From 7210e7ce1a9cee12fd297de068c199b25820c7d4 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 19 May 2023 11:43:44 +0200
Subject: [PATCH 0001/1862] NEW : TakePOS - add constant to sho line subprices

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 6f5e829ca47..0ca2155feb1 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1347,6 +1347,9 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 print $hookmanager->resPrint;
 
 if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
+	if ($conf->global->TAKEPOS_SHOW_SUBPRICE) {
+		print '<td class="linecolqty right">'.$langs->trans('PriceUHT').'</td>';
+	}
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
@@ -1602,6 +1605,9 @@ if ($placeid > 0) {
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				$htmlforlines .= $hookmanager->resPrint;
 
+				if ($conf->global->TAKEPOS_SHOW_SUBPRICE) {
+					$htmlforlines .= '<td class="right">'.price($line->subprice).'</td>';
+				}
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
 				if (isModEnabled('stock') && !empty($user->rights->stock->mouvement->lire)) {

From 8e7d1a9f23a2691384161c0579e7186067ae7475 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 19 May 2023 11:54:21 +0200
Subject: [PATCH 0002/1862] NEW : TAkePOS - dont allow payment if no thirdparty
 selected

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 7e1c648d460..c2bde7b3dc2 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -532,6 +532,17 @@ function Reduction() {
 function CloseBill() {
 	invoiceid = $("#invoiceid").val();
 	console.log("Open popup to enter payment on invoiceid="+invoiceid);
+	<?php if ($conf->global->TAKEPOS_NO_GENERIC_THIRDPARTY) { ?>
+		if ($("#idcustomer").val() == "") {
+			alert("<?php echo $langs->trans('TakePosCustomerMandatory'); ?>");
+			<?php if ($conf->global->TAKEPOS_CHOOSE_CONTACT) { ?>
+				Contact();
+			<?php } else { ?>
+				Customer();
+			<?php } ?>
+			return;
+		}
+	<?php }
 	$.colorbox({href:"pay.php?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
 }
 
@@ -585,6 +596,7 @@ function New() {
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 			});
 			ClearSearch();
+			$("#idcustomer").val("");
 		}
 	});
 }
@@ -1046,6 +1058,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				</div>
 				<!-- section for customer -->
 				<div class="inline-block valignmiddle" id="customerandsales"></div>
+				<input type="hidden" id="idcustomer" value="">
 				<!-- section for shopping carts -->
 				<div class="inline-block valignmiddle" id="shoppingcart"></div>
 				<!-- More info about customer -->

From 482b9756a28e2d2dbd3e9fb32212cbf3c8a074e5 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 19 May 2023 11:54:51 +0200
Subject: [PATCH 0003/1862] typo

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index c2bde7b3dc2..7b284762ba1 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -542,7 +542,7 @@ function CloseBill() {
 			<?php } ?>
 			return;
 		}
-	<?php }
+	<?php }	?>
 	$.colorbox({href:"pay.php?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
 }
 

From 5de555222c423569b99f1cfd665d7567d54bd395 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 19 May 2023 16:37:41 +0200
Subject: [PATCH 0004/1862] add missing trans

---
 htdocs/langs/en_US/cashdesk.lang | 1 +
 htdocs/langs/fr_FR/cashdesk.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 9cde66460d3..c8fb62e1d45 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -145,3 +145,4 @@ ShowProductReference=Show reference of products
 UsePriceHT=Use price excl. taxes and not price incl. taxes
 TerminalName=Terminal %s
 TerminalNameDesc=Terminal name
+TakePosCustomerMandatory=You must choose a customer
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 049ee169cef..91496e9ccf2 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -145,3 +145,4 @@ ShowProductReference=Afficher la référence des produits
 UsePriceHT=Utiliser le prix HT et non le prix TTC
 TerminalName=Terminal %s
 TerminalNameDesc=Nom du terminal
+TakePosCustomerMandatory=Vous devez choisir un client

From b2dd9bfb40de2a27a16d0cd33792cd0d1c2811c1 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Sun, 21 May 2023 09:51:56 +0200
Subject: [PATCH 0005/1862] fix php8

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0ca2155feb1..9eb94b9c9ee 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1347,7 +1347,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 print $hookmanager->resPrint;
 
 if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
-	if ($conf->global->TAKEPOS_SHOW_SUBPRICE) {
+	if (getDolGlobalString("TAKEPOS_SHOW_SUBPRICE")) {
 		print '<td class="linecolqty right">'.$langs->trans('PriceUHT').'</td>';
 	}
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';

From 3f337000d9f6c2d8fbc0881006f28ea2886198b6 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Sun, 21 May 2023 09:52:59 +0200
Subject: [PATCH 0006/1862] fix php8

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 9eb94b9c9ee..d97eb5e6f0d 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1605,7 +1605,7 @@ if ($placeid > 0) {
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				$htmlforlines .= $hookmanager->resPrint;
 
-				if ($conf->global->TAKEPOS_SHOW_SUBPRICE) {
+				if (getDolGlobalString("TAKEPOS_SHOW_SUBPRICE")) {
 					$htmlforlines .= '<td class="right">'.price($line->subprice).'</td>';
 				}
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';

From 823b479908091d581813189fd554054ab599dc12 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Sun, 21 May 2023 10:26:44 +0200
Subject: [PATCH 0007/1862] fix php8

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 7b284762ba1..93d0c478312 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -532,7 +532,7 @@ function Reduction() {
 function CloseBill() {
 	invoiceid = $("#invoiceid").val();
 	console.log("Open popup to enter payment on invoiceid="+invoiceid);
-	<?php if ($conf->global->TAKEPOS_NO_GENERIC_THIRDPARTY) { ?>
+	<?php if (getDolGlobalString("TAKEPOS_NO_GENERIC_THIRDPARTY")) { ?>
 		if ($("#idcustomer").val() == "") {
 			alert("<?php echo $langs->trans('TakePosCustomerMandatory'); ?>");
 			<?php if ($conf->global->TAKEPOS_CHOOSE_CONTACT) { ?>

From cdf16d965c107605ac0d5fa2dee279833e14b0cd Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Sun, 21 May 2023 19:01:50 +0200
Subject: [PATCH 0008/1862] fix

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 93d0c478312..cf9e8732951 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -532,7 +532,7 @@ function Reduction() {
 function CloseBill() {
 	invoiceid = $("#invoiceid").val();
 	console.log("Open popup to enter payment on invoiceid="+invoiceid);
-	<?php if (getDolGlobalString("TAKEPOS_NO_GENERIC_THIRDPARTY")) { ?>
+	<?php if (getDolGlobalInt("TAKEPOS_NO_GENERIC_THIRDPARTY")) { ?>
 		if ($("#idcustomer").val() == "") {
 			alert("<?php echo $langs->trans('TakePosCustomerMandatory'); ?>");
 			<?php if ($conf->global->TAKEPOS_CHOOSE_CONTACT) { ?>

From d9fd46caed3fb41b8415b5e4ed01428d527779b3 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Sun, 21 May 2023 19:03:00 +0200
Subject: [PATCH 0009/1862] fix

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index d97eb5e6f0d..577205621bb 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1347,7 +1347,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 print $hookmanager->resPrint;
 
 if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
-	if (getDolGlobalString("TAKEPOS_SHOW_SUBPRICE")) {
+	if (getDolGlobalInt("TAKEPOS_SHOW_SUBPRICE")) {
 		print '<td class="linecolqty right">'.$langs->trans('PriceUHT').'</td>';
 	}
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
@@ -1605,7 +1605,7 @@ if ($placeid > 0) {
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				$htmlforlines .= $hookmanager->resPrint;
 
-				if (getDolGlobalString("TAKEPOS_SHOW_SUBPRICE")) {
+				if (getDolGlobalInt("TAKEPOS_SHOW_SUBPRICE")) {
 					$htmlforlines .= '<td class="right">'.price($line->subprice).'</td>';
 				}
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';

From 382f9ce95dd6d3def274c467bd3fa3b46cfda0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Lukas?= <gl@gl.co.at>
Date: Fri, 8 Dec 2023 00:24:44 +0100
Subject: [PATCH 0010/1862] Fix #27029

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 2f4d4fe2f83..deb14e0b06d 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -1051,7 +1051,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".((int) $user->socid);
-			} elseif (isModEnabled("societe") && empty($user->rights->societe->client->voir)) {
+			} elseif (isModEnabled("societe") && empty($user->rights->societe->client->voir)&& ($feature != 'knowledgemanagement')) {
 				// If internal user without permission to see all thirdparties: Check permission for internal users that are restricted on their objects
 				if ($feature != 'ticket') {
 					if (empty($dbt_keyfield)) {

From 28769a13ebeec17db4745a949a9d6747a0c247f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Lukas?= <gl@gl.co.at>
Date: Wed, 27 Dec 2023 00:08:18 +0100
Subject: [PATCH 0011/1862] Update security.lib.php

Better fix as proposed by eldy
---
 htdocs/core/lib/security.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index deb14e0b06d..893cb3d8355 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -892,7 +892,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		$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', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website', 'recruitment', 'chargesociales', 'knowledgemanagement'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for object Societe
 		$checkparentsoc = array('agenda', 'contact', 'contrat'); // 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
@@ -1051,7 +1051,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".((int) $user->socid);
-			} elseif (isModEnabled("societe") && empty($user->rights->societe->client->voir)&& ($feature != 'knowledgemanagement')) {
+			} elseif (isModEnabled("societe") && empty($user->rights->societe->client->voir)) {
 				// If internal user without permission to see all thirdparties: Check permission for internal users that are restricted on their objects
 				if ($feature != 'ticket') {
 					if (empty($dbt_keyfield)) {

From ab206910ab509c76bd592501463688a2a9154d7f Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 15 Jan 2024 09:40:59 +0100
Subject: [PATCH 0012/1862] change to receptiondet_batch into scripts

---
 ...php => receptiondet_batch_extrafields.php} |  4 ++--
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/lib/reception.lib.php             |  6 ++---
 htdocs/core/modules/modReception.class.php    |  6 ++---
 htdocs/expedition/dispatch.php                |  2 +-
 .../class/fournisseur.commande.class.php      |  8 +++----
 .../fournisseur.commande.dispatch.class.php   |  2 +-
 htdocs/fourn/commande/dispatch.php            |  4 ++--
 htdocs/product/class/product.class.php        |  2 +-
 .../product/stock/class/productlot.class.php  |  4 ++--
 .../product/stock/lib/replenishment.lib.php   |  2 +-
 htdocs/product/stock/replenish.php            |  2 +-
 .../stock/stats/commande_fournisseur.php      |  2 +-
 htdocs/product/stock/stats/reception.php      |  2 +-
 htdocs/reception/card.php                     |  4 ++--
 htdocs/reception/class/reception.class.php    | 24 +++++++++----------
 htdocs/reception/dispatch.php                 |  4 ++--
 17 files changed, 40 insertions(+), 40 deletions(-)
 rename htdocs/admin/{commande_fournisseur_dispatch_extrafields.php => receptiondet_batch_extrafields.php} (94%)

diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/receptiondet_batch_extrafields.php
similarity index 94%
rename from htdocs/admin/commande_fournisseur_dispatch_extrafields.php
rename to htdocs/admin/receptiondet_batch_extrafields.php
index 277d61e1b2f..ea98618dda0 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/receptiondet_batch_extrafields.php
@@ -25,7 +25,7 @@
  */
 
 /**
- *      \file       htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+ *      \file       htdocs/admin/receptiondet_batch.php
  *		\ingroup    reception
  *		\brief      Page to setup extra fields of reception
  */
@@ -56,7 +56,7 @@ foreach ($tmptype2label as $key => $val) {
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'commande_fournisseur_dispatch'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'receptiondet_batch'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) {
 	accessforbidden();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 75fd4a5e47a..4dc6a6dad58 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4535,7 +4535,7 @@ abstract class CommonObject
 		if ($elementTable == 'expensereport') {
 			$fieldstatus = "fk_statut";
 		}
-		if ($elementTable == 'commande_fournisseur_dispatch') {
+		if ($elementTable == 'receptiondet_batch') {
 			$fieldstatus = "status";
 		}
 		if ($elementTable == 'prelevement_bons') {
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index 2dce74e6a11..b5f5a0c7067 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -122,7 +122,7 @@ function reception_admin_prepare_head()
 
 	$extrafields = new ExtraFields($db);
 	$extrafields->fetch_name_optionals_label('reception');
-	$extrafields->fetch_name_optionals_label('commande_fournisseur_dispatch');
+	$extrafields->fetch_name_optionals_label('receptiondet_batch');
 
 	$h = 0;
 	$head = array();
@@ -146,9 +146,9 @@ function reception_admin_prepare_head()
 	}
 
 	if (getDolGlobalString('MAIN_SUBMODULE_RECEPTION')) {
-		$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
+		$head[$h][0] = DOL_URL_ROOT.'/admin/receptiondet_batch_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
-		$nbExtrafields = $extrafields->attributes['commande_fournisseur_dispatch']['count'];
+		$nbExtrafields = $extrafields->attributes['receptiondet_batch']['count'];
 		if ($nbExtrafields > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 		}
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index f5f8429f5db..f0327612b7d 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -218,7 +218,7 @@ class modReception extends DolibarrModules
 		$keyforelement = 'reception';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect = 'commande_fournisseur_dispatch';
+		$keyforselect = 'receptiondet_batch';
 		$keyforelement = 'reception_line';
 		$keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -232,8 +232,8 @@ class modReception extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as ed';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch_extrafields as extra2 ON ed.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'receptiondet_batch as ed';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'receptiondet_batch_extrafields as extra2 ON ed.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		if ($idcontacts && getDolGlobalString('RECEPTION_ADD_CONTACTS_IN_EXPORT')) {
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 8ba6e6d7768..1daba85e87f 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -774,7 +774,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 						print '<td></td>'; // Warehouse column
 
 						/*$sql = "SELECT cfd.rowid, cfd.qty, cfd.fk_entrepot, cfd.batch, cfd.eatby, cfd.sellby, cfd.fk_product";
-						$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+						$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
 						$sql .= " WHERE cfd.fk_commandefourndet = ".(int) $objp->rowid;*/
 
 						$sql = "SELECT ed.rowid, ed.qty, ed.fk_entrepot,";
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 81570e7e320..102399eb4d9 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2103,7 +2103,7 @@ class CommandeFournisseur extends CommonOrder
 
 
 	/**
-	 * Save a receiving into the tracking table of receiving (commande_fournisseur_dispatch) and add product into stock warehouse.
+	 * Save a receiving into the tracking table of receiving (receptiondet_batch) and add product into stock warehouse.
 	 *
 	 * @param 	User		$user					User object making change
 	 * @param 	int			$product				Id of product to dispatch
@@ -2148,7 +2148,7 @@ class CommandeFournisseur extends CommonOrder
 		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY)) {
 			$this->db->begin();
 
-			$sql = "INSERT INTO ".$this->db->prefix()."commande_fournisseur_dispatch";
+			$sql = "INSERT INTO ".$this->db->prefix()."receptiondet_batch";
 			$sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch, fk_reception) VALUES";
 			$sql .= " ('".$this->id."','".$product."','".$qty."',".($entrepot > 0 ? "'".$entrepot."'" : "null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
 			$sql .= ($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ".($batch ? "'".$this->db->escape($batch)."'" : "null").", ".($fk_reception > 0 ? "'".$this->db->escape($fk_reception)."'" : "null");
@@ -2395,7 +2395,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
 		$sql .= " cfd.rowid as dispatchedlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.fk_commandefourndet";
 		$sql .= " FROM ".$this->db->prefix()."product as p,";
-		$sql .= " ".$this->db->prefix()."commande_fournisseur_dispatch as cfd";
+		$sql .= " ".$this->db->prefix()."receptiondet_batch as cfd";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."entrepot as e ON cfd.fk_entrepot = e.rowid";
 		$sql .= " WHERE cfd.fk_commande = ".((int) $this->id);
 		$sql .= " AND cfd.fk_product = p.rowid";
@@ -3556,7 +3556,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$sql = 'SELECT cd.rowid, cd.fk_product,';
 		$sql .= ' sum(cfd.qty) as qty';
-		$sql .= ' FROM '.$this->db->prefix().'commande_fournisseur_dispatch as cfd,';
+		$sql .= ' FROM '.$this->db->prefix().'receptiondet_batch as cfd,';
 		if ($filtre_statut >= 0) {
 			$sql .= ' '.$this->db->prefix().'reception as e,';
 		}
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 044a14119c9..7374ccb9111 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -56,7 +56,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'commande_fournisseur_dispatch'; //!< Name of table without prefix where object is stored
+	public $table_element = 'receptiondet_batch'; //!< Name of table without prefix where object is stored
 	public $lines = array();
 
 	/**
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 6241d2bd202..5c0a245310e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -655,7 +655,7 @@ if ($id > 0 || !empty($ref)) {
 		// Set $products_dispatched with qty dispatched for each product id
 		$products_dispatched = array();
 		$sql = "SELECT l.rowid, cfd.fk_product, sum(cfd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+		$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as l on l.rowid = cfd.fk_commandefourndet";
 		$sql .= " WHERE cfd.fk_commande = ".((int) $object->id);
 		$sql .= " GROUP BY l.rowid, cfd.fk_product";
@@ -1158,7 +1158,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " ,cfd.fk_reception, r.date_delivery";
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
-	$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+	$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
 	if ($conf->reception->enabled) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5a7ae18ee1d..99279e0b173 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3427,7 +3427,7 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_suppliers, COUNT(DISTINCT cf.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur_dispatch as fd";
+		$sql .= " FROM ".$this->db->prefix()."receptiondet_batch as fd";
 		$sql .= ", ".$this->db->prefix()."commande_fournisseur as cf";
 		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 0e9852fba82..9c145073f94 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -835,7 +835,7 @@ class Productlot extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_customers, COUNT(DISTINCT cf.rowid) as nb,";
 		$sql .= " COUNT(cfd.rowid) as nb_rows, SUM(cfdi.qty) as qty";
-		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur_dispatch as cfdi";
+		$sql .= " FROM ".$this->db->prefix()."receptiondet_batch as cfdi";
 		$sql .= " INNER JOIN ".$this->db->prefix()."commande_fournisseurdet as cfd ON (cfd.rowid = cfdi.fk_commandefourndet)";
 		$sql .= " INNER JOIN ".$this->db->prefix()."commande_fournisseur as cf ON (cf.rowid = cfd.fk_commande)";
 		//      $sql .= ", ".$this->db->prefix()."societe as s";
@@ -910,7 +910,7 @@ class Productlot extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT recep.fk_soc) as nb_customers, COUNT(DISTINCT recep.rowid) as nb,";
 		$sql .= " COUNT(cfdi.rowid) as nb_rows, SUM(cfdi.qty) as qty";
-		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur_dispatch as cfdi";
+		$sql .= " FROM ".$this->db->prefix()."receptiondet_batch as cfdi";
 		$sql .= " INNER JOIN ".$this->db->prefix()."reception as recep ON (recep.rowid = cfdi.fk_reception)";
 		//      $sql .= ", ".$this->db->prefix()."societe as s";
 		if (!$user->hasRight('societe', 'client', 'voir')) {
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index 8751935cb13..e6bf9d8a060 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -38,7 +38,7 @@ function dolDispatchToDo($order_id)
 	$ordered = array();
 
 	// Count nb of quantity dispatched per product
-	$sql = 'SELECT fk_product, SUM(qty) as qtydispatched FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+	$sql = 'SELECT fk_product, SUM(qty) as qtydispatched FROM '.MAIN_DB_PREFIX.'receptiondet_batch';
 	$sql .= ' WHERE fk_commande = '.((int) $order_id);
 	$sql .= ' GROUP BY fk_product';
 	$sql .= ' ORDER by fk_product';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index a9ae3c62195..b3e9b4aa510 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -451,7 +451,7 @@ if ($usevirtualstock) {
 
 		$sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd4.qty) IS NULL", "0", "SUM(fd4.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlReceptionFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf4,";
-		$sqlReceptionFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd4";
+		$sqlReceptionFourn .= " ".MAIN_DB_PREFIX."receptiondet_batch as fd4";
 		$sqlReceptionFourn .= " WHERE fd4.fk_commande = cf4.rowid AND cf4.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sqlReceptionFourn .= " AND fd4.fk_product = p.rowid";
 		$sqlReceptionFourn .= " AND cf4.fk_statut IN (3,4))";
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 756f814f575..4365c91e460 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -224,7 +224,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."commande_fournisseur as cf ON (cf.fk_soc = s.rowid)";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as cfd ON (cfd.fk_commande = cf.rowid)";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfdi ON (cfdi.fk_commandefourndet = cfd.rowid)";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."receptiondet_batch as cfdi ON (cfdi.fk_commandefourndet = cfd.rowid)";
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 63c4b942310..cc7165e3f4b 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -223,7 +223,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."reception as recep ON (recep.fk_soc = s.rowid)";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as d ON (d.fk_reception = recep.rowid)";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."receptiondet_batch as d ON (d.fk_reception = recep.rowid)";
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 0498c8d06bc..96835b53dc5 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1035,7 +1035,7 @@ if ($action == 'create') {
 			// Note that if an extrafield with the same name exists in the origin supplier order line, the value
 			// from the HTTP query will be ignored
 			foreach ($suffix2numAsked as $suffix => $n) {
-				$dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('commande_fournisseur_dispatch', '_' . $suffix, '');
+				$dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('receptiondet_batch', '_' . $suffix, '');
 			}
 
 			print '<script type="text/javascript">
@@ -1816,7 +1816,7 @@ if ($action == 'create') {
 		//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
 		$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
 		$sql .= ', p.description as product_desc';
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+		$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as ed";
 		$sql .= ", ".MAIN_DB_PREFIX."reception as e";
 		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
 		//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index a24bb2814d0..0839ef663ea 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -66,7 +66,7 @@ class Reception extends CommonObject
 	 */
 	public $fk_element = "fk_reception";
 	public $table_element = "reception";
-	public $table_element_line = "commande_fournisseur_dispatch";
+	public $table_element_line = "receptiondet_batch";
 	public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	/**
@@ -135,7 +135,7 @@ class Reception extends CommonObject
 	public $lines = array();
 
 
-	// detail of lot and qty = array(id in llx_commande_fournisseur_dispatch, batch, qty)
+	// detail of lot and qty = array(id in receptiondet_batch, batch, qty)
 	// We can use this to know warehouse planned to be used for each lot.
 	public $detail_batch;
 
@@ -559,7 +559,7 @@ class Reception extends CommonObject
 			$sql .= " ed.eatby, ed.sellby, ed.batch,";
 			$sql .= " ed.cost_price";
 			$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-			$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+			$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as ed";
 			$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
 			$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
@@ -1049,9 +1049,9 @@ class Reception extends CommonObject
 			$langs->load("agenda");
 
 			// Loop on each product line to add a stock movement
-			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.eatby, ed.sellby, ed.batch, ed.rowid as commande_fournisseur_dispatch_id";
+			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.eatby, ed.sellby, ed.batch, ed.rowid as receptiondet_batch_id";
 			$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-			$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+			$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as ed";
 			$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
 			$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
@@ -1076,12 +1076,12 @@ class Reception extends CommonObject
 		}
 
 		if (!$error) {
-			$main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+			$main = MAIN_DB_PREFIX.'receptiondet_batch';
 			$ef = $main."_extrafields";
 
 			$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_reception = ".((int) $this->id).")";
 
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."receptiondet_batch";
 			$sql .= " WHERE fk_reception = ".((int) $this->id);
 
 			if ($this->db->query($sqlef) && $this->db->query($sql)) {
@@ -1176,7 +1176,7 @@ class Reception extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch WHERE fk_reception = ".((int) $this->id);
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."receptiondet_batch WHERE fk_reception = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 
 		if (!empty($resql)) {
@@ -1638,7 +1638,7 @@ class Reception extends CommonObject
 				$sql .= " ed.eatby, ed.sellby, ed.batch,";
 				$sql .= " ed.cost_price";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+				$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as ed";
 				$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
 				$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
@@ -1796,7 +1796,7 @@ class Reception extends CommonObject
 				$sql .= " ed.eatby, ed.sellby, ed.batch,";
 				$sql .= " ed.cost_price";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+				$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as ed";
 				$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
 				$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
@@ -1930,7 +1930,7 @@ class Reception extends CommonObject
 				$sql .= " ed.eatby, ed.sellby, ed.batch,";
 				$sql .= " ed.cost_price";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
-				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+				$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as ed";
 				$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
 				$sql .= " AND cd.rowid = ed.fk_commandefourndet";
 
@@ -2092,7 +2092,7 @@ class Reception extends CommonObject
 	public static function replaceProduct(DoliDB $dbs, $origin_id, $dest_id)
 	{
 		$tables = array(
-			'commande_fournisseur_dispatch'
+			'receptiondet_batch'
 		);
 
 		return CommonObject::commonReplaceProduct($dbs, $origin_id, $dest_id, $tables);
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index 05ae583dedb..1e9170f0235 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -459,7 +459,7 @@ if ($id > 0 || !empty($ref)) {
 		// Get list of lines from the original Order into $products_dispatched with qty dispatched for each product id
 		$products_dispatched = array();
 		$sql = "SELECT l.rowid, cfd.fk_product, sum(cfd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
+		$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as l on l.rowid = cfd.fk_commandefourndet";
 		$sql .= " WHERE cfd.fk_reception = ".((int) $object->id);
 		$sql .= " GROUP BY l.rowid, cfd.fk_product";
@@ -686,7 +686,7 @@ if ($id > 0 || !empty($ref)) {
 						print '<td></td>'; // Warehouse column
 
 						$sql = "SELECT cfd.rowid, cfd.qty, cfd.fk_entrepot, cfd.batch, cfd.eatby, cfd.sellby, cfd.fk_product";
-						$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";	// commande_fournisseur_dispatch should be named receptiondet_batch
+						$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd";	// commande_fournisseur_dispatch should be named receptiondet_batch
 						$sql .= " WHERE cfd.fk_reception = ".((int) $object->id);
 						$sql .= " AND cfd.fk_commande = ".((int) $objectsrc->id);
 						$sql .= " AND cfd.fk_commandefourndet = ".(int) $objp->rowid;

From 268024d4248be45e2d0c1cbd233bb66c99c6ebc3 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 15 Jan 2024 09:49:33 +0100
Subject: [PATCH 0013/1862] change to receptiondet_batch into sql

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql       |  4 +---
 .../tables/llx_commande_fournisseur_dispatch.key.sql   | 10 +++++-----
 .../mysql/tables/llx_commande_fournisseur_dispatch.sql |  6 +++---
 ...x_commande_fournisseur_dispatch_extrafields.key.sql |  2 +-
 .../llx_commande_fournisseur_dispatch_extrafields.sql  |  2 +-
 .../install/mysql/tables/llx_expeditiondet_batch.sql   |  2 +-
 htdocs/install/pgsql/functions/functions.sql           |  2 +-
 htdocs/install/repair.php                              |  8 ++++----
 8 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index c9a280690a3..b4b7424cf79 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -50,8 +50,6 @@ ALTER TABLE llx_categories_extrafields DROP INDEX idx_categories_extrafields;
 ALTER TABLE llx_categories_extrafields ADD UNIQUE INDEX uk_categories_extrafields (fk_object);
 ALTER TABLE llx_commande_extrafields DROP INDEX idx_commande_extrafields;
 ALTER TABLE llx_commande_extrafields ADD UNIQUE INDEX uk_commande_extrafields (fk_object);
-ALTER TABLE llx_commande_fournisseur_dispatch_extrafields DROP INDEX idx_commande_fournisseur_dispatch_extrafields;
-ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_dispatch_extrafields (fk_object);
 ALTER TABLE llx_commande_fournisseur_extrafields DROP INDEX idx_commande_fournisseur_extrafields;
 ALTER TABLE llx_commande_fournisseur_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_extrafields (fk_object);
 ALTER TABLE llx_commande_fournisseurdet_extrafields DROP INDEX idx_commande_fournisseurdet_extrafields;
@@ -203,5 +201,5 @@ ALTER TABLE llx_c_tva ADD COLUMN type_vat smallint NOT NULL DEFAULT 0 AFTER fk_p
 
 ALTER TABLE llx_categorie ADD COLUMN position integer DEFAULT 0 AFTER color;
 
-ALTER TABLE llx_product DROP COLUMN onportal; 
+ALTER TABLE llx_product DROP COLUMN onportal;
 
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
index 98cb3db837f..0c92a0d8302 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
@@ -16,8 +16,8 @@
 --
 -- ===================================================================
 
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande);
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_reception (fk_reception);
-ALTER TABLE llx_commande_fournisseur_dispatch ADD CONSTRAINT fk_commande_fournisseur_dispatch_fk_reception FOREIGN KEY (fk_reception) REFERENCES llx_reception (rowid);
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_product (fk_product);
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commandefourndet (fk_commandefourndet);
+ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_commande (fk_commande);
+ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_reception (fk_reception);
+ALTER TABLE llx_receptiondet_batch ADD CONSTRAINT fk_receptiondet_batch_fk_reception FOREIGN KEY (fk_reception) REFERENCES llx_reception (rowid);
+ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_product (fk_product);
+ALTER TABLE llx_receptiondet_batch ADD INDEX idx_receptiondet_batch_fk_commandefourndet (fk_commandefourndet);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index 6bbaea61c45..3f3db04b8cb 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -14,17 +14,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
--- This table is just an history table to track all receiption to do or done for a 
+-- This table is just an history table to track all receiption to do or done for a
 -- particular supplier order. A movement with same information is also done
 -- into stock_movement so this table may be useless.
--- 
+--
 -- Detail of each lines of a reception (qty, batch and into which warehouse must be
 -- received or has been receveived a purchase order line).
 --
 -- This table should be renamed into llx_receptiondet_batch
 -- ===================================================================
 
-create table llx_commande_fournisseur_dispatch
+create table llx_receptiondet_batch
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
   fk_product     integer,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
index 09b50db8e3a..319720dd1a0 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_dispatch_extrafields (fk_object);
+ALTER TABLE llx_receptiondet_batch_extrafields ADD UNIQUE INDEX uk_receptiondet_batch_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
index d8720358cec..20ab19b4dc1 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
@@ -17,7 +17,7 @@
 -- This table should have been named llx_receptiondet_batch_extrafields
 -- ===================================================================
 
-create table llx_commande_fournisseur_dispatch_extrafields
+create table llx_receptiondet_batch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
index a8111e67cb9..3efd29dbc53 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
@@ -14,7 +14,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
--- Similar for supplier with llx_commande_fournisseur_dispatch=llx_receptiondet_batch
+-- Similar for supplier with llx_receptiondet_batch
 -- ============================================================================
 
 CREATE TABLE llx_expeditiondet_batch (
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index dacec28bd89..90e902458f9 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -89,7 +89,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_chargesociales FOR E
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande_fournisseur FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande_fournisseur_dispatch FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_receptiondet_batch FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande_fournisseur_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande_fournisseur_log FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_commande_fournisseurdet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 5d7596889fc..ba9a32ce7af 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1484,10 +1484,10 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 	$repair_link_dispatch_lines_supplier_order_lines = GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha');
 
 
-	echo '<tr><th>Repair llx_commande_fournisseur_dispatch.fk_commandefourndet</th></tr>';
+	echo '<tr><th>Repair llx_receptiondet_batch.fk_commandefourndet</th></tr>';
 	echo '<tr><td>Repair in progress. This may take a while.</td></tr>';
 
-	$sql_dispatch = 'SELECT * FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE COALESCE(fk_commandefourndet, 0) = 0';
+	$sql_dispatch = 'SELECT * FROM '.MAIN_DB_PREFIX.'receptiondet_batch WHERE COALESCE(fk_commandefourndet, 0) = 0';
 	$db->begin();
 	$resql_dispatch = $db->query($sql_dispatch);
 	$n_processed_rows = 0;
@@ -1527,7 +1527,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 				}
 				$qty_for_line = min($remaining_qty, $obj_line->qty);
 				if ($first_iteration) {
-					$sql_attach = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+					$sql_attach = 'UPDATE '.MAIN_DB_PREFIX.'receptiondet_batch';
 					$sql_attach .= ' SET fk_commandefourndet = '.((int) $obj_line->rowid).', qty = '.((float) $qty_for_line);
 					$sql_attach .= ' WHERE rowid = '.((int) $obj_dispatch->rowid);
 					$first_iteration = false;
@@ -1549,7 +1549,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 					);
 					$sql_attach_values = join(', ', $sql_attach_values);
 
-					$sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+					$sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'receptiondet_batch';
 					$sql_attach .= ' (fk_commande, fk_product, fk_commandefourndet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
 					$sql_attach .= " VALUES (".$sql_attach_values.")";
 				}

From 3670ba75ba4f1172ea50c1f266af78e141402965 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 15 Jan 2024 09:52:54 +0100
Subject: [PATCH 0014/1862] rename tables

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index b4b7424cf79..665b9a7d868 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -203,3 +203,5 @@ ALTER TABLE llx_categorie ADD COLUMN position integer DEFAULT 0 AFTER color;
 
 ALTER TABLE llx_product DROP COLUMN onportal;
 
+RENAME TABLE llx_commande_fournisseur_dispatch_extrafields TO llx_receptiondet_batch_extrafields;
+RENAME TABLE llx_commande_fournisseur_dispatch TO llx_receptiondet_batch;

From 12f28e3a2e2b13530b3dee2878aebce73b156b9f Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 15 Jan 2024 10:00:42 +0100
Subject: [PATCH 0015/1862] rename tablessql scripts

---
 ...ournisseur_dispatch.key.sql => llx_receptiondet_batch.key.sql} | 0
 ...mmande_fournisseur_dispatch.sql => llx_receptiondet_batch.sql} | 0
 ...afields.key.sql => llx_receptiondet_batch_extrafields.key.sql} | 0
 ...tch_extrafields.sql => llx_receptiondet_batch_extrafields.sql} | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/install/mysql/tables/{llx_commande_fournisseur_dispatch.key.sql => llx_receptiondet_batch.key.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_commande_fournisseur_dispatch.sql => llx_receptiondet_batch.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_commande_fournisseur_dispatch_extrafields.key.sql => llx_receptiondet_batch_extrafields.key.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_commande_fournisseur_dispatch_extrafields.sql => llx_receptiondet_batch_extrafields.sql} (100%)

diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
rename to htdocs/install/mysql/tables/llx_receptiondet_batch.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_receptiondet_batch.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
rename to htdocs/install/mysql/tables/llx_receptiondet_batch.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql b/htdocs/install/mysql/tables/llx_receptiondet_batch_extrafields.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_receptiondet_batch_extrafields.key.sql
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql b/htdocs/install/mysql/tables/llx_receptiondet_batch_extrafields.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
rename to htdocs/install/mysql/tables/llx_receptiondet_batch_extrafields.sql

From 933a36cf1e257156b4b1448b349ee8df8521184d Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 23 Jan 2024 18:05:54 +0100
Subject: [PATCH 0016/1862] update trigger

---
 htdocs/install/pgsql/functions/functions.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 90e902458f9..327fec5d17c 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -159,6 +159,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal FOR EACH ROW
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_merge_pdf_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propaldet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_receptiondet_batch FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_resource FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_salary FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();

From c2345a48c3a915badb7675ca363e1cab6b271328 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Thu, 25 Jan 2024 10:29:18 +0100
Subject: [PATCH 0017/1862] use alter table rename instead of rename table

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index cc6085b08be..a093abc1836 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -207,5 +207,5 @@ ALTER TABLE llx_product DROP COLUMN onportal;
 
 ALTER TABLE llx_knowledgemanagement_knowledgerecord MODIFY COLUMN answer longtext;
 
-RENAME TABLE llx_commande_fournisseur_dispatch_extrafields TO llx_receptiondet_batch_extrafields;
-RENAME TABLE llx_commande_fournisseur_dispatch TO llx_receptiondet_batch;
+ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME llx_receptiondet_batch_extrafields;
+ALTER TABLE llx_commande_fournisseur_dispatch RENAME llx_receptiondet_batch;

From 93427ee7a8ba9ec52eeaa73474a3042255e8abf7 Mon Sep 17 00:00:00 2001
From: Ariel Bentolila <ariel.bentolila@gmail.com>
Date: Mon, 5 Feb 2024 18:50:26 +0200
Subject: [PATCH 0018/1862] QUAL fix lines' title height calculation

---
 .../supplier_order/doc/pdf_cornas.modules.php | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 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 14de46cbd33..ef5e9f164a6 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -476,11 +476,22 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				// Use new auto collum system
 				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
+
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines) {
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
 				$nexY = $tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
-				$pageposbeforeprintlines = $pdf->getPage();
-				$pagenb = $pageposbeforeprintlines;
 				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -764,15 +775,6 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					}
 				}
 
-				// Show square
-				if ($pagenb == $pageposbeforeprintlines) {
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				} else {
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
-					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
 				// Affiche zone infos
 				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 

From 2b71c260d8b3f3dcd25a3de14b520135ba7c92b1 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:21:19 +0100
Subject: [PATCH 0019/1862] FIX 16.0 - parent company gets emptied when
 updating a third party from the card in edit mode (#28269)

This is because the field's value is set using GETPOST even when no corresponding <input> is present in the form.
---
 htdocs/societe/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index caaee4a92b9..264f73c5abb 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -453,7 +453,7 @@ if (empty($reshook)) {
 			}
 			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
 			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
-			$object->parent					= GETPOST('parent_company_id', 'int');
+			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOST('parent_company_id', 'int') : $object->parent;
 			$object->address				= GETPOST('address', 'alphanohtml');
 			$object->zip					= GETPOST('zipcode', 'alphanohtml');
 			$object->town					= GETPOST('town', 'alphanohtml');

From 6f5ed78d0a5b68d36d487c1a18ed133452b72681 Mon Sep 17 00:00:00 2001
From: atm-adrien <67913809+atm-adrien@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:24:14 +0100
Subject: [PATCH 0020/1862] FIX : Don't display column when it's out of date
 (#28271)

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

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index ee0ec817918..679ba9f0f38 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -256,7 +256,7 @@ print '<th class="liste_titre"></th>';
 print '<th class="liste_titre right">'.$langs->trans("PreviousPeriod").'</th>';
 print '<th class="liste_titre right">'.$langs->trans("SelectedPeriod").'</th>';
 foreach ($months as $k => $v) {
-	if (($k + 1) >= $date_startmonth) {
+	if (($k + 1) >= $date_startmonth && $k < $date_endmonth) {
 		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k + 1))).'</th>';
 	}
 }
@@ -389,7 +389,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Detail by month
 				foreach ($months as $k => $v) {
-					if (($k + 1) >= $date_startmonth) {
+					if (($k + 1) >= $date_startmonth && $k < $date_endmonth) {
 						foreach ($sommes as $code => $det) {
 							$vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
 						}
@@ -588,7 +588,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Each month
 				foreach ($totCat['M'] as $k => $v) {
-					if (($k + 1) >= $date_startmonth) {
+					if (($k + 1) >= $date_startmonth && $k < $date_endmonth) {
 						print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
 					}
 				}
@@ -629,7 +629,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 							// Make one call for each month
 							foreach ($months as $k => $v) {
-								if (($k + 1) >= $date_startmonth) {
+								if (($k + 1) >= $date_startmonth && $k < $date_endmonth) {
 									if (isset($cpt['account_number'])) {
 										$resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
 									} else {

From 46afde019bc13261b1e3cc76687ec37a9c84c7da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Feb 2024 15:59:11 +0100
Subject: [PATCH 0021/1862] Fix missing cash control menu in auguria

---
 htdocs/core/menus/init_menu_auguria.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 7fcafcf8e60..859ab73638b 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -404,6 +404,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2650__+MAX_llx_menu__, 'accountancy', 'cat', 14__+MAX_llx_menu__, '/categories/index.php?mainmenu=bank&amp;leftmenu=bank&amp;type=5', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2651__+MAX_llx_menu__, 'accountancy', '', 2650__+MAX_llx_menu__, '/categories/card.php?mainmenu=bank&amp;leftmenu=bank&amp;action=create&amp;type=5', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 
+-- Bank - Cash control POS
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("takepos") || isModEnabled("cashdesk"))', __HANDLER__, 'left', 6100__+MAX_llx_menu__, 'bank', 'cashcontrol', 14__+MAX_llx_menu__, '/compta/cashcontrol/cashcontrol_list.php?mainmenu=bank&amp;action=list', 'CashControl', 0, 'cashdesk', '$user->hasRight("cashdesk", "run")|| $user->hasRight("takepos", "run")', '', 2, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("takepos") || isModEnabled("cashdesk") && $leftmenu=="cashcontrol")', __HANDLER__, 'left', 6101__+MAX_llx_menu__, 'bank', 'cashcontrol', 6100__+MAX_llx_menu__, '/compta/cashcontrol/cashcontrol_card.php?mainmenu=bank&amp;action=create', 'NewCashFence', 1, 'cashdesk', '$user->hasRight("cashdesk", "run")|| $user->hasRight("takepos", "run")', '', 2, 6, __ENTITY__);
+
 
 -- Project
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->project->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?mainmenu=project&amp;leftmenu=projects', 'LeadsOrProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);

From 7ff44dfc3ee517bf053d601c733484d4982ed411 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 19 Feb 2024 23:33:34 +0100
Subject: [PATCH 0022/1862] FIX Responsive on admin project

---
 htdocs/projet/admin/project.php | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 2186dc580e4..d2f8967c000 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -298,6 +298,7 @@ print '<br>';
 
 print load_fiche_titre($langs->trans("ProjectsNumberingModules"), '', '');
 
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="100">'.$langs->trans("Name").'</td>';
@@ -387,13 +388,15 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br>';
-
+print '</table>';
+print '</div>';
+print '<br>';
 
 if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 	// Task numbering module
 	print load_fiche_titre($langs->trans("TasksNumberingModules"), '', '');
 
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td width="100">'.$langs->trans("Name").'</td>';
@@ -483,7 +486,9 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 		}
 	}
 
-	print '</table><br>';
+	print '</table>';
+	print '</div>';
+	print '<br>';
 }
 
 
@@ -515,8 +520,9 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-print "<table class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
+print '<table class="noborder" width="100%">'."\n";
+print '<tr class="liste_titre">'."\n";
 print '  <td width="100">'.$langs->trans("Name")."</td>\n";
 print "  <td>".$langs->trans("Description")."</td>\n";
 print '<td class="center" width="60">'.$langs->trans("Activated")."</td>\n";
@@ -622,7 +628,9 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br>';
+print '</table>';
+print '</div>';
+print '<br>';
 
 
 
@@ -655,8 +663,9 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 		dol_print_error($db);
 	}
 
-	print "<table class=\"noborder\" width=\"100%\">\n";
-	print "<tr class=\"liste_titre\">\n";
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
+	print '<table class="noborder" width="100%">'."\n";
+	print '<tr class="liste_titre">'."\n";
 	print '  <td width="100">'.$langs->trans("Name")."</td>\n";
 	print "  <td>".$langs->trans("Description")."</td>\n";
 	print '<td class="center" width="60">'.$langs->trans("Activated")."</td>\n";
@@ -761,7 +770,9 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 		}
 	}
 
-	print '</table><br>';
+	print '</table>';
+	print '</div>';
+	print '<br>';
 }
 
 
@@ -775,6 +786,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateoptions">';
 print '<input type="hidden" name="page_y" value="">';
 
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameters")."</td>\n";
@@ -830,7 +842,7 @@ print '<input type="submit" class="button small reposition" name="PROJECT_TIMESH
 print '</td>';
 print '</tr>';
 print '</table>';
-
+print '</div>';
 
 print '</form>';
 

From c2980f34c774004556ae143473c450eb7aedf3c4 Mon Sep 17 00:00:00 2001
From: Joachim Kueter <priojk@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:37:10 +0100
Subject: [PATCH 0023/1862] Fix: add missing parameters to existing hook
 (#28304)

For this hook to add reasonable additional fields to a line, access to the line number and other related values of the line is required.
---
 htdocs/product/stock/replenish.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index a3cac8adbc8..4135c31e80a 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -934,7 +934,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		print '<td class="right"><a href="replenishorders.php?search_product='.$prod->id.'">'.$ordered.'</a> '.$picto.'</td>';
 
 		// To order
-		print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.((!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
+		$tobuy = (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $stocktobuywarehouse : $stocktobuy;
+		print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.$tobuy.'"></td>';
 
 		// Supplier
 		print '<td class="right">';
@@ -942,7 +943,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		print '</td>';
 
 		// Fields from hook
-		$parameters = array('objp'=>$objp);
+		$parameters = array('objp'=>$objp, 'i'=>$i, 'tobuy'=>$tobuy);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 

From 0492fb609835508b21717fe373990ecd63bc37c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2024 14:28:41 +0100
Subject: [PATCH 0024/1862] FIX close #28279

---
 htdocs/core/class/commonpeople.class.php |  5 +++-
 htdocs/core/lib/functions.lib.php        | 32 ++++++++++++++++--------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/commonpeople.class.php b/htdocs/core/class/commonpeople.class.php
index 2b1145edb7f..7d1042e1401 100644
--- a/htdocs/core/class/commonpeople.class.php
+++ b/htdocs/core/class/commonpeople.class.php
@@ -235,11 +235,14 @@ trait CommonPeople
 		}
 		$outdone = 0;
 		if (!empty($this->email)) {
-			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
+			$out .= dol_print_email($this->email, $this->id, $object->id, 1, 0, 0, 1);
 			$outdone++;
 		}
 		if (!empty($this->url)) {
 			//$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
+			if (!empty($this->email)) {
+				$out .= ' ';
+			}
 			$out .= dol_print_url($this->url, '_blank', 0, 1);
 			$outdone++;
 		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 76b8ee3387d..8b109dbee3b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2579,7 +2579,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 	// Show address and email
 	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
-		$moreaddress = $object->getBannerAddress('refaddress', $object);
+		$moreaddress = $object->getBannerAddress('refaddress', $object);	// address, email, url, social networks
 		if ($moreaddress) {
 			$morehtmlref .= '<div class="refidno refaddress">';
 			$morehtmlref .= $moreaddress;
@@ -3281,9 +3281,9 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $mor
 	$linkend = '</a>';
 
 	if ($morecss == 'float') {	// deprecated
-		return '<div class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
+		return '<div class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'globe', 'class="paddingrightonly"') : '').$link.'</div>';
 	} else {
-		return $linkstart.'<span class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto('', 'globe').' ' : '').$link.'</span>'.$linkend;
+		return $linkstart.'<span class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto('', 'globe', 'class="paddingrightonly"') : '').$link.'</span>'.$linkend;
 	}
 }
 
@@ -3301,7 +3301,10 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $mor
  */
 function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0)
 {
-	global $conf, $user, $langs, $hookmanager;
+	global $user, $langs, $hookmanager;
+
+	//global $conf; $conf->global->AGENDA_ADDACTIONFOREMAIL = 1;
+	//$showinvalid = 1; $email = 'rrrrr';
 
 	$newemail = dol_escape_htmltag($email);
 
@@ -3314,30 +3317,35 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 	}
 
 	if (!empty($addlink)) {
-		$newemail = '<a style="text-overflow: ellipsis;" href="';
+		$newemail = '<a class="paddingrightonly" style="text-overflow: ellipsis;" href="';
 		if (!preg_match('/^mailto:/i', $email)) {
 			$newemail .= 'mailto:';
 		}
 		$newemail .= $email;
 		$newemail .= '">';
+
+		$newemail .= ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '');
+
 		$newemail .= dol_trunc($email, $max);
 		$newemail .= '</a>';
 		if ($showinvalid && !isValidEmail($email)) {
 			$langs->load("errors");
-			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
+			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email), '', 'paddingrightonly');
 		}
 
 		if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {
 			$type = 'AC_EMAIL';
-			$link = '';
+			$linktoaddaction = '';
 			if (getDolGlobalString('AGENDA_ADDACTIONFOREMAIL')) {
-				$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+				$linktoaddaction = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.urlencode($type).'&amp;contactid='.((int) $cid).'&amp;socid='.((int) $socid).'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
 			}
-			if ($link) {
-				$newemail = '<div>'.$newemail.' '.$link.'</div>';
+			if ($linktoaddaction) {
+				$newemail = '<div>'.$newemail.' '.$linktoaddaction.'</div>';
 			}
 		}
 	} else {
+		$newemail = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '').$newemail;
+
 		if ($showinvalid && !isValidEmail($email)) {
 			$langs->load("errors");
 			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
@@ -3345,8 +3353,10 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 	}
 
 	//$rep = '<div class="nospan" style="margin-right: 10px">';
-	$rep = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto)).' ' : '').$newemail;
+	//$rep = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '').$newemail;
 	//$rep .= '</div>';
+	$rep = $newemail;
+
 	if ($hookmanager) {
 		$parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);
 

From 02e9ef8023601b0fe2d886cd0da3bb78d6caacdd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2024 14:58:46 +0100
Subject: [PATCH 0025/1862] Close #28293

---
 test/phpunit/LangTest.php     | 7 +++++--
 test/phpunit/SecurityTest.php | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index be1e02b338d..e35abf51868 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -126,10 +126,13 @@ class LangTest extends CommonClassTest
 			// Test java string contains only d,M,y,/,-,. and not m,...
 			$result = $tmplangs->transnoentitiesnoconv("FormatDateShortJava");
 			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJava KO for lang code '.$code);
+			$tmpvar = preg_match('/^[dMy\/\-\.]+$/', $result);
+			$this->assertEquals(1, $tmpvar, 'FormatDateShortJava KO for lang code '.$code.'. Does not match /[dMy\/\-\.]+/');
+
 			$result = $tmplangs->trans("FormatDateShortJavaInput");
 			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/', $result, 'FormatDateShortJavaInput KO for lang code '.$code);
+			$tmpvar = preg_match('/^[dMy\/\-\.]+$/', $result);
+			$this->assertEquals(1, $tmpvar, 'FormatDateShortJavaInput KO for lang code '.$code.'. Does not match /^[dMy\/\-\.]+$/');
 
 			unset($tmplangs);
 
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index d0c0b005e62..f7ab7d0273b 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -839,7 +839,9 @@ class SecurityTest extends CommonClassTest
 		$url = 'ftp://mydomain.com';
 		$tmp = getURLContent($url);
 		print __METHOD__." url=".$url."\n";
-		$this->assertRegExp("/not supported/", $tmp['curl_error_msg'], "Should disable ftp connection");	// Test error if return does not contains 'not supported'
+
+		$tmpvar = preg_match('/not supported/', $tmp['curl_error_msg']);
+		$this->assertEquals(1, $tmpvar, "Did not find the /not supported/ in getURLContent error message. We should.");
 
 		$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
 		$tmp = getURLContent($url, 'GET', '', 0);	// We do NOT follow

From c67461bb385c9c6866a0a2dd84edd9629bf67dee Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 20 Feb 2024 15:02:05 +0100
Subject: [PATCH 0026/1862] qual: phpstan for
 htdocs/salaries/class/paymentsalary.class.php (#28291)

* qual: phpstan for htdocs/salaries/class/paymentsalary.class.php

htdocs/salaries/class/paymentsalary.class.php	205	Property PaymentSalary::$amount (float) does not accept string.

htdocs/salaries/class/paymentsalary.class.php	292	Property PaymentSalary::$amount (float) does not accept string.

htdocs/salaries/class/paymentsalary.class.php	389	Property PaymentSalary::$amount (float) does not accept string.

htdocs/salaries/class/paymentsalary.class.php	565	Property PaymentSalary::$datec (int) does not accept string.

* Update paymentsalary.class.php - apply price2num() on $totalamount before testing if $totalamount==0

* typo
---
 htdocs/salaries/class/paymentsalary.class.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 297a2865f06..7c27aa44b28 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -202,7 +202,7 @@ class PaymentSalary extends CommonObject
 			$this->fk_salary = (int) $this->fk_salary;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
@@ -228,13 +228,13 @@ class PaymentSalary extends CommonObject
 
 		$totalamount = 0;
 		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
-			$newvalue = price2num($value, 'MT');
+			$newvalue = (float) price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 		}
-		$totalamount = price2num($totalamount);
 
 		// Check parameters
+		$totalamount = (float) price2num($totalamount, 'MT'); // this is to ensure the following test is no biaised by a potential float equal to 0.0000000000001
 		if ($totalamount == 0) {
 			return -1;
 		} // On accepte les montants negatifs pour les rejets de prelevement mais pas null
@@ -246,14 +246,13 @@ class PaymentSalary extends CommonObject
 			// Insert array of amounts
 			foreach ($this->amounts as $key => $amount) {
 				$salary_id = $key;
-				$amount = price2num($amount);
 				if (is_numeric($amount) && !empty($amount)) {
 					// We can have n payments for 1 salary but we can't have 1 payments for n salaries (for invoices link is n-n, not for salaries).
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (entity, fk_salary, datec, datep, amount,";
 					$sql .= " fk_typepayment, num_payment, note, fk_user_author, fk_bank)";
 					$sql .= " VALUES (".((int) $conf->entity).", ".((int) $salary_id).", '".$this->db->idate($now)."',";
 					$sql .= " '".$this->db->idate($this->datep)."',";
-					$sql .= " ".price2num($amount).",";
+					$sql .= " ".((float) $amount).",";
 					$sql .= " ".((int) $this->fk_typepayment).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".((int) $user->id).",";
 					$sql .= " 0)";
 
@@ -386,7 +385,7 @@ class PaymentSalary extends CommonObject
 			$this->fk_salary = (int) $this->fk_salary;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
@@ -564,7 +563,7 @@ class PaymentSalary extends CommonObject
 		$this->fk_salary = 0;
 		$this->datec = '';
 		$this->tms = dol_now();
-		$this->datepaye = '';
+		$this->datepaye = dol_now();
 		$this->amount = 0.0;
 		$this->fk_typepayment = 0;
 		$this->num_payment = '';

From e36c2b2e2927259b40ff8246cc03bcc9ff1a4240 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Feb 2024 18:29:11 +0100
Subject: [PATCH 0027/1862] doc

---
 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 b9b5d61e2a5..74d19298a89 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6177,7 +6177,7 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0,
  *		@param	Translate|string	$outlangs		Object langs for output. '' use default lang. 'none' use international separators.
  *		@param	int					$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accuracy) before being inserted into database or after a computation, so this parameter should be useless.
  *		@param	int					$rounding		MINIMUM number of decimal to show: 0=no change, -1=we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
- *		@param	int|string			$forcerounding	MAXIMUM number of decimal to forcerounding decimal: -1=no change, 'MU' or 'MT' or numeric to round to MU or MT or to a given number of decimal
+ *		@param	int|string			$forcerounding	MAXIMUM number of decimal to forcerounding decimal: -1=no change, 'MU' or 'MT' or a numeric to round to MU or MT or to a given number of decimal
  *		@param	string				$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
  *		@return	string								String with formatted amount
  *

From 8acd3451d188204c0c0408eaebd72ce10edb0259 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Feb 2024 18:40:14 +0100
Subject: [PATCH 0028/1862] Doc

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 74d19298a89..8ba1c90c7d5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7239,11 +7239,10 @@ function yn($yesno, $case = 1, $color = 0)
  *  @param	Object		$object			Object to use to get ref to forge the path.
  *  @param	string		$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...'). Use '' for autodetect from $object.
  *  @return	string						Dir to use ending. Example '' or '1/' or '1/2/'
+ *  @see getMultiDirOuput()
  */
 function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '')
 {
-	global $conf;
-
 	if (empty($modulepart) && !empty($object->module)) {
 		$modulepart = $object->module;
 	}
@@ -11970,7 +11969,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
  * 									'myobject@mymodule' or
  * 									'myobject_mysubobject' (where mymodule = myobject, like 'project_task')
  * @return  array					array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>)
- * @see fetchObjectByElement()
+ * @see fetchObjectByElement(), getMultiDirOutput()
  */
 function getElementProperties($element_type)
 {

From 3aebda050fa8654957bb5c9a4b69f3f65794cf9b Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Tue, 20 Feb 2024 18:45:03 +0100
Subject: [PATCH 0029/1862] Added customer code export (#28309)

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

diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 48c733a76b3..452f006a8d4 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -195,7 +195,7 @@ class modPropale extends DolibarrModules
 		$this->export_label[$r] = 'ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("propale", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer",
 			'c.fk_soc'=>"IdCompany", 'c.datec'=>"DateCreation", 'c.datep'=>"DatePropal", 'c.fin_validite'=>"DateEndPropal",
 			'c.total_ht'=>"TotalHT", 'c.total_ttc'=>"TotalTTC");
@@ -235,7 +235,7 @@ class modPropale extends DolibarrModules
 		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text',
+			's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text',
 			's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.datec'=>"Date", 'c.datep'=>"Date", 'c.fin_validite'=>"Date",
 			'c.total_ht'=>"Numeric", 'c.total_ttc'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.note_private'=>"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",
@@ -243,7 +243,7 @@ class modPropale extends DolibarrModules
 			'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',
+			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"propal", 'c.ref'=>"propal", 'c.ref_client'=>"propal",
 			'c.fk_soc'=>"propal", 'c.datec'=>"propal", 'c.datep'=>"propal", 'c.fin_validite'=>"propal", 'c.total_ht'=>"propal",
 			'c.total_ttc'=>"propal", 'c.fk_statut'=>"propal", 'c.note_public'=>"propal", 'c.note_private'=>"propal", 'c.date_livraison'=>"propal",

From 61f571a36761a3b5a1c615e809fde00d659579f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Feb 2024 18:55:38 +0100
Subject: [PATCH 0030/1862] Avoir error

---
 .github/workflows/windows-ci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index 4d125a29497..50122652824 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -125,3 +125,4 @@ jobs:
           type %INIFILE%
           php --ini
           php "%PHPROOT%\phpunit" -d memory_limit=-1 -c "test\phpunit\phpunittest.xml" "test\phpunit\AllTests.php"
+        continue-on-error: true

From c3538ca36120ad69018649b1fb2af3ad58bec672 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Tue, 20 Feb 2024 18:57:28 +0100
Subject: [PATCH 0031/1862] Clean function addlink parameter (#28311)

---
 htdocs/contact/canvas/actions_contactcard_common.class.php | 2 +-
 htdocs/contact/list.php                                    | 2 +-
 htdocs/contrat/list.php                                    | 2 +-
 htdocs/societe/canvas/actions_card_common.class.php        | 2 +-
 htdocs/societe/list.php                                    | 2 +-
 htdocs/user/list.php                                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 2061d2c711f..d0db16191d0 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -249,7 +249,7 @@ abstract class ActionsContactCardCommon
 			$this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
 			$this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
 			$this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
-			$this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 1);
 
 			$this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv);
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 37517aa6ef9..26f1c8c2f89 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1586,7 +1586,7 @@ while ($i < $imaxinloop) {
 			if ($contextpage == 'poslist') {
 				print $obj->email;
 			} else {
-				print dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1);
+				print dol_print_email($obj->email, $obj->rowid, $obj->socid, 1, 18, 0, 1);
 			}
 			print '</td>';
 			if (!$i) {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index f21e19b43a1..d6d688ef27a 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -1183,7 +1183,7 @@ while ($i < $imaxinloop) {
 		}
 		// Email
 		if (!empty($arrayfields['s.email']['checked'])) {
-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->email).'">'.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->email).'">'.dol_print_email($obj->email, 0, $obj->socid, 1, 0, 1, 1).'</td>';
 		}
 		// Town
 		if (!empty($arrayfields['s.town']['checked'])) {
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 0ca0079270a..8949242dfc3 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -299,7 +299,7 @@ abstract class ActionsCardCommon
 
 			$this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
 			$this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
-			$this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 1);
 			$this->tpl['url'] 		= dol_print_url($this->object->url);
 
 			$this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 946fc1b3d33..32866803df7 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1902,7 +1902,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		if (!empty($arrayfields['s.email']['checked'])) {
-			print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
+			print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, 0, 1)."</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index eb5b214d362..ecc5c2a54f3 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -1180,7 +1180,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		if (!empty($arrayfields['u.email']['checked'])) {
-			print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 'AC_EMAIL', 0, 0, 1)."</td>\n";
+			print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)."</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}

From db223a041fa96235117e8f92800483a73f6f7c4e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 20 Feb 2024 19:36:30 +0100
Subject: [PATCH 0032/1862] Qual: Optimisation in load criteria (dol_dir_list)
 (#28263)

# Qual: Optimisation in load criteria (dol_dir_list)

By moving the "$sortcriteria" conditions into the load conditions, the
comparison between strings is less frequent.

The original test can probably even be removed as it is part of load_*.

The only side-effect that I can see is with the hook, but I think
in theory there should not be a negative side-effect, only a positive
one as this tells the hook to load the data we need without relying
on the hook to make the proper interpretation of the searchcriteria.
---
 htdocs/core/lib/files.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index d40af1aadd5..8b11ce53256 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -87,9 +87,9 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 		}
 	}
 
-	$loaddate = ($mode == 1 || $mode == 2 || $nbsecondsold != 0);
-	$loadsize = ($mode == 1 || $mode == 3);
-	$loadperm = ($mode == 1 || $mode == 4);
+	$loaddate = ($mode == 1 || $mode == 2 || $nbsecondsold != 0 || $sortcriteria == 'date');
+	$loadsize = ($mode == 1 || $mode == 3 || $sortcriteria == 'size');
+	$loadperm = ($mode == 1 || $mode == 4 || $sortcriteria == 'perm');
 
 	// Clean parameters
 	$utf8_path = preg_replace('/([\\/]+)$/', '', $utf8_path);

From f336c648fd9df2eaebf7523e2838d120c510b48d Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Tue, 20 Feb 2024 20:45:33 +0100
Subject: [PATCH 0033/1862] error in </span> tag (#28316)

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
---
 htdocs/langs/fi_FI/blockedlog.lang | 2 +-
 htdocs/langs/fi_FI/errors.lang     | 2 +-
 htdocs/langs/fi_FI/install.lang    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index 44b8923cc81..e422036e04c 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -20,7 +20,7 @@ Fingerprint=Sormenjälki
 DownloadLogCSV=Vie arkistoidut lokit (CSV)
 DataOfArchivedEvent=Täydelliset tiedot arkistoidusta tapahtumasta
 ImpossibleToReloadObject=Alkuperäistä objektia (tyyppi %s, tunnus %s) ei ole linkitetty (katso "Täydelliset tiedot" -sarake saadaksesi muuttumattomia tallennettuja tietoja)
-BlockedLogAreRequiredByYourCountryLegislation=Maasi lainsäädäntö saattaa edellyttää muuttumattomien lokien moduulia. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa <span class='notranslate'>vero<. /span> tarkastus.
+BlockedLogAreRequiredByYourCountryLegislation=Maasi lainsäädäntö saattaa edellyttää muuttumattomien lokien moduulia. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa <span class='notranslate'>vero</span> tarkastus.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Muuttamattomat lokit -moduuli otettiin käyttöön maasi lainsäädännön vuoksi. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa vero. span> tarkastus.
 BlockedLogDisableNotAllowedForCountry=Luettelo maista, joissa tämän moduulin käyttö on pakollista (että moduulia ei voida poistaa käytöstä virheellisesti, jos maasi on tässä luettelossa, moduulin poistaminen käytöstä ei ole mahdollista muokkaamatta ensin tätä luetteloa. Huomaa myös, että tämän moduulin käyttöönotto/poistaminen käytöstä seurata muuttumatonta Loki).
 OnlyNonValid=Ei kelvollinen
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index a5dc4cb57fb..82f16e6c10b 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -308,7 +308,7 @@ ErrorTableNotFound=Taulukkoa <b>%s</b> ei löydy
 ErrorRefNotFound=Viite <b>%s</b> ei löydy
 ErrorValueForTooLow=Arvo <b>%s</b> on liian pieni
 ErrorValueCantBeNull=Arvo <b>%s</b> ei voi olla tyhjä
-ErrorDateOfMovementLowerThanDateOfFileTransmission=Pankkitapahtuman päiväys ei voi olla pienempi kuin päiväys <span class='notranslate'>tiedosto<. /span> lähetys
+ErrorDateOfMovementLowerThanDateOfFileTransmission=Pankkitapahtuman päiväys ei voi olla pienempi kuin päiväys <span class='notranslate'>tiedosto</span> lähetys
 ErrorTooMuchFileInForm=Liikaa tiedostoja muodossa, enimmäismäärä on %s tiedosto(s)
 ErrorSessionInvalidatedAfterPasswordChange=Istunto mitätöitiin salasanan, sähköpostiosoitteen, tilan tai päivämäärät voimassaolon muutoksen vuoksi. Ole hyvä ja kirjaudu uudelleen.
 ErrorExistingPermission = Lupa <b>%s</b> objektille  <b>%s</b> on jo olemassa
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index b29587db107..87cf15d38a7 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -132,7 +132,7 @@ MigrationFinished=Muuttoliike valmis
 LastStepDesc=<strong>Viimeinen vaihe</strong>: Määritä tähän kirjautumissalasana, ja käytä yhteyden muodostamiseen Dolibarriin. <b>Älä hukkaa tätä, sillä se on päätili kaikkien muiden/lisäkäyttäjätilien hallinnassa.</b>
 ActivateModule=Aktivoi moduuli %s
 ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila)
-WarningUpgrade=Varoitus:\nTeitkö tietokanta varmuuskopion ensin?\nTämä on erittäin suositeltavaa. Tietojen katoaminen (esimerkiksi mysql-version 5.5.40/41/42/43 virheiden vuoksi) voi olla mahdollista tämän prosessin aikana, joten on tärkeää tehdä täydellinen vedos <span class='notranslate'>tietokanta<. /span> ennen kuin aloitat siirron.\n\nNapsauta OK aloittaaksesi siirtoprosessin...
+WarningUpgrade=Varoitus:\nTeitkö tietokanta varmuuskopion ensin?\nTämä on erittäin suositeltavaa. Tietojen katoaminen (esimerkiksi mysql-version 5.5.40/41/42/43 virheiden vuoksi) voi olla mahdollista tämän prosessin aikana, joten on tärkeää tehdä täydellinen vedos <span class='notranslate'>tietokanta</span> ennen kuin aloitat siirron.\n\nNapsauta OK aloittaaksesi siirtoprosessin...
 ErrorDatabaseVersionForbiddenForMigration=Versiosi tietokanta on %s. Siinä on kriittinen virhe, joka mahdollistaa tietojen menetyksen, jos teet siirtoprosessin edellyttämiä rakenteellisia muutoksia tietokanta. Tästä syystä siirtoa ei sallita, ennen kuin päivität tietokanta-laitteesi tasoversioksi (korjattu) (luettelo tunnetuista bugiisista versioista: %s)
 KeepDefaultValuesWamp=Käytit DoliWampin Dolibarrin ohjattua asennustoimintoa, joten tässä ehdotetut arvot on jo optimoitu. Muuta niitä vain, jos tiedät mitä olet tekemässä.
 KeepDefaultValuesDeb=Käytit Dolibarrin ohjattua asennustoimintoa Linux-paketista (Ubuntu, Debian, Fedora...), joten tässä ehdotetut arvot on jo optimoitu. Vain tietokanta omistajan salasana luo on annettava. Muuta muita parametreja vain, jos tiedät mitä olet tekemässä.

From 6d480ff78245cfeca859e204cc320f987672cc8f Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Tue, 20 Feb 2024 20:45:33 +0100
Subject: [PATCH 0034/1862] error in </span> tag (#28316)

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
---
 htdocs/langs/fi_FI/blockedlog.lang | 2 +-
 htdocs/langs/fi_FI/errors.lang     | 2 +-
 htdocs/langs/fi_FI/install.lang    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index 44b8923cc81..e422036e04c 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -20,7 +20,7 @@ Fingerprint=Sormenjälki
 DownloadLogCSV=Vie arkistoidut lokit (CSV)
 DataOfArchivedEvent=Täydelliset tiedot arkistoidusta tapahtumasta
 ImpossibleToReloadObject=Alkuperäistä objektia (tyyppi %s, tunnus %s) ei ole linkitetty (katso "Täydelliset tiedot" -sarake saadaksesi muuttumattomia tallennettuja tietoja)
-BlockedLogAreRequiredByYourCountryLegislation=Maasi lainsäädäntö saattaa edellyttää muuttumattomien lokien moduulia. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa <span class='notranslate'>vero<. /span> tarkastus.
+BlockedLogAreRequiredByYourCountryLegislation=Maasi lainsäädäntö saattaa edellyttää muuttumattomien lokien moduulia. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa <span class='notranslate'>vero</span> tarkastus.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Muuttamattomat lokit -moduuli otettiin käyttöön maasi lainsäädännön vuoksi. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa vero. span> tarkastus.
 BlockedLogDisableNotAllowedForCountry=Luettelo maista, joissa tämän moduulin käyttö on pakollista (että moduulia ei voida poistaa käytöstä virheellisesti, jos maasi on tässä luettelossa, moduulin poistaminen käytöstä ei ole mahdollista muokkaamatta ensin tätä luetteloa. Huomaa myös, että tämän moduulin käyttöönotto/poistaminen käytöstä seurata muuttumatonta Loki).
 OnlyNonValid=Ei kelvollinen
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index a5dc4cb57fb..82f16e6c10b 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -308,7 +308,7 @@ ErrorTableNotFound=Taulukkoa <b>%s</b> ei löydy
 ErrorRefNotFound=Viite <b>%s</b> ei löydy
 ErrorValueForTooLow=Arvo <b>%s</b> on liian pieni
 ErrorValueCantBeNull=Arvo <b>%s</b> ei voi olla tyhjä
-ErrorDateOfMovementLowerThanDateOfFileTransmission=Pankkitapahtuman päiväys ei voi olla pienempi kuin päiväys <span class='notranslate'>tiedosto<. /span> lähetys
+ErrorDateOfMovementLowerThanDateOfFileTransmission=Pankkitapahtuman päiväys ei voi olla pienempi kuin päiväys <span class='notranslate'>tiedosto</span> lähetys
 ErrorTooMuchFileInForm=Liikaa tiedostoja muodossa, enimmäismäärä on %s tiedosto(s)
 ErrorSessionInvalidatedAfterPasswordChange=Istunto mitätöitiin salasanan, sähköpostiosoitteen, tilan tai päivämäärät voimassaolon muutoksen vuoksi. Ole hyvä ja kirjaudu uudelleen.
 ErrorExistingPermission = Lupa <b>%s</b> objektille  <b>%s</b> on jo olemassa
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index b29587db107..87cf15d38a7 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -132,7 +132,7 @@ MigrationFinished=Muuttoliike valmis
 LastStepDesc=<strong>Viimeinen vaihe</strong>: Määritä tähän kirjautumissalasana, ja käytä yhteyden muodostamiseen Dolibarriin. <b>Älä hukkaa tätä, sillä se on päätili kaikkien muiden/lisäkäyttäjätilien hallinnassa.</b>
 ActivateModule=Aktivoi moduuli %s
 ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila)
-WarningUpgrade=Varoitus:\nTeitkö tietokanta varmuuskopion ensin?\nTämä on erittäin suositeltavaa. Tietojen katoaminen (esimerkiksi mysql-version 5.5.40/41/42/43 virheiden vuoksi) voi olla mahdollista tämän prosessin aikana, joten on tärkeää tehdä täydellinen vedos <span class='notranslate'>tietokanta<. /span> ennen kuin aloitat siirron.\n\nNapsauta OK aloittaaksesi siirtoprosessin...
+WarningUpgrade=Varoitus:\nTeitkö tietokanta varmuuskopion ensin?\nTämä on erittäin suositeltavaa. Tietojen katoaminen (esimerkiksi mysql-version 5.5.40/41/42/43 virheiden vuoksi) voi olla mahdollista tämän prosessin aikana, joten on tärkeää tehdä täydellinen vedos <span class='notranslate'>tietokanta</span> ennen kuin aloitat siirron.\n\nNapsauta OK aloittaaksesi siirtoprosessin...
 ErrorDatabaseVersionForbiddenForMigration=Versiosi tietokanta on %s. Siinä on kriittinen virhe, joka mahdollistaa tietojen menetyksen, jos teet siirtoprosessin edellyttämiä rakenteellisia muutoksia tietokanta. Tästä syystä siirtoa ei sallita, ennen kuin päivität tietokanta-laitteesi tasoversioksi (korjattu) (luettelo tunnetuista bugiisista versioista: %s)
 KeepDefaultValuesWamp=Käytit DoliWampin Dolibarrin ohjattua asennustoimintoa, joten tässä ehdotetut arvot on jo optimoitu. Muuta niitä vain, jos tiedät mitä olet tekemässä.
 KeepDefaultValuesDeb=Käytit Dolibarrin ohjattua asennustoimintoa Linux-paketista (Ubuntu, Debian, Fedora...), joten tässä ehdotetut arvot on jo optimoitu. Vain tietokanta omistajan salasana luo on annettava. Muuta muita parametreja vain, jos tiedät mitä olet tekemässä.

From 4fa736a6fa7a5aa91dc7c7f889ac0f4b596e0b63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2024 20:59:46 +0100
Subject: [PATCH 0035/1862] Fix closing tags

---
 htdocs/langs/am_ET/accountancy.lang | 35 -----------------------------
 htdocs/langs/am_ET/admin.lang       |  8 +++----
 htdocs/langs/en_US/errors.lang      | 22 +++++++++---------
 3 files changed, 15 insertions(+), 50 deletions(-)

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index e416c2c3c7c..ed0718c571a 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -327,41 +327,6 @@ NotReconciled=አልታረቅም።
 WarningRecordWithoutSubledgerAreExcluded=ማስጠንቀቂያ፣ ንዑስ መለያ የሌላቸው ሁሉም መስመሮች ተጣርተው ከዚህ እይታ የተገለሉ ናቸው።
 AccountRemovedFromCurrentChartOfAccount=አሁን ባለው የመለያዎች ገበታ ውስጥ የማይገኝ የሂሳብ አያያዝ
 
-## Admin
-BindingOptions=የማስያዣ አማራጮች
-ApplyMassCategories=የጅምላ ምድቦችን ተግብር
-AddAccountFromBookKeepingWithNoCategories=የሚገኝ መለያ ገና በግላዊ ቡድን ውስጥ የለም።
-CategoryDeleted=የሒሳብ መለያው ምድብ ተወግዷል
-AccountingJournals=የሂሳብ መጽሔቶች
-AccountingJournal=የሂሳብ መጽሔት
-NewAccountingJournal=አዲስ የሂሳብ ጆርናል
-ShowAccountingJournal=የሂሳብ መጽሔት አሳይ
-NatureOfJournal=የጆርናል ተፈጥሮ
-AccountingJournalType1=የተለያዩ ስራዎች
-AccountingJournalType2=ሽያጭ
-AccountingJournalType3=ግዢዎች
-AccountingJournalType4=ባንክ
-AccountingJournalType5=የወጪ ሪፖርቶች
-AccountingJournalType8=ቆጠራ
-AccountingJournalType9=የተያዙ ገቢዎች
-GenerationOfAccountingEntries=የሂሳብ ግቤቶች ማመንጨት
-ErrorAccountingJournalIsAlreadyUse=ይህ መጽሔት አስቀድሞ ጥቅም ላይ ውሏል
-AccountingAccountForSalesTaxAreDefinedInto=ማስታወሻ፡ ለሽያጭ ታክስ የሂሳብ አያያዝ መለያ በምናሌ ውስጥ ይገለጻል <b>%s</b>9a4b739f17f8z0 - <span class='notranslate'><b>%s</b>
-NumberOfAccountancyEntries=የመግቢያ ብዛት
-NumberOfAccountancyMovements=የእንቅስቃሴዎች ብዛት
-ACCOUNTING_DISABLE_BINDING_ON_SALES=በሽያጭ ላይ የሂሳብ አያያዝ እና ማስተላለፍን ያሰናክሉ (የደንበኛ ደረሰኞች በሂሳብ አያያዝ ውስጥ አይገቡም)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=በግዢዎች ላይ በሂሳብ አያያዝ ውስጥ ማሰር እና ማስተላለፍን ያሰናክሉ (የሻጭ ደረሰኞች በሂሳብ አያያዝ ውስጥ አይወሰዱም)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=በወጪ ሪፖርቶች ላይ የሂሳብ አያያዝ እና ማስተላለፍን ያሰናክሉ (የወጪ ሪፖርቶች በሂሳብ አያያዙም)
-ACCOUNTING_ENABLE_LETTERING=በሂሳብ አያያዝ ውስጥ የፊደል አጻጻፍ ተግባርን ያንቁ
-ACCOUNTING_ENABLE_LETTERING_DESC=እነዚህ አማራጮች ሲነቁ በእያንዳንዱ የሂሳብ መዝገብ ላይ የተለያዩ የሂሳብ እንቅስቃሴዎችን በአንድ ላይ ማቧደን እንዲችሉ ኮድ መግለፅ ይችላሉ። ቀደም ባሉት ጊዜያት, የተለያዩ መጽሔቶች በተናጥል ሲተዳደሩ, ይህ ባህሪ የተለያዩ መጽሔቶችን የመንቀሳቀስ መስመሮችን በአንድ ላይ ማቧደን አስፈላጊ ነበር. ነገር ግን፣ በዶሊባርር አካውንቲንግ፣ እንደዚህ ያለ የመከታተያ ኮድ፣ "<b>%s<span class='notranslate'>b09a4b78z09f17 span>" አስቀድሞ በራስ ሰር ተቀምጧል፣ ስለዚህ አውቶማቲክ ፊደላት አስቀድሞ ተከናውኗል፣ የስህተት ስጋት የለውም፣ ስለዚህ ይህ ባህሪ ለጋራ አጠቃቀም የማይጠቅም ሆኗል። በእጅ የፊደል አጻጻፍ ባህሪ በሂሳብ መዝገብ ውስጥ መረጃን ለማስተላለፍ የሚያደርገውን የኮምፒተር ሞተር ለማያምኑ ለዋና ተጠቃሚዎች ይሰጣል።
-EnablingThisFeatureIsNotNecessary=ይህንን ባህሪ ማንቃት ለጠንካራ የሂሳብ አያያዝ አስተዳደር አስፈላጊ አይሆንም።
-ACCOUNTING_ENABLE_AUTOLETTERING=ወደ አካውንቲንግ ሲተላለፉ አውቶማቲክ ፊደላትን አንቃ
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=የደብዳቤው ኮድ በራስ-ሰር ይፈልቃል እና ይጨምራል እናም በዋና ተጠቃሚ አልተመረጠም።
-ACCOUNTING_LETTERING_NBLETTERS=የፊደል አጻጻፍ ኮድ በሚፈጥሩበት ጊዜ የፊደሎች ብዛት (ነባሪ 3)
-ACCOUNTING_LETTERING_NBLETTERS_DESC=አንዳንድ የሂሳብ ሶፍትዌሮች ባለ ሁለት ፊደል ኮድ ብቻ ነው የሚቀበሉት። ይህ ግቤት ይህንን ገጽታ እንዲያዘጋጁ ያስችልዎታል. የነባሪ ፊደሎች ቁጥር ሦስት ነው።
-OptionsAdvanced=የላቁ አማራጮች
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=በአቅራቢዎች ግዢ ላይ የተጨማሪ እሴት ታክስ አስተዳደርን ያግብሩ
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=ይህ አማራጭ ሲነቃ፣ አቅራቢው ወይም የተሰጠው የአቅራቢ ደረሰኝ ወደ ሂሳብ ሒሳብ በተለየ መንገድ መተላለፍ እንዳለበት መግለፅ ይችላሉ፡ ተጨማሪ ዴቢት እና ክሬዲት መስመር በሂሳብ መዝገብ ውስጥ በ2 የተሰጡ ሂሳቦች በ‹‹< ውስጥ ከተገለፀው የመለያ ገበታው ላይ ይወጣሉ። span class='notranslate'>%s</span>" ማዋቀር ገጽ።
 
 ## Export
 NotExportLettering=ፋይሉን በሚፈጥሩበት ጊዜ ፊደሉን ወደ ውጭ አይላኩ
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index 4876ce5fddc..e3a0ab313ad 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -230,7 +230,7 @@ SeeReportPage=የሪፖርት ገጹን በ%s ላይ ይመልከቱ።
 SetOptionTo=አማራጭ <b>%s</b> ወደ <translate'> አዋቅር %s</span>
 Updated=ተዘምኗል
 AchatTelechargement=ይግዙ/ ያውርዱ
-GoModuleSetupArea=አዲስ ሞጁል ለማሰማራት/ለመጫን ወደ ሞጁል ማቀናበሪያ ቦታ ይሂዱ፡<a href="%s">%sb0e40dc658d 
+GoModuleSetupArea=አዲስ ሞጁል ለማሰማራት/ለመጫን ወደ ሞጁል ማቀናበሪያ ቦታ ይሂዱ፡<a href="%s">%sb0e40dc658d
 DoliStoreDesc=DoliStore፣ ለ Dolibarr ERP/CRM ውጫዊ ሞጁሎች ይፋዊ የገበያ ቦታ
 DoliPartnersDesc=ብጁ-የተገነቡ ሞጁሎችን ወይም ባህሪያትን የሚያቀርቡ ኩባንያዎች ዝርዝር።<br>ማስታወሻ፡ ዶሊባርር ክፍት ምንጭ መተግበሪያ ስለሆነ፣ <i>ማንኛውም ሰው</i>በ PHP ፕሮግራሚንግ ልምድ ያለው ሞጁል ማዘጋጀት መቻል አለበት።
 WebSiteDesc=ለተጨማሪ ተጨማሪ (ኮር-ያልሆኑ) ሞጁሎች ውጫዊ ድር ጣቢያዎች...
@@ -461,9 +461,9 @@ ComputedFormulaDesc=ተለዋዋጭ የተሰላ እሴት ለማግኘት ሌ
 Computedpersistent=የተሰላ መስክ ያከማቹ
 ComputedpersistentDesc=የተሰሉ ተጨማሪ መስኮች በመረጃ ቋቱ ውስጥ ይቀመጣሉ፣ ነገር ግን እሴቱ የሚሰላው የዚህ መስክ ነገር ሲቀየር ብቻ ነው። የተሰላው መስክ በሌሎች ነገሮች ወይም በአለምአቀፍ መረጃ ላይ የሚመረኮዝ ከሆነ ይህ ዋጋ የተሳሳተ ሊሆን ይችላል!!
 ExtrafieldParamHelpPassword=ይህንን መስክ ባዶ መተው ማለት ይህ ዋጋ ያለ ማመስጠር ይከማቻል ማለት ነው (መስክ በስክሪኑ ላይ በኮከቦች ተደብቋል)።<br><br>አስገባ እሴት 'ዶልክሪፕት' እሴትን በሚቀለበስ ምስጠራ ስልተቀመር ለመመስረት። አጽዳ ውሂብ አሁንም ሊታወቅ እና ሊስተካከል ይችላል ነገር ግን ወደ የውሂብ ጎታ የተመሰጠረ ነው።<br><br>'auto' (ወይም 'md5') አስገባ፣ 'sha256'፣ 'password_hash'፣ ...) የማይቀለበስ የሃሽ ይለፍ ቃል ወደ ዳታቤዝ ለማስቀመጥ ነባሪውን የይለፍ ቃል ምስጠራ አልጎሪዝም ለመጠቀም (ወይም md5፣ sha256፣ password_hash...) ለመጠቀም (የመጀመሪያውን እሴት ለማውጣት ምንም መንገድ የለም)
-ExtrafieldParamHelpselect=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2b0342fccfda19bz30,value2<span class='notranslate'>b0342fccfda19bz30</spanue span class='notranslate'><br>...<br><br>ዝርዝሩን በሌላ ላይ በመመስረት እንዲኖረን የተጨማሪ ባህሪ ዝርዝር፡<br>1,value1|አማራጮች_<i>parent_list_code<span class='notranselate'>350a parent_key<br>2,value2|አማራጮች_<i>parent_list_codeb0ae63750 class='notranslate'><br><br>ዝርዝሩን በሌላ ዝርዝር ለማግኘት፡<br>1, value1|<i>የወላጅ_ዝርዝር_code</i>:parent_keyb0342fccvalue'>b0342fccfvaluepan12| class='notranslate'><i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2b0342fccfda19bzvaluepan<30s span class='notranslate'><br>...
-ExtrafieldParamHelpradio=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2b0342fccfda19bzvaluepan<30s span class='notranslate'><br>...
+ExtrafieldParamHelpselect=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2'>3,value3><br>...<br><br>ዝርዝሩን በሌላ ላይ በመመስረት እንዲኖረን የተጨማሪ ባህሪ ዝርዝር፡<br>1,value1|አማራጮች_<i>parent_list_code<span class='notranselate'>350a parent_key<br>2,value2|አማራጮች_<i>parent_list_codeb0ae63750 class='notranslate'><br><br>ዝርዝሩን በሌላ ዝርዝር ለማግኘት፡<br>1, value1|<i>የወላጅ_ዝርዝር_code</i>:parent_keyb0342fccvalue'>b0342fccfvaluepan12| class='notranslate'><i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2,<br>...
 ExtrafieldParamHelpsellist=የእሴቶቹ ዝርዝር ከሠንጠረዥ ነው የሚመጣው<br>አገባብ፡ table_name:label_field:id_field::filtersql<br>ምሳሌ፡ c_typent:lib ::filtersql<br><br>- id_field የግድ ዋና የ int ቁልፍ ነውb0342fccfda19 - filtersql የ SQL ሁኔታ ነው። ገባሪ እሴትን ብቻ ለማሳየት ቀላል ሙከራ (ለምሳሌ active=1) ሊሆን ይችላል። ='notranslate'><br>በማጣሪያው ውስጥ SELECTን ለመጠቀም የፀረ-መርፌ ጥበቃን ለማለፍ $SEL$ የሚለውን ቁልፍ ይጠቀሙ።<br>በተጨማሪ ሜዳዎች ላይ ማጣራት ከፈለጉ use syntax extra.fieldcode=... (የመስክ ኮድ የኤክስትራፊልድ ኮድ በሆነበት)<br><br>ለመሆኑ ዝርዝር እንደ ሌላ ማሟያ አይነታ ዝርዝር፡<br>c_typent:libelle:id:options_<i>parent_list_code<span' class='translate'> </i></span>|parent_column:filter <br><br>ዝርዝሩን በሌላ ዝርዝር ለማግኘት<span ክፍል= 'notranslate'><br></span>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'></i>0
 ExtrafieldParamHelpchkbxlst=የእሴቶቹ ዝርዝር ከሠንጠረዥ ነው የሚመጣው<br>አገባብ፡ table_name:label_field:id_field::filtersql<br>ምሳሌ: c_typent:lib ::filtersql<br><br>ማጣሪያ ገባሪ እሴትን ብቻ ለማሳየት ቀላል ሙከራ (ለምሳሌ active=1) ሊሆን ይችላል<br>እንዲሁም $ID$ን በማጣሪያ ጠንቋይ መጠቀም ትችላለህ የአሁኑ ነገር መታወቂያ<br>በማጣሪያ ውስጥ ምረጥን ለማድረግ $SEL$<br>extrafields ላይ ማጣራት ከፈለግክ syntax extra.fieldcode=... (የመስክ ኮድ የኤክስትራፊልድ ኮድ የሆነበት)<br><br>ዝርዝሩን በሌላ ተጨማሪ የባህሪ ዝርዝር ላይ በመመስረት እንዲኖርዎት፡<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19z0>b0342fccfda19z0' z0 ዝርዝሩ እንደሌላው ዝርዝር እንዲኖር፡<br>c_typent:libelle:id:<i>parent_list_code</i>|የወላጅ_ዓምድ: ማጣሪያ
 ExtrafieldParamHelplink=መለኪያዎች ObjectName:Classpath<br>አገባብ መሆን አለባቸው የነገር ስም: ክፍል
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 71b2dccb2bf..cf721af6915 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -263,11 +263,11 @@ 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<> to allow use of Command Line Interface by the internal job scheduler
+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
-ErrorFilenameReserved=The filename <b>%s</b> can't be used as it is a reserved and protected command. 
+ErrorFilenameReserved=The filename <b>%s</b> can't be used as it is a reserved and protected command.
 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
@@ -312,24 +312,24 @@ ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transact
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
 ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, email, status or dates of validity. Please relogin.
 ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
-ErrorFieldExist=The value for <b>%s</b> already exist 
+ErrorFieldExist=The value for <b>%s</b> already exist
 ErrorEqualModule=Module invalid in <b>%s</b>
 ErrorFieldValue=Value for <b>%s</b> is incorrect
 ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
 ErrorUploadFileDragDrop=There was an error while the file(s) upload
-ErrorUploadFileDragDropPermissionDenied=There was an error while the file(s) upload : Permission denied 
+ErrorUploadFileDragDropPermissionDenied=There was an error while the file(s) upload : Permission denied
 ErrorFixThisHere=<a href="%s">Fix this here</a>
 ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you current instance (%s) does not match the URL defined into your OAuth2 login setup (%s). Doing OAuth2 login in such a configuration is not allowed.
 ErrorMenuExistValue=A Menu already exist with this Title or URL
-ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without the option %s 
-ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet 
+ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without the option %s
+ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet
 ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
 ErrorCountryCodeMustBe2Char=Country code must be a 2 character string
-ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces 
+ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces
 
 ErrorTableExist=Table <b>%s</b> already exist
 ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
-ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s 
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
 ErrorCheckTheCommandInsideTheAdvancedOptions=Check the command used for the export into the Advanced options of the export
 
 # Warnings
@@ -369,12 +369,12 @@ WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online
 WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Warning, this will also delete all existing pages/containers of the website. You should export your website before, so you have a backup to re-import it later.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
-WarningModuleNeedRefresh = Module <b>%s</b> has been disabled. Don't forget to enable it 
+WarningModuleNeedRefresh = Module <b>%s</b> has been disabled. Don't forget to enable it
 WarningPermissionAlreadyExist=Existing permissions for this object
-WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.  
+WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
 WarningCorrectedInvoiceNotFound=Corrected invoice not found
 WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
-WarningAlreadyReverse=Stock movement already reversed 
+WarningAlreadyReverse=Stock movement already reversed
 
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)

From 7dd9a448cb8d5d578343506c63e751f6dfcc0791 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Feb 2024 22:53:59 +0100
Subject: [PATCH 0036/1862] Fix lang files and add phpunit test to avoid bad <

---
 htdocs/langs/am_ET/errors.lang        |  2 +-
 htdocs/langs/am_ET/exports.lang       |  4 ++--
 htdocs/langs/am_ET/main.lang          |  3 +--
 htdocs/langs/am_ET/modulebuilder.lang |  2 +-
 htdocs/langs/am_ET/stocks.lang        |  6 +++---
 htdocs/langs/ar_SA/admin.lang         | 14 +++++++-------
 htdocs/langs/az_AZ/accountancy.lang   |  2 +-
 htdocs/langs/az_AZ/admin.lang         |  3 ++-
 htdocs/langs/he_IL/admin.lang         |  2 +-
 htdocs/langs/he_IL/main.lang          |  3 +--
 htdocs/langs/sq_AL/admin.lang         |  4 ++--
 test/phpunit/LangTest.php             |  7 +++++++
 12 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 4caaa3345f0..ec7a3df997c 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -263,7 +263,7 @@ ErrorReplaceStringEmpty=ስህተት፣ የሚተካው ሕብረቁምፊ ባ
 ErrorProductNeedBatchNumber=ስህተት፣ ምርት '<b>%s<span class='notranslate'></b></spanse>ቁጥር ብዙ ያስፈልገዋል
 ErrorProductDoesNotNeedBatchNumber=ስህተት፣ ምርት '<b>%s</b>ዕጣ አይቀበልም ተከታታይ ቁጥር
 ErrorFailedToReadObject=ስህተት፣ የነገር አይነት ማንበብ አልተሳካም <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=ስህተት፣ ፓራሜትር <b>%s</b>=span> ክፍል መንቃት አለበት 'notranslate'><b>conf/conf.php<> የትእዛዝ መስመር በይነገጽን በውስጣዊ የስራ መርሐግብር ለመጠቀም ያስችላል።
+ErrorParameterMustBeEnabledToAllwoThisFeature=ስህተት፣ ፓራሜትር <b>%s</b>=span> ክፍል መንቃት አለበት 'notranslate'><b>conf/conf.php</b> የትእዛዝ መስመር በይነገጽን በውስጣዊ የስራ መርሐግብር ለመጠቀም ያስችላል።
 ErrorLoginDateValidity=ስህተት፣ ይህ መግቢያ ከትክክለኛው የቀን ክልል ውጭ ነው።
 ErrorValueLength=የመስክ ርዝመት '<b>%s</b>ከ'' በላይ መሆን አለበት<span> span class='notranslate'><b></span>%s</b>'
 ErrorReservedKeyword=<b>%s</b> የሚለው ቃል የተያዘ ቁልፍ ቃል ነው።
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index f053588a0b7..25c717611bc 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -113,8 +113,8 @@ Separator=የመስክ መለያያ
 Enclosure=ሕብረቁምፊ Delimiter
 SpecialCode=ልዩ ኮድ
 ExportStringFilter=%% በጽሁፉ ውስጥ አንድ ወይም ከዚያ በላይ ቁምፊዎችን ለመተካት ይፈቅዳል.
-ExportDateFilter=አይይ, ያኪ, ያሂድም, አንድ አመት / YYYCHED, yyyyme, yyyyme, Yyyymd + yyyymd + yyyymd: span class='notranslate'><br></span> > ዓዓዓህ፣ > ዓዓዓህ፣ > ዓዓዓዓምዲ፡ ማጣሪያዎች በሁሉም በሚቀጥሉት ዓመታት/ወራቶች/ቀናቶች<br> <አህዋይ፣ <አህዋይ፣ አአአአአአአአ፡ ማጣሪያዎች በሁሉም ያለፉት አመታት/ወራቶች/ቀናቶች
-ExportNumericFilter=NNNNN በአንድ እሴት ያጣራል<br>NNNNN+NNNNN በተለያዩ የእሴቶች ክልል ላይ ያጣራል<br><span class='notranslate'>b208912a /span>> NNNNN በከፍተኛ እሴቶች ያጣራል።
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day1YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days2 > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days3 < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
+ExportNumericFilter=NNNNN filters by one value1NNNNN+NNNNN filters over a range of values2< NNNNN filters by lower values3> NNNNN filters by higher values
 ImportFromLine=ከመስመር ቁጥር ጀምሮ አስመጣ
 EndAtLineNb=በመስመር ቁጥር ጨርስ
 ImportFromToLine=ክልል ገድብ (ከ - ወደ)። ለምሳሌ. የራስጌ መስመር(ዎችን) ለመተው።
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index fa36fedbc52..9f0a052a02e 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -1239,7 +1239,7 @@ PublicVirtualCard=ምናባዊ የንግድ ካርድ
 TreeView=የዛፍ እይታ
 DropFileToAddItToObject=ወደዚህ ነገር ለማከል ፋይል ጣል ያድርጉ
 UploadFileDragDropSuccess=ፋይሉ በተሳካ ሁኔታ ተሰቅሏል።
-SearchSyntaxTooltipForStringOrNum=በጽሑፍ መስክ ውስጥ ለመፈለግ፣ 'በመጀመር ወይም በመጨረስ' ለመፈለግ ወይም ለመጠቀም ^ ወይም $ ቁምፊዎችን መጠቀም ትችላለህ። 'አልያዘም' ሙከራ ለማድረግ። መጠቀም ይችላሉ | ከ'AND' ይልቅ ለ'OR' ሁኔታ ከጠፈር ይልቅ በሁለት ሕብረቁምፊዎች መካከል። ለቁጥር እሴቶች፣ ከዋጋው በፊት የሂሳብ ንፅፅርን ተጠቅመው ለማጣራት ኦፕሬተሩን <, >፣ <=, >= ወይም != መጠቀም ትችላለህ።
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
 InProgress=በሂደት ላይ
 DateOfPrinting=የታተመበት ቀን
 ClickFullScreenEscapeToLeave=ወደ ሙሉ ስክሪን ሁነታ ለመቀየር እዚህ ጠቅ ያድርጉ። ከሙሉ ማያ ገጽ ሁነታ ለመውጣት ESCAPE ን ይጫኑ።
@@ -1259,4 +1259,3 @@ AmountSalary=የደመወዝ መጠን
 InvoiceSubtype=የክፍያ መጠየቂያ ንዑስ ዓይነት
 ConfirmMassReverse=የጅምላ ተገላቢጦሽ ማረጋገጫ
 ConfirmMassReverseQuestion=እርግጠኛ ነዎት %s የተመረጠውን መዝገብ(ዎች) መቀልበስ ይፈልጋሉ?
-
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 54c46265757..0a692f348f3 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -111,7 +111,7 @@ TriggerDefDesc=ከሞጁልዎ ውጪ የሆነ የንግድ ክስተት ሲፈ
 SeeIDsInUse=በእርስዎ ጭነት ላይ ጥቅም ላይ የዋሉ መታወቂያዎችን ይመልከቱ
 SeeReservedIDsRangeHere=የተያዙ መታወቂያዎችን ክልል ይመልከቱ
 ToolkitForDevelopers=ለ Dolibarr ገንቢዎች መሣሪያ ስብስብ
-TryToUseTheModuleBuilder=የSQL እና ፒኤችፒ እውቀት ካሎት ቤተኛ ሞጁል ገንቢ ዊዛርድን መጠቀም ይችላሉ።<br>ሞጁሉን <strong><span class ያንቁ ='notranslate'>%s</span></strong>እና <span class="fa fa-bug">='span><translate' class' የሚለውን በመጫን ጠንቋዩን ይጠቀሙ። ></span> በላይኛው ቀኝ ምናሌ ላይ።<br>ማስጠንቀቂያ፡ ይህ የላቀ የገንቢ ባህሪ ነው፣ b0aee83365837fz<0አይደረግም span class='notranslate'></b></span>በምርት ቦታህ ላይ ሙከራ አድርግ!
+TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.1Enable the module 2%s2 and use the wizard by clicking the 33 on the top right menu.4Warning: This is an advanced developer feature, do 5not5 experiment on your production site!
 SeeTopRightMenu=ከላይ በቀኝ ሜኑ ላይ <span class="fa fa-bug"></span>ን ይመልከቱ
 AddLanguageFile=የቋንቋ ፋይል ያክሉ
 YouCanUseTranslationKey=በቋንቋ ፋይል ውስጥ የሚገኘውን የትርጉም ቁልፍ የሆነውን ቁልፍ እዚህ መጠቀም ትችላለህ ("ቋንቋዎች" የሚለውን ትር ተመልከት)
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 7ea19e0d3fb..803b06aa1fd 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -145,8 +145,8 @@ ReplenishmentStatusDesc=ይህ ከተፈለገው አክሲዮን ያነሰ አ
 ReplenishmentStatusDescPerWarehouse=በአንድ መጋዘን በተገለፀው በተፈለገው መጠን መሰረት መሙላት ከፈለጉ በመጋዘኑ ላይ ማጣሪያ ማከል አለብዎት።
 ReplenishmentOrdersDesc=ይህ አስቀድሞ የተገለጹ ምርቶችን ጨምሮ የሁሉም ክፍት የግዢ ትዕዛዞች ዝርዝር ነው። አስቀድመው ከተገለጹ ምርቶች ጋር ክፍት ትዕዛዞች ብቻ ናቸው፣ ስለዚህ አክሲዮኖችን ሊነኩ የሚችሉ ትዕዛዞች እዚህ ይታያሉ።
 Replenishments=መሙላት
-NbOfProductBeforePeriod=ከተመረጠው ጊዜ በፊት ያለው የምርት መጠን %s (<%s)
-NbOfProductAfterPeriod=ከተመረጠው ጊዜ በኋላ (> %s ላይ ያለው የምርት መጠን %s
+NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
+NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=የጅምላ እንቅስቃሴ
 SelectProductInAndOutWareHouse=የምንጭ መጋዘን (አማራጭ)፣ የታለመ መጋዘን፣ ምርት እና መጠን ይምረጡ ከዚያ «%sን ጠቅ ያድርጉ። አንዴ ይህ ለሁሉም አስፈላጊ እንቅስቃሴዎች ከተሰራ በኋላ "%s ላይ ጠቅ ያድርጉ።
 RecordMovement=ማስተላለፍን ይመዝግቡ
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=በዚህ እንቅስቃሴ ወቅት ለሁሉ
 ImportFromCSV=የእንቅስቃሴ ዝርዝር CSV አስመጣ
 ChooseFileToImport=ፋይሉን ስቀል ከዚያም የ%s አዶን ጠቅ በማድረግ ፋይሉን እንደ ምንጭ አስመጪ ፋይል ለመምረጥ...
 SelectAStockMovementFileToImport=ለማስመጣት የአክሲዮን እንቅስቃሴ ፋይል ይምረጡ
-InfoTemplateImport=የተሰቀለው ፋይል ይህ ቅርጸት ሊኖረው ይገባል (* የግዴታ መስኮች ናቸው)፡<br>ምንጭ ማከማቻ* | ዒላማ መጋዘን* | ምርት* | ብዛት* | ሎት/ተከታታይ ቁጥር<br>CSV ቁምፊ መለያያ "<b>b0ecb><2ec87f49f0 መሆን አለበት span class='notranslate'></b>"
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial numberCSV character separator must be "%s"
 LabelOfInventoryMovemement=ክምችት %s
 ReOpen=እንደገና ክፈት
 ConfirmFinish=የእቃው መዘጋቱን አረጋግጠዋል? ይህ አክሲዮንዎን ወደ እቃው ያስገባዎትን ትክክለኛ ኪቲ ለማዘመን ሁሉንም የአክሲዮን እንቅስቃሴዎች ያመነጫል።
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 168ad0f6618..4f6e69f5cf9 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -39,7 +39,7 @@ UnlockNewSessions=إزالة قفل الإتصال
 YourSession=الجلسة الخاصة بك
 Sessions=جلسات المستخدمين
 WebUserGroup=خادم الويب المستخدم / المجموعة
-PermissionsOnFiles=أذونات في الملف 
+PermissionsOnFiles=أذونات في الملف
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=أذونات في الملف %s
 NoSessionFound=يبدو أن تكوين PHP الخاص بك لا يسمح بإدراج الجلسات النشطة. قد يتم حماية الدليل المستخدم لحفظ الجلسات (<b> %s </b>) (على سبيل المثال عن طريق أذونات نظام التشغيل أو عن طريق توجيه PHP open_basedir).
@@ -78,8 +78,8 @@ ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا
 ErrorCodeCantContainZero=الكود لا يمكن أن يحتوي على القيمة 0
 DisableJavascript=تعطيل عمليات الجافا و الأجاكس
 DisableJavascriptNote=ملاحظة: لغرض الاختبار أو التصحيح فقط. لتحسين أداء الشخص المكفوف أو المتصفحات النصية ، قد تفضل استخدام الإعداد في ملف تعريف المستخدم
-UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
-UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
+UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة ( > 100 000 )، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
+UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة ( > 100 000 )، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد الخاصة بالأطراف الثالثة ، <br> قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من الأطراف الثالثة ، ولكنه أقل ملاءمة.
 DelaiedFullListToSelectContact=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد جهات الاتصال. <br> قد يؤدي هذا إلى زيادة الأداء إذا كان لديك عدد كبير من جهات الاتصال ، ولكنه أقل ملاءمة.
 NumberOfKeyToSearch=عدد الأحرف لبدء البحث: %s
@@ -297,7 +297,7 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=مضيف SMTP/SMTPS
 MAIN_MAIL_EMAIL_FROM=البريد الإلكتروني للمرسل لرسائل البريد الإلكتروني التلقائية
 EMailHelpMsgSPFDKIM=لمنع تصنيف رسائل البريد الإلكتروني Dolibarr كرسائل غير مرغوب فيها، تأكد من أن الخادم مخول بإرسال رسائل بريد إلكتروني بهذه الهوية (عن طريق التحقق من تكوين SPF و DKIM لاسم المجال)
 MAIN_MAIL_ERRORS_TO=عنوان رسائل البريد الإلكترونية المرجعي لأخطاء الارسال (الحقل "الاخطاء إلى" ) في البريد المرسل
-MAIN_MAIL_AUTOCOPY_TO= نسخ (نسخة كربونية) كل رسائل البريد الإلكترونية المرسلة الى 
+MAIN_MAIL_AUTOCOPY_TO= نسخ (نسخة كربونية) كل رسائل البريد الإلكترونية المرسلة الى
 MAIN_DISABLE_ALL_MAILS=تعطيل جميع عمليات إرسال البريد الإلكتروني (لأغراض الاختبار أو العروض التوضيحية)
 MAIN_MAIL_FORCE_SENDTO=إرسال جميع رسائل البريد الإلكترونية الى (بدلا عن المستلم الحقيقي لاغراض التطوير والتجربة)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=اقتراح عناوين بريد الموظفين الإلكتروني (إذا كان موجودا) في حقل المستلمين عند ارنشاء رسالة بريد جديدة
@@ -2243,7 +2243,7 @@ PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=تضمين الاسم المستعار في
 THIRDPARTY_ALIAS=اسم الطرف الثالث - الاسم المستعار للطرف الثالث
 ALIAS_THIRDPARTY=الاسم المستعار لجهة خارجية - اسم الجهة الخارجية
 PDFIn2Languages=إظهار التسميات في ملف PDF بلغتين مختلفتين (قد لا تعمل هذه الميزة مع بعض اللغات)
-PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة 
+PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة
 PDF_USE_A=قم بإنشاء مستندات PDF بتنسيق PDF/A بدلاً من التنسيق الافتراضي PDF
 FafaIconSocialNetworksDesc=أدخل هنا رمز رمز FontAwesome. إذا كنت لا تعرف ما هو FontAwesome ، فيمكنك استخدام القيمة العامة fa-address-book.
 RssNote=ملاحظة: كل تعريف لمصدر اخبار مختصرة يوفر بريمج يجب تفعيله ليكون متاحا في لوحة المعلومات
@@ -2373,7 +2373,7 @@ CIDLookupURL=يقدم نموذج عنوان URL يمكن استخدامه بوا
 ScriptIsEmpty=لم يتم كتابة كود برمجي
 ShowHideTheNRequests=إظهار/إخفاء طلب (طلبات) SQL %s
 DefinedAPathForAntivirusCommandIntoSetup=حدد مسارًا لبرنامج مكافحة الفيروسات إلى <b>%s</b>
-TriggerCodes=أحداث قابله للاثارة 
+TriggerCodes=أحداث قابله للاثارة
 TriggerCodeInfo=أدخل هنا رمز (رموز) التشغيل التي يجب أن تنشئ منشورًا لطلب ويب (يُسمح فقط بعنوان URL الخارجي). يمكنك إدخال عدة رموز تشغيل مفصولة بفاصلة.
 EditableWhenDraftOnly=إذا لم يتم تحديدها، فلا يمكن تعديل القيمة إلا عندما يكون للكائن مسودة حالة
 CssOnEdit=CSS على صفحات التحرير
@@ -2388,7 +2388,7 @@ WarningDisabled=التحذيرات معطلة
 LimitsAndMitigation=حدود الوصول و التخفيف
 RecommendMitigationOnURL=It is recommended to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs.
 DesktopsOnly=الاجهزة المكتبية فقط
-DesktopsAndSmartphones=للموبايل و الاجهزة المكتبية 
+DesktopsAndSmartphones=للموبايل و الاجهزة المكتبية
 AllowOnlineSign=السماح بالتوقيع عبر الإنترنت
 AllowExternalDownload=السماح بالتنزيل الخارجي (بدون تسجيل الدخول، باستخدام رابط مشترك)
 DeadlineDayVATSubmission=الموعد النهائي لتقديم ضريبة القيمة المضافة في الشهر التالي
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 5bc6be391ab..d61db9131f8 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -360,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=Hərf kodu yaradan zaman hərflərin sayı (stand
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Bəzi mühasibat proqramları yalnız iki hərfli kodu qəbul edir. Bu parametr bu aspekti təyin etməyə imkan verir. Hərflərin standart sayı üçdür.
 OptionsAdvanced=Təkmilləşmiş Seçimlər
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Təchizatçı alışlarında ƏDV-nin əks ödənişinin idarə edilməsini aktivləşdirin
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Bu seçim aktiv olduqda, tədarükçünün və ya verilmiş satıcı hesab-fakturasının fərqli şəkildə mühasibat uçotuna köçürülməli olduğunu müəyyən edə bilərsiniz: "<"-də müəyyən edilmiş hesab planından 2 verilmiş hesab üzrə mühasibat uçotuna əlavə debet və kredit xətti yaradılacaq. span class='notranslate'>%s</span>" quraşdırma səhifəsi.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "" setup page.
 
 ## Export
 NotExportLettering=Fayl yaradarkən hərfləri ixrac etməyin
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index 08c24e89172..b25acaeb283 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -1971,7 +1971,8 @@ SomethingMakeInstallFromWebNotPossible=Xarici modulun quraşdırılması aşağ
 SomethingMakeInstallFromWebNotPossible2=Bu səbəbdən, burada təsvir edilən təkmilləşdirmə prosesi yalnız imtiyazlı istifadəçinin yerinə yetirə biləcəyi əl ilə həyata keçirilən prosesdir.
 InstallModuleFromWebHasBeenDisabledContactUs=Tətbiqdən xarici modulların və ya dinamik veb-saytların quraşdırılması və ya inkişafı təhlükəsizlik məqsədi ilə hazırda kilidlənib. Bu funksiyanı aktivləşdirmək lazımdırsa, bizimlə əlaqə saxlayın.
 InstallModuleFromWebHasBeenDisabledByFile=Tətbiqdən xarici modulun quraşdırılması administratorunuz tərəfindən deaktiv edilib. Buna icazə vermək üçün ondan <strong>%s</strong> faylını silməsini xahiş etməlisiniz. xüsusiyyət.
-ConfFileMustContainCustom=Tətbiqdən xarici modul quraşdırmaq və ya qurmaq üçün modul fayllarını <strong>%s qovluğunda saxlamaq lazımdır. </strong>. Bu kataloqun Dolibarr tərəfindən işlənməsi üçün siz <strong>conf/conf.php</strong> 2 direktiv sətir əlavə etmək üçün quraşdırmalısınız: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a106f><09fd ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49'>b0ecb2ec87f49;<spannotom/; '></strong>
+ConfFileMustContainCustom=
+Installing or building an external module from application need to save the module files into directory . To have this directory processed by Dolibarr, you must setup your conf/conf.php to add the 2 directive lines:$dolibarr_main_url_root_alt='/custom';$dolibarr_main_document_root_alt='/custom';
 HighlightLinesOnMouseHover=Siçan hərəkəti üzərindən keçəndə cədvəl xətlərini vurğulayın
 HighlightLinesColor=Siçan üzərindən keçəndə xəttin rəngini vurğulayın (vurğulanmamaq üçün "ffffff" istifadə edin)
 HighlightLinesChecked=Yoxlandıqda xəttin rəngini vurğulayın (vurğulanmamaq üçün "ffffff" istifadə edin)
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 4298f7869a1..a27c12a1e50 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -361,7 +361,7 @@ LastActivationIP=IP ההפעלה האחרון
 LastActivationVersion=גרסת ההפעלה האחרונה
 UpdateServerOffline=עדכן את השרת במצב לא מקוון
 WithCounter=נהל מונה
-GenericMaskCodes=אתה יכול להזין כל מסכת מספור. במסכה זו, ניתן להשתמש בתגים הבאים:<br><b>{000000}b09a4f739f<017f /span> מתאים למספר אשר יוגדל בכל <span class='notranslate'>%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). span class='notranslate'><br></span><b>{mm}</b> חודש (01 עד 12).<br><b>{yy}</b>,  {yyyy}</b> או <b>{y}</b> שנה מעל 2, 4 או 1 מספרים. <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:{000000} corresponds to a number which will be incremented on each . 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. {000000+000} same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first . {000000@x} 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. {dd} day (01 to 31).{mm} month (01 to 12).{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
 GenericMaskCodes2=<b>{cccc}</b> קוד הלקוח על n תווים<br><b>{cccc000}b0917b78z קוד הלקוח על n תווים ואחריו מונה המוקדש ללקוח. מונה זה המוקדש ללקוח מאופס במקביל למונה הגלובלי.<span class='notranslate'><br><b>b06a5f451419e8z </b> הקוד של סוג צד שלישי על n תווים (ראה תפריט בית - הגדרה - מילון - סוגי צדדים שלישיים). אם תוסיף תג זה, המונה יהיה שונה עבור כל סוג של צד שלישי.<br>
 GenericMaskCodes3=כל הדמויות האחרות מסכת יישאר ללא שינוי. <br> מקומות אסורים. <br>
 GenericMaskCodes3EAN=כל שאר התווים במסכה יישארו שלמים (למעט * או ? במיקום 13 ב-EAN13).<br>אין מותרים רווחים.<br> span>ב-EAN13, התו האחרון אחרי ה-} האחרון במיקום ה-13 צריך להיות * או ? . הוא יוחלף במפתח המחושב.<br>
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 54dc5a093c1..197cccf37c6 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -1048,7 +1048,7 @@ Select2NotFound=לא נמצאו תוצאות
 Select2Enter=להיכנס
 Select2MoreCharacter=או יותר אופי
 Select2MoreCharacters=או יותר דמויות
-Select2MoreCharactersMore=<strong>תחביר חיפוש:</strong><br><span'> class='notranslate <kbd></span><strong> |</strong>b0860de534da6f class='</spanda6f class notranslate'><kbd> או</kbd> (a|b)<br><span class='notranslate20'>b0601eczd>7a<b03aecd /span><strong>*</strong></kbd><kbd> כל תו</kbd> (a*b)<br>b03aecd27a span><span class='notranslate'><strong>^</strong></kbd> <kbd> התחל עם</kbd> (^ab)<br>b03aec07a60 <span class='notranslate'><strong>$</strong></kbd>203d<01ec0d>b03 /span> סיים ב<span class='notranslate'></kbd> (ab$)<br>
+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=טוען תוצאות נוספות...
 Select2SearchInProgress=חיפוש מתבצע...
 SearchIntoThirdparties=צדדים שלישיים
@@ -1259,4 +1259,3 @@ AmountSalary=סכום שכר
 InvoiceSubtype=תת סוג חשבונית
 ConfirmMassReverse=אישור הפוך בכמות גדולה
 ConfirmMassReverseQuestion=האם אתה בטוח שברצונך להפוך את %s הרשומות שנבחרו?
-
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 94184ed5ad2..bd5b1a3614d 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -250,8 +250,8 @@ Security=Siguria
 Passwords=Fjalëkalimet
 DoNotStoreClearPassword=Enkriptoni fjalëkalimet e ruajtura në bazën e të dhënave (JO si tekst i thjeshtë). Rekomandohet fuqimisht të aktivizoni këtë opsion.
 MainDbPasswordFileConfEncrypted=Enkriptoni fjalëkalimin e bazës së të dhënave të ruajtur në conf.php. Rekomandohet fuqimisht të aktivizoni këtë opsion.
-InstrucToEncodePass=Për të pasur fjalëkalim të koduar në skedarin <b>conf.php</b>, zëvendëso rreshtin cc<0192fz /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b014 >nga<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb9f2ec span class='notranslate'></b>
-InstrucToClearPass=Për të deshifruar (pastruar) fjalëkalimin në skedarin <b>conf.php</b>, zëvendësoni rreshtin <br><b>$dolibarr_main_db_pass="crypted:...";b09a4b739f17f8f8s0 ><br>nga<br><b>$dolibarr_main_db_pass'8fda19bz0<span> > ";</b>
+InstrucToEncodePass=To have password encoded into the 1conf.php1 file, replace the line 23$dolibarr_main_db_pass="...";34by56$dolibarr_main_db_pass="crypted:%s";6
+InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line $dolibarr_main_db_pass="crypted:...";by$dolibarr_main_db_pass="";
 ProtectAndEncryptPdfFiles=Mbroni skedarët PDF të krijuar. Kjo NUK rekomandohet pasi prish gjenerimin e PDF-ve në masë.
 ProtectAndEncryptPdfFilesDesc=Mbrojtja e një dokumenti PDF e mban atë të disponueshëm për t'u lexuar dhe printuar me çdo shfletues PDF. Megjithatë, redaktimi dhe kopjimi nuk është më i mundur. Vini re se përdorimi i kësaj veçorie bën që ndërtimi i PDF-ve të bashkuara globale të mos funksionojë.
 Feature=Veçori
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index e35abf51868..6774ed247f6 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -161,6 +161,13 @@ class LangTest extends CommonClassTest
 				$result = preg_match('/<<<<</m', $filecontent);	// A sequence of char we don't want
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result == 0, 'Found a sequence <<<<< into the translation file '.$code.'/'.$file.'. Probably a bad merge of code were done.');
+
+				if (!in_array($code, array('ar_SA'))) {
+					$reg = array();
+					$result = preg_match('/(.*)<([^a-z\/\s,=\(]1)/im', $filecontent, $reg);	// A sequence of char we don't want
+					//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+					$this->assertTrue($result == 0, 'Found a sequence tag '.$reg[1].'<'.$reg[2].' into the translation file '.$code.'/'.$file.'.');
+				}
 			}
 		}
 

From 75ad2e82fdb558fb72cdf58429e1f1bb5da0116d Mon Sep 17 00:00:00 2001
From: Eric <1468823+rycks@users.noreply.github.com>
Date: Tue, 20 Feb 2024 23:01:16 +0100
Subject: [PATCH 0037/1862] fix entity if interventions are shared between
 entities (#28317)

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 0205fec9e39..3bf1c5d5dfd 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -575,7 +575,8 @@ class Fichinter extends CommonObject
 			$sql .= ", date_valid = '".$this->db->idate($now)."'";
 			$sql .= ", fk_user_valid = ".((int) $user->id);
 			$sql .= " WHERE rowid = ".((int) $this->id);
-			$sql .= " AND entity = ".((int) $conf->entity);
+			$sql .= " AND entity IN (".getEntity('intervention').")";
+
 			$sql .= " AND fk_statut = 0";
 
 			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
@@ -603,7 +604,7 @@ class Fichinter extends CommonObject
 
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'ficheinter/".$this->db->escape($this->newref)."'";
-					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity IN (".getEntity('intervention').")";
 					$resql = $this->db->query($sql);
 					if (!$resql) {
 						$error++; $this->error = $this->db->lasterror();

From b343181789a1cc278d8baa9882c3cfbf71594aaf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 20 Feb 2024 23:02:59 +0100
Subject: [PATCH 0038/1862] Update phpunit.bat sample script and setup_conf.sh
 (#28307)

# Update phpunit.bat sample script and setup_conf.sh

- setup_conf.sh - Added caching feature;
- phpunit.bat - Example updated based on experience with php web server
---
 dev/setup/phpunit/PHPUNIT.BAT                 | 72 +++++++++++++++-
 dev/setup/phpunit/setup_conf.sh               | 83 +++++++++++++------
 .../codespell/codespell-lines-ignore.txt      |  1 +
 3 files changed, 128 insertions(+), 28 deletions(-)

diff --git a/dev/setup/phpunit/PHPUNIT.BAT b/dev/setup/phpunit/PHPUNIT.BAT
index 1df767c6c7e..b931a081528 100644
--- a/dev/setup/phpunit/PHPUNIT.BAT
+++ b/dev/setup/phpunit/PHPUNIT.BAT
@@ -1,6 +1,76 @@
+@ECHO OFF
 REM SAMPLE WINDOWS SCRIPT TO START TESTS
 REM
 REM CURRENTLY THIS SCRIPT MUST BE LOCATED AT THE ROOT OF THE PROJECT.
 REM A copy of phpunit-9.5.phar is required
+
+
 SET OPEN_BASEDIR=%~dp0
-c:\wamp64\bin\php\php7.4.33\php -dopen_basedir=%OPEN_BASEDIR%  .\phpunit-9.5.phar -d memory_limit=-1 -c test\phpunit\phpunittest.xml test\phpunit\AllTests.php
+SET DD_TRACE_CLI_ENABLED=1
+SET DD_TRACE_CLI_LOG_FILE=%~dp0/trace.log
+SET PHP=c:\wamp64\bin\php\php7.4.33\php
+
+REM c:\wamp64\bin\php\php7.4.33\php -dopen_basedir=%OPEN_BASEDIR%  .\phpunit-9.5.phar -d memory_limit=-1 -c test\phpunit\phpunittest.xml test\phpunit\AllTests.php --filter FilesLibTest --migrate-configuration
+REM Example: phpunit.bat test/phpunit/FilesLibTest.php --filter FilesLibTest::testDolDirMove
+REM
+
+REM The DOMAIN/Port value should be the same as in htdocs/conf/conf.php
+REM (This is only needed if did not set up another server locally
+REM  for your test installation database).
+SET PHPSERVER_DOMAIN_PORT=127.0.0.1:80
+SET PHPSERVER_LOG=%~dp0/php_serv.log
+GOTO :START
+
+REM The error handler
+:ERROR_HANDLER
+echo An error occurred.  Stop php server
+taskkill /F /PID %php_pid%
+exit /b 1
+
+:START
+
+start /B php -S %PHPSERVER_DOMAIN_PORT% -t htdocs > %PHPSERVER_LOG% 2>&1
+for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV /NH') do (
+    set "php_pid=%%~i"
+    goto :FOUND_PID
+)
+
+:FOUND_PID
+echo "Server PID: %php_pid%"
+curl "http://%PHPSERVER_DOMAIN_PORT%"
+
+
+SET MEMOPT=-d memory-limit=-1
+SET CONFOPT=-c test\phpunit\phpunittest.xml
+SET TESTS=test\phpunit\AllTests.php
+
+setlocal enabledelayedexpansion
+
+for %%i in (%*) do (
+    set "f=%%i"
+    if "!f:~0,12!"=="memory-limit" (
+        SET MEMOPT=""
+        goto :continue
+    )
+    if "%%i"=="-c" (
+        SET CONFOPT=""
+        goto :continue
+    )
+    if "!f:~-4!"==".php" (
+        set TESTS=""
+        goto :continue
+    )
+    :continue
+        REM NEEDED FOR CONTINUE
+
+)
+
+%PHP% -d display_errors=on -dopen_basedir=%OPEN_BASEDIR% .\phpunit-9.5.phar %MEMOPT% %CONFOPT% %TESTS% %*
+
+REM c:\wamp64\bin\php\php7.4.33\php -dopen_basedir=%OPEN_BASEDIR%  .\phpunit-9.5.phar -d memory_limit=-1 -c test\phpunit\phpunittest.xml test\phpunit\SecurityTest.php
+
+REM c:\wamp64\bin\php\php7.4.33\php -dopen_basedir=%OPEN_BASEDIR%  .\phpunit-9.5.phar -d memory_limit=-1 -c test\phpunit\phpunittest.xml
+REM c:\wamp64\bin\php\php7.4.33\php -dopen_basedir=%OPEN_BASEDIR%  .\phpunit-9.5.phar -d memory_limit=-1 test\phpunit\AllTests.php --filter FilesLibTest
+
+
+taskkill /F /PID %php_pid%
diff --git a/dev/setup/phpunit/setup_conf.sh b/dev/setup/phpunit/setup_conf.sh
index 7a23baab5db..9c11bb5f332 100755
--- a/dev/setup/phpunit/setup_conf.sh
+++ b/dev/setup/phpunit/setup_conf.sh
@@ -4,10 +4,12 @@
 
 TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR:=$(realpath "$(dirname "$0")/../../..")}
 MYSQL=${MYSQL:=mysql}
+MYSQLDUMP=${MYSQLDUMP:="${MYSQL}dump"}
 
 DB=${DB:=mariadb}
 DB_ROOT=${DB_ROOT:=root}
 DB_PASS=${DB_PASS:=}
+DB_CACHE_FILE="${TRAVIS_BUILD_DIR}/db_init.sql"
 
 TRAVIS_DOC_ROOT_PHP="${TRAVIS_DOC_ROOT_PHP:=$TRAVIS_BUILD_DIR/htdocs}"
 TRAVIS_DATA_ROOT_PHP="${TRAVIS_DATA_ROOT_PHP:=$TRAVIS_BUILD_DIR/documents}"
@@ -23,6 +25,18 @@ else
 fi
 CONF_FILE=${CONF_FILE:=${TRAVIS_BUILD_DIR}/htdocs/conf/conf.php}
 
+function save_db_cache() (
+	set -x
+	rm "${DB_CACHE_FILE}".md5 2>/dev/null
+	echo "Saving DB to cache file '${DB_CACHE_FILE}'"
+	${SUDO} "${MYSQLDUMP}" -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT travis \
+		--hex-blob --lock-tables=false --skip-add-locks \
+		| sed -e 's/DEFINER=[^ ]* / /' > ${DB_CACHE_FILE}
+	echo "${sum}" > "${DB_CACHE_FILE}".md5
+	set +x
+)
+
+
 if [ -r "${CONF_FILE}" ] ; then
 	echo "'${CONF_FILE} exists, not overwriting!"
 
@@ -55,6 +69,7 @@ else
 	echo
 fi
 
+load_cache=0
 echo "Setting up database '$DB'"
 if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
 	echo "MySQL stop"
@@ -71,6 +86,7 @@ if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; the
 		PASS_OPT="'-password=${DB_PASS}'"
 	fi
 	echo "MySQL set root password"
+
 	if [ 1 = 1 ]  ; then
 		CMDS=( \
 				""
@@ -110,8 +126,20 @@ if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; the
 	echo "MySQL flush"
 	${SUDO} "${MYSQL}" -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT -e 'FLUSH PRIVILEGES;'
 
-	echo "MySQL load sql"
-	${SUDO} "${MYSQL}" --force -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT -D travis < ${TRAVIS_BUILD_DIR}/dev/initdemo/mysqldump_dolibarr_3.5.0.sql | tee $TRAVIS_BUILD_DIR/initial_350.log
+	sum=$(find "${TRAVIS_BUILD_DIR}/htdocs/install" -type f -exec md5sum {} + | LC_ALL=C sort | md5sum)
+	load_cache=0
+	if [ -r "$DB_CACHE_FILE".md5 ] && [ -r "$DB_CACHE_FILE" ] && [ -x "$(which "${MYSQLDUMP}")" ] ; then
+		cache_sum="$(<"$DB_CACHE_FILE".md5)"
+		[ "$sum" = "$cache_sum" ] && load_cache=1
+	fi
+
+	if [ "$load_cache" = "1" ] ; then
+		echo "MySQL load cached sql"
+		${SUDO} "${MYSQL}" --force -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT -D travis < ${DB_CACHE_FILE} | tee $TRAVIS_BUILD_DIR/db_from_cacheinit.log
+	else
+		echo "MySQL load initial sql"
+		${SUDO} "${MYSQL}" --force -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT -D travis < ${TRAVIS_BUILD_DIR}/dev/initdemo/mysqldump_dolibarr_3.5.0.sql | tee $TRAVIS_BUILD_DIR/initial_350.log
+	fi
 elif [ "$DB" = 'postgresql' ]; then
 	echo Install pgsql if run is for pgsql
 
@@ -158,32 +186,33 @@ set +e
 	echo '$'force_install_prefix=\'llx_\'';'
 } > "$INSTALL_FORCED_FILE"
 
-(
-	cd "${TRAVIS_BUILD_DIR}/htdocs/install" || exit 1
+if [ "$load_cache" != "1" ] ; then
+	(
+		cd "${TRAVIS_BUILD_DIR}/htdocs/install" || exit 1
 
-	VERSIONS=("3.5.0" "3.6.0" "3.7.0" "3.8.0" "3.9.0")
-	VERSIONS+=("4.0.0")
-	VERSIONS+=("5.0.0" "6.0.0" "7.0.0" "8.0.0" "9.0.0")
-	VERSIONS+=("10.0.0" "11.0.0" "12.0.0" "13.0.0" "14.0.0")
-	VERSIONS+=("15.0.0" "16.0.0" "18.0.0" "19.0.0" "20.0.0")
-	pVer=${VERSIONS[0]}
-	for v in "${VERSIONS[@]:1}" ; do
-		LOGNAME="${TRAVIS_BUILD_DIR}/upgrade${pVer//./}${v//./}"
-		php upgrade.php "$pVer" "$v" ignoredbversion > "${LOGNAME}.log"
-		php upgrade2.php "$pVer" "$v" ignoredbversion > "${LOGNAME}-2.log"
-		php step5.php "$pVer" "$v" ignoredbversion > "${LOGNAME}-3.log"
-		pVer="$v"
-	done
+		VERSIONS=("3.5.0" "3.6.0" "3.7.0" "3.8.0" "3.9.0")
+		VERSIONS+=("4.0.0")
+		VERSIONS+=("5.0.0" "6.0.0" "7.0.0" "8.0.0" "9.0.0")
+		VERSIONS+=("10.0.0" "11.0.0" "12.0.0" "13.0.0" "14.0.0")
+		VERSIONS+=("15.0.0" "16.0.0" "18.0.0" "19.0.0" "20.0.0")
+		pVer=${VERSIONS[0]}
+		for v in "${VERSIONS[@]:1}" ; do
+			LOGNAME="${TRAVIS_BUILD_DIR}/upgrade${pVer//./}${v//./}"
+			php upgrade.php "$pVer" "$v" ignoredbversion > "${LOGNAME}.log"
+			php upgrade2.php "$pVer" "$v" ignoredbversion > "${LOGNAME}-2.log"
+			php step5.php "$pVer" "$v" ignoredbversion > "${LOGNAME}-3.log"
+			pVer="$v"
+		done
 
-	${SUDO} "${MYSQL}" --force -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT -D travis < "${TRAVIS_BUILD_DIR}/htdocs/install/mysql/migration/repair.sql"
+		${SUDO} "${MYSQL}" --force -u "$DB_ROOT" -h 127.0.0.1 $PASS_OPT -D travis < "${TRAVIS_BUILD_DIR}/htdocs/install/mysql/migration/repair.sql"
 
 
-	{
-		php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport
-		php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP
-		php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT
-		php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP
-		php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector
-	} > $TRAVIS_BUILD_DIR/enablemodule.log
-
-)
+		{
+			php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport
+			php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP
+			php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT
+			php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP
+			php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector
+		} > $TRAVIS_BUILD_DIR/enablemodule.log
+	) && save_db_cache
+fi
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 77b603de8a9..aeacfdccaa0 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -316,6 +316,7 @@ $usercanread = (($user->hasRight('stock', 'mouvement', 'lire')));
 * The hook contaxt thirdpartycard has been renamed thirdpartycontact
 * The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
 - New: Add proposals into referer page of thirdparty.
+for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV /NH') do (
 foreach ($TWeek as $week_number) {
 function checkES($IentOfi, $InumCta)
 function getFirstDayOfEachWeek($TWeek, $year)

From 9294662bb55b688023331703d10856405f61eefc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 12:13:04 +0100
Subject: [PATCH 0039/1862] QUAL Check lang files does not contains
 'notranslate'

---
 htdocs/langs/am_ET/accountancy.lang       |  4 --
 htdocs/langs/am_ET/admin.lang             | 59 -----------------------
 htdocs/langs/am_ET/agenda.lang            |  3 --
 htdocs/langs/am_ET/banks.lang             |  1 -
 htdocs/langs/am_ET/cashdesk.lang          |  2 -
 htdocs/langs/am_ET/errors.lang            | 18 -------
 htdocs/langs/am_ET/eventorganization.lang |  2 -
 htdocs/langs/am_ET/exports.lang           | 13 -----
 htdocs/langs/am_ET/holiday.lang           |  1 -
 htdocs/langs/am_ET/mails.lang             |  5 --
 test/phpunit/LangTest.php                 |  7 ++-
 11 files changed, 6 insertions(+), 109 deletions(-)

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index ed0718c571a..749eceae9c1 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -287,7 +287,6 @@ TotalVente=ከታክስ በፊት ጠቅላላ ገቢ
 TotalMarge=ጠቅላላ የሽያጭ ህዳግ
 
 DescVentilCustomer=ከመለያው ገበታ ወደ ምርት መለያ የታሰሩ (ወይም ያልሆኑ) የደንበኛ የክፍያ መጠየቂያ መስመሮችን ዝርዝር እዚህ ይመልከቱ
-DescVentilMore=በአብዛኛዎቹ ሁኔታዎች አስቀድሞ የተገለጹ ምርቶችን ወይም አገልግሎቶችን ከተጠቀሙ እና መለያውን (ከሂሳብ ሠንጠረዥ) በምርት/አገልግሎት ካርዱ ላይ ካስቀመጡት አፕሊኬሽኑ በሂሳብ መጠየቂያ መስመሮችዎ እና በገበታዎ የሂሳብ መዝገብ መካከል ያሉትን ሁሉንም ግንኙነቶች ማድረግ ይችላል። የመለያዎች፣ ልክ በአንድ ጠቅታ <strong>"%s"b0a65d071f6f6 >. መለያ በምርት/አገልግሎት ካርዶች ላይ ካልተዋቀረ ወይም አሁንም አንዳንድ ከመለያ ጋር ያልተያያዙ መስመሮች ካሉዎት ከ"<span class='notranslate'><strong><span" ምናሌ ውስጥ በእጅ ማሰር አለብዎት class='notranslate'>%s</span></strong>"።
 DescVentilDoneCustomer=የክፍያ መጠየቂያ ደረሰኞች ደንበኞችን ዝርዝር እና የምርት መለያቸውን ከመለያ ገበታ ይመልከቱ
 DescVentilTodoCustomer=የክፍያ መጠየቂያ መስመሮች አስቀድመው ከምርት መለያ ጋር ከመለያ ገበታ ላይ ያልታሰሩ
 ChangeAccount=ለተመረጡት መስመሮች የምርት/አገልግሎት መለያውን (ከሂሳብ ገበታ) በሚከተለው መለያ ይቀይሩ፡
@@ -433,15 +432,12 @@ AccountancyClosureConfirmAccountingReversal=እርግጠኛ ነዎት ለ"የተ
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=አንዳንድ አስገዳጅ የማዋቀር ደረጃዎች አልተደረጉም፣ እባክዎ ያጠናቅቁዋቸው
-ErrorNoAccountingCategoryForThisCountry=ለአገር ምንም የሂሳብ አያያዝ ቡድን የለም %s (%s ይመልከቱ - b0ecb2ec87f49fez0s <span class='notranslate'>%s)
-ErrorInvoiceContainsLinesNotYetBounded=አንዳንድ የክፍያ መጠየቂያ መጠየቂያ ደረሰኞችን <strong>%s<span class='notranslate'>b0a65d071f6fc9 ግን ለመመዝገብ ይሞክራሉ። አንዳንድ ሌሎች መስመሮች በሂሳብ አያያዝ መለያ ላይ ገና አልተገደቡም። ለዚህ ደረሰኝ የሁሉም የክፍያ መጠየቂያ መስመሮች ጋዜጠኝነት ውድቅ ተደርጓል።
 ErrorInvoiceContainsLinesNotYetBoundedShort=በክፍያ መጠየቂያ ላይ ያሉ አንዳንድ መስመሮች ከሂሳብ መዝገብ ጋር የተገናኙ አይደሉም።
 ExportNotSupported=የተቀናበረው ወደ ውጭ መላኪያ ቅርጸት በዚህ ገጽ ላይ አይደገፍም።
 BookeppingLineAlreayExists=በሂሳብ አያያዝ ውስጥ ቀድሞውኑ ያሉ መስመሮች
 NoJournalDefined=ምንም ጆርናል አልተገለጸም።
 Binded=መስመሮች ተያይዘዋል።
 ToBind=ለማሰር መስመሮች
-UseMenuToSetBindindManualy=መስመሮች ገና አልተጣመሩም ፣ ምናሌን ይጠቀሙ <a href="%s">%s<span class='notranslate'></a> binding> ለማድረግ በእጅ
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=ማስታወሻ፡ ይህ ሞጁል ወይም ገጽ ከሁኔታ ደረሰኞች የሙከራ ባህሪ ጋር ሙሉ ለሙሉ ተኳሃኝ አይደለም። አንዳንድ መረጃዎች የተሳሳቱ ሊሆኑ ይችላሉ።
 AccountancyErrorMismatchLetterCode=በማስታረቅ ኮድ ውስጥ አለመዛመድ
 AccountancyErrorMismatchBalanceAmount=ቀሪው (%s) ከ 0 ጋር እኩል አይደለም
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index e3a0ab313ad..e1fa86686e7 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -71,7 +71,6 @@ OSSetup=የስርዓተ ክወና ማዋቀር
 SecurityFilesDesc=ፋይሎችን ስለመስቀል ከደህንነት ጋር የተያያዙ አማራጮችን እዚህ ይግለጹ።
 ErrorModuleRequirePHPVersion=ስህተት፣ ይህ ሞጁል የPHP ስሪት %s ወይም ከዚያ በላይ ያስፈልገዋል
 ErrorModuleRequireDolibarrVersion=ስህተት፣ ይህ ሞጁል የዶሊባርር ስሪት %s ወይም ከዚያ በላይ ይፈልጋል።
-ErrorDecimalLargerThanAreForbidden=ስህተት፣ ትክክለኛነት ከ<b>%s<span class='notranslate'></b> አይደገፍም</span
 DictionarySetup=መዝገበ ቃላት ማዋቀር
 Dictionary=መዝገበ ቃላት
 ErrorReservedTypeSystemSystemAuto=ለዓይነት 'ስርዓት' እና 'systemauto' እሴት የተጠበቁ ናቸው። የራስዎን መዝገብ ለመጨመር 'ተጠቃሚ'ን እንደ እሴት መጠቀም ይችላሉ።
@@ -106,7 +105,6 @@ NextValueForInvoices=ቀጣይ ዋጋ (ደረሰኞች)
 NextValueForCreditNotes=ቀጣይ እሴት (የክሬዲት ማስታወሻዎች)
 NextValueForDeposit=ቀጣይ ዋጋ (ቅድመ ክፍያ)
 NextValueForReplacements=ቀጣይ እሴት (ምትክ)
-MustBeLowerThanPHPLimit=ማሳሰቢያ፡ የእርስዎ ፒኤችፒ ውቅር በአሁኑ ጊዜ ወደ <b>%sb09a4b739f17f17f17f ለመስቀል ከፍተኛውን የፋይል መጠን ይገድባል። span> <span class='notranslate'>%s፣ የዚህ ግቤት ዋጋ ምንም ይሁን ምን
 NoMaxSizeByPHPLimit=ማስታወሻ፡ በእርስዎ ፒኤችፒ ውቅር ውስጥ ምንም ገደብ አልተዘጋጀም።
 MaxSizeForUploadedFiles=ለተሰቀሉ ፋይሎች ከፍተኛው መጠን (ማንኛውንም ሰቀላ ላለመፍቀድ 0)
 UseCaptchaCode=በግራፊክ ኮድ (CAPTCHA) በመግቢያ ገፅ እና አንዳንድ የህዝብ ገፆች ላይ ተጠቀም
@@ -150,7 +148,6 @@ AllWidgetsWereEnabled=ሁሉም የሚገኙ መግብሮች ነቅተዋል።
 WidgetAvailable=መግብር ይገኛል።
 PositionByDefault=ነባሪ ትእዛዝ
 MenusDesc=የምናሌ አስተዳዳሪዎች የሁለቱን ምናሌ አሞሌዎች (አግድም እና አቀባዊ) ይዘት ያዘጋጃሉ።
-MenusEditorDesc=የምናሌ አርታዒው ብጁ የምናሌ ግቤቶችን እንዲገልጹ ይፈቅድልዎታል. አለመረጋጋትን እና በቋሚነት የማይደረስ የሜኑ ግቤቶችን ለማስወገድ በጥንቃቄ ይጠቀሙ።<br>አንዳንድ ሞጁሎች የምናሌ ግቤቶችን ይጨምራሉ (በምናሌው <b>ሁሉም<span class) ='notranslate'></b></span> በብዛት)። ከእነዚህ ግቤቶች አንዳንዶቹን በስህተት ካስወገዱ፣ ሞጁሉን ማሰናከል እና እንደገና ማንቃትን ወደነበሩበት መመለስ ይችላሉ።
 MenuForUsers=ለተጠቃሚዎች ምናሌ
 LangFile=.lang ፋይል
 Language_en_US_es_MX_etc=ቋንቋ (en_US፣ es_MX፣ ...)
@@ -159,11 +156,9 @@ SystemInfo=የስርዓት መረጃ
 SystemToolsArea=የስርዓት መሳሪያዎች አካባቢ
 SystemToolsAreaDesc=ይህ አካባቢ የአስተዳደር ተግባራትን ያቀርባል. አስፈላጊውን ባህሪ ለመምረጥ ምናሌውን ይጠቀሙ.
 Purge=ማጽዳት
-PurgeAreaDesc=ይህ ገጽ በዶሊባርር የተፈጠሩትን ወይም የተከማቹ ፋይሎችን በሙሉ (ጊዜያዊ ፋይሎች ወይም በ<b>%s<span class= ውስጥ ያሉ ፋይሎችን በሙሉ እንድትሰርዝ ይፈቅድልሃል። 'notranslate'></b></span> ማውጫ)። ይህንን ባህሪ መጠቀም በተለምዶ አስፈላጊ አይደለም. ዶሊባርር በድር አገልጋይ የተፈጠሩ ፋይሎችን ለመሰረዝ ፍቃድ በማይሰጥ አገልግሎት አቅራቢ ለተስተናገደላቸው ተጠቃሚዎች እንደ መፍትሄ ሆኖ ቀርቧል።
 PurgeDeleteLogFile=የምዝግብ ማስታወሻ ፋይሎችን ይሰርዙ፣ <b>%s</b> ሞጁል ለSpanys የተገለጸ ውሂብ የማጣት አደጋ)
 PurgeDeleteTemporaryFiles=ሁሉንም የምዝግብ ማስታወሻዎች እና ጊዜያዊ ፋይሎችን ሰርዝ (ውሂብ የማጣት አደጋ የለም)። መለኪያ 'tempfilesold'፣ 'logfiles' ወይም ሁለቱም 'tempfilesold+logfiles' ሊሆን ይችላል። ማሳሰቢያ፡- ጊዜያዊ ፋይሎችን መሰረዝ የሚደረገው የቴምፕ ዳይሬክተሩ ከ24 ሰአት በፊት ከተፈጠረ ብቻ ነው።
 PurgeDeleteTemporaryFilesShort=ሎግ እና ጊዜያዊ ፋይሎችን ሰርዝ (ውሂብ የማጣት አደጋ የለም)
-PurgeDeleteAllFilesInDocumentsDir=በማውጫው ውስጥ ያሉትን ሁሉንም ፋይሎች ይሰርዙ፡ <b>%s</b>። 'notranslate'><br></span>ይህ ከኤለመንቶች (ሶስተኛ ወገኖች፣ ደረሰኞች ወዘተ...)፣ ወደ ኢሲኤም ሞጁል የተሰቀሉ ፋይሎችን፣ የውሂብ ጎታ መጠባበቂያ ክምችቶችን እና ጊዜያዊ ፋይሎች ጋር የተያያዙ ሁሉንም የመነጩ ሰነዶችን ይሰርዛል።
 PurgeRunNow=አሁን ያጽዱ
 PurgeNothingToDelete=ምንም ማውጫ ወይም የሚሰረዙ ፋይሎች የሉም።
 PurgeNDirectoriesDeleted=<b>%s</b> ፋይሎች ወይም ማውጫዎች ተሰርዘዋል።
@@ -214,7 +209,6 @@ OnlyActiveElementsAreShown=የ<a href="%s">የነቁ ሞጁሎች</a> አባሎ
 ModulesDesc=ሞጁሎቹ/መተግበሪያዎቹ የትኞቹ ባህሪያት በሶፍትዌሩ ውስጥ እንደሚገኙ ይወስናሉ። አንዳንድ ሞጁሎች ሞጁሉን ካነቃቁ በኋላ ለተጠቃሚዎች ፈቃድ እንዲሰጡ ይፈልጋሉ። የእያንዳንዱን ሞጁል ለማንቃት <span class="small valignmiddle">%s</span> የሚለውን ቁልፍ ጠቅ ያድርጉ። ወይም ሞጁል/መተግበሪያን አሰናክል።
 ModulesDesc2=ሞጁሉን ለማዋቀር የዊል አዝራሩን <span class="small valignmiddle">%s</span>ን ጠቅ ያድርጉ።
 ModulesMarketPlaceDesc=በበይነመረቡ ላይ በውጫዊ ድረ-ገጾች ላይ የሚወርዱ ተጨማሪ ሞጁሎችን ማግኘት ይችላሉ...
-ModulesDeployDesc=በፋይል ስርዓትዎ ላይ ያሉ ፈቃዶች የሚፈቅዱ ከሆነ ውጫዊ ሞጁሉን ለማሰማራት ይህንን መሳሪያ መጠቀም ይችላሉ። ከዚያ ሞጁሉ በትር ላይ ይታያል <strong>%s<span class='notranslate'></strong></span.
 ModulesMarketPlaces=ውጫዊ መተግበሪያ/ሞጁሎችን ያግኙ
 ModulesDevelopYourModule=የራስዎን መተግበሪያ/ሞዱሎች ይገንቡ
 ModulesDevelopDesc=እንዲሁም የራስዎን ሞጁል ማዳበር ወይም አንዱን ለእርስዎ የሚያዘጋጅ አጋር ማግኘት ይችላሉ።
@@ -222,7 +216,6 @@ DOLISTOREdescriptionLong=ውጫዊ ሞጁል ለማግኘት <a href="https://ww
 FreeModule=ፍርይ
 CompatibleUpTo=ከስሪት %s ጋር ተኳሃኝ
 NotCompatible=ይህ ሞጁል ከእርስዎ Dolibarr ጋር የሚስማማ አይመስልም %s (ደቂቃ %s - ከፍተኛ b0ecb2fz0 span>)
-CompatibleAfterUpdate=ይህ ሞጁል የእርስዎን Dolibarr ማሻሻያ ይፈልጋል %s (Min %s - ከፍተኛ <span class='notranslate'>b0ecb2ec87fe49fe >)
 SeeInMarkerPlace=በገበያ ቦታ ይመልከቱ
 SeeSetupOfModule=የሞጁሉን ማዋቀር ይመልከቱ %s
 SeeSetupPage=የማዋቀር ገጽ በ%s ላይ ይመልከቱ።
@@ -250,8 +243,6 @@ Security=ደህንነት
 Passwords=የይለፍ ቃሎች
 DoNotStoreClearPassword=በመረጃ ቋት ውስጥ የተከማቹ የይለፍ ቃላትን ኢንክሪፕት ያድርጉ (እንደ ግልጽ ጽሑፍ አይደለም)። ይህንን አማራጭ ለማንቃት በጥብቅ ይመከራል.
 MainDbPasswordFileConfEncrypted=በ conf.php ውስጥ የተከማቸ የውሂብ ጎታ ይለፍ ቃል ያመስጥር። ይህንን አማራጭ ለማንቃት በጥብቅ ይመከራል.
-InstrucToEncodePass=በ<b>conf.php</b> ፋይል ውስጥ የይለፍ ቃል እንዲቀመጥ ለማድረግ የb0342fccfda /span><span class='notranslate'><b>$dolibarr_main_db_pass...";</b>b0342fcc0 > በ<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb9>fz0"b0ecb2ec8fe span class='notranslate'></b></span>
-InstrucToClearPass=በ<b>conf.php</b> ፋይል ውስጥ የይለፍ ቃል ዲኮድ ለማድረግ (ግልጽ)፣ የ<span class='notranslate' የሚለውን መስመር ይተኩ ><br></span><b>$dolibarr_main_db_pass="crypted:...";b09a4b739f17f8zlate'=notranslate'>b09a4b739f17f8zlate' ><br>በ<br><b>$dolibarr_main_db_pass="<ctranslate's=0" ";</b>
 ProtectAndEncryptPdfFiles=የተፈጠሩ ፒዲኤፍ ፋይሎችን ይጠብቁ። የጅምላ ፒዲኤፍ መፈጠርን ስለሚሰብር ይህ አይመከርም።
 ProtectAndEncryptPdfFilesDesc=የፒዲኤፍ ሰነድ ጥበቃ በማንኛውም ፒዲኤፍ አሳሽ ለማንበብ እና ለማተም ያስችላል። ሆኖም፣ ማረም እና መቅዳት ከአሁን በኋላ አይቻልም። ይህን ባህሪ መጠቀም አለምአቀፍ የተዋሃዱ ፒዲኤፎችን መገንባት አይሰራም።
 Feature=ባህሪ
@@ -268,8 +259,6 @@ OtherResources=ሌሎች ሀብቶች
 ExternalResources=የውጭ ሀብቶች
 SocialNetworks=ማህበራዊ አውታረ መረቦች
 SocialNetworkId=የማህበራዊ አውታረ መረብ መታወቂያ
-ForDocumentationSeeWiki=ለተጠቃሚ ወይም ለገንቢ ሰነድ (ሰነድ፣ ተደጋጋሚ ጥያቄዎች...)፣<br>Dolibarr Wikiን ይመልከቱ፡<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sc6570ec6570e <span class='notranslate'></b>
-ForAnswersSeeForum=ለማንኛውም ሌላ ጥያቄ/እገዛ የዶሊባርር መድረክን መጠቀም ትችላለህ፡<br><b>b00fab50ead932z /span><span class='notranslate'>%s</a></b>
 HelpCenterDesc1=በ Dolibarr እርዳታ እና ድጋፍ ለማግኘት አንዳንድ ግብዓቶች እዚህ አሉ።
 HelpCenterDesc2=ከእነዚህ ሃብቶች ውስጥ አንዳንዶቹ የሚገኙት በ<b>amharic</b> ውስጥ ብቻ ነው።
 CurrentMenuHandler=የአሁኑ ምናሌ ተቆጣጣሪ
@@ -290,8 +279,6 @@ EMailsSetup=ኢሜይሎች ማዋቀር
 EMailsDesc=ይህ ገጽ ኢሜል ለመላክ መለኪያዎችን ወይም አማራጮችን እንዲያዘጋጁ ይፈቅድልዎታል።
 EmailSenderProfiles=ኢሜይሎች ላኪ መገለጫዎች
 EMailsSenderProfileDesc=ይህንን ክፍል ባዶ ማድረግ ይችላሉ. አንዳንድ ኢሜይሎችን እዚህ ካስገቡ፣ አዲስ ኢሜል ሲጽፉ ወደ ጥምር ሳጥን ውስጥ ሊሆኑ ከሚችሉ ላኪዎች ዝርዝር ውስጥ ይታከላሉ።
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS ወደብ (ነባሪው ዋጋ በphp.ini ውስጥ፡ <b>%s<span class='notranslate'>b09a4b739f >>
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS አስተናጋጅ (ነባሪ እሴት በphp.ini ውስጥ፡ <b>%s<span class='notranslate'>b09a4f738f >>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS ወደብ
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS አስተናጋጅ
 MAIN_MAIL_EMAIL_FROM=ለራስ ሰር ኢሜይሎች ላኪ
@@ -345,12 +332,10 @@ ThisIsAlternativeProcessToFollow=ይህ በእጅ ለማስኬድ አማራጭ 
 StepNb=ደረጃ %s
 FindPackageFromWebSite=የሚፈልጉትን ባህሪያት የሚያቀርብ ጥቅል ያግኙ (ለምሳሌ በኦፊሴላዊው ድረ-ገጽ %s ላይ)።
 DownloadPackageFromWebSite=ጥቅል አውርድ (ለምሳሌ ከኦፊሴላዊው ድረ-ገጽ %s)።
-UnpackPackageInDolibarrRoot=የታሸጉትን ፋይሎች ወደ Dolibarr አገልጋይ ማውጫዎ ይንቀሉ/ይንቀሏቸው፡ <b>%s<span class='notranslate'>b09a4b738 >
 UnpackPackageInModulesRoot=ውጫዊ ሞጁሉን ለማሰማራት/ለመጫን የማህደር ፋይሉን ለውጫዊ ሞጁሎች ወደተዘጋጀው የአገልጋይ ማውጫ ውስጥ መንቀል/መፍታት አለብህ፡<br><b>%s</b>
 SetupIsReadyForUse=የሞዱል ዝርጋታ አልቋል። ነገር ግን ወደ ገጹ ማቀናበሪያ ሞጁሎች በመሄድ ሞጁሉን በመተግበሪያዎ ውስጥ ማንቃት እና ማዋቀር አለብዎት፡ <a href="%s">%s</a>።
 NotExistsDirect=ተለዋጭ ስርወ ማውጫው አሁን ላለው ማውጫ አልተገለጸም።<br>
 InfDirAlt=ከስሪት 3 ጀምሮ፣ አማራጭ ስርወ ማውጫን መግለፅ ይቻላል። ይህ ወደ ተለየ ማውጫ፣ ተሰኪዎች እና ብጁ አብነቶች እንዲያከማቹ ያስችልዎታል።<br>በ Dolibarr ስር ማውጫ ላይ (ለምሳሌ፡ ብጁ) ብቻ ፍጠር።<br>
-InfDirExample=<br>ከዚያ በፋይሉ ውስጥ አውጁት <strong>conf.phpb0a65d071f6fc9z class='notranslate'><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt/h. 'notranslate'><br></span>እነዚህ መስመሮች በ"#" አስተያየት ከተሰጡ እነሱን ለማስቻል የ"#" ቁምፊን በማስወገድ አስተያየት አይስጡ።
 YouCanSubmitFile=የሞጁሉን ጥቅል የዚፕ ፋይል ከዚህ መስቀል ይችላሉ፡-
 CurrentVersion=Dolibarr የአሁኑ ስሪት
 CallUpdatePage=የውሂብ ጎታውን አወቃቀር እና ውሂብ ወደሚያዘምነው ገጽ አስስ፡ %s።
@@ -361,22 +346,12 @@ LastActivationIP=የቅርብ ጊዜ ማግበር አይፒ
 LastActivationVersion=የቅርብ ጊዜ ማግበር ስሪት
 UpdateServerOffline=አገልጋዩን ከመስመር ውጭ ያዘምኑ
 WithCounter=ቆጣሪ ያስተዳድሩ
-GenericMaskCodes=ማንኛውንም የቁጥር ጭንብል ማስገባት ይችላሉ። በዚህ ጭንብል ውስጥ፣ የሚከተሉትን መለያዎች መጠቀም ይቻላል፡<br><b>{000000}b09a17389 /span> በእያንዳንዱ <span class='notranslate'>%s ላይ ከሚጨመር ቁጥር ጋር ይዛመዳል። የሚፈለገውን ያህል የቆጣሪው ርዝመት ያህል ዜሮዎችን አስገባ። እንደ ጭምብሉ ብዙ ዜሮዎች እንዲኖረው ቆጣሪው ከግራ በኩል በዜሮዎች ይጠናቀቃል። <br><b>{000000+000}b09a4b739f17f80 ጋር ተመሳሳይ ነው ከ+ ምልክቱ በስተቀኝ ካለው ቁጥር ጋር የሚዛመድ ማካካሻ ከመጀመሪያው <span class='notranslate'>%s ጀምሮ ይተገበራል። <br><b>{000000@x}</b> ከቀዳሚው ጋር ግን ተመሳሳይ ነው ወር x ሲደርስ ቆጣሪው ወደ ዜሮ ይጀመራል (x በ 1 እና 12 መካከል፣ ወይም 0 በእርስዎ ውቅር ውስጥ የተገለጹትን የበጀት ዓመት የመጀመሪያ ወራት ለመጠቀም ፣ ወይም 99 በየወሩ ወደ ዜሮ ለማስጀመር)። ይህ አማራጭ ጥቅም ላይ የሚውል ከሆነ እና x 2 ወይም ከዚያ በላይ ከሆነ፣ ቅደም ተከተል {yy}{mm} ወይም {yyyy}{mm}ም ያስፈልጋል። <span class='notranslate'><br><b>{dd}</b> ቀን (ከ 01 እስከ 01)። span class='notranslate'><br></span><b>{mm}</b> ወር (01 እስከ 1)። class='notranslate'><br></span><b>{yy}</b>, <spanlate'3='5 </span>{yyyy}</b> ወይም <b>{y}b09a4b78zpan ከ 2 ፣ 4 ወይም 1 ቁጥሮች በላይ ዓመት። <span class='notranslate'><br>
-GenericMaskCodes2=<b>{cccc}</b>የደንበኛ ኮድ በ ns ላይ<s notranslate'><br></span><b>{cccc000}b030f17f ደንበኛ በ n ቁምፊዎች ላይ ለደንበኛው የተሰጠ ቆጣሪ ይከተላል. ይህ ለደንበኛ የተወሰነ ቆጣሪ ከዓለም አቀፉ ቆጣሪ ጋር በተመሳሳይ ጊዜ ዳግም ይጀመራል።<span class='notranslate'><br><b>b06a5f4510419e </b> በ n ቁምፊዎች ላይ የሶስተኛ ወገን አይነት ኮድ (ሜኑ ይመልከቱ - ማዋቀር - መዝገበ ቃላት - የሶስተኛ ወገኖች አይነቶች)። ይህን መለያ ካከሉ፣ ቆጣሪው ለእያንዳንዱ የሶስተኛ ወገን አይነት የተለየ ይሆናል።<br>
 GenericMaskCodes3=በጭምብሉ ውስጥ ያሉት ሁሉም ሌሎች ቁምፊዎች ሳይበላሹ ይቆያሉ።<br>Spaces አይፈቀዱም።<br>
-GenericMaskCodes3EAN=በጭምብሉ ውስጥ ያሉት ሁሉም ሌሎች ቁምፊዎች ሳይበላሹ ይቆያሉ (ከ* ወይም ? በ EAN13 13ኛ ቦታ ላይ)።<br>Spaces አይፈቀዱም።<br></span span>በEAN13 ውስጥ፣ ከመጨረሻው በኋላ ያለው የመጨረሻው ቁምፊ በ13ኛ ደረጃ * ወይም ? . በተሰላው ቁልፍ ይተካል።<span class='notranslate'><br>
-GenericMaskCodes4a=<u>ምሳሌ በሶስተኛ ወገን TheCompany 99ኛው %s ላይ ከ2023-01-31:<span class='notranslate' '></u></span><br>
-GenericMaskCodes4b=<u>ምሳሌ በሶስተኛ ወገን ላይ የተፈጠረው በ2023-01-31፡</u><span class='notranslate'>b0342fccfda19 >
-GenericMaskCodes4c=<u>በ2023-01-31 የተፈጠረ ምርት ላይ ምሳሌ፡</u><span class='notranslate'>b0342fccfda19b>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ለb05837fz. span>ABC2301-000099<span class='notranslate'></b><br>b0aee8336583f>b0aee8336583 }-ZZZ/{dd}/XXX<span class='notranslate'></b> <b>0199-ZZZ/31/XXX<span class='notranslate' ይሰጣል '></b></span><br><b>IN{yy}{mm}-{0000}-{t} class='notranslate'></b></span> ለ<b>IN2301-0099-A<span class='notranslate'>b09a4b739f17f>የኩባንያው አይነት ከሆነ</spanz>ይሰጠዋል። 'ተጠያቂ ኢንስክሪፕቶ' ከአይነት ኮድ ጋር 'A_RI'
 GenericNumRefModelDesc=በተወሰነ ጭምብል መሰረት ሊበጅ የሚችል ቁጥር ይመልሳል።
-ServerAvailableOnIPOrPort=አገልጋይ በ<b>%s</b>=span> ወደቦች ላይ ይገኛል። 'notranslate'><b>%s</b>
-ServerNotAvailableOnIPOrPort=አገልጋይ በ<b>%s</b> ወደብ ላይ አይገኝም። ='notranslate'><b></span>%s</b>
 DoTestServerAvailability=የአገልጋይ ግንኙነትን ይሞክሩ
 DoTestSend=የመላክ ሙከራ
 DoTestSendHTML=HTML መላክን ይሞክሩ
 ErrorCantUseRazIfNoYearInMask=ስህተት፣ ተከታታይ {yy} ወይም {yyyy} ጭንብል ውስጥ ካልሆነ በየዓመቱ ቆጣሪን እንደገና ለማስጀመር አማራጭ @ መጠቀም አይቻልም።
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=ስህተት፣ ቅደም ተከተል ከሆነ አማራጭ @ መጠቀም አይቻልም {yy}{mm} ወይም {yyyy} <span class='notranslate'>{mm} ጭንብል ውስጥ የለም።
 UMask=በዩኒክስ/ሊኑክስ/ቢኤስዲ/ማክ ፋይል ስርዓት ላይ ለአዳዲስ ፋይሎች የUMask መለኪያ።
 UMaskExplanation=ይህ መመዘኛ በአገልጋዩ ላይ በዶሊባርር በተፈጠሩ ፋይሎች ላይ በነባሪ የተቀመጡ ፈቃዶችን እንዲገልጹ ያስችልዎታል (ለምሳሌ በሚሰቀልበት ጊዜ)<br>የስምንትዮሽ እሴት መሆን አለበት (ለምሳሌ 0666 ማንበብ ማለት ነው) እና ለሁሉም ሰው ይፃፉ.) የሚመከር እሴት 0600 ወይም 0660<br>ይህ ግቤት በዊንዶውስ አገልጋይ ላይ ምንም ፋይዳ የለውም።
 SeeWikiForAllTeam=አስተዋጽዖ አበርካቾችን እና ድርጅታቸውን ዝርዝር ለማግኘት የዊኪን ገጽ ይመልከቱ
@@ -390,9 +365,7 @@ LanguageFilesCachedIntoShmopSharedMemory=ፋይሎች .lang በጋራ ማህደ
 LanguageFile=የቋንቋ ፋይል
 ExamplesWithCurrentSetup=ምሳሌዎች ከአሁኑ ውቅር ጋር
 ListOfDirectories=የOpenDocument አብነት ማውጫዎች ዝርዝር
-ListOfDirectoriesForModelGenODT=OpenDocument ቅርጸት ያላቸው የአብነት ፋይሎችን የያዙ የማውጫ ማውጫዎች ዝርዝር።<br><br>ሙሉ የማውጫ መንገዶችን እዚህ አስቀምጥ።<br>በeah ማውጫ መካከል የመጓጓዣ ተመላሽ ጨምር።<br>የGED ሞጁሉን ማውጫ ለመጨመር እዚህ b0aee8336583 > DOL_DATA_ROOT/ecm/የእርስዎ ማዘዣ ስም<span class='notranslate'></b>።<br>b03192fccfda በ<span class='notranslate'><b>.odt</b> ወይም b0aee833365837fz0 ክፍል ማለቅ አለበት ='notranslate'></b></span>።
 NumberOfModelFilesFound=በእነዚህ ማውጫዎች ውስጥ የሚገኙት የኦዲቲ/ኦዲኤስ አብነት ፋይሎች ብዛት
-ExampleOfDirectoriesForModelGen=የአገባብ ምሳሌዎች፡<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mydocumentdir/mysubdir 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>የእርስዎን የ odt ሰነድ አብነቶች እንዴት መፍጠር እንደሚችሉ ለማወቅ በእነዚያ ማውጫዎች ውስጥ ከማስቀመጥዎ በፊት የዊኪ ሰነዶችን ያንብቡ፡-
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=የስም / የአያት ስም አቀማመጥ
@@ -461,11 +434,8 @@ ComputedFormulaDesc=ተለዋዋጭ የተሰላ እሴት ለማግኘት ሌ
 Computedpersistent=የተሰላ መስክ ያከማቹ
 ComputedpersistentDesc=የተሰሉ ተጨማሪ መስኮች በመረጃ ቋቱ ውስጥ ይቀመጣሉ፣ ነገር ግን እሴቱ የሚሰላው የዚህ መስክ ነገር ሲቀየር ብቻ ነው። የተሰላው መስክ በሌሎች ነገሮች ወይም በአለምአቀፍ መረጃ ላይ የሚመረኮዝ ከሆነ ይህ ዋጋ የተሳሳተ ሊሆን ይችላል!!
 ExtrafieldParamHelpPassword=ይህንን መስክ ባዶ መተው ማለት ይህ ዋጋ ያለ ማመስጠር ይከማቻል ማለት ነው (መስክ በስክሪኑ ላይ በኮከቦች ተደብቋል)።<br><br>አስገባ እሴት 'ዶልክሪፕት' እሴትን በሚቀለበስ ምስጠራ ስልተቀመር ለመመስረት። አጽዳ ውሂብ አሁንም ሊታወቅ እና ሊስተካከል ይችላል ነገር ግን ወደ የውሂብ ጎታ የተመሰጠረ ነው።<br><br>'auto' (ወይም 'md5') አስገባ፣ 'sha256'፣ 'password_hash'፣ ...) የማይቀለበስ የሃሽ ይለፍ ቃል ወደ ዳታቤዝ ለማስቀመጥ ነባሪውን የይለፍ ቃል ምስጠራ አልጎሪዝም ለመጠቀም (ወይም md5፣ sha256፣ password_hash...) ለመጠቀም (የመጀመሪያውን እሴት ለማውጣት ምንም መንገድ የለም)
-ExtrafieldParamHelpselect=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2'>3,value3><br>...<br><br>ዝርዝሩን በሌላ ላይ በመመስረት እንዲኖረን የተጨማሪ ባህሪ ዝርዝር፡<br>1,value1|አማራጮች_<i>parent_list_code<span class='notranselate'>350a parent_key<br>2,value2|አማራጮች_<i>parent_list_codeb0ae63750 class='notranslate'><br><br>ዝርዝሩን በሌላ ዝርዝር ለማግኘት፡<br>1, value1|<i>የወላጅ_ዝርዝር_code</i>:parent_keyb0342fccvalue'>b0342fccfvaluepan12| class='notranslate'><i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2,<br>...
-ExtrafieldParamHelpsellist=የእሴቶቹ ዝርዝር ከሠንጠረዥ ነው የሚመጣው<br>አገባብ፡ table_name:label_field:id_field::filtersql<br>ምሳሌ፡ c_typent:lib ::filtersql<br><br>- id_field የግድ ዋና የ int ቁልፍ ነውb0342fccfda19 - filtersql የ SQL ሁኔታ ነው። ገባሪ እሴትን ብቻ ለማሳየት ቀላል ሙከራ (ለምሳሌ active=1) ሊሆን ይችላል። ='notranslate'><br>በማጣሪያው ውስጥ SELECTን ለመጠቀም የፀረ-መርፌ ጥበቃን ለማለፍ $SEL$ የሚለውን ቁልፍ ይጠቀሙ።<br>በተጨማሪ ሜዳዎች ላይ ማጣራት ከፈለጉ use syntax extra.fieldcode=... (የመስክ ኮድ የኤክስትራፊልድ ኮድ በሆነበት)<br><br>ለመሆኑ ዝርዝር እንደ ሌላ ማሟያ አይነታ ዝርዝር፡<br>c_typent:libelle:id:options_<i>parent_list_code<span' class='translate'> </i></span>|parent_column:filter <br><br>ዝርዝሩን በሌላ ዝርዝር ለማግኘት<span ክፍል= 'notranslate'><br></span>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'></i>0
-ExtrafieldParamHelpchkbxlst=የእሴቶቹ ዝርዝር ከሠንጠረዥ ነው የሚመጣው<br>አገባብ፡ table_name:label_field:id_field::filtersql<br>ምሳሌ: c_typent:lib ::filtersql<br><br>ማጣሪያ ገባሪ እሴትን ብቻ ለማሳየት ቀላል ሙከራ (ለምሳሌ active=1) ሊሆን ይችላል<br>እንዲሁም $ID$ን በማጣሪያ ጠንቋይ መጠቀም ትችላለህ የአሁኑ ነገር መታወቂያ<br>በማጣሪያ ውስጥ ምረጥን ለማድረግ $SEL$<br>extrafields ላይ ማጣራት ከፈለግክ syntax extra.fieldcode=... (የመስክ ኮድ የኤክስትራፊልድ ኮድ የሆነበት)<br><br>ዝርዝሩን በሌላ ተጨማሪ የባህሪ ዝርዝር ላይ በመመስረት እንዲኖርዎት፡<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19z0>b0342fccfda19z0' z0 ዝርዝሩ እንደሌላው ዝርዝር እንዲኖር፡<br>c_typent:libelle:id:<i>parent_list_code</i>|የወላጅ_ዓምድ: ማጣሪያ
 ExtrafieldParamHelplink=መለኪያዎች ObjectName:Classpath<br>አገባብ መሆን አለባቸው የነገር ስም: ክፍል
 ExtrafieldParamHelpSeparator=ለቀላል መለያየት ባዶ ያቆዩ<br>ለሚሰበሰብ መለያየት ይህንን ወደ 1 ያዋቅሩት (ለአዲስ ክፍለ ጊዜ በነባሪነት ክፈት፣ ከዚያ ለእያንዳንዱ ክፍለ ጊዜ ሁኔታ ይቀመጣል)<br>ይህን ወደ 2 አዘጋጅ ለሚፈርስ መለያየት (ለአዲስ ክፍለ ጊዜ በነባሪነት ወድቋል፣ ከዚያ ሁኔታ ለእያንዳንዱ ተጠቃሚ ክፍለ ጊዜ ይጠበቃል)
 LibraryToBuildPDF=ለፒዲኤፍ ማመንጨት የሚያገለግል ላይብረሪ
@@ -483,7 +453,6 @@ ExternalModule=ውጫዊ ሞጁል
 InstalledInto=ወደ ማውጫ %s ተጭኗል
 BarcodeInitForThirdparties=ለሶስተኛ ወገኖች የጅምላ ባርኮድ መግቢያ
 BarcodeInitForProductsOrServices=ለምርቶች ወይም አገልግሎቶች የጅምላ ባር ኮድ መግቢያ ወይም ዳግም ያስጀምሩ
-CurrentlyNWithoutBarCode=በአሁኑ ጊዜ <strong>%s</strong>=' ሪከርድ <span> አለህ። notranslate'><strong>%s</strong> bardet2'></strong> <span class='notranslate'>bard .
 InitEmptyBarCode=Init ዋጋ ለ%s ባዶ ባርኮዶች
 EraseAllCurrentBarCode=ሁሉንም የባርኮድ ዋጋዎች ደምስስ
 ConfirmEraseAllCurrentBarCode=እርግጠኛ ነዎት ሁሉንም የባርኮድ እሴቶች መሰረዝ ይፈልጋሉ?
@@ -509,7 +478,6 @@ WarningPHPMailA=- የኢሜል አገልግሎት አቅራቢውን አገል
 WarningPHPMailB=- አንዳንድ የኢሜል አገልግሎት አቅራቢዎች (እንደ ያሁ ያሉ) ከሌላ አገልጋይ ከራሳቸው አገልጋይ ኢሜይል እንዲልኩ አይፈቅዱም። አሁን ያላችሁት ዝግጅት የኢሜል አቅራቢዎን አገልጋይ ሳይሆን ኢሜል ለመላክ የመተግበሪያውን አገልጋይ ይጠቀማል ስለዚህ አንዳንድ ተቀባዮች (ከዲኤምአርሲ ገዳቢ ፕሮቶኮል ጋር የሚስማማው) ኢሜልዎን እና አንዳንድ የኢሜል አቅራቢዎችን መቀበል ይችሉ እንደሆነ የኢሜል አቅራቢዎን ይጠይቃሉ ። (እንደ ያሁ አይነት) አገልጋዩ የእነሱ ስላልሆነ "አይ" የሚል ምላሽ ሊሰጥ ይችላል፣ ስለዚህ ከተላኩ ኢሜይሎችዎ ውስጥ ጥቂቶቹ ለማድረስ ተቀባይነት ላይኖራቸው ይችላል (የኢሜል አቅራቢዎን የመላኪያ ኮታም ይጠንቀቁ)።
 WarningPHPMailC=- የእራስዎን የኢሜል አገልግሎት አቅራቢ SMTP አገልጋይ ኢሜይሎችን ለመላክ እንዲሁ አስደሳች ነው ስለዚህ ከመተግበሪያው የተላኩ ኢሜይሎች በሙሉ ወደ የመልእክት ሳጥንዎ "የተላኩ" ማውጫ ውስጥ ይቀመጣሉ።
 WarningPHPMailD=ስለዚህ የኢሜል መላኪያ ዘዴን ወደ "SMTP" እሴት ለመቀየር ይመከራል.
-WarningPHPMailDbis=ኢሜይሎችን ለመላክ ነባሪውን የ"PHP" ዘዴ ማቆየት ከፈለግክ ይህን ማስጠንቀቂያ ችላ በል ወይም በ%sእዚህ ጠቅ በማድረግ ያስወግዱት%s<span class='notranslate'>%s
 WarningPHPMail2=የኢሜል SMTP አቅራቢዎ የኢሜል ደንበኛን ለአንዳንድ የአይፒ አድራሻዎች መገደብ ካለበት (በጣም አልፎ አልፎ) ይህ የመልእክት ተጠቃሚ ወኪሉ (MUA) ለኢአርፒ CRM መተግበሪያዎ የአይፒ አድራሻ ነው፡ <strong>%s</strong>።
 WarningPHPMailSPF=በላኪ ኢሜል አድራሻዎ ውስጥ ያለው የጎራ ስም በSPF መዝገብ ከተጠበቀ (የእርስዎን የጎራ ስም ሬጅስትር ይጠይቁ) በጎራዎ ዲ ኤን ኤስ የ SPF መዝገብ ውስጥ የሚከተሉትን አይፒዎች ማከል አለብዎት: <strong>%s</strong>።
 ActualMailSPFRecordFound=ትክክለኛው የSPF መዝገብ ተገኝቷል (ለኢሜል %s): %s
@@ -518,8 +486,6 @@ DependsOn=ይህ ሞጁል ሞጁሉን ያስፈልገዋል
 RequiredBy=ይህ ሞጁል በሞጁል(ዎች) ያስፈልጋል
 TheKeyIsTheNameOfHtmlField=ይህ የኤችቲኤምኤል መስክ ስም ነው። የመስክ ቁልፍ ስም ለማግኘት የኤችቲኤምኤል ገጹን ይዘት ለማንበብ የቴክኒክ እውቀት ያስፈልጋል።
 PageUrlForDefaultValues=የገጹን URL አንጻራዊ መንገድ ማስገባት አለብህ። በዩአርኤል ውስጥ ግቤቶችን ካካተቱ፣ በአሰሳ URL ውስጥ ያሉ ሁሉም መመዘኛዎች እዚህ ላይ የተገለጸው ዋጋ ካላቸው ውጤታማ ይሆናል።
-PageUrlForDefaultValuesCreate=<br>ምሳሌ፡<br>ቅጹ አዲስ ሶስተኛ ወገን ለመፍጠር b0e7843947c06 ነው። /span><span class='notranslate'>%s</strong>.<br>ወደ ውጫዊ ሞጁሎች URL ተጭኗል። ብጁ ማውጫ፣ "ብጁ/"ን አያካትቱ፣ስለዚህ እንደ <strong>mymodule/mypage.php</strong> ያለውን መንገድ ተጠቀም እንጂ ብጁ አትሁን። /mymodule/mypage.php.<br>ነባሪ እሴት ከፈለጉ url የተወሰነ መለኪያ ካለው ብቻ <strong><span መጠቀም ይችላሉ class='notranslate'>%s</span></strong>
-PageUrlForDefaultValuesList=<br>ምሳሌ፡<br>የሦስተኛ ወገኖችን ዝርዝር ለሚያካሂደው ገጽ b0e7843947c06 ><span class='notranslate'>%s</strong>.<br>ወደ ብጁ ዳይሬክተሮች ውጫዊ ሞጁሎች ተጭኗል። "ብጁ/"ን አያካትቱ ስለዚህ እንደ <strong>mymodule/mypagelist.php</strong> ሳይሆን ብጁ/mymodule ይጠቀሙ። /mypagelist.php.<br>ነባሪ እሴት ከፈለጉ url የተወሰነ መለኪያ ካለው ብቻ <strong><span class= መጠቀም ይችላሉ 'notranslate'>%s</span></strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=እንዲሁም ለቅጽ አፈጣጠር ነባሪ ዋጋዎችን እንደገና መፃፍ በትክክል ለተዘጋጁ ገፆች ብቻ እንደሚሰራ (ስለዚህ በመለኪያ ድርጊት = መፍጠር ወይም ማቅረብ...)
 EnableDefaultValues=ነባሪ እሴቶችን ማበጀትን ያንቁ
 EnableOverwriteTranslation=ትርጉሞችን ማበጀት ፍቀድ
@@ -1246,10 +1212,7 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=ለማጽደቅ የወጪ ሪፖርት
 Delays_MAIN_DELAY_HOLIDAYS=ለማጽደቅ ጥያቄዎችን ይተዉ
 SetupDescription1=ዶሊባርርን መጠቀም ከመጀመርዎ በፊት አንዳንድ የመጀመሪያ መለኪያዎች መገለጽ እና ሞጁሎች መንቃት/መዋቀር አለባቸው።
 SetupDescription2=የሚከተሉት ሁለት ክፍሎች የግዴታ ናቸው (በማዋቀር ምናሌ ውስጥ ያሉት ሁለቱ የመጀመሪያ ግቤቶች)
-SetupDescription3=<a href="%s">%s -> %s<span class='notranslate'd>cz0040 </span><br><br>የመተግበሪያዎን ነባሪ ባህሪ ለማበጀት የሚያገለግሉ መሰረታዊ መለኪያዎች (ለምሳሌ ከአገር ጋር የተገናኙ ባህሪያት)።
-SetupDescription4=<a href="%s">%s -> %s<span class='notranslate'd>cz0040 </span><br><br>ይህ ሶፍትዌር የበርካታ ሞጁሎች/መተግበሪያዎች ስብስብ ነው። ከእርስዎ ፍላጎቶች ጋር የተያያዙ ሞጁሎች መንቃት እና መዋቀር አለባቸው። እነዚህ ሞጁሎች ሲነቁ የምናሌ ግቤቶች ይታያሉ።
 SetupDescription5=ሌሎች የማዋቀር ምናሌ ግቤቶች የአማራጭ መለኪያዎችን ያስተዳድራሉ።
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'd<b05040> / span>
 SetupDescription3b=የመተግበሪያዎን ነባሪ ባህሪ ለማበጀት የሚያገለግሉ መሰረታዊ መለኪያዎች (ለምሳሌ ከአገር ጋር ለተያያዙ ባህሪያት)።
 SetupDescription4b=ይህ ሶፍትዌር የበርካታ ሞጁሎች/መተግበሪያዎች ስብስብ ነው። ከእርስዎ ፍላጎቶች ጋር የተያያዙ ሞጁሎች መንቃት አለባቸው. እነዚህ ሞጁሎች ሲነቁ የምናሌ ግቤቶች ይታያሉ።
 AuditedSecurityEvents=ኦዲት የተደረጉ የደህንነት ክስተቶች
@@ -1268,7 +1231,6 @@ BrowserOS=አሳሽ OS
 ListOfSecurityEvents=የዶሊባርር የደህንነት ክስተቶች ዝርዝር
 SecurityEventsPurged=የደህንነት ክስተቶች ጸድተዋል።
 TrackableSecurityEvents=መከታተል የሚችሉ የደህንነት ክስተቶች
-LogEventDesc=ለተወሰኑ የደህንነት ክስተቶች መግባትን አንቃ። ምዝግብ ማስታወሻውን በምናሌ በኩል ያስተዳድራሉ <b>%s - %s notranslate'></b></span>። ማስጠንቀቂያ፣ ይህ ባህሪ በመረጃ ቋቱ ውስጥ ከፍተኛ መጠን ያለው ውሂብ ሊያመነጭ ይችላል።
 AreaForAdminOnly=የማዋቀር መለኪያዎች በ<b>አስተዳዳሪ ተጠቃሚዎች</b> ብቻ ሊቀናበሩ ይችላሉ።
 SystemInfoDesc=የስርዓት መረጃ በንባብ ብቻ ሁነታ የሚያገኙት ልዩ ልዩ ቴክኒካዊ መረጃ እና ለአስተዳዳሪዎች ብቻ የሚታይ ነው።
 SystemAreaForAdminOnly=ይህ አካባቢ ለአስተዳዳሪ ተጠቃሚዎች ብቻ ይገኛል። የዶሊባርር ተጠቃሚ ፈቃዶች ይህንን ገደብ መለወጥ አይችሉም።
@@ -1281,13 +1243,10 @@ AvailableModules=የሚገኝ መተግበሪያ/ሞዱሎች
 ToActivateModule=ሞጁሎችን ለማግበር ወደ ማቀናበሪያ ቦታ ይሂዱ (ቤት -> ማዋቀር -> ሞጁሎች)።
 SessionTimeOut=ለክፍለ ጊዜ ጊዜው አልፏል
 SessionExplanation=የክፍለ-ጊዜው ማጽጃ የሚከናወነው በInternal PHP ክፍለ ጊዜ ማጽጃ (እና ምንም ካልሆነ) ይህ ቁጥር ከዚህ መዘግየት በፊት ክፍለ ጊዜው እንደማያልቅ ዋስትና ይሰጣል። የውስጥ ፒኤችፒ ክፍለ ጊዜ ማጽጃ ክፍለ ጊዜው ከዚህ መዘግየት በኋላ ጊዜው እንደሚያልፍ ዋስትና አይሰጥም። ከዚህ መዘግየት በኋላ እና የክፍለ-ጊዜ ማጽጃው ሲሰራ ጊዜው ያበቃል፣ ስለዚህ እያንዳንዱ <b>%s/%s</b>መዳረሻ፣ ነገር ግን በሌሎች ክፍለ-ጊዜዎች በሚደረግ መዳረሻ ጊዜ ብቻ (እሴቱ 0 ከሆነ፣ ክፍለ-ጊዜውን ማጽዳት በውጫዊ ሂደት ብቻ ነው የሚከናወነው) .<br>ማስታወሻ፡ በአንዳንድ የውጫዊ ክፍለ ጊዜ ማጽጃ ዘዴ ባላቸው አገልጋዮች ላይ (ክሮን በዴቢያን፣ ubuntu ...)፣ ክፍለ-ጊዜዎቹ በውጫዊ ማዋቀር ከተወሰነ ጊዜ በኋላ ሊጠፉ ይችላሉ። እዚህ የገባው ዋጋ ምንም ይሁን ምን.
-SessionsPurgedByExternalSystem=በዚህ አገልጋይ ላይ ያሉ ክፍለ-ጊዜዎች በውጫዊ ዘዴ (ክሮን በዴቢያን፣ ubuntu ...)፣ ምናልባት እያንዳንዱ <b>%s</span የጸዳ ይመስላል ><span class='notranslate'></b> ሰከንድ (= የመለኪያ እሴት <b>session.gc_maxlifetime<span class='notranslate'>b09a4b173) , ስለዚህ እዚህ ያለውን ዋጋ መቀየር ምንም ውጤት የለውም. የክፍለ ጊዜ መዘግየትን እንዲቀይር የአገልጋይ አስተዳዳሪን መጠየቅ አለብህ።
 TriggersAvailable=የሚገኙ ቀስቅሴዎች
 TriggersDesc=ቀስቅሴዎች ወደ ማውጫ <b>htdocs/core/triggers</b> ማውጫ ውስጥ አንዴ ከተገለበጡ የዶሊባርር የስራ ፍሰት ባህሪን የሚቀይሩ ፋይሎች ናቸው። አዳዲስ ድርጊቶችን ይገነዘባሉ, በ Dolibarr ክስተቶች (አዲስ ኩባንያ ፈጠራ, የክፍያ መጠየቂያ ማረጋገጫ, ...) ላይ ነቅተዋል.
 TriggerDisabledByName=በዚህ ፋይል ውስጥ ያሉ ቀስቅሴዎች በስማቸው በ<b>-NORUN</b> ቅጥያ ተሰናክለዋል።
-TriggerDisabledAsModuleDisabled=በዚህ ፋይል ውስጥ ያሉ ቀስቅሴዎች እንደ ሞጁል <b>%s<span class='notranslate'></b> ሊሰናከል አይችልም።
 TriggerAlwaysActive=በዚህ ፋይል ውስጥ ያሉ ቀስቅሴዎች ምንጊዜም ንቁ ናቸው፣ ምንም አይነት የነቃው የ Dolibarr ሞጁሎች።
-TriggerActiveAsModuleActive=በዚህ ፋይል ውስጥ ያሉ ቀስቅሴዎች እንደ ሞጁል <b>%s<span class='notranslate'></b> የነቃ ነው</span.
 GeneratedPasswordDesc=በራስ-ሰር ለሚፈጠሩ የይለፍ ቃሎች የሚጠቀሙበትን ዘዴ ይምረጡ።
 DictionaryDesc=ሁሉንም የማጣቀሻ ውሂብ አስገባ። እሴቶችዎን ወደ ነባሪ ማከል ይችላሉ።
 ConstDesc=ይህ ገጽ በሌሎች ገጾች ላይ የማይገኙ ግቤቶችን እንዲያርትዑ ይፈቅድልዎታል። እነዚህ በአብዛኛው የተጠበቁ መለኪያዎች ለገንቢዎች/ላቀ መላ ፍለጋ ብቻ ናቸው።
@@ -1306,8 +1265,6 @@ NoEventOrNoAuditSetup=ምንም የደህንነት ክስተት አልተመዘ
 NoEventFoundWithCriteria=ለዚህ የፍለጋ መስፈርት ምንም የደህንነት ክስተት አልተገኘም።
 SeeLocalSendMailSetup=የአካባቢዎን የመልእክት መልእክት ማዋቀር ይመልከቱ
 BackupDesc=የ<b>ሙሉ</b> የ Dolibarr ጭነት ምትኬ ሁለት ደረጃዎችን ይፈልጋል።
-BackupDesc2=የ"ሰነዶች" ማውጫ ይዘቶችን ምትኬ ያስቀምጡ (<b>%s<span class='notranslate'>b09a4b739f17f>b09a4b739f17f> ሁሉንም የተሰቀሉ እና የተፈጠሩ ፋይሎችን የያዘ። ይህ ደግሞ በደረጃ 1 ውስጥ የተፈጠሩትን ሁሉንም የቆሻሻ ፋይሎች ያካትታል። ይህ ክዋኔ ለብዙ ደቂቃዎች ሊቆይ ይችላል።
-BackupDesc3=የውሂብ ጎታህን አወቃቀር እና ይዘቶች (<b>%s<span class='notranslate'></b> ወደ ውስጥ አስቀምጥ የቆሻሻ መጣያ ፋይል. ለዚህም, የሚከተለውን ረዳት መጠቀም ይችላሉ.
 BackupDescX=በማህደር የተቀመጠው ማውጫ ደህንነቱ በተጠበቀ ቦታ መቀመጥ አለበት።
 BackupDescY=የተፈጠረው የቆሻሻ መጣያ ፋይል ደህንነቱ በተጠበቀ ቦታ መቀመጥ አለበት።
 BackupPHPWarning=ምትኬ በዚህ ዘዴ ሊረጋገጥ አይችልም። ቀዳሚው ይመከራል።
@@ -1371,8 +1328,6 @@ SendmailOptionMayHurtBuggedMTA="PHP mail direct" ዘዴን በመጠቀም መ
 TranslationSetup=የትርጉም ማዋቀር
 TranslationKeySearch=የትርጉም ቁልፍ ወይም ሕብረቁምፊ ይፈልጉ
 TranslationOverwriteKey=የትርጉም ሕብረቁምፊን ይፃፉ
-TranslationDesc=የማሳያ ቋንቋን እንዴት ማዋቀር እንደሚቻል፡<br>* ነባሪ/ስርዓት ሰፊ፡ ሜኑ <strong>ቤት -> ማዋቀር -> አሳይ</strong><br>* በእያንዳንዱ ተጠቃሚ፡ በማያ ገጹ ላይኛው ክፍል ላይ ያለውን የተጠቃሚ ስም ጠቅ ያድርጉ እና b0e784394006 span>የተጠቃሚ ማሳያ ማዋቀር<span class='notranslate'></strong> በተጠቃሚ ካርዱ ላይ።
-TranslationOverwriteDesc=እንዲሁም የሚከተለውን ሰንጠረዥ የሚሞሉ ሕብረቁምፊዎችን መሻር ይችላሉ። ቋንቋህን ከ"%s" ተቆልቋይ ምረጥ፣ የትርጉም ቁልፍ ሕብረቁምፊውን ወደ "%s" እና አዲሱ ትርጉምህን ወደ "<span> አስገባ class='notranslate'>%s</span>"
 TranslationOverwriteDesc2=የትኛውን የትርጉም ቁልፍ መጠቀም እንዳለቦት ለማወቅ እንዲረዳህ ሌላኛውን ትር መጠቀም ትችላለህ
 TranslationString=የትርጉም ሕብረቁምፊ
 CurrentTranslationString=የአሁኑ የትርጉም ሕብረቁምፊ
@@ -1397,7 +1352,6 @@ SearchOptim=የፍለጋ ማመቻቸት
 YouHaveXObjectUseComboOptim=በመረጃ ቋቱ ውስጥ %s %s አለህ። በተጫኑ ቁልፍ ክስተቶች ላይ ጥምር ዝርዝርን ለመጫን ወደ ሞጁል ማዋቀር መሄድ ይችላሉ።
 YouHaveXObjectUseSearchOptim=በመረጃ ቋቱ ውስጥ %s %s አለህ። በHome-Setup-Other ውስጥ ቋሚውን %s ወደ 1 ማከል ትችላለህ።
 YouHaveXObjectUseSearchOptimDesc=ይህ ፍለጋውን ወደ ሕብረቁምፊዎች መጀመሪያ ይገድባል ይህም የመረጃ ቋቱ መረጃ ጠቋሚዎችን እንዲጠቀም ያደርገዋል እና ፈጣን ምላሽ ማግኘት አለብዎት።
-YouHaveXObjectAndSearchOptimOn=በመረጃ ቋቱ ውስጥ %s %s አለህ እና ቋሚ %s ተቀናብሯል span class='notranslate'>%s</span>በቤት-ማዋቀር-ሌላ።
 BrowserIsOK=የ %s የድር አሳሽ እየተጠቀምክ ነው። ይህ አሳሽ ለደህንነት እና አፈጻጸም ደህና ነው።
 BrowserIsKO=የ %s የድር አሳሽ እየተጠቀምክ ነው። ይህ አሳሽ ለደህንነት፣ አፈጻጸም እና አስተማማኝነት መጥፎ ምርጫ እንደሆነ ይታወቃል። ፋየርፎክስ፣ ክሮም፣ ኦፔራ ወይም ሳፋሪ እንዲጠቀሙ እንመክራለን።
 PHPModuleLoaded=የPHP ክፍል %s ተጭኗል
@@ -1663,7 +1617,6 @@ LDAPDescUsers=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህ
 LDAPDescGroups=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህሪያትን ስም በዶሊባርር ቡድኖች ላይ ላለው እያንዳንዱ መረጃ እንዲገልጹ ያስችልዎታል።
 LDAPDescMembers=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህሪያትን ስም በዶሊባርር አባላት ሞጁል ላይ ላለው እያንዳንዱ መረጃ እንዲገልጹ ያስችልዎታል።
 LDAPDescMembersTypes=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህሪያትን ስም በዶሊባርር አባላት አይነቶች ላይ ላለው እያንዳንዱ መረጃ እንዲገልጹ ያስችልዎታል።
-LDAPDescValues=የምሳሌ ዋጋዎች የተነደፉት ለ<b>OpenLDAP</b> በሚከተለው የተጫኑ መርሃ ግብሮች ነው፡ 360ee</spanz>365ee core.schema, cosine.schema, inetorgperson.schema<span class='notranslate'></b>)። እሴቶችን እና ክፈት LDAPን ከተጠቀሙ፣ ሁሉም የተጫኑ መርሃግብሮችን ለመምረጥ የኤልዲኤፒ ማዋቀሪያ ፋይልዎን <b>slapd.conf</b> ያሻሽሉ።
 ForANonAnonymousAccess=ለተረጋገጠ መዳረሻ (ለመፃፍ መዳረሻ ለምሳሌ)
 PerfDolibarr=የአፈጻጸም ማዋቀር/አሳቢ ሪፖርት
 YouMayFindPerfAdviceHere=ይህ ገጽ ከአፈጻጸም ጋር የተያያዙ አንዳንድ ቼኮችን ወይም ምክሮችን ይሰጣል።
@@ -1860,7 +1813,6 @@ PastDelayVCalExport=ያለፈውን ክስተት ወደ ውጭ አትላክ
 SecurityKey = የሚስጥራዊ ቁልፍ
 ##### ClickToDial #####
 ClickToDialSetup=ሞጁል ማዋቀርን ለመደወል ጠቅ ያድርጉ
-ClickToDialUrlDesc=በስልክ ፒክቶ ላይ ጠቅ ሲደረግ URL ይጠራል። በዩአርኤል ውስጥ፣ መለያዎችን መጠቀም ትችላለህ<br><b>__PHONETO__b09a4b739f17f8z ያደርጋል በሚደውለው ሰው ስልክ ቁጥር ተተክቷል<span class='notranslate'><br><b>__PHONEFROM__b09a4b739f17f>ያ በሚደውለው ሰው (የእርስዎ) ስልክ ቁጥር ይተካዋል<span class='notranslate'><br><b>__LOGIN__b09a4b73z span> በ clicktodial login የሚተካ (በተጠቃሚ ካርድ ላይ የተገለጸ)<span class='notranslate'><br><b>__PASS__ </b>በጠቅታ ይለፍ ቃል የሚተካ (በተጠቃሚ ካርድ ላይ የተገለጸ)።
 ClickToDialDesc=ይህ ሞጁል የዴስክቶፕ ኮምፒዩተር ሲጠቀሙ ስልክ ቁጥሮችን ወደ ጠቅ ሊደረጉ የሚችሉ አገናኞች ይለውጣል። አንድ ጠቅታ ቁጥሩን ይደውላል. ይህ በዴስክቶፕዎ ላይ ለስላሳ ስልክ ሲጠቀሙ ወይም ለምሳሌ በ SIP ፕሮቶኮል ላይ የተመሰረተ የሲቲኤ ሲስተም ሲጠቀሙ የስልክ ጥሪውን ለመጀመር ሊያገለግል ይችላል። ማስታወሻ: ስማርትፎን ሲጠቀሙ, የስልክ ቁጥሮች ሁልጊዜ ጠቅ ሊደረጉ ይችላሉ.
 ClickToDialUseTelLink=በስልክ ቁጥሮች ላይ "tel:" የሚለውን አገናኝ ብቻ ይጠቀሙ
 ClickToDialUseTelLinkDesc=ተጠቃሚዎችዎ ሶፍት ፎን ወይም የሶፍትዌር በይነገጽ ካላቸው፣ በአሳሹ ውስጥ በተመሳሳይ ኮምፒዩተር ላይ የተጫነ እና በአሳሽዎ ውስጥ በ"ቴል:" የሚጀምር ሊንክ ሲጫኑ ይደውሉ። በ"sIP:" የሚጀምር አገናኝ ወይም ሙሉ የአገልጋይ መፍትሄ (የአገር ውስጥ ሶፍትዌር መጫን አያስፈልግም) ከፈለጉ ይህንን ወደ "አይ" ማዘጋጀት እና ቀጣዩን መስክ መሙላት አለብዎት።
@@ -1920,8 +1872,6 @@ IfSetToYesDontForgetPermission=ወደ ባዶ ያልሆነ እሴት ከተዋቀ
 GeoIPMaxmindSetup=GeoIP Maxmind ሞጁል ማዋቀር
 PathToGeoIPMaxmindCountryDataFile=ወደ አገር ትርጉም Maxmind ip ን የያዘ ወደ ፋይል የሚወስድበት መንገድ
 NoteOnPathLocation=የእርስዎ የአይ ፒ ወደ ሀገር ውሂብ ፋይል ፒኤችፒ ሊያነበው በሚችለው ማውጫ ውስጥ መሆን እንዳለበት ልብ ይበሉ (የ PHP open_basedir ማዋቀር እና የፋይል ስርዓት ፈቃዶችን ያረጋግጡ)።
-YouCanDownloadFreeDatFileTo=የ Maxmind GeoIP የሀገር ፋይል <b>ነጻ ማሳያ ስሪት</b>ን የማክስmind ጂኦአይፒ የሀገር ፋይል በ <span class='notranslate'>b0ecb2ecbz07 ላይ ማውረድ ትችላለህ። / span>
-YouCanDownloadAdvancedDatFileTo=ተጨማሪ <b>ሙሉ ስሪት ከዝማኔዎች ጋር</b> የ Maxmind GeoIP የሀገር ፋይል በ<span class=' ላይ ማውረድ ትችላለህ። notranslate'>%s</span>።
 TestGeoIPResult=የልወጣ IP -> አገር ሙከራ
 ##### Projects #####
 ProjectsNumberingModules=የፕሮጀክቶች ቁጥር መስጫ ሞጁል
@@ -1971,7 +1921,6 @@ SomethingMakeInstallFromWebNotPossible=በሚከተሉት ምክንያቶች የ
 SomethingMakeInstallFromWebNotPossible2=በዚህ ምክንያት፣ እዚህ ላይ የተገለጸው የማሻሻል ሂደት አንድ ልዩ ተጠቃሚ ሊያደርገው የሚችለው በእጅ የሚሰራ ሂደት ነው።
 InstallModuleFromWebHasBeenDisabledContactUs=የውጫዊ ሞጁሎችን ወይም ተለዋዋጭ ድር ጣቢያዎችን መጫን ወይም ማልማት፣ ከመተግበሪያው፣ በአሁኑ ጊዜ ለደህንነት ዓላማ ተቆልፏል። ይህንን ባህሪ ማንቃት ከፈለጉ እባክዎ ያነጋግሩን።
 InstallModuleFromWebHasBeenDisabledByFile=የውጫዊ ሞጁል ከመተግበሪያው መጫን በአስተዳዳሪዎ ተሰናክሏል። ይህንን እንዲፈቅድ <strong>%s</strong> ፋይሉን እንዲያስወግድ መጠየቅ አለብህ። ባህሪ.
-ConfFileMustContainCustom=ከመተግበሪያው ውጫዊ ሞጁል መጫን ወይም መገንባት የሞጁሉን ፋይሎች ወደ ማውጫ ውስጥ ማስቀመጥ አለበት <strong>%s </strong>። ይህንን ማውጫ በDolibarr ለማስኬድ፣ 2 የመመሪያ መስመሮችን ለመጨመር የእርስዎን <strong>conf/conf.php</strong> ማዋቀር አለብህ፡ <br><strong>$dolibarr_main_url_root_alt='/custom';b710 class='notranslate'>b7010 ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ecztomlate'>b0ecb2ecztomtom07fe/span > </strong>
 HighlightLinesOnMouseHover=የመዳፊት እንቅስቃሴ ሲያልፍ የጠረጴዛ መስመሮችን ያድምቁ
 HighlightLinesColor=አይጤው ሲያልፍ የመስመሩን ቀለም ያድምቁ (ያለ ድምቀት 'ffffff' ይጠቀሙ)
 HighlightLinesChecked=ሲፈተሽ የመስመሩን ቀለም ያድምቁ (ያለ ድምቀት 'ffffff' ይጠቀሙ)
@@ -2065,7 +2014,6 @@ DetectionNotPossible=ማወቅ አይቻልም
 UrlToGetKeyToUseAPIs=ኤፒአይን ለመጠቀም ማስመሰያ ለማግኘት ዩአርኤል (አንድ ጊዜ ማስመሰያ ከደረሰ በኋላ በመረጃ ቋት የተጠቃሚ ሠንጠረዥ ውስጥ ይቀመጣል እና በእያንዳንዱ የኤፒአይ ጥሪ ላይ መቅረብ አለበት)
 ListOfAvailableAPIs=የሚገኙ APIs ዝርዝር
 activateModuleDependNotSatisfied=ሞጁል "%s" በሞጁል "%s" ላይ የተመሰረተ ነው, ይህ ጠፍቷል, ስለዚህ ሞጁል " %1$s" በትክክል ላይሰራ ይችላል። እባክህ ሞጁሉን ጫን "%2$s" ወይም ሞጁሉን አሰናክል "%1$s" ከማንኛውም አስገራሚ ነገር መጠበቅ ከፈለጉ
-CommandIsNotInsideAllowedCommands=ለማስኬድ እየሞከሩት ያለው ትእዛዝ በፓራሜትር <strong>$dolibarr_main_restrict_os_commandsb0a65d071f6fc9z>በመለኪያ የተገለጹ የተፈቀደላቸው ትዕዛዞች ዝርዝር ውስጥ የለም። class='notranslate'><strong>conf.php</strong> ፋይል።
 LandingPage=ማረፊያ ገጽ
 SamePriceAlsoForSharedCompanies=የባለብዙ ኩባንያ ሞጁሉን ከተጠቀሙ በምርጫው "ነጠላ ዋጋ" ምርቶች በአካባቢው መካከል የሚጋሩ ከሆነ ዋጋው ለሁሉም ኩባንያዎች ተመሳሳይ ይሆናል.
 ModuleEnabledAdminMustCheckRights=ሞዱል ነቅቷል። የነቃ ሞጁል(ዎች) ፈቃዶች የተሰጡት ለአስተዳዳሪ ተጠቃሚዎች ብቻ ነው። አስፈላጊ ከሆነ ለሌሎች ተጠቃሚዎች ወይም ቡድኖች ፈቃዶችን በእጅ መስጠት ሊኖርብዎ ይችላል።
@@ -2074,7 +2022,6 @@ TypeCdr=የመክፈያ ጊዜው የክፍያ ቀን እና በቀን ውስጥ
 BaseCurrency=የኩባንያው የማጣቀሻ ምንዛሪ (ይህንን ለመለወጥ ወደ ኩባንያው ማዋቀር ይሂዱ)
 WarningNoteModuleInvoiceForFrenchLaw=ይህ ሞጁል %s የፈረንሳይ ህጎችን ያከብራል (Loi Finance 2016)።
 WarningNoteModulePOSForFrenchLaw=ይህ ሞጁል %s የፈረንሳይ ህጎችን (Loi Finance 2016) ያከብራል ምክንያቱም ሞጁል የማይቀለበስ ምዝግብ ማስታወሻዎች በራስ ሰር ስለሚነቃ ነው።
-WarningInstallationMayBecomeNotCompliantWithLaw=ውጫዊ ሞጁል የሆነውን ሞጁል %s ለመጫን እየሞከርክ ነው። ውጫዊ ሞጁል ማግበር ማለት የዚያን ሞጁል አታሚ ያምናሉ እና ይህ ሞጁል በማመልከቻዎ ባህሪ ላይ አሉታዊ ተጽዕኖ እንደማይኖረው እና በአገርዎ ህግጋት (<span class='notranslate'>%s) ያከብራል ማለት ነው። span>) ሞጁሉ ሕገ-ወጥ ባህሪን ካስተዋወቀ, ለህገ-ወጥ ሶፍትዌር አጠቃቀም ተጠያቂ ይሆናሉ.
 
 MAIN_PDF_MARGIN_LEFT=የግራ ህዳግ በፒዲኤፍ ላይ
 MAIN_PDF_MARGIN_RIGHT=የቀኝ ህዳግ በፒዲኤፍ ላይ
@@ -2114,7 +2061,6 @@ YouCanDeleteFileOnServerWith=ይህንን ፋይል በአገልጋዩ ላይ 
 ChartLoaded=የመለያ ገበታ ተጭኗል
 SocialNetworkSetup=የሞዱል ማህበራዊ አውታረ መረቦች ማዋቀር
 EnableFeatureFor=ለ<strong>%s</strong> ባህሪያትን አንቃ
-VATIsUsedIsOff=ማሳሰቢያ፡ የሽያጭ ታክስን ወይም ተ.እ.ታን የመጠቀም አማራጩ ወደ <strong>ጠፍቷል</strong> በምናሌው <span class='notranslate' ተቀናብሯል ‹%s</span> - %s፣ ስለዚህ ጥቅም ላይ የሚውለው የሽያጭ ታክስ ወይም ቫት ሁልጊዜ ለሽያጭ 0 ይሆናል።
 SwapSenderAndRecipientOnPDF=በፒዲኤፍ ሰነዶች ላይ የላኪ እና የተቀባይ አድራሻ ቦታ ይቀያይሩ
 FeatureSupportedOnTextFieldsOnly=ማስጠንቀቂያ፣ ባህሪ የሚደገፈው በጽሑፍ መስኮች እና ጥምር ዝርዝሮች ላይ ብቻ ነው። እንዲሁም የዩአርኤል መለኪያ action=create or action=edit መዘጋጀት አለበት ወይም ይህን ባህሪ ለመቀስቀስ የገጽ ስም በ'new.php' ያበቃል።
 EmailCollector=ኢሜል ሰብሳቢ
@@ -2176,7 +2122,6 @@ CreateCandidature=የሥራ ማመልከቻ ይፍጠሩ
 FormatZip=ዚፕ
 MainMenuCode=የምናሌ መግቢያ ኮድ (ዋና ምናሌ)
 ECMAutoTree=ራስ-ሰር የ ECM ዛፍን አሳይ
-OperationParamDesc=አንዳንድ ውሂብ ለማውጣት የሚጠቀሙባቸውን ደንቦች ይግለጹ ወይም ለስራ የሚውሉ እሴቶችን ያቀናብሩ።<br><br>የኩባንያውን ስም ለማውጣት ምሳሌ ኢሜል ርእሱን ወደ ጊዜያዊ ተለዋዋጭ፡<br>tmp_var=EXTRACT:SUBJECT:መልዕክት ከኩባንያ ([^])\n]*)<br><br>የአንድን ነገር ባህሪ ለመፍጠር ምሳሌዎች፡<br> /span>objproperty1=SET:ሃርድ ኮድ የተደረገ እሴት<span class='notranslate'><br>objproperty2=SET:__tmp_var__<br>obj valuepropertyFE የሚዋቀረው ንብረት አስቀድሞ ካልተገለጸ ብቻ ነው)<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=የመርጃ ሞጁል ውቅር
@@ -2262,7 +2207,6 @@ ModuleActivatedMayExposeInformation=ይህ የPHP ቅጥያ ሚስጥራዊነ
 ModuleActivatedDoNotUseInProduction=ለልማቱ የተነደፈ ሞጁል ነቅቷል። በማምረት አካባቢ ላይ አታድርጉት።
 CombinationsSeparator=ለምርት ውህዶች መለያ ባህሪ
 SeeLinkToOnlineDocumentation=ለምሳሌዎች ከላይ ባለው ምናሌ ላይ ወደ የመስመር ላይ ሰነዶች አገናኝ ይመልከቱ
-SHOW_SUBPRODUCT_REF_IN_PDF=ባህሪው "%s የሞጁል <b>%s=span><span ክፍል ከሆነ 'notranslate'></b> ጥቅም ላይ ይውላል፣ የኪት ንዑስ ምርቶች ዝርዝሮችን በፒዲኤፍ አሳይ።
 AskThisIDToYourBank=ይህን መታወቂያ ለማግኘት ባንክዎን ያነጋግሩ
 AdvancedModeOnly=ፍቃድ በላቁ የፍቃድ ሁነታ ብቻ ይገኛል።
 ConfFileIsReadableOrWritableByAnyUsers=የ conf ፋይል በማንኛውም ተጠቃሚ ሊነበብ ወይም ሊፃፍ ይችላል። ለድር አገልጋይ ተጠቃሚ እና ቡድን ብቻ ፍቃድ ይስጡ።
@@ -2291,7 +2235,6 @@ APIsAreNotEnabled=የኤፒአይዎች ሞጁሎች አልነቁም።
 YouShouldSetThisToOff=ይህንን ወደ 0 ወይም አጥፋ ማዋቀር አለብዎት
 InstallAndUpgradeLockedBy=መጫን እና ማሻሻያ በፋይሉ ተቆልፏል <b>%s</b>
 InstallLockedBy=ጫን/እንደገና መጫን በፋይሉ ተቆልፏል <b>%s</b>
-InstallOfAddonIsNotBlocked=የ addons ጭነቶች አልተቆለፉም። ፋይል ይፍጠሩ <b>installmodules.lock</b> ወደ ማውጫ b0aee83365837f ='notranslate'>%s</b> የውጭ addons/modules ጭነቶችን ለማገድ።
 OldImplementation=የድሮ አተገባበር
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=አንዳንድ የመስመር ላይ ክፍያ ሞጁሎች ከነቃ (Paypal፣ Stripe፣...)፣ የመስመር ላይ ክፍያ ለመፈጸም በፒዲኤፍ ላይ አገናኝ ያክሉ
 DashboardDisableGlobal=ሁሉንም የተከፈቱ ነገሮች አውራ ጣትን በአለምአቀፍ ደረጃ አሰናክል
@@ -2405,8 +2348,6 @@ NotAvailableByDefaultEnabledOnModuleActivation=በነባሪነት አልተፈ
 CSSPage=የሲኤስኤስ ዘይቤ
 Defaultfortype=ነባሪ
 DefaultForTypeDesc=ለአብነት አይነት አዲስ ኢሜይል ሲፈጥሩ በነባሪነት ጥቅም ላይ የሚውለው አብነት
-OptionXShouldBeEnabledInModuleY=አማራጭ "<b>%s</b>ወደ ሞጁል ውስጥ መንቃት አለበት ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=አማራጭ "<b>%s</b>s ሞጁል ውስጥ ነቅቷል 'notranslate'><b></span>%s</b>
 AllowOnLineSign=የመስመር ላይ ፊርማ ፍቀድ
 AtBottomOfPage=ከገጹ ግርጌ
 FailedAuth=ያልተሳኩ ማረጋገጫዎች
diff --git a/htdocs/langs/am_ET/agenda.lang b/htdocs/langs/am_ET/agenda.lang
index 7e1253ab492..c69a9682cdb 100644
--- a/htdocs/langs/am_ET/agenda.lang
+++ b/htdocs/langs/am_ET/agenda.lang
@@ -137,8 +137,6 @@ DateActionEnd=የመጨረሻ ቀን
 AgendaUrlOptions1=ውጤቱን ለማጣራት የሚከተሉትን መለኪያዎች ማከል ይችላሉ-
 AgendaUrlOptions3=<b>logina=%s</b> አንድን ውፅዓት በተጠቃሚ ወደ ድርጊቶች እንዲገድብ <b>%s</b>።
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ውፅዓት በድርጊት ያልተገደበ ተጠቃሚ <b>%s</b>።
-AgendaUrlOptions4=<b>logint=%s</b>ተጠቃሚን ውፅዓት ለድርጊት ለመገደብ ተመድቧል። span class='notranslate'><b></span>%s</b>(ባለቤት እና ሌሎች)።
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> ከፕሮጀክት ጋር የተገናኙትን እርምጃዎች ለመገደብ 365ee 365ee __PROJECT_ID__</b>።
 AgendaUrlOptionsNotAutoEvent=አውቶማቲክ ክስተቶችን ለማስቀረት <b>notactiontype=systemauto</b>።
 AgendaUrlOptionsIncludeHolidays=የበዓላት ክስተቶችን ለማካተት <b>includeholidays=1</b>።
 AgendaShowBirthdayEvents=የእውቂያዎች ልደት
@@ -161,7 +159,6 @@ AddEvent=ክስተት ፍጠር
 MyAvailability=የእኔ ተገኝነት
 ActionType=የክስተት አይነት
 DateActionBegin=የክስተት መጀመሪያ ቀን
-ConfirmCloneEvent=እርግጠኛ ነህ ክስተቱን መዝጋት ትፈልጋለህ <b>%s<span class='notranslate'></b>?
 RepeatEvent=ክስተቱን ድገም።
 OnceOnly=አንዴ ብቻ
 EveryDay=በየቀኑ
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index c249c19252c..d8284d16c9b 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -115,7 +115,6 @@ MenuBankInternalTransfer=የውስጥ ሽግግር
 TransferDesc=ከአንድ መለያ ወደ ሌላ ለማዛወር የውስጥ ዝውውርን ተጠቀም፣ አፕሊኬሽኑ ሁለት መዝገቦችን ይጽፋል፡ በምንጭ መለያ ውስጥ ያለ ዴቢት እና በዒላማ መለያ ውስጥ ያለ ብድር። ለዚህ ግብይት ተመሳሳይ መጠን፣ መለያ እና ቀን ጥቅም ላይ ይውላል።
 TransferFrom=ከ
 TransferTo=ለ
-TransferFromToDone=ከ<b>%s</b> ወደ <span class't ><b></span>%s</b>የb0583738f 'notranslate'>%s</b> %s ተመዝግቧል።
 CheckTransmitter=ላኪ
 ValidateCheckReceipt=ይህ የቼክ ደረሰኝ ይረጋገጥ?
 ConfirmValidateCheckReceipt=እርግጠኛ ነዎት ይህን የቼክ ደረሰኝ ለማረጋገጫ ማስገባት ይፈልጋሉ? አንዴ ከተረጋገጠ ምንም ለውጦች አይኖሩም።
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index 34abe080280..a784b66aa14 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -58,7 +58,6 @@ Numberspad=የቁጥሮች ፓድ
 BillsCoinsPad=ሳንቲሞች እና የባንክ ኖቶች ፓድ
 DolistorePosCategory=የ TakePOS ሞጁሎች እና ሌሎች የ POS መፍትሄዎች ለ Dolibarr
 TakeposNeedsCategories=TakePOS ለመስራት ቢያንስ አንድ የምርት ምድብ ያስፈልገዋል
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS በ<b>%s<span class='notranslate'></b> ምድብ ስር ቢያንስ 1 የምርት ምድብ ያስፈልገዋል። ሥራ
 OrderNotes=በእያንዳንዱ የታዘዙ ዕቃዎች ላይ አንዳንድ ማስታወሻዎችን ማከል ይችላል።
 CashDeskBankAccountFor=ለክፍያዎች የሚውል ነባሪ መለያ
 NoPaimementModesDefined=በ TakePOS ውቅረት ውስጥ ምንም ዓይነት የመዳኛ ሁነታ አልተገለጸም።
@@ -136,7 +135,6 @@ PrintWithoutDetailsLabelDefault=ያለ ዝርዝሮች በማተም ላይ የ
 PrintWithoutDetails=ያለ ዝርዝሮች አትም
 YearNotDefined=ዓመት አልተገለጸም።
 TakeposBarcodeRuleToInsertProduct=ምርት ለማስገባት የአሞሌ ኮድ
-TakeposBarcodeRuleToInsertProductDesc=የምርት ማመሳከሪያውን + ብዛት ከተቃኘ ባርኮድ ለማውጣት ደንብ።<br>ባዶ ከሆነ (ነባሪ እሴት) ትግበራ ምርቱን ለማግኘት የተቃኘውን ሙሉ ባርኮድ ይጠቀማል።<br><br>ከተገለጸ አገባብ የሚከተለው መሆን አለበት፡<br><spanlate'='notranslate'='notranslate <b></span>ref:NB+qu:NB+qd:NB+other:NB</b><br> የት ነው NB ከተቃኘው ባር ኮድ ለማውጣት የሚጠቀሙባቸው የቁምፊዎች ብዛት፡-<span class='notranslate'><br><b>refb09a4f739f ፡ የምርት ማጣቀሻ<br><b>qu</b>s ንጥል (ዩኒቶች) በሚያስገቡበት ጊዜ ያቀናብሩ<span class='notranslate'><br><b>qdb09a4b739f17f80: qud ንጥል ሲያስገቡ ይዘጋጃሉ (አስርዮሽ)<span class='notranslate'><br><b>ሌላ<span class='notranslate'>b09a4b739f17f>ሌሎችም:09a4b739f17f8z
 AlreadyPrinted=አስቀድሞ ታትሟል
 HideCategories=የምድብ ምርጫውን ሙሉውን ክፍል ደብቅ
 HideStockOnLine=በመስመር ላይ ክምችትን ደብቅ
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index ec7a3df997c..6d9dfd4bacd 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -15,12 +15,8 @@ ErrorGroupAlreadyExists=ቡድን %s አስቀድሞ አለ።
 ErrorEmailAlreadyExists=ኢሜይል %s አስቀድሞ አለ።
 ErrorRecordNotFound=መዝገብ አልተገኘም።
 ErrorRecordNotFoundShort=አልተገኘም
-ErrorFailToCopyFile=ፋይል '<b>%s</b> ወደ "መቅዳት አልተሳካም ='notranslate'><b></span>%s</b>'።
-ErrorFailToCopyDir=ማውጫ '<b>%s</b> ወደ 'ክፍል መቅዳት አልተሳካም ='notranslate'><b></span>%s</b>'።
-ErrorFailToRenameFile=የፋይሉን ስም መቀየር አልተሳካም <b>%s</b> ወደ 'ክፍል' ='notranslate'><b></span>%s</b>'።
 ErrorFailToDeleteFile=ፋይል '<b>%s</b>' ማስወገድ አልተሳካም።
 ErrorFailToCreateFile=ፋይል መፍጠር አልተሳካም '<b>%s</b>'።
-ErrorFailToRenameDir=ማውጫ '<b>%s</b> ክፍል ውስጥ እንደገና መሰየም አልተሳካም ='notranslate'><b></span>%s</b>'።
 ErrorFailToCreateDir=ማውጫ '<b>%s</b>' ማውጫ መፍጠር አልተሳካም።
 ErrorFailToDeleteDir=ማውጫ '<b>%s</b>' መሰረዝ አልተሳካም።
 ErrorFailToMakeReplacementInto=በፋይል '<b>%s</b>' ፋይል ማድረግ አልተሳካም።
@@ -51,7 +47,6 @@ ErrorBadDateFormat=እሴት %s የተሳሳተ የቀን ቅርጸት አለው
 ErrorWrongDate=ቀኑ ትክክል አይደለም!
 ErrorFailedToWriteInDir=ማውጫ %s ውስጥ መጻፍ አልተሳካም
 ErrorFailedToBuildArchive=የማህደር ፋይል %s መገንባት አልተሳካም
-ErrorFoundBadEmailInFile=በፋይል ውስጥ ለ%s መስመሮች ትክክል ያልሆነ የኢሜይል አገባብ ተገኝቷል (ምሳሌ መስመር %sከኢሜይል ጋር=<span class='notranslate'>b0ecb42ec / span>)
 ErrorUserCannotBeDelete=ተጠቃሚ ሊሰረዝ አይችልም። ምናልባት ከዶሊባርር አካላት ጋር የተያያዘ ሊሆን ይችላል.
 ErrorFieldsRequired=አንዳንድ አስፈላጊ መስኮች ባዶ ቀርተዋል።
 ErrorSubjectIsRequired=የኢሜል ርዕሰ ጉዳይ ያስፈልጋል
@@ -81,7 +76,6 @@ ErrorNoValueForRadioType=እባክዎ ለሬዲዮ ዝርዝር ዋጋ ይሙሉ
 ErrorBadFormatValueList=የዝርዝሩ እሴት ከአንድ በላይ ነጠላ ሰረዝ ሊኖረው አይችልም፡ <u>%s</u>, ግን ቢያንስ አንድ ያስፈልግዎታል: ቁልፍ ፣ እሴት
 ErrorFieldCanNotContainSpecialCharacters=መስኩ <b>%s</b> ልዩ ቁምፊዎችን መያዝ የለበትም።
 ErrorFieldCanNotContainSpecialNorUpperCharacters=መስኩ <b>%s</b> ልዩ ቁምፊዎችን መያዝ የለበትም ቁምፊዎች፣ እና በፊደል ፊደል (a-z) መጀመር አለበት።
-ErrorFieldMustHaveXChar=መስኩ <b>%s</b> ቢያንስ <span ክፍል ሊኖረው ይገባል notranslate'>%s</span> ቁምፊዎች።
 ErrorNoAccountancyModuleLoaded=ምንም የሂሳብ ሞጁል አልነቃም።
 ErrorExportDuplicateProfil=ይህ የመገለጫ ስም አስቀድሞ ለዚህ ወደ ውጭ መላኪያ ስብስብ አለ።
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP ማዛመድ አልተጠናቀቀም።
@@ -94,11 +88,7 @@ ErrorRecordIsUsedCantDelete=መዝገብ መሰረዝ አልተቻለም። አ
 ErrorModuleRequireJavascript=ይህ ባህሪ እንዲሰራ JavaScript መሰናከል የለበትም። ጃቫ ስክሪፕትን ለማንቃት/ለማሰናከል ወደ ሜኑ መነሻ->ማዋቀር->ማሳያ ይሂዱ።
 ErrorPasswordsMustMatch=ሁለቱም የተተየቡ የይለፍ ቃሎች እርስ በእርስ መመሳሰል አለባቸው
 ErrorContactEMail=የቴክኒክ ስህተት ተከስቷል። እባኮትን ለሚከተለው ኢሜል አስተዳዳሪን ያግኙ <b>%s</b>እና ስህተቱን ያቅርቡ code <b>%s</b>በመልዕክትህ ውስጥ ወይም ስክሪን ኮፒ ጨምር። ይህ ገጽ.
-ErrorWrongValueForField=መስክ <b>%s</b>: '<span' class=' <b></span>%s</b>' ከ regex ህግ ጋር አይዛመድም <span class='notranslate3>7f8f8f8s %s</b>
 ErrorHtmlInjectionForField=መስክ <b>%s</b>= እሴቱ '<slate' '><b></span>%s</b>' የማይፈቀድ ተንኮል አዘል ውሂብ ይዟል።
-ErrorFieldValueNotIn=መስክ <b>%s</b>: '<span' class=' <b></span>%s</b> በመስክ ላይ የተገኘ እሴት አይደለም <span class='notranslate'7f8f8f85z0 span>%s</b> የ b0aee833365837fz0<span' class=' %s</span></b>
-ErrorFieldRefNotIn=መስክ <b>%s</b>: '<span' class=' <b></span>%s</b>የ<span class><span><span><span class="verse"> 30838 class='notranslate'>%s</span></b> ነባር ማጣቀሻ
-ErrorMultipleRecordFoundFromRef=ከ ref <b>%s</b><span class='notranslate'></b>s ሲፈለግ ብዙ ሪከርዶች ተገኝተዋል። የትኛውን መታወቂያ መጠቀም እንዳለብን ለማወቅ ምንም መንገድ የለም።
 ErrorsOnXLines=%s ስህተቶች ተገኝተዋል
 ErrorFileIsInfectedWithAVirus=የጸረ-ቫይረስ ፕሮግራሙ ፋይሉን ማረጋገጥ አልቻለም (ፋይሉ በቫይረስ ሊጠቃ ይችላል)
 ErrorFileIsAnInfectedPDFWithJSInside=ፋይሉ በውስጡ በአንዳንድ ጃቫ ስክሪፕት የተበከለ ፒዲኤፍ ነው።
@@ -219,7 +209,6 @@ ErrorPhpMailDelivery=በጣም ብዙ የተቀባዮችን ቁጥር እንደ
 ErrorUserNotAssignedToTask=ተጠቃሚው የሚፈጀውን ጊዜ ማስገባት እንዲችል ለተግባር መመደብ አለበት።
 ErrorTaskAlreadyAssigned=ተግባር አስቀድሞ ለተጠቃሚ ተሰጥቷል።
 ErrorModuleFileSeemsToHaveAWrongFormat=የሞጁሉ ጥቅል የተሳሳተ ቅርጸት ያለው ይመስላል።
-ErrorModuleFileSeemsToHaveAWrongFormat2=ቢያንስ አንድ የግዴታ ማውጫ ወደ ሞጁል ዚፕ ውስጥ መኖር አለበት፡ <strong>%sb0a65d09z071fs > ወይም <span class='notranslate'><strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=የሞጁሉ ጥቅል ስም (<strong>%s</strong> አይመሳሰልም የሚጠበቀው ስም አገባብ፡ <strong>%s</strong>
 ErrorDuplicateTrigger=ስህተት፣ የተባዛ የማስነሻ ስም %s። ቀድሞውንም ከ%s ተጭኗል።
 ErrorNoWarehouseDefined=ስህተት፣ ምንም መጋዘኖች አልተገለጹም።
@@ -260,12 +249,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=ለዚህ ሎጥ/ተከታ
 ErrorOnlyOneFieldForGroupByIsPossible=ለ'ግሩፕ በ' 1 መስክ ብቻ ይቻላል (ሌሎች ይጣላሉ)
 ErrorTooManyDifferentValueForSelectedGroupBy=በጣም ብዙ የተለያዩ እሴቶች ተገኝተዋል (ከ<b>%s</b> ለ) መስክ '<b>%s</b>' ስለዚህ ልንጠቀምበት አንችልም። ለግራፊክስ እንደ 'ቡድን'። መስክ 'Group By' ተወግዷል። እንደ X-Axis ሊጠቀሙበት ይፈልጉ ይሆናል?
 ErrorReplaceStringEmpty=ስህተት፣ የሚተካው ሕብረቁምፊ ባዶ ነው።
-ErrorProductNeedBatchNumber=ስህተት፣ ምርት '<b>%s<span class='notranslate'></b></spanse>ቁጥር ብዙ ያስፈልገዋል
 ErrorProductDoesNotNeedBatchNumber=ስህተት፣ ምርት '<b>%s</b>ዕጣ አይቀበልም ተከታታይ ቁጥር
 ErrorFailedToReadObject=ስህተት፣ የነገር አይነት ማንበብ አልተሳካም <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=ስህተት፣ ፓራሜትር <b>%s</b>=span> ክፍል መንቃት አለበት 'notranslate'><b>conf/conf.php</b> የትእዛዝ መስመር በይነገጽን በውስጣዊ የስራ መርሐግብር ለመጠቀም ያስችላል።
 ErrorLoginDateValidity=ስህተት፣ ይህ መግቢያ ከትክክለኛው የቀን ክልል ውጭ ነው።
-ErrorValueLength=የመስክ ርዝመት '<b>%s</b>ከ'' በላይ መሆን አለበት<span> span class='notranslate'><b></span>%s</b>'
 ErrorReservedKeyword=<b>%s</b> የሚለው ቃል የተያዘ ቁልፍ ቃል ነው።
 ErrorFilenameReserved=የፋይል ስም <b>%s</b> ጥቅም ላይ ሊውል አይችልም. የተጠበቀ እና የተጠበቀ ትእዛዝ.
 ErrorNotAvailableWithThisDistribution=በዚህ ስርጭት አይገኝም
@@ -337,7 +323,6 @@ WarningParamUploadMaxFileSizeHigherThanPostMaxSize=የእርስዎ ፒኤችፒ
 WarningPasswordSetWithNoAccount=ለዚህ አባል የይለፍ ቃል ተቀናብሯል። ሆኖም የተጠቃሚ መለያ አልተፈጠረም። ስለዚህ ይህ የይለፍ ቃል ተከማችቷል ነገር ግን ወደ ዶሊባርር ለመግባት መጠቀም አይቻልም። በውጫዊ ሞጁል/በይነገጽ ጥቅም ላይ ሊውል ይችላል ነገር ግን ለአባል ምንም አይነት መግቢያም ሆነ የይለፍ ቃል መግለጽ ካላስፈለገዎት ከአባላት ሞጁል ቅንብር "ለእያንዳንዱ አባል መግቢያን ያስተዳድሩ" የሚለውን አማራጭ ማሰናከል ይችላሉ። መግቢያን ማስተዳደር ከፈለጉ ነገር ግን ምንም የይለፍ ቃል የማይፈልጉ ከሆነ ይህንን ማስጠንቀቂያ ለማስወገድ ይህንን መስክ ባዶ ማቆየት ይችላሉ። ማሳሰቢያ፡ አባሉ ከተጠቃሚ ጋር የተገናኘ ከሆነ ኢሜል እንደ መግቢያ መጠቀምም ይችላል።
 WarningMandatorySetupNotComplete=ዋና መለኪያዎችን ለማዘጋጀት እዚህ ጠቅ ያድርጉ
 WarningEnableYourModulesApplications=የእርስዎን ሞጁሎች እና መተግበሪያዎች ለማንቃት እዚህ ጠቅ ያድርጉ
-WarningSafeModeOnCheckExecDir=ማስጠንቀቂያ፣ የPHP አማራጭ <b>safe_mode</b> ስላለ ትዕዛዙ በ php መለኪያ በተገለጸው ማውጫ ውስጥ መቀመጥ አለበት <span class='' notranslate'><b></span>safe_mode_exec_dir</b>።
 WarningBookmarkAlreadyExists=ይህ ርዕስ ወይም ይህ ኢላማ (ዩአርኤል) ያለው ዕልባት አስቀድሞ አለ።
 WarningPassIsEmpty=ማስጠንቀቂያ፣ የውሂብ ጎታ ይለፍ ቃል ባዶ ነው። ይህ የደህንነት ጉድጓድ ነው. ይህንን ለማንፀባረቅ የይለፍ ቃል ወደ የውሂብ ጎታዎ ማከል እና የእርስዎን conf.php ፋይል መለወጥ አለብዎት።
 WarningConfFileMustBeReadOnly=ማስጠንቀቂያ፣ የእርስዎ የማዋቀር ፋይል (<b>htdocs/conf/conf.php</b>) በድር አገልጋይ ሊገለበጥ ይችላል። ይህ ከባድ የደህንነት ጉድጓድ ነው. በድር አገልጋይ ለሚጠቀመው የስርዓተ ክወና ተጠቃሚ የፋይል ፈቃዶችን በንባብ ብቻ ሁነታ ላይ ቀይር። ለዲስክዎ ዊንዶውስ እና ፋት (FAT) ቅርፀትን የሚጠቀሙ ከሆነ ይህ የፋይል ስርዓት በፋይል ላይ ፍቃዶችን ለመጨመር እንደማይፈቅድ ማወቅ አለብዎት ስለዚህ ሙሉ በሙሉ ደህንነቱ የተጠበቀ ሊሆን አይችልም.
@@ -349,13 +334,11 @@ WarningCloseAlways=ማስጠንቀቂያ፣ መጠኑ በምንጭ እና በዒ
 WarningUsingThisBoxSlowDown=ማስጠንቀቂያ፣ ይህን ሳጥን በመጠቀም ሳጥኑን የሚያሳዩ ሁሉንም ገጾች በቁም ነገር ይቀንሱ።
 WarningClickToDialUserSetupNotComplete=ለተጠቃሚዎ የ ClickToDial መረጃ ማዋቀር አልተጠናቀቀም (በተጠቃሚ ካርድዎ ላይ ጠቅ ለማድረግ ጠቅ ያድርጉ)።
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=የማሳያ ማዋቀር ለዓይነ ስውራን ወይም ለጽሑፍ አሳሾች ሲመቻች ባህሪው ተሰናክሏል።
-WarningPaymentDateLowerThanInvoiceDate=የክፍያ ቀን (%s) ከክፍያ መጠየቂያ ቀን (%s) ለክፍያ መጠየቂያ <span class='notranslate'>b0ecb2fz007fe span>
 WarningTooManyDataPleaseUseMoreFilters=በጣም ብዙ ውሂብ (ከ%s መስመሮች በላይ)። እባክዎ ተጨማሪ ማጣሪያዎችን ይጠቀሙ ወይም ቋሚውን %s ወደ ከፍተኛ ገደብ ያቀናብሩ።
 WarningSomeLinesWithNullHourlyRate=አንዳንድ ጊዜ በአንዳንድ ተጠቃሚዎች የተመዘገቡ ሲሆን የሰዓት ታሪካቸው አልተገለጸም። በሰዓት 0 %s ዋጋ ጥቅም ላይ ውሏል ነገር ግን ይህ ያጠፋውን ጊዜ የተሳሳተ ግምትን ሊያስከትል ይችላል።
 WarningYourLoginWasModifiedPleaseLogin=መግቢያህ ተስተካክሏል። ለደህንነት አላማ ከሚቀጥለው እርምጃ በፊት በአዲሱ መግቢያህ መግባት አለብህ።
 WarningYourPasswordWasModifiedPleaseLogin=የይለፍ ቃልህ ተስተካክሏል። ለደህንነት ሲባል በአዲሱ የይለፍ ቃልዎ አሁን መግባት ይኖርብዎታል።
 WarningAnEntryAlreadyExistForTransKey=ለዚህ ቋንቋ ለትርጉም ቁልፍ መግቢያ አስቀድሞ አለ።
-WarningNumberOfRecipientIsRestrictedInMassAction=ማስጠንቀቂያ፣ የተለያዩ ተቀባይዎች ቁጥር በ<b>%s<span class='notranslate'>b09a4b739f17f80 በመጠቀም የተገደበ ነው። በዝርዝሮች ላይ የጅምላ ድርጊቶች
 WarningDateOfLineMustBeInExpenseReportRange=ማስጠንቀቂያ፣ የመስመሩ ቀን በወጪ ሪፖርቱ ክልል ውስጥ አይደለም።
 WarningProjectDraft=ፕሮጀክቱ አሁንም በረቂቅ ሁነታ ላይ ነው። ተግባሮችን ለመጠቀም ካቀዱ ማረጋገጥዎን አይርሱ።
 WarningProjectClosed=ፕሮጀክቱ ተዘግቷል። መጀመሪያ እንደገና መክፈት አለብህ።
@@ -373,7 +356,6 @@ WarningModuleNeedRefresh = ሞጁል <b>%s</b> ተሰናክሏል። እሱን 
 WarningPermissionAlreadyExist=ለዚህ ነገር ነባር ፈቃዶች
 WarningGoOnAccountancySetupToAddAccounts=ይህ ዝርዝር ባዶ ከሆነ ወደ ሜኑ ይሂዱ %s - %s - %s ለመለያ ገበታዎ መለያዎችን ለመጫን ወይም ለመፍጠር።
 WarningCorrectedInvoiceNotFound=የተስተካከለ ደረሰኝ አልተገኘም።
-WarningCommentNotFound=እባክዎ ለ<b>%s</b> ውስጥ ለ<span class='notranslate'>አስተያየቶች አቀማመጥን ያረጋግጡ። እርምጃዎን ከማስገባትዎ በፊት ፋይል <span class='notranslate'><b>%s</b>
 WarningAlreadyReverse=የአክሲዮን እንቅስቃሴ አስቀድሞ ተቀልብሷል
 
 SwissQrOnlyVIR = የስዊስQR ደረሰኝ በክሬዲት ማስተላለፍ ክፍያዎች እንዲከፈሉ በተዘጋጁ ደረሰኞች ላይ ብቻ መጨመር ይችላል።
diff --git a/htdocs/langs/am_ET/eventorganization.lang b/htdocs/langs/am_ET/eventorganization.lang
index 4dffc1e3122..6db909b41ad 100644
--- a/htdocs/langs/am_ET/eventorganization.lang
+++ b/htdocs/langs/am_ET/eventorganization.lang
@@ -36,7 +36,6 @@ EventOrganizationSetup=የክስተት ድርጅት ማዋቀር
 EventOrganization=የክስተት ድርጅት
 EventOrganizationSetupPage = የክስተት ድርጅት ማዋቀር ገጽ
 EVENTORGANIZATION_TASK_LABEL = ፕሮጀክቱ ሲረጋገጥ በራስ ሰር የሚፈጠሩ የተግባር መለያዎች
-EVENTORGANIZATION_TASK_LABELTooltip = አንድን ክስተት ለማደራጀት ሲያረጋግጡ አንዳንድ ተግባራት በፕሮጀክቱ ውስጥ በራስ ሰር ሊፈጠሩ ይችላሉ<br><br>ለምሳሌ፡ <br>የኮንፈረንስ ጥሪ ይላኩ<br>ጥሪ ለቡዝ ላክ<br>Valid Conference classes ='notranslate'><br></span>የቡትስ ማመልከቻን አረጋግጥ<br>ለክስተቱ የደንበኝነት ምዝገባዎችን ለተሳታፊዎች ክፈትb0342fccfda19b>b0342fccfda19b> የዝግጅቱ ድምጽ ለተናጋሪዎች<span class='notranslate'><br>የዝግጅቱን አስታዋሽ ለቡዝ አስተናጋጆች ይላኩ<br>ክስተቱን ለተሰብሳቢዎች አስታዋሽ ላክ
 EVENTORGANIZATION_TASK_LABELTooltip2=ስራዎችን በራስ-ሰር መፍጠር ካላስፈለገዎት ባዶ ያስቀምጡ።
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = የሆነ ሰው ጉባኤን ሲጠቁም ወደ ሶስተኛ ወገኖች የሚታከል ምድብ
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = ዳስ ሲጠቁሙ ወደ ሶስተኛ ወገኖች የሚታከሉ ምድብ
@@ -127,7 +126,6 @@ PublicAttendeeSubscriptionPage = ለዚህ ክስተት ብቻ የህዝብ ግ
 MissingOrBadSecureKey = የደህንነት ቁልፉ ልክ ያልሆነ ወይም ጠፍቷል
 EvntOrgWelcomeMessage = ይህ ቅጽ ለዝግጅቱ እንደ አዲስ ተሳታፊ እንዲመዘገቡ ያስችልዎታል
 EvntOrgDuration = ይህ ኮንፈረንስ በ%s ይጀምር እና በ%s ላይ ያበቃል።
-ConferenceAttendeeFee = የስብሰባው ተሳታፊዎች ክፍያ ለዝግጅቱ፡ '%sከ%s እስከ <span class='notranslate'>b0ecb2ec87fe49fez0 >.
 BoothLocationFee = የዝግጅቱ ቦታ፡ '%s ከ%s እስከ b0ecb2ec87fe49fez0 የሚከሰት
 EventType = የክስተት አይነት
 LabelOfBooth=የዳስ መለያ
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index 25c717611bc..7c6a0b14070 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -83,42 +83,29 @@ SelectFormat=ይህን የማስመጣት ፋይል ቅርጸት ይምረጡ
 RunImportFile=ውሂብ አስመጣ
 NowClickToRunTheImport=የማስመጣት ማስመሰል ውጤቶችን ያረጋግጡ። ማናቸውንም ስህተቶች ያስተካክሉ እና እንደገና ይሞክሩ።<br>አስመሳይው ምንም ስህተት እንደሌለው ሲገልጽ ውሂቡን ወደ ዳታቤዝ ማስገባት መቀጠል ይችላሉ።
 DataLoadedWithId=የገባው ውሂብ በእያንዳንዱ የውሂብ ጎታ ሠንጠረዥ ውስጥ ይህ የማስመጣት መታወቂያ ያለው ተጨማሪ መስክ ይኖረዋል፡ <b>%s</b>፣ ከዚህ ማስመጣት ጋር የተያያዘ ችግርን በማጣራት ላይ እንዲፈለግ ለማድረግ።
-ErrorMissingMandatoryValue=አስገዳጅ ውሂብ በአምድ <b>%s<span class='notranslate'></b> ላይ ባለው የምንጭ ፋይል ውስጥ ባዶ ነው።
 TooMuchErrors=አሁንም አሉ <b>%s</b>ሌሎች የውጤት መስመሮች ግን ስህተቶች አሏቸው ተገድቧል።
 TooMuchWarnings=አሁንም አሉ <b>%s</b>ሌሎች የውጤት መስመሮች ግን ማስጠንቀቂያዎች አሉት ተገድቧል።
 EmptyLine=ባዶ መስመር (ይወገዳል)
-CorrectErrorBeforeRunningImport=አንተ <b> አለብህ</b> ሁሉንም ስህተቶች ማረም <b> notranslate'></b></span>አስመጪውን እያሄደ ነው።
 FileWasImported=ፋይሉ የመጣው በቁጥር <b>%s</b> ነው።
 YouCanUseImportIdToFindRecord=በመስክ <b>import_key='%s'በማጣራት በውሂብ ጎታህ ውስጥ ማግኘት ትችላለህ። > </b>።
-NbOfLinesOK=ምንም ስህተቶች እና ማስጠንቀቂያዎች የሌሉባቸው መስመሮች ብዛት፡ <b>%s</b><span class='notranslate'></b>
 NbOfLinesImported=በተሳካ ሁኔታ የገቡ የመስመሮች ብዛት፡ <b>%s</b>።
 DataComeFromNoWhere=የማስገባት እሴት ከምንጭ ፋይል ውስጥ ከየትም አይመጣም።
 DataComeFromFileFieldNb=የማስገባት እሴት ከአምድ <b>%s</b> ምንጭ ፋይል ይመጣል።
-DataComeFromIdFoundFromRef=ከምንጩ ፋይል የሚመጣው እሴት የሚጠቀመውን የወላጅ ነገር መታወቂያ ለማግኘት ጥቅም ላይ ይውላል (ስለዚህ ነገሩ <b>%s</span ከምንጭ ፋይል ማጣቀሻ ያለው ><span class='notranslate'></b>በመረጃ ቋቱ ውስጥ መኖር አለበት።
-DataComeFromIdFoundFromCodeId=ከምንጩ ፋይል የሚመጣው ኮድ ዋጋ የሚጠቀመው የወላጅ ነገር መታወቂያ ለማግኘት ጥቅም ላይ ይውላል (ስለዚህ ከምንጩ ፋይል የሚገኘው ኮድ በመዝገበ ቃላት <b><span class) ውስጥ መኖር አለበት ='notranslate'>%s</span></b>)። መታወቂያውን ካወቁ ከኮዱ ይልቅ በምንጭ ፋይሉ ውስጥ ሊጠቀሙበት እንደሚችሉ ልብ ይበሉ። ማስመጣት በሁለቱም ሁኔታዎች መስራት አለበት.
 DataIsInsertedInto=ከምንጩ ፋይል የሚመጣው ውሂብ በሚከተለው መስክ ውስጥ ይገባል፡-
 DataIDSourceIsInsertedInto=በምንጭ ፋይል ውስጥ ያለውን ውሂብ ተጠቅሞ የተገኘው የወላጅ ነገር መታወቂያ በሚከተለው መስክ ውስጥ ይገባል፡
 DataCodeIDSourceIsInsertedInto=ከኮድ የተገኘው የወላጅ መስመር መታወቂያ በሚከተለው መስክ ውስጥ ይገባል፡
 SourceRequired=የውሂብ ዋጋ ግዴታ ነው
 SourceExample=ሊሆን የሚችል የውሂብ እሴት ምሳሌ
 ExampleAnyRefFoundIntoElement=ለኤለመንት <b>%s</b> የተገኘ ማንኛውም ማጣቀሻ
-ExampleAnyCodeOrIdFoundIntoDictionary=መዝገበ ቃላት ውስጥ የተገኘ ማንኛውም ኮድ (ወይም መታወቂያ) <b>%s<span class='notranslate'></b>s
-CSVFormatDesc=<b>በነጠላ ሰረዝ የተለየ እሴት</b> የፋይል ቅርጸት (.csv)።b0342fccfda19 መስኮች በተከፋፋይ የሚለያዩበት የጽሑፍ ፋይል ቅርጸት ነው [ <span class='notranslate'>%s]። መለያየት በመስክ ይዘት ውስጥ ከተገኘ፣ ሜዳው በክብ ቁምፊ [%s የተጠጋጋ ነው። ክብ ቁምፊን ለማምለጥ የማምለጫ ቁምፊ [ %s ነው.
-Excel95FormatDesc=<b>Excel</b> የፋይል ቅርጸት (.xls)<span class='notranslate'><br> ይህ ነው</s napan napan የ Excel 95 ቅርጸት (BIFF5)።
-Excel2007FormatDesc=<b>Excel</b> የፋይል ቅርጸት (.xlsx)<span class='notranslate'><br> ነው የ Excel 2007 ቅርጸት (የተመን ሉህ ኤምኤል)።
-TsvFormatDesc=<b>ትር የተለየ እሴት</b> የፋይል ቅርጸት (.tsv)<span class='notranslate'>b0342fccfda19 ነው መስኮች በታቡሌተር [tab] የሚለያዩበት የጽሑፍ ፋይል ቅርጸት።
 ExportFieldAutomaticallyAdded=መስክ <b>%s</b> በቀጥታ ታክሏል። ተመሳሳይ መስመሮች እንደ የተባዛ መዝገብ እንዲታዩ ያደርግዎታል (ይህ መስክ ሲጨመር ሁሉም መስመሮች የራሳቸው መታወቂያ ይኖራቸዋል እና ይለያያሉ)።
 CsvOptions=የCSV ቅርጸት አማራጮች
 Separator=የመስክ መለያያ
 Enclosure=ሕብረቁምፊ Delimiter
 SpecialCode=ልዩ ኮድ
 ExportStringFilter=%% በጽሁፉ ውስጥ አንድ ወይም ከዚያ በላይ ቁምፊዎችን ለመተካት ይፈቅዳል.
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day1YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days2 > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days3 < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value1NNNNN+NNNNN filters over a range of values2< NNNNN filters by lower values3> NNNNN filters by higher values
 ImportFromLine=ከመስመር ቁጥር ጀምሮ አስመጣ
 EndAtLineNb=በመስመር ቁጥር ጨርስ
 ImportFromToLine=ክልል ገድብ (ከ - ወደ)። ለምሳሌ. የራስጌ መስመር(ዎችን) ለመተው።
-SetThisValueTo2ToExcludeFirstLine=ለምሳሌ፣ 2ቱን የመጀመሪያ መስመሮች ለማስቀረት ይህንን እሴት ወደ 3 ያዋቅሩት።<br>የራስጌ መስመሮቹ ካልተዘለሉ፣ ይህ በአስመጪ ማስመሰያው ላይ በርካታ ስህተቶችን ያስከትላል።
 KeepEmptyToGoToEndOfFile=ሁሉንም መስመሮች እስከ ፋይሉ መጨረሻ ድረስ ለማስኬድ ይህንን መስክ ባዶ ያድርጉት።
 SelectPrimaryColumnsForUpdateAttempt=ለዝማኔ ማስመጣት እንደ ዋና ቁልፍ ለመጠቀም አምድ(ዎችን) ምረጥ
 UpdateNotYetSupportedForThisImport=ለዚህ አይነት ማስመጣት አይደገፍም (አስገባ ብቻ)
diff --git a/htdocs/langs/am_ET/holiday.lang b/htdocs/langs/am_ET/holiday.lang
index d5285b38b97..fd9e86e9f81 100644
--- a/htdocs/langs/am_ET/holiday.lang
+++ b/htdocs/langs/am_ET/holiday.lang
@@ -27,7 +27,6 @@ UserForApprovalLastname=የተፈቀደ ተጠቃሚ የመጨረሻ ስም
 UserForApprovalLogin=የፍቃድ ተጠቃሚ መግቢያ
 DescCP=መግለጫ
 SendRequestCP=የእረፍት ጥያቄ ፍጠር
-DelayToRequestCP=የመልቀቅ ጥያቄ ቢያንስ <b>%s ቀን(ዎች)<span class='notranslate'>b09a4b739f17f80 ከነሱ በፊት.
 MenuConfCP=የእረፍት ጊዜ ሚዛን
 SoldeCPUser=ቀሪ ሂሳብን ይተው (በቀናት ውስጥ)፡ <b>%s</b>
 ErrorEndDateCP=ከመጀመሪያው ቀን የሚበልጥ የመጨረሻ ቀን መምረጥ አለብህ።
diff --git a/htdocs/langs/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index f5babec9d03..e6e76953d3c 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -50,7 +50,6 @@ MailingStatusReadAndUnsubscribe=ያንብቡ እና ከደንበኝነት ምዝ
 ErrorMailRecipientIsEmpty=ኢሜይል ተቀባይ ባዶ ነው።
 WarningNoEMailsAdded=ወደ ተቀባይ ዝርዝር የሚታከል አዲስ ኢሜይል የለም።
 ConfirmValidMailing=እርግጠኛ ነዎት ይህን ኢሜል ማረጋገጥ ይፈልጋሉ?
-ConfirmResetMailing=ማስጠንቀቂያ፣ ኢሜል መላክን እንደገና በማስጀመር <b>%s<span class='notranslate'></b> ይፈቅዳሉ ይህንን ኢሜል በጅምላ መላክ ላይ እንደገና የላከው። እርግጠኛ ነዎት ይህን ማድረግ ይፈልጋሉ?
 ConfirmDeleteMailing=እርግጠኛ ነዎት ይህን ኢሜል መሰረዝ ይፈልጋሉ?
 NbOfUniqueEMails=የልዩ ኢሜይሎች ቁጥር
 NbOfUniquePhones=No. of unique phones
@@ -147,7 +146,6 @@ UseFormatFileEmailToTarget=ከውጭ የመጣው ፋይል ቅርጸት ሊኖ
 UseFormatInputEmailToTarget=ሕብረቁምፊ ከቅርጸት ጋር አስገባ <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=ተቀባዮች (የላቀ ምርጫ)
 AdvTgtTitle=ሶስተኛ ወገኖችን ወይም አድራሻዎችን/አድራሻዎችን ዒላማ ለመምረጥ የግቤት መስኮችን ሙላ
-AdvTgtSearchTextHelp=%%ን እንደ ዱር ካርድ ተጠቀም። ለምሳሌ እንደ <b>jean, joe, jim</b> ያሉ ሁሉንም እቃዎች ለማግኘት  ማስገባት ትችላለህ <b>j%%</b> እንዲሁም መጠቀም ይችላሉ; እንደ እሴት መለያ ፣ እና ይጠቀሙ! ከዚህ ዋጋ በስተቀር. ለምሳሌ <b>jean;joe;jim%%;!jimo;!jimab07e53171 span><span class='notranslate'></b> ሁሉንም ጂንስ፣ ጆ፣ በጂም ይጀምሩ ነገር ግን በጂሞ አይጀምርም እና በጅማ የሚጀምር ሁሉ ኢላማ ያደርጋል።
 AdvTgtSearchIntHelp=ኢንት ወይም ተንሳፋፊ እሴትን ለመምረጥ ክፍተቱን ይጠቀሙ
 AdvTgtMinVal=ዝቅተኛው እሴት
 AdvTgtMaxVal=ከፍተኛው እሴት
@@ -182,13 +180,10 @@ IsAnAnswer=የመጀመሪያ ኢሜል መልስ ነው።
 RecordCreatedByEmailCollector=በኢሜል ሰብሳቢው የተፈጠረ መዝገብ %s ከኢሜል %s
 DefaultBlacklistMailingStatus=አዲስ እውቂያ ሲፈጥሩ የመስክ ነባሪ እሴት %s
 DefaultStatusEmptyMandatory=ባዶ ግን ግዴታ
-WarningLimitSendByDay=ማስጠንቀቂያ፡ የአብነትዎ ማዋቀር ወይም ውል በቀን የእርስዎን የኢሜይሎች ብዛት <b>%s<span class='notranslate' ይገድባል ></b></span>። ተጨማሪ ለመላክ መሞከር ምሳሌዎ እንዲቀንስ ወይም እንዲታገድ ሊያደርግ ይችላል። ከፍ ያለ ኮታ ከፈለጉ እባክዎን ድጋፍዎን ያግኙ።
 NoMoreRecipientToSendTo=ኢሜይሉን የሚልክለት ተቀባይ የለም።
 EmailOptedOut=የኢሜል ባለቤት በዚህ ኢሜይል እንዳያገኘው ጠይቀዋል።
 EvenUnsubscribe=መርጠው የወጡ ኢሜይሎችን ያካትቱ
 EvenUnsubscribeDesc=ኢሜይሎችን እንደ ዒላማ ሲመርጡ መርጠው የወጡ ኢሜይሎችን ያካትቱ። ለምሳሌ ለግዴታ አገልግሎት ኢሜይሎች ይጠቅማል።
-XEmailsDoneYActionsDone=%s ኢሜይሎች ቅድመ ብቃት ያላቸው፣ %s ኢሜይሎች በተሳካ ሁኔታ ተካሂደዋል (ለ<span class='notranslate'>b0ecb2ec87fe49f0</span) / የተከናወኑ ተግባራት)
 helpWithAi=Generate message from AI
-YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 6774ed247f6..478fa0a5b15 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -162,11 +162,16 @@ class LangTest extends CommonClassTest
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result == 0, 'Found a sequence <<<<< into the translation file '.$code.'/'.$file.'. Probably a bad merge of code were done.');
 
+				$reg = array();
+				$result = preg_match('/(.*)\'notranslate\'/im', $filecontent, $reg);	// A sequence of char we don't want
+				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+				$this->assertTrue($result == 0, 'Found a sequence tag \'notranslate\' into the translation file '.$code.'/'.$file.' in line '.$reg[1]);
+
 				if (!in_array($code, array('ar_SA'))) {
 					$reg = array();
 					$result = preg_match('/(.*)<([^a-z\/\s,=\(]1)/im', $filecontent, $reg);	// A sequence of char we don't want
 					//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
-					$this->assertTrue($result == 0, 'Found a sequence tag '.$reg[1].'<'.$reg[2].' into the translation file '.$code.'/'.$file.'.');
+					$this->assertTrue($result == 0, 'Found a sequence tag <'.$reg[2].' into the translation file '.$code.'/'.$file.' in line '.$reg[1]);
 				}
 			}
 		}

From f66b8987ec25c9c9da5e29e5561c2dbcba829e83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 12:40:11 +0100
Subject: [PATCH 0040/1862] Sync transifex

---
 htdocs/langs/am_ET/accountancy.lang       |   38 +
 htdocs/langs/am_ET/admin.lang             |   73 +-
 htdocs/langs/am_ET/agenda.lang            |    3 +
 htdocs/langs/am_ET/assets.lang            |  186 ++-
 htdocs/langs/am_ET/banks.lang             |    1 +
 htdocs/langs/am_ET/bills.lang             | 1228 +++++++++----------
 htdocs/langs/am_ET/bookmarks.lang         |   46 +-
 htdocs/langs/am_ET/boxes.lang             |  262 +++--
 htdocs/langs/am_ET/cashdesk.lang          |    2 +
 htdocs/langs/am_ET/categories.lang        |  203 ++--
 htdocs/langs/am_ET/commercial.lang        |  171 +--
 htdocs/langs/am_ET/companies.lang         |  821 ++++++-------
 htdocs/langs/am_ET/compta.lang            |  599 +++++-----
 htdocs/langs/am_ET/contracts.lang         |  203 ++--
 htdocs/langs/am_ET/cron.lang              |  173 +--
 htdocs/langs/am_ET/deliveries.lang        |   60 +-
 htdocs/langs/am_ET/dict.lang              |  697 +++++------
 htdocs/langs/am_ET/donations.lang         |    1 +
 htdocs/langs/am_ET/ecm.lang               |  103 +-
 htdocs/langs/am_ET/errors.lang            |   18 +
 htdocs/langs/am_ET/eventorganization.lang |    3 +
 htdocs/langs/am_ET/exports.lang           |   13 +
 htdocs/langs/am_ET/help.lang              |   44 +-
 htdocs/langs/am_ET/holiday.lang           |    2 +-
 htdocs/langs/am_ET/hrm.lang               |  166 +--
 htdocs/langs/am_ET/install.lang           |  420 +++----
 htdocs/langs/am_ET/interventions.lang     |  137 ++-
 htdocs/langs/am_ET/intracommreport.lang   |   48 +-
 htdocs/langs/am_ET/ldap.lang              |   56 +-
 htdocs/langs/am_ET/loan.lang              |   64 +-
 htdocs/langs/am_ET/mailmanspip.lang       |   52 +-
 htdocs/langs/am_ET/mails.lang             |    5 +
 htdocs/langs/am_ET/main.lang              |   41 +-
 htdocs/langs/am_ET/margins.lang           |   87 +-
 htdocs/langs/am_ET/members.lang           |    2 +-
 htdocs/langs/am_ET/modulebuilder.lang     |   10 +-
 htdocs/langs/am_ET/mrp.lang               |  245 ++--
 htdocs/langs/am_ET/multicurrency.lang     |    4 +-
 htdocs/langs/am_ET/opensurvey.lang        |  125 +-
 htdocs/langs/am_ET/orders.lang            |    4 +-
 htdocs/langs/am_ET/other.lang             |  617 +++++-----
 htdocs/langs/am_ET/partnership.lang       |    3 +-
 htdocs/langs/am_ET/paybox.lang            |   59 +-
 htdocs/langs/am_ET/paypal.lang            |   71 +-
 htdocs/langs/am_ET/printing.lang          |  104 +-
 htdocs/langs/am_ET/productbatch.lang      |   93 +-
 htdocs/langs/am_ET/products.lang          |  821 ++++++-------
 htdocs/langs/am_ET/projects.lang          |    4 +-
 htdocs/langs/am_ET/propal.lang            |    8 +-
 htdocs/langs/am_ET/receiptprinter.lang    |  163 +--
 htdocs/langs/am_ET/receptions.lang        |  108 +-
 htdocs/langs/am_ET/resource.lang          |   64 +-
 htdocs/langs/am_ET/salaries.lang          |   57 +-
 htdocs/langs/am_ET/sendings.lang          |  150 +--
 htdocs/langs/am_ET/sms.lang               |  100 +-
 htdocs/langs/am_ET/stocks.lang            |    8 +-
 htdocs/langs/am_ET/stripe.lang            |    4 +-
 htdocs/langs/am_ET/supplier_proposal.lang |  105 +-
 htdocs/langs/am_ET/ticket.lang            |    2 +-
 htdocs/langs/am_ET/trips.lang             |  296 ++---
 htdocs/langs/am_ET/users.lang             |  252 ++--
 htdocs/langs/am_ET/website.lang           |   18 +-
 htdocs/langs/am_ET/withdrawals.lang       |  317 ++---
 htdocs/langs/am_ET/workflow.lang          |   54 +-
 htdocs/langs/am_ET/zapier.lang            |   12 +-
 htdocs/langs/ar_EG/errors.lang            |    2 +
 htdocs/langs/ar_IQ/errors.lang            |    2 +
 htdocs/langs/ar_SA/admin.lang             |   24 +-
 htdocs/langs/ar_SA/boxes.lang             |   28 +-
 htdocs/langs/ar_SA/errors.lang            |    6 +-
 htdocs/langs/ar_SA/exports.lang           |    2 +-
 htdocs/langs/ar_SA/main.lang              |   27 +-
 htdocs/langs/ar_SA/modulebuilder.lang     |    2 +-
 htdocs/langs/ar_SA/stocks.lang            |    2 +-
 htdocs/langs/ar_SA/workflow.lang          |    2 +-
 htdocs/langs/az_AZ/accountancy.lang       |    8 +-
 htdocs/langs/az_AZ/admin.lang             |  113 +-
 htdocs/langs/az_AZ/agenda.lang            |    4 +-
 htdocs/langs/az_AZ/banks.lang             |    2 +-
 htdocs/langs/az_AZ/bills.lang             |   20 +-
 htdocs/langs/az_AZ/cashdesk.lang          |    4 +-
 htdocs/langs/az_AZ/companies.lang         |  795 +++++++------
 htdocs/langs/az_AZ/compta.lang            |   16 +-
 htdocs/langs/az_AZ/cron.lang              |  171 +--
 htdocs/langs/az_AZ/errors.lang            |   28 +-
 htdocs/langs/az_AZ/eventorganization.lang |    5 +-
 htdocs/langs/az_AZ/exports.lang           |   16 +-
 htdocs/langs/az_AZ/hrm.lang               |  164 +--
 htdocs/langs/az_AZ/install.lang           |  420 +++----
 htdocs/langs/az_AZ/ldap.lang              |   54 +-
 htdocs/langs/az_AZ/mails.lang             |    6 +-
 htdocs/langs/az_AZ/main.lang              |   36 +-
 htdocs/langs/az_AZ/modulebuilder.lang     |   10 +-
 htdocs/langs/az_AZ/mrp.lang               |  245 ++--
 htdocs/langs/az_AZ/multicurrency.lang     |    4 +-
 htdocs/langs/az_AZ/oauth.lang             |    2 +-
 htdocs/langs/az_AZ/orders.lang            |    2 +-
 htdocs/langs/az_AZ/other.lang             |  585 ++++-----
 htdocs/langs/az_AZ/partnership.lang       |    3 +-
 htdocs/langs/az_AZ/paypal.lang            |   71 +-
 htdocs/langs/az_AZ/products.lang          |  781 ++++++------
 htdocs/langs/az_AZ/propal.lang            |    2 +-
 htdocs/langs/az_AZ/receptions.lang        |  108 +-
 htdocs/langs/az_AZ/sendings.lang          |  150 +--
 htdocs/langs/az_AZ/stocks.lang            |    8 +-
 htdocs/langs/az_AZ/stripe.lang            |    2 +-
 htdocs/langs/az_AZ/supplier_proposal.lang |  109 +-
 htdocs/langs/az_AZ/ticket.lang            |    2 +-
 htdocs/langs/az_AZ/trips.lang             |  292 ++---
 htdocs/langs/az_AZ/users.lang             |  256 ++--
 htdocs/langs/az_AZ/website.lang           |   12 +-
 htdocs/langs/az_AZ/withdrawals.lang       |  317 ++---
 htdocs/langs/bg_BG/admin.lang             |   20 +-
 htdocs/langs/bg_BG/main.lang              |    3 +
 htdocs/langs/bg_BG/modulebuilder.lang     |    2 +-
 htdocs/langs/bg_BG/website.lang           |    2 +-
 htdocs/langs/bn_BD/accountancy.lang       |    7 +-
 htdocs/langs/bn_BD/admin.lang             |   86 +-
 htdocs/langs/bn_BD/agenda.lang            |    4 +-
 htdocs/langs/bn_BD/bills.lang             |    6 +-
 htdocs/langs/bn_BD/cashdesk.lang          |    2 +-
 htdocs/langs/bn_BD/companies.lang         |   12 +-
 htdocs/langs/bn_BD/compta.lang            |   20 +-
 htdocs/langs/bn_BD/cron.lang              |    5 +-
 htdocs/langs/bn_BD/errors.lang            |   14 +-
 htdocs/langs/bn_BD/eventorganization.lang |    3 +-
 htdocs/langs/bn_BD/exports.lang           |   12 +-
 htdocs/langs/bn_BD/help.lang              |    2 +-
 htdocs/langs/bn_BD/hrm.lang               |    2 +-
 htdocs/langs/bn_BD/install.lang           |    4 +-
 htdocs/langs/bn_BD/ldap.lang              |    2 +-
 htdocs/langs/bn_BD/mails.lang             |    4 +-
 htdocs/langs/bn_BD/main.lang              |   26 +-
 htdocs/langs/bn_BD/members.lang           |    2 +-
 htdocs/langs/bn_BD/modulebuilder.lang     |    8 +-
 htdocs/langs/bn_BD/mrp.lang               |    3 +-
 htdocs/langs/bn_BD/multicurrency.lang     |    4 +-
 htdocs/langs/bn_BD/orders.lang            |    2 +-
 htdocs/langs/bn_BD/other.lang             |    6 +-
 htdocs/langs/bn_BD/partnership.lang       |    3 +-
 htdocs/langs/bn_BD/paypal.lang            |    2 +-
 htdocs/langs/bn_BD/products.lang          |   12 +-
 htdocs/langs/bn_BD/receptions.lang        |    4 +-
 htdocs/langs/bn_BD/sendings.lang          |    4 +-
 htdocs/langs/bn_BD/stocks.lang            |    8 +-
 htdocs/langs/bn_BD/stripe.lang            |    2 +-
 htdocs/langs/bn_BD/trips.lang             |    8 +-
 htdocs/langs/bn_BD/users.lang             |    4 +-
 htdocs/langs/bn_BD/website.lang           |    8 +-
 htdocs/langs/bn_BD/withdrawals.lang       |    5 +-
 htdocs/langs/bn_IN/accountancy.lang       |    7 +-
 htdocs/langs/bn_IN/admin.lang             |   86 +-
 htdocs/langs/bn_IN/agenda.lang            |    4 +-
 htdocs/langs/bn_IN/banks.lang             |    2 +-
 htdocs/langs/bn_IN/bills.lang             |    4 +-
 htdocs/langs/bn_IN/cashdesk.lang          |    2 +-
 htdocs/langs/bn_IN/companies.lang         |   12 +-
 htdocs/langs/bn_IN/compta.lang            |   20 +-
 htdocs/langs/bn_IN/cron.lang              |    5 +-
 htdocs/langs/bn_IN/errors.lang            |   26 +-
 htdocs/langs/bn_IN/eventorganization.lang |    3 +-
 htdocs/langs/bn_IN/exports.lang           |   14 +-
 htdocs/langs/bn_IN/install.lang           |    6 +-
 htdocs/langs/bn_IN/ldap.lang              |    2 +-
 htdocs/langs/bn_IN/mails.lang             |    4 +-
 htdocs/langs/bn_IN/main.lang              |   26 +-
 htdocs/langs/bn_IN/members.lang           |    2 +-
 htdocs/langs/bn_IN/modulebuilder.lang     |    8 +-
 htdocs/langs/bn_IN/mrp.lang               |    3 +-
 htdocs/langs/bn_IN/multicurrency.lang     |    4 +-
 htdocs/langs/bn_IN/orders.lang            |    2 +-
 htdocs/langs/bn_IN/other.lang             |    6 +-
 htdocs/langs/bn_IN/partnership.lang       |    3 +-
 htdocs/langs/bn_IN/paypal.lang            |    2 +-
 htdocs/langs/bn_IN/products.lang          |   12 +-
 htdocs/langs/bn_IN/receptions.lang        |    2 -
 htdocs/langs/bn_IN/sendings.lang          |    4 +-
 htdocs/langs/bn_IN/stocks.lang            |    6 +-
 htdocs/langs/bn_IN/stripe.lang            |    2 +-
 htdocs/langs/bn_IN/trips.lang             |    8 +-
 htdocs/langs/bn_IN/users.lang             |    6 +-
 htdocs/langs/bn_IN/website.lang           |    8 +-
 htdocs/langs/bn_IN/withdrawals.lang       |   11 +-
 htdocs/langs/bs_BA/accountancy.lang       |    5 +-
 htdocs/langs/bs_BA/admin.lang             |   80 +-
 htdocs/langs/bs_BA/agenda.lang            |    4 +-
 htdocs/langs/bs_BA/bills.lang             |    6 +-
 htdocs/langs/bs_BA/companies.lang         |  268 +++--
 htdocs/langs/bs_BA/compta.lang            |    4 +-
 htdocs/langs/bs_BA/cron.lang              |   78 +-
 htdocs/langs/bs_BA/errors.lang            |   16 +-
 htdocs/langs/bs_BA/eventorganization.lang |    5 +-
 htdocs/langs/bs_BA/exports.lang           |   10 +-
 htdocs/langs/bs_BA/install.lang           |  172 +--
 htdocs/langs/bs_BA/mails.lang             |    2 +-
 htdocs/langs/bs_BA/main.lang              |    5 +-
 htdocs/langs/bs_BA/modulebuilder.lang     |    8 +-
 htdocs/langs/bs_BA/multicurrency.lang     |    2 +-
 htdocs/langs/bs_BA/other.lang             |  563 ++++-----
 htdocs/langs/bs_BA/partnership.lang       |    3 +-
 htdocs/langs/bs_BA/products.lang          |   16 +-
 htdocs/langs/bs_BA/stocks.lang            |    4 +-
 htdocs/langs/bs_BA/stripe.lang            |    2 +-
 htdocs/langs/bs_BA/ticket.lang            |    2 +-
 htdocs/langs/bs_BA/trips.lang             |  294 ++---
 htdocs/langs/bs_BA/website.lang           |   10 +-
 htdocs/langs/ca_ES/accountancy.lang       |    2 +-
 htdocs/langs/ca_ES/admin.lang             |   52 +-
 htdocs/langs/ca_ES/bills.lang             |    8 +-
 htdocs/langs/ca_ES/compta.lang            |    2 +-
 htdocs/langs/ca_ES/errors.lang            |    4 +-
 htdocs/langs/ca_ES/ldap.lang              |    2 +
 htdocs/langs/ca_ES/main.lang              |   11 +-
 htdocs/langs/ca_ES/modulebuilder.lang     |    4 +-
 htdocs/langs/ca_ES/website.lang           |    4 +-
 htdocs/langs/cs_CZ/main.lang              |    3 +
 htdocs/langs/da_DK/admin.lang             |   18 +-
 htdocs/langs/da_DK/eventorganization.lang |    3 +-
 htdocs/langs/da_DK/main.lang              |    5 +-
 htdocs/langs/da_DK/modulebuilder.lang     |    6 +-
 htdocs/langs/da_DK/other.lang             |   32 +-
 htdocs/langs/da_DK/products.lang          |   11 +-
 htdocs/langs/da_DK/resource.lang          |    2 +
 htdocs/langs/da_DK/website.lang           |    6 +-
 htdocs/langs/de_AT/datapolicy.lang        |   11 -
 htdocs/langs/de_CH/admin.lang             |    2 -
 htdocs/langs/de_CH/datapolicy.lang        |   11 -
 htdocs/langs/de_CH/orders.lang            |    1 -
 htdocs/langs/de_DE/admin.lang             |   94 +-
 htdocs/langs/de_DE/blockedlog.lang        |    2 +-
 htdocs/langs/de_DE/bookmarks.lang         |    2 +-
 htdocs/langs/de_DE/cron.lang              |    6 +-
 htdocs/langs/de_DE/ecm.lang               |   12 +-
 htdocs/langs/de_DE/eventorganization.lang |    3 +-
 htdocs/langs/de_DE/install.lang           |   14 +-
 htdocs/langs/de_DE/interventions.lang     |    9 +-
 htdocs/langs/de_DE/main.lang              |    9 +-
 htdocs/langs/de_DE/margins.lang           |    2 +-
 htdocs/langs/de_DE/mrp.lang               |   21 +-
 htdocs/langs/de_DE/opensurvey.lang        |    3 +-
 htdocs/langs/de_DE/other.lang             |    8 +-
 htdocs/langs/de_DE/products.lang          |   15 +-
 htdocs/langs/de_DE/receptions.lang        |    4 +-
 htdocs/langs/de_DE/resource.lang          |    6 +-
 htdocs/langs/de_DE/salaries.lang          |   10 +-
 htdocs/langs/de_DE/trips.lang             |    4 +-
 htdocs/langs/de_DE/users.lang             |    2 +-
 htdocs/langs/el_CY/errors.lang            |    2 -
 htdocs/langs/el_CY/holiday.lang           |    4 -
 htdocs/langs/el_CY/languages.lang         |    2 -
 htdocs/langs/el_CY/orders.lang            |    2 -
 htdocs/langs/el_CY/partnership.lang       |    2 -
 htdocs/langs/el_GR/accountancy.lang       |   21 +-
 htdocs/langs/el_GR/admin.lang             |   40 +-
 htdocs/langs/el_GR/main.lang              |   11 +-
 htdocs/langs/el_GR/other.lang             |    6 +-
 htdocs/langs/el_GR/resource.lang          |    4 +-
 htdocs/langs/el_GR/trips.lang             |  274 ++---
 htdocs/langs/en_AE/datapolicy.lang        |   11 -
 htdocs/langs/en_AE/errors.lang            |    4 -
 htdocs/langs/en_AE/holiday.lang           |    4 -
 htdocs/langs/en_AE/languages.lang         |    2 -
 htdocs/langs/en_AE/orders.lang            |    2 -
 htdocs/langs/en_AE/partnership.lang       |    2 -
 htdocs/langs/en_AU/datapolicy.lang        |   11 -
 htdocs/langs/en_AU/errors.lang            |    4 -
 htdocs/langs/en_AU/holiday.lang           |    4 -
 htdocs/langs/en_AU/languages.lang         |    2 -
 htdocs/langs/en_AU/orders.lang            |    2 -
 htdocs/langs/en_AU/partnership.lang       |    2 -
 htdocs/langs/en_CA/datapolicy.lang        |   11 -
 htdocs/langs/en_CA/errors.lang            |    4 -
 htdocs/langs/en_CA/holiday.lang           |    4 -
 htdocs/langs/en_CA/languages.lang         |    2 -
 htdocs/langs/en_CA/orders.lang            |    2 -
 htdocs/langs/en_CA/partnership.lang       |    2 -
 htdocs/langs/en_GB/admin.lang             |    2 -
 htdocs/langs/en_GB/datapolicy.lang        |   11 -
 htdocs/langs/en_GB/errors.lang            |    4 -
 htdocs/langs/en_GB/languages.lang         |    2 -
 htdocs/langs/en_IN/datapolicy.lang        |   11 -
 htdocs/langs/en_IN/errors.lang            |    4 -
 htdocs/langs/en_IN/holiday.lang           |    4 -
 htdocs/langs/en_IN/languages.lang         |    2 -
 htdocs/langs/en_IN/orders.lang            |    2 -
 htdocs/langs/en_IN/partnership.lang       |    2 -
 htdocs/langs/en_SG/datapolicy.lang        |   11 -
 htdocs/langs/en_SG/errors.lang            |    4 -
 htdocs/langs/en_SG/holiday.lang           |    4 -
 htdocs/langs/en_SG/languages.lang         |    2 -
 htdocs/langs/en_SG/orders.lang            |    2 -
 htdocs/langs/en_SG/partnership.lang       |    2 -
 htdocs/langs/en_ZA/datapolicy.lang        |   11 -
 htdocs/langs/en_ZA/errors.lang            |    4 -
 htdocs/langs/en_ZA/holiday.lang           |    4 -
 htdocs/langs/en_ZA/languages.lang         |    2 -
 htdocs/langs/en_ZA/orders.lang            |    2 -
 htdocs/langs/en_ZA/partnership.lang       |    2 -
 htdocs/langs/es_AR/admin.lang             |    2 -
 htdocs/langs/es_BO/errors.lang            |    2 -
 htdocs/langs/es_BO/holiday.lang           |    4 -
 htdocs/langs/es_BO/languages.lang         |    2 -
 htdocs/langs/es_BO/orders.lang            |    2 -
 htdocs/langs/es_BO/partnership.lang       |    2 -
 htdocs/langs/es_CL/admin.lang             |    2 -
 htdocs/langs/es_CL/main.lang              |    1 +
 htdocs/langs/es_CL/modulebuilder.lang     |    1 -
 htdocs/langs/es_CL/orders.lang            |    1 -
 htdocs/langs/es_CO/admin.lang             |    2 -
 htdocs/langs/es_CO/errors.lang            |    1 -
 htdocs/langs/es_CO/holiday.lang           |    3 -
 htdocs/langs/es_CO/modulebuilder.lang     |    1 -
 htdocs/langs/es_CO/orders.lang            |    1 -
 htdocs/langs/es_CO/partnership.lang       |    1 -
 htdocs/langs/es_CR/admin.lang             |    2 -
 htdocs/langs/es_CR/errors.lang            |    1 -
 htdocs/langs/es_CR/holiday.lang           |    3 -
 htdocs/langs/es_CR/modulebuilder.lang     |    1 -
 htdocs/langs/es_CR/orders.lang            |    1 -
 htdocs/langs/es_CR/partnership.lang       |    1 -
 htdocs/langs/es_CU/admin.lang             |    2 -
 htdocs/langs/es_CU/errors.lang            |    1 -
 htdocs/langs/es_CU/holiday.lang           |    3 -
 htdocs/langs/es_CU/modulebuilder.lang     |    1 -
 htdocs/langs/es_CU/orders.lang            |    1 -
 htdocs/langs/es_CU/partnership.lang       |    1 -
 htdocs/langs/es_DO/errors.lang            |    2 -
 htdocs/langs/es_DO/holiday.lang           |    4 -
 htdocs/langs/es_DO/languages.lang         |    2 -
 htdocs/langs/es_DO/orders.lang            |    2 -
 htdocs/langs/es_DO/partnership.lang       |    2 -
 htdocs/langs/es_EC/admin.lang             |    2 -
 htdocs/langs/es_EC/modulebuilder.lang     |    1 -
 htdocs/langs/es_EC/orders.lang            |    1 -
 htdocs/langs/es_ES/bills.lang             |    2 +-
 htdocs/langs/es_ES/eventorganization.lang |    3 +-
 htdocs/langs/es_ES/hrm.lang               |    2 +-
 htdocs/langs/es_ES/main.lang              |    3 +
 htdocs/langs/es_ES/receptions.lang        |    8 +-
 htdocs/langs/es_ES/stocks.lang            |    4 +-
 htdocs/langs/es_ES/withdrawals.lang       |   27 +-
 htdocs/langs/es_GT/errors.lang            |    2 -
 htdocs/langs/es_GT/holiday.lang           |    4 -
 htdocs/langs/es_GT/languages.lang         |    2 -
 htdocs/langs/es_GT/orders.lang            |    2 -
 htdocs/langs/es_GT/partnership.lang       |    2 -
 htdocs/langs/es_HN/errors.lang            |    2 -
 htdocs/langs/es_HN/holiday.lang           |    4 -
 htdocs/langs/es_HN/languages.lang         |    2 -
 htdocs/langs/es_HN/orders.lang            |    2 -
 htdocs/langs/es_HN/partnership.lang       |    2 -
 htdocs/langs/es_MX/admin.lang             |    2 -
 htdocs/langs/es_MX/languages.lang         |    2 -
 htdocs/langs/es_MX/main.lang              |    1 +
 htdocs/langs/es_PA/errors.lang            |    2 -
 htdocs/langs/es_PA/holiday.lang           |    4 -
 htdocs/langs/es_PA/languages.lang         |    2 -
 htdocs/langs/es_PA/orders.lang            |    2 -
 htdocs/langs/es_PA/partnership.lang       |    2 -
 htdocs/langs/es_PE/admin.lang             |    2 -
 htdocs/langs/es_PE/errors.lang            |    2 -
 htdocs/langs/es_PE/languages.lang         |    2 -
 htdocs/langs/es_PE/main.lang              |    1 +
 htdocs/langs/es_PE/orders.lang            |    2 -
 htdocs/langs/es_PE/partnership.lang       |    2 -
 htdocs/langs/es_PY/errors.lang            |    2 -
 htdocs/langs/es_PY/holiday.lang           |    4 -
 htdocs/langs/es_PY/languages.lang         |    2 -
 htdocs/langs/es_PY/orders.lang            |    2 -
 htdocs/langs/es_PY/partnership.lang       |    2 -
 htdocs/langs/es_US/errors.lang            |    2 -
 htdocs/langs/es_US/holiday.lang           |    4 -
 htdocs/langs/es_US/languages.lang         |    2 -
 htdocs/langs/es_US/orders.lang            |    2 -
 htdocs/langs/es_US/partnership.lang       |    2 -
 htdocs/langs/es_UY/errors.lang            |    2 -
 htdocs/langs/es_UY/holiday.lang           |    4 -
 htdocs/langs/es_UY/languages.lang         |    2 -
 htdocs/langs/es_UY/orders.lang            |    2 -
 htdocs/langs/es_UY/partnership.lang       |    2 -
 htdocs/langs/es_VE/admin.lang             |    2 -
 htdocs/langs/es_VE/holiday.lang           |    4 -
 htdocs/langs/es_VE/languages.lang         |    2 -
 htdocs/langs/et_EE/accountancy.lang       |   68 +-
 htdocs/langs/et_EE/admin.lang             |   50 +-
 htdocs/langs/et_EE/bills.lang             |   54 +-
 htdocs/langs/et_EE/blockedlog.lang        |    2 +-
 htdocs/langs/et_EE/compta.lang            |    5 +-
 htdocs/langs/et_EE/errors.lang            |   65 +-
 htdocs/langs/et_EE/holiday.lang           |   13 +-
 htdocs/langs/et_EE/main.lang              |    7 +-
 htdocs/langs/et_EE/members.lang           |    4 +-
 htdocs/langs/et_EE/opensurvey.lang        |    5 +-
 htdocs/langs/et_EE/products.lang          |   28 +-
 htdocs/langs/et_EE/projects.lang          |   58 +-
 htdocs/langs/et_EE/suppliers.lang         |    2 +-
 htdocs/langs/et_EE/trips.lang             |   10 +-
 htdocs/langs/et_EE/workflow.lang          |   30 +-
 htdocs/langs/eu_ES/main.lang              |    3 +
 htdocs/langs/fa_IR/main.lang              |    9 +-
 htdocs/langs/fi_FI/accountancy.lang       |   31 +-
 htdocs/langs/fi_FI/admin.lang             |   98 +-
 htdocs/langs/fi_FI/agenda.lang            |    4 +-
 htdocs/langs/fi_FI/banks.lang             |    2 +-
 htdocs/langs/fi_FI/bills.lang             |   21 +-
 htdocs/langs/fi_FI/blockedlog.lang        |    2 +-
 htdocs/langs/fi_FI/cashdesk.lang          |    6 +-
 htdocs/langs/fi_FI/companies.lang         |    2 +-
 htdocs/langs/fi_FI/compta.lang            |   20 +-
 htdocs/langs/fi_FI/cron.lang              |    5 +-
 htdocs/langs/fi_FI/errors.lang            |   32 +-
 htdocs/langs/fi_FI/eventorganization.lang |    3 +-
 htdocs/langs/fi_FI/exports.lang           |   10 +-
 htdocs/langs/fi_FI/install.lang           |   16 +-
 htdocs/langs/fi_FI/mails.lang             |    6 +-
 htdocs/langs/fi_FI/main.lang              |    5 +-
 htdocs/langs/fi_FI/members.lang           |    2 +-
 htdocs/langs/fi_FI/modulebuilder.lang     |   12 +-
 htdocs/langs/fi_FI/mrp.lang               |    3 +-
 htdocs/langs/fi_FI/multicurrency.lang     |    2 +-
 htdocs/langs/fi_FI/oauth.lang             |    2 +-
 htdocs/langs/fi_FI/other.lang             |    6 +-
 htdocs/langs/fi_FI/partnership.lang       |    3 +-
 htdocs/langs/fi_FI/paybox.lang            |    4 +-
 htdocs/langs/fi_FI/paypal.lang            |    4 +-
 htdocs/langs/fi_FI/products.lang          |   18 +-
 htdocs/langs/fi_FI/receptions.lang        |    4 +-
 htdocs/langs/fi_FI/sendings.lang          |    2 +-
 htdocs/langs/fi_FI/stocks.lang            |    6 +-
 htdocs/langs/fi_FI/stripe.lang            |    6 +-
 htdocs/langs/fi_FI/trips.lang             |   12 +-
 htdocs/langs/fi_FI/website.lang           |   14 +-
 htdocs/langs/fi_FI/withdrawals.lang       |    3 +-
 htdocs/langs/fi_FI/workflow.lang          |    8 +-
 htdocs/langs/fr_BE/errors.lang            |    2 +
 htdocs/langs/fr_BE/languages.lang         |    2 -
 htdocs/langs/fr_BE/main.lang              |    1 -
 htdocs/langs/fr_CH/errors.lang            |    2 +
 htdocs/langs/fr_CH/holiday.lang           |    4 -
 htdocs/langs/fr_CH/languages.lang         |    2 -
 htdocs/langs/fr_CI/errors.lang            |    2 +
 htdocs/langs/fr_CI/holiday.lang           |    4 -
 htdocs/langs/fr_CI/languages.lang         |    2 -
 htdocs/langs/fr_CM/errors.lang            |    2 +
 htdocs/langs/fr_CM/holiday.lang           |    4 -
 htdocs/langs/fr_CM/languages.lang         |    2 -
 htdocs/langs/fr_FR/admin.lang             |   51 +-
 htdocs/langs/fr_FR/agenda.lang            |    4 +-
 htdocs/langs/fr_FR/assets.lang            |  123 +-
 htdocs/langs/fr_FR/bills.lang             |    8 +-
 htdocs/langs/fr_FR/cashdesk.lang          |    8 +-
 htdocs/langs/fr_FR/datapolicy.lang        |   20 +-
 htdocs/langs/fr_FR/donations.lang         |    3 +-
 htdocs/langs/fr_FR/errors.lang            |   22 +-
 htdocs/langs/fr_FR/eventorganization.lang |    1 +
 htdocs/langs/fr_FR/mails.lang             |   12 +-
 htdocs/langs/fr_FR/members.lang           |   14 +-
 htdocs/langs/fr_FR/modulebuilder.lang     |    6 +-
 htdocs/langs/fr_FR/orders.lang            |    2 +-
 htdocs/langs/fr_FR/other.lang             |    6 +-
 htdocs/langs/fr_FR/partnership.lang       |    3 +-
 htdocs/langs/fr_FR/products.lang          |    8 +-
 htdocs/langs/fr_FR/projects.lang          |    4 +-
 htdocs/langs/fr_FR/receiptprinter.lang    |    8 +-
 htdocs/langs/fr_FR/resource.lang          |    6 +-
 htdocs/langs/fr_FR/website.lang           |  120 +-
 htdocs/langs/fr_GA/errors.lang            |    2 +
 htdocs/langs/fr_GA/holiday.lang           |    4 -
 htdocs/langs/fr_GA/languages.lang         |    2 -
 htdocs/langs/gl_ES/bills.lang             |   39 +-
 htdocs/langs/gl_ES/donations.lang         |    1 +
 htdocs/langs/gl_ES/errors.lang            |   32 +-
 htdocs/langs/gl_ES/receiptprinter.lang    |    3 +-
 htdocs/langs/he_IL/accountancy.lang       |    5 +-
 htdocs/langs/he_IL/admin.lang             |   64 +-
 htdocs/langs/he_IL/agenda.lang            |    4 +-
 htdocs/langs/he_IL/banks.lang             |    2 +-
 htdocs/langs/he_IL/bills.lang             |    5 +-
 htdocs/langs/he_IL/cashdesk.lang          |    2 +-
 htdocs/langs/he_IL/companies.lang         |    4 +-
 htdocs/langs/he_IL/compta.lang            |    4 +-
 htdocs/langs/he_IL/errors.lang            |   12 +-
 htdocs/langs/he_IL/eventorganization.lang |    3 +-
 htdocs/langs/he_IL/exports.lang           |   10 +-
 htdocs/langs/he_IL/install.lang           |   12 +-
 htdocs/langs/he_IL/ldap.lang              |    2 +-
 htdocs/langs/he_IL/mails.lang             |    2 +-
 htdocs/langs/he_IL/main.lang              |   17 +-
 htdocs/langs/he_IL/modulebuilder.lang     |    8 +-
 htdocs/langs/he_IL/multicurrency.lang     |    4 +-
 htdocs/langs/he_IL/other.lang             |    4 +-
 htdocs/langs/he_IL/paypal.lang            |    2 +-
 htdocs/langs/he_IL/products.lang          |   12 +-
 htdocs/langs/he_IL/stocks.lang            |    4 +-
 htdocs/langs/he_IL/stripe.lang            |    2 +-
 htdocs/langs/he_IL/trips.lang             |    4 +-
 htdocs/langs/he_IL/users.lang             |    2 +-
 htdocs/langs/he_IL/website.lang           |    6 +-
 htdocs/langs/hr_HR/admin.lang             |   30 +-
 htdocs/langs/hr_HR/cashdesk.lang          |    2 +-
 htdocs/langs/hr_HR/errors.lang            |    4 +-
 htdocs/langs/hr_HR/mails.lang             |    2 +-
 htdocs/langs/hr_HR/main.lang              |    7 +-
 htdocs/langs/hr_HR/modulebuilder.lang     |    2 +-
 htdocs/langs/hr_HR/other.lang             |  189 +--
 htdocs/langs/hr_HR/products.lang          |  141 ++-
 htdocs/langs/hr_HR/website.lang           |    2 +-
 htdocs/langs/hu_HU/accountancy.lang       |    4 +-
 htdocs/langs/hu_HU/admin.lang             |   26 +-
 htdocs/langs/hu_HU/cashdesk.lang          |    2 +-
 htdocs/langs/hu_HU/companies.lang         |    2 +-
 htdocs/langs/hu_HU/errors.lang            |    2 +-
 htdocs/langs/hu_HU/main.lang              |    3 +
 htdocs/langs/hu_HU/modulebuilder.lang     |    6 +-
 htdocs/langs/hu_HU/stocks.lang            |    2 +-
 htdocs/langs/hu_HU/website.lang           |    4 +-
 htdocs/langs/hu_HU/workflow.lang          |    4 +-
 htdocs/langs/id_ID/main.lang              |    3 +
 htdocs/langs/is_IS/main.lang              |    3 +
 htdocs/langs/it_CH/datapolicy.lang        |   11 -
 htdocs/langs/it_CH/languages.lang         |    2 -
 htdocs/langs/it_IT/main.lang              |    5 +-
 htdocs/langs/ja_JP/main.lang              |   11 +-
 htdocs/langs/ja_JP/products.lang          |   11 +-
 htdocs/langs/ka_GE/main.lang              |    3 +
 htdocs/langs/kk_KZ/accountancy.lang       |    6 +-
 htdocs/langs/kk_KZ/admin.lang             |   38 +-
 htdocs/langs/kk_KZ/banks.lang             |    2 +-
 htdocs/langs/kk_KZ/bills.lang             |    8 +-
 htdocs/langs/kk_KZ/cashdesk.lang          |    2 +-
 htdocs/langs/kk_KZ/companies.lang         |    2 +-
 htdocs/langs/kk_KZ/compta.lang            |    6 +-
 htdocs/langs/kk_KZ/cron.lang              |    2 +-
 htdocs/langs/kk_KZ/errors.lang            |   10 +-
 htdocs/langs/kk_KZ/eventorganization.lang |    3 +-
 htdocs/langs/kk_KZ/exports.lang           |    4 +-
 htdocs/langs/kk_KZ/hrm.lang               |    2 +-
 htdocs/langs/kk_KZ/install.lang           |    4 +-
 htdocs/langs/kk_KZ/mails.lang             |    6 +-
 htdocs/langs/kk_KZ/modulebuilder.lang     |    6 +-
 htdocs/langs/kk_KZ/multicurrency.lang     |    2 +-
 htdocs/langs/kk_KZ/oauth.lang             |    2 +-
 htdocs/langs/kk_KZ/partnership.lang       |    3 +-
 htdocs/langs/kk_KZ/paypal.lang            |    2 +-
 htdocs/langs/kk_KZ/receptions.lang        |    2 +-
 htdocs/langs/kk_KZ/sendings.lang          |    2 +-
 htdocs/langs/kk_KZ/stocks.lang            |    2 +-
 htdocs/langs/kk_KZ/trips.lang             |    2 +-
 htdocs/langs/kk_KZ/website.lang           |    8 +-
 htdocs/langs/kk_KZ/withdrawals.lang       |    3 +-
 htdocs/langs/kn_IN/main.lang              |    3 +
 htdocs/langs/ko_KR/main.lang              |    3 +
 htdocs/langs/lo_LA/accountancy.lang       |    2 +-
 htdocs/langs/lo_LA/admin.lang             |   22 +-
 htdocs/langs/lo_LA/banks.lang             |    2 +-
 htdocs/langs/lo_LA/bills.lang             |    2 +-
 htdocs/langs/lo_LA/errors.lang            |    4 +-
 htdocs/langs/lo_LA/eventorganization.lang |    3 +-
 htdocs/langs/lo_LA/exports.lang           |    2 +-
 htdocs/langs/lo_LA/main.lang              |    3 +
 htdocs/langs/lo_LA/modulebuilder.lang     |    6 +-
 htdocs/langs/lo_LA/website.lang           |    4 +-
 htdocs/langs/lt_LT/main.lang              |    3 +
 htdocs/langs/lv_LV/admin.lang             |   24 +-
 htdocs/langs/lv_LV/main.lang              |    3 +
 htdocs/langs/lv_LV/modulebuilder.lang     |    4 +-
 htdocs/langs/lv_LV/stocks.lang            |    2 +-
 htdocs/langs/lv_LV/website.lang           |    8 +-
 htdocs/langs/lv_LV/withdrawals.lang       |    3 +-
 htdocs/langs/mk_MK/main.lang              |    3 +
 htdocs/langs/nb_NO/admin.lang             |   34 +-
 htdocs/langs/nb_NO/bills.lang             |    9 +-
 htdocs/langs/nb_NO/errors.lang            |   14 +-
 htdocs/langs/nb_NO/eventorganization.lang |    1 +
 htdocs/langs/nb_NO/main.lang              |   17 +-
 htdocs/langs/nb_NO/other.lang             |   32 +-
 htdocs/langs/nb_NO/products.lang          |   27 +-
 htdocs/langs/nb_NO/projects.lang          |    4 +-
 htdocs/langs/nb_NO/receiptprinter.lang    |    3 +-
 htdocs/langs/nb_NO/resource.lang          |    7 +-
 htdocs/langs/nl_BE/main.lang              |    1 +
 htdocs/langs/nl_NL/admin.lang             |   20 +-
 htdocs/langs/nl_NL/cron.lang              |    8 +-
 htdocs/langs/nl_NL/eventorganization.lang |    3 +-
 htdocs/langs/nl_NL/main.lang              |    9 +-
 htdocs/langs/nl_NL/modulebuilder.lang     |    2 +-
 htdocs/langs/nl_NL/website.lang           |    2 +-
 htdocs/langs/pl_PL/commercial.lang        |    6 +-
 htdocs/langs/pl_PL/errors.lang            |    2 +-
 htdocs/langs/pl_PL/mails.lang             |    4 +-
 htdocs/langs/pl_PL/main.lang              |    9 +-
 htdocs/langs/pl_PL/modulebuilder.lang     |    4 +-
 htdocs/langs/pl_PL/partnership.lang       |    3 +-
 htdocs/langs/pl_PL/paypal.lang            |   33 +-
 htdocs/langs/pl_PL/stocks.lang            |    2 +-
 htdocs/langs/pt_AO/errors.lang            |    2 -
 htdocs/langs/pt_AO/holiday.lang           |    4 -
 htdocs/langs/pt_AO/languages.lang         |    2 -
 htdocs/langs/pt_AO/modulebuilder.lang     |    2 -
 htdocs/langs/pt_AO/partnership.lang       |    2 -
 htdocs/langs/pt_BR/admin.lang             |    1 -
 htdocs/langs/pt_BR/modulebuilder.lang     |    1 -
 htdocs/langs/pt_BR/zapier.lang            |    1 -
 htdocs/langs/pt_MZ/admin.lang             |    1 -
 htdocs/langs/pt_MZ/modulebuilder.lang     |    1 -
 htdocs/langs/pt_MZ/zapier.lang            |    1 -
 htdocs/langs/pt_PT/accountancy.lang       |    6 +-
 htdocs/langs/pt_PT/admin.lang             |   16 +-
 htdocs/langs/pt_PT/errors.lang            |    4 +-
 htdocs/langs/pt_PT/eventorganization.lang |    1 +
 htdocs/langs/pt_PT/exports.lang           |    4 +-
 htdocs/langs/pt_PT/main.lang              |    5 +-
 htdocs/langs/pt_PT/orders.lang            |    2 +-
 htdocs/langs/pt_PT/other.lang             |    2 +
 htdocs/langs/pt_PT/products.lang          |    2 +
 htdocs/langs/pt_PT/projects.lang          |    8 +-
 htdocs/langs/pt_PT/resource.lang          |    7 +-
 htdocs/langs/pt_PT/stocks.lang            |    2 +-
 htdocs/langs/pt_PT/users.lang             |    2 +-
 htdocs/langs/pt_PT/website.lang           |    2 +-
 htdocs/langs/pt_PT/withdrawals.lang       |    5 +-
 htdocs/langs/pt_PT/zapier.lang            |    6 +-
 htdocs/langs/ro_RO/admin.lang             |  102 +-
 htdocs/langs/ro_RO/main.lang              |    9 +-
 htdocs/langs/ro_RO/other.lang             |   10 +-
 htdocs/langs/ro_RO/products.lang          |   23 +-
 htdocs/langs/ro_RO/resource.lang          |   26 +-
 htdocs/langs/ru_RU/accountancy.lang       |    9 +-
 htdocs/langs/ru_RU/admin.lang             |   28 +-
 htdocs/langs/ru_RU/banks.lang             |    2 +-
 htdocs/langs/ru_RU/blockedlog.lang        |    2 +-
 htdocs/langs/ru_RU/boxes.lang             |   30 +-
 htdocs/langs/ru_RU/cron.lang              |   20 +-
 htdocs/langs/ru_RU/ecm.lang               |   18 +-
 htdocs/langs/ru_RU/errors.lang            |   10 +-
 htdocs/langs/ru_RU/mails.lang             |    2 +-
 htdocs/langs/ru_RU/main.lang              |    5 +-
 htdocs/langs/ru_RU/members.lang           |    4 +-
 htdocs/langs/ru_RU/modulebuilder.lang     |    6 +-
 htdocs/langs/ru_RU/mrp.lang               |   38 +-
 htdocs/langs/ru_RU/orders.lang            |    2 +-
 htdocs/langs/ru_RU/partnership.lang       |    3 +-
 htdocs/langs/ru_RU/products.lang          |   31 +-
 htdocs/langs/ru_RU/stocks.lang            |    8 +-
 htdocs/langs/ru_RU/workflow.lang          |   20 +-
 htdocs/langs/ru_UA/errors.lang            |    2 +
 htdocs/langs/sk_SK/accountancy.lang       |    3 +-
 htdocs/langs/sk_SK/admin.lang             |   98 +-
 htdocs/langs/sk_SK/agenda.lang            |    8 +-
 htdocs/langs/sk_SK/bills.lang             |    9 +-
 htdocs/langs/sk_SK/cashdesk.lang          |    2 +-
 htdocs/langs/sk_SK/companies.lang         |  384 +++---
 htdocs/langs/sk_SK/compta.lang            |  459 ++++----
 htdocs/langs/sk_SK/errors.lang            |   20 +-
 htdocs/langs/sk_SK/eventorganization.lang |    7 +-
 htdocs/langs/sk_SK/exports.lang           |   10 +-
 htdocs/langs/sk_SK/hrm.lang               |  169 +--
 htdocs/langs/sk_SK/install.lang           |  172 +--
 htdocs/langs/sk_SK/mails.lang             |    2 +-
 htdocs/langs/sk_SK/main.lang              |    9 +-
 htdocs/langs/sk_SK/modulebuilder.lang     |   10 +-
 htdocs/langs/sk_SK/mrp.lang               |    3 +-
 htdocs/langs/sk_SK/multicurrency.lang     |    4 +-
 htdocs/langs/sk_SK/oauth.lang             |    2 +-
 htdocs/langs/sk_SK/partnership.lang       |    3 +-
 htdocs/langs/sk_SK/products.lang          |   10 +-
 htdocs/langs/sk_SK/receptions.lang        |   94 +-
 htdocs/langs/sk_SK/sendings.lang          |   52 +-
 htdocs/langs/sk_SK/stocks.lang            |    4 +-
 htdocs/langs/sk_SK/stripe.lang            |    2 +-
 htdocs/langs/sk_SK/trips.lang             |  292 ++---
 htdocs/langs/sk_SK/website.lang           |   10 +-
 htdocs/langs/sk_SK/withdrawals.lang       |  261 ++---
 htdocs/langs/sl_SI/accountancy.lang       |    3 +-
 htdocs/langs/sl_SI/admin.lang             |   12 +-
 htdocs/langs/sl_SI/main.lang              |    3 +
 htdocs/langs/sl_SI/modulebuilder.lang     |    2 +-
 htdocs/langs/sl_SI/stocks.lang            |    2 +-
 htdocs/langs/sq_AL/accountancy.lang       |    9 +-
 htdocs/langs/sq_AL/admin.lang             |  164 +--
 htdocs/langs/sq_AL/agenda.lang            |    6 +-
 htdocs/langs/sq_AL/assets.lang            |    5 +-
 htdocs/langs/sq_AL/banks.lang             |    2 +-
 htdocs/langs/sq_AL/bills.lang             |   32 +-
 htdocs/langs/sq_AL/cashdesk.lang          |   14 +-
 htdocs/langs/sq_AL/companies.lang         |   20 +-
 htdocs/langs/sq_AL/compta.lang            |   27 +-
 htdocs/langs/sq_AL/contracts.lang         |    8 +-
 htdocs/langs/sq_AL/cron.lang              |    7 +-
 htdocs/langs/sq_AL/datapolicy.lang        |   20 +-
 htdocs/langs/sq_AL/deliveries.lang        |    2 +-
 htdocs/langs/sq_AL/donations.lang         |    1 +
 htdocs/langs/sq_AL/ecm.lang               |    2 +-
 htdocs/langs/sq_AL/errors.lang            |   62 +-
 htdocs/langs/sq_AL/eventorganization.lang |    9 +-
 htdocs/langs/sq_AL/exports.lang           |   24 +-
 htdocs/langs/sq_AL/help.lang              |    2 +-
 htdocs/langs/sq_AL/holiday.lang           |    5 +-
 htdocs/langs/sq_AL/hrm.lang               |    2 +-
 htdocs/langs/sq_AL/install.lang           |   18 +-
 htdocs/langs/sq_AL/interventions.lang     |    4 +-
 htdocs/langs/sq_AL/languages.lang         |    2 +-
 htdocs/langs/sq_AL/ldap.lang              |    2 +-
 htdocs/langs/sq_AL/mails.lang             |   22 +-
 htdocs/langs/sq_AL/main.lang              |   36 +-
 htdocs/langs/sq_AL/members.lang           |   18 +-
 htdocs/langs/sq_AL/modulebuilder.lang     |   18 +-
 htdocs/langs/sq_AL/mrp.lang               |    9 +-
 htdocs/langs/sq_AL/multicurrency.lang     |    6 +-
 htdocs/langs/sq_AL/oauth.lang             |    6 +-
 htdocs/langs/sq_AL/orders.lang            |   10 +-
 htdocs/langs/sq_AL/other.lang             |    8 +-
 htdocs/langs/sq_AL/partnership.lang       |    5 +-
 htdocs/langs/sq_AL/paybox.lang            |    2 +-
 htdocs/langs/sq_AL/paypal.lang            |    2 +-
 htdocs/langs/sq_AL/productbatch.lang      |    3 +
 htdocs/langs/sq_AL/products.lang          |   19 +-
 htdocs/langs/sq_AL/projects.lang          |    8 +-
 htdocs/langs/sq_AL/propal.lang            |    8 +-
 htdocs/langs/sq_AL/receiptprinter.lang    |    1 +
 htdocs/langs/sq_AL/receptions.lang        |    4 +-
 htdocs/langs/sq_AL/resource.lang          |    2 +
 htdocs/langs/sq_AL/sendings.lang          |    4 +-
 htdocs/langs/sq_AL/stocks.lang            |    8 +-
 htdocs/langs/sq_AL/stripe.lang            |    4 +-
 htdocs/langs/sq_AL/supplier_proposal.lang |    8 +-
 htdocs/langs/sq_AL/suppliers.lang         |    6 +-
 htdocs/langs/sq_AL/ticket.lang            |    6 +-
 htdocs/langs/sq_AL/trips.lang             |   16 +-
 htdocs/langs/sq_AL/users.lang             |   14 +-
 htdocs/langs/sq_AL/website.lang           |  166 +--
 htdocs/langs/sq_AL/withdrawals.lang       |   11 +-
 htdocs/langs/sr_RS/main.lang              |    3 +
 htdocs/langs/sv_SE/accountancy.lang       |    3 +-
 htdocs/langs/sv_SE/admin.lang             |   18 +-
 htdocs/langs/sv_SE/main.lang              |    3 +
 htdocs/langs/sv_SE/modulebuilder.lang     |    4 +-
 htdocs/langs/sw_SW/accountancy.lang       |   72 +-
 htdocs/langs/sw_SW/admin.lang             |   74 +-
 htdocs/langs/sw_SW/assets.lang            |    3 +-
 htdocs/langs/sw_SW/bills.lang             |    6 +
 htdocs/langs/sw_SW/bookmarks.lang         |    2 +-
 htdocs/langs/sw_SW/boxes.lang             |    6 +-
 htdocs/langs/sw_SW/commercial.lang        |    4 +
 htdocs/langs/sw_SW/companies.lang         |   34 +-
 htdocs/langs/sw_SW/compta.lang            |   27 +-
 htdocs/langs/sw_SW/contracts.lang         |    2 +-
 htdocs/langs/sw_SW/cron.lang              |   16 +-
 htdocs/langs/sw_SW/dict.lang              |    4 +-
 htdocs/langs/sw_SW/donations.lang         |    4 +-
 htdocs/langs/sw_SW/ecm.lang               |   12 +-
 htdocs/langs/sw_SW/errors.lang            |   16 +-
 htdocs/langs/sw_SW/eventorganization.lang |    3 +-
 htdocs/langs/sw_SW/holiday.lang           |    3 +-
 htdocs/langs/sw_SW/install.lang           |   14 +-
 htdocs/langs/sw_SW/interventions.lang     |    3 +
 htdocs/langs/sw_SW/languages.lang         |    5 +-
 htdocs/langs/sw_SW/loan.lang              |    2 +-
 htdocs/langs/sw_SW/main.lang              |   18 +-
 htdocs/langs/sw_SW/margins.lang           |    2 +-
 htdocs/langs/sw_SW/mrp.lang               |   13 +
 htdocs/langs/sw_SW/opensurvey.lang        |    3 +-
 htdocs/langs/sw_SW/other.lang             |   36 +-
 htdocs/langs/sw_SW/paybox.lang            |    2 +-
 htdocs/langs/sw_SW/productbatch.lang      |    5 +
 htdocs/langs/sw_SW/products.lang          |   15 +-
 htdocs/langs/sw_SW/projects.lang          |    4 +-
 htdocs/langs/sw_SW/receiptprinter.lang    |    3 +-
 htdocs/langs/sw_SW/receptions.lang        |    2 -
 htdocs/langs/sw_SW/resource.lang          |    2 +
 htdocs/langs/sw_SW/salaries.lang          |    6 +
 htdocs/langs/sw_SW/stripe.lang            |    9 +-
 htdocs/langs/sw_SW/supplier_proposal.lang |    4 +-
 htdocs/langs/sw_SW/ticket.lang            |    6 +-
 htdocs/langs/sw_SW/trips.lang             |    8 +-
 htdocs/langs/sw_SW/users.lang             |   18 +-
 htdocs/langs/sw_SW/website.lang           |   95 +-
 htdocs/langs/th_TH/admin.lang             |   32 +-
 htdocs/langs/th_TH/bills.lang             |   22 +-
 htdocs/langs/th_TH/cashdesk.lang          |    2 +-
 htdocs/langs/th_TH/errors.lang            |    2 +-
 htdocs/langs/th_TH/exports.lang           |    2 +-
 htdocs/langs/th_TH/install.lang           |  154 +--
 htdocs/langs/th_TH/main.lang              |    5 +-
 htdocs/langs/th_TH/partnership.lang       |    3 +-
 htdocs/langs/th_TH/sendings.lang          |    4 +-
 htdocs/langs/th_TH/stocks.lang            |    2 +-
 htdocs/langs/th_TH/users.lang             |  122 +-
 htdocs/langs/tr_TR/main.lang              |    3 +
 htdocs/langs/uk_UA/admin.lang             |   16 +-
 htdocs/langs/uk_UA/errors.lang            |    2 +-
 htdocs/langs/uk_UA/exports.lang           |    2 +-
 htdocs/langs/uk_UA/main.lang              |    3 +
 htdocs/langs/uk_UA/modulebuilder.lang     |    2 +-
 htdocs/langs/ur_PK/accountancy.lang       |    5 +-
 htdocs/langs/ur_PK/admin.lang             |   26 +-
 htdocs/langs/ur_PK/bills.lang             |  132 ++-
 htdocs/langs/ur_PK/companies.lang         |   78 +-
 htdocs/langs/ur_PK/compta.lang            |   61 +-
 htdocs/langs/ur_PK/errors.lang            |    4 +-
 htdocs/langs/ur_PK/eventorganization.lang |    3 +-
 htdocs/langs/ur_PK/exports.lang           |    2 +-
 htdocs/langs/ur_PK/hrm.lang               |   66 +-
 htdocs/langs/ur_PK/mails.lang             |    2 +-
 htdocs/langs/ur_PK/modulebuilder.lang     |    6 +-
 htdocs/langs/ur_PK/oauth.lang             |    2 +-
 htdocs/langs/ur_PK/partnership.lang       |    3 +-
 htdocs/langs/ur_PK/receptions.lang        |   18 +-
 htdocs/langs/ur_PK/sendings.lang          |   16 +-
 htdocs/langs/ur_PK/stocks.lang            |    2 +-
 htdocs/langs/ur_PK/withdrawals.lang       |   57 +-
 htdocs/langs/uz_UZ/accountancy.lang       |    6 +-
 htdocs/langs/uz_UZ/admin.lang             |   26 +-
 htdocs/langs/uz_UZ/assets.lang            |    1 -
 htdocs/langs/uz_UZ/bills.lang             |    4 +-
 htdocs/langs/uz_UZ/cashdesk.lang          |    2 +-
 htdocs/langs/uz_UZ/compta.lang            |    2 +-
 htdocs/langs/uz_UZ/cron.lang              |    5 +-
 htdocs/langs/uz_UZ/errors.lang            |    6 +-
 htdocs/langs/uz_UZ/eventorganization.lang |    1 +
 htdocs/langs/uz_UZ/exports.lang           |    2 +-
 htdocs/langs/uz_UZ/mails.lang             |    4 +-
 htdocs/langs/uz_UZ/main.lang              |    3 +
 htdocs/langs/uz_UZ/modulebuilder.lang     |    6 +-
 htdocs/langs/uz_UZ/oauth.lang             |    2 +-
 htdocs/langs/uz_UZ/other.lang             |    2 +
 htdocs/langs/uz_UZ/paypal.lang            |    2 +-
 htdocs/langs/uz_UZ/products.lang          |    2 +
 htdocs/langs/uz_UZ/receiptprinter.lang    |    1 +
 htdocs/langs/uz_UZ/receptions.lang        |    2 -
 htdocs/langs/uz_UZ/resource.lang          |    2 +
 htdocs/langs/uz_UZ/sendings.lang          |    4 +-
 htdocs/langs/uz_UZ/stocks.lang            |    2 +-
 htdocs/langs/uz_UZ/users.lang             |    2 +-
 htdocs/langs/uz_UZ/website.lang           |    4 +-
 htdocs/langs/uz_UZ/withdrawals.lang       |    9 +-
 htdocs/langs/uz_UZ/workflow.lang          |   12 +-
 htdocs/langs/vi_VN/admin.lang             |   18 +-
 htdocs/langs/vi_VN/assets.lang            |    1 -
 htdocs/langs/vi_VN/cron.lang              |    3 +-
 htdocs/langs/vi_VN/eventorganization.lang |    1 +
 htdocs/langs/vi_VN/main.lang              |    3 +
 htdocs/langs/vi_VN/modulebuilder.lang     |    2 +-
 htdocs/langs/vi_VN/other.lang             |    2 +
 htdocs/langs/vi_VN/partnership.lang       |    3 +-
 htdocs/langs/vi_VN/paypal.lang            |    3 +-
 htdocs/langs/vi_VN/products.lang          |    2 +
 htdocs/langs/vi_VN/projects.lang          |    2 +-
 htdocs/langs/vi_VN/receiptprinter.lang    |    1 +
 htdocs/langs/vi_VN/resource.lang          |    2 +
 htdocs/langs/vi_VN/stocks.lang            |    2 +-
 htdocs/langs/vi_VN/website.lang           |    2 +-
 htdocs/langs/zh_CN/main.lang              |   13 +-
 htdocs/langs/zh_HK/admin.lang             |  104 +-
 htdocs/langs/zh_HK/banks.lang             |    4 +-
 htdocs/langs/zh_HK/bills.lang             |   20 +-
 htdocs/langs/zh_HK/boxes.lang             |    4 +-
 htdocs/langs/zh_HK/commercial.lang        |    6 +-
 htdocs/langs/zh_HK/companies.lang         |   44 +-
 htdocs/langs/zh_HK/compta.lang            |   27 +-
 htdocs/langs/zh_HK/contracts.lang         |    6 +-
 htdocs/langs/zh_HK/cron.lang              |   16 +-
 htdocs/langs/zh_HK/errors.lang            |   34 +-
 htdocs/langs/zh_HK/exports.lang           |   12 +-
 htdocs/langs/zh_HK/holiday.lang           |   21 +-
 htdocs/langs/zh_HK/install.lang           |   22 +-
 htdocs/langs/zh_HK/interventions.lang     |    5 +-
 htdocs/langs/zh_HK/main.lang              | 1304 +++++++++++----------
 htdocs/langs/zh_HK/opensurvey.lang        |    5 +-
 htdocs/langs/zh_HK/orders.lang            |   10 +-
 htdocs/langs/zh_HK/other.lang             |   40 +-
 htdocs/langs/zh_HK/paybox.lang            |    6 +-
 htdocs/langs/zh_HK/paypal.lang            |    4 +-
 htdocs/langs/zh_HK/products.lang          |   28 +-
 htdocs/langs/zh_HK/projects.lang          |    4 +-
 htdocs/langs/zh_HK/propal.lang            |    9 +-
 htdocs/langs/zh_HK/stocks.lang            |   27 +-
 htdocs/langs/zh_HK/stripe.lang            |   13 +-
 htdocs/langs/zh_HK/suppliers.lang         |    2 +-
 htdocs/langs/zh_HK/users.lang             |   28 +-
 htdocs/langs/zh_HK/withdrawals.lang       |    7 +-
 htdocs/langs/zh_TW/main.lang              |    3 +
 test/phpunit/LangTest.php                 |    2 +-
 883 files changed, 14611 insertions(+), 13025 deletions(-)
 create mode 100644 htdocs/langs/ar_EG/errors.lang
 create mode 100644 htdocs/langs/ar_IQ/errors.lang
 delete mode 100644 htdocs/langs/de_AT/datapolicy.lang
 delete mode 100644 htdocs/langs/de_CH/datapolicy.lang
 delete mode 100644 htdocs/langs/el_CY/errors.lang
 delete mode 100644 htdocs/langs/el_CY/holiday.lang
 delete mode 100644 htdocs/langs/el_CY/languages.lang
 delete mode 100644 htdocs/langs/el_CY/orders.lang
 delete mode 100644 htdocs/langs/el_CY/partnership.lang
 delete mode 100644 htdocs/langs/en_AE/datapolicy.lang
 delete mode 100644 htdocs/langs/en_AE/errors.lang
 delete mode 100644 htdocs/langs/en_AE/holiday.lang
 delete mode 100644 htdocs/langs/en_AE/languages.lang
 delete mode 100644 htdocs/langs/en_AE/orders.lang
 delete mode 100644 htdocs/langs/en_AE/partnership.lang
 delete mode 100644 htdocs/langs/en_AU/datapolicy.lang
 delete mode 100644 htdocs/langs/en_AU/errors.lang
 delete mode 100644 htdocs/langs/en_AU/holiday.lang
 delete mode 100644 htdocs/langs/en_AU/languages.lang
 delete mode 100644 htdocs/langs/en_AU/orders.lang
 delete mode 100644 htdocs/langs/en_AU/partnership.lang
 delete mode 100644 htdocs/langs/en_CA/datapolicy.lang
 delete mode 100644 htdocs/langs/en_CA/errors.lang
 delete mode 100644 htdocs/langs/en_CA/holiday.lang
 delete mode 100644 htdocs/langs/en_CA/languages.lang
 delete mode 100644 htdocs/langs/en_CA/orders.lang
 delete mode 100644 htdocs/langs/en_CA/partnership.lang
 delete mode 100644 htdocs/langs/en_GB/datapolicy.lang
 delete mode 100644 htdocs/langs/en_GB/errors.lang
 delete mode 100644 htdocs/langs/en_GB/languages.lang
 delete mode 100644 htdocs/langs/en_IN/datapolicy.lang
 delete mode 100644 htdocs/langs/en_IN/errors.lang
 delete mode 100644 htdocs/langs/en_IN/holiday.lang
 delete mode 100644 htdocs/langs/en_IN/languages.lang
 delete mode 100644 htdocs/langs/en_IN/orders.lang
 delete mode 100644 htdocs/langs/en_IN/partnership.lang
 delete mode 100644 htdocs/langs/en_SG/datapolicy.lang
 delete mode 100644 htdocs/langs/en_SG/errors.lang
 delete mode 100644 htdocs/langs/en_SG/holiday.lang
 delete mode 100644 htdocs/langs/en_SG/languages.lang
 delete mode 100644 htdocs/langs/en_SG/orders.lang
 delete mode 100644 htdocs/langs/en_SG/partnership.lang
 delete mode 100644 htdocs/langs/en_ZA/datapolicy.lang
 delete mode 100644 htdocs/langs/en_ZA/errors.lang
 delete mode 100644 htdocs/langs/en_ZA/holiday.lang
 delete mode 100644 htdocs/langs/en_ZA/languages.lang
 delete mode 100644 htdocs/langs/en_ZA/orders.lang
 delete mode 100644 htdocs/langs/en_ZA/partnership.lang
 delete mode 100644 htdocs/langs/es_BO/errors.lang
 delete mode 100644 htdocs/langs/es_BO/holiday.lang
 delete mode 100644 htdocs/langs/es_BO/languages.lang
 delete mode 100644 htdocs/langs/es_BO/orders.lang
 delete mode 100644 htdocs/langs/es_BO/partnership.lang
 delete mode 100644 htdocs/langs/es_DO/errors.lang
 delete mode 100644 htdocs/langs/es_DO/holiday.lang
 delete mode 100644 htdocs/langs/es_DO/languages.lang
 delete mode 100644 htdocs/langs/es_DO/orders.lang
 delete mode 100644 htdocs/langs/es_DO/partnership.lang
 delete mode 100644 htdocs/langs/es_GT/errors.lang
 delete mode 100644 htdocs/langs/es_GT/holiday.lang
 delete mode 100644 htdocs/langs/es_GT/languages.lang
 delete mode 100644 htdocs/langs/es_GT/orders.lang
 delete mode 100644 htdocs/langs/es_GT/partnership.lang
 delete mode 100644 htdocs/langs/es_HN/errors.lang
 delete mode 100644 htdocs/langs/es_HN/holiday.lang
 delete mode 100644 htdocs/langs/es_HN/languages.lang
 delete mode 100644 htdocs/langs/es_HN/orders.lang
 delete mode 100644 htdocs/langs/es_HN/partnership.lang
 delete mode 100644 htdocs/langs/es_MX/languages.lang
 delete mode 100644 htdocs/langs/es_PA/errors.lang
 delete mode 100644 htdocs/langs/es_PA/holiday.lang
 delete mode 100644 htdocs/langs/es_PA/languages.lang
 delete mode 100644 htdocs/langs/es_PA/orders.lang
 delete mode 100644 htdocs/langs/es_PA/partnership.lang
 delete mode 100644 htdocs/langs/es_PE/errors.lang
 delete mode 100644 htdocs/langs/es_PE/languages.lang
 delete mode 100644 htdocs/langs/es_PE/orders.lang
 delete mode 100644 htdocs/langs/es_PE/partnership.lang
 delete mode 100644 htdocs/langs/es_PY/errors.lang
 delete mode 100644 htdocs/langs/es_PY/holiday.lang
 delete mode 100644 htdocs/langs/es_PY/languages.lang
 delete mode 100644 htdocs/langs/es_PY/orders.lang
 delete mode 100644 htdocs/langs/es_PY/partnership.lang
 delete mode 100644 htdocs/langs/es_US/errors.lang
 delete mode 100644 htdocs/langs/es_US/holiday.lang
 delete mode 100644 htdocs/langs/es_US/languages.lang
 delete mode 100644 htdocs/langs/es_US/orders.lang
 delete mode 100644 htdocs/langs/es_US/partnership.lang
 delete mode 100644 htdocs/langs/es_UY/errors.lang
 delete mode 100644 htdocs/langs/es_UY/holiday.lang
 delete mode 100644 htdocs/langs/es_UY/languages.lang
 delete mode 100644 htdocs/langs/es_UY/orders.lang
 delete mode 100644 htdocs/langs/es_UY/partnership.lang
 delete mode 100644 htdocs/langs/es_VE/holiday.lang
 delete mode 100644 htdocs/langs/es_VE/languages.lang
 create mode 100644 htdocs/langs/fr_BE/errors.lang
 delete mode 100644 htdocs/langs/fr_BE/languages.lang
 create mode 100644 htdocs/langs/fr_CH/errors.lang
 delete mode 100644 htdocs/langs/fr_CH/holiday.lang
 delete mode 100644 htdocs/langs/fr_CH/languages.lang
 create mode 100644 htdocs/langs/fr_CI/errors.lang
 delete mode 100644 htdocs/langs/fr_CI/holiday.lang
 delete mode 100644 htdocs/langs/fr_CI/languages.lang
 create mode 100644 htdocs/langs/fr_CM/errors.lang
 delete mode 100644 htdocs/langs/fr_CM/holiday.lang
 delete mode 100644 htdocs/langs/fr_CM/languages.lang
 create mode 100644 htdocs/langs/fr_GA/errors.lang
 delete mode 100644 htdocs/langs/fr_GA/holiday.lang
 delete mode 100644 htdocs/langs/fr_GA/languages.lang
 delete mode 100644 htdocs/langs/it_CH/datapolicy.lang
 delete mode 100644 htdocs/langs/it_CH/languages.lang
 delete mode 100644 htdocs/langs/pt_AO/errors.lang
 delete mode 100644 htdocs/langs/pt_AO/holiday.lang
 delete mode 100644 htdocs/langs/pt_AO/languages.lang
 delete mode 100644 htdocs/langs/pt_AO/modulebuilder.lang
 delete mode 100644 htdocs/langs/pt_AO/partnership.lang
 create mode 100644 htdocs/langs/ru_UA/errors.lang

diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 749eceae9c1..14ee7f9d45b 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -287,6 +287,7 @@ TotalVente=ከታክስ በፊት ጠቅላላ ገቢ
 TotalMarge=ጠቅላላ የሽያጭ ህዳግ
 
 DescVentilCustomer=ከመለያው ገበታ ወደ ምርት መለያ የታሰሩ (ወይም ያልሆኑ) የደንበኛ የክፍያ መጠየቂያ መስመሮችን ዝርዝር እዚህ ይመልከቱ
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=የክፍያ መጠየቂያ ደረሰኞች ደንበኞችን ዝርዝር እና የምርት መለያቸውን ከመለያ ገበታ ይመልከቱ
 DescVentilTodoCustomer=የክፍያ መጠየቂያ መስመሮች አስቀድመው ከምርት መለያ ጋር ከመለያ ገበታ ላይ ያልታሰሩ
 ChangeAccount=ለተመረጡት መስመሮች የምርት/አገልግሎት መለያውን (ከሂሳብ ገበታ) በሚከተለው መለያ ይቀይሩ፡
@@ -326,6 +327,40 @@ NotReconciled=አልታረቅም።
 WarningRecordWithoutSubledgerAreExcluded=ማስጠንቀቂያ፣ ንዑስ መለያ የሌላቸው ሁሉም መስመሮች ተጣርተው ከዚህ እይታ የተገለሉ ናቸው።
 AccountRemovedFromCurrentChartOfAccount=አሁን ባለው የመለያዎች ገበታ ውስጥ የማይገኝ የሂሳብ አያያዝ
 
+## Admin
+BindingOptions=የማስያዣ አማራጮች
+ApplyMassCategories=የጅምላ ምድቦችን ተግብር
+AddAccountFromBookKeepingWithNoCategories=የሚገኝ መለያ ገና በግላዊ ቡድን ውስጥ የለም።
+CategoryDeleted=የሒሳብ መለያው ምድብ ተወግዷል
+AccountingJournals=የሂሳብ መጽሔቶች
+AccountingJournal=የሂሳብ መጽሔት
+NewAccountingJournal=አዲስ የሂሳብ ጆርናል
+NatureOfJournal=የጆርናል ተፈጥሮ
+AccountingJournalType1=የተለያዩ ስራዎች
+AccountingJournalType2=ሽያጭ
+AccountingJournalType3=ግዢዎች
+AccountingJournalType4=ባንክ
+AccountingJournalType5=የወጪ ሪፖርቶች
+AccountingJournalType8=ቆጠራ
+AccountingJournalType9=የተያዙ ገቢዎች
+GenerationOfAccountingEntries=የሂሳብ ግቤቶች ማመንጨት
+ErrorAccountingJournalIsAlreadyUse=ይህ መጽሔት አስቀድሞ ጥቅም ላይ ውሏል
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=የመግቢያ ብዛት
+NumberOfAccountancyMovements=የእንቅስቃሴዎች ብዛት
+ACCOUNTING_DISABLE_BINDING_ON_SALES=በሽያጭ ላይ የሂሳብ አያያዝ እና ማስተላለፍን ያሰናክሉ (የደንበኛ ደረሰኞች በሂሳብ አያያዝ ውስጥ አይገቡም)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=በግዢዎች ላይ በሂሳብ አያያዝ ውስጥ ማሰር እና ማስተላለፍን ያሰናክሉ (የሻጭ ደረሰኞች በሂሳብ አያያዝ ውስጥ አይወሰዱም)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=በወጪ ሪፖርቶች ላይ የሂሳብ አያያዝ እና ማስተላለፍን ያሰናክሉ (የወጪ ሪፖርቶች በሂሳብ አያያዙም)
+ACCOUNTING_ENABLE_LETTERING=በሂሳብ አያያዝ ውስጥ የፊደል አጻጻፍ ተግባርን ያንቁ
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+EnablingThisFeatureIsNotNecessary=ይህንን ባህሪ ማንቃት ለጠንካራ የሂሳብ አያያዝ አስተዳደር አስፈላጊ አይሆንም።
+ACCOUNTING_ENABLE_AUTOLETTERING=ወደ አካውንቲንግ ሲተላለፉ አውቶማቲክ ፊደላትን አንቃ
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=የደብዳቤው ኮድ በራስ-ሰር ይፈልቃል እና ይጨምራል እናም በዋና ተጠቃሚ አልተመረጠም።
+ACCOUNTING_LETTERING_NBLETTERS=የፊደል አጻጻፍ ኮድ በሚፈጥሩበት ጊዜ የፊደሎች ብዛት (ነባሪ 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=አንዳንድ የሂሳብ ሶፍትዌሮች ባለ ሁለት ፊደል ኮድ ብቻ ነው የሚቀበሉት። ይህ ግቤት ይህንን ገጽታ እንዲያዘጋጁ ያስችልዎታል. የነባሪ ፊደሎች ቁጥር ሦስት ነው።
+OptionsAdvanced=የላቁ አማራጮች
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=በአቅራቢዎች ግዢ ላይ የተጨማሪ እሴት ታክስ አስተዳደርን ያግብሩ
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=ይህ አማራጭ ሲነቃ፣ አቅራቢው ወይም የተሰጠው የአቅራቢ ደረሰኝ ወደ ሂሳብ ሒሳብ በተለየ መንገድ መተላለፍ እንዳለበት መግለፅ ይችላሉ፡ ተጨማሪ ዴቢት እና ክሬዲት መስመር በሂሳብ መዝገብ ውስጥ በ2 የተሰጡ ሂሳቦች በ‹‹< ውስጥ ከተገለፀው የመለያ ገበታው ላይ ይወጣሉ። %s ማዋቀር ገጽ።
 
 ## Export
 NotExportLettering=ፋይሉን በሚፈጥሩበት ጊዜ ፊደሉን ወደ ውጭ አይላኩ
@@ -432,12 +467,15 @@ AccountancyClosureConfirmAccountingReversal=እርግጠኛ ነዎት ለ"የተ
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=አንዳንድ አስገዳጅ የማዋቀር ደረጃዎች አልተደረጉም፣ እባክዎ ያጠናቅቁዋቸው
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
+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=በክፍያ መጠየቂያ ላይ ያሉ አንዳንድ መስመሮች ከሂሳብ መዝገብ ጋር የተገናኙ አይደሉም።
 ExportNotSupported=የተቀናበረው ወደ ውጭ መላኪያ ቅርጸት በዚህ ገጽ ላይ አይደገፍም።
 BookeppingLineAlreayExists=በሂሳብ አያያዝ ውስጥ ቀድሞውኑ ያሉ መስመሮች
 NoJournalDefined=ምንም ጆርናል አልተገለጸም።
 Binded=መስመሮች ተያይዘዋል።
 ToBind=ለማሰር መስመሮች
+UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=ማስታወሻ፡ ይህ ሞጁል ወይም ገጽ ከሁኔታ ደረሰኞች የሙከራ ባህሪ ጋር ሙሉ ለሙሉ ተኳሃኝ አይደለም። አንዳንድ መረጃዎች የተሳሳቱ ሊሆኑ ይችላሉ።
 AccountancyErrorMismatchLetterCode=በማስታረቅ ኮድ ውስጥ አለመዛመድ
 AccountancyErrorMismatchBalanceAmount=ቀሪው (%s) ከ 0 ጋር እኩል አይደለም
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index e1fa86686e7..537dbd7cb32 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -71,6 +71,7 @@ OSSetup=የስርዓተ ክወና ማዋቀር
 SecurityFilesDesc=ፋይሎችን ስለመስቀል ከደህንነት ጋር የተያያዙ አማራጮችን እዚህ ይግለጹ።
 ErrorModuleRequirePHPVersion=ስህተት፣ ይህ ሞጁል የPHP ስሪት %s ወይም ከዚያ በላይ ያስፈልገዋል
 ErrorModuleRequireDolibarrVersion=ስህተት፣ ይህ ሞጁል የዶሊባርር ስሪት %s ወይም ከዚያ በላይ ይፈልጋል።
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
 DictionarySetup=መዝገበ ቃላት ማዋቀር
 Dictionary=መዝገበ ቃላት
 ErrorReservedTypeSystemSystemAuto=ለዓይነት 'ስርዓት' እና 'systemauto' እሴት የተጠበቁ ናቸው። የራስዎን መዝገብ ለመጨመር 'ተጠቃሚ'ን እንደ እሴት መጠቀም ይችላሉ።
@@ -105,6 +106,7 @@ NextValueForInvoices=ቀጣይ ዋጋ (ደረሰኞች)
 NextValueForCreditNotes=ቀጣይ እሴት (የክሬዲት ማስታወሻዎች)
 NextValueForDeposit=ቀጣይ ዋጋ (ቅድመ ክፍያ)
 NextValueForReplacements=ቀጣይ እሴት (ምትክ)
+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=ማስታወሻ፡ በእርስዎ ፒኤችፒ ውቅር ውስጥ ምንም ገደብ አልተዘጋጀም።
 MaxSizeForUploadedFiles=ለተሰቀሉ ፋይሎች ከፍተኛው መጠን (ማንኛውንም ሰቀላ ላለመፍቀድ 0)
 UseCaptchaCode=በግራፊክ ኮድ (CAPTCHA) በመግቢያ ገፅ እና አንዳንድ የህዝብ ገፆች ላይ ተጠቀም
@@ -148,6 +150,7 @@ AllWidgetsWereEnabled=ሁሉም የሚገኙ መግብሮች ነቅተዋል።
 WidgetAvailable=መግብር ይገኛል።
 PositionByDefault=ነባሪ ትእዛዝ
 MenusDesc=የምናሌ አስተዳዳሪዎች የሁለቱን ምናሌ አሞሌዎች (አግድም እና አቀባዊ) ይዘት ያዘጋጃሉ።
+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=ለተጠቃሚዎች ምናሌ
 LangFile=.lang ፋይል
 Language_en_US_es_MX_etc=ቋንቋ (en_US፣ es_MX፣ ...)
@@ -156,9 +159,11 @@ SystemInfo=የስርዓት መረጃ
 SystemToolsArea=የስርዓት መሳሪያዎች አካባቢ
 SystemToolsAreaDesc=ይህ አካባቢ የአስተዳደር ተግባራትን ያቀርባል. አስፈላጊውን ባህሪ ለመምረጥ ምናሌውን ይጠቀሙ.
 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=የምዝግብ ማስታወሻ ፋይሎችን ይሰርዙ፣ <b>%s</b> ሞጁል ለSpanys የተገለጸ ውሂብ የማጣት አደጋ)
 PurgeDeleteTemporaryFiles=ሁሉንም የምዝግብ ማስታወሻዎች እና ጊዜያዊ ፋይሎችን ሰርዝ (ውሂብ የማጣት አደጋ የለም)። መለኪያ 'tempfilesold'፣ 'logfiles' ወይም ሁለቱም 'tempfilesold+logfiles' ሊሆን ይችላል። ማሳሰቢያ፡- ጊዜያዊ ፋይሎችን መሰረዝ የሚደረገው የቴምፕ ዳይሬክተሩ ከ24 ሰአት በፊት ከተፈጠረ ብቻ ነው።
 PurgeDeleteTemporaryFilesShort=ሎግ እና ጊዜያዊ ፋይሎችን ሰርዝ (ውሂብ የማጣት አደጋ የለም)
+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=አሁን ያጽዱ
 PurgeNothingToDelete=ምንም ማውጫ ወይም የሚሰረዙ ፋይሎች የሉም።
 PurgeNDirectoriesDeleted=<b>%s</b> ፋይሎች ወይም ማውጫዎች ተሰርዘዋል።
@@ -209,6 +214,7 @@ OnlyActiveElementsAreShown=የ<a href="%s">የነቁ ሞጁሎች</a> አባሎ
 ModulesDesc=ሞጁሎቹ/መተግበሪያዎቹ የትኞቹ ባህሪያት በሶፍትዌሩ ውስጥ እንደሚገኙ ይወስናሉ። አንዳንድ ሞጁሎች ሞጁሉን ካነቃቁ በኋላ ለተጠቃሚዎች ፈቃድ እንዲሰጡ ይፈልጋሉ። የእያንዳንዱን ሞጁል ለማንቃት <span class="small valignmiddle">%s</span> የሚለውን ቁልፍ ጠቅ ያድርጉ። ወይም ሞጁል/መተግበሪያን አሰናክል።
 ModulesDesc2=ሞጁሉን ለማዋቀር የዊል አዝራሩን <span class="small valignmiddle">%s</span>ን ጠቅ ያድርጉ።
 ModulesMarketPlaceDesc=በበይነመረቡ ላይ በውጫዊ ድረ-ገጾች ላይ የሚወርዱ ተጨማሪ ሞጁሎችን ማግኘት ይችላሉ...
+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=ውጫዊ መተግበሪያ/ሞጁሎችን ያግኙ
 ModulesDevelopYourModule=የራስዎን መተግበሪያ/ሞዱሎች ይገንቡ
 ModulesDevelopDesc=እንዲሁም የራስዎን ሞጁል ማዳበር ወይም አንዱን ለእርስዎ የሚያዘጋጅ አጋር ማግኘት ይችላሉ።
@@ -216,6 +222,7 @@ DOLISTOREdescriptionLong=ውጫዊ ሞጁል ለማግኘት <a href="https://ww
 FreeModule=ፍርይ
 CompatibleUpTo=ከስሪት %s ጋር ተኳሃኝ
 NotCompatible=ይህ ሞጁል ከእርስዎ Dolibarr ጋር የሚስማማ አይመስልም %s (ደቂቃ %s - ከፍተኛ b0ecb2fz0 span>)
+CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=በገበያ ቦታ ይመልከቱ
 SeeSetupOfModule=የሞጁሉን ማዋቀር ይመልከቱ %s
 SeeSetupPage=የማዋቀር ገጽ በ%s ላይ ይመልከቱ።
@@ -243,6 +250,8 @@ Security=ደህንነት
 Passwords=የይለፍ ቃሎች
 DoNotStoreClearPassword=በመረጃ ቋት ውስጥ የተከማቹ የይለፍ ቃላትን ኢንክሪፕት ያድርጉ (እንደ ግልጽ ጽሑፍ አይደለም)። ይህንን አማራጭ ለማንቃት በጥብቅ ይመከራል.
 MainDbPasswordFileConfEncrypted=በ conf.php ውስጥ የተከማቸ የውሂብ ጎታ ይለፍ ቃል ያመስጥር። ይህንን አማራጭ ለማንቃት በጥብቅ ይመከራል.
+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=የተፈጠሩ ፒዲኤፍ ፋይሎችን ይጠብቁ። የጅምላ ፒዲኤፍ መፈጠርን ስለሚሰብር ይህ አይመከርም።
 ProtectAndEncryptPdfFilesDesc=የፒዲኤፍ ሰነድ ጥበቃ በማንኛውም ፒዲኤፍ አሳሽ ለማንበብ እና ለማተም ያስችላል። ሆኖም፣ ማረም እና መቅዳት ከአሁን በኋላ አይቻልም። ይህን ባህሪ መጠቀም አለምአቀፍ የተዋሃዱ ፒዲኤፎችን መገንባት አይሰራም።
 Feature=ባህሪ
@@ -259,6 +268,8 @@ OtherResources=ሌሎች ሀብቶች
 ExternalResources=የውጭ ሀብቶች
 SocialNetworks=ማህበራዊ አውታረ መረቦች
 SocialNetworkId=የማህበራዊ አውታረ መረብ መታወቂያ
+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=በ Dolibarr እርዳታ እና ድጋፍ ለማግኘት አንዳንድ ግብዓቶች እዚህ አሉ።
 HelpCenterDesc2=ከእነዚህ ሃብቶች ውስጥ አንዳንዶቹ የሚገኙት በ<b>amharic</b> ውስጥ ብቻ ነው።
 CurrentMenuHandler=የአሁኑ ምናሌ ተቆጣጣሪ
@@ -279,6 +290,8 @@ EMailsSetup=ኢሜይሎች ማዋቀር
 EMailsDesc=ይህ ገጽ ኢሜል ለመላክ መለኪያዎችን ወይም አማራጮችን እንዲያዘጋጁ ይፈቅድልዎታል።
 EmailSenderProfiles=ኢሜይሎች ላኪ መገለጫዎች
 EMailsSenderProfileDesc=ይህንን ክፍል ባዶ ማድረግ ይችላሉ. አንዳንድ ኢሜይሎችን እዚህ ካስገቡ፣ አዲስ ኢሜል ሲጽፉ ወደ ጥምር ሳጥን ውስጥ ሊሆኑ ከሚችሉ ላኪዎች ዝርዝር ውስጥ ይታከላሉ።
+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 ወደብ
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS አስተናጋጅ
 MAIN_MAIL_EMAIL_FROM=ለራስ ሰር ኢሜይሎች ላኪ
@@ -332,10 +345,12 @@ ThisIsAlternativeProcessToFollow=ይህ በእጅ ለማስኬድ አማራጭ 
 StepNb=ደረጃ %s
 FindPackageFromWebSite=የሚፈልጉትን ባህሪያት የሚያቀርብ ጥቅል ያግኙ (ለምሳሌ በኦፊሴላዊው ድረ-ገጽ %s ላይ)።
 DownloadPackageFromWebSite=ጥቅል አውርድ (ለምሳሌ ከኦፊሴላዊው ድረ-ገጽ %s)።
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=ውጫዊ ሞጁሉን ለማሰማራት/ለመጫን የማህደር ፋይሉን ለውጫዊ ሞጁሎች ወደተዘጋጀው የአገልጋይ ማውጫ ውስጥ መንቀል/መፍታት አለብህ፡<br><b>%s</b>
 SetupIsReadyForUse=የሞዱል ዝርጋታ አልቋል። ነገር ግን ወደ ገጹ ማቀናበሪያ ሞጁሎች በመሄድ ሞጁሉን በመተግበሪያዎ ውስጥ ማንቃት እና ማዋቀር አለብዎት፡ <a href="%s">%s</a>።
 NotExistsDirect=ተለዋጭ ስርወ ማውጫው አሁን ላለው ማውጫ አልተገለጸም።<br>
 InfDirAlt=ከስሪት 3 ጀምሮ፣ አማራጭ ስርወ ማውጫን መግለፅ ይቻላል። ይህ ወደ ተለየ ማውጫ፣ ተሰኪዎች እና ብጁ አብነቶች እንዲያከማቹ ያስችልዎታል።<br>በ Dolibarr ስር ማውጫ ላይ (ለምሳሌ፡ ብጁ) ብቻ ፍጠር።<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=የሞጁሉን ጥቅል የዚፕ ፋይል ከዚህ መስቀል ይችላሉ፡-
 CurrentVersion=Dolibarr የአሁኑ ስሪት
 CallUpdatePage=የውሂብ ጎታውን አወቃቀር እና ውሂብ ወደሚያዘምነው ገጽ አስስ፡ %s።
@@ -346,12 +361,22 @@ LastActivationIP=የቅርብ ጊዜ ማግበር አይፒ
 LastActivationVersion=የቅርብ ጊዜ ማግበር ስሪት
 UpdateServerOffline=አገልጋዩን ከመስመር ውጭ ያዘምኑ
 WithCounter=ቆጣሪ ያስተዳድሩ
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=በጭምብሉ ውስጥ ያሉት ሁሉም ሌሎች ቁምፊዎች ሳይበላሹ ይቆያሉ።<br>Spaces አይፈቀዱም።<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 2023-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=በተወሰነ ጭምብል መሰረት ሊበጅ የሚችል ቁጥር ይመልሳል።
+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=የአገልጋይ ግንኙነትን ይሞክሩ
 DoTestSend=የመላክ ሙከራ
 DoTestSendHTML=HTML መላክን ይሞክሩ
 ErrorCantUseRazIfNoYearInMask=ስህተት፣ ተከታታይ {yy} ወይም {yyyy} ጭንብል ውስጥ ካልሆነ በየዓመቱ ቆጣሪን እንደገና ለማስጀመር አማራጭ @ መጠቀም አይቻልም።
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=በዩኒክስ/ሊኑክስ/ቢኤስዲ/ማክ ፋይል ስርዓት ላይ ለአዳዲስ ፋይሎች የUMask መለኪያ።
 UMaskExplanation=ይህ መመዘኛ በአገልጋዩ ላይ በዶሊባርር በተፈጠሩ ፋይሎች ላይ በነባሪ የተቀመጡ ፈቃዶችን እንዲገልጹ ያስችልዎታል (ለምሳሌ በሚሰቀልበት ጊዜ)<br>የስምንትዮሽ እሴት መሆን አለበት (ለምሳሌ 0666 ማንበብ ማለት ነው) እና ለሁሉም ሰው ይፃፉ.) የሚመከር እሴት 0600 ወይም 0660<br>ይህ ግቤት በዊንዶውስ አገልጋይ ላይ ምንም ፋይዳ የለውም።
 SeeWikiForAllTeam=አስተዋጽዖ አበርካቾችን እና ድርጅታቸውን ዝርዝር ለማግኘት የዊኪን ገጽ ይመልከቱ
@@ -365,7 +390,9 @@ LanguageFilesCachedIntoShmopSharedMemory=ፋይሎች .lang በጋራ ማህደ
 LanguageFile=የቋንቋ ፋይል
 ExamplesWithCurrentSetup=ምሳሌዎች ከአሁኑ ውቅር ጋር
 ListOfDirectories=የOpenDocument አብነት ማውጫዎች ዝርዝር
+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=በእነዚህ ማውጫዎች ውስጥ የሚገኙት የኦዲቲ/ኦዲኤስ አብነት ፋይሎች ብዛት
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>የእርስዎን የ odt ሰነድ አብነቶች እንዴት መፍጠር እንደሚችሉ ለማወቅ በእነዚያ ማውጫዎች ውስጥ ከማስቀመጥዎ በፊት የዊኪ ሰነዶችን ያንብቡ፡-
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=የስም / የአያት ስም አቀማመጥ
@@ -434,8 +461,11 @@ ComputedFormulaDesc=ተለዋዋጭ የተሰላ እሴት ለማግኘት ሌ
 Computedpersistent=የተሰላ መስክ ያከማቹ
 ComputedpersistentDesc=የተሰሉ ተጨማሪ መስኮች በመረጃ ቋቱ ውስጥ ይቀመጣሉ፣ ነገር ግን እሴቱ የሚሰላው የዚህ መስክ ነገር ሲቀየር ብቻ ነው። የተሰላው መስክ በሌሎች ነገሮች ወይም በአለምአቀፍ መረጃ ላይ የሚመረኮዝ ከሆነ ይህ ዋጋ የተሳሳተ ሊሆን ይችላል!!
 ExtrafieldParamHelpPassword=ይህንን መስክ ባዶ መተው ማለት ይህ ዋጋ ያለ ማመስጠር ይከማቻል ማለት ነው (መስክ በስክሪኑ ላይ በኮከቦች ተደብቋል)።<br><br>አስገባ እሴት 'ዶልክሪፕት' እሴትን በሚቀለበስ ምስጠራ ስልተቀመር ለመመስረት። አጽዳ ውሂብ አሁንም ሊታወቅ እና ሊስተካከል ይችላል ነገር ግን ወደ የውሂብ ጎታ የተመሰጠረ ነው።<br><br>'auto' (ወይም 'md5') አስገባ፣ 'sha256'፣ 'password_hash'፣ ...) የማይቀለበስ የሃሽ ይለፍ ቃል ወደ ዳታቤዝ ለማስቀመጥ ነባሪውን የይለፍ ቃል ምስጠራ አልጎሪዝም ለመጠቀም (ወይም md5፣ sha256፣ password_hash...) ለመጠቀም (የመጀመሪያውን እሴት ለማውጣት ምንም መንገድ የለም)
-ExtrafieldParamHelpcheckbox=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2,<br>...
+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=የእሴቶቹ ዝርዝር የቅርጸት ቁልፍ፣ እሴት (ቁልፉ '0' ሊሆን የማይችልበት) መስመሮች መሆን አለባቸው<br><br> ለምሳሌ : <br>1,value1<br>2,value2,<br>3,value3n<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 necessarily 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=የእሴቶቹ ዝርዝር ከሠንጠረዥ ነው የሚመጣው<br>አገባብ፡ table_name:label_field:id_field::filtersql<br>ምሳሌ: c_typent:lib ::filtersql<br><br>ማጣሪያ ገባሪ እሴትን ብቻ ለማሳየት ቀላል ሙከራ (ለምሳሌ active=1) ሊሆን ይችላል<br>እንዲሁም $ID$ን በማጣሪያ ጠንቋይ መጠቀም ትችላለህ የአሁኑ ነገር መታወቂያ<br>በማጣሪያ ውስጥ ምረጥን ለማድረግ $SEL$<br>extrafields ላይ ማጣራት ከፈለግክ syntax extra.fieldcode=... (የመስክ ኮድ የኤክስትራፊልድ ኮድ የሆነበት)<br><br>ዝርዝሩን በሌላ ተጨማሪ የባህሪ ዝርዝር ላይ በመመስረት እንዲኖርዎት፡<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19z0>b0342fccfda19z0' z0 ዝርዝሩ እንደሌላው ዝርዝር እንዲኖር፡<br>c_typent:libelle:id:<i>parent_list_code</i>|የወላጅ_ዓምድ: ማጣሪያ
 ExtrafieldParamHelplink=መለኪያዎች ObjectName:Classpath<br>አገባብ መሆን አለባቸው የነገር ስም: ክፍል
 ExtrafieldParamHelpSeparator=ለቀላል መለያየት ባዶ ያቆዩ<br>ለሚሰበሰብ መለያየት ይህንን ወደ 1 ያዋቅሩት (ለአዲስ ክፍለ ጊዜ በነባሪነት ክፈት፣ ከዚያ ለእያንዳንዱ ክፍለ ጊዜ ሁኔታ ይቀመጣል)<br>ይህን ወደ 2 አዘጋጅ ለሚፈርስ መለያየት (ለአዲስ ክፍለ ጊዜ በነባሪነት ወድቋል፣ ከዚያ ሁኔታ ለእያንዳንዱ ተጠቃሚ ክፍለ ጊዜ ይጠበቃል)
 LibraryToBuildPDF=ለፒዲኤፍ ማመንጨት የሚያገለግል ላይብረሪ
@@ -453,6 +483,7 @@ ExternalModule=ውጫዊ ሞጁል
 InstalledInto=ወደ ማውጫ %s ተጭኗል
 BarcodeInitForThirdparties=ለሶስተኛ ወገኖች የጅምላ ባርኮድ መግቢያ
 BarcodeInitForProductsOrServices=ለምርቶች ወይም አገልግሎቶች የጅምላ ባር ኮድ መግቢያ ወይም ዳግም ያስጀምሩ
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Init ዋጋ ለ%s ባዶ ባርኮዶች
 EraseAllCurrentBarCode=ሁሉንም የባርኮድ ዋጋዎች ደምስስ
 ConfirmEraseAllCurrentBarCode=እርግጠኛ ነዎት ሁሉንም የባርኮድ እሴቶች መሰረዝ ይፈልጋሉ?
@@ -478,6 +509,7 @@ WarningPHPMailA=- የኢሜል አገልግሎት አቅራቢውን አገል
 WarningPHPMailB=- አንዳንድ የኢሜል አገልግሎት አቅራቢዎች (እንደ ያሁ ያሉ) ከሌላ አገልጋይ ከራሳቸው አገልጋይ ኢሜይል እንዲልኩ አይፈቅዱም። አሁን ያላችሁት ዝግጅት የኢሜል አቅራቢዎን አገልጋይ ሳይሆን ኢሜል ለመላክ የመተግበሪያውን አገልጋይ ይጠቀማል ስለዚህ አንዳንድ ተቀባዮች (ከዲኤምአርሲ ገዳቢ ፕሮቶኮል ጋር የሚስማማው) ኢሜልዎን እና አንዳንድ የኢሜል አቅራቢዎችን መቀበል ይችሉ እንደሆነ የኢሜል አቅራቢዎን ይጠይቃሉ ። (እንደ ያሁ አይነት) አገልጋዩ የእነሱ ስላልሆነ "አይ" የሚል ምላሽ ሊሰጥ ይችላል፣ ስለዚህ ከተላኩ ኢሜይሎችዎ ውስጥ ጥቂቶቹ ለማድረስ ተቀባይነት ላይኖራቸው ይችላል (የኢሜል አቅራቢዎን የመላኪያ ኮታም ይጠንቀቁ)።
 WarningPHPMailC=- የእራስዎን የኢሜል አገልግሎት አቅራቢ SMTP አገልጋይ ኢሜይሎችን ለመላክ እንዲሁ አስደሳች ነው ስለዚህ ከመተግበሪያው የተላኩ ኢሜይሎች በሙሉ ወደ የመልእክት ሳጥንዎ "የተላኩ" ማውጫ ውስጥ ይቀመጣሉ።
 WarningPHPMailD=ስለዚህ የኢሜል መላኪያ ዘዴን ወደ "SMTP" እሴት ለመቀየር ይመከራል.
+WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
 WarningPHPMail2=የኢሜል SMTP አቅራቢዎ የኢሜል ደንበኛን ለአንዳንድ የአይፒ አድራሻዎች መገደብ ካለበት (በጣም አልፎ አልፎ) ይህ የመልእክት ተጠቃሚ ወኪሉ (MUA) ለኢአርፒ CRM መተግበሪያዎ የአይፒ አድራሻ ነው፡ <strong>%s</strong>።
 WarningPHPMailSPF=በላኪ ኢሜል አድራሻዎ ውስጥ ያለው የጎራ ስም በSPF መዝገብ ከተጠበቀ (የእርስዎን የጎራ ስም ሬጅስትር ይጠይቁ) በጎራዎ ዲ ኤን ኤስ የ SPF መዝገብ ውስጥ የሚከተሉትን አይፒዎች ማከል አለብዎት: <strong>%s</strong>።
 ActualMailSPFRecordFound=ትክክለኛው የSPF መዝገብ ተገኝቷል (ለኢሜል %s): %s
@@ -486,6 +518,8 @@ DependsOn=ይህ ሞጁል ሞጁሉን ያስፈልገዋል
 RequiredBy=ይህ ሞጁል በሞጁል(ዎች) ያስፈልጋል
 TheKeyIsTheNameOfHtmlField=ይህ የኤችቲኤምኤል መስክ ስም ነው። የመስክ ቁልፍ ስም ለማግኘት የኤችቲኤምኤል ገጹን ይዘት ለማንበብ የቴክኒክ እውቀት ያስፈልጋል።
 PageUrlForDefaultValues=የገጹን URL አንጻራዊ መንገድ ማስገባት አለብህ። በዩአርኤል ውስጥ ግቤቶችን ካካተቱ፣ በአሰሳ URL ውስጥ ያሉ ሁሉም መመዘኛዎች እዚህ ላይ የተገለጸው ዋጋ ካላቸው ውጤታማ ይሆናል።
+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=እንዲሁም ለቅጽ አፈጣጠር ነባሪ ዋጋዎችን እንደገና መፃፍ በትክክል ለተዘጋጁ ገፆች ብቻ እንደሚሰራ (ስለዚህ በመለኪያ ድርጊት = መፍጠር ወይም ማቅረብ...)
 EnableDefaultValues=ነባሪ እሴቶችን ማበጀትን ያንቁ
 EnableOverwriteTranslation=ትርጉሞችን ማበጀት ፍቀድ
@@ -1163,6 +1197,7 @@ Skin=የቆዳ ጭብጥ
 DefaultSkin=ነባሪ የቆዳ ገጽታ
 MaxSizeList=ለዝርዝር ከፍተኛው ርዝመት
 DefaultMaxSizeList=ለዝርዝሮች ነባሪ ከፍተኛ ርዝመት
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=ለአጭር ዝርዝሮች ነባሪ ከፍተኛ ርዝመት (ማለትም በደንበኛ ካርድ ውስጥ)
 MessageOfDay=የእለቱ መልእክት
 MessageLogin=የመግቢያ ገጽ መልእክት
@@ -1212,7 +1247,10 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=ለማጽደቅ የወጪ ሪፖርት
 Delays_MAIN_DELAY_HOLIDAYS=ለማጽደቅ ጥያቄዎችን ይተዉ
 SetupDescription1=ዶሊባርርን መጠቀም ከመጀመርዎ በፊት አንዳንድ የመጀመሪያ መለኪያዎች መገለጽ እና ሞጁሎች መንቃት/መዋቀር አለባቸው።
 SetupDescription2=የሚከተሉት ሁለት ክፍሎች የግዴታ ናቸው (በማዋቀር ምናሌ ውስጥ ያሉት ሁለቱ የመጀመሪያ ግቤቶች)
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=ሌሎች የማዋቀር ምናሌ ግቤቶች የአማራጭ መለኪያዎችን ያስተዳድራሉ።
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=የመተግበሪያዎን ነባሪ ባህሪ ለማበጀት የሚያገለግሉ መሰረታዊ መለኪያዎች (ለምሳሌ ከአገር ጋር ለተያያዙ ባህሪያት)።
 SetupDescription4b=ይህ ሶፍትዌር የበርካታ ሞጁሎች/መተግበሪያዎች ስብስብ ነው። ከእርስዎ ፍላጎቶች ጋር የተያያዙ ሞጁሎች መንቃት አለባቸው. እነዚህ ሞጁሎች ሲነቁ የምናሌ ግቤቶች ይታያሉ።
 AuditedSecurityEvents=ኦዲት የተደረጉ የደህንነት ክስተቶች
@@ -1231,6 +1269,7 @@ BrowserOS=አሳሽ OS
 ListOfSecurityEvents=የዶሊባርር የደህንነት ክስተቶች ዝርዝር
 SecurityEventsPurged=የደህንነት ክስተቶች ጸድተዋል።
 TrackableSecurityEvents=መከታተል የሚችሉ የደህንነት ክስተቶች
+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=የማዋቀር መለኪያዎች በ<b>አስተዳዳሪ ተጠቃሚዎች</b> ብቻ ሊቀናበሩ ይችላሉ።
 SystemInfoDesc=የስርዓት መረጃ በንባብ ብቻ ሁነታ የሚያገኙት ልዩ ልዩ ቴክኒካዊ መረጃ እና ለአስተዳዳሪዎች ብቻ የሚታይ ነው።
 SystemAreaForAdminOnly=ይህ አካባቢ ለአስተዳዳሪ ተጠቃሚዎች ብቻ ይገኛል። የዶሊባርር ተጠቃሚ ፈቃዶች ይህንን ገደብ መለወጥ አይችሉም።
@@ -1243,10 +1282,13 @@ AvailableModules=የሚገኝ መተግበሪያ/ሞዱሎች
 ToActivateModule=ሞጁሎችን ለማግበር ወደ ማቀናበሪያ ቦታ ይሂዱ (ቤት -> ማዋቀር -> ሞጁሎች)።
 SessionTimeOut=ለክፍለ ጊዜ ጊዜው አልፏል
 SessionExplanation=የክፍለ-ጊዜው ማጽጃ የሚከናወነው በInternal PHP ክፍለ ጊዜ ማጽጃ (እና ምንም ካልሆነ) ይህ ቁጥር ከዚህ መዘግየት በፊት ክፍለ ጊዜው እንደማያልቅ ዋስትና ይሰጣል። የውስጥ ፒኤችፒ ክፍለ ጊዜ ማጽጃ ክፍለ ጊዜው ከዚህ መዘግየት በኋላ ጊዜው እንደሚያልፍ ዋስትና አይሰጥም። ከዚህ መዘግየት በኋላ እና የክፍለ-ጊዜ ማጽጃው ሲሰራ ጊዜው ያበቃል፣ ስለዚህ እያንዳንዱ <b>%s/%s</b>መዳረሻ፣ ነገር ግን በሌሎች ክፍለ-ጊዜዎች በሚደረግ መዳረሻ ጊዜ ብቻ (እሴቱ 0 ከሆነ፣ ክፍለ-ጊዜውን ማጽዳት በውጫዊ ሂደት ብቻ ነው የሚከናወነው) .<br>ማስታወሻ፡ በአንዳንድ የውጫዊ ክፍለ ጊዜ ማጽጃ ዘዴ ባላቸው አገልጋዮች ላይ (ክሮን በዴቢያን፣ ubuntu ...)፣ ክፍለ-ጊዜዎቹ በውጫዊ ማዋቀር ከተወሰነ ጊዜ በኋላ ሊጠፉ ይችላሉ። እዚህ የገባው ዋጋ ምንም ይሁን ምን.
+SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
 TriggersAvailable=የሚገኙ ቀስቅሴዎች
 TriggersDesc=ቀስቅሴዎች ወደ ማውጫ <b>htdocs/core/triggers</b> ማውጫ ውስጥ አንዴ ከተገለበጡ የዶሊባርር የስራ ፍሰት ባህሪን የሚቀይሩ ፋይሎች ናቸው። አዳዲስ ድርጊቶችን ይገነዘባሉ, በ Dolibarr ክስተቶች (አዲስ ኩባንያ ፈጠራ, የክፍያ መጠየቂያ ማረጋገጫ, ...) ላይ ነቅተዋል.
 TriggerDisabledByName=በዚህ ፋይል ውስጥ ያሉ ቀስቅሴዎች በስማቸው በ<b>-NORUN</b> ቅጥያ ተሰናክለዋል።
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
 TriggerAlwaysActive=በዚህ ፋይል ውስጥ ያሉ ቀስቅሴዎች ምንጊዜም ንቁ ናቸው፣ ምንም አይነት የነቃው የ Dolibarr ሞጁሎች።
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=በራስ-ሰር ለሚፈጠሩ የይለፍ ቃሎች የሚጠቀሙበትን ዘዴ ይምረጡ።
 DictionaryDesc=ሁሉንም የማጣቀሻ ውሂብ አስገባ። እሴቶችዎን ወደ ነባሪ ማከል ይችላሉ።
 ConstDesc=ይህ ገጽ በሌሎች ገጾች ላይ የማይገኙ ግቤቶችን እንዲያርትዑ ይፈቅድልዎታል። እነዚህ በአብዛኛው የተጠበቁ መለኪያዎች ለገንቢዎች/ላቀ መላ ፍለጋ ብቻ ናቸው።
@@ -1265,6 +1307,8 @@ NoEventOrNoAuditSetup=ምንም የደህንነት ክስተት አልተመዘ
 NoEventFoundWithCriteria=ለዚህ የፍለጋ መስፈርት ምንም የደህንነት ክስተት አልተገኘም።
 SeeLocalSendMailSetup=የአካባቢዎን የመልእክት መልእክት ማዋቀር ይመልከቱ
 BackupDesc=የ<b>ሙሉ</b> የ Dolibarr ጭነት ምትኬ ሁለት ደረጃዎችን ይፈልጋል።
+BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+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=በማህደር የተቀመጠው ማውጫ ደህንነቱ በተጠበቀ ቦታ መቀመጥ አለበት።
 BackupDescY=የተፈጠረው የቆሻሻ መጣያ ፋይል ደህንነቱ በተጠበቀ ቦታ መቀመጥ አለበት።
 BackupPHPWarning=ምትኬ በዚህ ዘዴ ሊረጋገጥ አይችልም። ቀዳሚው ይመከራል።
@@ -1328,6 +1372,8 @@ SendmailOptionMayHurtBuggedMTA="PHP mail direct" ዘዴን በመጠቀም መ
 TranslationSetup=የትርጉም ማዋቀር
 TranslationKeySearch=የትርጉም ቁልፍ ወይም ሕብረቁምፊ ይፈልጉ
 TranslationOverwriteKey=የትርጉም ሕብረቁምፊን ይፃፉ
+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=የትኛውን የትርጉም ቁልፍ መጠቀም እንዳለቦት ለማወቅ እንዲረዳህ ሌላኛውን ትር መጠቀም ትችላለህ
 TranslationString=የትርጉም ሕብረቁምፊ
 CurrentTranslationString=የአሁኑ የትርጉም ሕብረቁምፊ
@@ -1352,6 +1398,7 @@ SearchOptim=የፍለጋ ማመቻቸት
 YouHaveXObjectUseComboOptim=በመረጃ ቋቱ ውስጥ %s %s አለህ። በተጫኑ ቁልፍ ክስተቶች ላይ ጥምር ዝርዝርን ለመጫን ወደ ሞጁል ማዋቀር መሄድ ይችላሉ።
 YouHaveXObjectUseSearchOptim=በመረጃ ቋቱ ውስጥ %s %s አለህ። በHome-Setup-Other ውስጥ ቋሚውን %s ወደ 1 ማከል ትችላለህ።
 YouHaveXObjectUseSearchOptimDesc=ይህ ፍለጋውን ወደ ሕብረቁምፊዎች መጀመሪያ ይገድባል ይህም የመረጃ ቋቱ መረጃ ጠቋሚዎችን እንዲጠቀም ያደርገዋል እና ፈጣን ምላሽ ማግኘት አለብዎት።
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=የ %s የድር አሳሽ እየተጠቀምክ ነው። ይህ አሳሽ ለደህንነት እና አፈጻጸም ደህና ነው።
 BrowserIsKO=የ %s የድር አሳሽ እየተጠቀምክ ነው። ይህ አሳሽ ለደህንነት፣ አፈጻጸም እና አስተማማኝነት መጥፎ ምርጫ እንደሆነ ይታወቃል። ፋየርፎክስ፣ ክሮም፣ ኦፔራ ወይም ሳፋሪ እንዲጠቀሙ እንመክራለን።
 PHPModuleLoaded=የPHP ክፍል %s ተጭኗል
@@ -1617,6 +1664,7 @@ LDAPDescUsers=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህ
 LDAPDescGroups=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህሪያትን ስም በዶሊባርር ቡድኖች ላይ ላለው እያንዳንዱ መረጃ እንዲገልጹ ያስችልዎታል።
 LDAPDescMembers=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህሪያትን ስም በዶሊባርር አባላት ሞጁል ላይ ላለው እያንዳንዱ መረጃ እንዲገልጹ ያስችልዎታል።
 LDAPDescMembersTypes=ይህ ገጽ በ LDAP ዛፍ ውስጥ የኤልዲኤፒ ባህሪያትን ስም በዶሊባርር አባላት አይነቶች ላይ ላለው እያንዳንዱ መረጃ እንዲገልጹ ያስችልዎታል።
+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=ለተረጋገጠ መዳረሻ (ለመፃፍ መዳረሻ ለምሳሌ)
 PerfDolibarr=የአፈጻጸም ማዋቀር/አሳቢ ሪፖርት
 YouMayFindPerfAdviceHere=ይህ ገጽ ከአፈጻጸም ጋር የተያያዙ አንዳንድ ቼኮችን ወይም ምክሮችን ይሰጣል።
@@ -1813,6 +1861,7 @@ PastDelayVCalExport=ያለፈውን ክስተት ወደ ውጭ አትላክ
 SecurityKey = የሚስጥራዊ ቁልፍ
 ##### ClickToDial #####
 ClickToDialSetup=ሞጁል ማዋቀርን ለመደወል ጠቅ ያድርጉ
+ClickToDialUrlDesc=URL called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=ይህ ሞጁል የዴስክቶፕ ኮምፒዩተር ሲጠቀሙ ስልክ ቁጥሮችን ወደ ጠቅ ሊደረጉ የሚችሉ አገናኞች ይለውጣል። አንድ ጠቅታ ቁጥሩን ይደውላል. ይህ በዴስክቶፕዎ ላይ ለስላሳ ስልክ ሲጠቀሙ ወይም ለምሳሌ በ SIP ፕሮቶኮል ላይ የተመሰረተ የሲቲኤ ሲስተም ሲጠቀሙ የስልክ ጥሪውን ለመጀመር ሊያገለግል ይችላል። ማስታወሻ: ስማርትፎን ሲጠቀሙ, የስልክ ቁጥሮች ሁልጊዜ ጠቅ ሊደረጉ ይችላሉ.
 ClickToDialUseTelLink=በስልክ ቁጥሮች ላይ "tel:" የሚለውን አገናኝ ብቻ ይጠቀሙ
 ClickToDialUseTelLinkDesc=ተጠቃሚዎችዎ ሶፍት ፎን ወይም የሶፍትዌር በይነገጽ ካላቸው፣ በአሳሹ ውስጥ በተመሳሳይ ኮምፒዩተር ላይ የተጫነ እና በአሳሽዎ ውስጥ በ"ቴል:" የሚጀምር ሊንክ ሲጫኑ ይደውሉ። በ"sIP:" የሚጀምር አገናኝ ወይም ሙሉ የአገልጋይ መፍትሄ (የአገር ውስጥ ሶፍትዌር መጫን አያስፈልግም) ከፈለጉ ይህንን ወደ "አይ" ማዘጋጀት እና ቀጣዩን መስክ መሙላት አለብዎት።
@@ -1872,6 +1921,8 @@ IfSetToYesDontForgetPermission=ወደ ባዶ ያልሆነ እሴት ከተዋቀ
 GeoIPMaxmindSetup=GeoIP Maxmind ሞጁል ማዋቀር
 PathToGeoIPMaxmindCountryDataFile=ወደ አገር ትርጉም Maxmind ip ን የያዘ ወደ ፋይል የሚወስድበት መንገድ
 NoteOnPathLocation=የእርስዎ የአይ ፒ ወደ ሀገር ውሂብ ፋይል ፒኤችፒ ሊያነበው በሚችለው ማውጫ ውስጥ መሆን እንዳለበት ልብ ይበሉ (የ PHP open_basedir ማዋቀር እና የፋይል ስርዓት ፈቃዶችን ያረጋግጡ)።
+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=የልወጣ IP -> አገር ሙከራ
 ##### Projects #####
 ProjectsNumberingModules=የፕሮጀክቶች ቁጥር መስጫ ሞጁል
@@ -1921,6 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=በሚከተሉት ምክንያቶች የ
 SomethingMakeInstallFromWebNotPossible2=በዚህ ምክንያት፣ እዚህ ላይ የተገለጸው የማሻሻል ሂደት አንድ ልዩ ተጠቃሚ ሊያደርገው የሚችለው በእጅ የሚሰራ ሂደት ነው።
 InstallModuleFromWebHasBeenDisabledContactUs=የውጫዊ ሞጁሎችን ወይም ተለዋዋጭ ድር ጣቢያዎችን መጫን ወይም ማልማት፣ ከመተግበሪያው፣ በአሁኑ ጊዜ ለደህንነት ዓላማ ተቆልፏል። ይህንን ባህሪ ማንቃት ከፈለጉ እባክዎ ያነጋግሩን።
 InstallModuleFromWebHasBeenDisabledByFile=የውጫዊ ሞጁል ከመተግበሪያው መጫን በአስተዳዳሪዎ ተሰናክሏል። ይህንን እንዲፈቅድ <strong>%s</strong> ፋይሉን እንዲያስወግድ መጠየቅ አለብህ። ባህሪ.
+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=የመዳፊት እንቅስቃሴ ሲያልፍ የጠረጴዛ መስመሮችን ያድምቁ
 HighlightLinesColor=አይጤው ሲያልፍ የመስመሩን ቀለም ያድምቁ (ያለ ድምቀት 'ffffff' ይጠቀሙ)
 HighlightLinesChecked=ሲፈተሽ የመስመሩን ቀለም ያድምቁ (ያለ ድምቀት 'ffffff' ይጠቀሙ)
@@ -2014,6 +2066,7 @@ DetectionNotPossible=ማወቅ አይቻልም
 UrlToGetKeyToUseAPIs=ኤፒአይን ለመጠቀም ማስመሰያ ለማግኘት ዩአርኤል (አንድ ጊዜ ማስመሰያ ከደረሰ በኋላ በመረጃ ቋት የተጠቃሚ ሠንጠረዥ ውስጥ ይቀመጣል እና በእያንዳንዱ የኤፒአይ ጥሪ ላይ መቅረብ አለበት)
 ListOfAvailableAPIs=የሚገኙ APIs ዝርዝር
 activateModuleDependNotSatisfied=ሞጁል "%s" በሞጁል "%s" ላይ የተመሰረተ ነው, ይህ ጠፍቷል, ስለዚህ ሞጁል " %1$s" በትክክል ላይሰራ ይችላል። እባክህ ሞጁሉን ጫን "%2$s" ወይም ሞጁሉን አሰናክል "%1$s" ከማንኛውም አስገራሚ ነገር መጠበቅ ከፈለጉ
+CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
 LandingPage=ማረፊያ ገጽ
 SamePriceAlsoForSharedCompanies=የባለብዙ ኩባንያ ሞጁሉን ከተጠቀሙ በምርጫው "ነጠላ ዋጋ" ምርቶች በአካባቢው መካከል የሚጋሩ ከሆነ ዋጋው ለሁሉም ኩባንያዎች ተመሳሳይ ይሆናል.
 ModuleEnabledAdminMustCheckRights=ሞዱል ነቅቷል። የነቃ ሞጁል(ዎች) ፈቃዶች የተሰጡት ለአስተዳዳሪ ተጠቃሚዎች ብቻ ነው። አስፈላጊ ከሆነ ለሌሎች ተጠቃሚዎች ወይም ቡድኖች ፈቃዶችን በእጅ መስጠት ሊኖርብዎ ይችላል።
@@ -2022,6 +2075,7 @@ TypeCdr=የመክፈያ ጊዜው የክፍያ ቀን እና በቀን ውስጥ
 BaseCurrency=የኩባንያው የማጣቀሻ ምንዛሪ (ይህንን ለመለወጥ ወደ ኩባንያው ማዋቀር ይሂዱ)
 WarningNoteModuleInvoiceForFrenchLaw=ይህ ሞጁል %s የፈረንሳይ ህጎችን ያከብራል (Loi Finance 2016)።
 WarningNoteModulePOSForFrenchLaw=ይህ ሞጁል %s የፈረንሳይ ህጎችን (Loi Finance 2016) ያከብራል ምክንያቱም ሞጁል የማይቀለበስ ምዝግብ ማስታወሻዎች በራስ ሰር ስለሚነቃ ነው።
+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=የግራ ህዳግ በፒዲኤፍ ላይ
 MAIN_PDF_MARGIN_RIGHT=የቀኝ ህዳግ በፒዲኤፍ ላይ
@@ -2061,6 +2115,7 @@ YouCanDeleteFileOnServerWith=ይህንን ፋይል በአገልጋዩ ላይ 
 ChartLoaded=የመለያ ገበታ ተጭኗል
 SocialNetworkSetup=የሞዱል ማህበራዊ አውታረ መረቦች ማዋቀር
 EnableFeatureFor=ለ<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=በፒዲኤፍ ሰነዶች ላይ የላኪ እና የተቀባይ አድራሻ ቦታ ይቀያይሩ
 FeatureSupportedOnTextFieldsOnly=ማስጠንቀቂያ፣ ባህሪ የሚደገፈው በጽሑፍ መስኮች እና ጥምር ዝርዝሮች ላይ ብቻ ነው። እንዲሁም የዩአርኤል መለኪያ action=create or action=edit መዘጋጀት አለበት ወይም ይህን ባህሪ ለመቀስቀስ የገጽ ስም በ'new.php' ያበቃል።
 EmailCollector=ኢሜል ሰብሳቢ
@@ -2122,6 +2177,7 @@ CreateCandidature=የሥራ ማመልከቻ ይፍጠሩ
 FormatZip=ዚፕ
 MainMenuCode=የምናሌ መግቢያ ኮድ (ዋና ምናሌ)
 ECMAutoTree=ራስ-ሰር የ ECM ዛፍን አሳይ
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
 OpeningHours=ክፍት የሚሆንበት ሰዓቶች
 OpeningHoursDesc=የድርጅትዎን መደበኛ የስራ ሰዓቶች እዚህ ያስገቡ።
 ResourceSetup=የመርጃ ሞጁል ውቅር
@@ -2207,6 +2263,7 @@ ModuleActivatedMayExposeInformation=ይህ የPHP ቅጥያ ሚስጥራዊነ
 ModuleActivatedDoNotUseInProduction=ለልማቱ የተነደፈ ሞጁል ነቅቷል። በማምረት አካባቢ ላይ አታድርጉት።
 CombinationsSeparator=ለምርት ውህዶች መለያ ባህሪ
 SeeLinkToOnlineDocumentation=ለምሳሌዎች ከላይ ባለው ምናሌ ላይ ወደ የመስመር ላይ ሰነዶች አገናኝ ይመልከቱ
+SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=ይህን መታወቂያ ለማግኘት ባንክዎን ያነጋግሩ
 AdvancedModeOnly=ፍቃድ በላቁ የፍቃድ ሁነታ ብቻ ይገኛል።
 ConfFileIsReadableOrWritableByAnyUsers=የ conf ፋይል በማንኛውም ተጠቃሚ ሊነበብ ወይም ሊፃፍ ይችላል። ለድር አገልጋይ ተጠቃሚ እና ቡድን ብቻ ፍቃድ ይስጡ።
@@ -2235,6 +2292,7 @@ APIsAreNotEnabled=የኤፒአይዎች ሞጁሎች አልነቁም።
 YouShouldSetThisToOff=ይህንን ወደ 0 ወይም አጥፋ ማዋቀር አለብዎት
 InstallAndUpgradeLockedBy=መጫን እና ማሻሻያ በፋይሉ ተቆልፏል <b>%s</b>
 InstallLockedBy=ጫን/እንደገና መጫን በፋይሉ ተቆልፏል <b>%s</b>
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=የድሮ አተገባበር
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=አንዳንድ የመስመር ላይ ክፍያ ሞጁሎች ከነቃ (Paypal፣ Stripe፣...)፣ የመስመር ላይ ክፍያ ለመፈጸም በፒዲኤፍ ላይ አገናኝ ያክሉ
 DashboardDisableGlobal=ሁሉንም የተከፈቱ ነገሮች አውራ ጣትን በአለምአቀፍ ደረጃ አሰናክል
@@ -2348,6 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=በነባሪነት አልተፈ
 CSSPage=የሲኤስኤስ ዘይቤ
 Defaultfortype=ነባሪ
 DefaultForTypeDesc=ለአብነት አይነት አዲስ ኢሜይል ሲፈጥሩ በነባሪነት ጥቅም ላይ የሚውለው አብነት
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=የመስመር ላይ ፊርማ ፍቀድ
 AtBottomOfPage=ከገጹ ግርጌ
 FailedAuth=ያልተሳኩ ማረጋገጫዎች
@@ -2374,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/am_ET/agenda.lang b/htdocs/langs/am_ET/agenda.lang
index c69a9682cdb..c6ed3d5f76a 100644
--- a/htdocs/langs/am_ET/agenda.lang
+++ b/htdocs/langs/am_ET/agenda.lang
@@ -137,6 +137,8 @@ DateActionEnd=የመጨረሻ ቀን
 AgendaUrlOptions1=ውጤቱን ለማጣራት የሚከተሉትን መለኪያዎች ማከል ይችላሉ-
 AgendaUrlOptions3=<b>logina=%s</b> አንድን ውፅዓት በተጠቃሚ ወደ ድርጊቶች እንዲገድብ <b>%s</b>።
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ውፅዓት በድርጊት ያልተገደበ ተጠቃሚ <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> ከፕሮጀክት ጋር የተገናኙትን እርምጃዎች ለመገደብ 365ee 365ee __PROJECT_ID__</b>።
 AgendaUrlOptionsNotAutoEvent=አውቶማቲክ ክስተቶችን ለማስቀረት <b>notactiontype=systemauto</b>።
 AgendaUrlOptionsIncludeHolidays=የበዓላት ክስተቶችን ለማካተት <b>includeholidays=1</b>።
 AgendaShowBirthdayEvents=የእውቂያዎች ልደት
@@ -159,6 +161,7 @@ AddEvent=ክስተት ፍጠር
 MyAvailability=የእኔ ተገኝነት
 ActionType=የክስተት አይነት
 DateActionBegin=የክስተት መጀመሪያ ቀን
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=ክስተቱን ድገም።
 OnceOnly=አንዴ ብቻ
 EveryDay=በየቀኑ
diff --git a/htdocs/langs/am_ET/assets.lang b/htdocs/langs/am_ET/assets.lang
index ef04723c6c2..6c1653d3f93 100644
--- a/htdocs/langs/am_ET/assets.lang
+++ b/htdocs/langs/am_ET/assets.lang
@@ -1,4 +1,4 @@
-# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+# Copyright (C) 2018-2022  Alexandre Spangaro   <aspangaro@open-dsi.fr>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,50 +16,170 @@
 #
 # 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'
+NewAsset=አዲስ ንብረት
+AccountancyCodeAsset=የሂሳብ ኮድ (ንብረት)
+AccountancyCodeDepreciationAsset=የሂሳብ ኮድ (የዋጋ ቅነሳ የንብረት መለያ)
+AccountancyCodeDepreciationExpense=የሂሳብ ኮድ (የዋጋ ቅናሽ ሂሳብ)
+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
+AssetSetup=የንብረት ማዋቀር
+AssetSetupPage=የንብረት ማዋቀር ገጽ
+ExtraFieldsAssetModel=ተጨማሪ ባህሪያት (የንብረት ሞዴል)
+
+AssetsType=የንብረት ሞዴል
+AssetsTypeId=የንብረት ሞዴል መታወቂያ
+AssetsTypeLabel=የንብረት ሞዴል መለያ
+AssetsTypes=የንብረት ሞዴሎች
+ASSET_ACCOUNTANCY_CATEGORY=ቋሚ የንብረት ሒሳብ ቡድን
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets=ንብረቶች
+MenuNewAsset=አዲስ ንብረት
+MenuAssetModels=የሞዴል ንብረቶች
+MenuListAssets=ዝርዝር
+MenuNewAssetModel=አዲስ የንብረት ሞዴል
+MenuListAssetModels=ዝርዝር
 
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+ConfirmDeleteAsset=ይህን ንብረት በእርግጥ ማስወገድ ይፈልጋሉ?
+
+#
+# Tab
+#
+AssetDepreciationOptions=የዋጋ ቅነሳ አማራጮች
+AssetAccountancyCodes=የሂሳብ አያያዝ መለያዎች
+AssetDepreciation=የዋጋ ቅነሳ
+
+#
+# Asset
+#
+Asset=ንብረት
+Assets=ንብረቶች
+AssetReversalAmountHT=የተገላቢጦሽ መጠን (ያለ ታክስ)
+AssetAcquisitionValueHT=የማግኛ መጠን (ያለ ታክስ)
+AssetRecoveredVAT=የተመለሰ ተ.እ.ታ
+AssetReversalDate=የተገላቢጦሽ ቀን
+AssetDateAcquisition=የተገኘበት ቀን
+AssetDateStart=የተጀመረበት ቀን
+AssetAcquisitionType=የግዢ አይነት
+AssetAcquisitionTypeNew=አዲስ
+AssetAcquisitionTypeOccasion=ጥቅም ላይ የዋለ
+AssetType=የንብረት አይነት
+AssetTypeIntangible=የማይዳሰስ
+AssetTypeTangible=የሚዳሰስ
+AssetTypeInProgress=በሂደት ላይ
+AssetTypeFinancial=የገንዘብ
+AssetNotDepreciated=አልቀነሰም።
+AssetDisposal=ማስወገድ
+AssetConfirmDisposalAsk=Are you sure you want to dispose of the asset <b> %s</b>?
+AssetConfirmReOpenAsk=Are you sure you want to reopen the asset <b> %s</b>?
+
+#
+# Asset status
+#
+AssetInProgress=በሂደት ላይ
+AssetDisposed=ተወግዷል
+AssetRecorded=ተቆጥሯል።
+
+#
+# Asset disposal
+#
+AssetDisposalDate=የሚወገድበት ቀን
+AssetDisposalAmount=የማስወገጃ ዋጋ
+AssetDisposalType=የማስወገጃ አይነት
+AssetDisposalDepreciated=የዝውውር ዓመት ዋጋን ይቀንሱ
+AssetDisposalSubjectToVat=አወጋገድ ተ.እ.ታ
+
+#
+# Asset model
+#
+AssetModel=የንብረት ሞዴል
+AssetModels=የንብረት ሞዴሎች
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=የኢኮኖሚ ዋጋ መቀነስ
+AssetDepreciationOptionAcceleratedDepreciation=የተፋጠነ የዋጋ ቅናሽ (ግብር)
+AssetDepreciationOptionDepreciationType=የዋጋ ቅነሳ ዓይነት
+AssetDepreciationOptionDepreciationTypeLinear=መስመራዊ
+AssetDepreciationOptionDepreciationTypeDegressive=ወራዳ
+AssetDepreciationOptionDepreciationTypeExceptional=ልዩ
+AssetDepreciationOptionDegressiveRate=የማሽቆልቆል መጠን
+AssetDepreciationOptionDuration=ቆይታ
+AssetDepreciationOptionDurationType=የቆይታ ጊዜ ይተይቡ
+AssetDepreciationOptionDurationTypeAnnual=አመታዊ
+AssetDepreciationOptionDurationTypeMonthly=ወርሃዊ
+AssetDepreciationOptionDurationTypeDaily=በየቀኑ
+AssetDepreciationOptionRate=ደረጃ ይስጡ (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=የዋጋ ቅናሽ መሰረት (ከተጨማሪ እሴት ታክስ በስተቀር)
+AssetDepreciationOptionAmountBaseDeductibleHT=የሚቀነሰው መሠረት (ከተጨማሪ እሴት ታክስ በስተቀር)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=የዋጋ ቅናሽ ጠቅላላ መጠን (ከተጨማሪ እሴት ታክስ በስተቀር)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=የኢኮኖሚ ዋጋ መቀነስ
+AssetAccountancyCodeAsset=ንብረት
+AssetAccountancyCodeDepreciationAsset=የዋጋ ቅነሳ
+AssetAccountancyCodeDepreciationExpense=የዋጋ ቅነሳ ወጪ
+AssetAccountancyCodeValueAssetSold=የተጣለ ንብረት ዋጋ
+AssetAccountancyCodeReceivableOnAssignment=በመጣል ላይ ደረሰኝ
+AssetAccountancyCodeProceedsFromSales=ከማስወገድ የሚገኘው ገቢ
+AssetAccountancyCodeVatCollected=የተሰበሰበ ተ.እ.ታ
+AssetAccountancyCodeVatDeductible=በንብረቶች ላይ የተመለሰ ተ.እ.ታ
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=የተፋጠነ የዋጋ ቅናሽ (ግብር)
+AssetAccountancyCodeAcceleratedDepreciation=መለያ
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=የዋጋ ቅነሳ ወጪ
+AssetAccountancyCodeProvisionAcceleratedDepreciation=መልሶ ማግኘት/ አቅርቦት
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=የዋጋ ቅናሽ መሰረት (ከተጨማሪ እሴት ታክስ በስተቀር)
+AssetDepreciationBeginDate=የዋጋ ቅነሳ ጅምር በርቷል።
+AssetDepreciationDuration=ቆይታ
+AssetDepreciationRate=ደረጃ ይስጡ (%%)
+AssetDepreciationDate=የዋጋ ቅነሳ ቀን
+AssetDepreciationHT=የዋጋ ቅነሳ (ከተጨማሪ እሴት ታክስ በስተቀር)
+AssetCumulativeDepreciationHT=ድምር የዋጋ ቅናሽ (ከተጨማሪ እሴት ታክስ በስተቀር)
+AssetResidualHT=ቀሪ እሴት (ከተጨማሪ እሴት ታክስ በስተቀር)
+AssetDispatchedInBookkeeping=የዋጋ ቅናሽ ተመዝግቧል
+AssetFutureDepreciationLine=የወደፊት የዋጋ ቅነሳ
+AssetDepreciationReversal=መቀልበስ
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=የንብረቱ መታወቂያ ወይም የተገኘው ሞዴል አልቀረበም።
+AssetErrorFetchAccountancyCodesForMode=ለ'%sየዋጋ ቅነሳ ሁነታ የሂሳብ መለያዎችን በማውጣት ላይ ስህተት
+AssetErrorDeleteAccountancyCodesForMode=የሒሳብ መለያዎችን ከ'%sየዋጋ ቅነሳ ሁነታ ሲሰረዝ ስህተት
+AssetErrorInsertAccountancyCodesForMode=የዋጋ ቅነሳ ሁነታ '%s' የሂሳብ መለያዎችን ሲያስገቡ ስህተት
+AssetErrorFetchDepreciationOptionsForMode=የ%sየዋጋ ቅነሳ ሁነታ አማራጮችን በማውጣት ላይ ስህተት
+AssetErrorDeleteDepreciationOptionsForMode=የ%sየዋጋ ቅነሳ ሁነታ አማራጮችን ሲሰርዝ ስህተት
+AssetErrorInsertDepreciationOptionsForMode=የ%s የዋጋ ቅነሳ ሁነታ አማራጮችን ሲያስገቡ ስህተት
+AssetErrorFetchDepreciationLines=የተመዘገቡ የዋጋ ቅነሳ መስመሮችን በማውጣት ላይ ስህተት
+AssetErrorClearDepreciationLines=የተመዘገቡ የዋጋ ቅነሳ መስመሮችን (ተገላቢጦሽ እና ወደፊት) በማጽዳት ጊዜ ስህተት
+AssetErrorAddDepreciationLine=የዋጋ ቅነሳ መስመር ሲጨመር ስህተት
+AssetErrorCalculationDepreciationLines=የዋጋ ቅነሳ መስመሮችን (ማግኛ እና የወደፊት) ሲያሰሉ ስህተት
+AssetErrorReversalDateNotProvidedForMode=የተገላቢጦሹ ቀን ለ'%sየዋጋ ቅነሳ ዘዴ አልቀረበም።
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=ለ%sየዋጋ ቅነሳ ዘዴ ከአሁኑ የበጀት ዓመት መጀመሪያ የሚበልጥ ወይም እኩል መሆን አለበት።
+AssetErrorReversalAmountNotProvidedForMode=የተገላቢጦሹ መጠን ለዋጋ ቅናሽ ሁነታ '%s' አልቀረበም።
+AssetErrorFetchCumulativeDepreciation=የተጠራቀመውን የዋጋ ቅናሽ መጠን ከዋጋ ቅናሽ መስመር በማውጣት ላይ ስህተት
+AssetErrorSetLastCumulativeDepreciation=የመጨረሻውን የተጠራቀመ የዋጋ ቅናሽ መጠን ሲመዘገብ ስህተት
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index d8284d16c9b..21e524fd5e8 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -115,6 +115,7 @@ MenuBankInternalTransfer=የውስጥ ሽግግር
 TransferDesc=ከአንድ መለያ ወደ ሌላ ለማዛወር የውስጥ ዝውውርን ተጠቀም፣ አፕሊኬሽኑ ሁለት መዝገቦችን ይጽፋል፡ በምንጭ መለያ ውስጥ ያለ ዴቢት እና በዒላማ መለያ ውስጥ ያለ ብድር። ለዚህ ግብይት ተመሳሳይ መጠን፣ መለያ እና ቀን ጥቅም ላይ ይውላል።
 TransferFrom=ከ
 TransferTo=ለ
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=ላኪ
 ValidateCheckReceipt=ይህ የቼክ ደረሰኝ ይረጋገጥ?
 ConfirmValidateCheckReceipt=እርግጠኛ ነዎት ይህን የቼክ ደረሰኝ ለማረጋገጫ ማስገባት ይፈልጋሉ? አንዴ ከተረጋገጠ ምንም ለውጦች አይኖሩም።
diff --git a/htdocs/langs/am_ET/bills.lang b/htdocs/langs/am_ET/bills.lang
index f7d0155f41e..bfdf7b82e3b 100644
--- a/htdocs/langs/am_ET/bills.lang
+++ b/htdocs/langs/am_ET/bills.lang
@@ -1,609 +1,655 @@
 # 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 method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
-DefaultBankAccount=Default Bank Account
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
-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?
+Bill=ደረሰኝ
+Bills=ደረሰኞች
+BillsCustomers=የደንበኛ ደረሰኞች
+BillsCustomer=የደንበኛ ደረሰኝ
+BillsSuppliers=የአቅራቢ ደረሰኞች
+BillsCustomersUnpaid=ያልተከፈለ የደንበኛ ደረሰኞች
+BillsCustomersUnpaidForCompany=ለ%s ያልተከፈለ ደንበኛ ደረሰኞች
+BillsSuppliersUnpaid=ያልተከፈለ የሻጭ ደረሰኞች
+BillsSuppliersUnpaidForCompany=ያልተከፈለ የአቅራቢዎች ደረሰኞች ለ%s
+BillsLate=ዘግይተው ክፍያዎች
+BillsStatistics=የደንበኞች ደረሰኞች ስታቲስቲክስ
+BillsStatisticsSuppliers=የአቅራቢዎች የክፍያ መጠየቂያ ስታቲስቲክስ
+DisabledBecauseDispatchedInBookkeeping=ደረሰኝ ወደ ሒሳብ አያያዝ ስለተላከ ተሰናክሏል።
+DisabledBecauseNotLastInvoice=ደረሰኝ ሊሰረዝ ስለማይችል ተሰናክሏል። አንዳንድ ደረሰኞች ከዚህ በኋላ ተመዝግበዋል እና በቆጣሪው ላይ ቀዳዳዎችን ይፈጥራል።
+DisabledBecauseNotLastSituationInvoice=ደረሰኝ ሊሰረዝ ስለማይችል ተሰናክሏል። ይህ የክፍያ መጠየቂያ በሁኔታ የክፍያ መጠየቂያ ዑደት ውስጥ የመጨረሻው አይደለም።
+DisabledBecauseNotErasable=ተሰናክሏል ምክንያቱም ሊሰረዝ አይችልም።
+InvoiceStandard=መደበኛ ደረሰኝ
+InvoiceStandardAsk=መደበኛ ደረሰኝ
+InvoiceStandardDesc=የዚህ ዓይነቱ ደረሰኝ የተለመደው ደረሰኝ ነው.
+InvoiceStandardShort=መደበኛ
+InvoiceDeposit=የቅድሚያ ክፍያ ደረሰኝ
+InvoiceDepositAsk=የቅድሚያ ክፍያ ደረሰኝ
+InvoiceDepositDesc=የዚህ ዓይነቱ ደረሰኝ የሚከናወነው ቅድመ ክፍያ ሲደርስ ነው.
+InvoiceProForma=የዋጋ መሰብሰቢያ ደረሰኝ
+InvoiceProFormaAsk=የዋጋ መሰብሰቢያ ደረሰኝ
+InvoiceProFormaDesc=<b>ፕሮፎርማ ደረሰኝ</b> የእውነተኛ የክፍያ መጠየቂያ ምስል ነው ነገር ግን ምንም የሂሳብ ዋጋ የለውም።
+InvoiceReplacement=የምትክ ደረሰኝ
+InvoiceReplacementShort=መተካት
+InvoiceReplacementAsk=የክፍያ መጠየቂያ ደረሰኝ ምትክ
+InvoiceReplacementDesc=<b>የመተኪያ ደረሰኝ</b> ያለ ክፍያ መጠየቂያ ሙሉ በሙሉ ለመተካት ይጠቅማል።b0341 <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=የመክፈያ ዘዴ
+PaymentModes=የመክፈያ ዘዴዎች
+DefaultPaymentMode=ነባሪ የመክፈያ ዘዴ
+DefaultBankAccount=ነባሪ የባንክ ሂሳብ
+IdPaymentMode=የመክፈያ ዘዴ (መታወቂያ)
+CodePaymentMode=የመክፈያ ዘዴ (ኮድ)
+LabelPaymentMode=የመክፈያ ዘዴ (መለያ)
+PaymentModeShort=የመክፈያ ዘዴ
+PaymentTerm=የክፍያ ጊዜ
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
+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=የክፍያ መጠየቂያ ሁኔታ
+StatusOfAutoGeneratedInvoices=በራስ ሰር የመነጩ ደረሰኞች ሁኔታ
+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=የማህበረሰብ ውስጥ የተጨማሪ እሴት ታክስ ቁጥር ገና አልተገለጸም።
+ErrorNoPaiementModeConfigured=ምንም ነባሪ የክፍያ ዓይነት አልተገለጸም። ይህንን ለማስተካከል ወደ የክፍያ መጠየቂያ ሞጁል ማዋቀር ይሂዱ።
+ErrorCreateBankAccount=የባንክ ሒሳብ ይፍጠሩ፣ ከዚያ የክፍያ ዓይነቶችን ለመወሰን ወደ የዋጋ መጠየቂያ ሞጁል ይሂዱ
+ErrorBillNotFound=ደረሰኝ %s የለም
+ErrorInvoiceAlreadyReplaced=ስህተት፣ መጠየቂያ %sን ለመተካት ደረሰኝ ለማረጋገጥ ሞክረዋል። ነገር ግን ይህ አስቀድሞ በክፍያ መጠየቂያ %s ተተክቷል።
+ErrorDiscountAlreadyUsed=ስህተት፣ ቅናሽ አስቀድሞ ጥቅም ላይ ውሏል
+ErrorInvoiceAvoirMustBeNegative=ስህተት፣ ትክክለኛ ደረሰኝ አሉታዊ መጠን ሊኖረው ይገባል።
+ErrorInvoiceOfThisTypeMustBePositive=ስህተት፣ የዚህ አይነት ደረሰኝ የታክስ አወንታዊ (ወይም ባዶ) ሳይጨምር መጠን ሊኖረው ይገባል
+ErrorCantCancelIfReplacementInvoiceNotValidated=ስህተት፣ አሁንም በረቂቅ ደረጃ ላይ ባለው ሌላ ደረሰኝ የተተካ ደረሰኝ መሰረዝ አይቻልም
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=ይህ ክፍል ወይም ሌላ አስቀድሞ ጥቅም ላይ ውሏል ስለዚህ የቅናሽ ተከታታይ ሊወገድ አይችልም።
+ErrorInvoiceIsNotLastOfSameType=ስህተት፡ የክፍያ መጠየቂያ ቀን %s %s ነው። ለተመሳሳይ ዓይነት ደረሰኞች (%s) ከኋላ ወይም ከመጨረሻው ቀን ጋር እኩል መሆን አለበት። እባክዎ የክፍያ መጠየቂያ ቀኑን ይለውጡ።
+BillFrom=ከ
+BillTo=ለ
+ShippingTo=መላኪያ ወደ
+ActionsOnBill=በክፍያ መጠየቂያ ላይ ያሉ ድርጊቶች
+ActionsOnBillRec=ተደጋጋሚ ደረሰኝ ላይ ያሉ እርምጃዎች
+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=Are you sure you want to validate this invoice with the reference <b>%s</b>?
+ConfirmUnvalidateBill=እርግጠኛ ነህ ደረሰኝ <b>%s</b> ወደ ረቂቅ ሁኔታመቀየር ትፈልጋለህ? ?
 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'?
+ConfirmCancelBillQuestion=ለምን ይህን ደረሰኝ 'የተተወ' ለመመደብ ፈለጋችሁ?
 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
+ConfirmClassifyPaidPartiallyQuestion=ይህ ደረሰኝ ሙሉ በሙሉ አልተከፈለም። ይህን ደረሰኝ የሚዘጋበት ምክንያት ምንድን ነው?
+ConfirmClassifyPaidPartiallyReasonAvoir=ያልተከፈለው <b>(%s %s'<b> ></b></span> የሚከፈለው ከውል በፊት በመሆኑ ቅናሽ ነው። ተ.እ.ታን በክሬዲት ኖት መደበኛ አደርጋለሁ።
+ConfirmClassifyPaidPartiallyReasonDiscount=ያልተከፈለው <b>(%s %s'<b> ></b></span> የሚከፈለው ከውል በፊት በመሆኑ ቅናሽ ነው።
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=ያልተከፈለው <b>(%s %s'<b> ></b></span> የሚከፈለው ከውል በፊት በመሆኑ ቅናሽ ነው። በዚህ ቅናሽ ቫትን ማጣት እቀበላለሁ።
+ConfirmClassifyPaidPartiallyReasonDiscountVat=ያልተከፈለው <b>(%s %s'<b> ></b></span> የሚከፈለው ከውል በፊት በመሆኑ ቅናሽ ነው። ያለ ክሬዲት ማስታወሻ ተ.እ.ታን በዚህ ቅናሽ አገኛለሁ።
+ConfirmClassifyPaidPartiallyReasonBadCustomer=መጥፎ ደንበኛ
+ConfirmClassifyPaidPartiallyReasonBadSupplier=መጥፎ ሻጭ
+ConfirmClassifyPaidPartiallyReasonBankCharge=በባንክ ተቀናሽ (የመካከለኛ ባንክ ክፍያ)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=የተቀናሽ ግብር
+ConfirmClassifyPaidPartiallyReasonProductReturned=ምርቶች በከፊል ተመልሰዋል።
+ConfirmClassifyPaidPartiallyReasonOther=በሌላ ምክንያት የተተወ መጠን
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=የክፍያ መጠየቂያዎ ተስማሚ አስተያየቶች ከተሰጠ ይህ ምርጫ ይቻላል. (ምሳሌ «ከተከፈለው ዋጋ ጋር የሚዛመድ ግብር ብቻ የመቀነስ መብት ይሰጣል»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=በአንዳንድ አገሮች ይህ ምርጫ የሚቻለው ደረሰኝዎ ትክክለኛ ማስታወሻዎችን ከያዘ ብቻ ነው።
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=ሁሉም ሌሎች የማይስማሙ ከሆነ ይህንን ምርጫ ይጠቀሙ
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <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.
-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.
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=ያልተከፈለው መጠን የተቀናሽ ታክስ ስለሆነ በጭራሽ አይከፈልም።
+ConfirmClassifyPaidPartiallyReasonOtherDesc=ሌሎች ሁሉም ተስማሚ ካልሆኑ ይህን ምርጫ ይጠቀሙ፡ ለምሳሌ በሚከተለው ሁኔታ፡<br>- ክፍያ አልተጠናቀቀም ምክንያቱም አንዳንድ ምርቶች ተመልሰው ስለተላኩ<br> span>- የተጠየቀው መጠን በጣም አስፈላጊ ነው ምክንያቱም ቅናሹ ስለተረሳ<br>በሁሉም ጉዳዮች ላይ የክሬዲት ማስታወሻ በመፍጠር ከመጠን በላይ የይገባኛል ጥያቄ በሂሳብ አያያዝ ሥርዓት ውስጥ መታረም አለበት።
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>መጥፎ አቅራቢ</b> ለመክፈል እምቢ ያልነው አቅራቢ ነው።
+ConfirmClassifyAbandonReasonOther=ሌላ
+ConfirmClassifyAbandonReasonOtherDesc=ይህ ምርጫ በሁሉም ሌሎች ጉዳዮች ላይ ጥቅም ላይ ይውላል. ለምሳሌ የሚተካ ደረሰኝ ለመፍጠር ስላሰቡ ነው።
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-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
+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=የሚቀረው ገንዘብ ተመላሽ ገንዘብ፣ የመጀመሪያው ምንዛሬ
+NegativeIfExcessReceived=ከመጠን በላይ ከተቀበለ አሉታዊ
+NegativeIfExcessRefunded=ትርፍ ገንዘብ ከተመለሰ አሉታዊ
+NegativeIfExcessPaid=ከመጠን በላይ ከተከፈለ አሉታዊ
+Rest=በመጠባበቅ ላይ
+AmountExpected=የተጠየቀው መጠን
+ExcessReceived=ከመጠን በላይ ደረሰ
+ExcessReceivedMulticurrency=የተቀበለው ትርፍ፣ የመጀመሪያው ምንዛሬ
+ExcessPaid=ከመጠን በላይ የተከፈለ
+ExcessPaidMulticurrency=ከመጠን በላይ የተከፈለ, የመጀመሪያ ምንዛሬ
+EscompteOffered=ቅናሽ ቀርቧል (ከጊዜ በፊት ክፍያ)
+EscompteOfferedShort=ቅናሽ
+SendBillRef=የክፍያ መጠየቂያ ማቅረቢያ %s
+SendReminderBillRef=የክፍያ መጠየቂያ ማቅረቢያ %s (አስታዋሽ)
+SendPaymentReceipt=የክፍያ ደረሰኝ ማስገባት %s
+NoDraftBills=ምንም ረቂቅ ደረሰኞች የሉም
+NoOtherDraftBills=ምንም ሌላ ረቂቅ ደረሰኞች የሉም
+NoDraftInvoices=ምንም ረቂቅ ደረሰኞች የሉም
+RefBill=የክፍያ መጠየቂያ ማጣቀሻ
+RefSupplierBill=የአቅራቢ ደረሰኝ ማጣቀሻ
+SupplierOrderCreateBill=ደረሰኝ ፍጠር
+ToBill=ለማስከፈል
+RemainderToBill=ሂሳብ ለማስከፈል የቀረው
+SendBillByMail=ደረሰኝ በኢሜል ይላኩ።
+SendReminderBillByMail=አስታዋሽ በኢሜል ይላኩ።
+RelatedCommercialProposals=ተዛማጅ የንግድ ፕሮፖዛል
+RelatedRecurringCustomerInvoices=ተዛማጅ ተደጋጋሚ የደንበኛ ደረሰኞች
+MenuToValid=ትክክለኛ እንዲሆን
+DateMaxPayment=ክፍያ በ ላይ
+DateInvoice=የክፍያ መጠየቂያ ቀን
+DatePointOfTax=የግብር ነጥብ
+NoInvoice=ምንም ደረሰኝ የለም።
+NoOpenInvoice=ክፍት ደረሰኝ የለም።
+NbOfOpenInvoices=ክፍት ደረሰኞች ብዛት
+ClassifyBill=ደረሰኝ መድብ
+SupplierBillsToPay=ያልተከፈለ የሻጭ ደረሰኞች
+CustomerBillsUnpaid=ያልተከፈለ የደንበኛ ደረሰኞች
+NonPercuRecuperable=የማይመለስ
+SetConditions=የክፍያ ውሎችን ያዘጋጁ
+SetMode=የክፍያ ዓይነት ያዘጋጁ
+SetRevenuStamp=የገቢ ማህተም ያዘጋጁ
+Billed=ተከፍሏል።
+RecurringInvoices=ተደጋጋሚ ደረሰኞች
+RecurringInvoice=ተደጋጋሚ ደረሰኝ
+RecurringInvoiceSource=ተደጋጋሚ ደረሰኝ ምንጭ
+RepeatableInvoice=የአብነት ደረሰኝ
+RepeatableInvoices=የአብነት ደረሰኞች
+RecurringInvoicesJob=ተደጋጋሚ ደረሰኞች (የሽያጭ ደረሰኞች) ማመንጨት
+RecurringSupplierInvoicesJob=ተደጋጋሚ ደረሰኞች ማመንጨት (የግዢ ደረሰኞች)
+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=አዲስ ፍጹም ቅናሽ
+NewSupplierGlobalDiscount=አዲስ ፍጹም አቅራቢ ቅናሽ
+NewClientGlobalDiscount=አዲስ ፍጹም የደንበኛ ቅናሽ
+NewRelativeDiscount=አዲስ አንጻራዊ ቅናሽ
+DiscountType=የቅናሽ ዓይነት
+NoteReason=ማስታወሻ/ምክንያት።
+ReasonDiscount=ምክንያት
+DiscountOfferedBy=የተሰጠ በ
+DiscountStillRemaining=ቅናሾች ወይም ክሬዲቶች ይገኛሉ
+DiscountAlreadyCounted=አስቀድመው ጥቅም ላይ የዋሉ ቅናሾች ወይም ክሬዲቶች
+CustomerDiscounts=የደንበኛ ቅናሾች
+SupplierDiscounts=የአቅራቢዎች ቅናሾች
+BillAddress=የክፍያ መጠየቂያ አድራሻ
+HelpEscompte=ይህ ቅናሽ ለደንበኛ የተሰጠ ቅናሽ ነው ምክንያቱም ክፍያ የሚፈጸመው ከውል በፊት ነው።
+HelpAbandonBadCustomer=ይህ መጠን ተትቷል (ደንበኛው መጥፎ ደንበኛ ነው ይባላል) እና እንደ ልዩ ኪሳራ ይቆጠራል።
+HelpAbandonOther=ይህ መጠን ስህተት ስለሆነ ተትቷል (የተሳሳተ ደንበኛ ወይም ደረሰኝ በሌላ ተተክቷል ለምሳሌ)
+IdSocialContribution=የማህበራዊ/የፋይናንስ ታክስ ክፍያ መታወቂያ
+PaymentId=የክፍያ መታወቂያ
+PaymentRef=ክፍያ ማጣቀሻ.
+SourceInvoiceId=Source invoice id
+InvoiceId=የክፍያ መጠየቂያ መታወቂያ
+InvoiceRef=የክፍያ መጠየቂያ ማጣቀሻ.
+InvoiceDateCreation=የክፍያ መጠየቂያ የተፈጠረበት ቀን
+InvoiceStatus=የክፍያ መጠየቂያ ሁኔታ
+InvoiceNote=የክፍያ መጠየቂያ ማስታወሻ
+InvoicePaid=ደረሰኝ ተከፍሏል።
+InvoicePaidCompletely=ሙሉ በሙሉ ተከፍሏል።
+InvoicePaidCompletelyHelp=ሙሉ በሙሉ የሚከፈል ደረሰኝ. ይህ በከፊል የሚከፈሉትን ደረሰኞች አያካትትም። የሁሉንም 'ዝግ' ወይም 'የተዘጉ' የክፍያ መጠየቂያዎች ዝርዝር ለማግኘት በክፍያ መጠየቂያው ሁኔታ ላይ ማጣሪያ መጠቀምን ይምረጡ።
+OrderBilled=ትእዛዝ ተከፍሏል።
+DonationPaid=ልገሳ ተከፍሏል።
+PaymentNumber=የክፍያ ቁጥር
+RemoveDiscount=ቅናሽ አስወግድ
+WatermarkOnDraftBill=በረቂቅ ደረሰኞች ላይ ያለው የውሃ ምልክት (ባዶ ከሆነ ምንም የለም)
+InvoiceNotChecked=ምንም ደረሰኝ አልተመረጠም።
 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
+DisabledBecauseReplacedInvoice=ደረሰኝ ስለተተካ እርምጃ ተወግዷል
+DescTaxAndDividendsArea=ይህ ቦታ ለልዩ ወጪዎች የተደረጉትን ሁሉንም ክፍያዎች ማጠቃለያ ያቀርባል. በተወሰነው ዓመት ውስጥ ክፍያዎች ያላቸው መዝገቦች ብቻ እዚህ ተካትተዋል።
+NbOfPayments=የክፍያዎች ብዛት
+SplitDiscount=ቅናሽ ለሁለት ተከፍሏል።
 ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
-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
+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=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
+NextDateToExecution=የሚቀጥለው የክፍያ መጠየቂያ ትውልድ ቀን
+NextDateToExecutionShort=የሚቀጥለው ጄኔራል ቀን.
+DateLastGeneration=የቅርብ ጊዜ ትውልድ ቀን
+DateLastGenerationShort=የቅርብ ጊዜ Gen.
+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 ቀናት ውስጥ
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% ማስቀመጫ
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% ተቀማጭ፣ በማስረከብ ላይ የቀረው
+FixAmount=የተወሰነ መጠን - 1 መስመር '%s' መለያ
+VarAmount=ተለዋዋጭ መጠን (%% ቶ.)
+VarAmountOneLine=ተለዋዋጭ መጠን (%% tot.) - 1 መስመር ከመለያ ጋር '%s'
+VarAmountAllLines=ተለዋዋጭ መጠን (%%ቶ.) - ሁሉም መስመሮች ከመነሻ
+DepositPercent=ተቀማጭ %%
+DepositGenerationPermittedByThePaymentTermsSelected=ይህ በተመረጡት የክፍያ ውሎች ይፈቀዳል።
+GenerateDeposit=የ%s%% የማስቀመጫ ደረሰኝ ይፍጠሩ
+ValidateGeneratedDeposit=የተፈጠረውን ተቀማጭ ገንዘብ ያረጋግጡ
+DepositGenerated=ተቀማጭ ተፈጠረ
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=ተቀማጭ ገንዘብ ከፕሮፖዛል ወይም ከትእዛዝ ብቻ ማመንጨት ይችላሉ።
+ErrorPaymentConditionsNotEligibleToDepositCreation=የተመረጡት የክፍያ ሁኔታዎች አውቶማቲክ ተቀማጭ ገንዘብ ለማመንጨት ብቁ አይደሉም
 # 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
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeVIR=የባንክ ማስተላለፍ
+PaymentTypeShortVIR=የባንክ ማስተላለፍ
+PaymentTypePRE=ቀጥታ የዴቢት ክፍያ ማዘዣ
+PaymentTypePREdetails=(በመለያ %s...)
+PaymentTypeShortPRE=የዴቢት ክፍያ ማዘዣ
+PaymentTypeLIQ=ጥሬ ገንዘብ
+PaymentTypeShortLIQ=ጥሬ ገንዘብ
+PaymentTypeCB=የዱቤ ካርድ
+PaymentTypeShortCB=የዱቤ ካርድ
+PaymentTypeCHQ=ይፈትሹ
+PaymentTypeShortCHQ=ይፈትሹ
+PaymentTypeTIP=ጠቃሚ ምክር (ከክፍያ ጋር የተያያዙ ሰነዶች)
+PaymentTypeShortTIP=የቲፕ ክፍያ
+PaymentTypeVAD=የመስመር ላይ ክፍያ
+PaymentTypeShortVAD=የመስመር ላይ ክፍያ
+PaymentTypeTRA=የባንክ ረቂቅ
+PaymentTypeShortTRA=ረቂቅ
+PaymentTypeFAC=ምክንያት
+PaymentTypeShortFAC=ምክንያት
+PaymentTypeDC=ዴቢት/ክሬዲት ካርድ
 PaymentTypePP=PayPal
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Branch code
-BankAccountNumber=Account number
+BankDetails=የባንክ ዝርዝሮች
+BankCode=የባንክ ኮድ
+DeskCode=የቅርንጫፍ ኮድ
+BankAccountNumber=መለያ ቁጥር
 BankAccountNumberKey=Checksum
-Residence=Address
-IBANNumber=IBAN account number
-IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+Residence=አድራሻ
+IBANNumber=IBAN መለያ ቁጥር
+IBAN=አይባን
+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=የማህበረሰብ ውስጥ የተጨማሪ እሴት ታክስ መታወቂያ
+PaymentByChequeOrderedTo=ክፍያዎችን (ግብርን ጨምሮ) ለ%s የሚከፈሉ ናቸው፣ ይላኩ
+PaymentByChequeOrderedToShort=የቼክ ክፍያዎች (ግብርን ጨምሮ) የሚከፈሉ ናቸው።
+SendTo=ተልኳል።
+PaymentByTransferOnThisBankAccount=ወደሚከተለው የባንክ ሂሳብ በማስተላለፍ ክፍያ
+VATIsNotUsedForInvoice=* የማይተገበር ተ.እ.ታ ጥበብ-293B የ CGI
+VATIsNotUsedForInvoiceAsso=* የማይተገበር ተ.እ.ታ ጥበብ-261-7 የ CGI
+LawApplicationPart1=በህጉ 80.335 የ 12/05/80 አተገባበር
+LawApplicationPart2=እቃዎቹ የንብረቱ ንብረት ሆነው ይቆያሉ
+LawApplicationPart3=እስከ ሙሉ ክፍያ ድረስ ሻጩ
+LawApplicationPart4=ዋጋቸው.
+LimitedLiabilityCompanyCapital=SARL ከ ካፒታል ጋር
+UseLine=ያመልክቱ
+UseDiscount=ቅናሽ ይጠቀሙ
+UseCredit=ክሬዲት ተጠቀም
+UseCreditNoteInInvoicePayment=በዚህ ክሬዲት የሚከፍሉትን መጠን ይቀንሱ
+MenuChequeDeposits=የተቀማጭ ገንዘብ ይንሸራተታል።
+MenuCheques=ቼኮች
+MenuChequesReceipts=የተቀማጭ ወረቀቶች
+NewChequeDeposit=አዲስ የተቀማጭ ወረቀት
+ChequesReceipts=የተቀማጭ ወረቀቶችን ያረጋግጡ
+DocumentsDepositArea=የተቀማጭ መንሸራተቻ ቦታ
+ChequesArea=የተቀማጭ መንሸራተቻ ቦታ
+ChequeDeposits=የተቀማጭ ወረቀቶች
+Cheques=ቼኮች
+DepositId=መታወቂያ ማስቀመጫ
+NbCheque=የቼኮች ብዛት
+CreditNoteConvertedIntoDiscount=ይህ %s ወደ %s ተቀይሯል
+UsBillingContactAsIncoiveRecipientIfExist=ለክፍያ መጠየቂያዎች ተቀባይ ከሶስተኛ ወገን አድራሻ ይልቅ እውቂያ/አድራሻን ዓይነት 'የክፍያ መጠየቂያ አድራሻ' ይጠቀሙ
+ShowUnpaidAll=ሁሉንም ያልተከፈሉ ደረሰኞች አሳይ
+ShowUnpaidLateOnly=ዘግይተው ያልተከፈሉ ደረሰኞችን ብቻ አሳይ
+PaymentInvoiceRef=የክፍያ መጠየቂያ ደረሰኝ %s
+ValidateInvoice=ደረሰኝ አረጋግጥ
+ValidateInvoices=ደረሰኞችን ያረጋግጡ
+Cash=ጥሬ ገንዘብ
+Reported=ዘግይቷል
+DisabledBecausePayments=አንዳንድ ክፍያዎች ስላሉ አይቻልም
+CantRemovePaymentWithOneInvoicePaid=ቢያንስ አንድ የክፍያ መጠየቂያ የተከፈለ ክፍያ ስላለ ክፍያን ማስወገድ አይቻልም
+CantRemovePaymentVATPaid=የተጨማሪ እሴት ታክስ መግለጫ ስለሚከፈል ክፍያን ማስወገድ አይቻልም
+CantRemovePaymentSalaryPaid=ደሞዝ የሚከፈልበት ስለሆነ ክፍያን ማስወገድ አይቻልም
+ExpectedToPay=የሚጠበቀው ክፍያ
+CantRemoveConciliatedPayment=የታረቀ ክፍያን ማስወገድ አልተቻለም
+PayedByThisPayment=በዚህ ክፍያ ተከፍሏል።
+ClosePaidInvoicesAutomatically=ክፍያ ሙሉ በሙሉ ሲጠናቀቅ ሁሉንም መደበኛ፣ ቅድመ ክፍያ ወይም ምትክ ደረሰኞችን እንደ "የተከፈለ" ይመድቡ።
+ClosePaidCreditNotesAutomatically=ተመላሽ ገንዘብ ሙሉ በሙሉ ሲጠናቀቅ ሁሉንም የክሬዲት ማስታወሻዎች በራስ-ሰር እንደ "የተከፈለ" ይመድቡ።
+ClosePaidContributionsAutomatically=ክፍያ ሙሉ በሙሉ ሲጠናቀቅ ሁሉንም ማህበራዊ ወይም ፊስካል መዋጮዎችን እንደ "የተከፈለ" ይመድቡ።
+ClosePaidVATAutomatically=ክፍያ ሙሉ በሙሉ ሲጠናቀቅ የተጨማሪ እሴት ታክስ መግለጫን እንደ "የተከፈለ" ይመድቡ።
+ClosePaidSalaryAutomatically=ክፍያ ሙሉ በሙሉ ሲጠናቀቅ ደመወዙን እንደ "የተከፈለ" ይመድቡ።
+AllCompletelyPayedInvoiceWillBeClosed=ለመክፈል ምንም ቀሪ የሌላቸው ሁሉም ደረሰኞች በ"የተከፈለ" ሁኔታ በራስ-ሰር ይዘጋሉ።
+ToMakePayment=ይክፈሉ።
+ToMakePaymentBack=መልሰው ይክፈሉ።
+ListOfYourUnpaidInvoices=ያልተከፈሉ የክፍያ መጠየቂያዎች ዝርዝር
+NoteListOfYourUnpaidInvoices=ማሳሰቢያ፡ ይህ ዝርዝር እንደ የሽያጭ ተወካይ ከተያያዙት የሶስተኛ ወገኖች ደረሰኞች ብቻ ይዟል።
+RevenueStamp=የግብር ማህተም
+YouMustCreateInvoiceFromThird=ይህ አማራጭ ከሶስተኛ ወገን ትር "ደንበኛ" ደረሰኝ ሲፈጠር ብቻ ይገኛል
+YouMustCreateInvoiceFromSupplierThird=ይህ አማራጭ ከሶስተኛ ወገን "አቅራቢ" ትር ደረሰኝ ሲፈጠር ብቻ ይገኛል።
+YouMustCreateStandardInvoiceFirstDesc=አዲስ የአብነት መጠየቂያ ደረሰኝ ለመፍጠር መጀመሪያ መደበኛ ደረሰኝ መፍጠር እና ወደ "አብነት" መቀየር አለብዎት
+PDFCrabeDescription=የክፍያ መጠየቂያ ፒዲኤፍ አብነት Crabe. የተሟላ የክፍያ መጠየቂያ አብነት (የስፖንጅ አብነት የቆየ ትግበራ)
+PDFSpongeDescription=የክፍያ መጠየቂያ ፒዲኤፍ አብነት ስፖንጅ። የተሟላ የክፍያ መጠየቂያ አብነት
+PDFCrevetteDescription=የክፍያ መጠየቂያ ፒዲኤፍ አብነት Crevette። ለሁኔታ ደረሰኞች የተሟላ የክፍያ መጠየቂያ አብነት
+TerreNumRefModelDesc1=የመመለሻ ቁጥር በ%syymm-nnnn ለመደበኛ ደረሰኞች እና %syymm-nnn ለክሬዲት ማስታወሻዎች አመት ሲሆን ሚሜ ወር ነው እና nnn ምንም እረፍት የሌለው እና ወደ 0 የማይመለስ ተከታታይ በራስ-የሚጨምር ቁጥር ነው
+MarsNumRefModelDesc1=የመመለሻ ቁጥር በ%syymm-nnnn ለመደበኛ ደረሰኞች፣ %syymm-ninn ለመተኪያ ደረሰኞች፣ %syymm-nnnn ለቅድመ ክፍያ መጠየቂያዎች እና %syymm-nnnn ለክሬዲት ማስታወሻዎች ዓመተ ምህረት ወር ነው እና nnn ራስ-ሰር ተከታታይ ነው። ያለማቋረጥ እና ወደ 0 የማይመለስ ቁጥር እየጨመረ ነው።
+TerreNumRefModelError=በ$syymm የሚጀምር ሂሳብ አስቀድሞ አለ እና ከዚህ ተከታታይ ሞዴል ጋር ተኳሃኝ አይደለም። ይህን ሞጁል ለማንቃት ያስወግዱት ወይም እንደገና ይሰይሙት።
+CactusNumRefModelDesc1=የመመለሻ ቁጥር በ%syymm-nnnn ለመደበኛ ደረሰኞች፣ %syymm-nnn ለክሬዲት ማስታወሻዎች እና %syymm-nnnn ለቅድመ ክፍያ መጠየቂያዎች yy አመት ሲሆን ሚሜ ወር ሲሆን እና nnn ምንም እረፍት የሌለው እና ወደ 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.
-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
+InvoiceFirstSituationAsk=የመጀመሪያ ሁኔታ ደረሰኝ
+InvoiceFirstSituationDesc=የ<b>ሁኔታ ደረሰኞች</b> ከእድገት ጋር በተያያዙ ሁኔታዎች ላይ የተሳሰሩ ናቸው ለምሳሌ የግንባታ እድገት። እያንዳንዱ ሁኔታ ከክፍያ መጠየቂያ ደረሰኝ ጋር የተሳሰረ ነው።
+InvoiceSituation=የሁኔታ ደረሰኝ
+PDFInvoiceSituation=የሁኔታ ደረሰኝ
+InvoiceSituationAsk=ሁኔታውን ተከትሎ ደረሰኝ
+InvoiceSituationDesc=ቀደም ሲል የነበረውን ሁኔታ በመከተል አዲስ ሁኔታ ይፍጠሩ
+SituationAmount=የሁኔታ ደረሰኝ መጠን (የተጣራ)
+SituationDeduction=ሁኔታ መቀነስ
+ModifyAllLines=ሁሉንም መስመሮች ያስተካክሉ
+CreateNextSituationInvoice=የሚቀጥለውን ሁኔታ ይፍጠሩ
+ErrorFindNextSituationInvoice=የሚቀጥለውን ሁኔታ ዑደት ማግኘት አልተቻለም
+ErrorOutingSituationInvoiceOnUpdate=ከዚህ ሁኔታ ደረሰኝ መውጣት አልተቻለም።
+ErrorOutingSituationInvoiceCreditNote=የተገናኘ የብድር ማስታወሻ መውጣት አልተቻለም።
+NotLastInCycle=ይህ የክፍያ መጠየቂያ በዑደት ውስጥ የቅርብ ጊዜ አይደለም እናም መሻሻል የለበትም።
+DisabledBecauseNotLastInCycle=የሚቀጥለው ሁኔታ ቀድሞውኑ አለ።
+DisabledBecauseFinal=ይህ ሁኔታ የመጨረሻ ነው.
+situationInvoiceShortcode_AS=አስ
+situationInvoiceShortcode_S=ኤስ
+CantBeLessThanMinPercent=እድገቱ ካለፈው ሁኔታ ከዋጋው ያነሰ ሊሆን አይችልም።
+NoSituations=ክፍት ሁኔታዎች የሉም
+InvoiceSituationLast=የመጨረሻ እና አጠቃላይ ደረሰኝ
+PDFCrevetteSituationNumber=ሁኔታ N°%s
+PDFCrevetteSituationInvoiceLineDecompte=የሁኔታ ደረሰኝ - COUNT
+PDFCrevetteSituationInvoiceTitle=የሁኔታ ደረሰኝ
+PDFCrevetteSituationInvoiceLine=ሁኔታ N°%s፡ Inv. N°%s በ%s ላይ
+TotalSituationInvoice=አጠቃላይ ሁኔታ
+invoiceLineProgressError=የክፍያ መጠየቂያ መስመር ሂደት ከሚቀጥለው የክፍያ መጠየቂያ መስመር የበለጠ ወይም እኩል ሊሆን አይችልም።
+updatePriceNextInvoiceErrorUpdateline=ስህተት፡ በክፍያ መጠየቂያ መስመር ላይ ያለውን ዋጋ አዘምን፡ %s
+ToCreateARecurringInvoice=ለዚህ ውል ተደጋጋሚ የክፍያ መጠየቂያ ደረሰኝ ለመፍጠር በመጀመሪያ ይህንን ረቂቅ ደረሰኝ ይፍጠሩ እና ከዚያ ወደ ደረሰኝ አብነት ይለውጡት እና የወደፊቱን ደረሰኞች የማመንጨት ድግግሞሽ ይግለጹ።
+ToCreateARecurringInvoiceGene=የወደፊት ደረሰኞችን በመደበኛነት እና በእጅ ለማመንጨት ወደ ሜኑ ይሂዱ። span> - %s</strong>።
+ToCreateARecurringInvoiceGeneAuto=እንደዚህ አይነት ደረሰኞች በራስ ሰር እንዲፈጠሩ ከፈለጉ አስተዳዳሪዎን ሞጁሉን እንዲያነቃ እና እንዲያዋቅሩ ይጠይቁ <strong>%s </strong>። ሁለቱም ዘዴዎች (በእጅ እና አውቶማቲክ) ምንም የማባዛት አደጋ ሳይኖር አብረው ጥቅም ላይ ሊውሉ እንደሚችሉ ልብ ይበሉ።
+DeleteRepeatableInvoice=የአብነት ደረሰኝ ሰርዝ
+ConfirmDeleteRepeatableInvoice=እርግጠኛ ነዎት የአብነት መጠየቂያ መጠየቂያ ደረሰኝ መሰረዝ ይፈልጋሉ?
+CreateOneBillByThird=በሶስተኛ ወገን አንድ ደረሰኝ ይፍጠሩ (አለበለዚያ በተመረጠው ነገር አንድ ደረሰኝ)
+BillCreated=%s ደረሰኝ(ዎች) መነጨ
+BillXCreated=ደረሰኝ %s ተፈጥሯል
+StatusOfGeneratedDocuments=ሰነድ የማመንጨት ሁኔታ
+DoNotGenerateDoc=የሰነድ ፋይል አታመነጭ
+AutogenerateDoc=የሰነድ ፋይልን በራስ ሰር ፍጠር
+AutoFillDateFrom=በክፍያ መጠየቂያ ቀን ለአገልግሎት መስመር የሚጀምርበትን ቀን ያዘጋጁ
+AutoFillDateFromShort=የመጀመሪያ ቀን ያዘጋጁ
+AutoFillDateTo=የአገልግሎት መስመር ማብቂያ ቀንን በሚቀጥለው የክፍያ መጠየቂያ ቀን ያዘጋጁ
+AutoFillDateToShort=የማብቂያ ቀን ያዘጋጁ
+MaxNumberOfGenerationReached=ከፍተኛው የጄኔራል ቁጥር ደርሷል
+BILL_DELETEInDolibarr=ደረሰኝ ተሰርዟል።
+BILL_SUPPLIER_DELETEInDolibarr=የአቅራቢ ደረሰኝ ተሰርዟል።
+UnitPriceXQtyLessDiscount=የክፍል ዋጋ x Qty - ቅናሽ
+CustomersInvoicesArea=የደንበኛ መክፈያ ቦታ
+SupplierInvoicesArea=የአቅራቢ ክፍያ ቦታ
+SituationTotalRayToRest=ያለ ቀረጥ ለመክፈል የቀረው
+PDFSituationTitle=ሁኔታ n° %d
+SituationTotalProgress=አጠቃላይ ሂደት %d %%
+SearchUnpaidInvoicesWithDueDate=ያልተከፈለ የክፍያ መጠየቂያ ደረሰኞችን ከማለቂያ ቀን ጋር ይፈልጉ = %s
+SearchValidatedInvoicesWithDate=ያልተከፈለ ደረሰኞችን ከማረጋገጫ ቀን ጋር ይፈልጉ = %s
+NoPaymentAvailable=ለ%s ምንም ክፍያ የለም
+PaymentRegisteredAndInvoiceSetToPaid=ክፍያ ተመዝግቧል እና ደረሰኝ %s የሚከፈልበት ተቀናብሯል
+SendEmailsRemindersOnInvoiceDueDate=ለተረጋገጡ እና ላልተከፈሉ ደረሰኞች አስታዋሽ በኢሜል ይላኩ።
+MakePaymentAndClassifyPayed=ክፍያ ይመዝግቡ
+BulkPaymentNotPossibleForInvoice=ለክፍያ መጠየቂያ %s (መጥፎ ዓይነት ወይም ደረጃ) የጅምላ ክፍያ አይቻልም።
+MentionVATDebitOptionIsOn=በዴቢት ላይ በመመስረት ግብር የመክፈል አማራጭ
+MentionCategoryOfOperations=የክዋኔዎች ምድብ
+MentionCategoryOfOperations0=እቃዎች ማድረስ
+MentionCategoryOfOperations1=አገልግሎቶች አቅርቦት
+MentionCategoryOfOperations2=የተቀላቀለ - የሸቀጦች አቅርቦት እና አገልግሎቶች አቅርቦት
+Salaries=ደሞዝ
+InvoiceSubtype=የክፍያ መጠየቂያ ንዑስ ዓይነት
+SalaryInvoice=ደሞዝ
+BillsAndSalaries=ሂሳቦች እና ደሞዝ
+CreateCreditNoteWhenClientInvoiceExists=ይህ አማራጭ የሚነቃው የተረጋገጠ የክፍያ መጠየቂያ(ዎች) ለደንበኛ ሲኖር ወይም ቋሚ INVOICE_CREDIT_NOTE_STANDALONE ጥቅም ላይ ሲውል (ለአንዳንድ አገሮች ጠቃሚ)
diff --git a/htdocs/langs/am_ET/bookmarks.lang b/htdocs/langs/am_ET/bookmarks.lang
index be0f2f7e25d..c4c99c8cd9a 100644
--- a/htdocs/langs/am_ET/bookmarks.lang
+++ b/htdocs/langs/am_ET/bookmarks.lang
@@ -1,22 +1,24 @@
-# 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
-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
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = የአሁኑን ገጽ ወደ ዕልባቶች ያክሉ
+BehaviourOnClick = የዕልባት URL ሲመረጥ ባህሪ
+Bookmark = ዕልባት
+Bookmarks = ዕልባቶች
+BookmarkTargetNewWindowShort = አዲስ ትር
+BookmarkTargetReplaceWindowShort = የአሁኑ ትር
+BookmarkTitle = የዕልባት ስም
+BookmarksManagement = የዕልባቶች አስተዳደር
+BookmarksMenuShortCut = Ctrl + Shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = የተገናኘው ገጽ አሁን ባለው ትር ወይም በአዲስ ትር ውስጥ መከፈት እንዳለበት ይምረጡ
+CreateBookmark = ዕልባት ይፍጠሩ
+EditBookmarks = ዕልባቶችን ይዘርዝሩ/ያርትዑ
+ListOfBookmarks = የዕልባቶች ዝርዝር
+NewBookmark = አዲስ ዕልባት
+NoBookmarkFound = ምንም ዕልባት አልተገኘም።
+NoBookmarks = ምንም ዕልባቶች አልተገለጹም።
+OpenANewWindow = አዲስ ትር ክፈት
+ReplaceWindow = የአሁኑን ትር ይተኩ
+SetHereATitleForLink = ለዕልባቶች ስም ያዘጋጁ
+ShowBookmark = ዕልባት አሳይ
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = ውጫዊ/ፍፁም ማገናኛን (https://externalurl.com) ወይም የውስጥ/ዘመድ አገናኝ (/mypage.php) ተጠቀም። እንዲሁም እንደ ቴል፡0123456 ያለ ስልክ መጠቀም ይችላሉ።
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index 710d49bfab6..6fca04775df 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -1,120 +1,146 @@
 # 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=አባላት በአይነት እና በሁኔታ
+BoxTitleMembersByTags=አባላት በመለያዎች እና በሁኔታ
+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=በጣም የቆዩ ንቁ ጊዜ ያለፈባቸው አገልግሎቶች
+BoxOldestActions=የሚደረጉ በጣም የቆዩ ክስተቶች
+BoxLastExpiredServices=የቅርብ ጊዜ የ%s የቆዩ እውቂያዎች ከንቁ ጊዜ ያለፈባቸው አገልግሎቶች
+BoxTitleLastActionsToDo=የቅርብ ጊዜ %s የሚደረጉ እርምጃዎች
+BoxTitleOldestActionsToDo=በጣም የቆዩ %s የተደረጉ ክስተቶች፣ አልተጠናቀቁም
+BoxTitleFutureActions=ቀጣዩ %s መጪ ክስተቶች
+BoxTitleLastContracts=የተሻሻለው የ%s ኮንትራቶች
+BoxTitleLastModifiedDonations=የቅርብ ጊዜ የ%s ልገሳዎች የተሻሻሉ
+BoxTitleLastModifiedExpenses=የቅርብ ጊዜ የ%s የወጪ ሪፖርቶች የተሻሻሉ
+BoxTitleLatestModifiedBoms=የቅርብ ጊዜ %s የተሻሻሉ BOMዎች
+BoxTitleLatestModifiedMos=የቅርብ ጊዜ %s የተሻሻሉ የምርት ትዕዛዞች
+BoxTitleLastOutstandingBillReached=ከፍተኛ ውጤት ያላቸው ደንበኞች አልፈዋል
+BoxGlobalActivity=ዓለም አቀፍ እንቅስቃሴ (ክፍያ መጠየቂያዎች፣ ፕሮፖዛል፣ ትዕዛዞች)
+BoxGoodCustomers=ጥሩ ደንበኞች
+BoxTitleGoodCustomers=%s ጥሩ ደንበኞች
+BoxScheduledJobs=የታቀዱ ስራዎች
+BoxTitleFunnelOfProspection=የእርሳስ ፈንጣጣ
+FailedToRefreshDataInfoNotUpToDate=የአርኤስኤስ ፍሰትን ማደስ አልተሳካም። የቅርብ ጊዜ የተሳካ የማደሻ ቀን፡ %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 የደንበኛ ጭነት
+BoxTitleLastLeaveRequests=የቅርብ ጊዜ %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=ቤት የሶስተኛ ወገኖች
+productindex=የቤት ምርቶች እና አገልግሎቶች
+mrpindex=መነሻ MRP
+commercialindex=የቤት ማስታወቂያ
+projectsindex=የቤት ፕሮጀክቶች
+invoiceindex=የቤት ደረሰኞች
+hrmindex=የቤት ደረሰኞች
+TicketsHome=የቤት ትኬቶች
+stockindex=የቤት አክሲዮኖች
+sendingindex=የቤት ማጓጓዣዎች
+receptionindex=የቤት መቀበል
+activityindex=የቤት እንቅስቃሴ
+proposalindex=የቤት ፕሮፖዛል
+ordersindex=የቤት ሽያጭ ትዕዛዞች
+orderssuppliersindex=የቤት ግዢ ትዕዛዞች
+contractindex=የቤት ኮንትራቶች
+interventionindex=የቤት ውስጥ ጣልቃገብነቶች
+suppliersproposalsindex=የቤት አቅራቢዎች ሀሳቦች
+donationindex=የቤት ልገሳዎች
+specialexpensesindex=የቤት ልዩ ወጪዎች
+expensereportindex=የቤት ወጪ ሪፖርት
+mailingindex=የቤት መላክ
+opensurveyindex=የቤት ክፍት ዳሰሳ
+AccountancyHome=የቤት ሒሳብ
+ValidatedProjects=የተረጋገጡ ፕሮጀክቶች
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index a784b66aa14..77f9e86ea9b 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -58,6 +58,7 @@ Numberspad=የቁጥሮች ፓድ
 BillsCoinsPad=ሳንቲሞች እና የባንክ ኖቶች ፓድ
 DolistorePosCategory=የ TakePOS ሞጁሎች እና ሌሎች የ POS መፍትሄዎች ለ Dolibarr
 TakeposNeedsCategories=TakePOS ለመስራት ቢያንስ አንድ የምርት ምድብ ያስፈልገዋል
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
 OrderNotes=በእያንዳንዱ የታዘዙ ዕቃዎች ላይ አንዳንድ ማስታወሻዎችን ማከል ይችላል።
 CashDeskBankAccountFor=ለክፍያዎች የሚውል ነባሪ መለያ
 NoPaimementModesDefined=በ TakePOS ውቅረት ውስጥ ምንም ዓይነት የመዳኛ ሁነታ አልተገለጸም።
@@ -135,6 +136,7 @@ PrintWithoutDetailsLabelDefault=ያለ ዝርዝሮች በማተም ላይ የ
 PrintWithoutDetails=ያለ ዝርዝሮች አትም
 YearNotDefined=ዓመት አልተገለጸም።
 TakeposBarcodeRuleToInsertProduct=ምርት ለማስገባት የአሞሌ ኮድ
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=አስቀድሞ ታትሟል
 HideCategories=የምድብ ምርጫውን ሙሉውን ክፍል ደብቅ
 HideStockOnLine=በመስመር ላይ ክምችትን ደብቅ
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index cf0de898bdb..21839418ee8 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -1,100 +1,105 @@
 # 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=ወደ መለያ / ምድብ ያክሉ
+RemoveCategory=ምድብ አስወግድ
+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=የወላጅ መለያ / ምድብ
+ParentCategoryID=የወላጅ መለያ/ምድብ መታወቂያ
+ParentCategoryLabel=የወላጅ መለያ / ምድብ መለያ
+CatSupList=የአቅራቢዎች መለያዎች/ ምድቦች ዝርዝር
+CatCusList=የደንበኞች/የተስፋዎች መለያዎች/ ምድቦች ዝርዝር
+CatProdList=የምርት መለያዎች / ምድቦች ዝርዝር
+CatMemberList=የአባላት መለያዎች/ ምድቦች ዝርዝር
+CatContactList=የእውቂያዎች መለያዎች / ምድቦች ዝርዝር
+CatProjectsList=የፕሮጀክቶች መለያዎች / ምድቦች ዝርዝር
+CatUsersList=የተጠቃሚ መለያዎች/ ምድቦች ዝርዝር
+CatSupLinks=በአቅራቢዎች እና መለያዎች/ምድቦች መካከል ያሉ አገናኞች
+CatCusLinks=በደንበኞች / ተስፋዎች እና መለያዎች / ምድቦች መካከል ያሉ ግንኙነቶች
+CatContactsLinks=በእውቂያዎች/አድራሻዎች እና መለያዎች/ምድቦች መካከል ያሉ አገናኞች
+CatProdLinks=በምርቶች/አገልግሎቶች እና መለያዎች/ምድቦች መካከል ያሉ አገናኞች
+CatMembersLinks=በአባላት እና መለያዎች / ምድቦች መካከል ያሉ አገናኞች
+CatProjectsLinks=በፕሮጀክቶች እና በመለያዎች / ምድቦች መካከል ያሉ አገናኞች
+CatUsersLinks=በተጠቃሚዎች እና መለያዎች / ምድቦች መካከል ያሉ አገናኞች
+DeleteFromCat=ከመለያዎች/ምድብ ያስወግዱ
+ExtraFieldsCategories=ተጨማሪ ባህሪያት
+CategoriesSetup=መለያዎች / ምድቦች ማዋቀር
+CategorieRecursiv=ከወላጅ መለያ/ምድብ ጋር በራስ ሰር ማገናኘት።
+CategorieRecursivHelp=ምርጫው በርቶ ከሆነ አንድን ነገር ወደ ንዑስ ምድብ ሲጨምሩ ነገሩ ወደ የወላጅ ምድቦችም ይታከላል።
+AddProductServiceIntoCategory=ለምርቱ/አገልግሎት ምድብ መድብ
+AddCustomerIntoCategory=ምድብ ለደንበኛ መድብ
+AddSupplierIntoCategory=ምድብ ለአቅራቢው መድብ
+AssignCategoryTo=ምድብ ለ
+ShowCategory=መለያ/መደብ አሳይ
+ByDefaultInList=በነባሪ ዝርዝር ውስጥ
+ChooseCategory=ምድብ ይምረጡ
+StocksCategoriesArea=የመጋዘን ምድቦች
+TicketsCategoriesArea=የቲኬቶች ምድቦች
+ActionCommCategoriesArea=የክስተት ምድቦች
+WebsitePagesCategoriesArea=ገጽ-የመያዣ ምድቦች
+KnowledgemanagementsCategoriesArea=KM መጣጥፍ ምድቦች
+UseOrOperatorForCategories=ለምድብ የ'OR' ኦፕሬተርን ተጠቀም
+AddObjectIntoCategory=ወደ ምድብ መድብ
diff --git a/htdocs/langs/am_ET/commercial.lang b/htdocs/langs/am_ET/commercial.lang
index 10c536e0d48..69ce04202bf 100644
--- a/htdocs/langs/am_ET/commercial.lang
+++ b/htdocs/langs/am_ET/commercial.lang
@@ -1,80 +1,93 @@
 # 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=Automatically inserted events
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-ActionAC_OTH_AUTOShort=Auto
-Stats=Sales statistics
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-NoLimit=No limit
-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=የመስመር ላይ ፊርማ አገናኝ
+WelcomeOnOnlineSignaturePageProposal=ከ%s የንግድ ፕሮፖዛል ለመቀበል ወደ ገጹ እንኳን በደህና መጡ
+WelcomeOnOnlineSignaturePageContract=እንኳን ወደ %s የኮንትራት ፒዲኤፍ መፈረሚያ ገጽ እንኳን በደህና መጡ
+WelcomeOnOnlineSignaturePageFichinter=እንኳን ወደ %s ጣልቃ ገብነት ፒዲኤፍ መፈረሚያ ገጽ እንኳን በደህና መጡ
+WelcomeOnOnlineSignaturePageSociete_rib=እንኳን ወደ %s መጡ SEPA የፒዲኤፍ መፈረሚያ ገጽ
+ThisScreenAllowsYouToSignDocFromProposal=ይህ ማያ ገጽ የጥቅስ/የንግድ ፕሮፖዛልን ለመቀበል እና ለመፈረም ወይም ውድቅ ለማድረግ ያስችላል
+ThisScreenAllowsYouToSignDocFromContract=ይህ ማያ ገጽ በፒዲኤፍ ቅርጸት በመስመር ላይ ውል እንዲፈርሙ ያስችልዎታል።
+ThisScreenAllowsYouToSignDocFromFichinter=ይህ ማያ ገጽ በፒዲኤፍ ቅርጸት በመስመር ላይ ጣልቃ ገብነት እንዲፈርሙ ያስችልዎታል።
+ThisScreenAllowsYouToSignDocFromSociete_rib=ይህ ስክሪን በፒዲኤፍ ቅርጸት በመስመር ላይ SEPA Mandate እንዲፈርሙ ያስችልዎታል።
+ThisIsInformationOnDocumentToSignProposal=ይህ ለመቀበል ወይም ላለመቀበል በሰነድ ላይ ያለ መረጃ ነው።
+ThisIsInformationOnDocumentToSignContract=ይህ ለመፈረም ውል ላይ ያለ መረጃ ነው።
+ThisIsInformationOnDocumentToSignFichinter=ይህ ለመፈረም ጣልቃ ገብነት መረጃ ነው።
+ThisIsInformationOnDocumentToSignSociete_rib=ይህ በ SEPA የመፈረም ትእዛዝ ላይ ያለ መረጃ ነው።
+SignatureProposalRef=የጥቅስ/የንግድ ፕሮፖዛል ፊርማ %s
+SignatureContractRef=የኮንትራት ፊርማ %s
+SignatureFichinterRef=የጣልቃ ገብነት ፊርማ %s
+SignatureSociete_ribRef=የ SEPA ትዕዛዝ ፊርማ %s
+FeatureOnlineSignDisabled=ባህሪው ከመንቃት በፊት በመስመር ላይ የመፈረም ባህሪ ተሰናክሏል ወይም ሰነድ የመነጨ ነው።
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index 7de663ede6d..a63fec78ad7 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -1,495 +1,530 @@
 # 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
+newSocieteAdded=የእውቂያ ዝርዝሮችዎ ተመዝግበዋል። በቅርቡ እንመለሳለን...
+ContactUsDesc=ይህ ቅጽ ለመጀመሪያ ግንኙነት መልእክት እንድትልኩልን ይፈቅድልሃል።
+ErrorCompanyNameAlreadyExists=የኩባንያ ስም %s አስቀድሞ አለ። ሌላ ይምረጡ።
+ErrorSetACountryFirst=መጀመሪያ አገሩን ያዘጋጁ
+SelectThirdParty=ሶስተኛ ወገን ይምረጡ
+ConfirmDeleteCompany=እርግጠኛ ነዎት ይህንን ኩባንያ እና ሁሉንም ተዛማጅ መረጃዎችን መሰረዝ ይፈልጋሉ?
+DeleteContact=እውቂያ/አድራሻ ሰርዝ
+ConfirmDeleteContact=እርግጠኛ ነዎት ይህን እውቂያ እና ሁሉንም ተዛማጅ መረጃዎች መሰረዝ ይፈልጋሉ?
+MenuNewThirdParty=አዲስ ሶስተኛ ወገን
+MenuNewCustomer=አዲስ ደንበኛ
+MenuNewProspect=አዲስ ተስፋ
+MenuNewSupplier=አዲስ ሻጭ
+MenuNewPrivateIndividual=አዲስ የግል ሰው
+NewCompany=አዲስ ኩባንያ (ተፈላጊ, ደንበኛ, ሻጭ)
+NewThirdParty=አዲስ ሶስተኛ ወገን (ተፈላጊ፣ ደንበኛ፣ ሻጭ)
+CreateDolibarrThirdPartySupplier=ሶስተኛ ወገን (ሻጭ) ይፍጠሩ
+CreateThirdPartyOnly=ሶስተኛ ወገን ፍጠር
+CreateThirdPartyAndContact=የሶስተኛ ወገን + የልጅ ግንኙነት ይፍጠሩ
+ProspectionArea=የእይታ አካባቢ
+IdThirdParty=ሶስተኛ ወገን መታወቂያ
+IdCompany=የኩባንያ መታወቂያ
+IdContact=የእውቂያ መታወቂያ
+ThirdPartyAddress=የሶስተኛ ወገን አድራሻ
+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=የመጀመሪያ ስም
+RefEmployee=የሰራተኛ ማጣቀሻ
+NationalRegistrationNumber=ብሔራዊ የምዝገባ ቁጥር
+PostOrFunction=የሥራ ቦታ
+UserTitle=ርዕስ
+NatureOfThirdParty=የሶስተኛ ወገን ተፈጥሮ
+NatureOfContact=የግንኙነት ተፈጥሮ
+Address=አድራሻ
+State=ግዛት/አውራጃ
+StateId=የግዛት መታወቂያ
+StateCode=ግዛት / ግዛት ኮድ
+StateShort=ግዛት
+Region=ክልል
+Region-State=ክልል - ግዛት
+Country=ሀገር
+CountryCode=የአገር መለያ ቁጥር
+CountryId=የሀገር መታወቂያ
+Phone=ስልክ
+PhoneShort=ስልክ
+Skype=ስካይፕ
+Call=ይደውሉ
+Chat=ተወያይ
+PhonePro=አውቶቡስ. ስልክ
+PhonePerso=ፐርስ. ስልክ
+PhoneMobile=ሞባይል
+No_Email=የጅምላ ኢሜይሎችን እምቢ ይበሉ
+Fax=ፋክስ
+Zip=አካባቢያዊ መለያ ቁጥር
+Town=ከተማ
+Web=ድር
+Poste= አቀማመጥ
+DefaultLang=ነባሪ ቋንቋ
+VATIsUsed=ጥቅም ላይ የዋለው የሽያጭ ታክስ
+VATIsUsedWhenSelling=ይህ ሶስተኛ ወገን ለደንበኞቹ ደረሰኝ ሲያደርግ የሽያጭ ታክስን የሚጨምር ከሆነ ወይም ካልሆነ ይገልጻል
+VATIsNotUsed=የሽያጭ ታክስ ጥቅም ላይ አይውልም
+VATReverseCharge=ተ.እ.ታ በግልባጭ መሙላት
+VATReverseChargeByDefault=ተ.እ.ታ በግልባጭ ክፍያ በነባሪ
+VATReverseChargeByDefaultDesc=በአቅራቢው ደረሰኝ ላይ፣ ተ.እ.ታ ተቃራኒ ክፍያ በነባሪነት ጥቅም ላይ ይውላል
+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=የአሞሌ ኮድ
+GencodBuyPrice=የዋጋ ባርኮድ ማጣቀሻ
 ##### 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)
-ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId1Short=ፕሮፌሰር መታወቂያ 1
+ProfId2Short=ፕሮፌሰር መታወቂያ 2
+ProfId3Short=ፕሮፌሰር መታወቂያ 3
+ProfId4Short=ፕሮፌሰር መታወቂያ 4
+ProfId5Short=ፕሮፌሰር መታወቂያ 5
+ProfId6Short=ፕሮፌሰር መታወቂያ 6
+ProfId7Short=ፕሮፌሰር መታወቂያ 7
+ProfId8Short=ፕሮፌሰር መታወቂያ 8
+ProfId9Short=ፕሮፌሰር መታወቂያ 9
+ProfId10Short=ፕሮፌሰር መታወቂያ 10
+ProfId1=የባለሙያ መታወቂያ 1
+ProfId2=የባለሙያ መታወቂያ 2
+ProfId3=የባለሙያ መታወቂያ 3
+ProfId4=የባለሙያ መታወቂያ 4
+ProfId5=የባለሙያ መታወቂያ 5
+ProfId6=የባለሙያ መታወቂያ 6
+ProfId7=የባለሙያ መታወቂያ 7
+ProfId8=የባለሙያ መታወቂያ 8
+ProfId9=የባለሙያ መታወቂያ 9
+ProfId10=የባለሙያ መታወቂያ 10
+ProfId1AR=ፕሮፌሰር መታወቂያ 1 (CUIT/CUIL)
+ProfId2AR=ፕሮፌሰር መታወቂያ 2 (የሪቨኑ ብሩቶች)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
-ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId1AT=ፕሮፌሰር መታወቂያ 1 (USt.-IdNr)
+ProfId2AT=ፕሮፌሰር መታወቂያ 2 (USt.-Nr)
+ProfId3AT=ፕሮፌሰር መታወቂያ 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI ቁጥር
 ProfId6AT=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=ፕሮፌሰር መታወቂያ 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
+ProfId2BR=IE (ኢንስክሪካኦ ኢስታዱያል)
+ProfId3BR=አይኤም (ኢንስክሪካኦ ማዘጋጃ ቤት)
+ProfId4BR=ሲፒኤፍ
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=UID-Nummer
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId3CH=ፕሮፌሰር መታወቂያ 1 (የፌዴራል ቁጥር)
+ProfId4CH=ፕሮፌሰር መታወቂያ 2 (የንግድ መዝገብ ቁጥር)
+ProfId5CH=EORI ቁጥር
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId1CL=ፕሮፌሰር መታወቂያ 1 (R.U.T.)
 ProfId2CL=-
 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=-
+ProfId1CM=መታወቂያ ፕሮፌሰር 1 (የንግድ መዝገብ)
+ProfId2CM=መታወቂያ ፕሮፌሰር 2 (የግብር ከፋይ ቁጥር)
+ProfId3CM=መታወቂያ ፕሮፌሰር 3 (የፍጥረት ድንጋጌ ቁጥር)
+ProfId4CM=መታወቂያ ፕሮፌሰር 4 (የተቀማጭ የምስክር ወረቀት ቁጥር)
+ProfId5CM=መታወቂያ ፕሮፌሰር 5 (ሌሎች)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=የንግድ ምዝገባ
+ProfId2ShortCM=የግብር ከፋይ ቁጥር.
+ProfId3ShortCM=የፍጥረት ድንጋጌ ቁጥር
+ProfId4ShortCM=የተቀማጭ የምስክር ወረቀት ቁጥር
+ProfId5ShortCM=ሌሎች
 ProfId6ShortCM=-
-ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId1CO=ፕሮፌሰር መታወቂያ 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId1DE=ፕሮፌሰር መታወቂያ 1 (USt.-IdNr)
+ProfId2DE=ፕሮፌሰር መታወቂያ 2 (USt.-Nr)
+ProfId3DE=ፕሮፌሰር መታወቂያ 3 (Handelsregister-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 (ሲኤንኤኢ)
+ProfId4ES=ፕሮፌሰር መታወቂያ 4 (የኮሌጅ ቁጥር)
+ProfId5ES=ፕሮፌሰር መታወቂያ 5 (EORI ቁጥር)
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId1FR=ፕሮፌሰር መታወቂያ 1 (SIREN)
+ProfId2FR=ፕሮፌሰር መታወቂያ 2 (SIRET)
+ProfId3FR=ፕሮፌሰር መታወቂያ 3 (NAF፣ የድሮ APE)
+ProfId4FR=ፕሮፌሰር መታወቂያ 4 (RCS/RM)
+ProfId5FR=ፕሮፌሰር መታወቂያ 5 (ቁጥር ኢኦሪ)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
+ProfId1GB=የምዝገባ ቁጥር
 ProfId2GB=-
 ProfId3GB=SIC
 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 (ቲን)
+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 (አር.ሲ.ኤስ. ሉክሰምበርግ)
+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 (አር.ሲ.)
+ProfId2MA=መታወቂያ ፕሮፌሰር 2 (ፓተንት)
+ProfId3MA=መታወቂያ ፕሮፌሰር 3 (አይ.ኤፍ.)
+ProfId4MA=መታወቂያ ፕሮፌሰር 4 (ሲ.ኤን.ኤስ.ኤስ.)
+ProfId5MA=መታወቂያ ፕሮፌሰር 5 (አይ.ሲ.ኢ.)
 ProfId6MA=-
-ProfId1MX=Prof Id 1 (R.F.C).
-ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId1MX=ፕሮፌሰር መታወቂያ 1 (አር.ኤፍ.ሲ)
+ProfId2MX=ፕሮፌሰር መታወቂያ 2 (R..P. IMSS)
+ProfId3MX=ፕሮፌሰር መታወቂያ 3 (የፕሮፌሽናል ቻርተር)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
 ProfId1NL=KVK nummer
 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=ፕሮፌሰር መታወቂያ 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)
-ProfId3TN=Prof Id 3 (Douane code)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId1TN=ፕሮፌሰር መታወቂያ 1 (አርሲ)
+ProfId2TN=ፕሮፌሰር መታወቂያ 2 (የፊስካል ማትሪክስ)
+ProfId3TN=ፕሮፌሰር መታወቂያ 3 (Douane ኮድ)
+ProfId4TN=ፕሮፌሰር መታወቂያ 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=ፕሮፌሰር መታወቂያ 2 (Nr. Înmatriculare)
+ProfId3RO=ፕሮፌሰር መታወቂያ 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=ፕሮፌሰር መታወቂያ 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)
-ProfId6UA=Prof Id 6 (TRDPAU)
-ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId1UA=ፕሮፌሰር መታወቂያ 1 (EDRPOU)
+ProfId2UA=ፕሮፌሰር መታወቂያ 2 (DRFO)
+ProfId3UA=ፕሮፌሰር መታወቂያ 3 (INN)
+ProfId4UA=ፕሮፌሰር መታወቂያ 4 (የምስክር ወረቀት)
+ProfId5UA=ፕሮፌሰር መታወቂያ 5 (RNOKPP)
+ProfId6UA=ፕሮፌሰር መታወቂያ 6 (TRDPAU)
+ProfId1DZ=አር.ሲ
+ProfId2DZ=ስነ ጥበብ.
 ProfId3DZ=NIF
-ProfId4DZ=NIS
-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
+ProfId4DZ=ኤን.አይ.ኤስ
+VATIntra=የተ.እ.ታ መታወቂያ
+VATIntraShort=የተ.እ.ታ መታወቂያ
+VATIntraSyntaxIsValid=አገባብ ልክ ነው።
+VATReturn=የተ.እ.ታ ተመላሽ
+ProspectCustomer=ተስፋ / ደንበኛ
+Prospect=ተስፋ
+CustomerCard=የደንበኛ ካርድ
+Customer=ደንበኛ
+CustomerRelativeDiscount=አንጻራዊ የደንበኛ ቅናሽ
+SupplierRelativeDiscount=አንጻራዊ የአቅራቢ ቅናሽ
+CustomerRelativeDiscountShort=አንጻራዊ ቅናሽ
+CustomerAbsoluteDiscountShort=ፍጹም ቅናሽ
 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
+CompanyHasNoRelativeDiscount=ይህ ደንበኛ በነባሪ አንጻራዊ ቅናሽ የለውም
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=ከዚህ አቅራቢ ጋር ምንም ነባሪ አንጻራዊ ቅናሽ የለም።
 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
+HasNoAbsoluteDiscountFromSupplier=ከዚህ አቅራቢ ምንም ቅናሽ/ክሬዲት የለም።
 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.
-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
+HasCreditNoteFromSupplier=ለ<b>%s</b> <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=የቫት መታወቂያው የአገር ቅድመ ቅጥያ ማካተት አለበት። አገናኙ <b>%s</b> የአውሮፓ ቫት አረጋጋጭ አገልግሎትን ይጠቀማል ከ Dolibarr አገልጋይ የበይነመረብ መዳረሻ ያስፈልገዋል.
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
+VATIntraCheckableOnEUSite=የውስጠ-ማህበረሰብ ተ.እ.ታን መታወቂያ በአውሮፓ ኮሚሽን ድረ-ገጽ ላይ ያረጋግጡ
+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
+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=የዶሊባርር መዳረሻ የለም።
+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=እርግጠኛ ነህ ይህን ፋይል <b>%s</b>?
+AllocateCommercial=ለሽያጭ ተወካይ ተመድቧል
+Organization=ድርጅት
+FiscalYearInformation=የበጀት ዓመት
+FiscalMonthStart=የበጀት ዓመቱ መጀመሪያ ወር
+SocialNetworksInformation=ማህበራዊ አውታረ መረቦች
 SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
+SocialNetworksTwitterURL=የትዊተር ዩአርኤል
 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
+YouMustAssignUserMailFirst=የኢሜል ማሳወቂያ ማከል ከመቻልዎ በፊት ለዚህ ተጠቃሚ ኢሜይል መፍጠር አለብዎት።
+YouMustCreateContactFirst=የኢሜል ማሳወቂያዎችን ለመጨመር በመጀመሪያ ለሶስተኛ ወገን ትክክለኛ ኢሜይሎች ያላቸውን እውቂያዎች መግለፅ አለብዎት
+ListSuppliersShort=የአቅራቢዎች ዝርዝር
+ListProspectsShort=የተስፋዎች ዝርዝር
+ListCustomersShort=የደንበኞች ዝርዝር
+ThirdPartiesArea=የሶስተኛ ወገኖች/እውቂያዎች
+LastModifiedThirdParties=የቅርብ ጊዜ %s የተሻሻሉ ሶስተኛ ወገኖች
+UniqueThirdParties=የሶስተኛ ወገኖች ጠቅላላ ቁጥር
+InActivity=ክፈት
+ActivityCeased=ዝግ
+ThirdPartyIsClosed=ሶስተኛ ወገን ተዘግቷል።
+ProductsIntoElements=በ%s የተቀረጹ ምርቶች/አገልግሎቶች ዝርዝር
+CurrentOutstandingBill=አሁን ያለ ክፍያ ሂሳብ
+OutstandingBill=ከፍተኛ. ለላቀ ክፍያ
+OutstandingBillReached=ከፍተኛ. ለደረሰው የላቀ ሂሳብ
+OrderMinAmount=ለትእዛዝ ዝቅተኛው መጠን
+MonkeyNumRefModelDesc=ቁጥርን በ%syymm-nnnn ለደንበኛው ኮድ እና %syymm-nnn ለአቅራቢው ኮድ yy ባለበት ቅርጸት ይመልሱ። አመት፣ ሚሜ ወር ነው እና nnn ምንም እረፍት የሌለው እና ወደ 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=Multicurrency ይጠቀሙ
+MulticurrencyCurrency=ምንዛሪ
+InEEC=አውሮፓ (ኢኢሲ)
+RestOfEurope=የተቀረው አውሮፓ (EEC)
+OutOfEurope=ከአውሮፓ ውጪ (EEC)
+CurrentOutstandingBillLate=የአሁኑ ያልተከፈለ ሂሳብ ዘግይቷል።
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=ይጠንቀቁ፣ እንደ የምርት ዋጋ ቅንብሮችዎ፣ ምርቱን ወደ POS ከማከልዎ በፊት ሶስተኛ ወገንን መቀየር አለብዎት።
+EmailAlreadyExistsPleaseRewriteYourCompanyName=ኢሜይል አስቀድሞ አለ እባክዎ የኩባንያዎን ስም እንደገና ይፃፉ
+TwoRecordsOfCompanyName=ለዚህ ኩባንያ ከአንድ በላይ መዝገብ አለ፣ እባክዎን የአጋርነት ጥያቄዎን ለማጠናቀቅ ያነጋግሩን።
+CompanySection=የኩባንያው ክፍል
+ShowSocialNetworks=ማህበራዊ አውታረ መረቦችን አሳይ
+HideSocialNetworks=ማህበራዊ አውታረ መረቦችን ደብቅ
+ExternalSystemID=የውጭ ስርዓት መታወቂያ
+IDOfPaymentInAnExternalSystem=የመክፈያ ሁነታ መታወቂያ ወደ ውጫዊ ስርዓት (እንደ Stripe፣ Paypal፣ ...)
+AADEWebserviceCredentials=ADE Webservice ምስክርነቶች
+ThirdPartyMustBeACustomerToCreateBANOnStripe=የሶስተኛ ወገን የባንክ መረጃውን በ Stripe በኩል ለመፍጠር ደንበኛ መሆን አለበት።
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 640a229b7f2..f486e6a4936 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -1,300 +1,315 @@
 # 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>.
+MenuFinancial=ማስከፈል | ክፍያ
+TaxModuleSetupToModifyRules=የስሌት ደንቦችን ለማሻሻል ወደ <a href="%s">የግብር ሞዱል ማዋቀር</a> ይሂዱ
+TaxModuleSetupToModifyRulesLT=የስሌት ደንቦችን ለማሻሻል ወደ <a href="%s">የኩባንያ ማዋቀር</a> ይሂዱ
+OptionMode=ለሂሳብ አያያዝ አማራጭ
+OptionModeTrue=አማራጭ ገቢዎች-ወጪዎች
+OptionModeVirtual=አማራጭ የይገባኛል ጥያቄዎች-ዕዳዎች
+OptionModeTrueDesc=በዚህ ዐውደ-ጽሑፍ, ማዞሪያው በክፍያዎች (የክፍያ ቀን) ላይ ይሰላል. የቁጥሮቹ ትክክለኛነት የሚረጋገጠው የመጽሃፍ ማከማቻው በሂሳብ ደረሰኞች ላይ ባለው ግብአት/ውጤት ከተመረመረ ብቻ ነው።
+OptionModeVirtualDesc=በዚህ አውድ፣ ማዞሪያው በደረሰኞች (የተረጋገጠበት ቀን) ላይ ይሰላል። እነዚህ ደረሰኞች ሲከፈሉ፣ተከፈሉም አልሆኑ፣በማዞሪያው ውጤት ውስጥ ተዘርዝረዋል።
+FeatureIsSupportedInInOutModeOnly=ባህሪ የሚገኘው በCREDITS-DEBTS የሒሳብ አያያዝ ሁነታ ላይ ብቻ ነው (የአካውንቲንግ ሞጁል ውቅረትን ይመልከቱ)
+VATReportBuildWithOptionDefinedInModule=እዚህ የሚታዩት መጠኖች የሚሰሉት በታክስ ሞጁል ማዋቀር የተገለጹ ህጎችን በመጠቀም ነው።
+LTReportBuildWithOptionDefinedInModule=እዚህ የሚታዩት መጠኖች በኩባንያው ማዋቀር የተገለጹ ደንቦችን በመጠቀም ይሰላሉ.
+Param=አዘገጃጀት
+RemainingAmountPayment=የሚቀረው የክፍያ መጠን፡-
+Account=መለያ
+Accountparent=የወላጅ መለያ
+Accountsparent=የወላጅ መለያዎች
+Income=ገቢ
+Outcome=ወጪ
+MenuReportInOut=ገቢ / ወጪ
+ReportInOut=የገቢ እና ወጪዎች ሚዛን
+ReportTurnover=የማዞሪያ ደረሰኝ ተከፍሏል።
+ReportTurnoverCollected=ማዞሪያ ተሰብስቧል
+PaymentsNotLinkedToInvoice=ክፍያዎች ከማንኛውም ደረሰኝ ጋር አልተገናኙም፣ ስለዚህ ከማንኛውም ሶስተኛ ወገን ጋር አልተገናኙም።
+PaymentsNotLinkedToUser=ክፍያዎች ከማንም ተጠቃሚ ጋር አልተገናኙም።
+Profit=ትርፍ
+AccountingResult=የሂሳብ አያያዝ ውጤት
+BalanceBefore=ሚዛን (በፊት)
+Balance=ሚዛን
+Debit=ዴቢት
+Credit=ክሬዲት
+AccountingDebit=ዴቢት
+AccountingCredit=ክሬዲት
+Piece=የሂሳብ አያያዝ ሰነድ.
+AmountHTVATRealReceived=የተጣራ ተሰብስቧል
+AmountHTVATRealPaid=የተጣራ ክፍያ
+VATToPay=የግብር ሽያጭ
+VATReceived=ግብር ተቀብሏል።
+VATToCollect=የግብር ግዢዎች
+VATSummary=ግብር ወርሃዊ
+VATBalance=የግብር ሒሳብ
+VATPaid=ግብር ተከፍሏል።
+LT1Summary=የግብር 2 ማጠቃለያ
+LT2Summary=የግብር 3 ማጠቃለያ
+LT1SummaryES=የዳግም ሚዛን
+LT2SummaryES=የ IRPF ሚዛን
+LT1SummaryIN=CGST ሚዛን
+LT2SummaryIN=SGST ሚዛን
+LT1Paid=ግብር 2 ተከፍሏል።
+LT2Paid=ግብር 3 ተከፍሏል።
+LT1PaidES=እንደገና ተከፍሏል።
+LT2PaidES=IRPF ተከፍሏል።
+LT1PaidIN=CGST ተከፍሏል።
+LT2PaidIN=SGST ተከፍሏል።
+LT1Customer=ግብር 2 ሽያጭ
+LT1Supplier=ግብር 2 ግዢዎች
+LT1CustomerES=RE ሽያጭ
+LT1SupplierES=RE ግዢዎች
+LT1CustomerIN=የ CGST ሽያጭ
+LT1SupplierIN=የCGST ግዢዎች
+LT2Customer=ግብር 3 ሽያጭ
+LT2Supplier=ግብር 3 ግዢዎች
+LT2CustomerES=የ IRPF ሽያጭ
+LT2SupplierES=የ IRPF ግዢዎች
+LT2CustomerIN=SGST ሽያጮች
+LT2SupplierIN=የ SGST ግዢዎች
+VATCollected=ተ.እ.ታ ተሰብስቧል
+StatusToPay=መክፈል
+SpecialExpensesArea=ለሁሉም ልዩ ክፍያዎች አካባቢ
+VATExpensesArea=ለሁሉም የTVA ክፍያዎች አካባቢ
+SocialContribution=ማህበራዊ ወይም ፊስካል ታክስ
+SocialContributions=ማህበራዊ ወይም የፊስካል ግብሮች
+SocialContributionsDeductibles=የሚቀነሱ ማህበራዊ ወይም ፊስካል ታክሶች
+SocialContributionsNondeductibles=የማይቀነሱ ማህበራዊ ወይም ፊስካል ታክሶች
+DateOfSocialContribution=የማህበራዊ ወይም የፊስካል ታክስ ቀን
+LabelContrib=መሰየሚያ አስተዋጽዖ
+TypeContrib=መዋጮ ይተይቡ
+MenuSpecialExpenses=ልዩ ወጪዎች
+MenuTaxAndDividends=ግብሮች እና ክፍፍሎች
+MenuSocialContributions=ማህበራዊ/የገንዘብ ታክስ
+MenuNewSocialContribution=አዲስ የማህበራዊ/የፊስካል ታክስ
+NewSocialContribution=አዲስ ማህበራዊ/የፊስካል ታክስ
+AddSocialContribution=ማህበራዊ/የፋይስካል ታክስን ጨምር
+ContributionsToPay=ለመክፈል የማህበራዊ/የፋይናንስ ታክስ
+AccountancyTreasuryArea=የሂሳብ አያያዝ አካባቢ
+InvoicesArea=የክፍያ እና የክፍያ ቦታ
+NewPayment=አዲስ ክፍያ
+PaymentCustomerInvoice=የደንበኛ ደረሰኝ ክፍያ
+PaymentSupplierInvoice=የሻጭ ደረሰኝ ክፍያ
+PaymentSocialContribution=የማህበራዊ/የፋይናንስ ታክስ ክፍያ
+PaymentVat=የተጨማሪ እሴት ታክስ ክፍያ
+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=የተ.እ.ታ መግለጫዎች
+VATDeclaration=የተጨማሪ እሴት ታክስ መግለጫ
+VATRefund=የሽያጭ ታክስ ተመላሽ
+NewVATPayment=አዲስ የሽያጭ ታክስ ክፍያ
+NewLocalTaxPayment=አዲስ ግብር %s ክፍያ
+Refund=ተመላሽ ገንዘብ
+SocialContributionsPayments=የማህበራዊ/የፋይናንስ ታክስ ክፍያዎች
+ShowVatPayment=የተ.እ.ታ ክፍያን አሳይ
+TotalToPay=የሚከፈልበት ጠቅላላ
+BalanceVisibilityDependsOnSortAndFilters=ቀሪ ሂሳብ በዚህ ዝርዝር ውስጥ የሚታየው ሠንጠረዥ በ%s ላይ ከተደረደረ እና በ1 የባንክ አካውንት ላይ (ሌላ ማጣሪያ ከሌለው) ከተጣራ ብቻ ነው።
+CustomerAccountancyCode=የደንበኛ የሂሳብ ኮድ
+SupplierAccountancyCode=የአቅራቢ የሂሳብ ኮድ
+CustomerAccountancyCodeShort=ኩስት መለያ ኮድ
+SupplierAccountancyCodeShort=ሱፕ. መለያ ኮድ
+AccountNumber=መለያ ቁጥር
+NewAccountingAccount=አዲስ መለያ
+Turnover=የማዞሪያ ደረሰኝ ተከፍሏል።
+TurnoverCollected=ማዞሪያ ተሰብስቧል
+SalesTurnoverMinimum=ዝቅተኛ ማዞሪያ
+ByExpenseIncome=በወጪ እና ገቢ
+ByThirdParties=በሶስተኛ ወገኖች
+ByUserAuthorOfInvoice=በክፍያ መጠየቂያ ደራሲ
+CheckReceipt=የተቀማጭ ወረቀት
+CheckReceiptShort=የተቀማጭ ወረቀት
+LastCheckReceiptShort=የቅርብ ጊዜ %s የተቀማጭ ወረቀቶች
+LastPaymentForDepositShort=የቅርብ ጊዜ %s %s የተቀማጭ ወረቀቶች
+NewCheckReceipt=አዲስ ቅናሽ
+NewCheckDeposit=አዲስ የተቀማጭ ወረቀት
+NewCheckDepositOn=በሒሳብ ላይ ተቀማጭ የሚሆን ደረሰኝ ይፍጠሩ፡ %s
+NoWaitingChecks=ምንም ቼኮች ተቀማጭ የሚጠብቁ።
+NoWaitingPaymentForDeposit=ምንም የ%s ክፍያ ተቀማጭ የሚጠብቅ።
+DateChequeReceived=የመቀበያ ቀንን ያረጋግጡ
+DatePaymentReceived=የሰነድ መቀበያ ቀን
+NbOfCheques=የቼኮች ቁጥር
+PaySocialContribution=ማህበራዊ/ፋይስካል ታክስ ይክፈሉ።
+PayVAT=የተጨማሪ እሴት ታክስ መግለጫ ይክፈሉ።
+PaySalary=የደመወዝ ካርድ ይክፈሉ
+ConfirmPaySocialContribution=እርግጠኛ ነዎት ይህን ማህበራዊ ወይም ፊስካል ታክስ በሚከፈልበት መከፋፈል ይፈልጋሉ?
+ConfirmPayVAT=እርግጠኛ ነዎት ይህን የተጨማሪ እሴት ታክስ መግለጫ እንደተከፈለ መከፋፈል ይፈልጋሉ?
+ConfirmPaySalary=እርግጠኛ ነዎት ይህን የደመወዝ ካርድ በሚከፈልበት መከፋፈል ይፈልጋሉ?
+DeleteSocialContribution=የማህበራዊ ወይም የፊስካል ታክስ ክፍያን ሰርዝ
+DeleteVAT=የተጨማሪ እሴት ታክስ መግለጫን ሰርዝ
+DeleteSalary=የደመወዝ ካርድ ሰርዝ
+DeleteVariousPayment=የተለየ ክፍያ ሰርዝ
+ConfirmDeleteSocialContribution=እርግጠኛ ነዎት ይህን ማህበራዊ/ፋይስካል ታክስ ክፍያ መሰረዝ ይፈልጋሉ?
+ConfirmDeleteVAT=እርግጠኛ ነዎት ይህን የቫት መግለጫ መሰረዝ ይፈልጋሉ?
+ConfirmDeleteSalary=እርግጠኛ ነዎት ይህን ደሞዝ መሰረዝ ይፈልጋሉ?
+ConfirmDeleteVariousPayment=እርግጠኛ ነዎት ይህን የተለያየ ክፍያ መሰረዝ ይፈልጋሉ?
+ExportDataset_tax_1=ማህበራዊ እና የፊስካል ግብሮች እና ክፍያዎች
+CalcModeVATDebt=ሁነታ <b>%sተ.እ.ታ በቁርጠኝነት ሂሳብ%s=span><translate > </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.
+CalcModeDebt=የታወቁ የተመዘገቡ ሰነዶች ትንተና
+CalcModeEngagement=የታወቁ የተመዘገቡ ክፍያዎች ትንተና
+CalcModePayment=Analysis of known recorded payments
+CalcModeBookkeeping=በመፅሃፍ መዝገብ ሠንጠረዥ ውስጥ የጋዜጣ መረጃ ትንተና።
+CalcModeNoBookKeeping=ምንም እንኳን በሌድገር ውስጥ ገና ያልተመዘገቡ ቢሆኑም
 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>
+CalcModeLT1Debt=ሁነታ <b>%sበደንበኛ ደረሰኞች ላይ RE%s=0ecb2ec87f49fz0 = > </b>
+CalcModeLT1Rec= ሁነታ <b>%sRE በአቅራቢዎች ደረሰኞች ላይb0ecb2><ec87f49fezlate' > </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
+CalcModeLT2Debt=ሁነታ <b>%sIRPF በደንበኛ ደረሰኞች ላይ%s=0ecb2ec87f49fz0<span > </b></span>
+CalcModeLT2Rec= ሁነታ <b>%sIRPF በአቅራቢዎች ደረሰኞችb0ecb2><ec87f49fez0 </b></span>
+AnnualSummaryDueDebtMode=የገቢ እና ወጪዎች ሚዛን, አመታዊ ማጠቃለያ
+AnnualSummaryInputOutputMode=የገቢ እና ወጪዎች ሚዛን, አመታዊ ማጠቃለያ
+AnnualByCompanies=የገቢ እና ወጪዎች ሚዛን, አስቀድሞ በተገለጹ የሂሳብ ቡድኖች
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- 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
+SeeReportInInputOutputMode=<b>%sየክፍያዎች ትንተና%s='span><span' ክፍል ይመልከቱ ></b> በ<b>የተመዘገቡ ክፍያዎች</b> ላይ ለተመሰረተ ስሌት ምንም እንኳን በሌዘር ውስጥ ባይሆንም እስካሁን አልተደረጉም።
+SeeReportInDueDebtMode=<b>%sየተመዘገቡ ሰነዶችን ትንተና ይመልከቱ%s='span><span class ‹</b> በታወቀ <b>የተመዘገቡ ሰነዶች</b>ሌሎች ውስጥ ባይሆኑም እንኳ ለማስላት
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+RulesAmountWithTaxIncluded=- የሚታዩት መጠኖች ከሁሉም ግብሮች ጋር ተካትተዋል።
+RulesAmountWithTaxExcluded=- የታዩት የክፍያ መጠየቂያዎች መጠን ከሁሉም ግብሮች የተገለሉ ናቸው።
+RulesResultDue=- ሁሉንም ደረሰኞች፣ ወጭዎች፣ ተ.እ.ታ፣ ልገሳዎች፣ ደሞዞች፣ የሚከፈሉም ይሁኑ ያልተከፈሉ ያካትታል።<br>- ደረሰኞች በሚከፈልበት ቀን እና በክፍያ ቀን ላይ የተመሰረተ ነው. ወጪዎች ወይም የግብር ክፍያዎች. ለደሞዝ, ጊዜው የሚያበቃበት ቀን ጥቅም ላይ ይውላል.
+RulesResultInOut=- በክፍያ መጠየቂያ ደረሰኞች፣ ወጭዎች፣ ተ.እ.ታ እና ደሞዞች ላይ የተደረጉ እውነተኛ ክፍያዎችን ያካትታል። <br>- በክፍያ መጠየቂያዎች፣ ወጪዎች፣ ተ.እ.ታ፣ ልገሳዎች እና ደሞዞች መክፈያ ቀናት ላይ የተመሰረተ ነው።
+RulesCADue=- የተከፈለም ሆነ ያልተከፈለ የደንበኛ ክፍያ መጠየቂያ ደረሰኞችን ያጠቃልላል። <br>- በነዚህ ደረሰኞች የመክፈያ ቀን ላይ የተመሰረተ ነው።<br>
+RulesCAIn=- ከደንበኞች የተቀበሉትን የክፍያ መጠየቂያዎች ሁሉንም ውጤታማ ክፍያዎች ያካትታል።<br>- በነዚህ ደረሰኞች የክፍያ ቀን ላይ የተመሰረተ ነው<br>
+RulesCATotalSaleJournal=ከሽያጭ መጽሔት ሁሉንም የብድር መስመሮች ያካትታል።
+RulesSalesTurnoverOfIncomeAccounts=በቡድን ገቢ ውስጥ ለምርት መለያዎች (ክሬዲት - ዴቢት) መስመሮችን ያካትታል
+RulesAmountOnInOutBookkeepingRecord=በሂሳብ መዝገብዎ ውስጥ "EXPENSE" ወይም "ገቢ" ቡድን ካለው የሂሳብ መዝገብ ጋር መዝገብ ያካትታል
+RulesResultBookkeepingPredefined=በሂሳብ መዝገብዎ ውስጥ "EXPENSE" ወይም "ገቢ" ቡድን ካለው የሂሳብ መዝገብ ጋር መዝገብ ያካትታል
+RulesResultBookkeepingPersonalized=በሂሳብ መዝገብህ ውስጥ መዝገቡን ያሳያል <b>በግል በተበጁ ቡድኖች የተሰባሰበ</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=የተሰበሰበ እና የተከፈለ የደንበኛ ተ.እ.ታ ሪፖርት ያድርጉ
+VATReportByQuartersInInputOutputMode=የተሰበሰበው እና የተከፈለው የታክስ መጠን በሽያጭ ታክስ ሪፖርት ያድርጉ
+VATReportShowByRateDetails=የዚህን ተመን ዝርዝሮች አሳይ
+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.
-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 ?
+RulesVATInServices=- ለአገልግሎቶች, ሪፖርቱ በተከፈለበት ቀን መሰረት በትክክል የተቀበሉት ወይም የተከፈሉ ክፍያዎች ተ.እ.ታን ያካትታል.
+RulesVATInProducts=- ለቁሳዊ ንብረቶች, ሪፖርቱ በተከፈለበት ቀን መሰረት ተ.እ.ታን ያካትታል.
+RulesVATDueServices=- ለአገልግሎቶች፣ ሪፖርቱ በደረሰኝ ደረሰኝ ቀን ላይ በመመስረት የተከፈለ ወይም ያልተከፈለ የክፍያ መጠየቂያ ደረሰኞች ተ.እ.ታን ያካትታል።
+RulesVATDueProducts=- ለቁሳዊ ንብረቶች፣ ሪፖርቱ የክፍያ መጠየቂያ ደረሰኞችን ተ.እ.ታን ያካትታል፣ በደረሰኝ ደረሰኝ ቀን መሰረት።
+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=ጠቅላላ ተ.እ.ታን ለማስላት ሁለት ዘዴዎች አሉ<br>ዘዴ 1 በእያንዳንዱ መስመር ላይ ቫት እየጠጋጋ ነው፣ከዚያም ጠቅለል አድርጎላቸዋል።<br>ዘዴ 2 በእያንዳንዱ መስመር ላይ ያሉትን ሁሉንም ቫት እያጠቃለለ ነው፣ በመቀጠል ውጤቱን እየጠጋጋ ነው።<br>የመጨረሻው ውጤት ከጥቂት ሳንቲም ሊለያይ ይችላል። ነባሪው ሁነታ ሁነታ ነው <b>%s</b>።
+CalculationRuleDescSupplier=በሻጩ መሰረት፣ ተመሳሳዩን የስሌት ህግ ተግባራዊ ለማድረግ ተገቢውን ዘዴ ይምረጡ እና በአቅራቢዎ የሚጠበቀውን ተመሳሳይ ውጤት ያግኙ።
+TurnoverPerProductInCommitmentAccountingNotRelevant=በእያንዳንዱ ምርት የተሰበሰበ የተርን ኦቨር ሪፖርት አይገኝም። ይህ ሪፖርት የሚገኘው ለማዞሪያ ደረሰኝ ብቻ ነው።
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=በአንድ የሽያጭ ታክስ መጠን የተሰበሰበው የተርን ኦቨር ሪፖርት አይገኝም። ይህ ሪፖርት የሚገኘው ለማዞሪያ ደረሰኝ ብቻ ነው።
+CalculationMode=ስሌት ሁነታ
+AccountancyJournal=የሂሳብ ኮድ መጽሔት
+ACCOUNTING_VAT_SOLD_ACCOUNT=መለያ (ከመለያ ገበታ) በሽያጭ ላይ ለተጨማሪ እሴት ታክስ እንደ ነባሪ መለያ ጥቅም ላይ የሚውል (በተ.እ.ታ መዝገበ ቃላት ማዋቀር ላይ ካልተገለጸ ጥቅም ላይ ይውላል)
+ACCOUNTING_VAT_BUY_ACCOUNT=መለያ (ከመለያ ገበታ) በግዢዎች ላይ ለተጨማሪ እሴት ታክስ እንደ ነባሪ ሂሳብ የሚያገለግል (በተ.እ.ታ መዝገበ ቃላት ማዋቀር ላይ ካልተገለጸ ጥቅም ላይ ይውላል)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=በሽያጭ ላይ ላለው የገቢ ማህተም ጥቅም ላይ የሚውል መለያ (ከሂሳብ ሰንጠረዥ)
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=በግዢዎች ላይ ለገቢ ማህተም ጥቅም ላይ የሚውል መለያ (ከሂሳብ ሰንጠረዥ)
+ACCOUNTING_VAT_PAY_ACCOUNT=ተ.እ.ታ ለመክፈል እንደ ነባሪ ሂሳብ የሚያገለግል መለያ (ከሂሳብ ገበታ)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=መለያ (ከሂሳብ ገበታ) ለተጨማሪ ክፍያዎች (ክሬዲት) በሚደረጉ ግዢዎች ላይ ለተጨማሪ እሴት ታክስ እንደ ነባሪ ሂሳብ ያገለግላል።
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=መለያ (ከሂሣብ ገበታ) በግል ለሚደረጉ ክፍያዎች ግዢዎች ለተጨማሪ እሴት ታክስ እንደ ነባሪ መለያ ጥቅም ላይ ይውላል (ዴቢት)
+ACCOUNTING_ACCOUNT_CUSTOMER=መለያ (ከመለያ ገበታ) ለ "ደንበኛ" ሶስተኛ ወገኖች ጥቅም ላይ ይውላል
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=በሶስተኛ ወገን ካርድ ላይ የተገለጸው የወሰኑ የሂሳብ አካውንት ለ Subledger ሒሳብ ብቻ ጥቅም ላይ ይውላል። በሶስተኛ ወገን ላይ የተወሰነ የደንበኛ የሂሳብ አያያዝ መለያ ካልተገለጸ ይህ ለጄኔራል ሌድገር እና እንደ ነባሪ ዋጋ ለ Subledger ሂሳብ ስራ ላይ ይውላል።
+ACCOUNTING_ACCOUNT_SUPPLIER=ለ "ሻጭ" ሶስተኛ ወገኖች ጥቅም ላይ የዋለ መለያ (ከሂሳብ ሠንጠረዥ).
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=በሶስተኛ ወገን ካርድ ላይ የተገለጸው የወሰኑ የሂሳብ አካውንት ለ Subledger ሒሳብ ብቻ ጥቅም ላይ ይውላል። በሶስተኛ ወገን ላይ የተወሰነ የአቅራቢ የሂሳብ መዝገብ ካልተገለጸ ይህ ለጄኔራል ሌድገር እና እንደ ነባሪ ዋጋ ለ Subledger ሂሳብ ስራ ላይ ይውላል።
+ConfirmCloneTax=የማህበራዊ/የፋይስካል ታክስ ክሎኑን ያረጋግጡ
+ConfirmCloneVAT=የተጨማሪ እሴት ታክስ መግለጫ ክሎሉን ያረጋግጡ
+ConfirmCloneSalary=የደመወዝ ክሎኑን ያረጋግጡ
+CloneTaxForNextMonth=ለሚቀጥለው ወር ያጥፉት
+SimpleReport=ቀላል ዘገባ
+AddExtraReport=ተጨማሪ ሪፖርቶች (የውጭ እና የሀገር ውስጥ የደንበኞችን ሪፖርት ይጨምሩ)
+OtherCountriesCustomersReport=የውጭ ደንበኞች ሪፖርት
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=በሁለቱ የመጀመሪያ ፊደላት ላይ በመመስረት የቫት ቁጥሩ ከድርጅትዎ የአገር ኮድ የተለየ ነው።
+SameCountryCustomersWithVAT=ብሔራዊ ደንበኞች ሪፖርት
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=በሁለቱ የቫት ፊደሎች ላይ በመመስረት ከኩባንያዎ የአገር ኮድ ጋር ተመሳሳይ ነው።
+LinkedFichinter=ወደ ጣልቃገብነት ግንኙነት
+ImportDataset_tax_contrib=ማህበራዊ/የገንዘብ ታክስ
+ImportDataset_tax_vat=የቫት ክፍያዎች
+ErrorBankAccountNotFound=ስህተት፡ የባንክ ሂሳብ አልተገኘም።
+FiscalPeriod=የሂሳብ ጊዜ
+ListSocialContributionAssociatedProject=ከፕሮጀክቱ ጋር የተያያዙ የማህበራዊ አስተዋፅኦዎች ዝርዝር
+DeleteFromCat=ከሂሳብ ቡድን ያስወግዱ
+AccountingAffectation=የሂሳብ ስራ
+LastDayTaxIsRelatedTo=የክፍለ-ጊዜው የመጨረሻ ቀን ከግብር ጋር የተያያዘ ነው።
+VATDue=የሽያጭ ግብር ተጠየቀ
+ClaimedForThisPeriod=ለክፍለ-ጊዜው ይገባኛል
+PaidDuringThisPeriod=ለዚህ ጊዜ ተከፍሏል
+PaidDuringThisPeriodDesc=ይህ ከተጨማሪ እሴት ታክስ መግለጫዎች ጋር የተገናኙት የሁሉም ክፍያዎች ድምር ሲሆን እነዚህም በተመረጠው የቀን ክልል ውስጥ የፍጻሜ ቀን አላቸው
+ByVatRate=በሽያጭ የግብር መጠን
+TurnoverbyVatrate=በሽያጭ የግብር ተመን የተገኘ የትርፍ ደረሰኝ
+TurnoverCollectedbyVatrate=በሽያጭ የግብር ተመን የተሰበሰበ ትርፍ
+PurchasebyVatrate=በሽያጭ የግብር መጠን ይግዙ
+LabelToShow=አጭር መለያ
+PurchaseTurnover=የግዢ ማዞሪያ
+PurchaseTurnoverCollected=የግዢ ማዞሪያ ተሰብስቧል
+RulesPurchaseTurnoverDue=- ተከፈለም አልተከፈለም የአቅራቢውን የክፍያ መጠየቂያ ደረሰኞች ያካትታል። <br>- በነዚህ ደረሰኞች የክፍያ መጠየቂያ ቀን ላይ የተመሰረተ ነው።<br>
+RulesPurchaseTurnoverIn=- ለአቅራቢዎች የሚደረጉትን ሁሉንም ውጤታማ የክፍያ መጠየቂያ ክፍያዎች ያካትታል።<br>- በነዚህ ደረሰኞች የመክፈያ ቀን ላይ የተመሰረተ ነው<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=ከግዢ መጽሔት ሁሉንም የዴቢት መስመሮችን ያካትታል.
+RulesPurchaseTurnoverOfExpenseAccounts=በቡድን EXPENSE ውስጥ ለምርት መለያዎች (ዴቢት - ክሬዲት) መስመሮችን ያካትታል
+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 የተመረጡ መስመሮችን ከዚህ የሂሳብ ኮድ ጋር አስቀድመው መምረጥ ይፈልጋሉ?
+AmountPaidMustMatchAmountOfDownPayment=የተከፈለው መጠን ከቅድመ ክፍያ መጠን ጋር መዛመድ አለበት።
diff --git a/htdocs/langs/am_ET/contracts.lang b/htdocs/langs/am_ET/contracts.lang
index 1f3526bd994..2faee1ade06 100644
--- a/htdocs/langs/am_ET/contracts.lang
+++ b/htdocs/langs/am_ET/contracts.lang
@@ -1,104 +1,107 @@
 # 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?
+ContractsArea=የኮንትራቶች አካባቢ
+ListOfContracts=የኮንትራቶች ዝርዝር
+AllContracts=ሁሉም ኮንትራቶች
+ContractCard=ውል
+ContractStatusNotRunning=እየሮጠ አይደለም
+ContractStatusDraft=ረቂቅ
+ContractStatusValidated=ተረጋግጧል
+ContractStatusClosed=ዝግ
+ServiceStatusInitial=እየሮጠ አይደለም
+ServiceStatusRunning=መሮጥ
+ServiceStatusNotLate=መሮጥ፣ ጊዜው አላበቃም።
+ServiceStatusNotLateShort=ጊዜው አላበቃም።
+ServiceStatusLate=መሮጥ፣ ጊዜው አልፎበታል።
+ServiceStatusLateShort=ጊዜው አልፎበታል።
+ServiceStatusClosed=ዝግ
+ShowContractOfService=የአገልግሎት ውል አሳይ
+Contracts=ኮንትራቶች
+ContractsSubscriptions=ኮንትራቶች / የደንበኝነት ምዝገባዎች
+ContractsAndLine=ኮንትራቶች እና የኮንትራቶች መስመር
+Contract=ውል
+ContractLine=የኮንትራት መስመር
+ContractLines=የኮንትራት መስመሮች
+Closing=መዝጋት
+NoContracts=ምንም ኮንትራቶች የሉም
+MenuServices=አገልግሎቶች
+MenuInactiveServices=አገልግሎቶች ንቁ አይደሉም
+MenuRunningServices=የሩጫ አገልግሎቶች
+MenuExpiredServices=የአገልግሎት ጊዜያቸው ያለፈባቸው
+MenuClosedServices=የተዘጉ አገልግሎቶች
+NewContract=አዲስ ውል
+NewContractSubscription=አዲስ ውል ወይም የደንበኝነት ምዝገባ
+AddContract=ውል ይፍጠሩ
+DeleteAContract=ውል ሰርዝ
+ActivateAllOnContract=ሁሉንም አገልግሎቶች ያግብሩ
+CloseAContract=ውል ዝጋ
+ConfirmDeleteAContract=እርግጠኛ ነዎት ይህን ውል እና ሁሉንም አገልግሎቶቹን መሰረዝ ይፈልጋሉ?
 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
+ConfirmActivateAllOnContract=ይህ ሁሉንም አገልግሎቶች ይከፍታል (ገና ንቁ ያልሆነ)። እርግጠኛ ነዎት ሁሉንም አገልግሎቶች መክፈት ይፈልጋሉ?
+ConfirmCloseContract=ይህ ሁሉንም አገልግሎቶች ይዘጋዋል (ጊዜው ያለፈበት ወይም አይደለም)። እርግጠኛ ነዎት ይህን ውል መዝጋት ይፈልጋሉ?
+ConfirmCloseService=እርግጠኛ ነዎት ይህን አገልግሎት በቀን <b>%s</b></b>s ?
+ValidateAContract=ውልን ያረጋግጡ
+ActivateService=አገልግሎትን አንቃ
 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
+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 (አገልግሎት %s)
+ExpiredSince=የመጠቀሚያ ግዜ
+NoExpiredServices=ምንም የአገልግሎት ጊዜ ያለፈባቸው አገልግሎቶች የሉም
+ListOfServicesToExpireWithDuration=በ%s ቀናት ውስጥ ጊዜው የሚያበቃው የአገልግሎቶች ዝርዝር
+ListOfServicesToExpireWithDurationNeg=የአገልግሎቶች ዝርዝር ከ%s ቀናት በላይ ጊዜው አልፎበታል።
+ListOfServicesToExpire=የአገልግሎት ጊዜው የሚያበቃበት ዝርዝር
+NoteListOfYourExpiredServices=ይህ ዝርዝር እንደ የሽያጭ ተወካይ ከተያያዙት የሶስተኛ ወገኖች የኮንትራት አገልግሎት ብቻ ይዟል።
+StandardContractsTemplate=መደበኛ ኮንትራቶች አብነት
+ContactNameAndSignature=ለ%s ስም እና ፊርማ፡-
+OnlyLinesWithTypeServiceAreUsed=የ"አገልግሎት" አይነት ያላቸው መስመሮች ብቻ ይዘጋሉ።
+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=የተዘጉ አገልግሎቶችን ደብቅ
+UserStartingService=የተጠቃሚ መነሻ አገልግሎት
+UserClosingService=የተጠቃሚ መዝጊያ አገልግሎት
diff --git a/htdocs/langs/am_ET/cron.lang b/htdocs/langs/am_ET/cron.lang
index 4fd2220dea6..d95e57e6449 100644
--- a/htdocs/langs/am_ET/cron.lang
+++ b/htdocs/langs/am_ET/cron.lang
@@ -1,91 +1,100 @@
 # 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
+# Permissions
+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=ዩአርኤል ለመፈተሽ እና ብቁ የሆኑ የክሮን ስራዎችን ከአሳሽ ለማስጀመር
+OrToLaunchASpecificJob=ወይም ከአሳሽ አንድ የተወሰነ ሥራ ለመፈተሽ እና ለመጀመር
+KeyForCronAccess=የክሮን ስራዎችን ለመጀመር የዩአርኤል የደህንነት ቁልፍ
+FileToLaunchCronJobs=ብቁ የሆኑ ክሮን ስራዎችን ለመፈተሽ እና ለመጀመር የትእዛዝ መስመር
+CronExplainHowToRunUnix=በዩኒክስ አካባቢ የትእዛዝ መስመሩን በየ 5 ደቂቃው ለማስኬድ የሚከተለውን ክሮንታብ ግቤት መጠቀም አለቦት
+CronExplainHowToRunWin=በማይክሮሶፍት(tm) ዊንዶውስ አካባቢ በየ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>
+CronAdd= ስራዎችን ያክሉ
+CronEvery=እያንዳንዱን ሥራ ያከናውኑ
+CronObject=ምሳሌ/ የሚፈጠር ነገር
+CronArgs=መለኪያዎች
+CronSaveSucess=በተሳካ ሁኔታ አስቀምጥ
+CronNote=አስተያየት
+CronFieldMandatory=መስኮች %s ግዴታ ነው
+CronErrEndDateStartDt=የማለቂያ ቀን ከመጀመሪያው ቀን በፊት ሊሆን አይችልም
+StatusAtInstall=በሞጁል ጭነት ላይ ያለ ሁኔታ
+CronStatusActiveBtn=መርሐግብርን አንቃ
+CronStatusInactiveBtn=አሰናክል
+CronTaskInactive=ይህ ሥራ ተሰናክሏል (በእቅድ አልተያዘም)
+CronId=መታወቂያ
+CronClassFile=የፋይል ስም ከክፍል ጋር
+CronModuleHelp=የዶሊባርር ሞጁል ማውጫ ስም (እንዲሁም ከውጫዊ Dolibarr ሞጁል ጋር ይሰራል)። <BR> ለምሳሌ የዶሊባርር ምርት ነገር /htdocs/<u>ምርትb0dca48 ለመደወል /class/product.class.php፣ የሞጁሉ ዋጋ<br><i>ምርት ነው</i>
+CronClassFileHelp=የሚጫኑበት አንጻራዊ ዱካ እና የፋይል ስም (ዱካ ከድር አገልጋይ ስርወ ማውጫ አንጻራዊ ነው)። <BR> ለምሳሌ የዶሊባርር ምርት ነገር htdocs/product/class/<u>product.class.php<span>ምርት.class.php</u>፣ የክፍል ፋይል ስም ዋጋ<br><i>ምርት/ክፍል ነው .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
+CronMethodHelp=ለማስጀመር የነገር ዘዴ። <BR> ለምሳሌ የዶሊባርር ምርት ነገር /htdocs/product/class/product.class.php የማምጣት ዘዴን ለመጥራት የስልት ዋጋው ነው። <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 parameters can be<br><i>0, ProductRef</i>
+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=የ PHP ክፍል የጥሪ ዘዴ
+CronType_command=የሼል ትዕዛዝ
+CronCannotLoadClass=የክፍል ፋይልን መጫን አልተቻለም %s (ክፍል %s ለመጠቀም)
+CronCannotLoadObject=የክፍል ፋይል %s ተጭኗል፣ ነገር ግን %s አልተገኘም
+UseMenuModuleToolsToAddCronJobs=ወደ ሜኑ ይሂዱ "<a href="%s">ቤት - የአስተዳዳሪ መሳሪያዎች - የታቀዱ ስራዎችን ለማየት እና ለማረም</a>"
+JobDisabled=ሥራ ተወግዷል
+MakeLocalDatabaseDumpShort=የአካባቢ የውሂብ ጎታ ምትኬ
+MakeLocalDatabaseDump=የአካባቢ የመረጃ ቋት ፍጠር። መለኪያዎች፡ መጭመቅ ('gz' ወይም 'bz' or 'none')፣ የመጠባበቂያ አይነት ('mysql'፣ 'pgsql'፣ 'auto')፣ 1፣ 'auto' ወይም filename to build፣ የሚቀመጡ የመጠባበቂያ ፋይሎች ብዛት ናቸው።
+MakeSendLocalDatabaseDumpShort=የአካባቢ የውሂብ ጎታ ምትኬን ይላኩ።
+MakeSendLocalDatabaseDump=የአካባቢያዊ የውሂብ ጎታ ምትኬን በኢሜል ይላኩ። ልኬቶች፡ ከ፣ ከ ርዕሰ ጉዳይ፣ መልእክት፣ የፋይል ስም (የተላከው ፋይል ስም) ማጣሪያ ('sql' ለዳታቤዝ መጠባበቂያ ብቻ)
+BackupIsTooLargeSend=ይቅርታ፣ የመጨረሻው የመጠባበቂያ ፋይል በኢሜይል ለመላክ በጣም ትልቅ ነው።
+CleanUnfinishedCronjobShort=ያልተጠናቀቀ ክሮንጆብን አጽዳ
+CleanUnfinishedCronjob=ሂደቱ በማይሰራበት ጊዜ በማቀነባበር ላይ የተጣበቀ ክሮንጆብን ያጽዱ
+WarningCronDelayed=ትኩረት፣ ለአፈጻጸም ዓላማ፣ የነቁ ስራዎች የሚፈጸሙበት የሚቀጥለው ቀን ምንም ይሁን ምን ስራዎችዎ ከመሮጥዎ በፊት ቢበዛ እስከ %s ሰዓታት ሊዘገዩ ይችላሉ።
+DATAPOLICYJob=የውሂብ ማጽጃ እና ማንነት የማያሳውቅ
+JobXMustBeEnabled=ስራ %s መንቃት አለበት
+EmailIfError=ለስህተት ማስጠንቀቂያ ኢሜይል ያድርጉ
+JobNotFound=ስራ %s በስራዎች ዝርዝር ውስጥ አልተገኘም (ሞጁሉን ለማሰናከል/የነቃ)
+ErrorInBatch=ስራውን ሲሰራ ስህተት %s
+
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=ለመጨረሻ ጊዜ የተከናወነው የታቀደ ሥራ
+NextScheduledJobExecute=ቀጣይ መርሐግብር የተያዘለት ሥራ ለማስፈጸም
+NumberScheduledJobError=በስህተት የታቀዱ ስራዎች ብዛት
+NumberScheduledJobNeverFinished=የታቀዱ ሥራዎች ብዛት አላለቀም።
diff --git a/htdocs/langs/am_ET/deliveries.lang b/htdocs/langs/am_ET/deliveries.lang
index cd8a36e6c70..9d10bc21fb1 100644
--- a/htdocs/langs/am_ET/deliveries.lang
+++ b/htdocs/langs/am_ET/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
+Delivery=ማድረስ
+DeliveryRef=ማጣቀሻ መላኪያ
+DeliveryCard=የአክሲዮን ደረሰኝ
+DeliveryOrder=የመላኪያ ደረሰኝ
+DeliveryDate=መላኪያ ቀን
+CreateDeliveryOrder=የመላኪያ ደረሰኝ ይፍጠሩ
+DeliveryStateSaved=የማስረከቢያ ሁኔታ ተቀምጧል
+SetDeliveryDate=የመላኪያ ቀን ያዘጋጁ
+ValidateDeliveryReceipt=የመላኪያ ደረሰኝ ያረጋግጡ
+ValidateDeliveryReceiptConfirm=እርግጠኛ ነዎት ይህን የመላኪያ ደረሰኝ ማረጋገጥ ይፈልጋሉ?
+DeleteDeliveryReceipt=የመላኪያ ደረሰኝ ሰርዝ
 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
+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/am_ET/dict.lang b/htdocs/langs/am_ET/dict.lang
index ec315d97142..94ee0b6d67d 100644
--- a/htdocs/langs/am_ET/dict.lang
+++ b/htdocs/langs/am_ET/dict.lang
@@ -1,359 +1,362 @@
 # 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=Ivoiry 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=ቅዱስ ማርቲን
+CountryXK=ኮሶቮ
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=ወይዘሮ.
+CivilityMMEShort=ወይዘሮ.
+CivilityMR=ለ አቶ
+CivilityMRShort=ለ አቶ
+CivilityMLE=ወይዘሪት.
+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
-CurrencyXAF=CFA Francs BEAC
-CurrencySingXAF=CFA Franc BEAC
-CurrencyXOF=CFA Francs BCEAO
-CurrencySingXOF=CFA Franc BCEAO
-CurrencyXPF=CFP Francs
-CurrencySingXPF=CFP Franc
-CurrencyCentEUR=cents
-CurrencyCentSingEUR=cent
+Currencyeuros=ዩሮ
+CurrencyAUD=AU ዶላር
+CurrencySingAUD=AU ዶላር
+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=ሴኤፍአ ፍራንክ BEAC
+CurrencySingXAF=ሴኤፍአ ፍራንክ ቤኤክ
+CurrencyXOF=ሴኤፍአ ፍራንክ BCEAO
+CurrencySingXOF=ሴኤፍአ ፍራንክ BEAO
+CurrencyXPF=ሲኤፍፒ ፍራንክ
+CurrencySingXPF=ሲኤፍፒ ፍራንክ
+CurrencyCentEUR=ሳንቲም
+CurrencyCentSingEUR=መቶ
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+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=ቅርጸት አስፈፃሚ ዩኤስ
+PaperFormatUSLEDGER=ቅርጸት Ledger/Tabloid
+PaperFormatCAP1=ቅርጸት P1 ካናዳ
+PaperFormatCAP2=ቅርጸት P2 ካናዳ
+PaperFormatCAP3=ቅርጸት P3 ካናዳ
+PaperFormatCAP4=ቅርጸት P4 ካናዳ
+PaperFormatCAP5=ቅርጸት P5 ካናዳ
+PaperFormatCAP6=ቅርጸት P6 ካናዳ
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=መኪና
+ExpCycloCat=ሞፔድ
+ExpMotoCat=ሞተርሳይክል
 ExpAuto3CV=3 CV
-ExpAuto4CV=4 CV
+ExpAuto4CV=4 ሲቪ
 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
+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 ሲቪ እና ሌሎችም።
+ExpAuto7PCV=7 CV እና ሌሎችም።
+ExpAuto8PCV=8 ሲቪ እና ሌሎችም።
+ExpAuto9PCV=9 CV እና ሌሎችም።
+ExpAuto10PCV=10 ሲቪ እና ሌሎችም።
+ExpAuto11PCV=11 ሲቪ እና ሌሎችም።
+ExpAuto12PCV=12 CV እና ሌሎችም።
+ExpAuto13PCV=13 CV እና ሌሎችም።
+ExpCyclo=አቅም እስከ 50 ሴ.ሜ.3
+ExpMoto12CV=ሞተርሳይክል 1 ወይም 2 ሲ.ቪ
+ExpMoto345CV=ሞተር ብስክሌት 3, 4 ወይም 5 CV
+ExpMoto5PCV=ሞተርሳይክል 5 ሲቪ እና ሌሎችም።
diff --git a/htdocs/langs/am_ET/donations.lang b/htdocs/langs/am_ET/donations.lang
index fc725495c27..09daaca69b7 100644
--- a/htdocs/langs/am_ET/donations.lang
+++ b/htdocs/langs/am_ET/donations.lang
@@ -31,6 +31,7 @@ DONATION_ART200=የሚያሳስብዎት ከሆነ ከ CGI አንቀጽ 200 ያ
 DONATION_ART238=የሚያሳስብዎት ከሆነ ከ CGI አንቀጽ 238 ን አሳይ
 DONATION_ART978=የሚያሳስብዎት ከሆነ ከ CGI አንቀጽ 978 አሳይ
 DonationPayment=የልገሳ ክፍያ
+DonationPayments=Donation payments
 DonationValidated=ልገሳ %s የተረጋገጠ
 DonationUseThirdparties=የነባር የሶስተኛ ወገን አድራሻን እንደ ለጋሹ አድራሻ ይጠቀሙ
 DonationsStatistics=የልገሳ ስታቲስቲክስ
diff --git a/htdocs/langs/am_ET/ecm.lang b/htdocs/langs/am_ET/ecm.lang
index 494a6c55164..5d479b5ed7f 100644
--- a/htdocs/langs/am_ET/ecm.lang
+++ b/htdocs/langs/am_ET/ecm.lang
@@ -1,49 +1,56 @@
 # 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=የግል አውቶማቲክ ዛፍ
+ECMSectionsMedias=የህዝብ ዛፍ
+ECMSections=ማውጫዎች
+ECMRoot=ECM ስርወ
+ECMNewSection=አዲስ ማውጫ
+ECMAddSection=ማውጫ ያክሉ
+ECMCreationDate=የተፈጠረበት ቀን
+ECMNbOfFilesInDir=በማውጫው ውስጥ ያሉ የፋይሎች ብዛት
+ECMNbOfSubDir=የንዑስ ማውጫዎች ብዛት
+ECMNbOfFilesInSubDir=በንዑስ ማውጫዎች ውስጥ ያሉ የፋይሎች ብዛት
+ECMCreationUser=ፈጣሪ
+ECMArea=DMS/ECM አካባቢ
+ECMAreaDesc=የዲኤምኤስ/ኢሲኤም (የሰነድ አስተዳደር ስርዓት / የኤሌክትሮኒክስ ይዘት አስተዳደር) አካባቢ በዶሊባርር ውስጥ ሁሉንም ዓይነት ሰነዶች በፍጥነት እንዲያስቀምጡ ፣ እንዲያጋሩ እና እንዲፈልጉ ይፈቅድልዎታል።
+ECMAreaDesc2a=* የዛፍ መዋቅር ነፃ ድርጅት ጋር ሰነዶችን ለማስቀመጥ በእጅ ማውጫዎች መጠቀም ይቻላል.
+ECMAreaDesc2b=* ከኤለመንቱ ገጽ ላይ ሰነዶችን ሲጨምሩ አውቶማቲክ ማውጫዎች በራስ-ሰር ይሞላሉ።
+ECMAreaDesc3=* ይፋዊ ማውጫዎች በንኡስ ማውጫው ውስጥ ያሉ ፋይሎች ናቸው <b>/medias</b> የሰነዶች ማውጫ ውስጥ ያሉ ሁሉም ሰው ሊነበብ እና መግባት አያስፈልግም እና ፋይሉን በግልፅ ማጋራት አያስፈልግም። ለምሳሌ ለኢሜል ወይም ለድር ጣቢያ ሞጁል የምስል ፋይሎችን ለማከማቸት ይጠቅማል።
+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 ሞጁል ውጪ የተፈጠረ ወይም የተሻሻለ ይመስላል። የዚህን ማውጫ ይዘት ለማግኘት ዲስክ እና ዳታቤዝ ለማመሳሰል መጀመሪያ የ"ዳግም አስምር" የሚለውን ቁልፍ ጠቅ ማድረግ አለቦት።
+ReSyncListOfDir=የማውጫዎችን ዝርዝር ዳግም አስምር
+HashOfFileContent=የፋይል ይዘት Hash
+NoDirectoriesFound=ምንም ማውጫዎች አልተገኙም።
+FileNotYetIndexedInDatabase=ፋይል ገና ወደ ዳታቤዝ አልተጠቆመም (እንደገና ለመጫን ይሞክሩ)
+ExtraFieldsEcmFiles=Extrafields Ecm ፋይሎች
+ExtraFieldsEcmDirectories=Extrafields Ecm ማውጫዎች
+ECMSetup=ECM ማዋቀር
+GenerateImgWebp=ሁሉንም ምስሎች በሌላ ስሪት በ.webp ቅርጸት ያባዙ
+ConfirmGenerateImgWebp=ካረጋገጡ፣ በአሁኑ ጊዜ ወደዚህ አቃፊ ውስጥ ላሉ ምስሎች ሁሉ በድር ፒ ቅርጸት ምስል ያመነጫሉ (ንዑስ አቃፊዎች አልተካተቱም፣ የዌብፕ ምስሎች መጠኑ ከዋናው በላይ ከሆነ አይፈጠሩም)...
+ConfirmImgWebpCreation=ሁሉንም ምስሎች ማባዛትን ያረጋግጡ
+GenerateChosenImgWebp=የተመረጠውን ምስል ከሌላ ስሪት ከ.webp ቅርጸት ጋር ያባዙ
+ConfirmGenerateChosenImgWebp=ካረጋገጡ፣ ምስልን በ.webp ቅርጸት ለምስሉ ያመነጫሉ %s
+ConfirmChosenImgWebpCreation=የተመረጡ ምስሎችን ማባዛትን ያረጋግጡ
+SucessConvertImgWebp=ምስሎች በተሳካ ሁኔታ ተባዝተዋል።
+SucessConvertChosenImgWebp=የተመረጠው ምስል በተሳካ ሁኔታ ተባዝቷል።
+ECMDirName=ዲር ስም
+ECMParentDirectory=የወላጅ ማውጫ
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 6d9dfd4bacd..76239dacf12 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -15,8 +15,12 @@ ErrorGroupAlreadyExists=ቡድን %s አስቀድሞ አለ።
 ErrorEmailAlreadyExists=ኢሜይል %s አስቀድሞ አለ።
 ErrorRecordNotFound=መዝገብ አልተገኘም።
 ErrorRecordNotFoundShort=አልተገኘም
+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=ፋይል '<b>%s</b>' ማስወገድ አልተሳካም።
 ErrorFailToCreateFile=ፋይል መፍጠር አልተሳካም '<b>%s</b>'።
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=ማውጫ '<b>%s</b>' ማውጫ መፍጠር አልተሳካም።
 ErrorFailToDeleteDir=ማውጫ '<b>%s</b>' መሰረዝ አልተሳካም።
 ErrorFailToMakeReplacementInto=በፋይል '<b>%s</b>' ፋይል ማድረግ አልተሳካም።
@@ -47,6 +51,7 @@ ErrorBadDateFormat=እሴት %s የተሳሳተ የቀን ቅርጸት አለው
 ErrorWrongDate=ቀኑ ትክክል አይደለም!
 ErrorFailedToWriteInDir=ማውጫ %s ውስጥ መጻፍ አልተሳካም
 ErrorFailedToBuildArchive=የማህደር ፋይል %s መገንባት አልተሳካም
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=ተጠቃሚ ሊሰረዝ አይችልም። ምናልባት ከዶሊባርር አካላት ጋር የተያያዘ ሊሆን ይችላል.
 ErrorFieldsRequired=አንዳንድ አስፈላጊ መስኮች ባዶ ቀርተዋል።
 ErrorSubjectIsRequired=የኢሜል ርዕሰ ጉዳይ ያስፈልጋል
@@ -76,6 +81,7 @@ ErrorNoValueForRadioType=እባክዎ ለሬዲዮ ዝርዝር ዋጋ ይሙሉ
 ErrorBadFormatValueList=የዝርዝሩ እሴት ከአንድ በላይ ነጠላ ሰረዝ ሊኖረው አይችልም፡ <u>%s</u>, ግን ቢያንስ አንድ ያስፈልግዎታል: ቁልፍ ፣ እሴት
 ErrorFieldCanNotContainSpecialCharacters=መስኩ <b>%s</b> ልዩ ቁምፊዎችን መያዝ የለበትም።
 ErrorFieldCanNotContainSpecialNorUpperCharacters=መስኩ <b>%s</b> ልዩ ቁምፊዎችን መያዝ የለበትም ቁምፊዎች፣ እና በፊደል ፊደል (a-z) መጀመር አለበት።
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
 ErrorNoAccountancyModuleLoaded=ምንም የሂሳብ ሞጁል አልነቃም።
 ErrorExportDuplicateProfil=ይህ የመገለጫ ስም አስቀድሞ ለዚህ ወደ ውጭ መላኪያ ስብስብ አለ።
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP ማዛመድ አልተጠናቀቀም።
@@ -88,7 +94,11 @@ ErrorRecordIsUsedCantDelete=መዝገብ መሰረዝ አልተቻለም። አ
 ErrorModuleRequireJavascript=ይህ ባህሪ እንዲሰራ JavaScript መሰናከል የለበትም። ጃቫ ስክሪፕትን ለማንቃት/ለማሰናከል ወደ ሜኑ መነሻ->ማዋቀር->ማሳያ ይሂዱ።
 ErrorPasswordsMustMatch=ሁለቱም የተተየቡ የይለፍ ቃሎች እርስ በእርስ መመሳሰል አለባቸው
 ErrorContactEMail=የቴክኒክ ስህተት ተከስቷል። እባኮትን ለሚከተለው ኢሜል አስተዳዳሪን ያግኙ <b>%s</b>እና ስህተቱን ያቅርቡ code <b>%s</b>በመልዕክትህ ውስጥ ወይም ስክሪን ኮፒ ጨምር። ይህ ገጽ.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorHtmlInjectionForField=መስክ <b>%s</b>= እሴቱ '<slate' '><b></span>%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
+ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
 ErrorsOnXLines=%s ስህተቶች ተገኝተዋል
 ErrorFileIsInfectedWithAVirus=የጸረ-ቫይረስ ፕሮግራሙ ፋይሉን ማረጋገጥ አልቻለም (ፋይሉ በቫይረስ ሊጠቃ ይችላል)
 ErrorFileIsAnInfectedPDFWithJSInside=ፋይሉ በውስጡ በአንዳንድ ጃቫ ስክሪፕት የተበከለ ፒዲኤፍ ነው።
@@ -209,6 +219,7 @@ ErrorPhpMailDelivery=በጣም ብዙ የተቀባዮችን ቁጥር እንደ
 ErrorUserNotAssignedToTask=ተጠቃሚው የሚፈጀውን ጊዜ ማስገባት እንዲችል ለተግባር መመደብ አለበት።
 ErrorTaskAlreadyAssigned=ተግባር አስቀድሞ ለተጠቃሚ ተሰጥቷል።
 ErrorModuleFileSeemsToHaveAWrongFormat=የሞጁሉ ጥቅል የተሳሳተ ቅርጸት ያለው ይመስላል።
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=የሞጁሉ ጥቅል ስም (<strong>%s</strong> አይመሳሰልም የሚጠበቀው ስም አገባብ፡ <strong>%s</strong>
 ErrorDuplicateTrigger=ስህተት፣ የተባዛ የማስነሻ ስም %s። ቀድሞውንም ከ%s ተጭኗል።
 ErrorNoWarehouseDefined=ስህተት፣ ምንም መጋዘኖች አልተገለጹም።
@@ -249,9 +260,12 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=ለዚህ ሎጥ/ተከታ
 ErrorOnlyOneFieldForGroupByIsPossible=ለ'ግሩፕ በ' 1 መስክ ብቻ ይቻላል (ሌሎች ይጣላሉ)
 ErrorTooManyDifferentValueForSelectedGroupBy=በጣም ብዙ የተለያዩ እሴቶች ተገኝተዋል (ከ<b>%s</b> ለ) መስክ '<b>%s</b>' ስለዚህ ልንጠቀምበት አንችልም። ለግራፊክስ እንደ 'ቡድን'። መስክ 'Group By' ተወግዷል። እንደ X-Axis ሊጠቀሙበት ይፈልጉ ይሆናል?
 ErrorReplaceStringEmpty=ስህተት፣ የሚተካው ሕብረቁምፊ ባዶ ነው።
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=ስህተት፣ ምርት '<b>%s</b>ዕጣ አይቀበልም ተከታታይ ቁጥር
 ErrorFailedToReadObject=ስህተት፣ የነገር አይነት ማንበብ አልተሳካም <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=ስህተት፣ ይህ መግቢያ ከትክክለኛው የቀን ክልል ውጭ ነው።
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=<b>%s</b> የሚለው ቃል የተያዘ ቁልፍ ቃል ነው።
 ErrorFilenameReserved=የፋይል ስም <b>%s</b> ጥቅም ላይ ሊውል አይችልም. የተጠበቀ እና የተጠበቀ ትእዛዝ.
 ErrorNotAvailableWithThisDistribution=በዚህ ስርጭት አይገኝም
@@ -323,6 +337,7 @@ WarningParamUploadMaxFileSizeHigherThanPostMaxSize=የእርስዎ ፒኤችፒ
 WarningPasswordSetWithNoAccount=ለዚህ አባል የይለፍ ቃል ተቀናብሯል። ሆኖም የተጠቃሚ መለያ አልተፈጠረም። ስለዚህ ይህ የይለፍ ቃል ተከማችቷል ነገር ግን ወደ ዶሊባርር ለመግባት መጠቀም አይቻልም። በውጫዊ ሞጁል/በይነገጽ ጥቅም ላይ ሊውል ይችላል ነገር ግን ለአባል ምንም አይነት መግቢያም ሆነ የይለፍ ቃል መግለጽ ካላስፈለገዎት ከአባላት ሞጁል ቅንብር "ለእያንዳንዱ አባል መግቢያን ያስተዳድሩ" የሚለውን አማራጭ ማሰናከል ይችላሉ። መግቢያን ማስተዳደር ከፈለጉ ነገር ግን ምንም የይለፍ ቃል የማይፈልጉ ከሆነ ይህንን ማስጠንቀቂያ ለማስወገድ ይህንን መስክ ባዶ ማቆየት ይችላሉ። ማሳሰቢያ፡ አባሉ ከተጠቃሚ ጋር የተገናኘ ከሆነ ኢሜል እንደ መግቢያ መጠቀምም ይችላል።
 WarningMandatorySetupNotComplete=ዋና መለኪያዎችን ለማዘጋጀት እዚህ ጠቅ ያድርጉ
 WarningEnableYourModulesApplications=የእርስዎን ሞጁሎች እና መተግበሪያዎች ለማንቃት እዚህ ጠቅ ያድርጉ
+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=ይህ ርዕስ ወይም ይህ ኢላማ (ዩአርኤል) ያለው ዕልባት አስቀድሞ አለ።
 WarningPassIsEmpty=ማስጠንቀቂያ፣ የውሂብ ጎታ ይለፍ ቃል ባዶ ነው። ይህ የደህንነት ጉድጓድ ነው. ይህንን ለማንፀባረቅ የይለፍ ቃል ወደ የውሂብ ጎታዎ ማከል እና የእርስዎን conf.php ፋይል መለወጥ አለብዎት።
 WarningConfFileMustBeReadOnly=ማስጠንቀቂያ፣ የእርስዎ የማዋቀር ፋይል (<b>htdocs/conf/conf.php</b>) በድር አገልጋይ ሊገለበጥ ይችላል። ይህ ከባድ የደህንነት ጉድጓድ ነው. በድር አገልጋይ ለሚጠቀመው የስርዓተ ክወና ተጠቃሚ የፋይል ፈቃዶችን በንባብ ብቻ ሁነታ ላይ ቀይር። ለዲስክዎ ዊንዶውስ እና ፋት (FAT) ቅርፀትን የሚጠቀሙ ከሆነ ይህ የፋይል ስርዓት በፋይል ላይ ፍቃዶችን ለመጨመር እንደማይፈቅድ ማወቅ አለብዎት ስለዚህ ሙሉ በሙሉ ደህንነቱ የተጠበቀ ሊሆን አይችልም.
@@ -334,11 +349,13 @@ WarningCloseAlways=ማስጠንቀቂያ፣ መጠኑ በምንጭ እና በዒ
 WarningUsingThisBoxSlowDown=ማስጠንቀቂያ፣ ይህን ሳጥን በመጠቀም ሳጥኑን የሚያሳዩ ሁሉንም ገጾች በቁም ነገር ይቀንሱ።
 WarningClickToDialUserSetupNotComplete=ለተጠቃሚዎ የ ClickToDial መረጃ ማዋቀር አልተጠናቀቀም (በተጠቃሚ ካርድዎ ላይ ጠቅ ለማድረግ ጠቅ ያድርጉ)።
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=የማሳያ ማዋቀር ለዓይነ ስውራን ወይም ለጽሑፍ አሳሾች ሲመቻች ባህሪው ተሰናክሏል።
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=በጣም ብዙ ውሂብ (ከ%s መስመሮች በላይ)። እባክዎ ተጨማሪ ማጣሪያዎችን ይጠቀሙ ወይም ቋሚውን %s ወደ ከፍተኛ ገደብ ያቀናብሩ።
 WarningSomeLinesWithNullHourlyRate=አንዳንድ ጊዜ በአንዳንድ ተጠቃሚዎች የተመዘገቡ ሲሆን የሰዓት ታሪካቸው አልተገለጸም። በሰዓት 0 %s ዋጋ ጥቅም ላይ ውሏል ነገር ግን ይህ ያጠፋውን ጊዜ የተሳሳተ ግምትን ሊያስከትል ይችላል።
 WarningYourLoginWasModifiedPleaseLogin=መግቢያህ ተስተካክሏል። ለደህንነት አላማ ከሚቀጥለው እርምጃ በፊት በአዲሱ መግቢያህ መግባት አለብህ።
 WarningYourPasswordWasModifiedPleaseLogin=የይለፍ ቃልህ ተስተካክሏል። ለደህንነት ሲባል በአዲሱ የይለፍ ቃልዎ አሁን መግባት ይኖርብዎታል።
 WarningAnEntryAlreadyExistForTransKey=ለዚህ ቋንቋ ለትርጉም ቁልፍ መግቢያ አስቀድሞ አለ።
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=ማስጠንቀቂያ፣ የመስመሩ ቀን በወጪ ሪፖርቱ ክልል ውስጥ አይደለም።
 WarningProjectDraft=ፕሮጀክቱ አሁንም በረቂቅ ሁነታ ላይ ነው። ተግባሮችን ለመጠቀም ካቀዱ ማረጋገጥዎን አይርሱ።
 WarningProjectClosed=ፕሮጀክቱ ተዘግቷል። መጀመሪያ እንደገና መክፈት አለብህ።
@@ -356,6 +373,7 @@ WarningModuleNeedRefresh = ሞጁል <b>%s</b> ተሰናክሏል። እሱን 
 WarningPermissionAlreadyExist=ለዚህ ነገር ነባር ፈቃዶች
 WarningGoOnAccountancySetupToAddAccounts=ይህ ዝርዝር ባዶ ከሆነ ወደ ሜኑ ይሂዱ %s - %s - %s ለመለያ ገበታዎ መለያዎችን ለመጫን ወይም ለመፍጠር።
 WarningCorrectedInvoiceNotFound=የተስተካከለ ደረሰኝ አልተገኘም።
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
 WarningAlreadyReverse=የአክሲዮን እንቅስቃሴ አስቀድሞ ተቀልብሷል
 
 SwissQrOnlyVIR = የስዊስQR ደረሰኝ በክሬዲት ማስተላለፍ ክፍያዎች እንዲከፈሉ በተዘጋጁ ደረሰኞች ላይ ብቻ መጨመር ይችላል።
diff --git a/htdocs/langs/am_ET/eventorganization.lang b/htdocs/langs/am_ET/eventorganization.lang
index 6db909b41ad..4f4695b5ea0 100644
--- a/htdocs/langs/am_ET/eventorganization.lang
+++ b/htdocs/langs/am_ET/eventorganization.lang
@@ -36,6 +36,7 @@ EventOrganizationSetup=የክስተት ድርጅት ማዋቀር
 EventOrganization=የክስተት ድርጅት
 EventOrganizationSetupPage = የክስተት ድርጅት ማዋቀር ገጽ
 EVENTORGANIZATION_TASK_LABEL = ፕሮጀክቱ ሲረጋገጥ በራስ ሰር የሚፈጠሩ የተግባር መለያዎች
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=ስራዎችን በራስ-ሰር መፍጠር ካላስፈለገዎት ባዶ ያስቀምጡ።
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = የሆነ ሰው ጉባኤን ሲጠቁም ወደ ሶስተኛ ወገኖች የሚታከል ምድብ
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = ዳስ ሲጠቁሙ ወደ ሶስተኛ ወገኖች የሚታከሉ ምድብ
@@ -87,6 +88,7 @@ PriceOfRegistration=የምዝገባ ዋጋ
 PriceOfRegistrationHelp=በክስተቱ ላይ ለመመዝገብ ወይም ለመሳተፍ የሚከፈል ዋጋ
 PriceOfBooth=ዳስ ለመቆም የደንበኝነት ምዝገባ ዋጋ
 PriceOfBoothHelp=ዳስ ለመቆም የደንበኝነት ምዝገባ ዋጋ
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=ለኮንፈረንስ ICS አገናኝ
 ConferenceOrBoothInformation=የኮንፈረንስ ወይም የቡዝ መረጃ
 Attendees=ተሳታፊዎች
@@ -126,6 +128,7 @@ PublicAttendeeSubscriptionPage = ለዚህ ክስተት ብቻ የህዝብ ግ
 MissingOrBadSecureKey = የደህንነት ቁልፉ ልክ ያልሆነ ወይም ጠፍቷል
 EvntOrgWelcomeMessage = ይህ ቅጽ ለዝግጅቱ እንደ አዲስ ተሳታፊ እንዲመዘገቡ ያስችልዎታል
 EvntOrgDuration = ይህ ኮንፈረንስ በ%s ይጀምር እና በ%s ላይ ያበቃል።
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = የዝግጅቱ ቦታ፡ '%s ከ%s እስከ b0ecb2ec87fe49fez0 የሚከሰት
 EventType = የክስተት አይነት
 LabelOfBooth=የዳስ መለያ
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index 7c6a0b14070..5a6ca800842 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -83,29 +83,42 @@ SelectFormat=ይህን የማስመጣት ፋይል ቅርጸት ይምረጡ
 RunImportFile=ውሂብ አስመጣ
 NowClickToRunTheImport=የማስመጣት ማስመሰል ውጤቶችን ያረጋግጡ። ማናቸውንም ስህተቶች ያስተካክሉ እና እንደገና ይሞክሩ።<br>አስመሳይው ምንም ስህተት እንደሌለው ሲገልጽ ውሂቡን ወደ ዳታቤዝ ማስገባት መቀጠል ይችላሉ።
 DataLoadedWithId=የገባው ውሂብ በእያንዳንዱ የውሂብ ጎታ ሠንጠረዥ ውስጥ ይህ የማስመጣት መታወቂያ ያለው ተጨማሪ መስክ ይኖረዋል፡ <b>%s</b>፣ ከዚህ ማስመጣት ጋር የተያያዘ ችግርን በማጣራት ላይ እንዲፈለግ ለማድረግ።
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=አሁንም አሉ <b>%s</b>ሌሎች የውጤት መስመሮች ግን ስህተቶች አሏቸው ተገድቧል።
 TooMuchWarnings=አሁንም አሉ <b>%s</b>ሌሎች የውጤት መስመሮች ግን ማስጠንቀቂያዎች አሉት ተገድቧል።
 EmptyLine=ባዶ መስመር (ይወገዳል)
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=ፋይሉ የመጣው በቁጥር <b>%s</b> ነው።
 YouCanUseImportIdToFindRecord=በመስክ <b>import_key='%s'በማጣራት በውሂብ ጎታህ ውስጥ ማግኘት ትችላለህ። > </b>።
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
 NbOfLinesImported=በተሳካ ሁኔታ የገቡ የመስመሮች ብዛት፡ <b>%s</b>።
 DataComeFromNoWhere=የማስገባት እሴት ከምንጭ ፋይል ውስጥ ከየትም አይመጣም።
 DataComeFromFileFieldNb=የማስገባት እሴት ከአምድ <b>%s</b> ምንጭ ፋይል ይመጣል።
+DataComeFromIdFoundFromRef=The value that comes from the 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=The value of code that comes from 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=ከምንጩ ፋይል የሚመጣው ውሂብ በሚከተለው መስክ ውስጥ ይገባል፡-
 DataIDSourceIsInsertedInto=በምንጭ ፋይል ውስጥ ያለውን ውሂብ ተጠቅሞ የተገኘው የወላጅ ነገር መታወቂያ በሚከተለው መስክ ውስጥ ይገባል፡
 DataCodeIDSourceIsInsertedInto=ከኮድ የተገኘው የወላጅ መስመር መታወቂያ በሚከተለው መስክ ውስጥ ይገባል፡
 SourceRequired=የውሂብ ዋጋ ግዴታ ነው
 SourceExample=ሊሆን የሚችል የውሂብ እሴት ምሳሌ
 ExampleAnyRefFoundIntoElement=ለኤለመንት <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=መስክ <b>%s</b> በቀጥታ ታክሏል። ተመሳሳይ መስመሮች እንደ የተባዛ መዝገብ እንዲታዩ ያደርግዎታል (ይህ መስክ ሲጨመር ሁሉም መስመሮች የራሳቸው መታወቂያ ይኖራቸዋል እና ይለያያሉ)።
 CsvOptions=የCSV ቅርጸት አማራጮች
 Separator=የመስክ መለያያ
 Enclosure=ሕብረቁምፊ Delimiter
 SpecialCode=ልዩ ኮድ
 ExportStringFilter=%% በጽሁፉ ውስጥ አንድ ወይም ከዚያ በላይ ቁምፊዎችን ለመተካት ይፈቅዳል.
+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=ከመስመር ቁጥር ጀምሮ አስመጣ
 EndAtLineNb=በመስመር ቁጥር ጨርስ
 ImportFromToLine=ክልል ገድብ (ከ - ወደ)። ለምሳሌ. የራስጌ መስመር(ዎችን) ለመተው።
+SetThisValueTo2ToExcludeFirstLine=ለምሳሌ፣ 2ቱን የመጀመሪያ መስመሮች ለማስቀረት ይህንን እሴት ወደ 3 ያዋቅሩት።<br>የራስጌ መስመሮቹ ካልተዘለሉ፣ ይህ በአስመጪ ማስመሰያው ላይ በርካታ ስህተቶችን ያስከትላል።
 KeepEmptyToGoToEndOfFile=ሁሉንም መስመሮች እስከ ፋይሉ መጨረሻ ድረስ ለማስኬድ ይህንን መስክ ባዶ ያድርጉት።
 SelectPrimaryColumnsForUpdateAttempt=ለዝማኔ ማስመጣት እንደ ዋና ቁልፍ ለመጠቀም አምድ(ዎችን) ምረጥ
 UpdateNotYetSupportedForThisImport=ለዚህ አይነት ማስመጣት አይደገፍም (አስገባ ብቻ)
diff --git a/htdocs/langs/am_ET/help.lang b/htdocs/langs/am_ET/help.lang
index 048de16d3c0..b98cbf68256 100644
--- a/htdocs/langs/am_ET/help.lang
+++ b/htdocs/langs/am_ET/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real-time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-HelpCenter=Help Center
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+CommunitySupport=መድረክ/ዊኪ ድጋፍ
+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) መግብርን ጠቅ በማድረግ (ሁኔታ እና ከፍተኛ ዋጋ በራስ-ሰር ይሻሻላል)።
+PossibleLanguages=የሚደገፉ ቋንቋዎች
+SubscribeToFoundation=የዶሊባርር ፕሮጀክትን ያግዙ, ለመሠረት ይመዝገቡ
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/am_ET/holiday.lang b/htdocs/langs/am_ET/holiday.lang
index fd9e86e9f81..6433c022527 100644
--- a/htdocs/langs/am_ET/holiday.lang
+++ b/htdocs/langs/am_ET/holiday.lang
@@ -27,6 +27,7 @@ UserForApprovalLastname=የተፈቀደ ተጠቃሚ የመጨረሻ ስም
 UserForApprovalLogin=የፍቃድ ተጠቃሚ መግቢያ
 DescCP=መግለጫ
 SendRequestCP=የእረፍት ጥያቄ ፍጠር
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=የእረፍት ጊዜ ሚዛን
 SoldeCPUser=ቀሪ ሂሳብን ይተው (በቀናት ውስጥ)፡ <b>%s</b>
 ErrorEndDateCP=ከመጀመሪያው ቀን የሚበልጥ የመጨረሻ ቀን መምረጥ አለብህ።
@@ -108,7 +109,6 @@ TypeWasDisabledOrRemoved=የመልቀቅ አይነት (id %s) ተሰናክሏል
 LastHolidays=የቅርብ ጊዜ %s የመልቀቂያ ጥያቄዎች
 AllHolidays=ሁሉም የመልቀቅ ጥያቄዎች
 HalfDay=ግማሽ ቀን
-NotTheAssignedApprover=እርስዎ የተመደቡት አጽዳቂ አይደሉም
 LEAVE_PAID=የሚከፈልበት የእረፍት ጊዜ
 LEAVE_SICK=የህመም ጊዜ የስራ ዕረፍት ፍቃድ
 LEAVE_OTHER=ሌላ ዕረፍት
diff --git a/htdocs/langs/am_ET/hrm.lang b/htdocs/langs/am_ET/hrm.lang
index 8724bb805a6..564fc9d7042 100644
--- a/htdocs/langs/am_ET/hrm.lang
+++ b/htdocs/langs/am_ET/hrm.lang
@@ -2,80 +2,96 @@
 
 
 # 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=የኤችአርኤም የውጭ አገልግሎትን ለመከላከል ኢሜይል ያድርጉ
+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
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-Job=Job
-Jobs=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
-Position=Position
-Positions=Positions
-PositionCard=Position card
-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=የሥራ ካርድ
+NewJobProfile=አዲስ የስራ መገለጫ
+JobProfile=የስራ መገለጫ
+JobsProfiles=የስራ መገለጫዎች
+NewSkill=አዲስ ችሎታ
+SkillType=የክህሎት አይነት
+Skilldets=ለዚህ ችሎታ የደረጃዎች ዝርዝር
+Skilldet=የክህሎት ደረጃ
+rank=ደረጃ
+ErrNoSkillSelected=ምንም ችሎታ አልተመረጠም።
+ErrSkillAlreadyAdded=ይህ ችሎታ አስቀድሞ በዝርዝሩ ውስጥ አለ።
+SkillHasNoLines=ይህ ችሎታ ምንም መስመሮች የለውም
+Skill=ችሎታ
+Skills=ችሎታዎች
+SkillCard=የክህሎት ካርድ
+EmployeeSkillsUpdated=የሰራተኛ ችሎታዎች ተዘምነዋል (የሰራተኛ ካርድን "ክህሎት" ትርን ይመልከቱ)
+Eval=ግምገማ
+Evals=ግምገማዎች
+NewEval=አዲስ ግምገማ
+ValidateEvaluation=ግምገማን ያረጋግጡ
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=የግምገማ ካርድ
+RequiredRank=ለሥራው መገለጫ አስፈላጊ ደረጃ
+RequiredRankShort=ተፈላጊ ደረጃ
+PositionsWithThisProfile=ከዚህ የስራ መገለጫዎች ጋር ያሉ ቦታዎች
+EmployeeRank=ለዚህ ችሎታ የሰራተኛ ደረጃ
+EmployeeRankShort=የሰራተኛ ደረጃ
+EmployeePosition=የሰራተኛ አቀማመጥ
+EmployeePositions=የሰራተኛ ቦታዎች
+EmployeesInThisPosition=በዚህ ቦታ ላይ ያሉ ሰራተኞች
+group1ToCompare=ለመተንተን የተጠቃሚ ቡድን
+group2ToCompare=ለማነፃፀር ሁለተኛ የተጠቃሚ ቡድን
+OrJobToCompare=ከስራ መገለጫ የክህሎት መስፈርቶች ጋር አወዳድር
+difference=ልዩነት
+CompetenceAcquiredByOneOrMore=በአንድ ወይም በብዙ ተጠቃሚዎች የተገኘ ብቃት ግን በሁለተኛው ንጽጽር አልተጠየቀም።
+MaxlevelGreaterThan=የሰራተኛ ደረጃ ከሚጠበቀው ደረጃ ይበልጣል
+MaxLevelEqualTo=የሰራተኛ ደረጃ ከሚጠበቀው ደረጃ ጋር እኩል ነው
+MaxLevelLowerThan=የሰራተኛ ደረጃ ከሚጠበቀው ደረጃ ያነሰ ነው
+MaxlevelGreaterThanShort=ከተጠበቀው በላይ ደረጃ
+MaxLevelEqualToShort=ከተጠበቀው ደረጃ ጋር እኩል የሆነ ደረጃ
+MaxLevelLowerThanShort=ከተጠበቀው በታች ደረጃ
+SkillNotAcquired=ችሎታ በሁሉም ተጠቃሚዎች ያልተገኘ እና በሁለተኛው ንፅፅር የተጠየቀ
+legend=አፈ ታሪክ
+TypeSkill=የክህሎት አይነት
+AddSkill=ወደ ሥራ መገለጫ ችሎታዎችን ያክሉ
+RequiredSkills=ለዚህ የሥራ መገለጫ የሚያስፈልጉ ክህሎቶች
+UserRank=የተጠቃሚ ደረጃ
+SkillList=የክህሎት ዝርዝር
+SaveRank=ደረጃ አስቀምጥ
+TypeKnowHow=ተረዳ
+TypeHowToBe=እንዴት መሆን እንደሚቻል
+TypeKnowledge=እውቀት
+AbandonmentComment=የመተው አስተያየት
+DateLastEval=የመጨረሻ ግምገማ ቀን
+NoEval=ለዚህ ሰራተኛ ምንም አይነት ግምገማ አልተደረገም።
+HowManyUserWithThisMaxNote=የዚህ ደረጃ ተጠቃሚዎች ብዛት
+HighestRank=ከፍተኛ ደረጃ
+SkillComparison=የክህሎት ንጽጽር
+ActionsOnJob=በዚህ ሥራ ላይ ያሉ ክስተቶች
+VacantPosition=የሥራ ማስታወቂያ
+VacantCheckboxHelper=ይህንን አማራጭ መፈተሽ ያልተሞሉ የስራ መደቦችን ያሳያል (የስራ ክፍት ቦታ)
+SaveAddSkill = ችሎታ(ዎች) ታክሏል።
+SaveLevelSkill = የክህሎት(ዎች) ደረጃ ተቀምጧል
+DeleteSkill = ችሎታ ተወግዷል
+SkillsExtraFields=ተጨማሪ ባህሪያት (ችሎታዎች)
+JobsExtraFields=ተጨማሪ ባህሪያት (የስራ መገለጫ)
+EvaluationsExtraFields=ተጨማሪ ባህሪያት (ግምገማዎች)
+NeedBusinessTravels=የንግድ ጉዞዎች ያስፈልጉታል
+NoDescription=መግለጫ የለም።
+TheJobProfileHasNoSkillsDefinedFixBefore=የዚህ ሰራተኛ የተገመገመ የስራ መገለጫ በእሱ ላይ የተገለጸ ችሎታ የለውም. እባክህ ችሎታ(ዎች) ጨምር፣ ከዛ ሰርዝ እና ግምገማውን እንደገና አስጀምር።
diff --git a/htdocs/langs/am_ET/install.lang b/htdocs/langs/am_ET/install.lang
index 989f6aa9793..cee2cc8b055 100644
--- a/htdocs/langs/am_ET/install.lang
+++ b/htdocs/langs/am_ET/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.
+InstallEasy=መመሪያዎቹን ደረጃ በደረጃ ብቻ ይከተሉ።
+MiscellaneousChecks=ቅድመ-ሁኔታዎች ቼክ
+ConfFileExists=የማዋቀር ፋይል <b>%s</b> አለ።
+ConfFileDoesNotExistsAndCouldNotBeCreated=የማዋቀር ፋይል <b>%s</b> ሊኖር አይችልም እና አይችልም!
+ConfFileCouldBeCreated=የማዋቀር ፋይል <b>%s</b> ሊፈጠር ይችላል።
+ConfFileIsNotWritable=የማዋቀር ፋይል <b>%s</b> writable አይደለም ፈቃዶችን ያረጋግጡ። ለመጀመሪያ ጭነት፣ የእርስዎ ድር አገልጋይ በማዋቀር ሂደት ("chmod 666" ለምሳሌ በዩኒክስ እንደ OS ላይ) ወደዚህ ፋይል መፃፍ መቻል አለበት።
+ConfFileIsWritable=የማዋቀር ፋይል <b>%s</b> wri የሚችል ነው።
+ConfFileMustBeAFileNotADir=የማዋቀሪያ ፋይል <b>%s</b>ፋይል ሳይሆን ማውጫ መሆን አለበት።
+ConfFileReload=መለኪያዎችን ከውቅረት ፋይል እንደገና በመጫን ላይ።
+NoReadableConfFileSoStartInstall=የማዋቀሪያው ፋይል <b>conf/conf.php</b> የለም ወይም አይነበብም። እሱን ለማስጀመር ለመሞከር የመጫን ሂደቱን እናካሂዳለን።
+PHPSupportPOSTGETOk=ይህ ፒኤችፒ ተለዋዋጮችን POST እና GET ይደግፋል።
+PHPSupportPOSTGETKo=የእርስዎ ፒኤችፒ ማዋቀር ተለዋዋጮችን አይደግፍም POST እና/ወይም GET። መለኪያውን በphp.ini ውስጥ <b>variables_order</b>ን ያረጋግጡ።
+PHPSupportSessions=ይህ ፒኤችፒ ክፍለ ጊዜዎችን ይደግፋል።
+PHPSupport=ይህ PHP የ%s ተግባራትን ይደግፋል።
+PHPMemoryOK=የእርስዎ ፒኤችፒ ከፍተኛ ክፍለ ጊዜ ማህደረ ትውስታ ወደ <b>%s</b> ተቀናብሯል። ይህ በቂ መሆን አለበት.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-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
+Recheck=ለበለጠ ዝርዝር ሙከራ እዚህ ጠቅ ያድርጉ
+ErrorPHPDoesNotSupportSessions=የእርስዎ ፒኤችፒ ጭነት ክፍለ ጊዜዎችን አይደግፍም። Dolibarr እንዲሰራ ለመፍቀድ ይህ ባህሪ ያስፈልጋል። የእርስዎን ፒኤችፒ ማዋቀር እና የክፍለ ጊዜዎች ማውጫ ፈቃዶችን ያረጋግጡ።
+ErrorPHPDoesNotSupport=የእርስዎ ፒኤችፒ ጭነት የ%s ተግባራትን አይደግፍም።
+ErrorDirDoesNotExists=ማውጫ %s የለም።
+ErrorGoBackAndCorrectParameters=ተመለስ እና ግቤቶችን አረጋግጥ/አስተካክል።
+ErrorWrongValueForParameter=ለፓራሜትር '%s የተሳሳተ እሴት ተይበው ሊሆን ይችላል።
+ErrorFailedToCreateDatabase=የውሂብ ጎታ '%s' መፍጠር አልተሳካም።
+ErrorFailedToConnectToDatabase=ከመረጃ ቋት '%s ጋር መገናኘት አልተሳካም።
+ErrorDatabaseVersionTooLow=የውሂብ ጎታ ስሪት (%s) በጣም ያረጀ ነው። ሥሪት %s ወይም ከዚያ በላይ ያስፈልጋል።
+ErrorPHPVersionTooLow=የPHP ስሪት በጣም የቆየ ነው። ሥሪት %s ወይም ከዚያ በላይ ያስፈልጋል።
+ErrorPHPVersionTooHigh=የ PHP ስሪት በጣም ከፍተኛ ነው። ሥሪት %s ወይም ከዚያ በታች ያስፈልጋል።
+ErrorConnectedButDatabaseNotFound=ከአገልጋይ ጋር ያለው ግንኙነት ተሳክቷል ነገር ግን የውሂብ ጎታ '%s አልተገኘም።
+ErrorDatabaseAlreadyExists=የውሂብ ጎታ '%s አስቀድሞ አለ።
+ErrorNoMigrationFilesFoundForParameters=ለተመረጡት ስሪቶች ምንም የፍልሰት ፋይል አልተገኘም።
+IfDatabaseNotExistsGoBackAndUncheckCreate=የመረጃ ቋቱ ከሌለ ወደ ኋላ ተመለስ እና "ዳታቤዝ ፍጠር" የሚለውን አማራጭ አረጋግጥ።
+IfDatabaseExistsGoBackAndCheckCreate=የውሂብ ጎታ አስቀድሞ ካለ፣ ይመለሱ እና "ዳታቤዝ ፍጠር" የሚለውን አማራጭ ያንሱ።
+WarningBrowserTooOld=የአሳሽ ስሪት በጣም ያረጀ ነው። አሳሽዎን ወደ የቅርብ ጊዜ የፋየርፎክስ፣ Chrome ወይም Opera ስሪት ማሻሻል በጣም ይመከራል።
+PHPVersion=ፒኤችፒ ስሪት
+License=ፈቃድ በመጠቀም
+ConfigurationFile=የማዋቀር ፋይል
+WebPagesDirectory=ድረ-ገጾች የሚቀመጡበት ማውጫ
+DocumentsDirectory=የተሰቀሉ እና የተፈጠሩ ሰነዶችን ለማከማቸት ማውጫ
+URLRoot=URL ስርወ
+ForceHttps=ደህንነታቸው የተጠበቁ ግንኙነቶችን አስገድድ (https)
+CheckToForceHttps=ደህንነታቸው የተጠበቁ ግንኙነቶችን ለማስገደድ ይህንን አማራጭ ያረጋግጡ (https)።<br>ይህ የድር አገልጋዩ በSSL እውቅና ማረጋገጫ እንዲዋቀር ይጠይቃል።
+DolibarrDatabase=ዶሊባርር ዳታቤዝ
+DatabaseType=የውሂብ ጎታ አይነት
+DriverType=የአሽከርካሪ አይነት
+Server=አገልጋይ
+ServerAddressDescription=ለዳታቤዝ አገልጋይ ስም ወይም አይ ፒ አድራሻ። አብዛኛውን ጊዜ 'localhost' የመረጃ ቋቱ አገልጋይ ከድር አገልጋይ ጋር በተመሳሳይ አገልጋይ ላይ ሲስተናገድ።
+ServerPortDescription=የውሂብ ጎታ አገልጋይ ወደብ. ካልታወቀ ባዶ ያስቀምጡ።
+DatabaseServer=የውሂብ ጎታ አገልጋይ
+DatabaseName=የውሂብ ጎታ ስም
+DatabasePrefix=የውሂብ ጎታ ሰንጠረዥ ቅድመ ቅጥያ
+DatabasePrefixDescription=የውሂብ ጎታ ሰንጠረዥ ቅድመ ቅጥያ። ባዶ ከሆነ ነባሪው ወደ llx_ ነው።
+AdminLogin=የተጠቃሚ መለያ ለ Dolibarr የውሂብ ጎታ ባለቤት።
+AdminPassword=የይለፍ ቃል ለ Dolibarr የውሂብ ጎታ ባለቤት።
+CreateDatabase=የውሂብ ጎታ ይፍጠሩ
+CreateUser=የተጠቃሚ መለያ ይፍጠሩ ወይም በ Dolibarr የውሂብ ጎታ ላይ የተጠቃሚ መለያ ፍቃድ ይስጡ
+DatabaseSuperUserAccess=የውሂብ ጎታ አገልጋይ - ሱፐር ተጠቃሚ መዳረሻ
+CheckToCreateDatabase=የመረጃ ቋቱ እስካሁን ከሌለ እና መፈጠር ካለበት ሳጥኑ ላይ ምልክት ያድርጉ።<br>በዚህ አጋጣሚ የሱፐር ተጠቃሚ መለያውን የተጠቃሚ ስም እና የይለፍ ቃል መሙላት አለቦት። የዚህ ገጽ.
+CheckToCreateUser=ሳጥኑ ላይ ምልክት ያድርጉ፡<br>የመረጃ ቋቱ ተጠቃሚ መለያ እስካሁን ከሌለ እና መፈጠር አለበት ወይም<br>የተጠቃሚ መለያ ከሆነ አለ ግን ዳታቤዙ የለም እና ፈቃዶች መሰጠት አለባቸው።<br>በዚህ አጋጣሚ የተጠቃሚ መለያውን እና የይለፍ ቃሉን እና b0aee833365837fz0ን ማስገባት አለብህ። span>እንዲሁም</b>የሱፐር ተጠቃሚ መለያ ስም እና የይለፍ ቃል በዚህ ገጽ ግርጌ ላይ። ይህ ሳጥን ምልክት ካልተደረገበት የውሂብ ጎታው ባለቤት እና የይለፍ ቃል አስቀድሞ መኖር አለበት።
+DatabaseRootLoginDescription=የሱፐር ተጠቃሚ መለያ ስም (አዲስ ዳታቤዝ ወይም አዲስ ተጠቃሚዎችን ለመፍጠር)፣ የውሂብ ጎታው ወይም ባለቤቱ ከሌለ የግዴታ።
+KeepEmptyIfNoPassword=ሱፐር ተጠቃሚ የይለፍ ቃል ከሌለው ባዶ ይተው (አይመከርም)
+SaveConfigurationFile=መለኪያዎችን በማስቀመጥ ላይ ወደ
+ServerConnection=የአገልጋይ ግንኙነት
+DatabaseCreation=የውሂብ ጎታ መፍጠር
+CreateDatabaseObjects=የውሂብ ጎታ ዕቃዎች መፍጠር
+ReferenceDataLoading=የማጣቀሻ ውሂብ መጫን
+TablesAndPrimaryKeysCreation=ሰንጠረዦች እና ዋና ቁልፎች መፍጠር
+CreateTableAndPrimaryKey=ሰንጠረዥ ይፍጠሩ %s
+CreateOtherKeysForTable=ለሠንጠረዥ የውጭ ቁልፎችን እና ኢንዴክሶችን ይፍጠሩ %s
+OtherKeysCreation=የውጭ ቁልፎች እና ኢንዴክሶች መፍጠር
+FunctionsCreation=ተግባራትን መፍጠር
+AdminAccountCreation=የአስተዳዳሪ መግቢያ መፍጠር
+PleaseTypePassword=እባክዎ የይለፍ ቃል ይተይቡ፣ ባዶ የይለፍ ቃሎች አይፈቀዱም!
+PleaseTypeALogin=እባክዎ መግቢያ ይተይቡ!
+PasswordsMismatch=የይለፍ ቃሎች ይለያያሉ፣ እባክዎ እንደገና ይሞክሩ!
+SetupEnd=የማዋቀር መጨረሻ
+SystemIsInstalled=ይህ ጭነት ተጠናቅቋል።
+SystemIsUpgraded=ዶሊባርር በተሳካ ሁኔታ ተሻሽሏል።
+YouNeedToPersonalizeSetup=ለፍላጎትዎ (መልክ, ባህሪያት, ...) ለማሟላት Dolibarr ማዋቀር ያስፈልግዎታል. ይህንን ለማድረግ፣ እባክዎ ከታች ያለውን ሊንክ ይከተሉ፡-
+AdminLoginCreatedSuccessfuly=Dolibarr አስተዳዳሪ መግቢያ '<b>%s</b> በተሳካ ሁኔታ ተፈጥሯል
+GoToDolibarr=ወደ ዶሊባርር ይሂዱ
+GoToSetupArea=ወደ ዶሊባርር (የማዋቀሪያ ቦታ) ይሂዱ
+MigrationNotFinished=የመረጃ ቋቱ ስሪት ሙሉ በሙሉ የተዘመነ አይደለም፡ የማሻሻያ ሂደቱን እንደገና ያሂዱ።
+GoToUpgradePage=እንደገና ወደ ማላቅ ገጽ ይሂዱ
+WithNoSlashAtTheEnd=በመጨረሻው ላይ "/" ያለ ጩኸት
+DirectoryRecommendation=<span class="warning">አስፈላጊ</span>፡ ከድረ-ገጾች ውጭ የሆነ ማውጫ መጠቀም አለብህ (ስለዚህ የቀደመውን መለኪያ ንዑስ ማውጫ አትጠቀም። ).
+LoginAlreadyExists=አስቀድሞ አለ
+DolibarrAdminLogin=Dolibarr አስተዳዳሪ መግቢያ
+AdminLoginAlreadyExists=Dolibarr አስተዳዳሪ መለያ '<b>%s</b> አስቀድሞ አለ ሌላ መፍጠር ከፈለጉ ይመለሱ።
+FailedToCreateAdminLogin=የዶሊባርር አስተዳዳሪ መለያ መፍጠር አልተሳካም።
+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=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"
+BecauseConnectionFailedParametersMayBeWrong=የውሂብ ጎታው ግንኙነቱ አልተሳካም፡ የአስተናጋጁ ወይም የሱፐር ተጠቃሚ መለኪያዎች ስህተት መሆን አለባቸው።
+OrphelinsPaymentsDetectedByMethod=ወላጅ አልባ ክፍያ በ%s ዘዴ ተገኝቷል
+RemoveItManuallyAndPressF5ToContinue=እራስዎ ያስወግዱት እና ለመቀጠል F5 ን ይጫኑ።
+FieldRenamed=የመስክ ስም ተቀይሯል።
+IfLoginDoesNotExistsCheckCreateUser=ተጠቃሚው እስካሁን ከሌለ፣ “ተጠቃሚ ፍጠር” የሚለውን አማራጭ ማረጋገጥ አለብህ።
 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
+InstallChoiceSuggested=<b>የመጫኛ ምርጫ በጫኝ የተጠቆመ</b>።
+MigrateIsDoneStepByStep=የታለመው ስሪት (%s) የበርካታ ስሪቶች ክፍተት አለው። የመጫኛ አዋቂው ይህ ከተጠናቀቀ በኋላ ተጨማሪ ፍልሰትን ለመጠቆም ተመልሶ ይመጣል።
+CheckThatDatabasenameIsCorrect=የመረጃ ቋቱ ስም "<b>%s</b>" ትክክል መሆኑን ያረጋግጡ።
+IfAlreadyExistsCheckOption=ይህ ስም ትክክል ከሆነ እና የመረጃ ቋቱ እስካሁን ከሌለ፣ “ዳታቤዝ ፍጠር” የሚለውን አማራጭ ማረጋገጥ አለብህ።
+OpenBaseDir=PHP openbasedir መለኪያ
+YouAskToCreateDatabaseSoRootRequired="ዳታቤዝ ፍጠር" በሚለው ሳጥን ላይ ምልክት አድርገሃል። ለዚህም የሱፐርሰተር መግቢያ/የይለፍ ቃል (ከቅርጽ በታች) ማቅረብ አለቦት።
+YouAskToCreateDatabaseUserSoRootRequired="የውሂብ ጎታ ባለቤት ፍጠር" በሚለው ሳጥን ላይ ምልክት አድርገሃል። ለዚህም የሱፐርሰተር መግቢያ/የይለፍ ቃል (ከቅርጽ በታች) ማቅረብ አለቦት።
+NextStepMightLastALongTime=አሁን ያለው እርምጃ ብዙ ደቂቃዎችን ሊወስድ ይችላል። እባክዎ ከመቀጠልዎ በፊት የሚቀጥለው ማያ ገጽ ሙሉ በሙሉ እስኪታይ ድረስ ይጠብቁ።
+MigrationCustomerOrderShipping=ለሽያጭ ማዘዣ ማከማቻ ማጓጓዝ
+MigrationShippingDelivery=የማጓጓዣ ማከማቻን ያሻሽሉ።
+MigrationShippingDelivery2=የማጓጓዣ ማከማቻን አሻሽል 2
+MigrationFinished=ስደት አልቋል
+LastStepDesc=<strong>የመጨረሻው ደረጃ</strong>: ከዶሊባርር ጋር ለመገናኘት የሚፈልጉትን መግቢያ እና የይለፍ ቃል እዚህ ይግለጹ። <b>ይህን ሁሉ ሌሎች/ተጨማሪ የተጠቃሚ መለያዎችን ለማስተዳደር ዋናው መለያ ስለሆነ አይጥፋው።</b>
+ActivateModule=ሞጁሉን አግብር %s
+ShowEditTechnicalParameters=የላቁ መለኪያዎችን ለማሳየት/ለማርትዕ እዚህ ጠቅ ያድርጉ (የባለሙያ ሁነታ)
+WarningUpgrade=ማስጠንቀቂያ፡-\nመጀመሪያ የውሂብ ጎታ ምትኬን አስኬደህ ነበር?\nይህ በጣም ይመከራል. በዚህ ሂደት ውስጥ የውሂብ መጥፋት (ለምሳሌ በ mysql ስሪት 5.5.40/41/42/43 ስህተት ምክንያት) ሊኖር ይችላል ስለዚህ ማንኛውንም ፍልሰት ከመጀመርዎ በፊት የውሂብ ጎታዎን ሙሉ በሙሉ መጣል አስፈላጊ ነው።\n\nየስደት ሂደቱን ለመጀመር እሺን ጠቅ ያድርጉ...
+ErrorDatabaseVersionForbiddenForMigration=የውሂብ ጎታህ ስሪት %s ነው። በውሂብ ጎታህ ላይ መዋቅራዊ ለውጦችን ካደረግክ በስደት ሂደት የሚፈለገውን ያህል የውሂብ መጥፋት እንዲቻል የሚያደርግ ወሳኝ ስህተት አለው። በእሱ ምክንያት የውሂብ ጎታዎን ወደ ንብርብር (የተጣበቁ) ስሪት እስካላሳደጉ ድረስ ስደት አይፈቀድም (የሚታወቁት የስህተት ስሪቶች ዝርዝር፡ %s)
+KeepDefaultValuesWamp=የዶሊባርር ማዋቀር አዋቂን ከ DoliWamp ተጠቅመሃል፣ ስለዚህ እዚህ የታቀዱ እሴቶች አስቀድመው ተመቻችተዋል። ምን እየሰሩ እንደሆነ ካወቁ ብቻ ይቀይሯቸው።
+KeepDefaultValuesDeb=የዶሊባርር ማዋቀር አዋቂን ከሊኑክስ ፓኬጅ (ኡቡንቱ፣ ዴቢያን፣ ፌዶራ...) ተጠቅመዋል፣ ስለዚህ እዚህ የታቀዱት እሴቶች ቀድሞውኑ የተመቻቹ ናቸው። ለመፍጠር የውሂብ ጎታው ባለቤት የይለፍ ቃል ብቻ ነው መግባት ያለበት። ምን እየሰሩ እንደሆነ ካወቁ ብቻ ሌሎች መለኪያዎችን ይቀይሩ።
+KeepDefaultValuesMamp=የዶሊባርር ማዋቀር አዋቂን ከ DoliMamp ተጠቅመዋል፣ ስለዚህ እዚህ የታቀዱት እሴቶች ቀድሞውኑ የተመቻቹ ናቸው። ምን እየሰሩ እንደሆነ ካወቁ ብቻ ይቀይሯቸው።
+KeepDefaultValuesProxmox=የዶሊባርር ማዋቀር አዋቂን ከProxmox ቨርቹዋል ዕቃ ይጠቀማሉ፣ ስለዚህ እዚህ የታቀዱት እሴቶች ቀድሞውኑ የተመቻቹ ናቸው። ምን እየሰሩ እንደሆነ ካወቁ ብቻ ይቀይሯቸው።
+UpgradeExternalModule=የውጫዊ ሞጁል ልዩ የማሻሻያ ሂደትን ያሂዱ
+SetAtLeastOneOptionAsUrlParameter=በዩአርኤል ውስጥ ቢያንስ አንድ አማራጭ እንደ መለኪያ ያዘጋጁ። ለምሳሌ፡- '...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
+MigrationFixData=መደበኛ ያልሆነ ውሂብን አስተካክል።
+MigrationOrder=ለደንበኛ ትዕዛዞች የውሂብ ሽግግር
+MigrationSupplierOrder=ለሻጭ ትዕዛዞች የውሂብ ሽግግር
+MigrationProposal=ለንግድ ሀሳቦች የውሂብ ሽግግር
+MigrationInvoice=ለደንበኛ ደረሰኞች የውሂብ ሽግግር
+MigrationContract=የውሂብ ፍልሰት ለኮንትራቶች
+MigrationSuccessfullUpdate=ማሻሻል ተሳክቷል።
+MigrationUpdateFailed=የማሻሻል ሂደት አልተሳካም።
+MigrationRelationshipTables=የውሂብ ፍልሰት ለግንኙነት ሠንጠረዦች (%s)
+MigrationPaymentsUpdate=የክፍያ ውሂብ ማስተካከያ
+MigrationPaymentsNumberToUpdate=%s ክፍያ(ዎች) ለማዘመን
+MigrationProcessPaymentUpdate=ክፍያ(ዎች) አዘምን %s
+MigrationPaymentsNothingToUpdate=ምንም ተጨማሪ ነገሮች የሉም
+MigrationPaymentsNothingUpdatable=ከእንግዲህ የሚስተካከሉ ክፍያዎች የሉም
+MigrationContractsUpdate=የኮንትራት ውሂብ ማስተካከያ
+MigrationContractsNumberToUpdate=%s ለመዘመን ውል(ዎች)
+MigrationContractsLineCreation=የኮንትራት መስመር ይፍጠሩ ለኮንትራት ref %s
+MigrationContractsNothingToUpdate=ምንም ተጨማሪ ነገሮች የሉም
+MigrationContractsFieldDontExist=የመስክ fk_facture ከእንግዲህ የለም። ምንም የማደርገው የለም.
+MigrationContractsEmptyDatesUpdate=ውል ባዶ የቀን እርማት
+MigrationContractsEmptyDatesUpdateSuccess=የኮንትራት ባዶ ቀን እርማት በተሳካ ሁኔታ ተከናውኗል
+MigrationContractsEmptyDatesNothingToUpdate=ምንም ውል ለማረም ባዶ ቀን የለም።
+MigrationContractsEmptyCreationDatesNothingToUpdate=ምንም የሚስተካከል የውል ስምምነት የለም።
+MigrationContractsInvalidDatesUpdate=የመጥፎ እሴት ቀን ውል ማረም
 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
+MigrationContractsInvalidDatesNumber=%s ውሎች ተሻሽለዋል
+MigrationContractsInvalidDatesNothingToUpdate=ለማረም መጥፎ ዋጋ ያለው ቀን የለም።
+MigrationContractsIncoherentCreationDateUpdate=የመጥፎ እሴት ውል መፍጠር ቀን ማረም
+MigrationContractsIncoherentCreationDateUpdateSuccess=የመጥፎ እሴት ውል የተፈጠረበት ቀን ማስተካከያ በተሳካ ሁኔታ ተከናውኗል
+MigrationContractsIncoherentCreationDateNothingToUpdate=ለማረም የውል መፍጠሪያ ቀን ምንም መጥፎ ዋጋ የለም።
+MigrationReopeningContracts=ክፍት ውል በስህተት ተዘግቷል።
+MigrationReopenThisContract=ኮንትራቱን እንደገና ክፈት %s
+MigrationReopenedContractsNumber=%s ውሎች ተሻሽለዋል
+MigrationReopeningContractsNothingToUpdate=ለመክፈት የተዘጋ ውል የለም።
+MigrationBankTransfertsUpdate=በባንክ መግቢያ እና በባንክ ዝውውር መካከል ያለውን ግንኙነት ያዘምኑ
+MigrationBankTransfertsNothingToUpdate=ሁሉም ማገናኛዎች የተዘመኑ ናቸው።
+MigrationShipmentOrderMatching=ደረሰኝ ዝማኔ በመላክ ላይ
+MigrationDeliveryOrderMatching=የመላኪያ ደረሰኝ ዝማኔ
+MigrationDeliveryDetail=የማድረስ ዝማኔ
+MigrationStockDetail=የምርት ዋጋን ያዘምኑ
+MigrationMenusDetail=ተለዋዋጭ ምናሌዎችን ሰንጠረዦች ያዘምኑ
+MigrationDeliveryAddress=የመላኪያ አድራሻን በማጓጓዝ ያዘምኑ
+MigrationProjectTaskActors=ለሠንጠረዥ llx_projet_task_ተዋንያን የውሂብ ሽግግር
+MigrationProjectUserResp=የውሂብ ፍልሰት መስክ fk_user_resp of llx_projet ወደ llx_element_contact
+MigrationProjectTaskTime=በሰከንዶች ውስጥ የሚጠፋውን ጊዜ ያዘምኑ
+MigrationActioncommElement=በድርጊቶች ላይ ውሂብ ያዘምኑ
+MigrationPaymentMode=ለክፍያ አይነት የውሂብ ዝውውር
+MigrationCategorieAssociation=ምድቦች ፍልሰት
+MigrationEvents=የክስተት ባለቤትን ወደ የምደባ ሠንጠረዥ ለመጨመር የክስተቶች ሽግግር
+MigrationEventsContact=የክስተት ግንኙነትን ወደ ምደባ ሰንጠረዥ ለመጨመር የክስተቶች ፍልሰት
+MigrationRemiseEntity=የllx_societe_remise የህጋዊ አካል ዋጋን ያዘምኑ
+MigrationRemiseExceptEntity=የllx_societe_remise_ከቀር የህጋዊ አካል መስክ ዋጋን ያዘምኑ
+MigrationUserRightsEntity=የህጋዊ አካል የመስክ ዋጋ የllx_user_rights ያዘምኑ
+MigrationUserGroupRightsEntity=የህጋዊ አካል የመስክ ዋጋ የllx_usergroup_rights ያዘምኑ
+MigrationUserPhotoPath=ለተጠቃሚዎች የፎቶ ዱካዎች ፍልሰት
+MigrationFieldsSocialNetworks=የተጠቃሚዎች ፍልሰት ማህበራዊ አውታረ መረቦች (%s)
+MigrationReloadModule=ሞጁሉን እንደገና ጫን %s
+MigrationResetBlockedLog=ለv7 አልጎሪዝም ሞዱል የታገደ ሎግ ዳግም ያስጀምሩ
+MigrationImportOrExportProfiles=የማስመጣት ወይም ወደ ውጭ የሚላኩ መገለጫዎችን ስደት (%s)
+ShowNotAvailableOptions=የማይገኙ አማራጮችን አሳይ
+HideNotAvailableOptions=የማይገኙ አማራጮችን ደብቅ
+ErrorFoundDuringMigration=በስደት ሂደት ውስጥ ስህተት(ዎች) ሪፖርት ተደርጓል ስለዚህ ቀጣዩ ደረጃ አይገኝም። ስህተቶችን ችላ ለማለት <a href="%s">እዚህ ጠቅ ማድረግ ይችላሉ</a> ነገር ግን ስህተቶቹ እስኪፈቱ ድረስ አፕሊኬሽኑ ወይም አንዳንድ ባህሪያት በትክክል ላይሰሩ ይችላሉ። .
+YouTryInstallDisabledByDirLock=አፕሊኬሽኑ እራሱን ለማሻሻል ሞክሯል፣ ነገር ግን የመጫኛ/የማሻሻያ ገጾቹ ለደህንነት ሲባል ተሰናክለዋል (ማውጫ በ .መቆለፊያ ቅጥያ ተሰይሟል)።<br>
+YouTryInstallDisabledByFileLock=አፕሊኬሽኑ እራሱን ለማሻሻል ሞክሯል፣ ነገር ግን የመጫኛ/ማሻሻያ ገጾቹ ለደህንነት ሲባል ተሰናክለዋል (የመቆለፊያ ፋይል በመኖሩ <strong>install.lock</strong> በ dolibarr ሰነዶች ማውጫ ውስጥ)።<br>
+YouTryUpgradeDisabledByMissingFileUnLock=አፕሊኬሽኑ እራሱን ለማሻሻል ሞክሯል፣ ነገር ግን የማሻሻያ ሂደቱ በአሁኑ ጊዜ አይፈቀድም።<br>
+ClickHereToGoToApp=ወደ ማመልከቻዎ ለመሄድ እዚህ ጠቅ ያድርጉ
+ClickOnLinkOrRemoveManualy=ማሻሻያ በሂደት ላይ ከሆነ፣ እባክዎ ይጠብቁ። ካልሆነ የሚከተለውን ሊንክ ይጫኑ። ይህንን ተመሳሳይ ገጽ ሁል ጊዜ የሚያዩ ከሆነ በሰነዶች ማውጫ ውስጥ ያለውን ፋይል install.lock ማስወገድ ወይም እንደገና መሰየም አለብዎት።
+ClickOnLinkOrCreateUnlockFileManualy=ማሻሻያ በሂደት ላይ ከሆነ እባክህ ጠብቅ... ካልሆነ ፋይሉን install.lock ማስወገድ አለብህ ወይም የፋይል ማሻሻያ.unlockን ወደ Dolibarr documents directory መፍጠር አለብህ።
+Loaded=ተጭኗል
+FunctionTest=የተግባር ሙከራ
+NodoUpgradeAfterDB=የውሂብ ጎታውን ከማሻሻል በኋላ በውጫዊ ሞጁሎች የተጠየቀ ምንም አይነት እርምጃ የለም።
+NodoUpgradeAfterFiles=ፋይሎችን ወይም ማውጫዎችን ካሻሻሉ በኋላ በውጫዊ ሞጁሎች የተጠየቀ ምንም እርምጃ የለም።
+MigrationContractLineRank=ደረጃን ለመጠቀም የኮንትራት መስመርን ያዛውሩ (እና እንደገና ለማዘዝ አንቃ)
diff --git a/htdocs/langs/am_ET/interventions.lang b/htdocs/langs/am_ET/interventions.lang
index ef5df43e546..4d0e0a2dfff 100644
--- a/htdocs/langs/am_ET/interventions.lang
+++ b/htdocs/langs/am_ET/interventions.lang
@@ -1,68 +1,75 @@
 # 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?
+Intervention=ጣልቃ መግባት
+Interventions=ጣልቃገብነቶች
+InterventionCard=የጣልቃ ገብነት ካርድ
+NewIntervention=አዲስ ጣልቃ ገብነት
+AddIntervention=ጣልቃ ገብነት ይፍጠሩ
+ChangeIntoRepeatableIntervention=ወደ ተደጋጋሚ ጣልቃገብነት ይቀይሩ
+ListOfInterventions=የጣልቃ ገብነት ዝርዝር
+ActionsOnFicheInter=በጣልቃ ገብነት ላይ የሚደረጉ እርምጃዎች
+LastInterventions=የቅርብ ጊዜ %s ጣልቃገብነቶች
+AllInterventions=ሁሉም ጣልቃገብነቶች
+CreateDraftIntervention=ረቂቅ ፍጠር
+InterventionContact=የጣልቃ ገብነት ግንኙነት
+DeleteIntervention=ጣልቃ ገብነትን ሰርዝ
+ValidateIntervention=ጣልቃ ገብነትን ያረጋግጡ
+ModifyIntervention=ጣልቃ ገብነትን አስተካክል።
+CloseIntervention=ጣልቃ ገብነትን ይዝጉ
+DeleteInterventionLine=የጣልቃ ገብነት መስመርን ሰርዝ
+ConfirmDeleteIntervention=እርግጠኛ ነዎት ይህን ጣልቃ ገብነት መሰረዝ ይፈልጋሉ?
 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
+ConfirmModifyIntervention=እርግጠኛ ነዎት ይህን ጣልቃገብነት መቀየር ይፈልጋሉ?
+ConfirmCloseIntervention=እርግጠኛ ነዎት ይህን ጣልቃ ገብነት መዝጋት ይፈልጋሉ?
+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 በኢሜይል ተልኳል
+InterventionClosedInDolibarr= ጣልቃ ገብነት %s ተዘግቷል
+InterventionDeletedInDolibarr=ጣልቃ ገብነት %s ተሰርዟል
+InterventionsArea=ጣልቃ ገብነት አካባቢ
+DraftFichinter=ረቂቅ ጣልቃገብነቶች
+LastModifiedInterventions=የቅርብ ጊዜ %s የተሻሻሉ ጣልቃገብነቶች
+FichinterToProcess=ለማካሄድ ጣልቃገብነቶች
+TypeContact_fichinter_external_CUSTOMER=ተከታይ የደንበኛ ግንኙነት
+PrintProductsOnFichinter=እንዲሁም በጣልቃ ገብነት ካርድ ላይ "ምርት" (አገልግሎቶችን ብቻ ሳይሆን) አይነት መስመሮችን ያትሙ
+PrintProductsOnFichinterDetails=ከትእዛዞች የመነጩ ጣልቃገብነቶች
+UseServicesDurationOnFichinter=ከትእዛዞች ለሚፈጠሩ ጣልቃገብነቶች የአገልግሎቶችን ቆይታ ይጠቀሙ
+UseDurationOnFichinter=ለጣልቃ ገብነት መዝገቦች የቆይታ ጊዜውን ይደብቃል
+UseDateWithoutHourOnFichinter=ለጣልቃ ገብነት መዝገቦች ከቀን መስኩ የሰአታት እና ደቂቃዎችን ይደብቃል
+InterventionStatistics=የጣልቃ ገብነት ስታቲስቲክስ
+NbOfinterventions=የጣልቃ ገብነት ካርዶች ቁጥር
+NumberOfInterventionsByMonth=የጣልቃ ገብነት ካርዶች በወር (የተረጋገጠበት ቀን)
+AmountOfInteventionNotIncludedByDefault=የጣልቃ ገብነት መጠን በነባሪ ወደ ትርፍ አልተካተተም (በአብዛኛዎቹ ሁኔታዎች የጊዜ ሰሌዳዎች ጊዜን ለመቁጠር ያገለግላሉ)። በትርፍ ውስጥ የተካተቱትን ንጥረ ነገሮች ዝርዝር ለማጠናቀቅ PROJECT_ELEMENTS_FOR_ADD_MARGIN እና PROJECT_ELEMENTS_FOR_MINUS_MARGIN አማራጭን ወደ ቤት-ማዋቀር መጠቀም ይችላሉ።
+InterId=የጣልቃ ገብነት መታወቂያ
+InterRef=ጣልቃ ገብነት ማጣቀሻ.
+InterDateCreation=የቀን ፍጥረት ጣልቃገብነት
+InterDuration=የቆይታ ጊዜ ጣልቃገብነት
+InterStatus=የሁኔታ ጣልቃገብነት
+InterNote=ጣልቃገብነት ማስታወሻ
+InterLine=የጣልቃ ገብነት መስመር
+InterLineId=የመስመር መታወቂያ ጣልቃገብነት
+InterLineDate=የመስመር ቀን ጣልቃ ገብነት
+InterLineDuration=የመስመር ቆይታ ጣልቃ ገብነት
+InterLineDesc=የመስመር መግለጫ ጣልቃገብነት
+RepeatableIntervention=የጣልቃ ገብነት አብነት
+ToCreateAPredefinedIntervention=አስቀድሞ የተወሰነ ወይም ተደጋጋሚ ጣልቃ ገብነት ለመፍጠር፣ የተለመደ ጣልቃ ገብነት ይፍጠሩ እና ወደ ጣልቃ ገብነት አብነት ይለውጡት።
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
+GenerateInter=ጣልቃ-ገብነት ይፍጠሩ
+FichinterNoContractLinked=ጣልቃ ገብነት %s ያለ የተገናኘ ውል ተፈጥሯል።
+ErrorFicheinterCompanyDoesNotExist=ኩባንያ የለም። ጣልቃ ገብነት አልተፈጠረም።
+NextDateToIntervention=ለቀጣዩ ጣልቃገብነት ትውልድ ቀን
+NoIntervention=ምንም ጣልቃ ገብነት የለም
diff --git a/htdocs/langs/am_ET/intracommreport.lang b/htdocs/langs/am_ET/intracommreport.lang
index 3060300b974..a374bd24187 100644
--- a/htdocs/langs/am_ET/intracommreport.lang
+++ b/htdocs/langs/am_ET/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = የኢንትራኮም ሪፖርት
+Module68000Desc = Intracomm ሪፖርት አስተዳደር (የፈረንሳይ DEB/DES ቅርጸት ድጋፍ)
+IntracommReportSetup = ሞጁል ማዋቀር ኢንትራኮምምሪፖርት
+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=d'acteur ይተይቡ
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'ግዴታ ሱር Les መግቢያዎች
 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
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de Declarant
 
 # 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 ቅርጸት ማዘጋጀት
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=የመነጩ መግለጫዎች ዝርዝር
+IntracommReportNumber=የመግለጫ ቁጥር
+IntracommReportPeriod=የመተንተን ጊዜ
+IntracommReportTypeDeclaration=የመግለጫ አይነት
+IntracommReportDownload=የኤክስኤምኤል ፋይል ያውርዱ
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=የመጓጓዣ ሁነታ
diff --git a/htdocs/langs/am_ET/ldap.lang b/htdocs/langs/am_ET/ldap.lang
index 8b6f0864215..a8a4d0e320a 100644
--- a/htdocs/langs/am_ET/ldap.lang
+++ b/htdocs/langs/am_ET/ldap.lang
@@ -1,27 +1,33 @@
 # 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
+UserMustChangePassNextLogon=ተጠቃሚው ጎራ ላይ የይለፍ ቃል መቀየር አለበት %s
+LDAPInformationsForThisContact=ለዚህ እውቂያ በኤልዲኤፒ ዳታቤዝ ውስጥ ያለ መረጃ
+LDAPInformationsForThisUser=ለዚህ ተጠቃሚ በኤልዲኤፒ ዳታቤዝ ውስጥ ያለ መረጃ
+LDAPInformationsForThisGroup=ለዚህ ቡድን በኤልዲኤፒ ዳታቤዝ ውስጥ ያለ መረጃ
+LDAPInformationsForThisMember=ለዚህ አባል በኤልዲኤፒ ዳታቤዝ ውስጥ ያለ መረጃ
+LDAPInformationsForThisMemberType=የዚህ አባል አይነት በኤልዲኤፒ ዳታቤዝ ውስጥ ያለ መረጃ
+LDAPAttributes=የኤልዲኤፒ ባህሪዎች
+LDAPCard=LDAP ካርድ
+LDAPRecordNotFound=መዝገብ በኤልዲኤፒ ዳታቤዝ ውስጥ አልተገኘም።
+LDAPUsers=በኤልዲኤፒ ዳታቤዝ ውስጥ ያሉ ተጠቃሚዎች
+LDAPFieldStatus=ሁኔታ
+LDAPFieldFirstSubscriptionDate=የመጀመሪያው የደንበኝነት ምዝገባ ቀን
+LDAPFieldFirstSubscriptionAmount=የመጀመሪያው የደንበኝነት መጠን
+LDAPFieldLastSubscriptionDate=የቅርብ ጊዜ የደንበኝነት ምዝገባ ቀን
+LDAPFieldLastSubscriptionAmount=የቅርብ ጊዜ የደንበኝነት ምዝገባ መጠን
+LDAPFieldSkype=የስካይፕ መታወቂያ
+LDAPFieldSkypeExample=ምሳሌ፡ ስካይፕ ስም
+UserSynchronized=ተጠቃሚ ተመሳስሏል።
+GroupSynchronized=ቡድን ተመሳስሏል።
+MemberSynchronized=አባል ተመሳስሏል።
+MemberTypeSynchronized=የአባል አይነት ተመሳስሏል።
+ContactSynchronized=እውቂያ ተመሳስሏል።
+ForceSynchronize=Dolibarr -> LDAPን ማመሳሰል ያስገድድ
+ErrorFailedToReadLDAP=የኤልዲኤፒ ዳታቤዝ ማንበብ አልተሳካም። የኤልዲኤፒ ሞጁል ማዋቀር እና የውሂብ ጎታ ተደራሽነትን ያረጋግጡ።
+PasswordOfUserInLDAP=በኤልዲኤፒ ውስጥ የተጠቃሚ ይለፍ ቃል
+LDAPPasswordHashType=የይለፍ ቃል ሃሽ አይነት
+LDAPPasswordHashTypeExample=በአገልጋዩ ላይ ጥቅም ላይ የዋለው የይለፍ ቃል ሃሽ ዓይነት
+SupportedForLDAPExportScriptOnly=በldap ኤክስፖርት ስክሪፕት ብቻ የተደገፈ
+SupportedForLDAPImportScriptOnly=በldap ማስመጣት ስክሪፕት ብቻ ነው የሚደገፈው
+LDAPUserAccountControl = የተጠቃሚ መለያ ቁጥጥር በፍጥረት ላይ (ንቁ ማውጫ)
+LDAPUserAccountControlExample = 512 መደበኛ መለያ / 546 መደበኛ መለያ + የይለፍ ቃል የለም + ተሰናክሏል (ይመልከቱ፡ https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/am_ET/loan.lang b/htdocs/langs/am_ET/loan.lang
index d271ed0c140..6272c777d70 100644
--- a/htdocs/langs/am_ET/loan.lang
+++ b/htdocs/langs/am_ET/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/am_ET/mailmanspip.lang b/htdocs/langs/am_ET/mailmanspip.lang
index bab4b3576b4..5db670a3708 100644
--- a/htdocs/langs/am_ET/mailmanspip.lang
+++ b/htdocs/langs/am_ET/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=የMailman ዝርዝሮችን መመዝገብ ለመሞከር
+TestUnSubscribe=ከመልእክተኛ ዝርዝሮች የደንበኝነት ምዝገባ ለመውጣት ለመሞከር
+MailmanCreationSuccess=የደንበኝነት ምዝገባ ሙከራ በተሳካ ሁኔታ ተፈጽሟል
+MailmanDeletionSuccess=ከደንበኝነት ምዝገባ የመውጣት ሙከራ በተሳካ ሁኔታ ተፈጽሟል
+SynchroMailManEnabled=የመልእክተኛ ማሻሻያ ይከናወናል
+SynchroSpipEnabled=የ Spip ዝማኔ ይከናወናል
+DescADHERENT_MAILMAN_ADMIN_PASSWORD=የመልእክተኛ አስተዳዳሪ የይለፍ ቃል
+DescADHERENT_MAILMAN_URL=ዩአርኤል ለመልእክተኛ ምዝገባዎች
+DescADHERENT_MAILMAN_UNSUB_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/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index e6e76953d3c..21f2ab16691 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -50,6 +50,7 @@ MailingStatusReadAndUnsubscribe=ያንብቡ እና ከደንበኝነት ምዝ
 ErrorMailRecipientIsEmpty=ኢሜይል ተቀባይ ባዶ ነው።
 WarningNoEMailsAdded=ወደ ተቀባይ ዝርዝር የሚታከል አዲስ ኢሜይል የለም።
 ConfirmValidMailing=እርግጠኛ ነዎት ይህን ኢሜል ማረጋገጥ ይፈልጋሉ?
+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=እርግጠኛ ነዎት ይህን ኢሜል መሰረዝ ይፈልጋሉ?
 NbOfUniqueEMails=የልዩ ኢሜይሎች ቁጥር
 NbOfUniquePhones=No. of unique phones
@@ -146,6 +147,7 @@ UseFormatFileEmailToTarget=ከውጭ የመጣው ፋይል ቅርጸት ሊኖ
 UseFormatInputEmailToTarget=ሕብረቁምፊ ከቅርጸት ጋር አስገባ <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=ተቀባዮች (የላቀ ምርጫ)
 AdvTgtTitle=ሶስተኛ ወገኖችን ወይም አድራሻዎችን/አድራሻዎችን ዒላማ ለመምረጥ የግቤት መስኮችን ሙላ
+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=ኢንት ወይም ተንሳፋፊ እሴትን ለመምረጥ ክፍተቱን ይጠቀሙ
 AdvTgtMinVal=ዝቅተኛው እሴት
 AdvTgtMaxVal=ከፍተኛው እሴት
@@ -180,10 +182,13 @@ IsAnAnswer=የመጀመሪያ ኢሜል መልስ ነው።
 RecordCreatedByEmailCollector=በኢሜል ሰብሳቢው የተፈጠረ መዝገብ %s ከኢሜል %s
 DefaultBlacklistMailingStatus=አዲስ እውቂያ ሲፈጥሩ የመስክ ነባሪ እሴት %s
 DefaultStatusEmptyMandatory=ባዶ ግን ግዴታ
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=ኢሜይሉን የሚልክለት ተቀባይ የለም።
 EmailOptedOut=የኢሜል ባለቤት በዚህ ኢሜይል እንዳያገኘው ጠይቀዋል።
 EvenUnsubscribe=መርጠው የወጡ ኢሜይሎችን ያካትቱ
 EvenUnsubscribeDesc=ኢሜይሎችን እንደ ዒላማ ሲመርጡ መርጠው የወጡ ኢሜይሎችን ያካትቱ። ለምሳሌ ለግዴታ አገልግሎት ኢሜይሎች ይጠቅማል።
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
 helpWithAi=Generate message from AI
+YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index 9f0a052a02e..fa6cb2fb43f 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil and Ethiopian
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=freeserif
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -22,13 +22,13 @@ FormatDateShortJQuery=mm/dd/yy
 FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
-FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
+FormatHourShortDuration=%H፡%M
+FormatDateTextShort=%b %d፣ %Y
 FormatDateText=%B %d, %Y
 FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, %I:%M %p
+FormatDateHourTextShort=%b %d፣ %Y፣ %I:%M %p
+FormatDateHourText=%B %d፣ %Y፣ %I:%M %p
 DatabaseConnection=የውሂብ ጎታ ግንኙነት
 NoTemplateDefined=ለዚህ ኢሜይል አይነት ምንም አብነት የለም።
 AvailableVariables=የሚገኙ ተለዋዋጮች
@@ -68,7 +68,7 @@ ErrorNoRequestInError=ምንም ጥያቄ በስህተት የለም።
 ErrorServiceUnavailableTryLater=አገልግሎቱ በአሁኑ ጊዜ አይገኝም። ቆይተው እንደገና ይሞክሩ።
 ErrorDuplicateField=በልዩ መስክ ውስጥ የተባዛ እሴት
 ErrorSomeErrorWereFoundRollbackIsDone=አንዳንድ ስህተቶች ተገኝተዋል። ለውጦች ወደ ኋላ ተመልሰዋል።
-ErrorConfigParameterNotDefined=መለኪያ <b>%s</b> በዶሊ ፓንባር ፋይሉ ውስጥ አልተገለጸም class='notranslate'><b></span>conf.php</b>።
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=ተጠቃሚን ማግኘት አልተሳካም <b>%s</b> በ Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=ስህተት፣ ለአገር '%s' የተገለጹ የቫት ተመኖች የሉም።
 ErrorNoSocialContributionForSellerCountry=ስህተት፣ ለሀገር '%s' የተገለጸ የማህበራዊ/የፋይስካል ታክስ አይነት የለም።
@@ -103,7 +103,7 @@ RecordDeleted=መዝገብ ተሰርዟል።
 RecordGenerated=መዝገብ ተፈጠረ
 LevelOfFeature=የባህሪዎች ደረጃ
 NotDefined=አልተገለጸም።
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr የማረጋገጫ ሁነታ ወደ <b>%sb09a4b739f17f80 ፋይል ውቅር ተቀናብሯል class='notranslate'><b>conf.php</b>.<br>ይህ ማለት የውሂብ ጎታው ውጫዊ ነው ማለት ነው. ዶሊባርር, ስለዚህ ይህንን መስክ መቀየር ምንም ውጤት ላይኖረው ይችላል.
+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=የስርዓት አስተዳዳሪ
 AdministratorDesc=የስርዓት አስተዳዳሪ (ተጠቃሚን ፣ ፈቃዶችን ግን የስርዓት ማዋቀር እና የሞጁሎችን ውቅር ማስተዳደር ይችላል)
 Undefined=ያልተገለጸ
@@ -131,7 +131,7 @@ TechnicalID=የቴክኒክ መታወቂያ
 LineID=የመስመር መታወቂያ
 NotePublic=ማስታወሻ (ይፋዊ)
 NotePrivate=ማስታወሻ (የግል)
-PrecisionUnitIsLimitedToXDecimals=ዶሊባር የተዋቀረው የዋጋ ትክክለኝነት ወደ <b>%s<span class='notranslate'>b09a4b739f17f>b09a4b739f17f .
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=ሙከራ
 ToFilter=አጣራ
 NoFilter=ማጣሪያ የለም።
@@ -172,7 +172,7 @@ Close=ገጠመ
 CloseAs=ሁኔታ አቀናብር ወደ
 CloseBox=መግብርን ከዳሽቦርድዎ ያስወግዱ
 Confirm=አረጋግጥ
-ConfirmSendCardByMail=የምር የዚህን ካርድ ይዘት በደብዳቤ ወደ <b>%s<span class='notranslate'>b09a4b739f17f17f መላክ ይፈልጋሉ? /ስፓን>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=ሰርዝ
 Remove=አስወግድ
 Resiliate=አቋርጥ
@@ -267,7 +267,7 @@ Numero=ቁጥር
 Limit=ገደብ
 Limits=ገደቦች
 Logout=ውጣ
-NoLogoutProcessWithAuthMode=ከማረጋገጫ ሁነታ ጋር ምንም አይነት የሚተገበር የማቋረጥ ባህሪ የለም <b>%s<span class='notranslate'></b>9a4b739f17f8z
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
 Connection=ግባ
 Setup=አዘገጃጀት
 Alert=ማንቂያ
@@ -420,6 +420,8 @@ TotalTTCShort=ጠቅላላ (ግብርን ጨምሮ)
 TotalHT=ጠቅላላ (ከግብር በስተቀር)
 TotalHTforthispage=ጠቅላላ (ከግብር በስተቀር) ለዚህ ገጽ
 Totalforthispage=ለዚህ ገጽ አጠቃላይ
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=ጠቅላላ (ግብርን ጨምሮ)
 TotalTTCToYourCredit=ጠቅላላ (ግብርን ጨምሮ) ለእርስዎ ክሬዲት
 TotalVAT=ጠቅላላ ግብር
@@ -502,7 +504,7 @@ Completed=ተጠናቀቀ
 Running=በሂደት ላይ
 RequestAlreadyDone=ጥያቄ አስቀድሞ ተመዝግቧል
 Filter=አጣራ
-FilterOnInto=የፍለጋ መስፈርት '<strong>%s</strong>=span> ወደ መስኮች <span> notranslate'>%s
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=ማጣሪያን ያስወግዱ
 ChartGenerated=ገበታ ተፈጥሯል።
 ChartNotGenerated=ገበታ አልተፈጠረም።
@@ -647,6 +649,7 @@ ReportName=ስም ሪፖርት አድርግ
 ReportPeriod=የሪፖርት ጊዜ
 ReportDescription=መግለጫ
 Report=ሪፖርት አድርግ
+Reports=Reports
 Keyword=ቁልፍ ቃል
 Origin=መነሻ
 Legend=አፈ ታሪክ
@@ -757,7 +760,7 @@ MenuMembers=አባላት
 MenuAgendaGoogle=ጉግል አጀንዳ
 MenuTaxesAndSpecialExpenses=ግብር | ልዩ ወጪዎች
 ThisLimitIsDefinedInSetup=Dolibarr ገደብ (ሜኑ home-setup-security)፡ %s Kb፣ PHP ገደብ፡ %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr ገደብ (ምናሌ %s): %s Kb፣ PHP ገደብ (Param b0ecb2ecz807fespan >): <span class='notranslate'>%s ኪባ
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=ምንም ሰነዶች አልተሰቀሉም።
 CurrentUserLanguage=የአሁኑ ቋንቋ
 CurrentTheme=የአሁኑ ጭብጥ
@@ -787,7 +790,7 @@ Merge=አዋህድ
 DocumentModelStandardPDF=መደበኛ ፒዲኤፍ አብነት
 PrintContentArea=ዋናውን የይዘት ቦታ ለማተም ገጽ አሳይ
 MenuManager=የምናሌ አስተዳዳሪ
-WarningYouAreInMaintenanceMode=ማስጠንቀቂያ፣ የጥገና ሁነታ ላይ ነዎት፡ መግቢያ ብቻ <b>%s<span class='notranslate'></b> መተግበሪያውን በዚህ ሁነታ እንዲጠቀም ተፈቅዶለታል።
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
 CoreErrorTitle=የስርዓት ስህተት
 CoreErrorMessage=ይቅርታ፣ ስህተት ተፈጥሯል። መዝገቦቹን ለመፈተሽ የስርዓት አስተዳዳሪዎን ያግኙ ወይም ተጨማሪ መረጃ ለማግኘት $dolibarr_main_prod=1ን ያሰናክሉ።
 CreditCard=የዱቤ ካርድ
@@ -865,7 +868,7 @@ Access=መዳረሻ
 SelectAction=እርምጃ ይምረጡ
 SelectTargetUser=ኢላማ ተጠቃሚ/ሰራተኛ ይምረጡ
 HelpCopyToClipboard=ወደ ቅንጥብ ሰሌዳ ለመቅዳት Ctrl+C ይጠቀሙ
-SaveUploadedFileWithMask=ፋይሉን በአገልጋዩ ላይ አስቀምጥ "<strong>%s</strong> (አለበለዚያ") <span class='notranslate'>%s")
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=ኦሪጅናል የፋይል ስም
 SetDemandReason=ምንጭ አዘጋጅ
 SetBankAccount=የባንክ ሂሳብን ይግለጹ
@@ -963,6 +966,7 @@ AutomaticallyCalculated=በራስ-ሰር ይሰላል
 TitleSetToDraft=ወደ ረቂቅ ተመለስ
 ConfirmSetToDraft=እርግጠኛ ነህ ወደ ረቂቅ ሁኔታ መመለስ ትፈልጋለህ?
 ImportId=የማስመጣት መታወቂያ
+Event=Event
 Events=ክስተቶች
 EMailTemplates=የኢሜል አብነቶች
 FileNotShared=ፋይል ለውጭ ህዝብ አልተጋራም።
@@ -1048,7 +1052,7 @@ Select2NotFound=ምንም ውጤት አልተገኘም።
 Select2Enter=አስገባ
 Select2MoreCharacter=ወይም ተጨማሪ ባህሪ
 Select2MoreCharacters=ወይም ተጨማሪ ቁምፊዎች
-Select2MoreCharactersMore=<strong>አገባብ ይፈልጉ፡</strong><br>><br><span' <kbd></span><strong> |</strong>b0460de notranslate'><kbd> ወይም</kbd> (a|b)<br><span class='notranslate'0 /span><strong>*</strong></kbd>='span><span' ><kbd> ማንኛውም ቁምፊ</kbd> (a*b)<br><span class='notranslatec19>2600 span><strong>^</strong></kbd><span' class='translate' <kbd></span> በ</kbd> (^ab)<br>27060ec <span class='notranslate'><strong>$</strong></kbd><spanlate'07770600000 /span> በ</kbd>(ab$)<br> ያበቃል
+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=ተጨማሪ ውጤቶችን በመጫን ላይ...
 Select2SearchInProgress=ፍለጋ በሂደት ላይ...
 SearchIntoThirdparties=ሦስተኛ ወገኖች
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=እርግጠኛ ነዎት ተጠቃሚዎችን ለተ
 ConfirmSetSupervisorQuestion=እርግጠኛ ኖት ሱፐርቫይዘርን ወደ %s የተመረጡ መዝገብ(ዎች) ማዋቀር ይፈልጋሉ?
 ConfirmUpdatePriceQuestion=እርግጠኛ ነዎት የ%s የተመረጡ ሪኮርዶችን ዋጋ ማዘመን ይፈልጋሉ?
 CategTypeNotFound=ለመዝገቦች አይነት ምንም የመለያ አይነት አልተገኘም።
-Rate=ደረጃ ይስጡ
 SupervisorNotFound=ተቆጣጣሪ አልተገኘም።
 CopiedToClipboard=ወደ ቅንጥብ ሰሌዳ ተቀድቷል።
 InformationOnLinkToContract=ይህ መጠን የውሉ መስመሮች አጠቃላይ ድምር ብቻ ነው። የጊዜ ፅንሰ-ሀሳብ ግምት ውስጥ አይገቡም.
@@ -1213,6 +1216,7 @@ CanceledHidden=ተሰርዟል ተደብቋል
 CanceledShown=ተሰርዟል።
 Terminate=አቋርጥ
 Terminated=ተቋርጧል
+Position=Position
 AddLineOnPosition=በአቀማመጥ ላይ መስመር አክል (ባዶ ከሆነ መጨረሻ ላይ)
 ConfirmAllocateCommercial=የሽያጭ ተወካይ ማረጋገጫ ይመድቡ
 ConfirmAllocateCommercialQuestion=እርግጠኛ ነዎት %s የተመረጠውን መዝገብ(ዎች) መመደብ ይፈልጋሉ?
@@ -1230,6 +1234,7 @@ ExternalUser=የውጭ ተጠቃሚ
 NoSpecificContactAddress=የተለየ አድራሻ ወይም አድራሻ የለም።
 NoSpecificContactAddressBis=ይህ ትር የተወሰኑ እውቂያዎችን ወይም አድራሻዎችን አሁን ላለው ነገር ለማስገደድ የተነደፈ ነው። በሶስተኛ ወገን ላይ ያለው መረጃ በቂ ካልሆነ ወይም ትክክለኛ ካልሆነ ለዕቃው አንድ ወይም ብዙ የተወሰኑ እውቂያዎችን ወይም አድራሻዎችን ለመግለጽ ከፈለጉ ብቻ ይጠቀሙበት።
 HideOnVCard=ደብቅ %s
+ShowOnVCard=Show %s
 AddToContacts=አድራሻዬን ወደ እውቂያዎቼ ጨምር
 LastAccess=የመጨረሻ መዳረሻ
 UploadAnImageToSeeAPhotoHere=እዚህ ፎቶ ለማየት ከትር %s ላይ ምስል ይስቀሉ
@@ -1259,3 +1264,7 @@ AmountSalary=የደመወዝ መጠን
 InvoiceSubtype=የክፍያ መጠየቂያ ንዑስ ዓይነት
 ConfirmMassReverse=የጅምላ ተገላቢጦሽ ማረጋገጫ
 ConfirmMassReverseQuestion=እርግጠኛ ነዎት %s የተመረጠውን መዝገብ(ዎች) መቀልበስ ይፈልጋሉ?
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/am_ET/margins.lang b/htdocs/langs/am_ET/margins.lang
index a91b139ec7b..33476ae433c 100644
--- a/htdocs/langs/am_ET/margins.lang
+++ b/htdocs/langs/am_ET/margins.lang
@@ -1,45 +1,46 @@
 # 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=የትርፍ መጠን
+ModifyMarginRates=የኅዳግ ዋጋዎችን ያስተካክሉ
+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=በክብደት አማካይ ዋጋ (ዋፕ) ላይ ህዳግ
+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/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index 5b21ed8e1c6..9844962eb49 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -13,7 +13,7 @@ MembersTickets=የአባልነት አድራሻ ሉህ
 FundationMembers=የመሠረት አባላት
 ListOfValidatedPublicMembers=የተረጋገጡ የህዝብ አባላት ዝርዝር
 ErrorThisMemberIsNotPublic=ይህ አባል ይፋዊ አይደለም።
-ErrorMemberIsAlreadyLinkedToThisThirdParty=ሌላ አባል (ስም፦ <b>%s</b>፣ ይግቡ ='notranslate'><b></span>%s</b>) አስቀድሞ ከሦስተኛ ወገን ጋር ተገናኝቷል <span class=' '><b></span>%s</b>። ሶስተኛ ወገን ከአባል ጋር ብቻ ሊገናኝ ስለማይችል (እና በተገላቢጦሽ) ይህን አገናኝ መጀመሪያ ያስወግዱት።
+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=ለደህንነት ሲባል፣ አባልን የአንተ ካልሆነ ተጠቃሚ ጋር ማገናኘት እንድትችል ሁሉንም ተጠቃሚዎች ለማርትዕ ፈቃድ ሊሰጥህ ይገባል።
 SetLinkToUser=ከ Dolibarr ተጠቃሚ ጋር አገናኝ
 SetLinkToThirdParty=ወደ Dolibarr ሶስተኛ ወገን አገናኝ
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 0a692f348f3..883e25d328d 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -91,10 +91,10 @@ ListOfMenusEntries=የምናሌ ግቤቶች ዝርዝር
 ListOfDictionariesEntries=የመዝገበ-ቃላት ግቤቶች ዝርዝር
 ListOfPermissionsDefined=የተገለጹ ፈቃዶች ዝርዝር
 SeeExamples=ምሳሌዎችን እዚህ ይመልከቱ
-EnabledDesc=ይህ መስክ ገቢር ለማድረግ ሁኔታ።<br><br>ምሳሌዎች፡<br></span span class='notranslate'><br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=ሜዳው ይታያል? (ምሳሌዎች፡- 0=በፍፁም የማይታይ፣ 1=በዝርዝር ውስጥ የሚታይ እና ቅጾችን መፍጠር/ማዘመን/ዕይታ፣ 2=በዝርዝር ላይ ብቻ የሚታይ፣ 3=በፍጠር/ማዘመን/በእይታ ቅጽ ላይ ብቻ (በዝርዝሮች ላይ ያልሆነ)፣ 4=በዝርዝሮች ላይ የሚታየው እና ማዘመን/ዕይታ ቅጽ ብቻ (አይፈጠርም)፣ 5=በዝርዝር ላይ የሚታየው እና ቅጽ ብቻ (አይፈጥርም፣ አይዘምንም)።<br><br> አሉታዊ እሴትን መጠቀም ማለት መስክ በነባሪ ዝርዝር ውስጥ አይታይም ነገር ግን ለዕይታ ሊመረጥ ይችላል)።
 ItCanBeAnExpression=መግለጫ ሊሆን ይችላል። ምሳሌ፡<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user -> መብት አለው ('በዓል'፣ 'በዓልን_መግለፅ')?1፡5
-DisplayOnPdfDesc=ይህንን መስክ በተመጣጣኝ የፒዲኤፍ ሰነዶች ላይ አሳይ፣ ቦታን በ"Position" መስክ ማስተዳደር ይችላሉ።<br><strong>ለሰነድ፡</strong><br>0 = አልታየም <br>1 = ማሳያ<span'class=' ><br></span>2 = ማሳያ ባዶ ካልሆነ ብቻ ነው<br><br>40478</c040e span>ለሰነድ መስመሮች፡<span class='notranslate'></strong><br>0 = አልታየም <br> = በአምድ ውስጥ ይታያል<span class='notranslate'><br>3 = ከመግለጫው በኋላ በመስመር መግለጫ አምድ ላይ አሳይ<br>4 = ከማብራሪያው በኋላ በመግለጫ አምድ ውስጥ አሳይ ባዶ ካልሆነ ብቻ
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=በፒዲኤፍ ላይ
 IsAMeasureDesc=አጠቃላይ ወደ ዝርዝር ውስጥ ለመግባት የመስክ ዋጋ ሊጠራቀም ይችላል? (ምሳሌ፡ 1 ወይም 0)
 SearchAllDesc=መስኩ ከፈጣን መፈለጊያ መሳሪያ ለመፈለግ ጥቅም ላይ ይውላል? (ምሳሌ፡ 1 ወይም 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=ከሞጁልዎ ውጪ የሆነ የንግድ ክስተት ሲፈ
 SeeIDsInUse=በእርስዎ ጭነት ላይ ጥቅም ላይ የዋሉ መታወቂያዎችን ይመልከቱ
 SeeReservedIDsRangeHere=የተያዙ መታወቂያዎችን ክልል ይመልከቱ
 ToolkitForDevelopers=ለ Dolibarr ገንቢዎች መሣሪያ ስብስብ
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.1Enable the module 2%s2 and use the wizard by clicking the 33 on the top right menu.4Warning: This is an advanced developer feature, do 5not5 experiment on your production site!
+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=ከላይ በቀኝ ሜኑ ላይ <span class="fa fa-bug"></span>ን ይመልከቱ
 AddLanguageFile=የቋንቋ ፋይል ያክሉ
 YouCanUseTranslationKey=በቋንቋ ፋይል ውስጥ የሚገኘውን የትርጉም ቁልፍ የሆነውን ቁልፍ እዚህ መጠቀም ትችላለህ ("ቋንቋዎች" የሚለውን ትር ተመልከት)
@@ -148,7 +148,7 @@ CSSListClass=CSS ለዝርዝር
 NotEditable=ሊስተካከል የማይችል
 ForeignKey=የውጭ ቁልፍ
 ForeignKeyDesc=የዚህ መስክ ዋጋ ወደ ሌላ ሠንጠረዥ መኖሩን ማረጋገጥ ካለበት. እዚህ ጋር የሚዛመድ አገባብ ያስገቡ፡ tablename.parentfieldtocheck
-TypeOfFieldsHelp=ምሳሌ፡<br>varchar(99)<br>email<br>s ='notranslate'><br></span>ip<br>url<br>የይለፍ ቃል<span class='0349 span>ድርብ(24,8)<br>እውነተኛ<br>text<br>> <span class='notranslate'><br>ቀን<br>datetime<br>የጊዜ ማህተም<span> <br></span>ኢንቲጀር<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0341 /span><span class='notranslate'><br>'1' ማለት መዝገቡን ለመፍጠር ከተጣመሩ በኋላ የ+ አዝራር እንጨምራለን<br>'filter' is an ሁለንተናዊ የማጣሪያ አገባብ ሁኔታ፡ ለምሳሌ፡ '((ሁኔታ፡=፡1) እና (fk_user==__USER_ID__) እና (ህጋዊ አካል፡ ውስጥ፡(__SHARED_ENTITIES__)))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=ይህ የመስክ/የባህሪው አይነት ነው።
 AsciiToHtmlConverter=Ascii ወደ HTML መቀየሪያ
 AsciiToPdfConverter=Ascii ወደ ፒዲኤፍ መቀየሪያ
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=ኮድ ወደ ገላጭ ማከል አልተሳካ
 DictionariesCreated=መዝገበ ቃላት <b>%s</b> በተሳካ ሁኔታ ተፈጥሯል
 DictionaryDeleted=መዝገበ ቃላት <b>%s</b> በተሳካ ሁኔታ ተወግዷል
 PropertyModuleUpdated=ንብረት <b>%s</b> በተሳካ ሁኔታ ተዘምኗል
-InfoForApiFile=* ለመጀመሪያ ጊዜ ፋይል ሲያመነጩ ሁሉም ዘዴዎች ይፈጠራሉ <strong> ለእያንዳንዱ ነገር።</strong><br>* <strong>ን ጠቅ ሲያደርጉ</strong> ሁሉንም ዘዴዎች ያስወግዳል ='notranslate'><strong></span>የተመረጠ ነገር</strong>።
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=ለሞጁል ማዋቀር ገጽ
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=ለጅምላ ኢሜል መላላኪያ ሞጁል አዲስ የኢሜል ኢላማ መራጮችን ለማቅረብ የክፍል ፋይሎችን እዚህ ማመንጨት እና ማርትዕ ይችላሉ።
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
index 74bed0d9186..34f82751c95 100644
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -1,109 +1,138 @@
-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 manufacturing or the disassembly
-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
+Mrp=የማምረት ትዕዛዞች
+MOs=የማምረት ትዕዛዞች
+ManufacturingOrder=የማምረት ትዕዛዝ
+MRPDescription=የምርት እና የማምረቻ ትዕዛዞችን (MO) ለማስተዳደር ሞጁል።
+MRPArea=MRP አካባቢ
+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=በ MO ሰነድ ላይ ነፃ ጽሑፍ
+WatermarkOnDraftMOs=በረቂቅ MO ላይ የውሃ ምልክት
+ConfirmCloneBillOfMaterials=እርግጠኛ ነህ የቁሳቁስ ሂሳብ መጠየቂያውን %s ?
+ConfirmCloneMo=እርግጠኛ ነህ የማኑፋክቸሪንግ ትዕዛዙን %s መዝጋት ትፈልጋለህ?
+ManufacturingEfficiency=የማምረት ውጤታማነት
+ConsumptionEfficiency=የፍጆታ ቅልጥፍና
+Consumption=ፍጆታ
+ValueOfMeansLoss=የ0.95 ዋጋ በአማካይ 5%%በማምረቻው ወይም በሚፈታበት ጊዜ የጠፋ ኪሳራ ማለት ነው።
+ValueOfMeansLossForProductProduced=የ0.95 ዋጋ በአማካይ 5%%የተመረተ ምርት ማጣት ማለት ነው።
+DeleteBillOfMaterials=የቁሳቁስ ሂሳብን ሰርዝ
+CancelMo=የማምረት ትዕዛዝ ሰርዝ
+MoCancelConsumedAndProducedLines=እንዲሁም ሁሉንም የተበላሹ እና የተሰሩ መስመሮችን ይሰርዙ (መስመሮችን እና የመመለሻ አክሲዮኖችን ይሰርዙ)
+ConfirmCancelMo=እርግጠኛ ነዎት ይህን የማምረቻ ትእዛዝ መሰረዝ ይፈልጋሉ?
+DeleteMo=የማምረት ትዕዛዝ ሰርዝ
+ConfirmDeleteBillOfMaterials=እርግጠኛ ነዎት ይህን የቢል ኦፍ ማቴሪያሎች መሰረዝ ይፈልጋሉ?
+ConfirmDeleteMo=እርግጠኛ ነዎት ይህን የማምረቻ ትዕዛዝ መሰረዝ ይፈልጋሉ?
+DeleteMoChild = ከዚህ MO ጋር የተገናኘውን ልጅ MOs ሰርዝ %s
+MoChildsDeleted = ሁሉም የልጅ MOs ተሰርዘዋል
+MenuMRP=የማምረት ትዕዛዞች
+NewMO=አዲስ የማምረቻ ትእዛዝ
+QtyToProduce=ለማምረት Qty
+DateStartPlannedMo=የሚጀመርበት ቀን ታቅዷል
+DateEndPlannedMo=የሚያበቃበት ቀን ታቅዷል
+KeepEmptyForAsap=ባዶ ማለት 'እንደ በተቻለ ፍጥነት' ማለት ነው
+EstimatedDuration=የሚገመተው ቆይታ
+EstimatedDurationDesc=ይህን 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
+ConfirmCloseBom=እርግጠኛ ነዎት ይህን BOM መሰረዝ ይፈልጋሉ (ከአሁን በኋላ አዲስ የማምረቻ ትዕዛዞችን ለመገንባት ሊጠቀሙበት አይችሉም)?
+ConfirmReopenBom=እርግጠኛ ነዎት ይህን BOM እንደገና መክፈት ይፈልጋሉ (አዲስ የማምረቻ ትዕዛዞችን ለመገንባት ሊጠቀሙበት ይችላሉ)
+StatusMOProduced=ተመረተ
+QtyFrozen=የቀዘቀዘ Qty
+QuantityFrozen=የቀዘቀዘ ብዛት
+QuantityConsumedInvariable=ይህ ባንዲራ ሲዋቀር፣ የሚበላው መጠን ሁልጊዜ የሚገለፀው እሴት ነው እና ከተመረተው መጠን ጋር አንጻራዊ አይደለም።
+DisableStockChange=የአክሲዮን ለውጥ ተሰናክሏል።
+DisableStockChangeHelp=ይህ ባንዲራ ሲዋቀር በዚህ ምርት ላይ ምንም አይነት የአክሲዮን ለውጥ የለም፣ የሚበላው ብዛት ምንም ይሁን
+BomAndBomLines=የቁሳቁስ እና የመስመሮች ሂሳቦች
+BOMLine=የ BOM መስመር
+WarehouseForProduction=ለማምረት መጋዘን
+CreateMO=MO ፍጠር
+ToConsume=ለመመገብ
+ToProduce=ለማምረት
+ToObtain=ለማግኘት
+QtyAlreadyConsumed=Qty አስቀድሞ ተበላ
+QtyAlreadyProduced=Qty አስቀድሞ ተመርቷል።
+QtyAlreadyConsumedShort=ብዛት ተበላ
+QtyAlreadyProducedShort=Qty ተመረተ
+QtyRequiredIfNoLoss=ምንም ኪሳራ ከሌለ (የማምረቻው ቅልጥፍና 100%% ከሆነ) ወደ BOM የተገለጸውን መጠን ለማምረት Qty ያስፈልጋል።
+ConsumeOrProduce=መብላት ወይም ማምረት
+ConsumeAndProduceAll=ሁሉንም መብላት እና ማምረት
+Manufactured=ተመረተ
+TheProductXIsAlreadyTheProductToProduce=የሚጨመርበት ምርት ቀድሞውኑ የሚመረተው ምርት ነው።
+ForAQuantityOf=የ%s በብዛት ለማምረት
+ForAQuantityToConsumeOf=የ%s ለመበተን መጠን
+ConfirmValidateMo=እርግጠኛ ነዎት ይህን የማምረቻ ትዕዛዝ ማረጋገጥ ይፈልጋሉ?
+ConfirmProductionDesc='%s' ላይ ጠቅ በማድረግ ለተቀመጡት መጠኖች ፍጆታ እና/ወይም ምርት ያረጋግጣሉ። ይህ የአክሲዮን ማዘመን እና የአክሲዮን እንቅስቃሴዎችን ይመዘግባል።
+ProductionForRef=የ%s ምርት
+CancelProductionForRef=የምርት ክምችት መቀነስ መሰረዝ ለምርት %s
+TooltipDeleteAndRevertStockMovement=መስመርን ሰርዝ እና የአክሲዮን እንቅስቃሴን አድህር
+AutoCloseMO=የሚፈጀው እና የሚያመርተው መጠን ከደረሰ የማምረቻውን ትዕዛዝ በራስ ሰር ዝጋ
+NoStockChangeOnServices=በአገልግሎቶች ላይ ምንም የአክሲዮን ለውጥ የለም።
+ProductQtyToConsumeByMO=በክፍት MO የሚበላው የምርት ብዛት
+ProductQtyToProduceByMO=በክፍት MO የሚመረተው የምርት ብዛት
+AddNewConsumeLines=ለመጠቀም አዲስ መስመር ያክሉ
+AddNewProduceLines=ለማምረት አዲስ መስመር ያክሉ
+ProductsToConsume=የሚበሉ ምርቶች
+ProductsToProduce=ለማምረት ምርቶች
+UnitCost=የክፍል ዋጋ
+TotalCost=ጠቅላላ ወጪ
+BOMTotalCost=ይህንን BOM ለማምረት በእያንዳንዱ መጠን እና በሚፈጀው ምርት ላይ የተመሰረተ ወጪ (የዋጋውን ዋጋ ከተገለጸ፣ ካልሆነ አማካይ የተመዘነ ዋጋ ከተገለጸ፣ አለበለዚያ ምርጡ የግዢ ዋጋ)
+BOMTotalCostService="የመስሪያ ጣቢያ" ሞጁል ገቢር ከሆነ እና አንድ የስራ ቦታ በመስመሩ ላይ በነባሪነት ከተገለጸ, ስሌቱ "ብዛት (ወደ ሰአታት የተቀየረ) x የስራ ቦታ ahr" ነው, አለበለዚያ "የአገልግሎቱ ዋጋ x ብዛት" ነው.
+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=የስራ ቦታ አይነት
+DefaultWorkstation=ነባሪ የስራ ቦታ
+Human=ሰው
+Machine=ማሽን
+HumanMachine=የሰው / ማሽን
+WorkstationArea=የስራ ቦታ
+Machines=ማሽኖች
+THMEstimatedHelp=ይህ ተመን የእቃውን ትንበያ ዋጋ ለመወሰን ያስችላል
+BOM=የቁሳቁሶች ቢል
+CollapseBOMHelp=በ BOM ሞጁል ውቅር ውስጥ የስም ዝርዝሮችን ነባሪ ማሳያ መግለጽ ይችላሉ።
+MOAndLines=የማምረት ትዕዛዞች እና መስመሮች
+MoChildGenerate=ልጅ ሞ ፍጠር
+ParentMo=MO ወላጅ
+MOChild=MO ልጅ
+BomCantAddChildBom=ስያሜው %s ወደ ስያሜው በሚወስደው ዛፍ ላይ አስቀድሞ አለ %s
+BOMNetNeeds = BOM የተጣራ ፍላጎቶች
+BOMProductsList=የ BOM ምርቶች
+BOMServicesList=የ BOM አገልግሎቶች
+Manufacturing=ማምረት
+Disassemble=መበተን
+ProducedBy=የተሰራው በ
+QtyTot=ብዛት ጠቅላላ
+
+QtyCantBeSplit= ብዛት ሊከፋፈል አይችልም።
+NoRemainQtyToDispatch=ለመከፋፈል የሚቀረው ምንም መጠን የለም።
+
+THMOperatorEstimatedHelp=የሚገመተው የኦፕሬተር ዋጋ በሰዓት። ይህንን የስራ ቦታ በመጠቀም የBOM ወጪን ለመገመት ስራ ላይ ይውላል።
+THMMachineEstimatedHelp=የሚገመተው የማሽን ዋጋ በሰዓት። ይህንን የስራ ቦታ በመጠቀም የBOM ወጪን ለመገመት ስራ ላይ ይውላል።
diff --git a/htdocs/langs/am_ET/multicurrency.lang b/htdocs/langs/am_ET/multicurrency.lang
index d59783d23ed..66b8b4fc86e 100644
--- a/htdocs/langs/am_ET/multicurrency.lang
+++ b/htdocs/langs/am_ET/multicurrency.lang
@@ -7,12 +7,12 @@ multicurrency_syncronize_error=የማመሳሰል ስህተት፡ %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=የቅርብ ጊዜውን የታወቀ መጠን ከመጠቀም ይልቅ የምንዛሬ ተመንን ለማግኘት የሰነዱን ቀን ይጠቀሙ
 multicurrency_useOriginTx=አንድ ነገር ከሌላው ሲፈጠር ዋናውን መጠን ከምንጩ ነገር ያቆዩት (አለበለዚያ የቅርብ ጊዜውን የታወቀ መጠን ይጠቀሙ)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=ይህንን ተግባር ለመጠቀም በድር ጣቢያ %s ላይ መለያ መፍጠር አለቦት።<br>የእርስዎን b0aee83365837 /span>ኤፒአይ ቁልፍ<span class='notranslate'></b><br>ነጻ መለያ ከተጠቀሙ የ<span class='ን መቀየር አይችሉም notranslate'><b></span>ምንጭ ምንዛሬ</b> (በነባሪ የአሜሪካ ዶላር)<br>የእርስዎ ዋና ገንዘብ ከሆነ የአሜሪካ ዶላር አይደለም አፕሊኬሽኑ በራስ ሰር እንደገና ይሰላል።<br><br>እርስዎ በወር 1000 ማመሳሰል ተወስነዋል።
+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=የኤፒአይ ቁልፍ
 multicurrency_appCurrencySource=ምንጭ ምንዛሬ
 multicurrency_alternateCurrencySource=ተለዋጭ ምንጭ ምንዛሬ
 CurrenciesUsed=ጥቅም ላይ የዋሉ ምንዛሬዎች
-CurrenciesUsed_help_to_add=በእርስዎ <b>proposals</b>, b60838 /span>ትዕዛዝ<span class='notranslate'></b> ወዘተ።
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=ደረጃ
 MulticurrencyReceived=ተቀብሏል፣ ኦሪጅናል ምንዛሬ
 MulticurrencyRemainderToTake=የቀረው መጠን፣ የመጀመሪያው ምንዛሬ
diff --git a/htdocs/langs/am_ET/opensurvey.lang b/htdocs/langs/am_ET/opensurvey.lang
index 9fafacaf8bf..e5ea9acdc92 100644
--- a/htdocs/langs/am_ET/opensurvey.lang
+++ b/htdocs/langs/am_ET/opensurvey.lang
@@ -1,63 +1,64 @@
 # 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=የሕዝብ አስተያየትን በቀጥታ ለማግኘት ዩአርኤል ለመገናኘት
+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>- " 8 ሰ፣ "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=አስተያየት ለመለጠፍ ድምጽ የሰጡበት እና ድምጽ ለመስጠት የተጠቀሙበትን የተጠቃሚ ስም መጠቀም አለብዎት
+ListOfOpenSurveys=ክፍት የዳሰሳ ጥናቶች ዝርዝር
diff --git a/htdocs/langs/am_ET/orders.lang b/htdocs/langs/am_ET/orders.lang
index 1933d8dbeda..789c7b0088d 100644
--- a/htdocs/langs/am_ET/orders.lang
+++ b/htdocs/langs/am_ET/orders.lang
@@ -103,10 +103,10 @@ disablelinefree=ነፃ መስመሮች የሉም
 CloseOrder=ትእዛዝ ዝጋ
 ConfirmCloseOrder=እርግጠኛ ነዎት ይህን ትዕዛዝ እንዲደርስ ማዋቀር ይፈልጋሉ? አንዴ ትእዛዝ ከደረሰ፣ እንዲከፍል ሊዋቀር ይችላል።
 ConfirmDeleteOrder=እርግጠኛ ነዎት ይህን ትዕዛዝ መሰረዝ ይፈልጋሉ?
-ConfirmValidateOrder=እርግጠኛ ነህ ይህን ትዕዛዝ በስም <b>%s</b><span class='notranslate'></b> ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
 ConfirmUnvalidateOrder=እርግጠኛ ነህ <b>%s</b> ሁኔታን ወደ ረቂቅ ሁኔታ መመለስ ትፈልጋለህ? ?
 ConfirmCancelOrder=እርግጠኛ ነዎት ይህን ትዕዛዝ መሰረዝ ይፈልጋሉ?
-ConfirmMakeOrder=እርግጠኛ ነዎት ይህንን ትዕዛዝ በ<b>%s</b><span class='notranslate'></b> ላይ ማረጋገጥ ትፈልጋለህ። >?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=የክፍያ መጠየቂያ ማመንጨት
 ClassifyShipped=ደርሷል
 PassedInShippedStatus=ተመድቧል
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 49ff93dd589..1a5778132d0 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -1,305 +1,340 @@
 # 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__
+Tools=መሳሪያዎች
+TMenuTools=መሳሪያዎች
+ToolsDesc=በሌሎች የሜኑ ምዝግቦች ውስጥ ያልተካተቱ ሁሉም መሳሪያዎች እዚህ ተመድበዋል።<br>ሁሉም መሳሪያዎች በግራ ምናሌው በኩል ሊገኙ ይችላሉ።
+Birthday=የልደት ቀን
+BirthdayAlert=የልደት ማስጠንቀቂያ
+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_CLOSE=የሽያጭ ትዕዛዝ ደርሷል
+Notify_ORDER_SUPPLIER_SENTBYMAIL=የግዢ ትዕዛዝ በኢሜል ተልኳል።
+Notify_ORDER_SUPPLIER_VALIDATE=የግዢ ትዕዛዝ ተመዝግቧል
+Notify_ORDER_SUPPLIER_APPROVE=የግዢ ትዕዛዝ ጸድቋል
+Notify_ORDER_SUPPLIER_SUBMIT=የግዢ ትዕዛዝ ገብቷል።
+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_CLOSE=ጣልቃ ገብነት ተዘግቷል።
+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_ፊርማ__
 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
-LengthUnitm=m
+PredefinedMailContentContract=__(ሀሎ)__\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendInvoice=__(ሀሎ)__\n\nእባክዎን ደረሰኝ __REF__ አያይዘው ያግኙ\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendInvoiceReminder=__(ሀሎ)__\n\nየክፍያ መጠየቂያ __REF__ ያልተከፈለ እንደሚመስል ልናስታውስዎ እንወዳለን። የክፍያ መጠየቂያው ቅጂ እንደ ማስታወሻ ተያይዟል።\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendProposal=__(ሀሎ)__\n\nእባክዎ የንግድ ፕሮፖዛል __REF__ አያይዘው ያግኙ\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendSupplierProposal=__(ሀሎ)__\n\nእባክዎ የዋጋ ጥያቄን __REF__ አያይዘው ያግኙ\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendOrder=__(ሀሎ)__\n\nእባክዎን ትዕዛዝ__REF__ ተያይዟል።\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendSupplierOrder=__(ሀሎ)__\n\nእባክዎን የእኛን ትዕዛዝ __REF__ አያይዘው ያግኙ\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendSupplierInvoice=__(ሀሎ)__\n\nእባክዎን ደረሰኝ __REF__ አያይዘው ያግኙ\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendShipping=__(ሀሎ)__\n\nእባክህ መላኪያ__REF__ ተያይዟል።\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendFichInter=__(ሀሎ)__\n\nእባክዎን ጣልቃ ገብነት __REF__ አያይዘው ያግኙ\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentLink=ክፍያው ካልተከናወነ ለመክፈል ከዚህ በታች ያለውን ሊንክ ጠቅ ማድረግ ይችላሉ።\n\n%s\n\n
+PredefinedMailContentGeneric=__(ሀሎ)__\n\n\n__(ከሠላምታ ጋር)__\n\n_USER_ፊርማ__
+PredefinedMailContentSendActionComm=የክስተት አስታዋሽ "__EVENT_LABEL__" በ__EVENT_DATE__ በ__EVENT_TIME__<br><br>ይህ ራስ-ሰር መልእክት ነው፣ እባክዎን ምላሽ አይስጡ።
+DemoDesc=ዶሊባርር ብዙ የንግድ ሞጁሎችን የሚደግፍ የታመቀ ኢአርፒ/ሲአርኤም ነው። ይህ ሁኔታ በጭራሽ ስለማይከሰት ሁሉንም ሞጁሎች የሚያሳይ ማሳያ ትርጉም የለውም (በርካታ መቶዎች ይገኛሉ)። ስለዚህ፣ በርካታ ማሳያዎች ይገኛሉ።
+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=ኤም
 LengthUnitdm=dm
-LengthUnitcm=cm
-LengthUnitmm=mm
-Surface=Area
+LengthUnitcm=ሴሜ
+LengthUnitmm=ሚ.ሜ
+Surface=አካባቢ
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
-SurfaceUnitcm2=cm²
-SurfaceUnitmm2=mm²
-SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
-Volume=Volume
+SurfaceUnitcm2=ሴሜ²
+SurfaceUnitmm2=ሚሜ²
+SurfaceUnitfoot2=ጫማ²
+SurfaceUnitinch2=በ² ውስጥ
+Volume=ድምጽ
 VolumeUnitm3=m³
-VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=cm³ (ml)
-VolumeUnitmm3=mm³ (µl)
-VolumeUnitfoot3=ft³
-VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
-SizeUnitm=m
+VolumeUnitdm3=dm³ (ኤል)
+VolumeUnitcm3=ሴሜ³ (ሚሊ)
+VolumeUnitmm3=ሚሜ³ (µl)
+VolumeUnitfoot3=ጫማ³
+VolumeUnitinch3=ውስጥ³
+VolumeUnitounce=አውንስ
+VolumeUnitlitre=ሊትር
+VolumeUnitgallon=ጋሎን
+SizeUnitm=ኤም
 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.
+SizeUnitcm=ሴሜ
+SizeUnitmm=ሚ.ሜ
+SizeUnitinch=ኢንች
+SizeUnitfoot=እግር
+SizeUnitpoint=ነጥብ
+BugTracker=የሳንካ መከታተያ
+SendNewPasswordDesc=ይህ ቅጽ አዲስ የይለፍ ቃል እንዲጠይቁ ያስችልዎታል። ወደ ኢሜል አድራሻዎ ይላካል።<br>ለውጡ ውጤታማ የሚሆነው በኢሜል ውስጥ ያለውን የማረጋገጫ አገናኝ ጠቅ ካደረጉ በኋላ ነው።<br> የገቢ መልእክት ሳጥንዎን ያረጋግጡ።
+EnterNewPasswordHere=አዲሱን የይለፍ ቃልዎን እዚህ ያስገቡ
+BackToLoginPage=ወደ የመግቢያ ገጽ ተመለስ
+AuthenticationDoesNotAllowSendNewPassword=የማረጋገጫ ሁነታ <b>%s</b> ነው:: ><br>በዚህ ሁነታ Dolibarr የይለፍ ቃልህን ማወቅም ሆነ መለወጥ አይችልም።<br>የይለፍ ቃልህን መለወጥ ከፈለክ የስርዓት አስተዳዳሪህን አግኝ።
+EnableGDLibraryDesc=ይህንን አማራጭ ለመጠቀም በPHP ጭነትዎ ላይ የጂዲ ቤተ-መጽሐፍትን ጫን ወይም አንቃ።
 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
-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
-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
-LoginWith=Login with %s
+DolibarrDemo=ዶሊባርር ኢአርፒ/CRM ማሳያ
+StatsByAmount=የምርቶች/አገልግሎቶች ብዛት ላይ ስታቲስቲክስ
+StatsByAmountProducts=የምርቶች ብዛት ላይ ስታቲስቲክስ
+StatsByAmountServices=በአገልግሎት ብዛት ላይ ስታቲስቲክስ
+StatsByNumberOfUnits=የቁቲ ምርቶች/አገልግሎቶች ድምር ስታቲስቲክስ
+StatsByNumberOfUnitsProducts=የቁቲ ምርቶች ድምር ስታቲስቲክስ
+StatsByNumberOfUnitsServices=የኪቲ አገልግሎቶች ድምር ስታቲስቲክስ
+StatsByNumberOfEntities=የማጣቀሻ አካላት ብዛት ስታትስቲክስ (የክፍያ መጠየቂያዎች ቁጥር፣ ወይም ትዕዛዞች...)
+NumberOf=የ%s ብዛት
+NumberOfUnits=በ%s ላይ ያሉት ክፍሎች ብዛት
+AmountIn=በ%s ውስጥ ያለው መጠን
+NumberOfUnitsMos=በማኑፋክቸሪንግ ትዕዛዞች ውስጥ ለማምረት የንጥሎች ብዛት
+EMailTextInterventionAddedContact=አዲስ ጣልቃ ገብነት %s ለእርስዎ ተመድቧል።
+EMailTextInterventionValidated=ጣልቃ ገብነት %s ተረጋግጧል።
+EMailTextInterventionClosed=ጣልቃ ገብነት %s ተዘግቷል።
+EMailTextInvoiceValidated=ደረሰኝ %s ተረጋግጧል።
+EMailTextInvoicePayed=ደረሰኝ %s ተከፍሏል።
+EMailTextProposalValidated=ፕሮፖዛል %s ጸድቋል።
+EMailTextProposalClosedSigned=ፕሮፖዛል %s ተፈርሟል።
+EMailTextProposalClosedSignedWeb=ፕሮፖዛል %s በፖርታል ገጽ ላይ ተዘግቷል።
+EMailTextProposalClosedRefused=ፕሮፖዛል %s ተዘግቷል።
+EMailTextProposalClosedRefusedWeb=ፕሮፖዛል %s በፖርታል ገጽ ላይ እምቢታ ተዘግቷል።
+EMailTextOrderValidated=ትዕዛዝ %s ጸድቋል።
+EMailTextOrderClose=ትዕዛዝ %s ደርሷል።
+EMailTextSupplierOrderApprovedBy=የግዢ ትዕዛዝ %s በ%s ጸድቋል።
+EMailTextSupplierOrderValidatedBy=የግዢ ትዕዛዝ %s በ%s ተመዝግቧል።
+EMailTextSupplierOrderSubmittedBy=የግዢ ትዕዛዝ %s በ%s ገብቷል።
+EMailTextSupplierOrderRefusedBy=የግዢ ትዕዛዝ %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=የይለፍ ቃሉ ቢያንስ <strong>%s</strong> ትልቅ ፊደል ያስፈልገዋል
+PasswordNeedAtLeastXDigitChars=የይለፍ ቃሉ ቢያንስ <strong>%s</strong>ቁጥር ያስፈልገዋል
+PasswordNeedAtLeastXSpecialChars=የይለፍ ቃሉ ቢያንስ <strong>%s</strong> ልዩ ያስፈልገዋል
+PasswordNeedNoXConsecutiveChars=የይለፍ ቃሉ <strong>%s</strong> ተመሳሳይ ውጤት ሊኖረው አይገባም።
+YourPasswordHasBeenReset=የይለፍ ቃልዎ በተሳካ ሁኔታ ዳግም ተቀናብሯል።
+ApplicantIpAddress=የአመልካች አይፒ አድራሻ
+SMSSentTo=ኤስኤምኤስ ወደ %s ተልኳል
+MissingIds=የጠፉ መታወቂያዎች
+ThirdPartyCreatedByEmailCollector=ከኢሜይል MSGID %s በኢሜይል ሰብሳቢ የተፈጠረ ሶስተኛ ወገን
+ContactCreatedByEmailCollector=እውቂያ/አድራሻ የተፈጠረው በኢሜል ሰብሳቢው ከኢሜል MSGID %s
+ProjectCreatedByEmailCollector=ፕሮጀክት በኢሜይል ሰብሳቢ ከኤምኤስጂአይዲ የተፈጠረ %s
+TicketCreatedByEmailCollector=ትኬት በኢሜይል ሰብሳቢው የተፈጠረ ከኢሜይል MSGID %s
+OpeningHoursFormatDesc=የመክፈቻ እና የመዝጊያ ሰዓቶችን ለመለየት ሀ - ተጠቀም።<br>የተለያዩ ክልሎችን ለማስገባት ቦታ ተጠቀም።<br>ምሳሌ፡ 8-12 14 -18
+SuffixSessionName=ለክፍለ ጊዜ ስም ቅጥያ
+LoginWith=በ%s ይግቡ
 
 ##### 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__ ተጠቀም (ለምሳሌ፡ ምስል/__ድር ጣቢያ_ቁልፍ__/ ታሪኮች/mymage.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=የጥያቄው ቆይታ
+ProductsServicesPerPopularity=ምርቶች | አገልግሎቶች በታዋቂነት
+ProductsPerPopularity=ምርቶች በታዋቂነት
+ServicesPerPopularity=አገልግሎቶች በታዋቂነት
+PopuProp=ምርቶች|በፕሮፖዛል ውስጥ ታዋቂነት ያላቸው አገልግሎቶች
+PopuCom=ምርቶች|በትእዛዝ ውስጥ ያሉ አገልግሎቶች በታዋቂነት
+ProductStatistics=ምርቶች|የአገልግሎቶች ስታቲስቲክስ
+NbOfQtyInOrders=በትእዛዞች ውስጥ Qty
+SelectTheTypeOfObjectToAnalyze=ስታቲስቲክሱን ለማየት አንድ ነገር ይምረጡ...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
-CloseDialog = Close
+ConfirmBtnCommonContent = እርግጠኛ ነህ "%s" ?
+ConfirmBtnCommonTitle = ድርጊትህን አረጋግጥ
+CloseDialog = ገጠመ
+Autofill = ራስ-ሙላ
+OrPasteAnURL=ወይም URL ለጥፍ
+
+# externalsite
+ExternalSiteSetup=ወደ ውጫዊ ድር ጣቢያ የሚወስድ አገናኝ ያዋቅሩ
+ExternalSiteURL=የኤችቲኤምኤል iframe ይዘት ውጫዊ ጣቢያ URL
+ExternalSiteModuleNotComplete=Module ExternalSite በትክክል አልተዋቀረም።
+ExampleMyMenuEntry=የእኔ ምናሌ ግቤት
+
+# ftp
+FTPClientSetup=የኤፍቲፒ ወይም SFTP ደንበኛ ሞጁል ማዋቀር
+NewFTPClient=አዲስ የኤፍቲፒ/SFTP ግንኙነት ማዋቀር
+FTPArea=የኤፍቲፒ/SFTP አካባቢ
+FTPAreaDesc=ይህ ማያ ገጽ የኤፍቲፒ እና SFTP አገልጋይ እይታ ያሳያል።
+SetupOfFTPClientModuleNotComplete=የኤፍቲፒ ወይም SFTP ደንበኛ ሞጁል ማዋቀር ያልተሟላ ይመስላል
+FTPFeatureNotSupportedByYourPHP=የእርስዎ ፒኤችፒ ኤፍቲፒ ወይም SFTP ተግባራትን አይደግፍም።
+FailedToConnectToFTPServer=ከአገልጋይ ጋር መገናኘት አልተሳካም (አገልጋይ %s፣ ወደብ %s)
+FailedToConnectToFTPServerWithCredentials=በተወሰነ የመግቢያ/የይለፍ ቃል ወደ አገልጋይ መግባት አልተሳካም።
+FTPFailedToRemoveFile=ፋይል <b>%s</b>ን ማስወገድ አልተሳካም።
+FTPFailedToRemoveDir=ማውጫን ማስወገድ አልተሳካም <b>%s</b> ዳይሬክተሩን እና ፈቃዱን ያረጋግጡ: ባዶ ነው.
+FTPPassiveMode=ተገብሮ ሁነታ
+ChooseAFTPEntryIntoMenu=ከምናሌው የኤፍቲፒ/ኤስኤፍቲፒ ጣቢያ ይምረጡ...
+FailedToGetFile=ፋይሎችን ማግኘት አልተሳካም %s
+ErrorFTPNodisconnect=የኤፍቲፒ/SFTP አገልጋይን የማቋረጥ ስህተት
+FileWasUpload=ፋይል <b>%s</b> ተሰቅሏል
+FTPFailedToUploadFile=ፋይሉን <b>%s</b> መስቀል አልተሳካም።
+AddFolder=አቃፊ ፍጠር
+FileWasCreateFolder=አቃፊ <b>%s</b> ተፈጥሯል
+FTPFailedToCreateFolder=<b>%s</b> አቃፊ መፍጠር አልተሳካም።
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/am_ET/partnership.lang b/htdocs/langs/am_ET/partnership.lang
index 0fbdaa9744a..a5907df9596 100644
--- a/htdocs/langs/am_ET/partnership.lang
+++ b/htdocs/langs/am_ET/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=ለመጨረሻው የዩአርኤል ፍተሻ የስህ
 LastCheckBacklink=የመጨረሻው የዩአርኤል ፍተሻ ቀን
 
 NewPartnershipRequest=አዲስ የአጋርነት ጥያቄ
-NewPartnershipRequestDesc=ይህ ፎርም የአንዱ አጋርነት ፕሮግራማችን አካል ለመሆን እንዲጠይቁ ያስችልዎታል። ይህን ቅጽ ለመሙላት እርዳታ ከፈለጉ፣ እባክዎን በኢሜል ያነጋግሩ <b>%s<span class='notranslate'>b09a4b739f17f80 span>
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=ይህ ገጽ ከሚከተሉት ጎራዎች ወደ አንዱ ቢያንስ አንድ አገናኝ መያዝ አለበት፡ %s
 
 IPOfApplicant=የአመልካች አይፒ
-
diff --git a/htdocs/langs/am_ET/paybox.lang b/htdocs/langs/am_ET/paybox.lang
index 1bbbef4017b..ee163c258b6 100644
--- a/htdocs/langs/am_ET/paybox.lang
+++ b/htdocs/langs/am_ET/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-Continue=Next
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-VendorName=Name of vendor
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+PayBoxSetup=PayBox ሞጁል ማዋቀር
+PayBoxDesc=ይህ ሞጁል በደንበኞች <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> ላይ ክፍያ ለመፍቀድ ገጾችን ያቀርባል። ይህ ለነጻ ክፍያ ወይም በአንድ የተወሰነ የዶሊባርር ነገር (ደረሰኝ፣ ትዕዛዝ፣ ...) ላይ ለክፍያ ሊያገለግል ይችላል።
+FollowingUrlAreAvailableToMakePayments=የሚከተሉት ዩአርኤሎች በዶሊባርር ዕቃዎች ላይ ክፍያ ለመፈጸም ለደንበኛ አንድ ገጽ ለማቅረብ ይገኛሉ
+PaymentForm=የክፍያ ቅጽ
+WelcomeOnPaymentPage=ወደ የመስመር ላይ ክፍያ አገልግሎታችን እንኳን በደህና መጡ
+ThisScreenAllowsYouToPay=ይህ ስክሪን ለ%s የመስመር ላይ ክፍያ እንድትከፍል ያስችልሃል።
+ThisIsInformationOnPayment=ይህ በክፍያ ላይ መረጃ ነው
+ToComplete=ለማጠናቀቅ
+YourEMail=የክፍያ ማረጋገጫ ለመቀበል ኢሜይል ያድርጉ
+Creditor=አበዳሪ
+PaymentCode=የክፍያ ኮድ
+PayBoxDoPayment=በ Paybox ይክፈሉ።
+YouWillBeRedirectedOnPayBox=የክሬዲት ካርድ መረጃን ለማስገባት ደህንነቱ በተጠበቀው የ Paybox ገጽ ላይ ይዛወራሉ።
+Continue=ቀጥሎ
+SetupPayBoxToHavePaymentCreatedAutomatically=የክፍያ ሳጥንዎን በ url <b>%s</b> ለመክፈል በራስ-ሰር ሲፈጠር ያዋቅሩ። በ Paybox የተረጋገጠ።
+YourPaymentHasBeenRecorded=ይህ ገጽ ክፍያዎ መመዝገቡን ያረጋግጣል። አመሰግናለሁ.
+YourPaymentHasNotBeenRecorded=ክፍያዎ አልተመዘገበም እና ግብይቱ ተሰርዟል። አመሰግናለሁ.
+AccountParameter=የመለያ መለኪያዎች
+UsageParameter=የአጠቃቀም መለኪያዎች
+InformationToFindParameters=የእርስዎን %s መለያ መረጃ ለማግኘት ያግዙ
+PAYBOX_CGI_URL_V2=የ Paybox CGI ሞጁል ዩአርኤል ለክፍያ
+CSSUrlForPaymentForm=ለክፍያ ቅጽ የCSS ቅጥ ሉህ ዩአርኤል
+NewPayboxPaymentReceived=አዲስ የ Paybox ክፍያ ተቀብሏል።
+NewPayboxPaymentFailed=አዲስ የ Paybox ክፍያ ሞክሮ አልተሳካም።
+PAYBOX_PAYONLINE_SENDEMAIL=ከክፍያ ሙከራ በኋላ የኢሜል ማሳወቂያ (ስኬት ወይም ውድቀት)
+PAYBOX_PBX_SITE=ለPBX SITE ዋጋ
+PAYBOX_PBX_RANG=የPBX Rang ዋጋ
+PAYBOX_PBX_IDENTIFIANT=ለPBX መታወቂያ ዋጋ
+PAYBOX_HMAC_KEY=HMAC ቁልፍ
diff --git a/htdocs/langs/am_ET/paypal.lang b/htdocs/langs/am_ET/paypal.lang
index 5eb5f389445..9c1f88b3356 100644
--- a/htdocs/langs/am_ET/paypal.lang
+++ b/htdocs/langs/am_ET/paypal.lang
@@ -1,36 +1,37 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-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=የ PayPal ሞጁል ማዋቀር
+PaypalDesc=ይህ ሞጁል በደንበኞች በ<a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a> በኩል ክፍያ ይፈቅዳል። ይህ ለማስታወቂያ-ሆክ ክፍያ ወይም ከዶሊባርር ነገር ጋር ለተዛመደ ክፍያ (ክፍያ መጠየቂያ፣ ትዕዛዝ፣ ...) ጥቅም ላይ ሊውል ይችላል።
+PaypalOrCBDoPayment=በ PayPal (ካርድ ወይም PayPal) ይክፈሉ
+PaypalDoPayment=በ PayPal ይክፈሉ።
+PAYPAL_API_SANDBOX=ሁነታ ሙከራ/ማጠሪያ
+PAYPAL_API_USER=የኤፒአይ ተጠቃሚ ስም
+PAYPAL_API_PASSWORD=የኤፒአይ ይለፍ ቃል
+PAYPAL_API_SIGNATURE=የኤፒአይ ፊርማ
+PAYPAL_SSLVERSION=Curl SSL ስሪት
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY="የተዋሃደ" ክፍያ (ክሬዲት ካርድ+PayPal) ወይም "PayPal" ብቻ ያቅርቡ
+PaypalModeIntegral=የተዋሃደ
+PaypalModeOnlyPaypal=PayPal ብቻ
+ONLINE_PAYMENT_CSS_URL=በመስመር ላይ የክፍያ ገጽ ላይ የሲኤስኤስ የቅጥ ሉህ አማራጭ ዩአርኤል
+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=የፔይፓል ክፍያዎችን ያስመጡ
+PostActionAfterPayment=ከክፍያ በኋላ እርምጃዎችን ይለጥፉ
+ARollbackWasPerformedOnPostActions=በሁሉም የልጥፍ ድርጊቶች ላይ የመልሶ ማቋቋም ስራ ተሰርቷል። አስፈላጊ ከሆነ ድርጊቶችን እራስዎ ማጠናቀቅ አለብዎት.
+ValidationOfPaymentFailed=ክፍያን ማረጋገጥ አልተሳካም።
+CardOwner=ካርድ ያዥ
+PayPalBalance=Paypal ክሬዲት
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/am_ET/printing.lang b/htdocs/langs/am_ET/printing.lang
index bd9094f213d..521e43ecb90 100644
--- a/htdocs/langs/am_ET/printing.lang
+++ b/htdocs/langs/am_ET/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
+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=ይህ አሽከርካሪ Google Cloud Print በመጠቀም ሰነዶችን በቀጥታ ወደ አታሚ መላክ ይፈቅዳል።
+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=አታሚ ዩሪ
+IPP_Name=የአታሚ ስም
+IPP_State=የአታሚ ግዛት
+IPP_State_reason=የግዛት ምክንያት
+IPP_State_reason1=የግዛት ምክንያት1
 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.
+IPP_Color=ቀለም
+IPP_Device=መሳሪያ
+IPP_Media=የአታሚ ሚዲያ
+IPP_Supported=የሚዲያ ዓይነት
+DirectPrintingJobsDesc=ይህ ገጽ ላሉ አታሚዎች የተገኙ የማተሚያ ሥራዎችን ይዘረዝራል።
+GoogleAuthNotConfigured=Google OAuth አልተዋቀረም። ሞዱል OAuthን አንቃ እና የGoogle መታወቂያ/ሚስጥርን አዘጋጅ።
+GoogleAuthConfigured=የGoogle OAuth ምስክርነቶች በሞጁል OAuth ማዋቀር ውስጥ ተገኝተዋል።
+PrintingDriverDescprintgcp=የጎግል ክላውድ ህትመት ነጂዎችን ለማተም የውቅር ተለዋዋጮች።
+PrintingDriverDescprintipp=የአሽከርካሪ ኩባያዎችን ለማተም የማዋቀር ተለዋዋጮች።
+PrintTestDescprintgcp=ለGoogle ደመና ህትመት የአታሚዎች ዝርዝር።
+PrintTestDescprintipp=ለ ኩባያዎች የአታሚዎች ዝርዝር.
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
index ddf3eab9f3f..921c527f0aa 100644
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -1,45 +1,52 @@
 # 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
-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
+ManageLotSerial=ዕጣ/ተከታታይ ቁጥር ተጠቀም
+ProductStatusOnBatch=አዎ (ብዙ ያስፈልጋል)
+ProductStatusOnSerial=አዎ (ልዩ መለያ ቁጥር ያስፈልጋል)
+ProductStatusNotOnBatch=የለም (ሎት/ተከታታይ ጥቅም ላይ አልዋለም)
+ProductStatusOnBatchShort=ሎጥ
+ProductStatusOnSerialShort=ተከታታይ
+ProductStatusNotOnBatchShort=አይ
+BatchSellOrEatByMandatoryList=Make %s or %s mandatory
+BatchSellOrEatByMandatoryNone=None
+BatchSellOrEatByMandatoryAll=%s and %s
+Batch=ሎጥ / ተከታታይ
+atleast1batchfield=በቀን መብላት ወይም በቀን የሚሸጥ ወይም ሎጥ/መለያ ቁጥር
+batch_number=ሎጥ / ተከታታይ ቁጥር
+BatchNumberShort=ሎጥ / ተከታታይ
+EatByDate=በቀን መመገብ
+SellByDate=የሚሸጥ ቀን
+DetailBatchNumber=ሎጥ / ተከታታይ ዝርዝሮች
+printBatch=ሎት/ተከታታይ፡ %s
+printEatby=መብል፡ %s
+printSellby=የሚሸጥ፡ %s
+printQty=ብዛት፡ %d
+printPlannedWarehouse=መጋዘን፡ %s
+AddDispatchBatchLine=ለመደርደሪያ ሕይወት መላኪያ መስመር ያክሉ
+WhenProductBatchModuleOnOptionAreForced=ሞጁል ሎት/ተከታታይ ሲበራ፣ አውቶማቲክ የአክሲዮን ቅነሳ ወደ '%s' ይገደዳል እና ራስ-ሰር ጭማሪ ሁነታ '%s ይገደዳል። ' . አንዳንድ ምርጫዎች ላይገኙ ይችላሉ። ሌሎች አማራጮች እርስዎ እንደሚፈልጉት ሊገለጹ ይችላሉ.
+ProductDoesNotUseBatchSerial=ይህ ምርት ዕጣ/ተከታታይ ቁጥር አይጠቀምም።
+ProductLotSetup=የሞጁል ዕጣ/ተከታታይ ማዋቀር
+ShowCurrentStockOfLot=ለጥንዶች ምርት/ሎት የአሁኑን ክምችት አሳይ
+ShowLogOfMovementIfLot=ለጥንዶች ምርት/ሎት የእንቅስቃሴ ምዝግብ ማስታወሻ አሳይ
+StockDetailPerBatch=የአክሲዮን ዝርዝር በዕጣ
+SerialNumberAlreadyInUse=መለያ ቁጥር %s አስቀድሞ ለምርት %s ጥቅም ላይ ውሏል።
+TooManyQtyForSerialNumber=አንድ ምርት ብቻ ነው ሊኖርህ የሚችለው %s ለመለያ ቁጥር %s
+ManageLotMask=ብጁ ጭንብል
+CustomMasks=ለእያንዳንዱ ምርት የተለየ የቁጥር ጭንብል ለመወሰን አማራጭ
+BatchLotNumberingModules=የሎተሪ ቁጥርን በራስ-ሰር ለማመንጨት የቁጥር መመሪያ
+BatchSerialNumberingModules=የመለያ ቁጥር በራስ ሰር ለማመንጨት የቁጥር መመሪያ (ለእያንዳንዱ ምርት 1 ልዩ ዕጣ/ተከታታይ ንብረት ላላቸው ምርቶች)
+QtyToAddAfterBarcodeScan=Qty to %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=ተካ
+CantMoveNonExistantSerial=ስህተት ከአሁን በኋላ ለሌለው ተከታታይ መዝገብ ለመንቀሳቀስ ትጠይቃለህ። ተመሳሳዩን ተከታታይ መጋዘን በተመሳሳይ ጭነት ውስጥ ብዙ ጊዜ ወስደህ ሊሆን ይችላል ወይም በሌላ ጭነት ተጠቅሞ ሊሆን ይችላል። ይህንን ጭነት ያስወግዱ እና ሌላ ያዘጋጁ።
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=የሎጥ ጠረጴዛ ያልተሟላ የሩጫ ጥገና በመለኪያ '...repair.php?standard=የተረጋገጠ'
+IlligalQtyForSerialNumbers= የአክሲዮን እርማት ያስፈልጋል ምክንያቱም ልዩ መለያ ቁጥር።
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 14715670882..99c9e40291b 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -1,413 +1,438 @@
 # 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
+ProductRef=የምርት ማጣቀሻ.
+ProductLabel=የምርት መለያ
+ProductLabelTranslated=የተተረጎመ የምርት መለያ
+ProductDescription=የምርት ማብራሪያ
+ProductDescriptionTranslated=የተተረጎመ የምርት መግለጫ
+ProductNoteTranslated=የተተረጎመ የምርት ማስታወሻ
+ProductServiceCard=ምርቶች / አገልግሎቶች ካርድ
+TMenuProducts=ምርቶች
+TMenuServices=አገልግሎቶች
+Products=ምርቶች
+Services=አገልግሎቶች
+Product=ምርት
+Service=አገልግሎት
+ProductId=የምርት/አገልግሎት መታወቂያ
+Create=ፍጠር
+Reference=ማጣቀሻ
+NewProduct=አዲስ ምርት
+NewService=አዲስ አገልግሎት
+ProductVatMassChange=ዓለም አቀፍ የተጨማሪ እሴት ታክስ ዝማኔ
 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
+MassBarcodeInit=የጅምላ ባርኮድ መግቢያ
+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=ቫት አዘምን
+UpdateDefaultPrice=ነባሪውን ዋጋ ያዘምኑ
+UpdateLevelPrices=ለእያንዳንዱ ደረጃ ዋጋዎችን ያዘምኑ
+AppliedPricesFrom=የተተገበረው ከ
+SellingPrice=የመሸጫ ዋጋ
+SellingPriceHT=የመሸጫ ዋጋ (ከግብር በስተቀር)
+SellingPriceTTC=የመሸጫ ዋጋ (ግብርን ጨምሮ)
+SellingMinPriceTTC=ዝቅተኛው የመሸጫ ዋጋ (ግብርን ጨምሮ)
+CostPriceDescription=ይህ የዋጋ መስክ (ከግብር በስተቀር) ይህ ምርት ለድርጅትዎ የሚያወጣውን አማካይ መጠን ለመያዝ ሊያገለግል ይችላል። እራስዎን የሚያሰሉት ማንኛውም ዋጋ ሊሆን ይችላል, ለምሳሌ, ከአማካይ የግዢ ዋጋ እና አማካይ የምርት እና የስርጭት ዋጋ.
+CostPriceUsage=ይህ እሴት ለኅዳግ ስሌት ጥቅም ላይ ሊውል ይችላል።
+ManufacturingPrice=የማምረቻ ዋጋ
+SoldAmount=የተሸጠው መጠን
+PurchasedAmount=የተገዛው መጠን
+NewPrice=አዲስ ዋጋ
+MinPrice=ደቂቃ የመሸጫ ዋጋ
+MinPriceHT=ደቂቃ የመሸጫ ዋጋ (ከግብር በስተቀር)
+MinPriceTTC=ደቂቃ የመሸጫ ዋጋ (ግብርን ጨምሮ)
+EditSellingPriceLabel=የዋጋ መለያን ያርትዑ
+CantBeLessThanMinPrice=ለዚህ ምርት (%s ያለ ታክስ) የመሸጫ ዋጋው ከተፈቀደው ዝቅተኛው ያነሰ ሊሆን አይችልም። ከፍተኛ ቅናሽ ከተተይቡ ይህ መልእክትም ሊታይ ይችላል።
+CantBeLessThanMinPriceInclTax=ለዚህ ምርት (%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=Kitsን አንቃ (የበርካታ ምርቶች ስብስብ)
+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=ዋጋ (ምንዛሪ) ለዚህ ኪቲ
+WithoutDiscount=ያለ ቅናሽ
+VATRateForSupplierProduct=የተእታ ተመን (ለዚህ ሻጭ/ምርት)
+DiscountQtyMin=ለዚህ ኪቲ ቅናሽ።
+NoPriceDefinedForThisSupplier=ለዚህ አቅራቢ/ምርት ምንም ዋጋ/ኪቲ አልተገለጸም።
+NoSupplierPriceDefinedForThisProduct=ለዚህ ምርት ምንም የሻጭ ዋጋ/ኪቲ አልተገለጸም።
+PredefinedItem=አስቀድሞ የተወሰነ ንጥል
+PredefinedProductsToSell=አስቀድሞ የተገለጸ ምርት
+PredefinedServicesToSell=አስቀድሞ የተገለጸ አገልግሎት
+PredefinedProductsAndServicesToSell=ለመሸጥ አስቀድሞ የተገለጹ ምርቶች/አገልግሎቶች
+PredefinedProductsToPurchase=ለመግዛት አስቀድሞ የተወሰነ ምርት
+PredefinedServicesToPurchase=ለመግዛት አስቀድሞ የተገለጹ አገልግሎቶች
+PredefinedProductsAndServicesToPurchase=ለመግዛት አስቀድመው የተገለጹ ምርቶች / አገልግሎቶች
+NotPredefinedProducts=አስቀድሞ የተገለጹ ምርቶች/አገልግሎቶች አይደሉም
+GenerateThumb=አውራ ጣት ይፍጠሩ
+ServiceNb=አገልግሎት #%s
+ListProductServiceByPopularity=የምርቶች/አገልግሎቶች ዝርዝር በታዋቂነት
+ListProductByPopularity=የምርቶች ዝርዝር በታዋቂነት
+ListServiceByPopularity=የአገልግሎቶች ዝርዝር በታዋቂነት
+Finished=የተሰራ ምርት
+RowMaterial=ጥሬ እቃ
 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
-s=s
-hour=hour
-h=h
-day=day
-d=d
-kilogram=kilogram
-kg=Kg
-gram=gram
-g=g
-meter=meter
-m=m
+CloneContentProduct=ሁሉንም የምርቱን/አገልግሎቱን ዋና መረጃ ይዝጉ
+ClonePricesProduct=Clone ዋጋዎች
+CloneCategoriesProduct=ከክሎን የተገናኙ መለያዎች/ ምድቦች
+CloneCompositionProduct=ክሎን ምናባዊ ምርቶች/አገልግሎቶች
+CloneCombinationsProduct=የምርት ልዩነቶችን ይዝጉ
+ProductIsUsed=ይህ ምርት ጥቅም ላይ ይውላል
+NewRefForClone=ማጣቀሻ. አዲስ ምርት / አገልግሎት
+SellingPrices=የሽያጭ ዋጋዎች
+BuyingPrices=የግዢ ዋጋዎች
+CustomerPrices=የደንበኛ ዋጋዎች
+SuppliersPrices=የአቅራቢዎች ዋጋዎች
+SuppliersPricesOfProductsOrServices=የአቅራቢዎች ዋጋ (የምርቶች ወይም አገልግሎቶች)
+CustomCode=ጉምሩክ|ሸቀጥ|ኤችኤስ ኮድ
+CountryOrigin=የትውልድ ቦታ
+RegionStateOrigin=የትውልድ ክልል
+StateOrigin=ግዛት|የትውልድ ክልል
+Nature=የምርት ተፈጥሮ (ጥሬ/የተመረተ)
+NatureOfProductShort=የምርት ተፈጥሮ
+NatureOfProductDesc=ጥሬ እቃ ወይም የተሰራ ምርት
+ShortLabel=አጭር መለያ
+Unit=ክፍል
+p=ዩ.
+set=አዘጋጅ
+se=አዘጋጅ
+second=ሁለተኛ
+s=ኤስ
+hour=ሰአት
+h=ሸ
+day=ቀን
+d=መ
+kilogram=ኪሎግራም
+kg=ኪግ
+gram=ግራም
+g=ሰ
+meter=ሜትር
+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
+liter=ሊትር
+l=ኤል
+unitP=ቁራጭ
+unitSET=አዘጋጅ
+unitS=ሁለተኛ
+unitH=ሰአት
+unitD=ቀን
+unitL=ሊትር
+unitT=ቶን
+unitKG=ኪግ
+unitG=ግራም
+unitMG=ሚ.ግ
+unitLB=ፓውንድ
+unitOZ=አውንስ
+unitM=ሜትር
+unitLM=መስመራዊ ሜትር
 unitDM=dm
-unitCM=cm
-unitMM=mm
-unitFT=ft
-unitIN=in
-unitM2=Square meter
+unitCM=ሴሜ
+unitMM=ሚ.ሜ
+unitFT=ጫማ
+unitIN=ውስጥ
+unitM2=ካሬ ሜትር
 unitDM2=dm²
-unitCM2=cm²
-unitMM2=mm²
-unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
+unitCM2=ሴሜ²
+unitMM2=ሚሜ²
+unitFT2=ጫማ²
+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
+unitCM3=ሴሜ³
+unitMM3=ሚሜ³
+unitFT3=ጫማ³
+unitIN3=ውስጥ³
+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
+Build=ማምረት
+ProductsMultiPrice=ለእያንዳንዱ የዋጋ ክፍል ምርቶች እና ዋጋዎች
+ProductsOrServiceMultiPrice=የደንበኛ ዋጋዎች (የምርቶች ወይም አገልግሎቶች፣ ባለብዙ ዋጋ)
+ProductSellByQuarterHT=ምርቶች ከታክስ በፊት በየሩብ ዓመቱ ይሸጋገራሉ
+ServiceSellByQuarterHT=ከታክስ በፊት በየሩብ ዓመቱ የአገልግሎት ሽግግር
+Quarter1=1ኛ. ሩብ
+Quarter2=2ኛ. ሩብ
+Quarter3=3ኛ. ሩብ
+Quarter4=4ኛ. ሩብ
+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=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>
+PriceExpressionEditorHelp3=በሁለቱም የምርት/አገልግሎት እና የአቅራቢ ዋጋዎች እነዚህ ተለዋዋጮች ይገኛሉ፡<br><b>#tva_tx# #localtax1_tx2# #txta ክብደት# #ርዝመት# #ገጽታ# #ዋጋ_ደቂቃ#</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
+PriceExpressionEditorHelp5=የሚገኙ ዓለም አቀፍ እሴቶች፡-
+PriceMode=የዋጋ ሁነታ
+PriceNumeric=ቁጥር
+DefaultPrice=ነባሪ ዋጋ
+DefaultPriceLog=የቀደሙት ነባሪ ዋጋዎች መዝገብ
+ComposedProductIncDecStock=በወላጅ ለውጥ ላይ ክምችት ጨምር/ቀንስ
+ComposedProduct=የልጆች ምርቶች
+MinSupplierPrice=ዝቅተኛው የግዢ ዋጋ
+MinCustomerPrice=ዝቅተኛው የመሸጫ ዋጋ
+NoDynamicPrice=ምንም ተለዋዋጭ ዋጋ የለም
+DynamicPriceConfiguration=ተለዋዋጭ የዋጋ ውቅር
+DynamicPriceDesc=የደንበኛ ወይም የሻጭ ዋጋዎችን ለማስላት የሂሳብ ቀመሮችን መግለፅ ይችላሉ። እንደዚህ አይነት ቀመሮች ሁሉንም የሂሳብ ኦፕሬተሮችን, አንዳንድ ቋሚዎችን እና ተለዋዋጭዎችን መጠቀም ይችላሉ. ለመጠቀም የሚፈልጓቸውን ተለዋዋጮች እዚህ መግለፅ ይችላሉ። ተለዋዋጭው አውቶማቲክ ማሻሻያ ከሚያስፈልገው ዶሊባርር እሴቱን በራስ-ሰር እንዲያዘምን ለማድረግ ውጫዊውን ዩአርኤል ሊገልጹ ይችላሉ።
+AddVariable=ተለዋዋጭ አክል
+AddUpdater=ማዘመኛን ያክሉ
+GlobalVariables=ዓለም አቀፍ ተለዋዋጮች
+VariableToUpdate=ለማዘመን ተለዋዋጭ
+GlobalVariableUpdaters=ለተለዋዋጮች ውጫዊ ማሻሻያ
+GlobalVariableUpdaterType0=የJSON ውሂብ
+GlobalVariableUpdaterHelp0=ከተጠቀሰው ዩአርኤል የJSON ውሂብን ይመረምራል፣ VALUE የሚመለከተውን እሴት ቦታ ይገልጻል፣
+GlobalVariableUpdaterHelpFormat0=የጥያቄ ቅርጸት {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=የድር አገልግሎት ውሂብ
+GlobalVariableUpdaterHelp1=የዌብ ሰርቪስ ውሂብን ከተጠቀሰው ዩአርኤል ይመረምራል፣ NS የስም ቦታውን ይገልፃል፣ VALUE የሚመለከተውን ቦታ ይገልፃል፣ DATA የሚላከው ውሂብ መያዝ አለበት እና METHOD የWS ጥሪ ዘዴ ነው።
+GlobalVariableUpdaterHelpFormat1=የጥያቄው ቅርጸት {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" ነው. : "myWSMethod", "DATA": {"የእርስዎ": "ውሂብ", "ወደ": "መላክ"}}
+UpdateInterval=ክፍተቱን አዘምን (ደቂቃዎች)
+LastUpdated=የቅርብ ጊዜ ዝመና
+CorrectlyUpdated=በትክክል ዘምኗል
+PropalMergePdfProductActualFile=ወደ ፒዲኤፍ አዙር ለመጨመር የሚያገለግሉ ፋይሎች ናቸው።
+PropalMergePdfProductChooseFile=ፒዲኤፍ ፋይሎችን ይምረጡ
+IncludingProductWithTag=ከመለያው ጋር ምርቶችን/አገልግሎቶችን ጨምሮ
+DefaultPriceRealPriceMayDependOnCustomer=ነባሪ ዋጋ፣ እውነተኛ ዋጋ በደንበኛው ላይ ሊወሰን ይችላል።
+WarningSelectOneDocument=እባክዎ ቢያንስ አንድ ሰነድ ይምረጡ
+DefaultUnitToShow=ክፍል
+NbOfQtyInProposals=Qty በፕሮፖዛል
+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?
+Attributes=ባህሪያት
+VariantAttributes=ተለዋጭ ባህሪያት
+ProductAttributes=ለምርቶች ተለዋጭ ባህሪያት
+ProductAttributeName=ተለዋጭ ባህሪ %s
+ProductAttribute=ተለዋጭ ባህሪ
+ProductAttributeDeleteDialog=እርግጠኛ ነዎት ይህን ባህሪ መሰረዝ ይፈልጋሉ? ሁሉም እሴቶች ይሰረዛሉ
+ProductAttributeValueDeleteDialog=እርግጠኛ ነዎት የዚህን ባህሪ "%s" ከማጣቀሻ "%s" መሰረዝ ይፈልጋሉ?
 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
-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
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+ProductCombinationAlreadyUsed=ልዩነቱን በመሰረዝ ላይ ስህተት ነበር። እባክዎ በማንኛውም ዕቃ ውስጥ ጥቅም ላይ እንደማይውል ያረጋግጡ
+ProductCombinations=ተለዋጮች
+PropagateVariant=ማባዛት ተለዋጮች
+HideProductCombinations=በምርቶች መራጭ ውስጥ የምርቶችን ልዩነት ደብቅ
+ProductCombination=ተለዋጭ
+NewProductCombination=አዲስ ተለዋጭ
+EditProductCombination=የአርትዖት ልዩነት
+NewProductCombinations=አዲስ ተለዋጮች
+EditProductCombinations=ተለዋጮችን ማስተካከል
+SelectCombination=ጥምረት ይምረጡ
+ProductCombinationGenerator=ተለዋጮች ጄኔሬተር
+Features=ዋና መለያ ጸባያት
+PriceImpact=የዋጋ ተጽዕኖ
+ImpactOnPriceLevel=በዋጋ ደረጃ ላይ ተጽእኖ %s
+ApplyToAllPriceImpactLevel= በሁሉም ደረጃዎች ላይ ያመልክቱ
+ApplyToAllPriceImpactLevelHelp=እዚህ ጠቅ በማድረግ በሁሉም ደረጃዎች ላይ ተመሳሳይ የዋጋ ተፅእኖን አዘጋጅተዋል።
+WeightImpact=የክብደት ተጽእኖ
+NewProductAttribute=አዲስ ባህሪ
+NewProductAttributeValue=አዲስ የባህሪ እሴት
+ErrorCreatingProductAttributeValue=የባህሪ እሴቱን በመፍጠር ላይ ስህተት ነበር። ከዚህ ማጣቀሻ ጋር ቀድሞውኑ ነባር እሴት ስላለ ሊሆን ይችላል።
+ProductCombinationGeneratorWarning=ከቀጠሉ፣ አዲስ ተለዋጮችን ከማፍለቅዎ በፊት፣ ሁሉም ቀዳሚዎቹ ይሰረዛሉ። ቀድሞውንም የነበሩት በአዲሶቹ እሴቶች ይዘመናሉ።
+TooMuchCombinationsWarning=ብዙ ተለዋጮች ማመንጨት ከፍተኛ ሲፒዩ፣ የማስታወሻ አጠቃቀም እና ዶሊባርር እነሱን መፍጠር አልቻለም። "%s" የሚለውን አማራጭ ማንቃት የማህደረ ትውስታ አጠቃቀምን ለመቀነስ ይረዳል።
+DoNotRemovePreviousCombinations=ቀዳሚ ተለዋጮችን አታስወግድ
+UsePercentageVariations=የመቶኛ ልዩነቶችን ተጠቀም
+PercentageVariation=የመቶኛ ልዩነት
+ErrorDeletingGeneratedProducts=ያሉትን የምርት ልዩነቶች ለመሰረዝ በመሞከር ላይ ሳለ አንድ ስህተት ነበር።
+NbOfDifferentValues=የተለያዩ እሴቶች ቁጥር
+NbProducts=የምርት ብዛት
+ParentProduct=የወላጅ ምርት
+ParentProductOfVariant=የወላጅ ምርት
+HideChildProducts=የተለያዩ ምርቶችን ደብቅ
+ShowChildProducts=ተለዋጭ ምርቶችን አሳይ
+NoEditVariants=ወደ የወላጅ ምርት ካርድ ይሂዱ እና በተለዋዋጮች ትር ውስጥ የዋጋ ተፅእኖን ያርትዑ
+ConfirmCloneProductCombinations=በተሰጠው ማጣቀሻ ሁሉንም የምርት ልዩነቶች ወደ ሌላኛው የወላጅ ምርት መቅዳት ይፈልጋሉ?
+CloneDestinationReference=መድረሻ ምርት ማጣቀሻ
+ErrorCopyProductCombinations=የምርት ልዩነቶችን በመቅዳት ላይ ስህተት ነበር።
+ErrorDestinationProductNotFound=የመድረሻ ምርት አልተገኘም።
+ErrorProductCombinationNotFound=የምርት ልዩነት አልተገኘም።
+ActionAvailableOnVariantProductOnly=እርምጃ የሚገኘው በምርቱ ልዩነት ላይ ብቻ ነው።
+ProductsPricePerCustomer=የምርት ዋጋዎች ለደንበኛ
+ProductSupplierExtraFields=ተጨማሪ ባህሪያት (የአቅራቢዎች ዋጋዎች)
+DeleteLinkedProduct=ከጥምረት ጋር የተገናኘውን የልጁን ምርት ይሰርዙ
+AmountUsedToUpdateWAP=የተገመተውን አማካይ ዋጋ ለማዘመን የሚጠቅመው የክፍል መጠን
+PMPValue=አማካይ ዋጋ
+PMPValueShort=ዋፕ
+mandatoryperiod=አስገዳጅ ወቅቶች
+mandatoryPeriodNeedTobeSet=ማሳሰቢያ፡- ጊዜ (የመጀመሪያ እና የመጨረሻ ቀን) መገለጽ አለበት።
+mandatoryPeriodNeedTobeSetMsgValidate=አገልግሎት የመጀመሪያ እና የመጨረሻ ጊዜን ይፈልጋል
+mandatoryHelper=በዚህ አገልግሎት መስመሮች ላይ የመጀመሪያ እና የመጨረሻ ቀን ሳያስገቡ የክፍያ መጠየቂያ፣ የንግድ ፕሮፖዛል፣ የሽያጭ ማዘዣ ሲፈጥሩ ወይም ሲያረጋግጡ ለተጠቃሚው መልእክት ከፈለጉ ይህንን ያረጋግጡ።<br>ይህን ልብ ይበሉ መልእክቱ ማስጠንቀቂያ እንጂ የማገድ ስህተት አይደለም።
+DefaultBOM=ነባሪ BOM
+DefaultBOMDesc=ነባሪ BOM ይህንን ምርት ለማምረት እንዲጠቀም ይመከራል። ይህ መስክ ሊዋቀር የሚችለው የምርት ተፈጥሮ '%s' ከሆነ ብቻ ነው።
+Rank=ደረጃ
+MergeOriginProduct=የተባዛ ምርት (መሰረዝ የሚፈልጉት ምርት)
+MergeProducts=ምርቶችን ያዋህዱ
+ConfirmMergeProducts=እርግጠኛ ነዎት የተመረጠውን ምርት አሁን ካለው ጋር ማዋሃድ ይፈልጋሉ? ሁሉም የተገናኙ ነገሮች (ደረሰኞች, ትዕዛዞች, ...) ወደ አሁኑ ምርት ይንቀሳቀሳሉ, ከዚያ በኋላ የተመረጠው ምርት ይሰረዛል.
+ProductsMergeSuccess=ምርቶች ተዋህደዋል
+ErrorsProductsMerge=በምርቶች ውህደት ውስጥ ስህተቶች
+SwitchOnSaleStatus=የሽያጭ ሁኔታን ያብሩ
+SwitchOnPurchaseStatus=የግዢ ሁኔታን ያብሩ
+UpdatePrice=የደንበኞችን ዋጋ ጨምር/ ቀንስ
+StockMouvementExtraFields= ተጨማሪ መስኮች (የአክሲዮን እንቅስቃሴ)
+InventoryExtraFields= ተጨማሪ መስኮች (እቃዎች)
+ScanOrTypeOrCopyPasteYourBarCodes=የእርስዎን ባርኮዶች ይቃኙ ወይም ይተይቡ ወይም ይቅዱ/ለጥፉ
+PuttingPricesUpToDate=ዋጋዎችን አሁን በሚታወቁ ዋጋዎች ያዘምኑ
+PuttingDescUpToDate=መግለጫዎችን አሁን ከሚታወቁ መግለጫዎች ጋር ያዘምኑ
+PMPExpected=የሚጠበቀው PMP
+ExpectedValuation=የሚጠበቀው ዋጋ
+PMPReal=እውነተኛ PMP
+RealValuation=እውነተኛ ዋጋ
+ConfirmEditExtrafield = ሊቀይሩት የሚፈልጉትን ትርፍ መስክ ይምረጡ
+ConfirmEditExtrafieldQuestion = እርግጠኛ ነዎት ይህን ተጨማሪ መስክ መቀየር ይፈልጋሉ?
+ModifyValueExtrafields = የተጨማሪ ሜዳ እሴትን ቀይር
+OrProductsWithCategories=ወይም መለያዎች/ምድቦች ያላቸው ምርቶች
+WarningTransferBatchStockMouvToGlobal = ይህንን ምርት ከስር ለማጥፋት ከፈለጉ፣ ሁሉም ተከታታይ አክሲዮኖች ወደ አለምአቀፍ አክሲዮን ይቀየራሉ
+WarningConvertFromBatchToSerial=በአሁኑ ጊዜ ለምርቱ 2 መጠን ከፍ ያለ ወይም እኩል ከሆነ፣ ወደዚህ ምርጫ መቀየር ማለት አሁንም ተመሳሳይ ስብስብ ያላቸው የተለያዩ እቃዎች ያሉት ምርት ይኖርዎታል (ልዩ መለያ ቁጥር ሲፈልጉ)። ይህንን ለማስተካከል የተባዛው ክምችት ወይም የእጅ አክሲዮን እንቅስቃሴ እስኪደረግ ድረስ ይቆያል።
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=እርግጠኛ ነህ ወደ ረቂቅ ሁኔታ መመለስ ትፈልጋለህ?<br>አሁን በዕቃው ውስጥ የተቀመጡት መጠኖች ዳግም ይጀመራሉ።
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index 4a3151fdaf1..4c98156fb55 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -147,7 +147,7 @@ LinkedToAnotherCompany=ከሌላ ሶስተኛ ወገን ጋር ተገናኝቷ
 TaskIsNotAssignedToUser=ተግባር ለተጠቃሚ አልተሰጠም። አሁን ተግባር ለመመደብ '<strong>%s</strong> የሚለውን ቁልፍ ተጠቀም።
 ErrorTimeSpentIsEmpty=ያጠፋው ጊዜ ባዶ ነው።
 TimeRecordingRestrictedToNMonthsBack=የጊዜ ቀረጻ በ%s ወራት የተገደበ ነው
-ThisWillAlsoRemoveTasks=ይህ እርምጃ ሁሉንም የፕሮጀክት ተግባራት ይሰርዛል (<b>%s</b>s<span class='notranslate'></b>s በአሁኑ ጊዜ) እና ሁሉም ጊዜ ያለፈባቸው ግብዓቶች።
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOtherObjectKeepEmpty=የሌላ ሶስተኛ ወገን ንብረት የሆኑ አንዳንድ ነገሮች (ደረሰኝ፣ ትዕዛዝ፣...) ከፕሮጀክቱ ጋር መያያዝ ካለባቸው ፕሮጀክቱ ብዙ ሶስተኛ ወገኖች እንዲሆን ባዶ ያድርጉት።
 CloneTasks=Clone ተግባራት
 CloneContacts=ክሎን እውቂያዎች
@@ -249,7 +249,7 @@ LatestProjects=የቅርብ ጊዜ %s ፕሮጀክቶች
 LatestModifiedProjects=የቅርብ ጊዜ %s የተሻሻሉ ፕሮጀክቶች
 OtherFilteredTasks=ሌሎች የተጣሩ ተግባራት
 NoAssignedTasks=ምንም የተመደቡ ተግባራት አልተገኙም (ጊዜ ለማስገባት ከላይ ከተመረጠው ሳጥን ውስጥ ፕሮጀክት/ተግባራትን ለአሁኑ ተጠቃሚ መድቡ)
-ThirdPartyRequiredToGenerateInvoice=ደረሰኝ ለመጠየቅ ሶስተኛ ወገን በፕሮጀክቱ ላይ መገለጽ አለበት።
+ThirdPartyRequiredToGenerateIntervention=A third party must be defined on project to be able to create intervention.
 ThirdPartyRequiredToGenerateInvoice=ደረሰኝ ለመጠየቅ ሶስተኛ ወገን በፕሮጀክቱ ላይ መገለጽ አለበት።
 ChooseANotYetAssignedTask=እስካሁን ያልተመደበልህን ተግባር ምረጥ
 # Comments trans
diff --git a/htdocs/langs/am_ET/propal.lang b/htdocs/langs/am_ET/propal.lang
index 9fa30e5b24d..46012d34ac1 100644
--- a/htdocs/langs/am_ET/propal.lang
+++ b/htdocs/langs/am_ET/propal.lang
@@ -15,8 +15,8 @@ ValidateProp=የንግድ ፕሮፖዛል አረጋግጥ
 CancelPropal=ሰርዝ
 AddProp=ፕሮፖዛል ፍጠር
 ConfirmDeleteProp=እርግጠኛ ነዎት ይህን የንግድ ፕሮፖዛል መሰረዝ ይፈልጋሉ?
-ConfirmValidateProp=እርግጠኛ ነዎት ይህን የንግድ ፕሮፖዛል በስም <b>%s<span class='notranslate'>b09a4b739f17f17f >?
-ConfirmCancelPropal=እርግጠኛ ነህ የንግድ ፕሮፖዛል <b>%s<span class='notranslate'></b>?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+ConfirmCancelPropal=Are you sure you want to cancel commercial proposal <b>%s</b>?
 LastPropals=የቅርብ ጊዜ %s ሀሳቦች
 LastModifiedProposals=የቅርብ ጊዜ %s የተሻሻሉ ሀሳቦች
 AllPropals=ሁሉም ሀሳቦች
@@ -61,8 +61,8 @@ DefaultProposalDurationValidity=ነባሪ የንግድ ፕሮፖዛል የሚቆ
 DefaultPuttingPricesUpToDate=በነባሪነት የፕሮፖዛልን ክሎኒንግ ላይ ከታወቁት ዋጋዎች ጋር ዋጋዎችን ያዘምኑ
 DefaultPuttingDescUpToDate=በነባሪነት ፕሮፖዛልን በመዝጋት ላይ ከሚታወቁት መግለጫዎች ጋር መግለጫዎችን ያዘምኑ
 UseCustomerContactAsPropalRecipientIfExist=ከሶስተኛ ወገን አድራሻ ይልቅ እንደ ሀሳብ ተቀባይ አድራሻ ከተገለጸ 'የእውቂያ ተከታይ ሀሳብ' አይነት ጋር እውቂያ/አድራሻ ይጠቀሙ
-ConfirmClonePropal=እርግጠኛ ነዎት የንግድ ፕሮፖዛሉን <b>%s<span class='notranslate'>b09a4b739f17f80?
-ConfirmReOpenProp=እርግጠኛ ነዎት የንግድ ፕሮፖዛሉን <b>%s<span class='notranslate'>b09a4b739f17f80 ?
+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=የንግድ ፕሮፖዛል እና መስመሮች
 ProposalLine=የፕሮፖዛል መስመር
 ProposalLines=የፕሮፖዛል መስመሮች
diff --git a/htdocs/langs/am_ET/receiptprinter.lang b/htdocs/langs/am_ET/receiptprinter.lang
index 2574ff1b4bd..6e9d6fa236c 100644
--- a/htdocs/langs/am_ET/receiptprinter.lang
+++ b/htdocs/langs/am_ET/receiptprinter.lang
@@ -1,82 +1,85 @@
 # 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=የሞዱል ደረሰኝ አታሚ ማዋቀር
+PrinterAdded=አታሚ %s ታክሏል
+PrinterUpdated=አታሚ %s ተዘምኗል
+PrinterDeleted=አታሚ %s ተሰርዟል
+TestSentToPrinter=ሙከራ ወደ አታሚ ተልኳል %s
+ReceiptPrinter=ደረሰኝ አታሚዎች
+ReceiptPrinterDesc=ደረሰኝ አታሚዎችን ማዋቀር
+ReceiptPrinterTemplateDesc=አብነቶችን ማዋቀር
+ReceiptPrinterTypeDesc=በመስክ ላይ ሊሆኑ የሚችሉ እሴቶች ምሳሌ "Parameters" እንደ አሽከርካሪው አይነት
+ReceiptPrinterProfileDesc=ደረሰኝ የአታሚ መገለጫ መግለጫ
+ListPrinters=የአታሚዎች ዝርዝር
+FromServerPointOfView=From the web server point of view. This method must be reachable from the web server hosting.
+SetupReceiptTemplate=የአብነት ማዋቀር
+CONNECTOR_DUMMY=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=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
-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_FILE_PRINT_HELP=/dev/usb/lp0፣ /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1፣ COM1፣ smb://FooUser:secret@computername/workgroup/ደረሰኝ አታሚ
+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=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_BEEP_ALTERNATIVE=ቢፕ ድምጽ (አማራጭ ሁነታ)
+DOL_PRINT_CURR_DATE=የአሁኑን ቀን/ሰዓት ያትሙ
+DOL_PRINT_TEXT=ጽሑፍ አትም
+DateInvoiceWithTime=የክፍያ መጠየቂያ ቀን እና ሰዓት
+YearInvoice=የክፍያ መጠየቂያ ዓመት
+DOL_VALUE_MONTH_LETTERS=የክፍያ መጠየቂያ ወር በደብዳቤዎች
+DOL_VALUE_MONTH=የክፍያ መጠየቂያ ወር
+DOL_VALUE_DAY=የክፍያ መጠየቂያ ቀን
+DOL_VALUE_DAY_LETTERS=የክፍያ መጠየቂያ ቀን በደብዳቤዎች
+DOL_LINE_FEED_REVERSE=የመስመር ምግብ ተቃራኒ
+InvoiceID=የክፍያ መጠየቂያ መታወቂያ
+InvoiceRef=የክፍያ መጠየቂያ ማጣቀሻ
+DOL_PRINT_OBJECT_LINES=የክፍያ መጠየቂያ መስመሮች
+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/am_ET/receptions.lang b/htdocs/langs/am_ET/receptions.lang
index 7f1a97d16a9..8ed5fbb59d0 100644
--- a/htdocs/langs/am_ET/receptions.lang
+++ b/htdocs/langs/am_ET/receptions.lang
@@ -1,54 +1,56 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor 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
+ReceptionDescription=የአቅራቢዎች መቀበያ አስተዳደር (የመቀበያ ሰነዶችን ይፍጠሩ)
+ReceptionsSetup=የአቅራቢ መቀበያ ማዋቀር
+RefReception=ማጣቀሻ. መቀበያ
+Reception=መቀበያ
+Receptions=አቀባበል
+AllReceptions=ሁሉም አቀባበል
+ShowReception=አቀባበል አሳይ
+ReceptionsArea=የመቀበያ ቦታ
+ListOfReceptions=የአቀባበል ዝርዝር
+ReceptionMethod=የመቀበያ ዘዴ
+LastReceptions=የቅርብ ጊዜ %s አቀባበል
+StatisticsOfReceptions=የአቀባበል ስታቲስቲክስ
+NbOfReceptions=የአቀባበል ብዛት
+NumberOfReceptionsByMonth=የመቀበያ ብዛት በወር
+ReceptionCard=መቀበያ ካርድ
+NewReception=አዲስ አቀባበል
+CreateReception=መቀበያ ይፍጠሩ
+QtyInOtherReceptions=በሌሎች መስተንግዶዎች ውስጥ Qty
+OtherReceptionsForSameOrder=ለዚህ ትዕዛዝ ሌሎች መስተንግዶዎች
+ReceptionsAndReceivingForSameOrder=ለዚህ ትዕዛዝ መቀበል እና ደረሰኞች
+ReceptionsToValidate=ለማፅደቅ የተደረገ አቀባበል
+StatusReceptionCanceled=ተሰርዟል።
+StatusReceptionDraft=ረቂቅ
+StatusReceptionValidated=የተረጋገጠ (ምርቶች ለመቀበል ወይም ቀድሞ የተቀበሉ)
+StatusReceptionValidatedToReceive=የተረጋገጠ (ምርት ለመቀበል)
+StatusReceptionValidatedReceived=የተረጋገጠ (ምርቶች ተቀብለዋል)
+StatusReceptionProcessed=ተሰራ
+StatusReceptionDraftShort=ረቂቅ
+StatusReceptionValidatedShort=ተረጋግጧል
+StatusReceptionProcessedShort=ተሰራ
+ReceptionSheet=መቀበያ ወረቀት
+ValidateReception=መቀበሉን ያረጋግጡ
+ConfirmDeleteReception=እርግጠኛ ነዎት ይህን አቀባበል መሰረዝ ይፈልጋሉ?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
+ConfirmCancelReception=እርግጠኛ ነዎት ይህን አቀባበል መሰረዝ ይፈልጋሉ?
+StatsOnReceptionsOnlyValidated=በተረጋገጡ መቀበያዎች ላይ ብቻ የተካሄደ ስታቲስቲክስ። ጥቅም ላይ የዋለው ቀን መቀበያው የተረጋገጠበት ቀን ነው (የታቀደው የመላኪያ ቀን ሁልጊዜ አይታወቅም)።
+SendReceptionByEMail=አቀባበል በኢሜል ላክ
+SendReceptionRef=የአቀባበል አቀራረብ %s
+ActionsOnReception=በአቀባበል ላይ ያሉ ክስተቶች
+ReceptionCreationIsDoneFromOrder=ለጊዜው፣ አዲስ መቀበያ መፍጠር የሚከናወነው ከግዢ ትዕዛዝ ነው።
+ReceptionLine=መቀበያ መስመር
+ProductQtyInReceptionAlreadySent=ከክፍት የሽያጭ ትእዛዝ የምርት ብዛት አስቀድሞ ተልኳል።
+ProductQtyInSuppliersReceptionAlreadyRecevied=ከክፍት አቅራቢ ትዕዛዝ የተገኘው የምርት ብዛት
+ValidateOrderFirstBeforeReception=አቀባበል ለማድረግ ከመቻልዎ በፊት በመጀመሪያ ትዕዛዙን ማረጋገጥ አለብዎት።
+ReceptionsNumberingModules=የቁጥር ሞጁል ለእንግዶች አቀባበል
+ReceptionsReceiptModel=የሰነድ አብነቶች ለአቀባበል
+NoMorePredefinedProductToDispatch=ለመላክ ምንም ተጨማሪ አስቀድሞ የተገለጹ ምርቶች የሉም
+ReceptionExist=አቀባበል አለ።
+ReceptionBackToDraftInDolibarr=አቀባበል %s ወደ ረቂቅ ተመለስ
+ReceptionClassifyClosedInDolibarr=መቀበያ %s ተዘግቷል
+ReceptionUnClassifyCloseddInDolibarr=መቀበያ %s እንደገና ይከፈታል
+RestoreWithCurrentQtySaved=በቅርብ የተቀመጡ ዋጋዎች መጠኖችን ይሙሉ
+ReceptionsRecorded=አቀባበል ተመዝግቧል
+ReceptionUpdated=አቀባበል በተሳካ ሁኔታ ዘምኗል
+ReceptionDistribution=መቀበያ ስርጭት
diff --git a/htdocs/langs/am_ET/resource.lang b/htdocs/langs/am_ET/resource.lang
index e8574dc680f..9bc4ef5257b 100644
--- a/htdocs/langs/am_ET/resource.lang
+++ b/htdocs/langs/am_ET/resource.lang
@@ -1,39 +1,41 @@
 # 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 ክስተት ውስጥ ጥቅም ላይ ውሏል
+
+MaxUsers=Maximum users (places, seats, etc.)
diff --git a/htdocs/langs/am_ET/salaries.lang b/htdocs/langs/am_ET/salaries.lang
index c0e115a20df..da6f432f1ff 100644
--- a/htdocs/langs/am_ET/salaries.lang
+++ b/htdocs/langs/am_ET/salaries.lang
@@ -1,26 +1,33 @@
 # 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
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=መለያ (ከመለያ ገበታ) በነባሪነት ለ "ተጠቃሚ" ሶስተኛ ወገኖች ጥቅም ላይ የዋለ
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=በተጠቃሚ ካርድ ላይ የተገለጸው የተወሰነ መለያ ለ Subledger ሒሳብ ብቻ ጥቅም ላይ ይውላል። ይህ ለጠቅላላ Ledger እና ለ 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=የመጨረሻውን የደመወዝ መጠን ያዘጋጁ
+MakeTransferRequest=የማስተላለፊያ ጥያቄ አቅርቡ
+VirementOrder=የብድር ማስተላለፍ ጥያቄ
+BankTransferAmount=የብድር ማስተላለፍ መጠን
+WithdrawalReceipt=የዱቤ ማስተላለፍ ትዕዛዝ
+OrderWaiting=በመጠባበቅ ላይ ያለ ትዕዛዝ
+FillEndOfMonth=በወሩ መጨረሻ ሙላ
diff --git a/htdocs/langs/am_ET/sendings.lang b/htdocs/langs/am_ET/sendings.lang
index 8f10b1e9404..8dcf3a07f1c 100644
--- a/htdocs/langs/am_ET/sendings.lang
+++ b/htdocs/langs/am_ET/sendings.lang
@@ -1,76 +1,86 @@
 # 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=Qty መርከብ።
+QtyPreparedOrShipped=Qty ተዘጋጅቷል ወይም ተልኳል።
+QtyToShip=ለመላክ Qty
+QtyToReceive=ለመቀበል Qty
+QtyReceived=Qty ተቀብሏል።
+QtyInOtherShipments=Qty በሌሎች መላኪያዎች
+KeepToShip=ለመላክ ይቆዩ
+KeepToShipShort=ቀረ
+OtherSendingsForSameOrder=ለዚህ ትዕዛዝ ሌሎች መላኪያዎች
+SendingsAndReceivingForSameOrder=የዚህ ትዕዛዝ ማጓጓዣዎች እና ደረሰኞች
+SendingsToValidate=ለማረጋገጫ መላኪያዎች
+StatusSendingCanceled=ተሰርዟል።
+StatusSendingCanceledShort=ተሰርዟል።
+StatusSendingDraft=ረቂቅ
+StatusSendingValidated=የተረጋገጠ (ምርቶች የሚላኩ ወይም አስቀድሞ የተላኩ)
+StatusSendingProcessed=ተሰራ
+StatusSendingDraftShort=ረቂቅ
+StatusSendingValidatedShort=ተረጋግጧል
+StatusSendingProcessedShort=ተሰራ
+SendingSheet=የመላኪያ ሉህ
+ConfirmDeleteSending=እርግጠኛ ነዎት ይህን ጭነት መሰረዝ ይፈልጋሉ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmCancelSending=እርግጠኛ ነዎት ይህን ጭነት መሰረዝ ይፈልጋሉ?
+DocumentModelMerou=Merou 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=ማጓጓዝ ከመቻልዎ በፊት በመጀመሪያ ትዕዛዙን ማረጋገጥ አለብዎት።
+NoLineGoOnTabToAddSome=መስመር የለም፣ ለመጨመር "%s" የሚለውን ትር ቀጥል
 
 # 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
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= የመጋዘን ዝርዝሮች
+DetailWarehouseFormat= ወ፡%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=የመለያ ቁጥር ወይም ባች በሚላክበት ጊዜ በክምችት ውስጥ የገባበትን የመጨረሻ ቀን አሳይ
+CreationOptions=በማጓጓዣ ጊዜ ውስጥ ያሉ አማራጮች
+
+ShipmentDistribution=የማጓጓዣ ስርጭት
+
+ErrorTooManyCombinationBatchcode=ለመስመር ምንም መላኪያ የለም %s እንደ ብዙ የመጋዘን፣ የምርት፣ የባች ኮድ ጥምረት አልተገኘም (%s)።
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=የተላከው መጠን ለመስመር %s ከታዘዘው መጠን መብለጥ የለበትም።
diff --git a/htdocs/langs/am_ET/sms.lang b/htdocs/langs/am_ET/sms.lang
index 055085eb16a..adb88ede4c3 100644
--- a/htdocs/langs/am_ET/sms.lang
+++ b/htdocs/langs/am_ET/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
-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)
+Sms=ኤስኤምኤስ
+SmsSetup=የኤስኤምኤስ ማዋቀር
+SmsDesc=ይህ ገጽ በኤስኤምኤስ ባህሪያት ላይ አለምአቀፍ አማራጮችን እንዲገልጹ ያስችልዎታል
+SmsCard=የኤስኤምኤስ ካርድ
+AllSms=ሁሉም የኤስኤምኤስ ዘመቻዎች
+SmsTargets=ዒላማዎች
+SmsRecipients=ዒላማዎች
+SmsRecipient=ዒላማ
+SmsTitle=መግለጫ
+SmsFrom=ላኪ
+SmsTo=ዒላማ
+SmsTopic=የኤስኤምኤስ ርዕስ
+SmsText=መልእክት
+SmsMessage=የኤስኤምኤስ መልእክት
+ShowSms=ኤስኤምኤስ አሳይ
+ListOfSms=የኤስኤምኤስ ዘመቻዎችን ይዘርዝሩ
+NewSms=አዲስ የኤስኤምኤስ ዘመቻ
+EditSms=SMS አርትዕ
+ResetSms=አዲስ መላኪያ
+DeleteSms=የኤስኤምኤስ ዘመቻን ሰርዝ
+DeleteASms=የኤስኤምኤስ ዘመቻን ያስወግዱ
+PreviewSms=ኤስኤምኤስ አስቀድመው ይመልከቱ
+PrepareSms=ኤስኤምኤስ ያዘጋጁ
+CreateSms=SMS ፍጠር
+SmsResult=የኤስኤምኤስ መላኪያ ውጤት
+TestSms=የኤስኤምኤስ ሙከራ ያድርጉ
+ValidSms=ኤስኤምኤስ ያረጋግጡ
+ApproveSms=ኤስኤምኤስ አጽድቅ
+SmsStatusDraft=ረቂቅ
+SmsStatusValidated=ተረጋግጧል
+SmsStatusApproved=ጸድቋል
+SmsStatusSent=ተልኳል።
+SmsStatusSentPartialy=በከፊል ተልኳል።
+SmsStatusSentCompletely=ሙሉ በሙሉ ተልኳል።
+SmsStatusError=ስህተት
+SmsStatusNotSent=አልተላከም።
+SmsSuccessfulySent=ኤስኤምኤስ በትክክል ተልኳል (ከ%s ወደ %s)
+ErrorSmsRecipientIsEmpty=የዒላማው ብዛት ባዶ ነው።
+WarningNoSmsAdded=ወደ ዒላማ ዝርዝር የሚታከል አዲስ ስልክ ቁጥር የለም።
+ConfirmValidSms=የዚህ ዘመቻ ትክክለኛነት አረጋግጠዋል?
+NbOfUniqueSms=የልዩ ስልክ ቁጥሮች ቁጥር
+NbOfSms=የስልክ ቁጥሮች ቁጥር
+ThisIsATestMessage=ይህ የፈተና መልእክት ነው።
+SendSms=ኤስኤምኤስ ላክ
+SmsInfoCharRemain=የተቀሩት ቁምፊዎች ብዛት
+SmsInfoNumero= (ዓለም አቀፍ ቅርጸት ማለትም፡ +33899701761)
+DelayBeforeSending=ከመላክዎ በፊት መዘግየት (ደቂቃዎች)
+SmsNoPossibleSenderFound=ምንም ላኪ አይገኝም። የኤስኤምኤስ አቅራቢዎን ማዋቀር ያረጋግጡ።
+SmsNoPossibleRecipientFound=ምንም ኢላማ የለም። የኤስኤምኤስ አቅራቢዎን ማዋቀር ያረጋግጡ።
+DisableStopIfSupported=STOP መልዕክትን አሰናክል (የሚደገፍ ከሆነ)
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 803b06aa1fd..15cba5e1810 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -114,7 +114,7 @@ EstimatedStockValueSell=የሚሸጥ ዋጋ
 EstimatedStockValueShort=የግቤት ክምችት ዋጋ
 EstimatedStockValue=የግቤት ክምችት ዋጋ
 DeleteAWarehouse=መጋዘን ሰርዝ
-ConfirmDeleteWarehouse=እርግጠኛ ነዎት መጋዘኑን መሰረዝ ይፈልጋሉ <b>%s<span class='notranslate'></b>?
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
 PersonalStock=የግል ክምችት %s
 ThisWarehouseIsPersonalStock=ይህ መጋዘን የግል የ%s %sን ይወክላል
 SelectWarehouseForStockDecrease=ለክምችት ቅነሳ የሚጠቀሙበትን መጋዘን ይምረጡ
@@ -171,7 +171,7 @@ MovementTransferStock=የምርት ክምችት %s ወደ ሌላ መጋዘን 
 BatchStockMouvementAddInGlobal=ባች ክምችት ወደ አለምአቀፍ ክምችት ይሸጋገራል (ምርት ባች አይጠቀምም)
 InventoryCodeShort=ኢንቭ./Mov. ኮድ
 NoPendingReceptionOnSupplierOrder=በግዢ ትእዛዝ ምክንያት ምንም በመጠባበቅ ላይ ያለ አቀባበል የለም።
-ThisSerialAlreadyExistWithDifferentDate=ይህ ዕጣ/ተከታታይ ቁጥር (<strong>%s</strong></span ጋር ግን አስቀድሞ አለ) የተለየ የሚበላ ወይም የሚሸጥበት ቀን (የተገኘ <span class='notranslate'><strong>%s</strong> ግን ገባህ span class='notranslate'><strong>%s</strong>)።
+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=ክፍት (ሁሉም እንቅስቃሴዎች)
 OpenInternal=ክፍት (የውስጥ እንቅስቃሴ ብቻ)
 UseDispatchStatus=በግዢ ማዘዣ መቀበያ ላይ ለምርት መስመሮች የመላኪያ ሁኔታን (አጽድቅ/እምቢ) ተጠቀም
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=በዚህ እንቅስቃሴ ወቅት ለሁሉ
 ImportFromCSV=የእንቅስቃሴ ዝርዝር CSV አስመጣ
 ChooseFileToImport=ፋይሉን ስቀል ከዚያም የ%s አዶን ጠቅ በማድረግ ፋይሉን እንደ ምንጭ አስመጪ ፋይል ለመምረጥ...
 SelectAStockMovementFileToImport=ለማስመጣት የአክሲዮን እንቅስቃሴ ፋይል ይምረጡ
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial numberCSV character separator must be "%s"
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=ክምችት %s
 ReOpen=እንደገና ክፈት
 ConfirmFinish=የእቃው መዘጋቱን አረጋግጠዋል? ይህ አክሲዮንዎን ወደ እቃው ያስገባዎትን ትክክለኛ ኪቲ ለማዘመን ሁሉንም የአክሲዮን እንቅስቃሴዎች ያመነጫል።
@@ -282,7 +282,7 @@ ModuleStockTransferName=የላቀ የአክሲዮን ማስተላለፍ
 ModuleStockTransferDesc=የላቀ የአክሲዮን ማስተላለፍ አስተዳደር፣ የማስተላለፊያ ወረቀት በማመንጨት
 StockTransferNew=አዲስ የአክሲዮን ዝውውር
 StockTransferList=የአክሲዮን ዝውውሮች ዝርዝር
-ConfirmValidateStockTransfer=እርግጠኛ ነዎት ይህንን የአክሲዮን ዝውውር በማጣቀሻ <b>%s<span class='notranslate'>b09a4b739f17f span >?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=ከዝውውር ጋር የአክሲዮን ቅነሳ %s
 ConfirmDestockCancel=የአክሲዮን ቅነሳን በማስተላለፍ ይሰርዙ %s
 DestockAllProduct=የአክሲዮኖች ቅነሳ
diff --git a/htdocs/langs/am_ET/stripe.lang b/htdocs/langs/am_ET/stripe.lang
index 17d9951512b..56b088ad4d0 100644
--- a/htdocs/langs/am_ET/stripe.lang
+++ b/htdocs/langs/am_ET/stripe.lang
@@ -22,8 +22,8 @@ ToOfferALinkForOnlinePaymentOnContractLine=ዩአርኤል ለኮንትራት 
 ToOfferALinkForOnlinePaymentOnFreeAmount=ምንም አይነት ነገር ሳይኖር የ%s የመስመር ላይ ክፍያ ገጽ ለማቅረብ URL.
 ToOfferALinkForOnlinePaymentOnMemberSubscription=ለአባል ምዝገባ %s የመስመር ላይ ክፍያ ገጽ ለማቅረብ URL.
 ToOfferALinkForOnlinePaymentOnDonation=ዩአርኤል ለልገሳ ክፍያ %s የመስመር ላይ መክፈያ ገጽ ለማቅረብ
-YouCanAddTagOnUrl=እንዲሁም url መለኪያ ማከል ይችላሉ <b>&tag=<i>እሴትb0ae647358bac class='notranslate'></b> ወደ ማንኛቸውም ዩአርኤል (ከነገር ጋር ያልተገናኘ ክፍያ ብቻ የግዴታ) የራስዎን የክፍያ አስተያየት መለያ ለመጨመር።<br>ለ የክፍያ ዩአርኤል ያለ ምንም ነባር ነገር፣ ልኬቱን ማከል ይችላሉ <strong>&noidempotency=1</strong> ስለዚህ ተመሳሳይ አገናኝ ከተመሳሳይ መለያ ጋር ብዙ ጊዜ ጥቅም ላይ ሊውል ይችላል (አንዳንድ የክፍያ ሁነታ ያለዚህ ግቤት ለእያንዳንዱ የተለየ አገናኝ ክፍያውን 1 ሊገድበው ይችላል)
-SetupStripeToHavePaymentCreatedAutomatically=ስትሪፕህን በ url <b>%s<span class='notranslate'></b> ለመክፈል በራስ ሰር ያዋቅሩ። በ Stripe የተረጋገጠ.
+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=የመለያ መለኪያዎች
 UsageParameter=የአጠቃቀም መለኪያዎች
 InformationToFindParameters=የእርስዎን %s መለያ መረጃ ለማግኘት ያግዙ
diff --git a/htdocs/langs/am_ET/supplier_proposal.lang b/htdocs/langs/am_ET/supplier_proposal.lang
index ce5bdf0425a..2fcd9311c10 100644
--- a/htdocs/langs/am_ET/supplier_proposal.lang
+++ b/htdocs/langs/am_ET/supplier_proposal.lang
@@ -1,54 +1,59 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+SupplierProposal=ሻጭ የንግድ ፕሮፖዛል
+supplier_proposalDESC=የዋጋ ጥያቄዎችን ለአቅራቢዎች ያስተዳድሩ
+SupplierProposalNew=አዲስ የዋጋ ጥያቄ
+CommRequest=የዋጋ ጥያቄ
+CommRequests=የዋጋ ጥያቄዎች
+SearchRequest=ጥያቄ ይፈልጉ
+DraftRequests=ረቂቅ ጥያቄዎች
+SupplierProposalsDraft=ረቂቅ የአቅራቢ ሀሳቦች
+LastModifiedRequests=የቅርብ ጊዜ %s የተሻሻሉ የዋጋ ጥያቄዎች
+RequestsOpened=የዋጋ ጥያቄዎችን ይክፈቱ
+SupplierProposalArea=የአቅራቢዎች ፕሮፖዛል አካባቢ
+SupplierProposalShort=የአቅራቢ ሀሳብ
+SupplierProposals=የአቅራቢ ሀሳቦች
+SupplierProposalsShort=የአቅራቢ ሀሳቦች
+AskPrice=የዋጋ ጥያቄ
+NewAskPrice=አዲስ የዋጋ ጥያቄ
+ShowSupplierProposal=የዋጋ ጥያቄን አሳይ
+AddSupplierProposal=የዋጋ ጥያቄ ፍጠር
+SupplierProposalRefFourn=ሻጭ ማጣቀሻ
+SupplierProposalDate=መላኪያ ቀን
+SupplierProposalRefFournNotice=ወደ "ተቀባይነት ያለው" ከመዝጋትዎ በፊት የአቅራቢዎችን ማጣቀሻዎች ለመረዳት ያስቡበት።
 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
+DeleteAsk=ጥያቄ ሰርዝ
+ValidateAsk=ጥያቄ አረጋግጥ
+SupplierProposalStatusDraft=ረቂቅ (መረጋገጥ አለበት)
+SupplierProposalStatusValidated=የተረጋገጠ (ጥያቄው ክፍት ነው)
+SupplierProposalStatusClosed=ዝግ
+SupplierProposalStatusSigned=ተቀባይነት አግኝቷል
+SupplierProposalStatusNotSigned=እምቢ አለ።
+SupplierProposalStatusDraftShort=ረቂቅ
+SupplierProposalStatusValidatedShort=ተረጋግጧል
+SupplierProposalStatusClosedShort=ዝግ
+SupplierProposalStatusSignedShort=ተቀባይነት አግኝቷል
+SupplierProposalStatusNotSignedShort=እምቢ አለ።
+CopyAskFrom=ያለውን ጥያቄ በመቅዳት የዋጋ ጥያቄ ይፍጠሩ
+CreateEmptyAsk=ባዶ ጥያቄ ፍጠር
 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
+SendAskByMail=የዋጋ ጥያቄን በፖስታ ይላኩ።
+SendAskRef=የዋጋ ጥያቄውን በመላክ ላይ %s
+SupplierProposalCard=የጥያቄ ካርድ
+ConfirmDeleteAsk=እርግጠኛ ነዎት ይህን የዋጋ ጥያቄ <b>%s</b>መሰረዝ ይፈልጋሉ?
+ActionsOnSupplierProposal=በዋጋ ጥያቄ ላይ ያሉ ክስተቶች
+DocModelAuroreDescription=ለሻጭ ጥቅስ ጥያቄ የተሟላ አብነት (የስፖንጅ አብነት የቆየ ትግበራ)
+DocModelZenithDescription=ለሻጭ ጥቅስ ጥያቄ የተሟላ አብነት
+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/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index 57b1f85bd40..49c9c12e73e 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -320,7 +320,7 @@ ViewTicket=ትኬት ይመልከቱ
 ViewMyTicketList=የቲኬቴን ዝርዝር ይመልከቱ
 ErrorEmailMustExistToCreateTicket=ስህተት፡ የኢሜል አድራሻችን በውሂብ ጎታችን ውስጥ አልተገኘም።
 TicketNewEmailSubjectAdmin=አዲስ ቲኬት ተፈጥሯል - Ref %s (የህዝብ ትኬት መታወቂያ %s)
-TicketNewEmailBodyAdmin=<p>ትኬት አሁን የተፈጠረው በመታወቂያ #%s ነው፡ መረጃውን ይመልከቱ፡<span class='notranslate'>b0679c9a6a6a6d43 >
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
 SeeThisTicketIntomanagementInterface=በአስተዳደር በይነገጽ ውስጥ ትኬት ይመልከቱ
 TicketPublicInterfaceForbidden=የቲኬቶቹ ይፋዊ በይነገጽ አልነቃም።
 ErrorEmailOrTrackingInvalid=መታወቂያ ወይም ኢሜይል ለመከታተል መጥፎ ዋጋ
diff --git a/htdocs/langs/am_ET/trips.lang b/htdocs/langs/am_ET/trips.lang
index 9210ede360c..416d204300e 100644
--- a/htdocs/langs/am_ET/trips.lang
+++ b/htdocs/langs/am_ET/trips.lang
@@ -1,150 +1,152 @@
 # 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
+AUTHOR=የተመዘገበው በ
+AUTHORPAIEMENT=የተከፈለው በ
+AddTrip=የወጪ ሪፖርት ይፍጠሩ
+AllExpenseReport=ሁሉም ዓይነት የወጪ ሪፖርት
+AllExpenseReports=ሁሉም የወጪ ሪፖርቶች
+AnyOtherInThisListCanValidate=ጥያቄውን ስለማረጋገጡ የሚነገረው ሰው።
+AttachTheNewLineToTheDocument=መስመሩን ከተሰቀለ ሰነድ ጋር ያያይዙት።
+AucuneLigne=እስካሁን የተገለጸ የወጪ ሪፖርት የለም።
+BrouillonnerTrip=የወጪ ሪፖርትን ወደ "ረቂቅ" ሁኔታ ውሰድ
+byEX_DAY=በቀን (በ%s የተገደበ)
+byEX_EXP=በመስመር (በ %s የተገደበ)
+byEX_MON=በወር (በ%s የተገደበ)
+byEX_YEA=በዓመት (በ%s የተገደበ)
+CANCEL_USER=ተሰርዟል።
+CarCategory=የተሽከርካሪ ምድብ
+ClassifyRefunded=«የተመላሽ ገንዘብ»ን መድብ
+CompanyVisited=ኩባንያ/ድርጅት ተጎበኘ
+ConfirmBrouillonnerTrip=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት ወደ "ረቂቅ" ደረጃ ማዛወር ይፈልጋሉ?
+ConfirmCancelTrip=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት መሰረዝ ይፈልጋሉ?
+ConfirmCloneExpenseReport=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት መዝጋት ይፈልጋሉ?
+ConfirmDeleteTrip=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት መሰረዝ ይፈልጋሉ?
+ConfirmPaidTrip=እርግጠኛ ነዎት የዚህን የወጪ ሪፖርት ሁኔታ ወደ "የተከፈለ" መቀየር ይፈልጋሉ?
+ConfirmRefuseTrip=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት መካድ ይፈልጋሉ?
+ConfirmSaveTrip=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት ማረጋገጥ ይፈልጋሉ?
+ConfirmValideTrip=እርግጠኛ ነዎት ይህን የወጪ ሪፖርት ማጽደቅ ይፈልጋሉ?
+DATE_CANCEL=የተሰረዘበት ቀን
+DATE_PAIEMENT=የክፍያ ቀን
+DATE_REFUS=ቀን መካድ
+DATE_SAVE=የማረጋገጫ ቀን
+DefaultCategoryCar=ነባሪ የመጓጓዣ ሁኔታ
+DefaultRangeNumber=ነባሪ ክልል ቁጥር
+DeleteTrip=የወጪ ሪፖርትን ሰርዝ
+ErrorDoubleDeclaration=ሌላ የወጪ ሪፖርት በተመሳሳይ የቀን ክልል አውጀዋል።
+Error_EXPENSEREPORT_ADDON_NotDefined=ስህተት፣ የወጪ ሪፖርት ቁጥር ማጣቀሻ ደንብ በሞጁል 'የወጪ ሪፖርት' ማዋቀር ላይ አልተገለጸም
+ExpenseRangeOffset=የተቀነሰው መጠን፡ %s
+expenseReportCatDisabled=ምድብ ተሰናክሏል - የc_exp_tax_cat መዝገበ ቃላትን ይመልከቱ
 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
+expenseReportCoefUndefined=(እሴቱ አልተገለጸም)
+expenseReportOffset=ማካካሻ
 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
+expenseReportRangeDisabled=ክልል ተሰናክሏል - የc_exp_tax_ክልል መዝገበ ቃላትን ይመልከቱ
+expenseReportRangeFromTo=ከ%d ወደ %d
+expenseReportRangeMoreThan=ከ%d በላይ
+expenseReportTotalForFive=ምሳሌ በ<u>d</u> = 5
+ExpenseReportApplyTo=ተግባራዊ
+ExpenseReportApproved=የወጪ ሪፖርት ጸድቋል
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
+ExpenseReportCanceled=የወጪ ሪፖርት ተሰርዟል።
+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
+ExpenseReportConstraintViolationError=ከፍተኛው መጠን አልፏል (ደንብ %s): %s ከ%s (%s) ከፍ ያለ ነው። ከመጠን በላይ የተከለከለ)
+ExpenseReportConstraintViolationWarning=ከፍተኛው መጠን አልፏል (ደንብ %s): %s ከ %s (%s) ከፍ ያለ ነው። ከተፈቀደው በላይ)
+ExpenseReportDateEnd=የቀኑ ማብቂያ
+ExpenseReportDateStart=የሚጀምርበት ቀን
+ExpenseReportDomain=ለማመልከት ጎራ
+ExpenseReportIkDesc=የኪሎሜትር ወጪን ስሌት በምድብ እና ቀደም ሲል በማን እንደተገለፀው ማስተካከል ይችላሉ። <b>d</b> በኪሎሜትር ያለው ርቀት ነው
+ExpenseReportLimitAmount=ከፍተኛ መጠን
+ExpenseReportLimitOn=ላይ ገድብ
+ExpenseReportLine=የወጪ ሪፖርት መስመር
+ExpenseReportPaid=የወጪ ሪፖርት ተከፍሏል።
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
+ExpenseReportPayment=የወጪ ሪፖርት ክፍያ
+ExpenseReportRef=ማጣቀሻ. የወጪ ሪፖርት
+ExpenseReportRefused=የወጪ ሪፖርት ውድቅ ተደርጓል
+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
+ExpenseReportRestrictive=መብለጥ የተከለከለ
+ExpenseReportRuleErrorOnSave=ስህተት፡ %s
+ExpenseReportRuleSave=የወጪ ሪፖርት ደንብ ተቀምጧል
+ExpenseReportRulesDesc=ለወጪ ሪፖርቶች ከፍተኛ መጠን ደንቦችን መግለፅ ይችላሉ. እነዚህ ደንቦች አዲስ ወጪ በወጪ ሪፖርት ላይ ሲታከል ተግባራዊ ይሆናሉ
+ExpenseReportWaitingForApproval=ለማጽደቅ አዲስ የወጪ ሪፖርት ቀርቧል
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
+ExpenseReportWaitingForReApproval=እንደገና ለማጽደቅ የወጪ ሪፖርት ቀርቧል
+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
+ExpenseReportsIk=የማይል ርቀት ክፍያዎችን ማዋቀር
+ExpenseReportsRules=የወጪ ሪፖርት ደንቦች
+ExpenseReportsToApprove=ለማጽደቅ የወጪ ሪፖርቶች
+ExpenseReportsToPay=ለመክፈል የወጪ ሪፖርቶች
+ExpensesArea=የወጪ ሪፖርቶች አካባቢ
+FeesKilometersOrAmout=መጠን ወይም ኪሎሜትር
+LastExpenseReports=የቅርብ ጊዜ የ%s የወጪ ሪፖርቶች
+ListOfFees=የክፍያዎች ዝርዝር
+ListOfTrips=የወጪ ሪፖርቶች ዝርዝር
+ListToApprove=መጽደቅን በመጠበቅ ላይ
+ListTripsAndExpenses=የወጪ ሪፖርቶች ዝርዝር
+MOTIF_CANCEL=ምክንያት
+MOTIF_REFUS=ምክንያት
+ModePaiement=የክፍያ ሁነታ
+NewTrip=አዲስ የወጪ ሪፖርት
+nolimitbyEX_DAY=በቀን (ምንም ገደብ የለም)
+nolimitbyEX_EXP=በመስመር (ምንም ገደብ የለም)
+nolimitbyEX_MON=በወር (ምንም ገደብ የለም)
+nolimitbyEX_YEA=በዓመት (ምንም ገደብ የለም)
+NoTripsToExportCSV=ለዚህ ጊዜ ምንም የወጪ ሪፖርት የለም።
+NOT_AUTHOR=የዚህ የወጪ ሪፖርት ደራሲ አይደሉም። ክዋኔው ተሰርዟል።
+OnExpense=የወጪ መስመር
+PDFStandardExpenseReports=ለወጪ ዘገባ የፒዲኤፍ ሰነድ ለማመንጨት መደበኛ አብነት
+PaidTrip=የወጪ ሪፖርት ይክፈሉ።
+REFUSEUR=ተከልክሏል።
+RangeIk=የርቀት ክልል
+RangeNum=ክልል %d
+SaveTrip=የወጪ ሪፖርትን ያረጋግጡ
+ShowExpenseReport=የወጪ ሪፖርት አሳይ
+ShowTrip=የወጪ ሪፖርት አሳይ
+TripCard=የወጪ ሪፖርት ካርድ
+TripId=የመታወቂያ ወጪ ሪፖርት
+TripNDF=የመረጃ ወጪ ሪፖርት
+TripSociete=የመረጃ ኩባንያ
+Trips=የወጪ ሪፖርቶች
+TripsAndExpenses=ሪፖርቶችን ያወጣል።
+TripsAndExpensesStatistics=የወጪ ዘገባዎች ስታቲስቲክስ
+TypeFees=የክፍያ ዓይነቶች
+UploadANewFileNow=አሁን አዲስ ሰነድ ስቀል
+VALIDATOR=ለማጽደቅ ኃላፊነት ያለው ተጠቃሚ
+VALIDOR=ያረጋገጠው ሰው
+ValidateAndSubmit=ያረጋግጡ እና ለማጽደቅ ያስገቡ
+ValidatedWaitingApproval=የተረጋገጠ (ማጽደቅን በመጠባበቅ ላይ)
+ValideTrip=የወጪ ሪፖርትን ማጽደቅ
+
+## Dictionary
+EX_BRE=ቁርስ
+EX_CAM=የሲቪ ጥገና እና ጥገና
+EX_CAM_VP=የ PV ጥገና እና ጥገና
+EX_CAR=የመኪና ኪራይ
+EX_CUR=ደንበኞች መቀበል
+EX_DOC=ሰነድ
+EX_EMM=የሰራተኞች ምግብ
+EX_FUE=ነዳጅ ሲቪ
+EX_FUE_VP=ነዳጅ ፒ.ቪ
+EX_GUM=የእንግዶች ምግብ
+EX_HOT=ሆቴል
+EX_IND=የካሳ ማጓጓዣ ምዝገባ
+EX_KME=ማይል ወጪዎች
+EX_OTR=ሌሎች መቀበል
+EX_PAR=የመኪና ማቆሚያ CV
+EX_PAR_VP=የመኪና ማቆሚያ ፒ.ቪ
+EX_POS=ፖስታ
+EX_SUM=የጥገና አቅርቦት
+EX_SUO=የቢሮ መገልገያ ዕቃዎች
+EX_TAX=የተለያዩ ግብሮች
+EX_TOL=የክፍያ ሲቪ
+EX_TOL_VP=ክፍያ ፒ.ቪ
+TF_BUS=አውቶቡስ
+TF_CAR=መኪና
+TF_ESSENCE=ነዳጅ
+TF_HOTEL=ሆቴል
+TF_LUNCH=ምሳ
+TF_METRO=ሜትሮ
+TF_OTHER=ሌላ
+TF_PEAGE=ክፍያ
+TF_TAXI=ታክሲ
+TF_TRAIN=ባቡር
+TF_TRIP=መጓጓዣ
diff --git a/htdocs/langs/am_ET/users.lang b/htdocs/langs/am_ET/users.lang
index b6c7feb7bd2..74199e97c0b 100644
--- a/htdocs/langs/am_ET/users.lang
+++ b/htdocs/langs/am_ET/users.lang
@@ -1,126 +1,136 @@
 # 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
-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>?
+HRMArea=HRM አካባቢ
+UserCard=የተጠቃሚ ካርድ
+GroupCard=የቡድን ካርድ
+Permission=ፍቃድ
+Permissions=ፈቃዶች
+EditPassword=የይለፍ ቃል አርትዕ
+SendNewPassword=እንደገና ማመንጨት እና የይለፍ ቃል ላክ
+SendNewPasswordLink=የይለፍ ቃል ዳግም ለማስጀመር አገናኝ ይላኩ።
+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=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
+NewUser=አዲስ ተጠቃሚ
+CreateUser=ተጠቃሚ ፍጠር
+LoginNotDefined=መግባት አልተገለጸም።
+NameNotDefined=ስም አልተገለጸም።
+ListOfUsers=የተጠቃሚዎች ዝርዝር
+SuperAdministrator=ባለብዙ ኩባንያ አስተዳዳሪ
+SuperAdministratorDesc=የባለብዙ ኩባንያ ስርዓት አስተዳዳሪ (ማዋቀር እና ተጠቃሚዎችን መለወጥ ይችላል)
+DefaultRights=ነባሪ ፈቃዶች
 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>
+DolibarrUsers=Dolibarr ተጠቃሚዎች
+LastName=የአያት ስም
+FirstName=የመጀመሪያ ስም
+ListOfGroups=የቡድኖች ዝርዝር
+NewGroup=አዲስ ቡድን
+CreateGroup=ቡድን ይፍጠሩ
+RemoveFromGroup=ከቡድን አስወግድ
+PasswordChangedAndSentTo=የይለፍ ቃል ተቀይሮ ወደ <b>%s</b> ተልኳል።
+PasswordChangeRequest=ለ<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
-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
+IfLoginExistPasswordRequestSent=ይህ መግቢያ ትክክለኛ መለያ ከሆነ (ከሚሰራ ኢሜይል ጋር)፣ የይለፍ ቃል ዳግም ለማስጀመር ኢሜይል ተልኳል።
+IfEmailExistPasswordRequestSent=ይህ ኢሜይል የሚሰራ መለያ ከሆነ፣ የይለፍ ቃል ዳግም ለማስጀመር ኢሜይል ተልኳል (ምንም ነገር ካልደረሰዎት የአይፈለጌ መልእክት አቃፊዎን ማረጋገጥዎን ያስታውሱ)
+ConfirmPasswordReset=የይለፍ ቃል ዳግም ማስጀመርን ያረጋግጡ
+MenuUsersAndGroups=ተጠቃሚዎች እና ቡድኖች
+LastGroupsCreated=የቅርብ ጊዜ %s ቡድኖች ተፈጥረዋል
+LastUsersCreated=የቅርብ ጊዜ %s ተጠቃሚዎች ተፈጥረዋል
+ShowGroup=ቡድን አሳይ
+ShowUser=ተጠቃሚ አሳይ
+NonAffectedUsers=ያልተመደቡ ተጠቃሚዎች
+UserModified=ተጠቃሚ በተሳካ ሁኔታ ተስተካክሏል።
+PhotoFile=የፎቶ ፋይል
+ListOfUsersInGroup=በዚህ ቡድን ውስጥ ያሉ የተጠቃሚዎች ዝርዝር
+ListOfGroupsForUser=ለዚህ ተጠቃሚ የቡድኖች ዝርዝር
+LinkToCompanyContact=ከሶስተኛ ወገን/እውቂያ ጋር አገናኝ
+LinkedToDolibarrMember=ወደ አባል አገናኝ
+LinkedToDolibarrUser=ከተጠቃሚው ጋር አገናኝ
+LinkedToDolibarrThirdParty=የሶስተኛ ወገን አገናኝ
+CreateDolibarrLogin=ተጠቃሚ ፍጠር
+CreateDolibarrThirdParty=ሶስተኛ ወገን ይፍጠሩ
+LoginAccountDisableInDolibarr=መለያ ዶሊባርር ውስጥ ተሰናክሏል።
+PASSWORDInDolibarr=በዶሊባርር ውስጥ የይለፍ ቃል ተስተካክሏል።
+UsePersonalValue=የግል ዋጋን ተጠቀም
+ExportDataset_user_1=ተጠቃሚዎች እና ንብረቶቻቸው
+DomainUser=የጎራ ተጠቃሚ %s
+Reactivate=እንደገና አንቃ
+CreateInternalUserDesc=ይህ ቅጽ በድርጅትዎ ውስጥ የውስጥ ተጠቃሚ እንዲፈጥሩ ይፈቅድልዎታል። የውጭ ተጠቃሚን ለመፍጠር (ደንበኛ፣ ሻጭ ወዘተ..)፣ ከዚያ የሶስተኛ ወገን የእውቂያ ካርድ 'Dolibarr User ፍጠር' የሚለውን ቁልፍ ተጠቀም።
+InternalExternalDesc=የ<b>internal</b> ተጠቃሚ የድርጅትዎ አካል የሆነ ወይም ከድርጅትዎ ውጪ አጋር ተጠቃሚ ነው። ከኩባንያው ጋር ከተያያዙ መረጃዎች የበለጠ መረጃ ማየት ሊያስፈልገው ይችላል (የፍቃድ ስርዓቱ ማየት ወይም ማድረግ የማይችለውን ይገልፃል)<br>An <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=እርግጠኛ ነዎት ለዚህ እውቂያ የዶሊባርር መለያ መፍጠር ይፈልጋሉ?
+ConfirmCreateLogin=እርግጠኛ ነዎት ለዚህ አባል የዶሊባርር መለያ መፍጠር ይፈልጋሉ?
+ConfirmCreateThirdParty=እርግጠኛ ነዎት ለዚህ አባል ሶስተኛ ወገን መፍጠር ይፈልጋሉ?
+LoginToCreate=ለመፍጠር ይግቡ
+NameToCreate=ለመፍጠር የሶስተኛ ወገን ስም
+YourRole=የእርስዎ ሚናዎች
+YourQuotaOfUsersIsReached=የንቁ ተጠቃሚዎች ኮታዎ ደርሷል!
+NbOfUsers=የተጠቃሚዎች ብዛት
+NbOfPermissions=የፍቃዶች ብዛት
+DontDowngradeSuperAdmin=ሌላ አስተዳዳሪ ብቻ ነው አስተዳዳሪን ዝቅ ማድረግ የሚችለው
+HierarchicalResponsible=ተቆጣጣሪ
+HierarchicView=ተዋረዳዊ እይታ
+UseTypeFieldToChange=ለመቀየር የመስክ አይነትን ተጠቀም
+OpenIDURL=ክፍት መታወቂያ URL
+LoginUsingOpenID=ለመግባት OpenID ይጠቀሙ
+WeeklyHours=የስራ ሰዓታት (በሳምንት)
+ExpectedWorkedHours=የሚጠበቁ ሰዓቶች በሳምንት ይሠራሉ
+ColorUser=የተጠቃሚው ቀለም
+DisabledInMonoUserMode=በጥገና ሁነታ ላይ ተሰናክሏል።
+UserAccountancyCode=የተጠቃሚ መለያ ኮድ
+UserLogoff=የተጠቃሚ መውጣት፡ %s
+UserLogged=ተጠቃሚ ገብቷል፡ %s
+UserLoginFailed=የተጠቃሚ መግቢያ አልተሳካም፦ %s
+DateOfEmployment=የቅጥር ቀን
+DateEmployment=ሥራ
+DateEmploymentStart=የቅጥር መጀመሪያ ቀን
+DateEmploymentEnd=የቅጥር ማብቂያ ቀን
+RangeOfLoginValidity=የሚጸናበት ቀን ክልል ድረስበት
+CantDisableYourself=የራስዎን የተጠቃሚ መዝገብ ማሰናከል አይችሉም
+ForceUserExpenseValidator=የወጪ ሪፖርት አረጋጋጭን አስገድድ
+ForceUserHolidayValidator=የግዳጅ ፈቃድ ጥያቄ አረጋጋጭ
+ValidatorIsSupervisorByDefault=በነባሪነት አረጋጋጩ የተጠቃሚው ተቆጣጣሪ ነው። ይህንን ባህሪ ለማቆየት ባዶ ያድርጉት።
+UserPersonalEmail=የግል ኢሜይል
+UserPersonalMobile=የግል ሞባይል ስልክ
+WarningNotLangOfInterface=ማስጠንቀቂያ፣ ይህ ተጠቃሚው የሚናገረው ዋና ቋንቋ እንጂ ለማየት የመረጠው የበይነገጽ ቋንቋ አይደለም። በዚህ ተጠቃሚ የሚታየውን የበይነገጽ ቋንቋ ለመቀየር ወደ ትር ይሂዱ %s
+DateLastLogin=የመጨረሻው የመግቢያ ቀን
+DatePreviousLogin=የቀደመ መግቢያ ቀን
+IPLastLogin=የአይፒ የመጨረሻ መግቢያ
+IPPreviousLogin=የአይፒ ቀዳሚ መግቢያ
+ShowAllPerms=ሁሉንም የፍቃድ ረድፎች አሳይ
+HideAllPerms=ሁሉንም የፍቃድ ረድፎች ደብቅ
+UserPublicPageDesc=ለዚህ ተጠቃሚ ምናባዊ ካርድ ማንቃት ይችላሉ። ስማርትፎን ያለው ማንኛውም ሰው እንዲቃኘው እና አድራሻዎን በአድራሻ ደብተር ላይ እንዲያክልበት የተጠቃሚ መገለጫ እና ባር ኮድ ያለው ዩአርኤል ይገኛል።
+EnablePublicVirtualCard=የተጠቃሚውን ምናባዊ የንግድ ካርድ አንቃ
+UserEnabledDisabled=የተጠቃሚ ሁኔታ ተቀይሯል፡ %s
+AlternativeEmailForOAuth2=አማራጭ ኢሜይል ለ OAuth2 መግቢያ
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index bb110bf8ef2..8f7c3905051 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -32,7 +32,7 @@ AddWebsite=ድር ጣቢያ ያክሉ
 Webpage=ድረ-ገጽ/መያዣ
 AddPage=ገጽ/መያዣ ያክሉ
 PageContainer=ገጽ
-PreviewOfSiteNotYetAvailable=የድረ-ገጽህ ቅድመ እይታ <strong>%s</strong></span.> ገና አይገኝም። መጀመሪያ '<span class='notranslate'><strong>ሙሉ ድህረ ገጽ አብነት አስመጣ</strong>' ወይም ልክ 'b0e</c7843947 span>ገጽ/ኮንቴይነር አክል<span class='notranslate'></strong>'
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=የተጠየቀው ገጽ መታወቂያ %s እስካሁን ምንም ይዘት የለውም፣ ወይም የመሸጎጫ ፋይል .tpl.php ተወግዷል። ይህንን ለመፍታት የገጹን ይዘት ያርትዑ።
 SiteDeleted=ድር ጣቢያ '%s ተሰርዟል
 PageContent=ገጽ/ኮንቴናየር
@@ -48,13 +48,13 @@ VirtualhostDesc=የቨርቹዋል አስተናጋጅ ወይም ጎራ ስም (
 SetHereVirtualHost=<u>በApache/NGinx/...</u><br> በ ላይCrete የእርስዎ የድር አገልጋይ (Apache, Nginx, ...) የተወሰነ ምናባዊ አስተናጋጅ በ PHP የነቃ እና በ<br> ላይ ያለው Root directory<strong> %s</strong>
 ExampleToUseInApacheVirtualHostConfig=በApache ምናባዊ አስተናጋጅ ማዋቀር ውስጥ ለመጠቀም ምሳሌ፡-
 YouCanAlsoTestWithPHPS=<u>በPHP ከተከተተ አገልጋይ ጋር ተጠቀም</u><br>አካባቢን ማዳበር ትችላለህ። <br><strong>php -S 0.0.0.0 ን በማሄድ ጣቢያውን በPHP በተካተተ የድር አገልጋይ (PHP 5.5 ያስፈልጋል) መሞከርን እመርጣለሁ። :8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>የእርስዎን ድረ-ገጽ ከሌላ Dolibarr ማስተናገጃ አቅራቢ ጋር ያሂዱ</u><br> ከሆነ</span እንደ Apache ወይም NGinx ያለ ድረ-ገጽ በበይነ መረብ ላይ የሎትም፣ ድህረ ገጽዎን ወደ ሌላ የዶሊባርር ምሳሌ ወደ ውጭ መላክ እና ከድህረ ገጹ ሞጁል ጋር ሙሉ ውህደት በሚያቀርብ ሌላ የዶሊባርር ማስተናገጃ አቅራቢ ላይ ማስገባት ይችላሉ። የአንዳንድ ዶሊባርር ማስተናገጃ አቅራቢዎችን ዝርዝር በ<span class='notranslate'><a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a> ላይ ማግኘት ትችላለህ
-CheckVirtualHostPerms=የቨርቹዋል አስተናጋጅ ተጠቃሚ (ለምሳሌ www-data) <strong>%sb0a65d071f6fc9 እንዳለው ያረጋግጡ።  ፈቃዶች በፋይሎች ላይ ወደ<br><strong>%s<span ='notranslate'></strong></span>
+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=አንብብ
 WritePerm=ጻፍ
 TestDeployOnWeb=በድር ላይ ሞክር/አሰማር
-PreviewSiteServedByWebServer=<u>ቅድመ እይታ %s በአዲስ ትር ውስጥ።</u><span class='span>ክፍል notranslate'><br></span><br>የ %s በውጫዊ የድር አገልጋይ (እንደ Apache, Nginx ያሉ) ይቀርባል. ). ወደ ማውጫው ከመጠቆምዎ በፊት ይህን አገልጋይ መጫን እና ማዋቀር አለብዎት፡<br><strong>b0ecb2ec87f49fez0 span><span class='notranslate'></strong><br>ዩአርኤል በውጫዊ አገልጋይ የቀረበ፡<br><span ='notranslate'><strong></span>%s</strong>
-PreviewSiteServedByDolibarr=<u>ቅድመ እይታ %s በአዲስ ትር ውስጥ።</u><span class='span>ክፍል notranslate'><br></span><br>የ%s በዶሊባርር አገልጋይ ስለሚቀርብ ምንም ተጨማሪ የድር አገልጋይ አያስፈልገውም። (እንደ Apache, Nginx, IIS) መጫን አለበት.<br>የማይመችው የገጾቹ ዩአርኤሎች ለተጠቃሚ ምቹ አለመሆኑ እና በዶሊባርር መንገድ መጀመራቸው ነው።<br>ዩአርኤል በ Dolibarr የቀረበ፡<br><strong><spanec2class'06bz0</span><ecf2 class'06775570749 /span></strong><br><br>የራስህን ውጫዊ ድር አገልጋይ ለመጠቀም ይህንን ድረ-ገጽ አገልግሉ፣ በድር አገልጋይዎ ላይ ማውጫ ላይ የሚጠቁም ምናባዊ አስተናጋጅ ይፍጠሩ<br><strong>%s</strong><br>ከዚያም የዚህን ቨርቹዋል አገልጋይ ስም በዚህ ድህረ ገጽ ባህሪያት ውስጥ አስገባና ጠቅ አድርግ። አገናኝ "ሙከራ/በድሩ ላይ አሰማራ"።
+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=በውጫዊ የድር አገልጋይ የሚቀርበው የቨርቹዋል አስተናጋጅ ዩአርኤል አልተገለጸም።
 NoPageYet=እስካሁን ምንም ገጾች የሉም
 YouCanCreatePageOrImportTemplate=አዲስ ገጽ መፍጠር ወይም ሙሉ የድር ጣቢያ አብነት ማስመጣት ይችላሉ።
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=በአርታዒ ውስጥ ያለውን "ምንጭ"
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=ከማጋራት አገናኝ ጋር ለተጋራ ምስል (የፋይል ማጋሪያ ሃሽ ቁልፍን በመጠቀም ክፈት መዳረሻ)፣ አገባብ የሚከተለው ነው፡<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='070translate'd </span><br>
-YouCanEditHtmlSource3=የPHP ነገርን ምስል URL ለማግኘት<br><strong>&lt; ይጠቀሙ span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;span class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>ተጨማሪ የኤችቲኤምኤል ምሳሌዎች ወይም ተለዋዋጭ ኮድ በ<a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentationb0e40dc607d</span8 >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=ክሎን ገጽ/መያዣ
 CloneSite=Clone ጣቢያ
 SiteAdded=ድህረ ገጽ ታክሏል።
@@ -110,7 +110,7 @@ ThisPageIsTranslationOf=ይህ ገጽ/ኮንቴይነር ትርጉም ነው።
 ThisPageHasTranslationPages=ይህ ገጽ/ኮንቴይነር ትርጉም አለው።
 NoWebSiteCreateOneFirst=እስካሁን ምንም ድር ጣቢያ አልተፈጠረም። መጀመሪያ አንድ ይፍጠሩ.
 GoTo=መሄድ
-DynamicPHPCodeContainsAForbiddenInstruction=የPHP መመሪያን የያዘ ተለዋዋጭ ፒኤችፒ ኮድ አክለዋል '<strong>%s<span class='notranslate'>b0a65d071f6fc9z በነባሪነት እንደ ተለዋዋጭ ይዘት የተከለከለ ነው (የተፈቀዱትን ትዕዛዞች ዝርዝር ለመጨመር የተደበቁ አማራጮችን WEBSITE_PHP_ALLOW_xxx ይመልከቱ)።
+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=በድር ጣቢያዎች ውስጥ የPHP ተለዋዋጭ ይዘትን ለመጨመር ወይም ለማርትዕ ፍቃድ የለዎትም። ፍቃድ ይጠይቁ ወይም ኮድ ሳይሻሻል በ php መለያዎች ውስጥ ያስቀምጡ።
 ReplaceWebsiteContent=የድር ጣቢያ ይዘት ይፈልጉ ወይም ይተኩ
 DeleteAlsoJs=እንዲሁም ለዚህ ድህረ ገጽ የተለዩ ሁሉም የጃቫ ስክሪፕት ፋይሎች ይሰረዙ?
@@ -118,7 +118,7 @@ DeleteAlsoMedias=እንዲሁም ለዚህ ድህረ ገጽ የተለዩ ሁሉ
 MyWebsitePages=የእኔ ድረ-ገጽ ገፆች
 SearchReplaceInto=ፍለጋ | ወደ ውስጥ ይተኩ
 ReplaceString=አዲስ ሕብረቁምፊ
-CSSContentTooltipHelp=እዚህ የሲኤስኤስ ይዘት ያስገቡ። ከማመልከቻው CSS ጋር ምንም አይነት ግጭት ለማስቀረት፣ ሁሉንም መግለጫዎች ከ.bodywebsite ክፍል ጋር አስቀድመው ማዘጋጀትዎን ያረጋግጡ። ለምሳሌ፡<br><br>#mycssselector, input.myclass:ማንዣበብ { ... } <br>መሆን አለበት<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:ማንዣበብ { ... }b0342f</spanz>b0342f <span class='notranslate'><br>ማስታወሻ፡ ያለዚህ ቅድመ ቅጥያ ትልቅ ፋይል ካለህ የ .bodywebsite ቅድመ ቅጥያ በሁሉም ቦታ ላይ ለመጨመር 'lessc' ን መጠቀም ትችላለህ።
+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=ማስጠንቀቂያ፡ ይህ ይዘት የሚወጣው ጣቢያ ከአገልጋይ ሲደረስ ብቻ ነው። በአርትዖት ሁነታ ላይ ጥቅም ላይ አይውልም ስለዚህ የጃቫ ስክሪፕት ፋይሎችን በአርትዖት ሁነታ ላይ መጫን ከፈለጉ በቀላሉ 'script src=...' መለያዎን ወደ ገጹ ያክሉት።
 Dynamiccontent=ተለዋዋጭ ይዘት ያለው ገጽ ናሙና
 EditInLineOnOff=ሁነታ 'ኢንላይን አርትዕ' %s ነው
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
index bda987276b1..5984cc6027b 100644
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -1,156 +1,173 @@
 # 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
-CreditTransfer=Credit transfer
-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
-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
-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=የብድር ማስተላለፍ
+CreditTransferLine=የብድር ማስተላለፊያ መስመር
+WithdrawalsLines=ቀጥተኛ የዴቢት ትዕዛዝ መስመሮች
+CreditTransferLines=የብድር ማስተላለፊያ መስመሮች
+RequestStandingOrderToTreat=በቀጥታ የዴቢት ክፍያ ለማዘዝ ጥያቄዎች
+RequestStandingOrderTreated=የቀጥታ ዴቢት ክፍያ ማዘዣ ተካሄዷል
+RequestPaymentsByBankTransferToTreat=ለማስኬድ የብድር ማስተላለፍ ጥያቄዎች
+RequestPaymentsByBankTransferTreated=የብድር ማስተላለፍ ጥያቄዎች ተስተናግደዋል።
+NotPossibleForThisStatusOfWithdrawReceiptORLine=እስካሁን አይቻልም። በተወሰኑ መስመሮች ላይ ውድቅ ከማድረጉ በፊት የማውጣት ሁኔታ ወደ 'ክሬዲት' መቀናበር አለበት።
+NbOfInvoiceToWithdraw=በቀጥታ የዴቢት ትእዛዝ በመጠባበቅ ብቁ የደንበኛ ደረሰኞች ቁጥር
+NbOfInvoiceToWithdrawWithInfo=የባንክ ሒሳብ መረጃን የሚገልጽ ቀጥተኛ የዴቢት ክፍያ ትዕዛዞች የደንበኛ ደረሰኝ ቁጥር
+NbOfInvoiceToPayByBankTransfer=በክሬዲት ማስተላለፍ ክፍያ የሚጠብቁ ብቁ የአቅራቢዎች ደረሰኞች ቁጥር
+SupplierInvoiceWaitingWithdraw=የአቅራቢ ደረሰኝ በክሬዲት ማስተላለፍ ክፍያ በመጠባበቅ ላይ
+InvoiceWaitingWithdraw=የክፍያ መጠየቂያ ለቀጥታ ክፍያ በመጠባበቅ ላይ
+InvoiceWaitingPaymentByBankTransfer=ደረሰኝ የብድር ማስተላለፍን በመጠባበቅ ላይ
+AmountToWithdraw=የሚወጣበት መጠን
+AmountToTransfer=ለማስተላለፍ መጠን
+NoInvoiceToWithdraw=ለ'%s ምንም ደረሰኝ አልተከፈተም። ጥያቄ ለማቅረብ በክፍያ መጠየቂያ ካርድ ላይ '%s የሚለውን ትር ይሂዱ።
+NoSupplierInvoiceToWithdraw=ክፍት '%s ያለው ምንም የአቅራቢ ደረሰኝ አይጠብቅም። ጥያቄ ለማቅረብ በክፍያ መጠየቂያ ካርድ ላይ '%s የሚለውን ትር ይሂዱ።
+ResponsibleUser=ተጠያቂ ተጠቃሚ
+WithdrawalsSetup=የቀጥታ ዴቢት ክፍያ ማዋቀር
+CreditTransferSetup=የብድር ማስተላለፍ ማዋቀር
+WithdrawStatistics=ቀጥተኛ የዴቢት ክፍያ ስታቲስቲክስ
+CreditTransferStatistics=የብድር ማስተላለፍ ስታቲስቲክስ
+Rejects=ውድቅ ያደርጋል
+LastWithdrawalReceipt=የቅርብ ጊዜ %s ቀጥተኛ የዴቢት ደረሰኞች
+MakeWithdrawRequest=ቀጥታ የዴቢት ክፍያ ጥያቄ ያቅርቡ
+MakeWithdrawRequestStripe=በ Stripe በኩል የቀጥታ የዴቢት ክፍያ ጥያቄ ያቅርቡ
+MakeBankTransferOrder=የብድር ማስተላለፍ ጥያቄ ያቅርቡ
+WithdrawRequestsDone=%s የቀጥታ ዴቢት ክፍያ ጥያቄዎች ተመዝግበዋል
+BankTransferRequestsDone=%s የብድር ማስተላለፍ ጥያቄዎች ተመዝግበዋል
+ThirdPartyBankCode=የሶስተኛ ወገን የባንክ ኮድ
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=ምንም ደረሰኝ በተሳካ ሁኔታ አልተሰራም። ደረሰኞች ትክክለኛ IBAN ባላቸው ኩባንያዎች ላይ መሆናቸውን ያረጋግጡ።
+NoSalariesCouldBeWithdrawed=ምንም ደመወዝ በተሳካ ሁኔታ አልተሰራም። ደሞዝ የሚሰራ IBAN ባላቸው ተጠቃሚዎች ላይ መሆኑን ያረጋግጡ።
+WithdrawalCantBeCreditedTwice=ይህ የመውጫ ደረሰኝ አስቀድሞ እንደ ክሬዲት ምልክት ተደርጎበታል። ይህ ሁለት ጊዜ ሊሠራ አይችልም፣ ምክንያቱም ይህ የተባዙ ክፍያዎችን እና የባንክ ግቤቶችን ሊፈጥር ይችላል።
+ClassCredited=ክሬዲት ይመድቡ
+ClassDebited=የተከፈለበትን መድብ
+ClassCreditedConfirm=እርግጠኛ ነዎት ይህን የመውጣት ደረሰኝ በባንክ ሂሳብዎ ላይ እንደተመዘገበ መከፋፈል ይፈልጋሉ?
+TransData=የማስተላለፍ ቀን
+TransMetod=የማስተላለፊያ ዘዴ
+Send=ላክ
+Lines=መስመሮች
+StandingOrderReject=አለመቀበልን ይመዝግቡ
+WithdrawsRefused=ቀጥተኛ ክፍያ ውድቅ አደረገ
+WithdrawalRefused=መውጣት እምቢ አለ።
+CreditTransfersRefused=የዱቤ ዝውውሮች ውድቅ ናቸው።
+WithdrawalRefusedConfirm=እርግጠኛ ነዎት ለህብረተሰቡ የመውጣት ውድቅ ለማድረግ ይፈልጋሉ
+RefusedData=ውድቅ የተደረገበት ቀን
+RefusedReason=ውድቅ የተደረገበት ምክንያት
+RefusedInvoicing=ውድቀቱን ማስከፈል
+NoInvoiceRefused=ደንበኛው ላለመቀበል ክፍያ አያስከፍሉ
+InvoiceRefused=ለደንበኛው እምቢተኝነትን ያስከፍሉ
+DirectDebitRefusedInvoicingDesc=ይህ እምቢታ ለደንበኛው መከፈል አለበት ለማለት ባንዲራ ያዘጋጁ
+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=ይህ ትር በቀጥታ የዴቢት ክፍያ ትዕዛዝ እንዲጠይቁ ያስችልዎታል። አንዴ ከጨረሱ በኋላ ቀጥታ የዴቢት ማዘዣ ፋይል ለማመንጨት እና ለማስተዳደር ወደ ሜኑ "ባንክ->ክፍያ ቀጥታ ዴቢት" መሄድ ይችላሉ።
+DoStandingOrdersBeforePayments2=እንዲሁም ጥያቄን በቀጥታ ወደ SEPA የክፍያ ፕሮሰሰር መላክ ይችላሉ እንደ Stripe ፣ ...
+DoStandingOrdersBeforePayments3=ጥያቄው ሲዘጋ፣ የክፍያ መጠየቂያ ደረሰኞች በቀጥታ ይመዘገባሉ፣ እና ቀሪ ክፍያ ከተፈጸመ ደረሰኞች ይዘጋሉ።
+DoCreditTransferBeforePayments=ይህ ትር የብድር ማዘዋወር ትዕዛዝ እንዲጠይቁ ያስችልዎታል። አንዴ እንደጨረሰ፣ የክሬዲት ማስተላለፍ ማዘዣ ፋይል ለማመንጨት እና ለማስተዳደር ወደ ሜኑ "ባንክ->ክፍያ በክሬዲት ማስተላለፍ" ይሂዱ።
+DoCreditTransferBeforePayments3=የክሬዲት ማዘዋወር ትዕዛዝ ሲዘጋ፣ በደረሰኞች ላይ የሚከፈለው ክፍያ በራስ-ሰር ይመዘገባል፣ እና ቀሪ ክፍያ ከተፈጸመ ደረሰኞች ይዘጋሉ።
+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=ባዶ ከሆነ፣ የባንክ ሂሳቡ መረጃ ከተቀመጠ በኋላ ዩኤምአር (ልዩ የግዴታ ማጣቀሻ) ይፈጠራል።
+WithdrawMode=ቀጥተኛ የዴቢት ሁነታ (FRST ወይም RCUR)
+WithdrawRequestAmount=የቀጥታ ክፍያ ጥያቄ መጠን፡-
+BankTransferAmount=የብድር ማስተላለፍ ጥያቄ መጠን፡-
+WithdrawRequestErrorNilAmount=በባዶ መጠን ቀጥተኛ የዴቢት ጥያቄ መፍጠር አልተቻለም።
+SepaMandate=SEPA ቀጥተኛ የዴቢት ግዴታ
+SepaMandateShort=SEPA ትእዛዝ
+PleaseReturnMandate=እባክዎ ይህንን የግዴታ ቅጽ በኢሜል ወደ %s ወይም በፖስታ ይመልሱ
+SEPALegalText=ይህን የግዴታ ፎርም በመፈረም (A) %s እና የክፍያ አገልግሎት ሰጪውን ወደ ባንክዎ መለያዎን እንዲያስከፍል መመሪያ እንዲልክ እና (ለ) ባንክዎ መለያዎን እንዲከፍል ፈቃድ ይሰጣሉ። በ%s በተሰጠው መመሪያ መሰረት። እንደ የመብቶችዎ አካል፣ ከባንክዎ ጋር ባደረጉት ስምምነት ውሎች እና ሁኔታዎች ከባንክዎ ገንዘብ ተመላሽ ማድረግ ይችላሉ። ከላይ ያለውን ስልጣን በተመለከተ ያለዎት መብቶች ከባንክዎ ማግኘት በሚችሉት መግለጫ ተብራርተዋል። ስለወደፊቱ ክፍያዎች ከመከሰታቸው እስከ 2 ቀናት ድረስ ማሳወቂያዎችን ለመቀበል ተስማምተሃል።
+CreditorIdentifier=አበዳሪ መለያ
+CreditorName=የአበዳሪ ስም
+SEPAFillForm=(ለ) እባክዎን ምልክት የተደረገባቸውን ሁሉንም መስኮች ያጠናቅቁ።
+SEPAFormYourName=የአንተ ስም
+SEPAFormYourBAN=የእርስዎ የባንክ ሂሳብ ስም (IBAN)
+SEPAFormYourBIC=የእርስዎ የባንክ መለያ ኮድ (BIC)
+SEPAFrstOrRecur=የክፍያ ዓይነት
+ModeRECUR=ተደጋጋሚ ክፍያ
+ModeRCUR=ተደጋጋሚ ክፍያ
+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=አበዳሪ መለያ - አይ.ሲ.ኤስ
+IDS=የዲቢተር መለያ
+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
+InfoCreditSubject=የቀጥታ ዴቢት ክፍያ ትዕዛዝ %s በባንኩ መክፈል
+InfoCreditMessage=የቀጥታ ዴቢት ክፍያ ትዕዛዝ %s በባንኩ ተከፍሏል<br>የክፍያ ውሂብ፡ b0ecb2ecz807fe49
+InfoTransSubject=የቀጥታ ዴቢት ክፍያ ትዕዛዝ %s ወደ ባንክ ማስተላለፍ
+InfoTransMessage=የቀጥታ ዴቢት ክፍያ ትዕዛዝ %s ወደ ባንክ በ%s b0ecb2ec87f49fez0 ተልኳል. .<br><br>
+InfoTransData=መጠን፡ %s<br>ዘዴ፡ %s='span><span' ><br>ቀን፡ %s
+InfoRejectSubject=የቀጥታ ዴቢት ክፍያ ትዕዛዝ ውድቅ አደረገ
 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
+ModeWarning=የእውነተኛ ሁነታ አማራጭ አልተዘጋጀም, ከዚህ ማስመሰል በኋላ እናቆማለን
+ErrorCompanyHasDuplicateDefaultBAN=መታወቂያ ያለው ኩባንያ %s ከአንድ በላይ ነባሪ የባንክ ሂሳብ አለው። የትኛውን መጠቀም እንዳለቦት ለማወቅ ምንም መንገድ የለም.
+ErrorICSmissing=በባንክ አካውንት ውስጥ ICS ይጎድላል %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=አጠቃላይ የቀጥታ ዴቢት ትእዛዝ መጠን ከመስመሮች ድምር ይለያል
+WarningSomeDirectDebitOrdersAlreadyExists=ማስጠንቀቂያ፡ ለ%s መጠን የተጠየቁ ቀጥተኛ የዴቢት ትዕዛዞች (%s) ቀድሞውኑ አሉ።
+WarningSomeCreditTransferAlreadyExists=ማስጠንቀቂያ፡ አስቀድሞ የተወሰነ የተወሰነ የብድር ማስተላለፍ (%s) የተጠየቀ የ%s
+UsedFor=ለ%s ጥቅም ላይ ይውላል
+Societe_ribSigned=SEPA ሥልጣን ተፈርሟል
+NbOfInvoiceToPayByBankTransferForSalaries=በክሬዲት ማስተላለፍ ክፍያ የሚጠብቀው የደመወዝ ቁጥር
+SalaryWaitingWithdraw=በዱቤ ማስተላለፍ ክፍያ በመጠባበቅ ላይ ያሉ ደሞዞች
+RefSalary=ደሞዝ
+NoSalaryInvoiceToWithdraw='%s የሚጠብቅ ደሞዝ የለም። ጥያቄ ለማቅረብ በደመወዝ ካርድ ላይ '%s ላይ ይሂዱ።
+SalaryInvoiceWaitingWithdraw=በዱቤ ማስተላለፍ ክፍያ በመጠባበቅ ላይ ያሉ ደሞዞች
diff --git a/htdocs/langs/am_ET/workflow.lang b/htdocs/langs/am_ET/workflow.lang
index adfe7f69609..47e5bf6f6c6 100644
--- a/htdocs/langs/am_ET/workflow.lang
+++ b/htdocs/langs/am_ET/workflow.lang
@@ -1,26 +1,38 @@
 # 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=የሽያጭ ማዘዣ ከተዘጋ በኋላ የደንበኛ ደረሰኝ በራስ-ሰር ይፍጠሩ (አዲሱ ደረሰኝ ከትዕዛዙ ጋር ተመሳሳይ መጠን ይኖረዋል)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=በቲኬት ፈጠራ ላይ በራስ-ሰር ጣልቃ ገብነት ይፍጠሩ።
 # 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=የደንበኛ መጠየቂያ ደረሰኝ ሲረጋገጥ የተገናኘውን የምንጭ ሽያጭ ትዕዛዝ እንደ ደረሰኝ መድብ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት የሽያጭ ትዕዛዞች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ)። ለ n ትዕዛዞች የተረጋገጠ 1 ደረሰኝ ካልዎት፣ ይህ ሁሉንም ትዕዛዞች እንዲከፍሉ ሊያደርግ ይችላል።
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=የተገናኙትን የምንጭ ሽያጭ ትዕዛዞችን የደንበኛ ደረሰኝ እንዲከፈል ሲዋቀር (እና የክፍያ መጠየቂያው መጠን ከተገናኙት የሽያጭ ትዕዛዞች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ) እንደ ሂሳቡ መድብ። ለ n ትእዛዝ የሚከፈል 1 ደረሰኝ ካለህ፣ ይህ ሁሉንም ትዕዛዞች እንዲከፍሉ ሊያደርግ ይችላል።
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=ማጓጓዣው ሲረጋገጥ የተገናኙትን የምንጭ ሽያጭ ትዕዛዞችን እንደተላከ መድብ (እና በሁሉም ማጓጓዣዎች የተላከው መጠን ለማዘመን ከትእዛዝ ጋር ተመሳሳይ ከሆነ)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=ጭነት ሲዘጋ የተያያዘውን የምንጭ ሽያጭ ትዕዛዝ እንደተላከ መድብ (እና በሁሉም ማጓጓዣዎች የተላከው መጠን ለማዘመን ከትእዛዝ ጋር አንድ አይነት ከሆነ)
+# Autoclassify purchase proposal
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=የተገናኘውን የምንጭ አቅራቢ ፕሮፖዛል የሻጭ መጠየቂያ መጠየቂያ ደረሰኝ ከተረጋገጠ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት ፕሮፖዛሎች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ) እንደ ደረሰኝ ይመድቡ።
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
-# Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=የአቅራቢው ደረሰኝ ሲረጋገጥ የተገናኘውን የምንጭ ግዢ ትዕዛዝ እንደደረሰው ይመድቡ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት ትዕዛዞች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=መቀበያው ሲፀድቅ እንደደረሰው የተገናኘውን የምንጭ ግዢ ትዕዛዝ መድብ (እና በሁሉም ተጋባዦች የተቀበለው መጠን ለማዘመን በግዢ ትዕዛዝ ውስጥ ካለው ጋር ተመሳሳይ ከሆነ)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=መስተንግዶ ሲዘጋ የተገናኘውን የምንጭ ግዢ ትዕዛዝ እንደደረሰው መድብ (እና በሁሉም ተቀባዮች የተቀበለው መጠን ለማዘመን በግዢው ትዕዛዝ ላይ ካለው ጋር ተመሳሳይ ከሆነ)
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=የደንበኛ ክፍያ መጠየቂያ ደረሰኝ ሲረጋገጥ የተገናኘውን ምንጭ ጭነት እንደ ዝግ መድብ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት መላኪያዎች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=የደንበኛ ክፍያ መጠየቂያ ደረሰኝ ከተረጋገጠ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት መላኪያዎች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ) የተገናኘውን ምንጭ ጭነት እንደ ክፍያ መድብ።
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=የግዢ ክፍያ መጠየቂያ ደረሰኝ ሲረጋገጥ የተገናኙትን የምንጭ መቀበያዎች እንደ ሂሣብ መድብ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት መቀበያዎች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=የግዢ ክፍያ መጠየቂያ ደረሰኝ ሲረጋገጥ የተገናኙትን የምንጭ መቀበያዎች እንደ ሂሣብ መድብ (እና የክፍያ መጠየቂያው መጠን ከተገናኙት መቀበያዎች አጠቃላይ መጠን ጋር ተመሳሳይ ከሆነ)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=ትኬት በሚፈጥሩበት ጊዜ ሁሉንም የሶስተኛ ወገኖች ተዛማጅ ኮንትራቶችን ያገናኙ
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=ኮንትራቶችን በሚያገናኙበት ጊዜ, ከወላጆች ኩባንያዎች መካከል ይፈልጉ
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=ትኬቱ ሲዘጋ ከትኬቱ ጋር የተገናኙትን ሁሉንም ጣልቃገብነቶች ዝጋ
+AutomaticCreation=ራስ-ሰር መፍጠር
+AutomaticClassification=ራስ-ሰር ምደባ
+AutomaticClosing=በራስ-ሰር መዝጋት
+AutomaticLinking=ራስ-ሰር ማገናኘት
diff --git a/htdocs/langs/am_ET/zapier.lang b/htdocs/langs/am_ET/zapier.lang
index b4cc4ccba4a..7a617c7c931 100644
--- a/htdocs/langs/am_ET/zapier.lang
+++ b/htdocs/langs/am_ET/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Zapier ለ Dolibarr
+ModuleZapierForDolibarrDesc = Zapier ለ Dolibarr ሞጁል
+ZapierForDolibarrSetup=የ Zapier ለ Dolibarr ማዋቀር
+ZapierDescription=ከ Zapier ጋር በይነገጽ
+ZapierAbout=ስለ ሞጁል Zapier
+ZapierSetupPage=Zapier ን ለመጠቀም በዶሊባርር በኩል ማዋቀር አያስፈልግም። ሆኖም፣ Zapier with Dolibarr ለመጠቀም በ zapier ላይ ጥቅል ማመንጨት እና ማተም አለቦት። በ<a href="https://wiki.dolibarr.org/index.php/Module_Zapier">ይህ የዊኪ ገጽ</a> ላይ ያለውን ሰነድ ይመልከቱ።
diff --git a/htdocs/langs/ar_EG/errors.lang b/htdocs/langs/ar_EG/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/ar_EG/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/ar_IQ/errors.lang b/htdocs/langs/ar_IQ/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/ar_IQ/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 4f6e69f5cf9..f22b646ebdc 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -78,7 +78,7 @@ ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا
 ErrorCodeCantContainZero=الكود لا يمكن أن يحتوي على القيمة 0
 DisableJavascript=تعطيل عمليات الجافا و الأجاكس
 DisableJavascriptNote=ملاحظة: لغرض الاختبار أو التصحيح فقط. لتحسين أداء الشخص المكفوف أو المتصفحات النصية ، قد تفضل استخدام الإعداد في ملف تعريف المستخدم
-UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة ( > 100 000 )، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
+UseSearchToSelectCompanyTooltip=وأيضًا إذا كان لديك عدد كبير من الأطراف الثالثة ( > 100000)، فيمكنك زيادة السرعة عن طريق تعيين COMPANY_DONOTSEARCH_ANYWHERE الثابت على 1 في الإعداد->أخرى. سيقتصر البحث بعد ذلك على بداية السلسلة.
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة ( > 100 000 )، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد الخاصة بالأطراف الثالثة ، <br> قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من الأطراف الثالثة ، ولكنه أقل ملاءمة.
 DelaiedFullListToSelectContact=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد جهات الاتصال. <br> قد يؤدي هذا إلى زيادة الأداء إذا كان لديك عدد كبير من جهات الاتصال ، ولكنه أقل ملاءمة.
@@ -509,7 +509,7 @@ WarningPHPMailA=- يزيد استخدام خادم مزود خدمة البري
 WarningPHPMailB=- لا يسمح لك بعض مزودي خدمة البريد الإلكتروني (مثل Yahoo) بإرسال بريد إلكتروني من خادم آخر غير الخادم الخاص بهم. يستخدم الإعداد الحالي الخاص بك خادم التطبيق لإرسال بريد إلكتروني وليس خادم مزود البريد الإلكتروني الخاص بك ، لذلك سيطلب بعض المستلمين (المتوافق مع بروتوكول DMARC المقيد) ، مزود البريد الإلكتروني الخاص بك ما إذا كان بإمكانهم قبول بريدك الإلكتروني وبعض موفري البريد الإلكتروني (مثل Yahoo) قد تستجيب بـ "لا" لأن الخادم ليس خادمهم ، لذلك قد لا يتم قبول عدد قليل من رسائل البريد الإلكتروني المرسلة للتسليم (كن حذرًا أيضًا من حصة الإرسال لمزود البريد الإلكتروني الخاص بك).
 WarningPHPMailC=- يعد استخدام خادم SMTP الخاص بموفر خدمة البريد الإلكتروني الخاص بك لإرسال رسائل البريد الإلكتروني أمرًا مثيرًا للاهتمام أيضًا ، لذا سيتم أيضًا حفظ جميع رسائل البريد الإلكتروني المرسلة من التطبيق في دليل "البريد المرسل" الخاص بصندوق البريد الخاص بك.
 WarningPHPMailD=ولذلك يوصى بتغيير طريقة إرسال رسائل البريد الإلكتروني إلى القيمة "SMTP".
-WarningPHPMailDbis=إذا كنت تريد حقًا الاحتفاظ بطريقة "PHP" الافتراضية لإرسال رسائل البريد الإلكتروني، فما عليك سوى تجاهل هذا التحذير، أو إزالته عن طريق %sالنقر هنا<span class='notranslate'>%s< /فترة>.
+WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
 WarningPHPMail2=إذا كان موفر البريد الإلكتروني SMTP بحاجة إلى تقييد عميل البريد الإلكتروني لبعض عناوين IP (نادر جدًا) ، فهذا هو عنوان IP الخاص بوكيل مستخدم البريد (MUA) لتطبيق ERP CRM الخاص بك: <strong> %s </strong>.
 WarningPHPMailSPF=إذا كان اسم المجال في عنوان البريد الإلكتروني الخاص بالمرسل محميًا بسجل SPF (اسأل مسجل اسم المجال الخاص بك) ، يجب عليك إضافة عناوين IP التالية في سجل SPF الخاص بـ DNS لمجالك: <strong> %s </strong>.
 ActualMailSPFRecordFound=تم العثور على سجل SPF الفعلي (للبريد الإلكتروني %s): %s
@@ -674,7 +674,7 @@ Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3200Name=المحفوظات غير القابلة للتغيير
 Module3200Desc=تمكين سجل غير قابل للتغيير لأحداث العمل. يتم أرشفة الأحداث في الوقت الحقيقي. السجل هو جدول للقراءة فقط للأحداث المتسلسلة التي يمكن تصديرها. قد تكون هذه الوحدة إلزامية لبعض البلدان.
 Module3300Name=نموذج منشئ
-Module3300Desc=أداة RAD (التطوير السريع للتطبيقات - و بدون كود) لمساعدة المطورين أو المستخدمين المتقدمين على إنشاء <span class='notranslate'>نموذج</span الخاصة بهم >/تطبيق.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=الشبكات الاجتماعية
 Module3400Desc=قم بتمكين حقول الشبكات الاجتماعية في عناوين وعناوين الأطراف الثالثة (سكايب ، تويتر ، فيسبوك ، ...).
 Module4000Name=HRM
@@ -1197,6 +1197,7 @@ Skin=التصميم
 DefaultSkin=التصميم الإفتراضي
 MaxSizeList=الحد الأقصى لطول قائمة
 DefaultMaxSizeList=افتراضي الطول الاقصى للقوائم
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=الطول الأقصى الافتراضي للقوائم القصيرة (أي في بطاقة العميل)
 MessageOfDay=رسالة اليوم
 MessageLogin=ادخل صفحة الرسالة
@@ -1404,7 +1405,7 @@ PHPModuleLoaded=تم تحميل مكون PHP %s
 PreloadOPCode=يتم استخدام OPCode مسبقة التحميل
 AddRefInList=عرض مرجع العميل / البائع. في قوائم التحرير والسرد. <br> ستظهر الجهات الخارجية بتنسيق اسم "CC12345 - SC45678 - The Big Company corp." بدلاً من "The Big Company Corp".
 AddVatInList=عرض رقم ضريبة القيمة المضافة للعميل / البائع في قوائم التحرير والسرد.
-AddAdressInList=عرض عنوان العميل/المورد في قوائم التحرير والسرد.<br> ستظهر الجهات الخارجية بتنسيق اسم "The Big شركة corp. - 21 Jump street 123456 Big town - USA" بدلاً من "The Big <span class='notranslate'>شركة</span" > شركة".
+AddAdressInList=Display Customer/Vendor address 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=عرض البريد الإلكتروني لجهة الاتصال (أو الهواتف إذا لم يتم تحديدها) و قائمة معلومات المدينة (اختر قائمة أو combobox)<br> ستظهر جهات الاتصال مع تنسيق الاسم "Dupond Durand - dupond.durand@example.com - Paris" أو "Dupond Durand - 06 07 59 65 66 - Paris" بدلاً من "Dupond Durand".
 AskForPreferredShippingMethod=اسأل عن طريقة الشحن المفضلة للأطراف الثالثة.
 FieldEdition=طبعة من ميدان%s
@@ -1705,7 +1706,7 @@ DoNotAutofillButAutoConcat=لا تملأ حقل الإدخال تلقائيًا
 DoNotUseDescriptionOfProdut=لن يتم تضمين وصف المنتج مطلقًا في وصف سطور المستندات
 MergePropalProductCard=في تنشيط المنتج / الخدمة المرفقة التبويب ملفات خيار دمج المستند المنتج PDF إلى اقتراح PDF دازور إذا كان المنتج / الخدمة في الاقتراح
 ViewProductDescInThirdpartyLanguageAbility=عرض أوصاف المنتجات في نماذج بلغة الطرف الثالث (بخلاف ذلك بلغة المستخدم)
-UseSearchToSelectProductTooltip=أيضًا إذا كان لديك عدد كبير من المنتجات (> 100000) ، فيمكنك زيادة السرعة عن طريق تعيين PRODUCT_DONOTSEARCH_ANYWHERE ثابتًا إلى 1 في الإعداد-> أخرى. سيقتصر البحث بعد ذلك على بداية السلسلة.
+UseSearchToSelectProductTooltip=أيضًا إذا كان لديك عدد كبير من المنتجات ( > 100000 ) ، فيمكنك زيادة السرعة عن طريق تعيين PRODUCT_DONOTSEARCH_ANYWHERE ثابتًا إلى 1 في الإعداد-> أخرى. سيقتصر البحث بعد ذلك على بداية السلسلة.
 UseSearchToSelectProduct=انتظر حتى تضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد للمنتج (قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من المنتجات ، ولكنه أقل ملاءمة)
 SetDefaultBarcodeTypeProducts=النوع الافتراضي لاستخدام الباركود للمنتجات
 SetDefaultBarcodeTypeThirdParties=النوع الافتراضي لاستخدام الباركود لأطراف ثالثة
@@ -2153,7 +2154,7 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=امسح دل
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=مثال على جمع إجابات البريد الإلكتروني المرسلة من برنامج بريد إلكتروني خارجي
 EmailCollectorExampleToCollectDolibarrAnswersDesc=اجمع كل رسائل البريد الإلكتروني التي تمثل إجابة على رسالة بريد إلكتروني مرسلة من تطبيقك. سيتم تسجيل حدث (يجب تمكين جدول أعمال الوحدة النمطية) مع استجابة البريد الإلكتروني في مكان جيد. على سبيل المثال ، إذا أرسلت عرضًا تجاريًا أو طلبًا أو فاتورة أو رسالة لتذكرة عبر البريد الإلكتروني من التطبيق ، وقام المستلم بالرد على بريدك الإلكتروني ، فسيقوم النظام تلقائيًا بالتقاط الإجابة وإضافتها إلى نظام تخطيط موارد المؤسسات الخاص بك.
 EmailCollectorExampleToCollectDolibarrAnswers=مثال على جمع جميع الرسائل الداخلية التي تكون إجابات على الرسائل المرسلة من Dolibarr '
-EmailCollectorExampleToCollectLeadsDesc=جمع رسائل البريد الإلكتروني التي تطابق بعض القواعد و قم بإنشاء عميل محتمل تلقائيًا (نموذج < يجب تمكين النطاق class='notranslate'>مشروع</span>) مع معلومات البريد الإلكتروني. يمكنك استخدام هذا المجمع إذا كنت تريد متابعة عميل محتمل باستخدام نموذج مشروع (1 عميل محتمل = 1 مشروع)، لذلك سيتم إنشاء العملاء المتوقعين تلقائيًا. إذا تم تمكين المجمع Collect_Responses أيضًا، فعندما ترسل بريدًا إلكترونيًا من العملاء المتوقعين أو المقترحات أو أي كائن آخر، فقد ترى أيضًا إجابات عملائك أو شركائك مباشرة على التطبيق.<br>ملاحظة: في هذا المثال الأولي، يتم إنشاء عنوان عميل محتمل بما في ذلك البريد الإلكتروني. إذا تعذر العثور على الطرف الثالث في قاعدة البيانات (new العميل)، فسيتم إرفاق عميل محتمل بالطرف الثالث باستخدام المعرف 1.
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
 EmailCollectorExampleToCollectLeads=مثال على جمع العملاء المحتملين
 EmailCollectorExampleToCollectJobCandidaturesDesc=اجمع رسائل البريد الإلكتروني التي تتقدم إلى عروض العمل (يجب تمكين Module Recruitment). يمكنك إكمال هذا المجمع إذا كنت تريد إنشاء ترشيح تلقائيًا لطلب وظيفة. ملاحظة: مع هذا المثال الأولي ، يتم إنشاء عنوان الترشيح بما في ذلك البريد الإلكتروني.
 EmailCollectorExampleToCollectJobCandidatures=مثال على جمع ترشيحات الوظائف الواردة عن طريق البريد الإلكتروني
@@ -2176,7 +2177,7 @@ CreateCandidature=إنشاء طلب وظيفة
 FormatZip=الرمز البريدي
 MainMenuCode=رمز دخول القائمة (mainmenu)
 ECMAutoTree=عرض شجرة ECM التلقائية
-OperationParamDesc=حدد القواعد التي سيتم استخدامها لاستخراج بعض البيانات أو تعيين القيم لاستخدامها في العملية.<br><br>مثال لاستخراج شركة الاسم من موضوع البريد الإلكتروني إلى متغير مؤقت:<br>tmp_var=EXTRACT:SUBJECT:رسالة من <span class='notranslate'>شركة< /فترة> ([^\n]*)<br><br>أمثلة لتعيين خصائص الكائن المراد إنشاؤه:<br>objproperty1=SET:قيمة مشفرة ثابتة<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:قيمة (قيمة) يتم تعيينها فقط إذا لم تكن الخاصية محددة بالفعل)<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=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
 OpeningHours=ساعات الافتتاح
 OpeningHoursDesc=ادخل هنا ساعات الافتتاح لشركتك
 ResourceSetup=تكوين وحدة الموارد
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 7c0b77c215c..d25b4792c25 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -2,7 +2,7 @@
 BoxDolibarrStateBoard=إحصائيات عن كائنات الأعمال الرئيسية في قاعدة البيانات
 BoxLoginInformation=معلومات تسجيل الدخول
 BoxLastRssInfos=معلومات RSS
-BoxLastProducts=أحدث %s منتجات | خدمات 
+BoxLastProducts=أحدث %s منتجات | خدمات
 BoxProductsAlertStock=تنبيهات المخزون للمنتجات
 BoxLastProductsInContract=أحدث %s منتجات | خدمات  المتعاقد عليها
 BoxLastSupplierBills=أحدث فواتير الموردين
@@ -24,25 +24,25 @@ BoxFicheInter=أحدث التدخلات
 BoxCurrentAccounts=ميزان الحسابات المفتوحة
 BoxTitleMemberNextBirthdays=أعياد الميلاد لهذا الشهر (الأعضاء)
 BoxTitleMembersByType=الأعضاء حسب النوع والحالة
-BoxTitleMembersByTags=أعضاء بواسطة أوسمة و <span class='notranslate'>حالة< /فترة>
+BoxTitleMembersByTags=Members by tags and status
 BoxTitleMembersSubscriptionsByYear=اشتراكات الأعضاء حسب السنة
 BoxTitleLastRssInfos=آخر أخبار %s من %s
-BoxTitleLastProducts=المنتجات | الخدمات: آخر %s معدل 
+BoxTitleLastProducts=المنتجات | الخدمات: آخر %s معدل
 BoxTitleProductsAlertStock=المنتجات: تنبيه المخزون
 BoxTitleLastSuppliers=أحدث %s الموردين المسجلين
 BoxTitleLastModifiedSuppliers=الموردين: آخر %s معدل
-BoxTitleLastModifiedCustomers=العملاء: آخر %s تعديل 
+BoxTitleLastModifiedCustomers=العملاء: آخر %s تعديل
 BoxTitleLastCustomersOrProspects=أحدث %s عملاء أو فرص
 BoxTitleLastCustomerBills=أحدث %s تعديل لفواتير العميل
 BoxTitleLastSupplierBills=آخر %s تعديل لفواتير الموردين
-BoxTitleLastModifiedProspects=الفرص: آخر %s تعديل 
-BoxTitleLastModifiedMembers=أحدث %s أعضاء 
-BoxTitleLastFicheInter=أحدث %s تدخلات معدلة 
+BoxTitleLastModifiedProspects=الفرص: آخر %s تعديل
+BoxTitleLastModifiedMembers=أحدث %s أعضاء
+BoxTitleLastFicheInter=أحدث %s تدخلات معدلة
 BoxTitleOldestUnpaidCustomerBills=فواتير العميل: أقدم %s غير مدفوعة
 BoxTitleOldestUnpaidSupplierBills=فواتير الموردين: أقدم %s غير مدفوعة
 BoxTitleCurrentAccounts=الحسابات المفتوحة: أرصدة
 BoxTitleSupplierOrdersAwaitingReception=أوامر الموردين في انتظار الاستلام
-BoxTitleLastModifiedContacts=جهات الاتصال | العناوين: آخر %s تعديل 
+BoxTitleLastModifiedContacts=جهات الاتصال | العناوين: آخر %s تعديل
 BoxMyLastBookmarks=الإشارات المرجعية: أحدث %s
 BoxOldestExpiredServices=أقدم الخدمات النشطة منتهية الصلاحية
 BoxOldestActions=أقدم الأحداث للقيام بها
@@ -90,11 +90,11 @@ BoxProposalsPerMonth=العروض في الشهر
 NoTooLowStockProducts=لا توجد منتجات أقل من حد المخزون المنخفض
 BoxProductDistribution=توزيع المنتجات | الخدمات
 ForObject=في %s
-BoxTitleLastModifiedSupplierBills=فواتير الموردين: آخر %s تعديل 
-BoxTitleLatestModifiedSupplierOrders=أوامر الموردين: آخر %s تعديل 
-BoxTitleLastModifiedCustomerBills=فواتير العميل: آخر %s تعديل 
-BoxTitleLastModifiedCustomerOrders=أوامر المبيعات: آخر %s تعديل 
-BoxTitleLastModifiedPropals=أحدث %s العروض المعدلة 
+BoxTitleLastModifiedSupplierBills=فواتير الموردين: آخر %s تعديل
+BoxTitleLatestModifiedSupplierOrders=أوامر الموردين: آخر %s تعديل
+BoxTitleLastModifiedCustomerBills=فواتير العميل: آخر %s تعديل
+BoxTitleLastModifiedCustomerOrders=أوامر المبيعات: آخر %s تعديل
+BoxTitleLastModifiedPropals=أحدث %s العروض المعدلة
 BoxTitleLatestModifiedJobPositions=أحدث وظائف %s المعدلة
 BoxTitleLatestModifiedCandidatures=أحدث %s تطبيقات العمل المعدلة
 ForCustomersInvoices=فواتير العملاء
@@ -112,7 +112,7 @@ BoxTitleSuspenseAccount=عدد البنود غير المخصصة
 NumberOfLinesInSuspenseAccount=رقم البند في الحساب المعلق
 SuspenseAccountNotDefined=لم يتم تعريف الحساب المعلق
 BoxLastCustomerShipments=آخر شحنات العميل
-BoxTitleLastCustomerShipments=أحدث %s شحنات العملاء 
+BoxTitleLastCustomerShipments=أحدث %s شحنات العملاء
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 NoRecordedShipments=لا توجد شحنة مسجلة للعملاء
 BoxCustomersOutstandingBillReached=العملاء الذين وصلوا إلى الحد الأقصى المستحق
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 7b6c1859bb2..0f27fd3c067 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -313,7 +313,7 @@ ErrorTooMuchFileInForm=يوجد عدد كبير جدًا من الملفات ف
 ErrorSessionInvalidatedAfterPasswordChange=تم إبطال الجلسة بعد تغيير كلمة المرور أو البريد الإلكتروني حالة أو تواريخ الصلاحية. الرجاء إعادة تسجيل الدخول.
 ErrorExistingPermission = الإذن <b>%s</b> للكائن  <b>%s</b> موجود بالفعل
 ErrorFieldExist=قيمة <b>%s</b> موجودة بالفعل
-ErrorEqualModule=نموذج غير صالح في <b>%s</b> 
+ErrorEqualModule=نموذج غير صالح في <b>%s</b>
 ErrorFieldValue=قيمة <b>%s</b> غير صحيحة
 ErrorCoherenceMenu=<b>%s</b> مطلوب عندما  <b>%s</b> هو "يسار"
 ErrorUploadFileDragDrop=حدث خطأ أثناء تحميل الملف (الملفات).
@@ -369,11 +369,11 @@ WarningPaypalPaymentNotCompatibleWithStrict=تجعل القيمة "صارمة" 
 WarningThemeForcedTo=تحذير ، تم إجبار السمة على <b> %s </b> بواسطة الثابت المخفي MAIN_FORCETHEME
 WarningPagesWillBeDeleted=تحذير، سيؤدي هذا أيضًا إلى حذف كافة الصفحات/الحاويات الموجودة بالموقع. يجب عليك تصدير موقع الويب الخاص بك من قبل، حتى يكون لديك نسخة احتياطية لإعادة استيراده لاحقًا.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=يتم تعطيل التحقق التلقائي عند تعيين خيار تقليل المخزون على "التحقق من صحة فاتورة".
-WarningModuleNeedRefresh = نموذج <b>%s<span class='notranslate'></b></ تم تعطيل النطاق>. لا تنس تمكينه
+WarningModuleNeedRefresh = Module <b>%s</b> has been disabled. Don't forget to enable it
 WarningPermissionAlreadyExist=الأذونات الموجودة لهذا الكائن
 WarningGoOnAccountancySetupToAddAccounts=إذا كانت هذه القائمة فارغة، فانتقل إلى القائمة %s - %s - %s لتحميل أو إنشاء حسابات لدليل الحساب الخاص بك.
 WarningCorrectedInvoiceNotFound=لم يتم العثور على فاتورة المصحح
-WarningCommentNotFound=يرجى التحقق من موضع بداية التعليقات و لـ <b>%sقسم </b> في الملف <b>%s<span class='notranslate'></b></ تمتد> قبل تقديم الإجراء الخاص بك
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
 WarningAlreadyReverse=لقد انعكست حركة الأسهم بالفعل
 
 SwissQrOnlyVIR = لا يمكن إضافة SwissQR فاتورة إلا على الفواتير التي تم تعيينها ليتم دفعها من خلال دفعات تحويل الائتمان.
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index 67770acab49..dc12146b78f 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -94,7 +94,7 @@ NbOfLinesOK=عدد الأسطر مع عدم وجود أخطاء وتحذيرات
 NbOfLinesImported=عدد خطوط المستوردة بنجاح : <b>%s.</b>
 DataComeFromNoWhere=قيمة لادخال تأتي من أي مكان في الملف المصدر.
 DataComeFromFileFieldNb=تأتي القيمة المراد إدراجها من العمود <b> %s </b> في الملف المصدر.
-DataComeFromIdFoundFromRef=سيتم استخدام القيمة التي تأتي من الملف المصدر للعثور على معرف الكائن الأصلي المراد استخدامه (وبالتالي فإن الكائن <b>%s</span <span class='notranslate'></b> الذي يحتوي على المرجع من الملف المصدر يجب أن يكون موجودًا في قاعدة البيانات).
+DataComeFromIdFoundFromRef=The value that comes from the 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=سيتم استخدام قيمة الكود الذي يأتي من الملف المصدر للعثور على معرف الكائن الأصلي المراد استخدامه (لذا يجب أن يكون الكود من الملف المصدر موجودًا في القاموس <b>%s</b>). لاحظ أنه إذا كنت تعرف المعرف، فيمكنك أيضًا استخدامه في الملف المصدر بدلاً من الكود. يجب أن يعمل الاستيراد في كلتا الحالتين.
 DataIsInsertedInto=البيانات سوف تأتي من الملف المصدر يتم إدراجها في الحقل التالي :
 DataIDSourceIsInsertedInto=سيتم إدخال معرف الكائن الأصل ، الذي تم العثور عليه باستخدام البيانات الموجودة في الملف المصدر ، في الحقل التالي:
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 1452cbeecb1..c334b821d30 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -115,7 +115,7 @@ LastConnexion=آخر تسجيل دخول
 PreviousConnexion=تسجيل الدخول السابق
 PreviousValue=القيمة السابقه
 ConnectedOnMultiCompany=متصل بالبيئة
-ConnectedSince=متصل منذ 
+ConnectedSince=متصل منذ
 AuthenticationMode=وضع المصادقة
 RequestedUrl=مطلوب URL
 DatabaseTypeManager=مدير نوع قاعدة البيانات
@@ -418,8 +418,10 @@ TotalHT100Short=إجمالي 100%% (غ ش ض)
 TotalHTShortCurrency=الاجمالى (غ.ش.ض بعملة)
 TotalTTCShort=الإجمالي (ش.ض)
 TotalHT=الإجمالي (غ.ش.ض)
-TotalHTforthispage=الاجمالي لهذه الصفحة (غ.ش.ض) 
+TotalHTforthispage=الاجمالي لهذه الصفحة (غ.ش.ض)
 Totalforthispage=الاجمالي لهذه الصفحة
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=الإجمالي (ش.ض)
 TotalTTCToYourCredit=الإجمالي (ش.ض) إلى رصيدك
 TotalVAT=إجمالي الضريبة
@@ -484,7 +486,7 @@ ActionRunningNotStarted=للبدأ
 ActionRunningShort=في تقدم
 ActionDoneShort=تم الانتهاء
 ActionUncomplete=غير مكتمل
-LatestLinkedEvents=أحدث %s أحداث المرتبطة 
+LatestLinkedEvents=أحدث %s أحداث المرتبطة
 CompanyFoundation=الشركة | المؤسسة
 Accountant=المحاسب
 ContactsForCompany=اتصالات لهذا الطرف الثالث
@@ -575,7 +577,7 @@ NextStep=الخطوة التالية
 Datas=البيانات
 None=لا شيء
 NoneF=لا شيء
-NoneOrSeveral=الكل أو لا شيء 
+NoneOrSeveral=الكل أو لا شيء
 Late=متأخر
 LateDesc=يتم تعريف الصنف على أنه متأخر وفقًا لتكوين النظام في القائمة الرئيسية - الإعداد - التنبيهات.
 NoItemLate=لا يوجد صنف متأخر
@@ -647,6 +649,7 @@ ReportName=اسم التقرير
 ReportPeriod=فترة التقرير
 ReportDescription=وصف
 Report=تقرير
+Reports=تقارير
 Keyword=الكلمة الرئيسية
 Origin=الأصل
 Legend=عنوان تفسيري
@@ -723,9 +726,9 @@ ValueIsValid=القيمة صالحة
 ValueIsNotValid=القيمة غير صالحة
 RecordCreatedSuccessfully=تم إنشاء السجل بنجاح
 RecordModifiedSuccessfully=تم تعديل السجل بنجاح
-RecordsModified=تم تعديل %s سجل (سجلات) 
-RecordsDeleted=تم حذف %s سجل (سجلات) 
-RecordsGenerated=تم إنشاء %s سجل (سجلات) 
+RecordsModified=تم تعديل %s سجل (سجلات)
+RecordsDeleted=تم حذف %s سجل (سجلات)
+RecordsGenerated=تم إنشاء %s سجل (سجلات)
 ValidatedRecordWhereFound = لقد تم بالفعل التحقق من صحة بعض السجلات المحددة. لم يتم حذف أية سجلات.
 AutomaticCode=كود تلقائي
 FeatureDisabled=ميزة معطلة
@@ -1047,7 +1050,7 @@ SetRef=تعيين المرجع
 Select2ResultFoundUseArrows=تم العثور على بعض النتائج. استخدم الأسهم للتحديد.
 Select2NotFound=لا نتائج لبحثك
 Select2Enter=أدخل
-Select2MoreCharacter=أو أكثر 
+Select2MoreCharacter=أو أكثر
 Select2MoreCharacters=أحرف أو أكثر
 Select2MoreCharactersMore= <strong> صيغة البحث: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> OR </kbd> (أ | ب) <br> <kbd> <strong> * </strong> </kbd> <kbd> أي حرف </kbd> (أ ب *) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> البداية مع </kbd> (^ أ ب) <br> <kbd> <strong> $ </strong> </kbd> <kbd> النهاية مع </kbd> ( ab $) <br>
 Select2LoadingMoreResults=تحميل المزيد من النتائج ...
@@ -1098,7 +1101,7 @@ Deletedraft=حذف المسودة
 ConfirmMassDraftDeletion=تأكيد الحذف الشامل للمسودة
 FileSharedViaALink=Public file shared via link
 SelectAThirdPartyFirst=حدد طرف ثالث أولاً ...
-YouAreCurrentlyInSandboxMode=أنت حاليًا في وضع %s "sandbox" 
+YouAreCurrentlyInSandboxMode=أنت حاليًا في وضع %s "sandbox"
 Inventory=المخزون
 AnalyticCode=الكود التحليلي
 TMenuMRP=تخطيط موارد التصنيع
@@ -1151,10 +1154,10 @@ ByStatus=حسب الحالة
 InformationMessage=معلومات
 Used=استخدم
 ASAP=في أقرب وقت ممكن
-CREATEInDolibarr=تم إنشاء %s سجل 
+CREATEInDolibarr=تم إنشاء %s سجل
 MODIFYInDolibarr=%s سجل معدّل
 DELETEInDolibarr=%s سجل تم حذفه
-VALIDATEInDolibarr=%s سجل تم اعتماده 
+VALIDATEInDolibarr=%s سجل تم اعتماده
 APPROVEDInDolibarr=%s سجل تم الموافقة عليه
 DefaultMailModel=نموذج البريد الافتراضي
 PublicVendorName=الاسم العام للمورد
@@ -1252,7 +1255,7 @@ LinkedFiles=الملفات والمستندات المرتبطة
 NoLinkFound=لا يوجد روابط مسجلة
 LinkComplete=تم ربط الملف بنجاح
 ErrorFileNotLinked=لا يمكن ربط الملف
-LinkRemoved= الرابط%sتم إزالتة 
+LinkRemoved= الرابط%sتم إزالتة
 ErrorFailedToDeleteLink= فشل في إزالة الرابط '<b> %s </b>'
 ErrorFailedToUpdateLink= فشل تحديث الرابط '<b> %s </b>'
 URLToLink=عنوان URL للربط
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index c28a37f2af7..0237dcd3d0d 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -6,7 +6,7 @@ EnterNameOfObjectDesc=أدخل اسم الكائن المراد إنشاؤه ب
 EnterNameOfDictionaryDesc=أدخل اسم القاموس لإنشائه بدون مسافات. استخدم الأحرف الكبيرة لفصل الكلمات (على سبيل المثال: MyDico ...). سيتم إنشاء ملف الفصل ، وكذلك ملف SQL.
 ModuleBuilderDesc2=المسار الذي يتم فيه إنشاء / تحرير الوحدات (الدليل الأول للوحدات الخارجية المحددة في %s): <strong> %s </strong>
 ModuleBuilderDesc3=تم العثور على الوحدات النمطية / القابلة للتحرير: <strong> %s </strong>
-ModuleBuilderDesc4=تم اكتشاف نموذج باعتباره 'نموذج لـ نموذج مُنشئ' عندما الملف <strong>%s</strong> موجود في جذر <span class= دليل 'notranslate'>نموذج</span>
+ModuleBuilderDesc4=A module is detected as a 'module for Module Builer' when the file <strong>%s</strong> exists in the root of the module directory
 NewModule=وحدة جديدة
 NewObjectInModulebuilder=كائن جديد
 NewDictionary=قاموس جديد
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 3ed6f25cc56..74f422001e4 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=تحويل المخزون المتقدم
 ModuleStockTransferDesc=إدارة متقدمة لتحويل المخزون مع إنشاء صحيفة التحويل
 StockTransferNew=نقل مخزون جديد
 StockTransferList=قائمة تحويلات المخزون
-ConfirmValidateStockTransfer=هل أنت متأكد أنك تريد التحقق من صحة نقل الأسهم هذا باستخدام المرجع <b>%s<span class='notranslate'></b></ فترة>؟
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=انخفاض المخزون مع التحويل %s
 ConfirmDestockCancel=إلغاء تخفيض الأسهم بالتحويل %s
 DestockAllProduct=انخفاض المخزونات
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index 75c86f5358b..e3bc427972d 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -13,7 +13,7 @@ descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=تصنيف مقترحات المصاد
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=تصنيف مقترحات المصادر المرتبطة على أنها مفوترة عند التحقق من صحة العميل فاتورة (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي للمقترحات المرتبطة الموقعة)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=تصنيف مبيعات المصدر المرتبطة طلب على أنها مفوترة عند التحقق من صحة العميل فاتورة ( و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي لأوامر المبيعات المرتبطة). إذا كان لديك فاتورة واحد تم التحقق من صحته لعدد n من الطلبات، فقد يؤدي هذا إلى تعيين جميع الطلبات ليتم تحرير فواتير لها أيضًا.
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=تصنيف أوامر المبيعات المصدر المرتبطة على أنها مفوترة عند تعيين العميل فاتورة على مدفوع (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي لأوامر المبيعات المرتبطة). إذا كان لديك مجموعة واحدة فاتورة تم تحرير فاتورة بها لعدد n من الطلبات، فقد يؤدي هذا إلى تعيين جميع الطلبات ليتم تحرير فاتورة بها أيضًا.
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=قم بتصنيف أوامر المبيعات المصدر المرتبطة على أنها مشحونة عندما يتم التحقق من صحة الشحنة (و إذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها كما في <span class='notranslate'>طلب</ تمتد> للتحديث)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders 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=تصنيف أمر مبيعات المصدر المرتبط على أنه مشحون عند إغلاق الشحنة (وإذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها الموجودة في أمر التحديث)
 # Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=تصنيف اقتراح المصدر المرتبط المورد على أنه تمت فوترته عند التحقق من صحة فاتورة مورد (و إذا مبلغ فاتورة هو نفس المبلغ الإجمالي للمقترحات المرتبطة)
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index d61db9131f8..e637154564d 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -287,7 +287,7 @@ TotalVente=Vergidən əvvəl ümumi dövriyyə
 TotalMarge=Ümumi satış marjası
 
 DescVentilCustomer=Hesab planından məhsul hesabına bağlı (və ya olmayan) müştəri hesab-faktura xətlərinin siyahısına burada müraciət edin
-DescVentilMore=Əksər hallarda, siz əvvəlcədən təyin edilmiş məhsul və ya xidmətlərdən istifadə edirsinizsə və məhsul/xidmət kartında hesabı (hesab planından) təyin edirsinizsə, proqram faktura xətlərinizlə qrafikinizin mühasibat hesabı arasında bütün bəndləri həyata keçirə biləcək. yalnız bir kliklə <strong>"%s"b0a65d071f6spanfc90z >. Hesab məhsul/xidmət kartlarında qurulmayıbsa və ya hələ də hesaba bağlı olmayan bəzi xətləriniz varsa, "<span class='notranslate'><strong><span menyusundan əl ilə bağlama etməli olacaqsınız. class='notranslate'>%s</span></strong>".
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Müştərilərin hesab-faktura sətirlərinin siyahısı və onların hesab planından məhsul hesabı ilə buradan tanış olun
 DescVentilTodoCustomer=Hesab cədvəlindən məhsul hesabı ilə artıq bağlı olmayan faktura xətlərini bağlayın
 ChangeAccount=Seçilmiş xətlər üçün məhsul/xidmət hesabını (hesab planından) aşağıdakı hesabla dəyişdirin:
@@ -296,7 +296,7 @@ DescVentilSupplier=Hesab planından məhsul hesabına bağlı və ya hələ bağ
 DescVentilDoneSupplier=Burada satıcı hesab-fakturalarının sətirlərinin siyahısı və onların mühasibat hesabı ilə tanış olun
 DescVentilTodoExpenseReport=Artıq ödəniş mühasibat hesabı ilə əlaqələndirilməyən xərc hesabatı xətlərini birləşdirin
 DescVentilExpenseReport=Bir haqq mühasibat hesabına bağlı (və ya olmayan) xərc hesabatı xətlərinin siyahısına burada müraciət edin
-DescVentilExpenseReportMore=Xərc hesabatı sətirlərinin növü üzrə mühasibat hesabı qurarsanız, proqram <span class='notranslate düyməsi ilə bir kliklə xərc hesabatı xətləri ilə hesablar planınızın mühasibat hesabı arasında bütün əlaqəni həyata keçirə biləcək. '><strong></span>"%s"</strong>. Əgər haqq-hesab rüsumlar lüğətində qurulmayıbsa və ya hələ də hər hansı hesaba bağlı olmayan bəzi sətirləriniz varsa, "<strong><span class=" menyusundan əl ilə bağlama etməli olacaqsınız. 'notranslate'>%s</span></strong>".
+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=Xərc hesabatlarının sətirlərinin siyahısı və onların haqlarının uçotu hesabı ilə buradan tanış olun
 
 Closure=İllik bağlanma
@@ -352,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Satış üzrə mühasibatlıqda məcburi və
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Satınalmalar üzrə mühasibatlıqda məcburi və köçürməni aradan buraxın (satıcı fakturaları mühasibat uçotunda nəzərə alınmayacaq)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Xərc hesabatlarında mühasibatlıqda məcburi və köçürməni aradan buraxın (xərc hesabatları mühasibat uçotunda nəzərə alınmayacaq)
 ACCOUNTING_ENABLE_LETTERING=Mühasibat uçotunda yazı funksiyasını aktivləşdirin
-ACCOUNTING_ENABLE_LETTERING_DESC=Bu seçimlər aktiv olduqda, siz hər bir mühasibat qeydində kod təyin edə bilərsiniz ki, müxtəlif uçot hərəkətlərini birlikdə qruplaşdıra biləsiniz. Keçmişdə müxtəlif jurnallar müstəqil idarə olunanda bu xüsusiyyət müxtəlif jurnalların hərəkət xətlərini bir yerdə qruplaşdırmaq üçün lazım idi. Bununla belə, Dolibarr mühasibatlığı ilə belə bir izləmə kodu "<b>%s<span class='notranslate'>b09a4b739fz01f adlanır. span>" artıq avtomatik olaraq yadda saxlanılır, ona görə də avtomatik hərf artıq yerinə yetirilib, xəta riski olmadan bu funksiya ümumi istifadə üçün yararsız hala düşüb. Əl ilə yazı funksiyası mühasibatlıqda məlumatların ötürülməsini həyata keçirən kompüter mühərrikinə həqiqətən etibar etməyən son istifadəçilər üçün nəzərdə tutulub.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Bu funksiyanı aktivləşdirmək daha ciddi mühasibat uçotu idarəçiliyi üçün lazım deyil.
 ACCOUNTING_ENABLE_AUTOLETTERING=Mühasibat uçotuna köçürərkən avtomatik hərfləri aktivləşdirin
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Yazı üçün kod avtomatik olaraq yaradılır və artırılır və son istifadəçi tərəfindən seçilmir
@@ -360,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=Hərf kodu yaradan zaman hərflərin sayı (stand
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Bəzi mühasibat proqramları yalnız iki hərfli kodu qəbul edir. Bu parametr bu aspekti təyin etməyə imkan verir. Hərflərin standart sayı üçdür.
 OptionsAdvanced=Təkmilləşmiş Seçimlər
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Təchizatçı alışlarında ƏDV-nin əks ödənişinin idarə edilməsini aktivləşdirin
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Fayl yaradarkən hərfləri ixrac etməyin
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index b25acaeb283..1e6639bdcf3 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=Növbəti dəyər (qaimə-fakturalar)
 NextValueForCreditNotes=Növbəti dəyər (kredit qeydləri)
 NextValueForDeposit=Növbəti dəyər (ilkin ödəniş)
 NextValueForReplacements=Növbəti dəyər (əvəzlər)
-MustBeLowerThanPHPLimit=Qeyd: PHP konfiqurasiyanız hazırda <b>%sb09a4b739fz01f faylına yükləmək üçün maksimum fayl ölçüsünü məhdudlaşdırır. span> <span class='notranslate'>%s, bu parametrin dəyərindən asılı olmayaraq
+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=Qeyd: PHP konfiqurasiyanızda heç bir məhdudiyyət qoyulmayıb
 MaxSizeForUploadedFiles=Yüklənmiş fayllar üçün maksimum ölçü (hər hansı yükləməyə icazə vermək üçün 0)
 UseCaptchaCode=Giriş səhifəsində və bəzi ictimai səhifələrdə qrafik kodu (CAPTCHA) istifadə edin
@@ -150,7 +150,7 @@ AllWidgetsWereEnabled=Bütün mövcud vidjetlər aktivləşdirilib
 WidgetAvailable=Vidcet mövcuddur
 PositionByDefault=Defolt sifariş
 MenusDesc=Menyu menecerləri iki menyu çubuğunun məzmununu təyin edir (üfüqi və şaquli).
-MenusEditorDesc=Menyu redaktoru xüsusi menyu girişlərini təyin etməyə imkan verir. Qeyri-sabitlik və həmişəlik əlçatmaz menyu daxilolmalarının qarşısını almaq üçün ondan ehtiyatla istifadə edin.<br>Bəzi modullar menyu daxiletmələrini əlavə edir (menyuda <b>Bütün<span sinif ='notranslate'></b></span> əsasən). Bu qeydlərdən bəzilərini səhvən silsəniz, modulu söndürərək və yenidən aktivləşdirərək onları bərpa edə bilərsiniz.
+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=İstifadəçilər üçün menyu
 LangFile=.lang faylı
 Language_en_US_es_MX_etc=Dil (en_US, es_MX, ...)
@@ -159,7 +159,7 @@ SystemInfo=Sistem məlumatları
 SystemToolsArea=Sistem alətləri sahəsi
 SystemToolsAreaDesc=Bu sahə idarəetmə funksiyalarını təmin edir. Lazım olan funksiyanı seçmək üçün menyudan istifadə edin.
 Purge=Təmizləmə
-PurgeAreaDesc=Bu səhifə Dolibarr tərəfindən yaradılan və ya saxlanılan bütün faylları (müvəqqəti fayllar və ya <b>%s<span class=-dakı bütün fayllar) silməyə imkan verir. 'notranslate'></b></span> kataloqu). Bu funksiyadan istifadə adətən lazım deyil. O, Dolibarr-ı veb server tərəfindən yaradılan faylları silmək icazəsi təklif etməyən bir provayder tərəfindən yerləşdirilən istifadəçilər üçün həll yolu kimi təqdim olunur.
+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=<b>%s</b> daxil olmaqla jurnal fayllarını silin (no Syslog modulu üçün müəyyən edilib) məlumatların itirilməsi riski)
 PurgeDeleteTemporaryFiles=Bütün log və müvəqqəti faylları silin (məlumatların itirilməsi riski yoxdur). Parametr "tempfilesold", "logfiles" və ya hər ikisi "tempfilesold+logfiles" ola bilər. Qeyd: Müvəqqəti faylların silinməsi yalnız müvəqqəti kataloq 24 saatdan çox əvvəl yaradılıbsa həyata keçirilir.
 PurgeDeleteTemporaryFilesShort=Günlük və müvəqqəti faylları silin (məlumatların itirilməsi riski yoxdur)
@@ -250,8 +250,8 @@ Security=Təhlükəsizlik
 Passwords=Parollar
 DoNotStoreClearPassword=Verilənlər bazasında saxlanılan parolları şifrələyin (düz mətn kimi DEYİL). Bu seçimi aktivləşdirmək tövsiyə olunur.
 MainDbPasswordFileConfEncrypted=conf.php-də saxlanılan verilənlər bazası parolunu şifrələyin. Bu seçimi aktivləşdirmək tövsiyə olunur.
-InstrucToEncodePass=Parolun <b>conf.php</b> faylına kodlanması üçün b0342fccz01<span> sətrini əvəz edin. /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342fcc0da >by<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb2ec804"; span class='notranslate'></b></span>
-InstrucToClearPass=<b>conf.php</b> faylında parolun deşifrə edilməsi (təmizlənməsi) üçün <span class='notranslate' xəttini dəyişdirin. ><br></span><b>$dolibarr_main_db_pass="crypted:...";</b>='notranslate<span> ><br></span>by<br><b>$dolibarr_main_db_pass="<span class='notranslate'b04f>late class='notranslate" ";</b>
+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=Yaradılmış PDF fayllarını qoruyun. Bu, toplu PDF generasiyasını pozduğu üçün TÖVSİYƏ EDİLMİR.
 ProtectAndEncryptPdfFilesDesc=PDF sənədinin qorunması onu istənilən PDF brauzeri ilə oxumaq və çap etmək üçün əlçatan edir. Bununla belə, redaktə və köçürmə artıq mümkün deyil. Nəzərə alın ki, bu funksiyadan istifadə etməklə qlobal birləşmiş PDF-lərin qurulması işləməz.
 Feature=Xüsusiyyət
@@ -268,8 +268,8 @@ OtherResources=Digər resurslar
 ExternalResources=Xarici Resurslar
 SocialNetworks=Sosial şəbəkələr
 SocialNetworkId=Sosial şəbəkə ID
-ForDocumentationSeeWiki=İstifadəçi və ya tərtibatçı sənədləri (Sənəd, Tez-tez verilən suallar...) üçün<br>Dolibarr Wiki-yə nəzər salın:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e4080d <span class='notranslate'></b>
-ForAnswersSeeForum=Hər hansı digər suallar/kömək üçün Dolibarr forumundan istifadə edə bilərsiniz:<br><b>b00fab50ead9320 /span><span class='notranslate'>%s</a></b>
+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=Dolibarr ilə kömək və dəstək əldə etmək üçün bəzi resurslar buradadır.
 HelpCenterDesc2=Bu resurslardan bəziləri yalnız <b>ingiliscə</b> dilində əlçatandır.
 CurrentMenuHandler=Cari menyu işləyicisi
@@ -290,8 +290,8 @@ EMailsSetup=E-poçtların quraşdırılması
 EMailsDesc=Bu səhifə sizə e-poçt göndərilməsi üçün parametrlər və ya seçimlər təyin etməyə imkan verir.
 EmailSenderProfiles=E-poçt göndərən profilləri
 EMailsSenderProfileDesc=Bu bölməni boş saxlaya bilərsiniz. Bəzi e-poçtları buraya daxil etsəniz, yeni e-poçt yazdığınız zaman onlar birləşmiş qutuya mümkün göndərənlər siyahısına əlavə olunacaqlar.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Portu (php.ini-də defolt dəyər: <b>%s<span class='notranslate'>b09a4f73901</span7 >)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (php.ini-də defolt dəyər: <b>%s<span class='notranslate'>b09a4f73901</span7 >)
+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 Portu
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host
 MAIN_MAIL_EMAIL_FROM=Avtomatik e-poçtlar üçün e-poçt göndərin
@@ -320,7 +320,7 @@ UserEmail=İstifadəçi e-poçtu
 CompanyEmail=Şirkət E-poçtu
 FeatureNotAvailableOnLinux=Funksiya Unix kimi sistemlərdə mövcud deyil. Sendmail proqramınızı yerli olaraq yoxlayın.
 FixOnTransifex=Layihənin onlayn tərcümə platformasında tərcüməni düzəldin
-SubmitTranslation=Bu dil üçün tərcümə tamamlanmayıbsa və ya səhvlər tapsanız, <b>langs/%s</span qovluğundakı faylları redaktə etməklə bunu düzəldə bilərsiniz. ><span class='notranslate'></b> və dəyişikliyi www.transifex.com/dolibarr-association/dolibarr/ ünvanına göndərin.
+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=Bu dil üçün tərcümə tamamlanmayıbsa və ya səhvlər tapsanız, faylları <b>langs/%s qovluğuna redaktə etməklə düzəldə bilərsiniz. </b> və dəyişdirilmiş faylları dolibarr.org/forum saytında və ya tərtibatçısınızsa, github.com/Dolibarr/dolibarr saytında PR ilə təqdim edin
 ModuleSetup=Modulun qurulması
 ModulesSetup=Modullar/Tətbiqlərin qurulması
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=Bu, əl ilə işləmək üçün alternativ qura
 StepNb=Addım %s
 FindPackageFromWebSite=Sizə lazım olan funksiyaları təmin edən paketi tapın (məsələn, rəsmi internet saytında %s).
 DownloadPackageFromWebSite=Paketi endirin (məsələn, rəsmi internet saytından %s).
-UnpackPackageInDolibarrRoot=Paketlənmiş faylları Dolibarr server kataloqunuza açın/açın: <b>%s<span class='notranslate'>b09a4f73901</span7 >
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=Xarici modulu yerləşdirmək/quraşdırmaq üçün siz arxiv faylını xarici modullar üçün ayrılmış server kataloquna çıxarmalı/açmalısınız:<br><b>%s</b>
 SetupIsReadyForUse=Modulun yerləşdirilməsi tamamlandı. Bununla belə, səhifə quraşdırma modullarına daxil olaraq tətbiqinizdə modulu aktiv etməli və quraşdırmalısınız: <a href="%s">%s</a>.
 NotExistsDirect=Alternativ kök kataloqu mövcud kataloq üçün müəyyən edilməyib.<br>
 InfDirAlt=3-cü versiyadan etibarən alternativ kök kataloqu müəyyən etmək mümkündür. Bu, sizə xüsusi kataloq, plaginlər və fərdi şablonları saxlamağa imkan verir.<br>Sadəcə Dolibarr-ın kökündə kataloq yaradın (məsələn: xüsusi).<br>
-InfDirExample=<br>Sonra onu <strong>conf.phpb0a65d071f06fc faylında elan edin. class='notranslate'><br></span> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_ofda19bz0/'dolibarr_main_alt=s<span> 'notranslate'><br></span>Bu sətirlər "#" ilə şərh olunubsa, onları aktivləşdirmək üçün "#" simvolunu silməklə şərhi ləğv edin.
+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=Modul paketinin .zip faylını buradan yükləyə bilərsiniz:
 CurrentVersion=Dolibarr cari versiyası
 CallUpdatePage=Verilənlər bazası strukturunu və datasını yeniləyən səhifəyə baxın: %s.
@@ -361,17 +361,17 @@ LastActivationIP=Ən son aktivləşdirmə IP
 LastActivationVersion=Ən son aktivasiya versiyası
 UpdateServerOffline=Serveri oflayn olaraq yeniləyin
 WithCounter=Sayğacı idarə edin
-GenericMaskCodes=İstənilən nömrələmə maskasını daxil edə bilərsiniz. Bu maskada aşağıdakı teqlərdən istifadə edilə bilər:<br><b>{000000}b09a4b78z1 hər %s-da artırılacaq rəqəmə uyğundur. Sayğacın istədiyiniz uzunluğu qədər sıfır daxil edin. Maska qədər sıfıra sahib olmaq üçün sayğac soldan sıfırlarla tamamlanacaq. <br><b>{000000+000}</b> lakin əvvəlki ilə eyni ilk %s-dan başlayaraq + işarəsinin sağındakı rəqəmə uyğun ofset tətbiq edilir. <br><b>{000000@x}</b> əvvəlki ilə eyni x ayına çatdıqda sayğac sıfıra sıfırlanır (1 ilə 12 arasında x və ya konfiqurasiyanızda müəyyən edilmiş maliyyə ilinin ilk aylarından istifadə etmək üçün 0 və ya hər ay sıfıra sıfırlamaq üçün 99). Bu seçim istifadə olunursa və x 2 və ya daha yüksəkdirsə, {yy}{mm} və ya {yyyy}{mm} ardıcıllığı da tələb olunur. <br><b>{dd}</b> gün (01-31). span class='notranslate'><br></span><b>{mm}</b> ay (01-12). class='notranslate'><br></span><b>{yy}</b>, <span class='notranslate58036 </span>{yyyy}</b> və ya <b>{y}</b> 2, 4 və ya 1 rəqəmdən çox il. <br>
-GenericMaskCodes2=<b>{cccc}</b> n simvolda müştəri kodu<br><b>{cccc000}b09a4108 code n simvoldan sonra müştəriyə həsr olunmuş sayğac gəlir. Müştəriyə həsr olunmuş bu sayğac qlobal sayğacla eyni vaxtda sıfırlanır.<span class='notranslate'><br><b>b06a5f451419e80 </b> n simvoldan ibarət üçüncü tərəf növü kodu (bax menyu Əsas səhifə - Quraşdırma - Lüğət - Üçüncü tərəflərin növləri). Bu teqi əlavə etsəniz, sayğac hər bir üçüncü tərəf növü üçün fərqli olacaq.<br>
+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=Maskadakı bütün digər simvollar toxunulmaz qalacaq.<br>Boşluqlara icazə verilmir.<br>
 GenericMaskCodes3EAN=Maskadakı bütün digər simvollar toxunulmaz qalacaq (EAN13-də 13-cü mövqedə * və ya ? istisna olmaqla).<br>Boşluqlara icazə verilmir.<br> span>EAN13-də 13-cü mövqedə sonuncu }-dən sonra gələn sonuncu simvol * və ya ? . O, hesablanmış açarla əvəz olunacaq.<br>
 GenericMaskCodes4a=<u>Üçüncü tərəf TheCompany-nin 99-cu %s-da nümunə, 31-01-2023:</u><br>
-GenericMaskCodes4b=<u>31-01-2023 tarixində yaradılmış üçüncü tərəfə aid nümunə:</u><span class='notranslate'>b0342fccfda19b >
-GenericMaskCodes4c=<u>31-01-2023 tarixində yaradılmış məhsula dair nümunə:</u><span class='notranslate'>b0342fccfda19b
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> b0aee833608 verəcək span>ABC2301-000099</b><br>b0aee83365837{100z }-ZZZ/{dd}/XXX<span class='notranslate'></b> <b>0199-ZZZ/31/XXX<span class='notranslate verəcək '></b></span><br><b>IN{yy}{mm}-{0000}-{t}</b> şirkəti <b>IN2301-0099-A<span class='notranslate'>b09a4b739f17f80 verəcək "A_RI" növü üçün kodu olan "Məsuliyyətli Inscripto"
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Müəyyən edilmiş maskaya uyğun olaraq fərdiləşdirilə bilən nömrə qaytarır.
 ServerAvailableOnIPOrPort=Server <b>%s</b> ünvanında, <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server <b>%s</b> ünvanında mövcud deyil. ='notranslate'><b></span>%s</b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
 DoTestServerAvailability=Server bağlantısını sınayın
 DoTestSend=Test göndərilməsi
 DoTestSendHTML=HTML göndərilməsini sınayın
@@ -390,7 +390,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Paylaşılan yaddaşa yüklənmiş .lan
 LanguageFile=Dil faylı
 ExamplesWithCurrentSetup=Cari konfiqurasiya ilə nümunələr
 ListOfDirectories=OpenDocument şablon kataloqlarının siyahısı
-ListOfDirectoriesForModelGenODT=OpenDocument formatlı şablon faylları olan qovluqların siyahısı.<br><br>Kataloqların tam yolunu bura qoyun.<br>Eah kataloqu arasında karetin qaytarılması əlavə edin.<br>GED modulunun kataloqunu əlavə etmək üçün buraya əlavə edin b0aee83365837f >DOL_DATA_ROOT/ecm/yourdirectoryname<span class='notranslate'></b>.<br>b0342fccfda Directory in thats/b0342fccfda <span class='notranslate'><b>.odt</b> və ya <b>ods ilə bitməlidir. ='notranslate'></b></span>.
+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=Bu qovluqlarda tapılan ODT/ODS şablon fayllarının sayı
 ExampleOfDirectoriesForModelGen=Sintaksis nümunələri:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysub<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Odt sənəd şablonlarınızı necə yaratacağınızı bilmək üçün onları həmin kataloqlarda saxlamazdan əvvəl wiki sənədlərini oxuyun:
@@ -461,17 +461,17 @@ ComputedFormulaDesc=Dinamik hesablanmış dəyər əldə etmək üçün burada o
 Computedpersistent=Hesablanmış sahəni saxla
 ComputedpersistentDesc=Hesablanmış əlavə sahələr verilənlər bazasında saxlanılacaq, lakin dəyər yalnız bu sahənin obyekti dəyişdirildikdə yenidən hesablanacaq. Hesablanmış sahə digər obyektlərdən və ya qlobal məlumatlardan asılıdırsa, bu dəyər yanlış ola bilər!
 ExtrafieldParamHelpPassword=Bu sahənin boş qalması o deməkdir ki, bu dəyər ŞİFRELƏMƏSİZ saxlanacaq (sahə ekranda sadəcə ulduzlarla gizlənib).<br><br>Daxil edin dəyəri geri çevrilən şifrələmə alqoritmi ilə kodlaşdırmaq üçün 'dolcrypt' dəyəri. Təmiz data hələ də bilinə və redaktə edilə bilər, lakin verilənlər bazasında şifrələnir.<br><br>'Auto' (və ya 'md5') daxil edin. 'sha256', 'password_hash', ...) defolt parol şifrələmə alqoritmindən (və ya md5, sha256, password_hash...) istifadə etmək üçün geri qaytarıla bilməyən haşlanmış parolu verilənlər bazasında saxlamaq (orijinal dəyəri əldə etmək üçün heç bir yol yoxdur)
-ExtrafieldParamHelpselect=Dəyərlərin siyahısı format açarı olan sətirlərdən ibarət olmalıdır, dəyər (burada açar '0' ola bilməz)<br><br> : <br>1,value1<br>2,value2<br>,</spanue>3de span class='notranslate'><br>...<br><br>Siyahının başqasından asılı olması üçün tamamlayıcı atribut siyahısı:<br>1,value1|options_<i>parent_list_codeb0aes034:34 parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae6437z <spankey: class='notranslate'><br><br>Siyahının başqa siyahıdan asılı olması üçün:<br>1, value1|<i>parent_list_code</i>:parent_keyb0342fccfda1922|val, class='notranslate'><i></span>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=Dəyərlərin siyahısı format açarı olan sətirlərdən ibarət olmalıdır, dəyər (burada açar '0' ola bilməz)<br><br> : <br>1,value1<br>2,value2b0342fccfda19bzue3, span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=Dəyərlərin siyahısı format açarı olan sətirlərdən ibarət olmalıdır, dəyər (burada açar '0' ola bilməz)<br><br> : <br>1,value1<br>2,value2b0342fccfda19bzue3, span class='notranslate'><br></span>...
-ExtrafieldParamHelpsellist=Dəyərlərin siyahısı cədvəldən gəlir<br>Sintaksis: table_name:label_field:id_field::filtersql<br>Nümunə: c_typent: ::filtersql<br><br>- id_field mütləq əsas int açarıdırb0342fccz01> - filtersql SQL şərtidir. Yalnız aktiv dəyəri göstərmək üçün sadə bir test ola bilər (məsələn, aktiv=1)<span class='notranslate'><br>Siz həmçinin cari obyektin<span sinifinin cari id-si olan filtrdə $ID$ istifadə edə bilərsiniz ='notranslate'><br></span>Filtrdə SEÇİM istifadə etmək üçün inyeksiya əleyhinə mühafizəni keçmək üçün $SEL$ açar sözündən istifadə edin.<br>əgər əlavə sahələr üzrə filtrasiya etmək istəyirsinizsə extra.fieldcode=... sintaksisindən istifadə edin (burada sahə kodu əlavə sahənin kodudur)<br><br> başqa tamamlayıcı atribut siyahısından asılı olaraq siyahı:<br>c_typent:libelle:id:options_<i>parent_list_code<spante class='translate </i></span>|parent_column:filter <br><br>Siyahının başqa siyahıdan asılı olması üçün:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758baclum>film:
-ExtrafieldParamHelpchkbxlst=Dəyərlərin siyahısı cədvəldən gəlir<br>Sintaksis: table_name:label_field:id_field::filtersql<br>Nümunə: c_typent: ::filtersql<br><br>filtr yalnız aktiv dəyəri göstərmək üçün sadə test (məsələn, active=1) ola bilər<br>Siz həmçinin $ID$ filtrində istifadə edə bilərsiniz cadugər cari obyektin cari identifikatorudur<br>Filtrdə SEÇİM etmək üçün $SEL$< istifadə edin span class='notranslate'><br></span>əgər əlavə sahələr üzrə filtrasiya etmək istəyirsinizsə extra.fieldcode=... sintaksisindən istifadə edin (burada sahə kodu əlavə sahənin kodudur)<br><br>Siyahının başqa bir tamamlayıcı atribut siyahısından asılı olması üçün:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda1981fcz04'translateb0342fccfda19b209b0342fccfda19b29 0 Siyahının başqa siyahıdan asılı olması üçün:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+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 necessarily 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=Parametrlər ObjectName:Classpath<br>Sintaksis: ObjectName:Classpath olmalıdır
 ExtrafieldParamHelpSeparator=Sadə ayırıcı üçün boş saxlayın<br>Dağlanan ayırıcı üçün bunu 1-ə təyin edin (defolt olaraq yeni sessiya üçün açılır, sonra status hər istifadəçi sessiyası üçün saxlanılır)<br>Bunu yığışdıran ayırıcı üçün 2-yə təyin edin (yeni sessiya üçün defolt olaraq yığışdırılır, sonra status hər istifadəçi seansından əvvəl saxlanılır)
 LibraryToBuildPDF=PDF yaratmaq üçün istifadə olunan kitabxana
 LocalTaxDesc=Bəzi ölkələr hər faktura xəttinə iki və ya üç vergi tətbiq edə bilər. Əgər belədirsə, ikinci və üçüncü verginin növünü və onun dərəcəsini seçin. Mümkün növlər bunlardır:<br>1: yerli vergi ƏDV olmadan məhsul və xidmətlərə tətbiq edilir (yerli vergi vergisiz məbləğə hesablanır)<br> 2: yerli vergi ƏDV daxil olmaqla məhsul və xidmətlərə tətbiq edilir (yerli vergi məbləğə + əsas vergiyə görə hesablanır)<br>3: yerli vergi ƏDV-siz məhsullara tətbiq edilir (yerli vergi əlavə olunmayan məbləğə görə hesablanır) vergi)<br>4: yerli vergi ƏDV daxil olmaqla məhsullara tətbiq edilir (yerli vergi məbləğ + əsas ƏDV əsasında hesablanır)<br>5: yerli vergi ƏDV-siz xidmətlərə tətbiq edilir (yerli vergi vergisiz məbləğə hesablanır)<br>6: yerli vergi ƏDV daxil olmaqla xidmətlərə tətbiq edilir (yerli vergi məbləğə + vergiyə görə hesablanır)
 SMS=SMS
-LinkToTestClickToDial=İstifadəçi <strong>%s<span class='notranslate' üçün ClickToDial url-ni sınamaq üçün keçid göstərmək üçün zəng etmək üçün telefon nömrəsini daxil edin ></strong></span>
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Linki yeniləyin
 LinkToTest=İstifadəçi <strong>%s</strong> telefon nömrəsini sınaqdan keçirmək üçün yaradılan kliklənən keçid (click) )
 KeepEmptyToUseDefault=Standart dəyəri istifadə etmək üçün boş saxlayın
@@ -483,7 +483,7 @@ ExternalModule=Xarici modul
 InstalledInto=%s qovluğuna quraşdırılıb
 BarcodeInitForThirdparties=Üçüncü tərəflər üçün kütləvi ştrix kodu işə salın
 BarcodeInitForProductsOrServices=Kütləvi barkod məhsul və ya xidmətlər üçün işə salın və ya sıfırlayın
-CurrentlyNWithoutBarCode=Hazırda <strong>%s</strong> qeydiniz var. notranslate'><strong></span>%s</strong> <span class='notranslate'>b0ecb49ec olmadan .
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=%s boş barkodlar üçün başlanğıc dəyəri
 EraseAllCurrentBarCode=Bütün cari barkod dəyərlərini silin
 ConfirmEraseAllCurrentBarCode=Bütün cari barkod dəyərlərini silmək istədiyinizə əminsiniz?
@@ -518,8 +518,8 @@ DependsOn=Bu modula modul(lar) lazımdır
 RequiredBy=Bu modul modul(lar) tərəfindən tələb olunur
 TheKeyIsTheNameOfHtmlField=Bu HTML sahəsinin adıdır. Sahənin açar adını əldə etmək üçün HTML səhifəsinin məzmununu oxumaq üçün texniki bilik tələb olunur.
 PageUrlForDefaultValues=Siz səhifənin URL-nin nisbi yolunu daxil etməlisiniz. Əgər parametrləri URL-ə daxil etsəniz, baxılan URL-dəki bütün parametrlər burada müəyyən edilmiş dəyərə malik olarsa, bu effektiv olacaq.
-PageUrlForDefaultValuesCreate=<br>Nümunə:<br>Formanın yeni üçüncü tərəf yaratmaq üçün b0e7843947c06b /span><span class='notranslate'>%s</strong>.<br>Bura quraşdırılmış xarici modulların URL-i üçün xüsusi kataloq, "xüsusi/" daxil etməyin, belə ki, <strong>mymodule/mypage.php</strong> kimi yoldan istifadə edin və fərdi deyil /mymodule/mypage.php.<br>Yalnız url-də bəzi parametrlər olduqda defolt dəyər istəyirsinizsə, <strong><span istifadə edə bilərsiniz. class='notranslate'>%s</span></strong>
-PageUrlForDefaultValuesList=<br>Nümunə:<br>Üçüncü tərəfləri siyahıya alan səhifə üçün bu b0e7843947c06b0z ><span class='notranslate'>%s</strong>.<br>Fərdi direktoriyaya quraşdırılmış xarici modulların URL-i üçün , "xüsusi/" daxil etməyin, buna görə də <strong>mymodule/mypagelist.php</strong> kimi bir yoldan istifadə edin, fərdi/mymodule deyil /mypagelist.php.<br>Yalnız url-də bəzi parametrlər varsa, defolt dəyər istəyirsinizsə, <strong><span class= istifadə edə bilərsiniz. 'notranslate'>%s</span></strong>
+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=Həmçinin nəzərə alın ki, forma yaradılması üçün standart dəyərlərin üzərinə yazmaq yalnız düzgün tərtib edilmiş səhifələr üçün işləyir (beləliklə, action=create və ya təqdim... parametri ilə)
 EnableDefaultValues=Defolt dəyərlərin fərdiləşdirilməsini aktivləşdirin
 EnableOverwriteTranslation=Tərcümələrin fərdiləşdirilməsinə icazə verin
@@ -1197,6 +1197,7 @@ Skin=Dəri mövzusu
 DefaultSkin=Defolt dəri mövzusu
 MaxSizeList=Siyahı üçün maksimum uzunluq
 DefaultMaxSizeList=Siyahılar üçün defolt maksimum uzunluq
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Qısa siyahılar üçün defolt maksimum uzunluq (məsələn, müştəri kartında)
 MessageOfDay=Günün mesajı
 MessageLogin=Giriş səhifəsi mesajı
@@ -1246,10 +1247,10 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Təsdiq üçün xərc hesabatı
 Delays_MAIN_DELAY_HOLIDAYS=Təsdiq etmək üçün sorğuları buraxın
 SetupDescription1=Dolibarr-dan istifadə etməyə başlamazdan əvvəl bəzi ilkin parametrlər müəyyən edilməli və modullar işə salınmalı/konfiqurasiya edilməlidir.
 SetupDescription2=Aşağıdakı iki bölmə məcburidir (Quraşdırma menyusundakı ilk iki giriş):
-SetupDescription3=<a href="%s">%s -> %s<span class='notranslate'0dc05e </span><br><br>Tətbiqinizin defolt davranışını fərdiləşdirmək üçün istifadə olunan əsas parametrlər (məsələn, ölkə ilə bağlı funksiyalar üçün).
-SetupDescription4=<a href="%s">%s -> %s<span class='notranslate'0dc05e </span><br><br>Bu proqram çoxlu modullar/tətbiqlər toplusudur. Ehtiyaclarınıza uyğun modullar aktiv və konfiqurasiya edilməlidir. Bu modulların aktivləşdirilməsi ilə menyu girişləri görünəcək.
+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=Digər Quraşdırma menyu girişləri isteğe bağlı parametrləri idarə edir.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'0dc07<span> /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Tətbiqinizin standart davranışını fərdiləşdirmək üçün istifadə olunan əsas parametrlər (məsələn, ölkə ilə bağlı funksiyalar üçün).
 SetupDescription4b=Bu proqram çoxlu modulların/proqramların dəstidir. Ehtiyaclarınıza uyğun modullar aktivləşdirilməlidir. Bu modulların aktivləşdirilməsi ilə menyu girişləri görünəcək.
 AuditedSecurityEvents=Yoxlanılan təhlükəsizlik hadisələri
@@ -1268,7 +1269,7 @@ BrowserOS=Brauzer OS
 ListOfSecurityEvents=Dolibarr təhlükəsizlik hadisələrinin siyahısı
 SecurityEventsPurged=Təhlükəsizlik hadisələri təmizləndi
 TrackableSecurityEvents=İzlənə bilən təhlükəsizlik hadisələri
-LogEventDesc=Xüsusi təhlükəsizlik hadisələri üçün girişi aktiv edin. İdarəçilər <b>%s - %s<span class=' menyu vasitəsilə jurnalı idarə edir notranslate'></b></span>. Xəbərdarlıq, bu xüsusiyyət verilənlər bazasında böyük miqdarda məlumat yarada bilər.
+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=Quraşdırma parametrləri yalnız <b>administrator istifadəçiləri</b> tərəfindən təyin edilə bilər.
 SystemInfoDesc=Sistem məlumatı yalnız oxumaq rejimində əldə etdiyiniz və yalnız administratorlar üçün görünən müxtəlif texniki məlumatlardır.
 SystemAreaForAdminOnly=Bu sahə yalnız administrator istifadəçiləri üçün əlçatandır. Dolibarr istifadəçi icazələri bu məhdudiyyəti dəyişə bilməz.
@@ -1281,11 +1282,11 @@ AvailableModules=Mövcud proqramlar/modullar
 ToActivateModule=Modulları aktivləşdirmək üçün quraşdırma sahəsinə keçin (Ev-> Quraşdırma-> Modullar).
 SessionTimeOut=Sessiya üçün vaxt bitdi
 SessionExplanation=Bu nömrə zəmanət verir ki, seans təmizləyicisi Daxili PHP sessiya təmizləyicisi (və başqa heç nə) tərəfindən edilərsə, bu gecikmədən əvvəl sessiya heç vaxt bitməyəcək. Daxili PHP sessiya təmizləyicisi bu gecikmədən sonra sessiyanın bitəcəyinə zəmanət vermir. Bu gecikmədən sonra və sessiya təmizləyicisi işə salındıqda onun müddəti bitəcək, beləliklə hər <b>%s/%s</b> giriş, lakin yalnız digər seanslar tərəfindən edilən giriş zamanı (dəyər 0 olarsa, sessiyanın təmizlənməsi yalnız xarici proses tərəfindən həyata keçirilir) .<br>Qeyd: xarici seans təmizləmə mexanizmi olan bəzi serverlərdə (debian altında cron, ubuntu ...), sessiyalar xarici quraşdırma ilə müəyyən edilmiş müddətdən sonra məhv edilə bilər, buraya daxil edilən dəyər nə olursa olsun.
-SessionsPurgedByExternalSystem=Bu serverdəki sessiyalar xarici mexanizm (debian altında cron, ubuntu ...) tərəfindən təmizlənir, yəqin ki, hər <b>%s</b> saniyə (= parametrin dəyəri <b>session.gc_maxlifetime<span class='notranslate</span>b09a4b730z) , buna görə də burada dəyərin dəyişdirilməsinin heç bir təsiri yoxdur. Siz server administratorundan sessiya gecikməsini dəyişdirməyi xahiş etməlisiniz.
+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=Mövcud tetikler
 TriggersDesc=Tətiklər <b>htdocs/core/triggers</b> qovluğuna kopyalandıqdan sonra Dolibarr iş axınının davranışını dəyişdirəcək fayllardır. Onlar Dolibarr hadisələri üzərində aktivləşdirilmiş yeni hərəkətləri həyata keçirirlər (yeni şirkət yaradılması, fakturaların yoxlanılması, ...).
 TriggerDisabledByName=Bu fayldakı triggerlər adlarındakı <b>-NORUN</b> şəkilçisi ilə deaktiv edilib.
-TriggerDisabledAsModuleDisabled=Bu fayldakı triggerlər <b>%s<span class='notranslate'></b></spand</spand> modulu kimi deaktiv edilib.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
 TriggerAlwaysActive=Aktivləşdirilmiş Dolibarr modulları nə olursa olsun, bu fayldakı tetikler həmişə aktivdir.
 TriggerActiveAsModuleActive=Bu fayldakı triggerlər modul <b>%s</b> aktiv edildiyi kimi aktivdir.
 GeneratedPasswordDesc=Avtomatik yaradılan parollar üçün istifadə ediləcək metodu seçin.
@@ -1306,7 +1307,7 @@ NoEventOrNoAuditSetup=Heç bir təhlükəsizlik hadisəsi qeydə alınmayıb. "Q
 NoEventFoundWithCriteria=Bu axtarış meyarları üçün heç bir təhlükəsizlik hadisəsi tapılmadı.
 SeeLocalSendMailSetup=Yerli sendmail quraşdırmanıza baxın
 BackupDesc=Dolibarr quraşdırmasının <b>tam</b> ehtiyat nüsxəsi iki addım tələb edir.
-BackupDesc2="Sənədlər" kataloqunun məzmununu yedəkləyin (<b>%s<span class='notranslate'>b09a4b739f17f80) bütün yüklənmiş və yaradılan faylları ehtiva edir. Bu, həmçinin Addım 1-də yaradılan bütün dump fayllarını əhatə edəcək. Bu əməliyyat bir neçə dəqiqə davam edə bilər.
+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=Verilənlər bazanızın strukturunu və məzmununu yedəkləyin (<b>%s</b>) dump faylı. Bunun üçün aşağıdakı köməkçidən istifadə edə bilərsiniz.
 BackupDescX=Arxivləşdirilmiş kataloq təhlükəsiz yerdə saxlanmalıdır.
 BackupDescY=Yaradılmış dump faylı təhlükəsiz yerdə saxlanmalıdır.
@@ -1321,7 +1322,7 @@ PreviousDumpFiles=Mövcud ehtiyat faylları
 PreviousArchiveFiles=Mövcud arxiv faylları
 WeekStartOnDay=Həftənin ilk günü
 RunningUpdateProcessMayBeRequired=Təkmilləşdirmə prosesinin icrası tələb olunur (Proqram versiyası %s Database versiyası %s ilə fərqlənir)
-YouMustRunCommandFromCommandLineAfterLoginToUser=<b>%sb09a4b739f1780z istifadəçisi olan qabığa daxil olduqdan sonra bu əmri komanda xəttindən icra etməlisiniz.  və ya <b>%s<span class='notranslate təmin etmək üçün komanda xəttinin sonuna -W seçimi əlavə etməlisiniz. '></b></span> parol.
+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 funksiyaları PHP-də mövcud deyil
 DownloadMoreSkins=Yükləmək üçün daha çox dəri
 SimpleNumRefModelDesc=%syymm-nnnn formatında istinad nömrəsini qaytarır, burada yy il, mm ay və nnnn sıfırlama olmadan ardıcıl avtomatik artan nömrədir
@@ -1371,8 +1372,8 @@ SendmailOptionMayHurtBuggedMTA="PHP poçtu birbaşa" metodundan istifadə edər
 TranslationSetup=Tərcümənin qurulması
 TranslationKeySearch=Tərcümə açarı və ya sətrini axtarın
 TranslationOverwriteKey=Tərcümə sətirinin üzərinə yazın
-TranslationDesc=Ekran dilini necə təyin etmək olar:<br>* Defolt/Systemwide: menyu <strong>Ev -> Quraşdırma -> Ekran</strong><br>* İstifadəçiyə görə: Ekranın yuxarısındakı istifadəçi adına klikləyin və b0e7843907z</span6b dəyişdirin span>İstifadəçi Ekranının Quraşdırılması<span class='notranslate'></strong> istifadəçi kartındakı tab.
-TranslationOverwriteDesc=Siz həmçinin aşağıdakı cədvəli dolduran sətirləri ləğv edə bilərsiniz. "%s" açılan menyudan dilinizi seçin, tərcümə açarı sətirini "%s" və "<span" dilinə yeni tərcümənizi daxil edin class='notranslate'>%s</span>"
+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=Hansı tərcümə açarından istifadə edəcəyinizi bilmək üçün digər tabdan istifadə edə bilərsiniz
 TranslationString=Tərcümə sətri
 CurrentTranslationString=Cari tərcümə sətri
@@ -1397,7 +1398,7 @@ SearchOptim=Axtarış optimallaşdırılması
 YouHaveXObjectUseComboOptim=Verilənlər bazanızda %s %s var. Siz düyməyə basılan hadisədə kombinasiya siyahısının yüklənməsini aktivləşdirmək üçün modulun quraşdırılmasına daxil ola bilərsiniz.
 YouHaveXObjectUseSearchOptim=Verilənlər bazanızda %s %s var. Siz Ev Quraşdırma-Digər bölməsində %s sabitini 1-ə əlavə edə bilərsiniz.
 YouHaveXObjectUseSearchOptimDesc=Bu, axtarışı sətirlərin başlanğıcı ilə məhdudlaşdırır ki, bu da verilənlər bazası üçün indekslərdən istifadə etməyə imkan verir və siz dərhal cavab almalısınız.
-YouHaveXObjectAndSearchOptimOn=Verilənlər bazasında %s %s var və daimi %s < olaraq ayarlanıb span class='notranslate'>%s</span> Əsas Quraşdırma-Digər.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Siz %s veb brauzerindən istifadə edirsiniz. Bu brauzer təhlükəsizlik və performans baxımından yaxşıdır.
 BrowserIsKO=Siz %s veb brauzerindən istifadə edirsiniz. Bu brauzer təhlükəsizlik, performans və etibarlılıq baxımından pis seçim kimi tanınır. Firefox, Chrome, Opera və ya Safari istifadə etməyi tövsiyə edirik.
 PHPModuleLoaded=PHP komponenti %s yükləndi
@@ -1663,7 +1664,7 @@ LDAPDescUsers=Bu səhifə Dolibarr istifadəçilərində tapılan hər bir məlu
 LDAPDescGroups=Bu səhifə Dolibarr qruplarında tapılan hər bir məlumat üçün LDAP ağacında LDAP atributlarının adını müəyyən etməyə imkan verir.
 LDAPDescMembers=Bu səhifə Dolibarr üzvləri modulunda tapılan hər bir məlumat üçün LDAP ağacında LDAP atributlarının adını müəyyən etməyə imkan verir.
 LDAPDescMembersTypes=Bu səhifə sizə Dolibarr üzv tiplərində tapılan hər bir məlumat üçün LDAP ağacında LDAP atributlarının adını müəyyən etməyə imkan verir.
-LDAPDescValues=Nümunə dəyərlər aşağıdakı yüklənmiş sxemlərlə <b>OpenLDAP</b> üçün nəzərdə tutulub: b0aee3736 core.schema, cosine.schema, inetorgperson.schema<span class='notranslate'></b>). Bu dəyərlərdən və OpenLDAP-dan istifadə edirsinizsə, bütün sxemləri yükləmək üçün LDAP konfiqurasiya faylınızı <b>slapd.conf</b> dəyişdirin.
+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=Doğrulanmış giriş üçün (məsələn, yazma girişi üçün)
 PerfDolibarr=Performansın qurulması/optimallaşdırılması hesabatı
 YouMayFindPerfAdviceHere=Bu səhifə performansla bağlı bəzi yoxlamalar və ya məsləhətlər təqdim edir.
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Daha köhnə hadisəni ixrac etməyin
 SecurityKey = Təhlükəsizlik Açarı
 ##### ClickToDial #####
 ClickToDialSetup=Modul quraşdırmasını yığmaq üçün klikləyin
-ClickToDialUrlDesc=Telefon piktoqramına klik edildikdə URL çağırılır. URL-də <br><b>__PHONETO__b09a4b739f17f8z olacaq teqlərdən istifadə edə bilərsiniz. zəng ediləcək şəxsin telefon nömrəsi ilə əvəz olundu<br><b>__PHONEFROM__b09a4b739f017 zəng edən şəxsin telefon nömrəsi (sizin) ilə əvəz olunacaq<span class='notranslate'><br><b>__LOGIN__b09a41703f span> ki, kliklə daxil olan giriş (istifadəçi kartında müəyyən edilir) ilə əvəz olunacaq<span class='notranslate'><br><b>__PASS__ </b> bu, klikləmə parolu ilə əvəz olunacaq (istifadəçi kartında müəyyən edilmişdir).
+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=Bu modul masa üstü kompüterdən istifadə edərkən telefon nömrələrini kliklənən linklərə dəyişir. Bir klik nömrəyə zəng edəcək. Bu, masaüstünüzdə yumşaq telefondan istifadə edərkən və ya məsələn SIP protokoluna əsaslanan CTI sistemindən istifadə edərkən telefon zəngini başlamaq üçün istifadə edilə bilər. Qeyd: Smartfondan istifadə edərkən telefon nömrələri həmişə kliklənir.
 ClickToDialUseTelLink=Telefon nömrələrində sadəcə "tel:" linkindən istifadə edin
 ClickToDialUseTelLinkDesc=Əgər istifadəçilərinizin proqram telefonu və ya proqram interfeysi varsa, brauzerlə eyni kompüterdə quraşdırılıbsa və brauzerinizdə "tel:" ilə başlayan linkə kliklədiyiniz zaman zəng edibsə, bu üsuldan istifadə edin. Əgər sizə "sip:" ilə başlayan linkə və ya tam server həllinə ehtiyacınız varsa (yerli proqram təminatının quraşdırılmasına ehtiyac yoxdur), siz bunu "Xeyr" olaraq təyin etməli və növbəti sahəni doldurmalısınız.
@@ -1920,8 +1921,8 @@ IfSetToYesDontForgetPermission=Sıfır olmayan dəyərə təyin edilərsə, ikin
 GeoIPMaxmindSetup=GeoIP Maxmind modulunun qurulması
 PathToGeoIPMaxmindCountryDataFile=Ölkəyə tərcümədə Maxmind ip ehtiva edən fayl yolu
 NoteOnPathLocation=Nəzərə alın ki, ölkəyə olan IP məlumat faylınız PHP-nin oxuya biləcəyi qovluqda olmalıdır (PHP open_basedir quraşdırma və fayl sistemi icazələrini yoxlayın).
-YouCanDownloadFreeDatFileTo=Maxmind GeoIP ölkə faylının <b>pulsuz demo versiyasını</b> endirə bilərsiniz <span class='notranslate'>b0ecb9fz87 /span>.
-YouCanDownloadAdvancedDatFileTo=Siz həmçinin <span class=' ünvanında Maxmind GeoIP ölkə faylının </b> yenilikləri ilə daha <b>tam versiyasını endirə bilərsiniz. notranslate'>%s</span>.
+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=Konversiya IP-nin sınağı -> ölkə
 ##### Projects #####
 ProjectsNumberingModules=Layihələrin nömrələnməsi modulu
@@ -1971,8 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=Xarici modulun quraşdırılması aşağ
 SomethingMakeInstallFromWebNotPossible2=Bu səbəbdən, burada təsvir edilən təkmilləşdirmə prosesi yalnız imtiyazlı istifadəçinin yerinə yetirə biləcəyi əl ilə həyata keçirilən prosesdir.
 InstallModuleFromWebHasBeenDisabledContactUs=Tətbiqdən xarici modulların və ya dinamik veb-saytların quraşdırılması və ya inkişafı təhlükəsizlik məqsədi ilə hazırda kilidlənib. Bu funksiyanı aktivləşdirmək lazımdırsa, bizimlə əlaqə saxlayın.
 InstallModuleFromWebHasBeenDisabledByFile=Tətbiqdən xarici modulun quraşdırılması administratorunuz tərəfindən deaktiv edilib. Buna icazə vermək üçün ondan <strong>%s</strong> faylını silməsini xahiş etməlisiniz. xüsusiyyət.
-ConfFileMustContainCustom=
-Installing or building an external module from application need to save the module files into directory . To have this directory processed by Dolibarr, you must setup your conf/conf.php to add the 2 directive lines:$dolibarr_main_url_root_alt='/custom';$dolibarr_main_document_root_alt='/custom';
+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=Siçan hərəkəti üzərindən keçəndə cədvəl xətlərini vurğulayın
 HighlightLinesColor=Siçan üzərindən keçəndə xəttin rəngini vurğulayın (vurğulanmamaq üçün "ffffff" istifadə edin)
 HighlightLinesChecked=Yoxlandıqda xəttin rəngini vurğulayın (vurğulanmamaq üçün "ffffff" istifadə edin)
@@ -2066,12 +2066,12 @@ DetectionNotPossible=Aşkarlama mümkün deyil
 UrlToGetKeyToUseAPIs=API istifadə etmək üçün token əldə etmək üçün URL (token alındıqdan sonra verilənlər bazası istifadəçi cədvəlində saxlanılır və hər API çağırışında təqdim edilməlidir)
 ListOfAvailableAPIs=Mövcud API-lərin siyahısı
 activateModuleDependNotSatisfied="%s" modulu çatışmayan "%s" modulundan asılıdır, ona görə də " modulu %1$s" düzgün işləməyə bilər. Hər hansı bir sürprizdən təhlükəsiz olmaq istəyirsinizsə, "%2$s" modulunu quraşdırın və ya "%1$s" modulunu deaktiv edin.
-CommandIsNotInsideAllowedCommands=Çalışdırmağa çalışdığınız əmr <strong>$dolibarr_main_restrict_os_commands</strong> parametrində müəyyən edilmiş icazə verilən əmrlər siyahısında deyil. class='notranslate'><strong></span>conf.php</strong> faylı.
+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=Açılış səhifə
 SamePriceAlsoForSharedCompanies=Əgər "Vahid qiymət" seçimi ilə çoxşirkətli moduldan istifadə etsəniz, məhsullar mühitlər arasında paylaşıldıqda qiymət bütün şirkətlər üçün eyni olacaq.
 ModuleEnabledAdminMustCheckRights=Modul aktivləşdirilib. Aktivləşdirilmiş modul(lar) üçün icazələr yalnız admin istifadəçilərə verilib. Lazım gələrsə, digər istifadəçilərə və ya qruplara əl ilə icazələr verməli ola bilərsiniz.
 UserHasNoPermissions=Bu istifadəçinin müəyyən edilmiş icazələri yoxdur
-TypeCdr=Ödəniş müddəti hesab-fakturanın tarixi və günlərlə deltadırsa (delta "%s" sahəsidir)<br></strong>dırsa, "Yox"dan istifadə edin. span>Deltadan sonra ayın sonuna çatmaq üçün tarix artırılmalıdırsa, "Ayın sonunda" istifadə edin (+ günlərlə "<span class='notranslate'>%s" əlavə edin)<br>Ödəniş tarixinin deltadan sonra ayın ilk N-i olması üçün "Cari/Növbəti"dən istifadə edin (delta "%s" sahəsidir. , N "%s" sahəsində saxlanılır)
+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=Şirkətin istinad valyutası (bunu dəyişmək üçün şirkətin qurulmasına daxil olun)
 WarningNoteModuleInvoiceForFrenchLaw=Bu modul %s Fransa qanunlarına uyğundur (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Bu modul %s Fransız qanunlarına (Loi Finance 2016) uyğundur, çünki Qaytarılmayan Qeydlər modulu avtomatik aktivləşdirilir.
@@ -2115,7 +2115,7 @@ YouCanDeleteFileOnServerWith=Bu faylı serverdə Komanda xətti ilə silə bilə
 ChartLoaded=Hesab cədvəli yükləndi
 SocialNetworkSetup=Sosial şəbəkələr modulunun qurulması
 EnableFeatureFor=<strong>%s</strong> üçün funksiyaları aktiv edin
-VATIsUsedIsOff=Qeyd: Satış Vergisi və ya ƏDV-dən istifadə seçimi <span class='notranslate menyusunda <strong>Deaktiv</strong> olaraq təyin edilib. '>%s</span> - %s, buna görə də istifadə edilən Satış vergisi və ya ƏDV satış üçün həmişə 0 olacaq.
+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=PDF sənədlərində göndərici və alıcı ünvanının yerini dəyişdirin
 FeatureSupportedOnTextFieldsOnly=Xəbərdarlıq, funksiya yalnız mətn sahələrində və birləşmiş siyahılarda dəstəklənir. Həmçinin URL parametri action=create və ya action=edit təyin edilməlidir və ya bu funksiyanı işə salmaq üçün səhifə adı 'new.php' ilə bitməlidir.
 EmailCollector=E-poçt kollektoru
@@ -2263,7 +2263,7 @@ ModuleActivatedMayExposeInformation=Bu PHP genişləndirilməsi həssas məlumat
 ModuleActivatedDoNotUseInProduction=İnkişaf üçün nəzərdə tutulmuş modul işə salınıb. İstehsal mühitində onu aktivləşdirməyin.
 CombinationsSeparator=Məhsul birləşmələri üçün ayırıcı xarakter
 SeeLinkToOnlineDocumentation=Nümunələr üçün yuxarı menyuda onlayn sənədlərə keçidə baxın
-SHOW_SUBPRODUCT_REF_IN_PDF=<b>%s<span class= modulunun "%s" xüsusiyyəti varsa 'notranslate'></b></span> istifadə olunur, PDF-də dəstin alt məhsullarının təfərrüatlarını göstərin.
+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=Bu ID-ni əldə etmək üçün bankınızla əlaqə saxlayın
 AdvancedModeOnly=İcazə yalnız Qabaqcıl icazə rejimində mövcuddur
 ConfFileIsReadableOrWritableByAnyUsers=conf faylı istənilən istifadəçi tərəfindən oxuna və ya yaza bilər. Yalnız veb server istifadəçisinə və qrupa icazə verin.
@@ -2292,7 +2292,7 @@ APIsAreNotEnabled=API modulları aktiv deyil
 YouShouldSetThisToOff=Bunu 0 və ya söndürməlisiniz
 InstallAndUpgradeLockedBy=Quraşdırma və təkmilləşdirmələr <b>%s</b> faylı tərəfindən kilidlənib
 InstallLockedBy=Quraşdırma/Yenidən quraşdırma <b>%s</b> faylı tərəfindən kilidlənib
-InstallOfAddonIsNotBlocked=Əlavələrin quraşdırılması kilidlənmir. <b>installmodules.lock</b> faylını b0aee83365837fz<span> qovluğunda yaradın ='notranslate'>%s</span></b> xarici əlavələrin/modulların quraşdırılmasını bloklamaq üçün.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Köhnə tətbiq
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Bəzi onlayn ödəniş modulları aktivdirsə (Paypal, Stripe, ...), onlayn ödəniş etmək üçün PDF-ə keçid əlavə edin
 DashboardDisableGlobal=Açıq obyektlərin bütün baş barmaqlarını qlobal olaraq deaktiv edin
@@ -2406,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Defolt olaraq yaradılmayıb. Yal
 CSSPage=CSS üslubu
 Defaultfortype=Defolt
 DefaultForTypeDesc=Şablon növü üçün yeni e-poçt yaradarkən standart olaraq istifadə edilən şablon
-OptionXShouldBeEnabledInModuleY="<b>%s</b>" variantı <span sinfi modulunda aktivləşdirilməlidir ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY="<b>%s</b>" variantı <span class= modulunda aktivləşdirilib 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=On-line imzaya icazə verin
 AtBottomOfPage=Səhifənin altında
 FailedAuth=uğursuz autentifikasiyalar
@@ -2434,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/az_AZ/agenda.lang b/htdocs/langs/az_AZ/agenda.lang
index cfa125b7152..b144defb2ca 100644
--- a/htdocs/langs/az_AZ/agenda.lang
+++ b/htdocs/langs/az_AZ/agenda.lang
@@ -137,8 +137,8 @@ DateActionEnd=Bitmə vaxtı
 AgendaUrlOptions1=Siz həmçinin çıxışı filtrləmək üçün aşağıdakı parametrləri əlavə edə bilərsiniz:
 AgendaUrlOptions3=<b>logina=%s</b> çıxışı istifadəçinin sahib olduğu əməliyyatlarla məhdudlaşdırmaq <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> hasilatı sahib olmayan fəaliyyətlərlə məhdudlaşdırmaq istifadəçi <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> çıxışı istifadəçinin fəaliyyətinə məhdudlaşdırmaq üçün <span> span class='notranslate'><b></span>%s</b> (sahibi və başqaları).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b>, çıxışı <span class='notranslate'37>f08387 layihəsi ilə əlaqəli əməliyyatlarla məhdudlaşdırmaq __PROJECT_ID__</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> avtomatik hadisələri istisna etmək üçün.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> bayram günlərini əhatə edəcək.
 AgendaShowBirthdayEvents=Əlaqələrin ad günləri
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 4943ed498fd..4c8139bfd2c 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=Daxili köçürmə
 TransferDesc=Bir hesabdan digərinə köçürmək üçün daxili köçürmədən istifadə edin, proqram iki qeyd yazacaq: mənbə hesabında debet və hədəf hesabda kredit. Bu əməliyyat üçün eyni məbləğ, etiket və tarix istifadə olunacaq.
 TransferFrom=From
 TransferTo=Kimə
-TransferFromToDone=<b>%s</b>-dan <span class='notranslate-ə transfer ><b></span>%s</b> b0aee833608<span><span= 'notranslate'>%s</b> %s qeydə alınıb.
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Göndərən
 ValidateCheckReceipt=Bu çek qəbzi təsdiq edilsin?
 ConfirmValidateCheckReceipt=Bu çek qəbzini təsdiq üçün təqdim etmək istədiyinizə əminsiniz? Təsdiq edildikdən sonra heç bir dəyişiklik mümkün olmayacaq.
diff --git a/htdocs/langs/az_AZ/bills.lang b/htdocs/langs/az_AZ/bills.lang
index f855703536e..49b1615b430 100644
--- a/htdocs/langs/az_AZ/bills.lang
+++ b/htdocs/langs/az_AZ/bills.lang
@@ -188,7 +188,7 @@ SuppliersDraftInvoices=Satıcıların hesab-fakturaları
 Unpaid=Ödənilməmiş
 ErrorNoPaymentDefined=Xəta Heç bir ödəniş müəyyən edilməmişdir
 ConfirmDeleteBill=Bu fakturanı silmək istədiyinizə əminsiniz?
-ConfirmValidateBill=Bu fakturanı <b>%s<span class='notranslate'></b> istinadı ilə doğrulamaq istədiyinizə əminsiniz >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=<b>%s</b> fakturasını qaralama statusuna dəyişmək istədiyinizə əminsiniz ?
 ConfirmClassifyPaidBill=<b>%s</b> fakturasını ödənişli statusuna dəyişmək istədiyinizə əminsiniz ?
 ConfirmCancelBill=<b>%s</b> fakturasını ləğv etmək istədiyinizə əminsiniz?
@@ -210,14 +210,14 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Bəzi ölkələrdə bu seçim
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Bütün digərləri uyğun gəlmirsə, bu seçimdən istifadə edin
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>pis müştəri</b> borcunu ödəməkdən imtina edən müştəridir.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Bəzi məhsullar geri qaytarıldığı üçün ödəniş tamamlanmadıqda bu seçim istifadə olunur
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Ödənilməmiş məbləğ <b>vasitəçi bank haqları</b>, birbaşa b0aee3730z-dan çıxılır. >düzgün məbləğ<span class='notranslate'></b> Müştəri tərəfindən ödənilir.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Ödənilməmiş məbləğ heç vaxt ödənilməyəcək, çünki bu, vergi tutulmasıdır
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Bütün digərləri uyğun deyilsə, məsələn, aşağıdakı vəziyyətdə bu seçimi istifadə edin:<br>- ödəniş tamamlanmayıb, çünki bəzi məhsullar geri göndərilib<br>- endirim unudulmuş olduğu üçün iddia edilən məbləğ çox mühümdür<br>Bütün hallarda həddindən artıq tələb olunan məbləğ kredit qeydi yaratmaqla mühasibatlıq sistemində düzəldilməlidir.
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>pis təchizatçı</b> ödəməkdən imtina etdiyimiz təchizatçıdır.
 ConfirmClassifyAbandonReasonOther=Digər
 ConfirmClassifyAbandonReasonOtherDesc=Bu seçim bütün digər hallarda istifadə olunacaq. Məsələn, əvəzedici faktura yaratmağı planlaşdırdığınız üçün.
-ConfirmCustomerPayment=<b>%s</b> <span class= üçün bu ödəniş daxiletməsini təsdiq edirsiniz? 'notranslate'>%s</span>?
-ConfirmSupplierPayment=<b>%s</b> <span class= üçün bu ödəniş daxiletməsini təsdiq edirsiniz? 'notranslate'>%s</span>?
+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=Bu ödənişi təsdiqləmək istədiyinizə əminsiniz? Ödəniş təsdiqləndikdən sonra heç bir dəyişiklik edilə bilməz.
 ValidateBill=Fakturanı təsdiq edin
 UnvalidateBill=Fakturanı etibarsız edin
@@ -377,7 +377,7 @@ DisabledBecauseReplacedInvoice=Faktura dəyişdirildiyi üçün əməliyyat deak
 DescTaxAndDividendsArea=Bu sahə xüsusi xərclər üçün edilən bütün ödənişlərin xülasəsini təqdim edir. Burada yalnız müəyyən edilmiş il ərzində ödənişləri olan qeydlər daxil edilir.
 NbOfPayments=Ödənişlərin sayı
 SplitDiscount=Endirimi ikiye böl
-ConfirmSplitDiscount=<b>%s</b> endirimini bölmək istədiyinizə əminsiniz span class='notranslate'>%s</span> iki kiçik endirimə çevrilsin?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=İki hissənin hər biri üçün giriş məbləği:
 TotalOfTwoDiscountMustEqualsOriginal=İki yeni endirimin cəmi ilkin endirim məbləğinə bərabər olmalıdır.
 ConfirmRemoveDiscount=Bu endirimi silmək istədiyinizə əminsiniz?
@@ -403,7 +403,7 @@ FrequencyPer_d=Hər %s gündən bir
 FrequencyPer_m=Hər %s aydan bir
 FrequencyPer_y=Hər %s ildən bir
 FrequencyUnit=Tezlik vahidi
-toolTipFrequency=Nümunələr:<br><b>Set 7, Gün</b></spanice: yeni invo> verin: hər 7 gündən bir<span class='notranslate'><br><b>Set 3, Ay</b> yenisini verin: hər 3 aydan bir faktura
+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=Növbəti faktura yaratmaq üçün tarix
 NextDateToExecutionShort=Növbəti nəsil tarix.
 DateLastGeneration=Ən son nəslin tarixi
@@ -569,9 +569,9 @@ PDFCrabeDescription=Faktura pdf şablon Crabe. Tam faktura şablonu (Sponge şab
 PDFSpongeDescription=Faktura pdf şablon Sponge. Tam faktura şablonu
 PDFCrevetteDescription=Faktura pdf şablon Crevette. Vəziyyət fakturaları üçün tam faktura şablonu
 TerreNumRefModelDesc1=Standart hesab-fakturalar üçün %syymm-nnnn və yy-nin il olduğu kredit qeydləri üçün %syymm-nnnn formatında qaytarın aydır və nnnn fasiləsiz və 0-a qayıtmayan ardıcıl avtomatik artan nömrədir
-MarsNumRefModelDesc1=Standart fakturalar üçün %syymm-nnnn, əvəzedici fakturalar üçün %syymm-nnnn, <span class=' formatında qaytarın notranslate'>%s</span>ilkin ödəniş fakturaları üçün yymm-nnnn və yy il, mm ay və nnnn ardıcıl avtomatik olduğu kredit qeydləri üçün %syymm-nnnn fasiləsiz və 0-a qayıtmadan artan nömrə
+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 sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$syymm ilə başlayan qanun layihəsi artıq mövcuddur və bu ardıcıllıq modeli ilə uyğun gəlmir. Bu modulu aktivləşdirmək üçün onu silin və ya adını dəyişin.
-CactusNumRefModelDesc1=Standart fakturalar üçün %syymm-nnnn, kredit qeydləri üçün %syymm-nnnn və <span class=' formatında qaytarın notranslate'>%s</span>yymm-nnnn ilkin ödəniş fakturaları üçün burada yy il, mm ay və nnnn fasiləsiz və 0-a qayıtmayan ardıcıl avtomatik artan nömrədir
+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 sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Erkən bağlanma səbəbi
 EarlyClosingComment=Erkən yekun qeyd
 ##### Types de contacts #####
@@ -613,8 +613,8 @@ TotalSituationInvoice=Ümumi vəziyyət
 invoiceLineProgressError=Faktura xəttinin gedişatı növbəti faktura xəttindən çox və ya ona bərabər ola bilməz
 updatePriceNextInvoiceErrorUpdateline=Xəta: faktura xəttində qiyməti yeniləyin: %s
 ToCreateARecurringInvoice=Bu müqavilə üçün təkrarlanan faktura yaratmaq üçün əvvəlcə bu qaralama fakturanı yaradın, sonra onu faktura şablonuna çevirin və gələcək hesab-fakturaların yaradılması tezliyini müəyyənləşdirin.
-ToCreateARecurringInvoiceGene=Gələcək fakturaları müntəzəm və əl ilə yaratmaq üçün <strong>%s - b0ecb2ec807f49f49 menyusuna daxil olun. span> - <span class='notranslate'>%s</strong>.
-ToCreateARecurringInvoiceGeneAuto=Əgər belə hesab-fakturaların avtomatik yaradılmasına ehtiyacınız varsa, administratorunuzdan <strong>%s<span class='notranslate modulunu aktiv edib quraşdırmasını xahiş edin. '></strong></span>. Qeyd edək ki, hər iki üsul (əllə və avtomatik) təkrarlanma riski olmadan birlikdə istifadə edilə bilər.
+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=Şablon fakturanı silin
 ConfirmDeleteRepeatableInvoice=Şablon fakturanı silmək istədiyinizə əminsiniz?
 CreateOneBillByThird=Üçüncü tərəf üçün bir faktura yaradın (əks halda, hər seçilmiş obyekt üçün bir faktura)
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index 79586ae62ba..9c37c192443 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=Çox parametrləri olan güclü üsul. Şablonla
 ByTerminal=Terminalla
 TakeposNumpadUsePaymentIcon=Numpad-in ödəniş düymələrində mətn əvəzinə ikonadan istifadə edin
 CashDeskRefNumberingModules=POS satışları üçün nömrələmə modulu
-CashDeskGenericMaskCodes6 = <br><b>{TN}<span class='notranslate'4</span>71f span> etiketi terminal nömrəsini əlavə etmək üçün istifadə olunur
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Eyni məhsulların xətlərini birləşdirin
 StartAParallelSale=Yeni paralel satışa başlayın
 SaleStartedAt=Satış %s tarixində başladı
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Təfərrüatlar olmadan çapda standart olaraq x
 PrintWithoutDetails=Təfərrüatlar olmadan çap edin
 YearNotDefined=İl müəyyən edilməyib
 TakeposBarcodeRuleToInsertProduct=Məhsul daxil etmək üçün barkod qaydası
-TakeposBarcodeRuleToInsertProductDesc=Skan edilmiş barkoddan məhsul arayışı + kəmiyyət çıxarmaq qaydası.<br>Boşdursa (defolt dəyər), proqram məhsulu tapmaq üçün skan edilmiş tam barkoddan istifadə edəcək.<br><br>Müəyyən edilibsə, sintaksis belə olmalıdır:<br><span><span'>notranslate <b></span>ref:NB+qu:NB+qd:NB+digər:NB</b><br> haradadır skan edilmiş barkoddan məlumat çıxarmaq üçün istifadə ediləcək simvolların sayı:<br><b>refb09a4b78z1f  : məhsul arayışı<br><b>qu</b>: element (vahidlər) daxil edərkən təyin edin<br><b>qdb09a4b739f17f8z></spanity element daxil edərkən təyin edin (ondalıqlar)<span class='notranslate'><br><b>digərb09a4b739f17f8>ss.
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Artıq çap olunub
 HideCategories=Kateqoriya seçiminin bütün bölməsini gizlədin
 HideStockOnLine=Onlayn ehtiyatı gizlədin
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index 7de663ede6d..84be10890c9 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -1,107 +1,117 @@
 # 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
+newSocieteAdded=Əlaqə məlumatlarınız qeydə alınıb. Tezliklə sizinlə əlaqə saxlayacağıq...
+ContactUsDesc=Bu forma ilk əlaqə üçün bizə mesaj göndərməyə imkan verir.
+ErrorCompanyNameAlreadyExists=Şirkət adı %s artıq mövcuddur. Başqa birini seçin.
+ErrorSetACountryFirst=Əvvəlcə ölkəni təyin edin
+SelectThirdParty=Üçüncü tərəf seçin
+ConfirmDeleteCompany=Bu şirkəti və bütün əlaqəli məlumatları silmək istədiyinizə əminsiniz?
+DeleteContact=Kontaktı/ünvanı silin
+ConfirmDeleteContact=Bu kontaktı və bütün əlaqəli məlumatları silmək istədiyinizə əminsiniz?
+MenuNewThirdParty=Yeni Üçüncü Tərəf
+MenuNewCustomer=Yeni müştəri
+MenuNewProspect=Yeni Prospekt
+MenuNewSupplier=Yeni Satıcı
+MenuNewPrivateIndividual=Yeni fərdi şəxs
+NewCompany=Yeni şirkət (perspektiv, müştəri, satıcı)
+NewThirdParty=Yeni Üçüncü Tərəf (perspektiv, müştəri, satıcı)
+CreateDolibarrThirdPartySupplier=Üçüncü tərəf yaradın (satıcı)
+CreateThirdPartyOnly=Üçüncü tərəf yaradın
+CreateThirdPartyAndContact=Üçüncü tərəf + uşaq kontaktı yaradın
+ProspectionArea=Kəşfiyyat sahəsi
+IdThirdParty=ID üçüncü tərəf
+IdCompany=Şirkət ID
+IdContact=Əlaqə nömrəsi
+ThirdPartyAddress=Üçüncü tərəf ünvanı
+ThirdPartyContacts=Üçüncü tərəf kontaktları
+ThirdPartyContact=Üçüncü tərəf əlaqə/ünvanı
+Company=Şirkət
+CompanyName=Şirkət adı
+AliasNames=Alias adı (kommersiya, ticarət nişanı, ...)
+AliasNameShort=Alias Adı
+Companies=Şirkətlər
+CountryIsInEEC=Ölkə Avropa İqtisadi Birliyinin tərkibindədir
+PriceFormatInCurrentLanguage=Cari dildə və valyutada qiymət ekran formatı
+ThirdPartyName=Üçüncü tərəf adı
+ThirdPartyEmail=Üçüncü tərəf e-poçtu
+ThirdParty=Üçüncü tərəf
+ThirdParties=Üçüncü tərəflər
+ThirdPartyProspects=Perspektivlər
+ThirdPartyProspectsStats=Perspektivlər
+ThirdPartyCustomers=Müştərilər
+ThirdPartyCustomersStats=Müştərilər
+ThirdPartyCustomersWithIdProf12=%s və ya %s olan müştərilər
+ThirdPartySuppliers=Satıcılar
+ThirdPartyType=Üçüncü tərəf növü
+Individual=Şəxsi fərdi
+ToCreateContactWithSameName=Avtomatik olaraq üçüncü tərəf altında üçüncü tərəflə eyni məlumatlarla əlaqə/ünvan yaradacaq. Əksər hallarda, hətta üçüncü tərəfiniz fiziki şəxs olsa belə, yalnız üçüncü tərəf yaratmaq kifayətdir.
+ParentCompany=Ana şirkət
+Subsidiaries=törəmə şirkətlər
+ReportByMonth=Aylıq hesabat
+ReportByCustomers=Müştəriyə görə hesabat
+ReportByThirdparties=Üçüncü tərəf üçün hesabat
+ReportByQuarter=Qiymətə görə hesabat
+CivilityCode=Vətəndaşlıq kodu
+RegisteredOffice=Qeydiyyatdan keçmiş ofis
+Lastname=Soyad
+Firstname=Ad
+RefEmployee=İşçi arayışı
+NationalRegistrationNumber=Milli qeydiyyat nömrəsi
+PostOrFunction=İş mövqeyi
+UserTitle=Başlıq
+NatureOfThirdParty=Üçüncü tərəfin təbiəti
+NatureOfContact=Əlaqənin təbiəti
+Address=Ünvan
+State=Ştat/vilayət
+StateId=Dövlət ID
+StateCode=Dövlət/vilayət kodu
+StateShort=dövlət
 Region=Region
-Region-State=Region - State
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
-PhoneShort=Phone
+Region-State=Region - Dövlət
+Country=ölkə
+CountryCode=Ölkə Kodu
+CountryId=Ölkə ID
+Phone=Telefon
+PhoneShort=Telefon
 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
+Call=Zəng edin
+Chat=Söhbət
+PhonePro=avtobus. telefon
+PhonePerso=Pers. telefon
+PhoneMobile=Mobil
+No_Email=Toplu e-poçt göndərişlərindən imtina edin
+Fax=Faks
+Zip=Poçt kodu
+Town=Şəhər
+Web=Veb
+Poste= Vəzifə
+DefaultLang=Defolt dil
+VATIsUsed=Satış vergisi istifadə olunur
+VATIsUsedWhenSelling=Bu, bu üçüncü tərəfin öz müştərilərinə hesab-faktura təqdim edərkən satış vergisini daxil edib-etmədiyini müəyyən edir
+VATIsNotUsed=Satış vergisi istifadə edilmir
+VATReverseCharge=ƏDV-nin əks ödənişi
+VATReverseChargeByDefault=Defolt olaraq ƏDV-nin əks ödənişi
+VATReverseChargeByDefaultDesc=Təchizatçı hesab-fakturasında defolt olaraq ƏDV-nin əks ödənişi istifadə olunur
+CopyAddressFromSoc=Ünvanı üçüncü tərəf məlumatlarından kopyalayın
+ThirdpartyNotCustomerNotSupplierSoNoRef=Üçüncü tərəf nə müştəri, nə də satıcı, mövcud istinad obyektləri yoxdur
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Üçüncü tərəf nə müştəri, nə də satıcı, endirimlər mövcud deyil
+PaymentBankAccount=Ödəniş bank hesabı
+OverAllProposals=Təkliflər
+OverAllOrders=Sifarişlər
+OverAllInvoices=Fakturalar
+OverAllSupplierProposals=Qiymət sorğuları
 ##### 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=İkinci vergidən istifadə edin
+LocalTax1IsUsedES= RE istifadə olunur
+LocalTax1IsNotUsedES= RE istifadə edilmir
+LocalTax2IsUsed=Üçüncü vergidən istifadə edin
+LocalTax2IsUsedES= IRPF istifadə olunur
+LocalTax2IsNotUsedES= IRPF istifadə edilmir
+WrongCustomerCode=Müştəri kodu etibarsızdır
+WrongSupplierCode=Satıcı kodu etibarsızdır
+CustomerCodeModel=Müştəri kodu modeli
+SupplierCodeModel=Satıcı kodu modeli
+Gencod=Barkod
+GencodBuyPrice=Qiymətin barkodu ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -109,149 +119,165 @@ 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)
-ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
+ProfId1=Peşəkar ID 1
+ProfId2=Peşəkar şəxsiyyət vəsiqəsi 2
+ProfId3=Peşəkar şəxsiyyət vəsiqəsi 3
+ProfId4=Peşəkar şəxsiyyət vəsiqəsi 4
+ProfId5=Peşəkar şəxsiyyət vəsiqəsi 5
+ProfId6=Peşəkar şəxsiyyət vəsiqəsi 6
+ProfId7=Peşəkar ID 7
+ProfId8=Peşəkar şəxsiyyət vəsiqəsi 8
+ProfId9=Peşəkar ID 9
+ProfId10=Peşəkar ID 10
+ProfId1AR=Prof ID 1 (CUIT/CUIL)
+ProfId2AR=Professor Id 2 (Gəlir vəhşiləri)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
-ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId1AT=Professor Id 1 (USt.-IdNr)
+ProfId2AT=Prof ID 2 (ABŞ-Nr)
+ProfId3AT=Professor Id 3 (HandelsRegister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI nömrəsi
 ProfId6AT=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=Professor ID 1 (Peşəkar nömrə)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI nömrəsi
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
+ProfId3BR=IM (İnscricao Bələdiyyəsi)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-Nömrə
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId3CH=Prof ID 1 (Federal nömrə)
+ProfId4CH=Professor Id 2 (Kommersiya Rekord nömrəsi)
+ProfId5CH=EORI nömrəsi
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId1CL=Prof ID 1 (R.U.T.)
 ProfId2CL=-
 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=-
+ProfId1CM=İd. prof. 1 (Ticarət Reyestri)
+ProfId2CM=İd. prof. 2 (Vergi ödəyicisi nömrəsi)
+ProfId3CM=İd. prof. 3 (Yaradılış Fərmanı №)
+ProfId4CM=İd. prof. 4 (Depozit sertifikatının nömrəsi)
+ProfId5CM=İd. prof. 5 (Digərləri)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Ticarət reyestri
+ProfId2ShortCM=Vergi ödəyicisi nömrəsi
+ProfId3ShortCM=Yaradılış fərmanı №
+ProfId4ShortCM=Depozit sertifikatının nömrəsi
+ProfId5ShortCM=Digərləri
 ProfId6ShortCM=-
-ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId1CO=Prof ID 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId1DE=Professor Id 1 (USt.-IdNr)
+ProfId2DE=Prof ID 2 (ABŞ-Nr)
+ProfId3DE=Professor Id 3 (HandelsRegister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI nömrəsi
 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=Professor ID 1 (CIF/NIF)
+ProfId2ES=Prof ID 2 (Sosial təhlükəsizlik nömrəsi)
+ProfId3ES=Professor ID 3 (CNAE)
+ProfId4ES=Professor ID 4 (Kollec nömrəsi)
+ProfId5ES=Professor ID 5 (EORI nömrəsi)
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId1FR=Professor ID 1 (SIREN)
+ProfId2FR=Professor Id 2 (SIRET)
+ProfId3FR=Prof ID 3 (NAF, köhnə APE)
+ProfId4FR=Professor ID 4 (RCS/RM)
+ProfId5FR=Prof ID 5 (EORI nömrəsi)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
+ProfId1ShortFR=SİREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
+ProfId1GB=Qeydiyyat nömrəsi
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=İd prof. 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=Professor ID 1 (VÖEN)
+ProfId2IN=Professor ID 2 (PAN)
+ProfId3IN=Prof ID 3 (SRVC TAX)
+ProfId4IN=Prof ID 4
+ProfId5IN=Prof ID 5
 ProfId6IN=-
 ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI nömrəsi
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=İd. prof. 1 (R.C.S. Lüksemburq)
+ProfId2LU=İd. prof. 2 (Biznes icazəsi)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI nömrəsi
 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=İd prof. 1 (R.C.)
+ProfId2MA=İd prof. 2 (Patent)
+ProfId3MA=İd prof. 3 (İ.F.)
+ProfId4MA=İd prof. 4 (C.N.S.S.)
+ProfId5MA=İd prof. 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=Professor Id 1 (R.F.C).
+ProfId2MX=Professor Id 2 (R..P. IMSS)
+ProfId3MX=Prof ID 3 (Peşəkar Nizamnamə)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK nömrəsi
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI nömrəsi
 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=Professor ID 1 (NIPC)
+ProfId2PT=Prof ID 2 (Sosial təhlükəsizlik nömrəsi)
+ProfId3PT=Prof ID 3 (Kommersiya Rekord nömrəsi)
+ProfId4PT=Professor Id 4 (Konservatoriya)
+ProfId5PT=Professor ID 5 (EORI nömrəsi)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -259,237 +285,246 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane code)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId1TN=Professor ID 1 (RC)
+ProfId2TN=Prof ID 2 (Fiskal matrikul)
+ProfId3TN=Prof ID 3 (Douane kodu)
+ProfId4TN=Prof ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=Professor ID (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=Professor ID 1 (CUI)
+ProfId2RO=Professor Id 2 (Nr. Înmatriculare)
+ProfId3RO=Professor ID 3 (CAEN)
+ProfId4RO=Professor ID 5 (EUID)
+ProfId5RO=Professor ID 5 (EORI nömrəsi)
 ProfId6RO=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=Prof ID 1 (OGRN)
+ProfId2RU=Prof ID 2 (INN)
+ProfId3RU=Professor ID 3 (KPP)
+ProfId4RU=Professor ID 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)
-ProfId6UA=Prof Id 6 (TRDPAU)
+ProfId1UA=Professor ID 1 (EDRPOU)
+ProfId2UA=Professor ID 2 (DRFO)
+ProfId3UA=Prof ID 3 (INN)
+ProfId4UA=Prof ID 4 (Sertifikat)
+ProfId5UA=Professor ID 5 (RNOKPP)
+ProfId6UA=Professor Id 6 (TRDPAU)
 ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId2DZ=İncəsənət.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-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
+VATIntra=ƏDV ID
+VATIntraShort=ƏDV ID
+VATIntraSyntaxIsValid=Sintaksis etibarlıdır
+VATReturn=ƏDV bəyannaməsi
+ProspectCustomer=Potensial / Müştəri
+Prospect=Prospekt
+CustomerCard=Müştəri Kartı
+Customer=Müştəri
+CustomerRelativeDiscount=Nisbi müştəri endirimi
+SupplierRelativeDiscount=Nisbi satıcı endirimi
+CustomerRelativeDiscountShort=Nisbi endirim
+CustomerAbsoluteDiscountShort=Mütləq endirim
+CompanyHasRelativeDiscount=Bu müştərinin defolt endirimi <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Bu müştərinin standart olaraq nisbi endirimi yoxdur
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=Bu satıcı ilə standart nisbi endirim yoxdur
 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
+HasNoAbsoluteDiscountFromSupplier=Bu satıcıdan endirim/kredit yoxdur
 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.
-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
+CompanyHasNoAbsoluteDiscount=Bu müştərinin endirimli krediti yoxdur
+CustomerAbsoluteDiscountAllUsers=Mütləq müştəri endirimləri (bütün istifadəçilər tərəfindən verilir)
+CustomerAbsoluteDiscountMy=Mütləq müştəri endirimləri (özünüz tərəfindən verilir)
+SupplierAbsoluteDiscountAllUsers=Mütləq satıcı endirimləri (bütün istifadəçilər tərəfindən daxil edilir)
+SupplierAbsoluteDiscountMy=Mütləq satıcı endirimləri (özünüz daxil edirsiniz)
+DiscountNone=Heç biri
+Vendor=Satıcı
+Supplier=Satıcı
+AddContact=Əlaqə yaradın
+AddContactAddress=Əlaqə/ünvan yaradın
+EditContact=Kontaktı redaktə edin
+EditContactAddress=Əlaqəni/ünvanı redaktə edin
+Contact=Əlaqə ünvanı
+Contacts=Əlaqələr/Ünvanlar
+ContactId=Əlaqə id
+ContactsAddresses=Əlaqələr/Ünvanlar
+FromContactName=Adı:
+NoContactDefinedForThirdParty=Bu üçüncü tərəf üçün heç bir əlaqə müəyyən edilməmişdir
+NoContactDefined=Kontakt təyin olunmayıb
+DefaultContact=Defolt əlaqə/ünvan
+ContactByDefaultFor=üçün defolt əlaqə/ünvan
+AddThirdParty=Üçüncü tərəf yaradın
+DeleteACompany=Şirkəti silin
+PersonalInformations=Şəxsi məlumat
+AccountancyCode=Mühasibat hesabı
+CustomerCode=Müştəri Kodu
+SupplierCode=Satıcı kodu
+CustomerCodeShort=Müştəri Kodu
+SupplierCodeShort=Satıcı kodu
+CustomerCodeDesc=Bütün müştərilər üçün unikal olan Müştəri Kodu
+SupplierCodeDesc=Satıcı Kodu, bütün satıcılar üçün unikaldır
+RequiredIfCustomer=Üçüncü tərəf müştəri və ya perspektivdirsə, tələb olunur
+RequiredIfSupplier=Üçüncü tərəf satıcı olduqda tələb olunur
+ValidityControledByModule=Etibarlılıq modul tərəfindən idarə olunur
+ThisIsModuleRules=Bu modul üçün qaydalar
+ProspectToContact=Əlaqə üçün perspektiv
+CompanyDeleted="%s" şirkəti verilənlər bazasından silindi.
+ListOfContacts=Əlaqələrin/ünvanların siyahısı
+ListOfContactsAddresses=Əlaqələrin/ünvanların siyahısı
+ListOfThirdParties=Üçüncü Tərəflərin Siyahısı
+ShowCompany=Üçüncü Tərəf
+ShowContact=Əlaqə ünvanı
+ContactsAllShort=Hamısı (filtr yoxdur)
+ContactType=Əlaqə rolu
+ContactForOrders=Sifarişlə əlaqə
+ContactForOrdersOrShipments=Sifarişin və ya göndərişin əlaqəsi
+ContactForProposals=Təklifin əlaqəsi
+ContactForContracts=Müqavilə ilə əlaqə
+ContactForInvoices=Faktura ilə əlaqə
+NoContactForAnyOrder=Bu əlaqə hər hansı sifariş üçün əlaqə deyil
+NoContactForAnyOrderOrShipments=Bu əlaqə hər hansı bir sifariş və ya göndərmə üçün əlaqə deyil
+NoContactForAnyProposal=Bu əlaqə hər hansı kommersiya təklifi üçün əlaqə deyil
+NoContactForAnyContract=Bu əlaqə hər hansı bir müqavilə üçün əlaqə deyil
+NoContactForAnyInvoice=Bu kontakt hər hansı faktura üçün əlaqə deyil
+NewContact=Yeni əlaqə
+NewContactAddress=Yeni Əlaqə/Ünvan
+MyContacts=Əlaqələrim
+Capital=Kapital
+CapitalOf=%s-ın paytaxtı
+EditCompany=Şirkəti redaktə edin
+ThisUserIsNot=Bu istifadəçi perspektiv, müştəri və ya satıcı deyil
+VATIntraCheck=Yoxlayın
+VATIntraCheckDesc=ƏDV ID-sinə ölkə prefiksi daxil edilməlidir. <b>%s</b> linki Avropa ƏDV yoxlayıcı xidmətindən istifadə edir (VIES) Dolibarr serverindən internetə çıxış tələb edir.
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
+VATIntraCheckableOnEUSite=Avropa Komissiyasının saytında İcmadaxili ƏDV ID-sini yoxlayın
+VATIntraManualCheck=Siz həmçinin Avropa Komissiyasının internet saytında əl ilə yoxlaya bilərsiniz <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Yoxlamaq mümkün deyil. Çek xidməti üzv dövlət tərəfindən təmin edilmir (%s).
+NorProspectNorCustomer=Nə perspektiv, nə də müştəri
+JuridicalStatus=Təsərrüfat subyektinin növü
+Workforce=İşçi qüvvəsi
+Staff=İşçilər
+ProspectLevelShort=Potensial
+ProspectLevel=Perspektiv potensialı
+ContactPrivate=Şəxsi
+ContactPublic=Paylaşıldı
+ContactVisibility=Görünüş
+ContactOthers=Digər
+OthersNotLinkedToThirdParty=Üçüncü tərəflə əlaqəli olmayan digərləri
+ProspectStatus=Perspektiv statusu
+PL_NONE=Heç biri
+PL_UNKNOWN=Naməlum
+PL_LOW=Aşağı
+PL_MEDIUM=Orta
+PL_HIGH=Yüksək
 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
+TE_STARTUP=Başlamaq
+TE_GROUP=Böyük şirkət
+TE_MEDIUM=Orta şirkət
+TE_ADMIN=Hökumət
+TE_SMALL=Kiçik şirkət
+TE_RETAIL=Pərakəndə satıcı
+TE_WHOLE=Topdan satıcı
+TE_PRIVATE=Şəxsi fərdi
+TE_OTHER=Digər
+StatusProspect-1=Əlaqə saxlamayın
+StatusProspect0=Heç vaxt əlaqə saxlamayıb
+StatusProspect1=Əlaqə üçün
+StatusProspect2=Əlaqə prosesdədir
+StatusProspect3=Əlaqə tamamlandı
+ChangeDoNotContact=Vəziyyəti "Əlaqə saxlama" olaraq dəyişdirin
+ChangeNeverContacted=Vəziyyəti "Heç vaxt əlaqə saxlamadım" olaraq dəyişdirin
+ChangeToContact=Vəziyyəti "Əlaqə üçün" olaraq dəyişdirin
+ChangeContactInProcess=Vəziyyəti "Əlaqə prosesində" olaraq dəyişdirin
+ChangeContactDone=Vəziyyəti "Əlaqə tamamlandı" olaraq dəyişdirin
+ProspectsByStatus=Status üzrə perspektivlər
+NoParentCompany=Heç biri
+ExportCardToFormat=Kartı formata ixrac edin
+ContactNotLinkedToCompany=Heç bir üçüncü tərəflə əlaqəsi olmayan əlaqə
+DolibarrLogin=Dolibarr giriş
+NoDolibarrAccess=Dolibarr girişi yoxdur
+ExportDataset_company_1=Üçüncü tərəflər (şirkətlər/fondlar/fiziki şəxslər) və onların xassələri
+ExportDataset_company_2=Kontaktlar və onların xüsusiyyətləri
+ImportDataset_company_1=Üçüncü tərəflər və onların xassələri
+ImportDataset_company_2=Üçüncü tərəflərin əlavə kontaktları/ünvanları və atributları
+ImportDataset_company_3=Üçüncü tərəflərin bank hesabları
+ImportDataset_company_4=Üçüncü tərəflərin Satış nümayəndələri (şirkətlərə satış nümayəndələri/istifadəçiləri təyin edin)
+PriceLevel=Qiymət Səviyyəsi
+PriceLevelLabels=Qiymət Səviyyəsi Etiketləri
+DeliveryAddress=Çatdırılma ünvanı
+AddAddress=Ünvan əlavə edin
+SupplierCategory=Satıcı kateqoriyası
+JuridicalStatus200=Müstəqil
+DeleteFile=Faylı silin
+ConfirmDeleteFile=Bu faylı silmək istədiyinizə əminsiniz <b>%s</b>?
+AllocateCommercial=Satış nümayəndəsinə həvalə olunub
+Organization=Təşkilat
+FiscalYearInformation=Büdcə ili, Maliyyə ili
+FiscalMonthStart=Maliyyə ilinin başlanğıc ayı
+SocialNetworksInformation=Sosial şəbəkələr
 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
+YouMustAssignUserMailFirst=E-poçt bildirişi əlavə edə bilməmişdən əvvəl bu istifadəçi üçün e-poçt yaratmalısınız.
+YouMustCreateContactFirst=E-poçt bildirişləri əlavə etmək üçün ilk növbədə üçüncü tərəf üçün etibarlı e-poçtları olan kontaktları təyin etməlisiniz
+ListSuppliersShort=Satıcıların siyahısı
+ListProspectsShort=Perspektivlərin Siyahısı
+ListCustomersShort=Müştərilərin Siyahısı
+ThirdPartiesArea=Üçüncü Tərəflər/Əlaqələr
+LastModifiedThirdParties=Dəyişdirilmiş ən son %s Üçüncü Tərəflər
+UniqueThirdParties=Üçüncü Tərəflərin ümumi sayı
+InActivity=Açıq
+ActivityCeased=Bağlı
+ThirdPartyIsClosed=Üçüncü tərəf bağlıdır
+ProductsIntoElements=%s ilə əlaqəli məhsul/xidmətlərin siyahısı
+CurrentOutstandingBill=Cari ödənilməmiş qanun layihəsi
+OutstandingBill=Maks. ödənilməmiş hesab üçün
+OutstandingBillReached=Maks. ödənilməmiş qanun layihəsinə çatdı
+OrderMinAmount=Sifariş üçün minimum məbləğ
+MonkeyNumRefModelDesc=Müştəri kodu üçün %syymm-nnnn və yy olduğu satıcı kodu üçün %syymm-nnnn formatında nömrə qaytarın il, mm aydır və nnnn fasiləsiz və 0-a qayıtmayan ardıcıl avtomatik artan nömrədir.
+LeopardNumRefModelDesc=Kod pulsuzdur. Bu kod istənilən vaxt dəyişdirilə bilər.
+ManagingDirectors=Menecer(lər)in adı (baş direktor, direktor, prezident...)
+MergeOriginThirdparty=Dublikat üçüncü tərəf (silmək istədiyiniz üçüncü tərəf)
+MergeThirdparties=Üçüncü tərəfləri birləşdirin
+ConfirmMergeThirdparties=Seçilmiş üçüncü tərəfi indiki tərəflə birləşdirmək istədiyinizə əminsiniz? Bütün əlaqəli obyektlər (qaimə-fakturalar, sifarişlər, ...) cari üçüncü tərəfə köçürüləcək, bundan sonra seçilmiş üçüncü tərəf silinəcək.
+ThirdpartiesMergeSuccess=Üçüncü tərəflər birləşdirilib
+SaleRepresentativeLogin=Satış nümayəndəsinin girişi
+SaleRepresentativeFirstname=Satış nümayəndəsinin adı
+SaleRepresentativeLastname=Satış nümayəndəsinin soyadı
+ErrorThirdpartiesMerge=Üçüncü tərəfləri silərkən xəta baş verdi. Zəhmət olmasa jurnalı yoxlayın. Dəyişikliklər geri qaytarıldı.
+NewCustomerSupplierCodeProposed=Müştəri və ya Satıcı kodu artıq istifadə olunub, yeni kod təklif olunur
+KeepEmptyIfGenericAddress=Bu ünvan ümumi ünvandırsa, bu sahəni boş saxlayın
 #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=Ödəniş növü - Müştəri
+PaymentTermsCustomer=Ödəniş şərtləri - Müştəri
+PaymentTypeSupplier=Ödəniş növü - Satıcı
+PaymentTermsSupplier=Ödəniş müddəti - Satıcı
+PaymentTypeBoth=Ödəniş növü - Müştəri və Satıcı
+MulticurrencyUsed=Multivalyutadan istifadə edin
+MulticurrencyCurrency=Valyuta
+InEEC=Avropa (AET)
+RestOfEurope=Qalan Avropa (AET)
+OutOfEurope=Avropadan kənar (AET)
+CurrentOutstandingBillLate=Cari ödənilməmiş qanun layihəsi gecdir
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ehtiyatlı olun, məhsulun qiymət parametrlərindən asılı olaraq, məhsulu POS-a əlavə etməzdən əvvəl üçüncü tərəfi dəyişdirməlisiniz.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=e-poçt artıq mövcuddur, lütfən şirkət adınızı yenidən yazın
+TwoRecordsOfCompanyName=bu şirkət üçün birdən çox qeyd var, tərəfdaşlıq sorğunuzu tamamlamaq üçün bizimlə əlaqə saxlayın
+CompanySection=Şirkət bölməsi
+ShowSocialNetworks=Sosial şəbəkələri göstərin
+HideSocialNetworks=Sosial şəbəkələri gizlədin
+ExternalSystemID=Xarici sistem identifikatoru
+IDOfPaymentInAnExternalSystem=Xarici sistemə ödəniş rejiminin ID-si (Stripe, Paypal, ... kimi)
+AADEWebserviceCredentials=AADE Veb Xidməti Etibarnamələri
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Stripe tərəfində bank məlumatının yaradılmasına icazə vermək üçün üçüncü tərəf müştəri olmalıdır
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 200ef49d173..2925e30017d 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -165,20 +165,20 @@ CalcModeEngagement=Məlum qeydə alınmış ödənişlərin təhlili
 CalcModePayment=Məlum qeydə alınmış ödənişlərin təhlili
 CalcModeBookkeeping=Mühasibat uçotu cədvəlində jurnallaşdırılmış məlumatların təhlili.
 CalcModeNoBookKeeping=Onlar hələ Ledger-də uçota alınmasa belə
-CalcModeLT1= Rejim <b>%sMüştəri fakturaları üzrə RE - təchizatçı fakturalarıb0ecb2ec87f49fz<span>fz0 ='notranslate'></b></span>
-CalcModeLT1Debt=Müştəri fakturalarında <b>%sRE rejimi%s<spante class='notranslate '></b></span>
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
 CalcModeLT1Rec= Rejim <b>%stəchizatçı fakturaları üzrə RE%s<spanno'translate= '></b></span>
-CalcModeLT2= Rejim <b>%sMüştəri fakturaları üzrə IRPF - təchizatçı fakturalarıb0ecb2ec87f49f<span0f ='notranslate'></b></span>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
 CalcModeLT2Debt=Rejim <b>%sMüştəri fakturalarında IRPF%s<spanlate '></b></span>
-CalcModeLT2Rec= Rejim <b>%sTəchizatçı fakturaları üzrə IRPF%s='notranslate '></b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
 AnnualSummaryDueDebtMode=Gəlir və xərclər balansı, illik xülasə
 AnnualSummaryInputOutputMode=Gəlir və xərclər balansı, illik xülasə
 AnnualByCompanies=Əvvəlcədən müəyyən edilmiş hesab qrupları üzrə gəlir və xərclərin balansı
-AnnualByCompaniesDueDebtMode=Gəlir və xərclər balansı, əvvəlcədən müəyyən edilmiş qruplar üzrə təfərrüat, rejim <b>%sİddialar-Borclar<span class='notranslate'ec>80ec </span></b> dedi <b>Öhdəlik uçotu</b>.
-AnnualByCompaniesInputOutputMode=Gəlir və xərclər balansı, əvvəlcədən müəyyən edilmiş qruplar üzrə təfərrüat, rejim <b>%sGəlir-Xərclər<span class='notranslate'ec802f </span></b> dedi: <b>nağd uçotu</b>.
-SeeReportInInputOutputMode=<b>%södənişlərin təhlilinə baxın%s<spante class='notranslate ></b></span> <b>qeyd edilmiş ödənişlərə əsaslanan hesablama üçün</b>, hətta L-də hələ də hesaba daxil edilməmişlər
+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=<b>%sqeyd edilmiş sənədlərin təhlilinə baxın%s</b>, məlum <b>qeydə alınmış sənədlərə əsaslanan hesablama üçün</b> hələ də daxil edilməsələr belə
-SeeReportInBookkeepingMode=<b>%smühasibat uçotu cədvəlinin təhlilinə baxın%s<span='notranslate'> <b>Mühasibat Kitabı cədvəli</b> əsasında hesabat üçün notranslate'></b></span>
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Göstərilən məbləğlər bütün vergilər daxildir
 RulesAmountWithTaxExcluded=- Göstərilən fakturaların məbləğləri bütün vergilər istisna olmaqla
 RulesResultDue=- Buraya bütün hesab-fakturalar, xərclər, ƏDV, ianələr, maaşlar, onların ödənilib-ödənilməməsindən asılı olmayaraq daxildir.<br>- O, fakturaların hesablaşma tarixinə və ödəmə tarixinə əsaslanır. xərclər və ya vergi ödənişləri. Əmək haqqı üçün müddətin bitmə tarixindən istifadə olunur.
diff --git a/htdocs/langs/az_AZ/cron.lang b/htdocs/langs/az_AZ/cron.lang
index 4fd2220dea6..1d0d57a5624 100644
--- a/htdocs/langs/az_AZ/cron.lang
+++ b/htdocs/langs/az_AZ/cron.lang
@@ -1,91 +1,100 @@
 # 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
+# Permissions
+Permission23101 = Planlaşdırılmış işi oxuyun
+Permission23102 = Planlaşdırılmış işi yaradın/yeniləyin
+Permission23103 = Planlaşdırılmış işi silin
+Permission23104 = Planlaşdırılmış işi yerinə yetirin
 # 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=Planlaşdırılmış işin idarə edilməsinin qurulması
+URLToLaunchCronJobs=Brauzerdən ixtisaslı cron işlərini yoxlamaq və işə salmaq üçün URL
+OrToLaunchASpecificJob=Və ya brauzerdən müəyyən bir işi yoxlamaq və işə salmaq üçün
+KeyForCronAccess=Cron işlərini işə salmaq üçün URL üçün təhlükəsizlik açarı
+FileToLaunchCronJobs=Keyfiyyətli cron işlərini yoxlamaq və işə salmaq üçün komanda xətti
+CronExplainHowToRunUnix=Unix mühitində hər 5 dəqiqədən bir komanda xəttini işə salmaq üçün aşağıdakı crontab girişindən istifadə etməlisiniz
+CronExplainHowToRunWin=Microsoft(tm) Windows mühitində hər 5 dəqiqədən bir əmr xəttini işə salmaq üçün Planlaşdırılmış Tapşırıq alətlərindən istifadə edə bilərsiniz
+CronMethodDoesNotExists=%s sinfində heç bir metod yoxdur %s
+CronMethodNotAllowed=%s sinfinin %s metodu qadağan olunmuş metodların blok siyahısındadır
+CronJobDefDesc=Cron iş profilləri modul deskriptor faylında müəyyən edilir. Modul aktivləşdirildikdə, onlar yüklənir və əlçatan olur ki, siz %s admin alətləri menyusundan işləri idarə edə bilərsiniz.
+CronJobProfiles=Əvvəlcədən təyin edilmiş cron iş profillərinin siyahısı
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Aktiv və qeyri-aktiv
 # 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=Ən son çıxış çıxışı
+CronLastResult=Ən son nəticə kodu
+CronCommand=Əmr
+CronList=Planlaşdırılmış işlər
+CronDelete=Planlaşdırılmış işləri silin
+CronConfirmDelete=Bu planlaşdırılan işləri silmək istədiyinizə əminsiniz?
+CronExecute=İndi işə salın
+CronConfirmExecute=Bu planlaşdırılan işləri indi yerinə yetirmək istədiyinizə əminsiniz?
+CronInfo=Planlaşdırılmış iş modulu işlərin avtomatik yerinə yetirilməsini planlaşdırmağa imkan verir. İşlərə əl ilə də başlamaq olar.
+CronTask=İş
+CronNone=Heç biri
+CronDtStart=Əvvəl yox
+CronDtEnd=Sonra yox
+CronDtNextLaunch=Növbəti icra
+CronDtLastLaunch=Ən son icranın başlama tarixi
+CronDtLastResult=Ən son icranın bitmə tarixi
+CronFrequency=Tezlik
+CronClass=Sinif
+CronMethod=Metod
+CronModule=Modul
+CronNoJobs=Heç bir iş qeydə alınmayıb
+CronPriority=Prioritet
+CronLabel=Etiket
+CronNbRun=Başlama sayı
+CronMaxRun=Maksimum buraxılış sayı
+CronEach=Hər
+JobFinished=İş başladı və bitdi
+Scheduled=Planlaşdırılıb
 #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>
+CronAdd= İş əlavə edin
+CronEvery=Hər bir işi yerinə yetirin
+CronObject=Yaratmaq üçün Nümunə/Obyekt
+CronArgs=Parametrlər
+CronSaveSucess=Uğurla yadda saxlayın
+CronNote=Şərh
+CronFieldMandatory=%s sahələri məcburidir
+CronErrEndDateStartDt=Bitmə tarixi başlanğıc tarixindən əvvəl ola bilməz
+StatusAtInstall=Modulun quraşdırılmasında vəziyyət
+CronStatusActiveBtn=Planlaşdırmanı aktivləşdirin
+CronStatusInactiveBtn=Deaktiv edin
+CronTaskInactive=Bu iş deaktiv edilib (planlaşdırılmayıb)
+CronId=İd
+CronClassFile=Sinif ilə fayl adı
+CronModuleHelp=Dolibarr modul kataloqunun adı (həmçinin xarici Dolibarr modulu ilə işləyir). <BR> Məsələn, Dolibarr Məhsul obyektinin /htdocs/<u>məhsulunun gətirmə metoduna zəng etmək üçünb0aacaa80d /class/product.class.php, modul üçün dəyər<br><i>məhsul</i>
+CronClassFileHelp=Yüklənəcək nisbi yol və fayl adı (yol veb serverin kök kataloquna nisbətəndir). <BR> Məsələn, Dolibarr Məhsul obyektinin gətirmə metoduna zəng etmək üçün htdocs/product/class/<u>product.class.php</u>, sinif fayl adı üçün dəyər<br><i>product/class/product/class .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
+CronMethodHelp=Başlamaq üçün obyekt metodu. <BR> Məsələn, Dolibarr Məhsul obyektinin /htdocs/product/class/product.class.php gətirmə metoduna zəng etmək üçün, metodun dəyəridir. <br><i>getch</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 parameters can be<br><i>0, ProductRef</i>
+CronCommandHelp=İcra etmək üçün sistem əmr xətti.
+CronCreateJob=Yeni Planlaşdırılmış İş yaradın
 CronFrom=From
 # 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=İş Tipi
+CronType_method=PHP Sinifinin çağırış metodu
+CronType_command=Shell əmri
+CronCannotLoadClass=%s sinif faylını yükləmək mümkün deyil (%s sinfindən istifadə etmək üçün)
+CronCannotLoadObject=%s sinif faylı yükləndi, lakin %s obyekti onda tapılmadı
+UseMenuModuleToolsToAddCronJobs=Planlaşdırılmış işlərə baxmaq və redaktə etmək üçün "<a href="%s">Ev - Admin alətləri - Planlaşdırılmış işlər</a>" menyusuna daxil olun.
+JobDisabled=İş əlil
+MakeLocalDatabaseDumpShort=Yerli verilənlər bazası ehtiyat nüsxəsi
+MakeLocalDatabaseDump=Yerli verilənlər bazası zibilini yaradın. Parametrlər bunlardır: sıxılma ('gz' və ya 'bz' və ya 'yox'), ehtiyat nüsxə növü ('mysql', 'pgsql', 'auto'), 1, 'auto' və ya qurmaq üçün fayl adı, saxlanılacaq ehtiyat fayllarının sayı
+MakeSendLocalDatabaseDumpShort=Yerli verilənlər bazası ehtiyat nüsxəsini göndərin
+MakeSendLocalDatabaseDump=Yerli verilənlər bazası ehtiyat nüsxəsini e-poçtla göndərin. Parametrlər bunlardır: kimdən, mövzu, mesaj, fayl adı (göndərilən faylın adı), filtr (yalnız verilənlər bazasının ehtiyat nüsxəsi üçün "sql")
+BackupIsTooLargeSend=Üzr istəyirik, son ehtiyat faylı e-poçtla göndərmək üçün çox böyükdür
+CleanUnfinishedCronjobShort=Təmiz yarımçıq cronjob
+CleanUnfinishedCronjob=Proses artıq işləməyəndə təmiz cronjob emalda qalıb
+WarningCronDelayed=Diqqət, performans məqsədi ilə, aktivləşdirilən işlərin növbəti icra tarixi nə olursa olsun, işləriniz işə salınmazdan əvvəl maksimum %s saat gecikə bilər.
+DATAPOLICYJob=Məlumat təmizləyicisi və anonimator
+JobXMustBeEnabled=%s işi aktiv edilməlidir
+EmailIfError=Səhv barədə xəbərdarlıq üçün e-poçt
+JobNotFound=%s işi iş siyahısında tapılmadı (modulu deaktiv etməyə/aktiv etməyə çalışın)
+ErrorInBatch=%s işi icra edərkən xəta
+
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Son icra olunan planlaşdırılmış iş
+NextScheduledJobExecute=İcra etmək üçün növbəti planlaşdırılmış iş
+NumberScheduledJobError=Səhvlə planlaşdırılan işlərin sayı
+NumberScheduledJobNeverFinished=Planlaşdırılmış işlərin sayı heç vaxt tamamlanmayıb
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index b661755a298..f973536bf6d 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -15,12 +15,12 @@ ErrorGroupAlreadyExists=%s qrupu artıq mövcuddur.
 ErrorEmailAlreadyExists=%s e-poçtu artıq mövcuddur.
 ErrorRecordNotFound=Qeyd tapılmadı.
 ErrorRecordNotFoundShort=Tapılmadı
-ErrorFailToCopyFile='<b>%s</b>' faylını'<span> sinfinə kopyalamaq alınmadı ='notranslate'><b></span>%s</b>'.
-ErrorFailToCopyDir='<b>%s</b>' kataloqunu'<span>'a köçürmək alınmadı ='notranslate'><b></span>%s</b>'.
-ErrorFailToRenameFile='<b>%s</b>' faylının adını dəyişdirmək alınmadı. ='notranslate'><b></span>%s</b>'.
+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='<b>%s</b>' faylını silmək alınmadı.
 ErrorFailToCreateFile='<b>%s</b>' faylını yaratmaq alınmadı.
-ErrorFailToRenameDir='<b>%s</b>'<span>' qovluğunun adını dəyişmək alınmadı ='notranslate'><b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir='<b>%s</b>' kataloqunu yaratmaq alınmadı.
 ErrorFailToDeleteDir='<b>%s</b>' kataloqunu silmək alınmadı.
 ErrorFailToMakeReplacementInto='<b>%s</b>' faylına dəyişiklik etmək alınmadı.
@@ -51,7 +51,7 @@ ErrorBadDateFormat='%s' dəyərində yanlış tarix formatı var
 ErrorWrongDate=Tarix düzgün deyil!
 ErrorFailedToWriteInDir=%s qovluğuna yazmaq alınmadı
 ErrorFailedToBuildArchive=%s arxiv faylını qurmaq alınmadı
-ErrorFoundBadEmailInFile=Faylda %s sətirləri üçün səhv e-poçt sintaksisi tapıldı (misal sətir %s e-poçtu=<span class='notranslate'>b0ecb4980 /span>)
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=İstifadəçi silinə bilməz. Ola bilsin ki, bu, Dolibarr qurumları ilə bağlıdır.
 ErrorFieldsRequired=Bəzi tələb olunan sahələr boş qalıb.
 ErrorSubjectIsRequired=E-poçt mövzusu tələb olunur
@@ -81,7 +81,7 @@ ErrorNoValueForRadioType=Zəhmət olmasa radio siyahısı üçün dəyəri doldu
 ErrorBadFormatValueList=Siyahı dəyərində birdən çox vergül ola bilməz: <u>%s</u>, lakin ən azı birinə ehtiyac var: açar, dəyər
 ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> sahəsində xüsusi simvollar olmamalıdır.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>%s</b> sahəsində xüsusi simvollar və böyük hərflər olmamalıdır simvol və əlifba sırası ilə başlamalıdır (a-z)
-ErrorFieldMustHaveXChar=<b>%s</b> sahəsində ən azı <span class=' olmalıdır notranslate'>%s</span> simvol.
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
 ErrorNoAccountancyModuleLoaded=Heç bir mühasibat modulu aktivləşdirilməyib
 ErrorExportDuplicateProfil=Bu profil adı bu ixrac dəsti üçün artıq mövcuddur.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP uyğunluğu tamamlanmayıb.
@@ -94,10 +94,10 @@ ErrorRecordIsUsedCantDelete=Qeydi silmək mümkün deyil. O, artıq istifadə ol
 ErrorModuleRequireJavascript=Bu funksiyanın işləməsi üçün JavaScript deaktiv edilməməlidir. JavaScript-i aktivləşdirmək/deaktiv etmək üçün Ana səhifə->Quraşdırma->Ekran menyusuna keçin.
 ErrorPasswordsMustMatch=Hər iki daxil edilmiş parol bir-birinə uyğun olmalıdır
 ErrorContactEMail=Texniki xəta baş verdi. Zəhmət olmasa, aşağıdakı e-poçt ünvanına administratorla əlaqə saxlayın <b>%s</b> və xətanı təqdim edin. mesajınızda <b>%s</b> kodu və ya ekran nüsxəsini əlavə edin bu səhifə.
-ErrorWrongValueForField=Sahə <b>%s</b>: 'translate class='no <b></span>%s</b>' regex qaydasına uyğun gəlmir b0z838f <span class='notranslate'>%s</b>
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorHtmlInjectionForField=Sahə <b>%s</b>: '<spanlate class='no dəyəri '><b></span>%s</b>' icazə verilməyən zərərli məlumat ehtiva edir
-ErrorFieldValueNotIn=Sahə <b>%s</b>: 'translate class='no <b></span>%s</b>' <span class='notranslate'3</span>3038f sahəsində tapılan dəyər deyil span>%s</b> <b> %s</b>
-ErrorFieldRefNotIn=Sahə <b>%s</b>: 'translate class='no <b></span>%s</b>' b0aee8735z deyil class='notranslate'>%s</b> mövcud ref
+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
 ErrorMultipleRecordFoundFromRef=<b>%s</b> üzrə axtarış zamanı bir neçə qeyd tapıldı. Hansı identifikatordan istifadə edəcəyinizi bilmək üçün heç bir yol yoxdur.
 ErrorsOnXLines=%s xəta tapıldı
 ErrorFileIsInfectedWithAVirus=Antivirus proqramı faylı təsdiq edə bilmədi (fayl virusla yoluxmuş ola bilər)
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=Çox sayda alıcı istifadə etmədiyinizi və e-poçt məz
 ErrorUserNotAssignedToTask=İstehlak olunan vaxtı daxil edə bilmək üçün istifadəçi tapşırığa təyin edilməlidir.
 ErrorTaskAlreadyAssigned=Tapşırıq artıq istifadəçiyə təyin edilib
 ErrorModuleFileSeemsToHaveAWrongFormat=Modul paketində səhv format var.
-ErrorModuleFileSeemsToHaveAWrongFormat2=Modulun zipində ən azı bir məcburi kataloq olmalıdır: <strong>%sb0a65d09z06f > və ya <span class='notranslate'><strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Modul paketinin adı (<strong>%s</strong>) uyğun gəlmir gözlənilən ad sintaksisi: <strong>%s</strong>
 ErrorDuplicateTrigger=Xəta, tətik adının dublikatı %s. Artıq %s saytından yüklənib.
 ErrorNoWarehouseDefined=Xəta, anbar müəyyən edilməmişdir.
@@ -263,9 +263,9 @@ ErrorReplaceStringEmpty=Xəta, dəyişdiriləcək sətir boşdur
 ErrorProductNeedBatchNumber=Xəta, '<b>%s</b>' çoxlu/seriyalı nömrə tələb edir
 ErrorProductDoesNotNeedBatchNumber=Xəta, '<b>%s</b>' çox şeyi qəbul etmir/ seriya nömrəsi
 ErrorFailedToReadObject=Xəta, <b>%s</b> tipli obyekti oxumaq alınmadı
-ErrorParameterMustBeEnabledToAllwoThisFeature=Xəta, <b>%s</b> parametri <span sinfində aktivləşdirilməlidir= 'notranslate'><b></span>conf/conf.php<> əmr xətti interfeysindən daxili iş planlayıcısı tərəfindən istifadəyə icazə verin
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Xəta, bu giriş etibarlılıq tarix diapazonundan kənardadır
-ErrorValueLength=Sahənin uzunluğu '<b>%s</b>'-dən yüksək olmalıdır. span class='notranslate'><b></span>%s</b>'
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword='<b>%s</b>' sözü qorunmuş açar sözdür
 ErrorFilenameReserved=<b>%s</b> fayl adı olduğu üçün istifadə edilə bilməz qorunan və qorunan komanda.
 ErrorNotAvailableWithThisDistribution=Bu paylama ilə mövcud deyil
@@ -337,7 +337,7 @@ WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametriniz upload_max_f
 WarningPasswordSetWithNoAccount=Bu üzv üçün parol təyin edildi. Bununla belə, heç bir istifadəçi hesabı yaradılmayıb. Beləliklə, bu parol saxlanılır, lakin Dolibarr-a daxil olmaq üçün istifadə edilə bilməz. O, xarici modul/interfeys tərəfindən istifadə oluna bilər, lakin əgər üzv üçün hər hansı bir giriş və ya parol təyin etməyə ehtiyac yoxdursa, siz Üzv modulunun quraşdırılmasından "Hər bir üzv üçün girişi idarə et" seçimini söndürə bilərsiniz. Əgər siz girişi idarə etməlisinizsə, lakin heç bir parola ehtiyacınız yoxdursa, bu xəbərdarlığın qarşısını almaq üçün bu sahəni boş saxlaya bilərsiniz. Qeyd: Üzv bir istifadəçi ilə bağlıdırsa, e-poçt da giriş kimi istifadə edilə bilər.
 WarningMandatorySetupNotComplete=Əsas parametrləri qurmaq üçün bura klikləyin
 WarningEnableYourModulesApplications=Modullarınızı və proqramlarınızı aktivləşdirmək üçün bura klikləyin
-WarningSafeModeOnCheckExecDir=Xəbərdarlıq, PHP seçimi <b>safe_mode</b> aktivdir, ona görə də əmr php parametri <span class=' tərəfindən elan edilmiş kataloqda saxlanmalıdır. notranslate'><b></span>safe_mode_exec_dir</b>.
+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=Bu başlıq və ya bu hədəf (URL) ilə əlfəcin artıq mövcuddur.
 WarningPassIsEmpty=Xəbərdarlıq, verilənlər bazası parolu boşdur. Bu təhlükəsizlik boşluğudur. Bunu əks etdirmək üçün verilənlər bazanıza parol əlavə etməli və conf.php faylınızı dəyişdirməlisiniz.
 WarningConfFileMustBeReadOnly=Xəbərdarlıq, konfiqurasiya faylınız (<b>htdocs/conf/conf.php</b>) veb server tərəfindən üzərinə yazıla bilər. Bu ciddi təhlükəsizlik boşluğudur. Veb server tərəfindən istifadə edilən əməliyyat sistemi istifadəçisi üçün yalnız oxumaq rejimində olmaq üçün fayldakı icazələri dəyişdirin. Diskiniz üçün Windows və FAT formatından istifadə edirsinizsə, bilməlisiniz ki, bu fayl sistemi fayla icazələr əlavə etməyə imkan vermir, ona görə də tamamilə təhlükəsiz ola bilməz.
@@ -349,7 +349,7 @@ WarningCloseAlways=Xəbərdarlıq, bağlama, hətta mənbə və hədəf elementl
 WarningUsingThisBoxSlowDown=Xəbərdarlıq, bu qutudan istifadə edərək qutunu göstərən bütün səhifələri ciddi şəkildə yavaşlatır.
 WarningClickToDialUserSetupNotComplete=İstifadəçiniz üçün ClickToDial məlumatının quraşdırılması tamamlanmayıb (istifadəçi kartınızdakı ClickToDial nişanına baxın).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Displey quraşdırması kor insanlar və ya mətn brauzerləri üçün optimallaşdırıldıqda funksiya deaktiv edilir.
-WarningPaymentDateLowerThanInvoiceDate=Ödəniş tarixi (%s) faktura tarixindən (%s) əvvəldir <span class='notranslate'>b0ecb2ec87f49f span>.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Həddindən artıq çox data (%s sətirdən çox). Lütfən, daha çox filtrdən istifadə edin və ya sabit %s dəyərini daha yüksək həddə təyin edin.
 WarningSomeLinesWithNullHourlyRate=Bəzi vaxtlar bəzi istifadəçilər tərəfindən qeydə alınıb, lakin onların saatlıq tarifləri müəyyən edilməyib. Saatda 0 %s dəyəri istifadə edilib, lakin bu, sərf olunan vaxtın yanlış qiymətləndirilməsi ilə nəticələnə bilər.
 WarningYourLoginWasModifiedPleaseLogin=Girişiniz dəyişdirildi. Təhlükəsizlik məqsədi ilə növbəti əməliyyatdan əvvəl yeni girişinizlə daxil olmalısınız.
diff --git a/htdocs/langs/az_AZ/eventorganization.lang b/htdocs/langs/az_AZ/eventorganization.lang
index f26e7a3cb71..c9f052921d3 100644
--- a/htdocs/langs/az_AZ/eventorganization.lang
+++ b/htdocs/langs/az_AZ/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=Tədbirin təşkili
 EventOrganization=Tədbirin təşkili
 EventOrganizationSetupPage = Tədbir təşkilatının quraşdırma səhifəsi
 EVENTORGANIZATION_TASK_LABEL = Layihə təsdiq edildikdə avtomatik olaraq yaradılacaq tapşırıqların etiketi
-EVENTORGANIZATION_TASK_LABELTooltip = Tədbiri təşkil etmək üçün təsdiq etdiyiniz zaman bəzi tapşırıqlar layihədə avtomatik yaradıla bilər<br><br>Məsələn: <br>Konfranslara Zəng göndər<br>Konfranslar üçün Zəng göndər<br>V sinif təklifləri ='notranslate'><br></span>Butlar üçün ərizəni təsdiqləyin<br>İştirakçılar üçün tədbirə abunəlik açınb0342fccfda19b> xatırladın tədbir haqqında məruzəçilərə<span class='notranslate'><br>Tədbir haqqında Booth hosterlərinə xatırlatma göndər<br>İştirakçılara tədbir haqqında xatırlatma göndər
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=Tapşırıqları avtomatik yaratmağa ehtiyac yoxdursa, boş saxlayın.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kimsə konfrans təklif etdikdə avtomatik olaraq yaradılan üçüncü tərəflərə əlavə ediləcək kateqoriya
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Üçüncü tərəflərə əlavə ediləcək kateqoriya, onlar kabinə təklif etdikdə avtomatik olaraq yaradılır
@@ -88,6 +88,7 @@ PriceOfRegistration=Qeydiyyat qiyməti
 PriceOfRegistrationHelp=Qeydiyyatdan keçmək və ya tədbirdə iştirak etmək üçün ödənilməli qiymət
 PriceOfBooth=Bir stenddə dayanmaq üçün abunə qiyməti
 PriceOfBoothHelp=Bir stenddə dayanmaq üçün abunə qiyməti
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Konfranslar üçün ICS-i əlaqələndirin
 ConferenceOrBoothInformation=Konfrans və ya Booth məlumatı
 Attendees=İştirakçılar
@@ -127,7 +128,7 @@ PublicAttendeeSubscriptionPage = Yalnız bu tədbirə qeydiyyat üçün açıq l
 MissingOrBadSecureKey = Təhlükəsizlik açarı yanlışdır və ya yoxdur
 EvntOrgWelcomeMessage = Bu forma tədbirin yeni iştirakçısı kimi qeydiyyatdan keçməyə imkan verir
 EvntOrgDuration = Bu konfrans %s tarixində başlayır və %s tarixində bitir.
-ConferenceAttendeeFee = Tədbir üçün konfransda iştirak haqqı : '%s' %s-dan <span class='notranslate'>b0ecb2ec87f49f-a qədər davam edir >.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Tədbir üçün stend məkanı : '%s' %s-dan %s arasında baş verir
 EventType = Hadisə növü
 LabelOfBooth=Stend etiketi
diff --git a/htdocs/langs/az_AZ/exports.lang b/htdocs/langs/az_AZ/exports.lang
index ff45237b5c6..758fd218eb6 100644
--- a/htdocs/langs/az_AZ/exports.lang
+++ b/htdocs/langs/az_AZ/exports.lang
@@ -87,15 +87,15 @@ ErrorMissingMandatoryValue=<b>%s</b> sütunundakı mənbə faylında məcburi da
 TooMuchErrors=Hələ də <b>%s</b> başqa mənbə xətləri var, lakin çıxışda xəta var məhdudlaşdırılıb.
 TooMuchWarnings=Hələ də <b>%s</b> digər mənbə sətirlərində xəbərdarlıqlar var məhdudlaşdırılıb.
 EmptyLine=Boş sətir (lağ ediləcək)
-CorrectErrorBeforeRunningImport=Siz <b>bütün səhvləri düzəltməlisiniz</b> <b>class'e notranslate'></b></span> qəti idxalı icra edir.
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=Fayl <b>%s</b> nömrəsi ilə import edilib.
-YouCanUseImportIdToFindRecord=Siz <b>import_key='%s'<span class='notranslate sahəsində filtrasiya edərək verilənlər bazanızdakı bütün idxal edilmiş qeydləri tapa bilərsiniz. '></b></span>.
-NbOfLinesOK=Səhv və xəbərdarlıq olmayan sətirlərin sayı: <b>%s<span class='notranslate'></b></span.
+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=Uğurla idxal edilən sətirlərin sayı: <b>%s</b>.
 DataComeFromNoWhere=Daxil ediləcək dəyər mənbə faylında heç bir yerdən gəlir.
 DataComeFromFileFieldNb=Daxil ediləcək dəyər mənbə faylındakı <b>%s</b> sütunundan gəlir.
 DataComeFromIdFoundFromRef=Mənbə faylından gələn dəyər istifadə olunacaq əsas obyektin id-sini tapmaq üçün istifadə olunacaq (beləliklə obyekt <b>%s</b> mənbə faylından istinad verilənlər bazasında olmalıdır).
-DataComeFromIdFoundFromCodeId=Mənbə faylından gələn kodun dəyəri istifadə ediləcək əsas obyektin id-sini tapmaq üçün istifadə olunacaq (buna görə də mənbə fayldan olan kod lüğətdə <b><span sinif mövcud olmalıdır) ='notranslate'>%s</span></b>). Qeyd edək ki, id-i bilirsinizsə, kodun yerinə mənbə faylında da istifadə edə bilərsiniz. İdxal hər iki halda işləməlidir.
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=Mənbə faylından gələn məlumatlar aşağıdakı sahəyə daxil ediləcək:
 DataIDSourceIsInsertedInto=Mənbə faylındakı məlumatlardan istifadə etməklə tapılan əsas obyektin id-si aşağıdakı sahəyə daxil ediləcək:
 DataCodeIDSourceIsInsertedInto=Koddan tapılan ana xəttin id-si aşağıdakı sahəyə daxil ediləcək:
@@ -103,18 +103,18 @@ SourceRequired=Məlumat dəyəri məcburidir
 SourceExample=Mümkün məlumat dəyərinin nümunəsi
 ExampleAnyRefFoundIntoElement=<b>%s</b> elementi üçün hər hansı referans tapıldı
 ExampleAnyCodeOrIdFoundIntoDictionary=Lüğətdə hər hansı kod (və ya id) tapıldı <b>%s</b>
-CSVFormatDesc=<b>Vergüllə Ayrılmış Dəyər</b> fayl formatı (.csv).b0342fccfda19This sahələrin ayırıcı [ <span class='notranslate'>%s ] ilə ayrıldığı mətn faylı formatıdır. Ayırıcı sahə məzmununda tapılarsa, sahə dairəvi simvol ilə yuvarlaqlaşdırılır [ %s ]. Dəyirmi simvoldan qaçmaq üçün qaçış simvolu [ %s ]-dır.
+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> fayl formatı (.xls)<br> yerlidir Excel 95 formatı (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> fayl formatı (.xlsx)<br> yerlidir Excel 2007 formatı (SpreadsheetML).
-TsvFormatDesc=<b>Tabdan Ayrılmış Dəyər</b> fayl formatı (.tsv)<span class='notranslate'>b0342fccfdaspan>This is sahələrin tabulator [tab] ilə ayrıldığı mətn faylı formatı.
+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=<b>%s</b> sahəsi avtomatik əlavə edildi. Bu, oxşar sətirlərin dublikat qeyd kimi qəbul edilməsinin qarşısını alacaq (bu sahə əlavə edilməklə, bütün sətirlər öz id-lərinə sahib olacaq və fərqli olacaq).
 CsvOptions=CSV format seçimləri
 Separator=Sahə ayırıcı
 Enclosure=Sətir ayırıcı
 SpecialCode=Xüsusi kod
 ExportStringFilter=%% mətndə bir və ya bir neçə simvolu əvəz etməyə imkan verir
-ExportDateFilter=YYYY, YYYYMM, YYYAYA: bir il/ay/gün üzrə filtrlər<br>YYYY+YYYY, YYYYMM+YYYYYMM, YYYYMM+YYYYMMDG: il/ay aralığı üzrə filtrlər span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMD: bütün sonrakı illər/aylar/günlər üzrə filtrlər<br> < YYYY, Y YYYYMMG: bütün əvvəlki illər/aylar/günlər üzrə filtrlər
-ExportNumericFilter=NNNNN bir dəyər üzrə filtrləyir<br>NNNNN+NNNNN bir sıra dəyərlər üzərində filtrlər<br><span class='notranslate'>b08912a07<ed /span>> NNNNN daha yüksək dəyərlərlə filtrləyir
+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=Sətir nömrəsindən başlayaraq idxal edin
 EndAtLineNb=Sətir nömrəsində bitir
 ImportFromToLine=Limit diapazonu (From - To). Məs. başlıq sətirlərini buraxmaq.
diff --git a/htdocs/langs/az_AZ/hrm.lang b/htdocs/langs/az_AZ/hrm.lang
index 8724bb805a6..3a7704f8ddb 100644
--- a/htdocs/langs/az_AZ/hrm.lang
+++ b/htdocs/langs/az_AZ/hrm.lang
@@ -2,80 +2,96 @@
 
 
 # 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 xarici xidmətinin qarşısını almaq üçün e-poçt
+Establishments=Müəssisələr
+Establishment=Müəssisə
+NewEstablishment=Yeni müəssisə
+DeleteEstablishment=Müəssisəni silin
+ConfirmDeleteEstablishment=Bu müəssisəni silmək istədiyinizə əminsiniz?
+OpenEtablishment=Açıq müəssisə
+CloseEtablishment=Yaxın müəssisə
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Tətil - Dövlət tətilləri
+DictionaryDepartment=HRM - Təşkilat bölməsi
+DictionaryFunction=HRM - İş yerləri
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
-ListOfEmployees=List of employees
-HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
+Employees=İşçilər
+Employee=işçi
+NewEmployee=Yeni işçi
+ListOfEmployees=İşçilərin siyahısı
+HrmSetup=HRM modulunun qurulması
+SkillsManagement=Bacarıqların idarə edilməsi
+HRM_MAXRANK=Bir bacarığı sıralamaq üçün maksimum səviyyə sayı
+HRM_DEFAULT_SKILL_DESCRIPTION=Bacarıq yaradılan zaman dərəcələrin defolt təsviri
 deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-Job=Job
-Jobs=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
-Position=Position
-Positions=Positions
-PositionCard=Position card
-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
+DateEval=Qiymətləndirmə tarixi
+JobCard=İş kartı
+NewJobProfile=Yeni İş Profili
+JobProfile=İş profili
+JobsProfiles=İş profilləri
+NewSkill=Yeni Bacarıq
+SkillType=Bacarıq növü
+Skilldets=Bu bacarıq üçün dərəcələrin siyahısı
+Skilldet=Bacarıq səviyyəsi
+rank=Rütbə
+ErrNoSkillSelected=Heç bir bacarıq seçilməyib
+ErrSkillAlreadyAdded=Bu bacarıq artıq siyahıdadır
+SkillHasNoLines=Bu bacarığın heç bir xətti yoxdur
+Skill=Bacarıq
+Skills=bacarıqlar
+SkillCard=Bacarıq kartı
+EmployeeSkillsUpdated=İşçilərin bacarıqları yeniləndi (işçi kartının "Bacarıqlar" sekmesine baxın)
+Eval=Qiymətləndirmə
+Evals=Qiymətləndirmələr
+NewEval=Yeni qiymətləndirmə
+ValidateEvaluation=Qiymətləndirməni təsdiq edin
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=Qiymətləndirmə kartı
+RequiredRank=İş profili üçün tələb olunan dərəcə
+RequiredRankShort=Tələb olunan dərəcə
+PositionsWithThisProfile=Bu iş profilləri ilə vəzifələr
+EmployeeRank=Bu bacarıq üçün işçi rütbəsi
+EmployeeRankShort=İşçi rütbəsi
+EmployeePosition=İşçi mövqeyi
+EmployeePositions=İşçi mövqeləri
+EmployeesInThisPosition=Bu vəzifədə olan işçilər
+group1ToCompare=Təhlil etmək üçün istifadəçi qrupu
+group2ToCompare=Müqayisə üçün ikinci istifadəçi qrupu
+OrJobToCompare=İş profilinin bacarıq tələbləri ilə müqayisə edin
+difference=Fərq
+CompetenceAcquiredByOneOrMore=Bir və ya bir neçə istifadəçi tərəfindən əldə edilmiş, lakin ikinci müqayisəçi tərəfindən tələb olunmayan səriştə
+MaxlevelGreaterThan=İşçilərin səviyyəsi gözlənilən səviyyədən yüksəkdir
+MaxLevelEqualTo=İşçi səviyyəsi gözlənilən səviyyəyə bərabərdir
+MaxLevelLowerThan=İşçilərin səviyyəsi gözlənilən səviyyədən aşağıdır
+MaxlevelGreaterThanShort=Səviyyə gözləniləndən yüksəkdir
+MaxLevelEqualToShort=Gözlənilən səviyyəyə bərabər səviyyə
+MaxLevelLowerThanShort=Səviyyə gözləniləndən aşağıdır
+SkillNotAcquired=Bacarıq bütün istifadəçilər tərəfindən əldə edilmir və ikinci müqayisəçi tərəfindən tələb olunur
+legend=Əfsanə
+TypeSkill=Bacarıq növü
+AddSkill=İş profilinə bacarıqlar əlavə edin
+RequiredSkills=Bu iş profili üçün tələb olunan bacarıqlar
+UserRank=İstifadəçi dərəcəsi
+SkillList=Bacarıqların siyahısı
+SaveRank=Rütbəni saxla
+TypeKnowHow=Nou-hau
+TypeHowToBe=Necə olmaq
+TypeKnowledge=Bilik
+AbandonmentComment=Tərk etmə şərhi
+DateLastEval=Son qiymətləndirmə tarixi
+NoEval=Bu işçi üçün heç bir qiymətləndirmə aparılmayıb
+HowManyUserWithThisMaxNote=Bu dərəcəyə malik istifadəçilərin sayı
+HighestRank=Ən yüksək dərəcə
+SkillComparison=Bacarıqların müqayisəsi
+ActionsOnJob=Bu iş üzrə hadisələr
+VacantPosition=vakansiya
+VacantCheckboxHelper=Bu seçimin yoxlanılması doldurulmamış vəzifələri göstərəcək (vakansiya)
+SaveAddSkill = Bacarıq(lar) əlavə edildi
+SaveLevelSkill = Bacarıq(lar) səviyyəsi saxlanıldı
+DeleteSkill = Bacarıq silindi
+SkillsExtraFields=Tamamlayıcı atributlar (Bacarıqlar)
+JobsExtraFields=Tamamlayıcı atributlar (İş profili)
+EvaluationsExtraFields=Tamamlayıcı atributlar (Qiymətləndirmələr)
+NeedBusinessTravels=İşgüzar səfərlər lazımdır
+NoDescription=təsvirsiz
+TheJobProfileHasNoSkillsDefinedFixBefore=Bu işçinin qiymətləndirilən iş profilində müəyyən edilmiş bacarıq yoxdur. Zəhmət olmasa bacarıq(lar) əlavə edin, sonra silin və qiymətləndirməni yenidən başladın.
diff --git a/htdocs/langs/az_AZ/install.lang b/htdocs/langs/az_AZ/install.lang
index 989f6aa9793..edfe72833b6 100644
--- a/htdocs/langs/az_AZ/install.lang
+++ b/htdocs/langs/az_AZ/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.
+InstallEasy=Sadəcə addım-addım təlimatları izləyin.
+MiscellaneousChecks=İlkin şərtlərin yoxlanılması
+ConfFileExists=<b>%s</b> konfiqurasiya faylı mövcuddur.
+ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> konfiqurasiya faylı mövcud deyil və yaradıla bilməz!
+ConfFileCouldBeCreated=<b>%s</b> konfiqurasiya faylı yaradıla bilər.
+ConfFileIsNotWritable=<b>%s</b> konfiqurasiya faylı yazıla bilməz. İcazələri yoxlayın. İlk quraşdırma üçün veb serveriniz konfiqurasiya prosesi zamanı bu fayla yaza bilməlidir (məsələn, Unix kimi OS-də "chmod 666").
+ConfFileIsWritable=<b>%s</b> konfiqurasiya faylı yazıla bilər.
+ConfFileMustBeAFileNotADir=Konfiqurasiya faylı <b>%s</b> kataloq deyil, fayl olmalıdır.
+ConfFileReload=Parametrlərin konfiqurasiya faylından yenidən yüklənməsi.
+NoReadableConfFileSoStartInstall=<b>conf/conf.php</b> konfiqurasiya faylı mövcud deyil və ya oxunaqlı deyil. Onu işə salmağa çalışmaq üçün quraşdırma prosesini icra edəcəyik.
+PHPSupportPOSTGETOk=Bu PHP POST və GET dəyişənlərini dəstəkləyir.
+PHPSupportPOSTGETKo=Ola bilər ki, PHP quraşdırmanız POST və/və ya GET dəyişənlərini dəstəkləmir. Php.ini-də <b>variables_order</b> parametrini yoxlayın.
+PHPSupportSessions=Bu PHP seansları dəstəkləyir.
+PHPSupport=Bu PHP %s funksiyalarını dəstəkləyir.
+PHPMemoryOK=PHP maksimum sessiya yaddaşınız <b>%s</b> olaraq təyin edilib. Bu kifayət qədər olmalıdır.
 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
+Recheck=Daha ətraflı test üçün bura klikləyin
+ErrorPHPDoesNotSupportSessions=PHP quraşdırmanız sessiyaları dəstəkləmir. Bu xüsusiyyət Dolibarrın işləməsinə icazə vermək üçün tələb olunur. PHP quraşdırmanızı və sessiyalar kataloqunun icazələrini yoxlayın.
+ErrorPHPDoesNotSupport=PHP quraşdırmanız %s funksiyalarını dəstəkləmir.
+ErrorDirDoesNotExists=%s kataloqu mövcud deyil.
+ErrorGoBackAndCorrectParameters=Geri qayıdın və parametrləri yoxlayın/düzgün edin.
+ErrorWrongValueForParameter='%s' parametri üçün səhv dəyər yazmısınız.
+ErrorFailedToCreateDatabase='%s' verilənlər bazası yaratmaq alınmadı.
+ErrorFailedToConnectToDatabase='%s' verilənlər bazasına qoşulmaq alınmadı.
+ErrorDatabaseVersionTooLow=Databaza versiyası (%s) çox köhnə. %s və ya daha yüksək versiya tələb olunur.
+ErrorPHPVersionTooLow=PHP versiyası çox köhnədir. %s və ya daha yüksək versiya tələb olunur.
+ErrorPHPVersionTooHigh=PHP versiyası çox yüksəkdir. %s və ya daha aşağı versiya tələb olunur.
+ErrorConnectedButDatabaseNotFound=Serverə qoşulma uğurludur, lakin '%s' verilənlər bazası tapılmadı.
+ErrorDatabaseAlreadyExists='%s' verilənlər bazası artıq mövcuddur.
+ErrorNoMigrationFilesFoundForParameters=Seçilmiş versiyalar üçün miqrasiya faylı tapılmadı
+IfDatabaseNotExistsGoBackAndUncheckCreate=Verilənlər bazası yoxdursa, geri qayıdın və "Verilənlər bazası yarat" seçimini yoxlayın.
+IfDatabaseExistsGoBackAndCheckCreate=Əgər verilənlər bazası artıq mövcuddursa, geri qayıdın və "Verilənlər bazası yarat" seçimindən işarəni çıxarın.
+WarningBrowserTooOld=Brauzerin versiyası çox köhnədir. Brauzerinizi Firefox, Chrome və ya Opera-nın ən son versiyasına təkmilləşdirmək çox tövsiyə olunur.
+PHPVersion=PHP Versiyası
+License=Lisenziyadan istifadə
+ConfigurationFile=Konfiqurasiya faylı
+WebPagesDirectory=Veb səhifələrin saxlandığı qovluq
+DocumentsDirectory=Yüklənmiş və yaradılan sənədləri saxlamaq üçün kataloq
+URLRoot=URL kökü
+ForceHttps=Təhlükəsiz bağlantıları məcbur edin (https)
+CheckToForceHttps=Təhlükəsiz bağlantıları (https) məcbur etmək üçün bu seçimi yoxlayın.<br>Bu, veb serverin SSL sertifikatı ilə konfiqurasiya edilməsini tələb edir.
+DolibarrDatabase=Dolibarr verilənlər bazası
+DatabaseType=Verilənlər bazası növü
+DriverType=Sürücü növü
 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.
+ServerAddressDescription=Verilənlər bazası serverinin adı və ya IP ünvanı. Verilənlər bazası serveri veb serverlə eyni serverdə yerləşdirildikdə adətən 'localhost' olur.
+ServerPortDescription=Verilənlər bazası server portu. Əgər naməlumdursa, boş saxlayın.
+DatabaseServer=Verilənlər bazası serveri
+DatabaseName=Verilənlər bazasının adı
+DatabasePrefix=Verilənlər bazası cədvəli prefiksi
+DatabasePrefixDescription=Verilənlər bazası cədvəli prefiksi. Boşdursa, defolt olaraq llx_.
+AdminLogin=Dolibarr verilənlər bazası sahibi üçün istifadəçi hesabı.
+AdminPassword=Dolibarr verilənlər bazası sahibi üçün parol.
+CreateDatabase=Verilənlər bazası yaradın
+CreateUser=Dolibarr verilənlər bazasında istifadəçi hesabı yaradın və ya istifadəçi hesabı icazəsi verin
+DatabaseSuperUserAccess=Verilənlər bazası serveri - Super istifadəçi girişi
+CheckToCreateDatabase=Əgər verilənlər bazası hələ mövcud deyilsə və buna görə də yaradılmalıdırsa, qutunu işarələyin.<br>Bu halda, siz həmçinin alt hissədə super istifadəçi hesabı üçün istifadəçi adı və parolu daxil etməlisiniz. bu səhifədən.
+CheckToCreateUser=Əgər:<br>verilənlər bazası istifadəçi hesabı hələ mövcud deyilsə və buna görə yaradılmalıdırsa və ya<br>əgər istifadəçi hesabı varsa qutunu işarələyin. mövcuddur, lakin verilənlər bazası mövcud deyil və icazələr verilməlidir.<br>Bu halda, siz istifadəçi hesabı və parolu daxil etməlisiniz və <b> span>həmçinin</b> bu səhifənin altındakı super istifadəçi hesabı adı və parol. Əgər bu qutu işarələnmirsə, verilənlər bazası sahibi və parol artıq mövcud olmalıdır.
+DatabaseRootLoginDescription=Superuser hesabının adı (yeni verilənlər bazası və ya yeni istifadəçilər yaratmaq üçün), verilənlər bazası və ya onun sahibi artıq mövcud deyilsə, məcburidir.
+KeepEmptyIfNoPassword=Super istifadəçinin parolu yoxdursa, boş buraxın (tövsiyə DEYİL)
+SaveConfigurationFile=Parametrlər saxlanılır
+ServerConnection=Server bağlantısı
+DatabaseCreation=Verilənlər bazasının yaradılması
+CreateDatabaseObjects=Verilənlər bazası obyektlərinin yaradılması
+ReferenceDataLoading=İstinad məlumatlarının yüklənməsi
+TablesAndPrimaryKeysCreation=Cədvəllər və Əsas açarların yaradılması
+CreateTableAndPrimaryKey=%s cədvəli yaradın
+CreateOtherKeysForTable=%s cədvəli üçün xarici açarlar və indekslər yaradın
+OtherKeysCreation=Xarici açarların və indekslərin yaradılması
+FunctionsCreation=Funksiyaların yaradılması
+AdminAccountCreation=Administrator girişinin yaradılması
+PleaseTypePassword=Zəhmət olmasa parol daxil edin, boş parollara icazə verilmir!
+PleaseTypeALogin=Zəhmət olmasa giriş daxil edin!
+PasswordsMismatch=Parollar fərqlidir, yenidən cəhd edin!
+SetupEnd=Quraşdırmanın sonu
+SystemIsInstalled=Bu quraşdırma tamamlandı.
+SystemIsUpgraded=Dolibarr uğurla təkmilləşdirildi.
+YouNeedToPersonalizeSetup=Dolibarr-ı ehtiyaclarınıza uyğunlaşdırmaq üçün konfiqurasiya etməlisiniz (görünüş, xüsusiyyətlər, ...). Bunun üçün aşağıdakı linkə daxil olun:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator girişi '<b>%s</b>' uğurla yaradıldı.
+GoToDolibarr=Dolibarra gedin
+GoToSetupArea=Dolibarr-a gedin (quraşdırma sahəsi)
+MigrationNotFinished=Verilənlər bazası versiyası tamamilə yeni deyil: təkmilləşdirmə prosesini yenidən işə salın.
+GoToUpgradePage=Yenidən təkmilləşdirmə səhifəsinə keçin
+WithNoSlashAtTheEnd=Sonda "/" kəsişməsi olmadan
+DirectoryRecommendation=<span class="warning">VACİB</span>: Siz veb səhifələrdən kənarda olan kataloqdan istifadə etməlisiniz (ona görə də əvvəlki parametrin alt kataloqundan istifadə etməyin ).
+LoginAlreadyExists=Artıq mövcuddur
+DolibarrAdminLogin=Dolibarr admin girişi
+AdminLoginAlreadyExists=Dolibarr administrator hesabı '<b>%s</b>' artıq mövcuddur. Başqasını yaratmaq istəyirsinizsə, geri qayıdın.
+FailedToCreateAdminLogin=Dolibarr administrator hesabı yaratmaq alınmadı.
+WarningRemoveInstallDir=Xəbərdarlıq, təhlükəsizlik səbəbi ilə quraşdırma prosesi başa çatdıqdan sonra <b>install.lock</b> adlı fayl əlavə etməlisiniz. Quraşdırma alətlərinin təsadüfi/zərərli istifadəsinin qarşısını almaq üçün Dolibarr sənəd kataloqu.
+FunctionNotAvailableInThisPHP=Bu PHP-də mövcud deyil
+ChoosedMigrateScript=Miqrasiya skriptini seçin
+DataMigration=Verilənlər bazasının miqrasiyası (məlumat)
+DatabaseMigration=Verilənlər bazasının miqrasiyası (struktur + bəzi məlumatlar)
+ProcessMigrateScript=Skript emalı
+ChooseYourSetupMode=Quraşdırma rejiminizi seçin və "Başlat" düyməsini basın...
+FreshInstall=Təzə quraşdırma
+FreshInstallDesc=Bu ilk quraşdırmanızdırsa, bu rejimi istifadə edin. Əks halda, bu rejim natamam əvvəlki quraşdırmanı təmir edə bilər. Versiyanızı təkmilləşdirmək istəyirsinizsə, "Upgrade" rejimini seçin.
+Upgrade=Təkmilləşdirin
+UpgradeDesc=Köhnə Dolibarr fayllarını daha yeni versiyanın faylları ilə əvəz etmisinizsə, bu rejimi istifadə edin. Bu, verilənlər bazanızı və məlumatlarınızı təkmilləşdirəcək.
+Start=Başlamaq
+InstallNotAllowed=<b>conf.php</b> icazələri ilə quraşdırmaya icazə verilmir
+YouMustCreateWithPermission=Quraşdırma prosesi zamanı siz %s faylı yaratmalı və veb server üçün ona yazma icazələri təyin etməlisiniz.
+CorrectProblemAndReloadPage=Problemi həll edin və səhifəni yenidən yükləmək üçün F5 düyməsini basın.
+AlreadyDone=Artıq köçüb
+DatabaseVersion=Verilənlər bazası versiyası
+ServerVersion=Verilənlər bazası server versiyası
+YouMustCreateItAndAllowServerToWrite=Siz bu qovluğu yaratmalı və veb serverin ona yazmasına icazə verməlisiniz.
+DBSortingCollation=Xarakterlərin çeşidlənməsi qaydası
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Siz verilənlər bazası yaratdınız <b>%s</b>, lakin bunun üçün Dolibar lazımdır super istifadəçi ilə <b>%s</b> serverinə qoşulmaq üçün <b>%s</b> icazələri.
 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"
+BecauseConnectionFailedParametersMayBeWrong=Verilənlər bazası bağlantısı uğursuz oldu: host və ya super istifadəçi parametrləri səhv olmalıdır.
+OrphelinsPaymentsDetectedByMethod=Yetim ödənişi %s üsulu ilə aşkar edildi
+RemoveItManuallyAndPressF5ToContinue=Onu əl ilə çıxarın və davam etmək üçün F5 düyməsini basın.
+FieldRenamed=Sahənin adı dəyişdirildi
+IfLoginDoesNotExistsCheckCreateUser=İstifadəçi hələ mövcud deyilsə, "İstifadəçi yarat" seçimini yoxlamalısınız.
 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
+InstallChoiceSuggested=<b>Quraşdıran tərəfindən təklif edilən quraşdırma seçimi</b>.
+MigrateIsDoneStepByStep=Hədəflənmiş versiyada (%s) bir neçə versiyada boşluq var. Quraşdırma sihirbazı bu tamamlandıqdan sonra növbəti miqrasiya təklif etmək üçün geri qayıdacaq.
+CheckThatDatabasenameIsCorrect="<b>%s</b>" verilənlər bazası adının düzgün olduğunu yoxlayın.
+IfAlreadyExistsCheckOption=Bu ad düzgündürsə və həmin verilənlər bazası hələ mövcud deyilsə, "Verilənlər bazası yarat" seçimini yoxlamaq lazımdır.
+OpenBaseDir=PHP açıq əsaslı parametr
+YouAskToCreateDatabaseSoRootRequired="Verilənlər bazası yarat" qutusunu işarələdiniz. Bunun üçün super istifadəçinin giriş/parolunu təqdim etməlisiniz (formanın aşağısında).
+YouAskToCreateDatabaseUserSoRootRequired="Verilənlər bazası sahibi yaradın" qutusunu işarələdiniz. Bunun üçün super istifadəçinin giriş/parolunu təqdim etməlisiniz (formanın aşağısında).
+NextStepMightLastALongTime=Cari addım bir neçə dəqiqə çəkə bilər. Davam etməzdən əvvəl növbəti ekran tamamilə görünənə qədər gözləyin.
+MigrationCustomerOrderShipping=Satış sifarişlərinin saxlanması üçün göndərməni köçürün
+MigrationShippingDelivery=Göndərmə anbarını təkmilləşdirin
+MigrationShippingDelivery2=Göndərmə anbarını təkmilləşdirin 2
+MigrationFinished=Miqrasiya tamamlandı
+LastStepDesc=<strong>Son addım</strong>: Dolibarr-a qoşulmaq üçün istifadə etmək istədiyiniz giriş və parolu burada müəyyən edin. <b>Bunu itirməyin, çünki o, bütün digər/əlavə istifadəçi hesablarını idarə etmək üçün əsas hesabdır.</b>
+ActivateModule=%s modulunu aktivləşdirin
+ShowEditTechnicalParameters=Qabaqcıl parametrləri göstərmək/redaktə etmək üçün bura klikləyin (ekspert rejimi)
+WarningUpgrade=Xəbərdarlıq:\nƏvvəlcə verilənlər bazası ehtiyat nüsxəsini işlətdinizmi?\nBu çox tövsiyə olunur. Bu proses zamanı məlumat itkisi (məsələn, mysql 5.5.40/41/42/43-dəki səhvlər səbəbindən) mümkün ola bilər, ona görə də hər hansı miqrasiyaya başlamazdan əvvəl verilənlər bazanızın tam zibilini götürmək vacibdir.\n\nMiqrasiya prosesinə başlamaq üçün OK düyməsini klikləyin...
+ErrorDatabaseVersionForbiddenForMigration=Verilənlər bazası versiyanız %s-dır. Bu, miqrasiya prosesinin tələb etdiyi kimi, verilənlər bazanızda struktur dəyişiklikləri etsəniz, məlumat itkisini mümkün edən kritik bir səhvə malikdir. Bu səbəbdən, siz verilənlər bazanızı qat (yamaqlanmış) versiyaya təkmilləşdirməyincə miqrasiyaya icazə verilməyəcək (məlum səhv versiyaların siyahısı: %s)
+KeepDefaultValuesWamp=Siz DoliWamp-dan Dolibarr quraşdırma sehrbazından istifadə etdiniz, ona görə də burada təklif olunan dəyərlər artıq optimallaşdırılıb. Onları yalnız nə etdiyinizi bildiyiniz halda dəyişdirin.
+KeepDefaultValuesDeb=Siz Dolibarr quraşdırma sehrbazını Linux paketindən (Ubuntu, Debian, Fedora...) istifadə etdiniz, buna görə də burada təklif olunan dəyərlər artıq optimallaşdırılıb. Yalnız yaradılacaq verilənlər bazası sahibinin parolu daxil edilməlidir. Digər parametrləri yalnız nə etdiyinizi bildiyiniz halda dəyişdirin.
+KeepDefaultValuesMamp=Siz DoliMamp-dan Dolibarr quraşdırma sehrbazından istifadə etdiniz, ona görə də burada təklif olunan dəyərlər artıq optimallaşdırılıb. Onları yalnız nə etdiyinizi bildiyiniz halda dəyişdirin.
+KeepDefaultValuesProxmox=Siz Proxmox virtual cihazından Dolibarr quraşdırma sehrbazından istifadə etdiniz, ona görə də burada təklif olunan dəyərlər artıq optimallaşdırılıb. Onları yalnız nə etdiyinizi bildiyiniz halda dəyişdirin.
+UpgradeExternalModule=Xarici modulun xüsusi təkmilləşdirmə prosesini işə salın
+SetAtLeastOneOptionAsUrlParameter=Ən azı bir seçimi URL-də parametr kimi təyin edin. Məsələn: '...repair.php?standard=confirmed'
+NothingToDelete=Təmizləmək/silmək üçün heç nə yoxdur
+NothingToDo=Etməli bir şey yoxdur
 #########
 # 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>
+MigrationFixData=Normallaşdırılmamış məlumatlar üçün düzəliş
+MigrationOrder=Müştərinin sifarişləri üçün məlumatların köçürülməsi
+MigrationSupplierOrder=Satıcı sifarişləri üçün məlumat köçürməsi
+MigrationProposal=Kommersiya təklifləri üçün məlumat miqrasiyası
+MigrationInvoice=Müştərinin fakturaları üçün məlumat köçürməsi
+MigrationContract=Müqavilələr üçün məlumat miqrasiyası
+MigrationSuccessfullUpdate=Təkmilləşdirmə uğurlu oldu
+MigrationUpdateFailed=Uğursuz təkmilləşdirmə prosesi
+MigrationRelationshipTables=Əlaqə cədvəlləri üçün məlumat miqrasiyası (%s)
+MigrationPaymentsUpdate=Ödəniş məlumatlarının korreksiyası
+MigrationPaymentsNumberToUpdate=%s yeniləmək üçün ödəniş(lər)
+MigrationProcessPaymentUpdate=Ödənişləri yeniləyin %s
+MigrationPaymentsNothingToUpdate=Daha görüləsi iş yoxdur
+MigrationPaymentsNothingUpdatable=Artıq düzəldilə bilən ödənişlər yoxdur
+MigrationContractsUpdate=Müqavilə məlumatlarının korreksiyası
+MigrationContractsNumberToUpdate=%s yeniləmək üçün müqavilə(lər)
+MigrationContractsLineCreation=Müqavilə ref %s üçün müqavilə xətti yaradın
+MigrationContractsNothingToUpdate=Daha görüləsi iş yoxdur
+MigrationContractsFieldDontExist=fk_facture sahəsi artıq mövcud deyil. Etməli bir şey yoxdur.
+MigrationContractsEmptyDatesUpdate=Müqavilənin boş tarixinin düzəldilməsi
+MigrationContractsEmptyDatesUpdateSuccess=Müqavilənin boş tarixi korreksiyası uğurla həyata keçirildi
+MigrationContractsEmptyDatesNothingToUpdate=Düzəliş etmək üçün boş tarix yoxdur
+MigrationContractsEmptyCreationDatesNothingToUpdate=Düzəliş etmək üçün müqavilənin yaradılması tarixi yoxdur
+MigrationContractsInvalidDatesUpdate=Pis dəyər tarixi müqaviləsinin düzəldilməsi
+MigrationContractsInvalidDateFix=Düzgün müqavilə %s (Müqavilə tarixi=%s, Xidmətə başlama tarixi min=%s >)
+MigrationContractsInvalidDatesNumber=%s müqavilə dəyişdirildi
+MigrationContractsInvalidDatesNothingToUpdate=Düzəliş etmək üçün pis dəyəri olan tarix yoxdur
+MigrationContractsIncoherentCreationDateUpdate=Pis dəyər müqaviləsinin yaradılması tarixinin düzəldilməsi
+MigrationContractsIncoherentCreationDateUpdateSuccess=Pis dəyər müqaviləsinin yaradılması tarixinin korreksiyası uğurla həyata keçirilib
+MigrationContractsIncoherentCreationDateNothingToUpdate=Düzəliş etmək üçün müqavilənin yaradılması tarixi üçün pis dəyər yoxdur
+MigrationReopeningContracts=Açıq müqavilə xəta ilə bağlandı
+MigrationReopenThisContract=Müqaviləni yenidən açın %s
+MigrationReopenedContractsNumber=%s müqavilə dəyişdirildi
+MigrationReopeningContractsNothingToUpdate=Açmaq üçün qapalı müqavilə yoxdur
+MigrationBankTransfertsUpdate=Bank girişi və bank köçürməsi arasındakı əlaqələri yeniləyin
+MigrationBankTransfertsNothingToUpdate=Bütün keçidlər aktualdır
+MigrationShipmentOrderMatching=Göndərmə qəbzi yeniləməsi
+MigrationDeliveryOrderMatching=Çatdırılma qəbzinin yenilənməsi
+MigrationDeliveryDetail=Çatdırılma yeniləməsi
+MigrationStockDetail=Məhsulların ehtiyat dəyərini yeniləyin
+MigrationMenusDetail=Dinamik menyu cədvəllərini yeniləyin
+MigrationDeliveryAddress=Göndərmələrdə çatdırılma ünvanını yeniləyin
+MigrationProjectTaskActors=llx_projet_task_actors cədvəli üçün məlumat miqrasiyası
+MigrationProjectUserResp=llx_projetin fk_user_resp məlumat miqrasiya sahəsi llx_element_contact-a
+MigrationProjectTaskTime=Saniyədə sərf olunan vaxtı yeniləyin
+MigrationActioncommElement=Fəaliyyətlər haqqında məlumatları yeniləyin
+MigrationPaymentMode=Ödəniş növü üçün məlumat miqrasiyası
+MigrationCategorieAssociation=Kateqoriyaların miqrasiyası
+MigrationEvents=Tədbir sahibini tapşırıq cədvəlinə əlavə etmək üçün hadisələrin köçürülməsi
+MigrationEventsContact=Təyinat cədvəlinə hadisə kontaktını əlavə etmək üçün hadisələrin köçürülməsi
+MigrationRemiseEntity=llx_societe_remise obyekt sahəsinin dəyərini yeniləyin
+MigrationRemiseExceptEntity=llx_societe_remise_except obyekt sahəsinin dəyərini yeniləyin
+MigrationUserRightsEntity=llx_user_rights obyekt sahəsinin dəyərini yeniləyin
+MigrationUserGroupRightsEntity=llx_usergroup_rights obyekt sahəsinin dəyərini yeniləyin
+MigrationUserPhotoPath=İstifadəçilər üçün foto yollarının miqrasiyası
+MigrationFieldsSocialNetworks=İstifadəçilərin sosial şəbəkələrdə miqrasiyası (%s)
+MigrationReloadModule=Modulu yenidən yükləyin %s
+MigrationResetBlockedLog=v7 alqoritmi üçün BlockedLog modulunu sıfırlayın
+MigrationImportOrExportProfiles=İdxal və ya ixrac profillərinin miqrasiyası (%s)
+ShowNotAvailableOptions=Əlçatan olmayan variantları göstərin
+HideNotAvailableOptions=Əlçatan olmayan variantları gizlədin
+ErrorFoundDuringMigration=Xəta(lar) miqrasiya prosesi zamanı bildirildi, ona görə də növbəti addım əlçatan deyil. Səhvlərə məhəl qoymamaq üçün <a href="%s">buraya klikləyə bilərsiniz</a>, lakin xətalar həll olunana qədər proqram və ya bəzi funksiyalar düzgün işləməyə bilər. .
+YouTryInstallDisabledByDirLock=Tətbiq özünü təkmilləşdirməyə çalışdı, lakin quraşdırma/təkmilləşdirmə səhifələri təhlükəsizlik üçün deaktiv edilib (kataloqun adı .lock şəkilçisi ilə dəyişdirilib).<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
+YouTryUpgradeDisabledByMissingFileUnLock=Tətbiq özünü təkmilləşdirməyə çalışdı, lakin təkmilləşdirmə prosesinə hazırda icazə verilmir.<br>
+ClickHereToGoToApp=Tətbiqinizə getmək üçün bura klikləyin
+ClickOnLinkOrRemoveManualy=Təkmilləşdirmə davam edirsə, gözləyin. Əgər yoxsa, aşağıdakı linkə klikləyin. Həmişə eyni səhifəni görürsünüzsə, sənədlər kataloqunda install.lock faylını silməli/adını dəyişdirməlisiniz.
+ClickOnLinkOrCreateUnlockFileManualy=Təkmilləşdirmə davam edirsə, gözləyin... Yoxdursa, siz install.lock faylını silməli və ya Dolibarr sənədlər qovluğunda upgrade.unlock faylı yaratmalısınız.
+Loaded=Yükləndi
+FunctionTest=Funksiya testi
+NodoUpgradeAfterDB=Verilənlər bazasını təkmilləşdirdikdən sonra xarici modullar tərəfindən heç bir hərəkət tələb olunmur
+NodoUpgradeAfterFiles=Faylların və ya qovluqların təkmilləşdirilməsindən sonra xarici modullar tərəfindən heç bir hərəkət tələb olunmur
+MigrationContractLineRank=Rankdan istifadə etmək üçün Müqavilə Xəttini köçürün (və Yenidən Sifarişi aktivləşdirin)
diff --git a/htdocs/langs/az_AZ/ldap.lang b/htdocs/langs/az_AZ/ldap.lang
index 8b6f0864215..b82818f1e58 100644
--- a/htdocs/langs/az_AZ/ldap.lang
+++ b/htdocs/langs/az_AZ/ldap.lang
@@ -1,27 +1,33 @@
 # 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
+UserMustChangePassNextLogon=İstifadəçi %s domenində parolu dəyişməlidir
+LDAPInformationsForThisContact=Bu əlaqə üçün LDAP verilənlər bazasında məlumat
+LDAPInformationsForThisUser=Bu istifadəçi üçün LDAP verilənlər bazasındakı məlumat
+LDAPInformationsForThisGroup=Bu qrup üçün LDAP verilənlər bazasında məlumat
+LDAPInformationsForThisMember=Bu üzv üçün LDAP verilənlər bazasında məlumat
+LDAPInformationsForThisMemberType=Bu üzv növü üçün LDAP verilənlər bazasındakı məlumat
+LDAPAttributes=LDAP atributları
+LDAPCard=LDAP kartı
+LDAPRecordNotFound=LDAP verilənlər bazasında qeyd tapılmadı
+LDAPUsers=LDAP verilənlər bazasındakı istifadəçilər
+LDAPFieldStatus=Vəziyyət
+LDAPFieldFirstSubscriptionDate=İlk abunə tarixi
+LDAPFieldFirstSubscriptionAmount=İlk abunə məbləği
+LDAPFieldLastSubscriptionDate=Ən son abunə tarixi
+LDAPFieldLastSubscriptionAmount=Ən son abunə məbləği
 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
+LDAPFieldSkypeExample=Misal: skypeName
+UserSynchronized=İstifadəçi sinxronizasiya edildi
+GroupSynchronized=Qrup sinxronlaşdırıldı
+MemberSynchronized=Üzv sinxronlaşdırıldı
+MemberTypeSynchronized=Sinxronlaşdırılmış üzv növü
+ContactSynchronized=Əlaqə sinxronlaşdırıldı
+ForceSynchronize=Dolibarr -> LDAP-ı sinxronlaşdırmağa məcbur edin
+ErrorFailedToReadLDAP=LDAP verilənlər bazasını oxumaq alınmadı. LDAP modulunun qurulmasını və verilənlər bazası əlçatanlığını yoxlayın.
+PasswordOfUserInLDAP=LDAP-da istifadəçi parolu
+LDAPPasswordHashType=Parol hash növü
+LDAPPasswordHashTypeExample=Serverdə istifadə edilən parol hash növü
+SupportedForLDAPExportScriptOnly=Yalnız ldap ixrac skripti tərəfindən dəstəklənir
+SupportedForLDAPImportScriptOnly=Yalnız ldap idxal skripti tərəfindən dəstəklənir
+LDAPUserAccountControl = userAccountControl yaradılması (aktiv kataloq)
+LDAPUserAccountControlExample = 512 Normal Hesab / 546 Normal Hesab + Passwd Yox + Disabled (bax: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
index 451663ebb4f..3dc0adcc2da 100644
--- a/htdocs/langs/az_AZ/mails.lang
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -139,7 +139,7 @@ AddNewNotification=Yeni avtomatik e-poçt bildirişinə abunə olun (hədəf/tə
 ListOfActiveNotifications=Avtomatik e-poçt bildirişi üçün bütün aktiv abunəliklərin (hədəflər/tədbirlər) siyahısı
 ListOfNotificationsDone=Göndərilən bütün avtomatik e-poçt bildirişlərinin siyahısı
 MailSendSetupIs=E-poçt göndərmə konfiqurasiyası '%s' üçün quraşdırılıb. Bu rejim kütləvi e-poçt göndərmək üçün istifadə edilə bilməz.
-MailSendSetupIs2=<span class= parametrini dəyişmək üçün əvvəlcə admin hesabı ilə %sAna səhifə - Quraşdırma - E-poçtlar%s menyusuna daxil olmalısınız. 'notranslate'><strong></span>'%s'</strong> rejimindən istifadə etmək üçün '<spantec249'>b </span>'. Bu rejimlə siz İnternet Xidmət Provayderiniz tərəfindən təmin edilən SMTP serverinin quraşdırılmasına daxil ola və Kütləvi e-poçt göndərmə funksiyasından istifadə edə bilərsiniz.
+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=SMTP serverinizi necə quraşdırmaq barədə hər hansı sualınız varsa, %s ünvanına müraciət edə bilərsiniz.
 YouCanAlsoUseSupervisorKeyword=Siz həmçinin istifadəçinin nəzarətçisinə e-poçt göndərilməsi üçün <strong>__SUPERVISOREMAIL__</strong> açar sözünü əlavə edə bilərsiniz (yalnız e-poçt olduqda işləyir) bu nəzarətçi üçün müəyyən edilmişdir)
 NbOfTargetedContacts=Hədəflənmiş əlaqə e-poçtlarının cari sayı
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=İdxal edilmiş fayl <strong>email;name;firstname;oth
 UseFormatInputEmailToTarget=<strong>email;name;firstname;other</strong> formatlı sətir daxil edin
 MailAdvTargetRecipients=Qəbul edənlər (qabaqcıl seçim)
 AdvTgtTitle=Üçüncü tərəfləri və ya hədəflənəcək kontaktları/ünvanları əvvəlcədən seçmək üçün daxiletmə sahələrini doldurun
-AdvTgtSearchTextHelp=Joker simvol kimi %% istifadə edin. Məsələn, <b>jean, joe, jim</b> kimi bütün elementləri tapmaq üçün  daxil edə bilərsiniz. <b>j%%</b>, siz də istifadə edə bilərsiniz ; dəyər üçün ayırıcı kimi və istifadə edin! bu dəyər istisna olmaqla. Məsələn <b>jean;joe;jim%%;!jimo;!jimab07e631701f span><span class='notranslate'></b> bütün jean, joe-ni hədəf alacaq, jim ilə başlayacaq, lakin jimo ilə deyil, jima ilə başlayan hər şey deyil
+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=int və ya float dəyərini seçmək üçün intervaldan istifadə edin
 AdvTgtMinVal=Minimum dəyər
 AdvTgtMaxVal=Maksimum dəyər
@@ -182,7 +182,7 @@ IsAnAnswer=İlkin e-poçtun cavabıdır
 RecordCreatedByEmailCollector=%s e-poçtundan %s E-poçt Kollektoru tərəfindən yaradılmış qeyd
 DefaultBlacklistMailingStatus=Yeni kontakt yaratarkən '%s' sahəsi üçün defolt dəyər
 DefaultStatusEmptyMandatory=Boş, lakin məcburidir
-WarningLimitSendByDay=XƏBƏRDARLIQ: Nümunənizin quraşdırması və ya müqaviləsi gündə e-məktubların sayını <b>%s<span class='notranslate' ilə məhdudlaşdırır. ></b></span>. Daha çox göndərməyə cəhd nümunənizin yavaşlamasına və ya dayandırılmasına səbəb ola bilər. Daha yüksək kvotaya ehtiyacınız olarsa, dəstəyinizlə əlaqə saxlayın.
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=E-poçtu göndərmək üçün daha alıcı yoxdur
 EmailOptedOut=E-poçt sahibi daha bu e-poçt ilə onunla əlaqə saxlamamağı xahiş etdi
 EvenUnsubscribe=İmtina e-poçtlarını daxil edin
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index fcfa356511c..c60b96bbfba 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -18,8 +18,8 @@ FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=MM/dd/yy
-FormatDateShortJQueryInput=MM/dd/yy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
@@ -68,7 +68,7 @@ ErrorNoRequestInError=Səhvdə sorğu yoxdur
 ErrorServiceUnavailableTryLater=Xidmət hazırda mövcud deyil. Biraz sonra yenidən cəhd edin.
 ErrorDuplicateField=Unikal sahədə dublikat dəyər
 ErrorSomeErrorWereFoundRollbackIsDone=Bəzi səhvlər tapıldı. Dəyişikliklər geri qaytarıldı.
-ErrorConfigParameterNotDefined=<b>%s</b> parametri <Dolibarr konfiqurasiya faylında müəyyən edilməyib class='notranslate'><b></span>conf.php</b>.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarr verilənlər bazasında <b>%s</b> istifadəçisini tapmaq alınmadı.
 ErrorNoVATRateDefinedForSellerCountry=Xəta, '%s' ölkəsi üçün ƏDV dərəcələri müəyyən edilməyib.
 ErrorNoSocialContributionForSellerCountry=Xəta, '%s' ölkəsi üçün sosial/fiskal vergi növü müəyyən edilməyib.
@@ -103,7 +103,7 @@ RecordDeleted=Qeyd silindi
 RecordGenerated=Rekord yaradıldı
 LevelOfFeature=Xüsusiyyətlərin səviyyəsi
 NotDefined=Müəyyən edilməyib
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr identifikasiyası rejimi <b>%s</b> konfiqurasiya faylında ayarlanıb class='notranslate'><b></span>conf.php</b>.<br>Bu o deməkdir ki, parol verilənlər bazası üçün xaricidir. Dolibarr, buna görə də bu sahəni dəyişdirməyin heç bir təsiri olmaya bilər.
+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=Sistem administratoru
 AdministratorDesc=Sistem administratoru (istifadəçini, icazələri idarə edə bilər, həm də sistem quraşdırması və modulların konfiqurasiyasını idarə edə bilər)
 Undefined=Müəyyən edilməmiş
@@ -131,7 +131,7 @@ TechnicalID=Texniki ID
 LineID=Xətt ID
 NotePublic=Qeyd (ictimai)
 NotePrivate=Qeyd (şəxsi)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr vahid qiymətlərinin dəqiqliyini <b>%s<span class='notranslate'>b09a4b739f17f80 ilə məhdudlaşdırmaq üçün qurulub. .
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=Test
 ToFilter=Filtr
 NoFilter=Filtrsiz
@@ -172,7 +172,7 @@ Close=Yaxın
 CloseAs=Vəziyyəti təyin edin
 CloseBox=Vidceti idarə panelinizdən silin
 Confirm=Təsdiq edin
-ConfirmSendCardByMail=Siz həqiqətən bu kartın məzmununu poçtla <b>%s<span class='notranslate'></b><a göndərmək istəyirsiniz? /span>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=Sil
 Remove=Sil
 Resiliate=Bitirmək
@@ -267,7 +267,7 @@ Numero=Nömrə
 Limit=Limit
 Limits=Limitlər
 Logout=Çıxış
-NoLogoutProcessWithAuthMode=Doğrulama rejimi ilə tətbiqi ayırma funksiyası yoxdur <b>%s<span class='notranslate'>b09a4b739f17f80z
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
 Connection=Daxil ol
 Setup=Qurmaq
 Alert=Xəbərdarlıq
@@ -420,6 +420,8 @@ TotalTTCShort=Cəmi (vergi daxil olmaqla)
 TotalHT=Cəmi (vergi istisna olmaqla)
 TotalHTforthispage=Bu səhifə üçün cəmi (vergi istisna olmaqla).
 Totalforthispage=Bu səhifə üçün cəmi
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Cəmi (vergi daxil olmaqla)
 TotalTTCToYourCredit=Kreditinizə cəmi (vergi daxil olmaqla).
 TotalVAT=Ümumi vergi
@@ -502,7 +504,7 @@ Completed=Tamamlandı
 Running=Davam edir
 RequestAlreadyDone=Sorğu artıq qeydə alınıb
 Filter=Filtr
-FilterOnInto=Axtarış meyarları '<strong>%s</strong>=' sahələrində notranslate'>%s</span>
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=Filtri çıxarın
 ChartGenerated=Qrafik yaradıldı
 ChartNotGenerated=Diaqram yaradılmadı
@@ -647,6 +649,7 @@ ReportName=Hesabatın adı
 ReportPeriod=Hesabat dövrü
 ReportDescription=Təsvir
 Report=Hesabat
+Reports=Reports
 Keyword=Açar söz
 Origin=Mənşə
 Legend=Əfsanə
@@ -757,7 +760,7 @@ MenuMembers=Üzvlər
 MenuAgendaGoogle=Google gündəmi
 MenuTaxesAndSpecialExpenses=Vergilər | Xüsusi xərclər
 ThisLimitIsDefinedInSetup=Dolibarr limiti (Menyu ev quraşdırma-security): %s Kb, PHP limiti: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limiti (Menyu %s): %s Kb, PHP limiti (Param b0ecb2ec807f49 >): <span class='notranslate'>%s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Heç bir sənəd yüklənməyib
 CurrentUserLanguage=Cari dil
 CurrentTheme=Cari mövzu
@@ -963,6 +966,7 @@ AutomaticallyCalculated=Avtomatik hesablanır
 TitleSetToDraft=Qaralamaya qayıdın
 ConfirmSetToDraft=Qaralama statusuna qayıtmaq istədiyinizə əminsiniz?
 ImportId=Import id
+Event=Event
 Events=Hadisələr
 EMailTemplates=E-poçt şablonları
 FileNotShared=Fayl xarici ictimaiyyətə paylaşılmadı
@@ -1048,7 +1052,7 @@ Select2NotFound=Heç bir nəticə tapılmadı
 Select2Enter=Daxil edin
 Select2MoreCharacter=və ya daha çox xarakter
 Select2MoreCharacters=və ya daha çox simvol
-Select2MoreCharactersMore=<strong>Axtarış sintaksisi:</strong><br><span'notranslate='> <kbd></span><strong> |</strong>b0860dez5034 notranslate'><kbd> OR</kbd> (a|b)<br><span class='notranslate'06d<span class='notranslate'07b /span><strong>*</strong></kbd><kbd> İstənilən simvol</kbd> (a*b)<br>b06010d span><span class='notranslate'><strong>^</strong></kbd><span class='notranslate <kbd></span> </kbd> (^ab)<br>b03aec02>b03aec02a ilə başlayın <span class='notranslate'><strong>$</strong></kbd><span class='notranslaad'>b030102d /span> </kbd> (ab$)<br> ilə bitir
+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=Daha çox nəticə yüklənir...
 Select2SearchInProgress=Axtarış davam edir...
 SearchIntoThirdparties=Üçüncü tərəflər
@@ -1095,7 +1099,7 @@ KeyboardShortcut=Klaviatura qısa yolu
 AssignedTo=təyin edilmişdir
 Deletedraft=Qaralamanı silin
 ConfirmMassDraftDeletion=Kütləvi silmə təsdiqi layihəsi
-FileSharedViaALink=Public file shared via link
+FileSharedViaALink=Ümumi fayl keçid vasitəsilə paylaşıldı
 SelectAThirdPartyFirst=Əvvəlcə üçüncü tərəf seçin...
 YouAreCurrentlyInSandboxMode=Siz hazırda %s "sandbox" rejimindəsiniz
 Inventory=İnventar
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=İstifadəçiləri %s seçilmiş qeyd(lər)ə təyin e
 ConfirmSetSupervisorQuestion=Seçilmiş qeyd(lər)ə %s nəzarətçi təyin etmək istədiyinizə əminsiniz?
 ConfirmUpdatePriceQuestion=%s seçilmiş qeyd(lər)in qiymətini yeniləmək istədiyinizə əminsiniz?
 CategTypeNotFound=Qeydlərin növü üçün etiket növü tapılmadı
-Rate=Qiymətləndirmə
 SupervisorNotFound=Nəzarətçi tapılmadı
 CopiedToClipboard=Buferə kopyalandı
 InformationOnLinkToContract=Bu məbləğ yalnız müqavilənin bütün sətirlərinin cəmidir. Heç bir zaman anlayışı nəzərə alınmır.
@@ -1213,6 +1216,7 @@ CanceledHidden=Ləğv edilib gizlədilib
 CanceledShown=Ləğv göstərildi
 Terminate=Bitirmək
 Terminated=Xitam verildi
+Position=Position
 AddLineOnPosition=Mövqeyinə sətir əlavə edin (boşdursa sonunda)
 ConfirmAllocateCommercial=Satış nümayəndəsinin təsdiqini təyin edin
 ConfirmAllocateCommercialQuestion=%s seçilmiş qeyd(lər)i təyin etmək istədiyinizə əminsiniz?
@@ -1230,6 +1234,7 @@ ExternalUser=Xarici istifadəçi
 NoSpecificContactAddress=Konkret əlaqə və ya ünvan yoxdur
 NoSpecificContactAddressBis=Bu tab cari obyekt üçün xüsusi kontaktları və ya ünvanları məcbur etməyə həsr olunub. Yalnız üçüncü şəxs haqqında məlumat kifayət etmədikdə və ya dəqiq olmadıqda obyekt üçün bir və ya bir neçə xüsusi əlaqə və ya ünvan müəyyən etmək istəyirsinizsə, ondan istifadə edin.
 HideOnVCard=%s gizlədin
+ShowOnVCard=Show %s
 AddToContacts=Əlaqələrimə ünvan əlavə edin
 LastAccess=Son giriş
 UploadAnImageToSeeAPhotoHere=Fotoya burada baxmaq üçün %s nişanından şəkil yükləyin
@@ -1259,4 +1264,7 @@ AmountSalary=Əmək haqqı məbləği
 InvoiceSubtype=Faktura alt növü
 ConfirmMassReverse=Toplu tərs təsdiqləmə
 ConfirmMassReverseQuestion=%s seçilmiş qeydləri geri qaytarmaq istədiyinizə əminsiniz?
-
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index 4eb020dc9d4..2a698e3ec95 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -91,10 +91,10 @@ ListOfMenusEntries=Menyu girişlərinin siyahısı
 ListOfDictionariesEntries=Lüğətlərə daxil olanların siyahısı
 ListOfPermissionsDefined=Müəyyən edilmiş icazələrin siyahısı
 SeeExamples=Burada nümunələrə baxın
-EnabledDesc=Bu sahənin aktiv olması şərt.<br><br>Nümunələr:<br>1<span>1 span class='notranslate'><br></span>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Sahə görünürmü? (Nümunələr: 0=Heç vaxt görünmür, 1=Siyahıda görünür və formalar yaradın/yeniləyin/baxın, 2=Yalnız siyahıda görünür, 3=Yalnız forma yaratdıqda/yenilədikdə/görünürdə görünür (siyahılarda deyil), 4=Siyahılarda görünür və yalnız formanı yeniləmək/baxmaq (yaratmaq deyil), 5=Yalnız siyahıda görünür və formaya baxmaq (yaratmaq deyil, yeniləmək deyil).<br><br> Mənfi dəyərdən istifadə o deməkdir ki, sahə standart olaraq siyahıda göstərilmir, lakin baxmaq üçün seçilə bilər).
 ItCanBeAnExpression=ifadə ola bilər. Nümunə:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->HasRight('bayram', 'bayrami_müəyyən et')?1:5
-DisplayOnPdfDesc=Bu sahəni uyğun PDF sənədlərində göstərin, siz "Mövqe" sahəsi ilə mövqeyi idarə edə bilərsiniz.<br><strong>Sənəd üçün:</strong><br>0 = göstərilmir <br>1 = display<spante class='translate ><br></span>2 = yalnız boş deyilsə göstərin<br><br>b09078 span>Sənəd xətləri üçün :<span class='notranslate'></strong><br>0 = göstərilmir <br> = sütunda göstərilir<br>3 = təsvirdən sonra sətir təsviri sütununda göstərilir<br>4 = təsvirdən sonra təsvir sütununda göstərilir yalnız boş olmasa
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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 üzərində
 IsAMeasureDesc=Cəmi siyahıya daxil etmək üçün sahənin dəyəri toplana bilərmi? (Nümunələr: 1 və ya 0)
 SearchAllDesc=Sahə sürətli axtarış alətindən axtarış etmək üçün istifadə olunur? (Nümunələr: 1 və ya 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=Modulunuzdan kənar biznes hadisəsi (digər modullar tərəfind
 SeeIDsInUse=Quraşdırmanızda istifadə edilən ID-lərə baxın
 SeeReservedIDsRangeHere=Qorunan ID-lər sırasına baxın
 ToolkitForDevelopers=Dolibarr tərtibatçıları üçün alətlər dəsti
-TryToUseTheModuleBuilder=SQL və PHP bilikləriniz varsa, doğma modul qurucusu sehrbazından istifadə edə bilərsiniz.<br>Modulu aktivləşdirin <strong>%s</strong> və <span class="fa fa-bug"><spante'notranslate'notranslate klikləməklə sehrbazdan istifadə edin ></span></span> yuxarı sağ menyuda.<br>Xəbərdarlıq: Bu qabaqcıl tərtibatçı funksiyasıdır, <b>edin. span class='notranslate'></b></span> istehsal saytınızda sınaqdan keçirin!
+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=Üst sağ menyuda <span class="fa fa-bug"></span>-a baxın
 AddLanguageFile=Dil faylı əlavə edin
 YouCanUseTranslationKey=Burada dil faylında olan tərcümə açarı olan açardan istifadə edə bilərsiniz ("Dillər" sekmesine baxın)
@@ -148,7 +148,7 @@ CSSListClass=Siyahı üçün css
 NotEditable=Redaktə edilə bilməz
 ForeignKey=Xarici Açar
 ForeignKeyDesc=Bu sahənin dəyərinin başqa bir cədvəldə mövcud olmasına zəmanət verilməlidir. Buraya dəyərə uyğun sintaksisi daxil edin: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Nümunə:<br>varchar(99)<br>e-poçt<br>telefon ='notranslate'><br></span>ip<br>url<br>parol<span class='notranslate419b>b span>double(24,8)<br>real<br>mətn<br> <span class='notranslate'><br>date<br>datetime<br>zaman damgası<spante class='no <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]cc2fdaf03<b01 /span><span class='notranslate'><br>'1' o deməkdir ki, biz qeyd yaratmaq üçün kombinasiyadan sonra + düyməsi əlavə edirik<br>'filtr' Universal Filtr sintaksisi şərti, misal: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (obyekt:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Bu sahənin/atributun növüdür.
 AsciiToHtmlConverter=Ascii-dən HTML-ə çevirici
 AsciiToPdfConverter=Ascii-dən PDF-ə çevirici
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Kodu deskriptora əlavə etmək alınmadı. Faylda
 DictionariesCreated=Lüğət <b>%s</b> uğurla yaradıldı
 DictionaryDeleted=Lüğət <b>%s</b> uğurla silindi
 PropertyModuleUpdated=<b>%s</b> mülkiyyəti uğurla yeniləndi
-InfoForApiFile=* İlk dəfə fayl yaratdığınız zaman bütün üsullar hər obyekt üçün <strong> yaradılacaq.</strong><br>* <strong>sil</strong> üzərinə kliklədiyiniz zaman, sadəcə olaraq <span sinfi üçün bütün üsulları silirsiniz. ='notranslate'><strong></span>seçilmiş obyekt</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Modul quraşdırma səhifəsi
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Kütləvi e-poçt göndərmə modulu üçün yeni e-poçt hədəf seçicilərini təmin etmək üçün burada sinif fayllarını yarada və redaktə edə bilərsiniz
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
index 74bed0d9186..f7fd1aa6729 100644
--- a/htdocs/langs/az_AZ/mrp.lang
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -1,109 +1,138 @@
-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 manufacturing or the disassembly
-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
+Mrp=İstehsal Sifarişləri
+MOs=İstehsal sifarişləri
+ManufacturingOrder=İstehsal Sifarişi
+MRPDescription=İstehsal və İstehsal Sifarişlərini (MO) idarə etmək üçün modul.
+MRPArea=MRP sahəsi
+MrpSetupPage=MRP modulunun qurulması
+MenuBOM=Material sənədləri
+LatestBOMModified=Ən son %s Dəyişdirilmiş material sənədləri
+LatestMOModified=Ən son %s İstehsal Sifarişləri dəyişdirildi
+Bom=Material sənədləri
+BillOfMaterials=Materiallar siyahısı
+BillOfMaterialsLines=Materiallar siyahısı xətləri
+BOMsSetup=BOM modulunun qurulması
+ListOfBOMs=Material sənədləri - BOM
+ListOfManufacturingOrders=İstehsal Sifarişləri
+NewBOM=Yeni materiallar siyahısı
+ProductBOMHelp=Bu BOM ilə yaradılacaq (və ya söküləcək) məhsul.<br>Qeyd: 'Məhsulun təbiəti' = 'Xammal' xüsusiyyətinə malik məhsullar bu siyahıda görünmür.
+BOMsNumberingModules=BOM nömrələmə şablonları
+BOMsModelModule=BOM sənəd şablonları
+MOsNumberingModules=MO nömrələmə şablonları
+MOsModelModule=MO sənəd şablonları
+FreeLegalTextOnBOMs=BOM sənədi üzrə pulsuz mətn
+WatermarkOnDraftBOMs=BOM layihəsində su nişanı
+FreeLegalTextOnMOs=MO sənədi pulsuz mətn
+WatermarkOnDraftMOs=MO layihəsində su nişanı
+ConfirmCloneBillOfMaterials=%s materiallarını klonlaşdırmaq istədiyinizə əminsiniz?
+ConfirmCloneMo=%s İstehsal Sifarişini klonlaşdırmaq istədiyinizə əminsiniz?
+ManufacturingEfficiency=İstehsal səmərəliliyi
+ConsumptionEfficiency=İstehlak səmərəliliyi
+Consumption=İstehlak
+ValueOfMeansLoss=0,95 dəyəri istehsal və ya sökülmə zamanı orta hesabla 5%% itki deməkdir
+ValueOfMeansLossForProductProduced=0,95 dəyəri istehsal olunan məhsulun orta hesabla 5%% itkisi deməkdir
+DeleteBillOfMaterials=Materiallar Hesabını Sil
+CancelMo=İstehsal sifarişini ləğv edin
+MoCancelConsumedAndProducedLines=İstehlak olunan və istehsal olunan bütün xətləri də ləğv edin (sətirləri və ehtiyat hissələrini silin)
+ConfirmCancelMo=Bu İstehsal Sifarişini ləğv etmək istədiyinizə əminsiniz?
+DeleteMo=İstehsal sifarişini silin
+ConfirmDeleteBillOfMaterials=Bu Material Sənədini silmək istədiyinizə əminsiniz?
+ConfirmDeleteMo=Bu İstehsal Sifarişini silmək istədiyinizə əminsiniz?
+DeleteMoChild = Bu MO ilə əlaqəli uşaq MO-ları silin %s
+MoChildsDeleted = Bütün uşaq MO-lar silindi
+MenuMRP=İstehsal Sifarişləri
+NewMO=Yeni İstehsal Sifarişi
+QtyToProduce=İstehsal ediləcək miqdar
+DateStartPlannedMo=Planlaşdırılan başlanğıc tarixi
+DateEndPlannedMo=Planlaşdırılan bitmə tarixi
+KeepEmptyForAsap=Boş 'mümkün qədər tez' deməkdir
+EstimatedDuration=Təxmini müddət
+EstimatedDurationDesc=Bu BOM-dan istifadə edərək bu məhsulun istehsalı (və ya sökülməsi) üçün təxmini müddət
 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
+ConfirmCloseBom=Bu BOM-u ləğv etmək istədiyinizə əminsiniz (daha yeni İstehsal Sifarişləri yaratmaq üçün ondan istifadə edə bilməyəcəksiniz)?
+ConfirmReopenBom=Bu BOM-u yenidən açmaq istədiyinizə əminsiniz (onu yeni İstehsal Sifarişləri yaratmaq üçün istifadə edə biləcəksiniz)
+StatusMOProduced=İstehsal edilmişdir
+QtyFrozen=Dondurulmuş Miqdar
+QuantityFrozen=Dondurulmuş Miqdarı
+QuantityConsumedInvariable=Bu bayraq qoyulduqda, istehlak edilən kəmiyyət həmişə müəyyən edilmiş dəyərdir və istehsal edilən kəmiyyətə nisbi deyil.
+DisableStockChange=Səhm dəyişikliyi deaktiv edilib
+DisableStockChangeHelp=Bu bayraq qoyulduqda, istehlak edilən miqdar nə olursa olsun, bu məhsulda heç bir ehtiyat dəyişikliyi yoxdur
+BomAndBomLines=Material vərəqələri və xətlər
+BOMLine=BOM xətti
+WarehouseForProduction=İstehsal üçün anbar
+CreateMO=MO yaradın
+ToConsume=İstehlak etmək
+ToProduce=İstehsal
+ToObtain=əldə etmək
+QtyAlreadyConsumed=Miqdar artıq istehlak edilmişdir
+QtyAlreadyProduced=Miqdar artıq istehsal olunub
+QtyAlreadyConsumedShort=İstehlak olunan miqdar
+QtyAlreadyProducedShort=Miqdar istehsal olunur
+QtyRequiredIfNoLoss=İtki olmadıqda BOM-da müəyyən edilmiş kəmiyyəti istehsal etmək üçün tələb olunan miqdar (istehsal səmərəliliyi 100%% olarsa)
+ConsumeOrProduce=İstehlak et və ya istehsal et
+ConsumeAndProduceAll=Hamısını istehlak et və istehsal et
+Manufactured=İstehsal edilmişdir
+TheProductXIsAlreadyTheProductToProduce=Əlavə ediləcək məhsul artıq istehsal olunacaq məhsuldur.
+ForAQuantityOf=%s istehsal ediləcək miqdar üçün
+ForAQuantityToConsumeOf=%s söküləcək miqdar üçün
+ConfirmValidateMo=Bu İstehsal Sifarişini doğrulamaq istədiyinizə əminsiniz?
+ConfirmProductionDesc='%s' üzərinə klikləməklə siz təyin edilmiş kəmiyyətlər üçün istehlakı və/yaxud istehsalı təsdiq edəcəksiniz. Bu, həmçinin fondu yeniləyəcək və səhmlərin hərəkətini qeyd edəcək.
+ProductionForRef=%s istehsalı
+CancelProductionForRef=%s məhsulu üçün məhsul ehtiyatının azalmasının ləğvi
+TooltipDeleteAndRevertStockMovement=Xətti silin və fond hərəkətini bərpa edin
+AutoCloseMO=İstehlak ediləcək və istehsal ediləcək miqdarlara çatdıqda, İstehsal Sifarişini avtomatik bağlayın
+NoStockChangeOnServices=Xidmətlərdə ehtiyat dəyişikliyi yoxdur
+ProductQtyToConsumeByMO=Açıq MO ilə hələ də istehlak ediləcək məhsulun miqdarı
+ProductQtyToProduceByMO=Hələ açıq MO ilə istehsal ediləcək məhsulun miqdarı
+AddNewConsumeLines=İstehlak etmək üçün yeni sətir əlavə edin
+AddNewProduceLines=İstehsal etmək üçün yeni xətt əlavə edin
+ProductsToConsume=İstehlak ediləcək məhsullar
+ProductsToProduce=İstehsal ediləcək məhsullar
+UnitCost=Vahid dəyəri
+TotalCost=Ümumi xərc
+BOMTotalCost=İstehlak ediləcək hər bir kəmiyyətin və məhsulun maya dəyərinə əsaslanan bu BOM-u istehsal etmək üçün xərclər (müəyyən olunarsa Xərc qiymətindən, müəyyən edilərsə, Orta Çəkili Qiymətdən istifadə edin, əks halda Ən Yaxşı alış qiymətini istifadə edin)
+BOMTotalCostService=Əgər “İş stansiyası” modulu işə salınıbsa və xətdə defolt olaraq iş stansiyası müəyyən edilibsə, o zaman hesablama “kəmiyyət (saata çevrilmiş) x iş stansiyası ahr”, əks halda “kəmiyyət x xidmətin dəyəri qiyməti”dir.
+GoOnTabProductionToProduceFirst=İstehsal Sifarişini bağlamaq üçün əvvəlcə istehsala başlamalısınız ('%s' nişanına baxın). Amma Ləğv edə bilərsiniz.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Kitdən BOM və ya MO-da istifadə edilə bilməz
+Workstation=İş stansiyası
+Workstations=İş stansiyaları
+WorkstationsDescription=İş stansiyalarının idarə edilməsi
+WorkstationSetup = İş stansiyalarının qurulması
+WorkstationSetupPage = İş stansiyalarının quraşdırma səhifəsi
+WorkstationList=İş stansiyalarının siyahısı
+WorkstationCreate=Yeni iş stansiyası əlavə edin
+ConfirmEnableWorkstation=<b>%s</b> iş stansiyasını aktivləşdirmək istədiyinizə əminsiniz?
+EnableAWorkstation=İş stansiyasını aktivləşdirin
+ConfirmDisableWorkstation=<b>%s</b> iş stansiyasını deaktiv etmək istədiyinizə əminsiniz?
+DisableAWorkstation=İş stansiyasını söndürün
+DeleteWorkstation=Sil
+NbOperatorsRequired=Tələb olunan operatorların sayı
+THMOperatorEstimated=Təxmini operator THM
+THMMachineEstimated=Təxmini maşın THM
+WorkstationType=İş stansiyasının növü
+DefaultWorkstation=Defolt iş stansiyası
+Human=İnsan
+Machine=Maşın
+HumanMachine=İnsan / Maşın
+WorkstationArea=İş yeri sahəsi
+Machines=Maşınlar
+THMEstimatedHelp=Bu dərəcə obyektin proqnoz dəyərini müəyyən etməyə imkan verir
+BOM=Materiallar siyahısı
+CollapseBOMHelp=Siz BOM modulunun konfiqurasiyasında nomenklatura təfərrüatlarının standart ekranını təyin edə bilərsiniz
+MOAndLines=İstehsal sifarişləri və xətləri
+MoChildGenerate=Uşaq Mo yaradın
+ParentMo=MO Valideyn
+MOChild=MO Uşaq
+BomCantAddChildBom=%s nomenklaturası artıq %s nomenklaturasına aparan ağacda mövcuddur.
+BOMNetNeeds = BOM Net Ehtiyacları
+BOMProductsList=BOM məhsulları
+BOMServicesList=BOM xidmətləri
+Manufacturing=İstehsalat
+Disassemble=Sökmək
+ProducedBy=tərəfindən istehsal edilmişdir
+QtyTot=Cəmi Miqdar
+
+QtyCantBeSplit= Kəmiyyət bölünə bilməz
+NoRemainQtyToDispatch=Bölünəcək kəmiyyət qalmayıb
+
+THMOperatorEstimatedHelp=Operatorun bir saat üçün təxmini dəyəri. Bu iş stansiyasından istifadə edərək BOM-un dəyərini qiymətləndirmək üçün istifadə olunacaq.
+THMMachineEstimatedHelp=Maşının saatda təxmini dəyəri. Bu iş stansiyasından istifadə edərək BOM-un dəyərini qiymətləndirmək üçün istifadə olunacaq.
diff --git a/htdocs/langs/az_AZ/multicurrency.lang b/htdocs/langs/az_AZ/multicurrency.lang
index 0c394e074d8..2a329aa893d 100644
--- a/htdocs/langs/az_AZ/multicurrency.lang
+++ b/htdocs/langs/az_AZ/multicurrency.lang
@@ -7,7 +7,7 @@ multicurrency_syncronize_error=Sinxronizasiya xətası: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Ən son məlum məzənnədən istifadə etmək əvəzinə, valyuta məzənnəsini tapmaq üçün sənədin tarixindən istifadə edin
 multicurrency_useOriginTx=Bir obyekt digərindən yaradıldıqda, mənbə obyektindən orijinal sürəti saxlayın (əks halda ən son məlum sürətdən istifadə edin)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Bu funksiyadan istifadə etmək üçün %s saytında hesab yaratmalısınız.<br>b0aee83365837z əldə edin /span>API açarı<span class='notranslate'></b>.<br>Pulsuz hesab istifadə edirsinizsə, <span class='ı dəyişə bilməzsiniz. notranslate'><b></span>mənbə valyutası</b> (standart olaraq ABŞ dolları).<br>Əsas valyutanız ABŞ dolları deyilsə, proqram onu avtomatik olaraq yenidən hesablayacaq.<br><br>Siz ayda 1000 sinxronizasiya ilə məhdudlaşırsınız.
+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 açarı
 multicurrency_appCurrencySource=Mənbə valyutası
 multicurrency_alternateCurrencySource=Alternativ mənbə valyutası
@@ -25,7 +25,7 @@ CreateRate=Dərəcə yaradın
 FormCreateRate=Qiymətləndirmənin yaradılması
 FormUpdateRate=Dərəcənin dəyişdirilməsi
 successRateCreate=%s valyuta məzənnəsi verilənlər bazasına əlavə edildi
-ConfirmDeleteLineRate=%s</span saytında <span class='notranslate'>%s valyutası üçün %s məzənnəsini silmək istədiyinizə əminsiniz > tarix?
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
 DeleteLineRate=Təmiz məzənnə
 successRateDelete=Qiymət silindi
 errorRateDelete=Qiyməti silərkən xəta
diff --git a/htdocs/langs/az_AZ/oauth.lang b/htdocs/langs/az_AZ/oauth.lang
index fdf93cdf90b..0a01e8e27c1 100644
--- a/htdocs/langs/az_AZ/oauth.lang
+++ b/htdocs/langs/az_AZ/oauth.lang
@@ -29,7 +29,7 @@ OAUTH_GOOGLE_SECRET=OAuth Google Gizli
 OAUTH_GITHUB_NAME=OAuth GitHub xidməti
 OAUTH_GITHUB_ID=OAuth GitHub İD
 OAUTH_GITHUB_SECRET=OAuth GitHub sirri
-OAUTH_URL_FOR_CREDENTIAL=<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">bu səhifəyə keçin<span class="fas fa-external-link-alt paddingleft"></span><spante class='notranslate OAuth ID və Sirri yaratmaq və ya əldə etmək üçün ></a></span>
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Testi
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Canlı
 OAUTH_ID=OAuth Müştəri ID-si
diff --git a/htdocs/langs/az_AZ/orders.lang b/htdocs/langs/az_AZ/orders.lang
index a534aff02a9..eebff64ecbc 100644
--- a/htdocs/langs/az_AZ/orders.lang
+++ b/htdocs/langs/az_AZ/orders.lang
@@ -106,7 +106,7 @@ ConfirmDeleteOrder=Bu sifarişi silmək istədiyinizə əminsiniz?
 ConfirmValidateOrder=Bu sifarişi <b>%s</b> adı altında doğrulamaq istədiyinizə əminsiniz ?
 ConfirmUnvalidateOrder=<b>%s</b> statusunu qaralama vəziyyətinə qaytarmaq istədiyinizə əminsiniz ?
 ConfirmCancelOrder=Bu sifarişi ləğv etmək istədiyinizə əminsiniz?
-ConfirmMakeOrder=Bu sifarişi <b>%s<span class='notranslate'></b></span saytında verdiyinizi təsdiqləmək istədiyinizə əminsiniz >?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=Faktura yaradın
 ClassifyShipped=Təslim edildi
 PassedInShippedStatus=təsnif edilir
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 49ff93dd589..fedb2694e7e 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -1,305 +1,340 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
+SecurityCode=Təhlükəsizlik kodu
 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
+Tools=Alətlər
+TMenuTools=Alətlər
+ToolsDesc=Digər menyu girişlərinə daxil olmayan bütün alətlər burada qruplaşdırılıb.<br>Bütün alətlərə sol menyu vasitəsilə daxil olmaq olar.
+Birthday=Ad günü
+BirthdayAlert=Ad günü xəbərdarlığı
+BirthdayAlertOn=ad günü xəbərdarlığı aktivdir
+BirthdayAlertOff=ad günü xəbərdarlığı qeyri-aktiv
+TransKey=TransKey açarının tərcüməsi
+MonthOfInvoice=Faktura tarixinin ayı (nömrə 1-12).
+TextMonthOfInvoice=Faktura tarixinin ayı (mətni).
+PreviousMonthOfInvoice=Faktura tarixinin əvvəlki ayı (nömrə 1-12).
+TextPreviousMonthOfInvoice=Faktura tarixinin əvvəlki ayı (mətni).
+NextMonthOfInvoice=Faktura tarixindən sonrakı ay (nömrə 1-12).
+TextNextMonthOfInvoice=Faktura tarixinin sonrakı ayı (mətni).
+PreviousMonth=Əvvəlki ay
+CurrentMonth=Cari ay
+ZipFileGeneratedInto=Zip faylı <b>%s</b>-da yaradıldı.
+DocFileGeneratedInto=Sənəd faylı <b>%s</b>-da yaradıldı.
+JumpToLogin=Bağlantı kəsildi. Giriş səhifəsinə keçin...
+MessageForm=Onlayn ödəniş formasında mesaj
+MessageOK=Təsdiqlənmiş ödəniş üçün geri qaytarma səhifəsində mesaj
+MessageKO=Ləğv edilmiş ödəniş üçün geri qaytarma səhifəsində mesaj
+ContentOfDirectoryIsNotEmpty=Bu kataloqun məzmunu boş deyil.
+DeleteAlsoContentRecursively=Bütün məzmunu rekursiv silmək üçün yoxlayın
 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__
+YearOfInvoice=Faktura tarixi
+PreviousYearOfInvoice=Faktura tarixinin əvvəlki ili
+NextYearOfInvoice=Faktura tarixindən sonrakı il
+DateNextInvoiceBeforeGen=Növbəti hesab-fakturanın tarixi (generasiyadan əvvəl)
+DateNextInvoiceAfterGen=Növbəti faktura tarixi (nəsildən sonra)
+GraphInBarsAreLimitedToNMeasures=Qrafiklər 'Barlar' rejimində %s ölçüləri ilə məhdudlaşır. Bunun əvəzinə "Xətlər" rejimi avtomatik seçildi.
+OnlyOneFieldForXAxisIsPossible=Hal-hazırda X-Axis olaraq yalnız 1 sahə mümkündür. Yalnız ilk seçilmiş sahə seçilmişdir.
+AtLeastOneMeasureIsRequired=Ölçü üçün ən azı 1 sahə tələb olunur
+AtLeastOneXAxisIsRequired=X-Axis üçün ən azı 1 sahə tələb olunur
+LatestBlogPosts=Ən son Bloq Yazıları
+notiftouser=İstifadəçilərə
+notiftofixedemail=Sabit poçta
+notiftouserandtofixedemail=İstifadəçiyə və sabit poçta
+Notify_ORDER_VALIDATE=Satış sifarişi təsdiqləndi
+Notify_ORDER_SENTBYMAIL=Satış sifarişi poçtla göndərilir
+Notify_ORDER_CLOSE=Satış sifarişi çatdırılır
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Satınalma sifarişi e-poçt vasitəsilə göndərilir
+Notify_ORDER_SUPPLIER_VALIDATE=Satınalma sifarişi qeydə alınıb
+Notify_ORDER_SUPPLIER_APPROVE=Satınalma sifarişi təsdiqləndi
+Notify_ORDER_SUPPLIER_SUBMIT=Satınalma sifarişi təqdim edildi
+Notify_ORDER_SUPPLIER_REFUSE=Satınalma sifarişi rədd edildi
+Notify_PROPAL_VALIDATE=Müştəri təklifi təsdiqləndi
+Notify_PROPAL_CLOSE_SIGNED=Müştəri təklifi bağlanıb imzalanıb
+Notify_PROPAL_CLOSE_REFUSED=Müştəri təklifi bağlandı rədd edildi
+Notify_PROPAL_SENTBYMAIL=Kommersiya təklifi poçtla göndərilir
+Notify_WITHDRAW_TRANSMIT=Transmissiyanın çıxarılması
+Notify_WITHDRAW_CREDIT=Kreditin çıxarılması
+Notify_WITHDRAW_EMIT=Çıxarmağı həyata keçirin
+Notify_COMPANY_CREATE=Üçüncü tərəf yaradıldı
+Notify_COMPANY_SENTBYMAIL=Üçüncü tərəfin səhifəsindən göndərilən məktublar
+Notify_BILL_VALIDATE=Müştəri fakturası təsdiqləndi
+Notify_BILL_UNVALIDATE=Müştəri fakturası təsdiqlənməyib
+Notify_BILL_PAYED=Müştəri hesab-fakturası ödənildi
+Notify_BILL_CANCEL=Müştəri fakturası ləğv edildi
+Notify_BILL_SENTBYMAIL=Müştəri fakturası poçtla göndərilir
+Notify_BILL_SUPPLIER_VALIDATE=Satıcı fakturası təsdiqləndi
+Notify_BILL_SUPPLIER_PAYED=Satıcı fakturası ödənilib
+Notify_BILL_SUPPLIER_SENTBYMAIL=Satıcı fakturası poçtla göndərilir
+Notify_BILL_SUPPLIER_CANCELED=Satıcı fakturası ləğv edildi
+Notify_CONTRACT_VALIDATE=Müqavilə təsdiqləndi
+Notify_FICHINTER_VALIDATE=Müdaxilə təsdiqləndi
+Notify_FICHINTER_CLOSE=Müdaxilə bağlandı
+Notify_FICHINTER_ADD_CONTACT=Müdaxilə əlaqə əlavə edildi
+Notify_FICHINTER_SENTBYMAIL=Müdaxilə poçtla göndərildi
+Notify_SHIPPING_VALIDATE=Göndərmə təsdiqləndi
+Notify_SHIPPING_SENTBYMAIL=Çatdırılma poçtla göndərilir
+Notify_MEMBER_VALIDATE=Üzv təsdiqləndi
+Notify_MEMBER_MODIFY=Üzv dəyişdirildi
+Notify_MEMBER_SUBSCRIPTION=Üzv abunə oldu
+Notify_MEMBER_RESILIATE=Üzv ləğv edildi
+Notify_MEMBER_DELETE=Üzv silindi
+Notify_PROJECT_CREATE=Layihənin yaradılması
+Notify_TASK_CREATE=Tapşırıq yaradıldı
+Notify_TASK_MODIFY=Tapşırıq dəyişdirildi
+Notify_TASK_DELETE=Tapşırıq silindi
+Notify_EXPENSE_REPORT_VALIDATE=Xərc hesabatı təsdiqləndi (təsdiq tələb olunur)
+Notify_EXPENSE_REPORT_APPROVE=Xərc hesabatı təsdiq edildi
+Notify_HOLIDAY_VALIDATE=Sorğunu təsdiqlənmiş buraxın (təsdiq tələb olunur)
+Notify_HOLIDAY_APPROVE=Sorğunu təsdiq edilmiş buraxın
+Notify_ACTION_CREATE=Gündəliyə fəaliyyət əlavə edildi
+SeeModuleSetup=%s modulunun quraşdırılmasına baxın
+NbOfAttachedFiles=Əlavə edilmiş faylların/sənədlərin sayı
+TotalSizeOfAttachedFiles=Əlavə edilmiş faylların/sənədlərin ümumi ölçüsü
+MaxSize=Maksimum ölçü
+AttachANewFile=Yeni fayl/sənəd əlavə edin
+LinkedObject=Əlaqədar obyekt
+NbOfActiveNotifications=Bildirişlərin sayı (alıcı e-poçtlarının sayı)
+PredefinedMailTest=__(Salam)__\nBu __EMAIL__ ünvanına göndərilmiş sınaq məktubudur.\nXətlər bir vaqonun geri dönüşü ilə ayrılır.\n\n__USER_SİGNATURE__
 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
+PredefinedMailContentContract=__(Salam)__\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendInvoice=__(Salam)__\n\nZəhmət olmasa __REF__ fakturasını əlavə edin\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Salam)__\n\nNəzərinizə çatdırmaq istərdik ki, __REF__ hesab-fakturasının ödənilmədiyi görünür. Xatırlatma kimi fakturanın surəti əlavə olunur.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendProposal=__(Salam)__\n\n__REF__ kommersiya təklifini əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Salam)__\n\nZəhmət olmasa qiymət sorğusunu __REF__ əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendOrder=__(Salam)__\n\n__REF__ sifarişini əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Salam)__\n\nZəhmət olmasa sifarişimizi __REF__ əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Salam)__\n\nZəhmət olmasa __REF__ fakturasını əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendShipping=__(Salam)__\n\nZəhmət olmasa, göndərməni __REF__ əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendFichInter=__(Salam)__\n\n__REF__ müdaxiləsini əlavə edin\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentLink=Ödənişiniz hələ həyata keçirilməyibsə, onu etmək üçün aşağıdakı linkə klikləyə bilərsiniz.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Salam)__\n\n\n__(Hörmətlə)__\n\n__USER_SİGNATURE__
+PredefinedMailContentSendActionComm="__EVENT_LABEL__" hadisə xatırladıcısı, __EVENT_DATE__ tarixində __EVENT_TIME__<br><br>Bu, avtomatik olaraq təkrar mesaj deyil.
+DemoDesc=Dolibarr bir neçə biznes modulunu dəstəkləyən kompakt ERP/CRM-dir. Bütün modulları nümayiş etdirən demo heç bir məna kəsb etmir, çünki bu ssenari heç vaxt baş vermir (bir neçə yüz mövcuddur). Beləliklə, bir neçə demo profil mövcuddur.
+ChooseYourDemoProfil=Ehtiyaclarınıza ən uyğun demo profili seçin...
+ChooseYourDemoProfilMore=...və ya öz profilinizi yaradın<br>(əl ilə modul seçimi)
+DemoFundation=Bir fondun üzvlərini idarə edin
+DemoFundation2=Bir fondun üzvlərini və bank hesabını idarə edin
+DemoCompanyServiceOnly=Yalnız şirkət və ya sərbəst satış xidməti
+DemoCompanyShopWithCashDesk=Nağd pul qutusu olan bir mağaza idarə edin
+DemoCompanyProductAndStocks=Satış nöqtəsi ilə məhsul satan mağazalar
+DemoCompanyManufacturing=Şirkət məhsulları istehsal edir
+DemoCompanyAll=Çox fəaliyyət göstərən şirkət (bütün əsas modullar)
+CreatedBy=Yaradıb: %s
+ModifiedBy=%s tərəfindən dəyişdirilib
+ValidatedBy=%s tərəfindən təsdiq edilib
+SignedBy=%s tərəfindən imzalanıb
+ClosedBy=%s tərəfindən bağlanıb
+CreatedById=Yaradan istifadəçi identifikatoru
+ModifiedById=Ən son dəyişiklik edən istifadəçi identifikatoru
+ValidatedById=Doğrulayan istifadəçi identifikatoru
+CanceledById=Ləğv edən istifadəçi identifikatoru
+ClosedById=Bağlayan istifadəçi identifikatoru
+CreatedByLogin=Yaradan istifadəçi girişi
+ModifiedByLogin=Ən son dəyişikliyi edən istifadəçi girişi
+ValidatedByLogin=Doğrulayan istifadəçi girişi
+CanceledByLogin=Ləğv edən istifadəçi girişi
+ClosedByLogin=Bağlayan istifadəçi girişi
+FileWasRemoved=%s faylı silindi
+DirWasRemoved=%s kataloqu silindi
+FeatureNotYetAvailable=Xüsusiyyət cari versiyada hələ mövcud deyil
+FeatureNotAvailableOnDevicesWithoutMouse=Bu funksiya siçan olmayan cihazlarda mövcud deyil
+FeaturesSupported=Dəstəklənən xüsusiyyətlər
+Width=Genişlik
+Height=Hündürlük
+Depth=Dərinlik
+Top=Üst
+Bottom=Aşağı
+Left=Sol
+Right=Sağ
+CalculatedWeight=Hesablanmış çəki
+CalculatedVolume=Hesablanmış həcm
+Weight=Çəki
 WeightUnitton=ton
-WeightUnitkg=kg
+WeightUnitkg=Kiloqram
 WeightUnitg=g
-WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+WeightUnitmg=mq
+WeightUnitpound=funt
+WeightUnitounce=unsiya
+Length=Uzunluq
 LengthUnitm=m
 LengthUnitdm=dm
-LengthUnitcm=cm
+LengthUnitcm=santimetr
 LengthUnitmm=mm
-Surface=Area
+Surface=Ərazi
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
-SurfaceUnitcm2=cm²
+SurfaceUnitcm2=sm²
 SurfaceUnitmm2=mm²
 SurfaceUnitfoot2=ft²
 SurfaceUnitinch2=in²
-Volume=Volume
+Volume=Həcmi
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=cm³ (ml)
+VolumeUnitcm3=sm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=unsiya
+VolumeUnitlitre=litr
+VolumeUnitgallon=qallon
 SizeUnitm=m
 SizeUnitdm=dm
-SizeUnitcm=cm
+SizeUnitcm=santimetr
 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
+SizeUnitinch=düym
+SizeUnitfoot=ayaq
+SizeUnitpoint=nöqtə
+BugTracker=Səhv izləyicisi
+SendNewPasswordDesc=Bu forma sizə yeni parol tələb etməyə imkan verir. O, e-poçt ünvanınıza göndəriləcək.<br>Dəyişiklik e-poçtdakı təsdiqləmə linkinə kliklədikdən sonra qüvvəyə minəcək.<br> Gələnlər qutusunu yoxlayın.
+EnterNewPasswordHere=Yeni parolunuzu bura daxil edin
+BackToLoginPage=Giriş səhifəsinə qayıt
 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.
+EnableGDLibraryDesc=Bu seçimi istifadə etmək üçün PHP quraşdırmanızda GD kitabxanasını quraşdırın və ya aktivləşdirin.
 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
-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
-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
-LoginWith=Login with %s
+StatsByAmount=Məhsulların/xidmətlərin miqdarı haqqında statistik məlumatlar
+StatsByAmountProducts=Məhsulların miqdarı ilə bağlı statistika
+StatsByAmountServices=Xidmətlərin həcminə dair statistika
+StatsByNumberOfUnits=Məhsulların/xidmətlərin cəminin statistikası
+StatsByNumberOfUnitsProducts=Məhsulların miqdarının statistikası
+StatsByNumberOfUnitsServices=Xidmətlərin məbləği üzrə statistika
+StatsByNumberOfEntities=İstinad edən qurumların sayı üzrə statistika (qaimə-fakturaların və ya sifarişlərin sayı...)
+NumberOf=%s sayı
+NumberOfUnits=%s üzrə vahidlərin sayı
+AmountIn=%s-da məbləğ
+NumberOfUnitsMos=İstehsal sifarişlərində istehsal ediləcək vahidlərin sayı
+EMailTextInterventionAddedContact=Sizə yeni müdaxilə %s təyin edildi.
+EMailTextInterventionValidated=%s müdaxiləsi təsdiqləndi.
+EMailTextInterventionClosed=%s müdaxiləsi bağlandı.
+EMailTextInvoiceValidated=%s faktura təsdiqləndi.
+EMailTextInvoicePayed=%s faktura ödənilib.
+EMailTextProposalValidated=%s təklifi təsdiqləndi.
+EMailTextProposalClosedSigned=%s təklifi imzalanıb.
+EMailTextProposalClosedSignedWeb=%s təklifi portal səhifəsində imzalanaraq bağlanıb.
+EMailTextProposalClosedRefused=%s təklifi rədd edildi.
+EMailTextProposalClosedRefusedWeb=%s təklifi portal səhifəsində rədd edildi.
+EMailTextOrderValidated=%s sifarişi doğrulandı.
+EMailTextOrderClose=%s sifarişi çatdırıldı.
+EMailTextSupplierOrderApprovedBy=%s satınalma sifarişi %s tərəfindən təsdiqlənib.
+EMailTextSupplierOrderValidatedBy=%s alış sifarişi %s tərəfindən qeydə alınıb.
+EMailTextSupplierOrderSubmittedBy=%s satınalma sifarişi %s tərəfindən təqdim edilib.
+EMailTextSupplierOrderRefusedBy=%s satınalma sifarişi %s tərəfindən rədd edildi.
+EMailTextExpeditionValidated=%s çatdırılması təsdiqləndi.
+EMailTextExpenseReportValidated=Xərc hesabatı %s təsdiqləndi.
+EMailTextExpenseReportApproved=Xərc hesabatı %s təsdiq edildi.
+EMailTextHolidayValidated=%s sorğusu təsdiqləndi.
+EMailTextHolidayApproved=%s sorğusu təsdiqləndi.
+EMailTextActionAdded=Fəaliyyət %s Gündəliyə əlavə edildi.
+ImportedWithSet=İdxal məlumat dəsti
+DolibarrNotification=Avtomatik bildiriş
+ResizeDesc=Yeni eni <b>VEYA</b> yeni hündürlük daxil edin. Ölçü dəyişdirilərkən nisbət saxlanılacaq...
+NewLength=Yeni eni
+NewHeight=Yeni hündürlük
+NewSizeAfterCropping=Kəsdikdən sonra yeni ölçü
+DefineNewAreaToPick=Şəkildə seçmək üçün yeni sahə təyin edin (şəklin üzərinə sol klikləyin, sonra əks küncə çatana qədər dartın)
+CurrentInformationOnImage=Bu alət şəklin ölçüsünü dəyişməyə və ya kəsməyə kömək etmək üçün nəzərdə tutulmuşdur. Bu, cari redaktə edilmiş şəkil haqqında məlumatdır
+ImageEditor=Şəkil redaktoru
+YouReceiveMailBecauseOfNotification=E-poçtunuz %s proqramının %s proqramında xüsusi hadisələrdən xəbərdar olmaq üçün hədəflər siyahısına əlavə edildiyi üçün bu mesajı aldınız.
+YouReceiveMailBecauseOfNotification2=Bu hadisə aşağıdakılardır:
+ThisIsListOfModules=Bu, bu demo profili tərəfindən əvvəlcədən seçilmiş modulların siyahısıdır (yalnız ən ümumi modullar bu demoda görünür). Daha fərdiləşdirilmiş demoya sahib olmaq üçün bunu redaktə edin və "Başla" üzərinə klikləyin.
+UseAdvancedPerms=Bəzi modulların qabaqcıl icazələrindən istifadə edin
+FileFormat=Fayl formatı
+SelectAColor=Bir rəng seçin
+AddFiles=Faylları əlavə et
+StartUpload=Yükləməyə başlayın
+CancelUpload=Yükləməni ləğv edin
+FileIsTooBig=Fayllar çox böyükdür
+PleaseBePatient=Səbr edin...
+NewPassword=Yeni şifrə
+ResetPassword=Parolu sıfırlamak
+RequestToResetPasswordReceived=Parolunuzu dəyişdirmək üçün sorğu qəbul edildi.
+NewKeyIs=Bu, daxil olmaq üçün yeni açarlarınızdır
+NewKeyWillBe=Proqrama daxil olmaq üçün yeni açarınız olacaq
+ClickHereToGoTo=%s səhifəsinə keçmək üçün bura klikləyin
+YouMustClickToChange=Bununla belə, bu parol dəyişikliyini təsdiqləmək üçün əvvəlcə aşağıdakı linkə klik etməlisiniz
+ConfirmPasswordChange=Parol dəyişikliyini təsdiqləyin
+ForgetIfNothing=Bu dəyişikliyi tələb etməmisinizsə, sadəcə bu e-poçtu unutun. Etibarnamələriniz təhlükəsiz saxlanılır.
+IfAmountHigherThan=Əgər məbləğ <strong>%s</strong>-dan yüksəkdirsə
+SourcesRepository=Mənbələr üçün anbar
+Chart=Qrafik
+PassEncoding=Parolun kodlaşdırılması
+PermissionsAdd=İcazələr əlavə edildi
+PermissionsDelete=İcazələr silindi
+YourPasswordMustHaveAtLeastXChars=Parolunuzda ən azı <strong>%s</strong> simvol olmalıdır
+PasswordNeedAtLeastXUpperCaseChars=Parol üçün ən azı <strong>%s</strong> böyük hərflər olmalıdır
+PasswordNeedAtLeastXDigitChars=Parolu ən azı <strong>%s</strong> rəqəmli simvol lazımdır
+PasswordNeedAtLeastXSpecialChars=Parol üçün ən azı <strong>%s</strong> xüsusi simvol lazımdır
+PasswordNeedNoXConsecutiveChars=Parolda <strong>%s</strong> ardıcıl oxşar simvollar olmamalıdır
+YourPasswordHasBeenReset=Parolunuz uğurla sıfırlandı
+ApplicantIpAddress=Ərizəçinin IP ünvanı
+SMSSentTo=%s ünvanına SMS göndərildi
+MissingIds=Çatışmayan idlər
+ThirdPartyCreatedByEmailCollector=Üçüncü tərəf e-poçt toplayıcısı tərəfindən MSGID %s e-poçtundan yaradılıb
+ContactCreatedByEmailCollector=Əlaqə/ünvan e-poçt kollektoru tərəfindən e-poçt MSGID-dən yaradılmışdır %s
+ProjectCreatedByEmailCollector=Layihə e-poçt toplayıcısı tərəfindən MSGID %s e-poçtundan yaradılıb
+TicketCreatedByEmailCollector=Bilet e-poçt toplayıcısı tərəfindən MSGID %s e-poçtundan yaradılıb
+OpeningHoursFormatDesc=Açılış və bağlanış saatlarını ayırmaq üçün - istifadə edin.<br>Fərqli diapazonları daxil etmək üçün boşluqdan istifadə edin.<br>Məsələn: 8-12 14 -18
+SuffixSessionName=Sessiya adı üçün şəkilçi
+LoginWith=%s ilə daxil olun
 
 ##### 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=İxrac sahəsi
+AvailableFormats=Mövcud formatlar
+LibraryUsed=Kitabxanadan istifadə olunub
+LibraryVersion=Kitabxana versiyası
+ExportableDatas=İxrac edilə bilən məlumatlar
+NoExportableData=İxrac edilə bilən məlumat yoxdur (eksport edilə bilən data yüklənmiş modullar yoxdur və ya icazələr yoxdur)
 ##### 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=Modul veb saytının qurulması
+WEBSITE_PAGEURL=Səhifənin URL-i
+WEBSITE_TITLE=Başlıq
+WEBSITE_DESCRIPTION=Təsvir
+WEBSITE_IMAGE=Şəkil
+WEBSITE_IMAGEDesc=Təsvir mediasının nisbi yolu. Siz bunu boş saxlaya bilərsiniz, çünki bu, nadir hallarda istifadə olunur (bloq yazılarının siyahısında miniatür göstərmək üçün dinamik məzmun tərəfindən istifadə edilə bilər). Yol veb saytın adından asılıdırsa, yolda __WEBSITE_KEY__ istifadə edin (məsələn: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Açar sözlər
+LinesToImport=İdxal ediləcək xətlər
 
-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=Yaddaş istifadəsi
+RequestDuration=Müraciət müddəti
+ProductsServicesPerPopularity=Məhsullar|Xidmətlər populyarlığa görə
+ProductsPerPopularity=Populyarlığa görə məhsullar
+ServicesPerPopularity=Populyarlığa görə xidmətlər
+PopuProp=Məhsullar|Təkliflərdə populyarlığa görə xidmətlər
+PopuCom=Məhsullar|Sifarişlərdə populyarlığa görə xidmətlər
+ProductStatistics=Məhsullar|Xidmətlər Statistikası
+NbOfQtyInOrders=Sifarişlərdə
+SelectTheTypeOfObjectToAnalyze=Statistikaya baxmaq üçün obyekt seçin...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
-CloseDialog = Close
+ConfirmBtnCommonContent = "%s" etmək istədiyinizə əminsiniz?
+ConfirmBtnCommonTitle = Fəaliyyətinizi təsdiqləyin
+CloseDialog = Yaxın
+Autofill = Avtomatik doldurma
+OrPasteAnURL=və ya URL yapışdırın
+
+# externalsite
+ExternalSiteSetup=Xarici vebsayta keçidi quraşdırın
+ExternalSiteURL=HTML iframe məzmununun Xarici Sayt URL-i
+ExternalSiteModuleNotComplete=ExternalSite modulu düzgün konfiqurasiya olunmayıb.
+ExampleMyMenuEntry=Menyu girişim
+
+# ftp
+FTPClientSetup=FTP və ya SFTP Müştəri modulunun qurulması
+NewFTPClient=Yeni FTP/SFTP bağlantısı quraşdırma
+FTPArea=FTP/SFTP sahəsi
+FTPAreaDesc=Bu ekran FTP və SFTP serverinin görünüşünü göstərir.
+SetupOfFTPClientModuleNotComplete=FTP və ya SFTP müştəri modulunun quraşdırılması natamam görünür
+FTPFeatureNotSupportedByYourPHP=Sizin PHP FTP və ya SFTP funksiyalarını dəstəkləmir
+FailedToConnectToFTPServer=Serverə qoşulmaq alınmadı (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Müəyyən edilmiş giriş/parol ilə serverə daxil olmaq alınmadı
+FTPFailedToRemoveFile=<b>%s</b> faylını silmək alınmadı.
+FTPFailedToRemoveDir=<b>%s</b> kataloqunu silmək alınmadı: icazələri yoxlayın və boşdur.
+FTPPassiveMode=Passiv rejim
+ChooseAFTPEntryIntoMenu=Menyudan FTP/SFTP saytını seçin...
+FailedToGetFile=Faylları əldə etmək alınmadı %s
+ErrorFTPNodisconnect=FTP/SFTP serverini ayırmaq xətası
+FileWasUpload=Fayl <b>%s</b> yükləndi
+FTPFailedToUploadFile=<b>%s</b> faylını yükləmək alınmadı.
+AddFolder=Qovluq yaradın
+FileWasCreateFolder=<b>%s</b> qovluğu yaradıldı
+FTPFailedToCreateFolder=<b>%s</b> qovluğunu yaratmaq alınmadı.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/az_AZ/partnership.lang b/htdocs/langs/az_AZ/partnership.lang
index 019d1dd69b1..7c3b849ed9a 100644
--- a/htdocs/langs/az_AZ/partnership.lang
+++ b/htdocs/langs/az_AZ/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Son URL yoxlaması üçün xətaların sayı
 LastCheckBacklink=Son URL yoxlamasının tarixi
 
 NewPartnershipRequest=Yeni tərəfdaşlıq tələbi
-NewPartnershipRequestDesc=Bu forma sizə tərəfdaşlıq proqramımızın bir hissəsi olmaq üçün müraciət etməyə imkan verir. Bu formanı doldurmaq üçün köməyə ehtiyacınız varsa, lütfən, e-poçt vasitəsilə əlaqə saxlayın <b>%s<span class='notranslate'></b> span>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Bu səhifədə aşağıdakı domenlərdən birinə ən azı bir keçid olmalıdır: %s
 
 IPOfApplicant=Ərizəçinin IP
-
diff --git a/htdocs/langs/az_AZ/paypal.lang b/htdocs/langs/az_AZ/paypal.lang
index 5eb5f389445..5f64f9ca645 100644
--- a/htdocs/langs/az_AZ/paypal.lang
+++ b/htdocs/langs/az_AZ/paypal.lang
@@ -1,36 +1,37 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-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=PayPal modulunun qurulması
+PaypalDesc=Bu modul müştərilərə <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a> vasitəsilə ödəniş etməyə imkan verir. Bu, ad-hoc ödəniş və ya Dolibarr obyekti ilə əlaqəli ödəniş üçün istifadə edilə bilər (qaimə, sifariş, ...)
+PaypalOrCBDoPayment=PayPal ilə ödəyin (Kart və ya PayPal)
+PaypalDoPayment=PayPal ilə ödəyin
+PAYPAL_API_SANDBOX=Rejim testi/qum qutusu
+PAYPAL_API_USER=API istifadəçi adı
+PAYPAL_API_PASSWORD=API parolu
+PAYPAL_API_SIGNATURE=API imzası
+PAYPAL_SSLVERSION=Curl SSL Versiyası
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Yalnız "inteqral" ödəniş (Kredit kartı+PayPal) və ya "PayPal" təklif edin
+PaypalModeIntegral=İnteqral
+PaypalModeOnlyPaypal=Yalnız PayPal
+ONLINE_PAYMENT_CSS_URL=Onlayn ödəniş səhifəsində CSS üslub cədvəlinin isteğe bağlı URL-i
+ThisIsTransactionId=Bu, tranzaksiya identifikatorudur: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Sənədi e-poçtla göndərərkən PayPal ödəniş url-ni daxil edin
+NewOnlinePaymentReceived=Yeni onlayn ödəniş alındı
+NewOnlinePaymentFailed=Yeni onlayn ödəniş cəhd edildi, lakin alınmadı
+ONLINE_PAYMENT_SENDEMAIL=Hər ödəniş cəhdindən sonra bildirişlər üçün e-poçt ünvanı (uğur və uğursuzluq üçün)
+ReturnURLAfterPayment=Ödənişdən sonra URL-i qaytarın
+ValidationOfOnlinePaymentFailed=Onlayn ödənişin doğrulanması uğursuz oldu
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Ödənişin təsdiqi səhifəsi ödəniş sistemi tərəfindən çağırıldı xəta qaytardı
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API çağırışı uğursuz oldu.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API çağırışı uğursuz oldu.
+DetailedErrorMessage=Ətraflı Xəta Mesajı
+ShortErrorMessage=Qısa Xəta Mesajı
+ErrorCode=Səhv kodu
+ErrorSeverityCode=Xətanın Ciddilik Kodu
+OnlinePaymentSystem=Onlayn ödəniş sistemi
+PaypalLiveEnabled=PayPal "canlı" rejimi aktivdir (əks halda test/sandbox rejimi)
+PaypalImportPayment=PayPal ödənişlərini idxal edin
+PostActionAfterPayment=Ödənişlərdən sonra hərəkətləri göndərin
+ARollbackWasPerformedOnPostActions=Bütün Post əməliyyatlarında geriyə qaytarma həyata keçirilib. Lazım gələrsə, post əməliyyatlarını əl ilə tamamlamalısınız.
+ValidationOfPaymentFailed=Ödənişin doğrulanması uğursuz oldu
+CardOwner=Kart sahibi
+PayPalBalance=Paypal krediti
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 14715670882..8ebcabb8048 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -1,413 +1,438 @@
 # 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
+ProductRef=Məhsul ref.
+ProductLabel=Məhsul etiketi
+ProductLabelTranslated=Tərcümə edilmiş məhsul etiketi
+ProductDescription=Məhsul təsviri
+ProductDescriptionTranslated=Tərcümə edilmiş məhsul təsviri
+ProductNoteTranslated=Tərcümə edilmiş məhsul qeydi
+ProductServiceCard=Məhsullar/Xidmətlər kartı
+TMenuProducts=Məhsullar
+TMenuServices=Xidmətlər
+Products=Məhsullar
+Services=Xidmətlər
+Product=Məhsul
+Service=Xidmət
+ProductId=Məhsul/xidmət id
+Create=Yaradın
+Reference=İstinad
+NewProduct=Yeni məhsul
+NewService=Yeni xidmət
+ProductVatMassChange=Qlobal ƏDV yeniləməsi
 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
+MassBarcodeInit=Kütləvi barkod girişi
+MassBarcodeInitDesc=Bu səhifə barkodu təyin olunmayan obyektlərdə barkodu işə salmaq üçün istifadə edilə bilər. Modul barkodunun quraşdırılması tamamlanmamışdan əvvəl yoxlayın.
+ProductAccountancyBuyCode=Mühasibat kodu (satın alma)
+ProductAccountancyBuyIntraCode=Mühasibat kodu (icmadaxili satınalma)
+ProductAccountancyBuyExportCode=Mühasibat kodu (alış idxalı)
+ProductAccountancySellCode=Mühasibat kodu (satış)
+ProductAccountancySellIntraCode=Mühasibat kodu (İcmadaxili satış)
+ProductAccountancySellExportCode=Mühasibat kodu (satış ixracı)
+ProductOrService=Məhsul və ya Xidmət
+ProductsAndServices=Məhsullar və Xidmətlər
+ProductsOrServices=Məhsullar və ya Xidmətlər
+ProductsPipeServices=Məhsullar | Xidmətlər
+ProductsOnSale=Satış üçün məhsullar
+ProductsOnPurchase=Almaq üçün məhsullar
+ProductsOnSaleOnly=Yalnız satış üçün məhsullar
+ProductsOnPurchaseOnly=Yalnız alış üçün məhsullar
+ProductsNotOnSell=Məhsullar satılmır və alınmır
+ProductsOnSellAndOnBuy=Satış və alış üçün məhsullar
+ServicesOnSale=Satış üçün xidmətlər
+ServicesOnPurchase=Satınalma üçün xidmətlər
+ServicesOnSaleOnly=Yalnız satış üçün xidmətlər
+ServicesOnPurchaseOnly=Yalnız alış üçün xidmətlər
+ServicesNotOnSell=Xidmətlər satılmır və satın alınmır
+ServicesOnSellAndOnBuy=Satış və alış üçün xidmətlər
+LastModifiedProductsAndServices=Dəyişdirilmiş ən son %s məhsul/xidmətlər
+LastRecordedProducts=Ən son %s qeydə alınmış məhsullar
+LastRecordedServices=Ən son %s qeydə alınmış xidmətlər
+CardProduct0=Məhsul
+CardProduct1=Xidmət
+Stock=Səhm
+MenuStocks=Səhmlər
+Stocks=Məhsulların ehtiyatları və yeri (anbarı).
+Movements=Hərəkətlər
+Sell=Sat
+Buy=Alış
+OnSell=Satılır
+OnBuy=Alış üçün
+NotOnSell=Satış üçün deyil
+ProductStatusOnSell=Satılır
+ProductStatusNotOnSell=Satış üçün deyil
+ProductStatusOnSellShort=Satılır
+ProductStatusNotOnSellShort=Satış üçün deyil
+ProductStatusOnBuy=Alış üçün
+ProductStatusNotOnBuy=Alış üçün deyil
+ProductStatusOnBuyShort=Alış üçün
+ProductStatusNotOnBuyShort=Alış üçün deyil
+UpdateVAT=ƏDV-ni yeniləyin
+UpdateDefaultPrice=Defolt qiyməti yeniləyin
+UpdateLevelPrices=Hər səviyyə üçün qiymətləri yeniləyin
+AppliedPricesFrom=Müraciət edilmişdir
+SellingPrice=Satış qiyməti
+SellingPriceHT=Satış qiyməti (vergi istisna olmaqla)
+SellingPriceTTC=Satış qiyməti (vergi daxil)
+SellingMinPriceTTC=Minimum Satış qiyməti (vergi daxil olmaqla)
+CostPriceDescription=Bu qiymət sahəsi (vergi istisna olmaqla) bu məhsulun şirkətinizə sərf etdiyi orta məbləği tutmaq üçün istifadə edilə bilər. Bu, özünüz hesabladığınız hər hansı qiymət ola bilər, məsələn, orta alış qiymətindən əlavə orta istehsal və paylama dəyərindən.
+CostPriceUsage=Bu dəyər marjanın hesablanması üçün istifadə edilə bilər.
+ManufacturingPrice=İstehsal qiyməti
+SoldAmount=Satılmış məbləğ
+PurchasedAmount=Alınan məbləğ
+NewPrice=Yeni qiymət
+MinPrice=Min. satış qiyməti
+MinPriceHT=Min. satış qiyməti (vergi istisna olmaqla)
+MinPriceTTC=Min. satış qiyməti (vergi daxil)
+EditSellingPriceLabel=Satış qiyməti etiketini redaktə edin
+CantBeLessThanMinPrice=Satış qiyməti bu məhsul üçün icazə verilən minimumdan aşağı ola bilməz (vergisiz %s). Əhəmiyyətli endirim yazsanız, bu mesaj da görünə bilər.
+CantBeLessThanMinPriceInclTax=Satış qiyməti bu məhsul üçün icazə verilən minimumdan aşağı ola bilməz (vergilər daxil %s). Çox vacib endirim yazsanız, bu mesaj da görünə bilər.
+ContractStatusClosed=Bağlı
+ErrorProductAlreadyExists=%s istinadlı məhsul artıq mövcuddur.
+ErrorProductBadRefOrLabel=İstinad və ya etiket üçün yanlış dəyər.
+ErrorProductClone=Məhsul və ya xidməti klonlaşdırmaq istəyərkən problem baş verdi.
+ErrorPriceCantBeLowerThanMinPrice=Xəta, qiymət minimum qiymətdən aşağı ola bilməz.
+Suppliers=Satıcılar
+SupplierRef=Satıcı SKU
+ShowProduct=Məhsulu göstərin
+ShowService=Xidmət göstərin
+ProductsAndServicesArea=Məhsul və Xidmətlər sahəsi
+ProductsArea=Məhsul sahəsi
+ServicesArea=Xidmətlər sahəsi
+ListOfStockMovements=Səhm hərəkətlərinin siyahısı
+BuyingPrice=Alış qiyməti
+PriceForEachProduct=Xüsusi qiymətlərlə məhsullar
+SupplierCard=Satıcı kartı
+PriceRemoved=Qiymət silindi
+BarCode=Barkod
+BarcodeType=Barkod növü
+SetDefaultBarcodeType=Barkod növünü təyin edin
+BarcodeValue=Barkod dəyəri
+NoteNotVisibleOnBill=Qeyd (fakturalarda, təkliflərdə görünmür...)
+ServiceLimitedDuration=Məhsul məhdud müddətə malik xidmətdirsə:
+FillWithLastServiceDates=Son xidmət xətti tarixləri ilə doldurun
+MultiPricesAbility=Məhsul/xidmət üçün bir neçə qiymət seqmenti (hər bir müştəri bir qiymət seqmentindədir)
+MultiPricesNumPrices=Qiymətlərin sayı
+DefaultPriceType=Yeni satış qiymətləri əlavə edərkən defolt üzrə qiymətlərin bazası (vergisizlə müqayisədə).
+AssociatedProductsAbility=Aktivləşdirmə dəstləri (bir neçə məhsul dəsti)
+VariantsAbility=Variantları aktivləşdirin (məhsulların varyasyonları, məsələn, rəng, ölçü)
+AssociatedProducts=Dəstlər
+AssociatedProductsNumber=Bu dəsti təşkil edən məhsulların sayı
+ParentProductsNumber=Ana qablaşdırma məhsulunun sayı
+ParentProducts=Ana məhsullar
+IfZeroItIsNotAVirtualProduct=0 olarsa, bu məhsul dəst deyil
+IfZeroItIsNotUsedByVirtualProduct=0 olarsa, bu məhsul heç bir dəst tərəfindən istifadə edilmir
+KeywordFilter=Açar söz filtri
+CategoryFilter=Kateqoriya filtri
+ProductToAddSearch=Əlavə etmək üçün məhsul axtarın
+NoMatchFound=Uyğun tapılmadı
+ListOfProductsServices=Məhsulların/xidmətlərin siyahısı
+ProductAssociationList=Bu dəstin komponent(lər)i olan məhsulların/xidmətlərin siyahısı
+ProductParentList=Komponent kimi bu məhsulu olan dəstlərin siyahısı
+ErrorAssociationIsFatherOfThis=Seçilmiş məhsullardan biri cari məhsulun anasıdır
+DeleteProduct=Məhsulu/xidməti silin
+ConfirmDeleteProduct=Bu məhsulu/xidməti silmək istədiyinizə əminsiniz?
+ProductDeleted="%s" Məhsul/Xidmət verilənlər bazasından silindi.
+ExportDataset_produit_1=Məhsullar
+ExportDataset_service_1=Xidmətlər
+ImportDataset_produit_1=Məhsullar
+ImportDataset_service_1=Xidmətlər
+DeleteProductLine=Məhsul xəttini silin
+ConfirmDeleteProductLine=Bu məhsul xəttini silmək istədiyinizə əminsiniz?
+ProductSpecial=Xüsusi
+QtyMin=Min. alış miqdarı
+PriceQtyMin=Qiymət miqdarı min.
+PriceQtyMinCurrency=Bu qty üçün qiymət (valyuta).
+WithoutDiscount=Endirimsiz
+VATRateForSupplierProduct=ƏDV dərəcəsi (bu satıcı/məhsul üçün)
+DiscountQtyMin=Bu ədədə endirim.
+NoPriceDefinedForThisSupplier=Bu satıcı/məhsul üçün qiymət/qty müəyyən edilməyib
+NoSupplierPriceDefinedForThisProduct=Bu məhsul üçün heç bir satıcı qiyməti/qty müəyyən edilməyib
+PredefinedItem=Əvvəlcədən təyin edilmiş element
+PredefinedProductsToSell=Əvvəlcədən təyin edilmiş məhsul
+PredefinedServicesToSell=Əvvəlcədən təyin edilmiş xidmət
+PredefinedProductsAndServicesToSell=Satış üçün əvvəlcədən təyin edilmiş məhsullar/xidmətlər
+PredefinedProductsToPurchase=Almaq üçün əvvəlcədən təyin edilmiş məhsul
+PredefinedServicesToPurchase=Satın almaq üçün əvvəlcədən təyin edilmiş xidmətlər
+PredefinedProductsAndServicesToPurchase=Almaq üçün əvvəlcədən təyin edilmiş məhsullar/xidmətlər
+NotPredefinedProducts=Əvvəlcədən təyin edilmiş məhsullar/xidmətlər deyil
+GenerateThumb=Baş barmaq yaradın
+ServiceNb=Xidmət #%s
+ListProductServiceByPopularity=Populyarlığa görə məhsulların/xidmətlərin siyahısı
+ListProductByPopularity=Populyarlığa görə məhsulların siyahısı
+ListServiceByPopularity=Populyarlığa görə xidmətlərin siyahısı
+Finished=İstehsal olunan məhsul
+RowMaterial=Xammal
+ConfirmCloneProduct=Məhsul və ya xidməti klonlaşdırmaq istədiyinizə əminsiniz <b>%s</b>?
+CloneContentProduct=Məhsulun/xidmətin bütün əsas məlumatlarını klonlayın
+ClonePricesProduct=Klon qiymətləri
+CloneCategoriesProduct=Əlaqəli teqləri/kateqoriyaları klonlayın
+CloneCompositionProduct=Virtual məhsulları/xidmətləri klonlayın
+CloneCombinationsProduct=Məhsul variantlarını klonlayın
+ProductIsUsed=Bu məhsul istifadə olunur
+NewRefForClone=Ref. yeni məhsul/xidmət
+SellingPrices=Satış qiymətləri
+BuyingPrices=Alış qiymətləri
+CustomerPrices=Müştəri qiymətləri
+SuppliersPrices=Satıcı qiymətləri
+SuppliersPricesOfProductsOrServices=Satıcı qiymətləri (məhsul və ya xidmətlərin)
+CustomCode=Gömrük|Əmtəə|HS kodu
+CountryOrigin=Mənşə ölkəsi
+RegionStateOrigin=Mənşə bölgəsi
+StateOrigin=Dövlət|Mənşə əyaləti
+Nature=Məhsulun təbiəti (xam/istehsal)
+NatureOfProductShort=Məhsulun təbiəti
+NatureOfProductDesc=Xammal və ya istehsal olunan məhsul
+ShortLabel=Qısa etiket
+Unit=Vahid
 p=u.
-set=set
-se=set
-second=second
+set=təyin edin
+se=təyin edin
+second=ikinci
 s=s
-hour=hour
+hour=saat
 h=h
-day=day
+day=gün
 d=d
-kilogram=kilogram
-kg=Kg
-gram=gram
+kilogram=kiloqram
+kg=Kiloqram
+gram=qram
 g=g
-meter=meter
+meter=metr
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=litr
 l=L
-unitP=Piece
+unitP=Hissə
 unitSET=Set
-unitS=Second
-unitH=Hour
-unitD=Day
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
+unitS=İkinci
+unitH=Saat
+unitD=Gün
+unitL=litr
 unitT=ton
-unitKG=kg
-unitG=Gram
-unitMG=mg
-unitLB=pound
-unitOZ=ounce
-unitM=Meter
+unitKG=Kiloqram
+unitG=qram
+unitMG=mq
+unitLB=funt
+unitOZ=unsiya
+unitM=Metr
+unitLM=Xətti sayğac
 unitDM=dm
-unitCM=cm
+unitCM=santimetr
 unitMM=mm
 unitFT=ft
 unitIN=in
-unitM2=Square meter
+unitM2=Kvadrat metr
 unitDM2=dm²
-unitCM2=cm²
+unitCM2=sm²
 unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
-unitM3=Cubic meter
+unitM3=kubmetr
 unitDM3=dm³
-unitCM3=cm³
+unitCM3=sm³
 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=unsiya
+unitgallon=qallon
+ProductCodeModel=Məhsul referatı şablonu
+ServiceCodeModel=Xidmət referatı şablonu
+CurrentProductPrice=Cari qiymət
+AlwaysUseNewPrice=Həmişə məhsulun/xidmətin cari qiymətindən istifadə edin
+AlwaysUseFixedPrice=Sabit qiymətdən istifadə edin
+PriceByQuantity=Kəmiyyətə görə fərqli qiymətlər
+DisablePriceByQty=Kəmiyyətə görə qiymətləri söndürün
+PriceByQuantityRange=Kəmiyyət diapazonu
+MultipriceRules=Seqment üçün avtomatik qiymətlər
+UseMultipriceRules=Birinci seqmentə uyğun olaraq bütün digər seqmentlərin qiymətlərini avtomatik hesablamaq üçün qiymət seqmenti qaydalarından (məhsul modulu quraşdırmasında müəyyən edilmiş) istifadə edin
+PercentVariationOver=%% variasiya %s üzərində
+PercentDiscountOver=%% %s üzərində endirim
+KeepEmptyForAutoCalculation=Bunun məhsulların çəkisi və ya həcminə görə avtomatik hesablanması üçün boş saxlayın
+VariantRefExample=Nümunələr: COL, SIZE
+VariantLabelExample=Nümunələr: Rəng, Ölçü
 ### 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
+Build=istehsal
+ProductsMultiPrice=Hər bir qiymət seqmenti üçün məhsullar və qiymətlər
+ProductsOrServiceMultiPrice=Müştəri qiymətləri (məhsul və ya xidmətlər, çox qiymətlər)
+ProductSellByQuarterHT=Məhsul dövriyyəsi vergidən əvvəl rüblük
+ServiceSellByQuarterHT=Xidmətlərin dövriyyəsi vergidən əvvəl rüblük
+Quarter1=1-ci Dörddəbir
+Quarter2=2-ci. Dörddəbir
+Quarter3=3-cü. Dörddəbir
+Quarter4=4-cü. Dörddəbir
+BarCodePrintsheet=Barkodları çap edin
 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
+NumberOfStickers=Səhifədə çap ediləcək stikerlərin sayı
+PrintsheetForOneBarCode=Bir barkod üçün bir neçə stiker çap edin
+BuildPageToPrint=Çap etmək üçün səhifə yaradın
+FillBarCodeTypeAndValueManually=Barkod növünü və dəyərini əl ilə doldurun.
+FillBarCodeTypeAndValueFromProduct=Məhsulun barkodundan ştrix kodun növünü və dəyərini doldurun.
+FillBarCodeTypeAndValueFromThirdParty=Barkod növünü və dəyərini üçüncü tərəfin barkodundan doldurun.
+DefinitionOfBarCodeForProductNotComplete=%s məhsulu üçün barkodun növü və ya dəyərinin tərifi tam deyil.
+DefinitionOfBarCodeForThirdpartyNotComplete=Üçüncü tərəf üçün tam olmayan barkodun növü və ya dəyərinin tərifi %s.
+BarCodeDataForProduct=%s məhsulunun barkod məlumatı:
+BarCodeDataForThirdparty=Üçüncü tərəfin barkod məlumatı %s:
+ResetBarcodeForAllRecords=Bütün qeydlər üçün barkod dəyərini təyin edin (bu, həmçinin yeni dəyərlərlə artıq müəyyən edilmiş barkod dəyərini sıfırlayacaq)
+PriceByCustomer=Hər bir müştəri üçün fərqli qiymətlər
+PriceCatalogue=Məhsul/xidmət üçün vahid satış qiyməti
+PricingRule=Qiymətlərin satış qaydaları
+AddCustomerPrice=Müştəri tərəfindən qiymət əlavə edin
+ForceUpdateChildPriceSoc=Müştərinin törəmə şirkətlərində eyni qiyməti təyin edin
+PriceByCustomerLog=Əvvəlki müştəri qiymətlərinin qeydi
+MinimumPriceLimit=Minimum qiymət %s qiymətindən aşağı ola bilməz
+MinimumRecommendedPrice=Tövsiyə olunan minimum qiymət: %s
+PriceExpressionEditor=Qiymət ifadəsi redaktoru
+PriceExpressionSelected=Seçilmiş qiymət ifadəsi
+PriceExpressionEditorHelp1=Qiyməti təyin etmək üçün "qiymət = 2 + 2" və ya "2 + 2". İstifadə edin; ifadələri ayırmaq
 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>
+PriceExpressionEditorHelp3=Həm məhsul/xidmət, həm də satıcı qiymətlərində bu dəyişənlər mövcuddur:<br><b>#tva_tx# #localtax1_tx2# #tx#x çəki# #uzunluq# #səth# #qiymət_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
+PriceExpressionEditorHelp5=Mövcud qlobal dəyərlər:
+PriceMode=Qiymət rejimi
+PriceNumeric=Nömrə
+DefaultPrice=Defolt qiymət
+DefaultPriceLog=Əvvəlki standart qiymətlərin jurnalı
+ComposedProductIncDecStock=Valideyn dəyişikliyində ehtiyatı artırın/azalın
+ComposedProduct=Uşaq məhsulları
+MinSupplierPrice=Minimum alış qiyməti
+MinCustomerPrice=Minimum satış qiyməti
+NoDynamicPrice=Dinamik qiymət yoxdur
+DynamicPriceConfiguration=Dinamik qiymət konfiqurasiyası
+DynamicPriceDesc=Müştəri və ya Satıcı qiymətlərini hesablamaq üçün riyazi düsturlar təyin edə bilərsiniz. Belə düsturlar bütün riyazi operatorlardan, bəzi sabitlərdən və dəyişənlərdən istifadə edə bilər. Burada istifadə etmək istədiyiniz dəyişənləri təyin edə bilərsiniz. Dəyişən avtomatik yeniləməyə ehtiyac duyarsa, Dolibarr-a dəyəri avtomatik yeniləməyə icazə vermək üçün xarici URL təyin edə bilərsiniz.
+AddVariable=Dəyişən əlavə edin
+AddUpdater=Yeniləyici əlavə edin
+GlobalVariables=Qlobal dəyişənlər
+VariableToUpdate=Yenilənmək üçün dəyişən
+GlobalVariableUpdaters=Dəyişənlər üçün xarici yeniləyicilər
+GlobalVariableUpdaterType0=JSON məlumatları
+GlobalVariableUpdaterHelp0=Müəyyən edilmiş URL-dən JSON məlumatlarını təhlil edir, VALUE müvafiq dəyərin yerini müəyyənləşdirir,
+GlobalVariableUpdaterHelpFormat0=Sorğu üçün format {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Veb Xidməti məlumatları
+GlobalVariableUpdaterHelp1=Müəyyən edilmiş URL-dən Veb Xidməti məlumatlarını təhlil edir, NS ad məkanını müəyyən edir, VALUE müvafiq dəyərin yerini müəyyənləşdirir, DATA göndəriləcək məlumatları ehtiva etməlidir və METHOD çağıran WS metodudur
+GlobalVariableUpdaterHelpFormat1=Sorğunun formatı {"URL": "http://example.com/urlofws", "VALUE": "massiv,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"sizin": "məlumat", "to": "göndər"}}
+UpdateInterval=Yeniləmə intervalı (dəqiqə)
+LastUpdated=Ən son yeniləmə
+CorrectlyUpdated=Düzgün yeniləndi
+PropalMergePdfProductActualFile=Fayllar PDF Azur-a əlavə etmək üçün istifadə olunur
+PropalMergePdfProductChooseFile=PDF fayllarını seçin
+IncludingProductWithTag=Etiketi olan məhsullar/xidmətlər daxil olmaqla
+DefaultPriceRealPriceMayDependOnCustomer=Defolt qiymət, real qiymət müştəridən asılı ola bilər
+WarningSelectOneDocument=Ən azı bir sənəd seçin
+DefaultUnitToShow=Vahid
+NbOfQtyInProposals=Təkliflərdə sayı
+ClinkOnALinkOfColumn=Ətraflı görünüş əldə etmək üçün %s sütununun linkinə klikləyin...
+ProductsOrServicesTranslations=Məhsulların/Xidmətlərin tərcüməsi
+TranslatedLabel=Tərcümə edilmiş etiket
+TranslatedDescription=Tərcümə edilmiş təsvir
+TranslatedNote=Tərcümə edilmiş qeydlər
+ProductWeight=1 məhsul üçün çəki
+ProductVolume=1 məhsul üçün həcm
+WeightUnits=Çəki vahidi
+VolumeUnits=Həcm vahidi
+WidthUnits=Genişlik vahidi
+LengthUnits=Uzunluq vahidi
+HeightUnits=Hündürlük vahidi
+SurfaceUnits=Səth vahidi
+SizeUnits=Ölçü vahidi
+DeleteProductBuyPrice=Alış qiymətini silin
+ConfirmDeleteProductBuyPrice=Bu alış qiymətini silmək istədiyinizə əminsiniz?
+SubProduct=Alt məhsul
+ProductSheet=Məhsul vərəqi
+ServiceSheet=Xidmət vərəqi
+PossibleValues=Mümkün dəyərlər
+GoOnMenuToCreateVairants=Atribut variantları (məsələn, rənglər, ölçü, ...) hazırlamaq üçün %s - %s menyusuna keçin.
+UseProductFournDesc=Müştərilər üçün təsvirə əlavə olaraq satıcılar tərəfindən müəyyən edilmiş məhsul təsvirini (hər bir satıcı istinadı üçün) müəyyən etmək üçün xüsusiyyət əlavə edin
+ProductSupplierDescription=Məhsul üçün satıcı təsviri
+UseProductSupplierPackaging=Kəmiyyətləri bəzi verilmiş qatlara yuvarlaqlaşdırmaq üçün "qablaşdırma" funksiyasından istifadə edin (satıcı sənədlərinə sətir əlavə edərkən/yeniləyərkən, məhsulun alış qiymətlərində daha yüksək çoxluğa uyğun olaraq miqdarları və alış qiymətlərini yenidən hesablayın)
+PackagingForThisProduct=Miqdarların qablaşdırılması
+PackagingForThisProductDesc=Siz avtomatik olaraq bu miqdarın çoxunu alacaqsınız.
+QtyRecalculatedWithPackaging=Xəttin miqdarı təchizatçının qablaşdırmasına uyğun olaraq yenidən hesablanmışdır
 
 #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?
+Attributes=Atributlar
+VariantAttributes=Variant atributları
+ProductAttributes=Məhsullar üçün müxtəlif atributlar
+ProductAttributeName=Variant atributu %s
+ProductAttribute=Variant atributu
+ProductAttributeDeleteDialog=Bu atributu silmək istədiyinizə əminsiniz? Bütün dəyərlər silinəcək
+ProductAttributeValueDeleteDialog=Bu atributun "%s" istinadı ilə "%s" dəyərini silmək istədiyinizə əminsiniz?
 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
+ProductCombinationAlreadyUsed=Variant silinərkən xəta baş verdi. Heç bir obyektdə istifadə olunmadığını yoxlayın
+ProductCombinations=Variantlar
+PropagateVariant=Variantları yaymaq
+HideProductCombinations=Məhsul seçimində məhsul variantını gizlədin
 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
+NewProductCombination=Yeni variant
+EditProductCombination=Redaktə variantı
+NewProductCombinations=Yeni variantlar
+EditProductCombinations=Variantların redaktə edilməsi
+SelectCombination=Kombinasiya seçin
+ProductCombinationGenerator=Variantların generatoru
+Features=Xüsusiyyətləri
+PriceImpact=Qiymət təsiri
+ImpactOnPriceLevel=Qiymət səviyyəsinə təsir %s
+ApplyToAllPriceImpactLevel= Bütün səviyyələrə müraciət edin
+ApplyToAllPriceImpactLevelHelp=Bura klikləməklə siz bütün səviyyələrdə eyni qiymət təsirini təyin etmiş olursunuz
+WeightImpact=Çəki təsiri
+NewProductAttribute=Yeni atribut
+NewProductAttributeValue=Yeni atribut dəyəri
+ErrorCreatingProductAttributeValue=Atribut dəyərini yaratarkən xəta baş verdi. Bu, həmin istinadla artıq mövcud dəyər olduğuna görə ola bilər
+ProductCombinationGeneratorWarning=Davam etsəniz, yeni variantlar yaratmazdan əvvəl bütün əvvəlkilər SİLİNƏCƏK. Artıq mövcud olanlar yeni dəyərlərlə yenilənəcək
+TooMuchCombinationsWarning=Çoxlu variantların yaradılması yüksək CPU, yaddaş istifadəsi və Dolibarrın onları yarada bilməməsi ilə nəticələnə bilər. "%s" seçimini aktivləşdirmək yaddaş istifadəsini azaltmağa kömək edə bilər.
+DoNotRemovePreviousCombinations=Əvvəlki variantları silməyin
+UsePercentageVariations=Faiz dəyişikliklərindən istifadə edin
+PercentageVariation=Faiz dəyişikliyi
+ErrorDeletingGeneratedProducts=Mövcud məhsul variantlarını silmək istəyərkən xəta baş verdi
+NbOfDifferentValues=Fərqli dəyərlərin sayı
+NbProducts=Məhsulların sayı
+ParentProduct=Ana məhsul
+ParentProductOfVariant=Variantın ana məhsulu
+HideChildProducts=Variant məhsulları gizlədin
+ShowChildProducts=Variant məhsulları göstərin
+NoEditVariants=Əsas məhsul kartına keçin və variantlar tabında variantlar qiymətinə təsirini redaktə edin
+ConfirmCloneProductCombinations=Bütün məhsul variantlarını verilmiş istinadla digər əsas məhsula köçürmək istərdinizmi?
+CloneDestinationReference=Təyinat məhsulu arayışı
+ErrorCopyProductCombinations=Məhsul variantlarını kopyalayarkən xəta baş verdi
+ErrorDestinationProductNotFound=Təyinat məhsulu tapılmadı
+ErrorProductCombinationNotFound=Məhsul variantı tapılmadı
+ActionAvailableOnVariantProductOnly=Fəaliyyət yalnız məhsul variantında mövcuddur
+ProductsPricePerCustomer=Müştərilər üçün məhsul qiymətləri
+ProductSupplierExtraFields=Əlavə Atributlar (Təchizatçı Qiymətləri)
+DeleteLinkedProduct=Kombinasiya ilə əlaqəli uşaq məhsulu silin
+AmountUsedToUpdateWAP=Çəkili Orta Qiyməti yeniləmək üçün istifadə ediləcək vahid məbləği
+PMPValue=Çəkili orta qiymət
 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
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+mandatoryperiod=Məcburi dövrlər
+mandatoryPeriodNeedTobeSet=Qeyd: Müddət (başlama və bitmə tarixi) müəyyən edilməlidir
+mandatoryPeriodNeedTobeSetMsgValidate=Xidmət başlanğıc və bitmə müddəti tələb edir
+mandatoryHelper=Bu xidmətlə sətirlərdə başlanğıc və bitmə tarixini daxil etmədən faktura, kommersiya təklifi, satış sifarişi yaratarkən/təsdiq edərkən istifadəçiyə mesaj göndərmək istəyirsinizsə, bunu yoxlayın.<br>Qeyd edək ki, mesaj xəbərdarlıqdır və bloklama xətası deyil.
+DefaultBOM=Defolt BOM
+DefaultBOMDesc=Bu məhsulu istehsal etmək üçün istifadə etmək tövsiyə olunan standart BOM. Bu sahə yalnız məhsulun xarakteri "%s" olduqda təyin edilə bilər.
+Rank=Rütbə
+MergeOriginProduct=Dublikat məhsul (silmək istədiyiniz məhsul)
+MergeProducts=Məhsulları birləşdirin
+ConfirmMergeProducts=Seçilmiş məhsulu cari ilə birləşdirmək istədiyinizə əminsiniz? Bütün əlaqəli obyektlər (qaimə-fakturalar, sifarişlər, ...) cari məhsula köçürüləcək, bundan sonra seçilmiş məhsul silinəcək.
+ProductsMergeSuccess=Məhsullar birləşdirilib
+ErrorsProductsMerge=Məhsullarda səhvlər birləşir
+SwitchOnSaleStatus=Satış statusunu yandırın
+SwitchOnPurchaseStatus=Satınalma statusunu yandırın
+UpdatePrice=Müştəri qiymətini artırmaq/azaltmaq
+StockMouvementExtraFields= Əlavə Sahələr (səhmlərin hərəkəti)
+InventoryExtraFields= Əlavə Sahələr (inventar)
+ScanOrTypeOrCopyPasteYourBarCodes=Barkodlarınızı skan edin və ya yazın və ya kopyalayın/yapışdırın
+PuttingPricesUpToDate=Qiymətləri cari məlum qiymətlərlə yeniləyin
+PuttingDescUpToDate=Cari məlum təsvirlərlə təsvirləri yeniləyin
+PMPExpected=Gözlənilən PMP
+ExpectedValuation=Gözlənilən Qiymətləndirmə
+PMPReal=Real PMP
+RealValuation=Real Qiymətləndirmə
+ConfirmEditExtrafield = Dəyişdirmək istədiyiniz əlavə sahəni seçin
+ConfirmEditExtrafieldQuestion = Bu əlavə sahəni dəyişdirmək istədiyinizə əminsiniz?
+ModifyValueExtrafields = Əlavə sahənin dəyərini dəyişdirin
+OrProductsWithCategories=Və ya etiketləri/kateqoriyaları olan məhsullar
+WarningTransferBatchStockMouvToGlobal = Bu məhsulu seriyadan çıxarmaq istəyirsinizsə, onun bütün seriyalı ehtiyatı qlobal fonda çevriləcək
+WarningConvertFromBatchToSerial=Hal-hazırda məhsul üçün 2-yə bərabər və ya daha yüksək kəmiyyətiniz varsa, bu seçimə keçmək hələ də eyni partiyanın müxtəlif obyektləri olan bir məhsula sahib olacağınız deməkdir (unikal seriya nömrəsi istəsəniz). Dublikat inventar və ya bunu düzəltmək üçün əl ilə ehtiyat hərəkəti edilənə qədər qalacaq.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Qaralama statusuna qayıtmaq istədiyinizə əminsiniz?<br>Hazırda inventarda təyin edilmiş miqdarlar sıfırlanacaq.
diff --git a/htdocs/langs/az_AZ/propal.lang b/htdocs/langs/az_AZ/propal.lang
index 5658db5f964..2728aa8e471 100644
--- a/htdocs/langs/az_AZ/propal.lang
+++ b/htdocs/langs/az_AZ/propal.lang
@@ -15,7 +15,7 @@ ValidateProp=Kommersiya təklifini təsdiqləyin
 CancelPropal=Ləğv et
 AddProp=Təklif yaradın
 ConfirmDeleteProp=Bu kommersiya təklifini silmək istədiyinizə əminsiniz?
-ConfirmValidateProp=Bu kommersiya təklifini <b>%s<span class='notranslate'></b> adı ilə doğrulamaq istədiyinizə əminsiniz >?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
 ConfirmCancelPropal=Kommersiya təklifini <b>%s</b> ləğv etmək istədiyinizə əminsiniz?
 LastPropals=Ən son %s təkliflər
 LastModifiedProposals=Ən son %s dəyişdirilmiş təkliflər
diff --git a/htdocs/langs/az_AZ/receptions.lang b/htdocs/langs/az_AZ/receptions.lang
index 7f1a97d16a9..b775a9bbd0e 100644
--- a/htdocs/langs/az_AZ/receptions.lang
+++ b/htdocs/langs/az_AZ/receptions.lang
@@ -1,54 +1,56 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor 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
+ReceptionDescription=Satıcı qəbulunun idarə edilməsi (qəbul sənədlərinin yaradılması)
+ReceptionsSetup=Satıcı qəbulunun qurulması
+RefReception=Ref. qəbul
+Reception=Qəbul
+Receptions=Qəbullar
+AllReceptions=Bütün Qəbullar
+ShowReception=Qəbulları göstərin
+ReceptionsArea=Qəbullar sahəsi
+ListOfReceptions=Qəbulların siyahısı
+ReceptionMethod=Qəbul üsulu
+LastReceptions=Ən son %s qəbulları
+StatisticsOfReceptions=Qəbullar üçün statistika
+NbOfReceptions=Qəbulların sayı
+NumberOfReceptionsByMonth=Aylar üzrə qəbulların sayı
+ReceptionCard=Qəbul kartı
+NewReception=Yeni qəbul
+CreateReception=Qəbul yaradın
+QtyInOtherReceptions=Digər qəbullarda ədəd
+OtherReceptionsForSameOrder=Bu sifariş üçün digər qəbullar
+ReceptionsAndReceivingForSameOrder=Bu sifariş üçün qəbullar və qəbzlər
+ReceptionsToValidate=Təsdiq etmək üçün qəbullar
+StatusReceptionCanceled=Ləğv edildi
+StatusReceptionDraft=Qaralama
+StatusReceptionValidated=Təsdiqlənmiş (alınacaq və ya artıq alınmış məhsullar)
+StatusReceptionValidatedToReceive=Təsdiqlənmiş (qəbul ediləcək məhsullar)
+StatusReceptionValidatedReceived=Təsdiq edildi (məhsul qəbul edildi)
+StatusReceptionProcessed=Emal edilib
+StatusReceptionDraftShort=Qaralama
+StatusReceptionValidatedShort=Təsdiqlənmişdir
+StatusReceptionProcessedShort=Emal edilib
+ReceptionSheet=Qəbul vərəqi
+ValidateReception=Qəbulu təsdiqləyin
+ConfirmDeleteReception=Bu qəbulu silmək istədiyinizə əminsiniz?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
+ConfirmCancelReception=Bu qəbulu ləğv etmək istədiyinizə əminsiniz?
+StatsOnReceptionsOnlyValidated=Yalnız təsdiqlənmiş qəbullar üzrə statistika aparılır. İstifadə olunan tarix qəbulun təsdiqlənməsi tarixidir (planlaşdırılmış çatdırılma tarixi həmişə məlum deyil).
+SendReceptionByEMail=E-poçtla qəbulu göndərin
+SendReceptionRef=Qəbulun təqdim edilməsi %s
+ActionsOnReception=Qəbul zamanı hadisələr
+ReceptionCreationIsDoneFromOrder=Hazırda yeni qəbulun yaradılması Satınalma Sifarişindən həyata keçirilir.
+ReceptionLine=Qəbul xətti
+ProductQtyInReceptionAlreadySent=Açıq satış sifarişindən məhsulun miqdarı artıq göndərilmişdir
+ProductQtyInSuppliersReceptionAlreadyRecevied=Açıq təchizatçı sifarişindən məhsulun miqdarı artıq alınmışdır
+ValidateOrderFirstBeforeReception=Qəbul etmədən əvvəl sifarişi təsdiqləməlisiniz.
+ReceptionsNumberingModules=Qəbullar üçün nömrələmə modulu
+ReceptionsReceiptModel=Qəbullar üçün sənəd şablonları
+NoMorePredefinedProductToDispatch=Artıq göndəriləcək əvvəlcədən təyin edilmiş məhsullar yoxdur
+ReceptionExist=Qəbul var
+ReceptionBackToDraftInDolibarr=Qəbul %s qaralamaya qayıdıb
+ReceptionClassifyClosedInDolibarr=Qəbul %s təsnif edilib Bağlanıb
+ReceptionUnClassifyCloseddInDolibarr=Qəbul %s yenidən açılır
+RestoreWithCurrentQtySaved=Kəmiyyətləri ən son saxlanmış dəyərlərlə doldurun
+ReceptionsRecorded=Qəbullar qeydə alınıb
+ReceptionUpdated=Qəbul uğurla yeniləndi
+ReceptionDistribution=Qəbul paylanması
diff --git a/htdocs/langs/az_AZ/sendings.lang b/htdocs/langs/az_AZ/sendings.lang
index 8f10b1e9404..34149394cf6 100644
--- a/htdocs/langs/az_AZ/sendings.lang
+++ b/htdocs/langs/az_AZ/sendings.lang
@@ -1,76 +1,86 @@
 # 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=Ref. göndərmə
+Sending=Göndərmə
+Sendings=Göndərmələr
+AllSendings=Bütün Göndərmələr
+Shipment=Göndərmə
+Shipments=Göndərmələr
+ShowSending=Göndərmələri göstərin
+Receivings=Çatdırılma Qəbzləri
+SendingsArea=Göndərmə sahəsi
+ListOfSendings=Göndərmələrin siyahısı
+SendingMethod=Göndərmə üsulu
+LastSendings=Ən son %s göndərişləri
+StatisticsOfSendings=Göndərmə statistikası
+NbOfSendings=Göndərmələrin sayı
+NumberOfShipmentsByMonth=Aylar üzrə göndərişlərin sayı
+SendingCard=Göndərmə kartı
+NewSending=Yeni göndəriş
+CreateShipment=Göndərmə yaradın
+QtyShipped=Miqdar göndərildi
+QtyShippedShort=Qty gəmi.
+QtyPreparedOrShipped=Miqdar hazırlanmış və ya göndərilmişdir
+QtyToShip=Göndərmə miqdarı
+QtyToReceive=Qəbul etmək üçün qty
+QtyReceived=Qəbul edilən miqdar
+QtyInOtherShipments=Digər göndərişlərdə miqdar
+KeepToShip=Gəmidə qalın
+KeepToShipShort=Qalmaq
+OtherSendingsForSameOrder=Bu sifariş üçün digər göndərişlər
+SendingsAndReceivingForSameOrder=Bu sifariş üçün göndərişlər və qəbzlər
+SendingsToValidate=Doğrulamaq üçün göndərmələr
+StatusSendingCanceled=Ləğv edildi
+StatusSendingCanceledShort=Ləğv edildi
+StatusSendingDraft=Qaralama
+StatusSendingValidated=Təsdiqlənmiş (göndəriləcək və ya artıq göndərilmiş məhsullar)
+StatusSendingProcessed=Emal edilib
+StatusSendingDraftShort=Qaralama
+StatusSendingValidatedShort=Təsdiqlənmişdir
+StatusSendingProcessedShort=Emal edilib
+SendingSheet=Göndərmə vərəqi
+ConfirmDeleteSending=Bu göndərişi silmək istədiyinizə əminsiniz?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmCancelSending=Bu göndərişi ləğv etmək istədiyinizə əminsiniz?
+DocumentModelMerou=Merou A5 modeli
+WarningNoQtyLeftToSend=Xəbərdarlıq, göndərilməyi gözləyən heç bir məhsul yoxdur.
+StatsOnShipmentsOnlyValidated=Statistikalar yalnız təsdiqlənmiş göndərişlər üçündür. İstifadə olunan tarix göndərişin təsdiqlənmə tarixidir (planlaşdırılmış çatdırılma tarixi həmişə məlum deyil)
+DateDeliveryPlanned=Planlaşdırılmış çatdırılma tarixi
+RefDeliveryReceipt=Ref çatdırılma qəbzi
+StatusReceipt=Statusun çatdırılması qəbzi
+DateReceived=Qəbul tarixi
+ClassifyReception=Qəbul edilənləri təsnif edin
+SendShippingByEMail=Göndərməni e-poçtla göndərin
+SendShippingRef=Göndərmə %s
+ActionsOnShipping=Göndərmə zamanı hadisələr
+LinkToTrackYourPackage=Paketinizi izləmək üçün keçid
+ShipmentCreationIsDoneFromOrder=Hazırda yeni göndərişin yaradılması Satış Sifarişi qeydindən həyata keçirilir.
+ShipmentLine=Göndərmə xətti
+ProductQtyInCustomersOrdersRunning=Açıq satış sifarişlərindən məhsulun miqdarı
+ProductQtyInSuppliersOrdersRunning=Açıq satınalma sifarişlərindən məhsulun miqdarı
+ProductQtyInShipmentAlreadySent=Açıq satış sifarişindən məhsulun miqdarı artıq göndərilmişdir
+ProductQtyInSuppliersShipmentAlreadyRecevied=Artıq alınmış açıq alış sifarişlərindən məhsulun miqdarı
+NoProductToShipFoundIntoStock=<b>%s</b> anbarında göndəriləcək məhsul tapılmadı. Anbarı düzəldin və ya başqa anbar seçmək üçün geri qayıdın.
+WeightVolShort=Çəki/Vol.
+ValidateOrderFirstBeforeShipment=Göndərmə həyata keçirməzdən əvvəl ilk növbədə sifarişi təsdiqləməlisiniz.
+NoLineGoOnTabToAddSome=Sətir yoxdur, əlavə etmək üçün "%s" tabına keçin
 
 # 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=Çatdırılma qəbzləri üçün daha tam sənəd modeli (loqo...)
+DocumentModelStorm=Çatdırılma qəbzləri və əlavə sahələrə uyğunluq üçün daha tam sənəd modeli (loqo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Daimi EXPEDITION_ADDON_NUMBER müəyyən edilməyib
+SumOfProductVolumes=Məhsul həcmlərinin cəmi
+SumOfProductWeights=Məhsul çəkilərinin cəmi
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= Anbar təfərrüatları
+DetailWarehouseFormat= W:%s (Kəmiyyət: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Serial nömrəsi və ya partiya üçün göndərişin yaradılması zamanı anbara son giriş tarixini göstərin
+CreationOptions=Göndərmənin yaradılması zamanı mövcud seçimlər
+
+ShipmentDistribution=Göndərmə paylanması
+
+ErrorTooManyCombinationBatchcode=%s xətti üçün göndəriş yoxdur, çünki çoxlu anbar, məhsul, toplu kod kombinasiyası tapılıb (%s).
+ErrorNoCombinationBatchcode=%s sətrini anbar-məhsul lotu/seriya kombinasiyası kimi saxlamaq mümkün olmadı (%s, %s, %s) anbarda tapılmadı.
+
+ErrorTooMuchShipped=Göndərilən miqdar %s sətri üçün sifariş edilmiş miqdardan çox olmamalıdır.
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 7f16c8913b7..36311383982 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -164,14 +164,14 @@ InventoryCode=Hərəkət və ya inventar kodu
 IsInPackage=Paketdə var
 WarehouseAllowNegativeTransfer=Səhm mənfi ola bilər
 qtyToTranferIsNotEnough=Mənbə anbarınızdan kifayət qədər ehtiyatınız yoxdur və quraşdırmanız mənfi ehtiyatlara icazə vermir.
-qtyToTranferLotIsNotEnough=Mənbə anbarınızdan bu lot nömrəsi üçün kifayət qədər ehtiyatınız yoxdur və quraşdırmanız mənfi ehtiyatlara icazə vermir ("<span class" lotu ilə "%s" məhsulu üçün miqdar ='notranslate'>%s</span>' '%s' anbarında %s-dır.
+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=Anbarı göstərin
 MovementCorrectStock=%s məhsulu üçün ehtiyat korreksiyası
 MovementTransferStock=%s məhsulunun başqa anbara köçürülməsi
 BatchStockMouvementAddInGlobal=Partiya ehtiyatı qlobal stoka keçir (məhsul artıq partiyadan istifadə etmir)
 InventoryCodeShort=Inv./Mov. kod
 NoPendingReceptionOnSupplierOrder=Açıq satınalma sifarişinə görə gözlənilən qəbul yoxdur
-ThisSerialAlreadyExistWithDifferentDate=Bu lot/seriya nömrəsi (<strong>%s</strong>) artıq mövcuddur fərqli yemək və ya satış tarixi (tapıldı <strong>%s</strong>, lakin siz daxil edin. span class='notranslate'><strong></span>%s</strong>).
+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=Açıq (bütün hərəkət)
 OpenInternal=Açıq (yalnız daxili hərəkət)
 UseDispatchStatus=Satınalma sifarişinin qəbulu zamanı məhsul xətləri üçün göndərmə statusundan istifadə edin (təsdiq et/imtina et).
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=Bu hərəkət zamanı bu Dəstin bütün alt məh
 ImportFromCSV=Hərəkətin CSV siyahısını idxal edin
 ChooseFileToImport=Faylı yükləyin, sonra faylı mənbə idxal faylı kimi seçmək üçün %s ikonasına klikləyin...
 SelectAStockMovementFileToImport=idxal etmək üçün səhm hərəkəti faylını seçin
-InfoTemplateImport=Yüklənmiş fayl bu formata malik olmalıdır (* məcburi sahələrdir):<br>Mənbə Anbarı* | Hədəf Anbarı* | Məhsul* | Kəmiyyət* | Lot/seriya nömrəsi<br>CSV simvol ayırıcısı "<b>%s</span olmalıdır. span class='notranslate'></b>"
+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=İnventar %s
 ReOpen=Yenidən açın
 ConfirmFinish=İnventarın bağlanmasını təsdiq edirsinizmi? Bu, səhmlərinizi inventarınıza daxil etdiyiniz real miqdar qədər yeniləmək üçün bütün səhm hərəkətlərini yaradacaq.
@@ -282,7 +282,7 @@ ModuleStockTransferName=Təkmil Səhm Transferi
 ModuleStockTransferDesc=Köçürmə vərəqinin yaradılması ilə Fond Transferinin qabaqcıl idarə edilməsi
 StockTransferNew=Yeni səhm köçürməsi
 StockTransferList=Səhm köçürmələri siyahısı
-ConfirmValidateStockTransfer=Bu səhmlərin transferini <b>%s<span class='notranslate'></b> istinadı ilə doğrulamaq istədiyinizə əminsiniz span> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=%s transferi ilə ehtiyatların azalması
 ConfirmDestockCancel=%s transferi ilə səhmlərin azalmasını ləğv edin
 DestockAllProduct=Səhmlərin azalması
diff --git a/htdocs/langs/az_AZ/stripe.lang b/htdocs/langs/az_AZ/stripe.lang
index 84493c1a036..7a112707b19 100644
--- a/htdocs/langs/az_AZ/stripe.lang
+++ b/htdocs/langs/az_AZ/stripe.lang
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=Müqavilə xətti üçün %s onlayn 
 ToOfferALinkForOnlinePaymentOnFreeAmount=Mövcud obyekti olmayan istənilən məbləğin %s onlayn ödəniş səhifəsini təklif etmək üçün URL
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Üzv abunəliyi üçün %s onlayn ödəniş səhifəsi təklif etmək üçün URL
 ToOfferALinkForOnlinePaymentOnDonation=İanənin ödənilməsi üçün %s onlayn ödəniş səhifəsi təklif etmək üçün URL
-YouCanAddTagOnUrl=Siz həmçinin url parametrini <b>&tag=<i>dəyərib0ae64758bac><span><span> əlavə edə bilərsiniz class='notranslate'></b> öz ödəniş şərh teqinizi əlavə etmək üçün həmin URL-lərdən hər hansı birinə (yalnız obyektlə əlaqəli olmayan ödəniş üçün məcburidir).<br> Mövcud obyekti olmayan ödənişlərin URL-i, siz həmçinin <strong>&noidempotency=1</strong> parametrini əlavə edə bilərsiniz, beləliklə eyni teqlə eyni link bir neçə dəfə istifadə oluna bilər (bəzi ödəniş rejimi bu parametr olmadan hər bir fərqli keçid üçün ödənişi 1-ə qədər məhdudlaşdıra bilər)
+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=Ödəniş avtomatik yaradılan zaman <b>%s</b> URL ilə Stripe-i quraşdırın. Stripe tərəfindən təsdiq edilmişdir.
 AccountParameter=Hesab parametrləri
 UsageParameter=İstifadə parametrləri
diff --git a/htdocs/langs/az_AZ/supplier_proposal.lang b/htdocs/langs/az_AZ/supplier_proposal.lang
index ce5bdf0425a..af58dbb7ebd 100644
--- a/htdocs/langs/az_AZ/supplier_proposal.lang
+++ b/htdocs/langs/az_AZ/supplier_proposal.lang
@@ -1,54 +1,59 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
+SupplierProposal=Satıcı kommersiya təklifləri
+supplier_proposalDESC=Təchizatçılara qiymət sorğularını idarə edin
+SupplierProposalNew=Yeni qiymət sorğusu
+CommRequest=Qiymət sorğusu
+CommRequests=Qiymət sorğuları
+SearchRequest=Müraciət tapın
+DraftRequests=Qaralama sorğular
+SupplierProposalsDraft=Satıcı təklifləri layihəsi
+LastModifiedRequests=Ən son %s dəyişdirilmiş qiymət sorğuları
+RequestsOpened=Açıq qiymət sorğuları
+SupplierProposalArea=Satıcı təklifləri sahəsi
+SupplierProposalShort=Satıcı təklifi
+SupplierProposals=Satıcı təklifləri
+SupplierProposalsShort=Satıcı təklifləri
+AskPrice=Qiymət sorğusu
+NewAskPrice=Yeni qiymət sorğusu
+ShowSupplierProposal=Qiymət sorğusunu göstərin
+AddSupplierProposal=Qiymət sorğusu yaradın
+SupplierProposalRefFourn=Satıcı refer
+SupplierProposalDate=Çatdırılma tarixi
+SupplierProposalRefFournNotice="Qəbul edildi" bölməsinə keçməzdən əvvəl təchizatçıların istinadlarını başa düşməyi düşünün.
 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
+DeleteAsk=Sorğunu silin
+ValidateAsk=Sorğunu təsdiqləyin
+SupplierProposalStatusDraft=Qaralama (təsdiq edilməlidir)
+SupplierProposalStatusValidated=Təsdiq edildi (sorğu açıqdır)
+SupplierProposalStatusClosed=Bağlı
+SupplierProposalStatusSigned=Qəbul edildi
+SupplierProposalStatusNotSigned=İmtina etdi
+SupplierProposalStatusDraftShort=Qaralama
+SupplierProposalStatusValidatedShort=Təsdiqlənmişdir
+SupplierProposalStatusClosedShort=Bağlı
+SupplierProposalStatusSignedShort=Qəbul edildi
+SupplierProposalStatusNotSignedShort=İmtina etdi
+CopyAskFrom=Mövcud sorğunu kopyalayaraq qiymət sorğusu yaradın
+CreateEmptyAsk=Boş sorğu yaradın
+ConfirmCloneAsk=Qiymət sorğusunu <b>%s</b> klonlamaq istədiyinizə əminsiniz?
+ConfirmReOpenAsk=Qiymət sorğusunu geri açmaq istədiyinizə əminsiniz <b>%s</b> ?
+SendAskByMail=Qiymət sorğusunu poçtla göndərin
+SendAskRef=Qiymət sorğusu göndərilir %s
+SupplierProposalCard=Kart sorğusu
+ConfirmDeleteAsk=Bu qiymət sorğusunu silmək istədiyinizə əminsiniz <b>%s</b>?
+ActionsOnSupplierProposal=Qiymət tələbi ilə hadisələr
+DocModelAuroreDescription=Satıcıdan kotirovka sorğusu üçün tam şablon (Sponge şablonunun köhnə tətbiqi)
+DocModelZenithDescription=Satıcıdan kotirovka sorğusu üçün tam şablon
+CommercialAsk=Qiymət sorğusu
+DefaultModelSupplierProposalCreate=Defolt model yaradılması
+DefaultModelSupplierProposalToBill=Qiymət sorğusunu bağlayarkən defolt şablon (qəbul edilir)
+DefaultModelSupplierProposalClosed=Qiymət sorğusunu bağlayarkən defolt şablon (imtina edildi)
+ListOfSupplierProposals=Satıcı təklif sorğularının siyahısı
+ListSupplierProposalsAssociatedProject=Layihə ilə əlaqəli satıcı təkliflərinin siyahısı
+SupplierProposalsToClose=Satıcıların bağlanması təklifləri
+SupplierProposalsToProcess=Satıcı təkliflərini emal etmək
+LastSupplierProposals=Ən son %s qiymət sorğuları
+AllPriceRequests=Bütün sorğular
+TypeContact_supplier_proposal_external_SHIPPING=Çatdırılma üçün satıcı ilə əlaqə saxlayın
+TypeContact_supplier_proposal_external_BILLING=Faturalandırma üçün satıcı əlaqəsi
+TypeContact_supplier_proposal_external_SERVICE=Nümayəndə təqib təklifi
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index a115da15c9d..e1d0d07131e 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -320,7 +320,7 @@ ViewTicket=Biletə baxın
 ViewMyTicketList=Bilet siyahıma baxın
 ErrorEmailMustExistToCreateTicket=Xəta: e-poçt ünvanı verilənlər bazamızda tapılmadı
 TicketNewEmailSubjectAdmin=Yeni bilet yaradıldı - Ref %s (ictimai bilet ID %s)
-TicketNewEmailBodyAdmin=<p>Bilet indicə ID #%s ilə yaradılıb, məlumata baxın:<span class='notranslate'>b0679c9a6a6spand430 >
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
 SeeThisTicketIntomanagementInterface=İdarəetmə interfeysində biletə baxın
 TicketPublicInterfaceForbidden=Biletlər üçün ictimai interfeys aktiv edilmədi
 ErrorEmailOrTrackingInvalid=İzləmə ID və ya e-poçt üçün pis dəyər
diff --git a/htdocs/langs/az_AZ/trips.lang b/htdocs/langs/az_AZ/trips.lang
index 9210ede360c..45fdee38665 100644
--- a/htdocs/langs/az_AZ/trips.lang
+++ b/htdocs/langs/az_AZ/trips.lang
@@ -1,150 +1,152 @@
 # 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
+AUTHOR=tərəfindən qeydə alınıb
+AUTHORPAIEMENT=tərəfindən ödənilir
+AddTrip=Xərc hesabatı yaradın
+AllExpenseReport=Hər növ xərc hesabatı
+AllExpenseReports=Bütün xərc hesabatları
+AnyOtherInThisListCanValidate=Sorğunun təsdiqlənməsi üçün məlumatlandırılmalı olan şəxs.
+AttachTheNewLineToTheDocument=Yüklənmiş sənədə xətti əlavə edin
+AucuneLigne=Hələ heç bir xərc hesabatı açıqlanmayıb
+BrouillonnerTrip=Xərc hesabatını "Qaralama" statusuna geri köçürün
+byEX_DAY=gün üzrə (məhdudiyyət %s)
+byEX_EXP=sətir üzrə (%s ilə məhdudiyyət)
+byEX_MON=aya görə (məhdudiyyət %s)
+byEX_YEA=il üzrə (məhdudiyyət %s)
+CANCEL_USER=tərəfindən silindi
+CarCategory=Avtomobil kateqoriyası
+ClassifyRefunded='Geri qaytarıldı' təsnifatı
+CompanyVisited=Şirkət/təşkilat ziyarət edildi
+ConfirmBrouillonnerTrip=Bu xərc hesabatını "Qaralama" statusuna köçürmək istədiyinizə əminsiniz?
+ConfirmCancelTrip=Bu xərc hesabatını ləğv etmək istədiyinizə əminsiniz?
+ConfirmCloneExpenseReport=Bu xərc hesabatını klonlaşdırmaq istədiyinizə əminsiniz?
+ConfirmDeleteTrip=Bu xərc hesabatını silmək istədiyinizə əminsiniz?
+ConfirmPaidTrip=Bu xərc hesabatının statusunu "Ödənişli" olaraq dəyişmək istədiyinizə əminsiniz?
+ConfirmRefuseTrip=Bu xərc hesabatını rədd etmək istədiyinizə əminsiniz?
+ConfirmSaveTrip=Bu xərc hesabatını doğrulamaq istədiyinizə əminsiniz?
+ConfirmValideTrip=Bu xərc hesabatını təsdiqləmək istədiyinizə əminsiniz?
+DATE_CANCEL=Ləğv tarixi
+DATE_PAIEMENT=Ödəniş tarixi
+DATE_REFUS=Tarixi rədd edin
+DATE_SAVE=Doğrulama tarixi
+DefaultCategoryCar=Standart nəqliyyat rejimi
+DefaultRangeNumber=Defolt diapazon nömrəsi
+DeleteTrip=Xərc hesabatını silin
+ErrorDoubleDeclaration=Siz oxşar tarix diapazonunda başqa bir xərc hesabatı elan etmisiniz.
+Error_EXPENSEREPORT_ADDON_NotDefined=Xəta, xərc hesabatının nömrələnməsi qaydası 'Xərc Hesabatı' modulunun quraşdırılmasında müəyyən edilmədi
+ExpenseRangeOffset=Ofset məbləği: %s
+expenseReportCatDisabled=Kateqoriya əlil - c_exp_tax_cat lüğətinə baxın
+expenseReportCoef=Əmsal
+expenseReportCoefUndefined=(dəyər müəyyən edilməyib)
+expenseReportOffset=Ofset
+expenseReportPrintExample=ofset + (d x əmsal) = %s
+expenseReportRangeDisabled=Range disabled - c_exp_tax_range lüğətinə baxın
+expenseReportRangeFromTo=%d-dan %d-a
+expenseReportRangeMoreThan=%d-dan çox
+expenseReportTotalForFive=<u>d</u> = 5 ilə nümunə
+ExpenseReportApplyTo=Tətbiq et
+ExpenseReportApproved=Xərc hesabatı təsdiq edildi
 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
+ExpenseReportCanceled=Xərc hesabatı ləğv edildi
 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
+ExpenseReportConstraintViolationError=Maksimum məbləğ keçildi (qayda %s): %s %s-dan yüksəkdir ( Həddindən artıq qadağandır)
+ExpenseReportConstraintViolationWarning=Maksimum məbləğ keçildi (qayda %s): %s %s-dan yüksəkdir ( Həddindən artıq icazə verilir)
+ExpenseReportDateEnd=Tarixin sonu
+ExpenseReportDateStart=Başlama tarixi
+ExpenseReportDomain=Müraciət etmək üçün domen
+ExpenseReportIkDesc=Siz kilometr xərclərinin hesablanmasını əvvəllər müəyyən edilmiş kateqoriyaya və aralığa görə dəyişə bilərsiniz. <b>d</b> kilometrlərlə olan məsafədir
+ExpenseReportLimitAmount=Maksimum məbləğ
+ExpenseReportLimitOn=Limit aktivdir
+ExpenseReportLine=Xərc hesabatı xətti
+ExpenseReportPaid=Xərc hesabatı ödənildi
 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
+ExpenseReportPayment=Xərc hesabatı ödənişi
+ExpenseReportRef=Ref. xərc hesabatı
+ExpenseReportRefused=Xərc hesabatı rədd edildi
+ExpenseReportRefusedMessage=Xərc hesabatı %s rədd edildi.<br> - İstifadəçi: %s<br> - İmtina edən: %s<br> - İmtina səbəbi: %s<br>Xərc hesabatını göstərmək üçün bura klikləyin: %s
+ExpenseReportRestrictive=Həddindən artıq qadağandır
+ExpenseReportRuleErrorOnSave=Xəta: %s
+ExpenseReportRuleSave=Xərc hesabatı qaydası saxlanıldı
+ExpenseReportRulesDesc=Xərc hesabatları üçün maksimum məbləğ qaydalarını müəyyən edə bilərsiniz. Xərc hesabatına yeni xərc əlavə edildikdə bu qaydalar tətbiq ediləcək
+ExpenseReportWaitingForApproval=Yeni xərc hesabatı təsdiq üçün təqdim edilib
+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=Xərc hesabatı yenidən təsdiq üçün təqdim edilib
+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
+ExpenseReportsIk=Yürüş ödənişlərinin konfiqurasiyası
+ExpenseReportsRules=Xərc hesabatı qaydaları
+ExpenseReportsToApprove=Təsdiq üçün xərc hesabatları
+ExpenseReportsToPay=Ödəniləcək xərc hesabatları
+ExpensesArea=Xərc hesabatları sahəsi
+FeesKilometersOrAmout=Məbləğ və ya kilometr
+LastExpenseReports=Ən son %s xərc hesabatları
+ListOfFees=Ödənişlərin siyahısı
+ListOfTrips=Xərc hesabatlarının siyahısı
+ListToApprove=Təsdiq gözləyir
+ListTripsAndExpenses=Xərc hesabatlarının siyahısı
+MOTIF_CANCEL=Səbəb
+MOTIF_REFUS=Səbəb
+ModePaiement=Ödəniş rejimi
+NewTrip=Yeni xərc hesabatı
+nolimitbyEX_DAY=gün (məhdudiyyət yoxdur)
+nolimitbyEX_EXP=xətt üzrə (məhdudiyyət yoxdur)
+nolimitbyEX_MON=aya görə (məhdudiyyət yoxdur)
+nolimitbyEX_YEA=il üzrə (məhdudiyyət yoxdur)
+NoTripsToExportCSV=Bu dövr üçün ixrac üçün xərc hesabatı yoxdur.
+NOT_AUTHOR=Siz bu xərc hesabatının müəllifi deyilsiniz. Əməliyyat ləğv edildi.
+OnExpense=Xərc xətti
+PDFStandardExpenseReports=Xərc hesabatı üçün PDF sənədi yaratmaq üçün standart şablon
+PaidTrip=Xərc hesabatını ödəyin
+REFUSEUR=tərəfindən rədd edildi
+RangeIk=Yürüş məsafəsi
+RangeNum=Aralıq %d
+SaveTrip=Xərc hesabatını təsdiqləyin
+ShowExpenseReport=Xərc hesabatını göstərin
+ShowTrip=Xərc hesabatını göstərin
+TripCard=Xərc hesabat kartı
+TripId=Id xərc hesabatı
+TripNDF=Məlumat xərcləri hesabatı
+TripSociete=İnformasiya şirkəti
+Trips=Xərc hesabatları
+TripsAndExpenses=Xərclər haqqında hesabat
+TripsAndExpensesStatistics=Xərc hesabatlarının statistikası
+TypeFees=Ödəniş növləri
+UploadANewFileNow=İndi yeni sənəd yükləyin
+VALIDATOR=Təsdiq üçün cavabdeh olan istifadəçi
+VALIDOR=tərəfindən təsdiq edilmişdir
+ValidateAndSubmit=Təsdiq edin və təsdiq üçün təqdim edin
+ValidatedWaitingApproval=Təsdiq edildi (təsdiq gözlənilir)
+ValideTrip=Xərc hesabatını təsdiqləyin
+
+## Dictionary
+EX_BRE=Səhər yeməyi
+EX_CAM=CV-yə qulluq və təmir
+EX_CAM_VP=PV-yə qulluq və təmir
+EX_CAR=Avtomobil icarəsi
+EX_CUR=Müştərilərin qəbulu
+EX_DOC=Sənədlər
+EX_EMM=İşçilərin yeməyi
+EX_FUE=Yanacaq CV
+EX_FUE_VP=Yanacaq PV
+EX_GUM=Qonaqların yeməyi
+EX_HOT=Otel
+EX_IND=Təzminatlı nəqliyyat abunəsi
+EX_KME=Yürüş xərcləri
+EX_OTR=Digər qəbul
+EX_PAR=Parkinq CV
+EX_PAR_VP=Dayanacaq PV
+EX_POS=Poçt
+EX_SUM=Baxım təchizatı
+EX_SUO=Ofis ləvazimatları
+EX_TAX=Müxtəlif Vergilər
+EX_TOL=Ödənişli CV
+EX_TOL_VP=Ödənişli PV
+TF_BUS=avtobus
+TF_CAR=Avtomobil
+TF_ESSENCE=Yanacaq
+TF_HOTEL=Otel
+TF_LUNCH=Nahar
 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
+TF_OTHER=Digər
+TF_PEAGE=Ödəniş
+TF_TAXI=taksi
+TF_TRAIN=Qatar
+TF_TRIP=Nəqliyyat
diff --git a/htdocs/langs/az_AZ/users.lang b/htdocs/langs/az_AZ/users.lang
index b6c7feb7bd2..6de42ce55cb 100644
--- a/htdocs/langs/az_AZ/users.lang
+++ b/htdocs/langs/az_AZ/users.lang
@@ -1,126 +1,136 @@
 # 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
-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>
+HRMArea=HRM sahəsi
+UserCard=İstifadəçi kartı
+GroupCard=Qrup kartı
+Permission=İcazə
+Permissions=İcazələr
+EditPassword=Şifrəni redaktə edin
+SendNewPassword=Şifrəni bərpa edin və göndərin
+SendNewPasswordLink=Parolun sıfırlanması üçün keçid göndərin
+ReinitPassword=Şifrəni bərpa edin
+PasswordChangedTo=Parol dəyişdirildi: %s
+SubjectNewPassword=%s üçün yeni parolunuz
+GroupRights=Qrup icazələri
+UserRights=İstifadəçi icazələri
+Credentials=Etibarnamələr
+UserGUISetup=İstifadəçi Ekran Quraşdırma
+DisableUser=Deaktiv edin
+DisableAUser=İstifadəçini deaktiv edin
+DeleteUser=Sil
+DeleteAUser=İstifadəçini silin
+EnableAUser=İstifadəçini aktivləşdirin
+DeleteGroup=Sil
+DeleteAGroup=Qrupu silin
+ConfirmDisableUser=<b>%s</b> istifadəçisini deaktiv etmək istədiyinizə əminsiniz?
+ConfirmDeleteUser=<b>%s</b> istifadəçisini silmək istədiyinizə əminsiniz?
+ConfirmDeleteGroup=<b>%s</b> qrupunu silmək istədiyinizə əminsiniz?
+ConfirmEnableUser=<b>%s</b> istifadəçisini aktivləşdirmək istədiyinizə əminsiniz?
+ConfirmReinitPassword=İstifadəçi üçün yeni parol yaratmaq istədiyinizə əminsiniz <b>%s</b>?
+ConfirmSendNewPassword=İstifadəçi <b>%s</b> üçün yeni parol yaratmaq və göndərmək istədiyinizə əminsiniz span>?
+NewUser=Yeni istifadəçi
+CreateUser=İstifadəçi yaradın
+LoginNotDefined=Giriş müəyyən edilməyib.
+NameNotDefined=Ad müəyyən edilməyib.
+ListOfUsers=İstifadəçilərin siyahısı
+SuperAdministrator=Çox şirkət administratoru
+SuperAdministratorDesc=Çox şirkətli sistem administratoru (quraşdırma və istifadəçiləri dəyişə bilər)
+DefaultRights=Defolt İcazələr
+DefaultRightsDesc=Burada avtomatik olaraq <u>a verilən <u>defolt</u> icazələrini təyin edin. yeni</u> istifadəçi (mövcud istifadəçilər üçün icazələri dəyişdirmək üçün istifadəçi kartına keçin).
+DolibarrUsers=Dolibarr istifadəçiləri
+LastName=Soyad
+FirstName=Ad
+ListOfGroups=Qrupların siyahısı
+NewGroup=Yeni qrup
+CreateGroup=Qrup yaradın
+RemoveFromGroup=Qrupdan çıxarın
+PasswordChangedAndSentTo=Parol dəyişdirildi və <b>%s</b> ünvanına göndərildi.
+PasswordChangeRequest=<b>%s</b> üçün parolun dəyişdirilməsi sorğusu
 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
+IfLoginExistPasswordRequestSent=Bu giriş etibarlı hesabdırsa (etibarlı e-poçt ilə), parolun sıfırlanması üçün e-poçt göndərilib.
+IfEmailExistPasswordRequestSent=Bu e-poçt etibarlı hesabdırsa, parolu sıfırlamaq üçün e-poçt göndərilib (heç nə almasanız, SPAM qovluğunuzu yoxlamağı unutmayın)
+ConfirmPasswordReset=Parolun sıfırlanmasını təsdiqləyin
+MenuUsersAndGroups=İstifadəçilər və Qruplar
+LastGroupsCreated=Ən son %s qruplar yaradıldı
+LastUsersCreated=Ən son %s istifadəçi yaradılıb
+ShowGroup=Qrupu göstərin
+ShowUser=İstifadəçini göstər
+NonAffectedUsers=Təyin olunmamış istifadəçilər
+UserModified=İstifadəçi uğurla dəyişdirildi
+PhotoFile=Foto fayl
+ListOfUsersInGroup=Bu qrupdakı istifadəçilərin siyahısı
+ListOfGroupsForUser=Bu istifadəçi üçün qrupların siyahısı
+LinkToCompanyContact=Üçüncü tərəfə / əlaqəyə keçid
+LinkedToDolibarrMember=Üzv üçün keçid
+LinkedToDolibarrUser=İstifadəçiyə keçid
+LinkedToDolibarrThirdParty=Üçüncü tərəfə keçid
+CreateDolibarrLogin=İstifadəçi yaradın
+CreateDolibarrThirdParty=Üçüncü tərəf yaradın
+LoginAccountDisableInDolibarr=Dolibarr-da hesab deaktiv edilib
+PASSWORDInDolibarr=Parol Dolibarr-da dəyişdirildi
+UsePersonalValue=Şəxsi dəyərdən istifadə edin
+ExportDataset_user_1=İstifadəçilər və onların xüsusiyyətləri
+DomainUser=Domen istifadəçisi %s
+Reactivate=Yenidən aktivləşdirin
+CreateInternalUserDesc=Bu forma sizə şirkətinizdə/təşkilatınızda daxili istifadəçi yaratmağa imkan verir. Xarici istifadəçi (müştəri, satıcı və s.) yaratmaq üçün üçüncü tərəfin əlaqə kartından "Dolibarr İstifadəçisi Yarat" düyməsini istifadə edin.
+InternalExternalDesc=<b>daxili</b> istifadəçisi şirkətinizin/təşkilatınızın bir hissəsi olan və ya təşkilatınızdan kənar tərəfdaş istifadəçidir onun şirkəti ilə bağlı datadan daha çox məlumat görməsi tələb oluna bilər (icazə sistemi onun nəyi görə biləcəyini və ya edə bilməyəcəyini və ya edə bilməyəcəyini müəyyən edəcək).<br>An <b>external</b> istifadəçi YALNIZ özü ilə bağlı dataya baxmalı olan müştəri, satıcı və ya başqasıdır (Üçüncü tərəf üçün xarici istifadəçi yaratmaq mümkün ola bilər üçüncü tərəfin əlaqə qeydindən edilir).<br><br>Hər iki halda, siz funksiyalara icazə verməlisiniz. istifadəçi lazımdır.
+PermissionInheritedFromAGroup=İstifadəçi qrupundan birindən miras alındığı üçün icazə verildi.
+Inherited=miras qalmış
+UserWillBe=Yaradılmış istifadəçi olacaq
+UserWillBeInternalUser=Yaradılmış istifadəçi daxili istifadəçi olacaq (çünki xüsusi üçüncü tərəflə əlaqəsi yoxdur)
+UserWillBeExternalUser=Yaradılmış istifadəçi xarici istifadəçi olacaq (çünki xüsusi üçüncü tərəflə əlaqələndirilir)
+IdPhoneCaller=İd telefon zəngi
+NewUserCreated=%s adlı istifadəçi yaradıldı
+NewUserPassword=%s üçün parol dəyişikliyi
+NewPasswordValidated=Yeni parolunuz təsdiqləndi və daxil olmaq üçün indi istifadə edilməlidir.
+EventUserModified=İstifadəçi %s dəyişdirildi
+UserDisabled=İstifadəçi %s deaktiv edilib
+UserEnabled=İstifadəçi %s aktivləşdirildi
+UserDeleted=İstifadəçi %s silindi
+NewGroupCreated=%s qrupu yaradıldı
+GroupModified=%s qrupu dəyişdirildi
+GroupDeleted=%s qrupu silindi
+ConfirmCreateContact=Bu kontakt üçün Dolibarr hesabı yaratmaq istədiyinizə əminsiniz?
+ConfirmCreateLogin=Bu üzv üçün Dolibarr hesabı yaratmaq istədiyinizə əminsiniz?
+ConfirmCreateThirdParty=Bu üzv üçün üçüncü tərəf yaratmaq istədiyinizə əminsiniz?
+LoginToCreate=Yaratmaq üçün daxil olun
+NameToCreate=Yaratmaq üçün üçüncü tərəfin adı
+YourRole=Sizin rollarınız
+YourQuotaOfUsersIsReached=Aktiv istifadəçilər kvotanıza çatdı!
+NbOfUsers=İstifadəçilərin sayı
+NbOfPermissions=İcazələrin sayı
+DontDowngradeSuperAdmin=Yalnız başqa bir admin bir admini aşağı səviyyəyə endirə bilər
+HierarchicalResponsible=Nəzarətçi
+HierarchicView=İyerarxik görünüş
+UseTypeFieldToChange=Dəyişmək üçün Növ sahəsini istifadə edin
 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=Daxil olmaq üçün OpenID istifadə edin
+WeeklyHours=İş saatları (həftədə)
+ExpectedWorkedHours=Həftədə gözlənilən iş saatları
+ColorUser=İstifadəçinin rəngi
+DisabledInMonoUserMode=Baxım rejimində deaktiv edilib
+UserAccountancyCode=İstifadəçinin uçot kodu
+UserLogoff=İstifadəçi çıxışı: %s
+UserLogged=İstifadəçi daxil olub: %s
+UserLoginFailed=İstifadəçi girişi uğursuz oldu: %s
+DateOfEmployment=İşə qəbul tarixi
+DateEmployment=Məşğulluq
+DateEmploymentStart=İşə başlama tarixi
+DateEmploymentEnd=İşin bitmə tarixi
+RangeOfLoginValidity=Etibarlılıq tarixi aralığına daxil olun
+CantDisableYourself=Siz öz istifadəçi qeydinizi söndürə bilməzsiniz
+ForceUserExpenseValidator=Məcburi xərc hesabatı təsdiqləyicisi
+ForceUserHolidayValidator=Məcburi məzuniyyət sorğusu təsdiqləyicisi
+ValidatorIsSupervisorByDefault=Varsayılan olaraq, validator istifadəçinin nəzarətçisidir. Bu davranışı saxlamaq üçün boş saxlayın.
+UserPersonalEmail=Şəxsi e-poçt
+UserPersonalMobile=Şəxsi mobil telefon
+WarningNotLangOfInterface=Xəbərdarlıq, bu istifadəçinin danışdığı əsas dildir, görmək üçün seçdiyi interfeysin dili deyil. Bu istifadəçi tərəfindən görünən interfeys dilini dəyişmək üçün %s sekmesine keçin.
+DateLastLogin=Son giriş tarixi
+DatePreviousLogin=Əvvəlki giriş tarixi
+IPLastLogin=IP son giriş
+IPPreviousLogin=IP əvvəlki giriş
+ShowAllPerms=Bütün icazə sətirlərini göstərin
+HideAllPerms=Bütün icazə sətirlərini gizlədin
+UserPublicPageDesc=Bu istifadəçi üçün virtual kartı aktivləşdirə bilərsiniz. Smartfonu olan hər kəsə onu skan etmək və əlaqənizi onun ünvan kitabına əlavə etmək üçün istifadəçi profili və barkod olan url mövcud olacaq.
+EnablePublicVirtualCard=İstifadəçinin virtual vizit kartını aktivləşdirin
+UserEnabledDisabled=İstifadəçi statusu dəyişdi: %s
+AlternativeEmailForOAuth2=OAuth2 girişi üçün Alternativ E-poçt
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 4b280c8a2eb..ad269bbf4ac 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -32,7 +32,7 @@ AddWebsite=Veb sayt əlavə edin
 Webpage=Veb səhifə/konteyner
 AddPage=Səhifə/konteyner əlavə edin
 PageContainer=Səhifə
-PreviewOfSiteNotYetAvailable=<strong>%s</strong> vebsaytınızın önizləməsi hələ mövcud deyil. Siz əvvəlcə '<strong>Tam veb sayt şablonunu idxal edin</strong>' və ya sadəcə 'b0e7806z span>Səhifə/konteyner əlavə edin<span class='notranslate'></strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=%s id ilə sorğu edilən səhifədə hələ məzmun yoxdur və ya keş faylı .tpl.php silinib. Bunu həll etmək üçün səhifənin məzmununu redaktə edin.
 SiteDeleted='%s' veb saytı silindi
 PageContent=Səhifə/Contenair
@@ -49,12 +49,12 @@ SetHereVirtualHost=<u>Apache/NGinx/... ilə istifadə edin</u><br>Create veb ser
 ExampleToUseInApacheVirtualHostConfig=Apache virtual host quraşdırmasında istifadə etmək üçün nümunə:
 YouCanAlsoTestWithPHPS=<u>PHP daxili server ilə istifadə edin</u><br>Ətraf mühiti inkişaf etdirə bilərsiniz <br><strong>php -S 0.0.0.0 işlətməklə saytı PHP daxil edilmiş veb serveri (PHP 5.5 tələb olunur) ilə sınamağa üstünlük verin :8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Veb saytınızı başqa bir Dolibarr Hosting provayderi ilə idarə edin</u><br> internetdə mövcud Apache və ya NGinx kimi veb serveriniz yoxdursa, siz vebsaytınızı Veb-sayt modulu ilə tam inteqrasiyanı təmin edən başqa bir Dolibarr hosting provayderi tərəfindən təqdim edilən başqa bir Dolibarr nümunəsinə ixrac edə və idxal edə bilərsiniz. Siz bəzi Dolibarr hostinq provayderlərinin siyahısını <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a> saytında tapa bilərsiniz.
-CheckVirtualHostPerms=Virtual host istifadəçisinin (məsələn, www-data) <strong>%sb0a65d071f6fc90z olduğunu da yoxlayın. <span class='notranslate'><br><strong>%s<span sinfinə </span> fayl icazələri ='notranslate'></strong></span>
+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=Oxuyun
 WritePerm=yaz
 TestDeployOnWeb=Vebdə sınaqdan keçirin/yerləşdirin
-PreviewSiteServedByWebServer=<u>Önizləmə %s yeni tabda.</u><br><br>%s xarici veb server (Apache, Nginx kimi) tərəfindən xidmət göstərəcək ). Kataloqa işarə etməzdən əvvəl bu serveri quraşdırıb quraşdırmalısınız:<br><strong>%s span><span class='notranslate'></strong><br>URL xarici server tərəfindən təqdim olunur:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Önizləmə %s yeni tabda.</u><br><br>%s Dolibarr serveri tərəfindən xidmət göstərəcək, ona görə də əlavə veb serverə ehtiyac yoxdur (Apache, Nginx, IIS kimi) quraşdırılmalıdır.<br>Əlverişsiz odur ki, səhifələrin URL-ləri istifadəçi dostu deyil və Dolibarr yolunuzla başlayır.<br>URL Dolibarr tərəfindən təqdim olunur:<br><strong><spanteec='z08</span><spanteec='notranslate' /span></strong><br><br>Öz xarici veb serverinizdən istifadə etmək üçün bu veb saytına xidmət edin, veb serverinizdə qovluğa işarə edən virtual host yaradın<br><strong>%s</strong><br>sonra bu veb-saytın xüsusiyyətlərinə bu virtual serverin adını daxil edin və üzərinə klikləyin "İnternetdə sınaqdan keçirin/yerləşdirin" linki.
+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=Xarici veb server tərəfindən xidmət edilən virtual hostun URL-i müəyyən edilməyib
 NoPageYet=Hələ səhifə yoxdur
 YouCanCreatePageOrImportTemplate=Siz yeni səhifə yarada və ya tam veb sayt şablonunu idxal edə bilərsiniz
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=Siz redaktorda "Mənbə" düyməsini istifadə edə
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Paylaşım linki ilə paylaşılan şəkil üçün (faylın paylaşma heş açarından istifadə edərək açıq giriş) sintaksis belədir:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='notransa606f </span><br>
-YouCanEditHtmlSource3=PHP obyektinin şəklinin URL-ni əldə etmək üçün istifadə edin<br><strong>&lt; span>img src="<span class='notranslate'>&lt;?php çap getImagePublicURLOfObject($object, 1, "_small") ?b0012c7dcbe0870<span> class='notranslate'>&gt;</span></strong><br>
-YouCanEditHtmlSourceMore=<br>Daha çox HTML və ya dinamik kod nümunələri <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">viki sənədlərindəb0e40dc6508d əlçatandır >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Səhifəni/konteyneri klonlayın
 CloneSite=Klon saytı
 SiteAdded=Veb sayt əlavə edildi
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
index bda987276b1..d5fa78aa0e1 100644
--- a/htdocs/langs/az_AZ/withdrawals.lang
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -1,156 +1,173 @@
 # 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
-CreditTransfer=Credit transfer
-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
-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
-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=Birbaşa debet sifarişləri ilə ödənişlər
+SuppliersStandingOrdersArea=Kredit köçürmə yolu ilə ödənişlər
+StandingOrdersPayment=Birbaşa debet ödəniş tapşırıqları
+StandingOrderPayment=Birbaşa debet ödəniş tapşırığı
+NewStandingOrder=Yeni birbaşa debet sifarişi
+NewPaymentByBankTransfer=Kredit köçürmə yolu ilə yeni ödəniş
+StandingOrderToProcess=Emal etmək
+PaymentByBankTransferReceipts=Kredit köçürmə sifarişləri
+PaymentByBankTransferLines=Kredit köçürmə sifariş xətləri
+WithdrawalsReceipts=Birbaşa debet sifarişləri
+WithdrawalReceipt=Birbaşa debet sifarişi
+BankTransferReceipts=Kredit köçürmə sifarişləri
+BankTransferReceipt=Kredit köçürmə sifarişi
+LatestBankTransferReceipts=Ən son %s kredit köçürmə sifarişləri
+LastWithdrawalReceipts=Ən son %s birbaşa debet faylları
+WithdrawalsLine=Birbaşa debet sifariş xətti
+CreditTransfer=Kredit köçürməsi
+CreditTransferLine=Kredit köçürmə xətti
+WithdrawalsLines=Birbaşa debet sifariş xətləri
+CreditTransferLines=Kredit köçürmə xətləri
+RequestStandingOrderToTreat=İşləmək üçün birbaşa debet ödəniş tapşırığı üçün sorğular
+RequestStandingOrderTreated=Birbaşa debet ödəniş tapşırığı üçün sorğular emal edildi
+RequestPaymentsByBankTransferToTreat=Kreditin köçürülməsi üçün sorğuların işlənməsi
+RequestPaymentsByBankTransferTreated=Kredit köçürmə sorğularına baxıldı
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Hələ mümkün deyil. Xüsusi sətirlərdə rədd elan etməzdən əvvəl geri çəkilmə statusu "kreditə alınmış" olaraq təyin edilməlidir.
+NbOfInvoiceToWithdraw=Gözləyən birbaşa debet sifarişi ilə ixtisaslı müştəri hesab-fakturalarının sayı
+NbOfInvoiceToWithdrawWithInfo=Müəyyən bank hesabı məlumatları olan birbaşa debet ödəniş tapşırıqları ilə müştəri hesab-fakturasının nömrəsi
+NbOfInvoiceToPayByBankTransfer=Kredit köçürməsi ilə ödənişi gözləyən ixtisaslı təchizatçı hesab-fakturalarının sayı
+SupplierInvoiceWaitingWithdraw=Kredit köçürmə yolu ilə ödənişi gözləyən satıcı fakturası
+InvoiceWaitingWithdraw=Birbaşa debet üçün faktura gözləyir
+InvoiceWaitingPaymentByBankTransfer=Kredit köçürməsini gözləyən faktura
+AmountToWithdraw=Çıxarılacaq məbləğ
+AmountToTransfer=Köçürüləcək məbləğ
+NoInvoiceToWithdraw='%s' üçün açıq faktura gözlənmir. Sorğu etmək üçün faktura kartındakı '%s' tabına keçin.
+NoSupplierInvoiceToWithdraw=Açıq '%s' olan heç bir təchizatçı fakturası gözləmir. Sorğu etmək üçün faktura kartındakı '%s' tabına keçin.
+ResponsibleUser=İstifadəçi Məsuliyyətlidir
+WithdrawalsSetup=Birbaşa debet ödənişinin qurulması
+CreditTransferSetup=Kredit köçürməsinin qurulması
+WithdrawStatistics=Birbaşa debet ödəniş statistikası
+CreditTransferStatistics=Kredit köçürmə statistikası
+Rejects=Rədd edir
+LastWithdrawalReceipt=Ən son %s birbaşa debet qəbzləri
+MakeWithdrawRequest=Birbaşa debet ödəniş tələbi edin
+MakeWithdrawRequestStripe=Stripe vasitəsilə birbaşa debet ödəniş sorğusu göndərin
+MakeBankTransferOrder=Kredit köçürmə sorğusu göndərin
+WithdrawRequestsDone=%s birbaşa debet ödəniş sorğuları qeydə alınıb
+BankTransferRequestsDone=%s kredit köçürmə sorğusu qeydə alınıb
+ThirdPartyBankCode=Üçüncü tərəf bank kodu
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=Heç bir faktura uğurla emal edilmədi. Hesab-fakturaların etibarlı IBAN-ı olan şirkətlərdə olduğunu yoxlayın.
+NoSalariesCouldBeWithdrawed=Heç bir maaş uğurla işlənməyib. Etibarlı IBAN-ı olan istifadəçilərin əmək haqqının olduğunu yoxlayın.
+WithdrawalCantBeCreditedTwice=Bu geri çəkilmə qəbzi artıq kreditləşdirilmiş kimi qeyd olunub; bunu iki dəfə etmək olmaz, çünki bu, potensial olaraq dublikat ödənişlər və bank qeydləri yarada bilər.
+ClassCredited=Krediti təsnifləşdirin
+ClassDebited=Debeti təsnif edin
+ClassCreditedConfirm=Bu geri çəkilmə qəbzini bank hesabınıza daxil olan kimi təsnif etmək istədiyinizə əminsiniz?
+TransData=Ötürülmə tarixi
+TransMetod=Ötürmə üsulu
+Send=Göndər
+Lines=Xətlər
+StandingOrderReject=Rədd qeyd edin
+WithdrawsRefused=Birbaşa debet rədd edildi
+WithdrawalRefused=Çıxarma rədd edildi
+CreditTransfersRefused=Kredit köçürmələri rədd edildi
+WithdrawalRefusedConfirm=Cəmiyyət üçün geri çəkilmə rəddinə daxil olmaq istədiyinizə əminsiniz
+RefusedData=Rədd edilmə tarixi
+RefusedReason=Rədd edilmə səbəbi
+RefusedInvoicing=Rədd edilmənin hesablanması
+NoInvoiceRefused=Müştəridən imtinaya görə ödəniş etməyin
+InvoiceRefused=Müştəridən imtinaya görə ödəniş edin
+DirectDebitRefusedInvoicingDesc=Bu imtinanın müştəridən ödənilməli olduğunu bildirmək üçün bir bayraq qoyun
+StatusDebitCredit=Vəziyyət debeti/krediti
+StatusWaiting=Gözləyirəm
+StatusTrans=Göndərildi
+StatusDebited=debet edilmiş
+StatusCredited=Kredit
+StatusPaid=Ödənişli
+StatusRefused=İmtina etdi
+StatusMotif0=Dəqiqləşdirilməmiş, naməlum
+StatusMotif1=Yetərsiz vəsait
+StatusMotif2=Müraciət etiraz edildi
+StatusMotif3=Birbaşa debet ödəniş tapşırığı yoxdur
+StatusMotif4=Satış Sifarişi
+StatusMotif5=RIB yararsızdır
+StatusMotif6=Balanssız hesab
+StatusMotif7=Məhkəmə qərarı
+StatusMotif8=Başqa səbəb
+CreateForSepaFRST=Birbaşa debet faylı yaradın (SEPA FRST)
+CreateForSepaRCUR=Birbaşa debet faylı yaradın (SEPA RCUR)
+CreateAll=Birbaşa debet faylı yaradın
+CreateFileForPaymentByBankTransfer=Kredit köçürməsi üçün fayl yaradın
+CreateSepaFileForPaymentByBankTransfer=Kredit köçürmə faylı yaradın (SEPA)
+CreateGuichet=Yalnız ofis
+CreateBanque=Yalnız bank
+OrderWaiting=Müalicə gözləyir
+NotifyTransmision=Sifariş faylının ötürülməsini qeyd edin
+NotifyCredit=Sifarişin kreditini qeyd edin
+NumeroNationalEmetter=Milli Transmitter Nömrəsi
+WithBankUsingRIB=RIB istifadə edən bank hesabları üçün
+WithBankUsingBANBIC=IBAN/BIC/SWIFT istifadə edən bank hesabları üçün
+BankToReceiveWithdraw=Bank Hesabının qəbulu
+BankToPayCreditTransfer=Ödəniş mənbəyi kimi istifadə edilən bank hesabı
+CreditDate=Kredit
+WithdrawalFileNotCapable=Ölkəniz üçün geri götürmə qəbzi faylını yaratmaq mümkün deyil %s (Ölkəniz dəstəklənmir)
+ShowWithdraw=Birbaşa debit sifarişini göstərin
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Bununla belə, əgər hesab-fakturada hələ emal olunmamış ən azı bir birbaşa debet ödəniş tapşırığı varsa, o, pulun əvvəlcədən idarə edilməsinə icazə vermək üçün ödənilmiş kimi təyin edilməyəcək.
+DoStandingOrdersBeforePayments=Bu tab birbaşa debet ödəniş tapşırığını tələb etməyə imkan verir. Birbaşa debet sifariş faylını yaratmaq və idarə etmək üçün "Bank->Birbaşa debetlə ödəniş" menyusuna daxil ola bilərsiniz.
+DoStandingOrdersBeforePayments2=Siz həmçinin Stripe kimi SEPA ödəniş prosessoruna birbaşa sorğu göndərə bilərsiniz.
+DoStandingOrdersBeforePayments3=Sorğu bağlandıqda, qaimə-fakturalar üzrə ödəniş avtomatik qeydə alınacaq və ödəniləcək qalıq sıfır olduqda qaimə-fakturalar bağlanacaq.
+DoCreditTransferBeforePayments=Bu tab sizə kredit köçürmə sifarişi tələb etməyə imkan verir. Bitdikdən sonra Kredit köçürmə sifarişi faylını yaratmaq və idarə etmək üçün "Bank->Kredit köçürməsi ilə ödəniş" menyusuna daxil olun.
+DoCreditTransferBeforePayments3=Kredit köçürmə tapşırığı bağlandıqda, qaimə-fakturalar üzrə ödəniş avtomatik qeydə alınacaq və ödəniləcək qalıq sıfır olduqda qaimə-fakturalar bağlanacaq.
+WithdrawalFile=Debet sifariş faylı
+CreditTransferFile=Kredit köçürmə faylı
+SetToStatusSent="Fayl göndərildi" vəziyyətinə təyin edin
+ThisWillAlsoAddPaymentOnInvoice=Bu, həmçinin hesab-fakturalardakı ödənişləri qeyd edəcək və ödəməyə qalsa, onları "Ödənilmiş" kimi təsnif edəcək
+StatisticsByLineStatus=Xətlərin statusuna görə statistika
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-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=Mandat imza tarixi
+RUMLong=Unikal Mandat Arayışı
+RUMWillBeGenerated=Boşdursa, bank hesabı məlumatı saxlandıqdan sonra UMR (Unikal Mandat Arayışı) yaradılacaq.
+WithdrawMode=Birbaşa debet rejimi (FRST və ya RCUR)
+WithdrawRequestAmount=Birbaşa debet sorğusunun məbləği:
+BankTransferAmount=Kredit Köçürmə sorğusunun məbləği:
+WithdrawRequestErrorNilAmount=Boş məbləğ üçün birbaşa debet sorğusu yaratmaq mümkün deyil.
+SepaMandate=SEPA Birbaşa Debit Mandatı
+SepaMandateShort=SEPA Mandatı
+PleaseReturnMandate=Lütfən, bu mandat formasını e-poçt vasitəsilə %s və ya poçtla qaytarın
+SEPALegalText=Bu mandat formasını imzalamaqla siz (A) %s və onun ödəniş xidməti provayderinə hesabınızdan debet etmək üçün bankınıza təlimatlar göndərmək və (B) banka hesabınızdan debet etmək icazəsi verirsiniz. %s təlimatlarına uyğun olaraq. Hüquqlarınızın bir hissəsi olaraq, bankınızla müqavilənizin şərtlərinə uyğun olaraq, bankınızdan pulunuzu geri almaq hüququnuz var. Yuxarıdakı mandatla bağlı hüquqlarınız bankınızdan əldə edə biləcəyiniz bəyanatda izah olunur. Siz gələcək ödənişlər haqqında bildirişlərin baş verməsindən 2 gün əvvəl almağa razılaşırsınız.
+CreditorIdentifier=Kreditor İdentifikatoru
+CreditorName=Kreditorun adı
+SEPAFillForm=(B) * işarələnmiş bütün sahələri doldurun
+SEPAFormYourName=Adınız
+SEPAFormYourBAN=Bank Hesabınızın Adı (IBAN)
+SEPAFormYourBIC=Bank İdentifikator Kodunuz (BIC)
+SEPAFrstOrRecur=Ödəniş növü
+ModeRECUR=Təkrarlanan ödəniş
+ModeRCUR=Təkrarlanan ödəniş
+ModeFRST=Birdəfəlik ödəniş
+PleaseCheckOne=Zəhmət olmasa yalnız birini yoxlayın
+CreditTransferOrderCreated=%s kredit transfer sifarişi yaradıldı
+DirectDebitOrderCreated=Birbaşa debet sifarişi %s yaradıldı
+AmountRequested=Tələb olunan məbləğ
 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=İcra tarixi
+CreateForSepa=Birbaşa debet faylı yaradın
+ICS=Kreditor İdentifikatoru - ICS
+IDS=Debitor İdentifikatoru
+END_TO_END="EndToEndId" SEPA XML teqi - Hər əməliyyat üçün təyin edilmiş unikal id
+USTRD="Strukturlaşdırılmamış" SEPA XML etiketi
+ADDDAYS=İcra tarixinə günlər əlavə edin
+NoDefaultIBANFound=Bu üçüncü tərəf üçün heç bir defolt IBAN tapılmadı
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Direct debit payment order refused
+InfoCreditSubject=%s birbaşa debet ödəniş tapşırığının bank tərəfindən ödənilməsi
+InfoCreditMessage=%s birbaşa debet ödəniş tapşırığı bank tərəfindən ödənilib<br>Ödəniş datası: b0ecb2ec87f49fz
+InfoTransSubject=%s birbaşa debet ödəniş tapşırığının banka ötürülməsi
+InfoTransMessage=%s birbaşa debet ödəniş tapşırığı %s %s tərəfindən banka göndərildi .<br><br>
+InfoTransData=Məbləğ: %s<br>Metod: %s<br>Tarix: %s
+InfoRejectSubject=Birbaşa debet ödəniş tapşırığından imtina edildi
 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
+ModeWarning=Real rejim üçün seçim təyin edilmədi, bu simulyasiyadan sonra dayanırıq
+ErrorCompanyHasDuplicateDefaultBAN=İD %s olan şirkətin birdən çox defolt bank hesabı var. Hansı birini istifadə edəcəyinizi bilmək üçün heç bir yol yoxdur.
+ErrorICSmissing=Bank hesabında İCS çatışmır %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Birbaşa debet sifarişinin ümumi məbləği sətirlərin cəmindən fərqlənir
+WarningSomeDirectDebitOrdersAlreadyExists=Xəbərdarlıq: %s məbləğində tələb olunan bəzi gözlənilən Birbaşa Debit sifarişləri (%s) var.
+WarningSomeCreditTransferAlreadyExists=Xəbərdarlıq: %s məbləğində artıq bir neçə gözlənilən Kredit Transferi (%s) tələb olunub.
+UsedFor=%s üçün istifadə olunur
+Societe_ribSigned=SEPA mandatı İmzalanıb
+NbOfInvoiceToPayByBankTransferForSalaries=Kredit köçürmə yolu ilə ödənişi gözləyən ixtisaslı maaşların sayı
+SalaryWaitingWithdraw=Kredit köçürmə yolu ilə ödənilməsini gözləyən maaşlar
+RefSalary=Maaş
+NoSalaryInvoiceToWithdraw='%s' gözlənilən maaş yoxdur. Sorğu etmək üçün əmək haqqı kartında '%s' sekmesine keçin.
+SalaryInvoiceWaitingWithdraw=Kredit köçürmə yolu ilə ödənilməsini gözləyən maaşlar
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index b72edebf8bc..87fc95012af 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -60,7 +60,7 @@ GUISetup=Интерфейс
 SetupArea=Настройки
 UploadNewTemplate=Качване на нов(и) шаблон(и)
 FormToTestFileUploadForm=Формуляр за тестване на качването на файлове (според настройката)
-ModuleMustBeEnabled=Модулът/Приложението <b>%s</b>трябва да е активиран. 
+ModuleMustBeEnabled=Модулът/Приложението <b>%s</b>трябва да е активиран.
 ModuleIsEnabled=Модулът/Приложението <b>%s</b>е активирано
 IfModuleEnabled=Забележка: Ефективно е само ако модула <b>%s</b> е активиран
 RemoveLock=Премахнете / преименувайте файла <b>%s</b>, ако съществува, за да разрешите използването на инструмента за инсталиране / актуализиране.
@@ -77,7 +77,7 @@ Dictionary=Речници
 ErrorReservedTypeSystemSystemAuto=Стойностите "system" и "systemauto" за тип са резервирани. Може да използвате "user" като стойност, за да добавите свой собствен запис.
 ErrorCodeCantContainZero=Кодът не може да съдържа стойност 0
 DisableJavascript=Изключване на Java скрипт и Ajax функции
-DisableJavascriptNote=Бележка: Само за тестване или отстраняване на грешки. За оптимизиране за незрящи хора или текствои браузъри може да използвате настройките за профила на потребителя. 
+DisableJavascriptNote=Бележка: Само за тестване или отстраняване на грешки. За оптимизиране за незрящи хора или текствои браузъри може да използвате настройките за профила на потребителя.
 UseSearchToSelectCompanyTooltip=Също така, ако имате голям брой контрагенти (> 100 000) може да увеличите скоростта като зададете стойност 1 за константата COMPANY_DONOTSEARCH_ANYWHERE в Настройки -> Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 UseSearchToSelectContactTooltip=Също така, ако имате голям брой контакти (> 100 000) може да увеличите скоростта като зададете стойност 1 за константата CONTACT_DONOTSEARCH_ANYWHERE в Настройки -> Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 DelaiedFullListToSelectCompany=Изчаква натискането на клавиш, преди да зареди съдържание в списъка с контрагенти. <br> Това може да увеличи производителността, ако имате голям брой контрагенти, но е по-малко удобно.
@@ -106,7 +106,7 @@ NextValueForInvoices=Следваща стойност (фактури)
 NextValueForCreditNotes=Следваща стойност (кредитни известия)
 NextValueForDeposit=Следваща стойност (авансови плащания)
 NextValueForReplacements=Следваща стойност (замествания)
-MustBeLowerThanPHPLimit=Забележка: вашата PHP конфигурация в момента ограничава максималния размер на файловете за качване до <b>%s</b></span span> <span class='notranslate'>%s, независимо от стойността на този параметър
+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=Забележка: Не е зададено ограничение във вашата PHP конфигурация
 MaxSizeForUploadedFiles=Максимален размер за качени файлове (0 за забрана на качването)
 UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход и някои публични страници
@@ -364,7 +364,7 @@ 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> клиентският код на n знака<br><b>{cccc000}</b> кода на клиента на n знака е последван от брояч, посветен на Клиент. Този брояч, предназначен за Клиент, се нулира едновременно с глобалния брояч.<br><b>{tttt}</b> Кодът от тип трета страна на n знака (вижте менюто Начало - Настройка - Речник - Типове контрагенти). Ако добавите този маркер, броячът ще бъде различен за всеки тип трета страна.<br>
 GenericMaskCodes3=Всички други символи в маската ще останат непокътнати. <br> Не са разрешени интервали. <br>
-GenericMaskCodes3EAN=Всички други знаци в маската ще останат непокътнати (с изключение на * или ? на 13-та позиция в EAN13).<br>Интервалите не са разрешени.<br></span span>В EAN13 последният знак след последния } на 13-та позиция трябва да бъде * или ? . Той ще бъде заменен от изчисления ключ.<span class='notranslate'><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>Пример за 99-ия %s на третата страна TheCompany, с Дата 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>Пример за трета страна, създадена на 31 януари 2023 г.:</u><br>
 GenericMaskCodes4c=<u>Пример за продукт, създаден на 2023-01-31:</u><br>
@@ -1197,6 +1197,7 @@ Skin=Тема на интерфейса
 DefaultSkin=Тема по подразбиране
 MaxSizeList=Максимална дължина за списък
 DefaultMaxSizeList=Максимална дължина по подразбиране за списъци
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Максимална дължина по подразбиране за кратки списъци (т.е. в карта на клиента)
 MessageOfDay=Послание на деня
 MessageLogin=Съобщение в страницата за вход
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Да не се експортират събития по-с
 SecurityKey = Ключ за защита
 ##### ClickToDial #####
 ClickToDialSetup=Настройка на модула за набиране (ClickToDial)
-ClickToDialUrlDesc=URL адресът се извиква при щракване върху снимката на телефона. В URL можете да използвате тагове<br><b>__PHONETO__</b>, които ще бъдат заменен с телефонния номер на лицето, на което да се обадите<br><b>__PHONEFROM__</b>, който ще бъде заменен с телефонен номер на обаждащото се лице (ваш)<br><b>__LOGIN__</b></span span>, които ще бъдат заменени с данни за влизане чрез кликване (дефинирани в потребителската карта)<span class='notranslate'><br><b>__PASS__ </b>, която ще бъде заменена с парола за набиране чрез кликване (дефинирана в потребителската карта).
+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=Този модул променя телефонните номера, когато използвате настолен компютър, във връзки, върху които може да се кликне. Щракването ще извика номера. Това може да се използва за стартиране на телефонния разговор, когато използвате софтуерен телефон на вашия работен плот или когато използвате CTI система, базирана на SIP протокол, например. Забележка: Когато използвате смартфон, телефонните номера винаги могат да се кликват.
 ClickToDialUseTelLink=Просто използвайте връзката "tel:" за телефонни номера
 ClickToDialUseTelLinkDesc=Използвайте този метод, ако вашите потребители имат софтфон или софтуерен интерфейс, инсталиран на същия компютър като браузъра, и се извиква, когато щракнете върху връзка, започваща с "tel:" във вашия браузър. Ако имате нужда от връзка, която започва с „sip:“ или пълно сървърно решение (няма нужда от локална инсталация на софтуер), трябва да зададете това на „Не“ и да попълните следващото поле.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 4eea2b8e91c..49c94c74a94 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Общо (с ДДС)
 TotalHT=Данъчна основа (без ДДС)
 TotalHTforthispage=Общо (без ДДС) за тази страница
 Totalforthispage=Общо за тази страница
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Сума за плащане
 TotalTTCToYourCredit=Общо (с ДДС) към вашия кредит
 TotalVAT=Начислен ДДС
@@ -647,6 +649,7 @@ ReportName=Име на отчет
 ReportPeriod=Период на отчет
 ReportDescription=Описание
 Report=Отчет
+Reports=Отчети
 Keyword=Ключова дума
 Origin=Произход
 Legend=Легенда
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index eea4ff7d25a..1c4503559d2 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Неуспешно добавяне на код в
 DictionariesCreated=Речникът <b>%s</b> е създаден успешно
 DictionaryDeleted=Речникът <b>%s</b> премахнат успешно
 PropertyModuleUpdated=Собствеността <b>%s</b> е актуализирана успешно
-InfoForApiFile=* Когато генерирате файл за първи път, всички методи ще бъдат създадени <strong>за всеки обект.</strong><br>* Когато щракнете върху <strong>remove</strong>, вие просто премахвате всички методи за класа <span ='notranslate'><strong></span>избран обект</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Страница за настройка на модула
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Можете да генерирате и редактирате тук файловете на класа, за да предоставите нови целеви селектори за имейл за модула за масово изпращане по имейл
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index a23c6f140e3..94ea0012d30 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -63,7 +63,7 @@ YouCanEditHtmlSourceckeditor=Може да редактирате изходни
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=За изображение, споделено с връзка за споделяне (отворен достъп чрез хеш ключа за споделяне на файла), синтаксисът е:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
-YouCanEditHtmlSource3=За да получите URL адреса на изображението на PHP обект, използвайте<br><strong>&lt;</span span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small")?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Още примери за HTML или динамичен код са налични в <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">документацията на wiki</a>.<br>
 ClonePage=Клониране на страница / контейнер
 CloneSite=Клониране на сайт
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 1b98c4b323c..0a1637641e7 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=অ্যাকাউন্টিং অ্যাকাউন্
 AccountingJournals=অ্যাকাউন্টিং জার্নাল
 AccountingJournal=অ্যাকাউন্টিং জার্নাল
 NewAccountingJournal=নতুন অ্যাকাউন্টিং জার্নাল
-ShowAccountingJournal=অ্যাকাউন্টিং জার্নাল দেখান
 NatureOfJournal=জার্নালের প্রকৃতি
 AccountingJournalType1=বিবিধ অপারেশন
 AccountingJournalType2=বিক্রয়
@@ -346,14 +345,14 @@ AccountingJournalType8=ইনভেন্টরি
 AccountingJournalType9=ধরে রাখা উপার্জন
 GenerationOfAccountingEntries=অ্যাকাউন্টিং এন্ট্রি প্রজন্ম
 ErrorAccountingJournalIsAlreadyUse=এই জার্নাল ইতিমধ্যে ব্যবহার করা হয়
-AccountingAccountForSalesTaxAreDefinedInto=দ্রষ্টব্য: বিক্রয় করের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট <b>%s</b>মেনুতে সংজ্ঞায়িত করা হয়েছে - <span class='notranslate'><b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=এন্ট্রি সংখ্যা
 NumberOfAccountancyMovements=আন্দোলনের সংখ্যা
 ACCOUNTING_DISABLE_BINDING_ON_SALES=বিক্রয়ের ক্ষেত্রে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (কাস্টমার ইনভয়েস অ্যাকাউন্টিংয়ে বিবেচনা করা হবে না)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ক্রয়ের ক্ষেত্রে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (বিক্রেতার চালান অ্যাকাউন্টিংয়ে বিবেচনায় নেওয়া হবে না)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ব্যয়ের প্রতিবেদনে হিসাববিজ্ঞানে বাঁধাই এবং স্থানান্তর অক্ষম করুন (ব্যয় প্রতিবেদন অ্যাকাউন্টিংয়ে বিবেচনা করা হবে না)
 ACCOUNTING_ENABLE_LETTERING=অ্যাকাউন্টিং এ লেটারিং ফাংশন সক্রিয় করুন
-ACCOUNTING_ENABLE_LETTERING_DESC=যখন এই বিকল্পগুলি সক্রিয় করা হয়, আপনি প্রতিটি অ্যাকাউন্টিং এন্ট্রিতে একটি কোড সংজ্ঞায়িত করতে পারেন যাতে আপনি বিভিন্ন অ্যাকাউন্টিং আন্দোলনকে একসাথে গোষ্ঠী করতে পারেন। অতীতে, যখন বিভিন্ন জার্নাল স্বাধীনভাবে পরিচালিত হত, তখন এই বৈশিষ্ট্যটি বিভিন্ন জার্নালের আন্দোলনের লাইনগুলিকে একত্রিত করার জন্য প্রয়োজনীয় ছিল। যাইহোক, Dolibarr অ্যাকাউন্টেন্সির সাথে, এই ধরনের একটি ট্র্যাকিং কোড, যাকে বলা হয় "<b>%s</b><span class='notranslate'> span>" ইতিমধ্যেই স্বয়ংক্রিয়ভাবে সংরক্ষিত হয়েছে, তাই একটি স্বয়ংক্রিয় অক্ষর ইতিমধ্যেই সম্পন্ন হয়েছে, ত্রুটির কোনো ঝুঁকি নেই তাই এই বৈশিষ্ট্যটি সাধারণ ব্যবহারের জন্য অকেজো হয়ে পড়েছে। ম্যানুয়াল লেটারিং বৈশিষ্ট্য শেষ ব্যবহারকারীদের জন্য সরবরাহ করা হয়েছে যারা অ্যাকাউন্টেন্সিতে ডেটা স্থানান্তর করার জন্য কম্পিউটার ইঞ্জিনকে সত্যিই বিশ্বাস করেন না।
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=একটি কঠোর অ্যাকাউন্টিং ব্যবস্থাপনার জন্য এই বৈশিষ্ট্যটি সক্ষম করার আর প্রয়োজন নেই৷
 ACCOUNTING_ENABLE_AUTOLETTERING=অ্যাকাউন্টিংয়ে স্থানান্তর করার সময় স্বয়ংক্রিয় অক্ষর সক্ষম করুন
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=অক্ষরের জন্য কোডটি স্বয়ংক্রিয়ভাবে তৈরি এবং বৃদ্ধি পায় এবং শেষ ব্যবহারকারী দ্বারা নির্বাচিত হয় না
@@ -361,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=লেটারিং কোড তৈরি ক
 ACCOUNTING_LETTERING_NBLETTERS_DESC=কিছু অ্যাকাউন্টিং সফ্টওয়্যার শুধুমাত্র একটি দুই-অক্ষরের কোড গ্রহণ করে। এই প্যারামিটার আপনাকে এই দিকটি সেট করতে দেয়। অক্ষরের ডিফল্ট সংখ্যা তিনটি।
 OptionsAdvanced=উন্নত বিকল্প
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=সরবরাহকারী ক্রয়ের উপর ভ্যাট রিভার্স চার্জ পরিচালনা সক্রিয় করুন
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=যখন এই বিকল্পটি সক্রিয় থাকে, তখন আপনি সংজ্ঞায়িত করতে পারেন যে একটি সরবরাহকারী বা একটি প্রদত্ত বিক্রেতার চালানকে অবশ্যই অ্যাকাউন্টেন্সিতে স্থানান্তর করতে হবে: একটি অতিরিক্ত ডেবিট এবং একটি ক্রেডিট লাইন 2টি প্রদত্ত অ্যাকাউন্টে অ্যাকাউন্টিংয়ে তৈরি হবে "< এ সংজ্ঞায়িত অ্যাকাউন্টের চার্ট থেকে span class='notranslate'>%s</span>" সেটআপ পৃষ্ঠা৷
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=ফাইল তৈরি করার সময় অক্ষর রপ্তানি করবেন না
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 0d33cfeaecb..ac09aff54e0 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=পরবর্তী মান (চালান)
 NextValueForCreditNotes=পরবর্তী মান (ক্রেডিট নোট)
 NextValueForDeposit=পরবর্তী মান (ডাউন পেমেন্ট)
 NextValueForReplacements=পরবর্তী মান (প্রতিস্থাপন)
-MustBeLowerThanPHPLimit=দ্রষ্টব্য: আপনার PHP কনফিগারেশন বর্তমানে <b>%sb09a4b739fz0b09a4b739fz0-এ আপলোড করার জন্য সর্বাধিক ফাইলের আকার সীমাবদ্ধ করে span> <span class='notranslate'>%s, এই প্যারামিটারের মান নির্বিশেষে
+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=দ্রষ্টব্য: আপনার পিএইচপি কনফিগারেশনে কোন সীমা সেট করা নেই
 MaxSizeForUploadedFiles=আপলোড করা ফাইলগুলির জন্য সর্বাধিক আকার (0 যেকোন আপলোডের অনুমতি না দেওয়ার জন্য)
 UseCaptchaCode=লগইন পৃষ্ঠা এবং কিছু পাবলিক পৃষ্ঠায় গ্রাফিকাল কোড (ক্যাপচা) ব্যবহার করুন
@@ -150,7 +150,7 @@ AllWidgetsWereEnabled=সমস্ত উপলব্ধ উইজেট সক
 WidgetAvailable=উইজেট উপলব্ধ
 PositionByDefault=ডিফল্ট অর্ডার
 MenusDesc=মেনু পরিচালকরা দুটি মেনু বারের বিষয়বস্তু সেট করে (অনুভূমিক এবং উল্লম্ব)।
-MenusEditorDesc=মেনু এডিটর আপনাকে কাস্টম মেনু এন্ট্রি সংজ্ঞায়িত করতে দেয়। অস্থিরতা এবং স্থায়ীভাবে পৌঁছানো যায় না এমন মেনু এন্ট্রি এড়াতে সাবধানে এটি ব্যবহার করুন।<br>কিছু মডিউল মেনু এন্ট্রি যোগ করে (মেনু <b>সমস্ত<span ক্লাস ='notranslate'></b></span> বেশিরভাগই)। আপনি যদি ভুলবশত এই এন্ট্রিগুলির কিছু মুছে ফেলেন, তাহলে আপনি মডিউলটিকে নিষ্ক্রিয় এবং পুনরায় সক্রিয় করে সেগুলি পুনরুদ্ধার করতে পারেন।
+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=ব্যবহারকারীদের জন্য মেনু
 LangFile=.lang ফাইল
 Language_en_US_es_MX_etc=ভাষা (en_US, es_MX, ...)
@@ -230,7 +230,7 @@ SeeReportPage=%s এ রিপোর্ট পৃষ্ঠা দেখুন
 SetOptionTo=<b>%s</b>  বিকল্প সেট করুন %s
 Updated=আপডেট করা হয়েছে
 AchatTelechargement=কিনুন/ডাউনলোড করুন
-GoModuleSetupArea=একটি নতুন মডিউল স্থাপন/ইনস্টল করতে, মডিউল সেটআপ এলাকায় যান: <a href="%s">%sb0e40dc6588 
+GoModuleSetupArea=একটি নতুন মডিউল স্থাপন/ইনস্টল করতে, মডিউল সেটআপ এলাকায় যান: <a href="%s">%sb0e40dc6588
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM বাহ্যিক মডিউলের অফিসিয়াল মার্কেট প্লেস
 DoliPartnersDesc=কাস্টম-উন্নত মডিউল বা বৈশিষ্ট্যগুলি প্রদানকারী সংস্থাগুলির তালিকা৷<br>দ্রষ্টব্য: যেহেতু ডলিবার একটি ওপেন সোর্স অ্যাপ্লিকেশন, তাই <i>যে কেউ</i> পিএইচপি প্রোগ্রামিংয়ে অভিজ্ঞদের একটি মডিউল তৈরি করতে সক্ষম হওয়া উচিত।
 WebSiteDesc=আরো অ্যাড-অন (নন-কোর) মডিউলের জন্য বাহ্যিক ওয়েবসাইট...
@@ -250,8 +250,8 @@ Security=নিরাপত্তা
 Passwords=পাসওয়ার্ড
 DoNotStoreClearPassword=ডাটাবেসে সংরক্ষিত পাসওয়ার্ড এনক্রিপ্ট করুন (প্লেন-টেক্সট হিসাবে নয়)। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
 MainDbPasswordFileConfEncrypted=conf.php এ সংরক্ষিত ডাটাবেস পাসওয়ার্ড এনক্রিপ্ট করুন। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
-InstrucToEncodePass=<b>conf.php</b> ফাইলে পাসওয়ার্ড এনকোড করতে, লাইনটি প্রতিস্থাপন করুন b0342fccfda19b /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342fccfda19 >দ্বারা<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb2ecz87fz" span class='notranslate'></b></span>
-InstrucToClearPass=<b>conf.php</b> ফাইলে পাসওয়ার্ড ডিকোড (ক্লিয়ার) করতে, লাইনটি প্রতিস্থাপন করুন <br><b>$dolibarr_main_db_pass="crypted:...";</b><span class='notranslate' <br><b>$dolibarr_main_db_pass="<br>দ্বারা ";</b>
+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=উত্পন্ন পিডিএফ ফাইল সুরক্ষিত. এটি বাঞ্ছনীয় নয় কারণ এটি বাল্ক পিডিএফ তৈরি করে।
 ProtectAndEncryptPdfFilesDesc=একটি পিডিএফ ডকুমেন্টের সুরক্ষা এটিকে যেকোনো পিডিএফ ব্রাউজার দিয়ে পড়তে এবং মুদ্রণের জন্য উপলব্ধ রাখে। তবে এডিট ও কপি করা আর সম্ভব নয়। মনে রাখবেন যে এই বৈশিষ্ট্যটি ব্যবহার করার ফলে একটি বিশ্বব্যাপী মার্জড PDF গুলি কাজ করছে না।
 Feature=বৈশিষ্ট্য
@@ -268,7 +268,7 @@ OtherResources=অন্যান্য উৎস
 ExternalResources=বাহ্যিক সম্পদ
 SocialNetworks=সামাজিক যোগাযোগ
 SocialNetworkId=সামাজিক নেটওয়ার্ক আইডি
-ForDocumentationSeeWiki=ব্যবহারকারী বা বিকাশকারী ডকুমেন্টেশনের জন্য (ডক, প্রায়শই জিজ্ঞাসিত প্রশ্নাবলী...),<br>Dolibarr Wiki:<br><span দেখুন class='notranslate'><b></span><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dc658> <span class='notranslate'></b>
+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=অন্য কোনো প্রশ্ন/সহায়তার জন্য, আপনি Dolibarr ফোরাম ব্যবহার করতে পারেন:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Dolibarr-এর সাহায্য এবং সমর্থন পাওয়ার জন্য এখানে কিছু সংস্থান রয়েছে।
 HelpCenterDesc2=এই সম্পদগুলির মধ্যে কিছু শুধুমাত্র <b>ইংরেজি</b> এ উপলব্ধ।
@@ -290,8 +290,8 @@ EMailsSetup=ইমেল সেটআপ
 EMailsDesc=এই পৃষ্ঠাটি আপনাকে ইমেল পাঠানোর জন্য পরামিতি বা বিকল্প সেট করতে দেয়।
 EmailSenderProfiles=ইমেল প্রেরকের প্রোফাইল
 EMailsSenderProfileDesc=আপনি এই বিভাগটি খালি রাখতে পারেন। আপনি এখানে কিছু ইমেল লিখলে, আপনি যখন একটি নতুন ইমেল লিখবেন তখন সেগুলি কম্বোবক্সে সম্ভাব্য প্রেরকদের তালিকায় যোগ করা হবে।
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS পোর্ট (php.ini তে ডিফল্ট মান: <b>%s<span class='notranslate'>b09a4b739f17fz0 >>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS হোস্ট (php.ini তে ডিফল্ট মান: <b>%s<span class='notranslate'>b09a4b739f17fz0 >>)
+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 পোর্ট
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS হোস্ট
 MAIN_MAIL_EMAIL_FROM=স্বয়ংক্রিয় ইমেলের জন্য প্রেরক ইমেল
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=এটি ম্যানুয়ালি প
 StepNb=ধাপ %s
 FindPackageFromWebSite=আপনার প্রয়োজনীয় বৈশিষ্ট্যগুলি প্রদান করে এমন একটি প্যাকেজ খুঁজুন (উদাহরণস্বরূপ অফিসিয়াল ওয়েব সাইটে %s)।
 DownloadPackageFromWebSite=প্যাকেজ ডাউনলোড করুন (উদাহরণস্বরূপ অফিসিয়াল ওয়েব সাইট %s থেকে)।
-UnpackPackageInDolibarrRoot=আপনার Dolibarr সার্ভার ডিরেক্টরিতে প্যাকেজ করা ফাইলগুলি আনপ্যাক/আনজিপ করুন: <b>%sb09a4b739f8<span class='notranslate' >
-UnpackPackageInModulesRoot=একটি বাহ্যিক মডিউল স্থাপন/ইনস্টল করতে, আপনাকে অবশ্যই বহিরাগত মডিউলগুলির জন্য নিবেদিত সার্ভার ডিরেক্টরিতে সংরক্ষণাগার ফাইলটি আনপ্যাক/আনজিপ করতে হবে:<br>b0aee8365837fz0 ><span class='notranslate'>%s</b>
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <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=মডিউল স্থাপনার কাজ শেষ। তবে আপনাকে অবশ্যই পৃষ্ঠা সেটআপ মডিউলগুলিতে গিয়ে আপনার অ্যাপ্লিকেশনে মডিউলটি সক্ষম এবং সেটআপ করতে হবে: <a href="%s">%s</a>.
 NotExistsDirect=বিকল্প রুট ডিরেক্টরি একটি বিদ্যমান ডিরেক্টরিতে সংজ্ঞায়িত করা হয় না৷<br>
 InfDirAlt=সংস্করণ 3 থেকে, একটি বিকল্প রুট ডিরেক্টরি সংজ্ঞায়িত করা সম্ভব। এটি আপনাকে একটি ডেডিকেটেড ডিরেক্টরি, প্লাগ-ইন এবং কাস্টম টেমপ্লেটে সঞ্চয় করতে দেয়।<br>শুধু Dolibarr এর রুটে একটি ডিরেক্টরি তৈরি করুন (যেমন: কাস্টম)।<br>
-InfDirExample=<br>তারপর ফাইলে এটি ঘোষণা করুন <strong>conf.php</strong> class='notranslate'><br></span> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt/span>$dolibarr_main_document_root_alt'//barlib='/classom= 'notranslate'><br></span>যদি এই লাইনগুলিকে "#" দিয়ে কমেন্ট করা হয়, সেগুলিকে সক্রিয় করতে, শুধুমাত্র "#" অক্ষরটি সরিয়ে আনকমেন্ট করুন৷
+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=আপনি এখান থেকে মডিউল প্যাকেজের .zip ফাইল আপলোড করতে পারেন:
 CurrentVersion=ডলিবার বর্তমান সংস্করণ
 CallUpdatePage=ডাটাবেস গঠন এবং ডেটা আপডেট করে এমন পৃষ্ঠায় ব্রাউজ করুন: %s।
@@ -362,16 +362,16 @@ LastActivationVersion=সর্বশেষ অ্যাক্টিভেশন
 UpdateServerOffline=সার্ভার অফলাইনে আপডেট করুন
 WithCounter=একটি কাউন্টার পরিচালনা করুন
 GenericMaskCodes=আপনি যেকোন নম্বর মাস্ক লিখতে পারেন। এই মাস্কে, নিম্নলিখিত ট্যাগগুলি ব্যবহার করা যেতে পারে:<br><b>{000000}b09a4b739f17f17  একটি সংখ্যার সাথে মিলে যায় যা প্রতিটি %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>, b0635837fz35 {yyyy}</b> বা <b>{y}</b> 2, 4 বা 1 সংখ্যার বেশি বছর। <br>
-GenericMaskCodes2=<b>{cccc}</b> n অক্ষরে ক্লায়েন্ট কোড<br><b>{cccc000}b09a4b739f7>ক্লায়েন্ট কোড অন n অক্ষরের পরে গ্রাহককে উৎসর্গ করা একটি কাউন্টার রয়েছে। গ্রাহকের জন্য নিবেদিত এই কাউন্টারটি গ্লোবাল কাউন্টারের মতো একই সময়ে পুনরায় সেট করা হয়েছে।<span class='notranslate'><br><b>b06a5f451419e800 </b> n অক্ষরে তৃতীয় পক্ষের প্রকারের কোড (মেনু হোম - সেটআপ - অভিধান - তৃতীয় পক্ষের প্রকারগুলি দেখুন)। আপনি এই ট্যাগ যোগ করলে, কাউন্টারটি প্রতিটি ধরণের তৃতীয় পক্ষের জন্য আলাদা হবে৷<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=মাস্কের অন্য সব অক্ষর অক্ষত থাকবে।<br>স্পেস অনুমোদিত নয়।<br>
 GenericMaskCodes3EAN=মুখোশের অন্যান্য সমস্ত অক্ষর অক্ষত থাকবে (ইএএন 13 এ 13তম অবস্থানে * বা? ছাড়া)।<br>স্পেস অনুমোদিত নয়।<br> span>EAN13-এ, 13তম অবস্থানে শেষ } এর পরে শেষ অক্ষরটি * বা? . এটি গণনা করা কী দ্বারা প্রতিস্থাপিত হবে৷<br>
 GenericMaskCodes4a=<u>তৃতীয় পক্ষের TheCompany-এর 99তম %s উদাহরণ, তারিখ 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>2023-01-31 তারিখে তৈরি তৃতীয় পক্ষের উদাহরণ:</u><br> >
 GenericMaskCodes4c=<u>2023-01-31 তারিখে তৈরি পণ্যের উদাহরণ:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> দেবে b0aee8336580 span>ABC2301-000099</b><br>b0aee8365837fz0{0@span>0+1 }-ZZZ/{dd}/XXX<span class='notranslate'></b> দেবে <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> দেবে <b>IN2301-0099-A</b> যদি কোম্পানির প্রকার হয় 'A_RI' টাইপের কোড সহ 'দায়িত্বশীল ইনস্ক্রিপ্টো'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=একটি সংজ্ঞায়িত মাস্ক অনুযায়ী একটি কাস্টমাইজযোগ্য সংখ্যা প্রদান করে।
-ServerAvailableOnIPOrPort=সার্ভার ঠিকানা <b>%s</b> পোর্টে উপলব্ধ 'notranslate'><b></span>%s</b>
-ServerNotAvailableOnIPOrPort=পোর্ট <b>%s</b> ঠিকানায় সার্ভার উপলব্ধ নয় ='notranslate'><b></span>%s</b>
+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=সার্ভার সংযোগ পরীক্ষা করুন
 DoTestSend=পরীক্ষা পাঠানো
 DoTestSendHTML=এইচটিএমএল পাঠানোর পরীক্ষা করুন
@@ -390,9 +390,9 @@ LanguageFilesCachedIntoShmopSharedMemory=ফাইল .lang শেয়ার 
 LanguageFile=ভাষা ফাইল
 ExamplesWithCurrentSetup=বর্তমান কনফিগারেশন সহ উদাহরণ
 ListOfDirectories=OpenDocument টেমপ্লেট ডিরেক্টরির তালিকা
-ListOfDirectoriesForModelGenODT=OpenDocument ফরম্যাট সহ টেমপ্লেট ফাইল ধারণকারী ডিরেক্টরিগুলির তালিকা৷<br><br>এখানে ডিরেক্টরিগুলির সম্পূর্ণ পথ রাখুন৷<br>eah ডিরেক্টরির মধ্যে একটি ক্যারেজ রিটার্ন যোগ করুন।<br>GED মডিউলের একটি ডিরেক্টরি যোগ করতে, এখানে যোগ করুন b0aee8365837fz0 >DOL_DATA_ROOT/ecm/yourdirectoryname</b>।<br>b0342fccfda19bzless0>এ পরিচালক <span class='notranslate'><b>.odt</b> অথবা <b>.ods<span> দিয়ে শেষ করতে হবে ='notranslate'></b></span>।
+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=এই ডিরেক্টরিগুলিতে পাওয়া ODT/ODS টেমপ্লেট ফাইলের সংখ্যা
-ExampleOfDirectoriesForModelGen=সিনট্যাক্সের উদাহরণ:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<span> 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>আপনার odt নথি টেমপ্লেটগুলি কীভাবে তৈরি করবেন তা জানতে, সেগুলিকে সেই ডিরেক্টরিগুলিতে সংরক্ষণ করার আগে, উইকি ডকুমেন্টেশন পড়ুন:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=নাম/শেষনামের অবস্থান
@@ -461,17 +461,17 @@ ComputedFormulaDesc=ডায়নামিক কম্পিউটেড ম
 Computedpersistent=কম্পিউটেড ফিল্ড স্টোর করুন
 ComputedpersistentDesc=গণনা করা অতিরিক্ত ক্ষেত্রগুলি ডাটাবেসে সংরক্ষণ করা হবে, তবে, এই ক্ষেত্রের অবজেক্টটি পরিবর্তিত হলেই মানটি পুনরায় গণনা করা হবে। যদি গণনা করা ক্ষেত্রটি অন্যান্য অবজেক্ট বা গ্লোবাল ডেটার উপর নির্ভর করে তবে এই মানটি ভুল হতে পারে!!
 ExtrafieldParamHelpPassword=এই ক্ষেত্রটি ফাঁকা রাখার অর্থ হল এই মানটি এনক্রিপশন ছাড়াই সংরক্ষণ করা হবে (ক্ষেত্রটি স্ক্রিনে তারা দিয়ে লুকানো আছে)।<br><br>এন্টার করুন একটি বিপরীত এনক্রিপশন অ্যালগরিদমের সাথে মান এনকোড করতে মান 'ডলক্রিপ্ট'। পরিষ্কার ডেটা এখনও জানা এবং সম্পাদনা করা যেতে পারে তবে ডেটাবেসে এনক্রিপ্ট করা হয়৷<br><br>'অটো' (বা 'md5' লিখুন, 'sha256', 'password_hash', ...) ডিফল্ট পাসওয়ার্ড এনক্রিপশন অ্যালগরিদম ব্যবহার করতে (বা md5, sha256, password_hash...) ডাটাবেসে নন-রিভার্সিবল হ্যাশড পাসওয়ার্ড সংরক্ষণ করতে (মূল মান পুনরুদ্ধারের কোনো উপায় নেই)
-ExtrafieldParamHelpselect=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান (যেখানে কী '0' হতে পারে না)<br><br> সহ লাইন হতে হবে : <br>1,value1<br>2,value2<br>code3,value span class='notranslate'><br></span>...<br><br>অন্যের উপর নির্ভর করে তালিকা পেতে পরিপূরক বৈশিষ্ট্য তালিকা:<br>1,value1|options_<i>parent_list_codeb0ae634>b0ae634 parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae64758><span_par3bac: class='notranslate'><br><br>অন্য তালিকার উপর নির্ভর করে তালিকা পেতে:<br>1, value1|<i>parent_list_code</i>:parent_keyb0342fccfda19bzval,<span> class='notranslate'><i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান (যেখানে কী '0' হতে পারে না)<br><br> সহ লাইন হতে হবে : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
-ExtrafieldParamHelpsellist=মানের তালিকাটি একটি টেবিল থেকে আসে<br>সিনট্যাক্স: table_name:label_field:id_field::filtersql<br>উদাহরণ: c_tep ::filtersql<br><br>- id_field অগত্যা একটি প্রাথমিক int কী<br> - ফিল্টারএসকিউএল একটি এসকিউএল শর্ত। শুধুমাত্র সক্রিয় মান প্রদর্শন করার জন্য এটি একটি সাধারণ পরীক্ষা (যেমন সক্রিয়=1) হতে পারে<br>আপনি ফিল্টারে $ID$ ব্যবহার করতে পারেন যা বর্তমান বস্তুর বর্তমান আইডি<span ক্লাস ='notranslate'><br></span>ফিল্টারে একটি SELECT ব্যবহার করতে ইনজেকশন-বিরোধী সুরক্ষা বাইপাস করতে $SEL$ কীওয়ার্ডটি ব্যবহার করুন।<br>যদি আপনি অতিরিক্ত ফিল্ডে ফিল্টার করতে চান সিনট্যাক্স extra.fieldcode=... ব্যবহার করুন (যেখানে ফিল্ড কোড হল এক্সট্রাফিল্ডের কোড)<br><br> অন্য একটি পরিপূরক বৈশিষ্ট্যের তালিকার উপর নির্ভর করে তালিকা:<br>c_typent:libelle:id:options_<i>parent_list_translate<span>'notranslate' </i></span>|parent_column:filter <br><br>অন্য তালিকার উপর নির্ভর করে তালিকা পাওয়ার জন্য:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758bac33parent_col:
-ExtrafieldParamHelpchkbxlst=মানের তালিকাটি একটি টেবিল থেকে আসে<br>সিনট্যাক্স: table_name:label_field:id_field::filtersql<br>উদাহরণ: c_tep ::filtersql<br><br>শুধুমাত্র সক্রিয় মান প্রদর্শনের জন্য ফিল্টার একটি সাধারণ পরীক্ষা (যেমন সক্রিয়=1) হতে পারে<br>আপনি ফিল্টার জাদুকরীতে $ID$ ব্যবহার করতে পারেন এটি বর্তমান বস্তুর বর্তমান আইডি<br>ফিল্টারে একটি নির্বাচন করতে $SEL$ ব্যবহার করুন span class='notranslate'><br></span>যদি আপনি এক্সট্রাফিল্ডে ফিল্টার করতে চান তাহলে সিনট্যাক্স ব্যবহার করুন extra.fieldcode=... (যেখানে ফিল্ড কোড হল এক্সট্রাফিল্ডের কোড)<br> ><br>অন্য একটি পরিপূরক বৈশিষ্ট্যের তালিকার উপর নির্ভর করে তালিকা পেতে:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19bzc0b0342fccfda19bzc0</span>b024fda19bz </span>অন্য তালিকার উপর নির্ভর করে তালিকা পেতে:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+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 necessarily 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=পরামিতি হতে হবে ObjectName:Classpath<br>সিনট্যাক্স: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=একটি সাধারণ বিভাজকের জন্য খালি রাখুন<br>কোলাপসিং সেপারেটরের জন্য এটি 1 এ সেট করুন (নতুন সেশনের জন্য ডিফল্টরূপে খোলা, তারপর প্রতিটি ব্যবহারকারীর সেশনের জন্য স্থিতি রাখা হয়)<br>কোলাপসিং সেপারেটরের জন্য এটিকে 2 এ সেট করুন (নতুন সেশনের জন্য ডিফল্টরূপে ভেঙে পড়ে, তারপর প্রতিটি ব্যবহারকারীর সেশনের আগে স্থিতি রাখা হয়)
 LibraryToBuildPDF=পিডিএফ তৈরির জন্য ব্যবহৃত লাইব্রেরি
 LocalTaxDesc=কিছু দেশ প্রতিটি চালান লাইনে দুই বা তিনটি কর প্রয়োগ করতে পারে। যদি এটি হয়, দ্বিতীয় এবং তৃতীয় করের ধরন এবং তার হার নির্বাচন করুন। সম্ভাব্য প্রকারগুলি হল:<br>1: ভ্যাট ছাড়া পণ্য এবং পরিষেবার উপর স্থানীয় কর প্রযোজ্য (ট্যাক্স ছাড়াই পরিমাণের উপর স্থানীয় ট্যাক্স গণনা করা হয়)<br> 2: ভ্যাট সহ পণ্য এবং পরিষেবাগুলিতে স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + মূল ট্যাক্সের উপর গণনা করা হয়)<br>3: ভ্যাট ছাড়া পণ্যের উপর স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স ব্যতীত পরিমাণের উপর গণনা করা হয় ট্যাক্স)<br>4: ভ্যাট সহ পণ্যের উপর স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + প্রধান ভ্যাটের উপর গণনা করা হয়)<br>5: স্থানীয় ভ্যাট ছাড়া পরিষেবাগুলিতে কর প্রযোজ্য (স্থানীয় ট্যাক্স ট্যাক্স ছাড়া পরিমাণের উপর গণনা করা হয়)<br>6: ভ্যাট সহ পরিষেবাগুলিতে স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + ট্যাক্সের উপর গণনা করা হয়)
 SMS=খুদেবার্তা
-LinkToTestClickToDial=ব্যবহারকারী <strong>%s<span class='notranslate'-এর জন্য ClickToDial url পরীক্ষা করার জন্য একটি লিঙ্ক দেখানোর জন্য কল করার জন্য একটি ফোন নম্বর লিখুন ></strong></span>
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=লিঙ্ক রিফ্রেশ করুন
 LinkToTest=ব্যবহারকারীর জন্য ক্লিকযোগ্য লিঙ্ক তৈরি করা হয়েছে <strong>%s</strong> (পরীক্ষা করতে ফোন নম্বরে ক্লিক করুন )
 KeepEmptyToUseDefault=ডিফল্ট মান ব্যবহার করতে খালি রাখুন
@@ -509,7 +509,7 @@ WarningPHPMailA=- ইমেল পরিষেবা প্রদানকার
 WarningPHPMailB=- কিছু ইমেল পরিষেবা প্রদানকারী (যেমন ইয়াহু) আপনাকে তাদের নিজস্ব সার্ভারের পরিবর্তে অন্য সার্ভার থেকে একটি ইমেল পাঠাতে দেয় না। আপনার বর্তমান সেটআপ ইমেল পাঠানোর জন্য অ্যাপ্লিকেশনের সার্ভার ব্যবহার করে এবং আপনার ইমেল প্রদানকারীর সার্ভার নয়, তাই কিছু প্রাপক (নিষেধাজ্ঞামূলক DMARC প্রোটোকলের সাথে সামঞ্জস্যপূর্ণ), আপনার ইমেল প্রদানকারীকে জিজ্ঞাসা করবে তারা আপনার ইমেল এবং কিছু ইমেল প্রদানকারী গ্রহণ করতে পারে কিনা (ইয়াহুর মতো) "না" উত্তর দিতে পারে কারণ সার্ভারটি তাদের নয়, তাই আপনার পাঠানো কিছু ইমেল বিতরণের জন্য গৃহীত নাও হতে পারে (আপনার ইমেল প্রদানকারীর পাঠানোর কোটা সম্পর্কেও সতর্ক থাকুন)।
 WarningPHPMailC=- ইমেল পাঠানোর জন্য আপনার নিজস্ব ইমেল পরিষেবা প্রদানকারীর SMTP সার্ভার ব্যবহার করাও আকর্ষণীয় তাই অ্যাপ্লিকেশন থেকে পাঠানো সমস্ত ইমেলগুলি আপনার মেলবক্সের "প্রেরিত" ডিরেক্টরিতেও সংরক্ষিত হবে৷
 WarningPHPMailD=তাই ই-মেইল পাঠানোর পদ্ধতিকে "SMTP" মানতে পরিবর্তন করার পরামর্শ দেওয়া হচ্ছে।
-WarningPHPMailDbis=আপনি যদি সত্যিই ইমেল পাঠানোর জন্য ডিফল্ট "PHP" পদ্ধতি রাখতে চান, তাহলে এই সতর্কতা উপেক্ষা করুন, অথবা %sএখানে ক্লিক করে <span class='notranslate'>%s< এর মাধ্যমে এটি সরিয়ে দিন /span>।
+WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
 WarningPHPMail2=যদি আপনার ইমেল SMTP প্রদানকারীর ইমেল ক্লায়েন্টকে কিছু আইপি ঠিকানায় সীমাবদ্ধ করতে হয় (খুব বিরল), এটি আপনার ERP CRM অ্যাপ্লিকেশনের জন্য মেল ব্যবহারকারী এজেন্টের (MUA) IP ঠিকানা: <strong>%s</strong>।
 WarningPHPMailSPF=যদি আপনার প্রেরকের ইমেল ঠিকানার ডোমেন নামটি একটি SPF রেকর্ড দ্বারা সুরক্ষিত থাকে (আপনার ডোমেন নাম রেজিস্টারকে জিজ্ঞাসা করুন), আপনাকে অবশ্যই আপনার ডোমেনের DNS-এর SPF রেকর্ডে নিম্নলিখিত IPগুলি যোগ করতে হবে: <strong>%s</strong>।
 ActualMailSPFRecordFound=প্রকৃত SPF রেকর্ড পাওয়া গেছে (ইমেলের জন্য %s): %s
@@ -518,7 +518,7 @@ DependsOn=এই মডিউলটির মডিউল(গুলি) প্
 RequiredBy=এই মডিউলটি মডিউল(গুলি) দ্বারা প্রয়োজনীয়
 TheKeyIsTheNameOfHtmlField=এটি HTML ক্ষেত্রের নাম। একটি ক্ষেত্রের মূল নাম পেতে HTML পৃষ্ঠার বিষয়বস্তু পড়ার জন্য প্রযুক্তিগত জ্ঞান প্রয়োজন।
 PageUrlForDefaultValues=আপনাকে অবশ্যই পৃষ্ঠা URL এর আপেক্ষিক পাথ লিখতে হবে। আপনি URL-এ প্যারামিটার অন্তর্ভুক্ত করলে, ব্রাউজ করা URL-এর সমস্ত প্যারামিটারের মান এখানে সংজ্ঞায়িত থাকলে এটি কার্যকর হবে।
-PageUrlForDefaultValuesCreate=<br>উদাহরণ:<br>একটি নতুন তৃতীয় পক্ষ তৈরি করার ফর্মের জন্য, এটি হল b0e7843947c<bz06bz0 /span><span class='notranslate'>%s</strong>।<br>এ ইনস্টল করা বাহ্যিক মডিউলগুলির URL এর জন্য কাস্টম ডিরেক্টরি, "কাস্টম/" অন্তর্ভুক্ত করবেন না, তাই পথ ব্যবহার করুন যেমন <strong>mymodule/mypage.php</strong> এবং কাস্টম নয় /mymodule/mypage.php.<br>যদি আপনি ডিফল্ট মান চান শুধুমাত্র যদি url এর কিছু প্যারামিটার থাকে, আপনি <strong><span ব্যবহার করতে পারেন class='notranslate'>%s</span></strong>
+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>উদাহরণ:<br>যে পৃষ্ঠাটি তৃতীয় পক্ষের তালিকা করে, সেটি হল <strong> >%s</strong>।<br>কাস্টম ডিরেক্টরিতে ইনস্টল করা বাহ্যিক মডিউলগুলির URL এর জন্য , "কাস্টম/" অন্তর্ভুক্ত করবেন না তাই <strong>mymodule/mypagelist.php</strong> মত একটি পথ ব্যবহার করুন এবং কাস্টম/mymodule নয় /mypagelist.php.<br>যদি আপনি ডিফল্ট মান চান শুধুমাত্র যদি url এর কিছু প্যারামিটার থাকে, আপনি <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=এছাড়াও মনে রাখবেন যে ফর্ম তৈরির জন্য ডিফল্ট মানগুলি ওভাররাইট করা শুধুমাত্র সঠিকভাবে ডিজাইন করা পৃষ্ঠাগুলির জন্য কাজ করে (তাই প্যারামিটার অ্যাকশন = তৈরি করুন বা উপস্থাপন করুন...)
 EnableDefaultValues=ডিফল্ট মানগুলির কাস্টমাইজেশন সক্ষম করুন
@@ -1197,6 +1197,7 @@ Skin=ত্বকের থিম
 DefaultSkin=ডিফল্ট স্কিন থিম
 MaxSizeList=তালিকার জন্য সর্বোচ্চ দৈর্ঘ্য
 DefaultMaxSizeList=তালিকার জন্য ডিফল্ট সর্বোচ্চ দৈর্ঘ্য
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=ছোট তালিকার জন্য ডিফল্ট সর্বোচ্চ দৈর্ঘ্য (যেমন গ্রাহক কার্ডে)
 MessageOfDay=দিনের বার্তা
 MessageLogin=লগইন পৃষ্ঠা বার্তা
@@ -1249,7 +1250,7 @@ SetupDescription2=নিম্নলিখিত দুটি বিভাগ 
 SetupDescription3=<a href="%s">%s -> %sb0e40dc858 <br><br>আপনার অ্যাপ্লিকেশনের ডিফল্ট আচরণ কাস্টমাইজ করার জন্য ব্যবহৃত মৌলিক প্যারামিটারগুলি (যেমন দেশ-সম্পর্কিত বৈশিষ্ট্যগুলির জন্য)।
 SetupDescription4=<a href="%s">%s -> %sb0e40dc858 <br><br>এই সফ্টওয়্যারটি অনেক মডিউল/অ্যাপ্লিকেশনের একটি স্যুট। আপনার প্রয়োজনের সাথে সম্পর্কিত মডিউলগুলি অবশ্যই সক্ষম এবং কনফিগার করা উচিত। এই মডিউলগুলি সক্রিয় করার সাথে মেনু এন্ট্রি প্রদর্শিত হবে।
 SetupDescription5=অন্যান্য সেটআপ মেনু এন্ট্রি ঐচ্ছিক পরামিতি পরিচালনা করে।
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>b0e40dc<b67dc /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=আপনার অ্যাপ্লিকেশনের ডিফল্ট আচরণ কাস্টমাইজ করতে ব্যবহৃত মৌলিক পরামিতিগুলি (যেমন দেশ-সম্পর্কিত বৈশিষ্ট্যগুলির জন্য)।
 SetupDescription4b=এই সফ্টওয়্যারটি অনেক মডিউল/অ্যাপ্লিকেশনের একটি স্যুট। আপনার প্রয়োজনের সাথে সম্পর্কিত মডিউলগুলি সক্রিয় করতে হবে। এই মডিউলগুলি সক্রিয় করার সাথে মেনু এন্ট্রি প্রদর্শিত হবে।
 AuditedSecurityEvents=নিরাপত্তা ঘটনা যা নিরীক্ষিত হয়
@@ -1281,7 +1282,7 @@ AvailableModules=উপলব্ধ অ্যাপ/মডিউল
 ToActivateModule=মডিউল সক্রিয় করতে, সেটআপ এরিয়াতে যান (হোম->সেটআপ->মডিউল)।
 SessionTimeOut=অধিবেশনের জন্য সময় শেষ
 SessionExplanation=এই সংখ্যাটি গ্যারান্টি দেয় যে সেশনটি এই বিলম্বের আগে কখনই শেষ হবে না, যদি সেশন ক্লিনারটি অভ্যন্তরীণ PHP সেশন ক্লিনার দ্বারা করা হয় (এবং অন্য কিছু নয়)। অভ্যন্তরীণ PHP সেশন ক্লিনার গ্যারান্টি দেয় না যে এই বিলম্বের পরে সেশনের মেয়াদ শেষ হবে। এই বিলম্বের পরে এবং যখন সেশন ক্লিনার চালানো হবে তখন এটির মেয়াদ শেষ হয়ে যাবে, তাই প্রতিটি <b>%s/%s</b> অ্যাক্সেস, কিন্তু শুধুমাত্র অন্যান্য সেশন দ্বারা করা অ্যাক্সেসের সময় (যদি মান 0 হয়, এর অর্থ হল সেশনটি ক্লিয়ার করা শুধুমাত্র একটি বাহ্যিক প্রক্রিয়া দ্বারা সম্পন্ন হয়) .<br>দ্রষ্টব্য: একটি বাহ্যিক সেশন ক্লিনিং মেকানিজম সহ কিছু সার্ভারে (ডেবিয়ানের অধীনে ক্রন, উবুন্টু ...), সেশনগুলি একটি বাহ্যিক সেটআপ দ্বারা সংজ্ঞায়িত সময়ের পরে ধ্বংস করা যেতে পারে, এখানে প্রবেশ করা মান কোন ব্যাপার না.
-SessionsPurgedByExternalSystem=এই সার্ভারের সেশনগুলি একটি বাহ্যিক প্রক্রিয়া (ডেবিয়ান, উবুন্টুর অধীনে ক্রন ...) দ্বারা পরিষ্কার করা হয়েছে বলে মনে হচ্ছে, সম্ভবত প্রতিটি <b>%s</span <span class='notranslate'></b> সেকেন্ড (= প্যারামিটারের মান <b>session.gc_maxlifetimeb09a4b739fz8 , তাই এখানে মান পরিবর্তনের কোন প্রভাব নেই। আপনাকে অবশ্যই সার্ভার অ্যাডমিনিস্ট্রেটরকে সেশন বিলম্ব পরিবর্তন করতে বলতে হবে।
+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=উপলব্ধ ট্রিগার
 TriggersDesc=ট্রিগার হল এমন ফাইল যা <b>htdocs/core/triggers</b>-এ কপি করা হলে Dolibarr ওয়ার্কফ্লো-এর আচরণ পরিবর্তন করবে। তারা নতুন কর্ম উপলব্ধি করে, ডলিবার ইভেন্টগুলিতে সক্রিয় (নতুন কোম্পানি তৈরি, চালান বৈধতা, ...)।
 TriggerDisabledByName=এই ফাইলের ট্রিগারগুলি তাদের নামের <b>-NORUN</b> প্রত্যয় দ্বারা অক্ষম করা হয়েছে৷
@@ -1321,7 +1322,7 @@ PreviousDumpFiles=বিদ্যমান ব্যাকআপ ফাইল
 PreviousArchiveFiles=বিদ্যমান সংরক্ষণাগার ফাইল
 WeekStartOnDay=সপ্তাহের প্রথম দিন
 RunningUpdateProcessMayBeRequired=আপগ্রেড প্রক্রিয়া চালানো প্রয়োজন বলে মনে হচ্ছে (প্রোগ্রাম সংস্করণ %s ডেটাবেস সংস্করণ %s থেকে আলাদা)
-YouMustRunCommandFromCommandLineAfterLoginToUser=ব্যবহারকারী <b>%s</b> এর সাথে একটি শেলে লগইন করার পরে আপনাকে কমান্ড লাইন থেকে এই কমান্ডটি চালাতে হবে  অথবা আপনাকে <b>%s<span class='notranslate' প্রদান করতে কমান্ড লাইনের শেষে -W বিকল্প যোগ করতে হবে '></b></span> পাসওয়ার্ড।
+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 ফাংশন উপলব্ধ নয়
 DownloadMoreSkins=আরো স্কিন ডাউনলোড করতে
 SimpleNumRefModelDesc=%s yymm-nnnn ফর্ম্যাটে রেফারেন্স নম্বর ফেরত দেয় যেখানে yy হল বছর, mm হল মাস এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা রিসেট ছাড়াই
@@ -1372,7 +1373,7 @@ TranslationSetup=অনুবাদের সেটআপ
 TranslationKeySearch=একটি অনুবাদ কী বা স্ট্রিং অনুসন্ধান করুন
 TranslationOverwriteKey=একটি অনুবাদ স্ট্রিং ওভাররাইট করুন
 TranslationDesc=ডিসপ্লে ভাষা কিভাবে সেট করবেন:<br>* ডিফল্ট/সিস্টেমওয়াইড: মেনু <strong>হোম -> সেটআপ -> ডিসপ্লে</strong><br>* প্রতি ব্যবহারকারী: স্ক্রিনের শীর্ষে থাকা ব্যবহারকারীর নামটিতে ক্লিক করুন এবং <strong> span>ইউজার কার্ডে ইউজার ডিসপ্লে সেটআপ</strong> ট্যাব।
-TranslationOverwriteDesc=আপনি নিম্নলিখিত সারণী পূরণ করে স্ট্রিং ওভাররাইড করতে পারেন। "%s" ড্রপডাউন থেকে আপনার ভাষা চয়ন করুন, "%s" এ অনুবাদ কী স্ট্রিং ঢোকান এবং "<span এ আপনার নতুন অনুবাদ করুন class='notranslate'>%s</span>"
+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=কোন অনুবাদ কী ব্যবহার করতে হবে তা জানার জন্য আপনি অন্য ট্যাবটি ব্যবহার করতে পারেন
 TranslationString=অনুবাদ স্ট্রিং
 CurrentTranslationString=বর্তমান অনুবাদ স্ট্রিং
@@ -1663,7 +1664,7 @@ LDAPDescUsers=এই পৃষ্ঠাটি আপনাকে ডলিবা
 LDAPDescGroups=এই পৃষ্ঠাটি আপনাকে ডলিবার গ্রুপে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
 LDAPDescMembers=এই পৃষ্ঠাটি আপনাকে ডলিবার সদস্য মডিউলে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
 LDAPDescMembersTypes=এই পৃষ্ঠাটি আপনাকে LDAP ট্রিতে LDAP অ্যাট্রিবিউটের নাম সংজ্ঞায়িত করতে দেয় যা Dolibarr সদস্যদের প্রকারে পাওয়া প্রতিটি ডেটার জন্য।
-LDAPDescValues=উদাহরণ মানগুলি <b>OpenLDAP</b>-এর জন্য নিম্নলিখিত লোড করা স্কিমাগুলির সাথে ডিজাইন করা হয়েছে: b0aee8365>b0aee83365 core.schema, cosine.schema, inetorgperson.schema<span class='notranslate'></b>)। আপনি যদি সেই মানগুলি এবং OpenLDAP ব্যবহার করেন, আপনার LDAP কনফিগারেশন ফাইলটি পরিবর্তন করুন <b>slapd.conf</b> এই সমস্ত স্কিমা লোড করতে।
+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=একটি প্রমাণীকৃত অ্যাক্সেসের জন্য (উদাহরণস্বরূপ একটি লেখার অ্যাক্সেসের জন্য)
 PerfDolibarr=কর্মক্ষমতা সেটআপ/অপ্টিমাইজিং রিপোর্ট
 YouMayFindPerfAdviceHere=এই পৃষ্ঠাটি কর্মক্ষমতা সম্পর্কিত কিছু চেক বা পরামর্শ প্রদান করে।
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=এর চেয়ে পুরানো ইভেন্ট
 SecurityKey = নিরাপত্তা কী
 ##### ClickToDial #####
 ClickToDialSetup=মডিউল সেটআপ ডায়াল করতে ক্লিক করুন
-ClickToDialUrlDesc=ফোন পিক্টোতে ক্লিক করলে URL বলা হয়। URL-এ, আপনি ট্যাগগুলি ব্যবহার করতে পারেন<br><b>__PHONETO__</b> হবে কল করার জন্য ব্যক্তির ফোন নম্বর দিয়ে প্রতিস্থাপিত হয়েছে<br><b>__PHONEFROM__</b> কল করা ব্যক্তির (আপনার) ফোন নম্বর দিয়ে প্রতিস্থাপিত হবে<br><b>__LOGIN__b09a4b739f17f span> যা ক্লিকটোডিয়াল লগইন দিয়ে প্রতিস্থাপিত হবে (ব্যবহারকারী কার্ডে সংজ্ঞায়িত)<span class='notranslate'><br><b>__PASS__ </b> যা ক্লিকটোডিয়াল পাসওয়ার্ড দিয়ে প্রতিস্থাপিত হবে (ব্যবহারকারী কার্ডে সংজ্ঞায়িত)।
+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=এই মডিউলটি একটি ডেস্কটপ কম্পিউটার ব্যবহার করার সময় ফোন নম্বরগুলিকে ক্লিকযোগ্য লিঙ্কগুলিতে পরিবর্তন করে। একটি ক্লিক নম্বরে কল করবে। এটি আপনার ডেস্কটপে একটি নরম ফোন ব্যবহার করার সময় বা উদাহরণস্বরূপ SIP প্রোটোকলের উপর ভিত্তি করে একটি CTI সিস্টেম ব্যবহার করার সময় ফোন কল শুরু করতে ব্যবহার করা যেতে পারে। দ্রষ্টব্য: স্মার্টফোন ব্যবহার করার সময়, ফোন নম্বরগুলি সর্বদা ক্লিকযোগ্য।
 ClickToDialUseTelLink=ফোন নম্বরগুলিতে শুধুমাত্র একটি লিঙ্ক "টেল:" ব্যবহার করুন৷
 ClickToDialUseTelLinkDesc=এই পদ্ধতিটি ব্যবহার করুন যদি আপনার ব্যবহারকারীদের একটি সফ্টফোন বা একটি সফ্টওয়্যার ইন্টারফেস থাকে, ব্রাউজার হিসাবে একই কম্পিউটারে ইনস্টল করা হয় এবং আপনি যখন আপনার ব্রাউজারে "tel:" দিয়ে শুরু হওয়া একটি লিঙ্কে ক্লিক করেন তখন কল করা হয়৷ আপনার যদি "sip:" বা একটি সম্পূর্ণ সার্ভার সমাধান (স্থানীয় সফ্টওয়্যার ইনস্টলেশনের প্রয়োজন নেই) দিয়ে শুরু হয় এমন একটি লিঙ্কের প্রয়োজন হলে, আপনাকে অবশ্যই এটি "না" তে সেট করতে হবে এবং পরবর্তী ক্ষেত্রটি পূরণ করতে হবে।
@@ -1920,8 +1921,8 @@ IfSetToYesDontForgetPermission=যদি একটি নন-নাল মান
 GeoIPMaxmindSetup=জিওআইপি ম্যাক্সমাইন্ড মডিউল সেটআপ
 PathToGeoIPMaxmindCountryDataFile=ম্যাক্সমাইন্ড আইপি থেকে দেশের অনুবাদ ধারণকারী ফাইলের পথ
 NoteOnPathLocation=মনে রাখবেন যে আপনার আইপি টু কান্ট্রি ডেটা ফাইলটি আপনার PHP পড়তে পারে এমন একটি ডিরেক্টরির মধ্যে থাকা আবশ্যক (আপনার PHP open_basedir সেটআপ এবং ফাইল সিস্টেমের অনুমতি পরীক্ষা করুন)।
-YouCanDownloadFreeDatFileTo=আপনি ম্যাক্সমাইন্ড জিওআইপি কান্ট্রি ফাইলের একটি <b>ফ্রি ডেমো সংস্করণ</b> ডাউনলোড করতে পারেন <span class='notranslate'>b0ecb2ecz87f4<span class='notranslate'> /span>।
-YouCanDownloadAdvancedDatFileTo=এছাড়াও আপনি আরও <b>সম্পূর্ণ সংস্করণ ডাউনলোড করতে পারেন, আপডেট সহ, <span class=' এ Maxmind GeoIP কান্ট্রি ফাইলের</b> notranslate'>%s</span>.
+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=একটি রূপান্তর আইপি পরীক্ষা -> দেশ
 ##### Projects #####
 ProjectsNumberingModules=প্রজেক্ট নম্বরিং মডিউল
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=নিম্নলিখিত কার
 SomethingMakeInstallFromWebNotPossible2=এই কারণে, এখানে বর্ণিত আপগ্রেড করার প্রক্রিয়াটি একটি ম্যানুয়াল প্রক্রিয়া শুধুমাত্র একজন বিশেষ সুবিধাপ্রাপ্ত ব্যবহারকারী সম্পাদন করতে পারেন।
 InstallModuleFromWebHasBeenDisabledContactUs=অ্যাপ্লিকেশন থেকে বাহ্যিক মডিউল বা গতিশীল ওয়েবসাইটগুলির ইনস্টল বা বিকাশ বর্তমানে নিরাপত্তার উদ্দেশ্যে লক করা আছে। আপনি যদি এই বৈশিষ্ট্যটি সক্ষম করতে চান তাহলে অনুগ্রহ করে আমাদের সাথে যোগাযোগ করুন৷
 InstallModuleFromWebHasBeenDisabledByFile=অ্যাপ্লিকেশন থেকে বহিরাগত মডিউল ইনস্টল আপনার প্রশাসক দ্বারা নিষ্ক্রিয় করা হয়েছে. এটির অনুমতি দেওয়ার জন্য আপনাকে অবশ্যই তাকে <strong>%s</strong> ফাইলটি সরাতে বলতে হবে বৈশিষ্ট্য
-ConfFileMustContainCustom=অ্যাপ্লিকেশন থেকে একটি বাহ্যিক মডিউল ইনস্টল বা নির্মাণ করার জন্য মডিউল ফাইলগুলিকে <strong>%s ডিরেক্টরিতে সংরক্ষণ করতে হবে </strong>. Dolibarr দ্বারা এই ডিরেক্টরিটি প্রক্রিয়া করার জন্য, আপনাকে অবশ্যই আপনার <strong>conf/conf.php</strong> সেটআপ করতে হবে 2টি নির্দেশিক লাইন যোগ করতে: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a65dc><span><span class='notranslate'>b0a65d0 ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49fzmto '></strong></span>
+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=মাউস সরে গেলে টেবিল লাইন হাইলাইট করুন
 HighlightLinesColor=মাউস অতিক্রম করার সময় লাইনের রঙ হাইলাইট করুন (হাইলাইট না করার জন্য 'ffffff' ব্যবহার করুন)
 HighlightLinesChecked=যখন এটি চেক করা হয় তখন লাইনের রঙ হাইলাইট করুন (কোন হাইলাইট না করার জন্য 'ffffff' ব্যবহার করুন)
@@ -2065,7 +2066,7 @@ DetectionNotPossible=সনাক্তকরণ সম্ভব নয়
 UrlToGetKeyToUseAPIs=API ব্যবহার করার জন্য টোকেন পেতে Url (একবার টোকেন প্রাপ্ত হলে তা ডাটাবেস ব্যবহারকারী টেবিলে সংরক্ষিত হয় এবং প্রতিটি API কলে অবশ্যই প্রদান করতে হবে)
 ListOfAvailableAPIs=উপলব্ধ API-এর তালিকা
 activateModuleDependNotSatisfied=মডিউল "%s" মডিউল "%s" এর উপর নির্ভর করে, এটি অনুপস্থিত, তাই মডিউল " %1$s" সঠিকভাবে কাজ নাও করতে পারে। আপনি যদি কোনো বিস্ময় থেকে নিরাপদ থাকতে চান তাহলে অনুগ্রহ করে "%2$s" মডিউল ইনস্টল করুন বা "%1$s" মডিউলটি নিষ্ক্রিয় করুন
-CommandIsNotInsideAllowedCommands=আপনি যে কমান্ডটি চালানোর চেষ্টা করছেন সেটি প্যারামিটারে সংজ্ঞায়িত অনুমোদিত কমান্ডের তালিকায় নেই <strong>$dolibarr_main_restrict_os_commands</strong> class='notranslate'><strong></span>conf.php</strong> ফাইল।
+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=অবতরণ পাতা
 SamePriceAlsoForSharedCompanies=আপনি যদি একটি মাল্টিকোম্পানি মডিউল ব্যবহার করেন, "একক মূল্য" পছন্দের সাথে, পণ্যগুলি পরিবেশের মধ্যে ভাগ করা হলে মূল্যও সমস্ত কোম্পানির জন্য একই হবে
 ModuleEnabledAdminMustCheckRights=মডিউল সক্রিয় করা হয়েছে. সক্রিয় মডিউল (গুলি) জন্য অনুমতি শুধুমাত্র প্রশাসক ব্যবহারকারীদের দেওয়া হয়েছে. প্রয়োজনে আপনাকে অন্য ব্যবহারকারী বা গোষ্ঠীকে ম্যানুয়ালি অনুমতি দিতে হতে পারে।
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=APIs মডিউল সক্রিয় করা নেই
 YouShouldSetThisToOff=আপনার এটি 0 বা বন্ধ করা উচিত
 InstallAndUpgradeLockedBy=<b>%s</b> ফাইল দ্বারা ইনস্টল এবং আপগ্রেডগুলি লক করা আছে
 InstallLockedBy=<b>%s</b> ফাইল দ্বারা ইনস্টল/পুনঃইনস্টল লক করা আছে
-InstallOfAddonIsNotBlocked=অ্যাডঅনগুলির ইনস্টলেশন লক করা হয় না। একটি ফাইল তৈরি করুন <b>installmodules.lock</b> ডিরেক্টরিতে b0aee8365837><span class="fz0" ='notranslate'>%s</b> বহিরাগত অ্যাডঅন/মডিউলগুলির ইনস্টলেশন ব্লক করতে।
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=পুরানো বাস্তবায়ন
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=যদি কিছু অনলাইন পেমেন্ট মডিউল সক্ষম করা থাকে (পেপাল, স্ট্রাইপ, ...), অনলাইন পেমেন্ট করতে PDF এ একটি লিঙ্ক যোগ করুন
 DashboardDisableGlobal=বিশ্বব্যাপী খোলা বস্তুর সমস্ত থাম্ব অক্ষম করুন
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=ডিফল্টরূপে 
 CSSPage=CSS শৈলী
 Defaultfortype=ডিফল্ট
 DefaultForTypeDesc=টেমপ্লেট প্রকারের জন্য একটি নতুন ইমেল তৈরি করার সময় ডিফল্টরূপে ব্যবহৃত টেমপ্লেট
-OptionXShouldBeEnabledInModuleY=বিকল্প "<b>%s</b>" মডিউল <span মডিউলে সক্ষম করা উচিত ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=বিকল্প "<b>%s</b>" মডিউল <span= ক্লাসে সক্ষম করা হয়েছে 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=অন লাইন স্বাক্ষরের অনুমতি দিন
 AtBottomOfPage=পৃষ্ঠার নীচে
 FailedAuth=ব্যর্থ প্রমাণীকরণ
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index 5a9cdfe93d2..f4ad6730b96 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -137,8 +137,8 @@ DateActionEnd=শেষ তারিখ
 AgendaUrlOptions1=আপনি ফিল্টার আউটপুট নিম্নলিখিত পরামিতি যোগ করতে পারেন:
 AgendaUrlOptions3=<b>logina=%s</b> ব্যবহারকারীর মালিকানাধীন ক্রিয়াকলাপগুলিতে আউটপুট সীমাবদ্ধ করতে <b>%s</b>।
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> আউটপুটকে নিজের নয় এমন ক্রিয়াগুলিতে সীমাবদ্ধ করতে ব্যবহারকারী <b>%s</b>।
-AgendaUrlOptions4=<b>logint=%s</b> ব্যবহারকারীকে <অর্পণ করা কর্মগুলিতে আউটপুট সীমাবদ্ধ করতে span class='notranslate'><b></span>%s</b> (মালিক এবং অন্যান্য)।
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> প্রজেক্টের সাথে লিঙ্ক করা ক্রিয়াকলাপের আউটপুট সীমাবদ্ধ করতে b0aee85>b0aee83333 __PROJECT_ID__<span class='notranslate'></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>।
 AgendaUrlOptionsIncludeHolidays=ছুটির ইভেন্টগুলি অন্তর্ভুক্ত করতে <b>includeholidays=1</b>।
 AgendaShowBirthdayEvents=পরিচিতির জন্মদিন
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 8decc723a30..288561adc9f 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -188,7 +188,7 @@ SuppliersDraftInvoices=বিক্রেতার খসড়া চালা
 Unpaid=Unpaid
 ErrorNoPaymentDefined=ত্রুটি কোন পেমেন্ট সংজ্ঞায়িত করা হয়নি
 ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=আপনি কি <b>%s</b><span class='notranslate'>রেফারেন্স সহ এই চালানটি যাচাই করতে চান? >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the 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>?
@@ -377,7 +377,7 @@ DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
 DescTaxAndDividendsArea=এই এলাকাটি বিশেষ খরচের জন্য করা সমস্ত অর্থপ্রদানের সারাংশ উপস্থাপন করে। শুধুমাত্র নির্দিষ্ট বছরে পেমেন্ট সহ রেকর্ডগুলি এখানে অন্তর্ভুক্ত করা হয়েছে।
 NbOfPayments=পেমেন্ট সংখ্যা
 SplitDiscount=Split discount in two
-ConfirmSplitDiscount=আপনি কি নিশ্চিত যে আপনি <b>%s</b> এই ছাড়টি ভাগ করতে চান span class='notranslate'>%s</span> দুটি ছোট ডিসকাউন্টে?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=দুটি অংশের প্রতিটির জন্য ইনপুট পরিমাণ:
 TotalOfTwoDiscountMustEqualsOriginal=মোট দুটি নতুন ডিসকাউন্ট মূল ছাড়ের পরিমাণের সমান হতে হবে।
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
@@ -614,7 +614,7 @@ invoiceLineProgressError=Invoice line progress can't be greater than or equal to
 updatePriceNextInvoiceErrorUpdateline=ত্রুটি: চালান লাইনে মূল্য আপডেট করুন: %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=আপনার যদি এই ধরনের চালানগুলি স্বয়ংক্রিয়ভাবে তৈরি করতে হয়, তাহলে আপনার প্রশাসককে <strong>%s<span class='notranslate' মডিউল সক্ষম এবং সেটআপ করতে বলুন '></strong></span>। নোট করুন যে উভয় পদ্ধতি (ম্যানুয়াল এবং স্বয়ংক্রিয়) একসাথে ব্যবহার করা যেতে পারে নকলের ঝুঁকি ছাড়াই।
+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=তৃতীয় পক্ষের প্রতি একটি চালান তৈরি করুন (অন্যথায়, নির্বাচিত বস্তু প্রতি একটি চালান)
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 4e073b36b16..04d4bd64b81 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=অনেক পরামিতি সহ শক
 ByTerminal=টার্মিনাল দ্বারা
 TakeposNumpadUsePaymentIcon=নমপ্যাডের পেমেন্ট বোতামে টেক্সটের পরিবর্তে আইকন ব্যবহার করুন
 CashDeskRefNumberingModules=POS বিক্রয়ের জন্য সংখ্যায়ন মডিউল
-CashDeskGenericMaskCodes6 = <br><b>{TN}b09f870<span class='notranslate' টার্মিনাল নম্বর যোগ করতে span> ট্যাগ ব্যবহার করা হয়
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=একই পণ্যের লাইন মার্জ করুন
 StartAParallelSale=একটি নতুন সমান্তরাল বিক্রয় শুরু করুন
 SaleStartedAt=%s এ বিক্রি শুরু হয়েছে
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index cc96c82e9fb..f332294eab4 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -335,13 +335,13 @@ CompanyHasRelativeDiscount=এই গ্রাহকের ডিফল্ট 
 CompanyHasNoRelativeDiscount=এই গ্রাহকের ডিফল্টরূপে কোন আপেক্ষিক ডিসকাউন্ট নেই
 HasRelativeDiscountFromSupplier=আপনার ডিফল্ট ডিসকাউন্ট <b>%s%%</b> এই বিক্রেতার সাথে
 HasNoRelativeDiscountFromSupplier=এই বিক্রেতার সাথে কোন ডিফল্ট আপেক্ষিক ডিসকাউন্ট
-CompanyHasAbsoluteDiscount=এই গ্রাহকের <b>%sb09a4b739f17fz0এর জন্য ডিসকাউন্ট উপলব্ধ (ক্রেডিট নোট বা ডাউন পেমেন্ট) span> <span class='notranslate'>%s
-CompanyHasDownPaymentOrCommercialDiscount=এই গ্রাহকের <b>%s</b>এর জন্য ডিসকাউন্ট উপলব্ধ (বাণিজ্যিক, ডাউন পেমেন্ট) > <span class='notranslate'>%s
-CompanyHasCreditNote=এই গ্রাহকের কাছে এখনও <b>%s</b> <span class= এর ক্রেডিট নোট রয়েছে 'notranslate'>%s</span>
+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=এই বিক্রেতা থেকে কোন ডিসকাউন্ট/ক্রেডিট উপলব্ধ
-HasAbsoluteDiscountFromSupplier=<b>%s</b>এর জন্য আপনার কাছে ছাড় রয়েছে (ক্রেডিট নোট বা ডাউন পেমেন্ট) > <span class='notranslate'>%s এই বিক্রেতার কাছ থেকে
-HasDownPaymentOrCommercialDiscountFromSupplier=<b>%s</b>এর জন্য আপনার কাছে ছাড় রয়েছে (বাণিজ্যিক, ডাউন পেমেন্ট) এই বিক্রেতার কাছ থেকে <span class='notranslate'>%s
-HasCreditNoteFromSupplier=আপনার কাছে <b>%s</b> <span class='notranslate'-এর ক্রেডিট নোট রয়েছে '>%s</span> এই বিক্রেতা থেকে
+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=এই গ্রাহকের কোন ডিসকাউন্ট ক্রেডিট উপলব্ধ নেই
 CustomerAbsoluteDiscountAllUsers=পরম গ্রাহক ডিসকাউন্ট (সমস্ত ব্যবহারকারীদের দ্বারা মঞ্জুর)
 CustomerAbsoluteDiscountMy=সম্পূর্ণ গ্রাহক ছাড় (নিজের দ্বারা প্রদত্ত)
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 80612e042cc..346be4bd705 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -158,27 +158,27 @@ ConfirmDeleteVAT=আপনি কি এই ভ্যাট ঘোষণা ম
 ConfirmDeleteSalary=আপনি কি এই বেতন মুছে ফেলার বিষয়ে নিশ্চিত?
 ConfirmDeleteVariousPayment=আপনি কি এই বিভিন্ন অর্থপ্রদান মুছে ফেলার বিষয়ে নিশ্চিত?
 ExportDataset_tax_1=সামাজিক এবং রাজস্ব ট্যাক্স এবং পেমেন্ট
-CalcModeVATDebt=মোড <b>%sকমিটমেন্ট অ্যাকাউন্টিং এর উপর ভ্যাট%s<span class='notranslate' '></b></span>।
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=মোড <b>%sআয়-ব্যয়ের উপর ভ্যাট%s</b>.
 CalcModeDebt=পরিচিত নথিভুক্ত নথি বিশ্লেষণ
 CalcModeEngagement=পরিচিত নথিভুক্ত পেমেন্ট বিশ্লেষণ
 CalcModePayment=পরিচিত নথিভুক্ত পেমেন্ট বিশ্লেষণ
 CalcModeBookkeeping=বুককিপিং লেজার টেবিলে জার্নালাইজ করা ডেটা বিশ্লেষণ।
 CalcModeNoBookKeeping=এমনকি যদি তারা এখনও লেজারে হিসাব না করে থাকে
-CalcModeLT1= মোড <b>%sআরই গ্রাহক চালান - সরবরাহকারীদের চালানb0ecb2ec87f><span class0 ='notranslate'></b></span>
-CalcModeLT1Debt=মোড <b>%sগ্রাহকের চালানে RE%s<span class='notranslate' '></b></span>
-CalcModeLT1Rec= মোড <b>%sসাপ্লায়ার ইনভয়েসে RE%s<span class='notranslate' '></b></span>
-CalcModeLT2= মোড <b>%sগ্রাহকের চালানে IRPF - সরবরাহকারীদের চালানb0ecb2ec87f><span class0 ='notranslate'></b></span>
-CalcModeLT2Debt=মোড <b>%sগ্রাহকের চালানে IRPF%s<span class='notranslate' '></b></span>
+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= মোড <b>%sসাপ্লায়ার ইনভয়েসগুলিতে IRPF%s<translate class=translate '></b></span>
 AnnualSummaryDueDebtMode=আয় এবং ব্যয়ের ভারসাম্য, বার্ষিক সারাংশ
 AnnualSummaryInputOutputMode=আয় এবং ব্যয়ের ভারসাম্য, বার্ষিক সারাংশ
 AnnualByCompanies=অ্যাকাউন্টের পূর্বনির্ধারিত গোষ্ঠী দ্বারা আয় এবং ব্যয়ের ভারসাম্য
 AnnualByCompaniesDueDebtMode=আয় এবং ব্যয়ের ভারসাম্য, পূর্বনির্ধারিত গোষ্ঠীগুলির দ্বারা বিশদ, মোড <b>%sদাবি-ঋণb0ecb2ec880 </b> বলেছে <b>কমিটমেন্ট অ্যাকাউন্টিং</b>।
 AnnualByCompaniesInputOutputMode=আয় এবং ব্যয়ের ভারসাম্য, পূর্বনির্ধারিত গোষ্ঠী দ্বারা বিশদ, মোড <b>%sআয়-ব্যয়b0ecb2ecz80 </b> বলেছেন <b>নগদ হিসাব</b>।
-SeeReportInInputOutputMode=<b>%sপেমেন্টের বিশ্লেষণ দেখুন%s<span class='notranslate' <b>রেকর্ড করা পেমেন্ট</b> এর উপর ভিত্তি করে একটি গণনার জন্য ></b></span> এমনকি যদি সেগুলি এখনও এল একাউন্টে না থাকে
-SeeReportInDueDebtMode=<b>%sলিপিবদ্ধ নথির বিশ্লেষণ দেখুন%s<span class='notranslate' '></b></span> পরিচিত <b>লিপিবদ্ধ নথি</b> একাউন্টে না থাকলেও একটি গণনার জন্য
-SeeReportInBookkeepingMode=দেখুন <b>%sখাতা খাতা টেবিলের বিশ্লেষণ%s<span><span> notranslate'></b></span> <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 bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- সমস্ত ট্যাক্স সহ দেখানো পরিমাণ
 RulesAmountWithTaxExcluded=- সমস্ত ট্যাক্স বাদ দিয়ে দেখানো চালানের পরিমাণ
 RulesResultDue=- এতে সমস্ত ইনভয়েস, খরচ, ভ্যাট, অনুদান, বেতন অন্তর্ভুক্ত থাকে, সেগুলি দেওয়া হোক বা না হোক।<br>- এটি চালানের বিলিংয়ের তারিখ এবং নির্ধারিত তারিখের উপর ভিত্তি করে খরচ বা ট্যাক্স পেমেন্ট। বেতনের জন্য, মেয়াদ শেষ হওয়ার তারিখ ব্যবহার করা হয়।
@@ -213,7 +213,7 @@ LT2ReportByQuarters=হার দ্বারা রিপোর্ট কর 3
 LT1ReportByQuartersES=RE হার দ্বারা রিপোর্ট
 LT2ReportByQuartersES=IRPF হার দ্বারা রিপোর্ট
 SeeVATReportInInputOutputMode=প্রতিবেদন দেখুন <b>%sভ্যাট সংগ্রহ%s</b> একটি আদর্শ গণনার জন্য
-SeeVATReportInDueDebtMode=রিপোর্ট দেখুন <b>%sডেবিটের উপর ভ্যাট%s<span class='notranslate' চালানে একটি বিকল্প সহ একটি গণনার জন্য '></b></span>
+SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
 RulesVATInServices=- পরিষেবাগুলির জন্য, প্রতিবেদনে অর্থপ্রদানের তারিখের ভিত্তিতে প্রকৃতপক্ষে প্রাপ্ত অর্থপ্রদানের ভ্যাট অন্তর্ভুক্ত থাকে।
 RulesVATInProducts=- বস্তুগত সম্পদের জন্য, প্রতিবেদনে অর্থপ্রদানের তারিখের ভিত্তিতে ভ্যাট অন্তর্ভুক্ত থাকে।
 RulesVATDueServices=- পরিষেবার জন্য, প্রতিবেদনে ইনভয়েসের তারিখের উপর ভিত্তি করে বকেয়া ইনভয়েসের ভ্যাট অন্তর্ভুক্ত রয়েছে, পরিশোধ করা হয়েছে বা না করা হয়েছে।
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index 447487d2ccb..cb1160976f9 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = নির্ধারিত চাকরি পড়ুন
 Permission23102 = নির্ধারিত কাজ তৈরি/আপডেট করুন
 Permission23103 = নির্ধারিত কাজ মুছুন
@@ -64,7 +63,7 @@ CronTaskInactive=এই কাজটি অক্ষম (নির্ধার
 CronId=আইডি
 CronClassFile=ক্লাস সহ ফাইলের নাম
 CronModuleHelp=Dolibarr মডিউল ডিরেক্টরির নাম (এছাড়াও বহিরাগত Dolibarr মডিউলের সাথে কাজ করে)। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য </span>/class/product.class.php, মডিউলের মান হল<br><i>পণ্য</i>
-CronClassFileHelp=লোড করার জন্য আপেক্ষিক পাথ এবং ফাইলের নাম (পাথটি ওয়েব সার্ভার রুট ডিরেক্টরির সাথে সম্পর্কিত)। <BR> উদাহরণস্বরূপ Dolibarr পণ্য বস্তু htdocs/product/class/<u>product.class.php<span এর আনয়ন পদ্ধতি কল করতে class='notranslate'></u></span>, ক্লাস ফাইল নামের মান হল<br><i>পণ্য/শ্রেণী/পণ্য .class.php</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=লোড করার জন্য বস্তুর নাম। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য /htdocs/product/class/product.class.php, ক্লাস ফাইল নামের মান হল<br><i>পণ্য</i>
 CronMethodHelp=লঞ্চ করার জন্য অবজেক্ট পদ্ধতি। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতিকে কল করার জন্য /htdocs/product/class/product.class.php, পদ্ধতির মান হল <br><i>আনয়ন</i>
 CronArgsHelp=পদ্ধতি আর্গুমেন্ট. <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য /htdocs/product/class/product.class.php, প্যারামিটারের মান হতে পারে<br><i>0, ProductRef</i>
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 62795943e9e..b033804fb69 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -81,7 +81,7 @@ 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=<b>%s</b> ক্ষেত্রটিতে অবশ্যই বিশেষ অক্ষর থাকবে না।
 ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>%s</b> বিশেষ অক্ষর থাকা উচিত নয়, বড় হাতের অক্ষরও থাকবে না অক্ষর, এবং একটি বর্ণানুক্রমিক অক্ষর দিয়ে শুরু করতে হবে (a-z)
-ErrorFieldMustHaveXChar=<b>%s</b> ক্ষেত্রটিতে কমপক্ষে <span class=' থাকতে হবে notranslate'>%s</span> অক্ষর।
+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.
@@ -95,9 +95,9 @@ ErrorModuleRequireJavascript=এই বৈশিষ্ট্যটি কাজ
 ErrorPasswordsMustMatch=Both typed passwords must match each other
 ErrorContactEMail=একটি প্রযুক্তিগত ত্রুটি ঘটেছে. অনুগ্রহ করে, নিম্নলিখিত ইমেল <b>%s</b> করার জন্য প্রশাসকের সাথে যোগাযোগ করুন এবং ত্রুটি প্রদান করুন কোড <b>%s</b> আপনার বার্তায়, অথবা এর একটি স্ক্রিন কপি যোগ করুন এই পৃষ্ঠা.
 ErrorWrongValueForField=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' রেজেক্স নিয়মের সাথে মেলে না %s</b>
-ErrorHtmlInjectionForField=ক্ষেত্র <b>%s</b>: মান '<span class='notranslate' '><b></span>%s</b>' একটি দূষিত ডেটা রয়েছে অনুমোদিত নয়
-ErrorFieldValueNotIn=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' b0aee83z5</span class='notranslate' ক্ষেত্রে পাওয়া একটি মান নয় <span class='notranslate'><b> এর span><span class='notranslate'>%s</b> %s</span></b>
-ErrorFieldRefNotIn=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' একটি b0aee83f><span><span></span class='notranslate' নয় class='notranslate'>%s</b> বিদ্যমান রেফ
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+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
 ErrorMultipleRecordFoundFromRef=রেফ <b>%s</b> থেকে অনুসন্ধান করার সময় বেশ কিছু রেকর্ড পাওয়া গেছে। কোন আইডি ব্যবহার করবেন তা জানার উপায় নেই।
 ErrorsOnXLines=%s ত্রুটি পাওয়া গেছে
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=Check that you don't use a too high number of recipients an
 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=মডিউলের জিপে অন্তত একটি বাধ্যতামূলক ডিরেক্টরি থাকতে হবে: <strong>%sb0a65d071f6fz90 অথবা <span class='notranslate'><strong>%s</strong>
+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.
@@ -263,9 +263,9 @@ ErrorReplaceStringEmpty=ত্রুটি, প্রতিস্থাপন 
 ErrorProductNeedBatchNumber=ত্রুটি, পণ্য '<b>%s</b>' প্রচুর/ক্রমিক নম্বর প্রয়োজন
 ErrorProductDoesNotNeedBatchNumber=ত্রুটি, পণ্য '<b>%s</b>' অনেক কিছু গ্রহণ করে না/ ক্রমিক সংখ্যা
 ErrorFailedToReadObject=ত্রুটি, <b>%s</b> প্রকারের বস্তু পড়তে ব্যর্থ হয়েছে
-ErrorParameterMustBeEnabledToAllwoThisFeature=ত্রুটি, প্যারামিটার <b>%s</b> অবশ্যই <span class= এ সক্ষম হতে হবে 'notranslate'><b></span>conf/conf.php<> অভ্যন্তরীণ কাজের সময়সূচী দ্বারা কমান্ড লাইন ইন্টারফেস ব্যবহারের অনুমতি দিতে
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=ত্রুটি, এই লগইনটি বৈধতার তারিখ সীমার বাইরে
-ErrorValueLength='<b>%s</b>' ফিল্ডের দৈর্ঘ্য অবশ্যই '< এর থেকে বেশি হতে হবে span class='notranslate'><b></span>%s</b>'
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword='<b>%s</b>' শব্দটি একটি সংরক্ষিত কীওয়ার্ড
 ErrorFilenameReserved=ফাইলের নাম <b>%s</b> ব্যবহার করা যাবে না কারণ এটি একটি। সংরক্ষিত এবং সুরক্ষিত কমান্ড।
 ErrorNotAvailableWithThisDistribution=এই বিতরণের সাথে উপলব্ধ নয়
diff --git a/htdocs/langs/bn_BD/eventorganization.lang b/htdocs/langs/bn_BD/eventorganization.lang
index ef6bb01e9e1..d288711b697 100644
--- a/htdocs/langs/bn_BD/eventorganization.lang
+++ b/htdocs/langs/bn_BD/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=ইভেন্ট অর্গানাইজেশন 
 EventOrganization=ইভেন্ট সংগঠন
 EventOrganizationSetupPage = ইভেন্ট সংস্থা সেটআপ পৃষ্ঠা
 EVENTORGANIZATION_TASK_LABEL = প্রোজেক্ট যাচাই করা হলে স্বয়ংক্রিয়ভাবে তৈরি করা কাজের লেবেল
-EVENTORGANIZATION_TASK_LABELTooltip = যখন আপনি একটি ইভেন্টকে সংগঠিত করার জন্য যাচাই করেন, তখন কিছু কাজ স্বয়ংক্রিয়ভাবে প্রকল্পে তৈরি হতে পারে<br><br>উদাহরণস্বরূপ: <br>সম্মেলনের জন্য কল পাঠান<br>বুথের জন্য কল পাঠান<br>সম্মেলনের প্রস্তাবনা<span> ='notranslate'><br></span>বুথের জন্য আবেদন যাচাই করুন<br>অতিথিদের জন্য ইভেন্টের সদস্যতা উন্মুক্ত করুন<br>respandSmin বক্তাদের কাছে ইভেন্টের কথা<br>বুথ হোস্টার্সকে ইভেন্টের একটি অনুস্মারক পাঠান<br>অতিথিদের ইভেন্টের একটি অনুস্মারক পাঠান
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=আপনার যদি স্বয়ংক্রিয়ভাবে কাজ তৈরি করার প্রয়োজন না হয় তবে খালি রাখুন।
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = তৃতীয় পক্ষের সাথে যুক্ত করার জন্য বিভাগ স্বয়ংক্রিয়ভাবে তৈরি হয় যখন কেউ একটি সম্মেলনের পরামর্শ দেয়
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = তৃতীয় পক্ষের সাথে যুক্ত করার জন্য বিভাগ স্বয়ংক্রিয়ভাবে তৈরি হয় যখন তারা একটি বুথের পরামর্শ দেয়
@@ -88,6 +88,7 @@ PriceOfRegistration=নিবন্ধনের মূল্য
 PriceOfRegistrationHelp=ইভেন্টে নিবন্ধন বা অংশগ্রহণের জন্য মূল্য দিতে হবে
 PriceOfBooth=সাবস্ক্রিপশন মূল্য একটি বুথ দাঁড়ানো
 PriceOfBoothHelp=সাবস্ক্রিপশন মূল্য একটি বুথ দাঁড়ানো
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=সম্মেলনের জন্য আইসিএস লিঙ্ক করুন
 ConferenceOrBoothInformation=সম্মেলন বা বুথ তথ্য
 Attendees=উপস্থিতরা
diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
index eef575cb6c9..50fc51b8575 100644
--- a/htdocs/langs/bn_BD/exports.lang
+++ b/htdocs/langs/bn_BD/exports.lang
@@ -72,7 +72,7 @@ FieldsTarget=Targeted fields
 FieldTarget=Targeted field
 FieldSource=Source field
 NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=আপনার ফাইলের ফাইল ফরম্যাট (ক্ষেত্র এবং স্ট্রিং ডিলিমিটার) দেখানো বিকল্পগুলির সাথে মেলে এবং আপনি হেডার লাইনটি বাদ দিয়েছেন কিনা তা পরীক্ষা করে দেখুন, অথবা এইগুলি নিম্নলিখিত সিমুলেশনে ত্রুটি হিসাবে ফ্ল্যাগ করা হবে।<br></span span>একটি চালানোর জন্য "<span class='notranslate'><b>%s</b>" বোতামে ক্লিক করুন ফাইলের গঠন/বিষয়বস্তু পরীক্ষা করুন এবং আমদানি প্রক্রিয়া অনুকরণ করুন।<br><b>আপনার ডাটাবেসে কোনো ডেটা পরিবর্তন করা হবে না</b>।
+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=আমদানি সিমুলেশন চালান
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
@@ -83,19 +83,19 @@ SelectFormat=Choose this import file format
 RunImportFile=তথ্য আমদানি
 NowClickToRunTheImport=আমদানি সিমুলেশন ফলাফল পরীক্ষা করুন. কোনো ত্রুটি সংশোধন করুন এবং পুনরায় পরীক্ষা করুন।<br>যখন সিমুলেশন কোনো ত্রুটির প্রতিবেদন করে না আপনি ডাটাবেসে ডেটা আমদানি করতে এগিয়ে যেতে পারেন।
 DataLoadedWithId=এই আমদানি আইডি সহ প্রতিটি ডাটাবেস টেবিলে আমদানি করা ডেটার একটি অতিরিক্ত ক্ষেত্র থাকবে: <b>%s</b>, এই আমদানির সাথে সম্পর্কিত একটি সমস্যা তদন্তের ক্ষেত্রে এটি অনুসন্ধানযোগ্য হওয়ার অনুমতি দিতে৷
-ErrorMissingMandatoryValue=<b>%s</b><span class='notranslate'> কলামের উৎস ফাইলে বাধ্যতামূলক ডেটা খালি।
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=এখনও <b>%s</b> ত্রুটি সহ অন্যান্য উত্স লাইন আছে কিন্তু আউটপুট আছে সীমিত করা হয়েছে।
 TooMuchWarnings=এখনও <b>%s</b> সতর্কতা সহ অন্যান্য উত্স লাইন আছে কিন্তু আউটপুট আছে সীমিত করা হয়েছে।
 EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=আপনাকে <b>অবশ্যই</b> সমস্ত ত্রুটি সংশোধন করতে হবে <b>আগে <span=' notranslate'></b></span> নিশ্চিত আমদানি চলছে৷
+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=আপনি <b>import_key='%s'<span class='notranslate' ফিল্টার করে আপনার ডাটাবেসের সমস্ত আমদানি করা রেকর্ড খুঁজে পেতে পারেন '></b></span>।
+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=সন্নিবেশ করার মান উৎস ফাইলে <b>%s</b> থেকে আসে।
 DataComeFromIdFoundFromRef=সোর্স ফাইল থেকে আসা মানটি ব্যবহার করার জন্য মূল বস্তুর আইডি খুঁজতে ব্যবহার করা হবে (তাই বস্তুটি <b>%s</b> যার রেফ. ফ্রম সোর্স ফাইলটি ডাটাবেসে বিদ্যমান থাকতে হবে)।
-DataComeFromIdFoundFromCodeId=সোর্স ফাইল থেকে আসা কোডের মান ব্যবহার করা হবে প্যারেন্ট অবজেক্টের আইডি খুঁজে বের করার জন্য (সুতরাং সোর্স ফাইলের কোডটি ডিকশনারিতে থাকা আবশ্যক <b><span ক্লাস ='notranslate'>%s</span></b>)। মনে রাখবেন যে আপনি যদি আইডিটি জানেন তবে আপনি কোডের পরিবর্তে সোর্স ফাইলে এটি ব্যবহার করতে পারেন। আমদানি উভয় ক্ষেত্রেই কাজ করা উচিত।
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=মূল বস্তুর আইডি, যা উৎস ফাইলের ডেটা ব্যবহার করে পাওয়া গেছে, নিম্নলিখিত ক্ষেত্রে সন্নিবেশ করা হবে:
 DataCodeIDSourceIsInsertedInto=প্যারেন্ট লাইনের আইডি, যা কোড থেকে পাওয়া গেছে, নিম্নলিখিত ক্ষেত্রে ঢোকানো হবে:
@@ -113,7 +113,7 @@ Separator=ক্ষেত্র বিভাজক
 Enclosure=স্ট্রিং ডিলিমিটার
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: এক বছর/মাস/দিনের দ্বারা ফিল্টার করুন<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD+YYYYMMDD বছর/মাস/মাস রেঞ্জের বেশি বছর span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMDD: পরবর্তী সমস্ত বছর/মাস/দিনে ফিল্টার<br> < YYYY, <YYYY, YYYYMMDD: আগের সমস্ত বছর/মাস/দিনে ফিল্টার
+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
diff --git a/htdocs/langs/bn_BD/help.lang b/htdocs/langs/bn_BD/help.lang
index da41f13ea48..1a42aa60703 100644
--- a/htdocs/langs/bn_BD/help.lang
+++ b/htdocs/langs/bn_BD/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=অন্যথায়, <a href="%s">সহায়তা 
 LinkToGoldMember=আপনি আপনার ভাষার জন্য Dolibarr দ্বারা পূর্বনির্বাচিত একজন প্রশিক্ষককে কল করতে পারেন (%s) তাদের উইজেটে ক্লিক করে (স্থিতি এবং সর্বোচ্চ মূল্য স্বয়ংক্রিয়ভাবে আপডেট হয়):
 PossibleLanguages=Supported languages
 SubscribeToFoundation=Dolibarr প্রকল্পে সাহায্য করুন, ফাউন্ডেশনের সদস্যতা নিন
-SeeOfficalSupport=আপনার ভাষায় অফিসিয়াল Dolibarr সমর্থনের জন্য: <br><b><a href="%s" target="_blank" rel="noopener noreferrer"><span ক্লাস ='notranslate'>%s</span></a></b>
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/bn_BD/hrm.lang b/htdocs/langs/bn_BD/hrm.lang
index b6ec7fd1bce..6bb56282297 100644
--- a/htdocs/langs/bn_BD/hrm.lang
+++ b/htdocs/langs/bn_BD/hrm.lang
@@ -45,7 +45,7 @@ Eval=মূল্যায়ন
 Evals=মূল্যায়ন
 NewEval=নতুন মূল্যায়ন
 ValidateEvaluation=মূল্যায়ন যাচাই করুন
-ConfirmValidateEvaluation=আপনি কি <b>%s</b><span class='notranslate'>রেফারেন্স দিয়ে এই মূল্যায়ন যাচাই করার বিষয়ে নিশ্চিত >?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=মূল্যায়ন কার্ড
 RequiredRank=কাজের প্রোফাইলের জন্য প্রয়োজনীয় র‌্যাঙ্ক
 RequiredRankShort=প্রয়োজনীয় পদমর্যাদা
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index 97ad6c4642d..7aeb6b0ba61 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=এটা সম্ভব যে আপনার পিএ
 PHPSupportSessions=This PHP supports sessions.
 PHPSupport=এই PHP %s ফাংশন সমর্থন করে।
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=আপনার PHP সর্বোচ্চ সেশন মেমরি <b>%s</b> বাইটে সেট করা আছে। এটা খুবই কম। আপনার <b>php.ini</b> <b>মেমোরি সেট করতে পরিবর্তন করুন ='notranslate'></b></span> প্যারামিটারে অন্তত <b>%s<span class='notranslate'>b091b<a7fz7fz0 /span> বাইট।
+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=আরো বিস্তারিত পরীক্ষার জন্য এখানে ক্লিক করুন
 ErrorPHPDoesNotSupportSessions=আপনার পিএইচপি ইনস্টলেশন সেশন সমর্থন করে না. ডলিবারকে কাজ করার অনুমতি দেওয়ার জন্য এই বৈশিষ্ট্যটি প্রয়োজন। আপনার পিএইচপি সেটআপ এবং সেশন ডিরেক্টরির অনুমতি পরীক্ষা করুন।
 ErrorPHPDoesNotSupport=আপনার PHP ইনস্টলেশন %s ফাংশন সমর্থন করে না।
@@ -115,7 +115,7 @@ OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
 FieldRenamed=Field renamed
 IfLoginDoesNotExistsCheckCreateUser=যদি ব্যবহারকারী এখনও বিদ্যমান না থাকে তবে আপনাকে অবশ্যই "ব্যবহারকারী তৈরি করুন" বিকল্পটি চেক করতে হবে
-ErrorConnection=সার্ভার "<b>%s</b>", ডাটাবেসের নাম "<b>%s</b>", লগইন "b0aee</8383 span><span class='notranslate'>%s</b>", অথবা ডাটাবেস পাসওয়ার্ড ভুল হতে পারে বা PHP ক্লায়েন্ট সংস্করণ ডাটাবেস সংস্করণের তুলনায় অনেক পুরানো হতে পারে .
+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=লক্ষ্যযুক্ত সংস্করণে (%s) বেশ কয়েকটি সংস্করণের ব্যবধান রয়েছে। এটি সম্পূর্ণ হয়ে গেলে ইনস্টল উইজার্ডটি আরও একটি মাইগ্রেশনের পরামর্শ দিতে ফিরে আসবে।
diff --git a/htdocs/langs/bn_BD/ldap.lang b/htdocs/langs/bn_BD/ldap.lang
index 489a148ba56..a13fd9fbd24 100644
--- a/htdocs/langs/bn_BD/ldap.lang
+++ b/htdocs/langs/bn_BD/ldap.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=<span class=' ডোমেনে <b>%s</b> ব্যবহারকারীর জন্য পাসওয়ার্ড notranslate'><b></span>%s</b> পরিবর্তন করতে হবে৷
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=ব্যবহারকারীকে ডোমেনে পাসওয়ার্ড পরিবর্তন করতে হবে %s
 LDAPInformationsForThisContact=এই পরিচিতির জন্য LDAP ডাটাবেসে তথ্য
 LDAPInformationsForThisUser=এই ব্যবহারকারীর জন্য LDAP ডাটাবেসে তথ্য
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index e88e25df240..e4ebaaf89cc 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=আমদানি করা ফাইলে অব
 UseFormatInputEmailToTarget=বিন্যাস সহ একটি স্ট্রিং লিখুন <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=প্রাপক (উন্নত নির্বাচন)
 AdvTgtTitle=লক্ষ্য করার জন্য তৃতীয় পক্ষ বা পরিচিতি/ঠিকানাগুলি পূর্বনির্বাচন করতে ইনপুট ক্ষেত্রগুলি পূরণ করুন
-AdvTgtSearchTextHelp=ওয়াইল্ডকার্ড হিসেবে %% ব্যবহার করুন। উদাহরণস্বরূপ <b>জিন, জো, জিম</b> এর মতো সমস্ত আইটেম খুঁজে পেতে, আপনি  ইনপুট করতে পারেন <b>j%%</b>, আপনিও ব্যবহার করতে পারেন ; মান জন্য বিভাজক হিসাবে, এবং ব্যবহার করুন! এই মান ছাড়া জন্য. যেমন <b>jean;joe;jim%%;!jimo;!jimab07e63171f5dacz span><span class='notranslate'></b> সব জিন, জো, জিম দিয়ে শুরু করবে কিন্তু জিমো নয় এবং জিমা দিয়ে শুরু হওয়া সবকিছু নয়
+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=int বা ফ্লোট মান নির্বাচন করতে ব্যবধান ব্যবহার করুন
 AdvTgtMinVal=সর্বনিম্ন মান
 AdvTgtMaxVal=সর্বোচ্চ মূল্য
@@ -182,7 +182,7 @@ IsAnAnswer=এটি একটি প্রাথমিক ইমেলের 
 RecordCreatedByEmailCollector=ইমেল সংগ্রাহকের দ্বারা তৈরি করা রেকর্ড %s ইমেল থেকে %s
 DefaultBlacklistMailingStatus=একটি নতুন পরিচিতি তৈরি করার সময় '%s' ক্ষেত্রের ডিফল্ট মান
 DefaultStatusEmptyMandatory=খালি কিন্তু বাধ্যতামূলক
-WarningLimitSendByDay=সতর্কতা: আপনার উদাহরণের সেটআপ বা চুক্তিটি প্রতিদিন আপনার ইমেলের সংখ্যা <b>%s<span class='notranslate'-এ সীমাবদ্ধ করে ></b></span>। আরও পাঠানোর চেষ্টা করার ফলে আপনার দৃষ্টান্ত ধীর বা স্থগিত হতে পারে। আপনি একটি উচ্চ কোটা প্রয়োজন হলে আপনার সমর্থনের সাথে যোগাযোগ করুন.
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=ইমেল পাঠাতে আর কোন প্রাপক
 EmailOptedOut=ইমেলের মালিক অনুরোধ করেছেন এই ইমেলের মাধ্যমে তার সাথে আর যোগাযোগ না করার জন্য
 EvenUnsubscribe=অপ্ট-আউট ইমেলগুলি অন্তর্ভুক্ত করুন৷
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index f3db4028e10..ed96b5c0f5e 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -68,7 +68,7 @@ ErrorNoRequestInError=ভুল কোন অনুরোধ
 ErrorServiceUnavailableTryLater=এই মুহূর্তে পরিষেবা উপলব্ধ নেই৷ পরে আবার চেষ্টা করুন.
 ErrorDuplicateField=একটি অনন্য ক্ষেত্রে ডুপ্লিকেট মান
 ErrorSomeErrorWereFoundRollbackIsDone=কিছু ত্রুটি পাওয়া গেছে. পরিবর্তনগুলি ফিরিয়ে আনা হয়েছে৷
-ErrorConfigParameterNotDefined=প্যারামিটার <b>%s</b> ডলিবার কনফিগারেশন ফাইলে সংজ্ঞায়িত নয় class='notranslate'><b></span>conf.php</b>।
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarr ডেটাবেসে <b>%s</b> ব্যবহারকারী খুঁজে পাওয়া যায়নি।
 ErrorNoVATRateDefinedForSellerCountry=ত্রুটি, '%s' দেশের জন্য কোনো ভ্যাট হার সংজ্ঞায়িত করা হয়নি।
 ErrorNoSocialContributionForSellerCountry=ত্রুটি, '%s' দেশের জন্য কোনো সামাজিক/আর্থিক করের ধরন সংজ্ঞায়িত করা হয়নি।
@@ -103,7 +103,7 @@ RecordDeleted=রেকর্ড মুছে ফেলা হয়েছে
 RecordGenerated=রেকর্ড তৈরি হয়েছে
 LevelOfFeature=বৈশিষ্ট্যের স্তর
 NotDefined=সংজ্ঞায়িত নয়
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr প্রমাণীকরণ মোড <b>%s</b> কনফিগারেশন ফাইলে সেট করা আছে class='notranslate'><b></span>conf.php</b>।<br>এর মানে হল পাসওয়ার্ডের প্রাক্তন ডেটাবেস Dolibarr, তাই এই ক্ষেত্র পরিবর্তন কোন প্রভাব হতে পারে.
+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=সিস্টেম অ্যাডমিনিস্ট্রেটর
 AdministratorDesc=সিস্টেম অ্যাডমিনিস্ট্রেটর (ব্যবহারকারী, অনুমতি কিন্তু সিস্টেম সেটআপ এবং মডিউল কনফিগারেশন পরিচালনা করতে পারে)
 Undefined=অনির্ধারিত
@@ -131,7 +131,7 @@ TechnicalID=প্রযুক্তিগত আইডি
 LineID=লাইন আইডি
 NotePublic=নোট (সর্বজনীন)
 NotePrivate=নোট (ব্যক্তিগত)
-PrecisionUnitIsLimitedToXDecimals=ইউনিটের দামের নির্ভুলতা <b>%sb09a4b739f17f8cimal<span class='notranslate'>এ সীমাবদ্ধ করার জন্য Dolibarr সেটআপ করা হয়েছিল .
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=পরীক্ষা
 ToFilter=ছাঁকনি
 NoFilter=ছাঁকনিবিহীন
@@ -172,7 +172,7 @@ Close=বন্ধ
 CloseAs=স্থিতি সেট করুন
 CloseBox=আপনার ড্যাশবোর্ড থেকে উইজেট সরান
 Confirm=নিশ্চিত করুন
-ConfirmSendCardByMail=আপনি কি সত্যিই এই কার্ডের বিষয়বস্তু <b>%s<span class='notranslate'></b>< এ মেইলে পাঠাতে চান /span>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=মুছে ফেলা
 Remove=অপসারণ
 Resiliate=সমাপ্ত করুন
@@ -420,6 +420,8 @@ TotalTTCShort=মোট (inc. ট্যাক্স)
 TotalHT=মোট (ট্যাক্স বাদে)
 TotalHTforthispage=এই পৃষ্ঠার জন্য মোট (ট্যাক্স বাদে)
 Totalforthispage=এই পৃষ্ঠার জন্য মোট
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=মোট (inc. ট্যাক্স)
 TotalTTCToYourCredit=আপনার ক্রেডিট মোট (inc. ট্যাক্স)
 TotalVAT=মোট ট্যাক্স
@@ -502,7 +504,7 @@ Completed=সম্পন্ন
 Running=চলমান
 RequestAlreadyDone=অনুরোধ ইতিমধ্যে রেকর্ড করা হয়েছে
 Filter=ছাঁকনি
-FilterOnInto=মাপদণ্ড '<strong>%s</strong>' ক্ষেত্রে <span class=' অনুসন্ধান করুন notranslate'>%s</span>
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=ফিল্টার সরান
 ChartGenerated=চার্ট তৈরি হয়েছে
 ChartNotGenerated=চার্ট তৈরি হয়নি
@@ -647,6 +649,7 @@ ReportName=রিপোর্টের নাম
 ReportPeriod=রিপোর্ট সময়কাল
 ReportDescription=বর্ণনা
 Report=রিপোর্ট
+Reports=Reports
 Keyword=কীওয়ার্ড
 Origin=উৎপত্তি
 Legend=কিংবদন্তি
@@ -963,6 +966,7 @@ AutomaticallyCalculated=স্বয়ংক্রিয়ভাবে গণ
 TitleSetToDraft=খসড়ায় ফিরে যান
 ConfirmSetToDraft=আপনি কি খসড়া স্ট্যাটাসে ফিরে যেতে চান?
 ImportId=আইডি আমদানি করুন
+Event=Event
 Events=ঘটনা
 EMailTemplates=ইমেল টেমপ্লেট
 FileNotShared=ফাইল বহিরাগত পাবলিক শেয়ার করা হয় না
@@ -1048,7 +1052,7 @@ Select2NotFound=কোন ফলাফল পাওয়া যায়নি
 Select2Enter=প্রবেশ করুন
 Select2MoreCharacter=বা আরও চরিত্র
 Select2MoreCharacters=বা আরও অক্ষর
-Select2MoreCharactersMore=<strong>অনুসন্ধান সিনট্যাক্স:</strong><br><span>'notranslate>'notranslate' <kbd></span><strong> |</strong>b0860de534daf0 notranslate'><kbd></span> OR</kbd> (a|b)<br>b061d061d /span><span class='notranslate'><strong>*</strong></kbd><kbd> যেকোনো অক্ষর</kbd> (a*b)<br>b06aecd0207 span><span class='notranslate'><strong>^</strong></kbd> <kbd> দিয়ে শুরু করুন</kbd> (^ab)<br>b03aecd01>b03aecd20 <strong>$</strong></kbd>b061d061d  </kbd> (ab$)<br> দিয়ে শেষ করুন
+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=আরও ফলাফল লোড হচ্ছে...
 Select2SearchInProgress=অনুসন্ধান চলছে...
 SearchIntoThirdparties=তৃতীয় পক্ষ
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=আপনি কি নিশ্চিত যে আ
 ConfirmSetSupervisorQuestion=আপনি কি নির্বাচিত রেকর্ড(গুলি) %s সুপারভাইজার সেট করতে চান?
 ConfirmUpdatePriceQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) এর মূল্য আপডেট করার বিষয়ে নিশ্চিত?
 CategTypeNotFound=রেকর্ডের ধরনের জন্য কোন ট্যাগ টাইপ পাওয়া যায়নি
-Rate=হার
 SupervisorNotFound=সুপারভাইজার পাওয়া যায়নি
 CopiedToClipboard=ক্লিপবোর্ডে কপি করা হয়েছে
 InformationOnLinkToContract=এই পরিমাণ শুধুমাত্র চুক্তির সমস্ত লাইনের মোট। সময়ের কোন ধারণা বিবেচনায় নেওয়া হয় না।
@@ -1213,6 +1216,7 @@ CanceledHidden=বাতিল লুকানো
 CanceledShown=বাতিল দেখানো হয়েছে
 Terminate=সমাপ্ত করুন
 Terminated=সমাপ্ত
+Position=Position
 AddLineOnPosition=অবস্থানে লাইন যোগ করুন (শেষে যদি খালি থাকে)
 ConfirmAllocateCommercial=বিক্রয় প্রতিনিধি নিশ্চিতকরণ বরাদ্দ করুন
 ConfirmAllocateCommercialQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) বরাদ্দ করার বিষয়ে নিশ্চিত?
@@ -1230,6 +1234,7 @@ ExternalUser=বহিরাগত ব্যবহারকারী
 NoSpecificContactAddress=কোনো নির্দিষ্ট যোগাযোগ বা ঠিকানা নেই
 NoSpecificContactAddressBis=এই ট্যাবটি বর্তমান বস্তুর জন্য নির্দিষ্ট পরিচিতি বা ঠিকানা জোর করার জন্য নিবেদিত। আপনি যদি বস্তুর জন্য এক বা একাধিক নির্দিষ্ট পরিচিতি বা ঠিকানা নির্ধারণ করতে চান তখনই এটি ব্যবহার করুন যখন তৃতীয় পক্ষের তথ্য যথেষ্ট নয় বা সঠিক নয়।
 HideOnVCard=লুকান %s
+ShowOnVCard=Show %s
 AddToContacts=আমার পরিচিতি ঠিকানা যোগ করুন
 LastAccess=শেষ অ্যাক্সেস
 UploadAnImageToSeeAPhotoHere=এখানে একটি ফটো দেখতে %s ট্যাব থেকে একটি ছবি আপলোড করুন
@@ -1259,4 +1264,7 @@ AmountSalary=বেতনের পরিমাণ
 InvoiceSubtype=চালান সাবটাইপ
 ConfirmMassReverse=বাল্ক বিপরীত নিশ্চিতকরণ
 ConfirmMassReverseQuestion=আপনি কি %s নির্বাচিত রেকর্ড (গুলি) বিপরীত করতে চান?
-
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index a0d245f7cd5..56001a98a3c 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -13,7 +13,7 @@ MembersTickets=সদস্যপদ ঠিকানা শীট
 FundationMembers=ফাউন্ডেশনের সদস্যরা
 ListOfValidatedPublicMembers=বৈধ পাবলিক সদস্যদের তালিকা
 ErrorThisMemberIsNotPublic=এই সদস্য সর্বজনীন নয়
-ErrorMemberIsAlreadyLinkedToThisThirdParty=অন্য সদস্য (নাম: <b>%s</b>, লগইন: <b>%s</b>) ইতিমধ্যেই একটি তৃতীয় পক্ষের সাথে লিঙ্ক করা আছে <span class='notranslate' '><b></span>%s</b>। প্রথমে এই লিঙ্কটি সরান কারণ একটি তৃতীয় পক্ষ শুধুমাত্র একজন সদস্যের সাথে লিঙ্ক করা যাবে না (এবং এর বিপরীতে)।
+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=নিরাপত্তার কারণে, আপনার নয় এমন ব্যবহারকারীর সাথে সদস্যকে লিঙ্ক করতে সক্ষম হওয়ার জন্য আপনাকে অবশ্যই সমস্ত ব্যবহারকারীকে সম্পাদনা করার অনুমতি দিতে হবে।
 SetLinkToUser=একটি Dolibarr ব্যবহারকারী লিঙ্ক
 SetLinkToThirdParty=একটি Dolibarr তৃতীয় পক্ষের লিঙ্ক
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index b0dcfe3f4d9..6dd7ae7c9e5 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=এখানে উদাহরণ দেখুন
 EnabledDesc=এই ক্ষেত্রটি সক্রিয় থাকার শর্ত।<br><br>উদাহরণ:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=মাঠ কি দৃশ্যমান? (উদাহরণ: 0=কখনও দৃশ্যমান নয়, 1=তালিকায় দৃশ্যমান এবং ফর্মগুলি তৈরি/আপডেট/দেখুন, 2=শুধু তালিকায় দৃশ্যমান, 3=শুধুমাত্র তৈরি/আপডেট/দেখার ফর্মে দৃশ্যমান (তালিকায় নয়), 4=তালিকায় দৃশ্যমান এবং শুধুমাত্র ফর্ম আপডেট/দেখুন (তৈরি নয়), 5=তালিকাতে দৃশ্যমান এবং শুধুমাত্র ফর্ম দেখুন (তৈরি নয়, আপডেট নয়)।<br><br> একটি নেতিবাচক মান ব্যবহার করার অর্থ হল তালিকায় ডিফল্টভাবে ক্ষেত্র দেখানো হয় না তবে দেখার জন্য নির্বাচন করা যেতে পারে)।
 ItCanBeAnExpression=এটি একটি অভিব্যক্তি হতে পারে. উদাহরণ:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->অধিকার আছে('ছুটি', 'নির্ধারিত_ছুটির')?1:5
-DisplayOnPdfDesc=সামঞ্জস্যপূর্ণ PDF নথিতে এই ক্ষেত্রটি প্রদর্শন করুন, আপনি "পজিশন" ক্ষেত্রের সাথে অবস্থান পরিচালনা করতে পারেন।<br><strong>নথির জন্য :<span ক্লাস ='notranslate'></strong></span><br>0 = প্রদর্শিত হয় না <br>1 =<br>2 = শুধুমাত্র খালি না থাকলে প্রদর্শন করুন<br><br>b0e7849434 span>নথি লাইনের জন্য :<span class='notranslate'></strong><br>0 = প্রদর্শিত হয় না <br>1 = একটি কলামে প্রদর্শিত হয়<br>3 = বর্ণনার পরে লাইন বর্ণনা কলামে প্রদর্শিত হয়<br>4 = বর্ণনার পরে বিবরণ কলামে প্রদর্শন শুধুমাত্র যদি খালি না হয়
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=তালিকায় মোট পেতে ক্ষেত্রের মান কি কম্পুলেট করা যেতে পারে? (উদাহরণ: 1 বা 0)
 SearchAllDesc=ক্ষেত্রটি কি দ্রুত অনুসন্ধান সরঞ্জাম থেকে অনুসন্ধান করতে ব্যবহৃত হয়? (উদাহরণ: 1 বা 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=আপনার মডিউলের বাহ্যিক এ
 SeeIDsInUse=আপনার ইনস্টলেশন ব্যবহার করা আইডি দেখুন
 SeeReservedIDsRangeHere=সংরক্ষিত আইডি পরিসীমা দেখুন
 ToolkitForDevelopers=ডলিবার ডেভেলপারদের জন্য টুলকিট
-TryToUseTheModuleBuilder=আপনার যদি SQL এবং PHP সম্পর্কে জ্ঞান থাকে, আপনি স্থানীয় মডিউল নির্মাতা উইজার্ড ব্যবহার করতে পারেন।<br>মডিউলটি সক্ষম করুন <strong><span ক্লাস ='notranslate'>%s</span></strong> এবং <span class="fa fa-bug"><span class='notranslate' এ ক্লিক করে উইজার্ড ব্যবহার করুন ></span></span> উপরের ডানদিকের মেনুতে।<br>সতর্কতা: এটি একটি উন্নত ডেভেলপার বৈশিষ্ট্য, করুন <b><span>no span class='notranslate'></b> আপনার প্রোডাকশন সাইটে পরীক্ষা!
+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=উপরের ডানদিকের মেনুতে <span class="fa fa-bug"></span> দেখুন
 AddLanguageFile=ভাষা ফাইল যোগ করুন
 YouCanUseTranslationKey=আপনি এখানে একটি কী ব্যবহার করতে পারেন যা ভাষা ফাইলে পাওয়া অনুবাদ কী (ট্যাব "ভাষা" দেখুন)
@@ -148,7 +148,7 @@ CSSListClass=তালিকার জন্য CSS
 NotEditable=সম্পাদনাযোগ্য নয়
 ForeignKey=বিদেশী চাবি
 ForeignKeyDesc=যদি এই ক্ষেত্রের মান অবশ্যই অন্য টেবিলে উপস্থিত থাকার নিশ্চয়তা দিতে হবে। এখানে একটি মান মেলে সিনট্যাক্স লিখুন: tablename.parentfieldtocheck
-TypeOfFieldsHelp=উদাহরণ:<br>varchar(99)<br>ইমেল<br>ফোন<span ক্লাস ='notranslate'><br></span>ip<br>url<br>পাসওয়ার্ড<br> span>ডাবল(24,8)<br>real<br>পাঠ্য<br>html <br>তারিখ<br>তারিখের সময়<br>টাইমস্ট্যাম্প<span class'>'notranslate' <br></span>পূর্ণসংখ্যা<br>পূর্ণসংখ্যা:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fcc<b0342f /span><span class='notranslate'><br>'1' মানে আমরা রেকর্ড তৈরি করতে কম্বোর পরে একটি + বোতাম যোগ করি<br>'ফিল্টার' হল একটি ইউনিভার্সাল ফিল্টার সিনট্যাক্স শর্ত, উদাহরণ: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=এটি হল ক্ষেত্র/বিশিষ্টের ধরন।
 AsciiToHtmlConverter=Ascii থেকে HTML রূপান্তরকারী
 AsciiToPdfConverter=Ascii থেকে পিডিএফ কনভার্টার
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=বর্ণনাকারীতে কোড য
 DictionariesCreated=অভিধান <b>%s</b> সফলভাবে তৈরি করা হয়েছে
 DictionaryDeleted=অভিধান <b>%s</b> সফলভাবে সরানো হয়েছে
 PropertyModuleUpdated=সম্পত্তি <b>%s</b> সফলভাবে আপডেট করা হয়েছে
-InfoForApiFile=* আপনি যখন প্রথমবার ফাইল তৈরি করবেন তখন প্রতিটি বস্তুর জন্য সমস্ত পদ্ধতি <strong> তৈরি হবে।</strong><br>* আপনি যখন <strong>এ ক্লিক করুন</strong> আপনি শুধু <span ক্লাসের সমস্ত পদ্ধতি সরিয়ে ফেলবেন ='notranslate'><strong></span>নির্বাচিত বস্তু</strong>।
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=মডিউল সেটআপের জন্য পৃষ্ঠা
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=আপনি গণ ইমেল মডিউলের জন্য নতুন ইমেল লক্ষ্য নির্বাচক প্রদান করতে এখানে ক্লাস ফাইলগুলি তৈরি এবং সম্পাদনা করতে পারেন
diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang
index 7bca27a437b..72a4da627de 100644
--- a/htdocs/langs/bn_BD/mrp.lang
+++ b/htdocs/langs/bn_BD/mrp.lang
@@ -47,7 +47,7 @@ DateEndPlannedMo=তারিখ শেষ পরিকল্পিত
 KeepEmptyForAsap=খালি মানে 'যত তাড়াতাড়ি সম্ভব'
 EstimatedDuration=আনুমানিক সময়কাল
 EstimatedDurationDesc=এই BOM ব্যবহার করে এই পণ্যটি তৈরি (বা বিচ্ছিন্ন) করার আনুমানিক সময়কাল
-ConfirmValidateBom=আপনি কি <strong>%s</strong><span class='notranslate'>রেফারেন্স সহ 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=আপনি কি এই BOM বাতিল করার বিষয়ে নিশ্চিত (আপনি আর নতুন ম্যানুফ্যাকচারিং অর্ডার তৈরি করতে এটি ব্যবহার করতে পারবেন না)?
 ConfirmReopenBom=আপনি কি নিশ্চিত যে আপনি এই BOM পুনরায় খুলতে চান (আপনি এটি নতুন উত্পাদন অর্ডার তৈরি করতে ব্যবহার করতে সক্ষম হবেন)
 StatusMOProduced=উত্পাদিত
@@ -136,4 +136,3 @@ NoRemainQtyToDispatch=ভাগ করার জন্য কোন পরিম
 
 THMOperatorEstimatedHelp=প্রতি ঘন্টায় অপারেটরের আনুমানিক খরচ। এই ওয়ার্কস্টেশন ব্যবহার করে একটি BOM-এর খরচ অনুমান করতে ব্যবহার করা হবে।
 THMMachineEstimatedHelp=প্রতি ঘণ্টায় মেশিনের আনুমানিক খরচ। এই ওয়ার্কস্টেশন ব্যবহার করে একটি BOM-এর খরচ অনুমান করতে ব্যবহার করা হবে।
-
diff --git a/htdocs/langs/bn_BD/multicurrency.lang b/htdocs/langs/bn_BD/multicurrency.lang
index 1748addea91..7a1a4405193 100644
--- a/htdocs/langs/bn_BD/multicurrency.lang
+++ b/htdocs/langs/bn_BD/multicurrency.lang
@@ -7,12 +7,12 @@ multicurrency_syncronize_error=সিঙ্ক্রোনাইজেশন ত
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=সর্বশেষ পরিচিত হার ব্যবহার না করে মুদ্রার হার খুঁজতে নথির তারিখ ব্যবহার করুন
 multicurrency_useOriginTx=যখন একটি বস্তু অন্য থেকে তৈরি করা হয়, উৎস বস্তু থেকে মূল হার রাখুন (অন্যথায় সর্বশেষ পরিচিত হার ব্যবহার করুন)
 CurrencyLayerAccount=কারেন্সি লেয়ার এপিআই
-CurrencyLayerAccount_help_to_synchronize=এই কার্যকারিতা ব্যবহার করতে আপনাকে অবশ্যই %s ওয়েবসাইটে একটি অ্যাকাউন্ট তৈরি করতে হবে।<br>আপনার <b><span class='notranslate'>পান /span>API কী<span class='notranslate'></b>।<br>আপনি যদি একটি বিনামূল্যের অ্যাকাউন্ট ব্যবহার করেন, তাহলে আপনি <span class=' পরিবর্তন করতে পারবেন না notranslate'><b></span>উৎস মুদ্রা</b> (ডিফল্টরূপে USD)।<br>যদি আপনার মূল মুদ্রা ইউএসডি না হয়, অ্যাপ্লিকেশন স্বয়ংক্রিয়ভাবে এটি পুনরায় গণনা করবে।<br><br>আপনি প্রতি মাসে 1000 সিঙ্ক্রোনাইজেশনের মধ্যে সীমাবদ্ধ।
+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 কী
 multicurrency_appCurrencySource=উৎস মুদ্রা
 multicurrency_alternateCurrencySource=বিকল্প উৎস মুদ্রা
 CurrenciesUsed=ব্যবহৃত মুদ্রা
-CurrenciesUsed_help_to_add=আপনার <b>প্রস্তাব</b>, b0aee8336058<span class='notranslate'>b0aee8336587 /span>অর্ডার<span class='notranslate'></b> ইত্যাদি
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=হার
 MulticurrencyReceived=প্রাপ্ত, আসল মুদ্রা
 MulticurrencyRemainderToTake=অবশিষ্ট পরিমাণ, আসল মুদ্রা
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index 12e4ea443a8..48b2762e7e0 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -106,7 +106,7 @@ ConfirmDeleteOrder=আপনি কি এই অর্ডারটি মুছ
 ConfirmValidateOrder=আপনি কি <b>%s</b> নামে এই অর্ডারটি যাচাই করার বিষয়ে নিশ্চিত? ?
 ConfirmUnvalidateOrder=আপনি কি নিশ্চিত যে আপনি অর্ডার <b>%s</b> খসড়া স্থিতিতে পুনরুদ্ধার করতে চান ?
 ConfirmCancelOrder=আপনি কি নিশ্চিত আপনি এই অর্ডার বাতিল করতে চান?
-ConfirmMakeOrder=আপনি কি নিশ্চিত করতে চান যে আপনি এই অর্ডারটি <b>%s<span class='notranslate'></b></span-এ করেছেন। >?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=চালান তৈরি করুন
 ClassifyShipped=বিতরিত শ্রেণীবদ্ধ
 PassedInShippedStatus=শ্রেণীবদ্ধ বিতরণ
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 34109d13d4c..c7e24d59b25 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -94,7 +94,7 @@ AttachANewFile=একটি নতুন ফাইল/নথি সংযুক
 LinkedObject=লিঙ্কযুক্ত বস্তু
 NbOfActiveNotifications=বিজ্ঞপ্তির সংখ্যা (প্রাপকের ইমেলের সংখ্যা)
 PredefinedMailTest=__(হ্যালো)__\nএটি একটি পরীক্ষামূলক মেল যা __EMAIL__ এ পাঠানো হয়েছে৷\nলাইন একটি ক্যারেজ রিটার্ন দ্বারা পৃথক করা হয়.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(হ্যালো)__<br>এটি একটি <b>পরীক্ষা</b>মেল পাঠানো হয়েছে __EMAIL__ এ (পরীক্ষা শব্দটি অবশ্যই মোটা হতে হবে)।<br>রেখাগুলি একটি ক্যারেজ রিটার্ন দ্বারা পৃথক করা হয়েছে।<br><span ক্লাস ='notranslate'><br></span>__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=__(হ্যালো)__\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__
@@ -189,7 +189,7 @@ EnterNewPasswordHere=এখানে আপনার নতুন পাসও
 BackToLoginPage=লগইন পৃষ্ঠায় ফিরে যান
 AuthenticationDoesNotAllowSendNewPassword=প্রমাণীকরণ মোড হল <b>%s</b>।<span class='translate' ><br></span>এই মোডে, Dolibarr আপনার পাসওয়ার্ড জানতে বা পরিবর্তন করতে পারে না।<br>আপনার পাসওয়ার্ড পরিবর্তন করতে চাইলে আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।
 EnableGDLibraryDesc=এই বিকল্পটি ব্যবহার করতে আপনার পিএইচপি ইনস্টলেশনে জিডি লাইব্রেরি ইনস্টল বা সক্ষম করুন।
-ProfIdShortDesc=<b>প্রফেসর আইডি %s</b> তৃতীয় পক্ষের দেশের উপর নির্ভর করে একটি তথ্য৷ <br>উদাহরণস্বরূপ, দেশের জন্য <b>%s</b>, এটির কোড <b>%s<span class='notranslate'>b09a4b7837fz.
+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=ডলিবার ইআরপি/সিআরএম ডেমো
 StatsByAmount=পণ্য/পরিষেবার পরিমাণের পরিসংখ্যান
 StatsByAmountProducts=পণ্যের পরিমাণের পরিসংখ্যান
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=<b>%s</b> ফাইলটি আপলোড করতে
 AddFolder=ফোল্ডার তৈরি করুন
 FileWasCreateFolder=ফোল্ডার <b>%s</b> তৈরি করা হয়েছে
 FTPFailedToCreateFolder=<b>%s</b> ফোল্ডার তৈরি করতে ব্যর্থ হয়েছে৷
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/bn_BD/partnership.lang b/htdocs/langs/bn_BD/partnership.lang
index 4d00b57e935..0f6963729dd 100644
--- a/htdocs/langs/bn_BD/partnership.lang
+++ b/htdocs/langs/bn_BD/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=শেষ URL চেকের জন্য ত্রু
 LastCheckBacklink=শেষ ইউআরএল চেক করার তারিখ
 
 NewPartnershipRequest=নতুন অংশীদারিত্বের অনুরোধ
-NewPartnershipRequestDesc=এই ফর্মটি আপনাকে আমাদের অংশীদারিত্ব প্রোগ্রামের একটি অংশ হতে অনুরোধ করতে দেয়৷ এই ফর্মটি পূরণ করতে আপনার সাহায্যের প্রয়োজন হলে, অনুগ্রহ করে ইমেলের মাধ্যমে যোগাযোগ করুন <b>%s</b><span class='notranslate'> span>
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=এই পৃষ্ঠায় নিম্নলিখিত ডোমেনের একটিতে অন্তত একটি লিঙ্ক থাকতে হবে: %s
 
 IPOfApplicant=আবেদনকারীর আইপি
-
diff --git a/htdocs/langs/bn_BD/paypal.lang b/htdocs/langs/bn_BD/paypal.lang
index 3e0b0c383d0..33484b1ba6e 100644
--- a/htdocs/langs/bn_BD/paypal.lang
+++ b/htdocs/langs/bn_BD/paypal.lang
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=সমস্ত পোস্ট অ্যা
 ValidationOfPaymentFailed=অর্থপ্রদানের বৈধতা ব্যর্থ হয়েছে৷
 CardOwner=কার্ড হোল্ডার
 PayPalBalance=পেপ্যাল ক্রেডিট
-OnlineSubscriptionPaymentLine=অনলাইন সাবস্ক্রিপশন %s<br> %s<span class=' এর মাধ্যমে প্রদান করা হয়েছে notranslate'><br></span>প্রাথমিক আইপি ঠিকানা: %s<br>লেনদেন আইডি: <span class='noeclatec82f7f7f7f7 </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 2dc526ea1f6..b99ca945493 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -18,7 +18,7 @@ Reference=Reference
 NewProduct=নতুন পণ্য
 NewService=নতুন পরিষেবা
 ProductVatMassChange=গ্লোবাল ভ্যাট আপডেট
-ProductVatMassChangeDesc=এই টুলটি <b><u>ALL</u><span>তে সংজ্ঞায়িত ভ্যাট হার আপডেট করে class='notranslate'></b></span> পণ্য এবং পরিষেবা!
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
 MassBarcodeInit=ভর বারকোড init
 MassBarcodeInitDesc=এই পৃষ্ঠাটি এমন বস্তুগুলিতে একটি বারকোড শুরু করতে ব্যবহার করা যেতে পারে যেগুলিতে বারকোড সংজ্ঞায়িত নেই৷ মডিউল বারকোডের সেটআপ সম্পূর্ণ হওয়ার আগে পরীক্ষা করুন।
 ProductAccountancyBuyCode=অ্যাকাউন্টিং কোড (ক্রয়)
@@ -208,11 +208,6 @@ unitSET=সেট
 unitS=দ্বিতীয়
 unitH=ঘন্টা
 unitD=দিন
-unitG=ছোলা
-unitM=মিটার
-unitLM=রৈখিক মিটার
-unitM2=বর্গ মিটার
-unitM3=ঘন মিটার
 unitL=লিটার
 unitT=টন
 unitKG=কেজি
@@ -221,6 +216,7 @@ unitMG=মিলিগ্রাম
 unitLB=পাউন্ড
 unitOZ=আউন্স
 unitM=মিটার
+unitLM=রৈখিক মিটার
 unitDM=dm
 unitCM=সেমি
 unitMM=মিমি
@@ -361,7 +357,7 @@ ProductAttributeName=বৈকল্পিক বৈশিষ্ট্য %s
 ProductAttribute=বৈকল্পিক বৈশিষ্ট্য
 ProductAttributeDeleteDialog=আপনি কি এই বৈশিষ্ট্যটি মুছে ফেলার বিষয়ে নিশ্চিত? সমস্ত মান মুছে ফেলা হবে
 ProductAttributeValueDeleteDialog=আপনি কি এই অ্যাট্রিবিউটের "%s" রেফারেন্স সহ "%s" মানটি মুছতে চান?
-ProductCombinationDeleteDialog=আপনি কি "<strong>%s</strong><span class='notranslate'>পণ্যের বৈকল্পিকটি মুছে ফেলার বিষয়ে নিশ্চিত? >"?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=ভেরিয়েন্টটি মুছে ফেলার সময় একটি ত্রুটি ছিল৷ অনুগ্রহ করে চেক করুন এটি কোন বস্তুতে ব্যবহার করা হচ্ছে না
 ProductCombinations=বৈকল্পিক
 PropagateVariant=বৈকল্পিক প্রচার করুন
@@ -437,4 +433,6 @@ ModifyValueExtrafields = একটি অতিরিক্ত ক্ষেত
 OrProductsWithCategories=অথবা ট্যাগ/বিভাগ সহ পণ্য
 WarningTransferBatchStockMouvToGlobal = আপনি যদি এই পণ্যটিকে ডিসিরিয়ালাইজ করতে চান তবে এর সমস্ত সিরিয়ালাইজড স্টক গ্লোবাল স্টকে রূপান্তরিত হবে
 WarningConvertFromBatchToSerial=যদি আপনার কাছে বর্তমানে পণ্যটির জন্য 2 এর পরিমাণ বেশি বা সমান থাকে, তাহলে এই পছন্দে স্যুইচ করার অর্থ হল আপনার কাছে একই ব্যাচের বিভিন্ন বস্তু সহ একটি পণ্য থাকবে (যদিও আপনি একটি অনন্য সিরিয়াল নম্বর চান)। এটি ঠিক করার জন্য একটি ইনভেন্টরি বা ম্যানুয়াল স্টক মুভমেন্ট না হওয়া পর্যন্ত ডুপ্লিকেটটি থাকবে।
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=আপনি কি খসড়া স্থিতিতে ফিরে যাওয়ার বিষয়ে নিশ্চিত?<br>বর্তমানে ইনভেন্টরিতে সেট করা পরিমাণগুলি পুনরায় সেট করা হবে৷
diff --git a/htdocs/langs/bn_BD/receptions.lang b/htdocs/langs/bn_BD/receptions.lang
index c2241ca9273..aaab508f722 100644
--- a/htdocs/langs/bn_BD/receptions.lang
+++ b/htdocs/langs/bn_BD/receptions.lang
@@ -5,8 +5,6 @@ RefReception=রেফ. অভ্যর্থনা
 Reception=অভ্যর্থনা
 Receptions=অভ্যর্থনা
 AllReceptions=সমস্ত অভ্যর্থনা
-Reception=অভ্যর্থনা
-Receptions=অভ্যর্থনা
 ShowReception=অভ্যর্থনা দেখান
 ReceptionsArea=অভ্যর্থনা এলাকা
 ListOfReceptions=অভ্যর্থনা তালিকা
@@ -34,7 +32,7 @@ StatusReceptionProcessedShort=প্রক্রিয়াকৃত
 ReceptionSheet=অভ্যর্থনা শীট
 ValidateReception=অভ্যর্থনা যাচাই
 ConfirmDeleteReception=আপনি কি নিশ্চিত আপনি এই অভ্যর্থনা মুছে দিতে চান?
-ConfirmValidateReception=আপনি কি <b>%s</b><span class='notranslate'>রেফারেন্স সহ এই অভ্যর্থনাটি যাচাই করতে চান >?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=আপনি কি নিশ্চিত আপনি এই অভ্যর্থনা বাতিল করতে চান?
 StatsOnReceptionsOnlyValidated=পরিসংখ্যান শুধুমাত্র বৈধ অভ্যর্থনা উপর পরিচালিত. ব্যবহৃত তারিখ হল অভ্যর্থনার বৈধতার তারিখ (পরিকল্পিত ডেলিভারির তারিখ সবসময় জানা যায় না)।
 SendReceptionByEMail=ইমেল দ্বারা অভ্যর্থনা পাঠান
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index af13563e4ec..d439eb817a3 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validated
 StatusSendingProcessedShort=প্রক্রিয়াকৃত
 SendingSheet=চালান শীট
 ConfirmDeleteSending=আপনি কি এই চালানটি মুছে ফেলার বিষয়ে নিশ্চিত?
-ConfirmValidateSending=আপনি কি নিশ্চিত <b>%s</b><span class='notranslate'>রেফারেন্স সহ এই চালানটি যাচাই করতে চান >?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=আপনি কি নিশ্চিত আপনি এই চালান বাতিল করতে চান?
 DocumentModelMerou=Merou A5 মডেল
 WarningNoQtyLeftToSend=সতর্কতা, কোনো পণ্য পাঠানোর অপেক্ষায় নেই।
@@ -81,6 +81,6 @@ CreationOptions=চালান তৈরির সময় উপলব্ধ
 ShipmentDistribution=চালান বিতরণ
 
 ErrorTooManyCombinationBatchcode=%s লাইনের জন্য কোনও প্রেরণ নেই কারণ গুদাম, পণ্য, ব্যাচ কোডের অনেকগুলি সংমিশ্রণ পাওয়া গেছে (%s)৷
-ErrorNoCombinationBatchcode=warehouse-product-lot/serial (%s, <span class='notranslate'-এর সংমিশ্রণ হিসাবে %s লাইনটি সংরক্ষণ করা যায়নি '>%s</span>, %s) স্টকে পাওয়া যায়নি৷
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
 
 ErrorTooMuchShipped=পাঠানোর পরিমাণ %s লাইনের জন্য অর্ডার করা পরিমাণের চেয়ে বেশি হওয়া উচিত নয়
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 1c290105cba..721f795be1f 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -164,14 +164,14 @@ InventoryCode=মুভমেন্ট বা ইনভেন্টরি কো
 IsInPackage=প্যাকেজের মধ্যে রয়েছে
 WarehouseAllowNegativeTransfer=স্টক নেতিবাচক হতে পারে
 qtyToTranferIsNotEnough=আপনার সোর্স গুদাম থেকে আপনার কাছে পর্যাপ্ত স্টক নেই এবং আপনার সেটআপ নেতিবাচক স্টকের অনুমতি দেয় না।
-qtyToTranferLotIsNotEnough=আপনার কাছে পর্যাপ্ত স্টক নেই, এই লট নম্বরের জন্য, আপনার সোর্স গুদাম থেকে এবং আপনার সেটআপ নেতিবাচক স্টক অনুমোদন করে না (পণ্যের জন্য Qty '%s' লট সহ '<span ক্লাস ='notranslate'>%s</span>' হল %s গুদাম '%s')।
+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=গুদাম দেখান
 MovementCorrectStock=পণ্যের জন্য স্টক সংশোধন %s
 MovementTransferStock=পণ্য %s অন্য গুদামে স্টক স্থানান্তর
 BatchStockMouvementAddInGlobal=ব্যাচ স্টক গ্লোবাল স্টকে চলে যায় (পণ্য আর ব্যাচ ব্যবহার করে না)
 InventoryCodeShort=Inv./Mov. কোড
 NoPendingReceptionOnSupplierOrder=খোলা ক্রয় আদেশের কারণে কোনো মুলতুবি অভ্যর্থনা
-ThisSerialAlreadyExistWithDifferentDate=এই লট/ক্রমিক নম্বর (<strong>%s</strong>) আগে থেকেই আছে কিন্তু সাথে আছে বিভিন্ন খাবার বা বিক্রির তারিখ (<strong>%s</strong> পাওয়া গেছে কিন্তু আপনি <span> লিখুন span class='notranslate'><strong></span>%s</strong>)।
+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=খোলা (সমস্ত আন্দোলন)
 OpenInternal=খোলা (শুধুমাত্র অভ্যন্তরীণ আন্দোলন)
 UseDispatchStatus=ক্রয় অর্ডার রিসেপশনে পণ্য লাইনের জন্য একটি প্রেরণের অবস্থা (অনুমোদন/প্রত্যাখ্যান) ব্যবহার করুন
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=এই আন্দোলনের সময় 
 ImportFromCSV=আন্দোলনের CSV তালিকা আমদানি করুন
 ChooseFileToImport=ফাইল আপলোড করুন তারপর সোর্স ইম্পোর্ট ফাইল হিসাবে ফাইল নির্বাচন করতে %s আইকনে ক্লিক করুন...
 SelectAStockMovementFileToImport=আমদানি করার জন্য একটি স্টক আন্দোলন ফাইল নির্বাচন করুন
-InfoTemplateImport=আপলোড করা ফাইলের এই ফর্ম্যাট থাকা দরকার (* বাধ্যতামূলক ক্ষেত্রগুলি):<br>উৎস গুদাম* | লক্ষ্য গুদাম* | পণ্য* | পরিমাণ* | লট/ক্রমিক নম্বর<br>CSV অক্ষর বিভাজক হতে হবে "<b>%s span class='notranslate'></b></span>"
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=ইনভেন্টরি %s
 ReOpen=আবার খুলুন
 ConfirmFinish=আপনি জায় বন্ধ নিশ্চিত করুন? আপনি ইনভেন্টরিতে প্রবেশ করা আসল পরিমাণে আপনার স্টক আপডেট করতে এটি সমস্ত স্টক মুভমেন্ট তৈরি করবে।
@@ -282,7 +282,7 @@ ModuleStockTransferName=উন্নত স্টক স্থানান্ত
 ModuleStockTransferDesc=স্টক ট্রান্সফারের উন্নত ব্যবস্থাপনা, ট্রান্সফার শীট জেনারেশন সহ
 StockTransferNew=নতুন স্টক স্থানান্তর
 StockTransferList=স্টক স্থানান্তর তালিকা
-ConfirmValidateStockTransfer=আপনি কি <b>%s</b><span class='notranslate'>রেফারেন্স সহ এই স্টক স্থানান্তর যাচাই করতে চান? span>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=স্থানান্তরের সাথে স্টক হ্রাস %s
 ConfirmDestockCancel=স্থানান্তর %s সহ স্টক হ্রাস বাতিল করুন
 DestockAllProduct=মজুদ কমে যাওয়া
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index 000eeb5853c..71cd71d1690 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=একটি চুক্তি ল
 ToOfferALinkForOnlinePaymentOnFreeAmount=একটি %s যেকোন পরিমাণের অনলাইন পেমেন্ট পেজ অফার করার জন্য URL কোনো বিদ্যমান বস্তু ছাড়াই
 ToOfferALinkForOnlinePaymentOnMemberSubscription=সদস্য সদস্যতার জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
 ToOfferALinkForOnlinePaymentOnDonation=অনুদানের অর্থ প্রদানের জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
-YouCanAddTagOnUrl=এছাড়াও আপনি url প্যারামিটার যোগ করতে পারেন <b>&tag=<i>মানb0ae64758bac><span><span> class='notranslate'></b> আপনার নিজস্ব অর্থপ্রদানের মন্তব্য ট্যাগ যোগ করার জন্য সেই URLগুলির যে কোনো একটিতে (শুধুমাত্র অর্থপ্রদানের জন্য বাধ্যতামূলক) কোন বিদ্যমান বস্তু ছাড়া পেমেন্টের URL, আপনি প্যারামিটার যোগ করতে পারেন <strong>&noidempotency=1</strong> তাই একই ট্যাগের সাথে একই লিঙ্ক বেশ কয়েকবার ব্যবহার করা যেতে পারে (কিছু পেমেন্ট মোড এই প্যারামিটার ব্যতীত প্রতিটি আলাদা লিঙ্কের জন্য পেমেন্ট 1-এ সীমাবদ্ধ করতে পারে)
+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=স্বয়ংক্রিয়ভাবে পেমেন্ট তৈরি করার জন্য url <b>%s</b> দিয়ে আপনার স্ট্রাইপ সেটআপ করুন স্ট্রাইপ দ্বারা যাচাই করা হয়েছে।
 AccountParameter=অ্যাকাউন্ট প্যারামিটার
 UsageParameter=ব্যবহারের পরামিতি
diff --git a/htdocs/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang
index b2e5129042d..0aa0b21727e 100644
--- a/htdocs/langs/bn_BD/trips.lang
+++ b/htdocs/langs/bn_BD/trips.lang
@@ -45,9 +45,9 @@ expenseReportRangeMoreThan=%d এর চেয়ে বেশি
 expenseReportTotalForFive=<u>d</u> = 5 সহ উদাহরণ
 ExpenseReportApplyTo=আবেদন করতে
 ExpenseReportApproved=একটি ব্যয় প্রতিবেদন অনুমোদন করা হয়
-ExpenseReportApprovedMessage=ব্যয় প্রতিবেদন %s অনুমোদিত হয়েছে।<br> - ব্যবহারকারী: %s<span> class='notranslate'><br></span> - এর দ্বারা অনুমোদিত: %s<br>খরচ প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন:  span class='notranslate'>%s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=একটি খরচ রিপোর্ট বাতিল করা হয়েছে
-ExpenseReportCanceledMessage=ব্যয় প্রতিবেদন %s বাতিল করা হয়েছে।<br> - ব্যবহারকারী: %s<span><span> class='notranslate'><br></span> - এর দ্বারা বাতিল করা হয়েছে: %s<br> - বাতিলের উদ্দেশ্য: <span class= class= 'notranslate'>%s</span><br>ব্যয় প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন: %s
+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
 ExpenseReportConstraintViolationError=সর্বাধিক পরিমাণ ছাড়িয়ে গেছে (নিয়ম %s): %s %s থেকে বেশি ( হারাম ছাড়িয়ে যাওয়া)
 ExpenseReportConstraintViolationWarning=সর্বাধিক পরিমাণ ছাড়িয়ে গেছে (নিয়ম %s): %s %s থেকে বেশি ( অনুমোদনের চেয়ে বেশি)
 ExpenseReportDateEnd=তারিখ শেষ
@@ -62,13 +62,13 @@ ExpenseReportPaidMessage=খরচের রিপোর্ট %s দেওয
 ExpenseReportPayment=ব্যয় প্রতিবেদন প্রদান
 ExpenseReportRef=রেফ. ব্যয় রিপোর্ট
 ExpenseReportRefused=একটি খরচ রিপোর্ট প্রত্যাখ্যান করা হয়েছে
-ExpenseReportRefusedMessage=ব্যয়ের প্রতিবেদন %s প্রত্যাখ্যান করা হয়েছে।<br> - ব্যবহারকারী: %s<span><span> class='notranslate'><br></span> - প্রত্যাখ্যান করেছেন: %s<br> - প্রত্যাখ্যানের উদ্দেশ্য: <span class=class= 'notranslate'>%s</span><br>ব্যয় প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন: %s
+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
 ExpenseReportRestrictive=হারাম ছাড়িয়ে গেছে
 ExpenseReportRuleErrorOnSave=ত্রুটি: %s
 ExpenseReportRuleSave=খরচ রিপোর্ট নিয়ম সংরক্ষিত
 ExpenseReportRulesDesc=আপনি ব্যয় প্রতিবেদনের জন্য সর্বাধিক পরিমাণের নিয়ম নির্ধারণ করতে পারেন। এই নিয়মগুলি প্রয়োগ করা হবে যখন একটি নতুন ব্যয় একটি ব্যয় প্রতিবেদনে যোগ করা হয়
 ExpenseReportWaitingForApproval=একটি নতুন ব্যয় প্রতিবেদন অনুমোদনের জন্য জমা দেওয়া হয়েছে
-ExpenseReportWaitingForApprovalMessage=একটি নতুন ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে এবং অনুমোদনের জন্য অপেক্ষা করছে৷<br> - ব্যবহারকারী: %s <br> - সময়কাল: %s<br>বৈধকরণ করতে এখানে ক্লিক করুন: <span class='notranslate'>b0849fz span>
+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=পুনঃঅনুমোদনের জন্য একটি ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে
 ExpenseReportWaitingForReApprovalMessage=একটি ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে এবং পুনরায় অনুমোদনের জন্য অপেক্ষা করছে৷<br>The %s, আপনি এর জন্য ব্যয় প্রতিবেদন অনুমোদন করতে অস্বীকার করেছেন এই কারণে: %s।<br>একটি নতুন সংস্করণ প্রস্তাব করা হয়েছে এবং আপনার অনুমোদনের জন্য অপেক্ষা করছে। <br> - ব্যবহারকারী: %s<br> - সময়কাল: b0ecb2ecb9fz84 <br>প্রমাণিত করতে এখানে ক্লিক করুন: %s
 ExpenseReportsIk=মাইলেজ চার্জ কনফিগারেশন
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index 53136f447f9..ffd6fb68652 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -26,7 +26,7 @@ ConfirmDeleteUser=আপনি কি নিশ্চিত যে আপনি
 ConfirmDeleteGroup=আপনি কি <b>%s</b> গোষ্ঠী মুছে ফেলার বিষয়ে নিশ্চিত?
 ConfirmEnableUser=আপনি কি ব্যবহারকারী <b>%s</b> সক্ষম করার বিষয়ে নিশ্চিত?
 ConfirmReinitPassword=আপনি কি নিশ্চিত যে আপনি ব্যবহারকারীর জন্য একটি নতুন পাসওয়ার্ড তৈরি করতে চান <b>%s</b>?
-ConfirmSendNewPassword=আপনি কি নিশ্চিত যে আপনি ব্যবহারকারীর জন্য নতুন পাসওয়ার্ড তৈরি এবং পাঠাতে চান <b>%s<span class='notranslate'></b></span span>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
 NewUser=নতুন ব্যবহারকারী
 CreateUser=ব্যবহারকারী তৈরি করুন
 LoginNotDefined=লগইন সংজ্ঞায়িত করা হয় না.
@@ -45,7 +45,7 @@ CreateGroup=গ্রুপ তৈরি করুন
 RemoveFromGroup=দল থেকে বহিষ্কার করা
 PasswordChangedAndSentTo=পাসওয়ার্ড পরিবর্তন করে <b>%s</b>-এ পাঠানো হয়েছে।
 PasswordChangeRequest=<b>%s</b>-এর পাসওয়ার্ড পরিবর্তন করার অনুরোধ করুন
-PasswordChangeRequestSent=<b>%s</b> এর পাসওয়ার্ড পরিবর্তন করার অনুরোধ <span class= এ পাঠানো হয়েছে 'notranslate'><b></span>%s</b>।
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 IfLoginExistPasswordRequestSent=যদি এই লগইনটি একটি বৈধ অ্যাকাউন্ট হয় (একটি বৈধ ইমেল সহ), পাসওয়ার্ড পুনরায় সেট করার জন্য একটি ইমেল পাঠানো হয়েছে৷
 IfEmailExistPasswordRequestSent=যদি এই ইমেলটি একটি বৈধ অ্যাকাউন্ট হয়, তাহলে পাসওয়ার্ড রিসেট করার জন্য একটি ইমেল পাঠানো হয়েছে (আপনি কিছু না পেলে আপনার স্প্যাম ফোল্ডার চেক করতে ভুলবেন না)
 ConfirmPasswordReset=পাসওয়ার্ড রিসেট নিশ্চিত করুন
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index a33ef7b476f..da2c15414c5 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -49,11 +49,11 @@ SetHereVirtualHost=<u>Apache/NGinx এর সাথে ব্যবহার ক
 ExampleToUseInApacheVirtualHostConfig=Apache ভার্চুয়াল হোস্ট সেটআপে ব্যবহার করার উদাহরণ:
 YouCanAlsoTestWithPHPS=<u>PHP এম্বেডেড সার্ভারের সাথে ব্যবহার করুন</u><br>উন্নত পরিবেশে, আপনি করতে পারেন <br><strong>php -S 0.0.0.0 চালিয়ে PHP এমবেডেড ওয়েব সার্ভার (PHP 5.5 প্রয়োজনীয়) দিয়ে সাইটটি পরীক্ষা করতে পছন্দ করুন :8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>অন্য Dolibarr হোস্টিং প্রদানকারীর সাথে আপনার ওয়েব সাইট চালান</u><br> ইন্টারনেটে Apache বা NGinx-এর মতো কোনো ওয়েব সার্ভার উপলব্ধ নেই, আপনি আপনার ওয়েব সাইটটিকে অন্য Dolibarr হোস্টিং প্রদানকারী দ্বারা প্রদত্ত অন্য Dolibarr উদাহরণে রপ্তানি এবং আমদানি করতে পারেন যা ওয়েবসাইট মডিউলের সাথে সম্পূর্ণ একীকরণ প্রদান করে। আপনি <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>-এ কিছু Dolibarr হোস্টিং প্রদানকারীর একটি তালিকা পেতে পারেন
-CheckVirtualHostPerms=ভার্চুয়াল হোস্ট ব্যবহারকারীর (উদাহরণস্বরূপ www-ডেটা) <strong>%sb0a65d071f6fcz9 আছে কিনা পরীক্ষা করুন  ফাইলগুলিতে <br><strong>%s<span ক্লাসে অনুমতি ='notranslate'></strong></span>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=পড়ুন
 WritePerm=লিখুন
 TestDeployOnWeb=ওয়েবে পরীক্ষা/নিয়োগ করুন
-PreviewSiteServedByWebServer=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s একটি বহিরাগত ওয়েব সার্ভার (যেমন Apache, NginxIS, Nginx) দ্বারা পরিবেশিত হবে ) ডিরেক্টরিতে নির্দেশ করার আগে আপনাকে অবশ্যই এই সার্ভারটি ইনস্টল এবং সেটআপ করতে হবে:<br><strong>%s span><span class='notranslate'></strong><br>বাহ্যিক সার্ভার দ্বারা পরিবেশিত URL:<br><strong>%s</strong>
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s Dolibarr সার্ভার দ্বারা পরিবেশন করা হবে তাই এটির কোনো অতিরিক্ত ওয়েব সার্ভারের প্রয়োজন নেই (যেমন Apache, Nginx, IIS) ইনস্টল করতে হবে।<br>অসুবিধে হল যে পৃষ্ঠাগুলির URLগুলি ব্যবহারকারী বান্ধব নয় এবং আপনার Dolibarr এর পথ দিয়ে শুরু হয়৷<span class= Dolibarr দ্বারা পরিবেশিত URL /span></strong><br><br>এতে আপনার নিজস্ব বাহ্যিক ওয়েব সার্ভার ব্যবহার করতে এই ওয়েব সাইটটি পরিবেশন করুন, আপনার ওয়েব সার্ভারে একটি ভার্চুয়াল হোস্ট তৈরি করুন যা নির্দেশিকা নির্দেশ করে<br><strong>%s</strong><br>তারপর এই ওয়েবসাইটের বৈশিষ্ট্যগুলিতে এই ভার্চুয়াল সার্ভারের নাম লিখুন এবং ক্লিক করুন লিঙ্ক "টেস্ট/ডেপ্লয় অন ওয়েব"।
 VirtualHostUrlNotDefined=বহিরাগত ওয়েব সার্ভার দ্বারা পরিবেশিত ভার্চুয়াল হোস্টের URL সংজ্ঞায়িত করা হয়নি
 NoPageYet=এখনো কোনো পৃষ্ঠা নেই
@@ -63,7 +63,7 @@ YouCanEditHtmlSourceckeditor=আপনি সম্পাদকের "উৎস
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=একটি শেয়ার লিঙ্কের সাথে শেয়ার করা একটি ছবির জন্য (ফাইলের শেয়ারিং হ্যাশ কী ব্যবহার করে খোলা অ্যাক্সেস), সিনট্যাক্স হল:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;016f7f7f7012 <br>
-YouCanEditHtmlSource3=একটি PHP বস্তুর ছবির URL পেতে, <br><strong>&lt; ব্যবহার করুন span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt; class='notranslate'>&gt;</span></strong><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>এইচটিএমএল বা ডায়নামিক কোডের আরও উদাহরণ <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">উইকি ডকুমেন্টেশনb0e40dc6587এ উপলব্ধ >।<br>
 ClonePage=ক্লোন পৃষ্ঠা/ধারক
 CloneSite=ক্লোন সাইট
@@ -118,7 +118,7 @@ DeleteAlsoMedias=এই ওয়েবসাইটের জন্য নির
 MyWebsitePages=আমার ওয়েবসাইট পেজ
 SearchReplaceInto=অনুসন্ধান | মধ্যে প্রতিস্থাপন
 ReplaceString=নতুন স্ট্রিং
-CSSContentTooltipHelp=এখানে CSS কন্টেন্ট লিখুন। অ্যাপ্লিকেশনের CSS-এর সাথে কোনো দ্বন্দ্ব এড়াতে, .bodywebsite ক্লাসের সাথে সমস্ত ঘোষণা আগে-প্রান্তে রাখতে ভুলবেন না। যেমন:<br><br>#mycssselector, input.myclass:hover { ...  <br>অবশ্যই<br>।bodywebsite #mycssselector, .bodywebsite input.myclass:হোভার { ... b0342fccfda19>b0342fccfda19 <span class='notranslate'><br>দ্রষ্টব্য: যদি আপনার কাছে এই উপসর্গ ছাড়া একটি বড় ফাইল থাকে, তাহলে আপনি 'lessc' ব্যবহার করে এটিকে রূপান্তর করতে .bodywebsite উপসর্গটি সর্বত্র যুক্ত করতে পারেন।
+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=সতর্কতা: এই বিষয়বস্তু আউটপুট শুধুমাত্র যখন সাইট একটি সার্ভার থেকে অ্যাক্সেস করা হয়. এটি সম্পাদনা মোডে ব্যবহার করা হয় না তাই যদি আপনাকে জাভাস্ক্রিপ্ট ফাইলগুলিকে সম্পাদনা মোডেও লোড করতে হয়, তাহলে পৃষ্ঠায় আপনার ট্যাগ 'script src=...' যোগ করুন।
 Dynamiccontent=গতিশীল বিষয়বস্তু সহ একটি পৃষ্ঠার নমুনা
 EditInLineOnOff=মোড 'ইনলাইন সম্পাদনা' হল %s
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index 588766c7ded..827fd3290f1 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -47,7 +47,7 @@ MakeBankTransferOrder=একটি ক্রেডিট স্থানান
 WithdrawRequestsDone=%s সরাসরি ডেবিট পেমেন্টের অনুরোধ রেকর্ড করা হয়েছে
 BankTransferRequestsDone=%s ক্রেডিট ট্রান্সফার অনুরোধ রেকর্ড করা হয়েছে
 ThirdPartyBankCode=তৃতীয় পক্ষের ব্যাঙ্ক কোড
-NoInvoiceCouldBeWithdrawed=কোনো চালান সফলভাবে প্রক্রিয়া করা হয়নি। যাচাই করুন যে চালানগুলি একটি বৈধ IBAN সহ কোম্পানিগুলিতে রয়েছে এবং IBAN এর একটি UMR (অনন্য ম্যান্ডেট রেফারেন্স) মোড রয়েছে <strong>%s<span><span> span class='notranslate'></strong></span>।
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
 NoInvoiceCouldBeWithdrawedSupplier=কোনো চালান সফলভাবে প্রক্রিয়া করা হয়নি। একটি বৈধ IBAN সহ কোম্পানিগুলিতে চালানগুলি আছে কিনা তা পরীক্ষা করুন৷
 NoSalariesCouldBeWithdrawed=কোন বেতন সফলভাবে প্রক্রিয়া করা হয়েছে. একটি বৈধ IBAN সহ ব্যবহারকারীদের বেতন আছে কিনা তা পরীক্ষা করুন।
 WithdrawalCantBeCreditedTwice=এই প্রত্যাহার রসিদ ইতিমধ্যেই ক্রেডিট হিসাবে চিহ্নিত করা হয়েছে; এটি দুবার করা যাবে না, কারণ এটি সম্ভাব্য ডুপ্লিকেট পেমেন্ট এবং ব্যাঙ্ক এন্ট্রি তৈরি করবে।
@@ -152,7 +152,7 @@ ADDDAYS=মৃত্যুদন্ডের তারিখে দিন যো
 NoDefaultIBANFound=এই তৃতীয় পক্ষের জন্য কোনো ডিফল্ট IBAN পাওয়া যায়নি
 ### Notifications
 InfoCreditSubject=ব্যাঙ্কের সরাসরি ডেবিট পেমেন্ট অর্ডার %s পেমেন্ট
-InfoCreditMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কের দ্বারা দেওয়া হয়েছে<br>প্রদানের ডেটা: %s 
+InfoCreditMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কের দ্বারা দেওয়া হয়েছে<br>প্রদানের ডেটা: %s
 InfoTransSubject=ব্যাঙ্কে সরাসরি ডেবিট পেমেন্ট অর্ডার %s ট্রান্সমিশন
 InfoTransMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কে পাঠানো হয়েছে %s %s .<br><br>
 InfoTransData=পরিমাণ: %s<br>পদ্ধতি: %s<br>তারিখ: %s
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=ক্রেডিট ট্রান্সফারের
 RefSalary=বেতন
 NoSalaryInvoiceToWithdraw='%s'-এর জন্য কোনো বেতন অপেক্ষা করছে না। একটি অনুরোধ করতে বেতন কার্ডে '%s' ট্যাবে যান৷
 SalaryInvoiceWaitingWithdraw=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্টের অপেক্ষায় বেতন
-
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 5746cd97be3..c4637b5303f 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=অ্যাকাউন্টিং অ্যাকাউন্
 AccountingJournals=অ্যাকাউন্টিং জার্নাল
 AccountingJournal=অ্যাকাউন্টিং জার্নাল
 NewAccountingJournal=নতুন অ্যাকাউন্টিং জার্নাল
-ShowAccountingJournal=অ্যাকাউন্টিং জার্নাল দেখান
 NatureOfJournal=জার্নালের প্রকৃতি
 AccountingJournalType1=বিবিধ অপারেশন
 AccountingJournalType2=বিক্রয়
@@ -346,14 +345,14 @@ AccountingJournalType8=ইনভেন্টরি
 AccountingJournalType9=ধরে রাখা উপার্জন
 GenerationOfAccountingEntries=অ্যাকাউন্টিং এন্ট্রি প্রজন্ম
 ErrorAccountingJournalIsAlreadyUse=এই জার্নাল ইতিমধ্যে ব্যবহার করা হয়
-AccountingAccountForSalesTaxAreDefinedInto=দ্রষ্টব্য: বিক্রয় করের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট <b>%s</b>মেনুতে সংজ্ঞায়িত করা হয়েছে - <span class='notranslate'><b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=এন্ট্রি সংখ্যা
 NumberOfAccountancyMovements=আন্দোলনের সংখ্যা
 ACCOUNTING_DISABLE_BINDING_ON_SALES=বিক্রয়ের ক্ষেত্রে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (কাস্টমার ইনভয়েস অ্যাকাউন্টিংয়ে বিবেচনা করা হবে না)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ক্রয়ের ক্ষেত্রে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (বিক্রেতার চালান অ্যাকাউন্টিংয়ে বিবেচনায় নেওয়া হবে না)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ব্যয়ের প্রতিবেদনে হিসাববিজ্ঞানে বাঁধাই এবং স্থানান্তর অক্ষম করুন (ব্যয় প্রতিবেদন অ্যাকাউন্টিংয়ে বিবেচনা করা হবে না)
 ACCOUNTING_ENABLE_LETTERING=অ্যাকাউন্টিং এ লেটারিং ফাংশন সক্রিয় করুন
-ACCOUNTING_ENABLE_LETTERING_DESC=যখন এই বিকল্পগুলি সক্রিয় করা হয়, আপনি প্রতিটি অ্যাকাউন্টিং এন্ট্রিতে একটি কোড সংজ্ঞায়িত করতে পারেন যাতে আপনি বিভিন্ন অ্যাকাউন্টিং আন্দোলনকে একসাথে গোষ্ঠী করতে পারেন। অতীতে, যখন বিভিন্ন জার্নাল স্বাধীনভাবে পরিচালিত হত, তখন এই বৈশিষ্ট্যটি বিভিন্ন জার্নালের আন্দোলনের লাইনগুলিকে একত্রিত করার জন্য প্রয়োজনীয় ছিল। যাইহোক, ডলিবার অ্যাকাউন্টেন্সির সাথে, এই ধরনের একটি ট্র্যাকিং কোড, যাকে বলা হয় "<b>%s</b><span class='notranslate'> span>" ইতিমধ্যেই স্বয়ংক্রিয়ভাবে সংরক্ষিত হয়েছে, তাই একটি স্বয়ংক্রিয় অক্ষর ইতিমধ্যেই সম্পন্ন হয়েছে, ত্রুটির কোনো ঝুঁকি নেই তাই এই বৈশিষ্ট্যটি সাধারণ ব্যবহারের জন্য অকেজো হয়ে পড়েছে। ম্যানুয়াল লেটারিং বৈশিষ্ট্য শেষ ব্যবহারকারীদের জন্য সরবরাহ করা হয়েছে যারা অ্যাকাউন্টেন্সিতে ডেটা স্থানান্তর করার জন্য কম্পিউটার ইঞ্জিনকে সত্যিই বিশ্বাস করেন না।
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=একটি কঠোর অ্যাকাউন্টিং ব্যবস্থাপনার জন্য এই বৈশিষ্ট্যটি সক্ষম করার আর প্রয়োজন নেই৷
 ACCOUNTING_ENABLE_AUTOLETTERING=অ্যাকাউন্টিংয়ে স্থানান্তর করার সময় স্বয়ংক্রিয় অক্ষর সক্ষম করুন
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=অক্ষরের জন্য কোডটি স্বয়ংক্রিয়ভাবে তৈরি এবং বৃদ্ধি পায় এবং শেষ ব্যবহারকারী দ্বারা নির্বাচিত হয় না
@@ -361,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=লেটারিং কোড তৈরি ক
 ACCOUNTING_LETTERING_NBLETTERS_DESC=কিছু অ্যাকাউন্টিং সফ্টওয়্যার শুধুমাত্র একটি দুই-অক্ষরের কোড গ্রহণ করে। এই প্যারামিটার আপনাকে এই দিকটি সেট করতে দেয়। অক্ষরের ডিফল্ট সংখ্যা তিনটি।
 OptionsAdvanced=উন্নত বিকল্প
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=সরবরাহকারী ক্রয়ের উপর ভ্যাট রিভার্স চার্জ পরিচালনা সক্রিয় করুন
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=যখন এই বিকল্পটি সক্রিয় থাকে, তখন আপনি সংজ্ঞায়িত করতে পারেন যে একটি সরবরাহকারী বা একটি প্রদত্ত বিক্রেতার চালানকে অবশ্যই অ্যাকাউন্টেন্সিতে স্থানান্তর করতে হবে: একটি অতিরিক্ত ডেবিট এবং একটি ক্রেডিট লাইন 2টি প্রদত্ত অ্যাকাউন্টে অ্যাকাউন্টিংয়ে তৈরি হবে "< এ সংজ্ঞায়িত অ্যাকাউন্টের চার্ট থেকে span class='notranslate'>%s</span>" সেটআপ পৃষ্ঠা৷
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=ফাইল তৈরি করার সময় অক্ষর রপ্তানি করবেন না
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index b92c9c8488f..f42c696134d 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=পরবর্তী মান (চালান)
 NextValueForCreditNotes=পরবর্তী মান (ক্রেডিট নোট)
 NextValueForDeposit=পরবর্তী মান (ডাউন পেমেন্ট)
 NextValueForReplacements=পরবর্তী মান (প্রতিস্থাপন)
-MustBeLowerThanPHPLimit=দ্রষ্টব্য: আপনার PHP কনফিগারেশন বর্তমানে <b>%sb09a4b739fz0b09a4b739fz0-এ আপলোড করার জন্য সর্বাধিক ফাইলের আকার সীমাবদ্ধ করে span> <span class='notranslate'>%s, এই প্যারামিটারের মান নির্বিশেষে
+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=দ্রষ্টব্য: আপনার পিএইচপি কনফিগারেশনে কোন সীমা সেট করা নেই
 MaxSizeForUploadedFiles=আপলোড করা ফাইলগুলির জন্য সর্বাধিক আকার (0 যেকোন আপলোডের অনুমতি না দেওয়ার জন্য)
 UseCaptchaCode=লগইন পৃষ্ঠা এবং কিছু পাবলিক পৃষ্ঠায় গ্রাফিকাল কোড (ক্যাপচা) ব্যবহার করুন
@@ -150,7 +150,7 @@ AllWidgetsWereEnabled=সমস্ত উপলব্ধ উইজেট সক
 WidgetAvailable=উইজেট উপলব্ধ
 PositionByDefault=ডিফল্ট অর্ডার
 MenusDesc=মেনু পরিচালকরা দুটি মেনু বারের বিষয়বস্তু সেট করে (অনুভূমিক এবং উল্লম্ব)।
-MenusEditorDesc=মেনু এডিটর আপনাকে কাস্টম মেনু এন্ট্রি সংজ্ঞায়িত করতে দেয়। অস্থিরতা এবং স্থায়ীভাবে পৌঁছানো যায় না এমন মেনু এন্ট্রি এড়াতে সাবধানে এটি ব্যবহার করুন।<br>কিছু মডিউল মেনু এন্ট্রি যোগ করে (মেনু <b>সমস্ত<span ক্লাস ='notranslate'></b></span> বেশিরভাগই)। আপনি যদি ভুলবশত এই এন্ট্রিগুলির কিছু মুছে ফেলেন, তাহলে আপনি মডিউলটিকে নিষ্ক্রিয় এবং পুনরায় সক্রিয় করে সেগুলি পুনরুদ্ধার করতে পারেন।
+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=ব্যবহারকারীদের জন্য মেনু
 LangFile=.lang ফাইল
 Language_en_US_es_MX_etc=ভাষা (en_US, es_MX, ...)
@@ -230,7 +230,7 @@ SeeReportPage=%s এ রিপোর্ট পৃষ্ঠা দেখুন
 SetOptionTo=<b>%s</b>  বিকল্প সেট করুন %s
 Updated=আপডেট করা হয়েছে
 AchatTelechargement=কিনুন/ডাউনলোড করুন
-GoModuleSetupArea=একটি নতুন মডিউল স্থাপন/ইনস্টল করতে, মডিউল সেটআপ এলাকায় যান: <a href="%s">%sb0e40dc6588 
+GoModuleSetupArea=একটি নতুন মডিউল স্থাপন/ইনস্টল করতে, মডিউল সেটআপ এলাকায় যান: <a href="%s">%sb0e40dc6588
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM বাহ্যিক মডিউলের অফিসিয়াল মার্কেট প্লেস
 DoliPartnersDesc=কাস্টম-উন্নত মডিউল বা বৈশিষ্ট্যগুলি প্রদানকারী সংস্থাগুলির তালিকা৷<br>দ্রষ্টব্য: যেহেতু ডলিবার একটি ওপেন সোর্স অ্যাপ্লিকেশন, তাই <i>যে কেউ</i> পিএইচপি প্রোগ্রামিংয়ে অভিজ্ঞদের একটি মডিউল তৈরি করতে সক্ষম হওয়া উচিত।
 WebSiteDesc=আরো অ্যাড-অন (নন-কোর) মডিউলের জন্য বাহ্যিক ওয়েবসাইট...
@@ -250,8 +250,8 @@ Security=নিরাপত্তা
 Passwords=পাসওয়ার্ড
 DoNotStoreClearPassword=ডাটাবেসে সংরক্ষিত পাসওয়ার্ড এনক্রিপ্ট করুন (প্লেন-টেক্সট হিসেবে নয়)। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
 MainDbPasswordFileConfEncrypted=conf.php এ সংরক্ষিত ডাটাবেস পাসওয়ার্ড এনক্রিপ্ট করুন। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
-InstrucToEncodePass=<b>conf.php</b> ফাইলে পাসওয়ার্ড এনকোড করতে, লাইনটি প্রতিস্থাপন করুন b0342fccfda19b /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342fccfda19 >দ্বারা<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb2ecz87fz" span class='notranslate'></b></span>
-InstrucToClearPass=<b>conf.php</b> ফাইলে পাসওয়ার্ড ডিকোড (ক্লিয়ার) করতে, লাইনটি প্রতিস্থাপন করুন <br><b>$dolibarr_main_db_pass="crypted:...";</b><span class='notranslate' <br><b>$dolibarr_main_db_pass="<br>দ্বারা ";</b>
+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=উত্পন্ন পিডিএফ ফাইল রক্ষা করুন. এটি বাঞ্ছনীয় নয় কারণ এটি বাল্ক পিডিএফ তৈরি করে।
 ProtectAndEncryptPdfFilesDesc=একটি পিডিএফ ডকুমেন্টের সুরক্ষা এটিকে যেকোনো পিডিএফ ব্রাউজার দিয়ে পড়তে এবং মুদ্রণের জন্য উপলব্ধ রাখে। তবে এডিট ও কপি করা আর সম্ভব নয়। মনে রাখবেন যে এই বৈশিষ্ট্যটি ব্যবহার করার ফলে একটি বিশ্বব্যাপী মার্জড PDF গুলি কাজ করছে না।
 Feature=বৈশিষ্ট্য
@@ -268,7 +268,7 @@ OtherResources=অন্যান্য উৎস
 ExternalResources=বাহ্যিক সম্পদ
 SocialNetworks=সামাজিক যোগাযোগ
 SocialNetworkId=সামাজিক নেটওয়ার্ক আইডি
-ForDocumentationSeeWiki=ব্যবহারকারী বা বিকাশকারী ডকুমেন্টেশনের জন্য (ডক, প্রায়শই জিজ্ঞাসিত প্রশ্নাবলী...),<br>Dolibarr Wiki:<br><span দেখুন class='notranslate'><b></span><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dc658> <span class='notranslate'></b>
+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=অন্য কোনো প্রশ্ন/সাহায্যের জন্য, আপনি Dolibarr ফোরাম ব্যবহার করতে পারেন:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Dolibarr-এর সাহায্য এবং সমর্থন পাওয়ার জন্য এখানে কিছু সংস্থান রয়েছে।
 HelpCenterDesc2=এই সম্পদগুলির মধ্যে কিছু শুধুমাত্র <b>ইংরেজি</b> এ উপলব্ধ।
@@ -290,8 +290,8 @@ EMailsSetup=ইমেল সেটআপ
 EMailsDesc=এই পৃষ্ঠাটি আপনাকে ইমেল পাঠানোর জন্য পরামিতি বা বিকল্প সেট করতে দেয়।
 EmailSenderProfiles=ইমেল প্রেরকের প্রোফাইল
 EMailsSenderProfileDesc=আপনি এই বিভাগটি খালি রাখতে পারেন। আপনি এখানে কিছু ইমেল লিখলে, আপনি যখন একটি নতুন ইমেল লিখবেন তখন সেগুলি কম্বোবক্সে সম্ভাব্য প্রেরকদের তালিকায় যোগ করা হবে।
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS পোর্ট (php.ini তে ডিফল্ট মান: <b>%s<span class='notranslate'>b09a4b739f17fz0 >>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS হোস্ট (php.ini-এ ডিফল্ট মান: <b>%s<span class='notranslate'>b09a4b739f17fz0 >>)
+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 পোর্ট
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS হোস্ট
 MAIN_MAIL_EMAIL_FROM=স্বয়ংক্রিয় ইমেলের জন্য প্রেরক ইমেল
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=এটি ম্যানুয়ালি প
 StepNb=ধাপ %s
 FindPackageFromWebSite=আপনার প্রয়োজনীয় বৈশিষ্ট্যগুলি প্রদান করে এমন একটি প্যাকেজ খুঁজুন (উদাহরণস্বরূপ অফিসিয়াল ওয়েব সাইটে %s)।
 DownloadPackageFromWebSite=প্যাকেজ ডাউনলোড করুন (উদাহরণস্বরূপ অফিসিয়াল ওয়েব সাইট %s থেকে)।
-UnpackPackageInDolibarrRoot=আপনার Dolibarr সার্ভার ডিরেক্টরিতে প্যাকেজ করা ফাইলগুলি আনপ্যাক/আনজিপ করুন: <b>%sb09a4b739f8<span class='notranslate' >
-UnpackPackageInModulesRoot=একটি বাহ্যিক মডিউল স্থাপন/ইনস্টল করতে, আপনাকে অবশ্যই বহিরাগত মডিউলগুলির জন্য নিবেদিত সার্ভার ডিরেক্টরিতে সংরক্ষণাগার ফাইলটি আনপ্যাক/আনজিপ করতে হবে:<br>b0aee8365837fz0 ><span class='notranslate'>%s</b>
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <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=মডিউল স্থাপনার কাজ শেষ। তবে আপনাকে অবশ্যই পৃষ্ঠা সেটআপ মডিউলগুলিতে গিয়ে আপনার অ্যাপ্লিকেশনে মডিউলটি সক্ষম এবং সেটআপ করতে হবে: <a href="%s">%s</a>.
 NotExistsDirect=বিকল্প রুট ডিরেক্টরি একটি বিদ্যমান ডিরেক্টরিতে সংজ্ঞায়িত করা হয় না৷<br>
 InfDirAlt=সংস্করণ 3 থেকে, একটি বিকল্প রুট ডিরেক্টরি সংজ্ঞায়িত করা সম্ভব। এটি আপনাকে একটি ডেডিকেটেড ডিরেক্টরি, প্লাগ-ইন এবং কাস্টম টেমপ্লেটে সঞ্চয় করতে দেয়।<br>শুধু Dolibarr এর রুটে একটি ডিরেক্টরি তৈরি করুন (যেমন: কাস্টম)।<br>
-InfDirExample=<br>তারপর ফাইলে এটি ঘোষণা করুন <strong>conf.php</strong> class='notranslate'><br></span> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt/span>$dolibarr_main_document_root_alt'//barlib='/classom= 'notranslate'><br></span>যদি এই লাইনগুলিকে "#" দিয়ে কমেন্ট করা হয়, সেগুলিকে সক্রিয় করতে, শুধুমাত্র "#" অক্ষরটি সরিয়ে আনকমেন্ট করুন৷
+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=আপনি এখান থেকে মডিউল প্যাকেজের .zip ফাইল আপলোড করতে পারেন:
 CurrentVersion=ডলিবার বর্তমান সংস্করণ
 CallUpdatePage=ডাটাবেস গঠন এবং ডেটা আপডেট করে এমন পৃষ্ঠায় ব্রাউজ করুন: %s।
@@ -362,16 +362,16 @@ LastActivationVersion=সর্বশেষ অ্যাক্টিভেশন
 UpdateServerOffline=সার্ভার অফলাইনে আপডেট করুন
 WithCounter=একটি কাউন্টার পরিচালনা করুন
 GenericMaskCodes=আপনি যেকোন নম্বর মাস্ক লিখতে পারেন। এই মাস্কে, নিম্নলিখিত ট্যাগগুলি ব্যবহার করা যেতে পারে:<br><b>{000000}b09a4b739f17f17  একটি সংখ্যার সাথে মিলে যায় যা প্রতিটি %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>, b0635837fz35 {yyyy}</b> বা <b>{y}</b> 2, 4 বা 1 সংখ্যার বেশি বছর। <br>
-GenericMaskCodes2=<b>{cccc}</b> n অক্ষরের উপর ক্লায়েন্ট কোড<br><b>{cccc000}b09a4b739f7>ক্লায়েন্ট কোড অন n অক্ষরের পরে গ্রাহককে উৎসর্গ করা একটি কাউন্টার রয়েছে। গ্রাহকের জন্য নিবেদিত এই কাউন্টারটি গ্লোবাল কাউন্টারের মতো একই সময়ে পুনরায় সেট করা হয়েছে।<span class='notranslate'><br><b>b06a5f451419e800 </b> n অক্ষরে তৃতীয় পক্ষের প্রকারের কোড (মেনু হোম - সেটআপ - অভিধান - তৃতীয় পক্ষের প্রকারগুলি দেখুন)। আপনি এই ট্যাগ যোগ করলে, কাউন্টারটি প্রতিটি ধরণের তৃতীয় পক্ষের জন্য আলাদা হবে৷<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
 GenericMaskCodes3=মাস্কের অন্য সব অক্ষর অক্ষত থাকবে।<br>স্পেস অনুমোদিত নয়।<br>
 GenericMaskCodes3EAN=মুখোশের অন্যান্য সমস্ত অক্ষর অক্ষত থাকবে (ইএএন 13 এ 13তম অবস্থানে * বা? ছাড়া)।<br>স্পেস অনুমোদিত নয়।<br> span>EAN13-এ, 13তম অবস্থানে শেষ } এর পরে শেষ অক্ষরটি * বা? . এটি গণনা করা কী দ্বারা প্রতিস্থাপিত হবে৷<br>
 GenericMaskCodes4a=<u>তৃতীয় পক্ষের TheCompany-এর 99তম %s উদাহরণ, তারিখ 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>2023-01-31 তারিখে তৈরি তৃতীয় পক্ষের উদাহরণ:</u><br> >
 GenericMaskCodes4c=<u>2023-01-31 তারিখে তৈরি পণ্যের উদাহরণ:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> দেবে b0aee8336580 span>ABC2301-000099</b><br>b0aee8365837fz0{0@span>0+1 }-ZZZ/{dd}/XXX<span class='notranslate'></b> দেবে <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> দেবে <b>IN2301-0099-A</b> যদি কোম্পানির প্রকার হয় 'A_RI' টাইপের কোড সহ 'দায়িত্বশীল ইনস্ক্রিপ্টো'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=একটি সংজ্ঞায়িত মাস্ক অনুযায়ী একটি কাস্টমাইজযোগ্য সংখ্যা প্রদান করে।
-ServerAvailableOnIPOrPort=সার্ভার ঠিকানা <b>%s</b> পোর্টে উপলব্ধ 'notranslate'><b></span>%s</b>
-ServerNotAvailableOnIPOrPort=পোর্ট <b>%s</b> ঠিকানায় সার্ভার উপলব্ধ নয় ='notranslate'><b></span>%s</b>
+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=সার্ভার সংযোগ পরীক্ষা করুন
 DoTestSend=পরীক্ষা পাঠানো
 DoTestSendHTML=এইচটিএমএল পাঠানোর পরীক্ষা করুন
@@ -390,9 +390,9 @@ LanguageFilesCachedIntoShmopSharedMemory=ফাইল .lang শেয়ার 
 LanguageFile=ভাষা ফাইল
 ExamplesWithCurrentSetup=বর্তমান কনফিগারেশন সহ উদাহরণ
 ListOfDirectories=OpenDocument টেমপ্লেট ডিরেক্টরির তালিকা
-ListOfDirectoriesForModelGenODT=OpenDocument ফরম্যাট সহ টেমপ্লেট ফাইল ধারণকারী ডিরেক্টরিগুলির তালিকা৷<br><br>এখানে ডিরেক্টরিগুলির সম্পূর্ণ পথ রাখুন৷<br>eah ডিরেক্টরির মধ্যে একটি ক্যারেজ রিটার্ন যোগ করুন।<br>GED মডিউলের একটি ডিরেক্টরি যোগ করতে, এখানে যোগ করুন b0aee8365837fz0 >DOL_DATA_ROOT/ecm/yourdirectoryname</b>।<br>b0342fccfda19bzless0>এ পরিচালক <span class='notranslate'><b>.odt</b> অথবা <b>.ods<span> দিয়ে শেষ করতে হবে ='notranslate'></b></span>।
+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=এই ডিরেক্টরিগুলিতে পাওয়া ODT/ODS টেমপ্লেট ফাইলের সংখ্যা
-ExampleOfDirectoriesForModelGen=সিনট্যাক্সের উদাহরণ:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<span> 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>আপনার odt নথি টেমপ্লেটগুলি কীভাবে তৈরি করবেন তা জানতে, সেগুলিকে সেই ডিরেক্টরিগুলিতে সংরক্ষণ করার আগে, উইকি ডকুমেন্টেশন পড়ুন:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=নাম/শেষনামের অবস্থান
@@ -461,17 +461,17 @@ ComputedFormulaDesc=ডায়নামিক কম্পিউটেড ম
 Computedpersistent=কম্পিউটেড ফিল্ড স্টোর করুন
 ComputedpersistentDesc=গণনা করা অতিরিক্ত ক্ষেত্রগুলি ডাটাবেসে সংরক্ষণ করা হবে, তবে, এই ক্ষেত্রের অবজেক্টটি পরিবর্তিত হলেই মানটি পুনরায় গণনা করা হবে। যদি গণনা করা ক্ষেত্রটি অন্যান্য অবজেক্ট বা গ্লোবাল ডেটার উপর নির্ভর করে তবে এই মানটি ভুল হতে পারে!!
 ExtrafieldParamHelpPassword=এই ক্ষেত্রটি ফাঁকা রাখার অর্থ হল এই মানটি এনক্রিপশন ছাড়াই সংরক্ষণ করা হবে (ক্ষেত্রটি স্ক্রিনে তারা দিয়ে লুকানো আছে)।<br><br>এন্টার করুন একটি বিপরীত এনক্রিপশন অ্যালগরিদমের সাথে মান এনকোড করতে মান 'ডলক্রিপ্ট'। পরিষ্কার ডেটা এখনও জানা এবং সম্পাদনা করা যেতে পারে তবে ডেটাবেসে এনক্রিপ্ট করা হয়৷<br><br>'অটো' (বা 'md5' লিখুন, 'sha256', 'password_hash', ...) ডিফল্ট পাসওয়ার্ড এনক্রিপশন অ্যালগরিদম ব্যবহার করতে (বা md5, sha256, password_hash...) ডাটাবেসে নন-রিভার্সিবল হ্যাশড পাসওয়ার্ড সংরক্ষণ করতে (মূল মান পুনরুদ্ধারের কোনো উপায় নেই)
-ExtrafieldParamHelpselect=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>code3,value span class='notranslate'><br></span>...<br><br>অন্যের উপর নির্ভর করে তালিকা পেতে পরিপূরক বৈশিষ্ট্য তালিকা:<br>1,value1|options_<i>parent_list_codeb0ae634>b0ae634 parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae64758><span_par3bac: class='notranslate'><br><br>অন্য তালিকার উপর নির্ভর করে তালিকা পেতে:<br>1, value1|<i>parent_list_code</i>:parent_keyb0342fccfda19bzval,<span> class='notranslate'><i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
-ExtrafieldParamHelpsellist=মানের তালিকাটি একটি টেবিল থেকে আসে<br>সিনট্যাক্স: table_name:label_field:id_field::filtersql<br>উদাহরণ: c_tep ::filtersql<br><br>- id_field অগত্যা একটি প্রাথমিক int কী<br> - filtersql একটি SQL শর্ত। শুধুমাত্র সক্রিয় মান প্রদর্শন করার জন্য এটি একটি সাধারণ পরীক্ষা (যেমন সক্রিয়=1) হতে পারে<br>আপনি ফিল্টারে $ID$ ব্যবহার করতে পারেন যা বর্তমান বস্তুর বর্তমান আইডি<span ক্লাস ='notranslate'><br></span>ফিল্টারে একটি SELECT ব্যবহার করতে ইনজেকশন-বিরোধী সুরক্ষা বাইপাস করতে $SEL$ কীওয়ার্ডটি ব্যবহার করুন।<br>যদি আপনি অতিরিক্ত ফিল্ডে ফিল্টার করতে চান সিনট্যাক্স extra.fieldcode=... ব্যবহার করুন (যেখানে ফিল্ড কোড হল এক্সট্রাফিল্ডের কোড)<br><br> অন্য একটি পরিপূরক বৈশিষ্ট্যের তালিকার উপর নির্ভর করে তালিকা:<br>c_typent:libelle:id:options_<i>parent_list_translate<span>'notranslate' </i></span>|parent_column:filter <br><br>অন্য তালিকার উপর নির্ভর করে তালিকা পাওয়ার জন্য:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758bac33parent_col:
-ExtrafieldParamHelpchkbxlst=মানের তালিকাটি একটি টেবিল থেকে আসে<br>সিনট্যাক্স: table_name:label_field:id_field::filtersql<br>উদাহরণ: c_tep ::filtersql<br><br>শুধুমাত্র সক্রিয় মান প্রদর্শনের জন্য ফিল্টার একটি সাধারণ পরীক্ষা (যেমন সক্রিয়=1) হতে পারে<br>আপনি ফিল্টার জাদুকরীতে $ID$ ব্যবহার করতে পারেন এটি বর্তমান বস্তুর বর্তমান আইডি<br>ফিল্টারে একটি নির্বাচন করতে $SEL$ ব্যবহার করুন span class='notranslate'><br></span>যদি আপনি এক্সট্রাফিল্ডে ফিল্টার করতে চান তাহলে সিনট্যাক্স ব্যবহার করুন extra.fieldcode=... (যেখানে ফিল্ড কোড হল এক্সট্রাফিল্ডের কোড)<br> ><br>অন্য একটি পরিপূরক বৈশিষ্ট্যের তালিকার উপর নির্ভর করে তালিকা পেতে:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19bzc0b0342fccfda19bzc0</span>b024fda19bz </span>অন্য তালিকার উপর নির্ভর করে তালিকা পেতে:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+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 necessarily 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=পরামিতি হতে হবে ObjectName:Classpath<br>সিনট্যাক্স: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=একটি সাধারণ বিভাজকের জন্য খালি রাখুন<br>কোলাপসিং সেপারেটরের জন্য এটি 1 এ সেট করুন (নতুন সেশনের জন্য ডিফল্টরূপে খোলা, তারপর প্রতিটি ব্যবহারকারীর সেশনের জন্য স্থিতি রাখা হয়)<br>কোলাপসিং সেপারেটরের জন্য এটিকে 2 এ সেট করুন (নতুন সেশনের জন্য ডিফল্টরূপে ভেঙে পড়ে, তারপর প্রতিটি ব্যবহারকারীর সেশনের আগে স্থিতি রাখা হয়)
 LibraryToBuildPDF=পিডিএফ তৈরির জন্য ব্যবহৃত লাইব্রেরি
 LocalTaxDesc=কিছু দেশ প্রতিটি চালান লাইনে দুই বা তিনটি কর প্রয়োগ করতে পারে। যদি এটি হয়, দ্বিতীয় এবং তৃতীয় করের ধরন এবং তার হার নির্বাচন করুন। সম্ভাব্য প্রকারগুলি হল:<br>1: ভ্যাট ছাড়া পণ্য এবং পরিষেবার উপর স্থানীয় কর প্রযোজ্য (ট্যাক্স ছাড়াই পরিমাণের উপর স্থানীয় ট্যাক্স গণনা করা হয়)<br> 2: ভ্যাট সহ পণ্য এবং পরিষেবাগুলিতে স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + মূল ট্যাক্সের উপর গণনা করা হয়)<br>3: ভ্যাট ছাড়া পণ্যের উপর স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স ব্যতীত পরিমাণের উপর গণনা করা হয় ট্যাক্স)<br>4: ভ্যাট সহ পণ্যের উপর স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + প্রধান ভ্যাটের উপর গণনা করা হয়)<br>5: স্থানীয় ভ্যাট ছাড়া পরিষেবাগুলিতে কর প্রযোজ্য (স্থানীয় ট্যাক্স ট্যাক্স ছাড়া পরিমাণের উপর গণনা করা হয়)<br>6: ভ্যাট সহ পরিষেবাগুলিতে স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + ট্যাক্সের উপর গণনা করা হয়)
 SMS=খুদেবার্তা
-LinkToTestClickToDial=ব্যবহারকারী <strong>%s<span class='notranslate'-এর জন্য ClickToDial url পরীক্ষা করার জন্য একটি লিঙ্ক দেখানোর জন্য কল করার জন্য একটি ফোন নম্বর লিখুন ></strong></span>
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=লিঙ্ক রিফ্রেশ করুন
 LinkToTest=ব্যবহারকারীর জন্য ক্লিকযোগ্য লিঙ্ক তৈরি করা হয়েছে <strong>%s</strong> (পরীক্ষা করতে ফোন নম্বরে ক্লিক করুন )
 KeepEmptyToUseDefault=ডিফল্ট মান ব্যবহার করতে খালি রাখুন
@@ -509,7 +509,7 @@ WarningPHPMailA=- ইমেল পরিষেবা প্রদানকার
 WarningPHPMailB=- কিছু ইমেল পরিষেবা প্রদানকারী (যেমন ইয়াহু) আপনাকে তাদের নিজস্ব সার্ভারের পরিবর্তে অন্য সার্ভার থেকে একটি ইমেল পাঠাতে দেয় না। আপনার বর্তমান সেটআপ ইমেল পাঠানোর জন্য অ্যাপ্লিকেশনের সার্ভার ব্যবহার করে এবং আপনার ইমেল প্রদানকারীর সার্ভার নয়, তাই কিছু প্রাপক (নিষেধাজ্ঞামূলক DMARC প্রোটোকলের সাথে সামঞ্জস্যপূর্ণ), আপনার ইমেল প্রদানকারীকে জিজ্ঞাসা করবে তারা আপনার ইমেল এবং কিছু ইমেল প্রদানকারী গ্রহণ করতে পারে কিনা (ইয়াহুর মতো) "না" উত্তর দিতে পারে কারণ সার্ভারটি তাদের নয়, তাই আপনার পাঠানো কিছু ইমেল বিতরণের জন্য গৃহীত নাও হতে পারে (আপনার ইমেল প্রদানকারীর পাঠানোর কোটা সম্পর্কেও সতর্ক থাকুন)।
 WarningPHPMailC=- ইমেল পাঠানোর জন্য আপনার নিজস্ব ইমেল পরিষেবা প্রদানকারীর SMTP সার্ভার ব্যবহার করাও আকর্ষণীয় তাই অ্যাপ্লিকেশন থেকে পাঠানো সমস্ত ইমেলগুলি আপনার মেলবক্সের "প্রেরিত" ডিরেক্টরিতেও সংরক্ষিত হবে৷
 WarningPHPMailD=তাই ই-মেইল পাঠানোর পদ্ধতিকে "SMTP" মানতে পরিবর্তন করার পরামর্শ দেওয়া হচ্ছে।
-WarningPHPMailDbis=আপনি যদি সত্যিই ইমেল পাঠানোর জন্য ডিফল্ট "PHP" পদ্ধতি রাখতে চান, তাহলে এই সতর্কতা উপেক্ষা করুন, অথবা %sএখানে ক্লিক করে <span class='notranslate'>%s< দ্বারা এটি সরিয়ে দিন /span>।
+WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
 WarningPHPMail2=যদি আপনার ইমেল SMTP প্রদানকারীর ইমেল ক্লায়েন্টকে কিছু আইপি ঠিকানায় সীমাবদ্ধ করতে হয় (খুব বিরল), এটি আপনার ERP CRM অ্যাপ্লিকেশনের জন্য মেল ব্যবহারকারী এজেন্টের (MUA) IP ঠিকানা: <strong>%s</strong>।
 WarningPHPMailSPF=যদি আপনার প্রেরকের ইমেল ঠিকানার ডোমেন নামটি একটি SPF রেকর্ড দ্বারা সুরক্ষিত থাকে (আপনার ডোমেন নাম রেজিস্টারকে জিজ্ঞাসা করুন), আপনাকে অবশ্যই আপনার ডোমেনের DNS-এর SPF রেকর্ডে নিম্নলিখিত IPগুলি যোগ করতে হবে: <strong>%s</strong>।
 ActualMailSPFRecordFound=প্রকৃত SPF রেকর্ড পাওয়া গেছে (ইমেলের জন্য %s): %s
@@ -518,7 +518,7 @@ DependsOn=এই মডিউলটির মডিউল(গুলি) প্
 RequiredBy=এই মডিউলটি মডিউল(গুলি) দ্বারা প্রয়োজনীয়
 TheKeyIsTheNameOfHtmlField=এটি HTML ক্ষেত্রের নাম। একটি ক্ষেত্রের মূল নাম পেতে HTML পৃষ্ঠার বিষয়বস্তু পড়ার জন্য প্রযুক্তিগত জ্ঞান প্রয়োজন।
 PageUrlForDefaultValues=আপনাকে অবশ্যই পৃষ্ঠা URL এর আপেক্ষিক পাথ লিখতে হবে। আপনি URL-এ প্যারামিটার অন্তর্ভুক্ত করলে, ব্রাউজ করা URL-এর সমস্ত প্যারামিটারের মান এখানে সংজ্ঞায়িত থাকলে এটি কার্যকর হবে।
-PageUrlForDefaultValuesCreate=<br>উদাহরণ:<br>একটি নতুন তৃতীয় পক্ষ তৈরি করার ফর্মের জন্য, এটি হল b0e7843947c<bz06bz0 /span><span class='notranslate'>%s</strong>।<br>এ ইনস্টল করা বাহ্যিক মডিউলগুলির URL এর জন্য কাস্টম ডিরেক্টরি, "কাস্টম/" অন্তর্ভুক্ত করবেন না, তাই পথ ব্যবহার করুন যেমন <strong>mymodule/mypage.php</strong> এবং কাস্টম নয় /mymodule/mypage.php.<br>যদি আপনি ডিফল্ট মান চান শুধুমাত্র যদি url এর কিছু প্যারামিটার থাকে, আপনি <strong><span ব্যবহার করতে পারেন class='notranslate'>%s</span></strong>
+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>উদাহরণ:<br>যে পৃষ্ঠাটি তৃতীয় পক্ষের তালিকা করে, সেটি হল <strong> >%s</strong>।<br>কাস্টম ডিরেক্টরিতে ইনস্টল করা বাহ্যিক মডিউলগুলির URL এর জন্য , "কাস্টম/" অন্তর্ভুক্ত করবেন না তাই <strong>mymodule/mypagelist.php</strong> মত একটি পথ ব্যবহার করুন এবং কাস্টম/mymodule নয় /mypagelist.php.<br>যদি আপনি ডিফল্ট মান চান শুধুমাত্র যদি url এর কিছু প্যারামিটার থাকে, আপনি <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=এছাড়াও মনে রাখবেন যে ফর্ম তৈরির জন্য ডিফল্ট মানগুলি ওভাররাইট করা শুধুমাত্র সঠিকভাবে ডিজাইন করা পৃষ্ঠাগুলির জন্য কাজ করে (তাই প্যারামিটার অ্যাকশন = তৈরি করুন বা উপস্থাপন করুন...)
 EnableDefaultValues=ডিফল্ট মানগুলির কাস্টমাইজেশন সক্ষম করুন
@@ -1197,6 +1197,7 @@ Skin=ত্বকের থিম
 DefaultSkin=ডিফল্ট স্কিন থিম
 MaxSizeList=তালিকার জন্য সর্বোচ্চ দৈর্ঘ্য
 DefaultMaxSizeList=তালিকার জন্য ডিফল্ট সর্বোচ্চ দৈর্ঘ্য
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=ছোট তালিকার জন্য ডিফল্ট সর্বোচ্চ দৈর্ঘ্য (যেমন গ্রাহক কার্ডে)
 MessageOfDay=দিনের বার্তা
 MessageLogin=লগইন পৃষ্ঠা বার্তা
@@ -1249,7 +1250,7 @@ SetupDescription2=নিম্নলিখিত দুটি বিভাগ 
 SetupDescription3=<a href="%s">%s -> %sb0e40dc858 <br><br>আপনার অ্যাপ্লিকেশনের ডিফল্ট আচরণ কাস্টমাইজ করার জন্য ব্যবহৃত মৌলিক প্যারামিটারগুলি (যেমন দেশ-সম্পর্কিত বৈশিষ্ট্যগুলির জন্য)।
 SetupDescription4=<a href="%s">%s -> %sb0e40dc858 <br><br>এই সফ্টওয়্যারটি অনেক মডিউল/অ্যাপ্লিকেশনের একটি স্যুট। আপনার প্রয়োজনের সাথে সম্পর্কিত মডিউলগুলি অবশ্যই সক্ষম এবং কনফিগার করা উচিত। এই মডিউলগুলি সক্রিয় করার সাথে মেনু এন্ট্রি প্রদর্শিত হবে।
 SetupDescription5=অন্যান্য সেটআপ মেনু এন্ট্রি ঐচ্ছিক পরামিতি পরিচালনা করে।
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>b0e40dc<b67dc /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=আপনার অ্যাপ্লিকেশনের ডিফল্ট আচরণ কাস্টমাইজ করতে ব্যবহৃত মৌলিক পরামিতিগুলি (যেমন দেশ-সম্পর্কিত বৈশিষ্ট্যগুলির জন্য)।
 SetupDescription4b=এই সফ্টওয়্যারটি অনেক মডিউল/অ্যাপ্লিকেশনের একটি স্যুট। আপনার প্রয়োজনের সাথে সম্পর্কিত মডিউলগুলি সক্রিয় করতে হবে। এই মডিউলগুলি সক্রিয় করার সাথে মেনু এন্ট্রি প্রদর্শিত হবে।
 AuditedSecurityEvents=নিরাপত্তা ঘটনা যা নিরীক্ষিত হয়
@@ -1281,7 +1282,7 @@ AvailableModules=উপলব্ধ অ্যাপ/মডিউল
 ToActivateModule=মডিউল সক্রিয় করতে, সেটআপ এরিয়াতে যান (হোম->সেটআপ->মডিউল)।
 SessionTimeOut=অধিবেশনের জন্য সময় শেষ
 SessionExplanation=এই সংখ্যাটি গ্যারান্টি দেয় যে সেশনটি এই বিলম্বের আগে কখনই শেষ হবে না, যদি সেশন ক্লিনারটি অভ্যন্তরীণ PHP সেশন ক্লিনার দ্বারা করা হয় (এবং অন্য কিছু নয়)। অভ্যন্তরীণ PHP সেশন ক্লিনার গ্যারান্টি দেয় না যে এই বিলম্বের পরে সেশনের মেয়াদ শেষ হয়ে যাবে। এই বিলম্বের পরে এবং যখন সেশন ক্লিনার চালানো হবে তখন এটির মেয়াদ শেষ হয়ে যাবে, তাই প্রতিটি <b>%s/%s</b> অ্যাক্সেস, কিন্তু শুধুমাত্র অন্যান্য সেশন দ্বারা করা অ্যাক্সেসের সময় (যদি মান 0 হয়, এর অর্থ হল সেশনটি ক্লিয়ার করা শুধুমাত্র একটি বাহ্যিক প্রক্রিয়া দ্বারা সম্পন্ন হয়) .<br>দ্রষ্টব্য: একটি বাহ্যিক সেশন ক্লিনিং মেকানিজম সহ কিছু সার্ভারে (ডেবিয়ানের অধীনে ক্রন, উবুন্টু ...), সেশনগুলি একটি বাহ্যিক সেটআপ দ্বারা সংজ্ঞায়িত সময়ের পরে ধ্বংস করা যেতে পারে, এখানে প্রবেশ করা মান কোন ব্যাপার না.
-SessionsPurgedByExternalSystem=এই সার্ভারের সেশনগুলি একটি বাহ্যিক প্রক্রিয়া (ডেবিয়ান, উবুন্টুর অধীনে ক্রন ...) দ্বারা পরিষ্কার করা হয়েছে বলে মনে হচ্ছে, সম্ভবত প্রতিটি <b>%s</span <span class='notranslate'></b> সেকেন্ড (= প্যারামিটারের মান <b>session.gc_maxlifetimeb09a4b739fz8 , তাই এখানে মান পরিবর্তনের কোন প্রভাব নেই। আপনাকে অবশ্যই সার্ভার অ্যাডমিনিস্ট্রেটরকে সেশন বিলম্ব পরিবর্তন করতে বলতে হবে।
+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=উপলব্ধ ট্রিগার
 TriggersDesc=ট্রিগার হল এমন ফাইল যা <b>htdocs/core/triggers</b>-এ কপি করা হলে Dolibarr ওয়ার্কফ্লো-এর আচরণ পরিবর্তন করবে। তারা নতুন কর্ম উপলব্ধি করে, ডলিবার ইভেন্টগুলিতে সক্রিয় (নতুন কোম্পানি তৈরি, চালান বৈধতা, ...)।
 TriggerDisabledByName=এই ফাইলের ট্রিগারগুলি তাদের নামের <b>-NORUN</b> প্রত্যয় দ্বারা অক্ষম করা হয়েছে৷
@@ -1321,7 +1322,7 @@ PreviousDumpFiles=বিদ্যমান ব্যাকআপ ফাইল
 PreviousArchiveFiles=বিদ্যমান সংরক্ষণাগার ফাইল
 WeekStartOnDay=সপ্তাহের প্রথম দিন
 RunningUpdateProcessMayBeRequired=আপগ্রেড প্রক্রিয়া চালানো প্রয়োজন বলে মনে হচ্ছে (প্রোগ্রাম সংস্করণ %s ডেটাবেস সংস্করণ %s থেকে আলাদা)
-YouMustRunCommandFromCommandLineAfterLoginToUser=ব্যবহারকারী <b>%s</b> এর সাথে একটি শেলে লগইন করার পরে আপনাকে কমান্ড লাইন থেকে এই কমান্ডটি চালাতে হবে  অথবা আপনাকে <b>%s<span class='notranslate' প্রদান করতে কমান্ড লাইনের শেষে -W বিকল্প যোগ করতে হবে '></b></span> পাসওয়ার্ড।
+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 ফাংশন উপলব্ধ নয়
 DownloadMoreSkins=আরো স্কিন ডাউনলোড করতে
 SimpleNumRefModelDesc=%s yymm-nnnn ফর্ম্যাটে রেফারেন্স নম্বর ফেরত দেয় যেখানে yy হল বছর, mm হল মাস এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা রিসেট ছাড়াই
@@ -1372,7 +1373,7 @@ TranslationSetup=অনুবাদের সেটআপ
 TranslationKeySearch=একটি অনুবাদ কী বা স্ট্রিং অনুসন্ধান করুন
 TranslationOverwriteKey=একটি অনুবাদ স্ট্রিং ওভাররাইট করুন
 TranslationDesc=ডিসপ্লে ভাষা কিভাবে সেট করবেন:<br>* ডিফল্ট/সিস্টেমওয়াইড: মেনু <strong>হোম -> সেটআপ -> ডিসপ্লে</strong><br>* প্রতি ব্যবহারকারী: স্ক্রিনের শীর্ষে থাকা ব্যবহারকারীর নামটিতে ক্লিক করুন এবং <strong> span>ইউজার কার্ডে ইউজার ডিসপ্লে সেটআপ</strong> ট্যাব।
-TranslationOverwriteDesc=আপনি নিম্নলিখিত সারণী পূরণ করে স্ট্রিং ওভাররাইড করতে পারেন। "%s" ড্রপডাউন থেকে আপনার ভাষা চয়ন করুন, "%s"-এ অনুবাদ কী স্ট্রিং ঢোকান এবং "<span এ আপনার নতুন অনুবাদ করুন class='notranslate'>%s</span>"
+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=কোন অনুবাদ কী ব্যবহার করতে হবে তা জানার জন্য আপনি অন্য ট্যাবটি ব্যবহার করতে পারেন
 TranslationString=অনুবাদ স্ট্রিং
 CurrentTranslationString=বর্তমান অনুবাদ স্ট্রিং
@@ -1663,7 +1664,7 @@ LDAPDescUsers=এই পৃষ্ঠাটি আপনাকে ডলিবা
 LDAPDescGroups=এই পৃষ্ঠাটি আপনাকে ডলিবার গ্রুপে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
 LDAPDescMembers=এই পৃষ্ঠাটি আপনাকে ডলিবার সদস্য মডিউলে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
 LDAPDescMembersTypes=এই পৃষ্ঠাটি আপনাকে LDAP ট্রিতে LDAP অ্যাট্রিবিউটের নাম সংজ্ঞায়িত করতে দেয় যা Dolibarr সদস্যদের প্রকারে পাওয়া প্রতিটি ডেটার জন্য।
-LDAPDescValues=উদাহরণ মানগুলি <b>OpenLDAP</b>-এর জন্য নিম্নলিখিত লোড করা স্কিমাগুলির সাথে ডিজাইন করা হয়েছে: b0aee8365>b0aee83365 core.schema, cosine.schema, inetorgperson.schema<span class='notranslate'></b>)। আপনি যদি সেই মানগুলি এবং OpenLDAP ব্যবহার করেন, আপনার LDAP কনফিগারেশন ফাইলটি পরিবর্তন করুন <b>slapd.conf</b> এই সমস্ত স্কিমা লোড করতে।
+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=একটি প্রমাণীকৃত অ্যাক্সেসের জন্য (উদাহরণস্বরূপ একটি লেখার অ্যাক্সেসের জন্য)
 PerfDolibarr=কর্মক্ষমতা সেটআপ/অপ্টিমাইজিং রিপোর্ট
 YouMayFindPerfAdviceHere=এই পৃষ্ঠাটি কর্মক্ষমতা সম্পর্কিত কিছু চেক বা পরামর্শ প্রদান করে।
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=এর চেয়ে পুরানো ইভেন্ট
 SecurityKey = নিরাপত্তা কী
 ##### ClickToDial #####
 ClickToDialSetup=মডিউল সেটআপ ডায়াল করতে ক্লিক করুন
-ClickToDialUrlDesc=ফোন পিক্টোতে ক্লিক করলে URL বলা হয়। URL-এ, আপনি ট্যাগগুলি ব্যবহার করতে পারেন<br><b>__PHONETO__</b> হবে কল করার জন্য ব্যক্তির ফোন নম্বর দিয়ে প্রতিস্থাপিত হয়েছে<br><b>__PHONEFROM__</b> কল করা ব্যক্তির (আপনার) ফোন নম্বর দিয়ে প্রতিস্থাপিত হবে<br><b>__LOGIN__b09a4b739f17f span> যা ক্লিকটোডিয়াল লগইন দিয়ে প্রতিস্থাপিত হবে (ব্যবহারকারী কার্ডে সংজ্ঞায়িত)<span class='notranslate'><br><b>__PASS__ </b> যা ক্লিকটোডিয়াল পাসওয়ার্ড দিয়ে প্রতিস্থাপিত হবে (ব্যবহারকারী কার্ডে সংজ্ঞায়িত)।
+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=এই মডিউলটি একটি ডেস্কটপ কম্পিউটার ব্যবহার করার সময় ফোন নম্বরগুলিকে ক্লিকযোগ্য লিঙ্কগুলিতে পরিবর্তন করে। একটি ক্লিক নম্বরে কল করবে। এটি আপনার ডেস্কটপে একটি নরম ফোন ব্যবহার করার সময় বা উদাহরণস্বরূপ SIP প্রোটোকলের উপর ভিত্তি করে একটি CTI সিস্টেম ব্যবহার করার সময় ফোন কল শুরু করতে ব্যবহার করা যেতে পারে। দ্রষ্টব্য: স্মার্টফোন ব্যবহার করার সময়, ফোন নম্বরগুলি সর্বদা ক্লিকযোগ্য।
 ClickToDialUseTelLink=ফোন নম্বরগুলিতে শুধুমাত্র একটি লিঙ্ক "টেল:" ব্যবহার করুন৷
 ClickToDialUseTelLinkDesc=এই পদ্ধতিটি ব্যবহার করুন যদি আপনার ব্যবহারকারীদের একটি সফ্টফোন বা একটি সফ্টওয়্যার ইন্টারফেস থাকে, ব্রাউজার হিসাবে একই কম্পিউটারে ইনস্টল করা হয় এবং আপনি যখন আপনার ব্রাউজারে "tel:" দিয়ে শুরু হওয়া একটি লিঙ্কে ক্লিক করেন তখন কল করা হয়৷ আপনার যদি "sip:" বা একটি সম্পূর্ণ সার্ভার সমাধান (স্থানীয় সফ্টওয়্যার ইনস্টলেশনের প্রয়োজন নেই) দিয়ে শুরু হয় এমন একটি লিঙ্কের প্রয়োজন হলে, আপনাকে অবশ্যই এটি "না" তে সেট করতে হবে এবং পরবর্তী ক্ষেত্রটি পূরণ করতে হবে।
@@ -1920,8 +1921,8 @@ IfSetToYesDontForgetPermission=যদি একটি নন-নাল মান
 GeoIPMaxmindSetup=জিওআইপি ম্যাক্সমাইন্ড মডিউল সেটআপ
 PathToGeoIPMaxmindCountryDataFile=ম্যাক্সমাইন্ড আইপি থেকে দেশের অনুবাদ ধারণকারী ফাইলের পথ
 NoteOnPathLocation=মনে রাখবেন যে আপনার আইপি টু কান্ট্রি ডেটা ফাইলটি আপনার PHP পড়তে পারে এমন একটি ডিরেক্টরির মধ্যে থাকা আবশ্যক (আপনার PHP open_basedir সেটআপ এবং ফাইল সিস্টেমের অনুমতি পরীক্ষা করুন)।
-YouCanDownloadFreeDatFileTo=আপনি ম্যাক্সমাইন্ড জিওআইপি কান্ট্রি ফাইলের একটি <b>ফ্রি ডেমো সংস্করণ</b> ডাউনলোড করতে পারেন <span class='notranslate'>b0ecb2ecz87f4<span class='notranslate'> /span>।
-YouCanDownloadAdvancedDatFileTo=এছাড়াও আপনি আরও <b>সম্পূর্ণ সংস্করণ ডাউনলোড করতে পারেন, আপডেট সহ, <span class=' এ Maxmind GeoIP কান্ট্রি ফাইলের</b> notranslate'>%s</span>.
+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=একটি রূপান্তর আইপি পরীক্ষা -> দেশ
 ##### Projects #####
 ProjectsNumberingModules=প্রজেক্ট নম্বরিং মডিউল
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=নিম্নলিখিত কার
 SomethingMakeInstallFromWebNotPossible2=এই কারণে, এখানে বর্ণিত আপগ্রেড করার প্রক্রিয়াটি একটি ম্যানুয়াল প্রক্রিয়া শুধুমাত্র একজন বিশেষ সুবিধাপ্রাপ্ত ব্যবহারকারী সম্পাদন করতে পারেন।
 InstallModuleFromWebHasBeenDisabledContactUs=অ্যাপ্লিকেশন থেকে বাহ্যিক মডিউল বা গতিশীল ওয়েবসাইটগুলির ইনস্টল বা বিকাশ বর্তমানে নিরাপত্তার উদ্দেশ্যে লক করা আছে। আপনি যদি এই বৈশিষ্ট্যটি সক্ষম করতে চান তাহলে অনুগ্রহ করে আমাদের সাথে যোগাযোগ করুন৷
 InstallModuleFromWebHasBeenDisabledByFile=অ্যাপ্লিকেশন থেকে বহিরাগত মডিউল ইনস্টল আপনার প্রশাসক দ্বারা নিষ্ক্রিয় করা হয়েছে. এটির অনুমতি দেওয়ার জন্য আপনাকে অবশ্যই তাকে <strong>%s</strong> ফাইলটি সরাতে বলতে হবে বৈশিষ্ট্য
-ConfFileMustContainCustom=অ্যাপ্লিকেশন থেকে একটি বাহ্যিক মডিউল ইনস্টল বা নির্মাণ করার জন্য মডিউল ফাইলগুলিকে <strong>%s ডিরেক্টরিতে সংরক্ষণ করতে হবে </strong>. Dolibarr দ্বারা এই ডিরেক্টরিটি প্রক্রিয়া করার জন্য, আপনাকে অবশ্যই আপনার <strong>conf/conf.php</strong> সেটআপ করতে হবে 2টি নির্দেশিক লাইন যোগ করতে: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a65dc><span><span class='notranslate'>b0a65d0 ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49fzmto '></strong></span>
+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=মাউস সরে গেলে টেবিল লাইন হাইলাইট করুন
 HighlightLinesColor=মাউস অতিক্রম করার সময় লাইনের রঙ হাইলাইট করুন (হাইলাইট না করার জন্য 'ffffff' ব্যবহার করুন)
 HighlightLinesChecked=যখন এটি চেক করা হয় তখন লাইনের রঙ হাইলাইট করুন (কোন হাইলাইটের জন্য 'ffffff' ব্যবহার করুন)
@@ -2065,7 +2066,7 @@ DetectionNotPossible=সনাক্তকরণ সম্ভব নয়
 UrlToGetKeyToUseAPIs=API ব্যবহার করার জন্য টোকেন পেতে Url (একবার টোকেন প্রাপ্ত হলে এটি ডাটাবেস ব্যবহারকারী টেবিলে সংরক্ষিত হয় এবং প্রতিটি API কলে অবশ্যই প্রদান করতে হবে)
 ListOfAvailableAPIs=উপলব্ধ API-এর তালিকা
 activateModuleDependNotSatisfied=মডিউল "%s" মডিউল "%s" এর উপর নির্ভর করে, এটি অনুপস্থিত, তাই মডিউল " %1$s" সঠিকভাবে কাজ নাও করতে পারে। আপনি যদি কোনো বিস্ময় থেকে নিরাপদ থাকতে চান তাহলে অনুগ্রহ করে "%2$s" মডিউল ইনস্টল করুন বা "%1$s" মডিউলটি নিষ্ক্রিয় করুন
-CommandIsNotInsideAllowedCommands=আপনি যে কমান্ডটি চালানোর চেষ্টা করছেন সেটি প্যারামিটারে সংজ্ঞায়িত অনুমোদিত কমান্ডের তালিকায় নেই <strong>$dolibarr_main_restrict_os_commands</strong> class='notranslate'><strong></span>conf.php</strong> ফাইল।
+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=অবতরণ পাতা
 SamePriceAlsoForSharedCompanies=আপনি যদি একটি মাল্টিকোম্পানি মডিউল ব্যবহার করেন, "একক মূল্য" পছন্দের সাথে, পণ্যগুলি পরিবেশের মধ্যে ভাগ করা হলে মূল্যও সমস্ত কোম্পানির জন্য একই হবে
 ModuleEnabledAdminMustCheckRights=মডিউল সক্রিয় করা হয়েছে. সক্রিয় মডিউল (গুলি) জন্য অনুমতি শুধুমাত্র প্রশাসক ব্যবহারকারীদের দেওয়া হয়েছে. প্রয়োজনে আপনাকে অন্য ব্যবহারকারী বা গোষ্ঠীকে ম্যানুয়ালি অনুমতি দিতে হতে পারে।
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=APIs মডিউল সক্রিয় করা নেই
 YouShouldSetThisToOff=আপনার এটি 0 বা বন্ধ করা উচিত
 InstallAndUpgradeLockedBy=<b>%s</b> ফাইল দ্বারা ইনস্টল এবং আপগ্রেডগুলি লক করা আছে
 InstallLockedBy=<b>%s</b> ফাইল দ্বারা ইনস্টল/পুনঃইনস্টল লক করা আছে
-InstallOfAddonIsNotBlocked=অ্যাডঅনগুলির ইনস্টলেশন লক করা হয় না। একটি ফাইল তৈরি করুন <b>installmodules.lock</b> ডিরেক্টরিতে b0aee8365837><span class="fz0" ='notranslate'>%s</b> বহিরাগত অ্যাডঅন/মডিউলগুলির ইনস্টলেশন ব্লক করতে।
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=পুরানো বাস্তবায়ন
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=যদি কিছু অনলাইন পেমেন্ট মডিউল সক্ষম করা থাকে (পেপাল, স্ট্রাইপ, ...), অনলাইন পেমেন্ট করতে PDF এ একটি লিঙ্ক যোগ করুন
 DashboardDisableGlobal=বিশ্বব্যাপী খোলা বস্তুর সমস্ত থাম্ব অক্ষম করুন
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=ডিফল্টরূপে 
 CSSPage=CSS শৈলী
 Defaultfortype=ডিফল্ট
 DefaultForTypeDesc=টেমপ্লেট প্রকারের জন্য একটি নতুন ইমেল তৈরি করার সময় ডিফল্টরূপে ব্যবহৃত টেমপ্লেট
-OptionXShouldBeEnabledInModuleY=বিকল্প "<b>%s</b>" মডিউল <span মডিউলে সক্ষম করা উচিত ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=বিকল্প "<b>%s</b>" মডিউল <span= ক্লাসে সক্ষম করা হয়েছে 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=অন লাইন স্বাক্ষরের অনুমতি দিন
 AtBottomOfPage=পৃষ্ঠার নীচে
 FailedAuth=ব্যর্থ প্রমাণীকরণ
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/bn_IN/agenda.lang b/htdocs/langs/bn_IN/agenda.lang
index 428bfe379a1..ebeb135987b 100644
--- a/htdocs/langs/bn_IN/agenda.lang
+++ b/htdocs/langs/bn_IN/agenda.lang
@@ -137,8 +137,8 @@ DateActionEnd=শেষ তারিখ
 AgendaUrlOptions1=আপনি ফিল্টার আউটপুট নিম্নলিখিত পরামিতি যোগ করতে পারেন:
 AgendaUrlOptions3=<b>logina=%s</b> ব্যবহারকারীর মালিকানাধীন ক্রিয়াকলাপগুলিতে আউটপুট সীমাবদ্ধ করতে <b>%s</b>।
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> আউটপুটকে নিজের নয় এমন ক্রিয়াগুলিতে সীমাবদ্ধ করতে ব্যবহারকারী <b>%s</b>।
-AgendaUrlOptions4=<b>logint=%s</b> ব্যবহারকারীকে <অর্পণ করা কর্মগুলিতে আউটপুট সীমাবদ্ধ করতে span class='notranslate'><b></span>%s</b> (মালিক এবং অন্যান্য)।
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> প্রজেক্টের সাথে লিঙ্ক করা ক্রিয়াকলাপের আউটপুট সীমাবদ্ধ করতে b0aee85>b0aee83333 __PROJECT_ID__<span class='notranslate'></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>।
 AgendaUrlOptionsIncludeHolidays=ছুটির ইভেন্টগুলি অন্তর্ভুক্ত করতে <b>includeholidays=1</b>।
 AgendaShowBirthdayEvents=পরিচিতির জন্মদিন
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index a32ea9fdad5..cacd3451678 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=অভ্যন্তরীণ স্থানান্
 TransferDesc=এক অ্যাকাউন্ট থেকে অন্য অ্যাকাউন্টে স্থানান্তর করতে অভ্যন্তরীণ স্থানান্তর ব্যবহার করুন, অ্যাপ্লিকেশন দুটি রেকর্ড লিখবে: উত্স অ্যাকাউন্টে একটি ডেবিট এবং লক্ষ্য অ্যাকাউন্টে একটি ক্রেডিট। এই লেনদেনের জন্য একই পরিমাণ, লেবেল এবং তারিখ ব্যবহার করা হবে।
 TransferFrom=থেকে
 TransferTo=প্রতি
-TransferFromToDone=<b>%s</b> থেকে <span class='notranslate' এ স্থানান্তর b0aee83365837fz<b>%s</b> 'notranslate'>%s</span></b> %s রেকর্ড করা হয়েছে৷
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=প্রেরক
 ValidateCheckReceipt=এই চেক রসিদ বৈধ?
 ConfirmValidateCheckReceipt=আপনি কি নিশ্চিত যে আপনি যাচাইকরণের জন্য এই চেকের রসিদ জমা দিতে চান? একবার যাচাই করা হলে কোন পরিবর্তন সম্ভব হবে না।
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
index c0b60874fc6..bdf02b434fd 100644
--- a/htdocs/langs/bn_IN/bills.lang
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -377,7 +377,7 @@ DisabledBecauseReplacedInvoice=চালান প্রতিস্থাপন
 DescTaxAndDividendsArea=এই এলাকাটি বিশেষ খরচের জন্য করা সমস্ত অর্থপ্রদানের সারাংশ উপস্থাপন করে। শুধুমাত্র নির্দিষ্ট বছরে পেমেন্ট সহ রেকর্ডগুলি এখানে অন্তর্ভুক্ত করা হয়েছে।
 NbOfPayments=পেমেন্ট সংখ্যা
 SplitDiscount=দুই ভাগে ডিসকাউন্ট বিভক্ত
-ConfirmSplitDiscount=আপনি কি নিশ্চিত যে আপনি <b>%s</b> এই ছাড়টি ভাগ করতে চান span class='notranslate'>%s</span> দুটি ছোট ডিসকাউন্টে?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=দুটি অংশের প্রতিটির জন্য ইনপুট পরিমাণ:
 TotalOfTwoDiscountMustEqualsOriginal=মোট দুটি নতুন ডিসকাউন্ট মূল ছাড়ের পরিমাণের সমান হতে হবে।
 ConfirmRemoveDiscount=আপনি কি এই ছাড় সরানোর বিষয়ে নিশ্চিত?
@@ -614,7 +614,7 @@ invoiceLineProgressError=ইনভয়েস লাইনের অগ্র
 updatePriceNextInvoiceErrorUpdateline=ত্রুটি: চালান লাইনে মূল্য আপডেট করুন: %s
 ToCreateARecurringInvoice=এই চুক্তির জন্য একটি পুনরাবৃত্ত চালান তৈরি করতে, প্রথমে এই ড্রাফ্ট চালানটি তৈরি করুন, তারপর এটিকে একটি চালান টেমপ্লেটে রূপান্তর করুন এবং ভবিষ্যতের চালানগুলির প্রজন্মের জন্য ফ্রিকোয়েন্সি সংজ্ঞায়িত করুন৷
 ToCreateARecurringInvoiceGene=নিয়মিত এবং ম্যানুয়ালি ভবিষ্যত চালান তৈরি করতে, শুধু মেনুতে যান <strong>%s - b0ecb2ecz80 span> - %s</strong>৷
-ToCreateARecurringInvoiceGeneAuto=আপনার যদি এই ধরনের চালানগুলি স্বয়ংক্রিয়ভাবে তৈরি করতে হয়, তাহলে আপনার প্রশাসককে <strong>%s<span class='notranslate' মডিউল সক্ষম এবং সেটআপ করতে বলুন '></strong></span>। নোট করুন যে উভয় পদ্ধতি (ম্যানুয়াল এবং স্বয়ংক্রিয়) একসাথে ব্যবহার করা যেতে পারে নকলের ঝুঁকি ছাড়াই।
+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=টেমপ্লেট চালান মুছুন
 ConfirmDeleteRepeatableInvoice=আপনি কি নিশ্চিত আপনি টেমপ্লেট চালান মুছে ফেলতে চান?
 CreateOneBillByThird=তৃতীয় পক্ষের প্রতি একটি চালান তৈরি করুন (অন্যথায়, নির্বাচিত বস্তু প্রতি একটি চালান)
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index 24562c4ed3e..2a6101efd74 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=অনেক পরামিতি সহ শক
 ByTerminal=টার্মিনাল দ্বারা
 TakeposNumpadUsePaymentIcon=নমপ্যাডের পেমেন্ট বোতামে টেক্সটের পরিবর্তে আইকন ব্যবহার করুন
 CashDeskRefNumberingModules=POS বিক্রয়ের জন্য সংখ্যায়ন মডিউল
-CashDeskGenericMaskCodes6 = <br><b>{TN}b09f870<span class='notranslate' টার্মিনাল নম্বর যোগ করতে span> ট্যাগ ব্যবহার করা হয়
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=একই পণ্যের লাইন মার্জ করুন
 StartAParallelSale=একটি নতুন সমান্তরাল বিক্রয় শুরু করুন
 SaleStartedAt=%s এ বিক্রি শুরু হয়েছে
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index f2498552d18..c6badb47fe6 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -335,13 +335,13 @@ CompanyHasRelativeDiscount=এই গ্রাহকের ডিফল্ট 
 CompanyHasNoRelativeDiscount=এই গ্রাহকের ডিফল্টরূপে কোন আপেক্ষিক ডিসকাউন্ট নেই
 HasRelativeDiscountFromSupplier=আপনার ডিফল্ট ডিসকাউন্ট <b>%s%%</b> এই বিক্রেতার সাথে
 HasNoRelativeDiscountFromSupplier=এই বিক্রেতার সাথে কোন ডিফল্ট আপেক্ষিক ডিসকাউন্ট
-CompanyHasAbsoluteDiscount=এই গ্রাহকের <b>%sb09a4b739f17fz0এর জন্য ডিসকাউন্ট উপলব্ধ (ক্রেডিট নোট বা ডাউন পেমেন্ট) span> <span class='notranslate'>%s
-CompanyHasDownPaymentOrCommercialDiscount=এই গ্রাহকের <b>%s</b>এর জন্য ডিসকাউন্ট উপলব্ধ (বাণিজ্যিক, ডাউন পেমেন্ট) > <span class='notranslate'>%s
-CompanyHasCreditNote=এই গ্রাহকের কাছে এখনও <b>%s</b> <span class= এর ক্রেডিট নোট রয়েছে 'notranslate'>%s</span>
+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=এই বিক্রেতা থেকে কোন ডিসকাউন্ট/ক্রেডিট উপলব্ধ
-HasAbsoluteDiscountFromSupplier=<b>%s</b>এর জন্য আপনার কাছে ছাড় রয়েছে (ক্রেডিট নোট বা ডাউন পেমেন্ট) > <span class='notranslate'>%s এই বিক্রেতার কাছ থেকে
-HasDownPaymentOrCommercialDiscountFromSupplier=<b>%s</b>এর জন্য আপনার কাছে ছাড় রয়েছে (বাণিজ্যিক, ডাউন পেমেন্ট) এই বিক্রেতার কাছ থেকে <span class='notranslate'>%s
-HasCreditNoteFromSupplier=আপনার কাছে <b>%s</b> <span class='notranslate'-এর ক্রেডিট নোট রয়েছে '>%s</span> এই বিক্রেতা থেকে
+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=এই গ্রাহকের কোন ডিসকাউন্ট ক্রেডিট উপলব্ধ নেই
 CustomerAbsoluteDiscountAllUsers=নিখুঁত গ্রাহক ছাড় (সমস্ত ব্যবহারকারীদের দ্বারা প্রদত্ত)
 CustomerAbsoluteDiscountMy=সম্পূর্ণ গ্রাহক ছাড় (নিজের দ্বারা প্রদত্ত)
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index c99bf141940..3b7ab56d921 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -158,27 +158,27 @@ ConfirmDeleteVAT=আপনি কি এই ভ্যাট ঘোষণা ম
 ConfirmDeleteSalary=আপনি কি এই বেতন মুছে ফেলার বিষয়ে নিশ্চিত?
 ConfirmDeleteVariousPayment=আপনি কি এই বিভিন্ন অর্থপ্রদান মুছে ফেলার বিষয়ে নিশ্চিত?
 ExportDataset_tax_1=সামাজিক এবং রাজস্ব ট্যাক্স এবং পেমেন্ট
-CalcModeVATDebt=মোড <b>%sকমিটমেন্ট অ্যাকাউন্টিংয়ের উপর ভ্যাট%s<span class='notranslate' '></b></span>।
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=মোড <b>%sআয়-ব্যয়ের উপর ভ্যাট%s</b>.
 CalcModeDebt=পরিচিত নথিভুক্ত নথি বিশ্লেষণ
 CalcModeEngagement=পরিচিত নথিভুক্ত পেমেন্ট বিশ্লেষণ
 CalcModePayment=পরিচিত নথিভুক্ত পেমেন্ট বিশ্লেষণ
 CalcModeBookkeeping=বুককিপিং লেজার টেবিলে জার্নালাইজ করা ডেটা বিশ্লেষণ।
 CalcModeNoBookKeeping=এমনকি যদি তারা এখনও লেজারে হিসাব না করে থাকে
-CalcModeLT1= মোড <b>%sগ্রাহকের চালানের উপর RE - সরবরাহকারীদের চালানb0ecb2ec87f><span class0 ='notranslate'></b></span>
-CalcModeLT1Debt=মোড <b>%sগ্রাহকের চালানে RE%s<span class='notranslate' '></b></span>
-CalcModeLT1Rec= মোড <b>%sসাপ্লায়ার ইনভয়েসে RE%s<span class='notranslate' '></b></span>
-CalcModeLT2= মোড <b>%sগ্রাহকের চালানে IRPF - সরবরাহকারীদের চালানb0ecb2ec87f><span class0 ='notranslate'></b></span>
-CalcModeLT2Debt=মোড <b>%sগ্রাহকের চালানে IRPF%s<span class='notranslate' '></b></span>
+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= মোড <b>%sসাপ্লায়ার ইনভয়েসগুলিতে IRPF%s<translate class=translate '></b></span>
 AnnualSummaryDueDebtMode=আয় এবং ব্যয়ের ভারসাম্য, বার্ষিক সারাংশ
 AnnualSummaryInputOutputMode=আয় এবং ব্যয়ের ভারসাম্য, বার্ষিক সারাংশ
 AnnualByCompanies=অ্যাকাউন্টের পূর্বনির্ধারিত গোষ্ঠী দ্বারা আয় এবং ব্যয়ের ভারসাম্য
 AnnualByCompaniesDueDebtMode=আয় এবং ব্যয়ের ভারসাম্য, পূর্বনির্ধারিত গোষ্ঠী দ্বারা বিশদ, মোড <b>%sদাবি-ঋণb0ecb2ec8080 </b> বলেছে <b>কমিটমেন্ট অ্যাকাউন্টিং</b>।
 AnnualByCompaniesInputOutputMode=আয় এবং ব্যয়ের ভারসাম্য, পূর্বনির্ধারিত গোষ্ঠী দ্বারা বিশদ, মোড <b>%sআয়-ব্যয়b0ecb2ecz80 </b> বলেছেন <b>নগদ হিসাব</b>।
-SeeReportInInputOutputMode=<b>%sপেমেন্টের বিশ্লেষণ দেখুন%s<span class='notranslate' <b>রেকর্ড করা পেমেন্ট</b> এর উপর ভিত্তি করে গণনার জন্য ></b></span> এমনকি যদি সেগুলি এখনও এল একাউন্টে না থাকে
-SeeReportInDueDebtMode=<b>%sলিপিবদ্ধ নথির বিশ্লেষণ দেখুন%s<span class='notranslate' '></b></span> পরিচিত <b>লিপিবদ্ধ নথি</b> একাউন্টে না থাকলেও একটি গণনার জন্য
-SeeReportInBookkeepingMode=দেখুন <b>%sখাতা খাতা টেবিলের বিশ্লেষণ%s<span><span> notranslate'></b></span> <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 bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- সমস্ত ট্যাক্স সহ দেখানো পরিমাণ
 RulesAmountWithTaxExcluded=- সমস্ত ট্যাক্স বাদ দিয়ে দেখানো চালানের পরিমাণ
 RulesResultDue=- এতে সমস্ত ইনভয়েস, খরচ, ভ্যাট, অনুদান, বেতন অন্তর্ভুক্ত থাকে, সেগুলি দেওয়া হোক বা না হোক।<br>- এটি চালানের বিলিংয়ের তারিখ এবং নির্ধারিত তারিখের উপর ভিত্তি করে খরচ বা ট্যাক্স পেমেন্ট। বেতনের জন্য, মেয়াদ শেষ হওয়ার তারিখ ব্যবহার করা হয়।
@@ -213,7 +213,7 @@ LT2ReportByQuarters=হার দ্বারা রিপোর্ট কর 3
 LT1ReportByQuartersES=RE হার দ্বারা রিপোর্ট
 LT2ReportByQuartersES=IRPF হার দ্বারা রিপোর্ট
 SeeVATReportInInputOutputMode=প্রতিবেদন দেখুন <b>%sভ্যাট সংগ্রহ%s</b> একটি আদর্শ গণনার জন্য
-SeeVATReportInDueDebtMode=রিপোর্ট দেখুন <b>%sডেবিটের উপর ভ্যাট%s<span class='notranslate' চালানে একটি বিকল্প সহ একটি গণনার জন্য '></b></span>
+SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
 RulesVATInServices=- পরিষেবাগুলির জন্য, প্রতিবেদনে অর্থপ্রদানের তারিখের ভিত্তিতে প্রকৃতপক্ষে প্রাপ্ত অর্থপ্রদানের ভ্যাট অন্তর্ভুক্ত থাকে।
 RulesVATInProducts=- বস্তুগত সম্পদের জন্য, প্রতিবেদনে অর্থপ্রদানের তারিখের ভিত্তিতে ভ্যাট অন্তর্ভুক্ত থাকে।
 RulesVATDueServices=- পরিষেবার জন্য, প্রতিবেদনে ইনভয়েসের তারিখের উপর ভিত্তি করে, পরিশোধ করা বা না করা বকেয়া চালানের ভ্যাট অন্তর্ভুক্ত রয়েছে।
diff --git a/htdocs/langs/bn_IN/cron.lang b/htdocs/langs/bn_IN/cron.lang
index 3f03cd9dd5c..59f78a4fac1 100644
--- a/htdocs/langs/bn_IN/cron.lang
+++ b/htdocs/langs/bn_IN/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = নির্ধারিত চাকরি পড়ুন
 Permission23102 = নির্ধারিত কাজ তৈরি/আপডেট করুন
 Permission23103 = নির্ধারিত কাজ মুছুন
@@ -64,7 +63,7 @@ CronTaskInactive=এই কাজটি অক্ষম (নির্ধার
 CronId=আইডি
 CronClassFile=ক্লাস সহ ফাইলের নাম
 CronModuleHelp=Dolibarr মডিউল ডিরেক্টরির নাম (এছাড়াও বহিরাগত Dolibarr মডিউলের সাথে কাজ করে)। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য </span>/class/product.class.php, মডিউলের মান হল<br><i>পণ্য</i>
-CronClassFileHelp=লোড করার জন্য আপেক্ষিক পাথ এবং ফাইলের নাম (পাথটি ওয়েব সার্ভার রুট ডিরেক্টরির সাথে সম্পর্কিত)। <BR> উদাহরণস্বরূপ Dolibarr পণ্য বস্তু htdocs/product/class/<u>product.class.php<span এর আনয়ন পদ্ধতি কল করতে class='notranslate'></u></span>, ক্লাস ফাইল নামের মান হল<br><i>পণ্য/শ্রেণী/পণ্য .class.php</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=লোড করার জন্য বস্তুর নাম। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য /htdocs/product/class/product.class.php, ক্লাস ফাইল নামের মান হল<br><i>পণ্য</i>
 CronMethodHelp=লঞ্চ করার জন্য অবজেক্ট পদ্ধতি। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতিকে কল করার জন্য /htdocs/product/class/product.class.php, পদ্ধতির মান হল <br><i>আনয়ন</i>
 CronArgsHelp=পদ্ধতি আর্গুমেন্ট. <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য /htdocs/product/class/product.class.php, প্যারামিটারের মান হতে পারে<br><i>0, ProductRef</i>
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 73bc9be1499..3ec24e29aae 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -15,12 +15,12 @@ ErrorGroupAlreadyExists=গ্রুপ %s ইতিমধ্যেই বিদ
 ErrorEmailAlreadyExists=ইমেল %s ইতিমধ্যেই বিদ্যমান।
 ErrorRecordNotFound=রেকর্ড পাওয়া যায়নি।
 ErrorRecordNotFoundShort=পাওয়া যায়নি
-ErrorFailToCopyFile='<b>%s</b>' ফাইলটি '<span ক্লাসে অনুলিপি করতে ব্যর্থ হয়েছে ='notranslate'><b></span>%s</b>'।
-ErrorFailToCopyDir='<b>%s</b>' '<span ক্লাসে' ডিরেক্টরি অনুলিপি করতে ব্যর্থ হয়েছে ='notranslate'><b></span>%s</b>'।
-ErrorFailToRenameFile='<b>%s</b>' ফাইলের নাম পরিবর্তন করতে ব্যর্থ হয়েছে '<span ক্লাসে' ='notranslate'><b></span>%s</b>'।
+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='<b>%s</b>' ফাইল সরাতে ব্যর্থ হয়েছে৷
 ErrorFailToCreateFile='<b>%s</b>' ফাইল তৈরি করতে ব্যর্থ হয়েছে৷
-ErrorFailToRenameDir='<b>%s</b>'কে '<span ক্লাসে' নামকরণ করতে ব্যর্থ হয়েছে ='notranslate'><b></span>%s</b>'।
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir='<b>%s</b>' ডিরেক্টরি তৈরি করতে ব্যর্থ হয়েছে৷
 ErrorFailToDeleteDir='<b>%s</b>' ডিরেক্টরি মুছে ফেলতে ব্যর্থ হয়েছে৷
 ErrorFailToMakeReplacementInto='<b>%s</b>' ফাইলে প্রতিস্থাপন করতে ব্যর্থ হয়েছে৷
@@ -51,7 +51,7 @@ ErrorBadDateFormat=মান '%s' তারিখের বিন্যাস 
 ErrorWrongDate=তারিখ ঠিক হয়নি!
 ErrorFailedToWriteInDir=%s ডিরেক্টরিতে লিখতে ব্যর্থ হয়েছে
 ErrorFailedToBuildArchive=সংরক্ষণাগার ফাইল তৈরি করতে ব্যর্থ %s
-ErrorFoundBadEmailInFile=ফাইলে %s লাইনের জন্য ভুল ইমেল সিনট্যাক্স পাওয়া গেছে (উদাহরণ লাইন %s ইমেল=b0ecb2ecz87f<span class='notranslate'>b0ecb2ecz87f)
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=ব্যবহারকারী মুছে ফেলা যাবে না. হতে পারে এটি ডলিবার সত্তার সাথে যুক্ত।
 ErrorFieldsRequired=কিছু প্রয়োজনীয় ক্ষেত্র ফাঁকা রাখা হয়েছে।
 ErrorSubjectIsRequired=ইমেইল বিষয় প্রয়োজন
@@ -81,7 +81,7 @@ ErrorNoValueForRadioType=রেডিও তালিকার জন্য ম
 ErrorBadFormatValueList=তালিকার মানের একাধিক কমা থাকতে পারে না: <u>%s</u>, কিন্তু অন্তত একটি প্রয়োজন: কী, মান
 ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> ক্ষেত্রটিতে অবশ্যই বিশেষ অক্ষর থাকবে না।
 ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>%s</b> বিশেষ অক্ষর থাকা উচিত নয়, বড় হাতের অক্ষরও থাকবে না অক্ষর, এবং একটি বর্ণানুক্রমিক অক্ষর দিয়ে শুরু করতে হবে (a-z)
-ErrorFieldMustHaveXChar=<b>%s</b> ক্ষেত্রটিতে কমপক্ষে <span class=' থাকতে হবে notranslate'>%s</span> অক্ষর।
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
 ErrorNoAccountancyModuleLoaded=কোনো অ্যাকাউন্টেন্সি মডিউল সক্রিয় করা হয়নি
 ErrorExportDuplicateProfil=এই প্রোফাইল নামটি এই এক্সপোর্ট সেটের জন্য ইতিমধ্যেই বিদ্যমান।
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP মিল সম্পূর্ণ নয়।
@@ -95,9 +95,9 @@ ErrorModuleRequireJavascript=এই বৈশিষ্ট্যটি কাজ
 ErrorPasswordsMustMatch=উভয় টাইপ করা পাসওয়ার্ড একে অপরের সাথে মিলতে হবে
 ErrorContactEMail=একটি প্রযুক্তিগত ত্রুটি ঘটেছে. অনুগ্রহ করে, নিম্নলিখিত ইমেল <b>%s</b> করার জন্য প্রশাসকের সাথে যোগাযোগ করুন এবং ত্রুটি প্রদান করুন কোড <b>%s</b> আপনার বার্তায়, অথবা এর একটি স্ক্রিন কপি যোগ করুন এই পৃষ্ঠা.
 ErrorWrongValueForField=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' রেজেক্স নিয়মের সাথে মেলে না %s</b>
-ErrorHtmlInjectionForField=ক্ষেত্র <b>%s</b>: মান '<span class='notranslate' '><b></span>%s</b>' একটি দূষিত ডেটা রয়েছে অনুমোদিত নয়
-ErrorFieldValueNotIn=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' b0aee83z5</span class='notranslate' ক্ষেত্রে পাওয়া একটি মান নয় <span class='notranslate'><b> এর span><span class='notranslate'>%s</b> %s</span></b>
-ErrorFieldRefNotIn=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' একটি b0aee83f><span><span></span class='notranslate' নয় class='notranslate'>%s</b> বিদ্যমান রেফ
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+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
 ErrorMultipleRecordFoundFromRef=রেফ <b>%s</b> থেকে অনুসন্ধান করার সময় বেশ কিছু রেকর্ড পাওয়া গেছে। কোন আইডি ব্যবহার করবেন তা জানার উপায় নেই।
 ErrorsOnXLines=%s ত্রুটি পাওয়া গেছে
 ErrorFileIsInfectedWithAVirus=অ্যান্টিভাইরাস প্রোগ্রাম ফাইলটি যাচাই করতে সক্ষম হয়নি (ফাইলটি ভাইরাস দ্বারা সংক্রমিত হতে পারে)
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=পরীক্ষা করুন যে আপনি খ
 ErrorUserNotAssignedToTask=ব্যবহারকারীকে অবশ্যই কাজে নিযুক্ত করতে হবে যাতে সময় ব্যয় করা যায়।
 ErrorTaskAlreadyAssigned=টাস্ক ইতিমধ্যেই ব্যবহারকারীকে বরাদ্দ করা হয়েছে৷
 ErrorModuleFileSeemsToHaveAWrongFormat=মডিউল প্যাকেজ একটি ভুল বিন্যাস আছে বলে মনে হচ্ছে.
-ErrorModuleFileSeemsToHaveAWrongFormat2=মডিউলের জিপে অন্তত একটি বাধ্যতামূলক ডিরেক্টরি থাকতে হবে: <strong>%sb0a65d071f6fz90 অথবা <span class='notranslate'><strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=মডিউল প্যাকেজের নাম (<strong>%s</strong>) মেলে না প্রত্যাশিত নামের সিনট্যাক্স: <strong>%s</strong>
 ErrorDuplicateTrigger=ত্রুটি, ডুপ্লিকেট ট্রিগার নাম %s। ইতিমধ্যেই %s থেকে লোড করা হয়েছে৷
 ErrorNoWarehouseDefined=ত্রুটি, কোনো গুদাম সংজ্ঞায়িত করা নেই।
@@ -263,9 +263,9 @@ ErrorReplaceStringEmpty=ত্রুটি, প্রতিস্থাপন 
 ErrorProductNeedBatchNumber=ত্রুটি, পণ্য '<b>%s</b>' প্রচুর/ক্রমিক নম্বর প্রয়োজন
 ErrorProductDoesNotNeedBatchNumber=ত্রুটি, পণ্য '<b>%s</b>' অনেক কিছু গ্রহণ করে না/ ক্রমিক সংখ্যা
 ErrorFailedToReadObject=ত্রুটি, <b>%s</b> প্রকারের বস্তু পড়তে ব্যর্থ হয়েছে
-ErrorParameterMustBeEnabledToAllwoThisFeature=ত্রুটি, প্যারামিটার <b>%s</b> অবশ্যই <span class= এ সক্ষম হতে হবে 'notranslate'><b></span>conf/conf.php<> অভ্যন্তরীণ কাজের সময়সূচী দ্বারা কমান্ড লাইন ইন্টারফেস ব্যবহারের অনুমতি দিতে
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=ত্রুটি, এই লগইনটি বৈধতার তারিখ সীমার বাইরে
-ErrorValueLength='<b>%s</b>' ফিল্ডের দৈর্ঘ্য অবশ্যই '< এর থেকে বেশি হতে হবে span class='notranslate'><b></span>%s</b>'
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword='<b>%s</b>' শব্দটি একটি সংরক্ষিত কীওয়ার্ড
 ErrorFilenameReserved=ফাইলের নাম <b>%s</b> ব্যবহার করা যাবে না কারণ এটি একটি। সংরক্ষিত এবং সুরক্ষিত কমান্ড।
 ErrorNotAvailableWithThisDistribution=এই বিতরণের সাথে উপলব্ধ নয়
@@ -337,7 +337,7 @@ WarningParamUploadMaxFileSizeHigherThanPostMaxSize=আপনার PHP প্য
 WarningPasswordSetWithNoAccount=এই সদস্যের জন্য একটি পাসওয়ার্ড সেট করা হয়েছে৷ তবে কোনো ব্যবহারকারীর অ্যাকাউন্ট তৈরি হয়নি। তাই এই পাসওয়ার্ড সংরক্ষণ করা হয় কিন্তু Dolibarr লগইন করতে ব্যবহার করা যাবে না. এটি একটি বাহ্যিক মডিউল/ইন্টারফেস দ্বারা ব্যবহার করা যেতে পারে কিন্তু যদি আপনাকে কোনো সদস্যের জন্য কোনো লগইন বা পাসওয়ার্ড নির্ধারণ করতে না হয়, তাহলে আপনি সদস্য মডিউল সেটআপ থেকে "প্রতিটি সদস্যের জন্য একটি লগইন পরিচালনা করুন" বিকল্পটি নিষ্ক্রিয় করতে পারেন৷ আপনার যদি লগইন পরিচালনা করতে হয় কিন্তু কোনো পাসওয়ার্ডের প্রয়োজন না হয়, তাহলে এই সতর্কতা এড়াতে আপনি এই ক্ষেত্রটি খালি রাখতে পারেন। দ্রষ্টব্য: সদস্য যদি ব্যবহারকারীর সাথে সংযুক্ত থাকে তবে ইমেলটি লগইন হিসাবেও ব্যবহার করা যেতে পারে।
 WarningMandatorySetupNotComplete=প্রধান পরামিতি সেটআপ করতে এখানে ক্লিক করুন
 WarningEnableYourModulesApplications=আপনার মডিউল এবং অ্যাপ্লিকেশন সক্রিয় করতে এখানে ক্লিক করুন
-WarningSafeModeOnCheckExecDir=সতর্কতা, PHP বিকল্প <b>safe_mode</b> চালু আছে তাই php প্যারামিটার <span class=' দ্বারা ঘোষিত একটি ডিরেক্টরির মধ্যে কমান্ড সংরক্ষণ করা আবশ্যক notranslate'><b></span>safe_mode_exec_dir</b>৷
+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=এই শিরোনাম বা এই লক্ষ্য (URL) সহ একটি বুকমার্ক ইতিমধ্যেই বিদ্যমান৷
 WarningPassIsEmpty=সতর্কতা, ডাটাবেস পাসওয়ার্ড খালি। এটি একটি নিরাপত্তা গর্ত. আপনার ডাটাবেসে একটি পাসওয়ার্ড যোগ করা উচিত এবং এটি প্রতিফলিত করার জন্য আপনার conf.php ফাইল পরিবর্তন করা উচিত।
 WarningConfFileMustBeReadOnly=সতর্কতা, আপনার কনফিগার ফাইল (<b>htdocs/conf/conf.php</b>) ওয়েব সার্ভার দ্বারা ওভাররাইট করা যেতে পারে। এটি একটি গুরুতর নিরাপত্তা গর্ত. ওয়েব সার্ভার দ্বারা ব্যবহৃত অপারেটিং সিস্টেম ব্যবহারকারীর জন্য শুধুমাত্র পঠন মোডে ফাইলের অনুমতিগুলি পরিবর্তন করুন৷ আপনি যদি আপনার ডিস্কের জন্য Windows এবং FAT ফর্ম্যাট ব্যবহার করেন, তাহলে আপনাকে অবশ্যই জানতে হবে যে এই ফাইল সিস্টেম ফাইলে অনুমতি যোগ করার অনুমতি দেয় না, তাই সম্পূর্ণ নিরাপদ হতে পারে না।
diff --git a/htdocs/langs/bn_IN/eventorganization.lang b/htdocs/langs/bn_IN/eventorganization.lang
index 6166f24bfe7..cd5f6ea8379 100644
--- a/htdocs/langs/bn_IN/eventorganization.lang
+++ b/htdocs/langs/bn_IN/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=ইভেন্ট অর্গানাইজেশন 
 EventOrganization=ইভেন্ট সংগঠন
 EventOrganizationSetupPage = ইভেন্ট সংস্থা সেটআপ পৃষ্ঠা
 EVENTORGANIZATION_TASK_LABEL = প্রোজেক্ট যাচাই করা হলে স্বয়ংক্রিয়ভাবে তৈরি করা কাজের লেবেল
-EVENTORGANIZATION_TASK_LABELTooltip = যখন আপনি একটি ইভেন্টকে সংগঠিত করার জন্য যাচাই করেন, তখন কিছু কাজ স্বয়ংক্রিয়ভাবে প্রকল্পে তৈরি হতে পারে<br><br>উদাহরণস্বরূপ: <br>সম্মেলনের জন্য কল পাঠান<br>বুথের জন্য কল পাঠান<br>সম্মেলনের প্রস্তাবনা<span> ='notranslate'><br></span>বুথের জন্য আবেদন যাচাই করুন<br>অতিথিদের জন্য ইভেন্টের সদস্যতা উন্মুক্ত করুন<br>respandSmin বক্তাদের কাছে ইভেন্টের কথা<br>বুথ হোস্টার্সকে ইভেন্টের একটি অনুস্মারক পাঠান<br>অতিথিদের ইভেন্টের একটি অনুস্মারক পাঠান
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=আপনার যদি স্বয়ংক্রিয়ভাবে কাজ তৈরি করার প্রয়োজন না হয় তবে খালি রাখুন।
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = তৃতীয় পক্ষের সাথে যুক্ত করার জন্য বিভাগ স্বয়ংক্রিয়ভাবে তৈরি হয় যখন কেউ একটি সম্মেলনের পরামর্শ দেয়
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = তৃতীয় পক্ষের সাথে যুক্ত করার জন্য বিভাগ স্বয়ংক্রিয়ভাবে তৈরি করা হয় যখন তারা একটি বুথের পরামর্শ দেয়
@@ -88,6 +88,7 @@ PriceOfRegistration=নিবন্ধনের মূল্য
 PriceOfRegistrationHelp=ইভেন্টে নিবন্ধন বা অংশগ্রহণের জন্য মূল্য দিতে হবে
 PriceOfBooth=সাবস্ক্রিপশন মূল্য একটি বুথ দাঁড়ানো
 PriceOfBoothHelp=সাবস্ক্রিপশন মূল্য একটি বুথ দাঁড়ানো
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=সম্মেলনের জন্য আইসিএস লিঙ্ক করুন
 ConferenceOrBoothInformation=সম্মেলন বা বুথ তথ্য
 Attendees=উপস্থিতরা
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
index 56ad0259785..00988332004 100644
--- a/htdocs/langs/bn_IN/exports.lang
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -72,7 +72,7 @@ FieldsTarget=টার্গেটেড ক্ষেত্র
 FieldTarget=টার্গেটেড ক্ষেত্র
 FieldSource=উৎস ক্ষেত্র
 NbOfSourceLines=উৎস ফাইলে লাইনের সংখ্যা
-NowClickToTestTheImport=আপনার ফাইলের ফাইল ফরম্যাট (ক্ষেত্র এবং স্ট্রিং ডিলিমিটার) দেখানো বিকল্পগুলির সাথে মেলে এবং আপনি হেডার লাইনটি বাদ দিয়েছেন কিনা তা পরীক্ষা করে দেখুন, অথবা এইগুলি নিম্নলিখিত সিমুলেশনে ত্রুটি হিসাবে ফ্ল্যাগ করা হবে।<br></span span>একটি চালানোর জন্য "<span class='notranslate'><b>%s</b>" বোতামে ক্লিক করুন ফাইলের গঠন/বিষয়বস্তু পরীক্ষা করুন এবং আমদানি প্রক্রিয়া অনুকরণ করুন।<br><b>আপনার ডাটাবেসে কোনো ডেটা পরিবর্তন করা হবে না</b>।
+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=আমদানি সিমুলেশন চালান
 FieldNeedSource=এই ক্ষেত্রের উৎস ফাইল থেকে ডেটা প্রয়োজন
 SomeMandatoryFieldHaveNoSource=কিছু বাধ্যতামূলক ক্ষেত্র ডেটা ফাইল থেকে কোন উৎস নেই
@@ -83,19 +83,19 @@ SelectFormat=এই আমদানি ফাইল বিন্যাস নি
 RunImportFile=তথ্য আমদানি
 NowClickToRunTheImport=আমদানি সিমুলেশন ফলাফল পরীক্ষা করুন. কোনো ত্রুটি সংশোধন করুন এবং পুনরায় পরীক্ষা করুন।<br>যখন সিমুলেশন কোনো ত্রুটির প্রতিবেদন করে না আপনি ডাটাবেসে ডেটা আমদানি করতে এগিয়ে যেতে পারেন।
 DataLoadedWithId=এই আমদানি আইডি সহ প্রতিটি ডাটাবেস টেবিলে আমদানি করা ডেটার একটি অতিরিক্ত ক্ষেত্র থাকবে: <b>%s</b>, এই আমদানির সাথে সম্পর্কিত একটি সমস্যা তদন্তের ক্ষেত্রে এটি অনুসন্ধানযোগ্য হওয়ার অনুমতি দিতে৷
-ErrorMissingMandatoryValue=<b>%s</b><span class='notranslate'> কলামের উৎস ফাইলে বাধ্যতামূলক ডেটা খালি।
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=এখনও <b>%s</b> ত্রুটি সহ অন্যান্য উত্স লাইন আছে কিন্তু আউটপুট আছে সীমিত করা হয়েছে।
 TooMuchWarnings=এখনও <b>%s</b> সতর্কতা সহ অন্যান্য উত্স লাইন আছে কিন্তু আউটপুট আছে সীমিত করা হয়েছে।
 EmptyLine=খালি লাইন (বাদ দেওয়া হবে)
-CorrectErrorBeforeRunningImport=আপনাকে <b>অবশ্যই</b> সমস্ত ত্রুটি সংশোধন করতে হবে <b>আগে<span> notranslate'></b></span> নিশ্চিত আমদানি চলছে৷
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=<b>%s</b> নম্বর সহ ফাইল আমদানি করা হয়েছে৷
-YouCanUseImportIdToFindRecord=আপনি <b>import_key='%s'<span class='notranslate' ফিল্টার করে আপনার ডাটাবেসের সমস্ত আমদানি করা রেকর্ড খুঁজে পেতে পারেন '></b></span>।
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
 NbOfLinesOK=কোনো ত্রুটি এবং কোনো সতর্কতা ছাড়াই লাইনের সংখ্যা: <b>%s</b>
 NbOfLinesImported=লাইনের সংখ্যা সফলভাবে আমদানি করা হয়েছে: <b>%s</b>।
 DataComeFromNoWhere=সন্নিবেশ করার মান উৎস ফাইলের কোথাও থেকে আসে।
 DataComeFromFileFieldNb=সন্নিবেশ করার মান উৎস ফাইলে <b>%s</b> থেকে আসে।
 DataComeFromIdFoundFromRef=সোর্স ফাইল থেকে আসা মানটি ব্যবহার করার জন্য মূল বস্তুর আইডি খুঁজে পেতে ব্যবহার করা হবে (তাই বস্তুটি <b>%s</b> যার রেফ. ফ্রম সোর্স ফাইলটি ডাটাবেসে বিদ্যমান থাকতে হবে)।
-DataComeFromIdFoundFromCodeId=সোর্স ফাইল থেকে আসা কোডের মান ব্যবহার করা হবে প্যারেন্ট অবজেক্টের আইডি খুঁজে বের করার জন্য (সুতরাং সোর্স ফাইলের কোডটি ডিকশনারিতে থাকা আবশ্যক <b><span ক্লাস ='notranslate'>%s</span></b>)। মনে রাখবেন যে আপনি যদি আইডিটি জানেন তবে আপনি কোডের পরিবর্তে সোর্স ফাইলে এটি ব্যবহার করতে পারেন। আমদানি উভয় ক্ষেত্রেই কাজ করা উচিত।
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=উৎস ফাইল থেকে আসা ডেটা নিম্নলিখিত ক্ষেত্রে সন্নিবেশ করা হবে:
 DataIDSourceIsInsertedInto=মূল বস্তুর আইডি, যা উৎস ফাইলের ডেটা ব্যবহার করে পাওয়া গেছে, নিম্নলিখিত ক্ষেত্রে সন্নিবেশ করা হবে:
 DataCodeIDSourceIsInsertedInto=প্যারেন্ট লাইনের আইডি, যা কোড থেকে পাওয়া গেছে, নিম্নলিখিত ক্ষেত্রে ঢোকানো হবে:
@@ -113,8 +113,8 @@ Separator=ক্ষেত্র বিভাজক
 Enclosure=স্ট্রিং ডিলিমিটার
 SpecialCode=বিশেষ কোড
 ExportStringFilter=%% পাঠ্যের এক বা একাধিক অক্ষর প্রতিস্থাপনের অনুমতি দেয়
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: এক বছর/মাস/দিনের দ্বারা ফিল্টার করুন<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD+YYYYMMDD বছর/মাস/মাস রেঞ্জের বেশি বছর span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMDD: পরবর্তী সমস্ত বছর/মাস/দিনে ফিল্টার<br> < YYYY, <YYYY, YYYYMMDD: আগের সমস্ত বছর/মাস/দিনে ফিল্টার
-ExportNumericFilter=একটি মান দ্বারা NNNNN ফিল্টার<br>NNNNN+NNNNN ফিল্টারগুলি বিভিন্ন মানের পরিসরে<br><span class='notranslate'02127bz0 </span>> NNNNN উচ্চতর মান দ্বারা ফিল্টার
+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=লাইন নম্বর থেকে শুরু করে আমদানি
 EndAtLineNb=লাইন নম্বরে শেষ করুন
 ImportFromToLine=সীমা পরিসীমা (থেকে - থেকে)। যেমন হেডার লাইন(গুলি) বাদ দিতে।
diff --git a/htdocs/langs/bn_IN/install.lang b/htdocs/langs/bn_IN/install.lang
index b3c934c7305..710ab364046 100644
--- a/htdocs/langs/bn_IN/install.lang
+++ b/htdocs/langs/bn_IN/install.lang
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=এটা সম্ভব যে আপনার PHP সে
 PHPSupportSessions=এই পিএইচপি সেশন সমর্থন করে।
 PHPSupport=এই PHP %s ফাংশন সমর্থন করে।
 PHPMemoryOK=আপনার PHP সর্বোচ্চ সেশন মেমরি <b>%s</b> এ সেট করা আছে। এই যথেষ্ট হওয়া উচিত.
-PHPMemoryTooLow=আপনার PHP সর্বোচ্চ সেশন মেমরি <b>%s</b> বাইটে সেট করা আছে। এটা খুবই কম। আপনার <b>php.ini</b> <b>মেমোরি সেট করতে পরিবর্তন করুন ='notranslate'></b></span> প্যারামিটারে অন্তত <b>%s<span class='notranslate'>b091b<a7fz7fz0 /span> বাইট।
+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=আরো বিস্তারিত পরীক্ষার জন্য এখানে ক্লিক করুন
 ErrorPHPDoesNotSupportSessions=আপনার পিএইচপি ইনস্টলেশন সেশন সমর্থন করে না. ডলিবারকে কাজ করার অনুমতি দেওয়ার জন্য এই বৈশিষ্ট্যটি প্রয়োজন। আপনার পিএইচপি সেটআপ এবং সেশন ডিরেক্টরির অনুমতি পরীক্ষা করুন।
 ErrorPHPDoesNotSupport=আপনার PHP ইনস্টলেশন %s ফাংশন সমর্থন করে না।
@@ -115,8 +115,8 @@ OrphelinsPaymentsDetectedByMethod=%s পদ্ধতির মাধ্যমে
 RemoveItManuallyAndPressF5ToContinue=এটি ম্যানুয়ালি সরান এবং চালিয়ে যেতে F5 টিপুন।
 FieldRenamed=ক্ষেত্রটির নাম পরিবর্তন করা হয়েছে
 IfLoginDoesNotExistsCheckCreateUser=যদি ব্যবহারকারী এখনও বিদ্যমান না থাকে তবে আপনাকে অবশ্যই "ব্যবহারকারী তৈরি করুন" বিকল্পটি চেক করতে হবে
-ErrorConnection=সার্ভার "<b>%s</b>", ডাটাবেসের নাম "<b>%s</b>", লগইন "b0aee</8383 span><span class='notranslate'>%s</b>", অথবা ডাটাবেস পাসওয়ার্ড ভুল হতে পারে বা PHP ক্লায়েন্ট সংস্করণ ডাটাবেস সংস্করণের তুলনায় অনেক পুরানো হতে পারে .
-InstallChoiceRecommanded=আপনার বর্তমান সংস্করণ <b>%s</b> সংস্করণ ইনস্টল করার প্রস্তাবিত পছন্দ class='notranslate'><b></span>%s</b>
+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>ইন্সটলার দ্বারা প্রস্তাবিত ইনস্টল পছন্দ</b>৷
 MigrateIsDoneStepByStep=লক্ষ্যযুক্ত সংস্করণে (%s) বেশ কয়েকটি সংস্করণের ব্যবধান রয়েছে। এটি সম্পূর্ণ হয়ে গেলে ইনস্টল উইজার্ডটি আরও একটি মাইগ্রেশনের পরামর্শ দিতে ফিরে আসবে।
 CheckThatDatabasenameIsCorrect=পরীক্ষা করুন যে ডাটাবেসের নাম "<b>%s</b>" সঠিক।
diff --git a/htdocs/langs/bn_IN/ldap.lang b/htdocs/langs/bn_IN/ldap.lang
index 12070195724..f876f142287 100644
--- a/htdocs/langs/bn_IN/ldap.lang
+++ b/htdocs/langs/bn_IN/ldap.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=<span class=' ডোমেনে <b>%s</b> ব্যবহারকারীর জন্য পাসওয়ার্ড notranslate'><b></span>%s</b> পরিবর্তন করতে হবে।
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=ব্যবহারকারীকে ডোমেনে পাসওয়ার্ড পরিবর্তন করতে হবে %s
 LDAPInformationsForThisContact=এই পরিচিতির জন্য LDAP ডাটাবেসে তথ্য
 LDAPInformationsForThisUser=এই ব্যবহারকারীর জন্য LDAP ডাটাবেসে তথ্য
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index 98e16fd9b76..8caa8282594 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=আমদানি করা ফাইলে অব
 UseFormatInputEmailToTarget=বিন্যাস সহ একটি স্ট্রিং লিখুন <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=প্রাপক (উন্নত নির্বাচন)
 AdvTgtTitle=লক্ষ্য করার জন্য তৃতীয় পক্ষ বা পরিচিতি/ঠিকানাগুলি পূর্বনির্বাচন করতে ইনপুট ক্ষেত্রগুলি পূরণ করুন
-AdvTgtSearchTextHelp=ওয়াইল্ডকার্ড হিসেবে %% ব্যবহার করুন। উদাহরণস্বরূপ <b>জিন, জো, জিম</b> এর মতো সমস্ত আইটেম খুঁজে পেতে, আপনি  ইনপুট করতে পারেন <b>j%%</b>, আপনিও ব্যবহার করতে পারেন ; মান জন্য বিভাজক হিসাবে, এবং ব্যবহার করুন! এই মান ছাড়া জন্য. যেমন <b>jean;joe;jim%%;!jimo;!jimab07e63171f5dacz span><span class='notranslate'></b> সব জিন, জো, জিম দিয়ে শুরু করবে কিন্তু জিমো নয় এবং জিমা দিয়ে শুরু হওয়া সবকিছু নয়
+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=int বা ফ্লোট মান নির্বাচন করতে ব্যবধান ব্যবহার করুন
 AdvTgtMinVal=সর্বনিম্ন মান
 AdvTgtMaxVal=সর্বোচ্চ মূল্য
@@ -182,7 +182,7 @@ IsAnAnswer=এটি একটি প্রাথমিক ইমেলের 
 RecordCreatedByEmailCollector=ইমেল সংগ্রাহকের দ্বারা তৈরি করা রেকর্ড %s ইমেল থেকে %s
 DefaultBlacklistMailingStatus=একটি নতুন পরিচিতি তৈরি করার সময় '%s' ক্ষেত্রের ডিফল্ট মান
 DefaultStatusEmptyMandatory=খালি কিন্তু বাধ্যতামূলক
-WarningLimitSendByDay=সতর্কতা: আপনার উদাহরণের সেটআপ বা চুক্তিটি প্রতিদিন আপনার ইমেলের সংখ্যা <b>%s<span class='notranslate'-এ সীমাবদ্ধ করে ></b></span>। আরও পাঠানোর চেষ্টা করার ফলে আপনার দৃষ্টান্ত ধীর বা স্থগিত হতে পারে। আপনি একটি উচ্চ কোটা প্রয়োজন হলে আপনার সমর্থনের সাথে যোগাযোগ করুন.
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=ইমেল পাঠাতে আর কোন প্রাপক
 EmailOptedOut=ইমেলের মালিক অনুরোধ করেছেন এই ইমেলের মাধ্যমে তার সাথে আর যোগাযোগ না করার জন্য
 EvenUnsubscribe=অপ্ট-আউট ইমেলগুলি অন্তর্ভুক্ত করুন৷
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 00dd1046a0f..aff592c229b 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -68,7 +68,7 @@ ErrorNoRequestInError=ভুল কোন অনুরোধ
 ErrorServiceUnavailableTryLater=এই মুহূর্তে পরিষেবা উপলব্ধ নেই৷ পরে আবার চেষ্টা করুন.
 ErrorDuplicateField=একটি অনন্য ক্ষেত্রে ডুপ্লিকেট মান
 ErrorSomeErrorWereFoundRollbackIsDone=কিছু ত্রুটি পাওয়া গেছে. পরিবর্তনগুলি ফিরিয়ে আনা হয়েছে৷
-ErrorConfigParameterNotDefined=প্যারামিটার <b>%s</b> ডলিবার কনফিগারেশন ফাইলে সংজ্ঞায়িত করা হয়নি class='notranslate'><b></span>conf.php</b>।
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Dolibarr ডেটাবেসে <b>%s</b> ব্যবহারকারী খুঁজে পাওয়া যায়নি।
 ErrorNoVATRateDefinedForSellerCountry=ত্রুটি, '%s' দেশের জন্য কোনো ভ্যাট হার সংজ্ঞায়িত করা হয়নি।
 ErrorNoSocialContributionForSellerCountry=ত্রুটি, '%s' দেশের জন্য কোনো সামাজিক/আর্থিক করের ধরন সংজ্ঞায়িত করা হয়নি।
@@ -103,7 +103,7 @@ RecordDeleted=রেকর্ড মুছে ফেলা হয়েছে
 RecordGenerated=রেকর্ড তৈরি হয়েছে
 LevelOfFeature=বৈশিষ্ট্যের স্তর
 NotDefined=সংজ্ঞায়িত নয়
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr প্রমাণীকরণ মোড <b>%s</b> কনফিগারেশন ফাইলে সেট করা আছে class='notranslate'><b></span>conf.php</b>।<br>এর মানে হল পাসওয়ার্ডের প্রাক্তন ডেটাবেস Dolibarr, তাই এই ক্ষেত্র পরিবর্তন কোন প্রভাব হতে পারে.
+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=সিস্টেম অ্যাডমিনিস্ট্রেটর
 AdministratorDesc=সিস্টেম অ্যাডমিনিস্ট্রেটর (ব্যবহারকারী, অনুমতি কিন্তু সিস্টেম সেটআপ এবং মডিউল কনফিগারেশন পরিচালনা করতে পারে)
 Undefined=অনির্ধারিত
@@ -131,7 +131,7 @@ TechnicalID=প্রযুক্তিগত আইডি
 LineID=লাইন আইডি
 NotePublic=নোট (সর্বজনীন)
 NotePrivate=নোট (ব্যক্তিগত)
-PrecisionUnitIsLimitedToXDecimals=ইউনিটের দামের নির্ভুলতা <b>%sb09a4b739f17f8cimal<span class='notranslate'>এ সীমাবদ্ধ করার জন্য Dolibarr সেটআপ করা হয়েছিল .
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=পরীক্ষা
 ToFilter=ছাঁকনি
 NoFilter=ছাঁকনিবিহীন
@@ -172,7 +172,7 @@ Close=বন্ধ
 CloseAs=স্থিতি সেট করুন
 CloseBox=আপনার ড্যাশবোর্ড থেকে উইজেট সরান
 Confirm=নিশ্চিত করুন
-ConfirmSendCardByMail=আপনি কি সত্যিই এই কার্ডের বিষয়বস্তু <b>%s<span class='notranslate'></b>< এ মেইলে পাঠাতে চান /span>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=মুছে ফেলা
 Remove=অপসারণ
 Resiliate=সমাপ্ত করুন
@@ -420,6 +420,8 @@ TotalTTCShort=মোট (inc. ট্যাক্স)
 TotalHT=মোট (ট্যাক্স বাদে)
 TotalHTforthispage=এই পৃষ্ঠার জন্য মোট (ট্যাক্স বাদে)
 Totalforthispage=এই পৃষ্ঠার জন্য মোট
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=মোট (inc. ট্যাক্স)
 TotalTTCToYourCredit=আপনার ক্রেডিট মোট (inc. ট্যাক্স)
 TotalVAT=মোট ট্যাক্স
@@ -502,7 +504,7 @@ Completed=সম্পন্ন
 Running=চলমান
 RequestAlreadyDone=অনুরোধ ইতিমধ্যে রেকর্ড করা হয়েছে
 Filter=ছাঁকনি
-FilterOnInto=মাপদণ্ড '<strong>%s</strong>' ক্ষেত্রে <span class=' অনুসন্ধান করুন notranslate'>%s</span>
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=ফিল্টার সরান
 ChartGenerated=চার্ট তৈরি হয়েছে
 ChartNotGenerated=চার্ট তৈরি হয়নি
@@ -647,6 +649,7 @@ ReportName=রিপোর্টের নাম
 ReportPeriod=রিপোর্ট সময়কাল
 ReportDescription=বর্ণনা
 Report=রিপোর্ট
+Reports=Reports
 Keyword=কীওয়ার্ড
 Origin=উৎপত্তি
 Legend=কিংবদন্তি
@@ -963,6 +966,7 @@ AutomaticallyCalculated=স্বয়ংক্রিয়ভাবে গণ
 TitleSetToDraft=খসড়ায় ফিরে যান
 ConfirmSetToDraft=আপনি কি খসড়া স্ট্যাটাসে ফিরে যেতে চান?
 ImportId=আইডি আমদানি করুন
+Event=Event
 Events=ঘটনা
 EMailTemplates=ইমেল টেমপ্লেট
 FileNotShared=ফাইল বহিরাগত পাবলিক শেয়ার করা হয় না
@@ -1048,7 +1052,7 @@ Select2NotFound=কোন ফলাফল পাওয়া যায়নি
 Select2Enter=প্রবেশ করুন
 Select2MoreCharacter=বা আরও চরিত্র
 Select2MoreCharacters=বা আরও অক্ষর
-Select2MoreCharactersMore=<strong>অনুসন্ধান সিনট্যাক্স:</strong><br><span>'notranslate>'notranslate' <kbd></span><strong> |</strong>b0860de534daf0 notranslate'><kbd></span> OR</kbd> (a|b)<br>b061d061d /span><span class='notranslate'><strong>*</strong></kbd><kbd> যেকোনো অক্ষর</kbd> (a*b)<br>b06aecd0207 span><span class='notranslate'><strong>^</strong></kbd> <kbd> দিয়ে শুরু করুন</kbd> (^ab)<br>b03aecd01>b03aecd20 <strong>$</strong></kbd>b061d061d  </kbd> (ab$)<br> দিয়ে শেষ করুন
+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=আরও ফলাফল লোড হচ্ছে...
 Select2SearchInProgress=অনুসন্ধান চলছে...
 SearchIntoThirdparties=তৃতীয় পক্ষ
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=আপনি কি নিশ্চিত যে আ
 ConfirmSetSupervisorQuestion=আপনি কি %s নির্বাচিত রেকর্ডে সুপারভাইজার সেট করতে চান?
 ConfirmUpdatePriceQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) এর মূল্য আপডেট করার বিষয়ে নিশ্চিত?
 CategTypeNotFound=রেকর্ডের ধরনের জন্য কোন ট্যাগ টাইপ পাওয়া যায়নি
-Rate=হার
 SupervisorNotFound=সুপারভাইজার পাওয়া যায়নি
 CopiedToClipboard=ক্লিপবোর্ডে কপি করা হয়েছে
 InformationOnLinkToContract=এই পরিমাণ শুধুমাত্র চুক্তির সমস্ত লাইনের মোট। সময়ের কোন ধারণা বিবেচনায় নেওয়া হয় না।
@@ -1213,6 +1216,7 @@ CanceledHidden=বাতিল লুকানো
 CanceledShown=বাতিল দেখানো হয়েছে
 Terminate=সমাপ্ত করুন
 Terminated=সমাপ্ত
+Position=Position
 AddLineOnPosition=অবস্থানে লাইন যোগ করুন (শেষে যদি খালি থাকে)
 ConfirmAllocateCommercial=বিক্রয় প্রতিনিধি নিশ্চিতকরণ বরাদ্দ করুন
 ConfirmAllocateCommercialQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) বরাদ্দ করার বিষয়ে নিশ্চিত?
@@ -1230,6 +1234,7 @@ ExternalUser=বহিরাগত ব্যবহারকারী
 NoSpecificContactAddress=কোনো নির্দিষ্ট যোগাযোগ বা ঠিকানা নেই
 NoSpecificContactAddressBis=এই ট্যাবটি বর্তমান বস্তুর জন্য নির্দিষ্ট পরিচিতি বা ঠিকানা জোর করার জন্য নিবেদিত। আপনি যদি বস্তুর জন্য এক বা একাধিক নির্দিষ্ট পরিচিতি বা ঠিকানা নির্ধারণ করতে চান তখনই এটি ব্যবহার করুন যখন তৃতীয় পক্ষের তথ্য যথেষ্ট নয় বা সঠিক নয়।
 HideOnVCard=লুকান %s
+ShowOnVCard=Show %s
 AddToContacts=আমার পরিচিতি ঠিকানা যোগ করুন
 LastAccess=শেষ অ্যাক্সেস
 UploadAnImageToSeeAPhotoHere=এখানে একটি ফটো দেখতে %s ট্যাব থেকে একটি ছবি আপলোড করুন
@@ -1259,4 +1264,7 @@ AmountSalary=বেতনের পরিমাণ
 InvoiceSubtype=চালান সাবটাইপ
 ConfirmMassReverse=বাল্ক বিপরীত নিশ্চিতকরণ
 ConfirmMassReverseQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) বিপরীত করতে চান?
-
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index 8d1f1b0bc6b..01eca2e3be9 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -13,7 +13,7 @@ MembersTickets=সদস্যপদ ঠিকানা শীট
 FundationMembers=ফাউন্ডেশনের সদস্যরা
 ListOfValidatedPublicMembers=বৈধ পাবলিক সদস্যদের তালিকা
 ErrorThisMemberIsNotPublic=এই সদস্য সর্বজনীন নয়
-ErrorMemberIsAlreadyLinkedToThisThirdParty=অন্য সদস্য (নাম: <b>%s</b>, লগইন: <b>%s</b>) ইতিমধ্যেই একটি তৃতীয় পক্ষের সাথে লিঙ্ক করা আছে <span class='notranslate' '><b></span>%s</b>। প্রথমে এই লিঙ্কটি সরান কারণ একটি তৃতীয় পক্ষ শুধুমাত্র একজন সদস্যের সাথে লিঙ্ক করা যাবে না (এবং এর বিপরীতে)।
+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=নিরাপত্তার কারণে, আপনার নয় এমন ব্যবহারকারীর সাথে সদস্যকে লিঙ্ক করতে সক্ষম হওয়ার জন্য আপনাকে অবশ্যই সমস্ত ব্যবহারকারীকে সম্পাদনা করার অনুমতি দিতে হবে।
 SetLinkToUser=একটি Dolibarr ব্যবহারকারী লিঙ্ক
 SetLinkToThirdParty=একটি Dolibarr তৃতীয় পক্ষের লিঙ্ক
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 3bf9d2b5c06..388ba1d614e 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=এখানে উদাহরণ দেখুন
 EnabledDesc=এই ক্ষেত্রটি সক্রিয় থাকার শর্ত।<br><br>উদাহরণ:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=মাঠ কি দৃশ্যমান? (উদাহরণ: 0=কখনও দৃশ্যমান নয়, 1=তালিকায় দৃশ্যমান এবং ফর্মগুলি তৈরি/আপডেট/দেখুন, 2=শুধু তালিকায় দৃশ্যমান, 3=শুধুমাত্র তৈরি/আপডেট/দেখার ফর্মে দৃশ্যমান (তালিকায় নয়), 4=তালিকায় দৃশ্যমান এবং শুধুমাত্র ফর্ম আপডেট/দেখুন (তৈরি নয়), 5=তালিকাতে দৃশ্যমান এবং শুধুমাত্র ফর্ম দেখুন (তৈরি নয়, আপডেট নয়)।<br><br> একটি নেতিবাচক মান ব্যবহার করার অর্থ হল তালিকায় ডিফল্টরূপে ক্ষেত্র দেখানো হয় না তবে দেখার জন্য নির্বাচন করা যেতে পারে)।
 ItCanBeAnExpression=এটি একটি অভিব্যক্তি হতে পারে. উদাহরণ:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->অধিকার আছে('ছুটি', 'নির্ধারিত_ছুটির')?1:5
-DisplayOnPdfDesc=সামঞ্জস্যপূর্ণ PDF নথিতে এই ক্ষেত্রটি প্রদর্শন করুন, আপনি "পজিশন" ক্ষেত্রের সাথে অবস্থান পরিচালনা করতে পারেন।<br><strong>নথির জন্য :<span ক্লাস ='notranslate'></strong></span><br>0 = প্রদর্শিত হয় না <br>1 =<br>2 = শুধুমাত্র খালি না থাকলে প্রদর্শন করুন<br><br>b0e7849434 span>নথি লাইনের জন্য :<span class='notranslate'></strong><br>0 = প্রদর্শিত হয় না <br>1 = একটি কলামে প্রদর্শিত হয়<br>3 = বর্ণনার পরে লাইন বর্ণনা কলামে প্রদর্শিত হয়<br>4 = বর্ণনার পরে বিবরণ কলামে প্রদর্শন শুধুমাত্র যদি খালি না হয়
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=তালিকায় মোট পেতে ক্ষেত্রের মান কি কম্পুলেট করা যেতে পারে? (উদাহরণ: 1 বা 0)
 SearchAllDesc=ক্ষেত্রটি কি দ্রুত অনুসন্ধান সরঞ্জাম থেকে অনুসন্ধান করতে ব্যবহৃত হয়? (উদাহরণ: 1 বা 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=আপনার মডিউলের বাহ্যিক এ
 SeeIDsInUse=আপনার ইনস্টলেশন ব্যবহার করা আইডি দেখুন
 SeeReservedIDsRangeHere=সংরক্ষিত আইডি পরিসীমা দেখুন
 ToolkitForDevelopers=ডলিবার ডেভেলপারদের জন্য টুলকিট
-TryToUseTheModuleBuilder=আপনার যদি SQL এবং PHP সম্পর্কে জ্ঞান থাকে, আপনি স্থানীয় মডিউল নির্মাতা উইজার্ড ব্যবহার করতে পারেন।<br>মডিউলটি সক্ষম করুন <strong><span ক্লাস ='notranslate'>%s</span></strong> এবং <span class="fa fa-bug"><span class='notranslate' এ ক্লিক করে উইজার্ড ব্যবহার করুন ></span></span> উপরের ডানদিকের মেনুতে।<br>সতর্কতা: এটি একটি উন্নত ডেভেলপার বৈশিষ্ট্য, করুন <b><span>no span class='notranslate'></b> আপনার প্রোডাকশন সাইটে পরীক্ষা!
+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=উপরের ডানদিকের মেনুতে <span class="fa fa-bug"></span> দেখুন
 AddLanguageFile=ভাষা ফাইল যোগ করুন
 YouCanUseTranslationKey=আপনি এখানে একটি কী ব্যবহার করতে পারেন যা ভাষা ফাইলে পাওয়া অনুবাদ কী (ট্যাব "ভাষা" দেখুন)
@@ -148,7 +148,7 @@ CSSListClass=তালিকার জন্য CSS
 NotEditable=সম্পাদনাযোগ্য নয়
 ForeignKey=বিদেশী চাবি
 ForeignKeyDesc=যদি এই ক্ষেত্রের মান অবশ্যই অন্য টেবিলে উপস্থিত থাকার নিশ্চয়তা দিতে হবে। এখানে একটি মান মেলে সিনট্যাক্স লিখুন: tablename.parentfieldtocheck
-TypeOfFieldsHelp=উদাহরণ:<br>varchar(99)<br>ইমেল<br>ফোন<span ক্লাস ='notranslate'><br></span>ip<br>url<br>পাসওয়ার্ড<br> span>ডাবল(24,8)<br>real<br>পাঠ্য<br>html <br>তারিখ<br>তারিখের সময়<br>টাইমস্ট্যাম্প<span class'>'notranslate' <br></span>পূর্ণসংখ্যা<br>পূর্ণসংখ্যা:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fcc<b0342f /span><span class='notranslate'><br>'1' মানে আমরা রেকর্ড তৈরি করতে কম্বোর পরে একটি + বোতাম যোগ করি<br>'ফিল্টার' হল একটি ইউনিভার্সাল ফিল্টার সিনট্যাক্স শর্ত, উদাহরণ: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=এটি হল ক্ষেত্র/বিশিষ্টের ধরন।
 AsciiToHtmlConverter=Ascii থেকে HTML রূপান্তরকারী
 AsciiToPdfConverter=Ascii থেকে পিডিএফ কনভার্টার
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=বর্ণনাকারীতে কোড য
 DictionariesCreated=অভিধান <b>%s</b> সফলভাবে তৈরি করা হয়েছে
 DictionaryDeleted=অভিধান <b>%s</b> সফলভাবে সরানো হয়েছে
 PropertyModuleUpdated=সম্পত্তি <b>%s</b> সফলভাবে আপডেট করা হয়েছে
-InfoForApiFile=* আপনি যখন প্রথমবার ফাইল তৈরি করবেন তখন প্রতিটি বস্তুর জন্য সমস্ত পদ্ধতি <strong> তৈরি হবে।</strong><br>* আপনি যখন <strong>এ ক্লিক করুন</strong> আপনি শুধু <span ক্লাসের সমস্ত পদ্ধতি সরিয়ে ফেলবেন ='notranslate'><strong></span>নির্বাচিত বস্তু</strong>।
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=মডিউল সেটআপের জন্য পৃষ্ঠা
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=আপনি গণ ইমেল মডিউলের জন্য নতুন ইমেল লক্ষ্য নির্বাচক প্রদান করতে এখানে ক্লাস ফাইল তৈরি এবং সম্পাদনা করতে পারেন
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index de15c6b24fe..9147811c7c8 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -47,7 +47,7 @@ DateEndPlannedMo=তারিখ শেষ পরিকল্পিত
 KeepEmptyForAsap=খালি মানে 'যত তাড়াতাড়ি সম্ভব'
 EstimatedDuration=আনুমানিক সময়কাল
 EstimatedDurationDesc=এই BOM ব্যবহার করে এই পণ্যটি তৈরি (বা বিচ্ছিন্ন) করার আনুমানিক সময়কাল
-ConfirmValidateBom=আপনি কি <strong>%s</strong><span class='notranslate'>রেফারেন্স সহ 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=আপনি কি এই BOM বাতিল করার বিষয়ে নিশ্চিত (আপনি আর নতুন ম্যানুফ্যাকচারিং অর্ডার তৈরি করতে এটি ব্যবহার করতে পারবেন না)?
 ConfirmReopenBom=আপনি কি নিশ্চিত যে আপনি এই BOM পুনরায় খুলতে চান (আপনি এটি নতুন উত্পাদন অর্ডার তৈরি করতে ব্যবহার করতে সক্ষম হবেন)
 StatusMOProduced=উত্পাদিত
@@ -136,4 +136,3 @@ NoRemainQtyToDispatch=ভাগ করার জন্য কোন পরিম
 
 THMOperatorEstimatedHelp=প্রতি ঘন্টায় অপারেটরের আনুমানিক খরচ। এই ওয়ার্কস্টেশন ব্যবহার করে একটি BOM-এর খরচ অনুমান করতে ব্যবহার করা হবে।
 THMMachineEstimatedHelp=প্রতি ঘণ্টায় মেশিনের আনুমানিক খরচ। এই ওয়ার্কস্টেশন ব্যবহার করে একটি BOM-এর খরচ অনুমান করতে ব্যবহার করা হবে।
-
diff --git a/htdocs/langs/bn_IN/multicurrency.lang b/htdocs/langs/bn_IN/multicurrency.lang
index 4b4e5ae98b6..7a1a4405193 100644
--- a/htdocs/langs/bn_IN/multicurrency.lang
+++ b/htdocs/langs/bn_IN/multicurrency.lang
@@ -7,12 +7,12 @@ multicurrency_syncronize_error=সিঙ্ক্রোনাইজেশন ত
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=সর্বশেষ পরিচিত হার ব্যবহার না করে মুদ্রার হার খুঁজতে নথির তারিখ ব্যবহার করুন
 multicurrency_useOriginTx=যখন একটি বস্তু অন্য থেকে তৈরি করা হয়, উৎস বস্তু থেকে মূল হার রাখুন (অন্যথায় সর্বশেষ পরিচিত হার ব্যবহার করুন)
 CurrencyLayerAccount=কারেন্সি লেয়ার এপিআই
-CurrencyLayerAccount_help_to_synchronize=এই কার্যকারিতা ব্যবহার করতে আপনাকে অবশ্যই %s ওয়েবসাইটে একটি অ্যাকাউন্ট তৈরি করতে হবে।<br>আপনার <b><span class='notranslate'>পান /span>API কী<span class='notranslate'></b>।<br>আপনি যদি একটি বিনামূল্যের অ্যাকাউন্ট ব্যবহার করেন, তাহলে আপনি <span class=' পরিবর্তন করতে পারবেন না notranslate'><b></span>উৎস মুদ্রা</b> (ডিফল্টরূপে USD)।<br>যদি আপনার মূল মুদ্রা ইউএসডি না হয়, অ্যাপ্লিকেশন স্বয়ংক্রিয়ভাবে এটি পুনরায় গণনা করবে।<br><br>আপনি প্রতি মাসে 1000টি সিঙ্ক্রোনাইজেশনের মধ্যে সীমাবদ্ধ।
+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 কী
 multicurrency_appCurrencySource=উৎস মুদ্রা
 multicurrency_alternateCurrencySource=বিকল্প উৎস মুদ্রা
 CurrenciesUsed=ব্যবহৃত মুদ্রা
-CurrenciesUsed_help_to_add=আপনার <b>প্রস্তাব</b>, b0aee8336058<span class='notranslate'>b0aee8336587 /span>অর্ডার<span class='notranslate'></b> ইত্যাদি
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=হার
 MulticurrencyReceived=প্রাপ্ত, আসল মুদ্রা
 MulticurrencyRemainderToTake=অবশিষ্ট পরিমাণ, আসল মুদ্রা
diff --git a/htdocs/langs/bn_IN/orders.lang b/htdocs/langs/bn_IN/orders.lang
index af8f3c48170..8c0460b9150 100644
--- a/htdocs/langs/bn_IN/orders.lang
+++ b/htdocs/langs/bn_IN/orders.lang
@@ -106,7 +106,7 @@ ConfirmDeleteOrder=আপনি কি এই অর্ডারটি মুছ
 ConfirmValidateOrder=আপনি কি <b>%s</b> নামে এই অর্ডারটি যাচাই করার বিষয়ে নিশ্চিত? ?
 ConfirmUnvalidateOrder=আপনি কি নিশ্চিত যে আপনি অর্ডার <b>%s</b> খসড়া স্থিতিতে পুনরুদ্ধার করতে চান ?
 ConfirmCancelOrder=আপনি কি নিশ্চিত আপনি এই অর্ডার বাতিল করতে চান?
-ConfirmMakeOrder=আপনি কি নিশ্চিত করতে চান যে আপনি এই অর্ডারটি <b>%s<span class='notranslate'></b></span-এ করেছেন। >?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=চালান তৈরি করুন
 ClassifyShipped=বিতরিত শ্রেণীবদ্ধ
 PassedInShippedStatus=শ্রেণীবদ্ধ বিতরণ
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 7847d717083..163c73de633 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -94,7 +94,7 @@ AttachANewFile=একটি নতুন ফাইল/নথি সংযুক
 LinkedObject=লিঙ্কযুক্ত বস্তু
 NbOfActiveNotifications=বিজ্ঞপ্তির সংখ্যা (প্রাপকের ইমেলের সংখ্যা)
 PredefinedMailTest=__(হ্যালো)__\nএটি একটি পরীক্ষামূলক মেল যা __EMAIL__ এ পাঠানো হয়েছে৷\nলাইন একটি ক্যারেজ রিটার্ন দ্বারা পৃথক করা হয়.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(হ্যালো)__<br>এটি একটি <b>পরীক্ষা</b>মেল পাঠানো হয়েছে __EMAIL__ এ (পরীক্ষা শব্দটি অবশ্যই মোটা হতে হবে)।<br>রেখাগুলি একটি ক্যারেজ রিটার্ন দ্বারা পৃথক করা হয়েছে।<br><span ক্লাস ='notranslate'><br></span>__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=__(হ্যালো)__\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__
@@ -189,7 +189,7 @@ EnterNewPasswordHere=এখানে আপনার নতুন পাসও
 BackToLoginPage=লগইন পৃষ্ঠায় ফিরে যান
 AuthenticationDoesNotAllowSendNewPassword=প্রমাণীকরণ মোড হল <b>%s</b>।<span class='translate' ><br></span>এই মোডে, Dolibarr আপনার পাসওয়ার্ড জানতে বা পরিবর্তন করতে পারে না।<br>আপনার পাসওয়ার্ড পরিবর্তন করতে চাইলে আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।
 EnableGDLibraryDesc=এই বিকল্পটি ব্যবহার করতে আপনার পিএইচপি ইনস্টলেশনে জিডি লাইব্রেরি ইনস্টল বা সক্ষম করুন।
-ProfIdShortDesc=<b>প্রফেসর আইডি %s</b> তৃতীয় পক্ষের দেশের উপর নির্ভর করে একটি তথ্য৷ <br>উদাহরণস্বরূপ, দেশের জন্য <b>%s</b>, এটির কোড <b>%s<span class='notranslate'>b09a4b7837fz.
+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=ডলিবার ইআরপি/সিআরএম ডেমো
 StatsByAmount=পণ্য/পরিষেবার পরিমাণের পরিসংখ্যান
 StatsByAmountProducts=পণ্যের পরিমাণের পরিসংখ্যান
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=<b>%s</b> ফাইলটি আপলোড করতে
 AddFolder=ফোল্ডার তৈরি করুন
 FileWasCreateFolder=ফোল্ডার <b>%s</b> তৈরি করা হয়েছে
 FTPFailedToCreateFolder=<b>%s</b> ফোল্ডার তৈরি করতে ব্যর্থ হয়েছে৷
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/bn_IN/partnership.lang b/htdocs/langs/bn_IN/partnership.lang
index aa32f78e4c1..17ac3fd6be3 100644
--- a/htdocs/langs/bn_IN/partnership.lang
+++ b/htdocs/langs/bn_IN/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=শেষ URL চেকের জন্য ত্রু
 LastCheckBacklink=শেষ ইউআরএল চেক করার তারিখ
 
 NewPartnershipRequest=নতুন অংশীদারিত্বের অনুরোধ
-NewPartnershipRequestDesc=এই ফর্মটি আপনাকে আমাদের অংশীদারিত্ব প্রোগ্রামের একটি অংশ হতে অনুরোধ করতে দেয়৷ এই ফর্মটি পূরণ করতে আপনার সাহায্যের প্রয়োজন হলে, অনুগ্রহ করে ইমেলের মাধ্যমে যোগাযোগ করুন <b>%s</b><span class='notranslate'> span>
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=এই পৃষ্ঠায় নিম্নলিখিত ডোমেনের একটিতে অন্তত একটি লিঙ্ক থাকতে হবে: %s
 
 IPOfApplicant=আবেদনকারীর আইপি
-
diff --git a/htdocs/langs/bn_IN/paypal.lang b/htdocs/langs/bn_IN/paypal.lang
index 6261a654d0f..8f8d2f83067 100644
--- a/htdocs/langs/bn_IN/paypal.lang
+++ b/htdocs/langs/bn_IN/paypal.lang
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=সমস্ত পোস্ট অ্যা
 ValidationOfPaymentFailed=অর্থপ্রদানের বৈধতা ব্যর্থ হয়েছে৷
 CardOwner=কার্ড হোল্ডার
 PayPalBalance=পেপ্যাল ক্রেডিট
-OnlineSubscriptionPaymentLine=অনলাইন সাবস্ক্রিপশন %s<br> %s<span class=' এর মাধ্যমে প্রদান করা হয়েছে notranslate'><br></span>প্রাথমিক আইপি ঠিকানা: %s<br>লেনদেন আইডি: <span class='noeclatec82f7f7f7f7 </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 9e9bf4d61b5..fbc56032895 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -18,7 +18,7 @@ Reference=রেফারেন্স
 NewProduct=নতুন পণ্য
 NewService=নতুন পরিষেবা
 ProductVatMassChange=গ্লোবাল ভ্যাট আপডেট
-ProductVatMassChangeDesc=এই টুলটি <b><u>ALL</u><span>তে সংজ্ঞায়িত ভ্যাট হার আপডেট করে class='notranslate'></b></span> পণ্য এবং পরিষেবা!
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
 MassBarcodeInit=ভর বারকোড init
 MassBarcodeInitDesc=এই পৃষ্ঠাটি এমন বস্তুগুলিতে একটি বারকোড শুরু করতে ব্যবহার করা যেতে পারে যেগুলিতে বারকোড সংজ্ঞায়িত নেই৷ মডিউল বারকোডের সেটআপ সম্পূর্ণ হওয়ার আগে পরীক্ষা করুন।
 ProductAccountancyBuyCode=অ্যাকাউন্টিং কোড (ক্রয়)
@@ -208,11 +208,6 @@ unitSET=সেট
 unitS=দ্বিতীয়
 unitH=ঘন্টা
 unitD=দিন
-unitG=ছোলা
-unitM=মিটার
-unitLM=রৈখিক মিটার
-unitM2=বর্গ মিটার
-unitM3=ঘন মিটার
 unitL=লিটার
 unitT=টন
 unitKG=কেজি
@@ -221,6 +216,7 @@ unitMG=মিলিগ্রাম
 unitLB=পাউন্ড
 unitOZ=আউন্স
 unitM=মিটার
+unitLM=রৈখিক মিটার
 unitDM=dm
 unitCM=সেমি
 unitMM=মিমি
@@ -361,7 +357,7 @@ ProductAttributeName=বৈকল্পিক বৈশিষ্ট্য %s
 ProductAttribute=বৈকল্পিক বৈশিষ্ট্য
 ProductAttributeDeleteDialog=আপনি কি নিশ্চিত আপনি এই বৈশিষ্ট্য মুছে ফেলতে চান? সমস্ত মান মুছে ফেলা হবে
 ProductAttributeValueDeleteDialog=আপনি কি এই অ্যাট্রিবিউটের "%s" রেফারেন্স সহ "%s" মানটি মুছতে চান?
-ProductCombinationDeleteDialog=আপনি কি "<strong>%s</strong><span class='notranslate'>পণ্যের বৈকল্পিকটি মুছে ফেলার বিষয়ে নিশ্চিত? >"?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=ভেরিয়েন্টটি মুছে ফেলার সময় একটি ত্রুটি ছিল৷ অনুগ্রহ করে চেক করুন এটি কোন বস্তুতে ব্যবহার করা হচ্ছে না
 ProductCombinations=বৈকল্পিক
 PropagateVariant=বৈকল্পিক প্রচার করুন
@@ -437,4 +433,6 @@ ModifyValueExtrafields = একটি অতিরিক্ত ক্ষেত
 OrProductsWithCategories=অথবা ট্যাগ/বিভাগ সহ পণ্য
 WarningTransferBatchStockMouvToGlobal = আপনি যদি এই পণ্যটিকে ডিসিরিয়ালাইজ করতে চান তবে এর সমস্ত সিরিয়ালাইজড স্টক গ্লোবাল স্টকে রূপান্তরিত হবে
 WarningConvertFromBatchToSerial=যদি আপনার কাছে বর্তমানে পণ্যটির জন্য 2 এর পরিমাণ বেশি বা সমান থাকে, তাহলে এই পছন্দে স্যুইচ করার অর্থ হল আপনার কাছে একই ব্যাচের বিভিন্ন বস্তু সহ একটি পণ্য থাকবে (যখন আপনি একটি অনন্য সিরিয়াল নম্বর চান)। এটি ঠিক করার জন্য একটি ইনভেন্টরি বা ম্যানুয়াল স্টক মুভমেন্ট না হওয়া পর্যন্ত ডুপ্লিকেটটি থাকবে।
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=আপনি কি খসড়া স্থিতিতে ফিরে যাওয়ার বিষয়ে নিশ্চিত?<br>বর্তমানে ইনভেন্টরিতে সেট করা পরিমাণগুলি পুনরায় সেট করা হবে৷
diff --git a/htdocs/langs/bn_IN/receptions.lang b/htdocs/langs/bn_IN/receptions.lang
index 1d70bbb8b32..98141045d8a 100644
--- a/htdocs/langs/bn_IN/receptions.lang
+++ b/htdocs/langs/bn_IN/receptions.lang
@@ -5,8 +5,6 @@ RefReception=রেফ. অভ্যর্থনা
 Reception=অভ্যর্থনা
 Receptions=অভ্যর্থনা
 AllReceptions=সমস্ত অভ্যর্থনা
-Reception=অভ্যর্থনা
-Receptions=অভ্যর্থনা
 ShowReception=রিসেপশন দেখান
 ReceptionsArea=অভ্যর্থনা এলাকা
 ListOfReceptions=অভ্যর্থনা তালিকা
diff --git a/htdocs/langs/bn_IN/sendings.lang b/htdocs/langs/bn_IN/sendings.lang
index c8804dad72f..3f81da35824 100644
--- a/htdocs/langs/bn_IN/sendings.lang
+++ b/htdocs/langs/bn_IN/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=যাচাই করা হয়েছে
 StatusSendingProcessedShort=প্রক্রিয়াকৃত
 SendingSheet=চালান শীট
 ConfirmDeleteSending=আপনি কি এই চালানটি মুছে ফেলার বিষয়ে নিশ্চিত?
-ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmValidateSending=আপনি কি নিশ্চিত <b>%s</b>রেফারেন্স সহ এই চালানটি যাচাই করতে চান >?
 ConfirmCancelSending=আপনি কি নিশ্চিত আপনি এই চালান বাতিল করতে চান?
 DocumentModelMerou=Merou A5 মডেল
 WarningNoQtyLeftToSend=সতর্কতা, কোনো পণ্য পাঠানোর অপেক্ষায় নেই।
@@ -81,6 +81,6 @@ CreationOptions=চালান তৈরির সময় উপলব্ধ
 ShipmentDistribution=চালান বিতরণ
 
 ErrorTooManyCombinationBatchcode=%s লাইনের জন্য কোনও প্রেরণ নেই কারণ গুদাম, পণ্য, ব্যাচ কোডের অনেকগুলি সংমিশ্রণ পাওয়া গেছে (%s)৷
-ErrorNoCombinationBatchcode=warehouse-product-lot/serial (%s, <span class='notranslate'-এর সংমিশ্রণ হিসাবে %s লাইনটি সংরক্ষণ করা যায়নি '>%s</span>, %s) স্টকে পাওয়া যায়নি৷
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
 
 ErrorTooMuchShipped=%s লাইনের জন্য পাঠানো পরিমাণ অর্ডার করা পরিমাণের চেয়ে বেশি হওয়া উচিত নয়
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 72133ff19eb..2e25cc40883 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -164,14 +164,14 @@ InventoryCode=মুভমেন্ট বা ইনভেন্টরি কো
 IsInPackage=প্যাকেজের মধ্যে রয়েছে
 WarehouseAllowNegativeTransfer=স্টক নেতিবাচক হতে পারে
 qtyToTranferIsNotEnough=আপনার সোর্স গুদাম থেকে আপনার কাছে পর্যাপ্ত স্টক নেই এবং আপনার সেটআপ নেতিবাচক স্টকের অনুমতি দেয় না।
-qtyToTranferLotIsNotEnough=আপনার কাছে পর্যাপ্ত স্টক নেই, এই লট নম্বরের জন্য, আপনার সোর্স গুদাম থেকে এবং আপনার সেটআপ নেতিবাচক স্টক অনুমোদন করে না (পণ্যের জন্য Qty '%s' লট সহ '<span ক্লাস ='notranslate'>%s</span>' হল %s গুদাম '%s')।
+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=গুদাম দেখান
 MovementCorrectStock=পণ্যের জন্য স্টক সংশোধন %s
 MovementTransferStock=পণ্য %s অন্য গুদামে স্টক স্থানান্তর
 BatchStockMouvementAddInGlobal=ব্যাচ স্টক গ্লোবাল স্টকে চলে যায় (পণ্য আর ব্যাচ ব্যবহার করে না)
 InventoryCodeShort=Inv./Mov. কোড
 NoPendingReceptionOnSupplierOrder=খোলা ক্রয় আদেশের কারণে কোনো মুলতুবি অভ্যর্থনা
-ThisSerialAlreadyExistWithDifferentDate=এই লট/ক্রমিক নম্বর (<strong>%s</strong>) আগে থেকেই আছে কিন্তু সাথে আছে বিভিন্ন খাবার বা বিক্রির তারিখ (<strong>%s</strong> পাওয়া গেছে কিন্তু আপনি <span> লিখুন span class='notranslate'><strong></span>%s</strong>)।
+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=খোলা (সমস্ত আন্দোলন)
 OpenInternal=খোলা (শুধুমাত্র অভ্যন্তরীণ আন্দোলন)
 UseDispatchStatus=ক্রয় অর্ডার রিসেপশনে পণ্য লাইনের জন্য একটি প্রেরণের অবস্থা (অনুমোদন/প্রত্যাখ্যান) ব্যবহার করুন
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=এই আন্দোলনের সময় 
 ImportFromCSV=আন্দোলনের CSV তালিকা আমদানি করুন
 ChooseFileToImport=ফাইল আপলোড করুন তারপর সোর্স ইম্পোর্ট ফাইল হিসাবে ফাইল নির্বাচন করতে %s আইকনে ক্লিক করুন...
 SelectAStockMovementFileToImport=আমদানি করার জন্য একটি স্টক আন্দোলন ফাইল নির্বাচন করুন
-InfoTemplateImport=আপলোড করা ফাইলের এই ফর্ম্যাট থাকা দরকার (* বাধ্যতামূলক ক্ষেত্রগুলি):<br>উৎস গুদাম* | লক্ষ্য গুদাম* | পণ্য* | পরিমাণ* | লট/ক্রমিক নম্বর<br>CSV অক্ষর বিভাজক হতে হবে "<b>%s span class='notranslate'></b></span>"
+InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=ইনভেন্টরি %s
 ReOpen=আবার খুলুন
 ConfirmFinish=আপনি জায় বন্ধ নিশ্চিত করুন? এটি আপনার ইনভেন্টরিতে প্রবেশ করা আসল পরিমাণে আপনার স্টক আপডেট করতে সমস্ত স্টক মুভমেন্ট তৈরি করবে।
diff --git a/htdocs/langs/bn_IN/stripe.lang b/htdocs/langs/bn_IN/stripe.lang
index e815edfca11..3460a5ac0e9 100644
--- a/htdocs/langs/bn_IN/stripe.lang
+++ b/htdocs/langs/bn_IN/stripe.lang
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=একটি চুক্তি ল
 ToOfferALinkForOnlinePaymentOnFreeAmount=একটি %s যেকোন পরিমাণের অনলাইন পেমেন্ট পেজ অফার করার জন্য URL কোনো বিদ্যমান বস্তু ছাড়াই
 ToOfferALinkForOnlinePaymentOnMemberSubscription=সদস্য সদস্যতার জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
 ToOfferALinkForOnlinePaymentOnDonation=অনুদানের অর্থ প্রদানের জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
-YouCanAddTagOnUrl=এছাড়াও আপনি url প্যারামিটার যোগ করতে পারেন <b>&tag=<i>মানb0ae64758bac><span><span> class='notranslate'></b> আপনার নিজস্ব অর্থপ্রদানের মন্তব্য ট্যাগ যোগ করার জন্য সেই URLগুলির যে কোনো একটিতে (শুধুমাত্র অর্থপ্রদানের জন্য বাধ্যতামূলক) কোন বিদ্যমান বস্তু ছাড়া পেমেন্টের URL, আপনি প্যারামিটার যোগ করতে পারেন <strong>&noidempotency=1</strong> তাই একই ট্যাগের সাথে একই লিঙ্ক বেশ কয়েকবার ব্যবহার করা যেতে পারে (কিছু পেমেন্ট মোড এই প্যারামিটার ব্যতীত প্রতিটি আলাদা লিঙ্কের জন্য পেমেন্ট 1-এ সীমাবদ্ধ করতে পারে)
+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=স্বয়ংক্রিয়ভাবে পেমেন্ট তৈরি করার জন্য url <b>%s</b> দিয়ে আপনার স্ট্রাইপ সেটআপ করুন স্ট্রাইপ দ্বারা যাচাই করা হয়েছে।
 AccountParameter=অ্যাকাউন্ট প্যারামিটার
 UsageParameter=ব্যবহারের পরামিতি
diff --git a/htdocs/langs/bn_IN/trips.lang b/htdocs/langs/bn_IN/trips.lang
index 10f130fc157..1ebf236cdc8 100644
--- a/htdocs/langs/bn_IN/trips.lang
+++ b/htdocs/langs/bn_IN/trips.lang
@@ -45,9 +45,9 @@ expenseReportRangeMoreThan=%d এর চেয়ে বেশি
 expenseReportTotalForFive=<u>d</u> = 5 সহ উদাহরণ
 ExpenseReportApplyTo=আবেদন করতে
 ExpenseReportApproved=একটি ব্যয় রিপোর্ট অনুমোদিত হয়
-ExpenseReportApprovedMessage=ব্যয় প্রতিবেদন %s অনুমোদিত হয়েছে।<br> - ব্যবহারকারী: %s<span> class='notranslate'><br></span> - এর দ্বারা অনুমোদিত: %s<br>খরচ প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন:  span class='notranslate'>%s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=একটি খরচ রিপোর্ট বাতিল করা হয়েছে
-ExpenseReportCanceledMessage=ব্যয় প্রতিবেদন %s বাতিল করা হয়েছে।<br> - ব্যবহারকারী: %s<span><span> class='notranslate'><br></span> - এর দ্বারা বাতিল করা হয়েছে: %s<br> - বাতিলের উদ্দেশ্য: <span class= class= 'notranslate'>%s</span><br>ব্যয় প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন: %s
+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
 ExpenseReportConstraintViolationError=সর্বাধিক পরিমাণ ছাড়িয়ে গেছে (নিয়ম %s): %s %s থেকে বেশি ( হারাম ছাড়িয়ে যাওয়া)
 ExpenseReportConstraintViolationWarning=সর্বাধিক পরিমাণ ছাড়িয়ে গেছে (নিয়ম %s): %s %s থেকে বেশি ( অনুমোদনের চেয়ে বেশি)
 ExpenseReportDateEnd=তারিখ শেষ
@@ -62,13 +62,13 @@ ExpenseReportPaidMessage=খরচের রিপোর্ট %s দেওয
 ExpenseReportPayment=ব্যয় প্রতিবেদন প্রদান
 ExpenseReportRef=রেফ. ব্যয় রিপোর্ট
 ExpenseReportRefused=একটি খরচ রিপোর্ট প্রত্যাখ্যান করা হয়েছে
-ExpenseReportRefusedMessage=ব্যয়ের প্রতিবেদন %s প্রত্যাখ্যান করা হয়েছে।<br> - ব্যবহারকারী: %s<span><span> class='notranslate'><br></span> - প্রত্যাখ্যান করেছেন: %s<br> - প্রত্যাখ্যানের উদ্দেশ্য: <span class=class= 'notranslate'>%s</span><br>ব্যয় প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন: %s
+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
 ExpenseReportRestrictive=হারাম ছাড়িয়ে গেছে
 ExpenseReportRuleErrorOnSave=ত্রুটি: %s
 ExpenseReportRuleSave=খরচ রিপোর্ট নিয়ম সংরক্ষিত
 ExpenseReportRulesDesc=আপনি ব্যয় প্রতিবেদনের জন্য সর্বাধিক পরিমাণের নিয়ম নির্ধারণ করতে পারেন। এই নিয়মগুলি প্রয়োগ করা হবে যখন একটি নতুন ব্যয় একটি ব্যয় প্রতিবেদনে যোগ করা হয়
 ExpenseReportWaitingForApproval=একটি নতুন ব্যয় প্রতিবেদন অনুমোদনের জন্য জমা দেওয়া হয়েছে
-ExpenseReportWaitingForApprovalMessage=একটি নতুন ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে এবং অনুমোদনের জন্য অপেক্ষা করছে৷<br> - ব্যবহারকারী: %s <br> - সময়কাল: %s<br>বৈধকরণ করতে এখানে ক্লিক করুন: <span class='notranslate'>b0849fz span>
+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=পুনঃঅনুমোদনের জন্য একটি ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে
 ExpenseReportWaitingForReApprovalMessage=একটি ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে এবং পুনরায় অনুমোদনের জন্য অপেক্ষা করছে৷<br>The %s, আপনি এর জন্য ব্যয় প্রতিবেদন অনুমোদন করতে অস্বীকার করেছেন এই কারণে: %s।<br>একটি নতুন সংস্করণ প্রস্তাব করা হয়েছে এবং আপনার অনুমোদনের জন্য অপেক্ষা করছে। <br> - ব্যবহারকারী: %s<br> - সময়কাল: b0ecb2ecb9fz84 <br>প্রমাণিত করতে এখানে ক্লিক করুন: %s
 ExpenseReportsIk=মাইলেজ চার্জ কনফিগারেশন
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
index 21234aca461..25d3716e8a0 100644
--- a/htdocs/langs/bn_IN/users.lang
+++ b/htdocs/langs/bn_IN/users.lang
@@ -26,7 +26,7 @@ ConfirmDeleteUser=আপনি কি নিশ্চিত যে আপনি
 ConfirmDeleteGroup=আপনি কি <b>%s</b> গোষ্ঠী মুছে ফেলার বিষয়ে নিশ্চিত?
 ConfirmEnableUser=আপনি কি ব্যবহারকারী <b>%s</b> সক্ষম করার বিষয়ে নিশ্চিত?
 ConfirmReinitPassword=আপনি কি নিশ্চিত যে আপনি ব্যবহারকারীর জন্য একটি নতুন পাসওয়ার্ড তৈরি করতে চান <b>%s</b>?
-ConfirmSendNewPassword=আপনি কি নিশ্চিত যে আপনি ব্যবহারকারীর জন্য নতুন পাসওয়ার্ড তৈরি এবং পাঠাতে চান <b>%s<span class='notranslate'></b></span span>?
+ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
 NewUser=নতুন ব্যবহারকারী
 CreateUser=ব্যবহারকারী তৈরি করুন
 LoginNotDefined=লগইন সংজ্ঞায়িত করা হয় না.
@@ -45,7 +45,7 @@ CreateGroup=গ্রুপ তৈরি করুন
 RemoveFromGroup=দল থেকে বহিষ্কার করা
 PasswordChangedAndSentTo=পাসওয়ার্ড পরিবর্তন করে <b>%s</b>-এ পাঠানো হয়েছে।
 PasswordChangeRequest=<b>%s</b>-এর পাসওয়ার্ড পরিবর্তন করার অনুরোধ করুন
-PasswordChangeRequestSent=<b>%s</b> এর পাসওয়ার্ড পরিবর্তন করার অনুরোধ <span class= এ পাঠানো হয়েছে 'notranslate'><b></span>%s</b>।
+PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 IfLoginExistPasswordRequestSent=যদি এই লগইনটি একটি বৈধ অ্যাকাউন্ট হয় (একটি বৈধ ইমেল সহ), পাসওয়ার্ড পুনরায় সেট করার জন্য একটি ইমেল পাঠানো হয়েছে৷
 IfEmailExistPasswordRequestSent=যদি এই ইমেলটি একটি বৈধ অ্যাকাউন্ট হয়, তাহলে পাসওয়ার্ড রিসেট করার জন্য একটি ইমেল পাঠানো হয়েছে (আপনি কিছু না পেলে আপনার স্প্যাম ফোল্ডার চেক করতে ভুলবেন না)
 ConfirmPasswordReset=পাসওয়ার্ড রিসেট নিশ্চিত করুন
@@ -133,4 +133,4 @@ HideAllPerms=সমস্ত অনুমতি সারি লুকান
 UserPublicPageDesc=আপনি এই ব্যবহারকারীর জন্য একটি ভার্চুয়াল কার্ড সক্ষম করতে পারেন৷ ব্যবহারকারীর প্রোফাইল এবং একটি বারকোড সহ একটি ইউআরএল উপলব্ধ থাকবে যাতে স্মার্টফোন সহ যে কেউ এটিকে স্ক্যান করতে এবং আপনার পরিচিতিকে এর ঠিকানা বইতে যুক্ত করতে দেয়৷
 EnablePublicVirtualCard=ব্যবহারকারীর ভার্চুয়াল ব্যবসা কার্ড সক্রিয় করুন
 UserEnabledDisabled=ব্যবহারকারীর স্থিতি পরিবর্তিত হয়েছে: %s
-AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
+AlternativeEmailForOAuth2=OAuth2 লগইনের জন্য বিকল্প ইমেল
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 004039bc0e3..4dcb5c8d819 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -49,11 +49,11 @@ SetHereVirtualHost=<u>Apache/NGinx এর সাথে ব্যবহার ক
 ExampleToUseInApacheVirtualHostConfig=Apache ভার্চুয়াল হোস্ট সেটআপে ব্যবহার করার উদাহরণ:
 YouCanAlsoTestWithPHPS=<u>PHP এম্বেডেড সার্ভারের সাথে ব্যবহার করুন</u><br>উন্নত পরিবেশে, আপনি করতে পারেন <br><strong>php -S 0.0.0.0 চালিয়ে PHP এমবেডেড ওয়েব সার্ভার (PHP 5.5 প্রয়োজনীয়) দিয়ে সাইটটি পরীক্ষা করতে পছন্দ করুন :8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>অন্য Dolibarr হোস্টিং প্রদানকারীর সাথে আপনার ওয়েব সাইট চালান</u><br> ইন্টারনেটে Apache বা NGinx-এর মতো কোনো ওয়েব সার্ভার উপলব্ধ নেই, আপনি আপনার ওয়েব সাইটটিকে অন্য Dolibarr হোস্টিং প্রদানকারী দ্বারা প্রদত্ত অন্য Dolibarr উদাহরণে রপ্তানি এবং আমদানি করতে পারেন যা ওয়েবসাইট মডিউলের সাথে সম্পূর্ণ একীকরণ প্রদান করে। আপনি <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>-এ কিছু Dolibarr হোস্টিং প্রদানকারীর একটি তালিকা পেতে পারেন
-CheckVirtualHostPerms=ভার্চুয়াল হোস্ট ব্যবহারকারীর (উদাহরণস্বরূপ www-ডেটা) <strong>%sb0a65d071f6fcz9 আছে কিনা পরীক্ষা করুন  ফাইলগুলিতে <br><strong>%s<span ক্লাসে অনুমতি ='notranslate'></strong></span>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=পড়ুন
 WritePerm=লিখুন
 TestDeployOnWeb=ওয়েবে পরীক্ষা/নিয়োগ করুন
-PreviewSiteServedByWebServer=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s একটি বহিরাগত ওয়েব সার্ভার (যেমন Apache, NginxIS, Nginx) দ্বারা পরিবেশিত হবে ) ডিরেক্টরিতে নির্দেশ করার আগে আপনাকে অবশ্যই এই সার্ভারটি ইনস্টল এবং সেটআপ করতে হবে:<br><strong>%s span><span class='notranslate'></strong><br>বাহ্যিক সার্ভার দ্বারা পরিবেশিত URL:<br><strong>%s</strong>
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s Dolibarr সার্ভার দ্বারা পরিবেশিত হবে তাই এটির কোনো অতিরিক্ত ওয়েব সার্ভারের প্রয়োজন নেই (যেমন Apache, Nginx, IIS) ইনস্টল করতে হবে।<br>অসুবিধে হল যে পৃষ্ঠাগুলির URLগুলি ব্যবহারকারী বান্ধব নয় এবং আপনার Dolibarr এর পথ দিয়ে শুরু হয়৷<span class= Dolibarr দ্বারা পরিবেশিত URL /span></strong><br><br>এতে আপনার নিজস্ব বাহ্যিক ওয়েব সার্ভার ব্যবহার করতে এই ওয়েব সাইটটি পরিবেশন করুন, আপনার ওয়েব সার্ভারে একটি ভার্চুয়াল হোস্ট তৈরি করুন যা নির্দেশিকা নির্দেশ করে<br><strong>%s</strong><br>তারপর এই ওয়েবসাইটের বৈশিষ্ট্যগুলিতে এই ভার্চুয়াল সার্ভারের নাম লিখুন এবং ক্লিক করুন লিঙ্ক "টেস্ট/ডেপ্লয় অন ওয়েব"।
 VirtualHostUrlNotDefined=বহিরাগত ওয়েব সার্ভার দ্বারা পরিবেশিত ভার্চুয়াল হোস্টের URL সংজ্ঞায়িত করা হয়নি
 NoPageYet=এখনো কোনো পৃষ্ঠা নেই
@@ -63,7 +63,7 @@ YouCanEditHtmlSourceckeditor=আপনি সম্পাদকের "উৎস
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=একটি শেয়ার লিঙ্কের সাথে শেয়ার করা একটি ছবির জন্য (ফাইলের শেয়ারিং হ্যাশ কী ব্যবহার করে খোলা অ্যাক্সেস), সিনট্যাক্স হল:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;016f7f7f7012 <br>
-YouCanEditHtmlSource3=একটি PHP বস্তুর ছবির URL পেতে, <br><strong>&lt; span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt; class='notranslate'>&gt;</span></strong><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>এইচটিএমএল বা ডায়নামিক কোডের আরও উদাহরণ <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">উইকি ডকুমেন্টেশনb0e40dc6587এ উপলব্ধ >।<br>
 ClonePage=ক্লোন পৃষ্ঠা/ধারক
 CloneSite=ক্লোন সাইট
@@ -118,7 +118,7 @@ DeleteAlsoMedias=এই ওয়েবসাইটের জন্য নির
 MyWebsitePages=আমার ওয়েবসাইট পেজ
 SearchReplaceInto=অনুসন্ধান | মধ্যে প্রতিস্থাপন
 ReplaceString=নতুন স্ট্রিং
-CSSContentTooltipHelp=এখানে CSS কন্টেন্ট লিখুন। অ্যাপ্লিকেশনের CSS-এর সাথে কোনো দ্বন্দ্ব এড়াতে, .bodywebsite ক্লাসের সাথে সমস্ত ঘোষণা আগে-প্রান্তে রাখতে ভুলবেন না। যেমন:<br><br>#mycssselector, input.myclass:hover { ...  <br>অবশ্যই<br>।bodywebsite #mycssselector, .bodywebsite input.myclass:হোভার { ... b0342fccfda19>b0342fccfda19 <span class='notranslate'><br>দ্রষ্টব্য: যদি আপনার কাছে এই উপসর্গ ছাড়া একটি বড় ফাইল থাকে, তাহলে আপনি 'lessc' ব্যবহার করে এটিকে রূপান্তর করতে .bodywebsite উপসর্গটি সর্বত্র যুক্ত করতে পারেন।
+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=সতর্কতা: এই বিষয়বস্তু আউটপুট শুধুমাত্র যখন সাইট একটি সার্ভার থেকে অ্যাক্সেস করা হয়. এটি সম্পাদনা মোডে ব্যবহার করা হয় না তাই যদি আপনাকে জাভাস্ক্রিপ্ট ফাইলগুলিকে সম্পাদনা মোডেও লোড করতে হয়, তাহলে পৃষ্ঠায় আপনার ট্যাগ 'script src=...' যোগ করুন।
 Dynamiccontent=গতিশীল বিষয়বস্তু সহ একটি পৃষ্ঠার নমুনা
 EditInLineOnOff=মোড 'ইনলাইন সম্পাদনা' হল %s
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index e4dcff5a246..f74ef6f05a8 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -47,7 +47,7 @@ MakeBankTransferOrder=একটি ক্রেডিট স্থানান
 WithdrawRequestsDone=%s সরাসরি ডেবিট অর্থপ্রদানের অনুরোধ রেকর্ড করা হয়েছে
 BankTransferRequestsDone=%s ক্রেডিট ট্রান্সফার অনুরোধ রেকর্ড করা হয়েছে
 ThirdPartyBankCode=তৃতীয় পক্ষের ব্যাঙ্ক কোড
-NoInvoiceCouldBeWithdrawed=কোনো চালান সফলভাবে প্রক্রিয়া করা হয়নি। যাচাই করুন যে চালানগুলি একটি বৈধ IBAN সহ কোম্পানিগুলিতে রয়েছে এবং IBAN এর একটি UMR (অনন্য ম্যান্ডেট রেফারেন্স) মোড <strong>%s<span><span> span class='notranslate'></strong></span>।
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
 NoInvoiceCouldBeWithdrawedSupplier=কোনো চালান সফলভাবে প্রক্রিয়া করা হয়নি। একটি বৈধ IBAN সহ কোম্পানিগুলিতে চালানগুলি রয়েছে তা পরীক্ষা করুন৷
 NoSalariesCouldBeWithdrawed=কোন বেতন সফলভাবে প্রক্রিয়া করা হয়েছে. বৈধ IBAN সহ ব্যবহারকারীদের বেতন আছে কিনা তা পরীক্ষা করুন।
 WithdrawalCantBeCreditedTwice=এই প্রত্যাহার রসিদ ইতিমধ্যেই ক্রেডিট হিসাবে চিহ্নিত করা হয়েছে; এটি দুবার করা যাবে না, কারণ এটি সম্ভাব্য ডুপ্লিকেট পেমেন্ট এবং ব্যাঙ্ক এন্ট্রি তৈরি করবে।
@@ -66,9 +66,9 @@ WithdrawalRefusedConfirm=আপনি কি নিশ্চিত যে আপ
 RefusedData=প্রত্যাখ্যানের তারিখ
 RefusedReason=প্রত্যাখ্যানের কারণ
 RefusedInvoicing=প্রত্যাখ্যান বিল করা
-NoInvoiceRefused=Do not charge the customer for the refusal
-InvoiceRefused=Charge the customer for the refusal
-DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
+NoInvoiceRefused=প্রত্যাখ্যানের জন্য গ্রাহককে চার্জ করবেন না
+InvoiceRefused=প্রত্যাখ্যানের জন্য গ্রাহককে চার্জ করুন
+DirectDebitRefusedInvoicingDesc=এই প্রত্যাখ্যানটি গ্রাহকের কাছে চার্জ করা আবশ্যক বলে একটি পতাকা সেট করুন
 StatusDebitCredit=স্ট্যাটাস ডেবিট/ক্রেডিট
 StatusWaiting=অপেক্ষা করছে
 StatusTrans=পাঠানো হয়েছে
@@ -152,7 +152,7 @@ ADDDAYS=মৃত্যুদন্ডের তারিখে দিন যো
 NoDefaultIBANFound=এই তৃতীয় পক্ষের জন্য কোনো ডিফল্ট IBAN পাওয়া যায়নি
 ### Notifications
 InfoCreditSubject=ব্যাঙ্কের সরাসরি ডেবিট পেমেন্ট অর্ডার %s পেমেন্ট
-InfoCreditMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কের দ্বারা দেওয়া হয়েছে<br>প্রদানের ডেটা: %s 
+InfoCreditMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কের দ্বারা দেওয়া হয়েছে<br>প্রদানের ডেটা: %s
 InfoTransSubject=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কে ট্রান্সমিশন
 InfoTransMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কে পাঠানো হয়েছে %s %s .<br><br>
 InfoTransData=পরিমাণ: %s<br>পদ্ধতি: %s<br>তারিখ: %s
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=ক্রেডিট ট্রান্সফারের
 RefSalary=বেতন
 NoSalaryInvoiceToWithdraw='%s'-এর জন্য কোনো বেতন অপেক্ষা করছে না। একটি অনুরোধ করতে বেতন কার্ডে '%s' ট্যাবে যান৷
 SalaryInvoiceWaitingWithdraw=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্টের অপেক্ষায় বেতন
-
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 53ad6a2eef4..7e7b144dee7 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -85,7 +85,7 @@ AccountancyAreaDescDonation=KORAK %s: Definirajte zadane računovodstvene račun
 AccountancyAreaDescSubscription=KORAK %s: Definirajte zadane računovodstvene račune za pretplatu članova. Za ovo koristite unos menija %s.
 AccountancyAreaDescMisc=KORAK %s: Definirajte obavezne zadane račune i zadane računovodstvene račune za razne transakcije. Za ovo koristite unos menija %s.
 AccountancyAreaDescLoan=KORAK %s: Definirajte zadane računovodstvene račune za kredite. Za ovo koristite unos menija %s.
-AccountancyAreaDescBank=KORAK %s: Definirajte računovodstvene račune i šifru dnevnika za svaku banku b01f882f7e6484z račune. Za ovo koristite unos menija <span class='notranslate'>%s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescProd=KORAK %s: Definirajte računovodstvene račune na vašim proizvodima/uslugama. Za ovo koristite unos menija %s.
 
 AccountancyAreaDescBind=KORAK %s: Provjerite vezu između postojećih %s redova i račun je račun gotovo, tako da će aplikacija moći da evidentira transakcije u Ledgeru jednim klikom. Kompletne veze koje nedostaju. Za ovo koristite unos menija %s.
@@ -335,7 +335,6 @@ CategoryDeleted=Kategorija za računovodstveni račun je uklonjena
 AccountingJournals=Računovodstveni časopisi
 AccountingJournal=Računovodstveni časopis
 NewAccountingJournal=Novi računovodstveni dnevnik
-ShowAccountingJournal=Prikaži računovodstveni dnevnik
 NatureOfJournal=Priroda časopisa
 AccountingJournalType1=Razne operacije
 AccountingJournalType2=Prodaja
@@ -353,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Onemogućite uvezivanje i prijenos u računo
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Onemogućite uvezivanje i prijenos u računovodstvu na kupovini (fakture dobavljača neće se uzeti u obzir u računovodstvu)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Onemogućite uvezivanje i prijenos u računovodstvu na izvještajima o troškovima (izvještaji o troškovima neće se uzeti u obzir u računovodstvu)
 ACCOUNTING_ENABLE_LETTERING=Omogućite funkciju slova u računovodstvu
-ACCOUNTING_ENABLE_LETTERING_DESC=Kada je ova opcija omogućena, možete definirati, na svakom knjigovodstvenom unosu, šifru tako da možete zajedno grupirati različita računovodstvena kretanja. U prošlosti, kada se različitim časopisima upravljalo nezavisno, ova karakteristika je bila neophodna za grupisanje linija kretanja različitih časopisa zajedno. Međutim, kod Dolibarr računovodstva, takav kod za praćenje, nazvan "<b>%s<span class='notranslate'>b09a4b739f17f8z span>" je već automatski sačuvan, tako da je automatsko ispisivanje već urađeno, bez rizika od greške, tako da je ova funkcija postala beskorisna za uobičajenu upotrebu. Funkcija ručnog pisanja slova je predviđena za krajnje korisnike koji zaista nemaju povjerenja u kompjuterski mehanizam koji vrši prijenos podataka u računovodstvu.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Omogućavanje ove funkcije više nije potrebno za rigorozno računovodstveno upravljanje.
 ACCOUNTING_ENABLE_AUTOLETTERING=Omogućite automatsko pisanje slova prilikom prelaska na računovodstvo
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kôd za natpis se automatski generira i inkrementirano i nije izabrao krajnji korisnik
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index d25ff99fb5c..13cc4c7b8be 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=Sljedeća vrijednost (fakture)
 NextValueForCreditNotes=Sljedeća vrijednost (KO)
 NextValueForDeposit=Sljedeća vrijednost (kapara)
 NextValueForReplacements=Slijedeća vrijednost (zamjene)
-MustBeLowerThanPHPLimit=Napomena: vaša PHP konfiguracija trenutno ograničava maksimalnu veličinu datoteke za otpremanje na <b>%s</b> span> <span class='notranslate'>%s, bez obzira na vrijednost ovog parametra
+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=Napomena: U vašoj PHP konfiguraciji nije postavljeno ograničenje
 MaxSizeForUploadedFiles=Maksimalna veličina za otpremljene fajlove (0 da zabrani bilo kakvo otpremanje)
 UseCaptchaCode=Koristite grafički kod (CAPTCHA) na stranici za prijavu i nekim javnim stranicama
@@ -221,8 +221,8 @@ ModulesDevelopDesc=Također možete razviti vlastiti modul ili pronaći partnera
 DOLISTOREdescriptionLong=Umjesto da uključite <a href="https://www.dolistore.com">www.dolistore.com</a> web stranicu kako biste pronašli vanjski modul, možete koristiti ovaj ugrađeni alat koji izvršit će pretragu na vanjskom tržištu umjesto vas (možda je spor, potreban vam je pristup internetu)...
 FreeModule=Besplatno
 CompatibleUpTo=Kompatibilan s verzijom %s
-NotCompatible=Čini se da ovaj modul nije kompatibilan s vašim Dolibarr %s (Min %s - Max <span class='notranslate'>b0ecb2ec87f49 raspon>).
-CompatibleAfterUpdate=Ovaj modul zahtijeva ažuriranje vašeg Dolibarra %s (Min %s - Max <span class='notranslate'>%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=Vidi u Market place
 SeeSetupOfModule=Pogledajte postavljanje modula %s
 SeeSetupPage=Pogledajte stranicu za postavljanje na %s
@@ -250,7 +250,7 @@ Security=Sigurnost
 Passwords=Lozinke
 DoNotStoreClearPassword=Šifrirajte lozinke pohranjene u bazi podataka (NE kao običan tekst). Preporučuje se aktiviranje ove opcije.
 MainDbPasswordFileConfEncrypted=Šifrirajte lozinku baze podataka pohranjenu u conf.php. Preporučuje se aktiviranje ove opcije.
-InstrucToEncodePass=Za šifriranje lozinke u datoteku <b>conf.php</b>, zamijenite redak b0342fccfda19bz /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0392bzcfda >od<br><b>$dolibarr_main_db_pass="crypted:b0ecb2ec87f49"; span class='notranslate'></b>
+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=Da bi lozinka bila dekodirana (obrisana) u datoteku <b>conf.php</b>, zamijenite redak <br><b>$dolibarr_main_db_pass="crypted:...";</b>'<span' ><br></span>od<br><b>$dolibarr_main_db_pass="<span>fccfda19bz0</span><b>$dolibarr_main_db_pass="<span>fccfda19bz0</span>fccfda19bz0</span> ";</b>
 ProtectAndEncryptPdfFiles=Zaštitite generirane PDF datoteke. Ovo se NE preporučuje jer prekida masovno generiranje PDF-a.
 ProtectAndEncryptPdfFilesDesc=Zaštita PDF dokumenta čini ga dostupnim za čitanje i štampanja u bilo kojem PDF pretraživaču. Međutim, uređivanje i kopiranja više nije moguće. Imajte na umu da korištenje ove funkcije čini da izgradnja globalnih spojenih PDF-ova ne funkcionira.
@@ -269,7 +269,7 @@ ExternalResources=Eksterni resursi
 SocialNetworks=Društvene mreže
 SocialNetworkId=ID društvene mreže
 ForDocumentationSeeWiki=Za dokumentaciju za korisnike ili programere (Doc, FAQ...),<br>pogledajte Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dccz05 </b>
-ForAnswersSeeForum=Za sva druga pitanja/pomoć možete koristiti Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer"> /span><span class='notranslate'>%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=Evo nekih resursa za dobijanje pomoći i podrške za Dolibarr.
 HelpCenterDesc2=Neki od ovih resursa dostupni su samo na <b>engleskom</b>.
 CurrentMenuHandler=Trenutni rukovalac menijem
@@ -290,8 +290,8 @@ EMailsSetup=Podešavanje e-pošte
 EMailsDesc=Ova stranica vam omogućava da postavite parametre ili opcije za slanje e-pošte.
 EmailSenderProfiles=Profili pošiljaoca e-pošte
 EMailsSenderProfileDesc=Ovaj odjeljak možete ostaviti praznim. Ako ovdje unesete neke e-mailove, oni će biti dodati na listu mogućih pošiljatelja u kombobox kada napišete novu e-poštu.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS port (zadana vrijednost u php.ini: <b>%s<span class='notranslate'>b09a4b739f17f8f8 >)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (podrazumevana vrijednost u php.ini: <b>%s<span class='notranslate'>b09a4b839f17f17f >)
+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
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host
 MAIN_MAIL_EMAIL_FROM=E-pošta pošiljaoca za automatske e-poruke
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=Ovo je alternativno podešavanje za ručnu obra
 StepNb=Korak %s
 FindPackageFromWebSite=Pronađite paket koji pruža funkcije koje su vam potrebne (na primjer na službenoj web stranici %s).
 DownloadPackageFromWebSite=Preuzmite paket (na primjer sa službene web stranice %s).
-UnpackPackageInDolibarrRoot=Raspakirajte/raspakujte upakovane datoteke u direktorij vašeg Dolibarr servera: <b>%s<span class='notranslate'>b09a4b839f17f17f >
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=Da biste postavili/instalirali eksterni modul, morate raspakirati/raspakovati arhivsku datoteku u serverski direktorij posvećen vanjskim modulima:<br><b>%s</b>
 SetupIsReadyForUse=Postavljanje modula je završeno. Međutim, morate omogućiti i postavljanje modula u vašoj aplikaciji tako što ćete otići na stranicu za podešavanje modula: <a href="%s">%s</a>.
 NotExistsDirect=Alternativni korijenski direktorij nije definiran u postojećem direktoriju.<br>
 InfDirAlt=Od verzije 3, moguće je definirati alternativni korijenski direktorij. Ovo vam omogućava da pohranite, u namjenski direktorij, dodatke i prilagođene šablone.<br>Samo kreirajte direktorij u korijenu od Dolibarra (npr. prilagođeno).<br>
-InfDirExample=<br>Zatim ga deklarirajte u datoteci <strong>conf.php</strong><span><span> class='notranslate'><br></span> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_rootth_alt/of/docs<br>$dolibarr_main_document_rootth_alt/of/dot='/palibarr 'notranslate'><br></span>Ako su ovi redovi komentarisani sa "#", da biste ih omogućili, samo dekomentirajte uklanjanjem znaka "#".
+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=Ovdje možete učitati .zip datoteku modul paketa:
 CurrentVersion=Dolibarr trenutna verzija
 CallUpdatePage=Dođite do stranice koja ažurira strukturu baze podataka i podaci: %s.
@@ -361,14 +361,14 @@ LastActivationIP=Najnovija IP adresa za aktivaciju
 LastActivationVersion=Najnovija verzija za aktivaciju
 UpdateServerOffline=Ažurirajte server van mreže
 WithCounter=Upravljajte šalterom
-GenericMaskCodes=Možete uneti bilo koju masku za numerisanje. U ovoj maski se mogu koristiti sljedeće oznake:<br><b>{000000}b09a4b739f17f17 /span> odgovara broju koji će biti povećan na svakom <span class='notranslate'>%s. Unesite onoliko nula koliko je željena dužina brojača. Brojač će biti upotpunjen nulama s lijeve strane kako bi imali onoliko nula koliko je maska. <br><b>{000000+000}</b>, ali isto kao i prethodni pomak koji odgovara broju desno od znaka + primjenjuje se počevši od prvog %s. <br><b>{000000@x}</b> isto kao i prethodni brojač se resetuje na nulu kada se dostigne mesec x (x između 1 i 12, ili 0 da se koriste prvi meseci fiskalne godine definisane u vašoj konfiguraciji, ili 99 da se vrati na nula svakog mjeseca). Ako se koristi ova opcija i x je 2 ili više, tada je potreban niz {yy}{mm} ili {yyyy}{mm}. <br><b>{dd}</b> dan (01 do 31). span class='notranslate'><br></span><b>{mm}</b> mjesec (01 do 12).<span). class='notranslate'><br></span><b>{yy}</b>, <span class='notranslate80b3365e87b36b739f17f8z0 </span>{yyyy}</b> ili <b>{y}</b> godine preko 2, 4 ili 1 broja. <span class='notranslate'><br>
-GenericMaskCodes2=<b>{cccc}</b> klijentski kod na n znakova<br><b>{cccc000}b09a7b7839f kod klijenta na n znakova slijedi brojač posvećen kupcu. Ovaj brojač posvećen kupcu se resetuje u isto vreme kada i globalni brojač.<span class='notranslate'><br><b>{tttt} </b> Kôd tipa treće strane na n znakova (pogledajte meni Početna - Podešavanje - Rečnik - Tipovi trećih strana). Ako dodate ovu oznaku, brojač će biti drugačiji za svaku vrstu treće strane.<br>
+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=Svi ostali znakovi u maski će ostati netaknuti.<br>Razmaci nisu dozvoljeni.<br>
 GenericMaskCodes3EAN=Svi ostali znakovi u maski će ostati netaknuti (osim * ili ? na 13. poziciji u EAN13).<br>Razmaci nisu dozvoljeni.<br> span>U EAN13, posljednji znak nakon posljednjeg } na 13. poziciji treba biti * ili ? . Bit će zamijenjen izračunatim ključem.<br>
 GenericMaskCodes4a=<u>Primjer na 99. %s treće strane TheCompany, sa datumom 31.01.2023:</u><br>
-GenericMaskCodes4b=<u>Primjer treće strane kreiran 31.01.2023:</u><span class='notranslate'><br> >
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>Primjer proizvoda kreiranog 31.01.2023:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> će dati b0aee833365 span>ABC2301-000099</b><br>b0aee83365837{000@0000 }-ZZZ/{dd}/XXX<span class='notranslate'></b> će dati <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> će dati <b>IN2301-0099-A</b> tip kompanije 'Responsable Inscripto' sa kodom za tip koji je 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Vraća prilagodljivi broj prema definiranoj maski.
 ServerAvailableOnIPOrPort=Server je dostupan na adresi <b>%s</b> na portu <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nije dostupan na adresi <b>%s</b> na portu <b>%s</b>
@@ -390,7 +390,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Fajlovi .lang učitani u dijeljenu memo
 LanguageFile=Jezički fajl
 ExamplesWithCurrentSetup=Primjeri sa trenutnom konfiguracijom
 ListOfDirectories=Lista direktorija OpenDocument predložaka
-ListOfDirectoriesForModelGenODT=Lista direktorija koji sadrže datoteke šablona u OpenDocument formatu.<br><br>Ovdje stavite punu putanju direktorija.<br>Dodajte povratnu kartu između eah direktorija.<br>Da dodate direktorij GED modula, dodajte ovdje b0aee83365837f >DOL_DATA_ROOT/ecm/yourdirectoryname<span class='notranslate'></b>.<br>b0342fccfda19b te direktorije mora završiti sa <span class='notranslate'><b>.odt</b> ili <b>.ods. ='notranslate'></b></span>.
+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=Broj ODT/ODS datoteka predložaka pronađenih u ovim direktorijima
 ExampleOfDirectoriesForModelGen=Primjeri sintakse:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Da biste znali kako kreirati svoje odt šablone dokumenata, prije nego što ih pohranite u te direktorije, pročitajte wiki dokumentaciju:
@@ -460,11 +460,11 @@ ComputedFormula=Izračunato polje
 ComputedFormulaDesc=Ovdje možete unijeti formulu koristeći druga svojstva objekta ili bilo koje PHP kodiranje da biste dobili dinamičku izračunatu vrijednost. Možete koristiti bilo koju PHP kompatibilnu formulu uključujući "?" operator uvjeta, i sljedeći globalni objekat: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield </strong>.<br><strong>UPOZORENJE<span><br></span><strong>UPOZORENJE<span>b01cf607f67 </span>: Ako su vam potrebna svojstva objekta koji nije učitan, samo dohvatite sebi objekat u svoju formulu kao u drugom primjeru.<br>Upotreba izračunatog polja znači da možete' t unesite sebi bilo koju vrijednost iz interfejsa. Također, ako postoji sintaksička greška, formula može ništa vratiti.<br><br>Primjer formule:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Primjer za ponovno učitavanje objekta<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * >capital / 5: '-1')<br><br>Drugi primjer formule za prisilno učitavanje objekta i njegov nadređeni objekat:<br>(($reloadedobj = novi zadatak($db)) && ($reloadedobj->fetchNoCompute-($objectoffield) ) > 0) && ($secondloadedobj = novi projekat($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Nadređeni projekat nije pronađen'
 Computedpersistent=Spremite izračunato polje
 ComputedpersistentDesc=Izračunata dodatna polja će biti pohranjena u bazi podataka, međutim, vrijednost će biti ponovo izračunata samo kada se promijeni objekt ovog polja. Ako izračunato polje ovisi o drugim objektima ili globalnim podacima, ova vrijednost može biti pogrešna!!
-ExtrafieldParamHelpPassword=Ako ovo polje ostavite praznim, znači da će ova vrijednost biti pohranjena BEZ šifriranja (polje je samo skriveno sa zvijezdama na ekranu).<br><br>Unesite vrijednost 'dolcrypt' za kodiranje vrijednosti pomoću reverzibilnog algoritma šifriranja. Čisti podaci se i dalje mogu znati i uređivati, ali su šifrirani u bazi podataka.<br><span class='notranslate'><br> span>Unesite 'auto' (ili 'md5', 'sha256', 'password_hash', ...) da koristite zadani algoritam šifriranja lozinke (ili md5, sha256, password_hash...) za spremanje nepovratne heširane lozinke u baza podataka (nema načina da se povrati originalna vrijednost)
-ExtrafieldParamHelpselect=Lista vrijednosti mora biti redova s ključem formata, vrijednosti (gdje ključ ne može biti '0')<br><br> na primjer : <br>1,value1<br>2,value2<br>3code span class='notranslate'><br></span>...<br><br>Da bi lista zavisila od drugog komplementarna lista atributa:<br>1,value1|options_<i>parent_list_codeb0bac34z08b0ae6475</span> parent_key<br>2,value2|options_<i>parent_list_codeb0ae64758>b0ae64758bacy: class='notranslate'><br><br>Da bi lista zavisila od druge liste:<br>1, value1|<i>parent_list_code</i>:parent_key<br>2,bz0</span>2 class='notranslate'><i></span>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=Lista vrijednosti mora biti redova s ključem formata, vrijednosti (gdje ključ ne može biti '0')<br><br> na primjer : <br>1,value1<br>2,value2b0342fccfda19bzval03, span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=Lista vrijednosti mora biti redova s ključem formata, vrijednosti (gdje ključ ne može biti '0')<br><br> na primjer : <br>1,value1<br>2,value2b0342fccfda19bzval03, span class='notranslate'><br></span>...
-ExtrafieldParamHelpsellist=Lista vrijednosti dolazi iz tabele<br>Sintaksa: table_name:label_field:id_field::filtersql<br>Primjer: c_typent:libelle: ::filtersql<br><br>- id_field je nužno primarni int ključ<br> - filtersql je SQL uvjet. To može biti jednostavan test (npr. active=1) za prikaz samo aktivne vrijednosti<span class='notranslate'><br>Možete koristiti i $ID$ u filteru koji je trenutni ID trenutnog objekta<br>Da biste koristili SELECT u filteru, koristite ključnu riječ $SEL$ da biste zaobišli zaštitu protiv ubrizgavanja.<br>ako želite filtrirati po ekstrapoljima koristite sintaksu extra.fieldcode=... (gdje je kod polja kod extrafield)<br><br>Da biste imali lista u zavisnosti od druge komplementarne liste atributa:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>Da bi lista zavisila od druge liste:<br>c_typent:libelle:id:<i>parent_list_code</i>m
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (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 necessarily 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=Lista vrijednosti dolazi iz tabele<br>Sintaksa: table_name:label_field:id_field::filtersql<br>Primjer: c_typent:libelle: ::filtersql<br><br>filter može biti jednostavan test (npr. active=1) za prikaz samo aktivne vrijednosti<br>Također možete koristiti $ID$ u filteru koji je trenutni id trenutnog objekta<br>Da izvršite SELECT u filteru koristite $SEL$<br>ako želite filtrirati po extrafields koristite sintaksu extra.fieldcode=... (gdje je kod polja kod extrafield)<br><br>Da bi lista zavisila od druge komplementarne liste atributa:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br>fccfda19bz0</span>fccfda19bz0</span><spanlate'2 </span>Da bi lista zavisila od druge liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametri moraju biti ObjectName:Classpath<br>Sintaksa: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Ostavite prazno za jednostavan separator<br>Postavite ovo na 1 za separator koji se sažima (otvoreno prema zadanim postavkama za novu sesiju, tada se status čuva za svaku korisničku sesiju)<br>Postavite ovo na 2 za sažimajući separator (sažeto prema zadanim postavkama za novu sesiju, tada se status čuva za svaku korisničku sesiju)
@@ -518,7 +518,7 @@ DependsOn=Ovaj modul treba modul(e)
 RequiredBy=Ovaj modul je potreban za modul(i)
 TheKeyIsTheNameOfHtmlField=Ovo je naziv HTML polja. Za čitanje sadržaja HTML stranice potrebno je tehničko znanje da biste dobili ključno ime polja.
 PageUrlForDefaultValues=Morate unijeti relativnu putanju URL-a stranice. Ako u URL uključite parametre, to će biti efektivno ako svi parametri u pregledanom URL-u imaju vrijednost definiranu ovdje.
-PageUrlForDefaultValuesCreate=<br>Primjer:<br>Za obrazac za kreiranje nove treće strane, to je <strong> /span><span class='notranslate'>%s</strong>.<br>Za URL vanjskih modula instaliranih u prilagođeni direktorij, nemojte uključivati "custom/", pa koristite putanju kao što je <strong>mymodule/mypage.php</strong> i ne custom/mymodule/mypage.php.<br>Ako želite zadanu vrijednost samo ako url ima neki parametar, možete koristiti <strong>%s</strong>
+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>Primjer:<br>Za stranicu koja navodi treće strane, to je <strong> >%s</strong>.<br>Za URL vanjskih modula instaliranih u prilagođeni direktorij , nemojte uključivati "custom/" pa koristite putanju kao što je <strong>mymodule/mypagelist.php</strong> i ne custom/mymodule/mypagelist.php.<br>Ako želite zadanu vrijednost samo ako url ima neki parametar, možete koristiti <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=Također imajte na umu da prepisivanje zadanih vrijednosti za kreiranje obrasca radi samo za stranice koje su ispravno dizajnirane (pa s parametrom action=create ili presen...)
 EnableDefaultValues=Omogućite prilagođavanje zadanih vrijednosti
@@ -1118,7 +1118,7 @@ BackToModuleList=Povratak na listu modula
 BackToDictionaryList=Povratak na listu rječnika
 TypeOfRevenueStamp=Vrsta porezne marke
 VATManagement=Upravljanje porezom na promet
-VATIsUsedDesc=Prema zadanim postavkama kada kreirate izglede, fakture, narudžbe itd. Stopa poreza na promet slijedi aktivno standardno pravilo:<br>Ako prodavac ne podliježe porezu na promet, tada je porez na promet zadano 0 . Kraj pravila.<br>Ako je (zemlja prodavca = zemlja kupca), tada je porez na promet prema zadanim postavkama jednak porezu na promet proizvoda u zemlji prodavca. Kraj pravila.<br>Ako su prodavac i kupac obojica u Evropskoj zajednici b01f882f7e6484 /span> roba su proizvodi vezani za transport (prevoz, otprema, avio kompanija), zadani PDV je 0. Ovo pravilo zavisi od zemlje prodavca - konsultujte se sa svojim računovođom. Kupac treba da plati PDV carinarnici u svojoj zemlji <span class='notranslate'>i, a ne prodavcu. Kraj pravila.<br>Ako su prodavac i kupac obojica u Evropskoj zajednici b01f882f7e6484 /span> kupac nije kompanija (sa registrovanim PDV brojem unutar Zajednice) tada je PDV zadana stopa PDV-a u zemlji prodavca. Kraj pravila.<span class='notranslate'><br>Ako su prodavac i kupac obojica u Evropskoj zajednici b01f882f7e6484 /span> kupac je kompanija (sa registrovanim PDV brojem unutar zajednice), tada je PDV po defaultu 0. Kraj pravila.<span class='notranslate'><br>U svakom drugom slučaju predložena zadana vrijednost je porez na promet=0. Kraj vladavine.
+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 dependent 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=Podrazumevano je predloženi porez na promet 0 koji se može koristiti za slučajeve kao što su udruženja, pojedinci ili male kompanije.
 VATIsUsedExampleFR=U Francuskoj, to znači kompanije ili organizacije koje imaju stvarni fiskalni sistem (pojednostavljeni realni ili normalni real). Sistem u kojem se deklarira PDV.
 VATIsNotUsedExampleFR=U Francuskoj, to znači udruženja koja nisu prijavljena poreza na promet ili kompanije, organizacije ili slobodne profesije koje su odabrale fiskalni sistem mikro preduzeća (porez na promet u franšizi) i su platile franšizu za prodaju poreza bez ikakve prijave poreza na promet. Ovaj izbor će prikazati referencu "Neprimenjivi porez na promet - art-293B CGI" na fakturama.
@@ -1197,6 +1197,7 @@ Skin=Tema kože
 DefaultSkin=Zadana tema kože
 MaxSizeList=Maksimalna dužina liste
 DefaultMaxSizeList=Zadana maksimalna dužina za liste
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Zadana maksimalna dužina za kratke liste (tj. u korisničkoj kartici)
 MessageOfDay=Poruka dana
 MessageLogin=Poruka stranice za prijavu
@@ -1249,7 +1250,7 @@ SetupDescription2=Sljedeća dva odjeljka su obavezna (dva prva unosa u izborniku
 SetupDescription3=<a href="%s">%s -> %sb0e870cz80e47dcz <br><br>Osnovni parametri koji se koriste za prilagođavanje zadanog ponašanja vaše aplikacije (npr. za funkcije vezane za zemlju).
 SetupDescription4=<a href="%s">%s -> %sb0e870cz80e47dcz <br><br>Ovaj softver je paket mnogih modula/aplikacija. Moduli koji se odnose na vaše potrebe moraju biti omogućeni i konfigurirani. Unosi u meni će se pojaviti sa aktivacijom ovih modula.
 SetupDescription5=Drugi unosi menija za podešavanje upravljaju opcionim parametrima.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>b0e87dccz<span class='notranslate'>b0e87dccz /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Osnovni parametri koji se koriste za prilagođavanje zadanog ponašanja vaše aplikacije (npr. za funkcije vezane za zemlju).
 SetupDescription4b=Ovaj softver je skup mnogih modula/aplikacija. Moduli koji se odnose na vaše potrebe moraju biti aktivirani. Unosi u meni će se pojaviti sa aktivacijom ovih modula.
 AuditedSecurityEvents=Sigurnosni događaji koji se revidiraju
@@ -1281,7 +1282,7 @@ AvailableModules=Dostupne aplikacije/moduli
 ToActivateModule=Da biste aktivirali module, idite na Područje za podešavanje (Home->Setup->Modules).
 SessionTimeOut=Tajm aut za sesiju
 SessionExplanation=Ovaj broj garantuje da sesija nikada neće isteći prije ovog kašnjenja, ako čišćenje sesije vrši interni čistač PHP sesije (i ništa drugo). Interni čistač PHP sesije ne garantuje da će sesija isteći nakon ovog kašnjenja. Isteći će nakon ovog kašnjenja, i kada se pokrene čistač sesije, tako da svaki <b>%s/%s</b> pristup, ali samo tokom pristupa koji su napravile druge sesije (ako je vrijednost 0, znači brisanje sesije vrši samo vanjski proces).<br>Napomena: na nekim serverima s vanjskim mehanizmom za čišćenje sesije (cron pod debianom, ubuntu...), sesije može se uništiti nakon perioda definiranog vanjskim podešavanjem, bez obzira koja je vrijednost unesena ovdje.
-SessionsPurgedByExternalSystem=Čini se da su sesije na ovom serveru očišćene vanjskim mehanizmom (cron pod debianom, ubuntu...), vjerovatno svaki <b>%s</b> sekundi (= vrijednost parametra <b>session.gc_maxlifetime<span class='notranslate'>b09a17b73z) , tako da promjena vrijednosti ovdje nema efekta. Morate zamoliti administratora servera da promijeni kašnjenje sesije.
+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=Dostupni okidači
 TriggersDesc=Okidači su datoteke koje će modificirati ponašanje Dolibarr toka posla nakon kopiranja u direktorij <b>htdocs/core/triggers</b>. Realizuju nove akcije, aktivirane na Dolibarr događajima (kreiranje nove kompanije, validacija računa,...).
 TriggerDisabledByName=Okidači u ovoj datoteci su onemogućeni sufiksom <b>-NORUN</b> u njihovom nazivu.
@@ -1307,7 +1308,7 @@ NoEventFoundWithCriteria=Nije pronađen nijedan sigurnosni događaj za ovaj krit
 SeeLocalSendMailSetup=Pogledajte vaše lokalne postavke sendmaila
 BackupDesc=<b>potpuna</b> sigurnosna kopija Dolibarr instalacije zahtijeva dva koraka.
 BackupDesc2=Napravite sigurnosnu kopiju sadržaja direktorija "dokumenti" (<b>%s</b>) koji sadrži sve učitane i datoteke. Ovo će također uključiti sve dump datoteke generirane u koraku 1. Ova operacija može trajati nekoliko minuta.
-BackupDesc3=Napravite sigurnosnu kopiju strukture i sadržaja vaše baze podataka (<b>%s<span klasa ='notranslate'></b></span>) u dump datoteku. Za to možete koristiti sljedećeg pomoćnika.
+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=Arhivirani direktorij treba biti pohranjen na sigurnom mjestu.
 BackupDescY=Generirani dump fajl treba da bude pohranjen na bezbednom mestu.
 BackupPHPWarning=Sigurnosna kopija se ne može garantirati ovom metodom. Prethodni se preporučuje.
@@ -1479,7 +1480,7 @@ ProposalsNumberingModules=Modeli numeriranja komercijalnih prijedloga
 ProposalsPDFModules=Modeli dokumenata komercijalnih prijedloga
 SuggestedPaymentModesIfNotDefinedInProposal=Predloženi način plaćanja na prijedlogu prema zadanim postavkama ako nije definiran u prijedlogu
 FreeLegalTextOnProposal=Slobodan tekst o komercijalnim prijedlozima
-WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) 
+WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zatražite odredište bankovnog računa ponude
 ##### SupplierProposal #####
 SupplierProposalSetup=Podešavanje modula za zahtjeve dobavljača
@@ -1497,7 +1498,7 @@ OrdersSetup=Podešavanje upravljanja prodajnim nalozima
 OrdersNumberingModules=Modeli numerisanja narudžbi
 OrdersModelModule=Naručite modele dokumenata
 FreeLegalTextOnOrders=Besplatan tekst za narudžbe
-WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno) 
+WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno)
 ShippableOrderIconInList=Dodajte ikonu u listu narudžbi koja označava da li se narudžba može isporučiti
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zatražite odredište bankovnog računa za narudžbu
 ##### Interventions #####
@@ -1505,7 +1506,7 @@ InterventionsSetup=Postavljanje modula za intervencije
 FreeLegalTextOnInterventions=Slobodan tekst na dokumentima intervencije
 FicheinterNumberingModules=Modeli interventnog numeriranja
 TemplatePDFInterventions=Modeli dokumenata interventnih kartica
-WatermarkOnDraftInterventionCards=Vodeni žig na nacrte kartica za intervencije (ništa, ako je prazno) 
+WatermarkOnDraftInterventionCards=Vodeni žig na nacrte kartica za intervencije (ništa, ako je prazno)
 ##### Contracts #####
 ContractsSetup=Podešavanje modula Ugovori/Pretplate
 ContractsNumberingModules=Moduli numeracije ugovora
@@ -1663,7 +1664,7 @@ LDAPDescUsers=Ova stranica vam omogućava da definirate naziv LDAP atributa u LD
 LDAPDescGroups=Ova stranica vam omogućava da definirate ime LDAP atributa u LDAP stablu za svaki podatak koji se nalazi na Dolibarr grupama.
 LDAPDescMembers=Ova stranica vam omogućava da definirate ime LDAP atributa u LDAP stablu za svaki podatak koji se nalazi u modulu članova Dolibarr.
 LDAPDescMembersTypes=Ova stranica vam omogućava da definirate ime LDAP atributa u LDAP stablu za svaki podatak koji se nalazi na tipovima članova Dolibarr.
-LDAPDescValues=Primjer vrijednosti su dizajnirane za <b>OpenLDAP</b> sa sljedećim učitanim shemama: b0aee3733658 core.schema, cosine.schema, inetorgperson.schema</b>). Ako koristite te vrijednosti i OpenLDAP, izmijenite svoju LDAP konfiguracijsku datoteku <b>slapd.conf<span class='notranslate40b7b7b7 </span> da se sve te šeme učitaju.
+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=Za provjereni pristup (za pristup za pisanje na primjer)
 PerfDolibarr=Izvještaj o perfomansama postavki/optimizacije
 YouMayFindPerfAdviceHere=Ova stranica pruža neke provjere ili savjete vezane za performanse.
@@ -1671,7 +1672,7 @@ NotInstalled=Nije instalirano.
 NotSlowedDownByThis=Ne usporava ovo.
 NotRiskOfLeakWithThis=S ovim nema opasnosti od curenja.
 ApplicativeCache=Aplikativni cache
-MemcachedNotAvailable=Nije pronađen aplikativni keš. Možete poboljšati performanse instaliranjem keš servera Memcached i modula koji može koristiti ovaj keš server.<br>Više informacija ovdje <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<span class='notranslate'>b0344f0344 /span>Imajte na umu da mnogi web hosting provajderi ne pružaju takav keš server.
+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=Modul memcached za aplikativnu keš memoriju je pronađen, ali postavljanje modula nije završeno.
 MemcachedAvailableAndSetup=Modul memcached namijenjen za korištenje memcached servera je omogućen.
 OPCodeCache=OPCode cache
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Nemojte izvoziti događaj stariji od
 SecurityKey = Sigurnosni ključ
 ##### ClickToDial #####
 ClickToDialSetup=Kliknite za podešavanje modula za biranje
-ClickToDialUrlDesc=URL se poziva kada se klikne na sliku telefona. U URL-u možete koristiti oznake<br><b>__PHONETO__</b> koje će biti zamijenjen sa brojem telefona osobe koju treba pozvati<span class='notranslate'><br><b>__PHONEFROM__b09a4b739f17f da bit će zamijenjen brojem telefona osobe koja poziva (vaš)<span class='notranslate'><br><b>__LOGIN__b09a4b78z01 span> koji će biti zamijenjen klikom za prijavu (definirano na korisničkoj kartici)<br><b>__PASS__ </b> koja će biti zamijenjena lozinkom za biranje klikom (definiranom na korisničkoj kartici).
+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=Ovaj modul mijenja telefonske brojeve, kada koristite desktop računar, u linkove na koje se može kliknuti. Klik će pozvati broj. Ovo se može koristiti za pokretanje telefonskog poziva kada koristite softverski telefon na vašem desktopu ili kada koristite CTI sistem baziran na SIP protokolu, na primjer. Napomena: Kada koristite pametni telefon, telefonski brojevi se uvijek mogu kliknuti.
 ClickToDialUseTelLink=Koristite samo link "tel:" na brojevima telefona
 ClickToDialUseTelLinkDesc=Koristite ovu metodu ako vaši korisnici imaju softverski telefon ili softverski interfejs, instaliran na istom računaru kao i pretraživač, i pozvan kada kliknete na link koji počinje sa "tel:" u vaš pretraživač. Ako vam je potrebna veza koja počinje sa "sip:" ili potpuno serversko rješenje (nema potrebe za instalacijom lokalnog softvera), ovo morate postaviti na "Ne" i ispunite sljedeći polje.
@@ -1920,7 +1921,7 @@ IfSetToYesDontForgetPermission=Ako je postavljena na vrijednost koja nije null,
 GeoIPMaxmindSetup=Podešavanje GeoIP Maxmind modula
 PathToGeoIPMaxmindCountryDataFile=Put do datoteke koja sadrži Maxmind ip u prijevod zemlje
 NoteOnPathLocation=Imajte na umu da vaša datoteka sa podacima o IP-u i državi mora biti unutar direktorija koji vaš PHP može čitati (Provjerite dopuštenja vašeg PHP open_basedir podešavanja i).
-YouCanDownloadFreeDatFileTo=Možete preuzeti <b>besplatnu demo verziju</b> datoteke zemlje Maxmind GeoIP na <span class='notranslate'>b0ecb2ecz87f<span class='notranslate'>b0ecb2ecz87f /span>.
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=Također možete preuzeti više <b>kompletnu verziju, sa ažuriranjima,</b> Maxmind GeoIP zemlje na %s.
 TestGeoIPResult=Test IP konverzije -> zemlja
 ##### Projects #####
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=Instalacija eksternog modula nije moguća
 SomethingMakeInstallFromWebNotPossible2=Iz tog razloga, proces za nadogradnju opisan ovdje je ručni proces koji samo privilegirani korisnik može izvršiti.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalacija ili razvoj vanjskih modula ili dinamičkih web stranica iz aplikacije je trenutno zaključan iz sigurnosnih razloga. Molimo kontaktirajte nas ako trebate omogućiti ovu funkciju.
 InstallModuleFromWebHasBeenDisabledByFile=Vaš administrator je onemogućio instalaciju eksternog modula iz aplikacije. Morate ga zamoliti da ukloni datoteku <strong>%s</strong> kako bi ovo dozvolio karakteristika.
-ConfFileMustContainCustom=Instaliranje ili izgradnja eksternog modula iz aplikacije mora spremiti datoteke modula u direktorij <strong>%s </strong>. Da bi Dolibarr obradio ovaj direktorij, morate postaviti svoj <strong>conf/conf.php</strong> da dodate 2 linije direktive: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a65fc07>b0a65fc07 ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49f49fz0'; '></strong>
+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=Označite linije tabele kada pređete mišem
 HighlightLinesColor=Označite boju linije kada miš prijeđe (koristite 'ffffff' za bez isticanja)
 HighlightLinesChecked=Istaknite boju linije kada je označena (koristite 'ffffff' da nema isticanja)
@@ -2065,7 +2066,7 @@ DetectionNotPossible=Detekcija nije moguća
 UrlToGetKeyToUseAPIs=Url za dobivanje tokena za korištenje API-ja (kada je token primljen, pohranjuje se u korisničku tablicu baze podataka i mora biti naveden pri svakom API pozivu)
 ListOfAvailableAPIs=Lista dostupnih API-ja
 activateModuleDependNotSatisfied=Modul "%s" zavisi od modula "%s", koji nedostaje, pa modul " %1$s" možda neće raditi ispravno. Molimo instalirajte modul "%2$s" ili onemogućite modul "%1$s" ako želite biti sigurni od bilo kakvog iznenađenja
-CommandIsNotInsideAllowedCommands=Naredba koju pokušavate pokrenuti nije na listi dozvoljenih komandi definiranih u parametru <strong>$dolibarr_main_restrict_os_commands</strong> u class='notranslate'><strong></span>conf.php</strong> fajl.
+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=Ako koristite modul za više kompanija, uz izbor "Jedinstvena cijena", cijena će također biti ista za sve kompanije ako se proizvodi dijele između okruženja
 ModuleEnabledAdminMustCheckRights=Modul je aktiviran. Dozvole za aktivirani modul(e) su date samo administratorskim korisnicima. Možda ćete morati ručno dodijeliti dozvole drugim korisnicima ili grupama ako je potrebno.
@@ -2262,7 +2263,7 @@ ModuleActivatedMayExposeInformation=Ova PHP ekstenzija može otkriti osjetljive
 ModuleActivatedDoNotUseInProduction=Omogućen je modul dizajniran za razvoj. Nemojte ga omogućiti u proizvodnom okruženju.
 CombinationsSeparator=Znak za razdvajanje za kombinacije proizvoda
 SeeLinkToOnlineDocumentation=Za primjere pogledajte vezu do online dokumentacije u gornjem meniju
-SHOW_SUBPRODUCT_REF_IN_PDF=Ako je karakteristika "%s" modula <b>%s<span class= Koristi se 'notranslate'></b></span>, prikaži detalje podproizvoda kompleta u PDF-u.
+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=Kontaktirajte svoju banku da dobijete ovaj ID
 AdvancedModeOnly=Dozvola je dostupna samo u naprednom načinu rada
 ConfFileIsReadableOrWritableByAnyUsers=Konf datoteku može čitati ili pisati bilo koji korisnik. Dajte dozvolu samo grupi korisnika i web servera.
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=API moduli nisu omogućeni
 YouShouldSetThisToOff=Trebali biste ovo postaviti na 0 ili isključeno
 InstallAndUpgradeLockedBy=Instaliranje i nadogradnje je zaključano datotekom <b>%s</b>
 InstallLockedBy=Instalacija/ponovna instalacija je zaključana datotekom <b>%s</b>
-InstallOfAddonIsNotBlocked=Instalacije dodataka nisu zaključane. Kreirajte datoteku <b>installmodules.lock</b> u direktorij <b> ='notranslate'>%s</b> za blokiranje instalacije vanjskih dodataka/modula.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Stara implementacija
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Ako su neki moduli za online plaćanje omogućeni (Paypal, Stripe, ...), dodajte link na PDF da izvršite online plaćanje
 DashboardDisableGlobal=Onemogućite globalno sve palčeve otvorenih objekata
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 54b0bae0351..f4e3beddeb5 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -137,8 +137,8 @@ DateActionEnd=Datum završetka
 AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje prikazanog:
 AgendaUrlOptions3=<b>logina=%s</b> za ograničavanje izlaza na radnje u vlasništvu korisnika <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> za ograničavanje izlaza na radnje koje nisu u vlasništvu korisnik <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> za ograničavanje izlaza na radnje koje su dodijeljene korisniku span class='notranslate'><b></span>%s</b> (vlasnik <span class='notranslate'8fz07f88b4z44 /span> ostali).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> za ograničavanje izlaza na radnje povezane s projektom 36aee88736aee87 __PROJECT_ID__<span class='notranslate'></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> da isključite automatske događaje.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> da uključi događaje praznika.
 AgendaShowBirthdayEvents=Rođendani kontakata
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index c3ef4c4c281..b4312fa54f3 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -516,7 +516,7 @@ PaymentByTransferOnThisBankAccount=Plaćanje transferom na sljedeći bankovni ra
 VATIsNotUsedForInvoice=* Nije primjenjiv PDV art-293B CGI
 VATIsNotUsedForInvoiceAsso=* Neprimjenjiv PDV art-261-7 CGI
 LawApplicationPart1=Primjenom zakon 80.335 of 12/05/80
-LawApplicationPart2=roba ostaju vlasništvo od 
+LawApplicationPart2=roba ostaju vlasništvo od
 LawApplicationPart3=prodavac do pune isplate
 LawApplicationPart4=njihove vrijednosti.
 LimitedLiabilityCompanyCapital=d.o.o. s kapitalom
@@ -568,7 +568,7 @@ YouMustCreateStandardInvoiceFirstDesc=Prvo morate kreirati standardnu fakturu i
 PDFCrabeDescription=PDF predložak fakture Crabe. Kompletan predložak fakture (stara implementacija predloška Spužva)
 PDFSpongeDescription=PDF predložak fakture Spužva. Kompletan predložak fakture
 PDFCrevetteDescription=PDF šablon Crevette za račune. Kompletan šablon za situiranje privremenih situacija
-TerreNumRefModelDesc1=Vrati broj u formatu %syymm-nnnn za standardne fakture i b0ecb2ec87f49 yymm-nnnn za kreditne zapise gdje je yy godina, mm je mjesec <span class='notranslate'>i nnnn je sekvencijalni broj koji se automatski povećava bez prekida i > nema povratka na 0
+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 sequential auto-incrementing number with no break and no return to 0
 MarsNumRefModelDesc1=Povratni broj u formatu %syymm-nnnn za standardne fakture, %syymm-nnnn za zamjenske fakture, %syymm-nnnn za fakture avansa i %sza kredit nije ymm-nn gdje je nny godina, mm je mjesec i nnnn je sekvencijalni broj koji se automatski povećava bez prekida i bez povratka na 0
 TerreNumRefModelError=Račun z začetkom $syymm že obstaja in ni kompatibilen s tem modelom zaporedja. Odstranite ga ali ga preimenujte za aktiviranje tega modula.
 CactusNumRefModelDesc1=Povratni broj u formatu %syymm-nnnn za standardne fakture, %syymm-nnnn za kreditne zapise i %syymm-nnnn za fakture avansa gdje je yy godina, mm mjesec b01f882f7e6484z jenn sekvencijalni broj koji se automatski povećava bez prekida i bez povratka na 0
@@ -613,7 +613,7 @@ TotalSituationInvoice=Ukupna situacija
 invoiceLineProgressError=Red prethodno fakturisanog ne može biti veće ili jednako sljedećem redu u fakturi
 updatePriceNextInvoiceErrorUpdateline=Greška: ažuriranje cijene na liniji fakture: %s
 ToCreateARecurringInvoice=Da biste kreirali ponavljajuću fakturu za ovaj ugovor, prvo kreirajte ovaj nacrt fakture, a zatim ga pretvorite u predložak fakture i definirajte učestalost generiranja budućih faktura.
-ToCreateARecurringInvoiceGene=Da biste buduće fakture redovno generirali i ručno, samo idite na meni <strong>b0ecb2ec87f49fz - <span class='notranslate'>%s - %s</strong>.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Ako trebate imati takve fakture automatski generirane, zamolite svog administratora da omogući i modul za podešavanje <strong>%s</strong>. Imajte na umu da se obje metode (ručni i automatski) mogu koristiti zajedno bez rizika od dupliranja.
 DeleteRepeatableInvoice=Obriši šablon fakture
 ConfirmDeleteRepeatableInvoice=Jeste li sigurni da želite izbrisati predložak fakture?
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index d97b5328f14..45c923df0cf 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -1,17 +1,19 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Vaši kontakt podaci su zabilježeni. Javit ćemo vam se uskoro...
+ContactUsDesc=Ovaj obrazac vam omogućava da nam pošaljete poruku za prvi kontakt.
 ErrorCompanyNameAlreadyExists=Ime kompanije %s već postoji. Izaberite neko drugo.
 ErrorSetACountryFirst=Odberite prvo zemlju
 SelectThirdParty=Odaberite subjekt
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Jeste li sigurni da želite izbrisati ovu kompaniju i sve povezane informacije?
 DeleteContact=Obrisati kontakt/uslugu
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
+ConfirmDeleteContact=Jeste li sigurni da želite izbrisati ovaj kontakt i sve povezane informacije?
+MenuNewThirdParty=Nova treća strana
+MenuNewCustomer=Nova mušterija
 MenuNewProspect=New Prospect
 MenuNewSupplier=New Vendor
 MenuNewPrivateIndividual=Novo fizičko lice
 NewCompany=Nova kompanija (mogući klijent, kupac, prodavač)
-NewThirdParty=New Third Party (prospect, customer, vendor)
+NewThirdParty=Nova treća strana (potencijal, kupac, dobavljač)
 CreateDolibarrThirdPartySupplier=Napravi subjekt (prodavač)
 CreateThirdPartyOnly=Napravi novi subjekt
 CreateThirdPartyAndContact=Napravi subjekt + podređeni kontakt
@@ -19,76 +21,79 @@ ProspectionArea=Područje za moguće kupce
 IdThirdParty=ID subjekta
 IdCompany=ID kompanije
 IdContact=ID kontakta
-ThirdPartyAddress=Third-party address
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+ThirdPartyAddress=Adresa treće strane
+ThirdPartyContacts=Kontakti treće strane
+ThirdPartyContact=Kontakt/adresa treće strane
 Company=Kompanija
 CompanyName=Ime kompanije
 AliasNames=Nadimak (komercijalni, trgovačkim, ...)
 AliasNameShort=Alias Name
 Companies=Kompanije
-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
+CountryIsInEEC=Država je unutar Evropske ekonomske zajednice
+PriceFormatInCurrentLanguage=Format prikaza cijene u trenutnoj valuti i jezika
+ThirdPartyName=Ime treće strane
+ThirdPartyEmail=E-pošta treće strane
+ThirdParty=Treća stranka
+ThirdParties=Treće strane
 ThirdPartyProspects=Mogući klijenti
 ThirdPartyProspectsStats=Mogući klijenti
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
 ThirdPartySuppliers=Prodavači
-ThirdPartyType=Third-party type
+ThirdPartyType=Tip treće strane
 Individual=Fizičko lice
-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.
+ToCreateContactWithSameName=Automatski će kreirati kontakt/adresu sa istim informacijama kao i treća strana u okviru treće strane. U većini slučajeva, čak i ako je vaša treća strana fizička osoba, dovoljno je samo kreiranje treće strane.
 ParentCompany=Matična kompanija
 Subsidiaries=Podružnice
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Izvještaj mjesečno
+ReportByCustomers=Izvještaj po kupcu
+ReportByThirdparties=Izvještaj po trećoj strani
+ReportByQuarter=Izvještaj po stopi
 CivilityCode=Pravila ponašanja
 RegisteredOffice=Registrovan ured
 Lastname=Prezime
 Firstname=Ime
-RefEmployee=Employee reference
-NationalRegistrationNumber=National registration number
+RefEmployee=Referenca za zaposlene
+NationalRegistrationNumber=Nacionalni registarski broj
 PostOrFunction=Pozicija
 UserTitle=Titula
 NatureOfThirdParty=Vrsta treće strane
-NatureOfContact=Nature of Contact
+NatureOfContact=Priroda kontakta
 Address=Adresa
 State=Država/Provincija
-StateId=State ID
-StateCode=State/Province code
+StateId=Državni ID
+StateCode=Šifra države/pokrajine
 StateShort=Pokrajina
 Region=Region
 Region-State=Regija - Zemlja
 Country=Država
 CountryCode=Šifra države
-CountryId=Country ID
+CountryId=ID zemlje
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skajp
 Call=Pozovi
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Autobus. telefon
 PhonePerso=Privatni telefon
 PhoneMobile=Mobitel
-No_Email=Refuse bulk emailings
+No_Email=Odbijte masovne slanje e-pošte
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
 Web=Web
 Poste= Pozicija
-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
+DefaultLang=Zadani jezik
+VATIsUsed=Korišten porez na promet
+VATIsUsedWhenSelling=Ovo definira da li ova treća strana uključuje porez na promet ili ne kada ispostavlja fakturu vlastitim kupcima
 VATIsNotUsed=Porez na promet nije obračunat
-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
+VATReverseCharge=Povrat PDV-a
+VATReverseChargeByDefault=Obrnuti PDV po defaultu
+VATReverseChargeByDefaultDesc=Na fakturi dobavljača, po defaultu se koristi povrat PDV-a
+CopyAddressFromSoc=Kopirajte adresu iz podataka treće strane
+ThirdpartyNotCustomerNotSupplierSoNoRef=Treća strana ni kupac ni prodavac, nema dostupnih referentnih objekata
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Treća strana ni kupac ni prodavac, popusti nisu dostupni
 PaymentBankAccount=Bankovni račun za plaćanje
 OverAllProposals=Prijedlozi
 OverAllOrders=Narudžbe
@@ -105,8 +110,8 @@ WrongCustomerCode=Nevažeća šifra kupca
 WrongSupplierCode=Nevažeća šifra prodavača
 CustomerCodeModel=Model šifre kupca
 SupplierCodeModel=Model šifre prodavača
-Gencod=Barcode
-GencodBuyPrice=Barcode of price ref
+Gencod=Barkod
+GencodBuyPrice=Bar kod cijene ref
 ##### Professional ID #####
 ProfId1Short=ID broj 1
 ProfId2Short=ID broj 2
@@ -114,12 +119,20 @@ ProfId3Short=ID broj 3
 ProfId4Short=ID broj 4
 ProfId5Short=ID broj 5
 ProfId6Short=ID broj 6
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
 ProfId1=Profesionalni ID 1
 ProfId2=Profesionalni ID 2
 ProfId3=Profesionalni ID 3
 ProfId4=Profesionalni ID 4
 ProfId5=Profesionalni ID 5
 ProfId6=Profesionalni ID 6
+ProfId7=Profesionalni ID 7
+ProfId8=Profesionalni ID 8
+ProfId9=Profesionalni ID 9
+ProfId10=Profesionalni ID 10
 ProfId1AR=Prof Id 1 (CUIT / CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
@@ -130,7 +143,7 @@ ProfId1AT=Prof Id 1 (USt.-Id br.)
 ProfId2AT=Prof Id 2 (USt.-br.)
 ProfId3AT=Prof Id 3 (br. trgovačkog registra)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI broj
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -142,7 +155,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI broj
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -150,11 +163,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-broj
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federalni broj)
 ProfId4CH=Prof Id 2 (Broj komercijalnog zapisa)
-ProfId5CH=EORI number
+ProfId5CH=EORI broj
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -162,16 +175,16 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=Id. prof. 1 (Trgovski registar)
+ProfId2CM=Id. prof. 2 (br. poreskog obveznika)
+ProfId3CM=Id. prof. 3 (Br. dekreta o stvaranju)
+ProfId4CM=Id. prof. 4 (Br. potvrde o depozitu)
+ProfId5CM=Id. prof. 5 (Ostali)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
+ProfId1ShortCM=Trgovački registar
+ProfId2ShortCM=Poreski obveznik br.
+ProfId3ShortCM=Broj dekreta o stvaranju
+ProfId4ShortCM=br. potvrde o depozitu
 ProfId5ShortCM=Drugi
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
@@ -184,26 +197,34 @@ ProfId1DE=Prof Id 1 (USt.-Id br.)
 ProfId2DE=Prof Id 2 (USt.-br.)
 ProfId3DE=Prof Id 3 (br. trgovačkog registra)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI broj
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (broj udruženja)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (EORI broj)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, stari APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Prof Id 5 (broj EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Registracijski broj
 ProfId2GB=-
 ProfId3GB=SIC
@@ -226,13 +247,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI broj
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
 ProfId2LU=Id. prof. 2 (dozvola za rad)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI broj
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patent)
@@ -242,7 +263,7 @@ ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (profesionalna povelja)
+ProfId3MX=Prof Id 3 (Profesionalna povelja)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -250,13 +271,13 @@ ProfId1NL=KVK broj
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Broj usluga građanima (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI broj
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (broj socijalnog osiguranja)
 ProfId3PT=Prof Id 3 (broj komercijalnog zapisa)
 ProfId4PT=Prof Id 4 (konzervator)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (EORI broj)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -280,7 +301,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI broj)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -291,15 +312,15 @@ ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
 ProfId2UA=Prof Id 2 (DRFO)
 ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId4UA=Prof Id 4 (Sertifikat)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=PDV ID
+VATIntraShort=PDV ID
 VATIntraSyntaxIsValid=Sintaksa je nevažeća
 VATReturn=Povrat PDV
 ProspectCustomer=Mogući klijent / Kupac
@@ -312,15 +333,15 @@ CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Fiksni popust
 CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema relativnog popusta po defaultu
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasRelativeDiscountFromSupplier=Imate zadani popust od <b>%s%%</b> kod ovog dobavljača
+HasNoRelativeDiscountFromSupplier=Nema zadanog relativnog popusta kod ovog dobavljača
 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=Ovaj kupac i dalje ima knjižno odobrenje za <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=Nema popusta/kredita kod ovog prodavca
 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
+HasCreditNoteFromSupplier=Imate kreditne bilješke za <b>%s</b> %s od ovog dobavljača
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema zasluga za popust
 CustomerAbsoluteDiscountAllUsers=Apsolutni popusti kupcima (odobreni od svih korisnika)
 CustomerAbsoluteDiscountMy=Apsolutni popusti kupcima (koje ste vi odobrili)
@@ -333,7 +354,7 @@ AddContact=Napravi kontakt
 AddContactAddress=Napravi kontakt/adresu
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
-Contact=Contact/Address
+Contact=Kontakt adresa
 Contacts=Kontakti/Adrese
 ContactId=Id kontakta
 ContactsAddresses=Kontakti/Adrese
@@ -341,30 +362,30 @@ FromContactName=Naziv:
 NoContactDefinedForThirdParty=Nema definiranih kontakata za ovaj subjekt
 NoContactDefined=Nijedan kontakt definiran
 DefaultContact=Defaultni kontakt/adresa
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Zadani kontakt/adresa za
 AddThirdParty=Napravi novi subjekt
 DeleteACompany=Obrisati kompaniju
 PersonalInformations=Osobni podaci
 AccountancyCode=Računovodstveni račun
 CustomerCode=Customer Code
-SupplierCode=Vendor Code
+SupplierCode=Šifra dobavljača
 CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
+SupplierCodeShort=Šifra dobavljača
+CustomerCodeDesc=Korisnički kod, jedinstven za sve kupce
+SupplierCodeDesc=Šifra dobavljača, jedinstvena za sve dobavljače
 RequiredIfCustomer=Potrebno ako je subjekt kupac ili mogući klijent
 RequiredIfSupplier=Potrebno ako je subjekt prodavač
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
+ValidityControledByModule=Valjanost kontrolira modul
+ThisIsModuleRules=Pravila za ovaj modul
 ProspectToContact=Mogući klijent za kontaktirati
 CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ListOfThirdParties=Lista trećih strana
+ShowCompany=Treća stranka
+ShowContact=Kontakt adresa
 ContactsAllShort=Svi (bez filtera)
-ContactType=Contact role
+ContactType=Kontakt uloga
 ContactForOrders=Kontakt narudžbe
 ContactForOrdersOrShipments=Kontakt za narudžbu ili slanje
 ContactForProposals=Kontakt prijedloga
@@ -376,21 +397,21 @@ NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koji poslovni prijedlo
 NoContactForAnyContract=Ovaj kontakt nije kontakt za bilo koji ugovor
 NoContactForAnyInvoice=Ovaj kontakt nije kontakt za bilo koju fakturu
 NewContact=Novi kontakt
-NewContactAddress=New Contact/Address
+NewContactAddress=Novi kontakt/adresa
 MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
 EditCompany=Uredi kompaniju
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Ovaj korisnik nije potencijalni klijent, kupac ili prodavac
 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" rel="noopener noreferrer">%s</a>
+VATIntraCheckDesc=PDV ID mora sadržavati prefiks zemlje. Veza <b>%s</b> koristi evropsku uslugu provjere PDV-a (VIES) koji zahtijeva pristup internetu sa Dolibarr servera.
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
+VATIntraCheckableOnEUSite=Provjerite ID za PDV unutar Zajednice na web stranici Evropske komisije
+VATIntraManualCheck=Također možete ručno provjeriti na web stranici Evropske komisije <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
-Workforce=Workforce
+NorProspectNorCustomer=Ne potencijalni klijenti, niti kupac
+JuridicalStatus=Tip poslovnog subjekta
+Workforce=Radna snaga
 Staff=Employees
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijal mogućeg klijenta
@@ -412,7 +433,7 @@ TE_MEDIUM=Srednja kompanija
 TE_ADMIN=Državna kompanija
 TE_SMALL=Mala kompanija
 TE_RETAIL=Maloprodaja
-TE_WHOLE=Wholesaler
+TE_WHOLE=Veletrgovac
 TE_PRIVATE=Fizičko lice
 TE_OTHER=Ostalo
 StatusProspect-1=Ne kontaktirati
@@ -431,70 +452,79 @@ ExportCardToFormat=Izvod podataka u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan sa nekim od subjekata
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nema Dolibarr pristupa
-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)
+ExportDataset_company_1=Treće strane (kompanije/fondacije/fizičke osobe) i njihova svojstva
+ExportDataset_company_2=Kontakti i njihova svojstva
+ImportDataset_company_1=Svojstva trećih strana i
+ImportDataset_company_2=Dodatni kontakti/adrese trećih strana i atributi
+ImportDataset_company_3=Bankovni računi trećih strana
+ImportDataset_company_4=Predstavnici prodaje trećih strana (dodijelite prodajne predstavnike/korisnike kompanijama)
 PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+PriceLevelLabels=Oznake nivoa cijena
 DeliveryAddress=Adresa za dostavu
 AddAddress=Dodaj adresu
 SupplierCategory=Kategorija prodavača
 JuridicalStatus200=Nezavisni
 DeleteFile=Obriši fajl
-ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovaj fajl?
+ConfirmDeleteFile=Jeste li sigurni da želite izbrisati ovaj fajl <b>%s</b>?
 AllocateCommercial=Dodijeljen predstavniku prodaje
 Organization=Organizacija
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Fiskalna godina
 FiscalMonthStart=Početni mjesec fiskalne godine
-SocialNetworksInformation=Social networks
+SocialNetworksInformation=Društvene mreže
 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.
+YouMustAssignUserMailFirst=Morate kreirati e-poštu za ovog korisnika prije nego što budete mogli dodati obavještenje putem e-pošte.
 YouMustCreateContactFirst=Da bi mogli dodati e-mail obavještenja, prvo morate definirati kontakte s važećom e-poštom za subjekte
-ListSuppliersShort=List of Vendors
+ListSuppliersShort=Lista dobavljača
 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
+ListCustomersShort=Lista kupaca
+ThirdPartiesArea=Treće strane/Kontakti
+LastModifiedThirdParties=Najnovije %s Treće strane koje su izmijenjene
+UniqueThirdParties=Ukupan broj trećih strana
 InActivity=Otvori
 ActivityCeased=Zatvoreno
 ThirdPartyIsClosed=Subjekat je zatvoren
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Lista proizvoda/usluga mapiranih na %s
 CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
 OutstandingBillReached=Dostignut maksimum za neplaćene račune
 OrderMinAmount=Najmanja količina za naručiti
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=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 sequential auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
 ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
 MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
 MergeThirdparties=Spoji subjekte
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Jeste li sigurni da želite spojiti odabranu treću stranu sa trenutnom? Svi povezani objekti (fakture, narudžbe,...) bit će premješteni na trenutnu treću stranu, nakon čega će odabrana treća strana biti izbrisana.
 ThirdpartiesMergeSuccess=Treće strane su spojene
 SaleRepresentativeLogin=Pristup za predstavnika prodaje
 SaleRepresentativeFirstname=Ime predstavnika prodaje
 SaleRepresentativeLastname=Prezime predstavnika prodaje
 ErrorThirdpartiesMerge=Nastala je greška pri brisanju treće strane. Molimo vas da provjerite zapisnik. Izmjene su vraćene.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+NewCustomerSupplierCodeProposed=Šifra kupca ili dobavljača je već korištena, predlaže se novi kod
+KeepEmptyIfGenericAddress=Ostavite ovo polje praznim ako je ova adresa generička adresa
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeCustomer=Vrsta plaćanja - Kupac
+PaymentTermsCustomer=Uslovi plaćanja - Kupac
+PaymentTypeSupplier=Vrsta plaćanja - Dobavljač
+PaymentTermsSupplier=Rok plaćanja - Dobavljač
+PaymentTypeBoth=Vrsta plaćanja - Kupac i Dobavljač
+MulticurrencyUsed=Koristite Multicurrency
 MulticurrencyCurrency=valuta
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Evropa (EEZ)
+RestOfEurope=Ostatak Evrope (EEZ)
+OutOfEurope=van Evrope (EEZ)
+CurrentOutstandingBillLate=Trenutni neizmireni račun kasni
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Budite oprezni, ovisno o postavkama cijene vašeg proizvoda, trebali biste promijeniti treću stranu prije dodavanja proizvoda na POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=e-pošta već postoji, molimo prepišite naziv vaše kompanije
+TwoRecordsOfCompanyName=postoji više od jednog zapisa za ovu kompaniju, kontaktirajte nas da dovršimo vaš zahtjev za partnerstvo
+CompanySection=Odjel kompanije
+ShowSocialNetworks=Pokažite društvene mreže
+HideSocialNetworks=Sakrij društvene mreže
+ExternalSystemID=ID eksternog sistema
+IDOfPaymentInAnExternalSystem=ID načina plaćanja u eksterni sistem (kao što je Stripe, Paypal, ...)
+AADEWebserviceCredentials=AADE Webservice Credentials
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Treća strana mora biti klijent da bi dozvolila kreiranje svojih bankovnih podataka na strani Stripea
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 1fd00c7e697..d412f3b90db 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -174,8 +174,8 @@ 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=Stanje prihoda i rashodi, po unaprijed definiranim grupama računa
-AnnualByCompaniesDueDebtMode=Bilans prihoda i troškovi, detalji po unaprijed definiranim grupama, način rada <b>b0ecb2ec87f49fz Potraživanja-Dugovi<span class='notranslate'>%s</b> rekao je <b><span>Commitment account notranslate'></b>.
-AnnualByCompaniesInputOutputMode=Bilans prihoda i troškovi, detalji po unaprijed definiranim grupama, način rada <b>b0ecb2ec87f49fz Prihodi-Rashodi<span class='notranslate'>%s</b> rekao je <b>class='račun gotovine notranslate'></b></span>.
+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=Pogledajte <b>%sanalizu plaćanja%s</b> za kalkulaciju zasnovanu na <b>zabilježenim uplatama</b> čak i ako još nisu evidentirane na računu
 SeeReportInDueDebtMode=Pogledajte <b>%sanalizu snimljenih dokumenata%s</b> za izračun zasnovan na poznatim <b>snimljenim dokumentima</b> čak i ako još nisu evidentirani na L računu
 SeeReportInBookkeepingMode=Pogledajte <b>%sanalizu tablice knjigovodstvene knjige%s</b> za izvještaj zasnovan na <b>tabelu knjigovodstvene knjige</b>
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 72a16031cab..55f21979c71 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -1,22 +1,21 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Read Scheduled job
 Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # 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
+URLToLaunchCronJobs=URL za provjeru i pokrenite kvalifikovane cron poslove iz preglednika
+OrToLaunchASpecificJob=Ili da provjerite i pokrenite određeni posao iz preglednika
 KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron poslova
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Komandna linija za provjeru i pokretanje kvalifikovanih cron poslova
 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 contain any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronExplainHowToRunWin=U Microsoft(tm) Windows okruženju možete koristiti alate za planirani zadatak za pokretanje komandne linije svakih 5 minuta
+CronMethodDoesNotExists=Klasa %s ne sadrži nijednu metodu %s
+CronMethodNotAllowed=Metoda %s klase %s je na listi zabranjenih metoda
+CronJobDefDesc=Cron profili poslova definirani su u datoteci deskriptora modula. Kada je modul aktiviran, oni su učitani i dostupni tako da možete administrirati poslove iz menija administratorskih alata %s.
+CronJobProfiles=Lista unaprijed definiranih cron profila poslova
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
@@ -26,7 +25,7 @@ CronCommand=Komanda
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch now
+CronExecute=Pokreni sada
 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
@@ -43,11 +42,11 @@ CronModule=Modul
 CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
 CronLabel=Oznaka
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
+CronNbRun=Broj lansiranja
+CronMaxRun=Maksimalan broj lansiranja
 CronEach=Every
 JobFinished=Job launched and finished
-Scheduled=Scheduled
+Scheduled=Zakazano
 #Page card
 CronAdd= Dodaj posao
 CronEvery=Execute job each
@@ -57,44 +56,45 @@ CronSaveSucess=Save successfully
 CronNote=Komentar
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable scheduling
+StatusAtInstall=Status pri instalaciji modula
+CronStatusActiveBtn=Omogući zakazivanje
 CronStatusInactiveBtn=Iskljući
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Ovaj posao je onemogućen (nije zakazan)
 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>
+CronModuleHelp=Naziv direktorija Dolibarr modula (također radi s vanjskim Dolibarr modulom). <BR> Na primjer za pozivanje metode dohvaćanja objekta Dolibarr Product /htdocs/<u>productb0aaa478fdca /class/product.class.php, vrijednost za modul je<br><i>product</i>
+CronClassFileHelp=Relativna putanja i ime datoteke za učitavanje (putnja je relativna na korijenski direktorij web servera). <BR> Na primjer za pozivanje metode dohvaćanja objekta Dolibarr Product htdocs/product/class/<u>product.class.php</u>, vrijednost za naziv datoteke klase je<br><i>proizvod/klasa/proizvod .class.php</i>
+CronObjectHelp=Ime objekta za učitavanje. <BR> Na primjer, za pozivanje metode dohvaćanja objekta Dolibarr Product /htdocs/product/class/product.class.php, vrijednost za naziv datoteke klase je<br><i>Proizvod</i>
+CronMethodHelp=Metoda objekta za pokretanje. <BR> Na primjer za pozivanje metode dohvaćanja objekta Dolibarr Product /htdocs/product/class/product.class.php, vrijednost za metodu je <br><i>fetch</i>
+CronArgsHelp=Argumenti metode. <BR> Na primjer, za pozivanje metode dohvaćanja objekta Dolibarr Product /htdocs/product/class/product.class.php, vrijednost za parametre može biti<br><i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
 # Info
 # Common
 CronType=Job type
-CronType_method=Call method of a PHP Class
+CronType_method=Metod poziva PHP klase
 CronType_command=Shell komanda
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
+CronCannotLoadClass=Nije moguće učitati datoteku klase %s (za korištenje klase %s)
+CronCannotLoadObject=Datoteka klase %s je učitana, ali objekat %s nije pronađen u njoj
 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
-MakeSendLocalDatabaseDumpShort=Send local database backup
-MakeSendLocalDatabaseDump=Send local database backup by email. Parameters are: to, from, subject, message, filename (Name of file sent), filter ('sql' for backup of database only)
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
-CleanUnfinishedCronjobShort=Clean unfinished cronjob
-CleanUnfinishedCronjob=Clean cronjob stuck in processing when the process is no longer running
+MakeLocalDatabaseDump=Kreirajte lokalni dump baze podataka. Parametri su: kompresija ('gz' ili 'bz' ili 'none'), vrsta sigurnosne kopije ('mysql', 'pgsql', 'auto'), 1, 'auto' ili naziv datoteke za izradu, broj rezervnih datoteka koje treba zadržati
+MakeSendLocalDatabaseDumpShort=Pošaljite sigurnosnu kopiju lokalne baze podataka
+MakeSendLocalDatabaseDump=Pošaljite sigurnosnu kopiju lokalne baze podataka putem e-pošte. Parametri su: do, od, predmet, poruka, naziv datoteke (ime poslane datoteke), filter ('sql' samo za sigurnosnu kopiju baze podataka)
+BackupIsTooLargeSend=Žao nam je, posljednja sigurnosna kopija je prevelika za slanje e-poštom
+CleanUnfinishedCronjobShort=Čisti nedovršeni cronjob
+CleanUnfinishedCronjob=Clean cronjob zaglavljen u obradi kada proces više ne radi
 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
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+DATAPOLICYJob=Anonimizator za čišćenje podataka i
+JobXMustBeEnabled=Posao %s mora biti omogućen
+EmailIfError=E-mail za upozorenje o grešci
+JobNotFound=Posao %s nije pronađen na listi poslova (pokušajte onemogućiti/omogućiti modul)
+ErrorInBatch=Greška prilikom pokretanja posla %s
 
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+LastExecutedScheduledJob=Posljednji izvršeni zakazani posao
+NextScheduledJobExecute=Sljedeći planirani posao za izvršenje
+NumberScheduledJobError=Broj zakazanih poslova u grešci
+NumberScheduledJobNeverFinished=Broj zakazanih poslova nikada nije završen
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index b6a5208fd0b..d38396b26b9 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -93,11 +93,11 @@ ErrorRecordHasAtLeastOneChildOfType=Objekt %s ima najmanje jedno dijete tipa %s
 ErrorRecordIsUsedCantDelete=Nije moguće izbrisati zapis. Već je korišten ili uključen u drugi objekt.
 ErrorModuleRequireJavascript=JavaScript ne smije biti onemogućen da bi ova funkcija radila. Da omogućite/onemogućite JavaScript, idite na meni Početna->Podešavanje->Prikaz.
 ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=Došlo je do tehničke greške. Molimo kontaktirajte administratora na sljedeći e-mail <b>%s</b> i navedite šifru greške <b>%s<span class='notranslate'>f09f77b09 span> u svoju poruku ili dodajte ekransku kopiju ove stranice.
-ErrorWrongValueForField=Polje <b>%s</b>: '<span>notranslate' <b></span>%s</b>' se ne podudara s pravilom redovnog izraza 36aee83b0aee8 <span class='notranslate'>%s</b>
+ErrorContactEMail=A technical error occurred. 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>
 ErrorHtmlInjectionForField=Polje <b>%s</b>: vrijednost '<span class='no '><b></span>%s</b>' sadrži zlonamjerne podatke koji nisu dozvoljeni
-ErrorFieldValueNotIn=Polje <b>%s</b>: '<span>notranslate' <b></span>%s</b>' nije vrijednost pronađena u polju b0z0837 span><span class='notranslate'>%s</b> od <b> %s</b>
-ErrorFieldRefNotIn=Polje <b>%s</b>: '<span>notranslate' <b></span>%s</b>' nije b0ae83f7365<span> class='notranslate'>%s</span></b> postojeća ref.
+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
 ErrorMultipleRecordFoundFromRef=Nekoliko zapisa pronađeno je pretraživanjem iz ref <b>%s</b>. Nema načina da znate koji ID koristiti.
 ErrorsOnXLines=%s pronađene greške
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=Check that you don't use a too high number of recipients an
 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=Najmanje jedan obavezni direktorij mora postojati u zip modulu: <strong>%s</strong> > ili <span class='notranslate'><strong>%s</strong>
+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.
@@ -263,9 +263,9 @@ ErrorReplaceStringEmpty=Greška, niz za zamjenu je prazan
 ErrorProductNeedBatchNumber=Greška, proizvodu '<b>%s</b>' potreban je broj/serijski broj
 ErrorProductDoesNotNeedBatchNumber=Greška, proizvod '<b>%s</b>' ne prihvata lot/ serijski broj
 ErrorFailedToReadObject=Greška, nije uspjelo čitanje objekta tipa <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Greška, parametar <b>%s</b> mora biti omogućen u <span> class 'notranslate'><b></span>conf/conf.php<> za omogućavanje upotrebe sučelja komandne linije od strane internog planera poslova
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Greška, ova prijava je izvan raspona datuma valjanosti
-ErrorValueLength=Dužina polja '<b>%s</b>< mora biti veća od' span class='notranslate'><b></span>%s</b>'
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=Riječ '<b>%s</b>' je rezervirana ključna riječ
 ErrorFilenameReserved=Ime datoteke <b>%s</b> se ne može koristiti jer je rezervirana i zaštićena naredba.
 ErrorNotAvailableWithThisDistribution=Nije dostupno sa ovom distribucijom
@@ -373,7 +373,7 @@ WarningModuleNeedRefresh = Modul <b>%s</b> je onemogućen. Ne zaboravite to omog
 WarningPermissionAlreadyExist=Postojeće dozvole za ovaj objekt
 WarningGoOnAccountancySetupToAddAccounts=Ako je ova lista prazna, idite u meni %s - %s - %s da učitate ili kreirate račune za vaš kontni plan.
 WarningCorrectedInvoiceNotFound=Ispravljena faktura nije pronađena
-WarningCommentNotFound=Molimo provjerite položaj početnih i krajnjih komentara za <b>%s<span klasu ='notranslate'></b></span> odjeljak u datoteci <b>%s<span class='notranslate'>b09f4b>b09f17 span> prije podnošenja radnje
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
 WarningAlreadyReverse=Kretanje dionica je već obrnuto
 
 SwissQrOnlyVIR = SwissQR faktura se može dodati samo na fakture postavljene da se plaćaju plaćanjem kreditnim transferom.
diff --git a/htdocs/langs/bs_BA/eventorganization.lang b/htdocs/langs/bs_BA/eventorganization.lang
index c1cbea0ee3c..d1c5a575527 100644
--- a/htdocs/langs/bs_BA/eventorganization.lang
+++ b/htdocs/langs/bs_BA/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=Podešavanje organizacije događaja
 EventOrganization=Organizacija događaja
 EventOrganizationSetupPage = Stranica za podešavanje organizacije događaja
 EVENTORGANIZATION_TASK_LABEL = Oznaka zadataka za automatsko kreiranje kada se projekat validira
-EVENTORGANIZATION_TASK_LABELTooltip = Kada potvrdite događaj za organizaciju, neki zadaci se mogu automatski kreirati u projektu<br><br>Na primjer: <br>Pošalji poziv za konferencije<br>Pošalji poziv za štandove<br>prijedlozi Conferences of Conferences ='notranslate'><br></span>Provjeri prijavu za štandove<br>Otvori pretplatu na događaj za učesnike<br> a podsjetimo o događaju govornicima<span class='notranslate'><br>Pošalji podsjetnik na događaj domaćinima Bootha<br>Pošalji podsjetnik na događaj učesnicima
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=Ostavite prazno ako ne trebate automatski kreirati zadatke.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorija za dodavanje trećim stranama automatski kreirana kada neko predloži konferenciju
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorija za dodavanje trećim stranama se automatski kreira kada predlože štand
@@ -88,6 +88,7 @@ PriceOfRegistration=Cijena registracije
 PriceOfRegistrationHelp=Cijena koju treba platiti za registraciju ili učešće na događaju
 PriceOfBooth=Cijena pretplate za štand
 PriceOfBoothHelp=Cijena pretplate za štand
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Link ICS za konferencije
 ConferenceOrBoothInformation=Informacije o konferenciji ili štandu
 Attendees=Polaznici
@@ -127,7 +128,7 @@ PublicAttendeeSubscriptionPage = Javni link za registraciju samo na ovaj događa
 MissingOrBadSecureKey = Sigurnosni ključ je nevažeći ili nedostaje
 EvntOrgWelcomeMessage = Ovaj obrazac vam omogućava da se registrujete kao novi učesnik događaja
 EvntOrgDuration = Ova konferencija počinje %s i završava se %s.
-ConferenceAttendeeFee = Naknada za učesnike konferencije za događaj : '%s' koja se javlja od %s do <span class='notranslate'>%s >.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 BoothLocationFee = Lokacija štanda za događaj : '%s' koji se javlja od %s do %s
 EventType = Vrsta događaja
 LabelOfBooth=Oznaka štanda
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index 638a3f750f9..837bc2b30e1 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -72,7 +72,7 @@ FieldsTarget=Targeted fields
 FieldTarget=Targeted field
 FieldSource=Source field
 NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=Provjerite da li format datoteke (polje i graničnici nizova) vaše datoteke odgovara opcijama prikazanim i da ste izostavili red zaglavlja , ili će one biti označene kao greške u sljedećoj simulaciji.<br>Kliknite na "<b>%s</b>" dugme za pokretanje provjere strukture datoteke/sadržaja i<simulira proces uvoza. span class='notranslate'><br></span><b>Nikakvi podaci neće biti promijenjeni u vašoj bazi podataka</b>.
+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=Pokrenite simulaciju uvoza
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
@@ -87,7 +87,7 @@ ErrorMissingMandatoryValue=Obavezni podaci su prazni u izvornoj datoteci u kolon
 TooMuchErrors=Još uvijek postoje <b>%s</b> drugi izvorni redovi s greškama, ali izlaz ima bila ograničena.
 TooMuchWarnings=Još uvijek postoje <b>%s</b> druge izvorne linije s upozorenjima, ali izlaz ima bila ograničena.
 EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=Vi <b>morate</b> ispraviti sve greške <b><span class='prije notranslate'></b> izvodi definitivni uvoz.
+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=Možete pronaći sve uvezene zapise u vašoj bazi podataka filtriranjem u polju <b>import_key='%s'</b>.
 NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
@@ -95,7 +95,7 @@ NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
 DataComeFromNoWhere=Value to insert comes from nowhere in source file.
 DataComeFromFileFieldNb=Vrijednost za umetanje dolazi iz stupca <b>%s</b> u izvornoj datoteci.
 DataComeFromIdFoundFromRef=Vrijednost koja dolazi iz izvorne datoteke koristit će se za pronalaženje ID-a nadređenog objekta koji će se koristiti (dakle objekt <b>%s</b> koji ima referencu iz izvorne datoteke mora postojati u bazi podataka).
-DataComeFromIdFoundFromCodeId=Vrijednost koda koji dolazi iz izvorne datoteke koristit će se za pronalaženje ID-a nadređenog objekta koji će se koristiti (tako da kod iz izvorne datoteke mora postojati u rječniku <b><span klasa ='notranslate'>%s</span></b>). Imajte na umu da ako znate ID, možete ga koristiti i u izvornoj datoteci umjesto u kodu. Uvoz bi trebao funkcionirati u oba slučaja.
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=ID nadređenog objekta, koji je pronađen pomoću podataka u izvornoj datoteci, bit će umetnut u sljedeće polje:
 DataCodeIDSourceIsInsertedInto=ID roditeljske linije, koji je pronađen iz koda, bit će umetnut u sljedeće polje:
@@ -103,7 +103,7 @@ 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>Vrijednost odvojena zarezima</b> format datoteke (.csv).<br> je format tekstualne datoteke u kojoj su polja odvojena separatorom [ <span class='notranslate'>%s ]. Ako se separator pronađe unutar sadržaja polja, polje se zaokružuje okruglim znakom [ %s ]. Izlazni znak za izbjegavanje okruglog znaka je [ %s ].
+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> format datoteke (.xls)<br>Ovo je native Excel 95 format (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> format datoteke (.xlsx)<br> je nativni 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].
@@ -113,7 +113,7 @@ Separator=separator polja
 Enclosure=Razgraničenje nizova
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=GGGG, GGGGMM, GGGGMMDD: filtrira po jednu godinu/mjesec/dan<br>GGGG+GGGG, GGGGMM+GGGGMM, GGGGMMDD+GGGGMMDD: filteri u rasponu godina/mjeseca u rasponu od/ span class='notranslate'><br></span> > GGGG, > GGGGMM, > GGGGMMDD: filteri za sve naredne godine/mjesece/dane<br> < GGGG, < GGGMM GGGGMMDD: filteri za sve prethodne godine/mjesece/dane
+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
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index ad77b76a54f..6d99d0092ca 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -2,36 +2,36 @@
 InstallEasy=Pratite instrukcije korak po korak.
 MiscellaneousChecks=Provjera preduvjeta
 ConfFileExists=Konfiguracijska datoteka<b>%s</b> postoji.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijski fajl <b>%s</b> ne postoji i nije bilo moguće kreirati!
 ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se može napraviti.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=U konfiguracijski fajl <b>%s</b> nije moguće pisati. Provjerite dozvole. Za prvu instalaciju, vaš web server mora biti u mogućnosti da upiše u ovu datoteku tokom procesa konfiguracije ("chmod 666" na primjer na Unix-u poput OS-a).
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-NoReadableConfFileSoStartInstall=The configuration file <b>conf/conf.php</b> does not exists or is not readable. We will run the installation process to try to initialize it.
+ConfFileMustBeAFileNotADir=Konfiguracijski fajl <b>%s</b> mora biti datoteka, a ne direktorij.
+ConfFileReload=Ponovno učitavanje parametara iz konfiguracijske datoteke.
+NoReadableConfFileSoStartInstall=Konfiguracijski fajl <b>conf/conf.php</b> ne postoji ili nije čitljiv. Pokrenut ćemo proces instalacije kako bismo ga pokušali inicijalizirati.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportPOSTGETKo=Moguće je da vaša PHP postavka ne podržava varijable POST i/ili GET. Provjerite parametar <b>variables_order</b> u php.ini.
 PHPSupportSessions=Ovaj PHP podržava sesije.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=Ovaj PHP podržava funkcije %s.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
 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.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+Recheck=Kliknite ovdje za detaljniji test
+ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podržava sesije. Ova funkcija je potrebna da bi se Dolibarr omogućio da radi. Provjerite vaše PHP postavke i dozvole za direktorij sesija.
+ErrorPHPDoesNotSupport=Vaša PHP instalacija ne podržava funkcije %s.
 ErrorDirDoesNotExists=Direktorij %s ne postoji.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=Vratite se i provjerite/ispravite parametre.
 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 or higher is required.
-ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorPHPVersionTooLow=PHP verzija prestara. Potrebna je verzija %s ili novija.
+ErrorPHPVersionTooHigh=PHP verzija previsoka. Potrebna je verzija %s ili niža.
+ErrorConnectedButDatabaseNotFound=Veza sa serverom uspješna, ali baza podataka '%s' nije pronađena.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
-ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+ErrorNoMigrationFilesFoundForParameters=Nije pronađena datoteka za migraciju za odabrane verzije
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ako baza podataka ne postoji, vratite se i u opciju "Kreiraj bazu podataka".
 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.
+WarningBrowserTooOld=Verzija pretraživača je prestara. Toplo se preporučuje nadogradnja vašeg pretraživača na najnoviju verziju Firefoxa, Chromea ili Opera.
 PHPVersion=PHP Version
 License=Using license
 ConfigurationFile=Configuration file
@@ -44,23 +44,22 @@ 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.
+ServerAddressDescription=Ime ili IP adresa za server baze podataka. Obično 'localhost' kada se server baze podataka nalazi na istom serveru kao i 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
+DatabasePrefix=Prefiks tabele baze podataka
+DatabasePrefixDescription=Prefiks tabele baze podataka. Ako je prazno, podrazumevano je llx_.
+AdminLogin=Korisnički nalog za vlasnika Dolibarr baze podataka.
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
-CreateUser=Create user account or grant user account permission on the Dolibarr database
+CreateUser=Kreirajte korisnički račun ili dodijelite dozvolu korisničkom računu na Dolibarr bazi podataka
 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
+CheckToCreateDatabase=Označite kvadratić ako baza podataka još ne postoji i pa mora biti kreirana.<br>U ovom slučaju, također morate popuniti korisničko ime i lozinka za nalog superkorisnika na dnu ove stranice.
+CheckToCreateUser=Označite okvir ako:<br>korisnički račun baze podataka još ne postoji i pa mora biti kreiran, ili<br>ako korisnički račun postoji, ali baza podataka ne postoji i dozvole se moraju odobriti.<br> U ovom slučaju, morate unijeti i lozinku i <b> također</b> ime naloga superkorisnika i lozinku na dnu ove stranice. Ako ovo polje nije označeno, lozinka vlasnika baze podataka i već mora postojati.
+DatabaseRootLoginDescription=Ime naloga superkorisnika (za kreiranje novih baza podataka ili novih korisnika), obavezno ako baza podataka ili njen vlasnik već ne postoji.
+KeepEmptyIfNoPassword=Ostavite prazno ako superkorisnik nema lozinku (NE preporučuje se)
+SaveConfigurationFile=Pohranjivanje parametara u
 ServerConnection=Server connection
 DatabaseCreation=Database creation
 CreateDatabaseObjects=Database objects creation
@@ -71,9 +70,9 @@ 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!
+PleaseTypePassword=Unesite lozinku, prazne lozinke nisu dozvoljene!
+PleaseTypeALogin=Molimo unesite prijavu!
+PasswordsMismatch=Lozinke se razlikuju, pokušajte ponovo!
 SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
@@ -81,77 +80,77 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app
 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.
+MigrationNotFinished=Verzija baze podataka nije potpuno ažurirana: ponovo pokrenite proces nadogradnje.
 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).
+DirectoryRecommendation=<span class="warning">VAŽNO</span>: Morate koristiti direktorij koji je izvan web stranica (zato nemojte koristiti poddirektorij prethodnog parametra ).
 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.
+AdminLoginAlreadyExists=Dolibarr administratorski račun '<b>%s</b>' već postoji. Vratite se ako želite da kreirate još jednu.
 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
+WarningRemoveInstallDir=Upozorenje, iz sigurnosnih razloga, kada se proces instalacije završi, morate dodati datoteku pod nazivom <b>install.lock</b> u Dolibarr direktorij dokumenata kako bi se spriječilo ponovno slučajno/zlonamjerno korištenje instalacionih alata.
+FunctionNotAvailableInThisPHP=Nije dostupno u ovom PHP-u
 ChoosedMigrateScript=Choose migration script
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+DataMigration=Migracija baze podataka (podaci)
+DatabaseMigration=Migracija baze podataka (struktura + neki podaci)
 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.
+FreshInstallDesc=Koristite ovaj način ako vam je ovo prva instalacija. Ako nije, ovaj način rada može popraviti nepotpunu prethodnu instalaciju. Ako želite nadograditi svoju verziju, odaberite način "Nadogradnja".
 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.
+CorrectProblemAndReloadPage=Molimo riješite problem i pritisnite F5 da ponovo učitate stranicu.
 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.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Izabrali ste kreiranje baze podataka <b>%s</b>, ali za to je potreban Dolibarr za povezivanje na server <b>%s</b> sa super korisnikom <b>%s</b> dozvole.
+YouAskLoginCreationSoDolibarrNeedToConnect=Izabrali ste kreiranje baze podataka korisnika <b>%s</b>, ali za ovo, Dolibar treba se povezati na server <b>%s</b> sa super korisnikom <b>%s</b> dozvole.
+BecauseConnectionFailedParametersMayBeWrong=Povezivanje baze podataka nije uspjelo: parametri hosta ili super korisnika moraju biti pogrešni.
 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.
+IfLoginDoesNotExistsCheckCreateUser=Ako korisnik još ne postoji, morate označiti opciju "Kreiraj korisnika"
+ErrorConnection=Server "<b>%s</b>", naziv baze podataka "<b>%s</b>", login "f3z05 span>%s</b>", ili lozinka baze podataka može biti pogrešna ili verzija PHP klijenta može biti prestara u odnosu na verziju baze podataka .
 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.
+MigrateIsDoneStepByStep=Ciljana verzija (%s) ima prazninu od nekoliko verzija. Čarobnjak za instalaciju će se vratiti i predložiti daljnju migraciju kada se ova završi.
+CheckThatDatabasenameIsCorrect=Provjerite je li naziv baze podataka "<b>%s</b>" ispravan.
 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
+YouAskToCreateDatabaseSoRootRequired=Označili ste polje "Kreiraj bazu podataka". Za ovo, potrebno je da unesete login/lozinku superkorisnika (na dnu obrasca).
+YouAskToCreateDatabaseUserSoRootRequired=Označili ste polje "Kreiraj vlasnika baze podataka". Za ovo, potrebno je da unesete login/lozinku superkorisnika (na dnu obrasca).
+NextStepMightLastALongTime=Trenutni korak može potrajati nekoliko minuta. Molimo pričekajte da se sljedeći ekran u potpunosti prikaže prije nego što nastavite.
+MigrationCustomerOrderShipping=Migrirajte otpremu za skladištenje prodajnih naloga
 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>
+LastStepDesc=<strong>Posljednji korak</strong>: Definirajte ovdje i lozinku za prijavu koristite za povezivanje na Dolibarr. <b>Nemojte izgubiti ovo jer je to glavni račun za administraciju svih drugih/dodatnih korisničkih računa.</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'
+WarningUpgrade=Upozorenje:\nJeste li prvo pokrenuli sigurnosnu kopiju baze podataka?\nOvo se jako preporučuje. Gubitak podataka (zbog na primjer grešaka u mysql verziji 5.5.40/41/42/43) može biti moguć tokom ovog procesa, tako da je bitno da napravite potpuni dump vaše baze podataka prije početka bilo kakve migracije.\n\nKliknite OK da započnete proces migracije...
+ErrorDatabaseVersionForbiddenForMigration=Verzija vaše baze podataka je %s. Ima kritičnu grešku koja omogućava gubitak podataka ako izvršite strukturne promjene u vašoj bazi podataka, kao što je potrebno za proces migracije. Iz njegovog razloga, migracija neće biti dozvoljena dok ne nadogradite svoju bazu podataka na verziju sloja (zakrpljenu) (lista poznatih verzija s greškama: %s)
+KeepDefaultValuesWamp=Koristili ste Dolibarr čarobnjak za podešavanje iz DoliWamp-a, tako da su vrijednosti koje su ovdje predložene već optimizirane. Promijenite ih samo ako znate šta radite.
+KeepDefaultValuesDeb=Koristili ste Dolibarr čarobnjak za postavljanje iz Linux paketa (Ubuntu, Debian, Fedora...), tako da su vrijednosti koje su ovdje predložene već optimizirane. Mora se unijeti samo lozinka vlasnika baze podataka koju treba kreirati. Ostale parametre mijenjajte samo ako znate šta radite.
+KeepDefaultValuesMamp=Koristili ste Dolibarr čarobnjak za podešavanje iz DoliMamp-a, tako da su vrijednosti koje su ovdje predložene već optimizirane. Promijenite ih samo ako znate šta radite.
+KeepDefaultValuesProxmox=Koristili ste Dolibarr čarobnjak za podešavanje sa Proxmox virtuelnog uređaja, tako da su vrednosti koje su ovde predložene već optimizovane. Promijenite ih samo ako znate šta radite.
+UpgradeExternalModule=Pokrenite namjenski proces nadogradnje vanjskog modula
+SetAtLeastOneOptionAsUrlParameter=Postavite barem jednu opciju kao parametar u URL-u. Na primjer: '...repair.php?standard=confirmed'
 NothingToDelete=Ništa za čišćenje/brisanje
-NothingToDo=Nothing to do
+NothingToDo=Ništa za raditi
 #########
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=Migracija podataka za narudžbe dobavljača
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
+MigrationSuccessfullUpdate=Nadogradnja uspjela
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -163,9 +162,9 @@ 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.
+MigrationContractsFieldDontExist=Polje fk_facture više ne postoji. Ništa za raditi.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Ispravka datuma praznog ugovora je uspješno obavljena
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -187,29 +186,34 @@ 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
+MigrationProjectTaskActors=Migracija podataka za tablicu 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
+MigrationPaymentMode=Migracija podataka za vrstu plaćanja
 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
+MigrationEvents=Migracija događaja za dodavanje vlasnika događaja u tabelu dodjele
+MigrationEventsContact=Migracija događaja za dodavanje kontakta događaja u tabelu dodjele
 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)
+MigrationUserRightsEntity=Ažurirajte vrijednost polja entiteta llx_user_rights
+MigrationUserGroupRightsEntity=Ažurirajte vrijednost polja entiteta llx_usergroup_rights
+MigrationUserPhotoPath=Migracija foto staza za korisnike
+MigrationFieldsSocialNetworks=Migracija korisničkih polja društvenih mreža (%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
+MigrationResetBlockedLog=Resetujte modul BlockedLog za algoritam v7
+MigrationImportOrExportProfiles=Migracija uvoznih ili izvoznih profila (%s)
+ShowNotAvailableOptions=Prikaži nedostupne opcije
+HideNotAvailableOptions=Sakrij nedostupne opcije
+ErrorFoundDuringMigration=Greške su prijavljene tokom procesa migracije tako da sljedeći korak nije dostupan. Da zanemarite greške, možete <a href="%s">kliknuti ovdje</a>, ali aplikacija ili neke funkcije možda neće raditi ispravno dok se greške ne riješe .
+YouTryInstallDisabledByDirLock=Aplikacija je pokušala samostalno nadograditi, ali stranice za instalaciju/nadogradnju su onemogućene radi sigurnosti (direktorij je preimenovan sa sufiksom .lock).<br>
+YouTryInstallDisabledByFileLock=Aplikacija je pokušala samonadograditi, ali stranice za instalaciju/nadogradnju su onemogućene radi sigurnosti (postojanjem datoteke zaključavanja <strong>install.lock</strong> u direktoriju dolibarr dokumenata).<br>
+YouTryUpgradeDisabledByMissingFileUnLock=Aplikacija je pokušala samostalno nadograditi, ali proces nadogradnje trenutno nije dozvoljen.<br>
+ClickHereToGoToApp=Kliknite ovdje da odete na svoju aplikaciju
+ClickOnLinkOrRemoveManualy=Ako je nadogradnja u toku, pričekajte. Ako ne, kliknite na sljedeću vezu. Ako uvijek vidite istu stranicu, morate ukloniti/preimenovati datoteku install.lock u direktoriju dokumenata.
+ClickOnLinkOrCreateUnlockFileManualy=Ako je nadogradnja u toku, pričekajte... Ako nije, morate ukloniti datoteku install.lock ili kreirati datoteku upgrade.unlock u direktoriju Dolibarr dokumenata.
+Loaded=Napunjeno
+FunctionTest=Funkcionalni test
+NodoUpgradeAfterDB=Eksterni moduli ne zahtijevaju nikakvu radnju nakon nadogradnje baze podataka
+NodoUpgradeAfterFiles=Eksterni moduli ne zahtijevaju nikakvu radnju nakon nadogradnje datoteka ili direktorija
+MigrationContractLineRank=Premjesti liniju ugovora da koristi rang (i omogući promjenu redoslijeda)
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 4f76997f4fd..90a73dd167c 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Popunite polja za unos kako biste unaprijed odabrali treće strane ili kontakte/adrese za ciljanje
-AdvTgtSearchTextHelp=Koristite %% kao zamjenske znakove. Na primjer, da pronađete sve stavke kao što je <b>jean, joe, jim</b>, možete unijeti  <b>j%%</b>, također možete koristiti ; kao separator vrijednosti, i koristite ! za osim ove vrijednosti. Na primjer <b>jean;joe;jim%%;!jimo;!jima%% span><span class='notranslate'></b> će ciljati sve jean, joe, počni sa jim, ali ne i jimo i ne sve što počinje sa jima
+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
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 0ef57b6d13a..42444e703bb 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -68,7 +68,7 @@ ErrorNoRequestInError=Nema greške u zahtjevu
 ErrorServiceUnavailableTryLater=Usluga trenutno nije dostupna. Pokušajte ponovo kasnije.
 ErrorDuplicateField=Duplicirana vrijednost u unikatnom polju
 ErrorSomeErrorWereFoundRollbackIsDone=Pronađene su neke greške. Promjene su vraćene.
-ErrorConfigParameterNotDefined=Parametar <b>%s</b> nije definiran u <span konfiguraciji Dolibarr class='notranslate'><b></span>conf.php</b>.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Neuspjelo traženje korisnika <b>%s</b> u Dolibarr bazi podataka.
 ErrorNoVATRateDefinedForSellerCountry=Greška, nije definirana PDV stopa za državu '%s'.
 ErrorNoSocialContributionForSellerCountry=Greška, nisu definirane vrste doprinosa i poreza za državu '%s'.
@@ -420,6 +420,8 @@ TotalTTCShort=Ukupno (uklj. PDV)
 TotalHT=Ukupno (bez poreza)
 TotalHTforthispage=Ukupno (bez poreza) za ovu stranicu
 Totalforthispage=Ukupno za ovu stranicu
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Ukupno (uklj. PDV)
 TotalTTCToYourCredit=Ukupno (uklj. PDV) u vašu korist
 TotalVAT=Ukupan porez
@@ -647,6 +649,7 @@ ReportName=Naziv izvještaja
 ReportPeriod=Period izvještaja
 ReportDescription=Opis
 Report=Izvještaj
+Reports=Reports
 Keyword=Ključna riječ
 Origin=Porijeklo
 Legend=Objašnjenje
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index 6d5412f7807..81101a4f8a9 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=Pogledajte primjere ovdje
 EnabledDesc=Uslov da ovo polje bude aktivno.<br><br>Primjeri:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Je li polje vidljivo? (Primjeri: 0=Nikad vidljivo, 1=Vidljivo na listi i kreiranje/ažuriranje/pregled obrazaca, 2=Vidljivo samo na listi, 3=Vidljivo na obrascu za kreiranje/ažuriranje/pregled samo (ne na listama), 4=Vidljivo na listama i samo ažuriranje/pregled obrasca (ne kreiranje), 5=Vidljivo na listi i samo za prikaz (ne kreirajte, ne ažurirajte).<br><br>Upotreba negativne vrijednosti znači da polje nije prikazano podrazumevano na listi, ali se može izabrati za pregled).
 ItCanBeAnExpression=To može biti izraz. Primjer:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('odmor', 'define_holiday')?1:5
-DisplayOnPdfDesc=Prikažite ovo polje na kompatibilnim PDF dokumentima, možete upravljati pozicijom pomoću polja "Pozicija".<br><strong>Za dokument :</strong><br>0 = nije prikazano <br>1 = display<br>2 = prikaz samo ako nije prazan<br><br>b0e7843947b0e7843947 span>Za redove dokumenta :<span class='notranslate'></strong><br>0 = nije prikazano <br>1 = prikazano u koloni<br>3 = prikaz u stupcu opisa reda nakon opisa<br>4 = prikaz u stupcu opisa nakon opisa samo ako nije prazan
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=Na PDF
 IsAMeasureDesc=Može li se vrijednost polja kumulirati da se ukupan iznos dobije na listi? (Primjeri: 1 ili 0)
 SearchAllDesc=Koristi li se polje za pretraživanje iz alata za brzo pretraživanje? (Primjeri: 1 ili 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=Definirajte u datoteci okidača kod koji želite da izvršite kad
 SeeIDsInUse=Pogledajte ID-ove koji se koriste u vašoj instalaciji
 SeeReservedIDsRangeHere=Pogledajte raspon rezerviranih ID-ova
 ToolkitForDevelopers=Komplet alata za Dolibarr programere
-TryToUseTheModuleBuilder=Ako poznajete SQL i PHP, možete koristiti čarobnjaka za izradu izvornih modula.<br>Omogućite modul <strong>%s</strong> b01f6482 koristi the4 čarobnjaka klikom na <span class='notranslate'><span class="fa fa-bug"></span> u gornjem desnom meniju.<br>Warning : Ovo je napredna razvojna funkcija, <b>ne</b> eksperimentirajte na vašoj proizvodnoj lokaciji!
+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=Pogledajte <span class="fa fa-bug"></span> u gornjem desnom meniju
 AddLanguageFile=Dodajte jezički fajl
 YouCanUseTranslationKey=Ovdje možete koristiti ključ koji je ključ za prijevod koji se nalazi u jezičnoj datoteci (pogledajte karticu "Jezici")
@@ -148,7 +148,7 @@ CSSListClass=CSS za listu
 NotEditable=Nije moguće uređivati
 ForeignKey=Strani ključ
 ForeignKeyDesc=Ako vrijednost ovog polja mora biti zajamčena da postoji u drugoj tabeli. Ovdje unesite sintaksu koja odgovara vrijednosti: ime tablice.parentfieldtocheck
-TypeOfFieldsHelp=Primjer:<br>varchar(99)<br>e-pošta<br>telefon<span klasa ='notranslate'><br></span>ip<br>url<br>passwordb03b92fcz1 span>double(24,8)<span class='notranslate'><br>real<br>text<br>html <br>date<br>datetime<br>timestamp<span class='notranslate' <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]fda149bzcc<b03142bzcc<br>'1' znači da dodajemo + dugme nakon kombinacije da kreiramo zapis<br>'filter' je Uvjet sintakse univerzalnog filtera, primjer: '((status:=:1) i (fk_user:=:__USER_ID__) i( entitet:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Ovo je tip polja/atributa.
 AsciiToHtmlConverter=Ascii u HTML konverter
 AsciiToPdfConverter=Ascii u PDF konverter
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Dodavanje koda u deskriptor nije uspjelo. Provjeri
 DictionariesCreated=Rječnik <b>%s</b> uspješno kreiran
 DictionaryDeleted=Rječnik <b>%s</b> je uspješno uklonjen
 PropertyModuleUpdated=Svojstvo <b>%s</b> je uspješno ažurirano
-InfoForApiFile=* Kada generirate datoteku po prvi put, sve metode će biti kreirane <strong>za svaki objekt.</strong><br>* Kada kliknete na <strong>ukloni</strong> samo uklanjate sve metode za klasu <span ='notranslate'><strong></span>odabrani objekat</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Stranica za podešavanje modula
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Možete generirati i ovdje urediti datoteke klasa kako biste pružili nove birače cilja e-pošte za modul masovnog slanja e-pošte
diff --git a/htdocs/langs/bs_BA/multicurrency.lang b/htdocs/langs/bs_BA/multicurrency.lang
index 28bb0659cee..506ccaa61f1 100644
--- a/htdocs/langs/bs_BA/multicurrency.lang
+++ b/htdocs/langs/bs_BA/multicurrency.lang
@@ -7,7 +7,7 @@ multicurrency_syncronize_error=Greška pri sinhronizaciji: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Koristite datum dokumenta da pronađete kurs valute, umesto da koristite najnoviji poznati kurs
 multicurrency_useOriginTx=Kada je objekt kreiran od drugog, zadržite izvornu stopu od izvornog objekta (inače koristite najnoviju poznatu stopu)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Morate kreirati račun na web stranici %s da biste koristili ovu funkciju.<br>Nabavite svoj <b> /span>API ključ<span class='notranslate'></b>.<br>Ako koristite besplatni račun, ne možete promijeniti <b>izvorna valuta</b> (USD prema zadanim postavkama).<br>Ako vaša glavna valuta nije USD, aplikacija će ga automatski ponovo izračunati.<br><br>Ograničeni ste na 1000 sinhronizacija mjesečno.
+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 ključ
 multicurrency_appCurrencySource=Izvorna valuta
 multicurrency_alternateCurrencySource=Alternativni izvor valute
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index dd9a1a47906..16a4708694b 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -1,163 +1,165 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
-NumberingShort=N°
+SecurityCode=Sigurnosni kod
+NumberingShort=br
 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
+ToolsDesc=Svi alati koji nisu uključeni u druge stavke menija su grupirani ovdje.<br>Svim alatima se može pristupiti preko lijevog menija.
+Birthday=Rođendan
+BirthdayAlert=Upozorenje za rođendan
+BirthdayAlertOn=rođendansko upozorenje aktivno
+BirthdayAlertOff=rođendansko upozorenje neaktivno
+TransKey=Prevod ključa TransKey
+MonthOfInvoice=Mjesec (broj 1-12) od datuma fakture
+TextMonthOfInvoice=Mjesec (tekst) datuma fakture
+PreviousMonthOfInvoice=Prethodni mjesec (broj 1-12) datuma fakture
+TextPreviousMonthOfInvoice=Prethodni mjesec (tekst) datuma fakture
+NextMonthOfInvoice=Sledeći mesec (broj 1-12) od datuma fakture
+TextNextMonthOfInvoice=Sljedeći mjesec (tekst) datuma fakture
+PreviousMonth=Prethodni mjesec
+CurrentMonth=Tekući mjesec
+ZipFileGeneratedInto=Zip datoteka generirana u <b>%s</b>.
+DocFileGeneratedInto=Datoteka dokumenta generirana u <b>%s</b>.
+JumpToLogin=Disconnected. Idi na stranicu za prijavu...
+MessageForm=Poruka na obrascu za online plaćanje
+MessageOK=Poruka na povratnoj stranici za validirano plaćanje
+MessageKO=Poruka na povratnoj stranici za poništenu uplatu
+ContentOfDirectoryIsNotEmpty=Sadržaj ovog imenika nije prazan.
+DeleteAlsoContentRecursively=Označite da izbrišete sav sadržaj rekurzivno
 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_SIGNED_WEB=Customer proposal closed signed on portal page
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_CLOSE_REFUSED_WEB=Customer proposal closed refused on portal page
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
+YearOfInvoice=Godina datuma fakture
+PreviousYearOfInvoice=Prethodna godina datuma fakture
+NextYearOfInvoice=Naredna godina datuma fakture
+DateNextInvoiceBeforeGen=Datum sljedeće fakture (prije generiranja)
+DateNextInvoiceAfterGen=Datum sljedeće fakture (nakon generiranja)
+GraphInBarsAreLimitedToNMeasures=Grafika je ograničena na %s mjere u 'Bars' modu. Umjesto toga, automatski je odabran mod 'Linije'.
+OnlyOneFieldForXAxisIsPossible=Samo 1 polje je trenutno moguće kao X-osa. Odabrano je samo prvo odabrano polje.
+AtLeastOneMeasureIsRequired=Potrebno je najmanje 1 polje za mjeru
+AtLeastOneXAxisIsRequired=Potrebno je najmanje 1 polje za X-os
+LatestBlogPosts=Najnoviji postovi na blogu
+notiftouser=Za korisnike
+notiftofixedemail=Na fiksnu poštu
+notiftouserandtofixedemail=Za korisnika i fiksna pošta
+Notify_ORDER_VALIDATE=Prodajni nalog potvrđen
+Notify_ORDER_SENTBYMAIL=Prodajni nalog poslat poštom
+Notify_ORDER_CLOSE=Prodajni nalog isporučen
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Narudžbenica poslana e-poštom
+Notify_ORDER_SUPPLIER_VALIDATE=Narudžbenica je snimljena
+Notify_ORDER_SUPPLIER_APPROVE=Narudžbenica odobrena
+Notify_ORDER_SUPPLIER_SUBMIT=Narudžbenica dostavljena
+Notify_ORDER_SUPPLIER_REFUSE=Narudžbenica odbijena
+Notify_PROPAL_VALIDATE=Potvrđen prijedlog kupca
+Notify_PROPAL_CLOSE_SIGNED=Prijedlog klijenta zatvoren potpisan
+Notify_PROPAL_CLOSE_REFUSED=Prijedlog korisnika zatvoren je odbijen
+Notify_PROPAL_SENTBYMAIL=Komercijalni prijedlog poslat poštom
+Notify_WITHDRAW_TRANSMIT=Povlačenje prijenosa
+Notify_WITHDRAW_CREDIT=Povlačenje kredita
+Notify_WITHDRAW_EMIT=Izvršite povlačenje
 Notify_COMPANY_CREATE=Treća stranka kreirana
-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__
+Notify_COMPANY_SENTBYMAIL=Pošta poslana sa stranice treće strane
+Notify_BILL_VALIDATE=Validirana faktura kupca
+Notify_BILL_UNVALIDATE=Faktura kupca nije validirana
+Notify_BILL_PAYED=Plaćena faktura kupca
+Notify_BILL_CANCEL=Račun kupca je poništen
+Notify_BILL_SENTBYMAIL=Račun kupcu poslat poštom
+Notify_BILL_SUPPLIER_VALIDATE=Provjerena faktura dobavljača
+Notify_BILL_SUPPLIER_PAYED=Plaćena faktura dobavljača
+Notify_BILL_SUPPLIER_SENTBYMAIL=Račun dobavljača poslat poštom
+Notify_BILL_SUPPLIER_CANCELED=Faktura dobavljača je poništena
+Notify_CONTRACT_VALIDATE=Ugovor validiran
+Notify_FICHINTER_VALIDATE=Intervencija potvrđena
+Notify_FICHINTER_CLOSE=Intervencija zatvorena
+Notify_FICHINTER_ADD_CONTACT=Dodan kontakt u Intervenciju
+Notify_FICHINTER_SENTBYMAIL=Intervencija poslata poštom
+Notify_SHIPPING_VALIDATE=Dostava validirana
+Notify_SHIPPING_SENTBYMAIL=Dostava poslana poštom
+Notify_MEMBER_VALIDATE=Član potvrđen
+Notify_MEMBER_MODIFY=Član izmijenjen
+Notify_MEMBER_SUBSCRIPTION=Član je pretplaćen
+Notify_MEMBER_RESILIATE=Član prekinut
+Notify_MEMBER_DELETE=Član je izbrisan
+Notify_PROJECT_CREATE=Kreiranje projekta
+Notify_TASK_CREATE=Zadatak kreiran
+Notify_TASK_MODIFY=Zadatak izmijenjen
+Notify_TASK_DELETE=Zadatak je izbrisan
+Notify_EXPENSE_REPORT_VALIDATE=Potvrđen izvještaj o troškovima (potrebno je odobrenje)
+Notify_EXPENSE_REPORT_APPROVE=Izvještaj o troškovima odobren
+Notify_HOLIDAY_VALIDATE=Ostavite zahtjev potvrđenim (potrebno je odobrenje)
+Notify_HOLIDAY_APPROVE=Ostavite zahtjev odobren
+Notify_ACTION_CREATE=Dodata akcija dnevnom redu
+SeeModuleSetup=Pogledajte postavljanje modula %s
+NbOfAttachedFiles=Broj priloženih fajlova/dokumenata
+TotalSizeOfAttachedFiles=Ukupna veličina priloženih datoteka/dokumenata
+MaxSize=Maksimalna veličina
+AttachANewFile=Priložite novi fajl/dokument
+LinkedObject=Povezani objekt
+NbOfActiveNotifications=Broj obavještenja (br. mejlova primaoca)
+PredefinedMailTest=__(Zdravo)__\nOvo je probna poruka poslana na __EMAIL__.\nLinije su razdvojene povratnom linijom.\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 box
-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
+PredefinedMailContentContract=__(Zdravo)__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Zdravo)__\n\nU prilogu možete pronaći fakturu __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Zdravo)__\n\nPodsjećamo, čini se da faktura __REF__ nije plaćena. Kopija računa je priložena kao podsjetnik.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Zdravo)__\n\nU prilogu možete pronaći komercijalni prijedlog __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Zdravo)__\n\nU prilogu potražite zahtjev za cijenu __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Zdravo)__\n\nU prilogu možete pronaći narudžbu __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Zdravo)__\n\nU prilogu možete pronaći našu narudžbu __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Zdravo)__\n\nU prilogu možete pronaći fakturu __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Zdravo)__\n\nPriložena je isporuka __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Zdravo)__\n\nU prilogu potražite intervenciju __REF__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Možete kliknuti na link ispod da izvršite uplatu ako to već nije obavljeno.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Zdravo)__\n\n\n__(S poštovanjem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Podsjetnik na događaj "__EVENT_LABEL__" __EVENT_DATE__ u __EVENT_TIME__<br><br>Ovo nije automatska poruka, molimo vas da
+DemoDesc=Dolibarr je kompaktni ERP/CRM koji podržava nekoliko poslovnih modula. Demo koji prikazuje sve module nema smisla jer se ovaj scenario nikada ne dešava (dostupno je nekoliko stotina). Dakle, dostupno je nekoliko demo profila.
+ChooseYourDemoProfil=Odaberite demo profil koji najbolje odgovara vašim potrebama...
+ChooseYourDemoProfilMore=...ili napravite vlastiti profil<br>(ručni odabir modula)
+DemoFundation=Upravljajte članovima fondacije
+DemoFundation2=Upravljajte članovima i bankovnim računom fondacije
+DemoCompanyServiceOnly=Samo kompanija ili samostalna prodajna usluga
+DemoCompanyShopWithCashDesk=Upravljajte trgovinom s kasom
+DemoCompanyProductAndStocks=Kupujte u prodaji proizvoda na prodajnom mjestu
+DemoCompanyManufacturing=Kompanija koja proizvodi proizvode
+DemoCompanyAll=Kompanija sa više delatnosti (svi glavni moduli)
+CreatedBy=Kreirao %s
+ModifiedBy=Izmijenio %s
+ValidatedBy=Potvrdio %s
+SignedBy=Potpisao %s
+ClosedBy=Zatvorio %s
+CreatedById=ID korisnika koji je kreirao
+ModifiedById=Korisnički ID koji je izvršio posljednju promjenu
+ValidatedById=Korisnički ID koji je potvrdio
+CanceledById=ID korisnika koji je otkazao
+ClosedById=Korisnički ID koji je zatvoren
+CreatedByLogin=Prijava korisnika koji je kreirao
+ModifiedByLogin=Prijava korisnika koji je napravio posljednju promjenu
+ValidatedByLogin=Prijava korisnika koji je potvrdio
+CanceledByLogin=Prijava korisnika koji je otkazao
+ClosedByLogin=Prijava korisnika koji je zatvorio
+FileWasRemoved=Fajl %s je uklonjen
+DirWasRemoved=Direktorij %s je uklonjen
+FeatureNotYetAvailable=Funkcija još nije dostupna u trenutnoj verziji
+FeatureNotAvailableOnDevicesWithoutMouse=Funkcija nije dostupna na uređajima bez miša
+FeaturesSupported=Podržane funkcije
+Width=Širina
+Height=Visina
+Depth=Dubina
 Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-WeightUnitton=ton
+Bottom=Dno
+Left=lijevo
+Right=U redu
+CalculatedWeight=Izračunata težina
+CalculatedVolume=Izračunata zapremina
+Weight=Težina
+WeightUnitton=tona
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+WeightUnitpound=funta
+WeightUnitounce=unca
+Length=Dužina
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Area
+Surface=Područje
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
@@ -171,169 +173,168 @@ VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=unca
+VolumeUnitlitre=litar
+VolumeUnitgallon=galon
 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.
-EnterNewPasswordHere=Enter your new password here
-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.
+SizeUnitfoot=stopalo
+SizeUnitpoint=tačka
+BugTracker=Praćenje grešaka
+SendNewPasswordDesc=Ovaj obrazac vam omogućava da zatražite novu lozinku. Bit će poslana na vašu adresu e-pošte.<br>Promjena će stupiti na snagu kada kliknete na vezu za potvrdu u e-poruci.<br> Provjerite inbox.
+EnterNewPasswordHere=Unesite svoju novu lozinku ovdje
+BackToLoginPage=Povratak na stranicu za prijavu
+AuthenticationDoesNotAllowSendNewPassword=Način provjere autentičnosti je <b>%s</b>.<br>U ovom načinu rada, Dolibarr ne može znati niti promijeniti vašu lozinku.<br>Kontaktirajte administratora vašeg sistema ako želite promijeniti lozinku.
+EnableGDLibraryDesc=Instalirajte ili omogućite GD biblioteku na vašoj PHP instalaciji da biste koristili ovu opciju.
 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.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
-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
+StatsByAmount=Statistika količine proizvoda/usluga
+StatsByAmountProducts=Statistika količine proizvoda
+StatsByAmountServices=Statistika o količini usluga
+StatsByNumberOfUnits=Statistika za zbir količine proizvoda/usluga
+StatsByNumberOfUnitsProducts=Statistika za sumu količine proizvoda
+StatsByNumberOfUnitsServices=Statistika za zbir količine usluga
+StatsByNumberOfEntities=Statistika za broj referentnih subjekata (br. faktura, odnosno narudžbi...)
+NumberOf=Broj %s
+NumberOfUnits=Broj jedinica na %s
+AmountIn=Iznos u %s
+NumberOfUnitsMos=Broj jedinica za proizvodnju u proizvodnim narudžbama
+EMailTextInterventionAddedContact=Nova intervencija %s vam je dodijeljena.
+EMailTextInterventionValidated=Intervencija %s je potvrđena.
+EMailTextInterventionClosed=Intervencija %s je zatvorena.
+EMailTextInvoiceValidated=Faktura %s je potvrđena.
+EMailTextInvoicePayed=Faktura %s je plaćena.
+EMailTextProposalValidated=Prijedlog %s je potvrđen.
+EMailTextProposalClosedSigned=Prijedlog %s je zatvoren i potpisan.
+EMailTextProposalClosedSignedWeb=Prijedlog %s je zatvoren potpisan na stranici portala.
+EMailTextProposalClosedRefused=Odbijen je prijedlog %s.
+EMailTextProposalClosedRefusedWeb=Prijedlog %s je zatvoren i odbija se na stranici portala.
+EMailTextOrderValidated=Narudžba %s je potvrđena.
+EMailTextOrderClose=Narudžba %s je isporučena.
+EMailTextSupplierOrderApprovedBy=Narudžbenicu %s odobrio je %s.
+EMailTextSupplierOrderValidatedBy=Narudžbenicu %s snimio je %s.
+EMailTextSupplierOrderSubmittedBy=Narudžbenicu %s je poslao %s.
+EMailTextSupplierOrderRefusedBy=Narudžbenicu %s je odbio %s.
+EMailTextExpeditionValidated=Dostava %s je potvrđena.
+EMailTextExpenseReportValidated=Izvještaj o troškovima %s je potvrđen.
+EMailTextExpenseReportApproved=Izvještaj o troškovima %s je odobren.
+EMailTextHolidayValidated=Zahtjev za napuštanje %s je potvrđen.
+EMailTextHolidayApproved=Zahtjev za napuštanje %s je odobren.
+EMailTextActionAdded=Akcija %s je dodana na dnevni red.
+ImportedWithSet=Skup podataka za uvoz
+DolibarrNotification=Automatsko obavještenje
+ResizeDesc=Unesite novu širinu <b>ILI</b> novu visinu. Omjer će se zadržati tokom promjene veličine...
+NewLength=Nova širina
+NewHeight=Nova visina
+NewSizeAfterCropping=Nova veličina nakon obrezivanja
+DefineNewAreaToPick=Definirajte novo područje na slici za odabir (lijevim klikom na sliku pa povucite dok ne dođete do suprotnog ugla)
+CurrentInformationOnImage=Ovaj alat je dizajniran da vam pomogne da promijenite veličinu ili izrežete sliku. Ovo su informacije o trenutno uređenoj slici
+ImageEditor=Editor slika
+YouReceiveMailBecauseOfNotification=Ovu poruku ste primili jer je vaša e-pošta dodana na listu ciljeva za obavještavanje o određenim događajima u %s softveru %s.
+YouReceiveMailBecauseOfNotification2=Ovaj događaj je sljedeći:
+ThisIsListOfModules=Ovo je lista modula unapred odabranih ovim demo profilom (samo najčešći moduli su vidljivi u ovoj demonstraciji). Uredite ovo da biste imali personaliziraniji demo i kliknite na "Start".
+UseAdvancedPerms=Koristite napredne dozvole nekih modula
+FileFormat=Format datoteke
+SelectAColor=Odaberite boju
+AddFiles=Dodaj fajlove
 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
-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
-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
-LoginWith=Login with %s
+CancelUpload=Otkaži otpremanje
+FileIsTooBig=Fajlovi su preveliki
+PleaseBePatient=Molimo budite strpljivi...
+NewPassword=Nova šifra
+ResetPassword=Reset lozinke
+RequestToResetPasswordReceived=Primljen je zahtjev za promjenu vaše lozinke.
+NewKeyIs=Ovo su vaši novi ključevi za prijavu
+NewKeyWillBe=Vaš novi ključ za prijavu na softver će biti
+ClickHereToGoTo=Kliknite ovdje da odete na %s
+YouMustClickToChange=Međutim, prvo morate kliknuti na sljedeću vezu da potvrdite ovu promjenu lozinke
+ConfirmPasswordChange=Potvrdite promjenu lozinke
+ForgetIfNothing=Ako niste zatražili ovu promjenu, zaboravite ovu e-poštu. Vaši akreditivi se čuvaju.
+IfAmountHigherThan=Ako je iznos veći od <strong>%s</strong>
+SourcesRepository=Repozitorijum za izvore
+Chart=Grafikon
+PassEncoding=Šifriranje lozinke
+PermissionsAdd=Dozvole su dodane
+PermissionsDelete=Dozvole su uklonjene
+YourPasswordMustHaveAtLeastXChars=Vaša lozinka mora imati najmanje <strong>%s</strong> znakova
+PasswordNeedAtLeastXUpperCaseChars=Za lozinku je potrebno najmanje <strong>%s</strong> velika slova
+PasswordNeedAtLeastXDigitChars=Za lozinku je potrebno najmanje <strong>%s</strong> numeričke znakove
+PasswordNeedAtLeastXSpecialChars=Lozinka treba najmanje <strong>%s</strong> posebne znakove
+PasswordNeedNoXConsecutiveChars=Lozinka ne smije imati <strong>%s</strong> uzastopne slične znakove
+YourPasswordHasBeenReset=Vaša lozinka je uspješno resetirana
+ApplicantIpAddress=IP adresa podnosioca zahteva
+SMSSentTo=SMS poslan na %s
+MissingIds=Nedostaju id
+ThirdPartyCreatedByEmailCollector=Treća strana kreirana od strane sakupljača e-pošte iz e-pošte MSGID %s
+ContactCreatedByEmailCollector=Kontakt/adresa kreirana od strane sakupljača e-pošte iz e-pošte MSGID %s
+ProjectCreatedByEmailCollector=Projekat kreiran od strane sakupljača e-pošte iz e-pošte MSGID %s
+TicketCreatedByEmailCollector=Ulaznicu kreirao sakupljač e-pošte iz e-pošte MSGID %s
+OpeningHoursFormatDesc=Koristite - da odvojite radno vrijeme i.<br>Koristite razmak za unos različitih raspona.<br>Primjer: 8-12 14-18
+SuffixSessionName=Sufiks za naziv sesije
+LoginWith=Prijavite se sa %s
 
 ##### 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)
+LibraryUsed=Biblioteka korištena
+LibraryVersion=Bibliotečka verzija
+ExportableDatas=Podaci za izvoz
+NoExportableData=Nema podataka za izvoz (nema modula sa učitanim podacima za izvoz ili nedostaju dozvole)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Postavljanje web stranice modula
+WEBSITE_PAGEURL=URL stranice
 WEBSITE_TITLE=Titula
 WEBSITE_DESCRIPTION=Opis
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
+WEBSITE_IMAGE=Slika
+WEBSITE_IMAGEDesc=Relativni put medija slike. Ovo možete ostaviti praznim jer se rijetko koristi (može ga koristiti dinamički sadržaj za prikaz sličice na listi blog postova). Koristite __WEBSITE_KEY__ u putanji ako putanja zavisi od naziva web stranice (na primjer: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Ključne riječi
 LinesToImport=Linija za uvoz
 
-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=Upotreba memorije
+RequestDuration=Trajanje zahtjeva
+ProductsServicesPerPopularity=Proizvodi|Usluge prema popularnosti
+ProductsPerPopularity=Proizvodi po popularnosti
+ServicesPerPopularity=Usluge po popularnosti
+PopuProp=Proizvodi|Usluge prema popularnosti u Predlozima
+PopuCom=Proizvodi|Usluge prema popularnosti u Narudžbama
+ProductStatistics=Proizvodi|Usluge Statistika
+NbOfQtyInOrders=Količina u narudžbama
+SelectTheTypeOfObjectToAnalyze=Odaberite objekat da vidite njegovu statistiku...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Jeste li sigurni da želite "%s" ?
+ConfirmBtnCommonTitle = Potvrdite svoju akciju
 CloseDialog = Close
 Autofill = Autofill
+OrPasteAnURL=ili Zalijepite URL
 
 # externalsite
 ExternalSiteSetup=Podesi link za eksterni web sajt
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=URL vanjske web lokacije HTML iframe sadržaja
 ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.
 ExampleMyMenuEntry=My menu entry
 
 # ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/SFTP connection setup
-FTPArea=FTP/SFTP 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
+FTPClientSetup=Podešavanje modula FTP ili SFTP klijenta
+NewFTPClient=Novo podešavanje FTP/SFTP veze
+FTPArea=FTP/SFTP područje
+FTPAreaDesc=Ovaj ekran prikazuje prikaz FTP i SFTP servera.
+SetupOfFTPClientModuleNotComplete=Čini se da je podešavanje FTP ili SFTP klijentskog modula nepotpuno
+FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP ili SFTP funkcije
+FailedToConnectToFTPServer=Povezivanje sa serverom nije uspjelo (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Neuspješno se prijaviti na server sa definiranom prijavom/lozinkom
 FTPFailedToRemoveFile=Neuspjelo uklanjanje fajla <b>%s</b>.
 FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
 FTPPassiveMode=Pasivni način
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
+ChooseAFTPEntryIntoMenu=Izaberite FTP/SFTP lokaciju iz menija...
 FailedToGetFile=Failed to get files %s
-ErrorFTPNodisconnect=Error to disconnect FTP/SFTP server
-FileWasUpload=File <b>%s</b> was uploaded
-FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
-AddFolder=Create folder
-FileWasCreateFolder=Folder <b>%s</b> has been created
-FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
+ErrorFTPNodisconnect=Greška prilikom prekida veze sa FTP/SFTP serverom
+FileWasUpload=Datoteka <b>%s</b> je učitana
+FTPFailedToUploadFile=Prijenos datoteke <b>%s</b> nije uspio.
+AddFolder=Kreirajte folder
+FileWasCreateFolder=Kreirana je fascikla <b>%s</b>
+FTPFailedToCreateFolder=Kreiranje foldera <b>%s</b> nije uspjelo.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/bs_BA/partnership.lang b/htdocs/langs/bs_BA/partnership.lang
index 46a06496664..a29eda71c99 100644
--- a/htdocs/langs/bs_BA/partnership.lang
+++ b/htdocs/langs/bs_BA/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Broj grešaka za posljednju provjeru URL-a
 LastCheckBacklink=Datum posljednje provjere URL-a
 
 NewPartnershipRequest=Novi zahtjev za partnerstvo
-NewPartnershipRequestDesc=Ovaj obrazac vam omogućava da zatražite da budete dio jednog od naših partnerskih programa. Ako vam je potrebna pomoć da ispunite ovaj obrazac, kontaktirajte putem e-pošte <b>%s</b><span class='notranslate'> span>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Ova stranica mora sadržavati barem jedan link na jednu od sljedećih domena: %s
 
 IPOfApplicant=IP podnosioca zahtjeva
-
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 932be6bcd38..56a19a63cd3 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -18,7 +18,7 @@ Reference=Referenca
 NewProduct=Novi proizvod
 NewService=Nova usluga
 ProductVatMassChange=Globalno ažuriranje PDV-a
-ProductVatMassChangeDesc=Ovaj alat ažurira stopu PDV-a definiranu na <b><u>SVE</u><span> class='notranslate'></b></span> proizvodi i usluge!
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
 MassBarcodeInit=Masovni barkod init
 MassBarcodeInitDesc=Ova stranica se može koristiti za inicijalizaciju barkoda na objektima koji nemaju definiran bar kod. Provjerite prije nego što je postavljanje barkoda modula završeno.
 ProductAccountancyBuyCode=Knjigovodstvena šifra (kupovina)
@@ -208,11 +208,6 @@ unitSET=Set
 unitS=Sekunda
 unitH=Sat
 unitD=Dan
-unitG=Gram
-unitM=Meter
-unitLM=Linearni metar
-unitM2=Kvadratnom metru
-unitM3=Kubni metar
 unitL=Litara
 unitT=tona
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=funta
 unitOZ=unca
 unitM=Meter
+unitLM=Linearni metar
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -289,9 +285,9 @@ MinimumRecommendedPrice=Minimalna preporučena cijena je: %s
 PriceExpressionEditor=Urednik izraza cijene
 PriceExpressionSelected=Odabrani izraz cijene
 PriceExpressionEditorHelp1="cijena = 2 + 2" ili "2 + 2" za postavljanje cijene. Koristite ; da razdvoje izraze
-PriceExpressionEditorHelp2=ExtraFields možete pristupiti s varijablama kao što je <b>#extrafield_myextrafieldkey#</b> b07ef8>b07e684 varijable sa <span class='notranslate'><b>#global_mycode#</b>
-PriceExpressionEditorHelp3=U obje cijene proizvoda/usluge i dostupne su ove varijable:<br><b> span>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#<span class='notranslate'></b>
-PriceExpressionEditorHelp4=Samo u cijeni proizvoda/usluge: <b>#supplier_min_price#</b>b0342fccfda19b samo prodajne cijene: <span class='notranslate'><b>#supplier_quantity# i #supplier_tva_tx#<span class='notranslate'09f4b78b
+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=Dostupne globalne vrijednosti:
 PriceMode=Režim cijena
 PriceNumeric=Broj
@@ -437,4 +433,6 @@ ModifyValueExtrafields = Izmijenite vrijednost ekstrapolja
 OrProductsWithCategories=Ili proizvodi sa oznakama/kategorijama
 WarningTransferBatchStockMouvToGlobal = Ako želite deserijalizirati ovaj proizvod, sva njegova serijalizirana zaliha će biti transformirana u globalnu zalihu
 WarningConvertFromBatchToSerial=Ako trenutno imate količinu veću ili jednaku 2 za proizvod, prelazak na ovaj izbor znači da ćete i dalje imati proizvod s različitim objektima iste serije (dok želite jedinstveni serijski broj). Duplikat će ostati dok se ne izvrši inventar ili ručno kretanje zaliha da se to popravi.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Jeste li sigurni da se želite vratiti na status Nacrta?<br>Količine koje su trenutno postavljene u inventaru će biti resetirane.
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index c3cf306cee5..681fb05fa41 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -171,7 +171,7 @@ MovementTransferStock=Prijenos zaliha proizvoda %s u drugo skladište
 BatchStockMouvementAddInGlobal=Zalihe serije prelaze u globalne zalihe (proizvod više ne koristi seriju)
 InventoryCodeShort=Inv./Mov. kod
 NoPendingReceptionOnSupplierOrder=Nema prijema na čekanju zbog otvorene narudžbenice
-ThisSerialAlreadyExistWithDifferentDate=Ova serija/serijski broj (<strong>%s</strong>) već postoji, ali sa različit datum jedenja ili prodaje (pronađen <strong>%s</strong> ali vi unesete <</span> span class='notranslate'><strong></span>%s</strong>).
+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=Otvoreno (svi pokreti)
 OpenInternal=Otvoreno (samo unutrašnje kretanje)
 UseDispatchStatus=Koristite status otpreme (odobri/odbijem) za linije proizvoda prilikom prijema narudžbenice
@@ -282,7 +282,7 @@ ModuleStockTransferName=Napredni prijenos zaliha
 ModuleStockTransferDesc=Napredno upravljanje prijenosom zaliha, sa generiranjem prijenosnog lista
 StockTransferNew=Novi prijenos zaliha
 StockTransferList=Lista prijenosa dionica
-ConfirmValidateStockTransfer=Jeste li sigurni da želite potvrditi ovaj prijenos dionica s referencom <b>%s</b><span class='notranslate' span> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Smanjenje zaliha s prijenosom %s
 ConfirmDestockCancel=Otkažite smanjenje zaliha s prijenosom %s
 DestockAllProduct=Smanjenje zaliha
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index 76d0e32544e..f80a1710397 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL za ponudu %s stranice za online p
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL za ponudu %s stranice za online plaćanje bilo kojeg iznosa bez postojećeg objekta
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL za ponudu %s stranice za online plaćanje za pretplatu člana
 ToOfferALinkForOnlinePaymentOnDonation=URL za ponudu %s stranice za online plaćanje za uplatu donacije
-YouCanAddTagOnUrl=Također možete dodati url parametar <b>&tag=<i>value</i> class='notranslate'></b></span> na bilo koji od tih URL-ova (obavezno samo za plaćanje koje nije povezano sa objektom) da dodate svoju oznaku komentara o plaćanju.<br>Za URL plaćanja bez postojećeg objekta, možete dodati i parametar <strong>&noidempotency=1</strong> tako da isti link sa istom oznakom može se koristiti nekoliko puta (neki način plaćanja može ograničiti plaćanje na 1 za svaki različiti link bez ovog parametra)
+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=Postavite svoj Stripe s url <b>%s</b> da se plaćanje automatski kreira potvrdio Stripe.
 AccountParameter=Parametri računa
 UsageParameter=Parametri upotrebe
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index bc38a099385..efed5adb95d 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -320,7 +320,7 @@ ViewTicket=Pogledaj kartu
 ViewMyTicketList=Pogledaj moju listu karata
 ErrorEmailMustExistToCreateTicket=Greška: adresa e-pošte nije pronađena u našoj bazi podataka
 TicketNewEmailSubjectAdmin=Nova karta kreirana - Ref %s (ID javne karte %s)
-TicketNewEmailBodyAdmin=<p>Ulaznica je upravo kreirana sa ID-om #%s, pogledajte informacije:<span class='notranslate'></p> >
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
 SeeThisTicketIntomanagementInterface=Pogledajte kartu u interfejsu upravljanja
 TicketPublicInterfaceForbidden=Javni interfejs za karte nije bio omogućen
 ErrorEmailOrTrackingInvalid=Loša vrijednost za ID praćenja ili e-poštu
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 638772c81cd..941d821a3a1 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Izvještaj o troškovima
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=Lista naknada
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Iznos ili kilometri
-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
+AUTHOR=Snimio
+AUTHORPAIEMENT=Platio
+AddTrip=Kreirajte izvještaj o troškovima
+AllExpenseReport=Sve vrste izvještaja o troškovima
+AllExpenseReports=Svi izvještaji o troškovima
+AnyOtherInThisListCanValidate=Osoba koju treba obavijestiti za validaciju zahtjeva.
+AttachTheNewLineToTheDocument=Pričvrstite liniju na učitani dokument
+AucuneLigne=Još uvijek nije objavljen izvještaj o troškovima
+BrouillonnerTrip=Vrati izvještaj o troškovima u status "Nacrt"
+byEX_DAY=po danu (ograničenje na %s)
+byEX_EXP=po redu (ograničenje na %s)
+byEX_MON=po mjesecu (ograničenje na %s)
+byEX_YEA=po godini (ograničenje na %s)
+CANCEL_USER=Izbrisao/la
+CarCategory=Kategorija vozila
+ClassifyRefunded=Razvrstaj 'Vraćeno'
+CompanyVisited=Posjećena kompanija/organizacija
+ConfirmBrouillonnerTrip=Jeste li sigurni da želite premjestiti ovaj izvještaj o troškovima u status "Nacrt"?
+ConfirmCancelTrip=Jeste li sigurni da želite otkazati ovaj izvještaj o troškovima?
+ConfirmCloneExpenseReport=Jeste li sigurni da želite klonirati ovaj izvještaj o troškovima?
+ConfirmDeleteTrip=Jeste li sigurni da želite izbrisati ovaj izvještaj o troškovima?
+ConfirmPaidTrip=Jeste li sigurni da želite promijeniti status ovog izvještaja o troškovima u "Plaćeno"?
+ConfirmRefuseTrip=Jeste li sigurni da želite odbiti ovaj izvještaj o troškovima?
+ConfirmSaveTrip=Jeste li sigurni da želite potvrditi ovaj izvještaj o troškovima?
+ConfirmValideTrip=Jeste li sigurni da želite odobriti ovaj izvještaj o troškovima?
+DATE_CANCEL=Datum otkazivanja
+DATE_PAIEMENT=Datum uplate
+DATE_REFUS=Odbiti datum
+DATE_SAVE=Datum potvrde
+DefaultCategoryCar=Zadani način transporta
+DefaultRangeNumber=Zadani broj opsega
+DeleteTrip=Izbriši izvještaj o troškovima
+ErrorDoubleDeclaration=Deklarirali ste još jedan izvještaj o troškovima u sličnom rasponu datuma.
+Error_EXPENSEREPORT_ADDON_NotDefined=Greška, pravilo za numeraciju izvještaja o troškovima ref nije definirano u podešavanju modula 'Izvještaj o troškovima'
+ExpenseRangeOffset=Iznos pomaka: %s
+expenseReportCatDisabled=Kategorija onemogućena - pogledajte c_exp_tax_cat rječnik
+expenseReportCoef=Koeficijent
+expenseReportCoefUndefined=(vrijednost nije definirana)
+expenseReportOffset=Offset
+expenseReportPrintExample=pomak + (d x koef) = %s
+expenseReportRangeDisabled=Opseg onemogućen - pogledajte rječnik c_exp_tax_range
+expenseReportRangeFromTo=od %d do %d
+expenseReportRangeMoreThan=više od %d
+expenseReportTotalForFive=Primjer sa <u>d</u> = 5
+ExpenseReportApplyTo=Prijavite se na
+ExpenseReportApproved=Izvještaj o troškovima je odobren
+ExpenseReportApprovedMessage=Izvještaj o troškovima %s je odobren.<br> - Korisnik: %s<br> - Odobrio: %s<br>Kliknite ovdje za prikaz izvještaja o troškovima: %s
+ExpenseReportCanceled=Izvještaj o troškovima je poništen
+ExpenseReportCanceledMessage=Izvještaj o troškovima %s je otkazan.<br> - Korisnik: %s<br> - Otkazao: %s<br> - Motiv za otkazivanje: %s<br>Kliknite ovdje za prikaz izvještaja o troškovima: %s
+ExpenseReportConstraintViolationError=Maksimalni iznos je prekoračen (pravilo %s): %s je veći od %s ( Prekoračenje zabranjeno)
+ExpenseReportConstraintViolationWarning=Maksimalni iznos je prekoračen (pravilo %s): %s je veći od %s ( Prekoračenje ovlaštenja)
+ExpenseReportDateEnd=Kraj datuma
+ExpenseReportDateStart=Datum početka
+ExpenseReportDomain=Domena za prijavu
+ExpenseReportIkDesc=Možete modificirati obračun troškova kilometara prema kategorijama i rasponu koji su prethodno definirani. <b>d</b> je udaljenost u kilometrima
+ExpenseReportLimitAmount=Maksimalni iznos
+ExpenseReportLimitOn=Ograničenje uključeno
+ExpenseReportLine=Red izvještaja o troškovima
+ExpenseReportPaid=Izvještaj o troškovima je plaćen
+ExpenseReportPaidMessage=Izvještaj o troškovima %s je plaćen.<br> - Korisnik: %s<br> - Platio: %s<br>Kliknite ovdje za prikaz izvještaja o troškovima: %s
+ExpenseReportPayment=Plaćanje izvještaja o troškovima
+ExpenseReportRef=Ref. izvještaj o troškovima
+ExpenseReportRefused=Izvještaj o troškovima je odbijen
+ExpenseReportRefusedMessage=Izvještaj o troškovima %s je odbijen.<br> - Korisnik: %s<br> - Odbio: %s<br> - Motiv za odbijanje: %s<br>Kliknite ovdje za prikaz izvještaja o troškovima: %s
+ExpenseReportRestrictive=Prekoračenje zabranjeno
+ExpenseReportRuleErrorOnSave=Greška: %s
+ExpenseReportRuleSave=Pravilo izvještaja o troškovima je sačuvano
+ExpenseReportRulesDesc=Možete definirati pravila maksimalnog iznosa za izvještaje o troškovima. Ova pravila će se primjenjivati kada se izvještaju o troškovima doda novi trošak
+ExpenseReportWaitingForApproval=Novi izvještaj o troškovima je dostavljen na odobrenje
+ExpenseReportWaitingForApprovalMessage=Novi izvještaj o troškovima je dostavljen i čeka odobrenje.<br> - Korisnik: b0ecb2ec87f49fz <br> - Period: %s<br>Kliknite ovdje za potvrdu : %s
+ExpenseReportWaitingForReApproval=Izvještaj o troškovima je dostavljen na ponovno odobrenje
 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=Ostalo
-TF_TRIP=Transportation
+ExpenseReportsIk=Konfiguracija naknade za kilometražu
+ExpenseReportsRules=Pravila izvještaja o troškovima
+ExpenseReportsToApprove=Izvještaji o troškovima za odobrenje
+ExpenseReportsToPay=Izvještaji o troškovima za plaćanje
+ExpensesArea=Područje izvještaja o troškovima
+FeesKilometersOrAmout=Iznos ili kilometri
+LastExpenseReports=Najnoviji %s izvještaji o troškovima
+ListOfFees=Lista naknada
+ListOfTrips=Spisak izveštaja o troškovima
+ListToApprove=Čekajući na odobrenje
+ListTripsAndExpenses=Spisak izveštaja o troškovima
+MOTIF_CANCEL=Razlog
+MOTIF_REFUS=Razlog
+ModePaiement=Način plaćanja
+NewTrip=Novi izvještaj o troškovima
+nolimitbyEX_DAY=po danu (bez ograničenja)
+nolimitbyEX_EXP=po liniji (bez ograničenja)
+nolimitbyEX_MON=po mjesecu (bez ograničenja)
+nolimitbyEX_YEA=po godini (bez ograničenja)
+NoTripsToExportCSV=Nema izvještaja o troškovima za izvoz za ovaj period.
+NOT_AUTHOR=Vi niste autor ovog izvještaja o troškovima. Operacija je otkazana.
+OnExpense=Troškovna linija
+PDFStandardExpenseReports=Standardni predložak za generiranje PDF dokumenta za izvještaj o troškovima
+PaidTrip=Plati izvještaj o troškovima
+REFUSEUR=Denied by
+RangeIk=Raspon kilometara
+RangeNum=Raspon %d
+SaveTrip=Potvrdite izvještaj o troškovima
+ShowExpenseReport=Prikaži izvještaj o troškovima
+ShowTrip=Prikaži izvještaj o troškovima
+TripCard=Izvještaj o troškovima
+TripId=Izvještaj o ličnim troškovima
+TripNDF=Izvještaj o troškovima informacija
+TripSociete=Informaciona kompanija
+Trips=Izvještaj o troškovima
+TripsAndExpenses=Izvještaji o troškovima
+TripsAndExpensesStatistics=Statistički izvještaji o troškovima
+TypeFees=Vrste naknada
+UploadANewFileNow=Učitajte novi dokument sada
+VALIDATOR=Korisnik odgovoran za odobrenje
+VALIDOR=Odobrio
+ValidateAndSubmit=Potvrdite i slanje na odobrenje
+ValidatedWaitingApproval=Potvrđeno (čeka se odobrenje)
+ValideTrip=Odobravanje izvještaja o troškovima
+
+## Dictionary
+EX_BRE=Doručak
+EX_CAM=CV održavanje i popravka
+EX_CAM_VP=PV održavanje i popravak
+EX_CAR=Rentakar
+EX_CUR=Kupci primaju
+EX_DOC=Dokumentacija
+EX_EMM=Obrok za zaposlene
+EX_FUE=Fuel CV
+EX_FUE_VP=Fuel PV
+EX_GUM=Obrok za goste
+EX_HOT=Hotel
+EX_IND=Odštetna pretplata za prevoz
+EX_KME=Troškovi kilometraže
+EX_OTR=Drugo primanje
+EX_PAR=Parking CV
+EX_PAR_VP=Parking PV
+EX_POS=Poštarina
+EX_SUM=Opskrba za održavanje
+EX_SUO=Kancelarijski materijal
+EX_TAX=Razni porezi
+EX_TOL=Toll CV
+EX_TOL_VP=Toll PV
+TF_BUS=Autobus
+TF_CAR=Auto
+TF_ESSENCE=Gorivo
+TF_HOTEL=Hotel
 TF_LUNCH=Ručak
 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=Odobrio
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
-MOTIF_REFUS=Razlog
-MOTIF_CANCEL=Razlog
-DATE_REFUS=Deny date
-DATE_SAVE=Datum potvrde
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Datum uplate
-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
+TF_OTHER=Ostalo
+TF_PEAGE=Putarina
+TF_TAXI=Taksi
+TF_TRAIN=Voz
+TF_TRIP=Prijevoz
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 2e3f8b8a6c5..d9901a18f88 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -32,7 +32,7 @@ AddWebsite=Dodaj web stranicu
 Webpage=Web stranica/kontejner
 AddPage=Dodajte stranicu/kontejner
 PageContainer=Stranica
-PreviewOfSiteNotYetAvailable=Pregled vaše web stranice <strong>%s</strong> još nije dostupan. Prvo morate '<strong>uvesti cijeli predložak web stranice</strong>' ili samo 'b0e7843947c</00 span>Dodajte stranicu/kontejner<span class='notranslate'></strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Zatražena stranica sa ID-om %s još nema sadržaja ili je keš datoteka .tpl.php uklonjena. Uredite sadržaj stranice da to riješite.
 SiteDeleted=Web stranica '%s' je izbrisana
 PageContent=Page/Contenair
@@ -49,11 +49,11 @@ SetHereVirtualHost=<u>Koristite sa Apache/NGinx/...</u><br>Kreirajte na vaš web
 ExampleToUseInApacheVirtualHostConfig=Primjer za korištenje u Apache postavci virtualnog hosta:
 YouCanAlsoTestWithPHPS=<u>Koristite sa PHP ugrađenim serverom</u><br>U razvojnom okruženju možete radije testirajte web lokaciju sa PHP ugrađenim web serverom (potreban je PHP 5.5) pokretanjem<br><strong>php -S 0.0.0.0 :8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Pokrenite svoju web stranicu s drugim Dolibarr hosting provajderom</u><br> vas nemate web server kao što je Apache ili NGinx dostupan na internetu, možete izvesti i svoju web stranicu u drugu Dolibarr instancu koju pruža drugi Dolibarr hosting provajder koji pruža potpunu integraciju sa modul Website. Spisak nekih Dolibarr hosting provajdera možete pronaći na <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Provjerite također da li korisnik virtualnog hosta (na primjer www-data) ima <strong>%s</strong>  dozvole za datoteke u<br><strong>%s<span klasu ='notranslate'></strong></span>
+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=Pročitaj
 WritePerm=Pisati
 TestDeployOnWeb=Testirajte / implementirajte na webu
-PreviewSiteServedByWebServer=<u>Pregled %s na novoj kartici.</u><br><br>%s će služiti vanjski web server (kao što je Apache, Nginx, IIS ). Morate instalirati i postaviti ovaj server prije nego što ukažete na direktorij:<br><strong> ><span class='notranslate'>%s</strong><br>URL poslužuje vanjski server:<br><strong>%s<span class='notranslate'>b0a65d09z0f>b0a65d09z071
+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>Pregled %s na novoj kartici.</u><br><br>%s će služiti Dolibarr server tako da mu ne treba nikakav dodatni web server (kao Apache, Nginx, IIS) za instaliranje.<br>Nezgodno je to što URL-ovi stranica nisu prilagođeni korisniku i počnite s putanjom vašeg Dolibarra.<br>URL koju poslužuje Dolibarr:<br>b0e7843947c06bz span>%s</strong><br>b031492zcc Da biste koristili vlastiti vanjski web server za posluživanje ove web stranice, kreirajte virtualni host na svom web serveru koji pokazuje na direktorij<br> <strong>%s</strong><br> unesite ovo ime19bz0 virtuelni server u svojstvima ove web stranice i kliknite na vezu "Test/Deploy on the web".
 VirtualHostUrlNotDefined=URL virtuelnog hosta kojeg opslužuje vanjski web server nije definiran
 NoPageYet=Još nema stranica
@@ -63,7 +63,7 @@ YouCanEditHtmlSourceckeditor=Možete uređivati HTML izvorni kod koristeći dugm
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Za sliku koja se dijeli s vezom za dijeljenje (otvoreni pristup koristeći hash ključ za dijeljenje datoteke), sintaksa je:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;0af665dc71f09 <br>
-YouCanEditHtmlSource3=Da biste dobili URL slike PHP objekta, koristite<br><strong>&lt; span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;" class='notranslate'>&gt;</span></strong><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Više primjera HTML ili dinamičkog koda dostupno je na <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki dokumentacijib0e40dc6087 >.<br>
 ClonePage=Kloniraj stranicu/kontejner
 CloneSite=Clone site
@@ -118,7 +118,7 @@ DeleteAlsoMedias=Izbrisati i sve medijske datoteke specifične za ovu web strani
 MyWebsitePages=Moje web stranice
 SearchReplaceInto=Pretraga | Zamijenite u
 ReplaceString=New string
-CSSContentTooltipHelp=Ovdje unesite CSS sadržaj. Da biste izbjegli bilo kakav sukob sa CSS-om aplikacije, obavezno dodajte sve deklaracije klasom .bodywebsite. Na primjer:<br><br>#mycssselector, input.myclass:hover { ... } <br>mora biti<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }b0342fccfda19b <span class='notranslate'><br>Napomena: Ako imate veliki fajl bez ovog prefiksa, možete koristiti 'lessc' da ga konvertujete da biste svuda dodali prefiks .bodywebsite.
+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=Upozorenje: Ovaj sadržaj se izlazi samo kada se sajtu pristupa sa servera. Ne koristi se u režimu za uređivanje, tako da ako treba da učitate JavaScript fajlove iu režimu za uređivanje, samo dodajte svoju oznaku 'script src=...' na stranicu.
 Dynamiccontent=Uzorak stranice sa dinamičkim sadržajem
 EditInLineOnOff=Način rada 'Edit inline' je %s
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 41e566c5bdb..88dd54e65cc 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -423,7 +423,7 @@ SaleLocal=Venda local
 SaleExport=Venda d’exportació
 SaleEEC=Venda en CEE
 SaleEECWithVAT=Venda a la CEE amb un IVA que no és nul, per la qual cosa suposem que NO es tracta d’una venda intracomunitària i el compte suggerit és el compte estàndard del producte.
-SaleEECWithoutVATNumber=sale a EEC sense VAT però el VAT ID de Third party no està definit. Recorrem a account per a standard sales. Podeu arreglar el VAT ID del Third party o canviar el Third party span class='notranslate'>product</span> account suggerit per a l'enllaç si cal.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Prohibit: la transacció ha estat validada i/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibit: la transacció s'ha validat.
 ## Dictionary
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index ff3abe75c8b..0dbee7a5bcc 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=Valor següent (factures)
 NextValueForCreditNotes=Valor següent (notes de crèdit)
 NextValueForDeposit=Següent valor (pagament inicial)
 NextValueForReplacements=Valor següent (substitucions)
-MustBeLowerThanPHPLimit=Nota: actualment la vostra configuració de PHP limita la mida màxima dels fitxers per pujar a <b>%s</b></b> span> <span class='notranslate'>%s, independentment del valor d'aquest paràmetre
+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=Nota: No s'estableix cap límit a la configuració de PHP
 MaxSizeForUploadedFiles=Mida màxima per als fitxers penjats (0 per no permetre cap càrrega)
 UseCaptchaCode=Utilitzeu codi gràfic (CAPTCHA) a la pàgina d'inici de sessió i algunes pàgines públiques
@@ -163,7 +163,7 @@ PurgeAreaDesc=Aquesta pàgina us permet suprimir tots els fitxers generats o emm
 PurgeDeleteLogFile=Suprimeix fitxers de registre, inclosos <b>%s</b> definit per al mòdul Syslog (no risc de perdre dades)
 PurgeDeleteTemporaryFiles=Suprimeix tots els fitxers de registre i temporals (sense risc de perdre dades). El paràmetre pot ser "tempfilesold", "logfiles" o tots dos "tempfilesold+logfiles". Nota: L'eliminació dels fitxers temporals només es fa si el directori temporal es va crear fa més de 24 hores.
 PurgeDeleteTemporaryFilesShort=Suprimeix els fitxers de registre i temporals (sense risc de perdre dades)
-PurgeDeleteAllFilesInDocumentsDir=Suprimeix tots els fitxers del directori: <b>%s</b>.<span class== 'notranslate'><br></span>Això suprimirà tots els documents generats relacionats amb elements (tercers, factures, etc.), fitxers penjats al mòdul ECM, abocadors de còpia de seguretat de bases de dades i fitxers temporals.
+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=Purga ara
 PurgeNothingToDelete=No hi ha cap directori ni fitxers per esborrar.
 PurgeNDirectoriesDeleted=<b>%s</b> fitxers o directoris suprimits.
@@ -250,8 +250,8 @@ Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=Xifra les contrasenyes emmagatzemades a la base de dades (NO com a text sense format). És molt recomanable activar aquesta opció.
 MainDbPasswordFileConfEncrypted=Xifra la contrasenya de la base de dades emmagatzemada a conf.php. És molt recomanable activar aquesta opció.
-InstrucToEncodePass=Per tenir la contrasenya codificada al fitxer <b>conf.php</b>, substituïu la línia <br> /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342fccfda</span19bz0 >per<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:%s; span class='notranslate'></b></span>
-InstrucToClearPass=Per descodificar (esborrar) la contrasenya al fitxer <b>conf.php</b>, substituïu la línia <br><b>$dolibarr_main_db_pass="crypted:...";</b><span'class=''notranslate'> ><br></span>per<br><b>$dolibarr_main_db_pass="b0f4f4span2'><b>$dolibarr_main_db_pass="z7 ";<span class='notranslate'></b>
+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=Protegiu els fitxers PDF generats. Això NO es recomana perquè trenca la generació massiva de PDF.
 ProtectAndEncryptPdfFilesDesc=La protecció d'un document PDF el manté disponible per llegir i imprimir amb qualsevol navegador PDF. Tanmateix, l'edició i la còpia ja no són possibles. Tingueu en compte que l'ús d'aquesta funció fa que la creació d'un PDF global combinat no funcioni.
 Feature=Característica
@@ -268,7 +268,7 @@ OtherResources=Altres recursos
 ExternalResources=Recursos externs
 SocialNetworks=Xarxes socials
 SocialNetworkId=Identificador de la xarxa social
-ForDocumentationSeeWiki=Per a la documentació de l'usuari o del desenvolupador (Doc, PMF...),<br>fegeu una ullada a la wiki de Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40d8dc658%sb0e40d8dc658 <span class='notranslate'></b>
+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=Per a qualsevol altra pregunta/ajuda, podeu utilitzar el fòrum de Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Aquí teniu alguns recursos per obtenir ajuda i suport amb Dolibarr.
 HelpCenterDesc2=Alguns d'aquests recursos només estan disponibles a <b>anglès</b>.
@@ -290,8 +290,8 @@ EMailsSetup=Configuració de correus electrònics
 EMailsDesc=Aquesta pàgina us permet establir paràmetres o opcions per a l'enviament de correu electrònic.
 EmailSenderProfiles=Perfils de remitents de correus electrònics
 EMailsSenderProfileDesc=Podeu mantenir aquesta secció buida. Si introduïu alguns correus electrònics aquí, s'afegiran a la llista de possibles remitents al quadre combinat quan escriviu un correu electrònic nou.
-MAIN_MAIL_SMTP_PORT=Port SMTP/SMTPS (valor predeterminat a php.ini: <b>%s<span class='notranslate'>b09a4b739f17f8) >)
-MAIN_MAIL_SMTP_SERVER=Amfitrió SMTP/SMTPS (valor per defecte a php.ini: <b>%s<span class='notranslate'>b09a4b739f17f8) >)
+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=Port SMTP/SMTPS
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Amfitrió SMTP/SMTPS
 MAIN_MAIL_EMAIL_FROM=Correu electrònic del remitent per a correus electrònics automàtics
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=Aquesta és una configuració alternativa per p
 StepNb=Pas %s
 FindPackageFromWebSite=Trobeu un paquet que proporcioni les funcions que necessiteu (per exemple, al lloc web oficial %s).
 DownloadPackageFromWebSite=Baixeu el paquet (per exemple, des del lloc web oficial %s).
-UnpackPackageInDolibarrRoot=Descomprimiu/descomprimiu els fitxers empaquetats al directori del vostre servidor Dolibarr: <b>%s<span class='notranslate'>b09a4b739f17f >
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=Per implementar/instal·lar un mòdul extern, heu de descomprimir/descomprimir el fitxer d'arxiu al directori del servidor dedicat als mòduls externs:<br><b>%s</b>
 SetupIsReadyForUse=S'ha acabat el desplegament del mòdul. Tanmateix, heu d'habilitar i configurar el mòdul a la vostra aplicació anant als mòduls de configuració de la pàgina: <a href="%s">%s</a>.
 NotExistsDirect=El directori arrel alternatiu no està definit per a un directori existent.<br>
 InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això us permet emmagatzemar, en un directori dedicat, connectors i plantilles personalitzades.<br>Creeu només un directori a l'arrel de Dolibarr (per exemple: personalitzat).<br>
-InfDirExample=<br>A continuació, declara-ho al fitxer <strong>conf.php</strong><span> class='notranslate'><br></span> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of'/dolibar='custom/h/dolibar= 'notranslate'><br></span>Si aquestes línies es comenten amb "#", per activar-les, només cal que elimineu el comentari eliminant el caràcter "#".
+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=Podeu carregar el fitxer .zip del paquet del mòdul des d'aquí:
 CurrentVersion=Dolibarr versió actual
 CallUpdatePage=Navegueu fins a la pàgina que actualitza l'estructura i les dades de la base de dades: %s.
@@ -361,14 +361,14 @@ LastActivationIP=Última IP d'activació
 LastActivationVersion=Última versió d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestionar un comptador
-GenericMaskCodes=Podeu introduir qualsevol màscara de numeració. En aquesta màscara, es poden utilitzar les etiquetes següents:<br><b>{000000}b09a4b739f17f8 /span> correspon a un número que s'incrementarà a cada <span class='notranslate'>%s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros des de l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b> igual que l'anterior s'aplica un desplaçament corresponent al número a la dreta del signe + a partir del primer %s. <br><b>{000000@x}</b> igual que l'anterior el comptador es reinicia a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per utilitzar els primers mesos de l'any fiscal definits a la vostra configuració, o 99 per restablir a zero cada mes). Si s'utilitza aquesta opció i x és 2 o superior, també es requereix la seqüència {aa}{mm} o {aaaa}{mm}. <br><b>{dd}</b> dia (de l'1 al 31).<br><b>{mm}</b> mes (de l'1 al 12).<br><b>{yy}</b>, b36ae3736ae37 {yyyy}</b> o <b>{y}</b> any més de 2, 4 o 1 números. <br>
-GenericMaskCodes2=<b>{cccc}</b> el codi de client en n caràcters<br><b>{cccc000}b09a4b7390 el codi client{cccc000}b09a4b7390> en n caràcters va seguit d'un comptador dedicat al client. Aquest comptador dedicat al client es restableix al mateix temps que el comptador global.<span class='notranslate'><br><b>{tttt} </b> El codi del tipus de tercer en n caràcters (vegeu el menú Inici - Configuració - Diccionari - Tipus de tercers). Si afegiu aquesta etiqueta, el comptador serà diferent per a cada tipus de tercers.<br>
+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=Tots els altres caràcters de la màscara romandran intactes.<br>No es permeten espais.<br>
 GenericMaskCodes3EAN=Tots els altres caràcters de la màscara es mantindran intactes (excepte * o ? a la 13a posició de l'EAN13).<br>No es permeten espais.<br> span>A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
 GenericMaskCodes4a=<u>Exemple del 99è %s del tercer TheCompany, amb data 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>Exemple de tercers creat el 2023-01-31:</u><br> >
 GenericMaskCodes4c=<u>Exemple del producte creat el 31/01/2023:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà b0aee837fz0 span>ABC2301-000099</b><br><b>@00+1{0@019bz0 }-ZZZ/{dd}/XXX<span class='notranslate'></b> donarà <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> donarà <b>IN2301-0099-A</b> si el tipus d'empresa "Responsable Inscripto" amb codi per al tipus que és "A_RI"
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Retorna un número personalitzable segons una màscara definida.
 ServerAvailableOnIPOrPort=El servidor està disponible a l'adreça <b>%s</b> al port <b>%s</b>
 ServerNotAvailableOnIPOrPort=El servidor no està disponible a l'adreça <b>%s</b> al port <b>%s</b>
@@ -390,7 +390,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Fitxers .lang carregats a la memòria c
 LanguageFile=Fitxer d'idiomes
 ExamplesWithCurrentSetup=Exemples amb la configuració actual
 ListOfDirectories=Llista de directoris de plantilles d'OpenDocument
-ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Indiqueu aquí el camí complet dels directoris.<br>Afegiu un retorn de carro entre cada directori.<br>Per afegir un directori del mòdul GED, afegiu aquí <b> >DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br>b0342fccfda19><br> en aquests directorisb ha d'acabar amb <b>.odt</b> o <b><.ods ='notranslate'></b></span>.
+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=Nombre de fitxers de plantilla ODT/ODS trobats en aquests directoris
 ExampleOfDirectoriesForModelGen=Exemples de sintaxi:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Per saber com crear les plantilles de documents odt, abans d'emmagatzemar-les en aquests directoris, llegiu la documentació wiki:
@@ -461,11 +461,11 @@ ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propiet
 Computedpersistent=Emmagatzema el camp calculat
 ComputedpersistentDesc=Els camps addicionals calculats s'emmagatzemaran a la base de dades, però el valor només es tornarà a calcular quan es canviï l'objecte d'aquest camp. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor pot ser incorrecte!!
 ExtrafieldParamHelpPassword=Si deixeu aquest camp en blanc, vol dir que aquest valor s'emmagatzemarà SENSE xifratge (el camp només s'amaga amb estrelles a la pantalla).<br><br>Introduïu valor 'dolcrypt' per codificar el valor amb un algorisme de xifratge reversible. Les dades esborrades encara es poden conèixer i editar, però s'encripten a la base de dades.<br><br>Introduïu "auto" (o "md5", 'sha256', 'password_hash', ...) per utilitzar l'algorisme de xifratge de contrasenya predeterminat (o md5, sha256, password_hash...) per desar la contrasenya hash no reversible a la base de dades (no hi ha manera de recuperar el valor original)
-ExtrafieldParamHelpselect=La llista de valors ha de ser línies amb clau de format, valor (on la clau no pot ser '0')<br><br>, per exemple : <br>1,value1<br>2,value2<br>code3,value3 span class='notranslate'><br></span>...<br><br>Per tal que la llista depengui d'un altre llista d'atributs complementària:<br>1,value1|options_<i>parent_list_codeb0ae64758ba>c3:3z0ba> parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae64758parent_key</span>3:3 class='notranslate'><br></span><br>Per tal que la llista depengui d'una altra llista:<br>1, value1|<i>parent_list_code</i>:parent_key<br>2,value class='notranslate'><i></span>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=La llista de valors ha de ser línies amb clau de format, valor (on la clau no pot ser '0')<br><br>, per exemple : <br>1,value1<br>2,value2<br>3,value3 span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=La llista de valors ha de ser línies amb clau de format, valor (on la clau no pot ser '0')<br><br>, per exemple : <br>1,value1<br>2,value2<br>3,value3 span class='notranslate'><br></span>...
+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=La llista de valors prové d'una taula<br>Sintaxi: table_name:label_field:id_field::filtersql<br>Exemple: c_typent:libelle: ::filtersql<br><br>- id_field és necessàriament una clau int primària<br> - filtersql és una condició SQL. Pot ser una prova senzilla (per exemple, active=1) per mostrar només el valor actiu<br>També podeu utilitzar $ID$ al filtre, que és l'identificador actual de l'objecte actual<br>Per utilitzar SELECT al filtre, utilitzeu la paraula clau $SEL$ per evitar la protecció anti-injecció.<br>si voleu filtrar els camps addicionals utilitzeu la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tenir el llista en funció d'una altra llista d'atributs complementaris:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>Per tal que la llista depengui d'una altra llista:<br>c_typent:libelle:id:<i>parent_list_code</i>:filter_column>|
-ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula<br>Sintaxi: table_name:label_field:id_field::filtersql<br>Exemple: c_typent:libelle: ::filtersql<br><br>el filtre pot ser una prova senzilla (per exemple, active=1) per mostrar només el valor actiu<br>També podeu utilitzar $ID$ al filtre, que és l'identificador actual de l'objecte actual<br>Per fer un SELECT al filtre, utilitzeu $SEL$<br>si voleu filtrar sobre camps extra, utilitzeu la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tal que la llista depengui d'una altra llista d'atributs complementaris:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br></span class='notranslate'></i>19bz0</span>notranslate'90</span><span>fcz0 </span>Per tal que la llista depengui d'una altra llista:<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=Els paràmetres han de ser ObjectName:Classpath<br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per a un separador simple<br>Definiu-lo a 1 per a un separador que es replega (obert per defecte per a una sessió nova, llavors l'estat es manté per a cada sessió d'usuari)<br>Definiu-ho a 2 per a un separador que es replega (es replega de manera predeterminada per a una sessió nova, llavors l'estat es manté abans de cada sessió d'usuari)
 LibraryToBuildPDF=Biblioteca utilitzada per a la generació de PDF
@@ -633,7 +633,7 @@ Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus
 Module610Name=Variants de producte
 Module610Desc=Permet la creació de variants de producte en funció dels atributs (color, mida, etc.)
 Module650Name=Llistats de materials (BOM)
-Module650Desc=module per definir les vostres factures de Materials (BOM). Es pot utilitzar per a Manufacturing Resource Planificació de la module= 'notranslate'>Manufacturing</span> Comandes (MO)
+Module650Desc=Module to define your Bills Of Materials (BOM). Can be used for Manufacturing Resource Planning by the module Manufacturing Orders (MO)
 Module660Name=Manufacturing Resource Planificació (MRP)
 Module660Desc=module per gestionar Manufacturing (MO)
 Module700Name=Donacions
@@ -1197,6 +1197,7 @@ Skin=Tema visual
 DefaultSkin=Tema visual predeterminat
 MaxSizeList=Longitud màxima per llistats
 DefaultMaxSizeList=Longitud màxima per defecte per a les llistes
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Longitud màxima per defecte en llistes curtes (per exemple, en la fitxa de client)
 MessageOfDay=Missatge del dia
 MessageLogin=Missatge en la pàgina d'inici de sessió
@@ -2290,7 +2291,7 @@ DatabasePasswordNotObfuscated=La contrasenya de la base de dades NO està ofusca
 APIsAreNotEnabled=Els mòduls API no estan habilitats
 YouShouldSetThisToOff=Hauríeu d'establir-lo a 0 o desactivar-lo
 InstallAndUpgradeLockedBy=La instal·lació i les actualitzacions estan bloquejades pel fitxer <b> %s </b>
-InstallLockedBy=La instal·lació/reinstal·lació està bloquejada pel fitxer <b>%s</b> 
+InstallLockedBy=La instal·lació/reinstal·lació està bloquejada pel fitxer <b>%s</b>
 InstallOfAddonIsNotBlocked=Les instal·lacions de mòduls no estan bloquejades. Creeu un arxiu <b>installmodules.lock</b> dins del directori <b>%s</b> per a bloquejar instal·lacions de mòduls externs.
 OldImplementation=Implementació antiga
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Si alguns mòduls de pagament en línia estan habilitats (Paypal, Stripe, ...), afegiu un enllaç al PDF per a fer el pagament en línia
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=No creat per defecte. Creat nomé
 CSSPage=Estil CSS
 Defaultfortype=Defecte
 DefaultForTypeDesc=Plantilla utilitzada per defecte quan es crea un correu electrònic nou per al tipus de plantilla
-OptionXShouldBeEnabledInModuleY=L'opció «<b>%s</b>» s'ha d'habilitar al mòdul <b>%s</b> 
-OptionXIsCorrectlyEnabledInModuleY=L'opció «<b>%s</b>» està habilitada al mòdul <b>%s</b> 
+OptionXShouldBeEnabledInModuleY=L'opció «<b>%s</b>» s'ha d'habilitar al mòdul <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=L'opció «<b>%s</b>» està habilitada al mòdul <b>%s</b>
 AllowOnLineSign=Permet signatura en línia
 AtBottomOfPage=A la part inferior de la pàgina
 FailedAuth=autenticacions fallides
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=És possible definir un àlies al servidor web i aix
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 98bf4eb16b9..7b1292395b7 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -174,9 +174,9 @@ FoundXQualifiedRecurringInvoiceTemplate=%s plantilles recurrents de factura qual
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
 NewBill=Factura nova
 LastBills=Últimes %s factures
-LatestTemplateInvoices=Últimes %s plantilles de factura 
-LatestCustomerTemplateInvoices=Últimes %s plantilles de factures de client 
-LatestSupplierTemplateInvoices=Últimes %s plantilles de factures de proveïdor 
+LatestTemplateInvoices=Últimes %s plantilles de factura
+LatestCustomerTemplateInvoices=Últimes %s plantilles de factures de client
+LatestSupplierTemplateInvoices=Últimes %s plantilles de factures de proveïdor
 LastCustomersBills=Últimes %s factures de client
 LastSuppliersBills=Últimes %s factures de proveïdor
 AllBills=Totes les factures
@@ -188,7 +188,7 @@ SuppliersDraftInvoices=Esborrany de factures de Proveïdor
 Unpaid=Pendents
 ErrorNoPaymentDefined=Error No s'ha definit el pagament
 ConfirmDeleteBill=Vols eliminar aquesta factura?
-ConfirmValidateBill=Esteu segur que voleu validar aquesta factura amb la referència <b>%s</b><span class='notranslate'></b> >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Està segur de voler tornar la factura <b>%s</b> a l'estat esborrany?
 ConfirmClassifyPaidBill=Està segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmCancelBill=Està segur de voler anul·lar la factura <b>%s</b>?
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index b6309e3a625..724d51e1587 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -254,7 +254,7 @@ CalculationMode=Mode de càlcul
 AccountancyJournal=Diari de codi de comptable
 ACCOUNTING_VAT_SOLD_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA a les vendes (utilitzat si no està definit a la configuració del diccionari d'IVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA a les compres (utilitzat si no està definit a la configuració del diccionari d'IVA)
-ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=account (del gràfic de account) que s'utilitzarà per al timbre d'ingressos a <span class='notranslate'>sales /span>
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
 ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=account (del gràfic de account) que s'utilitzarà per al segell d'ingressos de les compres
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a pagar l'IVA
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA en compres per a càrrecs inversos (crèdit)
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index fb14f50df24..3ee4dbc45da 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -134,7 +134,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
 ErrorBadValueForCode=Valor incorrecte per codi de seguretat. Torna a intentar-ho amb un nou valor...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%sb071%sb0a6fc0a65 span> <span class='notranslate'>Cannot sigui negatiu en aquest tipus de invoice. Si necessiteu afegir un descompte line, només cal create primer el descompte (de Field /span> '<span class='notranslate'>%s' a la targeta third-party) and aplica-la a el invoice.
+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 third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=El total de línies (net d’impostos) no pot ser negatiu per a un tipus d’IVA determinat no nul (s’ha trobat un total negatiu per a l’IVA <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Les línies no poden ser negatives en un dipòsit. Si ho feu, podreu tenir problemes quan necessiteu consumir el dipòsit a la factura final
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures a client no poden ser negatives
@@ -323,7 +323,7 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: l'URL de la vos
 ErrorMenuExistValue=Ja existeix un menú amb aquest títol o URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Els fitxers SVG no es permeten com a enllaços externs sense l'opció %s
 ErrorTypeMenu=Impossible afegir un altre menú per al mateix mòdul a la barra de navegació, encara no es gestiona
-ErrorObjectNotFound = El object <b>%sb3z0<span class='notranslate'>%sb3z914b7 /span> no s'ha trobat, <span class='notranslate'>Check el vostre URL
+ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
 ErrorCountryCodeMustBe2Char=El codi del país ha de ser una cadena de 2 caràcters
 ErrorABatchShouldNotContainsSpaces=Un número de lot o de sèrie no hauria de contenir espais
 
diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
index ea122ee2993..6854411ca26 100644
--- a/htdocs/langs/ca_ES/ldap.lang
+++ b/htdocs/langs/ca_ES/ldap.lang
@@ -29,3 +29,5 @@ LDAPPasswordHashType=Tipus hash de contrasenya
 LDAPPasswordHashTypeExample=Tipus d'hash de contrasenya utilitzat al servidor
 SupportedForLDAPExportScriptOnly=Només és compatible amb un script d'exportació ldap
 SupportedForLDAPImportScriptOnly=Només és compatible amb un script d'importació ldap
+LDAPUserAccountControl = userAccountControl en la creació (directory actiu)
+LDAPUserAccountControlExample = 512 Normal Account / 546 Normal Account + No Passwd + Disabled (see : https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 668e31b0f39..22fcf6589da 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -169,7 +169,7 @@ RemoveLink=Elimina enllaç
 AddToDraft=Afegeix a esborrany
 Update=Actualitza
 Close=Tancar
-CloseAs=Indica l'estat 
+CloseAs=Indica l'estat
 CloseBox=Elimineu el giny del vostre tauler
 Confirm=Confirmar
 ConfirmSendCardByMail=Realment voleu enviar el contingut d'aquesta fitxa per correu a <b>%s</b>?
@@ -420,6 +420,8 @@ TotalTTCShort=Total
 TotalHT=Total (sense IVA)
 TotalHTforthispage=Total (sense IVA) d'aquesta pàgina
 Totalforthispage=Total per aquesta pàgina
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total
 TotalTTCToYourCredit=Total a crèdit
 TotalVAT=Total IVA
@@ -647,6 +649,7 @@ ReportName=Nom de l'informe
 ReportPeriod=Període d'anàlisi
 ReportDescription=Descripció
 Report=Informe
+Reports=Informes
 Keyword=Paraula clau
 Origin=Origen
 Legend=Llegenda
@@ -723,8 +726,8 @@ ValueIsValid=Valor vàlid
 ValueIsNotValid=Valor invàlid
 RecordCreatedSuccessfully=Registre creat correctament
 RecordModifiedSuccessfully=Registre modificat amb èxit
-RecordsModified=S'han modificat el(s) registre(s) %s 
-RecordsDeleted=S'han suprimit el(s) registre(s) %s 
+RecordsModified=S'han modificat el(s) registre(s) %s
+RecordsDeleted=S'han suprimit el(s) registre(s) %s
 RecordsGenerated=S'han generat el(s) registre(s) %s
 ValidatedRecordWhereFound = Alguns dels registres seleccionats ja s'han validat. No s'ha suprimit cap registre.
 AutomaticCode=Creació automàtica de codi
@@ -1135,7 +1138,7 @@ More=Més
 ShowDetails=Mostrar detalls
 CustomReports=Informes personalitzats
 StatisticsOn=Estadístiques de
-SelectYourGraphOptionsFirst=Seleccioneu les opcions gràfiques per a crear un gràfic 
+SelectYourGraphOptionsFirst=Seleccioneu les opcions gràfiques per a crear un gràfic
 Measures=Mesures
 XAxis=Eix X
 YAxis=Eix Y
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index abfd3c413bd..9a562dccec5 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -148,7 +148,7 @@ CSSListClass=CSS per a llistats
 NotEditable=No editable
 ForeignKey=Clau forana
 ForeignKeyDesc=Si s'ha de garantir que el valor d'aquest camp existeix en una altra taula. Introduïu aquí un valor que coincideixi amb la sintaxi: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Exemple:<br>varchar(99)<br>correu electrònic<br>telèfon<br>ip<br>url<br>contrasenyab0392bzcc span>double(24,8)<br>real<br>text<br>html <br>date<br>datetime<br>timestamp <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fccfda<1 /span><span class='notranslate'><br>'1' significa que afegim un botó + després de la combinació per crear el registre<br>'filtre' és un Condició de sintaxi del filtre universal, exemple: '((estat:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Aquest és el tipus de camp/atribut.
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=No s'ha pogut afegir el codi al descriptor. Compro
 DictionariesCreated=Diccionari <b>%s</b> creat correctament
 DictionaryDeleted=El diccionari <b>%s</b> s'ha eliminat correctament
 PropertyModuleUpdated=La propietat <b>%s</b> s'ha actualitzat correctament
-InfoForApiFile=* Quan genereu un fitxer per primera vegada, es crearan tots els mètodes <strong>per a cada objecte.</strong><br>* Quan feu clic a <strong>remove</strong> només elimineu tots els mètodes de la classe <span ='notranslate'><strong></span>objecte seleccionat</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Pàgina per a la configuració del mòdul
 EmailingSelectors=Selectors de correus electrònics
 EmailingSelectorDesc=Podeu generar i editar aquí els fitxers de classe per proporcionar nous selectors de destinació de correu electrònic per al mòdul d'enviament massiu de correu electrònic
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 325a424b3ec..09f399d201a 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -60,11 +60,11 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específica
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong>&lt;?php ?&gt;b90f65fdc070f65fdc0 . Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la sintaxi següent:<br><strong>&lt;?php includeContainer('alias_of_include'_to_container'); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no escriviu cap contingut abans d'una redirecció):<br><strong>&lt;?php redirectToContainer(' àlies_del_contenidor_a_redirigir_a'); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7dcbe087zdcbe087 >mylink<span class='notranslate'>&lt;a&gt;</strong> <br><br><span class="fa fa-download paddingright">b014f1b93d7c65 Per incloure a <span>classe ='notranslate'><strong>enllaç per baixar</strong> un fitxer emmagatzemat als <strong>documents</strong>, utilitzeu el directori <strong>document.php</strong> wrapper: ><br>Per exemple, per a un fitxer en documents/ecm (cal registrar-se), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer en documents o mitjans (directori obert per a l'accés públic), la sintaxi és: <br><strong>&lt;a="/document.php?modulepart=medias&file=[relative_dir href/] ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit ( accés obert mitjançant la clau hash per compartir del fitxer), la sintaxi és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un  <strong>imatge</strong> emmagatzemat al director de <strong>documentsb9z0f65fc0<strong></span> , utilitzeu l'embolcall <strong>viewimage.php</strong>.<br>, per exemple, una imatge a documents/mitjans (directori obert per a accés públic), la sintaxi és:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"b0018c7d31ecz0 </strong><br>
 YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç compartit (accés obert utilitzant la clau hash de compartició del fitxer), la sintaxi és:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Per obtenir l'URL de la imatge d'un objecte PHP, utilitzeu<br><strong>&lt;&lt; span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Més exemples de codi HTML o dinàmic disponibles a <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">la documentació de la wiki</a></span class='notranslate'> >.<span class='notranslate'><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
 SiteAdded=S'ha afegit el lloc web
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 2aad8317293..11d033bab58 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Celkem (vč. DPH)
 TotalHT=Celkem (bez daně)
 TotalHTforthispage=Celkem (po zdanění) pro tuto stránku
 Totalforthispage=Celkový pro tuto stránku
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Celkem (vč. DPH)
 TotalTTCToYourCredit=Celkem (vč. DPH) na Váš účet
 TotalVAT=Daň celkem
@@ -647,6 +649,7 @@ ReportName=Název zprávy
 ReportPeriod=Zpráva za období
 ReportDescription=Popis
 Report=Zpráva
+Reports=Zprávy
 Keyword=Klíčové slovo
 Origin=Původ
 Legend=Legenda
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 33989380652..248ef9161b6 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -365,9 +365,9 @@ GenericMaskCodes=Du kan indtaste en hvilken som helst nummereringsmaske. I denne
 GenericMaskCodes2=<b>{cccc}</b> kundekoden på n tegn<br><b>{cccc000}</b> kundekoden på n tegn efterfølges af en tæller dedikeret til kunden. Denne tæller nulstilles samtidig med den globale tæller.<br><b>{tttt}</b> Koden for tredjepartstype på n tegn (se menuen Hjem - Opsætning - Ordbøger - Tredjepartstyper). Hvis du tilføjer dette tag, vil tælleren være forskellig for hver type tredjepart.<br>
 GenericMaskCodes3=Alle andre tegn i masken forbliver intakte.<br>Mellemrum er ikke tilladt.<br>
 GenericMaskCodes3EAN=Alle andre tegn i masken forbliver intakte (undtagen * eller ? i 13. position i EAN13).<br>Mellemrum er ikke tilladt.<br>I EAN13 skal det sidste tegn efter det sidste } i 13. position være * eller ? . Det erstattes af det beregnede kontrolciffer.<br>
-GenericMaskCodes4a= <u> Eksempel den 99. %s af tredjeparten TheCompany, med dato 2023-01-31: </u>  <br> 
-GenericMaskCodes4b= <u> Eksempel på tredjepart oprettet 2023-01-31: </u>  <br> 
-GenericMaskCodes4c= <u> Eksempel på produkt oprettet 31-01-2023: </u>  <br> 
+GenericMaskCodes4a= <u> Eksempel den 99. %s af tredjeparten TheCompany, med dato 2023-01-31: </u>  <br>
+GenericMaskCodes4b= <u> Eksempel på tredjepart oprettet 2023-01-31: </u>  <br>
+GenericMaskCodes4c= <u> Eksempel på produkt oprettet 31-01-2023: </u>  <br>
 GenericMaskCodes5= <b> ABC{åå}{mm}-{000000} </b>  vil give <b> ABC2301-000099 </b>  <br>  <b> {0000+100@1}-ZZZ/{dd}/XXX </b>  vil give <b> 0199-ZZZ/31/XXX </b>  <br>  <b> IN{åå}{mm}-{0000}-{t} </b>  vil give <b> IN2301-0099-A </b>  hvis virksomhedens type er 'Responsable Inscripto' med kode for typen, der er 'A_RI'
 GenericNumRefModelDesc=Returnerer et bruger tilpasset tal i henhold til en defineret maske.
 ServerAvailableOnIPOrPort=Serveren er tilgængelig på adressen <b>%s</b> på port <b>%s</b>
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=At lade dette felt stå tomt betyder, at denne værd
 ExtrafieldParamHelpselect=Liste over værdier skal være linjer med formatet nøgle,værdi (hvor nøgle ikke kan være '0')<br><br>f.eks.:<br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>For at gøre listen afhængig af en anden supplerende attributliste:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key<br><br>For at gøre listen afhængig af en anden liste:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Liste over værdier skal være linjer med formatet nøgle,værdi (hvor nøgle ikke kan være '0')<br><br>f.eks.:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Liste over værdier skal være linjer med formatet nøgle,værdi (hvor nøgle ikke kan være '0')<br><br>f.eks.:<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel<br>Syntaks: tabelnavn:label_field:id_field::filtersql<br>Eksempel: c_idtypent:libelle: ::filtersql<br><br>- id_field er nødvendigvis en primær int-nøgleb0342fccfdaspan19bz> - filtersql er en SQL-betingelse. Det kan være en simpel test (f.eks. active=1) kun at vise aktiv værdi<span class='notranslate'><br>Du kan også bruge $ID$ i filter, som er det aktuelle id for det aktuelle objekt<br>For at bruge en SELECT i filteret, skal du bruge søgeordet $SEL$ for at omgå anti-injection beskyttelse.<br>hvis du vil filtrere på ekstrafelter brug syntaks extra.fieldcode=... (hvor feltkoden er koden for extrafield)<br><br>For at have liste afhængig af en anden komplementær attributliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>For at få listen afhængig af en anden liste:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'></i></umn>:forælder
+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 necessarily 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=Liste over værdier kommer fra en tabel<br>Syntaks: table_name:label_field:id_field::filtersql<br>Eksempel: c_typent:libelle:id::filtersql<br><br>filter kan være en simpel test (f.eks. aktiv=1) for kun at vise aktiv værdi<br>Du kan også bruge $ID$ i filter, som er det nuværende id for det aktuelle objekt<br>For at bruge en SELECT i filteret skal du bruge nøgleordet $SEL$<br>hvis du vil filtrere på ekstrafelter, brug syntaks extra.fieldcode=... (hvor fieldcode er koden for ekstrafelt)<br><br>For at få listen afhængig af en anden supplerende egenskabsliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>For at gøre listen afhængig af en anden liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametre skal være ObjectName:Classpath<br>Syntaks: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hold tom for en simpel adskiller<br>Indstil denne til 1 for en kollapsende separator (åben som standard for ny session, så beholdes status for hver brugersession)<br>Indstil denne til 2 for en kollapsende separator (skjulet som standard for ny session, så beholdes status før hver brugersession)
@@ -1197,6 +1197,7 @@ Skin=Skin tema
 DefaultSkin=Standard skin tema
 MaxSizeList=Maksimal længde for liste
 DefaultMaxSizeList=Standard maks. længde for lister
+DisplayGrandTotalInList=Vis totalsum (for alle sider) i listernes sidefod
 DefaultMaxSizeShortList=Standard maksimal længde for korte lister (dvs. i kundekort)
 MessageOfDay=Dagens budskab
 MessageLogin=Besked på login-siden
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=Det er muligt at definere et alias til webserveren o
 ExportUseForce=Brug parameteren -f
 ExportUseForceHelp=Tving til at fortsætte eksporten, selv når der er fundet en fejl (sikkerhedskopi er muligvis ikke pålidelig)
 CustomPrompt=Brugerdefinerede prompter
+AiDescription=AI (Artificial Intelligence) funktioner
+AiDescriptionLong=Giver AI (Artificial Intelligence) funktioner i forskellige dele af applikationen. Har brug for ekstern AI API.
+AI_KEY_API_CHATGPT= Nøgle til ChatGPT IA api
+AiSetup=AI-modulopsætning
+AiCustomPrompt=AI toldprompt
+AI_CONFIGURATIONS_PROMPT=Brugerdefineret prompt
+ImageGeneration=Billedgenerering
+AIPromptForFeatures=AI brugerdefinerede prompter om funktioner
+EnterAnIP=Indtast en IP-adresse
diff --git a/htdocs/langs/da_DK/eventorganization.lang b/htdocs/langs/da_DK/eventorganization.lang
index 9a00af1f6f2..1a3f0f461be 100644
--- a/htdocs/langs/da_DK/eventorganization.lang
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -75,7 +75,7 @@ EventOrganizationEmailBoothPayment = Betaling af din bod
 EventOrganizationEmailRegistrationPayment = Tilmelding til et arrangement
 EventOrganizationMassEmailAttendees = Kommunikation til deltagere
 EventOrganizationMassEmailSpeakers = Kommunikation til taler
-ToSpeakers=Til talere 
+ToSpeakers=Til talere
 
 #
 # Event
@@ -88,6 +88,7 @@ PriceOfRegistration=Pris for registrering
 PriceOfRegistrationHelp=Pris at betale for at tilmelde sig eller deltage i arrangementet
 PriceOfBooth=Abonnementspris for at stå en kabine
 PriceOfBoothHelp=Abonnementspris for at stå en kabine
+EventOrganizationICSLinkProject=Link ICS til begivenheden
 EventOrganizationICSLink=Link ICS til konferencer
 ConferenceOrBoothInformation=Konference eller stand information
 Attendees=Deltagere
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 800263d9259..d3a2853669b 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=I alt (m/moms)
 TotalHT=I alt (u/moms)
 TotalHTforthispage=I alt (ekskl. moms) for denne side
 Totalforthispage=I alt for denne side
+GrandTotal=Totalt
+TotalforAllPages=I alt for alle sider
 TotalTTC=I alt (m/moms)
 TotalTTCToYourCredit=I alt (inkl. moms) til din kredit
 TotalVAT=Moms i alt
@@ -647,6 +649,7 @@ ReportName=Rapportnavn
 ReportPeriod=Beretningsperioden
 ReportDescription=Beskrivelse
 Report=Rapport
+Reports=Reporter
 Keyword=Nøgleord
 Origin=Oprindelse
 Legend=Legend
@@ -1204,7 +1207,7 @@ ConfirmMassLeaveApprovalQuestion=Er du sikker på, at du vil godkende de (n) val
 ConfirmMassLeaveApproval=Godkendelse af masseorlov
 RecordAproved=Rekord godkendt
 RecordsApproved=%s Registrering (er) godkendt
-Properties=rettigheder 
+Properties=rettigheder
 hasBeenValidated=%s er valideret
 ClientTZ=Kunden Tidszone (bruger)
 NotClosedYet=Endnu ikke lukket
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 747d04630dd..c53cdeadfeb 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -86,7 +86,7 @@ IsAMeasure=Er en foranstaltning
 DirScanned=Directory scannet
 NoTrigger=Ingen udløser
 NoWidget=Ingen widget
-ApiExplorer=API udforske 
+ApiExplorer=API udforske
 ListOfMenusEntries=Liste over menupunkter
 ListOfDictionariesEntries=Liste over poster i ordbøger
 ListOfPermissionsDefined=Liste over definerede tilladelser
@@ -148,7 +148,7 @@ CSSListClass=CSS til liste
 NotEditable=Ikke redigerbar
 ForeignKey=Fremmed nøgle
 ForeignKeyDesc=Hvis værdien af dette felt skal garanteres at eksistere i en anden tabel. Indtast her en værdi, der matcher syntaks: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Eksempel:<br>varchar(99)<br>e-mail<br>telefon<br>ip<br>url<br>adgangskodefzcc</03492 span>double(24,8)<span class='notranslate'><br>real<br>text<br>html <br>date<br>datetime<br>tidsstempel <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fccfda19b /span><span class='notranslate'><br>'1' betyder, at vi tilføjer en +-knap efter kombinationen for at oprette posten<br>'filter' er et Universal Filter-syntaksbetingelse, eksempel: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Dette er typen af feltet/attributten.
 AsciiToHtmlConverter=Ascii til HTML-konverter
 AsciiToPdfConverter=Ascii til PDF konverter
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Kunne ikke tilføje kode i beskrivelsen. Tjek, at
 DictionariesCreated=Ordbog <b> %s </b> oprettet med succes
 DictionaryDeleted=Ordbog <b> %s </b> fjernet med succes
 PropertyModuleUpdated=Ejendommen <b> %s </b> er blevet opdateret.
-InfoForApiFile=* Når du genererer fil for første gang, vil alle metoder blive oprettet <strong>for hvert objekt.</strong><br>* Når du klikker i <strong>remove</strong> fjerner du bare alle klassemetoder for <span ='notranslate'><strong></span>valgt objekt</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Side for modulopsætning
 EmailingSelectors=E-mail-vælgere
 EmailingSelectorDesc=Du kan generere og redigere klassefilerne her for at give nye e-mail-målvælgere til masse-e-mail-modulet
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 525f9069ff6..da0e7dea576 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Tidligere års faktura dato
 NextYearOfInvoice=Følgende års faktura dato
 DateNextInvoiceBeforeGen=Dato for næste faktura (før generation)
 DateNextInvoiceAfterGen=Dato for næste faktura (efter generation)
-GraphInBarsAreLimitedToNMeasures=Grafik er begrænset til %s foranstaltninger i 'Bars' mode. Tilstanden "Lines blev automatisk valgt i stedet.
+GraphInBarsAreLimitedToNMeasures=Grafik er begrænset til %s mål i 'Bars'-tilstand. Tilstanden 'Linjer' blev automatisk valgt i stedet for.
 OnlyOneFieldForXAxisIsPossible=Kun 1 felt er i øjeblikket muligt som X-Axis. Kun det første valgte felt er valgt.
 AtLeastOneMeasureIsRequired=Mindst 1 felt til mål er påkrævet
 AtLeastOneXAxisIsRequired=Mindst 1 felt til X-Axis kræves
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Salgsordre leveret
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Indkøbsordre sendt via e-mail
 Notify_ORDER_SUPPLIER_VALIDATE=Indkøbsordre registreret
 Notify_ORDER_SUPPLIER_APPROVE=Indkøbsordre godkendt
+Notify_ORDER_SUPPLIER_SUBMIT=Indkøbsordre afgivet
 Notify_ORDER_SUPPLIER_REFUSE=Indkøbsordre afvist
 Notify_PROPAL_VALIDATE=Tilbud godkendt
 Notify_PROPAL_CLOSE_SIGNED=Kundeforslag er lukket underskrevet
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=Kundens faktura sendes med posten
 Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura valideret
 Notify_BILL_SUPPLIER_PAYED=Sælgerfaktura betalt
 Notify_BILL_SUPPLIER_SENTBYMAIL=Leverandørfaktura sendt med posten
-Notify_BILL_SUPPLIER_CANCELED=Leverandør faktura annulleret
+Notify_BILL_SUPPLIER_CANCELED=Leverandørfaktura annulleret
 Notify_CONTRACT_VALIDATE=Kontrakt bekræftet
 Notify_FICHINTER_VALIDATE=Intervention bekræftet
+Notify_FICHINTER_CLOSE=Intervention lukket
 Notify_FICHINTER_ADD_CONTACT=Tilføjet kontakt til intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sendt via post
 Notify_SHIPPING_VALIDATE=Forsendelse bekræftet
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Installer eller aktiver GD bibliotek på din PHP installatio
 ProfIdShortDesc=<b>Prof Id %s</b> er en information afhængigt tredjepart land. <br> For eksempel, for <b>land %s,</b> er det <b>kode %s.</b>
 DolibarrDemo=Dolibarr ERP / CRM demo
 StatsByAmount=Statistik over mængden af produkter/ydelser
+StatsByAmountProducts=Statistik over mængden af produkter
+StatsByAmountServices=Statistik over mængden af tjenester
 StatsByNumberOfUnits=Statistikker for summen af ​​produkter / tjenester
+StatsByNumberOfUnitsProducts=Statistik for summen af antal produkter
+StatsByNumberOfUnitsServices=Statistik for summen af antal tjenester
 StatsByNumberOfEntities=Statistik for antallet af henvisende enheder (antal fakturaer eller ordrer ...)
 NumberOf=Antal %s
 NumberOfUnits=Antal enheder på %s
@@ -198,6 +204,7 @@ AmountIn=Beløb i %s
 NumberOfUnitsMos=Antal enheder, der skal produceres i produktionsordrer
 EMailTextInterventionAddedContact=En ny intervention %s er blevet tildelt dig.
 EMailTextInterventionValidated=Intervention %s bekræftet
+EMailTextInterventionClosed=Interventionen %s er blevet lukket.
 EMailTextInvoiceValidated=Fakturaen %s er godkendt.
 EMailTextInvoicePayed=Faktura %s er blevet betalt.
 EMailTextProposalValidated=Tilbud %s er godkendt.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Forslag %s er blevet lukket afvist.
 EMailTextProposalClosedRefusedWeb=Forslag %s er blevet lukket afvise på portalsiden.
 EMailTextOrderValidated=Bestillingen %s er godkendt.
 EMailTextOrderClose=Ordren %s er blevet leveret.
-EMailTextOrderApproved=Ordren %s er godkendt.
-EMailTextOrderValidatedBy=Orden %s er indskrevet af%s.
-EMailTextOrderApprovedBy=Orden %s er godkendt af%s.
-EMailTextOrderRefused=Ordren %s er blevet afvist.
-EMailTextOrderRefusedBy=Orden %s er blevet afvist af %s.
+EMailTextSupplierOrderApprovedBy=Indkøbsordre %s er blevet godkendt af %s.
+EMailTextSupplierOrderValidatedBy=Indkøbsordre %s er blevet registreret af %s.
+EMailTextSupplierOrderSubmittedBy=Indkøbsordre %s er blevet indsendt af %s.
+EMailTextSupplierOrderRefusedBy=Indkøbsordre %s er blevet afvist af %s.
 EMailTextExpeditionValidated=Forsendelse %s er godkendt.
 EMailTextExpenseReportValidated=Udgiftsrapport %s er godkendt.
 EMailTextExpenseReportApproved=Udgiftsrapport %s er godkendt.
@@ -289,10 +295,12 @@ LinesToImport=Linjer at importere
 
 MemoryUsage=Brug af hukommelse
 RequestDuration=Anmodningens varighed
-ProductsPerPopularity=Produkter / Ydelser efter popularitet
-PopuProp=Produkter/tjenester efter popularitet i forslag
-PopuCom=Produkter/tjenester efter popularitet i ordrer
-ProductStatistics=Produkter / services statistik
+ProductsServicesPerPopularity=Produkter|Tjenester efter popularitet
+ProductsPerPopularity=Produkter efter popularitet
+ServicesPerPopularity=Tjenester efter popularitet
+PopuProp=Produkter|Tjenester efter popularitet i Forslag
+PopuCom=Produkter|Tjenester efter popularitet i ordrer
+ProductStatistics=Produkter|Tjenester Statistik
 NbOfQtyInOrders=Antal i ordrer
 SelectTheTypeOfObjectToAnalyze=Vælg et objekt for at se dets statistik ...
 
@@ -328,3 +336,5 @@ FTPFailedToUploadFile=Kunne ikke uploade filen <b> %s </b> .
 AddFolder=Opret mappe
 FileWasCreateFolder=Mappe <b> %s </b> er blevet oprettet
 FTPFailedToCreateFolder=Kunne ikke oprette mappen <b> %s </b> .
+SelectADay=Vælg en dag i kalenderen
+SelectANewDate=Vælg en ny dato
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 6742aa7cd8e..7312d0e0171 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -208,11 +208,6 @@ unitSET=Sæt
 unitS=Sekund
 unitH=Time
 unitD=Dag
-unitG=Gram
-unitM=Meter
-unitLM=Lineær meter
-unitM2=Kvadratmeter
-unitM3=Kubikmeter
 unitL=Liter
 unitT=ton
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=pund
 unitOZ=unse
 unitM=Meter
+unitLM=Lineær meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -240,7 +236,7 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=unse
 unitgallon=gallon
-ProductCodeModel=Skabelon for vare-ref 
+ProductCodeModel=Skabelon for vare-ref
 ServiceCodeModel=Service ref skabelon
 CurrentProductPrice=Nuværende pris
 AlwaysUseNewPrice=Brug altid den aktuelle pris for vare/ydelse
@@ -437,3 +433,6 @@ ModifyValueExtrafields = Ændre værdien af et ekstrafelt
 OrProductsWithCategories=Eller produkter med tags/kategorier
 WarningTransferBatchStockMouvToGlobal = Hvis du ønsker at deserialisere dette produkt, vil hele dets serialiserede lager blive omdannet til globalt lager
 WarningConvertFromBatchToSerial=Hvis du i øjeblikket har en mængde højere eller lig med 2 for produktet, betyder skift til dette valg, at du stadig vil have et produkt med forskellige objekter af samme batch (mens du ønsker et unikt serienummer). Duplikatet forbliver indtil en opgørelse eller en manuel lagerbevægelse for at rette dette.
+AllowStockMovementVariantParent=Registrerer også lagerbevægelser på moderprodukter af variantprodukter
+AllowStockMovementVariantParentHelp=Som standard er en forælder til en variant et virtuelt produkt, så der administreres ikke noget lager for det. Ved at aktivere denne mulighed, vil et lager blive administreret for overordnede produkter, og hver gang en lagermængde ændres for et variantprodukt, vil den samme mængde blive ændret for moderproduktet. Du bør ikke have brug for denne mulighed, undtagen hvis du bruger variant til at administrere det samme produkt end forælderen (men med forskellige beskrivelser, priser...)
+ConfirmSetToDraftInventory=Er du sikker på, at du vil gå tilbage til Kladdestatus?<br>De mængder, der i øjeblikket er indstillet i beholdningen, nulstilles.
diff --git a/htdocs/langs/da_DK/resource.lang b/htdocs/langs/da_DK/resource.lang
index 8c442abdbaf..df36d38414d 100644
--- a/htdocs/langs/da_DK/resource.lang
+++ b/htdocs/langs/da_DK/resource.lang
@@ -37,3 +37,5 @@ ImportDataset_resource_1=Ressourcer
 
 ErrorResourcesAlreadyInUse=Nogle ressourcer er i brug
 ErrorResourceUseInEvent=%s bruges i %s tilfælde
+
+MaxUsers=Maksimalt antal brugere (pladser, sæder osv.)
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 7a6cd477ee4..b12df56a609 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -60,11 +60,11 @@ NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong>&lt;?php ?&gt;<span class='01a66fccz01a665d9d0 </span>. Følgende globale variabler er tilgængelige: $conf, $db, $mysoc, $user, $websted, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Du kan også inkludere af en anden side/beholder med følgende syntaks:<br><strong>&lt;? php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Du kan foretage en omdirigering til en anden side/beholder med følgende syntaks (Bemærk: udskriv ikke nogen indhold før en omdirigering):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-link paddingright"></span> For at tilføje et link til en anden side skal du bruge syntaksen:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7z0</0be12c7z0 >mylink<span class='notranslate'>&lt;a&gt;</strong> <br><br><span class="fa fa-download paddingright"></span> To include a <</span class ='notranslate'><strong>link til download</strong> en fil gemt i <strong>dokumenterne<span notranslate'></strong></span> bibliotek, brug <strong>document.php</strong> class='notranslate' wrapper: ><br><br>Eksempel, for en fil til dokumenter/ecm (skal logges), er syntaksen:<br><strong> >&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil til dokumenter/medier (åben mappe til offentlig adgang), er syntaksen: <br><strong>&lt;a href="/document.php?modulepart=medias&file=]relative_dir/ ext"&gt;</strong><br>For en fil, der deles med et delingslink ( åben adgang ved hjælp af filens hash-nøgle), syntaks er:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en  <strong>image</strong> gemt i <strong>dokumenterne</strong>direktorie , brug <strong>viewimage.php</strong>-indpakningen.<br>,Example, et billede i dokumenter/medier (åben mappe til offentlig adgang), syntaks er:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"</strong><br>
 YouCanEditHtmlSource2=For et billede, der deles med et delingslink (åben adgang ved hjælp af deling af hash-nøglen til filen), er syntaks: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." </strong><br>
-YouCanEditHtmlSource3=For at få URL'en til billedet af et PHP-objekt skal du bruge<br><strong>&lt; span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"<span>" class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Flere eksempler på HTML eller dynamisk kode tilgængelig på <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki-dokumentationen</a> >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klon side / container
 CloneSite=Klon website
 SiteAdded=Hjemmeside tilføjet
diff --git a/htdocs/langs/de_AT/datapolicy.lang b/htdocs/langs/de_AT/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/de_AT/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 0ebdf950bea..5b12be91cba 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -161,7 +161,6 @@ MAIN_MAIL_AUTOCOPY_TO=Automatische Blindkopie (BCC) aller gesendeten Mails an:
 MAIN_DISABLE_ALL_MAILS=Deaktiviere alle E-Mail-Funktionen (für Test- oder Demozwecke)
 MAIN_MAIL_FORCE_SENDTO=Sende alle Emails an diese Adresse zum Test (statt an die echten Empfänger)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=E-Mails von Mitarbeitern (sofern definiert) beim Schreiben einer neuen E-Mail in die Liste der vordefinierten Empfänger vorschlagen
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=SMTP - Benutzer (wenn Authentifizierung durch Ausgangsserver erforderlich)
 MAIN_MAIL_SMTPS_PW=SMTP - Passwort (wenn Authentifizierung durch Ausgangsserver erforderlich)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL)-Verschlüsselung verwenden
@@ -336,7 +335,6 @@ Module2500Desc=Document - / Electronic Content Management System. Deine Dokument
 Module2660Desc=Aktivieren Sie den Dolibarr Webservice-Client (Kann verwendet werden, um Daten/Anfragen an externe Server zu übertragen. Nur Lieferantenbestellungen werden derzeit unterstützt.)
 Module2700Desc=Benutze den Gravatar - Dienst, um Fotos von deinen Benutzern und Mitgliedern darzustellen. (www.gravatar.com)
 Module3200Name=Unveränderbare Archive
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Ferienverwaltung
 Module20000Desc=Mitarbeiterurlaubsanträge erfassen und verfolgen
 Module40000Name=Multiwährungsfähigkeit
diff --git a/htdocs/langs/de_CH/datapolicy.lang b/htdocs/langs/de_CH/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/de_CH/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index fbf4c28bfcc..391e49b0ea5 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -56,7 +56,6 @@ RefOrderSupplier=Bestellnummer für den Lieferanten
 RefOrderSupplierShort=Lieferanten - Bestellnummer
 OrderMode=Bestellweise
 ConfirmCloneOrder=Bist du sicher, dass du die Bestellung <b>%s</b> duplizieren willst?
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 SupplierOrderClassifiedBilled=Lieferantenbestellung %s  verrechnet
 OtherOrders=Weitere Bestellungen
 SupplierOrderValidated=Lieferantenbestellung ist freigegeben:
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 6caf435cb84..c893ec5ac05 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -12,7 +12,7 @@ VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlen
 FileCheck= Integritätsprüfung Dateien
-FileCheckDesc=Dieses Tool ermöglicht es Ihnen, die  Datei-Integrität und das Setup der Anwendung zu überprüfen, indem jede Datei mit der offiziellen Version verglichen wird. Der Wert einiger Setup-Konstanten kann ebenso überprüft werden. Sie können dieses Tool verwenden, um festzustellen, ob Dateien verändert wurden (z.B. durch einen Hacker). 
+FileCheckDesc=Dieses Tool ermöglicht es Ihnen, die  Datei-Integrität und das Setup der Anwendung zu überprüfen, indem jede Datei mit der offiziellen Version verglichen wird. Der Wert einiger Setup-Konstanten kann ebenso überprüft werden. Sie können dieses Tool verwenden, um festzustellen, ob Dateien verändert wurden (z.B. durch einen Hacker).
 FileIntegrityIsStrictlyConformedWithReference=Dateiintegrität entspricht genau der Referenz.
 FileIntegrityIsOkButFilesWereAdded=Die Dateiintegritätsprüfung wurde bestanden, jedoch wurden einige neue Dateien hinzugefügt.
 FileIntegritySomeFilesWereRemovedOrModified=Datei-Integrität konnte NICHT bestätigt werden. Dateien wurden modifiziert, entfernt oder hinzugefügt.
@@ -32,7 +32,7 @@ SessionSaveHandler=Session Handler
 SessionSavePath=Pfad für Sitzungsdatenspeicherung
 PurgeSessions=Bereinigung von Sessions
 ConfirmPurgeSessions=Wollen Sie wirklich alle Sitzungen beenden? Dadurch werden alle Benutzer getrennt (ausser Ihnen).
-NoSessionListWithThisHandler=Anzeige der aller aktiven Sitzungen mit Ihrer PHP-Konfiguration nicht möglich. 
+NoSessionListWithThisHandler=Anzeige der aller aktiven Sitzungen mit Ihrer PHP-Konfiguration nicht möglich.
 LockNewSessions=Keine neuen Sitzungen zulassen
 ConfirmLockNewSessions=Möchten Sie wirklich alle neuen Dolibarr Verbindungen bis auf Ihre eigene blockieren? Nur Benutzer <b>%s</b> kann danach noch eine Verbindung aufbauen.
 UnlockNewSessions=Sperrung neuer Sitzungen aufheben
@@ -42,7 +42,7 @@ WebUserGroup=Webserver Benutzer/Gruppen
 PermissionsOnFiles=Berechtigungen für Dateien
 PermissionsOnFilesInWebRoot=Berechtigungen für Dateien im Stammverzeichnis Web
 PermissionsOnFile=Berechtigungen für die Datei %s
-NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Berechtigungen des Betriebssystems oder PHP open_basedir Beschränkungen). 
+NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Berechtigungen des Betriebssystems oder PHP open_basedir Beschränkungen).
 DBStoringCharset=Zeichensatz der Datenbank-Speicherung
 DBSortingCharset=Datenbank-Zeichensatz zum Sortieren von Daten
 HostCharset=Host-Zeichensatz
@@ -157,7 +157,7 @@ Language_en_US_es_MX_etc=Sprache  (de_DE, de_AT, de_CH, en_GB,  ...)
 System=System
 SystemInfo=Systeminformationen
 SystemToolsArea=Systemwerkzeugsübersicht
-SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verwenden Sie das Menü zur Auswahl der gesuchten Funktion. 
+SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verwenden Sie das Menü zur Auswahl der gesuchten Funktion.
 Purge=Bereinigen
 PurgeAreaDesc=Auf dieser Seite können Sie alle von Dolibarr erzeugten oder gespeicherten Dateien (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b> ) löschen. Die Verwendung dieser Funktion ist in der Regel nicht erforderlich. Es wird als Workaround für Benutzer bereitgestellt, deren Dolibarr von einem Anbieter gehostet wird, der keine Berechtigungen zum löschen von Dateien anbietet, die vom Webserver erzeugt wurden.
 PurgeDeleteLogFile=Protokolldateien löschen, einschließlich <b>%s</b>, die für das Syslog-Modul definiert wurden (kein Risiko Daten zu verlieren)
@@ -214,7 +214,7 @@ OnlyActiveElementsAreShown=Es werden nur Einstellungsmöglichkeiten für <a href
 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...
-ModulesDeployDesc=DateiWenn es die Berechtigungen in Ihrem Dateisystem zulassen, können Sie mit diesem Tool ein externes Modul bereitstellen. Das Modul ist dann auf der Registerkarte <strong>%s</strong> sichtbar. 
+ModulesDeployDesc=DateiWenn es die Berechtigungen in Ihrem Dateisystem zulassen, können Sie mit diesem Tool ein externes Modul bereitstellen. Das Modul ist dann auf der Registerkarte <strong>%s</strong> sichtbar.
 ModulesMarketPlaces=Zusatzmodule/Erweiterungen
 ModulesDevelopYourModule=Eigene Anwendungen/Module entwickeln
 ModulesDevelopDesc=Sie können ihr eiges Modul programmieren oder einen Partner finden, der es für Sie programmiert.
@@ -271,7 +271,7 @@ SocialNetworkId=ID des sozialen Netzwerks
 ForDocumentationSeeWiki=Für Benutzer- oder Entwicklerdokumentation (Doc, FAQs...), <br> schauen Sie in das Dolibarr-Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 ForAnswersSeeForum=Für weitere Fragen/Hilfe können Sie das Dolibarr-Forum nutzen: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=In diesem Bereich finden Sie eine Übersicht an verfügbaren Quellen, bei denen Sie im Fall von Problemen und Fragen Unterstützung bekommen können.
-HelpCenterDesc2=Einige dieser Angebote sind nur in <b>Englisch</b> verfügbar. 
+HelpCenterDesc2=Einige dieser Angebote sind nur in <b>Englisch</b> verfügbar.
 CurrentMenuHandler=Aktuelle Menü-Handler
 MeasuringUnit=Maßeinheit
 LeftMargin=linker Rand
@@ -304,7 +304,7 @@ MAIN_MAIL_ENABLED_USER_DEST_SELECT=E-Mail-Adressen von Mitarbeitern (falls defin
 MAIN_MAIL_NO_WITH_TO_SELECTED=Keinen Standardempfänger auswählen, auch wenn nur einer zur Auswahl steht
 MAIN_MAIL_SENDMODE=Versandmethode
 MAIN_MAIL_SMTPS_ID=SMTP-Benutzer (falls der Server eine Authentifizierung benötigt)
-MAIN_MAIL_SMTPS_PW=SMTP-Passwort (falls der Server eine Authentifizierung benötigt) 
+MAIN_MAIL_SMTPS_PW=SMTP-Passwort (falls der Server eine Authentifizierung benötigt)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) Verschlüsselung verwenden
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
 MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Selbst-signierte Zertifikate erlauben
@@ -317,7 +317,7 @@ MAIN_SMS_SENDMODE=Methode zum Versenden von SMS
 MAIN_MAIL_SMS_FROM=Standard Versandrufnummer der SMS-Funktion
 MAIN_MAIL_DEFAULT_FROMTYPE=Vorausgewählte Standard-Absenderadresse in Formularen zum Senden von E-Mails
 UserEmail=E-Mail des Benutzers
-CompanyEmail=Unternehmens-E-Mail 
+CompanyEmail=Unternehmens-E-Mail
 FeatureNotAvailableOnLinux=Diese Funktion ist in Unix-Umgebungen nicht verfügbar. Testen Sie Ihr sendmail Programm lokal.
 FixOnTransifex=Die Übersetzung in der Online-Übersetzungs-Plattform des Projektes korrigieren
 SubmitTranslation=Wenn die Übersetzung für diese Sprache nicht vollständig ist oder Sie Fehler finden, können Sie dies korrigieren, indem Sie Dateien im Verzeichnis <b>langs/%s</b> bearbeiten und Ihre Änderung an www.transifex.com/dolibarr-association/dolibarr/ senden.
@@ -365,9 +365,9 @@ GenericMaskCodes=Sie können ein beliebiges Nummerierungsschema eingeben. Folgen
 GenericMaskCodes2= <b> {cccc} </b> Kundennummer mit n Zeichen <br> <b> {cccc000} </b> Kundennummer gefolgt von einer dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem globalen Zähler zurückgesetzt. <br> <b> {tttt} </b> Der Code für die Partnerart, abgeschnitten nach n Zeichen (siehe Menü Start - Einstellungen - Stammdaten - Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt. <br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> \nLeerzeichen sind nicht zulässig. <br>
 GenericMaskCodes3EAN=Alle anderen Zeichen der Maske bleiben unberührt (außer * oder ? an 13. Stelle in EAN13). <br>Leerzeichen sind nicht erlaubt.<br>Für EAN13 sollte das letzte Zeichen nach der letzten } an 13. Stelle ein * oder ? sein. Dies wird durch den berechneten Wert ersetzt.<br>
-GenericMaskCodes4a= <u> Beispiel auf der 99. %s des Geschäftspartners TheCompany, mit Datum 2023-01-31: </u>  <br> 
-GenericMaskCodes4b= <u> Beispiel für einen Geschäftspartner, erstellt am 31.01.2023: </u>  <br> 
-GenericMaskCodes4c= <u> Beispiel für ein Produkt, das am 31.01.2023 erstellt wurde: </u>  <br> 
+GenericMaskCodes4a= <u> Beispiel auf der 99. %s des Geschäftspartners TheCompany, mit Datum 2023-01-31: </u>  <br>
+GenericMaskCodes4b= <u> Beispiel für einen Geschäftspartner, erstellt am 31.01.2023: </u>  <br>
+GenericMaskCodes4c= <u> Beispiel für ein Produkt, das am 31.01.2023 erstellt wurde: </u>  <br>
 GenericMaskCodes5= <b> ABC{yy}{mm}-{000000} </b>  ergibt <b> ABC2301-000099 </b>  <br>  <b> {0000+100@1}-ZZZ/{dd}/XXX </b>  ergibt <b> 0199-ZZZ/31/XXX </b>  <br>  <b> IN{yy}{mm}-{0000}-{t} </b>  ergibt <b> IN2301-0099-A </b>  wenn der Unternehmenstyp „Responsable Inscripto“ ist und der Code für den Typ „A_RI“ lautet.
 GenericNumRefModelDesc=Liefert eine anpassbare Nummer nach vordefiniertem Schema
 ServerAvailableOnIPOrPort=Der Server ist unter der Adresse <b>%s</b> auf Port <b>%s</b> verfügbar.
@@ -417,7 +417,7 @@ PDFLocaltax=Regeln für %s
 HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer/MwSt. ausblenden
 HideDescOnPDF=Produktbeschreibung ausblenden
 HideRefOnPDF=Produkt-Ref.Nr. ausblenden
-ShowProductBarcodeOnPDF=Barcode-Nummer des Produkts anzeigen 
+ShowProductBarcodeOnPDF=Barcode-Nummer des Produkts anzeigen
 HideDetailsOnPDF=Details in den Produktpositionen ausblenden
 PlaceCustomerAddressToIsoLocation=Benutze Standardposition in Frankreich (La Poste) für Position der Kundenadresse
 Library=Bibliothek
@@ -484,7 +484,7 @@ InstalledInto=Installiert in Verzeichnis %s
 BarcodeInitForThirdparties=Alle Barcodes für Geschäftspartner initialisieren
 BarcodeInitForProductsOrServices=Alle Barcodes für Produkte oder Services initialisieren oder zurücksetzen
 CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> %s ohne Barcode.
-InitEmptyBarCode=Initialisierungswert für die %s leeren Barcodes 
+InitEmptyBarCode=Initialisierungswert für die %s leeren Barcodes
 EraseAllCurrentBarCode=alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcode-Werte löschen?
 AllBarcodeReset=alle Barcode-Werte wurden entfernt
@@ -530,7 +530,7 @@ ProductDocumentTemplates=Dokumentvorlage(n)
 ProductBatchDocumentTemplates=Dokumentvorlagen zum Generieren von Dokumenten zu Produktchargen
 FreeLegalTextOnExpenseReports=Freier Rechtstext auf Spesenabrechnungen
 WatermarkOnDraftExpenseReports=Wasserzeichen auf Ausgabenbelegentwurf (leerlassen wenn keines benötigt wird)
-ProjectIsRequiredOnExpenseReports=Für die Erfassung einer Spesenabrechnung ist die Angabe des Projekts verpflichtend 
+ProjectIsRequiredOnExpenseReports=Für die Erfassung einer Spesenabrechnung ist die Angabe des Projekts verpflichtend
 PrefillExpenseReportDatesWithCurrentMonth=Das Start- und Enddatum einer neuen Spesenabrechnung mit dem Start- und Enddatum des aktuellen Monats vorausfüllen
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Die Eingabe von Spesen immer als Bruttowerte mit Steuern erzwingen
 AttachMainDocByDefault=Setzen Sie die Einstellung auf <b>Ja</b>, wenn Sie standardmäßig das Hauptdokument an die E-Mail anhängen möchten (falls zutreffend)
@@ -667,7 +667,7 @@ Module2610Desc=Aktiviere der Dolibarr REST Serverdienst
 Module2660Name=WebServices aufrufen (SOAP Client)
 Module2660Desc=Aktivieren des Dolibarr-Webdienst-Clients \n(Kann verwendet werden, um Daten / Anforderungen an externe Server zu senden. Derzeit werden nur Bestellungen unterstützt.)
 Module2700Name=Gravatar
-Module2700Desc=Verwenden Sie den Online-Dienst 'Gravatar' (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung. 
+Module2700Desc=Verwenden Sie den Online-Dienst 'Gravatar' (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung.
 Module2800Desc=FTP-Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind Konvertierung
@@ -701,7 +701,7 @@ Module50200Name=PayPal
 Module50200Desc=Bieten Sie Kunden eine PayPal-Online-Zahlungsseite (PayPal-Konto oder Kredit- / Debitkarten). Dies kann verwendet werden, um Ihren Kunden Ad-hoc-Zahlungen oder Zahlungen in Bezug auf ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung usw.) zu ermöglichen.
 Module50300Name=Stripe
 Module50300Desc=Bietet Kunden eine Stripe-Online-Zahlungsseite an (Kredit-/Debit-Karten). Diese Seite kann verwendet werden, um Ihren Kunden Ad-hoc-Zahlungen oder Zahlungen mit Bezug auf ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung etc...) zu ermöglichen.
-Module50400Name=Buchhaltung (erweitert) 
+Module50400Name=Buchhaltung (erweitert)
 Module50400Desc=Buchhaltungsmanagement (doppelte Einträge, Unterstützung von Haupt- und Nebenbüchern). Exportieren Sie das Hauptbuch in verschiedene andere Buchhaltungssoftwareformate.
 Module54000Name=PrintIPP
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein, auf dem Server muss CUPS installiert sein)
@@ -737,7 +737,7 @@ Permission27=Angebote löschen
 Permission28=Angebote exportieren
 Permission31=Produkte/Leistungen einsehen
 Permission32=Produkte/Leistungen erstellen/bearbeiten
-Permission33=Preise für Produkte einsehen 
+Permission33=Preise für Produkte einsehen
 Permission34=Produkte/Leistungen löschen
 Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
@@ -750,7 +750,7 @@ Permission61=Serviceaufträge einsehen
 Permission62=Serviceaufträge erstellen/bearbeiten
 Permission64=Serviceaufträge löschen
 Permission67=Leistungen exportieren
-Permission68=Serviceaufträge per E-Mail versenden 
+Permission68=Serviceaufträge per E-Mail versenden
 Permission69=Serviceaufträge freigeben
 Permission70=Freigabe für Serviceaufträge rückgängig machen
 Permission71=Mitglieder einsehen
@@ -964,11 +964,11 @@ Permission1191=Exportieren Sie Lieferantenaufträge und deren Attribute
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
 Permission1231=Lieferantenrechnungen (und Zahlungen) einsehen
-Permission1232=Lieferantenrechnungen (Eingangsrechnungen) erstellen/bearbeiten 
-Permission1233=Lieferantenrechnungen freigeben 
+Permission1232=Lieferantenrechnungen (Eingangsrechnungen) erstellen/bearbeiten
+Permission1233=Lieferantenrechnungen freigeben
 Permission1234=Lieferantenrechnungen löschen
-Permission1235=Lieferantenrechnungen per E-Mail versenden 
-Permission1236=Lieferantenrechnungen & -zahlungen exportieren 
+Permission1235=Lieferantenrechnungen per E-Mail versenden
+Permission1236=Lieferantenrechnungen & -zahlungen exportieren
 Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
@@ -1007,8 +1007,8 @@ Permission10001=Website-Inhalt einsehen
 Permission10002=Erstellen/Bearbeiten von Website-Inhalten (HTML und JavaScript)
 Permission10003=Erstelle/Bearbeite Website-Inhalte (dynamischer PHP-Code).  Gefährlich, dies muss auf ausgewählte Entwickler beschränkt werden.
 Permission10005=Inhalt der Website löschen
-Permission20001=Urlaubsanträge einsehen (eigene und die der unterstellten Mitarbeiter) 
-Permission20002=Urlaubsanträge anlegen/bearbeiten (eigene und die der unterstellten Mitarbeiter) 
+Permission20001=Urlaubsanträge einsehen (eigene und die der unterstellten Mitarbeiter)
+Permission20002=Urlaubsanträge anlegen/bearbeiten (eigene und die der unterstellten Mitarbeiter)
 Permission20003=Lösche Urlaubsanträge
 Permission20004=Alle Urlaubsanträge einsehen (auch die von nicht unterstellten Mitarbeitern)
 Permission20005=Urlaubsanträge für alle erstellen/bearbeiten (auch die von nicht unterstellten Mitarbeitern)
@@ -1064,7 +1064,7 @@ Permission941603=Quittungen freigeben
 Permission941604=Quittungen per E-Mail senden
 Permission941605=Quittungen exportieren
 Permission941606=Quittungen löschen
-DictionaryCompanyType=Geschäftspartner-Arten 
+DictionaryCompanyType=Geschäftspartner-Arten
 DictionaryCompanyJuridicalType=Rechtsformen der Geschäftspartner
 DictionaryProspectLevel=Level für Interessentenstatus - Unternehmen
 DictionaryProspectContactLevel=Level für Interessentenstatus - Kontakte
@@ -1117,7 +1117,7 @@ EntryDeleted=Eintrag gelöscht
 BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Stammdaten-Übersicht
 TypeOfRevenueStamp=Art der Steuermarke
-VATManagement=MwSt-Verwaltung 
+VATManagement=MwSt-Verwaltung
 VATIsUsedDesc=Standardmäßig basiert die Umsatzsteuer beim Erstellen von Leads, Rechnungen, Bestellungen usw. den aktiven Standardregeln:<br>Wenn der Verkäufer nicht der Umsatzsteuer unterliegt, dann wird die Umsatzsteuer standardmäßig auf 0 gesetzt. Ende der Regel.<br>Wenn (Land des Verkäufers = Land des Käufers), dann entspricht die Umsatzsteuer standardmäßig der Umsatzsteuer des Produkts im Land des Verkäufers. Ende der Regel.<br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Union befinden und die Güter sind zu transportierende Produkte (Abholung, Versand, Luftfracht), ist der Standardwert-Umsatzsteuersatz 0. Diese Regel hängt vom Land des Verkäufers ab – bitte wenden Sie sich an Ihren Buchhalter. Die USt. sollte vom Käufer in seinem Land bezahlt werden und und vom Verkäufer. Ende der Regel.<br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Union befinden und der Käufer ist kein Unternehmen (mit einem registrierten innergemeinschaftlichen USt.-ID), dann entspricht die USt. standardmäßig dem USt.-Satz im Land des Verkäufers. Ende der Regel.<br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Union befinden und der Käufer ist ein Unternehmen (mit einer registrierten innergemeinschaftlichen USt.-ID), dann ist die USt. standardmäßig 0. Ende der Regel.<br>In allen anderen Fällen ist der vorgeschlagene Standardwert der 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.
@@ -1197,6 +1197,7 @@ Skin=grafische Oberfläche
 DefaultSkin=Standardvorlage grafische Oberfläche
 MaxSizeList=Maximale Listenlänge
 DefaultMaxSizeList=Voreinstellung maximale Anzahl Zeilen für Listen
+DisplayGrandTotalInList=Zeigen Sie die Gesamtsumme (für alle Seiten) im Fußbereich der Listen an.
 DefaultMaxSizeShortList=Standard für maximale Länge bei kurzen Listen (z.B. Kundenkarte)
 MessageOfDay=Nachricht des Tages<br>(wird ganz oben auf der Startseite angezeigt)
 MessageLogin=Nachricht auf der Anmeldeseite
@@ -1345,7 +1346,7 @@ MAIN_PROXY_HOST=Proxyserver: IP-Adresse/DNS-Name
 MAIN_PROXY_PORT=Proxyserver: Port
 MAIN_PROXY_USER=Proxyserver: Benutzername
 MAIN_PROXY_PASS=Proxyserver: Passwort
-DefineHereComplementaryAttributes=Definieren Sie alle ergänzenden Attribute, die hinzugefügt werden sollen: 
+DefineHereComplementaryAttributes=Definieren Sie alle ergänzenden Attribute, die hinzugefügt werden sollen:
 ExtraFields=Ergänzende Attribute
 ExtraFieldsLines=Ergänzende Attribute (zu Positionen/Zeilen)
 ExtraFieldsLinesRec=Ergänzende Attribute (Positionen in Rechnungsvorlagen)
@@ -1419,10 +1420,10 @@ PasswordGenerationPerso=Ein Passwort entsprechend der persönlich definierten Ko
 SetupPerso=Nach Ihrer Konfiguration
 PasswordPatternDesc=Beschreibung für Passwortmuster
 ##### Users setup #####
-RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörtern 
+RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörtern
 DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
 UsersSetup=Einstellungen Modul Benutzer
-UserMailRequired=Für das Anlegen eines neuen Benutzers ist eine E-Mail-Adresse erforderlich 
+UserMailRequired=Für das Anlegen eines neuen Benutzers ist eine E-Mail-Adresse erforderlich
 UserHideInactive=Inaktive Benutzer aus allen Kombinationslisten von Benutzern ausblenden (Nicht empfohlen: dies kann bedeuten, dass Sie auf einigen Seiten nicht nach alten Benutzern filtern oder suchen können)
 UserHideExternal=Verbergen Sie externe Benutzer (nicht mit einem Geschäftspartner verknüpft) in allen Combo-Auswahllisten für Benutzer (nicht empfohlen: dies hat zur Folge, dass Sie externe Benutzer auf einigen Seiten nicht filtern oder suchen können)
 UserHideNonEmployee=Verbergen Sie alle Benutzer, die keine Mitarbeiter sind, in allen Combo-Auswahllisten für Benutzer (nicht empfohlen: dies hat zur Folge, dass Sie auf einigen Seiten Nicht-Mitarbeiter-Benutzer nicht filtern oder suchen können)
@@ -1442,7 +1443,7 @@ ModelModules=Dokumentenvorlage(n)
 DocumentModelOdt=Generiere Dokumente aus OpenDocument Vorlagen (.ODT / .ODS Dateien aus LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
 JSOnPaimentBill=Feature aktivieren, um Zahlungs-Zeilen in Zahlungs-Formularen automatisch zu füllen
-CompanyIdProfChecker=Regeln für gewerbliche Identifikationsnummern 
+CompanyIdProfChecker=Regeln für gewerbliche Identifikationsnummern
 MustBeUnique=Muss es eindeutig sein ?
 MustBeMandatory=Erforderlich um Drittanbieter zu erstellen (falls Ust.Id oder Firmenart definiert ist) ?
 MustBeInvoiceMandatory=Erforderlich, um Rechnungen freizugeben ?
@@ -1853,7 +1854,7 @@ AGENDA_REMINDER_BROWSER_SOUND = Aktiviere Tonbenachrichtigung
 AGENDA_REMINDER_EMAIL = Aktiviere die Ereigniserinnerung <b> per E-Mail </b> (Erinnerungsoption / Verzögerung kann für jedes Ereignis definiert werden).
 AGENDA_REMINDER_EMAIL_NOTE = Hinweis: Die Häufigkeit des geplanten Jobs %s muss ausreichend sein, um sicherzustellen, dass die Erinnerung zum richtigen Zeitpunkt gesendet wird.
 AGENDA_SHOW_LINKED_OBJECT = Verknüpfte Objekte in Agenda anzeigen
-AGENDA_USE_EVENT_TYPE = Verwenden der Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Stammdaten-> Ereignissarten) 
+AGENDA_USE_EVENT_TYPE = Verwenden der Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Stammdaten-> Ereignissarten)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
 PasswordTogetVCalExport = Passwort für den VCal-Export
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
@@ -1918,7 +1919,7 @@ SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
 IfSetToYesDontForgetPermission=Wenn ein Wert ungleich Null festgelegt ist, vergessen Sie nicht, Berechtigungen für Gruppen oder Benutzer bereitzustellen, die für die zweite Genehmigung zugelassen sind
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP-Maxmind Moduleinstellungen
-PathToGeoIPMaxmindCountryDataFile=Pfad zur Maxmind-Datei mit der Zuordnung von IPs zu Ländern 
+PathToGeoIPMaxmindCountryDataFile=Pfad zur Maxmind-Datei mit der Zuordnung von IPs zu Ländern
 NoteOnPathLocation=Bitte beachten Sie, dass Ihre IP-Länder-Datei in einem von PHP lesbaren Verzeichnis liegen muss (Überprüfen Sie Ihre PHP open_basedir-Einstellungen und die Dateisystem-Berechtigungen).
 YouCanDownloadFreeDatFileTo=Eine <b>kostenlose Demo-Version</b> der Maxmind-GeoIP Datei finden Sie hier: %s
 YouCanDownloadAdvancedDatFileTo=Eine <b>vollständigere Version mit Updates</b> der Maxmind-GeoIP Datei können Sie hier herunterladen: %s
@@ -2110,7 +2111,7 @@ GDPRContact=Datenschutzbeauftragte(r)
 GDPRContactDesc=Wenn Sie personenbezogene Daten in Ihrem Informationssystem speichern, können Sie hier den für die Datenschutz-Grundverordnung (DSGVO) zuständigen Ansprechpartner benennen
 HelpOnTooltip=Anzeigen des Hilfetextes im Tooltip
 HelpOnTooltipDesc=Fügen Sie hier Text oder einen Übersetzungsschlüssel ein, damit der Text in einer QuickInfo angezeigt wird, wenn dieses Feld in einem Formular angezeigt wird
-YouCanDeleteFileOnServerWith=Löschen dieser Datei auf dem Server mit diesem Kommandozeilenbefehl <br>%s 
+YouCanDeleteFileOnServerWith=Löschen dieser Datei auf dem Server mit diesem Kommandozeilenbefehl <br>%s
 ChartLoaded=Kontenplan ist geladen
 SocialNetworkSetup=Einstellungen vom Modul für Soziale Medien
 EnableFeatureFor=Aktiviere Features für <strong>%s</strong>
@@ -2136,8 +2137,8 @@ MailboxSourceDirectory=Quellverzechnis des eMail-Kontos
 MailboxTargetDirectory=Zielverzechnis des eMail-Kontos
 EmailcollectorOperations=Aktivitäten, die der eMail-Collector ausführen soll
 EmailcollectorOperationsDesc=Operationen werden von oben nach unten ausgeführt
-MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden E-Mails je Collect-Vorgang 
-TestCollectNow=Collect testen 
+MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden E-Mails je Collect-Vorgang
+TestCollectNow=Collect testen
 CollectNow=Jetzt abrufen
 ConfirmCloneEmailCollector=Möchten Sie den E-Mail-Collector %s wirklich duplizieren?
 DateLastCollectResult=Datum des letzten eMail-Collect-Versuchs
@@ -2168,8 +2169,8 @@ LoadThirdPartyFromName=Drittanbieter-Suche auf %s laden (nur laden)
 LoadThirdPartyFromNameOrCreate=Drittanbieter-Suche auf %s laden (erstellen, wenn nicht gefunden)
 LoadContactFromEmailOrCreate=Kontakt aus %s entnehmen (erstellen, wenn nicht gefunden)
 AttachJoinedDocumentsToObject=Speichern Sie angehängte Dateien als Dokumente eines Objekts, wenn die Referenz des Objekts im Betreff der E-Mail gefunden wird.
-WithDolTrackingID=Nachricht einer Unterhaltung die durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
-WithoutDolTrackingID=Nachricht einer Unterhaltung die NICHT durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
+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
 WithoutDolTrackingIDInMsgId=Nachricht NICHT von Dolibarr gesendet
 CreateCandidature=Stellen-Bewerbung erstellen
@@ -2203,7 +2204,7 @@ DebugBar=Debug-Leiste
 DebugBarDesc=Symbolleiste, die mit einer Vielzahl von Werkzeugen ausgestattet ist, um das Debuggen zu vereinfachen.
 DebugBarSetup=Debug-Leiste Einstellungen
 GeneralOptions=Allgemeine Optionen
-LogsLinesNumber=Zahl der Zeilen, die auf der Registerkarte Logs angezeigt werden sollen 
+LogsLinesNumber=Zahl der Zeilen, die auf der Registerkarte Logs angezeigt werden sollen
 UseDebugBar=Verwenden Sie die Debug-Leiste
 DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen
 WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich.
@@ -2241,7 +2242,7 @@ PDF_SHOW_PROJECT=Projekt im Dokument anzeigen
 ShowProjectLabel=Projektbezeichnung
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Den Namen des Geschäftspartners um Alias ergänzen
 THIRDPARTY_ALIAS=Name des Geschäftspartners - Alias des Geschäftspartners
-ALIAS_THIRDPARTY=Alias des Geschäftspartners – Name des Geschäftspartners 
+ALIAS_THIRDPARTY=Alias des Geschäftspartners – Name des Geschäftspartners
 PDFIn2Languages=Bezeichnungen im PDF in zwei verschiedenen Sprachen anzeigen (diese Funktion funktioniert möglicherweise bei einigen Sprachen nicht)
 PDF_USE_ALSO_LANGUAGE_CODE=Wenn Sie möchten, dass einige Texte in Ihrem PDF in 2 verschiedenen Sprachen in demselben generierten PDF dupliziert werden, müssen Sie hier diese zweite Sprache festlegen, damit das generierte PDF zwei verschiedene Sprachen auf derselben Seite enthält, die beim Generieren von PDF ausgewählte und diese (dies wird nur von wenigen PDF-Vorlagen unterstützt). Für 1 Sprache pro PDF leer halten.
 PDF_USE_A=PDF-Dokumente im Format PDF/A erstellen anstelle des Standardformats PDF
@@ -2331,7 +2332,7 @@ ModuleWebhookDesc = Schnittstelle zum Abfangen von Dolibarr-Triggern und Senden
 WebhookSetup = Webhook-Einrichtung
 WebhookSetupPage = Webhook-Einrichtungsseite
 ShowQuickAddLink=Eine Schaltfläche zum schnellen Hinzufügen eines Elements im oberen rechten Menü anzeigen
-ShowSearchAreaInTopMenu=Suchbereich im oberen Menü anzeigen 
+ShowSearchAreaInTopMenu=Suchbereich im oberen Menü anzeigen
 HashForPing=Für den Ping verwendeter Hash
 ReadOnlyMode=Ist eine Instanz im "Read Only"-Modus
 DEBUGBAR_USE_LOG_FILE=Die Datei <b>dolibarr.log</b> verwenden, um Protokolldaten zu erfassen
@@ -2343,8 +2344,8 @@ IconAndText=Icon und Text
 TextOnly=Nur Text
 IconOnlyAllTextsOnHover=Nur Icon - Alle Texte erscheinen unter dem Icon, wenn Sie mit der Maus über die Menüleiste fahren
 IconOnlyTextOnHover=Nur Icon – Der Text des Icons wird angezeigt, wenn Sie mit der Maus über das Icon fahren
-IconOnly=Nur Icon - Der Text wird als Tooltipp angezeigt 
-INVOICE_ADD_ZATCA_QR_CODE=Den ZATCA-QR-Code auf Rechnungen anzeigen 
+IconOnly=Nur Icon - Der Text wird als Tooltipp angezeigt
+INVOICE_ADD_ZATCA_QR_CODE=Den ZATCA-QR-Code auf Rechnungen anzeigen
 INVOICE_ADD_ZATCA_QR_CODEMore=Einige arabische Länder benötigen diesen QR-Code auf ihren Rechnungen
 INVOICE_ADD_SWISS_QR_CODE=Schweizer QR-Rechnungscode auf Rechnungen anzeigen
 INVOICE_ADD_SWISS_QR_CODEMore=Schweizer Standard für Rechnungen; Stellen Sie sicher, dass PLZ und Ort ausgefüllt sind und dass die Konten über gültige Schweizer/Liechtenstein-IBANs verfügen.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=Es ist möglich, einen Alias für das Web Server und
 ExportUseForce=Parameter -f verwenden
 ExportUseForceHelp=Erzwingen Sie die Fortsetzung des Exports, auch wenn ein Fehler gefunden wird (Backup ist möglicherweise nicht zuverlässig verwendbar).
 CustomPrompt=Benutzerdefinierte Prompts
+AiDescription=KI-Funktionen (Künstliche Intelligenz).
+AiDescriptionLong=Bietet KI (Künstliche Intelligenz) Funktionen in verschiedenen Teilen der Anwendung. Externe KI-API erforderlich.
+AI_KEY_API_CHATGPT= Schlüssel für ChatGPT IA API
+AiSetup=Konfiguration AI Modul
+AiCustomPrompt=Benutzerdefiniertes KI-Prompt
+AI_CONFIGURATIONS_PROMPT=Benutzerdefiniertes Prompt
+ImageGeneration=Bilderzeugung
+AIPromptForFeatures=Benitzerdefinierte KI-Prompts für Funktionen
+EnterAnIP=IP-Adresse eingeben
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index 71afe56ceae..062f21687db 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -29,7 +29,7 @@ RestrictYearToExport=Beschränke Zeitraum (Monat/Jahr) für den Export
 BlockedLogEnabled=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde aktiviert
 BlockedLogDisabled=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde deaktiviert, nachdem schon einige Aufzeichnungen durchgeführt wurden. Es wurde ein spezieller Fingerabdruck gespeichert, um die Kette als gebrochen zu markieren
 BlockedLogDisabledBis=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde deaktiviert. Dies ist möglich, da noch keine Aufzeichnungen vorgenommen wurden.
-LinkHasBeenDisabledForPerformancePurpose=Aus Leistungsgründen wird der direkte Link zum Dokument nach der 100. Zele nicht angezeigt.<span class='notranslate'>
+LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
 
 ## logTypes
 logBILL_DELETE=Kundenrechnung automatisch gelöscht
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
index ca3f4530e42..a4fcce16d58 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/langs/de_DE/bookmarks.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - marque pages / bookmarks
 
 AddThisPageToBookmarks = Aktuelle Ansicht zu Lesezeichen hinzufügen
-BehaviourOnClick = Öffnungsverhalten
+BehaviourOnClick = Verhalten, wenn eine Lesezeichen-URL ausgewählt wird
 Bookmark = Lesezeichen
 Bookmarks = Lesezeichen
 BookmarkTargetNewWindowShort = Neuer Tab
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 3ccbff5761c..f13f344dbeb 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Geplante Aufgabe einsehen
 Permission23102 = Erstelle/aktualisiere geplanten Job
 Permission23103 = Lösche geplanten Job
@@ -14,7 +13,7 @@ FileToLaunchCronJobs=Befehlszeile zum Überprüfen und Starten von qualifizierte
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
 CronExplainHowToRunWin=In Microsoft™ Windows Umgebungen können Sie die Aufgabenplanung benutzen, um die Kommandozeile alle 5 Minuten aufzurufen.
 CronMethodDoesNotExists=Die Klasse %s enthält keine Methode %s
-CronMethodNotAllowed=Die Methode %s der Klasse %s befindet sich in der schwarzen Liste der verbotenen Methoden
+CronMethodNotAllowed=Die Methode %s der Klasse %s befindet sich in der Sperrliste der verbotenen Methoden
 CronJobDefDesc=Cron-Jobprofile sind in der Moduldeskriptordatei definiert. Wenn das Modul aktiviert ist, sind diese geladen und verfügbar, so dass Sie die Jobs über das Menü admin tools %s verwalten können.
 CronJobProfiles=Liste vordefinierter Cron-Job Profile
 # Menu
@@ -91,6 +90,7 @@ WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bi
 DATAPOLICYJob=Datenbereiniger und Anonymisierer
 JobXMustBeEnabled=Job %s muss aktiviert sein
 EmailIfError=E-Mail zur Warnung bei Fehler
+JobNotFound=Job %s wurde in der Liste der Jobs nicht gefunden (versuchen Sie, das Modul zu deaktivieren/aktivieren)
 ErrorInBatch=Fehler beim Ausführen des Jobs %s
 
 # Cron Boxes
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 888e699b1f8..398174fb3af 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Anzahl der Dokumente im Verzeichnis
 ECMSection=Verzeichnis
 ECMSectionManual=Manueller Ordner
 ECMSectionAuto=Automatischer Ordner
-ECMSectionsManual=Manuelle Hierarchie
-ECMSectionsAuto=Automatische Hierarchie
-ECMSectionsMedias=Verzeichnisbaum Medien
+ECMSectionsManual=Private manuelle Hierarchie
+ECMSectionsAuto=Private automatische Hierarchie
+ECMSectionsMedias=Öffentliche Hierarchie
 ECMSections=Verzeichnisse (Ordner)
 ECMRoot=Stammverzeichnis
 ECMNewSection=Neuer Ordner
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Anzahl der Dateien in Unterverzeichnissen
 ECMCreationUser=Autor
 ECMArea=DMS/ECM Bereich
 ECMAreaDesc=Der Bereich DMS/ECM (Document Management System / Electronic Content Management) ermöglicht Ihnen das schnelle Speichern, Teilen und Durchsuchen von Dokumenten aller Art in Dolibarr.
-ECMAreaDesc2a=* Manuelle Verzeichnisse können verwendet werden, um Dokumente zu speichern, die nicht mit einem bestimmten Element verknüpft sind.
+ECMAreaDesc2a=* Manuelle Verzeichnisse können zum Speichern von Dokumenten mit freier Organisation der Speicherhierarchie verwendet werden.
 ECMAreaDesc2b=* Automatische Verzeichnisse werden automatisch gefüllt, wenn Dokumente von der Seite eines Elements hinzugefügt werden.
-ECMAreaDesc3=* Medienverzeichnisse sind Dateien im Unterverzeichnis <b> /medias </b> des Dokumentenverzeichnisses, die von jedem gelesen werden können, ohne dass eine Anmeldung erforderlich ist und die Datei nicht explizit freigegeben werden muss. Darin werden beispielsweise Bilddateien für das E-Mail- oder Website-Modul gespeichert.
+ECMAreaDesc3=* Öffentliche Verzeichnisse sind Dateien im Unterverzeichnis <b> /medias </b> des Dokumentenverzeichnisses, die von jedem gelesen werden können, ohne dass eine Anmeldung erforderlich ist und es ist nicht erforderlich, dass die Datei explizit freigegeben wird. Es wird zum Beispiel zum Speichern von Bilddateien für das E-Mail- oder Website-Modul verwendet.
 ECMSectionWasRemoved=Verzeichnis <b>%s</b> wurde gelöscht.
 ECMSectionWasCreated=Verzeichnis <b>%s</b> wurde erstellt.
 ECMSearchByKeywords=Suche nach Stichwörtern
@@ -45,7 +45,7 @@ ExtraFieldsEcmFiles=Extrafelder DMS/ECM-Dateien
 ExtraFieldsEcmDirectories=Extrafelder DMS/ECM-Verzeichnisse
 ECMSetup=DMS/ECM-Einstellungen
 GenerateImgWebp=Erstelle ein Duplikat aller Bilder im .webp-Format, sofern diese in einem anderen Dateiformat vorliegen
-ConfirmGenerateImgWebp=Wenn Sie bestätigen, generieren Sie für alle Bilder, die sich derzeit in diesem Ordner befinden, ein Bild im .webp-Format (Unterordner werden nicht berücksichtigt)...
+ConfirmGenerateImgWebp=Wenn Sie bestätigen, generieren Sie ein Bild im .webp-Format für alle Bilder, die sich derzeit in diesem Ordner befinden (Unterordner sind nicht enthalten, webp-Bilder werden nicht generiert, wenn die Größe größer als das Original ist) ...
 ConfirmImgWebpCreation=Bestätigen Sie die Duplizierung aller Bilder
 GenerateChosenImgWebp=Ausgewähltes Bild mit einer anderen Version im .webp-Format duplizieren
 ConfirmGenerateChosenImgWebp=Wenn Sie bestätigen, generieren Sie ein Bild im .webp-Format für das Bild %s
diff --git a/htdocs/langs/de_DE/eventorganization.lang b/htdocs/langs/de_DE/eventorganization.lang
index d577b75f3cc..059fecd841c 100644
--- a/htdocs/langs/de_DE/eventorganization.lang
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -43,7 +43,7 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorie, die Drittanbietern hinzuge
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Vorlage einer E-Mail, die nach Erhalt eines Vorschlags für einen Konferenzbeitrag gesendet werden soll.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Vorlage einer E-Mail, die nach Erhalt eines Standvorschlags gesendet werden soll.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = E-Mail-Vorlage, die nach der Bezahlung eines registrierten Standes gesendet wird.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E-Mail-Vorlage, die nach der Bezahlung der Anmeldung zu einer Veranstaltung gesendet wird. 
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E-Mail-Vorlage, die nach der Bezahlung der Anmeldung zu einer Veranstaltung gesendet wird.
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = E-Mail-Vorlage, die verwendet werden soll, wenn E-Mails durch Massenaktion "E-Mails senden" an Redner gesendet werden
 EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = E-Mail-Vorlage, die verwendet werden soll, wenn E-Mails durch Massenaktion „E-Mails senden“ an Teilnehmer gesendet werden
 EVENTORGANIZATION_FILTERATTENDEES_CAT = Schränkt im Formular zum Erstellen/Hinzufügen eines Teilnehmers die Liste der Geschäftspartner auf diejenigen aus der Kategorie ein
@@ -88,6 +88,7 @@ PriceOfRegistration=Kosten für die Teilnahme
 PriceOfRegistrationHelp=Preis für die Anmeldung/Teilnahme an der Veranstaltung
 PriceOfBooth=Buchungskosten für einen Stand
 PriceOfBoothHelp=Buchungskosten für einen Stand
+EventOrganizationICSLinkProject=ICS-Verknüpfung für das Ereignis
 EventOrganizationICSLink=Verknüpfe Kalenderdaten (ICS) für Vorträge
 ConferenceOrBoothInformation=Informationen zu Konferenzbeitrag oder Stand
 Attendees=Teilnehmer
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 5afef9047ea..eb8c39cc569 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -59,7 +59,7 @@ CheckToCreateDatabase=Aktivieren Sie das Kontrollkästchen, wenn die Datenbank n
 CheckToCreateUser=Aktivieren Sie das Kontrollkästchen, wenn: <br> das Datenbankbenutzerkonto noch nicht vorhanden ist und daher erstellt werden muss, oder <br>, wenn das Benutzerkonto vorhanden ist, die Datenbank jedoch nicht vorhanden ist und Berechtigungen erteilt werden müssen. <br> In diesem Fall müssen Sie das Benutzerkonto und das Kennwort sowie <b> sowie </b> den Namen und das Kennwort des Superuser-Kontos am Ende dieser Seite eingeben. Wenn dieses Kontrollkästchen deaktiviert ist, müssen Datenbankeigentümer und Kennwort bereits vorhanden sein.
 DatabaseRootLoginDescription=Superuser-Kontoname (zum Erstellen neuer Datenbanken oder neuer Benutzer), obligatorisch, wenn die Datenbank oder ihr Besitzer noch nicht vorhanden ist.
 KeepEmptyIfNoPassword=Leer lassen, wenn der Superuser kein Passwort hat (NICHT empfohlen)
-SaveConfigurationFile=Konfigurationsdaten werden gespeichert 
+SaveConfigurationFile=Konfigurationsdaten werden gespeichert
 ServerConnection=Serververbindung
 DatabaseCreation=Erstellung der Datenbank
 CreateDatabaseObjects=Anlegen der Datenbankobjekte
@@ -71,8 +71,8 @@ OtherKeysCreation=Erstellen der Fremdschlüssel und Indizes
 FunctionsCreation=Erstellen der Funktionen
 AdminAccountCreation=Erstellen des Administrationskontos
 PleaseTypePassword=Bitte geben Sie ein Passwort ein. Leere Passwörter sind nicht erlaubt.
-PleaseTypeALogin=Bitte geben Sie den Benutzernamen ein. 
-PasswordsMismatch=Die eingegebenen Passwörter stimmen nicht überein. \nBitte versuchen Sie es erneut! 
+PleaseTypeALogin=Bitte geben Sie den Benutzernamen ein.
+PasswordsMismatch=Die eingegebenen Passwörter stimmen nicht überein. \nBitte versuchen Sie es erneut!
 SetupEnd=Ende der Erstkonfiguration
 SystemIsInstalled=Die Installation wurde erfolgreich abgeschlossen.
 SystemIsUpgraded=Der Aktualisierungsvorgang wurde erfolgreich abgeschlossen.
@@ -102,14 +102,14 @@ UpgradeDesc=Verwenden Sie diesen Modus zum Ersetzen Ihrer bisherigen Dolibarr-Ve
 Start=Start
 InstallNotAllowed=Die in der Konfigurationsdatei <b>conf.php</b> gesetzten Berechtigungen verhindern eine Ausführung des Installationsvorganges.
 YouMustCreateWithPermission=Für den Installationsvorgang erstellen Sie bitte die Datei %s und machen Sie diese für Ihren Webserver beschreibbar.
-CorrectProblemAndReloadPage=Bitte beheben Sie das Problem und drücken anschließend auf F5 um die Seite neu zu laden. 
+CorrectProblemAndReloadPage=Bitte beheben Sie das Problem und drücken anschließend auf F5 um die Seite neu zu laden.
 AlreadyDone=Migration bereits durchgeführt
 DatabaseVersion=Datenbankversion
 ServerVersion=Version des Datenbankservers
 YouMustCreateItAndAllowServerToWrite=Bitte erstellen Sie dieses Verzeichnis und machen Sie dieses für Ihren Webserver beschreibbar.
 DBSortingCollation=Reihenfolge der Zeichensortierung
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Sie haben die Option Datenbank <b>%s</b> erstellen ausgewählt. Hierfür benötigt Dolibarr eine Verbindung zum Server <b>%s</b> mit den Berechtigungen des Super-Users<b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Sie möchten den Datenbank-Benutzer <b> %s </b> erstellen. Dafür benötigt Dolibarr jedoch eine Serververbindung <b> %s </b> mit super user <b>%s</b> Berechtigungen. 
+YouAskLoginCreationSoDolibarrNeedToConnect=Sie möchten den Datenbank-Benutzer <b> %s </b> erstellen. Dafür benötigt Dolibarr jedoch eine Serververbindung <b> %s </b> mit super user <b>%s</b> Berechtigungen.
 BecauseConnectionFailedParametersMayBeWrong=Die Datenbankverbindung ist fehlgeschlagen: Die Host- oder Superuser-Parameter sind falsch.
 OrphelinsPaymentsDetectedByMethod=Verwaiste Zahlung gefunden durch Methode %s
 RemoveItManuallyAndPressF5ToContinue=Bitte manuell entfernen und F5 drücken um fortzufahren.
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Migrieren Sie den Versand für die Speicherung vo
 MigrationShippingDelivery=Aktualisiere die Speicherung von Lieferungen (Versandart?)
 MigrationShippingDelivery2=Aktualisiere die Speicherung von Lieferungen 2 (Versandart 2?)
 MigrationFinished=Migration abgeschlossen
-LastStepDesc=<strong>Fast geschafft</strong>: Legen Sie hier Benutzername und Passwort des Administrators für Dolibarr fest. <b>Bewahren Sie diese Daten gut auf, da es sich hierbei um das Administratorkonto handelt, über das alle anderen Benutzerkonten verwaltet werden.</b>
+LastStepDesc=<strong>Letzter Schritt</strong>: Legen Sie hier Benutzername und Passwort des Administrators für Dolibarr fest. <b>Bewahren Sie diese Daten gut auf, da es sich hierbei um das Administratorkonto handelt, über das alle anderen Benutzerkonten verwaltet werden.</b>
 ActivateModule=Aktivieren von Modul %s
 ShowEditTechnicalParameters=Hier klicken um erweiterte Funktionen zu zeigen/bearbeiten (Expertenmodus)
 WarningUpgrade=Warnung:\nHaben Sie ein Datenbank Backup erstellt?\nDies wird unbedingt empfohlen. Datenverluste (durch Fehler in der mysql Version 5.5.40/41/42/43) können durch diesen Prozess auftreten, daher ist ein komplettes Datenbank-Backup vor jeder Migration unumgänglich.\n\nKlicke auf OK , um die Migration zu starten...
@@ -190,7 +190,7 @@ MigrationProjectTaskActors=Datenmigration für Tabelle llx_projet_task_actors
 MigrationProjectUserResp=Datenmigration des Feldes fk_user_resp von llx_projet nach llx_element_contact
 MigrationProjectTaskTime=Aktualisiere aufgewandte Zeit (in Sekunden)
 MigrationActioncommElement=Aktualisiere die Termine/Aufgaben
-MigrationPaymentMode=Migration der Daten für die Zahlungsart 
+MigrationPaymentMode=Migration der Daten für die Zahlungsart
 MigrationCategorieAssociation=Migration von Kategorien
 MigrationEvents=Ereignisse migrieren, um den Ereigniseigentümer in die Zuordnungstabelle aufzunehmen
 MigrationEventsContact=Ereignisse migrieren, um den Ereigniskontakt in die Zuordnungstabelle aufzunehmen
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 658581c66df..8311d9ec40a 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -14,28 +14,31 @@ InterventionContact=Kontakte/Adressen
 DeleteIntervention=Serviceauftrag löschen
 ValidateIntervention=Serviceauftrag freigeben
 ModifyIntervention=Serviceauftrag ändern
+CloseIntervention=Serviceauftrag schließen
 DeleteInterventionLine=Position im Serviceauftrag löschen
 ConfirmDeleteIntervention=Möchten Sie diesen Serviceauftrag wirklich löschen?
 ConfirmValidateIntervention=Sind Sie sicher, dass Sie den Serviceauftrag <b>%s</b> freigeben wollen?
 ConfirmModifyIntervention=Möchten Sie diesen Serviceauftrag wirklich ändern?
+ConfirmCloseIntervention=Sind Sie sicher, dass Sie diesen Serviceauftrag schließen wollen?
 ConfirmDeleteInterventionLine=Möchten Sie diese Serviceauftragsposition wirklich löschen?
 ConfirmCloneIntervention=Möchten Sie diesen Serviceauftrag wirklich duplizieren?
 NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiters:
 NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
 DocumentModelStandard=Standard-Dokumentenvorlage für Serviceaufträge
 InterventionCardsAndInterventionLines=Serviceaufträge und Serviceauftragspositionen
-InterventionClassifyBilled=Als "in Rechnung gestellt" markieren
-InterventionClassifyUnBilled=Als "nicht in Rechnung gestellt" markieren
+InterventionClassifyBilled=Als 'fakturiert' markieren
+InterventionClassifyUnBilled=Als 'nicht fakturiert' markieren
 InterventionClassifyDone=Als "erledigt" markieren
 StatusInterInvoiced=In Rechnung gestellt
 SendInterventionRef=Serviceauftrag %s
-SendInterventionByMail=Serviceauftrag per E-Mail versenden 
+SendInterventionByMail=Serviceauftrag per E-Mail versenden
 InterventionCreatedInDolibarr=Serviceauftrag %s erstellt
 InterventionValidatedInDolibarr=Serviceauftrag %s freigegeben
 InterventionModifiedInDolibarr=Serviceauftrag %s geändert
 InterventionClassifiedBilledInDolibarr=Serviceauftrag %s als "in Rechnung gestellt" markiert
 InterventionClassifiedUnbilledInDolibarr=Serviceauftrag %s als "nicht in Rechnung gestellt" markiert
 InterventionSentByEMail=Serviceauftrag %s per E-Mail versendet
+InterventionClosedInDolibarr= Serviceauftrag %s geschlossen
 InterventionDeletedInDolibarr=Serviceauftrag %s gelöscht
 InterventionsArea=Übersicht Serviceaufträge
 DraftFichinter=Serviceaufträge im Entwurf
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index b6b63905e80..24e05c98b23 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -73,7 +73,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Benutzer <b>%s</b> in der Dolibarr-Datenba
 ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s' definiert.
 ErrorNoSocialContributionForSellerCountry=Fehler, Sozialabgaben/Steuerwerte für Staat '%s' nicht definiert.
 ErrorFailedToSaveFile=Fehler, konnte Datei nicht speichern.
-ErrorCannotAddThisParentWarehouse=Sie versuchen ein Hauptlager hinzuzufügen, das bereits ein Unterlager eines existierenden Lagerortes ist 
+ErrorCannotAddThisParentWarehouse=Sie versuchen ein Hauptlager hinzuzufügen, das bereits ein Unterlager eines existierenden Lagerortes ist
 ErrorInvalidSubtype=Der ausgewählte Subtyp ist nicht zulässig
 FieldCannotBeNegative=Feld "%s" darf nicht negativ sein
 MaxNbOfRecordPerPage=Max. Anzahl der Datensätze pro Seite
@@ -169,7 +169,7 @@ RemoveLink=Entferne Link
 AddToDraft=Zum Entwurf hinzufügen
 Update=Aktualisieren
 Close=Schließen
-CloseAs=Status ändern in 
+CloseAs=Status ändern in
 CloseBox=Widget von Ihrer Startseite entfernen
 Confirm=Bestätigen
 ConfirmSendCardByMail=Möchten Sie wirklich die Inhalte dieser Karteikarte per E-Mail an <b>%s</b> senden?
@@ -420,6 +420,8 @@ TotalTTCShort=Gesamt (inkl. Ust)
 TotalHT=Nettosumme
 TotalHTforthispage=Gesamtpreis (Netto) für diese Seite
 Totalforthispage=Gesamtbetrag dieser Seite
+GrandTotal=Gesamtsumme
+TotalforAllPages=Gesamtsumme für alle Seiten
 TotalTTC=Bruttosumme
 TotalTTCToYourCredit=\nGesamtbetrag (inkl. USt.) zu ihren Gunsten
 TotalVAT=USt. gesamt
@@ -647,6 +649,7 @@ ReportName=Berichtsname
 ReportPeriod=Berichtszeitraum
 ReportDescription=Beschreibung
 Report=Bericht
+Reports=Berichte
 Keyword=Schlüsselwort
 Origin=Quelle
 Legend=Legende
@@ -1259,7 +1262,7 @@ URLToLink=zu verlinkende URL
 OverwriteIfExists=Vorhandene Datei überschreiben
 AmountSalary=Gehalt Betrag
 InvoiceSubtype=Rechnung Untertyp
-ConfirmMassReverse=Massenaktion Umkehr der Bestätigung 
+ConfirmMassReverse=Massenaktion Umkehr der Bestätigung
 ConfirmMassReverseQuestion=Sind Sie sicher, dass Sie die ausgewählten %s Datensätze umkehren wollen?
 ElementType=Elementtyp
 ElementId=Element ID
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 4876b0cffd9..c0714b3ef18 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -38,7 +38,7 @@ CostPrice=Selbstkostenpreis
 UnitCharges=Einheit Kosten
 Charges=Kosten
 AgentContactType=Kontaktart Handelsvertreter
-AgentContactTypeDetails=Definieren Sie, welcher Kontakttyp (auf Rechnungen verlinkt) für die Berichterstattung pro Kontakt / Adresse verwendet wird. Beachten Sie, dass das Lesen von Statistiken zu einem Kontakt nicht zuverlässig ist, da der Kontakt in den meisten Fällen nicht explizit auf den Rechnungen definiert ist.
+AgentContactTypeDetails=Definieren Sie, welcher Kontakttyp (auf Rechnungen verlinkt) für die Berichterstattung pro Kontakt/Adresse verwendet wird. Beachten Sie, dass das Lesen von Statistiken zu einem Kontakt nicht zuverlässig ist, da der Kontakt in den meisten Fällen nicht explizit auf den Rechnungen definiert ist.
 rateMustBeNumeric=Die Rate muss ein numerischer Wert sein
 markRateShouldBeLesserThan100=Die markierte Rate sollte kleiner sein als 100
 ShowMarginInfos=Zeige Rand-Informationen
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index a44b939cdcb..c2caf31f2c2 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -7,7 +7,7 @@ MrpSetupPage=Einrichtung des Moduls Materialbedarfsplanung (MRP)
 MenuBOM=Stücklisten
 LatestBOMModified=Zuletzt bearbeitete Stücklisten (maximal %s)
 LatestMOModified=Zuletzt bearbeitete Fertigungsaufträge (maximal %s)
-Bom=Stücklisten
+Bom=Stückliste
 BillOfMaterials=Stückliste
 BillOfMaterialsLines=Stücklistenpositionen
 BOMsSetup=Stücklisten Modul einrichten
@@ -31,9 +31,14 @@ Consumption=Verbrauch
 ValueOfMeansLoss=Ein Wert von 0,95 bedeutet einen durchschnittlichen Verlust von 5%% während der Herstellung oder Demontage
 ValueOfMeansLossForProductProduced=Ein Wert von 0,95 bedeutet im Durchschnitt 5%% Verlust bei dem hergestellten Produkt
 DeleteBillOfMaterials=Stückliste löschen
+CancelMo=Fertigungsauftrag abbrechen
+MoCancelConsumedAndProducedLines=Auch alle verbrauchten und produzierten Zeilen stornieren (Zeilen löschen und Lagerbestände rücksetzen)
+ConfirmCancelMo=Sind Sie sicher, dass Sie diesen Fertigungsauftrag abbrechen wollen??
 DeleteMo=Fertigungsauftrag löschen
 ConfirmDeleteBillOfMaterials=Möchten Sie diese Stückliste wirklich löschen?
 ConfirmDeleteMo=Möchten Sie diesen Fertigungsauftrag wirklich löschen?
+DeleteMoChild = Untergeordnete Fertigungsaufträge, die mit diesem Fertigungsauftrag %s verknüpft sind, löschen
+MoChildsDeleted = Alle untergeordneten Fertigungsaufträge wurden gelöscht
 MenuMRP=Fertigungsaufträge
 NewMO=Neuer Fertigungsauftrag
 QtyToProduce=Produktionsmenge
@@ -60,6 +65,8 @@ ToProduce=Zu produzieren
 ToObtain=Zu erhalten
 QtyAlreadyConsumed=Menge bereits verbraucht
 QtyAlreadyProduced=Menge bereits produziert
+QtyAlreadyConsumedShort=Verbrauchte Menge
+QtyAlreadyProducedShort=Produzierte Menge
 QtyRequiredIfNoLoss=Erforderliche Menge, um die in der Stückliste definierte Menge zu produzieren, wenn kein Verlust entsteht (wenn die Fertigungseffizienz 100%% beträgt)
 ConsumeOrProduce=Verbrauchen oder produzieren
 ConsumeAndProduceAll=Alles verbrauchen und produzieren
@@ -99,8 +106,8 @@ ConfirmDisableWorkstation=Sind Sie sicher, dass Sie die Arbeitsstation <b> %s </
 DisableAWorkstation=Deaktivieren Sie eine Workstation
 DeleteWorkstation=Löschen
 NbOperatorsRequired=Anzahl der erforderlichen Bediener
-THMOperatorEstimated=Geschätzter Bediener THM
-THMMachineEstimated=Geschätzter Maschinen THM
+THMOperatorEstimated=Geschätzter Bediener-Stundendsatz
+THMMachineEstimated=Geschätzter Maschinen-Stundensatz
 WorkstationType=Arbeitsstationstyp
 DefaultWorkstation=Standard-Arbeitsstation
 Human=Mensch
@@ -113,7 +120,7 @@ BOM=Stückliste
 CollapseBOMHelp=Die Standardanzeige der Details der Nomenklatur können Sie in der Konfiguration des Stücklistenmoduls festlegen
 MOAndLines=Fertigungsaufträge und Auftragspositionen
 MoChildGenerate=Untergeordneten Fertigungsauftrag generieren
-ParentMo=Übergeordneter Fertigungsauftrag 
+ParentMo=Übergeordneter Fertigungsauftrag
 MOChild=Untergeordneter Fertigungsauftrag
 BomCantAddChildBom=Die Nomenklatur %s ist bereits im Baum vorhanden, der zur Nomenklatur %s führt
 BOMNetNeeds = BOM-Nettobedarf
@@ -123,3 +130,9 @@ Manufacturing=Fertigung
 Disassemble=Demontage
 ProducedBy=Hergestellt von
 QtyTot=Menge gesamt
+
+QtyCantBeSplit= Die Menge kann nicht aufgeteilt werden
+NoRemainQtyToDispatch=Keine Menge zum Aufteilen verblieben
+
+THMOperatorEstimatedHelp=Geschätzte Bedienerkosten pro Stunde. Wird verwendet, um die Kosten eines Stückliste, die diese Arbeitsstation nutzt, zu schätzen.
+THMMachineEstimatedHelp=Geschätzte Maschinenkosten pro Stunde. Wird verwendet, um die Kosten einer Stückliste, die diese  Arbeitsstation nutzt, zu schätzen.
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
index 95b1d7befa7..e8c31d7e85f 100644
--- a/htdocs/langs/de_DE/opensurvey.lang
+++ b/htdocs/langs/de_DE/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Titel der Umfrage
 ToReceiveEMailForEachVote=E-Mail für jede abgegebene Stimme erhalten
 TypeDate=Datumsumfrage
 TypeClassic=Standardumfrage
-OpenSurveyStep2=Wählen Sie Ihre Daten aus den freien Tagen (Grau). Ausgewählte Tage erscheinen Grün und lassen sich durch erneutes Anklicken wieder abwählen.
+OpenSurveyStep2=Wählen Sie Ihre Daten aus den freien Tagen (grau). Ausgewählte Tage erscheinen grün und lassen sich durch erneutes Anklicken wieder abwählen.
 RemoveAllDays=Alle Tage entfernen
 CopyHoursOfFirstDay=Zeiten vom ersten Tag kopieren
 RemoveAllHours=Alle Zeiten entfernen
@@ -61,3 +61,4 @@ SurveyExpiredInfo=Die Umfrage wurde geschlossen oder ist bereits beendet.
 EmailSomeoneVoted=%s hat eine Stimme abgegeben. Sie können Ihre Umfrage unter folgendem Link finden: %s
 ShowSurvey=Umfrage anzeigen
 UserMustBeSameThanUserUsedToVote=Um einen Kommentar hinzuzufügen müssen Sie bereits abgestimmt haben und den gleichen Benutzernamen wie bei Ihrer Abstimmung verwenden.
+ListOfOpenSurveys=Liste offener Umfragen
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 2005424b737..470ffc0e2e4 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -46,7 +46,7 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
 Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung erfasst
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
 Notify_ORDER_SUPPLIER_SUBMIT=Lieferantenbestellung abgesendet
-Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt 
+Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt
 Notify_PROPAL_VALIDATE=Angebot freigegeben
 Notify_PROPAL_CLOSE_SIGNED=Geschlossene unterzeichnete Kundenangebote
 Notify_PROPAL_CLOSE_REFUSED=verworfene Kundenangebote, geschlossen
@@ -234,7 +234,7 @@ DefineNewAreaToPick=Definieren Sie einen neuen Bereich innerhalb des Bildes (Kli
 CurrentInformationOnImage=Mit diesem Tool können Sie die Größe eines Bildes ändern oder es zuschneiden. Dies sind die Informationen zum aktuell bearbeiteten Bild
 ImageEditor=Bildbearbeitung
 YouReceiveMailBecauseOfNotification=Sie erhalten diese Nachricht, weil Sie ein aktives Abonnement für das nachfolgende Ereignis bei %s / %s haben.
-YouReceiveMailBecauseOfNotification2=\n\nEreignis: 
+YouReceiveMailBecauseOfNotification2=\n\nEreignis:
 ThisIsListOfModules=Dies ist eine Liste von ausgewählten Modulen für die Demo (nur die gängigsten Module sind enthalten). Bearbeiten Sie die Auswahl und eine personalisierte Demo zu erhalten und klicken dann bitte auf "Start".
 UseAdvancedPerms=Erweiterte Berechtigungen einiger Module verwenden
 FileFormat=Dateiformat
@@ -268,7 +268,7 @@ YourPasswordHasBeenReset=Ihr Passwort wurde zurückgesetzt
 ApplicantIpAddress=IP Adresse des Antragstellers
 SMSSentTo=SMS an %s gesendet
 MissingIds=Fehlende IDs
-ThirdPartyCreatedByEmailCollector=Drittanbieter durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s 
+ThirdPartyCreatedByEmailCollector=Drittanbieter durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 ContactCreatedByEmailCollector=Kontakt / Adresse durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 ProjectCreatedByEmailCollector=Projekt durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 TicketCreatedByEmailCollector=Ticket durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Fehler beim Hochladen der Datei <b>%s</b>.
 AddFolder=Ordner erstellen
 FileWasCreateFolder=Ordner <b>%s</b> wurde erstellt
 FTPFailedToCreateFolder=Ordner <b>%s</b> konnte nicht erstellt werden.
+SelectADay=Einen Tag im Kalender auswählen
+SelectANewDate=Ein neues Datum auswählen
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 054da4fd1c7..7e70dbb5813 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -70,7 +70,7 @@ UpdateDefaultPrice=Standardpreis aktualisieren
 UpdateLevelPrices=Preise für Preissegmente ändern
 AppliedPricesFrom=Erstellungszeitpunkt
 SellingPrice=Verkaufspreis
-SellingPriceHT=Verkaufspreis (ohne Steuern) 
+SellingPriceHT=Verkaufspreis (ohne Steuern)
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 SellingMinPriceTTC=Mindestverkaufspreis (inkl. USt.)
 CostPriceDescription=Dieses Preisfeld (ohne Steuern) kann verwendet werden, um den durchschnittlichen Betrag zu erfassen, den dieses Produkt für Ihr Unternehmen kostet. Dies kann ein beliebiger Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Kaufpreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
@@ -208,11 +208,6 @@ unitSET=Zusammenstellung
 unitS=Sekunden
 unitH=Stunden
 unitD=Tag
-unitG=Gramm
-unitM=Meter
-unitLM=Laufende Meter
-unitM2=Quadratmeter
-unitM3=Kubikmeter
 unitL=Liter
 unitT=Tonne
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=Pfund
 unitOZ=Unze
 unitM=Meter
+unitLM=Laufende Meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -398,7 +394,7 @@ NoEditVariants=Gehen Sie zur übergeordneten Produktkarte und bearbeiten Sie die
 ConfirmCloneProductCombinations=Sollen alle Produktvarianten zum anderen Produkt mit der gegebenen Referenz kopiert werden?
 CloneDestinationReference=Ref. des Zielprodukts
 ErrorCopyProductCombinations=Es gab einen Fehler, während Produkt Varianten kopiert wurden
-ErrorDestinationProductNotFound=Zielprodukt nicht gefunden 
+ErrorDestinationProductNotFound=Zielprodukt nicht gefunden
 ErrorProductCombinationNotFound=Produktvariante nicht gefunden
 ActionAvailableOnVariantProductOnly=Aktion nur für die Produktvariante verfügbar
 ProductsPricePerCustomer=Produktpreise pro Kunde
@@ -435,5 +431,8 @@ ConfirmEditExtrafield = Wählen Sie das zu ändernde Extrafeld aus
 ConfirmEditExtrafieldQuestion = Möchten Sie dieses Extrafeld wirklich ändern?
 ModifyValueExtrafields = Wert eines Extrafeldes ändern
 OrProductsWithCategories=Oder Produkte mit Tags/Kategorien
-WarningTransferBatchStockMouvToGlobal = Wenn Sie dieses Produkt ohne Seriennummern verwalten möchten, wird der nach Seriennummern erfasste Lagerbestand einen globalen Lagerbestand umgewandelt 
+WarningTransferBatchStockMouvToGlobal = Wenn Sie dieses Produkt ohne Seriennummern verwalten möchten, wird der nach Seriennummern erfasste Lagerbestand einen globalen Lagerbestand umgewandelt
 WarningConvertFromBatchToSerial=Wenn Sie derzeit eine Menge größer oder gleich 2 für das Produkt haben, bedeutet der Wechsel zu dieser Auswahl, dass Sie immer noch über ein Produkt verfügen mit verschiedenen Objekten derselben Charge (während Sie ein eindeutige Seriennummer wünschen). Die Dopplung bleibt bestehen, bis eine Bestandsaufnahme oder eine manuelle Lagerbestandsbewegung zur Behebung dieses Problems erfolgt ist.
+AllowStockMovementVariantParent=Auch Lagerbewegungen der Elternprodukte von Variantenprodukten aufzeichnen.
+AllowStockMovementVariantParentHelp=Standardmäßig ist ein Elternprodukt eines Variantenprodukts ein virtuelles Produkt, daher wird kein Lagerbestand dafür verwaltet. Durch Aktivieren dieser Option wird ein Lagerbestand für Elternprodukte verwaltet und jedes Mal, wenn eine Lagermenge für ein Variantenprodukt geändert wird, wird dieselbe Menge für das Elternprodukt geändert. Sie sollten diese Option nicht benötigen, es sei denn, Sie verwenden Varianten, um dasselbe Produkt wie das Elternprodukt zu verwalten (aber mit unterschiedlichen Beschreibungen, Preisen...)
+ConfirmSetToDraftInventory=Sind Sie sicher, dass Sie zurück zum Status Entwurf wechseln wollen?<br>Die aktuell im Bestand berücksichtigten Mengen werden zurückgesetzt.
diff --git a/htdocs/langs/de_DE/receptions.lang b/htdocs/langs/de_DE/receptions.lang
index 55c227f95d1..bdd59452ee3 100644
--- a/htdocs/langs/de_DE/receptions.lang
+++ b/htdocs/langs/de_DE/receptions.lang
@@ -5,8 +5,6 @@ RefReception=Ref. Wareneingang
 Reception=Wareneingang
 Receptions=Wareneingänge
 AllReceptions=Alle Wareneingänge
-Reception=Wareneingang
-Receptions=Wareneingänge
 ShowReception=Zeige Wareneingänge
 ReceptionsArea=Wareneingang
 ListOfReceptions=Wareneingangsliste
@@ -32,7 +30,7 @@ StatusReceptionDraftShort=Entwurf
 StatusReceptionValidatedShort=Freigegeben
 StatusReceptionProcessedShort=Bearbeitet
 ReceptionSheet=Empfangsblatt
-ValidateReception=Warenempfang bestätigen 
+ValidateReception=Warenempfang bestätigen
 ConfirmDeleteReception=Möchten Sie diesen Wareneingang wirklich löschen?
 ConfirmValidateReception=Möchten Sie diesen Wareneingang mit der Referenz <b>%s</b> wirklich freigeben ?
 ConfirmCancelReception=Möchten Sie diesen Wareneingang wirklich stornieren?
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
index 3fa5ea8db6e..6fe86e205ea 100644
--- a/htdocs/langs/de_DE/resource.lang
+++ b/htdocs/langs/de_DE/resource.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Ressourcen
-MenuResourceAdd=neue Ressource
+MenuResourceAdd=Neue Ressource
 DeleteResource=Ressource löschen
 ConfirmDeleteResourceElement=Löschung der Ressource zu diesem Element bestätigen
 NoResourceInDatabase=Keine Ressource in der Datenbank
@@ -14,7 +14,7 @@ ResourceFormLabel_ref=Ressourcen-Name
 ResourceType=Ressourcen-Typ
 ResourceFormLabel_description=Ressourcen-Beschreibung
 
-ResourcesLinkedToElement=Mit Element verknüpfte Ressourcen 
+ResourcesLinkedToElement=Mit Element verknüpfte Ressourcen
 
 ShowResource=Ressource anzeigen
 
@@ -37,3 +37,5 @@ ImportDataset_resource_1=Ressourcen
 
 ErrorResourcesAlreadyInUse=Einige Ressourcen werden verwendet
 ErrorResourceUseInEvent=%s wird im Ereignis %s verwendet
+
+MaxUsers=Maximale Anzahl Benutzer (Plätze, Sitze, etc.)
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index cd3e8d03ccd..89a340ac9f6 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -5,7 +5,7 @@ SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standard-Buchungskonto für Gehaltszahlungen
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Lassen Sie beim Erstellen eines Gehalts standardmäßig die Option "Gesamtzahlung automatisch erstellen" leer
 Salary=Gehalt
 Salaries=Gehälter
-NewSalary=Neues Gehalt
+NewSalary=Neue Gehaltszahlung
 AddSalary=Gehalt hinzufügen
 NewSalaryPayment=Neue Gehaltskarte
 AddSalaryPayment=Gehaltszahlung hinzufügen
@@ -22,6 +22,12 @@ LastSalaries=Letzte %s Gehälter
 AllSalaries=Alle Gehälter
 SalariesStatistics=Statistik Gehälter
 SalariesAndPayments=Gehälter und Gehaltszahlungen
-ConfirmDeleteSalaryPayment=Möchten Sie diese Gehaltszahlung löschen? 
+ConfirmDeleteSalaryPayment=Möchten Sie diese Gehaltszahlung löschen?
 FillFieldFirst=Zuerst das Mitarbeiterfeld ausfüllen
 UpdateAmountWithLastSalary=Als Betrag letztes Gehalt vorbelegen
+MakeTransferRequest=Überweisungsanforderung erstellen
+VirementOrder=Überweisungsauftrag
+BankTransferAmount=Höhe des zu überweisenden Betrags
+WithdrawalReceipt=Überweisungsauftrag
+OrderWaiting=Ausstehender Auftrag
+FillEndOfMonth=Füllen Sie das Monatsende aus
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index 7c6377246de..23726abac6e 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -39,7 +39,7 @@ expenseReportCoef=Koeffizient
 expenseReportCoefUndefined=(Wert nicht definiert)
 expenseReportOffset=Auslage
 expenseReportPrintExample=offset + (d x coef) = %s
-expenseReportRangeDisabled=Periode deaktiviert - Wörterbuch c_exp_tax_range
+expenseReportRangeDisabled=Periode deaktiviert - siehe Stammdaten zu c_exp_tax_range
 expenseReportRangeFromTo=von %d bis %d
 expenseReportRangeMoreThan=mehr als %d
 expenseReportTotalForFive=Beispiel mit <u>d</u> = 5
@@ -103,7 +103,7 @@ ShowExpenseReport=Spesenabrechnung anzeigen
 ShowTrip=Spesenabrechnung anzeigen
 TripCard=Reisekosten – Übersicht
 TripId=Spesenabrechnung ID
-TripNDF=Hinweise Spesenabrechnung 
+TripNDF=Informationen zur Spesenabrechnung
 TripSociete=Information zum Unternehmen
 Trips=Spesenabrechnungen
 TripsAndExpenses=Spesenabrechnungen
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 0ad638c6a05..29bf78f8178 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -103,7 +103,7 @@ HierarchicalResponsible=Vorgesetzter
 HierarchicView=Hierarchische Ansicht
 UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum Ändern
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Verwende OpenID für Anmeldung
+LoginUsingOpenID=Verwende OpenID zur Anmeldung
 WeeklyHours=Sollarbeitszeit (Stunden pro Woche)
 ExpectedWorkedHours=Erwartete Wochenarbeitszeit
 ColorUser=Benutzerfarbe
diff --git a/htdocs/langs/el_CY/errors.lang b/htdocs/langs/el_CY/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/el_CY/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/el_CY/holiday.lang b/htdocs/langs/el_CY/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/el_CY/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/el_CY/languages.lang b/htdocs/langs/el_CY/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/el_CY/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/el_CY/orders.lang b/htdocs/langs/el_CY/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/el_CY/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/el_CY/partnership.lang b/htdocs/langs/el_CY/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/el_CY/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index a259e6cc543..33b1b54bb14 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -24,8 +24,8 @@ ConfigAccountingExpert=Διαμόρφωση της ενότητας λογιστ
 Journalization=Καταχώρηση ημερολογίου
 Journals=Ημερολόγια
 JournalFinancial=Οικονομικά ημερολόγια
-BackToChartofaccounts=Επιστροφή στο λογιστικό σχέδιο 
-Chartofaccounts=Λογιστικό σχέδιο 
+BackToChartofaccounts=Επιστροφή στο λογιστικό σχέδιο
+Chartofaccounts=Λογιστικό σχέδιο
 ChartOfSubaccounts=Λογιστικό σχέδιο μεμονωμένων λογαριασμών
 ChartOfIndividualAccountsOfSubsidiaryLedger=Λογιστικό σχέδιο μεμονωμένων λογαριασμών του θυγατρικού καθολικού
 CurrentDedicatedAccountingAccount=Τρέχων αποκλειστικός λογαριασμός
@@ -52,7 +52,7 @@ AccountantFiles=Εξαγωγή εγγράφων πηγής
 ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορείτε να αναζητήσετε και να εξαγάγετε τα συμβάντα πηγής που χρησιμοποιούνται για τη δημιουργία της λογιστικής σας. <br> Το εξαγόμενο αρχείο ZIP θα περιέχει τις λίστες των ζητούμενων στοιχείων σε CSV, καθώς και τα συνημμένα αρχεία τους στην αρχική τους μορφή (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγια σας, χρησιμοποιήστε την καταχώριση μενού %s - %s.
 ExportAccountingProjectHelp=Προσδιορίστε ένα έργο εάν χρειάζεστε μια λογιστική αναφορά μόνο για ένα συγκεκριμένο έργο. Οι αναφορές εξόδων και οι πληρωμές δανείων δεν περιλαμβάνονται στις αναφορές του έργου.
-ExportAccountancy=Εξαγωγή λογιστικής 
+ExportAccountancy=Εξαγωγή λογιστικής
 WarningDataDisappearsWhenDataIsExported=Προειδοποίηση, αυτή η λίστα περιέχει μόνο τις λογιστικές εγγραφές που δεν έχουν ήδη εξαχθεί (η ημερομηνία εξαγωγής είναι κενή). Εάν θέλετε να συμπεριλάβετε τις λογιστικές εγγραφές που έχουν ήδη εξαχθεί, κάντε κλικ στο παραπάνω κουμπί.
 VueByAccountAccounting=Προβολή ανά λογαριασμό λογιστικής
 VueBySubAccountAccounting=Προβολή ανά υπολογαριασμό λογιστικής
@@ -65,7 +65,7 @@ MainAccountForSubscriptionPaymentNotDefined=Ο λογαριασμός (από τ
 MainAccountForRetainedWarrantyNotDefined=Λογαριασμός (από το Λογιστικό Σχέδιο) για τη διατηρηθείσα εγγύηση που δεν έχει καθοριστεί στη ρύθμιση
 UserAccountNotDefined=Ο λογαριασμός λογιστικής για τον χρήστη δεν έχει οριστεί κατά τη ρύθμιση
 
-AccountancyArea=Τομέας Λογιστικής 
+AccountancyArea=Τομέας Λογιστικής
 AccountancyAreaDescIntro=Η χρήση της ενότητας λογιστικής πραγματοποιείται σε διάφορα στάδια:
 AccountancyAreaDescActionOnce=Οι ακόλουθες ενέργειες εκτελούνται συνήθως μόνο μία φορά ή μία φορά το χρόνο ...
 AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα πρέπει να γίνουν για να εξοικονομήσετε χρόνο στο μέλλον, προτείνοντάς σας αυτόματα τον σωστό προκαθορισμένο λογαριασμό λογιστικής κατά τη μεταφορά δεδομένων στη λογιστική
@@ -118,7 +118,7 @@ MenuLoanAccounts=Λογαριασμοί δανείων
 MenuProductsAccounts=Λογαριασμοί προϊόντων
 MenuClosureAccounts=Κλείσιμο Λογαριασμών
 MenuAccountancyClosure=Κλείσιμο
-MenuExportAccountancy=Εξαγωγή λογιστικής 
+MenuExportAccountancy=Εξαγωγή λογιστικής
 MenuAccountancyValidationMovements=Επικύρωση κινήσεων
 ProductsBinding=Λογαριασμοί προϊόντων
 TransferInAccounting=Μεταφορά στη λογιστική
@@ -318,7 +318,7 @@ FicheVentilation=Καρτέλα Δεσμεύσεων
 GeneralLedgerIsWritten=Οι συναλλαγές καταχωρήθηκαν στο Καθολικό
 GeneralLedgerSomeRecordWasNotRecorded=Δεν ήταν δυνατή η καταγραφή ορισμένων από τις συναλλαγές. Εάν δεν υπάρχει άλλο μήνυμα σφάλματος, αυτό πιθανότατα οφείλεται στο ότι είχαν ήδη καταχωρηθεί στο ημερολόγιο.
 NoNewRecordSaved=Δεν υπάρχει άλλη εγγραφή για μεταφορά
-ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογαριασμό  του λογιστικού σχεδίου 
+ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογαριασμό  του λογιστικού σχεδίου
 ChangeBinding=Αλλάξτε τη δέσμευση
 Accounted=Καταχωρήθηκε στο καθολικό
 NotYetAccounted=Δεν έχει μεταφερθεί ακόμη στη λογιστική
@@ -335,7 +335,6 @@ CategoryDeleted=Η κατηγορία για τον λογαριασμό λογ
 AccountingJournals=Λογιστικά ημερολόγια
 AccountingJournal=Λογιστικό ημερολόγιο
 NewAccountingJournal=Νέο λογιστικό ημερολόγιο
-ShowAccountingJournal=Εμφάνιση ημερολογίου λογιστικής
 NatureOfJournal=Φύση του ημερολογίου
 AccountingJournalType1=Διάφορες εργασίες
 AccountingJournalType2=Πωλήσεις
@@ -365,7 +364,7 @@ ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Όταν είναι ενεργο
 
 ## Export
 NotExportLettering=Μην εξάγετε τη συμφωνία κατά τη δημιουργία του αρχείου
-NotifiedExportDate=Επισήμανση γραμμών που δεν έχουν εξαχθεί ακόμη ως Εξαγόμενες <span class="warning"> (για να τροποποιήσετε μια γραμμή που έχει επισημανθεί ως εξαγόμενη, θα χρειαστεί να διαγράψετε ολόκληρη τη συναλλαγή και να τη μεταφέρετε ξανά στη λογιστική) </span> 
+NotifiedExportDate=Επισήμανση γραμμών που δεν έχουν εξαχθεί ακόμη ως Εξαγόμενες <span class="warning"> (για να τροποποιήσετε μια γραμμή που έχει επισημανθεί ως εξαγόμενη, θα χρειαστεί να διαγράψετε ολόκληρη τη συναλλαγή και να τη μεταφέρετε ξανά στη λογιστική) </span>
 NotifiedValidationDate=Επικύρωση και Κλείδωμα των εξαγόμενων καταχωρήσεων που δεν έχουν ήδη κλειδωθεί <span class="warning"> (το ίδιο αποτέλεσμα με τη δυνατότητα "%s", η τροποποίηση και η διαγραφή των γραμμών ΣΙΓΟΥΡΑ δεν θα είναι δυνατή) </span>
 NotifiedExportFull=Εξαγωγή εγγράφων ;
 DateValidationAndLock=Ημερομηνία επικύρωσης και κλειδώματος
@@ -393,7 +392,7 @@ Modelcsv_winfic=Εξαγωγή για Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Εξαγωγή για Gestinum (v3)
 Modelcsv_Gestinumv5=Εξαγωγή για Gestinum (v5)
 Modelcsv_charlemagne=Εξαγωγή για το Aplim Charlemagne
-ChartofaccountsId=Αναγνωριστικό λογιστικού σχεδίου 
+ChartofaccountsId=Αναγνωριστικό λογιστικού σχεδίου
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Έναρξη λογιστικής
@@ -474,7 +473,7 @@ ErrorInvoiceContainsLinesNotYetBoundedShort=Ορισμένες γραμμές σ
 ExportNotSupported=Η διαμορφωμένη μορφή εξαγωγής δεν υποστηρίζεται σε αυτή τη σελίδα
 BookeppingLineAlreayExists=Γραμμές που υπάρχουν ήδη στη λογιστική
 NoJournalDefined=Δεν βρέθηκε ημερολόγιο
-Binded=Δεσμευμένες γραμμές 
+Binded=Δεσμευμένες γραμμές
 ToBind=Γραμμές προς δέσμευση
 UseMenuToSetBindindManualy=Γραμμές που δεν έχουν ακόμη δεσμευτεί, χρησιμοποιήστε το μενού <a href="%s">%s</a> για να κάνετε τη δέσμευση χειροκίνητα
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Σημείωση: αυτή η ενότητα ή η σελίδα δεν είναι απολύτως συμβατή με την πειραματική λειτουργία των τιμολογίων κατάστασης. Ορισμένα δεδομένα μπορεί να είναι λάθος.
@@ -482,7 +481,7 @@ AccountancyErrorMismatchLetterCode=Αναντιστοιχία στον κώδι
 AccountancyErrorMismatchBalanceAmount=Το ισοζύγιο (%s) δεν είναι ίσο με 0
 AccountancyErrorLetteringBookkeeping=Παρουσιάστηκαν σφάλματα σχετικά με τις συναλλαγές: %s
 ErrorAccountNumberAlreadyExists=Ο λογιστικός αριθμός %s υπάρχει ήδη
-ErrorArchiveAddFile=Δεν είναι δυνατή η αρχειοθέτηση του αρχείου "%s" 
+ErrorArchiveAddFile=Δεν είναι δυνατή η αρχειοθέτηση του αρχείου "%s"
 ErrorNoFiscalPeriodActiveFound=Δεν βρέθηκε ενεργή φορολογική περίοδος
 ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Η ημερομηνία του εγγράφου λογιστικής δεν βρίσκεται εντός της ενεργής φορολογικής περιόδου.
 ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Η ημερομηνία του εγγράφου λογιστικής βρίσκεται εντός μιας κλειστής φορολογικής περιόδου
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 51bd496a353..f25ecf160b8 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -118,7 +118,7 @@ ComptaSetup=Ρύθμιση Λογιστικής ενότητας
 UserSetup=Ρύθμιση χρήστη
 MultiCurrencySetup=Ρύθμιση πολλαπλών νομισμάτων
 MenuLimits=Όρια και ακρίβεια
-MenuIdParent=Αναγνωριστικό γονικού μενού 
+MenuIdParent=Αναγνωριστικό γονικού μενού
 DetailMenuIdParent=Αναγνωριστικό γονικού μενού (κενό για κορυφαίο μενού)
 ParentID=Αναγνωριστικό γονέα
 DetailPosition=Αριθμός Ταξινόμησης για να καθοριστεί η θέση του μενού
@@ -136,7 +136,7 @@ IdPermissions=Αναγνωριστικό αδειών
 LanguageBrowserParameter=Παράμετρος %s
 LocalisationDolibarrParameters=Παράμετροι τοπικών ρυθμίσεων
 ClientHour=Ωρα χρήστη (χρήστης)
-OSTZ=Ζώνη ώρας του λειτουργικού συστήματος του διακομιστή 
+OSTZ=Ζώνη ώρας του λειτουργικού συστήματος του διακομιστή
 PHPTZ=Ζώνη Ώρας διακομιστή PHP
 DaylingSavingTime=Η θερινή ώρα (χρήστη)
 CurrentHour=Ώρα PHP (server)
@@ -238,7 +238,7 @@ DevelopYourModuleDesc=Μερικές λύσεις για να αναπτύξετ
 URL=URL
 RelativeURL=Σχετική διεύθυνση URL
 BoxesAvailable=Διαθέσιμα γραφικά στοιχεία
-BoxesActivated=Ενεργοποιημένα γραφικά στοιχεία 
+BoxesActivated=Ενεργοποιημένα γραφικά στοιχεία
 ActivateOn=Ενεργοποιήστε στις
 ActiveOn=Ενεργοποιήθηκε στις
 ActivatableOn=Δυνατότητα ενεργοποίησης σε
@@ -289,7 +289,7 @@ Emails=Emails
 EMailsSetup=Ρύθμιση Email
 EMailsDesc=Αυτή η σελίδα σας επιτρέπει να ορίσετε τις παραμέτρους η επιλογές για αποστολή email.
 EmailSenderProfiles=Προφίλ αποστολέων Email
-EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email εδώ, θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email. 
+EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email εδώ, θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email.
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP / SMTPS (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port
@@ -368,7 +368,7 @@ GenericMaskCodes3EAN=Όλοι οι άλλοι χαρακτήρες στη μάσ
 GenericMaskCodes4a=<u>Παράδειγμα για το 99ο %s του τρίτου μέρους TheCompany, με ημερομηνία 31-01-2023:</u> <br>
 GenericMaskCodes4b=<u>Παράδειγμα του τρίτου μέρους που δημιουργήθηκε στις 31-01-2023:</u><br>
 GenericMaskCodes4c=<u>Παράδειγμα του προϊόντος που δημιουργήθηκε στις 31-01-2023:</u><br>
-GenericMaskCodes5= <b>ABC{yy} {mm}-{000000}</b> θα δώσει <b>ABC2301-000099</b> <br> <b>{0000+100@1}-ZZZ/{dd}/XXX</b> θα δώσει <b>0199-ΖΖΖ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> θα δώσει το <b>IN2301-0099-A</b>Αν ο τύπος της εταιρείας ειναι 'Responsable Inscripto' με κωδικό για τύπο που ειναι 'A_RI' 
+GenericMaskCodes5= <b>ABC{yy} {mm}-{000000}</b> θα δώσει <b>ABC2301-000099</b> <br> <b>{0000+100@1}-ZZZ/{dd}/XXX</b> θα δώσει <b>0199-ΖΖΖ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> θα δώσει το <b>IN2301-0099-A</b>Αν ο τύπος της εταιρείας ειναι 'Responsable Inscripto' με κωδικό για τύπο που ειναι 'A_RI'
 GenericNumRefModelDesc=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα.
 ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμος στην διεύθυνση <b>%s</b> στην θύρα <b>%s</b>
 ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση <b>%s</b> στην θύρα <b>%s</b>
@@ -481,10 +481,10 @@ SetAsDefault=Ορισμός ως προεπιλογή
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
 ExternalModule=Εξωτερική ενότητα
 InstalledInto=Εγκαταστάθηκε στον κατάλογο %s
-BarcodeInitForThirdparties=Μαζική έναρξη γραμμικού κώδικα για Πελάτες/Προμηθευτές 
+BarcodeInitForThirdparties=Μαζική έναρξη γραμμικού κώδικα για Πελάτες/Προμηθευτές
 BarcodeInitForProductsOrServices=Μαζική έναρξη ή επαναφορά barcode για προϊόντα ή υπηρεσίες
 CurrentlyNWithoutBarCode=Επί του παρόντος, έχετε <strong>%s</strong> εγγραφές <strong>%s</strong> %s χωρίς barcode.
-InitEmptyBarCode=Τιμή έναρξης για τους %s κενούς γραμμικούς κώδικες 
+InitEmptyBarCode=Τιμή έναρξης για τους %s κενούς γραμμικούς κώδικες
 EraseAllCurrentBarCode=Διαγράψτε όλες τις τρέχουσες τιμές barcode
 ConfirmEraseAllCurrentBarCode=Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις τρέχουσες τιμές barcode;
 AllBarcodeReset=Όλες οι τιμές barcode έχουν αφαιρεθεί
@@ -773,7 +773,7 @@ Permission92=Δημιουργία / τροποποίηση κοινωνικών
 Permission93=Διαγραφή κοινωνικών ή φορολογικών εισφορών και ΦΠΑ
 Permission94=Εξαγωγή κοινωνικών ή φορολογικών εισφορών
 Permission95=Ανάγνωση αναφορών
-Permission101=Ανάγνωση αποστολών 
+Permission101=Ανάγνωση αποστολών
 Permission102=Δημιουργία / τροποποίηση αποστολών
 Permission104=Επικύρωση αποστολών
 Permission105=Αποστολή αποστολών μέσω email
@@ -1197,6 +1197,7 @@ Skin=Θέμα
 DefaultSkin=Βασικό Θέμα
 MaxSizeList=Μέγιστο μήκος για λίστα
 DefaultMaxSizeList=Προεπιλεγμένο μέγιστο μέγεθος για λίστες
+DisplayGrandTotalInList=Εμφάνιση του γενικού συνόλου (για όλες τις σελίδες) στο υποσέλιδο λιστών
 DefaultMaxSizeShortList=Προεπιλεγμένο μέγιστο μήκος για σύντομες λίστες (π.χ. Σε κάρτα πελάτη)
 MessageOfDay=Μήνυμα της ημέρας
 MessageLogin=Μήνυμα σελίδας εισόδου
@@ -1290,7 +1291,7 @@ TriggerAlwaysActive=Τα triggers σε αυτό το αρχείο είναι π
 TriggerActiveAsModuleActive=Τα triggers σε αυτό το αρχείο είναι ενεργά καθώς η ενότητα <b> %s </b> είναι ενεργοποιημένη.
 GeneratedPasswordDesc=Επιλέξτε τη μέθοδο που θα χρησιμοποιηθεί για κωδικούς πρόσβασης που δημιουργούνται αυτόματα.
 DictionaryDesc=Εισάγετε όλα τα δεδομένα αναφοράς. Μπορείτε να προσθέσετε τις τιμές σας στην προεπιλογή.
-ConstDesc=Αυτή η σελίδα επιτρέπει την επεξεργασία (αντικατάσταση) παραμέτρων που δεν είναι διαθέσιμες σε άλλες σελίδες. Αυτές είναι κυρίως δεσμευμένες παράμετροι για προγραμματιστές/ προχωρημένη αντιμετώπιση προβλημάτων μόνο. 
+ConstDesc=Αυτή η σελίδα επιτρέπει την επεξεργασία (αντικατάσταση) παραμέτρων που δεν είναι διαθέσιμες σε άλλες σελίδες. Αυτές είναι κυρίως δεσμευμένες παράμετροι για προγραμματιστές/ προχωρημένη αντιμετώπιση προβλημάτων μόνο.
 MiscellaneousOptions=Διάφορες επιλογές
 MiscellaneousDesc=Όλες οι άλλες παράμετροι που σχετίζονται με την ασφάλεια ορίζονται εδώ.
 LimitsSetup=Ρύθμιση Ορίων/Ακριβείας
@@ -2015,7 +2016,7 @@ ExpectedChecksum=Αναμενόμενο άθροισμα ελέγχου
 CurrentChecksum=Τρέχον άθροισμα ελέγχου
 ExpectedSize=Αναμενόμενο μέγεθος
 CurrentSize=Τρέχον μέγεθος
-ForcedConstants=Απαιτούμενες τιμές σταθερών (constants) 
+ForcedConstants=Απαιτούμενες τιμές σταθερών (constants)
 MailToSendProposal=Προσφορές πελατών
 MailToSendOrder=Εντολές πωλήσεων
 MailToSendInvoice=Τιμολόγια πελατών
@@ -2231,7 +2232,7 @@ RecipientEmailsWillBeReplacedWithThisValue=Τα email των παραληπτώ
 AtLeastOneDefaultBankAccountMandatory=Πρέπει να οριστεί τουλάχιστον ένας προεπιλεγμένος τραπεζικός λογαριασμός
 RESTRICT_ON_IP=Να επιτρέπεται η πρόσβαση στην API μόνο σε συγκεκριμένες διευθύνσεις IP πελάτη (δεν επιτρέπεται η χρήση μπαλαντέρ, αφήστε κενό διάστημα μεταξύ των τιμών). Κενή τιμή σημαίνει ότι κάθε πελάτης μπορεί να έχει πρόσβαση.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Βασισμένο στην έκδοση της βιβλιοθήκης SabreDAV 
+BaseOnSabeDavVersion=Βασισμένο στην έκδοση της βιβλιοθήκης SabreDAV
 NotAPublicIp=Δεν είναι δημόσια IP
 MakeAnonymousPing=Πραγματοποιήστε ένα ανώνυμο Ping '+1' στον διακομιστή του Dolibarr (εκτελείται 1 φορά μόνο μετά την εγκατάσταση) για να επιτρέψετε στον οργανισμό να μετρήσει τον αριθμό των εγκαταστάσεων Dolibarr.
 FeatureNotAvailableWithReceptionModule=Η δυνατότητα δεν είναι διαθέσιμη όταν η ενότητα Παραλαβή είναι ενεργοποιημένη
@@ -2371,7 +2372,7 @@ MaxNumberOfImagesInGetPost=Μέγιστος επιτρεπόμενος αριθ
 MaxNumberOfPostOnPublicPagesByIP=Μέγιστος αριθμός αναρτήσεων σε δημόσιες σελίδες με την ίδια διεύθυνση IP σε ένα μήνα
 CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για να λάβει το όνομα ενός τρίτου μέρους ή επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
 ScriptIsEmpty=Το script είναι κενό
-ShowHideTheNRequests=Εμφάνιση/απόκρυψη των %s αιτημάτων SQL 
+ShowHideTheNRequests=Εμφάνιση/απόκρυψη των %s αιτημάτων SQL
 DefinedAPathForAntivirusCommandIntoSetup=Ορίστε μια διαδρομή για ένα πρόγραμμα προστασίας από ιούς στο <b> %s </b>
 TriggerCodes=Συμβάντα που ξεκινούν άλλες ενέργειες
 TriggerCodeInfo=Εισάγετε εδώ τον κώδικα των trigger που θα δημιουργήσει μια ανάρτηση ενός αιτήματος ιστού (επιτρέπονται μόνο εξωτερικές διευθύνσεις URL). Μπορείτε να εισάγετε πολλούς κώδικες trigger διαχωρισμένους από κόμμα.
@@ -2430,6 +2431,15 @@ RecommendedForProduction=Συνιστάται σε Παραγωγικό περι
 RecommendedForDebug=Συνιστάται για αποσφαλμάτωση
 UrlPublicInterfaceLabelAdmin=Εναλλακτική διεύθυνση URL για δημόσια διεπαφή
 UrlPublicInterfaceHelpAdmin=Είναι δυνατόν να ορίσετε ένα ψευδώνυμο(alias) στον διακομιστή ιστού και έτσι να διαθέσετε τη δημόσια διεπαφή με μια άλλη διεύθυνση URL (ο διακομιστής πρέπει να ενεργεί ως διακομιστής μεσολάβησης(proxy) στην κανονική διεύθυνση URL)
-ExportUseForce=Use the parameter -f
-ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
-CustomPrompt=Custom prompts
+ExportUseForce=Χρησιμοποιήστε την παράμετρο -f
+ExportUseForceHelp=Αναγκαστική συνέχιση της εξαγωγής ακόμη και όταν εντοπιστεί σφάλμα (Το αντίγραφο ασφαλείας ενδέχεται να μην είναι αξιόπιστο)
+CustomPrompt=Προσαρμοσμένες προτροπές
+AiDescription=Χαρακτηριστικά AI (Τεχνητής Νοημοσύνης).
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=Ρύθμιση ενότητας ΑΙ
+AiCustomPrompt=Προσαρμοσμένες προτροπές AI
+AI_CONFIGURATIONS_PROMPT=Προσαρμοσμένη προτροπή
+ImageGeneration=Δημιουργία εικόνας
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Εισάγετε μια διεύθυνση IP
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index fb192d33b61..131a34fbf41 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Σύνολο (με Φ.Π.Α.)
 TotalHT=Σύνολο χωρίς ΦΠΑ
 TotalHTforthispage=Σύνολο (χωρίς φόρο) για αυτήν τη σελίδα
 Totalforthispage=Σύνολο για αυτή τη σελίδα
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Σύνολο (με Φ.Π.Α.)
 TotalTTCToYourCredit=Σύνολο (συμπ. φόρου) στην πίστωσή σας
 TotalVAT=Συνολικός Φ.Π.Α.
@@ -470,7 +472,7 @@ Status=Κατάσταση
 Favorite=Αγαπημένα
 ShortInfo=Πληροφορίες
 Ref=Αναφ.
-ExternalRef=εξωτερική Αναφ. 
+ExternalRef=εξωτερική Αναφ.
 RefSupplier=Αναφ. Προμηθευτή
 RefPayment=Αναφ. πληρωμής
 CommercialProposalsShort=Προσφορές
@@ -484,7 +486,7 @@ ActionRunningNotStarted=Δεν έχουν ξεκινήσει
 ActionRunningShort=Σε εξέλιξη
 ActionDoneShort=Ολοκληρωμένες
 ActionUncomplete=Ατελής
-LatestLinkedEvents=Τελευταία %s συνδεδεμένα συμβάντα 
+LatestLinkedEvents=Τελευταία %s συνδεδεμένα συμβάντα
 CompanyFoundation=Εταιρεία / Οργανισμός
 Accountant=Λογιστής
 ContactsForCompany=Επαφές για αυτό το τρίτο μέρος
@@ -647,6 +649,7 @@ ReportName=Όνομα Αναφοράς
 ReportPeriod=Περίοδος Αναφοράς
 ReportDescription=Περιγραφή
 Report=Αναφορά
+Reports=Αναφορές
 Keyword=Λέξη κλειδί
 Origin=Προέλευση
 Legend=Ετικέτα
@@ -856,7 +859,7 @@ ModulesSystemTools=Εργαλεία ενοτήτων
 Test=Δοκιμή
 Element=Στοιχείο
 NoPhotoYet=Δεν υπάρχουν διαθέσιμες εικόνες
-Dashboard=Πίνακας ελέγχου 
+Dashboard=Πίνακας ελέγχου
 MyDashboard=Ο πίνακας ελέγχου μου
 Deductible=Εκπίπτουν
 from=από
@@ -1202,7 +1205,7 @@ Forthcoming=Προσεχής
 Currently=Επί του παρόντος
 ConfirmMassLeaveApprovalQuestion=Είστε σίγουροι ότι θέλετε να εγκρίνετε τις %sεπιλεγμένες εγγραφές;
 ConfirmMassLeaveApproval=Επιβεβαίωση έγκρισης μαζικής άδειας
-RecordAproved=Εγκρίθηκε η εγγραφή 
+RecordAproved=Εγκρίθηκε η εγγραφή
 RecordsApproved=%s εγγραφές εγκρίθηκαν
 Properties=Ιδιότητες
 hasBeenValidated=Το %s έχει επικυρωθεί
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index a7a81e04fba..614ec3d99e1 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -44,7 +44,7 @@ Notify_ORDER_SENTBYMAIL=Η εντολή πωλήσεων στάλθηκε μέσ
 Notify_ORDER_CLOSE=Παραδόθηκε η παραγγελία πώλησης
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Η εντολή αγοράς στάλθηκε μέσω email
 Notify_ORDER_SUPPLIER_VALIDATE=Η εντολή αγοράς καταγράφηκε
-Notify_ORDER_SUPPLIER_APPROVE=Η εντολή αγοράς εγκρίθηκε 
+Notify_ORDER_SUPPLIER_APPROVE=Η εντολή αγοράς εγκρίθηκε
 Notify_ORDER_SUPPLIER_SUBMIT=Η παραγγελία αγοράς καταχωρήθηκε
 Notify_ORDER_SUPPLIER_REFUSE=Η εντολή αγοράς απορρίφθηκε
 Notify_PROPAL_VALIDATE=Η πρόσφορα πελάτη επικυρώθηκε
@@ -125,7 +125,7 @@ SignedBy=Υπογεγραμμένο από %s
 ClosedBy=Έκλεισε από  %s
 CreatedById=Ταυτότητα χρήστη που δημιούργησε
 ModifiedById=Αναγνωριστικό χρήστη που έκανε την τελευταία αλλαγή
-ValidatedById=Ταυτότητα χρήστη που επικύρωσε 
+ValidatedById=Ταυτότητα χρήστη που επικύρωσε
 CanceledById=Ταυτότητα χρήστη που ακύρωσε
 ClosedById=Ταυτότητα χρήστη που έκλεισε
 CreatedByLogin=Είσοδος χρήστη που δημιούργησε
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Απέτυχε η μεταφόρτωση του αρχεί
 AddFolder=Δημιουργια φακέλου
 FileWasCreateFolder=Ο φάκελος <b> %s </b> έχει δημιουργηθεί
 FTPFailedToCreateFolder=Απέτυχε η δημιουργία του φακέλου <b> %s </b> .
+SelectADay=Επιλέξτε μια ημέρα στο ημερολόγιο
+SelectANewDate=Επιλέξτε μια νέα ημερομηνία
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
index 2f47cb2616f..447a6eef0a2 100644
--- a/htdocs/langs/el_GR/resource.lang
+++ b/htdocs/langs/el_GR/resource.lang
@@ -35,5 +35,7 @@ AssetNumber=Σειριακός αριθμός
 ResourceTypeCode=Κωδικός τύπου πόρου
 ImportDataset_resource_1=Πόροι
 
-ErrorResourcesAlreadyInUse=Ορισμένοι πόροι χρησιμοποιούνται 
+ErrorResourcesAlreadyInUse=Ορισμένοι πόροι χρησιμοποιούνται
 ErrorResourceUseInEvent=%s που χρησιμοποιήθηκε στο συμβάν %s
+
+MaxUsers=Μέγιστος αριθμός χρηστών (μέρη, θέσεις, κ.λπ.)
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index 0a2d8ba5aac..a3572f07e5c 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Εμφάνιση αναφοράς εξόδων
-Trips=Αναφορές εξόδων
-TripsAndExpenses=Αναφορές εξόδων
-TripsAndExpensesStatistics=Στατιστικές αναφορές εξόδων
-TripCard=Καρτέλα αναφοράς εξόδων
+AUTHOR=Αποθηκεύτηκε από
+AUTHORPAIEMENT=Πληρώθηκε από
 AddTrip=Δημιουργία αναφοράς εξόδων
-ListOfTrips=Λίστα αναφορών εξόδων
-ListOfFees=Λίστα φόρων
-TypeFees=Είδη αμοιβών
-ShowTrip=Εμφάνιση αναφοράς εξόδων
-NewTrip=Νέα αναφορά εξόδων
-LastExpenseReports=Τελευταίες %s αναφορές εξόδων
+AllExpenseReport=Όλοι οι τύποι αναφορών εξόδων
 AllExpenseReports=Όλες οι αναφορές εξόδων
-CompanyVisited=Εταιρεία / οργανισμός επισκέφθηκε
-FeesKilometersOrAmout=Ποσότητα ή χιλιόμετρα
-DeleteTrip=Διαγραφή αναφοράς εξόδων
-ConfirmDeleteTrip=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την αναφορά εξόδων;
-ListTripsAndExpenses=Λίστα αναφορών εξόδων
-ListToApprove=Σε αναμονή για έγκριση
-ExpensesArea=Τομέας αναφοράς εξόδων
+AnyOtherInThisListCanValidate=Πρόσωπο που πρέπει να ενημερωθεί για την επικύρωση του αιτήματος.
+AttachTheNewLineToTheDocument=Συνδέστε τη γραμμή με ένα μεταφορτωμένο έγγραφο
+AucuneLigne=Δεν έχει δηλωθεί ακόμη αναφορά εξόδων
+BrouillonnerTrip=Μετακίνηση αναφοράς εξόδων στην κατάσταση "Προσχέδιο"
+byEX_DAY=ανά ημέρα (περιορισμός σε %s)
+byEX_EXP=ανά γραμμή (περιορισμός σε %s)
+byEX_MON=ανά μήνα (περιορισμός σε %s)
+byEX_YEA=ανά έτος (περιορισμός σε %s)
+CANCEL_USER=Διαγράφηκε από
+CarCategory=Κατηγορία οχήματος
 ClassifyRefunded=Ταξινόμηση ως "Επιστροφή χρημάτων"
+CompanyVisited=Επισκέψεις εταιρείας/οργανισμού
+ConfirmBrouillonnerTrip=Είστε σίγουροι ότι θέλετε να μετακινήσετε αυτήν την αναφορά εξόδων στην κατάσταση "Προσχέδιο";
+ConfirmCancelTrip=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτήν την αναφορά εξόδων;
+ConfirmCloneExpenseReport=Είστε σίγουροι ότι θέλετε να αντιγράψετε αυτήν την αναφορά εξόδων;
+ConfirmDeleteTrip=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την αναφορά εξόδων;
+ConfirmPaidTrip=Είστε σίγουροι ότι θέλετε να αλλάξετε την κατάσταση αυτής της αναφοράς εξόδων σε "Πληρωμένη";
+ConfirmRefuseTrip=Είστε σίγουροι ότι θέλετε να απορρίψετε αυτήν την αναφορά εξόδων;
+ConfirmSaveTrip=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την αναφορά εξόδων;
+ConfirmValideTrip=Είστε σιγουροι ότι θέλετε να εγκρίνετε αυτή την αναφορά εξόδων;
+DATE_CANCEL=Ημερομηνία ακύρωσης
+DATE_PAIEMENT=Ημερομηνία πληρωμής
+DATE_REFUS=Ημερομηνία απόρριψης
+DATE_SAVE=Ημερομηνία Επικύρωσης
+DefaultCategoryCar=Προεπιλεγμένος τρόπος μεταφοράς
+DefaultRangeNumber=Προεπιλεγμένος αριθμός εύρους
+DeleteTrip=Διαγραφή αναφοράς εξόδων
+ErrorDoubleDeclaration=Έχετε δηλώσει άλλη αναφορά εξόδων σε παρόμοιο εύρος ημερομηνιών.
+Error_EXPENSEREPORT_ADDON_NotDefined=Σφάλμα, ο κανόνας για την αρίθμηση αναφοράς εξόδων δεν ορίστηκε στη ρύθμιση της ενότητας "Αναφορά εξόδων"
+ExpenseRangeOffset=Ποσό απόκλισης: %s
+expenseReportCatDisabled=Απενεργοποιημένη κατηγορία - δείτε το λεξικό c_exp_tax_cat
+expenseReportCoef=Συντελεστής
+expenseReportCoefUndefined=(η τιμή δεν έχει καθοριστεί)
+expenseReportOffset=Απόκλιση
+expenseReportPrintExample=Απόκλιση + (d x συντελεστής) = %s
+expenseReportRangeDisabled=Το εύρος είναι απενεργοποιημένο - ανατρέξτε στο λεξικό c_exp_tax_range
+expenseReportRangeFromTo=από %d σε %d
+expenseReportRangeMoreThan=περισσότερο από %d
+expenseReportTotalForFive=Παράδειγμα με <u>d</u> = 5
+ExpenseReportApplyTo=Εφαρμογή σε
+ExpenseReportApproved=Έχει εγκριθεί η αναφορά εξόδων
+ExpenseReportApprovedMessage=Η αναφορά εξόδων %s εγκρίθηκε. <br> - Χρήστης: %s <br> - Εγκρίθηκε από: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
+ExpenseReportCanceled=Η αναφορά εξόδων ακυρώθηκε
+ExpenseReportCanceledMessage=Η αναφορά εξόδων %s ακυρώθηκε. <br> - Χρήστης: %s <br> - Ακυρώθηκε από: %s <br> - Αιτιολόγηση για ακύρωση: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
+ExpenseReportConstraintViolationError=Υπέρβαση του μέγιστου ποσού (κανόνας %s): το %s είναι υψηλότερο από το %s (Η υπέρβαση απαγορεύεται)
+ExpenseReportConstraintViolationWarning=Υπέρβαση του μέγιστου ποσού (κανόνας %s): το %s είναι υψηλότερο από το %s (Υπέρβαση εξουσιοδοτημένου)
+ExpenseReportDateEnd=Ημερομηνία λήξης
+ExpenseReportDateStart=Ημερομηνία Έναρξης
+ExpenseReportDomain=Τομέας για εφαρμογή
+ExpenseReportIkDesc=Μπορείτε να τροποποιήσετε τον υπολογισμό των εξόδων χιλιομέτρων ανά κατηγορία και εύρος που έχουν οριστεί προηγουμένως. <b>d</b> είναι η απόσταση σε χιλιόμετρα
+ExpenseReportLimitAmount=Μέγιστο ποσό
+ExpenseReportLimitOn=Περιορισμός σε
+ExpenseReportLine=Γραμμή αναφοράς εξόδων
+ExpenseReportPaid=Καταβλήθηκε ποσό αναφοράς εξόδων
+ExpenseReportPaidMessage=Η αναφορά εξόδων %s καταβλήθηκε. <br> - Χρήστης: %s <br> - Πληρωμή από: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
+ExpenseReportPayment=Πληρωμή αναφοράς εξόδων
+ExpenseReportRef=Αναφ. αναφοράς εξόδων
+ExpenseReportRefused=Η αναφορά εξόδων απορρίφθηκε
+ExpenseReportRefusedMessage=Η αναφορά εξόδων %s απορρίφθηκε. <br> - Χρήστης: %s <br> - απορρίφθηκε από: %s <br> - Αιτιολόγηση απόρριψης: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
+ExpenseReportRestrictive=Η υπέρβαση απαγορεύεται
+ExpenseReportRuleErrorOnSave=Σφάλμα: %s
+ExpenseReportRuleSave=Ο κανόνας αναφοράς εξόδων αποθηκεύτηκε
+ExpenseReportRulesDesc=Μπορείτε να ορίσετε κανόνες μέγιστου ποσού για αναφορές εξόδων. Αυτοί οι κανόνες θα εφαρμόζονται όταν ένα νέο έξοδο προστίθεται σε μια αναφορά εξόδων
 ExpenseReportWaitingForApproval=Μια νέα αναφορά εξόδων έχει υποβληθεί προς έγκριση
 ExpenseReportWaitingForApprovalMessage=Έχει υποβληθεί νέα αναφορά εξόδων και είναι σε αναμονή έγκρισης. <br> - Χρήστης: %s <br> - Περίοδος: %s <br> Κάντε κλικ εδώ για επικύρωση: %s
 ExpenseReportWaitingForReApproval=Έχει υποβληθεί μια αναφορά εξόδων για επανέγκριση
 ExpenseReportWaitingForReApprovalMessage=Έχει υποβληθεί αναφορά εξόδων και αναμένει επανέγκριση. <br> Την %s, αρνηθήκατε να εγκρίνετε την αναφορά εξόδων για το λόγο αυτό: %s. <br> Έχει προταθεί μια νέα έκδοση και περιμένει την έγκρισή σας. <br> - Χρήστης: %s <br> - Περίοδος: %s <br> Κάντε κλικ εδώ για να επικυρώσετε: %s
-ExpenseReportApproved=Έχει εγκριθεί η αναφορά εξόδων
-ExpenseReportApprovedMessage=Η αναφορά εξόδων %s εγκρίθηκε. <br> - Χρήστης: %s <br> - Εγκρίθηκε από: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
-ExpenseReportRefused=Η αναφορά εξόδων απορρίφθηκε
-ExpenseReportRefusedMessage=Η αναφορά εξόδων %s απορρίφθηκε. <br> - Χρήστης: %s <br> - απορρίφθηκε από: %s <br> - Αιτιολόγηση απόρριψης: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
-ExpenseReportCanceled=Η αναφορά εξόδων ακυρώθηκε
-ExpenseReportCanceledMessage=Η αναφορά εξόδων %s ακυρώθηκε. <br> - Χρήστης: %s <br> - Ακυρώθηκε από: %s <br> - Αιτιολόγηση για ακύρωση: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
-ExpenseReportPaid=Καταβλήθηκε ποσό αναφοράς εξόδων
-ExpenseReportPaidMessage=Η αναφορά εξόδων %s καταβλήθηκε. <br> - Χρήστης: %s <br> - Πληρωμή από: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
-TripId=Αναγνωριστικό αναφοράς εξόδων
-AnyOtherInThisListCanValidate=Πρόσωπο που πρέπει να ενημερωθεί για την επικύρωση του αιτήματος.
-TripSociete=Πληροφορίες εταιρίας
-TripNDF=Πληροφορίες αναφοράς εξόδων 
-PDFStandardExpenseReports=Τυπικό πρότυπο για τη δημιουργία ενός εγγράφου PDF για την αναφορά εξόδων
-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=καύσιμα
-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=Συντήρηση και επισκευή βιογραφικού σημειώματος
-EX_EMM=Γεύμα εργαζομένων
-EX_GUM=Γεύμα φιλοξενουμένων
-EX_BRE=Πρωινό γεύμα
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Πάρκινγκ PV
-EX_CAM_VP=PV συντήρηση και επισκευή
-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
-expenseReportPrintExample=Απόκλιση + (d x συντελεστής) = %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 (Υπέρβαση εξουσιοδοτημένου)
+ExpenseReportsToApprove=Αναφορές εξόδων για έγκριση
+ExpenseReportsToPay=Αναφορές εξόδων για πληρωμή
+ExpensesArea=Τομέας αναφοράς εξόδων
+FeesKilometersOrAmout=Ποσότητα ή χιλιόμετρα
+LastExpenseReports=Τελευταίες %s αναφορές εξόδων
+ListOfFees=Λίστα χρεώσεων
+ListOfTrips=Λίστα αναφορών εξόδων
+ListToApprove=Σε αναμονή για έγκριση
+ListTripsAndExpenses=Λίστα αναφορών εξόδων
+MOTIF_CANCEL=Λόγος
+MOTIF_REFUS=Λόγος
+ModePaiement=Τρόπος πληρωμής
+NewTrip=Νέα αναφορά εξόδων
 nolimitbyEX_DAY=ανά ημέρα (χωρίς περιορισμό)
+nolimitbyEX_EXP=κατά γραμμή (χωρίς περιορισμό)
 nolimitbyEX_MON=ανά μήνα (χωρίς περιορισμό)
 nolimitbyEX_YEA=ανά έτος (χωρίς περιορισμό)
-nolimitbyEX_EXP=κατά γραμμή (χωρίς περιορισμό)
-CarCategory=Κατηγορία οχήματος
-ExpenseRangeOffset=Ποσό απόκλισης: %s
+NoTripsToExportCSV=Δεν υπάρχει αναφορά εξόδων για εξαγωγή για αυτήν την περίοδο.
+NOT_AUTHOR=Δεν είστε ο συντάκτης αυτής της αναφοράς εξόδων. Η λειτουργία ακυρώθηκε.
+OnExpense=Γραμμή εξόδων
+PDFStandardExpenseReports=Τυπικό πρότυπο για τη δημιουργία ενός εγγράφου PDF για την αναφορά εξόδων
+PaidTrip=Πληρώστε μια αναφορά εξόδων
+REFUSEUR=Απορρίφθηκε από
 RangeIk=Εύρος χιλιομέτρων
-AttachTheNewLineToTheDocument=Συνδέστε τη γραμμή με ένα μεταφορτωμένο έγγραφο
+RangeNum=Εύρος %d
+SaveTrip=Επικύρωση αναφοράς εξόδων
+ShowExpenseReport=Εμφάνιση αναφοράς εξόδων
+ShowTrip=Εμφάνιση αναφοράς εξόδων
+TripCard=Καρτέλα αναφοράς εξόδων
+TripId=Αναγνωριστικό αναφοράς εξόδων
+TripNDF=Πληροφορίες αναφοράς εξόδων
+TripSociete=Πληροφορίες εταιρίας
+Trips=Αναφορές εξόδων
+TripsAndExpenses=Αναφορές εξόδων
+TripsAndExpensesStatistics=Στατιστικές αναφορές εξόδων
+TypeFees=Τύποι χρεώσεων
+UploadANewFileNow=Μεταφορτώστε ένα νέο έγγραφο τώρα
+VALIDATOR=Χρήστης υπεύθυνος για την έγκριση
+VALIDOR=Εγκρίθηκε από
+ValidateAndSubmit=Επικύρωση και υποβολή για έγκριση
+ValidatedWaitingApproval=Επικυρώθηκε (αναμονή για έγκριση)
+ValideTrip=Έγκριση αναφοράς εξόδων
+
+## Dictionary
+EX_BRE=Πρωινό γεύμα
+EX_CAM=Συντήρηση και επισκευή
+EX_CAM_VP=Συντήρηση και επισκευή PV
+EX_CAR=Ενοικίαση αυτοκινήτων
+EX_CUR=Αποδείξεις πελατών
+EX_DOC=Τεκμηρίωση
+EX_EMM=Γεύμα εργαζομένων
+EX_FUE=καύσιμα
+EX_FUE_VP=Kαύσιμα PV
+EX_GUM=Γεύμα φιλοξενουμένων
+EX_HOT=Ξενοδοχείο
+EX_IND=Συνδρομή ασφαλιστικής κάλυψης μεταφοράς
+EX_KME=κόστος ανά χιλιόμετρο
+EX_OTR=Άλλες αποδείξεις
+EX_PAR=Χώρος στάθμευσης
+EX_PAR_VP=Πάρκινγκ PV
+EX_POS=Ταχυδρομικά τέλη
+EX_SUM=Προμήθεια συντήρησης
+EX_SUO=Προμήθειες γραφείου
+EX_TAX=Διάφοροι φόροι
+EX_TOL=Διόδια
+EX_TOL_VP=Διόδια PV
+TF_BUS=Λεωφορείο
+TF_CAR=Όχημα
+TF_ESSENCE=Καύσιμα
+TF_HOTEL=Ξενοδοχείο
+TF_LUNCH=Γεύμα
+TF_METRO=Μετρό
+TF_OTHER=Άλλο
+TF_PEAGE=Διόδια
+TF_TAXI=Ταξί
+TF_TRAIN=Τρένο
+TF_TRIP=Μεταφορικά
diff --git a/htdocs/langs/en_AE/datapolicy.lang b/htdocs/langs/en_AE/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_AE/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_AE/errors.lang b/htdocs/langs/en_AE/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_AE/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_AE/holiday.lang b/htdocs/langs/en_AE/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/en_AE/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/en_AE/languages.lang b/htdocs/langs/en_AE/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_AE/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_AE/orders.lang b/htdocs/langs/en_AE/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/en_AE/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/en_AE/partnership.lang b/htdocs/langs/en_AE/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/en_AE/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/en_AU/datapolicy.lang b/htdocs/langs/en_AU/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_AU/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_AU/errors.lang b/htdocs/langs/en_AU/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_AU/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_AU/holiday.lang b/htdocs/langs/en_AU/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/en_AU/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/en_AU/languages.lang b/htdocs/langs/en_AU/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_AU/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_AU/orders.lang b/htdocs/langs/en_AU/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/en_AU/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/en_AU/partnership.lang b/htdocs/langs/en_AU/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/en_AU/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/en_CA/datapolicy.lang b/htdocs/langs/en_CA/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_CA/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_CA/errors.lang b/htdocs/langs/en_CA/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_CA/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_CA/holiday.lang b/htdocs/langs/en_CA/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/en_CA/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/en_CA/languages.lang b/htdocs/langs/en_CA/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_CA/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_CA/orders.lang b/htdocs/langs/en_CA/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/en_CA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/en_CA/partnership.lang b/htdocs/langs/en_CA/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/en_CA/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index a78eda7cf04..597b930235e 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -26,7 +26,6 @@ InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> fil
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying the document is no longer possible. Note: Using this feature disables your ability to build global merged PDFs.
 MeasuringUnit=Measurement unit
 MAIN_MAIL_AUTOCOPY_TO=Copy (Cc) all sent emails to
-MAIN_MAIL_SENDMODE=Sending method
 ModuleFamilyHr=Human Resources Management (HR)
 ModuleFamilyTechnic=Multi-module tools
 NotExistsDirect=The alternative root directory is not defined in an existing directory.<br>
@@ -36,7 +35,6 @@ GenericNumRefModelDesc=Returns a customisable number according to a defined mask
 ListOfDirectories=List of OpenDocument template directories
 ListOfDirectoriesForModelGenODT=List of directories containing template files in OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between each 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>.
 FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation:
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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.
 Module50200Name=PayPal
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
diff --git a/htdocs/langs/en_GB/datapolicy.lang b/htdocs/langs/en_GB/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_GB/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_GB/errors.lang b/htdocs/langs/en_GB/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_GB/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_GB/languages.lang b/htdocs/langs/en_GB/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_GB/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_IN/datapolicy.lang b/htdocs/langs/en_IN/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_IN/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_IN/errors.lang b/htdocs/langs/en_IN/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_IN/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_IN/holiday.lang b/htdocs/langs/en_IN/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/en_IN/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/en_IN/languages.lang b/htdocs/langs/en_IN/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_IN/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_IN/orders.lang b/htdocs/langs/en_IN/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/en_IN/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/en_IN/partnership.lang b/htdocs/langs/en_IN/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/en_IN/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/en_SG/datapolicy.lang b/htdocs/langs/en_SG/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_SG/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_SG/errors.lang b/htdocs/langs/en_SG/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_SG/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_SG/holiday.lang b/htdocs/langs/en_SG/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/en_SG/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/en_SG/languages.lang b/htdocs/langs/en_SG/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_SG/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_SG/orders.lang b/htdocs/langs/en_SG/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/en_SG/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/en_SG/partnership.lang b/htdocs/langs/en_SG/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/en_SG/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/en_ZA/datapolicy.lang b/htdocs/langs/en_ZA/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/en_ZA/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/en_ZA/errors.lang b/htdocs/langs/en_ZA/errors.lang
deleted file mode 100644
index 1f998d29e16..00000000000
--- a/htdocs/langs/en_ZA/errors.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
diff --git a/htdocs/langs/en_ZA/holiday.lang b/htdocs/langs/en_ZA/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/en_ZA/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/en_ZA/languages.lang b/htdocs/langs/en_ZA/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/en_ZA/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/en_ZA/orders.lang b/htdocs/langs/en_ZA/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/en_ZA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/en_ZA/partnership.lang b/htdocs/langs/en_ZA/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/en_ZA/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index cb9808bd9b0..91e6203ec1e 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -202,7 +202,6 @@ MAIN_MAIL_AUTOCOPY_TO=Copiar (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todo el envío de correo electrónico (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo.
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
@@ -256,7 +255,6 @@ Module80Name=Envíos
 Module80Desc=Gestión de envíos y remitos
 Module510Name=Sueldos
 Module4000Name=ARH
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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.
 Module62000Name=Incotérminos
 Permission23001=Leer tarea programada
 Permission23002=Crear/actualizar tarea programada
diff --git a/htdocs/langs/es_BO/errors.lang b/htdocs/langs/es_BO/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_BO/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_BO/holiday.lang b/htdocs/langs/es_BO/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_BO/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_BO/languages.lang b/htdocs/langs/es_BO/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_BO/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_BO/orders.lang b/htdocs/langs/es_BO/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_BO/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_BO/partnership.lang b/htdocs/langs/es_BO/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_BO/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 8c688304770..f8b0aa1bb3e 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -205,7 +205,6 @@ MAIN_MAIL_AUTOCOPY_TO=Copiar (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todo el envío de correo electrónico (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos electrónicos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo electrónico
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Utilizar cifrado TLS (SSL)
@@ -436,7 +435,6 @@ Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los e
 Module3400Name=Redes Sociales
 Module5000Name=Multi-compañía
 Module5000Desc=Le permite administrar múltiples compañías
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Gestión de solicitudes de licencia
 Module20000Desc=Definir y rastrear las solicitudes de permiso de los empleados.
 Module39000Desc=Lotes, números de serie, gestión de la fecha de caducidad de los productos.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 1e73c4c2049..8de90100578 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -298,6 +298,7 @@ DateFormatYYYYMMDD=AAAA-MM-DD
 DateFormatYYYYMMDDHHMM=AAAA-MM-DD HH: SS
 ReportName=Reportar nombre
 ReportPeriod=Período del informe
+Reports=Reportes
 Keyword=Palabra clave
 Fill=Llenar
 Reset=Reiniciar
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index dccb404facd..71eda1f7816 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -14,7 +14,6 @@ ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
 ModuleBuilderDescwidgets=Esta pestaña está dedicada a administrar / construir widgets.
 ModuleBuilderDescbuildpackage=Puede generar aquí un archivo de paquete "listo para distribuir" (un archivo .zip normalizado) de su módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para construir el paquete o archivo de documentación.
 EnterNameOfModuleToDeleteDesc=Puedes borrar tu módulo. ADVERTENCIA: ¡Se eliminarán todos los archivos de codificación del módulo (generados o creados manualmente) Y los datos y la documentación estructurados!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 BuildPackage=Paquete de compilación
 BuildPackageDesc=Puede generar un paquete zip de su aplicación para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en un mercado como <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Documentación de construcción
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index 78416262295..759005d22ed 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -96,7 +96,6 @@ DispatchSupplierOrder=Recibiendo orden de compra %s
 FirstApprovalAlreadyDone=Primera aprobación ya hecha
 SecondApprovalAlreadyDone=Segunda aprobación ya hecha
 SupplierOrderReceivedInDolibarr=La orden de compra %s recibió %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 SupplierOrderClassifiedBilled=Pedido de compra %s establecido facturado
 OtherOrders=Otras órdenes
 TypeContact_commande_internal_SALESREPFOLL=Representante seguimiento de orden de venta
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 64f6ec6e4bd..c0f4d40169e 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -217,7 +217,6 @@ MAIN_MAIL_AUTOCOPY_TO=Copiar (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todo el envío de correo electrónico (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos electrónicos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo electrónico
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Utilizar cifrado TLS (SSL)
@@ -476,7 +475,6 @@ Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los e
 Module3400Desc=Habilite los campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook, ...).
 Module5000Desc=Le permite gestionar múltiples empresas.
 Module6000Desc=Gestión del flujo de trabajo entre diferentes módulos (creación automática de objeto y / o cambio de estado automático)
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Gestión de solicitudes de licencia/permisos
 Module20000Desc=Definir y realizar un seguimiento de las solicitudes de licencia/permisos de los empleados
 Module39000Desc=Lotes, números de serie, gestión de fechas de caducidad "ingerir antes de/vender antes de" de productos
diff --git a/htdocs/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
index 9e468fcf251..8e5a8f2a340 100644
--- a/htdocs/langs/es_CO/errors.lang
+++ b/htdocs/langs/es_CO/errors.lang
@@ -2,7 +2,6 @@
 NoErrorCommitIsDone=Sin error, nos comprometemos
 ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
 ErrorBadValueForParamNotAString=Mal valor para su parámetro. Generalmente se adjunta cuando falta la traducción.
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
 ErrorLoginAlreadyExists=El inicio de sesión %s ya existe.
 ErrorRecordNotFound=Registro no encontrado.
 ErrorRecordNotFoundShort=Extraviado
diff --git a/htdocs/langs/es_CO/holiday.lang b/htdocs/langs/es_CO/holiday.lang
index 1d95a74c455..eb0a156a128 100644
--- a/htdocs/langs/es_CO/holiday.lang
+++ b/htdocs/langs/es_CO/holiday.lang
@@ -3,7 +3,6 @@ Holidays=Sale de
 Holiday=Salir
 CPTitreMenu=Salir
 MenuAddCP=Nueva solicitud de licencia
-MenuCollectiveAddCP=New collective leave
 NotActiveModCP=Debe habilitar el módulo Salir para ver esta página.
 AddCP=Hacer una solicitud de licencia
 DateDebCP=Fecha de inicio
@@ -72,8 +71,6 @@ LogCP=Registro de todas las actualizaciones realizadas en "Saldo de licencia"
 PrevSoldeCP=Balance anterior
 NewSoldeCP=Nuevo equilibrio
 alreadyCPexist=Ya se ha realizado una solicitud de licencia en este período.
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
 FirstDayOfHoliday=Solicitud del día de inicio de la licencia
 LastDayOfHoliday=Solicitud de fin de día de licencia
 EmployeeLastname=Apellido del empleado
diff --git a/htdocs/langs/es_CO/modulebuilder.lang b/htdocs/langs/es_CO/modulebuilder.lang
index 978c328cbe4..1851409e9c7 100644
--- a/htdocs/langs/es_CO/modulebuilder.lang
+++ b/htdocs/langs/es_CO/modulebuilder.lang
@@ -15,7 +15,6 @@ ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
 ModuleBuilderDescwidgets=Esta pestaña está dedicada a administrar / construir widgets.
 ModuleBuilderDescbuildpackage=Puede generar aquí un archivo de paquete "listo para distribuir" (un archivo .zip normalizado) de su módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para crear el paquete o el archivo de documentación.
 EnterNameOfModuleToDeleteDesc=Puede eliminar su módulo. ADVERTENCIA: ¡Se eliminarán todos los archivos de codificación del módulo (generados o creados manualmente) Y los datos estructurados y la documentación!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 BuildPackage=Paquete de compilación
 BuildPackageDesc=Puede generar un paquete zip de su aplicación para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en un mercado como <a href="https://www.dolistore.com"> DoliStore.com </a>.
 BuildDocumentation=Construir documentación
diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang
index 6b34c98ba1a..48964b5c2fe 100644
--- a/htdocs/langs/es_CO/orders.lang
+++ b/htdocs/langs/es_CO/orders.lang
@@ -107,7 +107,6 @@ DispatchSupplierOrder=Recibiendo orden de compra %s
 FirstApprovalAlreadyDone=Primera aprobación ya hecha
 SecondApprovalAlreadyDone=Segunda aprobación ya hecha
 SupplierOrderReceivedInDolibarr=Orden de compra %s recibida %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 SupplierOrderClassifiedBilled=Orden de compra %s conjunto facturado
 OtherOrders=Otras ordenes
 TypeContact_commande_internal_SALESREPFOLL=Representante en seguimiento de orden de venta
diff --git a/htdocs/langs/es_CO/partnership.lang b/htdocs/langs/es_CO/partnership.lang
index 37bf21edd0f..512a1e0d37d 100644
--- a/htdocs/langs/es_CO/partnership.lang
+++ b/htdocs/langs/es_CO/partnership.lang
@@ -10,7 +10,6 @@ PartnershipAbout=Acerca de la asociación
 PartnershipAboutPage=Página "acerca de" la asociación
 ReferingWebsiteCheck=Comprobación de la referencia del sitio web
 DatePartnershipEnd=Fecha final
-ReasonDeclineOrCancel=Reason for refusal or cancellation
 PartnershipCanceled=Cancelado
 PartnershipManagedFor=Socios son
 NewPartnershipRequestDesc=Este formulario le permite solicitar ser parte de uno de nuestros programas de asociación. Si necesita ayuda para completar este formulario, comuníquese por correo electrónico <b>%s</b>.
diff --git a/htdocs/langs/es_CR/admin.lang b/htdocs/langs/es_CR/admin.lang
index 2f7f768853a..7753e55b593 100644
--- a/htdocs/langs/es_CR/admin.lang
+++ b/htdocs/langs/es_CR/admin.lang
@@ -212,7 +212,6 @@ MAIN_MAIL_AUTOCOPY_TO=Copie (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilite todos los envíos de correo electrónico (para fines de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, con fines de prueba)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos electrónicos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo electrónico
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_STARTTLS=Usar encriptación TLS (STARTTLS)
@@ -497,7 +496,6 @@ Module4000Name=gestión de recursos humanos
 Module5000Name=multiempresa
 Module5000Desc=Le permite administrar varias empresas
 Module10000Name=sitios web
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Gestión de solicitudes de licencia
 Module20000Desc=Defina y realice un seguimiento de las solicitudes de licencia de los empleados
 Module39000Desc=Gestión de lotes, números de serie, fecha de caducidad/fecha de caducidad de los productos
diff --git a/htdocs/langs/es_CR/errors.lang b/htdocs/langs/es_CR/errors.lang
index ec1e83ac4f4..8034771cf37 100644
--- a/htdocs/langs/es_CR/errors.lang
+++ b/htdocs/langs/es_CR/errors.lang
@@ -3,7 +3,6 @@ NoErrorCommitIsDone=No hay error, nos comprometemos
 ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
 ErrorBadEMail=Dirección de correo electrónico %s es incorrecto
 ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Se anexa generalmente cuando falta la traducción.
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
 ErrorLoginAlreadyExists=La conexión%s ya existe.
 ErrorGroupAlreadyExists=El grupo%s ya existe.
 ErrorRecordNotFound=Registro no encontrado.
diff --git a/htdocs/langs/es_CR/holiday.lang b/htdocs/langs/es_CR/holiday.lang
index 7199e033c93..423e06d9815 100644
--- a/htdocs/langs/es_CR/holiday.lang
+++ b/htdocs/langs/es_CR/holiday.lang
@@ -4,7 +4,6 @@ Holidays=Licencias
 Holiday=Licencia
 CPTitreMenu=Licencia
 MenuAddCP=Nueva solicitud de permiso
-MenuCollectiveAddCP=New collective leave
 NotActiveModCP=Debe habilitar el módulo de Licencias para ver esta página
 AddCP=Crear una solicitud de licencia
 DateDebCP=Fecha de inicio
@@ -71,8 +70,6 @@ NewSoldeCP=Nuevo equilibrio
 alreadyCPexist=Ya se ha hecho una solicitud de permiso en este período
 UseralreadyCPexist=Ya se ha hecho una solicitud de permiso en este periodo para %s
 AutoSendMail=Correo automático
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
 FirstDayOfHoliday=Inicio del día de la solicitud de licencia
 LastDayOfHoliday=Final de día de la solicitud de licencia
 EmployeeLastname=Apellido del empleado
diff --git a/htdocs/langs/es_CR/modulebuilder.lang b/htdocs/langs/es_CR/modulebuilder.lang
index ffb7a0cb39d..d69b781b5a2 100644
--- a/htdocs/langs/es_CR/modulebuilder.lang
+++ b/htdocs/langs/es_CR/modulebuilder.lang
@@ -3,7 +3,6 @@ ModuleBuilderDesc3=Se encontraron módulos generados/editables: <strong>%s</stro
 NewObjectInModulebuilder=Nuevo Objeto
 ModuleBuilderDescspecifications=Puede ingresar aquí una descripción detallada de las especificaciones de su módulo que aún no está estructurada en otras pestañas. Así que tienes a tu alcance todas las reglas a desarrollar. También este contenido de texto se incluirá en la documentación generada (ver la última pestaña). Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (comparación entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
 ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 ClassFile=Archivo para la clase PHP DAO CRUD
 RegenerateMissingFiles=Generar archivos perdidos
 ConfirmDeleteProperty=¿Estás seguro de que quieres eliminar la propiedad <strong>%s</strong>? Esto cambiará el código en la clase de PHP pero también eliminará la columna de la definición de la tabla del objeto.
diff --git a/htdocs/langs/es_CR/orders.lang b/htdocs/langs/es_CR/orders.lang
index ee9bec43870..cd7f0689b67 100644
--- a/htdocs/langs/es_CR/orders.lang
+++ b/htdocs/langs/es_CR/orders.lang
@@ -82,7 +82,6 @@ DispatchSupplierOrder=Recibiendo orden de compra %s
 FirstApprovalAlreadyDone=Primera aprobación ya realizada
 SecondApprovalAlreadyDone=Segunda aprobación ya realizada
 SupplierOrderReceivedInDolibarr=Orden de compra %s recibida %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 TypeContact_commande_internal_SALESREPFOLL=Representante en seguimiento de orden de venta
 TypeContact_commande_internal_SHIPPING=Representante en seguimiento de envío
 TypeContact_commande_external_BILLING=Contacto de factura de cliente
diff --git a/htdocs/langs/es_CR/partnership.lang b/htdocs/langs/es_CR/partnership.lang
index 5ea3def0949..a6d319f5e3d 100644
--- a/htdocs/langs/es_CR/partnership.lang
+++ b/htdocs/langs/es_CR/partnership.lang
@@ -5,7 +5,6 @@ PartnershipDescriptionLong=Gestión Módulo Asociaciones
 Partnership=Asociación
 PartnershipAbout=Acerca de la asociación
 PublicFormRegistrationPartnerDesc=Dolibarr puede proporcionarle una URL/sitio web público para permitir que los visitantes externos soliciten ser parte del programa de asociación
-ReasonDeclineOrCancel=Reason for refusal or cancellation
 KeywordToCheckInWebsite=Si desea comprobar que una determinada palabra clave está presente en el sitio web de cada socio, defina esta palabra clave aquí
 PartnershipCanceled=Cancelado
 PartnershipManagedFor=Los socios son
diff --git a/htdocs/langs/es_CU/admin.lang b/htdocs/langs/es_CU/admin.lang
index a4c0401fe82..ab2c43c60e3 100644
--- a/htdocs/langs/es_CU/admin.lang
+++ b/htdocs/langs/es_CU/admin.lang
@@ -220,7 +220,6 @@ MAIN_MAIL_AUTOCOPY_TO=Copie (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilite todos los envíos de correo electrónico (para fines de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, con fines de prueba)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos electrónicos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo electrónico
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_STARTTLS=Usar encriptación TLS (STARTTLS)
@@ -495,7 +494,6 @@ Module4000Name=gestión de recursos humanos
 Module5000Name=multiempresa
 Module5000Desc=Le permite administrar varias empresas
 Module10000Name=sitios web
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Gestión de solicitudes de licencia
 Module20000Desc=Defina y realice un seguimiento de las solicitudes de licencia de los empleados
 Module39000Desc=Gestión de lotes, números de serie, fecha de caducidad/fecha de caducidad de los productos
diff --git a/htdocs/langs/es_CU/errors.lang b/htdocs/langs/es_CU/errors.lang
index 2e3678f2372..f6a24e4fc72 100644
--- a/htdocs/langs/es_CU/errors.lang
+++ b/htdocs/langs/es_CU/errors.lang
@@ -2,7 +2,6 @@
 NoErrorCommitIsDone=No hay error, nos comprometemos
 ErrorButCommitIsDone=Errores encontrados pero validamos a pesar de esto
 ErrorBadValueForParamNotAString=Mal valor para su parámetro. Se agrega generalmente cuando falta la traducción.
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
 ErrorLoginAlreadyExists=El inicio de sesión %s ya existe.
 ErrorRecordNotFound=Registro no encontrado.
 ErrorRecordNotFoundShort=Extraviado
diff --git a/htdocs/langs/es_CU/holiday.lang b/htdocs/langs/es_CU/holiday.lang
index 5b144c4ef0d..e925ab8b875 100644
--- a/htdocs/langs/es_CU/holiday.lang
+++ b/htdocs/langs/es_CU/holiday.lang
@@ -3,7 +3,6 @@ HRM=gestión de recursos humanos
 Holiday=Dejar
 CPTitreMenu=Dejar
 MenuAddCP=Nueva solicitud de vacaciones
-MenuCollectiveAddCP=New collective leave
 NotActiveModCP=Debe habilitar el módulo Salir para ver esta página.
 AddCP=Hacer una solicitud de licencia
 DateDebCP=Fecha de inicio
@@ -68,8 +67,6 @@ PrevSoldeCP=Balance anterior
 NewSoldeCP=Nuevo equilibrio
 alreadyCPexist=Ya se ha hecho una solicitud de permiso en este período.
 UseralreadyCPexist=Ya se ha realizado una solicitud de licencia en este período para %s.
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
 EmployeeLastname=apellido del empleado
 TypeWasDisabledOrRemoved=El tipo de licencia (id %s) se deshabilitó o eliminó
 LastHolidays=Últimas solicitudes de licencia %s
diff --git a/htdocs/langs/es_CU/modulebuilder.lang b/htdocs/langs/es_CU/modulebuilder.lang
index 9a2cba20d9f..38e134a097d 100644
--- a/htdocs/langs/es_CU/modulebuilder.lang
+++ b/htdocs/langs/es_CU/modulebuilder.lang
@@ -14,7 +14,6 @@ ModuleBuilderDesctriggers=Esta es la vista de disparadores proporcionada por su
 ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
 ModuleBuilderDescbuildpackage=Puede generar aquí un archivo de paquete "listo para distribuir" (un archivo .zip normalizado) de su módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para crear el paquete o el archivo de documentación.
 EnterNameOfModuleToDeleteDesc=Puede eliminar su módulo. ADVERTENCIA: ¡Todos los archivos de codificación del módulo (generados o creados manualmente) Y los datos estructurados y la documentación serán eliminados!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 BuildPackage=Paquete de compilación
 BuildPackageDesc=Puede generar un paquete zip de su aplicación para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en un mercado como <a href="https://www.dolistore.com"> DoliStore.com </a>.
 BuildDocumentation=Crear documentación
diff --git a/htdocs/langs/es_CU/orders.lang b/htdocs/langs/es_CU/orders.lang
index 2c3726ec19c..7dcaa6f9bd6 100644
--- a/htdocs/langs/es_CU/orders.lang
+++ b/htdocs/langs/es_CU/orders.lang
@@ -101,7 +101,6 @@ DispatchSupplierOrder=Recibiendo orden de compra %s
 FirstApprovalAlreadyDone=Primera aprobación ya hecha
 SecondApprovalAlreadyDone=Segunda aprobación ya hecha
 SupplierOrderReceivedInDolibarr=Pedido de compra %s recibido %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 SupplierOrderClassifiedBilled=Orden de compra %s conjunto facturado
 TypeContact_commande_internal_SALESREPFOLL=Representante de seguimiento de pedidos de venta.
 TypeContact_commande_internal_SHIPPING=Envío de seguimiento representativo
diff --git a/htdocs/langs/es_CU/partnership.lang b/htdocs/langs/es_CU/partnership.lang
index a9845b5906b..88e581d1e36 100644
--- a/htdocs/langs/es_CU/partnership.lang
+++ b/htdocs/langs/es_CU/partnership.lang
@@ -14,7 +14,6 @@ PARTNERSHIP_BACKLINKS_TO_CHECK=Vínculos de retroceso para comprobar
 ReferingWebsiteCheck=Comprobación del sitio web de referencia
 DatePartnershipEnd=Fecha final
 ReasonDecline=Motivo de rechazo
-ReasonDeclineOrCancel=Reason for refusal or cancellation
 ManagePartnership=Administrar asociación
 PartnershipType=tipo de asociación
 PartnershipCanceled=Cancelado
diff --git a/htdocs/langs/es_DO/errors.lang b/htdocs/langs/es_DO/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_DO/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_DO/holiday.lang b/htdocs/langs/es_DO/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_DO/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_DO/languages.lang b/htdocs/langs/es_DO/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_DO/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_DO/orders.lang b/htdocs/langs/es_DO/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_DO/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_DO/partnership.lang b/htdocs/langs/es_DO/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_DO/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index ba635fc3e91..ec0f9dd07e8 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -201,7 +201,6 @@ MAIN_MAIL_AUTOCOPY_TO= Copiar (Bcc) todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todo el envío de correo electrónico (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerir correos electrónicos de empleados (si están definidos) en la lista de destinatarios predefinidos al escribir un nuevo correo electrónico
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
@@ -442,7 +441,6 @@ Module2900Desc=Capacidades de conversiones GeoIP Maxmind
 Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de solo lectura de eventos encadenados que se pueden exportar. Este módulo puede ser obligatorio para algunos países.
 Module5000Desc=Permite gestionar múltiples empresas
 Module10000Name=Sitios Web
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Gestión de solicitudes de licencia
 Module20000Desc=Definir y rastrear las solicitudes de permisos de los empleados.
 Module39000Desc=Lotes, números de serie, gestión de la fecha de caducidad de los productos.
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
index 966b3066574..78dc31b231b 100644
--- a/htdocs/langs/es_EC/modulebuilder.lang
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -10,7 +10,6 @@ ModuleBuilderDesctriggers=Esta es la vista de los activadores proporcionados por
 ModuleBuilderDeschooks=Esta pestaña está dedicada a los ganchos.
 ModuleBuilderDescbuildpackage=Puede generar aquí un archivo de paquete "listo para distribuir" (un archivo .zip normalizado) de su módulo y un archivo de documentación "listo para distribuir". Simplemente haga clic en el botón para crear el paquete o el archivo de documentación.
 EnterNameOfModuleToDeleteDesc=Puedes borrar tu módulo. ADVERTENCIA: ¡Todos los archivos de codificación del módulo (generados o creados manualmente) Y los datos estructurados y la documentación serán eliminados!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 BuildPackage=Paquete de construcción
 BuildPackageDesc=Puede generar un paquete zip de su aplicación para que esté listo para distribuirlo en cualquier Dolibarr. También puede distribuirlo o venderlo en el mercado como <a href="https://www.dolistore.com"> DoliStore.com </a>.
 BuildDocumentation=Crear documentación
diff --git a/htdocs/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
index 39c8193d0ef..b219764e6d3 100644
--- a/htdocs/langs/es_EC/orders.lang
+++ b/htdocs/langs/es_EC/orders.lang
@@ -97,7 +97,6 @@ DispatchSupplierOrder=Recepción de orden de compra %s
 FirstApprovalAlreadyDone=Primera aprobación ya realizada
 SecondApprovalAlreadyDone=Segunda aprobación ya realizada
 SupplierOrderReceivedInDolibarr=Orden de compra %s recibida %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 SupplierOrderClassifiedBilled=Conjunto de ordenes de compra %s facturado
 OtherOrders=Otras órdenes
 TypeContact_commande_internal_SALESREPFOLL=Representante de seguimiento del pedido
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 23fcdc977a9..181f47ff4ff 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -188,7 +188,7 @@ SuppliersDraftInvoices=Facturas de proveedores borrador
 Unpaid=Pendientes
 ErrorNoPaymentDefined=Error Sin pago definido
 ConfirmDeleteBill=¿Está seguro de querer eliminar esta factura?
-ConfirmValidateBill=¿Estás seguro de que deseas validar esta factura con la referencia <b>%s<span class='notranslate'></b></span? >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=¿Está seguro de querer cambiar el estado de la factura <b>%s</b> a borrador?
 ConfirmClassifyPaidBill=¿Está seguro de querer cambiar el estado de la factura <b>%s</b> a pagado?
 ConfirmCancelBill=¿Está seguro de querer anular la factura <b>%s</b>?
diff --git a/htdocs/langs/es_ES/eventorganization.lang b/htdocs/langs/es_ES/eventorganization.lang
index c83afcd7da0..ddef23bd7b4 100644
--- a/htdocs/langs/es_ES/eventorganization.lang
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Precio de inscripción
 PriceOfRegistrationHelp=Precio a pagar por registrarse o participar en el evento
 PriceOfBooth=Precio de suscripción para hacer stand
 PriceOfBoothHelp=Precio de suscripción para hacer stand
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Enlace ICS para conferencias
 ConferenceOrBoothInformation=Información sobre conferencias o stands
 Attendees=Asistentes
@@ -173,7 +174,7 @@ DateStartEvent=Fecha de inicio del evento
 DateEndEvent=Fecha de finalización del evento
 ModifyStatus=Modificar estado
 ConfirmModifyStatus=Confirmar modificación de estado
-ConfirmModifyStatusQuestion=¿Está seguro de que desea modificar el <span class='notranslate'>%s</span>? registro(s) seleccionado(s)?
+ConfirmModifyStatusQuestion=Are you sure you want to modify the %s selected record(s)?
 RecordsUpdated = %s Registros actualizados
 RecordUpdated = Registro actualizado
 NoRecordUpdated = Sin registro actualizado
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index 9675f1fe43a..ab87c9c0f68 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -45,7 +45,7 @@ Eval=Evaluación
 Evals=Evaluaciones
 NewEval=Nueva evaluación
 ValidateEvaluation=Validar evaluación
-ConfirmValidateEvaluation=¿Está seguro de que desea validar esta evaluación con la referencia <b>%s<span class='notranslate'></b></span? >?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Tarjeta de evaluación
 RequiredRank=Rango requerido para el perfil de trabajo
 RequiredRankShort=rango requerido
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index a4a421a463e..4fb42807ef2 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total
 TotalHT=Total (Base imp).
 TotalHTforthispage=Total (base imponible) de esta página
 Totalforthispage=Total en esta página
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total
 TotalTTCToYourCredit=Total a crédito
 TotalVAT=Total IVA
@@ -647,6 +649,7 @@ ReportName=Nombre del informe
 ReportPeriod=Periodo de análisis
 ReportDescription=Descripción
 Report=Informe
+Reports=Informes
 Keyword=Clave
 Origin=Origen
 Legend=Leyenda
diff --git a/htdocs/langs/es_ES/receptions.lang b/htdocs/langs/es_ES/receptions.lang
index ab0bb9c0197..31f6a26a61a 100644
--- a/htdocs/langs/es_ES/receptions.lang
+++ b/htdocs/langs/es_ES/receptions.lang
@@ -5,8 +5,6 @@ RefReception=Ref. recepción
 Reception=Pte. recibir
 Receptions=Recepciones
 AllReceptions=Todas las recepciones
-Reception=Pte. recibir
-Receptions=Recepciones
 ShowReception=Mostrar recepciones
 ReceptionsArea=Área recepciones
 ListOfReceptions=Listado de recepciones
@@ -36,7 +34,7 @@ ValidateReception=Validar recepción
 ConfirmDeleteReception=¿Está seguro de querer eliminar esta recepción?
 ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=¿Está seguro de querer cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
+StatsOnReceptionsOnlyValidated=Estadísticas realizadas sobre recepciones únicamente validadas. La fecha utilizada es la fecha de validación de la recepción (no siempre se conoce la fecha prevista de entrega).
 SendReceptionByEMail=Enviar recepción por e-mail
 SendReceptionRef=Envío de la recepción %s
 ActionsOnReception=Eventos sobre la recepción
@@ -53,6 +51,6 @@ ReceptionBackToDraftInDolibarr=Recepción %s volver al borrador
 ReceptionClassifyClosedInDolibarr=Recepción %s clasificado Cerrado
 ReceptionUnClassifyCloseddInDolibarr=Recepción %s Reabrir
 RestoreWithCurrentQtySaved=Rellenar cantidades con los últimos valores guardados
-ReceptionsRecorded=Receptions recorded
-ReceptionUpdated=Reception successfully updated
+ReceptionsRecorded=Recepciones registradas
+ReceptionUpdated=Recepción actualizada con éxito
 ReceptionDistribution=Recepción distribución
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 23ab79fc4c0..22ec2dc5f57 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -163,7 +163,7 @@ DateMovement=Fecha de movimiento
 InventoryCode=Movimiento o código de inventario
 IsInPackage=Contenido en el paquete
 WarehouseAllowNegativeTransfer=El stock puede ser negativvo
-qtyToTranferIsNotEnough=No tiene suficiente existencias en el almacen de referencia y la actual configuracion no permite existencias negativas 
+qtyToTranferIsNotEnough=No tiene suficiente existencias en el almacen de referencia y la actual configuracion no permite existencias negativas
 qtyToTranferLotIsNotEnough=No tiene suficientes existencias para este número de lote en el almacén de origen, y la actual configuración no permite existencias negativas (cantidad del producto '%s' con el lote '%s' es de %s en el almacén '%s').
 ShowWarehouse=Mostrar almacén
 MovementCorrectStock=Correción de sotck del producto %s
@@ -282,7 +282,7 @@ ModuleStockTransferName=Transferencia avanzada de Stock
 ModuleStockTransferDesc=Gestión avanzada de Transferencia de Stock, con generación de ficha de transferencia
 StockTransferNew=Nueva transferencia de stock
 StockTransferList=Lista de transferencias de stock
-ConfirmValidateStockTransfer=¿Está seguro de que desea validar esta transferencia de acciones con la referencia <b>%s<span class='notranslate'></b></ lapso> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Disminución de existencias con transferencia %s
 ConfirmDestockCancel=Cancelar disminución de existencias con transferencia %s
 DestockAllProduct=Disminución de existencias
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 7454b00acd0..a68b2d4ac25 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -12,7 +12,7 @@ WithdrawalsReceipts=Domiciliaciones
 WithdrawalReceipt=Domiciliación
 BankTransferReceipts=Órdenes de transferencia bancaria
 BankTransferReceipt=Orden de transferencia bancaria
-LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria 
+LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria
 LastWithdrawalReceipts=Últimas %s domiciliaciones
 WithdrawalsLine=Línea de  domiciliación bancaria
 CreditTransfer=Transferencia bancaria
@@ -48,8 +48,8 @@ WithdrawRequestsDone=%s domiciliaciones registradas
 BankTransferRequestsDone=%s solicitudes de transferencia de crédito registradas
 ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
-NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
-NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
+NoInvoiceCouldBeWithdrawedSupplier=Ninguna factura se procesó correctamente. Comprueba que las facturas sean de empresas con IBAN válido.
+NoSalariesCouldBeWithdrawed=Ningún salario se procesó exitosamente. Verifique que el salario corresponda a usuarios con un IBAN válido.
 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
@@ -66,9 +66,9 @@ WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domic
 RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
 RefusedInvoicing=Facturación de la devolución
-NoInvoiceRefused=Do not charge the customer for the refusal
-InvoiceRefused=Charge the customer for the refusal
-DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
+NoInvoiceRefused=No cobrar al cliente por la negativa
+InvoiceRefused=Cobrar al cliente por el rechazo
+DirectDebitRefusedInvoicingDesc=Establecer una bandera para decir que este rechazo debe ser cobrado al cliente
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=En espera
 StatusTrans=Enviada
@@ -118,7 +118,7 @@ RUM=RUM
 DateRUM=Fecha de firma del mandato
 RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=Si está vacío,se generará un número RUM (Referencia Unica de Mandato) una vez que se guarde la información de la cuenta bancaria
-WithdrawMode=Direct debit mode (FRST or RCUR)
+WithdrawMode=Modalidad de domiciliación bancaria (FRST o RCUR)
 WithdrawRequestAmount=Importe de la domiciliación
 BankTransferAmount=Importe de transferencia bancaria:
 WithdrawRequestErrorNilAmount=No es posible crear una domiciliación sin importe
@@ -159,16 +159,15 @@ InfoTransData=Importe: %s<br>Método: %s<br>Fecha: %s
 InfoRejectSubject=Domiciliación devuelta
 InfoRejectMessage=Buenos días:<br><br>la domiciliación de la factura %s por cuenta de la empresa %s, con un importe de %s ha sido devuelta por el banco.<br><br>--<br>%s
 ModeWarning=No se ha establecido la opción de modo real, nos detendremos después de esta simulación
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
+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=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
 UsedFor=Usado para %s
-Societe_ribSigned=SEPA mandate Signed
-NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
-SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+Societe_ribSigned=Mandato SEPA Firmado
+NbOfInvoiceToPayByBankTransferForSalaries=No. de salarios calificados en espera de pago mediante transferencia de crédito
+SalaryWaitingWithdraw=Salarios pendientes de pago mediante transferencia bancaria
 RefSalary=Salario
-NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
-SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
-
+NoSalaryInvoiceToWithdraw=Sin salario esperando un '%s'. Vaya a la pestaña '%s' en la tarjeta de salario para realizar una solicitud.
+SalaryInvoiceWaitingWithdraw=Salarios pendientes de pago mediante transferencia bancaria
diff --git a/htdocs/langs/es_GT/errors.lang b/htdocs/langs/es_GT/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_GT/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_GT/holiday.lang b/htdocs/langs/es_GT/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_GT/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_GT/languages.lang b/htdocs/langs/es_GT/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_GT/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_GT/orders.lang b/htdocs/langs/es_GT/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_GT/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_GT/partnership.lang b/htdocs/langs/es_GT/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_GT/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_HN/errors.lang b/htdocs/langs/es_HN/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_HN/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_HN/holiday.lang b/htdocs/langs/es_HN/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_HN/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_HN/languages.lang b/htdocs/langs/es_HN/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_HN/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_HN/orders.lang b/htdocs/langs/es_HN/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_HN/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_HN/partnership.lang b/htdocs/langs/es_HN/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_HN/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index bfd4ad3b0c5..4070032eedc 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -190,7 +190,6 @@ Emails=Correos electrónicos
 EMailsSetup=Configuración de correos electrónicos
 MAIN_MAIL_SMTP_PORT=Puerto SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (valor predeterminado en php.ini: <b>%s</b> )
-MAIN_MAIL_SENDMODE=Sending method
 MAIN_MAIL_SMTPS_ID=ID de SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_SMTPS_PW=Contraseña SMTP (si el servidor de envío requiere autenticación)
 MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
@@ -243,7 +242,6 @@ Module56Name=Pago por transferencia de crédito
 Module610Name=Variantes de producto
 Module3400Name=Redes Sociales
 Module10000Name=Páginas web
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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.
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
 Upgrade=Actualizar
diff --git a/htdocs/langs/es_MX/languages.lang b/htdocs/langs/es_MX/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_MX/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 041bd334cc1..0685533d69d 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -200,6 +200,7 @@ DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
 ReportPeriod=Período del informe
+Reports=Reportes
 Fill=Llenar
 Reset=Reiniciar
 NotAllowed=No permitido
diff --git a/htdocs/langs/es_PA/errors.lang b/htdocs/langs/es_PA/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_PA/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_PA/holiday.lang b/htdocs/langs/es_PA/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_PA/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_PA/languages.lang b/htdocs/langs/es_PA/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_PA/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_PA/orders.lang b/htdocs/langs/es_PA/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_PA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_PA/partnership.lang b/htdocs/langs/es_PA/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_PA/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 22611e873a3..ddb2a6af38d 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,9 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar versión inicial
-MAIN_MAIL_SENDMODE=Sending method
 Module30Name=Facturas
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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.
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
diff --git a/htdocs/langs/es_PE/errors.lang b/htdocs/langs/es_PE/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_PE/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_PE/languages.lang b/htdocs/langs/es_PE/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_PE/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index cfd78785a51..f315390cf28 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -66,6 +66,7 @@ VATRate=Tasa Impuesto
 VATCode=Código de la Tasa del Impuesto
 List=Lista
 Opened=Abrir
+Reports=Reportes
 MenuAccountancy=Contabilizando
 SearchIntoMO=Órdenes de Fabricación
 SearchIntoCustomerInvoices=Facturas de Clientes
diff --git a/htdocs/langs/es_PE/orders.lang b/htdocs/langs/es_PE/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_PE/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_PE/partnership.lang b/htdocs/langs/es_PE/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_PE/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_PY/errors.lang b/htdocs/langs/es_PY/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_PY/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_PY/holiday.lang b/htdocs/langs/es_PY/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_PY/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_PY/languages.lang b/htdocs/langs/es_PY/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_PY/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_PY/orders.lang b/htdocs/langs/es_PY/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_PY/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_PY/partnership.lang b/htdocs/langs/es_PY/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_PY/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_US/errors.lang b/htdocs/langs/es_US/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_US/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_US/holiday.lang b/htdocs/langs/es_US/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_US/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_US/languages.lang b/htdocs/langs/es_US/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_US/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_US/orders.lang b/htdocs/langs/es_US/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_US/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_US/partnership.lang b/htdocs/langs/es_US/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_US/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_UY/errors.lang b/htdocs/langs/es_UY/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/es_UY/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/es_UY/holiday.lang b/htdocs/langs/es_UY/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_UY/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_UY/languages.lang b/htdocs/langs/es_UY/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_UY/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/es_UY/orders.lang b/htdocs/langs/es_UY/orders.lang
deleted file mode 100644
index a1e7f34c64b..00000000000
--- a/htdocs/langs/es_UY/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
diff --git a/htdocs/langs/es_UY/partnership.lang b/htdocs/langs/es_UY/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/es_UY/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index ffb5c894f4c..f3aeaf2ce7c 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -4,10 +4,8 @@ VersionLastUpgrade=Última actualización de la versión
 ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a usted).
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
-MAIN_MAIL_SENDMODE=Sending method
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
 Module1780Desc=Crear etiquetas/Categoría (Productos, clientes, proveedores, contactos y miembros)
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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.
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
diff --git a/htdocs/langs/es_VE/holiday.lang b/htdocs/langs/es_VE/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/es_VE/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/es_VE/languages.lang b/htdocs/langs/es_VE/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/es_VE/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 9c572a6a86a..df60557554c 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=This service
 ThisProduct=This product
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -38,7 +38,7 @@ 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
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 
 AccountancyAreaDescJournalSetup=STEP %s: 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
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %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.
@@ -84,19 +83,20 @@ AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment o
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
 AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts 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.
 
 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.
-
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescAnalyze=STEP %s: Read reportings or generate export files for other bookkeepers.
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't transfer anymore data in the same period in a future.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 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
+CurrentChartOfAccount=Current active chart of account
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 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, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
 ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Transitional bank transfer account
@@ -290,15 +292,15 @@ DescVentilDoneCustomer=Siit leiate loendit klientide arvete ridadest ja nende to
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred 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
+DescVentilDoneExpenseReport=Vaadake siin kuluaruannete ridade loendit ja nende tasude raamatupidamiskontot.
 
 Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -333,7 +335,6 @@ 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=Müügid
@@ -341,7 +342,7 @@ AccountingJournalType3=Ostud
 AccountingJournalType4=Pank
 AccountingJournalType5=Kuluaruanded
 AccountingJournalType8=Laoseis
-AccountingJournalType9=Has-new
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
@@ -352,12 +353,14 @@ 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)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kirja kood genereeritakse automaatselt ja seda suurendatakse ning seda ei vali lõppkasutaja
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -383,7 +386,7 @@ 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_FEC2=Ekspordi FEC (koos kuupäevade genereerimise kirjutamise / dokumendi pööramisega)
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
@@ -420,7 +423,7 @@ SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
 SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +444,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock the movements
+AccountancyClosureStep2=Step 2 : Close the fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Hulgikustutamise kinnitus
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 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
@@ -465,6 +482,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index d594aa74eaf..7fd51258c94 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -95,7 +95,7 @@ ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Eelvaade pole saadaval
 ThemeCurrentlyActive=Hetkel kasutatav teema
 MySQLTimeZone=MySQLi (andmebaasi) ajavöönd
-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).
+TZHasNoEffect=Kuupäevad salvestatakse andmebaasi serveris ja tagastatakse nii, nagu need oleksid esitatud stringina. Ajavööndil on mõju ainult siis, kui kasutatakse UNIX_TIMESTAMP funktsiooni (mida Dolibarr ei tohiks kasutada, seega andmebaasi ajavööndil ei tohiks olla mõju, isegi kui see muutub pärast andmete sisestamist).
 Space=Ruum
 Table=Tabel
 Fields=Väljad
@@ -353,7 +353,7 @@ InfDirAlt=Since version 3, it is possible to define an alternative root director
 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=Praegune Dolibarr versioon
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=Sirvi lehele, mis uuendab andmebaasi struktuuri ja andmeid: %s.
 LastStableVersion=Viimane stabiilne versioon
 LastActivationDate=Viimane aktiveerimise kuupäev
 LastActivationAuthor=Viimane aktiveerimise autor
@@ -531,7 +531,7 @@ ProductBatchDocumentTemplates=Document templates to generate product lots docume
 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
+PrefillExpenseReportDatesWithCurrentMonth=Täida uue kuluaruande algus- ja lõppkuupäevad käesoleva kuu algus- ja lõppkuupäevadega.
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
 AttachMainDocByDefault=Määrake selle väärtuseks <b> Jah </b>, kui soovite meilile vaikimisi manustada põhidokumendi (kui see on kohaldatav)
 FilesAttachedToEmail=Lisage fail
@@ -618,7 +618,7 @@ 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.
+Module400Desc=Projektide, juhtumite ja/või ülesannete haldamine. Samuti saate määrata projekti vaatest mis tahes elemendi (arve, tellimus, ettepanek, sekkumine, ...) ja saada projekti vaatest üldine ülevaade.
 Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
 Module500Name=Maksud & kohustused
@@ -742,8 +742,8 @@ Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
 Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared projects and projects of which I am a contact).
-Permission42=Create/modify projects (shared projects and projects of which I am a contact). Can also assign users to projects and tasks
+Permission41=Loe projekte ja ülesandeid (jagatud projekte ja projekte, millega olen seotud).
+Permission42=Loo/muuda projekte (jagatud projekte ja projekte, millega olen kontaktis). Saab samuti määrata kasutajaid projektidele ja ülesannetele.
 Permission44=Delete projects (shared projects and projects of which I am a contact)
 Permission45=Export projects
 Permission61=Sekkumiste vaatamine
@@ -791,10 +791,10 @@ Permission122=Kasutajaga seotud kolmandate isikute loomine/muutmine
 Permission125=Kasutajaga seotud kolmandate isikute kustutamine
 Permission126=Kolmandate isikute eksport
 Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (as well as the private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (as well as the private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (as well as the private projects I am not a contact)
-Permission145=Can enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission141=Lugege kõiki projekte ja ülesandeid (samuti eraviisilisi projekte, millega ma pole seotud).
+Permission142=Lugege kõiki projekte ja ülesandeid (samuti eraviisilisi projekte, millega ma pole seotud).
+Permission144=Kustuta kõik projektid ja ülesanded (samuti eraviisilised projektid, millega ma pole seotud)
+Permission145=Saate sisestada kulutatud aja minu või minu hierarhia jaoks määratud ülesannetele (tööaja aruanne)
 Permission146=Pakkujate vaatamine
 Permission147=Statistika vaatamine
 Permission151=Read direct debit payment orders
@@ -976,13 +976,13 @@ 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)
+Permission2401=Lugege tegevusi (sündmusi või ülesandeid), mis on seotud tema kasutajakontoga (kui ta on sündmuse omanik või sellele määratud).
+Permission2402=Loo/muuda tegevusi (sündmusi või ülesandeid), mis on seotud tema kasutajakontoga (kui ta on sündmuse omanik)
+Permission2403=Kustuta tegevused (sündmused või ülesanded), mis on seotud tema kasutajakontoga (kui ta on sündmuse omanik)
 Permission2411=Teiste kontodega seotud juhtumite (tegevuste või ülesannete) vaatamine
 Permission2412=Teiste kontodega seotud juhtumite (tegevuste või ülesannete) loomine/muutmine
 Permission2413=Teiste kontodega seotud juhtumite (tegevuste või ülesannete) kustutamine
-Permission2414=Export actions/tasks of others
+Permission2414=Teiste tegevuste/ülesannete eksportimine
 Permission2501=Dokumentide vaatamine/alla laadimine
 Permission2502=Dokumentide alla laadimine
 Permission2503=Dokumentide üles laadimine või kustutamine
@@ -1197,6 +1197,7 @@ Skin=Kesta kujundus
 DefaultSkin=Vaikimisi kesta kujundus
 MaxSizeList=Nimekirja maksimaalne pikkus
 DefaultMaxSizeList=Default max length for lists
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
 MessageOfDay=Päeva sõnu
 MessageLogin=Sisselogimise lehe sõnu
@@ -1230,7 +1231,7 @@ DelaysOfToleranceBeforeWarning=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=Projekt ei ole suletud tähtaegselt
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
+Delays_MAIN_DELAY_TASKS_TODO=Plaanitud ülesanne (projekti ülesanded) pole lõpule viidud
 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=Pakkumine ei ole suletud
@@ -1592,7 +1593,7 @@ LDAPTestSynchroMemberType=Test member type synchronization
 LDAPTestSearch= Testi LDAPi otsingut
 LDAPSynchroOK=Sünkroniseerimise testimine edukas
 LDAPSynchroKO=Sünkroniseerimise testimine ebaõnnestus
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Sünkroonimise test ebaõnnestus. Kontrollige, et ühendus serveriga oleks õigesti konfigureeritud ja võimaldaks LDAP-i värskendusi.
 LDAPTCPConnectOK=TCP ühendust LDAPi serveriga õnnestus (server=%s, port=%s)
 LDAPTCPConnectKO=TCP ühendust LDAPi serveriga ebaõnnestus (server=%s, port=%s)
 LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
@@ -1789,7 +1790,7 @@ FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
 FCKeditorForTicket=WYSIWYG creation/edition for tickets
 ##### Stock #####
 StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+IfYouUsePointOfSaleCheckModule=Kui kasutate vaikimisi pakutavat müügikoha moodulit (POS) või välismoodulit, võib see seadistus teie POS-mooduli poolt ignoreerida. Enamik POS-mooduleid on vaikimisi kujundatud arve loomiseks kohe ja varude vähendamiseks sõltumata siinsetest valikutest. Seega, kui teil on vaja või mitte varude vähendamist müügi registreerimisel oma POS-ist, kontrollige ka oma POS-mooduli seadistust.
 ##### Menu #####
 MenuDeleted=Menüü kustutatud
 Menu=Menu
@@ -1879,7 +1880,7 @@ 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.
+CashDeskForceDecreaseStockDesc=Vähendage esmalt vanimaid söömise ja müümise tähtaegu.
 CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
 ##### Bookmark #####
 BookmarkSetup=Järjehoidjate mooduli seadistamine
@@ -2277,10 +2278,10 @@ RecommendedValueIs=Recommended: %s
 Recommended=Soovitatav
 NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
-CheckForModuleUpdate=Check for external modules updates
+CheckForModuleUpdate=Kontrolli kolmandate osapoolte moodulite värskendusi
 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
+NoExternalModuleWithUpdate=Kolmandate osapoolte mooduleid ei leitud uuendamiseks.
 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
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 3773973cf2a..a2f2492714c 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -5,14 +5,14 @@ BillsCustomers=Kliendi arved
 BillsCustomer=Müügiarve
 BillsSuppliers=Tarnija arved
 BillsCustomersUnpaid=Maksmata kliendiarved
-BillsCustomersUnpaidForCompany=Tasumata kliendiarved %s 
+BillsCustomersUnpaidForCompany=Tasumata kliendiarved %s
 BillsSuppliersUnpaid=Tasumata tarnija arved
-BillsSuppliersUnpaidForCompany=Tasumata tarnijate arved %s 
+BillsSuppliersUnpaidForCompany=Tasumata tarnijate arved %s
 BillsLate=Hilinenud maksed
 BillsStatistics=Müügiiarvete statistika
 BillsStatisticsSuppliers=Tarnijate arved statistika
 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.
+DisabledBecauseNotLastInvoice=Keelatud, kuna arvet ei saa kustutada. Mõned arved on selle järel salvestatud ja see tekitab loenduris tühikuid.
 DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
 DisabledBecauseNotErasable=Disabled because cannot be erased
 InvoiceStandard=Standardne arve
@@ -33,8 +33,8 @@ InvoiceAvoir=Kreeditarve
 InvoiceAvoirAsk=Kreeditarve parandab arve
 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=Loo kreeditarve algse arve ridade põhjal
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Loo kreeditarve koos veel tasumata summale
+invoiceAvoirLineWithPaymentRestAmount=Krediidiarve maksmata summa eest
 ReplaceInvoice=Asendusarve arve %s
 ReplacementInvoice=Asendusarve
 ReplacedByInvoice=Asendatud arvega %s
@@ -93,6 +93,9 @@ CodePaymentMode=Makseviis (kood)
 LabelPaymentMode=Makseviis (silt)
 PaymentModeShort=Makseviis
 PaymentTerm=Maksetähtaeg
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=Maksetähtajad
 PaymentConditionsShort=Maksetähtajad
 PaymentAmount=Makse summa
@@ -100,14 +103,14 @@ PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk
 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=Liigita 'Makstud'
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Liiguta 'Maksmata'
 ClassifyPaidPartially=Liigita 'Osaliselt makstud'
 ClassifyCanceled=Liigita 'Hüljatud'
 ClassifyClosed=Liigita 'Suletud'
 ClassifyUnBilled=Liigita „tasumata”
 CreateBill=Loo arve
 CreateCreditNote=Koosta kreeditarve
-AddBill=Create invoice or credit note
+AddBill=Koostage arve või kreeditarve
 AddToDraftInvoices=Lisa arve mustandile
 DeleteBill=Kustuta arve
 SearchACustomerInvoice=Otsi müügiarvet
@@ -124,7 +127,7 @@ EnterPaymentDueToCustomer=Soorita kliendile makse
 DisabledBecauseRemainderToPayIsZero=Keelatud, sest järele jäänud maksmata on null
 PriceBase=Base price
 BillStatus=Arve staatus
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Mustand (kinnitada)
 BillStatusPaid=Makstud
 BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
@@ -151,7 +154,7 @@ BillShortStatusClosedPaidPartially=Makstud (osaliselt)
 PaymentStatusToValidShort=Kinnitada
 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
+ErrorCreateBankAccount=Loo pangakonto, seejärel mine arve mooduli seadistuspaneelile, et määratleda maksetüübid
 ErrorBillNotFound=Arvet %s ei ole
 ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Viga: allahindlust on juba kasutatud
@@ -167,7 +170,7 @@ ActionsOnBill=Tegevused arvel
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Mall / Korduv arve
 NoQualifiedRecurringInvoiceTemplateFound=Korduvat mallarvet pole genereerimiseks kvalifitseeritud.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Uus arve
 LastBills=Viimased %s arvet
@@ -185,7 +188,7 @@ SuppliersDraftInvoices=Tarnijate mustand arved
 Unpaid=Maksmata
 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>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the 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>?
@@ -217,9 +220,9 @@ ConfirmCustomerPayment=Kas kinnitate selle makse summas <b>%s</b> %s?
 ConfirmSupplierPayment=Kas kinnitate selle makse summas <b>%s</b> %s?
 ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
 ValidateBill=Kinnita arve
-UnvalidateBill=Muuda arve lahtiseks
+UnvalidateBill=Invalidate invoice
 NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+NumberOfBillsByMonth=Arvete arv kuus
 AmountOfBills=Arvete summa
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Arvete summa kuus (maksudeta)
@@ -250,12 +253,13 @@ RemainderToTake=Jäänud laekuda
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Jäänud tagastada
 RemainderToPayBackMulticurrency=Jäänud tagastada, originaal valuutas
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Ootel
 AmountExpected=Väidetav väärtus
 ExcessReceived=Liigne saadud
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Soodustus pakutud (makse enne tähtaega)
@@ -267,6 +271,8 @@ NoDraftBills=Arvete mustandeid ei ole
 NoOtherDraftBills=Muid arvete mustandeid ei ole
 NoDraftInvoices=Arvete mustandeid ei ole
 RefBill=Arve viide
+RefSupplierBill=Supplier invoice ref
+SupplierOrderCreateBill=Loo arve
 ToBill=Arve esitada
 RemainderToBill=Ülejääk, mille eest arve esitada
 SendBillByMail=Saada arve e-posti teel
@@ -351,6 +357,7 @@ HelpAbandonOther=This amount has been abandoned since it was an error (wrong cus
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=Makse ID
 PaymentRef=Payment ref.
+SourceInvoiceId=Source invoice id
 InvoiceId=Arve ID
 InvoiceRef=Arve viide
 InvoiceDateCreation=Arve loomise kuupäev
@@ -549,7 +556,7 @@ ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Pa
 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".
+AllCompletelyPayedInvoiceWillBeClosed=Kõik valitud arved (isegi, kui on jäänud mingi osa veel maksta) suletakse ja märgitakse statusesse "Makstud".
 ToMakePayment=Maksa
 ToMakePaymentBack=Maksa tagasi
 ListOfYourUnpaidInvoices=Maksmata arvete nimekiri
@@ -557,14 +564,14 @@ NoteListOfYourUnpaidInvoices=Märkus: see nimekiri sisaldab vaid nende kolmandat
 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
+YouMustCreateStandardInvoiceFirstDesc=Peate esmalt looma standardse arve ja teisendama selle "malliks", et luua uus malliarve.
 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
+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 sequential 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 sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Arve algusega $syymm on juba olemas ja ei ole antud jada mudeliga ühtiv. Eemalda see või muuda selle nimi antud mooduli aktiveerimiseks.
-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=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 sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -605,12 +612,12 @@ 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.
+ToCreateARecurringInvoice=Selle lepingu jaoks korduva arve loomiseks looge kõigepealt see mustandarve, seejärel teisendage see arvetemplaadiks ja määrake tulevaste arvete genereerimise sagedus.
 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=Kustuta arve mall
 ConfirmDeleteRepeatableInvoice=Kas olete kindel, et soovite malli arve kustutada?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
+CreateOneBillByThird=Loo üks arve iga kolmanda osapoole kohta (muidu üks arve valitud objekti kohta)
 BillCreated=%s invoice(s) generated
 BillXCreated=Invoice %s generated
 StatusOfGeneratedDocuments=Status of document generation
@@ -641,3 +648,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Palgad
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Palk
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/et_EE/blockedlog.lang b/htdocs/langs/et_EE/blockedlog.lang
index 63bc72d07bc..cfdde6c4641 100644
--- a/htdocs/langs/et_EE/blockedlog.lang
+++ b/htdocs/langs/et_EE/blockedlog.lang
@@ -53,6 +53,6 @@ logMODULE_SET=Module BlockedLog was enabled
 logPAYMENT_ADD_TO_BANK=Payment added to bank
 logPAYMENT_CUSTOMER_CREATE=Customer payment created
 logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
+logPAYMENT_VARIOUS_CREATE=Makse (ei ole seotud arvega) loodud
 logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
 logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index d3b8a2cd6db..524e1426eca 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -162,6 +162,7 @@ CalcModeVATDebt=Režiim <b>%stekkepõhise raamatupidamise KM%s</b>.
 CalcModeVATEngagement=Režiim <b>%stulude-kulude KM%s</b>.
 CalcModeDebt=Analysis of known recorded documents
 CalcModeEngagement=Analysis of known recorded payments
+CalcModePayment=Analysis of known recorded payments
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
 CalcModeLT1= Režiim <b> %sRE klientide arvetel – tarnijate arved%s </b>
@@ -177,11 +178,11 @@ AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefine
 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>
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Näidatud summad sisaldavad kõiki makse
 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.
+RulesResultInOut=- See sisaldab tegelikke makseid, mis on tehtud arvetel, kuludel, käibemaksul ja palkadel. <br>- See põhineb arvete, kulude, käibemaksu, annetuste ja palkade maksetähtpäevadel.
 RulesCADue=- See sisaldab kliendi tasumisele kuuluvaid arveid olenemata sellest, kas need on tasutud või mitte. <br> – see põhineb nende arvete arvelduskuupäeval. <br>
 RulesCAIn=- See sisaldab kõiki klientidelt saadud arvete tõhusaid makseid. <br> – see põhineb nende arvete maksekuupäeval <br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 106c87fcf6b..42d123eb309 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -4,11 +4,11 @@
 NoErrorCommitIsDone=Ühtegi viga ei ole, teostame
 # Errors
 ErrorButCommitIsDone=Esines vigu, kuid kinnitame sellest hoolimata
-ErrorBadEMail=Email %s is incorrect
+ErrorBadEMail=Email address %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.
+ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
 ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kasutajanimi %s on juba olemas.
 ErrorGroupAlreadyExists=Grupp %s on juba olemas.
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=Vigane kolmanda osapoole nimi
 ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s on kohustuslik
 ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
+ErrorAccountancyCodeSupplierIsMandatory=The accountancy code of supplier %s is mandatory
 ErrorBadCustomerCodeSyntax=Halb kliendi koodi süntaks
 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=Kliendi kood on nõutud
@@ -53,21 +54,22 @@ ErrorFailedToBuildArchive=Failed to build archive file %s
 ErrorFoundBadEmailInFile=Failis on %s real ebaõige e-posti aadressi süntaks (näiteks on rida %s aadress=%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
+ErrorSubjectIsRequired=Meili teema on kohustuslik
 ErrorFailedToCreateDir=Kausta loomine ebaõnnestus. Kontrolli, et veebiserveri kasutajal on piisavalt õigusi Dolibarri dokumentide kausta kirjutamiseks. Kui PHP <b>safe_mode</b> parameeter on sisse lülitatud, siis kontrolli, et veebiserveri kasutaja (või grupp) on Dolibarri PHP failide omanik.
 ErrorNoMailDefinedForThisUser=Antud kasutaja e-posti aadressi pole määratletud
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=See funktsioon vajab töötamiseks JavaScripti sisse lülitamist. Muuda seadeid Seadistamine->Kuva menüüs.
+ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0='Ülemine' tüüpi menüül ei saa olla emamenüüd. Sisesta emamenüü lahtrisse 0 või vali menüütüübiks 'Vasakul'.
 ErrorLeftMenuMustHaveAParentId='Vasak' tüüpi menüül peab olema ema ID.
 ErrorFileNotFound=Ei leidnud faili <b>%s</b> (vale rada, valed õigused või on ligipääs keelatud PHP openbasedir või safe_mode parameetritega)
 ErrorDirNotFound=Ei leidnud kausta <b>%s</b> (vale rada, valed õigused või on ligipääs keelatud PHP openbasedir või safe_mode parameetritega)
 ErrorFunctionNotAvailableInPHP=Selle võimaluse jaoks on vaja funktsiooni <b>%s</b>, kuid see ei ole antud PHP versiooni/seadistusega saadaval.
 ErrorDirAlreadyExists=Selle nimega kaust on juba olemas.
+ErrorDirNotWritable=Directory <b>%s</b> is not writable.
 ErrorFileAlreadyExists=Selle nimega fail on juba olemas.
 ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=Fail ei jõudnud täielikult serverisse.
-ErrorNoTmpDir=Ajutist kausta %s ei ole olemas.
+ErrorNoTmpDir=Temporary directory %s does not exists.
 ErrorUploadBlockedByAddon=PHP/Apache pistik blokeeris üleslaadimise.
 ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Field %s is too long.
@@ -85,14 +87,13 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP sobitamine ei ole täielik.
 ErrorLDAPMakeManualTest=Kausta %s on loodud .ldif fail. Vigade kohta lisainfo saamiseks proovi selle käsitsi käsurealt laadimist.
 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=Selle võimaluse töötamiseks peab JavaScript olema sisse lülitatud. JavaScripti sisse või välja lülitamiseks kasuta menüüd Kodu->Seadistamine->Kuva.
+ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Sisestatud paroolid peavad klappima
-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.
+ErrorContactEMail=A technical error occurred. 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>
 ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
@@ -100,10 +101,12 @@ ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
 ErrorsOnXLines=%s errors found
 ErrorFileIsInfectedWithAVirus=Antiviiruse programm ei suutnud faili valideerida (fail võib olla viiruse poolt nakatatud)
+ErrorFileIsAnInfectedPDFWithJSInside=The file is a PDF infected by some Javascript inside
 ErrorNumRefModel=Andmebaasi viide on juba olemas (%s) ja ei ole kooskõlas antud numeratsiooni reegliga. Kustuta kirje või nimeta viide ümber antud mooduli aktiveerimiseks.
 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.
+ErrorOrderStatusCantBeSetToDelivered=Order status can't be set to delivered.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be incomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Maski viga
 ErrorBadMaskFailedToLocatePosOfSequence=Viga: mask on järjekorranumbrita
 ErrorBadMaskBadRazMonth=Viga: halb lähteväärtus
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=Kasutajanime <b>%s</b> ei leitud.
 ErrorLoginHasNoEmail=Antud kasutajal ei ole e-posti aadressi. Protsess katkestatud.
 ErrorBadValueForCode=Turvakoodi halb väärtus. Proovi uuesti...
 ErrorBothFieldCantBeNegative=Mõlemad väljad %s ja %s ei saa olla negatiivse väärtusega
-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.
+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 third-party 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=Kliendiarvete rea kogus ei tohi olla negatiivne
@@ -150,6 +153,7 @@ ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database ser
 ErrorFailedToAddContact=Kontakti lisamine ebaõnnestus
 ErrorDateMustBeBeforeToday=The date must be lower than today
 ErrorDateMustBeInFuture=The date must be greater than today
+ErrorStartDateGreaterEnd=The start date is greater than the end date
 ErrorPaymentModeDefinedToWithoutSetup=Makseviis on seatud tüübile %s, kuid Arved mooduli seadistamine ei ole täielik ning selle makseviisi jaoks näidatav info on määratlemata.
 ErrorPHPNeedModule=Viga: selle võimaluse kasutamiseks peab PHPs olema võimaldatud moodul <b>%s</b>.
 ErrorOpenIDSetupNotComplete=Dolibarri seadistusfail lubab OpenIDga autentimist, ent konstandis %s ei ole OpenID teenuse URL määratletud
@@ -166,7 +170,7 @@ 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
+ErrorPriceExpression9=An unexpected error occurred
 ErrorPriceExpression10=Operator '%s' lacks operand
 ErrorPriceExpression11=Expecting '%s'
 ErrorPriceExpression14=Division by zero
@@ -191,7 +195,7 @@ 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
-ErrorOppStatusRequiredIfUsage=You set you want to use this project to follow an opportunity, so you must also fill the initial Status of opportunity.
+ErrorOppStatusRequiredIfUsage=You choose to follow an opportunity in this project, so you must also fill out the Lead status.
 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)
@@ -211,7 +215,7 @@ ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined
 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.
+ErrorPhpMailDelivery=Kontrollige, et te ei kasutaks liiga palju adressaate ja et teie meili sisu ei sarnaneks rämpspostiga. Täpsema teabe saamiseks paluge ka oma administraatoril kontrollida tulemüüri ja serveri logifaile.
 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.
@@ -224,7 +228,7 @@ 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.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Masstoiminguga "Saada meiliga" saab saata ainult kinnitatud arveid.
 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.
@@ -240,7 +244,7 @@ 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=Viga, suletud arve makse kustutamine ei ole võimalik
-ErrorSearchCriteriaTooSmall=Search criteria too small.
+ErrorSearchCriteriaTooSmall=Search criteria too short.
 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.
@@ -259,7 +263,7 @@ 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
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> 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
@@ -296,16 +300,17 @@ ErrorAjaxRequestFailed=Request failed
 ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
 ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
 ErrorQuantityIsLimitedTo=Quantity is limited to %s
-ErrorFailedToLoadThirdParty=Failed to find/load thirdparty from id=%s, email=%s, name=%s
+ErrorFailedToLoadThirdParty=Failed to find/load third party from id=%s, email=%s, name=%s
 ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
-ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this thirdparty (or set to a value deleted on Stripe side). Create (or re-attach) it first.
+ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this third party (or set to a value deleted on Stripe side). Create (or re-attach) it first.
 ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
 ErrorTableNotFound=Table <b>%s</b> not found
+ErrorRefNotFound=Ref <b>%s</b> not found
 ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
-ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, email, status or dates of validity. Please relogin.
+ErrorSessionInvalidatedAfterPasswordChange=Sessioon on tühistatud parooli, e-posti, staatuse või kehtivuskuupäevade muutmise tõttu. Palun logige uuesti sisse.
 ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
 ErrorFieldExist=The value for <b>%s</b> already exist
 ErrorEqualModule=Module invalid in <b>%s</b>
@@ -318,13 +323,18 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you
 ErrorMenuExistValue=A Menu already exist with this Title or URL
 ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without the option %s
 ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet
+ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
+ErrorCountryCodeMustBe2Char=Country code must be a 2 character string
+ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces
+
 ErrorTableExist=Table <b>%s</b> already exist
 ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
-ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Check the command used for the export into the Advanced options of the export
 
 # 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.
+WarningPasswordSetWithNoAccount=Selle liikme jaoks määrati parool. Kasutajakontot aga ei loodud. Nii et see parool on salvestatud, kuid seda ei saa kasutada Dolibarri sisselogimiseks. Seda võib kasutada väline moodul/liides, kuid kui te ei pea liikmele sisselogimist ega parooli määrama, saate liikmemooduli seadistustest keelata valiku "Halda iga liikme sisselogimist". Kui teil on vaja sisselogimist hallata, kuid parooli pole vaja, võite selle hoiatuse vältimiseks selle välja tühjaks jätta. Märkus. E-posti saab kasutada ka sisselogimiseks, kui liige on kasutajaga lingitud.
 WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
 WarningSafeModeOnCheckExecDir=Hoiatus: PHP direktiiv <b>safe_mode</b> on sisse lülitatud, seega peab käsk olema salvestatud PHP parameetris <b>safe_mode_exec_dir</b> deklareeritud kausta.
@@ -347,7 +357,7 @@ WarningYourPasswordWasModifiedPleaseLogin=Your password was modified. For securi
 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.
+WarningProjectDraft=Projekt on endiselt mustandirežiimis. Ärge unustage seda valideerida, kui kavatsete ülesandeid kasutada.
 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
@@ -359,10 +369,12 @@ WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online
 WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Hoiatus, see kustutab ka kõik veebisaidi olemasolevad lehed/konteinerid. Peaksite oma veebisaidi varem eksportima, et saaksite selle hiljem uuesti importida.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
-WarningModuleNeedRefrech = Module <b>%s</b> has been disabled. Don't forget to enable it
+WarningModuleNeedRefresh = Module <b>%s</b> has been disabled. Don't forget to enable it
 WarningPermissionAlreadyExist=Existing permissions for this object
 WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
 WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
+WarningAlreadyReverse=Stock movement already reversed
 
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
@@ -392,3 +404,10 @@ BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not
 BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
 BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
 ErrorTooManyAttempts= Liiga palju katseid, proovige hiljem uuesti
+
+TotalAmountEmpty=Total Amount Empty
+FailedToFoundTheConversionRateForInvoice=Failed to found the conversion rate for invoice
+ThisIdNotDefined=Id not defined
+OperNotDefined=Payment method not defined
+ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
+ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index 5b2f21ac987..4ba2cbcdb45 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -5,7 +5,7 @@ Holiday=Puhkus
 CPTitreMenu=Puhkus
 MenuReportMonth=Kuu aruanne
 MenuAddCP=New leave request
-MenuCollectiveAddCP=New collective leave request
+MenuCollectiveAddCP=New collective leave
 NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Alguskuupäev
@@ -85,7 +85,7 @@ AddEventToUserOkCP=Erakorralise puhkuse lisamine edukalt lõpetatud.
 ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be filled in
 fusionGroupsUsers=The groups field and the user field will be merged
 MenuLogCP=View change logs
-LogCP=Log of all updates made to "Balance of Leave"
+LogCP=Kõigi "Puhkusejäägi" uuenduste logi
 ActionByCP=Uuendaja
 UserUpdateCP=Updated for
 PrevSoldeCP=Eelmine saldo
@@ -95,21 +95,20 @@ UseralreadyCPexist=A leave request has already been done on this period for %s.
 groups=Rühmad
 users=Kasutajad
 AutoSendMail=Automatic mailing
-NewHolidayForGroup=New collective leave request
-SendRequestCollectiveCP=Send collective leave request
+NewHolidayForGroup=New collective leave
+SendRequestCollectiveCP=Create collective leave
 AutoValidationOnCreate=Automatic validation
 FirstDayOfHoliday=Beginning day of leave request
 LastDayOfHoliday=Ending day of leave request
 HolidaysMonthlyUpdate=Igakuine uuendus
 ManualUpdate=Käsitsi uuendus
-HolidaysCancelation=Leave request cancelation
+HolidaysCancelation=Leave request cancellation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Viimased %s lahkumistaotlused
 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
@@ -144,7 +143,7 @@ WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
 HolidayBalanceMonthlyUpdate=Monthly update of leave balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
+XIsAUsualNonWorkingDay=%s is usually a NON working day
 BlockHolidayIfNegative=Block if balance negative
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index b254704cff2..44334770720 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -61,7 +61,7 @@ ErrorFileNotUploaded=Ei õnnestunud faili üles laadida. Kontrolli järgmist: fa
 ErrorInternalErrorDetected=Tuvastati viga
 ErrorWrongHostParameter=Vigane hosti parameeter
 ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Company/Foundation and post the form again.
-ErrorRecordIsUsedByChild=Ei saanud kustutada seda kirjet. See kirje on kasutusel vähemalt ühe alamkirje poolt. 
+ErrorRecordIsUsedByChild=Ei saanud kustutada seda kirjet. See kirje on kasutusel vähemalt ühe alamkirje poolt.
 ErrorWrongValue=Vigane väärtus
 ErrorWrongValueForParameterX=Parameetrile %s on omistatud vigane väärtus
 ErrorNoRequestInError=Veas puudub päring
@@ -420,6 +420,8 @@ TotalTTCShort=Kokku (bruto)
 TotalHT=Kokku (neto)
 TotalHTforthispage=Selle lehekülje summa (neto)
 Totalforthispage=Selle lehekülje summa
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Kokku (km-ga)
 TotalTTCToYourCredit=Kokku (km-ga) krediidile lisaks
 TotalVAT=Maksud kokku
@@ -647,6 +649,7 @@ ReportName=Aruande nimi
 ReportPeriod=Aruande periood
 ReportDescription=Kirjeldus
 Report=Aruanne
+Reports=Reports
 Keyword=Märksõna
 Origin=Algupärane
 Legend=Legend
@@ -966,7 +969,7 @@ ImportId=Impordi ID
 Event=Sündmus
 Events=Sündmused
 EMailTemplates=E-kirja mallid
-FileNotShared=Fail ei ole jagatud välise avalikkusega 
+FileNotShared=Fail ei ole jagatud välise avalikkusega
 Project=Projekt
 Projects=Projektid
 LeadOrProject=Müügivihje | Projekt
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 0493ee55843..edda8aa0253 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -173,7 +173,7 @@ MembersAndSubscriptions=Members and Contributions
 MoreActions=Täiendav tegevus salvestamisel
 MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatically on online payment of a contribution
 MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankViaInvoice=Salvesta arve ja makse pangakontole
 MoreActionInvoiceOnly=Koosta makseta arve
 LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=See ekraan võimaldab luua visiitkaartidega PDF-failid iga liikme või mõne kindla liikme kohta.
@@ -233,7 +233,7 @@ 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 third party 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.
+CreateDolibarrThirdPartyDesc=Kolmas osapool on juriidiline isik, mida kasutatakse arvel, kui otsustate iga panuse kohta arve koostada. Saate selle luua hiljem kaastöö salvestamise käigus.
 MemberFirstname=Member firstname
 MemberLastname=Member lastname
 MemberCodeDesc=Member Code, unique for all members
diff --git a/htdocs/langs/et_EE/opensurvey.lang b/htdocs/langs/et_EE/opensurvey.lang
index 2d83b1d9885..02edd497727 100644
--- a/htdocs/langs/et_EE/opensurvey.lang
+++ b/htdocs/langs/et_EE/opensurvey.lang
@@ -8,10 +8,10 @@ AddACommentForPoll=Sa võid lisada küsitlusele kommentaari...
 AddComment=Lisa kommentaar
 CreatePoll=Loo küsitlus
 PollTitle=Küsitluse pealkiri
-ToReceiveEMailForEachVote=Receive an email for each vote
+ToReceiveEMailForEachVote=Saate iga hääle kohta meili
 TypeDate=Liik: kuupäev
 TypeClassic=Liik: standardne
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+OpenSurveyStep2=Valige oma kuupäevad vabade päevade (hallid) hulgast. Valitud päevad on rohelised. Saate tühistada eelnevalt valitud päeva, klõpsates sellel uuesti.
 RemoveAllDays=Eemalda kõik päevad
 CopyHoursOfFirstDay=Kopeeri esimese päeva tunnid
 RemoveAllHours=Eemalda kõik tunnid
@@ -61,3 +61,4 @@ 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
+ListOfOpenSurveys=List of open surveys
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 252396e3654..ae3382bc671 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -18,7 +18,7 @@ Reference=Viide
 NewProduct=Uus toode
 NewService=Uus teenus
 ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChangeDesc=See tööriist värskendab käibemaksumäära, mis on määratud <b><u>KÕIGILE</u></b> toodetele ja teenustele!
 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)
@@ -80,8 +80,11 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Uus hind
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=Müügihind ei saa olla madalam kui selle toote minimaalne lubatud hind (%s km-ta). Antud sõnumit näidatakse ka siis, kui sisestad liiga suure allahindluse.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Suletud
 ErrorProductAlreadyExists=Toode viitega %s on juba olemas.
 ErrorProductBadRefOrLabel=Vale viite või nime väärtus.
@@ -105,7 +108,7 @@ SetDefaultBarcodeType=Määra vöötkoodi tüüp
 BarcodeValue=Vöötkoodi väärtus
 NoteNotVisibleOnBill=Märkus (ei ole nähtav arvetel, pakkumistel jne)
 ServiceLimitedDuration=Kui toode on piiratud kestusega teenus:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Täida viimaste teenuseliinide kuupäevad
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hindasid
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -205,11 +208,6 @@ unitSET=Set
 unitS=Sekund
 unitH=Tund
 unitD=Päev
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
 unitL=Liter
 unitT=tonn
 unitKG=kg
@@ -218,6 +216,7 @@ unitMG=mg
 unitLB=nael
 unitOZ=unts
 unitM=Meter
+unitLM=Linear meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -347,16 +346,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Kasutage funktsiooni "pakendamine" koguste ümardamiseks teatud kordseteks (tarnija dokumentides rea lisamisel/värskendamisel arvutage kogused ja ostuhinnad ümber vastavalt toote ostuhindadele määratud kõrgemale kordsele)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Liini kogus arvutati ümber vastavalt tarnija pakenditele
 
 #Attributes
+Attributes=Atribuudid
 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?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the 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
@@ -387,6 +387,7 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=No. of different values
 NbProducts=Number of products
 ParentProduct=Parent product
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Hide variant products
 ShowChildProducts=Show variant products
 NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
@@ -417,7 +418,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +431,8 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 6581bc1bc28..1c480ee1433 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -12,19 +12,19 @@ AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Kõik projektid
 MyProjectsDesc=This view is limited to the projects that you are a contact for
 ProjectsPublicDesc=See vaade esitab kõik projektid, mida sul on lubatud vaadata.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=See vaade esitab kõik ülesanded projektides, mida sul on lubatud vaadata.
 ProjectsPublicTaskDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
 ProjectsDesc=See vaade näitab kõiki projekte (sinu kasutajaõigused annavad ligipääsu kõigele)
-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
+TasksOnProjectsDesc=See vaade näitab kõiki ülesandeid kõikidel projektidel (sinu kasutajaõigused annavad ligipääsu kõigele).
+MyTasksDesc=See vaade on piiratud projektide või ülesannetega, millega olete kontaktis.
 OnlyOpenedProject=Ainult avatud projektid on nähtavad (mustand ja suletud staatuses projektid on peidetud)
 ClosedProjectsAreHidden=Suletud projektid ei ole nähtavad
 TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
 TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõigused annavad ligipääsu kõigele)
-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.
+AllTaskVisibleButEditIfYouAreAssigned=Kõik kvalifitseeritud projektide ülesanded on nähtavad, kuid saate aega sisestada ainult ülesandele, mis on määratud valitud kasutajale. Määrake ülesanne, kui soovite sellele aega sisestada.
+OnlyYourTaskAreVisible=Ainult sulle määratud ülesanded on nähtavad. Kui pead aja sisestama ülesandele ja ülesanne ei ole siin nähtav, siis pead ülesande endale määrama.
 ImportDatasetProjects=Projects or opportunities
-ImportDatasetTasks=Tasks of projects
+ImportDatasetTasks=Projektide ülesanded
 ProjectCategories=Project tags/categories
 NewProject=Uus projekt
 AddProject=Create project
@@ -34,7 +34,7 @@ ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Avatud projektid
 OpenedProjectsOpportunities=Open opportunities
-OpenedTasks=Open tasks
+OpenedTasks=Avatud ülesanded
 OpportunitiesStatusForOpenedProjects=Juhib avatud projektide hulka staatuse järgi
 OpportunitiesStatusForProjects=Leads amount of projects by status
 ShowProject=Näita projekti
@@ -44,7 +44,7 @@ SetProject=Määra projekt
 OutOfProject=Out of project
 NoProject=Ühtki projekti pole määratletud või ei oma ühtki projekti
 NbOfProjects=Projektide arv
-NbOfTasks=Number of tasks
+NbOfTasks=Ülesannete arv
 TimeEntry=Time tracking
 TimeSpent=Aega kulutatud
 TimeSpentSmall=Aega kulutatud
@@ -83,7 +83,7 @@ MyProjectsArea=Minu projektid
 DurationEffective=Efektiivne kestus
 ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Currently open tasks
+CurentlyOpenedTasks=Hetkel avatud ülesanded
 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
@@ -91,7 +91,7 @@ WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Aeg
 TimeConsumed=Consumed
-ListOfTasks=List of tasks
+ListOfTasks=Ülesannete loend
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
 ListWarehouseAssociatedProject=List of warehouses associated to the project
@@ -110,7 +110,7 @@ ListVariousPaymentsAssociatedProject=Projektiga seotud mitmesuguste maksete loet
 ListSalariesAssociatedProject=Projektiga seotud palkade väljamaksete nimekiri
 ListActionsAssociatedProject=Projektiga seotud sündmuste nimekiri
 ListMOAssociatedProject=Projektiga seotud tootmistellimuste nimekiri
-ListTaskTimeUserProject=List of time consumed on tasks of project
+ListTaskTimeUserProject=Projekti ülesannetele kulutatud aja loend
 ListTaskTimeForTask=List of time consumed on task
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
@@ -128,7 +128,7 @@ ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Sulge projekt
 ConfirmCloseAProject=Oled kindel, et soovid antud projekti sulgeda?
 AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProjectTooltip=Jäta see avatuks, kui sul on ikka veel vaja sellel töid jälgida.
 ReOpenAProject=Ava projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekti kontaktid
@@ -138,8 +138,8 @@ YouAreNotContactOfProject=Sa ei ole antud privaatse projekti kontakt
 UserIsNotContactOfProject=User is not a contact of this private project
 DeleteATimeSpent=Kustuta kulutatud aeg
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Vaata ka ülesandeid, mis pole mulle määratud.
+ShowMyTasksOnly=Vaata ainult minule määratud ülesandeid
 TaskRessourceLinks=Contacts of task
 ProjectsDedicatedToThisThirdParty=Selle kolmanda isikuga seotud projektid
 NoTasks=Selle projektiga ei ole seotud ühtki ülesannet
@@ -154,9 +154,9 @@ CloneContacts=Klooni kontaktid
 CloneNotes=Klooni märkmed
 CloneProjectFiles=Klooni projekti ühised failid
 CloneTaskFiles=Klooni ülesande/(ülesannete) ühised failid (kui ülesanne/(ülesanded) kloonitakse)
-CloneMoveDate=Update project/tasks dates from now?
+CloneMoveDate=Uuenda projekti/ülesannete kuupäevi praegusest hetkest?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
+ProjectReportDate=Muuda ülesande kuupäevi vastavalt uuele projekti alguskuupäevale.
 ErrorShiftTaskDate=Ülesande kuupäeva ei ole võimalik nihutada vastavalt uuele projekti alguskuupäevale
 ProjectsAndTasksLines=Projektid ja ülesanded
 ProjectCreatedInDolibarr=Projekt %s on loodud
@@ -205,12 +205,12 @@ 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 third-party contact
-TasksWithThisUserAsContact=Tasks assigned to this user
+TasksWithThisUserAsContact=Sellele kasutajale määratud ülesanded
 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
+TasksAssignedTo=Ülesanded määratud
 AssignTaskToMe=Assign task to myself
 AssignTaskToUser=Assign task to %s
 SelectTaskToAssign=Select task to assign...
@@ -219,12 +219,12 @@ ProjectOverview=Ülevaade
 ManageTasks=Kasutage ülesannete jälgimiseks Projekte ja/või märkige ajakulu.
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
 ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
+ProjectNbTaskByMonth=Kuu jooksul loodud ülesannete arv
 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
+TasksStatistics=Statistika projektide või juhtumite ülesannete kohta
 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 recommended to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
@@ -247,13 +247,13 @@ Budget=Eelarve
 AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
 LatestProjects=Viimased %s projektid
 LatestModifiedProjects=Viimased %s muudetud projekti
-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.
+OtherFilteredTasks=Teised filtreeritud ülesanded
+NoAssignedTasks=Määratud ülesandeid ei leitud (määra projekti/ülesandeid praegusele kasutajale ülemisest valikukastist, et sellele aega sisestada)
+ThirdPartyRequiredToGenerateIntervention=A third party must be defined on project to be able to create intervention.
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
 ChooseANotYetAssignedTask=Valige ülesanne, mis pole teile veel määratud
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
+AllowCommentOnTask=Luba kasutajate kommentaarid ülesannetele
 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
@@ -269,7 +269,7 @@ OneLinePerUser=One line per user
 ServiceToUseOnLines=Service to use on lines by default
 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.
+ProjectBillTimeDescription=Kontrollige, kas sisestate ajakava projekti ülesannetele JA kavatsete genereerida arve(d) ajakavast kliendi projekti eest arveldamiseks (ärge kontrollige, kui kavatsete luua arve, mis ei põhine sisestatud ajakavadel). Märkus: Arve genereerimiseks minge projekti vahekaardile "Kulutatud aeg" ja valige lisamiseks read.
 ProjectFollowOpportunity=Follow opportunity
 ProjectFollowTasks=Järgige ülesandeid või kulutatud aega
 Usage=Kasutus
@@ -286,12 +286,12 @@ OneLinePerTimeSpentLine=One line for each time spent declaration
 AddDetailDateAndDuration=With date and duration into line description
 RefTaskParent=Ref. Parent Task
 ProfitIsCalculatedWith=Kasum arvutatakse kasutades
-AddPersonToTask=Add also to tasks
+AddPersonToTask=Lisage ka ülesannetesse
 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=Klassifitseeri projekt suletuks, kui kõik selle ülesanded on lõpule viidud (100% %% edenemine)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Märkus. Olemasolevaid projekte, mille kõigi ülesannete edenemine on juba 100%%, see ei mõjuta: peate need käsitsi sulgema. See valik mõjutab ainult avatud projekte.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
+SelectLinesOfTimeSpentToInvoice=Valige arveldamata kulutatud aja read ja seejärel teostage massitoiming "Arve genereerimine", et neid arveldada
+ProjectTasksWithoutTimeSpent=Projekti ülesanded ilma kulutatud ajata
 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
 StartDateCannotBeAfterEndDate=Lõppkuupäev ei saa olla alguskuupäevast varasem
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 7fdebf9a7c6..c17feba8bc6 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -51,6 +51,6 @@ RepeatableSupplierInvoice=Tarnija arve mall
 RepeatableSupplierInvoices=Tarnija arvete mall
 RepeatableSupplierInvoicesList=Tarnija arvete mall
 RecurringSupplierInvoices=Recurring supplier invoices
-ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+ToCreateAPredefinedSupplierInvoice=Selleks, et luua malli tarnija arvet, peate looma standardse arve, seejärel klõpsake "%s" nupul, ilma seda valideerimata.
 GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
 SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index 33882b0d4a1..1b772ed8a25 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -24,7 +24,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 ConfirmRefuseTrip=Are you sure you want to deny this expense report?
 ConfirmSaveTrip=Are you sure you want to validate this expense report?
 ConfirmValideTrip=Are you sure you want to approve this expense report?
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=Cancellation date
 DATE_PAIEMENT=Maksekuupäev
 DATE_REFUS=Deny date
 DATE_SAVE=Kinnitamise kuupäev
@@ -39,7 +39,7 @@ expenseReportCoef=Coefficient
 expenseReportCoefUndefined=(value not defined)
 expenseReportOffset=Nihe
 expenseReportPrintExample=offset + (d x coef) = %s
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
 expenseReportRangeFromTo=from %d to %d
 expenseReportRangeMoreThan=more than %d
 expenseReportTotalForFive=Example with <u>d</u> = 5
@@ -91,7 +91,7 @@ nolimitbyEX_EXP=by line (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 NoTripsToExportCSV=No expense report to export for this period.
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
 OnExpense=Expense line
 PDFStandardExpenseReports=Standardmall kuluaruande PDF-dokumendi loomiseks
 PaidTrip=Pay an expense report
@@ -103,10 +103,10 @@ ShowExpenseReport=Show expense report
 ShowTrip=Show expense report
 TripCard=Expense report card
 TripId=Id expense report
-TripNDF=Informations expense report
+TripNDF=Information expense report
 TripSociete=Information company
 Trips=Kuluaruanded
-TripsAndExpenses=Expenses reports
+TripsAndExpenses=Kulude aruanded
 TripsAndExpensesStatistics=Expense reports statistics
 TypeFees=Types of fees
 UploadANewFileNow=Upload a new document now
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index 99ae21a1080..ee710385fb2 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -5,32 +5,34 @@ ThereIsNoWorkflowToModify=There is no workflow modifications available with the
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Looge müügitellimus automaatselt pärast pakkumise allkirjastamist (uuel tellimusel on sama summa kui pakkumisel)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Kliendi arve automaatne koostamine pärast pakkumise allkirjastamist (uuel arvel on sama summa kui pakkumisel)
-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_CONTRACT_AUTOCREATE_INVOICE=Loo automaatselt kliendi arve pärast lepingu kinnitamist
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Loo automaatselt kliendi arve pärast müügi tellimuse sulgemist (uus arve on samas summas kui tellimus).
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase 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=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 proposals)
 # 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_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 orders)
 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)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index f1f340750bf..4e0d9390e0d 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total (inc. tax)
 TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total tax
@@ -647,6 +649,7 @@ ReportName=Report name
 ReportPeriod=Report period
 ReportDescription=Deskribapena
 Report=Txostena
+Reports=Reports
 Keyword=Keyword
 Origin=Origin
 Legend=Legend
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 8a9b5d894b7..9429cfc1200 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -31,7 +31,7 @@ FormatDateHourTextShort=%b %d %Y %I:%M %p
 FormatDateHourText=%B %d %Y %H:%M %p
 DatabaseConnection=اتصال به پایگاه‌داده
 NoTemplateDefined=برای این نوع رایانامه قالبی وجود ندارد
-AvailableVariables=متغیرهای موجود برای جایگزینی 
+AvailableVariables=متغیرهای موجود برای جایگزینی
 NoTranslation=بدون ترجمه
 Translation=ترجمه
 Translations=Translations
@@ -420,6 +420,8 @@ TotalTTCShort=جمع‌کل (با مالیات)
 TotalHT=جمع‌کل (بدون مالیت)
 TotalHTforthispage=جمع‌کلی (بدون مالیات) برای این صفحه
 Totalforthispage=جمع‌مبلغ برای این صفحه
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=جمع‌کل (با مالیات)
 TotalTTCToYourCredit=جمع‌کل (با مالیات) به اعتبار شما
 TotalVAT=جمع‌کل مالیات
@@ -647,6 +649,7 @@ ReportName=نام گزارش
 ReportPeriod=بازۀ زمانی گزارش
 ReportDescription=توضیحا
 Report=گزارش
+Reports=گزارش ها
 Keyword=کلیدواژه
 Origin=اصل
 Legend=راهنما
@@ -723,7 +726,7 @@ ValueIsValid=مقدار، معتبر است
 ValueIsNotValid=مقدار، معتبر نیست
 RecordCreatedSuccessfully=ردیف با موفقیت ساخته شد
 RecordModifiedSuccessfully=ردیف با موفقیت تغییر پیدا کرد
-RecordsModified=(%s) ردیف تغییر یافت 
+RecordsModified=(%s) ردیف تغییر یافت
 RecordsDeleted=(%s) حذف شد
 RecordsGenerated=(%s) تولید شد
 ValidatedRecordWhereFound = Some of the selected records have already been validated. No records have been deleted.
@@ -876,7 +879,7 @@ ShowMoreLines=نمایش سطور بیشتر/کمتر
 PublicUrl=نشانی عمومی
 AddBox=ایجاد کادر
 SelectElementAndClick=Select an element and click on %s
-PrintFile=پرینت فایل %s 
+PrintFile=پرینت فایل %s
 ShowTransaction=نمایش ورودی در حساب بانکی
 ShowIntervention=نمایش واسطه‌گری
 ShowContract=نمایش قرارداد
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 309b940b473..460d8027f3c 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -72,24 +72,24 @@ AccountancyAreaDescActionOnceBis=Seuraavat vaiheet kannattaa tehdä, jotta sää
 AccountancyAreaDescActionFreq=Seuraavat toiminnot suoritetaan yleensä kuukausittain, Viikko tai joka päivä erittäin suurille yrityksille...
 
 AccountancyAreaDescJournalSetup=VAIHE %s: Tarkista päiväkirjaluettelosi sisältö osoitteesta valikko %s
-AccountancyAreaDescChartModel=VAIHE %s: Tarkista, että tilikartan malli on olemassa tai luo mallista valikko /span> <span class='notranslate'>%s
+AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
 AccountancyAreaDescChart=VAIHE %s: Valitse ja|tai täydennä tilikarttasi osoitteessa valikko %s
 
-AccountancyAreaDescFiscalPeriod=VAIHE %s: Määritä tilivuosi oletus mukaan, johon Kirjanpito-tilisi integroidaan. > merkintöjä. Käytä tähän <span class='notranslate'>valikko-merkintää %s.
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=VAIHE %s: Määritä kirjanpitotilit kullekin ALV-hinnalle. Käytä tähän valikko-merkintää %s.
 AccountancyAreaDescDefault=VAIHE %s: Määritä oletus kirjanpitotilit. Käytä tähän valikko-merkintää %s.
-AccountancyAreaDescExpenseReport=VAIHE %s: Määritä oletus kirjanpitotilit kullekin <span class=-tyypille 'notranslate'>kuluraportti</span>. Käytä tähän valikko-merkintää %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=VAIHE %s: Määritä oletus kirjanpitotilit kohteelle maksu palkoista. Käytä tähän valikko-merkintää %s.
 AccountancyAreaDescContrib=VAIHE %s: Määritä oletus kirjanpitotilit kohteelle Verot (Erikoiskustannukset). Käytä tähän valikko-merkintää %s.
 AccountancyAreaDescDonation=VAIHE %s: Määritä lahjoitus oletus kirjanpitotilit. Käytä tähän valikko-merkintää %s.
 AccountancyAreaDescSubscription=VAIHE %s: Määritä jäsentilaukselle oletus kirjanpitotilit. Käytä tähän valikko-merkintää %s.
 AccountancyAreaDescMisc=VAIHE %s: Määritä pakolliset oletus tilit ja oletus kirjanpitotilit sekalaisille tapahtumille. Käytä tähän valikko-merkintää %s.
 AccountancyAreaDescLoan=VAIHE %s: Määritä oletus kirjanpitotilit sanalle lainat. Käytä tähän valikko-merkintää %s.
-AccountancyAreaDescBank=VAIHE %s: Määritä kirjanpitotilit ja päiväkirjakoodi jokaiselle pankille ='notranslate'>ja</span> rahoitustilit. Käytä tähän valikko-merkintää %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescProd=VAIHE %s: Määritä kirjanpitotilit tuotteet/Services. Käytä tähän valikko-merkintää %s.
 
 AccountancyAreaDescBind=VAIHE %s: Tarkista olemassa olevien %s rivien välinen sidos ja Kirjanpito -tili on valmis, joten sovellus voi kirjata tapahtumat Ledgeriin yhdellä napsautuksella. Täydelliset puuttuvat sidokset. Käytä tähän valikko-merkintää %s.
-AccountancyAreaDescWriteRecords=VAIHE %s: Kirjoita tapahtumat pääkirjaan. Tätä varten siirry kohtaan valikko <strong>%s</strong>, ja klikkaa painiketta <strong>0</fecb492fz8 <span class='notranslate'></strong>.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
 AccountancyAreaDescAnalyze=VAIHE %s: Lue raportteja tai luo vientitiedostoja muille kirjanpitäjille.
 AccountancyAreaDescClosePeriod=VAIHE %s: Sulje jakso, jotta emme voi siirtää enää tietoja samalla ajanjaksolla tulevaisuudessa.
 
@@ -203,17 +203,17 @@ UseAuxiliaryAccountOnSupplierDeposit=Tallenna toimittaja-tili henkilökohtaisena
 ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Kirjanpito tililtä oletus asiakkaan säilyttämän takuun rekisteröimiseksi
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Tili (tilikartasta), jota käytetään oletus-tilinä samassa maassa ostetulle tuotteet -tilille (käytetään, jos ei määritelty tuoteselosteessa)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Tili (tilikaaviosta), jota käytetään oletus-tilinä tuotteet -tiliin, joka on ostettu <span class='notranslatelta '>ETA</span> toiseen ETA maahan (käytetään, jos sitä ei ole määritelty tuoteselosteessa)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Tili (tilikaaviosta), jota käytetään oletus-tilinä tuotteet ostetulle ja tuotu mistä tahansa muusta ulkomailta (käytetään, jos sitä ei ole määritelty tuoteselosteessa)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Tili (tilikaaviosta) käytettäväksi oletus -tilinä myydylle tuotteet (käytetään, jos sitä ei ole määritelty tuotelehti)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Tili (tilikaaviosta), jota käytetään oletus-tilinä tuotteet -tiliin, jota myydään ETA toiseen ETA maahan (käytetään, jos sitä ei ole määritelty tuoteselosteessa)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Tili (tilikaaviosta) käytettäväksi <span class='notranslate' myydyn <span class='notranslate' tuotteet -tilinä oletus. >ja</span> viedään mihin tahansa muuhun ulkomaahan (käytetään, jos sitä ei ole määritelty tuoteselosteessa)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Tili (tilikartasta), jota käytetään oletus -tilinä samassa maassa ostetuissa palveluissa (käytetään, jos sitä ei ole määritelty palvelulomakkeessa)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Tili (tilikaaviosta), jota käytetään oletus-tilinä palveluille, jotka on ostettu henkilöltä ETA toiselle <span-luokalle ='notranslate'>ETA</span> maa (käytetään, jos sitä ei ole määritelty palvelulomakkeessa)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Tili (tilikartasta), jota käytetään oletus -tilinä ostetuille palveluille ja, jotka on tuotu muusta ulkomailta ( käytetään, jos sitä ei ole määritelty palvelulomakkeessa)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Tili (tilikartasta), jota käytetään oletus -tilinä myydyissä palveluissa (käytetään, jos sitä ei ole määritelty palvelulomakkeessa)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Tili (tilikartasta), jota käytetään oletus-tilinä palveluille, jotka myydään ETA toiselle <span-luokalle ='notranslate'>ETA</span> maa (käytetään, jos sitä ei ole määritelty palvelulomakkeessa)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Tili (tilikartasta), jota käytetään oletus tilinä myydyille palveluille ja, jotka viedään muihin ulkomaihin (käytetään, jos sitä ei ole määritelty palvelulomakkeessa)
 
 Doctype=Asiakirjan tyyppi
@@ -263,7 +263,7 @@ ListeMvts=Lista liikkeistä
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Lisää kirjanpitotilit kohtaan ryhmä
 ReportThirdParty=Luettelo kolmannen osapuolen tilit
-DescThirdPartyReport=Katso tästä luettelo kolmannen osapuolen asiakkaat ja toimittajista ja span class='notranslate'>kirjanpitotilit
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Tuntematon kolmannen osapuolen tili. Käytämme %s
 UnknownAccountForThirdpartyBlocking=Tuntematon kolmannen osapuolen tili. Estovirhe
@@ -293,10 +293,10 @@ DescVentilTodoCustomer=Sido laskurivit, joita ei ole vielä sidottu tuotetiliin
 ChangeAccount=Muuta tuote-/palvelutiliä (tilikartasta) valituille riveille seuraavalla tilillä:
 Vide=-
 DescVentilSupplier=Katso tästä luettelo ostolasku -riveistä, jotka on sidottu tai ei ole vielä sidottu tuotetiliin tilikartalta (näkyvät vain tietueet, joita ei ole vielä siirretty kirjanpitoon)
-DescVentilDoneSupplier=Katso täältä Toimittaja laskujen rivit ja heidän <span class='notranslate'>Kirjanpito-tilinsä
+DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
 DescVentilTodoExpenseReport=Sido kuluraportti riviä, jota ei ole vielä sidottu maksulla Kirjanpito-tili
 DescVentilExpenseReport=Katso tästä luettelo kuluraportti riveistä, jotka on sidottu (tai ei) maksuun Kirjanpito-tili
-DescVentilExpenseReportMore=Jos määrität Kirjanpito-tilin kuluraportti-riville, sovellus voi tehdä kaiken sitomisen <span-luokkasi välillä. ='notranslate'>kuluraportti</span> riviä ja tilikarttasi Kirjanpito tilille yhdellä napsautuksella painike <strong>"%s"</strong>. Jos tiliä ei ole asetettu maksusanakirjaan tai jos sinulla on edelleen joitakin rivejä, joita ei ole sidottu mihinkään tiliin, sinun on tehtävä manuaalinen sidonta tiedostosta valikko "<strong>%s</strong>".
+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=Katso tästä luettelo kuluraporttien riveistä ja niiden maksuista Kirjanpito tili
 
 Closure=Vuosittainen sulkeminen
@@ -335,7 +335,6 @@ CategoryDeleted=Tilin Kirjanpito luokka on poistettu
 AccountingJournals=Kirjanpitotilityypit
 AccountingJournal=Kirjanpito päiväkirja
 NewAccountingJournal=Uusi Kirjanpito -päiväkirja
-ShowAccountingJournal=Näytä Kirjanpito päiväkirja
 NatureOfJournal=Lehden luonne
 AccountingJournalType1=Erilaiset toiminnot
 AccountingJournalType2=Myynti
@@ -346,14 +345,14 @@ AccountingJournalType8=Varasto
 AccountingJournalType9=Kertyneet voittovarat
 GenerationOfAccountingEntries=Kirjanpito merkinnän luominen
 ErrorAccountingJournalIsAlreadyUse=Tämä päiväkirja on jo käytössä
-AccountingAccountForSalesTaxAreDefinedInto=Huomautus: Kirjanpito myyntitili vero on määritelty valikko <b>%s</b> - b058span87f3 <span class='notranslate'>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Sisäänpääsyjen lukumäärä
 NumberOfAccountancyMovements=Liikkeiden määrä
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Poista sidonta ja siirto käytöstä myynnin kirjanpidossa (asiakaslaskuja ei oteta huomioon Kirjanpito)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Poista sidonta ja siirto käytöstä ostojen kirjanpidossa (Toimittaja laskuja ei oteta huomioon Kirjanpito)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Poista sidonta ja siirto käytöstä kirjanpidossa kuluraportit (kuluraportit ei oteta huomioon b0d4305fc47d )
 ACCOUNTING_ENABLE_LETTERING=Ota kirjaintoiminto käyttöön Kirjanpito
-ACCOUNTING_ENABLE_LETTERING_DESC=Kun tämä asetus on käytössä, voit määrittää jokaiselle Kirjanpito-merkinnölle koodin, jotta voit ryhmä eri Kirjanpito liikettä yhdessä. Aikaisemmin, kun eri lehtiä hallittiin itsenäisesti, tämä ominaisuus oli tarpeen ryhmä eri lehtien rivien siirtämiseksi yhteen. Kuitenkin Dolibarr-kirjanpidossa tällainen seurantakoodi, nimeltään "<b>%s<span class='notranslate'></b> span>" on jo tallennettu automaattisesti, joten automaattinen kirjoitus on jo tehty ilman virheriskiä, joten tästä ominaisuudesta on tullut hyödytön yleisessä käytössä. Manuaalinen kirjainominaisuus tarjotaan loppukäyttäjille, jotka eivät todellakaan luota kirjanpidon tietojen siirtoa suorittavaan tietokonemoottoriin.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Tämän ominaisuuden käyttöönotto ei ole enää välttämätöntä tiukan Kirjanpito hallinnan kannalta.
 ACCOUNTING_ENABLE_AUTOLETTERING=Ota automaattinen kirjain käyttöön siirtäessäsi kohteeseen Kirjanpito
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kirjoituksen koodi luodaan automaattisesti ja lisättynä ja, jota loppukäyttäjä ei ole valinnut
@@ -361,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=Kirjainten määrä kirjainkoodia luotaessa (olet
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Jotkut Kirjanpito ohjelmistot hyväksyvät vain kaksikirjaimisen koodin. Tämän parametrin avulla voit asettaa tämän kuvasuhteen. oletus kirjainten määrä on kolme.
 OptionsAdvanced=Edistyneet asetukset
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktivoi toimittaja ostosten ALV:n käännetyn verotuksen hallinta
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Kun tämä vaihtoehto on käytössä, voit määrittää, että toimittaja tai tietty ostolasku on siirrettävä kirjanpitoon eri tavalla: Lisäveloitus ja luottoraja luodaan Kirjanpito kahdelle tietylle tilille "<span class=" määritellystä tilikaaviosta. 'notranslate'>%s</span>" -asetussivulla.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Kun tämä vaihtoehto on käytössä, voit määrittää, että toimittaja tai tietty ostolasku on siirrettävä kirjanpitoon eri tavalla: Lisäveloitus ja luottoraja luodaan Kirjanpito kahdelle tietylle tilille "<span class=" määritellystä tilikaaviosta%s asetussivulla.
 
 ## Export
 NotExportLettering=Älä vie kirjaimia luodessasi tiedosto
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index bb29fdb3666..68d210d3561 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -268,7 +268,7 @@ OtherResources=Muut resurssit
 ExternalResources=Ulkoiset resurssit
 SocialNetworks=Sosiaaliset verkostot
 SocialNetworkId=Sosiaalisen verkoston tunnus
-ForDocumentationSeeWiki=Katso käyttäjien tai kehittäjien dokumentaatio (asiakirja, UKK...)<br>Dolibarr Wikissä:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dccz65878 <span class='notranslate'></b>
+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=Jos sinulla on muita kysymyksiä tai apua, voit käyttää Dolibarrin keskusteluryhmää:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Tässä on joitain resursseja, joilla saat apua ja tukea Dolibarrin kanssa.
 HelpCenterDesc2=Osa näistä resursseista on saatavana vain  <b> englanniksi </b>.
@@ -361,14 +361,14 @@ LastActivationIP=Viimeinen aktiivinen IP
 LastActivationVersion=Uusin aktivointiversio
 UpdateServerOffline=Palvelimen offline-päivitys
 WithCounter=Laskurin hallinta
-GenericMaskCodes=Voit syöttää minkä tahansa numeromaskin. Tässä maskissa voidaan käyttää seuraavia tunnisteita:<br><b>{000000}b09a4b739f17f8 /span> vastaa numeroa, joka kasvaa jokaisen <span class='notranslate'>%s kohdalla. Syötä niin monta nollaa kuin laskurin haluttu pituus. Laskuria täydennetään nollalla vasemmalta, jotta siinä olisi yhtä monta nollaa kuin maskissa. <br><b>{000000+000}</b>, mutta sama kuin edellinen +-merkin oikealla puolella olevaa numeroa vastaava siirtymä otetaan käyttöön ensimmäisestä <span class='notranslate'>%s alkaen. <br><b>{000000@x}</b> mutta sama kuin edellinen laskuri nollataan, kun kuukausi x saavutetaan (x välillä 1 ja 12 tai 0, jos haluat käyttää määrityksessäsi määritettyjä tilivuoden alkukuukausia, tai 99 nollataksesi nolla joka kuukausi). Jos tätä vaihtoehtoa käytetään ja x on 2 tai suurempi, myös järjestys {yy}{mm} tai {yyyy}{mm} vaaditaan. <br><b>{dd}</b> päivä (01–31). span class='notranslate'><br></span><b>{mm}</b> kuukausi (01–12).<br><b>{yy}</b>, 3f658383fz08 {yyyy}</b> tai <b>{y}</b> vuosi yli 2, 4 tai 1 numeroa. <br>
+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> asiakaskoodi n merkillä<br><b>{cccc000}b09a4b739f17> asiakaskoodi n merkkiä seuraa asiakkaalle omistettu laskuri. Tämä asiakkaalle tarkoitettu laskuri nollataan samaan aikaan kuin yleinen laskuri.<br><b>{tttt} </b> Kolmannen osapuolen tyypin koodi n merkillä (katso valikko Etusivu - Asennus - Sanakirja - Kolmannen tyypin tyypit juhlat). Jos lisäät tämän tunnisteen, laskuri on erilainen kullekin kolmannen osapuolen tyypille.<br>
 GenericMaskCodes3=Kaikki muut merkit ja maski pysyy ennallaan. <br> Välilyönnit eivät ole sallittuja. <br>
 GenericMaskCodes3EAN=Kaikki muut maskin merkit pysyvät ennallaan (paitsi * tai ? EAN13:n 13. kohdassa).<br>Välilyönnit eivät ole sallittuja.<br> span>EAN13:ssa viimeisen }:n jälkeen 13. sijainnissa tulee olla * tai ? . Se korvataan lasketulla avaimella.<br>
-GenericMaskCodes4a=<u>Esimerkki kolmannen osapuolen TheCompanyn 99. %s:sta päiväys 31.1.2023:<span class='notranslate'></u><br>
-GenericMaskCodes4b=<u>Esimerkki kolmannesta osapuolesta luotu 31.1.2023:</u><span class='notranslate'><br> >
+GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>Esimerkki tuotteesta luotu 31.1.2023:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> antaa b0aee833650</837f span>ABC2301-000099<span class='notranslate'></b><br>b0aee83365837+0{0@1</0> }-ZZZ/{dd}/XXX<span class='notranslate'></b> antaa <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> antaa <b>IN2301-0099-A</b>, jos <span> class='notranslate'>Yritys</span> on "Responsable Inscripto", jonka tyypin koodi on "A_RI"
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Paluu mukautettavan numeron mukaan määritelty mask.
 ServerAvailableOnIPOrPort=Server on saatavilla <b>osoitteessa %s satama %s</b>
 ServerNotAvailableOnIPOrPort=Palvelin ei ole käytettävissä <b>osoitteessa %s satama %s</b>
@@ -457,19 +457,19 @@ ExtrafieldCheckBox=Valintaruudut
 ExtrafieldCheckBoxFromList=Valintaruudut taulusta
 ExtrafieldLink=Linkki objektiin
 ComputedFormula=Laskettu kenttä
-ComputedFormulaDesc=Voit syöttää tähän kaavan käyttämällä objektin muita ominaisuuksia tai mitä tahansa PHP-koodausta saadaksesi dynaamisen lasketun arvon. Voit käyttää mitä tahansa PHP-yhteensopivia kaavoja, mukaan lukien "?" ehtooperaattori, ja seuraava globaali objekti: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield </strong>.<br><strong>VAROITUS<span class='notranslate'5c070 </span>: Jos tarvitset lataamattoman objektin ominaisuuksia, hae itse objekti kaavaan kuten toisessa esimerkissä.<br>Käyttämällä laskettua Kenttä tarkoittaa, että et voi syöttää itsellesi arvoa käyttöliittymästä. Jos myös syntaksivirhe, kaava ei välttämättä palauta mitään.<br><br>Esimerkki kaavasta:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Esimerkki objektin lataamisesta uudelleen<br>(($reloadedobj = uusi Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey']*- $reloadedobj >kapitali / 5: '-1')<br><br>Muu esimerkki kaavasta, jolla pakotetaan objektin <span class=' kuormitus notranslate'>ja</span> sen pääobjekti:<br>(($reloadedobj = uusi tehtävä($db)) && ($reloadedobj->fetchNoCompute($idobjectoffield-> ) > 0) && ($secondloadedobj = uusi projekti($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'emoprojektia ei löydy'
+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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Tallenna laskettu kenttä
 ComputedpersistentDesc=Lasketut ylimääräiset kentät tallennetaan tietokantaan, mutta arvo lasketaan uudelleen vasta, kun tämän kentän kohdetta muutetaan. Jos laskettu kenttä riippuu muista kohteista tai globaaleista tiedoista, tämä arvo saattaa olla väärä!!
-ExtrafieldParamHelpPassword=Tämän Kenttä jättäminen tyhjäksi tarkoittaa, että tämä arvo tallennetaan ILMAN salausta (Kenttä on vain piilotettu tähdillä näytöllä).<br><br>Syötä arvo dolcrypt koodataksesi arvon palautuvalla salausalgoritmilla. Tyhjät tiedot voidaan edelleen tuntea ja muokattuna, mutta ne on salattu muotoon tietokanta.<br> ><span class='notranslate'><br>Syötä "auto" (tai "md5", "sha256", "password_hash", ...) käyttääksesi oletus span> salasanan salausalgoritmi (tai md5, sha256, password_hash...) tallentaaksesi ei-palauttavan hajautetun salasanan kohteeseen tietokanta (alkuperäistä arvoa ei voi palauttaa)
-ExtrafieldParamHelpselect=Arvoluettelon on oltava rivejä, joissa on muotoavain, arvo (jossa avain ei voi olla '0')<br><br> esimerkiksi : <br>1,value1<br>2,value2b0342fccfda19bzvalue0code3, span class='notranslate'><br></span>...<br><br>Jotta luettelo riippuu muista täydentävä attribuuttiluettelo:<br>1,value1|options_<i>parent_list_codeb0ae64758bac3:3 parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae64758avain_parent_</span>z33 class='notranslate'><br></span><br>Jotta luettelo riippuu toisesta luettelosta:<br>1, value1|<i>parent_list_code</i>:parent_key<br>2,value</2| class='notranslate'><i></span>parent_list_code</i>:parent_key
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (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=Arvoluettelon on oltava rivejä, joissa on muoto: avain,arvo (missä avain ei voi olla 0) <br> <br> esimerkiksi: <br> 1,arvo1 <br> 2,arvo2 <br> 3,arvo3 <br> ...
 ExtrafieldParamHelpradio=Arvoluettelon on oltava rivejä, joissa on muoto: avain,arvo (missä avain ei voi olla 0) <br> <br> esimerkiksi: <br> 1,arvo1 <br> 2,arvo2 <br> 3,arvo3 <br> ...
-ExtrafieldParamHelpsellist=Arvoluettelo tulee taulukosta<br>Syntaksi: table_name:label_field:id_field::filtersql<br>Esimerkki: c_idtypent:libelle ::filtersql<br><br> – id_field on välttämättä ensisijainen int-avain<br> - filtersql on SQL-ehto. Vain aktiivisen arvon näyttäminen voi olla yksinkertainen testi (esim. active=1).<span class='notranslate'><br>Voit myös käyttää $ID$ suodattimessa, joka on nykyisen objektin nykyinen tunnus<br>Jos haluat käyttää SELECT-toimintoa suodattimessa, käytä avainsanaa $SEL$ ohittaaksesi injektioestosuojauksen.<br>jos haluat suodattaa lisäkenttiä käytä syntaksia extra.fieldcode=... (jossa Kenttä koodi on lisäkentän koodi)<br><br>Jotta luettelo riippuu toisesta täydentävästä attribuuttiluettelosta:<br>c_typent:libelle:id:options_b049271e8181fcz /span>parent_list_code<span class='notranslate'></i>|parent_column:filter <br>b0342fccfda19bz järjestyksessä 0 sisältää luettelon toisesta luettelosta riippuen:<span class='notranslate'><br>c_typent:libelle:id:<i>parent_list_codeb0ae64708 |parent_column:filter
-ExtrafieldParamHelpchkbxlst=Arvoluettelo tulee taulukosta<br>Syntaksi: table_name:label_field:id_field::filtersql<br>Esimerkki: c_idtypent:libelle ::filtersql<br><br>-suodatin voi olla yksinkertainen testi (esim. active=1), joka näyttää vain aktiivisen arvon<br>Voit myös käyttää suodattimessa arvoa $ID$, joka on nykyisen objektin nykyinen tunnus<br>Voit tehdä SELECT-toiminnon suodattimessa käyttämällä $SEL$<. span class='notranslate'><br></span>, jos haluat suodattaa lisäkenttiä, käytä syntaksia extra.fieldcode=... (jossa Kenttä koodi on lisäkentän koodi) <br><br>Jotta luettelo riippuu toisesta täydentävästä attribuuttiluettelosta:<br> span>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <span class='notranslate2bccf03datranslate2bccf09 /span><br>Jotta luettelo riippuu toisesta luettelosta:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+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 necessarily 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=Parametrien on oltava ObjectName:Classpath<br>Syntaksi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Pidä tyhjänä yksinkertainen erotin<br>Aseta tämän arvoksi 1, jos haluat tiivistävän erottimen (avaa oletus uutta istuntoa varten, tila on säilytetään jokaista käyttäjäistuntoa varten)<br>Aseta tämän arvoksi 2 tiivistyvälle erottimelle (kutistaa oletus uutta istuntoa varten, tila on säilytetään jokaista käyttäjäistuntoa varten)
 LibraryToBuildPDF=Käytettävä kirjasto PDF:n luomiseen
-LocalTaxDesc=Joissakin maissa voi olla kaksi tai kolme Verot jokaiselle laskuriville. Jos näin on, valitse tyyppi toiselle ja kolmannelle vero ja span> sen kurssi. Mahdolliset tyypit ovat:<span class='notranslate'><br>1: paikallinen vero sovelletaan tuotteet <span> class='notranslate'>ja</span> palvelut ilman alv:ta (localtax lasketaan summasta ilman vero)<br> paikalliset vero koskevat tuotteet ja palvelut, mukaan lukien alv (localtax) määrä + pääasiallinen vero)<br>3: paikallinen vero voimassa tuotteet ilman alv:a (localtax lasketaan summasta ilman vero)<br>4: local vero sovelletaan tuotteet mukaan lukien alv (localtax lasketaan summasta + pääalv)b0342fccfda19 /span>5: paikallinen <span class='notranslate'>vero koskee palveluita ilman ALV:tä (localtax lasketaan summasta ilman vero)<br>6: paikallinen vero koskee palveluja, mukaan lukien alv (localtax lasketaan summasta + <span class='notranslate'>vero)
+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=Tekstiviesti
 LinkToTestClickToDial=Anna puhelinnumero, johon haluat soittaa, jotta saat linkin testata käyttäjän ClickToDial-URL-osoitetta <strong> %s </strong>
 RefreshPhoneLink=Päivitä linkki
@@ -483,7 +483,7 @@ ExternalModule=Ulkoinen moduuli
 InstalledInto=Asennettu hakemistoon %s
 BarcodeInitForThirdparties=viivakoodi-init kolmansille osapuolille
 BarcodeInitForProductsOrServices=Massa viivakoodi init tai reset tuotteet tai palveluille
-CurrentlyNWithoutBarCode=Tällä hetkellä sinulla on <strong>%s</strong> tietue sivustolla <strong>%s</strong> b0ecb2fz87f class='notranslate'>viivakoodi määritetty.
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Alkuarvo %s tyhjälle viivakoodille
 EraseAllCurrentBarCode=Poista kaikki nykyiset viivakoodi arvot
 ConfirmEraseAllCurrentBarCode=Haluatko varmasti poistaa kaikki nykyiset viivakoodiarvot?
@@ -502,7 +502,7 @@ ModuleCompanyCodePanicum=Palauta tyhjä kirjanpitokoodi.
 ModuleCompanyCodeDigitaria=Palauttaa yhdistelmäkoodin Kirjanpito kolmannen osapuolen nimen mukaan. Koodi koostuu etuliitteestä, joka voidaan määrittää ensimmäiseen kohtaan, jota seuraa kolmannen osapuolen koodissa määritetty merkkien määrä.
 ModuleCompanyCodeCustomerDigitaria=%s, jota seuraa lyhennetty asiakkaan nimi merkkien määrällä: %s asiakkaalle b0d4305fc47d9ez  koodi.
 ModuleCompanyCodeSupplierDigitaria=%s ja sen jälkeen katkaistu nimi toimittaja merkkien lukumäärän mukaan: %s koodille toimittaja Kirjanpito.
-Use3StepsApproval=Tekijä: oletus, Hankinta Tilaukset on luotava ja hyväksynyt 2 erilaista käyttäjät (yksi vaihe/käyttäjä luo ja yksi vaihe/käyttäjä hyväksyä >. Huomaa, että jos käyttäjällä on molemmat käyttöoikeudet luo ja hyväksyä, yksi askel/käyttäjä riittää). Voit pyytää tällä vaihtoehdolla ottamaan käyttöön kolmannen vaiheen/käyttäjän hyväksynnän, jos summa on suurempi kuin varattu arvo (joten tarvitaan kolme vaihetta: 1=vahvistus, 2=ensimmäinen hyväksyntä ja</) span> 3=sekunti hyväksyntä, jos määrä riittää).<span class='notranslate'><br>Aseta tämä tyhjäksi, jos yksi hyväksyntä (2 askelta) riittää, aseta arvo erittäin pieneksi (0,1), jos toinen hyväksyntä (3 vaihetta) vaaditaan aina.
+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=Käytä kolmivaiheista hyväksyntää, kun summa (ilman vero) on suurempi kuin...
 WarningPHPMail=VAROITUS: Asetukset sähköpostien lähettämiseen sovelluksesta käyttävät oletus yleistä asetusta. Usein on parempi määrittää lähtevät sähköpostit käyttämään sähköpostipalveluntarjoajasi sähköpostipalvelinta oletus-asetuksen sijaan useista syistä:
 WarningPHPMailA=- Sähköpostipalveluntarjoajan palvelimen käyttö lisää sähköpostisi luotettavuutta, joten se lisää toimitettavuutta ilman, että se merkitään roskapostiksi
@@ -518,8 +518,8 @@ DependsOn=Tämä moduuli tarvitsee moduulit
 RequiredBy=Moduuli (t) vaativat tämän moduulin
 TheKeyIsTheNameOfHtmlField=Tämä on HTML-koodin Kenttä nimi. Tekninen tietämys vaaditaan HTML-sivun sisällön lukemiseen saadakseen Kenttä avaimenimen.
 PageUrlForDefaultValues=Sinun on syötettävä sivun URL-osoitteen suhteellinen polku. Jos lisäät parametreja URL-osoitteeseen, se on tehokas, jos kaikilla selattavan URL-osoitteen parametreilla on tässä määritetty arvo.
-PageUrlForDefaultValuesCreate=<br>Esimerkki:<br>Lomake luo uudelle kolmannelle osapuolelle, se on <strong>%s</strong>. <br>Muokattuun hakemistoon asennettujen ulkoisten moduulien URL-osoitteisiin älä sisällytä "custom/", joten käytä polkua kuten <strong>mymodule/mypage.php</strong> ja not custom/mymodule/mypage.php.<br>, jonka haluat <span>classIf ='notranslate'>oletus arvo vain, jos URL-osoitteessa on jokin parametri, voit käyttää <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Esimerkki:<br>Sivulla, jolla on luettelo kolmansista osapuolista, se on <strong> >%s</strong>.<br>Muokattuun hakemistoon asennettujen ulkoisten moduulien URL-osoitteet , älä sisällytä "custom/", joten käytä polkua kuten <strong>mymodule/mypagelist.php</strong> ja not custom/mymodule/mypagelist.php.<br>Jos haluat oletus</url>-arvon vain jos sisältää jonkin parametrin, voit käyttää <span class='notranslate'><strong>%s</strong>
+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=Huomaa myös, että oletus-arvojen korvaaminen lomakkeiden luonnissa toimii vain sivuilla, jotka on suunniteltu oikein (siis parametrilla action=luo tai presend ...)
 EnableDefaultValues=Ota käyttöön oletusarvojen mukauttaminen
 EnableOverwriteTranslation=Salli käännösten mukauttaminen
@@ -531,7 +531,7 @@ ProductBatchDocumentTemplates=Asiakirjamallit tuoteerien asiakirjan luomiseksi
 FreeLegalTextOnExpenseReports=Ilmainen lakiteksti kuluraporteissa
 WatermarkOnDraftExpenseReports=Vesileima kuluraporttiluonnoksissa
 ProjectIsRequiredOnExpenseReports=Projekti on pakollinen kuluraportti
-PrefillExpenseReportDatesWithCurrentMonth=Esitäytä uusi kuluraportti alku ja loppu päivämäärät. class='notranslate'>ja</span> kuluvan kuukauden päivämäärät
+PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Pakota kuluraportti summien syöttäminen aina summana Verot
 AttachMainDocByDefault=Aseta arvoksi <b>Kyllä</b>, jos haluat liittää oletus pääasiakirja sähköpostiin (jos mahdollista)
 FilesAttachedToEmail=Liitä tiedosto
@@ -742,8 +742,8 @@ Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vie tuotteita
 Permission39=Ohita vähimmäishinta
-Permission41=Lue Projektit ja tehtäviä (jaettu Projektit <span' class='notranslate >ja</span> Projektit jonka yhteyshenkilö olen).
-Permission42=luo/modify Projektit (jaettu Projektit <span' class='notranslate' class=' >ja</span> Projektit jonka yhteyshenkilö olen). Voi myös määrittää käyttäjiä Projektit ja tehtäviin
+Permission41=Read projects and tasks (shared projects and projects of which I am a contact).
+Permission42=Create/modify projects (shared projects and projects of which I am a contact). Can also assign users to projects and tasks
 Permission44=Poista Projektit (jaettu Projektit ja <span' class=' Projektit</span> jonka yhteyshenkilö olen)
 Permission45=Vie Projektit
 Permission61=Lue interventioiden
@@ -792,7 +792,7 @@ Permission125=Poista kolmansien osapuolten liittyy käyttäjän
 Permission126=Vienti kolmansiin osapuoliin
 Permission130=luo/muokkaa kolmansien osapuolten maksu tietoja
 Permission141=Lue kaikki Projektit ja tehtävät (sekä yksityiset Projektit en ole yhteyshenkilö)
-Permission142=luo/muokkaa kaikkia Projektit ja < (sekä yksityisiä tehtäviä span class='notranslate'>Projektit</span>, jonka yhteyshenkilö en ole)
+Permission142=Create/modify all projects and tasks (as well as the private projects for which I am not a contact)
 Permission144=Poista kaikki Projektit ja tehtävät (sekä yksityiset Projektit ei yhteystieto)
 Permission145=Voi syöttää minulle tai hierarkialleni kulutetun ajan määrättyihin tehtäviin (aikataulukko)
 Permission146=Lue tarjoajien
@@ -854,7 +854,7 @@ Permission254=Poista tai poistaa muiden käyttäjien
 Permission255=Muokkaa käyttäjien salasanoja
 Permission256=Poista käyttäjiä
 Permission262=Laajenna pääsy kaikille kolmansille osapuolille ja heidän objekteihinsa (ei vain kolmansille osapuolille, joiden myyntiedustaja on).<br>Ei voimassa ulkopuolisille käyttäjille (rajoitettu aina itseensä ehdotuksiin, tilauksiin, laskuihin, sopimuksiin jne.).<br>Ei voimassa: Projektit (vain projektin käyttöoikeuksia koskevat säännöt, näkyvyyden ja tehtävällä on merkitystä).
-Permission263=Laajenna pääsy kaikille kolmansille osapuolille ILMAN heidän objektejaan (ei vain kolmansille osapuolille, joiden myyntiedustaja on käyttäjä).<br>Ei tehokas ulkoisille käyttäjille (rajoitettu aina itseensä ehdotuksiin, tilaukset, laskut, sopimukset jne.).<br>Ei voimassa Projektit (vain projektin käyttöoikeuksia, näkyvyyttä koskevat säännöt <span class) ='notranslate'>ja</span> tehtävällä on merkitystä).
+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=Lue CA
 Permission272=Lue laskut
 Permission273=Laskutuksen
@@ -1118,10 +1118,10 @@ BackToModuleList=Takaisin moduuliluetteloon
 BackToDictionaryList=Takaisin sanakirjaluetteloon
 TypeOfRevenueStamp=Veroleiman tyyppi
 VATManagement=Myyntiverojen hallinta
-VATIsUsedDesc=Tekijä oletus luodessaan potentiaalisia asiakkaita, laskuja, tilauksia jne. Myyntiprosentti vero noudattaa aktiivista vakiosääntöä:<br>Jos myyjä ei ole Myynnin vero alainen, Myynti vero päättyy oletuksena. säännön.<br>Jos (myyjän maa = ostajan maa), <span class='notranslate' Myynti vero >oletus</span> vastaa tuotteen vero myyntiä myyjän maassa. Säännön loppu.<br>Jos myyjän ja ostaja ovat molemmat Euroopan yhteisön alueella, b0ae6e9e5925a0z /span> tavarat liittyvät kuljetuksiin <span class='notranslate'>tuotteet (kuljetus, merenkulku, lentoyhtiö), oletus ALV on 0. Tämä sääntö on riippuu myyjän maasta – ota yhteyttä kirjanpitäjään. Ostajan tulee maksaa arvonlisävero maansa tullitoimipaikalle ja, ei myyjälle. Säännön loppu.<br>Jos myyjän ja ostaja ovat molemmat Euroopan yhteisön alueella, b0ae6e9e5925a0z /span> ostaja ei ole <span class='notranslate'>Yritys (jolla on rekisteröity yhteisön sisäinen ALV-numero), jolloin ALV:n oletusarvo on myyjän maan ALV-kanta. Säännön loppu.<br>Jos myyjän ja ostaja ovat molemmat Euroopan yhteisön alueella, b0ae6e9e5925a0z /span> ostaja on <span class='notranslate'>Yritys (jolla on rekisteröity yhteisön sisäinen ALV-numero), silloin ALV on 0 oletus . Säännön loppu.<br>Muissa tapauksissa ehdotettu oletus on Myynti vero >=0. Säännön loppu.
+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 dependent 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=Oletusarvoisesti ehdotettu myyntivero on 0, jota voidaan käyttää esimerkiksi yhdistyksiin, yksityishenkilöihin tai pieniin yrityksiin.
 VATIsUsedExampleFR=Ranskassa se tarkoittaa yrityksiä tai organisaatioita, joilla on todellinen verojärjestelmä (yksinkertaistettu todellinen tai normaali real). Järjestelmä, jossa arvonlisävero ilmoitetaan.
-VATIsNotUsedExampleFR=Ranskassa se tarkoittaa yhdistyksiä, jotka eivät ole myynti- vero ilmoitettuja, tai yrityksiä, organisaatioita tai vapaita ammatteja, jotka ovat valinneet mikroyritysten verotusjärjestelmän (Sales vero  franchising-sopimuksessa) ja maksoi franchising-sopimuksen Myynti vero ilman myyntiä b0e7a3c6c047b2c6c0 /span> -ilmoitus. Tämä vaihtoehto näyttää laskuissa viittauksen "Ei sovellettavissa myynti <span class='notranslate'>vero - art-293B of CGI".
+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.
 VATType=ALV-tyyppi
 ##### Local Taxes #####
 TypeOfSaleTaxes=Myyntiveron tyyppi
@@ -1146,7 +1146,7 @@ LocalTax2IsUsedExampleES=Espanjassa, freelancer ja itsenäisten ammatinharjoitta
 LocalTax2IsNotUsedExampleES=Espanjassa ne ovat yrityksiä, joihin ei sovelleta vero moduulijärjestelmää.
 RevenueStampDesc="vero leima" tai "tuloleima" on kiinteä vero, joka on sinulle laskua kohden (se ei riipu laskun määrästä ). Se voi olla myös prosenttiosuus vero, mutta toisen tai kolmannen tyypin vero käyttäminen on parempi prosenttiosuudelle Verot vero -leimoina ei anna mitään raportteja. Vain harvat maat käyttävät tämän tyyppistä vero-tyyppiä.
 UseRevenueStamp=Käytä veroleimaa
-UseRevenueStampExample=Merkin vero leiman arvon määrittää oletus sanakirjojen asetuksiin (b0ecb2ec87f49fez span> - <span class='notranslate'>%s - %s)
+UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
 CalcLocaltax=Raportit paikallisista veroista
 CalcLocaltax1=Myynnit - Ostot
 CalcLocaltax1Desc=Paikallisten verojen raportit on laskettu paikallisverojen myyntien ja ostojen erotuksena
@@ -1154,7 +1154,7 @@ CalcLocaltax2=Ostot
 CalcLocaltax2Desc=Veroraportit on laskettu hankintojen veroista
 CalcLocaltax3=Myynti
 CalcLocaltax3Desc=Veroraportit on laskettu myyntien veroista
-NoLocalTaxXForThisCountry=Asetuksen Verot mukaan (katso %s - %s - <span> class='notranslate'>%s</span>), maasi ei tarvitse käyttää tällaista vero
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löytyy koodi
 LabelOnDocuments=Label asiakirjoihin
 LabelOrTranslationKey=Tunniste tai käännösavain
@@ -1197,6 +1197,7 @@ Skin=Ihon teema
 DefaultSkin=Oletus ihon teema
 MaxSizeList=Max pituus luettelo
 DefaultMaxSizeList=Oletus luettelon maksimipituuteen
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=oletus lyhyiden luetteloiden enimmäispituus (eli asiakaskortissa)
 MessageOfDay=Message of the day
 MessageLogin=Kirjoita viesti
@@ -1249,7 +1250,7 @@ SetupDescription2=Seuraavat kaksi osiota ovat pakollisia (kaksi ensimmäistä me
 SetupDescription3=<a href="%s">%s -> %sb0cz0e47d <br><br>Perusparametrit, joita käytetään oletus-käyttäytymisen mukauttamiseen sovelluksestasi (esim. maakohtaiset ominaisuudet).
 SetupDescription4=<a href="%s">%s -> %sb0cz0e47d <br><br>Tämä ohjelmisto sisältää useita moduuleja/sovelluksia. Tarpeisiisi liittyvät moduulit on otettava käyttöön ja määritettynä. valikko merkintä tulee näkyviin, kun nämä moduulit aktivoidaan.
 SetupDescription5=Muut asetukset valikko hallitsevat valinnaisia parametreja.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>b0e40d8c6587 /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Perusparametrit, joilla muokataan sovelluksesi oletus toimintaa (esim. maakohtaisia ominaisuuksia varten).
 SetupDescription4b=Tämä ohjelmisto on sarja monia moduuleja/sovelluksia. Sinun tarpeisiisi liittyvät moduulit on aktivoitava. valikko merkintä tulee näkyviin, kun nämä moduulit aktivoidaan.
 AuditedSecurityEvents=Turvatapahtumat, jotka auditoidaan
@@ -1281,7 +1282,7 @@ AvailableModules=Saatavilla olevat sovellukset/moduulit
 ToActivateModule=Moduulien aktivointi asetuksista (Koti-Asetukset-Moduulit)
 SessionTimeOut=Istunnon aikakatkaisu
 SessionExplanation=Tämä numero takaa, että istunto ei koskaan vanhene ennen tätä viivettä, jos istunnon puhdistuksen suorittaa sisäinen PHP-istunnonpuhdistaja (ja ei muuta). Sisäinen PHP-istunnonpuhdistaja ei takaa, että istunto vanhenee tämän viiveen jälkeen. Se vanhenee tämän viiveen jälkeen ja, kun istunnonpuhdistaja suoritetaan, joten jokainen <b>%s/%s</b> pääsy, mutta vain muiden istuntojen aikana (jos arvo on 0, se tarkoittaa, että istunnon tyhjentää vain ulkoinen prosessi).<br>Huomaa: joissakin palvelimissa, joissa on ulkoinen istunnon puhdistusmekanismi (cron under debian, ubuntu...), istunnot voidaan tuhota ulkoisen asennuksen määrittämän ajanjakson jälkeen riippumatta tähän syötetystä arvosta.
-SessionsPurgedByExternalSystem=Tämän palvelimen istunnot näyttävät puhdistettavan ulkoisella mekanismilla (cron alle debian, ubuntu...), luultavasti joka <b>%s</b> sekuntia (= parametrin arvo <b>session.gc_maxlifetime<span class='notranslate'>b09a4b739f) , joten arvon muuttamisella ei ole vaikutusta. Sinun on pyydettävä palvelimen järjestelmänvalvojaa muuttamaan istunnon viivettä.
+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=Saatavilla laukaisimet
 TriggersDesc=Triggerit ovat tiedostoja, jotka muokkaavat Dolibarrin työnkulkua, kun ne on kopioitu hakemistoon <b>htdocs/core/triggers</b>. He toteuttavat uusia toimintoja, jotka aktivoituvat Dolibarr-tapahtumissa (uuden Yritys luominen, laskun vahvistus, ...).
 TriggerDisabledByName=Käynnistäjät tässä tiedosto on poistettu, <b>joita-NORUN</b> suffix heidän nimissään.
@@ -1307,20 +1308,20 @@ NoEventFoundWithCriteria=Tälle hakukriteerille ei löytynyt suojaustapahtumaa.
 SeeLocalSendMailSetup=Katso paikallisen sendmail setup
 BackupDesc=Dolibarr-asennuksen <b>täydellinen</b> varmuuskopiointi vaatii kaksi vaihetta.
 BackupDesc2=Varmuuskopioi "documents" -hakemiston sisältö (<b>%s</b>) sisältää kaikki ladatut ja luodut tiedostot. Tämä sisältää myös kaikki vaiheessa 1 luodut vedostiedostot. Tämä toiminto voi kestää useita minuutteja.
-BackupDesc3=Varmuuskopioi tietokanta (<b><span class=) rakenne ja 'notranslate'>%s</span></b>) vedokseen tiedosto. Tätä varten voit käyttää seuraavaa avustajaa.
+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=Arkistoitu hakemisto tulisi tallentaa turvalliseen paikkaan.
 BackupDescY=Luotu dump tiedosto on säilytettävä turvallisessa paikassa.
 BackupPHPWarning=Varmuuskopiointia ei voida taata tällä menetelmällä. Edellinen suositeltava.
 RestoreDesc=Dolibarr-varmuuskopion palauttaminen edellyttää kahta vaihetta.
 RestoreDesc2=Palauta "documents" -hakemiston varmuuskopio tiedosto (esimerkiksi zip tiedosto) uuteen Dolibarr-asennukseen tai näihin nykyisiin asiakirjoihin hakemisto (<b>%s</b>).
-RestoreDesc3=Palauta tietokanta-rakenteen ja tiedot varmuuskopiovedosta tiedosto < span class='notranslate'>tietokanta</span> uudesta Dolibarr-asennuksesta tai tämän nykyisen asennuksen tietokanta (<b> >%s</b>). Varoitus, kun palautus on valmis, sinun on käytettävä kirjautumistunnusta/salasanaa, joka oli olemassa varmuuskopioinnin tai asennuksen aikana, jotta voit muodostaa yhteyden uudelleen.<br>Varmuuskopion palauttaminen tietokanta tähän nykyiseen asennukseen, voit seurata tätä avustajaa.
+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 vienti
 ForcedToByAModule=Tämä sääntö on <b>pakko %s</b> on aktivoitu moduuli
 ValueIsForcedBySystem=Järjestelmä pakottaa tämän arvon. Et voi muuttaa sitä.
 PreviousDumpFiles=Olemassa olevat varmuuskopiot
 PreviousArchiveFiles=Olemassa olevat arkistotiedostot
 WeekStartOnDay=Ensimmäinen viikonpäivä
-RunningUpdateProcessMayBeRequired=Päivitysprosessi näyttää vaadittavan (Ohjelman versio %s eroaa tietokanta versiosta <span class='notranslate'>%s /span>)
+RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Sinun on suoritettava tämä komento komentoriviltä jälkeen kirjautua kuori käyttäjän <b>%s.</b>
 YourPHPDoesNotHaveSSLSupport=SSL toimintoja ei saatavilla PHP
 DownloadMoreSkins=Lisää nahat ladata
@@ -1371,8 +1372,8 @@ SendmailOptionMayHurtBuggedMTA=Ominaisuus lähettää sähköpostit "PHP mail di
 TranslationSetup=Käännöksen asetukset
 TranslationKeySearch=Etsi käännöstä
 TranslationOverwriteKey=Ylikirjoita käännösteksti
-TranslationDesc=Näytön asettaminen Kieli:<br>* oletus/Systemwide: span class='notranslate'>valikko</span> <strong>Etusivu -> Asennus -> Näyttö</strong><br>* Käyttäjää kohden: klikkaa käyttäjänimeä näytön yläreunassa ja muokkaa <strong> Käyttäjän näytön asetukset</strong> -välilehti käyttäjäkortissa.
-TranslationOverwriteDesc=Voit myös ohittaa seuraavan taulukon täyttävät merkkijonot. Valitse Kieli avattavasta %s-valikosta, lisää käännösavainmerkkijono kohtaan %s /span>" <span class='notranslate'>ja uusi käännös kielelle "%s"
+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=Voit käyttää toista välilehteä saadaksesi selville, mitä käännösavainta käytetään
 TranslationString=Käännösteksti
 CurrentTranslationString=Nykyinen käännösteksti
@@ -1404,7 +1405,7 @@ PHPModuleLoaded=PHP:n laajennus %sladattu
 PreloadOPCode=Esiladattua OPCode-koodia käytetään
 AddRefInList=Näytä asiakas/Toimittaja viite. yhdistelmäluetteloihin.<br>Kolmannet osapuolet näkyvät nimimuodolla "CC12345 - SC45678 - Suuri Yritys corp." "The Big Yritys corp" sijaan.
 AddVatInList=Näytä asiakkaan/Toimittaja ALV-numero yhdistelmäluetteloissa.
-AddAdressInList=Näytä asiakkaan/Toimittaja osoite yhdistelmäluetteloissa.<br>Kolmannet osapuolet tulevat näkyviin nimimuodolla "The Big <span class=" 'notranslate'>Yritys</span> corp. - 21 jump street 123456 Big Town - USA" "The Big Yritys corp" sijaan.
+AddAdressInList=Display Customer/Vendor address 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=Näytä yhteyshenkilön sähköpostiosoite (tai puhelinnumerot, jos niitä ei ole määritetty) ja kaupungin tietoluettelo (valitse luettelo tai yhdistelmälaatikko)<br>Yhteystiedot näkyvät nimimuoto "Dupond Durand - dupond.durand@example.com - Paris" tai "Dupond Durand - 06 07 59 65 66 - Paris" "Dupond Durand" sijaan.
 AskForPreferredShippingMethod=Kysy ensisijaista lähetystapaa kolmansille osapuolille.
 FieldEdition=Alalla painos %s
@@ -1434,7 +1435,7 @@ HRMSetup=Henkilöstöhallinta moduulin asetukset
 CompanySetup=Yritykset moduulin asetukset
 CompanyCodeChecker=Vaihtoehdot asiakas- / toimittajakoodien automaattiseen luomiseen
 AccountCodeManager=Vaihtoehdot asiakkaan / toimittajan kirjanpitokoodien automaattiseen luomiseen
-NotificationsDesc=Sähköposti Ilmoitukset voidaan lähettää automaattisesti joidenkin Dolibarr-tapahtumien yhteydessä.<br>Sähköpostin <span class='notranslate'>b0cb8c8f02af vastaanottajat > voidaan määritellä:
+NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
 NotificationsDescUser=* käyttäjää kohden, yksi käyttäjä kerrallaan.
 NotificationsDescContact=* kolmansien osapuolten yhteystietoja (asiakkaita tai toimittajia) kohti, yksi yhteyshenkilö kerrallaan.
 NotificationsDescGlobal=* tai asettamalla yleiset sähköpostiosoitteet moduulin asetussivulla.
@@ -1595,8 +1596,8 @@ LDAPSynchroKO=Epäonnistui synkronointi testi
 LDAPSynchroKOMayBePermissions=Synkronointitesti epäonnistui. Tarkista, että yhteys palvelimeen on määritetty oikein ja sallii LDAP-päivitykset
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP yhteyden LDAP-palvelin onnistunut (Server= %s, Port= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP yhteyden LDAP-palvelimeen ei onnistunut (Server= %s, Port= %s)
-LDAPBindOK=Yhdistäminen/todennus LDAP-palvelimeen onnistui (Server=%s, Port=%s, b0b4652430823334308 /span>=<span class='notranslate'>%s, Salasana=%s)
-LDAPBindKO=Yhteyden muodostaminen/todennus LDAP-palvelimeen epäonnistui (palvelin=%s, portti=%s, b0b46534308 /span>=<span class='notranslate'>%s, Salasana=%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-palvelin määritetty versio 3
 LDAPSetupForVersion2=LDAP-palvelin määritetty versio 2
 LDAPDolibarrMapping=Dolibarr Mapping
@@ -1671,7 +1672,7 @@ NotInstalled=Ei asennettu.
 NotSlowedDownByThis=Ei hidasta tätä.
 NotRiskOfLeakWithThis=Ei vuotoriskiä tällä.
 ApplicativeCache=Sovellettava välimuisti
-MemcachedNotAvailable=Sovellusvälimuistia ei löytynyt. Voit parantaa suorituskykyä asentamalla välimuistipalvelimen, johon on tallennettu ja moduuli, joka pystyy käyttämään tätä välimuistipalvelinta.<br>Lisätietoja täältä <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<span class='notranslate<94bz'>b3142fz0 /span>Huomaa, että monet verkkopalveluntarjoajat eivät tarjoa tällaista välimuistipalvelinta.
+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=Moduuli on tallennettu sovelluksen välimuistiin, mutta moduulin asennus ei ole valmis.
 MemcachedAvailableAndSetup=Memcached-moduuli, joka on omistettu memcached-palvelimen käyttöön, on käytössä.
 OPCodeCache=OPCode-välimuisti
@@ -1704,7 +1705,7 @@ AutoFillFormFieldBeforeSubmit=Täytä kuvauksen syöttökenttä automaattisesti
 DoNotAutofillButAutoConcat=Älä täytä syötettä Kenttä automaattisesti tuotteen kuvauksella. Tuotteen kuvaus liitetään annettuun kuvaukseen automaattisesti.
 DoNotUseDescriptionOfProdut=Tuotteen kuvausta ei koskaan sisällytetä asiakirjarivien kuvaukseen
 MergePropalProductCard=Aktivoi tuotteen/palvelun liitetiedostot -välilehdellä vaihtoehto tuotteen PDF-dokumentin yhdistämiseksi tarjous PDF-azuriin, jos tuote/palvelu on kohdassa tarjous
-ViewProductDescInThirdpartyLanguageAbility=Näytä tuotteet kuvaukset kolmannen osapuolen Kieli lomakkeissa (muussa muodossa <span class='notranslate'>b0df2e8a8z0<c0 /span> käyttäjästä)
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Jos sinulla on myös suuri määrä tuotteet (> 100 000), voit lisätä nopeutta asettamalla vakion PRODUCT_DONOTSEARCH_ANYWHERE arvoksi 1 kohdassa Setup->Other. Haku rajoittuu sitten merkkijonon alkuun.
 UseSearchToSelectProduct=Odota, kunnes painat näppäintä, ennen kuin lataat tuoteyhdistelmäluettelon sisällön (Tämä voi parantaa suorituskykyä, jos sinulla on paljon tuotteet, mutta se ei ole niin kätevää)
 SetDefaultBarcodeTypeProducts=Tuotteissa käytetty viivakoodin tyyppi
@@ -1789,7 +1790,7 @@ FCKeditorForMail=WYSIWYG-luonti/painos kaikille viesteille (paitsi Työkalut->s
 FCKeditorForTicket=WYSIWYG-luonti/painos lipuille
 ##### Stock #####
 StockSetup='Varasto' - moduulin asetukset
-IfYouUsePointOfSaleCheckModule=Jos käytät oletus:n tarjoamaa myyntipistemoduulia (POS) tai ulkoista moduulia, POS-moduulisi saattaa jättää tämän asennuksen huomioimatta. Useimmat myyntipistemoduulit on suunnitellut oletus ja luo laskuttaa välittömästi ja span class='notranslate'>vähentää</span> -osakkeesta riippumatta tässä olevista vaihtoehdoista. Joten jos sinulla on tai ei ole varastossa vähentää, kun rekisteröit myyntiä myyntipisteestäsi, tarkista myös POS-moduulisi asetukset.
+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.
 ##### Menu #####
 MenuDeleted=Valikko poistettu
 Menu=Valikko
@@ -1848,7 +1849,7 @@ AGENDA_DEFAULT_VIEW = Minkä näkymän haluat avata: oletus, kun valitset valikk
 AGENDA_EVENT_PAST_COLOR = Menneen tapahtuman väri
 AGENDA_EVENT_CURRENT_COLOR = Tämänhetkinen tapahtuman väri
 AGENDA_EVENT_FUTURE_COLOR = Tulevaisuuden tapahtuman väri
-AGENDA_REMINDER_BROWSER = Ota tapahtumamuistutus <b> käyttöön käyttäjän selaimessa</b> (kun muistutus päiväys saavutetaan , selain näyttää ponnahdusikkunan. Jokainen käyttäjä voi poistaa tällaisen <span class='notranslate'>Ilmoitukset selaimen ilmoitusasetuksista).
+AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
 AGENDA_REMINDER_BROWSER_SOUND = Ota käyttöön ilmoitusäänet
 AGENDA_REMINDER_EMAIL = Ota käyttöön sähköpostimuistutus <b></b> (muistutusvaihtoehto/viive voidaan määrittää kullekin tapahtumalle).
 AGENDA_REMINDER_EMAIL_NOTE = Huomaa: ajoitetun työn %s tiheyden on oltava riittävä, jotta varmistetaan, että muistutus lähetetään oikealla hetkellä.
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Älä viedä tapauksessa vanhempia kuin
 SecurityKey = Turva-avain
 ##### ClickToDial #####
 ClickToDialSetup='Click To Dial'-moduulin asetukset
-ClickToDialUrlDesc=URL-osoite kutsutaan, kun puhelinkuvaa napsautetaan. URL-osoitteessa voit käyttää tunnisteita<br><b>__PHONETO__</b> korvattu soittajan puhelinnumerolla<br><b>__PHONEFROM__</b> korvataan soittavan henkilön puhelinnumerolla (sinun)<span class='notranslate'><br><b>__LOGIN__b09a4b739f1 span>, joka korvataan clicktodial-kirjautumisella (määritetty käyttäjäkortissa)<span class='notranslate'><br><b>__PASS__ </b>, joka korvataan clicktodial-salasanalla (määritetty käyttäjäkortissa).
+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=Tämä moduuli muuttaa puhelinnumerot pöytätietokonetta käytettäessä napsautettaviksi linkeiksi. Numeroon soitetaan klikkaus. Tätä voidaan käyttää puhelun aloittamiseen, kun käytät pehmeää puhelinta työpöydälläsi tai kun käytät esimerkiksi SIP-protokollaan perustuvaa CTI-järjestelmää. Huomautus: Kun käytät älypuhelinta, puhelinnumerot ovat aina napsautettavissa.
 ClickToDialUseTelLink=Käytä vain linkkiä "tel:" puhelinnumeroihin
 ClickToDialUseTelLinkDesc=Käytä tätä menetelmää, jos käyttäjilläsi on ohjelmistopuhelin tai ohjelmistoliitäntä, joka on asennettu samaan tietokoneeseen kuin selain. ja kutsutaan, kun napsautat "tel:"-alkuista linkkiä selaimesi. Jos tarvitset linkin, joka alkaa sanalla "sip:" tai täyden palvelinratkaisun (ei tarvitse paikallista ohjelmiston asennusta), sinun on asetettava asetukseksi "Ei". ja täytä seuraava Kenttä.
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=Ulkoisen moduulin asennus ei ole mahdolli
 SomethingMakeInstallFromWebNotPossible2=Tästä syystä tässä kuvattu päivitysprosessi on manuaalinen prosessi, jonka vain etuoikeutettu käyttäjä voi suorittaa.
 InstallModuleFromWebHasBeenDisabledContactUs=Ulkoisten moduulien tai dynaamisten verkkosivustojen asentaminen tai kehittäminen sovelluksesta on tällä hetkellä lukittu turvallisuussyistä. Ota yhteyttä, jos haluat ottaa tämän ominaisuuden käyttöön.
 InstallModuleFromWebHasBeenDisabledByFile=Järjestelmänvalvoja on poistanut ulkoisen moduulin asennuksen sovelluksesta. Sinun on pyydettävä häntä poistamaan tiedosto <strong> %s </strong> tämän ominaisuuden sallimiseksi.
-ConfFileMustContainCustom=Ulkoisen moduulin asentaminen tai rakentaminen sovelluksesta täytyy tallentaa moduulitiedostot hakemistoon <strong>%s </strong>. Jotta Dolibarr käsittelee tämän hakemiston, sinun on määritettävä <strong>conf/conf.php</strong>, jotta voit lisätä kaksi ohjeriviä: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a65fc9 classz0<span9 classz0 ='notranslate'><br></span><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49fztom' '></strong></span>
+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=Korosta taulukon rivit hiiren liikkuessa niiden päällä
 HighlightLinesColor=Korosta viivan väri, kun hiiri kulkee sen yli (käytä "ffffff", jos et halua korostaa)
 HighlightLinesChecked=Korosta viivan väri, kun se on valittuna (käytä "ffffff", jos et halua korostaa)
@@ -1998,7 +1999,7 @@ EnterAnyCode=Tämä kenttä sisältää viitteen linjan tunnistamiseksi. Syötä
 Enter0or1=Syötä 0 tai 1
 UnicodeCurrency=Kirjoita tähän aaltosulkeiden väliin, luettelo tavunumerosta, joka edustaa valuuttasymbolia. Esimerkiksi: kirjoita $: lle [36] - Brasilian real:lle R $ [82,36] - €: lle, kirjoita [8364]
 ColorFormat=RGB-väri on HEX-muodossa, esim .: FF0000
-PictoHelp=Kuvakkeen nimi muodossa:<br>- image.png kuvalle tiedosto nykyiseen teemahakemistoon<br>- image.png@module, jos tiedosto on moduulin hakemistossa /img/<br>- fa-xxx FontAwesome fa-xxx -kuvalle<br> - fontawesome_xxx_fa_color_size FontAwesome fa-xxx -kuvalle (etuliitteellä, väri <span class='notranslate6e90505atranslate65a9> koko setti)
+PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Viivan sijainti yhdistelmäluetteloissa
 SellTaxRate=Myyntiprosentti vero
 RecuperableOnly=Kyllä, jos arvonlisävero "Ei havaittu, mutta palautettavissa" on omistettu jollekin Ranskan osavaltiolle. Pidä arvo "Ei" kaikissa muissa tapauksissa.
@@ -2114,7 +2115,7 @@ YouCanDeleteFileOnServerWith=Voit poistaa tämän tiedoston palvelimelta komento
 ChartLoaded=Tilikartta ladattu
 SocialNetworkSetup=Sosiaalisten verkostojen moduulin asetukset
 EnableFeatureFor=Ota ominaisuudet käyttöön kohteelle <strong>%s</strong>
-VATIsUsedIsOff=Huomautus: Myynti-vero tai ALV-vaihtoehto on asetettu arvoon <strong>Poisb0a65d071f6fc /span> <span class='notranslate'>valikko %s - %s, joten myynti <span> class='notranslate'>vero</span> tai käytetty ALV on aina 0 myynnin yhteydessä.
+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=Vaihda lähettäjän ja vastaanottajan osoitteen sijainti PDF-dokumenteissa
 FeatureSupportedOnTextFieldsOnly=Varoitus, ominaisuutta tuetaan vain tekstikentissä ja yhdistelmäluetteloissa. Myös URL-parametri action=luo tai action=edit on asetettava TAI sivun nimen lopussa on oltava "new.php", jotta tämä ominaisuus käynnistyy.
 EmailCollector=Sähköpostin kerääjä
@@ -2176,7 +2177,7 @@ CreateCandidature=Luo työhakemus
 FormatZip=Postinumero
 MainMenuCode=Valikkokoodi (päävalikko)
 ECMAutoTree=Näytä automaattinen ECM-puu
-OperationParamDesc=Määritä säännöt, joita käytetään joidenkin tietojen purkamiseen tai määritä arvoja toimintaa varten.<br><br>Esimerkki <span-luokan purkamisesta ='notranslate'>Yritys</span> nimi sähköpostin aiheesta väliaikaiseksi muuttujaksi:<br>tmp_var=EXTRACT:SUBJECT:Viesti lähettäjältä <span class='notranslate'>b0a06ee7cda03 /span> ([^\n]*)<br><br>Esimerkkejä objektin ominaisuuksien asettamisesta luo >:<br>objproperty1=SET:koodattu arvo<br>objproperty2=SET:__tmp_var__<span class='notranslate2fz'> </span>objproperty3=SETIFEMPTY:a arvo (arvo asetetaan vain, jos ominaisuutta ei ole jo määritetty)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([ ^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>objekti .objproperty5=EXTRACT:BODY:Minun Yritys nimeni on\\s([^\\s]*)<br><br>Käytä uutta riviä useiden ominaisuuksien poimimiseen tai määrittämiseen.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
 OpeningHours=Aukioloajat
 OpeningHoursDesc=Yrityksen tavalliset aukioloajat
 ResourceSetup=Resurssimoduulin määritys
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index 874e4cca828..9bd147193b8 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -137,8 +137,8 @@ DateActionEnd=Lopetuspäivä
 AgendaUrlOptions1=Voit myös lisätä seuraavat parametrit suodattaa output:
 AgendaUrlOptions3=<b>logina=%s</b> rajoittaaksesi ulostulon käyttäjän omistamiin toimiin <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> rajoittaaksesi tulostuksen toimiin, jotka eivät ole muiden omistamia käyttäjä <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> tulostuksen rajoittamiseksi < käyttäjälle määritettyihin toimintoihin span class='notranslate'><b></span> /span> muut).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> rajoittaaksesi tuotos toimiin, jotka on linkitetty projektiin b0aee83fz365</8> __PROJECT_ID__<span class='notranslate'></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> automaattisten tapahtumien sulkemiseksi pois.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> sisällyttääksesi lomatapahtumat.
 AgendaShowBirthdayEvents=Yhteyshenkilöiden syntymäpäivät
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 3de618b1090..5a3e7b113e6 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -190,6 +190,6 @@ NoBankAccountDefined=Ei pankkitili määritettyä
 NoRecordFoundIBankcAccount=Tietueita ei löytynyt kielellä pankkitili. Yleensä näin tapahtuu, kun tietue on poistettu manuaalisesti tapahtumaluettelosta pankkitili (esimerkiksi pankkitili täsmäytyksen aikana. span>). Toinen syy on se, että maksu tallennettiin, kun moduuli "%s" poistettiin käytöstä.
 AlreadyOneBankAccount=Yksi pankkitili on jo määritetty
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-versio tiedosto
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Kyllä = Tallenna 'maksu Type' SEPA-tiedoston Tilisiirto-osioon<br>b0342fccfda19b Kun luodaan SEPA XML tiedosto tilisiirtoja varten, PaymentTypeInformation-osio voidaan nyt sijoittaa "CreditTransferTransactionInformation"-osioon (<span class=' sijaan. notranslate'>maksu</span>"-osio). Suosittelemme jättämään tämän valitsematta, jotta PaymentTypeInformation sijoitetaan maksu-tasolle, koska kaikki pankit eivät välttämättä hyväksy sitä CreditTransferTransactionInformation-tasolla. Ota yhteyttä pankkiisi ennen kuin asetat PaymentTypeInformation CreditTransferTransactionInformation-tasolle.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Yes = Store 'Payment Type' in 'Credit Transfer' section of SEPA file<br><br>When generating a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
 ToCreateRelatedRecordIntoBank=Vastaanottajalle luo puuttuu liittyvä pankkitietue
 XNewLinesConciliated=%s uusi rivi(ä) sovittu
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index baf9e2ccecb..48d90e3358f 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -28,7 +28,7 @@ InvoiceProFormaDesc=<b>Proforma lasku</b> on todellinen lasku, mutta sillä ei o
 InvoiceReplacement=Korvaava lasku
 InvoiceReplacementShort=Korvaus
 InvoiceReplacementAsk=Laskun korvaava lasku
-InvoiceReplacementDesc=<b>Korvaava lasku</b> käytetään korvaamaan kokonaan lasku, jossa ei ole b0f70b5017f16. jo vastaanotettu.<span class='notranslate'><br><br>Huomaa: vain laskut, joissa ei ole maksu voidaan vaihtaa. Jos korvaamasi lasku ei ole vielä suljettu, se suljetaan automaattisesti hylätyksi.
+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=Menoilmoitus
 InvoiceAvoirAsk=Menoilmoitus korjata laskun
 InvoiceAvoirDesc=<b>hyvityslasku</b> on negatiivinen lasku, jota käytetään korjaamaan se tosiasia, että laskussa näkyy summa, joka poikkeaa todellisesta summasta. maksettu (esim. asiakas maksoi liikaa vahingossa tai ei maksa koko summaa, koska tuotteet palautettiin).
@@ -93,6 +93,9 @@ CodePaymentMode=maksu -menetelmä (koodi)
 LabelPaymentMode=maksu -menetelmä (tunniste)
 PaymentModeShort=maksu -menetelmä
 PaymentTerm=maksu Termi
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=Maksuehdot
 PaymentConditionsShort=Maksuehdot
 PaymentAmount=Maksusumma
@@ -151,7 +154,7 @@ BillShortStatusClosedPaidPartially=Maksettu (osittain)
 PaymentStatusToValidShort=Validoida
 ErrorVATIntraNotConfigured=Yhteisön sisäistä ALV-numeroa ei ole vielä määritetty
 ErrorNoPaiementModeConfigured=Tyyppiä oletus maksu ei ole määritetty. Korjaa tämä siirtymällä Laskumoduulin asetuksiin.
-ErrorCreateBankAccount=luo a pankkitili ja siirry sitten Laskumoduulin asetuspaneeliin ja määritä <span class='notranslate'>b0f70b5017f > tyyppejä
+ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
 ErrorBillNotFound=Lasku %s ei ole olemassa
 ErrorInvoiceAlreadyReplaced=Virhe, yritit vahvistaa laskun korvataksesi laskun %s. Mutta tämä on jo korvattu laskulla %s.
 ErrorDiscountAlreadyUsed=Virhe, alennus jo käytössä
@@ -207,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Joissakin maissa tämä valint
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Käytä tätä vaihtoehtoa, jos kaikki muut ei sovi
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>huono asiakas</b> on asiakas, joka kieltäytyy maksamasta velkansa.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Tämä valinta on käytössä, kun maksua ei ole täydellinen, koska jotkut tuotteet on palautettu
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Maksamaton summa on <b>välittäjäpankkimaksut</b>, joka vähennetään suoraan b0aee833658</3span7. >oikea summa<span class='notranslate'></b>, jonka asiakas on maksanut.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Maksamatonta summaa ei koskaan makseta, koska se on ennakonpidätys vero
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Käytä tätä vaihtoehtoa, jos kaikki muut eivät sovellu, esimerkiksi seuraavassa tilanteessa:<br> - maksu ei ole valmis, koska jokin tuotteet lähetettiin takaisin<br> – vaadittu summa liian tärkeäksi, koska alennus unohdettiin<br> Kaikissa tapauksissa ylikorjattu määrä on korjattava kirjanpitojärjestelmässä luomalla hyvityslasku.
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>huono toimittaja</b> on toimittaja, jota kieltäydymme maksamasta.
@@ -561,14 +564,14 @@ NoteListOfYourUnpaidInvoices=Huomautus: Tämä luettelo sisältää vain laskut
 RevenueStamp=vero leima
 YouMustCreateInvoiceFromThird=Tämä vaihtoehto on käytettävissä vain luotaessa laskua kolmannen osapuolen "Asiakas"-välilehdeltä
 YouMustCreateInvoiceFromSupplierThird=Tämä vaihtoehto on käytettävissä vain, kun luot laskun kolmannen osapuolen välilehdeltä "Toimittaja"
-YouMustCreateStandardInvoiceFirstDesc=Sinun on luo vakiolasku ja muutettava se malliksi luo<span class='notranslate'> /span> uusi <span class='notranslate'>laskupohja
+YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Laskun PDF-malli Crabe. Täydellinen laskumalli (vanha Sponge-mallin toteutus)
 PDFSpongeDescription=Laskun PDF-malli Sponge. Täydellinen laskumalli
 PDFCrevetteDescription=Lasku PDF-malli Crevette. Täydellinen laskumalli tilannelaskuille
-TerreNumRefModelDesc1=Palautusnumero muodossa %syymm-nnnn vakiolaskuille ja b0ecb2ec87f49 yymm-nnnn hyvityslaskuille, joissa yy on vuosi, mm on kuukausi <span class='notranslate'>ja nnnn on peräkkäinen automaattisesti kasvava luku ilman taukoa <span class='notranslate'>ja > ei paluuta nollaan
-MarsNumRefModelDesc1=Palautusnumero muodossa %syymm-nnnn vakiolaskuille, %syymm-nnnn korvaavalle laskulle, %syymm-nnnn osamaksu laskuille ja</noec4b92' class=b span>yymm-nnnn hyvityslaskuille, joissa yy on vuosi, mm on kuukausi ja nnnn on peräkkäinen automaattisesti kasvava luku ilman taukoa <span class='notranslate'>b0ae6e9e5925a0z /span> ei paluuta arvoon 0
+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 sequential 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 sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill alkaen $ syymm jo olemassa, ja ei ole yhteensopiva tämän mallin järjestyksessä. Poistaa sen tai nimetä sen aktivoida tämän moduulin.
-CactusNumRefModelDesc1=Palautusnumero muodossa %syymm-nnnn vakiolaskuille, %syymm-nnnn hyvityslaskuille ja %syymm-nnnn osamaksu laskuille, joissa kuukausi yy on luokka, mm 'notranslate'>ja</span> nnnn on peräkkäinen automaattisesti kasvava luku ilman taukoa ja ei paluuta nollaan
+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 sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Syy ennenaikaiseen sulkemiseen
 EarlyClosingComment=Varhainen päätöshuomautus
 ##### Types de contacts #####
@@ -609,8 +612,8 @@ PDFCrevetteSituationInvoiceLine=Tilanne N°%s: Laskutus N°%s osoitteessa %s
 TotalSituationInvoice=Kokonaistilanne
 invoiceLineProgressError=Laskun rivin edistyminen ei voi olla suurempi tai yhtä suuri kuin seuraava laskurivi
 updatePriceNextInvoiceErrorUpdateline=Virhe: päivitä hinta laskuriville: %s
-ToCreateARecurringInvoice=Jos haluat luo tämän sopimuksen toistuvan laskun, luo tämä Luonnos , muunna se sitten laskumalliksi <span class='notranslate'>ja määritä tulevien laskujen luontitiheys.
-ToCreateARecurringInvoiceGene=Voit luoda tulevat laskut säännöllisesti ja manuaalisesti siirtymällä kohtaan valikko <strong> span class='notranslate'>%s - %s - %s<span class='notranslate'>b01f65c07 /span>.
+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=Jos sinun on luotava tällaiset laskut automaattisesti, pyydä järjestelmänvalvojaa ottamaan käyttöön ja asennusmoduuli <strong>%s</strong>. Huomaa, että molempia menetelmiä (manuaalinen ja automaattinen) voidaan käyttää yhdessä ilman päällekkäisyyden vaaraa.
 DeleteRepeatableInvoice=Poista laskupohja
 ConfirmDeleteRepeatableInvoice=Haluatko varmasti poistaa kohteen laskupohja?
diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index e422036e04c..813de4b58fb 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -20,7 +20,7 @@ Fingerprint=Sormenjälki
 DownloadLogCSV=Vie arkistoidut lokit (CSV)
 DataOfArchivedEvent=Täydelliset tiedot arkistoidusta tapahtumasta
 ImpossibleToReloadObject=Alkuperäistä objektia (tyyppi %s, tunnus %s) ei ole linkitetty (katso "Täydelliset tiedot" -sarake saadaksesi muuttumattomia tallennettuja tietoja)
-BlockedLogAreRequiredByYourCountryLegislation=Maasi lainsäädäntö saattaa edellyttää muuttumattomien lokien moduulia. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa <span class='notranslate'>vero</span> tarkastus.
+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=Muuttamattomat lokit -moduuli otettiin käyttöön maasi lainsäädännön vuoksi. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa vero. span> tarkastus.
 BlockedLogDisableNotAllowedForCountry=Luettelo maista, joissa tämän moduulin käyttö on pakollista (että moduulia ei voida poistaa käytöstä virheellisesti, jos maasi on tässä luettelossa, moduulin poistaminen käytöstä ei ole mahdollista muokkaamatta ensin tätä luetteloa. Huomaa myös, että tämän moduulin käyttöönotto/poistaminen käytöstä seurata muuttumatonta Loki).
 OnlyNonValid=Ei kelvollinen
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 023dcb35c6a..9d5662fd89b 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=Tehokas menetelmä, jossa on paljon parametreja.
 ByTerminal=Terminaalin kautta
 TakeposNumpadUsePaymentIcon=Käytä kuvaketta tekstin sijaan numeronäppäimistön maksu painikkeissa
 CashDeskRefNumberingModules=Numerointimoduuli POS-myyntiin
-CashDeskGenericMaskCodes6 = <br><b>{TN}<span class='notranslate'>b09f47f8 span> -tunnistetta käytetään terminaalin numeron lisäämiseen
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Yhdistä saman tuotteet rivit
 StartAParallelSale=Aloita uusi rinnakkaismyynti
 SaleStartedAt=Alennusmyynti alkoi %s
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Viivatarra, kirjoittaja oletus tulostuksessa ilm
 PrintWithoutDetails=Tulosta ilman yksityiskohtia
 YearNotDefined=Vuotta ei ole määritelty
 TakeposBarcodeRuleToInsertProduct=viivakoodi sääntö tuotteen lisäämiseksi
-TakeposBarcodeRuleToInsertProductDesc=Sääntö tuoteviitteen ja määrän poimimiseksi skannatusta viivakoodi.<br>Jos tyhjä ( oletus arvo), sovellus käyttää koko viivakoodi skannattua tuotetta löytääkseen tuotteen.<br><br>Jos on määritetty, syntaksin on oltava:<br><b>ref:NB+qu:NB+qd :NB+other:NB</b><br>jossa NB on merkkien määrä tietojen poimimiseen skannatusta <span-luokasta ='notranslate'>viivakoodi</span> ja:<br><b>refb7b7f8</z09f8 span> : tuoteviite<br><b>qu</b> : määrä asetettava milloin lisäämällä nimike (yksiköt)<br><b>qd</b> : määrä asettaa kun kohteen lisääminen (desimaalit)<br><b>muu</b>: muut merkit
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Jo painettu
 HideCategories=Piilota koko luokkavalintaosio
 HideStockOnLine=Piilota varasto verkossa
@@ -149,7 +149,7 @@ TerminalNameDesc=Päätteen nimi
 DefaultPOSThirdLabel=TakePOS-yleinen asiakas
 DefaultPOSCatLabel=Myyntipiste (POS) tuotteet
 DefaultPOSProductLabel=Tuoteesimerkki TakePOS:lle
-TakeposNeedsPayment=TakePOS tarvitsee maksu-menetelmän toimiakseen, haluatko luo maksu > menetelmä '<span class='notranslate'>Käteisvarat'?
+TakeposNeedsPayment=TakePOS needs a payment method to work, do you want to create the payment method 'Cash'?
 LineDiscount=Linja-alennus
 LineDiscountShort=Linjalevy.
 InvoiceDiscount=Laskun alennus
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 12790e11285..56d619c971b 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -493,7 +493,7 @@ CurrentOutstandingBill=Avoin lasku
 OutstandingBill=Avointen laskujen enimmäismäärä
 OutstandingBillReached=Avointen laskujen enimmäismäärä saavutettu
 OrderMinAmount=Vähimmäistilausmäärä
-MonkeyNumRefModelDesc=Palauta numero muodossa %syymm-nnnn asiakaskoodille ja b0ecb2ec87f49fez span>yymm-nnnn <span class='notranslate'>Toimittaja-koodille, jossa yy on vuosi, mm on kuukausi ja nnnn on peräkkäinen automaattisesti kasvava numero ilman taukoa ja ei paluuta nollaan.
+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 sequential auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa.
 ManagingDirectors=Johtajien nimet (TJ, johtaja, päällikkö...)
 MergeOriginThirdparty=Monista sidosryhmä (sidosryhmä jonka haluat poistaa)
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 0b4c813a205..1aedac8f878 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -165,32 +165,32 @@ CalcModeEngagement=Tunnettujen kirjattujen maksujen analyysi
 CalcModePayment=Tunnettujen kirjattujen maksujen analyysi
 CalcModeBookkeeping=Kirjanpitorekisteritaulukkoon kirjattujen tietojen analyysi.
 CalcModeNoBookKeeping=Vaikka niitä ei vielä ole kirjattu Ledgeriin
-CalcModeLT1= Tila <b>%sRE asiakaslaskuissa – Toimittajat class= laskut 'notranslate'>%s</span></b>
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
 CalcModeLT1Debt=Tila <b>%sRE asiakaslaskuissa%s</b>
 CalcModeLT1Rec= Tila <b>%sRE Toimittajat laskuissa%s</b>
-CalcModeLT2= Tila <b>%sIRPF asiakaslaskuissa – Toimittajat class= laskut 'notranslate'>%s</span></b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
 CalcModeLT2Debt=Tila <b>%sIRPF asiakaslaskuissa%s</b>
 CalcModeLT2Rec= Tila <b>%sIRPF Toimittajat laskuissa%s</b>
 AnnualSummaryDueDebtMode=saldo tuloista ja kuluista, vuosiyhteenveto
 AnnualSummaryInputOutputMode=saldo tuloista ja kuluista, vuosiyhteenveto
 AnnualByCompanies=saldo tuloista ja kuluista ennalta määritettyjen tiliryhmien mukaan
-AnnualByCompaniesDueDebtMode=saldo tuloista ja kuluista, yksityiskohtaiset tiedot ennalta määritettyjen ryhmien mukaan, tila <b> span class='notranslate'>%sClaims-Debts%s</b> sanoi <span class='no <b></span>Sitoumuskirjanpito</b>.
-AnnualByCompaniesInputOutputMode=saldo tuloista ja kuluista, yksityiskohtaiset tiedot ennalta määritettyjen ryhmien mukaan, tila <b> span class='notranslate'>%sTulot ja kulut%s</b> sanoi <span class='no <b></span>kassakirjanpito</b>.
+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=Katso <b>%smaksuanalyysi%s</b> laskelmaan, joka perustuu <b>kirjattuihin maksuihin</b>, vaikka niitä ei olisi vielä kirjattu Ledgerissä
 SeeReportInDueDebtMode=Katso <b>%s tallennettujen asiakirjojen analyysi%s</b> laskelmaan, joka perustuu tunnettuihin <b>tallennettuihin asiakirjoihin</b>, vaikka niitä ei vielä ole kirjattu Ledgerissä
 SeeReportInBookkeepingMode=Katso <b>%skirjanpitotaulukon analyysi%s</b> raportille, joka perustuu <b>Kirjakirjanpitotaulukkoon</b>
 RulesAmountWithTaxIncluded=- Näytetyt määrät sisältävät kaikki Verot
 RulesAmountWithTaxExcluded=- Näytetyt laskujen määrät on jätetty pois kaikki Verot
-RulesResultDue=- Se sisältää kaikki laskut, kulut, ALV, lahjoitukset, palkat riippumatta siitä, onko ne maksettu vai ei.<br>- Se perustuu laskutukseen päiväys  laskuista ja eräpäivänä päiväys tai b0e7a3c6c47b29 > maksuja. Palkkojen osalta käytetään kauden lopun <span class='notranslate'>päiväys.
+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=- Se sisältää todelliset laskut, kulut, arvonlisäveron ja palkat. <br> – Se perustuu maksu päivämäärät laskuihin, kuluihin , ALV, lahjoitukset ja palkat.
 RulesCADue=- Se sisältää asiakkaan erääntyneet laskut riippumatta siitä, onko ne maksettu vai ei. <br> – Se perustuu näiden laskujen päiväys laskutukseen.<br>
-RulesCAIn=- Se sisältää kaikki osoitteesta asiakkaat saatujen laskujen maksut.<br> - Se perustuu <span class='notranslateen '>maksu</span> päiväys näistä laskuista<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=Se sisältää kaikki myyntipäiväkirjan luottorajat.
 RulesSalesTurnoverOfIncomeAccounts=Se sisältää (hyvitys-veloitus) tuotetilien rivejä kohdassa ryhmä TULOT
 RulesAmountOnInOutBookkeepingRecord=Se sisältää Reskontrasi tietueen kirjanpitotilit, jossa on ryhmä "KULUT" tai "TULO"
 RulesResultBookkeepingPredefined=Se sisältää Reskontrasi tietueen kirjanpitotilit, jossa on ryhmä "KULUT" tai "TULO"
-RulesResultBookkeepingPersonalized=Se näyttää kirjanpidossasi tietueen kirjanpitotilit <b>ryhmiteltynä henkilökohtaisten ryhmien mukaan<span class='notranslate'>b09a4b739f17f8
-SeePageForSetup=Katso valikko <a href="%s">%s<span class='notranslate'>b0c0e470 /span> määritystä varten
+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=- osamaksu laskut eivät sisälly
 DepositsAreIncluded=- osamaksu laskut sisältyvät
 LT1ReportByMonth=vero 2 raportti kuukausittain
@@ -247,7 +247,7 @@ LinkedOrder=Linkki Tilauksiin
 Mode1=Menetelmä 1
 Mode2=Menetelmä 2
 CalculationRuleDesc=Kokonaisarvonlisäveron laskemiseen on kaksi menetelmää:<br>Menetelmä 1 pyöristää kunkin rivin alv:t ja laskee ne sitten yhteen.<br>Menetelmä 2 laskee yhteen jokaisen rivin alv:t ja pyöristää sitten tuloksen.<br>Lopullinen tulos voi poiketa muutamasta sentistä. oletus tila on tila <b>%s </b>.
-CalculationRuleDescSupplier=Valitse Toimittaja mukaan sopiva menetelmä saman laskentasäännön soveltamiseksi. ja saat saman tuloksen, jota <span class='notranslate' odottaa. >Toimittaja</span>.
+CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Tuotekohtaisesti kerätty liikevaihtoraportti ei ole saatavilla. Tämä raportti on saatavilla vain laskutetulle liikevaihdolle.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Raportti liikevaihdosta, joka on kerätty myyntiä kohden vero, ei ole saatavilla. Tämä raportti on saatavilla vain laskutetulle liikevaihdolle.
 CalculationMode=Laskentatila
@@ -294,7 +294,7 @@ LabelToShow=Lyhyt etiketti
 PurchaseTurnover=Hankinta liikevaihto
 PurchaseTurnoverCollected=Hankinta liikevaihto kerätty
 RulesPurchaseTurnoverDue=- Se sisältää toimittaja:n erääntyneet laskut riippumatta siitä, onko ne maksettu vai ei. <br> – Se perustuu näiden laskujen päiväys laskuun.<br>
-RulesPurchaseTurnoverIn=- Se sisältää kaikki tehokkaat laskujen maksut numeroon Toimittajat.<br> - Se perustuu <span class='notranslateen '>maksu</span> päiväys näistä laskuista<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=Se sisältää kaikki veloitusrivit Hankinta päiväkirjasta.
 RulesPurchaseTurnoverOfExpenseAccounts=Se sisältää (veloitus - hyvitys) tuotetilien rivejä ryhmä EXPENSE
 ReportPurchaseTurnover=Hankinta liikevaihto laskutettu
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index 39b46dd367c..01d999e63e4 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Lue Ajastettu työ
 Permission23102 = luo/update Suunniteltu työ
 Permission23103 = Poista Ajastettu työ
@@ -78,7 +77,7 @@ CronType_method=PHP-luokan kutsumenetelmä
 CronType_command=Shell-komento
 CronCannotLoadClass=Luokkaa tiedosto %s ei voi ladata (käytä luokkaa %s)
 CronCannotLoadObject=Luokka tiedosto %s ladattiin, mutta objektia %s ei löytynyt siitä
-UseMenuModuleToolsToAddCronJobs=Siirry kohtaan valikko "<a href="%s">Etusivu - Pääkäyttäjä -työtyökalut - <spanuloidut class='notranslate'></a></span>" nähdäksesi ja muokkaa ajoitettuja töitä.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Työ estetty
 MakeLocalDatabaseDumpShort=Paikallinen tietokanta varmuuskopio
 MakeLocalDatabaseDump=luo paikallinen tietokanta kaatopaikka. Parametrit ovat: pakkaus ('gz' tai 'bz' tai 'none'), varmuuskopion tyyppi ('mysql', 'pgsql', 'auto'), 1, 'auto' tai rakennettava tiedostonimi, säilytettävien varmuuskopiotiedostojen määrä
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 82f16e6c10b..02268452a07 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -16,7 +16,7 @@ ErrorEmailAlreadyExists=Sähköposti %s on jo olemassa.
 ErrorRecordNotFound=Levykauppa ei löytynyt.
 ErrorRecordNotFoundShort=Ei löydetty
 ErrorFailToCopyFile=Epäonnistui kopioida tiedoston <b>%s</b> ilmaisuksi <b>%s</b> &quot;.
-ErrorFailToCopyDir=Hakemiston <b>%s</b> kopioiminen hakemistoon <b> epäonnistui. ='notranslate'><b></span>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Epäonnistui nimetä tiedoston <b>%s</b> ilmaisuksi <b>%s</b> &quot;.
 ErrorFailToDeleteFile=Epäonnistui poistaa tiedoston <b>' %s'.</b>
 ErrorFailToCreateFile=Luominen epäonnistui file <b>' %s'.</b>
@@ -24,7 +24,7 @@ ErrorFailToRenameDir=Epäonnistui nimetä directory <b>' %s' osaksi' %s'.</b>
 ErrorFailToCreateDir=Luominen epäonnistui directory <b>' %s'.</b>
 ErrorFailToDeleteDir=Poistaminen ei onnistunut directory <b>' %s'.</b>
 ErrorFailToMakeReplacementInto=Epäonnistui korvaaminen muotoon tiedosto '<b>%s</b>'.
-ErrorFailToGenerateFile=tiedosto '<b>%s<span class='notranslate' luominen epäonnistui. ></b></span>'.
+ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Tämä yhteys on jo määritelty yhteyttä tämän tyypin osalta.
 ErrorCashAccountAcceptsOnlyCashMoney=Tämä pankkitili on käteistä huomioon, joten se hyväksyy maksujen tyypin käteisellä vain.
 ErrorFromToAccountsMustDiffers=Lähde ja tavoitteet pankkitilit on erilainen.
@@ -79,9 +79,9 @@ ErrorNoValueForSelectType=Täytä arvo valintalistaa varten
 ErrorNoValueForCheckBoxType=Täytä valintaruutuluettelon arvo
 ErrorNoValueForRadioType=Ole hyvä ja täytä radioluettelon arvo
 ErrorBadFormatValueList=Luetteloarvossa voi olla vain yksi pilkku: <u>%s</u>, mutta tarvitset ainakin yhden: avain,arvo
-ErrorFieldCanNotContainSpecialCharacters=Kenttä <b>%s<span class='notranslate'>b09f17f7309f17f8 /span> ei saa sisältää erikoismerkkejä.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Kenttä <b>%sb09f17f7309f17f8 /span> ei saa sisältää erikoismerkkejä eikä isoja kirjaimia, <span class='notranslate'>ja on aloitettava aakkosmerkillä (a-z)
-ErrorFieldMustHaveXChar=Kenttä <b>%sb09f17f7309f17f8 /span>:ssa on oltava vähintään <span class='notranslate'>%s merkkiä.
+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 must start with an alphabetical character (a-z)
+ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
 ErrorNoAccountancyModuleLoaded=O kirjanpito moduuli aktivoitu
 ErrorExportDuplicateProfil=Tämä profiilinimi on jo olemassa tälle vientijoukolle.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP yhteensovitus ei ole täydellinen.
@@ -93,11 +93,11 @@ ErrorRecordHasAtLeastOneChildOfType=Objektilla %s on vähintään yksi alatason
 ErrorRecordIsUsedCantDelete=Tietuetta ei voi poistaa. Se on jo käytetty tai sisällytetty toiseen objektiin.
 ErrorModuleRequireJavascript=JavaScriptiä ei saa poistaa käytöstä, jotta tämä ominaisuus toimisi. Ota JavaScript käyttöön tai poista se käytöstä siirtymällä kohtaan valikko Etusivu->Asetukset->Näyttö.
 ErrorPasswordsMustMatch=Molemmat kirjoittaa salasanat on vastattava toisiaan
-ErrorContactEMail=Tapahtui tekninen virhe. Ota yhteyttä järjestelmänvalvojaan seuraavaan sähköpostiin <b>%s</b> ja anna virhekoodi <b>%s<span class='notranslate'>34f18b09 span> viestiisi tai lisää näyttökopio tästä sivusta.
+ErrorContactEMail=A technical error occurred. 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=Kenttä <b>%sb09f4b730 span>: '<b>%s</b>' ei vastaa regex-sääntöä <b>%s</b>
 ErrorHtmlInjectionForField=Kenttä <b>%sb09f4b730 span>: Arvo <b>%s</b> sisältää haitallista tietoa ei sallittu
 ErrorFieldValueNotIn=Kenttä <b>%sb09f4b730 span>: '<b>%s</b>' ei löydy arvosta Kenttä <b>%sb09f4b730 span> / <b>%s</b>
-ErrorFieldRefNotIn=Kenttä <b>%sb09f4b730 span>: '<b>%s</b>' ei ole <span-luokka ='notranslate'><b></span>%s</b> olemassa oleva viite
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorMultipleRecordFoundFromRef=Useita tietueita löytyi haettaessa viitteestä <b>%s</b>. Ei voi tietää, mitä tunnusta käyttää.
 ErrorsOnXLines=%s virhettä löydetty
 ErrorFileIsInfectedWithAVirus=Virustentorjuntaohjelma ei voinut tarkistaa tiedoston (tiedosto saattaa olla tartunnan virus)
@@ -134,7 +134,7 @@ ErrorLoginDoesNotExists=Käyttäjälle <b>sisäänkirjoittautumissivuksesi %s</b
 ErrorLoginHasNoEmail=Tämä käyttäjä ei ole sähköpostiosoitetta. Process aborted.
 ErrorBadValueForCode=Bad arvotyypeillä koodin. Yritä uudelleen uuteen arvoon ...
 ErrorBothFieldCantBeNegative=Kentät %s ja %s voi olla sekä kielteisiä
-ErrorFieldCantBeNegativeOnInvoice=Kenttä <strong>%sb0af65c07910f65d span> ei voi olla negatiivinen tämän tyyppisessä laskussa. Jos sinun on lisättävä alennusrivi, <span class='notranslate'>luo alennus ensin (osoitteesta Kenttä ' %s' kolmannen osapuolen kortissa) ja käytä sitä laskussa.
+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 third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Rivien kokonaismäärä (ilman vero) ei voi olla negatiivinen annetulle ei nolla-arvonlisäverokannalle (Löytyi negatiivinen kokonaissumma ALV-prosentille <b>%s</b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Rivit eivät voi olla negatiivisia talletuksissa. Kohtaat ongelmia, kun joudut käyttämään talletuksen loppulaskussa, jos teet niin.
 ErrorQtyForCustomerInvoiceCantBeNegative=Asiakaslaskujen rivin määrä ei voi olla negatiivinen
@@ -154,7 +154,7 @@ ErrorFailedToAddContact=Yhteystiedon lisääminen epäonnistui
 ErrorDateMustBeBeforeToday=päiväys on oltava pienempi kuin nykyään
 ErrorDateMustBeInFuture=päiväys on oltava suurempi kuin nykyään
 ErrorStartDateGreaterEnd=Alku päiväys on suurempi kuin loppu päiväys
-ErrorPaymentModeDefinedToWithoutSetup=maksu-tila asetettiin tyypiksi %s, mutta moduulin Lasku määritystä ei suoritettu loppuun, jotta tälle <span luokalle näytettäviä tietoja määritettiin. ='notranslate'>maksu</span>-tilassa.
+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=Virhe, PHP:ssäsi on oltava asennettuna moduuli <b>%s</b>, jotta voit käyttää tätä ominaisuus.
 ErrorOpenIDSetupNotComplete=Määrität Dolibarr-määrityksen tiedosto sallimaan OpenID:n Autentikointi, mutta OpenID-palvelun URL-osoitetta ei ole määritetty vakioksi %s
 ErrorWarehouseMustDiffers=Lähteen ja kohde Varastot täytyy poiketa
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=Varmista, että et käytä liian suurta määrää vastaano
 ErrorUserNotAssignedToTask=Käyttäjä on määritettävä tehtävään, jotta hän voi syöttää kulutetun ajan.
 ErrorTaskAlreadyAssigned=Tehtävä on jo määrätty käyttäjälle
 ErrorModuleFileSeemsToHaveAWrongFormat=Moduulipaketilla näyttää olevan väärä muoto.
-ErrorModuleFileSeemsToHaveAWrongFormat2=Moduulin zip-tiedostossa on oltava vähintään yksi pakollinen hakemisto: <strong>%sb0a65d071f6fc9 > tai <span class='notranslate'><strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Moduulipaketin nimi (<strong>%s</strong>) ei täsmää odotetun nimen syntaksi: <strong>%s</strong>
 ErrorDuplicateTrigger=Virhe, kaksoiskäynnistimen nimi %s. Ladattu jo kohteesta %s.
 ErrorNoWarehouseDefined=Virhe, varastoa ei tunnistettu
@@ -258,14 +258,14 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Virhe, käännetyn sivun Kieli o
 ErrorBatchNoFoundForProductInWarehouse=Tuotteelle "%s" ei löytynyt erää/sarjaa varastosta "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ei tarpeeksi määrää tälle erälle/sarjalle tuotteelle "%s" varastossa "%s".
 ErrorOnlyOneFieldForGroupByIsPossible=Vain yksi Kenttä arvolle "ryhmä by" on mahdollinen (muut hylätään)
-ErrorTooManyDifferentValueForSelectedGroupBy=Löytyi liian monta eri arvoa (yli <b>%s</b>) Kenttä '<b>%sb09f17b73z0f14 /span>", joten emme voi käyttää sitä "<span class='notranslate'>ryhmä by" grafiikkaa varten. Kenttä 'ryhmä Tekijä' on poistettu. Ehkä halusit käyttää sitä X-akselina?
+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=Virhe, merkkijono, johon korvataan, on tyhjä
-ErrorProductNeedBatchNumber=Virhe, tuote '<b>%s</b>' tarvitsee paljon/<span> class='notranslate'>Sarjanumero</span>
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Virhe, tuote '<b>%s</b>' ei hyväksy erää/ Sarjanumero
 ErrorFailedToReadObject=Virhe, tyypin <b>%s</b> objektin lukeminen epäonnistui.
 ErrorParameterMustBeEnabledToAllwoThisFeature=Virhe, parametri <b>%s</b> on otettava käyttöön arvossa <b>conf/conf.php<> salliaksesi sisäisen työn ajoituksen komentoriviliittymän käytön
 ErrorLoginDateValidity=Virhe, tämä kirjautuminen on kelpoisuusalueen päiväys ulkopuolella
-ErrorValueLength=Kenttä '<b>%s pituus </b>' on oltava suurempi kuin '<b>%s<span class='notranslate'>b09af7f739 '
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=Sana <b>%s</b> on varattu avainsana
 ErrorFilenameReserved=Tiedostonimeä <b>%s</b> ei voi käyttää, koska se on varattu ja suojattu komento.
 ErrorNotAvailableWithThisDistribution=Ei saatavilla tällä jakelulla
@@ -308,7 +308,7 @@ ErrorTableNotFound=Taulukkoa <b>%s</b> ei löydy
 ErrorRefNotFound=Viite <b>%s</b> ei löydy
 ErrorValueForTooLow=Arvo <b>%s</b> on liian pieni
 ErrorValueCantBeNull=Arvo <b>%s</b> ei voi olla tyhjä
-ErrorDateOfMovementLowerThanDateOfFileTransmission=Pankkitapahtuman päiväys ei voi olla pienempi kuin päiväys <span class='notranslate'>tiedosto</span> lähetys
+ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Liikaa tiedostoja muodossa, enimmäismäärä on %s tiedosto(s)
 ErrorSessionInvalidatedAfterPasswordChange=Istunto mitätöitiin salasanan, sähköpostiosoitteen, tilan tai päivämäärät voimassaolon muutoksen vuoksi. Ole hyvä ja kirjaudu uudelleen.
 ErrorExistingPermission = Lupa <b>%s</b> objektille  <b>%s</b> on jo olemassa
@@ -343,7 +343,7 @@ WarningPassIsEmpty=Varoitus, tietokannan salasana on tyhjä. Tämä on turvallis
 WarningConfFileMustBeReadOnly=Varoitus, config tiedosto <b>(htdocs / conf / conf.php)</b> voidaan korvata jonka web-palvelin. Tämä on vakava tietoturva-aukko. Muokkaa käyttöoikeuksia tiedoston luettavaksi vain tila-käyttöjärjestelmän käyttäjä käyttää Web-palvelimeen. Jos käytät Windows ja FAT oman levy, sinun täytyy tietää, että tämä tiedostojärjestelmä ei mahdollista lisätä käyttöoikeuksia tiedostoon, joten ei voi olla täysin turvallista.
 WarningsOnXLines=Varoitukset <b>%s</b> lähde linjat
 WarningNoDocumentModelActivated=Asiakirjojen luomiseen tarkoitettua mallia ei ole aktivoitu. oletus valitsee mallin, kunnes tarkistat moduulin asetukset.
-WarningLockFileDoesNotExists=Varoitus, kun asennus on valmis, sinun on poistettava asennus-/siirtotyökalut käytöstä lisäämällä tiedosto <b>install.lock</b> hakemistoon <b>%sb09</f47b730f >. Tämän <span class='notranslate'>tiedosto luomisen jättäminen pois on vakava turvallisuusriski.
+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=Tämä suojausvaroitus pysyy aktiivisena niin kauan kuin haavoittuvuus on olemassa.
 WarningCloseAlways=Varoitus, sulkeminen suoritetaan, vaikka määrä eroaisi lähde-ja kohdeelementtien välillä. Ota tämä ominaisuus käyttöön varoen.
 WarningUsingThisBoxSlowDown=Varoitus, tämän laatikon käyttäminen hidastaa vakavasti kaikkia laatikkoa näyttäviä sivuja.
@@ -373,7 +373,7 @@ WarningModuleNeedRefresh = Moduuli <b>%s</b> on poistettu käytöstä. Älä uno
 WarningPermissionAlreadyExist=Tämän objektin nykyiset käyttöoikeudet
 WarningGoOnAccountancySetupToAddAccounts=Jos tämä luettelo on tyhjä, siirry kohtaan valikko %s - %s - %s ladataksesi tai luo tilikarttasi.
 WarningCorrectedInvoiceNotFound=Korjattua laskua ei löytynyt
-WarningCommentNotFound=Tarkista alun ja loppukommenttien sijainti <b>%s</b> osiossa tiedosto <b>b0ecb4fz87</f429 ><span class='notranslate'></b> ennen toimenpiteen lähettämistä
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
 WarningAlreadyReverse=Osakeliikkeet ovat jo kääntyneet
 
 SwissQrOnlyVIR = SwissQR-lasku voidaan lisätä vain tilisiirtomaksuilla maksettaviin laskuihin.
diff --git a/htdocs/langs/fi_FI/eventorganization.lang b/htdocs/langs/fi_FI/eventorganization.lang
index ef2613838a0..6e6a0f7186b 100644
--- a/htdocs/langs/fi_FI/eventorganization.lang
+++ b/htdocs/langs/fi_FI/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=Tapahtuman järjestämisen asetukset
 EventOrganization=Tapahtuman järjestäminen
 EventOrganizationSetupPage = Tapahtumaorganisaation asetussivu
 EVENTORGANIZATION_TASK_LABEL = Tehtävien tunniste luo automaattisesti, kun projekti vahvistetaan
-EVENTORGANIZATION_TASK_LABELTooltip = Kun vahvistat tapahtuman järjestämisen, projektissa voidaan luoda automaattisesti joitakin tehtäviä<br><br>Esimerkki: <br>Lähetä konferenssikutsu<br>Lähetä osastokutsu<br>Konferenssiehdotukset<span>Vahvista ='notranslate'><br></span>Vahvista Booths-hakemus<br>Avaa tapahtuman tilaukset osallistujille<br> tapahtuman puhujille<span class='notranslate'><br>Lähetä muistutus tapahtumasta Boothin isännöijille<br>Lähetä muistutus tapahtumasta osallistujille
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=Pidä tyhjänä, jos sinun ei tarvitse luo tehdä tehtäviä automaattisesti.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kolmansille osapuolille lisättävä luokka, joka luodaan automaattisesti, kun joku ehdottaa konferenssia
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kolmansille osapuolille lisättävä luokka luodaan automaattisesti, kun he ehdottavat osastoa
@@ -88,6 +88,7 @@ PriceOfRegistration=Rekisteröinnin hinta
 PriceOfRegistrationHelp=Ilmoittautumisesta tai tapahtumaan osallistumisesta maksettava hinta
 PriceOfBooth=Tilaushinta kestämään koppi
 PriceOfBoothHelp=Tilaushinta kestämään koppi
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Linkitä ICS konferensseihin
 ConferenceOrBoothInformation=Tiedot konferenssista tai osastosta
 Attendees=Osallistujat
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index d0474d49609..2f20b92c11d 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -72,7 +72,7 @@ FieldsTarget=Kohdennettu kentät
 FieldTarget=Alalta
 FieldSource=Lähde kenttä
 NbOfSourceLines=Määrä riviä lähdetiedoston
-NowClickToTestTheImport=Tarkista, että merkkijonojen tiedosto muoto (Kenttä ja) span class='notranslate'>tiedosto</span> vastaa näytettyjä vaihtoehtoja ja, että olet jättänyt otsikkorivin pois, tai ne merkitään virheiksi seuraavassa simulaatiossa.<br>Klikkaa <b>%s </b>" -painike suorittaa tiedosto rakenteen/sisällön tarkistuksen ja simuloi tuontiprosessia.<span class. ='notranslate'><br></span><b>Tietokannassasi ei muuteta tietoja</b>.
+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=Suorita tuontisimulaatio
 FieldNeedSource=Tämä Kenttä vaatii tietoja lähteestä tiedosto
 SomeMandatoryFieldHaveNoSource=Jotkut pakolliset kentät eivät lähde tiedosto
@@ -103,18 +103,18 @@ SourceRequired=Tiedon arvo on pakollinen
 SourceExample=Esimerkki mahdollisesta tietojen arvo
 ExampleAnyRefFoundIntoElement=Jos ref löytynyt elementin <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Mikä tahansa sanakirjasta löytyvä koodi (tai tunnus) <b>%s</b>
-CSVFormatDesc=<b>Pilkuilla erotettu arvo</b> tiedosto muoto (.csv). class='notranslate'><br></span>Tämä on tiedosto tekstimuoto, jossa kentät erotetaan erottimella [ %s ]. Jos erotin löytyy Kenttä-sisällöstä, Kenttä pyöristetään pyöreällä merkillä [ %s ]. Esc-merkki pyöreäksi merkiksi on [ %s ].
+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> tiedosto muoto (.xls)<br>Tämä on alkuperäinen Excel 95 -muoto (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> tiedosto muoto (.xlsx)<br>Tämä on alkuperäinen Excel 2007 -muoto (SpreadsheetML).
-TsvFormatDesc=<b>Sarkaimella erotettu arvo</b> tiedosto muoto (.tsv) ='notranslate'><br></span>Tämä on tiedosto tekstimuoto, jossa kentät on erotettu tabulaattorilla [sarkain].
+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=Kenttä <b>%sb09f4b730 span> lisättiin automaattisesti. Näin vältytään siltä, että samankaltaisia rivejä käsitellään päällekkäisinä tietueina (kun tämä Kenttä lisätään, kaikki rivit omistavat oman tunnuksensa ja span> vaihtelee).
 CsvOptions=CSV-muotoasetukset
 Separator=Kenttä Erotin
 Enclosure=Merkkijonojen erotin
 SpecialCode=Erikoiskoodi
 ExportStringFilter=%% sallii yhden tai useamman merkin korvaamisen tekstissä
-ExportDateFilter=VVVV, VVVVKK, VVVVKKPP: suodattaa yhden vuoden/kuukauden/päivän mukaan<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: suodattaa <kuukausi ajanjaksolla/vuosi/päivä span class='notranslate'><br></span> > VVVV, > VVVVKK, > VVVVKKPP: suodattaa kaikille seuraaville vuosille/kuukausille/päiville<br> < VVVVKK, <VVV VVVVKKPP: suodattaa kaikki edelliset vuodet/kuukaudet/päivät
-ExportNumericFilter=NNNNN suodattaa yhdellä arvolla<br>NNNNN+NNNNN suodattaa arvoalueen yli<br><span class='notranslate'>b08912a27ede2 /span>> NNNNN suodattaa korkeammilla arvoilla
+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=Tuo rivin numerosta alkaen
 EndAtLineNb=Lopeta rivin numeroon
 ImportFromToLine=Rajoitusalue (Alkaen - Mihin). Esim. ohittaaksesi otsikkorivit.
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 87cf15d38a7..a604568b537 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -2,11 +2,11 @@
 InstallEasy=Seuraa ohjeita askel askeleelta.
 MiscellaneousChecks=Ehtojen tarkistus
 ConfFileExists=Asetustiedosto <b>%s</b> on olemassa.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Kokoonpano tiedosto <b>%s<span class='notranslate7f8<z0f17f8 /span> ei ole olemassa ja ei voitu luoda!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
 ConfFileCouldBeCreated=Asetustiedosto <b>%s</b> voitaisiin luoda.
-ConfFileIsNotWritable=Kokoonpano tiedosto <b>%s<span class='notranslate7f8<z0f17f8 /span> ei ole kirjoitettava. Tarkista käyttöoikeudet. Ensiasennuksessa verkkopalvelimesi on kyettävä kirjoittamaan tähän tiedosto määritysprosessin aikana ("chmod 666" esimerkiksi Unix-tyyppisessä käyttöjärjestelmässä).
+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 <b>file %s</b> on kirjoitettavissa.
-ConfFileMustBeAFileNotADir=Kokoonpano tiedosto <b>%s<span class='notranslate7f8<z0f17f8 /span> on oltava tiedosto, ei hakemisto.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Ladataan parametreja uudelleen määrityksestä tiedosto.
 NoReadableConfFileSoStartInstall=Määritystä tiedosto <b>conf/conf.php</b> ei ole olemassa. ei ole luettavissa. Suoritamme asennusprosessin ja yritämme alustaa sen.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET.
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=On mahdollista, että PHP-asetuksesi ei tue muuttujia POST j
 PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupport=Tämä PHP tukee %s-toimintoja.
 PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pitäisi olla tarpeeksi.
-PHPMemoryTooLow=PHP max -istuntomuistisi on <b>%s</b> tavua. Tämä on liian alhainen. Muuta <b>php.ini</b> määrittämään <b><span class_limit ='notranslate'></b></span> -parametrin arvoksi vähintään <b>%s<span class='notranslate'>b09a4f78<z09a /span> tavua.
+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=Napsauta tätä saadaksesi tarkemman testin
 ErrorPHPDoesNotSupportSessions=PHP-asennus ei tue istuntoja. Tämä ominaisuus tarvitaan, jotta Dolibarr toimii. Tarkista istuntohakemiston PHP-asetusten ja käyttöoikeudet.
 ErrorPHPDoesNotSupport=PHP-asennus ei tue %s-toimintoja.
@@ -56,7 +56,7 @@ CreateDatabase=Luo tietokanta
 CreateUser=luo käyttäjätili tai myönnä käyttäjätiliin käyttöoikeus Dolibarrissa tietokanta
 DatabaseSuperUserAccess=Tietokanta - SuperUser pääsy
 CheckToCreateDatabase=Valitse valintaruutu, jos tietokanta ei ole vielä olemassa ja, joten se on luotava.<br>Tässä tapauksessa sinun on myös täytettävä tämän sivun alareunaan pääkäyttäjätilin käyttäjänimi ja.
-CheckToCreateUser=Valitse valintaruutu, jos:<br>tietokanta käyttäjätiliä ei vielä ole olemassa ja > joten se on luotava tai<br>jos käyttäjätili on olemassa, mutta tietokanta ei ole olemassa ja käyttöoikeudet on myönnettävä.<br>Tässä tapauksessa sinun on annettava käyttäjätili ja salasana ja <b>myös</b> pääkäyttäjätilin nimi <span class='notranslate' class=' ja</span> salasana tämän sivun alareunassa. Jos tätä valintaruutua ei ole valittu, tietokanta omistajan ja salasanan on oltava jo olemassa.
+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=Pääkäyttäjätilin nimi (luo uuteen tietokantaan tai uusiin käyttäjiin), pakollinen, jos tietokanta tai sen omistajaa ei vielä ole olemassa.
 KeepEmptyIfNoPassword=Jätä tyhjäksi, jos pääkäyttäjällä ei ole salasanaa (EI suositella)
 SaveConfigurationFile=Tallennetaan parametreja kohteeseen
@@ -109,7 +109,7 @@ ServerVersion=Tietokanta Serverin versio
 YouMustCreateItAndAllowServerToWrite=Sinun on luotava tähän hakemistoon ja mahdollistaa web-palvelin voi kirjoittaa sitä.
 DBSortingCollation=Luonne lajittelu jotta
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Valitsit luo tietokanta <b>0ec4b9fec80 </b>, mutta tätä varten Dolibarrin on muodostettava yhteys palvelimeen <b>%s </b> superkäyttäjän kanssa <b>%s</b> -käyttöoikeudet.
-YouAskLoginCreationSoDolibarrNeedToConnect=Valitsit luo tietokanta käyttäjän <b> %s</b>, mutta tätä varten Dolibarrin on muodostettava yhteys palvelimeen <b> %s</b> superkäyttäjän kanssa <b>b0ecb2ec87f49f classz ='notranslate'></b> käyttöoikeudet.
+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=Yhteys tietokanta epäonnistui: isäntä- tai pääkäyttäjäparametrien on oltava väärät.
 OrphelinsPaymentsDetectedByMethod=Orphelins maksu havaittu menetelmä %s
 RemoveItManuallyAndPressF5ToContinue=Poistaa sen manuaalisesti ja paina F5 jatkaa.
@@ -132,7 +132,7 @@ MigrationFinished=Muuttoliike valmis
 LastStepDesc=<strong>Viimeinen vaihe</strong>: Määritä tähän kirjautumissalasana, ja käytä yhteyden muodostamiseen Dolibarriin. <b>Älä hukkaa tätä, sillä se on päätili kaikkien muiden/lisäkäyttäjätilien hallinnassa.</b>
 ActivateModule=Aktivoi moduuli %s
 ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila)
-WarningUpgrade=Varoitus:\nTeitkö tietokanta varmuuskopion ensin?\nTämä on erittäin suositeltavaa. Tietojen katoaminen (esimerkiksi mysql-version 5.5.40/41/42/43 virheiden vuoksi) voi olla mahdollista tämän prosessin aikana, joten on tärkeää tehdä täydellinen vedos <span class='notranslate'>tietokanta</span> ennen kuin aloitat siirron.\n\nNapsauta OK aloittaaksesi siirtoprosessin...
+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=Versiosi tietokanta on %s. Siinä on kriittinen virhe, joka mahdollistaa tietojen menetyksen, jos teet siirtoprosessin edellyttämiä rakenteellisia muutoksia tietokanta. Tästä syystä siirtoa ei sallita, ennen kuin päivität tietokanta-laitteesi tasoversioksi (korjattu) (luettelo tunnetuista bugiisista versioista: %s)
 KeepDefaultValuesWamp=Käytit DoliWampin Dolibarrin ohjattua asennustoimintoa, joten tässä ehdotetut arvot on jo optimoitu. Muuta niitä vain, jos tiedät mitä olet tekemässä.
 KeepDefaultValuesDeb=Käytit Dolibarrin ohjattua asennustoimintoa Linux-paketista (Ubuntu, Debian, Fedora...), joten tässä ehdotetut arvot on jo optimoitu. Vain tietokanta omistajan salasana luo on annettava. Muuta muita parametreja vain, jos tiedät mitä olet tekemässä.
@@ -191,7 +191,7 @@ MigrationProjectUserResp=Tietojen siirtäminen alalla fk_user_resp ja llx_projet
 MigrationProjectTaskTime=Päivitä aika sekunneissa
 MigrationActioncommElement=Päivitä tiedot toimista
 MigrationPaymentMode=maksu-tyypin tietojen siirto
-MigrationCategorieAssociation=Kategorioiden siirto 
+MigrationCategorieAssociation=Kategorioiden siirto
 MigrationEvents=Tapahtumien siirto tapahtuman omistajan lisäämiseksi tehtävätaulukkoon
 MigrationEventsContact=Tapahtumien siirto tapahtuman yhteyshenkilön lisäämiseksi tehtävätaulukkoon
 MigrationRemiseEntity=Päivitä entiteetin Kenttä arvo llx_societe_remise
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index a024441f306..b8326f6cd55 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -143,11 +143,11 @@ MailSendSetupIs2=Sinun on ensin siirryttävä admin-tilillä valikkoon %sHome -
 MailSendSetupIs3=Jos sinulla on kysyttävää SMTP-palvelimen määrittämisestä, voit kysyä osoitteesta %s.
 YouCanAlsoUseSupervisorKeyword=Voit myös lisätä avainsanan <strong>__SUPERVISOREMAIL__</strong>, jotta sähköposti lähetetään käyttäjän valvojalle (toimii vain, jos sähköposti on määritelty tälle esimiehelle)
 NbOfTargetedContacts=Kohdistettujen yhteyssähköpostien nykyinen määrä
-UseFormatFileEmailToTarget=Tuodun tiedosto muodon on oltava <strong>email;name;Etunimi;muu span class='notranslate'></strong></span>
-UseFormatInputEmailToTarget=Kirjoita merkkijono muodossa <strong>email;name;Etunimi;other<span class='notranslate'></strong>
+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=Vastaanottajat (tarkennettu valinta)
 AdvTgtTitle=Täytä syöttökentät valitaksesi kolmannet osapuolet tai yhteystiedot/osoitteet kohdistettavaksi
-AdvTgtSearchTextHelp=Käytä %% jokerimerkeinä. Jos haluat esimerkiksi löytää kaikki kohteet, kuten <b>jean, joe, jim</b>, voit syöttää  <b>j%%</b>, voit myös käyttää ; arvon erottimena ja käytä ! paitsi tämä arvo. Esimerkiksi <b>jean;joe;jim%%;!jimo;!jima%% span><span class='notranslate'></b> kohdistaa kaikkiin jeaneihin, joihin, jotka alkavat jimillä, mutta ei jimon ja ei kaikkeen, joka alkaa jimalla
+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=Käytä intervallia valitaksesi int- tai float-arvon
 AdvTgtMinVal=Minimiarvo
 AdvTgtMaxVal=Suurin arvo
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 388d0cba2f8..3a6a40573a0 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Yhteensä (sis. alv)
 TotalHT=Yhteensä (alv. 0)
 TotalHTforthispage=Yhteensä (ilman veroja) tällä sivulla
 Totalforthispage=Yhteensä tällä sivulla
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Yhteensä (sis. alv)
 TotalTTCToYourCredit=Yhteensä (sis. alv) on luotollesi
 TotalVAT=Verot yhteensä
@@ -647,6 +649,7 @@ ReportName=Raportin nimi
 ReportPeriod=Raportointikausi
 ReportDescription=Kuvaus
 Report=Raportti
+Reports=Reports
 Keyword=Avainsana
 Origin=Alkuperä
 Legend=Legend
@@ -1049,7 +1052,7 @@ Select2NotFound=Tuloksia ei löytynyt
 Select2Enter=Syötä
 Select2MoreCharacter=tai useampi merkki
 Select2MoreCharacters=tai lisää merkkejä
-Select2MoreCharactersMore=<strong>Hakusyntaksi:</strong><br> <kbd><strong> |</strong>b0860de534da6f class=' notranslate'><kbd> TAI</kbd> (a|b)<br>za03aec07. /span><span class='notranslate'><strong>*</strong></kbd><kbd> Mikä tahansa merkki</kbd> (a*b)<br>b03aec07z0</01d2z0 span><span class='notranslate'><strong>^</strong></kbd> <kbd> Aloita </kbd> (^ab)<br>b03aec07a601d27a601 <span class='notranslate'><strong>$</strong></kbd>za601d27<b03 /span> Loppuun <span class='notranslate'></kbd> (ab$)<br>
+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=Lataa lisää tuloksia...
 Select2SearchInProgress=Haku käynnissä...
 SearchIntoThirdparties=Sidosryhmät
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index fc98c61cb8b..b852e29de62 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -173,7 +173,7 @@ MembersAndSubscriptions=Jäsenet ja lahjoitukset
 MoreActions=Täydentäviä toimia tallennus
 MoreActionsOnSubscription=Täydentävä toimenpide, jota oletus ehdotti tekstityksen tallennuksen yhteydessä, myös automaattisesti maksu verkossa.
 MoreActionBankDirect=luo suora merkintä pankkitili
-MoreActionBankViaInvoice=luo lasku, ja a maksu <span class='notranslatessa '>pankkitili</span>
+MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
 MoreActionInvoiceOnly=Luo laskun maksua
 LinkToGeneratedPages=Käyntikorttien tai osoitelehtien luominen
 LinkToGeneratedPagesDesc=Tässä näytössä voit luoda PDF-tiedostoja käyntikortit kaikki jäsenet tai tietyssä jäsenvaltiossa.
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index b35c9df60a5..48ae4bab001 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -6,7 +6,7 @@ EnterNameOfObjectDesc=Kirjoita objektin nimi muotoon luo ilman välilyöntejä.
 EnterNameOfDictionaryDesc=Kirjoita sanakirjan nimi muotoon luo ilman välilyöntejä. Käytä isoja kirjaimia erottaaksesi sanat (esimerkiksi: MyDico...). Luokka tiedosto, mutta myös SQL tiedosto luodaan.
 ModuleBuilderDesc2=Polku, jossa moduuleja luodaan/muokataan (ensimmäinen hakemisto ulkoisille moduuleille, jotka on määritetty muotoon %s): <strong>%s</strong>
 ModuleBuilderDesc3=Löytyi luotuja/muokattavia moduuleja: <strong>%s</strong>
-ModuleBuilderDesc4=Moduuli tunnistetaan moduulin rakentajan moduuliksi, kun tiedosto <strong>b0ecb2fz87f4 /span><span class='notranslate'></strong> on moduulihakemiston juuressa
+ModuleBuilderDesc4=A module is detected as a 'module for Module Builer' when the file <strong>%s</strong> exists in the root of the module directory
 NewModule=Uusi moduuli
 NewObjectInModulebuilder=Uusi kohde
 NewDictionary=Uusi sanakirja
@@ -16,7 +16,7 @@ ObjectKey=Objekti avain
 DicKey=Sanakirjan avain
 ModuleInitialized=Moduuli alustettu
 FilesForObjectInitialized=Uuden objektin %s tiedostot alustettiin
-FilesForObjectUpdated=Objektin '%s' tiedostot päivitetty (.sql-tiedostot ja .class.php <span class='notranslate'>b0590afecbb5551z0 /span>)
+FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
 ModuleBuilderDescdescription=Kirjoita tähän kaikki yleiset tiedot, jotka kuvaavat moduuliasi.
 ModuleBuilderDescspecifications=Voit kirjoittaa tähän yksityiskohtaisen kuvauksen moduulisi teknisistä tiedoista, joita ei ole jo jäsennelty muihin välilehtiin. Joten sinulla on helposti ulottuvillasi kaikki säännöt, joita voit kehittää. Myös tämä tekstisisältö sisällytetään luotuun dokumentaatioon (katso viimeinen välilehti). Voit käyttää Markdown-muotoa, mutta on suositeltavaa käyttää Asciidoc-muotoa (.md ja .asciidoc vertailu: http://asciidoctor.org/docs/user-manual/# alennukseen verrattuna).
 ModuleBuilderDescobjects=Määritä tässä objektit, joita haluat hallita moduulillasi. CRUD DAO -luokka, SQL-tiedostot, sivu objektitietueiden luetteloa varten luo/edit/view tietueen ja API syntyy.
@@ -94,7 +94,7 @@ SeeExamples=Katso esimerkkejä tästä
 EnabledDesc=Edellytys, että tämä Kenttä on aktiivinen.<br><br>Esimerkkejä:<br>1<br>isModEnabled('anothermodule')<br>LODUBAL_StringLE(OP'G'TION) =2
 VisibleDesc=Onko Kenttä näkyvissä? (Esimerkkejä: 0=ei koskaan näkyvissä, 1=näkyy luettelossa ja luo/update/view forms, 2=näkyy luettelossa vain, 3=Näkyy osoitteessa luo/update/view form only (ei luetteloissa), 4=Näkyy luetteloissa ja update /view only form (ei luo), 5=Näkyy luettelossa ja vain näytä lomake (ei luo, ei päivitystä).<br><br>Negatiivisen arvon käyttäminen tarkoittaa Kenttä ei näy oletus luettelossa, mutta se voidaan valita katseltavaksi).
 ItCanBeAnExpression=Se voi olla ilmaisu. Esimerkki:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('loma', 'define_holiday')?1:5
-DisplayOnPdfDesc=Näytä tämä Kenttä yhteensopivissa PDF-dokumenteissa, voit hallita sijaintia "Position"-komennolla Kenttä. <br><strong>Asiakirjalle:</strong>b0342fccfda1>b0342fccfda1> näytetään <span class='notranslate'><br>1 = näyttö<br>2 = näyttö vain, jos se ei ole tyhjä<br> <br><strong>Asiakirjan rivit:</strong><br>0 = ei näy <br>1 = näytetään sarakkeessa<br>3 = näytetään rivin kuvaussarakkeessa kuvaus<br>4 = näytä kuvaussarakkeessa kuvauksen jälkeen vain, jos se ei ole tyhjä
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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:ssä
 IsAMeasureDesc=Voidaanko Kenttä arvo kumuloida, jotta kokonaissumma saadaan luetteloon? (Esimerkkejä: 1 tai 0)
 SearchAllDesc=Käytetäänkö Kenttä haun tekemiseen pikahakutyökalulla? (Esimerkkejä: 1 tai 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=Määritä triggerissä tiedosto koodi, jonka haluat suorittaa, k
 SeeIDsInUse=Katso asennuksessasi käytössä olevat tunnukset
 SeeReservedIDsRangeHere=Katso valikoima varattuja tunnuksia
 ToolkitForDevelopers=Toolkit Dolibarr-kehittäjille
-TryToUseTheModuleBuilder=Jos tiedät SQL:n ja PHP, voit käyttää ohjattua natiivimoduulin rakennustoimintoa.<br>Ota moduuli käyttöön <strong>%s</strong> b0ae6e90 the059</2span> ohjattu toiminto napsauttamalla <span class='notranslate'><span class="fa fa-bug"></span> oikeassa yläkulmassa valikko.<span> class='notranslate'><br></span>Varoitus: tämä on edistynyt kehittäjäominaisuus, <b>älä</b> kokeile tuotantopaikallesi!
+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=Katso oikeasta yläkulmasta <span class="fa fa-bug"></span> valikko
 AddLanguageFile=Lisää Kieli tiedosto
 YouCanUseTranslationKey=Voit käyttää tässä avainta, joka on käännösavain kielelle Kieli tiedosto (katso Kielet-välilehti).
@@ -148,7 +148,7 @@ CSSListClass=CSS luettelolle
 NotEditable=Ei muokattavissa
 ForeignKey=Vieras avain
 ForeignKeyDesc=Jos tämän Kenttä arvon on taattava olevan olemassa toisessa taulukossa. Kirjoita tähän arvo, joka vastaa syntaksia: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Esimerkki:<br>varchar(99)<br>sähköposti<br>puhelin<br>ip<br>url<br>salasana04b2fccf3 span>double(24,8)<span class='notranslate'><br>todellinen<br>text<br>html <br>päivämäärä<br>datetime<br>aikaleima <br>kokonaisluku<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342bccfda<99bccf0 /span><span class='notranslate'><br>'1' tarkoittaa, että lisäämme +-painikkeen yhdistelmän jälkeen luo tietueeseen<br>'filter' on yleisen suodattimen syntaksiehto, esimerkki: '((status:=:1) ja (fk_user:=:__USER_ID__) ja (entity:IN:(__SHARED_ENTITIES__))"
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Tämä on attribuutin Kenttä/tyyppi.
 AsciiToHtmlConverter=Ascii-HTML-muunnin
 AsciiToPdfConverter=Ascii-pdf-muunnin
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Koodin lisääminen kuvaajaan epäonnistui. Tarkis
 DictionariesCreated=Sanakirja <b>%s</b> luotu onnistuneesti
 DictionaryDeleted=Sanakirja <b>%s</b> poistettu onnistuneesti
 PropertyModuleUpdated=Omaisuus <b>%s</b> on päivitetty onnistuneesti
-InfoForApiFile=* Kun luot tiedosto ensimmäistä kertaa, kaikki menetelmät luodaan <strong> jokaiselle objektille.</strong><br>* Kun napsautat <strong>poista<span class='notranslate'0f6f6f6f79 span> poistat vain kaikki menetelmät <strong>valitusta objektista</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Sivu moduulien asennukseen
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Voit luoda ja muokata tässä luokkatiedostoja tarjotaksesi uusia sähköpostikohteen valitsimia joukkosähköpostimoduulille
diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang
index 818285d0a04..f9e6b198cf2 100644
--- a/htdocs/langs/fi_FI/mrp.lang
+++ b/htdocs/langs/fi_FI/mrp.lang
@@ -14,7 +14,7 @@ BOMsSetup=Moduulin tuoteluettelon asennus
 ListOfBOMs=Materiaaliluettelot - BOM
 ListOfManufacturingOrders=Valmistustilaukset
 NewBOM=Uusi lasku Materiaalit
-ProductBOMHelp=Tuote luo (tai pura) tämän tuoteluettelon avulla.<br>Huomaa: <span class='notranslate'>b07827aafe</8a05z0 > ominaisuudella 'Tuotteen luonne' = 'Raaka-aine' eivät näy tässä luettelossa.
+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=Tuoteluettelon numerointimallit
 BOMsModelModule=BOM-asiakirjamallit
 MOsNumberingModules=MO numerointimallit
@@ -136,4 +136,3 @@ NoRemainQtyToDispatch=Jaettavaa määrää ei ole jäljellä
 
 THMOperatorEstimatedHelp=Operaattorin arvioitu tuntihinta. Käytetään tätä työasemaa käyttävän tuoteluettelon kustannusten arvioimiseen.
 THMMachineEstimatedHelp=Arvioitu koneen hinta per tunti. Käytetään tätä työasemaa käyttävän tuoteluettelon kustannusten arvioimiseen.
-
diff --git a/htdocs/langs/fi_FI/multicurrency.lang b/htdocs/langs/fi_FI/multicurrency.lang
index 2cd283da681..deabb67354d 100644
--- a/htdocs/langs/fi_FI/multicurrency.lang
+++ b/htdocs/langs/fi_FI/multicurrency.lang
@@ -12,7 +12,7 @@ multicurrency_appId=API-avain
 multicurrency_appCurrencySource=Lähdevaluutta
 multicurrency_alternateCurrencySource=Vaihtoehtoinen lähdevaluutta
 CurrenciesUsed=Käytetyt valuutat
-CurrenciesUsed_help_to_add=Lisää eri valuuttojen ja kurssit, joita sinun tulee käyttää <b>ehdotuksissasib09a4b739f17 >, <span class='notranslate'><b>tilaukset</b> jne.
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=korko
 MulticurrencyReceived=Vastaanotettu, alkuperäinen valuutta
 MulticurrencyRemainderToTake=Jäljellä oleva summa, alkuperäinen valuutta
diff --git a/htdocs/langs/fi_FI/oauth.lang b/htdocs/langs/fi_FI/oauth.lang
index 51dafd01a67..e274616b890 100644
--- a/htdocs/langs/fi_FI/oauth.lang
+++ b/htdocs/langs/fi_FI/oauth.lang
@@ -14,7 +14,7 @@ RequestAccess=Napsauta tätä pyytääksesi/uusiaksesi käyttöoikeus ja vastaan
 DeleteAccess=Napsauta tästä poistaaksesi tunnuksen
 RedirectURL=Uudelleenohjauksen URL-osoite
 UseTheFollowingUrlAsRedirectURI=Käytä seuraavaa URL-osoitetta uudelleenohjaus-URL-osoitteena, kun luot kirjautumistietojasi OAuth-palveluntarjoajaltasi
-ListOfSupportedOauthProviders=Lisää OAuth2-tunnuksen tarjoajat. Siirry sitten OAuth-palveluntarjoajan Pääkäyttäjä-sivulle ja luo/hae OAuth-tunnus b0ae6e90z09. /span> Salaiset <span class='notranslate'>ja tallenna ne tähän. Kun olet valmis, avaa toinen välilehti luodaksesi tunnus.
+ListOfSupportedOauthProviders=Add your OAuth2 token providers. Then, go on your OAuth provider admin page to create/get an OAuth ID and Secret and save them here. Once done, switch on the other tab to generate your token.
 OAuthSetupForLogin=Sivu, jolla voit hallita (luoda/poista) OAuth-tunnuksia
 SeePreviousTab=Katso edellinen välilehti
 OAuthProvider=OAuth-palveluntarjoaja
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 77c5b178110..a6e1acce92e 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -331,8 +331,10 @@ FTPPassiveMode=Passiivisena
 ChooseAFTPEntryIntoMenu=Valitse FTP/SFTP-sivusto hakemistosta valikko...
 FailedToGetFile=Tiedostojen %s lataus epäonnistui
 ErrorFTPNodisconnect=Virhe katkaistaessa FTP/SFTP-palvelinta
-FileWasUpload=tiedosto <b>%s<span class='notranslate'>b09f17f830 span> ladattiin
-FTPFailedToUploadFile=tiedosto <b>%s<span class='notranslate' lataaminen epäonnistui. ></b></span>.
+FileWasUpload=File <b>%s</b> was uploaded
+FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
 AddFolder=luo kansio
 FileWasCreateFolder=Kansio <b>%s</b> on luotu
 FTPFailedToCreateFolder=luo-kansioon <b>%s epäonnistui. </b>.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/fi_FI/partnership.lang b/htdocs/langs/fi_FI/partnership.lang
index 8817e3c9f9b..7710e14af47 100644
--- a/htdocs/langs/fi_FI/partnership.lang
+++ b/htdocs/langs/fi_FI/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Viimeisimmän URL-osoitteen tarkistuksen virheiden määr
 LastCheckBacklink=päiväys viimeisestä URL-osoitteen tarkistuksesta
 
 NewPartnershipRequest=Uusi kumppanuuspyyntö
-NewPartnershipRequestDesc=Tällä lomakkeella voit pyytää liittymistä johonkin kumppanuusohjelmaamme. Jos tarvitset apua tämän lomakkeen täyttämisessä, ota yhteyttä sähköpostitse <b>%s</b><span class='notranslate'> span>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Tällä sivulla on oltava vähintään yksi linkki johonkin seuraavista verkkotunnuksista: %s
 
 IPOfApplicant=Hakijan IP
-
diff --git a/htdocs/langs/fi_FI/paybox.lang b/htdocs/langs/fi_FI/paybox.lang
index c086edbeaf4..931f03ddcf0 100644
--- a/htdocs/langs/fi_FI/paybox.lang
+++ b/htdocs/langs/fi_FI/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBox moduulin asetukset
-PayBoxDesc=Tämä moduuli tarjoaa sivuja sallia maksu <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Payboxissa</a> class='notranslate'>asiakkaat</span>. Tätä voidaan käyttää ilmaiseen maksu tai maksu tiettyyn Dolibarr-objektiin (lasku, tilaus, ...)
+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=Seuraavat URL-osoitteet ovat käytettävissä tarjota sivu asiakas tehdä maksua Dolibarr esineitä
 PaymentForm=Maksu-muodossa
 WelcomeOnPaymentPage=Tervetuloa verkkopalveluumme maksu
@@ -13,7 +13,7 @@ PaymentCode=Maksu-koodi
 PayBoxDoPayment=Maksa Payboxilla
 YouWillBeRedirectedOnPayBox=Sinut ohjataan on turvattu Paybox sivu tuloliittimeen voit luottokortin tiedot
 Continue=Seuraava
-SetupPayBoxToHavePaymentCreatedAutomatically=Määritä Payboxin URL-osoite <b>%s</b> saadaksesi <span class=> 'notranslate'>maksu</span> luodaan automaattisesti, kun Paybox vahvistaa.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Tämä sivu vahvistaa, että maksu on kirjattu. Kiitos.
 YourPaymentHasNotBeenRecorded=maksu EI ole tallennettu ja tapahtuma on peruutettu. Kiitos.
 AccountParameter=Tilin parametrit
diff --git a/htdocs/langs/fi_FI/paypal.lang b/htdocs/langs/fi_FI/paypal.lang
index 1da5c562581..b0c035ead5a 100644
--- a/htdocs/langs/fi_FI/paypal.lang
+++ b/htdocs/langs/fi_FI/paypal.lang
@@ -16,7 +16,7 @@ ThisIsTransactionId=Tämä on id liiketoimen: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Sisällytä PayPalin maksu URL-osoite, kun lähetät asiakirjan sähköpostitse
 NewOnlinePaymentReceived=Uusi verkossa maksu vastaanotettu
 NewOnlinePaymentFailed=Uusi verkossa maksu yritti, mutta epäonnistui
-ONLINE_PAYMENT_SENDEMAIL=Sähköpostiosoite käyttäjälle Ilmoitukset jokaisen maksu yrityksen jälkeen (menestys <span class='notranslate'>ja)
+ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
 ReturnURLAfterPayment=Palauta URL-osoite maksu jälkeen
 ValidationOfOnlinePaymentFailed=Verkkotunnuksen maksu vahvistus epäonnistui
 PaymentSystemConfirmPaymentPageWasCalledButFailed=maksu vahvistussivun kutsui maksu järjestelmä palautti virheen
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=Kaikille Post-toiminnoille suoritettiin peruu
 ValidationOfPaymentFailed=Kohteen maksu vahvistus epäonnistui
 CardOwner=Kortin haltija
 PayPalBalance=Paypal luotto
-OnlineSubscriptionPaymentLine=Verkkotilaus tallennettu %s<br>Maksettu %s<br>Alkuperäinen IP-osoite: %s<br>Tapahtuman tunnus: <span class='notranslate2f87> </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 6d296184783..33a1dc1b05d 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -208,11 +208,6 @@ unitSET=Aseta
 unitS=Sekunti
 unitH=Tunti
 unitD=Päivä
-unitG=Gramma
-unitM=Metri
-unitLM=Lineaarinen mittari
-unitM2=Neliömetri
-unitM3=Kuutiometri
 unitL=Litra
 unitT=tonnia
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=punta
 unitOZ=unssi
 unitM=Metri
+unitLM=Lineaarinen mittari
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -289,9 +285,9 @@ MinimumRecommendedPrice=Suositeltu vähimmäishinta on: %s
 PriceExpressionEditor=Hintailmaisueditori
 PriceExpressionSelected=Valittu hintalauseke
 PriceExpressionEditorHelp1="hinta = 2 + 2" tai "2 + 2" hinnan määrittämiseksi. Käytä ; ilmaisujen erottamiseen
-PriceExpressionEditorHelp2=Voit käyttää ExtraFields-kenttiä muuttujilla, kuten <b>#extrafield_myextrafieldkey#</b> b0ae65a9e50</2span6e> muuttujat <span class='notranslate'><b>#global_mycode#</b>
-PriceExpressionEditorHelp3=Molemmissa tuotteen/palvelun ja Toimittaja hinnoissa on saatavilla seuraavat muuttujat:<br> ><b>#tva_tx# #localtax1_tx# #localtax2_tx# #Massa# #length# #pinta#<span class_min# ='notranslate'></b></span>
-PriceExpressionEditorHelp4=Vain tuotteen/palvelun hinta: <b>#supplier_min_price#</b>b0342fccfda</span19bz0 <span class='notranslate'>Toimittaja vain hinnat: <b>#supplier_quantity# ja #suppli class='notranslate'></b></span>
+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=Käytettävissä olevat globaalit arvot:
 PriceMode=Hinta-tila
 PriceNumeric=Numero
@@ -410,7 +406,7 @@ PMPValueShort=WAP
 mandatoryperiod=Pakolliset ajanjaksot
 mandatoryPeriodNeedTobeSet=Huomaa: jakso (alku ja loppu päiväys) on määritettävä
 mandatoryPeriodNeedTobeSetMsgValidate=Palvelu vaatii aloitusjakson ja
-mandatoryHelper=Valitse tämä, jos haluat viestiä käyttäjälle luodessasi/vahvisttaessasi laskua, Tarjouspyyntö, myyntitilausta ilman alkua ja lopeta päiväys tämän palvelun linjoilla.<br>Huomaa, että viesti on varoitus <span class='notranslate'>ja /span> ei ole estovirhe.
+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=oletus tuoteluettelo
 DefaultBOMDesc=Tämän tuotteen valmistukseen suositeltu oletus tuoteluettelo. Tämä Kenttä voidaan asettaa vain, jos tuotteen luonne on %s.
 Rank=Sijoitus
@@ -436,5 +432,7 @@ ConfirmEditExtrafieldQuestion = Haluatko varmasti muokata tätä lisäkenttää?
 ModifyValueExtrafields = Muokkaa lisäkentän arvoa
 OrProductsWithCategories=Tai tuotteet tunnisteilla/luokilla
 WarningTransferBatchStockMouvToGlobal = Jos haluat deserialisoida tämän tuotteen, kaikki sen sarjoitetut varastot muutetaan maailmanlaajuisiksi varastoiksi
-WarningConvertFromBatchToSerial=Jos sinulla on tällä hetkellä tuotteen määrä suurempi tai yhtä suuri kuin 2, tähän valintaan vaihtaminen tarkoittaa, että sinulla on edelleen tuote, jossa on saman erän eri kohteita (vaikka haluat ainutlaatuisen <span class='notranslate'>Sarjanumero</. span>). Kaksoiskappale säilyy, kunnes inventaario tai manuaalinen varastosiirto tämän korjaamiseksi on tehty.
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Haluatko varmasti palata Luonnos-tilaan?<br>Mainosjakaumaan tällä hetkellä asetetut määrät nollataan.
diff --git a/htdocs/langs/fi_FI/receptions.lang b/htdocs/langs/fi_FI/receptions.lang
index fe9fc6ae977..89afeacd2d9 100644
--- a/htdocs/langs/fi_FI/receptions.lang
+++ b/htdocs/langs/fi_FI/receptions.lang
@@ -5,8 +5,6 @@ RefReception=Viite. vastaanotto
 Reception=Prosessissa
 Receptions=Vastaanotot
 AllReceptions=Kaikki vastaanotot
-Reception=Prosessissa
-Receptions=Vastaanotot
 ShowReception=Näytä vastaanotot
 ReceptionsArea=Vastaanottoalue
 ListOfReceptions=Luettelo vastaanotoista
@@ -36,7 +34,7 @@ ValidateReception=Vahvista vastaanotto
 ConfirmDeleteReception=Haluatko varmasti poistaa tämän vastaanoton?
 ConfirmValidateReception=Haluatko varmasti vahvistaa tämän vastaanoton viitteellä <b>%s</b>?
 ConfirmCancelReception=Haluatko varmasti peruuttaa tämän vastaanoton?
-StatsOnReceptionsOnlyValidated=Tilastot on tehty vain validoiduista vastaanotoista. päiväys on päiväys vastaanoton validoinnista (suunniteltu toimitus <span> ='notranslate'>päiväys</span> ei ole aina tiedossa).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Lähetä vastaanotto sähköpostitse
 SendReceptionRef=Vastaanoton lähettäminen %s
 ActionsOnReception=Tapahtumat vastaanotossa
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 239ed38c8a0..4c1f29177cc 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Haluatko varmasti vahvistaa tämän lähetyksen viitenume
 ConfirmCancelSending=Haluatko varmasti peruuttaa tämän toimituksen?
 DocumentModelMerou=Merou A5 malli
 WarningNoQtyLeftToSend=Varoitus, ei tuotteet odottavat lähettämistä.
-StatsOnShipmentsOnlyValidated=Tilastot koskevat vain hyväksyttyjä lähetyksiä. päiväys on päiväys lähetyksen validoinnissa (suunniteltu toimitus class='notranslate'>päiväys</span> ei ole aina tiedossa)
+StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
 DateDeliveryPlanned=Suunniteltu toimituspäivä
 RefDeliveryReceipt=Viite toimitus kuitti
 StatusReceipt=Tilan toimitus kuitti
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 968ea27829c..56132aac672 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -164,14 +164,14 @@ InventoryCode=Liike- tai varastokoodi
 IsInPackage=Pakkauksessa mukana
 WarehouseAllowNegativeTransfer=Varasto voi olla negatiivinen
 qtyToTranferIsNotEnough=Sinulla ei ole tarpeeksi varastoa lähdevarastostasi ja, asetukset eivät salli negatiivisia varastoja.
-qtyToTranferLotIsNotEnough=Sinulla ei ole tarpeeksi varastoa tälle eränumerolle lähdevarastostasi ja, asetukset eivät salli negatiivisia varastoja (määrä tuotteelle  %s" erällä "%s" on %s varastossa '<span class='notranslate'>b9fz'07f4b9fz80 /span>').
+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=Näytä varasto
 MovementCorrectStock=Varastokorjaus tuotteelle %s
 MovementTransferStock=Tuotteen %s varastosiirto toiseen varastoon
 BatchStockMouvementAddInGlobal=Erävarasto siirtyy globaaliin varastoon (tuote ei enää käytä erää)
 InventoryCodeShort=Inv./Mov. koodi
 NoPendingReceptionOnSupplierOrder=Ei odottavaa vastaanottoa avoimen Hankinta tilauksen vuoksi
-ThisSerialAlreadyExistWithDifferentDate=Tämä erä/Sarjanumero (<strong>%s</strong>) on jo olemassa, mutta sillä on eri eatby tai sellby päiväys (löytyi <strong><span' class='no >%s</span></strong> mutta kirjoitat <strong>b0ecb2ec87f4><span9fz87f4 class='notranslate'></strong>).
+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=Avaa (kaikki liikkeet)
 OpenInternal=Avoin (vain sisäinen liike)
 UseDispatchStatus=Käytä lähetystilaa (hyväksyä/refuse) tuotelinjoille Hankinta tilauksen vastaanotossa
@@ -282,7 +282,7 @@ ModuleStockTransferName=Edistynyt osakesiirto
 ModuleStockTransferDesc=Edistynyt varastonsiirron hallinta siirtoarkin luomisen kanssa
 StockTransferNew=Uuden osakkeen siirto
 StockTransferList=Osakkeiden siirtoluettelo
-ConfirmValidateStockTransfer=Haluatko varmasti vahvistaa tämän osakkeiden siirron viitenumerolla <b>%s</b><span class='notranslate'> span> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=vähentää osakkeita siirrolla %s
 ConfirmDestockCancel=Peru vähentää osakkeita siirtämällä %s
 DestockAllProduct=vähentää osakkeista
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index a1573480e0b..a5b0876b36d 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -22,8 +22,8 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL-osoite, jolla tarjotaan %s online
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL-osoite, jolla tarjotaan %s online- maksu -sivu minkä tahansa summan ilman objektia
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL-osoite, joka tarjoaa %s online- maksu -sivun jäsentilaukselle
 ToOfferALinkForOnlinePaymentOnDonation=URL-osoite, jolla tarjotaan %s online maksu -sivu maksu lahjoituksesta
-YouCanAddTagOnUrl=Voit myös lisätä URL-parametrin <b>&tag=<i>value</i> class='notranslate'></b></span> mihin tahansa näistä URL-osoitteista (pakollinen vain maksulle, jota ei ole linkitetty objektiin), jotta voit lisätä oman maksu kommenttitunniste.<br>Voit myös lisätä parametrin <strong> sellaisten maksujen URL-osoitteeseen, joissa ei ole olemassa olevaa objektia. >> class='notranslate'>maksu arvoksi 1 jokaiselle eri linkille ilman tätä parametria)
-SetupStripeToHavePaymentCreatedAutomatically=Määritä Stripe URL-osoitteella <b>%s</b>, jotta saat <span class=' 'notranslate'>maksu</span> luodaan automaattisesti, kun Stripe on vahvistanut.
+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=Tilin parametrit
 UsageParameter=Käyttöparametrien
 InformationToFindParameters=Auta löytää %s tilitiedot
@@ -38,7 +38,7 @@ STRIPE_TEST_WEBHOOK_KEY=Webhook-testiavain
 STRIPE_LIVE_SECRET_KEY=Salainen live-avain
 STRIPE_LIVE_PUBLISHABLE_KEY=Julkaistu live-avain
 STRIPE_LIVE_WEBHOOK_KEY=Webhook live-avain
-ONLINE_PAYMENT_WAREHOUSE=Osake käytettäväksi varastossa vähentää, kun online-tilassa maksu on valmis<br>(TODO) Kun vaihtoehto vähentää on tehty laskun ja toiminnolle, online <span class='notranslate'>maksu span> luo itse laskun?)
+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 käytössä (muuten testi/hiekkalaatikkotila)
 StripeImportPayment=Tuo Stripe-maksut
 ExampleOfTestCreditCard=Esimerkki luottokortista testiä varten maksu: %s => kelvollinen, %s > => virhe CVC, %s => vanhentunut, %s => veloitus epäonnistuu
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index 23678004646..d5d6f9c8ef5 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -5,7 +5,7 @@ AddTrip=Tee uusi kulutosite
 AllExpenseReport=Kaiken tyyppiset kuluraportti
 AllExpenseReports=Kaikki kulutositteet
 AnyOtherInThisListCanValidate=Henkilö, jolle on tiedotettava pyynnön vahvistamiseksi.
-AttachTheNewLineToTheDocument=Liite rivi ladattuun dokumenttiin 
+AttachTheNewLineToTheDocument=Liite rivi ladattuun dokumenttiin
 AucuneLigne=Ei ole kulutositteita vielä kirjattuna
 BrouillonnerTrip=Muuta takaisin esitäytetty tilaan
 byEX_DAY=päivän mukaan (rajoitus %s)
@@ -45,9 +45,9 @@ expenseReportRangeMoreThan=enemmän kuin %d
 expenseReportTotalForFive=Esimerkki: <u>d</u> = 5
 ExpenseReportApplyTo=hyväksy
 ExpenseReportApproved=Kulutosite on hyväksytty
-ExpenseReportApprovedMessage=kuluraportti %s hyväksyttiin.<br> – Käyttäjä: %s<br> - Hyväksyjä: %sb0342bccf span>Näytä <span class='notranslate'>kuluraportti napsauttamalla tätä: %s
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=Kulutosite on peruutettu
-ExpenseReportCanceledMessage=kuluraportti %s peruutettiin.<br> - Käyttäjä: %s span> – Peruuttamisen syy: %s<br>Napsauta tätä nähdäksesi kuluraportti >: <span class='notranslate'>%s
+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
 ExpenseReportConstraintViolationError=Enimmäismäärä ylitetty (sääntö %s): %s on suurempi kuin %s ( Kielletyn ylittäminen)
 ExpenseReportConstraintViolationWarning=Enimmäismäärä ylitetty (sääntö %s): %s on suurempi kuin %s ( Ylittää luvan)
 ExpenseReportDateEnd=Päättyen
@@ -62,7 +62,7 @@ ExpenseReportPaidMessage=kuluraportti %s maksettiin.<br> - Käyttäjä: %s<br> 
 ExpenseReportPayment=Kululaskun maksatus
 ExpenseReportRef=Viite. kuluraportti
 ExpenseReportRefused=Kulutosite on hylätty
-ExpenseReportRefusedMessage=kuluraportti %s hylättiin.<br> - Käyttäjä: %s span> - Kieltäytymisen syy: %s<br>Näytä kuluraportti napsauttamalla tätä >: <span class='notranslate'>%s
+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
 ExpenseReportRestrictive=Ylittäminen kielletty
 ExpenseReportRuleErrorOnSave=Virhe: %s
 ExpenseReportRuleSave=Sääntö tallennettu
@@ -90,10 +90,10 @@ nolimitbyEX_DAY=päivällä (ei rajoituksia)
 nolimitbyEX_EXP=rivillä (ei rajoituksia)
 nolimitbyEX_MON=kuukausittain (ei rajoituksia)
 nolimitbyEX_YEA=vuoden mukaan (ei rajoituksia)
-NoTripsToExportCSV=Ei kulutositteita tälle kuulle 
+NoTripsToExportCSV=Ei kulutositteita tälle kuulle
 NOT_AUTHOR=Et ole tämän kuluraportti kirjoittaja. Toiminto peruttu.
 OnExpense=Kulutositteen rivi
-PDFStandardExpenseReports=Muodosta PDF 
+PDFStandardExpenseReports=Muodosta PDF
 PaidTrip=Maksa kululasku
 REFUSEUR=Hylätty toimesta
 RangeIk=Kilometrit
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index d2d3e31eef9..206794503b5 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -32,7 +32,7 @@ AddWebsite=Lisää sivusto
 Webpage=Verkkosivu/säilö
 AddPage=Lisää sivu/säilö
 PageContainer=Sivu
-PreviewOfSiteNotYetAvailable=Verkkosivustosi <strong>%s</strong> esikatselu ei ole vielä saatavilla. Sinun täytyy ensin <strong>tuoda täydellinen verkkosivustomalli</strong> tai vain b0e7843947c. span>Lisää sivu/säilö<span class='notranslate'></strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Pyydetyllä sivulla, jonka tunnus on %s, ei ole vielä sisältöä, tai välimuisti tiedosto .tpl.php on poistettu. Muokkaa sivun sisältöä ratkaistaksesi tämän.
 SiteDeleted=Verkkosivusto '%s' poistettu
 PageContent=Sivu/sisältö
@@ -53,8 +53,8 @@ CheckVirtualHostPerms=Tarkista myös, että virtuaalipalvelimen käyttäjällä
 ReadPerm=Luettu
 WritePerm=Kirjoittaa
 TestDeployOnWeb=Testaa / ota käyttöön verkossa
-PreviewSiteServedByWebServer=<u>Esikatsele %s uudessa välilehdessä.</u><br><br>%s palvelee ulkoinen verkkopalvelin (kuten Apache, Nginx, IIS ). Sinun on asennettava ja tämän palvelimen asennus ennen kuin voit osoittaa hakemistoon:<br><strong> >%s</strong><br>Ulkoisen palvelimen tarjoama URL-osoite:<br><strong>%s<span class='notranslate'>b0a65fc071f65fc071f
-PreviewSiteServedByDolibarr=<u>Esikatsele %s uudessa välilehdessä.</u><br><br>%s palvelee Dolibarr-palvelinta, joten se ei tarvitse ylimääräistä verkkopalvelinta (kuten Apache, Nginx, IIS) asennettava.<br>Epämukavaa on, että sivujen URL-osoitteet eivät ole käyttäjäystävällisiä ja aloita Dolibarrin polulla.<br>Dolibarrin tarjoama URL-osoite:<br><strong> span><span class='notranslate'>%s</strong><br>b0349bcc0fda192fz Jos haluat käyttää omaa ulkoista verkkopalvelintasi tämän verkkosivuston palvelemiseen, luo verkkopalvelimellasi on virtuaalinen isäntä, joka osoittaa hakemistoon<br> <strong>%s</strong><br> ja kirjoita tämän virtuaalipalvelimen nimi tämän verkkosivuston ominaisuuksiin ja napsauta linkkiä "Testaa/käyttöönotto verkossa".
+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=Ulkoisen verkkopalvelimen palveleman virtuaalisen isännän URL-osoitetta ei ole määritetty
 NoPageYet=Ei vielä sivuja
 YouCanCreatePageOrImportTemplate=Voit luo uuden sivun tai tuoda täyden verkkosivustomallin
@@ -62,9 +62,9 @@ SyntaxHelp=Ohje tiettyihin syntaksivinkkeihin
 YouCanEditHtmlSourceckeditor=Voit muokata HTML-lähdekoodia käyttämällä "Lähde"-painiketta editorissa.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
-YouCanEditHtmlSource2=Jaa-linkillä jaetun kuvan (avoin pääsy tiedosto jakamishajaavaimella) syntaksi on:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."<span class='notranslate<<span class='notranslate8b012'>d0c012'>d0c012'> /span></strong><br>
-YouCanEditHtmlSource3=Saat PHP-objektin kuvan URL-osoitteen käyttämällä <br><strong>&lt; span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt; class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Lisää esimerkkejä HTML-koodista tai dynaamisesta koodista löytyy <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wikin dokumentaatiosta</a> >.<span class='notranslate'><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>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Kloonaa sivu/säilö
 CloneSite=Kloonaa sivusto
 SiteAdded=Verkkosivusto lisätty
@@ -143,7 +143,7 @@ DefineListOfAltLanguagesInWebsiteProperties=Määritä luettelo kaikista saatavi
 GenerateSitemaps=Luo verkkosivusto sitemap.xml tiedosto
 ConfirmGenerateSitemaps=Jos vahvistat, poistat nykyisen sivustokartan tiedosto...
 ConfirmSitemapsCreation=Vahvista sivustokartan luominen
-SitemapGenerated=Sivustokartta tiedosto <b>%s<span class='notranslate'>b09a4f8<z09a /span> luotu
+SitemapGenerated=Sitemap file <b>%s</b> generated
 ImportFavicon=Favicon
 ErrorFaviconType=Faviconin on oltava png
 ErrorFaviconSize=Faviconin koon tulee olla 16x16, 32x32 tai 64x64
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 6ee774b438b..6559d57b885 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -125,7 +125,7 @@ WithdrawRequestErrorNilAmount=Tyhjän summan luo suoraveloituspyyntö epäonnist
 SepaMandate=SEPA-suoraveloitusvaltuutus
 SepaMandateShort=SEPA-mandaatti
 PleaseReturnMandate=Palauta tämä toimeksiantolomake sähköpostitse osoitteeseen %s tai postitse osoitteeseen
-SEPALegalText=Allekirjoittamalla tämän valtuutuslomakkeen valtuutat (A) %s ja sen maksu > palveluntarjoaja lähettää pankkillesi ohjeet tilin veloittamiseksi <span class='notranslate'>ja (B) pankkillesi veloittaaksesi tiliäsi lähettäjän %s ohjeiden mukaisesti . Osana oikeuksiasi sinulla on oikeus saada hyvitys pankiltasi pankkisi kanssa tekemäsi sopimuksen ehtojen ja ehtojen mukaisesti. Yllä olevaan toimeksiantoon liittyvät oikeutesi on selitetty tiliotteessa, jonka voit saada pankistasi. Suostut vastaanottamaan Ilmoitukset tulevista veloituksista enintään 2 päivää ennen niiden toteutumista.
+SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. You agree to receive notifications about future charges up to 2 days before they occur.
 CreditorIdentifier=Luotonantajan tunniste
 CreditorName=Luotonantajan nimi
 SEPAFillForm=(B) Täytä kaikki * merkityt kentät
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Palkat odottavat tilisiirtona maksu
 RefSalary=Palkka
 NoSalaryInvoiceToWithdraw=Ei palkkaa odottamassa %s. Tee pyyntö siirtymällä palkkakortin välilehteen %s.
 SalaryInvoiceWaitingWithdraw=Palkat odottavat tilisiirtona maksu
-
diff --git a/htdocs/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
index 8351d427005..58f38c31986 100644
--- a/htdocs/langs/fi_FI/workflow.lang
+++ b/htdocs/langs/fi_FI/workflow.lang
@@ -3,8 +3,8 @@ WorkflowSetup=Workflow-moduuli asennus
 WorkflowDesc=Tämä moduuli tarjoaa joitain automaattisia toimintoja. Tekijän oletus työnkulku on auki (voit tehdä asioita haluamassasi järjestyksessä), mutta täällä voit aktivoida joitain automaattisia toimintoja.
 ThereIsNoWorkflowToModify=Aktivoiduilla moduuleilla ei ole käytettävissä työnkulun muutoksia.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automaattisesti luo myyntitilaus, kun Tarjouspyyntö on allekirjoitettu (uuden tilauksen summa on sama kuin <span class='notranslatessa '>tarjous</span>)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automaattisesti luo asiakkaan lasku, kun Tarjouspyyntö on allekirjoitettu (uudessa laskussa on sama summa kuin <span class='notranslatessa '>tarjous</span>)
+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=luo asiakkaan lasku automaattisesti, kun sopimus on vahvistettu
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automaattisesti luo asiakkaan lasku myyntitilauksen sulkemisen jälkeen (uudessa laskussa on sama summa kuin tilauksessa)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Lippua luotaessa automaattisesti luo väliintulo.
@@ -16,9 +16,9 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Luokittele linkitetyt lähdemyyntitil
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Luokittele linkitetyt lähdemyyntitilaukset toimitetuiksi, kun lähetys vahvistetaan (ja, jos kaikkien lähetysten toimitettu määrä on sama kuin päivitettävässä tilauksessa)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Luokittele linkitetyn lähteen myyntitilaus lähetetyksi, kun lähetys on suljettu (ja, jos kaikkien lähetysten lähetysmäärä on sama kuin päivitettävässä tilauksessa)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Luokittele linkitetty lähde Toimittaja tarjous laskutetuksi, kun ostolasku on vahvistettu (<span> class='notranslate'>ja</span>, jos laskun summa on sama kuin linkitettyjen ehdotusten kokonaissumma)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Luokittele linkitetty lähde Hankinta tilaus laskutetuksi, kun ostolasku on vahvistettu (<span class='notranslate'>ja laskun summa on sama kuin linkitettyjen tilausten kokonaissumma)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Luokittele linkitetyn lähteen Hankinta tilaus vastaanotetuksi, kun vastaanotto on vahvistettu (ja, jos kaikkien vastaanottojen vastaanottama määrä on sama kuin kohdassa Hankinta päivitysjärjestys)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Luokittele linkitetyn lähteen Hankinta tilaus vastaanotetuksi, kun vastaanotto suljetaan (ja, jos kaikkien vastaanottojen vastaanottama määrä on sama kuin kohdassa Hankinta päivitysjärjestys)
 # Autoclassify shipment
diff --git a/htdocs/langs/fr_BE/errors.lang b/htdocs/langs/fr_BE/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/fr_BE/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/fr_BE/languages.lang b/htdocs/langs/fr_BE/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/fr_BE/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 3042af1642f..1e1313ac698 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -25,5 +25,4 @@ DateEnd=Date de fin
 AmountPayment=Montant de paiement
 Discount=Ristourne
 Unknown=Inconnue
-Check=Chèque
 ValidatePayment=Valider paiement
diff --git a/htdocs/langs/fr_CH/errors.lang b/htdocs/langs/fr_CH/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/fr_CH/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/fr_CH/holiday.lang b/htdocs/langs/fr_CH/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/fr_CH/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/fr_CH/languages.lang b/htdocs/langs/fr_CH/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/fr_CH/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/fr_CI/errors.lang b/htdocs/langs/fr_CI/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/fr_CI/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/fr_CI/holiday.lang b/htdocs/langs/fr_CI/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/fr_CI/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/fr_CI/languages.lang b/htdocs/langs/fr_CI/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/fr_CI/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/fr_CM/errors.lang b/htdocs/langs/fr_CM/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/fr_CM/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/fr_CM/holiday.lang b/htdocs/langs/fr_CM/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/fr_CM/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/fr_CM/languages.lang b/htdocs/langs/fr_CM/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/fr_CM/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index e1f9705b6b2..2857c585ba4 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -190,7 +190,7 @@ Compression=Compression
 CommandsToDisableForeignKeysForImport=Commande pour désactiver les clés étrangères à l'importation
 CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre « dump » SQL plus tard
 ExportCompatibility=Compatibilité du fichier d'exportation généré
-ExportUseMySQLQuickParameter=Utiliser le paramètre --quick 
+ExportUseMySQLQuickParameter=Utiliser le paramètre --quick
 ExportUseMySQLQuickParameterHelp=Le paramètre '--quick' aide à réduire la consommation de RAM pour les longues listes
 MySqlExportParameters=Paramètres de l'exportation MySQL
 PostgreSqlExportParameters= Paramètres de l'exportation PostgreSQL
@@ -302,7 +302,7 @@ MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode te
 MAIN_MAIL_FORCE_SENDTO=Envoyer tous les emails à (au lieu des vrais destinataires, à des fins de test)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Proposer les courriels des employés (si définis) dans la liste des destinataires prédéfinis lors de la rédaction d'un nouveau courriel
 MAIN_MAIL_NO_WITH_TO_SELECTED=Ne pas sélectionner de destinataire par défaut même si choix unique
-MAIN_MAIL_SENDMODE=Sending method
+MAIN_MAIL_SENDMODE=Méthode d'envoi
 MAIN_MAIL_SMTPS_ID=ID SMTP (si le serveur d'envoi nécessite une authentification)
 MAIN_MAIL_SMTPS_PW=Mot de passe SMTP (si le serveur d'envoi nécessite une authentification)
 MAIN_MAIL_EMAIL_TLS=Utiliser le chiffrement TLS (SSL)
@@ -341,7 +341,7 @@ MenuHandlers=Gestionnaires de menu
 MenuAdmin=Édition menu
 DoNotUseInProduction=Ne pas utiliser en production
 ThisIsProcessToFollow=Procédure de mise à jour:
-ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternative 
+ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternative
 StepNb=Étape %s
 FindPackageFromWebSite=Rechercher le paquet qui répond à votre besoin (par exemple sur le site web %s).
 DownloadPackageFromWebSite=Télécharger le package (par exemple depuis le site web officiel %s)
@@ -366,8 +366,8 @@ GenericMaskCodes2=<b>{cccc}</b> : code client sur n caractères<br><b>{cccc000}<
 GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<br>Les espaces ne sont pas permis.<br>
 GenericMaskCodes3EAN=Tous les autres caractères du masque resteront intacts (sauf * ou ? en 13ème position dans EAN13). <br>Les espaces ne sont pas autorisés.<br> Dans EAN13, le dernier caractère après le dernier } en 13ème position doit être * ou ? . Il sera remplacé par la clé calculée.<br>
 GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie, à la date du 31/01/2023:</u><br>
-GenericMaskCodes4b= <u> Exemple pour un tiers créé le 31/01/2023 : </u>  <br> 
-GenericMaskCodes4c= <u> Exemple pour un produit créé le 31/01/2023 : </u>  <br> 
+GenericMaskCodes4b= <u> Exemple pour un tiers créé le 31/01/2023 : </u>  <br>
+GenericMaskCodes4c= <u> Exemple pour un produit créé le 31/01/2023 : </u>  <br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b><br><b>IN{yy}{mm}-{0000}-{t}</b> donnera <b>IN0701-0099-A</b> si la société a le type 'Responsable Inscripto' avec le code type qui est 'A_RI'
 GenericNumRefModelDesc=Renvoie un numéro personnalisable selon un masque à définir.
 ServerAvailableOnIPOrPort=Serveur disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
@@ -512,7 +512,7 @@ WarningPHPMailD=Il est donc recommandé de changer la méthode d'envoi des e-mai
 WarningPHPMailDbis=Si vous voulez vraiment conserver la méthode par défaut "PHP" pour envoyer des e-mails, ignorez simplement cet avertissement ou supprimez-le en %scliquant ici%s.
 WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP du mail user agent (MUA) de votre application CRM ERP : <strong> %s </strong>.
 WarningPHPMailSPF=Si le nom de domaine de votre adresse e-mail d'expéditeur est protégé par un enregistrement SPF (demandez à votre fournisseur de nom de domaine), vous devez inclure les adresses IP suivantes dans l'enregistrement SPF du DNS de votre domaine: <strong>%s</strong>.
-ActualMailSPFRecordFound=Enregistrement SPF réel trouvé (pour l'e-mail %s) : %s
+ActualMailSPFRecordFound=Enregistrement SPF actuel trouvé (pour l'e-mail %s) : %s
 ClickToShowDescription=Cliquer pour afficher la description
 DependsOn=Ce module a besoin du(des) module(s)
 RequiredBy=Ce module est requis par le ou les module(s)
@@ -684,7 +684,7 @@ Module5000Desc=Permet de gérer plusieurs sociétés
 Module6000Name=Workflow Inter-modules
 Module6000Desc=Gestion du workflow entre différents modules (création automatique d'objet et / ou de changement automatique d'état)
 Module10000Name=Sites web
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module10000Desc=Système de gestion de contenu (CMS) pour créer des sites web avec un éditeur WYSIWYG. Il s'agit d'un CMS orienté webmaster ou développeur (il est préférable de connaître les langages HTML et CSS). Il suffit de configurer votre serveur web (Apache, Nginx, ...) pour qu'il pointe vers le répertoire Dolibarr dédié afin de le faire fonctionner sur Internet avec votre propre nom de domaine.
 Module20000Name=Demandes de congés
 Module20000Desc=Déclaration et suivi des congés des employés
 Module39000Name=Numéros de Lot/Série
@@ -865,7 +865,7 @@ Permission286=Exporter les contacts
 Permission291=Consulter les tarifs
 Permission292=Définir les permissions sur les tarifs
 Permission293=Modifier les tarifs clients
-Permission301=Générer la planche PDF de code barres 
+Permission301=Générer la planche PDF de code barres
 Permission304=Créer/modifier les codes-barres
 Permission305=Supprimer les codes-barres
 Permission311=Consulter les services
@@ -1197,7 +1197,7 @@ Skin=Thème visuel
 DefaultSkin=Thème visuel par défaut
 MaxSizeList=Longueur maximale des listes
 DefaultMaxSizeList=Longueur maximale par défaut des listes
-DisplayGrandTotalInList=Affiche le total général (de toutes les pages) en bas des listes
+DisplayGrandTotalInList=Afficher le total général (pour toutes les pages) dans le pied de page des listes
 DefaultMaxSizeShortList=Longueur maximale par défaut des listes courtes (e.g. dans la fiche client)
 MessageOfDay=Message du jour
 MessageLogin=Message page de connexion
@@ -1415,7 +1415,7 @@ NumberingModules=Modèles de numérotation
 DocumentModules=Modèles de documents
 ##### Module password generation
 PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : %s caractères contenant des nombres et des caractères partagés.
-PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement. 
+PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement.
 PasswordGenerationPerso=Renvoie un mot de passe en fonction d'une configuration personnalisée.
 SetupPerso=Selon votre configuration
 PasswordPatternDesc=Description du masque du mot de passe
@@ -1425,8 +1425,8 @@ DisableForgetPasswordLinkOnLogonPage=Cacher le lien "Mot de passe oublié" sur l
 UsersSetup=Configuration du module utilisateurs
 UserMailRequired=Email requis pour créer un nouvel utilisateur
 UserHideInactive=Masquer les utilisateurs inactifs sur toutes les listes déroulantes d'utilisateurs (non recommandé: cela peut signifier que vous ne pourrez pas filtrer ou rechercher les anciens utilisateurs sur certaines pages)
-UserHideExternal=Masquer les utilisateurs externes (non liés à un tiers) sur toutes les listes déroulantes d'utilisateurs (non recommandé: cela peut signifier que vous ne pourrez pas filtrer ou rechercher les utilisateurs externes sur certaines pages)
-UserHideNonEmployee=Masquer les utilisateurs externes (non salariés) sur toutes les listes déroulantes d'utilisateurs (non recommandé: cela peut signifier que vous ne pourrez pas filtrer ou rechercher les utilisateurs non salariés sur certaines pages)
+UserHideExternal=Masquer les utilisateurs externes (non liés à un tiers) de toutes les listes combinées d'utilisateurs (Non recommandé : cela peut signifier que vous ne pourrez pas filtrer ou rechercher des utilisateurs externes sur certaines pages)
+UserHideNonEmployee=Masquer les utilisateurs non-employés de toutes les listes combinées d'utilisateurs (Non recommandé : cela peut signifier que vous ne pourrez pas filtrer ou rechercher les utilisateurs non-employés sur certaines pages)
 UsersDocModules=Modèles de documents pour les documents générés à partir de la fiche utilisateur
 GroupsDocModules=Modèles de documents pour les documents générés à partir de la fiche d'un groupe
 ##### HRM setup #####
@@ -1499,7 +1499,7 @@ OrdersNumberingModules=Modèles de numérotation des commandes
 OrdersModelModule=Modèles de document des commandes
 FreeLegalTextOnOrders=Mention complémentaire sur les commandes
 WatermarkOnDraftOrders=Filigrane sur les brouillons de commandes (aucun si vide)
-ShippableOrderIconInList=Ajouter une icône dans la liste des commandes qui indique si la commande est expédiable.  
+ShippableOrderIconInList=Ajouter une icône dans la liste des commandes qui indique si la commande est expédiable.
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Demander le compte bancaire cible durant la commande
 ##### Interventions #####
 InterventionsSetup=Configuration du module Interventions
@@ -1691,7 +1691,7 @@ TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible
 DefaultValuesDesc=Vous pouvez définir/forcer ici la valeur par défaut que vous voulez obtenir lorsque vous créez un nouvel enregistrement, et/ou les filtres par défaut ou ordre de tri des listes.
 DefaultCreateForm=Valeurs par défaut (sur les formulaires de création)
 DefaultSearchFilters=Filtres de recherche par défaut
-DefaultSortOrder=Ordre de tri par défaut 
+DefaultSortOrder=Ordre de tri par défaut
 DefaultFocus=Champs par défaut ayant le focus
 DefaultMandatory=Champs de formulaire obligatoires
 ##### Products #####
@@ -1912,7 +1912,7 @@ ChequeReceiptsNumberingModule=Module de numérotation des bordereaux de remises
 MultiCompanySetup=Configuration du module Multi-société
 ##### Suppliers #####
 SuppliersSetup=Configuration du module Fournisseurs
-SuppliersCommandModel=Modèle de commande fournisseur complet 
+SuppliersCommandModel=Modèle de commande fournisseur complet
 SuppliersCommandModelMuscadet=Modèle de commande fournisseur complet (ancienne implémentation du modèle Cornas)
 SuppliersInvoiceModel=Modèle de facture fournisseur complet
 SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
@@ -1947,7 +1947,7 @@ NbMajMin=Nombre minimal de caractères majuscules
 NbNumMin=Nombre minimal de caractères numériques
 NbSpeMin=Nombre minimal de caractères spéciaux
 NbIteConsecutive=Nombre maximal de répétition des mêmes caractères
-NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique 
+NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique
 SalariesSetup=Configuration du module salaires
 SortOrder=Ordre de tri
 Format=Format
@@ -1968,7 +1968,7 @@ GoOntoContactCardToAddMore=Rendez-vous sur l'onglet "Notifications" d'un tiers p
 Threshold=Seuil
 BackupDumpWizard=Assistant pour créer le fichier dump de la base de données
 BackupZipWizard=Assistant pour générer l'archive du répertoire documents
-SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
+SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante :
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est une processus manuel que seul un utilisateur ayant des droits privilégiés peut réaliser.
 InstallModuleFromWebHasBeenDisabledContactUs=L'installation ou le développement de modules externes ou de sites Web dynamiques, à partir de l'application, est actuellement verrouillé pour des raisons de sécurité. Veuillez nous contacter si vous avez besoin d'activer cette fonctionnalité.
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrateur. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
@@ -2430,7 +2430,16 @@ TryToKeepOnly=Essayez de ne conserver que %s
 RecommendedForProduction=Recommandé pour la production
 RecommendedForDebug=Recommandé pour le débogage
 UrlPublicInterfaceLabelAdmin=URL alternative pour l'interface publique
-UrlPublicInterfaceHelpAdmin=Il est possible de définir un alias vers le serveur et de rendre ainsi l'interface publique accessible avec une autre URL (le serveur doit agir comme un proxy sur cette nouvelle URL)
-ExportUseForce=Use the parameter -f
-ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
-CustomPrompt=Custom prompts
+UrlPublicInterfaceHelpAdmin=Il est possible de définir un alias vers le serveur web et ainsi rendre l'interface publique accessible avec une autre URL (le serveur hôte virtuel doit agir comme un proxy sur l'URL standard)
+ExportUseForce=Utilisez le paramètre -f
+ExportUseForceHelp=Forcer la poursuite de l'exportation même en cas d'erreur (La sauvegarde peut ne pas être fiable)
+CustomPrompt=Instructions personnalisées
+AiDescription=Fonctionnalités d'IA (Intelligence Artificielle)
+AiDescriptionLong=Fournit des fonctionnalités d'IA (Intelligence Artificielle) dans différentes parties de l'application. Besoin d'une API d'IA externe.
+AI_KEY_API_CHATGPT= Clé pour l'API ChatGPT
+AiSetup=Configuration du module d'IA
+AiCustomPrompt=Instructions personnalisées pour l'IA
+AI_CONFIGURATIONS_PROMPT=Instruction personnalisée
+ImageGeneration=Génération d'image
+AIPromptForFeatures=Instructions personnalisées de l'IA pour les fonctionnalités
+EnterAnIP=Entrez une adresse IP
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 4d031f398d7..2c858536528 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -101,7 +101,7 @@ PRODUCT_MODIFYInDolibarr=Produit %s modifié
 PRODUCT_DELETEInDolibarr=Produit%ssupprimé
 HOLIDAY_CREATEInDolibarr=Demande de congé %s créée
 HOLIDAY_MODIFYInDolibarr=Demande de congé %s modifiée
-HOLIDAY_APPROVEInDolibarr=Demande de congé %s approuvée 
+HOLIDAY_APPROVEInDolibarr=Demande de congé %s approuvée
 HOLIDAY_VALIDATEInDolibarr=Demande de congé %s validée
 HOLIDAY_DELETEInDolibarr=Demande de congé %s supprimée
 EXPENSE_REPORT_CREATEInDolibarr=Note de frais %s créée
@@ -201,4 +201,4 @@ AppointmentDuration = Durée du rendez-vous : %s
 BookingSuccessfullyBooked=Votre réservation a été enregistrée
 BookingReservationHourAfter=Nous confirmons la réservation de votre rendez-vous à la date %s
 BookcalBookingTitle=Rendez-vous en ligne
-Transparency = Transparency
+Transparency = Transparence
diff --git a/htdocs/langs/fr_FR/assets.lang b/htdocs/langs/fr_FR/assets.lang
index a03327da420..82053c3ba3b 100644
--- a/htdocs/langs/fr_FR/assets.lang
+++ b/htdocs/langs/fr_FR/assets.lang
@@ -22,26 +22,26 @@ AccountancyCodeDepreciationAsset=Code comptable (compte d'amortissement)
 AccountancyCodeDepreciationExpense=Code comptable (compte de charges d'amortissement)
 AssetsLines=Immobilisations
 DeleteType=Supprimer
-DeleteAnAssetType=Supprimer un modèle d'actif
-ConfirmDeleteAssetType=Voulez-vous vraiment supprimer ce modèle d'actif ?
+DeleteAnAssetType=Supprimer un modèle d'immobilisation
+ConfirmDeleteAssetType=Êtes-vous sûr de vouloir supprimer ce modèle d'immobilisation ?
 ShowTypeCard=Afficher le modèle '%s'
 
 # Module label 'ModuleAssetsName'
 ModuleAssetsName=Immobilisations
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc=Module pour suivre vos immobilisations
+ModuleAssetsDesc=Module de suivi des immobilisations
 
 #
 # Admin page
 #
 AssetSetup=Configuration du module immobilisations
-AssetSetupPage=Page de configuration des actifs
-ExtraFieldsAssetModel=Attributs complémentaires (modèle d'Asset)
+AssetSetupPage=Page de configuration des immobilisations
+ExtraFieldsAssetModel=Attributs complémentaires (modèle d'immobilisation)
 
-AssetsType=Modèle d'actif
-AssetsTypeId=ID du modèle d'actif
-AssetsTypeLabel=Libellé du modèle d'actif
-AssetsTypes=Modèles d'actifs
+AssetsType=Modèle d'immobilisation
+AssetsTypeId=ID du modèle d'immobilisation
+AssetsTypeLabel=Libellé du modèle d'immobilisation
+AssetsTypes=Modèles d'immobilisation
 ASSET_ACCOUNTANCY_CATEGORY=Groupe de comptabilité des immobilisations
 
 #
@@ -49,15 +49,15 @@ ASSET_ACCOUNTANCY_CATEGORY=Groupe de comptabilité des immobilisations
 #
 MenuAssets=Immobilisations
 MenuNewAsset=Nouvelle immobilisation
-MenuAssetModels=Actifs du modèle
+MenuAssetModels=Modèles d'immobilisation
 MenuListAssets=Liste
-MenuNewAssetModel=Nouveau modèle d'actif
+MenuNewAssetModel=Nouveau modèle d'immobilisation
 MenuListAssetModels=Liste
 
 #
 # Module
 #
-ConfirmDeleteAsset=Voulez-vous vraiment supprimer cet élément ?
+ConfirmDeleteAsset=Êtes-vous sûr de vouloir supprimer cette immobilisation ?
 
 #
 # Tab
@@ -78,23 +78,23 @@ AssetReversalDate=Date d'annulation
 AssetDateAcquisition=Date d'achat
 AssetDateStart=Date de démarrage
 AssetAcquisitionType=Type d'acquisition
-AssetAcquisitionTypeNew=Nouveau type
-AssetAcquisitionTypeOccasion=Utilisé
-AssetType=Type d'actif
-AssetTypeIntangible=Intangible
-AssetTypeTangible=Tangible
+AssetAcquisitionTypeNew=Neuve
+AssetAcquisitionTypeOccasion=Occasion
+AssetType=Type d'immobilisation
+AssetTypeIntangible=Incorporelle
+AssetTypeTangible=Corporelle
 AssetTypeInProgress=En cours
-AssetTypeFinancial=Financier
-AssetNotDepreciated=Non amorti
-AssetDisposal=Disposition
-AssetConfirmDisposalAsk=Êtes-vous sûr de vouloir céder l'actif <b> %s </b> ?
-AssetConfirmReOpenAsk=Voulez-vous vraiment rouvrir l'actif <b> %s </b> ?
+AssetTypeFinancial=Financière
+AssetNotDepreciated=Non amortissable
+AssetDisposal=Cession
+AssetConfirmDisposalAsk=Êtes-vous sûr de vouloir céder l'immobilisation <b> %s </b> ?
+AssetConfirmReOpenAsk=Êtes-vous sûr de vouloir rouvrir l'immobilisation <b> %s </b> ?
 
 #
 # Asset status
 #
 AssetInProgress=En cours
-AssetDisposed=Disposé
+AssetDisposed=Cédée
 AssetRecorded=Comptabilisé
 
 #
@@ -102,85 +102,84 @@ AssetRecorded=Comptabilisé
 #
 AssetDisposalDate=Date de cession
 AssetDisposalAmount=Valeur de cession
-AssetDisposalType=Type d'élimination
+AssetDisposalType=Type de cession
 AssetDisposalDepreciated=Amortir l'année du transfert
 AssetDisposalSubjectToVat=Cession soumise à TVA
 
 #
 # Asset model
 #
-AssetModel=Modèle d'actif
-AssetModels=Modèles d'actifs
+AssetModel=Modèle d'immobilisation
+AssetModels=Modèles des immobilisations
 
 #
 # Asset depreciation options
 #
 AssetDepreciationOptionEconomic=Amortissement économique
-AssetDepreciationOptionAcceleratedDepreciation=Amortissement accéléré (impôt)
+AssetDepreciationOptionAcceleratedDepreciation=Dérogatoire (fiscal)
 AssetDepreciationOptionDepreciationType=Type d'amortissement
 AssetDepreciationOptionDepreciationTypeLinear=Linéaire
 AssetDepreciationOptionDepreciationTypeDegressive=Dégressif
 AssetDepreciationOptionDepreciationTypeExceptional=Exceptionnel
-AssetDepreciationOptionDegressiveRate=Tarif dégressif
-AssetDepreciationOptionAcceleratedDepreciation=Amortissement accéléré (impôt)
+AssetDepreciationOptionDegressiveRate=Coefficient dégressif
 AssetDepreciationOptionDuration=Durée
-AssetDepreciationOptionDurationType=Tapez la durée
+AssetDepreciationOptionDurationType=Type de durée
 AssetDepreciationOptionDurationTypeAnnual=Annuel
 AssetDepreciationOptionDurationTypeMonthly=Mensuel
-AssetDepreciationOptionDurationTypeDaily=du quotidien
+AssetDepreciationOptionDurationTypeDaily=Journalier
 AssetDepreciationOptionRate=Taux (%%)
-AssetDepreciationOptionAmountBaseDepreciationHT=Base d'amortissement (hors TVA)
-AssetDepreciationOptionAmountBaseDeductibleHT=Base déductible (hors TVA)
-AssetDepreciationOptionTotalAmountLastDepreciationHT=Montant total dernier amortissement (hors TVA)
+AssetDepreciationOptionAmountBaseDepreciationHT=Base amortissable (HT)
+AssetDepreciationOptionAmountBaseDeductibleHT=Base déductible (HT)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Cumul amortissement N-1 (HT)
 
 #
 # Asset accountancy codes
 #
 AssetAccountancyCodeDepreciationEconomic=Amortissement économique
-AssetAccountancyCodeAsset=Immobilisations
-AssetAccountancyCodeDepreciationAsset=Dépréciation
-AssetAccountancyCodeDepreciationExpense=La charge d'amortissement
-AssetAccountancyCodeValueAssetSold=Valeur de l'actif cédé
-AssetAccountancyCodeReceivableOnAssignment=A recevoir sur cession
-AssetAccountancyCodeProceedsFromSales=Produit de la cession
+AssetAccountancyCodeAsset=Immobilisation
+AssetAccountancyCodeDepreciationAsset=Amortissement
+AssetAccountancyCodeDepreciationExpense=Dotation
+AssetAccountancyCodeValueAssetSold=Valeur comptable immobilisation cédée
+AssetAccountancyCodeReceivableOnAssignment=Créance sur cession
+AssetAccountancyCodeProceedsFromSales=Produit de cession
 AssetAccountancyCodeVatCollected=TVA collectée
-AssetAccountancyCodeVatDeductible=TVA récupérée sur les actifs
-AssetAccountancyCodeDepreciationAcceleratedDepreciation=Amortissement accéléré (impôt)
+AssetAccountancyCodeVatDeductible=TVA récupérée sur immobilisation
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Amortissement dérogatoire (fiscal)
 AssetAccountancyCodeAcceleratedDepreciation=Compte
 AssetAccountancyCodeEndowmentAcceleratedDepreciation=La charge d'amortissement
-AssetAccountancyCodeProvisionAcceleratedDepreciation=Reprise/Fourniture
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Reprise/Provision
 
 #
 # Asset depreciation
 #
-AssetBaseDepreciationHT=Base d'amortissement (hors TVA)
+AssetBaseDepreciationHT=Base d'amortissement (HT)
 AssetDepreciationBeginDate=Début de l'amortissement le
 AssetDepreciationDuration=Durée
 AssetDepreciationRate=Taux (%%)
 AssetDepreciationDate=Date d'amortissement
-AssetDepreciationHT=Amortissement (hors TVA)
-AssetCumulativeDepreciationHT=Amortissements cumulés (hors TVA)
-AssetResidualHT=Valeur résiduelle (hors TVA)
-AssetDispatchedInBookkeeping=Amortissement enregistré
-AssetFutureDepreciationLine=Amortissement futur
-AssetDepreciationReversal=Renversement
+AssetDepreciationHT=Amortissement (HT)
+AssetCumulativeDepreciationHT=Cumul de l'amortissement (HT)
+AssetResidualHT=Valeur résiduelle (HT)
+AssetDispatchedInBookkeeping=Amortissement comptabilisé
+AssetFutureDepreciationLine=Future amortissement
+AssetDepreciationReversal=Reprise
 
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=L'identifiant de l'élément ou du son du modèle n'a pas été fourni
-AssetErrorFetchAccountancyCodesForMode=Erreur lors de la récupération des comptes comptables pour le mode d'amortissement '%s'
-AssetErrorDeleteAccountancyCodesForMode=Erreur lors de la suppression des comptes comptables du mode d'amortissement '%s'
-AssetErrorInsertAccountancyCodesForMode=Erreur lors de l'insertion des comptes comptables du mode d'amortissement '%s'
-AssetErrorFetchDepreciationOptionsForMode=Erreur lors de la récupération des options pour le mode d'amortissement '%s'
-AssetErrorDeleteDepreciationOptionsForMode=Erreur lors de la suppression des options de mode d'amortissement '%s'
-AssetErrorInsertDepreciationOptionsForMode=Erreur lors de l'insertion des options de mode d'amortissement '%s'
+AssetErrorAssetOrAssetModelIDNotProvide=L'identifiant de l'immobilisation ou du modèle trouvé n'a pas été fourni
+AssetErrorFetchAccountancyCodesForMode=Erreur lors de la récupération des comptes comptables pour le modèle d'immobilisation  '%s'
+AssetErrorDeleteAccountancyCodesForMode=Erreur lors de la suppression des comptes comptables pour le modèle d'immobilisation '%s'
+AssetErrorInsertAccountancyCodesForMode=Erreur lors de l'insertion des comptes comptables pour le modèle d'immobilisation '%s'
+AssetErrorFetchDepreciationOptionsForMode=Erreur lors de la récupération des options pour le modèle d'immobilisation '%s'
+AssetErrorDeleteDepreciationOptionsForMode=Erreur lors de la suppression des options pour le modèle d'immobilisation '%s'
+AssetErrorInsertDepreciationOptionsForMode=Erreur lors de l'insertion des options pour le modèle d'immobilisation '%s'
 AssetErrorFetchDepreciationLines=Erreur lors de la récupération des lignes d'amortissement enregistrées
-AssetErrorClearDepreciationLines=Erreur lors de la purge des lignes d'amortissement comptabilisées (extourne et future)
+AssetErrorClearDepreciationLines=Erreur lors de la purge des lignes d'amortissement comptabilisées (reprise et future)
 AssetErrorAddDepreciationLine=Erreur lors de l'ajout d'une ligne d'amortissement
 AssetErrorCalculationDepreciationLines=Erreur lors du calcul des lignes d'amortissement (reprise et future)
-AssetErrorReversalDateNotProvidedForMode=La date de renversement n'est pas fournie pour la méthode d'amortissement '%s'
-AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=La date d'annulation doit être supérieure ou égale au début de l'exercice en cours pour la méthode d'amortissement '%s'
-AssetErrorReversalAmountNotProvidedForMode=Le montant de la contrepassation n'est pas fourni pour le mode d'amortissement '%s'.
-AssetErrorFetchCumulativeDepreciation=Erreur lors de la récupération du montant de l'amortissement cumulé à partir de la ligne d'amortissement
+AssetErrorReversalDateNotProvidedForMode=La date de reprise n'est pas fournie pour le modèle d'immobilisation '%s'
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=La date de reprise doit être supérieure ou égale au début de l'exercice fiscal en cours pour le modèle d'immobilisation '%s'
+AssetErrorReversalAmountNotProvidedForMode=Le montant de la reprise n'est pas fourni pour le modèle d'immobilisation '%s'.
+AssetErrorFetchCumulativeDepreciation=Erreur lors de la récupération du montant de l'amortissement cumulé de la ligne d'amortissement
 AssetErrorSetLastCumulativeDepreciation=Erreur lors de l'enregistrement du dernier montant d'amortissement cumulé
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index de5ce64620e..5d0e1a3b246 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -93,9 +93,9 @@ CodePaymentMode=Mode de règlement (code)
 LabelPaymentMode=Mode de règlement (libellé)
 PaymentModeShort=Mode règlement
 PaymentTerm=Condition de règlement
-IdPaymentTerm=Payment term (id)
-CodePaymentTerm=Payment term (code)
-LabelPaymentTerm=Payment term (label)
+IdPaymentTerm=Terme de paiement (id)
+CodePaymentTerm=Terme de paiement (code)
+LabelPaymentTerm=Terme de paiement (étiquette)
 PaymentConditions=Conditions de règlement
 PaymentConditionsShort=Conditions de règlement
 PaymentAmount=Montant règlement
@@ -118,7 +118,7 @@ SearchASupplierInvoice=Rechercher une facture fournisseur
 CancelBill=Annuler une facture
 SendRemindByMail=Envoyer une relance par email
 DoPayment=Saisir règlement
-DoPaymentBack=Saisir remboursement 
+DoPaymentBack=Saisir remboursement
 ConvertToReduc=Marquer comme crédit disponible
 ConvertExcessReceivedToReduc=Convertir le trop-perçu en crédit disponible
 ConvertExcessPaidToReduc=Convertir le trop-payé en crédit disponible
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index fbdaac91f65..5238503b35f 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -105,10 +105,10 @@ ControlCashOpening=Ouvrez la fenêtre contextuelle "Contrôle de caisse" lors de
 CloseCashFence=Fermeture de caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
-MainPrinterToUseMore=empty means the browser printer system
+MainPrinterToUseMore=vide signifie le système d'impression du navigateur
 OrderPrinterToUse=Imprimante à utiliser
 MainTemplateToUse=Modèle principal à utiliser
-MainTemplateToUseMore=when not using browser printing system
+MainTemplateToUseMore=quand on n'utilise pas le système d'impression du navigateur
 OrderTemplateToUse=Modèle de commande à utiliser
 BarRestaurant=Bar Restaurant
 AutoOrder=Commande par le client lui même
@@ -154,5 +154,5 @@ LineDiscount=Remise de ligne
 LineDiscountShort=Remise ligne
 InvoiceDiscount=Remise facture
 InvoiceDiscountShort=Remise fac.
-TestPrinterDesc=The server will send a simple test page to a ESC/POS printer
-TestPrinterDesc2=The server will send an enhanced test page with image and barcode to a ESC/POS printer
+TestPrinterDesc=Le serveur enverra une simple page de test à l'imprimante ESC/POS.
+TestPrinterDesc2=Le serveur enverra une page de test améliorée avec une image et un code-barre à l'imprimante ESC/POS
diff --git a/htdocs/langs/fr_FR/datapolicy.lang b/htdocs/langs/fr_FR/datapolicy.lang
index 043a8809540..dd6377694aa 100644
--- a/htdocs/langs/fr_FR/datapolicy.lang
+++ b/htdocs/langs/fr_FR/datapolicy.lang
@@ -23,7 +23,7 @@ Module4100Desc = Module de gestion de la confidentialité des données (conformi
 #
 datapolicySetup = Configuration de la politique de confidentialité des données du module
 Deletion = Suppression de données
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+datapolicySetupPage = En fonction des législations de vos pays (Exemple <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external"> Article 5 </a> du RGPD), les données personnelles doivent être conservées pendant une durée n'excédant pas celle nécessaire aux finalités pour lesquelles elles ont été collectées, sauf à des fins d'archivage. <br> La suppression se fera automatiquement après une certaine durée sans événement (la durée que vous aurez indiquée ci-dessous).
 NB_MONTHS = %s mois
 ONE_YEAR = 1 an
 NB_YEARS = %s ans
@@ -40,16 +40,16 @@ DATAPOLICY_CONTACT_FOURNISSEUR = Fournisseur
 DATAPOLICY_ADHERENT = Adhérent
 DATAPOLICY_Tooltip_SETUP = Type de contact - Indiquez vos choix pour chaque type.
 DATAPOLICYMail = Configuration des e-mails
-DATAPOLICYSUBJECTMAIL = Subject of the email
+DATAPOLICYSUBJECTMAIL = Objet du courriel
 DATAPOLICYCONTENTMAIL = Contenu de l'e-mail
 DATAPOLICYSUBSITUTION = Vous pouvez utiliser les variables suivantes dans votre email (LINKACCEPT permet de créer un lien enregistrant l'accord de la personne, LINKREFUSED permet d'enregistrer le refus de la personne) :
 DATAPOLICYACCEPT = Message après accord
-DATAPOLICYREFUSE = Message after disagreement
+DATAPOLICYREFUSE = Message après désaccord
 SendAgreementText = Vous pouvez envoyer un e-mail RGPD à tous vos contacts concernés (qui n'ont pas encore reçu d'e-mail et pour lesquels vous n'avez rien enregistré concernant leur accord RGPD). Pour ce faire, utilisez le bouton suivant.
 SendAgreement = Envoyer des emails
 AllAgreementSend = Tous les e-mails ont été envoyés
 TXTLINKDATAPOLICYACCEPT = Texte pour le lien "accord"
-TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+TXTLINKDATAPOLICYREFUSE = Texte pour le lien "désaccord"
 
 
 #
@@ -57,8 +57,8 @@ TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
 #
 DATAPOLICY_BLOCKCHECKBOX = RGPD : Traitement des données personnelles
 DATAPOLICY_consentement = Consentement obtenu pour le traitement des données personnelles
-DATAPOLICY_opposition_traitement = Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes to the processing of his personal data for the purposes of prospecting
+DATAPOLICY_opposition_traitement = S'oppose au traitement de ses données personnelles
+DATAPOLICY_opposition_prospection = S'oppose au traitement de ses données personnelles à des fins de prospection
 
 #
 # Popup
@@ -78,11 +78,11 @@ DATAPOLICY_PORTABILITE_CONFIRMATION = Vous souhaitez exporter les données perso
 #
 ANONYMISER_AT = Anonymisé le %s
 
-DATAPOLICY_date = Date of agreement/disagreement GDPR
-DATAPOLICY_send = Date agreement email sent
+DATAPOLICY_date = Date d'accord/désaccord RGPD
+DATAPOLICY_send = Date d'envoi de l'e-mail d'accord
 DATAPOLICY_SEND = Envoyer un e-mail RGPD
 MailSent = L'email a été envoyé
 
 # ERROR
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of months before deletion
+=Suite à un problème technique, nous n'avons pas pu enregistrer votre choix. Nous nous en excusons. Contactez-nous pour nous faire part de votre choix.
+NUMBER_MONTH_BEFORE_DELETION = Nombre de mois avant la suppression
diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
index 617877bcf73..af8e14613d8 100644
--- a/htdocs/langs/fr_FR/donations.lang
+++ b/htdocs/langs/fr_FR/donations.lang
@@ -31,8 +31,7 @@ DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés
 DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés
 DONATION_ART978=Afficher article 978 du CGI si vous êtes concernés
 DonationPayment=Paiement du don
+DonationPayments=Paiement du don
 DonationValidated=Don %s validé
-
 DonationUseThirdparties=Utiliser un tiers existant comme coordonnées du donateur
 DonationsStatistics=Statistiques des dons
-
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 70aa3479b8d..8abb5564d03 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -8,7 +8,7 @@ ErrorBadEMail=L'email %s est invalide
 ErrorBadMXDomain=L'email %s semble incorrect (domaine n'a pas d'enregistrement MX valide)
 ErrorBadUrl=L'URL '%s' est invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
+ErrorRefAlreadyExists=Référence <b>%s</b> utilisée pour la création existe déjà.
 ErrorTitleAlreadyExists=Le titre <b>%s</b> existe déjà
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
@@ -137,7 +137,7 @@ ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux nég
 ErrorFieldCantBeNegativeOnInvoice=Le champ <strong> %s </strong> ne peut pas être négatif sur ce type de facture. Si vous devez ajouter une ligne de remise, créez d'abord la remise (à partir du champ '%s' dans la fiche du tiers) et appliquez-la à la facture.
 ErrorLinesCantBeNegativeForOneVATRate=Le total des lignes (HT) ne peut pas être négatif pour un taux de TVA non null donné (Un total négatif pour le taux de <b>%s</b>%% a été trouvé).
 ErrorLinesCantBeNegativeOnDeposits=Les lignes ne peuvent pas être négatives dans un acompte. Si vous le faites, vous rencontrerez des problèmes lorsque vous devrez consommer l'acompte dans la facture finale.
-ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients 
+ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients
 ErrorWebServerUserHasNotPermission=Le compte d'exécution du serveur web <b>%s</b> n'a pas les permissions pour cela
 ErrorNoActivatedBarcode=Aucun type de code-barres activé
 ErrUnzipFails=Impossible de décompresser le fichier %s avec ZipArchive
@@ -171,7 +171,7 @@ ErrorPriceExpression5=Unexpected '%s'
 ErrorPriceExpression6=Nombre incorrect d'arguments (%s donné,%s attendu)
 ErrorPriceExpression8=Operateur '%s' non attendu
 ErrorPriceExpression9=Une erreur inattendue s'est produite
-ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s' 
+ErrorPriceExpression10=Il manque l'opérande à l'opérateur '%s'
 ErrorPriceExpression11=Attendu '%s'
 ErrorPriceExpression14=Division par zéro
 ErrorPriceExpression17=Variable '%s' non définie
@@ -245,7 +245,7 @@ ErrorHostMustNotStartWithHttp=L'URL %s ne doit PAS commencer par http:// ou http
 ErrorNewRefIsAlreadyUsed=Erreur, la nouvelle référence est déjà utilisée
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erreur, supprimer le paiement lié à une facture clôturée n'est pas possible.
 ErrorSearchCriteriaTooSmall=Critère de recherche trop petit.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Les objets doivent avoir le statut 'Actif' pour être désactivés 
+ErrorObjectMustHaveStatusActiveToBeDisabled=Les objets doivent avoir le statut 'Actif' pour être désactivés
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Les objets doivent avoir le statut 'Brouillon' ou 'Désactivé' pour être activés
 ErrorNoFieldWithAttributeShowoncombobox=Aucun champ n'a la propriété 'showoncombobox' dans la définition de l'objet '%s'. Pas moyen d'afficher la liste de cases à cocher
 ErrorFieldRequiredForProduct=Le champ '%s' est obligatoire pour le produit %s
@@ -325,7 +325,7 @@ ErrorSVGFilesNotAllowedAsLinksWithout=Les fichiers SVG ne sont pas autorisés en
 ErrorTypeMenu=Impossible d'ajouter un autre menu pour le même module sur la barre de navigation, pas encore géré
 ErrorObjectNotFound = L'objet <b>%s</b> n'est pas trouvé, veuillez vérifier votre url
 ErrorCountryCodeMustBe2Char=Le code pays doit être une chaîne de 2 caractères
-ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces
+ErrorABatchShouldNotContainsSpaces=Un numéro de lot ou de série ne doit pas contenir d'espaces
 
 ErrorTableExist=Le tableau <b> %s </b> existe déjà
 ErrorDictionaryNotFound=Dictionnaire <b> %s </b> introuvable
@@ -405,9 +405,9 @@ BadSetupOfFieldFileNotFound = Erreur mauvaise configuration du champ : Fichier i
 BadSetupOfFieldFetchNotCallable = Erreur mauvaise configuration du champ : Fetch non appelable sur la classe
 ErrorTooManyAttempts= Trop de tentatives, veuillez réessayer plus tard
 
-TotalAmountEmpty=Total Amount Empty
-FailedToFoundTheConversionRateForInvoice=Failed to found the conversion rate for invoice
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
-ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
-ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
+TotalAmountEmpty=Montant total vide
+FailedToFoundTheConversionRateForInvoice=Le taux de conversion de la facture n'a pas été trouvé
+ThisIdNotDefined=Identifiant non défini
+OperNotDefined=Méthode de paiement non définie
+ErrorThisContactXIsAlreadyDefinedAsThisType=%s est déjà défini comme contact pour ce type.
+ErrorThisGroupIsAlreadyDefinedAsThisType=Les contacts avec ce groupe sont déjà définis comme contact pour ce type.
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index 07a03bedafb..e774e113248 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Prix de l'inscription
 PriceOfRegistrationHelp=Montant à payer pour l'enregistrement d'un participant à l'événement
 PriceOfBooth=Prix d’inscription pour un stand
 PriceOfBoothHelp=Prix d’inscription pour un stand
+EventOrganizationICSLinkProject=Lien ICS pour l'événement
 EventOrganizationICSLink=Lien ICS pour les conférences
 ConferenceOrBoothInformation=Informations sur la conférence ou sur le stand
 Attendees=Participants
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 820a090b54c..58027fe5eed 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -26,7 +26,7 @@ BodyNotIn=Pas dans le Message
 ShowEMailing=Afficher emailing
 ListOfEMailings=Liste des emailings
 NewMailing=Nouvel emailing
-NewSMSing=New smsing
+NewSMSing=Nouveau smsing
 EditMailing=Éditer emailing
 ResetMailing=Ré-envoyer emailing
 DeleteMailing=Supprimer emailing
@@ -53,7 +53,7 @@ ConfirmValidMailing=Confirmez-vous la validation de l'emailing ?
 ConfirmResetMailing=Attention, en réinitialisant l'emailing <b>%s</b>, vous autorisez son émission en masse une nouvelle fois. Est-ce bien ce que vous voulez faire ?
 ConfirmDeleteMailing=Êtes-vous sûr de vouloir supprimer cet emailing ?
 NbOfUniqueEMails=Nombre d'emails uniques
-NbOfUniquePhones=No. of unique phones
+NbOfUniquePhones=Nb. de téléphones uniques
 NbOfEMails=Nb. d'emails
 TotalNbOfDistinctRecipients=Nombre de destinataires uniques
 NoTargetYet=Aucun destinataire défini (Aller sur l'onglet Destinataires)
@@ -188,7 +188,7 @@ EmailOptedOut=Le propriétaire de l'e-mail a demandé à ne plus le contacter av
 EvenUnsubscribe=Inclure les e-mails désinscrits
 EvenUnsubscribeDesc=Inclure les e-mails étant désinscrit lorsque vous sélectionnez des e-mails comme cibles. Utile pour les emails de service obligatoires par exemple.
 XEmailsDoneYActionsDone=%s e-mails pré-qualifiés, %s e-mails traités avec succès (pour %s enregistrement/actions effectuées)
-helpWithAi=Generate message from AI
-YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
-ModelTemplate=Email template
-YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
+helpWithAi=Générer un message à partir de l'IA
+YouCanMakeSomeInstructionForEmail=Vous pouvez créer des instructions pour votre e-mail (Exemple : générer une image dans un modèle d'e-mail...)
+ModelTemplate=Modèles des e-mails
+YouCanChooseAModelForYouMailContent= Vous pouvez choisir l'un des modèles proposés ou en créer un avec l'IA
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index c59614ec998..52044ce165f 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -238,11 +238,11 @@ MemberFirstname=Prénom du membre
 MemberLastname=Nom de famille du membre
 MemberCodeDesc=Code membre, unique pour tous les membres
 MemberSubscriptionStartFirstDayOf=La date de début d'adhésion correspond au premier jour de
-MemberSubscriptionStartAfter=Délai minimum avant l'entrée en vigueur de la date de début d'une cotisation hors renouvellements (exemple +3m = +3 mois, -5d = -5 jours, +1Y = +1 an) 
-SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
-ConfirmMassSubsriptionCreation=Confirm subscription creation
-ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
-XSubsriptionCreated=%s subscription(s) created
-XSubsriptionErrors=%s subscription(s) where in error
+MemberSubscriptionStartAfter=Délai minimum avant l'entrée en vigueur de la date de début d'une cotisation hors renouvellements (exemple +3m = +3 mois, -5d = -5 jours, +1Y = +1 an)
+SubscriptionLinkedToConciliatedTransaction=L'adhésion est liée à une transaction rapprochée, donc cette modification n'est pas autorisée.
+ConfirmMassSubsriptionCreation=Confirmer la création de cotisation
+ConfirmMassSubsriptionCreationQuestion=Êtes-vous sûr de vouloir créer la/les cotisation(s) %s sélectionnée(s) ?
+XSubsriptionCreated=%s cotisation(s) créée(s)
+XSubsriptionErrors=%s cotisation(s) sont en erreur
 CreateSubscription=Créer cotisation
-WarningNoComplementaryActionDone=No Complementary action on recording will be executed with this massaction
+WarningNoComplementaryActionDone=Aucune action complémentaire d'enregistrement ne sera exécutée avec cette action de masse.
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index f3f331f7dd8..fe8e0920688 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfModuleDesc=Entrez le nom du module/application à créer sans espaces
 EnterNameOfObjectDesc=Renseignez le nom de l'objet à créer, sans utiliser d'espace. Utilisez des majuscules pour séparer les termes (par exemple : MyObject, Student, Teacher...). Le fichier de classe CRUD, les pages pour lister/ajouter/modifier/supprimer l'objet et les fichiers SQL seront générés.
 EnterNameOfDictionaryDesc=Entrez le nom du dictionnaire à créer sans espaces. Utilisez des majuscules pour séparer les mots (Par exemple : MyDico...). Le fichier de classe, mais aussi le fichier SQL seront générés.
 ModuleBuilderDesc2=Chemin ou les modules sont générés/modifiés (premier répertoire pour les modules externes défini dans %s):<strong>%s</strong>
-ModuleBuilderDesc3=Modules générés/éditables trouvés : <strong>%s</strong> 
+ModuleBuilderDesc3=Modules générés/éditables trouvés : <strong>%s</strong>
 ModuleBuilderDesc4=Un module est détecté comme un 'module pour Module Builder' lorsque le fichier <strong> %s </strong> existe à la racine du répertoire du module
 NewModule=Nouveau module
 NewObjectInModulebuilder=Nouvel objet
@@ -27,7 +27,7 @@ ModuleBuilderDeschooks=Cet onglet est dédié aux points d'accroche.
 ModuleBuilderDescwidgets=Cet onglet est dédié à la gestion/construction de widgets.
 ModuleBuilderDescbuildpackage=Vous pouvez générer ici un fichier de package "prêt à distribuer" (un fichier .zip normalisé) de votre module et un fichier de documentation "prêt à distribuer". Cliquez simplement sur le bouton pour créer le paquet ou le fichier de documentation.
 EnterNameOfModuleToDeleteDesc=Vous pouvez supprimer votre module. ATTENTION: Tous les fichiers relatifs a ce module (générés ou créés manuellement) ET toutes les données et documentation seront supprimés!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
+EnterNameOfObjectToDeleteDesc=Vous pouvez supprimer un objet. ATTENTION : Tous les fichiers (générés ou créés manuellement) en rapport avec l'objet seront définitivement effacés !
 DangerZone=Zone de danger
 BuildPackage=Construire le package
 BuildPackageDesc=Vous pouvez générer un package zip de votre application afin d'être prêt à le distribuer sur n’importe quel Dolibarr. Vous pouvez également le distribuer ou le vendre sur une place de marché, comme <a href="https://www.dolistore.com">DoliStore.com</a> .
@@ -182,7 +182,7 @@ DictionaryDeleted=Dictionnaire <b> %s </b> supprimé avec succès
 PropertyModuleUpdated=La propriété <b> %s </b> a été mise à jour avec succès
 InfoForApiFile=* Lorsque vous générez fichier pour la première fois, toutes les méthodes seront créées <strong> pour chaque objet. </strong><br>* Lorsque vous cliquez sur <strong>supprimer</strong> vous supprimez simplement toutes les méthodes pour <strong>l'objet sélectionné</strong>.
 SetupFile=Page de configuration du module
-EmailingSelectors=Emails selectors
+EmailingSelectors=Sélecteurs d'e-mails
 EmailingSelectorDesc=Vous pouvez générer et modifier ici les fichiers de classe afin de fournir de nouveaux sélecteurs de cibles d'e-mail pour le module d'e-mailing de masse.
 EmailingSelectorFile=Fichier de sélection des e-mails
 NoEmailingSelector=Aucun fichier de sélection d'e-mails
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index f66e621cc4b..46a66696fd4 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -130,7 +130,7 @@ DispatchSupplierOrder=Réception de la commande fournisseur %s
 FirstApprovalAlreadyDone=Premier niveau d'approbation déjà réalisé
 SecondApprovalAlreadyDone=Deuxième niveau d'approbation déjà réalisé
 SupplierOrderReceivedInDolibarr=Commande fournisseur %s réceptionné %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
+SupplierOrderSubmitedInDolibarr=Commande fournisseur %s soumise (%s)
 SupplierOrderClassifiedBilled=Commande fournisseur %s classée facturée
 OtherOrders=Autres commandes
 SupplierOrderValidatedAndApproved=Commande fournisseur validée et approuvée : %s
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 76567aa8700..f183c1ed56f 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -3,7 +3,7 @@ SecurityCode=Code sécurité
 NumberingShort=N°
 Tools=Outils
 TMenuTools=Outils
-ToolsDesc=Cet espace regroupe divers outils non accessibles par les autres entrées du menu. <br>Tous ces outils sont accessibles depuis le menu sur le côté.. 
+ToolsDesc=Cet espace regroupe divers outils non accessibles par les autres entrées du menu. <br>Tous ces outils sont accessibles depuis le menu sur le côté..
 Birthday=Anniversaire
 BirthdayAlert=Alerte anniversaire
 BirthdayAlertOn=alerte anniversaire active
@@ -300,7 +300,7 @@ ProductsPerPopularity=Produits par popularité
 ServicesPerPopularity=Services par popularité
 PopuProp=Produits|Services par popularité dans les devis
 PopuCom=Produits|Services par popularité dans les commandes
-ProductStatistics=Statistiques Produits|Services 
+ProductStatistics=Statistiques Produits|Services
 NbOfQtyInOrders=Qté en commandes
 SelectTheTypeOfObjectToAnalyze=Sélectionner un objet pour en voir les statistiques
 
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Impossible de télécharger le fichier <b>%s</b>.
 AddFolder=Créer un dossier
 FileWasCreateFolder=Le dossier <b>%s</b> a été créé
 FTPFailedToCreateFolder=Échec de la création du dossier <b>%s</b>.
+SelectADay=Sélectionnez un jour dans le calendrier
+SelectANewDate=Sélectionnez une nouvelle date
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index 866597a5710..e8d03dc49ad 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -55,7 +55,7 @@ PartnershipDedicatedToThisMember=Partenariat dédié à cet adhérent
 DatePartnershipStart=Date de début
 DatePartnershipEnd=Date de fin
 ReasonDecline=Raison du refus
-ReasonDeclineOrCancel=Reason for refusal or cancellation
+ReasonDeclineOrCancel=Raison du refus ou de l'annulation
 PartnershipAlreadyExist=Partenariat déjà existant
 ManagePartnership=Gestion de partenariat
 BacklinkNotFoundOnPartnerWebsite=Lien de retour non trouvé sur le site web partenaire
@@ -95,4 +95,3 @@ NewPartnershipRequestDesc=Ce formulaire vous permet de demander à faire partie
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Cette page doit contenir au moins un lien vers l'un des domaines suivants: %s
 
 IPOfApplicant=IP du demandeur
-
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 9ac8174656f..b794cbde418 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -208,11 +208,6 @@ unitSET=Positionner
 unitS=Seconde
 unitH=Heure
 unitD=Jour
-unitG=Gramme
-unitM=Mètre
-unitLM=Mètre linéaire
-unitM2=Mètre carré
-unitM3=Mètre cube
 unitL=Litre
 unitT=tonne
 unitKG=Kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=livre
 unitOZ=once
 unitM=Mètre
+unitLM=Mètre linéaire
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -437,4 +433,6 @@ ModifyValueExtrafields = Modifier la valeur d'un extrafield
 OrProductsWithCategories=Ou des produits avec des tags/catégories
 WarningTransferBatchStockMouvToGlobal = Si vous souhaitez désérialiser ce produit, tout son stock sérialisé sera transformé en stock global
 WarningConvertFromBatchToSerial=Si vous disposez actuellement d'une quantité supérieure ou égale à 2 pour le produit, passer à ce choix signifie que vous aurez toujours un produit avec différents objets du même lot (alors que vous souhaitez un numéro de série unique). Le doublon restera jusqu'à ce qu'un inventaire ou un mouvement de stock manuel soit effectué pour résoudre ce problème.
+AllowStockMovementVariantParent=Enregistre également les mouvements de stock sur les produits parent des produits variants
+AllowStockMovementVariantParentHelp=Par défaut, un parent d'une variante est un produit virtuel, donc aucun stock n'est géré pour celui-ci. En activant cette option, un stock sera géré pour les produits parents et à chaque fois qu'une quantité de stock est modifiée pour une variante de produit, la même quantité sera modifiée pour le produit parent. Vous ne devriez pas avoir besoin de cette option, sauf si vous utilisez une variante pour gérer le même produit que le parent (mais avec des descriptions, des prix différents...)
 ConfirmSetToDraftInventory=Êtes-vous sûr de vouloir revenir à l'état de brouillon ?<br>Les quantités actuellement définies dans l'inventaire seront réinitialisées.
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 7b0ad57af0e..962372b874b 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -249,7 +249,7 @@ LatestProjects=Les %s derniers projets
 LatestModifiedProjects=Les %s derniers projets modifiés
 OtherFilteredTasks=Autres tâches filtrées
 NoAssignedTasks=Aucune tâche assignée (assignez un projet/tâche à l'utilisateur depuis la liste déroulante utilisateur en haut pour pouvoir saisir du temps dessus)
-ThirdPartyRequiredToGenerateIntervention=A third party must be defined on project to be able to create intervention.
+ThirdPartyRequiredToGenerateIntervention=Un tiers doit être défini sur le projet pour pouvoir créer une intervention.
 ThirdPartyRequiredToGenerateInvoice=Un tiers doit être défini sur le projet pour pouvoir le facturer.
 ChooseANotYetAssignedTask=Choisissez une tâche qui ne vous est pas encore assignée
 # Comments trans
@@ -270,7 +270,7 @@ ServiceToUseOnLines=Service à utiliser sur les lignes par défaut
 InvoiceGeneratedFromTimeSpent=La facture %s a été générée à partir du temps passé sur le projet
 InterventionGeneratedFromTimeSpent=L'intervention %s a été générée à partir du temps consacré au projet
 ProjectBillTimeDescription=Cochez si vous saisissez du temps sur les tâches du projet ET prévoyez de générer des factures à partir des temps pour facturer le client du projet (ne cochez pas si vous comptez créer une facture qui n'est pas basée sur la saisie des temps). Note: Pour générer une facture, aller sur l'onglet 'Temps consommé' du project et sélectionnez les lignes à inclure.
-ProjectFollowOpportunity=Suivre une opportunité 
+ProjectFollowOpportunity=Suivre une opportunité
 ProjectFollowTasks=Suivre des tâches ou du temps passé
 Usage=Usage
 UsageOpportunity=Utilisation: Opportunité
diff --git a/htdocs/langs/fr_FR/receiptprinter.lang b/htdocs/langs/fr_FR/receiptprinter.lang
index 89cfbd327ba..a79f0939bb1 100644
--- a/htdocs/langs/fr_FR/receiptprinter.lang
+++ b/htdocs/langs/fr_FR/receiptprinter.lang
@@ -9,8 +9,8 @@ ReceiptPrinterDesc=Réglage des imprimantes de tickets
 ReceiptPrinterTemplateDesc=Réglage des modèles
 ReceiptPrinterTypeDesc=Exemple de valeurs possibles pour le champ "Paramètres" selon le type de driver
 ReceiptPrinterProfileDesc=Description des imprimantes de tickets
-ThisFeatureIsForESCPOSPrintersOnly=This feature is for ESC/POS printers only
 ListPrinters=Liste des imprimantes
+FromServerPointOfView=Du point de vue du serveur web. Cette méthode doit être accessible depuis l'hébergeur du serveur web.
 SetupReceiptTemplate=Réglage des modèles
 CONNECTOR_DUMMY=Imprimante Test
 CONNECTOR_NETWORK_PRINT=Imprimante réseau
@@ -36,9 +36,9 @@ DOL_LINE_FEED=Passer la ligne
 DOL_ALIGN_LEFT=Texte aligner à gauche
 DOL_ALIGN_CENTER=Centrer le texte
 DOL_ALIGN_RIGHT=Texte aligner à droite
-DOL_USE_FONT_A=Utilisez la police A de l'imprimante 
-DOL_USE_FONT_B=Utilisez la police B de l'imprimante 
-DOL_USE_FONT_C=Utilisez la police C de l'imprimante 
+DOL_USE_FONT_A=Utilisez la police A de l'imprimante
+DOL_USE_FONT_B=Utilisez la police B de l'imprimante
+DOL_USE_FONT_C=Utilisez la police C de l'imprimante
 DOL_PRINT_BARCODE=Imprimer le code barre
 DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimer le code barre du client
 DOL_CUT_PAPER_FULL=Découper le ticket
diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
index 5db22aedcbd..044f23f33eb 100644
--- a/htdocs/langs/fr_FR/resource.lang
+++ b/htdocs/langs/fr_FR/resource.lang
@@ -35,5 +35,7 @@ AssetNumber=Numéro de série
 ResourceTypeCode=Code de type de ressource
 ImportDataset_resource_1=Ressources
 
-ErrorResourcesAlreadyInUse=Des ressources sont déjà occupées
-ErrorResourceUseInEvent=%s occupée dans l'événement %s
\ No newline at end of file
+ErrorResourcesAlreadyInUse=Certaines ressources sont utilisées
+ErrorResourceUseInEvent=%s utilisé dans l'événement %s
+
+MaxUsers=Utilisateurs maximum (places, sièges, etc.)
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index adb63ea6301..5dc984ebce6 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -58,10 +58,10 @@ PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %
 VirtualHostUrlNotDefined=URL du virtual host servit par le serveur web externe non défini
 NoPageYet=Pas de page pour l'instant
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet.
-SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe 
+SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span>Vous pouvez inclure du code PHP dans cette source en utilisant des balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span>Vous pouvez également inclure le contenu d'une autre page/conteneur avec la syntaxe suivante :<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span>Vous pouvez créer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque: ne pas afficher de contenu avant une redirection) :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span>Pour ajouter un lien vers une autre page, utilisez la syntaxe suivante :<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 paddingright"></span>Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire des <strong>documents</strong>, utilisez l'encapsuleur <strong>document.php</strong> : <br>Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans documents/medias (répertoire ouvert en accès public), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est la suivante :<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span>Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>documents</strong>, utilisez l'encapsuleur<strong>viewimage.php</strong>. <br>Par exemple, pour une image dans documents/medias (répertoire ouvert en accès public), la syntaxe est : <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès ouvert à l'aide de la clé de partage du fichier), la syntaxe est la suivante: <br> <strong> &lt;img src = "/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Pour obtenir l'adresse URL de l'image d'un objet PHP, utilisez<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Plus d'exemples de code HTML ou dynamique disponibles sur <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">la documentation wiki</a>.<br>
@@ -160,77 +160,77 @@ PagesViewedTotal=Pages vues (total)
 Everyone=Tout le monde
 AssignedContacts=Contacts assignés
 WebsiteTypeLabel=Type de site Internet
-WebsiteTypeDolibarrWebsite=Web site (Module WebSites CMS)
-WebsiteTypeDolibarrPortal=Native and ready to use web portal (Module Web Portal)
-WebPortalURL=Web portal URL
-NewWebsiteAccount=New accounts for websites
-ModuleWebPortalName=Web portal
-ModuleWebPortalDesc=A ready to use native web portal for customers, suppliers, partners or members
-WebPortalDescription=Public web portal module for membership and partnership
-WebPortalSetup=WebPortal setup
-WebPortalCSS=Web portal CSS
-WebPortalSetupPage=WebPortal setup page
-WEBPORTAL_TITLE=Brand name on header of public page
-UserAccountForWebPortalAreInThirdPartyTabHelp=Users accounts for WebPortal can be set on each third party card in Website accounts tab
+WebsiteTypeDolibarrWebsite=Site Internet (Module CMS Sites Internet)
+WebsiteTypeDolibarrPortal=Portail web natif et prêt à utiliser (Module Portail Web)
+WebPortalURL=URL du portail Web
+NewWebsiteAccount=Nouveaux comptes pour les sites web
+ModuleWebPortalName=Portail Web
+ModuleWebPortalDesc=Un portail web natif, prêt à l'emploi pour les clients, fournisseurs, partenaires ou adhérents
+WebPortalDescription=Module de portail web public pour l'adhésion et le partenariat
+WebPortalSetup=Configuration du portail web
+WebPortalCSS=CSS du portail web
+WebPortalSetupPage=Page de configuration du portail web
+WEBPORTAL_TITLE=Nom de la marque sur l'en-tête de la page publique
+UserAccountForWebPortalAreInThirdPartyTabHelp=Les comptes utilisateurs pour le portail web peuvent être configurés sur chaque tiers dans l'onglet des comptes du site web.
 WebPortalAccessHidden=Caché
 WebPortalAccessVisible=Visible
 WebPortalAccessEdit=Editable
-WEBPORTAL_MEMBER_CARD_ACCESS=Enable access to the membership record
-WebPortalMemberCardAccessHelp=Enable access to the membership record (Hidden / Visible or Editable)
-WEBPORTAL_PARTNERSHIP_CARD_ACCESS=Enable access to the partnership record
-WebPortalPartnerShipCardAccessHelp=Enable access to the partnership record (Hidden / Visible or Editable)
-WEBPORTAL_PROPAL_LIST_ACCESS=Enable access to the proposals
-WEBPORTAL_ORDER_LIST_ACCESS=Enable access to the orders
-WEBPORTAL_INVOICE_LIST_ACCESS=Enable access to the invoices
-WEBPORTAL_USER_LOGGED=Select an anonymous user
-WebPortalUserLoggedHelp=This user is used to update cards
-WebPortalHomeTitle=Welcome
-WebPortalHomeDesc=Welcome to the public interface
+WEBPORTAL_MEMBER_CARD_ACCESS=Autoriser l'accès au dossier des adhérents
+WebPortalMemberCardAccessHelp=Autoriser l'accès à l'enregistrement des adhérents (Caché / Visible ou Modifiable)
+WEBPORTAL_PARTNERSHIP_CARD_ACCESS=Autoriser l'accès au dossier des partenariats
+WebPortalPartnerShipCardAccessHelp=Autoriser l'accès à l'enregistrement des partenariats (Caché / Visible ou Modifiable)
+WEBPORTAL_PROPAL_LIST_ACCESS=Autoriser l'accès aux devis
+WEBPORTAL_ORDER_LIST_ACCESS=Autoriser l'accès aux commandes
+WEBPORTAL_INVOICE_LIST_ACCESS=Autoriser l'accès aux factures
+WEBPORTAL_USER_LOGGED=Sélectionnez un utilisateur anonyme
+WebPortalUserLoggedHelp=Cet utilisateur est utilisé pour mettre à jour les fiches.
+WebPortalHomeTitle=Bienvenue
+WebPortalHomeDesc=Bienvenue sur l'interface publique
 WebPortalPropalListMenu=Propositions commerciales
-WebPortalPropalListTitle=List of proposals
-WebPortalPropalListDesc=List of proposals
-WebPortalPropalListNothing=Proposals not found
+WebPortalPropalListTitle=Liste des devis
+WebPortalPropalListDesc=Liste des devis
+WebPortalPropalListNothing=Devis non trouvés
 WebPortalOrderListMenu=Commandes
 WebPortalOrderListTitle=Liste des commandes
 WebPortalOrderListDesc=Liste des commandes
-WebPortalOrderListNothing=Orders not found
+WebPortalOrderListNothing=Commandes non trouvées
 WebPortalInvoiceListMenu=Factures
-WebPortalInvoiceListTitle=List of invoices
-WebPortalInvoiceListDesc=List of invoices
-WebPortalInvoiceListNothing=Invoices not found
+WebPortalInvoiceListTitle=Liste des factures
+WebPortalInvoiceListDesc=Liste des factures
+WebPortalInvoiceListNothing=Factures non trouvées
 WebPortalMemberCardMenu=Adhérent
 WebPortalMemberCardTitle=Fiche adhérent
 WebPortalMemberCardDesc=Fiche adhérent
 WebPortalPartnershipCardMenu=Partenariat
-WebPortalPartnershipCardTitle=Partnership card
-WebPortalPartnershipCardDesc=Partnership card
-loginWebportalUserName=User name / email
+WebPortalPartnershipCardTitle=Fiche du partenariat
+WebPortalPartnershipCardDesc=Fiche du partenariat
+loginWebportalUserName=Nom d'utilisateur / email
 loginWebportalPassword=Mot de passe
-LoginNow=Login now
-RemoveSearchFilters=Remove search filters
-WEBPORTAL_PRIMARY_COLOR=Primary color
-WEBPORTAL_SECONDARY_COLOR=Secondary color
-WEBPORTAL_LOGIN_LOGO_URL=Login logo image URL
-WEBPORTAL_MENU_LOGO_URL=Menu logo image URL
-WEBPORTAL_MENU_LOGO_URLTooltip=Leave empty to use login logo
-WEBPORTAL_LOGIN_BACKGROUND=Background login image URL
-WEBPORTAL_BANNER_BACKGROUND=Background for banner
-WEBPORTAL_BANNER_BACKGROUND_IS_DARK=Use dark theme for banner
-AriaPrevPage=Previous page
-AriaNextPage=Next page
+LoginNow=Connectez-vous maintenant
+RemoveSearchFilters=Supprimer les filtres de recherche
+WEBPORTAL_PRIMARY_COLOR=Couleur primaire
+WEBPORTAL_SECONDARY_COLOR=Couleur secondaire
+WEBPORTAL_LOGIN_LOGO_URL=URL de l'image du logo de connexion
+WEBPORTAL_MENU_LOGO_URL=URL de l'image du logo du menu
+WEBPORTAL_MENU_LOGO_URLTooltip=Laissez vide pour utiliser le logo de connexion
+WEBPORTAL_LOGIN_BACKGROUND=URL de l'image de l'arrière-plan de connexion
+WEBPORTAL_BANNER_BACKGROUND=Fond pour la bannière
+WEBPORTAL_BANNER_BACKGROUND_IS_DARK=Utilisez le thème sombre pour la bannière
+AriaPrevPage=Page précédente
+AriaNextPage=Page suivante
 AriaPageX=Page %s
-WebPortalError404=Page not found
-WebPortalErrorPageNotExist=Page not exist
-WebPortalErrorFetchThirdPartyAccountFromLogin=Error when loading third-party account (login : %s)
-WebPortalErrorAuthentication=Authentication error
-WebPortalErrorFetchLoggedThirdPartyAccount=Error when loading third-party account (login : %s)
-WebPortalErrorFetchLoggedUser=Error when loading user (Id : %s)
-WebPortalErrorFetchLoggedThirdParty=Error when loading third-party (Id : %s)
-WebPortalErrorFetchLoggedMember=Error when loading member (Id : %s)
-WebPortalErrorFetchLoggedPartnership=Error when loading partnership (Third-party Id : %s, Member Id : %s)
-ExportIntoGIT=Export into sources
-WebPortalMember=Membership
-WebPortalOrder=Sale Order
+WebPortalError404=Page non trouvée
+WebPortalErrorPageNotExist=La page n'existe pas
+WebPortalErrorFetchThirdPartyAccountFromLogin=Erreur lors du chargement du compte tiers (login : %s)
+WebPortalErrorAuthentication=Erreur d'identification
+WebPortalErrorFetchLoggedThirdPartyAccount=Erreur lors du chargement du compte tiers (login : %s)
+WebPortalErrorFetchLoggedUser=Erreur lors du chargement de l'utilisateur (Id : %s)
+WebPortalErrorFetchLoggedThirdParty=Erreur lors du chargement du tiers (Id : %s)
+WebPortalErrorFetchLoggedMember=Erreur lors du chargement de l'adhérent (Id : %s)
+WebPortalErrorFetchLoggedPartnership=Erreur lors du chargement du partenariat (Identifiant tiers : %s, Identifiant adhérent : %s)
+ExportIntoGIT=Exporter dans les sources
+WebPortalMember=Adhésion
+WebPortalOrder=Commande client
 WebPortalPartnership=Partenariat
 WebPortalPropal=Proposition
 WebPortalGroupMenuAdmin=Administration
diff --git a/htdocs/langs/fr_GA/errors.lang b/htdocs/langs/fr_GA/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/fr_GA/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/fr_GA/holiday.lang b/htdocs/langs/fr_GA/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/fr_GA/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/fr_GA/languages.lang b/htdocs/langs/fr_GA/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/fr_GA/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 432e1945038..daf9a6e0315 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=Modo de pagamento (código)
 LabelPaymentMode=Modo de pagamento (etiqueta)
 PaymentModeShort=Modo de pagamento
 PaymentTerm=Condición de pagamento
+IdPaymentTerm=Condición de pagamento (id)
+CodePaymentTerm=Condición de pagamento (código)
+LabelPaymentTerm=Condición de pagamento (etiqueta)
 PaymentConditions=Condicións de pagamento
 PaymentConditionsShort=Condicións de pagamento
 PaymentAmount=Importe pagamento
@@ -245,20 +248,20 @@ AlreadyPaidBack=Xa reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Xa pago (excluidos os abonos e anticipos)
 Abandoned=Abandoada
 RemainderToPay=Resta por pagar
-RemainderToPayMulticurrency=Modea restante orixinal sen pagar 
+RemainderToPayMulticurrency=Modea restante orixinal sen pagar
 RemainderToTake=Resta por cobrar
-RemainderToTakeMulticurrency=Importe restante por coller, moeda orixinal 
+RemainderToTakeMulticurrency=Importe restante por coller, moeda orixinal
 RemainderToPayBack=Resta por reembolsar
-RemainderToPayBackMulticurrency=Importe restante por reembolsar, moeda orixinal 
-NegativeIfExcessReceived=negativo se se recibe exceso 
-NegativeIfExcessRefunded=negativo se se reembolsa o exceso 
+RemainderToPayBackMulticurrency=Importe restante por reembolsar, moeda orixinal
+NegativeIfExcessReceived=negativo se se recibe exceso
+NegativeIfExcessRefunded=negativo se se reembolsa o exceso
 NegativeIfExcessPaid=negativo se se recibe de mais
 Rest=Pendente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
-ExcessReceivedMulticurrency=Exceso recibido, moeda orixinal 
+ExcessReceivedMulticurrency=Exceso recibido, moeda orixinal
 ExcessPaid=Pagado en exceso
-ExcessPaidMulticurrency=Exceso pagado, moeda orixinal 
+ExcessPaidMulticurrency=Exceso pagado, moeda orixinal
 EscompteOffered=Desconto (Pronto pagamento)
 EscompteOfferedShort=Desconto
 SendBillRef=Envío da factura %s
@@ -281,7 +284,7 @@ DateMaxPayment=Data límite de pagamento
 DateInvoice=Data facturación
 DatePointOfTax=Impostos
 NoInvoice=Ninguna factura
-NoOpenInvoice=Non hai factura aberta 
+NoOpenInvoice=Non hai factura aberta
 NbOfOpenInvoices=Número de facturas abertas
 ClassifyBill=Clasificar a factura
 SupplierBillsToPay=Facturas de provedor pendentes de pagamento
@@ -292,7 +295,7 @@ SetMode=Definir modo de pagamento
 SetRevenuStamp=Establecer selo fiscal
 Billed=Facturado
 RecurringInvoices=Facturas recurrentes
-RecurringInvoice=Factura recurrente 
+RecurringInvoice=Factura recurrente
 RecurringInvoiceSource=Factura recorrente de orixe
 RepeatableInvoice=Padrón de factura
 RepeatableInvoices=Padrón de facturas
@@ -543,16 +546,16 @@ Cash=Efectivo
 Reported=Aprazado
 DisabledBecausePayments=Non dispoñible xa que existen pagamentos
 CantRemovePaymentWithOneInvoicePaid=Eliminación imposible cando existe alo menos unha factura clasificada como pagada.
-CantRemovePaymentVATPaid=Non se pode eliminar o pago porque a declaración do IVE está clasificada como pagada 
-CantRemovePaymentSalaryPaid=Non se pode eliminar o pago xa que o salario está clasificado como pagado 
+CantRemovePaymentVATPaid=Non se pode eliminar o pago porque a declaración do IVE está clasificada como pagada
+CantRemovePaymentSalaryPaid=Non se pode eliminar o pago xa que o salario está clasificado como pagado
 ExpectedToPay=Agardando o pagamento
 CantRemoveConciliatedPayment=Non pódese eliminar un pagamento conciliado
 PayedByThisPayment=Pagada por este pagamento
 ClosePaidInvoicesAutomatically=Clasificar como "Pagadas" as facturas, anticipos e facturas rectificativas completamente pagadas.
 ClosePaidCreditNotesAutomatically=Clasificar automáticamente como "Pagados" os abonos completamente reembolsados
 ClosePaidContributionsAutomatically=Clasificar como "Pagadas" todas as taxas fiscais ou sociais completamente pagadas
-ClosePaidVATAutomatically=Clasifique automaticamente a declaración de IVE como "Pago" cando o pagamento é feito por completo. 
-ClosePaidSalaryAutomatically=Clasifique automaticamente o salario como "Pagado" cando o pagamento é realizado por completo. 
+ClosePaidVATAutomatically=Clasifique automaticamente a declaración de IVE como "Pago" cando o pagamento é feito por completo.
+ClosePaidSalaryAutomatically=Clasifique automaticamente o salario como "Pagado" cando o pagamento é realizado por completo.
 AllCompletelyPayedInvoiceWillBeClosed=Todas as facturas cun resto a pagar 0 serán automáticamente pechadas ao estado "Pagada".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
@@ -565,10 +568,10 @@ YouMustCreateStandardInvoiceFirstDesc=Primeiro ten que crear unha factura están
 PDFCrabeDescription=Modelo PDF de factura Crabe. Un modelo de factura completo (implementación antiga do modelo Sponge)
 PDFSpongeDescription=Modelo PDF de factura Sponge. Un modelo de factura completo
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un modelo de factura completo para as facturas de situación
-TerreNumRefModelDesc1=Devolve o número no formato %s yymm-nnnn para as facturas estándar e %s yymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0 
-MarsNumRefModelDesc1=Devolve o número no formato %s yymm-nnnn para as facturas estándar, %s yymm-nnnn para as facturas rectificativas, %s yymm-nnnn para as facturas de anticipo e %s yymm-nnnn para as notas de crédito onde o ano é mm,  mm é mes e nnnn é unha número secuencial de incremento automático sen interrupción e sen retorno a 0 
+TerreNumRefModelDesc1=Devolve o número no formato %s yymm-nnnn para as facturas estándar e %s yymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0
+MarsNumRefModelDesc1=Devolve o número no formato %s yymm-nnnn para as facturas estándar, %s yymm-nnnn para as facturas rectificativas, %s yymm-nnnn para as facturas de anticipo e %s yymm-nnnn para as notas de crédito onde o ano é mm,  mm é mes e nnnn é unha número secuencial de incremento automático sen interrupción e sen retorno a 0
 TerreNumRefModelError=Xa existe unha factura que comeza con $syymm e non é compatible con este modelo de secuencia. Elimina ou renoméao para activar este módulo.
-CactusNumRefModelDesc1=Devolve un número no formato %s yymm-nnnn para as facturas estándar, %s yymm-nnnn para as notas de crédito e %s yymm-nnnn para as facturas de anticipo onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0 
+CactusNumRefModelDesc1=Devolve un número no formato %s yymm-nnnn para as facturas estándar, %s yymm-nnnn para as notas de crédito e %s yymm-nnnn para as facturas de anticipo onde aa é ano, mm é mes e nnnn é un número secuencial de incremento automático sen interrupción e sen retorno a 0
 EarlyClosingReason=Motivo de peche anticipado
 EarlyClosingComment=Nota de peche anticipado
 ##### Types de contacts #####
@@ -614,7 +617,7 @@ ToCreateARecurringInvoiceGene=Para xerar futuras facturas regularmente e manualm
 ToCreateARecurringInvoiceGeneAuto=Se precisa xerar estas facturas automaticamente, pídelle ao administrador que active e configure o módulo <strong>%s </strong>. Teña conta que os dous métodos (manual e automático) pódense empregar xuntos sen risco de duplicación.
 DeleteRepeatableInvoice=Eliminar factura modelo
 ConfirmDeleteRepeatableInvoice=¿Está certo de que quere eliminar a factura modelo?
-CreateOneBillByThird=Crear unha factura por terceiro (se non, unha factura por obxecto seleccionado) 
+CreateOneBillByThird=Crear unha factura por terceiro (se non, unha factura por obxecto seleccionado)
 BillCreated=%s factura(s) xerada
 BillXCreated=Factura %s xerada
 StatusOfGeneratedDocuments=Estado da xeración de documentos
@@ -636,7 +639,7 @@ SituationTotalProgress=Progreso total %d %%
 SearchUnpaidInvoicesWithDueDate=Procurar facturas pendentes de pagamento cunha data de vencemento= %s
 SearchValidatedInvoicesWithDate=Procurar facturas sen pagar cunha data de validación = %s
 NoPaymentAvailable=Non hai pagamento dispoñible para %s
-PaymentRegisteredAndInvoiceSetToPaid=Pagamento rexistrado e factura %s configurada como xa paga 
+PaymentRegisteredAndInvoiceSetToPaid=Pagamento rexistrado e factura %s configurada como xa paga
 SendEmailsRemindersOnInvoiceDueDate=Enviar lembranza por correo electrónico para facturas validadas e non abonadas
 MakePaymentAndClassifyPayed=Rexistro de pagamento
 BulkPaymentNotPossibleForInvoice=Non é posible o pagamento masivo para a factura %s (tipo ou estado incorrecto)
diff --git a/htdocs/langs/gl_ES/donations.lang b/htdocs/langs/gl_ES/donations.lang
index a5f441fac91..74f3ad25763 100644
--- a/htdocs/langs/gl_ES/donations.lang
+++ b/htdocs/langs/gl_ES/donations.lang
@@ -31,6 +31,7 @@ DONATION_ART200=Amosar artigo 200 do CGI se está interesado
 DONATION_ART238=Amosar artigo 238 do CGI se está interesado
 DONATION_ART978=Mostra o artigo 978 de CGI se che preocupa
 DonationPayment=Pago de doación/subvención
+DonationPayments=Pagamentos de doazóns
 DonationValidated=Doación/Subvención %s validada
 DonationUseThirdparties=Usa o enderezo dun terceiro existente como enderezo do doador
 DonationsStatistics=Estatísticas de doazóns
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index c42d8f070b0..9165967fd90 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -120,7 +120,7 @@ ErrorFailedToLoadRSSFile=Non alcanza a fonte RSS. Tente engadir a constante MAIN
 ErrorForbidden=Acceso denegado.<br> Intenta acceder a unha páxina, área ou función dun módulo desactivado ou sen estar nunha sesión autenticada ou que non está permitida ao seu usuario.
 ErrorForbidden2=O seu administrador Dolibarr pode definir o permiso para este inicio de sesión no menú %s->%s.
 ErrorForbidden3=Parece que Dolibarr non se usa a través dunha sesión autenticada. Bote unha ollada á documentación de configuración de Dolibarr para saber como xestionar as autenticacións (htaccess, mod_auth ou outro ...).
-ErrorForbidden4=Nota: borre as cookies do seu navegador para destruír as sesións existentes neste inicio de sesión. 
+ErrorForbidden4=Nota: borre as cookies do seu navegador para destruír as sesións existentes neste inicio de sesión.
 ErrorNoImagickReadimage=A clase Imagick non se atopa neste PHP. Non pode estar dispoñible ningunha vista previa. Os administradores poden desactivar esta pestana no menú Configuración-Amosar
 ErrorRecordAlreadyExists=Rexistro xa existente
 ErrorLabelAlreadyExists=Etiqueta xa existente
@@ -128,7 +128,7 @@ ErrorCantReadFile=Erro de lectura do ficheiro '%s'
 ErrorCantReadDir=Error de lectura do directorio '%s'
 ErrorBadLoginPassword=Valor incorrecto para o inicio de sesión ou o contrasinals
 ErrorLoginDisabled=A súa conta foi descativada
-ErrorFailedToRunExternalCommand=Fallou ao executar o comando externo. Comprobe que está dispoñible e executable polo usuario do servidor PHP. Comprobe tamén que a orde non está protexida a nivel de shell por unha capa de seguridade como apparmor. 
+ErrorFailedToRunExternalCommand=Fallou ao executar o comando externo. Comprobe que está dispoñible e executable polo usuario do servidor PHP. Comprobe tamén que a orde non está protexida a nivel de shell por unha capa de seguridade como apparmor.
 ErrorFailedToChangePassword=Erro ao cambiar o contrasinal
 ErrorLoginDoesNotExists=Non foi posible atopar o usuario con inicio de sesión <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuario non ten enderezo de correo electrónico. Proceso abortado.
@@ -277,15 +277,15 @@ ErrorDateIsInFuture=Erro, a data non pode ser no futuro
 ErrorAnAmountWithoutTaxIsRequired=Erro, a cantidade é obrigatoria
 ErrorAPercentIsRequired=Erro, prégase cubra a porcentaxe correctamente
 ErrorYouMustFirstSetupYourChartOfAccount=Primeiro debe configurar o seu plan de contas
-ErrorFailedToFindEmailTemplate=Fallo ao atopar o modelo co nome de código %s 
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duración non definida no servizo. Non hai forma de calcular o prezo por hora. 
+ErrorFailedToFindEmailTemplate=Fallo ao atopar o modelo co nome de código %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duración non definida no servizo. Non hai forma de calcular o prezo por hora.
 ErrorActionCommPropertyUserowneridNotDefined=É preciso o supervisor do usuario
 ErrorActionCommBadType=O tipo de evento seleccionado (id: %s, código: %s) non existe no dicionario de tipo de evento
 CheckVersionFail=Fallou a comprobación da versión
 ErrorWrongFileName=O nome do ficheiro non pode conte  __SOMETHING__ nel
-ErrorNotInDictionaryPaymentConditions=Non está no Dicionario de Condicións de Pagamento. Modifíqueo. 
+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" 
+ErrorExecIdFailed=Non se pode executar o comando "id"
 ErrorBadCharIntoLoginName=Carácter non autorizado no campo %s
 ErrorRequestTooLarge=Erro, solicitude demasiado grande ou sesión caducada
 ErrorNotApproverForHoliday=No es o que aproba a baixa %s
@@ -323,9 +323,9 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Erro: o URL da súa in
 ErrorMenuExistValue=Xa existe un menú con este título ou URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Os ficheiros SVG non están permitidos como ligazóns externas sen a opción %s
 ErrorTypeMenu=Imposible engadir outro menú para o mesmo módulo na barra de navegación, aínda non operativo
-ErrorObjectNotFound = O obxecto <b>%s </b> non se atopa, <span class='notranslate'>Revise o seu URL
+ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
 ErrorCountryCodeMustBe2Char=O código de país debe ser unha cadea de 2 caracteres
-ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces
+ErrorABatchShouldNotContainsSpaces=Un número de lote ou de serie non debe conter espazos
 
 ErrorTableExist=A táboa <b> %s </b> xa existe
 ErrorDictionaryNotFound=Non se atopou o dicionario <b> %s </b>
@@ -365,7 +365,7 @@ WarningTheHiddenOptionIsOn=Aviso, a opción oculta <b>%s</b> está activa.
 WarningCreateSubAccounts=Aviso, non pode crear directamente unha subconta, debe crear un terceiro ou un usuario e asignarlles un código contable para atopalos nesta listaxe
 WarningAvailableOnlyForHTTPSServers=Dispoñible só se usa conexión segura HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Non foi activado o módulo %s . Pode que perda moitos eventos aquí
-WarningPaypalPaymentNotCompatibleWithStrict=O valor "Estricto" fai que as funcións de pago en liña non funcionen correctamente. Use "Laxo" no seu lugar. 
+WarningPaypalPaymentNotCompatibleWithStrict=O valor "Estricto" fai que as funcións de pago en liña non funcionen correctamente. Use "Laxo" no seu lugar.
 WarningThemeForcedTo=Aviso, o tema foi forzado a <b> %s </b> pola constante oculta MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Aviso, isto tamén eliminará todas as páxinas/contedores existentes do sitio web. Debería exportar o seu sitio web antes, para ter unha copia de seguridade e poder  importalo de novo máis tarde.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=A validación automática está desactivada cando a opción para diminuír o stock está definida en "Validación de facturas".
@@ -396,18 +396,18 @@ RequireMinLength = A lonxitude ten que ser maior de %s caracter(es)
 RequireValidUrl = Require un enderezo web válido
 RequireValidDate = Require unha data válida
 RequireANotEmptyValue = É requirido
-RequireValidDuration = Require unha duración válida 
+RequireValidDuration = Require unha duración válida
 RequireValidExistingElement = Require un valor existente
 RequireValidBool = Require un booleano válido
-BadSetupOfField = Erro de configuración do campo 
-BadSetupOfFieldClassNotFoundForValidation = Erro de configuración do campo: Non se atopou a clase para validación 
+BadSetupOfField = Erro de configuración do campo
+BadSetupOfFieldClassNotFoundForValidation = Erro de configuración do campo: Non se atopou a clase para validación
 BadSetupOfFieldFileNotFound = Erro de configuración do campo: Non se atopou o ficheiro para a súa inclusión 
 BadSetupOfFieldFetchNotCallable = Erro de configuración do campo: A recuperación non se pode chamar na clase
 ErrorTooManyAttempts= Demasiados intentos, ténteo de novo máis tarde
 
 TotalAmountEmpty=Cantidade total baleira
 FailedToFoundTheConversionRateForInvoice=Produciuse un erro ao atopar a taxa de conversión da factura
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
-ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
-ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
+ThisIdNotDefined=Id non definido
+OperNotDefined=O moo de pagamento non está definido
+ErrorThisContactXIsAlreadyDefinedAsThisType=%s xa está definido como contacto para este tipo.
+ErrorThisGroupIsAlreadyDefinedAsThisType=Os contactos con este grupo xa están definidos como contactos deste tipo.
diff --git a/htdocs/langs/gl_ES/receiptprinter.lang b/htdocs/langs/gl_ES/receiptprinter.lang
index dea972fe50d..67a2fcb29a3 100644
--- a/htdocs/langs/gl_ES/receiptprinter.lang
+++ b/htdocs/langs/gl_ES/receiptprinter.lang
@@ -10,6 +10,7 @@ ReceiptPrinterTemplateDesc=Configuración de Modelos
 ReceiptPrinterTypeDesc=Exemplo de posibles valores para o campo "Parámetros" segundo o tipo de controlador
 ReceiptPrinterProfileDesc=Descrición do perfil da impresora de recibos
 ListPrinters=Listaxe de impresoras
+FromServerPointOfView=Desde o punto de vista do servidor web. Este método debe ser accesible desde o servidor web de hospedaxe.
 SetupReceiptTemplate=Configuración do modelo
 CONNECTOR_DUMMY=Impresora ficticia
 CONNECTOR_NETWORK_PRINT=Impresora de rede
@@ -63,7 +64,7 @@ YearInvoice=Ano de factura
 DOL_VALUE_MONTH_LETTERS=Mes de factura en letras
 DOL_VALUE_MONTH=Mes da factura
 DOL_VALUE_DAY=Día da factura
-DOL_VALUE_DAY_LETTERS=Día factura en letras
+DOL_VALUE_DAY_LETTERS=Día da factura en letras
 DOL_LINE_FEED_REVERSE=Avance de liña inverso
 InvoiceID=ID de factura
 InvoiceRef=Ref. factura
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 103d21b0cc5..6dd47fdb09f 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=הקטגוריה עבור חשבון הנהלת החשבונות
 AccountingJournals=יומנים חשבונאיים
 AccountingJournal=יומן חשבונאות
 NewAccountingJournal=יומן חשבונאות חדש
-ShowAccountingJournal=הצג יומן חשבונאות
 NatureOfJournal=Nature of Journal
 AccountingJournalType1=פעולות שונות
 AccountingJournalType2=מכירות
@@ -353,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=השבת כריכה והעברה בהנהל
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=השבת כריכה והעברה בהנהלת חשבונות ברכישות (חשבוניות ספק לא יילקחו בחשבון בהנהלת חשבונות)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=השבת כריכה והעברה בראיית חשבון על דוחות הוצאות (דוחות הוצאות לא יילקחו בחשבון בהנהלת חשבונות)
 ACCOUNTING_ENABLE_LETTERING=אפשר את פונקציית האותיות בהנהלת החשבונות
-ACCOUNTING_ENABLE_LETTERING_DESC=כאשר אפשרות זו מופעלת, תוכל להגדיר, בכל ערך חשבונאי, קוד כדי שתוכל לקבץ תנועות חשבונאיות שונות יחד. בעבר, כאשר יומנים שונים נוהלו באופן עצמאי, תכונה זו הייתה הכרחית כדי לקבץ שורות תנועה של כתבי עת שונים יחדיו. עם זאת, עם הנהלת חשבונות של Dolibarr, קוד מעקב כזה, הנקרא "<b>%s<span class='notranslate'></b> span>" כבר נשמר אוטומטית, כך שכבר נעשה כיתוב אוטומטי, ללא סיכון לשגיאה, כך שתכונה זו הפכה חסרת תועלת לשימוש נפוץ. תכונת כיתוב ידני מסופקת עבור משתמשי קצה שבאמת לא סומכים על מנוע המחשב שמבצע העברת נתונים בהנהלת חשבונות.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=הפעלת תכונה זו אינה הכרחית יותר לניהול חשבונאי קפדני.
 ACCOUNTING_ENABLE_AUTOLETTERING=הפעל את האותיות האוטומטיות בעת העברה להנהלת חשבונות
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=הקוד לאותיות נוצר באופן אוטומטי ומוגדל ואינו נבחר על ידי משתמש הקצה
@@ -469,7 +468,7 @@ AccountancyClosureConfirmAccountingReversal=האם אתה בטוח שברצונ
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=חלק משלבי ההגדרה לא בוצעו, אנא השלם אותם
 ErrorNoAccountingCategoryForThisCountry=אין קבוצת חשבונות חשבונאית זמינה עבור המדינה %s (ראה %s - %s - %s)
-ErrorInvoiceContainsLinesNotYetBounded=אתה מנסה לתעד כמה שורות של החשבונית <strong>%s<span class='notranslate'></strong>, אבל כמה קווים אחרים עדיין אינם מוגבלים לחשבון חשבונאי. דיווח עיתונאי של כל שורות החשבוניות עבור חשבונית זו נדחה.
+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=חלק מהשורות בחשבונית אינן קשורות לחשבון הנהלת חשבונות.
 ExportNotSupported=פורמט הייצוא שהוגדר אינו נתמך בדף זה
 BookeppingLineAlreayExists=קווים שכבר קיימים בהנהלת חשבונות
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index a27c12a1e50..5f5eb293f8a 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=הערך הבא (חשבוניות)
 NextValueForCreditNotes=הערך הבא (הערות אשראי)
 NextValueForDeposit=הערך הבא (מקדמה)
 NextValueForReplacements=הערך הבא (החלפות)
-MustBeLowerThanPHPLimit=הערה: תצורת ה-PHP שלך מגבילה כרגע את גודל הקבצים המרבי להעלאה ל-<b>%sb09a4b739f17f80 span> <span class='notranslate'>%s, ללא קשר לערך של פרמטר זה
+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=הערה: אין גבול מוגדר בתצורת שלך PHP
 MaxSizeForUploadedFiles=הגודל המקסימלי של קבצים שאפשר להעלות (0 לאסור על כל ההעלאה)
 UseCaptchaCode=השתמש בקוד גרפי (CAPTCHA) בדף הכניסה ובחלק מהדפים הציבוריים
@@ -163,7 +163,7 @@ PurgeAreaDesc=דף זה מאפשר לך למחוק את כל הקבצים שנו
 PurgeDeleteLogFile=מחק קובצי יומן, כולל <b>%s</b> (לא הוגדר עבור מודול Syslog סיכון לאובדן נתונים)
 PurgeDeleteTemporaryFiles=מחק את כל היומן והקבצים הזמניים (ללא סיכון לאובדן נתונים). הפרמטר יכול להיות 'tempfilesold', 'logfiles' או שניהם 'tempfilesold+logfiles'. הערה: מחיקת קבצים זמניים מתבצעת רק אם הספרייה הזמנית נוצרה לפני יותר מ-24 שעות.
 PurgeDeleteTemporaryFilesShort=מחק יומן וקבצים זמניים (ללא סיכון לאובדן נתונים)
-PurgeDeleteAllFilesInDocumentsDir=מחק את כל הקבצים בספרייה: <b>%s</b>=.<span class 'notranslate'><br></span>זה ימחק את כל המסמכים שנוצרו הקשורים לאלמנטים (צדדים שלישיים, חשבוניות וכו'...), קבצים שהועלו למודול ה-ECM, מזימות גיבוי של מסד נתונים וקבצים זמניים.
+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=לטהר עכשיו
 PurgeNothingToDelete=אין ספרייה או קבצים למחיקה.
 PurgeNDirectoriesDeleted=<b>%s</b> קבצים או ספריות נמחק.
@@ -250,8 +250,8 @@ Security=בטחון
 Passwords=סיסמאות
 DoNotStoreClearPassword=הצפין סיסמאות המאוחסנות במסד הנתונים (לא כטקסט רגיל). מומלץ מאוד להפעיל אפשרות זו.
 MainDbPasswordFileConfEncrypted=הצפנת סיסמת מסד הנתונים המאוחסנת ב-conf.php. מומלץ מאוד להפעיל אפשרות זו.
-InstrucToEncodePass=כדי שהסיסמה תקודד בקובץ <b>conf.php</b>, החלף את השורה b0342bz0<19 /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342bz0fda19 >מאת<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb2ec87fspan>fz;<07fspan>fz; span class='notranslate'></b>
-InstrucToClearPass=כדי לפענח (נקה) את הסיסמה לקובץ <b>conf.php</b>, החלף את השורה <br><b>$dolibarr_main_db_pass="crypted:...";</b>='</notranslate' class ><br>מאת<br><b>$dolibarr_main_db_pass="<span8b>70ec49becz0></span8b>7notranslate'ec> ";</b>
+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=הגן על קבצי PDF שנוצרו. זה לא מומלץ מכיוון שהוא שובר יצירת PDF בתפזורת.
 ProtectAndEncryptPdfFilesDesc=הגנה על מסמך PDF שומרת אותו זמין לקריאה והדפסה בכל דפדפן PDF. עם זאת, עריכה והעתקה אינן אפשריות יותר. שים לב ששימוש בתכונה זו גורם לבניית קובצי PDF ממוזגים גלובליים לא לעבוד.
 Feature=תכונה
@@ -268,7 +268,7 @@ OtherResources=משאבים אחרים
 ExternalResources=משאבים חיצוניים
 SocialNetworks=רשתות חברתיות
 SocialNetworkId=מזהה רשת חברתית
-ForDocumentationSeeWiki=לתיעוד משתמשים או מפתחים (מסמך, שאלות נפוצות...),<br>עיין ב-Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dc65</80>dc65 <span class='notranslate'></b>
+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=לכל שאלה/עזרה אחרת, אתה יכול להשתמש בפורום Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=הנה כמה משאבים לקבלת עזרה ותמיכה עם Dolibarr.
 HelpCenterDesc2=חלק ממשאבים אלו זמינים רק ב<b>אנגלית</b>.
@@ -290,8 +290,8 @@ EMailsSetup=הגדרת מיילים
 EMailsDesc=עמוד זה מאפשר לך להגדיר פרמטרים או אפשרויות לשליחת דואר אלקטרוני.
 EmailSenderProfiles=שולח אימייל פרופילי שולח
 EMailsSenderProfileDesc=אתה יכול לשמור את החלק הזה ריק. אם תזין כאן כמה הודעות דוא"ל, הם יתווספו לרשימת השולחים האפשריים לתיבת המשולבת כאשר תכתוב אימייל חדש.
-MAIN_MAIL_SMTP_PORT=יציאת SMTP/SMTPS (ערך ברירת מחדל ב-php.ini: <b>%s<span class='notranslate'>b09a4b739f17f >)
-MAIN_MAIL_SMTP_SERVER=מארח SMTP/SMTPS (ערך ברירת מחדל ב-php.ini: <b>%s<span class='notranslate'>b09a4b739f17f >)
+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
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=מארח SMTP/SMTPS
 MAIN_MAIL_EMAIL_FROM=דוא"ל שולח למיילים אוטומטיים
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=זוהי הגדרה חלופית לעיבוד 
 StepNb=שלב %s
 FindPackageFromWebSite=מצא חבילה שמספקת את התכונות שאתה צריך (לדוגמה באתר האינטרנט הרשמי %s).
 DownloadPackageFromWebSite=חבילת הורדה (לדוגמה מאתר האינטרנט הרשמי %s).
-UnpackPackageInDolibarrRoot=פרק/פרק את הקבצים הארוזים לתוך ספריית שרת Dolibarr שלך: <b>%s<span class='notranslate'>b09a4b739f17f >
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=כדי לפרוס/להתקין מודול חיצוני, עליך לפרוק/לפרוק את קובץ הארכיון לתוך ספריית השרת המוקדשת למודולים חיצוניים:<br><b>%s</b>
 SetupIsReadyForUse=פריסת המודול הסתיימה. עם זאת, עליך להפעיל ולהגדיר את המודול ביישום שלך על ידי מעבר למודולי הגדרת הדף: <a href="%s">%s</a>.
 NotExistsDirect=ספריית השורש החלופית אינה מוגדרת לספרייה קיימת.<br>
 InfDirAlt=מאז גרסה 3, ניתן להגדיר ספריית שורש חלופית. זה מאפשר לך לאחסן, בספרייה ייעודית, יישומי פלאגין ותבניות מותאמות אישית.<br>פשוט צור ספרייה בשורש של Dolibarr (למשל: מותאם אישית).<br>
-InfDirExample=<br>לאחר מכן הכריז על זה בקובץ <strong>conf.phpb0a65d071f6fcspan9z0</span class='notranslate'><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/barrtom/of/dolibarrtom/of/dspan 'notranslate'><br></span>אם השורות האלה מוערות ב-"#", כדי לאפשר אותן, פשוט בטל את ההערה על-ידי הסרת התו "#".
+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=אתה יכול להעלות את קובץ ה-zip של חבילת המודול מכאן:
 CurrentVersion=Dolibarr הגרסה הנוכחית
 CallUpdatePage=דפדף לדף שמעדכן את מבנה מסד הנתונים והנתונים: %s.
@@ -361,14 +361,14 @@ LastActivationIP=IP ההפעלה האחרון
 LastActivationVersion=גרסת ההפעלה האחרונה
 UpdateServerOffline=עדכן את השרת במצב לא מקוון
 WithCounter=נהל מונה
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:{000000} corresponds to a number which will be incremented on each . 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. {000000+000} same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first . {000000@x} 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. {dd} day (01 to 31).{mm} month (01 to 12).{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
-GenericMaskCodes2=<b>{cccc}</b> קוד הלקוח על n תווים<br><b>{cccc000}b0917b78z קוד הלקוח על n תווים ואחריו מונה המוקדש ללקוח. מונה זה המוקדש ללקוח מאופס במקביל למונה הגלובלי.<span class='notranslate'><br><b>b06a5f451419e8z </b> הקוד של סוג צד שלישי על n תווים (ראה תפריט בית - הגדרה - מילון - סוגי צדדים שלישיים). אם תוסיף תג זה, המונה יהיה שונה עבור כל סוג של צד שלישי.<br>
+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=כל הדמויות האחרות מסכת יישאר ללא שינוי. <br> מקומות אסורים. <br>
 GenericMaskCodes3EAN=כל שאר התווים במסכה יישארו שלמים (למעט * או ? במיקום 13 ב-EAN13).<br>אין מותרים רווחים.<br> span>ב-EAN13, התו האחרון אחרי ה-} האחרון במיקום ה-13 צריך להיות * או ? . הוא יוחלף במפתח המחושב.<br>
 GenericMaskCodes4a=<u>דוגמה בתאריך ה-99 של %s של הצד השלישי TheCompany, עם תאריך 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>דוגמה על צד שלישי שנוצר ב-2023-01-31:</u><br> >
 GenericMaskCodes4c=<u>דוגמה על מוצר שנוצר ב-2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ייתן b0aee873308 span>ABC2301-000099</b><br><b>@01+</0> }-ZZZ/{dd}/XXX<span class='notranslate'></b> ייתן <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> ייתן <b>IN2301-0099-A</b> סוג החברה הוא 'Inscripto אחראי' עם קוד לסוג שהוא 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=להחזיר מספר להתאמה אישית על פי מסכת מוגדר.
 ServerAvailableOnIPOrPort=שרת זמין בכתובת <b>%s</b> כתובת ביציאה <b>%s</b>
 ServerNotAvailableOnIPOrPort=השרת אינו זמין <b>%s</b> כתובת ביציאה <b>%s</b>
@@ -390,7 +390,7 @@ LanguageFilesCachedIntoShmopSharedMemory=קבצים. Lang טעון בזיכרו
 LanguageFile=קובץ שפה
 ExamplesWithCurrentSetup=דוגמאות עם תצורה נוכחית
 ListOfDirectories=רשימה של ספריות ותבניות OpenDocument
-ListOfDirectoriesForModelGenODT=רשימת ספריות המכילות קבצי תבניות בפורמט OpenDocument.<br><br>שים כאן את הנתיב המלא של ספריות.<br>הוסף החזרת כרכרה בין ספרייה אחת.<br>כדי להוסיף ספרייה של מודול GED, הוסף כאן <b> >DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br>b0342fccfdaies19bz0 במנהלים אלו חייב להסתיים ב-<b>.odt</b> או <b>.ods ='notranslate'></b></span>.
+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=מספר קובצי תבנית ODT/ODS שנמצאו בספריות אלו
 ExampleOfDirectoriesForModelGen=דוגמאות לתחביר:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> לדעת איך ליצור תבניות ODT המסמכים שלך, לפני אחסונם ספריות אלה, קרא את התיעוד wiki:
@@ -461,10 +461,10 @@ ComputedFormulaDesc=אתה יכול להזין כאן נוסחה באמצעות
 Computedpersistent=אחסן שדה מחושב
 ComputedpersistentDesc=שדות נוספים מחושבים יאוחסנו במסד הנתונים, עם זאת, הערך יחושב מחדש רק כאשר האובייקט של שדה זה ישתנה. אם השדה המחושב תלוי באובייקטים אחרים או בנתונים גלובליים ערך זה עשוי להיות שגוי!!
 ExtrafieldParamHelpPassword=השארת שדה זה ריק פירושה שהערך הזה יאוחסן ללא הצפנה (השדה פשוט מוסתר עם כוכבים על המסך).<br><br>הזן ערך 'dolcrypt' כדי לקודד ערך עם אלגוריתם הצפנה הפיך. עדיין ניתן לדעת ולערוך נתונים ברורים, אך הם מוצפנים במסד הנתונים.<br><br>הזן 'auto' (או 'md5', 'sha256', 'password_hash', ...) כדי להשתמש באלגוריתם ברירת המחדל של הצפנת סיסמה (או md5, sha256, password_hash...) כדי לשמור את הסיסמה ה-hash הבלתי הפיכה במסד הנתונים (אין דרך לאחזר את הערך המקורי)
-ExtrafieldParamHelpselect=רשימת הערכים חייבת להיות שורות עם מפתח פורמט, ערך (כאשר המפתח לא יכול להיות '0')<br><br> למשל : <br>1,value1<br>2,value2<br></espan>code3,valu span class='notranslate'><br>...<br><br>כדי שהרשימה תהיה תלויה באחר רשימת מאפיינים משלימים:<br>1,value1|options_<i>parent_list_codeb0ae634758bac>: parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae64758bac33zkey class='notranslate'><br></span><br>כדי שהרשימה תהיה תלויה ברשימה אחרת:<br>1, value1|<i>parent_list_code</i>:parent_key<br></span|span>2,value class='notranslate'><i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=רשימת הערכים חייבת להיות שורות עם מפתח פורמט, ערך (כאשר המפתח לא יכול להיות '0')<br><br> למשל : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=רשימת הערכים חייבת להיות שורות עם מפתח פורמט, ערך (כאשר המפתח לא יכול להיות '0')<br><br> למשל : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
-ExtrafieldParamHelpsellist=רשימת ערכים מגיעה מטבלה<br>תחביר: table_name:label_field:id_field::filtersql<br>דוגמה: c_idtypent:libelle: ::filtersql<br><br>- id_field הוא בהכרח מפתח int ראשיb0342fccfda19bz> - filtersql הוא תנאי SQL. זה יכול להיות בדיקה פשוטה (למשל active=1) להציג רק ערך פעיל<span class='notranslate'><br>אתה יכול גם להשתמש ב-$ID$ במסנן שהוא המזהה הנוכחי של האובייקט הנוכחי<br>כדי להשתמש ב-SELECT לתוך המסנן, השתמש במילת המפתח $SEL$ כדי לעקוף את ההגנה נגד הזרקה.<br>אם ברצונך לסנן על שדות נוספים. השתמש בתחביר extra.fieldcode=... (כאשר קוד השדה הוא הקוד של extrafield)<br><br>על מנת לקבל את רשימה בהתאם לרשימת מאפיינים משלימים אחרת:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>כדי שהרשימה תהיה תלויה ברשימה אחרת:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'></i></umn>:parent|
+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 necessarily 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=רשימת ערכים מגיעה מטבלה<br>תחביר: table_name:label_field:id_field::filtersql<br>דוגמה: c_idtypent:libelle: ::filtersql<br><br>מסנן יכול להיות בדיקה פשוטה (למשל active=1) להצגת ערך פעיל בלבד<br>תוכל גם להשתמש ב-$ID$ במסנן שהוא המזהה הנוכחי של האובייקט הנוכחי<br>כדי לבצע SELECT במסנן השתמש ב-$SEL$<br>אם אתה רוצה לסנן על extrafields השתמש בתחביר extra.fieldcode=... (כאשר קוד השדה הוא הקוד של extrafield)<br><br>כדי שהרשימה תהיה תלויה ברשימת תכונות משלימה אחרת:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br></3translatespan' class=0bda10fzcfz0bda19bz0</span44758bac33z0' כדי שהרשימה תהיה תלויה ברשימה אחרת:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=הפרמטרים חייבים להיות ObjectName:Classpath<br>תחביר: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=שמור ריק עבור מפריד פשוט<br>הגדר את זה ל-1 עבור מפריד מתמוטט (פתוח כברירת מחדל עבור הפעלה חדשה, ואז הסטטוס נשמר עבור כל הפעלה של משתמש)<br>הגדר את זה ל-2 עבור מפריד מכווץ (כווץ כברירת מחדל עבור הפעלה חדשה, ואז הסטטוס נשמר לפני כל הפעלת משתמש)
@@ -483,7 +483,7 @@ ExternalModule=מודול חיצוני
 InstalledInto=מותקן בספרייה %s
 BarcodeInitForThirdparties=ברקוד המוני init עבור צדדים שלישיים
 BarcodeInitForProductsOrServices=ברקוד המוני התחל או איפוס עבור מוצרים או שירותים
-CurrentlyNWithoutBarCode=נכון לעכשיו, יש לך רשומת <strong>%s</strong> ב-<strong>%s</strong> <span class='notranslate'>b0ecb>9fc87f מוגדר</4 .
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=ערך Init עבור %s הברקודים הריקים
 EraseAllCurrentBarCode=מחק את כל ערכי הברקוד הנוכחיים
 ConfirmEraseAllCurrentBarCode=האם אתה בטוח שברצונך למחוק את כל ערכי הברקוד הנוכחיים?
@@ -1197,6 +1197,7 @@ Skin=העור נושא
 DefaultSkin=העור סגנון ברירת מחדל
 MaxSizeList=אורך מקסימלי עבור רשימה
 DefaultMaxSizeList=אורך מרבי ברירת מחדל עבור רשימות
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=ברירת המחדל של אורך מקסימלי עבור רשימות קצרות (כלומר בכרטיס לקוח)
 MessageOfDay=המסר של היום
 MessageLogin=התחברות הודעה בדף
@@ -1249,7 +1250,7 @@ SetupDescription2=שני הסעיפים הבאים הם חובה (שני הער
 SetupDescription3=<a href="%s">%s -> %sb0e87d8cczc60e40d <br><br>פרמטרים בסיסיים המשמשים להתאמה אישית של התנהגות ברירת המחדל של היישום שלך (למשל עבור תכונות הקשורות למדינה).
 SetupDescription4=<a href="%s">%s -> %sb0e87d8cczc60e40d <br><br>תוכנה זו היא חבילה של מודולים/יישומים רבים. המודולים הקשורים לצרכים שלך חייבים להיות מופעלים ומוגדרים. ערכים בתפריט יופיעו עם הפעלת המודולים הללו.
 SetupDescription5=ערכי תפריט הגדרה אחרים מנהלים פרמטרים אופציונליים.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>b05e87d8ccz60e87d8ccz /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=פרמטרים בסיסיים המשמשים להתאמה אישית של התנהגות ברירת המחדל של האפליקציה שלך (למשל עבור תכונות הקשורות למדינה).
 SetupDescription4b=תוכנה זו היא חבילה של מודולים/יישומים רבים. יש להפעיל את המודולים הקשורים לצרכים שלך. ערכים בתפריט יופיעו עם הפעלת המודולים הללו.
 AuditedSecurityEvents=אירועי אבטחה שנבדקים
@@ -1280,8 +1281,8 @@ DisplayDesc=ניתן לשנות כאן פרמטרים המשפיעים על המ
 AvailableModules=אפליקציה/מודולים זמינים
 ToActivateModule=כדי להפעיל מודולים, ללכת על שטח ההתקנה (ראשי-> התקנה-> Modules).
 SessionTimeOut=זמן לפגישה
-SessionExplanation=מספר זה מבטיח שההפעלה לעולם לא יפוג לפני העיכוב הזה, אם ניקוי הפגישות נעשה על ידי מנקה ההפעלה הפנימי של PHP (ושום דבר אחר). מנקה הפעלות פנימי של PHP אינו מבטיח שההפעלה יפוג לאחר עיכוב זה. התוקף יפוג, לאחר עיכוב זה, וכאשר מנקה הפעלות יופעל, כך שכל <b>%s/<span class=' גישה notranslate'>%s</span></b>, אבל רק במהלך גישה שנעשתה על ידי הפעלות אחרות (אם הערך הוא 0, זה אומר שניקוי ההפעלה נעשה רק על ידי תהליך חיצוני) .<br>הערה: בשרתים מסוימים עם מנגנון ניקוי הפעלה חיצוני (cron תחת debian, ubuntu...), ההפעלות יכולות להיהרס לאחר תקופה שהוגדרה על ידי הגדרה חיצונית, לא משנה מה הערך שהוזן כאן.
-SessionsPurgedByExternalSystem=נראה כי הפעלות בשרת זה מנוקות על ידי מנגנון חיצוני (cron תחת debian, ubuntu ...), כנראה כל <b>%s</b> שניות (= ערך הפרמטר <b>session.gc_maxlifetime<span class='notranslate'>b09a4b739f</017z) , כך שלשינוי הערך כאן אין השפעה. עליך לבקש ממנהל השרת לשנות את עיכוב ההפעלה.
+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=זמין טריגרים
 TriggersDesc=טריגרים הם קבצים שישנו את ההתנהגות של זרימת העבודה של Dolibarr לאחר העתקה לספרייה <b>htdocs/core/triggers</b>. הם מבינים פעולות חדשות, המופעלות באירועי Dolibarr (יצירת חברה חדשה, אימות חשבונית, ...).
 TriggerDisabledByName=גורמים בקובץ זה אינם זמינים על ידי <b>הסיומת-NoRun</b> בשמם.
@@ -1381,7 +1382,7 @@ NewTranslationStringToShow=מחרוזת תרגום חדשה להצגה
 OriginalValueWas=התרגום המקורי מוחלף. הערך המקורי היה:<br><br>%s
 TransKeyWithoutOriginalValue=אילצת תרגום חדש למפתח התרגום '<strong>%s</strong>' שאינו קיים באף קבצי שפה
 TitleNumberOfActivatedModules=מודולים מופעלים
-TotalNumberOfActivatedModules=מודולים מופעלים: <b>%s</b> / <span' class='notranslate ><b></span>%s</b>
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=עליך להפעיל לפחות מודול אחד
 YouMustEnableTranslationOverwriteBefore=תחילה עליך להפעיל את החלפת התרגום כדי לאפשר לך להחליף תרגום
 ClassNotFoundIntoPathWarning=המחלקה %s לא נמצאה בנתיב PHP
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=לא יצא אירוע מבוגרת
 SecurityKey = מפתח אבטחה
 ##### ClickToDial #####
 ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
-ClickToDialUrlDesc=כתובת האתר נקראת כאשר מתבצעת לחיצה על תמונת הטלפון. ב-URL, אתה יכול להשתמש בתגים<br><b>__PHONETO__</b> שיהיה הוחלף במספר הטלפון של האדם שאליו יש להתקשר<br><b>__PHONEFROM__b09a4b739f17f80 יוחלף במספר הטלפון של האדם המתקשר (שלך)<span class='notranslate'><br><b>__LOGIN__b09a4b739f</017f span> שיוחלף בכניסה עם קליקטודיאל (מוגדר בכרטיס המשתמש)<span class='notranslate'><br><b>__PASS__ </b> שתוחלף בסיסמת קליקטודיאל (מוגדרת בכרטיס המשתמש).
+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=מודול זה משנה מספרי טלפון, בעת שימוש במחשב שולחני, לקישורים הניתנים ללחיצה. לחיצה תתקשר למספר. זה יכול לשמש כדי להתחיל את שיחת הטלפון בעת שימוש בטלפון רך על שולחן העבודה שלך או בעת שימוש במערכת CTI המבוססת על פרוטוקול SIP למשל. הערה: בעת שימוש בסמארטפון, מספרי טלפון תמיד ניתנים ללחיצה.
 ClickToDialUseTelLink=השתמש רק בקישור "טל:" במספרי הטלפון
 ClickToDialUseTelLinkDesc=השתמש בשיטה זו אם למשתמשים שלך יש softphone או ממשק תוכנה, המותקן על אותו מחשב כמו הדפדפן, ונקרא כאשר אתה לוחץ על קישור שמתחיל ב-"tel:" בדפדפן שלך. אם אתה צריך קישור שמתחיל ב-"sip:" או פתרון שרת מלא (אין צורך בהתקנת תוכנה מקומית), עליך להגדיר זאת ל-"No" ולמלא את השדה הבא.
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=התקנה של מודול חיצוני 
 SomethingMakeInstallFromWebNotPossible2=מסיבה זו, תהליך השדרוג המתואר כאן הוא תהליך ידני שרק משתמש בעל הרשאה רשאי לבצע.
 InstallModuleFromWebHasBeenDisabledContactUs=התקנה או פיתוח של מודולים חיצוניים או אתרים דינמיים, מהאפליקציה, נעולים כעת למטרות אבטחה. אנא צור איתנו קשר אם אתה צריך להפעיל תכונה זו.
 InstallModuleFromWebHasBeenDisabledByFile=התקנת מודול חיצוני מהאפליקציה הושבתה על ידי מנהל המערכת שלך. עליך לבקש ממנו להסיר את הקובץ <strong>%s</strong> כדי לאפשר זאת תכונה.
-ConfFileMustContainCustom=התקנה או בנייה של מודול חיצוני מהאפליקציה צריך לשמור את קבצי המודול בספרייה <strong>%s </strong>. כדי שהספרייה הזו תעבד על ידי Dolibarr, עליך להגדיר את <strong>conf/conf.php</strong> שלך כדי להוסיף את 2 שורות ההנחיה: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a65fspanc90f</spancd070 ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49fztom0;<span>/ class '></strong>
+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=הדגש קווי טבלה כאשר תנועת העכבר עוברת
 HighlightLinesColor=הדגש את צבע הקו כאשר העכבר עובר (השתמש ב-'ffffff' כדי לא להדגיש)
 HighlightLinesChecked=הדגש את צבע הקו כאשר הוא מסומן (השתמש ב-'ffffff' ללא הדגשה)
@@ -2065,7 +2066,7 @@ DetectionNotPossible=איתור לא אפשרי
 UrlToGetKeyToUseAPIs=כתובת אתר לקבלת אסימון לשימוש ב-API (לאחר קבלת האסימון הוא נשמר בטבלת המשתמשים של מסד הנתונים ויש לספק אותו בכל קריאת API)
 ListOfAvailableAPIs=רשימה של ממשקי API זמינים
 activateModuleDependNotSatisfied=מודול "%s" תלוי במודול "%s", שחסר, אז מודול " %1$s" עשוי שלא לפעול כהלכה. אנא התקן את המודול "%2$s" או השבת את המודול "%1$s" אם אתה רוצה להיות בטוח מכל הפתעה
-CommandIsNotInsideAllowedCommands=הפקודה שאתה מנסה להפעיל אינה ברשימת הפקודות המותרות המוגדרות בפרמטר <strong>$dolibarr_main_restrict_os_commands</strong> ב-<span> class='notranslate'><strong>conf.php</strong> קובץ.
+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=דף נחיתה
 SamePriceAlsoForSharedCompanies=אם אתה משתמש במודול מרובה חברות, עם הבחירה "מחיר יחיד", המחיר יהיה זהה גם עבור כל החברות אם מוצרים משותפים בין סביבות
 ModuleEnabledAdminMustCheckRights=מודול הופעל. הרשאות עבור מודולים מופעלים ניתנו למשתמשי אדמין בלבד. ייתכן שיהיה עליך להעניק הרשאות למשתמשים אחרים או לקבוצות באופן ידני במידת הצורך.
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=מודולי ממשקי API אינם מופעלים
 YouShouldSetThisToOff=אתה צריך להגדיר את זה ל-0 או כבוי
 InstallAndUpgradeLockedBy=ההתקנה והשדרוגים נעולים על ידי הקובץ <b>%s</b>
 InstallLockedBy=ההתקנה/התקנה מחדש ננעלת על ידי הקובץ <b>%s</b>
-InstallOfAddonIsNotBlocked=התקנות של תוספות אינן נעולות. צור קובץ <b>installmodules.lock</b> לתוך הספרייה b0aee83365837 class</span ='notranslate'>%s</b> כדי לחסום התקנות של תוספות/מודולים חיצוניים.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=יישום ישן
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=אם כמה מודולי תשלום מקוונים מופעלים (Paypal, Stripe, ...), הוסף קישור ב-PDF כדי לבצע את התשלום המקוון
 DashboardDisableGlobal=השבת באופן גלובלי את כל האגודלים של אובייקטים פתוחים
@@ -2406,7 +2407,7 @@ CSSPage=סגנון CSS
 Defaultfortype=בְּרִירַת מֶחדָל
 DefaultForTypeDesc=התבנית משמשת כברירת מחדל בעת יצירת אימייל חדש עבור סוג התבנית
 OptionXShouldBeEnabledInModuleY=יש להפעיל את האפשרות "<b>%s</b>" למודול <b>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=האפשרות "<b>%s</b>" מופעלת במודול <span class 'notranslate'><b></span>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=אפשר חתימה On Line
 AtBottomOfPage=בתחתית העמוד
 FailedAuth=אימותים נכשלים
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index c022360e289..47b0e01b042 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -137,8 +137,8 @@ DateActionEnd=תאריך סיום
 AgendaUrlOptions1=אתה יכול גם להוסיף את הפרמטרים הבאים לסינון הפלט:
 AgendaUrlOptions3=<b>logina=%s</b> כדי להגביל את הפלט לפעולות שבבעלות משתמש <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> כדי להגביל פלט לפעולות שאינן בבעלות משתמש <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> כדי להגביל את הפלט לפעולות ש<strong>הוקצו למשתמש span class='notranslate'><b></span>%s</b> (בעלים ואחרים).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> כדי להגביל את הפלט לפעולות המקושרות לפרויקט b0aee87365 __PROJECT_ID__<span class='notranslate'></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> כדי לא לכלול אירועים אוטומטיים.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> כדי לכלול אירועים של חגים.
 AgendaShowBirthdayEvents=ימי הולדת של אנשי קשר
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 997dbb0b3de..206301ef880 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=העברה פנימית
 TransferDesc=השתמש בהעברה פנימית להעברת מחשבון אחד לאחר, האפליקציה תכתוב שתי רשומות: חיוב בחשבון המקור וזיכוי בחשבון היעד. אותו סכום, תווית ותאריך ישמשו עבור עסקה זו.
 TransferFrom=מ
 TransferTo=ל
-TransferFromToDone=העברה מ-<b>%s</b> אל <b>%s</b> מתוך b0aee83365 class</0833658365 'notranslate'>%s</b> %s תועד.
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=שׁוֹלֵחַ
 ValidateCheckReceipt=האם לאמת את קבלת ההמחאה הזו?
 ConfirmValidateCheckReceipt=האם אתה בטוח שברצונך להגיש את קבלה המחאה הזו לאימות? לא יתאפשרו שינויים לאחר האימות.
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index ad8f482dab1..d67355ce8ad 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=אמצעי תשלום (קוד)
 LabelPaymentMode=אמצעי תשלום (תווית)
 PaymentModeShort=אמצעי תשלום
 PaymentTerm=טווח תשלום
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=תנאי תשלום
 PaymentConditionsShort=תנאי תשלום
 PaymentAmount=סכום לתשלום
@@ -610,7 +613,7 @@ TotalSituationInvoice=מצב טוטאלי
 invoiceLineProgressError=התקדמות שורת החשבונית אינה יכולה להיות גדולה או שווה לשורת החשבונית הבאה
 updatePriceNextInvoiceErrorUpdateline=שגיאה: עדכן מחיר בשורת החשבונית: %s
 ToCreateARecurringInvoice=כדי ליצור חשבונית חוזרת עבור חוזה זה, תחילה צור טיוטת חשבונית זו, ולאחר מכן המר אותה לתבנית חשבונית והגדר את התדירות להפקת חשבוניות עתידיות.
-ToCreateARecurringInvoiceGene=כדי ליצור חשבוניות עתידיות באופן קבוע וידני, פשוט עבור לתפריט <strong>%s - %s span> - <span class='notranslate'>%s</strong>.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=אם אתה צריך להפיק חשבוניות כאלה באופן אוטומטי, בקש ממנהל המערכת שלך להפעיל ולהגדיר את המודול <strong>%s</strong>. שימו לב שניתן להשתמש בשתי השיטות (ידניות ואוטומטיות) יחד ללא סיכון לשכפול.
 DeleteRepeatableInvoice=מחק חשבונית תבנית
 ConfirmDeleteRepeatableInvoice=האם אתה בטוח שברצונך למחוק את חשבונית התבנית?
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 85b83797168..253e38e0ef5 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=שיטה עוצמתית עם הרבה פרמטר
 ByTerminal=לפי טרמינל
 TakeposNumpadUsePaymentIcon=השתמש בסמל במקום בטקסט על כפתורי התשלום של ה-numpad
 CashDeskRefNumberingModules=מודול מספור למכירות קופה
-CashDeskGenericMaskCodes6 = <br><b>{TN}<span class='notranslate'>b399a</047f78 span> תג משמש להוספת מספר הטרמינל
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=מיזוג שורות של אותם מוצרים
 StartAParallelSale=התחל מכירה מקבילה חדשה
 SaleStartedAt=המכירה החלה ב-%s
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 43288a331dc..b9556b90ee7 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -335,11 +335,11 @@ CompanyHasRelativeDiscount=ללקוח זה יש הנחה ברירת מחדל ש
 CompanyHasNoRelativeDiscount=ללקוח זה אין הנחה יחסית כברירת מחדל
 HasRelativeDiscountFromSupplier=יש לך הנחה ברירת מחדל של <b>%s%%</b> עם הספק הזה
 HasNoRelativeDiscountFromSupplier=אין הנחה יחסית ברירת מחדל אצל ספק זה
-CompanyHasAbsoluteDiscount=ללקוח זה יש הנחות זמינות (הערות זיכוי או מקדמה) עבור <b>%s</b> span> <span class='notranslate'>%s
+CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=ללקוח זה יש הנחות זמינות (מסחריות, מקדמה) עבור <b>%s</b> > %s
 CompanyHasCreditNote=ללקוח זה עדיין יש תעודות אשראי עבור <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=אין הנחה/אשראי זמינים מהספק הזה
-HasAbsoluteDiscountFromSupplier=יש לך הנחות זמינות (הערות זיכוי או מקדמה) עבור <b>%s</b> > <span class='notranslate'>%s מהספק הזה
+HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
 HasDownPaymentOrCommercialDiscountFromSupplier=יש לך הנחות זמינות (מסחרי, מקדמה) עבור <b>%s</b> %s מהספק הזה
 HasCreditNoteFromSupplier=יש לך תעודות אשראי עבור <b>%s</b> %s מהספק הזה
 CompanyHasNoAbsoluteDiscount=ללקוח זה אין זיכוי הנחה זמין
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 4bf61d7fe0d..786e7fa9547 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -165,10 +165,10 @@ CalcModeEngagement=ניתוח תשלומים רשומים ידועים
 CalcModePayment=ניתוח תשלומים רשומים ידועים
 CalcModeBookkeeping=ניתוח נתונים מתועדים בטבלת הנהלת חשבונות.
 CalcModeNoBookKeeping=גם אם הם עדיין לא מטופלים בלדג'ר
-CalcModeLT1= מצב <b>%sRE בחשבוניות לקוחות - חשבוניות ספקים%s</span ='notranslate'></b>
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
 CalcModeLT1Debt=מצב <b>%sRE בחשבוניות לקוחות%s</b>
 CalcModeLT1Rec= מצב <b>%sRE בחשבוניות ספקים%s</b>
-CalcModeLT2= מצב <b>%sIRPF בחשבוניות לקוחות - חשבוניות ספקים%s</span ='notranslate'></b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
 CalcModeLT2Debt=מצב <b>%sIRPF בחשבוניות לקוחות%s</b>
 CalcModeLT2Rec= מצב <b>%sIRPF על חשבוניות ספקים%s</spanlate><span class='no '></b>
 AnnualSummaryDueDebtMode=מאזן הכנסות והוצאות, סיכום שנתי
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index f6c3796dfbd..c7fd7a25814 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -15,7 +15,7 @@ ErrorGroupAlreadyExists=הקבוצה %s כבר קיימת.
 ErrorEmailAlreadyExists=דוא"ל %s כבר קיים.
 ErrorRecordNotFound=רשומה לא נמצאה.
 ErrorRecordNotFoundShort=לא נמצא
-ErrorFailToCopyFile=נכשלה העתקת הקובץ '<b>%s</b>' אל '<span class' ='notranslate'><b></span>%s</b>'.
+ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCopyDir=נכשלה העתקת הספרייה '<b>%s</b>' אל '<b>%s</b>'.
 ErrorFailToRenameFile=נכשל שינוי שם הקובץ '<b>%s</b>' ל-'<b>%s</b>'.
 ErrorFailToDeleteFile=הסרת הקובץ '<b>%s</b>' נכשלה.
@@ -51,7 +51,7 @@ ErrorBadDateFormat=לערך '%s' יש פורמט תאריך שגוי
 ErrorWrongDate=התאריך לא נכון!
 ErrorFailedToWriteInDir=נכשל כתיבה בספרייה %s
 ErrorFailedToBuildArchive=בניית קובץ הארכיון נכשלה %s
-ErrorFoundBadEmailInFile=נמצא תחביר דוא"ל שגוי עבור שורות %s בקובץ (שורה לדוגמא %s עם email=<span class='notranslate'>b0ecb2ec87f49f /span>)
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=לא ניתן למחוק את המשתמש. אולי זה משויך לישויות Dolibarr.
 ErrorFieldsRequired=כמה שדות חובה נותרו ריקים.
 ErrorSubjectIsRequired=נושא הדוא"ל נדרש
@@ -95,9 +95,9 @@ ErrorModuleRequireJavascript=אין להשבית את JavaScript כדי שתכו
 ErrorPasswordsMustMatch=שתי הסיסמאות המוקלדות חייבות להתאים זו לזו
 ErrorContactEMail=אירעה שגיאה טכנית. אנא צור קשר עם מנהל המערכת כדי לשלוח את הדוא"ל <b>%s</b> ולספק את השגיאה קוד <b>%s</b> בהודעה שלך, או הוסף עותק מסך של הדף הזה.
 ErrorWrongValueForField=שדה <b>%s</b>: ' <b>%s</b>' אינו תואם את כלל הביטוי הרגולרי b065837f %s</b>
-ErrorHtmlInjectionForField=שדה <b>%s</b>: הערך '<span class='notranslate' '><b></span>%s</b>' מכיל נתונים זדוניים אסורים
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=שדה <b>%s</b>: ' <b>%s</b>' אינו ערך שנמצא בשדה b30583fz span>%s</b> מתוך <b> %s</b>
-ErrorFieldRefNotIn=שדה <b>%s</b>: ' <b>%s</b>' אינו b0aee873365 class='notranslate'>%s</span></b> ref קיים
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorMultipleRecordFoundFromRef=נמצאו מספר רשומות בעת חיפוש מ-ref <b>%s</b>. אין דרך לדעת באיזה תעודת זהות להשתמש.
 ErrorsOnXLines=נמצאו שגיאות %s
 ErrorFileIsInfectedWithAVirus=תוכנית האנטי וירוס לא הצליחה לאמת את הקובץ (ייתכן שהקובץ נגוע בווירוס)
@@ -263,7 +263,7 @@ ErrorReplaceStringEmpty=שגיאה, המחרוזת להחלפה ריקה
 ErrorProductNeedBatchNumber=שגיאה, המוצר '<b>%s</b>' צריך הרבה/מספר סידורי
 ErrorProductDoesNotNeedBatchNumber=שגיאה, המוצר '<b>%s</b>' אינו מקבל הרבה/ מספר סידורי
 ErrorFailedToReadObject=שגיאה, כשל בקריאת אובייקט מסוג <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=שגיאה, יש להפעיל את הפרמטר <b>%s</b> ב-<span class 'notranslate'><b></span>conf/conf.php<> כדי לאפשר שימוש בממשק שורת הפקודה על ידי מתזמן המשימות הפנימי
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=שגיאה, התחברות זו היא מחוץ לטווח תאריכי התוקף
 ErrorValueLength=אורך השדה '<b>%s</b>' חייב להיות גבוה מ-'<b>%s</b>'
 ErrorReservedKeyword=המילה '<b>%s</b>' היא מילת מפתח שמורה
@@ -349,7 +349,7 @@ WarningCloseAlways=אזהרה, הסגירה מתבצעת גם אם הכמות ש
 WarningUsingThisBoxSlowDown=אזהרה, שימוש בתיבה זו האט ברצינות את כל הדפים המציגים את התיבה.
 WarningClickToDialUserSetupNotComplete=ההגדרה של מידע ClickToDial עבור המשתמש שלך לא הושלמה (ראה את הכרטיסייה ClickToDial בכרטיס המשתמש שלך).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=התכונה מושבתת כאשר הגדרת התצוגה מותאמת לאדם עיוור או לדפדפני טקסט.
-WarningPaymentDateLowerThanInvoiceDate=תאריך התשלום (%s) מוקדם מתאריך החשבונית (%s) עבור חשבונית <span class='notranslate'>b0ecb2ec87f49fz span>.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=יותר מדי נתונים (יותר משורות %s). אנא השתמש בעוד מסננים או הגדר את הקבוע %s לגבול גבוה יותר.
 WarningSomeLinesWithNullHourlyRate=חלק מהפעמים תועדו על ידי חלק מהמשתמשים בעוד התעריף השעתי שלהם לא הוגדר. נעשה שימוש בערך של 0 %s לשעה, אך הדבר עלול לגרום להערכה שגויה של הזמן המושקע.
 WarningYourLoginWasModifiedPleaseLogin=פרטי הכניסה שלך השתנו. למטרות אבטחה תצטרך להתחבר עם פרטי הכניסה החדשים שלך לפני הפעולה הבאה.
diff --git a/htdocs/langs/he_IL/eventorganization.lang b/htdocs/langs/he_IL/eventorganization.lang
index d91330bee9d..e9aa3e55d24 100644
--- a/htdocs/langs/he_IL/eventorganization.lang
+++ b/htdocs/langs/he_IL/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=הגדרת ארגון אירועים
 EventOrganization=ארגון אירועים
 EventOrganizationSetupPage = דף הגדרות ארגון אירועים
 EVENTORGANIZATION_TASK_LABEL = תווית של משימות ליצירה אוטומטית כאשר הפרויקט מאומת
-EVENTORGANIZATION_TASK_LABELTooltip = כאשר אתה מאמת אירוע לארגון, ניתן ליצור כמה משימות באופן אוטומטי בפרויקט<br><br>לדוגמה: <br>שלח קול קורא לוועידות<br>שלח קול קורא לדוכנים<br>אמת הצעות של כנסים<span ='notranslate'><br></span>אמת את האפליקציה לדוכנים<br>פתוח מנויים לאירוע למשתתפים<br> של האירוע לרמקולים<span class='notranslate'><br>שלח תזכורת לאירוע למארחי ביתן<br>שלח תזכורת לאירוע למשתתפים
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=השאר ריק אם אינך צריך ליצור משימות באופן אוטומטי.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = קטגוריה להוספה לצדדים שלישיים נוצרת באופן אוטומטי כאשר מישהו מציע ועידה
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = קטגוריה להוספה לצדדים שלישיים נוצרה אוטומטית כאשר הם מציעים דוכן
@@ -88,6 +88,7 @@ PriceOfRegistration=מחיר הרשמה
 PriceOfRegistrationHelp=מחיר לתשלום עבור הרשמה או השתתפות באירוע
 PriceOfBooth=מחיר מנוי לעמוד דוכן
 PriceOfBoothHelp=מחיר מנוי לעמוד דוכן
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=קישור ICS לכנסים
 ConferenceOrBoothInformation=מידע על כנס או דוכן
 Attendees=משתתפים
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index 788cd27b6be..a5fb65d7c19 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -87,7 +87,7 @@ ErrorMissingMandatoryValue=נתוני חובה ריקים בקובץ המקור
 TooMuchErrors=עדיין יש <b>%s</b> שורות מקור אחרות עם שגיאות, אך יש בפלט היה מוגבל.
 TooMuchWarnings=עדיין יש <b>%s</b> שורות מקור אחרות עם אזהרות אבל הפלט מכיל היה מוגבל.
 EmptyLine=שורה ריקה (תימחק)
-CorrectErrorBeforeRunningImport=אתה <b>חייב</b> לתקן את כל השגיאות <b>before notranslate'></b></span> מריץ את הייבוא הסופי.
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=הקובץ יובא עם המספר <b>%s</b>.
 YouCanUseImportIdToFindRecord=תוכל למצוא את כל הרשומות המיובאות במסד הנתונים שלך על ידי סינון בשדה <b>import_key='%s'</b>.
 NbOfLinesOK=מספר שורות ללא שגיאות וללא אזהרות: <b>%s</b>.
@@ -104,17 +104,17 @@ SourceExample=דוגמה לערך נתונים אפשרי
 ExampleAnyRefFoundIntoElement=כל רפר נמצא עבור רכיב <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=כל קוד (או מזהה) שנמצא במילון <b>%s</b>
 CSVFormatDesc=<b>ערך מופרד בפסיק</b> פורמט קובץ (.csv).<br>This הוא פורמט קובץ טקסט שבו שדות מופרדים על ידי מפריד [ %s ]. אם נמצא מפריד בתוך תוכן שדה, השדה מעוגל לפי תו עגול [ %s ]. תו בריחה לתו עגול הוא [ %s ].
-Excel95FormatDesc=<b>Excel</b> פורמט הקובץ (.xls)<span class='notranslate'><br> </nspan>זהו הקובץ פורמט אקסל 95 (BIFF5).
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> פורמט הקובץ (.xlsx)<br> זה  פורמט Excel 2007 (SpreadsheetML).
-TsvFormatDesc=<b>ערך מופרד בכרטיסיות</b> פורמט קובץ (.tsv)<span class='notranslate'><br> פורמט קובץ טקסט שבו שדות מופרדים על ידי טבולטור [טאב].
+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=השדה <b>%s</b> נוסף אוטומטית. זה ימנע ממך להתייחס לשורות דומות כרשומה כפולה (עם הוספת שדה זה, כל השורות יהיו בעלות המזהה שלהן ויהיה שונה).
 CsvOptions=אפשרויות פורמט CSV
 Separator=מפריד שדות
 Enclosure=מפריד מחרוזות
 SpecialCode=קוד מיוחד
 ExportStringFilter=%% מאפשר החלפת תו אחד או יותר בטקסט
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: מסננים לפי שנה/חודש/יום<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: מסננים בטווח של שנים/יום span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMDD: מסננים בכל השנים/החודשים/הימים הבאים<br> < YYYYMM, < YYYY YYYYMMDD: מסננים על כל השנים/החודשים/ימים הקודמות
-ExportNumericFilter=NNNNN מסנן לפי ערך אחד<br>NNNN+NNNNN מסנן על פני טווח של ערכים<br><span class='notranslate'>b08910a<27ede2 /span>> NNNNN מסנן לפי ערכים גבוהים יותר
+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=ייבוא החל ממספר שורה
 EndAtLineNb=סיים במספר שורה
 ImportFromToLine=הגבלת טווח (מ-עד). לְמָשָׁל. כדי להשמיט את שורת הכותרת.
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index 9feac014d76..8add21a2746 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=ייתכן שהגדרת ה-PHP שלך לא תומכת במש
 PHPSupportSessions=PHP זה תומך בהפעלות.
 PHPSupport=PHP זה תומך בפונקציות %s.
 PHPMemoryOK=זיכרון ההפעלה המקסימלי של PHP מוגדר ל-<b>%s</b>. זה אמור להספיק.
-PHPMemoryTooLow=זיכרון ההפעלה המקסימלי של PHP מוגדר ל-<b>%s</b> בתים. זה נמוך מדי. שנה את <b>php.ini</b> שלך כדי להגדיר את <b>me class ='notranslate'></b></span> פרמטר לפחות ל-<b>%s<span class='notranslate'>789f<b>739f /span> בתים.
+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=לחצו כאן לבדיקה מפורטת יותר
 ErrorPHPDoesNotSupportSessions=התקנת ה-PHP שלך אינה תומכת בהפעלות. תכונה זו נדרשת כדי לאפשר ל-Dolibarr לעבוד. בדוק את הגדרת ה-PHP וההרשאות של ספריית הפעלות.
 ErrorPHPDoesNotSupport=התקנת ה-PHP שלך אינה תומכת בפונקציות %s.
@@ -56,7 +56,7 @@ CreateDatabase=צור מסד נתונים
 CreateUser=צור חשבון משתמש או הענק הרשאת חשבון משתמש במסד הנתונים של Dolibarr
 DatabaseSuperUserAccess=שרת מסד נתונים - גישת Superuser
 CheckToCreateDatabase=סמן את התיבה אם מסד הנתונים עדיין לא קיים ולכן יש ליצור אותו.<br>במקרה זה, עליך גם למלא את שם המשתמש והסיסמה עבור חשבון משתמש העל בתחתית של הדף הזה.
-CheckToCreateUser=סמן את התיבה אם:<br>חשבון המשתמש במסד הנתונים עדיין לא קיים ולכן יש ליצור אותו, או<br>אם חשבון המשתמש קיים אך מסד הנתונים אינו קיים ויש להעניק הרשאות.<br>במקרה זה, עליך להזין את חשבון המשתמש והסיסמה ו<b></span span>גם<span class='notranslate'></b> שם חשבון משתמש העל והסיסמה בתחתית עמוד זה. אם תיבה זו אינה מסומנת, הבעלים והסיסמה של מסד הנתונים חייבים כבר להתקיים.
+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 (ליצירת מסדי נתונים חדשים או משתמשים חדשים), חובה אם מסד הנתונים או בעליו אינם קיימים כבר.
 KeepEmptyIfNoPassword=השאר ריק אם למשתמש-על אין סיסמה (לא מומלץ)
 SaveConfigurationFile=שמירת פרמטרים ל
@@ -108,15 +108,15 @@ DatabaseVersion=גרסת מסד נתונים
 ServerVersion=גרסת שרת מסד נתונים
 YouMustCreateItAndAllowServerToWrite=עליך ליצור ספרייה זו ולאפשר לשרת האינטרנט לכתוב לתוכה.
 DBSortingCollation=סדר מיון תווים
-YouAskDatabaseCreationSoDolibarrNeedToConnect=בחרת ליצור מסד נתונים <b>%s</b>, אבל בשביל זה, דוליבר צריך להתחבר לשרת <b>%s</b> עם משתמש-על <span class= הרשאות 'notranslate'><b></span>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=בחרת ליצור משתמש במסד נתונים <b>%s</b>, אבל בשביל זה, Dolibr צריך להתחבר לשרת <b>%s</b> עם סופר משתמש <span class הרשאות ='notranslate'><b></span>%s</b>.
+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=חיבור מסד הנתונים נכשל: הפרמטרים של המארח או משתמש העל חייבים להיות שגויים.
 OrphelinsPaymentsDetectedByMethod=תשלום יתומים זוהה בשיטה %s
 RemoveItManuallyAndPressF5ToContinue=הסר אותו ידנית והקש F5 כדי להמשיך.
 FieldRenamed=שם השדה שונה
 IfLoginDoesNotExistsCheckCreateUser=אם המשתמש עדיין לא קיים, עליך לסמן את האפשרות "צור משתמש"
-ErrorConnection=שרת "<b>%s</b>", שם מסד הנתונים "<b>%s</b>", login "3058e'>b368e span><span class='notranslate'>%s</b>", או שסיסמת מסד הנתונים שגויה או שגרסת לקוח PHP ישנה מדי בהשוואה לגרסת מסד הנתונים .
-InstallChoiceRecommanded=בחירה מומלצת להתקנת גרסה <b>%s</b> מהגרסה הנוכחית שלך <span> class='notranslate'><b></span>%s</b>
+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>בחירת ההתקנה שהוצעה על ידי המתקין</b>.
 MigrateIsDoneStepByStep=לגרסה הממוקדת (%s) יש פער של מספר גרסאות. אשף ההתקנה יחזור להציע העברה נוספת לאחר השלמת זו.
 CheckThatDatabasenameIsCorrect=בדוק ששם מסד הנתונים "<b>%s</b>" נכון.
diff --git a/htdocs/langs/he_IL/ldap.lang b/htdocs/langs/he_IL/ldap.lang
index 7a714049e56..38b4a5f0813 100644
--- a/htdocs/langs/he_IL/ldap.lang
+++ b/htdocs/langs/he_IL/ldap.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=סיסמה למשתמש <b>%s</b> בדומיין <span class=' יש לשנות notranslate'><b></span>%s</b>.
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=על המשתמש לשנות סיסמה בדומיין %s
 LDAPInformationsForThisContact=מידע במסד הנתונים של LDAP עבור איש קשר זה
 LDAPInformationsForThisUser=מידע במסד הנתונים של LDAP עבור משתמש זה
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index cc48bc8f4df..96a1175f564 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=הקובץ המיובא חייב להיות בפור
 UseFormatInputEmailToTarget=הזן מחרוזת בפורמט <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=נמענים (בחירה מתקדמת)
 AdvTgtTitle=מלא שדות קלט כדי לבחור מראש את צדדים שלישיים או אנשי קשר/כתובות למיקוד
-AdvTgtSearchTextHelp=השתמש ב-%% בתור תווים כלליים. לדוגמה כדי למצוא את כל הפריטים כמו <b>jean, joe, jim</b>, אתה יכול להזין  <b>j%%</b>, אתה יכול גם להשתמש ; כמפריד לערך, ולהשתמש ! עבור חוץ מהערך הזה. לדוגמה <b>jean;joe;jim%%;!jimo;!jimab07e63171f5dacz span><span class='notranslate'></b> ימקד את כל ג'ין, ג'ו, מתחיל עם ג'ים אבל לא ג'ימו ולא כל מה שמתחיל בג'ימה
+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=השתמש במרווח כדי לבחור ערך int או float
 AdvTgtMinVal=ערך מינימלי
 AdvTgtMaxVal=ערך מקסימלי
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 197cccf37c6..0b16f039b5c 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -68,7 +68,7 @@ ErrorNoRequestInError=אין בקשה בטעות
 ErrorServiceUnavailableTryLater=השירות אינו זמין כרגע. נסה שוב מאוחר יותר.
 ErrorDuplicateField=ערך כפול בשדה ייחודי
 ErrorSomeErrorWereFoundRollbackIsDone=נמצאו כמה שגיאות. השינויים הוחזרו לאחור.
-ErrorConfigParameterNotDefined=הפרמטר <b>%s</b> אינו מוגדר בקובץ Dolibarr config class='notranslate'><b></span>conf.php</b>.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=לא הצליח למצוא את המשתמש <b>%s</b> במסד הנתונים של Dolibar.
 ErrorNoVATRateDefinedForSellerCountry=שגיאה, לא הוגדרו שיעורי מע"מ עבור המדינה '%s'.
 ErrorNoSocialContributionForSellerCountry=שגיאה, לא הוגדר סוג מסים חברתיים/פיסקליים עבור המדינה '%s'.
@@ -103,7 +103,7 @@ RecordDeleted=הרשומה נמחקה
 RecordGenerated=רשומה נוצרה
 LevelOfFeature=רמת תכונות
 NotDefined=לא מוגדר
-DolibarrInHttpAuthenticationSoPasswordUseless=מצב האימות של Dolibarr מוגדר ל<b>%s</b> בקובץ התצורה <span> class='notranslate'><b>conf.php</b>.<br>זה אומר שמסד הנתונים של הסיסמאות הוא חיצוני Dolibarr, אז ייתכן שלשינוי שדה זה לא תהיה השפעה.
+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=מנהל מערכת
 AdministratorDesc=מנהל מערכת (יכול לנהל משתמש, הרשאות אך גם הגדרות מערכת ותצורת מודולים)
 Undefined=לא מוגדר
@@ -420,6 +420,8 @@ TotalTTCShort=סה"כ (כולל מס)
 TotalHT=סה"כ (לא כולל מס)
 TotalHTforthispage=סך הכל (ללא מס) עבור דף זה
 Totalforthispage=סך הכל עבור דף זה
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=סך הכל (כולל מס)
 TotalTTCToYourCredit=סך הכל (כולל מס) לזכותך
 TotalVAT=סך המס
@@ -647,6 +649,7 @@ ReportName=שם הדוח
 ReportPeriod=תקופת דיווח
 ReportDescription=תאור
 Report=להגיש תלונה
+Reports=Reports
 Keyword=מילת מפתח
 Origin=מָקוֹר
 Legend=אגדה
@@ -963,6 +966,7 @@ AutomaticallyCalculated=מחושב אוטומטית
 TitleSetToDraft=חזור לטיוטה
 ConfirmSetToDraft=האם אתה בטוח שברצונך לחזור לסטטוס טיוטה?
 ImportId=ייבוא מזהה
+Event=Event
 Events=אירועים
 EMailTemplates=תבניות אימייל
 FileNotShared=הקובץ לא שותף לציבור חיצוני
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=האם אתה בטוח שברצונך להקצות מ
 ConfirmSetSupervisorQuestion=האם אתה בטוח שברצונך להגדיר מפקח ל-%s הרשומות שנבחרו?
 ConfirmUpdatePriceQuestion=האם אתה בטוח שברצונך לעדכן את המחיר של %s הרשומות שנבחרו?
 CategTypeNotFound=לא נמצא סוג תג עבור סוג הרשומות
-Rate=ציון
 SupervisorNotFound=המפקח לא נמצא
 CopiedToClipboard=הועתק ללוח
 InformationOnLinkToContract=סכום זה הוא רק סך כל שורות החוזה. שום מושג של זמן לא נלקח בחשבון.
@@ -1213,6 +1216,7 @@ CanceledHidden=בוטל מוסתר
 CanceledShown=בוטלה מוצגת
 Terminate=לבטל, לסיים
 Terminated=הסתיים
+Position=Position
 AddLineOnPosition=הוסף שורה במיקום (בסוף אם ריק)
 ConfirmAllocateCommercial=הקצה אישור נציג מכירות
 ConfirmAllocateCommercialQuestion=האם אתה בטוח שברצונך להקצות את %s הרשומות שנבחרו?
@@ -1230,6 +1234,7 @@ ExternalUser=משתמש חיצוני
 NoSpecificContactAddress=אין איש קשר או כתובת ספציפית
 NoSpecificContactAddressBis=כרטיסייה זו מוקדשת לאלץ אנשי קשר או כתובות ספציפיים עבור האובייקט הנוכחי. השתמש בו רק אם ברצונך להגדיר איש קשר או כתובת ספציפיים אחד או כמה עבור האובייקט כאשר המידע על הצד השלישי אינו מספיק או אינו מדויק.
 HideOnVCard=הסתר את %s
+ShowOnVCard=Show %s
 AddToContacts=הוסף כתובת לאנשי הקשר שלי
 LastAccess=גישה אחרונה
 UploadAnImageToSeeAPhotoHere=העלה תמונה מהכרטיסייה %s כדי לראות תמונה כאן
@@ -1259,3 +1264,7 @@ AmountSalary=סכום שכר
 InvoiceSubtype=תת סוג חשבונית
 ConfirmMassReverse=אישור הפוך בכמות גדולה
 ConfirmMassReverseQuestion=האם אתה בטוח שברצונך להפוך את %s הרשומות שנבחרו?
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index acc950c2a45..5b531befc30 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=ראה דוגמאות כאן
 EnabledDesc=תנאי להפעלת שדה זה.<br><br>דוגמאות:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=האם השדה נראה לעין? (דוגמאות: 0=לעולם לא נראה, 1=גלוי ברשימה וצור/עדכן/הצג טפסים, 2=גלוי ברשימה בלבד, 3=גלוי בטופס יצירה/עדכון/הצג בלבד (לא ברשימות), 4=גלוי ברשימות וטופס עדכון/הצג בלבד (לא צור), 5=גלוי ברשימה ובטופס הצג בלבד (לא צור, לא עדכון).<br><br> שימוש בערך שלילי פירושו שהשדה אינו מוצג כברירת מחדל ברשימה אך ניתן לבחור אותו לצפייה).
 ItCanBeAnExpression=זה יכול להיות ביטוי. דוגמה:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=הצג שדה זה במסמכי PDF תואמים, אתה יכול לנהל מיקום עם השדה "Position".<br><strong>עבור מסמך:</strong><br>0 = לא מוצג <br>1 = display<br>2 = הצג רק אם לא ריק<br><br>b0e7843947 span>עבור שורות מסמך:<span class='notranslate'></strong><br>0 = לא מוצג <br>1 = מוצג בעמודה<br>3 = הצגת עמודת תיאור שורה אחרי התיאור<br>4 = תצוגה בעמודת תיאור אחרי התיאור רק אם לא ריק
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=האם ניתן לצבור את הערך של השדה כדי לקבל סכום כולל לרשימה? (דוגמאות: 1 או 0)
 SearchAllDesc=האם השדה משמש לביצוע חיפוש מכלי החיפוש המהיר? (דוגמאות: 1 או 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=הגדירו בקובץ הטריגר את הקוד שברצונכ
 SeeIDsInUse=ראה מזהים שנמצאים בשימוש בהתקנה שלך
 SeeReservedIDsRangeHere=ראה מגוון תעודות זהות שמורות
 ToolkitForDevelopers=ערכת כלים למפתחי Dolibarr
-TryToUseTheModuleBuilder=אם יש לך ידע ב-SQL ו-PHP, תוכל להשתמש באשף בניית המודולים המקורי.<br>הפעל את המודול <strong>%s</strong> והשתמש באשף על ידי לחיצה על <span class="fa fa-bug"></span> בתפריט הימני העליון.<br>אזהרה: זוהי תכונת מפתחים מתקדמת, אל <b> ניסוי span class='notranslate'></b></span> באתר הייצור שלך!
+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=ראה <span class="fa fa-bug"></span> בתפריט הימני העליון
 AddLanguageFile=הוסף קובץ שפה
 YouCanUseTranslationKey=אתה יכול להשתמש כאן במפתח שהוא מפתח התרגום שנמצא לקובץ השפה (ראה לשונית "שפות")
@@ -148,7 +148,7 @@ CSSListClass=CSS לרשימה
 NotEditable=לא ניתן לעריכה
 ForeignKey=מפתח זר
 ForeignKeyDesc=אם יש להבטיח שהערך של שדה זה קיים בטבלה אחרת. הזן כאן תחביר תואם ערך: tablename.parentfieldtocheck
-TypeOfFieldsHelp=דוגמה:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>סיסמהbzcc</03492fzcc</03492 span>double(24,8)<span class='notranslate'><br>real<br>text<br>html <br>date<br>datetime<br>timestamp <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fccfda19b /span><span class='notranslate'><br>'1' פירושו שאנו מוסיפים כפתור + אחרי המשולב כדי ליצור את הרשומה<br>'מסנן' הוא תנאי תחביר מסנן אוניברסלי, דוגמה: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (ישות:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=זהו סוג השדה/תכונה.
 AsciiToHtmlConverter=ממיר Ascii ל-HTML
 AsciiToPdfConverter=ממיר Ascii ל-PDF
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=הוספת הקוד לתיאור נכשלה. בד
 DictionariesCreated=מילון <b>%s</b> נוצר בהצלחה
 DictionaryDeleted=מילון <b>%s</b> הוסר בהצלחה
 PropertyModuleUpdated=הנכס <b>%s</b> עודכן בהצלחה
-InfoForApiFile=* כאשר אתה יוצר קובץ בפעם הראשונה, כל השיטות ייווצרו <strong>עבור כל אובייקט.</strong><br>* כשאתה לוחץ ב-<strong>remove</strong> אתה פשוט מסיר את כל השיטות עבור ה-<span ='notranslate'><strong></span>האובייקט שנבחר</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=עמוד להגדרת מודול
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=אתה יכול ליצור ולערוך כאן את קבצי הכיתה כדי לספק בוררי יעד חדשים לדוא"ל עבור מודול שליחת הדוא"ל ההמונית
diff --git a/htdocs/langs/he_IL/multicurrency.lang b/htdocs/langs/he_IL/multicurrency.lang
index 1d550cb8b9f..0694c8961c2 100644
--- a/htdocs/langs/he_IL/multicurrency.lang
+++ b/htdocs/langs/he_IL/multicurrency.lang
@@ -7,12 +7,12 @@ multicurrency_syncronize_error=שגיאת סנכרון: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=השתמש בתאריך של המסמך כדי למצוא את שער המטבע, במקום להשתמש בשער האחרון הידוע
 multicurrency_useOriginTx=כאשר אובייקט נוצר מאובייקט אחר, שמור את הקצב המקורי מאובייקט המקור (אחרת השתמש בקצב האחרון הידוע)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=עליך ליצור חשבון באתר %s כדי להשתמש בפונקציונליות זו.<br>קבל את <b> שלך /span>מפתח API<span class='notranslate'></b>.<br>אם אתה משתמש בחשבון חינמי, לא תוכל לשנות את ה-<b>מטבע המקור</b> (דולר ארה"ב כברירת מחדל).<br>אם המטבע הראשי שלך אינו דולר ארה"ב, היישום יחשב אותו מחדש באופן אוטומטי.<br><br>אתה מוגבל ל-1000 סנכרון בחודש.
+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
 multicurrency_appCurrencySource=מטבע המקור
 multicurrency_alternateCurrencySource=מטבע מקור חלופי
 CurrenciesUsed=השתמשו במטבעות
-CurrenciesUsed_help_to_add=הוסף את המטבעות והשערים השונים שבהם אתה צריך להשתמש בהצעות <b></b>, b0aee83365<b0aee83365 /span>הזמנות<span class='notranslate'></b> וכו'.
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=ציון
 MulticurrencyReceived=התקבל, מטבע מקורי
 MulticurrencyRemainderToTake=הסכום הנותר, המטבע המקורי
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index e0560fc6164..6287d70c38f 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -189,7 +189,7 @@ EnterNewPasswordHere=הזן את הסיסמה החדשה שלך כאן
 BackToLoginPage=חזרה לדף הכניסה
 AuthenticationDoesNotAllowSendNewPassword=מצב האימות הוא <b>%s</b>.<translate' class='no ><br></span>במצב זה, Dolibarr לא יכול לדעת או לשנות את הסיסמה שלך.<br>צור קשר עם מנהל המערכת שלך אם ברצונך לשנות את הסיסמה שלך.
 EnableGDLibraryDesc=התקן או הפעל את ספריית GD בהתקנת PHP שלך כדי להשתמש באפשרות זו.
-ProfIdShortDesc=<b>מזהה מקצוען %s</b> הוא מידע התלוי במדינה של צד שלישי. <br>לדוגמה, עבור מדינה <b>%s</b>, זה הקוד <b>%s<span class='notranslate'>b09a17f8z.b09a17b>.
+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
 StatsByAmount=סטטיסטיקה על כמות מוצרים/שירותים
 StatsByAmountProducts=סטטיסטיקה על כמות המוצרים
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=העלאת הקובץ <b>%s</b> נכשלה.
 AddFolder=צור תיקיה
 FileWasCreateFolder=התיקיה <b>%s</b> נוצרה
 FTPFailedToCreateFolder=יצירת התיקייה <b>%s</b> נכשלה.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/he_IL/paypal.lang b/htdocs/langs/he_IL/paypal.lang
index 86d5961c1e2..f80a0e9e746 100644
--- a/htdocs/langs/he_IL/paypal.lang
+++ b/htdocs/langs/he_IL/paypal.lang
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=בוצעה החזרה לאחור על כל פ
 ValidationOfPaymentFailed=אימות התשלום נכשל
 CardOwner=בעל כרטיס
 PayPalBalance=אשראי Paypal
-OnlineSubscriptionPaymentLine=מנוי מקוון נרשם ב-%s<br>בתשלום באמצעות %s<br>כתובת ה-IP המקורית: %s<br>מזהה עסקה: <span class='notranslate2ecz870fccfda19bz0'> </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index e458d0b7850..9713df556ec 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -208,11 +208,6 @@ unitSET=מַעֲרֶכֶת
 unitS=שְׁנִיָה
 unitH=שָׁעָה
 unitD=יְוֹם
-unitG=גְרַם
-unitM=מטר
-unitLM=מטר ליניארי
-unitM2=מטר מרובע
-unitM3=מטר מרובע
 unitL=לִיטר
 unitT=טוֹן
 unitKG=ק"ג
@@ -221,6 +216,7 @@ unitMG=מ"ג
 unitLB=לִירָה
 unitOZ=אוּנְקִיָה
 unitM=מטר
+unitLM=מטר ליניארי
 unitDM=dm
 unitCM=ס"מ
 unitMM=מ"מ
@@ -289,9 +285,9 @@ MinimumRecommendedPrice=מחיר מינימלי מומלץ הוא: %s
 PriceExpressionEditor=עורך ביטוי מחיר
 PriceExpressionSelected=ביטוי מחיר נבחר
 PriceExpressionEditorHelp1="מחיר = 2 + 2" או "2 + 2" להגדרת המחיר. להשתמש ; להפריד בין ביטויים
-PriceExpressionEditorHelp2=אתה יכול לגשת ל-ExtraFields עם משתנים כמו <b>#extrafield_myextrafieldkey#</b> ומשתנים גלובליים עם 7360e8b0736e8b07 /span>#global_mycode#<span class='notranslate'></b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=גם במחירי המוצר/שירות וגם במחירי הספקים ישנם משתנים זמינים:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=במחיר המוצר/שירות בלבד: <b>#supplier_min_price#</b>b0342fccfda19b</z0342fccfda19 מחירי ספקים בלבד: <span class='notranslate'><b>#supplier_quantity# ו-#supplier_tva_tx#</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=ערכים גלובליים זמינים:
 PriceMode=מצב מחיר
 PriceNumeric=מספר
@@ -437,4 +433,6 @@ ModifyValueExtrafields = שנה ערך של שדה נוסף
 OrProductsWithCategories=או מוצרים עם תגיות/קטגוריות
 WarningTransferBatchStockMouvToGlobal = אם ברצונך להפוך את המוצר הזה לסידריאליזציה, כל המלאי המסודר שלו יהפוך למלאי גלובלי
 WarningConvertFromBatchToSerial=אם יש לך כרגע כמות גבוהה או שווה ל-2 עבור המוצר, מעבר לבחירה זו אומר שעדיין יהיה לך מוצר עם אובייקטים שונים מאותה אצווה (בעוד שאתה רוצה מספר סידורי ייחודי). השכפול יישאר עד לביצוע מלאי או תנועת מלאי ידנית לתיקון זה.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=האם אתה בטוח שברצונך לחזור למצב טיוטה?<br>הכמויות המוגדרות כעת במלאי יאופסו.
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 35311e83d63..f4df2ff4ccb 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -164,14 +164,14 @@ InventoryCode=קוד תנועה או מלאי
 IsInPackage=כלול בחבילה
 WarehouseAllowNegativeTransfer=מלאי יכול להיות שלילי
 qtyToTranferIsNotEnough=אין לך מספיק מלאי ממחסן המקור שלך וההגדרה שלך לא מאפשרת מלאי שלילי.
-qtyToTranferLotIsNotEnough=אין לך מספיק מלאי, עבור מספר מגרש זה, ממחסן המקור שלך וההגדרה שלך לא מאפשרת מלאי שלילי (כמות עבור מוצר '%s' עם מגרש '<span class' ='notranslate'>%s</span>' הוא %s במחסן '%s').
+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=הצג מחסן
 MovementCorrectStock=תיקון מלאי עבור מוצר %s
 MovementTransferStock=העברת מלאי של מוצר %s למחסן אחר
 BatchStockMouvementAddInGlobal=מלאי אצווה עובר למלאי גלובלי (המוצר לא משתמש יותר באצווה)
 InventoryCodeShort=Inv./Mov. קוד
 NoPendingReceptionOnSupplierOrder=אין קבלה בהמתנה עקב הזמנת רכש פתוחה
-ThisSerialAlreadyExistWithDifferentDate=מגרש/מספר סידורי זה (<strong>%s</strong>) כבר קיים אבל עם תאריך אחר לאכול עד או למכור (נמצא <strong>%s</strong> < אבל אתה מזין span class='notranslate'><strong></span>%s</strong>).
+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=פתוח (כל תנועה)
 OpenInternal=פתוח (רק תנועה פנימית)
 UseDispatchStatus=השתמש בסטטוס שליחה (אישור/סירוב) עבור קווי מוצרים בקבלת הזמנת רכש
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index 0e935f5d90b..7a00246cf80 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=כתובת אתר להציע %s דף
 ToOfferALinkForOnlinePaymentOnFreeAmount=כתובת אתר להציע %s דף תשלום מקוון בכל סכום ללא אובייקט קיים
 ToOfferALinkForOnlinePaymentOnMemberSubscription=כתובת אתר להציע %s דף תשלום מקוון עבור מנוי חבר
 ToOfferALinkForOnlinePaymentOnDonation=כתובת אתר להציע %s דף תשלום מקוון לתשלום תרומה
-YouCanAddTagOnUrl=אתה יכול גם להוסיף פרמטר url <b>&tag=<i>value</i></span class='notranslate'></b> לכל אחת מכתובות ה-URL הללו (חובה רק עבור תשלום שאינו מקושר לאובייקט) כדי להוסיף תג משלך לתשלום.<br>עבור כתובת האתר של תשלומים ללא אובייקט קיים, תוכל גם להוסיף את הפרמטר <strong>&noidempotency=1</strong> אז אותו קישור עם אותו תג ניתן להשתמש מספר פעמים (מצב תשלום מסוים עשוי להגביל את התשלום ל-1 עבור כל קישור אחר ללא פרמטר זה)
+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=הגדר את ה-Stripe שלך עם כתובת האתר <b>%s</b> כדי ליצור את התשלום באופן אוטומטי מאומת על ידי Stripe.
 AccountParameter=פרמטרים של חשבון
 UsageParameter=פרמטרי שימוש
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index 432376a99cd..e52093bd13c 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -68,9 +68,9 @@ ExpenseReportRuleErrorOnSave=שגיאה: %s
 ExpenseReportRuleSave=כלל דוח ההוצאות נשמר
 ExpenseReportRulesDesc=ניתן להגדיר כללי סכום מקסימלי עבור דוחות הוצאות. כללים אלה יחולו כאשר הוצאה חדשה תתווסף לדוח הוצאות
 ExpenseReportWaitingForApproval=דו"ח הוצאות חדש הוגש לאישור
-ExpenseReportWaitingForApprovalMessage=דוח הוצאות חדש הוגש והוא ממתין לאישור.<br> - משתמש: %s <br> - תקופה: %s<br>לחץ כאן כדי לאמת: <span class='notranslate'>b0ecfda19bz8 span>
+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=דו"ח הוצאות הוגש לאישור מחדש
-ExpenseReportWaitingForReApprovalMessage=דוח הוצאות הוגש והוא ממתין לאישור מחדש.<br>את %s, סירבת לאשר את דוח ההוצאות עבור סיבה זו: %s.<br>גרסה חדשה הוצעה ומחכה לאישורך. <br> - משתמש: %s<br> - תקופה: b0ecb2ec87f49 <span class='notranslate'><br>לחץ כאן כדי לאמת: %s
+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
 ExpenseReportsIk=הגדרת דמי קילומטראז'
 ExpenseReportsRules=כללי דוח הוצאות
 ExpenseReportsToApprove=דוחות הוצאות לאישור
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index ebc9caac864..54f82ecbf1b 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=משתמשים והמאפיינים שלהם
 DomainUser=משתמש דומיין %s
 Reactivate=הפעל מחדש
 CreateInternalUserDesc=טופס זה מאפשר לך ליצור משתמש פנימי בחברה/ארגון שלך. כדי ליצור משתמש חיצוני (לקוח, ספק וכו'...), השתמש בלחצן 'צור משתמש Dolibarr' מכרטיס הקשר של אותו צד שלישי.
-InternalExternalDesc=משתמש <b>פנימי</b> הוא משתמש שהוא חלק מהחברה/ארגון שלך, או שהוא משתמש שותף מחוץ לארגון שלך שאולי יצטרך לראות יותר נתונים מאשר נתונים הקשורים לחברה שלו (מערכת ההרשאות תגדיר מה הוא יכול או לא יכול לראות או לעשות).<br>An <span class=' משתמש notranslate'><b></span>external</b> הוא לקוח, ספק או אחר שחייב להציג רק נתונים הקשורים לעצמו (יצירת משתמש חיצוני עבור צד שלישי יכולה להיות נעשה מתוך רשומת אנשי הקשר של הצד השלישי).<br><br>בשני המקרים, עליך להעניק הרשאות לתכונות הצורך של המשתמש.
+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=הרשאה ניתנה בגלל בירושה מאחד מקבוצת המשתמש.
 Inherited=ירש
 UserWillBe=המשתמש שנוצר יהיה
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index d7b772ddc6b..d6baed95ad4 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -54,7 +54,7 @@ ReadPerm=לקרוא
 WritePerm=לִכתוֹב
 TestDeployOnWeb=בדיקה/פריסה באינטרנט
 PreviewSiteServedByWebServer=<u>תצוגה מקדימה של %s בכרטיסייה חדשה.</u><br><br>ה-%s יוגש על ידי שרת אינטרנט חיצוני (כמו Apache, Nginx, IIS ). עליך להתקין ולהגדיר את השרת הזה לפני כדי להצביע על הספרייה:<br><strong>%s span></strong><br>כתובת אתר מוגשת על ידי שרת חיצוני:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>תצוגה מקדימה של %s בכרטיסייה חדשה.</u><br><br>ה-%s יוגש על ידי שרת Dolibarr כך שהוא לא צריך שום שרת אינטרנט נוסף (כמו Apache, Nginx, IIS) להתקנה.<br>הבלתי נוח הוא שכתובות האתרים של הדפים אינן ידידותיות למשתמש ומתחילות בנתיב של Dolibarr שלך.<br>כתובת אתר מוגשת על ידי Dolibarr:<br><strong><span class='notranslate2ec8b87b /span></strong><br><br>כדי להשתמש בשרת אינטרנט חיצוני משלך כדי שרת אתר אינטרנט זה, צור מארח וירטואלי בשרת האינטרנט שלך שמצביע על הספרייה<br><strong>%s</strong><br>ולאחר מכן הזן את השם של שרת וירטואלי זה במאפייני אתר זה ולחץ על קישור "בדוק/פרוס באינטרנט".
+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=כתובת האתר של המארח הוירטואלי המוגש על ידי שרת אינטרנט חיצוני לא מוגדרת
 NoPageYet=עדיין אין דפים
 YouCanCreatePageOrImportTemplate=אתה יכול ליצור דף חדש או לייבא תבנית אתר מלאה
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=אתה יכול לערוך קוד מקור HTML ב
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=עבור תמונה ששותפה עם קישור שיתוף (גישה פתוחה באמצעות מפתח ה-hash השיתוף של הקובץ), התחביר הוא:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;070fcd9b <br>
-YouCanEditHtmlSource3=כדי לקבל את כתובת האתר של התמונה של אובייקט PHP, השתמש ב<br><strong>&lt; span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"<span> class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>דוגמאות נוספות של HTML או קוד דינמי זמינות ב<a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">תיעוד הוויקי</a> >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=שיבוט דף/מיכל
 CloneSite=אתר שיבוט
 SiteAdded=האתר נוסף
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 27bcb2cf1d1..c0c789a96c5 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -76,7 +76,7 @@ DictionarySetup=Podešavanje definicija
 Dictionary=Definicije
 ErrorReservedTypeSystemSystemAuto=Vrijednosti 'sistem' i 'sistemauto' za tipove je rezervirana. Možete koristiti 'korisnik' kao vrijednost za dodavanje vlastitog podatka
 ErrorCodeCantContainZero=Kod ne može sadržavati vrijednost 0
-DisableJavascript=Onemogući JavaScript i AJAX funkcije 
+DisableJavascript=Onemogući JavaScript i AJAX funkcije
 DisableJavascriptNote=Napomena: Samo u svrhu testiranja ili otklanjanja pogrešaka. Za optimizaciju za slijepe osobe ili tekstualne preglednike, možda ćete radije koristiti postavke na profilu korisnika
 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.
@@ -213,7 +213,7 @@ BoxesDesc=Widgeti su komponente koje prikazuju neke informacije koje možete dod
 OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogućenih modula</a>
 ModulesDesc=Moduli/aplikacije određuju koje su značajke dostupne u softveru. Neki moduli zahtijevaju da se dozvole dodijele korisnicima nakon aktivacije modula. Kliknite gumb za uključivanje/isključivanje <span class="small valignmiddle"> %s </span> svakog modula kako biste omogućili ili onemogućili modul/aplikaciju.
 ModulesDesc2=Kliknite gumb kotačića <span class="small valignmiddle"> %s </span> da biste konfigurirali modul/aplikaciju.
-ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
+ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama
 ModulesDeployDesc=Ako dozvole na vašem datotečnom sustavu to dopuštaju, možete koristiti ovaj alat za implementaciju vanjskog modula. Modul će tada biti vidljiv na kartici <strong> %s </strong>.
 ModulesMarketPlaces=Nađi vanjske aplikacije/module
 ModulesDevelopYourModule=Razvijte vlastitu aplikaciju/module
@@ -260,7 +260,7 @@ Developpers=Kreatori/suradnici
 OfficialWebSite=Dolibarr službena web stranica
 OfficialWebSiteLocal=Lokalna web lokacija (%s)
 OfficialWiki=Dolibarr dokumentacija / Wiki
-OfficialDemo=Dolibarr Online demo 
+OfficialDemo=Dolibarr Online demo
 OfficialMarketPlace=Ovlaštena trgovina za vanjske module/dodatke
 OfficialWebHostingService=Preporučeni web hosting servisi (Cloud hosting)
 ReferencedPreferredPartners=Preferirani partneri
@@ -402,7 +402,7 @@ TestSubmitForm=Unesite obrazac testiranja
 ThisForceAlsoTheme=Korištenje ovog upravitelja izbornika također će koristiti vlastitu temu bez obzira na odabir korisnika. Također ovaj upravitelj izbornika specijaliziran za pametne telefone ne radi na svim pametnim telefonima. Koristite drugi upravitelj izbornika ako imate problema sa svojim.
 ThemeDir=Mapa stilova
 ConnectionTimeout=Vrijeme povezanosti je isteklo
-ResponseTimeout=Odgovor 
+ResponseTimeout=Odgovor
 SmsTestMessage=Test poruka od __PHONEFROM__ za __PHONETO__
 ModuleMustBeEnabledFirst=Modul <b>%s</b> mora biti omogućen ako želite koristiti ovu mogučnost.
 SecurityToken=Ključ za sigurne URL-ove
@@ -766,7 +766,7 @@ Permission84=Ovjeri narudžbu kupca
 Permission85=Generirajte dokumente prodajnih naloga
 Permission86=Pošalji narudžbu kupca
 Permission87=Zatvori narudžbu kupca
-Permission88=Otkaži potvrdu 
+Permission88=Otkaži potvrdu
 Permission89=Obriši narudžbe kupaca
 Permission91=Čitaj društvene ili fiskalne poreze i PDV
 Permission92=Izradi/izmjeni društvene ili fiskalne poreze i PDV
@@ -1197,6 +1197,7 @@ Skin=Skin teme
 DefaultSkin=Zadani skin teme
 MaxSizeList=Maks. dužina za popis
 DefaultMaxSizeList=Zadana maks. dužina popisa
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Zadana maksimalna duljina za kratke liste (tj. u kartici korisnika)
 MessageOfDay=Poruka dana
 MessageLogin=Poruka na stranici za prijavu
@@ -1777,7 +1778,7 @@ DeliveriesOrderAbility=Potvrde o isporuci proizvoda
 FreeLegalTextOnDeliveryReceipts=Slobodan unos teksta na primkama
 ##### FCKeditor #####
 AdvancedEditor=Napredni uređivač
-ActivateFCKeditor=Aktiviraj napredni uređivač za: 
+ActivateFCKeditor=Aktiviraj napredni uređivač za:
 FCKeditorForNotePublic=WYSIWYG kreiranje/izdanje polja "javne bilješke" elemenata
 FCKeditorForNotePrivate=WYSIWYG kreiranje/izdanje polja "privatne bilješke" elemenata
 FCKeditorForCompany=WYSIWYG izrada/izdanje polja opisa elemenata (osim proizvoda/usluga)
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Ne izvoziti događaj stariji od
 SecurityKey = Sigurnosni ključ
 ##### ClickToDial #####
 ClickToDialSetup=Podešavanje modula ClickToDial
-ClickToDialUrlDesc=URL koji se poziva kada se izvrši klik na sliku telefona. U URL-u možete koristiti oznake<br><b>__PHONETO__</b> koje će biti zamijenjen telefonskim brojem osobe koju treba nazvati<br><b>__PHONEFROM__</b> koji bit će zamijenjen telefonskim brojem osobe koja zove (vaš)<br><b>__LOGIN__</b></span span> koja će biti zamijenjena prijavom za biranje klika (definirana na korisničkoj kartici)<span class='notranslate'><br><b>__PASS__ </b> koja će biti zamijenjena lozinkom clicktodial (definirana na korisničkoj kartici).
+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=Ovaj modul mijenja telefonske brojeve, kada koristite stolno računalo, u veze na koje se može kliknuti. Klik će pozvati broj. Ovo se može koristiti za pokretanje telefonskog poziva kada koristite soft telefon na vašem stolnom računalu ili kada koristite CTI sustav koji se temelji na SIP protokolu, na primjer. Napomena: Kada koristite pametni telefon, telefonske brojeve uvijek možete kliknuti.
 ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
 ClickToDialUseTelLinkDesc=Upotrijebite ovu metodu ako vaši korisnici imaju softphone ili softversko sučelje, instalirano na istom računalu kao i preglednik, i koji se poziva kada kliknete na vezu koja počinje s "tel:" u vaš preglednik. Ako trebate vezu koja počinje s "sip:" ili potpuno poslužiteljsko rješenje (nema potrebe za lokalnom instalacijom softvera), ovo morate postaviti na "Ne" i ispunite sljedeće polje.
@@ -2161,7 +2162,7 @@ NoNewEmailToProcess=Nema nove e-pošte (odgovarajući filteri) za obradu
 NothingProcessed=Ništa nije učinjeno
 RecordEvent=Zabilježite događaj u dnevnom redu (s vrstom Email poslana ili primljena)
 CreateLeadAndThirdParty=izradi potencijalni klijent (i treća strana ako je potrebno)
-CreateTicketAndThirdParty=izradi ulaznica (povezana s trećom stranom ako je treća strana učitana prethodnom operacijom ili je pogodena iz programa za praćenje u <span class='notranslate'>e-pošta</span) > zaglavlje, inače bez treće strane)
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation or was guessed from a tracker in email header, without third party otherwise)
 CodeLastResult=Najnoviji kod rezultata
 NbOfEmailsInInbox=Broj e-poruka u izvornom direktoriju
 LoadThirdPartyFromName=Učitaj traženje treće strane na %s (samo učitavanje)
@@ -2176,7 +2177,7 @@ CreateCandidature=Napravite prijavu za posao
 FormatZip=PBR
 MainMenuCode=Kôd za unos izbornika (glavni izbornik)
 ECMAutoTree=Prikaži automatsko ECM stablo
-OperationParamDesc=Definirajte pravila koja će se koristiti za izdvajanje nekih podataka ili postavite vrijednosti za upotrebu za operaciju.<br><br>Primjer za izdvajanje <span klase ='notranslate'>tvrtka</span> naziv iz e-pošta subjekta u privremenu varijablu:<br>tmp_var=EXTRACT:SUBJECT: Poruka od tvrtka ([^\n]*)<br><br>Primjeri za postavljanje svojstava objekta na izradi:<br>objproperty1=SET:tvrdo kodirana vrijednost<br>objproperty2=SET:__tmp_var__<br> objproperty3=SETIFEMPTY:vrijednost (vrijednost je postavljena samo ako svojstvo nije već definirano)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([ ^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>objekt .objproperty5=EXTRACT:BODY:Moje tvrtka ime je\\s([^\\s]*)<br><br>Upotrijebite novi redak za izdvajanje ili postavljanje nekoliko svojstava.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
 OpeningHours=Radno vrijeme
 OpeningHoursDesc=Ovdje unesite redovno radno vrijeme Vaše tvrtke.
 ResourceSetup=Konfiguracija modula resursa
@@ -2219,7 +2220,7 @@ ImportSetup=Postavljanje uvoza modula
 InstanceUniqueID=Jedinstveni ID instance
 SmallerThan=Manje od
 LargerThan=Veće od
-IfTrackingIDFoundEventWillBeLinked=Imajte na umu da ako se ID praćenja objekta pronađe u e-pošta ili ako je e-pošta odgovor <span klase ='notranslate'>e-pošta</span> već prikupljeni i povezan s objektom, stvoreni događaj automatski će se povezati s poznatim povezanim objektom.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email already collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=S GMail računom, ako ste omogućili provjeru valjanosti u 2 koraka, preporučuje se izradi namjenska druga lozinka za aplikaciju umjesto korištenja vlastite lozinke računa s https://myaccount .google.com/.
 EmailCollectorTargetDir=Možda bi bilo poželjno premjestiti e-pošta u drugi oznaka/direktorij nakon što je uspješno obrađen. Ovdje samo postavite ime direktorija da biste koristili ovu značajku (NEMOJTE koristiti posebne znakove u imenu). Imajte na umu da također morate koristiti račun za prijavu za čitanje/pisanje.
 EmailCollectorLoadThirdPartyHelp=Ovu radnju možete upotrijebiti za korištenje sadržaja e-pošta za pronalaženje i učitavanja postojeće treće strane u vašoj bazi podataka (pretražit će se na definiranom svojstvu između 'id','name','name_alias','e-pošta'). Pronađena (ili stvorena) treća strana koristit će se za sljedeće radnje koje to trebaju.<br>Na primjer, ako želite izradi treća strana s imenom izdvojenim iz niza 'Ime: ime za pronalaženje' prisutna u tijelu, koristite pošiljatelja e-pošta kao e-pošta, polje parametra možete postaviti ovako:<br>'e-pošta=HEADER:^From:(.*) ;name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index ae1a1be1270..ac9c4bd7086 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=Snažna metoda s puno parametara. Potpuno prilag
 ByTerminal=Po terminalu
 TakeposNumpadUsePaymentIcon=Koristite ikonu umjesto teksta na gumbima za plaćanje numeričke tipkovnice
 CashDeskRefNumberingModules=Modul numeracije za POS prodaju
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b></span span> <span class='notranslate'>oznaka koristi se za dodavanje broja terminala
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Merge lines of the same products
 StartAParallelSale=Započnite novu paralelnu prodaju
 SaleStartedAt=Prodaja je počela u %s
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index cd3b373dde4..e3b1941bbf4 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -114,7 +114,7 @@ ErrorMaxNumberReachForThisMask=Dosegnut je najveći broj za ovu masku
 ErrorCounterMustHaveMoreThan3Digits=Brojač mora imati više od 3 znamenke
 ErrorSelectAtLeastOne=Pogreška, odaberite barem jedan unos.
 ErrorDeleteNotPossibleLineIsConsolidated=Brisanje nije moguće jer je zapis povezan s bankovnom transakcijom koja je usklađena
-ErrorProdIdAlreadyExist=%s je dodjeljen to drugom 
+ErrorProdIdAlreadyExist=%s je dodjeljen to drugom
 ErrorFailedToSendPassword=Slanje lozinke nije uspjelo
 ErrorFailedToLoadRSSFile=Ne uspijeva dobiti RSS feed. Pokušajte dodati konstantu MAIN_SIMPLEXMLLOAD_DEBUG ako poruke o grešci ne pružaju dovoljno informacija.
 ErrorForbidden=Pristup odbijen.<br>Pokušavate pristupiti stranici, području ili značajki onemogućenog modula ili bez da ste u autentificiranoj sesiji ili to nije dopušteno vašem korisniku.
@@ -349,7 +349,7 @@ WarningCloseAlways=Upozorenje, zatvaranje se vrši čak i ako se iznos razlikuje
 WarningUsingThisBoxSlowDown=Upozorenje, korištenje ovog okvira ozbiljno usporava sve stranice koje prikazuju okvir.
 WarningClickToDialUserSetupNotComplete=Postavljanje ClickToDial informacija za vašeg korisnika nije dovršeno (pogledajte karticu ClickToDial na vašoj korisničkoj kartici).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Značajka je onemogućena kada je postavka zaslona optimizirana za slijepe osobe ili tekstualne preglednike.
-WarningPaymentDateLowerThanInvoiceDate=Datum plaćanja (%s) je raniji od datuma fakture (%s) za fakturu <span class='notranslate'>%s</ raspon>.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Previše podataka (više od %s redaka). Upotrijebite više filtara ili postavite konstantu %s na višu granicu.
 WarningSomeLinesWithNullHourlyRate=Neki su korisnici zabilježili neka vremena, a njihova satnica nije bila definirana. Korištena je vrijednost od 0 %s po satu, ali to može dovesti do pogrešnog vrednovanja utrošenog vremena.
 WarningYourLoginWasModifiedPleaseLogin=Vaša prijava je promijenjena. Iz sigurnosnih razloga morat ćete se prijaviti sa svojom novom prijavom prije sljedeće radnje.
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 41dd2155944..df4f482aec1 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=Uvezena datoteka mora imati format <strong>email;name
 UseFormatInputEmailToTarget=Unesite niz u formatu <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Primatelji (napredni odabir)
 AdvTgtTitle=Ispunite polja za unos kako biste unaprijed odabrali treće strane ili kontakte/adrese za ciljanje
-AdvTgtSearchTextHelp=Koristite %% kao zamjenske znakove. Na primjer, da biste pronašli sve stavke poput <b>jean, joe, jim</b>, možete unijeti  <b>j%%</b>, također možete koristiti ; kao separator za vrijednost, i koristite ! osim ove vrijednosti. Na primjer <b>jean;joe;jim%%;!jimo;!jima%%</span span><span class='notranslate'></b> ciljat će sve jean, joe, započeti s jim, ali ne i jimo i ne sve što počinje s jima
+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=Koristite interval za odabir int ili float vrijednosti
 AdvTgtMinVal=Minimalna vrijednost
 AdvTgtMaxVal=Maksimalna vrijednost
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 0487c472422..6324dbeeb3e 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -44,7 +44,7 @@ NotEnoughDataYet=Nedovoljno podataka
 NoError=Bez greške
 Error=Greška
 Errors=Greške
-ErrorFieldRequired=Potrebno je polje '%s' 
+ErrorFieldRequired=Potrebno je polje '%s'
 ErrorFieldFormat=Neispravna vrijednost u polju '%s'
 ErrorFileDoesNotExists=Datoteka %s ne postoji
 ErrorFailedToOpenFile=Otvaranje datoteke %s nije uspjelo
@@ -420,6 +420,8 @@ TotalTTCShort=Ukupno s PDV-om
 TotalHT=Ukupno bez PDV-a
 TotalHTforthispage=Ukupno (bez PDV-a) na ovoj stranici
 Totalforthispage=Ukupno na ovoj stranici
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Ukupno s PDV-om
 TotalTTCToYourCredit=Ukupno s porezom na vaš račun
 TotalVAT=Iznos PDV-a
@@ -647,6 +649,7 @@ ReportName=Naziv izvještaja
 ReportPeriod=Razdoblje izvještaja
 ReportDescription=Opis
 Report=Izvještaj
+Reports=Reports
 Keyword=Ključna riječ
 Origin=Porijeklo
 Legend=Natpis
@@ -712,7 +715,7 @@ AlreadyRead=Već pročitano
 NotRead=Nepročitano
 NoMobilePhone=Nema mobilnog telefona
 Owner=Vlasnik
-FollowingConstantsWillBeSubstituted=Sljedeće konstante bit će zamjenjene s odgovarajućom vrijednošću. 
+FollowingConstantsWillBeSubstituted=Sljedeće konstante bit će zamjenjene s odgovarajućom vrijednošću.
 Refresh=Osvježi
 BackToList=Povratak na popis
 BackToTree=Natrag na stablo
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 828ce58d2d7..2b266401558 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=Ovdje pogledajte primjere
 EnabledDesc=Uvjet da ovo polje bude aktivno.<br><br>Primjeri:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Je li polje vidljivo? (Primjeri: 0=Nikad vidljivo, 1=Vidljivo na popisu i izradi/update/view forms, 2=Vidljivo na popisu samo, 3=Vidljivo samo na izradi/update/view obrascu (ne na popisima), 4=Vidljivo na popisima i ažuriranje /prikaži samo obrazac (ne izradi), 5=Vidljivo na popisu i samo prikaži obrazac (ne izradi, ne ažurirati).<br><br>Korištenje negativne vrijednosti znači da se polje prema zadanim postavkama ne prikazuje na popis ali se može odabrati za pregled).
 ItCanBeAnExpression=Može biti izraz. Primjer:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('praznik', 'defini_praznik')?1:5
-DisplayOnPdfDesc=Prikaži ovo polje na kompatibilnim PDF dokumentima, položajem možeš upravljati pomoću polja "Pozicija".<br><strong>Za dokument:</strong><br>0 = nije prikazan <br>1 = prikaz<br>2 = prikaži samo ako nije prazno<br><br><strong></span span>Za retke dokumenta:<span class='notranslate'></strong><br>0 = nije prikazano <br>1 = prikazano u stupcu<br>3 = prikaz u stupcu opisa retka nakon opisa<br>4 = prikaz u stupcu opisa nakon opisa samo ako nije prazna
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=U PDF-u
 IsAMeasureDesc=Može li se vrijednost polja kumulirati kako bi se zbroj donio na popis? (Primjeri: 1 ili 0)
 SearchAllDesc=Koristi li se polje za pretraživanje pomoću alata za brzo pretraživanje? (Primjeri: 1 ili 0)
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 359ffab4495..b619b266a53 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -5,7 +5,7 @@ Tools=Alati
 TMenuTools=Alati
 ToolsDesc=Svi alati koji nisu uključeni u ostalim sučeljima grupirani su ovdje.<br>Možete im pristupiti uz pomoć izbornika lijevo.
 Birthday=Rođendan
-BirthdayAlert=Birthday alert
+BirthdayAlert=Upozorenje za rođendan
 BirthdayAlertOn=rođendansko upozorenje aktivno
 BirthdayAlertOff=rođendansko upozorenje neaktivno
 TransKey=Prijevod ključa TransKey
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Prethodna godina datuma fakture
 NextYearOfInvoice=Sljedeća godina datuma fakture
 DateNextInvoiceBeforeGen=Datum sljedeće fakture (prije generiranja)
 DateNextInvoiceAfterGen=Datum sljedeće fakture (nakon generiranja)
-GraphInBarsAreLimitedToNMeasures=Grafike su ograničene na mjere %s u načinu 'Bars'. Umjesto toga automatski je odabran način rada 'Linije'.
+GraphInBarsAreLimitedToNMeasures=Grafika je ograničena na %s mjere u načinu 'Stupke'. Umjesto toga automatski je odabran način 'Linije'.
 OnlyOneFieldForXAxisIsPossible=Samo 1 polje je trenutno moguće kao X-os. Odabrano je samo prvo odabrano polje.
 AtLeastOneMeasureIsRequired=Potrebno je najmanje 1 polje za mjeru
 AtLeastOneXAxisIsRequired=Potrebno je najmanje 1 polje za X-os
@@ -41,33 +41,35 @@ notiftofixedemail=Na fiksnu poštu
 notiftouserandtofixedemail=Na korisničku i fiksnu poštu
 Notify_ORDER_VALIDATE=Prodajni nalog potvrđen
 Notify_ORDER_SENTBYMAIL=Prodajni nalog poslan poštom
-Notify_ORDER_CLOSE=Sales order delivered
+Notify_ORDER_CLOSE=Prodajna narudžba isporučena
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Narudžbenica poslana e-poštom
 Notify_ORDER_SUPPLIER_VALIDATE=Narudžbenica je snimljena
 Notify_ORDER_SUPPLIER_APPROVE=Narudžbenica odobrena
+Notify_ORDER_SUPPLIER_SUBMIT=Narudžbenica poslana
 Notify_ORDER_SUPPLIER_REFUSE=Narudžbenica odbijena
 Notify_PROPAL_VALIDATE=Potvrđen prijedlog kupaca
 Notify_PROPAL_CLOSE_SIGNED=Prijedlog korisnika zatvoren potpisan
 Notify_PROPAL_CLOSE_REFUSED=Prijedlog korisnika zatvoren je odbijen
 Notify_PROPAL_SENTBYMAIL=Ponuda poslana poštom
 Notify_WITHDRAW_TRANSMIT=Povlačenje prijenosa
-Notify_WITHDRAW_CREDIT=Credit withdrawal
+Notify_WITHDRAW_CREDIT=Povlačenje kredita
 Notify_WITHDRAW_EMIT=Izvršite isplatu
 Notify_COMPANY_CREATE=Komitent kreiran
-Notify_COMPANY_SENTBYMAIL=Mails sent from the page of third party
-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_COMPANY_SENTBYMAIL=Pošta poslana sa stranice treće strane
+Notify_BILL_VALIDATE=Faktura kupca potvrđena
+Notify_BILL_UNVALIDATE=Faktura kupca nije potvrđena
+Notify_BILL_PAYED=Plaćena faktura kupca
+Notify_BILL_CANCEL=Faktura kupca otkazana
+Notify_BILL_SENTBYMAIL=Račun kupca šalje poštom
+Notify_BILL_SUPPLIER_VALIDATE=Faktura dobavljača potvrđena
+Notify_BILL_SUPPLIER_PAYED=Plaćena faktura dobavljača
+Notify_BILL_SUPPLIER_SENTBYMAIL=Faktura dobavljača poslana poštom
+Notify_BILL_SUPPLIER_CANCELED=Faktura dobavljača poništena
 Notify_CONTRACT_VALIDATE=Ugovor potvrđen
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_VALIDATE=Intervencija potvrđena
+Notify_FICHINTER_CLOSE=Intervencija zatvorena
+Notify_FICHINTER_ADD_CONTACT=Dodan kontakt u Intervenciju
+Notify_FICHINTER_SENTBYMAIL=Intervencija poslana poštom
 Notify_SHIPPING_VALIDATE=Dostava potvrđena
 Notify_SHIPPING_SENTBYMAIL=Dostava poslana poštom
 Notify_MEMBER_VALIDATE=Član potvrđen
@@ -81,39 +83,39 @@ Notify_TASK_MODIFY=Zadatak izmijenjen
 Notify_TASK_DELETE=Zadatak je izbrisan
 Notify_EXPENSE_REPORT_VALIDATE=Potvrđeno izvješće o troškovima (potrebno je odobrenje)
 Notify_EXPENSE_REPORT_APPROVE=Izvješće o troškovima odobreno
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=Leave request approved
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_HOLIDAY_VALIDATE=Ostavi zahtjev potvrđen (potrebno je odobrenje)
+Notify_HOLIDAY_APPROVE=Zahtjev za odlazak odobren
+Notify_ACTION_CREATE=Dodana radnja na dnevni red
 SeeModuleSetup=Pogledajte postavljanje modula %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
+NbOfAttachedFiles=Broj priloženih datoteka/dokumenata
+TotalSizeOfAttachedFiles=Ukupna veličina priloženih datoteka/dokumenata
 MaxSize=Maksimalna veličina
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
+AttachANewFile=Priložite novu datoteku/dokument
+LinkedObject=Povezani objekt
 NbOfActiveNotifications=Broj obavijesti (br. e-poruka primatelja)
-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__
+PredefinedMailTest=__(Zdravo)__\nOvo je probna pošta poslana na __EMAIL__.\nRedovi su odvojeni znakom za početak.\n\n__POTPIS_KORISNIKA__
+PredefinedMailTestHtml=__(Pozdrav)__<br>Ovo je <b>test</b> poruka poslana na __EMAIL__ (provjera riječi mora biti podebljana).<br>Reci su odvojeni znakom za početak.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Zdravo)__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendInvoice=__(Zdravo)__\n\nU prilogu pogledajte fakturu __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendInvoiceReminder=__(Zdravo)__\n\nPodsjećamo da faktura __REF__ izgleda nije plaćena. Kao podsjetnik prilažemo kopiju računa.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendProposal=__(Zdravo)__\n\nU prilogu pogledajte komercijalni prijedlog __REF__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendSupplierProposal=__(Zdravo)__\n\nU prilogu pronađite zahtjev za cijenu __REF__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendOrder=__(Zdravo)__\n\nU prilogu pronađite narudžbu __REF__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendSupplierOrder=__(Zdravo)__\n\nU prilogu pronađite našu narudžbu __REF__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendSupplierInvoice=__(Zdravo)__\n\nU prilogu pogledajte fakturu __REF__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
 PredefinedMailContentSendShipping=Poštovana/ni,\nposlali smo vam robu prema dostavnici __REF__ u privitku.\n\nUkoliko je dostupna, na dostavnicu upisana je poveznica na stranice prijevoznika i broj pošiljke. Upišite broj na odredišnoj stranici i pratite vašu pošiljku.\n\nSrdačan pozdrav!\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.
+PredefinedMailContentSendFichInter=__(Zdravo)__\n\nU prilogu pronađite intervenciju __REF__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentLink=Možete kliknuti na poveznicu u nastavku da izvršite uplatu ako već nije učinjena.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Zdravo)__\n\n\n__(Iskreno)__\n\n__POTPIS_KORISNIKA__
+PredefinedMailContentSendActionComm=Podsjetnik na događaj "__EVENT_LABEL__" __EVENT_DATE__ u __EVENT_TIME__<br><br>Ovo je automatska poruka, nemojte odgovarati.
+DemoDesc=Dolibarr je kompaktni ERP/CRM koji podržava nekoliko poslovnih modula. Demo koji prikazuje sve module nema smisla jer se ovaj scenarij nikada ne događa (dostupno nekoliko stotina). Dakle, dostupno je nekoliko demo profila.
 ChooseYourDemoProfil=Odaberite demo profil koji najbolje odgovara vašim potrebama...
 ChooseYourDemoProfilMore=...ili napravite vlastiti profil <br> (ručni odabir modula)
 DemoFundation=Upravljanje članovima zaklade
 DemoFundation2=Upravljanje članovima i bankovnim računom zaklade
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash box
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
+DemoCompanyServiceOnly=tvrtka ili samo slobodna prodajna usluga
+DemoCompanyShopWithCashDesk=Upravljajte trgovinom s kasom
+DemoCompanyProductAndStocks=Kupujte prodajući proizvode na prodajnom mjestu
 DemoCompanyManufacturing=Tvrtka koja proizvodi proizvode
 DemoCompanyAll=Tvrtka s više djelatnosti (svi glavni moduli)
 CreatedBy=Izradio %s
@@ -183,53 +185,57 @@ SizeUnitfoot=stopa
 SizeUnitpoint=točka
 BugTracker=Praćenje bugova
 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.
-EnterNewPasswordHere=Enter your new password here
+EnterNewPasswordHere=Unesite svoju novu lozinku ovdje
 BackToLoginPage=Povratak na stranicu za prijavu
-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.
+AuthenticationDoesNotAllowSendNewPassword=Ovjera vjerodostojnosti način je <b>%s</b> .<br>U ovom načinu rada Dolibarr ne može znati niti promijeniti vašu lozinku.<br>Obratite se svom administratoru sustava ako želite promijeniti lozinku.
+EnableGDLibraryDesc=Instalirajte ili omogućite GD knjižnicu na svojoj PHP instalaciji da biste koristili ovu opciju.
 ProfIdShortDesc=<b>Prof Id %s</b> je podatak ovisan o državi komitenta. <br> Na primjer, za zemlju <b>%s</b>, kod je <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByAmount=Statistics on amount of products/services
+StatsByAmount=Statistika o količini proizvoda/usluga
+StatsByAmountProducts=Statistika o količini proizvoda
+StatsByAmountServices=Statistika o količini usluga
 StatsByNumberOfUnits=Statistika za zbroj količine proizvoda/usluga
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOf=Number of %s
-NumberOfUnits=Number of units on %s
-AmountIn=Amount in %s
+StatsByNumberOfUnitsProducts=Statistika za zbroj proizvoda
+StatsByNumberOfUnitsServices=Statistika za zbroj usluga
+StatsByNumberOfEntities=Statistika za broj subjekata koji upućuju (br. faktura ili narudžbi...)
+NumberOf=Broj %s
+NumberOfUnits=Broj jedinica na %s
+AmountIn=Iznos u %s
 NumberOfUnitsMos=Broj jedinica za proizvodnju u proizvodnim narudžbama
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=The intervention %s has been validated.
+EMailTextInterventionAddedContact=Dodijeljena vam je nova intervencija %s.
+EMailTextInterventionValidated=Intervencija %s je potvrđena.
+EMailTextInterventionClosed=Intervencija %s je zatvorena.
 EMailTextInvoiceValidated=Račun %s je potvrđen.
 EMailTextInvoicePayed=Račun %s je plaćen.
 EMailTextProposalValidated=Prijedlog %s je potvrđen.
 EMailTextProposalClosedSigned=Prijedlog %s je zatvoren potpisan.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
+EMailTextProposalClosedSignedWeb=Prijedlog %s je zatvoren potpisan na stranici portala.
+EMailTextProposalClosedRefused=Prijedlog %s je zatvoren i odbijen.
+EMailTextProposalClosedRefusedWeb=Prijedlog %s je zatvoren odbijen na stranici portala.
 EMailTextOrderValidated=Narudžba %s je potvrđena.
-EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=Narudžba %s je odobrena.
-EMailTextOrderValidatedBy=Narudžbu %s zabilježio je %s.
-EMailTextOrderApprovedBy=Narudžbu %s odobrio je %s.
-EMailTextOrderRefused=Narudžba %s je odbijena.
-EMailTextOrderRefusedBy=Narudžbu %s odbio je %s.
+EMailTextOrderClose=Narudžba %s je isporučena.
+EMailTextSupplierOrderApprovedBy=Narudžbenicu %s odobrio je %s.
+EMailTextSupplierOrderValidatedBy=Narudžbenicu %s zabilježio je %s.
+EMailTextSupplierOrderSubmittedBy=Narudžbenicu %s poslao je %s.
+EMailTextSupplierOrderRefusedBy=Narudžbenicu %s odbio je %s.
 EMailTextExpeditionValidated=Dostava %s je potvrđena.
 EMailTextExpenseReportValidated=Izvješće o troškovima %s je potvrđeno.
 EMailTextExpenseReportApproved=Izvješće o troškovima %s je odobreno.
 EMailTextHolidayValidated=Zahtjev za dopustom %s je potvrđen.
 EMailTextHolidayApproved=Zahtjev za dopustom %s je odobren.
-EMailTextActionAdded=The action %s has been added to the Agenda.
-ImportedWithSet=Importation data set
+EMailTextActionAdded=Radnja %s dodana je na dnevni red.
+ImportedWithSet=Skup podataka o uvozu
 DolibarrNotification=Automatska obavijest
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
+ResizeDesc=Unesite novu širinu <b>ILI</b> novu visinu. Omjer će se zadržati tijekom promjene veličine...
 NewLength=Nova širina
 NewHeight=Nova visina
-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
+NewSizeAfterCropping=Nova veličina nakon izrezivanja
+DefineNewAreaToPick=Definirajte novo područje na slici za odabir (lijevi klik na sliku zatim povucite dok ne dođete do suprotnog kuta)
+CurrentInformationOnImage=Ovaj je alat osmišljen kako bi vam pomogao promijeniti veličinu ili obrezivanje slike. Ovo su informacije o trenutačno uređenoj slici
 ImageEditor=Uređivač slika
-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".
+YouReceiveMailBecauseOfNotification=Primili ste ovu poruku jer je vaš e-pošta dodan na popis ciljeva za obavještavanje o određenim događajima u %s softveru %s.
+YouReceiveMailBecauseOfNotification2=Ovaj događaj je sljedeći:
+ThisIsListOfModules=Ovo je popis modula unaprijed odabranih ovim demo profilom (u ovoj demo verziji vidljivi su samo najčešći moduli). Uredite ovo da biste imali prilagođeniju demonstraciju i kliknite na "Start".
 UseAdvancedPerms=Koristite napredna dopuštenja nekih modula
 FileFormat=Format datoteke
 SelectAColor=Odaberite boju
@@ -262,19 +268,19 @@ YourPasswordHasBeenReset=Vaša lozinka je uspješno poništena
 ApplicantIpAddress=IP adresa podnositelja zahtjeva
 SMSSentTo=SMS poslan na %s
 MissingIds=Nedostaju ID-ovi
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
+ThirdPartyCreatedByEmailCollector=Treća strana koju je izradio e-pošta sakupljač iz e-pošta MSGID %s
 ContactCreatedByEmailCollector=Kontakt/adresa kreirana od strane sakupljača e-pošte iz e-pošte 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
+ProjectCreatedByEmailCollector=Projekt izradio e-pošta sakupljač iz e-pošta MSGID %s
+TicketCreatedByEmailCollector=Ulaznicu izradio e-pošta kolekcionar iz e-pošta MSGID %s
+OpeningHoursFormatDesc=Koristite - za odvajanje i radnog vremena.<br>Koristite razmak za unos različitih raspona.<br>Primjer: 8-12 14-18
 SuffixSessionName=Sufiks za naziv sesije
 LoginWith=Prijavite se s %s
 
 ##### Export #####
 ExportsArea=Područje izvoza
 AvailableFormats=Dostupni formati
-LibraryUsed=Library used
-LibraryVersion=Library version
+LibraryUsed=Korištena biblioteka
+LibraryVersion=Verzija biblioteke
 ExportableDatas=Podaci koji se mogu izvesti
 NoExportableData=Nema podataka za izvoz (nema modula s učitanim podacima za izvoz ili nedostaju dopuštenja)
 ##### External sites #####
@@ -283,16 +289,18 @@ WEBSITE_PAGEURL=URL stranice
 WEBSITE_TITLE=Naslov
 WEBSITE_DESCRIPTION=Opis
 WEBSITE_IMAGE=Slika
-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_IMAGEDesc=Relativni put slikovnog medija. Ovo možete ostaviti praznim jer se rijetko koristi (može ga koristiti dinamički sadržaj za prikaz minijature na popisu postova na blogu). Koristite __WEBSITE_KEY__ u putu ako put ovisi o nazivu web mjesta (na primjer: image/__WEBSITE_KEY__/stories/myimage.png).
 WEBSITE_KEYWORDS=Ključne riječi
 LinesToImport=Linije za uvoz
 
 MemoryUsage=Korištenje memorije
 RequestDuration=Trajanje zahtjeva
-ProductsPerPopularity=Proizvodi/usluge prema popularnosti
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Proizvodi/usluge prema popularnosti u narudžbama
-ProductStatistics=Statistika proizvoda/usluga
+ProductsServicesPerPopularity=Proizvodi|Usluge prema popularnosti
+ProductsPerPopularity=Proizvodi po popularnosti
+ServicesPerPopularity=Usluge prema popularnosti
+PopuProp=Proizvodi|Usluge prema popularnosti u ponudama
+PopuCom=Proizvodi|Usluge prema popularnosti u Narudžbama
+ProductStatistics=Statistika proizvoda|usluga
 NbOfQtyInOrders=Količina u narudžbama
 SelectTheTypeOfObjectToAnalyze=Odaberite objekt za pregled njegove statistike...
 
@@ -300,6 +308,7 @@ ConfirmBtnCommonContent = Jeste li sigurni da želite "%s"?
 ConfirmBtnCommonTitle = Potvrdite svoju radnju
 CloseDialog = Zatvori
 Autofill = Automatsko popunjavanje
+OrPasteAnURL=ili Zalijepite URL
 
 # externalsite
 ExternalSiteSetup=Postavljanje linkova na vanjske web stranice
@@ -309,8 +318,8 @@ ExampleMyMenuEntry=Moj izbornik unos
 
 # ftp
 FTPClientSetup=Postavljanje modula FTP ili SFTP klijenta
-NewFTPClient=New FTP/SFTP connection setup
-FTPArea=FTP/SFTP Area
+NewFTPClient=Postavljanje nove FTP/SFTP veze
+FTPArea=FTP/SFTP područje
 FTPAreaDesc=Ovaj zaslon prikazuje prikaz FTP i SFTP poslužitelja.
 SetupOfFTPClientModuleNotComplete=Čini se da postavljanje FTP ili SFTP klijentskog modula nije dovršeno
 FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP ili SFTP funkcije
@@ -321,9 +330,11 @@ FTPFailedToRemoveDir=Uklanjanje direktorija <b> %s </b> nije uspjelo: provjerite
 FTPPassiveMode=Pasivni mod
 ChooseAFTPEntryIntoMenu=Odaberite FTP/SFTP stranicu s izbornika...
 FailedToGetFile=Neuspješno preuzimanje datoteka %s
-ErrorFTPNodisconnect=Error to disconnect FTP/SFTP server
-FileWasUpload=File <b>%s</b> was uploaded
-FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
-AddFolder=Create folder
-FileWasCreateFolder=Folder <b>%s</b> has been created
-FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
+ErrorFTPNodisconnect=Pogreška pri odspajanju FTP/SFTP poslužitelja
+FileWasUpload=Datoteka <b>%s</b> je prenesena
+FTPFailedToUploadFile=Prijenos datoteke <b>%s</b> nije uspio.
+AddFolder=izradi mapa
+FileWasCreateFolder=Stvorena je mapa <b>%s</b>
+FTPFailedToCreateFolder=Nije uspjelo izradi mapu <b>%s </b>.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index fe71dea284e..b6913872667 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -22,11 +22,11 @@ ProductVatMassChangeDesc=Ovaj alat ažurira stopu PDV-a definiranu za <b> <u> SV
 MassBarcodeInit=Masovni init barkoda
 MassBarcodeInitDesc=Ova stranica se može koristiti za inicijalizaciju barkoda na objektima koji nemaju definiran barkod. Provjerite prije da li su postavke barcode modula podešene.
 ProductAccountancyBuyCode=Konto (kupnja)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Računovodstveni kod (kupnja unutar zajednice)
+ProductAccountancyBuyExportCode=Knjigovodstveni kod (uvoz kupnje)
 ProductAccountancySellCode=Konto (prodaja)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Računovodstveni kod (prodaja unutar Zajednice)
+ProductAccountancySellExportCode=Računovodstveni kod (prodaja izvoz)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi ili usluge
 ProductsOrServices=Proizvodi ili usluge
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Usluga samo za prodaju
 ServicesOnPurchaseOnly=Usluga samo za nabavu
 ServicesNotOnSell=Usluge ni na prodaju ni za kupovinu
 ServicesOnSellAndOnBuy=Usluga za prodaju i za nabavu
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Najnoviji %s proizvodi/usluge koji su izmijenjeni
 LastRecordedProducts=Zadnja %s pohranjena proizvoda
 LastRecordedServices=Zadnje %s pohranjene usluge
 CardProduct0=Proizvod
@@ -73,18 +73,18 @@ SellingPrice=Prodajna cijena
 SellingPriceHT=Prodajna cijena (bez PDV-a)
 SellingPriceTTC=Prodajna cijena (sa PDV-om)
 SellingMinPriceTTC=Minimalna prodajna cijena (s porezom)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=Ovo polje cijene (bez poreza) može se koristiti za bilježenje prosječnog iznosa koji košta ovaj proizvod na vašem tvrtka. To može biti bilo koja cijena koju sami izračunate, na primjer, iz prosječne nabavne cijene plus prosječni proizvodni i troškovi distribucije.
 CostPriceUsage=Ova vrijednost se može koristiti za izračun marže.
 ManufacturingPrice=Cijena proizvodnje
 SoldAmount=Prodani iznos
 PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
 MinPrice=Min. prodajna cijena
-MinPriceHT=Min. selling price (excl. tax)
-MinPriceTTC=Min. selling price (inc. tax)
+MinPriceHT=Min. prodajna cijena (bez poreza)
+MinPriceTTC=Min. prodajna cijena (uključujući porez)
 EditSellingPriceLabel=Uredite oznaku prodajne cijene
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
-CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
+CantBeLessThanMinPrice=Prodajna cijena ne može biti niža od minimalno dopuštene za ovaj proizvod (%s bez poreza). Ova se poruka također može pojaviti ako upišete značajan popust.
+CantBeLessThanMinPriceInclTax=Prodajna cijena ne može biti niža od minimalne dopuštene za ovaj proizvod (%s uključujući poreze). Ova poruka se također može pojaviti ako upišete previše važan popust.
 ContractStatusClosed=Zatvoreno
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
 ErrorProductBadRefOrLabel=Neispravna vrijednost za referencu ili oznaku.
@@ -108,12 +108,12 @@ SetDefaultBarcodeType=Odredi vrstu barkoda
 BarcodeValue=Vrijednost barkoda
 NoteNotVisibleOnBill=Bilješka (ne vidi se na računima, ponudama...)
 ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+FillWithLastServiceDates=Ispunite datume posljednje usluge
+MultiPricesAbility=Više cjenovnih segmenata po proizvodu/usluzi (svaki kupac je u jednom cjenovnom segmentu)
 MultiPricesNumPrices=Broj cijena
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
+DefaultPriceType=Baza cijena prema zadanim postavkama (s usporedbom bez poreza) prilikom dodavanja novih prodajnih cijena
+AssociatedProductsAbility=Omogući komplete (skup od nekoliko proizvoda)
+VariantsAbility=Omogući varijante (varijacije proizvoda, na primjer boja, veličina)
 AssociatedProducts=Kompleti
 AssociatedProductsNumber=Broj proizvoda koji čine ovaj komplet
 ParentProductsNumber=Broj matičnih grupiranih proizvoda
@@ -125,8 +125,8 @@ CategoryFilter=Filter po kategoriji
 ProductToAddSearch=Pronađi proizvod za dodavanje
 NoMatchFound=Ništa slično nije pronađeno
 ListOfProductsServices=Popis proizvoda/usluga
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Popis proizvoda/usluga koji su dio(e) ovog kompleta
+ProductParentList=Popis kompleta s ovim proizvodom kao komponentom
 ErrorAssociationIsFatherOfThis=Jedan od odabranih proizvoda je matični proizvod trenutnog proizvoda
 DeleteProduct=Obriši proizvod/uslugu
 ConfirmDeleteProduct=Jeste li sigurni da želite izbrisati ovaj proizvod/uslugu
@@ -174,7 +174,7 @@ BuyingPrices=Nabavne cijene
 CustomerPrices=Cijene kupaca
 SuppliersPrices=Cijene dobavljača
 SuppliersPricesOfProductsOrServices=Cijene dobavljača (proizvoda ili usluga)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Carina|Roba|HS šifra
 CountryOrigin=Zemlja porijekla
 RegionStateOrigin=Regija podrijetla
 StateOrigin=Država|Pokrajina podrijetla
@@ -208,11 +208,6 @@ unitSET=Komplet
 unitS=Sekunda
 unitH=Sat
 unitD=Dan
-unitG=Gram
-unitM=Metar
-unitLM=Linearni metar
-unitM2=Četvorni metar
-unitM3=Metar kubni
 unitL=Litra
 unitT=tona
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=funta
 unitOZ=unca
 unitM=Metar
+unitLM=Linearni metar
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -253,7 +249,7 @@ UseMultipriceRules=Koristite pravila segmenta cijena (definirana u postavkama mo
 PercentVariationOver=%% varijacija preko %s
 PercentDiscountOver=%% popust preko %s
 KeepEmptyForAutoCalculation=Ostavite prazno kako bi se to automatski izračunalo iz težine ili volumena proizvoda
-VariantRefExample=Examples: COL, SIZE
+VariantRefExample=Primjeri: COL, SIZE
 VariantLabelExample=Primjeri: boja, veličina
 ### composition fabrication
 Build=Proizvodi
@@ -265,24 +261,24 @@ Quarter1=1. tromjesečje
 Quarter2=2. tromjesečje
 Quarter3=3. tromjesečje
 Quarter4=4. tromjesečje
-BarCodePrintsheet=Print barcodes
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+BarCodePrintsheet=Ispis barkodova
+PageToGenerateBarCodeSheets=Pomoću ovog alata možete ispisati listove naljepnica s crtičnim kodom. Odaberite format svoje stranice s naljepnicom, vrstu crtičnog koda i vrijednost crtičnog koda, zatim kliknite gumb <b>%s</b>.
 NumberOfStickers=Broj naljepnica za ispis na stranici
 PrintsheetForOneBarCode=Ispiši nekoliko naljepnica s istim barkodom
 BuildPageToPrint=Generiraj stranicu za ispis
 FillBarCodeTypeAndValueManually=Popuni ručno tip barkoda i vrijednost.
 FillBarCodeTypeAndValueFromProduct=Popuni tip barkoda i vrijednost iz barkoda proizvoda.
-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.
+FillBarCodeTypeAndValueFromThirdParty=Ispunite vrijednost vrste crtičnog koda i iz crtičnog koda treće strane.
+DefinitionOfBarCodeForProductNotComplete=Definicija vrste ili vrijednosti crtičnog koda nije dovršena za proizvod %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definicija vrste ili vrijednosti crtičnog koda nije potpuna za treću stranu %s.
 BarCodeDataForProduct=Barkod podaci za proizvod %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)
+BarCodeDataForThirdparty=Informacije o barkodu treće strane %s:
+ResetBarcodeForAllRecords=Definirajte vrijednost barkoda za sve zapise (ovo će također poništiti vrijednost barkoda koja je već definirana s novim vrijednostima)
 PriceByCustomer=Različite cijene za svakog kupca
 PriceCatalogue=Jedinstvena prodajna cijena po proizvodu/usluzi
 PricingRule=Pravila za prodajne cijene
 AddCustomerPrice=Dodaj cijenu po kupcu
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
+ForceUpdateChildPriceSoc=Postavite istu cijenu za klijentove podružnice
 PriceByCustomerLog=Zabilježi prijašnje cijene kupca
 MinimumPriceLimit=Minimalna cijena ne može biti niža od %s.
 MinimumRecommendedPrice=Minimalna preporučena cijena je: %s
@@ -291,7 +287,7 @@ PriceExpressionSelected=Odabrani izraz cijene
 PriceExpressionEditorHelp1="cijena = 2 + 2" ili "2 + 2" za postavljanje cijene. Koristite ; za odvajanje izraza
 PriceExpressionEditorHelp2=Možete pristupiti EkstraPoljima s varijablama <b>#extrafield_myextrafieldkey#</b> i globalnim varijablama <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>
+PriceExpressionEditorHelp4=Samo u cijeni proizvoda/usluge: <b>#supplier_min_price#</b><br>U samo cijene dobavljača: <b>#supplier_quantity# i #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Dostupne globalne vrijednosti:
 PriceMode=Način cijena
 PriceNumeric=Broj
@@ -303,24 +299,24 @@ MinSupplierPrice=Minimalna kupovna cijena
 MinCustomerPrice=Minimalna prodajna cijena
 NoDynamicPrice=Nema dinamičke cijene
 DynamicPriceConfiguration=Dinamična konfiguracija cijene
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Možete definirati matematičke formule za izračun cijena kupaca ili dobavljača. Takve formule mogu koristiti sve matematičke operatore, neke konstante i varijable. Ovdje možete definirati varijable koje želite koristiti. Ako je varijabli potrebno automatsko ažuriranje, možete definirati vanjski URL kako biste Dolibarru omogućili automatsko ažuriranje vrijednosti.
 AddVariable=Dodaj varijablu
 AddUpdater=Dodaj promjenjivač
 GlobalVariables=Globalne varijable
 VariableToUpdate=Variabla za promjeniti
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=Vanjski programi za ažuriranje varijabli
 GlobalVariableUpdaterType0=JSON podaci
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelp0=Raščlanjuje JSON podatke iz navedenog URL-a, VALUE navodi lokaciju relevantne vrijednosti,
 GlobalVariableUpdaterHelpFormat0=Format zahtjeva {"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"}}
+GlobalVariableUpdaterType1=WebService podaci
+GlobalVariableUpdaterHelp1=Raščlanjuje podatke WebServicea iz navedenog URL-a, NS navodi prostor imena, VALUE navodi lokaciju relevantne vrijednosti, DATA treba sadržavati podatke za slanje i METHOD je WS metoda koja poziva
+GlobalVariableUpdaterHelpFormat1=Format zahtjeva je {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"vaš": "podaci", "za": "pošalji"}}
 UpdateInterval=Interval promjene (minute)
 LastUpdated=Zadnje ažuriranje
 CorrectlyUpdated=Ispravno promjenjeno
 PropalMergePdfProductActualFile=Datoteke za dodati u PDF Azur su/je
 PropalMergePdfProductChooseFile=Odaberite PDF datoteke
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=Uključujući proizvode/usluge s oznaka
 DefaultPriceRealPriceMayDependOnCustomer=Predefinirana cijena, stvarna cijena može ovisiti o kupcu
 WarningSelectOneDocument=Molimo odaberite barem jedan dokument
 DefaultUnitToShow=Jedinica
@@ -342,29 +338,29 @@ SizeUnits=Jedinica veličine
 DeleteProductBuyPrice=Obriši nabavnu cijenu
 ConfirmDeleteProductBuyPrice=Jeste li sigurni da želite obrisati ovu nabavnu cijenu ?
 SubProduct=Podproizvod
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
+ProductSheet=List proizvoda
+ServiceSheet=Servisni list
 PossibleValues=Moguće vrijednosti
-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
+GoOnMenuToCreateVairants=Idite na izbornik %s - %s da pripremite varijante atributa (kao što su boje, veličina, ...)
+UseProductFournDesc=Dodavanje značajke za definiranje opisa proizvoda definiranog od strane dobavljača (za svaku referencu dobavljača) uz opis za kupce
 ProductSupplierDescription=Opis dobavljača za proizvod
-UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
-PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductSupplierPackaging=Upotrijebite značajku "pakiranja" za zaokruživanje količina na neke dane višekratnike (prilikom dodavanja/ažuriranja retka u dokumentima dobavljača, ponovno izračunajte količine i nabavne cijene prema višem višekratniku postavljenom na nabavne cijene proizvoda)
+PackagingForThisProduct=Pakiranje količina
+PackagingForThisProductDesc=Automatski ćete kupiti višestruku količinu ove količine.
+QtyRecalculatedWithPackaging=Količina linije preračunata je prema pakiranju dobavljača
 
 #Attributes
-Attributes=Attributes
+Attributes=Atributi
 VariantAttributes=Atributi varijante
 ProductAttributes=Varijanta atributa za proizvode
 ProductAttributeName=Atribut varijante %s
 ProductAttribute=Atribut varijante
 ProductAttributeDeleteDialog=Jeste li sigurni da želite izbrisati ovaj atribut? Sve vrijednosti će biti izbrisane
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Jeste li sigurni da želite za brisanje vrijednosti "%s" s referencom "%s" ovog atributa?
 ProductCombinationDeleteDialog=Jeste li sigurni da želite izbrisati varijantu proizvoda "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Došlo je do pogreške prilikom brisanja varijante. Molimo provjerite da se ne koristi ni u jednom objektu
 ProductCombinations=Varijante
-PropagateVariant=Propagate variants
+PropagateVariant=Propagirati varijante
 HideProductCombinations=Sakrij varijantu proizvoda u izborniku proizvoda
 ProductCombination=Varijanta
 NewProductCombination=Nova varijanta
@@ -381,20 +377,20 @@ ApplyToAllPriceImpactLevelHelp=Klikom ovdje postavljate isti utjecaj cijene na s
 WeightImpact=Utjecaj težine
 NewProductAttribute=Novi atribut
 NewProductAttributeValue=Nova vrijednost atributa
-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.
+ErrorCreatingProductAttributeValue=Došlo je do pogreške prilikom stvaranja vrijednosti atributa. To bi moglo biti zato što već postoji vrijednost s tom referencom
+ProductCombinationGeneratorWarning=Ako nastavite, prije generiranja novih varijanti, sve prethodne će biti IZBRISANE. Već postojeći bit će ažurirani s novim vrijednostima
+TooMuchCombinationsWarning=Generiranje puno varijanti može rezultirati visokom upotrebom procesora, memorije i Dolibarr ih ne može izradi. Omogućavanje opcije "%s" može pomoći u smanjenju upotrebe memorije.
 DoNotRemovePreviousCombinations=Nemojte uklanjati prethodne varijante
 UsePercentageVariations=Koristite postotne varijacije
 PercentageVariation=Postotna varijacija
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
+ErrorDeletingGeneratedProducts=Došlo je do pogreške prilikom pokušaja brisanja postojećih varijanti proizvoda
 NbOfDifferentValues=br. različitih vrijednosti
 NbProducts=Broj proizvoda
 ParentProduct=Matični proizvod
-ParentProductOfVariant=Parent product of variant
+ParentProductOfVariant=Matični proizvod varijante
 HideChildProducts=Sakrij varijante proizvoda
 ShowChildProducts=Prikaži varijante proizvoda
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+NoEditVariants=Idite na matičnu karticu proizvoda i uredite utjecaj varijanti na cijenu na kartici varijanti
 ConfirmCloneProductCombinations=Želite li kopirati sve varijante proizvoda na drugi matični proizvod s navedenom referencom?
 CloneDestinationReference=Referenca odredišnog proizvoda
 ErrorCopyProductCombinations=Došlo je do pogreške prilikom kopiranja varijanti proizvoda
@@ -404,36 +400,39 @@ ActionAvailableOnVariantProductOnly=Akcija dostupna samo na varijanti proizvoda
 ProductsPricePerCustomer=Cijene proizvoda po kupcu
 ProductSupplierExtraFields=Dodatni atributi (cijene dobavljača)
 DeleteLinkedProduct=Izbrišite podređeni proizvod povezan s kombinacijom
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Jedinični iznos koji se koristi za ažuriranje ponderirane prosječne cijene
 PMPValue=Procjenjena prosječna cijena
 PMPValueShort=PPC
 mandatoryperiod=Obvezna razdoblja
 mandatoryPeriodNeedTobeSet=Napomena: Razdoblje (datum početka i završetka) mora biti definirano
 mandatoryPeriodNeedTobeSetMsgValidate=Usluga zahtijeva razdoblje početka i završetka
-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=Provjeri ovo ako želite poruku korisniku prilikom izrade/potvrde fakture, komercijalnog prijedloga, prodajnog naloga bez unosa početka i datum završetka na linijama ove usluge.<br>Imajte na umu da je poruka upozorenje i a ne pogreška blokiranja.
 DefaultBOM=Zadana BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
+DefaultBOMDesc=Zadana sastavnica koja se preporučuje za proizvodnju ovog proizvoda. Ovo polje može se postaviti samo ako je priroda proizvoda '%s'.
 Rank=Rang
 MergeOriginProduct=Duplikat proizvoda (proizvod koji želite izbrisati)
 MergeProducts=Spojite proizvode
-ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
+ConfirmMergeProducts=Jeste li sigurni da želite spojiti odabrani proizvod s trenutnim? Svi povezani objekti (računi, narudžbe, ...) bit će premješteni na trenutni proizvod, nakon čega će se odabrani proizvod izbrisati.
 ProductsMergeSuccess=Proizvodi su spojeni
 ErrorsProductsMerge=Pogreške u spajanju proizvoda
 SwitchOnSaleStatus=Uključite status prodaje
 SwitchOnPurchaseStatus=Uključite status nabave
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock movement)
+UpdatePrice=Povećanje/smanjenje cijene za kupca
+StockMouvementExtraFields= Dodatna polja (kretanje dionica)
 InventoryExtraFields= Dodatna polja (inventar)
-ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+ScanOrTypeOrCopyPasteYourBarCodes=Skenirajte ili upišite ili kopirajte/zalijepite svoje crtične kodove
 PuttingPricesUpToDate=Ažurirajte cijene s trenutačno poznatim cijenama
-PuttingDescUpToDate=Update descriptions with current known descriptions
+PuttingDescUpToDate=Ažurirajte opise trenutačno poznatim opisima
 PMPExpected=Očekivani PMP
 ExpectedValuation=Očekivana vrijednost
 PMPReal=Stvarni PMP
 RealValuation=Stvarna vrijednost
-ConfirmEditExtrafield = Select the extrafield you want modify
-ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
-ModifyValueExtrafields = Modify value of an extrafield
-OrProductsWithCategories=Or products with tags/categories
-WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
-WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+ConfirmEditExtrafield = Odaberite dodatno polje koje želite promjeni - izmjeni
+ConfirmEditExtrafieldQuestion = Jeste li sigurni da želite u promjeni - izmjeni ovo dodatno polje?
+ModifyValueExtrafields = promjeni - izmjeni vrijednost dodatnog polja
+OrProductsWithCategories=Ili proizvodi s oznake/Kategorije
+WarningTransferBatchStockMouvToGlobal = Ako želite deserijalizirati ovaj proizvod, sve njegove serijalizirane zalihe transformirat će se u globalne zalihe
+WarningConvertFromBatchToSerial=Ako trenutno imate količinu veću ili jednaku 2 za proizvod, prebacivanje na ovaj izbor znači da ćete i dalje imati proizvod s različitim objektima iste serije (iako želite jedinstveni serijski broj). Duplikat će ostati dok se ne izvrši inventura ili ručno kretanje zaliha kako bi se to popravilo.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 72a2865f63c..a5fae9cdd7a 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -54,7 +54,7 @@ ReadPerm=Čitaj
 WritePerm=Piši
 TestDeployOnWeb=Testirajte / implementirajte na web
 PreviewSiteServedByWebServer=<u>Pregledajte %s u novoj kartici.</u><br><br>%s posluživat će vanjski web poslužitelj (kao što je Apache, Nginx, IIS ). Morate instalirati i postavku ovog poslužitelja prije nego što usmjerite na direktorij:<br><strong>%s</strong><br>URL koji poslužuje vanjski poslužitelj:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Pregledajte %s u novoj kartici.</u><br><br>%s posluživat će poslužitelj Dolibarr tako da ne treba dodatni web poslužitelj (kao što su Apache, Nginx, IIS) koje treba instalirati.<br>Nezgodno je to što URL-ovi stranica nisu prilagođeni korisniku i počnite s putanjom vašeg Dolibarra.<br>URL koji poslužuje Dolibarr:<br><strong></span span><span class='notranslate'>%s</strong><br><br> Da biste koristili vlastiti vanjski web poslužitelj za posluživanje ove web stranice, izradi virtualni host na vašem web poslužitelju koji pokazuje na direktorij<br> <strong>%s</strong><br>zatim unesite naziv ovog virtualnog poslužitelja u svojstva ove web stranice i kliknite vezu "Testiraj/Postavi na web".
+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 virtualnog hosta kojeg poslužuje vanjski web poslužitelj nije definiran
 NoPageYet=Još nema stranica
 YouCanCreatePageOrImportTemplate=Možete stvoriti novu stranicu ili uvesti cijeli predložak web stranice
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index c3651a80fe2..5b1848b7fb6 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -287,7 +287,7 @@ TotalVente=Teljes forgalom adózás előtt
 TotalMarge=Teljes értékesítési árrés
 
 DescVentilCustomer=Tekintse meg itt a vevő számla sorok listáját, amelyek a számlatervből termékszámlához vannak kötve (vagy nem)
-DescVentilMore=A legtöbb esetben, ha előre definiált termékeket vagy szolgáltatásokat használ, és beállítja a számlát (a számlatükörből) a termék-/szolgáltatáskártyán, az alkalmazás képes lesz minden kötést a számla között.  sorokat és a számlatükör könyvelési számláját, egyetlen kattintással a <strong>"%s" gombbal </strong>. Ha a fiók nincs beállítva a termék-/szolgáltatáskártyákon, vagy még mindig vannak olyan sorok, amelyek nincsenek fiókhoz kötve, kézi összerendelést kell végrehajtania a „<strong><span” menüből. class='notranslate'>%s</span></strong>".
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Itt tekintheti meg a vevők számlasorainak listáját és termékszámlájukat a számlatükörből
 DescVentilTodoCustomer=A számla sorok kötése, amelyek még nem kötöttek egy termékfiókkal a számlatükörből
 ChangeAccount=Módosítsa a termék/szolgáltatás fiókot (a számlatükörből) a kiválasztott sorokhoz a következő fiókkal:
@@ -352,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=A kötés és az átvitel letiltása az ért
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=A kötés és az átvitel letiltása a vásárlások könyvelésében (a szállítói számlák nem lesznek figyelembe véve a könyvelésben)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=A kötés és az átvitel letiltása a könyvelésben a költségjelentéseken (a költségjelentéseket nem veszik figyelembe a könyvelésben)
 ACCOUNTING_ENABLE_LETTERING=Engedélyezze a feliratozás funkciót a számvitelben
-ACCOUNTING_ENABLE_LETTERING_DESC=Ha ez az opció engedélyezve van, minden könyvelési bejegyzéshez megadhat egy kódot, így csoportosíthatja a különböző könyvelési mozgásokat. A múltban, amikor a különböző folyóiratokat egymástól függetlenül kezelték, ez a funkció szükséges volt a különböző folyóiratok mozgássorainak csoportosításához. A Dolibarr könyvelésnél azonban egy ilyen követőkód, az úgynevezett "<b>%s<span class='notranslate'></b> span>" már automatikusan mentve van, tehát az automatikus feliratozás már megtörtént, hibaveszély nélkül, így ez a funkció használhatatlanná vált a szokásos használat során. A kézi feliratozási funkció azoknak a végfelhasználóknak van biztosítva, akik nem igazán bíznak a számviteli adatátvitelt végző számítógépes motorban.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Ennek a funkciónak az engedélyezése már nem szükséges a szigorú számviteli kezeléshez.
 ACCOUNTING_ENABLE_AUTOLETTERING=Engedélyezze az automatikus feliratozást a könyvelésbe való áttéréskor
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=A betűk kódja automatikusan generálódik és növekszik, és nem a végfelhasználó választja ki
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index b21062fbb77..c2d0d00530e 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -62,7 +62,7 @@ UploadNewTemplate=Új sablon(ok) feltöltése
 FormToTestFileUploadForm=A fájlfeltöltés tesztelésének űrlapja (beállítás szerint)
 ModuleMustBeEnabled=A(z) <b>%s</b> modult/alkalmazást engedélyezni kell
 ModuleIsEnabled=A(z) <b>%s</b> modul/alkalmazás engedélyezve van
-IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> modul engedélyezve van 
+IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> modul engedélyezve van
 RemoveLock=Távolítsa el / nevezze át a(z) <b>%s</b> fájlt, ha létezik, hogy engedélyezze a Frissítés / Telepítés eszközt.
 RestoreLock=Állítsa vissza az <b>%s</b> fájlt, csak olvasási jogokat engedélyezzen, hogy le lehessen tiltani a Frissítés / Telepítés eszköz további használatát.
 SecuritySetup=Biztonsági beállítások
@@ -366,9 +366,9 @@ GenericMaskCodes2=<b>{cccc}</b> az n karakteres ügyfélkód<br><b>{cccc000}</b>
 GenericMaskCodes3=Az összes többi karakter a maszkban érintetlen marad. <br> A szóközök nem megengedettek. <br>
 GenericMaskCodes3EAN=A maszk összes többi karaktere érintetlen marad (kivéve a * vagy a ? jelet az EAN13 13. pozíciójában).<br>Szóközök nem megengedettek.<br>Az EAN13-ban a 13. pozícióban lévő utolsó } után az utolsó karakternek * vagy ? . Ezt a számított kulcs váltja fel.<br>
 GenericMaskCodes4a=<u>Példa a partner 99. %s-jára a következővel: The20202 -01-31:</u><br>
-GenericMaskCodes4b=<u>Példa a következőre: partner, létrehozva: 2023. 01. 31.:b0aaa878<b>4dz0 span class='notranslate'><br></span>
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>Példa a 2023. 01. 31-én létrehozott termékre:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> a b0aee833650</837fz spanyol }-ZZZ/{dd}/XXX<span class='notranslate'></b> a következőt adja: <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> a következőt adja meg: <b>IN2301-0099-A</b>, ha a vállalat típusa „Responsable Inscripto” „A_RI” típusú kóddal
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Vissza szabható számot a meghatározott maszkot.
 ServerAvailableOnIPOrPort=Kiszolgálóhoz elérhető a címen <b>%s %s</b> porton
 ServerNotAvailableOnIPOrPort=A kiszolgáló nem elérhető címen <b>%s %s</b> porton
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=Ha ezt a mezőt üresen hagyja, akkor ez az érték
 ExtrafieldParamHelpselect=Az értékek listájának olyan sorokat kell tartalmaznia, amelyek formátuma kulcs,érték (ahol a kulcs nem lehet '0')<br><br> például: <br>1,érték1<br>2,érték2<br>kód3,érték3< br>...<br><br>Ahhoz, hogy a lista egy másik kiegészítő attribútumlistától függ:<br>1,érték1|opciók_<i>szülőlista_kódja</i>:szülőkulcs<br>2,érték2|opciók_ <i>parent_list_code</i>:parent_key <br><br>Ahhoz, hogy a lista egy másik listától függjön:<br>1,érték1|<i>szülőlista_kódja</i>:parent_key<br>2,value2 |<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
 ExtrafieldParamHelpradio=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
-ExtrafieldParamHelpsellist=Az értékek listája egy táblázatból származik<br>Syntax: table_name:label_field:id_field::filtersql<br>Példa: c_idtypent:libelle ::filtersql<br><br> – az id_field szükségszerűen elsődleges int kulcs<br> - A filtersql egy SQL feltétel. Ez lehet egy egyszerű teszt (pl. active=1), hogy csak az aktív értéket jelenítse meg<span class='notranslate'><br>A $ID$ is használható a szűrőben, amely az aktuális objektum aktuális azonosítója<br>Ha SELECT-et szeretne használni a szűrőben, használja a $SEL$ kulcsszót a befecskendezés elleni védelem megkerüléséhez.<br>ha extra mezőkre szeretne szűrni használja a szintaxist extra.fieldcode=... (ahol a mezőkód az extramező kódja)<br><br>In megrendelés, hogy a lista egy másik kiegészítő attribútumlistától függ:<br>c_typent:libelle:id:options_b049271<08181fcze81 /span>parent_list_code<span class='notranslate'></i>|parent_column:filter <br><br> class='notranslate'>megrendelés, hogy a lista egy másik listától függjön:<br>c_typent:libelle:id:<i> span>parent_list_code<span class='notranslate'></i>|parent_column:filter
+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 necessarily 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=Az értékek listája egy táblázatból származik.<br>Szintaxis: tábla_neve:címkemező:id_mező::filtersql<br>Példa: c_typent:libelle:id::filtersql<br><br>a szűrő egy egyszerű teszt is lehet (pl. active=1 ) csak az aktív érték megjelenítéséhez<br>Használhatja a $ID$-t is a szűrőben, ez az aktuális objektum aktuális azonosítója<br>A szűrőben történő KIVÁLASZTÁSHOZ használja a $SEL$<br>ha extramezőkre szeretne szűrni, használja szintaxis extra.fieldcode=... (ahol a mezőkód az extramező kódja)<br><br>Ahhoz, hogy a lista egy másik kiegészítő attribútumlistától függ:<br>c_typent:libelle:id:options_<i> parent_list_code</i>|parent_column:filter <br><br>Ahhoz, hogy a lista egy másik listától függjön:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=A paramétereknek ObjectName:Classpath típusúnak kell lennie <br> Szintaxis: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hagyja üresen egyszerű elválasztó esetén<br>Állítsa ezt 1-re összecsukódó elválasztó esetén (alapértelmezés szerint nyitva van új munkamenethez, majd az állapot megmarad minden felhasználói munkamenethez)<br>Állítsa ezt 2-re összecsukódó elválasztó esetén (alapértelmezés szerint összecsukva új munkamenet, akkor az állapot minden felhasználói munkamenetre megmarad)
@@ -1197,6 +1197,7 @@ Skin=Bőr téma
 DefaultSkin=Alapértelmezett skin téma
 MaxSizeList=Maximális hossza lista
 DefaultMaxSizeList=A listák alapértelmezett maximális hossza
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=A rövid listák alapértelmezett maximális hossza (azaz az ügyfélkártyán)
 MessageOfDay=A nap üzenete
 MessageLogin=Belépés oldalra üzenet
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Ne exportáljon régebbi eseményt mint
 SecurityKey = Biztonsági kulcs
 ##### ClickToDial #####
 ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
-ClickToDialUrlDesc=Az URL akkor hívható meg, amikor a telefon képére kattintanak. Az URL-ben használhat címkéket<br><b>__PHONETO__</b> lecserélve a hívni kívánt személy telefonszámára<br><b>__PHONEFROM__</b> helyére a hívó személy telefonszáma kerül (az Öné)<span class='notranslate'><br><b>__LOGIN__b09a4b739f1 span>, amelyet a clicktodial bejelentkezés váltja fel (a felhasználói kártyán meghatározott)<span class='notranslate'><br><b>__PASS__ </b>, amely a clicktodial jelszóra lesz cserélve (a felhasználói kártyán van meghatározva).
+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=Ez a modul megváltoztatja a telefonszámokat, amikor asztali számítógépet használ, kattintható hivatkozásokká. Egy kattintás hívja a számot. Ez használható a telefonhívás indítására, ha egy puha telefont használ az asztalon, vagy ha például SIP protokollon alapuló CTI rendszert használ. Megjegyzés: Okostelefon használatakor a telefonszámok mindig rákattinthatók.
 ClickToDialUseTelLink=Csak egy "tel:" hivatkozást használjon a telefonszámokon
 ClickToDialUseTelLinkDesc=Használja ezt a módszert, ha felhasználói szoftveres telefonnal vagy szoftveres interfésszel rendelkeznek, amely ugyanarra a számítógépre van telepítve, mint a böngésző, és akkor hívható meg, amikor a böngészőjében a „tel:” betűvel kezdődő hivatkozásra kattint. Ha olyan hivatkozásra van szüksége, amely "sip:"-vel kezdődik, vagy teljes szervermegoldásra (nincs szükség helyi szoftvertelepítésre), akkor ezt "Nem"-re kell állítania, és ki kell töltenie a következő mezőt.
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=Az API-modulok nincsenek engedélyezve
 YouShouldSetThisToOff=Állítsa ezt 0-ra vagy ki
 InstallAndUpgradeLockedBy=A telepítést és a frissítéseket a <b>%s</b> fájl zárolja
 InstallLockedBy=A telepítést/újratelepítést a következő fájl zárolja: <b>%s</b>
-InstallOfAddonIsNotBlocked=A kiegészítők telepítése nincs zárolva. Hozzon létre egy <b>installmodules.lock</b> fájlt a <b><span class= ='notranslate'>%s</span></b> a külső kiegészítők/modulok telepítésének blokkolásához.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Régi megvalósítás
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Ha egyes online fizetési modulok engedélyezve vannak (Paypal, Stripe, ...), adjon hozzá egy hivatkozást a PDF-fájlhoz az online fizetéshez
 DashboardDisableGlobal=Globálisan letiltja a nyitott objektumok összes mutatóját
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Alapértelmezés szerint nincs l
 CSSPage=CSS stílus
 Defaultfortype=Alaptértelmezett
 DefaultForTypeDesc=Alapértelmezés szerint használt sablon új e-mail létrehozásakor a sablontípushoz
-OptionXShouldBeEnabledInModuleY=A "<b>%s</b>" opciót engedélyezni kell a <span class modulban ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=A "<b>%s</b>" opció engedélyezve van a <span class= modulban 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=On Line aláírás engedélyezése
 AtBottomOfPage=Az oldal alján
 FailedAuth=sikertelen hitelesítések
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 453052b1acd..2abc36229c0 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Alapértelmezett vonalcímke részletek nélkül
 PrintWithoutDetails=Nyomtatás részletek nélkül
 YearNotDefined=Az év nincs megadva
 TakeposBarcodeRuleToInsertProduct=Vonalkód szabály a termék beillesztéséhez
-TakeposBarcodeRuleToInsertProductDesc=Szabály a termékreferencia kinyerésére + egy mennyiség a beolvasott vonalkódból.<br>Ha üres (alapértelmezett érték), az alkalmazás a teljes beolvasott vonalkódot használja a termék megtalálásához.<br><br>Ha meg van adva, a szintaxisnak a következőnek kell lennie:<br> <b>ref:NB+qu:NB+qd:NB+other:NB</b><br>ahol NB a a beolvasott vonalkódból az adatok kinyeréséhez használandó karakterek száma:<br><b>refb09a4b739f17f8z  : termékreferencia<br><b>qu</b> : mennyiség tétel (egységek) beillesztésekor beállítva<br><b>qd</b>: mennyiség – beállítva az elem beszúrásakor (tizedesjegyek)<br><b>egyéb<span class='notranslate'></b> karakter</s>
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Már kinyomtatva
 HideCategories=A kategóriakiválasztás teljes szakaszának elrejtése
 HideStockOnLine=A készlet elrejtése az interneten
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index e19e60a96cf..684ad2e8cd7 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -493,7 +493,7 @@ CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
 OutstandingBillReached=Max. a kintlévőség elért
 OrderMinAmount=Minimális rendelési összeg
-MonkeyNumRefModelDesc=Adjon vissza egy számot a következő formátumban: %syymm-nnnn a vevő kódhoz és a <span class='notranslate'>b0ecb2ec87f49ffz span>yymm-nnnn a szállítói kódhoz, ahol az yy az év, a mm a hónap és az nnnn egy szekvenciális automatikusan növekvő szám, törés és 0-hoz való visszatérés nélkül.
+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 sequential auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index c60cb817c31..e5e2b40d3e3 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -134,7 +134,7 @@ ErrorLoginDoesNotExists=A(z) <b>%s</b> bejelentkezési névvel rendelkező felha
 ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címe. A folyamat megszakítva.
 ErrorBadValueForCode=A biztonsági kód hibás értéke. Próbálja újra új értékkel...
 ErrorBothFieldCantBeNegative=A %s és a %s mező nem lehet negatív
-ErrorFieldCantBeNegativeOnInvoice=A <strong>%s</strong> mező nem lehet negatív ezen a típusú <span classon ='notranslate'>számla</span>. Ha kedvezménysort kell hozzáadnia, először csak hozza létre a kedvezményt (a harmadik féltől származó kártya „%s” mezőjéből), és alkalmazza a számla.
+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 third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=A sorok összessége (adó nélkül) nem lehet negatív egy adott nem null áfakulcs esetén (Negatív összeget találtunk a(z) <b>%s</b>%% áfakulcshoz.
 ErrorLinesCantBeNegativeOnDeposits=A sorok nem lehetnek negatívak a betétben. Problémákkal kell szembenéznie, amikor a végszámlán szereplő letétet fel kell használnia.
 ErrorQtyForCustomerInvoiceCantBeNegative=A vevői számlák sorának mennyisége nem lehet negatív
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 2c1c7826bd6..66bf548f225 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Végösszeg (bruttó)
 TotalHT=Összesen (nettó)
 TotalHTforthispage=Összesen (nettó) ehhez az oldalhoz
 Totalforthispage=Végösszeg ezen az oldalon
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Végösszeg (bruttó)
 TotalTTCToYourCredit=Végösszeg (bruttó) terhelve az ön számláján
 TotalVAT=ÁFA összesen
@@ -647,6 +649,7 @@ ReportName=Jelentés neve
 ReportPeriod=Jelentés periódusa
 ReportDescription=Leírás
 Report=Jelentés
+Reports=Riportok
 Keyword=Kulcsszó
 Origin=Eredet
 Legend=Jelmagyarázat
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index cb6dd2c1bd7..d273d94874c 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=Példákat lásd itt
 EnabledDesc=Feltétel, hogy ez a mező aktív legyen.<br><br>Példák:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Látható a mező? (Példák: 0=soha nem látható, 1=látható a listán és az űrlapok létrehozása/frissítése/megtekintése, 2=csak a listán látható, 3=csak a létrehozási/frissítési/megtekintési űrlapon látható (nem a listákon), 4=látható a listákon és csak az űrlap frissítése/megtekintése (nem létrehozás), 5=Csak a listán és a megtekintési űrlapon látható (nem létrehozás, nem frissítés).<br><br> Negatív érték használata azt jelenti, hogy a mező alapértelmezés szerint nem jelenik meg a listán, de kiválasztható megtekintésre).
 ItCanBeAnExpression=Ez lehet egy kifejezés. Példa:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Jelenítse meg ezt a mezőt a kompatibilis PDF dokumentumokon, a pozíciót a „Pozíció” mezővel kezelheti.<br><strong>A következő dokumentumhoz:</strong><br>0 = nincs megjelenítve <br>1 = megjelenítés<br>2 = csak akkor jelenik meg, ha nem üres<br><br>b0e7843947 span>Dokumentumsorok esetén:<span class='notranslate'></strong><br>0 = nincs megjelenítve <br>1 = megjelenik egy oszlopban<br>3 = megjelenítés a sorleíró oszlopban a leírás után<br>4 = megjelenítés a leírás utáni oszlopban csak ha nem üres
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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-en
 IsAMeasureDesc=A mező értéke összesíthető, hogy a listába kerüljön az összeg? (Példák: 1 vagy 0)
 SearchAllDesc=Használják a mezőt a gyorskereső eszközből történő kereséshez? (Példák: 1 vagy 0)
@@ -148,7 +148,7 @@ CSSListClass=CSS a listához
 NotEditable=Nem szerkeszthető
 ForeignKey=Idegen kulcs
 ForeignKeyDesc=Ha ennek a mezőnek az értékét garantálni kell egy másik táblába. Adja meg a következő szintaxisnak megfelelő értéket: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Példa:<br>varchar(99)<br>e-mail<br>telefon<br>ip<br>url<br>jelszóccfda149bfz0 b03 span>double(24,8)<span class='notranslate'><br>real<br>text<br>html <br>dátum<br>dátumidő<br>időbélyeg <br>egész<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342bccfda<19bcc0 /span><span class='notranslate'><br>"1" azt jelenti, hogy a kombó után hozzáadunk egy + gombot a rekord létrehozásához.<br>"szűrő" Univerzális szűrő szintaktikai feltétele, példa: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Ez a mező/attribútum típusa.
 AsciiToHtmlConverter=Ascii-HTML konverter
 AsciiToPdfConverter=Ascii PDF konvertáló
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Nem sikerült kódot adni a leíróhoz. Ellenőriz
 DictionariesCreated=A szótár <b>%s</b> sikeresen létrehozva
 DictionaryDeleted=Szótár <b>%s</b>
 PropertyModuleUpdated=A <b>%s</b> tulajdon frissítése sikeresen megtörtént
-InfoForApiFile=* Amikor először generál fájlt, az összes metódus létrejön <strong> minden objektumhoz.</strong><br>* Ha rákattint a <strong>remove</strong> gombra, akkor csak eltávolítja a <span osztály összes metódusát. ='notranslate'><strong></span>kijelölt objektum</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Oldal a modul beállításához
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Itt létrehozhatja és szerkesztheti az osztályfájlokat, hogy új e-mail célválasztókat biztosítson a tömeges e-mail modulhoz
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 8c89788babf..d843aea6208 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Speciális készlettranszfer
 ModuleStockTransferDesc=A készlettranszfer fejlett kezelése transzfer lap generálásával
 StockTransferNew=Új készlet átadása
 StockTransferList=Készlettranszferek listája
-ConfirmValidateStockTransfer=Biztosan érvényesíteni kívánja ezt a részvényátruházást a következő hivatkozással: <b>%s</b><span class='notranslate'> span> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Készletek csökkenése átutalással %s
 ConfirmDestockCancel=Törölje a készletcsökkentést %s átutalással
 DestockAllProduct=A készletek csökkenése
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 7e8b0e389fd..2f58ebebb77 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=A HTML forráskódot a szerkesztő "Forrás" gombj
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Megosztási hivatkozással megosztott kép esetén (nyílt hozzáférés a fájl megosztási hash kulcsával) a szintaxis:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt ;</strong><br>
-YouCanEditHtmlSource3=Egy PHP-objektum képének URL-címének lekéréséhez használja a<br><strong>&lt; parancsot. span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt; class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>További példák HTML-re vagy dinamikus kódra a <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki dokumentációban</a> >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Oldal/tároló klónozása
 CloneSite=Webhely klónozása
 SiteAdded=Webhely hozzáadva
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index f3cc4586f58..d0bf9943a1c 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -12,13 +12,13 @@ descWORKFLOW_TICKET_CREATE_INTERVENTION=A jegy létrehozásakor automatikusan ho
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=A linkelt forrásra vonatkozó ajánlatok besorolása számlázottként, ha az értékesítés megrendelés számlázásra van állítva (és ha a megrendelés összege megegyezik a az aláírt linkelt ajánlatok teljes összege)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=A hivatkozott forrásajánlatok besorolása számlázottként, ha a vevő számla érvényes (és ha a számla megegyezik az aláírt linkelt ajánlatok teljes összegével)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=A linkelt forrásértékesítések megrendelés besorolása számlázottként, ha a vevő számla érvényes ( és ha a számla összege megegyezik a kapcsolt értékesítési rendelések teljes összegével). Ha 1 számla van érvényesítve n rendelésre, akkor ez az összes rendelést is számlázottra állíthatja.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=A kapcsolt forrásból származó értékesítési rendeléseket számlázottként kell besorolni, ha a vevő számla fizetésre van állítva (és ha a <span class= A 'notranslate'>számla</span> megegyezik a kapcsolt értékesítési rendelések teljes összegével). Ha 1 számla beállított n rendelést számláz ki, akkor ez az összes rendelést is számlázottra állíthatja.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=A linkelt forrásból származó értékesítési rendelések besorolása szállítottként a szállítmány érvényesítésekor (és ha az összes szállítmány által kiszállított mennyiség megegyezik a frissítendő megrendelés-ban szereplővel)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=A kapcsolt forrás értékesítési rendelés besorolása a szállítmány lezárásakor (és ha az összes szállítmány által kiszállított mennyiség megegyezik a frissítendő rendelésben szereplővel)
 # Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=A kapcsolódó forrásszállítói ajánlat besorolása számlázottként, ha a számla szállító érvényesítve van (és ha a számla összege megegyezik a teljes összeggel a linkelt ajánlatok mennyisége)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=A megrendelés linkelt forrásból történő vásárlás besorolása számlázottként, ha a számla szállító érvényesítve van (és ha a <span class='notranslate' összege >számla</span> megegyezik a kapcsolt rendelések teljes összegével)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=A kapcsolt forrásból származó beszerzési rendelés besorolása beérkezettként, amikor egy fogadás érvényesül (és ha az összes fogadás által beérkezett mennyiség megegyezik a frissítendő beszerzési rendelésben szereplő mennyiséggel)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=A kapcsolt forrásból származó beszerzési rendelés besorolása a fogadás lezárásakor (és ha az összes fogadás által kapott mennyiség megegyezik a frissítendő beszerzési rendelésben szereplő mennyiséggel)
 # Autoclassify shipment
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 7fdd1deaba9..2cc3d42f6c2 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total (termasuk pajak)
 TotalHT=Total (tidak termasuk pajak)
 TotalHTforthispage=Total (tidak termasuk pajak) pada halaman ini
 Totalforthispage=Total untuk halaman ini
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total (termasuk pajak)
 TotalTTCToYourCredit=Total (termasuk pajak) ke kredit Anda
 TotalVAT=Total pajak
@@ -647,6 +649,7 @@ ReportName=Nama laporan
 ReportPeriod=Periode laporan
 ReportDescription=Keterangan
 Report=Melaporkan
+Reports=Laporan
 Keyword=Kata kunci
 Origin=Asal
 Legend=Legenda
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 3e15d0bb175..390a0374425 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Samtals (Inc skatt)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Samtals (Inc skatt)
 TotalTTCToYourCredit=Samtals (Inc skatta) til að kredit
 TotalVAT=Samtals VSK
@@ -647,6 +649,7 @@ ReportName=Heiti skýrslu
 ReportPeriod=Skýrsla tímabils
 ReportDescription=Lýsing
 Report=Skýrsla
+Reports=Reports
 Keyword=Keyword
 Origin=Origin
 Legend=Legend
diff --git a/htdocs/langs/it_CH/datapolicy.lang b/htdocs/langs/it_CH/datapolicy.lang
deleted file mode 100644
index b73db9bf6c4..00000000000
--- a/htdocs/langs/it_CH/datapolicy.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - datapolicy
-datapolicySetupPage =Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
-DATAPOLICYSUBJECTMAIL =Subject of the email
-DATAPOLICYREFUSE =Message after disagreement
-TXTLINKDATAPOLICYREFUSE =Text for the link "disagreement"
-DATAPOLICY_opposition_traitement =Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection =Opposes to the processing of his personal data for the purposes of prospecting
-DATAPOLICY_date =Date of agreement/disagreement GDPR
-DATAPOLICY_send =Date agreement email sent
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION =Number of months before deletion
diff --git a/htdocs/langs/it_CH/languages.lang b/htdocs/langs/it_CH/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/it_CH/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 9ef43db1347..7b8ac27966d 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Totale (IVA inc.)
 TotalHT=Totale Netto
 TotalHTforthispage=Totale Netto per questa Pagina
 Totalforthispage=Totale in questa pagina
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Totale (IVA inclusa)
 TotalTTCToYourCredit=Totale (IVA inclusa) a tuo credito
 TotalVAT=Totale IVA
@@ -647,6 +649,7 @@ ReportName=Nome report
 ReportPeriod=Periodo report
 ReportDescription=Descrizione
 Report=Report
+Reports=Report
 Keyword=Chiave
 Origin=Origine
 Legend=Legenda
@@ -1098,7 +1101,7 @@ Deletedraft=Elimina bozza
 ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=Public file shared via link
 SelectAThirdPartyFirst=Seleziona prima un Soggetto terzo...
-YouAreCurrentlyInSandboxMode=Sei attualmente nella modalità "sandbox" di %s 
+YouAreCurrentlyInSandboxMode=Sei attualmente nella modalità "sandbox" di %s
 Inventory=Inventario
 AnalyticCode=Analytic code
 TMenuMRP=MRP
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index d3ea84e1e0f..8777f016f7c 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=合計(税込)
 TotalHT=小計（税抜）
 TotalHTforthispage=このページの合計(税抜き)
 Totalforthispage=このページの合計
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=合計(税込)
 TotalTTCToYourCredit=あなたのクレジットの合計(税込)
 TotalVAT=税額合計
@@ -647,6 +649,7 @@ ReportName=報告書名
 ReportPeriod=報告書期間
 ReportDescription=説明
 Report=報告書
+Reports=Reports
 Keyword=キーワード
 Origin=原産地
 Legend=凡例
@@ -720,7 +723,7 @@ GoBack=戻る
 CanBeModifiedIfOk=有効であれば変更することができる
 CanBeModifiedIfKo=有効でない場合は変更することができる
 ValueIsValid=値が有効。
-ValueIsNotValid=値が無効 
+ValueIsNotValid=値が無効
 RecordCreatedSuccessfully=レコードが正常に作成された
 RecordModifiedSuccessfully=レコードが正常に変更
 RecordsModified=%sレコード(s)が変更された
@@ -793,7 +796,7 @@ CoreErrorMessage=申し訳ないが、エラーが発生した。システム管
 CreditCard=クレジットカード
 ValidatePayment=支払を検証
 CreditOrDebitCard=クレジットカードまたはデビットカード
-FieldsWithAreMandatory=<b>%s</b>のフィールドは必須 
+FieldsWithAreMandatory=<b>%s</b>のフィールドは必須
 FieldsWithIsForPublic=<b> %s </b>のフィールドは、構成員の公開リストに表示される。これを望まない場合は、「公開」ボックスのチェックを外すること。
 AccordingToGeoIPDatabase=(GeoIP変換による)
 Line=ライン
@@ -804,7 +807,7 @@ ToTest=テスト
 ValidateBefore=この機能を使用する前に、アイテムが要検証済
 Visibility=可視性
 Totalizable=合計可能
-TotalizableDesc=このフィールドはリストで合計可能 
+TotalizableDesc=このフィールドはリストで合計可能
 Private=非公開
 Hidden=非表示
 Resources=資源
@@ -1184,7 +1187,7 @@ CategTypeNotFound=レコードのタイプのタグタイプが見つからな
 SupervisorNotFound=スーパーバイザーが見つからない
 CopiedToClipboard=クリップボードにコピー
 InformationOnLinkToContract=この金額は、契約の全行の合計にすぎない。時間の概念は考慮されていない。
-ConfirmCancel=本当にキャンセルしたいか 
+ConfirmCancel=本当にキャンセルしたいか
 EmailMsgID=メールMsgID
 EmailDate=メール日付
 SetToStatus=ステータス %s に設定
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 963a1a4a07a..69d6556460d 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -208,11 +208,6 @@ unitSET=セット
 unitS=秒
 unitH=時間
 unitD=日
-unitG=グラム
-unitM=メートル
-unitLM=直線メートル
-unitM2=平方メートル
-unitM3=立方メートル
 unitL=リットル
 unitT=トン
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=ポンド
 unitOZ=オンス
 unitM=メートル
+unitLM=直線メートル
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -435,5 +431,8 @@ ConfirmEditExtrafield = 変更するエクストラフィールドを選択す
 ConfirmEditExtrafieldQuestion = このエクストラフィールドを変更してもよいか？
 ModifyValueExtrafields = エクストラフィールドの値を変更する
 OrProductsWithCategories=またはタグ/カテゴリのある製品
-WarningTransferBatchStockMouvToGlobal = この 製品 を逆シリアル化する場合、シリアル化されたすべての 在庫 はグローバル <span class='notranslate'>在庫 に変換される。
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
 WarningConvertFromBatchToSerial=現在 製品 の数量が 2 以上ある場合、この選択に切り替えると、製品 が引き続き存在することになる。同じバッチの異なるオブジェクトを使用する (一意のシリアル番号が必要な場合)。これを修正するためのインベントリまたは手動の 在庫 移動が完了するまで、重複は残る。
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=下書きステータスに戻したいか?<br>現在在庫に設定されている数量はリセットされる。
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 6f71ac82865..5446a557de0 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total (inc. tax)
 TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total tax
@@ -647,6 +649,7 @@ ReportName=Report name
 ReportPeriod=Report period
 ReportDescription=Description
 Report=Report
+Reports=Reports
 Keyword=Keyword
 Origin=Origin
 Legend=Legend
diff --git a/htdocs/langs/kk_KZ/accountancy.lang b/htdocs/langs/kk_KZ/accountancy.lang
index 72e651b8d5b..62d3f68a4a2 100644
--- a/htdocs/langs/kk_KZ/accountancy.lang
+++ b/htdocs/langs/kk_KZ/accountancy.lang
@@ -287,7 +287,7 @@ TotalVente=Салыққа дейінгі жалпы айналым
 TotalMarge=Жалпы сату маржасы
 
 DescVentilCustomer=Шот жоспарынан өнім шотына байланыстырылған (немесе жоқ) тұтынушы шот-фактураларының тізімі осы жерден қараңыз.
-DescVentilMore=Көп жағдайда, егер сіз алдын ала анықталған өнімдерді немесе қызметтерді пайдалансаңыз және өнім/қызмет картасына есептік жазбаны (шот жоспарынан) орнатсаңыз, қолданба сіздің шот-фактура жолдары мен диаграммаңыздың есеп шоты арасындағы барлық байланыстыруды жасай алады. есептік жазбаларды бір рет басу арқылы <strong>"%s"b0a65d071f6fc90z >. Есептік жазба өнім/қызмет карталарында орнатылмаған болса немесе тіркелгіге байланыстырылмаған кейбір жолдарыңыз болса, "<span class='notranslate'><strong><span" мәзірінен қолмен байланыстыруды орындауыңыз керек. class='notranslate'>%s</span></strong>".
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Мұнда тұтынушылардың шот-фактураларының тізімі мен олардың өнім шоты шоттар жоспарынан қараңыз
 DescVentilTodoCustomer=Шот жоспарындағы өнім тіркелгісімен байланысы жоқ шот-фактура жолдарын байланыстырыңыз
 ChangeAccount=Таңдалған жолдар үшін өнім/қызмет шотын (шот жоспарынан) келесі есептік жазбамен өзгертіңіз:
@@ -352,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Сату кезінде бухгалтерл
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Сатып алу кезінде бухгалтерлік есепте байланыстыруды және аударуды өшіру (жеткізушілердің шот -фактуралары бухгалтерлік есепке алынбайды)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Бухгалтерлік есепте міндеттемелер мен аударымдарды өшіру (шығындар туралы есептер бухгалтерлік есепке алынбайды)
 ACCOUNTING_ENABLE_LETTERING=Бухгалтерлік есепте әріптер функциясын қосыңыз
-ACCOUNTING_ENABLE_LETTERING_DESC=Бұл опциялар қосылғанда, әр есеп жазбасында кодты анықтауға болады, осылайша әртүрлі есеп қозғалыстарын бірге топтауға болады. Бұрын әртүрлі журналдар дербес басқарылатын кезде, бұл мүмкіндік әртүрлі журналдардың қозғалыс сызықтарын біріктіру үшін қажет болды. Дегенмен, Dolibarr бухгалтериясында мұндай бақылау коды "<b>%s<span class='notranslate'>b09a4b739fz01f деп аталады. span>" қазірдің өзінде автоматты түрде сақталған, сондықтан автоматты әріптер жасалып қойған, қате қаупі жоқ, сондықтан бұл мүмкіндік жалпы пайдалану үшін пайдасыз болып қалды. Қолмен әріптерді жазу мүмкіндігі бухгалтерлік есепте деректерді тасымалдауды жүзеге асыратын компьютер қозғалтқышына шынымен сенбейтін соңғы пайдаланушылар үшін қамтамасыз етілген.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Бұл мүмкіндікті қосу бухгалтерлік есепті қатаң басқару үшін қажет емес.
 ACCOUNTING_ENABLE_AUTOLETTERING=Бухгалтерлік есепке көшкен кезде автоматты әріптерді қосыңыз
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Әріптің коды автоматты түрде жасалады және көбейтіледі және соңғы пайдаланушы таңдамайды
@@ -360,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=Әріптік кодты жасау кезінд
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Кейбір бухгалтерлік бағдарламалық құрал тек екі әріптік кодты қабылдайды. Бұл параметр осы аспектіні орнатуға мүмкіндік береді. Әдепкі әріптер саны үш.
 OptionsAdvanced=Қосымша опциялар
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Жеткізушінің сатып алулары бойынша ҚҚС кері төлемін басқаруды белсендіріңіз
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Бұл опция қосылғанда, жеткізушінің немесе берілген жеткізушінің шот-фактурасын бухгалтерлік есепке басқаша аудару керектігін анықтауға болады: «<» шотында анықталған шот жоспарынан 2 берілген шот бойынша бухгалтерлік есепке қосымша дебет пен кредиттік желі жасалады. span class='notranslate'>%s</span>" орнату беті.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Файлды жасау кезінде әріпті экспорттамаңыз
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index 6a83bf89f54..e40c2e042e5 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -268,8 +268,8 @@ OtherResources=Басқа ресурстар
 ExternalResources=Сыртқы ресурстар
 SocialNetworks=Әлеуметтік желілер
 SocialNetworkId=Әлеуметтік желі идентификаторы
-ForDocumentationSeeWiki=Пайдаланушы немесе әзірлеуші құжаттамасы (Doc, FAQ...),<br>Dolibarr Wiki сайтын қараңыз:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e4078d <span class='notranslate'></b>
-ForAnswersSeeForum=Кез келген басқа сұрақтар/анықтама үшін Dolibarr форумын пайдалана аласыз:<br><b>b00fab50ead9320 /span><span class='notranslate'>%s</a></b>
+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=Міне, Dolibarr көмегімен көмек пен қолдау алуға арналған бірнеше ресурстар.
 HelpCenterDesc2=Бұл ресурстардың кейбірі <b> ағылшын тілінде </b> қол жетімді.
 CurrentMenuHandler=Ағымдағы мәзір өңдегіші
@@ -366,9 +366,9 @@ GenericMaskCodes2= <b> {cccc} </b> n таңбалы клиент коды <br> <
 GenericMaskCodes3=Масканың барлық басқа кейіпкерлері өзгеріссіз қалады. <br> Бос орындарға рұқсат жоқ. <br>
 GenericMaskCodes3EAN=Маскадағы барлық басқа таңбалар өзгеріссіз қалады ( * немесе? EAN13 -те 13 -ші позициядан басқа). <br> Бос орындарға рұқсат жоқ. <br> EAN13 кезінде 13 -ші позициядағы соңғы} -дан кейінгі соңғы таңба * немесе? . Ол есептелген кілтпен ауыстырылады. <br>
 GenericMaskCodes4a=<u>Үшінші тарап TheCompany компаниясының 99-шы %s үлгісі, 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>31.01.2023 күні жасалған үшінші тараптағы мысал:</u><span class='notranslate'>b0342fccfda19b >
-GenericMaskCodes4c=<u>2023-01-31 жасалған өнім туралы мысал:</u><span class='notranslate'>b0342fccfda19b
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> b0aee833608 береді span>ABC2301-000099</b><br>b0aee83365837{100@ }-ZZZ/{dd}/XXX<span class='notranslate'></b> <b>0199-ZZZ/31/XXX<span class='notranslate береді '></b></span><br><b>IN{yy}{mm}-{0000}-{t}</b> <b>IN2301-0099-A<span class='notranslate'>b09a4b739f17f80 болса, береді "A_RI" түрінің коды бар "Жауапты Inscripto"
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Анықталған маска бойынша теңшелетін нөмірді қайтарады.
 ServerAvailableOnIPOrPort=Сервер <b> %s </b> а0ае83365837fz0 %s </b> портында бар
 ServerNotAvailableOnIPOrPort=<b> %s </b> <b> %s </b> адресінде сервер жоқ
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=Бұл өрісті бос қалдырсаңыз, 
 ExtrafieldParamHelpselect=Мәндер тізімі формат кілті бар жолдар болуы керек, онда мән (мұнда кілт '0' болмауы керек) <br> <br> 1, мән1 <br> 2, мән2 a0342fcc3f342f030429342943f04f34f34f34f34f34f34f34f34f34f3f34f319f342f34f3f34f34f34f34f34f34f34f34f31943 басқа толықтыратын атрибут тізімнен байланысты тізімі: <br> 1, 1-мән | options_ <i> parent_list_code </i>: parent_key <br> 2, 2-мән | options_ <i> parent_list_code </i>: parent_key <br> <br> басқа тізімге байланысты тізімі болуы үшін: <br> 1, значение1 | <i> parent_list_code </i>: parent_key <br> 2, мән2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Мәндер тізімі формат кілті бар жолдар болуы керек, мән (мұнда кілт '0' болмауы керек) <br> <br> 1, мән1 <br> 2, мән2 a0342fccff319f03
 ExtrafieldParamHelpradio=Мәндер тізімі формат кілті бар жолдар болуы керек, мән (мұнда кілт '0' болмауы керек) <br> <br> 1, мән1 <br> 2, мән2 a0342fccff319f03
-ExtrafieldParamHelpsellist=Мәндер тізімі кестеден алынған<br>Синтаксис: table_name:label_field:id_field::filtersql<br>Мысалы: c_typent: ::filtersql<br><br>- id_field міндетті түрде негізгі int кілті болып табыладыb0342fcczf01> - filtersql — SQL шарты. Бұл тек белсенді мәнді көрсету үшін қарапайым сынақ (мысалы, active=1) болуы мүмкін<span class='notranslate'><br>Сонымен қатар ағымдағы нысанның ағымдағы идентификаторы<span класы болып табылатын сүзгіде $ID$ пайдалануға болады. ='notranslate'><br></span>Сүзгіде ТАҢДАУ функциясын пайдалану үшін, инъекцияға қарсы қорғанысты айналып өту үшін $SEL$ кілт сөзін пайдаланыңыз.<br>Егер қосымша өрістерде сүзгіңіз келсе extra.fieldcode=... синтаксисін пайдаланыңыз (мұндағы өріс коды - экстра өріс коды)<br><br> басқа қосымша төлсипат тізіміне байланысты тізім:<br>c_typent:libelle:id:options_<i>parent_list_code<spante class='translate </i></span>|parent_column:сүзгі <br><br>Тізім басқа тізімге байланысты болуы үшін:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758baclum>033npar
+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 necessarily 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=Мәндер тізімі <br> кестесінен келеді Синтаксис: table_name: label_field: id_field :: filtersql <br> Мысал: c_typent: libelle: id :: filtersql <br> a0342 a0342 a03f2 a0342fccff19 $ ID $ сүзгіні қолдана алады, бұл ағымдағы нысанның идентификаторы <br> Сүзгіде SELECT жасау үшін $ SEL $ <br> пайдаланыңыз, егер сіз қосымша өрістерде сүзгіңіз келсе, extra.fieldcode = ... синтаксисін қолданыңыз (өріс коды - бұл extrafield коды) <br> <br> басқа толықтыратын атрибут тізімнен байланысты тізімі болуы үшін: <br> c_typent: Libelle: ID: options_ <i> parent_list_code </i> | parent_column: сүзгі <br> <br> басқа тізімге байланысты тізімі болуы үшін: <br> c_typent: жала жабу: идентификатор: <i> parent_list_code </i> | ата -аналық баған: сүзгі
 ExtrafieldParamHelplink=Параметрлер ObjectName болуы керек: Classpath <br> Синтаксис: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Қарапайым сепаратор үшін бос ұстаңыз күй әр пайдаланушы сеансы алдында сақталады)
@@ -483,7 +483,7 @@ ExternalModule=Сыртқы модуль
 InstalledInto=%s каталогына орнатылды
 BarcodeInitForThirdparties=Үшінші тараптар үшін жаппай штрих-код
 BarcodeInitForProductsOrServices=Штрих -кодтың жаппай басталуы немесе өнімдерге немесе қызметтерге қалпына келтіру
-CurrentlyNWithoutBarCode=Қазіргі уақытта сізде <strong>%s</strong> жазбасы <strong>%s</strong> <span class='notranslate'>b0ecb4dedefined bar8cod .
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=%s бос штрих-кодтар үшін бастапқы мән
 EraseAllCurrentBarCode=Штрих -кодтың барлық ағымдағы мәндерін өшіріңіз
 ConfirmEraseAllCurrentBarCode=Штрих -кодтың барлық ағымдағы мәндерін шынымен өшіргіңіз келе ме?
@@ -1197,6 +1197,7 @@ Skin=Тері тақырыбы
 DefaultSkin=Терінің әдепкі тақырыбы
 MaxSizeList=Тізім үшін максималды ұзындық
 DefaultMaxSizeList=Тізімдер үшін әдепкі максималды ұзындық
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Қысқа тізімдер үшін әдепкі максималды ұзындық (яғни тұтынушы картасында)
 MessageOfDay=Күннің хабарламасы
 MessageLogin=Кіру бетінің хабарламасы
@@ -1281,7 +1282,7 @@ AvailableModules=Қол жетімді бағдарлама/модульдер
 ToActivateModule=Модульдерді іске қосу үшін «Аймақтарды реттеу» бөліміне өтіңіз (Үй-> Орнату-> Модульдер).
 SessionTimeOut=Сеанстың уақыты
 SessionExplanation=Бұл нөмір, егер сеанс тазалағышты PHP ішкі сеанс тазалаушысымен жасаса (және басқа ештеңе жоқ) сеанстың аяқталмайтынына кепілдік береді. PHP сеансының ішкі тазалағышы осы кідірістен кейін сеанстың аяқталатынына кепілдік бермейді. Ол осы кідірістен кейін және сеанс тазалағыш іске қосылғанда аяқталады, сондықтан әрбір <b> %s/%s </b> қатынау кезінде, бірақ басқа сеанстар арқылы кіру кезінде (егер мән 0 болса, бұл тек сессияның тазалануын білдіреді) процесс). <br> Ескертпе: сыртқы сеансты тазалау механизмі бар кейбір серверлерде (cron debian, ubuntu ... астында), сеанс сыртқы орнатумен анықталған кезеңнен кейін жойылуы мүмкін, мұнда қандай мән енгізілгеніне қарамастан.
-SessionsPurgedByExternalSystem=Бұл сервердегі сеанстар сыртқы механизммен (Debian астында cron, ubuntu ...) тазартылған сияқты, мүмкін әрбір <b>%s</b> секунд (= параметрдің мәні <b>session.gc_maxlifetime<span class='notranslate</span>b09a4b739) , сондықтан мұнда мәнді өзгерту әсер етпейді. Сервер әкімшісінен сеанс кідірісін өзгертуді сұрау керек.
+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=Қол жетімді триггерлер
 TriggersDesc=Триггерлер - <b> htdocs/core/</b> каталогына көшірілгеннен кейін Dolibarr жұмыс процесінің тәртібін өзгертетін файлдар. Олар Dolibarr оқиғаларында белсендірілген жаңа әрекеттерді жүзеге асырады (жаңа компания құру, шот -фактураны тексеру, ...).
 TriggerDisabledByName=Бұл файлдағы триггерлер <b> -NORUN </b> өз атауындағы жұрнақпен өшірілген.
@@ -1321,7 +1322,7 @@ PreviousDumpFiles=Бар резервтік файлдар
 PreviousArchiveFiles=Бар архив файлдары
 WeekStartOnDay=Аптаның бірінші күні
 RunningUpdateProcessMayBeRequired=Жаңарту процесін жүргізу қажет сияқты (Бағдарламаның %s нұсқасы %s мәліметтер базасынан өзгеше)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Бұл пәрменді <b>%sb09a4b739f17fz0 пайдаланушысы бар қабықшаға кіргеннен кейін пәрмен жолынан орындау керек.  немесе <b>%s<span class='notranslate беру үшін пәрмен жолының соңына -W опциясын қосу керек. '></b></span> құпия сөз.
+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=PHP -де SSL функциялары жоқ
 DownloadMoreSkins=Жүктеу үшін қосымша мұқабалар
 SimpleNumRefModelDesc=Анықтамалық нөмірді %syymm-nnnn форматында қайтарады, мұнда yy-жыл, мм-ай және nnnn-қалпына келтірусіз автоматты түрде қосылатын нөмір.
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Ескі оқиғаны экспорттамаңыз
 SecurityKey = Қауіпсіздік кілті
 ##### ClickToDial #####
 ClickToDialSetup=Теру үшін модульді орнату түймешігін басыңыз
-ClickToDialUrlDesc=Телефон суретін басқан кезде URL шақырылады. URL мекенжайында <br><b>__PHONETO__b09a4b739f17f8z болатын тегтерді пайдалануға болады. қоңырау шалатын адамның телефон нөмірімен ауыстырылды<span class='notranslate'><br><b>__PHONEFROM__b09a4b739f017</span7f Қоңырау шалушы тұлғаның телефон нөмірімен ауыстырылады (сіздікі)<span class='notranslate'><br><b>__LOGIN__b09a41709f span> ол басу арқылы логинмен ауыстырылады (пайдаланушы картасында анықталған)<span class='notranslate'><br><b>__PASS__ </b> ол басу арқылы терілетін құпия сөзбен ауыстырылады (пайдаланушы картасында анықталған).
+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=Бұл модуль жұмыс үстелінің компьютерін пайдаланған кезде телефон нөмірлерін басылатын сілтемелерге өзгертеді. Бір рет басу арқылы нөмірге қоңырау шалынады. Бұл жұмыс үстелінде жұмсақ телефонды пайдалану кезінде немесе мысалы SIP протоколына негізделген CTI жүйесін пайдалану кезінде телефон қоңырауын бастау үшін пайдаланылуы мүмкін. Ескерту: Смартфонды пайдаланған кезде телефон нөмірлері әрқашан басылады.
 ClickToDialUseTelLink=Телефон нөмірлеріндегі «tel:» сілтемесін пайдаланыңыз
 ClickToDialUseTelLinkDesc=Егер сіздің пайдаланушыларыңызда браузермен бір компьютерде орнатылған және шолғышта «tel:» деп басталатын сілтемені басқанда қоңырау шалатын телефон немесе бағдарламалық жасақтама интерфейсі болса, бұл әдісті қолданыңыз. Егер сізге «sip:» деп басталатын сілтеме немесе сервердің толық шешімі қажет болса (жергілікті бағдарламалық жасақтаманы орнатудың қажеті жоқ), оны «Жоқ» деп қойып, келесі өрісті толтыру қажет.
@@ -2114,7 +2115,7 @@ YouCanDeleteFileOnServerWith=Бұл файлды пәрмен жолы арқы
 ChartLoaded=Есеп схемасы жүктелді
 SocialNetworkSetup=Әлеуметтік желілер модулін орнату
 EnableFeatureFor=<strong> %s </strong> мүмкіндіктерін қосу
-VATIsUsedIsOff=Ескертпе: Сату салығын немесе ҚҚС пайдалану опциясы <span class='notranslate мәзірінде <strong>Өшірулі</strong> күйіне орнатылды. '>%s</span> - %s, сондықтан сатылым салығы немесе пайдаланылған ҚҚС сату үшін әрқашан 0 болады.
+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=PDF құжаттарында жіберуші мен алушының мекенжайын ауыстырыңыз
 FeatureSupportedOnTextFieldsOnly=Ескерту, мүмкіндік тек мәтін өрістерінде және құрама тізімдерде қолдау көрсетеді. Сонымен қатар URL параметрі action = create немесе action = edit орнатылуы керек НЕМЕСЕ беттің атауы бұл мүмкіндікті іске қосу үшін 'new.php' деп аяқталуы керек.
 EmailCollector=Электрондық пошта жинаушы
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=API модульдері қосылмаған
 YouShouldSetThisToOff=Мұны 0 немесе өшіруге қою керек
 InstallAndUpgradeLockedBy=Орнату мен жаңарту <b> %s </b> файлымен құлыпталған.
 InstallLockedBy=Орнату/қайта орнату <b>%s</b> файлымен құлыпталған.
-InstallOfAddonIsNotBlocked=Қосымшалардың орнатулары құлыпталмаған. <b>installmodules.lock</b> файлын b0aee83365837fz<span>class0 каталогына жасаңыз ='notranslate'>%s</span></b> сыртқы қосымшаларды/модульдерді орнатуды блоктау үшін.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Ескі іске асыру
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Кейбір онлайн төлем модульдері қосылған болса (Paypal, Stripe, ...), онлайн төлем жасау үшін PDF файлына сілтеме қосыңыз.
 DashboardDisableGlobal=Ашық нысандардың барлық бас бармақтарын жаһандық түрде өшіріңіз
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Әдепкі бойынша жа
 CSSPage=CSS стилі
 Defaultfortype=Әдепкі
 DefaultForTypeDesc=Үлгі түрі үшін жаңа электрондық поштаны жасау кезінде әдепкі бойынша пайдаланылатын үлгі
-OptionXShouldBeEnabledInModuleY="<b>%s</b>" опциясы <span сынып модуліне қосылуы керек ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY="<b>%s</b>" опциясы <span class= модуліне қосылды 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=On line қолтаңбаға рұқсат беру
 AtBottomOfPage=Беттің төменгі жағында
 FailedAuth=сәтсіз аутентификациялар
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/kk_KZ/banks.lang b/htdocs/langs/kk_KZ/banks.lang
index 41d157a459d..b4f1336be02 100644
--- a/htdocs/langs/kk_KZ/banks.lang
+++ b/htdocs/langs/kk_KZ/banks.lang
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=Ішкі аударым
 TransferDesc=Бір шоттан екіншісіне аудару үшін ішкі аударымды қолданыңыз, қосымшада екі жазба жазылады: бастапқы шоттағы дебет және мақсатты шоттағы несие. Бұл транзакция үшін сол сома, белгі және күн қолданылады.
 TransferFrom=Қайдан
 TransferTo=Кімге
-TransferFromToDone=<b>%s</b> файлынан <span class='notranslate файлына тасымалдау ><b></span>%s</b> b0aee833608><span=span> 'notranslate'>%s</b> %s жазылды.
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Жіберуші
 ValidateCheckReceipt=Бұл чек түбіртегін растау керек пе?
 ConfirmValidateCheckReceipt=Бұл чек түбіртегін тексеру үшін жібергіңіз келетініне сенімдісіз бе? Тексерілгеннен кейін ешқандай өзгерту мүмкін болмайды.
diff --git a/htdocs/langs/kk_KZ/bills.lang b/htdocs/langs/kk_KZ/bills.lang
index 888d05acc84..eb5982489c2 100644
--- a/htdocs/langs/kk_KZ/bills.lang
+++ b/htdocs/langs/kk_KZ/bills.lang
@@ -188,7 +188,7 @@ SuppliersDraftInvoices=Жеткізуші шот -фактуралар
 Unpaid=Төленбеген
 ErrorNoPaymentDefined=Қате Төлем анықталмады
 ConfirmDeleteBill=Бұл шот -фактураны шынымен жойғыңыз келе ме?
-ConfirmValidateBill=Осы шот-фактураны <b>%s<span class='notranslate'></b> сілтемесі арқылы растағыңыз келетініне сенімдісіз бе >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=<b> %s </b> шот -фактураны жоба күйіне өзгерткіңіз келетініне сенімдісіз бе?
 ConfirmClassifyPaidBill=<b> %s </b> шот -фактураны төленген күйге өзгерткіңіз келетініне сенімдісіз бе?
 ConfirmCancelBill=<b> %s </b> шот -фактурасынан бас тартқыңыз келетініне сенімдісіз бе?
@@ -210,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Кейбір елдерде б
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Егер басқалары сәйкес келмесе, бұл таңдауды қолданыңыз
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> нашар клиент </b> - бұл қарызын төлеуден бас тартатын клиент.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Бұл таңдау төлем аяқталмаған кезде қолданылады, себебі кейбір өнімдер қайтарылды
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Төленбеген сома - <b>делдалдық банк комиссиялары</b>, тікелей b0aee3836z шегеріледі. >дұрыс сома<span class='notranslate'></b> Тұтынушы төлеген.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Төленбеген сома ешқашан төленбейді, өйткені бұл ұсталатын салық
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Егер басқалары сәйкес келмесе, бұл таңдауды қолданыңыз, мысалы, келесі жағдайда: <br> - кейбір өнімдер қайтарылғандықтан, төлем аяқталмады несиелік нотаны құру арқылы бухгалтерлік есеп жүйесінде.
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>жаман жеткізуші</b> - біз төлеуден бас тартатын жеткізуші.
@@ -569,9 +569,9 @@ PDFCrabeDescription=Crabe шот -фактурасының PDF үлгісі. Ш
 PDFSpongeDescription=Шот -фактураның PDF үлгісі губка. Шот -фактураның толық үлгісі
 PDFCrevetteDescription=Шот -фактура PDF үлгісі Crevette. Жағдайлы шот -фактуралар үшін шот -фактураның толық үлгісі
 TerreNumRefModelDesc1=Стандартты шот-фактуралар үшін %syymm-nnnn және несиелік жазбалар үшін %syymm-nnnn пішіміндегі қайтару нөмірі, мұнда yy жыл, мм ай және nnnn үзіліссіз және 0-ге қайтарылмаған дәйекті автоматты өсетін сан
-MarsNumRefModelDesc1=Стандартты шот-фактуралар үшін %syymm-nnnn, ауыстыру шот-фактуралары үшін %syymm-nnnn, <span class=' пішіміндегі қайтару нөмірі notranslate'>%s</span>yymm-nnnn бастапқы төлем шоттары үшін және %syymm-nnnn несиелік ноталар үшін, мұнда yy – жыл, мм – ай және nnnn – дәйекті авто- Үзіліссіз және 0-ге қайтарылмаған көбейту
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$ Syymm -ден басталатын шот бұрыннан бар және бұл реттілік моделіне сәйкес келмейді. Бұл модульді іске қосу үшін оны алып тастаңыз немесе атын өзгертіңіз.
-CactusNumRefModelDesc1=Стандартты шот-фактуралар үшін %syymm-nnnn, несиелік жазбалар үшін %syymm-nnnn және <span class=' пішіміндегі қайтару нөмірі notranslate'>%s</span>yymm-nnnn бастапқы төлем шоттары үшін, мұнда yy – жыл, мм – ай және nnnn – үзіліссіз және 0-ге қайтарылмаған дәйекті автоматты ұлғайтылатын сан.
+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 sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Ерте жабылу себебі
 EarlyClosingComment=Ерте жабылу жазбасы
 ##### Types de contacts #####
diff --git a/htdocs/langs/kk_KZ/cashdesk.lang b/htdocs/langs/kk_KZ/cashdesk.lang
index aa71194da18..cb83a99d065 100644
--- a/htdocs/langs/kk_KZ/cashdesk.lang
+++ b/htdocs/langs/kk_KZ/cashdesk.lang
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Мәліметсіз басып шығаруда
 PrintWithoutDetails=Егжей-тегжейсіз басып шығарыңыз
 YearNotDefined=Жылы анықталмаған
 TakeposBarcodeRuleToInsertProduct=Өнімді енгізу үшін штрих-код ережесі
-TakeposBarcodeRuleToInsertProductDesc=Өнім анықтамасын + сканерленген штрих-кодтан мөлшерді шығару ережесі.<br>Егер бос болса (әдепкі мән), қолданба өнімді табу үшін сканерленген толық штрих-кодты пайдаланады.<br><br>Анықталған болса, синтаксис келесідей болуы керек:<br><span'>notranslate class='notranslate <b></span>ref:NB+qu:NB+qd:NB+басқа:NB</b><br> сканерленген штрих-кодтан деректерді шығару үшін пайдаланылатын таңбалар саны:<br><b>refb09a4b789z  : өнім анықтамасы<br><b>qu</b>: элементті (бірліктер) енгізу кезінде орнату<br><b>qdb09a4b739f17f8z>quantity элементті (ондық сандар) кірістіру кезінде орнату<span class='notranslate'><br><b>басқа<span class='notranslate'>b09a4b739f17f8>0 басқа таңбалар
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Қазірдің өзінде басып шығарылған
 HideCategories=Санат таңдауының бүкіл бөлімін жасырыңыз
 HideStockOnLine=Желідегі қорды жасыру
diff --git a/htdocs/langs/kk_KZ/companies.lang b/htdocs/langs/kk_KZ/companies.lang
index 3e87e650b77..3de9110be4f 100644
--- a/htdocs/langs/kk_KZ/companies.lang
+++ b/htdocs/langs/kk_KZ/companies.lang
@@ -333,7 +333,7 @@ CustomerRelativeDiscountShort=Салыстырмалы жеңілдік
 CustomerAbsoluteDiscountShort=Абсолютті жеңілдік
 CompanyHasRelativeDiscount=Бұл тұтынушыда <b> %s%% </b> әдепкі бойынша жеңілдік бар.
 CompanyHasNoRelativeDiscount=Бұл тұтынушыда әдепкі бойынша салыстырмалы жеңілдік жоқ
-HasRelativeDiscountFromSupplier=Сізде <b>%s%%<span class=' әдепкі жеңілдік бар. notranslate'></b></span> осы жеткізушімен
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
 HasNoRelativeDiscountFromSupplier=Бұл жеткізушіде әдепкі салыстырмалы жеңілдік жоқ
 CompanyHasAbsoluteDiscount=Бұл тұтынушыда <b> %s </b> %s үшін жеңілдіктер бар (несиелік жазбалар немесе бастапқы жарналар).
 CompanyHasDownPaymentOrCommercialDiscount=Бұл тұтынушыда <b> %s </b> %s үшін жеңілдіктер бар (коммерциялық, бастапқы жарналар).
diff --git a/htdocs/langs/kk_KZ/compta.lang b/htdocs/langs/kk_KZ/compta.lang
index 958966fba82..d8d3a7aecfc 100644
--- a/htdocs/langs/kk_KZ/compta.lang
+++ b/htdocs/langs/kk_KZ/compta.lang
@@ -175,10 +175,10 @@ AnnualSummaryDueDebtMode=Кірістер мен шығыстар балансы
 AnnualSummaryInputOutputMode=Кірістер мен шығыстар балансы, жылдық қорытынды
 AnnualByCompanies=Есептердің алдын ала анықталған топтары бойынша кірістер мен шығыстардың қалдығы
 AnnualByCompaniesDueDebtMode=Кірістер мен шығыстар балансы, алдын ала анықталған топтар бойынша егжей-тегжейлі, режим <b>%sТалаптар-Борыштар809f </b> <b>Міндеттеме есебі</b> деді.
-AnnualByCompaniesInputOutputMode=Кірістер мен шығыстар балансы, алдын ала анықталған топтар бойынша егжей-тегжейлі, режим <b>%sКірістер-шығындар<span class='notranslate'ec802f </span></b> <b>қолма-қол ақшаны есепке алу</b> деді.
-SeeReportInInputOutputMode=<b>%sтөлемдердің талдауын қараңыз%s<spante class='notranslate ></b></span> <b>жазылған төлемдерге негізделген есептеу үшін</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=<b> %s жазылған құжаттарды талдау %s </b> белгілі <b> жазылған құжаттарға </b> тіркелген болса да қараңыз
-SeeReportInBookkeepingMode=<b>%sбухгалтерлік есеп кестесінің талдауын қараңыз%s<span <b>Бухгалтерлік есеп кестесі</b> негізіндегі есеп үшін notranslate'></b></span>
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Көрсетілген сомалар барлық салықтарды қосқанда
 RulesAmountWithTaxExcluded=- Көрсетілген шот-фактуралардың сомалары барлық салықтарды есептемегенде
 RulesResultDue=- Оған барлық шот-фактуралар, шығыстар, ҚҚС, қайырылымдар, жалақы төленгеніне немесе төленбегеніне қарамастан кіреді.<br>- Ол шот-фактуралардың есеп айырысу күніне және төлем мерзіміне негізделген. шығындар немесе салық төлемдері. Жалақы үшін кезеңнің аяқталу күні пайдаланылады.
diff --git a/htdocs/langs/kk_KZ/cron.lang b/htdocs/langs/kk_KZ/cron.lang
index af9b464fcf4..a41598ec5e8 100644
--- a/htdocs/langs/kk_KZ/cron.lang
+++ b/htdocs/langs/kk_KZ/cron.lang
@@ -66,7 +66,7 @@ CronModuleHelp=Dolibarr модуль каталогының атауы (соны
 CronClassFileHelp=Жүктелетін салыстырмалы жол мен файл атауы (жол веб -сервердің каталогына қатысты). <BR> Мысалы, Dolibarr Өнім объектісінің алу әдісін шақыру үшін htdocs/product/class/<u> product.class.php </u>, сынып файлының атауының мәні a0342fccfda19bz8 өнім болып табылады a049271
 CronObjectHelp=Жүктелетін объект атауы. <BR> Мысалы, Dolibarr Product объектісінің алу әдісін шақыру үшін /htdocs/product/class/product.class.php, сынып файл атауының мәні <br> <i> Өнім </i>
 CronMethodHelp=Іске қосылатын объект әдісі. <BR> Мысалы, Dolibarr Product объектісінің алу әдісін шақыру үшін /htdocs/product/class/product.class.php, әдіс мәні <br> <i> </i> алу
-CronArgsHelp=Әдіс аргументтері. <BR> Мысалы, Dolibarr өнімі нысанының /htdocs/product/class/product.class.php алу әдісін шақыру үшін, параметрлердің мәні<span class='notranslate' болуы мүмкін. ><br></span><i>0, ProductRef</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 parameters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Орындалатын жүйелік пәрмен жолы.
 CronCreateJob=Жаңа жоспарланған жұмысты құру
 CronFrom=Қайдан
diff --git a/htdocs/langs/kk_KZ/errors.lang b/htdocs/langs/kk_KZ/errors.lang
index bf7488551d8..c0fd9b4c91d 100644
--- a/htdocs/langs/kk_KZ/errors.lang
+++ b/htdocs/langs/kk_KZ/errors.lang
@@ -94,10 +94,10 @@ ErrorRecordIsUsedCantDelete=Жазбаны жою мүмкін емес. Ол қ
 ErrorModuleRequireJavascript=Бұл мүмкіндік жұмыс істеуі үшін JavaScript өшірілмеуі керек. JavaScript қосу/өшіру үшін Басты->Орнату->Дисплей мәзіріне өтіңіз.
 ErrorPasswordsMustMatch=Екі терілген пароль бір -біріне сәйкес келуі керек
 ErrorContactEMail=Техникалық қате орын алды. Келесі электрондық поштаға әкімшіге хабарласыңыз <b>%s</b> және қатені көрсетіңіз. Хабардағы <b>%s</b> кодын немесе экрандық көшірмесін қосыңыз осы бет.
-ErrorWrongValueForField=Өріс <b>%s</b>: '<spante class='no <b></span>%s</b>' регекс ережесіне сәйкес келмейді b0aee337 <span class='notranslate'>%s</b>
-ErrorHtmlInjectionForField=<b>%s</b> өрісі: '<span class='notranslate мәні '><b></span>%s</b>' рұқсат етілмеген зиянды деректерден тұрады
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Өріс <b> %s </b>: «<b> %s </b>» мән <b> %s </b> <b> %s </b> саласында табылған жоқ
-ErrorFieldRefNotIn=Өріс <b>%s</b>: '<spante class='no <b></span>%s</b>' - b0aee8735z class='notranslate'>%s</b> бар сілтеме
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorMultipleRecordFoundFromRef=<b>%s</b> сілтемесінен іздеу кезінде бірнеше жазба табылды. Қай идентификаторды пайдалану керектігін білу мүмкін емес.
 ErrorsOnXLines=%s қателері табылды
 ErrorFileIsInfectedWithAVirus=Антивирустық бағдарлама файлды тексере алмады (файл вирус жұқтырған болуы мүмкін)
@@ -263,7 +263,7 @@ ErrorReplaceStringEmpty=Қате, ауыстырылатын жол бос
 ErrorProductNeedBatchNumber=Қате, '<b> %s </b>' өніміне көп/сериялық нөмір қажет
 ErrorProductDoesNotNeedBatchNumber=Қате, '<b> %s </b>' өнімі көп/сериялық нөмірді қабылдамайды
 ErrorFailedToReadObject=Қате, <b> %s </b> түріндегі объект оқылмады
-ErrorParameterMustBeEnabledToAllwoThisFeature=Қате, <b>%s</b> параметрі <span class= қосулы болуы керек 'notranslate'><b></span>conf/conf.php<> пәрмен жолы интерфейсін ішкі жұмыс жоспарлаушысымен пайдалануға рұқсат беру үшін
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Қате, бұл кіру мерзімі жарамдылық мерзімінен тыс
 ErrorValueLength='<b> %s </b>' өрісінің ұзындығы '<b> %s </b>' жоғары болуы керек
 ErrorReservedKeyword='<b> %s </b>' сөзі сақталған кілт сөз
@@ -311,7 +311,7 @@ ErrorValueCantBeNull=<b>%s</b> мәні нөл болуы мүмкін емес
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Банк операциясының күні файлды жіберу күнінен төмен болмауы керек
 ErrorTooMuchFileInForm=Пішінде файлдар тым көп, максималды саны - %s файл(лар)
 ErrorSessionInvalidatedAfterPasswordChange=Сеанс құпия сөз, электрондық пошта, күй немесе жарамдылық мерзімі өзгергеннен кейін жарамсыз деп танылды. Қайта кіріңіз.
-ErrorExistingPermission = Рұқсат <b>%s</b> <span'>notranslate <b></span>%s</b> бұрыннан бар
+ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
 ErrorFieldExist=<b>%s</b> мәні бұрыннан бар
 ErrorEqualModule=Модуль <b>%s</b> ішінде жарамсыз
 ErrorFieldValue=<b>%s</b> мәні дұрыс емес
diff --git a/htdocs/langs/kk_KZ/eventorganization.lang b/htdocs/langs/kk_KZ/eventorganization.lang
index ffe44d94d22..010827fcc20 100644
--- a/htdocs/langs/kk_KZ/eventorganization.lang
+++ b/htdocs/langs/kk_KZ/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=Іс -шараны ұйымдастыру
 EventOrganization=Іс-шараны ұйымдастыру
 EventOrganizationSetupPage = Оқиғаны ұйымдастыру беті
 EVENTORGANIZATION_TASK_LABEL = Жоба расталған кезде автоматты түрде жасалатын тапсырмалар белгісі
-EVENTORGANIZATION_TASK_LABELTooltip = Ұйымдастыру үшін оқиғаны растаған кезде, кейбір тапсырмалар жобада автоматты түрде жасалуы мүмкін<br><br>Мысалы: <br>Конференцияларға шақыру жіберу<br>Конференцияларға шақыру жіберу<br></spanidateV сыныптары бойынша ұсыныстар ='notranslate'><br></span>Stencils қолданбасын тексеру<br>Қатысушылар үшін оқиғаға жазылуларды ашуb0342fccfda19b>az спикерлерге оқиға туралы<span class='notranslate'><br>Бут хостерлеріне оқиға туралы еске салу жіберу<br>Қатысушыларға оқиға туралы еске салу жіберу
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=Тапсырмаларды автоматты түрде жасау қажет болмаса, бос қалдырыңыз.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Біреу конференция ұсынған кезде үшінші тараптарға автоматты түрде қосылатын санат
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Үшінші тараптарға стенд ұсынылған кезде автоматты түрде қосылатын санат
@@ -88,6 +88,7 @@ PriceOfRegistration=Тіркеу бағасы
 PriceOfRegistrationHelp=Тіркелу немесе шараға қатысу үшін төлейтін баға
 PriceOfBooth=Кабинаға жазылу бағасы
 PriceOfBoothHelp=Кабинаға жазылу бағасы
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Конференциялар үшін ICS сілтемесі
 ConferenceOrBoothInformation=Конференция немесе стенд туралы ақпарат
 Attendees=Қатысушылар
diff --git a/htdocs/langs/kk_KZ/exports.lang b/htdocs/langs/kk_KZ/exports.lang
index 5ff41eb9f0e..a55c0400c59 100644
--- a/htdocs/langs/kk_KZ/exports.lang
+++ b/htdocs/langs/kk_KZ/exports.lang
@@ -94,8 +94,8 @@ NbOfLinesOK=Қатесіз және ескертусіз жолдар саны:
 NbOfLinesImported=Сәтті импортталған жолдар саны: <b> %s </b>.
 DataComeFromNoWhere=Кірістіру мәні бастапқы файлдың ешқайсысынан болмайды.
 DataComeFromFileFieldNb=Енгізілетін мән бастапқы файлдағы <b>%s</b> бағанынан алынады.
-DataComeFromIdFoundFromRef=Бастапқы файлдан келетін мән пайдаланылатын негізгі нысанның идентификаторын табу үшін пайдаланылады (сондықтан <b>%s</span нысаны ><span class='notranslate'></b> бастапқы файлдан алынған сілтеме дерекқорда болуы керек).
-DataComeFromIdFoundFromCodeId=Бастапқы файлдан келетін кодтың мәні пайдаланылатын негізгі нысанның идентификаторын табу үшін пайдаланылады (сондықтан бастапқы файлдағы код <b><span сынып сөздігінде болуы керек. ='notranslate'>%s</span></b>). Идентификаторды білсеңіз, оны кодтың орнына бастапқы файлда да пайдалануға болатынын ескеріңіз. Импорт екі жағдайда да жұмыс істеуі керек.
+DataComeFromIdFoundFromRef=The value that comes from the 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=The value of code that comes from 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=Бастапқы файлдан алынған деректер келесі өріске енгізіледі:
 DataIDSourceIsInsertedInto=Бастапқы файлдағы деректерді пайдалану арқылы табылған негізгі нысанның идентификаторы келесі өріске кірістіріледі:
 DataCodeIDSourceIsInsertedInto=Кодтан табылған ата-аналық жолдың идентификаторы келесі өріске енгізіледі:
diff --git a/htdocs/langs/kk_KZ/hrm.lang b/htdocs/langs/kk_KZ/hrm.lang
index 9535a3f93d2..efde73ae05b 100644
--- a/htdocs/langs/kk_KZ/hrm.lang
+++ b/htdocs/langs/kk_KZ/hrm.lang
@@ -45,7 +45,7 @@ Eval=Бағалау
 Evals=Бағалар
 NewEval=Жаңа бағалау
 ValidateEvaluation=Бағалауды растау
-ConfirmValidateEvaluation=Бұл бағалауды <b>%s<span class='notranslate'>b09a4b739f17f80z сілтемесі арқылы растағыңыз келетініне сенімдісіз бе >?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Бағалау картасы
 RequiredRank=Жұмыс профилі үшін қажетті дәреже
 RequiredRankShort=Міндетті дәреже
diff --git a/htdocs/langs/kk_KZ/install.lang b/htdocs/langs/kk_KZ/install.lang
index 5d4dc90349c..160493e8197 100644
--- a/htdocs/langs/kk_KZ/install.lang
+++ b/htdocs/langs/kk_KZ/install.lang
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=Мүмкін сіздің PHP орнату POST және/н
 PHPSupportSessions=Бұл PHP сеанстарды қолдайды.
 PHPSupport=Бұл PHP %s функцияларын қолдайды.
 PHPMemoryOK=PHP максималды сеанс жады <b> %s </b> күйіне орнатылған. Бұл жеткілікті болуы керек.
-PHPMemoryTooLow=Сіздің PHP сеансының максималды жады <b>%s</b> байт етіп орнатылған. Бұл тым төмен. <b>php.ini</b> параметрін <b></spany<span>сыныбын орнату үшін өзгертіңіз. ='notranslate'></b> параметрін кем дегенде <b>%s<span class='notranslate'>b09a18f<span> /span> байт.
+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=Толығырақ тест алу үшін мына жерді басыңыз
 ErrorPHPDoesNotSupportSessions=PHP орнату сеанстарды қолдамайды. Бұл функция Dolibarr жұмыс істеуі үшін қажет. PHP параметрлерін және сеанс каталогының рұқсаттарын тексеріңіз.
 ErrorPHPDoesNotSupport=Сіздің PHP қондырғыңыз %s функцияларын қолдамайды.
@@ -108,7 +108,7 @@ DatabaseVersion=Мәліметтер қорының нұсқасы
 ServerVersion=Мәліметтер қоры серверінің нұсқасы
 YouMustCreateItAndAllowServerToWrite=Сіз бұл каталогты құрып, оған веб -сервердің жазуына рұқсат беруіңіз керек.
 DBSortingCollation=Таңбаларды сұрыптау тәртібі
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Сіз дерекқор жасауды таңдадыңыз <b>%s</b>, бірақ бұл үшін Dolibar қажет <b>%s</b> серверіне супер пайдаланушы <span class= қосылу үшін 'notranslate'><b></span>%s</b> рұқсаттары.
+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=Дерекқор пайдаланушысы <b> %s </b> жасау таңдалған, бірақ бұл үшін, Dolibarr супер пайдаланушы <b> %s </b> рұқсаттарымен серверге <b> %s </b> қосылу үшін қажет.
 BecauseConnectionFailedParametersMayBeWrong=Дерекқорға қосылу сәтсіз аяқталды: хост немесе супер пайдаланушы параметрлері қате болуы керек.
 OrphelinsPaymentsDetectedByMethod=Жетім балалардың төлемі %s әдісімен анықталды
diff --git a/htdocs/langs/kk_KZ/mails.lang b/htdocs/langs/kk_KZ/mails.lang
index 3601bb2fad8..6901e48dd14 100644
--- a/htdocs/langs/kk_KZ/mails.lang
+++ b/htdocs/langs/kk_KZ/mails.lang
@@ -139,7 +139,7 @@ AddNewNotification=Жаңа автоматты электрондық хабар
 ListOfActiveNotifications=Электрондық поштаға автоматты түрде хабарландыру үшін барлық белсенді жазылымдардың (мақсатты/оқиғалардың) тізімі
 ListOfNotificationsDone=Барлық автоматты электрондық пошта хабарландыруларының тізімі
 MailSendSetupIs=Электрондық поштаны жіберу конфигурациясы '%s' күйіне орнатылды. Бұл режим жаппай электрондық поштаны жіберу үшін қолданылмайды.
-MailSendSetupIs2=<span class= параметрін өзгерту үшін алдымен әкімші тіркелгісімен %sБасты бет - Орнату - Электрондық пошталар%s мәзіріне өту керек. 'notranslate'><strong></span>'%s'</strong> '<spante class=07fb' режимін пайдалану үшін </span>'. Бұл режим арқылы Интернет провайдері ұсынатын SMTP серверін орнатуға және жаппай электрондық пошта жіберу мүмкіндігін пайдалануға болады.
+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=Егер SMTP серверін орнату туралы сұрақтарыңыз болса, %s сұрай аласыз.
 YouCanAlsoUseSupervisorKeyword=Пайдаланушы бақылаушысына электрондық поштаны жіберу үшін <strong> __SUPERVISOREMAIL__ </strong> кілт сөзін қосуға болады (тек осы супервайзер үшін электрондық пошта анықталған жағдайда ғана жұмыс істейді)
 NbOfTargetedContacts=Мақсатты байланыс хаттарының қазіргі саны
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=Импортталған файлда <strong> эле
 UseFormatInputEmailToTarget=<strong> электрондық поштасы бар жолды енгізіңіз; аты; аты; басқа </strong>
 MailAdvTargetRecipients=Алушылар (кеңейтілген таңдау)
 AdvTgtTitle=Үшінші тараптарды немесе мақсатты контактілерді/мекенжайларды алдын ала таңдау үшін енгізу өрістерін толтырыңыз
-AdvTgtSearchTextHelp=Қойылмалы таңбалар ретінде %% пайдаланыңыз. Мысалы, <b>jean, joe, jim</b> сияқты барлық элементтерді табу үшін  енгізуге болады. <b>j%%</b>, сіз де пайдалана аласыз ; мән үшін бөлгіш ретінде және пайдаланыңыз! осы мәннен басқасы үшін. Мысалы, <b>jean;joe;jim%%;!jimo;!jimab07e631701f span><span class='notranslate'></b> барлық Джин, Джоға бағытталған, Джиммен басталады, бірақ Джимо емес, Джимамен басталатын барлық нәрселер емес
+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=Int немесе float мәнін таңдау үшін интервалды пайдаланыңыз
 AdvTgtMinVal=Ең төменгі мән
 AdvTgtMaxVal=Максималды мән
@@ -182,7 +182,7 @@ IsAnAnswer=Бұл бастапқы электрондық поштаға жау
 RecordCreatedByEmailCollector=%s электрондық пошта жинаушысы %s электрондық поштасынан жасаған жазба
 DefaultBlacklistMailingStatus=Жаңа контакт жасау кезінде '%s' өрісінің әдепкі мәні
 DefaultStatusEmptyMandatory=Бос, бірақ міндетті
-WarningLimitSendByDay=ЕСКЕРТУ: дананы орнату немесе келісім-шарт күніне <b>%s<span class='notranslate' электрондық хабарлар санын шектейді. ></b></span>. Көбірек жіберу әрекеті дананың баяулауына немесе уақытша тоқтатылуына әкелуі мүмкін. Сізге жоғары квота қажет болса, қолдау қызметіне хабарласыңыз.
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=Электрондық поштаны жіберетін алушы жоқ
 EmailOptedOut=Электрондық пошта иесі оған енді осы электрондық пошта арқылы хабарласпауды сұрады
 EvenUnsubscribe=Бас тарту электрондық пошталарын қосыңыз
diff --git a/htdocs/langs/kk_KZ/modulebuilder.lang b/htdocs/langs/kk_KZ/modulebuilder.lang
index 998c5826f3c..97a0a052ef4 100644
--- a/htdocs/langs/kk_KZ/modulebuilder.lang
+++ b/htdocs/langs/kk_KZ/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=Мысалдарды мына жерден қараңыз
 EnabledDesc=Бұл өрістің белсенді болуы шарты.<br><br>Мысалдар:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Өріс көрінеді ме? (Мысалдар: 0=Ешқашан көрінбейді, 1=Тізімде көрінеді және пішіндерді жасау/жаңарту/қарау, 2=Тек тізімде көрінеді, 3=Тек пішінді жасау/жаңарту/қарау кезінде көрінеді (тізімде емес), 4=Тізімде көрінеді және тек пішінді жаңарту/қарау (жасау емес), 5=Тізімде көрінеді және пішінді ғана қарау (жасау емес, жаңарту емес).<br><br> Теріс мәнді пайдалану өрістің тізімде әдепкі бойынша көрсетілмейтінін, бірақ оны көру үшін таңдауға болатынын білдіреді).
 ItCanBeAnExpression=Бұл өрнек болуы мүмкін. Мысал:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Бұл өрісті үйлесімді PDF құжаттарында көрсетіңіз, орынды "Орын" өрісімен басқара аласыз.<br><strong>Құжат үшін:</strong><br>0 = көрсетілмейді <br>1 = display<spante class='translate ><br></span>2 = бос болмаса ғана көрсету<br><br>b09bz80 span>Құжат жолдары үшін :<span class='notranslate'></strong><br>0 = көрсетілмейді <br> = бағанда көрсетіледі<br>3 = сипаттамадан кейін жол сипаттамасы бағанында көрсетіледі<br>4 = сипаттамадан кейін сипаттама бағанында көрсетіледі бос болмаса ғана
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=Тізімге жиынтық алу үшін өрістің мәні жинақталуы мүмкін бе? (Мысалдар: 1 немесе 0)
 SearchAllDesc=Өріс жылдам іздеу құралынан іздеу үшін пайдаланылады ма? (Мысалдар: 1 немесе 0)
@@ -148,7 +148,7 @@ CSSListClass=Тізімге арналған CSS
 NotEditable=Өңдеуге болмайды
 ForeignKey=Сыртқы кілт
 ForeignKeyDesc=Егер бұл өрістің мәні басқа кестеде бар екеніне кепілдік беру керек болса. Мұнда мәнге сәйкес келетін синтаксисті енгізіңіз: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Мысал:<br>varchar(99)<br>электрондық пошта<br>телефон ='notranslate'><br></span>ip<br>url<br>құпия сөз<span class='notranslate319b>b span>double(24,8)<br>нақты<br>мәтін<br> <span class='notranslate'><br>күн<br>datetime<br>уақыт белгісі<spante class='no <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]cc039<span /span><span class='notranslate'><br>'1' жазба жасау үшін комбодан кейін + түймесін қосамыз дегенді білдіреді<br>'сүзгі' Әмбебап сүзгі синтаксисі шарты, мысал: '((күйі:=:1) ЖӘНЕ (fk_user:=:__USER_ID__) ЖӘНЕ (нысан:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Бұл өрістің/атрибуттың түрі.
 AsciiToHtmlConverter=Ascii - HTML түрлендіргіші
 AsciiToPdfConverter=Ascii - PDF түрлендіргіші
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Дескрипторға код қосылмады
 DictionariesCreated=<b>%s</b> сөздігі сәтті жасалды.
 DictionaryDeleted=<b>%s</b> сөздігі жойылды
 PropertyModuleUpdated=<b>%s</b> сипаты сәтті жаңартылды
-InfoForApiFile=* Файлды бірінші рет жасағанда, әрбір нысан үшін барлық әдістер <strong>құрылады.</strong><br>* <strong>жоюды басқанда</strong> <span> сыныптың барлық әдістерін ғана алып тастайсыз. ='notranslate'><strong></span>таңдалған нысан</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Модульді орнату беті
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Жаппай электрондық пошта жіберу модулі үшін жаңа электрондық пошта мақсатты таңдаушыларын қамтамасыз ету үшін осы жерде сынып файлдарын жасауға және өңдеуге болады
diff --git a/htdocs/langs/kk_KZ/multicurrency.lang b/htdocs/langs/kk_KZ/multicurrency.lang
index cfe180be814..2a4c0ab24fe 100644
--- a/htdocs/langs/kk_KZ/multicurrency.lang
+++ b/htdocs/langs/kk_KZ/multicurrency.lang
@@ -25,7 +25,7 @@ CreateRate=Тариф құру
 FormCreateRate=Бағаны құру
 FormUpdateRate=Бағаны өзгерту
 successRateCreate=Дерекқорға %s валютасының бағамы қосылды
-ConfirmDeleteLineRate=%s</span сайтындағы <span class='notranslate'>%s валютасының %s бағамын шынымен алып тастағыңыз келе ме? > күні?
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
 DeleteLineRate=Таза тариф
 successRateDelete=Бағасы жойылды
 errorRateDelete=Тарифті жою кезінде қате пайда болды
diff --git a/htdocs/langs/kk_KZ/oauth.lang b/htdocs/langs/kk_KZ/oauth.lang
index 154786e9a8b..e296715be88 100644
--- a/htdocs/langs/kk_KZ/oauth.lang
+++ b/htdocs/langs/kk_KZ/oauth.lang
@@ -29,7 +29,7 @@ OAUTH_GOOGLE_SECRET=OAuth Google құпиясы
 OAUTH_GITHUB_NAME=OAuth GitHub қызметі
 OAUTH_GITHUB_ID=OAuth GitHub идентификаторы
 OAUTH_GITHUB_SECRET=OAuth GitHub құпиясы
-OAUTH_URL_FOR_CREDENTIAL=<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">осы бетке өтіңіз<span class="fas fa-external-link-alt paddingleft"></span><span><spante class='notranslate OAuth идентификаторын және құпиясын жасау немесе алу үшін ></a></span>
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=OAuth жолақ сынағы
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe тікелей эфирі
 OAUTH_ID=OAuth клиент идентификаторы
diff --git a/htdocs/langs/kk_KZ/partnership.lang b/htdocs/langs/kk_KZ/partnership.lang
index c6621fcaa3b..352682fb430 100644
--- a/htdocs/langs/kk_KZ/partnership.lang
+++ b/htdocs/langs/kk_KZ/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=URL -ді соңғы тексеруге қателер с
 LastCheckBacklink=URL мекенжайын соңғы тексеру күні
 
 NewPartnershipRequest=Жаңа серіктестік сұрауы
-NewPartnershipRequestDesc=Бұл пішін серіктестік бағдарламамыздың бір бөлігі болуды сұрауға мүмкіндік береді. Бұл пішінді толтыру үшін көмек қажет болса, электрондық пошта арқылы хабарласыңыз <b>%s<span class='notranslate'></b> аралығы>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Бұл бетте келесі домендердің біріне кемінде бір сілтеме болуы керек: %s
 
 IPOfApplicant=Өтініш берушінің IP
-
diff --git a/htdocs/langs/kk_KZ/paypal.lang b/htdocs/langs/kk_KZ/paypal.lang
index e10ad781a3e..736280eaedc 100644
--- a/htdocs/langs/kk_KZ/paypal.lang
+++ b/htdocs/langs/kk_KZ/paypal.lang
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=Барлық Post әрекеттері бой
 ValidationOfPaymentFailed=Төлем расталмады
 CardOwner=Карточка ұстаушы
 PayPalBalance=Paypal несиесі
-OnlineSubscriptionPaymentLine=%s<br>жазылымында жазылған онлайн жазылым %s<span class=' арқылы төленді. notranslate'><br></span>Бастапқы IP мекенжайы: %s<br>Транзакция идентификаторы: <spanteec29bz4fb </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/kk_KZ/receptions.lang b/htdocs/langs/kk_KZ/receptions.lang
index 0c226769b67..26be602d9ce 100644
--- a/htdocs/langs/kk_KZ/receptions.lang
+++ b/htdocs/langs/kk_KZ/receptions.lang
@@ -32,7 +32,7 @@ StatusReceptionProcessedShort=Өңделді
 ReceptionSheet=Қабылдау парағы
 ValidateReception=Қабылдауды растау
 ConfirmDeleteReception=Бұл қабылдауды шынымен жойғыңыз келе ме?
-ConfirmValidateReception=Бұл қабылдауды <b>%s<span class='notranslate'></b></span сілтеме арқылы растағыңыз келетініне сенімдісіз бе >?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Бұл қабылдаудан бас тартқыңыз келетініне сенімдісіз бе?
 StatsOnReceptionsOnlyValidated=Тек расталған қабылдаулар бойынша жүргізілген статистика. Қолданылған күн - қабылдауды растау күні (жоспарланған жеткізу күні әрқашан белгілі емес).
 SendReceptionByEMail=Қабылдауды электрондық пошта арқылы жіберіңіз
diff --git a/htdocs/langs/kk_KZ/sendings.lang b/htdocs/langs/kk_KZ/sendings.lang
index 89bae344240..e26e7f36fb1 100644
--- a/htdocs/langs/kk_KZ/sendings.lang
+++ b/htdocs/langs/kk_KZ/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Тексерілді
 StatusSendingProcessedShort=Өңделді
 SendingSheet=Жеткізу парағы
 ConfirmDeleteSending=Бұл жүкті шынымен жойғыңыз келе ме?
-ConfirmValidateSending=Бұл жөнелтімді <b>%s<span class='notranslate'></b> сілтемесімен растағыңыз келетініне сенімдісіз бе >?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Бұл жөнелтуден бас тартқыңыз келетініне сенімдісіз бе?
 DocumentModelMerou=Merou A5 моделі
 WarningNoQtyLeftToSend=Ескерту, жөнелтуді күтетін өнімдер жоқ.
diff --git a/htdocs/langs/kk_KZ/stocks.lang b/htdocs/langs/kk_KZ/stocks.lang
index fde782d0dc3..081816ae7ec 100644
--- a/htdocs/langs/kk_KZ/stocks.lang
+++ b/htdocs/langs/kk_KZ/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Жетілдірілген қорды тасымалда
 ModuleStockTransferDesc=Тасымалдау парағын генерациялай отырып, Stock Transfer қызметін кеңейтілген басқару
 StockTransferNew=Жаңа акцияларды аудару
 StockTransferList=Акциялар тізімі
-ConfirmValidateStockTransfer=Осы акциялардың аударымын <b>%s<span class='notranslate'></b> сілтемесі арқылы растағыңыз келетініне сенімдісіз бе span> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=%s аударымымен қорлардың азаюы
 ConfirmDestockCancel=%s тасымалдау арқылы акциялардың азаюын болдырмау
 DestockAllProduct=Қорлардың азаюы
diff --git a/htdocs/langs/kk_KZ/trips.lang b/htdocs/langs/kk_KZ/trips.lang
index 6d726eb26f5..de3e90f11f8 100644
--- a/htdocs/langs/kk_KZ/trips.lang
+++ b/htdocs/langs/kk_KZ/trips.lang
@@ -47,7 +47,7 @@ ExpenseReportApplyTo=Қолдану
 ExpenseReportApproved=Шығындар есебі бекітілді
 ExpenseReportApprovedMessage=%s шығыс есебі мақұлданды. <br> - Пайдаланушы: %s <br> - Мақұлдаған: %s <br> Шығындар есебін көрсету үшін мына жерді басыңыз: %s
 ExpenseReportCanceled=Шығындар туралы есеп жойылды
-ExpenseReportCanceledMessage=%s шығыс есебінен бас тартылды.<br> - Пайдаланушы: %s<br> - Болдырмады: %s<br> - Бас тарту себебі: <span сынып= 'notranslate'>%s</span><br>Шығындар есебін көрсету үшін осы жерді басыңыз: %s
+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
 ExpenseReportConstraintViolationError=Максималды сомадан асып кетті (%s ережесі): %s %s мәнінен жоғары ( Артық тыйым салынған)
 ExpenseReportConstraintViolationWarning=Максималды сомадан асып кетті (%s ережесі): %s %s мәнінен жоғары ( Рұқсат етілгеннен асып кету)
 ExpenseReportDateEnd=Аяқталу күні
diff --git a/htdocs/langs/kk_KZ/website.lang b/htdocs/langs/kk_KZ/website.lang
index 566cbfed362..920506aa8dc 100644
--- a/htdocs/langs/kk_KZ/website.lang
+++ b/htdocs/langs/kk_KZ/website.lang
@@ -49,11 +49,11 @@ SetHereVirtualHost=<u>Apache/NGinx/...</u><br> қосулыreate қолданб
 ExampleToUseInApacheVirtualHostConfig=Apache виртуалды хостын орнатуда қолданылатын мысал:
 YouCanAlsoTestWithPHPS=<u>PHP ендірілген серверімен пайдалану</u><br>Ортаның дамуы мүмкін. сайтты PHP ендірілген веб-серверімен (PHP 5.5 қажет)<br><strong>php -S 0.0.0.0 іске қосу арқылы сынауды қалайды :8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Веб-сайтыңызды басқа Dolibarr хостинг провайдерімен іске қосыңыз</u><br>If Интернетте қол жетімді Apache немесе NGinx сияқты веб-сервер болмаса, веб-сайт модулімен толық интеграцияны қамтамасыз ететін басқа Dolibarr хостинг провайдері ұсынатын басқа Dolibarr данасына веб-сайтыңызды экспорттауға және импорттауға болады. Кейбір Dolibarr хостинг провайдерлерінің тізімін <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a> сайтынан таба аласыз.
-CheckVirtualHostPerms=Сондай-ақ виртуалды хост пайдаланушысында (мысалы, www-data) <strong>%sb0a65d071f6fc90 бар екенін тексеріңіз.  файлдарға<br><strong>%s<span класына рұқсаттар ='notranslate'></strong></span>
+CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
 ReadPerm=Оқыңыз
 WritePerm=Жазу
 TestDeployOnWeb=Вебте тестілеу/орналастыру
-PreviewSiteServedByWebServer=<u> %s жаңа қойындыда алдын ала қарау.</u><br><br>%s сыртқы веб-сервермен (мысалы, Apache, Nginx) қызмет көрсетеді. ). Каталогты көрсетпес бұрын осы серверді орнатып, орнатуыңыз керек:<br><strong>%s span><span class='notranslate'></strong><br>URL сыртқы сервер арқылы қызмет етеді:<br><span сынып ='notranslate'><strong></span>%s</strong>
+PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr= <u> %s жаңа қойындыда алдын ала қарау. </u> <br> <br> %s Dolibarr серверінде қызмет етеді, сондықтан оған қосымша веб -сервер қажет емес (Apache, Nginx, IIS). <br> Қолайсыз нәрсе - беттердің URL мекенжайлары қолданушыларға ыңғайлы емес және сіздің Dolibarr жолынан басталады. URL мекенжайына <br> Dolibarr қызмет: <br> <strong> %s </strong> <br> <br> каталогына <br> <strong> %s </strong> <br> бойынша балл, содан кейін осы виртуалды сервер атауын енгізіңіз, бұл сіздің веб-серверде виртуалды хост жасау, осы веб-сайтты қызмет үшін өз сыртқы веб-серверін пайдалану үшін осы веб -сайттың қасиеттерінде «Сынақ/Интернетте орналастыру» сілтемесін нұқыңыз.
 VirtualHostUrlNotDefined=Сыртқы веб -сервер қызмет ететін виртуалды хосттың URL мекенжайы анықталмаған
 NoPageYet=Әлі беттер жоқ
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=Редактордағы «Дереккөз» ба
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Бөлісу сілтемесімен бөлісілген кескін үшін (файлдың ортақ хэш кілтін қолдана отырып, ашық қатынас), синтаксис: <br> <strong> &lt;img src = «/viewimage.php? Hashp = 12345679012z00f01f01f0f1f0f4f0f0f0f0f0f09f0f0f0f09b029»
-YouCanEditHtmlSource3=PHP нысаны кескінінің URL мекенжайын алу үшін<br><strong>&lt; пайдаланыңыз. span>img src="<span class='notranslate'>&lt;?php басып шығару getImagePublicURLOfObject($object, 1, "_small") ?b0012c7dcbe0870</span"><span> class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>HTML немесе динамикалық кодтың қосымша мысалдары <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki құжаттамасындаb0e40dc6508d</span7d >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Бетті/контейнерді клондау
 CloneSite=Сайтты клондау
 SiteAdded=Веб -сайт қосылды
diff --git a/htdocs/langs/kk_KZ/withdrawals.lang b/htdocs/langs/kk_KZ/withdrawals.lang
index 3b76bfe1774..cd117d018ae 100644
--- a/htdocs/langs/kk_KZ/withdrawals.lang
+++ b/htdocs/langs/kk_KZ/withdrawals.lang
@@ -47,7 +47,7 @@ MakeBankTransferOrder=Несие аудару туралы өтініш жаса
 WithdrawRequestsDone=%s тікелей дебет бойынша төлем сұраулары жазылды
 BankTransferRequestsDone=%s несие аудару сұраныстары жазылды
 ThirdPartyBankCode=Үшінші тараптың банк коды
-NoInvoiceCouldBeWithdrawed=Ешбір шот-фактура сәтті өңделмеді. Шот-фактуралардың жарамды IBAN нөмірі бар компанияларда екенін және IBAN-да <strong>%s< режимі бар UMR (бірегей мандат анықтамасы) бар екенін тексеріңіз. span class='notranslate'></strong></span>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
 NoInvoiceCouldBeWithdrawedSupplier=Ешбір шот-фактура сәтті өңделмеді. Шот-фактуралардың жарамды IBAN нөмірі бар компанияларда екенін тексеріңіз.
 NoSalariesCouldBeWithdrawed=Ешбір жалақы сәтті өңделмеді. Жарамды IBAN бар пайдаланушылардың жалақысы екенін тексеріңіз.
 WithdrawalCantBeCreditedTwice=Бұл шығыс түбіртегі есептелген деп белгіленді; бұл екі рет жасалуы мүмкін емес, себебі бұл қайталанатын төлемдер мен банктік жазбаларды тудыруы мүмкін.
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Несие аудару арқылы төлеуді күт
 RefSalary=Жалақы
 NoSalaryInvoiceToWithdraw='%s' күтетін жалақы жоқ. Сұрау жасау үшін жалақы картасындағы '%s' қойындысына өтіңіз.
 SalaryInvoiceWaitingWithdraw=Несие аудару арқылы төлеуді күткен жалақы
-
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 2a49728e55c..cb29adfbf0c 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total (inc. tax)
 TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total tax
@@ -647,6 +649,7 @@ ReportName=Report name
 ReportPeriod=Report period
 ReportDescription=Description
 Report=Report
+Reports=Reports
 Keyword=Keyword
 Origin=Origin
 Legend=Legend
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index f4c7e771513..3e85c215d49 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=합계 (세금 포함)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=이 페이지의 합계
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=합계 (세금 포함)
 TotalTTCToYourCredit=신용합계 (세금 포함)
 TotalVAT=총 세금
@@ -647,6 +649,7 @@ ReportName=보고서 이름
 ReportPeriod=보고서 기간
 ReportDescription=설명
 Report=보고서
+Reports=Reports
 Keyword=키워드
 Origin=원산지
 Legend=전설
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 6236441b00a..47a32e97a8a 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -352,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=ປິດໃຊ້ງານການຜູ
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ປິດໃຊ້ງານການຜູກມັດແລະການໂອນບັນຊີຢູ່ໃນການຊື້ (ໃບເກັບເງິນຂອງຜູ້ຂາຍຈະບໍ່ຖືກເອົາເຂົ້າໃນບັນຊີ)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ປິດໃຊ້ງານການຜູກມັດແລະການໂອນບັນຊີຢູ່ໃນລາຍງານລາຍຈ່າຍ (ບົດລາຍງານຄ່າໃຊ້ຈ່າຍຈະບໍ່ຖືກເອົາເຂົ້າໃນບັນຊີ)
 ACCOUNTING_ENABLE_LETTERING=ເປີດໃຊ້ຟັງຊັນຕົວອັກສອນໃນການບັນຊີ
-ACCOUNTING_ENABLE_LETTERING_DESC=ເມື່ອຕົວເລືອກນີ້ຖືກເປີດໃຊ້, ທ່ານສາມາດກໍານົດ, ໃນແຕ່ລະບັນຊີລາຍການ, ລະຫັດເພື່ອໃຫ້ທ່ານສາມາດຈັດກຸ່ມການເຄື່ອນໄຫວບັນຊີທີ່ແຕກຕ່າງກັນຮ່ວມກັນ. ໃນອະດີດ, ເມື່ອວາລະສານຕ່າງໆຖືກຄຸ້ມຄອງຢ່າງເປັນເອກະລາດ, ຄຸນສົມບັດນີ້ແມ່ນຈໍາເປັນເພື່ອຈັດກຸ່ມສາຍການເຄື່ອນໄຫວຂອງວາລະສານຕ່າງໆຮ່ວມກັນ. ຢ່າງໃດກໍຕາມ, ດ້ວຍບັນຊີ Dolibarr, ລະຫັດຕິດຕາມດັ່ງກ່າວ, ເອີ້ນວ່າ "<b>%s<span class='notranslate'>b09a4b739f17f80 span>" ຖືກບັນທຶກໂດຍອັດຕະໂນມັດແລ້ວ, ສະນັ້ນການພິມຕົວອັກສອນອັດຕະໂນມັດແມ່ນເຮັດແລ້ວ, ບໍ່ມີຄວາມສ່ຽງຕໍ່ຄວາມຜິດພາດ, ດັ່ງນັ້ນຄຸນສົມບັດນີ້ຈຶ່ງບໍ່ມີປະໂຫຍດຕໍ່ການນໍາໃຊ້ທົ່ວໄປ. ຄຸນນະສົມບັດຕົວອັກສອນຄູ່ມືແມ່ນສະຫນອງໃຫ້ສໍາລັບຜູ້ໃຊ້ສຸດທ້າຍທີ່ບໍ່ໄວ້ວາງໃຈເຄື່ອງຈັກຄອມພິວເຕີເຮັດໃຫ້ການໂອນຂໍ້ມູນໃນບັນຊີ.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=ການເປີດໃຊ້ຄຸນສົມບັດນີ້ບໍ່ຈໍາເປັນສໍາລັບການຄຸ້ມຄອງບັນຊີທີ່ເຂັ້ມງວດ.
 ACCOUNTING_ENABLE_AUTOLETTERING=ເປີດໃຊ້ຕົວອັກສອນອັດຕະໂນມັດເມື່ອໂອນເຂົ້າບັນຊີ
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=ລະ​ຫັດ​ສໍາ​ລັບ​ຕົວ​ອັກ​ສອນ​ໄດ້​ຖືກ​ສ້າງ​ຂຶ້ນ​ອັດ​ຕະ​ໂນ​ມັດ​ແລະ​ເພີ່ມ​ຂຶ້ນ​ແລະ​ບໍ່​ໄດ້​ຮັບ​ຄັດ​ເລືອກ​ໂດຍ​ຜູ້​ໃຊ້​ສຸດ​ທ້າຍ​
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 1418e0e6b28..c70618a84ce 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -268,7 +268,7 @@ OtherResources=ຊັບພະຍາກອນອື່ນ
 ExternalResources=ຊັບພະຍາກອນພາຍນອກ
 SocialNetworks=ເຄືອຂ່າຍສັງຄົມ
 SocialNetworkId=ID ເຄືອຂ່າຍສັງຄົມ
-ForDocumentationSeeWiki=ສໍາລັບເອກະສານຜູ້ໃຊ້ ຫຼືຜູ້ພັດທະນາ (Doc, FAQs...),<br>ເບິ່ງທີ່ Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dc807 <span class='notranslate'></b>
+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=ສຳລັບຄຳຖາມ/ຄວາມຊ່ວຍເຫຼືອອື່ນໆ, ທ່ານສາມາດໃຊ້ກະດານສົນທະນາ Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=ນີ້ແມ່ນແຫຼ່ງຂໍ້ມູນ ຈຳ ນວນ ໜຶ່ງ ເພື່ອໃຫ້ໄດ້ຮັບການຊ່ວຍເຫຼືອແລະການສະ ໜັບ ສະ ໜູນ ກັບ Dolibarr.
 HelpCenterDesc2=ບາງແຫຼ່ງຂໍ້ມູນເຫຼົ່ານີ້ມີຢູ່ໃນ <b> english </b> ເທົ່ານັ້ນ.
@@ -368,7 +368,7 @@ GenericMaskCodes3EAN=ຕົວອັກສອນອື່ນ All ທັງinົ
 GenericMaskCodes4a=<u>ຕົວຢ່າງຂອງວັນທີ 99 %s ຂອງພາກສ່ວນທີສາມ TheCompany, ກັບວັນທີ 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>ຕົວຢ່າງຂອງພາກສ່ວນທີສາມສ້າງເມື່ອ 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>ຕົວຢ່າງຂອງຜະລິດຕະພັນທີ່ສ້າງຂຶ້ນໃນວັນທີ 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ຈະໃຫ້ b0aee83365837fz span>ABC2301-000099<span class='notranslate'></b><br><b>01/span> }-ZZZ/{dd}/XXX<span class='notranslate'></b> ຈະໃຫ້ <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> ຈະໃຫ້ <b>IN2301-0099-A</b> is 'Responsable Inscripto' ທີ່ມີລະຫັດສໍາລັບປະເພດທີ່ເປັນ 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=ຕອບຕົວເລກທີ່ປັບແຕ່ງໄດ້ຕາມ ໜ້າ ກາກທີ່ ກຳ ນົດໄວ້.
 ServerAvailableOnIPOrPort=ເຊີບເວີມີຢູ່ທີ່ທີ່ຢູ່ <b> %s </b> ຢູ່ທີ່ Port <b> %s </b>
 ServerNotAvailableOnIPOrPort=ເຊີບເວີບໍ່ສາມາດໃຊ້ໄດ້ຢູ່ທີ່ຢູ່ <b> %s </b> ຢູ່ທີ່ Port <b> %s </b>
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=ການປະຊ່ອງນີ້ຫວ່າງ
 ExtrafieldParamHelpselect=ບັນຊີລາຍຊື່ຂອງຄ່າຕ້ອງການສາຍທີ່ມີທີ່ສໍາຄັນຮູບແບບ, ມູນຄ່າ (ທີ່ສໍາຄັນບໍ່ສາມາດຈະ '0') <br> <br> ສໍາລັບຕົວຢ່າງເຊັ່ນ: <br> 1, value1 <br> 2, value2 <br> ທຸລະການ 3, 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> 2, value2 <br> 3, value3 a0cc2 ...
 ExtrafieldParamHelpradio=ລາຍການຄ່າຕ້ອງເປັນແຖວທີ່ມີລະຫັດຮູບແບບ, ຄ່າ (ບ່ອນທີ່ກະແຈບໍ່ສາມາດເປັນ '0') <br> <br> ຕົວຢ່າງ: <br> 1, value1 <br> 2, value2 <br> 3, value3 a0cc2 ...
-ExtrafieldParamHelpsellist=ລາຍຊື່ຂອງຄ່າມາຈາກຕາຕະລາງ<br>Syntax: table_name:label_field:id_field::filtersql<br>ຕົວຢ່າງ: c_typent:libelle ::filtersql<br><br>- id_field ຈຳເປັນເປັນກະແຈຫຼັກ int b0342fccfdab0342fccfda19 - filtersql ແມ່ນເງື່ອນໄຂ SQL. ມັນສາມາດເປັນການທົດສອບງ່າຍໆ (ເຊັ່ນ: active=1) ເພື່ອສະແດງຄ່າທີ່ໃຊ້ໄດ້ເທົ່ານັ້ນ<br>ນອກນັ້ນທ່ານຍັງສາມາດໃຊ້ $ID$ ໃນຕົວກອງທີ່ເປັນ id ປະຈຸບັນຂອງວັດຖຸປັດຈຸບັນ <span class. ='notranslate'><br></span>ເພື່ອໃຊ້ SELECT ເຂົ້າໄປໃນຕົວກອງ ໃຫ້ໃຊ້ຄໍາສໍາຄັນ $SEL$ ເພື່ອຂ້າມການປ້ອງກັນການສີດຢາ.<br>ຖ້າທ່ານຕ້ອງການການກັ່ນຕອງໃນ extrafields ໃຊ້ syntax extra.fieldcode=... (ບ່ອນທີ່ລະຫັດພາກສະຫນາມແມ່ນລະຫັດຂອງ extrafield)<br><br>ເພື່ອໃຫ້ມີ ລາຍຊື່ຂຶ້ນກັບລາຍຊື່ຄຸນສົມບັດເພີ່ມເຕີມອື່ນ:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>ເພື່ອໃຫ້ມີລາຍຊື່ຂຶ້ນກັບລາຍຊື່ອື່ນ:<br>c_typent:libelle:id:<i>parent_list_code</i>
+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 necessarily 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=ບັນຊີລາຍຊື່ຂອງຄ່າແມ່ນມາຈາກຕາຕະລາງ <br> Syntax: table_name: label_field: id_field :: filtersql <br> ຕົວຢ່າງ: c_typent: libelle: id :: filtersql <br> <br> ຕົວຢ່າງສາມາດເປັນຕົວທົດສອບຕົວຈິງໄດ້ (ຕົວຢ່າງເທົ່ານັ້ນ) active0 (ຕົວຢ່າງເທົ່ານັ້ນ) ຈະໃຊ້ໄດ້ເທົ່ານັ້ນ ຍັງສາມາດໃຊ້ $ ID $ ໃນຕົວກັ່ນຕອງແມ່ມົດເປັນ id ປະຈຸບັນຂອງວັດຖຸປັດຈຸບັນ <br> ເພື່ອເຮັດການຄັດເລືອກໃນຕົວກອງໃຫ້ໃຊ້ $ SEL $ <br> ຖ້າເຈົ້າຕ້ອງການກັ່ນຕອງຢູ່ໃນເຂດນອກໃຫ້ໃຊ້ໄວຍາກອນ extra.fieldcode = ... (ບ່ອນທີ່ລະຫັດພາກສະ ໜາມ ແມ່ນ ລະຫັດຂອງ extrafield) <br> <br> ເພື່ອທີ່ຈະມີບັນຊີລາຍການໂດຍອີງຕາມບັນຊີລາຍຊື່ຄຸນລັກສະນະຄົນອື່ນແລ້ວ: <br> c_typent: libel: id: options_ <i> parent_list_code </i> | parent_column: ການກັ່ນຕອງ <br> <br> ເພື່ອທີ່ຈະມີບັນຊີລາຍການໂດຍອີງຕາມບັນຊີລາຍຊື່ອື່ນ: c_typent <br>: libelle: id: <i> parent_list_code </i> | parent_column: ຕົວກັ່ນຕອງ
 ExtrafieldParamHelplink=ພາຣາມິເຕີຕ້ອງເປັນ ObjectName: Classpath <br> Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=ຮັກສາຫວ່າງເປົ່າສໍາລັບຕົວແຍກແບບງ່າຍ simple <br> ຕັ້ງອັນນີ້ເປັນ 1 ສໍາລັບຕົວແຍກຕົວຫຍໍ້ (ເປີດຕາມຄ່າເລີ່ມຕົ້ນສໍາລັບຊ່ວງເວລາເຂົ້າໃ,່, ຈາກນັ້ນສະຖານະຈະຖືກເກັບໄວ້ສໍາລັບແຕ່ລະຊ່ວງເວລາຂອງຜູ້ໃຊ້) <br> ກໍານົດອັນນີ້ເປັນ 2 ສໍາລັບຕົວແຍກການຫຍໍ້ (ຫຍໍ້ລົງຕາມຄ່າເລີ່ມຕົ້ນສໍາລັບເຊດຊັນໃ,່, ຈາກນັ້ນ ສະຖານະພາບໄດ້ຖືກເກັບຮັກສາໄວ້ໃນແຕ່ລະກອງປະຊຸມຜູ້ໃຊ້)
@@ -483,7 +483,7 @@ ExternalModule=ໂມດູນພາຍນອກ
 InstalledInto=ຕິດຕັ້ງໃສ່ໄດເຣັກທໍຣີ %s
 BarcodeInitForThirdparties=ການລິເລີ່ມບາໂຄດ ຈຳ ນວນຫຼາຍ ສຳ ລັບພາກສ່ວນທີສາມ
 BarcodeInitForProductsOrServices=ເລີ່ມຫຼືຕັ້ງບາໂຄດຄືນໃfor່ ສຳ ລັບຜະລິດຕະພັນຫຼືການບໍລິການ
-CurrentlyNWithoutBarCode=ໃນປັດຈຸບັນ, ທ່ານມີ <strong>%s</strong> ຢູ່ໃນ <strong>%s</strong> <span class='notranslate'>b0ecb2ecz87f4 .
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=ຄ່າ init ສໍາລັບ %s ບາໂຄດເປົ່າ
 EraseAllCurrentBarCode=ລຶບຄ່າ barcode ປັດຈຸບັນທັງົດ
 ConfirmEraseAllCurrentBarCode=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລຶບຄ່າ barcode ປັດຈຸບັນທັງ?ົດ?
@@ -1197,6 +1197,7 @@ Skin=ຮູບແບບສີສັນຜິວ ໜັງ
 DefaultSkin=ຮູບແບບສີສັນເລີ່ມຕົ້ນ
 MaxSizeList=ຄວາມຍາວສູງສຸດຂອງລາຍການ
 DefaultMaxSizeList=ຄວາມຍາວສູງສຸດເລີ່ມຕົ້ນ ສຳ ລັບລາຍຊື່
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=ຄວາມຍາວສູງສຸດເລີ່ມຕົ້ນ ສຳ ລັບລາຍຊື່ສັ້ນ (ເຊັ່ນ: ໃນບັດລູກຄ້າ)
 MessageOfDay=ຂໍ້ຄວາມຂອງມື້
 MessageLogin=ຂໍ້ຄວາມ ໜ້າ ເຂົ້າສູ່ລະບົບ
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=ຢ່າສົ່ງອອກເຫດການທີ່ເ
 SecurityKey = ກະແຈຄວາມປອດໄພ
 ##### ClickToDial #####
 ClickToDialSetup=ຄລິກເພື່ອໂທຫາການຕັ້ງໂມດູນ
-ClickToDialUrlDesc=URL ເອີ້ນວ່າເມື່ອຄລິກໃສ່ຮູບໂທລະສັບແລ້ວ. ໃນ URL, ທ່ານສາມາດນໍາໃຊ້ tags<br><b>__PHONETO__</b> ແທນທີ່ດ້ວຍເບີໂທລະສັບຂອງຄົນທີ່ຈະໂທຫາ <br><b>__PHONEFROM__b09a4b739f17f80z ຈະຖືກແທນທີ່ດ້ວຍເບີໂທລະສັບຂອງຜູ້ໂທ (ຂອງເຈົ້າ)<span class='notranslate'><br><b>__LOGIN__b09a4b7390f17f17 span> ທີ່ຈະຖືກແທນທີ່ດ້ວຍການເຂົ້າສູ່ລະບົບ clicktodial (ກຳນົດໄວ້ໃນບັດຜູ້ໃຊ້)<span class='notranslate'><br><b>__PASS__ </b> ທີ່ຈະຖືກແທນທີ່ດ້ວຍລະຫັດຜ່ານ clicktodial (ກໍານົດໄວ້ໃນບັດຜູ້ໃຊ້).
+ClickToDialUrlDesc=URL called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=ໂມດູນນີ້ປ່ຽນເບີໂທລະສັບ, ເມື່ອໃຊ້ຄອມພິວເຕີຕັ້ງໂຕະ, ເຂົ້າໄປໃນລິ້ງທີ່ສາມາດກົດໄດ້. ຄລິກຈະໂທຫາເບີ. ອັນນີ້ສາມາດໃຊ້ເພື່ອເລີ່ມໂທລະສັບໄດ້ເມື່ອໃຊ້ໂທລະສັບອ່ອນຢູ່ເທິງຄອມພິວເຕີຂອງເຈົ້າຫຼືເມື່ອໃຊ້ລະບົບ CTI ອີງຕາມພິທີການ SIP. Noteາຍເຫດ: ເມື່ອໃຊ້ສະມາດໂຟນ, ຕົວເລກໂທລະສັບສາມາດກົດໄດ້ຕະຫຼອດ.
 ClickToDialUseTelLink=ໃຊ້ພຽງແຕ່ການເຊື່ອມຕໍ່ "tel:" ຢູ່ໃນເບີໂທລະສັບ
 ClickToDialUseTelLinkDesc=ໃຊ້ວິທີນີ້ຖ້າຜູ້ໃຊ້ຂອງເຈົ້າມີ softphone ຫຼືມີການໂຕ້ຕອບຊອບແວ, ຕິດຕັ້ງຢູ່ໃນຄອມພິວເຕີດຽວກັນກັບ browser, ແລະໂທຫາເມື່ອເຈົ້າຄລິກໃສ່ລິ້ງທີ່ເລີ່ມຕົ້ນດ້ວຍ "tel:" ຢູ່ໃນ browser ຂອງເຈົ້າ. ຖ້າເຈົ້າຕ້ອງການການເຊື່ອມຕໍ່ທີ່ເລີ່ມຕົ້ນດ້ວຍ "sip:" ຫຼືການແກ້ໄຂບັນຫາ server ເຕັມ (ບໍ່ຈໍາເປັນຕ້ອງມີການຕິດຕັ້ງຊອບແວໃນທ້ອງຖິ່ນ), ເຈົ້າຕ້ອງຕັ້ງອັນນີ້ເປັນ "ບໍ່" ແລະຕື່ມໃສ່ຊ່ອງຂໍ້ມູນຕໍ່ໄປ.
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=ໂມດູນ APIs ບໍ່ໄດ້ຖືກເປີດ
 YouShouldSetThisToOff=ເຈົ້າຄວນຕັ້ງອັນນີ້ເປັນ 0 ຫຼືປິດ
 InstallAndUpgradeLockedBy=ການຕິດຕັ້ງແລະອັບເກຣດຖືກລັອກໂດຍໄຟລ a <b> %s </b>
 InstallLockedBy=ການຕິດຕັ້ງ/ຕິດຕັ້ງຄືນໃໝ່ຖືກລັອກໂດຍໄຟລ໌ <b>%s</b>
-InstallOfAddonIsNotBlocked=ການຕິດຕັ້ງ addons ບໍ່ໄດ້ຖືກລັອກ. ສ້າງໄຟລ໌ <b>installmodules.lock</b> ເຂົ້າໄປໃນໄດເລກະທໍລີ <b></span ='notranslate'>%s</b> ເພື່ອບລັອກການຕິດຕັ້ງ addons/modules ພາຍນອກ.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=ການຈັດຕັ້ງປະຕິບັດເກົ່າ
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=ຖ້າບາງໂມດູນການຈ່າຍເງິນອອນໄລນ໌ຖືກເປີດໃຊ້ (Paypal, Stripe, ...), ເພີ່ມການເຊື່ອມຕໍ່ໃນ PDF ເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນອອນໄລນ໌.
 DashboardDisableGlobal=ປິດການນຳໃຊ້ນິ້ວໂປ້ມືທັງໝົດຂອງວັດຖຸທີ່ເປີດຢູ່ທົ່ວໂລກ
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 4a28770a2ff..7471a976580 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=ການໂອນພາຍໃນ
 TransferDesc=ໃຊ້ການໂອນພາຍໃນເພື່ອໂອນຈາກບັນຊີ ໜຶ່ງ ໄປຫາບັນຊີອື່ນ, ແອັບພລິເຄຊັນຈະຂຽນສອງບັນທຶກຄື: ການຫັກບັນຊີໃນບັນຊີຕົ້ນທາງແລະການປ່ອຍສິນເຊື່ອໃນບັນຊີເປົ້າາຍ. ຈຳ ນວນດຽວກັນ, ປ້າຍ ກຳ ກັບແລະວັນທີຈະຖືກໃຊ້ ສຳ ລັບທຸລະ ກຳ ນີ້.
 TransferFrom=ຈາກ
 TransferTo=ເຖິງ
-TransferFromToDone=ການໂອນຍ້າຍຈາກ <b>%s</b> ໄປ <b>%s</b> ຂອງ b0aee83365837fz 'notranslate'>%s</b> %s ຖືກບັນທຶກແລ້ວ.
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=ຜູ້ສົ່ງ
 ValidateCheckReceipt=ຮັບຮອງໃບຮັບເງິນນີ້ບໍ?
 ConfirmValidateCheckReceipt=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການສົ່ງໃບຮັບເງິນກວດສອບຄວາມຖືກຕ້ອງນີ້? ຈະບໍ່ສາມາດປ່ຽນແປງໄດ້ເມື່ອກວດສອບແລ້ວ.
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 1dd85b21aba..7f845aa1ad5 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -210,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=ໃນບາງປະເທດ
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=ໃຊ້ທາງເລືອກນີ້ຖ້າອັນອື່ນບໍ່ເsuitາະສົມ
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=ລູກຄ້າທີ່ບໍ່ດີ <b> </b> ແມ່ນລູກຄ້າທີ່ປະຕິເສດທີ່ຈະຊໍາລະ ໜີ້ ຂອງລາວ.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ທາງເລືອກນີ້ຖືກໃຊ້ເມື່ອການຊໍາລະເງິນບໍ່ສໍາເລັດເພາະວ່າບາງຜະລິດຕະພັນຖືກສົ່ງຄືນ
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=ຈຳນວນທີ່ຍັງບໍ່ໄດ້ຈ່າຍແມ່ນ <b>ຄ່າທຳນຽມທະນາຄານຕົວກາງ</b>, ຫັກອອກໂດຍກົງຈາກ b0aee8336583 >ຈຳນວນທີ່ຖືກຕ້ອງ<span class='notranslate'></b> ລູກຄ້າຈ່າຍໃຫ້.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=ຈໍານວນທີ່ບໍ່ໄດ້ຈ່າຍຈະບໍ່ຖືກຈ່າຍຍ້ອນວ່າມັນເປັນພາສີຫັກຢູ່ບ່ອນຈ່າຍ
 ConfirmClassifyPaidPartiallyReasonOtherDesc=ໃຊ້ຕົວເລືອກນີ້ຖ້າຄົນອື່ນທັງareົດບໍ່ເsuitableາະສົມ, ຕົວຢ່າງໃນສະຖານະການຕໍ່ໄປນີ້: <br> - ການຊໍາລະເງິນບໍ່ສໍາເລັດເພາະວ່າບາງຜະລິດຕະພັນຖືກສົ່ງຄືນ <br> - ຈໍານວນທີ່ອ້າງວ່າສໍາຄັນເກີນໄປເພາະວ່າມີສ່ວນຫຼຸດຖືກລືມ <br> ໃນທຸກກໍລະນີ, ຈໍານວນເງິນທີ່ອ້າງສິດເກີນໄປຕ້ອງໄດ້ຮັບການແກ້ໄຂ. ໃນລະບົບບັນຊີໂດຍການສ້າງບັນທຶກສິນເຊື່ອ.
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>ຜູ້ສະໜອງທີ່ບໍ່ດີ</b> ເປັນຜູ້ສະໜອງທີ່ພວກເຮົາປະຕິເສດທີ່ຈະຈ່າຍເງິນ.
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 078ba70e355..ac64d28046d 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -94,10 +94,10 @@ ErrorRecordIsUsedCantDelete=ບໍ່ສາມາດລຶບບັນທຶກ
 ErrorModuleRequireJavascript=JavaScript ຈະຕ້ອງບໍ່ຖືກປິດໃຊ້ງານເພື່ອໃຫ້ຄຸນສົມບັດນີ້ເຮັດວຽກໄດ້. ເພື່ອເປີດ/ປິດ JavaScript, ໃຫ້ໄປທີ່ເມນູ Home->Setup->Display.
 ErrorPasswordsMustMatch=ລະຫັດຜ່ານທີ່ພິມທັງສອງອັນຕ້ອງກົງກັນ
 ErrorContactEMail=ເກີດຄວາມຜິດພາດທາງດ້ານວິຊາການ. ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບເພື່ອຕິດຕາມອີເມວ <b>%s</b> ແລະໃຫ້ຂໍ້ຜິດພາດ ລະຫັດ <b>%s</b> ໃນຂໍ້ຄວາມຂອງທ່ານ, ຫຼືເພີ່ມສຳເນົາໜ້າຈໍຂອງ ໜ້ານີ້.
-ErrorWrongValueForField=Field <b>%s</b>: ' <b>%s</b>' ບໍ່ກົງກັບກົດລະບຽບ regex b0587833 <span class='notranslate'>%s</b>
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorHtmlInjectionForField=Field <b>%s</b>: ຄ່າ '<b>%s</b>' ມີຂໍ້ມູນທີ່ເປັນອັນຕະລາຍທີ່ບໍ່ໄດ້ຮັບອະນຸຍາດ.
 ErrorFieldValueNotIn=ພາກສະຫນາມ <b> %s </b>: '<b> %s </b>' ບໍ່ແມ່ນມູນຄ່າທີ່ພົບເຫັນໃນພາກສະຫນາມ <b> %s </b> ຂອງ <b> %s </b>
-ErrorFieldRefNotIn=Field <b>%s</b>: ' <b>%s</b>' ບໍ່ແມ່ນ b0aee><83spanf36583 class='notranslate'>%s</b> ອ້າງອີງທີ່ມີຢູ່ແລ້ວ
+ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorMultipleRecordFoundFromRef=ພົບບັນທຶກຫຼາຍຢ່າງເມື່ອຊອກຫາຈາກ ref <b>%s</b>. ບໍ່ມີທາງທີ່ຈະຮູ້ວ່າຈະໃຊ້ ID ໃດ.
 ErrorsOnXLines=ພົບຂໍ້ຜິດພາດ %s
 ErrorFileIsInfectedWithAVirus=ໂປຣແກມປ້ອງກັນໄວຣັດບໍ່ສາມາດກວດສອບໄຟລໄດ້ (ໄຟລ might ອາດຈະຕິດໄວຣັດ)
diff --git a/htdocs/langs/lo_LA/eventorganization.lang b/htdocs/langs/lo_LA/eventorganization.lang
index a8c4d32f689..a5c04cde748 100644
--- a/htdocs/langs/lo_LA/eventorganization.lang
+++ b/htdocs/langs/lo_LA/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=ການຕັ້ງອົງການຈັດຕັ້
 EventOrganization=ອົງການຈັດຕັ້ງເຫດການ
 EventOrganizationSetupPage = ໜ້າ ການຕັ້ງອົງການຈັດຕັ້ງເຫດການ
 EVENTORGANIZATION_TASK_LABEL = ປ້າຍ ກຳ ກັບ ໜ້າ ວຽກເພື່ອສ້າງອັດຕະໂນມັດເມື່ອໂຄງການໄດ້ຮັບການກວດສອບ
-EVENTORGANIZATION_TASK_LABELTooltip = ເມື່ອທ່ານກວດສອບເຫດການເພື່ອຈັດຕັ້ງ, ບາງໜ້າວຽກສາມາດຖືກສ້າງໂດຍອັດຕະໂນມັດໃນໂຄງການ<br><br>ຕົວຢ່າງ: <br>ສົ່ງການໂທເຂົ້າປະຊຸມ<br>ສົ່ງການໂທສຳລັບບູດ<br>ກວດສອບການແນະນຳການຈັດກອງປະຊຸມ ='notranslate'><br></span>ກວດສອບການສະໝັກສຳລັບ Booths<br>ເປີດການສະໝັກສະມາຊິກເຂົ້າຮ່ວມງານ<br>Send ຂອງເຫດການເຖິງລໍາໂພງ<br>ສົ່ງການເຕືອນເຫດການໃຫ້ຜູ້ຈັດບູດ<br>ສົ່ງຄໍາເຕືອນເຫດການໃຫ້ຜູ້ເຂົ້າຮ່ວມ
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=ເກັບໄວ້ຫວ່າງເປົ່າຖ້າທ່ານບໍ່ຈໍາເປັນຕ້ອງສ້າງຫນ້າວຽກໂດຍອັດຕະໂນມັດ.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoryວດtoູ່ເພື່ອເພີ່ມໃສ່ພາກສ່ວນທີສາມສ້າງໂດຍອັດຕະໂນມັດເມື່ອມີຄົນແນະ ນຳ ການປະຊຸມ
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoryວດtoູ່ເພື່ອເພີ່ມໃສ່ພາກສ່ວນທີສາມສ້າງໂດຍອັດຕະໂນມັດເມື່ອພວກເຂົາແນະ ນຳ ບູດ
@@ -88,6 +88,7 @@ PriceOfRegistration=ລາຄາການລົງທະບຽນ
 PriceOfRegistrationHelp=ລາຄາເພື່ອລົງທະບຽນຫຼືເຂົ້າຮ່ວມກິດຈະກໍາ
 PriceOfBooth=ລາຄາຈອງເພື່ອຢືນບູດ
 PriceOfBoothHelp=ລາຄາຈອງເພື່ອຢືນບູດ
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=ເຊື່ອມຕໍ່ ICS ສໍາລັບກອງປະຊຸມ
 ConferenceOrBoothInformation=ຂໍ້ມູນກອງປະຊຸມ ຫຼື Booth
 Attendees=ຜູ້ເຂົ້າຮ່ວມ
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index 0b4ba1aad82..5664d12162c 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -114,7 +114,7 @@ Enclosure=Stim Delimiter
 SpecialCode=ລະຫັດພິເສດ
 ExportStringFilter=%% ອະນຸຍາດໃຫ້ປ່ຽນຕົວອັກສອນ ໜຶ່ງ ຕົວຫຼືຫຼາຍຕົວໃນຂໍ້ຄວາມ
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: ການກັ່ນຕອງໂດຍ ໜຶ່ງ ປີ/ເດືອນ/ມື້ <br> YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: ການກັ່ນຕອງໃນຊ່ວງຫຼາຍປີ/ເດືອນ/ມື້ a0342fccYY>, ປີຕໍ່ໄປ/ເດືອນ/ມື້ <br> <YYYY, <YYYYMM, <YYYYMMDD: ຕົວກັ່ນຕອງໃນທຸກປີຜ່ານມາ/ເດືອນ/ມື້
-ExportNumericFilter=NNNNN ການກັ່ນຕອງໂດຍຄ່າອັນໜຶ່ງ <br>NNNNNN+NNNNNN ການກັ່ນຕອງໃນໄລຍະຂອງຄ່າ<br><span class='notranslate'>b08912a07ede2 /span>> NNNNN ການກັ່ນຕອງໂດຍຄ່າທີ່ສູງກວ່າ
+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=ການ ນຳ ເຂົ້າເລີ່ມຈາກlineາຍເລກແຖວ
 EndAtLineNb=ລົງທ້າຍດ້ວຍຕົວເລກແຖວ
 ImportFromToLine=ຂອບເຂດຈໍາກັດ (ຈາກ - ຫາ). ຕົວຢ່າງ: ເພື່ອລະເວັ້ນແຖວຫົວຂໍ້.
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 40d77899416..41abbc65335 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=ທັງ(ົດ (ລວມພາສີ)
 TotalHT=ທັງ(ົດ (ບໍ່ຮວມອາກອນ)
 TotalHTforthispage=ທັງ(ົດ (ບໍ່ລວມອາກອນ) ສໍາລັບ ໜ້າ ນີ້
 Totalforthispage=ທັງforົດ ສຳ ລັບ ໜ້າ ນີ້
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=ທັງ(ົດ (ລວມພາສີ)
 TotalTTCToYourCredit=ທັງ(ົດ (ລວມພາສີ) ຕໍ່ສິນເຊື່ອຂອງທ່ານ
 TotalVAT=ອາກອນທັງົດ
@@ -647,6 +649,7 @@ ReportName=ຊື່ລາຍງານ
 ReportPeriod=ໄລຍະເວລາລາຍງານ
 ReportDescription=ລາຍລະອຽດ
 Report=ລາຍງານ
+Reports=ບົດລາຍງານ
 Keyword=ຄໍາສໍາຄັນ
 Origin=ຕົ້ນກໍາເນີດ
 Legend=ຄວາມຫມາຍ
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 1ace0b5d352..236e7944007 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=ເບິ່ງຕົວຢ່າງທີ່ນີ້
 EnabledDesc=ເງື່ອນໄຂເພື່ອໃຫ້ຊ່ອງຂໍ້ມູນນີ້ເຮັດວຽກໄດ້.<br><br>ຕົວຢ່າງ:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=ສະໜາມແມ່ນເຫັນໄດ້ບໍ? (ຕົວຢ່າງ: 0=ບໍ່ເຄີຍເຫັນ, 1=ເບິ່ງເຫັນໄດ້ໃນລາຍການ ແລະສ້າງ/ອັບເດດ/ເບິ່ງແບບຟອມ, 2=ເບິ່ງເຫັນໄດ້ໃນລາຍການເທົ່ານັ້ນ, 3=ເບິ່ງເຫັນໄດ້ໃນແບບຟອມສ້າງ/ອັບເດດ/ເບິ່ງເທົ່ານັ້ນ (ບໍ່ຢູ່ໃນລາຍການ), 4=ເບິ່ງເຫັນໄດ້ໃນລາຍການ ແລະອັບເດດ/ເບິ່ງແບບຟອມເທົ່ານັ້ນ (ບໍ່ສ້າງ), 5=ເບິ່ງເຫັນໄດ້ໃນລາຍການ ແລະເບິ່ງແບບຟອມເທົ່ານັ້ນ (ບໍ່ສ້າງ, ບໍ່ອັບເດດ).<br><br> ການ​ນໍາ​ໃຊ້​ຄ່າ​ລົບ​ຫມາຍ​ຄວາມ​ວ່າ​ພາກ​ສະ​ຫນາມ​ບໍ່​ໄດ້​ສະ​ແດງ​ໃຫ້​ເຫັນ​ໂດຍ​ຄ່າ​ເລີ່ມ​ຕົ້ນ​ໃນ​ລາຍ​ການ​ແຕ່​ສາ​ມາດ​ເລືອກ​ສໍາ​ລັບ​ການ​ເບິ່ງ).
 ItCanBeAnExpression=ມັນສາມາດເປັນການສະແດງອອກ. ຕົວຢ່າງ:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=ສະແດງຊ່ອງຂໍ້ມູນນີ້ຢູ່ໃນເອກະສານ PDF ທີ່ເຂົ້າກັນໄດ້, ທ່ານສາມາດຈັດການຕຳແໜ່ງດ້ວຍຊ່ອງຂໍ້ມູນ "Position" ໄດ້.<br><strong>ສຳລັບເອກະສານ :</strong><br>0 = ບໍ່ສະແດງ <br>1 = display<br>2 = ສະແດງພຽງແຕ່ຖ້າບໍ່ຫວ່າງ<br><br>b0e78463907c span>ສຳລັບແຖວເອກະສານ :<span class='notranslate'></strong><br>0 = ບໍ່ສະແດງ <br>1 =ສະແດງຢູ່ໃນຖັນ<br>3 =ສະແດງຢູ່ໃນຖັນລາຍລະອຽດແຖວຫຼັງຄຳອະທິບາຍ<br>4 =ສະແດງໃນຖັນລາຍລະອຽດຫຼັງຄຳອະທິບາຍ ພຽງແຕ່ຖ້າບໍ່ຫວ່າງ
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=ສາມາດສະສົມມູນຄ່າຂອງຊ່ອງຂໍ້ມູນເພື່ອເອົາຈໍານວນທັງintoົດເຂົ້າໃນບັນຊີໄດ້ບໍ? (ຕົວຢ່າງ: 1 ຫຼື 0)
 SearchAllDesc=ພາກສະ ໜາມ ໄດ້ຖືກນໍາໃຊ້ເພື່ອເຮັດການຄົ້ນຫາຈາກເຄື່ອງມືຄົ້ນຫາໄວບໍ? (ຕົວຢ່າງ: 1 ຫຼື 0)
@@ -148,7 +148,7 @@ CSSListClass=CSS ສຳ ລັບລາຍຊື່
 NotEditable=ບໍ່ສາມາດແກ້ໄຂໄດ້
 ForeignKey=ກະແຈຕ່າງປະເທດ
 ForeignKeyDesc=ຖ້າຄ່າຂອງຊ່ອງຂໍ້ມູນນີ້ຕ້ອງໄດ້ຮັບການຮັບປະກັນວ່າມີຢູ່ໃນຕາຕະລາງອື່ນ. ກະລຸນາໃສ່ syntax ທີ່ກົງກັບຄ່າທີ່ນີ້: tablename.parentfieldtocheck
-TypeOfFieldsHelp=ຕົວຢ່າງ:<br>varchar(99)<br>email<br>ໂທລະສັບ<br>ip<br>url<br>passwordb0342fcc span>double(24,8)<span class='notranslate'><br>ຈິງ<br>text<br>html <br>date<br>datetime<br>timestamp <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342bzcfda /span><span class='notranslate'><br>'1' ໝາຍ​ຄວາມ​ວ່າ​ພວກ​ເຮົາ​ເພີ່ມ​ປຸ່ມ + ຫຼັງ​ຈາກ​ຄອມ​ໂບ​ເພື່ອ​ສ້າງ​ບັນ​ທຶກ <br>'filter' ເປັນ ເງື່ອນໄຂ syntax ຂອງ Universal Filter, ຕົວຢ່າງ: '((ສະຖານະ:=:1) AND (fk_user:=:_USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=ນີ້ແມ່ນປະເພດຂອງພາກສະຫນາມ / ຄຸນລັກສະນະ.
 AsciiToHtmlConverter=ຕົວປ່ຽນ Ascii ເປັນ HTML
 AsciiToPdfConverter=Ascii ເປັນຕົວປ່ຽນ PDF
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=ລົ້ມເຫລວໃນການເພີ
 DictionariesCreated=ວັດຈະນານຸກົມ <b>%s</b> ສ້າງສຳເລັດແລ້ວ
 DictionaryDeleted=ວັດຈະນານຸກົມ <b>%s</b> ອອກສຳເລັດແລ້ວ
 PropertyModuleUpdated=ຊັບສິນ <b>%s</b> ໄດ້ຮັບການອັບເດດສຳເລັດແລ້ວ
-InfoForApiFile=* ເມື່ອທ່ານສ້າງໄຟລ໌ເປັນຄັ້ງທຳອິດ, ວິທີການທັງໝົດຈະຖືກສ້າງ <strong>ສຳລັບແຕ່ລະວັດຖຸ.</strong><br>* ເມື່ອທ່ານຄລິກໃນ <strong>remove</strong> ທ່ານພຽງແຕ່ລຶບວິທີການທັງໝົດສຳລັບ <span. ='notranslate'><strong></span>ວັດຖຸທີ່ເລືອກ</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=ຫນ້າສໍາລັບການຕິດຕັ້ງໂມດູນ
 EmailingSelectors=ຕົວເລືອກອີເມວ
 EmailingSelectorDesc=ທ່ານສາມາດສ້າງແລະແກ້ໄຂໄຟລ໌ຫ້ອງຮຽນໄດ້ທີ່ນີ້ເພື່ອສະຫນອງຕົວເລືອກເປົ້າຫມາຍອີເມວໃຫມ່ສໍາລັບໂມດູນການສົ່ງອີເມວມະຫາຊົນ
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 8ded35b6c3f..b62e73f04ed 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=ເຈົ້າສາມາດແກ້ໄຂລະ
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=ສໍາລັບຮູບພາບທີ່ແບ່ງປັນກັບການເຊື່ອມຕໍ່ແບ່ງປັນ (ເປີດການເຂົ້າເຖິງໂດຍໃຊ້ລະຫັດ hash ການແບ່ງປັນຂອງໄຟລ)), ໄວຍະກອນແມ່ນ: <br> <strong> &lt;img src = "/viewimage.php? hashp = 12345679012 ... " a0012c7d009007700775 a039c087007c007c007c007c0b087c07c0b0785c087b07b0770c087b087b07b0770c07b07b07b07b0775c0b087b087b07b07b087b087b087a087b087b087b087c087c087c07b07b07b087c06b08770
-YouCanEditHtmlSource3=ເພື່ອເອົາ URL ຂອງຮູບຂອງວັດຖຸ PHP, ໃຫ້ໃຊ້<br><strong>&lt;img src="&lt;?php ພິມ getImagePublicURLOfObject($object, 1, "_small") ?&gt;" class='notranslate'>&gt;</span></strong><br>
-YouCanEditHtmlSourceMore=<br>ຕົວຢ່າງເພີ່ມເຕີມຂອງ HTML ຫຼືລະຫັດໄດນາມິກທີ່ມີຢູ່ໃນ <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">ເອກະສານ wiki</a> >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=ເພີ່ມເວັບໄຊທແລ້ວ
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 6633115ff0d..75cf180073c 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Iš viso (su PVM)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Iš viso (su PVM)
 TotalTTCToYourCredit=Iš viso (su PVM) prie Jūsų kredito
 TotalVAT=Iš viso PVM
@@ -647,6 +649,7 @@ ReportName=Ataskaitos pavadinimas
 ReportPeriod=Ataskaitos laikotarpis
 ReportDescription=Aprašymas
 Report=Ataskaita
+Reports=Ataskaitos
 Keyword=Keyword
 Origin=Origin
 Legend=Legenda
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 0a16a201d58..3153da43412 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -253,7 +253,7 @@ MainDbPasswordFileConfEncrypted=Šifrēt datubāzes paroli, kas saglabāta conf.
 InstrucToEncodePass=Lai paroli šifrētu <b> conf.php </b> failā, nomainiet rindiņu <br><b> $ dolibarr_main_db_pass = "..."; </b>  <br>ar<br><b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Lai <b>conf.php</b> failā dekodētu (dzēstu) paroli, nomainiet rindu <br><b>$dolibarr_main_db_pass = "crypted: ..."; </b><br>ar<br> <b>$dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Aizsargāt ģenerētos PDF failus. Tas nav ieteicams, jo tas pārtrauc lielapjoma PDF ģenerēšanu.
-ProtectAndEncryptPdfFilesDesc=Aizsardzība PDF dokumentu saglabā to pieejamu lasīt un izdrukāt ar jebkuru PDF pārlūkprogrammu. Tomēr, rediģēšana un kopēšana nav iespējams vairs. Ņemiet vērā, ka, izmantojot šo funkciju veidojot kopējos apvienotos pdf nedarbojas (piemēram, neapmaksātiem rēķiniem). 
+ProtectAndEncryptPdfFilesDesc=Aizsardzība PDF dokumentu saglabā to pieejamu lasīt un izdrukāt ar jebkuru PDF pārlūkprogrammu. Tomēr, rediģēšana un kopēšana nav iespējams vairs. Ņemiet vērā, ka, izmantojot šo funkciju veidojot kopējos apvienotos pdf nedarbojas (piemēram, neapmaksātiem rēķiniem).
 Feature=Iespēja
 DolibarrLicense=Licence
 Developpers=Izstrādātāji/ziedotāji
@@ -366,9 +366,9 @@ GenericMaskCodes2= <b> {cccc} </b> klienta kods uz n rakstzīmēm <br> <b> {cccc
 GenericMaskCodes3=Visas citas rakstzīmes masku paliks neskartas.<br>Atstarpes nav atļautas.<br>
 GenericMaskCodes3EAN=Visas pārējās maskas rakstzīmes paliks neskartas (izņemot * vai? EAN13 13. pozīcijā). <br> Atstarpes nav atļautas. <br> EAN13, pēdējam rakstzīmei pēc pēdējā} 13. pozīcijā jābūt * vai? . To aizstās aprēķinātā atslēga. <br>
 GenericMaskCodes4a=<u>Piemērs par trešās puses TheCompany 99. piemēru %s ar datumu 2023. 01.31.:</u><br>
-GenericMaskCodes4b=<u>Piemērs par trešo pusi, izveidots 31.01.2023.:</u><span class='notranslate'>b0342fccfda</span19bz0 >
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>Piemērs par produktu, kas izveidots 2023.01.31.:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> sniegs b0aee833650</837f span>ABC2301-000099<span class='notranslate'></b><br>b0aee83365837{0@0</1> }-ZZZ/{dd}/XXX<span class='notranslate'></b> sniegs <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> sniegs <b>IN2301-0099-A</b>, ja uzņēmuma veids "Atbildīgs Inscripto" ar kodu tipam, kas ir "A_RI"
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Atgriež pielāgojamu numuru atbilstoši noteiktajai maskai.
 ServerAvailableOnIPOrPort=Serveris ir pieejams adresē <b>%s</b> ports <b>%s</b>
 ServerNotAvailableOnIPOrPort=Serveris nav pieejams adresē <b>%s</b> ports <b>%s</b>
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=Ja atstājat šo lauku tukšu, šī vērtība tiks s
 ExtrafieldParamHelpselect=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> kods3, vērtība3 < br> ... <br> <br> Lai saraksts būtu atkarīgs no cita papildinošā atribūtu saraksta: <br> 1, vērtība1 | opcijas_ <i> vecāku_līmeņa kods </i>: vecāku_skava <br> 2, vērtība2 | opcijas_ <i> vecāku saraksts_code </i>: parent_key <br> <br> Lai saraksts būtu atkarīgs no cita saraksta: <br> 1, vērtība1 | <i> vecāku saraksts_code </i>: vecāku_skava <br> 2, vērtība2 | <i> vecāku saraksts_code </i>: vecāku_poga
 ExtrafieldParamHelpcheckbox=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
 ExtrafieldParamHelpradio=Vērtību sarakstam jābūt rindām ar formāta atslēgu, vērtība (kur atslēga nevar būt '0') <br> <br>, piemēram,: 1, vērtība1 <br> 2, vērtība2 <br> 3, vērtība3 < br> ...
-ExtrafieldParamHelpsellist=Vērtību saraksts nāk no tabulas<br>Sintakse: table_name:label_field:id_field::filtersql<br>Piemērs: c_idtypent:libelle ::filtersql<br><br> — lauks id_field noteikti ir primārā int atslēgab0342fccfda</span19bz0 - filtersql ir SQL nosacījums. Tas var būt vienkāršs tests (piemēram, active=1), lai parādītu tikai aktīvo vērtību<span class='notranslate'><br>Varat arī izmantot $ID$ filtrā, kas ir pašreizējā objekta pašreizējais ID<br>Lai filtrā izmantotu SELECT, izmantojiet atslēgvārdu $SEL$, lai apietu pretinjekcijas aizsardzību.<br>ja vēlaties filtrēt papildu laukus. izmantojiet sintaksi extra.fieldcode=... (kur lauka kods ir ekstralauka kods)<br><br>Lai saraksts atkarībā no cita papildu atribūtu saraksta:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>Lai saraksts būtu atkarīgs no cita saraksta:<br>c_typent:libelle:id:<i>parent_list_code</i>|
+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 necessarily 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=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtersql <br> Piemērs: c_typent: libelle: id :: filtersql <br> <br> tikai aktīvs displejs var izmantot arī $ ID $ filtrā. ragana ir pašreizējā objekta <br> ID. Lai atlasītu filtru, izmantojiet $ SEL $ <br>, ja vēlaties filtrēt ekstra laukos, izmantojiet sintaksi extra.fieldcode = ... (kur lauka kods ir kods extrafield) <br> <br> lai būtu sarakstu atkarībā citā papildu atribūtu saraksta: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filtrs <br> <br> lai iegūtu sarakstu, atkarībā no citu sarakstā: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtrs
 ExtrafieldParamHelplink=Parametriem jābūt ObjectName: Classpath <br> Sintakse: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Vienkārša atdalītāja atstāšana tukša <br> Iestatiet to uz 1 sabrūkošajam atdalītājam (pēc noklusējuma atveriet jaunu sesiju, pēc tam katras lietotāja sesijai tiek saglabāts statuss) <br> Iestatiet to uz 2 sabrukušajam atdalītājam (jaunajai sesijai pēc noklusējuma sabrūk, pēc tam katras lietotāja sesijas laikā tiek saglabāts statuss)
@@ -1197,6 +1197,7 @@ Skin=Izskats
 DefaultSkin=Noklusētais izskats
 MaxSizeList=Maksimālais saraksta garums
 DefaultMaxSizeList=Noklusētais maksimālais sarakstu garums
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Īsu saraksta noklusējuma maksimālais garums (t.i., klienta kartē)
 MessageOfDay=Dienas ziņa
 MessageLogin=Pieteikšanās lapas paziņojums
@@ -1449,7 +1450,7 @@ MustBeInvoiceMandatory=Obligāti, lai apstiprinātu rēķinus?
 TechnicalServicesProvided=Tehniskie pakalpojumi
 ##### WebDAV #####
 WebDAVSetupDesc=Šī ir saite, lai piekļūtu WebDAV direktorijai. Tā satur "publisku" dir., Kas atvērts jebkuram lietotājam, kurš zina URL (ja publiskā kataloga piekļuve ir atļauta) un "privātu" direktoriju, kuram ir nepieciešams esošs pieteikšanās konts / parole.
-WebDavServer=%s servera%s saknes URL: 
+WebDavServer=%s servera%s saknes URL:
 ##### WebCAL setup #####
 WebCalUrlForVCalExport=Eksporta saite uz <b>%s</b> formātā ir pieejams šādā tīmekļa vietnē: %s
 ##### Invoices #####
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Neeksportē notikums, kuri vecāki par
 SecurityKey = Drošības atslēga
 ##### ClickToDial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
-ClickToDialUrlDesc=URL tiek izsaukts, kad tiek noklikšķināts uz tālruņa attēla. Vietrādī URL varat izmantot tagus<br><b>__PHONETO__</b> aizstāts ar zvanāmās personas tālruņa numuru<br><b>__PHONEFROM__</b> tiks aizstāts ar zvanītās personas tālruņa numuru (jūsu)<span class='notranslate'><br><b>__LOGIN__b09a4b739f1 span>, kas tiks aizstāts ar clicktodial pieteikšanos (noteikts lietotāja kartē)<span class='notranslate'><br><b>__PASS__ </b>, kas tiks aizstāta ar clicktodial paroli (noteikta lietotāja kartē).
+ClickToDialUrlDesc=URL called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Šis modulis maina tālruņu numurus, izmantojot galddatoru, uz noklikšķināmām saitēm. Klikšķis piezvanīs uz numuru. To var izmantot, lai sāktu tālruņa zvanu, kad, izmantojot darbvirsmu, izmantojat mīksto tālruni vai, piemēram, izmantojot CTI sistēmu, kuras pamatā ir SIP protokols. Piezīme. Izmantojot viedtālruni, uz tālruņu numuriem vienmēr var noklikšķināt.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Izmantojiet šo metodi, ja jūsu lietotājiem ir programmatūra vai programmatūras saskarne, kas instalēta tajā pašā datorā, kurā atrodas pārlūkprogramma, un zvanīja, kad pārlūkprogrammā noklikšķinājāt uz saites, kas sākas ar "tel:". Ja jums nepieciešama saite, kas sākas ar "sip:", vai pilns servera risinājums (nav nepieciešama vietējās programmatūras instalēšana), jums jāiestata tā uz "Nē" un jāaizpilda nākamais lauks.
@@ -1943,7 +1944,7 @@ ShowFiscalYear=Rādīt grāmatvedības periodu
 AlwaysEditable=Vienmēr var rediģēt
 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=Minimālais lielo burtu skaits
-NbNumMin=Minimālais ciparu skaits 
+NbNumMin=Minimālais ciparu skaits
 NbSpeMin=Minimālais speciālo simbolu skaits
 NbIteConsecutive=Maksimālais atkārtojošos simbolu skaits
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=Ir iespējams definēt tīmekļa servera aizstājvā
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 11f583d9558..e1f1e3a4d31 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Pavisam (ar PVN)
 TotalHT=Kopā (bez nodokļiem)
 TotalHTforthispage=Kopā (izņemot nodokli) šai lapai
 Totalforthispage=Kopā par šo lapu
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Pavisam (ar PVN)
 TotalTTCToYourCredit=Pavisam (ieskaitot nodokli), pie jūsu kredīta
 TotalVAT=Kopējā nodokļu
@@ -647,6 +649,7 @@ ReportName=Atskaites nosaukums
 ReportPeriod=Atskaites periods
 ReportDescription=Apraksts
 Report=Ziņojums
+Reports=Atskaites
 Keyword=Atslēgas vārdi
 Origin=Izcelsme
 Legend=Leģenda
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 9b1eef67b60..30aafd8e147 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -148,7 +148,7 @@ CSSListClass=CSS sarakstam
 NotEditable=Nav rediģējams
 ForeignKey=Sveša atslēga
 ForeignKeyDesc=Ja šī lauka vērtībai ir jāgarantē, ka tā pastāv citā tabulā. Ievadiet šeit vērtību, kas atbilst sintakse: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Piemērs:<br>varchar(99)<br>e-pasts<br>tālrunis<br>ip<br>url<br>parole0</9bfccf3 span>double(24,8)<span class='notranslate'><br>real<br>text<br>html <br>datums<br>datetime<br>laika zīmogs <br>vesels skaitlis<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342bccfda<99bcc0 /span><span class='notranslate'><br>“1” nozīmē, ka aiz kombinācijas tiek pievienota poga +, lai izveidotu ierakstu.<br>“filtrs” ir Universālā filtra sintakses nosacījums, piemērs: '((statuss:=:1) UN (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Šis ir lauka/atribūta veids.
 AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Neizdevās pievienot kodu deskriptoram. Pārbaudie
 DictionariesCreated=Vārdnīca <b>%s</b> ir veiksmīgi izveidota
 DictionaryDeleted=Vārdnīca <b>%s</b> veiksmīgi noņemta
 PropertyModuleUpdated=Īpašums <b>%s</b> ir veiksmīgi atjaunināts
-InfoForApiFile=* Katram objektam ģenerējot failu pirmo reizi, visas metodes tiks izveidotas <strong>.</strong><br>* Noklikšķinot uz <strong>noņemt</strong>, jūs vienkārši noņemat visas <span klases metodes. ='notranslate'><strong></span>atlasīts objekts</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Lapa moduļa iestatīšanai
 EmailingSelectors=E-pasta atlasītāji
 EmailingSelectorDesc=Šeit varat ģenerēt un rediģēt klases failus, lai nodrošinātu jaunus e-pasta mērķa atlasītājus masveida e-pasta sūtīšanas modulim
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 963a0b97a27..8b27cf6beeb 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Uzlabota akciju pārsūtīšana
 ModuleStockTransferDesc=Uzlabota krājumu pārsūtīšanas pārvaldība ar pārsūtīšanas lapas ģenerēšanu
 StockTransferNew=Jaunu akciju nodošana
 StockTransferList=Krājumu pārvedumu saraksts
-ConfirmValidateStockTransfer=Vai tiešām vēlaties apstiprināt šo akciju nodošanu ar atsauci <b>%s</b><span class='notranslate'> span> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Krājumu samazinājums ar pārskaitījumu %s
 ConfirmDestockCancel=Atcelt krājumu samazināšanu ar pārskaitījumu %s
 DestockAllProduct=Krājumu samazināšanās
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 8294c2e6647..1497fa49f4c 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -60,11 +60,11 @@ NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
 SyntaxHelp=Palīdzība par konkrētiem sintakses padomiem
 YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot redaktorā pogu "Avots".
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong>&lt;?php ?&gt;<span class='notranslate6fd70b1 </span>. Ir pieejami šādi globālie mainīgie: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Varat iekļaut arī citas lapas/konteinera saturu ar šādu sintaksi:<br><strong>&lt;?php includeContainer('alias_of_includeer'); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Varat veikt novirzīšanu uz citu lapu/konteineru, izmantojot šādu sintaksi (piezīme: neizvadiet nevienu saturs pirms novirzīšanas):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7d0be</08c7d >mana saite<span class='notranslate'>&lt;a&gt;</strong> <br><br><span class="fa fa-download paddingright"></span> ='notranslate'><strong></span>saite, lai lejupielādētu</strong> failu, kas saglabāts <strong>dokumentos</strong> direktorijā, izmantojiet <strong>document.php</strong><span> class'no:translate' class'no: ><br></span>Piemērs, failam dokumentos/ecm (jāreģistrē), sintakse ir šāda:<br><strong> >&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Dokumentos/multivides failam (atvērts publiskai piekļuvei), sintakse ir šāda: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_name ext"&gt;</strong><br>Failam, kas kopīgots ar kopīgošanas saiti ( atvērta piekļuve, izmantojot faila koplietošanas jaucējatslēgu), sintakse ir:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Lai iekļautu  <strong>attēls</strong>, kas saglabāts <strong>dokumentosb0701</span class='notranslate'>b07009f6fcz09 , izmantojiet <span class='notranslate'><strong>viewimage.php</strong> iesaiņojumu.<br>,Piemēram attēlu dokumentos/multivides (atvērts direktorijs publiskai piekļuvei), sintakse ir:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"<span class='notranslate8c07b012czd </span></strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Attēlam, kas tiek koplietots ar koplietošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas hash atslēgu), sintakse ir: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 123456790120f0f0f0f0f0f0c0f0fcfcfcfcfcfcfcfcfcfcfcflcflcfcflcflcfl0f0flffcfcfcflflfcflflflflflflflflflflflflflflflflflflflflflflfcflflflflflflflflflflflflflrlxlrg" "
-YouCanEditHtmlSource3=Lai iegūtu PHP objekta attēla URL, izmantojiet <br><strong>&lt;. span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt; class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Citi HTML vai dinamiskā koda piemēri ir pieejami <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki dokumentācijā</a> >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonēt lapu / konteineru
 CloneSite=Klonēt vietni
 SiteAdded=Tīmekļa vietne ir pievienota
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index dc4dc5af141..db511322ea3 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -47,7 +47,7 @@ MakeBankTransferOrder=Veiciet kredīta pārveduma pieprasījumu
 WithdrawRequestsDone=%s reģistrēti tiešā debeta maksājumu pieprasījumi
 BankTransferRequestsDone=%s reģistrēti kredīta pārveduma pieprasījumi
 ThirdPartyBankCode=Trešās puses bankas kods
-NoInvoiceCouldBeWithdrawed=Neviens rēķins nav veiksmīgi apstrādāts. Pārbaudiet, vai rēķini ir no uzņēmumiem ar derīgu IBAN un vai IBAN ir UMR (unikālā mandāta atsauce) ar režīmu <strong>%s<. span class='notranslate'></strong></span>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
 NoInvoiceCouldBeWithdrawedSupplier=Neviens rēķins nav veiksmīgi apstrādāts. Pārbaudiet, vai rēķini ir no uzņēmumiem ar derīgu IBAN.
 NoSalariesCouldBeWithdrawed=Neviena alga nav veiksmīgi apstrādāta. Pārbaudiet, vai alga ir lietotājiem ar derīgu IBAN.
 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.
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Algas gaida samaksu ar pārskaitījumu
 RefSalary=Alga
 NoSalaryInvoiceToWithdraw=Nav algas, kas gaida “%s”. Lai iesniegtu pieprasījumu, atveriet algas kartes cilni %s.
 SalaryInvoiceWaitingWithdraw=Algas gaida samaksu ar pārskaitījumu
-
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 35459e8f355..d5f3362a305 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total (inc. tax)
 TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Total tax
@@ -647,6 +649,7 @@ ReportName=Report name
 ReportPeriod=Report period
 ReportDescription=Description
 Report=Report
+Reports=Reports
 Keyword=Keyword
 Origin=Origin
 Legend=Legend
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 5204958ad24..c12b7287862 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -231,7 +231,7 @@ SetOptionTo=Sett alternativet <b>%s</b> til %s
 Updated=Oppdatert
 AchatTelechargement=Kjøp/Last ned
 GoModuleSetupArea=For å distribuere/installere en ny modul, gå til området for Moduloppsett på <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
+DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM
 DoliPartnersDesc=Liste over selskaper som tilbyr spesialutviklede moduler eller funksjoner. <br> Merk: Siden Dolibarr er et program med åpen kildekode, bør <i> alle </i> med erfaring i PHP-programmering kunne utvikle en modul.
 WebSiteDesc=Eksterne nettsteder for flere tilleggs- (ikke-kjerne) moduler ...
 DevelopYourModuleDesc=Noen løsninger for å utvikle din egen modul...
@@ -352,7 +352,7 @@ NotExistsDirect=Alternativ rotkatalog er ikke definert til en eksisterende katal
 InfDirAlt=Fra versjon 3 er det mulig å definere en alternativ rotkatalog. Dette gjør det mulig å lagre plug-ins og egendefinerte maler.<br>Opprett en katalog i roten til Dolibarr (f.eks min katalog).<br>
 InfDirExample=<br> Deklarer det i filen <strong>conf.php</strong> <br> $ dolibarr_main_url_root_alt='/custom' <br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/tilpasset' <br> Hvis disse linjene er kommentert med "#", er det bare å fjerne tegnet "#" for å aktivere linjene.
 YouCanSubmitFile=Du kan laste opp .zip-filen til modulpakken herfra:
-CurrentVersion=Gjeldende versjon av Dolibarr 
+CurrentVersion=Gjeldende versjon av Dolibarr
 CallUpdatePage=Gå til siden som oppdaterer databasestrukturen og dataene: %s.
 LastStableVersion=Siste stabile versjon
 LastActivationDate=Siste aktiveringsdato
@@ -365,9 +365,9 @@ GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke føl
 GenericMaskCodes2=<b> {cccc} </b> klientkoden på n tegn <br> <b> {cccc000} </b> klientkoden på n tegn etterfølges av en teller dedikert for kunden. Denne telleren tilbakestilles samtidig med global teller. <br> <b> {tttt} </b> Koden til tredjepartstype på n tegn (se menyen Hjem - Oppsett - Ordbok - Typer av tredjeparter) . Hvis du legger til denne taggen, vil telleren være forskjellig for hver type tredjepart. <br>
 GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
 GenericMaskCodes3EAN=Alle andre tegn i masken forblir intakte (unntatt * eller ? I 13. posisjon i EAN13). <br> Mellomrom er ikke tillatt. <br> I EAN13 skal det siste tegnet etter det siste} i 13. posisjon være * eller? . Den vil bli erstattet av den beregnede nøkkelen. <br>
-GenericMaskCodes4a= <u> Eksempel på den 99. %s av tredjeparten Firmaet, med dato 2023-01-31: </u> <br> 
+GenericMaskCodes4a= <u> Eksempel på den 99. %s av tredjeparten Firmaet, med dato 2023-01-31: </u> <br>
 GenericMaskCodes4b= <u> Eksempel på tredjepart opprettet 2023-01-31: </u> <br>
-GenericMaskCodes4c= <u> Eksempel på vare opprettet 2023-01-31: </u>  <br> 
+GenericMaskCodes4c= <u> Eksempel på vare opprettet 2023-01-31: </u>  <br>
 GenericMaskCodes5= <b> ABC{åå}{mm}-{000000} </b>  vil gi <b> ABC2301-000099 </b>  <br>  <b> {0000+100@1}-ZZZ/{dd}/XXX </b>  vil gi <b> 0199-ZZZ/31/XXX </b>  <br>  <b> IN{yy}{mm}-{0000}-{t} </b>  vil gi <b> IN2301-0099-A </b>  hvis selskapstypen er 'Responsable Inscripto' med kode for type som er 'A_RI'
 GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal.
 ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
@@ -684,7 +684,7 @@ Module5000Desc=Lar deg administrere flere selskaper
 Module6000Name=Intermoduler Arbeidsflyt
 Module6000Desc=Arbeidsflytstyring mellom forskjellige moduler (automatisk oppretting av objekt og/eller automatisk statusendring)
 Module10000Name=Websider
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module10000Desc=CMS for å lage nettsteder med en WYSIWYG-editor. Dette er et webmaster- eller utviklerorientert innholdsstyringssystem (det er bedre å kunne HTML og CSS-språk). Bare konfigurer webserveren din (Apache, Nginx, ...) for å peke til den dedikerte Dolibarr-katalogen for å ha den online på internett med ditt eget domenenavn.
 Module20000Name=Håndtering av permisjonsforespørsler
 Module20000Desc=Definer og spor ansattes permisjonsforespørsler
 Module39000Name=Varelotter
@@ -1042,7 +1042,7 @@ Permission50440=Administrer kontooversikt, oppsett av regnskap
 Permission51001=Les eiendeler
 Permission51002=Opprett/oppdater eiendeler
 Permission51003=Slett eiendeler
-Permission51005=Oppsett av aktivatyper 
+Permission51005=Oppsett av aktivatyper
 Permission54001=Skriv ut
 Permission55001=Les meningsmålinger
 Permission55002=Opprett/endre meningsmålinger
@@ -1147,7 +1147,7 @@ LocalTax2IsNotUsedExampleES=I Spania er de bedrifter som ikke er ikke skatteplik
 RevenueStampDesc="Avgiftsstempelet" eller "inntektsstempelet" er en fast avgift du betaler per faktura (det avhenger ikke av fakturabeløpet). Det kan også være en prosentskatt, men å bruke den andre eller tredje typen skatt er bedre for prosentskatt, ettersom avgiftsstempler ikke gir noen rapportering. Bare få land bruker denne typen avgifter.
 UseRevenueStamp=Bruk et avgiftsstempel
 UseRevenueStampExample=Verdien av avgiftstempelet er definert som standard i oppsettet av ordbøker (%s - %s - %s)
-CalcLocaltax=Rapport over lokale avgifter 
+CalcLocaltax=Rapport over lokale avgifter
 CalcLocaltax1=Salg - Innkjøp
 CalcLocaltax1Desc=Lokale skatter-rapporter kalkuleres med forskjellen mellom kjøp og salg
 CalcLocaltax2=Innkjøp
@@ -1197,6 +1197,7 @@ Skin=Tema
 DefaultSkin=Standard tema
 MaxSizeList=Makslengde på lister
 DefaultMaxSizeList=Standard maks.lengde for lister
+DisplayGrandTotalInList=Vis totalsum (for alle sider) i listens bunntekst
 DefaultMaxSizeShortList=Standard maks lengde for korte lister (dvs. i kundekort)
 MessageOfDay=Dagens melding
 MessageLogin=Meldingstekst på innloggingsbildet
@@ -1466,7 +1467,7 @@ FreeLegalTextOnInvoices=Fritekst på fakturaer
 WatermarkOnDraftInvoices=Vannmerke på fakturakladder (ingen hvis tom)
 PaymentsNumberingModule=Modell for betalingsnummerering
 SuppliersPayment=Leverandørbetalinger
-SupplierPaymentSetup=Oppsett av leverandørbetaling 
+SupplierPaymentSetup=Oppsett av leverandørbetaling
 InvoiceCheckPosteriorDate=Sjekk fakturadato før validering
 InvoiceCheckPosteriorDateHelp=Validering av en faktura vil være forbudt hvis datoen er foran datoen for siste faktura av samme type.
 InvoiceOptionCategoryOfOperations=Vis omtale "kategori av operasjoner" på fakturaen.
@@ -1573,7 +1574,7 @@ LDAPMemberDn=Dolibarr-medlemmers DN
 LDAPMemberDnExample=Komplett DN (eks: ou=medlemmer,dc=eksempel,dc=com)
 LDAPMemberObjectClassList=Liste over objectClass
 LDAPMemberObjectClassListExample=Liste over objectClass som definerer postattributter (eks: topp, inetOrgPerson eller topp, bruker for ActiveDirectory)
-LDAPMemberTypeDn=Dolibarr medlemmer DN-typer 
+LDAPMemberTypeDn=Dolibarr medlemmer DN-typer
 LDAPMemberTypepDnExample=Komplett DN (eks: ou=medlemstyper, dc=eksempel, dc=com)
 LDAPMemberTypeObjectClassList=Liste over objectClass
 LDAPMemberTypeObjectClassListExample=Liste over objectClass som definerer postattributter (eks: topp, groupOfUniqueNames)
@@ -1700,7 +1701,7 @@ ProductServiceSetup=Oppsett av varer- og tjenester-modulen
 NumberOfProductShowInSelect=Maksimalt antall varer som skal vises i kombinasjonslister (0 = ingen grense)
 ViewProductDescInFormAbility=Vis produktbeskrivelser i varelinjer (ellers vis beskrivelse i et popup-vindu med verktøytips)
 OnProductSelectAddProductDesc=Hvordan bruke varebeskrivelsen når du legger til en en vare som en linje i et dokument
-AutoFillFormFieldBeforeSubmit=Fyll ut beskrivelsesfeltet med varebeskrivelsen automatisk 
+AutoFillFormFieldBeforeSubmit=Fyll ut beskrivelsesfeltet med varebeskrivelsen automatisk
 DoNotAutofillButAutoConcat=Ikke fyll inn inndatafeltet med varebeskrivelse. Varebeskrivelsen blir automatisk sammenkoblet til den angitte beskrivelsen.
 DoNotUseDescriptionOfProdut=Varebeskrivelse vil aldri bli inkludert i beskrivelsen på dokumentlinjer
 MergePropalProductCard=I "Vedlagte filer"-fanen i "Varer og tjenester" kan du aktivere en opsjon for å flette PDF-varedokument til tilbud PDF-azur hvis varen/tjenesten er i tilbudet
@@ -2294,8 +2295,8 @@ InstallLockedBy=Installer/Reinstaller er låst av filen <b> %s </b>
 InstallOfAddonIsNotBlocked=Installasjoner av tillegg er ikke låst. Opprett en fil <b> installmodules.lock </b> i katalogen <b> %s </b> for å blokkere installasjoner av eksterne tilleggsmoduler.
 OldImplementation=Gammel implementering
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Hvis noen elektroniske betalingsmoduler er aktivert (Paypal, Stripe, ...), legg til en lenke på PDF-en for å foreta online betaling
-DashboardDisableGlobal=Deaktiver alle knapper til åpne objekter globalt 
-BoxstatsDisableGlobal=Deaktiver boksstatistikk fullstendig 
+DashboardDisableGlobal=Deaktiver alle knapper til åpne objekter globalt
+BoxstatsDisableGlobal=Deaktiver boksstatistikk fullstendig
 DashboardDisableBlocks=Knapper for åpne objekter (for å behandle eller for sen) på hoveddashbordet
 DashboardDisableBlockAgenda=Deaktiver knappen for agenda
 DashboardDisableBlockProject=Deaktiver knappen for prosjekter
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=Det er mulig å definere et alias til webserveren og
 ExportUseForce=Bruk parameteren -f
 ExportUseForceHelp=Tving til å fortsette eksporten selv når en feil blir funnet (sikkerhetskopiering er kanskje ikke pålitelig)
 CustomPrompt=Egendefinerte forespørsler
+AiDescription=KI (kunstig intelligense) funksjoner
+AiDescriptionLong=Gir KI (kunstig intelligens) funksjoner i forskjellige deler av applikasjonen. Trenger ekstern AI API.
+AI_KEY_API_CHATGPT= Nøkkel for ChatGPT IA API
+AiSetup=AI-moduloppsett
+AiCustomPrompt=KI Egendefinert ledetekst
+AI_CONFIGURATIONS_PROMPT=Egendefinert ledetekst
+ImageGeneration=Bildegenerering
+AIPromptForFeatures=AI Egendefinert ledetekst for funksjoner
+EnterAnIP=Skriv inn en IP-adresse
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index d631941ffc7..9f6a6a18ef5 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=Betalingsmåte (kode)
 LabelPaymentMode=Betalingsmåte (etikett)
 PaymentModeShort=Betalingsmetode
 PaymentTerm=Betalingsbetingelser
+IdPaymentTerm=Betalingsbetingelse (id)
+CodePaymentTerm=Betalingsbetingelse (kode)
+LabelPaymentTerm=Betalingsbetingelse (etikett)
 PaymentConditions=Betalingsbetingelser
 PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Beløp til betaling
@@ -377,14 +380,14 @@ SplitDiscount=Del rabatt i to
 ConfirmSplitDiscount=Er du sikker på at du vil dele rabatten på<b>%s</b>? %s i to mindre rabatter?
 TypeAmountOfEachNewDiscount=Sett inn beløp for hver av de to delene:
 TotalOfTwoDiscountMustEqualsOriginal=Totalen for de to nye rabattene må være lik det originale rabattbeløpet.
-ConfirmRemoveDiscount=Er du sikker på at du vil 
+ConfirmRemoveDiscount=Er du sikker på at du vil
 RelatedBill=Relatert faktura
 RelatedBills=Relaterte fakturaer
 RelatedCustomerInvoices=Relaterte kundefakturaer
 RelatedSupplierInvoices=Relaterte leverandørfakturaer
 LatestRelatedBill=Siste tilknyttede faktura
 WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
-MergingPDFTool=Verktøy for fletting av PDF 
+MergingPDFTool=Verktøy for fletting av PDF
 AmountPaymentDistributedOnInvoice=Beløp fordelt på faktura
 PaymentOnDifferentThirdBills=Tillat betaling av fakturaer for ulike tredjeparter under samme foreldre-firma
 PaymentNote=Betalingsnotat
@@ -613,7 +616,7 @@ ToCreateARecurringInvoice=For å opprette en gjentakende faktura for denne kontr
 ToCreateARecurringInvoiceGene=For å opprette fremtidige periodiske fakturaer manuelt, gå til meny <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Hvis du vil opprette slike fakturaer automatisk, ta kontakt med administrator for å aktivere og sette opp modulen <strong>%s</strong>. Husk at begge metoder (manuell og automatisk) kan bruke om hverandre uten fare for duplisering.
 DeleteRepeatableInvoice=Slett fakturamal
-ConfirmDeleteRepeatableInvoice=Er du sikker på at du vil 
+ConfirmDeleteRepeatableInvoice=Er du sikker på at du vil
 CreateOneBillByThird=Opprett én faktura per tredjepart (ellers én faktura per valgt objekt)
 BillCreated=%s faktura(er) generert
 BillXCreated=Faktura %s generert
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 33e0ce4a5ad..db457ebd9c6 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -93,7 +93,7 @@ ErrorRecordHasAtLeastOneChildOfType=Objekt %s har minst ett barn av typen %s
 ErrorRecordIsUsedCantDelete=Kan ikke slette posten. Den er allerede brukt eller inkludert i et annet objekt.
 ErrorModuleRequireJavascript=JavaScript må ikke deaktiveres for at denne funksjonen skal fungere. For å aktivere/deaktivere JavaScript, gå til menyen Hjem->Oppsett->Skjerm.
 ErrorPasswordsMustMatch=Passordene må samsvare med hverandre
-ErrorContactEMail=Det oppsto en teknisk feil. Vennligst kontakt administrator på følge epost <b>%s</b> og oppgi feilkoden <b>8</049fez ><span class='notranslate'></b> i meldingen din, eller legg til en skjermkopi av denne siden.
+ErrorContactEMail=A technical error occurred. 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=Felt <b> %s </b>: '<b> %s </b>' stemmer ikke overens med regexregel <b> %s </b>
 ErrorHtmlInjectionForField=Felt <b> %s </b>: Verdien '<b> %s </b>' inneholder ikke tillatte data
 ErrorFieldValueNotIn=Felt <b> %s </b>: '<b> %s </b>' er ikke en verdi funnet i felt <b> %s </b> av <b> %s </b>
@@ -101,7 +101,7 @@ ErrorFieldRefNotIn=Felt <b> %s </b>: '<b> %s </b>' er ikke en <b> %s </b> eksist
 ErrorMultipleRecordFoundFromRef=Flere poster funnet ved søk fra ref <b> %s </b> . Ingen måte å vite hvilken ID du skal bruke.
 ErrorsOnXLines=%s feil funnet
 ErrorFileIsInfectedWithAVirus=Antivirus-programmet var ikke i stand til å validere filen (filen kan være infisert av et virus)
-ErrorFileIsAnInfectedPDFWithJSInside=Filen er en PDF-fil infisert av Javascript 
+ErrorFileIsAnInfectedPDFWithJSInside=Filen er en PDF-fil infisert av Javascript
 ErrorNumRefModel=En referanse finnes i databasen (%s), og er ikke kompatibel med denne nummereringsregelen. Fjern posten eller omdøp referansen for å aktivere denne modulen.
 ErrorQtyTooLowForThisSupplier=Mengde for lav for denne leverandøren eller ingen pris angitt på dette produktet for denne leverandøren
 ErrorOrdersNotCreatedQtyTooLow=Noen ordrer er ikke opprettet på grunn av for lave mengder
@@ -386,7 +386,7 @@ SwissQrDebitorAddressInvalid = Debitorinformasjonen var ugyldig (%s)
 # Validate
 RequireValidValue = Verdien er ikke gyldig
 RequireAtLeastXString = Krever minst %s tegn
-RequireXStringMax = Krever maks%s tegn 
+RequireXStringMax = Krever maks%s tegn
 RequireAtLeastXDigits = Krever minst %s siffer
 RequireXDigitsMax = Krever maks %s siffer
 RequireValidNumeric = Krever en numerisk verdi
@@ -407,7 +407,7 @@ ErrorTooManyAttempts= For mange forsøk, prøv igjen senere
 
 TotalAmountEmpty=Totalt beløp tomt
 FailedToFoundTheConversionRateForInvoice=Fant ikke konverteringsfrekvensen for faktura
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
-ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
-ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
+ThisIdNotDefined=ID ikke definert
+OperNotDefined=Betalingsmåte er ikke definert
+ErrorThisContactXIsAlreadyDefinedAsThisType=%s er allerede definert som kontakt for denne typen.
+ErrorThisGroupIsAlreadyDefinedAsThisType=Kontaktene med denne gruppen er allerede definert som kontakt for denne typen.
diff --git a/htdocs/langs/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
index 38b71fe4ad1..3a93d65d65e 100644
--- a/htdocs/langs/nb_NO/eventorganization.lang
+++ b/htdocs/langs/nb_NO/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Pris for registrering
 PriceOfRegistrationHelp=Pris for å registrere seg eller delta i arrangementet
 PriceOfBooth=Abonnementspris for en stand
 PriceOfBoothHelp=Abonnementspris for en stand
+EventOrganizationICSLinkProject=Koble til ICS for arrangementet
 EventOrganizationICSLink=Koble til ICS for konferanser
 ConferenceOrBoothInformation=Informasjon om konferanse eller stand
 Attendees=Deltakere
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 206289faf76..4a60660f3eb 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -58,7 +58,7 @@ ErrorGoToGlobalSetup=Gå til 'Firma/organisasjon' for å fikse dette
 ErrorGoToModuleSetup=Gå til Modul oppsett for å rette dette
 ErrorFailedToSendMail=Klarte ikke å sende epost (avsender=%s, mottager=%s)
 ErrorFileNotUploaded=Filen ble ikke lastet oppp. Sjekk at den ikke er større en maksimumsgrensen, at det er plass igjen på disken og at det ikke ligger en fil med samme navn i katalogen.
-ErrorInternalErrorDetected=Feil oppdaget 
+ErrorInternalErrorDetected=Feil oppdaget
 ErrorWrongHostParameter=Feil vertsparameter
 ErrorYourCountryIsNotDefined=Landet ditt er ikke definert. Gå til Home-Setup-Company/Foundation og legg ut skjemaet på nytt.
 ErrorRecordIsUsedByChild=Kunne ikke slette denne posten. Denne posten brukes av minst en under-post.
@@ -420,6 +420,8 @@ TotalTTCShort=Totalt (inkl. MVA)
 TotalHT=Totalt (ekskl. MVA)
 TotalHTforthispage=Totalt (ekskl. MVA) for denne siden
 Totalforthispage=Totalt for denne siden
+GrandTotal=Totalsum
+TotalforAllPages=Totalt for alle sider
 TotalTTC=Totalt (inkl. MVA)
 TotalTTCToYourCredit=Totalt (inkl. MVA) godskrevet deg
 TotalVAT=Total MVA
@@ -647,6 +649,7 @@ ReportName=Rapportnavn
 ReportPeriod=Rapport for perioden
 ReportDescription=Beskrivelse
 Report=Rapport
+Reports=Rapporter
 Keyword=Nøkkelord
 Origin=Opprinnelse
 Legend=Historikk
@@ -1174,7 +1177,7 @@ ConfirmAffectTag=Bulk etikettildeling
 ConfirmAffectUser=Bulk brukertildeling
 ProjectRole=Rolle tildelt på hvert prosjekt/mulighet
 TasksRole=Rolle tildelt hver oppgave (hvis brukt)
-ConfirmSetSupervisor=Sett Bulk Supervisor 
+ConfirmSetSupervisor=Sett Bulk Supervisor
 ConfirmUpdatePrice=Velg en øknings-/reduksjonssats
 ConfirmAffectTagQuestion=Er du sikker på at du vil tilordne merker til %s valgte post(er)?
 ConfirmAffectUserQuestion=Er du sikker på at du vil tilordne brukere til %s valgte post(er)?
@@ -1217,7 +1220,7 @@ Position=Posisjon
 AddLineOnPosition=Legg til linje på posisjon (på slutten hvis tom)
 ConfirmAllocateCommercial=Tildel salgsrepresentant bekreftelse
 ConfirmAllocateCommercialQuestion=Er du sikker på at du vil tilordne %s valgte post(er)?
-CommercialsAffected=Tildelt salgsrepresentanter 
+CommercialsAffected=Tildelt salgsrepresentanter
 CommercialAffected=Tildelt salgsrepresentant
 YourMessage=Din beskjed
 YourMessageHasBeenReceived=Meldingen din er mottatt. Vi vil svare eller kontakte deg så snart som mulig.
@@ -1231,7 +1234,7 @@ ExternalUser=Ekstern bruker
 NoSpecificContactAddress=Ingen spesifikk kontakt eller adresse
 NoSpecificContactAddressBis=Denne fanen er dedikert til å tvinge spesifikke kontakter eller adresser for gjeldende objekt. Bruk den bare hvis du ønsker å definere en eller flere spesifikke kontakter eller adresser for objektet når informasjonen om tredjeparten ikke er tilstrekkelig eller nøyaktig.
 HideOnVCard=Skjul %s
-ShowOnVCard=Show %s
+ShowOnVCard=Vis %s
 AddToContacts=Legg til adresse i kontaktene mine
 LastAccess=Siste tilgang
 UploadAnImageToSeeAPhotoHere=Last opp et bilde fra fanen %s for å se et bilde her
@@ -1261,7 +1264,7 @@ AmountSalary=Lønnsbeløp
 InvoiceSubtype=Faktura undertype
 ConfirmMassReverse=Bulk reversert bekreftelse
 ConfirmMassReverseQuestion=Er du sikker på at du vil reversere %s valgte post(er)?
-ElementType=Element type
-ElementId=Element Id
-Encrypted=Encrypted
+ElementType=Elementtype
+ElementId=Element-ID
+Encrypted=Kryptert
 Settings=Innstillinger
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 6a40456a1da..fc2eeb505df 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Forrige års fakturadato
 NextYearOfInvoice=Følgende år av fakturadato
 DateNextInvoiceBeforeGen=Dato for neste faktura (før generering)
 DateNextInvoiceAfterGen=Dato for neste faktura (etter generering)
-GraphInBarsAreLimitedToNMeasures=Grafikk er begrenset til %s-mål i 'Barer' -modus. Modusen 'Linjer' ble automatisk valgt i stedet.
+GraphInBarsAreLimitedToNMeasures=Grafikken er begrenset til %s mål i «Søyler»-modus. Modusen 'Linjer' ble automatisk valgt i stedet.
 OnlyOneFieldForXAxisIsPossible=Bare ett felt er for øyeblikket mulig som X-Akse. Bare det første valgte feltet er valgt.
 AtLeastOneMeasureIsRequired=Det kreves minst ett felt for mål
 AtLeastOneXAxisIsRequired=Minst ett felt for X-akse er påkrevd
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Salgsordre levert
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Innkjøpsordre sendt via e-post
 Notify_ORDER_SUPPLIER_VALIDATE=Innkjøpsordre er registrert
 Notify_ORDER_SUPPLIER_APPROVE=Innkjøpsordre godkjent
+Notify_ORDER_SUPPLIER_SUBMIT=Innkjøpsordre sendt
 Notify_ORDER_SUPPLIER_REFUSE=Innkjøpsordre avvist
 Notify_PROPAL_VALIDATE=Kundetilbud validert
 Notify_PROPAL_CLOSE_SIGNED=Kundetilbud lukket signert
@@ -66,6 +67,7 @@ Notify_BILL_SUPPLIER_SENTBYMAIL=Leverandørfaktura sendt via post
 Notify_BILL_SUPPLIER_CANCELED=Leverandørfaktura kansellert
 Notify_CONTRACT_VALIDATE=Kontrakt validert
 Notify_FICHINTER_VALIDATE=Intervensjon validert
+Notify_FICHINTER_CLOSE=Intervensjon lukket
 Notify_FICHINTER_ADD_CONTACT=Kontakt lagt til intervensjon
 Notify_FICHINTER_SENTBYMAIL=Intervensjon sendt med post
 Notify_SHIPPING_VALIDATE=Leveranse validert
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Installer eller aktiver GD-bibliotek i din PHP-installasjon
 ProfIdShortDesc=<b>Prof-ID %s</b> er avhengig av tredjepartens land.<br>For eksempel er det for <b>%s</b>, koden <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByAmount=Statistikk over mengde varer/tjenester
+StatsByAmountProducts=Statistikk over varermengde
+StatsByAmountServices=Statistikk over antall tjenester
 StatsByNumberOfUnits=Statistikk over summen av produkter/tjenester
+StatsByNumberOfUnitsProducts=Statistikk for summen av antall varer
+StatsByNumberOfUnitsServices=Statistikk for summen av antall tjenester
 StatsByNumberOfEntities=Statistikk for antall henvisende enheter (antall fakturaer, eller bestillinger...)
 NumberOf=Antall %s
 NumberOfUnits=Antall enheter på %s
@@ -198,6 +204,7 @@ AmountIn=Beløp i %s
 NumberOfUnitsMos=Antall enheter som skal produseres i produksjonsordre
 EMailTextInterventionAddedContact=En ny intervensjon %s har blitt tildelt deg.
 EMailTextInterventionValidated=Intervensjonen %s har blitt validert.
+EMailTextInterventionClosed=Intervensjonen %s er avsluttet.
 EMailTextInvoiceValidated=Faktura %s er validert.
 EMailTextInvoicePayed=Faktura %s er betalt.
 EMailTextProposalValidated=Tilbud %s er validert.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Tilbud %s er lukket avvist.
 EMailTextProposalClosedRefusedWeb=Tilbud %s har blitt stengt avvist på portalside.
 EMailTextOrderValidated=Ordre %s er validert.
 EMailTextOrderClose=Ordre %s er levert.
-EMailTextOrderApproved=Ordre %s er godkjent.
-EMailTextOrderValidatedBy=Ordre %s har blitt registrert av %s.
-EMailTextOrderApprovedBy=Ordre %s har blitt godkjent av %s.
-EMailTextOrderRefused=Ordre%s har blitt avvist.
-EMailTextOrderRefusedBy=Ordre %s har blitt avvist av %s.
+EMailTextSupplierOrderApprovedBy=Kjøpsordre %s er godkjent av %s.
+EMailTextSupplierOrderValidatedBy=Kjøpsordre %s er registrert av %s.
+EMailTextSupplierOrderSubmittedBy=Kjøpsordre %s er sendt inn av %s.
+EMailTextSupplierOrderRefusedBy=Kjøpsordre %s har blitt avvist av %s.
 EMailTextExpeditionValidated=Forsendelse %s er validert.
 EMailTextExpenseReportValidated=Utgiftsrapport %s er validert.
 EMailTextExpenseReportApproved=Utgiftsrapport %s er godkjent.
@@ -289,10 +295,12 @@ LinesToImport=Linjer å importere
 
 MemoryUsage=Minnebruk
 RequestDuration=Varighet av forespørsel
-ProductsPerPopularity=Varer/tjenester etter popularitet
-PopuProp=Varer/tjenester etter popularitet i tilbud
-PopuCom=Varer/tjenester etter popularitet i ordre
-ProductStatistics=Varer/Tjenestestatistikk
+ProductsServicesPerPopularity=Varer|Tjenester etter popularitet
+ProductsPerPopularity=Varer etter popularitet
+ServicesPerPopularity=Tjenester etter popularitet
+PopuProp=Varer|Tjenester etter popularitet i tilbud
+PopuCom=Varer|Tjenester etter popularitet i ordre
+ProductStatistics=Varer-|Tjenestestatistikk
 NbOfQtyInOrders=Antall i ordre
 SelectTheTypeOfObjectToAnalyze=Velg et objekt for å se dets statistikk...
 
@@ -309,7 +317,7 @@ ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
 ExampleMyMenuEntry=Meny overskrift
 
 # ftp
-FTPClientSetup=Modul for oppsett av FTP- eller SFTP-klient 
+FTPClientSetup=Modul for oppsett av FTP- eller SFTP-klient
 NewFTPClient=Nytt oppsett av FTP/SFTP-tilkobling
 FTPArea=FTP/SFTP-område
 FTPAreaDesc=Dette skjermbildet viser en FTP et SFTP-server.
@@ -328,3 +336,5 @@ FTPFailedToUploadFile=Kunne ikke laste opp filen <b> %s </b> .
 AddFolder=Lag mappe
 FileWasCreateFolder=Mappe <b> %s </b> er opprettet
 FTPFailedToCreateFolder=Kunne ikke opprette mappen <b> %s </b> .
+SelectADay=Velg en dag i kalenderen
+SelectANewDate=Velg en ny dato
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 9d256ab9f21..ded86d28790 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -80,11 +80,11 @@ SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
 MinPrice=Min. salgspris
-MinPriceHT=Min. selling price (excl. tax)
+MinPriceHT=Min. utsalgspris (ekskl. mva)
 MinPriceTTC=Minste utsalgspris (inkl. MVA)
 EditSellingPriceLabel=Rediger salgsprisetikett
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
-CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
+CantBeLessThanMinPrice=Utsalgspris kan ikke være lavere enn minimum tillatt for denne varen (%s uten MVA). Denne meldingen kan også vises hvis du skriver inn en betydelig rabatt.
+CantBeLessThanMinPriceInclTax=Utsalgspris kan ikke være lavere enn minimum tillatt for denne varen (%s inkludert MVA). Denne meldingen kan også vises hvis du skriver inn en for stor rabatt.
 ContractStatusClosed=Lukket
 ErrorProductAlreadyExists=En vare med varenummere %s eksisterer allerede.
 ErrorProductBadRefOrLabel=Ugyldig verdi for referanse eller etikett.
@@ -208,11 +208,6 @@ unitSET=Sett
 unitS=Sekund
 unitH=Time
 unitD=Dag
-unitG=Gram
-unitM=Meter
-unitLM=Lineær meter
-unitM2=Kvadratmeter
-unitM3=Kubikkmeter
 unitL=Liter
 unitT=tonn
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=pund
 unitOZ=unse
 unitM=Meter
+unitLM=Lineær meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -326,7 +322,7 @@ WarningSelectOneDocument=Velg minst ett dokument
 DefaultUnitToShow=Enhet
 NbOfQtyInProposals=Antall i tilbud
 ClinkOnALinkOfColumn=Klikk på en link i kolonnen %s for detaljert visning...
-ProductsOrServicesTranslations=Oversettelser for Varer/Tjenester 
+ProductsOrServicesTranslations=Oversettelser for Varer/Tjenester
 TranslatedLabel=Oversatt etikett
 TranslatedDescription=Oversatt beskrivelse
 TranslatedNote=Oversatte notater
@@ -350,7 +346,7 @@ UseProductFournDesc=Legg til en funksjon for å definere produktbeskrivelsen def
 ProductSupplierDescription=Leverandørs beskrivelse av produktet
 UseProductSupplierPackaging=Bruk "pakking"-funksjonen for å avrunde mengdene til noen gitte multipler (når du legger til/oppdaterer linje i leverandørdokumenter, beregner du mengder og innkjøpspriser på nytt i henhold til det høyere multiplumet som er satt på innkjøpsprisene til et produkt)
 PackagingForThisProduct=Pakking av mengder
-PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
+PackagingForThisProductDesc=Du vil automatisk kjøpe et multiplum av denne mengden.
 QtyRecalculatedWithPackaging=Mengden på linjen ble beregnet på nytt i henhold til leverandøremballasje
 
 #Attributes
@@ -360,7 +356,7 @@ ProductAttributes=Variantattributter for varer
 ProductAttributeName=Variantattributt %s
 ProductAttribute=Variantattributt
 ProductAttributeDeleteDialog=Er du sikker på at du vil slette denne attributten? Alle verdier vil bli slettet.
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Er du sikker på at du vil slette verdien "%s" med referansen "%s" for dette attributtet?
 ProductCombinationDeleteDialog=Er du sikker på at du vil slette varevarianten "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Det oppsto en feil ved sletting av varianten. Kontroller at den ikke blir brukt av noen objekter
 ProductCombinations=Varianter
@@ -422,7 +418,7 @@ ErrorsProductsMerge=Feil i varesammenslåing
 SwitchOnSaleStatus=Slå på salgsstatus
 SwitchOnPurchaseStatus=Slå på kjøpsstatus
 UpdatePrice=Øk/reduser kundepris
-StockMouvementExtraFields= Extra Fields (stock movement)
+StockMouvementExtraFields= Ekstra felt (varebevegelse)
 InventoryExtraFields= Ekstra felt (beholdning)
 ScanOrTypeOrCopyPasteYourBarCodes=Skann eller skriv eller kopier/lim inn strekkodene dine
 PuttingPricesUpToDate=Oppdater priser med gjeldende kjente priser
@@ -435,5 +431,8 @@ ConfirmEditExtrafield = Velg ekstrafeltet du vil endre
 ConfirmEditExtrafieldQuestion = Er du sikker på at du vil endre dette ekstrafeltet?
 ModifyValueExtrafields = Endre verdien for et ekstrafelt
 OrProductsWithCategories=Eller varer med tagger/kategorier
-WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
-WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+WarningTransferBatchStockMouvToGlobal = Hvis du ønsker å deserialisere denne varen, vil alle dens serialiserte beholdning bli transformert til globale vare
+WarningConvertFromBatchToSerial=Hvis du for øyeblikket har en mengde høyere eller lik 2 for vare, betyr å bytte til dette valget at du fortsatt vil ha en vare med forskjellige objekter av samme batch (mens du ønsker et unikt serienummer). Duplikatet vil forbli til en inventar eller en manuell varebevegelse for å fikse dette er gjort.
+AllowStockMovementVariantParent=Registrerer også varebevegelser på overordnede varer av varianter
+AllowStockMovementVariantParentHelp=Som standard er en forelder til en variant en virtuell vare, så ingen beholdning administreres for den. Ved å aktivere dette alternativet vil en beholdning bli administrert for overordnede varer og hver gang en beholdning mengde endres for en variant vare, vil samme mengde bli endret for den overordnede vare. Du bør ikke trenge dette alternativet, bortsett fra hvis du bruker variant for å administrere den samme vare i stedet for overordnet (men med andre beskrivelser, priser...)
+ConfirmSetToDraftInventory=Er du sikker på at du vil gå tilbake til utkaststatus?<br>Mengdene som for øyeblikket er angitt i beholdningen vil bli tilbakestilt.
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 6d8b613e79b..2e92d44cac3 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -127,7 +127,7 @@ ValidateProject=Valider prosjektet
 ConfirmValidateProject=Er du sikker på at du vil validere dette prosjektet?
 CloseAProject=Lukk prosjektet
 ConfirmCloseAProject=Er du sikker på at du vil lukke dette prosjektet?
-AlsoCloseAProject=Lukk prosjekt også 
+AlsoCloseAProject=Lukk prosjekt også
 AlsoCloseAProjectTooltip=Hold den åpen hvis du fortsatt trenger å følge produksjonsoppgaver på den
 ReOpenAProject=Åpne prosjekt
 ConfirmReOpenAProject=Er du sikker på at du vil gjenåpne dette prosjektet?
@@ -249,7 +249,7 @@ LatestProjects=Siste %s prosjekter
 LatestModifiedProjects=Siste %s endrede prosjekter
 OtherFilteredTasks=Andre filtrerte oppgaver
 NoAssignedTasks=Ingen tildelte oppgaver funnet (tilordne prosjekt/oppgaver til den nåværende brukeren fra den øverste valgboksen for å legge inn tid på den)
-ThirdPartyRequiredToGenerateInvoice=En tredjepart må defineres på prosjektet for å kunne fakturere det.
+ThirdPartyRequiredToGenerateIntervention=En tredjepart må være definert på prosjekt for å kunne skape intervensjon.
 ThirdPartyRequiredToGenerateInvoice=En tredjepart må defineres på prosjektet for å kunne fakturere det.
 ChooseANotYetAssignedTask=Velg en oppgave som du ennå ikke er tildelt
 # Comments trans
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
index 6a4cdb6dd04..17f75449a4b 100644
--- a/htdocs/langs/nb_NO/receiptprinter.lang
+++ b/htdocs/langs/nb_NO/receiptprinter.lang
@@ -10,6 +10,7 @@ ReceiptPrinterTemplateDesc=Oppsett av maler
 ReceiptPrinterTypeDesc=Eksempel på mulige verdier for feltet "Parametere" i henhold til drivertype
 ReceiptPrinterProfileDesc=Beskrivelse av skriverprofil
 ListPrinters=Liste over skrivere
+FromServerPointOfView=Fra webserverens synspunkt. Denne metoden må være tilgjengelig fra webserververten.
 SetupReceiptTemplate=Maloppsett
 CONNECTOR_DUMMY=Dummyskriver
 CONNECTOR_NETWORK_PRINT=Nettverksskriver
@@ -63,7 +64,7 @@ YearInvoice=Fakturaår
 DOL_VALUE_MONTH_LETTERS=Fakturamåned med bokstaver
 DOL_VALUE_MONTH=Fakturamåned
 DOL_VALUE_DAY=Fakturadag
-DOL_VALUE_DAY_LETTERS=Fakturadag med bokstaver
+DOL_VALUE_DAY_LETTERS=fakturadag i bokstaver
 DOL_LINE_FEED_REVERSE=Linjemating revers
 InvoiceID=Faktura-ID
 InvoiceRef=Fakturareferanse
diff --git a/htdocs/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang
index 2fabc89415f..2e3f7dee637 100644
--- a/htdocs/langs/nb_NO/resource.lang
+++ b/htdocs/langs/nb_NO/resource.lang
@@ -5,7 +5,7 @@ DeleteResource=Slett ressurs
 ConfirmDeleteResourceElement=Bekreft sletting av ressursen for dette elementet
 NoResourceInDatabase=Ingen ressurs i databasen
 NoResourceLinked=Ingen koblet ressurs
-
+ActionsOnResource=Hendelser om denne ressursen
 ResourcePageIndex=Ressursliste
 ResourceSingular=Ressurs
 ResourceCard=Ressurskort
@@ -34,3 +34,8 @@ IdResource=ID ressurs
 AssetNumber=Serienummer
 ResourceTypeCode=Ressurskode
 ImportDataset_resource_1=Ressurser
+
+ErrorResourcesAlreadyInUse=Noen ressurser er i bruk
+ErrorResourceUseInEvent=%s brukt i %s hendelse
+
+MaxUsers=Maksimalt antall brukere (plasser, seter osv.)
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 0c349b7d7fb..bd30e372b03 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -84,6 +84,7 @@ ToDate=aan
 ToLocation=aan
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
 DateFormatYYYYMMDDHHMM=JJJJ-MM-DD HH: SS
+Reports=Rapporten
 NotRead=Ongelezen
 Offered=Beschikbaar
 SetLinkToAnotherThirdParty=Link naar een derde partij
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index f7e98a69090..d1eb6b110bd 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -365,9 +365,9 @@ GenericMaskCodes=U kunt elk nummeringsmasker invoeren. In dit masker kunnen de v
 GenericMaskCodes2= <b> {cccc} </b> de klantcode op n tekens <br> <b> {cccc000} </b> de klant wordt gevolgd door een teller. Deze teller voor de klant wordt tegelijk met de globale teller gereset. <br> <b> {tttt} </b> De code van derde partij type op n karakters (zie menu Home - Instellingen - Woordenboek - Soorten derde partijen). Als u deze tag toevoegt, is de teller voor elk type derde partij anders. <br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
 GenericMaskCodes3EAN=Alle andere tekens in het masker blijven intact (behalve * of ? op de 13e positie in EAN13). <br> Spaties zijn niet toegestaan. <br> In EAN13 moet het laatste teken na de laatste } op de 13e positie * of ? . Deze wordt vervangen door de berekende sleutel. <br>
-GenericMaskCodes4a= <u> Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2023: </u>  <br> 
-GenericMaskCodes4b= <u> Voorbeeld op derde partij gemaakt op 31-01-2023: </u>  <br> 
-GenericMaskCodes4c= <u> Voorbeeld van product gemaakt op 31-01-2023: </u>  <br> 
+GenericMaskCodes4a= <u> Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2023: </u>  <br>
+GenericMaskCodes4b= <u> Voorbeeld op derde partij gemaakt op 31-01-2023: </u>  <br>
+GenericMaskCodes4c= <u> Voorbeeld van product gemaakt op 31-01-2023: </u>  <br>
 GenericMaskCodes5= <b> ABC{jj}{mm}-{000000} </b>  geeft <b> ABC2301-000099 </b>  <br>  <b> {0000+100@1}-ZZZ/{dd}/XXX </b>  geeft <b> 0199-ZZZ/31/XXX </b>  <br>  <b> IN{jj}{mm}-{0000}-{t} </b>  geeft <b> IN2301-0099-A </b>  als het type bedrijf 'Responsable Inscripto' is met code voor type dat 'A_RI' is
 GenericNumRefModelDesc=Geeft een aanpasbaar nummer volgens een gedefinieerd masker.
 ServerAvailableOnIPOrPort=Server is beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
@@ -1118,7 +1118,7 @@ BackToModuleList=Terug naar modulelijst
 BackToDictionaryList=Terug naar woordenboekenlijst
 TypeOfRevenueStamp=Soort belastingstempel
 VATManagement=Omzetbelastingbeheer
-VATIsUsedDesc=Standaard volgt bij het aanmaken van prospects, Facturen, bestellingen etc. het verkooppercentage belasting de actieve standaardregel:<br>Als de verkoper niet onderworpen is aan Sales belasting, dan wordt Sales belasting standaard ingesteld op 0. Einde van de regel.<br>Als (land van de verkoper = land van de koper), dan is de Verkoop belasting standaard gelijk aan de Verkoop <span klasse ='notranslate'>belasting</span> van het product in het land van de verkoper. Einde van de regel.<br>Als de verkoper en de koper zich beide in de Europese Gemeenschap bevinden en de goederen transportgerelateerde producten zijn (vervoer, verzending, luchtvaartmaatschappij), is de standaard BTW 0. Dit regel is afhankelijk van het land van de verkoper - raadpleeg uw accountant. De BTW moet door de koper worden betaald aan het douanekantoor in zijn land en niet aan de verkoper. Einde van de regel.<br>Als de verkoper en de koper zich beide in de Europese Gemeenschap bevinden en de koper geen bedrijf is (met een geregistreerd intracommunautair BTW-nummer), dan wordt de BTW standaard ingesteld op het BTW-tarief van het land van de verkoper. Einde van de regel.<br>Als de verkoper en de koper zich beide in de Europese Gemeenschap bevinden en de koper een bedrijf is (met een geregistreerd intracommunautair BTW-nummer), dan is de BTW standaard 0. Einde van de regel.<br>In elk ander geval is de voorgestelde standaard Verkoop belasting=0. Einde van de heerschappij.
+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 dependent 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=Standaard is de voorgestelde btw 0. Dit kan gebruikt worden in situaties zoals verenigingen, particulieren of kleine bedrijven.
 VATIsUsedExampleFR=In Frankrijk betekent dit dat bedrijven of organisaties een echt fiscaal systeem hebben (Vereenvoudigd echt of normaal echt). Een systeem waarin btw wordt aangegeven.
 VATIsNotUsedExampleFR=In Frankrijk betekent dit verenigingen die niet-omzetbelasting zijn aangegeven of bedrijven, organisaties of vrije beroepen die hebben gekozen voor het micro-onderneming fiscale systeem (omzetbelasting in franchise) en een franchise omzetbelasting hebben betaald zonder aangifte omzetbelasting. Bij deze keuze wordt de verwijzing "Niet van toepassing omzetbelasting - art-293B van CGI" op facturen weergegeven.
@@ -1197,6 +1197,7 @@ Skin=Thema
 DefaultSkin=Standaard thema
 MaxSizeList=Maximale lijstlengte
 DefaultMaxSizeList=Standaard maximum lengte voor lijsten
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Standaard maximale lengte voor korte lijsten (bijv. In klantenkaart)
 MessageOfDay=Bericht van de dag
 MessageLogin=Bericht op inlogpagina
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Exporteer geen gebeurtenissen ouder dan
 SecurityKey = Veiligheidssleutel
 ##### ClickToDial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
-ClickToDialUrlDesc=URL die wordt aangeroepen wanneer er op het telefoonpictogram wordt geklikt. In de URL kunt u tags <span class='notranslate'><br></span> gebruiken\n  <b> __PHONETO__ </b>  dat wordt vervangen door het telefoonnummer van de te bellen persoon <br>  <b> __PHONEFROM__ </b>  dat wordt vervangen door het telefoonnummer van de bellende persoon (van u) <br>  <b> __LOGIN__ </b>  die zal worden vervangen door clicktodial login (gedefinieerd op gebruikerskaart) <br>  <b> __PASS__ </b>  dat wordt vervangen door het clicktodial-wachtwoord (gedefinieerd op de gebruikerskaart).
+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=Deze module verandert telefoonnummers bij gebruik van een desktopcomputer in klikbare links. Bij een klik zal het nummer gebeld worden. Dit kan worden gebruikt om het telefoongesprek te starten wanneer u een softphone op uw bureaublad gebruikt of wanneer u bijvoorbeeld een CTI-systeem op basis van het SIP-protocol gebruikt. Let op: Bij het gebruik van een smartphone zijn telefoonnummers altijd klikbaar.
 ClickToDialUseTelLink=Gebruik alleen de link "tel:" bij telefoonnummers
 ClickToDialUseTelLinkDesc=Gebruik deze methode als uw gebruikers een softphone of een software-interface hebben, geïnstalleerd op dezelfde computer als de browser, en gebeld wanneer u klikt op een link die begint met "tel:" in uw browser. Als u een link nodig heeft die begint met "sip:" of een volledige serveroplossing (geen lokale software-installatie nodig), moet u deze op "Nee" zetten en het volgende veld invullen.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 8a0e4820a8e..baca7206277 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Lees geplande taak
 Permission23102 = Maak/wijzig geplande taak
 Permission23103 = Verwijder geplande taak
@@ -14,7 +13,7 @@ FileToLaunchCronJobs=Opdrachtregel om gekwalificeerde cron-taken te controleren
 CronExplainHowToRunUnix=In een Unix-omgeving moet u het volgende crontab-item gebruiken om de opdrachtregel elke 5 minuten uit te voeren
 CronExplainHowToRunWin=In een Microsoft (tm) Windows-omgeving kunt u de geplande taakhulpmiddelen gebruiken om de opdrachtregel elke 5 minuten uit te voeren
 CronMethodDoesNotExists=Class%sbevat geen methode%s
-CronMethodNotAllowed=Methode %s van class %s staat op de zwarte lijst met verboden methoden
+CronMethodNotAllowed=Methode %s van klasse %s staat in de blokkeerlijst van verboden methoden
 CronJobDefDesc=Cron-taakprofielen worden gedefinieerd in het modulebeschrijvingsbestand. Wanneer de module is geactiveerd, zijn ze geladen en beschikbaar, zodat u de taken kunt beheren vanuit het menu admin tools %s.
 CronJobProfiles=Lijst met vooraf gedefinieerde cron-functieprofielen
 # Menu
@@ -67,7 +66,7 @@ CronModuleHelp=Naam van Dolibarr-modulemap (werkt ook met externe Dolibarr-modul
 CronClassFileHelp=Het relatieve pad en de bestandsnaam die moet worden geladen (pad is relatief ten opzichte van de hoofdmap van de webserver). <BR> Als u bijvoorbeeld de ophaalmethode van Dolibarr Product-object htdocs / product / class / <u>product.class.php</u> wilt aanroepen, is de waarde voor de klasse bestandsnaam <br> <i>product / class / product.class.php</i>
 CronObjectHelp=De objectnaam die moet worden geladen. <BR> Als u bijvoorbeeld de ophaalmethode van Dolibarr Product-object /htdocs/product/class/product.class.php wilt aanroepen, is de waarde voor de klasse bestandsnaam <br> <i>Product</i>
 CronMethodHelp=De objectmethode om te starten. <BR> Als u bijvoorbeeld de ophaalmethode van Dolibarr Product-object /htdocs/product/class/product.class.php wilt aanroepen, is de waarde voor methode <br> <i>halen</i>
-CronArgsHelp=De methode argumenten. <BR> Om bijvoorbeeld de ophaalmethode van het Dolibarr-productobject /htdocs/product/class/product.class.php aan te roepen, kan de waarde voor paramters zijn <br> <i>0, ProductRef</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 parameters can be<br><i>0, ProductRef</i>
 CronCommandHelp=De te uitvoeren opdrachtregel.
 CronCreateJob=Aanmaken nieuwe geplande taak
 CronFrom=Van
@@ -91,6 +90,7 @@ WarningCronDelayed=Opgelet, voor prestatiedoeleinden, ongeacht de volgende datum
 DATAPOLICYJob=Gegevens opschonen en anonimiseren
 JobXMustBeEnabled=Taak %s moet zijn ingeschakeld
 EmailIfError=E-mail voor waarschuwing bij fout
+JobNotFound=Taak %s niet gevonden in de lijst met taken (probeer de module uit/in te schakelen)
 ErrorInBatch=Fout bij het uitvoeren van de taak %s
 
 # Cron Boxes
diff --git a/htdocs/langs/nl_NL/eventorganization.lang b/htdocs/langs/nl_NL/eventorganization.lang
index 49ecf092cc0..91f493015e3 100644
--- a/htdocs/langs/nl_NL/eventorganization.lang
+++ b/htdocs/langs/nl_NL/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Prijs van registratie
 PriceOfRegistrationHelp=Prijs te betalen om te registreren of deel te nemen aan het evenement
 PriceOfBooth=Abonnementsprijs om een stand te staan
 PriceOfBoothHelp=Abonnementsprijs om een stand te staan
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Koppel ICS voor conferenties
 ConferenceOrBoothInformation=Conferentie- of standinformatie
 Attendees=deelnemers
@@ -173,7 +174,7 @@ DateStartEvent=Startdatum evenement
 DateEndEvent=Einddatum evenement
 ModifyStatus=Status wijzigen
 ConfirmModifyStatus=Bevestig statuswijziging
-ConfirmModifyStatusQuestion=Weet u zeker dat u de <span class='notranslate'>%s</span>\n geselecteerde record(s) wilt wijzigen?
+ConfirmModifyStatusQuestion=Are you sure you want to modify the %s selected record(s)?
 RecordsUpdated = %s Records bijgewerkt
 RecordUpdated = Record bijgewerkt
 NoRecordUpdated = Geen record bijgewerkt
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 6289bfae54a..d1689c7f776 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Totaal incl. BTW
 TotalHT=Totaal (excl. BTW)
 TotalHTforthispage=Totaal (excl. BTW) voor deze pagina
 Totalforthispage=Totaal voor deze pagina
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Totaal (incl. BTW)
 TotalTTCToYourCredit=Totaal (incl. BTW) op uw krediet
 TotalVAT=Totaal BTW
@@ -647,6 +649,7 @@ ReportName=Rapportnaam
 ReportPeriod=Periode-analyse
 ReportDescription=Omschrijving
 Report=Verslag
+Reports=Reports
 Keyword=Trefwoord
 Origin=Origineel
 Legend=Legende
@@ -715,7 +718,7 @@ Owner=Eigenaar
 FollowingConstantsWillBeSubstituted=De volgende constanten worden vervangen met de overeenkomstige waarde.
 Refresh=Vernieuwen
 BackToList=Terug naar het overzicht
-BackToTree=Terug 
+BackToTree=Terug
 GoBack=Ga terug
 CanBeModifiedIfOk=Kan worden gewijzigd indien geldig
 CanBeModifiedIfKo=Kan worden gewijzigd indien ongeldig
@@ -956,7 +959,7 @@ WebSite=Website
 WebSites=Websites
 WebSiteAccounts=Webtoegangsaccounts
 ExpenseReport=Rapportage kosten
-ExpenseReports=Onkostennota's 
+ExpenseReports=Onkostennota's
 HR=HR
 HRAndBank=HR en Bank
 AutomaticallyCalculated=Automatisch berekend
@@ -1070,7 +1073,7 @@ SearchIntoSupplierProposals=Leveranciersvoorstellen
 SearchIntoInterventions=Interventies
 SearchIntoContracts=Contracten
 SearchIntoCustomerShipments=Klantzendingen
-SearchIntoExpenseReports=Onkostennota's 
+SearchIntoExpenseReports=Onkostennota's
 SearchIntoLeaves=Vertrekken
 SearchIntoKM=Kennis basis
 SearchIntoTickets=Tickets
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index df5776e3390..7295eab2adf 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Kan code niet toevoegen aan descriptor. Controleer
 DictionariesCreated=Woordenboek <b> %s </b> succesvol aangemaakt
 DictionaryDeleted=Woordenboek <b> %s </b> succesvol verwijderd
 PropertyModuleUpdated=Property <b>%s</b> is succesvol bijgewerkt
-InfoForApiFile=* Wanneer u voor de eerste keer een bestand genereert, worden alle methoden <strong>voor elk object gemaakt.</strong><br>* Wanneer u in <strong>remove</strong> klikt, verwijdert u gewoon alle methoden voor de <span-klasse ='notranslate'><strong></span>geselecteerd object</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Pagina voor module-instellingen
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=U kunt hier de klasbestanden genereren en bewerken om nieuwe e-maildoelkiezers te bieden voor de module voor massa-e-mailen
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 1294eabd0f2..90fbdd704a0 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -63,7 +63,7 @@ YouCanEditHtmlSourceckeditor=U kunt HTML-broncode bewerken met de knop "Bron" in
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 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>
-YouCanEditHtmlSource3=Om de URL van de afbeelding van een PHP-object te verkrijgen, gebruikt u <br><strong>&lt;&lt;&lt; span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Meer voorbeelden van HTML of dynamische code beschikbaar op <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">de wiki-documentatie</a>.<br>
 ClonePage=Kloon pagina/container
 CloneSite=Klonen site
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index 0aec7ae53c4..10b440d02f9 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -9,7 +9,7 @@ DeleteAction=Usuń wydarzenie
 NewAction=Nowe zdarzenie
 AddAction=Utwórz wydarzenie
 AddAnAction=Utwórz wydarzenie
-AddActionRendezVous=Stwórz umówione spotkanie 
+AddActionRendezVous=Stwórz umówione spotkanie
 ConfirmDeleteAction=Czy jesteś pewien, że chcesz usunąć to wydarzenie?
 CardAction=Karta zdarzenia
 ActionOnCompany=Powiązana firma
@@ -43,7 +43,7 @@ StatusActionInProcess=W trakcie
 TasksHistoryForThisContact=Działania na rzecz tego kontaktu
 LastProspectDoNotContact=Nie kontaktować się
 LastProspectNeverContacted=Nigdy nie skontaktowano
-LastProspectToContact=Do skontaktowania 
+LastProspectToContact=Do skontaktowania
 LastProspectContactInProcess=W trakcie kontaktu
 LastProspectContactDone=Kontakt wykonany
 ActionAffectedTo=Zdarzenie przypisane do
@@ -74,7 +74,7 @@ StatusProsp=Stan oferty
 DraftPropals=Szkic oferty handlowej
 NoLimit=Bez limitu
 ToOfferALinkForOnlineSignature=Link dla podpisu online
-WelcomeOnOnlineSignaturePageProposal=Witamy na stronie, na której można akceptować oferty handlowe od %s
+WelcomeOnOnlineSignaturePageProposal=Witamy na stronie, na której można akceptować wyceny i oferty przygotowane przez %s
 WelcomeOnOnlineSignaturePageContract=Witamy na %s stronie podpisywania umowy w formacie PDF
 WelcomeOnOnlineSignaturePageFichinter=Witamy na %s stronie interwencyjnego podpisywania plików PDF
 WelcomeOnOnlineSignaturePageSociete_rib=Witamy na stronie %s mandatu SEPA na stronie podpisywania plików PDF
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 94f8183d90a..65e7daddd0d 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -300,7 +300,7 @@ ErrorAjaxRequestFailed=Żądanie nie powiodło się
 ErrorThirpdartyOrMemberidIsMandatory=Osoba trzecia lub członek spółki jest obowiązkowa
 ErrorFailedToWriteInTempDirectory=Nie udało się zapisać w katalogu tymczasowym
 ErrorQuantityIsLimitedTo=Ilość jest ograniczona do %s
-ErrorFailedToLoadThirdParty=Nie udało się znaleźć/załadować strony trzeciej z id=%s, email=%s, name=<span class='notranslate'> %s</rozpiętość>
+ErrorFailedToLoadThirdParty=Failed to find/load third party from id=%s, email=%s, name=%s
 ErrorThisPaymentModeIsNotSepa=Ten sposób płatności nie jest kontem bankowym
 ErrorStripeCustomerNotFoundCreateFirst=Klient Stripe nie jest ustawiony dla tej strony trzeciej (lub ma ustawioną wartość usuniętą po stronie Stripe). Najpierw utwórz go (lub dołącz ponownie).
 ErrorCharPlusNotSupportedByImapForSearch=Wyszukiwanie IMAP nie jest w stanie przeszukać nadawcy ani odbiorcy ciągu zawierającego znak +
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 8c2b821d903..3d878cd2d71 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -20,7 +20,7 @@ MailCCC=Kopi w pamięci do
 MailTopic=Temat wiadomości e-mail
 MailText=Wiadomość
 MailFile=Dołączone pliki
-MailMessage=Zawartość emaila 
+MailMessage=Zawartość emaila
 SubjectNotIn=Nie w temacie
 BodyNotIn=Nie w ciele
 ShowEMailing=Pokaż mailingi
@@ -182,7 +182,7 @@ IsAnAnswer=To odpowiedź na pierwszą wiadomość e-mail
 RecordCreatedByEmailCollector=Rekord utworzony przez moduł zbierający wiadomości e-mail %s z wiadomości e-mail %s
 DefaultBlacklistMailingStatus=Domyślna wartość pola „%s” podczas tworzenia nowego kontaktu
 DefaultStatusEmptyMandatory=Puste, ale obowiązkowe
-WarningLimitSendByDay=OSTRZEŻENIE: konfiguracja lub umowa Twojej instancji ogranicza liczbę e-maili dziennie do <b>%s<span class='notranslate' ></b></rozpiętość>. Próba wysłania większej liczby może spowodować spowolnienie lub zawieszenie instancji. Jeśli potrzebujesz większego limitu, skontaktuj się ze swoim wsparciem.
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=Nie ma już odbiorcy, do którego można wysłać wiadomość e-mail
 EmailOptedOut=Właściciel adresu e-mail poprosił o zaprzestanie kontaktowania się z nim za pomocą tego e-maila
 EvenUnsubscribe=Dołącz e-maile dotyczące rezygnacji
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 895aea986bb..67c73f63821 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Ogółem (z VAT)
 TotalHT=Kwota (Bez VAT)
 TotalHTforthispage=Razem (bez podatku) dla tej strony
 Totalforthispage=Suma dla tej strony
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Ogółem (z VAT)
 TotalTTCToYourCredit=Ogółem (z VAT) na twoje konto
 TotalVAT=Razem VAT
@@ -436,7 +438,7 @@ INCVATONLY=Zawiera VAT
 INCT=Zawiera wszystkie podatki
 VAT=Stawka VAT
 VATIN=IGST
-VATs=Podatek od sprzedaży 
+VATs=Podatek od sprzedaży
 VATINs=Zintegrowany podatek od towarów i usług
 LT1=Podatek obrotowy 2
 LT1Type=Rodzaj podatku od sprzedaży 2
@@ -647,6 +649,7 @@ ReportName=Nazwa raportu
 ReportPeriod=Raport z okresu
 ReportDescription=Opis
 Report=Sprawozdanie
+Reports=Raporty
 Keyword=Słowo klucz
 Origin=Pochodzenie
 Legend=Legenda
@@ -703,7 +706,7 @@ SendByMail=Wyślij przez e-mail
 MailSentBy=E-mail został wysłany przez
 MailSentByTo=E-mail wysłany przez %s do %s
 NotSent=Nie wysłał
-TextUsedInTheMessageBody=Zawartość emaila 
+TextUsedInTheMessageBody=Zawartość emaila
 SendAcknowledgementByMail=Wyślij email potwierdzający
 SendMail=Wyślij wiadomość email
 Email=Adres e-mail
@@ -782,7 +785,7 @@ FreeZone=Produkt opisany dowolnym tekstem
 FreeLineOfType=Pozycja opisana dowolnym tekstem, rodzaj:
 CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami
 ReGeneratePDF=Wygeneruj ponownie PDF
-PDFMerge=Scalanie/ dzielenie PDF 
+PDFMerge=Scalanie/ dzielenie PDF
 Merge=Scalanie/ dzielenie
 DocumentModelStandardPDF=Standardowy szablon PDF
 PrintContentArea=Pokaż stronę do wydruku głównej treści
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 37b3e5eefae..f7298b0b958 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -148,7 +148,7 @@ CSSListClass=CSS dla listy
 NotEditable=Nie można edytować
 ForeignKey=Klucz obcy
 ForeignKeyDesc=Jeśli wartość tego pola musi być gwarantowana w innej tabeli. Wprowadź tutaj składnię pasującą do wartości: nazwa tabeli.pole nadrzędne do sprawdzenia
-TypeOfFieldsHelp=Przykład:<br>varchar(99)<br>e-mail<br>telefon<span klasa ='notranslate'><br></span>ip<br>url<br>hasło<br>double(24,8)<br>real<br>text<br>html <br>data<br>datetime<br>znacznik czasu <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' oznacza, że dodajemy przycisk + po kombinacji, aby utworzyć rekord<br>'filtr' to Warunek składni filtra uniwersalnego, przykład: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=To jest typ pola/atrybutu.
 AsciiToHtmlConverter=Konwerter Ascii na HTML
 AsciiToPdfConverter=Konwerter ASCII na PDF
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Nie udało się dodać kodu do deskryptora. Sprawd
 DictionariesCreated=Słownik <b>%s</b> pomyślnie utworzono
 DictionaryDeleted=Słownik <b>%s</b> pomyślnie usunięto
 PropertyModuleUpdated=Właściwość <b>%s</b> została pomyślnie zaktualizowana
-InfoForApiFile=* Kiedy wygenerujesz plik po raz pierwszy, wszystkie metody zostaną utworzone <strong>dla każdego obiektu.</strong><br>* Klikając <strong>usuń</strong>, po prostu usuwasz wszystkie metody dla klasy <span ='notranslate'><strong></span>wybrany obiekt</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Strona konfiguracji modułu
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=You can generate and edit here the class files to provide new email target selectors for the mass emailing module
diff --git a/htdocs/langs/pl_PL/partnership.lang b/htdocs/langs/pl_PL/partnership.lang
index 4093f760713..23511a1c18c 100644
--- a/htdocs/langs/pl_PL/partnership.lang
+++ b/htdocs/langs/pl_PL/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Liczba błędów podczas ostatniego sprawdzania adresu UR
 LastCheckBacklink=Data ostatniego sprawdzenia adresu URL
 
 NewPartnershipRequest=Nowa prośba o partnerstwo
-NewPartnershipRequestDesc=Za pomocą tego formularza możesz złożyć wniosek o przyłączenie się do jednego z naszych programów partnerskich. Jeśli potrzebujesz pomocy w wypełnieniu tego formularza, skontaktuj się z nami e-mailem <b>%s<span class='notranslate'></b></ rozpiętość>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Ta strona musi zawierać co najmniej jeden link do jednej z następujących domen: %s
 
 IPOfApplicant=Adres IP wnioskodawcy
-
diff --git a/htdocs/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
index 63c2dd530ee..0240d745597 100644
--- a/htdocs/langs/pl_PL/paypal.lang
+++ b/htdocs/langs/pl_PL/paypal.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal konfiguracji modułu
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
+PaypalDesc=Moduł ten umożliwia dokonywanie płatności przez klientów za pośrednictwem <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a>. Można to wykorzystać do płatności ad hoc lub płatności związanej z obiektem Dolibarr (faktura, zamówienie, ...)
+PaypalOrCBDoPayment=Zapłać za pomocą PayPal (karta lub PayPal)
+PaypalDoPayment=Zapłać z PayPal-em
 PAYPAL_API_SANDBOX=Tryb testu / sandbox
 PAYPAL_API_USER=API użytkownika
 PAYPAL_API_PASSWORD=API hasło
 PAYPAL_API_SIGNATURE=Podpis API
 PAYPAL_SSLVERSION=Wersja Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferuj płatność „integralną” (karta kredytowa + PayPal) lub tylko „PayPal”
 PaypalModeIntegral=Integralny
 PaypalModeOnlyPaypal=Tylko PayPal
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Opcjonalny adres URL arkusza stylów CSS na stronie płatności online
 ThisIsTransactionId=Jest to id transakcji: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
+PAYPAL_ADD_PAYMENT_URL=Wysyłając dokument pocztą e-mail, dołącz adres URL płatności PayPal
 NewOnlinePaymentReceived=Otrzymano nową płatność online
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+NewOnlinePaymentFailed=Nowa płatność online została podjęta, ale nie powiodła się
+ONLINE_PAYMENT_SENDEMAIL=Adres e-mail do powiadomień po każdej próbie płatności (w przypadku sukcesu i niepowodzenia)
 ReturnURLAfterPayment=Zwróć adres URL po dokonaniu płatności
 ValidationOfOnlinePaymentFailed=Niepowodzenie potwierdzenia płatności online
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Strona potwierdzenia płatności została wywołana przez system płatności zwróciła błąd
 SetExpressCheckoutAPICallFailed=Wywołanie API poprzez SetExpressCheckout nie powiodło się
 DoExpressCheckoutPaymentAPICallFailed=Wywołanie API poprzez DoExpressCheckoutPayment nie powiodło się.
 DetailedErrorMessage=Szczegółowa informacja o błędzie
@@ -27,10 +27,11 @@ ShortErrorMessage=Krotka informacja o błędzie
 ErrorCode=Kod błędu
 ErrorSeverityCode=Kod ważności błędu
 OnlinePaymentSystem=System płatności online
-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
+PaypalLiveEnabled=Tryb „na żywo” PayPal włączony (w przeciwnym razie tryb testowy / piaskownicy)
+PaypalImportPayment=Importuj płatności PayPal
+PostActionAfterPayment=Opublikuj akcje po dokonaniu płatności
+ARollbackWasPerformedOnPostActions=Wszystkie akcje związane z wpisem zostały wycofane. Jeśli to konieczne, musisz ręcznie wykonać czynności związane z publikowaniem.
+ValidationOfPaymentFailed=Weryfikacja płatności nie powiodła się
+CardOwner=Posiadacz karty
+PayPalBalance=Kredyt PayPal
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 458ae7aecb9..289d62beeb1 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Zaawansowany transfer zapasów
 ModuleStockTransferDesc=Zaawansowane zarządzanie przesunięciami magazynowymi z generowaniem arkusza przeniesień
 StockTransferNew=Nowy transfer akcji
 StockTransferList=Lista transferów akcji
-ConfirmValidateStockTransfer=Czy na pewno chcesz zatwierdzić ten transfer zapasów za pomocą referencji <b>%s<span class='notranslate'></b></ rozpiętość>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Zmniejszenie zapasów wraz z przeniesieniem %s
 ConfirmDestockCancel=Anuluj zmniejszenie zapasów poprzez przeniesienie %s
 DestockAllProduct=Zmniejszenie zapasów
diff --git a/htdocs/langs/pt_AO/errors.lang b/htdocs/langs/pt_AO/errors.lang
deleted file mode 100644
index c07bad2b19c..00000000000
--- a/htdocs/langs/pt_AO/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
diff --git a/htdocs/langs/pt_AO/holiday.lang b/htdocs/langs/pt_AO/holiday.lang
deleted file mode 100644
index 254b07b0308..00000000000
--- a/htdocs/langs/pt_AO/holiday.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - holiday
-MenuCollectiveAddCP=New collective leave
-NewHolidayForGroup=New collective leave
-SendRequestCollectiveCP=Create collective leave
diff --git a/htdocs/langs/pt_AO/languages.lang b/htdocs/langs/pt_AO/languages.lang
deleted file mode 100644
index 879813b70ad..00000000000
--- a/htdocs/langs/pt_AO/languages.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_en_AE=English (United Arab Emirates)
diff --git a/htdocs/langs/pt_AO/modulebuilder.lang b/htdocs/langs/pt_AO/modulebuilder.lang
deleted file mode 100644
index 23cb0d02f7a..00000000000
--- a/htdocs/langs/pt_AO/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
diff --git a/htdocs/langs/pt_AO/partnership.lang b/htdocs/langs/pt_AO/partnership.lang
deleted file mode 100644
index 6a2455e0302..00000000000
--- a/htdocs/langs/pt_AO/partnership.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - partnership
-ReasonDeclineOrCancel=Reason for refusal or cancellation
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 6e15a2c0401..0b4d4b0f3fe 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -472,7 +472,6 @@ Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
 Module6000Name=Fluxo de trabalho entre módulos
 Module6000Desc=Gerenciamento de fluxo de trabalho entre diferentes módulos (criação automática de objeto e / ou mudança automática de status)
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Deixar o gerenciamento de solicitações
 Module20000Desc=Definir e rastrear solicitações de saída de funcionários
 Module39000Name=Lotes de Produtos
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index 37206bdb2a3..0c352531cc3 100644
--- a/htdocs/langs/pt_BR/modulebuilder.lang
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -8,7 +8,6 @@ ModuleBuilderDeschooks=Esta aba é dedicada aos ganchos.
 ModuleBuilderDescwidgets=Esta aba é dedicada a gerenciar / construir widgets.
 ModuleBuilderDescbuildpackage=Você pode gerar aqui um arquivo de pacote "pronto para distribuir" (um arquivo .zip normalizado) do seu módulo e um arquivo de documentação "pronto para distribuir". Basta clicar no botão para criar o pacote ou arquivo de documentação.
 EnterNameOfModuleToDeleteDesc=Você pode excluir seu módulo. AVISO: Todos os arquivos de codificação do módulo (gerados ou criados manualmente) e dados estruturados e documentação serão apagados!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 BuildDocumentation=Documentação de compilação
 ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode interromper um recurso atual ao vivo.
 DescriptionLong=Longa descrição
diff --git a/htdocs/langs/pt_BR/zapier.lang b/htdocs/langs/pt_BR/zapier.lang
index a1150fab1bc..16991cc5822 100644
--- a/htdocs/langs/pt_BR/zapier.lang
+++ b/htdocs/langs/pt_BR/zapier.lang
@@ -2,4 +2,3 @@
 ModuleZapierForDolibarrName =Zapier para Dolibarr
 ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
 ZapierForDolibarrSetup=Configurações do Zapier para Dolibarr
-ZapierDescription=Interface com Zapier
diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang
index cb71d41b386..b13c12e4765 100644
--- a/htdocs/langs/pt_MZ/admin.lang
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -457,7 +457,6 @@ Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
 Module6000Name=Fluxo de trabalho entre módulos
 Module6000Desc=Gerenciamento de fluxo de trabalho entre diferentes módulos (criação automática de objeto e / ou mudança automática de status)
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (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=Deixar o gerenciamento de solicitações
 Module20000Desc=Definir e rastrear solicitações de saída de funcionários
 Module39000Name=Lotes de Produtos
diff --git a/htdocs/langs/pt_MZ/modulebuilder.lang b/htdocs/langs/pt_MZ/modulebuilder.lang
index 37206bdb2a3..0c352531cc3 100644
--- a/htdocs/langs/pt_MZ/modulebuilder.lang
+++ b/htdocs/langs/pt_MZ/modulebuilder.lang
@@ -8,7 +8,6 @@ ModuleBuilderDeschooks=Esta aba é dedicada aos ganchos.
 ModuleBuilderDescwidgets=Esta aba é dedicada a gerenciar / construir widgets.
 ModuleBuilderDescbuildpackage=Você pode gerar aqui um arquivo de pacote "pronto para distribuir" (um arquivo .zip normalizado) do seu módulo e um arquivo de documentação "pronto para distribuir". Basta clicar no botão para criar o pacote ou arquivo de documentação.
 EnterNameOfModuleToDeleteDesc=Você pode excluir seu módulo. AVISO: Todos os arquivos de codificação do módulo (gerados ou criados manualmente) e dados estruturados e documentação serão apagados!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
 BuildDocumentation=Documentação de compilação
 ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode interromper um recurso atual ao vivo.
 DescriptionLong=Longa descrição
diff --git a/htdocs/langs/pt_MZ/zapier.lang b/htdocs/langs/pt_MZ/zapier.lang
index a1150fab1bc..16991cc5822 100644
--- a/htdocs/langs/pt_MZ/zapier.lang
+++ b/htdocs/langs/pt_MZ/zapier.lang
@@ -2,4 +2,3 @@
 ModuleZapierForDolibarrName =Zapier para Dolibarr
 ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
 ZapierForDolibarrSetup=Configurações do Zapier para Dolibarr
-ZapierDescription=Interface com Zapier
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 21d86242c44..5ea0dfb07f1 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -95,7 +95,7 @@ AccountancyAreaDescClosePeriod=ETAPA %s: feche o período para que não possamos
 
 TheFiscalPeriodIsNotDefined=Uma etapa obrigatória na configuração não foi concluída (o período fiscal não está definido)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Uma etapa obrigatória na configuração não foi concluída (Contabilista Código diário não definido para todas as contas bancárias)
-Selectchartofaccounts=Selecione gráfico de contas ativo 
+Selectchartofaccounts=Selecione gráfico de contas ativo
 CurrentChartOfAccount=Gráfico ativo atual de conta
 ChangeAndLoad=Mudar e carregar
 Addanaccount=Adicione uma conta contabilística
@@ -397,7 +397,7 @@ ChartofaccountsId=ID de plano de contas
 ## Tools - Init accounting account on product / service
 InitAccountancy=Iniciar contabilidade
 InitAccountancyDesc=Essa página pode ser usada para inicializar uma conta contábil em produtos e serviços que não tenham uma conta contábil definida para vendas e compras.
-DefaultBindingDesc=Esta página pode ser usada para definir as contas padrão (do gráfico de conta) a serem usadas em objetos de negócios hiperligação, conexão com um conta, como pagamento de salários, doações, impostos e IVA, quando não há <span class='notranslate'>conta</span específico > já estavam definidos.
+DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
 DefaultClosureDesc=Esta página pode ser usada para definir parâmetros usados para fechamentos Contabilista.
 Options=Opções
 OptionModeProductSell=Modo de vendas
@@ -422,7 +422,7 @@ AccountRemovedFromGroup=conta removido do grupo
 SaleLocal=Venda local
 SaleExport=Venda de exportação
 SaleEEC=Venda em EEC
-SaleEECWithVAT=Venda em EEC com IVA não nulo, então supomos que esta NÃO seja uma venda intracomunitária e a <span class=' sugerida notranslate'>conta</span> é o produto padrão conta.
+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=Venda em EEC sem IVA, mas o IVA Id. de terceiros não está definido. Recorremos ao conta para vendas padrão. Você pode corrigir o IVA Id. do terceiro ou alterar o produto conta sugerido para vinculação, se necessário.
 ForbiddenTransactionAlreadyExported=Proibido: a transação foi validada e/ou exportada.
 ForbiddenTransactionAlreadyValidated=Proibido: A transação foi validada.
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index c9e4482b07a..4955b3db094 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -465,7 +465,7 @@ ExtrafieldParamHelpselect=Lista de valores devem ser linhas com chave de formato
 ExtrafieldParamHelpcheckbox=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0') <br> <br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br>19bz3, valor3
 ExtrafieldParamHelpradio=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0') <br> <br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br>19bz3, valor3
 ExtrafieldParamHelpsellist=A lista de valores vem de uma tabela<br>Sintaxe: table_name:label_field: id_field::filtersql<br>Exemplo: c_typent:libelle:Id.::filtersql<br><br>- id_field é necessariamente uma chave int primária<br>- filtersql é uma condição SQL. Pode ser um teste simples (por exemplo, active=1) para exibir apenas o valor ativo<br>Você também pode usar $Id.$ em filtro que é o Id. atual do objeto atual<br>Para usar um SELECT no filtro, use a palavra-chave $SEL$ para ignorar o anti -proteção contra injeção.<br>se você deseja filtrar campos extras, use a sintaxe extra.fieldcode=... (onde o campo Código é o Código do campo extra)<br><br>Em encomenda para ter a lista dependendo de outra lista de atributos complementares:<br>c_typent:libelle:Id.:options_ <i>  PANTER_LIST_CODE  </i>  Parent_Column  BS0582FAFE CFDA19BZ0 <br>Em encomenda para ter a lista dependendo de outra lista:<br>c_typent:libelle:Id.:<i>parent_list_code</i>|parent_column:filtro
-ExtrafieldParamHelpchkbxlst=A lista de valores vem de uma tabela<br>Sintaxe: table_name:label_field: id_field::filtersql<br>Exemplo: c_typent:libelle:Id.::filtersql<br><br>o filtro pode ser um teste simples (por exemplo, active=1 ) para exibir apenas o valor ativo<br>Você também pode usar $Id.$ no filtro que é o <span class='notranslate atual '>Id.</span> do objeto atual<br>Para fazer um SELECT no filtro use $SEL$<br>se desejar filtrar em campos extras use a sintaxe extra.fieldcode=... (onde o campo Código é o Código do campo extra)<br><br>Em encomenda para ter a lista dependendo de outra lista de atributos complementares:<br>c_typent:libelle: Id.:options_<i>parent_list_code</i> |parent_column:filtro <br><br>Em encomenda para ter a lista dependendo de outra lista:<br>c_typent:libelle:Id.:<i>parent_list_code</i>|parent_column:filtro
+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=Os parâmetros devem ser ObjectName:Classpath<br>Sintaxe: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Mantenha vazio para um separador simples<br>Defina como 1 para um separador recolhível (abrir por padrão para uma nova sessão, então o status é mantido para cada sessão utilizador)<br>Defina como 2 para um separador recolhido (recolhido por padrão para uma nova sessão, então o status é mantido antes de cada sessão utilizador)
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
@@ -543,7 +543,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=O diretoria genérico privado é um WebDAV diretori
 DAV_ALLOW_PUBLIC_DIR=Ative o público genérico diretoria (WebDAV dedicado diretoria chamado "public" - não é necessário fazer login)
 DAV_ALLOW_PUBLIC_DIRTooltip=O público genérico diretoria é um WebDAV diretoria que qualquer pessoa pode acessar (em leitura e modo de gravação), sem necessidade de autorização (login/senha conta).
 DAV_ALLOW_ECM_DIR=Habilite o diretoria privado do DMS/ECM (raiz diretoria do DMS/ECM módulo - login necessário)
-DAV_ALLOW_ECM_DIRTooltip=A raiz diretoria onde todos os arquivos são manualmente carregados ao usar o DMS/ECM <span class='notranslate'>módulo</ intervalo>. Da mesma forma que o acesso pela interface web, você precisará de um login/senha válido com permissões adequadas para acessá-lo.
+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 adequate permissions to access it.
 ##### Modules #####
 Module0Name=Utilizadores e Grupos
 Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
@@ -1197,6 +1197,7 @@ Skin=Tema
 DefaultSkin=Tema predefinido
 MaxSizeList=Tamanho máximo da lista
 DefaultMaxSizeList=Tamanho máximo predefinido para listas
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Comprimento máximo padrão para listas curtas (ou seja, no cartão do cliente)
 MessageOfDay=Mensagem do día
 MessageLogin=Mensagem da página de inicio de sessão
@@ -1953,7 +1954,7 @@ Format=Formato
 TypePaymentDesc=0:cliente tipo de pagamento, 1:Fornecedor, Vendedor tipo de pagamento, 2:Ambos clientes e forma de pagamento de fornecedores
 IncludePath=Caminho para o dirétorio "include" (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas"
-TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa 
+TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa
 ExpenseReportsRulesSetup=Configuração do módulo Relatórios de despesas - Regras
 ExpenseReportNumberingModules=Módulo de numeração de relatórios de despesas
 NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 20e6bd23664..ea7e9ae0ae4 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -292,7 +292,7 @@ ErrorNotApproverForHoliday=Você não é o aprovador da licença %s
 ErrorAttributeIsUsedIntoProduct=Este atributo é usado em uma ou mais variantes de produto
 ErrorAttributeValueIsUsedIntoProduct=Este valor de atributo é usado em uma ou mais variantes de produto
 ErrorPaymentInBothCurrency=Erro, todos os valores devem ser inseridos na mesma coluna
-ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Você tenta pagar faturas na moeda %s de um conta com a moeda <span class='notranslate'>%s</ período>
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=You try to pay invoices in the currency %s from an account with the currency %s
 ErrorInvoiceLoadThirdParty=Não é possível carregar objeto de terceiros para fatura "%s"
 ErrorInvoiceLoadThirdPartyKey=Chave de terceiros "%s" não definida para fatura "%s"
 ErrorDeleteLineNotAllowedByObjectStatus=A linha eliminar, apagar não é permitida pelo status atual do objeto
@@ -313,7 +313,7 @@ ErrorTooMuchFileInForm=Muitos arquivos em formulário, o número máximo é %s f
 ErrorSessionInvalidatedAfterPasswordChange=A sessão foi invalidada após uma alteração de senha, e-mail, status ou datas de validade. Faça login novamente.
 ErrorExistingPermission = Permissão <b>%s</b> para o objeto  <b>%s</b> já existe
 ErrorFieldExist=O valor de <b>%s</b> já existe
-ErrorEqualModule=módulo inválido em <b>%s</b> 
+ErrorEqualModule=módulo inválido em <b>%s</b>
 ErrorFieldValue=O valor de <b>%s</b> está incorreto
 ErrorCoherenceMenu=<b>%s</b> é obrigatório quando  <b>%s</b> é 'esquerda'
 ErrorUploadFileDragDrop=Ocorreu um erro enquanto o(s) ficheiro(s) enviar
diff --git a/htdocs/langs/pt_PT/eventorganization.lang b/htdocs/langs/pt_PT/eventorganization.lang
index 30661ca3ca8..cb1e48d1d32 100644
--- a/htdocs/langs/pt_PT/eventorganization.lang
+++ b/htdocs/langs/pt_PT/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Preço da inscrição
 PriceOfRegistrationHelp=Preço a pagar para se inscrever ou participar do evento
 PriceOfBooth=Preço da assinatura para ficar em um estande
 PriceOfBoothHelp=Preço da assinatura para ficar em um estande
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=hiperligação, conexão ICS para conferências
 ConferenceOrBoothInformation=Informações sobre conferência ou estande
 Attendees=Participantes
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 9ae12d61cc5..a05f4406b12 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -72,7 +72,7 @@ FieldsTarget=Domínios orientados
 FieldTarget=Campo alvo
 FieldSource=Campo da Fonte
 NbOfSourceLines=Número de linhas no arquivo de origem
-NowClickToTestTheImport=verificar que o formato ficheiro (campo e delimitadores de string) do seu verificar span class='notranslate'>ficheiro</span> corresponde às opções mostradas e que você omitiu a linha do cabeçalho ou serão sinalizadas como erros na simulação a seguir.<br>Clique em "<b>%s </b>" para executar um verificar da ficheiro estrutura/conteúdo e  simula o processo de importação.<br><b>Nenhum dado será alterado em seu banco de dados</b>.
+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=Executar Simulação de Importação
 FieldNeedSource=Este campo requer dados do ficheiro fonte
 SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de dados de arquivo
@@ -95,7 +95,7 @@ NbOfLinesImported=Número de linhas de importados com sucesso: <b>%s.</b>
 DataComeFromNoWhere=Valor para inserir vem do nada no arquivo fonte.
 DataComeFromFileFieldNb=O valor a ser inserido vem da coluna <b>%s</b> na fonte ficheiro.
 DataComeFromIdFoundFromRef=O valor que vem da fonte ficheiro será usado para encontrar o Id. do origem, fonte  objeto a ser usado (portanto, o objeto <b>%s</b> que tem a referência da fonte ficheiro deve existir no banco de dados).
-DataComeFromIdFoundFromCodeId=O valor de Código que vem da fonte ficheiro será usado para encontrar o Id. do objeto origem, fonte a ser usado (portanto, o Código da fonte ficheiro deve existir no dicionário <b>%s</b>). Observe que se você conhece o Id., também pode usá-lo na fonte ficheiro em vez do <span class='notranslate' '>Código</span>. A importação deve funcionar em ambos os casos.
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=Dados provenientes de arquivo de origem será inserido no seguinte campo:
 DataIDSourceIsInsertedInto=O Id. do objeto origem, fonte, que foi encontrado usando os dados na fonte ficheiro, será inserido no seguinte campo:
 DataCodeIDSourceIsInsertedInto=O Id. da linha origem, fonte, que foi encontrada em Código, será ser inserido no seguinte campo:
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 278d821fc7f..cd2f1779f44 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Total (IVA inc.)
 TotalHT=Total (excl. IVA)
 TotalHTforthispage=Total desta página (excl. IVA)
 Totalforthispage=Total para esta página
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Total (IVA inc.)
 TotalTTCToYourCredit=Total (IVA inc.) a crédito
 TotalVAT=Total do IVA
@@ -647,6 +649,7 @@ ReportName=Nome do Relatório
 ReportPeriod=Periodo de análise
 ReportDescription=Descrição
 Report=Relatório
+Reports=Relatórios
 Keyword=Palavra-chave
 Origin=Origem
 Legend=Legenda
@@ -787,7 +790,7 @@ Merge=Junção
 DocumentModelStandardPDF=Modelo PDF padrão
 PrintContentArea=Visualizar página para impressão área de conteúdo principal
 MenuManager=Gestão do menu
-WarningYouAreInMaintenanceMode=Atenção, você  está em modo de manutenção: Só o login <b>%s</b> está autorizado a usar a aplicação neste modo. 
+WarningYouAreInMaintenanceMode=Atenção, você  está em modo de manutenção: Só o login <b>%s</b> está autorizado a usar a aplicação neste modo.
 CoreErrorTitle=Erro de sistema
 CoreErrorMessage=Ocorreu um erro. Contacte o seu administrador do sistema de forma a que este proceda à análise do relatórios ou desative a opção $dolibarr_main_prod=1 para obter mais informação.
 CreditCard=Cartão de crédito
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 0613dc76592..debcd70bc81 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
-OrderExists=Um encomenda já estava abrir vinculado a este orçamento, então nenhum outro orçamento span class='notranslate'>encomenda</span> foi criado automaticamente
+OrderExists=An order was already open linked to this proposal, so no other order was created automatically
 OrdersArea=Área de encomendas de clientes
 SuppliersOrdersArea=Área de encomendas de compra
 OrderCard=Ficha da encomenda
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 73c49ca53ed..367470eeccd 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Falha ao enviar o ficheiro <b> %s</b>.
 AddFolder=Criar pasta
 FileWasCreateFolder=A pasta <b>%s</b> foi criada
 FTPFailedToCreateFolder=Falha ao criar a pasta <b>%s</b>.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index da213a9e84a..53f27605ad7 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -433,4 +433,6 @@ ModifyValueExtrafields = modificar valor de um campo extra
 OrProductsWithCategories=Ou produtos com tags/Categorias
 WarningTransferBatchStockMouvToGlobal = Caso queira desserializar este produto, todo o seu estoque serializado será transformado em estoque global
 WarningConvertFromBatchToSerial=Se você atualmente possui uma quantidade maior ou igual a 2 para o produto, mudar para esta opção significa que você ainda terá um produto com objetos diferentes do mesmo lote (embora queira um número de série exclusivo). A duplicata permanecerá até que um inventário ou estoque manual movimento para corrigir isso seja feito.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Tem a certeza que pretende retornar ao status Rascunho?<br>As quantidades atualmente definidas no inventário serão redefinidas.
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index b9d0189c79f..cbd904745c9 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -115,7 +115,7 @@ ListTaskTimeForTask=Lista de tempo gasto na tarefa
 ActivityOnProjectToday=Atividade de hoje no projeto
 ActivityOnProjectYesterday=Atividade de ontem no projeto
 ActivityOnProjectThisWeek=Atividade da semana no projeto
-ActivityOnProjectThisMonth=Atividades do mês no projeto 
+ActivityOnProjectThisMonth=Atividades do mês no projeto
 ActivityOnProjectThisYear=Atividade do ano no projeto
 ChildOfProjectTask=Sub projeto/tarefa
 ChildOfTask=Sub tarefa
@@ -214,7 +214,7 @@ TasksAssignedTo=Tarefas atribuídas a
 AssignTaskToMe=Atribuir tarefa para mim mesmo
 AssignTaskToUser=Atribuir tarefa a %s
 SelectTaskToAssign=Selecione a tarefa para atribuir ...
-AssignTask=Atribuir 
+AssignTask=Atribuir
 ProjectOverview=Resumo
 ManageTasks=Use projetos para monitorar tarefas e / ou relatar o tempo gasto (tabelas de tempos)
 ManageOpportunitiesStatus=Usar projetos para seguir potenciais/oportunidades
@@ -246,7 +246,7 @@ OppStatusLOST=Perdido
 Budget=Orçamento
 AllowToLinkFromOtherCompany=Permitir hiperligação, conexão um elemento com um projeto de outra empresa<br><br><u>Valores suportados:</u><br>- Manter vazio: pode hiperligação, conexão elementos com qualquer projeto no mesmo empresa, companhia (padrão)<br>- "all": Pode hiperligação, conexão elementos com qualquer projeto, até mesmo projetos de outras empresas<br>- Uma lista de IDs de terceiros separados por vírgulas: podem hiperligação, conexão elementos com quaisquer projetos desses terceiros (Exemplo: 123,4795,53) <br>
 LatestProjects=Últimos projetos %s
-LatestModifiedProjects=Últimos %s projetos modificados 
+LatestModifiedProjects=Últimos %s projetos modificados
 OtherFilteredTasks=Outras tarefas filtradas
 NoAssignedTasks=Nenhuma tarefa atribuída encontrada (atribua projetos/tarefas ao utilizador atual na caixa de seleção superior para inserir o tempo nele)
 ThirdPartyRequiredToGenerateIntervention=Um terceiro deve ser definido no projeto para poder criar intervensão.
@@ -289,7 +289,7 @@ ProfitIsCalculatedWith=O lucro é calculado usando
 AddPersonToTask=Adicione também às tarefas
 UsageOrganizeEvent=Uso: Organização de Eventos
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classificar o projeto como encerrado quando todas as suas tarefas forem concluídas (100%% progresso)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Observação: projetos existentes com todas as tarefas já definidas para um progresso de 100%% não serão afetados: você terá que fechá-los manualmente</ intervalo>. Esta opção afeta apenas projetos <span class='notranslate'>abrir.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
 SelectLinesOfTimeSpentToInvoice=Selecione as linhas de tempo gasto que não são faturadas e, em seguida, execute a ação em massa "Gerar fatura" para cobrá-las
 ProjectTasksWithoutTimeSpent=Tarefas do projeto sem perda de tempo
 FormForNewLeadDesc=Obrigado por preencher o seguinte formulário para entrar em contato conosco. Você também pode nos enviar um e-mail diretamente para <b>%s</b>.
diff --git a/htdocs/langs/pt_PT/resource.lang b/htdocs/langs/pt_PT/resource.lang
index b5980757000..22854f9e425 100644
--- a/htdocs/langs/pt_PT/resource.lang
+++ b/htdocs/langs/pt_PT/resource.lang
@@ -5,7 +5,7 @@ DeleteResource=Apagar recurso
 ConfirmDeleteResourceElement=Confirme apagar o recurso para este elemento
 NoResourceInDatabase=Nenhum recurso na base de dados
 NoResourceLinked=Nenhum recurso interligado
-
+ActionsOnResource=Eventos sobre este recurso
 ResourcePageIndex=Lista de recursos
 ResourceSingular=Recurso
 ResourceCard=Ficha do recurso
@@ -34,3 +34,8 @@ IdResource=ID do recurso
 AssetNumber=Número de série
 ResourceTypeCode=Código do tipo de recurso
 ImportDataset_resource_1=Recursos
+
+ErrorResourcesAlreadyInUse=Alguns recursos estão em uso
+ErrorResourceUseInEvent=%s usado no evento %s
+
+MaxUsers=Maximum users (places, seats, etc.)
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 3c58179a72c..c2bde408375 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -174,7 +174,7 @@ NoPendingReceptionOnSupplierOrder=Nenhum receção pendente devido à compra de
 ThisSerialAlreadyExistWithDifferentDate=Este lote / número de série (<strong> %s </ strong>) já existe, mas com data diferente de eatby ou sellby (encontrado <strong> %s </ strong>, mas você insere <strong> %s </ strong>).
 OpenAnyMovement=abrir (todos movimento)
 OpenInternal=abrir (somente movimento interno)
-UseDispatchStatus=Use um status de envio (Aprovar/refuse) para linhas de produtos na compra encomenda <span class='notranslate'>receção</ período>
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=A opção "vários preços por segmento" está ativada. Isso significa que um produto tem vários preços de venda, portanto, o valor para venda não pode ser calculado
 ProductStockWarehouseCreated=Limite de estoque para estoque ideal de alerta e desejado criado corretamente
 ProductStockWarehouseUpdated=Limite de estoque para estoque ótimo de alerta e desejado atualizado corretamente
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index ec6ee64bf7b..8cf5e186f9b 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -72,7 +72,7 @@ ExportDataset_user_1=Utilizadores e as suas propriedades
 DomainUser=Utilizador de Domínio %s
 Reactivate=Reativar
 CreateInternalUserDesc=Este formulário permite que você crie um utilizador interno em sua empresa, companhia/organização . Para criar um utilizador externo (cliente, Fornecedor, Vendedor etc..) , use o botão 'Criar Dolibarr utilizador' do cartão de contato desse terceiro.
-InternalExternalDesc=Um <b></b> utilizador interno é um utilizador que faz parte da sua empresa, companhia/organização ou é um parceiro utilizador fora da sua organização que pode precisa ver mais dados do que dados relacionados ao seu empresa, companhia (o sistema de permissão definirá o que ele pode ou não ver ou fazer).<br> Uma <b></b>externa utilizador é uma cliente, Fornecedor, Vendedor ou outro que deva visualizar APENAS dados relacionados a si mesmo (Criando um utilizador</span externo > para terceiros pode ser feito a partir do registro de contato do terceiro).<span class='notranslate'><br><br>Em ambos os casos, você deve conceder permissões nos recursos que o utilizador precisa.
+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=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador.
 Inherited=Herdado
 UserWillBe=utilizador criado será
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index e0e41e99f49..6b508da28d4 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -54,7 +54,7 @@ ReadPerm=Ler
 WritePerm=Escrever
 TestDeployOnWeb=Testar/implantar na web
 PreviewSiteServedByWebServer=<u> Pré-visualize %s num novo separador. </ u> <br> <br> O %s será servido por um servidor Web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL fornecida pelo servidor externo: <br> <strong> %s </ strong>
-PreviewSiteServedByDolibarr=<u>Visualize %s em uma nova guia.</u><br><br>O %s será servido pelo servidor Dolibarr, portanto não precisa de nenhum servidor web extra (como Apache, Nginx, IIS) a serem instalados.<br>O inconveniente é que os URLs das páginas não são utilizador amigáveis e comece com o caminho do seu Dolibarr.<br>URL servido por Dolibarr: <br><strong>%s</strong><br><br>Para usar seu próprio servidor web externo para servir este site, crie um <span class='notranslate virtual '>anfitrião, hospedeiro</span> em seu servidor web que aponta para o diretório<br><strong>%s </strong><br>em seguida, insira o nome deste servidor virtual nas propriedades deste Site da Web e clique em hiperligação, conexão "Testar/Implantar na web".
+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 do host virtual servido pelo servidor da web externo não definido
 NoPageYet=Ainda sem páginas
 YouCanCreatePageOrImportTemplate=Você pode criar uma nova página ou importar um modelo de site completo
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index e12911f78d8..039660b3dc1 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -159,10 +159,10 @@ InfoTransData=Valor: %s <br> Metode: %s <br> Data: %s
 InfoRejectSubject=Pedido de pagamento por débito direto recusado
 InfoRejectMessage=Olá, <br> <br> a ordem de pagamento de débito directo da factura  %s relacionada com a empresa %s, com uma quantidade de %s foi recusada pelo banco. <br> <br> <br> <br>%s
 ModeWarning=Opção para o modo real não foi definido, nós paramos depois desta simulação
-ErrorCompanyHasDuplicateDefaultBAN=empresa, companhia com Id. %s tem mais de um <span class=' padrão notranslate'>conta bancária</span>. Não há como saber qual usar.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=ICS ausente em conta bancária %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=A quantidade total de Débito direto encomenda difere da soma das linhas
-WarningSomeDirectDebitOrdersAlreadyExists=Aviso: já existem alguns pedidos pendentes de Débito direto (%s) solicitados no valor de %s 
+WarningSomeDirectDebitOrdersAlreadyExists=Aviso: já existem alguns pedidos pendentes de Débito direto (%s) solicitados no valor de %s
 WarningSomeCreditTransferAlreadyExists=Aviso: já existem algumas transferências de crédito pendentes (%s) solicitadas no valor de %s
 UsedFor=Usado para %s
 Societe_ribSigned=Mandato SEPA assinado
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Salários aguardando pagamento por transferência bancári
 RefSalary=Salário
 NoSalaryInvoiceToWithdraw=Nenhum salário esperando por um '%s'. Acesse a aba '%s' no cartão de salário para fazer uma solicitação.
 SalaryInvoiceWaitingWithdraw=Salários aguardando pagamento por transferência bancária
-
diff --git a/htdocs/langs/pt_PT/zapier.lang b/htdocs/langs/pt_PT/zapier.lang
index da5156793a5..08637594d5e 100644
--- a/htdocs/langs/pt_PT/zapier.lang
+++ b/htdocs/langs/pt_PT/zapier.lang
@@ -16,6 +16,6 @@
 ModuleZapierForDolibarrName = Zapier for Dolibarr
 ModuleZapierForDolibarrDesc = Zapier para o módulo Dolibarr
 ZapierForDolibarrSetup=Configuração do Zapier para 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>.
+ZapierDescription=Interface com Zapier
+ZapierAbout=Sobre o módulo Zapier
+ZapierSetupPage=Não há necessidade de configuração no Dolibarr para usar o Zapier. No entanto, deve gerar e publicar um pacote no zapier para o poder usar com o Dolibarr. Consulte a documentação em <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> nesta página wiki </a> .
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 3aeb4fefa2e..fdb21ec91ac 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -111,7 +111,7 @@ NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia PHP
 MaxSizeForUploadedFiles=Mărimea maximă pentru fişierele încărcate (0 pentru a interzice orice încărcare)
 UseCaptchaCode=Utilizare cod grafic (CAPTCHA) pe pagina de conectare și pe unele pagini publice
 AntiVirusCommand=Calea completă la comanda antivirus
-AntiVirusCommandExample=Exemplu pentru ClamAv Daemon (necesită clamav-daemon): /usr/bin/clamdscan<br>Exemplu pentru ClamWin (foarte foarte lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe 
+AntiVirusCommandExample=Exemplu pentru ClamAv Daemon (necesită clamav-daemon): /usr/bin/clamdscan<br>Exemplu pentru ClamWin (foarte foarte lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Mai multe despre parametrii liniei de comandă
 AntiVirusParamExample=Exemplu pentru ClamAv Daemon: --fdpass<br>Exemplu pentru ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Setări modul Contabilitate
@@ -161,9 +161,9 @@ SystemToolsAreaDesc=Această zonă oferă funcții de administrare. Utilizați m
 Purge=Curăţenie
 PurgeAreaDesc=Această pagină vă permite să ștergeți toate fișierele generate sau stocate de Dolibarr (fișiere temporare sau toate fișierele din directorul <b>%s</b>). Utilizarea acestei funcții nu este în mod normal necesară. Este oferită ca soluție pentru utilizatorii care găzduiesc Dolibarr la un furnizor care nu oferă permisiuni de ștergere a fișierelor generate de serverul web.
 PurgeDeleteLogFile=Ștergeți fișierele din jurnal, inclusiv <b> %s </b> definite pentru modulul Syslog (fără risc de pierdere a datelor)
-PurgeDeleteTemporaryFiles=Ștergeți toate fișierele jurnal și temporare (fără risc de pierdere a datelor). Parametrul poate fi 'tempfilesold', 'logfiles' sau ambele 'tempfilesold + logfiles'. Notă: Ștergerea fișierelor temporare se face numai dacă directorul temporar a fost creat acum mai mult de 24 de ore. 
+PurgeDeleteTemporaryFiles=Ștergeți toate fișierele jurnal și temporare (fără risc de pierdere a datelor). Parametrul poate fi 'tempfilesold', 'logfiles' sau ambele 'tempfilesold + logfiles'. Notă: Ștergerea fișierelor temporare se face numai dacă directorul temporar a fost creat acum mai mult de 24 de ore.
 PurgeDeleteTemporaryFilesShort=Ștergere fișiere jurnal și temporare (fără risc de pierdere a datelor)
-PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>Aceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, backup-urile pentru baze de date și fișierele temporare. 
+PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>Aceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, backup-urile pentru baze de date și fișierele temporare.
 PurgeRunNow=Curăţă acum
 PurgeNothingToDelete=Niciun director sau fișier de șters.
 PurgeNDirectoriesDeleted=<b>%s</b> fişiere sau directoare şterse.
@@ -175,7 +175,7 @@ Backup=Backup
 Restore=Restaurare
 RunCommandSummary=Backup-ul poate fi lansat cu următoarea comandă
 BackupResult=Rezultat backup
-BackupFileSuccessfullyCreated=Fişier backup generat 
+BackupFileSuccessfullyCreated=Fişier backup generat
 YouCanDownloadBackupFile=Fișierul generat poate fi acum descărcat
 NoBackupFileAvailable=Niciun fişier backup disponibil.
 ExportMethod=Metodă export
@@ -192,7 +192,7 @@ CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi r
 ExportCompatibility=Compatibilitatea fişierului de export generat
 ExportUseMySQLQuickParameter=Foloseşte parametrul --quick
 ExportUseMySQLQuickParameterHelp=Parametrul '--quick' ajută la limitarea consumului de memorie RAM pentru tabelele mari.
-MySqlExportParameters=Parametri export MySQL 
+MySqlExportParameters=Parametri export MySQL
 PostgreSqlExportParameters= Parametrii export PostgreSQL
 UseTransactionnalMode=Utilizare mod tranzacţional
 FullPathToMysqldumpCommand=Calea completă către comanda mysqldump
@@ -319,7 +319,7 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Email expeditor prestabilit preselectat în formulare
 UserEmail=Email utilizator
 CompanyEmail=Email companie
 FeatureNotAvailableOnLinux=Caracteristică indisponibilă pe sistemele tip Unix. Testaţi-vă programul sendmail la nivel local.
-FixOnTransifex=Remediază traducerea pe platforma de traducere online a proiectului 
+FixOnTransifex=Remediază traducerea pe platforma de traducere online a proiectului
 SubmitTranslation=Dacă traducerea pentru această limbă nu este completă sau dacă găsiți erori, puteți corecta aceasta prin editarea fișierelor din directorul <b> langs / %s </b> și trimiteți modificarea la www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Dacă traducerea pentru această limbă nu este completă sau găsiți erori, puteți corecta aceasta modificând fișierele din directorul <b>langs/%s</b> şi trimiţând fişierele modificate la dolibarr.org/forum sau, dacă eşti developer cu un PR la github.com/Dolibarr/dolibarr
 ModuleSetup=Configurare modul
@@ -402,7 +402,7 @@ TestSubmitForm=Test introducere date în formular
 ThisForceAlsoTheme=Utilizând acest meniu, managerul va folosi și propria temă indiferent de alegerea utilizatorului. De asemenea, acest manager de meniu specializat pentru smartphone-uri nu funcționează pe toate smartphone-urile. Utilizează un alt manager de meniuri dacă întâmpini probleme pe smartphone-ul tău.
 ThemeDir=Director teme
 ConnectionTimeout=Pauză de conectare
-ResponseTimeout=Timeout răspuns 
+ResponseTimeout=Timeout răspuns
 SmsTestMessage=SMS de test de la __PHONEFROM__ to __PHONETO__
 ModuleMustBeEnabledFirst=Modulul <b>%s</b> trebuie să fie activat daca aveti nevoie de aceasta funcţionalitate.
 SecurityToken=Cheia pentru URL-uri securizate
@@ -423,7 +423,7 @@ PlaceCustomerAddressToIsoLocation=Utilizați poziția standard franceză (La Pos
 Library=Bibliotecă
 UrlGenerationParameters=Parametrii pentru URL-uri securizate
 SecurityTokenIsUnique=Utilizaţi un parametru unic securekey pentru fiecare URL
-EnterRefToBuildUrl=Introdu referinţa pentru obiectul %s 
+EnterRefToBuildUrl=Introdu referinţa pentru obiectul %s
 GetSecuredUrl=Obţineţi URL-ul calculat
 ButtonHideUnauthorized=Ascunde butoanele de acțiuni neautorizate și pentru utilizatorii interni (gri în caz contrar)
 OldVATRates=Vechea cotă de TVA
@@ -466,7 +466,7 @@ ExtrafieldParamHelpcheckbox=Lista de valori trebuie să fie linii cu formatul ch
 ExtrafieldParamHelpradio=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi '0') <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
 ExtrafieldParamHelpsellist=Lista de valori provine dintr-o tabelă <br>Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>- id_field este în mod necesar o cheie int primară<br>- filtersql este o condiție SQL. Poate fi un test simplu (de exemplu, activ=1) pentru a afișa numai valoarea activă.<br> De asemenea, poți utiliza $ID$ în filtru, care este id-ul curent al obiectului curent.<br> Pentru a utiliza un SELECT în filtru, utilizează cuvântul cheie $SEL$ pentru a ocoli protecția anti-injecție.<br>dacă vrei să filtrezi pe extracâmpuri folosește sintaxa extra.fieldcode=... (unde codul campului este codul extracâmpului)<br><br>Pentru ca lista să depindă de o altă listă de atribut complementar:<br>list:c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column :filter <br><br>Pentru ca lista să depindă de altă listă:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lista valorilor provine dintr-un tabel <br>Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>filtru care poate fi un test simplu (de exemplu, activ = 1) pentru a afișa doar valoarea activă<br> Puteți utiliza, de asemenea, $ID$ în filtru care este ID-ul curent al obiectului curent<br> Pentru a efectua o selecție în filtru folosiți $SEL$<br> dacă doriți să filtrați pe câmpuri suplimentare utilizați sintaxa extra.fieldcode=... (unde codul de câmp este codul câmpului extra)<br><br> Pentru a avea o listă dependentă de un  de atribut complementar:<br> c_typent:libelle:id:options_<i>parent_list_code</i>| parent_column:filter <br><br>Pentru a avea o listă în funcție de altă listă:<br> c_typent:libelle:id:<i> parent_list_code</i>|parent_column: filter
-ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName:Classpath<br>Sintaxă: ObjectName: Classpath 
+ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName:Classpath<br>Sintaxă: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Păstrați liber pentru un separator simplu <br> Setați acest lucru la 1 pentru un separator care se prăbușește (deschis în mod implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune de utilizator) <br> Setați acest lucru la 2 pentru un separator care se prăbușește (se prăbușește implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune a utilizatorului)
 LibraryToBuildPDF=Bibliotecă utilizată pentru generarea PDF-urilor
 LocalTaxDesc=Unele țări pot aplica două sau trei taxe pe fiecare linie de facturare. Dacă este cazul, alegeți tipul pentru a doua și a treia taxă și rata acestora. Tipuri posibile sunt: <br> 1: taxa locală se aplică produselor și serviciilor fără TVA (localtax se calculează pe valoare fără taxă)<br> 2: taxa locală se aplică produselor și serviciilor, inclusiv TVA (localtax se calculează în funcție de valoare+ taxa principală ) <br>3: taxa locală se aplică produselor fără TVA (localtax se calculează pe valoare fără taxă) <br>4: taxa locală se aplică produselor şi includ tva (localtax  se calculeaza pe valoare + TVA principală) <br> 5: taxa locală se aplică serviciilor fără TVA (localtax se calculează pe valoarea fără TVA) <br> 6: taxa locală se aplică serviciilor, inclusiv TVA (localtax se calculează pe sumă + taxă)
@@ -485,7 +485,7 @@ BarcodeInitForThirdparties=Coduri de bare în masă pentru terți
 BarcodeInitForProductsOrServices=Iniţializare sau resetare coduri de bare în masă pentru produse şi servicii
 CurrentlyNWithoutBarCode=În prezent, aveţi <strong>%s</strong> înregistrări pe <strong>%s</strong> %s fără cod de bare definit.
 InitEmptyBarCode=Valoarea inițială pentru codurile de bare %s goale
-EraseAllCurrentBarCode=Ștergeți toate valorile curente de coduri de bare 
+EraseAllCurrentBarCode=Ștergeți toate valorile curente de coduri de bare
 ConfirmEraseAllCurrentBarCode=Sigur doriți să ștergeți toate valorile actuale ale codurilor de bare?
 AllBarcodeReset=Toate valorile codurilor de bare au fost şterse
 NoBarcodeNumberingTemplateDefined=Nu este activat niciun șablon de cod de bare de numere în configurare modulului Coduri de bare
@@ -506,7 +506,7 @@ Use3StepsApproval=În mod implicit, comenzile de achiziţie trebuie să fie crea
 UseDoubleApproval=Utilizați o aprobare în 3 pași atunci când suma (fără taxă) este mai mare decât...
 WarningPHPMail=ATENŢIE: Configurarea pentru trimitea de email-uri din aplicație utilizează configurarea generică implicită. De multe ori este mai bine să configurați email-urile de ieșire pentru a utiliza serverul de email al furnizorului dvs. de servicii email în loc de configurarea implicită din mai multe motive:
 WarningPHPMailA=- Utilizarea serverului furnizorului de servicii de e-mail crește fiabilitatea e-mailului dvs., astfel încât crește livrabilitatea fără a fi semnalată ca SPAM
-WarningPHPMailB=- Unii furnizori de servicii de email (cum ar fi Yahoo) nu vă permit să trimiteți un email de pe alt server decât propriul server. Configurarea dvs. actuală utilizează serverul aplicației pentru a trimite email-uri și nu serverul furnizorului dvs. de email, deci unii destinatari (cei compatibili cu protocolul restrictiv DMARC), vă vor întreba furnizorul de email dacă vă pot accepta emailul și unii furnizori de email (cum ar fi Yahoo) poate răspunde "nu" deoarece serverul nu este al lor, așa că puține emailuri trimise pot să nu fie acceptate pentru livrare (aveți grijă și la cota de trimitere a furnizorului dvs. de email). 
+WarningPHPMailB=- Unii furnizori de servicii de email (cum ar fi Yahoo) nu vă permit să trimiteți un email de pe alt server decât propriul server. Configurarea dvs. actuală utilizează serverul aplicației pentru a trimite email-uri și nu serverul furnizorului dvs. de email, deci unii destinatari (cei compatibili cu protocolul restrictiv DMARC), vă vor întreba furnizorul de email dacă vă pot accepta emailul și unii furnizori de email (cum ar fi Yahoo) poate răspunde "nu" deoarece serverul nu este al lor, așa că puține emailuri trimise pot să nu fie acceptate pentru livrare (aveți grijă și la cota de trimitere a furnizorului dvs. de email).
 WarningPHPMailC=- Utilizând serverul SMTP al furnizorului de servicii email pentru a trimite email-uri este, de asemenea, interesantă, astfel încât toate email-urile trimise din aplicație vor fi, de asemenea, salvate în directorul "Trimise" al cutiei poștale.
 WarningPHPMailD=Prin urmare, este recomandat să schimbi metoda de trimitere a email-urilor la valoarea "SMTP".
 WarningPHPMailDbis=Dacă vrei cu adevărat să păstrezi metoda implicită "PHP" pentru a trimite email-uri, ignoră acest avertisment sau elimină-l făcând %sclic aici%s.
@@ -586,7 +586,7 @@ Module55Desc=Management coduri de bare şi coduri QR
 Module56Name=Plăţi transfer credit
 Module56Desc=Gestionarea plăților furnizorilor sau a salariilor prin ordine de transfer credit. Include generarea de fișiere SEPA pentru țările europene.
 Module57Name=Plăţi prin direct debit
-Module57Desc=Gestionarea ordinelor de direct debit. Acesta include generarea de fișiere SEPA pentru țările europene. 
+Module57Desc=Gestionarea ordinelor de direct debit. Acesta include generarea de fișiere SEPA pentru țările europene.
 Module58Name=ClickToDial
 Module58Desc=Integrare cu un sistem ClickToDial (Asterisk, ...)
 Module60Name=Stickere
@@ -608,9 +608,9 @@ Module200Desc=Sincronizarea directorului LDAP
 Module210Name=PostNuke
 Module210Desc=Integrare PostNuke
 Module240Name=Export date
-Module240Desc=Instrument pentru export date din Dolibarr (asistat) 
+Module240Desc=Instrument pentru export date din Dolibarr (asistat)
 Module250Name=Import date
-Module250Desc=Instrument pentru import date în Dolibarr (asistat) 
+Module250Desc=Instrument pentru import date în Dolibarr (asistat)
 Module310Name=Membri
 Module310Desc=Managementul membrilor unei fundaţii
 Module320Name=Feed RSS
@@ -644,7 +644,7 @@ Module1120Name=Oferte comerciale de la furnizori
 Module1120Desc=Solicitați furnizorilor oferte şi cereri de prețuri
 Module1200Name=Mantis
 Module1200Desc=Integrare Mantis
-Module1520Name=Generare document 
+Module1520Name=Generare document
 Module1520Desc=Generarea de newslettere
 Module1780Name=Tag-uri/Categorii
 Module1780Desc=Creați etichete/categorii (produse, clienti, furnizori, contacte sau membri)
@@ -715,7 +715,7 @@ Module62000Name=Incoterm
 Module62000Desc=Adăugați caracteristici pentru a gestiona Incoterms
 Module63000Name=Resurse
 Module63000Desc=Gestionarea resurselor (imprimante, mașini, camere, ...) pentru a le aloca evenimentelor
-Module66000Name=Management token OAuth2 
+Module66000Name=Management token OAuth2
 Module66000Desc=Furnizează un instrument pentru a genera și gestiona token-uri OAuth2. Token-ul poate fi apoi folosit de alte module.
 Module94160Name=Recepţii
 ModuleBookCalName=Sistem calendar de rezervări
@@ -800,7 +800,7 @@ Permission147=Citeşte statisticile
 Permission151=Citeşte ordinele de plată prin debitare directă
 Permission152=Creare/modificare ordin de plată prin debit direct
 Permission153=Trimite/transmite ordine de plată prin debit direct
-Permission154=Înregistrează creditarea/respingerea ordinelor de plată prin debitare directă 
+Permission154=Înregistrează creditarea/respingerea ordinelor de plată prin debitare directă
 Permission161=Citește contracte/abonamente
 Permission162=Creare/modificare contracte/abonamente
 Permission163=Activează un serviciu/abonament al unui contract
@@ -905,7 +905,7 @@ Permission536=Vede/administrează serviciile ascunse
 Permission538=Export servicii
 Permission561=Citire ordine de plată prin transfer de credit
 Permission562=Creare/modificare comandă de plată prin transfer de credit
-Permission563=Trimitere/Transmitere comanda de plată prin transfer de credit 
+Permission563=Trimitere/Transmitere comanda de plată prin transfer de credit
 Permission564=Înregistrare debite/respingeri de transfer de credit
 Permission601=Citeşte stickere
 Permission602=Creare/modificare stickere
@@ -978,7 +978,7 @@ Permission1521=Citeşte documente
 Permission1522=Ştergere documente
 Permission2401=Citeşte acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al unui eveniment sau doar i s-a atribuit)
 Permission2402=Creare/modificare acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al evenimentului)
-Permission2403=Șterge acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al evenimentului) 
+Permission2403=Șterge acțiuni (evenimente sau task-uri) legate de contul său de utilizator (dacă este proprietar al evenimentului)
 Permission2411=Citeşte acţiuni (evenimente sau task-uri) ale altor persoane
 Permission2412=Creare/modificarea acţiuni (evenimente sau task-uri) ale altor persoane
 Permission2413=Şterge acţiuni (evenimente sau task-uri) ale altor persoane
@@ -986,7 +986,7 @@ Permission2414=Export acțiuni activităţi/task-uri ale altora
 Permission2501=Citeşte/descarcă documente
 Permission2502=Descărcare documente
 Permission2503=Trimite sau şterge documente
-Permission2515=Configurare directoare documente 
+Permission2515=Configurare directoare documente
 Permission2610=Cheie API de generare/modificare utilizatori
 Permission2801=Foloseşte clientul FTP în modul de citire (numai navigare și descărcare)
 Permission2802=Foloseşte clientul FTP în modul de scriere (ştergere şi încărcare fişiere)
@@ -1040,7 +1040,7 @@ Permission50420=Rapoarte și export de rapoarte (cifră de afaceri, balanţe, ju
 Permission50430=Defineşte perioadele fiscale. Validează tranzacţiile şi perioadele fiscale.
 Permission50440=Administrează schema de conturi, configurează contabilitatea
 Permission51001=Citeşte active
-Permission51002=Creare/Modificare active 
+Permission51002=Creare/Modificare active
 Permission51003=Ştergere active
 Permission51005=Setare tipuri de active
 Permission54001=Tipărire
@@ -1197,6 +1197,7 @@ Skin=Temă vizuală
 DefaultSkin=Temă vizuală implicită
 MaxSizeList=Lungime maximă pentru liste
 DefaultMaxSizeList=Lungime maximă implicită pentru liste
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Lungimea maximă implicită pentru listele scurte (de ex. în fişa client)
 MessageOfDay=Mesajul zilei
 MessageLogin=Mesaj pagină de autentificare
@@ -1246,8 +1247,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Raport de cheltuieli de aprobat
 Delays_MAIN_DELAY_HOLIDAYS=Cereri de concediu de aprobat
 SetupDescription1=Înainte de a începe să utilizați sistemul, unii parametri inițiali trebuie să fie definiți şi anumite module activate/configurate.
 SetupDescription2=Următoarele două secțiuni sunt obligatorii (primele două intrări din meniul de configurare)
-SetupDescription3=<a href="%s">%s->%s</a><br><br>Parametri de bază folosiți pentru a personaliza comportamentul implicit al aplicației (de exemplu, pentru funcțiile legate de țară). 
-SetupDescription4=<a href="%s">%s->%s</a><br><br>Acest software este o suită de mai multe module/aplicații. Modulele necesare trebuie să fie activate și configurate. Intrările din meniu vor apărea odată cu activarea acestor module. 
+SetupDescription3=<a href="%s">%s->%s</a><br><br>Parametri de bază folosiți pentru a personaliza comportamentul implicit al aplicației (de exemplu, pentru funcțiile legate de țară).
+SetupDescription4=<a href="%s">%s->%s</a><br><br>Acest software este o suită de mai multe module/aplicații. Modulele necesare trebuie să fie activate și configurate. Intrările din meniu vor apărea odată cu activarea acestor module.
 SetupDescription5=Meniul Alte setări gestionează parametrii opționali.
 SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Parametrii de bază utilizați pentru a personaliza comportamentul implicit al aplicației (de exemplu, pentru funcționalităţile legate de țară).
@@ -1277,7 +1278,7 @@ MoreNetworksAvailableWithModule=Mai multe rețele sociale pot fi disponibile act
 AccountantDesc= Dacă aveți un contabil/firmă de contabilitate externă, puteți modifica aici informațiile aferente.
 AccountantFileNumber=Cod contabil
 DisplayDesc=Parametrii care afectează aspectul și prezentarea aplicației pot fi modificați aici.
-AvailableModules=Aplicații/module disponibile 
+AvailableModules=Aplicații/module disponibile
 ToActivateModule=Pentru a activa module, du-te la zona de configurare (Acasă->Setări-Module).
 SessionTimeOut=Timeout pentru sesiune
 SessionExplanation=Acest număr garantează că sesiunea nu va expira niciodată înainte de această întârziere, în cazul în care curățarea sesiunii este efectuată de Cleaner intern pentru sesiuni PHP (și nimic altceva). Interfața de curățare internă a sesiunii PHP nu garantează că sesiunea va expira după această întârziere. Va expira, după această întârziere și atunci când curățătorul sesiunii va fi rulat, astfel încât fiecare <b> %s / %s </b>, acces dar numai în timpul accesului realizat de alte sesiuni (dacă valoarea este 0, înseamnă că ștergerea sesiunii se face numai printr-un proces extern). <br> Notă: pe unele servere cu mecanism extern de curățare a sesiunilor (cron sub debian, ubuntu ...) sesiunile pot fi distruse după o perioadă definită de o configurație externă, indiferent de valoarea introdusă aici.
@@ -1369,7 +1370,7 @@ PathToDocuments=Cale documente
 PathDirectory=Director
 SendmailOptionMayHurtBuggedMTA=Funcția de trimitere a e-mailurilor utilizând metoda "PHP mail direct" va genera un mesaj email care ar putea să nu fie analizat corect de către unele servere de email . Rezultatul este că unele email-uri nu pot fi citite de persoanele găzduite de acele platforme cu probleme. Acesta este cazul pentru unii furnizori de Internet (Ex: Orange în Franța). Aceasta nu este o problemă de sistem sau de PHP, ci cu server-ul de mail. Cu toate acestea, puteți adăuga o opțiune MAIN_FIX_FOR_BUGGED_MTA la 1 din Setări  - Alte setări ca Dolibarr să poată evita acest lucru. Cu toate acestea, este posibil să întâmpinați probleme cu alte servere care utilizează strict standardul SMTP. Cealaltă soluție (recomandată) este utilizarea metodei "SMTP socket library" care nu are aceste dezavantaje.
 TranslationSetup=Configurare traducere
-TranslationKeySearch=Căutați o cheie sau un șir de traducere 
+TranslationKeySearch=Căutați o cheie sau un șir de traducere
 TranslationOverwriteKey=Suprascrieți un șir de traducere
 TranslationDesc=Cum se setează limba de afișare: <br>* Implicit/Pentru tot sistemul: meniul <strong>Acasă -> Setări -> Afișare</strong> <br>* Per utilizator: Clic pe numele utilizatorului în partea de sus a ecranului și modificați fila <strong>Setări afișare utilizator</strong> din fişa de utilizator.
 TranslationOverwriteDesc=Poți, de asemenea, să înlocuieşti șiruri de caractere care completează următorul tabel . Alege limba ta din meniul derulant "%s", inserează șirul cheie de traducere în "%s" şi noua ta traducere în "%s"
@@ -1474,9 +1475,9 @@ InvoiceOptionCategoryOfOperationsHelp=In functie de situatie, mentiunea va apare
 InvoiceOptionCategoryOfOperationsYes1=Da, sub blocul de adresă
 InvoiceOptionCategoryOfOperationsYes2=Da, în colțul din stânga jos
 ##### Proposals #####
-PropalSetup=Configurare modul Oferte Comerciale 
-ProposalsNumberingModules=Modele numerotare Oferte comerciale 
-ProposalsPDFModules=Şabloane documente Oferte comerciale 
+PropalSetup=Configurare modul Oferte Comerciale
+ProposalsNumberingModules=Modele numerotare Oferte comerciale
+ProposalsPDFModules=Şabloane documente Oferte comerciale
 SuggestedPaymentModesIfNotDefinedInProposal=Modalitatea de plată sugerată pe ofertă în mod implicit, dacă nu este definită pe oferta comercială
 FreeLegalTextOnProposal=Text liber pe ofertele comerciale
 WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
@@ -1507,7 +1508,7 @@ FicheinterNumberingModules=Modele de numerotare pentru intervenţie
 TemplatePDFInterventions=Şabloane documente Fişă intervenţie
 WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul dacă e gol)
 ##### Contracts #####
-ContractsSetup=Configurare modul Contracte/Abonamente 
+ContractsSetup=Configurare modul Contracte/Abonamente
 ContractsNumberingModules=Modele numerotare Contracte
 TemplatePDFContracts=Şaboane documente contracte
 FreeLegalTextOnContracts=Text liber pe contracte
@@ -1620,7 +1621,7 @@ LDAPFieldFirstName=Prenume
 LDAPFieldFirstNameExample=Exemplu: givenName
 LDAPFieldMail=Adresă email
 LDAPFieldMailExample=Exemplu: mail
-LDAPFieldPhone=Nr. telefon profesional 
+LDAPFieldPhone=Nr. telefon profesional
 LDAPFieldPhoneExample=Exemplu: telephonenumber
 LDAPFieldHomePhone=Numărul de telefon personal
 LDAPFieldHomePhoneExample=Exemplu: homephone
@@ -1820,7 +1821,7 @@ FailedToInitializeMenu=Eroare la inițializarea meniului
 ##### Tax #####
 TaxSetup=Configurare modul Taxe sociale sau fiscale şi dividente
 OptionVatMode=Plătitor de TVA
-OptionVATDefault=Bază standard 
+OptionVATDefault=Bază standard
 OptionVATDebitOption=Bază acumulare debit
 OptionVatDefaultDesc=TVA se datorează: <br> - pentru livrare de mărfuri (bazată pe facturare) <br> - Pe plăţi pentru servicii
 OptionVatDebitOptionDesc=TVA se datorează: <br> - pentru livrare de mărfuri (bazată pe facturare) <br> - pe facturi(debit) pentru servicii
@@ -1915,7 +1916,7 @@ SuppliersCommandModel=Şablon complet pentru comanda de achiziţie
 SuppliersCommandModelMuscadet=Şablon complet pentru Comandă de achiziţie (vechea implementare a şablonului cornas)
 SuppliersInvoiceModel=Şablon complet de factură furnizor
 SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizor
-IfSetToYesDontForgetPermission=Dacă este setată o valoare nulă, nu uitați să furnizați permisiuni grupurilor sau utilizatorilor autorizați pentru a doua aprobare 
+IfSetToYesDontForgetPermission=Dacă este setată o valoare nulă, nu uitați să furnizați permisiuni grupurilor sau utilizatorilor autorizați pentru a doua aprobare
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configurare modul GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Calea către fișierul care conține conversia IP Maxmind în țară
@@ -1960,10 +1961,10 @@ NoModueToManageStockIncrease=Nu a fost activat niciun modul capabil să gestione
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puteți găsi opțiuni pentru notificările prin email activând şi configurând modulul "Notificare".
 TemplatesForNotifications=Şabloane pentru notificări
 ListOfNotificationsPerUser=Lista notificărilor automate pentru utilizator*
-ListOfNotificationsPerUserOrContact=Lista posibilelor notificări automate (în cadrul evenimentului comercial) disponibile pentru utilizator* sau pentru contact** 
+ListOfNotificationsPerUserOrContact=Lista posibilelor notificări automate (în cadrul evenimentului comercial) disponibile pentru utilizator* sau pentru contact**
 ListOfFixedNotifications=Listă notificări automate
 GoOntoUserCardToAddMore=Accesați fişa "Notificări" a unui utilizator pentru a adăuga sau elimina notificări
-GoOntoContactCardToAddMore=Accesați fila "Notificări" a terțului pentru a adăuga sau elimina notificări pentru contacte/adrese 
+GoOntoContactCardToAddMore=Accesați fila "Notificări" a terțului pentru a adăuga sau elimina notificări pentru contacte/adrese
 Threshold=Prag
 BackupDumpWizard=Wizard pentru generarea fişierului dump al bazei de date
 BackupZipWizard=Wizard pentru generarea arhivei cu directul de documente
@@ -2017,7 +2018,7 @@ ExpectedSize=Dimensiune aşteptată
 CurrentSize=Dimensiune curentă
 ForcedConstants=Valori constante necesare
 MailToSendProposal=Oferte clienţi
-MailToSendOrder=Comenzi de vânzări 
+MailToSendOrder=Comenzi de vânzări
 MailToSendInvoice=Facturi clienţi
 MailToSendShipment=Livrări
 MailToSendIntervention=Intervenţii
@@ -2077,9 +2078,9 @@ WarningNoteModulePOSForFrenchLaw=Acest modul %s respectă legile franceze (Loi F
 WarningInstallationMayBecomeNotCompliantWithLaw=Încercați să instalați modulul %s care este un modul extern. Activarea unui modul extern presupune că aveți încredere în editorul modulului şi că sunteți sigur că acest modul nu afectează negativ comportamentul aplicației şi este în concordanţă cu legile țării tale (%s). Dacă modulul introduce o o caracteristică ilegală, devii responsabil pentru utilizarea necorespunzătoare a software-ului.
 
 MAIN_PDF_MARGIN_LEFT=Marginea stângă a PDF-ului
-MAIN_PDF_MARGIN_RIGHT=Marginea dreaptă a PDF-ului 
-MAIN_PDF_MARGIN_TOP=Marginea superioară a PDF-ului 
-MAIN_PDF_MARGIN_BOTTOM=Marginea inferioară a PDF-ului 
+MAIN_PDF_MARGIN_RIGHT=Marginea dreaptă a PDF-ului
+MAIN_PDF_MARGIN_TOP=Marginea superioară a PDF-ului
+MAIN_PDF_MARGIN_BOTTOM=Marginea inferioară a PDF-ului
 MAIN_DOCUMENTS_LOGO_HEIGHT=Înălţime logo în PDF
 DOC_SHOW_FIRST_SALES_REP=Afișează primul reprezentant de vânzări
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Adaugă coloană pentru imagine pe liniile de ofertă
@@ -2115,13 +2116,13 @@ ChartLoaded=Planul de conturi a fost încărcat
 SocialNetworkSetup=Configurarea modulului Rețele sociale
 EnableFeatureFor=Activați caracteristici pentru <strong>%s</strong>
 VATIsUsedIsOff=Nota: Opțiunea de a utiliza impozitul pe vânzări sau taxa TVA a fost setată la <strong>Oprit</strong> în meniul %s - %s, astfel încât impozitul pe vânzări sau taxa TVA utilizate vor fi întotdeauna 0 pentru vânzări.
-SwapSenderAndRecipientOnPDF=Interschimbă poziţia adreselor expeditorului şi destinatarului în documentele PDF generate 
+SwapSenderAndRecipientOnPDF=Interschimbă poziţia adreselor expeditorului şi destinatarului în documentele PDF generate
 FeatureSupportedOnTextFieldsOnly=Atenție, caracteristică acceptată numai pe câmpurile de text și pe listele combinate. De asemenea, trebuie setat un parametru URL action=create sau action=edit SAU numele paginii trebuie să se termine cu 'new.php' pentru a declanșa această caracteristică.
 EmailCollector=Colector de emailuri
 EmailCollectors=Colectoare email
 EmailCollectorDescription=Adăugați un job programat și o pagină de configurare pentru a scana în mod regulat căsuţele de email (utilizând protocolul IMAP) și pentru a înregistra emailurile primite în aplicația ta, la locul potrivit și/sau pentru a crea automat înregistrări (cum ar fi clienții).
 NewEmailCollector=Colector de emailuri nou
-EMailHost=Server gazdă de email IMAP 
+EMailHost=Server gazdă de email IMAP
 EMailHostPort=Port email server IMAP
 loginPassword=Login/Parolă
 oauthToken=Token OAuth2
@@ -2133,13 +2134,13 @@ ImapEncryptionHelp = Examplu: none, ssl, tls, notls
 NoRSH = Utilizare configurare NoRSH
 NoRSHHelp = Nu se utilizează protocoale RSH sau SSH pentru a stabili o sesiune de pre-identificare IMAP
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
-MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
+MailboxTargetDirectory=Directorul ţintă al cutiei poștale
 EmailcollectorOperations=Operațiuni de făcut de către colector
 EmailcollectorOperationsDesc=Operațiunile sunt executate în ordinea de sus în jos
 MaxEmailCollectPerCollect=Număr maxim de email-uri colectae per operaţiune
 TestCollectNow=Test colectare
 CollectNow=Colectați acum
-ConfirmCloneEmailCollector=Sigur vrei să clonezi colectorul de email-uri %s? 
+ConfirmCloneEmailCollector=Sigur vrei să clonezi colectorul de email-uri %s?
 DateLastCollectResult=Data ultimei încercări de colectare
 DateLastcollectResultOk=Data ultimei colectări cu succes
 LastResult=Ultimul rezultat
@@ -2179,7 +2180,7 @@ ECMAutoTree=Afișați arborele ECM automat
 OperationParamDesc=Definește regulile de utilizat pentru extragerea unor date sau setează valorile de utilizat pentru operare.<br><br>Exemplu pentru extragerea unui nume de companie din subiectul email-ului într-o variabilă temporară:<br>tmp_var=EXTRACT:SUBJECT:Mesaj de la companie ([^\n]*)<br><br>Exemple pentru a seta proprietățile unui obiect de creat:<br>objproperty1=SET:o valoare codată<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:o valoare (valoarea este setată numai dacă proprietatea nu este deja definită)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Numele companiei mele este \\s([^\\s]*)<br><br>Utilizează o linie nouă pentru a extrage sau pentru a seta proprietăți.
 OpeningHours=Program de lucru
 OpeningHoursDesc=Introduceți aici programul de lucru normal ale companiei dvs.
-ResourceSetup=Configurarea modulului Resurse 
+ResourceSetup=Configurarea modulului Resurse
 UseSearchToSelectResource=Utilizați un formular de căutare pentru a alege o resursă (mai degrabă decât o listă derulantă).
 DisabledResourceLinkUser=Dezactivați funcţia care conectează o resursă la utilizatori
 DisabledResourceLinkContact=Dezactivați funcţia care conectează o resursă la contacte
@@ -2190,7 +2191,7 @@ DisableProspectCustomerType=Dezactivați tipul terțului „Prospect + Client”
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificați interfața pentru o persoană nevăzătoare
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activați această opțiune dacă sunteți o persoană nevăzătoare sau dacă utilizați aplicația dintr-un browser text precum Lynx sau Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Schimbă culorile interfeţei pentru persoanele cu disabilităţi vizuale
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Activează această opţiune dacă eşti o persoană cu probleme vizuale, în anumite cazuri interfaţa îşi va schimba paleta de culori pentru a mări contrastul. 
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Activează această opţiune dacă eşti o persoană cu probleme vizuale, în anumite cazuri interfaţa îşi va schimba paleta de culori pentru a mări contrastul.
 Protanopia=Protanopie
 Deuteranopes=Deuteranopie
 Tritanopes=Tritanopie
@@ -2282,7 +2283,7 @@ CheckForModuleUpdateHelp=Această acțiune se va conecta la editori de module ex
 ModuleUpdateAvailable=O actualizare este disponibilă
 NoExternalModuleWithUpdate=Nu au fost găsite actualizări pentru modulele externe
 SwaggerDescriptionFile=Fişier descriptor Swagger API (pentru utilizare redoc de exemplu)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ai activat WS API care este învechit. Ar trebui să foloseşti REST API. 
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ai activat WS API care este învechit. Ar trebui să foloseşti REST API.
 RandomlySelectedIfSeveral=Selectat aleatoriu dacă sunt disponibile mai multe imagini
 SalesRepresentativeInfo=Pentru Oferte, Comenzi, Facturi.
 DatabasePasswordObfuscated=Parola bazei de date este eclipsată în fişierul conf
@@ -2352,7 +2353,7 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Afișează adresa de livrare
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Mențiune obligatorie în unele țări (Franța, ...)
 UrlSocialNetworksDesc=Link URL rețea socială. Utilizează {socialid} pentru partea variabilă care conține ID-ul rețelei sociale.
 IfThisCategoryIsChildOfAnother=Dacă această categorie este un copil al alteia
-DarkThemeMode=Mod întunecat temă 
+DarkThemeMode=Mod întunecat temă
 AlwaysDisabled=Întotdeauna dezactivat
 AccordingToBrowser=Conform browser-ului
 AlwaysEnabled=Întotdeauna activat
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=Este posibil să definești un alias pentru serverul
 ExportUseForce=Folosește parametrul -f
 ExportUseForceHelp=Forțare continuare export chiar și atunci când este găsită o eroare (backup-ul poate să nu fie de încredere)
 CustomPrompt=Solicitări personalizate
+AiDescription=Caracteristici AI (Inteligență Artificială)
+AiDescriptionLong=Oferă funcții AI (Inteligență Artificială) în diferite părți ale aplicației. Ai nevoie de un API AI extern.
+AI_KEY_API_CHATGPT= Cheie API pentru AI ChatGPT
+AiSetup=Configurare modul AI
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Generare imagine
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Introdu o adresă IP
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 6e15d6424d1..114b093fc9e 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -115,7 +115,7 @@ LastConnexion=Ultima autentificare
 PreviousConnexion=Autentificarea anterioară
 PreviousValue=Valoare anterioară
 ConnectedOnMultiCompany=Conectat la entitatea
-ConnectedSince=Conectat din 
+ConnectedSince=Conectat din
 AuthenticationMode=Mod autentificare
 RequestedUrl=URL solicitat
 DatabaseTypeManager=Tip manager bază de date
@@ -420,6 +420,8 @@ TotalTTCShort=Total (cu taxe)
 TotalHT=Total (fără taxe)
 TotalHTforthispage=Total (fără taxe) pentru această pagină
 Totalforthispage=Total pentru această pagină
+GrandTotal=Total final
+TotalforAllPages=Total pentru toate paginile
 TotalTTC=Total (cu taxe)
 TotalTTCToYourCredit=Total (cu taxe) în creditul tău
 TotalVAT=Total taxe
@@ -551,7 +553,7 @@ Drafts=Schiţe
 StatusInterInvoiced=Facturată
 Done=Efectuat
 Validated=Validat
-ValidatedToProduce=Validate (De fabricat) 
+ValidatedToProduce=Validate (De fabricat)
 Opened=Deschis
 OpenAll=Deschise (Toate)
 ClosedAll=Închise (Toate)
@@ -647,6 +649,7 @@ ReportName=Nume raport
 ReportPeriod=Perioadă de raportare
 ReportDescription=Descriere
 Report=Raport
+Reports=Rapoarte
 Keyword=Cuvânt cheie
 Origin=Origine
 Legend=Legendă
@@ -725,7 +728,7 @@ RecordCreatedSuccessfully=Înregistrare creată cu succes
 RecordModifiedSuccessfully=Înregistrare modificată cu succes
 RecordsModified=Înregistrările (Înregistrarea) %s au fost modificate
 RecordsDeleted=Înregistrările(rarea) %s au fost șterse
-RecordsGenerated=%s înregistrare(ări) au fost generate 
+RecordsGenerated=%s înregistrare(ări) au fost generate
 ValidatedRecordWhereFound = Unele dintre înregistrările selectate au fost deja validate. Nu au fost șterse înregistrări.
 AutomaticCode=Cod automat
 FeatureDisabled=Funcţionalitate dezactivată
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 5d7171ccebe..4fcf77ca45f 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -32,7 +32,7 @@ NextYearOfInvoice=Anul următor datei facturii
 DateNextInvoiceBeforeGen=Data următoarei facturi (înainte de generare)
 DateNextInvoiceAfterGen=Data următoarei facturi (după generare)
 GraphInBarsAreLimitedToNMeasures=Graficele sunt limitate la %s măsuri în modul 'Bare'. În schimb, a fost selectat automat modul 'Linii'.
-OnlyOneFieldForXAxisIsPossible=Doar 1 câmp este posibil pentru axa X. Doar primul câmp a fost selectat. 
+OnlyOneFieldForXAxisIsPossible=Doar 1 câmp este posibil pentru axa X. Doar primul câmp a fost selectat.
 AtLeastOneMeasureIsRequired=Cel puţin 1 câmp pentru metrică este necesar
 AtLeastOneXAxisIsRequired=Cel puţin 1 câmp pentru axa X este necesar
 LatestBlogPosts=Ultimile postări din blog
@@ -301,7 +301,7 @@ ServicesPerPopularity=Servicii după popularitate
 PopuProp=Produse|Servicii după popularitate din oferte
 PopuCom=Produse|Servicii după popularitate din comenzi
 ProductStatistics=Statistici Produse|Servicii
-NbOfQtyInOrders=Cantitate în comenzi 
+NbOfQtyInOrders=Cantitate în comenzi
 SelectTheTypeOfObjectToAnalyze=Selectează un obiect pentru a-i vedea statisticile...
 
 ConfirmBtnCommonContent = Eşti sigur că vrei să  "%s" ?
@@ -312,7 +312,7 @@ OrPasteAnURL=sau Lipește un URL
 
 # externalsite
 ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
-ExternalSiteURL=URL-ul site-ului extern care va fi conținut în iframe HTML 
+ExternalSiteURL=URL-ul site-ului extern care va fi conținut în iframe HTML
 ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
 ExampleMyMenuEntry=Intrare în Meniul meu
 
@@ -321,7 +321,7 @@ FTPClientSetup=Configurare modul client FTP sau SFTP
 NewFTPClient=Configurare nouă de conexiune FTP/SFTP
 FTPArea=FTP/SFTP
 FTPAreaDesc=Acest ecran arată o vedere a unui server FTP și SFTP.
-SetupOfFTPClientModuleNotComplete=Configurarea modulului client FTP sau SFTP pare să fie incompletă 
+SetupOfFTPClientModuleNotComplete=Configurarea modulului client FTP sau SFTP pare să fie incompletă
 FTPFeatureNotSupportedByYourPHP=PHP-ul nu suportă funcţii FTP sau SFTP
 FailedToConnectToFTPServer=Conectarea la server a eşuat ( server %s, port %s)
 FailedToConnectToFTPServerWithCredentials=Autentificarea la server a eşuat cu numele/parola definită
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Eșec la încărcarea fișierului <b>%s</b>.
 AddFolder=Creare folder
 FileWasCreateFolder=Folderul <b>%s</b> a fost creat
 FTPFailedToCreateFolder=Eșec la crearea folderului <b>%s</b>.
+SelectADay=Select a day in calendar
+SelectANewDate=Selectare dată nouă
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 2d1522fa8cb..e517f270661 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -33,7 +33,7 @@ ProductsOrServices=Produse sau servicii
 ProductsPipeServices=Produse | Servicii
 ProductsOnSale=Produse de vânzare
 ProductsOnPurchase=Produse de achiziţionat
-ProductsOnSaleOnly=Produse doar de vânzare 
+ProductsOnSaleOnly=Produse doar de vânzare
 ProductsOnPurchaseOnly=Produse doar pentru achiziţie
 ProductsNotOnSell=Produse care nu sunt de vânzare și nici de achiziţionat
 ProductsOnSellAndOnBuy=Produse de vânzare sau de achiziţionat
@@ -45,7 +45,7 @@ ServicesNotOnSell=Servicii care nu sunt nici de vânzare și nici de achiziţion
 ServicesOnSellAndOnBuy=Servicii de vânzare sau de achiziţionat
 LastModifiedProductsAndServices=Ultimele %s produse/servicii modificate
 LastRecordedProducts=Ultimele %s produse înregistrate
-LastRecordedServices=Ultimele %s servicii înregistrate 
+LastRecordedServices=Ultimele %s servicii înregistrate
 CardProduct0=Produs
 CardProduct1=Serviciu
 Stock=Stoc
@@ -170,7 +170,7 @@ CloneCombinationsProduct=Clonare variante de produs
 ProductIsUsed=Acest produs este utilizat
 NewRefForClone=Ref. noului produs/serviciu
 SellingPrices=Preţuri de vânzare
-BuyingPrices=Prețuri de achiziție 
+BuyingPrices=Prețuri de achiziție
 CustomerPrices=Preţuri client
 SuppliersPrices=Prețuri furnizor
 SuppliersPricesOfProductsOrServices=Prețuri furnizori (pentru produse sau servicii)
@@ -208,11 +208,6 @@ unitSET=Set
 unitS=Secundă
 unitH=Oră
 unitD=Zi
-unitG=Gram
-unitM=Metru
-unitLM=Metru liniar
-unitM2=Metru pătrat
-unitM3=Metru cub
 unitL=Litru
 unitT=tonă
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=livră
 unitOZ=uncie
 unitM=Metru
+unitLM=Metru liniar
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -241,7 +237,7 @@ unitIN3=in³
 unitOZ3=uncie
 unitgallon=galon
 ProductCodeModel=Şablon ref Produs
-ServiceCodeModel=Şablon ref Serviciu 
+ServiceCodeModel=Şablon ref Serviciu
 CurrentProductPrice=Preţ curent
 AlwaysUseNewPrice=Foloseşte întotdeauna preţul curent al produsului/serviciului
 AlwaysUseFixedPrice=Foloseşte preţ fix
@@ -334,7 +330,7 @@ ProductWeight=Greutate pentru 1 produs
 ProductVolume=Volum pentru 1 produs
 WeightUnits=Unitate de greutate
 VolumeUnits=Unitate de volum
-WidthUnits=Unitate lățime 
+WidthUnits=Unitate lățime
 LengthUnits=Unitate lungime
 HeightUnits=Unitate înălţime
 SurfaceUnits=Unitate suprafaţă
@@ -364,7 +360,7 @@ ProductAttributeValueDeleteDialog=Sigur vrei să ștergi valoarea "%s" cu referi
 ProductCombinationDeleteDialog=Sigur doriți să ștergeți varianta de produs "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=A apărut o eroare la ștergerea variantei. Verificați că nu este folosită de niciun obiect
 ProductCombinations=Variante
-PropagateVariant=Propagare variante de produs 
+PropagateVariant=Propagare variante de produs
 HideProductCombinations=Ascunde varianta de produs în selectorul de produse
 ProductCombination=Variantă
 NewProductCombination=Variantă nouă
@@ -396,7 +392,7 @@ HideChildProducts=Ascundeți variantele de produs
 ShowChildProducts=Afișare variante de produs
 NoEditVariants=Accesați fişa produsul părinte și modificați impactul asupra prețurilor variantelor în fişa Variante
 ConfirmCloneProductCombinations=Doriți să copiați toate variantele de produs la celălalt produs părinte cu referința dată?
-CloneDestinationReference=Referință produs destinație 
+CloneDestinationReference=Referință produs destinație
 ErrorCopyProductCombinations=A apărut o eroare la copierea variantelor de produs
 ErrorDestinationProductNotFound=Produsul destinația nu a fost găsit
 ErrorProductCombinationNotFound=Varianta de produs nu a fost găsită
@@ -437,3 +433,6 @@ ModifyValueExtrafields = Modificare valoare extracâmp
 OrProductsWithCategories=Sau produse cu etichete/categorii
 WarningTransferBatchStockMouvToGlobal = Dacă vrei să deserializezi acest produs, tot stocul serializat/lotizat al acestuia va fi transformat în stoc global
 WarningConvertFromBatchToSerial=Dacă în prezent ai o cantitate mai mare sau egală cu 2 pentru produs, trecerea la această opțiune înseamnă că vei avea în continuare un produs cu diferite obiecte din același lot (în timp ce vrei un număr de serie unic). Dublura va rămâne până când se face un inventar sau o mișcare manuală a stocului pentru a remedia acest lucru.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=În mod implicit, un părinte al unei variante este un produs virtual, deci nu este gestionat stoc pentru acesta. Prin activarea acestei opțiuni, un stoc va fi gestionat pentru produsele părinte și de fiecare dată când se modifică o cantitate de stoc pentru un variantă de produs, aceeași cantitate va fi modificată pentru produsul părinte. Nu ar trebui să ai nevoie de această opțiune, cu excepția cazului în care utilizezi varianta pentru a gestiona același produs ca părinte (dar cu descrieri, prețuri diferite...)
+ConfirmSetToDraftInventory=Sigur vrei să reîntorci în starea Schiță?<br> Cantitățile stabilite în prezent în inventar vor fi resetate.
diff --git a/htdocs/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang
index 1839baa3439..67e57480c19 100644
--- a/htdocs/langs/ro_RO/resource.lang
+++ b/htdocs/langs/ro_RO/resource.lang
@@ -1,39 +1,41 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Resurse
 MenuResourceAdd=Resursă nouă
-DeleteResource=Şterge resursa
+DeleteResource=Şterge resursă
 ConfirmDeleteResourceElement=Confirmaţi ştergerea resursei pentru acest element
 NoResourceInDatabase=Nicio resursă în baza de date.
-NoResourceLinked=Nicio resursă legată
+NoResourceLinked=Nicio resursă asociată
 ActionsOnResource=Evenimente despre această resursă
-ResourcePageIndex=Lista resurse
+ResourcePageIndex=Listă resurse
 ResourceSingular=Resursă
 ResourceCard=Fişă resursă
-AddResource=Crează resursă
+AddResource=Creare resursă
 ResourceFormLabel_ref=Nume resursă
 ResourceType=Tip resursă
 ResourceFormLabel_description=Descriere resursă
 
 ResourcesLinkedToElement=Resurse legate de elementul
 
-ShowResource=Arata Resursă
+ShowResource=Arată resursă
 
-ResourceElementPage=Element resurse
-ResourceCreatedWithSuccess=Resursă creată
+ResourceElementPage=Resurse element
+ResourceCreatedWithSuccess=Resursa a fost creată cu succes
 RessourceLineSuccessfullyDeleted=Linie resursă ștearsă
-RessourceLineSuccessfullyUpdated=Linie  resursă actualizată
-ResourceLinkedWithSuccess=Resursă legată cu succes
+RessourceLineSuccessfullyUpdated=Linie resursă actualizată
+ResourceLinkedWithSuccess=Resursă asociată cu succes
 
 ConfirmDeleteResource=Confirmaţi ştergerea acestei resurse
 RessourceSuccessfullyDeleted=Resursă ştearsă
 DictionaryResourceType=Tipuri resurse
 
-SelectResource=Selectează resursa
+SelectResource=Selectare resursă
 
 IdResource=Id resursă
 AssetNumber=Număr serial
-ResourceTypeCode=Codul tipului de resursă
+ResourceTypeCode=Cod tip resursă
 ImportDataset_resource_1=Resurse
 
 ErrorResourcesAlreadyInUse=O parte din resurse sunt deja în uz
-ErrorResourceUseInEvent= %sutilizat în %seveniment
+ErrorResourceUseInEvent= %sutilizată în %seveniment
+
+MaxUsers=Număr maxim de utilizatori (locuri, scaune etc.)
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index fe30b68b439..80160f4e631 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -309,7 +309,7 @@ DescValidateMovements=Любое изменение или удаление на
 
 ValidateHistory=Связывать автоматически
 AutomaticBindingDone=Выполнено автоматическое связывание (%s) — автоматическое связывание невозможно для некоторых записей (%s)
-DoManualBindingForFailedRecord=Вам необходимо выполнить вручную ссылка для строк %s, которые не связаны <span class='notranslate'>автоматически< /пролет>.
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
 
 ErrorAccountancyCodeIsAlreadyUse=Ошибка, вы не можете удалить или отключить этот счет плана счетов, потому что он используется
 MvtNotCorrectlyBalanced=Движение неправильно сбалансировано. Дебет = %s и кредит = %s
@@ -335,7 +335,6 @@ CategoryDeleted=Категория учетной записи удалена
 AccountingJournals=Бухгалтерские журналы
 AccountingJournal=Бухгалтерский журнал
 NewAccountingJournal=Новый бухгалтерский журнал
-ShowAccountingJournal=Показать бухгалтерский журнал
 NatureOfJournal=Природа журнала
 AccountingJournalType1=Разные операции
 AccountingJournalType2=Продажи
@@ -353,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Отключить привязку и пе
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Отключить привязку и перенос в бухгалтерии по закупкам (счета поставщика не будут учитываться в бухгалтерии)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Отключить привязку и перенос в бухгалтерском учете в отчетах о расходах (отчеты о расходах не будут учитываться в бухгалтерском учете)
 ACCOUNTING_ENABLE_LETTERING=Включить функцию надписей в бухгалтерии
-ACCOUNTING_ENABLE_LETTERING_DESC=Если эта опция включена, вы можете определить для каждой бухгалтерской записи код, чтобы группировать различные учетные движения вместе. Раньше, когда разные журналы управлялись независимо, этот особенность был необходим для группировки перемещения линии разных журналов вместе. Однако в бухгалтерском учете Dolibarr такое отслеживание код называется "<b>%s</span". ><span class='notranslate'></b>" уже сохранен автоматически, поэтому автоматическое написание букв уже выполнено без риска ошибки, поэтому этот особенность стал бесполезным для обычного использования. Ручное написание букв особенность предназначено для конечных пользователей, которые действительно не доверяют компьютерному механизму, создающему перевод данных в бухгалтерском учете.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Включение этого особенность больше не требуется для строгого управления бухгалтерским учетом.
 ACCOUNTING_ENABLE_AUTOLETTERING=Включить автоматическое написание букв при передаче в бухгалтерию
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=код для надписи: автоматически сгенерировано и и увеличено и не выбран окончательно пользователь
@@ -462,7 +461,7 @@ ConfirmMassUnletteringAuto=Массовое автоматическое под
 ConfirmMassUnletteringManual=Массовое подтверждение несогласования вручную
 ConfirmMassUnletteringQuestion=Вы действительно хотите, чтобы отменить согласование выбранных записей %s?
 ConfirmMassDeleteBookkeepingWriting=Подтверждение пакетного удаления
-ConfirmMassDeleteBookkeepingWritingQuestion=Это приведет к удалить проводка из учета (все линия записи <span> class='notranslate'>Связанный</span> на тот же проводка будет удален). Вы действительно хотите на удалить выбранные записи %s?
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
 AccountancyClosureConfirmClose=Вы действительно хотите закрыть текущий финансовый период? <span class="warning">Вы понимаете, что закрытие финансового периода является необратимым действием, и навсегда заблокирует любое изменение или удаление записей за этот период</span>.
 AccountancyClosureConfirmAccountingReversal=Вы действительно хотите для записи записей «Нераспределенная прибыль»?
 
@@ -477,7 +476,7 @@ NoJournalDefined=Журнал не определен
 Binded=Линии связаны
 ToBind=Линии для привязки
 UseMenuToSetBindindManualy=Строки еще не связаны, используйте меню <a href="%s">%s</a>, чтобы выполнить привязку вручную
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Примечание. Эта модуль или страница не полностью совместима с экспериментальной особенность из ситуация</. span> <span class='notranslate'>счета-фактуры. Некоторые данные могут быть неверными.
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Несоответствие в коде согласования
 AccountancyErrorMismatchBalanceAmount=Баланс (%s) не равен 0
 AccountancyErrorLetteringBookkeeping=Произошли ошибки, связанные с транзакциями: %s
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 1d3a73d62fc..845c207963c 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -358,7 +358,7 @@ LastStableVersion=Последняя стабильная версия
 LastActivationDate=Последняя дата активации
 LastActivationAuthor=Последний активированный автор
 LastActivationIP=Последний активированный IP-адрес
-LastActivationVersion=Последняя версия активации 
+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>
@@ -460,7 +460,7 @@ ComputedFormula=Вычисленное поле
 ComputedFormulaDesc=Вы можете ввести здесь формулу, используя другие свойства объекта или любой код PHP, чтобы получить динамическое вычисляемое значение. Вы можете использовать любые формулы, совместимые с PHP, включая "?" оператор условия и следующий глобальный объект: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> ПРЕДУПРЕЖДЕНИЕ </strong> : Если вам нужны незагруженные свойства объекта, просто выберите объект в своей формуле, как во втором примере. <br> Использование вычисляемого поля означает, что вы не можете ввести себе какое-либо значение из интерфейса. Кроме того, при наличии синтаксической ошибки формула может ничего не возвращать. <br> <br> Пример формулы: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Пример перезагрузки объекта <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extra ключ поля'] * $reloadedobj ->capital / 5: '-1') <br> <br> Другой пример формулы для принудительной загрузки объекта и его родительского объекта: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield) ->id) > 0) && ($secondloadedobj = новый проект($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Родительский проект не найден'
 Computedpersistent=Сохранить вычисленное поле
 ComputedpersistentDesc=Вычисленные дополнительные поля будут сохранены в базе данных, однако значение будет пересчитано только при изменении объекта этого поля. Если вычисляемое поле зависит от других объектов или глобальных данных, это значение может быть неправильным!!
-ExtrafieldParamHelpPassword=Если оставить это поле пустым, это значение будет храниться БЕЗ шифрования (поле просто скрыто звездочками на экране).<br><br>Введите значение «dolcrypt» для кодирования значения с помощью алгоритма обратимого шифрования. Очистить данные все еще можно узнать, и отредактировать, но они зашифрованы в база данных.<br><br>Введите «auto» (или «md5», «sha256», «password_hash», ...), чтобы использовать по умолчанию</ алгоритм шифрования пароля span> (или md5, sha256, pass_hash...) для сохранения необратимого хешированного пароля в <span class='notranslate'>база данных (нет возможности получить исходное значение)
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
 ExtrafieldParamHelpselect=Список значений должен быть строками формата: ключ, значение (где ключ не может быть равен 0)<br><br>например:<br>1, значение1<br>2, значение2<br>code3, значение3<br>...<br><br>Чтобы иметь список в зависимости от другого списка дополнительных атрибутов:<br>1, значение1|options_ <i>parent_list_code</i>:parent_key<br>2, значение2|options_ <i>parent_list_code</i>:parent_key<br><br>Чтобы иметь список в зависимости от другого списка:<br>1, значение1|<i>parent_list_code</i>:parent_key<br>2, значение2 | <i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0)<br><br>например:<br>1, значение1<br>2, значение2<br>3, значение3<br>...
 ExtrafieldParamHelpradio=Список значений должен быть строками с форматом: ключ, значение (где ключ не может быть равен 0)<br><br>например:<br>1, значение1<br>2, значение2<br>3, значение3<br> ...
@@ -543,7 +543,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Общий частный каталог - это 
 DAV_ALLOW_PUBLIC_DIR=Включить общий публичный каталог (выделенный каталог WebDAV с именем «public» - вход в систему не требуется)
 DAV_ALLOW_PUBLIC_DIRTooltip=Общий публичный каталог - это каталог WebDAV, к которому может получить доступ каждый (в режиме чтения и записи) без авторизации (логин/пароль).
 DAV_ALLOW_ECM_DIR=Включить приватный каталог DMS/ECM (корневой каталог модуля DMS/ECM - требуется вход в систему)
-DAV_ALLOW_ECM_DIRTooltip=Корневой каталог каталог, где все файлы вручную загружены при использовании DMS/ECM <span class='notranslate'>модуль</ пролет>. Как и при доступе через веб-интерфейс, вам потребуется действительный логин/пароль с соответствующими разрешениями для доступа к нему.
+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 adequate permissions to access it.
 ##### Modules #####
 Module0Name=Пользователи и Группы
 Module0Desc=Управление Пользователями/Сотрудниками и Группами
@@ -790,7 +790,7 @@ Permission121=Просмотр контрагентов, связанных с 
 Permission122=Создать/изменить контрагентов, связанных с пользователем
 Permission125=Удалить контрагентов, связанных с пользователем
 Permission126=Экспорт контрагентов
-Permission130=Создание/изменение платежной информации третьих лиц 
+Permission130=Создание/изменение платежной информации третьих лиц
 Permission141=Читать все проекты и задачи (а также частные проекты, по которым я не контактный)
 Permission142=Создавать/изменять все проекты и задачи (а также частные проекты, для которых я не являюсь контактным лицом)
 Permission144=Удалить все проекты и задачи (а также частные проекты я не в контакте)
@@ -1197,6 +1197,7 @@ Skin=Тема оформления
 DefaultSkin=Тема по умолчанию
 MaxSizeList=Максимальная длина списка
 DefaultMaxSizeList=Максимальная длина по умолчанию для списков
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Максимальная длина по умолчанию для коротких списков (т.е. в карточке клиента)
 MessageOfDay=Сообщение дня
 MessageLogin=Сообщение на странице входа
@@ -1404,8 +1405,8 @@ PHPModuleLoaded=Компонент PHP %s загружен
 PreloadOPCode=Используется предварительно загруженный OPCode
 AddRefInList=Отображение ссылки на клиента/поставщика в комбо-списки. <br> Третьи стороны будут отображаться с форматом имени "CC12345 - SC45678 - The Big Company corp." вместо "Корпорация Большой Компании".
 AddVatInList=Отображение номера НДС клиента/поставщика в комбинированных списках.
-AddAdressInList=Отображать клиент/адрес поставщика в комбинированных списках.<br>Появится третий стороны с форматом названия «The Big компания Corp. – 21 Jump Street 123456 Big Town – USA» вместо «The Big <span class='notranslate'>компания</span» > корпорация».
-AddEmailPhoneTownInContactList=Отобразить контактный адрес электронной почты (или телефоны, если не определены) и город информация Список (выберите Список или поле со списком)<br>Контакты будут отображаться с именем в формате «Dupond Durand - dupond.durand@<span class» ='notranslate'>Пример</span>.com – Париж» или «Дюпон Дюран – 06 07 59 65 66 – Париж» вместо «Дюпон Дюран».
+AddAdressInList=Display Customer/Vendor address 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@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
 FieldEdition=Редакция поля %s
 FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
@@ -1517,7 +1518,7 @@ MembersSetup=Настройка модуля участников
 MemberMainOptions=Основные настройки
 MemberCodeChecker=Параметры автоматического создания кодов член
 AdherentLoginRequired=Управляйте логином и паролем для каждого член
-AdherentLoginRequiredDesc=Добавьте значение для входа и и пароля на член файл. Если член связан с пользователь, обновление имени входа член < Пароль span class='notranslate'>и</span> также обновит пароль для входа пользователь и.
+AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Требуется электронная почта для создания нового участника
 MemberSendInformationByMailByDefault=Чекбокс отправить по почте подтверждение участников по умолчанию
 MemberCreateAnExternalUserForSubscriptionValidated=Создайте внешний пользовательский логин для каждой подтвержденной подписки нового участника
@@ -1780,7 +1781,7 @@ AdvancedEditor=Расширенный редактор
 ActivateFCKeditor=Включить FCKeditor для:
 FCKeditorForNotePublic=WYSIWYG создание/редактирование поля «публичные заметки» элементов
 FCKeditorForNotePrivate=WYSIWYG создание/редактирование поля «личные заметки» элементов
-FCKeditorForCompany=WYSIWYG создание/редактирование поля Описание элементов (кроме продукты/<span class='notranslate'>услуги</span) >)
+FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
 FCKeditorForProductDetails=WYSIWYG-создание/редактирование продукты Описание или линии для объектов (линии из предложения, заказы, счета-фактуры и т. д.).
 FCKeditorForProductDetails2=Предупреждение. Использование этой опции в этом случае категорически не рекомендуется, так как это может привести к создать проблемам со специальными символами, и форматированием страницы при создании PDF-файла. файлы.
 FCKeditorForMailing= Создание/редактирование WYSIWYG для массовых рассылок по электронной почте (инструменты->eMailing)
@@ -2153,7 +2154,7 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Сканир
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Пример сбора ответов по электронной почте, отправленных из внешнего программного обеспечения электронной почты
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Соберите все электронные письма, которые являются ответом на электронное письмо, отправленное из вашего приложения. Событие (Module Agenda должно быть включено) с ответом по электронной почте будет записано в нужном месте. Например, если вы отправляете коммерческое предложение, заказ, счет или сообщение на билет по электронной почте из приложения, и получатель отвечает на ваше письмо, система автоматически поймает ответ и добавит его в вашу ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Пример сбора всех входящих сообщений, являющихся ответами на сообщения, отправленные Долибарром.
-EmailCollectorExampleToCollectLeadsDesc=Собирать электронные письма, соответствующие некоторым правилам 'notranslate'>лид</span> (модуль проект должен быть включен) с информацией об электронной почте. Вы можете использовать этот сборщик, если хотите следить за своим лид с помощью модуль проект (1 лид = 1 проект), поэтому ваш Лиды будет быть сгенерирован автоматически. Если сборщик Collect_Responses также включен, когда вы отправляете электронное письмо с вашего Лиды, предложения или любого другого объекта, вы также можете смотрите ответы вашего клиенты или партнеров непосредственно в приложении.<br>Примечание: с этим начальным  Пример, заголовок лид генерируется вместе с электронным письмом. Если третью сторону невозможно найти в база данных (новый клиент), лид  будет прикреплен к третьей стороне с помощью ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
 EmailCollectorExampleToCollectLeads=Пример сбора лидов
 EmailCollectorExampleToCollectJobCandidaturesDesc=Собирайте электронные письма с предложениями о работе (Module Recruitment должен быть включен). Вы можете заполнить этот коллектор, если хотите автоматически создать кандидатуру для запроса на работу. Примечание. В этом начальном примере заголовок кандидата генерируется вместе с адресом электронной почты.
 EmailCollectorExampleToCollectJobCandidatures=Пример сбора кандидатур на работу, полученных по электронной почте
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 2492d4601bd..7be578b576c 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -190,6 +190,6 @@ NoBankAccountDefined=Банковский счет не указан
 NoRecordFoundIBankcAccount=Никаких записей на банковском счете не найдено. Обычно это происходит, когда запись была вручную удалена из списка транзакций на банковском счете (например, во время выверки банковского счета). Другая причина в том, что платеж был записан при отключении модуля «%s».
 AlreadyOneBankAccount=Уже определен один банковский счет
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA файл вариант
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Да = сохранить 'платеж Type' в разделе 'Credit перевод' файла SEPA<br><br>При создании SEPA XML файл для кредитных переводов раздел "PaymentTypeInformation" теперь можно поместить внутри " CreditTransferTransactionInformation» (вместо раздела «платеж»). Мы настоятельно рекомендуем оставить этот флажок снятым и поместить информацию о типе платежа в платеж уровень, так как не все банки обязательно примут ее в CreditTransferTransactionInformation <span. class='notranslate'>уровень</span>. Прежде чем размещать информацию о типе платежа в CreditTransferTransactionInformation уровень, свяжитесь со своим банком.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Yes = Store 'Payment Type' in 'Credit Transfer' section of SEPA file<br><br>When generating a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
 ToCreateRelatedRecordIntoBank=Чтобы создать отсутствующую связанную банковскую запись
 XNewLinesConciliated=%s новый линия(s) согласован
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index 4c3f0973dee..4d5c167068e 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -29,7 +29,7 @@ RestrictYearToExport=Ограничить экспорт по месяцам/г
 BlockedLogEnabled=Включена система для отслеживания событий в неизменяемых журналах.
 BlockedLogDisabled=Система для отслеживания событий в неизменяемых журналах была отключена после того, как были сделаны некоторые записи. Мы сохранили специальный отпечаток пальца, чтобы отслеживать цепочку как сломанную.
 BlockedLogDisabledBis=Система для отслеживания событий в неизменяемых журналах отключена. Это возможно, потому что запись еще не была сделана.
-LinkHasBeenDisabledForPerformancePurpose=В целях повышения производительности прямой ссылка на документ не отображается после 100-го <span class='notranslate'>линия</ пролет>.
+LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
 
 ## logTypes
 logBILL_DELETE=Счет клиента удален логически
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index ba59880516e..5cd4446c98d 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -23,7 +23,8 @@ BoxLastMembersSubscriptions=Последние подписки участник
 BoxFicheInter=Последние вмешательства
 BoxCurrentAccounts=Остаток на открытых счетах
 BoxTitleMemberNextBirthdays=Дни рождения в этом месяце (участники)
-BoxTitleMembersByType=Участники по типу
+BoxTitleMembersByType=Участники по типу и статусу
+BoxTitleMembersByTags=Members by tags and status
 BoxTitleMembersSubscriptionsByYear=Подписки участников по годам
 BoxTitleLastRssInfos=Последние  %s новостей от %s
 BoxTitleLastProducts=Продукты/Услуги: последних %s изменений
@@ -44,8 +45,11 @@ BoxTitleSupplierOrdersAwaitingReception=Заказы поставщика ожи
 BoxTitleLastModifiedContacts=Контакты/Адреса: последнее изменение %s
 BoxMyLastBookmarks=Закладки: последние %s
 BoxOldestExpiredServices=Старейшие активных истек услуги
+BoxOldestActions=Самые старые события, которые стоит сделать
 BoxLastExpiredServices=Последние %s самые старые контакты с активными просроченными услугами
 BoxTitleLastActionsToDo=Последние действия %s, которые нужно сделать
+BoxTitleOldestActionsToDo=Самые старые события %s, которые необходимо выполнить, не завершены
+BoxTitleFutureActions=Следующие %s предстоящие мероприятия
 BoxTitleLastContracts=Последние контракты %s, которые были изменены
 BoxTitleLastModifiedDonations=Последние пожертвования %s, которые были изменены
 BoxTitleLastModifiedExpenses=Последние отчеты о расходах %s, которые были изменены
@@ -109,12 +113,34 @@ NumberOfLinesInSuspenseAccount=Номер строки в предварител
 SuspenseAccountNotDefined=Приостановленный аккаунт не определен
 BoxLastCustomerShipments=Последние поставки клиентам
 BoxTitleLastCustomerShipments=Последние поставки от клиентов %s
+BoxTitleLastLeaveRequests=Последний %s измененные запросы на отпуск
 NoRecordedShipments=Отгрузка от клиента не зафиксирована
-BoxCustomersOutstandingBillReached=Достигнуты клиенты с невыполненным лимитом
+BoxCustomersOutstandingBillReached=клиенты достигнут лимит непогашенной задолженности
 # Pages
 UsersHome=Главная Пользователи и группы
 MembersHome=Главная Участники
 ThirdpartiesHome=Главная Контрагенты
+productindex=Home products and services
+mrpindex=Главная ППМ
+commercialindex=Главная рекламный ролик
+projectsindex=Главная Проекты
+invoiceindex=Главная счета-фактуры
+hrmindex=Главная счета-фактуры
 TicketsHome=Главная Тикеты
+stockindex=Главная Остатки
+sendingindex=Главная доставки
+receptionindex=Главная получения
+activityindex=Главная активность
+proposalindex=Главная предложение
+ordersindex=Главная продажа заказы
+orderssuppliersindex=Главная покупка заказы
+contractindex=Главная контракты
+interventionindex=Главная вмешательства
+suppliersproposalsindex=Главная Поставщики предложения
+donationindex=Главная пожертвования
+specialexpensesindex=Главная специальные расходы
+expensereportindex=Главная отчет о расходах
+mailingindex=Главная рассылка
+opensurveyindex=Главная opensurvey
 AccountancyHome=Главная Бухгалтерия
 ValidatedProjects=Проверенные проекты
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index c8a9bf1efdc..4fbdfd06955 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Просмотр Запланированных задач
 Permission23102 = Создать/обновить Запланированную задачу
 Permission23103 = Удалить Запланированную задачу
@@ -13,7 +12,7 @@ KeyForCronAccess=Ключ безопасности для запуска зап
 FileToLaunchCronJobs=Командная строка для проверки и запуска квалифицированных заданий cron
 CronExplainHowToRunUnix=В среде Unix вы должны использовать следующую запись crontab для запуска командной строки каждые 5 минут
 CronExplainHowToRunWin=В среде Microsoft (tm) Windows вы можете использовать инструменты запланированного задания для запуска командной строки каждые 5 минут.
-CronMethodDoesNotExists=Class %s does not contain any method %s
+CronMethodDoesNotExists=Класс %s не содержит методов %s
 CronMethodNotAllowed=Метод %s класса %s находится в черном списке запрещенных методов
 CronJobDefDesc=Профили заданий Cron определены в файле дескриптора модуля. Когда модуль активирован, они загружаются и становятся доступными, поэтому вы можете управлять заданиями из меню инструментов администратора %s.
 CronJobProfiles=Список предопределенных профилей вакансий cron
@@ -67,7 +66,7 @@ CronModuleHelp=Имя каталога модуля Dolibarr (также раб
 CronClassFileHelp=Относительный путь и имя файла для загрузки (путь относительно корневого каталога веб-сервера). <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr htdocs/product/class/<u>product.class.php</u>, значение для имени файла класса -<br><i>product/class/product.class.php</i>
 CronObjectHelp=Имя загружаемого объекта. <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr /htdocs/product/class/product.class.php, значение имени файла класса будет <br><i>Product</i>
 CronMethodHelp=Метод объекта для запуска. <BR> Например, чтобы вызвать метод выборки объекта продукта Dolibarr /htdocs/product/class/product.class.php, значение метода будет <br><i>fetch</i>
-CronArgsHelp=Аргументы метода. <BR> Например, чтобы вызвать метод выборки объекта Dolibarr Product /htdocs/product/class/product.class.php, значение параметров может быть <br><i>0, ProductRef</i>
+CronArgsHelp=Аргументы метода. <BR> Для Пример для вызова метода выборки объекта Dolibarr продукт /htdocs /продукт/class/продукт.class.php, значение параметров может быть <br> <i>0, ProductRef</i>
 CronCommandHelp=Команда для выполнения
 CronCreateJob=Создать новое запланированное задание
 CronFrom=От
@@ -84,17 +83,18 @@ MakeLocalDatabaseDumpShort=Резервное копирование локал
 MakeLocalDatabaseDump=Создайте дамп локальной базы данных. Параметры: сжатие ('gz' или 'bz' или 'none'), тип резервной копии ('mysql', 'pgsql', 'auto'), 1, 'auto' или имя файла для создания, количество файлов резервных копий для хранения
 MakeSendLocalDatabaseDumpShort=Отправить резервную копию локальной базы данных
 MakeSendLocalDatabaseDump=Отправить резервную копию локальной базы данных по электронной почте. Параметры: кому, от, тема, сообщение, имя файла (имя отправляемого файла), фильтр («sql» только для резервного копирования базы данных)
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
-CleanUnfinishedCronjobShort=Clean unfinished cronjob
-CleanUnfinishedCronjob=Clean cronjob stuck in processing when the process is no longer running
+BackupIsTooLargeSend=К сожалению, последний резервная копия файл слишком велик для отправки по электронной почте.
+CleanUnfinishedCronjobShort=Очистить незаконченный cronjob
+CleanUnfinishedCronjob=Очистить cronjob, зависший в обработке, когда процесс больше не выполняется
 WarningCronDelayed=Внимание, для повышения производительности, какой бы ни была следующая дата выполнения включенных заданий, ваши задания могут быть отложены максимум на %s часов перед запуском.
 DATAPOLICYJob=Очиститель и анонимайзер данных
 JobXMustBeEnabled=Должно быть включено задание %s
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+EmailIfError=Электронная почта для предупреждения об ошибке
+JobNotFound=Job %s not found in list of jobs (try to disable/enabled module)
+ErrorInBatch=Ошибка при запуске задания %s
 
 # Cron Boxes
 LastExecutedScheduledJob=Последнее выполненное запланированное задание
 NextScheduledJobExecute=Следующее запланированное задание для выполнения
 NumberScheduledJobError=Количество запланированных заданий с ошибкой
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+NumberScheduledJobNeverFinished=номер запланированных заданий так и не были завершены
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 1193f40aebd..e62cfa30b66 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Количество документов в каталоге
 ECMSection=Директория
 ECMSectionManual=Директория в ручном режиме
 ECMSectionAuto=Директория в автоматическом режиме
-ECMSectionsManual=Ручное дерево директории
-ECMSectionsAuto=Автоматическое дерево директории
-ECMSectionsMedias=Medias tree
+ECMSectionsManual=Частное ручное дерево
+ECMSectionsAuto=Частное автоматическое дерево
+ECMSectionsMedias=Публичное дерево
 ECMSections=Директории
 ECMRoot=Корень ECM
 ECMNewSection=Новая директория
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Количество файлов в поддиректор
 ECMCreationUser=Создатель
 ECMArea=Область DMS/ECM
 ECMAreaDesc=Область DMS/ECM (Система управления документами / Управление электронным контентом) позволяет сохранять, обмениваться и быстро искать все виды документов в Dolibarr.
-ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
-ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc2a=* Ручные каталоги могут использоваться для сохранения документов со свободной организацией древовидной структуры.
+ECMAreaDesc2b=* Каталоги заполняются автоматически автоматически при добавлении документов со страницы элемента.
+ECMAreaDesc3=* Public directories are files into the subdirectory <b>/medias</b> of the documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitly. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Каталог <b>%s</b> удален.
 ECMSectionWasCreated=Каталог <b>%s</b> создан.
 ECMSearchByKeywords=Поиск по ключевым словам
@@ -45,8 +45,12 @@ ExtraFieldsEcmFiles=Файлы Extrafields Ecm
 ExtraFieldsEcmDirectories=Каталоги Extrafields Ecm
 ECMSetup=Настройка ECM
 GenerateImgWebp=Дублируйте все изображения с другой версией в формате .webp
-ConfirmGenerateImgWebp=Если вы подтвердите, вы сгенерируете изображение в формате .webp для всех изображений, находящихся в настоящее время в этой папке (подпапки не включены) ...
+ConfirmGenerateImgWebp=Если вы подтвердите, вы создадите изображение в формате .webp для всех изображений, находящихся в данный момент в этой папке (подпапки не включены, изображения WebP не будут созданы, если Размер больше исходного )...
 ConfirmImgWebpCreation=Подтвердите дублирование всех изображений
+GenerateChosenImgWebp=Дублируйте выбранное изображение другой версией в формате .webp.
+ConfirmGenerateChosenImgWebp=Если вы подтвердите, вы создадите изображение в формате .webp для изображения %s
+ConfirmChosenImgWebpCreation=Подтвердите дублирование выбранных изображений
 SucessConvertImgWebp=Изображения успешно скопированы
+SucessConvertChosenImgWebp=Выбранное изображение успешно дублировано
 ECMDirName=Имя режиссера
 ECMParentDirectory=Родительский каталог
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 42d91d37454..73a7909fe27 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -95,10 +95,10 @@ ErrorModuleRequireJavascript=JavaScript не должен быть Отключ
 ErrorPasswordsMustMatch=Оба введенных пароля должны совпадать друг с другом
 ErrorContactEMail=Произошла техническая ошибка. Пожалуйста, свяжитесь с администратором по адресу следующий по электронной почте <b>%s</b> и укажите ошибку код <b> %s</b> в свое сообщение или добавьте копию экрана этой страницы.
 ErrorWrongValueForField=Поле <b>%s</b>: '<b>%s</b>' не совпадает с регулярным выражением <b>%s</b>
-ErrorHtmlInjectionForField=Поле <b>%s</b>: значение '<span class='notranslate' '><b></span>%s</b>' содержит вредоносные данные, которые запрещены
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Поле <b>%s</b>: '<b>%s</b>' не является найденным значением в поле <b>%s</b> из <b>%s</b>
 ErrorFieldRefNotIn=Поле <b>%s</b>: '<b>%s</b>' не является <b>%s</b> существующей ссылкой
-ErrorMultipleRecordFoundFromRef=При поиске по ссылка <b>%s<span class=' найдено несколько записей. notranslate'></b></span>. Невозможно узнать, какой ID использовать.
+ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
 ErrorsOnXLines=%s обнаружены ошибки
 ErrorFileIsInfectedWithAVirus=Антивирусная программа не смогла проверить файл (файл может быть заражен вирусом)
 ErrorFileIsAnInfectedPDFWithJSInside=The file is a PDF infected by some Javascript inside
@@ -305,15 +305,15 @@ ErrorThisPaymentModeIsNotSepa=Этот режим платеж не являет
 ErrorStripeCustomerNotFoundCreateFirst=Полоса клиент не установлена для этой третьей стороны (или ей присвоено значение, удаленное на стороне Stripe). создать (или прикрепите его сначала).
 ErrorCharPlusNotSupportedByImapForSearch=Поиск IMAP не может найти у отправителя или получателя строку, содержащую символ +
 ErrorTableNotFound=Таблица <b>%s</b> не найдена
-ErrorRefNotFound=ссылка <b>%s<span class='notranslate'></b></ диапазон> не найден
+ErrorRefNotFound=Ref <b>%s</b> not found
 ErrorValueForTooLow=Значение для <b>%s</b> слишком низкое
 ErrorValueCantBeNull=Значение для <b>%s</b> не может быть нулевым
 ErrorDateOfMovementLowerThanDateOfFileTransmission=дата банка проводка не может быть ниже, чем дата передачи файл
 ErrorTooMuchFileInForm=Слишком много файлов в форма, максимальное значение номер – %s файл(s)
-ErrorSessionInvalidatedAfterPasswordChange=Сеанс был признан недействительным следующий сменой пароля, электронной почты, статус или <span class='notranslate'>даты</ диапазон> срока действия. Пожалуйста, перезайдите.
+ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, email, status or dates of validity. Please relogin.
 ErrorExistingPermission = Разрешение <b>%s</b> для объекта  <b>%s</b> уже существует
 ErrorFieldExist=Значение для <b>%s</b> уже существует
-ErrorEqualModule=модуль недействителен в <b>%s</b> 
+ErrorEqualModule=модуль недействителен в <b>%s</b>
 ErrorFieldValue=Значение для <b>%s</b> неверно
 ErrorCoherenceMenu=<b>%s</b> требуется, когда  <b>%s</b> — «слева»
 ErrorUploadFileDragDrop=Произошла ошибка при выполнении файл(s) загрузить
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 71139ac99fb..f62b225bb00 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -187,7 +187,7 @@ NoMoreRecipientToSendTo=Больше нет получателя, котором
 EmailOptedOut=Владелец электронной почты попросил больше не связываться с ним по этому адресу.
 EvenUnsubscribe=Включить электронные письма для отказа
 EvenUnsubscribeDesc=Включите электронные письма об отказе от рассылки, когда вы выбираете электронные письма в качестве целевых. Полезно для обязательных электронных писем услуга для Пример.
-XEmailsDoneYActionsDone=%s электронные письма предварительно квалифицированы, %s электронные письма успешно обработаны (для %s class='notranslate'>%s</span> запись/действия выполнены)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
 helpWithAi=Generate message from AI
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 69644c7265e..8d03f9ac64d 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -105,7 +105,7 @@ LevelOfFeature=Уровень возможностей
 NotDefined=Неопределено
 DolibarrInHttpAuthenticationSoPasswordUseless=Режим аутентификации Dolibarr установлен в <b>%s</b> в файле конфигурации <b>conf.php</b>.<br>Это означает, что Dolibarr хранит пароли во внешней базе, поэтому изменение этого поля может не помочь.
 Administrator=Системный администратор
-AdministratorDesc=Системный администратор (может администрировать пользователь, разрешения, а также системные настройка и < конфигурация span class='notranslate'>модули</span>)
+AdministratorDesc=System administrator (can administer user, permissions but also system setup and modules configuration)
 Undefined=Неопределено
 PasswordForgotten=Забыли пароль?
 NoAccount=Нет аккаунта?
@@ -420,6 +420,8 @@ TotalTTCShort=Всего (вкл-я налог)
 TotalHT=Всего (без налога)
 TotalHTforthispage=Всего (без налога) для этой страницы
 Totalforthispage=Итого для этой страницы
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Всего (вкл-я налог)
 TotalTTCToYourCredit=Всего (вкл-я налог) с Вашей кредитной
 TotalVAT=Всего НДС
@@ -647,6 +649,7 @@ ReportName=Имя отчета
 ReportPeriod=Период отчета
 ReportDescription=Описание
 Report=Отчет
+Reports=Отчёты
 Keyword=Ключевое слово
 Origin=Происхождение
 Legend=Легенда
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 9faa5d68823..e363c55a0cb 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -27,7 +27,7 @@ MembersListNotUpToDate=Список действительных участни
 MembersListExcluded=Список исключенных участников
 MembersListResiliated=Список прекращенных участников
 MembersListQualified=Список квалифицированных участников
-MembersShowMembershipTypesTable=Показать таблица всех доступных типов членства (если нет, Показать непосредственно регистрация <span class='notranslate'>форма< /пролет>)
+MembersShowMembershipTypesTable=Show a table of all available membership types (if no, show directly the registration form)
 MembersShowVotesAllowed=Показать разрешено ли голосование, в таблице типов членства
 MenuMembersToValidate=Проект участники
 MenuMembersValidated=Подтвержденные участники
@@ -171,7 +171,7 @@ HTPasswordExport=htpassword файл поколения
 NoThirdPartyAssociatedToMember=Никакая третья сторона не связана с этим участником
 MembersAndSubscriptions=Члены и взносы
 MoreActions=Дополнительные меры по записи
-MoreActionsOnSubscription=Дополнительное действие, предложенное по умолчанию при записи вклада, также выполняется автоматически в Интернете <span class='notranslate'>платеж</ диапазон> вклада
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatically on online payment of a contribution
 MoreActionBankDirect=Создайте прямую запись на банковский счет
 MoreActionBankViaInvoice=Создайте счет-фактуру и оплату на банковский счет
 MoreActionInvoiceOnly=Создание счета без каких-либо оплаты
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 5858265b2f3..7202a23fe1d 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -106,7 +106,7 @@ PermissionsDefDesc=Определите здесь новые разрешени
 MenusDefDescTooltip=Меню, предоставляемые вашим модулем/приложением, определены в массиве <strong> $this->menus </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) меню также отображаются в редакторе меню, доступном для пользователей-администраторов на %s.
 DictionariesDefDescTooltip=Словари, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> dictionaries </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) словари также отображаются в области настройки для пользователей-администраторов на %s.
 PermissionsDefDescTooltip=Разрешения, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> rights </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) разрешения отображаются в настройках разрешений по умолчанию %s.
-HooksDefDesc=Определите в свойстве <b>module_parts['hooks']</b>, в модуль</ дескриптор span> <span class='notranslate'>файл, Список контекстов, когда ваш перехватчик должен быть выполнен (Список  возможных контекстов можно найти с помощью поиска по запросу '<b>initHooks(</b>' в ядре код).<br>Затем отредактируйте файл с помощью хуков  код с код ваших подключаемых функций (Список подключаемых функций можно найти с помощью поиска по ' <b>executeHooks</b>' в ядре код).
+HooksDefDesc=Define in the property <b>module_parts['hooks']</b>, in the module descriptor file, the list of contexts when your hook must be executed (the list of possible contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Then edit the file with hooks code with the code of your hooked functions (the list of hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Определите в файле триггера код, который вы хотите выполнять при выполнении бизнес-события, внешнего по отношению к вашему модулю (события, инициированные другими модулями).
 SeeIDsInUse=См. Идентификаторы, используемые в вашей установке
 SeeReservedIDsRangeHere=См. Диапазон зарезервированных идентификаторов
@@ -177,8 +177,8 @@ ApiObjectDeleted=API для объекта %s был успешно удален
 CRUDRead=Читать
 CRUDCreateWrite=создать или Обновить
 FailedToAddCodeIntoDescriptor=Не удалось добавить код в дескриптор. проверить что строковый комментарий "%s" все еще присутствует в файл .
-DictionariesCreated=Словарь <b>%s</b> создан успешно 
-DictionaryDeleted=Словарь <b>%s</b> удален успешно 
+DictionariesCreated=Словарь <b>%s</b> создан успешно
+DictionaryDeleted=Словарь <b>%s</b> удален успешно
 PropertyModuleUpdated=Свойство <b>%s</b> обновлено успешно
 InfoForApiFile=* При первом создании файл для каждого объекта будут созданы все методы <strong>.</strong><br>* При нажатии кнопки <strong>remove</strong> вы просто удаляете все методы для <strong>выбранного объекта</strong>.
 SetupFile=Страница для модуль настройка
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index 038df26e7b9..d1478c7a8d6 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -27,13 +27,18 @@ ConfirmCloneBillOfMaterials=Вы уверены, что хотите клони
 ConfirmCloneMo=Вы действительно хотите клонировать заказ на производство %s?
 ManufacturingEfficiency=Эффективность производства
 ConsumptionEfficiency=Эффективность потребления
-Consumption=Consumption
+Consumption=Потребление
 ValueOfMeansLoss=Значение 0,95 означает в среднем 5%% потерь при изготовлении или разборке.
 ValueOfMeansLossForProductProduced=Значение 0.95 означает в среднем 5%% потерь произведенного продукта.
 DeleteBillOfMaterials=Удалить перечень элементов
+CancelMo=отменить Производство заказ
+MoCancelConsumedAndProducedLines=отменить также все потребленные и произведенные линии (удалить линии и откат Остатки)
+ConfirmCancelMo=Вы действительно хотите в отменить это производство заказ?
 DeleteMo=Удалить производственный заказ
 ConfirmDeleteBillOfMaterials=Вы уверены, что хотите удалить эту спецификацию материалов?
 ConfirmDeleteMo=Вы действительно хотите удалить этот заказ на производство?
+DeleteMoChild = удалить дочерние МО, связанные с этим МО %s
+MoChildsDeleted = Все дочерние МО удалены.
 MenuMRP=Заказы на производство
 NewMO=Новый заказ на производство
 QtyToProduce=Кол-во для производства
@@ -60,6 +65,8 @@ ToProduce=Производить
 ToObtain=Чтобы получить
 QtyAlreadyConsumed=Кол-во уже израсходовано
 QtyAlreadyProduced=Кол-во уже произведено
+QtyAlreadyConsumedShort=Qty consumed
+QtyAlreadyProducedShort=Qty produced
 QtyRequiredIfNoLoss=Кол-во, необходимое для производства количества, указанного в спецификации, если нет потерь (если эффективность производства равна 100%%)
 ConsumeOrProduce=Потребляйте или производите
 ConsumeAndProduceAll=Потребляйте и производите все
@@ -102,7 +109,7 @@ NbOperatorsRequired=Требуемое количество операторов
 THMOperatorEstimated=Предполагаемый оператор THM
 THMMachineEstimated=Ориентировочная машина THM
 WorkstationType=Тип рабочего места
-DefaultWorkstation=Default workstation
+DefaultWorkstation=по умолчанию рабочая станция
 Human=Человек
 Machine=Машина
 HumanMachine=Человек / Машина
@@ -112,13 +119,20 @@ THMEstimatedHelp=Эта ставка позволяет определить п
 BOM=Спецификации материалов
 CollapseBOMHelp=Вы можете определить отображение деталей номенклатуры по умолчанию в конфигурации модуля Спецификации материалов.
 MOAndLines=Производственные заказы и строки
-MoChildGenerate=Generate Child Mo
-ParentMo=MO Parent
-MOChild=MO Child
-BomCantAddChildBom=The nomenclature %s is already present in the tree leading to the nomenclature %s
-BOMNetNeeds = BOM Net Needs
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
-Manufacturing=Manufacturing
-Disassemble=Disassemble
-ProducedBy=Produced by
+MoChildGenerate=Создать дочерний Мо
+ParentMo=МО родитель
+MOChild=МО Чайлд
+BomCantAddChildBom=Номенклатура %s уже присутствует в дереве, ведущем к номенклатуре %s
+BOMNetNeeds = Спецификация Чистые потребности
+BOMProductsList=Спецификация продукты
+BOMServicesList=Спецификация услуги
+Manufacturing=Производство
+Disassemble=Разобрать
+ProducedBy=Произведено
+QtyTot=Кол-во Итого
+
+QtyCantBeSplit= Количество Не может будет разделено
+NoRemainQtyToDispatch=Не осталось количества для разделения
+
+THMOperatorEstimatedHelp=Ориентировочная стоимость часа работы оператора. Будет использоваться для оценки стоимости Спецификация с использованием этой рабочей станции.
+THMMachineEstimatedHelp=Ориентировочная стоимость машины в час. Будет использоваться для оценки стоимости Спецификация с использованием этой рабочей станции.
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 944d78612d4..001db0f507d 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
-OrderExists=заказ уже открыть связан с этим предложение, поэтому никаких других < создан span class='notranslate'>заказ</span> автоматически
+OrderExists=An order was already open linked to this proposal, so no other order was created automatically
 OrdersArea=Раздел заказов клиентов
 SuppliersOrdersArea=Область заказов на закупку
 OrderCard=Карточка заказа
diff --git a/htdocs/langs/ru_RU/partnership.lang b/htdocs/langs/ru_RU/partnership.lang
index 9cbf2834408..be3d7b3a2c4 100644
--- a/htdocs/langs/ru_RU/partnership.lang
+++ b/htdocs/langs/ru_RU/partnership.lang
@@ -92,7 +92,6 @@ LastCheckBacklink=Дата последней проверки URL
 
 NewPartnershipRequest=Новый запрос на партнерство
 NewPartnershipRequestDesc=Эта форма позволяет вам подать заявку на участие в одной из наших партнерских программ. Если вам нужна помощь в заполнении этой формы, свяжитесь с нами по электронной почте <b> %s </b> .
-ThisUrlMustContainsAtLeastOneLinkToWebsite=Эта страница должна содержать хотя бы один ссылка в одном из доменов следующий: <span class='notranslate'>%s</ пролет>
+ThisUrlMustContainsAtLeastOneLinkToWebsite=This page must contains at least one link to one of the following domain: %s
 
 IPOfApplicant=ИП заявителя
-
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index e1b3bc46ae6..315af2461af 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -80,8 +80,8 @@ SoldAmount=Сумма продажи
 PurchasedAmount=Сумма покупки
 NewPrice=Новая цена
 MinPrice=Мин. цена продажи
-MinPriceHT=Min. selling price (excl. tax)
-MinPriceTTC=Min. selling price (inc. tax)
+MinPriceHT=Мин. цена продажи (исключая налог)
+MinPriceTTC=Мин. цена продажи (включая налог)
 EditSellingPriceLabel=Изменить ярлык цены продажи
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
 CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
@@ -208,11 +208,6 @@ unitSET=Установить
 unitS=Второй
 unitH=Час
 unitD=День
-unitG=Грамм
-unitM=Метр
-unitLM=Линейный метр
-unitM2=Квадратный метр
-unitM3=Кубический метр
 unitL=Литр
 unitT=тонна
 unitKG=кг
@@ -221,6 +216,7 @@ unitMG=мг
 unitLB=фунт
 unitOZ=унция
 unitM=Метр
+unitLM=Линейный метр
 unitDM=дм
 unitCM=см
 unitMM=мм
@@ -350,7 +346,7 @@ UseProductFournDesc=Добавьте функцию для определени
 ProductSupplierDescription=Описание продавца продукта
 UseProductSupplierPackaging=Используйте функцию «упаковки» для округления количества до заданного кратного значения (при добавлении/обновлении строки в документах поставщика пересчитывайте количество и закупочные цены в соответствии с более высоким множителем, установленным в закупочных ценах продукта)
 PackagingForThisProduct=Упаковка количества
-PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
+PackagingForThisProductDesc=Вы получите автоматически покупка кратное этому количеству.
 QtyRecalculatedWithPackaging=Количество линии пересчитано в соответствии с упаковкой поставщика.
 
 #Attributes
@@ -391,7 +387,7 @@ ErrorDeletingGeneratedProducts=При попытке удалить сущест
 NbOfDifferentValues=Кол-во разных значений
 NbProducts=Количество продуктов
 ParentProduct=Родительский продукт
-ParentProductOfVariant=Parent product of variant
+ParentProductOfVariant=родитель продукт варианта
 HideChildProducts=Скрыть варианты продуктов
 ShowChildProducts=Показать варианты продуктов
 NoEditVariants=Перейдите в карточку родительского продукта и отредактируйте влияние вариантов на цену на вкладке вариантов.
@@ -404,7 +400,7 @@ ActionAvailableOnVariantProductOnly=Действие доступно тольк
 ProductsPricePerCustomer=Цены на продукцию для каждого покупателя
 ProductSupplierExtraFields=Дополнительные атрибуты (цены поставщиков)
 DeleteLinkedProduct=Удалить дочерний продукт, связанный с комбинацией
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=ед.измерения сумма, используемая для обновления средневзвешенного значения цена
 PMPValue=Средневзвешенная цена
 PMPValueShort=СВЦ
 mandatoryperiod=Обязательные периоды
@@ -421,12 +417,12 @@ ProductsMergeSuccess=Продукты были объединены
 ErrorsProductsMerge=Ошибки в объединении продуктов
 SwitchOnSaleStatus=Включить статус продажи
 SwitchOnPurchaseStatus=Включить статус покупки
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock movement)
+UpdatePrice=Увеличение/уменьшить клиент цена
+StockMouvementExtraFields= Дополнительные поля (перемещение остаток)
 InventoryExtraFields= Дополнительные поля (инвентарь)
 ScanOrTypeOrCopyPasteYourBarCodes=Отсканируйте или введите или скопируйте/вставьте свои штрих-коды
 PuttingPricesUpToDate=Обновить цены с текущими известными ценами
-PuttingDescUpToDate=Update descriptions with current known descriptions
+PuttingDescUpToDate=Обновить описания, используя текущие известные описания.
 PMPExpected=Ожидаемый PMP
 ExpectedValuation=Ожидаемая оценка
 PMPReal=Настоящий пмп
@@ -434,6 +430,9 @@ RealValuation=Реальная оценка
 ConfirmEditExtrafield = Выберите дополнительное поле, которое вы хотите изменить
 ConfirmEditExtrafieldQuestion = Вы уверены, что хотите изменить это дополнительное поле?
 ModifyValueExtrafields = Изменить значение дополнительного поля
-OrProductsWithCategories=Or products with tags/categories
-WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
-WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+OrProductsWithCategories=Или продукты с ярлыки/категории
+WarningTransferBatchStockMouvToGlobal = Если вы хотите десериализовать этот продукт, все его сериализованные остаток будут преобразованы в глобальные остаток
+WarningConvertFromBatchToSerial=Если в настоящее время у вас есть количество, превышающее или равное 2 для продукт, переключение на этот вариант означает, что у вас все еще будет продукт с разными объектами одного пакета (хотя вам нужен уникальный Серийный номер). Дубликат останется до тех пор, пока не будет произведена инвентаризация или перемещение вручную остаток для исправления ситуации.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 1f54e81f248..66731f03e2b 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -283,7 +283,7 @@ ModuleStockTransferDesc=Расширенное управление остато
 StockTransferNew=Новый остаток перевод
 StockTransferList=остаток передает Список
 ConfirmValidateStockTransfer=Вы действительно хотите на подтвердить этот Остатки перевод  со ссылкой <b>%s</b> ?
-ConfirmDestock=уменьшить из Остатки с перевод %s 
+ConfirmDestock=уменьшить из Остатки с перевод %s
 ConfirmDestockCancel=отменить уменьшить из Остатки с перевод  %s
 DestockAllProduct=уменьшить из Остатки
 DestockAllProductCancel=отменить уменьшить из Остатки
@@ -295,8 +295,8 @@ DatePrevueDepart=Предполагаемый дата отбытия
 DateReelleDepart=действительный дата отправления
 DatePrevueArrivee=Предполагаемое дата прибытия
 DateReelleArrivee=действительный дата прибытия
-HelpWarehouseStockTransferSource=Если этот склад установлен, только сам и его дочерние элементы будут доступны в качестве источника <span class='notranslate'>склад< /пролет>
-HelpWarehouseStockTransferDestination=Если этот склад установлен, только сам и его дочерние элементы будут доступны в качестве пункта назначения <span class='notranslate'>склад< /пролет>
+HelpWarehouseStockTransferSource=If this warehouse is set, only itself and its children will be available as source warehouse
+HelpWarehouseStockTransferDestination=If this warehouse is set, only itself and its children will be available as destination warehouse
 LeadTimeForWarning=лид время до оповещения (в днях)
 TypeContact_stocktransfer_internal_STFROM=Отправитель Остатки перевод
 TypeContact_stocktransfer_internal_STDEST=Получатель Остатки перевод
@@ -326,7 +326,7 @@ ReverseConfirmed=остаток движение было отменено ус
 WarningThisWIllAlsoDeleteStock=Внимание! При этом также будут уничтожены все количества в остаток в склад.
 ValidateInventory=Инвентарь подтверждение
 IncludeSubWarehouse=Включить под-склад ?
-IncludeSubWarehouseExplanation=проверить в этом поле, если вы хотите включить все суб-Склады связанного <span class='notranslate'>склад</ пролет> в инвентаре
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=удалить партия/serial
 ConfirmDeleteBatch=Вы действительно хотите до удалить партия/serial ?
 WarehouseUsage=склад использование
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index 59f76192b17..5214a5f8fb7 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -9,26 +9,26 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Автоматически создав
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматически создавать счет клиента после закрытия заказа на продажу (новый счет будет иметь ту же сумму, что и заказ)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=При создании заявки автоматически создайте вмешательство.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Классифицировать связанный источник предложения как счет выставлен, если продажи заказ имеет значение счет выставлен (и, если количество заказ соответствует общей сумме подписанной ссылки предложения)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders 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_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицировать связанный источник продажи заказ как счет выставлен, когда счет-фактура клиента проверяется (и, если сумма счет-фактура равна общей сумме связанные заказы продажи). Если у вас есть 1 счет-фактура, проверенный для n заказов, это также может установить для всех заказов значение счет выставлен.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицировать связанный источник продажи как счет выставлен, если для счет-фактура клиента установлено значение Оплачен (и, если сумма счет-фактура равна общей сумме количество связанных продажи заказов). Если у вас есть 1 счет-фактура set счет выставлен для n заказов, это может установить для всех заказов значение счет выставлен  тоже.
+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 proposals)
 # 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 orders)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Классифицировать связанный источник покупка заказ как счет выставлен, если поставщик счет-фактура проверяется (и, если сумма счет-фактура равна общей сумме связанные заказы)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Классифицировать связанный исходный заказ на покупку как полученный, когда прием подтвержден (и если количество, полученное всеми приемами, такое же, как в заказе на покупку для обновления)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Классифицировать связанный исходный заказ на покупку как полученный, когда прием закрыт (и если количество, полученное всеми приемами, такое же, как в заказе на покупку для обновления)
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
-descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Классифицировать поставку связанного источника как закрытую, если счет-фактура клиента подтвержден (и, если сумма  счет-фактура соответствует общей сумме связанных поставок)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Классифицировать отправку связанного источника как счет выставлен, если счет-фактура клиента подтвержден (и, если сумма счет-фактура равна общей сумме связанных отправлений)
 # Autoclassify receptions
-descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
-descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Классифицировать приемы связанных источников как счет выставлен, если покупка счет-фактура проверен (и, если сумма счет-фактура равна общей сумме связанных приемов)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Классифицировать приемы связанных источников как счет выставлен, если покупка счет-фактура проверен (и, если сумма счет-фактура равна общей сумме связанных приемов)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
+descWORKFLOW_TICKET_LINK_CONTRACT=При создании талон, ссылка всех доступных контрактов соответствия третьему стороны
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=При привязке договоров искать среди договоров материнских компаний
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Закройте все вмешательства, связанные с заявкой, когда заявка закрыта
diff --git a/htdocs/langs/ru_UA/errors.lang b/htdocs/langs/ru_UA/errors.lang
new file mode 100644
index 00000000000..a2f9be5ee1f
--- /dev/null
+++ b/htdocs/langs/ru_UA/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index ac4edd65d27..e5cde6708c1 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=Kategória pre účtovný účet bola odstránená
 AccountingJournals=Účtovné denníky
 AccountingJournal=Účtovný denník
 NewAccountingJournal=Nový účtovný denník
-ShowAccountingJournal=Zobraziť účtovný denník
 NatureOfJournal=Povaha časopisu
 AccountingJournalType1=Rôzne operácie
 AccountingJournalType2=Predaje
@@ -353,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Zakázať viazanie a prevod v účtovníctve
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Zakázať viazanie a prevod v účtovníctve pri nákupoch (faktúry dodávateľa sa nebudú brať do úvahy v účtovníctve)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Zakázať viazanie a prevod v účtovníctve na výkazoch výdavkov (výdavkové výkazy sa nebudú brať do úvahy v účtovníctve)
 ACCOUNTING_ENABLE_LETTERING=Povoliť funkciu písma v účtovníctve
-ACCOUNTING_ENABLE_LETTERING_DESC=Keď je táto možnosť zapnutá, môžete definovať pre každý účtovný zápis kód, aby ste mohli zoskupovať rôzne účtovné pohyby. V minulosti, keď sa rôzne časopisy spravovali nezávisle, bola táto funkcia potrebná na zoskupenie línií pohybu rôznych časopisov. S účtovníctvom Dolibarr sa však takýto kód sledovania nazýva "<b>%s<span class='notranslate'>b09a4f739f17 span>" je už uložený automaticky, takže automatické písanie je už vykonané, bez rizika chyby, takže táto funkcia je pre bežné použitie zbytočná. Funkcia ručného písania je určená pre koncových používateľov, ktorí skutočne neveria počítačovému stroju, ktorý prenáša údaje v účtovníctve.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Povolenie tejto funkcie už nie je potrebné pre dôslednú správu účtovníctva.
 ACCOUNTING_ENABLE_AUTOLETTERING=Povoliť automatické písanie pri prenose do účtovníctva
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kód pre písmo sa generuje automaticky a zvyšuje a nevyberá si ho koncový používateľ
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index e94246e391d..b4c2b5ac4cd 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -106,7 +106,7 @@ NextValueForInvoices=Ďalšie hodnota (faktúry)
 NextValueForCreditNotes=Ďalšie hodnota (dobropisov)
 NextValueForDeposit=Ďalšia hodnota (záloha)
 NextValueForReplacements=Ďalšie hodnota (náhrady)
-MustBeLowerThanPHPLimit=Poznámka: Vaša konfigurácia PHP momentálne obmedzuje maximálnu veľkosť súboru na nahrávanie do <b>%s</b> span> <span class='notranslate'>%s, bez ohľadu na hodnotu tohto parametra
+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=Poznámka: No limit je nastavený v konfigurácii PHP
 MaxSizeForUploadedFiles=Maximálna veľkosť nahraných súborov (0, aby tak zabránil akejkoľvek odosielanie)
 UseCaptchaCode=Použite grafický kód (CAPTCHA) na prihlasovacej stránke a niektorých verejných stránkach
@@ -163,7 +163,7 @@ PurgeAreaDesc=Táto stránka vám umožňuje vymazať všetky súbory vygenerova
 PurgeDeleteLogFile=Odstráňte súbory denníka vrátane <b>%s</b> (definovaný pre modul Sys riziko straty údajov)
 PurgeDeleteTemporaryFiles=Odstráňte všetky protokoly a dočasné súbory (bez rizika straty údajov). Parameter môže byť 'tempfilesold', 'logfiles' alebo oba 'tempfilesold+logfiles'. Poznámka: Vymazanie dočasných súborov sa vykoná iba vtedy, ak bol dočasný adresár vytvorený pred viac ako 24 hodinami.
 PurgeDeleteTemporaryFilesShort=Odstráňte denník a dočasné súbory (bez rizika straty údajov)
-PurgeDeleteAllFilesInDocumentsDir=Odstráňte všetky súbory v adresári: <b>%s</b>.%s</b>.%s. 'notranslate'><br></span>Týmto sa vymažú všetky vygenerované dokumenty súvisiace s prvkami (tretie strany, faktúry atď...), súbory nahrané do modulu ECM, výpisy zálohy databázy a dočasné súbory.
+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=Vyčistiť teraz
 PurgeNothingToDelete=Žiadne súbory alebo priečinky na zmazanie
 PurgeNDirectoriesDeleted=<b>%s</b> súbory alebo adresáre odstránené.
@@ -221,13 +221,13 @@ ModulesDevelopDesc=Môžete si tiež vytvoriť svoj vlastný modul alebo nájsť
 DOLISTOREdescriptionLong=Namiesto zapínania <a href="https://www.dolistore.com">www.dolistore.com</a> webovej stránky na nájdenie externého modulu môžete použiť tento vložený nástroj, ktorý vykoná vyhľadávanie na externom trhu za vás (môže byť pomalé, vyžaduje prístup na internet)...
 FreeModule=zadarmo
 CompatibleUpTo=Kompatibilné s verziou %s
-NotCompatible=Zdá sa, že tento modul nie je kompatibilný s vaším Dolibarr %s (Min. %s – Max <span class='notranslate'>b0ecb2zec87f49 rozpätie>).
-CompatibleAfterUpdate=Tento modul vyžaduje aktualizáciu vášho Dolibarr %s (min. %s – max. <span class='notranslate'>%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=Pozrite si na Trhovisku
 SeeSetupOfModule=Pozrite si nastavenie modulu %s
 SeeSetupPage=Pozrite si stránku nastavenia na %s
 SeeReportPage=Pozrite si stránku správy na adrese %s
-SetOptionTo=Nastavte možnosť <b>%s</b> na <span' class='notranslate %s</span>
+SetOptionTo=Set option <b>%s</b> to %s
 Updated=Aktualizované
 AchatTelechargement=Kúpiť / stiahnuť
 GoModuleSetupArea=Ak chcete nasadiť alebo nainštalovať nový modul, prejdite do oblasti Nastavenie modulu: <a href="%s">%s</a> .
@@ -250,8 +250,8 @@ Security=Zabezpečenie
 Passwords=Heslá
 DoNotStoreClearPassword=Šifrovať heslá uložené v databáze (NIE ako obyčajný text). Dôrazne sa odporúča aktivovať túto možnosť.
 MainDbPasswordFileConfEncrypted=Zašifrovať heslo databázy uložené v conf.php. Dôrazne sa odporúča aktivovať túto možnosť.
-InstrucToEncodePass=Ak chcete mať heslo zakódované do súboru <b>conf.php</b>, nahraďte riadok b0392bzccf /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342bzccfda19 >by<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb2ec87f49";f span class='notranslate'></b>
-InstrucToClearPass=Ak chcete, aby bolo heslo dekódované (vymazané) do súboru <b>conf.php</b>, nahraďte riadok <br><b>$dolibarr_main_db_pass="crypted:...";b09a4b739f17f8z'no<spanlate' ><br></span>by<br><b>$dolibarr_main_db_pass="<span class='0bec7</notranslate>9 ";</b>
+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=Chráňte vygenerované súbory PDF. Toto sa NEODPORÚČA, pretože to prerušuje hromadné generovanie PDF.
 ProtectAndEncryptPdfFilesDesc=Ochrana dokumentu PDF umožňuje jeho čítanie a tlač pomocou ľubovoľného prehliadača PDF. Úprava a kopírovanie však už nie je možné. Všimnite si, že pri použití tejto funkcie nebude fungovať vytváranie globálnych zlúčených súborov PDF.
 Feature=Rys
@@ -268,8 +268,8 @@ OtherResources=Iné zdroje
 ExternalResources=Externé zdroje
 SocialNetworks=Sociálne siete
 SocialNetworkId=ID sociálnej siete
-ForDocumentationSeeWiki=Používateľskú alebo vývojársku dokumentáciu (Doc, FAQ...)<br>nahliadnite na Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s<span class='notranslate'c>65d40 </b>
-ForAnswersSeeForum=V prípade akýchkoľvek ďalších otázok alebo pomoci môžete použiť fórum Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer"> /span><span class='notranslate'>%s</a></b>
+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=Tu je niekoľko zdrojov na získanie pomoci a podpory s Dolibarrom.
 HelpCenterDesc2=Niektoré z týchto zdrojov sú dostupné iba v <b>angličtine</b>.
 CurrentMenuHandler=Aktuálna ponuka handler
@@ -290,8 +290,8 @@ EMailsSetup=Nastavenie e-mailov
 EMailsDesc=Táto stránka vám umožňuje nastaviť parametre alebo možnosti odosielania e-mailov.
 EmailSenderProfiles=Profily odosielateľov e-mailov
 EMailsSenderProfileDesc=Túto sekciu môžete ponechať prázdnu. Ak sem zadáte nejaké e-maily, pridajú sa do zoznamu možných odosielateľov v rozbaľovacom poli, keď napíšete nový e-mail.
-MAIN_MAIL_SMTP_PORT=Port SMTP/SMTPS (predvolená hodnota v php.ini: <b>%s<span class='notranslate'>b09a4f739f17 >)
-MAIN_MAIL_SMTP_SERVER=Hostiteľ SMTP/SMTPS (predvolená hodnota v php.ini: <b>%s<span class='notranslate'>b09a4f739f17 >)
+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=Port SMTP/SMTPS
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Hostiteľ SMTP/SMTPS
 MAIN_MAIL_EMAIL_FROM=E-mail odosielateľa pre automatické e-maily
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=Toto je alternatívne nastavenie na manuálne s
 StepNb=Krok %s
 FindPackageFromWebSite=Nájdite balík, ktorý poskytuje funkcie, ktoré potrebujete (napríklad na oficiálnej webovej stránke %s).
 DownloadPackageFromWebSite=Stiahnite si balík (napríklad z oficiálnej webovej stránky %s).
-UnpackPackageInDolibarrRoot=Rozbaľte/rozbaľte zabalené súbory do adresára vášho servera Dolibarr: <b>%sb09a4b839f<span class='notranslate'>b09a4b839f >
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=Ak chcete nasadiť/inštalovať externý modul, musíte rozbaliť/rozbaliť archívny súbor do adresára servera vyhradeného pre externé moduly:<br><b>%s</b>
 SetupIsReadyForUse=Nasadenie modulu je dokončené. Musíte však povoliť a nastaviť modul vo svojej aplikácii tak, že prejdete na moduly nastavenia stránky: <a href="%s">%s<span class=' nottranslate'></a></span>.
 NotExistsDirect=Alternatívny koreňový adresár nie je definovaný pre existujúci adresár.<br>
 InfDirAlt=Od verzie 3 je možné definovať alternatívny koreňový adresár. To vám umožňuje ukladať do vyhradeného adresára zásuvné moduly a vlastné šablóny.<br>Stačí vytvoriť adresár v koreňovom adresári Dolibarr (napr.: custom).<br>
-InfDirExample=<br>Potom to deklarujte v súbore <strong>conf.phpb0a65d071f6><fc9z0 class='notranslate'><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt/docht='/span> 'notranslate'><br></span>Ak sú tieto riadky zakomentované znakom „#“, ak ich chcete povoliť, odkomentujte ich odstránením znaku „#“.
+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=Súbor .zip balíka modulu môžete nahrať odtiaľto:
 CurrentVersion=Dolibarr aktuálna verzia
 CallUpdatePage=Prejdite na stránku, ktorá aktualizuje štruktúru databázy a údaje: %s.
@@ -361,14 +361,14 @@ LastActivationIP=Posledná aktivačná IP
 LastActivationVersion=Najnovšia verzia aktivácie
 UpdateServerOffline=Aktualizovať server offline
 WithCounter=Spravovať počítadlo
-GenericMaskCodes=Môžete zadať akúkoľvek masku číslovania. V tejto maske možno použiť nasledujúce značky:<br><b>{000000}b09a4b839f /span> zodpovedá číslu, ktoré sa zvýši pri každom <span class='notranslate'>%s. Zadajte toľko núl, koľko je požadovaná dĺžka počítadla. Počítadlo bude doplnené nulami zľava, aby bolo toľko núl ako maska. <br><b>{000000+000}</b>, ale rovnaký ako predchádzajúci posun zodpovedajúci číslu napravo od znamienka + sa použije od prvého %s. <br><b>{000000@x}</b> ako predchádzajúci, ale rovnaké počítadlo sa vynuluje po dosiahnutí mesiaca x (x medzi 1 a 12, alebo 0, ak chcete použiť prvé mesiace fiškálneho roka definovaného vo vašej konfigurácii, alebo 99 na vynulovanie každý mesiac). Ak sa použije táto možnosť a x je 2 alebo vyššie, potom sa vyžaduje aj postupnosť {yy}{mm} alebo {yyyy}{mm}. <br><b>{dd}</b> deň (01 až 3). span class='notranslate'><br></span><b>{mm}</b> mesiac (01 až 12). class='notranslate'><br></span><b>{yy}</b>, <span'e class=3b0306 </span>{yyyy}</b> alebo <b>{y}b09a4b739f17f8 rok nad 2, 4 alebo 1 číslo. <span class='notranslate'><br>
-GenericMaskCodes2=<b>{cccc}</b> klientsky kód na'n znakov<br><b>{cccc000}b09fa4b8>39 klient</b09a4b7 na n znakoch nasleduje počítadlo venované zákazníkovi. Toto počítadlo určené pre zákazníka sa vynuluje v rovnakom čase ako globálne počítadlo.<span class='notranslate'><br><b>b06a5f451419e8z </b> Kód typu tretej strany na n znakoch (pozri menu Domov - Nastavenie - Slovník - Typy tretích strán). Ak pridáte túto značku, počítadlo sa bude líšiť pre každý typ tretej strany.<br>
+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=Všetky ostatné znaky v maske zostanú nedotknuté. <br> Medzery nie sú povolené. <br>
 GenericMaskCodes3EAN=Všetky ostatné znaky v maske zostanú nedotknuté (okrem * alebo ? na 13. pozícii v EAN13).<br>Medzery nie sú povolené.<br> span>V EAN13 by mal byť posledný znak za posledným } na 13. pozícii * alebo ? . Bude nahradený vypočítaným kľúčom.<br>
 GenericMaskCodes4a=<u>Príklad na 99. %s tretej strany TheCompany s dátumom 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Príklad na tretej strane vytvorený 31.01.2023:</u><span class='notranslate'>b0342fccfda19b >
-GenericMaskCodes4c=<u>Príklad produktu vytvoreného 31.01.2023:</u><span class='notranslate'><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> poskytne b0aee</083f span>ABC2301-000099<span class='notranslate'></b><br>b0aee833065101+01 }-ZZZ/{dd}/XXX<span class='notranslate'></b> poskytne <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> poskytne <b>IN2301-0099-Ab09a4b730 typ spoločnostiak je typ spoločnosti 8 'Responsable Inscripto' s kódom pre typ, ktorý je 'A_RI'
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Vracia číslo prispôsobiteľný podľa tvarovanou maskou.
 ServerAvailableOnIPOrPort=Server je k dispozícii na adrese <b>%s</b> na porte <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nie je k dispozícii na adrese <b>%s</b> na porte <b>%s</b>
@@ -390,9 +390,9 @@ LanguageFilesCachedIntoShmopSharedMemory=Súbory. Lang vložený do zdieľanej p
 LanguageFile=Jazykový súbor
 ExamplesWithCurrentSetup=Príklady s aktuálnou konfiguráciou
 ListOfDirectories=Zoznam OpenDocument šablóny zoznamov
-ListOfDirectoriesForModelGenODT=Zoznam adresárov obsahujúcich súbory šablón vo formáte OpenDocument.<br><br>Sem vložte úplnú cestu k adresárom.<br>Pridajte návrat vozíka medzi každý adresár.<br>Ak chcete pridať adresár modulu GED, pridajte sem <b> >DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br>b0342fz0Files in 9 directories in musí končiť reťazcom <b>.odt</b> alebo b0aee83365837.ods0 ='notranslate'></b></span>.
+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=Počet súborov šablón ODT/ODS nájdených v týchto adresároch
-ExampleOfDirectoriesForModelGen=Príklady syntaxe:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir<span class/mysubdir 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ak chcete vedieť, ako vytvoriť svoje ODT šablóny dokumentov pred ich uložením do týchto adresárov, prečítajte si wiki dokumentácie:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozícia Meno / Priezvisko
@@ -461,10 +461,10 @@ ComputedFormulaDesc=Tu môžete zadať vzorec pomocou iných vlastností objektu
 Computedpersistent=Uložiť vypočítané pole
 ComputedpersistentDesc=Vypočítané nadbytočné polia sa uložia do databázy, avšak hodnota sa prepočíta len pri zmene objektu tohto poľa. Ak vypočítané pole závisí od iných objektov alebo globálnych údajov, táto hodnota môže byť nesprávna!!
 ExtrafieldParamHelpPassword=Ak toto pole ponecháte prázdne, znamená to, že táto hodnota bude uložená BEZ šifrovania (pole je na obrazovke iba skryté hviezdičkami).<br><br>Zadajte hodnota 'dolcrypt' na zakódovanie hodnoty pomocou reverzibilného šifrovacieho algoritmu. Jasné údaje možno stále poznať a upravovať, ale sú zašifrované do databázy.<br><br>Zadajte 'auto' (alebo 'md5', 'sha256', 'password_hash', ...) na použitie predvoleného algoritmu šifrovania hesla (alebo md5, sha256, password_hash...) na uloženie nevratného hashovaného hesla do databázy (žiadny spôsob, ako získať pôvodnú hodnotu)
-ExtrafieldParamHelpselect=Zoznam hodnôt musí byť riadky s formátom key,value (kde kľúč nemôže byť '0')<br><br> : <br>1,value1<br>2,value2b0342fccfda19bzz0,3 span class='notranslate'><br></span>...<br><br>Aby bol zoznam závislý od iného zoznam doplnkových atribútov:<br>1,value1|options_<i>parent_list_codeb0bac>3408 parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae_key <span>:parentba8 class='notranslate'><br><br>Ak chcete, aby bol zoznam závislý od iného zoznamu:<br>1, value1|<i>parent_list_code</i>:parent_keyb0342fccfda>29bz0 class='notranslate'><i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=Zoznam hodnôt musí byť riadky s formátom key,value (kde kľúč nemôže byť '0')<br><br> : <br>1,value1<br>2,value2<br> span class='notranslate'><br></span>...
-ExtrafieldParamHelpradio=Zoznam hodnôt musí byť riadky s formátom key,value (kde kľúč nemôže byť '0')<br><br> : <br>1,value1<br>2,value2<br> span class='notranslate'><br></span>...
-ExtrafieldParamHelpsellist=Zoznam hodnôt pochádza z tabuľky<br>Syntax: table_name:label_field:id_field::filtersql<br>Príklad: c_typid:libelle: ::filtersql<br><br>- id_field je nevyhnutne primárny kľúč typu intb0342fccfda19b - filtersql je podmienka SQL. Môže to byť jednoduchý test (napr. active=1) na zobrazenie iba aktívnej hodnoty<span class='notranslate'><br>Vo filtri môžete použiť aj $ID$, čo je aktuálne ID aktuálneho objektu<br>Ak chcete vo filtri použiť SELECT, použite kľúčové slovo $SEL$ na obídenie ochrany proti vstreknutiu.<br>ak chcete filtrovať extrapole použite syntax extra.fieldcode=... (kde kód poľa je kód extrapola)<br><br>Ak chcete mať zoznam závisí od iného zoznamu doplnkových atribútov:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>Ak chcete, aby bol zoznam závislý od iného zoznamu:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758bac>33z0_filter
+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 necessarily 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=Zoznam hodnôt pochádza z tabuľky<br>Syntax: table_name:label_field:id_field::filtersql<br>Príklad: c_typid:libelle: ::filtersql<br><br>filter môže byť jednoduchým testom (napr. active=1) na zobrazenie iba aktívnej hodnoty<br>Vo filtri môžete použiť aj $ID$, čo je aktuálne ID aktuálneho objektu<br>Na vykonanie SELECT vo filtri použite $SEL$<br>ak chcete filtrovať extrapolia, použite syntax extra.fieldcode=... (kde kód poľa je kód extrafield)<br><br>Ak chcete, aby bol zoznam závislý od iného zoznamu doplnkových atribútov:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19translate'>0319bzf'cc Ak chcete, aby bol zoznam závislý od iného zoznamu:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametre musia byť ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Ponechajte prázdne pre jednoduchý oddeľovač<br>Nastavte toto na 1 pre zbalený oddeľovač (predvolene otvorený pre novú reláciu, potom sa stav zachová pre každú reláciu používateľa)<br>Nastavte toto na 2 pre zbalený oddeľovač (predvolene zbalený pre novú reláciu, potom sa stav zachová pre každú reláciu používateľa)
@@ -518,8 +518,8 @@ DependsOn=Tento modul potrebuje modul(y)
 RequiredBy=Tento modul vyžadujú moduly
 TheKeyIsTheNameOfHtmlField=Toto je názov poľa HTML. Na čítanie obsahu stránky HTML, aby ste získali názov kľúča poľa, sú potrebné technické znalosti.
 PageUrlForDefaultValues=Musíte zadať relatívnu cestu adresy URL stránky. Ak do URL zahrniete parametre, bude to účinné, ak všetky parametre v prehliadanej URL budú mať tu definovanú hodnotu.
-PageUrlForDefaultValuesCreate=<br>Príklad:<br>Pre formulár na vytvorenie novej tretej strany je to b0e7843947c06b /span><span class='notranslate'>%s</strong>.<br>Pre adresu URL externých modulov nainštalovaných do vlastný adresár, nezahŕňajte "custom/", takže použite cestu ako <strong>mymodule/mypage.php</strong> a nie vlastnú /mymodule/mypage.php.<br>Ak chcete predvolenú hodnotu, iba ak adresa URL obsahuje nejaký parameter, môžete použiť <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Príklad:<br>Pre stránku, ktorá obsahuje zoznam tretích strán, je to <strong> ><span class='notranslate'>%s</strong>.<br>Pre adresy URL externých modulov nainštalovaných do vlastného adresára , nezahŕňajte „custom/“, takže použite cestu ako <strong>mymodule/mypagelist.php</strong> a nie custom/mymodule /mypagelist.php.<br>Ak chcete predvolenú hodnotu iba vtedy, ak adresa URL obsahuje nejaký parameter, môžete použiť <strong>%s</strong>
+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=Všimnite si tiež, že prepísanie predvolených hodnôt pre vytváranie formulárov funguje len pre stránky, ktoré boli správne navrhnuté (takže s parametrom action=create alebo presend...)
 EnableDefaultValues=Povoliť prispôsobenie predvolených hodnôt
 EnableOverwriteTranslation=Povoliť prispôsobenie prekladov
@@ -1197,6 +1197,7 @@ Skin=Skin téma
 DefaultSkin=Default skin téma
 MaxSizeList=Maximálna dĺžka zoznamu
 DefaultMaxSizeList=Základná max. dĺžka zoznamu
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Predvolená maximálna dĺžka pre krátke zoznamy (t. j. na zákazníckej karte)
 MessageOfDay=Správa dňa
 MessageLogin=Prihlasovacia stránka správu
@@ -1249,7 +1250,7 @@ SetupDescription2=Nasledujúce dve časti sú povinné (prvé dve položky v pon
 SetupDescription3=<a href="%s">%s -> %s<span class='0e40dcb6> </span><br><br>Základné parametre používané na prispôsobenie predvoleného správania vašej aplikácie (napr. pre funkcie súvisiace s krajinou).
 SetupDescription4=<a href="%s">%s -> %s<span class='0e40dcb6> </span><br><br>Tento softvér je balíkom mnohých modulov/aplikácií. Moduly súvisiace s vašimi potrebami musia byť povolené a nakonfigurované. Po aktivácii týchto modulov sa zobrazia položky ponuky.
 SetupDescription5=Ďalšie položky ponuky Setup spravujú voliteľné parametre.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>8cz08 /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Základné parametre používané na prispôsobenie predvoleného správania vašej aplikácie (napr. pre funkcie súvisiace s krajinou).
 SetupDescription4b=Tento softvér je balíkom mnohých modulov/aplikácií. Moduly súvisiace s vašimi potrebami musia byť aktivované. Po aktivácii týchto modulov sa zobrazia položky ponuky.
 AuditedSecurityEvents=Udalosti zabezpečenia, ktoré sú auditované
@@ -1281,7 +1282,7 @@ AvailableModules=Dostupné aplikácie/moduly
 ToActivateModule=Pre aktiváciu modulov, prejdite na nastavenie priestoru (Domov-&gt; Nastavenie-&gt; Modules).
 SessionTimeOut=Time out na zasadnutí
 SessionExplanation=Toto číslo zaručuje, že relácia nikdy nevyprší pred týmto oneskorením, ak čistenie relácie vykoná Internal PHP session cleaner (a nič iné). Interný čistič relácie PHP nezaručuje, že relácia po tomto oneskorení vyprší. Jeho platnosť vyprší po tomto oneskorení a keď sa spustí čistič relácie, takže každý <b>%s/%s</b> prístup, ale iba počas prístupu vykonaného inými reláciami (ak je hodnota 0, znamená to, že vymazanie relácie vykonáva iba externý proces) .<br>Poznámka: na niektorých serveroch s externým mechanizmom čistenia relácií (cron v debiane, ubuntu ...) môžu byť relácie zničené po uplynutí doby definovanej externým nastavením, bez ohľadu na to, aká je tu zadaná hodnota.
-SessionsPurgedByExternalSystem=Zdá sa, že relácie na tomto serveri sú vyčistené externým mechanizmom (cron pod debianom, ubuntu ...), pravdepodobne každý <b>%s</b> sekúnd (= hodnota parametra <b>session.gc_maxlifetime<span class='notranslate'>b09a4b8z39f) , takže zmena hodnoty tu nemá žiadny vplyv. O zmenu oneskorenia relácie musíte požiadať správcu servera.
+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=Dostupné spúšťače
 TriggersDesc=Spúšťače sú súbory, ktoré po skopírovaní do adresára <b>htdocs/core/triggers</b> zmenia správanie pracovného postupu Dolibarr. Realizujú nové akcie, aktivované na udalostiach Dolibarr (založenie novej firmy, validácia faktúr, ...).
 TriggerDisabledByName=Trigger v tomto súbore sú <b>zakázané-NoRun</b> prípona vo svojom názve.
@@ -1306,7 +1307,7 @@ NoEventOrNoAuditSetup=Nebola zaznamenaná žiadna udalosť zabezpečenia. To je
 NoEventFoundWithCriteria=Pre tieto kritériá vyhľadávania sa nenašla žiadna udalosť zabezpečenia.
 SeeLocalSendMailSetup=Pozrite sa na miestne sendmail nastavenie
 BackupDesc=<b>úplná</b> záloha inštalácie Dolibarr vyžaduje dva kroky.
-BackupDesc2=Zálohujte obsah adresára „documents“ (<b>%s<span class='notranslate'>b09a4b739f17>f8z0 obsahujúce všetky nahrané a vygenerované súbory. To bude zahŕňať aj všetky súbory výpisu vygenerované v kroku 1. Táto operácia môže trvať niekoľko minút.
+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=Zálohujte štruktúru a obsah svojej databázy (<b>%s</b>) súbor výpisu. Na tento účel môžete použiť nasledujúceho asistenta.
 BackupDescX=Archivovaný adresár by mal byť uložený na bezpečnom mieste.
 BackupDescY=Vygenerovaný súbor výpisu by sa mal skladovať na bezpečnom mieste.
@@ -1349,8 +1350,8 @@ DefineHereComplementaryAttributes=Definujte všetky ďalšie / vlastné atribút
 ExtraFields=Doplnkové atribúty
 ExtraFieldsLines=Doplnkové atribúty (linky)
 ExtraFieldsLinesRec=Doplnkové atribúty (šablóny riadkov faktúr)
-ExtraFieldsSupplierOrdersLines=Doplnkové hodnoty ( riadky objednávky ) 
-ExtraFieldsSupplierInvoicesLines=Doplnkové hodnoty ( riadky faktúry ) 
+ExtraFieldsSupplierOrdersLines=Doplnkové hodnoty ( riadky objednávky )
+ExtraFieldsSupplierInvoicesLines=Doplnkové hodnoty ( riadky faktúry )
 ExtraFieldsThirdParties=Doplnkové atribúty (tretia strana)
 ExtraFieldsContacts=Doplnkové atribúty (kontakty/adresa)
 ExtraFieldsMember=Doplnkové atribúty (člen)
@@ -1371,7 +1372,7 @@ SendmailOptionMayHurtBuggedMTA=Funkcia odosielania e-mailov pomocou metódy „P
 TranslationSetup=Nastavenie prekladu
 TranslationKeySearch=Vyhľadajte prekladový kľúč alebo reťazec
 TranslationOverwriteKey=Preprísať prekladový reľazec
-TranslationDesc=Ako nastaviť jazyk zobrazenia:<br>* Predvolené/Celý systém: ponuka <strong>Domov -> Nastavenie -> Displej</strong><br>* Pre používateľa: Kliknite na používateľské meno v hornej časti obrazovky a upravte b0e7843947c06b span>Nastavenie zobrazenia používateľa<span class='notranslate'></strong> na karte používateľa.
+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=Môžete tiež prepísať reťazce vypĺňajúce nasledujúcu tabuľku. Vyberte si jazyk z rozbaľovacej ponuky „%s“, vložte reťazec kľúča prekladu do „%s“ a váš nový preklad do „%s"
 TranslationOverwriteDesc2=Môžete použiť druhú kartu, ktorá vám pomôže zistiť, ktorý prekladový kľúč máte použiť
 TranslationString=Prekladový reťazec
@@ -1379,7 +1380,7 @@ CurrentTranslationString=Aktuálny prekladovy reťazec
 WarningAtLeastKeyOrTranslationRequired=Kritériá vyhľadávania sa vyžadujú aspoň pre kľúč alebo reťazec prekladu
 NewTranslationStringToShow=Novy prekladový reťazec na zobrzenie
 OriginalValueWas=Pôvodný preklad je prepísaný. Pôvodná hodnota bola:<br><br>%s
-TransKeyWithoutOriginalValue=Vynútili ste nový preklad pre prekladový kľúč '<strong>%s<span class='notranslate'></strong></span'> ktorý neexistuje v žiadnych jazykových súboroch
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
 TitleNumberOfActivatedModules=Aktivované moduly
 TotalNumberOfActivatedModules=Aktivované moduly: <b>%s</b> / <translate' class= ><b></span>%s</b>
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
@@ -1511,7 +1512,7 @@ ContractsSetup=Nastaviť modul Zmluvy / Predplatné
 ContractsNumberingModules=Zákazky číslovanie moduly
 TemplatePDFContracts=Modely zmlúv
 FreeLegalTextOnContracts=Poznámka k zmluve
-WatermarkOnDraftContractCards=Vodoznak na návrhy zmluvy ( nie ak prázdne ) 
+WatermarkOnDraftContractCards=Vodoznak na návrhy zmluvy ( nie ak prázdne )
 ##### Members #####
 MembersSetup=Členovia modul nastavenia
 MemberMainOptions=Hlavné voľby
@@ -1686,7 +1687,7 @@ CacheByServerDesc=Napríklad pomocou direktívy Apache "ExpiresByType image/gif
 CacheByClient=Cache v prehliadači
 CompressionOfResources=Kompresia odpovedí HTTP
 CompressionOfResourcesDesc=Napríklad pomocou direktívy Apache "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=So súčasnými prehliadačmi taká automatická detekcia nie je možná 
+TestNotPossibleWithCurrentBrowsers=So súčasnými prehliadačmi taká automatická detekcia nie je možná
 DefaultValuesDesc=Tu môžete definovať predvolenú hodnotu, ktorú chcete použiť pri vytváraní nového záznamu, a/alebo predvolené filtre alebo poradie triedenia pri uvádzaní záznamov.
 DefaultCreateForm=Predvolené hodnoty (na použitie vo formulároch)
 DefaultSearchFilters=Predvolené filtre vyhľadávania
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Neexportovať udalosti staršie ako
 SecurityKey = Bezpečnostný kľúč
 ##### ClickToDial #####
 ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
-ClickToDialUrlDesc=Adresa URL volaná po kliknutí na ikonu telefónu. V adrese URL môžete použiť značky<br><b>__PHONETO__b09a4b739f17f to bude nahradené telefónnym číslom osoby, ktorej chcete zavolať<span class='notranslate'><br><b>__PHONEFROM__b09a4f739f17> bude nahradené telefónnym číslom volajúcej osoby (vaším)<span class='notranslate'><br><b>__LOGIN__b09a4b839 span>, ktoré bude nahradené prihlásením pomocou kliknutia (definované na karte používateľa)<span class='notranslate'><br><b>__PASS__ </b>, ktoré bude nahradené heslom clicktodial (definovaným na karte používateľa).
+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=Tento modul mení telefónne čísla, keď používate stolný počítač, na klikateľné odkazy. Kliknutím zavoláte na číslo. Toto je možné použiť na začatie telefonického hovoru, keď používate softvérový telefón na pracovnej ploche alebo keď používate systém CTI založený napríklad na protokole SIP. Poznámka: Pri používaní smartfónu sa na telefónne čísla vždy dá kliknúť.
 ClickToDialUseTelLink=Na telefónne čísla použite iba odkaz „tel:“.
 ClickToDialUseTelLinkDesc=Túto metódu použite, ak vaši používatelia majú softvérový telefón alebo softvérové rozhranie nainštalované na rovnakom počítači ako prehliadač a volajú po kliknutí na odkaz začínajúci „tel:“ vo vašom prehliadači. Ak potrebujete odkaz začínajúci „sip:“ alebo úplné serverové riešenie (nie je potrebná inštalácia lokálneho softvéru), musíte to nastaviť na „Nie“ a vyplniť ďalšie pole.
@@ -1967,11 +1968,11 @@ GoOntoContactCardToAddMore=Ak chcete pridať alebo odstrániť upozornenia pre k
 Threshold=Maximálna hodnota
 BackupDumpWizard=Sprievodca zostavením súboru výpisu databázy
 BackupZipWizard=Sprievodca vytvorením adresára archívu dokumentov
-SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli : 
+SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli :
 SomethingMakeInstallFromWebNotPossible2=Z tohto dôvodu je proces aktualizácie popísaný tu manuálnym procesom, ktorý môže vykonať iba privilegovaný používateľ.
 InstallModuleFromWebHasBeenDisabledContactUs=Inštalácia alebo vývoj externých modulov alebo dynamických webových stránok z aplikácie je momentálne z bezpečnostných dôvodov uzamknutý. Ak potrebujete povoliť túto funkciu, kontaktujte nás.
 InstallModuleFromWebHasBeenDisabledByFile=Inštaláciu externého modulu z aplikácie zakázal váš administrátor. Ak to chcete povoliť, musíte ho požiadať o odstránenie súboru <strong>%s</strong> vlastnosť.
-ConfFileMustContainCustom=Pri inštalácii alebo zostavovaní externého modulu z aplikácie je potrebné uložiť súbory modulu do adresára <strong>%s </strong>. Ak chcete, aby tento adresár spracoval Dolibarr, musíte nastaviť <strong>conf/conf.php</strong> na pridanie 2 riadkov direktív: <br><strong>$dolibarr_main_url_root_alt='/custom';071f065d ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec'spanec87f49/translate= '></strong>
+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=Zvýrazniť riadok pre prechode kurzora
 HighlightLinesColor=Zvýrazniť farbu čiary pri prechode myšou (použite „ffffff“ pre žiadne zvýraznenie)
 HighlightLinesChecked=Zvýrazniť farbu čiary, keď je začiarknutá (použite 'ffffff' pre žiadne zvýraznenie)
@@ -2065,7 +2066,7 @@ DetectionNotPossible=Zmazanie nie je možné
 UrlToGetKeyToUseAPIs=Adresa URL na získanie tokenu na používanie rozhrania API (po prijatí tokenu sa uloží do tabuľky používateľov databázy a musí byť poskytnutá pri každom volaní rozhrania API)
 ListOfAvailableAPIs=Zoznam dostupných API
 activateModuleDependNotSatisfied=Modul "%s" závisí od modulu "%s", ktorý chýba, takže modul " %1$s" nemusí fungovať správne. Nainštalujte modul "%2$s" alebo deaktivujte modul "%1$s", ak chcete byť v bezpečí pred akýmkoľvek prekvapením
-CommandIsNotInsideAllowedCommands=Príkaz, ktorý sa pokúšate spustiť, nie je v zozname povolených príkazov definovaných v parametri <strong>$dolibarr_main_restrict_os_commands</strong> v class='notranslate'><strong></span>conf.php</strong>.
+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=Vstupná stránka
 SamePriceAlsoForSharedCompanies=Ak používate modul pre viacero spoločností, s voľbou „Jedna cena“ bude cena rovnaká pre všetky spoločnosti, ak sú produkty zdieľané medzi prostrediami
 ModuleEnabledAdminMustCheckRights=Modul bol aktivovaný. Povolenia pre aktivované moduly boli udelené iba administrátorom. V prípade potreby možno budete musieť udeliť povolenia iným používateľom alebo skupinám manuálne.
@@ -2074,7 +2075,7 @@ TypeCdr=Ak je dátumom splatnosti dátum faktúry plus delta v dňoch, použite
 BaseCurrency=Referenčná mena spoločnosti (pre zmenu prejdite do nastavenia spoločnosti)
 WarningNoteModuleInvoiceForFrenchLaw=Tento modul %s je v súlade s francúzskymi zákonmi (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Tento modul %s je v súlade s francúzskymi zákonmi (Loi Finance 2016), pretože modul Non Reversible Logs je automaticky aktivovaný.
-WarningInstallationMayBecomeNotCompliantWithLaw=Pokúšate sa nainštalovať modul %s, ktorý je externým modulom. Aktivácia externého modulu znamená, že dôverujete vydavateľovi tohto modulu a ste si istí, že tento modul nemá nepriaznivý vplyv na správanie vašej aplikácie a je v súlade so zákonmi vašej krajiny (<span class='notranslate'>%s</ rozpätie>). Ak modul zavádza nelegálnu funkciu, preberáte zodpovednosť za používanie nelegálneho softvéru.
+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=Ľavý okraj na PDF
 MAIN_PDF_MARGIN_RIGHT=Pravý okraj v PDF
@@ -2262,7 +2263,7 @@ ModuleActivatedMayExposeInformation=Toto rozšírenie PHP môže odhaliť citliv
 ModuleActivatedDoNotUseInProduction=Bol aktivovaný modul určený pre vývoj. Nepovoľujte ho v produkčnom prostredí.
 CombinationsSeparator=Oddeľovací znak pre kombinácie produktov
 SeeLinkToOnlineDocumentation=Príklady nájdete v odkaze na online dokumentáciu v hornej ponuke
-SHOW_SUBPRODUCT_REF_IN_PDF=Ak je funkcia "%s" modulu <b>%s<span class= Používa sa 'notranslate'></b></span>, zobraziť podrobnosti o vedľajších produktoch súpravy vo formáte PDF.
+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=Ak chcete získať toto ID, kontaktujte svoju banku
 AdvancedModeOnly=Povolenie je k dispozícii iba v rozšírenom režime povolení
 ConfFileIsReadableOrWritableByAnyUsers=Súbor conf je čitateľný alebo zapisovateľný pre všetkých používateľov. Udeľte povolenie iba používateľovi a skupine webového servera.
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=Moduly API nie sú povolené
 YouShouldSetThisToOff=Mali by ste to nastaviť na 0 alebo vypnúť
 InstallAndUpgradeLockedBy=Inštalácia a inovácie sú uzamknuté súborom <b>%s</b>
 InstallLockedBy=Inštalácia/opätovná inštalácia je uzamknutá súborom <b>%s</b>
-InstallOfAddonIsNotBlocked=Inštalácie doplnkov nie sú uzamknuté. Vytvorte súbor <b>installmodules.lock</b> do adresára <b><span> ='notranslate'>%s</span></b> na blokovanie inštalácií externých doplnkov/modulov.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Stará implementácia
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Ak sú povolené niektoré online platobné moduly (Paypal, Stripe, ...), pridajte do PDF odkaz na uskutočnenie online platby
 DashboardDisableGlobal=Globálne zakázať všetky palce otvorených objektov
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Predvolene nie je vytvorený. Vyt
 CSSPage=CSS štýl
 Defaultfortype=Štandardné
 DefaultForTypeDesc=Šablóna sa predvolene používa pri vytváraní nového e-mailu pre daný typ šablóny
-OptionXShouldBeEnabledInModuleY=Možnosť "<b>%s</b>" by mala byť povolená v module <span> ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Možnosť „<b>%s</b>“ je povolená v module <class= 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=Povoliť podpis online
 AtBottomOfPage=V spodnej časti stránky
 FailedAuth=neúspešné overenia
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 22b41d8436f..6c7564666e6 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -5,7 +5,7 @@ Agenda=Program rokovania
 TMenuAgenda=Program rokovania
 Agendas=Program
 LocalAgenda=Predvolený kalendár
-ActionsOwnedBy=Udalosť vytvorená: 
+ActionsOwnedBy=Udalosť vytvorená:
 ActionsOwnedByShort=Majiteľ
 AffectedTo=Priradené
 EventsNb=Počet udalostí
@@ -22,7 +22,7 @@ ListOfEvents=Zoznam udalostí (predvolený kalendár)
 ActionsAskedBy=Akcia hlásené
 ActionsToDoBy=Akcia priradené
 ActionsDoneBy=Akcie vykonané
-ActionAssignedTo=Udalosť priradená na 
+ActionAssignedTo=Udalosť priradená na
 ViewCal=Mesačný pohľad
 ViewDay=Denné zobrazenie
 ViewWeek=Zobraziť týždeň
@@ -137,8 +137,8 @@ DateActionEnd=Dátum ukončenia
 AgendaUrlOptions1=Môžete tiež pridať nasledujúce parametre filtrovania výstupu:
 AgendaUrlOptions3=<b>logina=%s</b> pre obmedzenie výstupu akciam ktoré vlastní užívateľ <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> na obmedzenie výstupu na akcie, ktoré nie sú vlastnené používateľ <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> na obmedzenie < výstupu na akcie priradené používateľovi span class='notranslate'><b></span>%s</b> (vlastník a ďalší).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b>, aby ste obmedzili výstup na akcie spojené s projektom b0aeee>3650838 __PROJECT_ID__<span class='notranslate'></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> na vylúčenie automatických udalostí.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> na zahrnutie udalostí sviatkov.
 AgendaShowBirthdayEvents=Narodeniny kontaktov
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 00b5edeb9a5..7dfb71ba667 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=Spôsob platby (kód)
 LabelPaymentMode=Spôsob platby (štítok)
 PaymentModeShort=Spôsob platby
 PaymentTerm=Lehota splatnosti
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=Platobné podmienky
 PaymentConditionsShort=Platobné podmienky
 PaymentAmount=Suma platby
@@ -185,7 +188,7 @@ SuppliersDraftInvoices=Dodávateľské návrhy faktúr
 Unpaid=Nezaplatený
 ErrorNoPaymentDefined=Chyba Nie je definovaná žiadna platba
 ConfirmDeleteBill=Naozaj chcete odstrániť túto faktúru?
-ConfirmValidateBill=Naozaj chcete overiť túto faktúru pomocou odkazu <b>%s<span class='notranslate'></b> >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Naozaj chcete zmeniť faktúru <b>%s</b> na stav konceptu ?
 ConfirmClassifyPaidBill=Naozaj chcete zmeniť faktúru <b>%s</b> na stav zaplatená ?
 ConfirmCancelBill=Naozaj chcete zrušiť faktúru <b>%s</b>?
@@ -207,7 +210,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=V niektorých krajinách môž
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Použite túto voľbu, ak všetky ostatné nesluší
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Zlý zákazník</b> je zákazník, ktorý odmieta zaplatiť svoj dlh.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Táto voľba sa používa, keď platba nie je kompletná, pretože niektoré z výrobkov boli vrátené
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Nezaplatená suma je <b>poplatky sprostredkovateľskej banky</b>, ktoré sa odpočítavajú priamo z b0aee37336 >správna suma<span class='notranslate'></b> zaplatená zákazníkom.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Nezaplatená suma nebude nikdy vyplatená, keďže ide o zrážkovú daň
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Túto voľbu použite, ak všetky ostatné nevyhovujú, napríklad v nasledujúcej situácii:<br>- platba nie je dokončená, pretože niektoré produkty boli odoslané späť<br>- požadovaná suma je príliš dôležitá, pretože sa zabudlo na zľavu<br>Vo všetkých prípadoch musí byť nadmerne nárokovaná suma opravená v účtovnom systéme vytvorením dobropisu.
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>zlý dodávateľ</b> je dodávateľ, ktorému odmietame zaplatiť.
@@ -374,7 +377,7 @@ DisabledBecauseReplacedInvoice=Akcia zakázané, pretože faktúra bola nahraden
 DescTaxAndDividendsArea=Táto oblasť predstavuje súhrn všetkých platieb uskutočnených na mimoriadne výdavky. Tu sú zahrnuté iba záznamy s platbami počas fixného roka.
 NbOfPayments=Počet platieb
 SplitDiscount=Rozdeliť zľavu v dvoch
-ConfirmSplitDiscount=Naozaj si chcete rozdeliť túto zľavu vo výške <b>%s</b> span class='notranslate'>%s</span> do dvoch menších zliav?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=Vstupné množstvo pre každú z dvoch častí:
 TotalOfTwoDiscountMustEqualsOriginal=Súčet dvoch nových zliav sa musí rovnať pôvodnej výške zľavy.
 ConfirmRemoveDiscount=Naozaj chcete odstrániť túto zľavu?
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 1adf91bd230..17bfd2d7b76 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Riadkový štítok predvolene pri tlači bez pod
 PrintWithoutDetails=Tlač bez detailov
 YearNotDefined=Rok nie je definovaný
 TakeposBarcodeRuleToInsertProduct=Pravidlo čiarového kódu na vloženie produktu
-TakeposBarcodeRuleToInsertProductDesc=Pravidlo na extrahovanie referencie produktu + množstva z naskenovaného čiarového kódu.<br>Ak je prázdne (predvolená hodnota), aplikácia na nájdenie produktu použije celý naskenovaný čiarový kód.<br><br>Ak je definovaná, syntax musí byť:<br> <b>ref:NB+qu:NB+qd:NB+other:NB</b><br>kde je NB počet znakov, ktoré sa majú použiť na extrahovanie údajov z naskenovaného čiarového kódu pomocou:<br><b>refb09a4f839f17  : referencia produktu<br><b>qu</b> do nastaviť pri vkladaní položky (jednotiek)<br><b>qd</b>množstvo:8z0 nastaviť pri vkladaní položky (desatinné miesta)<br><b>other<span class='notranslate'></b> other characters
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Už vytlačené
 HideCategories=Skryť celú sekciu výberu kategórií
 HideStockOnLine=Skryť zásoby online
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 29fe6611cf5..14dbb1f2f30 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -1,95 +1,100 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Vaše kontaktné údaje boli zaznamenané. Čoskoro sa vám ozveme...
+ContactUsDesc=Tento formulár vám umožňuje poslať nám správu pre prvý kontakt.
 ErrorCompanyNameAlreadyExists=Názov spoločnosti %s už existuje. Vyberte si inú.
 ErrorSetACountryFirst=Nastavenie krajiny prvý
 SelectThirdParty=Vyberte tretiu stranu
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Naozaj chcete odstrániť túto spoločnosť a všetky súvisiace informácie?
 DeleteContact=Odstránenie kontaktu / adresa
-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
+ConfirmDeleteContact=Naozaj chcete odstrániť tento kontakt a všetky súvisiace informácie?
+MenuNewThirdParty=Nová tretia strana
+MenuNewCustomer=Nový zákazník
+MenuNewProspect=Nový výhľad
+MenuNewSupplier=Nový predajca
 MenuNewPrivateIndividual=Nová súkromná osoba
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
+NewCompany=Nová spoločnosť (potenciálny zákazník, predajca)
+NewThirdParty=Nová tretia strana (potenciálny, zákazník, predajca)
+CreateDolibarrThirdPartySupplier=Vytvorte tretiu stranu (dodávateľa)
 CreateThirdPartyOnly=Vytvoriť tretiu stranu
-CreateThirdPartyAndContact=Create a third party + a child contact
+CreateThirdPartyAndContact=Vytvorte kontakt na tretiu stranu + dieťa
 ProspectionArea=Prospekcia plochy
 IdThirdParty=Id treťou stranou
 IdCompany=IČ
 IdContact=Contact ID
-ThirdPartyAddress=Third-party address
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+ThirdPartyAddress=Adresa tretej strany
+ThirdPartyContacts=Kontakty tretích strán
+ThirdPartyContact=Kontakt/adresa tretej strany
 Company=Spoločnosť
 CompanyName=Názov spoločnosti
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
+AliasNames=Názov aliasu (komerčný, ochranná známka, ...)
+AliasNameShort=Názov aliasu
 Companies=Firmy
-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
+CountryIsInEEC=Krajina je v rámci Európskeho hospodárskeho spoločenstva
+PriceFormatInCurrentLanguage=Formát zobrazenia ceny v aktuálnom jazyku a mene
+ThirdPartyName=Názov tretej strany
+ThirdPartyEmail=E-mail tretej strany
+ThirdParty=Tretia strana
+ThirdParties=Tretie strany
 ThirdPartyProspects=Vyhliadky
 ThirdPartyProspectsStats=Vyhliadky
 ThirdPartyCustomers=Zákazníci
 ThirdPartyCustomersStats=Zákazníci
 ThirdPartyCustomersWithIdProf12=Zákazníci s %s alebo %s
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
+ThirdPartySuppliers=Predajcovia
+ThirdPartyType=Typ tretej strany
 Individual=Súkromná osoba
-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.
+ToCreateContactWithSameName=Automaticky vytvorí kontakt/adresu s rovnakými informáciami ako tretia strana pod treťou stranou. Vo väčšine prípadov, aj keď je vašou treťou stranou fyzická osoba, stačí vytvoriť tretiu stranu.
 ParentCompany=Materská spoločnosť
 Subsidiaries=Dcérske spoločnosti
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Správa za mesiac
+ReportByCustomers=Správa podľa zákazníka
+ReportByThirdparties=Správa od tretej strany
+ReportByQuarter=Správa podľa sadzby
 CivilityCode=Zdvorilosť kód
 RegisteredOffice=Sídlo spoločnosti
 Lastname=Priezvisko
 Firstname=Krstné meno
-RefEmployee=Employee reference
-NationalRegistrationNumber=National registration number
+RefEmployee=Referencia zamestnanca
+NationalRegistrationNumber=Národné registračné číslo
 PostOrFunction=Poradie úlohy
 UserTitle=Názov
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
+NatureOfThirdParty=Povaha tretej strany
+NatureOfContact=Povaha kontaktu
 Address=Adresa
 State=Štát / Provincia
-StateId=State ID
-StateCode=State/Province code
-StateShort=State
+StateId=ID štátu
+StateCode=Kód štátu/provincie
+StateShort=Štát
 Region=Kraj
-Region-State=Region - State
+Region-State=Región – Štát
 Country=Krajina
 CountryCode=Kód krajiny
-CountryId=Country ID
+CountryId=ID krajiny
 Phone=Telefón
 PhoneShort=Telefón
 Skype=Skype
 Call=Volanie
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Autobus. telefón
 PhonePerso=Os. telefón
 PhoneMobile=Mobilné
-No_Email=Refuse bulk emailings
+No_Email=Odmietnuť hromadné e-maily
 Fax=Fax
 Zip=Poštové smerovacie číslo
 Town=Mesto
 Web=Web
 Poste= Pozícia
-DefaultLang=Default language
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
+DefaultLang=Predvolený jazyk
+VATIsUsed=Použitá daň z obratu
+VATIsUsedWhenSelling=Toto definuje, či táto tretia strana zahŕňa daň z obratu alebo nie, keď vystavuje faktúru svojim vlastným zákazníkom
+VATIsNotUsed=Daň z obratu sa nepoužíva
+VATReverseCharge=prenesenie daňovej povinnosti
+VATReverseChargeByDefault=Štandardne prenesenie DPH
+VATReverseChargeByDefaultDesc=Na dodávateľskej faktúre sa štandardne používa prenesenie DPH
+CopyAddressFromSoc=Skopírujte adresu z údajov tretích strán
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tretia strana, ani zákazník, ani predajca, žiadne dostupné odkazujúce objekty
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tretia strana ani zákazník ani predajca, zľavy nie sú dostupné
+PaymentBankAccount=Platobný bankový účet
 OverAllProposals=Návrhy
 OverAllOrders=Objednávky
 OverAllInvoices=Faktúry
@@ -102,24 +107,32 @@ LocalTax2IsUsed=Použitie tretí daň
 LocalTax2IsUsedES= IRPF sa používa
 LocalTax2IsNotUsedES= IRPF sa nepoužíva
 WrongCustomerCode=Zákaznícky kód neplatný
-WrongSupplierCode=Vendor code invalid
+WrongSupplierCode=Kód dodávateľa je neplatný
 CustomerCodeModel=Zákaznícky kód modelu
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=Model kódu dodávateľa
 Gencod=Čiarový kód
-GencodBuyPrice=Barcode of price ref
+GencodBuyPrice=Čiarový kód ceny ref
 ##### 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
+ProfId6Short=ID prof. 6
+ProfId7Short=ID prof. 7
+ProfId8Short=ID prof. 8
+ProfId9Short=ID prof. 9
+ProfId10Short=ID prof. 10
 ProfId1=Profesionálne ID 1
 ProfId2=Profesionálne ID 2
 ProfId3=Profesionálne ID 3
 ProfId4=Profesionálne ID 4
 ProfId5=Profesionálne ID 5
 ProfId6=Profesionálne ID 6
+ProfId7=Profesijný preukaz 7
+ProfId8=Profesionálny preukaz 8
+ProfId9=Profesijný preukaz 9
+ProfId10=Profesionálny preukaz 10
 ProfId1AR=Prof Id 1 (cuite / Cuile)
 ProfId2AR=Prof Id 2 (Rebarbora beštie)
 ProfId3AR=-
@@ -130,7 +143,7 @@ ProfId1AT=Prof Id 1 (ust-IdNr)
 ProfId2AT=Prof Id 2 (ust-Nr)
 ProfId3AT=Prof ID 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=číslo EORI
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -142,7 +155,7 @@ ProfId1BE=Prof Id 1 (Professional číslo)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=číslo EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -150,11 +163,11 @@ ProfId3BR=IM (Inscricao obecnej)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-číslo
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federálne číslo)
 ProfId4CH=Prof Id 2 (obchodné Záznam číslo)
-ProfId5CH=EORI number
+ProfId5CH=číslo EORI
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -162,16 +175,16 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=Id. Prednášal prof. 1 (obchodný register)
+ProfId2CM=Id. Prednášal prof. 2 (Číslo daňového poplatníka)
+ProfId3CM=Id. Prednášal prof. 3 (č. zriaďovacej vyhlášky)
+ProfId4CM=Id. Prednášal prof. 4 (číslo depozitného certifikátu)
+ProfId5CM=Id. Prednášal prof. 5 (iné)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
+ProfId1ShortCM=živnostenského registra
+ProfId2ShortCM=Daňovník č.
+ProfId3ShortCM=č. kreačného dekrétu
+ProfId4ShortCM=číslo depozitného certifikátu
 ProfId5ShortCM=Ostatné
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
@@ -184,26 +197,34 @@ ProfId1DE=Prof Id 1 (ust-IdNr)
 ProfId2DE=Prof Id 2 (ust-Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=číslo EORI
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Číslo sociálneho poistenia)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate číslo)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (číslo EORI)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (siréna)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, starý APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Prof Id 5 (číslo EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
+ProfId1ShortFR=SIRÉNA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Registračné číslo
 ProfId2GB=-
 ProfId3GB=SIC
@@ -226,13 +247,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=číslo EORI
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. Prednášal prof. 1 (R.C.S. Luxembursko)
+ProfId2LU=Id. Prednášal prof. 2 (živnostenské povolenie)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=číslo EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
@@ -242,7 +263,7 @@ ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
-ProfId3MX=Prof ID 3 (Profesional Charta)
+ProfId3MX=Prof Id 3 (Professional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -250,13 +271,13 @@ ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=číslo EORI
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (Nipča)
 ProfId2PT=Prof Id 2 (Číslo sociálneho poistenia)
 ProfId3PT=Prof ID 3 (obchodný Záznam číslo)
 ProfId4PT=Prof Id 4 (konzervatórium)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (číslo EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -280,7 +301,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (číslo EORI)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -291,107 +312,107 @@ ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
 ProfId2UA=Prof Id 2 (DRFO)
 ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId4UA=Prof Id 4 (certifikát)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId2DZ=čl.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=IČ DPH
+VATIntraShort=IČ DPH
 VATIntraSyntaxIsValid=Syntax je platná
-VATReturn=VAT return
+VATReturn=priznanie k DPH
 ProspectCustomer=Prospect / zákazník
 Prospect=Vyhliadka
 CustomerCard=Zákaznícka karta
 Customer=Zákazník
 CustomerRelativeDiscount=Relatívna zákazník zľava
-SupplierRelativeDiscount=Relative vendor discount
+SupplierRelativeDiscount=Relatívna zľava predajcu
 CustomerRelativeDiscountShort=Relatívna zľava
 CustomerAbsoluteDiscountShort=Absolútna zľava
 CompanyHasRelativeDiscount=Tento zákazník má predvolenú zľavu <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Tento zákazník nemá relatívnej zľavu v predvolenom nastavení
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasRelativeDiscountFromSupplier=Máte predvolenú zľavu <b>%s%%</b> s týmto dodávateľom
+HasNoRelativeDiscountFromSupplier=Žiadna predvolená relatívna zľava u tohto dodávateľa
 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=Tento zákazník má stále dobropisy pre <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=Od tohto predajcu nie je k dispozícii žiadna zľava/kredit
 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
+HasDownPaymentOrCommercialDiscountFromSupplier=Máte k dispozícii zľavy (komerčné, zálohové platby) pre <b>%s</b> %s od tohto dodávateľa
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
 CompanyHasNoAbsoluteDiscount=Tento zákazník nemá diskontné úver k dispozícii
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
-SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
+CustomerAbsoluteDiscountAllUsers=Absolútne zákaznícke zľavy (poskytované všetkými používateľmi)
+CustomerAbsoluteDiscountMy=Absolútne zákaznícke zľavy (udeľujete sami)
+SupplierAbsoluteDiscountAllUsers=Absolútne zľavy dodávateľa (zadané všetkými používateľmi)
+SupplierAbsoluteDiscountMy=Absolútne zľavy dodávateľov (zadané sami)
 DiscountNone=Nikto
-Vendor=Vendor
-Supplier=Vendor
+Vendor=Predajca
+Supplier=Predajca
 AddContact=Vytvoriť kontakt
 AddContactAddress=Vytvoriť kontakt/adresu
 EditContact=Upraviť kontakt
 EditContactAddress=Upraviť kontakt / adresa
-Contact=Contact/Address
+Contact=Kontaktná adresa
 Contacts=Kontakty / adresy
-ContactId=Contact id
+ContactId=ID kontaktu
 ContactsAddresses=Kontakty / adresy
-FromContactName=Name:
+FromContactName=Názov:
 NoContactDefinedForThirdParty=Žiadny kontakt definovaná pre túto tretiu stranu
 NoContactDefined=Žiadny kontakt definované
 DefaultContact=Predvolené kontakt / adresa
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Predvolený kontakt/adresa pre
 AddThirdParty=Vytvoriť tretiu stranu
 DeleteACompany=Odstránenie spoločnosť
 PersonalInformations=Osobné údaje
 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
+CustomerCode=Zákaznický kód
+SupplierCode=Kód dodávateľa
+CustomerCodeShort=Zákaznický kód
+SupplierCodeShort=Kód dodávateľa
+CustomerCodeDesc=Zákaznícky kód, jedinečný pre všetkých zákazníkov
+SupplierCodeDesc=Kód predajcu, jedinečný pre všetkých predajcov
 RequiredIfCustomer=Požadované, ak tretia osoba zákazníka alebo perspektíva
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
+RequiredIfSupplier=Vyžaduje sa, ak je tretia strana predajcom
+ValidityControledByModule=Platnosť riadená modulom
+ThisIsModuleRules=Pravidlá pre tento modul
 ProspectToContact=Prospect kontaktovať
 CompanyDeleted=Spoločnosť &quot;%s&quot; vymazaný z databázy.
 ListOfContacts=Zoznam kontaktov adries /
 ListOfContactsAddresses=Zoznam kontaktov adries /
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ListOfThirdParties=Zoznam tretích strán
+ShowCompany=Tretia strana
+ShowContact=Kontaktná adresa
 ContactsAllShort=Všetko (Bez filtra)
-ContactType=Contact role
+ContactType=Kontaktná rola
 ContactForOrders=Order kontakt
-ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForOrdersOrShipments=Kontakt objednávky alebo zásielky
 ContactForProposals=Návrh je kontakt
 ContactForContracts=Zmluva je kontakt
 ContactForInvoices=Faktúra je kontakt
 NoContactForAnyOrder=Tento kontakt nie je kontakt na ľubovoľnom poradí
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyOrderOrShipments=Tento kontakt nie je kontaktom pre žiadnu objednávku alebo zásielku
 NoContactForAnyProposal=Tento kontakt nie je kontaktnou osobou pre akékoľvek komerčné návrhu
 NoContactForAnyContract=Tento kontakt nie je kontakt u každej zákazky
 NoContactForAnyInvoice=Tento kontakt nie je kontakt pre každé faktúre
 NewContact=Nový kontakt
-NewContactAddress=New Contact/Address
+NewContactAddress=Nový kontakt/adresa
 MyContacts=Moje kontakty
 Capital=Kapitál
 CapitalOf=Hlavné mesto %s
 EditCompany=Upraviť spoločnosť
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Tento používateľ nie je potenciálnym zákazníkom, zákazníkom ani predajcom
 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" rel="noopener noreferrer">%s</a>
+VATIntraCheckDesc=IČ DPH musí obsahovať predvoľbu krajiny. Odkaz <b>%s</b> používa európsku službu kontroly DPH (VIES) ktorý vyžaduje prístup na internet zo servera Dolibarr.
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
+VATIntraCheckableOnEUSite=Skontrolujte si IČ DPH v rámci Spoločenstva na webovej stránke Európskej komisie
+VATIntraManualCheck=Môžete to skontrolovať aj manuálne na webovej stránke Európskej komisie <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
-Workforce=Workforce
-Staff=Employees
+NorProspectNorCustomer=Nie záujemca, ani zákazník
+JuridicalStatus=Typ obchodného subjektu
+Workforce=Pracovná sila
+Staff=zamestnancov
 ProspectLevelShort=Potenciál
 ProspectLevel=Prospect potenciál
 ContactPrivate=Súkromný
@@ -412,17 +433,17 @@ TE_MEDIUM=Stredná firma
 TE_ADMIN=Vládne
 TE_SMALL=Malé spoločnosti
 TE_RETAIL=Maloobchodník
-TE_WHOLE=Wholesaler
+TE_WHOLE=Veľkoobchodník
 TE_PRIVATE=Súkromná osoba
 TE_OTHER=Ostatné
 StatusProspect-1=Nedotýkajte sa
 StatusProspect0=Nikdy nekontaktoval
-StatusProspect1=To be contacted
+StatusProspect1=Byť kontaktovaný
 StatusProspect2=Kontakt v procese
 StatusProspect3=Spojiť sa vykonáva
 ChangeDoNotContact=Zmeniť stav na &quot;Nedotýkajte sa&quot;
 ChangeNeverContacted=Zmeniť stav na &quot;nikdy nekontaktoval&quot;
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Zmeniť stav na „Na kontaktovanie“
 ChangeContactInProcess=Zmeniť stav na &quot;Kontakt v procese&quot;
 ChangeContactDone=Zmeniť stav na &quot;Kontaktujte urobiť&quot;
 ProspectsByStatus=Vyhliadky podľa postavenia
@@ -431,70 +452,79 @@ ExportCardToFormat=Export do formátu karty
 ContactNotLinkedToCompany=Kontaktu, ktorý nie je spojený s akoukoľvek treťou stranou
 DolibarrLogin=Dolibarr prihlásenie
 NoDolibarrAccess=Žiadny prístup Dolibarr
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+ExportDataset_company_1=Tretie strany (firmy/nadácie/fyzické osoby) a ich majetok
+ExportDataset_company_2=Kontakty a ich vlastnosti
+ImportDataset_company_1=Tretie strany a ich vlastnosti
+ImportDataset_company_2=Ďalšie kontakty/adresy a atribúty tretích strán
+ImportDataset_company_3=Bankové účty tretích strán
+ImportDataset_company_4=Tretie strany Obchodní zástupcovia (priraďte obchodných zástupcov/používateľov spoločnostiam)
+PriceLevel=Cenová hladina
+PriceLevelLabels=Štítky cenovej hladiny
 DeliveryAddress=Dodacia adresa
 AddAddress=Pridať adresu
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
+SupplierCategory=Kategória predajcu
+JuridicalStatus200=Nezávislý
 DeleteFile=Zmazať súbor
-ConfirmDeleteFile=Ste si istí, že chcete zmazať tento súbor?
-AllocateCommercial=Assigned to sales representative
+ConfirmDeleteFile=Naozaj chcete odstrániť tento súbor <b>%s</b>?
+AllocateCommercial=Pridelené obchodnému zástupcovi
 Organization=Organizácia
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Fiškálny rok
 FiscalMonthStart=Počiatočný mesiac fiškálneho roka
-SocialNetworksInformation=Social networks
+SocialNetworksInformation=Sociálne siete
 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
+SocialNetworksInstagramURL=Adresa URL Instagramu
+SocialNetworksYoutubeURL=Adresa URL služby YouTube
+SocialNetworksGithubURL=Adresa URL Github
+YouMustAssignUserMailFirst=Aby ste mohli pridať e-mailové upozornenie, musíte pre tohto používateľa vytvoriť e-mail.
+YouMustCreateContactFirst=Aby ste mohli pridávať e-mailové upozornenia, musíte najprv definovať kontakty s platnými e-mailami pre tretiu stranu
+ListSuppliersShort=Zoznam predajcov
+ListProspectsShort=Zoznam perspektív
+ListCustomersShort=Zoznam zákazníkov
+ThirdPartiesArea=Tretie strany/Kontakty
+LastModifiedThirdParties=Najnovšie %s tretie strany, ktoré boli upravené
+UniqueThirdParties=Celkový počet tretích strán
 InActivity=Otvorení
 ActivityCeased=Zatvorené
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
-CurrentOutstandingBill=Current outstanding bill
+ThirdPartyIsClosed=Tretia strana je zatvorená
+ProductsIntoElements=Zoznam produktov/služieb namapovaných na %s
+CurrentOutstandingBill=Aktuálna neuhradená faktúra
 OutstandingBill=Max. za vynikajúce účet
-OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+OutstandingBillReached=Max. za dosiahnutý neuhradený účet
+OrderMinAmount=Minimálna suma pre objednávku
+MonkeyNumRefModelDesc=Vráťte číslo vo formáte %syymm-nnnn pre kód zákazníka a %syymm-nnnn pre kód dodávateľa, kde je yy rok, mm je mesiac a nnnn je sekvenčné automaticky sa zvyšujúce číslo bez prerušenia a bez návratu na 0.
 LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť.
-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
+ManagingDirectors=Meno manažéra (výkonný riaditeľ, riaditeľ, prezident...)
+MergeOriginThirdparty=Duplicitná tretia strana (tretia strana, ktorú chcete odstrániť)
+MergeThirdparties=Zlúčiť tretie strany
+ConfirmMergeThirdparties=Naozaj chcete zlúčiť vybratú tretiu stranu s aktuálnou? Všetky prepojené objekty (faktúry, objednávky, ...) budú presunuté na aktuálnu tretiu stranu, po čom bude zvolená tretia strana vymazaná.
+ThirdpartiesMergeSuccess=Tretie strany boli zlúčené
+SaleRepresentativeLogin=Prihlásenie obchodného zástupcu
+SaleRepresentativeFirstname=Krstné meno obchodného zástupcu
+SaleRepresentativeLastname=Priezvisko obchodného zástupcu
+ErrorThirdpartiesMerge=Pri odstraňovaní tretích strán sa vyskytla chyba. Skontrolujte denník. Zmeny boli vrátené.
+NewCustomerSupplierCodeProposed=Kód zákazníka alebo dodávateľa sa už používa, navrhuje sa nový kód
+KeepEmptyIfGenericAddress=Ak je táto adresa všeobecná, ponechajte toto pole prázdne
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeCustomer=Typ platby - Zákazník
+PaymentTermsCustomer=Platobné podmienky – zákazník
+PaymentTypeSupplier=Typ platby - Dodávateľ
+PaymentTermsSupplier=Platobná lehota - Predajca
+PaymentTypeBoth=Typ platby - Zákazník a Dodávateľ
+MulticurrencyUsed=Použite viac mien
 MulticurrencyCurrency=Mena
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Európa (EHS)
+RestOfEurope=zvyšok Európy (EHS)
+OutOfEurope=Mimo Európy (EHS)
+CurrentOutstandingBillLate=Aktuálna neuhradená faktúra je oneskorená
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Buďte opatrní, v závislosti od nastavení ceny vášho produktu by ste mali pred pridaním produktu na POS zmeniť tretiu stranu.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=e-mail už existuje, prepíšte názov svojej spoločnosti
+TwoRecordsOfCompanyName=pre túto spoločnosť existuje viac ako jeden záznam, kontaktujte nás, aby ste dokončili svoju žiadosť o partnerstvo
+CompanySection=Firemná sekcia
+ShowSocialNetworks=Zobraziť sociálne siete
+HideSocialNetworks=Skryť sociálne siete
+ExternalSystemID=ID externého systému
+IDOfPaymentInAnExternalSystem=ID platobného režimu do externého systému (ako Stripe, Paypal, ...)
+AADEWebserviceCredentials=Poverenia webovej služby AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Tretia strana musí byť zákazníkom, aby povolila vytvorenie svojich bankových informácií na strane Stripe
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index fc0d4be5ef5..b4d132565be 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
+MenuFinancial=Fakturácia | Platba
 TaxModuleSetupToModifyRules=Prejsť na <a href="%s">daniach z modulu nastavenie</a> zmeniť pravidlá pre výpočet
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Ak chcete upraviť pravidlá výpočtu, prejdite na <a href="%s">Nastavenie spoločnosti</a>
 OptionMode=Voľba pre účtovníctvo
 OptionModeTrue=Možnosť Príjmy-Výdavky
 OptionModeVirtual=Možnosť deklaráciami Pohľadávky
@@ -9,216 +9,217 @@ OptionModeTrueDesc=V tejto súvislosti sa počíta obrat cez platby (dátum plat
 OptionModeVirtualDesc=V tejto súvislosti sa počíta obrat cez faktúr (dátum schválenia). Ak sú tieto faktúry sú splatné, či boli zaplatené alebo nie, sú uvedené v obrate výstupu.
 FeatureIsSupportedInInOutModeOnly=Funkcie dostupné iba v ÚVERY-dlhy účtovného režimu (pozri konfigurácia modulu Účtovníctvo)
 VATReportBuildWithOptionDefinedInModule=Sumy uvedené tu sú vypočítané na základe pravidiel stanovených daňovými Nastavenie modulu.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Tu zobrazené sumy sú vypočítané pomocou pravidiel definovaných nastavením spoločnosti.
 Param=Setup
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Zostávajúca suma platby:
 Account=Účet
-Accountparent=Parent account
-Accountsparent=Parent accounts
+Accountparent=Rodičovský účet
+Accountsparent=Rodičovské účty
 Income=Príjem
 Outcome=Výdavok
 MenuReportInOut=Výnosy / náklady
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportInOut=Bilancia príjmov a výdavkov
+ReportTurnover=Fakturovaný obrat
+ReportTurnoverCollected=Zhromaždený obrat
 PaymentsNotLinkedToInvoice=Platby nesúvisiace s akoukoľvek faktúru, takže nie sú spojené žiadne tretej strane
 PaymentsNotLinkedToUser=Platby nesúvisiace všetkých užívateľov
 Profit=Zisk
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
+AccountingResult=Výsledok účtovníctva
+BalanceBefore=Zostatok (predtým)
 Balance=Zostatok
 Debit=Debet
 Credit=Úver
 AccountingDebit=Debet
 AccountingCredit=Úver
-Piece=Accounting Doc.
+Piece=Účtovníctvo Doc.
 AmountHTVATRealReceived=Net zhromaždený
 AmountHTVATRealPaid=Čisté platené
-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
+VATToPay=Daňový predaj
+VATReceived=Prijatá daň
+VATToCollect=Daňové nákupy
+VATSummary=Daň mesačne
+VATBalance=Daňový zostatok
+VATPaid=Zaplatená daň
+LT1Summary=Súhrn dane 2
+LT2Summary=Súhrn dane 3
 LT1SummaryES=RE Balance
 LT2SummaryES=IRPF Balance
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
+LT1SummaryIN=Zostatok CGST
+LT2SummaryIN=Zostatok SGST
+LT1Paid=Daň 2 zaplatená
+LT2Paid=Daň 3 zaplatená
+LT1PaidES=RE zaplatené
 LT2PaidES=IRPF Platené
-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
+LT1PaidIN=CGST zaplatené
+LT2PaidIN=SGST zaplatené
+LT1Customer=Daň 2 predaj
+LT1Supplier=Daň za 2 nákupy
+LT1CustomerES=RE predaj
+LT1SupplierES=RE nákupy
+LT1CustomerIN=Predaj CGST
+LT1SupplierIN=Nákupy CGST
+LT2Customer=Daň 3 predaj
+LT2Supplier=Daň za 3 nákupy
 LT2CustomerES=IRPF predaj
 LT2SupplierES=IRPF nákupy
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=Predaj SGST
+LT2SupplierIN=SGST nákupy
 VATCollected=Vybrané DPH
 StatusToPay=Zaplatiť
-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
+SpecialExpensesArea=Oblasť pre všetky špeciálne platby
+VATExpensesArea=Oblasť pre všetky platby TVA
+SocialContribution=Sociálna alebo fiškálna daň
+SocialContributions=Sociálne alebo fiškálne dane
+SocialContributionsDeductibles=Odpočítateľné sociálne alebo fiškálne dane
+SocialContributionsNondeductibles=Neodpočítateľné sociálne alebo fiškálne dane
+DateOfSocialContribution=Dátum sociálnej alebo fiškálnej dane
+LabelContrib=Príspevok štítku
+TypeContrib=Typ príspevku
 MenuSpecialExpenses=špeciálne rozšírenia
 MenuTaxAndDividends=Dane a dividendy
-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=Accounting area
-InvoicesArea=Billing and payment area
+MenuSocialContributions=Sociálne/fiškálne dane
+MenuNewSocialContribution=Nová sociálna/fiškálna daň
+NewSocialContribution=Nová sociálna/fiškálna daň
+AddSocialContribution=Pridajte sociálnu/fiškálnu daň
+ContributionsToPay=Platiť sociálne/fiškálne dane
+AccountancyTreasuryArea=Účtovná oblasť
+InvoicesArea=Oblasť fakturácie a platieb
 NewPayment=Nový platobný
 PaymentCustomerInvoice=Zákazník faktúru
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=úhrada faktúry dodávateľa
 PaymentSocialContribution=Platba sociálnej/fiškálnej dane
 PaymentVat=DPH platba
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Automaticky zaznamenajte platbu
 ListPayment=Zoznam platieb
 ListOfCustomerPayments=Zoznam zákazníckych platieb
-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
+ListOfSupplierPayments=Zoznam platieb dodávateľa
+DateStartPeriod=Dátum začiatku obdobia
+DateEndPeriod=Dátum ukončenia obdobia
+newLT1Payment=Nová platba dane 2
+newLT2Payment=Nová platba dane 3
+LT1Payment=Platba dane 2
+LT1Payments=Platby dane 2
+LT2Payment=Platba dane 3
+LT2Payments=Platby dane 3
+newLT1PaymentES=Nová platba RE
 newLT2PaymentES=Nový IRPF platba
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE platba
+LT1PaymentsES=RE platby
 LT2PaymentES=IRPF platby
 LT2PaymentsES=IRPF Platby
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+VATPayment=Platba dane z obratu
+VATPayments=Platby dane z obratu
+VATDeclarations=priznania k DPH
+VATDeclaration=priznanie k DPH
+VATRefund=Vrátenie dane z predaja
+NewVATPayment=Nová platba dane z obratu
+NewLocalTaxPayment=Nová daňová platba %s
+Refund=Vrátenie peňazí
+SocialContributionsPayments=Platby sociálnych/fiškálnych daní
 ShowVatPayment=Zobraziť DPH platbu
 TotalToPay=Celkom k zaplateniu
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+BalanceVisibilityDependsOnSortAndFilters=Zostatok je v tomto zozname viditeľný iba vtedy, ak je tabuľka zoradená podľa %s a filtrovaná na 1 bankovom účte (bez ďalších filtrov)
+CustomerAccountancyCode=Účtovný kód zákazníka
+SupplierAccountancyCode=Účtovný kód dodávateľa
+CustomerAccountancyCodeShort=Cust. účtu. kód
+SupplierAccountancyCodeShort=Súp. účtu. kód
 AccountNumber=Číslo účtu
 NewAccountingAccount=Nový účet
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
+Turnover=Fakturovaný obrat
+TurnoverCollected=Zhromaždený obrat
+SalesTurnoverMinimum=Minimálny obrat
+ByExpenseIncome=Podľa výdavkov a príjmov
 ByThirdParties=Tretími stranami
 ByUserAuthorOfInvoice=Faktúrou autorovi
 CheckReceipt=Doklad o vklade
 CheckReceiptShort=Doklad o vklade
-LastCheckReceiptShort=Latest %s deposit slips
-LastPaymentForDepositShort=Latest %s %s deposit slips
+LastCheckReceiptShort=Najnovšie vkladové listy %s
+LastPaymentForDepositShort=Najnovšie vkladové listy %s %s
 NewCheckReceipt=Nová zľava
-NewCheckDeposit=New deposit slip
+NewCheckDeposit=Nový vkladový list
 NewCheckDepositOn=Vytvorte potvrdenie o vklade na účet: %s
-NoWaitingChecks=No checks awaiting deposit.
-NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
-DateChequeReceived=Check receiving date
-DatePaymentReceived=Date of document reception
-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
-DeleteVariousPayment=Delete a various payment
-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 ?
-ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
-ExportDataset_tax_1=Social and fiscal taxes and payments
+NoWaitingChecks=Žiadne šeky čakajúce na vklad.
+NoWaitingPaymentForDeposit=Žiadna platba %s nečaká na vklad.
+DateChequeReceived=Skontrolujte dátum prijatia
+DatePaymentReceived=Dátum prijatia dokumentu
+NbOfCheques=Počet šekov
+PaySocialContribution=Platiť sociálnu/fiškálnu daň
+PayVAT=Zaplatiť priznanie k DPH
+PaySalary=Zaplatiť platovú kartu
+ConfirmPaySocialContribution=Naozaj chcete klasifikovať túto sociálnu alebo daňovú daň ako zaplatenú?
+ConfirmPayVAT=Naozaj chcete toto vyhlásenie o DPH klasifikovať ako zaplatené?
+ConfirmPaySalary=Naozaj chcete klasifikovať túto mzdovú kartu ako platenú?
+DeleteSocialContribution=Odstráňte platbu sociálnej alebo daňovej dane
+DeleteVAT=Vymažte priznanie DPH
+DeleteSalary=Vymažte mzdovú kartu
+DeleteVariousPayment=Odstráňte rôzne platby
+ConfirmDeleteSocialContribution=Naozaj chcete odstrániť túto platbu sociálnej/fiškálnej dane?
+ConfirmDeleteVAT=Naozaj chcete vymazať toto vyhlásenie o DPH?
+ConfirmDeleteSalary=Naozaj chcete odstrániť tento plat?
+ConfirmDeleteVariousPayment=Naozaj chcete odstrániť tieto rôzne platby?
+ExportDataset_tax_1=Sociálne a fiškálne dane a platby
 CalcModeVATDebt=Režim <b>%sVAT na záväzky accounting%s.</b>
 CalcModeVATEngagement=Režim <b>%sVAT z príjmov-expense%sS.</b>
-CalcModeDebt=Analysis of known recorded documents
-CalcModeEngagement=Analysis of known recorded payments
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
-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>
+CalcModeDebt=Analýza známych zaznamenaných dokumentov
+CalcModeEngagement=Analýza známych zaznamenaných platieb
+CalcModePayment=Analysis of known recorded payments
+CalcModeBookkeeping=Analýza údajov žurnalizovaných v tabuľke účtovnej knihy.
+CalcModeNoBookKeeping=Aj keď ešte nie sú zaúčtované v účtovnej knihe
+CalcModeLT1= Režim <b>%sRE na zákazníckych faktúrach – dodávateľské faktúry%s</b>
+CalcModeLT1Debt=Režim <b>%sRE na zákazníckych faktúrach%s</b>
+CalcModeLT1Rec= Režim <b>%sRE na dodávateľských faktúrach%s</b>
+CalcModeLT2= Režim <b>%sIRPF na faktúrach zákazníkov – faktúry dodávateľov%s</b>
+CalcModeLT2Debt=Režim <b>%sIRPF na zákazníckych faktúrach%s<spante class='no '></b></span>
+CalcModeLT2Rec= Režim <b>%sIRPF na dodávateľských faktúrach%s<spante class='no '></b></span>
 AnnualSummaryDueDebtMode=Bilancia príjmov a výdavkov, ročné zhrnutie
 AnnualSummaryInputOutputMode=Bilancia príjmov a výdavkov, ročné zhrnutie
-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>
+AnnualByCompanies=Saldo príjmov a výdavkov podľa vopred definovaných účtových skupín
+AnnualByCompaniesDueDebtMode=Zostatok príjmov a výdavkov, detail podľa vopred definovaných skupín, režim <b>%sPohľadávky-Dluhyb0ecb92ec8 </b> povedal <b>Účtovanie záväzkov</b>.8z0
+AnnualByCompaniesInputOutputMode=Zostatok príjmov a výdavkov, podrobnosti podľa preddefinovaných skupín, režim <b>%sPríjmy-Výdavkyb0449fz0 </b> povedal <b>hotovostné účtovníctvo</b>.
+SeeReportInInputOutputMode=Pozrite si <b>%sanalýzu platieb%s</b> pre výpočet založený na <b>zaúčtovaných platbách</b> uskutočnených v Ledger, aj keď ešte nie sú zaúčtované
+SeeReportInDueDebtMode=Pozrite si <b>%sanalýzu zaznamenaných dokumentov%s</b> pre výpočet založený na známych <b>zaznamenaných dokumentoch</b>, aj keď ešte nie sú zaúčtované v Ledger
+SeeReportInBookkeepingMode=Pozrite si <b>%sanalýzu tabuľky účtovnej knihyb0ecb2ec87f49fz'</b> pre prehľad založený na <b>Tabuľka účtovnej knihy</b>
 RulesAmountWithTaxIncluded=- Uvedené sumy sú so všetkými daňami
-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
+RulesAmountWithTaxExcluded=- Uvedené sumy na faktúrach sú bez všetkých daní
+RulesResultDue=- Zahŕňa všetky faktúry, výdavky, DPH, dary, platy, či už sú zaplatené alebo nie.<br>- Zakladá sa na dátume fakturácie faktúr a na dátume splatnosti za výdavky alebo platby daní. Pri platoch sa používa dátum konca obdobia.
+RulesResultInOut=- Zahŕňa skutočné platby uskutočnené na faktúrach, výdavky, DPH a mzdy. <br>- Vychádza z dátumov platieb faktúr, výdavkov, DPH, darov a miezd.
+RulesCADue=- Zahŕňa splatné faktúry zákazníka bez ohľadu na to, či sú zaplatené alebo nie. <br>– Vychádza z dátumu fakturácie týchto faktúr.<br>
+RulesCAIn=– Zahŕňa všetky platné platby faktúr prijatých od zákazníkov.<br>– Zakladá sa na dátume platby týchto faktúr<br>
+RulesCATotalSaleJournal=Zahŕňa všetky úverové linky z denníka predaja.
+RulesSalesTurnoverOfIncomeAccounts=Zahŕňa (kreditné - debetné) riadky pre produktové účty v skupine PRÍJMY
+RulesAmountOnInOutBookkeepingRecord=Zahŕňa záznam vo vašej účtovnej knihe s účtovnými účtami, ktoré majú skupinu „NÁKLADY“ alebo „PRÍJMY“
+RulesResultBookkeepingPredefined=Zahŕňa záznam vo vašej účtovnej knihe s účtovnými účtami, ktoré majú skupinu „NÁKLADY“ alebo „PRÍJMY“
+RulesResultBookkeepingPersonalized=Zobrazuje záznam vo vašej účtovnej knihe s účtovnými účtami <b>zoskupenými podľa prispôsobených skupín</b>
+SeePageForSetup=Nastavenie nájdete v ponuke <a href="%s">%s</a>
+DepositsAreNotIncluded=- Zálohové faktúry nie sú zahrnuté
+DepositsAreIncluded=- Súčasťou sú aj zálohové faktúry
+LT1ReportByMonth=Správa o dani 2 podľa mesiaca
+LT2ReportByMonth=Správa o dani 3 podľa mesiaca
+LT1ReportByCustomers=Nahláste daň 2 treťou stranou
+LT2ReportByCustomers=Nahláste daň 3 treťou stranou
+LT1ReportByCustomersES=Správa tretej strany RE
 LT2ReportByCustomersES=Správa o treťou stranou 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
+VATReport=Správa o dani z predaja
+VATReportByPeriods=Správa o dani z obratu podľa obdobia
+VATReportByMonth=Správa o dani z predaja podľa mesiaca
+VATReportByRates=Správa o dani z obratu podľa sadzby
+VATReportByThirdParties=Správa o dani z predaja od tretej strany
+VATReportByCustomers=Správa o dani z predaja zákazníkom
 VATReportByCustomersInInputOutputMode=Správa zákazníka DPH vyzdvihnúť a zaplatiť
-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
+VATReportByQuartersInInputOutputMode=Správa o sadzbe dane z obratu vybranej a zaplatenej dane
+VATReportShowByRateDetails=Zobraziť podrobnosti o tejto sadzbe
+LT1ReportByQuarters=Vykazujte daň 2 podľa sadzby
+LT2ReportByQuarters=Vykazujte daň 3 podľa sadzby
+LT1ReportByQuartersES=Správa podľa sadzby RE
+LT2ReportByQuartersES=Správa podľa sadzby 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.
+SeeVATReportInDueDebtMode=Pozrite si prehľad <b>%sDPH na debet%s<laspan class='no '></b></span> pre výpočet s možnosťou fakturácie
+RulesVATInServices=- V prípade služieb správa obsahuje DPH skutočne prijatých alebo zaplatených platieb na základe dátumu platby.
+RulesVATInProducts=- V prípade hmotného majetku výkaz obsahuje DPH na základe dátumu platby.
+RulesVATDueServices=- V prípade služieb výkaz zahŕňa DPH splatných faktúr, zaplatených alebo nezaplatených, na základe dátumu faktúry.
+RulesVATDueProducts=- Pre hmotný majetok výkaz obsahuje DPH splatných faktúr na základe dátumu faktúry.
 OptionVatInfoModuleComptabilite=Poznámka: U hmotného majetku, mal by používať termín dodania bude spravodlivejší.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+ThisIsAnEstimatedValue=Toto je náhľad založený na obchodných udalostiach a nie z konečnej tabuľky hlavnej knihy, takže konečné výsledky sa môžu líšiť od hodnôt tohto náhľadu
 PercentOfInvoice=%% / Faktúra
 NotUsedForGoods=Nepoužíva sa na tovar
 ProposalStats=Štatistiky o návrhoch
@@ -233,80 +234,82 @@ PurchasesJournal=Nákupy Journal
 DescSellsJournal=Predaj Journal
 DescPurchasesJournal=Nákupy Journal
 CodeNotDef=Nie je definované
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
+WarningDepositsNotIncluded=Zálohové faktúry nie sú zahrnuté v tejto verzii s týmto modulom účtovníctva.
 DatePaymentTermCantBeLowerThanObjectDate=Termín vyplatenia dátum nemôže byť nižšia ako objektu dáta.
-Pcg_version=Chart of accounts models
+Pcg_version=Modely účtovnej osnovy
 Pcg_type=PCG typ
 Pcg_subtype=PCG podtyp
 InvoiceLinesToDispatch=Faktúra linky na expedíciu
-ByProductsAndServices=By product and service
+ByProductsAndServices=Podľa produktu a služby
 RefExt=Externé 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
+ToCreateAPredefinedInvoice=Ak chcete vytvoriť šablónu faktúry, vytvorte štandardnú faktúru a potom bez jej overenia kliknite na tlačidlo "%s".
+LinkedOrder=Odkaz na objednávku
+Mode1=Metóda 1
 Mode2=Metóda 2
 CalculationRuleDesc=Ak chcete vypočítať celkovú sumu DPH, tam sú dve metódy: <br> Metóda 1 je zaokrúhlenie DPH na každom riadku, potom sa spočítajú tak. <br> Metóda 2 je súčtom všetkých sud na každom riadku, potom sa výsledok zaokrúhľovania. <br> Konečný výsledok môže sa líši od niekoľkých centov. Predvolený režim je režim <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.
+CalculationRuleDescSupplier=Podľa dodávateľa vyberte vhodnú metódu na uplatnenie rovnakého pravidla výpočtu a získajte rovnaký výsledok, aký očakáva váš dodávateľ.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Správa o obrate zhromaždených na produkt nie je k dispozícii. Tento prehľad je dostupný len pre fakturovaný obrat.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Prehľad obratu inkasovaného podľa sadzby dane z predaja nie je k dispozícii. Tento prehľad je dostupný len pre fakturovaný obrat.
 CalculationMode=Výpočet režim
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of 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=Account (from the Chart of Account) used for the "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
+AccountancyJournal=Denník účtovných kódov
+ACCOUNTING_VAT_SOLD_ACCOUNT=Účet (z účtovnej osnovy), ktorý sa má použiť ako predvolený účet pre DPH z predaja (používa sa, ak nie je definovaný v nastaveniach slovníka DPH)
+ACCOUNTING_VAT_BUY_ACCOUNT=Účet (z účtovnej osnovy), ktorý sa má použiť ako predvolený účet pre DPH z nákupov (používa sa, ak nie je definovaný v nastavení slovníka DPH)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Účet (z Účtovnej osnovy), ktorý sa má použiť pre príjmovú známku pri predaji
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Účet (z Účtovnej osnovy), ktorý sa má použiť pre príjmovú známku pri nákupoch
+ACCOUNTING_VAT_PAY_ACCOUNT=Účet (z účtovnej osnovy), ktorý sa má použiť ako predvolený účet na platenie DPH
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Účet (z účtovnej osnovy), ktorý sa má použiť ako predvolený účet pre DPH z nákupov na účely prenesenia daňovej povinnosti (Kredit)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Účet (z účtovnej osnovy), ktorý sa má použiť ako predvolený účet pre DPH pri nákupoch na účely prenesenia daňovej povinnosti (Debet)
+ACCOUNTING_ACCOUNT_CUSTOMER=Účet (z Účtovnej osnovy) používaný pre „zákaznícke“ tretie strany
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Vyhradený účtovný účet definovaný na karte tretej strany sa použije len na účtovníctvo vedľajšej knihy. Tento sa použije pre hlavnú knihu a ako predvolená hodnota účtovníctva vedľajšej knihy, ak nie je definovaný špeciálny zákaznícky účtovný účet na tretej strane.
+ACCOUNTING_ACCOUNT_SUPPLIER=Účet (z Účtovnej osnovy) používaný pre tretie strany „predávajúceho“.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Vyhradený účtovný účet definovaný na karte tretej strany sa bude používať iba na účtovníctvo vedľajšej knihy. Toto sa použije pre hlavnú knihu a ako predvolená hodnota pre účtovníctvo vedľajšej knihy, ak nie je definovaný osobitný účtovný účet dodávateľa na tretej strane.
+ConfirmCloneTax=Potvrďte klon sociálnej/fiškálnej dane
+ConfirmCloneVAT=Potvrďte klon daňového priznania k DPH
+ConfirmCloneSalary=Potvrďte klon platu
+CloneTaxForNextMonth=Naklonujte to na budúci mesiac
+SimpleReport=Jednoduchá správa
+AddExtraReport=Extra správy (pridať správu o zahraničných a národných zákazníkoch)
+OtherCountriesCustomersReport=Hlásia sa zahraniční zákazníci
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Na základe dvoch prvých písmen IČ DPH, ktoré sa líšia od kódu krajiny vašej vlastnej spoločnosti
+SameCountryCustomersWithVAT=Správa národných zákazníkov
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Na základe dvoch prvých písmen IČ DPH, ktoré sú rovnaké ako kód krajiny vašej vlastnej spoločnosti
+LinkedFichinter=Odkaz na zásah
+ImportDataset_tax_contrib=Sociálne/fiškálne dane
+ImportDataset_tax_vat=Platby DPH
+ErrorBankAccountNotFound=Chyba: Bankový účet sa nenašiel
+FiscalPeriod=Účtovného obdobia
+ListSocialContributionAssociatedProject=Zoznam sociálnych príspevkov spojených s projektom
+DeleteFromCat=Odstrániť z účtovnej skupiny
+AccountingAffectation=Účtovná úloha
+LastDayTaxIsRelatedTo=Posledný deň obdobia, na ktorý sa daň vzťahuje
+VATDue=Nárokovaná daň z predaja
+ClaimedForThisPeriod=Nárokované za obdobie
+PaidDuringThisPeriod=Zaplatené za toto obdobie
+PaidDuringThisPeriodDesc=Toto je súčet všetkých platieb spojených s priznaniami DPH, ktoré majú dátum konca obdobia vo vybranom rozsahu dátumov
+ByVatRate=Podľa sadzby dane z predaja
+TurnoverbyVatrate=Obrat fakturovaný podľa sadzby dane z predaja
+TurnoverCollectedbyVatrate=Obrat vyberaný podľa sadzby dane z predaja
+PurchasebyVatrate=Nákup podľa sadzby dane z predaja
 LabelToShow=Krátky názov
-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 = Late (> 30 days)
-InvoiceLate15Days = Late (15 to 30 days)
-InvoiceLateMinus15Days = 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 ?
-AmountPaidMustMatchAmountOfDownPayment=Amount paid must match amount of down payment
+PurchaseTurnover=Nákupný obrat
+PurchaseTurnoverCollected=Zhromaždený nákupný obrat
+RulesPurchaseTurnoverDue=- Zahŕňa splatné faktúry dodávateľa bez ohľadu na to, či sú zaplatené alebo nie. <br>– Vychádza z dátumu faktúry týchto faktúr.<br>
+RulesPurchaseTurnoverIn=– Zahŕňa všetky skutočné platby faktúr uskutočnené dodávateľom.<br>– Zakladá sa na dátume platby týchto faktúr<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Zahŕňa všetky debetné riadky z nákupného denníka.
+RulesPurchaseTurnoverOfExpenseAccounts=Zahŕňa (debetné - kreditné) riadky pre produktové účty v skupine NÁKLADY
+ReportPurchaseTurnover=Fakturovaný nákupný obrat
+ReportPurchaseTurnoverCollected=Zhromaždený nákupný obrat
+IncludeVarpaysInResults = Zahrňte do prehľadov rôzne platby
+IncludeLoansInResults = Zahrnúť pôžičky do prehľadov
+InvoiceLate30Days = Neskoro (> 30 dní)
+InvoiceLate15Days = Neskoro (15 až 30 dní)
+InvoiceLateMinus15Days = Neskoro (< 15 dní)
+InvoiceNotLate = Na vyzdvihnutie (< 15 dní)
+InvoiceNotLate15Days = Na vyzdvihnutie (15 až 30 dní)
+InvoiceNotLate30Days = Na vyzdvihnutie (> 30 dní)
+InvoiceToPay=Na zaplatenie (< 15 dní)
+InvoiceToPay15Days=Platiť (15 až 30 dní)
+InvoiceToPay30Days=Na zaplatenie (> 30 dní)
+ConfirmPreselectAccount=Predvoľba účtovného kódu
+ConfirmPreselectAccountQuestion=Naozaj chcete vopred vybrať %s vybraté riadky s týmto účtovným kódom?
+AmountPaidMustMatchAmountOfDownPayment=Zaplatená suma sa musí zhodovať so sumou akontácie
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 2ead219694c..9c06abfba86 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -16,7 +16,7 @@ ErrorEmailAlreadyExists=E-mail %s už existuje.
 ErrorRecordNotFound=Záznam nie je nájdený.
 ErrorRecordNotFoundShort=Nenájdené
 ErrorFailToCopyFile=Nepodarilo sa skopírovať súbor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
-ErrorFailToCopyDir=Nepodarilo sa skopírovať adresár '<b>%s</b> do '<' ='notranslate'><b></span>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Nepodarilo sa premenovať súbor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Nepodarilo sa odstrániť súbor <b>&quot;%s&quot;.</b>
 ErrorFailToCreateFile=Nepodarilo sa vytvoriť súbor <b>&quot;%s&quot;.</b>
@@ -94,10 +94,10 @@ ErrorRecordIsUsedCantDelete=Záznam sa nedá vymazať. Je už použitý alebo za
 ErrorModuleRequireJavascript=Aby táto funkcia fungovala, nesmie byť zakázaný JavaScript. Ak chcete povoliť/zakázať JavaScript, prejdite do ponuky Domov->Nastavenie->Zobrazenie.
 ErrorPasswordsMustMatch=Obaja napísaný hesla sa musia zhodovať sa navzájom
 ErrorContactEMail=Vyskytla sa technická chyba. Obráťte sa na správcu na nasledujúci e-mail <b>%s</b> a uveďte chybu kód <b>%s</b> do správy alebo pridajte kópiu táto strana.
-ErrorWrongValueForField=Pole <b>%s</b>: '<span class'>'notrans <b></span>%s</b>' nezodpovedá pravidlu regulárneho výrazu <span class='notranslatee8</span>3f36 %s</b>
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorHtmlInjectionForField=Pole <b>%s</b>: hodnota '<span class=' '><b></span>%s</b>' obsahuje škodlivé údaje, ktoré nie sú povolené
-ErrorFieldValueNotIn=Pole <b>%s</b>: '<span class'>'notrans <b></span>%s</b>' nie je hodnota nájdená v poli 38365 span><span class='notranslate'>%s</b> z <b><span class='notranslate %s</span></b>
-ErrorFieldRefNotIn=Pole <b>%s</b>: '<span class'>'notrans <b></span>%s</b>' nie je 350aee83 class='notranslate'>%s</b> existujúci ref.
+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
 ErrorMultipleRecordFoundFromRef=Pri vyhľadávaní z ref <b>%s</b> sa našlo niekoľko záznamov. Žiadny spôsob, ako zistiť, ktoré ID použiť.
 ErrorsOnXLines=Našli sa %s chyby
 ErrorFileIsInfectedWithAVirus=Antivírusový program nebol schopný overiť súbor (súbor môže byť napadnutý vírusom)
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=Skontrolujte, či nepoužívate príliš vysoký počet pr
 ErrorUserNotAssignedToTask=Používateľ musí byť priradený k úlohe, aby mohol zadať spotrebovaný čas.
 ErrorTaskAlreadyAssigned=Úloha je už priradená používateľovi
 ErrorModuleFileSeemsToHaveAWrongFormat=Zdá sa, že balík modulov má nesprávny formát.
-ErrorModuleFileSeemsToHaveAWrongFormat2=V súbore zip modulu musí existovať aspoň jeden povinný adresár: <strong>%s</strong> > alebo <span class='notranslate'><strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Názov balíka modulu (<strong>%s</strong>) sa nezhoduje očakávaná syntax názvu: <strong>%s</strong>
 ErrorDuplicateTrigger=Chyba, duplicitný názov spúšťača %s. Už načítané z %s.
 ErrorNoWarehouseDefined=Chyba, nie sú definované žiadne sklady.
@@ -260,12 +260,12 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Pre túto šaržu/sériu ni
 ErrorOnlyOneFieldForGroupByIsPossible=Je možné len 1 pole pre „Zoskupiť podľa“ (ostatné sú vyradené)
 ErrorTooManyDifferentValueForSelectedGroupBy=Našlo sa príliš veľa rôznych hodnôt (viac ako <b>%s</b>) pole '<b>%s</b>', takže ho nemôžeme použiť ako „Skupina podľa“ pre grafiku. Pole „Skupina podľa“ bolo odstránené. Možno by ste ho chceli použiť ako os X?
 ErrorReplaceStringEmpty=Chyba, reťazec, do ktorého sa má nahradiť, je prázdny
-ErrorProductNeedBatchNumber=Chyba, produkt '<b>%s<span class='notranslate'></b>/serial>' vyžaduje číslo šarže
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Chyba, produkt '<b>%s</b>' neprijíma sériové číslo
 ErrorFailedToReadObject=Chyba, nepodarilo sa prečítať objekt typu <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Chyba, parameter <b>%s</b> musí byť povolený v triede <span> 'notranslate'><b></span>conf/conf.php<> na umožnenie použitia rozhrania príkazového riadka interným plánovačom úloh
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Chyba, toto prihlásenie je mimo rozsahu dátumov platnosti
-ErrorValueLength=Dĺžka poľa '<b>%s</b>' musí byť väčšia ako span class='notranslate'><b></span>%s</b>'
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=Slovo '<b>%s</b>' je vyhradené kľúčové slovo
 ErrorFilenameReserved=Názov súboru <b>%s</b> nie je možné použiť tak, ako je vyhradený a chránený príkaz.
 ErrorNotAvailableWithThisDistribution=Nie je k dispozícii s touto distribúciou
@@ -315,7 +315,7 @@ ErrorExistingPermission = Povolenie <b>%s</b> pre objekt <span class'>notrans <b
 ErrorFieldExist=Hodnota pre <b>%s</b> už existuje
 ErrorEqualModule=Modul je neplatný v <b>%s</b>
 ErrorFieldValue=Hodnota pre <b>%s</b> je nesprávna
-ErrorCoherenceMenu=<b>%s</b>, keď sa vyžaduje <span class='notranslate <b></span>%s</b> je vľavo
+ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
 ErrorUploadFileDragDrop=Pri nahrávaní súboru (súborov) sa vyskytla chyba
 ErrorUploadFileDragDropPermissionDenied=Pri nahrávaní súboru (súborov) sa vyskytla chyba: Povolenie odmietnuté
 ErrorFixThisHere=<a href="%s">Opravte to tu</a>
@@ -366,7 +366,7 @@ WarningCreateSubAccounts=Upozornenie, podúčet nemôžete vytvoriť priamo, mus
 WarningAvailableOnlyForHTTPSServers=Dostupné iba pri použití zabezpečeného pripojenia HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Modul %s nebol povolený. Takže tu môžete zmeškať veľa udalostí.
 WarningPaypalPaymentNotCompatibleWithStrict=Hodnota 'Strict' spôsobuje, že funkcie online platieb nefungujú správne. Namiesto toho použite „Lax“.
-WarningThemeForcedTo=Upozornenie, motív bol vynútený <b>%s<span class='notranslate'></b> MAIN_FORHEC skrytými konštantami MAIN_FORHEC
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Upozornenie, týmto sa odstránia aj všetky existujúce stránky/kontajnery webovej lokality. Svoju webovú stránku by ste mali exportovať predtým, aby ste mali zálohu, ktorú môžete neskôr znova importovať.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatická validácia je vypnutá, keď je možnosť zníženia zásob nastavená na "Overenie faktúry".
 WarningModuleNeedRefresh = Modul <b>%s</b> bol zakázaný. Nezabudnite ho povoliť
diff --git a/htdocs/langs/sk_SK/eventorganization.lang b/htdocs/langs/sk_SK/eventorganization.lang
index dc3e9ec6bc5..7e6804e91eb 100644
--- a/htdocs/langs/sk_SK/eventorganization.lang
+++ b/htdocs/langs/sk_SK/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=Nastavenie organizácie udalosti
 EventOrganization=Organizácia podujatia
 EventOrganizationSetupPage = Stránka nastavenia organizácie udalosti
 EVENTORGANIZATION_TASK_LABEL = Označenie úloh, ktoré sa vytvorí automaticky pri overení projektu
-EVENTORGANIZATION_TASK_LABELTooltip = Keď potvrdíte organizáciu udalosti, niektoré úlohy sa môžu automaticky vytvoriť v projekte<br><br>Napríklad: <br>Odoslať výzvu na konferencie<br>Odoslať výzvu na stánok<br> návrhy na konferenciu<span>Valispandate class ='notranslate'><br>Overiť prihlášku pre stánky<br>Otvoriť odbery udalosti pre účastníkovb0342fccfda>Sbz0 udalosti prednášajúcim<span class='notranslate'><br>Poslať pripomienku udalosti hosťom stánku<br>Poslať účastníkom pripomienku udalosti
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=Ponechajte prázdne, ak nepotrebujete vytvárať úlohy automaticky.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategória na pridanie k tretím stranám sa automaticky vytvorí, keď niekto navrhne konferenciu
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategória na pridanie k tretím stranám sa automaticky vytvorí, keď navrhnú stánok
@@ -88,6 +88,7 @@ PriceOfRegistration=Cena registrácie
 PriceOfRegistrationHelp=Cena za registráciu alebo účasť na podujatí
 PriceOfBooth=Cena predplatného na státie stánku
 PriceOfBoothHelp=Cena predplatného na státie stánku
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Prepojiť ICS pre konferencie
 ConferenceOrBoothInformation=Informácie o konferencii alebo stánku
 Attendees=Účastníci
@@ -127,8 +128,8 @@ PublicAttendeeSubscriptionPage = Verejný odkaz na registráciu iba na túto uda
 MissingOrBadSecureKey = Bezpečnostný kľúč je neplatný alebo chýba
 EvntOrgWelcomeMessage = Tento formulár vám umožňuje zaregistrovať sa ako nový účastník podujatia
 EvntOrgDuration = Táto konferencia sa začína %s a končí sa %s.
-ConferenceAttendeeFee = Účastnícky poplatok za udalosť: '%s' od %s do <span class='notranslate'>b0ecb2ec87f49f >.
-BoothLocationFee = Miesto stánku pre udalosť: '%s' od %s do <span class='notranslate'>%s
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
 EventType = Typ udalosti
 LabelOfBooth=Označenie stánku
 LabelOfconference=Konferenčný štítok
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index b781a584de8..a071e076d18 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -87,7 +87,7 @@ ErrorMissingMandatoryValue=V zdrojovom súbore v stĺpci <b>%s</b> sú povinné
 TooMuchErrors=Stále existujú <b>%s</b> ďalšie zdrojové riadky s chybami, ale výstup má boli obmedzené.
 TooMuchWarnings=Stále existujú <b>%s</b> iné zdrojové riadky s upozorneniami boli obmedzené.
 EmptyLine=Prázdny riadok (budú odstránené)
-CorrectErrorBeforeRunningImport=<b>musíte</b> opraviť všetky chyby b0aee83365837fore class<span='be notranslate'></b> spustí definitívny import.
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=Súbor bol importovaný s číslom <b>%s.</b>
 YouCanUseImportIdToFindRecord=Všetky importované záznamy môžete nájsť vo svojej databáze filtrovaním podľa poľa <b>import_key='%s'</b>.
 NbOfLinesOK=Počet riadkov bez chýb a bez varovania: <b>%s.</b>
@@ -103,9 +103,9 @@ SourceRequired=Hodnota dát je povinné
 SourceExample=Príklad možné hodnoty údajov
 ExampleAnyRefFoundIntoElement=Akékoľvek ref našli prvkov <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Kód (alebo ID) nájdené v slovníku <b>%s</b>
-CSVFormatDesc=<b>Hodnota oddelená čiarkou</b> formát súboru (.csv).<br> je formát textového súboru, kde sú polia oddelené oddeľovačom [ <span class='notranslate'>%s ]. Ak sa v obsahu poľa nájde oddeľovač, pole sa zaokrúhli na okrúhly znak [ %s ]. Únikový znak na únikový kruhový znak je [ %s ].
+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> formát súboru (.xls)<br> Formát Excel 95 (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> formát súboru (.xlsx)<span class='notranslate'><br> Formát Excel 2007 (Tabuľkový hárokML).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
 TsvFormatDesc=<b>Tab Hodnoty oddelené</b> formát súboru (. TSV) <br> Jedná sa o textový formát súboru, kde sú polia oddelené tabulátorom [Tab].
 ExportFieldAutomaticallyAdded=Pole <b>%s</b> bolo pridané automaticky. Vyhnete sa tak tomu, že podobné riadky sa budú považovať za duplicitný záznam (pri pridaní tohto poľa budú mať všetky riadky svoje vlastné ID a budú sa líšiť).
 CsvOptions=Možnosti formátu CSV
@@ -113,8 +113,8 @@ Separator=Oddeľovač polí
 Enclosure=Oddeľovač reťazcov
 SpecialCode=Špeciálny kód
 ExportStringFilter=%% umožňuje nahradenie jedného alebo viac znakov v texte
-ExportDateFilter=RRRR, RRRRMM, RRRRMMDD: filtre podľa jedného roka/mesiaca/deň<br>RRRR+RRRR, RRRRMM+RRRRMMDD+RRRRMMDD+ RRRRMMDD roky/mesiace/dni span class='notranslate'><br></span> > RRRR, > RRRRMM, > RRRRMMDD: filtre pre všetky nasledujúce roky/mesiace/dni<br> < RRRR, < RRRR, < RRRR RRRRMMDD: filtruje všetky predchádzajúce roky/mesiace/dni
-ExportNumericFilter=NNNNN filtruje podľa jednej hodnoty<br>NNNNN+NNNNNN filtruje v rozsahu hodnôt<br><span class='notranslate'>b08912a027 /span>> NNNNN filtruje vyššie hodnoty
+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 začína od riadka číslo
 EndAtLineNb=Číslo konca riadka
 ImportFromToLine=Limitný rozsah (Od - Do). Napr. vynechať riadok(y) hlavičky.
diff --git a/htdocs/langs/sk_SK/hrm.lang b/htdocs/langs/sk_SK/hrm.lang
index 7b44243dff1..0052aa63aff 100644
--- a/htdocs/langs/sk_SK/hrm.lang
+++ b/htdocs/langs/sk_SK/hrm.lang
@@ -2,91 +2,96 @@
 
 
 # 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=E-mail na zabránenie externej službe HRM
+Establishments=Prevádzkarne
+Establishment=Založenie
+NewEstablishment=Nová prevádzka
+DeleteEstablishment=Odstrániť prevádzkareň
+ConfirmDeleteEstablishment=Naozaj chcete odstrániť túto inštitúciu?
+OpenEtablishment=Otvorená prevádzka
+CloseEtablishment=Zatvorte prevádzkareň
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Organizational Unit
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Dovolenka - štátne sviatky
+DictionaryDepartment=HRM – organizačná jednotka
+DictionaryFunction=HRM - Pracovné pozície
 # Module
-Employees=Employees
+Employees=zamestnancov
 Employee=Zamestnanec
-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
+NewEmployee=Nový zamestnanec
+ListOfEmployees=Zoznam zamestnancov
+HrmSetup=Nastavenie modulu HRM
+SkillsManagement=Manažment zručností
+HRM_MAXRANK=Maximálny počet úrovní na hodnotenie zručnosti
+HRM_DEFAULT_SKILL_DESCRIPTION=Predvolený popis hodností pri vytváraní zručnosti
 deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-JobPosition=Job profile
-JobsPosition=Job profiles
-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
+DateEval=Dátum hodnotenia
+JobCard=Pracovná karta
+NewJobProfile=Nový pracovný profil
+JobProfile=Pracovný profil
+JobsProfiles=Pracovné profily
+NewSkill=Nová zručnosť
+SkillType=Typ zručnosti
+Skilldets=Zoznam hodností pre túto zručnosť
+Skilldet=Úroveň zručnosti
+rank=Poradie
+ErrNoSkillSelected=Nie je vybratá žiadna zručnosť
+ErrSkillAlreadyAdded=Táto zručnosť je už v zozname
+SkillHasNoLines=Táto zručnosť nemá žiadne čiary
+Skill=Zručnosť
+Skills=Zručnosti
+SkillCard=Karta zručnosti
+EmployeeSkillsUpdated=Zručnosti zamestnanca boli aktualizované (pozri kartu „Zručnosti“ na karte zamestnanca)
+Eval=Hodnotenie
+Evals=hodnotenia
+NewEval=Nové hodnotenie
+ValidateEvaluation=Overiť hodnotenie
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=Hodnotiaca karta
+RequiredRank=Požadovaná hodnosť pre pracovný profil
+RequiredRankShort=Požadovaná hodnosť
+PositionsWithThisProfile=Pozície s týmto pracovným profilom
+EmployeeRank=Hodnosť zamestnanca za túto zručnosť
+EmployeeRankShort=Zamestnanecká hodnosť
+EmployeePosition=Zamestnanecká pozícia
+EmployeePositions=Zamestnanecké pozície
+EmployeesInThisPosition=Zamestnanci na tejto pozícii
+group1ToCompare=Používateľská skupina na analýzu
+group2ToCompare=Druhá skupina používateľov na porovnanie
+OrJobToCompare=Porovnajte s požiadavkami na zručnosti profilu zamestnania
 difference=Rozdiel
-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
+CompetenceAcquiredByOneOrMore=Kompetencia získaná jedným alebo viacerými používateľmi, ale nevyžiadaná druhým porovnávačom
+MaxlevelGreaterThan=Úroveň zamestnancov je vyššia ako očakávaná úroveň
+MaxLevelEqualTo=Úroveň zamestnancov sa rovná očakávanej úrovni
+MaxLevelLowerThan=Úroveň zamestnancov je nižšia ako očakávaná úroveň
+MaxlevelGreaterThanShort=Úroveň vyššia, ako sa očakávalo
+MaxLevelEqualToShort=Úroveň rovná očakávanej úrovni
+MaxLevelLowerThanShort=Úroveň nižšia, ako sa očakávalo
+SkillNotAcquired=Zručnosť, ktorú nezískali všetci používatelia a ktorú vyžaduje druhý porovnávač
 legend=Legenda
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=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
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
-NoDescription=No description
+TypeSkill=Typ zručnosti
+AddSkill=Pridajte zručnosti do pracovného profilu
+RequiredSkills=Požadované zručnosti pre tento pracovný profil
+UserRank=Hodnotenie používateľa
+SkillList=Zoznam zručností
+SaveRank=Uložiť hodnosť
+TypeKnowHow=Know-how
+TypeHowToBe=Ako byť
+TypeKnowledge=Vedomosti
+AbandonmentComment=Komentár o opustení
+DateLastEval=Dátum posledného hodnotenia
+NoEval=Pre tohto zamestnanca nebolo vykonané žiadne hodnotenie
+HowManyUserWithThisMaxNote=Počet používateľov s týmto hodnotením
+HighestRank=Najvyššia hodnosť
+SkillComparison=Porovnanie zručností
+ActionsOnJob=Udalosti v tejto práci
+VacantPosition=voľné pracovné miesto
+VacantCheckboxHelper=Zaškrtnutím tejto možnosti sa zobrazia neobsadené pozície (voľné pracovné miesto)
+SaveAddSkill = Pridané zručnosti
+SaveLevelSkill = Úroveň zručností bola uložená
+DeleteSkill = Zručnosť odstránená
+SkillsExtraFields=Doplnkové atribúty (zručnosti)
+JobsExtraFields=Doplnkové atribúty (Profil úlohy)
+EvaluationsExtraFields=Doplnkové atribúty (hodnotenia)
+NeedBusinessTravels=Potrebujete služobné cesty
+NoDescription=žiadny popis
+TheJobProfileHasNoSkillsDefinedFixBefore=Hodnotený pracovný profil tohto zamestnanca nemá definovanú žiadnu zručnosť. Pridajte zručnosti, potom odstráňte a reštartujte hodnotenie.
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 06f2fbed1cf..1e1c1cf66a4 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -2,36 +2,36 @@
 InstallEasy=Stačí sledovať inštrukcie krok za krokom.
 MiscellaneousChecks=Kontrola predpokladov
 ConfFileExists=Konfiguračný súbor <b>%s</b> existuje.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguračný súbor <b>%s</b> neexistuje a nebolo možné ho vytvoriť!
 ConfFileCouldBeCreated=<b>%s</b> Konfiguračný súbor môže byť vytvorený.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
+ConfFileIsNotWritable=Konfiguračný súbor <b>%s</b> nie je zapisovateľný. Skontrolujte povolenia. Pri prvej inštalácii musí byť váš webový server schopný zapisovať do tohto súboru počas procesu konfigurácie („chmod 666“ napríklad na OS typu Unix).
 ConfFileIsWritable=Konfiguračný súbor <b>%s</b> je zapisovatelný.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-NoReadableConfFileSoStartInstall=The configuration file <b>conf/conf.php</b> does not exists or is not readable. We will run the installation process to try to initialize it.
+ConfFileMustBeAFileNotADir=Konfiguračný súbor <b>%s</b> musí byť súbor, nie adresár.
+ConfFileReload=Opätovné načítanie parametrov z konfiguračného súboru.
+NoReadableConfFileSoStartInstall=Konfiguračný súbor <b>conf/conf.php</b> neexistuje alebo nie je čitateľný. Spustíme proces inštalácie a pokúsime sa ho inicializovať.
 PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
+PHPSupportPOSTGETKo=Je možné, že vaše nastavenie PHP nepodporuje premenné POST a/alebo GET. Skontrolujte parameter <b>variables_order</b> v php.ini.
 PHPSupportSessions=Vaše PHP podporuje relácie.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=Toto PHP podporuje funkcie %s.
 PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. To by malo stačiť.
 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.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+Recheck=Kliknutím sem zobrazíte podrobnejší test
+ErrorPHPDoesNotSupportSessions=Vaša inštalácia PHP nepodporuje relácie. Táto funkcia je potrebná na to, aby Dolibarr fungoval. Skontrolujte nastavenie PHP a oprávnenia adresára sessions.
+ErrorPHPDoesNotSupport=Vaša inštalácia PHP nepodporuje funkcie %s.
 ErrorDirDoesNotExists=Adresár %s neexistuje.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=Vráťte sa a skontrolujte/opravte parametre.
 ErrorWrongValueForParameter=Možno ste zadali nesprávnu hodnotu pre parameter &quot;%s&quot;.
 ErrorFailedToCreateDatabase=Nepodarilo sa vytvoriť databázu &quot;%s&quot;.
 ErrorFailedToConnectToDatabase=Nepodarilo sa pripojiť k databáze &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Verzia databázy (%s) je príliš stará. Vyžaduje sa verzia %s alebo vyššia.
-ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
-ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorPHPVersionTooLow=Verzia PHP je príliš stará. Vyžaduje sa verzia %s alebo vyššia.
+ErrorPHPVersionTooHigh=Verzia PHP je príliš vysoká. Vyžaduje sa verzia %s alebo nižšia.
+ErrorConnectedButDatabaseNotFound=Pripojenie k serveru úspešné, ale databáza '%s' sa nenašla.
 ErrorDatabaseAlreadyExists=Databáza '%s' už existuje.
-ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+ErrorNoMigrationFilesFoundForParameters=Pre vybraté verzie sa nenašiel žiadny súbor migrácie
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ak databáza neexistuje, vráťte sa späť a zaškrtnite možnosť „Vytvoriť databázu“.
 IfDatabaseExistsGoBackAndCheckCreate=Ak databáza už existuje, vráťte sa späť a zrušte začiarknutie políčka &quot;Vytvoriť databázu&quot;.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+WarningBrowserTooOld=Verzia prehliadača je príliš stará. Dôrazne sa odporúča inovovať prehliadač na najnovšiu verziu prehliadača Firefox, Chrome alebo Opera.
 PHPVersion=Verzia PHP
 License=Používa sa licencia
 ConfigurationFile=Konfiguračný súbor
@@ -44,23 +44,22 @@ DolibarrDatabase=Dolibarr databáza
 DatabaseType=Typ databázy
 DriverType=Typ ovládača
 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.
+ServerAddressDescription=Názov alebo IP adresa databázového servera. Zvyčajne „localhost“, keď je databázový server umiestnený na rovnakom serveri ako webový server.
 ServerPortDescription=Port databázového servera. Nechajte prázdne, ak je neznámy.
 DatabaseServer=Databázový server
 DatabaseName=Názov databázy
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
+DatabasePrefix=Predpona databázovej tabuľky
+DatabasePrefixDescription=Predpona databázovej tabuľky. Ak je prázdny, predvolená hodnota je llx_.
+AdminLogin=Používateľský účet vlastníka databázy Dolibarr.
 AdminPassword=Heslo pre vlastníka databázy Dolibarr.
 CreateDatabase=Vytvoriť databázu
-CreateUser=Create user account or grant user account permission on the Dolibarr database
+CreateUser=Vytvorte používateľské konto alebo udeľte povolenie používateľskému kontu v databáze Dolibarr
 DatabaseSuperUserAccess=Databázový server - prístup Superuser
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
+CheckToCreateDatabase=Začiarknite políčko, ak databáza ešte neexistuje, a preto musí byť vytvorená.<br>V tomto prípade musíte v spodnej časti vyplniť aj používateľské meno a heslo pre superužívateľský účet tejto stránky.
+CheckToCreateUser=Začiarknite políčko, ak:<br>používateľský účet databázy ešte neexistuje, a preto ho treba vytvoriť, alebo<br>ak používateľský účet existuje, ale databáza neexistuje a musia byť udelené povolenia.<br>V tomto prípade musíte zadať používateľský účet a heslo a <b> span>tiež</b> meno a heslo superužívateľského účtu v spodnej časti tejto stránky. Ak toto políčko nie je začiarknuté, vlastník databázy a heslo už musia existovať.
+DatabaseRootLoginDescription=Názov účtu superužívateľa (na vytvorenie nových databáz alebo nových používateľov), povinný, ak databáza alebo jej vlastník ešte neexistuje.
+KeepEmptyIfNoPassword=Nechajte prázdne, ak superužívateľ nemá žiadne heslo (NEODPORÚČANÉ)
+SaveConfigurationFile=Ukladanie parametrov do
 ServerConnection=Pripojenie k serveru
 DatabaseCreation=Vytvorenie databázy
 CreateDatabaseObjects=Tvorba objektov databázy
@@ -71,9 +70,9 @@ CreateOtherKeysForTable=Vytvorte cudzie kľúče a indexy pre tabuľky %s
 OtherKeysCreation=Cudzie kľúče a indexy tvorba
 FunctionsCreation=Funkcia vytvárania
 AdminAccountCreation=Administrator login tvorba
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
+PleaseTypePassword=Zadajte heslo, prázdne heslá nie sú povolené!
+PleaseTypeALogin=Zadajte prihlasovacie meno!
+PasswordsMismatch=Heslá sa líšia, skúste to znova!
 SetupEnd=Koniec nastavenie
 SystemIsInstalled=Táto inštalácia je dokončená.
 SystemIsUpgraded=Dolibarr bol aktualizovaný úspešne.
@@ -81,73 +80,73 @@ YouNeedToPersonalizeSetup=Je potrebné nakonfigurovať Dolibarr aby vyhovoval va
 AdminLoginCreatedSuccessfuly=Dolibarr administrátorský účet '<b>%s</b>' úspešne vytvorený
 GoToDolibarr=Prejsť na Dolibarr
 GoToSetupArea=Prejsť na Dolibarr (nastavenie plochy)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+MigrationNotFinished=Verzia databázy nie je úplne aktuálna: spustite proces aktualizácie znova.
 GoToUpgradePage=Prejsť na stránku znova upgradovať
 WithNoSlashAtTheEnd=Bez lomítka &quot;/&quot; na koniec
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation=<span class="warning">DÔLEŽITÉ</span>: Musíte použiť adresár, ktorý sa nachádza mimo webových stránok (takže nepoužívajte podadresár predchádzajúceho parametra ).
 LoginAlreadyExists=Už existuje
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+AdminLoginAlreadyExists=Účet správcu Dolibarr '<b>%s</b> už existuje.' Ak chcete vytvoriť ďalší, vráťte sa späť.
 FailedToCreateAdminLogin=Vytvorenie Dolibarr administratórskeho účtu zlyhalo
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
+WarningRemoveInstallDir=Upozornenie, z bezpečnostných dôvodov musíte po dokončení procesu inštalácie pridať súbor s názvom <b>install.lock</b> do Adresár dokumentov Dolibarr, aby ste zabránili opätovnému náhodnému/neúmyselnému použitiu inštalačných nástrojov.
+FunctionNotAvailableInThisPHP=Nie je k dispozícii v tomto PHP
 ChoosedMigrateScript=Vyberte si skript migrácie
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+DataMigration=Migrácia databázy (údaje)
+DatabaseMigration=Migrácia databázy (štruktúra + niektoré údaje)
 ProcessMigrateScript=Skript pre spracovanie
 ChooseYourSetupMode=Vyberte si režim inštalácie a kliknite na tlačidlo &quot;Štart&quot; ...
 FreshInstall=Čerstvá inštalácia
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=Tento režim použite, ak ide o vašu prvú inštaláciu. Ak nie, tento režim môže opraviť nedokončenú predchádzajúcu inštaláciu. Ak chcete aktualizovať svoju verziu, vyberte režim „Aktualizovať“.
 Upgrade=Vylepšiť
 UpgradeDesc=Tento režim použite, ak ste vymenili staré Dolibarr súbory sa súbory z novšej verzie. To bude aktualizovať databázy a dáta.
 Start=Začiatok
 InstallNotAllowed=Inštalácia nie je povolené <b>conf.php</b> oprávnenia
 YouMustCreateWithPermission=Musíte vytvoriť súbor %s a nastaviť povolenia na zápis na tom webovom serveri počas procesu inštalácie.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+CorrectProblemAndReloadPage=Opravte problém a stlačením klávesu F5 znova načítajte stránku.
 AlreadyDone=Už sa sťahoval
 DatabaseVersion=Verzia databázy
 ServerVersion=Databázový server verzia
 YouMustCreateItAndAllowServerToWrite=Musíte vytvoriť tento adresár a umožniť pre webový server zapisovať do neho.
 DBSortingCollation=Znak triedením
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Vybrali ste vytvoriť databázu <b>%s</b>, ale na to potrebuje Dolibarr na pripojenie k serveru <b>%s</b> so super používateľom <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Vybrali ste používateľa vytvorenia databázy <b>%s</b>, ale pre toto, Dolibarr potrebuje sa pripojiť k serveru <b>%s</b> so super používateľom <b>%s</b>.
+BecauseConnectionFailedParametersMayBeWrong=Pripojenie k databáze zlyhalo: parametre hostiteľa alebo superužívateľa musia byť nesprávne.
 OrphelinsPaymentsDetectedByMethod=Siroty platba detegované metódou %s
 RemoveItManuallyAndPressF5ToContinue=Odstrániť ručne a stlačte klávesu F5 pokračovať.
 FieldRenamed=Pole premenovaný
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
+IfLoginDoesNotExistsCheckCreateUser=Ak používateľ ešte neexistuje, musíte zaškrtnúť možnosť „Vytvoriť používateľa“
 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=Odporúčaná voľba pre inštaláciu verzie <b>%s</b> od aktuálnej verzie <b>%s</b>
 InstallChoiceSuggested=<b>Nainštalujte voľbou navrhol inštaláciu.</b>
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=Cieľová verzia (%s) má medzeru niekoľkých verzií. Sprievodca inštaláciou sa vráti a navrhne ďalšiu migráciu po dokončení tejto.
+CheckThatDatabasenameIsCorrect=Skontrolujte, či je názov databázy "<b>%s</b>" správny.
 IfAlreadyExistsCheckOption=Ak to je správny názov a databázy doteraz neexistuje, musíte skontrolovať voľbu &quot;Vytvoriť databázu&quot;.
 OpenBaseDir=PHP OpenBasedir parametrov
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+YouAskToCreateDatabaseSoRootRequired=Zaškrtli ste políčko „Vytvoriť databázu“. Na tento účel musíte zadať prihlasovacie meno/heslo superužívateľa (spodná časť formulára).
+YouAskToCreateDatabaseUserSoRootRequired=Zaškrtli ste políčko „Vytvoriť vlastníka databázy“. Na tento účel musíte zadať prihlasovacie meno/heslo superužívateľa (spodná časť formulára).
+NextStepMightLastALongTime=Aktuálny krok môže trvať niekoľko minút. Pred pokračovaním počkajte, kým sa úplne nezobrazí ďalšia obrazovka.
+MigrationCustomerOrderShipping=Migrujte zásielky pre sklad predajných objednávok
 MigrationShippingDelivery=Aktualizujte skladovanie lodnej dopravy
 MigrationShippingDelivery2=Aktualizujte skladovaní dopravy 2
 MigrationFinished=Migrácia dokončená
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc=<strong>Posledný krok</strong>: Tu definujte prihlasovacie meno a heslo, ktoré chcete použiť na pripojenie k službe Dolibarr. <b>Nestratíte to, pretože je to hlavný účet na správu všetkých ostatných/ďalších používateľských účtov.</b>
 ActivateModule=Aktivácia modulu %s
 ShowEditTechnicalParameters=Kliknite tu pre zobrazenie / editovať pokročilé parametre (expertný režim)
-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
+WarningUpgrade=POZOR:\nSpustili ste najskôr zálohu databázy?\nToto sa dôrazne odporúča. Počas tohto procesu môže dôjsť k strate údajov (napríklad kvôli chybám v mysql verzii 5.5.40/41/42/43), preto je nevyhnutné pred začatím akejkoľvek migrácie vytvoriť úplný výpis databázy.\n\nKliknutím na tlačidlo OK spustíte proces migrácie...
+ErrorDatabaseVersionForbiddenForMigration=Verzia vašej databázy je %s. Obsahuje kritickú chybu, ktorá umožňuje stratu údajov, ak vo svojej databáze vykonáte štrukturálne zmeny, ako to vyžaduje proces migrácie. Z tohto dôvodu nebude migrácia povolená, kým neupgradujete svoju databázu na vrstvu (opravenú) verziu (zoznam známych chybných verzií: %s)
+KeepDefaultValuesWamp=Použili ste sprievodcu nastavením Dolibarr z DoliWamp, takže tu navrhované hodnoty sú už optimalizované. Zmeňte ich iba vtedy, ak viete, čo robíte.
+KeepDefaultValuesDeb=Použili ste sprievodcu nastavením Dolibarr z balíka Linux (Ubuntu, Debian, Fedora...), takže tu navrhnuté hodnoty sú už optimalizované. Musíte zadať iba heslo vlastníka databázy, ktorú chcete vytvoriť. Ostatné parametre meňte len vtedy, ak viete, čo robíte.
+KeepDefaultValuesMamp=Použili ste sprievodcu nastavením Dolibarr od DoliMamp, takže tu navrhnuté hodnoty sú už optimalizované. Zmeňte ich iba vtedy, ak viete, čo robíte.
+KeepDefaultValuesProxmox=Použili ste sprievodcu nastavením Dolibarr z virtuálneho zariadenia Proxmox, takže tu navrhnuté hodnoty sú už optimalizované. Zmeňte ich iba vtedy, ak viete, čo robíte.
+UpgradeExternalModule=Spustite vyhradený proces aktualizácie externého modulu
+SetAtLeastOneOptionAsUrlParameter=Nastavte aspoň jednu možnosť ako parameter v adrese URL. Napríklad: '...repair.php?standard=confirmed'
+NothingToDelete=Nie je čo čistiť/vymazávať
+NothingToDo=Nič na práci
 #########
 # upgrade
 MigrationFixData=Oprava pre denormalized dát
 MigrationOrder=Migrácia dát pre zákazníkovej objednávky
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=Migrácia dát pre objednávky dodávateľa
 MigrationProposal=Migrácia dát na komerčné návrhov
 MigrationInvoice=Migrácia dát pre zákazníka faktúry
 MigrationContract=Migrácia dát pre zmluvy
@@ -163,9 +162,9 @@ MigrationContractsUpdate=Zmluva korekcia dát
 MigrationContractsNumberToUpdate=%s zmluva (y) aktualizovať
 MigrationContractsLineCreation=Vytvorte riadku zmluvy pre %s zmluvných ref
 MigrationContractsNothingToUpdate=Žiadne ďalšie vecí, ktoré sa
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsFieldDontExist=Pole fk_facture už neexistuje. Nič na práci.
 MigrationContractsEmptyDatesUpdate=Zmluva prázdna dáta korekcia
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Oprava prázdneho dátumu zmluvy bola úspešne vykonaná
 MigrationContractsEmptyDatesNothingToUpdate=Žiadna zmluva prázdny Dátum opraviť
 MigrationContractsEmptyCreationDatesNothingToUpdate=Žiadna zmluva dátum vytvorenia opraviť
 MigrationContractsInvalidDatesUpdate=Bad valuty zmluva korekcia
@@ -179,7 +178,7 @@ MigrationReopeningContracts=Otvorte zmluva uzatvorená chyby
 MigrationReopenThisContract=Znovu zmluvné %s
 MigrationReopenedContractsNumber=%s zmluvy zmenená
 MigrationReopeningContractsNothingToUpdate=Žiadne uzatvorené zmluvy o otvorení
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=Aktualizujte prepojenia medzi bankovým záznamom a bankovým prevodom
 MigrationBankTransfertsNothingToUpdate=Všetky odkazy sú aktuálne
 MigrationShipmentOrderMatching=Sendings príjem aktualizácie
 MigrationDeliveryOrderMatching=Potvrdenie o doručení aktualizácie
@@ -187,29 +186,34 @@ MigrationDeliveryDetail=Dodávka aktualizácie
 MigrationStockDetail=Aktualizovať hodnotu zásob výrobkov
 MigrationMenusDetail=Aktualizácia dynamická menu tabuľky
 MigrationDeliveryAddress=Aktualizovať adresu dodania zásielky
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectTaskActors=Migrácia údajov pre tabuľku llx_projet_task_actors
 MigrationProjectUserResp=Migrácia dát z poľa fk_user_resp llx_projet na llx_element_contact
 MigrationProjectTaskTime=Aktualizovať čas strávený v sekundách
 MigrationActioncommElement=Aktualizovať údaje o činnosti
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=Migrácia údajov pre typ platby
 MigrationCategorieAssociation=Migrácia kategórií
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationEvents=Migrácia udalostí na pridanie vlastníka udalosti do tabuľky priradenia
+MigrationEventsContact=Migrácia udalostí na pridanie kontaktu udalosti do tabuľky priradenia
 MigrationRemiseEntity=Aktualizácia hodnoty llx_societe_remise
 MigrationRemiseExceptEntity=Aktualizácia hodnoty llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationUserRightsEntity=Aktualizujte hodnotu poľa entity llx_user_rights
+MigrationUserGroupRightsEntity=Aktualizujte hodnotu poľa entity llx_usergroup_rights
+MigrationUserPhotoPath=Migrácia fotografických ciest pre používateľov
+MigrationFieldsSocialNetworks=Migrácia používateľských polí sociálnych sietí (%s)
 MigrationReloadModule=Znovu načítať modul %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-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
+MigrationResetBlockedLog=Resetujte modul BlockedLog pre algoritmus v7
+MigrationImportOrExportProfiles=Migrácia importných alebo exportných profilov (%s)
+ShowNotAvailableOptions=Zobraziť nedostupné možnosti
+HideNotAvailableOptions=Skryť nedostupné možnosti
+ErrorFoundDuringMigration=Počas procesu migrácie boli hlásené chyby, takže ďalší krok nie je k dispozícii. Ak chcete chyby ignorovať, <a href="%s">kliknite sem</a>, ale aplikácia alebo niektoré funkcie nemusia fungovať správne, kým sa chyby nevyriešia .
+YouTryInstallDisabledByDirLock=Aplikácia sa pokúsila o samoinováciu, ale stránky inštalácie/inovácie boli z bezpečnostných dôvodov deaktivované (adresár bol premenovaný s príponou .lock).<br>
+YouTryInstallDisabledByFileLock=Aplikácia sa pokúsila o samoinováciu, ale stránky inštalácie/inovácie boli z bezpečnostných dôvodov deaktivované (existenciou súboru zámku <strong>install.lock</strong> v adresári dokumentov dolibarr).<br>
+YouTryUpgradeDisabledByMissingFileUnLock=Aplikácia sa pokúsila o samoinováciu, ale proces inovácie momentálne nie je povolený.<br>
+ClickHereToGoToApp=Kliknutím sem prejdete na svoju aplikáciu
+ClickOnLinkOrRemoveManualy=Ak prebieha inovácia, počkajte. Ak nie, kliknite na nasledujúci odkaz. Ak sa vždy zobrazuje rovnaká stránka, musíte odstrániť/premenovať súbor install.lock v adresári dokumentov.
+ClickOnLinkOrCreateUnlockFileManualy=Ak prebieha aktualizácia, počkajte... Ak nie, musíte odstrániť súbor install.lock alebo vytvoriť súbor upgrade.unlock v adresári dokumentov Dolibarr.
+Loaded=Naložený
+FunctionTest=Funkčný test
+NodoUpgradeAfterDB=Po aktualizácii databázy nie je vyžadovaná žiadna akcia externými modulmi
+NodoUpgradeAfterFiles=Po aktualizácii súborov alebo adresárov externé moduly nevyžadujú žiadnu akciu
+MigrationContractLineRank=Migrujte zmluvnú líniu, aby ste mohli používať hodnotenie (a povoliť zmenu poradia)
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index d0185a2b586..1911a8ffffc 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=Importovaný súbor musí mať formát <strong>email;
 UseFormatInputEmailToTarget=Zadajte reťazec vo formáte <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Príjemcovia (rozšírený výber)
 AdvTgtTitle=Vyplnením vstupných polí vopred vyberte tretie strany alebo kontakty/adresy, na ktoré chcete zacieliť
-AdvTgtSearchTextHelp=Ako zástupné znaky použite %%. Ak chcete napríklad nájsť všetky položky ako <b>jean, joe, jim</b>, môžete zadať  <b>j%%</b>, môžete použiť aj ; ako oddeľovač hodnoty a použite ! okrem tejto hodnoty. Napríklad <b>jean;joe;jim%%;!jimo;!jimab07e63171f span><span class='notranslate'></b> sa zameria na všetkých jean, joe, začínajú s Jimom, ale nie na Jimo a nie na všetko, čo začína na jima
+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=Použite interval na výber hodnoty int alebo float
 AdvTgtMinVal=Minimálna hodnota
 AdvTgtMaxVal=Maximálna hodnota
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 8f6e335ac6e..c9b489b454f 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -68,7 +68,7 @@ ErrorNoRequestInError=Žiadna požiadavka omylom
 ErrorServiceUnavailableTryLater=Služba momentálne nie je k dispozícii. Skúste to znova neskôr.
 ErrorDuplicateField=Duplicitné hodnota v jedinečnej poľa
 ErrorSomeErrorWereFoundRollbackIsDone=Našli sa nejaké chyby. Zmeny boli vrátené späť.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> nie je definovaný v konfiguračnom súbore <Dolibarr class='notranslate'><b></span>conf.php</b>.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Nepodarilo sa nájsť užívateľa <b>%s</b> v databáze Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre krajinu &quot;%s&quot;.
 ErrorNoSocialContributionForSellerCountry=Chyba, pre krajinu „%s“ nie je definovaný žiadny typ sociálnych/fiškálnych daní.
@@ -103,7 +103,7 @@ RecordDeleted=Zaznamenajte zmazaný
 RecordGenerated=Vygenerovaný záznam
 LevelOfFeature=Úroveň vlastností
 NotDefined=Nie je definované
-DolibarrInHttpAuthenticationSoPasswordUseless=Režim overenia Dolibarr je nastavený na <b>%s</b> v konfiguračnom súbore < class='notranslate'><b></span>conf.php</b>.<br>To znamená, že databáza je externá Dolibarr, takže zmena tohto poľa nemusí mať žiadny účinok.
+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=Systémový administrátor
 AdministratorDesc=Správca systému (môže spravovať užívateľa, oprávnenia, ale aj nastavenie systému a konfiguráciu modulov)
 Undefined=Undefined
@@ -420,6 +420,8 @@ TotalTTCShort=Celkom (s DPH)
 TotalHT=Celkom (bez dane)
 TotalHTforthispage=Celkom (bez dane) za túto stránku
 Totalforthispage=Celkom za túto stránku
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Celkom (s DPH)
 TotalTTCToYourCredit=Celkom (s DPH) na Váš účet
 TotalVAT=Daň celkom
@@ -647,6 +649,7 @@ ReportName=Názov správy
 ReportPeriod=Správa za obdobie
 ReportDescription=Popis
 Report=Správa
+Reports=Zostavy
 Keyword=Kľúčové slovo
 Origin=Pôvod
 Legend=Legenda
@@ -1049,7 +1052,7 @@ Select2NotFound=Nenašli sa žiadne výsledky
 Select2Enter=Zadajte
 Select2MoreCharacter=alebo viac charakteru
 Select2MoreCharacters=alebo viac znakov
-Select2MoreCharactersMore=<strong>Syntax vyhľadávania:</strong><br><span class'>notranslate <kbd></span><strong> |</strong>b0860fz=034 notranslate'><kbd> ALEBO</kbd> (a|b)<br><span class='b0330707' /span><strong>*</strong></kbd><kbd> Ľubovoľný znak</kbd> (a*b)<br>b030aec0 span><span class='notranslate'><strong>^</strong></kbd><span class='notranslate <kbd></span> Začnite s</kbd> (^ab)<br>b03aecd207 <span class='notranslate'><strong>$</strong></kbd><span class='bza30601' /span> Koniec na </kbd> (ab$)<br>
+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=Načítavajú sa ďalšie výsledky...
 Select2SearchInProgress=Prebieha vyhľadávanie...
 SearchIntoThirdparties=Tretie strany
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 7d6f2c4deb4..cf27af63b44 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -91,10 +91,10 @@ ListOfMenusEntries=Zoznam položiek ponuky
 ListOfDictionariesEntries=Zoznam záznamov v slovníkoch
 ListOfPermissionsDefined=Zoznam definovaných povolení
 SeeExamples=Pozrite si príklady tu
-EnabledDesc=Podmienka, aby bolo toto pole aktívne.<br><br>Príklady:<br>1 span class='notranslate'><br></span>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Je pole viditeľné? (Príklady: 0=nikdy viditeľné, 1=viditeľné vo formulároch na vytvorenie/aktualizáciu/zobrazenie, 2=viditeľné iba na zozname, 3=viditeľné iba vo formulári na vytvorenie/aktualizáciu/zobrazenie (nie na zoznamoch), 4=viditeľné na zoznamoch a aktualizovať/zobraziť iba formulár (nie vytvoriť), 5=Viditeľné iba vo formulári zoznamu a zobraziť (nie vytvoriť, neaktualizovať).<br><br> Použitie zápornej hodnoty znamená, že pole sa v zozname predvolene nezobrazuje, ale možno ho vybrať na zobrazenie).
 ItCanBeAnExpression=Môže to byť výraz. Príklad:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Zobrazte toto pole v kompatibilných dokumentoch PDF, pozíciu môžete spravovať pomocou poľa „Pozícia“.<br><strong>Pre dokument:</strong><br>0 = nezobrazené <br>1 = zobrazenie<br>2 = zobraziť, iba ak nie je prázdne<br><br>b0e7064b span>Pre riadky dokumentu:<span class='notranslate'></strong><br>0 = nezobrazené <br> = zobrazené v stĺpci<br>3 = zobrazenie v stĺpci popisu riadka za popisom<br>4 = zobrazenie v stĺpci popisu za popisom iba ak nie je prázdny
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=Na PDF
 IsAMeasureDesc=Môže sa hodnota poľa kumulovať, aby sa do zoznamu dostal súčet? (Príklady: 1 alebo 0)
 SearchAllDesc=Používa sa pole na vyhľadávanie pomocou nástroja rýchleho vyhľadávania? (Príklady: 1 alebo 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=V spúšťacom súbore definujte kód, ktorý chcete spustiť, ke
 SeeIDsInUse=Pozrite si ID používané vo vašej inštalácii
 SeeReservedIDsRangeHere=Pozrite si rozsah rezervovaných ID
 ToolkitForDevelopers=Sada nástrojov pre vývojárov Dolibarr
-TryToUseTheModuleBuilder=Ak ovládate SQL a PHP, môžete použiť sprievodcu vytváraním natívnych modulov.<br>Povoliť modul <strong>%s</strong> a použite sprievodcu kliknutím na <span class="fa fa-bug"><spante'no ></span></span> v ponuke vpravo hore.<br>Upozornenie: Toto je pokročilá funkcia pre vývojárov, vykonajte <b> span class='notranslate'></b></span> experimentujte na svojej produkčnej stránke!
+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=Pozrite si <span class="fa fa-bug"></span> v ponuke vpravo hore
 AddLanguageFile=Pridať jazykový súbor
 YouCanUseTranslationKey=Tu môžete použiť kľúč, ktorý je prekladovým kľúčom nájdeným do jazykového súboru (pozri záložku „Jazyky“)
@@ -148,7 +148,7 @@ CSSListClass=CSS pre zoznam
 NotEditable=Nedá sa upravovať
 ForeignKey=Cudzí kľúč
 ForeignKeyDesc=Ak hodnota tohto poľa musí byť zaručená, že existuje do inej tabuľky. Tu zadajte syntax zodpovedajúcej hodnote: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Príklad:<br>varchar(99)<br>e-mail<br> classtelefón< ='notranslate'><br></span>ip<br>url<br>heslo<span class='b034fccda9b> span>double(24,8)<br>skutočné<br>text<br> <br>dátum<br>datetime<br>časová pečiatka<span class'>'notranslate <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0392f /span><span class='notranslate'><br>'1' znamená, že za kombináciu pridáme tlačidlo + na vytvorenie záznamu<br>'filter' je Podmienka syntaxe univerzálneho filtra, príklad: '((stav:=:1) AND (fk_user:=:__USER_ID__) AND (entita:IN:(__SHARED_ENTITIES__))“
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Toto je typ poľa/atribútu.
 AsciiToHtmlConverter=Konvertor z ascii do HTML
 AsciiToPdfConverter=Konvertor z ascii do formátu PDF
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Nepodarilo sa pridať kód do deskriptora. Skontro
 DictionariesCreated=Slovník <b>%s</b> bol úspešne vytvorený
 DictionaryDeleted=Slovník <b>%s</b> bol úspešne odstránený
 PropertyModuleUpdated=Vlastníctvo <b>%s</b> bolo úspešne aktualizované
-InfoForApiFile=* Keď vygenerujete súbor prvýkrát, všetky metódy sa vytvoria <strong>pre každý objekt.</strong><br>* Keď kliknete na <strong>remove</strong>, odstránite iba všetky metódy pre túto triedu ='notranslate'><strong></span>vybratý objekt</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Stránka pre nastavenie modulu
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Tu môžete generovať a upravovať súbory triedy, aby ste poskytli nové selektory cieľov e-mailu pre modul hromadného odosielania e-mailov
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index 1c65e793b68..8dbdb0285a9 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -47,7 +47,7 @@ DateEndPlannedMo=Plánovaný dátum ukončenia
 KeepEmptyForAsap=Prázdne znamená „Akonáhle to bude možné“
 EstimatedDuration=Odhadované trvanie
 EstimatedDurationDesc=Odhadované trvanie výroby (alebo demontáže) tohto produktu pomocou tohto kusovníka
-ConfirmValidateBom=Naozaj chcete overiť kusovník pomocou odkazu <strong>%s<span class='notranslate'></strong> > (budete ho môcť použiť na vytváranie nových výrobných objednávok)
+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=Ste si istý, že chcete zrušiť tento kusovník (už ho nebudete môcť použiť na vytváranie nových výrobných objednávok)?
 ConfirmReopenBom=Ste si istý, že chcete znovu otvoriť tento kusovník (budete ho môcť použiť na vytvorenie nových výrobných objednávok)
 StatusMOProduced=Vyrobené
@@ -136,4 +136,3 @@ NoRemainQtyToDispatch=Nezostáva žiadne množstvo na rozdelenie
 
 THMOperatorEstimatedHelp=Odhadované náklady operátora na hodinu. Použije sa na odhad nákladov na kusovník pomocou tejto pracovnej stanice.
 THMMachineEstimatedHelp=Odhadovaná cena stroja za hodinu. Použije sa na odhad nákladov na kusovník pomocou tejto pracovnej stanice.
-
diff --git a/htdocs/langs/sk_SK/multicurrency.lang b/htdocs/langs/sk_SK/multicurrency.lang
index bb0bf57098d..53971c53834 100644
--- a/htdocs/langs/sk_SK/multicurrency.lang
+++ b/htdocs/langs/sk_SK/multicurrency.lang
@@ -7,12 +7,12 @@ multicurrency_syncronize_error=Chyba synchronizácie: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Na nájdenie kurzu meny použite dátum dokumentu, namiesto použitia posledného známeho kurzu
 multicurrency_useOriginTx=Keď je objekt vytvorený z iného objektu, ponechajte pôvodnú sadzbu zo zdrojového objektu (inak použite poslednú známu sadzbu)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Ak chcete používať túto funkciu, musíte si vytvoriť účet na webovej stránke %s.<br>Získajte <b> /span>Kľúč API<span class='notranslate'></b>.<br>Ak používate bezplatný účet, nemôžete zmeniť <b>zdrojová mena</b> (predvolene USD).<br>Ak vaša hlavná mena nie je USD aplikácia to automaticky prepočíta.<br><br>Máte obmedzený počet 1000 synchronizácií za mesiac.
+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 kľúč
 multicurrency_appCurrencySource=Zdrojová mena
 multicurrency_alternateCurrencySource=Alternatívna zdrojová mena
 CurrenciesUsed=Použité meny
-CurrenciesUsed_help_to_add=Pridajte rôzne meny a sadzby, ktoré musíte použiť vo svojich <b>ponukách</b>, b0aeee383 /span>objednávky<span class='notranslate'></b> atď.
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=sadzba
 MulticurrencyReceived=Prijaté, pôvodná mena
 MulticurrencyRemainderToTake=Zostávajúca suma, pôvodná mena
diff --git a/htdocs/langs/sk_SK/oauth.lang b/htdocs/langs/sk_SK/oauth.lang
index b2c525a6646..c115da80d3c 100644
--- a/htdocs/langs/sk_SK/oauth.lang
+++ b/htdocs/langs/sk_SK/oauth.lang
@@ -29,7 +29,7 @@ OAUTH_GOOGLE_SECRET=OAuth Google Secret
 OAUTH_GITHUB_NAME=Služba OAuth GitHub
 OAUTH_GITHUB_ID=Id OAuth GitHub
 OAUTH_GITHUB_SECRET=Tajomstvo OAuth GitHub
-OAUTH_URL_FOR_CREDENTIAL=Prejdite na <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">túto stránku<span class="fas fa-external-link-alt paddingleft"></span><spante class='notranslate ></a></span> a vytvorte alebo získajte svoje ID a tajný kľúč OAuth
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
 OAUTH_ID=ID klienta OAuth
diff --git a/htdocs/langs/sk_SK/partnership.lang b/htdocs/langs/sk_SK/partnership.lang
index d08c8a94249..6ad51f3664e 100644
--- a/htdocs/langs/sk_SK/partnership.lang
+++ b/htdocs/langs/sk_SK/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Počet chýb pri poslednej kontrole webovej adresy
 LastCheckBacklink=Dátum poslednej kontroly webovej adresy
 
 NewPartnershipRequest=Nová žiadosť o partnerstvo
-NewPartnershipRequestDesc=Tento formulár vám umožňuje požiadať o účasť v jednom z našich partnerských programov. Ak potrebujete pomoc s vyplnením tohto formulára, kontaktujte nás e-mailom <b>%s</b>%s<span class='notranslate'></b> rozpätie>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Táto stránka musí obsahovať aspoň jeden odkaz na jednu z nasledujúcich domén: %s
 
 IPOfApplicant=IP žiadateľa
-
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 6af1488986b..b0ed4ccb2d6 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -208,11 +208,6 @@ unitSET=Set
 unitS=Druhý
 unitH=Hodina
 unitD=Deň
-unitG=Gram
-unitM=Meter
-unitLM=Lineárny meter
-unitM2=Meter štvorcový
-unitM3=Meter kubický
 unitL=Litr
 unitT=ton
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=libra
 unitOZ=unca
 unitM=Meter
+unitLM=Lineárny meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -291,7 +287,7 @@ PriceExpressionSelected=Výraz zvolenej ceny
 PriceExpressionEditorHelp1="cena = 2 + 2" alebo "2 + 2"  pre nastavenie ceny. Použite ; pre oddelenie výrazov
 PriceExpressionEditorHelp2=Môžete použiť extra polia použitím premennej ako:\n<b>#extrafield_myextrafieldkey#</b> a globálnej premennej <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=V cenách produktov/služieb aj cien dodávateľov sú k dispozícii tieto premenné:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# hmotnosť# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=Len v cene produktu/služby: <b>#supplier_min_price#</b>b0342bzccfda19> len predajné ceny: <span class='notranslate'><b>#supplier_quantity# a #supplier_tva_tx#</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=Dostupné globálne hodnoty
 PriceMode=Cenový mód
 PriceNumeric=Počet
@@ -437,4 +433,6 @@ ModifyValueExtrafields = Upravte hodnotu extrapola
 OrProductsWithCategories=Alebo produkty so štítkami/kategóriami
 WarningTransferBatchStockMouvToGlobal = Ak chcete tento produkt deserializovať, všetky jeho sériové zásoby budú transformované na globálne zásoby
 WarningConvertFromBatchToSerial=Ak momentálne máte pre produkt množstvo vyššie alebo rovné 2, prepnutie na túto voľbu znamená, že stále budete mať produkt s rôznymi predmetmi tej istej šarže (zatiaľ čo chcete jedinečné sériové číslo). Duplikát zostane, kým sa nevykoná inventúra alebo ručný pohyb zásob na opravu.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Naozaj sa chcete vrátiť do stavu konceptu?<br>Množstvá aktuálne nastavené v inventári budú resetované.
diff --git a/htdocs/langs/sk_SK/receptions.lang b/htdocs/langs/sk_SK/receptions.lang
index 220885375f0..098905c4b7f 100644
--- a/htdocs/langs/sk_SK/receptions.lang
+++ b/htdocs/langs/sk_SK/receptions.lang
@@ -1,54 +1,56 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
-RefReception=Ref. reception
+ReceptionDescription=Správa príjmu dodávateľa (vytvoriť dokumenty príjmu)
+ReceptionsSetup=Nastavenie príjmu predajcu
+RefReception=Ref. recepcia
 Reception=Recepcia
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Recepcia
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+Receptions=Recepcie
+AllReceptions=Všetky recepcie
+ShowReception=Zobraziť recepcie
+ReceptionsArea=Priestory recepcií
+ListOfReceptions=Zoznam recepcií
+ReceptionMethod=Spôsob prijímania
+LastReceptions=Najnovšie %s recepcie
+StatisticsOfReceptions=Štatistiky pre recepcie
+NbOfReceptions=Počet recepcií
+NumberOfReceptionsByMonth=Počet recepcií podľa mesiaca
+ReceptionCard=Recepčná karta
+NewReception=Nová recepcia
+CreateReception=Vytvorte príjem
+QtyInOtherReceptions=Množstvo v iných recepciách
+OtherReceptionsForSameOrder=Ďalšie recepcie pre túto objednávku
+ReceptionsAndReceivingForSameOrder=Príjemky a účtenky k tejto objednávke
+ReceptionsToValidate=Recepcie na overenie
 StatusReceptionCanceled=Zrušený
 StatusReceptionDraft=Návrh
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
+StatusReceptionValidated=Overené (produkty na prijatie alebo už prijaté)
+StatusReceptionValidatedToReceive=Overené (produkty na prijatie)
+StatusReceptionValidatedReceived=Overené (prijaté produkty)
 StatusReceptionProcessed=Spracované
 StatusReceptionDraftShort=Návrh
 StatusReceptionValidatedShort=Overené
 StatusReceptionProcessedShort=Spracované
-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
+ReceptionSheet=Recepčný list
+ValidateReception=Overte príjem
+ConfirmDeleteReception=Naozaj chcete odstrániť tento príjem?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
+ConfirmCancelReception=Naozaj chcete zrušiť tento príjem?
+StatsOnReceptionsOnlyValidated=Štatistika vykonaná iba na overených recepciách. Použitý dátum je dátum potvrdenia prijatia (plánovaný dátum doručenia nie je vždy známy).
+SendReceptionByEMail=Pošlite príjem e-mailom
+SendReceptionRef=Odoslanie recepcie %s
+ActionsOnReception=Udalosti na recepcii
+ReceptionCreationIsDoneFromOrder=Vytvorenie nového príjmu sa momentálne vykonáva z objednávky.
+ReceptionLine=Recepčná linka
+ProductQtyInReceptionAlreadySent=Množstvo produktu z otvorenej predajnej objednávky už bolo odoslané
+ProductQtyInSuppliersReceptionAlreadyRecevied=Množstvo produktu z otvorenej objednávky dodávateľa už bolo prijaté
+ValidateOrderFirstBeforeReception=Pred prijatím musíte najprv potvrdiť objednávku.
+ReceptionsNumberingModules=Modul číslovania pre recepcie
+ReceptionsReceiptModel=Šablóny dokumentov pre recepcie
+NoMorePredefinedProductToDispatch=Už žiadne preddefinované produkty na odoslanie
+ReceptionExist=Recepcia existuje
+ReceptionBackToDraftInDolibarr=Recepcia %s späť na koncept
+ReceptionClassifyClosedInDolibarr=Recepcia %s klasifikovaná Zatvorené
+ReceptionUnClassifyCloseddInDolibarr=Recepcia %s znovu otvorená
+RestoreWithCurrentQtySaved=Doplňte množstvá najnovšími uloženými hodnotami
+ReceptionsRecorded=Zaznamenané recepcie
+ReceptionUpdated=Recepcia bola úspešne aktualizovaná
+ReceptionDistribution=Distribúcia recepcie
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 48280e8deb8..6d38bd685c8 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -18,16 +18,16 @@ SendingCard=Zasielková karta
 NewSending=Nová zásielka
 CreateShipment=Vytvoriť zásielku
 QtyShipped=Odoslané množstvo
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+QtyShippedShort=Množstvo lode.
+QtyPreparedOrShipped=Množstvo pripravené alebo odoslané
 QtyToShip=Množstvo na odoslanie
-QtyToReceive=Qty to receive
+QtyToReceive=Množstvo na prijatie
 QtyReceived=Prijaté množstvo
-QtyInOtherShipments=Qty in other shipments
+QtyInOtherShipments=Množstvo v iných zásielkach
 KeepToShip=Zostáva odoslať
-KeepToShipShort=Remain
+KeepToShipShort=Zostať
 OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsAndReceivingForSameOrder=Zásielky a potvrdenky pre túto objednávku
 SendingsToValidate=Zásielky na overenie
 StatusSendingCanceled=Zrušený
 StatusSendingCanceledShort=Zrušený
@@ -43,44 +43,44 @@ ConfirmValidateSending=Are you sure you want to validate this shipment with the
 ConfirmCancelSending=Určite chcete zrušiť túto zásielku ?
 DocumentModelMerou=Mero A5 modelu
 WarningNoQtyLeftToSend=Varovanie: žiadny tovar majú byť dodané.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Štatistiky sú len pre overené zásielky. Použitý dátum je dátum overenia zásielky (plánovaný dátum doručenia nie je vždy známy)
 DateDeliveryPlanned=Plánovaný dátum doručenia
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
+RefDeliveryReceipt=Ref. potvrdenie o doručení
+StatusReceipt=Stav potvrdenia o doručení
 DateReceived=Dátum doručenia obdržal
-ClassifyReception=Classify Received
-SendShippingByEMail=Send shipment by email
+ClassifyReception=Klasifikovať prijaté
+SendShippingByEMail=Zásielku poslať emailom
 SendShippingRef=Podanie zásielky %s
 ActionsOnShipping=Udalosti na zásielky
 LinkToTrackYourPackage=Odkaz pre sledovanie balíkov
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=V súčasnosti sa vytvorenie novej zásielky vykonáva zo záznamu zákazky odberateľa.
 ShipmentLine=Zásielka linka
-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.
+ProductQtyInCustomersOrdersRunning=Množstvo produktu z otvorených zákaziek odberateľa
+ProductQtyInSuppliersOrdersRunning=Množstvo produktu z otvorených objednávok
+ProductQtyInShipmentAlreadySent=Množstvo produktu z otvorenej predajnej objednávky už bolo odoslané
+ProductQtyInSuppliersShipmentAlreadyRecevied=Množstvo produktu z už prijatých otvorených objednávok
+NoProductToShipFoundIntoStock=V sklade sa nenašiel žiadny produkt na odoslanie <b>%s</b>. Opravte zásoby alebo sa vráťte a vyberte si iný sklad.
 WeightVolShort=Váha/Objem
 ValidateOrderFirstBeforeShipment=Najprv musíte overiť objednávku pred vytvorením zásielky.
-NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
+NoLineGoOnTabToAddSome=Žiadny riadok, prejdite na kartu „%s“ a pridajte
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Viac Celý dokument model pre potvrdenie o doručení (logo. ..)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+DocumentModelStorm=Kompletnejší model dokumentu pre potvrdenie o doručení a kompatibilitu extrapolí (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konštantná EXPEDITION_ADDON_NUMBER nie je definované
 SumOfProductVolumes=Súčet objemov produktov
 SumOfProductWeights=Súčet hmotností produktov
 
 # warehouse details
 DetailWarehouseNumber= Detaily skladu
-DetailWarehouseFormat= W:%s (Qty: %d)
-SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
-CreationOptions=Available options during shipment creation
+DetailWarehouseFormat= W:%s (množstvo: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Zobrazte posledný dátum vstupu na sklade počas vytvárania zásielky pre sériové číslo alebo šaržu
+CreationOptions=Dostupné možnosti pri vytváraní zásielky
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=Distribúcia zásielok
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+ErrorTooManyCombinationBatchcode=Žiadne odoslanie pre riadok %s, pretože sa našlo príliš veľa kombinácií kódu skladu, produktu, šarže (%s).
+ErrorNoCombinationBatchcode=Nepodarilo sa uložiť riadok %s ako kombináciu sklad-produkt-šarža/sériový (%s, %s, %s) nebol nájdený na sklade.
 
-ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
+ErrorTooMuchShipped=Dodané množstvo by nemalo byť väčšie ako objednané množstvo pre riadok %s
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 75e475a0c4b..43320fbda49 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=Počas tohto pohybu deaktivujte výmenu zásob pr
 ImportFromCSV=Importujte zoznam pohybu vo formáte CSV
 ChooseFileToImport=Nahrajte súbor a potom kliknite na ikonu %s a vyberte súbor ako zdrojový importný súbor...
 SelectAStockMovementFileToImport=vyberte súbor pohybu zásob na import
-InfoTemplateImport=Odovzdaný súbor musí mať tento formát (* sú povinné polia):<br>Source Warehouse* | Cieľový sklad* | Produkt* | Množstvo* | Číslo šarže/sériové číslo<br>Oddeľovač znakov CSV musí byť "<b>b0ecb2ec87f><49fz0 span class='notranslate'></b>"
+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=Inventár %s
 ReOpen=Znovu otvorte
 ConfirmFinish=Potvrdzujete uzávierku inventarizácie? Tým sa vygenerujú všetky skladové pohyby na aktualizáciu vašich zásob na skutočné množstvo, ktoré ste zadali do inventára.
@@ -282,7 +282,7 @@ ModuleStockTransferName=Pokročilý prevod zásob
 ModuleStockTransferDesc=Pokročilá správa prevodu zásob s generovaním prevodného listu
 StockTransferNew=Nový prevod akcií
 StockTransferList=Zoznam prevodov akcií
-ConfirmValidateStockTransfer=Naozaj chcete overiť tento prevod akcií pomocou odkazu <b>%s<span class='notranslate'></b> rozpätie> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Zníženie zásob s prevodom %s
 ConfirmDestockCancel=Zrušiť zníženie zásob prevodom %s
 DestockAllProduct=Zníženie zásob
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index 1547580e739..dbdb73050b4 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -22,7 +22,7 @@ ToOfferALinkForOnlinePaymentOnContractLine=Adresa URL, ktorá ponúka %s stránk
 ToOfferALinkForOnlinePaymentOnFreeAmount=Adresa URL, ktorá ponúka %s stránku online platieb v ľubovoľnej výške bez existujúceho objektu
 ToOfferALinkForOnlinePaymentOnMemberSubscription=Adresa URL, ktorá ponúka %s online platobnú stránku pre členské predplatné
 ToOfferALinkForOnlinePaymentOnDonation=Adresa URL, ktorá ponúka %s stránku online platieb na platbu daru
-YouCanAddTagOnUrl=Môžete tiež pridať parameter adresy URL <b>&tag=<i>valueb0ae64758</spanc><span> class='notranslate'></b> na ktorúkoľvek z týchto adries URL (povinné iba pri platbe, ktorá nie je prepojená s objektom), aby ste pridali svoju vlastnú značku komentára k platbe.<br>Pre URL platieb bez existujúceho objektu, môžete pridať aj parameter <strong>&noidempotency=1</strong>, takže rovnaký odkaz s rovnakou značkou možno použiť niekoľkokrát (niektoré spôsoby platby môžu obmedziť platbu na 1 za každý iný odkaz bez tohto parametra)
+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=Nastavte svoj Stripe pomocou adresy URL <b>%s</b>, kedy sa platba vytvorí automaticky potvrdené spoločnosťou Stripe.
 AccountParameter=Parametre účtu
 UsageParameter=Používanie parametrov
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index fc226cd59b0..2ef1b724fff 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -1,150 +1,152 @@
 # 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=Sadzobník poplatkov
-TypeFees=Poplatky
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Množstvo alebo kilometrov
-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
+AUTHOR=Zaznamenal
+AUTHORPAIEMENT=Zaplatené
+AddTrip=Vytvorte správu o výdavkoch
+AllExpenseReport=Všetky typy výkazu výdavkov
+AllExpenseReports=Všetky správy o výdavkoch
+AnyOtherInThisListCanValidate=Osoba, ktorá má byť informovaná na potvrdenie žiadosti.
+AttachTheNewLineToTheDocument=Pripojte riadok k nahranému dokumentu
+AucuneLigne=Zatiaľ nie je deklarovaná žiadna správa o výdavkoch
+BrouillonnerTrip=Presunúť správu o výdavkoch späť do stavu „Koncept“
+byEX_DAY=podľa dňa (obmedzenie na %s)
+byEX_EXP=po riadku (obmedzenie na %s)
+byEX_MON=podľa mesiaca (obmedzenie na %s)
+byEX_YEA=podľa roku (obmedzenie na %s)
+CANCEL_USER=Odstránené používateľom
+CarCategory=Kategória vozidla
+ClassifyRefunded=Klasifikovať ako „vrátené“
+CompanyVisited=Navštívená spoločnosť/organizácia
+ConfirmBrouillonnerTrip=Naozaj chcete presunúť tento výkaz výdavkov do stavu „Koncept“?
+ConfirmCancelTrip=Naozaj chcete zrušiť tento výkaz výdavkov?
+ConfirmCloneExpenseReport=Naozaj chcete naklonovať túto správu o výdavkoch?
+ConfirmDeleteTrip=Naozaj chcete odstrániť tento výkaz výdavkov?
+ConfirmPaidTrip=Naozaj chcete zmeniť stav tohto prehľadu výdavkov na „Zaplatené“?
+ConfirmRefuseTrip=Naozaj chcete zamietnuť túto správu o výdavkoch?
+ConfirmSaveTrip=Naozaj chcete overiť tento výkaz výdavkov?
+ConfirmValideTrip=Naozaj chcete schváliť túto správu o výdavkoch?
+DATE_CANCEL=Dátum zrušenia
+DATE_PAIEMENT=Dátum platby
+DATE_REFUS=Odmietnuť dátum
+DATE_SAVE=Dátum overenia
+DefaultCategoryCar=Predvolený spôsob dopravy
+DefaultRangeNumber=Predvolené číslo rozsahu
+DeleteTrip=Odstrániť správu o výdavkoch
+ErrorDoubleDeclaration=Vyhlásili ste inú správu o výdavkoch v podobnom rozsahu dátumov.
+Error_EXPENSEREPORT_ADDON_NotDefined=Chyba, pravidlo pre číslovanie výkazu výdavkov nebolo definované v nastavení modulu 'Výkaz výdavkov'
+ExpenseRangeOffset=Suma kompenzácie: %s
+expenseReportCatDisabled=Kategória vypnutá – pozrite si slovník c_exp_tax_cat
+expenseReportCoef=Koeficient
+expenseReportCoefUndefined=(hodnota nie je definovaná)
+expenseReportOffset=Ofset
+expenseReportPrintExample=offset + (d x koef) = %s
+expenseReportRangeDisabled=Rozsah vypnutý – pozrite si slovník rozsahu c_exp_tax_range
+expenseReportRangeFromTo=z %d do %d
+expenseReportRangeMoreThan=viac ako %d
+expenseReportTotalForFive=Príklad s <u>d</u> = 5
+ExpenseReportApplyTo=Aplikovať na
+ExpenseReportApproved=Bola schválená správa o výdavkoch
 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=Ostatné
-TF_TRIP=Transportation
+ExpenseReportCanceled=Výkaz výdavkov bol zrušený
+ExpenseReportCanceledMessage=Prehľad výdavkov %s bol zrušený.<br> – Používateľ: %s<br> – Zrušil: %s<br> – Dôvod zrušenia: %s<br>Kliknutím sem zobrazíte prehľad výdavkov: %s
+ExpenseReportConstraintViolationError=Prekročená maximálna suma (pravidlo %s): %s je vyššia ako %s ( Prekročenie zakázané)
+ExpenseReportConstraintViolationWarning=Prekročená maximálna suma (pravidlo %s): %s je vyššia ako %s ( Prekročenie povoleného)
+ExpenseReportDateEnd=Dátum ukončenia
+ExpenseReportDateStart=Dátum začiatku
+ExpenseReportDomain=Doména na prihlásenie
+ExpenseReportIkDesc=Výpočet nákladov na kilometre môžete upraviť podľa kategórie a rozsahu, ktorým boli predtým definované. <b>d</b> je vzdialenosť v kilometroch
+ExpenseReportLimitAmount=Maximálne množstvo
+ExpenseReportLimitOn=Obmedzte
+ExpenseReportLine=Riadok výkazu výdavkov
+ExpenseReportPaid=Bola zaplatená správa o výdavkoch
+ExpenseReportPaidMessage=Prehľad výdavkov %s bol zaplatený.<br> – Používateľ: %s<br> – Zaplatí: %s<br>Kliknutím sem zobrazíte prehľad výdavkov: %s
+ExpenseReportPayment=Platba prehľadu výdavkov
+ExpenseReportRef=Ref. správa o výdajoch
+ExpenseReportRefused=Správa o výdavkoch bola zamietnutá
+ExpenseReportRefusedMessage=Prehľad výdavkov %s bol odmietnutý.<br> – Používateľ: %s<br> – Odmietol: %s<br> – Dôvod odmietnutia: %s<br>Kliknutím sem zobrazíte prehľad výdavkov: %s
+ExpenseReportRestrictive=Prekročenie zakázané
+ExpenseReportRuleErrorOnSave=Chyba: %s
+ExpenseReportRuleSave=Pravidlo prehľadu výdavkov bolo uložené
+ExpenseReportRulesDesc=Môžete definovať pravidlá maximálnej sumy pre výkazy výdavkov. Tieto pravidlá sa použijú, keď sa do výkazu výdavkov pridá nový výdavok
+ExpenseReportWaitingForApproval=Na schválenie bol predložený nový výkaz výdavkov
+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=Výkaz výdavkov bol predložený na opätovné schválenie
+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
+ExpenseReportsIk=Konfigurácia poplatkov za najazdené kilometre
+ExpenseReportsRules=Pravidlá výkazu výdavkov
+ExpenseReportsToApprove=Správy o výdavkoch na schválenie
+ExpenseReportsToPay=Správy o výdavkoch na zaplatenie
+ExpensesArea=Oblasť prehľadov výdavkov
+FeesKilometersOrAmout=Množstvo alebo kilometrov
+LastExpenseReports=Najnovšie prehľady výdavkov %s
+ListOfFees=Sadzobník poplatkov
+ListOfTrips=Zoznam výkazov o výdavkoch
+ListToApprove=Čakanie na schválenie
+ListTripsAndExpenses=Zoznam výkazov o výdavkoch
+MOTIF_CANCEL=Dôvod
+MOTIF_REFUS=Dôvod
+ModePaiement=Platobný režim
+NewTrip=Nová správa o výdavkoch
+nolimitbyEX_DAY=podľa dňa (bez obmedzenia)
+nolimitbyEX_EXP=po riadku (bez obmedzenia)
+nolimitbyEX_MON=podľa mesiaca (bez obmedzenia)
+nolimitbyEX_YEA=podľa roku (bez obmedzenia)
+NoTripsToExportCSV=Za toto obdobie nie je možné exportovať žiadne hlásenie o výdavkoch.
+NOT_AUTHOR=Nie ste autorom tejto správy o výdavkoch. Operácia zrušená.
+OnExpense=Výdajový riadok
+PDFStandardExpenseReports=Štandardná šablóna na generovanie dokumentu PDF pre správu o výdavkoch
+PaidTrip=Zaplatiť správu o výdavkoch
+REFUSEUR=Odmietnuté
+RangeIk=Rozsah najazdených kilometrov
+RangeNum=Rozsah %d
+SaveTrip=Overte správu o výdavkoch
+ShowExpenseReport=Zobraziť správu o výdavkoch
+ShowTrip=Zobraziť správu o výdavkoch
+TripCard=Výkaz o výdavkoch
+TripId=Id výdavková správa
+TripNDF=Správa o výdavkoch na informácie
+TripSociete=Informačná spoločnosť
+Trips=Prehľady výdavkov
+TripsAndExpenses=Prehľady výdavkov
+TripsAndExpensesStatistics=Štatistiky výkazov výdavkov
+TypeFees=Poplatky
+UploadANewFileNow=Teraz nahrajte nový dokument
+VALIDATOR=Používateľ zodpovedný za schválenie
+VALIDOR=Schválil
+ValidateAndSubmit=Overte a odošlite na schválenie
+ValidatedWaitingApproval=Overené (čaká sa na schválenie)
+ValideTrip=Schváľte správu o výdavkoch
+
+## Dictionary
+EX_BRE=Raňajky
+EX_CAM=Údržba a opravy CV
+EX_CAM_VP=Údržba a opravy PV
+EX_CAR=Požičanie auta
+EX_CUR=Zákazníci prijímajúci
+EX_DOC=Dokumentácia
+EX_EMM=Stravovanie zamestnancov
+EX_FUE=Životopis paliva
+EX_FUE_VP=Palivo PV
+EX_GUM=Stravovanie hostí
+EX_HOT=Hotel
+EX_IND=Predplatenie náhradnej dopravy
+EX_KME=Náklady na najazdené kilometre
+EX_OTR=Iný príjem
+EX_PAR=Parkovacie CV
+EX_PAR_VP=Parkovanie PV
+EX_POS=Poštovné
+EX_SUM=Zásobovanie údržby
+EX_SUO=Kancelárske potreby
+EX_TAX=Rôzne dane
+EX_TOL=Životopis mýta
+EX_TOL_VP=Mýto PV
+TF_BUS=Autobus
+TF_CAR=Auto
+TF_ESSENCE=Palivo
+TF_HOTEL=Hotel
 TF_LUNCH=Obed
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
+TF_OTHER=Ostatné
+TF_PEAGE=Mýto
 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=Dôvod
-MOTIF_CANCEL=Dôvod
-DATE_REFUS=Deny date
-DATE_SAVE=Dátum overenia
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Dátum platby
-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=Ofset
-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=Dátum začiatku
-ExpenseReportDateEnd=Dátum ukončenia
-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
+TF_TRAIN=Vlak
+TF_TRIP=Doprava
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 0503fbfbbde..1cfcc576411 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -32,7 +32,7 @@ AddWebsite=Pridať webovú stránku
 Webpage=Webová stránka/kontajner
 AddPage=Pridať stránku/kontajner
 PageContainer=Strana
-PreviewOfSiteNotYetAvailable=Ukážka vašej webovej stránky <strong>%s</strong> ešte nie je k dispozícii. Najprv musíte '<strong>Importovať úplnú šablónu webovej stránky</strong>' alebo len 'b0e78643947 span>Pridať stránku/kontajner<span class='notranslate'></strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Požadovaná stránka s ID %s zatiaľ nemá žiadny obsah alebo bol odstránený súbor vyrovnávacej pamäte .tpl.php. Ak chcete tento problém vyriešiť, upravte obsah stránky.
 SiteDeleted=Web '%s' bol odstránený
 PageContent=Stránka/Contenair
@@ -53,7 +53,7 @@ CheckVirtualHostPerms=Skontrolujte tiež, či má používateľ virtuálneho hos
 ReadPerm=Čítať
 WritePerm=Napíšte
 TestDeployOnWeb=Testovať/nasadiť na webe
-PreviewSiteServedByWebServer=<u>Ukážka %s na novej karte.</u><br><br>%s bude obsluhovaný externým webovým serverom (ako Apache, Nginx, ). Tento server musíte nainštalovať a nastaviť predtým, aby ste mohli smerovať na adresár:<br><strong>%s<strong>%s<strong> span><span class='notranslate'></strong><br>Adresa URL poskytovaná externým serverom:<br><strong>%s</strong>
+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>Ukážka %s na novej karte.</u><br><br>%s bude obsluhovať server Dolibarr, takže nepotrebuje žiadny ďalší webový server (ako Apache, Nginx, IIS) na inštaláciu.<br>Nevhodné je, že adresy URL stránok nie sú užívateľsky prívetivé a začínajú cestou vášho Dolibarru.<br>Adresa URL poskytovaná spoločnosťou Dolibarr:<br><strong><spante'9292ec<07fecla /span></strong><br><br>Ak chcete použiť svoj vlastný externý webový server obsluhujte túto webovú stránku, vytvorte si na svojom webovom serveri virtuálneho hostiteľa, ktorý ukazuje na adresár<br><strong>%s</strong><br>potom zadajte názov tohto virtuálneho servera vo vlastnostiach tohto webu a kliknite na odkaz „Testovať/nasadiť na webe“.
 VirtualHostUrlNotDefined=Adresa URL virtuálneho hostiteľa obsluhovaného externým webovým serverom nie je definovaná
 NoPageYet=Zatiaľ žiadne stránky
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=Zdrojový kód HTML môžete upraviť pomocou tlač
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Pre obrázok zdieľaný s odkazom na zdieľanie (otvorený prístup pomocou hash kľúča zdieľania súboru) je syntax:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='0906170dfb> </span><br>
-YouCanEditHtmlSource3=Ak chcete získať adresu URL obrázka objektu PHP, použite<br><strong>&lt;<strong>&lt;<strong> span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;" class='notranslate'>&gt;</span></strong><br>
-YouCanEditHtmlSourceMore=<br>Ďalšie príklady HTML alebo dynamického kódu sú k dispozícii na <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki dokumentácii</a> >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonovanie stránky/kontajnera
 CloneSite=Klonovacia stránka
 SiteAdded=Webová stránka bola pridaná
@@ -118,7 +118,7 @@ DeleteAlsoMedias=Odstrániť aj všetky mediálne súbory špecifické pre túto
 MyWebsitePages=Moje webové stránky
 SearchReplaceInto=Hľadať | Nahradiť do
 ReplaceString=Nový reťazec
-CSSContentTooltipHelp=Tu zadajte obsah CSS. Aby ste sa vyhli akémukoľvek konfliktu s CSS aplikácie, nezabudnite pred všetky deklarácie pridať triedu .bodywebsite. Napríklad:<br><br>#mycssselector, input.myclass:hover { ... } <br>musí byť<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... b0342fccfda19b> <span class='notranslate'><br>Poznámka: Ak máte veľký súbor bez tejto predpony, môžete použiť „lessc“ na jeho konverziu a všade pridať predponu .bodywebsite.
+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=Upozornenie: Tento obsah sa zobrazí iba vtedy, keď sa na stránku pristupuje zo servera. Nepoužíva sa v režime úprav, takže ak potrebujete načítať súbory JavaScript aj v režime úprav, stačí na stránku pridať značku 'script src=...'.
 Dynamiccontent=Ukážka stránky s dynamickým obsahom
 EditInLineOnOff=Režim „Inline edit“ je %s
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index a0028a40c55..4b5ff4cb19c 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -1,174 +1,173 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Platby príkazmi na inkaso
+SuppliersStandingOrdersArea=Platby prevodom na účet
 StandingOrdersPayment=Inkaso objednávky
 StandingOrderPayment=Inkaso objednávka
 NewStandingOrder=Nová inkaso objednávka
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Nová platba prevodom
 StandingOrderToProcess=Ak chcete spracovať
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Kreditné prevodné príkazy
+PaymentByBankTransferLines=Riadky príkazov na prevod kreditu
 WithdrawalsReceipts=Inkaso objednávky
 WithdrawalReceipt=Inkaso objednávka
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Kreditné prevodné príkazy
+BankTransferReceipt=Príkaz na prevod kreditu
+LatestBankTransferReceipts=Najnovšie %s príkazy na prevod kreditu
 LastWithdrawalReceipts=Najnovšie %s dokumenty bezhotovostných platieb
-WithdrawalsLine=Direct debit order line
-CreditTransfer=Credit transfer
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Riadok príkazu na inkaso
+CreditTransfer=Prevod kreditu
+CreditTransferLine=Linka na prevod kreditu
 WithdrawalsLines=Riadky inkaso objednávok
-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
+CreditTransferLines=Linky na prevod kreditu
+RequestStandingOrderToTreat=Žiadosti o príkaz na inkaso na spracovanie
+RequestStandingOrderTreated=Žiadosti o príkaz na inkaso spracované
+RequestPaymentsByBankTransferToTreat=Žiadosti o prevod kreditu na spracovanie
+RequestPaymentsByBankTransferTreated=Žiadosti o prevod spracované
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Zatiaľ to nie je možné. Stav výberu musí byť nastavený na „pripísané“ pred deklarovaním odmietnutia na konkrétnych riadkoch.
+NbOfInvoiceToWithdraw=Počet kvalifikovaných odberateľských faktúr s čakajúcim príkazom na inkaso
+NbOfInvoiceToWithdrawWithInfo=Číslo zákazníckej faktúry s príkazmi na inkaso s definovanými informáciami o bankovom účte
+NbOfInvoiceToPayByBankTransfer=Počet kvalifikovaných dodávateľských faktúr čakajúcich na platbu bezhotovostným prevodom
+SupplierInvoiceWaitingWithdraw=Faktúra dodávateľa čaká na platbu prevodom
+InvoiceWaitingWithdraw=Faktúra čakajúca na inkaso
+InvoiceWaitingPaymentByBankTransfer=Faktúra čakajúca na prevod
 AmountToWithdraw=Suma, ktorá má zrušiť
-AmountToTransfer=Amount to transfer
-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 '%s' 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
+AmountToTransfer=Suma na prevod
+NoInvoiceToWithdraw=Žiadna otvorená faktúra pre '%s' nečaká. Ak chcete zadať požiadavku, prejdite na kartu '%s' na karte faktúry.
+NoSupplierInvoiceToWithdraw=Žiadna dodávateľská faktúra s otvoreným '%s' nečaká. Ak chcete zadať požiadavku, prejdite na kartu '%s' na karte faktúry.
+ResponsibleUser=Zodpovedný používateľ
+WithdrawalsSetup=Nastavenie platby inkasom
+CreditTransferSetup=Nastavenie prevodu kreditu
+WithdrawStatistics=Štatistika platieb inkasom
+CreditTransferStatistics=Štatistika prevodu kreditu
 Rejects=Odmieta
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
-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 processed 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>.
-NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
-NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
-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.
+LastWithdrawalReceipt=Najnovšie potvrdenia o inkase %s
+MakeWithdrawRequest=Požiadajte o platbu inkasom
+MakeWithdrawRequestStripe=Požiadajte o platbu inkasom cez Stripe
+MakeBankTransferOrder=Požiadajte o prevod kreditu
+WithdrawRequestsDone=%s zaznamenané žiadosti o platbu inkasom
+BankTransferRequestsDone=%s zaznamenané žiadosti o prevod
+ThirdPartyBankCode=Kód banky tretej strany
+NoInvoiceCouldBeWithdrawed=Žiadna faktúra nebola úspešne spracovaná. Skontrolujte, či sú faktúry na spoločnosti s platným IBAN a či IBAN obsahuje UMR (Unique Mandate Reference) s režimom <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Žiadna faktúra nebola úspešne spracovaná. Skontrolujte, či sú faktúry na spoločnosti s platným IBAN.
+NoSalariesCouldBeWithdrawed=Žiadna úspešne spracovaná mzda. Skontrolujte, či sú platy používateľov s platným IBAN.
+WithdrawalCantBeCreditedTwice=Toto potvrdenie o výbere je už označené ako pripísané; to sa nedá urobiť dvakrát, pretože by to mohlo viesť k duplicitným platbám a bankovým záznamom.
 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
+ClassDebited=Klasifikovať debetné
+ClassCreditedConfirm=Naozaj chcete tento doklad o výbere klasifikovať ako pripísaný na váš bankový účet?
+TransData=Dátum prenosu
+TransMetod=Spôsob prenosu
 Send=Odoslať
 Lines=Riadky
-StandingOrderReject=Record a rejection
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=Withdrawal refused
-CreditTransfersRefused=Credit transfers refused
+StandingOrderReject=Zaznamenajte odmietnutie
+WithdrawsRefused=Inkaso odmietnuté
+WithdrawalRefused=Stiahnutie odmietnuté
+CreditTransfersRefused=Úverové prevody boli odmietnuté
 WithdrawalRefusedConfirm=Ste si istí, že chcete zadať stiahnutiu odmietnutie pre spoločnosť
 RefusedData=Dátum odmietnutia
 RefusedReason=Dôvod odmietnutia
 RefusedInvoicing=Fakturácia odmietnutie
-NoInvoiceRefused=Do not charge the customer for the refusal
-InvoiceRefused=Charge the customer for the refusal
-DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
-StatusDebitCredit=Status debit/credit
+NoInvoiceRefused=Neúčtovajte zákazníkovi za odmietnutie
+InvoiceRefused=Naúčtovať zákazníkovi odmietnutie
+DirectDebitRefusedInvoicingDesc=Nastavte príznak, že toto odmietnutie musí byť účtované zákazníkovi
+StatusDebitCredit=Stav debet/kredit
 StatusWaiting=Čakanie
 StatusTrans=Odoslané
-StatusDebited=Debited
+StatusDebited=Debetované
 StatusCredited=Pripísania
 StatusPaid=Platený
 StatusRefused=Odmietol
 StatusMotif0=Nešpecifikovaný
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
-StatusMotif5=RIB unusable
+StatusMotif1=Nedostatok finančných prostriedkov
+StatusMotif2=Požiadavka bola napadnutá
+StatusMotif3=Žiadny príkaz na inkaso
+StatusMotif4=Predajné objednávky
+StatusMotif5=RIB nepoužiteľné
 StatusMotif6=Účet bez rovnováhy
 StatusMotif7=Súdne rozhodnutia
 StatusMotif8=Iný dôvod
-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)
+CreateForSepaFRST=Vytvorte súbor inkasa (SEPA FRST)
+CreateForSepaRCUR=Vytvoriť súbor inkasa (SEPA RCUR)
+CreateAll=Vytvorte súbor inkasa
+CreateFileForPaymentByBankTransfer=Vytvorte súbor na prevod kreditu
+CreateSepaFileForPaymentByBankTransfer=Vytvoriť súbor prevodu kreditu (SEPA)
 CreateGuichet=Iba kancelária
 CreateBanque=Iba banky
 OrderWaiting=Čakanie na liečbu
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Zaznamenajte prenos súboru objednávky
+NotifyCredit=Rekordný kredit objednávky
 NumeroNationalEmetter=Národná Vysielač číslo
 WithBankUsingRIB=U bankových účtov pomocou RIB
 WithBankUsingBANBIC=U bankových účtov pomocou IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToReceiveWithdraw=Prijímanie bankového účtu
+BankToPayCreditTransfer=Bankový účet používaný ako zdroj platieb
 CreditDate=Kredit na
-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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
-DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
-DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+WithdrawalFileNotCapable=Nie je možné vygenerovať súbor potvrdenia o výbere pre vašu krajinu %s (Vaša krajina nie je podporovaná)
+ShowWithdraw=Zobraziť príkaz na inkaso
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ak však faktúra obsahuje aspoň jeden platobný príkaz na inkaso, ktorý ešte nebol spracovaný, nebude nastavený ako zaplatený, aby bolo možné vopred spravovať výber.
+DoStandingOrdersBeforePayments=Táto záložka umožňuje požiadať o príkaz na inkaso. Po dokončení môžete prejsť do ponuky „Banka->Platba inkasom“ a vygenerovať a spravovať súbor príkazu na inkaso.
+DoStandingOrdersBeforePayments2=Môžete tiež poslať žiadosť priamo spracovateľovi platieb SEPA, ako je Stripe, ...
+DoStandingOrdersBeforePayments3=Po uzavretí požiadavky sa platba na faktúry automaticky zaznamená a faktúry sa uzavrú, ak je zvyšok platby nulový.
+DoCreditTransferBeforePayments=Táto záložka vám umožňuje požiadať o prevodný príkaz. Po dokončení prejdite do ponuky „Banka->Platba prevodom na účet“ a vygenerujte a spravujte súbor príkazu na prevod kreditu.
+DoCreditTransferBeforePayments3=Po uzavretí prevodného príkazu sa platba na faktúry automaticky zaznamená a faktúry sa uzavrú, ak je zvyšok platby nulový.
+WithdrawalFile=Súbor debetného príkazu
+CreditTransferFile=Súbor prevodu kreditu
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
-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
+ThisWillAlsoAddPaymentOnInvoice=Týmto sa zaznamenajú aj platby na faktúrach a budú sa klasifikovať ako „Zaplatené“, ak je zostávajúce platby nulové
+StatisticsByLineStatus=Štatistiky podľa stavu liniek
 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 RCUR)
-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 and its payment service provider 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. You agree to receive notifications about future charges up to 2 days before they occur.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
+DateRUM=Dátum podpisu mandátu
+RUMLong=Jedinečná referencia mandátu
+RUMWillBeGenerated=Ak je prázdne, po uložení informácií o bankovom účte sa vygeneruje UMR (Unique Mandate Reference).
+WithdrawMode=Režim inkasa (FRST alebo RCUR)
+WithdrawRequestAmount=Výška žiadosti o inkaso:
+BankTransferAmount=Suma žiadosti o prevod:
+WithdrawRequestErrorNilAmount=Nie je možné vytvoriť žiadosť o inkaso pre prázdnu sumu.
+SepaMandate=Mandát na SEPA inkaso
+SepaMandateShort=SEPA mandát
+PleaseReturnMandate=Tento formulár splnomocnenia vráťte e-mailom na adresu %s alebo poštou na adresu
+SEPALegalText=Podpísaním tohto formulára splnomocnenia oprávňujete (A) %s a jej poskytovateľa platobných služieb posielať vašej banke pokyny na odpočítanie z vášho účtu a (B) vašej banke na odpočítanie vášho účtu v v súlade s pokynmi z %s. V rámci svojich práv máte nárok na vrátenie peňazí od vašej banky podľa podmienok vašej zmluvy s bankou. Vaše práva týkajúce sa vyššie uvedeného poverenia sú vysvetlené vo vyhlásení, ktoré môžete získať od svojej banky. Súhlasíte s tým, že budete dostávať upozornenia o budúcich poplatkoch až 2 dni pred ich uskutočnením.
+CreditorIdentifier=Identifikátor veriteľa
+CreditorName=Meno veriteľa
+SEPAFillForm=(B) Vyplňte všetky polia označené *
 SEPAFormYourName=Vaše meno
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Recurring payment
-ModeRCUR=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
+SEPAFormYourBAN=Názov vášho bankového účtu (IBAN)
+SEPAFormYourBIC=Váš bankový identifikačný kód (BIC)
+SEPAFrstOrRecur=Typ platby
+ModeRECUR=Opakujúca sa platba
+ModeRCUR=Opakujúca sa platba
+ModeFRST=Jednorazová platba
+PleaseCheckOne=Začiarknite iba jeden
+CreditTransferOrderCreated=Príkaz na prevod kreditu %s bol vytvorený
+DirectDebitOrderCreated=Príkaz na inkaso %s vytvorený
+AmountRequested=Požadovaná suma
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier - ICS
-IDS=Debitor Identifier
-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=Dátum vykonania
+CreateForSepa=Vytvorte súbor inkasa
+ICS=Identifikátor veriteľa – ICS
+IDS=Identifikátor dlžníka
+END_TO_END="EndToEndId" SEPA XML tag - Jedinečné ID priradené k transakcii
+USTRD="Neštruktúrovaný" SEPA XML tag
+ADDDAYS=Pridajte dni k dátumu vykonania
+NoDefaultIBANFound=Pre túto tretiu stranu sa nenašiel žiadny predvolený IBAN
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=Platba príkazu na platbu inkasom %s bankou
+InfoCreditMessage=Platobný príkaz na inkaso %s bol uhradený bankou<br>Údaje o platbe: b0ecb2ec87f49fz
+InfoTransSubject=Prenos príkazu na inkaso %s do banky
+InfoTransMessage=Platobný príkaz na inkaso %s odoslal banke %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
+InfoRejectSubject=Príkaz na inkaso bol odmietnutý
+InfoRejectMessage=Dobrý deň,<br><br>príkaz na inkaso faktúry %s súvisiaci s spoločnosť %s s čiastkou %s banka odmietla.<br><br>--<br>%s
 ModeWarning=Voľba pre reálny režim nebol nastavený, môžeme zastaviť po tomto simuláciu
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which 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
-UsedFor=Used for %s
-Societe_ribSigned=SEPA mandate Signed
-NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
-SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+ErrorCompanyHasDuplicateDefaultBAN=Spoločnosť s ID %s má viac ako jeden predvolený bankový účet. Žiadny spôsob, ako zistiť, ktorý z nich použiť.
+ErrorICSmissing=Chýba ICS v bankovom účte %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Celková suma príkazu na inkaso sa líši od súčtu riadkov
+WarningSomeDirectDebitOrdersAlreadyExists=Upozornenie: Už existuje niekoľko nespracovaných príkazov na inkaso (%s) vyžiadaných vo výške %s
+WarningSomeCreditTransferAlreadyExists=Upozornenie: Už existuje nejaký čakajúci prevod kreditu (%s) na sumu %s
+UsedFor=Používa sa pre %s
+Societe_ribSigned=Mandát SEPA podpísaný
+NbOfInvoiceToPayByBankTransferForSalaries=Počet kvalifikovaných platov čakajúcich na platbu prevodom
+SalaryWaitingWithdraw=Mzdy čakajúce na platbu prevodom
 RefSalary=Mzda
-NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
-SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
-
+NoSalaryInvoiceToWithdraw=Žiadne čakanie na plat na '%s'. Prejdite na kartu '%s' na platovej karte a požiadajte.
+SalaryInvoiceWaitingWithdraw=Mzdy čakajúce na platbu prevodom
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 0200a97bf51..8411b5714cc 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=Kategorija za računovodski račun je bila odstranjena
 AccountingJournals=Računovodski dnevniki
 AccountingJournal=Računovodski dnevnik
 NewAccountingJournal=Nov računovodski dnevnik
-ShowAccountingJournal=Prikaži knjigovodski dnevnik
 NatureOfJournal=Narava časopisa
 AccountingJournalType1=Razne operacije
 AccountingJournalType2=Prodaja
@@ -361,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=Število črk pri generiranju črkovne kode (priv
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Nekateri računovodski programi sprejemajo samo dvočrkovno kodo. Ta parameter vam omogoča nastavitev tega vidika. Privzeto število črk je tri.
 OptionsAdvanced=Napredne možnosti
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktivirajte upravljanje obrnjene davčne obveznosti pri dobaviteljih
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Ko je ta možnost omogočena, lahko določite, da mora biti dobaviteljev ali dani račun dobavitelja drugače prenesen v računovodstvo: Dodatna obremenitev in kreditna linija bosta generirani v računovodstvu na 2 podanih kontih iz kontnega načrta, definiranega v "< stran za nastavitev span class='notranslate'>%s</span>".
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Pri ustvarjanju datoteke ne izvažajte črk
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index fe7543c282d..7a040d945e2 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -1197,6 +1197,7 @@ Skin=Tema preobleke
 DefaultSkin=Privzeta tema preobleke
 MaxSizeList=Največja dolžina seznama
 DefaultMaxSizeList=Privzeta največja dolžina za sezname
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Privzeta največja dolžina za kratke sezname (tj. na kartici stranke)
 MessageOfDay=Sporočilo dneva
 MessageLogin=Sporočilo na prijavni strani
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Ne izvažaj dogodekov, starejših od
 SecurityKey = Varnostni ključ
 ##### ClickToDial #####
 ClickToDialSetup=Nastavitve modula za klicanje s klikom
-ClickToDialUrlDesc=URL, ki se prikliče, ko kliknete sliko telefona. V URL-ju lahko uporabite oznake<br><b>__PHONETO__</b>, ki bodo zamenjana s telefonsko številko osebe, ki jo je treba poklicati<br><b>__PHONEFROM__</b> bo nadomeščena s telefonsko številko osebe, ki kliče (vaša)<br><b>__LOGIN__</b></span span>, ki bo nadomeščen s prijavo za klicanje (določeno na uporabniški kartici)<span class='notranslate'><br><b>__PASS__ </b>, ki bo nadomeščeno z geslom za klicanje (določeno na uporabniški kartici).
+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=Ta modul spremeni telefonske številke pri uporabi namiznega računalnika v povezave, ki jih je mogoče klikniti. Klik bo poklical številko. To lahko uporabite za začetek telefonskega klica, ko na namizju uporabljate programski telefon ali na primer pri uporabi sistema CTI, ki temelji na protokolu SIP. Opomba: Ko uporabljate pametni telefon, lahko telefonske številke vedno kliknete.
 ClickToDialUseTelLink=Na telefonskih številkah uporabite samo povezavo "tel:".
 ClickToDialUseTelLinkDesc=Uporabite to metodo, če imajo vaši uporabniki programski telefon ali programski vmesnik, nameščen v istem računalniku kot brskalnik, ki se pokliče, ko v brskalniku kliknete povezavo, ki se začne z "tel:". Če potrebujete povezavo, ki se začne s "sip:", ali celotno strežniško rešitev (ni potrebe po namestitvi lokalne programske opreme), morate to nastaviti na "Ne" in izpolniti naslednje polje.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 99ff11f31ef..092c995719c 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Skupaj (z DDV)
 TotalHT=Skupaj (brez davka)
 TotalHTforthispage=Skupaj (brez davka) za to stran
 Totalforthispage=Skupaj za to stran
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Skupaj (z DDV)
 TotalTTCToYourCredit=Skupaj (z DDV) na vaš dobropis
 TotalVAT=Skupaj DDV
@@ -647,6 +649,7 @@ ReportName=Ime poročila
 ReportPeriod=Obdobje poročila
 ReportDescription=Opis
 Report=Poročilo
+Reports=Poročila
 Keyword=Ključna beseda
 Origin=Izvor
 Legend=Legenda
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 969669f4e2a..cd250982958 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Kode ni bilo mogoče dodati v deskriptor. Preverit
 DictionariesCreated=Slovar <b>%s</b> je bil uspešno ustvarjen
 DictionaryDeleted=Slovar <b>%s</b> je bil uspešno odstranjen
 PropertyModuleUpdated=Lastnost <b>%s</b> je bila uspešno posodobljena
-InfoForApiFile=* Ko prvič ustvarite datoteko, bodo vse metode ustvarjene <strong>za vsak predmet.</strong><br>* Ko kliknete <strong>remove</strong>, samo odstranite vse metode za razred <span ='notranslate'><strong></span>izbrani predmet</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Stran za nastavitev modula
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=You can generate and edit here the class files to provide new email target selectors for the mass emailing module
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 18af68c91c8..9186319c605 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Napredni prenos zalog
 ModuleStockTransferDesc=Napredno upravljanje prenosa zalog z generiranjem prenosnega lista
 StockTransferNew=Nov prenos zalog
 StockTransferList=Seznam prenosov delnic
-ConfirmValidateStockTransfer=Ali ste prepričani, da želite potrditi ta prenos delnic s sklicem <b>%s<span class='notranslate'></b></ razpon>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Zmanjšanje zalog s prenosom %s
 ConfirmDestockCancel=Preklic zmanjšanja zalog z nakazilom %s
 DestockAllProduct=Zmanjšanje zalog
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 48441a6f259..0500eaab088 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=Kategoria për llogarinë e kontabilitetit është hequr
 AccountingJournals=revista të kontabilitetit
 AccountingJournal=ditar i kontabilitetit
 NewAccountingJournal=Ditar i ri i kontabilitetit
-ShowAccountingJournal=Trego ditarin e kontabilitetit
 NatureOfJournal=Natyra e ditarit
 AccountingJournalType1=Operacione të ndryshme
 AccountingJournalType2=Shitjet
@@ -346,14 +345,14 @@ AccountingJournalType8=Inventari
 AccountingJournalType9=Fitimet e mbajtura
 GenerationOfAccountingEntries=Gjenerimi i regjistrimeve të kontabilitetit
 ErrorAccountingJournalIsAlreadyUse=Ky ditar tashmë po përdoret
-AccountingAccountForSalesTaxAreDefinedInto=Shënim: Llogaria e kontabilitetit për tatimin mbi shitjet përcaktohet në menynë <b>%sb09a4b739f17>b09a4b739f17> - <span class='notranslate'><b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Numri i hyrjeve
 NumberOfAccountancyMovements=Numri i lëvizjeve
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Çaktivizo lidhjen dhe transferimin në kontabilitet në shitje (faturat e klientit nuk do të merren parasysh në kontabilitet)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Çaktivizo lidhjen dhe transferimin në kontabilitet për blerjet (faturat e shitësit nuk do të merren parasysh në kontabilitet)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Çaktivizo lidhjen dhe transferimin në kontabilitet në raportet e shpenzimeve (raportet e shpenzimeve nuk do të merren parasysh në kontabilitet)
 ACCOUNTING_ENABLE_LETTERING=Aktivizo funksionin e shkronjave në kontabilitet
-ACCOUNTING_ENABLE_LETTERING_DESC=Kur ky opsion është i aktivizuar, ju mund të përcaktoni, në çdo hyrje kontabël, një kod që të mund të gruponi lëvizje të ndryshme kontabël së bashku. Në të kaluarën, kur revista të ndryshme menaxhoheshin në mënyrë të pavarur, kjo veçori ishte e nevojshme për të grupuar linjat e lëvizjes së revistave të ndryshme së bashku. Megjithatë, me kontabilitetin Dolibarr, një kod i tillë gjurmimi, i quajtur "<b>%s<span class='notranslate'>b09a17f78zf span>" është ruajtur tashmë automatikisht, kështu që një shkronja automatike është bërë tashmë, pa rrezik gabimi, kështu që kjo veçori është bërë e padobishme për një përdorim të zakonshëm. Funksioni manual i shkronjave ofrohet për përdoruesit fundorë që vërtet nuk i besojnë motorit të kompjuterit që bën transferimin e të dhënave në kontabilitet.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Aktivizimi i kësaj veçorie nuk është më i nevojshëm për një menaxhim rigoroz të kontabilitetit.
 ACCOUNTING_ENABLE_AUTOLETTERING=Aktivizoni shkronjat automatike kur transferoni në kontabilitet
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kodi për germat gjenerohet dhe rritet automatikisht dhe nuk zgjidhet nga përdoruesi përfundimtar
@@ -468,8 +467,8 @@ AccountancyClosureConfirmAccountingReversal=Jeni i sigurt që dëshironi të reg
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Disa hapa të detyrueshëm të konfigurimit nuk u kryen, ju lutemi plotësoni ato
-ErrorNoAccountingCategoryForThisCountry=Nuk ka asnjë grup llogarish të disponueshme për shtetin %s (Shih %s - b0ecb2ec87f49>fz <span class='notranslate'>%s)
-ErrorInvoiceContainsLinesNotYetBounded=Ju përpiqeni të shkruani disa rreshta të faturës <strong>%s<span class='notranslate'>b0a65d071f6f69, disa linja të tjera nuk janë ende të kufizuara me llogarinë kontabël. Gazetarimi i të gjitha linjave të faturave për këtë faturë refuzohet.
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
+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=Disa rreshta në faturë nuk janë të lidhura me llogarinë kontabël.
 ExportNotSupported=Formati i konfiguruar i eksportit nuk mbështetet në këtë faqe
 BookeppingLineAlreayExists=Linjat ekzistuese tashmë në kontabilitet
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index bd5b1a3614d..809baf2f138 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -61,9 +61,9 @@ SetupArea=Konfigurimi
 UploadNewTemplate=Ngarko shabllon(t) e ri
 FormToTestFileUploadForm=Formulari për të testuar ngarkimin e skedarit (sipas konfigurimit)
 ModuleMustBeEnabled=Moduli/aplikacioni <b>%s</b> duhet të jetë en
-ModuleIsEnabled=Moduli/aplikacioni <b>%s<span class='notranslate'></b></spanabled> ka qenë i hapur
-IfModuleEnabled=Shënim: po është efektive vetëm nëse moduli <b>%s<span class='notranslate'></b> është i mundshëm</spand>
-RemoveLock=Hiq/riemërto skedarin <b>%s<span class='notranslate'></b></span të na lejojë të ekzistojë të mjetit Përditëso/Instalo.
+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=Rivendos skedarin <b>%s</b>, vetëm me leje të lexueshme përdorimi i mëtejshëm i mjetit Përditëso/Instalo.
 SecuritySetup=Konfigurimi i sigurisë
 PHPSetup=Konfigurimi i PHP
@@ -71,7 +71,7 @@ OSSetup=Konfigurimi i OS
 SecurityFilesDesc=Përcaktoni këtu opsionet që lidhen me sigurinë në lidhje me ngarkimin e skedarëve.
 ErrorModuleRequirePHPVersion=Gabim, ky modul kërkon versionin PHP %s ose më të lartë
 ErrorModuleRequireDolibarrVersion=Gabim, ky modul kërkon versionin Dolibarr %s ose më të lartë
-ErrorDecimalLargerThanAreForbidden=Gabim, një saktësi më e lartë se <b>%s<span class='notranslate'></b></s> nuk mbështetet.
+ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
 DictionarySetup=Vendosja e fjalorit
 Dictionary=fjalorë
 ErrorReservedTypeSystemSystemAuto=Vlera 'system' dhe 'systemauto' për llojin është e rezervuar. Ju mund të përdorni 'përdoruesin' si vlerë për të shtuar rekordin tuaj
@@ -106,7 +106,7 @@ NextValueForInvoices=Vlera tjetër (faturat)
 NextValueForCreditNotes=Vlera tjetër (shënimet e kreditit)
 NextValueForDeposit=Vlera tjetër (parapagim)
 NextValueForReplacements=Vlera tjetër (zëvendësimet)
-MustBeLowerThanPHPLimit=Shënim: konfigurimi juaj PHP aktualisht kufizon madhësinë maksimale të skedarit për ngarkim në <b>%sb09a4fz0 span> <span class='notranslate'>%s, pavarësisht nga vlera e këtij parametri
+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=Shënim: Asnjë kufi nuk është vendosur në konfigurimin tuaj të PHP
 MaxSizeForUploadedFiles=Madhësia maksimale për skedarët e ngarkuar (0 për të mos lejuar çdo ngarkim)
 UseCaptchaCode=Përdorni kodin grafik (CAPTCHA) në faqen e hyrjes dhe disa faqe publike
@@ -150,7 +150,7 @@ AllWidgetsWereEnabled=Të gjitha miniaplikacionet e disponueshme janë aktivizua
 WidgetAvailable=Widget i disponueshëm
 PositionByDefault=Rendi i parazgjedhur
 MenusDesc=Menaxherët e menysë vendosin përmbajtjen e dy shiritave të menysë (horizontale dhe vertikale).
-MenusEditorDesc=Redaktori i menusë ju lejon të përcaktoni hyrjet e personalizuara të menusë. Përdoreni atë me kujdes për të shmangur paqëndrueshmërinë dhe hyrjet e menysë të paarritshme përgjithmonë.<br>Disa module shtojnë hyrje të menysë (në menynë <b></span class>Të gjitha<s ='notranslate'></b> kryesisht). Nëse i hiqni gabimisht disa nga këto hyrje, mund t'i rivendosni ato duke çaktivizuar dhe riaktivizuar modulin.
+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 për përdoruesit
 LangFile=skedar .lang
 Language_en_US_es_MX_etc=Gjuha (en_US, es_MX, ...)
@@ -159,11 +159,11 @@ SystemInfo=Informacioni i sistemit
 SystemToolsArea=Zona e mjeteve të sistemit
 SystemToolsAreaDesc=Kjo zonë ofron funksione administrative. Përdorni menunë për të zgjedhur funksionin e kërkuar.
 Purge=Pastrimi
-PurgeAreaDesc=Kjo faqe ju lejon të fshini të gjithë skedarët e krijuar ose të ruajtur nga Dolibarr (skedarët e përkohshëm ose të gjithë skedarët në <b>%s<span class= drejtoria 'notranslate'></b></span>). Përdorimi i kësaj veçorie zakonisht nuk është i nevojshëm. Ofrohet si një zgjidhje për përdoruesit, Dolibarr i të cilëve është pritur nga një ofrues që nuk ofron leje për të fshirë skedarët e krijuar nga serveri i uebit.
+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=Fshi skedarët e regjistrit, duke përfshirë <b>%s</b> të përcaktuar për modulin Synlog rreziku i humbjes së të dhënave)
 PurgeDeleteTemporaryFiles=Fshini të gjithë skedarët e regjistrit dhe të përkohshëm (pa rrezik të humbjes së të dhënave). Parametri mund të jetë 'tempfilesold', 'logfiles' ose të dyja 'tempfilesold+logfiles'. Shënim: Fshirja e skedarëve të përkohshëm bëhet vetëm nëse drejtoria temp është krijuar më shumë se 24 orë më parë.
 PurgeDeleteTemporaryFilesShort=Fshini regjistrin dhe skedarët e përkohshëm (pa rrezik të humbjes së të dhënave)
-PurgeDeleteAllFilesInDocumentsDir=Fshi të gjithë skedarët në direktori: <b>%s</b><span class=>. 'notranslate'><br>Kjo do të fshijë të gjitha dokumentet e krijuara në lidhje me elementët (palë të treta, fatura etj...), skedarët e ngarkuar në modulin ECM, depozitat e rezervave të bazës së të dhënave dhe skedarët e përkohshëm.
+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=Pastroni tani
 PurgeNothingToDelete=Nuk ka drejtori ose skedarë për të fshirë.
 PurgeNDirectoriesDeleted=skedarët ose drejtoritë janë fshirë <b>%s</b>.
@@ -212,17 +212,17 @@ FeatureAvailableOnlyOnStable=Funksioni i disponueshëm vetëm në versionet zyrt
 BoxesDesc=Miniaplikacionet janë komponentë që tregojnë disa informacione që mund t'i shtoni për të personalizuar disa faqe. Mund të zgjidhni midis shfaqjes ose jo të miniaplikacionit duke zgjedhur faqen e synuar dhe duke klikuar 'Aktivizo', ose duke klikuar në koshin e plehrave për ta çaktivizuar atë.
 OnlyActiveElementsAreShown=Shfaqen vetëm elementet nga <a href="%s">modulet e aktivizuara</a>.
 ModulesDesc=Modulet/aplikacionet përcaktojnë se cilat veçori janë të disponueshme në softuer. Disa module kërkojnë që lejet t'u jepen përdoruesve pas aktivizimit të modulit. Klikoni butonin e ndezjes/fikjes <span class="small valignmiddle">%s</span> për çdo modul ose çaktivizoni një modul/aplikacion.
-ModulesDesc2=Klikoni butonin e rrotës <span class="small valignmiddle">%s<span class='notranslate'></span></span/> për të konfiguruar modulin.
+ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
 ModulesMarketPlaceDesc=Mund të gjeni më shumë module për t'u shkarkuar në faqet e jashtme të internetit në internet...
-ModulesDeployDesc=Nëse lejet në sistemin tuaj të skedarëve e lejojnë këtë, mund ta përdorni këtë mjet për të vendosur një modul të jashtëm. Moduli më pas do të jetë i dukshëm në skedën <strong>%s<span class='notranslate'></strong></s.
+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=Gjeni aplikacionin/modulet e jashtme
 ModulesDevelopYourModule=Zhvilloni aplikacionin/modulet tuaja
 ModulesDevelopDesc=Ju gjithashtu mund të zhvilloni modulin tuaj ose të gjeni një partner për të zhvilluar një për ju.
 DOLISTOREdescriptionLong=Në vend që të aktivizoni faqen e internetit <a href="https://www.dolistore.com">www.dolistore.com</a> për të gjetur një modul të jashtëm, mund të përdorni këtë mjet të integruar që do të kryejë kërkimin në tregun e jashtëm për ju (mund të jetë i ngadalshëm, ka nevojë për qasje në internet)...
 FreeModule=Falas
 CompatibleUpTo=E përputhshme me versionin %s
-NotCompatible=Ky modul nuk duket i pajtueshëm me Dolibarr tuaj %s (Min %s - Maksimumi <span class='notranslate'>b049f2ec87 span>).
-CompatibleAfterUpdate=Ky modul kërkon një përditësim të Dolibarr tuaj %s (Min %s - Maksimumi <span class='notranslate'>b0ecb2ecz87f9 >).
+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=Shihni në treg
 SeeSetupOfModule=Shiko konfigurimin e modulit %s
 SeeSetupPage=Shiko faqen e konfigurimit në %s
@@ -250,8 +250,8 @@ Security=Siguria
 Passwords=Fjalëkalimet
 DoNotStoreClearPassword=Enkriptoni fjalëkalimet e ruajtura në bazën e të dhënave (JO si tekst i thjeshtë). Rekomandohet fuqimisht të aktivizoni këtë opsion.
 MainDbPasswordFileConfEncrypted=Enkriptoni fjalëkalimin e bazës së të dhënave të ruajtur në conf.php. Rekomandohet fuqimisht të aktivizoni këtë opsion.
-InstrucToEncodePass=To have password encoded into the 1conf.php1 file, replace the line 23$dolibarr_main_db_pass="...";34by56$dolibarr_main_db_pass="crypted:%s";6
-InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line $dolibarr_main_db_pass="crypted:...";by$dolibarr_main_db_pass="";
+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=Mbroni skedarët PDF të krijuar. Kjo NUK rekomandohet pasi prish gjenerimin e PDF-ve në masë.
 ProtectAndEncryptPdfFilesDesc=Mbrojtja e një dokumenti PDF e mban atë të disponueshëm për t'u lexuar dhe printuar me çdo shfletues PDF. Megjithatë, redaktimi dhe kopjimi nuk është më i mundur. Vini re se përdorimi i kësaj veçorie bën që ndërtimi i PDF-ve të bashkuara globale të mos funksionojë.
 Feature=Veçori
@@ -268,8 +268,8 @@ OtherResources=Burime të tjera
 ExternalResources=Burimet e Jashtme
 SocialNetworks=Rrjete sociale
 SocialNetworkId=ID e rrjetit social
-ForDocumentationSeeWiki=Për dokumentacionin e përdoruesit ose zhvilluesit (Dokument, FAQ...),<br>hidhini një sy Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s<span class='notranslate'88>c650 </b>
-ForAnswersSeeForum=Për çdo pyetje/ndihmë tjetër, mund të përdorni forumin e Dolibarr:<br><b>b00fab32z0e<9 /span><span class='notranslate'>%s</a></b>
+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=Këtu janë disa burime për të marrë ndihmë dhe mbështetje me Dolibarr.
 HelpCenterDesc2=Disa nga këto burime disponohen vetëm në <b>anglisht</b>.
 CurrentMenuHandler=Trajtuesi aktual i menysë
@@ -290,8 +290,8 @@ EMailsSetup=Konfigurimi i emaileve
 EMailsDesc=Kjo faqe ju lejon të vendosni parametra ose opsione për dërgimin e emailit.
 EmailSenderProfiles=Profilet e dërguesit të emaileve
 EMailsSenderProfileDesc=Ju mund ta mbani këtë seksion bosh. Nëse futni disa email këtu, ato do të shtohen në listën e dërguesve të mundshëm në kutinë e kombinuar kur shkruani një email të ri.
-MAIN_MAIL_SMTP_PORT=Porta SMTP/SMTPS (vlera e parazgjedhur në php.ini: <b>%s<span class='notranslate'>b09f17b73 >)
-MAIN_MAIL_SMTP_SERVER=Pritësi SMTP/SMTPS (vlera e parazgjedhur në php.ini: <b>%s<span class='notranslate'>b09f177 >)
+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=Porta SMTP/SMTPS
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Pritësi SMTP/SMTPS
 MAIN_MAIL_EMAIL_FROM=Email dërgues për emaile automatike
@@ -302,7 +302,7 @@ MAIN_DISABLE_ALL_MAILS=Çaktivizo të gjithë dërgimin e emaileve (për qëllim
 MAIN_MAIL_FORCE_SENDTO=Dërgoni të gjitha emailet tek (në vend të marrësve të vërtetë, për qëllime testimi)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugjeroni emailet e punonjësve (nëse është përcaktuar) në listën e marrësve të paracaktuar kur shkruani një email të ri
 MAIN_MAIL_NO_WITH_TO_SELECTED=Mos zgjidhni një marrës të paracaktuar edhe nëse ka vetëm 1 zgjedhje të mundshme
-MAIN_MAIL_SENDMODE=Sending method
+MAIN_MAIL_SENDMODE=Mënyra e dërgimit
 MAIN_MAIL_SMTPS_ID=ID SMTP (nëse serveri dërgues kërkon vërtetim)
 MAIN_MAIL_SMTPS_PW=Fjalëkalimi SMTP (nëse serveri dërgues kërkon vërtetim)
 MAIN_MAIL_EMAIL_TLS=Përdorni enkriptimin TLS (SSL).
@@ -345,12 +345,12 @@ ThisIsAlternativeProcessToFollow=Ky është një konfigurim alternativ për t'u
 StepNb=Hapi %s
 FindPackageFromWebSite=Gjeni një paketë që ofron veçoritë që ju nevojiten (për shembull në faqen zyrtare të internetit %s).
 DownloadPackageFromWebSite=Shkarko paketën (për shembull nga faqja zyrtare e internetit %s).
-UnpackPackageInDolibarrRoot=Shpaketoni/zbrisni skedarët e paketuar në drejtorinë tuaj të serverit Dolibarr: <b>%s<span class='notranslate'>b09a17sf830f >
+UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
 UnpackPackageInModulesRoot=Për të vendosur/instaluar një modul të jashtëm, duhet të shpaketoni/zbrisni skedarin e arkivit në drejtorinë e serverit të dedikuar për modulet e jashtme:<br><b>%s</b>
 SetupIsReadyForUse=Vendosja e modulit ka përfunduar. Sidoqoftë, duhet ta aktivizoni dhe konfiguroni modulin në aplikacionin tuaj duke shkuar te modulet e konfigurimit të faqes: <a href="%s">%s</a>.
 NotExistsDirect=Drejtoria alternative rrënjë nuk është përcaktuar në një direktori ekzistuese.<br>
 InfDirAlt=Që nga versioni 3, është e mundur të përcaktohet një direktori alternative rrënjë. Kjo ju lejon të ruani, në një drejtori të dedikuar, shtojca dhe shabllone të personalizuara.<br>Thjesht krijoni një direktori në rrënjë të Dolibarr (p.sh.: me porosi).<br>
-InfDirExample=<br>Më pas deklaroje në skedarin <strong>conf.phpb0a65d09zpan0sf class = 'noTranslate'> <br>  $ dolibarr_main_url_root_alt = '/custom'  <br>  'notranslate'><br></span>Nëse këto rreshta komentohen me "#", për t'i aktivizuar ato, thjesht hiqni komentin duke hequr karakterin "#".
+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=Ju mund të ngarkoni skedarin .zip të paketës së modulit nga këtu:
 CurrentVersion=Versioni aktual i Dolibarr
 CallUpdatePage=Shfletoni në faqen që përditëson strukturën dhe të dhënat e bazës së të dhënave: %s.
@@ -361,28 +361,28 @@ LastActivationIP=IP e fundit e aktivizimit
 LastActivationVersion=Versioni i fundit i aktivizimit
 UpdateServerOffline=Përditëso serverin jashtë linje
 WithCounter=Menaxhoni një numërues
-GenericMaskCodes=Ju mund të vendosni çdo maskë numërimi. Në këtë maskë, etiketat e mëposhtme mund të përdoren:<br><b>{000000}b09a4b73 /span> korrespondon me një numër që do të rritet në çdo <span class='notranslate'>%s. Futni aq zero sa gjatësia e dëshiruar e numëruesit. Numëruesi do të plotësohet me zero nga e majta në mënyrë që të ketë aq zero sa maska. <br><b>{000000+000}b09a4b739f17f8z e mëparshme, por e njëjta gjë një zhvendosje që korrespondon me numrin në të djathtë të shenjës + zbatohet duke filluar nga <span class='notranslate'>%s e parë. <br><b>{000000@x}</b> por e njëjta gjë si e mëparshme numëruesi rivendoset në zero kur arrihet muaji x (x midis 1 dhe 12, ose 0 për të përdorur muajt e parë të vitit fiskal të përcaktuar në konfigurimin tuaj, ose 99 për të rivendosur në zero çdo muaj). Nëse përdoret ky opsion dhe x është 2 ose më i lartë, atëherë kërkohet gjithashtu sekuenca {yy}{mm} ose {yyyy}{mm}. <br><b>{dd}</b> 10 ditë (<1 deri në 3). span class='notranslate'><br></span><b>{mm}</b> 1 muaj (01 deri në 1 muaj). class='notranslate'><br></span><b>{yy}</b>, <span8e33f6050 </span>{yyyy}</b> ose <b>{y}b09a4b739f17> viti mbi 2, 4 ose 1 numra. <span class='notranslate'><br>
-GenericMaskCodes2=<b>{cccc}</b> kodi i klientit në karakterin e <span class='s notranslate'><br></span><b>{cccc000}b091 code</span class='notranslate'8f391>b091 në n karaktere ndiqet nga një numërues i dedikuar klientit. Ky numërues i dedikuar klientit rivendoset në të njëjtën kohë me numëruesin global.<span class='notranslate'><br><b>b06a5f45149e </b> Kodi i llojit të palës së tretë në n karaktere (shih menynë Faqja kryesore - Konfigurimi - Fjalori - Llojet e palëve të treta). Nëse shtoni këtë etiketë, numëruesi do të jetë i ndryshëm për çdo lloj pale të tretë.<br>
+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=Të gjithë karakteret e tjera në maskë do të mbeten të paprekura.<br>Hapësirat nuk lejohen.<br>
 GenericMaskCodes3EAN=Të gjithë karakteret e tjera në maskë do të mbeten të paprekura (përveç * ose ? në pozicionin e 13-të në EAN13).<br>Hapësirat nuk lejohen.<br>Në EAN13, karakteri i fundit pas }-së së fundit në pozicionin e 13-të duhet të jetë * ose ? . Ai do të zëvendësohet nga çelësi i llogaritur.<br>
 GenericMaskCodes4a=<u>Shembull në datën 99 %s të palës së tretë TheCompany, me datë 2023-01-31:<span class='notrans '></u></span><br>
 GenericMaskCodes4b=<u>Shembull për palën e tretë i krijuar më 31/01/2023:</u>b0349fccf
-GenericMaskCodes4c=<u>Shembull për produktin e krijuar më 31/01/2023:</u><span class='notranslate'>b0342fccfdas</1>b0342fccfdas
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> do të japë b65</83738 span>ABC2301-000099<span class='notranslate'></b><br>b0aee83fz0658>b0aee83fz0658@0+0 }-ZZZ/{dd}/XXX<span class='notranslate'></b> do të japë <b>0199-ZZZ/31/XXX<span class='notrans '></b></span><br><b>IN{yy}{mm}-{0000}-{t class='notranslate'></b></span> do t'i japë <b>IN2301-0099-A<span class='notranslate'>b09a4b739f17 të llojit të kompanisë 'Responsable Inscripto' me kod për llojin që është 'A_RI'
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Kthen një numër të personalizueshëm sipas një maske të përcaktuar.
-ServerAvailableOnIPOrPort=Serveri është i disponueshëm në adresën <b>%s</b> <span class= në port 'notranslate'><b>%s</b>
-ServerNotAvailableOnIPOrPort=Serveri nuk është i disponueshëm në adresën <b>%s</b> <span class ='notranslate'><b></span>%s</b>
+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=Testoni lidhjen e serverit
 DoTestSend=Testimi i dërgimit
 DoTestSendHTML=Testoni dërgimin e HTML
 ErrorCantUseRazIfNoYearInMask=Gabim, nuk mund të përdoret opsioni @ për të rivendosur numëruesin çdo vit nëse sekuenca {yy} ose {yyyy} nuk është në maskë.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Gabim, nuk mund të përdoret opsioni @ nëse sekuenca {yy}{mm} ose b03d0fe4bc90b>9 <span class='notranslate'>{mm} nuk është në maskë.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=Parametri UMask për skedarët e rinj në sistemin e skedarëve Unix/Linux/BSD/Mac.
 UMaskExplanation=Ky parametër ju lejon të përcaktoni lejet e vendosura si parazgjedhje për skedarët e krijuar nga Dolibarr në server (për shembull gjatë ngarkimit).<br>Duhet të jetë vlera oktal (për shembull, 0666 do të thotë lexo dhe shkruani për të gjithë.). Vlera e rekomanduar është 0600 ose 0660<br>Ky parametër është i padobishëm në një server Windows.
 SeeWikiForAllTeam=Hidhini një sy faqes Wiki për një listë të kontribuesve dhe organizimin e tyre
 UseACacheDelay= Vonesa për ruajtjen e përgjigjes së eksportit në memorie të fshehtë në sekonda (0 ose bosh pa memorie të fshehtë)
 DisableLinkToHelpCenter=Fshih lidhjen "<b>Ke nevojë për ndihmë ose mbështetje</b>" në faqen e identifikimit
-DisableLinkToHelp=Fshih lidhjen për ndihmën në internet "<b>%s<span class='notranslate'></b></s>"
+DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
 AddCRIfTooLong=Nuk ka mbështjellje automatike të tekstit, teksti që është shumë i gjatë nuk do të shfaqet në dokumente. Ju lutemi shtoni kthimet e transportit në zonën e tekstit nëse është e nevojshme.
 ConfirmPurge=Jeni i sigurt që dëshironi ta ekzekutoni këtë spastrim?<br>Kjo do të fshijë përgjithmonë të gjithë skedarët tuaj të të dhënave pa asnjë mënyrë për t'i rivendosur ato (skedarët ECM, skedarët e bashkangjitur...).
 MinLength=Gjatësia minimale
@@ -390,9 +390,9 @@ LanguageFilesCachedIntoShmopSharedMemory=Skedarët .lang ngarkohen në memorien
 LanguageFile=Skedari i gjuhës
 ExamplesWithCurrentSetup=Shembuj me konfigurimin aktual
 ListOfDirectories=Lista e drejtorive të shablloneve të OpenDocument
-ListOfDirectoriesForModelGenODT=Lista e drejtorive që përmbajnë skedarë shabllonesh me formatin OpenDocument.<br><br>Vendosni këtu rrugën e plotë të drejtorive.<br>Shto një kthim transporti midis drejtorisë eah.<br>Për të shtuar një drejtori të modulit GED, shtoni këtu b0aee833z0583f >DOL_DATA_ROOT/ecm/yourdirectoryname<span class='notranslate'></b>.<br>b031panFisles</spanFiccs' duhet të përfundojë me <span class='notranslate'><b>.odt</b> ose <b></span. ='notranslate'></b>.
+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=Numri i skedarëve të shabllonit ODT/ODS të gjetur në këto drejtori
-ExampleOfDirectoriesForModelGen=Shembuj të sintaksës:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mydocumentdir/my 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Për të ditur se si të krijoni shabllonet tuaja të dokumenteve odt, përpara se t'i ruani në ato drejtori, lexoni dokumentacionin wiki:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozicioni i Emrit/Mbiemrit
@@ -433,7 +433,7 @@ MassConvert=Nis konvertimin në masë
 PriceFormatInCurrentLanguage=Formati i çmimit në gjuhën aktuale
 String=Vargu
 String1Line=Varg (1 rresht)
-Text=Text
+Text=Teksti
 TextLong=Tekst i gjatë
 TextLongNLines=Tekst i gjatë (n rreshta)
 HtmlText=Teksti HTML
@@ -461,11 +461,11 @@ ComputedFormulaDesc=Këtu mund të futni një formulë duke përdorur vetitë e
 Computedpersistent=Ruaj fushën e llogaritur
 ComputedpersistentDesc=Fushat shtesë të llogaritura do të ruhen në bazën e të dhënave, megjithatë, vlera do të rillogaritet vetëm kur objekti i kësaj fushe ndryshohet. Nëse fusha e llogaritur varet nga objekte të tjera ose të dhëna globale, kjo vlerë mund të jetë e gabuar!!
 ExtrafieldParamHelpPassword=Lënia e kësaj fushe bosh do të thotë se kjo vlerë do të ruhet PA enkriptim (fusha thjesht është fshehur me yje në ekran).<br><br>Enter vlera 'dolcrypt' për të koduar vlerën me një algoritëm të kthyeshëm enkriptimi. Të dhënat e pastra ende mund të njihen dhe modifikohen, por janë të koduara në bazën e të dhënave.<br><br>Fut 'auto' (ose 'md5', 'sha256', 'password_hash', ...) për të përdorur algoritmin e parazgjedhur të enkriptimit të fjalëkalimit (ose md5, sha256, password_hash...) për të ruajtur fjalëkalimin e hashuar jo të kthyeshëm në bazën e të dhënave (nuk ka asnjë mënyrë për të marrë vlerën origjinale)
-ExtrafieldParamHelpselect=Lista e vlerave duhet të jetë rreshta me çelësin e formatit, vlerën (ku çelësi nuk mund të jetë '0')<br><br> për shembull : <br>1,value1<br>2,value2<br></s span class='notranslate'><br>...<br><br>Për të pasur listën në varësi të një tjetri lista plotësuese e atributeve:<br>1,value1|options_<i>parent_list_code<span class='notranslate'4:0bace>7span çelësi_prindëror<br>2,value2|opsionet_<i>kodi_lista_parent7par_833>b0pansbacey3>b0pansbacey6 class='notranslate'><br><br>Për të pasur listën në varësi të një liste tjetër:<br>1, vlera1|<i>parent_list_code</i>:parent_keyb0342fccfda1, b0342zvalue</029>b0342fccfda1| class='notranslate'><i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=Lista e vlerave duhet të jetë rreshta me çelësin e formatit, vlerën (ku çelësi nuk mund të jetë '0')<br><br> për shembull : <br>1,value1<br>2,value2<br>,value<3> span class='notranslate'><br>...
-ExtrafieldParamHelpradio=Lista e vlerave duhet të jetë rreshta me çelësin e formatit, vlerën (ku çelësi nuk mund të jetë '0')<br><br> për shembull : <br>1,value1<br>2,value2<br>,value<3> span class='notranslate'><br>...
-ExtrafieldParamHelpsellist=Lista e vlerave vjen nga një tabelë<br>Sintaksa: table_name:label_field:id_field::filtersql<br>Shembull: cbelle_typident: ::filtersql<br><br>- id_field është domosdoshmërisht një çelës int primarb03420cc - filtersql është një kusht SQL. Mund të jetë një test i thjeshtë (p.sh. aktiv=1) për të shfaqur vetëm vlerën aktive<span class='notranslate'><br>Mund të përdorni gjithashtu $ID$ në filtër që është id-ja aktuale e objektit aktual<br>Për të përdorur një SELECT në filtër, përdorni fjalën kyçe $SEL$ për të anashkaluar mbrojtjen kundër injektimit.<br>nëse dëshironi të filtroni në fusha shtesë përdorni sintaksë extra.fieldcode=... (ku kodi i fushës është kodi i extrafield)<br><br>Për të pasur listë në varësi të një liste atributesh plotësuese:<br>c_typent:libelle:id:options_<i>parent_list_codenotranslate' class='> </i></span>|column_parent:filter <br><br>Për të pasur listën në varësi të një liste tjetër: 'notranslate'><br></span>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758sacum33>b0ae64758sbacum33|
-ExtrafieldParamHelpchkbxlst=Lista e vlerave vjen nga një tabelë<br>Sintaksa: table_name:label_field:id_field::filtersql<br>Shembull: cbelle_typident: ::filtersql<br><br>filtri mund të jetë një test i thjeshtë (p.sh. active=1) për të shfaqur vetëm vlerën aktive<br>Mund të përdorni gjithashtu $ID$ në filtër, ku është id-ja aktuale e objektit aktual<br>Për të bërë një SELECT në filtër përdorni $SEL$<br>nëse dëshiron të filtrosh në fusha shtesë, përdor sintaksën extra.fieldcode=... (ku kodi i fushës është kodi i extrafield)<br><br>Për të pasur listën në varësi të një liste tjetër atributesh plotësuese:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfdaspannotranslate'>b0342fccfdaspannotranslate'0342fccfdaspannotranslate'0 9bz0 Për të pasur listën në varësi të një liste tjetër:<br>c_typent:libelle:id:<i>parent_list_code<s class='notranslate'></i></span>|column_parent:filter
+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 necessarily 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=Parametrat duhet të jenë ObjectName:Classpath<br>Sintaksa: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Mbajeni bosh për një ndarës të thjeshtë<br>Vendoseni këtë në 1 për një ndarës në kolaps (i hapur si parazgjedhje për sesionin e ri, më pas statusi mbahet për çdo sesion përdoruesi)<br>Cakto këtë në 2 për një ndarës në kolaps (i palosur si parazgjedhje për sesionin e ri, më pas statusi mbahet për çdo sesion përdoruesi)
 LibraryToBuildPDF=Biblioteka e përdorur për gjenerimin e PDF-ve
@@ -473,7 +473,7 @@ LocalTaxDesc=Disa vende mund të aplikojnë dy ose tre taksa për çdo linjë fa
 SMS=SMS
 LinkToTestClickToDial=Fut një numër telefoni për të thirrur për të shfaqur një lidhje për të testuar url-në ClickToDial për përdoruesin <strong>%s</strong>
 RefreshPhoneLink=Rifresko lidhjen
-LinkToTest=Lidhja e klikueshme e krijuar për përdoruesin <strong>%s<span class='notranslate'>b0a65d071f6fc9zli</span test për numrin e telefonit )
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Mbajeni bosh për të përdorur vlerën e paracaktuar
 KeepThisEmptyInMostCases=Në shumicën e rasteve, ju mund ta mbani këtë fushë bosh.
 DefaultLink=Lidhja e parazgjedhur
@@ -483,7 +483,7 @@ ExternalModule=Moduli i jashtëm
 InstalledInto=Instaluar në drejtorinë %s
 BarcodeInitForThirdparties=Fillimi masiv i barkodit për palët e treta
 BarcodeInitForProductsOrServices=Fillimi ose rivendosja e barkodit masiv për produktet ose shërbimet
-CurrentlyNWithoutBarCode=Aktualisht, ju keni <strong>%s</strong> <span class=' notranslate'><strong>%s</strong> <span class='notranslate'8 pa definicion'87f4b4 .
+CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Vlera fillestare për barkodet boshe %s
 EraseAllCurrentBarCode=Fshini të gjitha vlerat aktuale të barkodit
 ConfirmEraseAllCurrentBarCode=Jeni i sigurt që dëshironi të fshini të gjitha vlerat aktuale të barkodit?
@@ -518,8 +518,8 @@ DependsOn=Ky modul ka nevojë për modulin(et)
 RequiredBy=Ky modul kërkohet nga moduli(et)
 TheKeyIsTheNameOfHtmlField=Ky është emri i fushës HTML. Kërkohen njohuri teknike për të lexuar përmbajtjen e faqes HTML për të marrë emrin kyç të një fushe.
 PageUrlForDefaultValues=Duhet të futni shtegun përkatës të URL-së së faqes. Nëse përfshini parametra në URL, do të jetë efektive nëse të gjithë parametrat në URL-në e shfletuar kanë vlerën e përcaktuar këtu.
-PageUrlForDefaultValuesCreate=<br>Shembull:<br>Për formularin për të krijuar një palë të tretë të re, është b0e7843947c<0 /span><span class='notranslate'>%s</strong>.<br>Për URL të instaluar në module të jashtme drejtoria e personalizuar, mos përfshini "custom/", prandaj përdorni shteg si <strong>mymodule/mypage.php</strong> dhe jo të personalizuar /mymodule/mypage.php.<br>Nëse dëshironi vlerën e paracaktuar vetëm nëse url-ja ka ndonjë parametër, mund të përdorni <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Shembull:<br>Për faqen që liston palët e treta, është b0e7843947c0 ><span class='notranslate'>%s</strong>.<br>Për URL-në e instaluar të moduleve të jashtme , mos përfshini "custom/" kështu që përdorni një shteg si <strong>mymodule/mypagelist.php</strong> dhe jo të personalizuar/mymodule /mypagelist.php.<br>Nëse dëshironi vlerën e paracaktuar vetëm nëse url-ja ka ndonjë parametër, mund të përdorni <strong>%s</strong>
+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=Vini re gjithashtu se mbishkrimi i vlerave të paracaktuara për krijimin e formularit funksionon vetëm për faqet që janë projektuar saktë (pra me parametrin veprim=krijoni ose paraqisni...)
 EnableDefaultValues=Aktivizo personalizimin e vlerave të paracaktuara
 EnableOverwriteTranslation=Lejo personalizimin e përkthimeve
@@ -684,7 +684,7 @@ Module5000Desc=Ju lejon të menaxhoni kompani të shumta
 Module6000Name=Rrjedha e punës ndërmodule
 Module6000Desc=Menaxhimi i rrjedhës së punës midis moduleve të ndryshme (krijimi automatik i objektit dhe/ose ndryshimi automatik i statusit)
 Module10000Name=Faqet e internetit
-Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module10000Desc=CMS për të krijuar faqe interneti me një redaktues WYSIWYG. Ky është një sistem i menaxhimit të përmbajtjes i orientuar nga webmaster ose zhvillues (është më mirë të dini gjuhën HTML dhe CSS). Thjesht konfiguroni serverin tuaj të internetit (Apache, Nginx, ...) për të treguar direktorinë e dedikuar Dolibarr për ta vendosur atë në internet në internet me emrin tuaj të domenit.
 Module20000Name=Menaxhimi i Kërkesave të Lënë
 Module20000Desc=Përcaktoni dhe gjurmoni kërkesat për pushim të punonjësve
 Module39000Name=Shumë produkte
@@ -1154,7 +1154,7 @@ CalcLocaltax2=Blerjet
 CalcLocaltax2Desc=Raportet e taksave lokale janë totali i blerjeve të taksave lokale
 CalcLocaltax3=Shitjet
 CalcLocaltax3Desc=Raportet e taksave lokale janë totali i shitjeve të taksave lokale
-NoLocalTaxXForThisCountry=Sipas konfigurimit të taksave (Shih %s - %s - <span class='notranslate'>b0ecb2ec87f49>fz)0 , vendi juaj nuk ka nevojë të përdorë këtë lloj takse
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etiketa përdoret si parazgjedhje nëse nuk mund të gjendet përkthim për kodin
 LabelOnDocuments=Etiketa në dokumente
 LabelOrTranslationKey=Etiketa ose çelësi i përkthimit
@@ -1197,6 +1197,7 @@ Skin=Tema e lëkurës
 DefaultSkin=Tema e parazgjedhur e lëkurës
 MaxSizeList=Gjatësia maksimale për listën
 DefaultMaxSizeList=Gjatësia maksimale e parazgjedhur për listat
+DisplayGrandTotalInList=Shfaq totalin e përgjithshëm (për të gjitha faqet) në fundin e listave
 DefaultMaxSizeShortList=Gjatësia maksimale e parazgjedhur për listat e shkurtra (d.m.th. në kartën e klientit)
 MessageOfDay=Mesazhi i ditës
 MessageLogin=Mesazhi i faqes së hyrjes
@@ -1249,7 +1250,7 @@ SetupDescription2=Dy seksionet e mëposhtme janë të detyrueshme (dy hyrjet e p
 SetupDescription3=<a href="%s">%s -> %sc60804 <br><br>Parametrat bazë të përdorur për të personalizuar sjelljen e paracaktuar të aplikacionit tuaj (p.sh. për veçoritë që lidhen me shtetin).
 SetupDescription4=<a href="%s">%s -> %sc60804 <br><br>Ky softuer është një grup i shumë moduleve/aplikacioneve. Modulet që lidhen me nevojat tuaja duhet të aktivizohen dhe konfigurohen. Regjistrimet e menysë do të shfaqen me aktivizimin e këtyre moduleve.
 SetupDescription5=Regjistrimet e tjera të menusë Setup menaxhojnë parametrat opsionalë.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='enotranslate'8 /span>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Parametrat bazë të përdorur për të personalizuar sjelljen e paracaktuar të aplikacionit tuaj (p.sh. për veçoritë që lidhen me shtetin).
 SetupDescription4b=Ky softuer është një grup i shumë moduleve/aplikacioneve. Modulet që lidhen me nevojat tuaja duhet të aktivizohen. Regjistrimet e menysë do të shfaqen me aktivizimin e këtyre moduleve.
 AuditedSecurityEvents=Ngjarjet e sigurisë që auditohen
@@ -1268,7 +1269,7 @@ BrowserOS=Shfletuesi OS
 ListOfSecurityEvents=Lista e ngjarjeve të sigurisë Dolibarr
 SecurityEventsPurged=Ngjarjet e sigurisë u spastruan
 TrackableSecurityEvents=Ngjarjet e sigurisë të gjurmueshme
-LogEventDesc=Aktivizo regjistrimin për ngjarje specifike të sigurisë. Administratorët regjistrin nëpërmjet menysë <b>%s - %s notranslate'></b></span>. Kujdes, kjo veçori mund të gjenerojë një sasi të madhe të dhënash në bazën e të dhënave.
+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=Parametrat e konfigurimit mund të vendosen vetëm nga <b>përdoruesit e administratorit</b>.
 SystemInfoDesc=Informacioni i sistemit është informacion i ndryshëm teknik që merrni në modalitetin vetëm për lexim dhe i dukshëm vetëm për administratorët.
 SystemAreaForAdminOnly=Kjo zonë është e disponueshme vetëm për përdoruesit e administratorëve. Lejet e përdoruesve të Dolibarr nuk mund ta ndryshojnë këtë kufizim.
@@ -1280,14 +1281,14 @@ DisplayDesc=Parametrat që ndikojnë në pamjen dhe paraqitjen e aplikacionit mu
 AvailableModules=Aplikacioni/modulet e disponueshme
 ToActivateModule=Për të aktivizuar modulet, shkoni te zona e konfigurimit (Home->Setup->Modules).
 SessionTimeOut=Kohëzgjatja e seancës
-SessionExplanation=Ky numër garanton që sesioni nuk do të skadojë kurrë përpara kësaj vonese, nëse pastruesi i sesionit bëhet nga Pastruesi i brendshëm i sesioneve PHP (dhe asgjë tjetër). Pastruesi i brendshëm i sesioneve PHP nuk garanton që sesioni do të përfundojë pas kësaj vonese. Ai do të skadojë, pas kësaj vonese dhe kur të ekzekutohet pastruesja e sesioneve, kështu që çdo <b>%s/<span class=' qasje notranslate'>%s</span></b>, por vetëm gjatë aksesit të bërë nga sesionet e tjera (nëse vlera është 0, do të thotë se pastrimi i sesionit bëhet vetëm nga një proces i jashtëm) .<br>Shënim: në disa serverë me një mekanizëm të jashtëm pastrimi të sesioneve (cron nën debian, ubuntu ...), sesionet mund të shkatërrohen pas një periudhe të përcaktuar nga një konfigurim i jashtëm, pa marrë parasysh se cila është vlera e futur këtu.
-SessionsPurgedByExternalSystem=Sesionet në këtë server duket se pastrohen nga një mekanizëm i jashtëm (cron nën debian, ubuntu ...), ndoshta çdo <b>%s</b> sekonda (= vlera e parametrit <b>session.gc_maxlifetime<span class='notranslate'>8f391>b091 , kështu që ndryshimi i vlerës këtu nuk ka asnjë efekt. Duhet t'i kërkoni administratorit të serverit të ndryshojë vonesën e sesionit.
+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=Shkaktarët e disponueshëm
-TriggersDesc=Aktivizuesit janë skedarë që do të modifikojnë sjelljen e rrjedhës së punës Dolibarr sapo të kopjohen në drejtorinë <b>htdocs/core/triggers<span class='notranslate'></b></s>. Ata realizojnë veprime të reja, të aktivizuara në ngjarjet e Dolibarr (krijimi i kompanisë së re, vlefshmëria e faturës, ...).
+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=Aktivizuesit në këtë skedar janë çaktivizuar nga prapashtesa <b>-NORUN</b> në emrin e tyre.
-TriggerDisabledAsModuleDisabled=Aktivizuesit në këtë skedar janë çaktivizuar pasi moduli <b>%s<span class='notranslate'>b09a4b739f17f8z është i çaktivizuar.
+TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
 TriggerAlwaysActive=Aktivizuesit në këtë skedar janë gjithmonë aktivë, pavarësisht nga modulet e aktivizuara Dolibarr.
-TriggerActiveAsModuleActive=Aktivizuesit në këtë skedar janë aktiv si modul <b>%s<span class='notranslate'></b>s.
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Zgjidhni metodën që do të përdoret për fjalëkalimet e krijuara automatikisht.
 DictionaryDesc=Fut të gjitha të dhënat e referencës. Ju mund të shtoni vlerat tuaja në parazgjedhje.
 ConstDesc=Kjo faqe ju lejon të modifikoni (të anashkaloni) parametrat që nuk janë të disponueshëm në faqet e tjera. Këto janë kryesisht parametra të rezervuar vetëm për zhvilluesit/zgjidhja e avancuar e problemeve.
@@ -1306,8 +1307,8 @@ NoEventOrNoAuditSetup=Asnjë ngjarje sigurie nuk është regjistruar. Kjo ësht
 NoEventFoundWithCriteria=Asnjë ngjarje sigurie nuk është gjetur për këtë kriter kërkimi.
 SeeLocalSendMailSetup=Shikoni konfigurimin tuaj lokal të postës elektronike
 BackupDesc=Një kopje rezervë <b>i plotë</b> e një instalimi Dolibarr kërkon dy hapa.
-BackupDesc2=Rezervoni përmbajtjen e drejtorisë "documents" (<b>%s<span class='notranslate'>b09a4b739f17f) që përmban të gjithë skedarët e ngarkuar dhe të krijuar. Kjo do të përfshijë gjithashtu të gjithë skedarët e grumbullimit të krijuar në Hapin 1. Ky operacion mund të zgjasë disa minuta.
-BackupDesc3=Rezervoni strukturën dhe përmbajtjen e bazës së të dhënave tuaja (<b>%s<span class='notranslate'>b09a4b739f17f8z) në</s0 një skedar hale. Për këtë, mund të përdorni asistentin e mëposhtëm.
+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=Drejtoria e arkivuar duhet të ruhet në një vend të sigurt.
 BackupDescY=Skedari i krijuar i deponimit duhet të ruhet në një vend të sigurt.
 BackupPHPWarning=Rezervimi nuk mund të garantohet me këtë metodë. E mëparshme e rekomanduar.
@@ -1371,7 +1372,7 @@ SendmailOptionMayHurtBuggedMTA=Funksioni për të dërguar email duke përdorur
 TranslationSetup=Vendosja e përkthimit
 TranslationKeySearch=Kërkoni një çelës ose varg përkthimi
 TranslationOverwriteKey=Mbishkruani një varg përkthimi
-TranslationDesc=Si të vendosni gjuhën e ekranit:<br>* Parazgjedhja/sistem mbarë: menyja <strong>Home -> Konfigurimi -> Ekrani</strong><br>* Për përdorues: Klikoni në emrin e përdoruesit në krye të ekranit dhe modifikoni b0e7843947c</0 span>Konfigurimi i ekranit të përdoruesit<span class='notranslate'></strong> skeda në kartën e përdoruesit.
+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=Ju gjithashtu mund të anashkaloni vargjet që plotësojnë tabelën e mëposhtme. Zgjidhni gjuhën tuaj nga "%s", futni vargun e çelësit të përkthimit në "%s" dhe përkthimin tuaj të ri në "%s"
 TranslationOverwriteDesc2=Mund të përdorni skedën tjetër për t'ju ndihmuar të dini se cilin çelës përkthimi të përdorni
 TranslationString=Varg përkthimi
@@ -1379,9 +1380,9 @@ CurrentTranslationString=Vargu aktual i përkthimit
 WarningAtLeastKeyOrTranslationRequired=Kërkohet një kriter kërkimi të paktën për çelësin ose vargun e përkthimit
 NewTranslationStringToShow=Varg i ri përkthimi për t'u shfaqur
 OriginalValueWas=Përkthimi origjinal është mbishkruar. Vlera origjinale ishte:<br><br>%s
-TransKeyWithoutOriginalValue=Detyruat një përkthim të ri për çelësin e përkthimit '<strong>%s<span class='notranslate'>b0a65d071f6fc9>'s që nuk ekziston në asnjë skedar gjuhësor
+TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
 TitleNumberOfActivatedModules=Modulet e aktivizuara
-TotalNumberOfActivatedModules=Modulet e aktivizuara: <b>%s</b></span'notranslate'> ><b>%s</b>
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Duhet të aktivizoni të paktën 1 modul
 YouMustEnableTranslationOverwriteBefore=Së pari duhet të aktivizoni mbishkrimin e përkthimit që të lejohet të zëvendësojë një përkthim
 ClassNotFoundIntoPathWarning=Klasa %s nuk u gjet në shtegun PHP
@@ -1397,7 +1398,7 @@ SearchOptim=Optimizimi i kërkimit
 YouHaveXObjectUseComboOptim=Ju keni %s %s në bazën e të dhënave. Mund të shkoni në konfigurimin e modulit për të mundësuar ngarkimin e listës së kombinuar në ngjarjen e shtypur.
 YouHaveXObjectUseSearchOptim=Ju keni %s %s në bazën e të dhënave. Mund të shtoni konstanten %s në 1 në Home-Setup-Other.
 YouHaveXObjectUseSearchOptimDesc=Kjo kufizon kërkimin në fillim të vargjeve, gjë që bën të mundur që baza e të dhënave të përdorë indekse dhe ju duhet të merrni një përgjigje të menjëhershme.
-YouHaveXObjectAndSearchOptimOn=Ju keni %s %s në bazën e të dhënave dhe konstante %s është caktuar në <span> span class='notranslate'>%s</span> në Home-Setup-Other.
+YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
 BrowserIsOK=Po përdorni shfletuesin e internetit %s. Ky shfletues është në rregull për sigurinë dhe performancën.
 BrowserIsKO=Po përdorni shfletuesin e internetit %s. Ky shfletues njihet si një zgjedhje e keqe për sigurinë, performancën dhe besueshmërinë. Ne rekomandojmë përdorimin e Firefox, Chrome, Opera ose Safari.
 PHPModuleLoaded=Komponenti PHP %s është ngarkuar
@@ -1424,8 +1425,8 @@ DisableForgetPasswordLinkOnLogonPage=Mos e shfaq lidhjen "Fjalëkalimi i harruar
 UsersSetup=Konfigurimi i modulit të përdoruesve
 UserMailRequired=Kërkohet email për të krijuar një përdorues të ri
 UserHideInactive=Fshih përdoruesit joaktivë nga të gjitha listat e kombinuara të përdoruesve (Nuk rekomandohet: kjo mund të thotë që nuk do të mund të filtrosh ose të kërkosh përdorues të vjetër në disa faqe)
-UserHideExternal=Hide external users (not linked to a third party) from all combo lists of users (Not recommended: this may means you won't be able to filter or search on external users on some pages)
-UserHideNonEmployee=Hide non employee users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on non employee users on some pages)
+UserHideExternal=Fshih përdoruesit e jashtëm (jo të lidhur me një palë të tretë) nga të gjitha listat e kombinuara të përdoruesve (Nuk rekomandohet: kjo mund të thotë që nuk do të mund të filtrosh ose të kërkosh te përdoruesit e jashtëm në disa faqe)
+UserHideNonEmployee=Fshih përdoruesit jo punonjës nga të gjitha listat e kombinuara të përdoruesve (Nuk rekomandohet: kjo mund të thotë që nuk do të mund të filtrosh ose të kërkosh te përdoruesit jo punonjës në disa faqe)
 UsersDocModules=Modelet e dokumenteve për dokumentet e krijuara nga të dhënat e përdoruesit
 GroupsDocModules=Modelet e dokumenteve për dokumentet e krijuara nga një rekord grupi
 ##### HRM setup #####
@@ -1663,7 +1664,7 @@ LDAPDescUsers=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pem
 LDAPDescGroups=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në grupet Dolibarr.
 LDAPDescMembers=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në modulin e anëtarëve Dolibarr.
 LDAPDescMembersTypes=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në llojet e anëtarëve Dolibarr.
-LDAPDescValues=Vlerat e shembujve janë të dizajnuara për <b>OpenLDAP</b> me skemat e ngarkuara në vijim: <span class='notranslate'873>b650 core.schema, cosine.schema, inetorgperson.schema</b>). Nëse përdorni ato vlera dhe OpenLDAP, modifikoni skedarin tuaj të konfigurimit LDAP <b>slapd.conf</b> që të ketë të gjitha skemat e ngarkuara.
+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=Për një akses të vërtetuar (për shembull për një akses shkrimi)
 PerfDolibarr=Raporti i konfigurimit/optimizimit të performancës
 YouMayFindPerfAdviceHere=Kjo faqe ofron disa kontrolle ose këshilla në lidhje me performancën.
@@ -1815,7 +1816,7 @@ DetailTarget=Synimi për lidhjet (_blank krye hap një dritare të re)
 DetailLevel=Niveli (-1: menyja e sipërme, 0: menyja me kokë, >0 menyja dhe nënmenyja)
 ModifMenu=Ndryshimi i menysë
 DeleteMenu=Fshi hyrjen e menysë
-ConfirmDeleteMenu=Jeni të sigurt që dëshironi të fshini hyrjen e menysë <b>%s<span class='notranslate'></b></s?
+ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
 FailedToInitializeMenu=Inicializimi i menysë dështoi
 ##### Tax #####
 TaxSetup=Krijimi i modulit të taksave, taksave sociale ose fiskale dhe dividentëve
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Mos e eksportoni ngjarje më të vjetër se
 SecurityKey = Çelësi i sigurisë
 ##### ClickToDial #####
 ClickToDialSetup=Kliko Për të thirrur konfigurimin e modulit
-ClickToDialUrlDesc=URL thirret kur kryhet një klikim në foton e telefonit. Në URL, mund të përdorni etiketat<br><b>__PHONETO__b09a4b78z0f1 zëvendësohet me numrin e telefonit të personit që do të telefonojë<span class='notranslate'><br><b>__PHONEFROM__b09f17f789 that do të zëvendësohet me numrin e telefonit të personit që telefonon (i juaji)<span class='notranslate'><br><b>__LOGIN__<span class='notranslate'8f3091 span> që do të zëvendësohet me login clicktodial (të përcaktuar në kartën e përdoruesit)<br><b>__PASS__<span class='notrans </b></span> që do të zëvendësohet me fjalëkalimin e klikimit (të përcaktuar në kartën e përdoruesit).
+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=Ky modul ndryshon numrat e telefonit, kur përdorni një kompjuter desktop, në lidhje të klikueshme. Një klikim do të telefonojë numrin. Kjo mund të përdoret për të nisur një telefonatë kur përdorni një telefon të butë në desktop ose kur përdorni një sistem CTI bazuar në protokollin SIP për shembull. Shënim: Kur përdorni një smartphone, numrat e telefonit janë gjithmonë të klikueshëm.
 ClickToDialUseTelLink=Përdorni vetëm një lidhje "tel:" në numrat e telefonit
 ClickToDialUseTelLinkDesc=Përdoreni këtë metodë nëse përdoruesit tuaj kanë një telefon të butë ose një ndërfaqe softuerike, të instaluar në të njëjtin kompjuter si shfletuesi dhe të thirrur kur klikoni në një lidhje që fillon me "tel:" në shfletuesin tuaj. Nëse keni nevojë për një lidhje që fillon me "sip:" ose një zgjidhje të plotë të serverit (nuk ka nevojë për instalim lokal të softuerit), duhet ta vendosni këtë në "Jo" dhe të plotësoni fushën tjetër.
@@ -1920,7 +1921,7 @@ IfSetToYesDontForgetPermission=Nëse vendoset në një vlerë jo null, mos harro
 GeoIPMaxmindSetup=Konfigurimi i modulit GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Rruga drejt skedarit që përmban përkthimin e ip-së së Maxmind në shtet
 NoteOnPathLocation=Vini re se skedari juaj i të dhënave ip në shtet duhet të jetë brenda një drejtorie që mund të lexojë PHP-ja juaj (Kontrollo konfigurimin e PHP open_basedir dhe lejet e sistemit të skedarëve).
-YouCanDownloadFreeDatFileTo=Ju mund të shkarkoni një <b>version demo falas</b> të skedarit të vendit të Maxmind GeoIP në <span class='notranslate'8000<4bec /span>.
+YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=Mund të shkarkoni gjithashtu një version më të plotë <b>, me përditësime,</b> të skedarit të vendit Maxmind GeoIP në %s.
 TestGeoIPResult=Testi i një IP konvertimi -> vendi
 ##### Projects #####
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=Instalimi i modulit të jashtëm nuk ësh
 SomethingMakeInstallFromWebNotPossible2=Për këtë arsye, procesi i përmirësimit i përshkruar këtu është një proces manual që mund të kryejë vetëm një përdorues i privilegjuar.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalimi ose zhvillimi i moduleve të jashtme ose uebsajteve dinamike, nga aplikacioni, aktualisht është i bllokuar për qëllime sigurie. Ju lutemi na kontaktoni nëse duhet ta aktivizoni këtë veçori.
 InstallModuleFromWebHasBeenDisabledByFile=Instalimi i modulit të jashtëm nga aplikacioni është çaktivizuar nga administratori juaj. Duhet t'i kërkoni atij të heqë skedarin <strong>%s</strong> veçori.
-ConfFileMustContainCustom=Instalimi ose ndërtimi i një moduli të jashtëm nga aplikacioni duhet të ruani skedarët e modulit në direktorinë <strong>%s </strong>. Për ta përpunuar këtë direktori nga Dolibarr, duhet të konfiguroni <strong>conf/conf.php</strong> për të shtuar 2 linjat e direktivës: <br><strong>$dolibarr_main_url_root_alt='/custom';<span class='notranslate'09span class='notranslate'09f1000 ='notranslate'><br></span><strong>$dolibarr_main_document_root_alt='b0ecb2ec8787f94; '></strong>
+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=Theksoni linjat e tabelës kur lëvizja e miut kalon
 HighlightLinesColor=Theksoni ngjyrën e rreshtit kur miu kalon sipër (përdorni 'ffffff' për të mos theksuar)
 HighlightLinesChecked=Theksoni ngjyrën e rreshtit kur është e kontrolluar (përdorni 'ffffff' për të mos theksuar)
@@ -2065,7 +2066,7 @@ DetectionNotPossible=Zbulimi nuk është i mundur
 UrlToGetKeyToUseAPIs=Url për të marrë token për të përdorur API (pasi të merret token, ai ruhet në tabelën e përdoruesve të bazës së të dhënave dhe duhet të sigurohet në çdo thirrje API)
 ListOfAvailableAPIs=Lista e API-ve të disponueshme
 activateModuleDependNotSatisfied=Moduli "%s" varet nga moduli "%s", që mungon, kështu që moduli " %1$s" mund të mos funksionojë siç duhet. Ju lutemi instaloni modulin "%2$s" ose çaktivizoni modulin "%1$s" nëse doni të jeni të sigurt nga çdo surprizë
-CommandIsNotInsideAllowedCommands=Komanda që po përpiqeni të ekzekutoni nuk është në listën e komandave të lejuara të përcaktuara në parametrin <strong>$dolibarr_main_restrict_os_commandsb0a65d071f6fc9> file class='notranslate'><strong>conf.php</strong>.
+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=Faqja e uljes
 SamePriceAlsoForSharedCompanies=Nëse përdorni një modul shumëkompani, me zgjedhjen "Çmim i vetëm", çmimi do të jetë gjithashtu i njëjtë për të gjitha kompanitë nëse produktet ndahen midis mjediseve.
 ModuleEnabledAdminMustCheckRights=Moduli është aktivizuar. Lejet për modul(et) e aktivizuara iu dhanë vetëm përdoruesve të administratorëve. Mund t'ju duhet t'u jepni leje përdoruesve ose grupeve të tjerë manualisht nëse është e nevojshme.
@@ -2176,7 +2177,7 @@ CreateCandidature=Krijo aplikim për punë
 FormatZip=Zip
 MainMenuCode=Kodi i hyrjes në meny (menyja kryesore)
 ECMAutoTree=Shfaq pemën automatike ECM
-OperationParamDesc=Përcaktoni rregullat për t'u përdorur për të nxjerrë disa të dhëna ose për të vendosur vlera për t'u përdorur për operim.<br><br>Shembull për të nxjerrë një emër kompanie nga subjekti i emailit në një variabël të përkohshëm:<br>tmp_var=EXTRACT:SUBJECT:Mesazhi nga kompania ([^\n]*)<br><br>Shembuj për të vendosur vetitë e një objekti për të krijuar:b0342fccfda<9 /span>objproperty1=SET:një vlerë e koduar e fortë<span class='notranslate'><br>objproperty2=SET:__tmp_var__<br></spanTYaSE/vlera provalty:obj vendoset vetëm nëse vetia nuk është përcaktuar tashmë)<span class='notranslate'><br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:Emri i kompanisë është\\DY: s([^\\s]*)<br><br>Përdor një rresht të ri për të nxjerrë ose vendosur disa veti.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
 OpeningHours=Orari i hapjes
 OpeningHoursDesc=Shkruani këtu orarin e rregullt të hapjes së kompanisë suaj.
 ResourceSetup=Konfigurimi i modulit të Burimeve
@@ -2262,7 +2263,7 @@ ModuleActivatedMayExposeInformation=Kjo shtesë PHP mund të ekspozojë të dhë
 ModuleActivatedDoNotUseInProduction=Një modul i krijuar për zhvillimin është aktivizuar. Mos e aktivizoni në një mjedis prodhimi.
 CombinationsSeparator=Karakteri ndarës për kombinimet e produkteve
 SeeLinkToOnlineDocumentation=Shih lidhjen me dokumentacionin online në menunë e sipërme për shembuj
-SHOW_SUBPRODUCT_REF_IN_PDF=Nëse veçoria "%s" e modulit <b>%s<s class 'notranslate'></b></span> është përdorur, tregoni detajet e nënprodukteve të një komplete në PDF.
+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=Kontaktoni bankën tuaj për të marrë këtë ID
 AdvancedModeOnly=Leja disponohet vetëm në modalitetin e lejeve të avancuara
 ConfFileIsReadableOrWritableByAnyUsers=Skedari conf është i lexueshëm ose i shkruhet nga çdo përdorues. Jepni leje vetëm përdoruesit dhe grupit të serverit të uebit.
@@ -2289,9 +2290,9 @@ DatabasePasswordObfuscated=Fjalëkalimi i bazës së të dhënave është i turb
 DatabasePasswordNotObfuscated=Fjalëkalimi i bazës së të dhënave NUK është i turbullt në skedarin conf
 APIsAreNotEnabled=Modulet e API-ve nuk janë të aktivizuara
 YouShouldSetThisToOff=Ju duhet ta vendosni këtë në 0 ose jo
-InstallAndUpgradeLockedBy=Instalimi dhe përmirësimet janë të kyçura nga skedari <b>%s<span class='notranslate'>b09a4b739f17f
-InstallLockedBy=Instalimi/Rinstalimi është i kyçur nga skedari <b>%s<span class='notranslate'>b09a4b739f17>b09a4b739f17>
-InstallOfAddonIsNotBlocked=Instalimet e shtesave nuk janë të kyçura. Krijo një skedar <b>installmodules.lock</b> në direktoriumin b0aee83panslateb0aee833305 ='notranslate'>%s</span></b> për të bllokuar instalimet e shtesave/moduleve të jashtme.
+InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
+InstallLockedBy=Install/Reinstall is locked by the file <b>%s</b>
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Zbatimi i vjetër
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Nëse janë aktivizuar disa module pagese në internet (Paypal, Stripe, ...), shtoni një lidhje në PDF për të bërë pagesën në internet
 DashboardDisableGlobal=Çaktivizo globalisht të gjithë gishtat e mëdhenj të objekteve të hapura
@@ -2372,7 +2373,7 @@ MaxNumberOfPostOnPublicPagesByIP=Numri maksimal i postimeve në faqet publike me
 CIDLookupURL=Moduli sjell një URL që mund të përdoret nga një mjet i jashtëm për të marrë emrin e një pale të tretë ose kontaktit nga numri i tij i telefonit. URL-ja për t'u përdorur është:
 ScriptIsEmpty=Skenari është bosh
 ShowHideTheNRequests=Shfaq/fsheh %s kërkesat SQL
-DefinedAPathForAntivirusCommandIntoSetup=Përcaktoni një shteg për një program antivirus në <b>%s<span class='notranslate'></b></s
+DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
 TriggerCodes=Ngjarjet e shkaktuara
 TriggerCodeInfo=Futni këtu kodin(et) e aktivizimit që duhet të gjenerojnë një postim të një kërkese në ueb (lejohen vetëm URL-të e jashtme). Mund të futni disa kode nxitëse të ndara me presje.
 EditableWhenDraftOnly=Nëse nuk është zgjedhur, vlera mund të modifikohet vetëm kur objekti ka një status draft
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Nuk është krijuar si parazgjedh
 CSSPage=Stili CSS
 Defaultfortype=E paracaktuar
 DefaultForTypeDesc=Modeli përdoret si parazgjedhje kur krijoni një email të ri për llojin e shabllonit
-OptionXShouldBeEnabledInModuleY=Opsioni "<b>%s</b>" duhet të jetë <pan classable ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Opsioni "<b>%s</b>" është aktivizuar në module 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=Lejo nënshkrimin On Line
 AtBottomOfPage=Në fund të faqes
 FailedAuth=vërtetimet e dështuara
@@ -2428,8 +2429,17 @@ ParametersForTestEnvironment=Parametrat për mjedisin e testimit
 TryToKeepOnly=Mundohuni të mbani vetëm %s
 RecommendedForProduction=Rekomandohet për prodhim
 RecommendedForDebug=Rekomandohet për korrigjimin e gabimeve
-UrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the virtual host server must act as a proxy on the standard URL)
-ExportUseForce=Use the parameter -f
-ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
-CustomPrompt=Custom prompts
+UrlPublicInterfaceLabelAdmin=URL alternative për ndërfaqen publike
+UrlPublicInterfaceHelpAdmin=Është e mundur të përcaktohet një pseudonim për serverin e uebit dhe kështu të vihet në dispozicion ndërfaqja publike me një URL tjetër (serveri virtual i hostit duhet të veprojë si një përfaqësues në URL-në standarde)
+ExportUseForce=Përdorni parametrin -f
+ExportUseForceHelp=Detyroni të vazhdoni eksportin edhe kur zbulohet një gabim (Rezervimi mund të mos jetë i besueshëm)
+CustomPrompt=Kërkesat e personalizuara
+AiDescription=Karakteristikat e AI (Inteligjencës Artificiale).
+AiDescriptionLong=Ofron veçori të AI (Inteligjencës Artificiale) në pjesë të ndryshme të aplikacionit. Nevojë për API të jashtme të AI.
+AI_KEY_API_CHATGPT= Çelësi për api ChatGPT IA
+AiSetup=Konfigurimi i modulit AI
+AiCustomPrompt=Kërkesa doganore e AI
+AI_CONFIGURATIONS_PROMPT=Prompt i personalizuar
+ImageGeneration=Gjenerimi i imazhit
+AIPromptForFeatures=Kërkesat me porosi të AI për veçori
+EnterAnIP=Futni një adresë IP
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index c51f0d39e95..a17c4e16f30 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -137,7 +137,7 @@ DateActionEnd=Data e përfundimit
 AgendaUrlOptions1=Ju gjithashtu mund të shtoni parametrat e mëposhtëm për të filtruar daljen:
 AgendaUrlOptions3=<b>logina=%s</b> për të kufizuar një veprim të përdoruesit <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> për të kufizuar veprimet përdoruesi <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> për t'u caktuar veprimeve të kufizuara të përdoruesit span class='notranslate'><b></span>%s</b> (pronari dhe të tjerët).
+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> për të kufizuar daljen në veprimet e lidhura me projektin <span class='058</0epanslate'38>b. __PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> për të përjashtuar ngjarjet automatike.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> për të përfshirë ngjarjet e festave.
@@ -161,7 +161,7 @@ AddEvent=Krijo ngjarje
 MyAvailability=Disponueshmëria ime
 ActionType=Lloji i ngjarjes
 DateActionBegin=Data e fillimit të ngjarjes
-ConfirmCloneEvent=Jeni i sigurt që dëshironi të klononi ngjarjen <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Përsëriteni ngjarjen
 OnceOnly=Vetëm njëherë
 EveryDay=Çdo ditë
@@ -201,4 +201,4 @@ AppointmentDuration = Kohëzgjatja e takimit: %s
 BookingSuccessfullyBooked=Rezervimi juaj është ruajtur
 BookingReservationHourAfter=Ne konfirmojmë rezervimin e takimit tonë në datën %s
 BookcalBookingTitle=Takimi online
-Transparency = Transparency
+Transparency = Transparenca
diff --git a/htdocs/langs/sq_AL/assets.lang b/htdocs/langs/sq_AL/assets.lang
index cdd230db3a5..34d85c3e9c9 100644
--- a/htdocs/langs/sq_AL/assets.lang
+++ b/htdocs/langs/sq_AL/assets.lang
@@ -87,8 +87,8 @@ AssetTypeInProgress=Në vazhdim
 AssetTypeFinancial=Financiare
 AssetNotDepreciated=I pa amortizuar
 AssetDisposal=Asgjesimi
-AssetConfirmDisposalAsk=Jeni i sigurt që dëshironi të asgjësoni aktivin <b> %s<span class='notranslate'>b09a4b739f17f>z?
-AssetConfirmReOpenAsk=Jeni i sigurt që dëshironi të rihapni aktivin <b> %s<span class='notranslate'>b09a4b739f17f>z?
+AssetConfirmDisposalAsk=Are you sure you want to dispose of the asset <b> %s</b>?
+AssetConfirmReOpenAsk=Are you sure you want to reopen the asset <b> %s</b>?
 
 #
 # Asset status
@@ -122,7 +122,6 @@ AssetDepreciationOptionDepreciationTypeLinear=Linear
 AssetDepreciationOptionDepreciationTypeDegressive=Degresive
 AssetDepreciationOptionDepreciationTypeExceptional=Të jashtëzakonshme
 AssetDepreciationOptionDegressiveRate=Shkalla degresive
-AssetDepreciationOptionAcceleratedDepreciation=Amortizimi i përshpejtuar (taksa)
 AssetDepreciationOptionDuration=Kohëzgjatja
 AssetDepreciationOptionDurationType=Kohëzgjatja e llojit
 AssetDepreciationOptionDurationTypeAnnual=Vjetore
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index c6ce54a904c..e6d2a79f3d6 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=Transferimi i brendshëm
 TransferDesc=Përdorni transferimin e brendshëm për të transferuar nga një llogari në tjetrën, aplikacioni do të shkruajë dy regjistrime: një debi në llogarinë burimore dhe një kredi në llogarinë e synuar. E njëjta shumë, etiketë dhe datë do të përdoren për këtë transaksion.
 TransferFrom=Nga
 TransferTo=te
-TransferFromToDone=Një transferim nga <b>%s</b>'no në <span' class='notranslate' ><b></span>%s</b> nga %s</b> nga b30span838 'notranslate'>%s</b> %s është regjistruar.
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=Dërguesi
 ValidateCheckReceipt=Të vërtetohet kjo faturë çeku?
 ConfirmValidateCheckReceipt=Jeni i sigurt që dëshironi ta dorëzoni këtë faturë çeku për vërtetim? Asnjë ndryshim nuk do të jetë i mundur pasi të vërtetohet.
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 6d2b95602c0..bc2a1723665 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=Mënyra e pagesës (kodi)
 LabelPaymentMode=Mënyra e pagesës (etiketa)
 PaymentModeShort=Metoda e pagesës
 PaymentTerm=Kushtet e pagesës
+IdPaymentTerm=Afati i pagesës (id)
+CodePaymentTerm=Afati i pagesës (kodi)
+LabelPaymentTerm=Afati i pagesës (etiketa)
 PaymentConditions=Kushtet e pagesës
 PaymentConditionsShort=Kushtet e pagesës
 PaymentAmount=Shuma e pagesës
@@ -185,12 +188,12 @@ SuppliersDraftInvoices=Draft faturat e shitësit
 Unpaid=E papaguar
 ErrorNoPaymentDefined=Gabim Nuk është përcaktuar pagesa
 ConfirmDeleteBill=Je i sigurt që dëshiron ta fshish këtë faturë?
-ConfirmValidateBill=Jeni i sigurt që dëshironi ta vërtetoni këtë faturë me referencën <b>%s<span class='notranslate'>b09a4b739f17 >?
-ConfirmUnvalidateBill=Jeni i sigurt që dëshironi të ndryshoni faturën <b>%s<span class='notranslate'></b> në statusin e drafteve ?
-ConfirmClassifyPaidBill=Jeni të sigurt që dëshironi të ndryshoni faturën <b>%s<span class='notranslate'></b> statusin e paguar</s0 ?
-ConfirmCancelBill=Jeni i sigurt që dëshironi ta anuloni faturën <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the 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=Pse dëshironi ta klasifikoni këtë faturë "të braktisur"?
-ConfirmClassifyPaidPartially=Jeni të sigurt që dëshironi të ndryshoni faturën <b>%s<span class='notranslate'></b> statusin e paguar</s0 ?
+ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
 ConfirmClassifyPaidPartiallyQuestion=Kjo faturë nuk është paguar plotësisht. Cila është arsyeja e mbylljes së kësaj faturë?
 ConfirmClassifyPaidPartiallyReasonAvoir=E mbetur pa pagesë <b>(%s %s</span' class=>) ></b> është një zbritje e dhënë sepse pagesa është bërë përpara afatit. E rregulloj TVSH-në me kredit.
 ConfirmClassifyPaidPartiallyReasonDiscount=E mbetur pa pagesë <b>(%s %s</span' class=>) ></b> është një zbritje e dhënë sepse pagesa është bërë përpara afatit.
@@ -207,14 +210,14 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Në disa vende, kjo zgjedhje m
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Përdoreni këtë zgjedhje nëse të gjitha të tjerat nuk ju përshtaten
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Një <b>klient i keq</b> është një klient që refuzon të paguajë borxhin e tij.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Kjo zgjedhje përdoret kur pagesa nuk është e plotë sepse disa produkte janë kthyer
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Shuma e papaguar është <b>tarifat bankare ndërmjetëse</b>, e zbritur direkt nga <span class='notranslate'87333850b065 >shuma e saktë</b> e paguar nga Klienti.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Shuma e papaguar nuk do të paguhet kurrë pasi është një taksë e mbajtur në burim
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Përdoreni këtë zgjedhje nëse të gjitha të tjerat nuk janë të përshtatshme, për shembull në situatën e mëposhtme:<br>- pagesa nuk është e përfunduar sepse disa produkte janë dërguar prapa<br>- shuma e pretenduar shumë e rëndësishme sepse u harrua një zbritje<br>Në të gjitha rastet, shuma e mbideklaruar duhet të korrigjohet në sistemin e kontabilitetit duke krijuar një shënim krediti.
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=Një <b>furnizues i keq</b> është një furnizues që ne refuzojmë ta paguajmë.
 ConfirmClassifyAbandonReasonOther=Të tjera
 ConfirmClassifyAbandonReasonOtherDesc=Kjo zgjedhje do të përdoret në të gjitha rastet e tjera. Për shembull sepse planifikoni të krijoni një faturë zëvendësuese.
-ConfirmCustomerPayment=A e konfirmoni këtë hyrje pagese për <b>%s</b> <span class='notranslate'> 'notranslate'>%s?
-ConfirmSupplierPayment=A e konfirmoni këtë hyrje pagese për <b>%s</b> <span class='notranslate'> 'notranslate'>%s?
+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=Je i sigurt që dëshiron ta vërtetosh këtë pagesë? Asnjë ndryshim nuk mund të bëhet pasi pagesa të vërtetohet.
 ValidateBill=Vërtetoni faturën
 UnvalidateBill=Të pavlefshme faturë
@@ -268,6 +271,8 @@ NoDraftBills=Nuk ka draft fatura
 NoOtherDraftBills=Nuk ka draft fatura të tjera
 NoDraftInvoices=Nuk ka draft fatura
 RefBill=Faturë ref
+RefSupplierBill=Fatura e furnizuesit ref
+SupplierOrderCreateBill=Krijo faturë
 ToBill=Për të faturuar
 RemainderToBill=Pjesa e mbetur për faturim
 SendBillByMail=Dërgo faturë me email
@@ -352,6 +357,7 @@ HelpAbandonOther=Kjo shumë është braktisur pasi ishte një gabim (klient i ga
 IdSocialContribution=ID e pagesës së tatimit social/fiskal
 PaymentId=ID-ja e pagesës
 PaymentRef=Pagesa ref.
+SourceInvoiceId=ID-ja e faturës burimore
 InvoiceId=ID-ja e faturës
 InvoiceRef=Faturë ref.
 InvoiceDateCreation=Data e krijimit të faturës
@@ -366,12 +372,12 @@ PaymentNumber=Numri i pagesës
 RemoveDiscount=Hiq zbritjen
 WatermarkOnDraftBill=Filigram në draft faturat (asgjë nëse është bosh)
 InvoiceNotChecked=Nuk u zgjodh asnjë faturë
-ConfirmCloneInvoice=Jeni i sigurt që dëshironi ta klononi këtë faturë <b>%s<span class='notranslate'>b09a4b739f17f>z?
+ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Veprimi u çaktivizua sepse fatura është zëvendësuar
 DescTaxAndDividendsArea=Kjo zonë paraqet një përmbledhje të të gjitha pagesave të bëra për shpenzime të veçanta. Këtu përfshihen vetëm të dhënat me pagesa gjatë vitit fiks.
 NbOfPayments=Numri i pagesave
 SplitDiscount=Ndani zbritjen në dysh
-ConfirmSplitDiscount=Jeni i sigurt që dëshironi ta ndani këtë zbritje të <b>%sb09a4b739f17f8z <0 span class='notranslate'>%s në dy zbritje më të vogla?
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=Shuma e hyrjes për secilën nga dy pjesët:
 TotalOfTwoDiscountMustEqualsOriginal=Totali i dy zbritjeve të reja duhet të jetë i barabartë me shumën fillestare të zbritjes.
 ConfirmRemoveDiscount=Je i sigurt që dëshiron ta heqësh këtë zbritje?
@@ -397,7 +403,7 @@ FrequencyPer_d=Çdo %s ditë
 FrequencyPer_m=Çdo %s muaj
 FrequencyPer_y=Çdo %s vjet
 FrequencyUnit=Njësia e frekuencës
-toolTipFrequency=Shembuj:<br><b>Seti 7, Ditab09a4b739f17panvoice: jepi një</i>s çdo 7 ditë<span class='notranslate'><br><b>Set 3, muaj<span class='notranslate'>b09a4b739f17f8z: jepni një faturë çdo 3 muaj
+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=Data për gjenerimin e faturës së ardhshme
 NextDateToExecutionShort=Data e gjeneratës së ardhshme.
 DateLastGeneration=Data e gjeneratës së fundit
@@ -563,7 +569,7 @@ PDFCrabeDescription=Shablloni i faturës PDF Crabe. Një shabllon i plotë fatur
 PDFSpongeDescription=Shablloni i faturës PDF Sfungjeri. Një model i plotë faturë
 PDFCrevetteDescription=Shablloni PDF i faturës Crevette. Një model i plotë faturë për faturat e situatës
 TerreNumRefModelDesc1=Numri i kthimit në formatin %syymm-nnnn për faturat standarde dhe %syymm-nnnn për shënimet e kreditit ku yy është viti mm, është muaj dhe nnnn është një numër auto-rritës sekuencial pa ndërprerje dhe pa kthim në 0
-MarsNumRefModelDesc1=Numri i kthimit në formatin %syymm-nnnn për faturat standarde, %syymm-nnnn për faturat zëvendësuese class=', <span notranslate'>%s</span>yymm-nnnn për faturat e parapagimit dhe %syymm-nnnn për shënimet e kreditit ku yy është vit, mm është muaj dhe nnnn është një sekuencë numri në rritje pa pushim dhe pa kthim në 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 sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Një faturë që fillon me $syymm ekziston tashmë dhe nuk është në përputhje me këtë model sekuence. Hiqeni ose riemërtoni për të aktivizuar këtë modul.
 CactusNumRefModelDesc1=Numri i kthimit në formatin %syymm-nnnn për faturat standarde, %syymm-nnnn për shënimet e kreditit dhe %syymm-nnnn për faturat e parapagimit ku yy është viti, mm është muaji dhe nnnn është një numër i njëpasnjëshëm në rritje automatike pa ndërprerje dhe pa kthim në 0
 EarlyClosingReason=Arsyeja e mbylljes së hershme
@@ -607,7 +613,7 @@ TotalSituationInvoice=Situata totale
 invoiceLineProgressError=Përparimi i linjës së faturës nuk mund të jetë më i madh ose i barabartë me rreshtin tjetër të faturës
 updatePriceNextInvoiceErrorUpdateline=Gabim: përditëso çmimin në linjën e faturës: %s
 ToCreateARecurringInvoice=Për të krijuar një faturë të përsëritur për këtë kontratë, fillimisht krijoni këtë draft faturë, më pas shndërrojeni atë në një model faturë dhe përcaktoni frekuencën për gjenerimin e faturave të ardhshme.
-ToCreateARecurringInvoiceGene=Për të gjeneruar fatura të ardhshme rregullisht dhe manualisht, thjesht shkoni te menyja <strong>%s - b0ecb9fz87f span> - <span class='notranslate'>%s</strong>.
+ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Nëse keni nevojë që fatura të tilla të gjenerohen automatikisht, kërkoni nga administratori juaj të aktivizojë dhe konfigurojë modulin <strong>%s</strong>. Vini re se të dyja metodat (manuale dhe automatike) mund të përdoren së bashku pa rrezik dyfishimi.
 DeleteRepeatableInvoice=Fshi faturën e shabllonit
 ConfirmDeleteRepeatableInvoice=Jeni i sigurt që dëshironi të fshini faturën e shabllonit?
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index df4910cc1b4..95e476ec8f7 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -58,7 +58,7 @@ Numberspad=Tabela e numrave
 BillsCoinsPad=Mbushje e monedhave dhe kartëmonedhave
 DolistorePosCategory=Modulet TakePOS dhe zgjidhje të tjera POS për Dolibarr
 TakeposNeedsCategories=TakePOS ka nevojë për të paktën një kategori produkti për të punuar
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS ka nevojë për të paktën 1 kategori produkti nën kategorinë <b>%s<span class='notranslate'>b09a4b739f17f>z puna
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
 OrderNotes=Mund të shtojë disa shënime për secilin artikull të porositur
 CashDeskBankAccountFor=Llogaria e parazgjedhur për t'u përdorur për pagesat në
 NoPaimementModesDefined=Asnjë modalitet pagese nuk është përcaktuar në konfigurimin e TakePOS
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=Metoda e fuqishme me shumë parametra. Plot i pe
 ByTerminal=Me terminal
 TakeposNumpadUsePaymentIcon=Përdorni ikonën në vend të tekstit në butonat e pagesës të numpad
 CashDeskRefNumberingModules=Moduli i numërimit për shitjet me POS
-CashDeskGenericMaskCodes6 = <br><b>{TN}<bpan class='notranslate'8 etiketa span> përdoret për të shtuar numrin e terminalit
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Bashkoni linjat e të njëjtave produkte
 StartAParallelSale=Filloni një shitje të re paralele
 SaleStartedAt=Shitja filloi në %s
@@ -105,10 +105,10 @@ ControlCashOpening=Hapni dritaren "Control cash box" kur hapni POS-in
 CloseCashFence=Mbyll kontrollin e arkës
 CashReport=Raporti i parave të gatshme
 MainPrinterToUse=Printeri kryesor për t'u përdorur
-MainPrinterToUseMore=empty means the browser printer system
+MainPrinterToUseMore=bosh nënkupton sistemin e printerit të shfletuesit
 OrderPrinterToUse=Porosit printerin për përdorim
 MainTemplateToUse=Modeli kryesor për t'u përdorur
-MainTemplateToUseMore=when not using browser printing system
+MainTemplateToUseMore=kur nuk përdorni sistemin e printimit të shfletuesit
 OrderTemplateToUse=Porosit shabllonin për t'u përdorur
 BarRestaurant=Bar Restorant
 AutoOrder=Porosit nga vetë klienti
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Etiketa e linjës si parazgjedhje në printim pa
 PrintWithoutDetails=Printoni pa detaje
 YearNotDefined=Viti nuk është i përcaktuar
 TakeposBarcodeRuleToInsertProduct=Rregulli i barkodit për të futur produktin
-TakeposBarcodeRuleToInsertProductDesc=Rregulli për nxjerrjen e referencës së produktit + një sasi nga një barkod i skanuar.<br>Nëse është bosh (vlera e parazgjedhur), aplikacioni do të përdorë barkodin e plotë të skanuar për të gjetur produktin.<br><br>Nëse përcaktohet, sintaksa duhet të jetë:<br></spannotranslate' class=' <b>ref:NB+qu:NB+qd:NB+other:NB</b><br> numri i karaktereve që do të përdoren për nxjerrjen e të dhënave nga barkodi i skanuar me:<span class='notranslate'><br><b>refb09f014b  : referenca e produktit<br><b>qub09a4b739f17pan to quantity:</s0 vendos kur fut artikullin (njësitë)<span class='notranslate'><br><b>qdb09a4b739f17f to caktohet kur futet artikulli (dhjetra)<span class='notranslate'><br><b>tjetërb09a4b78z0f1s të tjerë
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Tashmë e shtypur
 HideCategories=Fshih të gjithë seksionin e përzgjedhjes së kategorive
 HideStockOnLine=Fshih aksionet në linjë
@@ -154,5 +154,5 @@ LineDiscount=Zbritje në linjë
 LineDiscountShort=Disku i linjës.
 InvoiceDiscount=Zbritje në faturë
 InvoiceDiscountShort=Disku i faturës.
-TestPrinterDesc=The server will send a simple test page to a ESC/POS printer
-TestPrinterDesc2=The server will send an enhanced test page with image and barcode to a ESC/POS printer
+TestPrinterDesc=Serveri do të dërgojë një faqe të thjeshtë testimi në një printer ESC/POS
+TestPrinterDesc2=Serveri do të dërgojë një faqe testimi të përmirësuar me imazh dhe barkod në një printer ESC/POS
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index b98349e0d84..19c6e163866 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -331,17 +331,17 @@ CustomerRelativeDiscount=Zbritje relative e klientit
 SupplierRelativeDiscount=Zbritje relative nga shitësi
 CustomerRelativeDiscountShort=Zbritje relative
 CustomerAbsoluteDiscountShort=Zbritje absolute
-CompanyHasRelativeDiscount=Ky klient ka një zbritje të paracaktuar prej <b>%s%%</span class=span><span class='notranslate'> 'notranslate'></b>
+CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ky klient nuk ka zbritje relative si parazgjedhje
-HasRelativeDiscountFromSupplier=Ju keni një zbritje të paracaktuar prej <b>%s%%<s class='pan><s notranslate'></b></span> me këtë shitës
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
 HasNoRelativeDiscountFromSupplier=Nuk ka zbritje relative të paracaktuar me këtë shitës
-CompanyHasAbsoluteDiscount=Ky klient ka zbritje të disponueshme (shënime krediti ose pagesa paraprake) për <b>%sb09a17f739f span> <span class='notranslate'>%s
-CompanyHasDownPaymentOrCommercialDiscount=Ky klient ka zbritje të disponueshme (komerciale, pagesa paraprake) për <b>%sb09a4b78z01s > <span class='notranslate'>%s
-CompanyHasCreditNote=Ky klient ka ende shënime krediti për <b>%s</b> <span class='notranslate'> 'notranslate'>%s
+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=Nuk ofrohet zbritje/kredi nga ky shitës
-HasAbsoluteDiscountFromSupplier=Ju keni zbritje në dispozicion (shënime krediti ose pagesa paraprake) për <b>%sb09a17b739f > <span class='notranslate'>%s nga ky shitës
-HasDownPaymentOrCommercialDiscountFromSupplier=Keni zbritje të disponueshme (komerciale, parapagime) për <b>%sb09a4b78z0f17> <span class='notranslate'>%s nga ky shitës
-HasCreditNoteFromSupplier=Ju keni shënime krediti për <b>%s</b></span= class'notranslate's '>%s nga ky shitës
+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=Ky klient nuk disponon kredi me zbritje
 CustomerAbsoluteDiscountAllUsers=Zbritje absolute të klientëve (të dhëna nga të gjithë përdoruesit)
 CustomerAbsoluteDiscountMy=Zbritje absolute të klientëve (të dhënë nga ju)
@@ -407,7 +407,7 @@ VATIntraCheck=Kontrollo
 VATIntraCheckDesc=ID-ja e TVSH-së duhet të përfshijë prefiksin e shtetit. Lidhja <b>%s</b> përdor kontrolluesin evropian VAT) (VIES) e cila kërkon qasje në internet nga serveri Dolibarr.
 VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Kontrolloni ID-në e TVSH-së brenda Komunitetit në faqen e internetit të Komisionit Evropian
-VATIntraManualCheck=Ju gjithashtu mund të kontrolloni manualisht në faqen e internetit të Komisionit Evropian <a href="%s" target="_blank" rel="noopener noreferrer">%s<span class='notranslate'></a></s>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrolli nuk është i mundur. Shërbimi i kontrollit nuk ofrohet nga shteti anëtar (%s).
 NorProspectNorCustomer=As perspektivë, as klient
 JuridicalStatus=Lloji i subjektit të biznesit
@@ -465,7 +465,7 @@ AddAddress=Shto adresën
 SupplierCategory=Kategoria e shitësve
 JuridicalStatus200=I pavarur
 DeleteFile=Fshi skedarin
-ConfirmDeleteFile=Jeni të sigurt që dëshironi ta fshini këtë skedar <b>%s<span class='notranslate'></b></s?
+ConfirmDeleteFile=Are you sure you want to delete this file <b>%s</b>?
 AllocateCommercial=I caktuar për përfaqësuesin e shitjeve
 Organization=Organizimi
 FiscalYearInformation=Viti fiskal
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 7af8c2cedb2..0531f874443 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -158,26 +158,27 @@ ConfirmDeleteVAT=Jeni i sigurt që dëshironi të fshini këtë deklaratë të T
 ConfirmDeleteSalary=Je i sigurt që dëshiron ta fshish këtë pagë?
 ConfirmDeleteVariousPayment=Jeni i sigurt që dëshironi ta fshini këtë pagesë të ndryshme?
 ExportDataset_tax_1=Taksat dhe pagesat sociale dhe fiskale
-CalcModeVATDebt=Modaliteti <b>%sTVSH në kontabilitetin e angazhimit%s class='notranslate<span '></b></span>.
-CalcModeVATEngagement=Modaliteti <b>%sTVSH-ja mbi të ardhurat-shpenzimetb0ecb2ec87f49><panfz0</span notranslate'></b>.
+CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Analiza e dokumenteve të njohura të regjistruara
 CalcModeEngagement=Analiza e pagesave të njohura të regjistruara
+CalcModePayment=Analiza e pagesave të njohura të regjistruara
 CalcModeBookkeeping=Analiza e të dhënave të regjistruara në tabelën e librit të kontabilitetit.
 CalcModeNoBookKeeping=Edhe nëse ato ende nuk janë llogaritur në Ledger
-CalcModeLT1= Modaliteti <b>%sRE në faturat e klientëve - faturat e furnitorëveb0ecb2ec87f49f ='notranslate'></b>
-CalcModeLT1Debt=Modaliteti <b>%sRE në faturat e klientitb0ecb2ec87f49fzpan class='notranslate'spannotranslate '></b>
-CalcModeLT1Rec= Modaliteti <b>%sRE në faturat e furnitorëve%s</spannotranslate '></b>
-CalcModeLT2= Modaliteti <b>%sIRPF në faturat e klientëve - faturat e furnitorëveb0><4panf9spanz80f ='notranslate'></b>
+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=Modaliteti <b>%sIRPF në faturat e klientitb0ecb2ec87f49f49fz0</span' '></b>
 CalcModeLT2Rec= Modaliteti <b>%sIRPF në faturat e furnitorëveb0ecb2ec87f49fzlate<span'fz0 '></b></span>
 AnnualSummaryDueDebtMode=Bilanci i të ardhurave dhe shpenzimeve, përmbledhje vjetore
 AnnualSummaryInputOutputMode=Bilanci i të ardhurave dhe shpenzimeve, përmbledhje vjetore
 AnnualByCompanies=Bilanci i të ardhurave dhe shpenzimeve, sipas grupeve të paracaktuara të llogarive
-AnnualByCompaniesDueDebtMode=Bilanci i të ardhurave dhe shpenzimeve, detaje sipas grupeve të paracaktuara, modaliteti <b>%sKërkesat-Borxhet<span class='notranslate'0z00 </span></b> tha <b>Kontabiliteti i zotimit<span class='notranslate'>b09a4b739f17f.
-AnnualByCompaniesInputOutputMode=Bilanci i të ardhurave dhe shpenzimeve, detaje sipas grupeve të paracaktuara, modaliteti <b>%sTë ardhura-Shpenzime<span class='notranslate'0000 </span></b> tha <b>kontabiliteti i parave<span class='notranslate'>b09a4b739f17f8>z.
-SeeReportInInputOutputMode=Shiko <b>%sanalizën e pagesave%s<slate class='notranslate's ></b></span> për një llogaritje të bazuar në <b>pagesat e regjistruara</b>, edhe nëse ato nuk janë bërë ende në Llogaria
-SeeReportInDueDebtMode=Shiko <b>%sanalizën e dokumenteve të regjistruara%s class='notranslate'span '></b> për një llogaritje të bazuar në <b>dokumentet e regjistruara të njohura</b>, edhe nëse nuk janë llogaritur ende në L
-SeeReportInBookkeepingMode=Shiko <b>%sanalizën e tabelës së kontabilitetit%s notranslate'></b> për një raport të bazuar në <b>Tabela e librit të kontabilitetit<span class='notranslate'>b09a4b739f17f8z
+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 bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Shumat e paraqitura janë me të gjitha taksat e përfshira
 RulesAmountWithTaxExcluded=- Shumat e faturave të paraqitura janë të përjashtuara nga të gjitha taksat
 RulesResultDue=- Ai përfshin të gjitha faturat, shpenzimet, TVSH-në, donacionet, pagat, pavarësisht nëse paguhen apo jo.<br>- Bazohet në datën e faturimit të faturave dhe në datën e duhur për shpenzimet apo pagesat e taksave. Për pagat përdoret data e përfundimit të periudhës.
@@ -211,8 +212,8 @@ LT1ReportByQuarters=Raporto taksën 2 sipas normës
 LT2ReportByQuarters=Raporto taksën 3 sipas normës
 LT1ReportByQuartersES=Raporti sipas normës së RE
 LT2ReportByQuartersES=Raporti sipas normës së IRPF
-SeeVATReportInInputOutputMode=Shiko raportin <b>%smbledhjen e TVSH-së%s</spannotranslate' class=' ></b> për një llogaritje standarde
-SeeVATReportInDueDebtMode=Shiko raportin <b>%sTVSH në debit%s</spannotranslate '></b> për një llogaritje me një opsion në faturim
+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=- Për shërbimet, raporti përfshin TVSH-në e pagesave të pranuara ose të paguara faktikisht në bazë të datës së pagesës.
 RulesVATInProducts=- Për pasuritë materiale raporti përfshin TVSH-në në bazë të datës së pagesës.
 RulesVATDueServices=- Për shërbimet, raporti përfshin TVSH-në e faturave të paguara ose jo, bazuar në datën e faturës.
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index df397811ccf..ce1b16e463c 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -35,13 +35,13 @@ DeleteAContract=Fshi një kontratë
 ActivateAllOnContract=Aktivizoni të gjitha shërbimet
 CloseAContract=Mbyllni një kontratë
 ConfirmDeleteAContract=Je i sigurt që dëshiron ta fshish këtë kontratë dhe të gjitha shërbimet e saj?
-ConfirmValidateContract=Jeni i sigurt që dëshironi ta vërtetoni këtë kontratë me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z ?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
 ConfirmActivateAllOnContract=Kjo do të hapë të gjitha shërbimet (ende jo aktive). Jeni i sigurt që dëshironi të hapni të gjitha shërbimet?
 ConfirmCloseContract=Kjo do të mbyllë të gjitha shërbimet (të skaduara ose jo). Jeni i sigurt që dëshironi ta mbyllni këtë kontratë?
-ConfirmCloseService=Jeni i sigurt që dëshironi ta mbyllni këtë shërbim me datë <b>%s<span class='notranslate'></b></s0 ?
+ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
 ValidateAContract=Vërtetoni një kontratë
 ActivateService=Aktivizoni shërbimin
-ConfirmActivateService=Jeni i sigurt që dëshironi ta aktivizoni këtë shërbim me datë <b>%s<span class='notranslate'>b09a4b739f17f>z ?
+ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
 RefContract=Referenca e kontratës
 DateContract=Data e kontratës
 DateServiceActivate=Data e aktivizimit të shërbimit
@@ -90,7 +90,7 @@ NoteListOfYourExpiredServices=Kjo listë përmban vetëm shërbimet e kontratave
 StandardContractsTemplate=Modeli i kontratave standarde
 ContactNameAndSignature=Për %s, emri dhe nënshkrimi:
 OnlyLinesWithTypeServiceAreUsed=Vetëm linjat me llojin "Shërbim" do të klonohen.
-ConfirmCloneContract=Jeni i sigurt që doni të klononi kontratën <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
 LowerDateEndPlannedShort=Data më e ulët e planifikuar e përfundimit të shërbimeve aktive
 SendContractRef=Informacioni i kontratës __REF__
 OtherContracts=Kontrata të tjera
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 10d1510c0d1..75d03038dc7 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Lexoni punën e planifikuar
 Permission23102 = Krijo/përditëso punë të planifikuar
 Permission23103 = Fshi punën e planifikuar
@@ -63,8 +62,8 @@ CronStatusInactiveBtn=Çaktivizo
 CronTaskInactive=Kjo punë është e çaktivizuar (jo e planifikuar)
 CronId=Id
 CronClassFile=Emri i skedarit me klasën
-CronModuleHelp=Emri i drejtorisë së modulit Dolibarr (punoni edhe me modulin e jashtëm Dolibarr). <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/<u>produkt<span class='notranslate'87z7z4b0cada </span>/class/product.class.php, vlera për modulin është<br><i>produkt</i>
-CronClassFileHelp=Rruga relative dhe emri i skedarit për t'u ngarkuar (rruga është në lidhje me direktorinë rrënjë të serverit të uebit). <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt htdocs/product/class/<u>product.class.php<s class='notranslate'></u></span>, vlera për emrin e skedarit të klasës është<br><i>produkt/class .class.php</i>
+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=Emri i objektit për t'u ngarkuar. <BR> Për shembull për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/product/class/product.class.php, vlera për emrin e skedarit të klasës është <br><i>Produkt</i>
 CronMethodHelp=Metoda e objektit për të nisur. <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/product/class/product.class.php, vlera për metodën është  <br><i>marr</i>
 CronArgsHelp=Argumentet e metodës. <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/product/class/product.class.php, vlera për parametrat mund të jetë <br><i>0, ProductRef</i>
diff --git a/htdocs/langs/sq_AL/datapolicy.lang b/htdocs/langs/sq_AL/datapolicy.lang
index 9da60e13f9b..ed02836708a 100644
--- a/htdocs/langs/sq_AL/datapolicy.lang
+++ b/htdocs/langs/sq_AL/datapolicy.lang
@@ -23,7 +23,7 @@ Module4100Desc = Moduli për menaxhimin e privatësisë së të dhënave (përpu
 #
 datapolicySetup = Konfigurimi i politikës së privatësisë së të dhënave të modulit
 Deletion = Fshirja e të dhënave
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+datapolicySetupPage = Në varësi të ligjeve të vendeve tuaja (Shembull <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Neni 5</a> i GDPR), të dhënat personale duhet të mbahen për një periudhë duke mos e tejkaluar kohëzgjatjen, të dhënat nevojiten për qëllimin për të cilin janë mbledhur, përveç për qëllime arkivore.<br>Fshirja do të bëhet automatikisht pas një kohëzgjatjeje të caktuar pa ngjarje (kohëzgjatja të cilat do t'i keni treguar më poshtë).
 NB_MONTHS = %s muaj
 ONE_YEAR = 1 vit
 NB_YEARS = %s vjet
@@ -40,16 +40,16 @@ DATAPOLICY_CONTACT_FOURNISSEUR = Furnizuesi
 DATAPOLICY_ADHERENT = Anëtar
 DATAPOLICY_Tooltip_SETUP = Lloji i kontaktit - Tregoni zgjedhjet tuaja për secilin lloj.
 DATAPOLICYMail = Konfigurimi i emaileve
-DATAPOLICYSUBJECTMAIL = Subject of the email
+DATAPOLICYSUBJECTMAIL = Subjekti i emailit
 DATAPOLICYCONTENTMAIL = Përmbajtja e emailit
 DATAPOLICYSUBSITUTION = Ju mund të përdorni variablat e mëposhtëm në emailin tuaj (LINKACCEPT lejon krijimin e një lidhjeje që regjistron marrëveshjen e personit, LINKREFUSED bën të mundur regjistrimin e refuzimit të personit):
 DATAPOLICYACCEPT = Mesazh pas marrëveshjeje
-DATAPOLICYREFUSE = Message after disagreement
+DATAPOLICYREFUSE = Mesazh pas mosmarrëveshjes
 SendAgreementText = Ju mund t'u dërgoni një email GDPR të gjithë kontakteve tuaja përkatëse (të cilët nuk kanë marrë ende një email dhe për të cilët nuk keni regjistruar asgjë në lidhje me marrëveshjen e tyre GDPR). Për ta bërë këtë, përdorni butonin e mëposhtëm.
 SendAgreement = Dërgo email
 AllAgreementSend = Të gjitha emailet janë dërguar
 TXTLINKDATAPOLICYACCEPT = Teksti për lidhjen "marrëveshje"
-TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+TXTLINKDATAPOLICYREFUSE = Teksti për lidhjen "mosmarrëveshje"
 
 
 #
@@ -57,8 +57,8 @@ TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
 #
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Përpunimi i të dhënave personale
 DATAPOLICY_consentement = Pëlqimi i marrë për përpunimin e të dhënave personale
-DATAPOLICY_opposition_traitement = Opposes to the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes to the processing of his personal data for the purposes of prospecting
+DATAPOLICY_opposition_traitement = Kundërshton përpunimin e të dhënave të tij personale
+DATAPOLICY_opposition_prospection = Kundërshton përpunimin e të dhënave të tij personale për qëllime kërkimi
 
 #
 # Popup
@@ -78,11 +78,11 @@ DATAPOLICY_PORTABILITE_CONFIRMATION = Ju dëshironi të eksportoni të dhënat p
 #
 ANONYMISER_AT = Anonimoi %s
 
-DATAPOLICY_date = Date of agreement/disagreement GDPR
-DATAPOLICY_send = Date agreement email sent
+DATAPOLICY_date = Data e marrëveshjes/mosmarrëveshjes GDPR
+DATAPOLICY_send = Data e dërgimit të email-it të marrëveshjes
 DATAPOLICY_SEND = Dërgo email GDPR
 MailSent = Email është dërguar
 
 # ERROR
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to notify us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of months before deletion
+=Për shkak të një problemi teknik, ne nuk mundëm të regjistronim zgjedhjen tuaj. Kërkojmë falje për këtë. Na kontaktoni për të na njoftuar zgjedhjen tuaj.
+NUMBER_MONTH_BEFORE_DELETION = Numri i muajve para fshirjes
diff --git a/htdocs/langs/sq_AL/deliveries.lang b/htdocs/langs/sq_AL/deliveries.lang
index 3586c227be2..15eb4ca5c02 100644
--- a/htdocs/langs/sq_AL/deliveries.lang
+++ b/htdocs/langs/sq_AL/deliveries.lang
@@ -10,7 +10,7 @@ SetDeliveryDate=Cakto datën e dërgesës
 ValidateDeliveryReceipt=Vërtetoni faturën e dorëzimit
 ValidateDeliveryReceiptConfirm=Jeni i sigurt që dëshironi të vërtetoni këtë faturë dërgese?
 DeleteDeliveryReceipt=Fshi faturën e dorëzimit
-DeleteDeliveryReceiptConfirm=Jeni i sigurt që dëshironi të fshini faturën e dorëzimit <b>%s<span class='notranslate'>b09a4b739f17f>z?
+DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
 DeliveryMethod=Metodat e dërgesës
 TrackingNumber=Numri i gjurmimit
 DeliveryNotValidated=Dorëzimi nuk është vërtetuar
diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
index a58e748bbe2..537631c7d15 100644
--- a/htdocs/langs/sq_AL/donations.lang
+++ b/htdocs/langs/sq_AL/donations.lang
@@ -31,6 +31,7 @@ DONATION_ART200=Trego artikullin 200 nga CGI nëse jeni të shqetësuar
 DONATION_ART238=Trego artikullin 238 nga CGI nëse jeni të shqetësuar
 DONATION_ART978=Trego artikullin 978 nga CGI nëse jeni të shqetësuar
 DonationPayment=Pagesa e donacionit
+DonationPayments=Pagesat e donacioneve
 DonationValidated=Donacioni %s u vërtetua
 DonationUseThirdparties=Përdorni adresën e një pale të tretë ekzistuese si adresë të donatorit
 DonationsStatistics=Statistikat e donacioneve
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index 4152cb777f1..223f3d64fa7 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -30,7 +30,7 @@ ECMDocsBy=Dokumentet e lidhura me %s
 ECMNoDirectoryYet=Asnjë drejtori nuk u krijua
 ShowECMSection=Shfaq drejtorinë
 DeleteSection=Hiq drejtorinë
-ConfirmDeleteSection=A mund të konfirmoni që dëshironi të fshini direktorinë <b>%s<span class='notranslate'></b></s?
+ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Drejtoria relative për skedarët
 CannotRemoveDirectoryContainsFilesOrDirs=Heqja nuk është e mundur sepse përmban disa skedarë ose nëndrejtori
 CannotRemoveDirectoryContainsFiles=Heqja nuk është e mundur sepse përmban disa skedarë
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index d9bd3b4d75a..189743ca740 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -8,22 +8,22 @@ ErrorBadEMail=Adresa e emailit %s është e pasaktë
 ErrorBadMXDomain=Emaili %s duket i pasaktë (domeni nuk ka rekord të vlefshëm MX)
 ErrorBadUrl=Urlja %s është e pasaktë
 ErrorBadValueForParamNotAString=Vlera e keqe për parametrin tuaj. Ai shtohet përgjithësisht kur mungon përkthimi.
-ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
+ErrorRefAlreadyExists=Referenca <b>%s</b> e përdorur për krijimin tashmë ekziston.
 ErrorTitleAlreadyExists=Titulli <b>%s</b> ekziston tashmë.
 ErrorLoginAlreadyExists=Hyrja %s ekziston tashmë.
 ErrorGroupAlreadyExists=Grupi %s ekziston tashmë.
 ErrorEmailAlreadyExists=Email %s ekziston tashmë.
 ErrorRecordNotFound=Regjistrimi nuk u gjet.
 ErrorRecordNotFoundShort=Nuk u gjet
-ErrorFailToCopyFile=Dështoi në kopjimin e skedarit '<b>%s</b>' në '<span>' ='notranslate'><b></span>%s</b>'.
-ErrorFailToCopyDir=Dështoi në kopjimin e drejtorisë '<b>%s</b>' në '<span>' ='notranslate'><b></span>%s</b>'.
-ErrorFailToRenameFile=Riemërtimi i skedarit '<b>%s</b> në '<span>' dështoi në '<span>' ='notranslate'><b>%s</b>'.
+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=Dështoi në heqjen e skedarit '<b>%s</b>'.
 ErrorFailToCreateFile=Dështoi në krijimin e skedarit '<b>%s</b>'.
-ErrorFailToRenameDir=Riemërtimi i drejtorisë '<b>%s</b> në '<span>' dështoi në '<span>' ='notranslate'><b>%s</b>'.
+ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Dështoi në krijimin e drejtorisë '<b>%s</b>'.
 ErrorFailToDeleteDir=Fshirja e drejtorisë '<b>%s</b>' dështoi.
-ErrorFailToMakeReplacementInto=Zëvendësimi i skedarit '<b>%s<span class='notranslate'></b></s dështoi.
+ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorFailToGenerateFile=Dështoi në gjenerimin e skedarit '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ky kontakt është përcaktuar tashmë si kontakt për këtë lloj.
 ErrorCashAccountAcceptsOnlyCashMoney=Kjo llogari bankare është një llogari cash, kështu që pranon vetëm pagesa të llojit cash.
@@ -51,7 +51,7 @@ ErrorBadDateFormat=Vlera '%s' ka format të gabuar të datës
 ErrorWrongDate=Data nuk është e saktë!
 ErrorFailedToWriteInDir=Dështoi të shkruante në drejtorinë %s
 ErrorFailedToBuildArchive=Dështoi në ndërtimin e skedarit të arkivit %s
-ErrorFoundBadEmailInFile=U gjet sintaksë e gabuar e emailit për linjat %s në skedar (rreshti shembull %s me email=<span class='notranslate'>b0f0292 /span>)
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=Përdoruesi nuk mund të fshihet. Ndoshta është e lidhur me entitetet Dolibarr.
 ErrorFieldsRequired=Disa fusha të kërkuara janë lënë bosh.
 ErrorSubjectIsRequired=Kërkohet tema e emailit
@@ -94,11 +94,11 @@ ErrorRecordIsUsedCantDelete=Nuk mund të fshihet regjistrimi. Është përdorur
 ErrorModuleRequireJavascript=JavaScript nuk duhet të çaktivizohet që kjo veçori të funksionojë. Për të aktivizuar/çaktivizuar JavaScript, shkoni te menyja Home->Setup->Display.
 ErrorPasswordsMustMatch=Të dy fjalëkalimet e shtypura duhet të përputhen me njëri-tjetrin
 ErrorContactEMail=Ndodhi një gabim teknik. Ju lutemi, kontaktoni administratorin në emailin vijues <b>%s</b> kodi <b>%s</b> në ekranin e mesazhit tuaj, ose shtoni një kopje të mesazhit kjo faqe.
-ErrorWrongValueForField=Fusha <b>%s</b>: 'no <span'> <b></span>%s</b>' nuk përputhet me rregullin regex <span class='notranslate</0epanslate'38 %s</b>
-ErrorHtmlInjectionForField=Fusha <b>%s</b>: Vlera '<span' class'notranslate '><b></span>%s</b>' përmban të dhëna me qëllim të keq që nuk lejohen
-ErrorFieldValueNotIn=Fusha <b>%s</b>: 'no<span'> <b></span>%s</b>' nuk është një vlerë e gjetur në fushën <span class='notranslate</05e</037> span>%s</b> nga <b></spannotranslate' class='> %s</b>
-ErrorFieldRefNotIn=Fusha <b>%s</b>: 'no <span'> <b></span>%s</b>' nuk është një <span class='notranslate'8</span68</span33050 class='notranslate'>%s</span></b> ref ekzistues
-ErrorMultipleRecordFoundFromRef=U gjetën disa shënime gjatë kërkimit nga ref <b>%s<span class='notranslate'></b>. Nuk ka asnjë mënyrë për të ditur se cilën ID të përdorni.
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+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
+ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
 ErrorsOnXLines=%s u gjetën gabime
 ErrorFileIsInfectedWithAVirus=Programi antivirus nuk ishte në gjendje të vërtetonte skedarin (skedari mund të jetë i infektuar nga një virus)
 ErrorFileIsAnInfectedPDFWithJSInside=Skedari është një PDF i infektuar nga disa Javascript brenda
@@ -155,7 +155,7 @@ ErrorDateMustBeBeforeToday=Data duhet të jetë më e ulët se sot
 ErrorDateMustBeInFuture=Data duhet të jetë më e madhe se sot
 ErrorStartDateGreaterEnd=Data e fillimit është më e madhe se data e përfundimit
 ErrorPaymentModeDefinedToWithoutSetup=Një mënyrë pagese u caktua për të shtypur %s por konfigurimi i modulit Fatura nuk u krye për të përcaktuar informacionin për t'u shfaqur për këtë mënyrë pagese.
-ErrorPHPNeedModule=Gabim, PHP juaj duhet të ketë modul <b>%s<span class='notranslate'></b> të instaluar për të përdorur këtë</s veçori.
+ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=Ju konfiguroni skedarin e konfigurimit Dolibarr për të lejuar vërtetimin e OpenID, por URL-ja e shërbimit OpenID nuk është përcaktuar në konstante %s
 ErrorWarehouseMustDiffers=Burimi dhe magazinat e synuara duhet të ndryshojnë
 ErrorBadFormat=Format i keq!
@@ -219,7 +219,7 @@ ErrorPhpMailDelivery=Kontrolloni që të mos përdorni një numër shumë të la
 ErrorUserNotAssignedToTask=Përdoruesi duhet të caktohet në detyrë që të jetë në gjendje të fusë kohën e konsumuar.
 ErrorTaskAlreadyAssigned=Detyra i është caktuar tashmë përdoruesit
 ErrorModuleFileSeemsToHaveAWrongFormat=Paketa e modulit duket se ka një format të gabuar.
-ErrorModuleFileSeemsToHaveAWrongFormat2=Të paktën një direktori e detyrueshme duhet të ekzistojë në zip të modulit: <strong>%sb0a65d071f0sf > ose <span class='notranslate'><strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
 ErrorFilenameDosNotMatchDolibarrPackageRules=Emri i paketës së modulit (<strong>%s</strong> nuk përputhet) sintaksa e pritshme e emrit: <strong>%s</strong>
 ErrorDuplicateTrigger=Gabim, emri i kopjimit të kopjimit %s. I ngarkuar tashmë nga %s.
 ErrorNoWarehouseDefined=Gabim, nuk janë përcaktuar magazina.
@@ -258,14 +258,14 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Gabim, gjuha e faqes së përkth
 ErrorBatchNoFoundForProductInWarehouse=Nuk u gjet asnjë lot/serial për produktin "%s" në magazinë "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Nuk ka sasi të mjaftueshme për këtë lot/serial për produktin "%s" në magazinë "%s".
 ErrorOnlyOneFieldForGroupByIsPossible=Vetëm 1 fushë për "Grupi sipas" është e mundur (të tjerat janë hedhur poshtë)
-ErrorTooManyDifferentValueForSelectedGroupBy=U gjetën shumë vlera të ndryshme (më shumë se <b>%s</b></s>) fusha '<span class='notranslate'><b>%s</b>', kështu që ne mund ta përdorim si një 'Group by' për grafikë. Fusha 'Group By' është hequr. Ndoshta dëshironi ta përdorni atë si një bosht X?
+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=Gabim, vargu për të zëvendësuar është bosh
 ErrorProductNeedBatchNumber=Gabim, produkti '<b>%s</b>' ka nevojë për një numër
 ErrorProductDoesNotNeedBatchNumber=Gabim, produkti '<b>%s</b>' nuk pranon shumë/ numër serik
-ErrorFailedToReadObject=Gabim, dështoi në leximin e objektit të llojit <b>%s<span class='notranslate'></b></s>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Gabim, parametri <b>%s</b> duhet të jetë en class='notranslate'> 'notranslate'><b></span>conf/conf.php<> për të lejuar përdorimin e ndërfaqes së linjës së komandës nga programuesi i brendshëm i punës
+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<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Gabim, ky identifikim është jashtë intervalit të datave të vlefshmërisë
-ErrorValueLength=Gjatësia e fushës '<b>%s</b> duhet të jetë më e lartë se '<span>' span class='notranslate'><b></span>%s</b>'
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=Fjala '<b>%s</b>' është një fjalë kyçe e rezervuar
 ErrorFilenameReserved=Emri i skedarit <b>%s</b> nuk mund të përdoret komanda e rezervuar dhe e mbrojtur.
 ErrorNotAvailableWithThisDistribution=Nuk disponohet me këtë shpërndarje
@@ -311,7 +311,7 @@ ErrorValueCantBeNull=Vlera për <b>%s</b> nuk mund të jetë null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Data e transaksionit bankar nuk mund të jetë më e ulët se data e transmetimit të dosjes
 ErrorTooMuchFileInForm=Shumë skedarë në formë, numri maksimal është %s skedar(s)
 ErrorSessionInvalidatedAfterPasswordChange=Sesioni u zhvlerësua pas një ndryshimi të fjalëkalimit, emailit, statusit ose datave të vlefshmërisë. Ju lutemi identifikohuni përsëri.
-ErrorExistingPermission = Leja <b>%s</b> për objektin <span'notranslate'> <b></span>%s</b> ekziston tashmë
+ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
 ErrorFieldExist=Vlera për <b>%s</b> ekziston tashmë
 ErrorEqualModule=Moduli i pavlefshëm në <b>%s</b>
 ErrorFieldValue=Vlera për <b>%s</b> është e pasaktë
@@ -325,7 +325,7 @@ ErrorSVGFilesNotAllowedAsLinksWithout=Skedarët SVG nuk lejohen si lidhje të ja
 ErrorTypeMenu=Është e pamundur të shtosh një menu tjetër për të njëjtin modul në shiritin e navigimit, por ende nuk është trajtuar
 ErrorObjectNotFound = Objekti <b>%s</b> nuk është gjetur, ju lutemi kontrolloni url
 ErrorCountryCodeMustBe2Char=Kodi i shtetit duhet të jetë një varg me 2 karaktere
-ErrorABatchShouldNotContainsSpaces=A lot or serial number should not contains spaces
+ErrorABatchShouldNotContainsSpaces=Një lot ose numri serial nuk duhet të përmbajë hapësira
 
 ErrorTableExist=Tabela <b>%s</b> ekziston tashmë
 ErrorDictionaryNotFound=Fjalori <b>%s</b> nuk u gjet
@@ -349,13 +349,13 @@ WarningCloseAlways=Paralajmërim, mbyllja bëhet edhe nëse shuma ndryshon midis
 WarningUsingThisBoxSlowDown=Paralajmërim, përdorimi i kësaj kutie ngadalësoni seriozisht të gjitha faqet që shfaqin kutinë.
 WarningClickToDialUserSetupNotComplete=Konfigurimi i informacionit ClickToDial për përdoruesin tuaj nuk është i plotë (shih skedën ClickToDial në kartën tuaj të përdoruesit).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funksioni çaktivizohet kur konfigurimi i ekranit është optimizuar për shfletuesit e tekstit për personat e verbër.
-WarningPaymentDateLowerThanInvoiceDate=Data e pagesës (%s) është më e hershme se data e faturës (%s) për faturë <span class='notranslate'>b0ecb2fz874 span>.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Shumë të dhëna (më shumë se rreshta %s). Ju lutemi përdorni më shumë filtra ose vendosni konstanten %s në një kufi më të lartë.
 WarningSomeLinesWithNullHourlyRate=Disa herë u regjistruan nga disa përdorues ndërsa tarifa e tyre për orë nuk ishte e përcaktuar. Është përdorur një vlerë prej 0 %s në orë, por kjo mund të rezultojë në vlerësim të gabuar të kohës së shpenzuar.
 WarningYourLoginWasModifiedPleaseLogin=Hyrja juaj u modifikua. Për qëllime sigurie, do t'ju duhet të identifikoheni me hyrjen tuaj të re përpara veprimit tjetër.
 WarningYourPasswordWasModifiedPleaseLogin=Fjalëkalimi juaj u modifikua. Për qëllime sigurie do të duhet të identifikoheni tani me fjalëkalimin tuaj të ri.
 WarningAnEntryAlreadyExistForTransKey=Ekziston tashmë një hyrje për çelësin e përkthimit për këtë gjuhë
-WarningNumberOfRecipientIsRestrictedInMassAction=Paralajmërim, numri i marrësve të ndryshëm është i kufizuar në <b>%s<span class='notranslate'>b09a4b739f17f8z kur përdoret veprimet masive në lista
+WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Paralajmërim, data e rreshtit nuk është në intervalin e raportit të shpenzimeve
 WarningProjectDraft=Projekti është ende në modalitetin draft. Mos harroni ta vërtetoni nëse planifikoni të përdorni detyra.
 WarningProjectClosed=Projekti është mbyllur. Së pari duhet ta rihapni.
@@ -366,14 +366,14 @@ WarningCreateSubAccounts=Kujdes, nuk mund të krijosh drejtpërdrejt një nën-l
 WarningAvailableOnlyForHTTPSServers=E disponueshme vetëm nëse përdorni lidhje të sigurt HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Moduli %s nuk është aktivizuar. Kështu që mund të humbisni shumë ngjarje këtu.
 WarningPaypalPaymentNotCompatibleWithStrict=Vlera 'Rreptë' bën që veçoritë e pagesës në internet të mos funksionojnë siç duhet. Përdorni 'Lax' në vend të kësaj.
-WarningThemeForcedTo=Paralajmërim, tema është e detyruar të <b>%s</b>HED> MAQEDONISHT konstante<span class='notranslate'>
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Kujdes, kjo do të fshijë gjithashtu të gjitha faqet/kontejnerët ekzistues të faqes së internetit. Ju duhet të eksportoni faqen tuaj të internetit më parë, në mënyrë që të keni një kopje rezervë për ta ri-importuar më vonë.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Vleresimi automatik çaktivizohet kur opsioni për uljen e stokut është vendosur në "Vleresimi i faturës".
 WarningModuleNeedRefresh = Moduli <b>%s</b> është çaktivizuar. Mos harroni ta aktivizoni
 WarningPermissionAlreadyExist=Lejet ekzistuese për këtë objekt
-WarningGoOnAccountancySetupToAddAccounts=Nëse kjo listë është bosh, shkoni te menyja %s - %s - <span class='notranslate'>%s</s> për të ngarkuar ose krijuar llogari për grafikun tuaj të llogarisë.
+WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
 WarningCorrectedInvoiceNotFound=Fatura e korrigjuar nuk u gjet
-WarningCommentNotFound=Ju lutemi kontrolloni vendosjen e komenteve të fillimit dhe të fundit për seksionin <b>%s</b> skedari <span class='notranslate'><b>%s</b> përpara se të dorëzoni veprimin tuaj
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
 WarningAlreadyReverse=Lëvizja e aksioneve është kthyer tashmë
 
 SwissQrOnlyVIR = Fatura SwissQR mund të shtohet vetëm në faturat e vendosura për t'u paguar me pagesa të transfertave të kreditit.
@@ -405,9 +405,9 @@ BadSetupOfFieldFileNotFound = Gabim në konfigurimin e gabuar të fushës: Skeda
 BadSetupOfFieldFetchNotCallable = Gabim në konfigurimin e gabuar të fushës: Marrja nuk mund të thirret në klasë
 ErrorTooManyAttempts= Shumë përpjekje, ju lutemi provoni përsëri më vonë
 
-TotalAmountEmpty=Total Amount Empty
-FailedToFoundTheConversionRateForInvoice=Failed to found the conversion rate for invoice
-ThisIdNotDefined=Id not defined
-OperNotDefined=Payment method not defined
-ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
-ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
+TotalAmountEmpty=Shuma totale bosh
+FailedToFoundTheConversionRateForInvoice=Gjetja e normës së konvertimit për faturë dështoi
+ThisIdNotDefined=I pa përcaktuar
+OperNotDefined=Mënyra e pagesës nuk është përcaktuar
+ErrorThisContactXIsAlreadyDefinedAsThisType=%s është përcaktuar tashmë si kontakt për këtë lloj.
+ErrorThisGroupIsAlreadyDefinedAsThisType=Kontaktet me këtë grup janë përcaktuar tashmë si kontakt për këtë lloj.
diff --git a/htdocs/langs/sq_AL/eventorganization.lang b/htdocs/langs/sq_AL/eventorganization.lang
index 8728c0eaeed..8895a8add7a 100644
--- a/htdocs/langs/sq_AL/eventorganization.lang
+++ b/htdocs/langs/sq_AL/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=Konfigurimi i organizimit të ngjarjeve
 EventOrganization=Organizimi i eventit
 EventOrganizationSetupPage = Faqja e konfigurimit të organizimit të ngjarjeve
 EVENTORGANIZATION_TASK_LABEL = Etiketa e detyrave për t'u krijuar automatikisht kur projekti të vërtetohet
-EVENTORGANIZATION_TASK_LABELTooltip = Kur vërtetoni një ngjarje për të organizuar, disa detyra mund të krijohen automatikisht në projekt<br><br>Për shembull: <br>Dërgo thirrje për konferenca<br>Dërgo thirrje për kabinatb0342fccfda19bzit sugjerime të klasave të konferencave</span ='notranslate'><br>Vërteto aplikacionin për Booths<br>Hap abonimet në ngjarje për të pranishmitb0342fccfda19>b0342fccfda1 i ngjarjes folësve<span class='notranslate'><br>Dërgo një kujtim të ngjarjes te mbajtësit e Booth<br>Dërgo një kujtim të ngjarjes për të pranishmit
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=Mbajeni bosh nëse nuk keni nevojë të krijoni detyra automatikisht.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategoria për t'u shtuar palëve të treta krijohet automatikisht kur dikush sugjeron një konferencë
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategoria për t'u shtuar palëve të treta krijohet automatikisht kur ata sugjerojnë një kabinë
@@ -88,6 +88,7 @@ PriceOfRegistration=Çmimi i regjistrimit
 PriceOfRegistrationHelp=Çmimi që duhet paguar për t'u regjistruar ose për të marrë pjesë në ngjarje
 PriceOfBooth=Çmimi i abonimit për të qëndruar në një kabinë
 PriceOfBoothHelp=Çmimi i abonimit për të qëndruar në një kabinë
+EventOrganizationICSLinkProject=Lidhni ICS për ngjarjen
 EventOrganizationICSLink=Lidhni ICS për konferenca
 ConferenceOrBoothInformation=Informacione për Konferencën ose Bothin
 Attendees=Të pranishmit
@@ -127,8 +128,8 @@ PublicAttendeeSubscriptionPage = Lidhje publike vetëm për regjistrim në kët
 MissingOrBadSecureKey = Çelësi i sigurisë është i pavlefshëm ose mungon
 EvntOrgWelcomeMessage = Ky formular ju lejon të regjistroheni si një pjesëmarrës i ri në ngjarje
 EvntOrgDuration = Kjo konferencë fillon në %s dhe përfundon në %s.
-ConferenceAttendeeFee = Tarifa e pjesëmarrësve në konferencë për ngjarjen : '%s' ndodh nga %s në <span class='notranslate'>b0ecb2fz874 >.
-BoothLocationFee = Vendndodhja e kabinës për ngjarjen : '%s' që ndodh nga %s në <span class='notranslate'>b0ecb2ec87f49>f
+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 = Lloji i ngjarjes
 LabelOfBooth=Etiketa e kabinës
 LabelOfconference=Etiketa e konferencës
@@ -161,7 +162,7 @@ Attendee = Pjesëmarrësit
 PaymentConferenceAttendee = Pagesa e pjesëmarrësve në konferencë
 PaymentBoothLocation = Pagesa e vendndodhjes së kabinës
 DeleteConferenceOrBoothAttendee=Hiq pjesëmarrësin
-RegistrationAndPaymentWereAlreadyRecorder=Një regjistrim dhe një pagesë janë regjistruar tashmë për emailin <b>%s<span class='notranslate'>b09a4b739f17f8z
+RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
 EmailAttendee=Email i pjesëmarrësit
 EmailCompany=Email i kompanisë
 EmailCompanyForInvoice=Email-i i kompanisë (për faturë, nëse është i ndryshëm nga email-i i pjesëmarrësit)
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index 43d59b47984..71996f7040b 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -72,7 +72,7 @@ FieldsTarget=Fushat e synuara
 FieldTarget=Fusha e synuar
 FieldSource=Fusha e burimit
 NbOfSourceLines=Numri i rreshtave në skedarin burimor
-NowClickToTestTheImport=Kontrolloni që formati i skedarit (ndarësit e fushave dhe vargjeve) të skedarit tuaj përputhet me opsionet e treguara dhe se e keni hequr rreshtin e titullit, ose këto do të shënohen si gabime në simulimin e mëposhtëm.<br>Kliko në butonin "<b>%s</b>" për të</span a> kontrolloni strukturën/përmbajtjen e skedarit dhe simuloni procesin e importimit.<span class='notranslate'><br><b>Asnjë të dhënë nuk do të ndryshohet në bazën tuaj të të dhënave</b>.
+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=Ekzekutoni simulimin e importit
 FieldNeedSource=Kjo fushë kërkon të dhëna nga skedari burimor
 SomeMandatoryFieldHaveNoSource=Disa fusha të detyrueshme nuk kanë burim nga skedari i të dhënave
@@ -83,15 +83,15 @@ SelectFormat=Zgjidhni këtë format skedari të importit
 RunImportFile=Të dhënat e importit
 NowClickToRunTheImport=Kontrolloni rezultatet e simulimit të importit. Korrigjoni çdo gabim dhe riprovoni.<br>Kur simulimi nuk raporton asnjë gabim, mund të vazhdoni të importoni të dhënat në bazën e të dhënave.
 DataLoadedWithId=Të dhënat e importuara do të kenë një fushë shtesë në secilën tabelë të bazës së të dhënave me këtë ID të importit: <b>%s</b>, për të lejuar që ai të jetë i kërkueshëm në rastin e hetimit të një problemi që lidhet me këtë import.
-ErrorMissingMandatoryValue=Të dhënat e detyrueshme janë bosh në skedarin burimor në kolonën <b>%s<span class='notranslate'>b09a4b739f17f8z.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=Ka ende <b>%s</b> linja të tjera burimore por ka nxjerrë linja të tjera ka qenë e kufizuar.
 TooMuchWarnings=Ende ka <b>%s</b> që ka linja të tjera burimore me luftë ishte i kufizuar.
 EmptyLine=Linja e zbrazët (do të hidhet poshtë)
-CorrectErrorBeforeRunningImport=Ju <b>duhet</b> të korrigjoni të gjitha gabimet b0aee83365837fz>b0aee83365837fz notranslate'></b> duke ekzekutuar importin përfundimtar.
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=Skedari u importua me numër <b>%s</b>.
 YouCanUseImportIdToFindRecord=Ju mund t'i gjeni të gjitha regjistrimet e importuara në bazën tuaj të të dhënave duke filtruar në fushën <b>import_key='%s'</b>.
-NbOfLinesOK=Numri i rreshtave pa gabime dhe pa paralajmërime: <b>%s<span class='notranslate'>b09a4b78z000f1>f.
-NbOfLinesImported=Numri i rreshtave të importuar me sukses: <b>%s<span class='notranslate'></b></s.
+NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
+NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
 DataComeFromNoWhere=Vlera për të futur vjen nga askund në skedarin burimor.
 DataComeFromFileFieldNb=Vlera për të futur vjen nga kolona <b>%s</b> në skedarin burimor.
 DataComeFromIdFoundFromRef=Vlera që vjen nga skedari burimor do të përdoret për të gjetur ID-në e objektit prind për t'u përdorur (kështu që objekti <b>%s</b> që ka ref. nga skedari burim duhet të ekzistojë në bazën e të dhënave).
@@ -102,19 +102,19 @@ DataCodeIDSourceIsInsertedInto=ID-ja e linjës mëmë, e gjetur nga kodi, do të
 SourceRequired=Vlera e të dhënave është e detyrueshme
 SourceExample=Shembull i vlerës së mundshme të të dhënave
 ExampleAnyRefFoundIntoElement=Çdo referencë e gjetur për elementin <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Çdo kod (ose id) i gjetur në fjalor <b>%s<span class='notranslate'>b09a4b739f17f8z</s0
-CSVFormatDesc=<b>Vlera e ndarë me presje</b> formati i skedarit (.csv).b0149fccf>b0149fccf është një format skedari teksti ku fushat janë të ndara nga një ndarës [ <span class='notranslate'>%s ]. Nëse gjendet ndarësi brenda përmbajtjes së fushës, fusha rrumbullakohet me karakter të rrumbullakët [ %s ]. Karakteri i arratisjes për t'i shpëtuar karakterit të rrumbullakët është [ %s ].
-Excel95FormatDesc=<b>Excel</b> formati i skedarit (.xls)<span class='notranslate'>b0342fccfda19>b0 Formati Excel 95 (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> formati i skedarit (.xlsx)<span class='notranslate'>b0342fccfda19>z Formati Excel 2007 (SpreadsheetML).
-TsvFormatDesc=<b>Vlera e veçuar me skedë</b> formati i skedarit (.tsv)<span class='notranslate'>b0342fccfda. një format skedari teksti ku fushat janë të ndara nga një tabelator [tab].
+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=Fusha <b>%s</b> u shtua automatikisht. Kjo do t'ju shmangë që të keni linja të ngjashme që do të trajtohen si rekord dublikatë (me këtë fushë të shtuar, të gjitha linjat do të kenë ID-në e tyre dhe do të ndryshojnë).
 CsvOptions=Opsionet e formatit CSV
 Separator=Ndarës i fushës
 Enclosure=Kufizues i vargut
 SpecialCode=Kodi special
 ExportStringFilter=%% lejon zëvendësimin e një ose më shumë karaktereve në tekst
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtron sipas një viti/muaj/ditë<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD+VVVYYMNë diapazonin e viteve/VVVMMMDD: span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMDD: filtra në të gjitha vitet/muajt/ditët në vijim<br> <YYYYMM YYYYMMDD: filtra në të gjitha vitet/muajt/ditët e mëparshme
-ExportNumericFilter=NNNNN filtron sipas një vlere<br>NNNNN+NNNNN filtro mbi një sërë vlerash<br><span class='notranslate'>b27ede2ez<0892ez /span>> NNNNN filtron sipas vlerave më të larta
+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=Importoni duke filluar nga numri i linjës
 EndAtLineNb=Përfundoni në numrin e linjës
 ImportFromToLine=Gama e kufirit (Nga - Deri). P.sh. për të hequr rreshtat e titullit.
diff --git a/htdocs/langs/sq_AL/help.lang b/htdocs/langs/sq_AL/help.lang
index c26af0e9340..869c47568b8 100644
--- a/htdocs/langs/sq_AL/help.lang
+++ b/htdocs/langs/sq_AL/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=Përndryshe, <a href="%s">kthehu në faqen kryesore të qendrë
 LinkToGoldMember=Ju mund të telefononi një nga trajnerët e parazgjedhur nga Dolibarr për gjuhën tuaj (%s) duke klikuar Widget-in e tyre (statusi dhe çmimi maksimal përditësohen automatikisht):
 PossibleLanguages=Gjuhët e mbështetura
 SubscribeToFoundation=Ndihmoni projektin Dolibarr, regjistrohuni në fondacion
-SeeOfficalSupport=Për mbështetjen zyrtare të Dolibarr në gjuhën tuaj: <br><b><a href="%s" target="_blank" rel="noopener noreferrer"></span ='notranslate'>%s</a></b>
+SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index f643c1c5919..a97a7a7cd41 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -27,9 +27,9 @@ UserForApprovalLastname=Mbiemri i përdoruesit të miratimit
 UserForApprovalLogin=Hyrja e përdoruesit të miratimit
 DescCP=Përshkrimi
 SendRequestCP=Krijo kërkesë për pushim
-DelayToRequestCP=Kërkesat për largim duhet të bëhen të paktën <b>%s ditë(a)<span class='notranslate'>b09a4b739f17f para tyre.
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Bilanci i lejes
-SoldeCPUser=Lëreni bilancin (në ditë) : <b>%s<span class='notranslate'></b></s>
+SoldeCPUser=Leave balance (in days) : <b>%s</b>
 ErrorEndDateCP=Duhet të zgjidhni një datë përfundimi më të madhe se data e fillimit.
 ErrorSQLCreateCP=Ndodhi një gabim SQL gjatë krijimit:
 ErrorIDFicheCP=Ka ndodhur një gabim, kërkesa për pushim nuk ekziston.
@@ -109,7 +109,6 @@ TypeWasDisabledOrRemoved=Lloji i lejes (id %s) u çaktivizua ose u hoq
 LastHolidays=Kërkesat më të fundit për largim %s
 AllHolidays=Të gjitha kërkesat për pushim
 HalfDay=Gjysmë ditë
-NotTheAssignedApprover=Ju nuk jeni miratuesi i caktuar
 LEAVE_PAID=Pushime me pagesë
 LEAVE_SICK=Pushim mjekësor
 LEAVE_OTHER=Pushime të tjera
diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
index 5d416e37822..c8855ce9fc3 100644
--- a/htdocs/langs/sq_AL/hrm.lang
+++ b/htdocs/langs/sq_AL/hrm.lang
@@ -45,7 +45,7 @@ Eval=Vlerësimi
 Evals=vlerësimet
 NewEval=Vlerësim i ri
 ValidateEvaluation=Vërtetoni vlerësimin
-ConfirmValidateEvaluation=Jeni i sigurt që dëshironi ta vërtetoni këtë vlerësim me referencën <b>%s<span class='notranslate'>b09a4b739f17f8z >?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Karta e vlerësimit
 RequiredRank=Grada e kërkuar për profilin e punës
 RequiredRankShort=Grada e kërkuar
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index b26a1000936..6b8e80d1567 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -13,8 +13,8 @@ PHPSupportPOSTGETOk=Ky PHP mbështet variablat POST dhe GET.
 PHPSupportPOSTGETKo=Është e mundur që konfigurimi juaj i PHP nuk i mbështet variablat POST dhe/ose GET. Kontrolloni parametrin <b>variables_order</b> në php.ini.
 PHPSupportSessions=Ky PHP mbështet seancat.
 PHPSupport=Ky PHP mbështet funksionet %s.
-PHPMemoryOK=Memoria juaj maksimale e sesionit PHP është caktuar në <b>%s<span class='notranslate'>b09a4b739f17f8z></s0. Kjo duhet të jetë e mjaftueshme.
-PHPMemoryTooLow=Memoria juaj maksimale e sesionit PHP është caktuar në <b>%sb09a4b739f17panf8z0</s0. Kjo është shumë e ulët. Ndrysho <span class='notranslate'><b>php.ini</b> për të vendosur b0aee83365837fm<0aee8336583737f ='notranslate'></b> parametër për të paktën <b>%s<span class='notranslate'8 /span> bajt.
+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=Klikoni këtu për një test më të detajuar
 ErrorPHPDoesNotSupportSessions=Instalimi juaj i PHP nuk i mbështet seancat. Kjo veçori kërkohet për të lejuar funksionimin e Dolibarr. Kontrolloni konfigurimin tuaj të PHP dhe lejet e drejtorisë së sesioneve.
 ErrorPHPDoesNotSupport=Instalimi juaj PHP nuk mbështet funksionet %s.
@@ -77,7 +77,7 @@ SetupEnd=Fundi i konfigurimit
 SystemIsInstalled=Ky instalim ka përfunduar.
 SystemIsUpgraded=Dolibarr është përmirësuar me sukses.
 YouNeedToPersonalizeSetup=Ju duhet të konfiguroni Dolibarr për t'iu përshtatur nevojave tuaja (pamja, veçoritë, ...). Për ta bërë këtë, ju lutemi ndiqni lidhjen e mëposhtme:
-AdminLoginCreatedSuccessfuly=Identifikimi i administratorit të Dolibarr '<b>%s<span class='notranslate'>b09a4b739f17f80'z0 u krijua me sukses.
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=Shkoni në Dolibarr
 GoToSetupArea=Shkoni te Dolibarr (zona e konfigurimit)
 MigrationNotFinished=Versioni i bazës së të dhënave nuk është plotësisht i përditësuar: ekzekutoni përsëri procesin e përmirësimit.
@@ -86,7 +86,7 @@ WithNoSlashAtTheEnd=Pa të pjerrët "/" në fund
 DirectoryRecommendation=<span class="warning">E RËNDËSISHME</span>: Duhet të përdorni një direktori që është jashtë faqeve të internetit (kështu që mos përdorni një nëndrejtori të parametrit të mëparshëm ).
 LoginAlreadyExists=Tashmë ekziston
 DolibarrAdminLogin=Identifikimi i administratorit të Dolibarr
-AdminLoginAlreadyExists=Llogaria e administratorit të Dolibarr '<b>%s<span class='notranslate'></b> tashmë ekziston. Kthehuni nëse dëshironi të krijoni një tjetër.
+AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
 FailedToCreateAdminLogin=Krijimi i llogarisë së administratorit të Dolibarr dështoi.
 WarningRemoveInstallDir=Paralajmërim, për arsye sigurie, pasi të përfundojë procesi i instalimit, duhet të shtoni një skedar të quajtur <b>install.lock</b> në Drejtoria e dokumenteve Dolibarr për të parandaluar përsëri përdorimin aksidental/me qëllim të keq të veglave të instalimit.
 FunctionNotAvailableInThisPHP=Nuk disponohet në këtë PHP
@@ -108,15 +108,15 @@ DatabaseVersion=Versioni i bazës së të dhënave
 ServerVersion=Versioni i serverit të bazës së të dhënave
 YouMustCreateItAndAllowServerToWrite=Ju duhet të krijoni këtë direktori dhe të lejoni që serveri në internet të shkruajë në të.
 DBSortingCollation=Rendi i renditjes së karaktereve
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Ju zgjodhët krijimin e bazës së të dhënave <b>%s</b></spanli>, por ka nevojë për këtë, porr për t'u lidhur me serverin <span class='notranslate'><b>%s</b> me super përdorues <span> class= 'notranslate'><b></span>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Ju zgjodhët krijimin e përdoruesit të bazës së të dhënave <b>%s</b></spanli>, porr duhet të lidhet me serverin <span class='notranslate'><b>%s</b> <span class me super përdorues ='notranslate'><b></span>%s</b> lejet.
+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=Lidhja e bazës së të dhënave dështoi: parametrat e hostit ose të superpërdoruesit duhet të jenë të gabuara.
 OrphelinsPaymentsDetectedByMethod=Pagesa për jetimët u zbulua me metodën %s
 RemoveItManuallyAndPressF5ToContinue=Hiqeni manualisht dhe shtypni F5 për të vazhduar.
 FieldRenamed=Fusha u riemërua
 IfLoginDoesNotExistsCheckCreateUser=Nëse përdoruesi nuk ekziston ende, duhet të kontrolloni opsionin "Krijo përdorues"
-ErrorConnection=Serveri "<b>%s</b>", emri i klasës së bazës së të dhënave "<span> 'notranslate'><b></span>%s</b>", login "<span class33f4'05 span>%s</b>", ose fjalëkalimi i bazës së të dhënave mund të jetë i gabuar ose versioni i klientit PHP mund të jetë shumë i vjetër në krahasim me versionin e bazës së të dhënave .
-InstallChoiceRecommanded=Zgjedhja e rekomanduar për të instaluar versionin <b>%s</b> nga versioni juaj aktual <span> class='notranslate'><b>%s</b>
+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>Zgjedhja e instalimit e sugjeruar nga instaluesi</b>.
 MigrateIsDoneStepByStep=Versioni i synuar (%s) ka një boshllëk prej disa versionesh. Magjistari i instalimit do të kthehet për të sugjeruar një migrim të mëtejshëm pasi ky të përfundojë.
 CheckThatDatabasenameIsCorrect=Kontrollo që emri i bazës së të dhënave "<b>%s</b>" është i saktë.
@@ -168,7 +168,7 @@ MigrationContractsEmptyDatesUpdateSuccess=Korrigjimi i datës së kontratës bos
 MigrationContractsEmptyDatesNothingToUpdate=Asnjë datë e zbrazët e kontratës për t'u korrigjuar
 MigrationContractsEmptyCreationDatesNothingToUpdate=Asnjë datë e krijimit të kontratës për t'u korrigjuar
 MigrationContractsInvalidDatesUpdate=Korrigjimi i kontratës me datë të keqe
-MigrationContractsInvalidDateFix=Kontrata e saktë %s (Data e kontratës=%s, data e fillimit të shërbimit min=<span class='notranslate'>b0ecb2ec80</spansf >)
+MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
 MigrationContractsInvalidDatesNumber=%s kontratat u modifikuan
 MigrationContractsInvalidDatesNothingToUpdate=Asnjë datë me vlerë të keqe për t'u korrigjuar
 MigrationContractsIncoherentCreationDateUpdate=Korrigjimi i datës së krijimit të kontratës me vlerë të keqe
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index 8b8346f96d9..af58fa22b31 100644
--- a/htdocs/langs/sq_AL/interventions.lang
+++ b/htdocs/langs/sq_AL/interventions.lang
@@ -17,7 +17,7 @@ ModifyIntervention=Ndryshoni ndërhyrjen
 CloseIntervention=Ndërhyrja e ngushtë
 DeleteInterventionLine=Fshi linjën e ndërhyrjes
 ConfirmDeleteIntervention=Je i sigurt që dëshiron ta fshish këtë ndërhyrje?
-ConfirmValidateIntervention=Jeni të sigurt që dëshironi ta vërtetoni këtë ndërhyrje me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
 ConfirmModifyIntervention=Jeni i sigurt që dëshironi ta modifikoni këtë ndërhyrje?
 ConfirmCloseIntervention=Je i sigurt që dëshiron ta mbyllësh këtë ndërhyrje?
 ConfirmDeleteInterventionLine=Je i sigurt që dëshiron ta fshish këtë linjë ndërhyrjeje?
@@ -67,7 +67,7 @@ InterLineDuration=Ndërhyrja e kohëzgjatjes së linjës
 InterLineDesc=Ndërhyrja e përshkrimit të linjës
 RepeatableIntervention=Modeli i ndërhyrjes
 ToCreateAPredefinedIntervention=Për të krijuar një ndërhyrje të paracaktuar ose të përsëritur, krijoni një ndërhyrje të përbashkët dhe shndërroni atë në shabllon ndërhyrjeje
-ConfirmReopenIntervention=Jeni i sigurt që dëshironi të hapni përsëri ndërhyrjen <b>%s<span class='notranslate'></b></s?
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Gjeneroni ndërhyrje
 FichinterNoContractLinked=Ndërhyrja %s është krijuar pa një kontratë të lidhur.
 ErrorFicheinterCompanyDoesNotExist=Kompania nuk ekziston. Ndërhyrja nuk është krijuar.
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index 3758e70d828..5dbbfd4086a 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -27,7 +27,7 @@ Language_de_CH=gjermanisht (Zvicër)
 Language_de_LU=gjermanisht (Luksemburg)
 Language_el_GR=greke
 Language_el_CY=greqisht (Qipro)
-Language_en_AE=English (United Arab Emirates)
+Language_en_AE=Anglisht (Emiratet e Bashkuara Arabe)
 Language_en_AU=anglisht (Australi)
 Language_en_CA=Anglisht (Kanada)
 Language_en_GB=Anglisht (Mbretëria e Bashkuar)
diff --git a/htdocs/langs/sq_AL/ldap.lang b/htdocs/langs/sq_AL/ldap.lang
index acab6e1486f..fc9c61488f5 100644
--- a/htdocs/langs/sq_AL/ldap.lang
+++ b/htdocs/langs/sq_AL/ldap.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Fjalëkalimi për përdoruesin <b>%s</b></span class=' në domenin notranslate'><b>%s</b> duhet të ndryshohet.
+YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=Përdoruesi duhet të ndryshojë fjalëkalimin në domenin %s
 LDAPInformationsForThisContact=Informacion në bazën e të dhënave LDAP për këtë kontakt
 LDAPInformationsForThisUser=Informacion në bazën e të dhënave LDAP për këtë përdorues
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index d27096dded2..463ffdd60f0 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -2,14 +2,14 @@
 Mailing=Dërgimi me email
 EMailing=Dërgimi me email
 EMailings=Emailet
-SMSings=SMSings
+SMSings=SMS
 AllEMailings=Të gjitha emailet
 MailCard=Karta e postës elektronike
 MailRecipients=Marrësit
 MailRecipient=Marrësi
 MailTitle=Përshkrimi
 MailFrom=Nga
-PhoneFrom=From
+PhoneFrom=Nga
 MailErrorsTo=Gabimet në
 MailReply=Ti përgjigjeni
 MailTo=për të
@@ -26,7 +26,7 @@ BodyNotIn=Jo në trup
 ShowEMailing=Shfaq dërgimin me email
 ListOfEMailings=Lista e postimeve elektronike
 NewMailing=E-mail i ri
-NewSMSing=New smsing
+NewSMSing=SMS i ri
 EditMailing=Redakto dërgimin me email
 ResetMailing=Ridërgo email
 DeleteMailing=Fshi email-in
@@ -50,10 +50,10 @@ MailingStatusReadAndUnsubscribe=Lexoni dhe çregjistrohuni
 ErrorMailRecipientIsEmpty=Marrësi i emailit është bosh
 WarningNoEMailsAdded=Nuk ka email të ri për t'u shtuar në listën e marrësve.
 ConfirmValidMailing=Jeni i sigurt që dëshironi ta vërtetoni këtë dërgim me email?
-ConfirmResetMailing=Paralajmërim, duke rifilluar dërgimin me email <b>%s<span class='notranslate'>b09a4b739f17f8z, do t'ju lejojë, ri-dërgimin e këtij emaili në një postim me shumicë. Jeni i sigurt që dëshironi ta bëni këtë?
+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=Jeni i sigurt që dëshironi ta fshini këtë email?
 NbOfUniqueEMails=Numri i emaileve unike
-NbOfUniquePhones=No. of unique phones
+NbOfUniquePhones=Numri i telefonave unikë
 NbOfEMails=Nr. i Email-eve
 TotalNbOfDistinctRecipients=Numri i marrësve të veçantë
 NoTargetYet=Nuk është përcaktuar ende asnjë marrës (Kalo në skedën "Marrësit")
@@ -147,7 +147,7 @@ UseFormatFileEmailToTarget=Skedari i importuar duhet të ketë format <strong>em
 UseFormatInputEmailToTarget=Fut një varg me format <strong>email;name;firstname;tjetër</strong>
 MailAdvTargetRecipients=Marrësit (përzgjedhja e avancuar)
 AdvTgtTitle=Plotësoni fushat e hyrjes për të zgjedhur paraprakisht palët e treta ose kontaktet/adresat për të synuar
-AdvTgtSearchTextHelp=Përdor %% si shkronja të ngurta. Për shembull, për të gjetur të gjithë artikujt si <b>jean, joe, jim</b>, mund të futni  <b>j%%</b>, mund të përdorni gjithashtu ; si ndarës për vlerën dhe përdorimin! për përveç kësaj vlere. Për shembull <b>jean;joe;jim%%;!jimo;!jimab07e5dacz0 span><span class='notranslate'></b> do të synojë të gjitha xhinset, joe, fillo me jim por jo jimo dhe jo gjithçka që fillon me jima
+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=Përdorni intervalin për të zgjedhur vlerën int ose float
 AdvTgtMinVal=Vlera minimale
 AdvTgtMaxVal=Vlera maksimale
@@ -187,8 +187,8 @@ NoMoreRecipientToSendTo=Nuk ka më marrës për të dërguar email
 EmailOptedOut=Pronari i email-it ka kërkuar që të mos e kontaktojë më me këtë email
 EvenUnsubscribe=Përfshi email-et e tërheqjes
 EvenUnsubscribeDesc=Përfshini emailet e tërheqjes kur zgjidhni emailet si objektiva. E dobishme për emailet e shërbimit të detyrueshëm për shembull.
-XEmailsDoneYActionsDone=%s email të parakualifikuar, %s emaile të përpunuara me sukses (për <span class='notranslate'>b0ecb2ec87f49f>z /veprimet e kryera)
-helpWithAi=Generate message from AI
-YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
-ModelTemplate=Email template
-YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+helpWithAi=Gjeneroni mesazh nga AI
+YouCanMakeSomeInstructionForEmail=Ju mund të bëni disa udhëzime për emailin tuaj (Shembull: gjeneroni imazh në shabllonin e emailit...)
+ModelTemplate=Modeli i postës elektronike
+YouCanChooseAModelForYouMailContent= Ju mund të zgjidhni një nga modelet shabllone ose të krijoni një me AI
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index a3ab998b935..3be12a7716f 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
@@ -68,7 +68,7 @@ ErrorNoRequestInError=Asnjë kërkesë e gabuar
 ErrorServiceUnavailableTryLater=Shërbimi nuk ofrohet për momentin. Provo sërish më vonë.
 ErrorDuplicateField=Vlera e kopjuar në një fushë unike
 ErrorSomeErrorWereFoundRollbackIsDone=U gjetën disa gabime. Ndryshimet janë rikthyer.
-ErrorConfigParameterNotDefined=Parametri <b>%s</b> nuk është i përcaktuar në skedarin e shiritit <spanr. class='notranslate'><b></span>conf.php</b>.
+ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Gjetja e përdoruesit <b>%s</b> dështoi në bazën e të dhënave Doo.
 ErrorNoVATRateDefinedForSellerCountry=Gabim, nuk janë përcaktuar tarifat e TVSH-së për shtetin '%s'.
 ErrorNoSocialContributionForSellerCountry=Gabim, nuk është përcaktuar lloji i taksave sociale/fiskale për shtetin '%s'.
@@ -103,7 +103,7 @@ RecordDeleted=Regjistrimi u fshi
 RecordGenerated=Regjistrimi i krijuar
 LevelOfFeature=Niveli i veçorive
 NotDefined=E pa përcaktuar
-DolibarrInHttpAuthenticationSoPasswordUseless=Modaliteti i vërtetimit të Dolibarr është caktuar në <b>%sb09a4b739f17f8z class='notranslate'><b>conf.php</b>.<br>Kjo do të thotë që fjalëkalimi është i jashtëm për Dolibarr, kështu që ndryshimi i kësaj fushe mund të mos ketë efekt.
+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=Administratori i sistemit
 AdministratorDesc=Administratori i sistemit (mund të administrojë përdoruesin, lejet, por edhe konfigurimin e sistemit dhe konfigurimin e moduleve)
 Undefined=E papërcaktuar
@@ -131,7 +131,7 @@ TechnicalID=ID teknike
 LineID=ID e linjës
 NotePublic=Shënim (publik)
 NotePrivate=Shënim (privat)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr u konfigurua për të kufizuar saktësinë e çmimeve të njësisë në <b>%s<span class='notranslate'>b09a4b78z0f1span .
+PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=Test
 ToFilter=Filtro
 NoFilter=Pa filtër
@@ -172,7 +172,7 @@ Close=Mbyll
 CloseAs=Cakto statusin në
 CloseBox=Hiq miniaplikacionin nga paneli yt
 Confirm=Konfirmo
-ConfirmSendCardByMail=Dëshiron vërtet të dërgosh përmbajtjen e kësaj karte me postë te <b>%s<span class='notranslate'>b09a4b739f17f /span>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=Fshi
 Remove=Hiq
 Resiliate=Përfundoni
@@ -189,7 +189,7 @@ SaveAndStay=Kurseni dhe qëndroni
 SaveAndNew=Ruaj dhe e re
 TestConnection=Testoni lidhjen
 ToClone=Klon
-ConfirmCloneAsk=Jeni i sigurt që dëshironi të klononi objektin <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Zgjidhni të dhënat që dëshironi të klononi:
 NoCloneOptionsSpecified=Nuk janë përcaktuar të dhëna për klonim.
 Of=e
@@ -267,7 +267,7 @@ Numero=Numri
 Limit=Kufiri
 Limits=Limitet
 Logout=Shkyç
-NoLogoutProcessWithAuthMode=Nuk ka veçori të zbatueshme shkëputjeje me modalitetin e vërtetimit <b>%s<span class='notranslate'>b09a4b739f17f
+NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
 Connection=Identifikohu
 Setup=Konfiguro
 Alert=Alarmi
@@ -420,6 +420,8 @@ TotalTTCShort=Totali (përfshirë taksat)
 TotalHT=Totali (pa taksa)
 TotalHTforthispage=Totali (pa taksa) për këtë faqe
 Totalforthispage=Totali për këtë faqe
+GrandTotal=Total i madh
+TotalforAllPages=Totali për të gjitha faqet
 TotalTTC=Totali (përfshirë taksat)
 TotalTTCToYourCredit=Totali (përfshirë tatimin) në kreditin tuaj
 TotalVAT=Taksa totale
@@ -502,7 +504,7 @@ Completed=E përfunduar
 Running=Në vazhdim
 RequestAlreadyDone=Kërkesa është regjistruar tashmë
 Filter=Filtro
-FilterOnInto=Kriteret e kërkimit '<strong>%s</strong>' në fusha <span>' notranslate'>%s</span>
+FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=Hiq filtrin
 ChartGenerated=Grafiku u krijua
 ChartNotGenerated=Grafiku nuk u krijua
@@ -647,6 +649,7 @@ ReportName=Emri i raportit
 ReportPeriod=Periudha e raportimit
 ReportDescription=Përshkrimi
 Report=Raportoni
+Reports=Reports
 Keyword=Fjalë kyçe
 Origin=Origjina
 Legend=Legjenda
@@ -757,7 +760,7 @@ MenuMembers=Anëtarët
 MenuAgendaGoogle=Axhenda e Google
 MenuTaxesAndSpecialExpenses=Taksat | Shpenzime të veçanta
 ThisLimitIsDefinedInSetup=Kufiri i Dolibarr (Menu home-setup-security): %s Kb, kufiri PHP: %s Kb
-ThisLimitIsDefinedInSetupAt=Kufiri i dolibarr (Menyja %s): %s Kb, kufiri PHP (Param b0ecb9fpanz80f >): <span class='notranslate'>%s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
 NoFileFound=Asnjë dokument i ngarkuar
 CurrentUserLanguage=Gjuha aktuale
 CurrentTheme=Tema aktuale
@@ -787,7 +790,7 @@ Merge=Shkrihet
 DocumentModelStandardPDF=Modeli standard PDF
 PrintContentArea=Shfaq faqen për të printuar zonën kryesore të përmbajtjes
 MenuManager=Menaxheri i menysë
-WarningYouAreInMaintenanceMode=Paralajmërim, ju jeni në modalitetin e mirëmbajtjes: vetëm hyni <b>%s<span class='notranslate'>b09a4b739f17f8>z lejohet të përdorë aplikacionin në këtë mënyrë.
+WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
 CoreErrorTitle=Gabim sistemi
 CoreErrorMessage=Na vjen keq, ka ndodhur një gabim. Kontaktoni administratorin e sistemit tuaj për të kontrolluar regjistrat ose çaktivizoni $dolibarr_main_prod=1 për të marrë më shumë informacion.
 CreditCard=Kartë Krediti
@@ -865,7 +868,7 @@ Access=Qasja
 SelectAction=Zgjidhni veprimin
 SelectTargetUser=Zgjidhni përdoruesin/punonjësin e synuar
 HelpCopyToClipboard=Përdorni Ctrl+C për të kopjuar në kujtesën e fragmenteve
-SaveUploadedFileWithMask=Ruani skedarin në server me emrin "<strong>%s</strong> (otherwise>" <span class='notranslate'>%s")
+SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Emri origjinal i skedarit
 SetDemandReason=Cakto burimin
 SetBankAccount=Përcaktoni llogarinë bankare
@@ -963,6 +966,7 @@ AutomaticallyCalculated=Llogaritur automatikisht
 TitleSetToDraft=Kthehu te drafti
 ConfirmSetToDraft=Jeni i sigurt që dëshironi të ktheheni në statusin Draft?
 ImportId=ID-ja e importit
+Event=Ngjarja
 Events=Ngjarjet
 EMailTemplates=Modelet e postës elektronike
 FileNotShared=Skedari nuk është ndarë me publikun e jashtëm
@@ -1048,7 +1052,7 @@ Select2NotFound=Nuk u gjet asnjë rezultat
 Select2Enter=Hyni
 Select2MoreCharacter=ose më shumë karakter
 Select2MoreCharacters=ose më shumë personazhe
-Select2MoreCharactersMore=<strong>Sintaksa e kërkimit:</strong>b0342fccfda19bzlate class='translate <kbd><strong> |</strong>b04da'6f><5/08660 notranslate'><kbd> OSE</kbd> (a|b)<br></kbd> (a|b)<br><span class='061a /span><strong>*</strong></kbd></spanno><span' class='notranslate'> ><kbd> Çdo karakter</kbd> (a*b)<br><span class='notranslate'020z span><strong>^</strong></kbd></spannotranslate' class=> <kbd> Fillo me</kbd> (^ab)<br><span class='notranslate'06>7063 <strong>$</strong></kbd><span><span class='notranslate'8 /span> Përfundojnë me</kbd> (ab$)<br>
+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=Po ngarkon më shumë rezultate...
 Select2SearchInProgress=Kërkimi në vazhdim...
 SearchIntoThirdparties=Palëve të treta
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=Jeni i sigurt që dëshironi të caktoni përdoruesit
 ConfirmSetSupervisorQuestion=Jeni i sigurt që dëshironi të vendosni mbikëqyrësin në rekordet e zgjedhura %s?
 ConfirmUpdatePriceQuestion=Jeni i sigurt që dëshironi të përditësoni çmimin e %s rekordit(eve) të zgjedhura?
 CategTypeNotFound=Nuk u gjet asnjë lloj etikete për llojin e regjistrimeve
-Rate=Vlerësoni
 SupervisorNotFound=Mbikëqyrësi nuk u gjet
 CopiedToClipboard=Kopjuar në kujtesën e fragmenteve
 InformationOnLinkToContract=Kjo shumë është vetëm totali i të gjitha linjave të kontratës. Asnjë nocion i kohës nuk merret parasysh.
@@ -1213,6 +1216,7 @@ CanceledHidden=U anulua u fsheh
 CanceledShown=U shfaqur anuluar
 Terminate=Përfundoni
 Terminated=Përfundoi
+Position=Pozicioni
 AddLineOnPosition=Shtoni rreshtin në pozicion (në fund nëse është bosh)
 ConfirmAllocateCommercial=Cakto konfirmimin e përfaqësuesit të shitjeve
 ConfirmAllocateCommercialQuestion=Jeni i sigurt që dëshironi të caktoni %s rekordet e zgjedhura?
@@ -1230,6 +1234,7 @@ ExternalUser=Përdorues i jashtëm
 NoSpecificContactAddress=Asnjë kontakt apo adresë specifike
 NoSpecificContactAddressBis=Kjo skedë është e dedikuar për të detyruar kontakte ose adresa specifike për objektin aktual. Përdoreni atë vetëm nëse dëshironi të përcaktoni një ose disa kontakte ose adresa specifike për objektin kur informacioni për palën e tretë nuk është i mjaftueshëm ose jo i saktë.
 HideOnVCard=Fshih %s
+ShowOnVCard=Shfaq %s
 AddToContacts=Shto adresën në kontaktet e mia
 LastAccess=Qasja e fundit
 UploadAnImageToSeeAPhotoHere=Ngarko një imazh nga skeda %s për të parë një foto këtu
@@ -1259,4 +1264,7 @@ AmountSalary=Shuma e pagës
 InvoiceSubtype=Nëntipi i faturës
 ConfirmMassReverse=Konfirmim i kundërt me shumicë
 ConfirmMassReverseQuestion=Jeni i sigurt që dëshironi të ktheni mbrapsht rekordet e zgjedhura %s?
-
+ElementType=Lloji i elementit
+ElementId=Id i elementit
+Encrypted=E koduar
+Settings=Cilësimet
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 10006c607c1..f78468ca7cb 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -13,7 +13,7 @@ MembersTickets=Fleta e adresës së anëtarësimit
 FundationMembers=Anëtarët e fondacionit
 ListOfValidatedPublicMembers=Lista e anëtarëve publikë të vërtetuar
 ErrorThisMemberIsNotPublic=Ky anëtar nuk është publik
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Një anëtar tjetër (emri: <b>%s</b>, <span>, classlog ='notranslate'><b></span>%s</b>) është tashmë i lidhur me një palë të tretë class='notranslate '><b></span>%s</b>. Hiqe fillimisht këtë lidhje sepse një palë e tretë nuk mund të lidhet vetëm me një anëtar (dhe anasjelltas).
+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=Për arsye sigurie, duhet t'ju jepen lejet për të modifikuar të gjithë përdoruesit që të mund të lidhni një anëtar me një përdorues që nuk është i juaji.
 SetLinkToUser=Lidhje me një përdorues të Dolibarr
 SetLinkToThirdParty=Lidhja me një palë të tretë të Dolibarr
@@ -202,7 +202,7 @@ LastMemberDate=Data e fundit e anëtarësimit
 LatestSubscriptionDate=Data e fundit e kontributit
 MemberNature=Natyra e anëtarit
 MembersNature=Natyra e anëtarëve
-Public=%s mund të publikojë anëtarësimin tim në <a target="_blank" href="%s">regjistrin publik<span class='notranslate'></a></s>
+Public=%s can publish my membership in <a target="_blank" href="%s">the public register</a>
 MembershipPublic=Anëtarësimi publik
 NewMemberbyWeb=U shtua një anëtar i ri. Në pritje të miratimit
 NewMemberForm=Formulari i ri i anëtarësimit
@@ -239,10 +239,10 @@ MemberLastname=Mbiemri i anëtarit
 MemberCodeDesc=Kodi i Anëtarit, unik për të gjithë anëtarët
 MemberSubscriptionStartFirstDayOf=Data e fillimit të anëtarësimit korrespondon me ditën e parë të a
 MemberSubscriptionStartAfter=Periudha minimale para hyrjes në fuqi të datës së fillimit të një abonimi, përveç rinovimeve (shembull +3m = +3 muaj, -5d = -5 ditë, +1Y = +1 vit)
-SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
-ConfirmMassSubsriptionCreation=Confirm subscription creation
-ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
-XSubsriptionCreated=%s subscription(s) created
-XSubsriptionErrors=%s subscription(s) where in error
-CreateSubscription=Create subscription
-WarningNoComplementaryActionDone=No Complementary action on recording will be executed with this massaction
+SubscriptionLinkedToConciliatedTransaction=Anëtarësimi është i lidhur me një transaksion të pajtimit, kështu që ky modifikim nuk lejohet.
+ConfirmMassSubsriptionCreation=Konfirmo krijimin e abonimit
+ConfirmMassSubsriptionCreationQuestion=Jeni i sigurt që dëshironi të krijoni abonimin(et) e zgjedhura %s?
+XSubsriptionCreated=%s abonim(a) u krijua
+XSubsriptionErrors=%s abonim(a) ku është gabim
+CreateSubscription=Krijo abonim
+WarningNoComplementaryActionDone=Asnjë veprim plotësues në regjistrim nuk do të ekzekutohet me këtë masakër
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 8faf0580333..c9852a9e9e0 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfModuleDesc=Futni emrin e modulit/aplikacionit për të krijuar pa hap
 EnterNameOfObjectDesc=Futni emrin e objektit për të krijuar pa hapësira. Përdorni shkronja të mëdha për të ndarë fjalët (Për shembull: Objekti im, Student, Mësues...). Do të krijohen skedari i klasës CRUD, faqet për të renditur/shtuar/redaktuar/fshirë objektin dhe skedarët SQL.
 EnterNameOfDictionaryDesc=Futni emrin e fjalorit për të krijuar pa hapësira. Përdorni shkronja të mëdha për të ndarë fjalët (Për shembull: MyDico...). Do të gjenerohet skedari i klasës, por edhe skedari SQL.
 ModuleBuilderDesc2=Rruga ku gjenerohen/redaktohen modulet (drejtoria e parë për modulet e jashtme e përcaktuar në %s): <strong>%s</strong>
-ModuleBuilderDesc3=Module të gjeneruara/të redaktueshme u gjetën: <strong>%s<span class='notranslate'>b0a65d071f6fc9>z0
+ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=Një modul zbulohet si "modul për ndërtuesin e modulit" kur skedari <strong>%sb0f065  ekziston në rrënjën e drejtorisë së modulit
 NewModule=Moduli i ri
 NewObjectInModulebuilder=Objekti i ri
@@ -27,7 +27,7 @@ ModuleBuilderDeschooks=Kjo skedë është e dedikuar për grepa.
 ModuleBuilderDescwidgets=Kjo skedë është e dedikuar për të menaxhuar/ndërtuar miniaplikacione.
 ModuleBuilderDescbuildpackage=Këtu mund të gjeneroni një skedar paketë "gati për t'u shpërndarë" (një skedar .zip i normalizuar) të modulit tuaj dhe një skedar dokumentacioni "gati për t'u shpërndarë". Thjesht klikoni në butonin për të ndërtuar skedarin e paketës ose dokumentacionit.
 EnterNameOfModuleToDeleteDesc=Ju mund të fshini modulin tuaj. PARALAJMËRIM: Të gjithë skedarët e kodimit të modulit (të krijuara ose të krijuara me dorë) DHE të dhënat dhe dokumentacioni i strukturuar do të fshihen!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to the object will be deleted!
+EnterNameOfObjectToDeleteDesc=Ju mund të fshini një objekt. PARALAJMËRIM: Të gjithë skedarët e kodimit (të krijuara ose të krijuara manualisht) që lidhen me objektin do të fshihen!
 DangerZone=Zone e rrezikshme
 BuildPackage=Ndërtoni paketën
 BuildPackageDesc=Ju mund të gjeneroni një paketë zip të aplikacionit tuaj në mënyrë që të jeni gati ta shpërndani atë në çdo Dolibarr. Mund ta shpërndani ose ta shisni gjithashtu në treg si <a href="https://www.dolistore.com">DoliStore.com</a>.
@@ -58,7 +58,7 @@ LanguageFile=Skedari për gjuhën
 ObjectProperties=Vetitë e objektit
 Property=Prona
 PropertyDesc=Një veti është një atribut që karakterizon një objekt. Ky atribut ka një kod, një etiketë dhe një lloj me disa opsione.
-ConfirmDeleteProperty=Jeni i sigurt që dëshironi të fshini pronën <strong>%s<span class='notranslate'></strong></s? Kjo do të ndryshojë kodin në klasën PHP, por gjithashtu do të heqë kolonën nga përkufizimi i tabelës së objektit.
+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=Jo NULL
 NotNullDesc=1=Cakto bazën e të dhënave në NOT NULL, 0=Lejo vlerat null, -1=Lejo vlerat null duke e detyruar vlerën në NULL nëse është bosh ('' ose 0)
 SearchAll=Përdoret për 'kërko të gjitha'
@@ -91,10 +91,10 @@ ListOfMenusEntries=Lista e hyrjeve në menu
 ListOfDictionariesEntries=Lista e hyrjeve të fjalorëve
 ListOfPermissionsDefined=Lista e lejeve të përcaktuara
 SeeExamples=Shikoni shembuj këtu
-EnabledDesc=Kusht për ta pasur këtë fushë aktive.<br><br>Shembuj:b0342fccfda19>bz0</s span class='notranslate'><br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=A është fusha e dukshme? (Shembuj: 0=Asnjëherë i dukshëm, 1=I dukshëm në listë dhe krijo/përditëso/shiko formularët, 2=Duket vetëm në listë, 3=Duket vetëm në formën e krijimit/përditësimit/shikimit (jo në lista), 4=I dukshëm në lista dhe përditëso/shiko vetëm formularin (jo krijo), 5=Duket në listë dhe shiko vetëm formularin (jo krijo, jo përditësoi).<br><br> Përdorimi i një vlere negative do të thotë që fusha nuk shfaqet si parazgjedhje në listë, por mund të zgjidhet për t'u parë).
 ItCanBeAnExpression=Mund të jetë një shprehje. Shembull:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$er ->hasRight('pushime', 'define_pushime')?1:5
-DisplayOnPdfDesc=Shfaqni këtë fushë në dokumente të përputhshme PDF, ju mund të menaxhoni pozicionin me fushën "Pozicioni".<br><strong>Për dokumentin :</strong><br>0 = nuk shfaqet <br>1 = nuk shfaq<span' class=' ><br></span>2 = shfaq vetëm nëse nuk është bosh<br><br><span class='notranslate'430</b947c span>Për linjat e dokumentit:</strong><br>0 = nuk shfaqet b0342fccfdaspan19>0 = shfaqet në një kolonë<span class='notranslate'><br>3 = shfaq në kolonën e përshkrimit të rreshtit pas përshkrimit<br>4 = shfaq në kolonën e përshkrimit pas përshkrimit vetëm nëse jo bosh
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=Në PDF
 IsAMeasureDesc=A mund të grumbullohet vlera e fushës për të futur një total në listë? (Shembuj: 1 ose 0)
 SearchAllDesc=A përdoret fusha për të bërë një kërkim nga mjeti i kërkimit të shpejtë? (Shembuj: 1 ose 0)
@@ -111,7 +111,7 @@ TriggerDefDesc=Përcaktoni në skedarin e aktivizimit kodin që dëshironi të e
 SeeIDsInUse=Shikoni ID-të në përdorim në instalimin tuaj
 SeeReservedIDsRangeHere=Shikoni gamën e ID-ve të rezervuara
 ToolkitForDevelopers=Paketa e veglave për zhvilluesit e Dolibarr
-TryToUseTheModuleBuilder=Nëse keni njohuri për SQL dhe PHP, mund të përdorni magjistarin e ndërtuesit të moduleve.<br>Aktivizo modulin <strong>%s</strong> dhe përdor magjistarin duke klikuar <span class="fa fa-bug"></spannotranslate' class='notranslate' ></span> në menynë lart djathtas.<br>Kujdes: Ky është një veçori e avancuar e zhvilluesit, bëni b0aee83365837>t<0z span class='notranslate'></b> eksperiment në faqen tuaj të prodhimit!
+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=Shiko <span class="fa fa-bug"></span> në menynë lart djathtas
 AddLanguageFile=Shto skedarin e gjuhës
 YouCanUseTranslationKey=Këtu mund të përdorni një çelës që është çelësi i përkthimit që gjendet në skedarin e gjuhës (shih skedën "Gjuhët")
@@ -148,7 +148,7 @@ CSSListClass=CSS për listën
 NotEditable=E pa modifikueshme
 ForeignKey=Çelësi i huaj
 ForeignKeyDesc=Nëse vlera e kësaj fushe duhet të garantohet se ekziston në një tabelë tjetër. Fut këtu një sintaksë që përputhet me vlerën: emri i tabelës.parentfieldtocheck
-TypeOfFieldsHelp=Shembull:<br>varchar(99)<br>email<br>-telefon<pans0</s ='notranslate'><br>ip<br>url<br>fjalëkalimi<span class='notranslate'0342fccfda19bz0</span> span>double(24,8)<br>reale<br>tekstb0342fccfda19>b0342fccfda19>z <span class='notranslate'><br>data<br>datetime<br>class='notranslate'span <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<span class='notranslate' /span><br>'1' do të thotë se ne shtojmë një buton + pas kombinimit për të krijuar rekordin<br>'filtri' është një Kushti i sintaksës së filtrit universal, shembull: '((statusi:=:1) AND (fk_user:=:__USER_ID__) AND (entiteti:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Ky është lloji i fushës/atributit.
 AsciiToHtmlConverter=Konvertuesi Ascii në HTML
 AsciiToPdfConverter=Konvertuesi Ascii në PDF
@@ -180,9 +180,9 @@ FailedToAddCodeIntoDescriptor=Shtimi i kodit në përshkrues dështoi. Kontrollo
 DictionariesCreated=Fjalori <b>%s</b> u krijua me sukses
 DictionaryDeleted=Fjalori <b>%s</b> u hoq me sukses
 PropertyModuleUpdated=Vetia <b>%s</b> është përditësuar me sukses
-InfoForApiFile=* Kur gjeneroni skedar për herë të parë, atëherë të gjitha metodat do të krijohen <strong>për çdo objekt.</strong><br>* Kur klikoni në <strong>hiq</strong> ju thjesht hiqni të gjitha metodat e klasës ='notranslate'><strong></span>objekt i zgjedhur</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Faqe për konfigurimin e modulit
-EmailingSelectors=Emails selectors
+EmailingSelectors=Zgjedhësit e emaileve
 EmailingSelectorDesc=Ju mund të gjeneroni dhe modifikoni këtu skedarët e klasës për të siguruar përzgjedhës të rinj të synimeve të postës elektronike për modulin e dërgimit masiv të postës elektronike
 EmailingSelectorFile=Skedari i përzgjedhësit të emaileve
 NoEmailingSelector=Nuk ka skedar përzgjedhës të postës elektronike
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index c33971042bd..4c6fe9607c4 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -47,7 +47,7 @@ DateEndPlannedMo=Data e fundit e planifikuar
 KeepEmptyForAsap=Bosh do të thotë "Sa më shpejt të jetë e mundur"
 EstimatedDuration=Kohëzgjatja e parashikuar
 EstimatedDurationDesc=Kohëzgjatja e parashikuar për të prodhuar (ose çmontuar) këtë produkt duke përdorur këtë BOM
-ConfirmValidateBom=Jeni i sigurt që dëshironi të vërtetoni BOM me referencën <strong>%s<span class='notranslate'>b0a65d071f6f6 > (ju do të jeni në gjendje ta përdorni për të ndërtuar porosi të reja prodhuese)
+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=Jeni i sigurt që dëshironi ta anuloni këtë BOM (nuk do të mund ta përdorni më për të ndërtuar porosi të reja prodhimi)?
 ConfirmReopenBom=Jeni i sigurt që dëshironi ta rihapni këtë BOM (do të jeni në gjendje ta përdorni për të krijuar porosi të reja prodhuese)
 StatusMOProduced=Prodhuar
@@ -65,6 +65,8 @@ ToProduce=Të prodhosh
 ToObtain=Për të marrë
 QtyAlreadyConsumed=Sasia e konsumuar tashmë
 QtyAlreadyProduced=Sasia e prodhuar tashmë
+QtyAlreadyConsumedShort=Sasia e konsumuar
+QtyAlreadyProducedShort=Sasia e prodhuar
 QtyRequiredIfNoLoss=Sasia e nevojshme për të prodhuar sasinë e përcaktuar në BOM nëse nuk ka humbje (nëse efikasiteti i prodhimit është 100%%)
 ConsumeOrProduce=Konsumoni ose prodhoni
 ConsumeAndProduceAll=Konsumoni dhe prodhoni të gjitha
@@ -98,9 +100,9 @@ WorkstationSetup = Vendosja e stacioneve të punës
 WorkstationSetupPage = Faqja e konfigurimit të stacioneve të punës
 WorkstationList=Lista e stacioneve të punës
 WorkstationCreate=Shto stacion të ri pune
-ConfirmEnableWorkstation=Jeni të sigurt që dëshironi të aktivizoni stacionin e punës <b>%s<span class='notranslate'></b>?
+ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
 EnableAWorkstation=Aktivizo një stacion pune
-ConfirmDisableWorkstation=Jeni i sigurt që dëshironi të çaktivizoni stacionin e punës <b>%s<span class='notranslate'></b>?
+ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
 DisableAWorkstation=Çaktivizo një stacion pune
 DeleteWorkstation=Fshi
 NbOperatorsRequired=Numri i operatorëve të kërkuar
@@ -134,4 +136,3 @@ NoRemainQtyToDispatch=Nuk ka mbetur asnjë sasi për t'u ndarë
 
 THMOperatorEstimatedHelp=Kostoja e vlerësuar e operatorit për orë. Do të përdoret për të vlerësuar koston e një BOM duke përdorur këtë stacion pune.
 THMMachineEstimatedHelp=Kostoja e vlerësuar e makinës për orë. Do të përdoret për të vlerësuar koston e një BOM duke përdorur këtë stacion pune.
-
diff --git a/htdocs/langs/sq_AL/multicurrency.lang b/htdocs/langs/sq_AL/multicurrency.lang
index e5e3d5736d5..4e1b92cc03f 100644
--- a/htdocs/langs/sq_AL/multicurrency.lang
+++ b/htdocs/langs/sq_AL/multicurrency.lang
@@ -7,12 +7,12 @@ multicurrency_syncronize_error=Gabim sinkronizimi: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Përdorni datën e dokumentit për të gjetur kursin e monedhës, në vend që të përdorni kursin më të fundit të njohur
 multicurrency_useOriginTx=Kur një objekt krijohet nga një tjetër, mbani normën origjinale nga objekti burimor (përndryshe përdorni normën më të fundit të njohur)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Ju duhet të krijoni një llogari në faqen e internetit %s për të përdorur këtë funksion.<br>Merrni b0aee83fz058<3 /span>Çelësi API<span class='notranslate'></b>.<br>Nëse përdorni një llogari falas, nuk mund ta ndryshoni <b>monedha burimore</b> (USD si parazgjedhje).<br>Nëse monedha juaj kryesore nuk është USD, aplikacioni do ta rillogarisë atë automatikisht.<br><br>Ju jeni i kufizuar në 1000 sinkronizime në muaj.
+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=Tasti API
 multicurrency_appCurrencySource=Monedha burimore
 multicurrency_alternateCurrencySource=Monedha e burimit alternativ
 CurrenciesUsed=Monedhat e përdorura
-CurrenciesUsed_help_to_add=Shtoni monedhat dhe tarifat e ndryshme që duhet të përdorni në <b>propozimet</b>, <span class='notranslate'833z05<30e /span>urdhra</b> etj.
+CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
 rate=norma
 MulticurrencyReceived=Marrë, monedhë origjinale
 MulticurrencyRemainderToTake=Shuma e mbetur, monedha origjinale
@@ -25,7 +25,7 @@ CreateRate=Krijo një normë
 FormCreateRate=Krijimi i vlerës
 FormUpdateRate=Modifikimi i normës
 successRateCreate=Norma për monedhën %s është shtuar në bazën e të dhënave
-ConfirmDeleteLineRate=Jeni i sigurt që dëshironi të hiqni normën %s për monedhën %s në <span class='notranslate'>%s</s > data?
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
 DeleteLineRate=Shkalla e qartë
 successRateDelete=Vlerësimi u fshi
 errorRateDelete=Gabim gjatë fshirjes së tarifës
diff --git a/htdocs/langs/sq_AL/oauth.lang b/htdocs/langs/sq_AL/oauth.lang
index eecd7ee7029..1a409ff8efd 100644
--- a/htdocs/langs/sq_AL/oauth.lang
+++ b/htdocs/langs/sq_AL/oauth.lang
@@ -12,8 +12,8 @@ TokenDeleted=Shenja u fshi
 GetAccess=Klikoni këtu për të marrë një shenjë
 RequestAccess=Klikoni këtu për të kërkuar/rinovuar aksesin dhe për të marrë një shenjë të re
 DeleteAccess=Klikoni këtu për të fshirë shenjën
-RedirectURL=Redirect URL
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URL when creating your credentials with your OAuth provider
+RedirectURL=URL-ja e ridrejtuar
+UseTheFollowingUrlAsRedirectURI=Përdorni URL-në e mëposhtme si URL-në e ridrejtimit kur krijoni kredencialet tuaja me ofruesin tuaj OAuth
 ListOfSupportedOauthProviders=Shtoni ofruesit tuaj të tokenit OAuth2. Më pas, shkoni në faqen tuaj të administratorit të ofruesit të OAuth për të krijuar/merr një ID dhe Sekret të OAuth dhe ruajini këtu. Pasi të keni mbaruar, ndizni skedën tjetër për të gjeneruar shenjën tuaj.
 OAuthSetupForLogin=Faqe për të menaxhuar (gjeneruar/fshirë) shenjat OAuth
 SeePreviousTab=Shih skedën e mëparshme
@@ -29,7 +29,7 @@ OAUTH_GOOGLE_SECRET=OAuth Google Secret
 OAUTH_GITHUB_NAME=Shërbimi OAuth GitHub
 OAUTH_GITHUB_ID=OAuth GitHub ID
 OAUTH_GITHUB_SECRET=OAuth GitHub Sekret
-OAUTH_URL_FOR_CREDENTIAL=Shko te <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">kjo faqe<span class="fas fa-external-link-alt paddingleft"></span></spannotranslate' class= ></a> për të krijuar ose marrë ID-në tuaj OAuth dhe sekretin
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=Testi i vijave OAuth
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
 OAUTH_ID=ID-ja e klientit OAuth
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 09d63152e3a..2d1ebc8b5bf 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -103,10 +103,10 @@ disablelinefree=Nuk ka linja falas
 CloseOrder=Mbyll porosinë
 ConfirmCloseOrder=Jeni i sigurt që dëshironi ta caktoni këtë porosi për të dorëzuar? Pasi një porosi të dorëzohet, ajo mund të vendoset në faturim.
 ConfirmDeleteOrder=Jeni i sigurt që dëshironi ta fshini këtë porosi?
-ConfirmValidateOrder=Jeni të sigurt që dëshironi ta vërtetoni këtë porosi me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z ?
-ConfirmUnvalidateOrder=Jeni i sigurt që dëshironi të rivendosni rendin <b>%s<span class='notranslate'></b> në statusin e draftit</pan> ?
+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=Jeni i sigurt që dëshironi ta anuloni këtë porosi?
-ConfirmMakeOrder=Jeni i sigurt që dëshironi të konfirmoni se e keni bërë këtë porosi në <b>%s<span class='notranslate'>b09a4b739f17f80 >?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=Gjeneroni faturë
 ClassifyShipped=Klasifikoni dorëzuar
 PassedInShippedStatus=klasifikuar dorëzuar
@@ -125,12 +125,12 @@ OrderMode=Mënyra e porositjes
 AuthorRequest=Kërkoni autor
 UserWithApproveOrderGrant=Përdoruesve u jepet leja e "miratimit të porosive".
 PaymentOrderRef=Pagesa e porosisë %s
-ConfirmCloneOrder=Jeni të sigurt që dëshironi ta klononi këtë porosi <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Po merr porosinë e blerjes %s
 FirstApprovalAlreadyDone=Miratimi i parë tashmë është bërë
 SecondApprovalAlreadyDone=Aprovimi i dytë tashmë është bërë
 SupplierOrderReceivedInDolibarr=Porosia e blerjes %s u mor %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
+SupplierOrderSubmitedInDolibarr=Porosia e blerjes %s u dorëzua (%s)
 SupplierOrderClassifiedBilled=Urdhri i blerjes %s u faturua
 OtherOrders=Porositë e tjera
 SupplierOrderValidatedAndApproved=Porosia e furnizuesit është vërtetuar dhe miratuar: %s
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 22f3d3b0e57..ff044f4376c 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -94,7 +94,7 @@ AttachANewFile=Bashkangjit një skedar/dokument të ri
 LinkedObject=Objekti i lidhur
 NbOfActiveNotifications=Numri i njoftimeve (nr. i email-eve të marrësve)
 PredefinedMailTest=__(Përshëndetje)__\nKjo është një postë provë e dërguar në __EMAIL__.\nLinjat ndahen nga një karrocë kthimi.\n\n__SIGNATURE_USER__
-PredefinedMailTestHtml=__(Përshëndetje)__<br>Ky është një <b>testb09a4b739f17f dërguar</span8> në __EMAIL__ (fjala test duhet të jetë me shkronja të zeza).<span class='notranslate'><br>Rreshtat janë të ndara nga një karrocë kthimi.<br><br>__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=__(Përshëndetje)__\n\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Përshëndetje)__\n\nJu lutemi gjeni të bashkangjitur faturën __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Përshëndetje)__\n\nJu rikujtojmë se fatura __REF__ duket se nuk është paguar. Një kopje e faturës është bashkangjitur si kujtesë.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
@@ -187,9 +187,9 @@ BugTracker=Gjurmuesi i gabimeve
 SendNewPasswordDesc=Ky formular ju lejon të kërkoni një fjalëkalim të ri. Ai do të dërgohet në adresën tuaj të emailit.<br>Ndryshimi do të hyjë në fuqi sapo të klikoni në lidhjen e konfirmimit në email.<br> Kontrolloni kutinë tuaj.
 EnterNewPasswordHere=Shkruani fjalëkalimin tuaj të ri këtu
 BackToLoginPage=Kthehu në faqen e identifikimit
-AuthenticationDoesNotAllowSendNewPassword=Modaliteti i vërtetimit është <b>%s</b></span'notranslate'>. ><br>Në këtë modalitet, Dolibarr nuk mund ta dijë dhe as të ndryshojë fjalëkalimin tuaj.<br>Kontakto administratorin e sistemit nëse dëshiron të ndryshosh fjalëkalimin.
+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=Instaloni ose aktivizoni bibliotekën GD në instalimin tuaj të PHP për të përdorur këtë opsion.
-ProfIdShortDesc=<b>ID-ja e profilit %s</b> është një informacion i palës së tretë. <br>Për shembull, për shtetin <b>%s</spannotranslate class=' '></b>, është kodi <b>%s<span class='nofaspan7</span><span.
+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=Demo Dolibarr ERP/CRM
 StatsByAmount=Statistikat për sasinë e produkteve/shërbimeve
 StatsByAmountProducts=Statistikat për sasinë e produkteve
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Ngarkimi i skedarit dështoi <b>%s</b>.
 AddFolder=Krijo nje dosje
 FileWasCreateFolder=Dosja <b>%s</b> është krijuar
 FTPFailedToCreateFolder=Dështoi në krijimin e dosjes <b>%s</b>.
+SelectADay=Zgjidhni një ditë në kalendar
+SelectANewDate=Zgjidhni një datë të re
diff --git a/htdocs/langs/sq_AL/partnership.lang b/htdocs/langs/sq_AL/partnership.lang
index 878e3e2092d..53f55b50f45 100644
--- a/htdocs/langs/sq_AL/partnership.lang
+++ b/htdocs/langs/sq_AL/partnership.lang
@@ -55,7 +55,7 @@ PartnershipDedicatedToThisMember=Partneritet kushtuar këtij anëtari
 DatePartnershipStart=Data e fillimit
 DatePartnershipEnd=Data e përfundimit
 ReasonDecline=Refuzoni arsyen
-ReasonDeclineOrCancel=Reason for refusal or cancellation
+ReasonDeclineOrCancel=Arsyeja e refuzimit ose anulimit
 PartnershipAlreadyExist=Partneriteti tashmë ekziston
 ManagePartnership=Menaxhoni partneritetin
 BacklinkNotFoundOnPartnerWebsite=Lidhja e pasme nuk u gjet në faqen e internetit të partnerit
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Numri i gabimeve për kontrollin e fundit të URL-së
 LastCheckBacklink=Data e kontrollit të fundit të URL-së
 
 NewPartnershipRequest=Kërkesë e re për partneritet
-NewPartnershipRequestDesc=Ky formular ju lejon të kërkoni të jeni pjesë e një prej programeve tona të partneritetit. Nëse keni nevojë për ndihmë për të plotësuar këtë formular, ju lutemi kontaktoni me email <b>%s<span class='notranslate'>b09a4b739f17f8z span>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Kjo faqe duhet të përmbajë të paktën një lidhje me një nga domenet e mëposhtme: %s
 
 IPOfApplicant=IP e aplikantit
-
diff --git a/htdocs/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang
index 831bbabc592..31a8e3bb0dc 100644
--- a/htdocs/langs/sq_AL/paybox.lang
+++ b/htdocs/langs/sq_AL/paybox.lang
@@ -13,7 +13,7 @@ PaymentCode=Kodi i pagesës
 PayBoxDoPayment=Paguani me Paybox
 YouWillBeRedirectedOnPayBox=Do të ridrejtoheni në faqen e sigurt të Paybox për të futur informacionin e kartës së kreditit
 Continue=Tjetri
-SetupPayBoxToHavePaymentCreatedAutomatically=Konfiguro Paybox-in tuaj me url <b>%s<span class='notranslate'></b> automatikisht, kur pagesa të krijohen në</span vërtetuar nga Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=Kjo faqe konfirmon që pagesa juaj është regjistruar. Faleminderit.
 YourPaymentHasNotBeenRecorded=Pagesa juaj NUK është regjistruar dhe transaksioni është anuluar. Faleminderit.
 AccountParameter=Parametrat e llogarisё
diff --git a/htdocs/langs/sq_AL/paypal.lang b/htdocs/langs/sq_AL/paypal.lang
index 3485208e1ff..828fbc4b27c 100644
--- a/htdocs/langs/sq_AL/paypal.lang
+++ b/htdocs/langs/sq_AL/paypal.lang
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=U krye një rikthim në të gjitha veprimet e
 ValidationOfPaymentFailed=Verifikimi i pagesës dështoi
 CardOwner=Mbajtësi i kartës
 PayPalBalance=Kredi Paypal
-OnlineSubscriptionPaymentLine=Abonimi në linjë i regjistruar në %s<br>Paguar nëpërmjet b0ecb2ec87f49fzpan class='span><span notranslate'><br>Adresa IP e origjinës: %s<br>Identifikimi i transaksionit: <spanf2000/01/2011 </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 27b83c81428..92aa5b50dc6 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -6,6 +6,9 @@ ProductStatusNotOnBatch=Jo (seriali/seriali nuk është përdorur)
 ProductStatusOnBatchShort=Shumë
 ProductStatusOnSerialShort=Serial
 ProductStatusNotOnBatchShort=Nr
+BatchSellOrEatByMandatoryList=Bëje të detyrueshme %s ose %s
+BatchSellOrEatByMandatoryNone=Asnje
+BatchSellOrEatByMandatoryAll=%s dhe %s
 Batch=Lot/Serial
 atleast1batchfield=Data e ngrënies ose data e shitjes ose numri i lotit/serialit
 batch_number=Loti/Numri serial
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 8767d803a18..3acdec8e71c 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -18,7 +18,7 @@ Reference=Reference
 NewProduct=Produkt i ri
 NewService=Shërbimi i ri
 ProductVatMassChange=Përditësimi global i TVSH-së
-ProductVatMassChangeDesc=Ky mjet përditëson normën e TVSH-së të përcaktuar në <b><u>ALLb0aaa878fdca4span</span class='notranslate'></b> produkte dhe shërbime!
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
 MassBarcodeInit=Fillimi i barkodit masiv
 MassBarcodeInitDesc=Kjo faqe mund të përdoret për të inicializuar një barkod në objekte që nuk kanë barkod të përcaktuar. Kontrolloni përpara se të përfundojë konfigurimi i barkodit të modulit.
 ProductAccountancyBuyCode=Kodi i kontabilitetit (blerje)
@@ -161,7 +161,7 @@ ListProductByPopularity=Lista e produkteve sipas popullaritetit
 ListServiceByPopularity=Lista e shërbimeve sipas popullaritetit
 Finished=Produkt i prodhuar
 RowMaterial=Lëndë e parë
-ConfirmCloneProduct=Jeni të sigurt që dëshironi të klononi produktin ose shërbimin <b>%s<span class='notranslate'>b09a4b739f17f8z?
+ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klononi të gjitha informacionet kryesore të produktit/shërbimit
 ClonePricesProduct=Çmimet e klonit
 CloneCategoriesProduct=Klononi etiketat/kategoritë e lidhura
@@ -208,11 +208,6 @@ unitSET=Set
 unitS=Së dyti
 unitH=Ora
 unitD=Dita
-unitG=gram
-unitM=Metër
-unitLM=Metër linear
-unitM2=Metër katror
-unitM3=Metër kub
 unitL=Litër
 unitT=ton
 unitKG=kg
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=paund
 unitOZ=ons
 unitM=Metër
+unitLM=Metër linear
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -289,9 +285,9 @@ MinimumRecommendedPrice=Çmimi minimal i rekomanduar është: %s
 PriceExpressionEditor=Redaktori i shprehjes së çmimeve
 PriceExpressionSelected=Shprehja e zgjedhur e çmimit
 PriceExpressionEditorHelp1="çmimi = 2 + 2" ose "2 + 2" për vendosjen e çmimit. Përdorimi ; për të ndarë shprehjet
-PriceExpressionEditorHelp2=Ju mund të hyni në ExtraFields me variabla si <b>#extrafield_myextrafieldkey#</b> dhe variabla globale me 30ee83ae<30e7=30' /span>#global_mycode#<span class='notranslate'></b>
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=Si në çmimet e produktit/shërbimit ashtu edhe në çmimet e shitësit ka këto variabla të disponueshme:<br><b>#tva_tx# #localtax1_tx2#_ta pesha# #length# #sipërfaqja# #price_min#</b>
-PriceExpressionEditorHelp4=Vetëm në çmimin e produktit/shërbimit: <b>#supplier_min_price#</b>bcc</0349>b0342f vetëm çmimet e shitësit: <span class='notranslate'><b>#supplier_quantity# dhe #supplier_tva_tx#</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=Vlerat globale të disponueshme:
 PriceMode=Modaliteti i çmimit
 PriceNumeric=Numri
@@ -361,7 +357,7 @@ ProductAttributeName=Atributi i variantit %s
 ProductAttribute=Atribut variant
 ProductAttributeDeleteDialog=Jeni i sigurt që dëshironi ta fshini këtë atribut? Të gjitha vlerat do të fshihen
 ProductAttributeValueDeleteDialog=Jeni i sigurt që dëshironi të fshini vlerën "%s" me referencën "%s" të këtij atributi?
-ProductCombinationDeleteDialog=Jeni i sigurt që dëshironi të fshini variantin e produktit "<strong>%s<span class='notranslate'>b0a65d071f6f6fc >"?
+ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Pati një gabim gjatë fshirjes së variantit. Ju lutemi kontrolloni që të mos përdoret në asnjë objekt
 ProductCombinations=Variantet
 PropagateVariant=Përhapni variante
@@ -437,3 +433,6 @@ ModifyValueExtrafields = Ndrysho vlerën e një ekstrafushe
 OrProductsWithCategories=Ose produkte me etiketa/kategori
 WarningTransferBatchStockMouvToGlobal = Nëse dëshironi të deserializoni këtë produkt, i gjithë stoku i tij i serializuar do të shndërrohet në stok global
 WarningConvertFromBatchToSerial=Nëse aktualisht keni një sasi më të madhe ose të barabartë me 2 për produktin, kalimi në këtë zgjedhje do të thotë që do të keni akoma një produkt me objekte të ndryshme të së njëjtës grumbull (ndërsa dëshironi një numër serial unik). Dublikati do të mbetet derisa të bëhet një inventar ose një lëvizje manuale e stokut për ta rregulluar këtë.
+AllowStockMovementVariantParent=Gjithashtu regjistron lëvizjet e stokut në produktet mëmë të produkteve variant
+AllowStockMovementVariantParentHelp=Si parazgjedhje, një prind i një varianti është një produkt virtual, kështu që asnjë stok nuk menaxhohet për të. Duke aktivizuar këtë opsion, një stok do të menaxhohet për produktet mëmë dhe sa herë që modifikohet një sasi stok për një produkt variant, e njëjta sasi do të modifikohet për produktin mëmë. Ju nuk duhet të keni nevojë për këtë opsion, përveç nëse përdorni variant për të menaxhuar të njëjtin produkt sesa prindi (por me përshkrime, çmime të ndryshme...)
+ConfirmSetToDraftInventory=Jeni i sigurt që dëshironi të ktheheni te statusi Draft?<br>Sasitë e vendosura aktualisht në inventar do të rivendosen.
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index ea91867d27d..e7078404943 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -47,7 +47,7 @@ NbOfProjects=Numri i projekteve
 NbOfTasks=Numri i detyrave
 TimeEntry=Ndjekja e kohës
 TimeSpent=Koha e shfrytzuar
-TimeSpentSmall=Time spent
+TimeSpentSmall=Koha e shfrytzuar
 TimeSpentByYou=Koha e shpenzuar nga ju
 TimeSpentByUser=Koha e shpenzuar nga përdoruesi
 TaskId=ID-ja e detyrës
@@ -147,7 +147,7 @@ LinkedToAnotherCompany=Lidhur me palë të treta
 TaskIsNotAssignedToUser=Detyra nuk i është caktuar përdoruesit. Përdor butonin '<strong>%s</strong>' për të caktuar detyrën tani.
 ErrorTimeSpentIsEmpty=Koha e kaluar është bosh
 TimeRecordingRestrictedToNMonthsBack=Regjistrimi i kohës është i kufizuar në %s muaj më parë
-ThisWillAlsoRemoveTasks=Ky veprim do të fshijë gjithashtu të gjitha detyrat e projektit (<b>%s<span class='notranslate'>b09a4b739f17f8z për momentin) dhe të gjitha inputet e kohës së shpenzuar.
+ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOtherObjectKeepEmpty=Nëse disa objekte (faturë, porosi, ...), që i përkasin një pale tjetër të tretë, duhet të lidhen me projektin për t'u krijuar, mbajeni këtë bosh që projekti të jetë shumë palë të treta.
 CloneTasks=Detyrat e klonimit
 CloneContacts=Klononi kontaktet
@@ -249,7 +249,7 @@ LatestProjects=Projektet më të fundit %s
 LatestModifiedProjects=Projektet më të fundit të modifikuara %s
 OtherFilteredTasks=Detyra të tjera të filtruara
 NoAssignedTasks=Nuk u gjetën detyra të caktuara (cakto projekt/detyra përdoruesit aktual nga kutia e përzgjedhjes së sipërme për të futur kohën në të)
-ThirdPartyRequiredToGenerateInvoice=Një palë e tretë duhet të përcaktohet në projekt që të jetë në gjendje ta faturojë atë.
+ThirdPartyRequiredToGenerateIntervention=Një palë e tretë duhet të përcaktohet në projekt që të jetë në gjendje të krijojë ndërhyrje.
 ThirdPartyRequiredToGenerateInvoice=Një palë e tretë duhet të përcaktohet në projekt që të jetë në gjendje ta faturojë atë.
 ChooseANotYetAssignedTask=Zgjidhni një detyrë që nuk ju është caktuar ende
 # Comments trans
@@ -292,7 +292,7 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klasifiko projektin si të mbyllur k
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Shënim: projektet ekzistuese me të gjitha detyrat tashmë të vendosura në një progres prej 100%% nuk do të preken: do t'ju duhet t'i mbyllni ato manualisht. Ky opsion prek vetëm projektet e hapura.
 SelectLinesOfTimeSpentToInvoice=Zgjidh linjat e kohës së shpenzuar që janë të pafaturuara, më pas vepro në masë "Gjenero faturë" për t'i faturuar
 ProjectTasksWithoutTimeSpent=Detyrat e projektit pa kohë të shpenzuar
-FormForNewLeadDesc=Faleminderit që plotësoni formularin e mëposhtëm për të na kontaktuar. Mund të na dërgoni gjithashtu një email direkt te <b>%s<span class='notranslate'></b></s>.
+FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
 ProjectsHavingThisContact=Projektet që kanë këtë kontakt
 StartDateCannotBeAfterEndDate=Data e përfundimit nuk mund të jetë para datës së fillimit
 ErrorPROJECTLEADERRoleMissingRestoreIt=Roli "PROJECTLEADER" mungon ose është çaktivizuar, ju lutemi rivendosni në fjalorin e llojeve të kontaktit
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index 516ab9f421f..65b4fd21eb5 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -15,8 +15,8 @@ ValidateProp=Vërtetoni propozimin tregtar
 CancelPropal=Anulo
 AddProp=Krijo propozim
 ConfirmDeleteProp=Je i sigurt që dëshiron ta fshish këtë propozim komercial?
-ConfirmValidateProp=Jeni i sigurt që dëshironi ta vërtetoni këtë propozim komercial me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z >?
-ConfirmCancelPropal=Jeni i sigurt që dëshironi të anuloni propozimin komercial <b>%s<span class='notranslate'></b></s?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+ConfirmCancelPropal=Are you sure you want to cancel commercial proposal <b>%s</b>?
 LastPropals=Propozimet më të fundit %s
 LastModifiedProposals=Propozimet më të fundit të modifikuara %s
 AllPropals=Të gjitha propozimet
@@ -61,8 +61,8 @@ DefaultProposalDurationValidity=Kohëzgjatja e parazgjedhur e vlefshmërisë së
 DefaultPuttingPricesUpToDate=Si parazgjedhje përditësoni çmimet me çmimet aktuale të njohura në klonimin e një propozimi
 DefaultPuttingDescUpToDate=Si parazgjedhje përditësoni përshkrimet me përshkrimet aktuale të njohura për klonimin e një propozimi
 UseCustomerContactAsPropalRecipientIfExist=Përdorni kontaktin/adresën me llojin "Propozimi pasues i kontaktit" nëse përcaktohet në vend të adresës së palës së tretë si adresë e marrësit të propozimit
-ConfirmClonePropal=Jeni i sigurt që dëshironi të klononi propozimin komercial <b>%s<span class='notranslate'>b09a4b739f17f8z?
-ConfirmReOpenProp=Jeni i sigurt që dëshironi të hapni përsëri propozimin komercial <b>%s<span class='notranslate'></b> ?
+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=Propozim dhe linja tregtare
 ProposalLine=Linja e propozimit
 ProposalLines=Linjat e propozimit
diff --git a/htdocs/langs/sq_AL/receiptprinter.lang b/htdocs/langs/sq_AL/receiptprinter.lang
index b80f9a475bc..c4d1eeff115 100644
--- a/htdocs/langs/sq_AL/receiptprinter.lang
+++ b/htdocs/langs/sq_AL/receiptprinter.lang
@@ -10,6 +10,7 @@ ReceiptPrinterTemplateDesc=Vendosja e shablloneve
 ReceiptPrinterTypeDesc=Shembull i vlerave të mundshme për fushën "Parametrat" sipas llojit të drejtuesit
 ReceiptPrinterProfileDesc=Përshkrimi i Profilit të Printerit të Faturave
 ListPrinters=Lista e printerave
+FromServerPointOfView=Nga pikëpamja e ueb serverit. Kjo metodë duhet të jetë e arritshme nga hosti i serverit në internet.
 SetupReceiptTemplate=Konfigurimi i shabllonit
 CONNECTOR_DUMMY=Printer bedel
 CONNECTOR_NETWORK_PRINT=Printer rrjeti
diff --git a/htdocs/langs/sq_AL/receptions.lang b/htdocs/langs/sq_AL/receptions.lang
index 3cdc4251c4d..f03be44fe78 100644
--- a/htdocs/langs/sq_AL/receptions.lang
+++ b/htdocs/langs/sq_AL/receptions.lang
@@ -5,8 +5,6 @@ RefReception=Ref. pritje
 Reception=Pritja
 Receptions=Pritje
 AllReceptions=Të gjitha pritjet
-Reception=Pritja
-Receptions=Pritje
 ShowReception=Shfaq pritjet
 ReceptionsArea=Zona e pritjes
 ListOfReceptions=Lista e pritjeve
@@ -34,7 +32,7 @@ StatusReceptionProcessedShort=Të përpunuara
 ReceptionSheet=Fletë pritjeje
 ValidateReception=Vërtetoni pritjen
 ConfirmDeleteReception=Je i sigurt që dëshiron ta fshish këtë pritje?
-ConfirmValidateReception=Jeni i sigurt që dëshironi ta vërtetoni këtë pritje me referencën <b>%s<span class='notranslate'>b09a4b739f178 >?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Je i sigurt që dëshiron ta anulosh këtë pritje?
 StatsOnReceptionsOnlyValidated=Statistikat e kryera vetëm në pritje të vërtetuara. Data e përdorur është data e vërtetimit të marrjes (data e planifikuar e dorëzimit nuk dihet gjithmonë).
 SendReceptionByEMail=Dërgo pritjen me email
diff --git a/htdocs/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang
index 1f577ebbc5e..d1c36b9bac1 100644
--- a/htdocs/langs/sq_AL/resource.lang
+++ b/htdocs/langs/sq_AL/resource.lang
@@ -37,3 +37,5 @@ ImportDataset_resource_1=Burimet
 
 ErrorResourcesAlreadyInUse=Disa burime janë në përdorim
 ErrorResourceUseInEvent=%s përdoret në ngjarjen %s
+
+MaxUsers=Përdoruesit maksimalë (vendet, vendet, etj.)
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index ef9df9bd140..781b221fe8a 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=E vërtetuar
 StatusSendingProcessedShort=Të përpunuara
 SendingSheet=Fleta e dërgesës
 ConfirmDeleteSending=Jeni i sigurt që dëshironi ta fshini këtë dërgesë?
-ConfirmValidateSending=Jeni i sigurt që dëshironi ta vërtetoni këtë dërgesë me referencën <b>%s<span class='notranslate'>b09a4b739f17 >?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Jeni i sigurt që dëshironi ta anuloni këtë dërgesë?
 DocumentModelMerou=Modeli Merou A5
 WarningNoQtyLeftToSend=Paralajmërim, nuk ka produkte që presin për t'u dërguar.
@@ -59,7 +59,7 @@ ProductQtyInCustomersOrdersRunning=Sasia e produktit nga porositë e shitjeve t
 ProductQtyInSuppliersOrdersRunning=Sasia e produktit nga porositë e hapura të blerjes
 ProductQtyInShipmentAlreadySent=Sasia e produktit nga porosia e hapur e shitjes është dërguar tashmë
 ProductQtyInSuppliersShipmentAlreadyRecevied=Sasia e produktit nga porositë e hapura të blerjes të marra tashmë
-NoProductToShipFoundIntoStock=Nuk u gjet asnjë produkt për dërgim në magazinë <b>%s<span class='notranslate'></b></s. Korrigjoni stokun ose kthehuni për të zgjedhur një magazinë tjetër.
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Peshë/Vëll
 ValidateOrderFirstBeforeShipment=Së pari duhet të vërtetoni porosinë përpara se të jeni në gjendje të bëni dërgesa.
 NoLineGoOnTabToAddSome=Nuk ka rresht, shkoni në skedën "%s" për të shtuar
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index fa423d530eb..fffdc47af8a 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -114,7 +114,7 @@ EstimatedStockValueSell=Vlera per shitje
 EstimatedStockValueShort=Vlera e aksioneve hyrëse
 EstimatedStockValue=Vlera e aksioneve hyrëse
 DeleteAWarehouse=Fshi një magazinë
-ConfirmDeleteWarehouse=Jeni të sigurt që dëshironi të fshini magazinën <b>%s<span class='notranslate'>b09a4b739f17f8z?
+ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
 PersonalStock=Aksione personale %s
 ThisWarehouseIsPersonalStock=Kjo magazinë përfaqëson stokun personal të %s %s
 SelectWarehouseForStockDecrease=Zgjidhni depon për t'u përdorur për uljen e stokut
@@ -171,7 +171,7 @@ MovementTransferStock=Transferimi i aksioneve të produktit %s në një depo tje
 BatchStockMouvementAddInGlobal=Stoku i grupit kalon në magazinë globale (produkti nuk përdor më grup)
 InventoryCodeShort=Inv./Mov. kodi
 NoPendingReceptionOnSupplierOrder=Nuk ka pritje në pritje për shkak të porosisë së hapur të blerjes
-ThisSerialAlreadyExistWithDifferentDate=Ky lot/numër serial (<strong>%s</strong> tashmë ekziston, por me>) data e ndryshme eatby ose sellby (u gjet <span class='notranslate'><strong>%sb0a65d071f6fc90 por ju shkruani <spanfc90 span class='notranslate'><strong>%s</strong>).
+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=Hapur (të gjitha lëvizjet)
 OpenInternal=E hapur (vetëm lëvizje e brendshme)
 UseDispatchStatus=Përdorni një status dërgimi (mirato/refuzoj) për linjat e produkteve në marrjen e porosisë së blerjes
@@ -253,7 +253,7 @@ DisableStockChangeOfSubProduct=Çaktivizoni ndryshimin e stokut për të gjithë
 ImportFromCSV=Importoni listën e lëvizjes CSV
 ChooseFileToImport=Ngarkoni skedarin më pas klikoni në ikonën %s për të zgjedhur skedarin si skedar importues burimi...
 SelectAStockMovementFileToImport=zgjidhni një skedar të lëvizjes së aksioneve për të importuar
-InfoTemplateImport=Skedari i ngarkuar duhet të ketë këtë format (* janë fusha të detyrueshme):<br>Depoja e burimit* | Magazina e synuar* | Produkt* | Sasia* | Loti/numri serial<br>Ndarësi i karaktereve CSV duhet të jetë "<b>b0ecb2ec80f49 span class='notranslate'></b>"
+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=Inventari %s
 ReOpen=Rihap
 ConfirmFinish=A e konfirmoni mbylljen e inventarit? Kjo do të gjenerojë të gjitha lëvizjet e aksioneve për të përditësuar stokun tuaj në sasinë reale që keni futur në inventar.
@@ -282,7 +282,7 @@ ModuleStockTransferName=Transferim i avancuar i aksioneve
 ModuleStockTransferDesc=Menaxhimi i avancuar i transferimit të aksioneve, me gjenerimin e fletës së transfertave
 StockTransferNew=Transferimi i aksioneve të reja
 StockTransferList=Lista e transfertave të aksioneve
-ConfirmValidateStockTransfer=Jeni i sigurt që dëshironi të vërtetoni këtë transferim të aksioneve me referencën <b>%s<span class='notranslate'>b09a4b739f17f shtrirje> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Ulja e aksioneve me transferim %s
 ConfirmDestockCancel=Anulo uljen e aksioneve me transferimin %s
 DestockAllProduct=Ulja e stoqeve
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index 81df3f2c756..98f3145c2be 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -22,8 +22,8 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL për të ofruar një faqe pagese
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL për të ofruar një %s faqe pagese në internet të çdo shume pa objekt ekzistues
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL për të ofruar një faqe pagese në internet %s për një abonim të anëtarëve
 ToOfferALinkForOnlinePaymentOnDonation=URL për të ofruar një faqe pagese në internet %s për pagesën e një donacioni
-YouCanAddTagOnUrl=Ju gjithashtu mund të shtoni parametrin e url-së <b>&tag=<i>vlerab0ae33spanzb0ae33475 class='notranslate'></b></span> në ndonjë nga ato URL (të detyrueshme vetëm për pagesën që nuk është e lidhur me një objekt) për të shtuar etiketën tuaj të komentit të pagesës.<br>Për URL-ja e pagesave pa objekt ekzistues, mund të shtoni edhe parametrin <strong>&noidempotency=1</strong> kështu që e njëjta lidhje me të njëjtën etiketë mund të përdoret disa herë (disa mënyra pagese mund ta kufizojnë pagesën në 1 për çdo lidhje të ndryshme pa këtë parametër)
-SetupStripeToHavePaymentCreatedAutomatically=Konfiguro Stripe-in tënd me url <b>%s<span class='notranslate'></b> kur të krijohen automatikisht pagesat</span to vërtetuar nga Stripe.
+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=Parametrat e llogarisё
 UsageParameter=Parametrat e përdorimit
 InformationToFindParameters=Ndihmoni për të gjetur informacionin e llogarisë tuaj %s
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index d495d0d005b..c63f28267b7 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -20,7 +20,7 @@ AddSupplierProposal=Krijo një kërkesë për çmim
 SupplierProposalRefFourn=Shitësi ref
 SupplierProposalDate=Data e dorëzimit
 SupplierProposalRefFournNotice=Përpara mbylljes së "Pranuar", mendoni të kuptoni referencat e furnitorëve.
-ConfirmValidateAsk=Jeni i sigurt që dëshironi ta vërtetoni këtë kërkesë për çmim nën emrin <b>%s<span class='notranslate'>b09a4b739f17f8z >?
+ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
 DeleteAsk=Fshi kërkesën
 ValidateAsk=Vërteto kërkesën
 SupplierProposalStatusDraft=Drafti (duhet të vërtetohet)
@@ -35,12 +35,12 @@ SupplierProposalStatusSignedShort=Pranuar
 SupplierProposalStatusNotSignedShort=Refuzuar
 CopyAskFrom=Krijoni një kërkesë çmimi duke kopjuar një kërkesë ekzistuese
 CreateEmptyAsk=Krijo kërkesë bosh
-ConfirmCloneAsk=Jeni i sigurt që dëshironi të klononi kërkesën për çmim <b>%s<span class='notranslate'>b09a4b739f17f8z?
-ConfirmReOpenAsk=Jeni i sigurt që dëshironi të hapni përsëri kërkesën për çmim <b>%s<span class='notranslate'></b></s0 ?
+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=Dërgo kërkesën për çmim me postë
 SendAskRef=Dërgimi i kërkesës për çmim %s
 SupplierProposalCard=Karta e kërkesës
-ConfirmDeleteAsk=Jeni i sigurt që dëshironi ta fshini këtë kërkesë çmimi <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
 ActionsOnSupplierProposal=Ngjarjet sipas kërkesës së çmimit
 DocModelAuroreDescription=Një shabllon i plotë për një kërkesë për kuotim të shitësit (zbatimi i vjetër i shabllonit Sfungjeri)
 DocModelZenithDescription=Një model i plotë për një kërkesë për kuotim të shitësit
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index 8fa4fb21a68..8bb26586dac 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -26,10 +26,10 @@ ExportDataset_fournisseur_1=Faturat e shitësit dhe detajet e faturës
 ExportDataset_fournisseur_2=Faturat dhe pagesat e shitësit
 ExportDataset_fournisseur_3=Porositë e blerjeve dhe detajet e porosisë
 ApproveThisOrder=Mirato këtë urdhër
-ConfirmApproveThisOrder=Jeni i sigurt që dëshironi të miratoni porosinë <b>%s<span class='notranslate'></b></s?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Refuzoni këtë urdhër
-ConfirmDenyingThisOrder=Jeni të sigurt që dëshironi ta refuzoni këtë porosi <b>%s<span class='notranslate'></b></s?
-ConfirmCancelThisOrder=Jeni i sigurt që dëshironi ta anuloni këtë porosi <b>%s<span class='notranslate'></b></s?
+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=Krijo Urdhër Blerje
 AddSupplierInvoice=Krijo faturë shitësi
 ListOfSupplierProductForSupplier=Lista e produkteve dhe çmimet për shitësin <b>%s</b>
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index bf924a684c2..e6977007215 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -69,7 +69,7 @@ Read=Lexoni
 Assigned=Caktuar
 NeedMoreInformation=Në pritje të komenteve të gazetarëve
 NeedMoreInformationShort=Në pritje të komenteve
-TicketAnswered=Answered
+TicketAnswered=U përgjigj
 Waiting=Ne pritje
 SolvedClosed=E zgjidhur
 Deleted=U fshi
@@ -233,7 +233,7 @@ TicketMessageMailIntroText=Përshëndetje,<br>Një përgjigje e re është shtua
 TicketMessageMailIntroHelpAdmin=Ky tekst do të futet përpara përgjigjes kur i përgjigjeni një bilete nga Dolibarr
 TicketMessageMailFooter=Fundi i mesazhit
 TicketMessageMailFooterHelp=Ky tekst shtohet vetëm në fund të mesazhit të dërguar me email dhe nuk do të ruhet.
-TicketMessageMailFooterText=Mesazh i dërguar nga <b>%s<span class='notranslate'></b></spanr> nëpërmjet
+TicketMessageMailFooterText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailFooterHelpAdmin=Ky tekst do të futet pas mesazhit të përgjigjes.
 TicketMessageHelp=Vetëm ky tekst do të ruhet në listën e mesazheve në kartën e biletës.
 TicketMessageSubstitutionReplacedByGenericValues=Variablat e zëvendësimeve zëvendësohen me vlera gjenerike.
@@ -320,7 +320,7 @@ ViewTicket=Shiko biletën
 ViewMyTicketList=Shikoni listën time të biletave
 ErrorEmailMustExistToCreateTicket=Gabim: adresa e emailit nuk u gjet në bazën tonë të të dhënave
 TicketNewEmailSubjectAdmin=Bileta e re u krijua - Ref %s (ID-ja e biletës publike %s)
-TicketNewEmailBodyAdmin=<p>Bileta sapo është krijuar me ID #%s, shiko informacionin:<span class='notranslate'>b0679c9z3a6a64 >
+TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
 SeeThisTicketIntomanagementInterface=Shihni biletën në ndërfaqen e menaxhimit
 TicketPublicInterfaceForbidden=Ndërfaqja publike për biletat nuk u aktivizua
 ErrorEmailOrTrackingInvalid=Vlera e keqe për ndjekjen e ID-së ose emailit
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index dfe74dc5b1d..150a748d52f 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -45,11 +45,11 @@ expenseReportRangeMoreThan=më shumë se %d
 expenseReportTotalForFive=Shembull me <u>d</u> = 5
 ExpenseReportApplyTo=Aplikoni në
 ExpenseReportApproved=U miratua një raport shpenzimesh
-ExpenseReportApprovedMessage=Raporti i shpenzimeve %s u miratua.<br> - Përdoruesi: %s<s class='notranslate'><br></span> - Miratuar nga: %s<br>Kliko këtu për të shfaqur raportin e shpenzimeve span class='notranslate'>%s</span>
+ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
 ExpenseReportCanceled=Një raport shpenzimesh u anulua
-ExpenseReportCanceledMessage=Raporti i shpenzimeve %s u anulua.<br> - Përdoruesi: %s</span class='notranslate'><br> - Anuluar nga: %s<br> - Motivi për anulim class=: 'notranslate'>%s</span><br>Kliko këtu për të shfaqur raportin e shpenzimeve: %s
-ExpenseReportConstraintViolationError=Shuma maksimale e tejkaluar (rregulli %s): %s është më i lartë se <span class='notranslate'>%s</s> Tejkalimi i ndaluar)
-ExpenseReportConstraintViolationWarning=Shuma maksimale e tejkaluar (rregulli %s): %s është më i lartë se <span class='notranslate'>%s</s> Tejkalimi i autorizimit)
+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
+ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
 ExpenseReportDateEnd=Data e fundit
 ExpenseReportDateStart=Data e fillimit
 ExpenseReportDomain=Domain për të aplikuar
@@ -58,19 +58,19 @@ ExpenseReportLimitAmount=Shuma maksimale
 ExpenseReportLimitOn=Kufizojeni
 ExpenseReportLine=Linja e raportit të shpenzimeve
 ExpenseReportPaid=U pagua një raport shpenzimesh
-ExpenseReportPaidMessage=Raporti i shpenzimeve %s u pagua.<br> - Përdoruesi: %s<s class='notranslate'><br></span> - Paguar nga: %s<br>Kliko këtu për të shfaqur raportin e shpenzimeve: span class='notranslate'>%s</span>
+ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
 ExpenseReportPayment=Pagesa e raportit të shpenzimeve
 ExpenseReportRef=Ref. raporti i shpenzimeve
 ExpenseReportRefused=Një raport shpenzimesh u refuzua
-ExpenseReportRefusedMessage=Raporti i shpenzimeve %s u refuzua.<br> - Përdoruesi: %s class='notranslate'><br></span> - Refuzuar nga: %s<br> - Motivi për refuzim: <span class=: 'notranslate'>%s</span><br>Kliko këtu për të shfaqur raportin e shpenzimeve: %s
+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
 ExpenseReportRestrictive=Tejkalimi i ndaluar
 ExpenseReportRuleErrorOnSave=Gabim: %s
 ExpenseReportRuleSave=Rregulli i raportit të shpenzimeve u ruajt
 ExpenseReportRulesDesc=Ju mund të përcaktoni rregullat e shumës maksimale për raportet e shpenzimeve. Këto rregulla do të zbatohen kur një shpenzim i ri shtohet në një raport shpenzimesh
 ExpenseReportWaitingForApproval=Një raport i ri i shpenzimeve është dorëzuar për miratim
-ExpenseReportWaitingForApprovalMessage=Një raport i ri shpenzimesh është dorëzuar dhe është në pritje për miratim.<br> - Përdoruesi: %s <br> - Periudha: %s<br>Kliko këtu për të vërtetuar: <span class='notranslate span>
+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=Një raport shpenzimesh është dorëzuar për ri-miratim
-ExpenseReportWaitingForReApprovalMessage=Një raport shpenzimesh është dorëzuar dhe është në pritje të ri-miratimit.<br>%s, ju refuzuat të miratoni raportin e shpenzimeve për kjo arsye: %s.<br>Një version i ri është propozuar dhe pret miratimin tuaj. <br> - Përdoruesi: %s<br> - Periudha: <span class='notranslate'8</7>b0cb2ec87f49fz0 <br>Kliko këtu për të vërtetuar: %s
+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
 ExpenseReportsIk=Konfigurimi i tarifave për kilometrazhin
 ExpenseReportsRules=Rregullat e raportit të shpenzimeve
 ExpenseReportsToApprove=Raportet e shpenzimeve për të miratuar
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 533caf4998d..9a08054068b 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -21,12 +21,12 @@ DeleteAUser=Fshi një përdorues
 EnableAUser=Aktivizo një përdorues
 DeleteGroup=Fshi
 DeleteAGroup=Fshi një grup
-ConfirmDisableUser=Jeni të sigurt që dëshironi të çaktivizoni përdoruesin <b>%s<span class='notranslate'></b></s>?
-ConfirmDeleteUser=Jeni të sigurt që dëshironi të fshini përdoruesin <b>%s<span class='notranslate'></b></s>?
-ConfirmDeleteGroup=Jeni të sigurt që dëshironi të fshini grupin <b>%s<span class='notranslate'></b></s>?
-ConfirmEnableUser=Jeni i sigurt që dëshironi të aktivizoni përdoruesin <b>%s<span class='notranslate'></b></s>?
-ConfirmReinitPassword=Jeni i sigurt që dëshironi të krijoni një fjalëkalim të ri për përdoruesin <b>%s<span class='notranslate'>b09a4b739f17f80 >?
-ConfirmSendNewPassword=Jeni i sigurt që dëshironi të gjeneroni dhe dërgoni fjalëkalim të ri për përdoruesin <b>%s<span class='notranslate'>b09a4b739f17f8z shtrirje>?
+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=Përdorues i ri
 CreateUser=Krijo përdorues
 LoginNotDefined=Hyrja nuk është e përcaktuar.
@@ -35,7 +35,7 @@ ListOfUsers=Lista e përdoruesve
 SuperAdministrator=Administrator i shumë kompanive
 SuperAdministratorDesc=Administratori i sistemit për shumë kompani (mund të ndryshojë konfigurimin dhe përdoruesit)
 DefaultRights=Lejet e parazgjedhura
-DefaultRightsDesc=Përcaktoni këtu lejet <u>default</u> që i jepen automatikisht një b0b5ba1a823> përdorues i ri<span class='notranslate'></u> (për të modifikuar lejet për përdoruesit ekzistues, shkoni te karta e përdoruesit).
+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=Përdoruesit e Dolibarr
 LastName=Mbiemri
 FirstName=Emri
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 9ee079fb302..d90ead6aa50 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -20,7 +20,7 @@ WEBSITE_KEYWORDSDesc=Përdorni presje për të ndarë vlerat
 EnterHereReadmeInformation=Shkruani këtu një përshkrim të faqes në internet. Nëse e shpërndani faqen tuaj të internetit si shabllon, skedari do të përfshihet në paketën e tundimit.
 EnterHereLicenseInformation=Shkruani këtu LICENCEN e kodit të faqes së internetit. Nëse e shpërndani faqen tuaj të internetit si shabllon, skedari do të përfshihet në paketën e tundimit.
 HtmlHeaderPage=Titulli HTML (vetëm për këtë faqe)
-PageNameAliasHelp=Emri ose pseudonimi i faqes.<br>Ky pseudonim përdoret gjithashtu për të falsifikuar një URL SEO kur uebsajti drejtohet nga një host virtual i një serveri ueb (si Apacke, Nginx, .. .). Përdorni butonin "<strong>%s<span class='notranslate'></strong></spanali>" për të ndryshuar këtë.
+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=Shënim: Nëse dëshironi të përcaktoni një titull të personalizuar për të gjitha faqet, modifikoni titullin në nivelin e sajtit në vend të faqes/kontejnerit.
 MediaFiles=Biblioteka mediatike
 EditCss=Redakto vetitë e faqes në internet
@@ -32,7 +32,7 @@ AddWebsite=Shto faqen e internetit
 Webpage=Uebfaqe/kontejner
 AddPage=Shto faqe/enë
 PageContainer=Faqe
-PreviewOfSiteNotYetAvailable=Pamja paraprake e faqes suaj të internetit <strong>%s</strong> nuk është ende e disponueshme. Së pari duhet të '<strong>Importoni një shabllon të plotë uebsajti</strong>' ose thjesht 'b0e78439z span>Shto një faqe/enë<span class='notranslate'></strong>'.
+PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Faqja e kërkuar me id %s nuk ka ende përmbajtje, ose skedari i memories .tpl.php është hequr. Ndryshoni përmbajtjen e faqes për ta zgjidhur këtë.
 SiteDeleted=Faqja e internetit '%s' u fshi
 PageContent=Faqe/Kontenair
@@ -45,16 +45,16 @@ RealURL=URL e vërtetë
 ViewWebsiteInProduction=Shikoni faqen e internetit duke përdorur URL-të e shtëpisë
 Virtualhost=Emri i hostit virtual ose i domenit
 VirtualhostDesc=Emri i hostit ose domenit virtual (Për shembull: www.mywebsite.com, mybigcompany.net, ...)
-SetHereVirtualHost=<u>Përdor me Apache/NGinx/...</u><br></s> serveri juaj i internetit (Apache, Nginx, ...) një host virtual i dedikuar me PHP të aktivizuar dhe një direktori Root në<span class='notranslate'><br><strong> %s</strong>
+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=Shembull për t'u përdorur në konfigurimin e hostit virtual të Apache:
 YouCanAlsoTestWithPHPS=<u>Përdoreni me serverin e integruar PHP</u><br>mund të zhvilloni mjediset tuaja, preferoni të testoni faqen me serverin e integruar të PHP-së (kërkohet PHP 5.5) duke ekzekutuar<br><strong>php -S 0.0. :8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Drejto faqen tënde të internetit me një ofrues tjetër të hostimit të Dolibarr</u>b0342fccfda19>f you nuk keni një server në internet si Apache ose NGinx të disponueshëm në internet, ju mund të eksportoni dhe importoni faqen tuaj të internetit në një shembull tjetër Dolibarr të ofruar nga një ofrues tjetër hosting Dolibarr që siguron integrim të plotë me modulin e Uebsajtit. Ju mund të gjeni një listë të disa ofruesve të pritjes Dolibarr në <span class='notranslate'><a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Kontrolloni gjithashtu që përdoruesi i hostit virtual (për shembull www-data) të ketë <strong>%sb0a65d09z0f6f  lejet e skedarëve në<br><strong>%s</span ='notranslate'></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=Lexoni
 WritePerm=Shkruaj
 TestDeployOnWeb=Testoni/shpërndani në ueb
-PreviewSiteServedByWebServer=<u>Shiko paraprakisht %s në një skedë të re.</u><s notranslate'><br></span><br>%s do të shërbehet nga një server i jashtëm ueb (si Apache, Apache, ). Duhet ta instaloni dhe konfiguroni këtë server më parë për të treguar drejtorinë:<br><strong>%s span><span class='notranslate'></strong><br>URL e shërbyer nga serveri i jashtëm:<br></span ='notranslate'><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Shiko paraprakisht %s në një skedë të re.</u><s notranslate'><br></span><br>%s do të shërbehet nga serveri Dolibarr shtesë, kështu që nuk ka nevojë për ndonjë server ueb shtesë (si Apache, Nginx, IIS) për t'u instaluar.<br>E papërshtatshme është që URL-të e faqeve nuk janë miqësore me përdoruesit dhe fillojnë me shtegun e Dolibarr-it tuaj.<br>URL-ja e shërbyer nga Dolibarr:<br><strong></spannotranslate2000</spannotranslate'8='8 /span><span class='notranslate'></strong><br><br>Për të përdorur serverin tuaj të jashtëm të uebit shërbejeni këtë faqe interneti, krijoni një host virtual në serverin tuaj të internetit që tregon direktorinë<br><strong>%s</strong><br>më pas shkruani emrin e këtij serveri virtual në vetitë e kësaj faqe interneti dhe klikoni në lidhja "Testoni/Shpërndani në ueb".
+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-ja e hostit virtual të shërbyer nga serveri i jashtëm i uebit nuk është i përcaktuar
 NoPageYet=Ende nuk ka faqe
 YouCanCreatePageOrImportTemplate=Mund të krijoni një faqe të re ose të importoni një shabllon të plotë të faqes në internet
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=Ju mund të modifikoni kodin burimor HTML duke për
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Për një imazh të ndarë me një lidhje të përbashkët (hapja e qasjes duke përdorur çelësin hash të ndarjes së skedarit), sintaksa është:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='70f600000665 class='0012c7dcbe087z0 </span><br>
-YouCanEditHtmlSource3=Për të marrë URL-në e imazhit të një objekti PHP, përdorni<br><strong>b03900df7d31ec span>img src="<span class='notranslate'>&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?b0012c7dcbe08"z<0spanspan7> class='notranslate'>&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Më shumë shembuj të kodit HTML ose dinamik të disponueshëm në <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">dokumentacioni wikib0e47sd80cz5 >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonimi i faqes/kontejnerit
 CloneSite=Faqja e klonimit
 SiteAdded=Faqja e internetit u shtua
@@ -110,7 +110,7 @@ ThisPageIsTranslationOf=Kjo faqe/enë është një përkthim i
 ThisPageHasTranslationPages=Kjo faqe/enë ka përkthim
 NoWebSiteCreateOneFirst=Nuk është krijuar ende asnjë faqe interneti. Krijo një të parë.
 GoTo=Shkoni në
-DynamicPHPCodeContainsAForbiddenInstruction=Ju shtoni kodin dinamik PHP që përmban instruksionin PHP '<strong>%s<span class='notranslate'>b0a65dfc>071f ' që është e ndaluar si parazgjedhje si përmbajtje dinamike (shih opsionet e fshehura WEBSITE_PHP_ALLOW_xxx për të rritur listën e komandave të lejuara).
+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=Ju nuk keni leje për të shtuar ose modifikuar përmbajtje dinamike PHP në faqet e internetit. Kërkoni leje ose thjesht mbani kodin në etiketat php të pandryshuara.
 ReplaceWebsiteContent=Kërkoni ose zëvendësoni përmbajtjen e faqes në internet
 DeleteAlsoJs=Të fshihen gjithashtu të gjithë skedarët JavaScript specifike për këtë faqe interneti?
@@ -118,7 +118,7 @@ DeleteAlsoMedias=Të fshihen gjithashtu të gjithë skedarët e medias specifike
 MyWebsitePages=Faqet e mia të internetit
 SearchReplaceInto=Kërko | Zëvendësoni në
 ReplaceString=Varg i ri
-CSSContentTooltipHelp=Fut këtu përmbajtjen e CSS. Për të shmangur ndonjë konflikt me CSS të aplikacionit, sigurohuni që të paraprini të gjitha deklaratat me klasën .bodywebsite. Për shembull:<br><br>#mycssselector, input.myclass:hover { ...  <br>duhet të jetë<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... <span class='notranslate'2ccdaf3><br></span> <br>Shënim: Nëse keni një skedar të madh pa këtë parashtesë, mund të përdorni 'lessc' për ta kthyer atë për të shtuar prefiksin .bodywebsite kudo.
+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=Paralajmërim: Kjo përmbajtje del vetëm kur aksesohet në sajt nga një server. Nuk përdoret në modalitetin e modifikimit, kështu që nëse keni nevojë të ngarkoni skedarë JavaScript edhe në modalitetin e redaktimit, thjesht shtoni etiketën tuaj 'script src=...' në faqe.
 Dynamiccontent=Shembull i një faqeje me përmbajtje dinamike
 EditInLineOnOff=Modaliteti 'Redakto në linjë' është %s
@@ -160,78 +160,78 @@ PagesViewedTotal=Faqet e shikuara (gjithsej)
 Everyone=Të gjithë
 AssignedContacts=Kontaktet e caktuara
 WebsiteTypeLabel=Lloji i faqes në internet
-WebsiteTypeDolibarrWebsite=Web site (Module WebSites CMS)
-WebsiteTypeDolibarrPortal=Native and ready to use web portal (Module Web Portal)
-WebPortalURL=Web portal URL
-NewWebsiteAccount=New accounts for websites
-ModuleWebPortalName=Web portal
-ModuleWebPortalDesc=A ready to use native web portal for customers, suppliers, partners or members
-WebPortalDescription=Public web portal module for membership and partnership
-WebPortalSetup=WebPortal setup
-WebPortalCSS=Web portal CSS
-WebPortalSetupPage=WebPortal setup page
-WEBPORTAL_TITLE=Brand name on header of public page
-UserAccountForWebPortalAreInThirdPartyTabHelp=Users accounts for WebPortal can be set on each third party card in Website accounts tab
-WebPortalAccessHidden=Hidden
-WebPortalAccessVisible=Visible
-WebPortalAccessEdit=Editable
-WEBPORTAL_MEMBER_CARD_ACCESS=Enable access to the membership record
-WebPortalMemberCardAccessHelp=Enable access to the membership record (Hidden / Visible or Editable)
-WEBPORTAL_PARTNERSHIP_CARD_ACCESS=Enable access to the partnership record
-WebPortalPartnerShipCardAccessHelp=Enable access to the partnership record (Hidden / Visible or Editable)
-WEBPORTAL_PROPAL_LIST_ACCESS=Enable access to the proposals
-WEBPORTAL_ORDER_LIST_ACCESS=Enable access to the orders
-WEBPORTAL_INVOICE_LIST_ACCESS=Enable access to the invoices
-WEBPORTAL_USER_LOGGED=Select an anonymous user
-WebPortalUserLoggedHelp=This user is used to update cards
-WebPortalHomeTitle=Welcome
-WebPortalHomeDesc=Welcome to the public interface
-WebPortalPropalListMenu=Proposals
-WebPortalPropalListTitle=List of proposals
-WebPortalPropalListDesc=List of proposals
-WebPortalPropalListNothing=Proposals not found
-WebPortalOrderListMenu=Orders
-WebPortalOrderListTitle=List of orders
-WebPortalOrderListDesc=List of orders
-WebPortalOrderListNothing=Orders not found
+WebsiteTypeDolibarrWebsite=Uebfaqja (CMS e modulit të faqeve të internetit)
+WebsiteTypeDolibarrPortal=Portali uebi vendas dhe i gatshëm për t'u përdorur (Module Web Portal)
+WebPortalURL=URL e portalit në internet
+NewWebsiteAccount=Llogari të reja për faqet e internetit
+ModuleWebPortalName=ueb portal
+ModuleWebPortalDesc=Një ueb-portal i gatshëm për t'u përdorur për klientët, furnitorët, partnerët ose anëtarët
+WebPortalDescription=Moduli i portalit publik për anëtarësim dhe partneritet
+WebPortalSetup=Konfigurimi i uebportalit
+WebPortalCSS=Ueb-portali CSS
+WebPortalSetupPage=Faqja e konfigurimit të uebportalit
+WEBPORTAL_TITLE=Emri i markës në kokën e faqes publike
+UserAccountForWebPortalAreInThirdPartyTabHelp=Llogaritë e përdoruesve për WebPortal mund të vendosen në secilën kartë të palës së tretë në skedën e llogarive të faqes në internet
+WebPortalAccessHidden=I fshehur
+WebPortalAccessVisible=E dukshme
+WebPortalAccessEdit=E redaktueshme
+WEBPORTAL_MEMBER_CARD_ACCESS=Aktivizo qasjen në regjistrimin e anëtarësimit
+WebPortalMemberCardAccessHelp=Aktivizo qasjen në regjistrimin e anëtarësimit (I fshehur / i dukshëm ose i modifikueshëm)
+WEBPORTAL_PARTNERSHIP_CARD_ACCESS=Aktivizo qasjen në të dhënat e partneritetit
+WebPortalPartnerShipCardAccessHelp=Aktivizo qasjen në regjistrimin e partneritetit (I fshehur / i dukshëm ose i modifikueshëm)
+WEBPORTAL_PROPAL_LIST_ACCESS=Aktivizo qasjen në propozime
+WEBPORTAL_ORDER_LIST_ACCESS=Aktivizo qasjen në porositë
+WEBPORTAL_INVOICE_LIST_ACCESS=Aktivizo qasjen në fatura
+WEBPORTAL_USER_LOGGED=Zgjidhni një përdorues anonim
+WebPortalUserLoggedHelp=Ky përdorues përdoret për të përditësuar kartat
+WebPortalHomeTitle=Mirë se vini
+WebPortalHomeDesc=Mirë se vini në ndërfaqen publike
+WebPortalPropalListMenu=Propozimet
+WebPortalPropalListTitle=Lista e propozimeve
+WebPortalPropalListDesc=Lista e propozimeve
+WebPortalPropalListNothing=Propozimet nuk u gjetën
+WebPortalOrderListMenu=Porositë
+WebPortalOrderListTitle=Lista e porosive
+WebPortalOrderListDesc=Lista e porosive
+WebPortalOrderListNothing=Porositë nuk u gjetën
 WebPortalInvoiceListMenu=Faturat
-WebPortalInvoiceListTitle=List of invoices
-WebPortalInvoiceListDesc=List of invoices
-WebPortalInvoiceListNothing=Invoices not found
-WebPortalMemberCardMenu=Member
-WebPortalMemberCardTitle=Member card
-WebPortalMemberCardDesc=Member card
-WebPortalPartnershipCardMenu=Partnership
-WebPortalPartnershipCardTitle=Partnership card
-WebPortalPartnershipCardDesc=Partnership card
-loginWebportalUserName=User name / email
+WebPortalInvoiceListTitle=Lista e faturave
+WebPortalInvoiceListDesc=Lista e faturave
+WebPortalInvoiceListNothing=Faturat nuk u gjetën
+WebPortalMemberCardMenu=Anëtar
+WebPortalMemberCardTitle=Karta e anëtarit
+WebPortalMemberCardDesc=Karta e anëtarit
+WebPortalPartnershipCardMenu=Partneritet
+WebPortalPartnershipCardTitle=Karta e partneritetit
+WebPortalPartnershipCardDesc=Karta e partneritetit
+loginWebportalUserName=Emri i përdoruesit / emaili
 loginWebportalPassword=Fjalëkalimi
-LoginNow=Login now
-RemoveSearchFilters=Remove search filters
-WEBPORTAL_PRIMARY_COLOR=Primary color
-WEBPORTAL_SECONDARY_COLOR=Secondary color
-WEBPORTAL_LOGIN_LOGO_URL=Login logo image URL
-WEBPORTAL_MENU_LOGO_URL=Menu logo image URL
-WEBPORTAL_MENU_LOGO_URLTooltip=Leave empty to use login logo
-WEBPORTAL_LOGIN_BACKGROUND=Background login image URL
-WEBPORTAL_BANNER_BACKGROUND=Background for banner
-WEBPORTAL_BANNER_BACKGROUND_IS_DARK=Use dark theme for banner
-AriaPrevPage=Previous page
-AriaNextPage=Next page
-AriaPageX=Page %s
-WebPortalError404=Page not found
-WebPortalErrorPageNotExist=Page not exist
-WebPortalErrorFetchThirdPartyAccountFromLogin=Error when loading third-party account (login : %s)
-WebPortalErrorAuthentication=Authentication error
-WebPortalErrorFetchLoggedThirdPartyAccount=Error when loading third-party account (login : %s)
-WebPortalErrorFetchLoggedUser=Error when loading user (Id : %s)
-WebPortalErrorFetchLoggedThirdParty=Error when loading third-party (Id : %s)
-WebPortalErrorFetchLoggedMember=Error when loading member (Id : %s)
-WebPortalErrorFetchLoggedPartnership=Error when loading partnership (Third-party Id : %s, Member Id : %s)
-ExportIntoGIT=Export into sources
-WebPortalMember=Membership
-WebPortalOrder=Sale Order
-WebPortalPartnership=Partnership
-WebPortalPropal=Proposal
-WebPortalGroupMenuAdmin=Administration
+LoginNow=Identifikohu tani
+RemoveSearchFilters=Hiq filtrat e kërkimit
+WEBPORTAL_PRIMARY_COLOR=Ngjyra primare
+WEBPORTAL_SECONDARY_COLOR=Ngjyra dytësore
+WEBPORTAL_LOGIN_LOGO_URL=URL e imazhit të logos së hyrjes
+WEBPORTAL_MENU_LOGO_URL=URL-ja e imazhit të logos së menysë
+WEBPORTAL_MENU_LOGO_URLTooltip=Lëreni bosh për të përdorur logon e hyrjes
+WEBPORTAL_LOGIN_BACKGROUND=URL e imazhit të hyrjes në sfond
+WEBPORTAL_BANNER_BACKGROUND=Sfondi për baner
+WEBPORTAL_BANNER_BACKGROUND_IS_DARK=Përdorni temën e errët për baner
+AriaPrevPage=Faqja e meparshme
+AriaNextPage=Faqja tjetër
+AriaPageX=Faqja %s
+WebPortalError404=Faqja nuk u gjet
+WebPortalErrorPageNotExist=Faqja nuk ekziston
+WebPortalErrorFetchThirdPartyAccountFromLogin=Gabim gjatë ngarkimit të llogarisë së palës së tretë (identifikimi : %s)
+WebPortalErrorAuthentication=Gabim vërtetimi
+WebPortalErrorFetchLoggedThirdPartyAccount=Gabim gjatë ngarkimit të llogarisë së palës së tretë (identifikimi : %s)
+WebPortalErrorFetchLoggedUser=Gabim gjatë ngarkimit të përdoruesit (Id : %s)
+WebPortalErrorFetchLoggedThirdParty=Gabim gjatë ngarkimit të palës së tretë (Id : %s)
+WebPortalErrorFetchLoggedMember=Gabim gjatë ngarkimit të anëtarit (Id : %s)
+WebPortalErrorFetchLoggedPartnership=Gabim gjatë ngarkimit të partneritetit (ID-ja e palës së tretë : %s, ID-ja e anëtarit: %s)
+ExportIntoGIT=Eksporto në burime
+WebPortalMember=Anëtarësimi
+WebPortalOrder=Urdhër Shitje
+WebPortalPartnership=Partneritet
+WebPortalPropal=Propozim
+WebPortalGroupMenuAdmin=Administrata
 WebPortalGroupMenuTechnical=Sistemi
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index bb826ef061d..891a57e7cf5 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -47,7 +47,7 @@ MakeBankTransferOrder=Bëni një kërkesë për transferim kredie
 WithdrawRequestsDone=%s u regjistruan kërkesa për pagesë të debitit direkt
 BankTransferRequestsDone=%s kërkesat për transferim krediti u regjistruan
 ThirdPartyBankCode=Kodi i bankës së palës së tretë
-NoInvoiceCouldBeWithdrawed=Asnjë faturë nuk u përpunua me sukses. Kontrollo që faturat janë në kompani me një IBAN të vlefshëm dhe që IBAN të ketë një UMR (Unique Mandate Reference) me modalitetin <strong>%s</span span class='notranslate'></strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
 NoInvoiceCouldBeWithdrawedSupplier=Asnjë faturë nuk u përpunua me sukses. Kontrollo që faturat janë në kompani me një IBAN të vlefshëm.
 NoSalariesCouldBeWithdrawed=Asnjë pagë nuk u përpunua me sukses. Kontrollo që pagat janë për përdoruesit me një IBAN të vlefshëm.
 WithdrawalCantBeCreditedTwice=Kjo faturë tërheqjeje është shënuar tashmë si e kredituar; kjo nuk mund të bëhet dy herë, pasi kjo mund të krijojë pagesa të dyfishta dhe hyrje bankare.
@@ -152,12 +152,12 @@ ADDDAYS=Shtoni ditë në datën e ekzekutimit
 NoDefaultIBANFound=Nuk u gjet asnjë IBAN i paracaktuar për këtë palë të tretë
 ### Notifications
 InfoCreditSubject=Urdhërpagesa e debitit direkt %s nga banka
-InfoCreditMessage=Urdhërpagesa e debitit direkt %s është paguar nga banka<br>Të dhënat e pagesës: b0ecb2ec87f49 
+InfoCreditMessage=Urdhërpagesa e debitit direkt %s është paguar nga banka<br>Të dhënat e pagesës: b0ecb2ec87f49
 InfoTransSubject=Transmetimi i urdhrit të pagesës së debitit direkt %s në bankë
-InfoTransMessage=Urdhri i pagesës së debitit direkt %s është dërguar në bankë nga %s %s</s .<span class='notranslate'><br><br>
-InfoTransData=Shuma: %s<br>Metoda: %s</spanno><span' class='notranslate' ><br>Data: %s
+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=Urdhërpagesa e debitimit direkt u refuzua
-InfoRejectMessage=Përshëndetje,<br><br>urdhri i pagesës së debitit direkt të faturës %s i lidhur me</s kompania <span class='notranslate'>%s, me një shumë prej %s është refuzuar nga banka.b0342fccfda19bz /span><span class='notranslate'><br>--<br>%s
+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=Opsioni për modalitetin real nuk u vendos, ne ndalemi pas këtij simulimi
 ErrorCompanyHasDuplicateDefaultBAN=Kompania me id %s ka më shumë se një llogari bankare të paracaktuar. Nuk ka asnjë mënyrë për të ditur se cilën të përdorni.
 ErrorICSmissing=Mungon ICS në llogarinë bankare %s
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Pagat në pritje të pagesës me transfertë krediti
 RefSalary=Rrogë
 NoSalaryInvoiceToWithdraw=Nuk ka rrogë në pritje të një '%s'. Shko te skeda '%s' në kartën e pagës për të bërë një kërkesë.
 SalaryInvoiceWaitingWithdraw=Pagat në pritje të pagesës me transfertë krediti
-
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 6a53d7ceb2c..1cacf67f637 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Ukupno (bruto)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
 Totalforthispage=Total for this page
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Ukupno (bruto)
 TotalTTCToYourCredit=Ukupno (bruto) za Vaš račun
 TotalVAT=Ukupan porez
@@ -647,6 +649,7 @@ ReportName=Ime izveštaja
 ReportPeriod=Period izveštaja
 ReportDescription=Opis
 Report=Izveštaj
+Reports=Izveštaji
 Keyword=Keyword
 Origin=Origin
 Legend=Legenda
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index b66f8f8249b..0aa303320fe 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -335,7 +335,6 @@ CategoryDeleted=Kategori för bokföringskonto har tagits bort
 AccountingJournals=Bokföringsloggbok
 AccountingJournal=Bokföringsloggbok
 NewAccountingJournal=Ny bokföringsloggbok
-ShowAccountingJournal=Visa loggböcker
 NatureOfJournal=Journalens natur
 AccountingJournalType1=Övrig verksamhet
 AccountingJournalType2=Försäljning
@@ -353,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Inaktivera bindning och överföring av bokf
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Inaktivera bindning och överföring av bokföring vid köp (leverantörsfakturor kommer inte att beaktas vid redovisning)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Inaktivera bindning och överföring i bokföring på kostnadsrapporter (kostnadsrapporter kommer inte att beaktas vid redovisning)
 ACCOUNTING_ENABLE_LETTERING=Aktivera bokstäverfunktionen i bokföringen
-ACCOUNTING_ENABLE_LETTERING_DESC=När detta alternativ är aktiverat kan du definiera en kod för varje bokföringspost så att du kan gruppera olika bokföringsrörelser. Tidigare, när olika tidskrifter hanterades oberoende, var denna funktion nödvändig för att gruppera rörelserader för olika tidskrifter tillsammans. Men med Dolibarr-bokföring, en sådan spårningskod, som heter "<b>%s<span class='notranslate'></b> span>" sparas redan automatiskt, så en automatisk bokstäver är redan gjord, utan risk för fel så denna funktion har blivit värdelös för en vanlig användning. Manuell bokstäverfunktion tillhandahålls för slutanvändare som verkligen inte litar på datormotorn som gör överföringen av data i bokföring.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Att aktivera den här funktionen är inte längre nödvändigt för en rigorös redovisningshantering.
 ACCOUNTING_ENABLE_AUTOLETTERING=Aktivera den automatiska bokstäverna vid överföring till bokföring
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Koden för bokstäverna genereras automatiskt och inkrementeras och väljs inte av slutanvändaren
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 3467e8c1226..a400150849a 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -368,7 +368,7 @@ GenericMaskCodes3EAN=Alla andra tecken i masken förblir intakta (utom * eller ?
 GenericMaskCodes4a=<u>Exempel den 99:e %s av tredje parten TheCompany, med datum 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>Exempel på tredje part skapat 2023-01-31:</u><br> >
 GenericMaskCodes4c=<u>Exempel på produkt skapad 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ger b0aee8733658 span>ABC2301-000099<span class='notranslate'></b><br>b0aee8336583710fz0@</01+>{01+ }-ZZZ/{dd}/XXX<span class='notranslate'></b> ger <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> ger <b>IN2301-0099-A</b> om företagets typ är 'Responsable Inscripto' med kod för typen som är 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Ger en anpassningsbar nummerserie enligt en fastställd mask.
 ServerAvailableOnIPOrPort=Server finns på adressen <b>%s</b> på port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servern är inte tillgänglig på adresseb <b>%s</b> på port <b>%s</b>
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=Om du lämnar detta fält tomt betyder det att detta
 ExtrafieldParamHelpselect=Lista över värden måste vara rader med formatet nyckel,värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br>1,värde1<br> 2,värde2 <br>code3,värde3<br> ... <br> <br>För att få listan beroende av andra komplementära attribut:<br> 1,värde1|options_<i> parent_list_code</i>:parent_key<br> 2,value2|options_<i>parent_list_code</i>:parent_key<br> <br>För att få listan beroende av en annan lista: <br>1,värde1|<i>parent_list_code</i>:parent_key<br>2,värde2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Lista över värden måste vara rader med formatet nyckel,värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br>1,värde1<br>2,värde2<br>3,värde3 <br> ...
 ExtrafieldParamHelpradio=Lista över värden måste vara rader med formatet nyckel,värde (där nyckel inte kan vara '0') <br> <br> till exempel: <br>1,värde1<br>2,värde2<br>3,värde3 <br> ...
-ExtrafieldParamHelpsellist=Lista med värden kommer från en tabell<br>Syntax: table_name:label_field:id_field::filtersql<br>Exempel: c_idtypent:libelle: ::filtersql<br><br>- id_field är nödvändigtvis en primär int-nyckelb0342fccfdaspan19bz> - filtersql är ett SQL-villkor. Det kan vara ett enkelt test (t.ex. active=1) för att endast visa aktivt värde<span class='notranslate'><br>Du kan också använda $ID$ i filter som är det aktuella ID:t för det aktuella objektet<br>För att använda en SELECT i filtret använd nyckelordet $SEL$ för att kringgå antiinjektionsskydd.<br>om du vill filtrera på extrafält använd syntax extra.fieldcode=... (där fältkoden är koden för extrafield)<br><br>För att ha lista beroende på en annan kompletterande attributlista:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>För att få listan beroende av en annan lista:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'></i></umn>:filter_column>|
+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 necessarily 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=Listan med värden kommer från en tabell<br>Syntax: table_name:label_field:id_field::filtersql<br>Exempel: c_typent:libelle:id::filtersql<br><br>filter kan vara ett enkelt test (t.ex. active=1) för att visa endast aktiva värden<br>Du kan också använda $ID$ i filter som är aktuellt ID för aktuellt objekt<br>För att göra en SELECT i filter använder du $SEL$<br>om du vill filtrera på extrafält använder du syntax extra.fieldcode= ... (där fältkoden är koden för extrafältet)<br><br>För att listan skall vara beroende av komplementära attribut:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>För att få listan beroende av en annan lista:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametrar måste vara ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Håll tomt för en enkel separator<br>Ange detta till 1 för en kollapsande separator (öppnas som standard för en ny session, sedan behålls status för varje användarsession)<br>Ange detta till 2 för en kollapsande separator (kollapsad som standard för ny session, sedan status hålls för varje användarsession)
@@ -1197,6 +1197,7 @@ Skin=Tema för utseende
 DefaultSkin=Standardtema
 MaxSizeList=Maxlängd för lista
 DefaultMaxSizeList=Standard maxlängd för listor
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Standard maxlängd för korta listor (exempelvis i kundkort)
 MessageOfDay=Dagens meddelande
 MessageLogin=Meddelande på inloggningssida
@@ -1221,7 +1222,7 @@ LogoSquarred=Logotyp (kvadratisk)
 LogoSquarredDesc=Måste vara fyrkantig (bredd = höjd). Den här logotypen kommer att användas som favicon eller annat som rör den övre menyraden (om den inte är inaktiverad).
 DoNotSuggestPaymentMode=Föreslå inte
 NoActiveBankAccountDefined=Inga aktivt bankkonto angivet
-OwnerOfBankAccount=Innehavare till bankkontot %s 
+OwnerOfBankAccount=Innehavare till bankkontot %s
 BankModuleNotActive=Modlen bankkonton inte aktiverad
 ShowBugTrackLink=Visa länken <strong>%s</strong>
 ShowBugTrackLinkDesc=Lämna tomt för att inte visa denna länk, använd värdet 'github' för länk till Dolibarr projektet eller ange en url direkt 'https://...'
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Inte exporterar fall äldre än
 SecurityKey = Säkerhetsnyckel
 ##### ClickToDial #####
 ClickToDialSetup=Klicka för att Dial modul inställning
-ClickToDialUrlDesc=URL anropas när ett klick på telefonbilden görs. I URL kan du använda taggar<br><b>__PHONETO__</b> som blir ersatt med telefonnumret till den person som ska ringas<br><b>__PHONEFROM__</b> kommer att ersättas med telefonnummer till den som ringer (ditt)<span class='notranslate'><br><b>__LOGIN__b09a4b739f</017f span> som kommer att ersättas med clicktodial inloggning (definierad på användarkortet)<span class='notranslate'><br><b>__PASS__ </b> som kommer att ersättas med ett klickkodslösenord (definierat på användarkortet).
+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=Denna modul ändrar telefonnummer när du använder en stationär dator till klickbara länkar. Ett klick ringer upp numret. Detta kan användas för att starta telefonsamtalet när du använder en mjuk telefon på skrivbordet eller när du t.ex. använder ett CTI-system baserat på SIP-protokoll. Obs! När du använder en smartphone är telefonnummer alltid klickbara.
 ClickToDialUseTelLink=Använd bara en länk "tel:" på telefonnummer
 ClickToDialUseTelLinkDesc=Använd den här metoden om dina användare har en datortelefon eller ett programvarugränssnitt, installerat på samma dator som webbläsaren och anropas när du klickar på en länk som börjar med "tel:" i din webbläsare. Om du behöver en länk som börjar med "sip:" eller en komplett serverlösning (inget behov av lokal mjukvaruinstallation), måste du ställa in denna på "Nej" och fylla i nästa fält.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 719f7c3c33a..7b07ae6a220 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Totalt (inkl. moms)
 TotalHT=Totalt (exkl. moms)
 TotalHTforthispage=Totalt (exkl. moms) för denna sida
 Totalforthispage=Totalt för denna sida
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Totalt (inkl. moms)
 TotalTTCToYourCredit=Totalt (inkl. moms) för kreditering
 TotalVAT=Summa moms
@@ -647,6 +649,7 @@ ReportName=Rapportnamn
 ReportPeriod=Rapportperiod
 ReportDescription=Beskrivning
 Report=Rapport
+Reports=Rapporter
 Keyword=Nyckelord
 Origin=Ursprung
 Legend=Legend
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index e70f41fe711..7f74bbbd371 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -148,7 +148,7 @@ CSSListClass=CSS för lista
 NotEditable=Ej redigerbar
 ForeignKey=Främmande nyckel
 ForeignKeyDesc=Om värdet på detta fält måste garanteras existera i en annan tabell. Ange här ett värde som matchar syntaxen: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Exempel:<br>varchar(99)<br>e-post<br>telefon<br>ip<br>url<br>lösenordbzcc</031492 span>double(24,8)<span class='notranslate'><br>real<br>text<br>html <br>date<br>datetime<br>tidsstämpel <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fccfda19b /span><span class='notranslate'><br>'1' betyder att vi lägger till en +-knapp efter kombinationen för att skapa posten<br>'filter' är ett Syntaxvillkor för universellt filter, exempel: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Detta är typen av fält/attribut.
 AsciiToHtmlConverter=Ascii till HTML-omvandlare
 AsciiToPdfConverter=Ascii till PDF-omvandlare
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Det gick inte att lägga till kod i beskrivningen.
 DictionariesCreated=Ordbok <b>%s</b> skapad framgångsrikt
 DictionaryDeleted=Ordbok <b>%s</b> har tagits bort framgångsrikt
 PropertyModuleUpdated=Egendomen <b>%s</b> har uppdaterats framgångsrikt
-InfoForApiFile=* När du genererar fil för första gången kommer alla metoder att skapas <strong>för varje objekt.</strong><br>* När du klickar i <strong>remove</strong> tar du bara bort alla klassmetoder för <span> ='notranslate'><strong></span>valt objekt</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Sida för modulinställning
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=You can generate and edit here the class files to provide new email target selectors for the mass emailing module
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index d473d79055c..b49907a4034 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Huduma hii
 ThisProduct=Bidhaa hii
 DefaultForService=Chaguomsingi kwa huduma
 DefaultForProduct=Chaguomsingi kwa bidhaa
-ProductForThisThirdparty=Bidhaa kwa wahusika wengine
-ServiceForThisThirdparty=Huduma kwa wahusika wengine
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Haiwezi kupendekeza
 AccountancySetupDoneFromAccountancyMenu=Usanidi mwingi wa uhasibu hufanywa kutoka kwa menyu %s
 ConfigAccountingExpert=Usanidi wa uhasibu wa moduli (ingizo mara mbili)
@@ -38,7 +38,7 @@ DeleteCptCategory=Ondoa akaunti ya uhasibu kutoka kwa kikundi
 ConfirmDeleteCptCategory=Je, una uhakika unataka kuondoa akaunti hii ya uhasibu kutoka kwa kikundi cha akaunti ya uhasibu?
 JournalizationInLedgerStatus=Hali ya uandishi wa habari
 AlreadyInGeneralLedger=Tayari kuhamishiwa majarida ya uhasibu na leja
-NotYetInGeneralLedger=Bado haijahamishwa kwa majarida na leja ya uhasibu
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Kikundi ni tupu, angalia usanidi wa kikundi cha uhasibu kilichobinafsishwa
 DetailByAccount=Onyesha maelezo kwa akaunti
 DetailBy=Maelezo na
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Ukiwa na zana hii, unaweza kutafuta na kuhamisha m
 ExportAccountingSourceDocHelp2=Ili kuhamisha majarida yako, tumia ingizo la menyu %s - %s.
 ExportAccountingProjectHelp=Bainisha mradi ikiwa unahitaji ripoti ya uhasibu kwa mradi mahususi pekee. Ripoti za gharama na malipo ya mkopo hazijajumuishwa katika ripoti za mradi.
 ExportAccountancy=Uhasibu wa kuuza nje
-WarningDataDisappearsWhenDataIsExported=Onyo, orodha hii ina maingizo ya uhasibu pekee ambayo hayajahamishwa (Tarehe ya uhamishaji ni tupu). Ikiwa ungependa kujumuisha maingizo ya uhasibu ambayo tayari yamehamishwa ili kuyasafirisha tena, bofya kitufe kilicho hapo juu.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Tazama kwa akaunti ya uhasibu
 VueBySubAccountAccounting=Tazama kwa akaunti ndogo ya uhasibu
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Akaunti ya uhasibu kwa mtumiaji haijafafanuliwa katika usa
 AccountancyArea=Eneo la uhasibu
 AccountancyAreaDescIntro=Matumizi ya moduli ya uhasibu hufanywa kwa hatua kadhaa:
 AccountancyAreaDescActionOnce=Vitendo vifuatavyo kwa kawaida hutekelezwa mara moja tu, au mara moja kwa mwaka...
-AccountancyAreaDescActionOnceBis=Hatua zinazofuata zinapaswa kufanywa ili kuokoa muda katika siku zijazo kwa kukupendekezea kiotomatiki akaunti sahihi ya uhasibu chaguomsingi wakati wa kuhamisha data katika uhasibu.
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Hatua zifuatazo kwa kawaida hutekelezwa kila mwezi, wiki au siku kwa makampuni makubwa sana...
 
 AccountancyAreaDescJournalSetup=STEP %s: Angalia maudhui ya orodha yako ya jarida kutoka kwenye menyu %s
 AccountancyAreaDescChartModel=STEP %s: Hakikisha kuwa kuna muundo wa chati ya akaunti au uunde kutoka kwa menyu %s
 AccountancyAreaDescChart=STEP %s: Chagua na|au ukamilishe chati yako ya akaunti kutoka kwenye menyu %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=STEP %s: Bainisha akaunti za uhasibu kwa kila Viwango vya VAT. Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescDefault=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu. Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescExpenseReport=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu kwa kila aina ya ripoti ya Gharama. Kwa hili, tumia ingizo la menyu %s.
@@ -84,19 +83,20 @@ AccountancyAreaDescSal=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu kwa ma
 AccountancyAreaDescContrib=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu za Kodi (gharama maalum). Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescDonation=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu kwa mchango. Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescSubscription=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu kwa usajili wa wanachama. Kwa hili, tumia ingizo la menyu %s.
-AccountancyAreaDescMisc=STEP %s: Bainisha akaunti chaguo-msingi ya lazima na akaunti chaguo-msingi za uhasibu kwa shughuli mbalimbali. Kwa hili, tumia ingizo la menyu %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Bainisha akaunti chaguo-msingi za uhasibu za mikopo. Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescBank=STEP %s: Bainisha akaunti za uhasibu na msimbo wa jarida kwa kila benki na akaunti za fedha. Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescProd=STEP %s: Bainisha akaunti za uhasibu kwenye Bidhaa/Huduma zako. Kwa hili, tumia ingizo la menyu %s.
 
 AccountancyAreaDescBind=STEP %s: Angalia ufungaji kati ya %s iliyopo mistari na akaunti ya uhasibu imefanywa, kwa hivyo programu itaweza kuandika shughuli kwenye Ledger kwa mbofyo mmoja. Kamilisha vifungo vilivyokosekana. Kwa hili, tumia ingizo la menyu %s.
 AccountancyAreaDescWriteRecords=STEP %s: Andika miamala kwenye Leja. Ili kufanya hivyo, nenda kwenye menyu <strong> %s </strong> , na ubofye kitufe cha <strong> %s </strong> .
-AccountancyAreaDescAnalyze=STEP %s: Ongeza au hariri miamala iliyopo na uzalishe ripoti na mauzo ya nje.
-
-AccountancyAreaDescClosePeriod=STEP %s: Funga kipindi ili tusiweze kufanya marekebisho katika siku zijazo.
+AccountancyAreaDescAnalyze=STEP %s: Read reportings or generate export files for other bookkeepers.
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't transfer anymore data in the same period in a future.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Hatua ya lazima ya usanidi haijakamilika (jarida la kanuni za uhasibu halijafafanuliwa kwa akaunti zote za benki)
 Selectchartofaccounts=Chagua chati inayotumika ya akaunti
+CurrentChartOfAccount=Current active chart of account
 ChangeAndLoad=Badilisha na upakie
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Ruhusu kudhibiti idadi tofauti ya sufuri mwishoni mwa aka
 BANK_DISABLE_DIRECT_INPUT=Zima rekodi ya moja kwa moja ya shughuli katika akaunti ya benki
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Washa uhamishaji wa rasimu kwenye jarida
 ACCOUNTANCY_COMBO_FOR_AUX=Washa orodha ya mchanganyiko kwa akaunti tanzu (inaweza kuwa polepole ikiwa una washirika wengi, vunja uwezo wa kutafuta kwa sehemu ya thamani)
-ACCOUNTING_DATE_START_BINDING=Bainisha tarehe ya kuanza kushurutisha na kuhamisha katika uhasibu. Chini ya tarehe hii, shughuli hazitahamishwa kwa uhasibu.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Kwenye uhamishaji wa hesabu, ni kipindi gani kilichochaguliwa kwa chaguo-msingi
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Jarida la mauzo - mauzo na mapato
 ACCOUNTING_PURCHASE_JOURNAL=Jarida la ununuzi - ununuzi na urejeshaji
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_RESULT_PROFIT=Akaunti ya uhasibu ya matokeo (Faida)
 ACCOUNTING_RESULT_LOSS=Akaunti ya uhasibu ya matokeo (Hasara)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jarida la kufungwa
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Akaunti (kutoka Chati ya Akaunti) itakayotumika kama akaunti ya uhamisho wa mpito wa benki
 TransitionalAccount=Akaunti ya mpito ya uhamisho wa benki
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Angalia hapa orodha ya laini za ankara za wateja na akaun
 DescVentilTodoCustomer=Unganisha ankara ambazo tayari hazijafungwa na akaunti ya bidhaa kutoka chati ya akaunti
 ChangeAccount=Badilisha akaunti ya bidhaa/huduma (kutoka chati ya akaunti) kwa laini zilizochaguliwa na akaunti ifuatayo:
 Vide=-
-DescVentilSupplier=Rejelea hapa orodha ya ankara za wauzaji zinazofungwa au ambazo bado hazijafungwa kwa akaunti ya bidhaa kutoka chati ya akaunti (rekodi pekee ambayo haijahamishwa katika uhasibu ndiyo inayoonekana)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Angalia hapa orodha ya mistari ya ankara za wauzaji na akaunti zao za uhasibu
 DescVentilTodoExpenseReport=Unganisha mistari ya ripoti ya gharama ambayo tayari haijafungwa na akaunti ya uhasibu wa ada
 DescVentilExpenseReport=Angalia hapa orodha ya mistari ya ripoti ya gharama inayofungamana (au la) kwa akaunti ya uhasibu wa ada
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=Ukisanidi akaunti ya uhasibu kwa aina ya njia za rip
 DescVentilDoneExpenseReport=Angalia hapa orodha ya mistari ya ripoti za gharama na akaunti ya uhasibu wa ada
 
 Closure=Kufungwa kwa mwaka
-DescClosure=Angalia hapa idadi ya miondoko kwa mwezi ambayo bado haijathibitishwa na kufungwa
-OverviewOfMovementsNotValidated=Muhtasari wa harakati ambazo hazijathibitishwa na kufungwa
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=Vitendo vyote vilirekodiwa kama vilivyothibitishwa na kufungwa
 NotAllMovementsCouldBeRecordedAsValidated=Sio miondoko yote ingeweza kurekodiwa kama iliyothibitishwa na kufungwa
 ValidateMovements=Thibitisha na funga harakati
@@ -333,7 +335,6 @@ CategoryDeleted=Kitengo cha akaunti ya uhasibu kimeondolewa
 AccountingJournals=Majarida ya uhasibu
 AccountingJournal=Jarida la uhasibu
 NewAccountingJournal=Jarida jipya la uhasibu
-ShowAccountingJournal=Onyesha jarida la uhasibu
 NatureOfJournal=Asili ya Jarida
 AccountingJournalType1=Shughuli mbalimbali
 AccountingJournalType2=Mauzo
@@ -341,10 +342,10 @@ AccountingJournalType3=Ununuzi
 AccountingJournalType4=Benki
 AccountingJournalType5=Ripoti za gharama
 AccountingJournalType8=Malipo
-AccountingJournalType9=Ina-mpya
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Uzalishaji wa maingizo ya uhasibu
 ErrorAccountingJournalIsAlreadyUse=Jarida hili tayari linatumika
-AccountingAccountForSalesTaxAreDefinedInto=Kumbuka: Akaunti ya uhasibu ya kodi ya Mauzo imefafanuliwa katika menyu <b> %s </b>  - <b> %s </b> 
+AccountingAccountForSalesTaxAreDefinedInto=Kumbuka: Akaunti ya uhasibu ya kodi ya Mauzo imefafanuliwa katika menyu <b> %s </b>  - <b> %s </b>
 NumberOfAccountancyEntries=Idadi ya maingizo
 NumberOfAccountancyMovements=Idadi ya harakati
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Zima ufungaji na uhamisho katika uhasibu kwenye mauzo (ankara za mteja hazitazingatiwa katika uhasibu)
@@ -352,17 +353,19 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Zima ufungaji na uhamisho katika uhasibu
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Zima ufungaji na uhamishaji katika uhasibu kwenye ripoti za gharama (ripoti za gharama hazitazingatiwa katika uhasibu)
 ACCOUNTING_ENABLE_LETTERING=Washa kipengele cha uandishi katika uhasibu
 ACCOUNTING_ENABLE_LETTERING_DESC=Chaguo hizi zikiwashwa, unaweza kufafanua, kwenye kila ingizo la uhasibu, msimbo ili uweze kupanga harakati tofauti za uhasibu pamoja. Hapo awali, wakati majarida tofauti yalisimamiwa kwa kujitegemea, kipengele hiki kilikuwa muhimu ili kuunganisha mistari ya harakati ya majarida tofauti. Hata hivyo, kwa uhasibu wa Dolibarr, msimbo kama huo wa ufuatiliaji, unaoitwa " <b> %s </b> "Tayari imehifadhiwa kiatomati, kwa hivyo uandishi wa kiotomatiki tayari umefanywa, bila hatari ya makosa kwa hivyo kipengele hiki kimekuwa bure kwa matumizi ya kawaida. Kipengele cha uandishi wa mwongozo hutolewa kwa watumiaji wa mwisho ambao hawaamini injini ya kompyuta inayofanya uhamishaji wa data katika uhasibu.
-EnablingThisFeatureIsNotNecessary=Kuwasha kipengele hiki si lazima tena kwa usimamizi mkali wa uhasibu.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Washa uandishi wa kiotomatiki wakati wa kuhamisha kwa uhasibu
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Msimbo wa uandishi huzalishwa kiotomatiki na kuongezwa na sio kuchaguliwa na mtumiaji wa mwisho
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Chaguzi za hali ya juu
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Wezesha udhibiti wa malipo ya VAT kwa ununuzi wa wasambazaji
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Chaguo hili likiwashwa, unaweza kufafanua kuwa msambazaji au ankara ya mchuuzi aliyepewa lazima ihamishwe kwenye uhasibu kwa njia tofauti: Debiti ya ziada na laini ya mkopo itatolewa katika uhasibu kwenye akaunti 2 zilizotolewa kutoka kwa chati ya akaunti iliyofafanuliwa katika "<span class='notranslate'>%s\n" ukurasa wa kuanzisha.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Usihamishe maandishi wakati wa kuunda faili
-NotifiedExportDate=Alamisha mistari ambayo bado haijatumwa kama Imetumwa <span class="warning"> (ili kurekebisha laini iliyoalamishwa kama imehamishwa, utahitaji kufuta muamala wote na kuuhamishia tena kwenye hesabu) </span> 
-NotifiedValidationDate=Thibitisha na Ufunge maingizo yaliyohamishwa bado hayajafungwa <span class="warning"> (athari sawa na "%s" kipengele, urekebishaji na ufutaji wa laini hautawezekana KWA HAKIKA) </span> 
+NotifiedExportDate=Alamisha mistari ambayo bado haijatumwa kama Imetumwa <span class="warning"> (ili kurekebisha laini iliyoalamishwa kama imehamishwa, utahitaji kufuta muamala wote na kuuhamishia tena kwenye hesabu) </span>
+NotifiedValidationDate=Thibitisha na Ufunge maingizo yaliyohamishwa bado hayajafungwa <span class="warning"> (athari sawa na "%s" kipengele, urekebishaji na ufutaji wa laini hautawezekana KWA HAKIKA) </span>
 NotifiedExportFull=Hamisha hati?
 DateValidationAndLock=Uthibitishaji wa tarehe na kufuli
 ConfirmExportFile=Uthibitishaji wa utengenezaji wa faili ya uhasibu ya kuuza nje?
@@ -420,7 +423,7 @@ SaleLocal=Uuzaji wa ndani
 SaleExport=Uuzaji wa kuuza nje
 SaleEEC=Inauzwa katika EEC
 SaleEECWithVAT=Uuzaji katika EEC na VAT sio batili, kwa hivyo tunadhani hii SIO mauzo ya ndani ya jumuiya na akaunti iliyopendekezwa ni akaunti ya kawaida ya bidhaa.
-SaleEECWithoutVATNumber=Inauzwa katika EEC bila VAT lakini Kitambulisho cha VAT cha wahusika wengine hakijabainishwa. Tunarudi kwenye akaunti kwa mauzo ya kawaida. Unaweza kurekebisha Kitambulisho cha VAT cha wahusika wengine, au kubadilisha akaunti ya bidhaa iliyopendekezwa ili kufungwa ikihitajika.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Hairuhusiwi: Muamala umeidhinishwa na/au kuhamishwa.
 ForbiddenTransactionAlreadyValidated=Hairuhusiwi: Muamala umeidhinishwa.
 ## Dictionary
@@ -441,16 +444,30 @@ AccountancyNoUnletteringModified=Hakuna upatanisho uliorekebishwa
 AccountancyOneUnletteringModifiedSuccessfully=Moja ya kutopatanisha imerekebishwa
 AccountancyUnletteringModifiedSuccessfully=%s kubatilisha imebadilishwa kwa ufanisi
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock the movements
+AccountancyClosureStep2=Step 2 : Close the fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Uthibitishaji wa kutenganisha kiotomatiki kwa wingi
 ConfirmMassUnletteringManual=Uthibitishaji wa kutopatanishwa kwa mwongozo wa wingi
 ConfirmMassUnletteringQuestion=Je, una uhakika unataka kubatilisha %s rekodi zilizochaguliwa?
 ConfirmMassDeleteBookkeepingWriting=Uthibitishaji wa Kufuta Wingi
 ConfirmMassDeleteBookkeepingWritingQuestion=Hii itafuta muamala kutoka kwa uhasibu (maingizo yote ya laini yanayohusiana na muamala sawa yatafutwa). Je, una uhakika unataka kufuta %s maingizo yaliyochaguliwa?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Baadhi ya hatua za lazima za usanidi hazijafanywa, tafadhali zikamilishe
-ErrorNoAccountingCategoryForThisCountry=Hakuna kikundi cha akaunti ya uhasibu kinachopatikana kwa nchi %s (Angalia Nyumbani - Mipangilio - Kamusi)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Unajaribu kuorodhesha baadhi ya mistari ya ankara <strong> %s </strong> , lakini njia zingine bado hazijafungwa kwenye akaunti ya uhasibu. Uandishi wa habari wa ankara zote za ankara hii umekataliwa.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Baadhi ya mistari kwenye ankara haifungwi kwenye akaunti ya uhasibu.
 ExportNotSupported=Umbizo la kuhamisha lililowekwa halitumiki katika ukurasa huu
@@ -465,6 +482,9 @@ AccountancyErrorMismatchBalanceAmount=Salio (%s) si sawa na 0
 AccountancyErrorLetteringBookkeeping=Hitilafu zimetokea kuhusu shughuli za malipo: %s
 ErrorAccountNumberAlreadyExists=Nambari ya hesabu %s tayari ipo
 ErrorArchiveAddFile=Haiwezi kuweka "%s"faili kwenye kumbukumbu
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Maingizo ya hesabu
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index ea176590472..8a1787ca358 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -250,8 +250,8 @@ Security=Usalama
 Passwords=Nywila
 DoNotStoreClearPassword=Simba nenosiri lililohifadhiwa kwenye hifadhidata (SIO kama maandishi wazi). Inashauriwa sana kuamsha chaguo hili.
 MainDbPasswordFileConfEncrypted=Encrypt database password kuhifadhiwa katika conf.php. Inashauriwa sana kuamsha chaguo hili.
-InstrucToEncodePass=Ili nenosiri lisimbwe kwenye <b> conf.php </b>  faili, badilisha mstari <br>  <b> $ dolibarr_main_db_pass="..."; </b>  <br> na <br>  <b> $dolibarr_main_db_pass="crypted:%s"; </b> 
-InstrucToClearPass=Ili nenosiri lisimbuliwe (wazi) katika <b> conf.php </b>  faili, badilisha mstari <br>  <b> $dolibarr_main_db_pass="iliyofichwa:..."; </b>  <br> na <br>  <b> $dolibarr_main_db_pass="%s"; </b> 
+InstrucToEncodePass=Ili nenosiri lisimbwe kwenye <b> conf.php </b>  faili, badilisha mstari <br>  <b> $ dolibarr_main_db_pass="..."; </b>  <br> na <br>  <b> $dolibarr_main_db_pass="crypted:%s"; </b>
+InstrucToClearPass=Ili nenosiri lisimbuliwe (wazi) katika <b> conf.php </b>  faili, badilisha mstari <br>  <b> $dolibarr_main_db_pass="iliyofichwa:..."; </b>  <br> na <br>  <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=Linda faili za PDF zinazozalishwa. Hii haipendekezwi kwani inavunja uundaji wa PDF kwa wingi.
 ProtectAndEncryptPdfFilesDesc=Ulinzi wa hati ya PDF huifanya iweze kusoma na kuchapisha kwa kutumia kivinjari chochote cha PDF. Walakini, kuhariri na kunakili hakuwezekani tena. Kumbuka kuwa kutumia kipengele hiki hufanya ujenzi wa PDF zilizounganishwa kimataifa kutofanya kazi.
 Feature=Kipengele
@@ -268,8 +268,8 @@ OtherResources=Rasilimali nyingine
 ExternalResources=Rasilimali za Nje
 SocialNetworks=Mitandao ya kijamii
 SocialNetworkId=Kitambulisho cha Mtandao wa Kijamii
-ForDocumentationSeeWiki=Kwa hati za mtumiaji au msanidi (Hati, Maswali Yanayoulizwa Mara kwa Mara...), <br> angalia Wiki ya Dolibarr: <br>  <b>  <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>  </b> 
-ForAnswersSeeForum=Kwa maswali/msaada wowote mwingine, unaweza kutumia jukwaa la Dolibarr: <br>  <b>  <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>  </b> 
+ForDocumentationSeeWiki=Kwa hati za mtumiaji au msanidi (Hati, Maswali Yanayoulizwa Mara kwa Mara...), <br> angalia Wiki ya Dolibarr: <br>  <b>  <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>  </b>
+ForAnswersSeeForum=Kwa maswali/msaada wowote mwingine, unaweza kutumia jukwaa la Dolibarr: <br>  <b>  <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>  </b>
 HelpCenterDesc1=Hizi hapa ni baadhi ya nyenzo za kupata usaidizi na usaidizi na Dolibarr.
 HelpCenterDesc2=Baadhi ya nyenzo hizi zinapatikana tu katika <b> kiingereza </b> .
 CurrentMenuHandler=Kidhibiti cha menyu cha sasa
@@ -345,11 +345,11 @@ ThisIsAlternativeProcessToFollow=Huu ni usanidi mbadala wa kuchakata kwa mikono:
 StepNb=Hatua %s
 FindPackageFromWebSite=Tafuta kifurushi kinachotoa vipengele unavyohitaji (kwa mfano kwenye tovuti rasmi %s)
 DownloadPackageFromWebSite=Pakua kifurushi (kwa mfano kutoka kwa tovuti rasmi %s)
-UnpackPackageInDolibarrRoot=Fungua/fungua faili zilizofungashwa kwenye saraka yako ya seva ya Dolibarr: <b> %s </b> 
-UnpackPackageInModulesRoot=Ili kupeleka/kusakinisha sehemu ya nje, lazima ufungue/ufungue faili ya kumbukumbu kwenye saraka ya seva iliyowekwa kwa moduli za nje: <br>  <b> %s </b> 
+UnpackPackageInDolibarrRoot=Fungua/fungua faili zilizofungashwa kwenye saraka yako ya seva ya Dolibarr: <b> %s </b>
+UnpackPackageInModulesRoot=Ili kupeleka/kusakinisha sehemu ya nje, lazima ufungue/ufungue faili ya kumbukumbu kwenye saraka ya seva iliyowekwa kwa moduli za nje: <br>  <b> %s </b>
 SetupIsReadyForUse=Uwekaji wa moduli umekamilika. Hata hivyo lazima uwashe na usanidi moduli katika programu yako kwa kwenda kwenye moduli za kusanidi ukurasa: <a href="%s"> %s </a> .
-NotExistsDirect=Saraka ya mizizi mbadala haijafafanuliwa kwa saraka iliyopo. <br> 
-InfDirAlt=Tangu toleo la 3, inawezekana kufafanua saraka ya mizizi mbadala. Hii hukuruhusu kuhifadhi, kwenye saraka maalum, programu-jalizi na violezo maalum. <br> Unda tu saraka kwenye mzizi wa Dolibarr (kwa mfano: desturi). <br> 
+NotExistsDirect=Saraka ya mizizi mbadala haijafafanuliwa kwa saraka iliyopo. <br>
+InfDirAlt=Tangu toleo la 3, inawezekana kufafanua saraka ya mizizi mbadala. Hii hukuruhusu kuhifadhi, kwenye saraka maalum, programu-jalizi na violezo maalum. <br> Unda tu saraka kwenye mzizi wa Dolibarr (kwa mfano: desturi). <br>
 InfDirExample= <br> Kisha itangaze katika faili <strong> conf.php </strong>  <br>  $dolibarr_main_url_root_alt='/custom' <br> $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom' <br> Ikiwa mistari hii imetolewa maoni kwa "#", ili kuiwezesha, toa maoni tu kwa kuondoa herufi "#".
 YouCanSubmitFile=Unaweza kupakia faili ya .zip ya kifurushi cha moduli kutoka hapa:
 CurrentVersion=Toleo la sasa la Dolibarr
@@ -361,17 +361,17 @@ LastActivationIP=IP ya uanzishaji wa hivi karibuni
 LastActivationVersion=Toleo la hivi punde la kuwezesha
 UpdateServerOffline=Sasisha seva nje ya mtandao
 WithCounter=Dhibiti kaunta
-GenericMaskCodes=Unaweza kuingiza kinyago chochote cha nambari. Katika barakoa hii, lebo zifuatazo zinaweza kutumika: <br>  <b> {000000} </b>  inalingana na nambari ambayo itaongezwa kwa kila %s. Weka sufuri nyingi kadiri ya urefu unaohitajika wa kaunta. Kaunta itakamilika kwa sufuri kutoka upande wa kushoto ili kuwa na sufuri nyingi kama kinyago. <br>  <b> {000000+000} </b>  sawa na ile ya awali lakini msimbo unaolingana na nambari iliyo upande wa kulia wa + ishara inatumika kuanzia <span class='notranslate'>%s</span> ya kwanza\n. <br>  <b> {000000@x} </b>  sawa na ile ya awali lakini kaunta imewekwa upya hadi sifuri mwezi x unapofikiwa (x kati ya 1 na 12, au 0 ili kutumia miezi ya mapema ya mwaka wa fedha iliyobainishwa katika usanidi wako, au 99 kuweka upya hadi sufuri kila mwezi). Ikiwa chaguo hili litatumika na x ni 2 au zaidi, basi mfuatano wa {yy}{mm} au {yyyy}{mm} unahitajika pia. <br>  <b> {dd} </b>  siku (01 hadi 31). <br>  <b> {mm} </b>  mwezi (01 hadi 12). <br>  <b> {yy} </b> , <b> {yyyy} </b>  au <b> {y} </b>  mwaka zaidi ya 2, 4 au 1 nambari. <br> 
-GenericMaskCodes2= <b> {cccc} </b>  msimbo wa mteja kwenye herufi n <br>  <b> {cccc000} </b>  msimbo wa mteja kwenye herufi n hufuatwa na kaunta iliyowekwa kwa mteja. Kaunta hii iliyowekwa kwa mteja imewekwa upya kwa wakati mmoja na kaunta ya kimataifa. <br>  <b> {tttt} </b>  Msimbo wa aina ya mtu wa tatu kwenye herufi n (tazama menyu Nyumbani - Mipangilio - Kamusi - Aina za wahusika wengine). Ukiongeza lebo hii, kihesabu kitakuwa tofauti kwa kila aina ya wahusika wengine. <br> 
-GenericMaskCodes3=Wahusika wengine wote kwenye barakoa watabaki bila kubadilika. <br> Nafasi haziruhusiwi. <br> 
-GenericMaskCodes3EAN=Vibambo vingine vyote kwenye barakoa vitasalia bila kubadilika (isipokuwa * au ? katika nafasi ya 13 katika EAN13). <br> Nafasi haziruhusiwi. <br> Katika EAN13, herufi ya mwisho baada ya ya mwisho } katika nafasi ya 13 inapaswa kuwa * au ? . Itabadilishwa na ufunguo uliohesabiwa. <br> 
+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>  msimbo wa mteja kwenye herufi n <br>  <b> {cccc000} </b>  msimbo wa mteja kwenye herufi n hufuatwa na kaunta iliyowekwa kwa mteja. Kaunta hii iliyowekwa kwa mteja imewekwa upya kwa wakati mmoja na kaunta ya kimataifa. <br>  <b> {tttt} </b>  Msimbo wa aina ya mtu wa tatu kwenye herufi n (tazama menyu Nyumbani - Mipangilio - Kamusi - Aina za wahusika wengine). Ukiongeza lebo hii, kihesabu kitakuwa tofauti kwa kila aina ya wahusika wengine. <br>
+GenericMaskCodes3=Wahusika wengine wote kwenye barakoa watabaki bila kubadilika. <br> Nafasi haziruhusiwi. <br>
+GenericMaskCodes3EAN=Vibambo vingine vyote kwenye barakoa vitasalia bila kubadilika (isipokuwa * au ? katika nafasi ya 13 katika EAN13). <br> Nafasi haziruhusiwi. <br> Katika EAN13, herufi ya mwisho baada ya ya mwisho } katika nafasi ya 13 inapaswa kuwa * au ? . Itabadilishwa na ufunguo uliohesabiwa. <br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Hurejesha nambari inayoweza kugeuzwa kukufaa kulingana na kinyago kilichobainishwa.
-ServerAvailableOnIPOrPort=Seva inapatikana katika anwani <b> %s </b>  kwenye bandari <b> %s </b> 
-ServerNotAvailableOnIPOrPort=Seva haipatikani kwa anwani <b> %s </b>  kwenye bandari <b> %s </b> 
+ServerAvailableOnIPOrPort=Seva inapatikana katika anwani <b> %s </b>  kwenye bandari <b> %s </b>
+ServerNotAvailableOnIPOrPort=Seva haipatikani kwa anwani <b> %s </b>  kwenye bandari <b> %s </b>
 DoTestServerAvailability=Jaribu muunganisho wa seva
 DoTestSend=Mtihani wa kutuma
 DoTestSendHTML=Jaribu kutuma HTML
@@ -471,7 +471,7 @@ ExtrafieldParamHelpSeparator=Weka tupu kwa kitenganishi rahisi <br> Weka hii iwe
 LibraryToBuildPDF=Maktaba inayotumika kutengeneza PDF
 LocalTaxDesc=Baadhi ya nchi zinaweza kutoza kodi mbili au tatu kwenye kila laini ya ankara. Ikiwa ndivyo ilivyo, chagua aina ya ushuru wa pili na wa tatu na kiwango chake. Aina zinazowezekana ni: <br> 1: Kodi ya ndani itatozwa kwa bidhaa na huduma bila VAT (kokotoo la ushuru wa ndani huhesabiwa kwa kiasi bila kodi) <br> 2: Kodi ya ndani itatozwa kwa bidhaa na huduma ikijumuisha vat (kokotoo la kodi ya ndani huhesabiwa kwa kiasi + kodi kuu) <br> 3: Kodi ya ndani itatozwa kwa bidhaa bila VAT (kokotoo la ushuru wa ndani huhesabiwa kwa kiasi bila kodi) <br> 4: Kodi ya ndani itatozwa kwa bidhaa ikijumuisha vat (kokotoo la ushuru wa ndani huhesabiwa kwa kiasi + VAT kuu) <br> 5: Kodi ya ndani itatozwa kwa huduma bila VAT (kokotoo la ushuru wa ndani huhesabiwa kwa kiasi bila kodi) <br> 6: Kodi ya ndani itatozwa kwa huduma ikijumuisha vat (kokotoo la ushuru wa ndani huhesabiwa kwa kiasi + kodi)
 SMS=SMS
-LinkToTestClickToDial=Weka nambari ya simu ya kupiga ili kuonyesha kiungo cha kujaribu url ya BofyaToDial kwa mtumiaji <strong> %s </strong> 
+LinkToTestClickToDial=Weka nambari ya simu ya kupiga ili kuonyesha kiungo cha kujaribu url ya BofyaToDial kwa mtumiaji <strong> %s </strong>
 RefreshPhoneLink=Onyesha upya kiungo
 LinkToTest=Kiungo kinachoweza kubofya kimetolewa kwa mtumiaji <strong> %s </strong>  (bonyeza nambari ya simu ili kujaribu)
 KeepEmptyToUseDefault=Weka tupu ili kutumia thamani chaguomsingi
@@ -518,8 +518,8 @@ DependsOn=Moduli hii inahitaji moduli
 RequiredBy=Moduli hii inahitajika na moduli
 TheKeyIsTheNameOfHtmlField=Hili ndilo jina la uga wa HTML. Ujuzi wa kiufundi unahitajika ili kusoma maudhui ya ukurasa wa HTML ili kupata jina muhimu la sehemu.
 PageUrlForDefaultValues=Lazima uweke njia ya jamaa ya URL ya ukurasa. Ukijumuisha vigezo katika URL, itafaa ikiwa vigezo vyote katika URL iliyovinjari vina thamani iliyofafanuliwa hapa.
-PageUrlForDefaultValuesCreate= <br> Mfano: <br> Ili fomu iunde mtu mwingine mpya, ni <strong> %s </strong> . <br> Kwa URL ya sehemu za nje zilizosakinishwa kwenye saraka maalum, usijumuishe "desturi/", kwa hivyo tumia njia kama <strong> mymodule/mypage.php </strong>  na si desturi/mymodule/mypage.php. <br> Ikiwa unataka thamani chaguo-msingi ikiwa url ina kigezo fulani, unaweza kutumia <strong> %s </strong> 
-PageUrlForDefaultValuesList= <br> Mfano: <br> Kwa ukurasa unaoorodhesha wahusika wengine, ni <strong> %s </strong> . <br> Kwa URL ya sehemu za nje zilizosakinishwa kwenye saraka maalum, usijumuishe "desturi/" kwa hivyo tumia njia kama <strong> mymodule/mypagelist.php </strong>  na si desturi/mymodule/mypagelist.php. <br> Ikiwa unataka thamani chaguo-msingi ikiwa url ina kigezo fulani, unaweza kutumia <strong> %s </strong> 
+PageUrlForDefaultValuesCreate= <br> Mfano: <br> Ili fomu iunde mtu mwingine mpya, ni <strong> %s </strong> . <br> Kwa URL ya sehemu za nje zilizosakinishwa kwenye saraka maalum, usijumuishe "desturi/", kwa hivyo tumia njia kama <strong> mymodule/mypage.php </strong>  na si desturi/mymodule/mypage.php. <br> Ikiwa unataka thamani chaguo-msingi ikiwa url ina kigezo fulani, unaweza kutumia <strong> %s </strong>
+PageUrlForDefaultValuesList= <br> Mfano: <br> Kwa ukurasa unaoorodhesha wahusika wengine, ni <strong> %s </strong> . <br> Kwa URL ya sehemu za nje zilizosakinishwa kwenye saraka maalum, usijumuishe "desturi/" kwa hivyo tumia njia kama <strong> mymodule/mypagelist.php </strong>  na si desturi/mymodule/mypagelist.php. <br> Ikiwa unataka thamani chaguo-msingi ikiwa url ina kigezo fulani, unaweza kutumia <strong> %s </strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwriting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Washa ubinafsishaji wa thamani chaguo-msingi
 EnableOverwriteTranslation=Ruhusu ubinafsishaji wa tafsiri
@@ -1135,12 +1135,12 @@ LocalTax2IsUsedDesc=Tumia aina ya tatu ya ushuru (isipokuwa ya kwanza)
 LocalTax2IsNotUsedDesc=Usitumie aina nyingine ya ushuru (isipokuwa ya kwanza)
 LocalTax2Management=Aina ya tatu ya ushuru
 LocalTax1ManagementES=Usimamizi wa RE
-LocalTax1IsUsedDescES=Kiwango cha RE kwa chaguomsingi wakati wa kuunda matarajio, ankara, maagizo n.k. hufuata kanuni inayotumika ya kawaida: <br> Ikiwa mnunuzi hajatawaliwa na RE, RE kwa chaguo-msingi=0. Mwisho wa kanuni. <br> Ikiwa mnunuzi anakabiliwa na RE basi RE bila msingi. Mwisho wa kanuni. <br> 
+LocalTax1IsUsedDescES=Kiwango cha RE kwa chaguomsingi wakati wa kuunda matarajio, ankara, maagizo n.k. hufuata kanuni inayotumika ya kawaida: <br> Ikiwa mnunuzi hajatawaliwa na RE, RE kwa chaguo-msingi=0. Mwisho wa kanuni. <br> Ikiwa mnunuzi anakabiliwa na RE basi RE bila msingi. Mwisho wa kanuni. <br>
 LocalTax1IsNotUsedDescES=Kwa chaguo-msingi RE iliyopendekezwa ni 0. Mwisho wa sheria.
 LocalTax1IsUsedExampleES=Huko Uhispania ni wataalamu walio chini ya sehemu fulani maalum za IAE ya Uhispania.
 LocalTax1IsNotUsedExampleES=Nchini Uhispania ni taaluma na jamii na ziko chini ya sehemu fulani za IAE ya Uhispania.
 LocalTax2ManagementES=Usimamizi wa IRPF
-LocalTax2IsUsedDescES=Kiwango cha IRPF kwa chaguomsingi wakati wa kuunda matarajio, ankara, maagizo n.k. fuata kanuni inayotumika ya kawaida: <br> Ikiwa muuzaji hajakabiliwa na IRPF, basi IRPF kwa chaguo-msingi=0. Mwisho wa kanuni. <br> Ikiwa muuzaji anakabiliwa na IRPF basi IRPF kwa chaguo-msingi. Mwisho wa kanuni. <br> 
+LocalTax2IsUsedDescES=Kiwango cha IRPF kwa chaguomsingi wakati wa kuunda matarajio, ankara, maagizo n.k. fuata kanuni inayotumika ya kawaida: <br> Ikiwa muuzaji hajakabiliwa na IRPF, basi IRPF kwa chaguo-msingi=0. Mwisho wa kanuni. <br> Ikiwa muuzaji anakabiliwa na IRPF basi IRPF kwa chaguo-msingi. Mwisho wa kanuni. <br>
 LocalTax2IsNotUsedDescES=Kwa chaguo-msingi IRPF inayopendekezwa ni 0. Mwisho wa sheria.
 LocalTax2IsUsedExampleES=Huko Uhispania, wafanyikazi wa kujitegemea na wataalamu wa kujitegemea ambao hutoa huduma na kampuni ambazo zimechagua mfumo wa ushuru wa moduli.
 LocalTax2IsNotUsedExampleES=Huko Uhispania ni biashara ambazo haziko chini ya mfumo wa ushuru wa moduli.
@@ -1197,6 +1197,7 @@ Skin=Mandhari ya ngozi
 DefaultSkin=Mandhari chaguomsingi ya ngozi
 MaxSizeList=Urefu wa juu wa orodha
 DefaultMaxSizeList=Upeo chaguomsingi wa urefu wa orodha
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Upeo chaguomsingi wa urefu wa orodha fupi (yaani katika kadi ya mteja)
 MessageOfDay=Ujumbe wa siku
 MessageLogin=Ujumbe wa ukurasa wa kuingia
@@ -1249,7 +1250,7 @@ SetupDescription2=Sehemu mbili zifuatazo ni za lazima (viingizo viwili vya kwanz
 SetupDescription3= <a href="%s"> %s -> %s </a>  <br>  <br> Vigezo vya msingi vinavyotumika kubinafsisha tabia chaguomsingi ya programu yako (k.m kwa vipengele vinavyohusiana na nchi).
 SetupDescription4= <a href="%s"> %s -> %s </a>  <br>  <br> Programu hii ni safu ya moduli/programu nyingi. Moduli zinazohusiana na mahitaji yako lazima ziwashwe na kusanidiwa. Maingizo ya menyu yataonekana na kuwezesha moduli hizi.
 SetupDescription5=Maingizo mengine ya menyu ya Kuweka hudhibiti vigezo vya hiari.
-SetupDescriptionLink= <a href="%s"> %s - %s </a> 
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=Vigezo vya msingi vinavyotumika kubinafsisha tabia chaguo-msingi ya programu yako (k.m kwa vipengele vinavyohusiana na nchi).
 SetupDescription4b=Programu hii ni safu ya moduli/programu nyingi. Moduli zinazohusiana na mahitaji yako lazima ziwezeshwe. Maingizo ya menyu yataonekana na kuwezesha moduli hizi.
 AuditedSecurityEvents=Matukio ya usalama ambayo yanakaguliwa
@@ -1381,21 +1382,21 @@ NewTranslationStringToShow=Mfuatano mpya wa tafsiri wa kuonyesha
 OriginalValueWas=Tafsiri asili imebatilishwa. Thamani halisi ilikuwa: <br>  <br> %s
 TransKeyWithoutOriginalValue=Umelazimisha tafsiri mpya ya ufunguo wa kutafsiri ' <strong> %s </strong> ' ambayo haipo katika faili za lugha yoyote
 TitleNumberOfActivatedModules=Moduli zilizoamilishwa
-TotalNumberOfActivatedModules=Sehemu zilizoamilishwa: <b> %s </b>  / <b> %s </b> 
+TotalNumberOfActivatedModules=Sehemu zilizoamilishwa: <b> %s </b>  / <b> %s </b>
 YouMustEnableOneModule=Lazima angalau uwashe moduli 1
 YouMustEnableTranslationOverwriteBefore=Lazima kwanza uwezeshe uandishi wa tafsiri ili uruhusiwe kuchukua nafasi ya tafsiri
 ClassNotFoundIntoPathWarning=Darasa %s haipatikani kwenye njia ya PHP
 YesInSummer=Ndiyo katika majira ya joto
-OnlyFollowingModulesAreOpenedToExternalUsers=Kumbuka, sehemu zifuatazo pekee ndizo zinapatikana kwa watumiaji wa nje (bila kujali ruhusa za watumiaji kama hao) na ikiwa tu ruhusa zimetolewa: <br> 
+OnlyFollowingModulesAreOpenedToExternalUsers=Kumbuka, sehemu zifuatazo pekee ndizo zinapatikana kwa watumiaji wa nje (bila kujali ruhusa za watumiaji kama hao) na ikiwa tu ruhusa zimetolewa: <br>
 SuhosinSessionEncrypt=Hifadhi ya kipindi imesimbwa kwa njia fiche na Suhosin
 ConditionIsCurrently=Hali kwa sasa ni %s
 YouUseBestDriver=Unatumia dereva %s ambayo ni dereva bora zaidi kwa sasa.
 YouDoNotUseBestDriver=Unatumia dereva %s lakini dereva %s inapendekezwa.
-NbOfObjectIsLowerThanNoPb=Una <span class='notranslate'>%s</span> pekee\n %s katika hifadhidata. Hii haihitaji uboreshaji wowote.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 ComboListOptim=Uboreshaji wa upakiaji wa orodha ya mchanganyiko
 SearchOptim=Uboreshaji wa utafutaji
 YouHaveXObjectUseComboOptim=Una %s %s katika hifadhidata. Unaweza kwenda katika usanidi wa moduli ili kuwezesha upakiaji wa orodha ya mseto kwenye tukio lililobonyezwa kwa ufunguo.
-YouHaveXObjectUseSearchOptim=Una %s %s katika hifadhidata. Unaweza kuongeza <span class='notranslate'>%s</span> isiyobadilika.\n kwa 1 katika Nyumbani-Setup-Nyingine.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
 YouHaveXObjectUseSearchOptimDesc=Hii inaweka kikomo utaftaji hadi mwanzo wa mifuatano ambayo inafanya uwezekano wa hifadhidata kutumia faharisi na unapaswa kupata jibu la haraka.
 YouHaveXObjectAndSearchOptimOn=Una %s %s katika hifadhidata na mara kwa mara %s imewekwa kuwa %s katika Usanidi-Nyumbani-Nyingine.
 BrowserIsOK=Unatumia %s kivinjari. Kivinjari hiki ni sawa kwa usalama na utendakazi.
@@ -1921,7 +1922,7 @@ GeoIPMaxmindSetup=Usanidi wa moduli ya GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Njia ya faili iliyo na Maxmind ip kwa tafsiri ya nchi
 NoteOnPathLocation=Kumbuka kuwa faili yako ya data ya ip hadi nchi lazima iwe ndani ya saraka ambayo PHP yako inaweza kusoma (Angalia usanidi wako wa PHP open_basedir na ruhusa za mfumo wa faili).
 YouCanDownloadFreeDatFileTo=Unaweza kupakua <b> toleo la onyesho lisilolipishwa </b>  ya faili ya Maxmind GeoIP nchi katika %s.
-YouCanDownloadAdvancedDatFileTo=Unaweza pia kupakua <span class='notranslate'><b></span> zaidi\n toleo kamili, pamoja na masasisho, </b>  ya faili ya Maxmind GeoIP nchi katika %s.
+YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
 TestGeoIPResult=Jaribio la IP ya ubadilishaji -> nchi
 ##### Projects #####
 ProjectsNumberingModules=Moduli ya kuhesabu miradi
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=Ufungaji wa moduli ya nje hauwezekani kut
 SomethingMakeInstallFromWebNotPossible2=Kwa sababu hii, mchakato wa kuboresha uliofafanuliwa hapa ni mchakato wa mwongozo tu mtumiaji aliyebahatika anaweza kufanya.
 InstallModuleFromWebHasBeenDisabledContactUs=Kusakinisha au kutengeneza moduli za nje au tovuti zinazobadilika, kutoka kwa programu, imefungwa kwa sasa kwa madhumuni ya usalama. Tafadhali wasiliana nasi ikiwa unahitaji kuwezesha kipengele hiki.
 InstallModuleFromWebHasBeenDisabledByFile=Usakinishaji wa sehemu ya nje kutoka kwa programu umezimwa na msimamizi wako. Lazima umwombe aondoe faili <strong> %s </strong>  kuruhusu kipengele hiki.
-ConfFileMustContainCustom=Kusakinisha au kujenga sehemu ya nje kutoka kwa programu kunahitaji kuhifadhi faili za sehemu kwenye saraka <strong> %s </strong> . Ili saraka hii ichakatwa na Dolibarr, lazima usanidi <strong> conf/conf.php </strong>  ili kuongeza mistari 2 ya maagizo: <br>  <strong> $dolibarr_main_url_root_alt='/custom'; </strong>  <br>  <strong> $dolibarr_main_document_root_alt='%s/desturi'; </strong> 
+ConfFileMustContainCustom=Kusakinisha au kujenga sehemu ya nje kutoka kwa programu kunahitaji kuhifadhi faili za sehemu kwenye saraka <strong> %s </strong> . Ili saraka hii ichakatwa na Dolibarr, lazima usanidi <strong> conf/conf.php </strong>  ili kuongeza mistari 2 ya maagizo: <br>  <strong> $dolibarr_main_url_root_alt='/custom'; </strong>  <br>  <strong> $dolibarr_main_document_root_alt='%s/desturi'; </strong>
 HighlightLinesOnMouseHover=Angazia mistari ya jedwali wakati uhamishaji wa kipanya unapita
 HighlightLinesColor=Angazia rangi ya mstari wakati kipanya kinapita (tumia 'ffffff' bila kuangazia)
 HighlightLinesChecked=Angazia rangi ya mstari inapoangaliwa (tumia 'ffffff' bila kuangazia)
@@ -2113,7 +2114,7 @@ HelpOnTooltipDesc=Weka maandishi au ufunguo wa kutafsiri hapa ili maandishi yaon
 YouCanDeleteFileOnServerWith=Unaweza kufuta faili hii kwenye seva kwa Mstari wa Amri: <br> %s
 ChartLoaded=Chati ya akaunti imepakiwa
 SocialNetworkSetup=Usanidi wa moduli ya Mitandao ya Kijamii
-EnableFeatureFor=Washa vipengele vya <strong> %s </strong> 
+EnableFeatureFor=Washa vipengele vya <strong> %s </strong>
 VATIsUsedIsOff=Kumbuka: Chaguo la kutumia Kodi ya Mauzo au VAT limewekwa kuwa <strong> Imezimwa </strong>  katika menyu %s - %s, kwa hivyo ushuru wa mauzo au Vat iliyotumiwa itakuwa 0 kwa mauzo kila wakati.
 SwapSenderAndRecipientOnPDF=Badilisha nafasi ya anwani ya mtumaji na mpokeaji kwenye hati za PDF
 FeatureSupportedOnTextFieldsOnly=Onyo, kipengele kinachotumika kwenye sehemu za maandishi na orodha za mchanganyiko pekee. Pia kigezo cha URL action=create au action=edit lazima kiwekwe AU jina la ukurasa lazima limalizike na 'new.php' ili kuanzisha kipengele hiki.
@@ -2289,8 +2290,8 @@ DatabasePasswordObfuscated=Nenosiri la hifadhidata limefichwa katika faili ya co
 DatabasePasswordNotObfuscated=Nenosiri la hifadhidata HAIJABIKISHWA kwenye faili ya conf
 APIsAreNotEnabled=Moduli za API hazijawezeshwa
 YouShouldSetThisToOff=Unapaswa kuweka hii kuwa 0 au kuzima
-InstallAndUpgradeLockedBy=Usakinishaji na uboreshaji hufungwa na faili <b> %s </b> 
-InstallLockedBy=Sakinisha/Sakinisha upya imefungwa na faili <b> %s </b> 
+InstallAndUpgradeLockedBy=Usakinishaji na uboreshaji hufungwa na faili <b> %s </b>
+InstallLockedBy=Sakinisha/Sakinisha upya imefungwa na faili <b> %s </b>
 InstallOfAddonIsNotBlocked=Ufungaji wa addons haujafungwa. Unda faili <b> installmodules.lock </b>  kwenye saraka <b> %s </b>  kuzuia usakinishaji wa viongezeo/moduli za nje.
 OldImplementation=Utekelezaji wa zamani
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Ikiwa baadhi ya moduli za malipo mtandaoni zimewashwa (Paypal, Stripe, ...), ongeza kiungo kwenye PDF ili kufanya malipo ya mtandaoni.
@@ -2372,7 +2373,7 @@ MaxNumberOfPostOnPublicPagesByIP=Idadi ya juu zaidi ya machapisho kwenye kurasa
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a third party or contact from its phone number. URL to use is:
 ScriptIsEmpty=Hati ni tupu
 ShowHideTheNRequests=Onyesha/ficha %s Maombi ya SQL
-DefinedAPathForAntivirusCommandIntoSetup=Bainisha njia ya programu ya kuzuia virusi katika <b> %s </b> 
+DefinedAPathForAntivirusCommandIntoSetup=Bainisha njia ya programu ya kuzuia virusi katika <b> %s </b>
 TriggerCodes=Matukio yanayoweza kuzuka
 TriggerCodeInfo=Ingiza hapa misimbo ya vichochezi ambayo lazima itoe chapisho la ombi la wavuti (URL ya nje pekee ndiyo inaruhusiwa). Unaweza kuingiza misimbo kadhaa ya vichochezi ikitenganishwa na koma.
 EditableWhenDraftOnly=Ikiwa haijachaguliwa, thamani inaweza kurekebishwa tu wakati kitu kina hali ya rasimu
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Haijaundwa na chaguo-msingi. Imeu
 CSSPage=Mtindo wa CSS
 Defaultfortype=Chaguomsingi
 DefaultForTypeDesc=Kiolezo kinachotumiwa na chaguo-msingi wakati wa kuunda barua pepe mpya ya aina ya kiolezo
-OptionXShouldBeEnabledInModuleY=Chaguo " <b> %s </b> " inapaswa kuwashwa katika sehemu <b> %s </b> 
-OptionXIsCorrectlyEnabledInModuleY=Chaguo " <b> %s </b> " imewashwa kuwa moduli <b> %s </b> 
+OptionXShouldBeEnabledInModuleY=Chaguo " <b> %s </b> " inapaswa kuwashwa katika sehemu <b> %s </b>
+OptionXIsCorrectlyEnabledInModuleY=Chaguo " <b> %s </b> " imewashwa kuwa moduli <b> %s </b>
 AllowOnLineSign=Allow On Line signature
 AtBottomOfPage=Chini ya ukurasa
 FailedAuth=failed authentications
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/sw_SW/assets.lang b/htdocs/langs/sw_SW/assets.lang
index ed22a3bc4d2..40a4c78196c 100644
--- a/htdocs/langs/sw_SW/assets.lang
+++ b/htdocs/langs/sw_SW/assets.lang
@@ -122,7 +122,6 @@ AssetDepreciationOptionDepreciationTypeLinear=Linear
 AssetDepreciationOptionDepreciationTypeDegressive=Degressive
 AssetDepreciationOptionDepreciationTypeExceptional=Kipekee
 AssetDepreciationOptionDegressiveRate=Kiwango cha kushuka
-AssetDepreciationOptionAcceleratedDepreciation=Kushuka kwa thamani kwa kasi (kodi)
 AssetDepreciationOptionDuration=Muda
 AssetDepreciationOptionDurationType=Muda wa aina
 AssetDepreciationOptionDurationTypeAnnual=Mwaka
@@ -168,7 +167,7 @@ AssetDepreciationReversal=Kugeuza
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=Kitambulisho cha kipengee au sauti ya mfano haijatolewa
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model found has not been provided
 AssetErrorFetchAccountancyCodesForMode=Hitilafu wakati wa kurejesha akaunti za uhasibu za '%s' hali ya kushuka kwa thamani
 AssetErrorDeleteAccountancyCodesForMode=Hitilafu wakati wa kufuta akaunti za uhasibu kutoka kwa '%s' hali ya kushuka kwa thamani
 AssetErrorInsertAccountancyCodesForMode=Hitilafu wakati wa kuingiza akaunti za uhasibu za hali ya uchakavu '%s'
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index b1a0dac0230..67c1680ae39 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=Njia ya malipo (msimbo)
 LabelPaymentMode=Njia ya malipo (lebo)
 PaymentModeShort=Njia ya malipo
 PaymentTerm=Muda wa Malipo
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=Masharti ya Malipo
 PaymentConditionsShort=Masharti ya Malipo
 PaymentAmount=Kiasi cha malipo
@@ -268,6 +271,8 @@ NoDraftBills=Hakuna rasimu ya ankara
 NoOtherDraftBills=Hakuna rasimu nyingine ya ankara
 NoDraftInvoices=Hakuna rasimu ya ankara
 RefBill=Ref ya ankara
+RefSupplierBill=Supplier invoice ref
+SupplierOrderCreateBill=Create invoice
 ToBill=Kwa bili
 RemainderToBill=Salio kwa bili
 SendBillByMail=Tuma ankara kwa barua pepe
@@ -352,6 +357,7 @@ HelpAbandonOther=Kiasi hiki kimetelekezwa kwa kuwa kilikuwa na hitilafu (mteja m
 IdSocialContribution=Kitambulisho cha malipo ya kodi ya kijamii/fedha
 PaymentId=Kitambulisho cha malipo
 PaymentRef=Ref.
+SourceInvoiceId=Source invoice id
 InvoiceId=Kitambulisho cha ankara
 InvoiceRef=Ref ya ankara.
 InvoiceDateCreation=Tarehe ya kuunda ankara
diff --git a/htdocs/langs/sw_SW/bookmarks.lang b/htdocs/langs/sw_SW/bookmarks.lang
index 272543c3b33..dba8ec1e031 100644
--- a/htdocs/langs/sw_SW/bookmarks.lang
+++ b/htdocs/langs/sw_SW/bookmarks.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - marque pages / bookmarks
 
 AddThisPageToBookmarks = Ongeza ukurasa wa sasa kwenye vialamisho
-BehaviourOnClick = Tabia wakati URL ya alamisho imechaguliwa
+BehaviourOnClick = Behavior when a bookmark URL is selected
 Bookmark = Alamisho
 Bookmarks = Alamisho
 BookmarkTargetNewWindowShort = Kichupo kipya
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 3026ba76df3..bb0d83cb607 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -49,7 +49,7 @@ BoxOldestActions=Matukio ya zamani zaidi ya kufanya
 BoxLastExpiredServices=Hivi karibuni %s anwani za zamani zaidi zilizo na huduma zinazotumika ambazo muda wake umeisha
 BoxTitleLastActionsToDo=Hivi karibuni %s vitendo vya kufanya
 BoxTitleOldestActionsToDo=Kongwe zaidi %s matukio ya kufanya, haijakamilika
-BoxTitleFutureActions=<span class='notranslate'>%s</span> inayofuata\n matukio yajayo
+BoxTitleFutureActions=The next %s upcoming events
 BoxTitleLastContracts=Hivi karibuni %s mikataba ambayo ilifanyiwa marekebisho
 BoxTitleLastModifiedDonations=Hivi karibuni %s michango ambayo ilibadilishwa
 BoxTitleLastModifiedExpenses=Hivi karibuni %s ripoti za gharama ambazo zilibadilishwa
@@ -100,7 +100,7 @@ BoxTitleLatestModifiedCandidatures=Hivi karibuni %s maombi ya kazi yaliyorekebis
 ForCustomersInvoices=ankara za wateja
 ForCustomersOrders=Wateja maagizo
 ForProposals=Mapendekezo
-LastXMonthRolling=<span class='notranslate'>%s</span> ya hivi punde zaidi\n mwezi rolling
+LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Ongeza wijeti kwenye dashibodi yako
 BoxAdded=Wijeti iliongezwa kwenye dashibodi yako
 BoxTitleUserBirthdaysOfMonth=Siku za kuzaliwa za mwezi huu (watumiaji)
@@ -115,7 +115,7 @@ BoxLastCustomerShipments=Usafirishaji wa mwisho wa mteja
 BoxTitleLastCustomerShipments=Hivi karibuni %s usafirishaji wa wateja
 BoxTitleLastLeaveRequests=Hivi karibuni %s maombi ya likizo yaliyorekebishwa
 NoRecordedShipments=Hakuna usafirishaji wa mteja uliorekodiwa
-BoxCustomersOutstandingBillReached=Wateja walio na kikomo ambacho hakijalipwa wamefikiwa
+BoxCustomersOutstandingBillReached=Customers with outstanding limit reached
 # Pages
 UsersHome=Watumiaji wa nyumbani na vikundi
 MembersHome=Uanachama wa Nyumbani
diff --git a/htdocs/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang
index 064d0965b32..7f0c5cc0642 100644
--- a/htdocs/langs/sw_SW/commercial.lang
+++ b/htdocs/langs/sw_SW/commercial.lang
@@ -77,13 +77,17 @@ ToOfferALinkForOnlineSignature=Kiungo cha sahihi ya mtandaoni
 WelcomeOnOnlineSignaturePageProposal=Karibu kwenye ukurasa ili ukubali mapendekezo ya kibiashara kutoka %s
 WelcomeOnOnlineSignaturePageContract=Karibu %s Ukurasa wa Kusaini wa Mkataba wa PDF
 WelcomeOnOnlineSignaturePageFichinter=Karibu %s Ukurasa wa Kusainiwa kwa PDF
+WelcomeOnOnlineSignaturePageSociete_rib=Welcome to %s SEPA mandate PDF Signing Page
 ThisScreenAllowsYouToSignDocFromProposal=Skrini hii hukuruhusu kukubali na kutia sahihi, au kukataa, pendekezo la bei/manukuu
 ThisScreenAllowsYouToSignDocFromContract=Skrini hii hukuruhusu kusaini mkataba kwenye umbizo la PDF mtandaoni.
 ThisScreenAllowsYouToSignDocFromFichinter=Skrini hii hukuruhusu kutia sahihi kuingilia kati kwenye umbizo la PDF mtandaoni.
+ThisScreenAllowsYouToSignDocFromSociete_rib=This screen allow you to sign SEPA Mandate on PDF format online.
 ThisIsInformationOnDocumentToSignProposal=Hii ni habari juu ya hati ya kukubali au kukataa
 ThisIsInformationOnDocumentToSignContract=Hii ni habari juu ya mkataba wa kusaini
 ThisIsInformationOnDocumentToSignFichinter=Hii ni habari juu ya kuingilia kati kusaini
+ThisIsInformationOnDocumentToSignSociete_rib=This is information on SEPA Mandate to sign
 SignatureProposalRef=Saini ya pendekezo la nukuu/biashara %s
 SignatureContractRef=Saini ya mkataba %s
 SignatureFichinterRef=Saini ya kuingilia kati %s
+SignatureSociete_ribRef=Signature of SEPA Mandate %s
 FeatureOnlineSignDisabled=Kipengele cha kutia sahihi mtandaoni kimezimwa au hati kuzalishwa kabla ya kipengele kuwezeshwa
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 9dc3514f9de..a0f99d85a34 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Your contact details have been recorded. We will get back to you soon...
+ContactUsDesc=This form allows you to send us a message for a first contact.
 ErrorCompanyNameAlreadyExists=Jina la kampuni %s tayari ipo. Chagua nyingine.
 ErrorSetACountryFirst=Weka nchi kwanza
 SelectThirdParty=Chagua mtu wa tatu
@@ -46,7 +48,7 @@ ParentCompany=Kampuni mama
 Subsidiaries=Kampuni tanzu
 ReportByMonth=Ripoti kwa mwezi
 ReportByCustomers=Ripoti kwa kila mteja
-ReportByThirdparties=Ripoti kwa kila mtu wa tatu
+ReportByThirdparties=Report per third party
 ReportByQuarter=Ripoti kwa kila kiwango
 CivilityCode=Kanuni ya kiraia
 RegisteredOffice=Ofisi iliyosajiliwa
@@ -117,12 +119,20 @@ ProfId3Short=kitambulisho cha Prof 3
 ProfId4Short=kitambulisho cha Prof 4
 ProfId5Short=kitambulisho cha Prof 5
 ProfId6Short=kitambulisho cha Prof 6
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
 ProfId1=Kitambulisho cha Mtaalamu 1
 ProfId2=Kitambulisho cha Mtaalamu 2
 ProfId3=Kitambulisho cha Mtaalamu 3
 ProfId4=Kitambulisho cha Mtaalamu 4
 ProfId5=Kitambulisho cha Mtaalamu 5
 ProfId6=Kitambulisho cha Mtaalamu 6
+ProfId7=Professional ID 7
+ProfId8=Professional ID 8
+ProfId9=Professional ID 9
+ProfId10=Professional ID 10
 ProfId1AR=Prof Id 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
@@ -201,12 +211,20 @@ ProfId3FR=Prof Id 3 (NAF, APE wa zamani)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=Prof Id 5 (nambari EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Nambari ya Usajili
 ProfId2GB=-
 ProfId3GB=SIC
@@ -245,7 +263,7 @@ ProfId5MA=Kitambulisho cha Prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Mkataba wa Kitaalamu)
+ProfId3MX=Prof Id 3 (Professional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -313,7 +331,7 @@ CustomerRelativeDiscount=Punguzo la jamaa kwa wateja
 SupplierRelativeDiscount=Punguzo la jamaa la muuzaji
 CustomerRelativeDiscountShort=Punguzo la jamaa
 CustomerAbsoluteDiscountShort=Punguzo kabisa
-CompanyHasRelativeDiscount=Mteja huyu ana punguzo chaguomsingi la <b> %s%% </b> 
+CompanyHasRelativeDiscount=Mteja huyu ana punguzo chaguomsingi la <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Mteja huyu hana punguzo la jamaa kwa chaguomsingi
 HasRelativeDiscountFromSupplier=Una punguzo chaguomsingi la <b> %s%% </b>  na muuzaji huyu
 HasNoRelativeDiscountFromSupplier=Hakuna punguzo chaguo-msingi la jamaa na mchuuzi huyu
@@ -387,9 +405,9 @@ EditCompany=Badilisha kampuni
 ThisUserIsNot=Mtumiaji huyu si mtarajiwa, mteja au mchuuzi
 VATIntraCheck=Angalia
 VATIntraCheckDesc=Kitambulisho cha VAT lazima kijumuishe kiambishi awali cha nchi. Kiungo <b> %s </b>  hutumia huduma ya Ulaya ya kukagua VAT (VIES) ambayo inahitaji ufikiaji wa mtandao kutoka kwa seva ya Dolibarr.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Angalia Kitambulisho cha VAT ya ndani ya Jumuiya kwenye tovuti ya Tume ya Ulaya
-VATIntraManualCheck=Unaweza pia kuangalia mwenyewe kwenye tovuti ya Tume ya Ulaya <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> 
+VATIntraManualCheck=Unaweza pia kuangalia mwenyewe kwenye tovuti ya Tume ya Ulaya <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Angalia haiwezekani. Huduma ya hundi haitolewi na nchi mwanachama (%s)
 NorProspectNorCustomer=Si matarajio, wala mteja
 JuridicalStatus=Aina ya chombo cha biashara
@@ -475,7 +493,7 @@ CurrentOutstandingBill=Mswada wa sasa ambao haujalipwa
 OutstandingBill=Max. kwa bili ambayo haijalipwa
 OutstandingBillReached=Max. kwa muswada ambao haujafikiwa
 OrderMinAmount=Kiasi cha chini cha agizo
-MonkeyNumRefModelDesc=Rejesha nambari katika umbizo %syymm-nnnn kwa msimbo wa mteja na %syymm-nnnn kwa msimbo wa muuzaji ambapo yy ni mwaka, mm ni mwezi na nnnn ni nambari ya kuongeza kiotomatiki kwa mpangilio bila mapumziko na hakuna kurudi kwa 0.
+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 sequential auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=Kanuni ni bure. Msimbo huu unaweza kurekebishwa wakati wowote.
 ManagingDirectors=Jina la meneja (Mkurugenzi Mtendaji, mkurugenzi, rais...)
 MergeOriginThirdparty=Rudufu mtu wa tatu (mtu wa tatu unayetaka kufuta)
@@ -500,7 +518,7 @@ InEEC=Ulaya (EEC)
 RestOfEurope=Sehemu Zingine za Ulaya (EEC)
 OutOfEurope=Nje ya Ulaya (EEC)
 CurrentOutstandingBillLate=Bili ya sasa ambayo haijalipwa imechelewa
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Kuwa mwangalifu, kulingana na mipangilio ya bei ya bidhaa yako, unapaswa kubadilisha wahusika wengine kabla ya kuongeza bidhaa kwenye POS.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be careful, depending on your product price settings, you should change the third party before adding product to POS.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=barua pepe tayari ipo tafadhali andika upya jina la kampuni yako
 TwoRecordsOfCompanyName=zaidi ya rekodi moja ipo kwa kampuni hii, tafadhali wasiliana nasi ili kukamilisha ombi lako la ushirikiano
 CompanySection=Sehemu ya kampuni
@@ -508,3 +526,5 @@ ShowSocialNetworks=Onyesha mitandao ya kijamii
 HideSocialNetworks=Ficha mitandao ya kijamii
 ExternalSystemID=Kitambulisho cha mfumo wa nje
 IDOfPaymentInAnExternalSystem=Kitambulisho cha hali ya malipo katika mfumo wa nje (kama Stripe, Paypal, ...)
+AADEWebserviceCredentials=AADE Webservice Credentials
+ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index bd7b0bc7228..91d80a52c95 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -162,14 +162,15 @@ CalcModeVATDebt=Hali <b> %sVAT kwenye uhasibu wa ahadi%s </b> .
 CalcModeVATEngagement=Hali <b> %sVAT kwa gharama za mapato%s </b> .
 CalcModeDebt=Uchambuzi wa hati zinazojulikana zilizorekodiwa
 CalcModeEngagement=Uchambuzi wa malipo yaliyorekodiwa yanayojulikana
+CalcModePayment=Analysis of known recorded payments
 CalcModeBookkeeping=Uchambuzi wa data iliyoandikwa katika jedwali la Leja ya Utunzaji.
 CalcModeNoBookKeeping=Hata kama bado hawajahesabiwa kwenye Leja
-CalcModeLT1= Hali <b> %sRE kwenye ankara za wateja - ankara za wasambazaji%s </b> 
-CalcModeLT1Debt=Hali <b> %sRE kwenye ankara za mteja%s </b> 
-CalcModeLT1Rec= Hali <b> %sRE kuhusu ankara za wasambazaji%s </b> 
-CalcModeLT2= Hali <b> %sIRPF kwenye ankara za wateja - ankara za wasambazaji%s </b> 
-CalcModeLT2Debt=Hali <b> %sIRPF kwenye ankara za mteja%s </b> 
-CalcModeLT2Rec= Hali <b> %sIRPF kwenye ankara za wasambazaji%s </b> 
+CalcModeLT1= Hali <b> %sRE kwenye ankara za wateja - ankara za wasambazaji%s </b>
+CalcModeLT1Debt=Hali <b> %sRE kwenye ankara za mteja%s </b>
+CalcModeLT1Rec= Hali <b> %sRE kuhusu ankara za wasambazaji%s </b>
+CalcModeLT2= Hali <b> %sIRPF kwenye ankara za wateja - ankara za wasambazaji%s </b>
+CalcModeLT2Debt=Hali <b> %sIRPF kwenye ankara za mteja%s </b>
+CalcModeLT2Rec= Hali <b> %sIRPF kwenye ankara za wasambazaji%s </b>
 AnnualSummaryDueDebtMode=Usawa wa mapato na gharama, muhtasari wa kila mwaka
 AnnualSummaryInputOutputMode=Usawa wa mapato na matumizi, muhtasari wa kila mwaka
 AnnualByCompanies=Salio la mapato na matumizi, na vikundi vilivyoainishwa vya akaunti
@@ -177,18 +178,18 @@ AnnualByCompaniesDueDebtMode=Salio la mapato na matumizi, maelezo kulingana na v
 AnnualByCompaniesInputOutputMode=Salio la mapato na matumizi, maelezo kulingana na vikundi vilivyobainishwa awali, hali ya <b> %sMapato-Gharama%s </b>  alisema <b> uhasibu wa fedha </b> .
 SeeReportInInputOutputMode=Angalia <b> %suchambuzi wa malipo%s </b>  kwa hesabu kulingana na <b> malipo yaliyorekodiwa </b>  imetengenezwa hata kama bado haijahesabiwa kwenye Leja
 SeeReportInDueDebtMode=Angalia <b> %suchambuzi wa hati zilizorekodiwa%s </b>  kwa hesabu kulingana na <b> inayojulikana hati zilizorekodiwa </b>  hata kama bado hawajahesabiwa katika Leja
-SeeReportInBookkeepingMode=Angalia <b> %suchambuzi wa jedwali la leja ya uwekaji vitabu%s </b>  kwa ripoti kulingana na <b> Jedwali la Leja ya Uwekaji hesabu </b> 
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Kiasi kilichoonyeshwa kinajumuisha ushuru wote
 RulesAmountWithTaxExcluded=- Kiasi cha ankara kilichoonyeshwa hakijumuishwi kodi zote
 RulesResultDue=- Inajumuisha ankara zote, gharama, VAT, michango, mishahara, iwe inalipwa au la. <br> - Inategemea tarehe ya bili ya ankara na tarehe ya kukamilisha ya gharama au malipo ya kodi. Kwa mishahara, tarehe ya mwisho wa kipindi hutumiwa.
 RulesResultInOut=- Inajumuisha malipo halisi yaliyotolewa kwenye ankara, gharama, VAT na mishahara. <br> - Inategemea tarehe za malipo ya ankara, gharama, VAT, michango na mishahara.
-RulesCADue=- Inajumuisha ankara za mteja kama wanalipwa au la. <br> - Inategemea tarehe ya bili ya ankara hizi. <br> 
-RulesCAIn=- Inajumuisha malipo yote ya ufanisi ya ankara zilizopokelewa kutoka kwa wateja. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br> 
+RulesCADue=- Inajumuisha ankara za mteja kama wanalipwa au la. <br> - Inategemea tarehe ya bili ya ankara hizi. <br>
+RulesCAIn=- Inajumuisha malipo yote ya ufanisi ya ankara zilizopokelewa kutoka kwa wateja. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br>
 RulesCATotalSaleJournal=Inajumuisha njia zote za mkopo kutoka kwa jarida la Uuzaji.
 RulesSalesTurnoverOfIncomeAccounts=Inajumuisha (mkopo - debit) ya laini za akaunti za bidhaa katika MAPATO ya kikundi
 RulesAmountOnInOutBookkeepingRecord=Inajumuisha rekodi katika Leja yako na akaunti za uhasibu ambazo zina kikundi "GHARAMA" au "KIPATO"
 RulesResultBookkeepingPredefined=Inajumuisha rekodi katika Leja yako na akaunti za uhasibu ambazo zina kikundi "GHARAMA" au "KIPATO"
-RulesResultBookkeepingPersonalized=Inaonyesha rekodi kwenye Leja yako na akaunti za uhasibu <b> imepangwa kulingana na vikundi vilivyobinafsishwa </b> 
+RulesResultBookkeepingPersonalized=Inaonyesha rekodi kwenye Leja yako na akaunti za uhasibu <b> imepangwa kulingana na vikundi vilivyobinafsishwa </b>
 SeePageForSetup=Angalia menyu <a href="%s"> %s </a>  kwa kuanzisha
 DepositsAreNotIncluded=- Ankara za malipo ya chini hazijajumuishwa
 DepositsAreIncluded=- Ankara za malipo ya chini zimejumuishwa
@@ -253,6 +254,8 @@ CalculationMode=Hali ya kuhesabu
 AccountancyJournal=Jarida la kanuni za hesabu
 ACCOUNTING_VAT_SOLD_ACCOUNT=Akaunti (kutoka Chati ya Akaunti) itatumika kama akaunti chaguo-msingi ya VAT kwenye mauzo (inatumika ikiwa haijafafanuliwa kwenye usanidi wa kamusi ya VAT)
 ACCOUNTING_VAT_BUY_ACCOUNT=Akaunti (kutoka Chati ya Akaunti) itakayotumika kama akaunti chaguo-msingi ya VAT kwenye ununuzi (inatumika ikiwa haijafafanuliwa kwenye usanidi wa kamusi ya VAT)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on purchases
 ACCOUNTING_VAT_PAY_ACCOUNT=Akaunti (kutoka Chati ya Akaunti) itatumika kama akaunti chaguo-msingi ya kulipa VAT
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Akaunti (kutoka Chati ya Akaunti) itakayotumika kama akaunti chaguo-msingi ya VAT kwa ununuzi unaotozwa kinyume (Mikopo)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Akaunti (kutoka Chati ya Akaunti) itatumika kama akaunti chaguo-msingi ya VAT kwa ununuzi wa malipo ya nyuma (Debit)
@@ -290,8 +293,8 @@ PurchasebyVatrate=Ununuzi kwa kiwango cha kodi ya mauzo
 LabelToShow=Lebo fupi
 PurchaseTurnover=Kununua mauzo
 PurchaseTurnoverCollected=Mauzo ya ununuzi yamekusanywa
-RulesPurchaseTurnoverDue=- Inajumuisha ankara za mtoa huduma kama zimelipwa au la. <br> - Inatokana na tarehe ya ankara ya ankara hizi. <br> 
-RulesPurchaseTurnoverIn=- Inajumuisha malipo yote yenye ufanisi ya ankara zinazofanywa kwa wauzaji. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br> 
+RulesPurchaseTurnoverDue=- Inajumuisha ankara za mtoa huduma kama zimelipwa au la. <br> - Inatokana na tarehe ya ankara ya ankara hizi. <br>
+RulesPurchaseTurnoverIn=- Inajumuisha malipo yote yenye ufanisi ya ankara zinazofanywa kwa wauzaji. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inajumuisha njia zote za malipo kutoka kwa jarida la ununuzi.
 RulesPurchaseTurnoverOfExpenseAccounts=Inajumuisha (debit - credit) ya laini za akaunti za bidhaa katika kikundi GHARAMA
 ReportPurchaseTurnover=Ankara ya mauzo ya ununuzi
diff --git a/htdocs/langs/sw_SW/contracts.lang b/htdocs/langs/sw_SW/contracts.lang
index 0f3f79c3877..9f50bc1642d 100644
--- a/htdocs/langs/sw_SW/contracts.lang
+++ b/htdocs/langs/sw_SW/contracts.lang
@@ -78,7 +78,7 @@ CloseAllContracts=Funga njia zote za mkataba
 DeleteContractLine=Futa mstari wa mkataba
 ConfirmDeleteContractLine=Je, una uhakika unataka kufuta mstari huu wa mkataba?
 MoveToAnotherContract=Hamisha huduma kwenye mkataba mwingine.
-ConfirmMoveToAnotherContract=Nilichagua mkataba mpya lengwa na kuthibitisha kuwa ninataka kuhamisha huduma hii kwenye mkataba huu.
+ConfirmMoveToAnotherContract=I chose a new target contract and confirm I want to move this service into this contract.
 ConfirmMoveToAnotherContractQuestion=Chagua katika mkataba upi uliopo (wa wahusika wengine sawa), ungependa kuhamishia huduma hii?
 PaymentRenewContractId=Sasisha mkataba %s (huduma %s)
 ExpiredSince=Tarehe ya kumalizika muda wake
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index a95d44a92bd..c67610a5144 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Soma kazi iliyopangwa
 Permission23102 = Unda/sasisha Kazi iliyoratibiwa
 Permission23103 = Futa Kazi Iliyoratibiwa
@@ -14,7 +13,7 @@ FileToLaunchCronJobs=Mstari wa amri ili kuangalia na kuzindua kazi zilizohitimu
 CronExplainHowToRunUnix=Kwenye mazingira ya Unix unapaswa kutumia kiingilio kifuatacho cha crontab kuendesha safu ya amri kila dakika 5
 CronExplainHowToRunWin=Kwenye Microsoft(tm) mazingira ya Windows unaweza kutumia zana za Task Iliyoratibiwa kuendesha safu ya amri kila baada ya dakika 5
 CronMethodDoesNotExists=Darasa %s haina mbinu yoyote %s
-CronMethodNotAllowed=Mbinu %s ya darasa %s iko katika orodha nyeusi ya njia zilizokatazwa
+CronMethodNotAllowed=Method %s of class %s is in blocklist of forbidden methods
 CronJobDefDesc=Profaili za kazi za Cron zimefafanuliwa kwenye faili ya maelezo ya moduli. Sehemu inapowashwa, hupakiwa na inapatikana ili uweze kusimamia kazi kutoka kwenye menyu ya zana za msimamizi %s.
 CronJobProfiles=Orodha ya profaili za kazi za cron zilizoainishwa awali
 # Menu
@@ -63,11 +62,11 @@ CronStatusInactiveBtn=Zima
 CronTaskInactive=Kazi hii imezimwa (haijaratibiwa)
 CronId=Kitambulisho
 CronClassFile=Jina la faili na darasa
-CronModuleHelp=Jina la saraka ya moduli ya Dolibarr (pia fanya kazi na moduli ya nje ya Dolibarr). <BR>  Kwa mfano kupiga simu njia ya kuleta ya Dolibarr Product object /htdocs/ <u> product </u> /class/product.class.php, thamani ya sehemu ni <br>  <i> product </i> 
-CronClassFileHelp=Njia ya jamaa na jina la faili kupakia (njia inahusiana na saraka ya mizizi ya seva ya wavuti). <BR>  Kwa mfano kuita mbinu ya kuleta bidhaa ya Dolibarr htdocs/product/class/ <u> product.class.php </u> , thamani ya jina la faili la darasa ni <br>  <i> product/class/product.class.php </i> 
-CronObjectHelp=Jina la kitu cha kupakia. <BR>  Kwa mfano kupiga simu njia ya kuleta ya bidhaa ya Dolibarr /htdocs/product/class/product.class.php, thamani ya jina la faili la darasa ni <br>  <i> Bidhaa </i> 
-CronMethodHelp=Mbinu ya kipengee cha kuzindua. <BR>  Kwa mfano kupiga simu njia ya kuleta bidhaa ya Dolibarr Product /htdocs/product/class/product.class.php, thamani ya mbinu ni <br>  <i> leta </i> 
-CronArgsHelp=Hoja za mbinu. <BR>  Kwa mfano kupiga simu njia ya kuleta bidhaa ya Dolibarr Product /htdocs/product/class/product.class.php, thamani ya vigezo inaweza kuwa <br>  <i> 0, Ref ya Bidhaa </i> 
+CronModuleHelp=Jina la saraka ya moduli ya Dolibarr (pia fanya kazi na moduli ya nje ya Dolibarr). <BR>  Kwa mfano kupiga simu njia ya kuleta ya Dolibarr Product object /htdocs/ <u> product </u> /class/product.class.php, thamani ya sehemu ni <br>  <i> product </i>
+CronClassFileHelp=Njia ya jamaa na jina la faili kupakia (njia inahusiana na saraka ya mizizi ya seva ya wavuti). <BR>  Kwa mfano kuita mbinu ya kuleta bidhaa ya Dolibarr htdocs/product/class/ <u> product.class.php </u> , thamani ya jina la faili la darasa ni <br>  <i> product/class/product.class.php </i>
+CronObjectHelp=Jina la kitu cha kupakia. <BR>  Kwa mfano kupiga simu njia ya kuleta ya bidhaa ya Dolibarr /htdocs/product/class/product.class.php, thamani ya jina la faili la darasa ni <br>  <i> Bidhaa </i>
+CronMethodHelp=Mbinu ya kipengee cha kuzindua. <BR>  Kwa mfano kupiga simu njia ya kuleta bidhaa ya Dolibarr Product /htdocs/product/class/product.class.php, thamani ya mbinu ni <br>  <i> leta </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 parameters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Mstari wa amri ya mfumo wa kutekeleza.
 CronCreateJob=Unda Kazi Mpya Iliyoratibiwa
 CronFrom=Kutoka
@@ -91,6 +90,7 @@ WarningCronDelayed=Tahadhari, kwa madhumuni ya utendakazi, tarehe yoyote inayofu
 DATAPOLICYJob=Kisafishaji data na kitambulisho
 JobXMustBeEnabled=Kazi %s lazima kuwezeshwa
 EmailIfError=Barua pepe kwa onyo juu ya hitilafu
+JobNotFound=Job %s not found in list of jobs (try to disable/enabled module)
 ErrorInBatch=Hitilafu wakati wa kutekeleza kazi %s
 
 # Cron Boxes
diff --git a/htdocs/langs/sw_SW/dict.lang b/htdocs/langs/sw_SW/dict.lang
index c0f19d46d2d..f0504354183 100644
--- a/htdocs/langs/sw_SW/dict.lang
+++ b/htdocs/langs/sw_SW/dict.lang
@@ -158,7 +158,7 @@ CountryMX=Mexico
 CountryFM=Mikronesia
 CountryMD=Moldova
 CountryMN=Mongolia
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Msumbiji
 CountryMM=Myanmar (Burma)
 CountryNA=Namibia
@@ -233,7 +233,7 @@ CountryUY=Uruguay
 CountryUZ=Uzbekistan
 CountryVU=Vanuatu
 CountryVE=Venezuela
-CountryVN=Viet Nam
+CountryVN=Vietnam
 CountryVG=Visiwa vya Virgin, Uingereza
 CountryVI=Visiwa vya Virgin, U.S.
 CountryWF=Wallis na Futuna
diff --git a/htdocs/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang
index b1baaba9661..cad8229860b 100644
--- a/htdocs/langs/sw_SW/donations.lang
+++ b/htdocs/langs/sw_SW/donations.lang
@@ -31,5 +31,7 @@ DONATION_ART200=Onyesha kifungu cha 200 kutoka kwa CGI ikiwa una wasiwasi
 DONATION_ART238=Onyesha kifungu cha 238 kutoka kwa CGI ikiwa una wasiwasi
 DONATION_ART978=Onyesha kifungu cha 978 kutoka kwa CGI ikiwa una wasiwasi
 DonationPayment=Malipo ya mchango
+DonationPayments=Donation payments
 DonationValidated=Mchango %s imethibitishwa
-DonationUseThirdparties=Tumia wahusika wengine waliopo kama waratibu wa wafadhili
+DonationUseThirdparties=Use the address of an existing thirdparty as the address of the donor
+DonationsStatistics=Donation's statistics
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index d53331c1fac..a0fe268ae22 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Idadi ya hati katika saraka
 ECMSection=Orodha
 ECMSectionManual=Saraka ya mwongozo
 ECMSectionAuto=Saraka otomatiki
-ECMSectionsManual=Mti wa mwongozo
-ECMSectionsAuto=Mti otomatiki
-ECMSectionsMedias=Mti wa Medias
+ECMSectionsManual=Private manual tree
+ECMSectionsAuto=Private automatic tree
+ECMSectionsMedias=Public tree
 ECMSections=Saraka
 ECMRoot=Mzizi wa ECM
 ECMNewSection=Saraka mpya
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Idadi ya faili katika saraka ndogo
 ECMCreationUser=Muumba
 ECMArea=Eneo la DMS/ECM
 ECMAreaDesc=Eneo la DMS/ECM (Mfumo wa Kudhibiti Hati/Udhibiti wa Maudhui ya Kielektroniki) hukuruhusu kuhifadhi, kushiriki na kutafuta haraka kila aina ya hati katika Dolibarr.
-ECMAreaDesc2a=* Saraka za mwongozo zinaweza kutumika kuhifadhi hati ambazo hazijaunganishwa na kipengele fulani.
+ECMAreaDesc2a=* Manual directories can be used to save documents with a free organization of the tree structure.
 ECMAreaDesc2b=* Saraka otomatiki hujazwa kiotomatiki wakati wa kuongeza hati kutoka kwa ukurasa wa kipengee.
-ECMAreaDesc3=* Saraka za Medias ni faili katika saraka ndogo <b> /medias </b>  ya saraka ya hati, inayoweza kusomeka na kila mtu bila hitaji la kuandikishwa na hakuna haja ya kuwa na faili iliyoshirikiwa waziwazi. Inatumika kuhifadhi faili za picha kwa moduli ya barua pepe au tovuti kwa mfano.
+ECMAreaDesc3=* Public directories are files into the subdirectory <b>/medias</b> of the documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitly. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Saraka <b> %s </b>  imefutwa.
 ECMSectionWasCreated=Saraka <b> %s </b>  imeundwa.
 ECMSearchByKeywords=Tafuta kwa maneno muhimu
@@ -45,7 +45,7 @@ ExtraFieldsEcmFiles=Faili za Extrafields Ecm
 ExtraFieldsEcmDirectories=Saraka za Ecm za Extrafields
 ECMSetup=Mpangilio wa ECM
 GenerateImgWebp=Rudufu picha zote ukitumia toleo lingine lenye umbizo la .webp
-ConfirmGenerateImgWebp=Ukithibitisha, utatengeneza picha katika umbizo la .webp kwa picha zote kwa sasa kwenye folda hii (folda ndogo hazijajumuishwa)...
+ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included, webp images will not be generated if size is greater than original)...
 ConfirmImgWebpCreation=Thibitisha marudio ya picha zote
 GenerateChosenImgWebp=Rudufu picha iliyochaguliwa na toleo lingine lenye umbizo la .webp
 ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 3e9b09cb111..1b807fc9ead 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -94,9 +94,9 @@ ErrorRecordIsUsedCantDelete=Haiwezi kufuta rekodi. Tayari imetumika au imejumuis
 ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Nenosiri zote mbili zilizochapwa lazima zilingane
 ErrorContactEMail=A technical error occurred. 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=Sehemu <b> %s </b> : ' <b> %s </b> ' hailingani na sheria ya regex <b> %s </b> 
+ErrorWrongValueForField=Sehemu <b> %s </b> : ' <b> %s </b> ' hailingani na sheria ya regex <b> %s </b>
 ErrorHtmlInjectionForField=Sehemu <b> %s </b> : Thamani ' <b> %s </b> ' ina data hasidi hairuhusiwi
-ErrorFieldValueNotIn=Sehemu <b> %s </b> : ' <b> %s </b> ' sio thamani inayopatikana katika sehemu <b> %s </b>  ya <b> %s </b> 
+ErrorFieldValueNotIn=Sehemu <b> %s </b> : ' <b> %s </b> ' sio thamani inayopatikana katika sehemu <b> %s </b>  ya <b> %s </b>
 ErrorFieldRefNotIn=Sehemu <b> %s </b> : ' <b> %s </b> ' sio <b> %s </b>  ref iliyopo
 ErrorMultipleRecordFoundFromRef=Rekodi kadhaa zilipatikana wakati wa kutafuta kutoka kwa ref <b> %s </b> . Hakuna njia ya kujua ni kitambulisho gani cha kutumia.
 ErrorsOnXLines=%s makosa kupatikana
@@ -167,7 +167,7 @@ ErrorPriceExpression1=Haiwezi kukabidhi '%s mara kwa mara'
 ErrorPriceExpression2=Haiwezi kufafanua upya chaguo za kukokotoa zilizojumuishwa '%s'
 ErrorPriceExpression3=Tofauti isiyobainishwa '%s' katika ufafanuzi wa kazi
 ErrorPriceExpression4=Herufi haramu '%s'
-ErrorPriceExpression5='<span class='notranslate'>%s</span> isiyotarajiwa\n'
+ErrorPriceExpression5=Unexpected '%s'
 ErrorPriceExpression6=Idadi isiyo sahihi ya hoja (%s ikitolewa, %s inatarajiwa)
 ErrorPriceExpression8=Opereta asiyetarajiwa '%s'
 ErrorPriceExpression9=An unexpected error occurred
@@ -219,8 +219,8 @@ ErrorPhpMailDelivery=Hakikisha kuwa hutumii idadi kubwa ya wapokeaji na kwamba m
 ErrorUserNotAssignedToTask=Mtumiaji lazima apewe jukumu ili aweze kuingiza muda uliotumiwa.
 ErrorTaskAlreadyAssigned=Jukumu ambalo tayari limekabidhiwa kwa mtumiaji
 ErrorModuleFileSeemsToHaveAWrongFormat=Kifurushi cha moduli kinaonekana kuwa na umbizo lisilo sahihi.
-ErrorModuleFileSeemsToHaveAWrongFormat2=Angalau saraka moja ya lazima lazima iwepo katika zip ya moduli: <strong> %s </strong>  au <strong> %s </strong> 
-ErrorFilenameDosNotMatchDolibarrPackageRules=Jina la kifurushi cha sehemu ( <strong> %s </strong> ) hailingani na sintaksia ya jina inayotarajiwa: <strong> %s </strong> 
+ErrorModuleFileSeemsToHaveAWrongFormat2=Angalau saraka moja ya lazima lazima iwepo katika zip ya moduli: <strong> %s </strong>  au <strong> %s </strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Jina la kifurushi cha sehemu ( <strong> %s </strong> ) hailingani na sintaksia ya jina inayotarajiwa: <strong> %s </strong>
 ErrorDuplicateTrigger=Hitilafu, nakala ya jina la kianzisha %s. Tayari imepakiwa kutoka %s.
 ErrorNoWarehouseDefined=Hitilafu, hakuna ghala zilizofafanuliwa.
 ErrorBadLinkSourceSetButBadValueForRef=Kiungo unachotumia si sahihi. 'Chanzo' cha malipo kimefafanuliwa, lakini thamani ya 'rejelea' si halali.
@@ -262,7 +262,7 @@ ErrorTooManyDifferentValueForSelectedGroupBy=Imepata thamani nyingi tofauti (zai
 ErrorReplaceStringEmpty=Hitilafu, mfuatano wa kuchukua nafasi ni tupu
 ErrorProductNeedBatchNumber=Hitilafu, bidhaa ' <b> %s </b> ' unahitaji nambari nyingi / serial
 ErrorProductDoesNotNeedBatchNumber=Hitilafu, bidhaa ' <b> %s </b> ' haikubali nambari nyingi / serial
-ErrorFailedToReadObject=Hitilafu, imeshindwa kusoma kitu cha aina <b> %s </b> 
+ErrorFailedToReadObject=Hitilafu, imeshindwa kusoma kitu cha aina <b> %s </b>
 ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Hitilafu, kuingia huku kuko nje ya kipindi cha tarehe ya uhalali
 ErrorValueLength=Urefu wa sehemu ' <b> %s </b> ' lazima iwe juu zaidi ya ' <b> %s </b> '
@@ -313,12 +313,12 @@ ErrorTooMuchFileInForm=Faili zikiwa nyingi mno, idadi ya juu zaidi ni %s mafaili
 ErrorSessionInvalidatedAfterPasswordChange=Kipindi kilibatilishwa kufuatia mabadiliko ya nenosiri, barua pepe, hali au tarehe za uhalali. Tafadhali ingia upya.
 ErrorExistingPermission = Ruhusa <b> %s </b>  kwa kitu <b> %s </b>  tayari ipo
 ErrorFieldExist=Thamani ya <b> %s </b>  tayari zipo
-ErrorEqualModule=Moduli ni batili katika <b> %s </b> 
+ErrorEqualModule=Moduli ni batili katika <b> %s </b>
 ErrorFieldValue=Thamani ya <b> %s </b>  si sahihi
 ErrorCoherenceMenu= <b> %s </b>  inahitajika wakati <b> %s </b>  ni 'kushoto'
 ErrorUploadFileDragDrop=Kulikuwa na hitilafu wakati faili inapakia
 ErrorUploadFileDragDropPermissionDenied=Kulikuwa na hitilafu wakati wa kupakia faili : Ruhusa imekataliwa
-ErrorFixThisHere= <a href="%s"> Rekebisha hii hapa </a> 
+ErrorFixThisHere= <a href="%s"> Rekebisha hii hapa </a>
 ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Hitilafu: URL ya mfano wako wa sasa (%s) hailingani na URL iliyofafanuliwa kwenye usanidi wako wa kuingia wa OAuth2 (%s) Kuingia kwa OAuth2 katika usanidi huo hairuhusiwi.
 ErrorMenuExistValue=Tayari kuna Menyu iliyo na Kichwa hiki au URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Faili za SVG haziruhusiwi kama viungo vya nje bila chaguo %s
diff --git a/htdocs/langs/sw_SW/eventorganization.lang b/htdocs/langs/sw_SW/eventorganization.lang
index 19616c56700..70dedff6757 100644
--- a/htdocs/langs/sw_SW/eventorganization.lang
+++ b/htdocs/langs/sw_SW/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Bei ya usajili
 PriceOfRegistrationHelp=Bei ya kulipa ili kujiandikisha au kushiriki katika tukio
 PriceOfBooth=Bei ya usajili ili kusimama kibanda
 PriceOfBoothHelp=Bei ya usajili ili kusimama kibanda
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Unganisha ICS kwa mikutano
 ConferenceOrBoothInformation=Conference Or Booth information
 Attendees=Waliohudhuria
@@ -161,7 +162,7 @@ Attendee = Mhudhuriaji
 PaymentConferenceAttendee = Malipo ya waliohudhuria mkutano
 PaymentBoothLocation = Malipo ya eneo la kibanda
 DeleteConferenceOrBoothAttendee=Ondoa mshiriki
-RegistrationAndPaymentWereAlreadyRecorder=Usajili na malipo tayari yamerekodiwa kwa barua pepe <b> %s </b> 
+RegistrationAndPaymentWereAlreadyRecorder=Usajili na malipo tayari yamerekodiwa kwa barua pepe <b> %s </b>
 EmailAttendee=Barua pepe ya mshiriki
 EmailCompany=Barua pepe ya kampuni
 EmailCompanyForInvoice=Barua pepe ya kampuni (kwa ankara, ikiwa tofauti na barua pepe ya mhudhuriaji)
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index 1b74aad3afb..5383b036f7d 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -29,7 +29,7 @@ DescCP=Maelezo
 SendRequestCP=Unda ombi la kuondoka
 DelayToRequestCP=Maombi ya kuondoka lazima yafanywe angalau <b> %s siku </b>  mbele yao.
 MenuConfCP=Mizani ya likizo
-SoldeCPUser=Acha salio (kwa siku) : <b> %s </b> 
+SoldeCPUser=Acha salio (kwa siku) : <b> %s </b>
 ErrorEndDateCP=Lazima uchague tarehe ya mwisho ambayo ni kubwa kuliko tarehe ya kuanza.
 ErrorSQLCreateCP=Hitilafu ya SQL ilitokea wakati wa uundaji:
 ErrorIDFicheCP=Hitilafu imetokea, ombi la kuondoka halipo.
@@ -109,7 +109,6 @@ TypeWasDisabledOrRemoved=Ondoka aina (id %s) ilizimwa au kuondolewa
 LastHolidays=Hivi karibuni %s kuacha maombi
 AllHolidays=Maombi yote ya likizo
 HalfDay=Nusu siku
-NotTheAssignedApprover=Wewe si midhinishaji aliyekabidhiwa
 LEAVE_PAID=Likizo ya kulipwa
 LEAVE_SICK=Likizo ya ugonjwa
 LEAVE_OTHER=Nyingine kuondoka
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index da48d3439be..749390a5729 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -14,7 +14,7 @@ PHPSupportPOSTGETKo=Inawezekana usanidi wako wa PHP hauauni vigeu vya POST na/au
 PHPSupportSessions=PHP hii inasaidia vipindi.
 PHPSupport=PHP hii inaweza kutumia %s kazi.
 PHPMemoryOK=Kumbukumbu yako ya kipindi cha juu zaidi cha PHP imewekwa kuwa <b> %s </b> . Hii inapaswa kutosha.
-PHPMemoryTooLow=Kumbukumbu yako ya kipindi cha juu zaidi cha PHP imewekwa kuwa <b> %s </b>  baiti. Hii ni ya chini sana. Badilisha <span class='notranslate'><b></span> yako\n php.ini </b>  kuweka <b> memory_limit </b>  kigezo cha angalau <b> %s </b>  baiti.
+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=Bofya hapa kwa mtihani wa kina zaidi
 ErrorPHPDoesNotSupportSessions=Usakinishaji wako wa PHP hauauni vipindi. Kipengele hiki kinahitajika ili kuruhusu Dolibarr kufanya kazi. Angalia usanidi wako wa PHP na ruhusa za saraka ya vikao.
 ErrorPHPDoesNotSupport=Usakinishaji wako wa PHP hautumii %s kazi.
@@ -116,7 +116,7 @@ RemoveItManuallyAndPressF5ToContinue=Iondoe wewe mwenyewe na ubonyeze F5 ili kue
 FieldRenamed=Sehemu imebadilishwa jina
 IfLoginDoesNotExistsCheckCreateUser=Ikiwa mtumiaji bado hayupo, lazima uangalie chaguo "Unda mtumiaji"
 ErrorConnection=Seva " <b> %s </b> ", jina la hifadhidata " <b> %s </b> ", ingia " <b> %s </b> ", au nenosiri la hifadhidata linaweza kuwa si sahihi au toleo la mteja wa PHP linaweza kuwa la zamani sana ikilinganishwa na toleo la hifadhidata.
-InstallChoiceRecommanded=Chaguo linalopendekezwa la kusakinisha toleo <b> %s </b>  kutoka kwa toleo lako la sasa <b> %s </b> 
+InstallChoiceRecommanded=Chaguo linalopendekezwa la kusakinisha toleo <b> %s </b>  kutoka kwa toleo lako la sasa <b> %s </b>
 InstallChoiceSuggested= <b> Chaguo la kusakinisha lililopendekezwa na kisakinishi </b> .
 MigrateIsDoneStepByStep=Toleo linalolengwa (%s) ina pengo la matoleo kadhaa. Kichawi cha kusakinisha kitarudi ili kupendekeza uhamishaji zaidi pindi hii itakapokamilika.
 CheckThatDatabasenameIsCorrect=Hakikisha kuwa jina la hifadhidata " <b> %s </b> " ni sahihi.
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Hamisha usafirishaji kwa uhifadhi wa maagizo ya m
 MigrationShippingDelivery=Boresha uhifadhi wa usafirishaji
 MigrationShippingDelivery2=Kuboresha hifadhi ya usafirishaji 2
 MigrationFinished=Uhamiaji umekamilika
-LastStepDesc= <strong> Hatua ya mwisho </strong> : Bainisha hapa jina la kuingia na nenosiri unalotaka kutumia kuunganisha kwa Dolibarr. <b> Usipoteze hii kwani ni akaunti kuu ya kusimamia akaunti zingine zote za watumiaji/ziada. </b> 
+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 main account to administer all other/additional user accounts.</b>
 ActivateModule=Washa sehemu %s
 ShowEditTechnicalParameters=Bofya hapa ili kuonyesha/kuhariri vigezo vya hali ya juu (hali ya kitaalam)
 WarningUpgrade=Onyo:\nJe, uliendesha hifadhi ya hifadhidata kwanza?\nHii inapendekezwa sana. Kupoteza data (kutokana na kwa mfano hitilafu katika toleo la mysql 5.5.40/41/42/43) kunaweza kutokea wakati wa mchakato huu, kwa hivyo ni muhimu kuchukua utupaji kamili wa hifadhidata yako kabla ya kuanza uhamishaji wowote.\n\nBofya Sawa ili kuanza mchakato wa uhamiaji...
@@ -206,12 +206,12 @@ MigrationImportOrExportProfiles=Uhamishaji wa wasifu wa uingizaji au usafirishaj
 ShowNotAvailableOptions=Onyesha chaguo ambazo hazipatikani
 HideNotAvailableOptions=Ficha chaguo ambazo hazipatikani
 ErrorFoundDuringMigration=Hitilafu ziliripotiwa wakati wa mchakato wa uhamiaji kwa hivyo hatua inayofuata haipatikani. Ili kupuuza makosa, unaweza <a href="%s"> bofya hapa </a> , lakini programu au vipengele vingine huenda visifanye kazi ipasavyo hadi makosa yatatuliwe.
-YouTryInstallDisabledByDirLock=Programu ilijaribu kujiboresha, lakini kurasa za kusakinisha/kuboresha zimezimwa kwa usalama (saraka imepewa jina la .lock suffix). <br> 
-YouTryInstallDisabledByFileLock=Programu ilijaribu kujiboresha, lakini kurasa za kusakinisha/kuboresha zimezimwa kwa usalama (kwa kuwepo kwa faili ya kufuli <strong> install.lock </strong>  kwenye saraka ya hati za dolibarr). <br> 
-YouTryUpgradeDisabledByMissingFileUnLock=Programu ilijaribu kujiboresha, lakini mchakato wa kuboresha hauruhusiwi kwa sasa. <br> 
+YouTryInstallDisabledByDirLock=Programu ilijaribu kujiboresha, lakini kurasa za kusakinisha/kuboresha zimezimwa kwa usalama (saraka imepewa jina la .lock suffix). <br>
+YouTryInstallDisabledByFileLock=Programu ilijaribu kujiboresha, lakini kurasa za kusakinisha/kuboresha zimezimwa kwa usalama (kwa kuwepo kwa faili ya kufuli <strong> install.lock </strong>  kwenye saraka ya hati za dolibarr). <br>
+YouTryUpgradeDisabledByMissingFileUnLock=Programu ilijaribu kujiboresha, lakini mchakato wa kuboresha hauruhusiwi kwa sasa. <br>
 ClickHereToGoToApp=Bofya hapa ili kwenda kwa maombi yako
 ClickOnLinkOrRemoveManualy=Ikiwa uboreshaji unaendelea, tafadhali subiri. Ikiwa sivyo, bofya kiungo kifuatacho. Ikiwa unaona ukurasa huu kila wakati, lazima uondoe/ubadilishe jina la faili install.lock katika saraka ya hati.
-ClickOnLinkOrCreateUnlockFileManualy=Ikiwa uboreshaji unaendelea, tafadhali subiri... Ikiwa sivyo, lazima uunde faili ya upgrade.unlock kwenye saraka ya hati za Dolibarr.
+ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must remove the file install.lock or create a file upgrade.unlock into the Dolibarr documents directory.
 Loaded=Imepakiwa
 FunctionTest=Mtihani wa kazi
 NodoUpgradeAfterDB=Hakuna hatua iliyoombwa na moduli za nje baada ya uboreshaji wa hifadhidata
diff --git a/htdocs/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang
index 8b35762b823..966d95e3014 100644
--- a/htdocs/langs/sw_SW/interventions.lang
+++ b/htdocs/langs/sw_SW/interventions.lang
@@ -14,10 +14,12 @@ InterventionContact=Mawasiliano ya kuingilia kati
 DeleteIntervention=Futa uingiliaji kati
 ValidateIntervention=Thibitisha uingiliaji kati
 ModifyIntervention=Rekebisha uingiliaji kati
+CloseIntervention=Close intervention
 DeleteInterventionLine=Futa mstari wa kuingilia kati
 ConfirmDeleteIntervention=Je, una uhakika unataka kufuta uingiliaji kati huu?
 ConfirmValidateIntervention=Je, una uhakika unataka kuhalalisha uingiliaji kati huu chini ya jina <b> %s </b> ?
 ConfirmModifyIntervention=Je, una uhakika unataka kurekebisha uingiliaji kati huu?
+ConfirmCloseIntervention=Are you sure you want to close this intervention?
 ConfirmDeleteInterventionLine=Je, una uhakika unataka kufuta njia hii ya kuingilia kati?
 ConfirmCloneIntervention=Je, una uhakika unataka kuiga uingiliaji kati huu?
 NameAndSignatureOfInternalContact=Jina na saini ya kuingilia kati:
@@ -36,6 +38,7 @@ InterventionModifiedInDolibarr=Kuingilia kati %s imebadilishwa
 InterventionClassifiedBilledInDolibarr=Kuingilia kati %s weka kama inavyotozwa
 InterventionClassifiedUnbilledInDolibarr=Kuingilia kati %s weka kama isiyolipishwa
 InterventionSentByEMail=Kuingilia kati %s kutumwa kwa barua pepe
+InterventionClosedInDolibarr= Intervention %s closed
 InterventionDeletedInDolibarr=Kuingilia kati %s imefutwa
 InterventionsArea=Eneo la kuingilia kati
 DraftFichinter=Rasimu ya kuingilia kati
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index 2ae20286308..67c4ec0e3b6 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -6,7 +6,7 @@ Language_ar_DZ=Kiarabu (Algeria)
 Language_ar_EG=Kiarabu (Misri)
 Language_ar_JO=Kiarabu (Jordania)
 Language_ar_MA=Kiarabu (Moroko)
-Language_ar_SA=Kiarabu
+Language_ar_SA=Arabic (Saudi Arabia)
 Language_ar_TN=Kiarabu (Tunisia)
 Language_ar_IQ=Kiarabu (Iraq)
 Language_as_IN=Kiassamese
@@ -27,7 +27,7 @@ Language_de_CH=Kijerumani (Uswizi)
 Language_de_LU=Kijerumani (Luxembourg)
 Language_el_GR=Kigiriki
 Language_el_CY=Kigiriki (Kupro)
-Language_en_AE=Kiingereza (Falme za Kiarabu)
+Language_en_AE=English (United Arab Emirates)
 Language_en_AU=Kiingereza (Australia)
 Language_en_CA=Kiingereza (Kanada)
 Language_en_GB=English (United Kingdom)
@@ -56,7 +56,6 @@ Language_es_PE=Spanish (Peru)
 Language_es_PR=Kihispania (Puerto Rico)
 Language_es_US=Kihispania (Marekani)
 Language_es_UY=Kihispania (Uruguay)
-Language_es_GT=Kihispania (Guatemala)
 Language_es_VE=Kihispania (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
diff --git a/htdocs/langs/sw_SW/loan.lang b/htdocs/langs/sw_SW/loan.lang
index 932cc14648b..443307c0551 100644
--- a/htdocs/langs/sw_SW/loan.lang
+++ b/htdocs/langs/sw_SW/loan.lang
@@ -23,7 +23,7 @@ AddLoan=Tengeneza mkopo
 FinancialCommitment=Ahadi ya kifedha
 InterestAmount=Hamu
 CapitalRemain=Mtaji unabaki
-TermPaidAllreadyPaid = Neno hili tayari limelipwa
+TermPaidAllreadyPaid = This term is already paid
 CantUseScheduleWithLoanStartedToPaid = Haiwezi kutengeneza rekodi ya matukio ya mkopo na malipo yameanza
 CantModifyInterestIfScheduleIsUsed = Huwezi kurekebisha maslahi ikiwa unatumia ratiba
 # Admin
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index ec2380b2d7f..6afb20a253c 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -9,7 +9,7 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -267,7 +267,7 @@ Numero=Nambari
 Limit=Kikomo
 Limits=Mipaka
 Logout=Ondoka
-NoLogoutProcessWithAuthMode=Hakuna kipengele kinachotumika cha kukata muunganisho chenye modi ya uthibitishaji <b> %s </b> 
+NoLogoutProcessWithAuthMode=Hakuna kipengele kinachotumika cha kukata muunganisho chenye modi ya uthibitishaji <b> %s </b>
 Connection=Ingia
 Setup=Sanidi
 Alert=Tahadhari
@@ -420,6 +420,8 @@ TotalTTCShort=Jumla (pamoja na kodi)
 TotalHT=Jumla (isipokuwa kodi)
 TotalHTforthispage=Jumla (isipokuwa kodi) ya ukurasa huu
 Totalforthispage=Jumla ya ukurasa huu
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Jumla (pamoja na kodi)
 TotalTTCToYourCredit=Jumla (pamoja na kodi) kwa mkopo wako
 TotalVAT=Jumla ya kodi
@@ -647,6 +649,7 @@ ReportName=Jina la ripoti
 ReportPeriod=Kipindi cha ripoti
 ReportDescription=Maelezo
 Report=Ripoti
+Reports=Reports
 Keyword=Neno muhimu
 Origin=Asili
 Legend=Hadithi
@@ -963,6 +966,7 @@ AutomaticallyCalculated=Imekokotolewa kiotomatiki
 TitleSetToDraft=Rudi kwenye rasimu
 ConfirmSetToDraft=Je, una uhakika unataka kurudi kwenye hali ya Rasimu?
 ImportId=Kitambulisho cha kuagiza
+Event=Event
 Events=Matukio
 EMailTemplates=Violezo vya barua pepe
 FileNotShared=Faili haijashirikiwa kwa umma wa nje
@@ -1048,7 +1052,7 @@ Select2NotFound=Hakuna matokeo yaliyopatikana
 Select2Enter=Ingiza
 Select2MoreCharacter=au tabia zaidi
 Select2MoreCharacters=au wahusika zaidi
-Select2MoreCharactersMore= <strong> Sintaksia ya utafutaji: </strong>  <br>  <kbd>  <strong>  | </strong>  </kbd>  <kbd>  AU </kbd>  (a|b) <br>  <kbd>  <strong> * </strong>  </kbd>  <kbd>  Herufi yoyote </kbd>  (a*b) <br>  <kbd>  <strong> ^ </strong>  </kbd>  <kbd>  Anza na </kbd>  (^ab) <br>  <kbd>  <strong> $ </strong>  </kbd>  <kbd>  Malizia kwa </kbd>  (ab$) <br> 
+Select2MoreCharactersMore= <strong> Sintaksia ya utafutaji: </strong>  <br>  <kbd>  <strong>  | </strong>  </kbd>  <kbd>  AU </kbd>  (a|b) <br>  <kbd>  <strong> * </strong>  </kbd>  <kbd>  Herufi yoyote </kbd>  (a*b) <br>  <kbd>  <strong> ^ </strong>  </kbd>  <kbd>  Anza na </kbd>  (^ab) <br>  <kbd>  <strong> $ </strong>  </kbd>  <kbd>  Malizia kwa </kbd>  (ab$) <br>
 Select2LoadingMoreResults=Inapakia matokeo zaidi...
 Select2SearchInProgress=Utafutaji unaendelea...
 SearchIntoThirdparties=Vyama vya tatu
@@ -1180,7 +1184,6 @@ ConfirmAffectUserQuestion=Je, una uhakika unataka kuwakabidhi watumiaji %s rekod
 ConfirmSetSupervisorQuestion=Je, una uhakika unataka kuweka msimamizi kwenye %s rekodi zilizochaguliwa?
 ConfirmUpdatePriceQuestion=Je, una uhakika unataka kusasisha bei ya %s rekodi zilizochaguliwa?
 CategTypeNotFound=Hakuna aina ya lebo iliyopatikana kwa aina ya rekodi
-Rate=Kiwango
 SupervisorNotFound=Msimamizi hajapatikana
 CopiedToClipboard=Imenakiliwa kwenye ubao wa kunakili
 InformationOnLinkToContract=Kiasi hiki ni jumla tu ya mistari yote ya mkataba. Hakuna dhana ya wakati inazingatiwa.
@@ -1213,6 +1216,7 @@ CanceledHidden=Imeghairiwa iliyofichwa
 CanceledShown=Imeghairiwa imeonyeshwa
 Terminate=Sitisha
 Terminated=Kuachishwa
+Position=Position
 AddLineOnPosition=Ongeza mstari kwenye nafasi (mwisho ikiwa tupu)
 ConfirmAllocateCommercial=Weka uthibitisho wa mwakilishi wa mauzo
 ConfirmAllocateCommercialQuestion=Je, una uhakika unataka kukabidhi %s rekodi zilizochaguliwa?
@@ -1230,6 +1234,7 @@ ExternalUser=Mtumiaji wa nje
 NoSpecificContactAddress=Hakuna anwani maalum au anwani
 NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the third party is not enough or not accurate.
 HideOnVCard=Ficha %s
+ShowOnVCard=Show %s
 AddToContacts=Ongeza anwani kwa anwani zangu
 LastAccess=Ufikiaji wa mwisho
 UploadAnImageToSeeAPhotoHere=Pakia picha kutoka kwa kichupo %s kuona picha hapa
@@ -1259,4 +1264,7 @@ AmountSalary=Salary amount
 InvoiceSubtype=Invoice subtype
 ConfirmMassReverse=Bulk Reverse confirmation
 ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
-
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
index 6e80f431aaf..768aeca0a5a 100644
--- a/htdocs/langs/sw_SW/margins.lang
+++ b/htdocs/langs/sw_SW/margins.lang
@@ -38,7 +38,7 @@ CostPrice=Bei ya gharama
 UnitCharges=Gharama za kitengo
 Charges=Malipo
 AgentContactType=Aina ya mawasiliano ya wakala wa kibiashara
-AgentContactTypeDetails=Bainisha ni aina gani ya anwani (iliyounganishwa kwenye ankara) itatumika kwa ripoti ya ukingo kwa kila mwasiliani/anwani. Kumbuka kuwa takwimu za kusoma kwenye mwasiliani si za kuaminika kwani katika hali nyingi mwasiliani huenda asifafanuliwe kwa uwazi kwenye ankara.
+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 explicitly on the invoices.
 rateMustBeNumeric=Kiwango lazima kiwe thamani ya nambari
 markRateShouldBeLesserThan100=Kiwango cha alama kinapaswa kuwa chini ya 100
 ShowMarginInfos=Onyesha maelezo ya ukingo
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
index ec2ea2253bd..9cc32254ea4 100644
--- a/htdocs/langs/sw_SW/mrp.lang
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -31,9 +31,14 @@ Consumption=Matumizi
 ValueOfMeansLoss=Thamani ya 0.95 inamaanisha wastani wa 5%% hasara wakati wa utengenezaji au disassembly
 ValueOfMeansLossForProductProduced=Thamani ya 0.95 inamaanisha wastani wa 5%% ya hasara ya bidhaa zinazozalishwa
 DeleteBillOfMaterials=Futa Muswada wa Nyenzo
+CancelMo=Cancel Manufacturing Order
+MoCancelConsumedAndProducedLines=Cancel also all the consumed and produced lines (delete lines and rollback stocks)
+ConfirmCancelMo=Are you sure you want to cancel this Manufacturing Order?
 DeleteMo=Futa Agizo la Utengenezaji
 ConfirmDeleteBillOfMaterials=Je, una uhakika unataka kufuta Muswada huu wa Nyenzo?
 ConfirmDeleteMo=Je, una uhakika unataka kufuta Agizo hili la Utengenezaji?
+DeleteMoChild = Delete the child MOs linked to this MO %s
+MoChildsDeleted = All child MOs have been deleted
 MenuMRP=Maagizo ya Utengenezaji
 NewMO=Agizo Mpya la Utengenezaji
 QtyToProduce=Kiasi cha kuzalisha
@@ -60,6 +65,8 @@ ToProduce=Kuzalisha
 ToObtain=Kupata
 QtyAlreadyConsumed=Kiasi tayari kimetumika
 QtyAlreadyProduced=Qty tayari imetolewa
+QtyAlreadyConsumedShort=Qty consumed
+QtyAlreadyProducedShort=Qty produced
 QtyRequiredIfNoLoss=Kiasi kinahitajika ili kutoa kiasi kilichobainishwa kwenye BOM ikiwa hakuna hasara (ikiwa ufanisi wa utengenezaji ni 100%%)
 ConsumeOrProduce=Tumia au Zalisha
 ConsumeAndProduceAll=Tumia na Utengeneze Vyote
@@ -123,3 +130,9 @@ Manufacturing=Utengenezaji
 Disassemble=Tenganisha
 ProducedBy=Imetolewa na
 QtyTot=Jumla ya Qty
+
+QtyCantBeSplit= Quantity cannot be split
+NoRemainQtyToDispatch=No quantity remaining to divide
+
+THMOperatorEstimatedHelp=Estimated cost of operator per hour. Will be used to estimate cost of a BOM using this workstation.
+THMMachineEstimatedHelp=Estimated cost of machine per hour. Will be used to estimate cost of a BOM using this workstation.
diff --git a/htdocs/langs/sw_SW/opensurvey.lang b/htdocs/langs/sw_SW/opensurvey.lang
index 58f1923ea4a..539d0ae5579 100644
--- a/htdocs/langs/sw_SW/opensurvey.lang
+++ b/htdocs/langs/sw_SW/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Jina la kura
 ToReceiveEMailForEachVote=Pokea barua pepe kwa kila kura
 TypeDate=Tarehe ya aina
 TypeClassic=Aina ya kawaida
-OpenSurveyStep2=Chagua tarehe zako kati ya siku zisizolipishwa (kijivu). Siku zilizochaguliwa ni kijani. Unaweza kuacha kuchagua siku iliyochaguliwa hapo awali kwa kubofya tena
+OpenSurveyStep2=Select your dates among the free days (gray). The selected days are green. You can unselect a day previously selected by clicking again on it
 RemoveAllDays=Ondoa siku zote
 CopyHoursOfFirstDay=Nakili masaa ya siku ya kwanza
 RemoveAllHours=Ondoa masaa yote
@@ -61,3 +61,4 @@ SurveyExpiredInfo=Kura imefungwa au ucheleweshaji wa upigaji kura umekwisha.
 EmailSomeoneVoted=%s imejaza mstari.\nUnaweza kupata kura yako kwenye kiungo:\n%s
 ShowSurvey=Onyesha uchunguzi
 UserMustBeSameThanUserUsedToVote=Lazima uwe umepiga kura na utumie jina la mtumiaji lile lile ambalo yule alitumia kupiga kura, kuchapisha maoni
+ListOfOpenSurveys=List of open surveys
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 0be066a31bc..bcb53e6997c 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Mwaka uliopita wa tarehe ya ankara
 NextYearOfInvoice=Mwaka unaofuata wa tarehe ya ankara
 DateNextInvoiceBeforeGen=Tarehe ya ankara inayofuata (kabla ya uzalishaji)
 DateNextInvoiceAfterGen=Tarehe ya ankara inayofuata (baada ya kizazi)
-GraphInBarsAreLimitedToNMeasures=Michoro ni %s hatua katika hali ya 'Baa'. Njia ya 'Mistari' ilichaguliwa kiotomatiki badala yake.
+GraphInBarsAreLimitedToNMeasures=Graphics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
 OnlyOneFieldForXAxisIsPossible=Sehemu 1 pekee ndiyo inayowezekana kwa sasa kama Mhimili wa X. Sehemu ya kwanza iliyochaguliwa pekee ndiyo imechaguliwa.
 AtLeastOneMeasureIsRequired=Angalau sehemu 1 ya kipimo inahitajika
 AtLeastOneXAxisIsRequired=Angalau sehemu 1 ya X-Axis inahitajika
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Agizo la mauzo limewasilishwa
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Agizo la ununuzi lililotumwa kwa barua pepe
 Notify_ORDER_SUPPLIER_VALIDATE=Agizo la ununuzi limerekodiwa
 Notify_ORDER_SUPPLIER_APPROVE=Agizo la ununuzi limeidhinishwa
+Notify_ORDER_SUPPLIER_SUBMIT=Purchase order submitted
 Notify_ORDER_SUPPLIER_REFUSE=Agizo la ununuzi limekataliwa
 Notify_PROPAL_VALIDATE=Pendekezo la mteja limethibitishwa
 Notify_PROPAL_CLOSE_SIGNED=Pendekezo la mteja limefungwa limetiwa saini
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=Ankara ya mteja iliyotumwa kwa barua
 Notify_BILL_SUPPLIER_VALIDATE=Ankara ya muuzaji imethibitishwa
 Notify_BILL_SUPPLIER_PAYED=Ankara ya muuzaji imelipwa
 Notify_BILL_SUPPLIER_SENTBYMAIL=Ankara ya muuzaji iliyotumwa kwa barua
-Notify_BILL_SUPPLIER_CANCELED=Ankara ya muuzaji imeghairiwa
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice canceled
 Notify_CONTRACT_VALIDATE=Mkataba umeidhinishwa
 Notify_FICHINTER_VALIDATE=Uingiliaji kati umethibitishwa
+Notify_FICHINTER_CLOSE=Intervention closed
 Notify_FICHINTER_ADD_CONTACT=Imeongeza anwani kwenye Afua
 Notify_FICHINTER_SENTBYMAIL=Uingiliaji kati uliotumwa kwa barua
 Notify_SHIPPING_VALIDATE=Usafirishaji umeidhinishwa
@@ -172,7 +174,7 @@ VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=katika³
 VolumeUnitounce=wanzi
-VolumeUnitlitre=lita
+VolumeUnitlitre=liter
 VolumeUnitgallon=galoni
 SizeUnitm=m
 SizeUnitdm=dm
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Sakinisha au wezesha maktaba ya GD kwenye usakinishaji wako
 ProfIdShortDesc= <b> Prof Id %s </b>  ni habari kulingana na nchi ya mtu wa tatu. <br> Kwa mfano, kwa nchi <b> %s </b> , ni msimbo <b> %s </b> .
 DolibarrDemo=Onyesho la ERP/CRM la Dolibarr
 StatsByAmount=Takwimu za kiasi cha bidhaa/huduma
+StatsByAmountProducts=Statistics on amount of products
+StatsByAmountServices=Statistics on amount of services
 StatsByNumberOfUnits=Takwimu za jumla ya qty ya bidhaa/huduma
+StatsByNumberOfUnitsProducts=Statistics for sum of qty of products
+StatsByNumberOfUnitsServices=Statistics for sum of qty of services
 StatsByNumberOfEntities=Takwimu za idadi ya huluki zinazorejelea (hakuna. ya ankara, au maagizo...)
 NumberOf=Idadi ya %s
 NumberOfUnits=Idadi ya vitengo kwenye %s
@@ -198,6 +204,7 @@ AmountIn=Kiasi katika %s
 NumberOfUnitsMos=Idadi ya vitengo vya kuzalisha katika maagizo ya utengenezaji
 EMailTextInterventionAddedContact=Uingiliaji kati mpya %s umepewa wewe.
 EMailTextInterventionValidated=Uingiliaji kati %s imethibitishwa.
+EMailTextInterventionClosed=The intervention %s has been closed.
 EMailTextInvoiceValidated=Ankara %s imethibitishwa.
 EMailTextInvoicePayed=Ankara %s imelipwa.
 EMailTextProposalValidated=Pendekezo %s imethibitishwa.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Pendekezo %s imefungwa imekataliwa.
 EMailTextProposalClosedRefusedWeb=Pendekezo %s imefungwa takataka kwenye ukurasa wa lango.
 EMailTextOrderValidated=Agiza %s imethibitishwa.
 EMailTextOrderClose=Agiza %s imetolewa.
-EMailTextOrderApproved=Agiza %s imeidhinishwa.
-EMailTextOrderValidatedBy=Agiza %s imerekodiwa na %s.
-EMailTextOrderApprovedBy=Agiza %s imeidhinishwa na %s.
-EMailTextOrderRefused=Agiza %s imekataliwa.
-EMailTextOrderRefusedBy=Agiza %s imekataliwa na %s.
+EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
+EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
+EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
+EMailTextSupplierOrderRefusedBy=Purchase order %s has been refused by %s.
 EMailTextExpeditionValidated=Usafirishaji %s imethibitishwa.
 EMailTextExpenseReportValidated=Ripoti ya gharama %s imethibitishwa.
 EMailTextExpenseReportApproved=Ripoti ya gharama %s imeidhinishwa.
@@ -247,7 +253,7 @@ ClickHereToGoTo=Bofya hapa ili kwenda %s
 YouMustClickToChange=Ni lazima kwanza ubofye kiungo kifuatacho ili kuthibitisha mabadiliko haya ya nenosiri
 ConfirmPasswordChange=Thibitisha mabadiliko ya nenosiri
 ForgetIfNothing=Ikiwa hukuomba mabadiliko haya, sahau barua pepe hii. Kitambulisho chako kinawekwa salama.
-IfAmountHigherThan=Ikiwa kiasi cha juu kuliko <strong> %s </strong> 
+IfAmountHigherThan=Ikiwa kiasi cha juu kuliko <strong> %s </strong>
 SourcesRepository=Hifadhi ya vyanzo
 Chart=Chati
 PassEncoding=Usimbaji wa nenosiri
@@ -289,10 +295,12 @@ LinesToImport=Mistari ya kuagiza
 
 MemoryUsage=Matumizi ya kumbukumbu
 RequestDuration=Muda wa ombi
-ProductsPerPopularity=Bidhaa/Huduma kulingana na umaarufu
-PopuProp=Bidhaa/Huduma kwa umaarufu katika Mapendekezo
-PopuCom=Bidhaa/Huduma kwa umaarufu katika Maagizo
-ProductStatistics=Takwimu za Bidhaa/Huduma
+ProductsServicesPerPopularity=Products|Services by popularity
+ProductsPerPopularity=Products by popularity
+ServicesPerPopularity=Services by popularity
+PopuProp=Products|Services by popularity in Proposals
+PopuCom=Products|Services by popularity in Orders
+ProductStatistics=Products|Services Statistics
 NbOfQtyInOrders=Qty katika maagizo
 SelectTheTypeOfObjectToAnalyze=Chagua kitu ili kuona takwimu zake...
 
@@ -328,3 +336,5 @@ FTPFailedToUploadFile=Imeshindwa kupakia faili <b> %s </b> .
 AddFolder=Unda folda
 FileWasCreateFolder=Folda <b> %s </b>  imeundwa
 FTPFailedToCreateFolder=Imeshindwa kuunda folda <b> %s </b> .
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/sw_SW/paybox.lang b/htdocs/langs/sw_SW/paybox.lang
index d5e6272e88f..8d4a9c41b59 100644
--- a/htdocs/langs/sw_SW/paybox.lang
+++ b/htdocs/langs/sw_SW/paybox.lang
@@ -18,7 +18,7 @@ YourPaymentHasBeenRecorded=Ukurasa huu unathibitisha kuwa malipo yako yamerekodi
 YourPaymentHasNotBeenRecorded=Malipo yako HAYAJAREKODIWA na muamala umeghairiwa. Asante.
 AccountParameter=Vigezo vya akaunti
 UsageParameter=Vigezo vya matumizi
-InformationToFindParameters=Usaidizi wa kupata <span class='notranslate'>%s</span> yako\n maelezo ya akaunti
+InformationToFindParameters=Help to find your %s account information
 PAYBOX_CGI_URL_V2=Url ya moduli ya Paybox CGI kwa malipo
 CSSUrlForPaymentForm=Url ya mtindo wa CSS ya fomu ya malipo
 NewPayboxPaymentReceived=Malipo mapya ya Paybox yamepokelewa
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 626f4a2cd41..1d215ef43e7 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -6,6 +6,9 @@ ProductStatusNotOnBatch=Hapana (sehemu/seria haijatumika)
 ProductStatusOnBatchShort=Mengi
 ProductStatusOnSerialShort=Msururu
 ProductStatusNotOnBatchShort=Hapana
+BatchSellOrEatByMandatoryList=Make %s or %s mandatory
+BatchSellOrEatByMandatoryNone=None
+BatchSellOrEatByMandatoryAll=%s and %s
 Batch=Mengi/Seri
 atleast1batchfield=Tarehe ya Kula au Tarehe ya Kuuza au Nambari ya Mengi/Siri
 batch_number=Mengi/Nambari ya serial
@@ -45,3 +48,5 @@ OutOfOrder=Nje ya utaratibu
 InWorkingOrder=Katika utaratibu wa kufanya kazi
 ToReplace=Badilisha
 CantMoveNonExistantSerial=Hitilafu. Unauliza hoja kwenye rekodi kwa mfululizo ambao haupo tena. Labda unaweza kuchukua mfululizo sawa kwenye ghala moja mara kadhaa katika usafirishaji sawa au ilitumiwa na usafirishaji mwingine. Ondoa usafirishaji huu na uandae nyingine.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Lot table incomplete run repair with parameter '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= Stock correction required because unique serial number.
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 86953586118..75f0affa1d9 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -208,11 +208,6 @@ unitSET=Weka
 unitS=Pili
 unitH=Saa
 unitD=Siku
-unitG=Gramu
-unitM=Mita
-unitLM=Mita ya mstari
-unitM2=Mita ya mraba
-unitM3=Mita za ujazo
 unitL=Lita
 unitT=tani
 unitKG=kilo
@@ -221,6 +216,7 @@ unitMG=mg
 unitLB=pound
 unitOZ=wanzi
 unitM=Mita
+unitLM=Mita ya mstari
 unitDM=dm
 unitCM=sentimita
 unitMM=mm
@@ -289,9 +285,9 @@ MinimumRecommendedPrice=Bei ya chini inayopendekezwa ni: %s
 PriceExpressionEditor=Mhariri wa kujieleza kwa bei
 PriceExpressionSelected=Kielelezo cha bei kilichochaguliwa
 PriceExpressionEditorHelp1="bei = 2 + 2" au "2 + 2" kwa kuweka bei. Tumia; kutenganisha misemo
-PriceExpressionEditorHelp2=Unaweza kufikia ExtraFields na vigeuzo kama vile <b> #extrafield_myextrafieldkey# </b>  na vigeu vya kimataifa vilivyo na <b> #global_mycode# </b> 
-PriceExpressionEditorHelp3=Katika bei za bidhaa/huduma na wauzaji kuna vigeu hivi vinavyopatikana: <br>  <b> #tva_tx# #localtax1_tx# #localtax2_tx# #uzito# #urefu# #uso# #bei_min# </b> 
-PriceExpressionEditorHelp4=Katika bei ya bidhaa/huduma pekee: <b> #supplier_min_price# </b>  <br> Kwa bei za wauzaji pekee: <b> #supplier_quantity# na #supplier_tva_tx# </b> 
+PriceExpressionEditorHelp2=Unaweza kufikia ExtraFields na vigeuzo kama vile <b> #extrafield_myextrafieldkey# </b>  na vigeu vya kimataifa vilivyo na <b> #global_mycode# </b>
+PriceExpressionEditorHelp3=Katika bei za bidhaa/huduma na wauzaji kuna vigeu hivi vinavyopatikana: <br>  <b> #tva_tx# #localtax1_tx# #localtax2_tx# #uzito# #urefu# #uso# #bei_min# </b>
+PriceExpressionEditorHelp4=Katika bei ya bidhaa/huduma pekee: <b> #supplier_min_price# </b>  <br> Kwa bei za wauzaji pekee: <b> #supplier_quantity# na #supplier_tva_tx# </b>
 PriceExpressionEditorHelp5=Thamani zinazopatikana za kimataifa:
 PriceMode=Hali ya bei
 PriceNumeric=Nambari
@@ -437,3 +433,6 @@ ModifyValueExtrafields = Rekebisha thamani ya uwanja wa ziada
 OrProductsWithCategories=Au bidhaa zilizo na lebo/kategoria
 WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
 WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 753dd7d3e13..ac50bdf0e7f 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -244,12 +244,12 @@ OppStatusPENDING=Inasubiri
 OppStatusWON=Ameshinda
 OppStatusLOST=Potea
 Budget=Bajeti
-AllowToLinkFromOtherCompany=Ruhusu kuunganisha kipengele na mradi wa kampuni nyingine <br>  <br>  <u> Thamani zinazotumika: </u>  <br> - Weka bila kitu: Inaweza kuunganisha vipengele na miradi yoyote katika kampuni moja (chaguo-msingi) <br> - "yote": Inaweza kuunganisha vipengele na miradi yoyote, hata miradi ya makampuni mengine <br> - Orodha ya vitambulisho vya watu wengine ikitenganishwa kwa koma: inaweza kuunganisha vipengele na miradi yoyote ya wahusika wengine (Mfano: 123,4795,53) <br> 
+AllowToLinkFromOtherCompany=Ruhusu kuunganisha kipengele na mradi wa kampuni nyingine <br>  <br>  <u> Thamani zinazotumika: </u>  <br> - Weka bila kitu: Inaweza kuunganisha vipengele na miradi yoyote katika kampuni moja (chaguo-msingi) <br> - "yote": Inaweza kuunganisha vipengele na miradi yoyote, hata miradi ya makampuni mengine <br> - Orodha ya vitambulisho vya watu wengine ikitenganishwa kwa koma: inaweza kuunganisha vipengele na miradi yoyote ya wahusika wengine (Mfano: 123,4795,53) <br>
 LatestProjects=Hivi karibuni %s miradi
 LatestModifiedProjects=Hivi karibuni %s miradi iliyorekebishwa
 OtherFilteredTasks=Kazi zingine zilizochujwa
 NoAssignedTasks=Hakuna kazi zilizokabidhiwa zilizopatikana (peana mradi/kazi kwa mtumiaji wa sasa kutoka kwenye kisanduku teule cha juu ili kuweka muda juu yake)
-ThirdPartyRequiredToGenerateInvoice=Mtu wa tatu lazima afafanuliwe kwenye mradi ili aweze kuuweka ankara.
+ThirdPartyRequiredToGenerateIntervention=A third party must be defined on project to be able to create intervention.
 ThirdPartyRequiredToGenerateInvoice=Mtu wa tatu lazima afafanuliwe kwenye mradi ili aweze kuuweka ankara.
 ChooseANotYetAssignedTask=Chagua kazi ambayo bado haujakabidhiwa
 # Comments trans
diff --git a/htdocs/langs/sw_SW/receiptprinter.lang b/htdocs/langs/sw_SW/receiptprinter.lang
index 56d39f4ae9c..f25df08e929 100644
--- a/htdocs/langs/sw_SW/receiptprinter.lang
+++ b/htdocs/langs/sw_SW/receiptprinter.lang
@@ -10,6 +10,7 @@ ReceiptPrinterTemplateDesc=Usanidi wa Violezo
 ReceiptPrinterTypeDesc=Mfano wa maadili iwezekanavyo kwa shamba "Parameters" kulingana na aina ya dereva
 ReceiptPrinterProfileDesc=Maelezo ya Wasifu wa Kichapishi cha Risiti
 ListPrinters=Orodha ya Wachapishaji
+FromServerPointOfView=From the web server point of view. This method must be reachable from the web server hosting.
 SetupReceiptTemplate=Kuweka Kiolezo
 CONNECTOR_DUMMY=Kichapishaji cha Dummy
 CONNECTOR_NETWORK_PRINT=Printa ya Mtandao
@@ -63,7 +64,7 @@ YearInvoice=Mwaka wa ankara
 DOL_VALUE_MONTH_LETTERS=Mwezi wa ankara katika barua
 DOL_VALUE_MONTH=Mwezi wa ankara
 DOL_VALUE_DAY=Siku ya ankara
-DOL_VALUE_DAY_LETTERS=Siku ya Inovice katika barua
+DOL_VALUE_DAY_LETTERS=Invoice day in letters
 DOL_LINE_FEED_REVERSE=Mlisho wa mstari kinyume
 InvoiceID=Kitambulisho cha ankara
 InvoiceRef=Ref ya ankara
diff --git a/htdocs/langs/sw_SW/receptions.lang b/htdocs/langs/sw_SW/receptions.lang
index 97bc7cb4d19..d22b8947f25 100644
--- a/htdocs/langs/sw_SW/receptions.lang
+++ b/htdocs/langs/sw_SW/receptions.lang
@@ -5,8 +5,6 @@ RefReception=Kumb. mapokezi
 Reception=Mapokezi
 Receptions=Mapokezi
 AllReceptions=Mapokezi Yote
-Reception=Mapokezi
-Receptions=Mapokezi
 ShowReception=Onyesha Mapokezi
 ReceptionsArea=Eneo la mapokezi
 ListOfReceptions=Orodha ya mapokezi
diff --git a/htdocs/langs/sw_SW/resource.lang b/htdocs/langs/sw_SW/resource.lang
index bd68d031edc..dc0622ebac2 100644
--- a/htdocs/langs/sw_SW/resource.lang
+++ b/htdocs/langs/sw_SW/resource.lang
@@ -37,3 +37,5 @@ ImportDataset_resource_1=Rasilimali
 
 ErrorResourcesAlreadyInUse=Baadhi ya rasilimali zinatumika
 ErrorResourceUseInEvent=%s imetumika katika %s tukio
+
+MaxUsers=Maximum users (places, seats, etc.)
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index 3fb56121037..3f03edf4c2c 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -25,3 +25,9 @@ SalariesAndPayments=Mishahara na malipo
 ConfirmDeleteSalaryPayment=Je, ungependa kufuta malipo haya ya mishahara?
 FillFieldFirst=Jaza uwanja wa wafanyikazi kwanza
 UpdateAmountWithLastSalary=Weka kiasi cha mshahara wa mwisho
+MakeTransferRequest=Make transfer request
+VirementOrder=Credit transfer request
+BankTransferAmount=Amount of credit transfer
+WithdrawalReceipt=Credit transfer order
+OrderWaiting=Pending order
+FillEndOfMonth=Fill with end of month
diff --git a/htdocs/langs/sw_SW/stripe.lang b/htdocs/langs/sw_SW/stripe.lang
index 366153e4cf9..b11f58d104d 100644
--- a/htdocs/langs/sw_SW/stripe.lang
+++ b/htdocs/langs/sw_SW/stripe.lang
@@ -26,7 +26,7 @@ YouCanAddTagOnUrl=Unaweza pia kuongeza kigezo cha url <b> &tag= <i> thamani </i>
 SetupStripeToHavePaymentCreatedAutomatically=Sanidi Stripe yako kwa url <b> %s </b>  kufanya malipo kuundwa kiotomatiki yanapothibitishwa na Stripe.
 AccountParameter=Vigezo vya akaunti
 UsageParameter=Vigezo vya matumizi
-InformationToFindParameters=Usaidizi wa kupata <span class='notranslate'>%s</span> yako\n maelezo ya akaunti
+InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url ya moduli ya Stripe CGI kwa malipo
 CSSUrlForPaymentForm=Url ya mtindo wa CSS ya fomu ya malipo
 NewStripePaymentReceived=Malipo mapya ya Stripe yamepokelewa
@@ -70,10 +70,11 @@ StripePayoutList=Orodha ya malipo ya Stripe
 ToOfferALinkForTestWebhook=Unganisha ili kusanidi Stripe WebHook ili kupiga IPN (hali ya majaribio)
 ToOfferALinkForLiveWebhook=Unganisha ili kusanidi Stripe WebHook ili kupiga IPN (modi ya moja kwa moja)
 PaymentWillBeRecordedForNextPeriod=Malipo yatarekodiwa kwa kipindi kijacho.
-ClickHereToTryAgain= <a href="%s"> Bofya hapa ili kujaribu tena... </a> 
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Kwa sababu ya sheria Imara za Uthibitishaji wa Mteja, uundaji wa kadi lazima ufanywe kutoka kwa ofisi ya Stripe backoffice. Unaweza kubofya hapa ili kuwasha rekodi ya mteja ya Stripe: %s
+ClickHereToTryAgain= <a href="%s"> Bofya hapa ili kujaribu tena... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe back office. You can click here to switch on Stripe customer record: %s
 STRIPE_CARD_PRESENT=Ipo kwa Kadi ya Vituo vya Mistari
 TERMINAL_LOCATION=Mahali (anwani) ya Vituo vya Stripe
 RequestDirectDebitWithStripe=Omba Debit ya Moja kwa moja na Stripe
+RequesCreditTransferWithStripe=Request Credit Transfer with Stripe
 STRIPE_SEPA_DIRECT_DEBIT=Washa malipo ya Debit ya Moja kwa Moja kupitia Stripe
-
+StripeConnect_Mode=Stripe Connect mode
diff --git a/htdocs/langs/sw_SW/supplier_proposal.lang b/htdocs/langs/sw_SW/supplier_proposal.lang
index 4febf09ed84..a5cb417965f 100644
--- a/htdocs/langs/sw_SW/supplier_proposal.lang
+++ b/htdocs/langs/sw_SW/supplier_proposal.lang
@@ -42,8 +42,8 @@ SendAskRef=Inatuma ombi la bei %s
 SupplierProposalCard=Omba kadi
 ConfirmDeleteAsk=Je, una uhakika unataka kufuta ombi hili la bei <b> %s </b> ?
 ActionsOnSupplierProposal=Matukio kwa ombi la bei
-DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
-DocModelZenithDescription=A complete template for a vendor quotation request template
+DocModelAuroreDescription=A complete template for a vendor quotation request (old implementation of Sponge template)
+DocModelZenithDescription=A complete template for a vendor quotation request
 CommercialAsk=Ombi la bei
 DefaultModelSupplierProposalCreate=Uundaji wa muundo chaguomsingi
 DefaultModelSupplierProposalToBill=Kiolezo chaguomsingi wakati wa kufunga ombi la bei (limekubaliwa)
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index 927c9ce7093..7ee9950a6cd 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -229,7 +229,7 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Mpokeaji hana kitu. Hakuna kutuma
 TicketGoIntoContactTab=Tafadhali nenda kwenye kichupo cha "Anwani" ili kuzichagua
 TicketMessageMailIntro=Kijajuu cha ujumbe
 TicketMessageMailIntroHelp=Maandishi haya yanaongezwa tu mwanzoni mwa barua pepe na hayatahifadhiwa.
-TicketMessageMailIntroText=Hujambo, <br> Jibu jipya limeongezwa kwa tikiti unayofuata. Huu ndio ujumbe: <br> 
+TicketMessageMailIntroText=Hujambo, <br> Jibu jipya limeongezwa kwa tikiti unayofuata. Huu ndio ujumbe: <br>
 TicketMessageMailIntroHelpAdmin=Maandishi haya yataingizwa kabla ya jibu wakati wa kujibu tikiti kutoka Dolibarr
 TicketMessageMailFooter=kijachini cha ujumbe
 TicketMessageMailFooterHelp=Maandishi haya yanaongezwa tu mwishoni mwa ujumbe uliotumwa kwa barua pepe na hayatahifadhiwa.
@@ -320,7 +320,7 @@ ViewTicket=Tazama tikiti
 ViewMyTicketList=Tazama orodha yangu ya tikiti
 ErrorEmailMustExistToCreateTicket=Hitilafu: anwani ya barua pepe haipatikani katika hifadhidata yetu
 TicketNewEmailSubjectAdmin=Tikiti mpya imeundwa - Rejea %s (kitambulisho cha tikiti ya umma %s)
-TicketNewEmailBodyAdmin= <p> Tiketi imeundwa hivi punde ikiwa na kitambulisho #%s, angalia maelezo: </p> 
+TicketNewEmailBodyAdmin= <p> Tiketi imeundwa hivi punde ikiwa na kitambulisho #%s, angalia maelezo: </p>
 SeeThisTicketIntomanagementInterface=Tazama tikiti katika kiolesura cha usimamizi
 TicketPublicInterfaceForbidden=Kiolesura cha umma cha tikiti hakijawezeshwa
 ErrorEmailOrTrackingInvalid=Thamani mbaya ya kitambulisho cha kufuatilia au barua pepe
@@ -361,7 +361,7 @@ BoxTicketSeverity=Idadi ya tikiti zilizofunguliwa kwa ukali
 BoxNoTicketSeverity=Hakuna tikiti zilizofunguliwa
 BoxTicketLastXDays=Idadi ya tikiti mpya kwa siku za mwisho %s siku
 BoxTicketLastXDayswidget = Idadi ya tikiti mpya kwa siku X zilizopita
-BoxNoTicketLastXDays=Hakuna tikiti mpya <span class='notranslate'>%s</span> ya mwisho\n siku
+BoxNoTicketLastXDays=No new tickets the last %s days
 BoxNumberOfTicketByDay=Idadi ya tikiti mpya kwa siku
 BoxNewTicketVSClose=Idadi ya tikiti dhidi ya tikiti zilizofungwa (leo)
 TicketCreatedToday=Tikiti imeundwa leo
diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang
index b46786436d2..426213fb6c7 100644
--- a/htdocs/langs/sw_SW/trips.lang
+++ b/htdocs/langs/sw_SW/trips.lang
@@ -24,7 +24,7 @@ ConfirmPaidTrip=Je, una uhakika unataka kubadilisha hali ya ripoti hii ya gharam
 ConfirmRefuseTrip=Je, una uhakika unataka kukataa ripoti hii ya gharama?
 ConfirmSaveTrip=Je, una uhakika unataka kuthibitisha ripoti hii ya gharama?
 ConfirmValideTrip=Je, una uhakika unataka kuidhinisha ripoti hii ya gharama?
-DATE_CANCEL=Tarehe ya kughairiwa
+DATE_CANCEL=Cancellation date
 DATE_PAIEMENT=Siku ya malipo
 DATE_REFUS=Kataa tarehe
 DATE_SAVE=Tarehe ya uthibitishaji
@@ -39,7 +39,7 @@ expenseReportCoef=Mgawo
 expenseReportCoefUndefined=(thamani haijafafanuliwa)
 expenseReportOffset=Kukabiliana
 expenseReportPrintExample=kukabiliana + (d x coef) = %s
-expenseReportRangeDisabled=Masafa yamezimwa - tazama kamusi ya c_exp_tax_range
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
 expenseReportRangeFromTo=kutoka %d hadi %d
 expenseReportRangeMoreThan=zaidi ya %d
 expenseReportTotalForFive=Mfano na <u> d </u>  = 5
@@ -91,7 +91,7 @@ nolimitbyEX_EXP=kwa mstari (hakuna kizuizi)
 nolimitbyEX_MON=kwa mwezi (hakuna kizuizi)
 nolimitbyEX_YEA=kwa mwaka (hakuna kizuizi)
 NoTripsToExportCSV=Hakuna ripoti ya gharama ya kusafirisha nje kwa kipindi hiki.
-NOT_AUTHOR=Wewe si mwandishi wa ripoti hii ya gharama. Operesheni imeghairiwa.
+NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
 OnExpense=Mstari wa gharama
 PDFStandardExpenseReports=Kiolezo cha kawaida cha kutengeneza hati ya PDF kwa ripoti ya gharama
 PaidTrip=Lipa ripoti ya gharama
@@ -103,7 +103,7 @@ ShowExpenseReport=Onyesha ripoti ya gharama
 ShowTrip=Onyesha ripoti ya gharama
 TripCard=Kadi ya ripoti ya gharama
 TripId=Ripoti ya gharama ya kitambulisho
-TripNDF=Ripoti ya gharama ya habari
+TripNDF=Information expense report
 TripSociete=Kampuni ya habari
 Trips=Ripoti za gharama
 TripsAndExpenses=Ripoti za gharama
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index 6855caab862..ce7b52b9da7 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -32,9 +32,8 @@ CreateUser=Unda mtumiaji
 LoginNotDefined=Kuingia hakufafanuliwa.
 NameNotDefined=Jina halijafafanuliwa.
 ListOfUsers=Orodha ya watumiaji
-SuperAdministrator=Msimamizi Mkuu
-SuperAdministratorDesc=Msimamizi wa kimataifa
-AdministratorDesc=Msimamizi
+SuperAdministrator=Multicompany Administrator
+SuperAdministratorDesc=Multicompany system administrator (can change setup and users)
 DefaultRights=Ruhusa Chaguomsingi
 DefaultRightsDesc=Bainisha hapa <u> chaguo-msingi </u>  ruhusa ambazo zinatolewa kiotomatiki kwa <u> mpya </u>  mtumiaji (kurekebisha ruhusa kwa watumiaji waliopo, nenda kwenye kadi ya mtumiaji).
 DolibarrUsers=Watumiaji wa Dolibarr
@@ -45,7 +44,7 @@ NewGroup=Kikundi kipya
 CreateGroup=Unda kikundi
 RemoveFromGroup=Ondoa kwenye kikundi
 PasswordChangedAndSentTo=Nenosiri lilibadilishwa na kutumwa kwa <b> %s </b> .
-PasswordChangeRequest=Ombi la kubadilisha nenosiri la <b> %s </b> 
+PasswordChangeRequest=Ombi la kubadilisha nenosiri la <b> %s </b>
 PasswordChangeRequestSent=Ombi la kubadilisha nenosiri la <b> %s </b>  imetumwa kwa <b> %s </b> .
 IfLoginExistPasswordRequestSent=Ikiwa kuingia huku ni akaunti halali (iliyo na barua pepe halali), barua pepe ya kuweka upya nenosiri imetumwa.
 IfEmailExistPasswordRequestSent=Ikiwa barua pepe hii ni akaunti halali, barua pepe ya kuweka upya nenosiri imetumwa (kumbuka kuangalia folda yako ya TAKA ikiwa hupokei chochote)
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Saa zinazotarajiwa kufanya kazi kwa wiki
 ColorUser=Rangi ya mtumiaji
 DisabledInMonoUserMode=Imezimwa katika hali ya matengenezo
 UserAccountancyCode=Nambari ya hesabu ya mtumiaji
-UserLogoff=Kuondoka kwa mtumiaji
-UserLogged=Mtumiaji ameingia
+UserLogoff=User logout: %s
+UserLogged=User logged: %s
+UserLoginFailed=User login failed: %s
 DateOfEmployment=Tarehe ya ajira
 DateEmployment=Ajira
 DateEmploymentStart=Tarehe ya Kuanza Ajira
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Muda wa tarehe ya uhalali wa ufikiaji
 CantDisableYourself=Huwezi kuzima rekodi yako ya mtumiaji
 ForceUserExpenseValidator=Lazimisha kithibitishaji cha ripoti ya gharama
 ForceUserHolidayValidator=Lazimisha mthibitishaji wa ombi la likizo
-ValidatorIsSupervisorByDefault=Kwa chaguo-msingi, mthibitishaji ndiye msimamizi wa mtumiaji. Weka tupu ili kuweka tabia hii.
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behavior.
 UserPersonalEmail=Barua pepe ya kibinafsi
 UserPersonalMobile=Simu ya kibinafsi ya rununu
-WarningNotLangOfInterface=Onyo, hii ndiyo lugha kuu ambayo mtumiaji huzungumza, si lugha ya kiolesura alichochagua kuona. Ili kubadilisha lugha ya kiolesura inayoonekana na mtumiaji huyu, nenda kwenye kichupo %s
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he chose to see. To change the interface language visible by this user, go on tab %s
 DateLastLogin=Tarehe ya mwisho ya kuingia
 DatePreviousLogin=Tarehe ya kuingia hapo awali
 IPLastLogin=IP ya mwisho ya kuingia
@@ -132,3 +132,5 @@ ShowAllPerms=Onyesha safu mlalo zote za ruhusa
 HideAllPerms=Ficha safu mlalo zote za ruhusa
 UserPublicPageDesc=Unaweza kuwezesha kadi pepe kwa mtumiaji huyu. Url iliyo na wasifu wa mtumiaji na msimbo pau zitapatikana ili kuruhusu mtu yeyote aliye na simu mahiri kuichanganua na kuongeza mtu unayewasiliana naye kwenye kitabu chake cha anwani.
 EnablePublicVirtualCard=Washa kadi pepe ya biashara ya mtumiaji
+UserEnabledDisabled=User status changed: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 74a58465b8e..c83e03e8428 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -45,24 +45,24 @@ RealURL=URL halisi
 ViewWebsiteInProduction=Tazama tovuti kwa kutumia URL za nyumbani
 Virtualhost=Mpangishi pepe au jina la kikoa
 VirtualhostDesc=Jina la seva pangishi Pekee au kikoa (Kwa mfano: www.mywebsite.com, mybigcompany.net, ...)
-SetHereVirtualHost= <u> Tumia na Apache/NGinx/... </u>  <br> Unda kwenye seva yako ya wavuti (Apache, Nginx, ...) Seva pepe iliyojitolea iliyojitolea iliyo na PHP iliyowezeshwa na saraka ya Mizizi kwenye <br>  <strong> %s </strong> 
+SetHereVirtualHost= <u> Tumia na Apache/NGinx/... </u>  <br> Unda kwenye seva yako ya wavuti (Apache, Nginx, ...) Seva pepe iliyojitolea iliyojitolea iliyo na PHP iliyowezeshwa na saraka ya Mizizi kwenye <br>  <strong> %s </strong>
 ExampleToUseInApacheVirtualHostConfig=Mfano wa kutumia katika usanidi wa mwenyeji wa Apache:
-YouCanAlsoTestWithPHPS= <u> Tumia na seva iliyopachikwa PHP </u>  <br> Kwenye mazingira ya usanidi, unaweza kupendelea kujaribu tovuti kwa seva ya wavuti iliyopachikwa PHP (PHP 5.5 inahitajika) kwa kuendesha <br>  <strong> php -S 0.0.0.0:8080 -t %s </strong> 
-YouCanAlsoDeployToAnotherWHP= <u> Endesha tovuti yako na mtoa huduma mwingine wa Kukaribisha Dolibarr </u>  <br> Ikiwa huna seva ya wavuti kama Apache au NGinx inayopatikana kwenye mtandao, unaweza kuhamisha na kuagiza tovuti yako kwenye mfano mwingine wa Dolibarr uliotolewa na mtoa huduma mwingine wa kupangisha Dolibarr ambaye hutoa ushirikiano kamili na moduli ya Tovuti. Unaweza kupata orodha ya baadhi ya watoa huduma waandaji wa Dolibarr kwenye <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a> 
-CheckVirtualHostPerms=Angalia pia kwamba mtumiaji mpangishi pepe (kwa mfano www-data) ana <strong> %s </strong>  ruhusa kwenye faili katika <br>  <strong> %s </strong> 
+YouCanAlsoTestWithPHPS= <u> Tumia na seva iliyopachikwa PHP </u>  <br> Kwenye mazingira ya usanidi, unaweza kupendelea kujaribu tovuti kwa seva ya wavuti iliyopachikwa PHP (PHP 5.5 inahitajika) kwa kuendesha <br>  <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP= <u> Endesha tovuti yako na mtoa huduma mwingine wa Kukaribisha Dolibarr </u>  <br> Ikiwa huna seva ya wavuti kama Apache au NGinx inayopatikana kwenye mtandao, unaweza kuhamisha na kuagiza tovuti yako kwenye mfano mwingine wa Dolibarr uliotolewa na mtoa huduma mwingine wa kupangisha Dolibarr ambaye hutoa ushirikiano kamili na moduli ya Tovuti. Unaweza kupata orodha ya baadhi ya watoa huduma waandaji wa Dolibarr kwenye <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Angalia pia kwamba mtumiaji mpangishi pepe (kwa mfano www-data) ana <strong> %s </strong>  ruhusa kwenye faili katika <br>  <strong> %s </strong>
 ReadPerm=Soma
 WritePerm=Andika
 TestDeployOnWeb=Jaribu/tuma kwenye wavuti
-PreviewSiteServedByWebServer= <u> Hakiki %s katika kichupo kipya. </u>  <br>  <br> %s itahudumiwa na seva ya wavuti ya nje (kama Apache, Nginx, IIS). Lazima usakinishe na usanidi seva hii kabla ili kuelekeza kwenye saraka: <br>  <strong> %s </strong>  <br> URL inatolewa na seva ya nje: <br>  <strong> %s </strong> 
+PreviewSiteServedByWebServer= <u> Hakiki %s katika kichupo kipya. </u>  <br>  <br> %s itahudumiwa na seva ya wavuti ya nje (kama Apache, Nginx, IIS). Lazima usakinishe na usanidi seva hii kabla ili kuelekeza kwenye saraka: <br>  <strong> %s </strong>  <br> URL inatolewa na seva ya nje: <br>  <strong> %s </strong>
 PreviewSiteServedByDolibarr= <u> Hakiki %s katika kichupo kipya. </u>  <br>  <br> %s itahudumiwa na seva ya Dolibarr kwa hivyo haihitaji seva yoyote ya ziada ya wavuti (kama Apache, Nginx, IIS) kusakinishwa. <br> Usumbufu ni kwamba URL za kurasa sio rafiki kwa watumiaji na huanza na njia ya Dolibarr yako. <br> URL inayotolewa na Dolibarr: <br>  <strong> %s </strong>  <br>  <br> Ili kutumia seva yako ya nje ya wavuti kuhudumia tovuti hii, tengeneza seva pangishi pepe kwenye seva yako ya wavuti inayoelekeza kwenye saraka <br>  <strong> %s </strong>  <br> kisha ingiza jina la seva hii pepe katika sifa za tovuti hii na ubofye kiungo "Jaribio/Weka kwenye wavuti".
 VirtualHostUrlNotDefined=URL ya seva pangishi pepe inayotolewa na seva ya wavuti ya nje haijafafanuliwa
 NoPageYet=Bado hakuna kurasa
 YouCanCreatePageOrImportTemplate=Unaweza kuunda ukurasa mpya au kuleta kiolezo kamili cha tovuti
 SyntaxHelp=Msaada juu ya vidokezo maalum vya sintaksia
 YouCanEditHtmlSourceckeditor=Unaweza kuhariri msimbo wa chanzo wa HTML kwa kutumia kitufe cha "Chanzo" kwenye kihariri.
-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>
-YouCanEditHtmlSource1=<br><span class="fa fa-image"></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>
-YouCanEditHtmlSource2=Kwa picha iliyoshirikiwa na kiungo cha kushiriki (ufikiaji wazi kwa kutumia ufunguo wa hashi wa kushiriki), syntax ni: <br>  <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong>  <br> 
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
+YouCanEditHtmlSource2=Kwa picha iliyoshirikiwa na kiungo cha kushiriki (ufikiaji wazi kwa kutumia ufunguo wa hashi wa kushiriki), syntax ni: <br>  <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong>  <br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Sambaza ukurasa/chombo
@@ -121,7 +121,6 @@ ReplaceString=Kamba mpya
 CSSContentTooltipHelp=Ingiza hapa maudhui ya CSS. Ili kuepuka mgongano wowote na CSS ya programu, hakikisha kuwa umetayarisha tamko lote na darasa la tovuti ya .bodywebsite. Kwa mfano: <br>  <br> #mycssselector, input.myclass:hover { ... } <br> lazima iwe <br> .bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... } <br>  <br> Kumbuka: Ikiwa una faili kubwa isiyo na kiambishi awali hiki, unaweza kutumia 'lessc' kuibadilisha ili kuambatisha kiambishi awali cha .bodywebsite kila mahali.
 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=Sampuli ya ukurasa wenye maudhui yanayobadilika
-ImportSite=Ingiza kiolezo cha tovuti
 EditInLineOnOff=Hali ya 'Hariri inline' ni %s
 ShowSubContainersOnOff=Hali ya kutekeleza 'maudhui yanayobadilika' ni %s
 GlobalCSSorJS=Faili ya Global CSS/JS/Header ya tovuti
@@ -158,9 +157,81 @@ Booking=Kuhifadhi
 Reservation=Uhifadhi
 PagesViewedPreviousMonth=Kurasa zilizotazamwa (mwezi uliopita)
 PagesViewedTotal=Kurasa zilizotazamwa (jumla)
-Visibility=Visibility
 Everyone=Everyone
 AssignedContacts=Assigned contacts
 WebsiteTypeLabel=Type of Web site
-WebsiteTypeDolibarrWebsite=Web site (CMS Dolibarr)
-WebsiteTypeDolibarrPortal=Native Dolibarr portal
+WebsiteTypeDolibarrWebsite=Web site (Module WebSites CMS)
+WebsiteTypeDolibarrPortal=Native and ready to use web portal (Module Web Portal)
+WebPortalURL=Web portal URL
+NewWebsiteAccount=New accounts for websites
+ModuleWebPortalName=Web portal
+ModuleWebPortalDesc=A ready to use native web portal for customers, suppliers, partners or members
+WebPortalDescription=Public web portal module for membership and partnership
+WebPortalSetup=WebPortal setup
+WebPortalCSS=Web portal CSS
+WebPortalSetupPage=WebPortal setup page
+WEBPORTAL_TITLE=Brand name on header of public page
+UserAccountForWebPortalAreInThirdPartyTabHelp=Users accounts for WebPortal can be set on each third party card in Website accounts tab
+WebPortalAccessHidden=Hidden
+WebPortalAccessVisible=Visible
+WebPortalAccessEdit=Editable
+WEBPORTAL_MEMBER_CARD_ACCESS=Enable access to the membership record
+WebPortalMemberCardAccessHelp=Enable access to the membership record (Hidden / Visible or Editable)
+WEBPORTAL_PARTNERSHIP_CARD_ACCESS=Enable access to the partnership record
+WebPortalPartnerShipCardAccessHelp=Enable access to the partnership record (Hidden / Visible or Editable)
+WEBPORTAL_PROPAL_LIST_ACCESS=Enable access to the proposals
+WEBPORTAL_ORDER_LIST_ACCESS=Enable access to the orders
+WEBPORTAL_INVOICE_LIST_ACCESS=Enable access to the invoices
+WEBPORTAL_USER_LOGGED=Select an anonymous user
+WebPortalUserLoggedHelp=This user is used to update cards
+WebPortalHomeTitle=Welcome
+WebPortalHomeDesc=Welcome to the public interface
+WebPortalPropalListMenu=Proposals
+WebPortalPropalListTitle=List of proposals
+WebPortalPropalListDesc=List of proposals
+WebPortalPropalListNothing=Proposals not found
+WebPortalOrderListMenu=Orders
+WebPortalOrderListTitle=List of orders
+WebPortalOrderListDesc=List of orders
+WebPortalOrderListNothing=Orders not found
+WebPortalInvoiceListMenu=Invoices
+WebPortalInvoiceListTitle=List of invoices
+WebPortalInvoiceListDesc=List of invoices
+WebPortalInvoiceListNothing=Invoices not found
+WebPortalMemberCardMenu=Member
+WebPortalMemberCardTitle=Member card
+WebPortalMemberCardDesc=Member card
+WebPortalPartnershipCardMenu=Partnership
+WebPortalPartnershipCardTitle=Partnership card
+WebPortalPartnershipCardDesc=Partnership card
+loginWebportalUserName=User name / email
+loginWebportalPassword=Password
+LoginNow=Login now
+RemoveSearchFilters=Remove search filters
+WEBPORTAL_PRIMARY_COLOR=Primary color
+WEBPORTAL_SECONDARY_COLOR=Secondary color
+WEBPORTAL_LOGIN_LOGO_URL=Login logo image URL
+WEBPORTAL_MENU_LOGO_URL=Menu logo image URL
+WEBPORTAL_MENU_LOGO_URLTooltip=Leave empty to use login logo
+WEBPORTAL_LOGIN_BACKGROUND=Background login image URL
+WEBPORTAL_BANNER_BACKGROUND=Background for banner
+WEBPORTAL_BANNER_BACKGROUND_IS_DARK=Use dark theme for banner
+AriaPrevPage=Previous page
+AriaNextPage=Next page
+AriaPageX=Page %s
+WebPortalError404=Page not found
+WebPortalErrorPageNotExist=Page not exist
+WebPortalErrorFetchThirdPartyAccountFromLogin=Error when loading third-party account (login : %s)
+WebPortalErrorAuthentication=Authentication error
+WebPortalErrorFetchLoggedThirdPartyAccount=Error when loading third-party account (login : %s)
+WebPortalErrorFetchLoggedUser=Error when loading user (Id : %s)
+WebPortalErrorFetchLoggedThirdParty=Error when loading third-party (Id : %s)
+WebPortalErrorFetchLoggedMember=Error when loading member (Id : %s)
+WebPortalErrorFetchLoggedPartnership=Error when loading partnership (Third-party Id : %s, Member Id : %s)
+ExportIntoGIT=Export into sources
+WebPortalMember=Membership
+WebPortalOrder=Sale Order
+WebPortalPartnership=Partnership
+WebPortalPropal=Proposal
+WebPortalGroupMenuAdmin=Administration
+WebPortalGroupMenuTechnical=System
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 974fd586f60..388bfda8bc2 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -192,7 +192,7 @@ CommandsToDisableForeignKeysForImportWarning=บังคับถ้าคุ
 ExportCompatibility=ความเข้ากันได้ของไฟล์การส่งออกที่สร้าง
 ExportUseMySQLQuickParameter=ใช้ --ควิกพารามิเตอร์
 ExportUseMySQLQuickParameterHelp=พารามิเตอร์ '--quick' ช่วยจำกัดการใช้ RAM สำหรับตารางขนาดใหญ่
-MySqlExportParameters=พารามิเตอร์การส่งออก MySQL 
+MySqlExportParameters=พารามิเตอร์การส่งออก MySQL
 PostgreSqlExportParameters= พารามิเตอร์การส่งออก PostgreSQL
 UseTransactionnalMode=ใช้โหมดการทำธุรกรรม
 FullPathToMysqldumpCommand=เส้นทางแบบเต็มไป mysqldump คำสั่ง
@@ -320,7 +320,7 @@ UserEmail=อีเมลผู้ใช้
 CompanyEmail=อีเมลบริษัท
 FeatureNotAvailableOnLinux=คุณลักษณะที่ไม่สามารถใช้ได้บน Unix เหมือนระบบ ทดสอบโปรแกรม sendmail ในประเทศของคุณ
 FixOnTransifex=แก้ไขการแปลบนแพลตฟอร์มการแปลออนไลน์ของโครงการ
-SubmitTranslation=หากการแปลภาษานี้ไม่สมบูรณ์หรือพบข้อผิดพลาด คุณสามารถแก้ไขได้โดยแก้ไขไฟล์ในไดเรกทอรี <b>langs/%s</span <span class='notranslate'></b> และส่งการเปลี่ยนแปลงของคุณไปที่ www.transifex.com/dolibarr-association/dolibarr/
+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=หากการแปลภาษานี้ไม่สมบูรณ์หรือพบข้อผิดพลาด คุณสามารถแก้ไขได้โดยแก้ไขไฟล์ลงในไดเรกทอรี <b>langs/%s </b> และส่งไฟล์ที่แก้ไขบน dolibarr.org/forum หรือหากคุณเป็นนักพัฒนา ก็ส่งด้วยการประชาสัมพันธ์บน github.com/Dolibarr/dolibarr
 ModuleSetup=การติดตั้งโมดูล
 ModulesSetup=การตั้งค่าโมดูล/แอปพลิเคชัน
@@ -346,7 +346,7 @@ StepNb=ขั้นตอนที่ %s
 FindPackageFromWebSite=ค้นหาแพ็คเกจที่มีฟีเจอร์ที่คุณต้องการ (เช่น บนเว็บไซต์อย่างเป็นทางการ %s)
 DownloadPackageFromWebSite=ดาวน์โหลดแพ็คเกจ (เช่น จากเว็บไซต์อย่างเป็นทางการ %s)
 UnpackPackageInDolibarrRoot=แตก/แตกไฟล์แพ็กเกจลงในไดเร็กทอรีเซิร์ฟเวอร์ Dolibarr ของคุณ: <b>%s</b>
-UnpackPackageInModulesRoot=หากต้องการปรับใช้/ติดตั้งโมดูลภายนอก คุณต้องคลายแพ็ก/แตกไฟล์เก็บถาวรลงในไดเร็กทอรีเซิร์ฟเวอร์สำหรับโมดูลภายนอกโดยเฉพาะ:<br><b></span <span class='notranslate'>%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=การปรับใช้โมดูลเสร็จสิ้นแล้ว อย่างไรก็ตาม คุณต้องเปิดใช้งานและตั้งค่าโมดูลในแอปพลิเคชันของคุณโดยไปที่โมดูลการตั้งค่าเพจ: <a href="%s">%s</a>.
 NotExistsDirect=ไดเร็กทอรีรากทางเลือกไม่ได้ถูกกำหนดให้กับไดเร็กทอรีที่มีอยู่<br>
 InfDirAlt=ตั้งแต่เวอร์ชัน 3 เป็นต้นไป คุณสามารถกำหนดไดเร็กทอรีรากสำรองได้ ซึ่งช่วยให้คุณสามารถจัดเก็บไว้ในไดเร็กทอรีเฉพาะ ปลั๊กอิน และเทมเพลตที่กำหนดเองได้<br>เพียงสร้างไดเร็กทอรีที่รากของ Dolibarr (เช่น: กำหนดเอง)<br>
@@ -364,7 +364,7 @@ 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> รหัสไคลเอ็นต์ที่มีอักขระ n ตัว<br><b>{cccc000}</b> รหัสไคลเอ็นต์ บนอักขระ n ตามด้วยตัวนับสำหรับลูกค้าโดยเฉพาะ ตัวนับนี้สำหรับลูกค้าโดยเฉพาะจะถูกรีเซ็ตในเวลาเดียวกันกับตัวนับส่วนกลาง<br><b>{tttt} </b> รหัสประเภทบุคคลที่สามที่มีอักขระ n ตัว (ดูเมนู หน้าแรก - การตั้งค่า - พจนานุกรม - ประเภทของบุคคลที่สาม) หากคุณเพิ่มแท็กนี้ ตัวนับจะแตกต่างกันสำหรับบุคคลที่สามแต่ละประเภท<br>
 GenericMaskCodes3=ทุกตัวอักษรอื่น ๆ ในหน้ากากจะยังคงเหมือนเดิม <br> ไม่อนุญาตให้ใช้ช่องว่าง<br>
-GenericMaskCodes3EAN=อักขระอื่นๆ ทั้งหมดในมาสก์จะยังคงเดิม (ยกเว้น * หรือ ? ในตำแหน่งที่ 13 ใน EAN13)<br>ไม่อนุญาตให้เว้นวรรค<br></ span span>ใน EAN13 อักขระตัวสุดท้ายหลัง } ตัวสุดท้ายในตำแหน่งที่ 13 ควรเป็น * หรือ ? . มันจะถูกแทนที่ด้วยคีย์ที่คำนวณ<span class='notranslate'><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>ตัวอย่างในวันที่ 99 %s ของบุคคลที่สาม TheCompany ซึ่งมีวันที่ 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>ตัวอย่างของบุคคลที่สามที่สร้างขึ้นเมื่อ 2023-01-31:</u><br>
 GenericMaskCodes4c=<u>ตัวอย่างเกี่ยวกับผลิตภัณฑ์ที่สร้างขึ้นเมื่อ 2023-01-31:</u><br>
@@ -509,7 +509,7 @@ WarningPHPMailA=- การใช้เซิร์ฟเวอร์ของ
 WarningPHPMailB=- ผู้ให้บริการอีเมลบางราย (เช่น Yahoo) ไม่อนุญาตให้คุณส่งอีเมลจากเซิร์ฟเวอร์อื่นที่ไม่ใช่เซิร์ฟเวอร์ของตนเอง การตั้งค่าปัจจุบันของคุณใช้เซิร์ฟเวอร์ของแอปพลิเคชันในการส่งอีเมล ไม่ใช่เซิร์ฟเวอร์ของผู้ให้บริการอีเมลของคุณ ดังนั้นผู้รับบางราย (ที่เข้ากันได้กับโปรโตคอล DMARC ที่มีข้อจำกัด) จะถามผู้ให้บริการอีเมลของคุณว่าสามารถรับอีเมลของคุณและผู้ให้บริการอีเมลบางรายได้หรือไม่ (เช่น Yahoo) อาจตอบว่า "ไม่" เนื่องจากเซิร์ฟเวอร์ไม่ใช่ของพวกเขา ดังนั้นอีเมลที่คุณส่งบางส่วนอาจไม่ได้รับการยอมรับสำหรับการจัดส่ง (โปรดระวังโควต้าการส่งของผู้ให้บริการอีเมลของคุณด้วย)
 WarningPHPMailC=- การใช้เซิร์ฟเวอร์ SMTP ของผู้ให้บริการอีเมลของคุณเองในการส่งอีเมลก็น่าสนใจเช่นกัน ดังนั้นอีเมลทั้งหมดที่ส่งจากแอปพลิเคชันจะถูกบันทึกลงในไดเร็กทอรี "ส่ง" ของกล่องจดหมายของคุณด้วย
 WarningPHPMailD=ดังนั้นจึงแนะนำให้เปลี่ยนวิธีการส่งอีเมลเป็นค่า "SMTP"
-WarningPHPMailDbis=หากคุณต้องการคงวิธีการส่งอีเมลตามค่าเริ่มต้นของ "PHP" ไว้จริงๆ เพียงเพิกเฉยต่อคำเตือนนี้ หรือลบออกโดย %sคลิกที่นี่<span class='notranslate'>%s< /ช่วง>.
+WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
 WarningPHPMail2=หากผู้ให้บริการอีเมล SMTP ของคุณจำเป็นต้องจำกัดโปรแกรมรับส่งอีเมลไว้เฉพาะที่อยู่ IP บางส่วน (ซึ่งพบได้ยากมาก) นี่คือที่อยู่ IP ของตัวแทนผู้ใช้อีเมล (MUA) สำหรับแอปพลิเคชัน ERP CRM ของคุณ: <strong>%s</strong>
 WarningPHPMailSPF=หากชื่อโดเมนในที่อยู่อีเมลของผู้ส่งของคุณได้รับการปกป้องโดยบันทึก SPF (สอบถามผู้รับจดทะเบียนชื่อโดเมนของคุณ) คุณต้องเพิ่ม IP ต่อไปนี้ในบันทึก SPF ของ DNS ของโดเมนของคุณ: <strong>%s</strong>
 ActualMailSPFRecordFound=พบบันทึก SPF จริง (สำหรับอีเมล %s) : %s
@@ -519,7 +519,7 @@ RequiredBy=โมดูลนี้จำเป็นสำหรับโมด
 TheKeyIsTheNameOfHtmlField=นี่คือชื่อของฟิลด์ HTML จำเป็นต้องมีความรู้ทางเทคนิคในการอ่านเนื้อหาของหน้า HTML เพื่อรับชื่อคีย์ของฟิลด์
 PageUrlForDefaultValues=คุณต้องป้อนเส้นทางสัมพันธ์ของ URL ของหน้า หากคุณรวมพารามิเตอร์ใน URL จะมีประสิทธิภาพหากพารามิเตอร์ทั้งหมดใน URL ที่เรียกดูมีค่าที่กำหนดไว้ที่นี่
 PageUrlForDefaultValuesCreate=<br>ตัวอย่าง:<br>สำหรับแบบฟอร์มในการสร้างบุคคลที่สามใหม่ คือ <strong>%s</strong>.<br>สำหรับ URL ของโมดูลภายนอกที่ติดตั้งใน ไดเรกทอรีที่กำหนดเอง ไม่รวม "กำหนดเอง/" ดังนั้นให้ใช้เส้นทางเช่น <strong>mymodule/mypage.php</strong> และไม่ใช่แบบกำหนดเอง /mymodule/mypage.php.<br>หากคุณต้องการค่าเริ่มต้นเฉพาะในกรณีที่ url มีพารามิเตอร์บางตัว คุณสามารถใช้ <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>ตัวอย่าง:<br>สำหรับหน้าที่แสดงรายการบุคคลที่สาม จะเป็น <strong></span <span class='notranslate'>%s</strong>.<br>สำหรับ URL ของโมดูลภายนอกที่ติดตั้งในไดเรกทอรีที่กำหนดเอง ไม่รวม "custom/" ดังนั้นให้ใช้เส้นทางเช่น <strong>mymodule/mypagelist.php</strong> และไม่ใช่ custom/mymodule /mypagelist.php.<br>หากคุณต้องการค่าเริ่มต้นเฉพาะในกรณีที่ url มีพารามิเตอร์บางตัว คุณสามารถใช้ <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=โปรดทราบว่าการเขียนทับค่าเริ่มต้นสำหรับการสร้างแบบฟอร์มจะใช้ได้กับหน้าที่ได้รับการออกแบบอย่างถูกต้องเท่านั้น (ดังนั้นด้วยพารามิเตอร์ action=create หรือ presend...)
 EnableDefaultValues=เปิดใช้งานการปรับแต่งค่าเริ่มต้น
 EnableOverwriteTranslation=อนุญาตให้ปรับแต่งการแปล
@@ -1197,6 +1197,7 @@ Skin=ธีม
 DefaultSkin=ธีมเริ่มต้น
 MaxSizeList=ความยาวสูงสุดสำหรับรายชื่อ
 DefaultMaxSizeList=ความยาวสูงสุดเริ่มต้นสำหรับรายการ
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=ความยาวสูงสุดเริ่มต้นสำหรับรายการสั้นๆ (เช่น ในบัตรลูกค้า)
 MessageOfDay=ข้อความของวัน
 MessageLogin=ข้อความหน้าเข้าสู่ระบบ
@@ -1249,7 +1250,7 @@ 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<span class='notranslate'></a>< /ช่วง>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=พารามิเตอร์พื้นฐานที่ใช้ในการปรับแต่งพฤติกรรมเริ่มต้นของแอปพลิเคชันของคุณ (เช่น สำหรับคุณลักษณะที่เกี่ยวข้องกับประเทศ)
 SetupDescription4b=ซอฟต์แวร์นี้เป็นชุดของโมดูล/แอปพลิเคชันจำนวนมาก ต้องเปิดใช้งานโมดูลที่เกี่ยวข้องกับความต้องการของคุณ รายการเมนูจะปรากฏขึ้นพร้อมกับการเปิดใช้งานโมดูลเหล่านี้
 AuditedSecurityEvents=เหตุการณ์ด้านความปลอดภัยที่ได้รับการตรวจสอบ
@@ -1281,7 +1282,7 @@ AvailableModules=แอพ/โมดูลที่ใช้งานได้
 ToActivateModule=เพื่อเปิดใช้งานโมดูลไปในพื้นที่การติดตั้ง (หน้าแรก> Setup-> โมดูล)
 SessionTimeOut=หมดเวลาสำหรับเซสชั่น
 SessionExplanation=ตัวเลขนี้รับประกันว่าเซสชันจะไม่มีวันหมดอายุก่อนที่จะเกิดความล่าช้านี้ หากตัวล้างเซสชัน PHP ภายในดำเนินการด้วยตัวล้างเซสชัน PHP ภายใน (และไม่มีอะไรอื่นอีก) ตัวล้างเซสชัน PHP ภายในไม่รับประกันว่าเซสชันจะหมดอายุหลังจากความล่าช้านี้ มันจะหมดอายุหลังจากการหน่วงเวลานี้ และเมื่อมีการรันตัวล้างเซสชัน ดังนั้นทุก <b>%s/%s</b> การเข้าถึง แต่เฉพาะระหว่างการเข้าถึงที่ทำโดยเซสชันอื่น (หากค่าเป็น 0 หมายความว่าการล้างเซสชันทำได้โดยกระบวนการภายนอกเท่านั้น) .<br>หมายเหตุ: ในบางเซิร์ฟเวอร์ที่มีกลไกการล้างเซสชันภายนอก (cron ภายใต้ debian, ubuntu ...) เซสชันสามารถถูกทำลายได้หลังจากระยะเวลาที่กำหนดโดยการตั้งค่าภายนอก ไม่ว่าค่าที่ป้อนที่นี่จะเป็นเท่าใด
-SessionsPurgedByExternalSystem=เซสชันบนเซิร์ฟเวอร์นี้ดูเหมือนว่าจะได้รับการทำความสะอาดโดยกลไกภายนอก (cron ภายใต้ debian, ubuntu ...) อาจเป็นทุก <b>%s</span <span class='notranslate'></b> วินาที (= ค่าของพารามิเตอร์ <b>session.gc_maxlifetime</b>) ดังนั้นการเปลี่ยนค่าตรงนี้จึงไม่มีผลใดๆ คุณต้องขอให้ผู้ดูแลระบบเซิร์ฟเวอร์เปลี่ยนการหน่วงเวลาของเซสชัน
+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=มีจำหน่ายทริกเกอร์
 TriggersDesc=ทริกเกอร์คือไฟล์ที่จะปรับเปลี่ยนลักษณะการทำงานของเวิร์กโฟลว์ Dolibarr เมื่อคัดลอกลงในไดเรกทอรี <b>htdocs/core/triggers</b> พวกเขาตระหนักถึงการดำเนินการใหม่ๆ ที่เปิดใช้งานในเหตุการณ์ Dolibarr (การสร้างบริษัทใหม่ การตรวจสอบใบแจ้งหนี้ ...)
 TriggerDisabledByName=ทริกเกอร์ในแฟ้มนี้มีการปิดใช้งานโดยต่อท้าย <b>-NORUN</b> ในชื่อของพวกเขา
@@ -1971,7 +1972,7 @@ SomethingMakeInstallFromWebNotPossible=การติดตั้งโมด
 SomethingMakeInstallFromWebNotPossible2=ด้วยเหตุนี้ กระบวนการอัปเกรดที่อธิบายไว้ที่นี่จึงเป็นกระบวนการที่ต้องดำเนินการด้วยตนเองซึ่งผู้ใช้ที่มีสิทธิ์เท่านั้นที่สามารถทำได้
 InstallModuleFromWebHasBeenDisabledContactUs=ขณะนี้การติดตั้งหรือการพัฒนาโมดูลภายนอกหรือเว็บไซต์ไดนามิกจากแอปพลิเคชันถูกล็อคเพื่อความปลอดภัย โปรดติดต่อเราหากคุณต้องการเปิดใช้งานคุณสมบัตินี้
 InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ <strong>คุณต้องขอให้เขาลบไฟล์% s</strong> เพื่อให้คุณลักษณะนี้
-ConfFileMustContainCustom=การติดตั้งหรือสร้างโมดูลภายนอกจากแอปพลิเคชันจำเป็นต้องบันทึกไฟล์โมดูลลงในไดเร็กทอรี <strong>%s </strong>. หากต้องการให้ Dolibarr ประมวลผลไดเรกทอรีนี้ คุณต้องตั้งค่า <strong>conf/conf.php</strong> เพื่อเพิ่มบรรทัดคำสั่ง 2 บรรทัด: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><span คลาส ='notranslate'><br></span><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+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=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 HighlightLinesColor=เน้นสีของเส้นเมื่อเมาส์ผ่าน (ใช้ 'ffffff' เพื่อไม่เน้น)
 HighlightLinesChecked=ไฮไลต์สีของเส้นเมื่อตรวจสอบ (ใช้ 'ffffff' เพื่อไม่ให้ไฮไลต์)
@@ -2074,7 +2075,7 @@ TypeCdr=ใช้ "ไม่มี" หากวันที่ชำระเ
 BaseCurrency=สกุลเงินอ้างอิงของบริษัท (เข้าไปที่การตั้งค่าของบริษัทเพื่อเปลี่ยนแปลงสิ่งนี้)
 WarningNoteModuleInvoiceForFrenchLaw=โมดูลนี้ %s เป็นไปตามกฎหมายฝรั่งเศส (Loi Finance 2016)
 WarningNoteModulePOSForFrenchLaw=โมดูลนี้ %s เป็นไปตามกฎหมายฝรั่งเศส (Loi Finance 2016) เนื่องจากโมดูล Non Reversible Logs ถูกเปิดใช้งานโดยอัตโนมัติ
-WarningInstallationMayBecomeNotCompliantWithLaw=คุณกำลังพยายามติดตั้งโมดูล %s ที่เป็นโมดูลภายนอก การเปิดใช้งานโมดูลภายนอกหมายความว่าคุณเชื่อถือผู้เผยแพร่โมดูลนั้น และคุณแน่ใจว่าโมดูลนี้ไม่ส่งผลเสียต่อพฤติกรรมของแอปพลิเคชันของคุณ และเป็นไปตามกฎหมายในประเทศของคุณ (<span class='notranslate'>%s</ ช่วง >) หากโมดูลแนะนำคุณสมบัติที่ผิดกฎหมาย คุณจะต้องรับผิดชอบต่อการใช้ซอฟต์แวร์ที่ผิดกฎหมาย
+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=ขอบซ้ายบน PDF
 MAIN_PDF_MARGIN_RIGHT=ขอบขวาบน PDF
@@ -2262,7 +2263,7 @@ ModuleActivatedMayExposeInformation=ส่วนขยาย PHP นี้อา
 ModuleActivatedDoNotUseInProduction=เปิดใช้งานโมดูลที่ออกแบบมาเพื่อการพัฒนาแล้ว อย่าเปิดใช้งานในสภาพแวดล้อมการผลิต
 CombinationsSeparator=อักขระตัวคั่นสำหรับการรวมผลิตภัณฑ์
 SeeLinkToOnlineDocumentation=ดูตัวอย่างลิงก์ไปยังเอกสารออนไลน์ที่เมนูด้านบน
-SHOW_SUBPRODUCT_REF_IN_PDF=หากคุณลักษณะ "%s" ของโมดูล <b>%s<span class= มีการใช้ 'notranslate'></b></span> แสดงรายละเอียดผลิตภัณฑ์ย่อยของชุดอุปกรณ์ในรูปแบบ PDF
+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=ติดต่อธนาคารของคุณเพื่อรับรหัสนี้
 AdvancedModeOnly=การอนุญาตมีให้ในโหมดการอนุญาตขั้นสูงเท่านั้น
 ConfFileIsReadableOrWritableByAnyUsers=ไฟล์ conf สามารถอ่านหรือเขียนได้โดยผู้ใช้ ให้สิทธิ์แก่ผู้ใช้เว็บเซิร์ฟเวอร์และกลุ่มเท่านั้น
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index c5f73c56b03..1992a2766a1 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -93,6 +93,9 @@ CodePaymentMode=วิธีการชำระเงิน (รหัส)
 LabelPaymentMode=วิธีการชำระเงิน (ฉลาก)
 PaymentModeShort=วิธีการชำระเงิน
 PaymentTerm=เงื่อนไขการชำระเงิน
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=เงื่อนไขการชำระเงิน
 PaymentConditionsShort=เงื่อนไขการชำระเงิน
 PaymentAmount=จำนวนเงินที่ชำระ
@@ -185,7 +188,7 @@ SuppliersDraftInvoices=ใบแจ้งหนี้ฉบับร่างข
 Unpaid=ยังไม่ได้ชำระ
 ErrorNoPaymentDefined=เกิดข้อผิดพลาด ไม่ได้กำหนดการชำระเงิน
 ConfirmDeleteBill=คุณแน่ใจหรือไม่ว่าต้องการลบใบแจ้งหนี้นี้
-ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
+ConfirmValidateBill=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบใบแจ้งหนี้นี้โดยมีข้อมูลอ้างอิง <b>%s</b>?
 ConfirmUnvalidateBill=คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนใบแจ้งหนี้ <b>%s</b> เป็นสถานะฉบับร่าง ?
 ConfirmClassifyPaidBill=คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนใบแจ้งหนี้ <b>%s</b> เป็นสถานะชำระแล้ว ?
 ConfirmCancelBill=คุณแน่ใจหรือไม่ว่าต้องการยกเลิกใบแจ้งหนี้ <b>%s</b>
@@ -214,10 +217,10 @@ ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>ซัพพลายเอ
 ConfirmClassifyAbandonReasonOther=อื่น ๆ
 ConfirmClassifyAbandonReasonOtherDesc=ทางเลือกนี้จะถูกนำมาใช้ในกรณีอื่น ๆ ตัวอย่างเช่นเพราะคุณวางแผนที่จะสร้างใบแจ้งหนี้แทน
 ConfirmCustomerPayment=คุณยืนยันข้อมูลการชำระเงินนี้สำหรับ <b>%s</b> %s?
-ConfirmSupplierPayment=คุณยืนยันข้อมูลการชำระเงินนี้สำหรับ <b>%s</b> <span class= หรือไม่ 'notranslate'>%s</span>?
+ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
 ConfirmValidatePayment=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบการชำระเงินนี้ ไม่สามารถเปลี่ยนแปลงได้เมื่อการชำระเงินได้รับการยืนยันแล้ว
 ValidateBill=ตรวจสอบใบแจ้งหนี้
-UnvalidateBill=Invalidate invoice
+UnvalidateBill=ใบแจ้งหนี้ไม่ถูกต้อง
 NumberOfBills=จำนวนใบแจ้งหนี้
 NumberOfBillsByMonth=จำนวนใบแจ้งหนี้ต่อเดือน
 AmountOfBills=จำนวนเงินของใบแจ้งหนี้
@@ -252,7 +255,7 @@ RemainderToPayBack=ยอดเงินคงเหลือเพื่อข
 RemainderToPayBackMulticurrency=จำนวนเงินคงเหลือที่จะคืนเงินเป็นสกุลเงินเดิม
 NegativeIfExcessReceived=ลบหากได้รับส่วนเกิน
 NegativeIfExcessRefunded=ค่าลบหากคืนเงินส่วนเกิน
-NegativeIfExcessPaid=negative if excess paid
+NegativeIfExcessPaid=ติดลบหากจ่ายเกิน
 Rest=ที่รอดำเนินการ
 AmountExpected=จำนวนเงินที่อ้างว่า
 ExcessReceived=ส่วนเกินที่ได้รับ
@@ -268,6 +271,8 @@ NoDraftBills=ไม่มีใบแจ้งหนี้ร่าง
 NoOtherDraftBills=ไม่มีใบแจ้งหนี้ร่างอื่น ๆ
 NoDraftInvoices=ไม่มีใบแจ้งหนี้ร่าง
 RefBill=อ้างอิงใบแจ้งหนี้
+RefSupplierBill=Supplier invoice ref
+SupplierOrderCreateBill=Create invoice
 ToBill=เพื่อเรียกเก็บเงิน
 RemainderToBill=เพื่อเรียกเก็บเงินส่วนที่เหลือ
 SendBillByMail=ส่งใบแจ้งหนี้ทางอีเมล
@@ -352,6 +357,7 @@ HelpAbandonOther=จำนวนเงินนี้ถูกยกเลิก
 IdSocialContribution=สังคม / รหัสชำระภาษีการคลัง
 PaymentId=รหัสการชำระเงิน
 PaymentRef=การอ้างอิงการชำระเงิน
+SourceInvoiceId=Source invoice id
 InvoiceId=รหัสใบแจ้งหนี้
 InvoiceRef=อ้างอิงใบแจ้งหนี้
 InvoiceDateCreation=วันที่สร้างใบแจ้งหนี้
@@ -562,10 +568,10 @@ YouMustCreateStandardInvoiceFirstDesc=คุณต้องสร้างใบ
 PDFCrabeDescription=เทมเพลต PDF ใบแจ้งหนี้ Crabe เทมเพลตใบแจ้งหนี้ที่สมบูรณ์ (การใช้เทมเพลต Sponge แบบเก่า)
 PDFSpongeDescription=เทมเพลตใบแจ้งหนี้ PDF ฟองน้ำ เทมเพลตใบแจ้งหนี้ที่สมบูรณ์
 PDFCrevetteDescription=เทมเพลตใบแจ้งหนี้ PDF Crevette เทมเพลตใบแจ้งหนี้ที่สมบูรณ์สำหรับใบแจ้งหนี้ตามสถานการณ์
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential 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 sequential 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 สำหรับใบลดหนี้ โดยที่ yy คือปี mm คือเดือน และ nnnn เป็นลำดับอัตโนมัติ จำนวนที่เพิ่มขึ้นโดยไม่มีการหยุดพักและไม่มีการกลับเป็น 0
 TerreNumRefModelError=มีบิลที่ขึ้นต้นด้วย $syymm อยู่แล้ว และไม่รองรับกับโมเดลลำดับนี้ ลบออกหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential 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 #####
@@ -646,4 +652,4 @@ Salaries=เงินเดือน
 InvoiceSubtype=ประเภทย่อยของใบแจ้งหนี้
 SalaryInvoice=เงินเดือน
 BillsAndSalaries=ตั๋วเงินและเงินเดือน
-CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
+CreateCreditNoteWhenClientInvoiceExists=ตัวเลือกนี้จะเปิดใช้งานเฉพาะเมื่อมีใบแจ้งหนี้ที่ได้รับการตรวจสอบแล้วสำหรับลูกค้าหรือเมื่อมีการใช้ INVOICE_CREDIT_NOTE_STANDALONE คงที่เท่านั้น (มีประโยชน์สำหรับบางประเทศ)
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 409e6aa9c9a..faa17049e99 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -97,7 +97,7 @@ ReceiptPrinterMethodDescription=วิธีการอันทรงพลั
 ByTerminal=โดยเทอร์มินัล
 TakeposNumpadUsePaymentIcon=ใช้ไอคอนแทนข้อความบนปุ่มชำระเงินของ numpad
 CashDeskRefNumberingModules=โมดูลการกำหนดหมายเลขสำหรับการขาย POS
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b><span class='notranslate'></b></span span> ใช้แท็กเพื่อเพิ่มหมายเลขเทอร์มินัล
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Merge lines of the same products
 StartAParallelSale=เริ่มการขายแบบคู่ขนานใหม่
 SaleStartedAt=เริ่มขายที่ %s
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 313b19d01e0..863aa2c4920 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -96,7 +96,7 @@ ErrorPasswordsMustMatch=ทั้งสองพิมพ์รหัสผ่
 ErrorContactEMail=เกิดข้อผิดพลาดทางเทคนิค โปรดติดต่อผู้ดูแลระบบเพื่อติดตามอีเมล <b>%s</b> และระบุข้อผิดพลาด รหัส <b>%s</b> ในข้อความของคุณ หรือเพิ่มสำเนาหน้าจอของ หน้านี้.
 ErrorWrongValueForField=ฟิลด์ <b>%s</b>: ' <b>%s</b>' ไม่ตรงกับกฎ regex <b> %s</b>
 ErrorHtmlInjectionForField=ฟิลด์ <b>%s</b>: ค่า '<b>%s</b>' มีข้อมูลที่เป็นอันตรายซึ่งไม่ได้รับอนุญาต
-ErrorFieldValueNotIn=ฟิลด์ <b>%s</b>: ' <b>%s</b>' ไม่ใช่ค่าที่พบในฟิลด์ <b></ span span><span class='notranslate'>%s</b> ของ <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=ฟิลด์ <b>%s</b>: ' <b>%s</b>' ไม่ใช่ <b>%s</b> การอ้างอิงที่มีอยู่
 ErrorMultipleRecordFoundFromRef=พบหลายบันทึกเมื่อค้นหาจากการอ้างอิง <b>%s</b> ไม่มีทางรู้ว่าจะใช้ ID ใด
 ErrorsOnXLines=พบข้อผิดพลาด %s
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index 9733c543153..52750e65642 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -94,7 +94,7 @@ NbOfLinesOK=<b>จำนวนเส้นที่มีข้อผิดพ
 NbOfLinesImported=<b>จำนวนของเส้นที่นำเข้ามาประสบความสำเร็จ:%</b> s
 DataComeFromNoWhere=คุ้มค่าที่จะแทรกมาจากที่ไหนเลยในแฟ้มแหล่งที่มา
 DataComeFromFileFieldNb=ค่าที่จะแทรกมาจากคอลัมน์ <b>%s</b> ในไฟล์ต้นฉบับ
-DataComeFromIdFoundFromRef=ค่าที่มาจากไฟล์ต้นฉบับจะถูกใช้เพื่อค้นหารหัสของออบเจ็กต์หลักที่จะใช้ (ดังนั้นออบเจ็กต์ <b>%s</span <span class='notranslate'></b> ที่มีการอ้างอิงจากไฟล์ต้นฉบับต้องมีอยู่ในฐานข้อมูล)
+DataComeFromIdFoundFromRef=The value that comes from the 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=ค่าของโค้ดที่มาจากไฟล์ต้นฉบับจะถูกใช้เพื่อค้นหา ID ของออบเจ็กต์พาเรนต์ที่จะใช้ (ดังนั้นโค้ดจากไฟล์ต้นฉบับจะต้องมีอยู่ในพจนานุกรม <b>%s</b>) โปรดทราบว่าหากคุณทราบรหัส คุณจะสามารถใช้รหัสดังกล่าวในไฟล์ต้นฉบับแทนโค้ดได้ การนำเข้าควรใช้งานได้ทั้งสองกรณี
 DataIsInsertedInto=ข้อมูลที่มาจากแฟ้มแหล่งที่มาจะถูกแทรกเข้าไปในสนามต่อไปนี้:
 DataIDSourceIsInsertedInto=รหัสของออบเจ็กต์หลักซึ่งพบโดยใช้ข้อมูลในไฟล์ต้นฉบับจะถูกแทรกลงในฟิลด์ต่อไปนี้:
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 041c1efd3b1..aa806f19c02 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -8,7 +8,7 @@ ConfFileIsNotWritable=ไฟล์การกำหนดค่า <b>%s</b>ไ
 ConfFileIsWritable=ไฟล์การกำหนดค่า <b>%s</b>สามารถเขียนได้
 ConfFileMustBeAFileNotADir=ไฟล์การกำหนดค่า <b>%s</b>ต้องเป็นไฟล์ ไม่ใช่ไดเร็กทอรี
 ConfFileReload=กำลังโหลดพารามิเตอร์อีกครั้งจากไฟล์การกำหนดค่า
-NoReadableConfFileSoStartInstall=The configuration file <b>conf/conf.php</b> does not exists or is not readable. We will run the installation process to try to initialize it.
+NoReadableConfFileSoStartInstall=ไฟล์การกำหนดค่า <b>conf/conf.php</b> ไม่มีอยู่หรือไม่สามารถอ่านได้ เราจะรันกระบวนการติดตั้งเพื่อพยายามเริ่มต้นใช้งาน
 PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
 PHPSupportPOSTGETKo=เป็นไปได้ว่าการตั้งค่า PHP ของคุณไม่รองรับตัวแปร POST และ/หรือ GET ตรวจสอบพารามิเตอร์ <b>variables_order</b> ใน php.ini
 PHPSupportSessions=PHP นี้รองรับเซสชัน
@@ -24,11 +24,11 @@ ErrorWrongValueForParameter=คุณอาจจะพิมพ์ค่าท
 ErrorFailedToCreateDatabase=ไม่สามารถสร้างฐานข้อมูล '%s'
 ErrorFailedToConnectToDatabase=ไม่สามารถเชื่อมต่อกับฐานข้อมูล '%s'
 ErrorDatabaseVersionTooLow=เวอร์ชั่นฐานข้อมูล (%s) เก่าเกินไป ต้องใช้เวอร์ชั่น %s หรือสูงกว่า
-ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
-ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorPHPVersionTooLow=PHP เวอร์ชันเก่าเกินไป ต้องมีเวอร์ชัน %s หรือสูงกว่า
+ErrorPHPVersionTooHigh=เวอร์ชัน PHP สูงเกินไป ต้องมีเวอร์ชัน %s หรือต่ำกว่า
 ErrorConnectedButDatabaseNotFound=การเชื่อมต่อกับเซิร์ฟเวอร์สำเร็จ แต่ไม่พบฐานข้อมูล '%s'
 ErrorDatabaseAlreadyExists=ฐานข้อมูล '%s' อยู่แล้ว
-ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+ErrorNoMigrationFilesFoundForParameters=ไม่พบไฟล์การย้ายข้อมูลสำหรับเวอร์ชันที่เลือก
 IfDatabaseNotExistsGoBackAndUncheckCreate=หากไม่มีฐานข้อมูล ให้ย้อนกลับและเลือกตัวเลือก "สร้างฐานข้อมูล"
 IfDatabaseExistsGoBackAndCheckCreate=ถ้าฐานข้อมูลที่มีอยู่แล้วให้กลับไปและยกเลิก "สร้างฐานข้อมูลตัวเลือก"
 WarningBrowserTooOld=เวอร์ชันของเบราว์เซอร์เก่าเกินไป ขอแนะนำให้อัปเกรดเบราว์เซอร์ของคุณเป็น Firefox, Chrome หรือ Opera เวอร์ชันล่าสุด
@@ -48,19 +48,18 @@ ServerAddressDescription=ชื่อหรือที่อยู่ IP สำ
 ServerPortDescription=ฐานข้อมูลเซิร์ฟเวอร์พอร์ต ให้ค่าว่าง ถ้าไม่รู้
 DatabaseServer=เซิร์ฟเวอร์ฐานข้อมูล
 DatabaseName=ชื่อฐานข้อมูล
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
+DatabasePrefix=คำนำหน้าตารางฐานข้อมูล
+DatabasePrefixDescription=คำนำหน้าตารางฐานข้อมูล หากว่างเปล่า จะมีค่าเริ่มต้นเป็น llx_
+AdminLogin=บัญชีผู้ใช้สำหรับเจ้าของฐานข้อมูล Dolibarr
 AdminPassword=รหัสผ่านสำหรับเจ้าของฐานข้อมูล Dolibarr
 CreateDatabase=สร้างฐานข้อมูล
-CreateUser=Create user account or grant user account permission on the Dolibarr database
+CreateUser=สร้างบัญชีผู้ใช้หรือให้สิทธิ์บัญชีผู้ใช้ในฐานข้อมูล Dolibarr
 DatabaseSuperUserAccess=เซิร์ฟเวอร์ฐานข้อมูล - การเข้าถึง Superuser
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateDatabase=ทำเครื่องหมายที่ช่องหากยังไม่มีฐานข้อมูลและจำเป็นต้องสร้าง<br>ในกรณีนี้ คุณต้องกรอกชื่อผู้ใช้และรหัสผ่านสำหรับบัญชี superuser ที่ด้านล่าง ของหน้านี้
 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
+DatabaseRootLoginDescription=ชื่อบัญชี Superuser (เพื่อสร้างฐานข้อมูลใหม่หรือผู้ใช้ใหม่) จำเป็นหากฐานข้อมูลหรือเจ้าของไม่มีอยู่แล้ว
+KeepEmptyIfNoPassword=เว้นว่างไว้หาก superuser ไม่มีรหัสผ่าน (ไม่แนะนำ)
+SaveConfigurationFile=กำลังบันทึกพารามิเตอร์ไปที่
 ServerConnection=การเชื่อมต่อเซิร์ฟเวอร์
 DatabaseCreation=การสร้างฐานข้อมูล
 CreateDatabaseObjects=ฐานข้อมูลการสร้างวัตถุ
@@ -71,83 +70,83 @@ CreateOtherKeysForTable=สร้างปุ่มต่างประเท
 OtherKeysCreation=คีย์ต่างประเทศและการสร้างดัชนี
 FunctionsCreation=ฟังก์ชั่นการสร้าง
 AdminAccountCreation=ผู้ดูแลระบบเข้าสู่ระบบการสร้าง
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
+PleaseTypePassword=กรุณาพิมพ์รหัสผ่าน ไม่อนุญาตให้ใช้รหัสผ่านที่ว่างเปล่า!
+PleaseTypeALogin=กรุณาพิมพ์เข้าสู่ระบบ!
+PasswordsMismatch=รหัสผ่านแตกต่างออกไป โปรดลองอีกครั้ง!
 SetupEnd=ในตอนท้ายของการตั้งค่า
 SystemIsInstalled=การติดตั้งนี้เสร็จสมบูรณ์
 SystemIsUpgraded=Dolibarr ได้รับการอัพเกรดที่ประสบความสำเร็จ
 YouNeedToPersonalizeSetup=คุณต้องกำหนดค่า Dolibarr เพื่อให้เหมาะกับความต้องการของคุณ (ลักษณะคุณสมบัติ, ... ) การทำเช่นนี้โปรดทำตามลิงค์ด้านล่าง:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+AdminLoginCreatedSuccessfuly=สร้างการเข้าสู่ระบบผู้ดูแลระบบ Dolibarr '<b>%s</b>' สำเร็จแล้ว
 GoToDolibarr=ไปที่ Dolibarr
 GoToSetupArea=ไปที่ Dolibarr (พื้นที่ติดตั้ง)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+MigrationNotFinished=เวอร์ชันฐานข้อมูลไม่ทันสมัยอย่างสมบูรณ์: รันกระบวนการอัปเกรดอีกครั้ง
 GoToUpgradePage=ไปที่หน้าอัพเกรดอีกครั้ง
 WithNoSlashAtTheEnd=โดยไม่ต้องเฉือน "/" ในตอนท้าย
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation=<span class="warning">สำคัญ</span>: คุณต้องใช้ไดเรกทอรีที่อยู่นอกหน้าเว็บ (ดังนั้นอย่าใช้ไดเรกทอรีย่อยของพารามิเตอร์ก่อนหน้า ).
 LoginAlreadyExists=ที่มีอยู่แล้ว
 DolibarrAdminLogin=ผู้ดูแลระบบเข้าสู่ระบบ Dolibarr
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-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
+AdminLoginAlreadyExists=บัญชีผู้ดูแลระบบ Dolibarr '<b>%s</b>' มีอยู่แล้ว ย้อนกลับหากคุณต้องการสร้างรายการอื่น
+FailedToCreateAdminLogin=ไม่สามารถสร้างบัญชีผู้ดูแลระบบ Dolibarr
+WarningRemoveInstallDir=คำเตือน ด้วยเหตุผลด้านความปลอดภัย เมื่อกระบวนการติดตั้งเสร็จสมบูรณ์ คุณต้องเพิ่มไฟล์ชื่อ <b>install.lock</b> ลงใน ไดเร็กทอรีเอกสาร Dolibarr เพื่อป้องกันการใช้เครื่องมือติดตั้งอีกครั้งโดยไม่ตั้งใจ/เป็นอันตราย
+FunctionNotAvailableInThisPHP=ไม่มีใน PHP นี้
 ChoosedMigrateScript=เลือกสคริปต์การย้ายถิ่น
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+DataMigration=การย้ายฐานข้อมูล (ข้อมูล)
+DatabaseMigration=การย้ายฐานข้อมูล (โครงสร้าง + ข้อมูลบางส่วน)
 ProcessMigrateScript=การประมวลผลสคริปต์
 ChooseYourSetupMode=เลือกโหมดการตั้งค่าของคุณและคลิกที่ "เริ่มต้น" ...
 FreshInstall=ติดตั้งใหม่
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
+FreshInstallDesc=ใช้โหมดนี้หากเป็นการติดตั้งครั้งแรกของคุณ ถ้าไม่ โหมดนี้สามารถซ่อมแซมการติดตั้งก่อนหน้านี้ที่ไม่สมบูรณ์ได้ หากคุณต้องการอัปเกรดเวอร์ชันของคุณ ให้เลือกโหมด "อัปเกรด"
 Upgrade=อัพเกรด
 UpgradeDesc=ใช้โหมดนี้ถ้าคุณได้เปลี่ยนไฟล์ Dolibarr กับไฟล์จากเวอร์ชันที่ใหม่กว่า นี้จะอัพเกรดฐานข้อมูลและข้อมูลของคุณ
 Start=เริ่มต้น
 InstallNotAllowed=ติดตั้งไม่ได้รับอนุญาตตามสิทธิ์ <b>conf.php</b>
 YouMustCreateWithPermission=คุณต้องสร้างแฟ้ม% s และกำหนดสิทธิ์ในการเขียนเกี่ยวกับมันสำหรับเว็บเซิร์ฟเวอร์ในระหว่างขั้นตอนการติดตั้ง
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+CorrectProblemAndReloadPage=โปรดแก้ไขปัญหาแล้วกด F5 เพื่อโหลดหน้าซ้ำ
 AlreadyDone=อพยพแล้ว
 DatabaseVersion=รุ่นฐานข้อมูล
 ServerVersion=เซิร์ฟเวอร์ฐานข้อมูลรุ่น
 YouMustCreateItAndAllowServerToWrite=คุณต้องสร้างไดเรกทอรีนี้และอนุญาตให้เว็บเซิร์ฟเวอร์ที่จะเขียนลงไป
 DBSortingCollation=เรียงลำดับตัวอักษร
 YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+YouAskLoginCreationSoDolibarrNeedToConnect=คุณเลือกสร้างผู้ใช้ฐานข้อมูล <b>%s</b> แต่สำหรับสิ่งนี้ Dolibarr จำเป็นต้องเชื่อมต่อกับเซิร์ฟเวอร์ <b>%s</b> ด้วยผู้ใช้ระดับสูง <b>%s</b> สิทธิ์
+BecauseConnectionFailedParametersMayBeWrong=การเชื่อมต่อฐานข้อมูลล้มเหลว: โฮสต์หรือพารามิเตอร์ผู้ใช้ขั้นสูงต้องผิด
 OrphelinsPaymentsDetectedByMethod=การชำระเงินเด็กกำพร้าที่ตรวจพบโดยวิธี% s
 RemoveItManuallyAndPressF5ToContinue=ลบออกด้วยตนเองและกด F5 เพื่อดำเนินการต่อไป
 FieldRenamed=เปลี่ยนชื่อสนาม
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
+IfLoginDoesNotExistsCheckCreateUser=หากยังไม่มีผู้ใช้ คุณต้องกาเครื่องหมายที่ตัวเลือก "สร้างผู้ใช้"
+ErrorConnection=เซิร์ฟเวอร์ "<b>%s</b>" ชื่อฐานข้อมูล "<b>%s</b>", เข้าสู่ระบบ "<b> span>%s</b>" หรือรหัสผ่านฐานข้อมูลอาจผิดหรือเวอร์ชันไคลเอ็นต์ PHP อาจเก่าเกินไปเมื่อเทียบกับเวอร์ชันฐานข้อมูล .
 InstallChoiceRecommanded=<b>ทางเลือกที่แนะนำในการติดตั้งเวอร์ชั่น% s จากรุ่นปัจจุบันของคุณ% s</b>
 InstallChoiceSuggested=<b>ติดตั้งทางเลือกที่แนะนำโดยการติดตั้ง</b>
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
+MigrateIsDoneStepByStep=เวอร์ชันเป้าหมาย (%s) มีช่องว่างหลายเวอร์ชัน วิซาร์ดการติดตั้งจะกลับมาเพื่อแนะนำการย้ายข้อมูลเพิ่มเติมเมื่อการดำเนินการนี้เสร็จสมบูรณ์
+CheckThatDatabasenameIsCorrect=ตรวจสอบว่าชื่อฐานข้อมูล "<b>%s</b>" ถูกต้อง
 IfAlreadyExistsCheckOption=ถ้าชื่อนี้ถูกต้องและฐานข้อมูลที่ยังไม่ปรากฏอยู่คุณต้องตรวจสอบตัวเลือก "สร้างฐานข้อมูล"
 OpenBaseDir=PHP openbasedir พารามิเตอร์
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+YouAskToCreateDatabaseSoRootRequired=คุณทำเครื่องหมายที่ช่อง "สร้างฐานข้อมูล" ในการดำเนินการนี้ คุณจะต้องระบุข้อมูลเข้าสู่ระบบ/รหัสผ่านของ superuser (ด้านล่างของแบบฟอร์ม)
+YouAskToCreateDatabaseUserSoRootRequired=คุณทำเครื่องหมายในช่อง "สร้างเจ้าของฐานข้อมูล" ในการดำเนินการนี้ คุณจะต้องระบุข้อมูลเข้าสู่ระบบ/รหัสผ่านของ superuser (ด้านล่างของแบบฟอร์ม)
+NextStepMightLastALongTime=ขั้นตอนปัจจุบันอาจใช้เวลาหลายนาที โปรดรอจนกระทั่งหน้าจอถัดไปแสดงโดยสมบูรณ์ก่อนดำเนินการต่อ
+MigrationCustomerOrderShipping=ย้ายข้อมูลการจัดส่งสำหรับการจัดเก็บใบสั่งขาย
 MigrationShippingDelivery=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง
 MigrationShippingDelivery2=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง 2
 MigrationFinished=การโยกย้ายเสร็จ
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc=<strong>ขั้นตอนสุดท้าย</strong>: กำหนดข้อมูลเข้าสู่ระบบและรหัสผ่านที่คุณต้องการใช้เชื่อมต่อกับ Dolibarr ที่นี่ <b>อย่าสูญเสียสิ่งนี้ เนื่องจากเป็นบัญชีหลักในการดูแลบัญชีผู้ใช้อื่นๆ/เพิ่มเติมทั้งหมด</b>
 ActivateModule=เปิดใช้งานโมดูล% s
 ShowEditTechnicalParameters=คลิกที่นี่เพื่อแสดง / แก้ไขพารามิเตอร์ขั้นสูง (โหมดผู้เชี่ยวชาญ)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-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
+WarningUpgrade=คำเตือน:\nคุณได้ทำการสำรองฐานข้อมูลก่อนหรือไม่?\nขอแนะนำอย่างยิ่ง ข้อมูลสูญหาย (เนื่องจากข้อบกพร่องต่างๆ ใน mysql เวอร์ชัน 5.5.40/41/42/43) อาจเกิดขึ้นได้ในระหว่างกระบวนการนี้ ดังนั้นจึงจำเป็นอย่างยิ่งที่จะต้องดัมพ์ฐานข้อมูลของคุณให้สมบูรณ์ก่อนที่จะเริ่มการย้ายข้อมูลใดๆ\n\nคลิกตกลงเพื่อเริ่มกระบวนการย้าย...
+ErrorDatabaseVersionForbiddenForMigration=เวอร์ชันฐานข้อมูลของคุณคือ %s มีจุดบกพร่องร้ายแรง ซึ่งทำให้ข้อมูลสูญหายได้หากคุณทำการเปลี่ยนแปลงโครงสร้างในฐานข้อมูล เช่น จำเป็นต่อกระบวนการย้าย ด้วยเหตุผลของเขา การโยกย้ายจะไม่ได้รับอนุญาตจนกว่าคุณจะอัปเกรดฐานข้อมูลของคุณเป็นเวอร์ชันเลเยอร์ (แพตช์) (รายการเวอร์ชัน buggy ที่รู้จัก: %s)
+KeepDefaultValuesWamp=คุณใช้วิซาร์ดการตั้งค่า Dolibarr จาก DoliWamp ดังนั้นค่าที่เสนอที่นี่จึงได้รับการปรับให้เหมาะสมแล้ว เปลี่ยนมันเฉพาะเมื่อคุณรู้ว่าคุณกำลังทำอะไรอยู่
+KeepDefaultValuesDeb=คุณใช้วิซาร์ดการตั้งค่า Dolibarr จากแพ็คเกจ Linux (Ubuntu, Debian, Fedora...) ดังนั้นค่าที่เสนอที่นี่จึงได้รับการปรับปรุงให้เหมาะสมแล้ว ต้องป้อนรหัสผ่านของเจ้าของฐานข้อมูลที่จะสร้างเท่านั้น เปลี่ยนพารามิเตอร์อื่นๆ เฉพาะเมื่อคุณรู้ว่าคุณกำลังทำอะไรอยู่
+KeepDefaultValuesMamp=คุณใช้วิซาร์ดการตั้งค่า Dolibarr จาก DoliMamp ดังนั้นค่าที่เสนอที่นี่จึงได้รับการปรับให้เหมาะสมแล้ว เปลี่ยนมันเฉพาะเมื่อคุณรู้ว่าคุณกำลังทำอะไรอยู่
+KeepDefaultValuesProxmox=คุณใช้วิซาร์ดการตั้งค่า Dolibarr จากอุปกรณ์เสมือน Proxmox ดังนั้นค่าที่เสนอที่นี่จึงได้รับการปรับให้เหมาะสมแล้ว เปลี่ยนมันเฉพาะเมื่อคุณรู้ว่าคุณกำลังทำอะไรอยู่
+UpgradeExternalModule=รันกระบวนการอัพเกรดเฉพาะของโมดูลภายนอก
+SetAtLeastOneOptionAsUrlParameter=ตั้งค่าอย่างน้อยหนึ่งตัวเลือกเป็นพารามิเตอร์ใน URL ตัวอย่างเช่น: '...repair.php?standard=confirmed'
+NothingToDelete=ไม่มีอะไรที่จะล้าง/ลบ
+NothingToDo=ไม่มีอะไรทำ
 #########
 # upgrade
 MigrationFixData=แก้ไขข้อมูล denormalized
 MigrationOrder=การโยกย้ายข้อมูลสำหรับการสั่งซื้อของลูกค้า
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=การย้ายข้อมูลสำหรับคำสั่งซื้อของผู้ขาย
 MigrationProposal=การโยกย้ายข้อมูลสำหรับข้อเสนอในเชิงพาณิชย์
 MigrationInvoice=การโยกย้ายข้อมูลสำหรับใบแจ้งหนี้ของลูกค้า
 MigrationContract=การโยกย้ายข้อมูลในการทำสัญญา
@@ -163,9 +162,9 @@ MigrationContractsUpdate=สัญญาแก้ไขข้อมูล
 MigrationContractsNumberToUpdate=สัญญา% s (s) เพื่อปรับปรุง
 MigrationContractsLineCreation=สร้างสายสัญญาสำหรับการอ้างอิงสัญญา% s
 MigrationContractsNothingToUpdate=ไม่มีสิ่งที่ต้องทำ
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsFieldDontExist=ไม่มีฟิลด์ fk_facture อีกต่อไป ไม่มีอะไรทำ.
 MigrationContractsEmptyDatesUpdate=การแก้ไขสัญญาวันที่ว่างเปล่า
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=แก้ไขวันที่ว่างของสัญญาสำเร็จแล้ว
 MigrationContractsEmptyDatesNothingToUpdate=ไม่มีวันที่ทำสัญญาที่ว่างเปล่าที่จะแก้ไข
 MigrationContractsEmptyCreationDatesNothingToUpdate=วันที่สร้างสัญญายังไม่ได้แก้ไข
 MigrationContractsInvalidDatesUpdate=วันที่คิดมูลค่าการแก้ไขสัญญาที่ไม่ดี
@@ -173,13 +172,13 @@ MigrationContractsInvalidDateFix=สัญญาที่ถูกต้อง%
 MigrationContractsInvalidDatesNumber=สัญญา% s การแก้ไข
 MigrationContractsInvalidDatesNothingToUpdate=ไม่มีวันที่มีมูลค่าที่ดีที่จะแก้ไข
 MigrationContractsIncoherentCreationDateUpdate=การสร้างมูลค่าสัญญาที่ไม่ดีแก้ไขวันที่
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateUpdateSuccess=แก้ไขวันที่สร้างสัญญามูลค่าไม่ถูกต้องสำเร็จแล้ว
 MigrationContractsIncoherentCreationDateNothingToUpdate=ไม่มีค่าที่ไม่ดีสำหรับวันที่สร้างสัญญาที่จะแก้ไข
 MigrationReopeningContracts=สัญญาเปิดปิดโดยข้อผิดพลาด
 MigrationReopenThisContract=เปิดสัญญา% s
 MigrationReopenedContractsNumber=สัญญา% s การแก้ไข
 MigrationReopeningContractsNothingToUpdate=ไม่มีการทำสัญญาในการเปิดปิด
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=อัปเดตลิงก์ระหว่างรายการธนาคารและการโอนเงินผ่านธนาคาร
 MigrationBankTransfertsNothingToUpdate=การเชื่อมโยงทั้งหมดมีถึงวันที่
 MigrationShipmentOrderMatching=อัปเดตได้รับตอบรับ
 MigrationDeliveryOrderMatching=การปรับปรุงการจัดส่งใบเสร็จรับเงิน
@@ -187,29 +186,34 @@ MigrationDeliveryDetail=การปรับปรุงการจัดส
 MigrationStockDetail=อัพเดตค่าหุ้นของผลิตภัณฑ์
 MigrationMenusDetail=ปรับปรุงตารางเมนูแบบไดนามิก
 MigrationDeliveryAddress=ที่อยู่จัดส่งการปรับปรุงในการจัดส่ง
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectTaskActors=การย้ายข้อมูลสำหรับตาราง llx_projet_task_actors
 MigrationProjectUserResp=เขตการโยกย้ายข้อมูล fk_user_resp ของ llx_projet เพื่อ llx_element_contact
 MigrationProjectTaskTime=เวลาการปรับปรุงการใช้จ่ายในไม่กี่วินาที
 MigrationActioncommElement=ปรับปรุงข้อมูลเกี่ยวกับการกระทำ
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=การย้ายข้อมูลสำหรับประเภทการชำระเงิน
 MigrationCategorieAssociation=การย้ายถิ่นของประเภท
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
-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
+MigrationEvents=การย้ายข้อมูลกิจกรรมเพื่อเพิ่มเจ้าของกิจกรรมลงในตารางการมอบหมาย
+MigrationEventsContact=การย้ายข้อมูลเหตุการณ์เพื่อเพิ่มผู้ติดต่อเหตุการณ์ลงในตารางการมอบหมาย
+MigrationRemiseEntity=อัปเดตค่าฟิลด์เอนทิตีของ llx_societe_remise
+MigrationRemiseExceptEntity=อัปเดตค่าฟิลด์เอนทิตีของ llx_societe_remise_ยกเว้น
+MigrationUserRightsEntity=อัปเดตค่าฟิลด์เอนทิตีของ llx_user_rights
+MigrationUserGroupRightsEntity=อัปเดตค่าฟิลด์เอนทิตีของ llx_usergroup_rights
+MigrationUserPhotoPath=การย้ายเส้นทางภาพถ่ายสำหรับผู้ใช้
+MigrationFieldsSocialNetworks=การย้ายข้อมูลผู้ใช้ในเครือข่ายโซเชียล (%s)
+MigrationReloadModule=โหลดโมดูล %s
+MigrationResetBlockedLog=รีเซ็ตโมดูล BlockedLog สำหรับอัลกอริทึม v7
+MigrationImportOrExportProfiles=การย้ายข้อมูลโปรไฟล์นำเข้าหรือส่งออก (%s)
+ShowNotAvailableOptions=แสดงตัวเลือกที่ไม่พร้อมใช้งาน
+HideNotAvailableOptions=ซ่อนตัวเลือกที่ไม่พร้อมใช้งาน
+ErrorFoundDuringMigration=มีการรายงานข้อผิดพลาดในระหว่างกระบวนการย้ายข้อมูล ดังนั้นจึงไม่สามารถดำเนินการขั้นตอนต่อไปได้ หากต้องการเพิกเฉยต่อข้อผิดพลาด คุณสามารถ <a href="%s">คลิกที่นี่</a> แต่แอปพลิเคชันหรือคุณลักษณะบางอย่างอาจทำงานไม่ถูกต้องจนกว่าข้อผิดพลาดจะได้รับการแก้ไข .
+YouTryInstallDisabledByDirLock=แอปพลิเคชันพยายามอัปเกรดด้วยตนเอง แต่หน้าการติดตั้ง/อัปเกรดถูกปิดใช้งานเพื่อความปลอดภัย (ไดเร็กทอรีเปลี่ยนชื่อเป็น .lock ต่อท้าย)<br>
+YouTryInstallDisabledByFileLock=แอปพลิเคชันพยายามอัปเกรดด้วยตนเอง แต่หน้าการติดตั้ง/อัปเกรดถูกปิดใช้งานเพื่อความปลอดภัย (เนื่องจากมีไฟล์ล็อค <strong>install.lock</strong> ในไดเรกทอรีเอกสาร dolibarr)<br>
+YouTryUpgradeDisabledByMissingFileUnLock=แอปพลิเคชันพยายามอัปเกรดด้วยตนเอง แต่กระบวนการอัปเกรดไม่ได้รับอนุญาตในขณะนี้<br>
+ClickHereToGoToApp=คลิกที่นี่เพื่อไปที่ใบสมัครของคุณ
+ClickOnLinkOrRemoveManualy=หากกำลังดำเนินการอัปเกรด โปรดรอสักครู่ ถ้าไม่เช่นนั้น ให้คลิกที่ลิงค์ต่อไปนี้ หากคุณเห็นเพจเดียวกันนี้เสมอ คุณต้องลบ/เปลี่ยนชื่อไฟล์ install.lock ในไดเร็กทอรีเอกสาร
+ClickOnLinkOrCreateUnlockFileManualy=หากอยู่ระหว่างการอัพเกรด โปรดรอสักครู่... ถ้าไม่เช่นนั้น คุณต้องลบไฟล์ install.lock หรือสร้างไฟล์ upgrade.unlock ลงในไดเร็กทอรีเอกสาร Dolibarr
+Loaded=โหลดแล้ว
+FunctionTest=การทดสอบฟังก์ชัน
+NodoUpgradeAfterDB=ไม่มีการดำเนินการที่ร้องขอโดยโมดูลภายนอกหลังจากอัปเกรดฐานข้อมูล
+NodoUpgradeAfterFiles=ไม่มีการดำเนินการใดที่ร้องขอโดยโมดูลภายนอกหลังจากอัปเกรดไฟล์หรือไดเร็กทอรี
+MigrationContractLineRank=โยกย้าย Contract Line เพื่อใช้อันดับ (และเปิดใช้งานการจัดลำดับใหม่)
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 9cfe8ab44c5..116ea8606c8 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -172,7 +172,7 @@ Close=ใกล้
 CloseAs=ตั้งสถานะเป็น
 CloseBox=ลบวิดเจ็ตออกจากแดชบอร์ดของคุณ
 Confirm=ยืนยัน
-ConfirmSendCardByMail=คุณต้องการส่งเนื้อหาของการ์ดนี้ทางไปรษณีย์ไปที่ <b>%s<span class='notranslate'></b>< /ช่วง>?
+ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=ลบ
 Remove=เอาออก
 Resiliate=ยุติ
@@ -420,6 +420,8 @@ TotalTTCShort=รวม (รวมภาษี).
 TotalHT=รวม (ไม่รวมภาษี)
 TotalHTforthispage=ยอดรวม (ไม่รวมภาษี) สำหรับหน้านี้
 Totalforthispage=รวมสำหรับหน้านี้
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=รวม (รวมภาษี).
 TotalTTCToYourCredit=รวม (inc. ภาษี) เพื่อเครดิตของคุณ
 TotalVAT=รวมภาษี
@@ -647,6 +649,7 @@ ReportName=ชื่อรายงาน
 ReportPeriod=ระยะเวลาที่รายงาน
 ReportDescription=ลักษณะ
 Report=รายงาน
+Reports=รายงาน
 Keyword=คำสำคัญ
 Origin=ต้นทาง
 Legend=ตำนาน
diff --git a/htdocs/langs/th_TH/partnership.lang b/htdocs/langs/th_TH/partnership.lang
index c14572a540f..861651d1cb4 100644
--- a/htdocs/langs/th_TH/partnership.lang
+++ b/htdocs/langs/th_TH/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=จำนวนข้อผิดพลาดสำหร
 LastCheckBacklink=วันที่ตรวจสอบ URL ล่าสุด
 
 NewPartnershipRequest=คำขอหุ้นส่วนใหม่
-NewPartnershipRequestDesc=แบบฟอร์มนี้ช่วยให้คุณสามารถขอเป็นส่วนหนึ่งของโปรแกรมพันธมิตรของเราได้ หากคุณต้องการความช่วยเหลือในการกรอกแบบฟอร์มนี้ โปรดติดต่อทางอีเมล <b>%s</b><span class='notranslate'></b></ ช่วง>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=หน้านี้ต้องมีอย่างน้อยหนึ่งลิงก์ไปยังหนึ่งในโดเมนต่อไปนี้: %s
 
 IPOfApplicant=IP ของผู้สมัคร
-
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 42c9d1e0b57..a88a0dd977f 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=ผ่านการตรวจสอบ
 StatusSendingProcessedShort=การประมวลผล
 SendingSheet=แผ่นจัดส่ง
 ConfirmDeleteSending=คุณแน่ใจหรือไม่ว่าต้องการลบการจัดส่งนี้
-ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmValidateSending=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบการจัดส่งนี้ด้วยข้อมูลอ้างอิง <b>%s</b>?
 ConfirmCancelSending=คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการจัดส่งนี้
 DocumentModelMerou=Merou A5 รูปแบบ
 WarningNoQtyLeftToSend=คำเตือนผลิตภัณฑ์ไม่มีการรอคอยที่จะส่ง
@@ -81,6 +81,6 @@ CreationOptions=ตัวเลือกที่มีให้ระหว่
 ShipmentDistribution=การกระจายสินค้า
 
 ErrorTooManyCombinationBatchcode=ไม่มีการจัดส่งสำหรับบรรทัด %s เนื่องจากพบคลังสินค้า ผลิตภัณฑ์ รหัสชุดงานมากเกินไป (%s)
-ErrorNoCombinationBatchcode=ไม่สามารถบันทึกบรรทัด %s เป็นการรวมของ warehouse-product-lot/serial (%s, <span class='notranslate ไม่พบ '>%s</span>, %s) ในสต็อก
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
 
 ErrorTooMuchShipped=ปริมาณที่จัดส่งไม่ควรมากกว่าปริมาณที่สั่งซื้อสำหรับบรรทัด %s
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 533ac211f1a..ee64342bd7c 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=การโอนหุ้นขั้นสูง
 ModuleStockTransferDesc=การจัดการขั้นสูงของการโอนสต็อคพร้อมการสร้างใบโอน
 StockTransferNew=โอนสต๊อกใหม่
 StockTransferList=รายการโอนสต๊อก
-ConfirmValidateStockTransfer=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบการโอนหุ้นนี้ด้วยข้อมูลอ้างอิง <b>%s</b><span class='notranslate'></b></ ช่วง> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=การลดลงของสต็อกพร้อมการโอน %s
 ConfirmDestockCancel=ยกเลิกการลดสต๊อกด้วยการโอน %s
 DestockAllProduct=การลดลงของหุ้น
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 13ee6b87d4f..120a32105d0 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -6,14 +6,14 @@ Permission=การอนุญาต
 Permissions=สิทธิ์
 EditPassword=แก้ไขรหัสผ่าน
 SendNewPassword=สร้างรหัสผ่านใหม่และส่งรหัสผ่าน
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=ส่งลิงค์เพื่อรีเซ็ตรหัสผ่าน
 ReinitPassword=สร้างรหัสผ่านใหม่
 PasswordChangedTo=เปลี่ยนรหัสผ่านเป็น: %s
 SubjectNewPassword=รหัสผ่านใหม่ของคุณ %s
 GroupRights=สิทธิ์ของกลุ่ม
 UserRights=สิทธิ์ของผู้ใช้
-Credentials=Credentials
-UserGUISetup=User Display Setup
+Credentials=ข้อมูลรับรอง
+UserGUISetup=การตั้งค่าการแสดงผลของผู้ใช้
 DisableUser=ปิดการใช้งาน
 DisableAUser=ปิดการใช้งานของผู้ใช้
 DeleteUser=ลบ
@@ -21,22 +21,21 @@ DeleteAUser=ลบผู้ใช้
 EnableAUser=เปิดการใช้งานของผู้ใช้
 DeleteGroup=ลบ
 DeleteAGroup=ลบกลุ่ม
-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>?
+ConfirmDisableUser=คุณแน่ใจหรือไม่ว่าต้องการปิดการใช้งานผู้ใช้ <b>%s</b>
+ConfirmDeleteUser=คุณแน่ใจหรือไม่ว่าต้องการลบผู้ใช้ <b>%s</b>
+ConfirmDeleteGroup=คุณแน่ใจหรือไม่ว่าต้องการลบกลุ่ม <b>%s</b>
+ConfirmEnableUser=คุณแน่ใจหรือไม่ว่าต้องการเปิดใช้งานผู้ใช้ <b>%s</b>
+ConfirmReinitPassword=คุณแน่ใจหรือไม่ว่าต้องการสร้างรหัสผ่านใหม่สำหรับผู้ใช้ <b>%s</b>?
 ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
 NewUser=ผู้ใช้ใหม่
 CreateUser=สร้างผู้ใช้
 LoginNotDefined=เข้าสู่ระบบไม่ได้กำหนดไว้
 NameNotDefined=ชื่อไม่ได้กำหนดไว้
 ListOfUsers=รายการของผู้ใช้
-SuperAdministrator=ผู้ดูแลระบบซูเปอร์
-SuperAdministratorDesc=ผู้ดูแลระบบทั่วโลก
-AdministratorDesc=ผู้บริหาร
-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).
+SuperAdministrator=ผู้ดูแลระบบหลายบริษัท
+SuperAdministratorDesc=ผู้ดูแลระบบหลายบริษัท (สามารถเปลี่ยนการตั้งค่าและผู้ใช้ได้)
+DefaultRights=สิทธิ์เริ่มต้น
+DefaultRightsDesc=กำหนดสิทธิ์ <u>default</u> ที่ได้รับโดยอัตโนมัติให้กับ <u> ที่นี่ ใหม่</u> ผู้ใช้ (หากต้องการแก้ไขสิทธิ์สำหรับผู้ใช้ที่มีอยู่ ให้ไปที่การ์ดผู้ใช้)
 DolibarrUsers=ผู้ใช้ Dolibarr
 LastName=นามสกุล
 FirstName=ชื่อแรก
@@ -45,14 +44,14 @@ NewGroup=กลุ่มใหม่
 CreateGroup=สร้างกลุ่ม
 RemoveFromGroup=ลบออกจากกลุ่ม
 PasswordChangedAndSentTo=เปลี่ยนรหัสผ่านแล้วส่งมาที่ <b>%s</b>.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=ขอเปลี่ยนรหัสผ่านสำหรับ <b>%s</b>
 PasswordChangeRequestSent=ขอเปลี่ยนรหัสผ่านสำหรับ <b>%s</b> ส่งไปยัง <b>%s</b>.
-IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent (remember to check your SPAM folder if you do not receive anything)
-ConfirmPasswordReset=Confirm password reset
+IfLoginExistPasswordRequestSent=หากการเข้าสู่ระบบนี้เป็นบัญชีที่ถูกต้อง (ด้วยอีเมลที่ถูกต้อง) ระบบจะส่งอีเมลเพื่อรีเซ็ตรหัสผ่าน
+IfEmailExistPasswordRequestSent=หากอีเมลนี้เป็นบัญชีที่ถูกต้อง ระบบได้ส่งอีเมลเพื่อรีเซ็ตรหัสผ่านแล้ว (อย่าลืมตรวจสอบโฟลเดอร์สแปมของคุณหากคุณไม่ได้รับสิ่งใด)
+ConfirmPasswordReset=ยืนยันการรีเซ็ตรหัสผ่าน
 MenuUsersAndGroups=ผู้ใช้และกลุ่ม
-LastGroupsCreated=Latest %s groups created
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=สร้างกลุ่ม %s ล่าสุดแล้ว
+LastUsersCreated=สร้างผู้ใช้ %s ล่าสุด
 ShowGroup=แสดงกลุ่ม
 ShowUser=แสดงผู้ใช้
 NonAffectedUsers=ผู้ใช้ที่ได้รับมอบหมายไม่
@@ -62,27 +61,27 @@ ListOfUsersInGroup=รายการของผู้ใช้ในกลุ
 ListOfGroupsForUser=รายชื่อของกลุ่มสำหรับผู้ใช้นี้
 LinkToCompanyContact=เชื่อมโยงไปยังบุคคลที่สาม / ติดต่อ
 LinkedToDolibarrMember=เชื่อมโยงไปยังสมาชิก
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
+LinkedToDolibarrUser=เชื่อมโยงไปยังผู้ใช้
+LinkedToDolibarrThirdParty=เชื่อมโยงไปยังบุคคลที่สาม
 CreateDolibarrLogin=สร้างผู้ใช้
 CreateDolibarrThirdParty=สร้างของบุคคลที่สาม
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr
-PASSWORDInDolibarr=Password modified in Dolibarr
+LoginAccountDisableInDolibarr=บัญชีถูกปิดใช้งานใน Dolibarr
+PASSWORDInDolibarr=รหัสผ่านถูกแก้ไขใน Dolibarr
 UsePersonalValue=ใช้ค่าส่วนบุคคล
-ExportDataset_user_1=Users and their properties
+ExportDataset_user_1=ผู้ใช้และคุณสมบัติของพวกเขา
 DomainUser=ผู้ใช้โดเมน %s
 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.
+CreateInternalUserDesc=แบบฟอร์มนี้ช่วยให้คุณสร้างผู้ใช้ภายในบริษัท/องค์กรของคุณได้ หากต้องการสร้างผู้ใช้ภายนอก (ลูกค้า ผู้ขาย ฯลฯ ..) ให้ใช้ปุ่ม 'สร้างผู้ใช้ Dolibarr' จากบัตรข้อมูลที่ติดต่อของบุคคลที่สามนั้น
+InternalExternalDesc=ผู้ใช้ <b>ภายใน</b> คือผู้ใช้ที่เป็นส่วนหนึ่งของบริษัท/องค์กรของคุณ หรือเป็นผู้ใช้พันธมิตรภายนอกองค์กรของคุณ ที่อาจจำเป็นต้องดูข้อมูลมากกว่าข้อมูลที่เกี่ยวข้องกับบริษัทของเขา (ระบบการอนุญาตจะกำหนดสิ่งที่เขาสามารถหรือไม่เห็นหรือทำ)<br>และ <b>ภายนอก</b> ผู้ใช้คือลูกค้า ผู้ขาย หรืออื่นๆ ที่ต้องดูเฉพาะข้อมูลที่เกี่ยวข้องกับตัวเขาเอง (การสร้างผู้ใช้ภายนอกสำหรับบุคคลที่สามสามารถทำได้ ดำเนินการจากบันทึกการติดต่อของบุคคลที่สาม)<br><br>ในทั้งสองกรณี คุณต้องให้สิทธิ์ในฟีเจอร์ที่ ความต้องการของผู้ใช้
 PermissionInheritedFromAGroup=ได้รับอนุญาตเพราะรับมาจากหนึ่งในกลุ่มของผู้ใช้
 Inherited=ที่สืบทอด
-UserWillBe=Created user will be
+UserWillBe=ผู้ใช้ที่สร้างขึ้นจะเป็น
 UserWillBeInternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้งานภายใน (เพราะไม่เชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
 UserWillBeExternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้ภายนอก (เพราะเชื่อมโยงกับบุคคลที่สามโดยเฉพาะ)
 IdPhoneCaller=id โทรโทรศัพท์
 NewUserCreated=ผู้ใช้ %s สร้างแล้ว
 NewUserPassword=เปลี่ยนรหัสผ่านสำหรับ %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
+NewPasswordValidated=รหัสผ่านใหม่ของคุณได้รับการตรวจสอบแล้ว และต้องใช้ตอนนี้เพื่อเข้าสู่ระบบ
 EventUserModified=ผู้ใช้ %s แก้ไขแล้ว
 UserDisabled=ผู้ใช้ %s ปิดการใช้งาน
 UserEnabled=ผู้ใช้ %s เปิดใช้งาน
@@ -90,45 +89,48 @@ UserDeleted=ผู้ใช้ %s ลบออกแล้ว
 NewGroupCreated=กลุ่ม %s สร้างแล้ว
 GroupModified=กลุ่ม %s แก้ไขแล้ว
 GroupDeleted=กลุ่ม %s ลบออกแล้ว
-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?
+ConfirmCreateContact=คุณแน่ใจหรือไม่ว่าต้องการสร้างบัญชี Dolibarr สำหรับผู้ติดต่อรายนี้
+ConfirmCreateLogin=คุณแน่ใจหรือไม่ว่าต้องการสร้างบัญชี Dolibarr สำหรับสมาชิกรายนี้?
+ConfirmCreateThirdParty=คุณแน่ใจหรือไม่ว่าต้องการสร้างบุคคลที่สามสำหรับสมาชิกรายนี้
 LoginToCreate=เข้าสู่ระบบที่จะสร้าง
 NameToCreate=ชื่อของบุคคลที่สามในการสร้าง
 YourRole=บทบาทของคุณ
 YourQuotaOfUsersIsReached=โควต้าของคุณของผู้ใช้ที่ใช้งานถึง!
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+NbOfUsers=จำนวนผู้ใช้
+NbOfPermissions=จำนวนสิทธิ์
+DontDowngradeSuperAdmin=มีเพียงผู้ดูแลระบบรายอื่นเท่านั้นที่สามารถดาวน์เกรดผู้ดูแลระบบได้
 HierarchicalResponsible=ผู้ดูแล
 HierarchicView=มุมมองลำดับชั้น
 UseTypeFieldToChange=ใช้ประเภทเพื่อเปลี่ยน
 OpenIDURL=URL OpenID
 LoginUsingOpenID=ใช้ OpenID เข้าสู่ระบบ
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected hours worked per week
+WeeklyHours=ชั่วโมงทำงาน (ต่อสัปดาห์)
+ExpectedWorkedHours=ชั่วโมงทำงานที่คาดหวังต่อสัปดาห์
 ColorUser=สีของผู้ใช้
-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
-DateLastLogin=Date last login
-DatePreviousLogin=Date previous login
-IPLastLogin=IP last login
-IPPreviousLogin=IP previous login
-ShowAllPerms=Show all permission rows
-HideAllPerms=Hide all permission rows
-UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
-EnablePublicVirtualCard=Enable the user's virtual business card
+DisabledInMonoUserMode=ปิดใช้งานในโหมดบำรุงรักษา
+UserAccountancyCode=รหัสบัญชีผู้ใช้
+UserLogoff=ผู้ใช้ออกจากระบบ: %s
+UserLogged=ผู้ใช้ที่เข้าสู่ระบบ: %s
+UserLoginFailed=การเข้าสู่ระบบของผู้ใช้ล้มเหลว: %s
+DateOfEmployment=วันที่เข้าทำงาน
+DateEmployment=การจ้างงาน
+DateEmploymentStart=วันที่เริ่มการจ้างงาน
+DateEmploymentEnd=วันที่สิ้นสุดการจ้างงาน
+RangeOfLoginValidity=เข้าถึงช่วงวันที่มีผลบังคับใช้
+CantDisableYourself=คุณไม่สามารถปิดการใช้งานบันทึกผู้ใช้ของคุณเองได้
+ForceUserExpenseValidator=เครื่องมือตรวจสอบรายงานค่าใช้จ่ายบังคับ
+ForceUserHolidayValidator=เครื่องมือตรวจสอบคำขอบังคับให้ลา
+ValidatorIsSupervisorByDefault=ตามค่าเริ่มต้น เครื่องมือตรวจสอบคือผู้ดูแลของผู้ใช้ เว้นว่างไว้เพื่อรักษาลักษณะการทำงานนี้
+UserPersonalEmail=อีเมลส่วนตัว
+UserPersonalMobile=โทรศัพท์มือถือส่วนตัว
+WarningNotLangOfInterface=คำเตือน นี่คือภาษาหลักที่ผู้ใช้พูด ไม่ใช่ภาษาของอินเทอร์เฟซที่เขาเลือกดู หากต้องการเปลี่ยนภาษาอินเทอร์เฟซที่ผู้ใช้รายนี้มองเห็นได้ ให้ไปที่แท็บ %s
+DateLastLogin=วันที่เข้าสู่ระบบครั้งล่าสุด
+DatePreviousLogin=วันที่เข้าสู่ระบบครั้งก่อน
+IPLastLogin=IP เข้าสู่ระบบครั้งล่าสุด
+IPPreviousLogin=IP การเข้าสู่ระบบก่อนหน้า
+ShowAllPerms=แสดงแถวการอนุญาตทั้งหมด
+HideAllPerms=ซ่อนแถวการอนุญาตทั้งหมด
+UserPublicPageDesc=คุณสามารถเปิดใช้งานการ์ดเสมือนสำหรับผู้ใช้รายนี้ได้ URL พร้อมโปรไฟล์ผู้ใช้และบาร์โค้ดจะพร้อมใช้งานเพื่อให้ทุกคนที่มีสมาร์ทโฟนสามารถสแกนและเพิ่มผู้ติดต่อของคุณลงในสมุดที่อยู่ได้
+EnablePublicVirtualCard=เปิดใช้งานนามบัตรเสมือนของผู้ใช้
+UserEnabledDisabled=สถานะผู้ใช้มีการเปลี่ยนแปลง: %s
+AlternativeEmailForOAuth2=อีเมลสำรองสำหรับการเข้าสู่ระบบ OAuth2
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index f41a1639a34..62bd535a2ce 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Toplam (KDV dahil)
 TotalHT=Toplam (KDV hariç)
 TotalHTforthispage=Bu sayfa için Toplam (KDV hariç)
 Totalforthispage=Bu sayfa toplamı
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Toplam (KDV dahil)
 TotalTTCToYourCredit=Alacağınız için toplam (KDV dahil)
 TotalVAT=Toplam KDV
@@ -647,6 +649,7 @@ ReportName=Rapor Adı
 ReportPeriod=Rapor dönemi
 ReportDescription=Açıklama
 Report=Rapor
+Reports=Raporlar
 Keyword=Anahtar kelime
 Origin=Köken
 Legend=Gösterge
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 6d7fd01b081..8d79ffba7ec 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -223,7 +223,7 @@ FreeModule=Безкоштовно
 CompatibleUpTo=Сумісний з версією %s
 NotCompatible=Цей модуль не сумісний з вашою версією Dolibarr %s (Мін %s - Макс %s).
 CompatibleAfterUpdate=Цей модуль вимагає оновлення версії Dolibarr до %s (Мін %s - Макс %s).
-SeeInMarkerPlace=Дивіться у магазині 
+SeeInMarkerPlace=Дивіться у магазині
 SeeSetupOfModule=Див. налаштування модуля %s
 SeeSetupPage=Перегляньте сторінку налаштування за адресою %s
 SeeReportPage=Перегляньте сторінку звіту за адресою %s
@@ -455,7 +455,7 @@ ExtrafieldPassword=Пароль
 ExtrafieldRadio=Перемикач (одиничний вибір)
 ExtrafieldCheckBox=Прапорці
 ExtrafieldCheckBoxFromList=Прапорці з таблиці
-ExtrafieldLink=Посилання на об'єкт 
+ExtrafieldLink=Посилання на об'єкт
 ComputedFormula=Обчислюване поле
 ComputedFormulaDesc=Ви можете ввести тут формулу, використовуючи інші властивості об’єкта або будь-який код PHP, щоб отримати динамічне обчислене значення. Ви можете використовувати будь-які PHP-сумісні формули, включаючи "?" оператор умови та наступний глобальний об’єкт: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>УВАГА</strong>: якщо вам потрібні властивості об’єкта не завантажено, просто виберіть собі об’єкт у свою формулу, як у другому прикладі.<br>Використання обчислюваного поля означає, що ви не можете самостійно ввести будь-яке значення з інтерфейсу. Крім того, якщо є синтаксична помилка, формула може нічого не повернути.<br><br>Приклад формули:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Приклад перезавантаження об'єкта<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Інший приклад формули для примусового завантаження об’єкта та його батьківського об’єкта: <br>(($reloadedobj = нове завдання($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = новий проект( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: "Батьківський проект не знайдено"
 Computedpersistent=Зберегти обчислюване поле
@@ -1197,6 +1197,7 @@ Skin=Тема шкіри
 DefaultSkin=Тема шкіри за замовчуванням
 MaxSizeList=Максимальна довжина для списку
 DefaultMaxSizeList=Максимальна довжина за умовчанням для списків
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Максимальна довжина за умовчанням для коротких списків (тобто в картці клієнта)
 MessageOfDay=Повідомлення дня
 MessageLogin=Повідомлення сторінки входу
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Не експортуйте подію старше ніж
 SecurityKey = Ключ захисту
 ##### ClickToDial #####
 ClickToDialSetup=Натисніть «Налаштування модуля для набору».
-ClickToDialUrlDesc=URL-адреса викликається після натискання піктограми телефону. В URL-адресі ви можете використовувати теги<br><b>__PHONETO__</b>, які будуть замінено номером телефону особи, якій потрібно зателефонувати<br><b>__PHONEFROM__</b>, який буде замінено на номер телефону особи, яка телефонує (ваш)<br><b>__LOGIN__</b></span span>, який буде замінено логіном Clicktodial (визначеним у картці користувача)<span class='notranslate'><br><b>__PASS__ </b>, який буде замінено паролем Clicktodial (визначеним у картці користувача).
+ClickToDialUrlDesc=URL called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Цей модуль змінює номери телефонів під час використання настільного комп’ютера на посилання, які можна натискати. Клацніть на номер. Це можна використовувати, щоб почати телефонний дзвінок під час використання програмного телефону на робочому столі або, наприклад, при використанні системи CTI на основі протоколу SIP. Примітка. Під час використання смартфона номери телефонів завжди можна натиснути.
 ClickToDialUseTelLink=Використовуйте лише посилання "tel:" на номерах телефонів
 ClickToDialUseTelLinkDesc=Використовуйте цей метод, якщо ваші користувачі мають програмний телефон або програмний інтерфейс, встановлений на тому ж комп’ютері, що й браузер, і викликають, коли ви натискаєте посилання, яке починається з «tel:» у вашому браузері. Якщо вам потрібне посилання, яке починається з «sip:» або повне серверне рішення (не потребує встановлення локального програмного забезпечення), ви повинні встановити значення «Ні» та заповнити наступне поле.
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 1d9fc16767f..3116c3321db 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -95,7 +95,7 @@ ErrorModuleRequireJavascript=Щоб ця функція працювала, не
 ErrorPasswordsMustMatch=Обидва введені паролі повинні відповідати один одному
 ErrorContactEMail=Сталася технічна помилка. Будь ласка, зв’яжіться з адміністратором на електронну адресу <b>%s</b> і вкажіть помилку код <b>%s</b> у своєму повідомленні або додайте копію екрана ця сторінка.
 ErrorWrongValueForField=Поле <b> %s </b>: '<b> %s A09NICFRIMS0FZ0 A0CB20FRIFTIONM0303030303030303030303030303030308520308508508352030858350835083508358358358358358358358358358583583583583583583583583583583583583583583583.
-ErrorHtmlInjectionForField=Поле <b>%s</b>: значення '<span class='notranslate "><b></span>%s</b>" містить шкідливі дані, заборонені
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 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
 ErrorMultipleRecordFoundFromRef=Кілька записів знайдено під час пошуку з посилання <b>%s</b>. Немає способу дізнатися, який ідентифікатор використовувати.
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 43e73abfdca..971342ea5a9 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -95,7 +95,7 @@ NbOfLinesImported=Кількість успішно імпортованих р
 DataComeFromNoWhere=Значення для вставки приходить з нізвідки у вихідному файлі.
 DataComeFromFileFieldNb=Значення для вставки походить зі стовпця <b>%s</b> у вихідному файлі.
 DataComeFromIdFoundFromRef=Значення, отримане з вихідного файлу, використовуватиметься для пошуку ідентифікатора батьківського об’єкта для використання (тому об’єкт <b>%s</b>, який містить посилання з вихідного файлу, має існувати в базі даних).
-DataComeFromIdFoundFromCodeId=Значення коду, отриманого з вихідного файлу, використовуватиметься для пошуку ідентифікатора батьківського об’єкта для використання (тому код із вихідного файлу має існувати в словнику <b><span class). ='notranslate'>%s</span></b>). Зверніть увагу: якщо ви знаєте ідентифікатор, ви також можете використовувати його у вихідному файлі замість коду. Імпорт має працювати в обох випадках.
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=Дані, що надходять з вихідного файлу, будуть вставлені в наступне поле:
 DataIDSourceIsInsertedInto=Ідентифікатор батьківського об’єкта, який було знайдено за допомогою даних у вихідному файлі, буде вставлено в наступне поле:
 DataCodeIDSourceIsInsertedInto=Ідентифікатор батьківського рядка, який було знайдено з коду, буде вставлено в наступне поле:
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 8f1b0f27bcc..708d84da70e 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Усього (включаючи податок)
 TotalHT=Усього (без податку)
 TotalHTforthispage=Усього (без податку) для цієї сторінки
 Totalforthispage=Усього для цієї сторінки
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Усього (включаючи податок)
 TotalTTCToYourCredit=Усього (включаючи податки) на ваш кредит
 TotalVAT=Загальний податок
@@ -647,6 +649,7 @@ ReportName=Назва звіту
 ReportPeriod=Звітний період
 ReportDescription=Опис
 Report=Звіт
+Reports=Reports
 Keyword=Ключове слово
 Origin=Походження
 Legend=Легенда
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 89029f23d99..8c44b24cfc5 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Не вдалося додати код до де
 DictionariesCreated=Словник <b>%s</b> успішно створено
 DictionaryDeleted=Словник <b>%s</b> успішно видалено
 PropertyModuleUpdated=Властивість <b>%s</b> успішно оновлено
-InfoForApiFile=* Коли ви вперше створюєте файл, усі методи будуть створені <strong>для кожного об'єкта.</strong><br>* Коли ви натискаєте <strong>remove</strong>, ви просто видаляєте всі методи для класу <span ='notranslate'><strong></span>вибраний об'єкт</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Сторінка налаштування модуля
 EmailingSelectors=Селектори електронних листів
 EmailingSelectorDesc=Тут ви можете створювати та редагувати файли класів, щоб надати нові селектори цілей електронної пошти для модуля масової електронної пошти
diff --git a/htdocs/langs/ur_PK/accountancy.lang b/htdocs/langs/ur_PK/accountancy.lang
index 999f91d97c0..ca034dfd592 100644
--- a/htdocs/langs/ur_PK/accountancy.lang
+++ b/htdocs/langs/ur_PK/accountancy.lang
@@ -287,7 +287,7 @@ TotalVente=ٹیکس سے پہلے کل کاروبار
 TotalMarge=فروخت کا کل مارجن
 
 DescVentilCustomer=اکاؤنٹ کے چارٹ سے پروڈکٹ اکاؤنٹ سے منسلک کسٹمر انوائس لائنوں کی فہرست یہاں دیکھیں
-DescVentilMore=زیادہ تر معاملات میں، اگر آپ پہلے سے طے شدہ مصنوعات یا خدمات استعمال کرتے ہیں اور آپ پروڈکٹ/سروس کارڈ پر اکاؤنٹ (اکاؤنٹ کے چارٹ سے) سیٹ کرتے ہیں، تو ایپلیکیشن آپ کے انوائس لائنوں اور آپ کے چارٹ کے اکاؤنٹنگ اکاؤنٹ کے درمیان تمام پابندیاں عائد کر سکے گی۔ اکاؤنٹس کے، بٹن کے ساتھ صرف ایک کلک میں <strong>"%s"</strong> > اگر اکاؤنٹ پروڈکٹ/سروس کارڈز پر سیٹ نہیں کیا گیا تھا یا اگر آپ کے پاس اب بھی کچھ لائنیں ہیں جو اکاؤنٹ سے منسلک نہیں ہیں، تو آپ کو مینو "<strong><span مینو سے ایک دستی بائنڈنگ کرنا ہوگی۔ class='notranslate'>%s</span></strong>"۔
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=اکاؤنٹ کے چارٹ سے انوائس کے صارفین اور ان کے پروڈکٹ اکاؤنٹ کی لائنوں کی فہرست یہاں دیکھیں
 DescVentilTodoCustomer=اکاؤنٹ کے چارٹ سے پروڈکٹ اکاؤنٹ کے ساتھ پہلے سے پابند انوائس لائنوں کو باندھیں۔
 ChangeAccount=درج ذیل اکاؤنٹ کے ساتھ منتخب لائنوں کے لیے پروڈکٹ/سروس اکاؤنٹ (اکاؤنٹ کے چارٹ سے) تبدیل کریں:
@@ -335,7 +335,6 @@ CategoryDeleted=اکاؤنٹنگ اکاؤنٹ کے زمرے کو ہٹا دیا 
 AccountingJournals=اکاؤنٹنگ جرائد
 AccountingJournal=اکاؤنٹنگ جرنل
 NewAccountingJournal=نیا اکاؤنٹنگ جریدہ
-ShowAccountingJournal=اکاؤنٹنگ جرنل دکھائیں۔
 NatureOfJournal=جرنل کی نوعیت
 AccountingJournalType1=متفرق آپریشنز
 AccountingJournalType2=سیلز
@@ -353,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=سیلز پر اکاؤنٹنسی میں با
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=خریداری پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (وینڈر انوائس کو اکاؤنٹنگ میں مدنظر نہیں رکھا جائے گا)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=اخراجات کی رپورٹوں پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (اکاؤنٹنگ میں اخراجات کی رپورٹوں کو مدنظر نہیں رکھا جائے گا)
 ACCOUNTING_ENABLE_LETTERING=اکاؤنٹنگ میں لیٹرنگ فنکشن کو فعال کریں۔
-ACCOUNTING_ENABLE_LETTERING_DESC=جب یہ اختیارات فعال ہوتے ہیں، تو آپ اکاؤنٹنگ کے ہر اندراج پر، ایک کوڈ کی وضاحت کر سکتے ہیں تاکہ آپ اکاؤنٹنگ کی مختلف حرکات کو ایک ساتھ گروپ کر سکیں۔ ماضی میں، جب مختلف جرائد کو آزادانہ طور پر منظم کیا جاتا تھا، تو یہ خصوصیت مختلف جرائد کی نقل و حرکت کی لائنوں کو ایک ساتھ گروپ کرنے کے لیے ضروری تھی۔ تاہم، Dolibarr اکاؤنٹنسی کے ساتھ، ایک ٹریکنگ کوڈ، جسے "<b>%s</b><span class='notranslate'>کہا جاتا ہے span>" پہلے سے ہی خود بخود محفوظ ہو چکا ہے، اس لیے ایک خودکار خطوط پہلے سے ہی ہو چکا ہے، جس میں غلطی کا کوئی خطرہ نہیں ہے اس لیے یہ فیچر عام استعمال کے لیے بیکار ہو گیا ہے۔ دستی خطوط کی خصوصیت ان آخری صارفین کے لیے فراہم کی گئی ہے جو اکاؤنٹنسی میں ڈیٹا کی منتقلی کرنے والے کمپیوٹر انجن پر واقعی بھروسہ نہیں کرتے ہیں۔
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=اکاؤنٹنگ کے سخت انتظام کے لیے اس خصوصیت کو فعال کرنا مزید ضروری نہیں ہے۔
 ACCOUNTING_ENABLE_AUTOLETTERING=اکاؤنٹنگ میں منتقل کرتے وقت خودکار حروف کو فعال کریں۔
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=حروف کے لیے کوڈ خود بخود تیار ہوتا ہے اور بڑھایا جاتا ہے اور آخری صارف کے ذریعے منتخب نہیں کیا جاتا ہے۔
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
index 6839ef785d7..76b4f209038 100644
--- a/htdocs/langs/ur_PK/admin.lang
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -346,7 +346,7 @@ StepNb=مرحلہ %s
 FindPackageFromWebSite=ایک ایسا پیکیج تلاش کریں جو آپ کو مطلوبہ خصوصیات فراہم کرتا ہو (مثال کے طور پر سرکاری ویب سائٹ %s پر)۔
 DownloadPackageFromWebSite=پیکیج ڈاؤن لوڈ کریں (مثال کے طور پر سرکاری ویب سائٹ %s سے)۔
 UnpackPackageInDolibarrRoot=پیک شدہ فائلوں کو اپنی ڈولیبر سرور ڈائرکٹری میں کھولیں/ان زپ کریں: <b> %s </b>
-UnpackPackageInModulesRoot=کسی بیرونی ماڈیول کو تعینات/انسٹال کرنے کے لیے، آپ کو بیرونی ماڈیولز کے لیے مختص سرور ڈائرکٹری میں آرکائیو فائل کو کھولنا/ان زپ کرنا ہوگا:<br>b0aee8365837fz0 ><span class='notranslate'>%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=ماڈیول کی تعیناتی ختم ہو گئی ہے۔ تاہم آپ کو صفحہ سیٹ اپ ماڈیولز: <a href="%s"> %s </a> پر جا کر اپنی درخواست میں ماڈیول کو فعال اور سیٹ اپ کرنا ہوگا۔
 NotExistsDirect=متبادل روٹ ڈائرکٹری موجودہ ڈائرکٹری سے متعین نہیں ہے۔ <br>
 InfDirAlt=ورژن 3 کے بعد سے، متبادل روٹ ڈائریکٹری کی وضاحت ممکن ہے۔ یہ آپ کو ایک وقف شدہ ڈائرکٹری، پلگ ان اور حسب ضرورت ٹیمپلیٹس میں ذخیرہ کرنے کی اجازت دیتا ہے۔ <br> بس Dolibarr کے روٹ پر ایک ڈائرکٹری بنائیں (جیسے: کسٹم)۔ <br>
@@ -368,7 +368,7 @@ GenericMaskCodes3EAN=ماسک میں باقی تمام حروف برقرار ر
 GenericMaskCodes4a=<u>تیسرے فریق TheCompany کی 99ویں %s پر مثال، تاریخ 2023-01-31 کے ساتھ:</u><br>
 GenericMaskCodes4b=<u>31-01-2023 کو بنائے گئے فریق ثالث کی مثال:</u><br> >
 GenericMaskCodes4c=<u>31-01-2023 کو تیار کردہ پروڈکٹ کی مثال:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> دے گا b0aee83365830 span>ABC2301-000099</b><br>b0aee8365837fz0{0@0@0@span }-ZZZ/{dd}/XXX<span class='notranslate'></b> دے گا <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}<span> class='notranslate'></b></span> دے گا <b>IN2301-0099-A<span class='notranslate'></b> اگر کمپنی کی قسم ہے 'ذمہ دار انسکرپٹو' اس قسم کے کوڈ کے ساتھ جو 'A_RI' ہے
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=ایک متعین ماسک کے مطابق حسب ضرورت نمبر لوٹاتا ہے۔
 ServerAvailableOnIPOrPort=سرور <b> <b> %s </b> پورٹ <b> %s a09a4b739f17f80 پر دستیاب ہے۔
 ServerNotAvailableOnIPOrPort=پورٹ <b> <b> %s </b> پر سرور دستیاب نہیں ہے <b> %s a09a4b739f178
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=اس فیلڈ کو خالی چھوڑنے کا مطل
 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=اقدار کی فہرست ایک ٹیبل سے آتی ہے<br>نحو: table_name:label_field:id_field::filtersql<br>مثال: ccfda19bz0 ::filtersql<br><br>- id_field لازمی طور پر ایک بنیادی int کلید ہے<br> - filtersql ایک SQL شرط ہے۔ صرف فعال قدر ظاہر کرنے کے لیے یہ ایک سادہ ٹیسٹ (مثلاً فعال=1) ہو سکتا ہے<br>آپ $ID$ کو فلٹر میں بھی استعمال کر سکتے ہیں جو موجودہ آبجیکٹ کی موجودہ id ہے<br>فلٹر میں SELECT استعمال کرنے کے لیے اینٹی انجیکشن تحفظ کو نظرانداز کرنے کے لیے مطلوبہ لفظ $SEL$ استعمال کریں۔<br>اگر آپ ایکسٹرا فیلڈز پر فلٹر کرنا چاہتے ہیں نحو کا استعمال کریں extra.fieldcode=... (جہاں فیلڈ کوڈ extrafield کا کوڈ ہے)<br><br> فہرست ایک اور تکمیلی انتساب کی فہرست پر منحصر ہے:<br>c_typent:libelle:id:options_<i>parent_list_code<span>'notranslate'>'notranslate' </i></span>|parent_column:filter <br><br>دوسری فہرست پر منحصر فہرست رکھنے کے لیے:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758bac33parent_col>
+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 necessarily 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=اقدار کی فہرست ایک ٹیبل سے آتی ہے فلٹر ڈائن میں $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=ایک سادہ سیپریٹر کے لیے خالی رکھیں اسٹیٹس کو ہر صارف کے سیشن کے لیے رکھا جاتا ہے)
@@ -1197,6 +1197,7 @@ Skin=جلد کی تھیم
 DefaultSkin=پہلے سے طے شدہ جلد کی تھیم
 MaxSizeList=فہرست کے لیے زیادہ سے زیادہ لمبائی
 DefaultMaxSizeList=فہرستوں کے لیے پہلے سے طے شدہ زیادہ سے زیادہ لمبائی
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=مختصر فہرستوں کے لیے پہلے سے طے شدہ زیادہ سے زیادہ لمبائی (یعنی کسٹمر کارڈ میں)
 MessageOfDay=دن کا پیغام
 MessageLogin=لاگ ان پیج پیغام
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=سے پرانا واقعہ برآمد نہ کریں۔
 SecurityKey = سیکیورٹی کلید
 ##### ClickToDial #####
 ClickToDialSetup=ماڈیول سیٹ اپ ڈائل کرنے کے لیے کلک کریں۔
-ClickToDialUrlDesc=یو آر ایل اس وقت کال کیا جاتا ہے جب فون پکٹو پر کلک کیا جاتا ہے۔ URL میں، آپ ٹیگز استعمال کر سکتے ہیں<br><b>__PHONETO__</b>یہ ہوگا کال کرنے والے شخص کے فون نمبر سے بدل دیا گیا<br><b>__PHONEFROM__</b> کال کرنے والے شخص (آپ کا) کے فون نمبر سے بدل دیا جائے گا<br><b>__LOGIN__b09a4b739f17f span> جسے کلک ٹوڈیل لاگ ان سے تبدیل کیا جائے گا (یوزر کارڈ پر بیان کیا گیا ہے)<span class='notranslate'><br><b>__PASS__ </b> جسے کلک ٹوڈیل پاس ورڈ (یوزر کارڈ پر بیان کیا گیا) سے بدل دیا جائے گا۔
+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=یہ ماڈیول ڈیسک ٹاپ کمپیوٹر کا استعمال کرتے وقت فون نمبروں کو کلک کے قابل لنکس میں تبدیل کرتا ہے۔ ایک کلک نمبر پر کال کرے گا۔ یہ آپ کے ڈیسک ٹاپ پر سافٹ فون استعمال کرتے وقت یا مثال کے طور پر SIP پروٹوکول پر مبنی CTI سسٹم استعمال کرتے وقت فون کال شروع کرنے کے لیے استعمال کیا جا سکتا ہے۔ نوٹ: اسمارٹ فون استعمال کرتے وقت، فون نمبرز ہمیشہ کلک کے قابل ہوتے ہیں۔
 ClickToDialUseTelLink=فون نمبرز پر صرف ایک لنک "tel:" استعمال کریں۔
 ClickToDialUseTelLinkDesc=یہ طریقہ استعمال کریں اگر آپ کے صارفین کے پاس سافٹ فون یا سافٹ ویئر انٹرفیس ہے، جو براؤزر والے کمپیوٹر پر انسٹال ہے، اور جب آپ اپنے براؤزر میں "tel:" سے شروع ہونے والے لنک پر کلک کرتے ہیں تو اسے کال کیا جاتا ہے۔ اگر آپ کو کسی ایسے لنک کی ضرورت ہے جو "sip:" سے شروع ہو یا ایک مکمل سرور حل (مقامی سافٹ ویئر انسٹالیشن کی ضرورت نہیں)، آپ کو اسے "نہیں" پر سیٹ کرنا ہوگا اور اگلا فیلڈ بھرنا ہوگا۔
@@ -2176,7 +2177,7 @@ CreateCandidature=ملازمت کی درخواست بنائیں
 FormatZip=زپ
 MainMenuCode=مینو انٹری کوڈ (مین مینو)
 ECMAutoTree=خودکار ECM درخت دکھائیں۔
-OperationParamDesc=کچھ ڈیٹا نکالنے کے لیے استعمال کرنے کے لیے قواعد کی وضاحت کریں یا آپریشن کے لیے استعمال کرنے کے لیے قدریں سیٹ کریں۔<br><br>سے کمپنی کا نام نکالنے کی مثال ای میل کا موضوع ایک عارضی متغیر میں:<br>tmp_var=EXTRACT:SUBJECT:کمپنی کی طرف سے پیغام ([^\n]*)<br><br>تخلیق کے لیے کسی آبجیکٹ کی خصوصیات سیٹ کرنے کی مثالیں:<br>objproperty1=SET:ایک ہارڈ کوڈ شدہ قدر<br>objproperty2=SET:__tmp_var__<br>objproperty (MPvalue3=SETIFEa value: صرف اس صورت میں سیٹ کیا جاتا ہے جب پراپرٹی کی پہلے سے وضاحت نہ کی گئی ہو)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<span class='notranslate' '><br></span>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY is:My s([^\\s]*)<br><br>متعدد خصوصیات کو نکالنے یا سیٹ کرنے کے لیے ایک نئی لائن استعمال کریں۔
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
 OpeningHours=ابتدائی گھنٹے
 OpeningHoursDesc=اپنی کمپنی کے باقاعدہ کھلنے کے اوقات یہاں درج کریں۔
 ResourceSetup=وسائل کے ماڈیول کی ترتیب
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=APIs ماڈیولز فعال نہیں ہیں۔
 YouShouldSetThisToOff=آپ کو اسے 0 یا آف پر سیٹ کرنا چاہیے۔
 InstallAndUpgradeLockedBy=انسٹال اور اپ گریڈ فائل <b> %s </b> کے ذریعہ مقفل ہیں۔
 InstallLockedBy=انسٹال/دوبارہ انسٹال فائل <b>%s</b> کے ذریعہ مقفل ہے۔
-InstallOfAddonIsNotBlocked=ایڈونز کی تنصیبات مقفل نہیں ہیں۔ ایک فائل <b>installmodules.lock</b> ڈائرکٹری <b> میں بنائیں ='notranslate'>%s</span></b> بیرونی ایڈونز/ماڈیولز کی تنصیبات کو بلاک کرنے کے لیے۔
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=پرانا عمل درآمد
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=اگر آن لائن ادائیگی کے کچھ ماڈیولز فعال ہیں (پے پال، پٹی، ...)، آن لائن ادائیگی کرنے کے لیے پی ڈی ایف پر ایک لنک شامل کریں۔
 DashboardDisableGlobal=کھلی اشیاء کے تمام انگوٹھوں کو عالمی سطح پر غیر فعال کریں۔
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=ڈیفالٹ کے ذریعہ نہ
 CSSPage=سی ایس ایس اسٹائل
 Defaultfortype=طے شدہ
 DefaultForTypeDesc=ٹیمپلیٹ کی قسم کے لیے نیا ای میل بناتے وقت بطور ڈیفالٹ استعمال کیا جاتا ہے۔
-OptionXShouldBeEnabledInModuleY=آپشن "<b>%s</b>" ماڈیول <span کلاس میں فعال ہونا چاہئے ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=آپشن "<b>%s</b>" ماڈیول میں فعال ہے <span= class 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=آن لائن دستخط کی اجازت دیں۔
 AtBottomOfPage=صفحہ کے نیچے
 FailedAuth=ناکام تصدیق
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/ur_PK/bills.lang b/htdocs/langs/ur_PK/bills.lang
index 38604133b54..04fce8cc959 100644
--- a/htdocs/langs/ur_PK/bills.lang
+++ b/htdocs/langs/ur_PK/bills.lang
@@ -13,12 +13,12 @@ BillsStatistics=صارفین کی رسیدوں کے اعدادوشمار
 BillsStatisticsSuppliers=وینڈرز انوائس کے اعدادوشمار
 DisabledBecauseDispatchedInBookkeeping=غیر فعال کیونکہ انوائس بک کیپنگ میں بھیجی گئی تھی۔
 DisabledBecauseNotLastInvoice=انوائس کو مٹانے کے قابل نہ ہونے کی وجہ سے غیر فعال ہے۔ اس کے بعد کچھ رسیدیں ریکارڈ کی گئیں اور اس سے کاؤنٹر میں سوراخ ہو جائیں گے۔
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
+DisabledBecauseNotLastSituationInvoice=انوائس کو مٹانے کے قابل نہ ہونے کی وجہ سے غیر فعال ہے۔ یہ انوائس صورتحال انوائس سائیکل میں آخری نہیں ہے۔
 DisabledBecauseNotErasable=غیر فعال کیونکہ مٹایا نہیں جا سکتا
 InvoiceStandard=معیاری رسید
 InvoiceStandardAsk=معیاری رسید
 InvoiceStandardDesc=اس قسم کی رسید عام رسید ہے۔
-InvoiceStandardShort=Standard
+InvoiceStandardShort=معیاری
 InvoiceDeposit=ڈاون پیمنٹ انوائس
 InvoiceDepositAsk=ڈاون پیمنٹ انوائس
 InvoiceDepositDesc=اس قسم کی رسید اس وقت کی جاتی ہے جب ڈاؤن پیمنٹ موصول ہو جاتی ہے۔
@@ -26,7 +26,7 @@ InvoiceProForma=پروفارما رسید
 InvoiceProFormaAsk=پروفارما رسید
 InvoiceProFormaDesc= <b> پروفارما انوائس </b> ایک حقیقی انوائس کی تصویر ہے لیکن اس کی کوئی اکاؤنٹنسی ویلیو نہیں ہے۔
 InvoiceReplacement=متبادل رسید
-InvoiceReplacementShort=Replacement
+InvoiceReplacementShort=متبادل
 InvoiceReplacementAsk=انوائس کے بدلے انوائس
 InvoiceReplacementDesc= <b> تبدیلی کی رسید </b> کو مکمل طور پر انوائس کو تبدیل کرنے کے لیے استعمال کیا جاتا ہے جس میں پہلے سے کوئی ادائیگی موصول نہیں ہوئی ہے۔ <br> <br> نوٹ: صرف ان انوائسز کو تبدیل کیا جا سکتا ہے جن پر کوئی ادائیگی نہ ہو۔ اگر آپ جو انوائس تبدیل کرتے ہیں وہ ابھی تک بند نہیں ہوا ہے، تو یہ خود بخود 'متروک' پر بند ہو جائے گا۔
 InvoiceAvoir=کریڈٹ نوٹ
@@ -84,15 +84,18 @@ PaymentsReports=ادائیگی کی رپورٹس
 PaymentsAlreadyDone=ادائیگیاں ہو چکی ہیں۔
 PaymentsBackAlreadyDone=ریفنڈز پہلے ہی ہو چکے ہیں۔
 PaymentRule=ادائیگی کا اصول
-PaymentMode=Payment method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
+PaymentMode=ادائیگی کا طریقہ
+PaymentModes=ادائیگی کے طریقے
+DefaultPaymentMode=پہلے سے طے شدہ ادائیگی کا طریقہ
 DefaultBankAccount=ڈیفالٹ بینک اکاؤنٹ
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
+IdPaymentMode=ادائیگی کا طریقہ (id)
+CodePaymentMode=ادائیگی کا طریقہ (کوڈ)
+LabelPaymentMode=ادائیگی کا طریقہ (لیبل)
+PaymentModeShort=ادائیگی کا طریقہ
 PaymentTerm=ادائیگی کی شرط
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=ادائیگی کی شرائط
 PaymentConditionsShort=ادائیگی کی شرائط
 PaymentAmount=ادائیگی کی رقم
@@ -124,7 +127,7 @@ EnterPaymentDueToCustomer=گاہک کی وجہ سے ادائیگی کریں۔
 DisabledBecauseRemainderToPayIsZero=غیرفعال ہے کیونکہ بقیہ غیر ادا شدہ صفر ہے۔
 PriceBase=بنیادی قیمت
 BillStatus=رسید کی حیثیت
-StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
+StatusOfAutoGeneratedInvoices=خودکار طور پر تیار کردہ رسیدوں کی حیثیت
 BillStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
 BillStatusPaid=ادا کیا
 BillStatusPaidBackOrConverted=کریڈٹ نوٹ کی واپسی یا کریڈٹ دستیاب کے بطور نشان زد
@@ -159,15 +162,15 @@ ErrorInvoiceAvoirMustBeNegative=خرابی، درست انوائس میں منف
 ErrorInvoiceOfThisTypeMustBePositive=خرابی، اس قسم کی رسید میں ٹیکس مثبت (یا کالعدم) کے علاوہ رقم ہونی چاہیے
 ErrorCantCancelIfReplacementInvoiceNotValidated=خرابی، ایک انوائس کو منسوخ نہیں کیا جا سکتا جس کی جگہ کسی اور انوائس نے لے لی ہو جو ابھی بھی مسودہ کی حالت میں ہے
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=یہ حصہ یا دوسرا حصہ پہلے ہی استعمال ہو چکا ہے لہذا ڈسکاؤنٹ سیریز کو ہٹایا نہیں جا سکتا۔
-ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s  is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
+ErrorInvoiceIsNotLastOfSameType=خرابی: انوائس کی تاریخ %s ہے %s۔ یہ ایک ہی قسم کے انوائس (%s) کے لیے پچھلی یا آخری تاریخ کے برابر ہونا چاہیے۔ براہ کرم رسید کی تاریخ تبدیل کریں۔
 BillFrom=سے
 BillTo=کو
-ShippingTo=Shipping to
+ShippingTo=بھیجنا
 ActionsOnBill=انوائس پر کارروائیاں
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=اعادی انوائس پر کارروائیاں
 RecurringInvoiceTemplate=ٹیمپلیٹ / بار بار چلنے والی رسید
 NoQualifiedRecurringInvoiceTemplateFound=کوئی اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل نہیں ہے۔
-FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل ہیں۔
 NotARecurringInvoiceTemplate=اعادی ٹیمپلیٹ انوائس نہیں ہے۔
 NewBill=نئی رسید
 LastBills=تازہ ترین %s رسیدیں۔
@@ -197,9 +200,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=بقیہ بلا معاوضہ <b> (%s
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں اس رعایت پر VAT کھونا قبول کرتا ہوں۔
 ConfirmClassifyPaidPartiallyReasonDiscountVat=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں بغیر کریڈٹ نوٹ کے اس رعایت پر VAT وصول کرتا ہوں۔
 ConfirmClassifyPaidPartiallyReasonBadCustomer=برا گاہک
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=برا فروش
+ConfirmClassifyPaidPartiallyReasonBankCharge=بینک کی طرف سے کٹوتی (درمیانی بینک کی فیس)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=ودہولڈنگ ٹیکس
 ConfirmClassifyPaidPartiallyReasonProductReturned=مصنوعات جزوی طور پر واپس آ گئیں۔
 ConfirmClassifyPaidPartiallyReasonOther=دوسری وجہ سے چھوڑ دی گئی رقم
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=یہ انتخاب ممکن ہے اگر آپ کی رسید مناسب تبصروں کے ساتھ فراہم کی گئی ہو۔ (مثال کے طور پر "صرف اس قیمت کے مطابق ٹیکس جو اصل میں ادا کیا گیا ہے، کٹوتی کے حقوق دیتا ہے")
@@ -208,16 +211,16 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=اس انتخاب کا استعما
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> برا گاہک </b> وہ صارف ہے جو اپنا قرض ادا کرنے سے انکار کرتا ہے۔
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=یہ انتخاب اس وقت استعمال کیا جاتا ہے جب ادائیگی مکمل نہیں ہوتی ہے کیونکہ کچھ مصنوعات واپس کردی گئی تھیں۔
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=غیر ادا شدہ رقم <b> انٹرمیڈیری بینک فیس ہے
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=ادا نہ کی گئی رقم کبھی ادا نہیں کی جائے گی کیونکہ یہ ودہولڈنگ ٹیکس ہے۔
 ConfirmClassifyPaidPartiallyReasonOtherDesc=اس انتخاب کو استعمال کریں اگر باقی سب موزوں نہیں ہیں، مثال کے طور پر درج ذیل صورت حال میں: <br> - ادائیگی مکمل نہیں ہوئی کیونکہ کچھ پروڈکٹس واپس بھیجے گئے تھے ایک کریڈٹ نوٹ بنا کر اکاؤنٹنسی سسٹم میں۔
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=ایک <b>خراب سپلائر</b> ایک ایسا سپلائر ہے جسے ہم ادائیگی کرنے سے انکار کرتے ہیں۔
 ConfirmClassifyAbandonReasonOther=دیگر
 ConfirmClassifyAbandonReasonOtherDesc=یہ انتخاب دیگر تمام معاملات میں استعمال کیا جائے گا۔ مثال کے طور پر کیونکہ آپ ایک بدلی انوائس بنانے کا ارادہ رکھتے ہیں۔
 ConfirmCustomerPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
 ConfirmSupplierPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
 ConfirmValidatePayment=کیا آپ واقعی اس ادائیگی کی توثیق کرنا چاہتے ہیں؟ ادائیگی کی توثیق ہونے کے بعد کوئی تبدیلی نہیں کی جا سکتی۔
 ValidateBill=رسید کی توثیق کریں۔
-UnvalidateBill=Invalidate invoice
+UnvalidateBill=انوائس کو باطل کریں۔
 NumberOfBills=رسیدوں کی تعداد
 NumberOfBillsByMonth=ماہانہ رسیدوں کی تعداد
 AmountOfBills=رسیدوں کی رقم
@@ -252,7 +255,7 @@ RemainderToPayBack=ریفنڈ کے لیے باقی رقم
 RemainderToPayBackMulticurrency=ریفنڈ کے لیے باقی رقم، اصل کرنسی
 NegativeIfExcessReceived=اضافی موصول ہونے پر منفی
 NegativeIfExcessRefunded=اضافی رقم کی واپسی کی صورت میں منفی
-NegativeIfExcessPaid=negative if excess paid
+NegativeIfExcessPaid=اگر زیادہ ادائیگی کی جائے تو منفی
 Rest=زیر التواء
 AmountExpected=دعوی کردہ رقم
 ExcessReceived=ضرورت سے زیادہ موصول ہوئی۔
@@ -268,6 +271,8 @@ NoDraftBills=کوئی مسودہ رسید نہیں ہے۔
 NoOtherDraftBills=کوئی دوسرا مسودہ رسید نہیں ہے۔
 NoDraftInvoices=کوئی مسودہ رسید نہیں ہے۔
 RefBill=انوائس کا حوالہ
+RefSupplierBill=Supplier invoice ref
+SupplierOrderCreateBill=Create invoice
 ToBill=بل کرنا
 RemainderToBill=بل کے لیے باقی ہے۔
 SendBillByMail=ای میل کے ذریعے رسید بھیجیں۔
@@ -291,11 +296,11 @@ SetRevenuStamp=ریونیو سٹیمپ سیٹ کریں۔
 Billed=بل کیا گیا۔
 RecurringInvoices=بار بار چلنے والی رسیدیں
 RecurringInvoice=بار بار چلنے والی رسید
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoiceSource=ماخذ بار بار چلنے والی رسید
 RepeatableInvoice=ٹیمپلیٹ رسید
 RepeatableInvoices=ٹیمپلیٹ رسیدیں
-RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
-RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+RecurringInvoicesJob=بار بار چلنے والی رسیدوں کی تخلیق (سیلز انوائس)
+RecurringSupplierInvoicesJob=بار بار چلنے والی رسیدوں کی تخلیق (خریداری رسیدیں)
 Repeatable=سانچے
 Repeatables=ٹیمپلیٹس
 ChangeIntoRepeatableInvoice=ٹیمپلیٹ انوائس میں تبدیل کریں۔
@@ -334,8 +339,8 @@ DiscountFromExcessPaid=انوائس %s سے زیادہ ادائیگی
 AbsoluteDiscountUse=اس قسم کا کریڈٹ انوائس پر اس کی توثیق سے پہلے استعمال کیا جا سکتا ہے۔
 CreditNoteDepositUse=اس قسم کے کریڈٹ استعمال کرنے کے لیے انوائس کی توثیق ہونی چاہیے۔
 NewGlobalDiscount=نیا مطلق رعایت
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=نیا مطلق سپلائر رعایت
+NewClientGlobalDiscount=کلائنٹ کی نئی مطلق رعایت
 NewRelativeDiscount=نیا رشتہ دار رعایت
 DiscountType=ڈسکاؤنٹ کی قسم
 NoteReason=نوٹ/ وجہ
@@ -352,6 +357,7 @@ HelpAbandonOther=اس رقم کو چھوڑ دیا گیا ہے کیونکہ یہ
 IdSocialContribution=سماجی/مالیاتی ٹیکس ادائیگی کی شناخت
 PaymentId=ادائیگی کی شناخت
 PaymentRef=ادائیگی کا حوالہ
+SourceInvoiceId=Source invoice id
 InvoiceId=انوائس آئی ڈی
 InvoiceRef=انوائس کا حوالہ
 InvoiceDateCreation=انوائس بنانے کی تاریخ
@@ -405,7 +411,7 @@ DateLastGenerationShort=تازہ ترین جنرل کی تاریخ۔
 MaxPeriodNumber=زیادہ سے زیادہ انوائس نسل کی تعداد
 NbOfGenerationDone=انوائس جنریشن کی تعداد پہلے ہی ہو چکی ہے۔
 NbOfGenerationOfRecordDone=ریکارڈ جنریشن کی تعداد پہلے ہی ہو چکی ہے۔
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationDoneShort=مکمل ہونے والی نسلوں کی تعداد
 MaxGenerationReached=نسلوں کی زیادہ سے زیادہ تعداد تک پہنچ گئی۔
 InvoiceAutoValidate=انوائسز کی خود بخود توثیق کریں۔
 GeneratedFromRecurringInvoice=ٹیمپلیٹ ریکرنگ انوائس %s سے تیار کردہ
@@ -442,24 +448,24 @@ PaymentConditionShort14D=14 دن
 PaymentCondition14D=14 دن
 PaymentConditionShort14DENDMONTH=مہینے کے اختتام کے 14 دن
 PaymentCondition14DENDMONTH=مہینے کے اختتام کے بعد 14 دنوں کے اندر
-PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% جمع
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% ڈپازٹ، ڈیلیوری پر باقی
 FixAmount=مقررہ رقم - '%s' لیبل کے ساتھ 1 لائن
 VarAmount=متغیر رقم (%% tot.)
 VarAmountOneLine=متغیر رقم (%% tot.) - '%s' لیبل کے ساتھ 1 لائن
 VarAmountAllLines=متغیر رقم (%% tot.) - اصل سے تمام لائنیں
-DepositPercent=Deposit %%
-DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected
-GenerateDeposit=Generate a %s%% deposit invoice
-ValidateGeneratedDeposit=Validate the generated deposit
-DepositGenerated=Deposit generated
-ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=You can only automatically generate a deposit from a proposal or an order
-ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
+DepositPercent=ڈپازٹ %%
+DepositGenerationPermittedByThePaymentTermsSelected=ادائیگی کی منتخب کردہ شرائط سے اس کی اجازت ہے۔
+GenerateDeposit=ایک %s%% جمع رسید بنائیں
+ValidateGeneratedDeposit=پیدا شدہ ڈپازٹ کی توثیق کریں۔
+DepositGenerated=جمع کرایا
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=آپ کسی تجویز یا آرڈر سے صرف خود بخود جمع کر سکتے ہیں۔
+ErrorPaymentConditionsNotEligibleToDepositCreation=ادائیگی کی منتخب کردہ شرائط خودکار ڈپازٹ جنریشن کے لیے اہل نہیں ہیں۔
 # PaymentType
 PaymentTypeVIR=بینک ٹرانسفر
 PaymentTypeShortVIR=بینک ٹرانسفر
 PaymentTypePRE=براہ راست ڈیبٹ ادائیگی کا آرڈر
-PaymentTypePREdetails=(on account %s...)
+PaymentTypePREdetails=(اکاؤنٹ %s پر...)
 PaymentTypeShortPRE=ڈیبٹ ادائیگی کا آرڈر
 PaymentTypeLIQ=نقد
 PaymentTypeShortLIQ=نقد
@@ -508,7 +514,7 @@ PaymentByChequeOrderedToShort=چیک کی ادائیگیاں (ٹیکس سمیت)
 SendTo=کو بھیجا
 PaymentByTransferOnThisBankAccount=درج ذیل بینک اکاؤنٹ میں ٹرانسفر کے ذریعے ادائیگی
 VATIsNotUsedForInvoice=* CGI کا غیر قابل اطلاق VAT آرٹ-293B
-VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
+VATIsNotUsedForInvoiceAsso=* CGI کا غیر قابل اطلاق VAT آرٹ-261-7
 LawApplicationPart1=قانون 80.335 از 12/05/80 کے اطلاق سے
 LawApplicationPart2=سامان کی ملکیت رہتی ہے
 LawApplicationPart3=کی مکمل ادائیگی تک بیچنے والے
@@ -518,14 +524,14 @@ UseLine=درخواست دیں
 UseDiscount=ڈسکاؤنٹ استعمال کریں۔
 UseCredit=کریڈٹ استعمال کریں۔
 UseCreditNoteInInvoicePayment=اس کریڈٹ کے ساتھ ادائیگی کے لیے رقم کم کریں۔
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=جمع پرچی
 MenuCheques=چیک کرتا ہے۔
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=ڈپازٹ سلپس
+NewChequeDeposit=نئی ڈپازٹ سلپ
+ChequesReceipts=ڈپازٹ سلپس چیک کریں۔
+DocumentsDepositArea=ڈپازٹ سلپ ایریا
+ChequesArea=ڈپازٹ سلپس کا علاقہ
+ChequeDeposits=ڈپازٹ سلپس
 Cheques=چیک کرتا ہے۔
 DepositId=آئی ڈی ڈپازٹ
 NbCheque=چیکوں کی تعداد
@@ -562,10 +568,10 @@ YouMustCreateStandardInvoiceFirstDesc=آپ کو سب سے پہلے ایک معی
 PDFCrabeDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریب۔ ایک مکمل انوائس ٹیمپلیٹ (سپنج ٹیمپلیٹ کا پرانا نفاذ)
 PDFSpongeDescription=انوائس پی ڈی ایف ٹیمپلیٹ سپنج۔ ایک مکمل انوائس ٹیمپلیٹ
 PDFCrevetteDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریویٹ۔ صورت حال کی رسیدوں کے لیے ایک مکمل انوائس ٹیمپلیٹ
-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 sequential 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 sequential auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=فارمیٹ میں واپسی نمبر %sمعیاری رسیدوں کے لیے yymm-nnnn اور %sکریڈٹ نوٹس کے لیے yymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں اور 0 پر واپسی نہیں
+MarsNumRefModelDesc1=فارمیٹ میں واپسی نمبر %sمعیاری رسیدوں کے لیے yymm-nnnn، %sمتبادل انوائسز کے لیے yymm-nnnn، %sڈاؤن پیمنٹ انوائسز کے لیے yymm-nnnn اور %sکریڈٹ نوٹس کے لیے yymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خودکار ہے۔ بغیر کسی وقفے کے اور 0 پر واپسی کے بغیر بڑھتی ہوئی تعداد
 TerreNumRefModelError=$syymm سے شروع ہونے والا بل پہلے سے موجود ہے اور ترتیب کے اس ماڈل کے ساتھ مطابقت نہیں رکھتا ہے۔ اس ماڈیول کو فعال کرنے کے لیے اسے ہٹا دیں یا اس کا نام تبدیل کریں۔
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=فارمیٹ میں واپسی نمبر %sمعیاری رسیدوں کے لیے yymm-nnnn، %sکریڈٹ نوٹس کے لیے yymm-nnnn اور %sڈاؤن پیمنٹ انوائسز کے لیے yymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہے اور نہ ہی 0 پر واپسی ہے۔
 EarlyClosingReason=ابتدائی بندش کی وجہ
 EarlyClosingComment=ابتدائی اختتامی نوٹ
 ##### Types de contacts #####
@@ -631,19 +637,19 @@ SituationTotalRayToRest=ٹیکس کے بغیر ادا کرنے کے لیے با
 PDFSituationTitle=صورتحال n° %d
 SituationTotalProgress=کل پیش رفت %d %%
 SearchUnpaidInvoicesWithDueDate=مقررہ تاریخ = %s کے ساتھ بلا معاوضہ رسیدیں تلاش کریں۔
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
+SearchValidatedInvoicesWithDate=توثیق کی تاریخ = %s کے ساتھ بلا معاوضہ رسیدیں تلاش کریں۔
 NoPaymentAvailable=%s کے لیے کوئی ادائیگی دستیاب نہیں ہے۔
 PaymentRegisteredAndInvoiceSetToPaid=ادائیگی رجسٹرڈ اور انوائس %s ادا کرنے پر سیٹ ہے۔
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
-MakePaymentAndClassifyPayed=Record payment
-BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
-Salaries=Salaries
-InvoiceSubtype=Invoice Subtype
-SalaryInvoice=Salary
-BillsAndSalaries=Bills & Salaries
-CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
+SendEmailsRemindersOnInvoiceDueDate=تصدیق شدہ اور غیر ادا شدہ رسیدوں کے لیے ای میل کے ذریعے یاد دہانی بھیجیں۔
+MakePaymentAndClassifyPayed=ادائیگی ریکارڈ کریں۔
+BulkPaymentNotPossibleForInvoice=انوائس کے لیے بلک ادائیگی ممکن نہیں ہے %s (خراب قسم یا حیثیت)
+MentionVATDebitOptionIsOn=ڈیبٹ کی بنیاد پر ٹیکس ادا کرنے کا اختیار
+MentionCategoryOfOperations=آپریشنز کا زمرہ
+MentionCategoryOfOperations0=سامان کی ترسیل
+MentionCategoryOfOperations1=خدمات کی فراہمی
+MentionCategoryOfOperations2=مخلوط - سامان کی ترسیل اور خدمات کی فراہمی
+Salaries=تنخواہیں
+InvoiceSubtype=انوائس ذیلی قسم
+SalaryInvoice=تنخواہ
+BillsAndSalaries=بل اور تنخواہ
+CreateCreditNoteWhenClientInvoiceExists=یہ اختیار صرف اس وقت فعال ہوتا ہے جب کسی گاہک کے لیے تصدیق شدہ انوائس موجود ہوں یا جب مستقل INVOICE_CREDIT_NOTE_STANDALONE استعمال کیا جائے (کچھ ممالک کے لیے مفید)
diff --git a/htdocs/langs/ur_PK/companies.lang b/htdocs/langs/ur_PK/companies.lang
index 7155ad7f338..6c0575b3c57 100644
--- a/htdocs/langs/ur_PK/companies.lang
+++ b/htdocs/langs/ur_PK/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=آپ کے رابطے کی تفصیلات ریکارڈ کر لی گئی ہیں۔ ہم جلد ہی آپ سے رابطہ کریں گے...
+ContactUsDesc=یہ فارم آپ کو پہلے رابطے کے لیے ہمیں پیغام بھیجنے کی اجازت دیتا ہے۔
 ErrorCompanyNameAlreadyExists=کمپنی کا نام %s پہلے سے موجود ہے۔ ایک اور کا انتخاب کریں۔
 ErrorSetACountryFirst=پہلے ملک کو سیٹ کریں۔
 SelectThirdParty=تیسرے فریق کو منتخب کریں۔
@@ -19,7 +21,7 @@ ProspectionArea=پراسپیکشن ایریا
 IdThirdParty=آئی ڈی تھرڈ پارٹی
 IdCompany=کمپنی کی شناخت
 IdContact=رابطہ کی شناخت
-ThirdPartyAddress=Third-party address
+ThirdPartyAddress=فریق ثالث کا پتہ
 ThirdPartyContacts=فریق ثالث کے رابطے
 ThirdPartyContact=فریق ثالث کا رابطہ/ پتہ
 Company=کمپنی
@@ -52,22 +54,22 @@ CivilityCode=شہریت کا ضابطہ
 RegisteredOffice=منظور شدہ دفتر
 Lastname=آخری نام
 Firstname=پہلا نام
-RefEmployee=Employee reference
-NationalRegistrationNumber=National registration number
+RefEmployee=ملازم کا حوالہ
+NationalRegistrationNumber=قومی رجسٹریشن نمبر
 PostOrFunction=عہدہ
 UserTitle=عنوان
 NatureOfThirdParty=تیسرے فریق کی نوعیت
 NatureOfContact=رابطے کی نوعیت
 Address=پتہ
 State=ریاست/صوبہ
-StateId=State ID
+StateId=ریاستی شناخت
 StateCode=ریاست/صوبائی کوڈ
 StateShort=حالت
 Region=علاقہ
 Region-State=علاقہ - ریاست
 Country=ملک
 CountryCode=ملک کا کوڈ
-CountryId=Country ID
+CountryId=ملک کی شناخت
 Phone=فون
 PhoneShort=فون
 Skype=سکائپ
@@ -86,6 +88,9 @@ DefaultLang=پہلے سے طے شدہ زبان
 VATIsUsed=سیلز ٹیکس استعمال کیا گیا۔
 VATIsUsedWhenSelling=یہ اس بات کی وضاحت کرتا ہے کہ آیا اس تیسرے فریق میں سیلز ٹیکس شامل ہے یا نہیں جب وہ اپنے صارفین کو انوائس کرتا ہے۔
 VATIsNotUsed=سیلز ٹیکس استعمال نہیں کیا جاتا
+VATReverseCharge=VAT ریورس چارج
+VATReverseChargeByDefault=پہلے سے طے شدہ طور پر VAT ریورس چارج
+VATReverseChargeByDefaultDesc=سپلائر انوائس پر، VAT ریورس چارج بطور ڈیفالٹ استعمال ہوتا ہے۔
 CopyAddressFromSoc=تیسرے فریق کی تفصیلات سے پتہ کاپی کریں۔
 ThirdpartyNotCustomerNotSupplierSoNoRef=فریق ثالث نہ تو گاہک اور نہ وینڈر، کوئی حوالہ دینے والی اشیاء دستیاب نہیں۔
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=تھرڈ پارٹی نہ تو گاہک اور نہ وینڈر، چھوٹ دستیاب نہیں ہے۔
@@ -106,7 +111,7 @@ WrongSupplierCode=وینڈر کوڈ غلط ہے۔
 CustomerCodeModel=کسٹمر کوڈ ماڈل
 SupplierCodeModel=وینڈر کوڈ ماڈل
 Gencod=بارکوڈ
-GencodBuyPrice=Barcode of price ref
+GencodBuyPrice=قیمت کا بار کوڈ حوالہ
 ##### Professional ID #####
 ProfId1Short=پروفیسر آئی ڈی 1
 ProfId2Short=پروفیسر آئی ڈی 2
@@ -114,12 +119,20 @@ ProfId3Short=پروفیسر آئی ڈی 3
 ProfId4Short=پروفیسر آئی ڈی 4
 ProfId5Short=پروفیسر آئی ڈی 5
 ProfId6Short=پروفیسر آئی ڈی 6
+ProfId7Short=پروفیسر آئی ڈی 7
+ProfId8Short=پروفیسر آئی ڈی 8
+ProfId9Short=پروفیسر آئی ڈی 9
+ProfId10Short=پروفیسر id 10
 ProfId1=پروفیشنل آئی ڈی 1
 ProfId2=پروفیشنل آئی ڈی 2
 ProfId3=پروفیشنل آئی ڈی 3
 ProfId4=پروفیشنل آئی ڈی 4
 ProfId5=پروفیشنل آئی ڈی 5
 ProfId6=پروفیشنل آئی ڈی 6
+ProfId7=پروفیشنل آئی ڈی 7
+ProfId8=پروفیشنل آئی ڈی 8
+ProfId9=پروفیشنل آئی ڈی 9
+ProfId10=پروفیشنل آئی ڈی 10
 ProfId1AR=پروفیسر کی شناخت 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
@@ -162,17 +175,17 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=آئی ڈی پروفیسر 1 (تجارتی رجسٹر)
+ProfId2CM=آئی ڈی پروفیسر 2 (ٹیکس دہندہ نمبر)
+ProfId3CM=آئی ڈی پروفیسر 3 (تخلیق کے فرمان کی تعداد)
+ProfId4CM=آئی ڈی پروفیسر 4 (ڈپازٹ سرٹیفکیٹ کی تعداد)
+ProfId5CM=آئی ڈی پروفیسر 5 (دیگر)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
-ProfId5ShortCM=Others
+ProfId1ShortCM=تجارتی رجسٹر
+ProfId2ShortCM=ٹیکس دہندہ نمبر
+ProfId3ShortCM=تخلیق کے فرمان کی تعداد
+ProfId4ShortCM=ڈپازٹ سرٹیفکیٹ کی تعداد
+ProfId5ShortCM=دوسرے
 ProfId6ShortCM=-
 ProfId1CO=پروفیسر Id 1 (R.U.T.)
 ProfId2CO=-
@@ -198,12 +211,20 @@ ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=پروفیسر کی شناخت 4 (RCS/RM)
 ProfId5FR=پروفیسر آئی ڈی 5 (نمبر EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=سائرن کی آواز
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=این اے ایف
 ProfId4ShortFR=آر سی ایس
 ProfId5ShortFR=ای او آر آئی
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=رجسٹریشن نمبر
 ProfId2GB=-
 ProfId3GB=ایس آئی سی
@@ -242,7 +263,7 @@ ProfId5MA=آئی ڈی پروفیسر 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=پروفیسر Id 1 (R.F.C)۔
 ProfId2MX=پروفیسر Id 2 (R.P. IMSS)
-ProfId3MX=Prof Id 3 (پروفیشنل چارٹر)
+ProfId3MX=پروفیسر کی شناخت 3 (پیشہ ورانہ چارٹر)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -312,12 +333,12 @@ CustomerRelativeDiscountShort=متعلقہ رعایت
 CustomerAbsoluteDiscountShort=مطلق رعایت
 CompanyHasRelativeDiscount=اس صارف کے پاس <b> %s%% </b> کی ڈیفالٹ رعایت ہے۔
 CompanyHasNoRelativeDiscount=اس صارف کو بطور ڈیفالٹ کوئی رشتہ دار رعایت نہیں ہے۔
-HasRelativeDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s%% </b> کی ڈیفالٹ رعایت ہے۔
-HasNoRelativeDiscountFromSupplier=آپ کے پاس اس وینڈر سے کوئی ڈیفالٹ رشتہ دار رعایت نہیں ہے۔
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=اس وینڈر کے ساتھ کوئی ڈیفالٹ رشتہ دار رعایت نہیں۔
 CompanyHasAbsoluteDiscount=اس صارف کے پاس <b> %s </b> %s کے لیے رعایتیں دستیاب ہیں (کریڈٹ نوٹس یا ڈاؤن پیمنٹس)
 CompanyHasDownPaymentOrCommercialDiscount=اس صارف کے پاس <b> %s </b> %s کے لیے چھوٹ دستیاب ہے (تجارتی، نیچے ادائیگیاں)
 CompanyHasCreditNote=اس صارف کے پاس ابھی بھی <b> %s </b> %s کے لیے کریڈٹ نوٹ موجود ہیں۔
-HasNoAbsoluteDiscountFromSupplier=آپ کو اس وینڈر سے کوئی رعایتی کریڈٹ دستیاب نہیں ہے۔
+HasNoAbsoluteDiscountFromSupplier=اس وینڈر سے کوئی رعایت/کریڈٹ دستیاب نہیں ہے۔
 HasAbsoluteDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s </b> %s کے لیے رعایتیں دستیاب ہیں (کریڈٹ نوٹس یا ڈاؤن پیمنٹس)
 HasDownPaymentOrCommercialDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s </b> %s کے لیے چھوٹ دستیاب ہے (تجارتی، نیچے ادائیگی)
 HasCreditNoteFromSupplier=آپ کے پاس اس وینڈر سے <b> %s </b> %s کے لیے کریڈٹ نوٹس ہیں۔
@@ -364,7 +385,7 @@ ListOfThirdParties=تیسرے فریق کی فہرست
 ShowCompany=تیسری پارٹی
 ShowContact=رابطہ کا پتہ
 ContactsAllShort=تمام (کوئی فلٹر نہیں)
-ContactType=Contact role
+ContactType=رابطہ کردار
 ContactForOrders=آرڈر کا رابطہ
 ContactForOrdersOrShipments=آرڈر یا شپمنٹ کا رابطہ
 ContactForProposals=تجویز کا رابطہ
@@ -384,7 +405,7 @@ EditCompany=کمپنی میں ترمیم کریں۔
 ThisUserIsNot=یہ صارف کوئی امکان، گاہک یا وینڈر نہیں ہے۔
 VATIntraCheck=چیک کریں۔
 VATIntraCheckDesc=VAT ID میں ملک کا سابقہ شامل ہونا چاہیے۔ لنک <b> %s </b> یورپی VAT چیکر سروس (VIES) کا استعمال کرتا ہے جسے Dolibarr سرور سے انٹرنیٹ تک رسائی کی ضرورت ہوتی ہے۔
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=یورپی کمیشن کی ویب سائٹ پر انٹرا کمیونٹی VAT ID چیک کریں۔
 VATIntraManualCheck=آپ یورپی کمیشن کی ویب سائٹ <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> پر دستی طور پر بھی چیک کر سکتے ہیں۔
 ErrorVATCheckMS_UNAVAILABLE=چیک کرنا ممکن نہیں ہے۔ چیک سروس رکن ریاست (%s) کی طرف سے فراہم نہیں کی جاتی ہے۔
@@ -444,7 +465,7 @@ AddAddress=ایڈریس شامل کریں۔
 SupplierCategory=وینڈر کیٹیگری
 JuridicalStatus200=آزاد
 DeleteFile=فائل کو ڈیلیٹ کریں
-ConfirmDeleteFile=Are you sure you want to delete this file?
+ConfirmDeleteFile=کیا آپ واقعی اس فائل کو حذف کرنا چاہتے ہیں <b>%s</b>؟
 AllocateCommercial=سیلز کے نمائندے کو تفویض کیا گیا۔
 Organization=تنظیم
 FiscalYearInformation=مالی سال
@@ -472,7 +493,7 @@ CurrentOutstandingBill=موجودہ بقایا بل
 OutstandingBill=زیادہ سے زیادہ بقایا بل کے لیے
 OutstandingBillReached=زیادہ سے زیادہ بقایا بل تک پہنچ گئے۔
 OrderMinAmount=آرڈر کے لیے کم از کم رقم
-MonkeyNumRefModelDesc=کسٹمر کوڈ کے لیے %syymm-nnnn فارمیٹ میں ایک نمبر اور وینڈر کوڈ کے لیے %syymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہوتا ہے اور 0 پر واپس نہیں آتا ہے۔
+MonkeyNumRefModelDesc=فارمیٹ میں نمبر واپس کریں %sکسٹمر کوڈ کے لیے yymm-nnnn اور %s yymm-nnnn وینڈر کوڈ کے لیے جہاں yy ہے سال، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہوتا اور 0 پر واپسی نہیں ہوتی۔
 LeopardNumRefModelDesc=کوڈ مفت ہے۔ اس کوڈ میں کسی بھی وقت ترمیم کی جا سکتی ہے۔
 ManagingDirectors=مینیجر کا نام (سی ای او، ڈائریکٹر، صدر...)
 MergeOriginThirdparty=ڈپلیکیٹ تھرڈ پارٹی (تیسری پارٹی جسے آپ حذف کرنا چاہتے ہیں)
@@ -498,3 +519,12 @@ RestOfEurope=باقی یورپ (EEC)
 OutOfEurope=یورپ سے باہر (EEC)
 CurrentOutstandingBillLate=موجودہ بقایا بل دیر سے
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=ہوشیار رہیں، آپ کی پروڈکٹ کی قیمت کی ترتیبات کے مطابق، آپ کو POS میں پروڈکٹ شامل کرنے سے پہلے فریق ثالث کو تبدیل کرنا چاہیے۔
+EmailAlreadyExistsPleaseRewriteYourCompanyName=ای میل پہلے سے موجود ہے براہ کرم اپنی کمپنی کا نام دوبارہ لکھیں۔
+TwoRecordsOfCompanyName=اس کمپنی کے لیے ایک سے زیادہ ریکارڈ موجود ہیں، اپنی شراکت کی درخواست مکمل کرنے کے لیے براہ کرم ہم سے رابطہ کریں۔
+CompanySection=کمپنی سیکشن
+ShowSocialNetworks=سوشل نیٹ ورک دکھائیں۔
+HideSocialNetworks=سوشل نیٹ ورک چھپائیں۔
+ExternalSystemID=بیرونی سسٹم ID
+IDOfPaymentInAnExternalSystem=بیرونی نظام میں ادائیگی کے موڈ کی ID (جیسے پٹی، پے پال، ...)
+AADEWebserviceCredentials=AADE ویب سروس کی اسناد
+ThirdPartyMustBeACustomerToCreateBANOnStripe=فریق ثالث کو سٹرائپ سائیڈ پر اپنی بینک کی معلومات بنانے کی اجازت دینے کے لیے ایک صارف ہونا چاہیے۔
diff --git a/htdocs/langs/ur_PK/compta.lang b/htdocs/langs/ur_PK/compta.lang
index 8273429d767..bc8e3a604b2 100644
--- a/htdocs/langs/ur_PK/compta.lang
+++ b/htdocs/langs/ur_PK/compta.lang
@@ -29,8 +29,8 @@ BalanceBefore=توازن (پہلے)
 Balance=بقیہ
 Debit=ڈیبٹ
 Credit=کریڈٹ
-AccountingDebit=Debit
-AccountingCredit=Credit
+AccountingDebit=ڈیبٹ
+AccountingCredit=کریڈٹ
 Piece=اکاؤنٹنگ ڈاکٹر
 AmountHTVATRealReceived=نیٹ جمع
 AmountHTVATRealPaid=خالص ادائیگی
@@ -82,8 +82,8 @@ MenuNewSocialContribution=نیا سماجی/مالیاتی ٹیکس
 NewSocialContribution=نیا سماجی/مالیاتی ٹیکس
 AddSocialContribution=سماجی/مالیاتی ٹیکس شامل کریں۔
 ContributionsToPay=ادا کرنے کے لیے سماجی/مالیاتی ٹیکس
-AccountancyTreasuryArea=Accounting area
-InvoicesArea=Billing and payment area
+AccountancyTreasuryArea=اکاؤنٹنگ ایریا
+InvoicesArea=بلنگ اور ادائیگی کا علاقہ
 NewPayment=نئی ادائیگی
 PaymentCustomerInvoice=کسٹمر انوائس کی ادائیگی
 PaymentSupplierInvoice=وینڈر انوائس کی ادائیگی
@@ -131,17 +131,17 @@ SalesTurnoverMinimum=کم سے کم کاروبار
 ByExpenseIncome=اخراجات اور آمدنی سے
 ByThirdParties=تیسرے فریق کے ذریعہ
 ByUserAuthorOfInvoice=انوائس مصنف کے ذریعہ
-CheckReceipt=Deposit slip
-CheckReceiptShort=Deposit slip
-LastCheckReceiptShort=Latest %s deposit slips
-LastPaymentForDepositShort=Latest %s %s deposit slips
+CheckReceipt=رقم جمع کروانے کی رسید
+CheckReceiptShort=رقم جمع کروانے کی رسید
+LastCheckReceiptShort=تازہ ترین %s ڈپازٹ سلپس
+LastPaymentForDepositShort=تازہ ترین %s %s ڈپازٹ سلپس
 NewCheckReceipt=نئی رعایت
-NewCheckDeposit=New deposit slip
+NewCheckDeposit=نئی ڈپازٹ سلپ
 NewCheckDepositOn=اکاؤنٹ پر جمع کرنے کے لیے رسید بنائیں: %s
 NoWaitingChecks=کوئی چیک ڈپازٹ کے منتظر نہیں۔
-NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
+NoWaitingPaymentForDeposit=کوئی %s ادائیگی ڈپازٹ کی منتظر ہے۔
 DateChequeReceived=وصول کرنے کی تاریخ چیک کریں۔
-DatePaymentReceived=Date of document reception
+DatePaymentReceived=دستاویز کے استقبال کی تاریخ
 NbOfCheques=چیکوں کی تعداد
 PaySocialContribution=سماجی/مالیاتی ٹیکس ادا کریں۔
 PayVAT=VAT اعلامیہ ادا کریں۔
@@ -152,18 +152,19 @@ ConfirmPaySalary=کیا آپ واقعی اس تنخواہ کارڈ کو بطور
 DeleteSocialContribution=سماجی یا مالی ٹیکس کی ادائیگی کو حذف کریں۔
 DeleteVAT=VAT اعلامیہ حذف کریں۔
 DeleteSalary=تنخواہ کارڈ حذف کریں۔
-DeleteVariousPayment=Delete a various payment
+DeleteVariousPayment=مختلف ادائیگیوں کو حذف کریں۔
 ConfirmDeleteSocialContribution=کیا آپ واقعی اس سماجی/مالیاتی ٹیکس کی ادائیگی کو حذف کرنا چاہتے ہیں؟
 ConfirmDeleteVAT=کیا آپ واقعی اس VAT ڈیکلریشن کو حذف کرنا چاہتے ہیں؟
-ConfirmDeleteSalary=Are you sure you want to delete this salary ?
-ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
+ConfirmDeleteSalary=کیا آپ واقعی اس تنخواہ کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteVariousPayment=کیا آپ واقعی اس مختلف ادائیگی کو حذف کرنا چاہتے ہیں؟
 ExportDataset_tax_1=سماجی اور مالیاتی ٹیکس اور ادائیگیاں
 CalcModeVATDebt=موڈ <b> %sVAT پر عزم accounting%s </b> ۔
 CalcModeVATEngagement=موڈ <b> %sVAT آمدنی-خرچوں0ecb2ec87f49fz0 </b>
-CalcModeDebt=Analysis of known recorded documents
-CalcModeEngagement=Analysis of known recorded payments
+CalcModeDebt=معلوم ریکارڈ شدہ دستاویزات کا تجزیہ
+CalcModeEngagement=معلوم ریکارڈ شدہ ادائیگیوں کا تجزیہ
+CalcModePayment=Analysis of known recorded payments
 CalcModeBookkeeping=بک کیپنگ لیجر ٹیبل میں جرنلائزڈ ڈیٹا کا تجزیہ۔
-CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
+CalcModeNoBookKeeping=یہاں تک کہ اگر ان کا ابھی تک لیجر میں حساب نہیں لیا گیا ہے۔
 CalcModeLT1= موڈ <b> %sRE کسٹمر انوائس پر - سپلائرز invoices%s </b>
 CalcModeLT1Debt=موڈ <b> %sRE کسٹمر انوائس پر موڈ
 CalcModeLT1Rec= موڈ <b> %sRE سپلائرز انوائس پر
@@ -177,7 +178,7 @@ AnnualByCompaniesDueDebtMode=آمدنی اور اخراجات کا توازن،
 AnnualByCompaniesInputOutputMode=آمدنی اور اخراجات کا توازن، پہلے سے طے شدہ گروپوں کے لحاظ سے تفصیل، موڈ <b> %sIncomes-Expenses%s </b> نے کہا a0aee83365837fz4701917fz
 SeeReportInInputOutputMode=دیکھیں <b> %sادائیگیوں کا تجزیہ
 SeeReportInDueDebtMode=دیکھیں <b> %s ریکارڈ شدہ دستاویزات کا تجزیہ.
-SeeReportInBookkeepingMode=دیکھیں <b> %s بک کیپنگ لیجر ٹیبل کا تجزیہ
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- دکھائی گئی رقم تمام ٹیکسوں کے ساتھ ہے۔
 RulesAmountWithTaxExcluded=- دکھائے گئے انوائسز کی رقم تمام ٹیکسوں کو چھوڑ کر ہے۔
 RulesResultDue=- اس میں تمام رسیدیں، اخراجات، VAT، عطیات، تنخواہیں، چاہے وہ ادا کیے جائیں یا نہ ہوں۔ <br> - یہ انوائسز کی بلنگ کی تاریخ اور اخراجات یا ٹیکس کی ادائیگیوں کی مقررہ تاریخ پر مبنی ہے۔ تنخواہوں کے لیے، مدت کے اختتام کی تاریخ استعمال کی جاتی ہے۔
@@ -251,14 +252,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=فی پروڈکٹ جمع ہ
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=فی سیل ٹیکس کی شرح سے جمع ہونے والے ٹرن اوور کی رپورٹ دستیاب نہیں ہے۔ یہ رپورٹ صرف ٹرن اوور انوائس کے لیے دستیاب ہے۔
 CalculationMode=کیلکولیشن موڈ
 AccountancyJournal=اکاؤنٹنگ کوڈ جرنل
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) سیلز پر VAT کے لیے ڈیفالٹ اکاؤنٹ کے طور پر استعمال کیا جائے گا (اگر VAT ڈکشنری سیٹ اپ پر اس کی وضاحت نہیں کی گئی ہے)
+ACCOUNTING_VAT_BUY_ACCOUNT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) خریداریوں پر VAT کے لیے ڈیفالٹ اکاؤنٹ کے طور پر استعمال کیا جائے گا (اگر VAT ڈکشنری سیٹ اپ پر اس کی وضاحت نہیں کی گئی ہے)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) سیلز پر ریونیو سٹیمپ کے لیے استعمال کیا جائے گا۔
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) خریداریوں پر ریونیو سٹیمپ کے لیے استعمال کیا جائے گا۔
+ACCOUNTING_VAT_PAY_ACCOUNT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) VAT کی ادائیگی کے لیے بطور ڈیفالٹ اکاؤنٹ استعمال کیا جائے۔
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) ریورس چارجز کے لیے خریداریوں پر VAT کے لیے ڈیفالٹ اکاؤنٹ کے طور پر استعمال کیا جائے گا (کریڈٹ)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) ریورس چارجز (ڈیبٹ) کے لیے خریداریوں پر VAT کے لیے بطور ڈیفالٹ اکاؤنٹ استعمال کیا جائے گا۔
+ACCOUNTING_ACCOUNT_CUSTOMER=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) "کسٹمر" تیسرے فریق کے لیے استعمال کیا جاتا ہے۔
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=تھرڈ پارٹی کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر تھرڈ پارٹی پر مخصوص کسٹمر اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=اکاؤنٹ (اکاؤنٹ کے چارٹ سے) "فروش" تیسرے فریق کے لیے استعمال کیا جاتا ہے۔
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=تھرڈ پارٹی کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر تیسرے فریق پر ڈیڈیکیٹڈ وینڈر اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
 ConfirmCloneTax=سماجی/مالیاتی ٹیکس کے کلون کی تصدیق کریں۔
 ConfirmCloneVAT=VAT ڈیکلریشن کے کلون کی تصدیق کریں۔
@@ -298,9 +301,9 @@ ReportPurchaseTurnover=ٹرن اوور کی انوائس خریدی۔
 ReportPurchaseTurnoverCollected=خریداری کا کاروبار جمع ہوا۔
 IncludeVarpaysInResults = رپورٹس میں مختلف ادائیگیاں شامل کریں۔
 IncludeLoansInResults = رپورٹوں میں قرضوں کو شامل کریں۔
-InvoiceLate30Days = Late (> 30 days)
-InvoiceLate15Days = Late (15 to 30 days)
-InvoiceLateMinus15Days = Late (< 15 days)
+InvoiceLate30Days = دیر سے (> 30 دن)
+InvoiceLate15Days = دیر سے (15 سے 30 دن)
+InvoiceLateMinus15Days = دیر سے (<15 دن)
 InvoiceNotLate = جمع کیا جائے گا (<15 دن)
 InvoiceNotLate15Days = جمع کیا جائے گا (15 سے 30 دن)
 InvoiceNotLate30Days = جمع کیا جائے گا (> 30 دن)
@@ -309,4 +312,4 @@ InvoiceToPay15Days=ادائیگی کے لیے (15 سے 30 دن)
 InvoiceToPay30Days=ادائیگی کے لیے (> 30 دن)
 ConfirmPreselectAccount=اکاؤنٹنسی کوڈ کو پہلے سے منتخب کریں۔
 ConfirmPreselectAccountQuestion=کیا آپ واقعی اس اکاؤنٹنسی کوڈ کے ساتھ %s منتخب لائنوں کو پہلے سے منتخب کرنا چاہتے ہیں؟
-AmountPaidMustMatchAmountOfDownPayment=Amount paid must match amount of down payment
+AmountPaidMustMatchAmountOfDownPayment=ادا کی گئی رقم ڈاؤن پیمنٹ کی رقم سے مماثل ہونی چاہیے۔
diff --git a/htdocs/langs/ur_PK/errors.lang b/htdocs/langs/ur_PK/errors.lang
index ab928e58764..cf0e1c7b47a 100644
--- a/htdocs/langs/ur_PK/errors.lang
+++ b/htdocs/langs/ur_PK/errors.lang
@@ -95,7 +95,7 @@ ErrorModuleRequireJavascript=اس خصوصیت کو کام کرنے کے لیے
 ErrorPasswordsMustMatch=دونوں ٹائپ شدہ پاس ورڈ ایک دوسرے سے مماثل ہونے چاہئیں
 ErrorContactEMail=ایک تکنیکی خرابی پیش آگئی۔ براہ کرم، مندرجہ ذیل ای میل کے لیے منتظم سے رابطہ کریں <b>%s</b> اور غلطی فراہم کریں کوڈ <b>%s</b> اپنے پیغام میں، یا اس کی اسکرین کاپی شامل کریں یہ صفحہ.
 ErrorWrongValueForField=فیلڈ <b> %s </b> : '<b> %s a09a4b739f17f8zec0839f17f8zec083839f17f8zexa83fz39fz7839f49fz083839f49fz0839fz7839f49fz0839fz7fz19 سے مماثل ہے
-ErrorHtmlInjectionForField=فیلڈ <b>%s</b>: قدر '<span class='notranslate' '><b></span>%s</b>' میں بدنیتی پر مبنی ڈیٹا کی اجازت نہیں ہے
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=فیلڈ <b> %s </b>: '<b> %s </b>' ایک قیمت میدان <b> %s </b> میں پائے کا نہیں ہے <b> %s </b>
 ErrorFieldRefNotIn=فیلڈ <b> %s </b> : '<b> %s </b>839f17f8z080839f739f17fz087839fz08739fz087fz0839fz087fz39fz087fz087fz087fz07fz087f49fz07fz09fz0839f17fz087fz087fz07fz07fz0839f17fz07fz087fz0839f17fz087fz.
 ErrorMultipleRecordFoundFromRef=ref <b>%s</b> سے تلاش کرنے پر کئی ریکارڈ ملے۔ یہ جاننے کا کوئی طریقہ نہیں کہ کون سی آئی ڈی استعمال کرنی ہے۔
@@ -263,7 +263,7 @@ ErrorReplaceStringEmpty=خرابی، جس سٹرنگ کو تبدیل کرنا ہ
 ErrorProductNeedBatchNumber=خرابی، پروڈکٹ '<b> %s </b>' بہت زیادہ/سیریل نمبر کی ضرورت ہے
 ErrorProductDoesNotNeedBatchNumber=خرابی، پروڈکٹ '<b> %s </b>' لاٹ/سیریل نمبر قبول نہیں کرتا
 ErrorFailedToReadObject=خرابی، <b> %s </b> قسم کے آبجیکٹ کو پڑھنے میں ناکام
-ErrorParameterMustBeEnabledToAllwoThisFeature=خرابی، پیرامیٹر <b>%s</b> کو <span class= میں فعال ہونا ضروری ہے۔ 'notranslate'><b></span>conf/conf.php<> اندرونی جاب شیڈولر کے ذریعہ کمانڈ لائن انٹرفیس کے استعمال کی اجازت دینے کے لیے
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=خرابی، یہ لاگ ان درست تاریخ کی حد سے باہر ہے۔
 ErrorValueLength=فیلڈ کی لمبائی '<b> %s </b>' '<b> %s a09a4b739f' سے زیادہ ہونی چاہیے۔
 ErrorReservedKeyword=لفظ '<b> %s </b>' ایک محفوظ مطلوبہ لفظ ہے۔
diff --git a/htdocs/langs/ur_PK/eventorganization.lang b/htdocs/langs/ur_PK/eventorganization.lang
index 3a040d40fcd..aabea31a087 100644
--- a/htdocs/langs/ur_PK/eventorganization.lang
+++ b/htdocs/langs/ur_PK/eventorganization.lang
@@ -36,7 +36,7 @@ EventOrganizationSetup=ایونٹ آرگنائزیشن سیٹ اپ
 EventOrganization=تقریب کی تنظیم
 EventOrganizationSetupPage = ایونٹ آرگنائزیشن سیٹ اپ صفحہ
 EVENTORGANIZATION_TASK_LABEL = پروجیکٹ کی توثیق ہونے پر خود بخود تخلیق کرنے کے لیے کاموں کا لیبل
-EVENTORGANIZATION_TASK_LABELTooltip = جب آپ کسی ایونٹ کو منظم کرنے کے لیے توثیق کرتے ہیں، تو پروجیکٹ میں کچھ کام خود بخود بن سکتے ہیں<br><br>مثال کے طور پر: <br>کانفرنسز کے لیے کال بھیجیں<br>بوتھز کے لیے کال بھیجیں<br>کلاسز کی درست تجویز کریں ='notranslate'><br></span>بوتھس کے لیے درخواست کی توثیق کریں<br>شرکاء کے لیے ایونٹ کی سبسکرپشنز کھولیںb0342fccfda19bzmin تقریب کے مقررین کو<span class='notranslate'><br>بوتھ کے میزبانوں کو ایونٹ کی یاد دہانی بھیجیں<br>شرکاء کو ایونٹ کی یاد دہانی بھیجیں
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
 EVENTORGANIZATION_TASK_LABELTooltip2=اگر آپ کو خود بخود کام بنانے کی ضرورت نہیں ہے تو خالی رکھیں۔
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = فریق ثالث میں شامل کرنے کے لیے زمرہ خود بخود بن جاتا ہے جب کوئی کانفرنس تجویز کرتا ہے۔
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = تیسری پارٹیوں میں شامل کرنے کے لیے زمرہ خود بخود بن جاتا ہے جب وہ بوتھ تجویز کرتے ہیں۔
@@ -88,6 +88,7 @@ PriceOfRegistration=رجسٹریشن کی قیمت
 PriceOfRegistrationHelp=رجسٹر کرنے یا ایونٹ میں شرکت کے لیے ادا کرنے کی قیمت
 PriceOfBooth=ایک بوتھ کھڑا کرنے کے لیے سبسکرپشن کی قیمت
 PriceOfBoothHelp=ایک بوتھ کھڑے کرنے کے لئے سبسکرپشن کی قیمت
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=کانفرنسوں کے لیے ICS لنک کریں۔
 ConferenceOrBoothInformation=کانفرنس یا بوتھ کی معلومات
 Attendees=حاضرین
diff --git a/htdocs/langs/ur_PK/exports.lang b/htdocs/langs/ur_PK/exports.lang
index ebea0298bca..8247a223aa9 100644
--- a/htdocs/langs/ur_PK/exports.lang
+++ b/htdocs/langs/ur_PK/exports.lang
@@ -95,7 +95,7 @@ NbOfLinesImported=کامیابی سے درآمد شدہ لائنوں کی تعد
 DataComeFromNoWhere=داخل کرنے کی قدر سورس فائل میں کہیں سے نہیں آتی ہے۔
 DataComeFromFileFieldNb=داخل کرنے کی قدر ماخذ فائل میں کالم <b>%s</b> سے آتی ہے۔
 DataComeFromIdFoundFromRef=ماخذ فائل سے آنے والی قدر کو استعمال کرنے کے لیے پیرنٹ آبجیکٹ کی شناخت تلاش کرنے کے لیے استعمال کیا جائے گا (لہذا آبجیکٹ <b>%s</b> جس میں ماخذ فائل سے حوالہ ڈیٹا بیس میں موجود ہونا چاہیے)۔
-DataComeFromIdFoundFromCodeId=ماخذ فائل سے آنے والے کوڈ کی قدر کو استعمال کرنے کے لیے پیرنٹ آبجیکٹ کی شناخت تلاش کرنے کے لیے استعمال کیا جائے گا (لہذا ماخذ فائل کا کوڈ لغت میں موجود ہونا چاہیے <b><span کلاس ='notranslate'>%s</span></b>)۔ نوٹ کریں کہ اگر آپ کو آئی ڈی معلوم ہے تو آپ اسے کوڈ کے بجائے سورس فائل میں بھی استعمال کر سکتے ہیں۔ درآمد دونوں صورتوں میں کام کرنا چاہئے.
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=سورس فائل سے آنے والا ڈیٹا درج ذیل فیلڈ میں داخل کیا جائے گا:
 DataIDSourceIsInsertedInto=پیرنٹ آبجیکٹ کی آئی ڈی، جو سورس فائل میں ڈیٹا کا استعمال کرتے ہوئے پائی گئی تھی، درج ذیل فیلڈ میں ڈالی جائے گی:
 DataCodeIDSourceIsInsertedInto=پیرنٹ لائن کی آئی ڈی، جو کوڈ سے ملی تھی، درج ذیل فیلڈ میں ڈالی جائے گی:
diff --git a/htdocs/langs/ur_PK/hrm.lang b/htdocs/langs/ur_PK/hrm.lang
index 56060320255..fe4a8f81cc4 100644
--- a/htdocs/langs/ur_PK/hrm.lang
+++ b/htdocs/langs/ur_PK/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=کھلی اسٹیبلشمنٹ
 CloseEtablishment=بند اسٹیبلشمنٹ
 # Dictionary
 DictionaryPublicHolidays=چھٹی - عوامی تعطیلات
-DictionaryDepartment=HRM - Organizational Unit
+DictionaryDepartment=HRM - تنظیمی یونٹ
 DictionaryFunction=HRM - ملازمت کی پوزیشنیں۔
 # Module
 Employees=ملازمین
@@ -26,9 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=صفوں کی پہلے سے طے شدہ تفصیل
 deplacement=شفٹ
 DateEval=تشخیص کی تاریخ
 JobCard=جاب کارڈ
-NewJobProfile=New Job Profile
-JobProfile=Job profile
-JobsProfiles=Job profiles
+NewJobProfile=نئی جاب پروفائل
+JobProfile=ملازمت کی پروفائل
+JobsProfiles=جاب پروفائلز
 NewSkill=نیا ہنر
 SkillType=مہارت کی قسم
 Skilldets=اس مہارت کے لیے درجات کی فہرست
@@ -37,7 +37,7 @@ rank=رینک
 ErrNoSkillSelected=کوئی ہنر منتخب نہیں کیا گیا۔
 ErrSkillAlreadyAdded=یہ مہارت پہلے سے ہی فہرست میں ہے۔
 SkillHasNoLines=اس مہارت کی کوئی لکیر نہیں ہے۔
-Skill=Skill
+Skill=ہنر
 Skills=ہنر
 SkillCard=ہنر کارڈ
 EmployeeSkillsUpdated=ملازمین کی مہارتوں کو اپ ڈیٹ کر دیا گیا ہے (ملازمین کارڈ کا "ہنر" ٹیب دیکھیں)
@@ -47,51 +47,51 @@ NewEval=نئی تشخیص
 ValidateEvaluation=تشخیص کی توثیق کریں۔
 ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=تشخیصی کارڈ
-RequiredRank=Required rank for the job profile
-RequiredRankShort=Required rank
-PositionsWithThisProfile=Positions with this job profiles
+RequiredRank=جاب پروفائل کے لیے مطلوبہ رینک
+RequiredRankShort=مطلوبہ درجہ
+PositionsWithThisProfile=اس جاب پروفائلز کے ساتھ عہدے
 EmployeeRank=اس مہارت کے لیے ملازم کا درجہ
-EmployeeRankShort=Employee rank
+EmployeeRankShort=ملازم کا درجہ
 EmployeePosition=ملازم کی پوزیشن
 EmployeePositions=ملازمین کے عہدے
 EmployeesInThisPosition=اس عہدے پر ملازمین
 group1ToCompare=تجزیہ کرنے کے لیے صارف گروپ
 group2ToCompare=موازنہ کے لیے دوسرا صارف گروپ
-OrJobToCompare=Compare to skill requirements of a job profile
+OrJobToCompare=ملازمت کے پروفائل کی مہارت کی ضروریات کا موازنہ کریں۔
 difference=فرق
 CompetenceAcquiredByOneOrMore=قابلیت ایک یا زیادہ صارفین نے حاصل کی ہے لیکن دوسرے موازنہ کنندہ کے ذریعہ درخواست نہیں کی گئی ہے۔
-MaxlevelGreaterThan=Employee level is greater than the expected level
-MaxLevelEqualTo=Employee level is equals to the expected level
-MaxLevelLowerThan=Employee level is lower than that the expected level
-MaxlevelGreaterThanShort=Level greater than expected
-MaxLevelEqualToShort=Level equal to the expected level
-MaxLevelLowerThanShort=Level lower than expected
+MaxlevelGreaterThan=ملازمین کی سطح متوقع سطح سے زیادہ ہے۔
+MaxLevelEqualTo=ملازمین کی سطح متوقع سطح کے برابر ہے۔
+MaxLevelLowerThan=ملازمین کی سطح متوقع سطح سے کم ہے۔
+MaxlevelGreaterThanShort=سطح توقع سے زیادہ ہے۔
+MaxLevelEqualToShort=متوقع سطح کے برابر سطح
+MaxLevelLowerThanShort=توقع سے کم سطح
 SkillNotAcquired=مہارت تمام صارفین کے ذریعہ حاصل نہیں کی گئی ہے اور دوسرے موازنہ کنندہ کے ذریعہ درخواست کی گئی ہے۔
 legend=لیجنڈ
 TypeSkill=مہارت کی قسم
-AddSkill=Add skills to job profile
-RequiredSkills=Required skills for this job profile
+AddSkill=جاب پروفائل میں مہارتیں شامل کریں۔
+RequiredSkills=اس جاب پروفائل کے لیے درکار ہنر
 UserRank=صارف کی درجہ بندی
 SkillList=ہنر کی فہرست
 SaveRank=رینک محفوظ کریں۔
-TypeKnowHow=Know-how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
+TypeKnowHow=جاننے کا طریقہ
+TypeHowToBe=کیسے بننا ہے۔
+TypeKnowledge=علم
 AbandonmentComment=ترک تبصرہ
 DateLastEval=آخری تشخیص کی تاریخ
 NoEval=اس ملازم کی کوئی تشخیص نہیں کی گئی۔
 HowManyUserWithThisMaxNote=اس رینک والے صارفین کی تعداد
 HighestRank=اعلیٰ ترین عہدہ
 SkillComparison=مہارت کا موازنہ
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Complementary attributes (Skills)
-JobsExtraFields=Complementary attributes (Job profile)
-EvaluationsExtraFields=Complementary attributes (Evaluations)
-NeedBusinessTravels=Need business travels
-NoDescription=No description
-TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
+ActionsOnJob=اس کام پر ہونے والے واقعات
+VacantPosition=ملازمت کی جگہ خالی
+VacantCheckboxHelper=اس آپشن کو چیک کرنے سے خالی جگہیں دکھائی دیں گی (نوکری کی خالی جگہ)
+SaveAddSkill = مہارتیں شامل کی گئیں۔
+SaveLevelSkill = مہارت کی سطح محفوظ ہو گئی۔
+DeleteSkill = ہنر ہٹا دیا گیا۔
+SkillsExtraFields=تکمیلی صفات (مہارت)
+JobsExtraFields=تکمیلی صفات (جاب پروفائل)
+EvaluationsExtraFields=تکمیلی صفات (تشخیصات)
+NeedBusinessTravels=کاروباری سفر کی ضرورت ہے۔
+NoDescription=کوئی وضاحت نہیں
+TheJobProfileHasNoSkillsDefinedFixBefore=اس ملازم کی جانچ شدہ جاب پروفائل میں اس پر کوئی ہنر متعین نہیں ہے۔ براہ کرم مہارت (ہنر) شامل کریں، پھر حذف کریں اور تشخیص کو دوبارہ شروع کریں۔
diff --git a/htdocs/langs/ur_PK/mails.lang b/htdocs/langs/ur_PK/mails.lang
index 5fe727a17f1..e13f65d2de1 100644
--- a/htdocs/langs/ur_PK/mails.lang
+++ b/htdocs/langs/ur_PK/mails.lang
@@ -182,7 +182,7 @@ IsAnAnswer=ابتدائی ای میل کا جواب ہے۔
 RecordCreatedByEmailCollector=ای میل کلکٹر %s ای میل %s سے ریکارڈ بنایا گیا
 DefaultBlacklistMailingStatus=نیا رابطہ بناتے وقت فیلڈ '%s' کے لیے ڈیفالٹ قدر
 DefaultStatusEmptyMandatory=خالی لیکن لازمی
-WarningLimitSendByDay=انتباہ: آپ کی مثال کا سیٹ اپ یا معاہدہ آپ کی روزانہ کی ای میلز کی تعداد کو <b>%s<span class='notranslate' تک محدود کرتا ہے۔ ></b></span>۔ مزید بھیجنے کی کوشش کرنے کے نتیجے میں آپ کی مثال سست یا معطل ہو سکتی ہے۔ اگر آپ کو زیادہ کوٹے کی ضرورت ہو تو براہ کرم اپنے سپورٹ سے رابطہ کریں۔
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=ای میل بھیجنے کے لیے مزید وصول کنندہ نہیں۔
 EmailOptedOut=ای میل کے مالک نے اس ای میل کے ساتھ مزید رابطہ نہ کرنے کی درخواست کی ہے۔
 EvenUnsubscribe=آپٹ آؤٹ ای میلز شامل کریں۔
diff --git a/htdocs/langs/ur_PK/modulebuilder.lang b/htdocs/langs/ur_PK/modulebuilder.lang
index 114379304df..87901c095d7 100644
--- a/htdocs/langs/ur_PK/modulebuilder.lang
+++ b/htdocs/langs/ur_PK/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=یہاں مثالیں دیکھیں
 EnabledDesc=اس فیلڈ کو فعال رکھنے کی شرط۔<br><br>مثالیں:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=کیا میدان نظر آتا ہے؟ (مثالیں: 0=کبھی دکھائی نہیں دیتا، 1=فہرست پر نظر آتا ہے اور فارمز بنائیں/اپ ڈیٹ کریں/دیکھیں، 2=صرف فہرست میں مرئی، 3=صرف بنانے/اپ ڈیٹ کرنے/دیکھنے کے فارم پر مرئی (فہرستوں پر نہیں)، 4=فہرستوں پر مرئی اور صرف فارم کو اپ ڈیٹ/دیکھیں (تخلیق نہیں)، 5=صرف فہرست میں دکھائی دیتا ہے اور فارم کو صرف دیکھتا ہے (تخلیق نہیں کرتا، اپ ڈیٹ نہیں کرتا)۔<br><br> منفی قدر کا استعمال کرنے کا مطلب ہے کہ فیلڈ کو فہرست میں بطور ڈیفالٹ نہیں دکھایا جاتا ہے لیکن اسے دیکھنے کے لیے منتخب کیا جا سکتا ہے)۔
 ItCanBeAnExpression=یہ ایک اظہار ہوسکتا ہے۔ مثال:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user -> ہے حق ('چھٹی'، 'تعریف_چھٹی')؟1:5
-DisplayOnPdfDesc=اس فیلڈ کو مطابقت پذیر پی ڈی ایف دستاویزات پر ڈسپلے کریں، آپ "پوزیشن" فیلڈ کے ساتھ پوزیشن کا نظم کر سکتے ہیں۔<br><strong>دستاویز کے لیے:</strong><br>0 = ڈسپلے نہیں کیا گیا <br>1 = ڈسپلے<br>2 = صرف ڈسپلے کریں اگر خالی نہ ہو<br><br>b0e784943 span>دستاویزی خطوط کے لیے :<span class='notranslate'></strong><br>0 = ظاہر نہیں کیا گیا <br>1 = ایک کالم میں ظاہر ہوتا ہے<br>3 = تفصیل کے بعد لائن تفصیل کے کالم میں ڈسپلے<br>4 = تفصیل کے بعد تفصیل کے کالم میں ڈسپلے صرف اس صورت میں جب خالی نہ ہو۔
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=پی ڈی ایف پر
 IsAMeasureDesc=کیا فہرست میں کل حاصل کرنے کے لیے فیلڈ کی قدر کو جمع کیا جا سکتا ہے؟ (مثالیں: 1 یا 0)
 SearchAllDesc=کیا کوئیک سرچ ٹول سے تلاش کرنے کے لیے فیلڈ کا استعمال کیا جاتا ہے؟ (مثالیں: 1 یا 0)
@@ -148,7 +148,7 @@ CSSListClass=فہرست کے لیے سی ایس ایس
 NotEditable=قابل تدوین نہیں۔
 ForeignKey=غیر ملکی چابی
 ForeignKeyDesc=اگر اس فیلڈ کی قدر کسی دوسرے ٹیبل میں موجود ہونے کی ضمانت ہونی چاہیے۔ یہاں ایک قدر مماثل نحو درج کریں: tablename.parentfieldtocheck
-TypeOfFieldsHelp=مثال:<br>varchar(99)<br>ای میل<br>فون<span class='notranslate' ='notranslate'><br></span>ip<br>url<br>پاس ورڈ<br> span>double(24,8)<br>real<br>text<br>html <br>date<br>تاریخ کا وقت<br>ٹائم اسٹیمپ<span class='notranslate' <br></span>انٹیجر<br>انٹیجر:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fcc<b0342f /span><span class='notranslate'><br>'1' کا مطلب ہے کہ ہم ریکارڈ بنانے کے لیے کومبو کے بعد + بٹن شامل کرتے ہیں<br>'فلٹر' ایک ہے یونیورسل فلٹر نحو کی حالت، مثال: '((status:=:1) AND (fk_user:=:__USER_ID__) اور (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=یہ فیلڈ/انتساب کی قسم ہے۔
 AsciiToHtmlConverter=Ascii سے HTML کنورٹر
 AsciiToPdfConverter=Ascii سے پی ڈی ایف کنورٹر
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=ڈسکرپٹر میں کوڈ شامل کرنے م
 DictionariesCreated=ڈکشنری <b>%s</b> کامیابی کے ساتھ بنائی گئی
 DictionaryDeleted=ڈکشنری <b>%s</b> کو کامیابی سے ہٹا دیا گیا
 PropertyModuleUpdated=پراپرٹی <b>%s</b> کو کامیابی سے اپ ڈیٹ کر دیا گیا ہے۔
-InfoForApiFile=* جب آپ پہلی بار فائل بنائیں گے تو تمام طریقے بنائے جائیں گے <strong>ہر چیز کے لیے۔</strong><br>* جب آپ <strong>ہٹائیں</strong> پر کلک کریں تو آپ <span کلاس کے تمام طریقے ہٹا دیتے ہیں ='notranslate'><strong></span>منتخب کردہ آبجیکٹ</strong>۔
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=ماڈیول سیٹ اپ کے لیے صفحہ
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=You can generate and edit here the class files to provide new email target selectors for the mass emailing module
diff --git a/htdocs/langs/ur_PK/oauth.lang b/htdocs/langs/ur_PK/oauth.lang
index 10b206ab0b0..e24c98bc308 100644
--- a/htdocs/langs/ur_PK/oauth.lang
+++ b/htdocs/langs/ur_PK/oauth.lang
@@ -29,7 +29,7 @@ OAUTH_GOOGLE_SECRET=OAuth گوگل سیکریٹ
 OAUTH_GITHUB_NAME=OAuth GitHub سروس
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub سیکریٹ
-OAUTH_URL_FOR_CREDENTIAL=<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">اس صفحہ<span class="fas fa-external-link-alt paddingleft"></span><span class='notranslate' پر جائیں ></a></span> اپنی OAuth ID اور خفیہ بنانے یا حاصل کرنے کے لیے
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=OAuth اسٹرائپ ٹیسٹ
 OAUTH_STRIPE_LIVE_NAME=OAuth اسٹرائپ لائیو
 OAUTH_ID=OAuth کلائنٹ ID
diff --git a/htdocs/langs/ur_PK/partnership.lang b/htdocs/langs/ur_PK/partnership.lang
index 055b1f4d2d1..87e7b1cbe43 100644
--- a/htdocs/langs/ur_PK/partnership.lang
+++ b/htdocs/langs/ur_PK/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=آخری URL چیک کے لیے غلطیوں کی تعد
 LastCheckBacklink=آخری URL چیک کی تاریخ
 
 NewPartnershipRequest=نئی شراکت داری کی درخواست
-NewPartnershipRequestDesc=یہ فارم آپ کو ہمارے شراکتی پروگرام میں سے کسی ایک کا حصہ بننے کی درخواست کرنے کی اجازت دیتا ہے۔ اگر آپ کو اس فارم کو پُر کرنے میں مدد کی ضرورت ہو تو، براہ کرم ای میل کے ذریعے رابطہ کریں <b>%s<span class='notranslate'></b></span span>
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=اس صفحہ میں درج ذیل ڈومین میں سے کسی ایک کا کم از کم ایک لنک ہونا چاہیے: %s
 
 IPOfApplicant=درخواست دہندہ کا IP
-
diff --git a/htdocs/langs/ur_PK/receptions.lang b/htdocs/langs/ur_PK/receptions.lang
index de8e98aa643..aee6695ae6c 100644
--- a/htdocs/langs/ur_PK/receptions.lang
+++ b/htdocs/langs/ur_PK/receptions.lang
@@ -1,12 +1,10 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
+ReceptionDescription=وینڈر ریسپشن مینجمنٹ (استقبالیہ دستاویزات بنائیں)
+ReceptionsSetup=وینڈر ریسپشن سیٹ اپ
 RefReception=حوالہ استقبالیہ
 Reception=استقبالیہ
 Receptions=استقبالیہ
 AllReceptions=تمام استقبالیہ
-Reception=استقبالیہ
-Receptions=استقبالیہ
 ShowReception=استقبالیہ دکھائیں۔
 ReceptionsArea=استقبالیہ علاقہ
 ListOfReceptions=استقبالیوں کی فہرست
@@ -32,11 +30,11 @@ StatusReceptionDraftShort=مسودہ
 StatusReceptionValidatedShort=تصدیق شدہ
 StatusReceptionProcessedShort=پروسیس شدہ
 ReceptionSheet=استقبالیہ شیٹ
-ValidateReception=Validate reception
+ValidateReception=استقبال کی توثیق کریں۔
 ConfirmDeleteReception=کیا آپ واقعی اس استقبالیہ کو حذف کرنا چاہتے ہیں؟
 ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=کیا آپ واقعی اس استقبالیہ کو منسوخ کرنا چاہتے ہیں؟
-StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
+StatsOnReceptionsOnlyValidated=اعداد و شمار صرف تصدیق شدہ استقبالیہ پر کئے گئے ہیں۔ استعمال شدہ تاریخ استقبالیہ کی توثیق کی تاریخ ہے (منصوبہ بند ترسیل کی تاریخ ہمیشہ معلوم نہیں ہوتی ہے)۔
 SendReceptionByEMail=ای میل کے ذریعے استقبالیہ بھیجیں۔
 SendReceptionRef=استقبالیہ %s جمع کروانا
 ActionsOnReception=استقبالیہ پر تقریبات
@@ -52,7 +50,7 @@ ReceptionExist=ایک استقبالیہ موجود ہے۔
 ReceptionBackToDraftInDolibarr=استقبالیہ %s ڈرافٹ پر واپس
 ReceptionClassifyClosedInDolibarr=استقبالیہ %s کلاسیفائیڈ بند
 ReceptionUnClassifyCloseddInDolibarr=استقبالیہ %s دوبارہ کھولیں۔
-RestoreWithCurrentQtySaved=Fill quantities with latest saved values
-ReceptionsRecorded=Receptions recorded
-ReceptionUpdated=Reception successfully updated
-ReceptionDistribution=Reception distribution
+RestoreWithCurrentQtySaved=تازہ ترین محفوظ شدہ اقدار کے ساتھ مقدار بھریں۔
+ReceptionsRecorded=استقبالیہ ریکارڈ کیا گیا۔
+ReceptionUpdated=استقبالیہ کامیابی کے ساتھ اپ ڈیٹ ہو گیا۔
+ReceptionDistribution=استقبالیہ تقسیم
diff --git a/htdocs/langs/ur_PK/sendings.lang b/htdocs/langs/ur_PK/sendings.lang
index a384fbcc5cd..e59628184c0 100644
--- a/htdocs/langs/ur_PK/sendings.lang
+++ b/htdocs/langs/ur_PK/sendings.lang
@@ -48,7 +48,7 @@ DateDeliveryPlanned=ترسیل کی منصوبہ بند تاریخ
 RefDeliveryReceipt=حوالگی کی رسید
 StatusReceipt=حیثیت کی ترسیل کی رسید
 DateReceived=موصول ہونے کی تاریخ
-ClassifyReception=Classify Received
+ClassifyReception=درجہ بندی موصول ہوئی۔
 SendShippingByEMail=ای میل کے ذریعے کھیپ بھیجیں۔
 SendShippingRef=کھیپ جمع کروانا %s
 ActionsOnShipping=شپمنٹ پر واقعات
@@ -62,7 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=کھلے خریداری کے آرڈ
 NoProductToShipFoundIntoStock=گودام <b> %s </b> میں بھیجنے کے لیے کوئی پروڈکٹ نہیں ملا۔ اسٹاک کو درست کریں یا دوسرا گودام منتخب کرنے کے لیے واپس جائیں۔
 WeightVolShort=وزن/جلد
 ValidateOrderFirstBeforeShipment=ترسیل کرنے کے قابل ہونے سے پہلے آپ کو پہلے آرڈر کی توثیق کرنی ہوگی۔
-NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
+NoLineGoOnTabToAddSome=کوئی لائن نہیں، شامل کرنے کے لیے ٹیب "%s" پر جائیں۔
 
 # Sending methods
 # ModelDocument
@@ -75,12 +75,12 @@ SumOfProductWeights=مصنوعات کے وزن کا مجموعہ
 # warehouse details
 DetailWarehouseNumber= گودام کی تفصیلات
 DetailWarehouseFormat= W:%s (Qty: %d)
-SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
-CreationOptions=Available options during shipment creation
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=سیریل نمبر یا بیچ کے لیے شپمنٹ کی تخلیق کے دوران اسٹاک میں داخلے کی آخری تاریخ دکھائیں۔
+CreationOptions=شپمنٹ کی تخلیق کے دوران دستیاب اختیارات
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=کھیپ کی تقسیم
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+ErrorTooManyCombinationBatchcode=لائن %s کے لیے کوئی ڈسپیچ نہیں کیونکہ گودام، پروڈکٹ، بیچ کوڈ کے بہت زیادہ مجموعے ملے تھے (%s)۔
+ErrorNoCombinationBatchcode=warehouse-product-lot/serial (%s کے مجموعہ کے طور پر %s لائن کو محفوظ نہیں کیا جا سکا، %s, %s) اسٹاک میں نہیں ملا۔
 
-ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
+ErrorTooMuchShipped=بھیجی گئی مقدار لائن %s کے لیے آرڈر کی گئی مقدار سے زیادہ نہیں ہونی چاہیے۔
diff --git a/htdocs/langs/ur_PK/stocks.lang b/htdocs/langs/ur_PK/stocks.lang
index 362ed95af74..d6af3262631 100644
--- a/htdocs/langs/ur_PK/stocks.lang
+++ b/htdocs/langs/ur_PK/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=اعلی درجے کی اسٹاک کی منتقلی
 ModuleStockTransferDesc=ٹرانسفر شیٹ کی نسل کے ساتھ اسٹاک ٹرانسفر کا جدید انتظام
 StockTransferNew=نیا اسٹاک ٹرانسفر
 StockTransferList=اسٹاک کی منتقلی کی فہرست
-ConfirmValidateStockTransfer=کیا آپ واقعی <b>%s</b><span class='notranslate'> حوالہ کے ساتھ اس اسٹاک کی منتقلی کی توثیق کرنا چاہتے ہیں span>؟
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=منتقلی کے ساتھ اسٹاک کی کمی %s
 ConfirmDestockCancel=منتقلی کے ساتھ اسٹاک کی کمی کو منسوخ کریں %s
 DestockAllProduct=اسٹاک کی کمی
diff --git a/htdocs/langs/ur_PK/withdrawals.lang b/htdocs/langs/ur_PK/withdrawals.lang
index f84564c3beb..998b2097b4e 100644
--- a/htdocs/langs/ur_PK/withdrawals.lang
+++ b/htdocs/langs/ur_PK/withdrawals.lang
@@ -15,7 +15,7 @@ BankTransferReceipt=کریڈٹ ٹرانسفر آرڈر
 LatestBankTransferReceipts=تازہ ترین %s کریڈٹ ٹرانسفر آرڈرز
 LastWithdrawalReceipts=تازہ ترین %s ڈائریکٹ ڈیبٹ فائلیں۔
 WithdrawalsLine=ڈائریکٹ ڈیبٹ آرڈر لائن
-CreditTransfer=Credit transfer
+CreditTransfer=کریڈٹ ٹرانسفر
 CreditTransferLine=کریڈٹ ٹرانسفر لائن
 WithdrawalsLines=ڈائریکٹ ڈیبٹ آرڈر لائنز
 CreditTransferLines=کریڈٹ ٹرانسفر لائنز
@@ -31,9 +31,9 @@ SupplierInvoiceWaitingWithdraw=وینڈر انوائس کریڈٹ ٹرانسفر
 InvoiceWaitingWithdraw=انوائس براہ راست ڈیبٹ کا انتظار کر رہا ہے۔
 InvoiceWaitingPaymentByBankTransfer=انوائس کریڈٹ ٹرانسفر کا انتظار کر رہی ہے۔
 AmountToWithdraw=واپس لینے کی رقم
-AmountToTransfer=Amount to transfer
+AmountToTransfer=منتقلی کی رقم
 NoInvoiceToWithdraw='%s' کے لیے کھلا کوئی رسید انتظار نہیں کر رہا ہے۔ درخواست کرنے کے لیے انوائس کارڈ پر ٹیب '%s' پر جائیں۔
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=کھلے '%s' کے ساتھ کوئی سپلائر انوائس انتظار نہیں کر رہا ہے۔ درخواست کرنے کے لیے انوائس کارڈ پر ٹیب '%s' پر جائیں۔
 ResponsibleUser=صارف ذمہ دار
 WithdrawalsSetup=براہ راست ڈیبٹ ادائیگی کا سیٹ اپ
 CreditTransferSetup=کریڈٹ ٹرانسفر سیٹ اپ
@@ -42,23 +42,23 @@ CreditTransferStatistics=کریڈٹ ٹرانسفر کے اعدادوشمار
 Rejects=رد کرتا ہے۔
 LastWithdrawalReceipt=تازہ ترین %s براہ راست ڈیبٹ رسیدیں۔
 MakeWithdrawRequest=براہ راست ڈیبٹ ادائیگی کی درخواست کریں۔
-MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
+MakeWithdrawRequestStripe=پٹی کے ذریعے براہ راست ڈیبٹ ادائیگی کی درخواست کریں۔
 MakeBankTransferOrder=کریڈٹ ٹرانسفر کی درخواست کریں۔
 WithdrawRequestsDone=%s براہ راست ڈیبٹ ادائیگی کی درخواستیں ریکارڈ کی گئیں۔
 BankTransferRequestsDone=%s کریڈٹ ٹرانسفر کی درخواستیں ریکارڈ کی گئیں۔
 ThirdPartyBankCode=تھرڈ پارٹی بینک کوڈ
 NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
-NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
-NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
+NoInvoiceCouldBeWithdrawedSupplier=کسی انوائس پر کامیابی سے کارروائی نہیں ہوئی۔ چیک کریں کہ رسیدیں ایک درست IBAN والی کمپنیوں پر ہیں۔
+NoSalariesCouldBeWithdrawed=کسی تنخواہ پر کامیابی سے کارروائی نہیں ہوئی۔ چیک کریں کہ تنخواہ ایک درست IBAN والے صارفین پر ہے۔
 WithdrawalCantBeCreditedTwice=یہ واپسی کی رسید پہلے ہی بطور کریڈٹ نشان زد ہے۔ یہ دو بار نہیں کیا جا سکتا، کیونکہ اس سے ممکنہ طور پر ڈپلیکیٹ ادائیگیاں اور بینک اندراجات پیدا ہوں گے۔
 ClassCredited=درجہ بندی کریڈٹ
-ClassDebited=Classify debited
+ClassDebited=ڈیبٹ کی درجہ بندی کریں۔
 ClassCreditedConfirm=کیا آپ واقعی اس رقم نکلوانے کی رسید کو اپنے بینک اکاؤنٹ میں کریڈٹ کے طور پر درجہ بندی کرنا چاہتے ہیں؟
 TransData=ترسیل کی تاریخ
 TransMetod=ترسیل کا طریقہ
 Send=بھیجیں
 Lines=لکیریں
-StandingOrderReject=Record a rejection
+StandingOrderReject=ایک مسترد ریکارڈ کریں۔
 WithdrawsRefused=براہ راست ڈیبٹ سے انکار کر دیا۔
 WithdrawalRefused=واپس لینے سے انکار کر دیا۔
 CreditTransfersRefused=کریڈٹ ٹرانسفر سے انکار کر دیا گیا۔
@@ -66,9 +66,9 @@ WithdrawalRefusedConfirm=کیا آپ کو یقین ہے کہ آپ سوسائٹی
 RefusedData=مسترد ہونے کی تاریخ
 RefusedReason=انکار کی وجہ
 RefusedInvoicing=مسترد کرنے کا بل دینا
-NoInvoiceRefused=Do not charge the customer for the refusal
-InvoiceRefused=Charge the customer for the refusal
-DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
+NoInvoiceRefused=انکار پر گاہک سے چارج نہ کریں۔
+InvoiceRefused=انکار کے لیے گاہک سے چارج کریں۔
+DirectDebitRefusedInvoicingDesc=یہ کہنے کے لیے ایک جھنڈا لگائیں کہ یہ انکار گاہک سے وصول کیا جانا چاہیے۔
 StatusDebitCredit=اسٹیٹس ڈیبٹ/کریڈٹ
 StatusWaiting=انتظار کر رہا ہے۔
 StatusTrans=بھیجا
@@ -104,11 +104,11 @@ CreditDate=پر کریڈٹ
 WithdrawalFileNotCapable=آپ کے ملک %s (آپ کا ملک تعاون یافتہ نہیں ہے) کے لیے رقم نکلوانے کی رسید بنانے میں ناکام
 ShowWithdraw=براہ راست ڈیبٹ آرڈر دکھائیں۔
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=تاہم، اگر انوائس میں کم از کم ایک براہ راست ڈیبٹ ادائیگی کا آرڈر ابھی تک پروسیس نہیں ہوا ہے، تو اسے پہلے سے نکالنے کے انتظام کی اجازت دینے کے لیے بطور ادائیگی سیٹ نہیں کیا جائے گا۔
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
-DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
-DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=یہ ٹیب آپ کو براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواست کرنے کی اجازت دیتا ہے۔ ایک بار مکمل ہو جانے کے بعد، آپ ڈائریکٹ ڈیبٹ آرڈر فائل بنانے اور اس کا نظم کرنے کے لیے مینو "بینک->براہ راست ڈیبٹ کے ذریعے ادائیگی" میں جا سکتے ہیں۔
+DoStandingOrdersBeforePayments2=آپ براہ راست SEPA ادائیگی کے پروسیسر کو بھی درخواست بھیج سکتے ہیں جیسے Stripe،...
+DoStandingOrdersBeforePayments3=درخواست بند ہونے پر، انوائس پر ادائیگی خود بخود ریکارڈ ہو جائے گی، اور اگر ادائیگی باقی ہے تو انوائسز بند ہو جائیں گی۔
+DoCreditTransferBeforePayments=یہ ٹیب آپ کو کریڈٹ ٹرانسفر آرڈر کی درخواست کرنے کی اجازت دیتا ہے۔ ایک بار ہو جانے کے بعد، کریڈٹ ٹرانسفر آرڈر فائل بنانے اور اس کا نظم کرنے کے لیے مینو "بینک-> کریڈٹ ٹرانسفر کے ذریعے ادائیگی" میں جائیں۔
+DoCreditTransferBeforePayments3=جب کریڈٹ ٹرانسفر آرڈر بند ہو جائے گا، انوائس پر ادائیگی خود بخود ریکارڈ ہو جائے گی، اور اگر ادائیگی باقی ہے تو انوائسز بند ہو جائیں گی۔
 WithdrawalFile=ڈیبٹ آرڈر فائل
 CreditTransferFile=کریڈٹ ٹرانسفر فائل
 SetToStatusSent="فائل بھیجی گئی" کی حیثیت پر سیٹ کریں
@@ -118,14 +118,14 @@ RUM=UMR
 DateRUM=مینڈیٹ کے دستخط کی تاریخ
 RUMLong=منفرد مینڈیٹ حوالہ
 RUMWillBeGenerated=خالی ہونے کی صورت میں، بینک اکاؤنٹ کی معلومات محفوظ ہونے کے بعد ایک UMR (منفرد مینڈیٹ حوالہ) تیار کیا جائے گا۔
-WithdrawMode=Direct debit mode (FRST or RCUR)
+WithdrawMode=ڈائریکٹ ڈیبٹ موڈ (FRST یا RCUR)
 WithdrawRequestAmount=براہ راست ڈیبٹ کی درخواست کی رقم:
 BankTransferAmount=کریڈٹ ٹرانسفر کی درخواست کی رقم:
 WithdrawRequestErrorNilAmount=خالی رقم کے لیے براہ راست ڈیبٹ کی درخواست بنانے سے قاصر۔
 SepaMandate=SEPA ڈائریکٹ ڈیبٹ مینڈیٹ
 SepaMandateShort=SEPA مینڈیٹ
 PleaseReturnMandate=براہ کرم یہ مینڈیٹ فارم بذریعہ ای میل %s پر یا بذریعہ ڈاک واپس کریں۔
-SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. You agree to receive notifications about future charges up to 2 days before they occur.
+SEPALegalText=اس مینڈیٹ فارم پر دستخط کر کے، آپ (A) %s اور اس کے ادائیگی سروس فراہم کنندہ کو آپ کے اکاؤنٹ کو ڈیبٹ کرنے کے لیے آپ کے بینک کو ہدایات بھیجنے کی اجازت دیتے ہیں اور (B) آپ کے بینک کو آپ کے اکاؤنٹ کو ڈیبٹ کرنے کے لیے %s کی ہدایات کے مطابق۔ اپنے حقوق کے حصے کے طور پر، آپ اپنے بینک کے ساتھ اپنے معاہدے کی شرائط و ضوابط کے تحت اپنے بینک سے رقم کی واپسی کے حقدار ہیں۔ مندرجہ بالا مینڈیٹ سے متعلق آپ کے حقوق کی وضاحت ایک بیان میں کی گئی ہے جو آپ اپنے بینک سے حاصل کر سکتے ہیں۔ آپ مستقبل کے چارجز کے وقوع پذیر ہونے سے 2 دن پہلے تک اطلاعات موصول کرنے سے اتفاق کرتے ہیں۔
 CreditorIdentifier=قرض دہندہ شناخت کنندہ
 CreditorName=قرض دینے والے کا نام
 SEPAFillForm=(B) براہ کرم نشان زدہ تمام فیلڈز کو مکمل کریں*
@@ -134,7 +134,7 @@ SEPAFormYourBAN=آپ کے بینک اکاؤنٹ کا نام (IBAN)
 SEPAFormYourBIC=آپ کا بینک شناختی کوڈ (BIC)
 SEPAFrstOrRecur=ادائیگی کی قسم
 ModeRECUR=بار بار چلنے والی ادائیگی
-ModeRCUR=Recurring payment
+ModeRCUR=بار بار چلنے والی ادائیگی
 ModeFRST=یک طرفہ ادائیگی
 PleaseCheckOne=براہ کرم صرف ایک چیک کریں۔
 CreditTransferOrderCreated=کریڈٹ ٹرانسفر آرڈر %s بنایا گیا۔
@@ -145,7 +145,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=پھانسی کی تاریخ
 CreateForSepa=ڈائریکٹ ڈیبٹ فائل بنائیں
 ICS=کریڈٹ کنندہ شناخت کنندہ - ICS
-IDS=Debitor Identifier
+IDS=ڈیبیٹر شناخت کنندہ
 END_TO_END="EndToEndId" SEPA XML ٹیگ - فی ٹرانزیکشن تفویض کردہ منفرد شناخت
 USTRD="غیر ساختہ" SEPA XML ٹیگ
 ADDDAYS=عملدرآمد کی تاریخ میں دن شامل کریں۔
@@ -159,16 +159,15 @@ InfoTransData=رقم: %s <br> طریقہ: %s <br> تاریخ: %s
 InfoRejectSubject=براہ راست ڈیبٹ ادائیگی کے آرڈر سے انکار کر دیا گیا۔
 InfoRejectMessage=ہیلو، <br> <br> کمپنی %s سے متعلق انوائس %s کا براہ راست ڈیبٹ ادائیگی آرڈر، جس میں %s کی رقم ہے بینک نے انکار کر دیا ہے۔ <br> <br> -- <br> %s
 ModeWarning=اصلی موڈ کے لیے آپشن سیٹ نہیں کیا گیا تھا، ہم اس سمولیشن کے بعد رک جاتے ہیں۔
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
+ErrorCompanyHasDuplicateDefaultBAN=id %s والی کمپنی کے پاس ایک سے زیادہ ڈیفالٹ بینک اکاؤنٹ ہیں۔ یہ جاننے کا کوئی طریقہ نہیں کہ کون سا استعمال کرنا ہے۔
 ErrorICSmissing=بینک اکاؤنٹ %s میں ICS غائب ہے۔
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=براہ راست ڈیبٹ آرڈر کی کل رقم لائنوں کے مجموعے سے مختلف ہے۔
 WarningSomeDirectDebitOrdersAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء ڈائریکٹ ڈیبٹ آرڈرز (%s) کی درخواست کی گئی ہے %s
 WarningSomeCreditTransferAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء کریڈٹ ٹرانسفر (%s) کی درخواست کی گئی ہے %s کی رقم
-UsedFor=Used for %s
-Societe_ribSigned=SEPA mandate Signed
-NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
-SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
-RefSalary=Salary
-NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
-SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
-
+UsedFor=%s کے لیے استعمال کیا جاتا ہے
+Societe_ribSigned=SEPA مینڈیٹ پر دستخط کیے گئے۔
+NbOfInvoiceToPayByBankTransferForSalaries=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کے منتظر اہل تنخواہوں کی تعداد
+SalaryWaitingWithdraw=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کے منتظر تنخواہ
+RefSalary=تنخواہ
+NoSalaryInvoiceToWithdraw='%s' کے انتظار میں کوئی تنخواہ نہیں۔ درخواست کرنے کے لیے سیلری کارڈ پر ٹیب '%s' پر جائیں۔
+SalaryInvoiceWaitingWithdraw=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کے منتظر تنخواہ
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index b5b37d1a2a5..d034ac9ec9f 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -287,7 +287,7 @@ TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
 DescVentilCustomer=Hisoblar jadvalidan mahsulot hisobiga bog'langan (yoki bog'lanmagan) mijozlar hisob-fakturalari ro'yxatini shu yerda ko'ring.
-DescVentilMore=Aksariyat hollarda, agar siz oldindan belgilangan mahsulot yoki xizmatlardan foydalansangiz va mahsulot/xizmat kartasida hisobni (hisob jadvalidan) o'rnatgan bo'lsangiz, dastur hisob-faktura satrlari va jadvalingizning buxgalteriya hisobi o'rtasidagi barcha bog'lanishlarni amalga oshirishi mumkin. bir marta bosish bilan <strong>"%s"b0a65d071f6spanfc90z >. Agar hisob mahsulot/xizmat kartalarida oʻrnatilmagan boʻlsa yoki sizda hali ham hisobga bogʻlanmagan qatorlar mavjud boʻlsa, “<span class='notranslate'><strong><span menyusidan qoʻlda bogʻlashni amalga oshirishingiz kerak boʻladi. class='notranslate'>%s</span></strong>".
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Bu yerda mijozlar hisob-fakturalari qatorlari ro‘yxati va hisoblar jadvalidagi mahsulot hisobi bilan tanishing
 DescVentilTodoCustomer=Hisoblar jadvalidan mahsulot hisobi bilan bog'lanmagan hisob-faktura qatorlarini bog'lang
 ChangeAccount=Tanlangan qatorlar uchun mahsulot/xizmat hisobini (hisob jadvalidan) quyidagi hisob bilan o'zgartiring:
@@ -352,7 +352,7 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Sotish bo'yicha buxgalteriyada majburiy va o
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Xaridlar bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (sotuvchi hisob-kitoblari buxgalteriya hisobida hisobga olinmaydi)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Xarajatlar hisobotlari bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (xarajatlar hisoboti buxgalteriya hisobida hisobga olinmaydi)
 ACCOUNTING_ENABLE_LETTERING=Buxgalteriya hisobida harflar funksiyasini yoqing
-ACCOUNTING_ENABLE_LETTERING_DESC=Ushbu parametr yoqilganda, siz har bir buxgalteriya yozuvida turli xil buxgalteriya harakatlarini guruhlashingiz uchun kodni belgilashingiz mumkin. Ilgari, turli jurnallar mustaqil ravishda boshqarilsa, bu xususiyat turli jurnallarning harakat chiziqlarini birlashtirish uchun zarur edi. Biroq, Dolibarr buxgalteriyasi bilan bunday kuzatuv kodi "<b>%s<span class='notranslate'>b09a4b739fz01f deb ataladi. span>" allaqachon avtomatik tarzda saqlangan, shuning uchun avtomatik harflar allaqachon bajarilgan, xatolik xavfi yo'q, shuning uchun bu xususiyat umumiy foydalanish uchun foydasiz bo'lib qoldi. Qo'lda harf yozish xususiyati buxgalteriya hisobidagi ma'lumotlarni uzatishni amalga oshiradigan kompyuter dvigateliga haqiqatan ham ishonmaydigan oxirgi foydalanuvchilar uchun taqdim etiladi.
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
 EnablingThisFeatureIsNotNecessary=Bu xususiyatni yoqish buxgalteriya hisobini jiddiy boshqarish uchun endi zarur emas.
 ACCOUNTING_ENABLE_AUTOLETTERING=Buxgalteriya hisobiga o'tishda avtomatik harflarni yoqish
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Harf uchun kod avtomatik ravishda yaratiladi va oshiriladi va oxirgi foydalanuvchi tomonidan tanlanmaydi
@@ -360,7 +360,7 @@ ACCOUNTING_LETTERING_NBLETTERS=Harf kodini yaratishda harflar soni (standart 3)
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Ba'zi buxgalteriya dasturlari faqat ikki harfli kodni qabul qiladi. Ushbu parametr ushbu jihatni o'rnatishga imkon beradi. Harflarning standart soni uchtadir.
 OptionsAdvanced=Kengaytirilgan variantlar
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Yetkazib beruvchining xaridlari uchun QQS teskari to'lovini boshqarishni faollashtiring
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Ushbu parametr yoqilgan bo'lsa, siz yetkazib beruvchi yoki ma'lum bir sotuvchi hisob-fakturasini buxgalteriya hisobiga boshqacha tarzda o'tkazish kerakligini belgilashingiz mumkin: "<" da belgilangan hisoblar rejasidan 2 ta hisobvaraq bo'yicha buxgalteriya hisobiga qo'shimcha debet va kredit liniyasi hosil bo'ladi. span class='notranslate'>%s</span>" sozlash sahifasi.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Faylni yaratishda harflarni eksport qilmang
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 11732df3ce1..de8754cc081 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -366,9 +366,9 @@ GenericMaskCodes2= <b> {cccc} </b> n kodidagi mijoz kodi <br> <b> {cccc000} a09a
 GenericMaskCodes3=Maskadagi barcha boshqa belgilar buzilmasdan qoladi. <br> bo'sh joylarga ruxsat berilmaydi. <br>
 GenericMaskCodes3EAN=Maskadagi barcha boshqa belgilar buzilmasdan qoladi (* yoki "EAN13" ning 13-pozitsiyasidan tashqari). <br> bo'sh joylarga ruxsat berilmaydi. <br> EAN13 da 13-o'rinda oxirgi} dan keyin oxirgi belgi * yoki bo'lishi kerak? . U hisoblangan kalit bilan almashtiriladi. <br>
 GenericMaskCodes4a=<u>31-01-2023 sanasi bilan uchinchi tomon TheCompany kompaniyasining 99-chi %sdagi misol:</u><br>
-GenericMaskCodes4b=<u>31-01-2023-yilda uchinchi tomonda yaratilgan misol:</u><span class='notranslate'>b0342fccfda19b >
-GenericMaskCodes4c=<u>2023-01-31 da yaratilgan mahsulotga misol:</u><span class='notranslate'>b0342fccfda19b
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> b0aee833608</span8 beradi span>ABC2301-000099<span class='notranslate'></b><br>b0aee83365837{100@ }-ZZZ/{dd}/XXX<span class='notranslate'></b> <b>0199-ZZZ/31/XXX<span class='notranslate beradi '></b></span><br><b>IN{yy}{mm}-{0000}-{t}</b>, agar kompaniya turi bo'lsa, <b>IN2301-0099-A<span class='notranslate'>b09a4b739f17f8z beradi. "A_RI" turi uchun kodli "Ma'suliyatli Inscripto"
+GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
+GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Belgilangan niqobga ko'ra moslashtirilgan raqamni qaytaradi.
 ServerAvailableOnIPOrPort=Server <b> %s </b> manzilida <b> %s </b>
 ServerNotAvailableOnIPOrPort=Server <b> %s </b> manzilida <b> %s </b> manzilida mavjud emas
@@ -464,7 +464,7 @@ ExtrafieldParamHelpPassword=Bu maydonni boʻsh qoldirish, bu qiymat shifrlashSIZ
 ExtrafieldParamHelpselect=Qadriyatlar ro'yxati format bo'lishi kerak, bu erda kalit '0' bo'lishi mumkin emas <br> masalan: <br> 2, value2 <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxati: <br> 1, VALUE1 | options_ <i> parent_list_code </i>: parent_key <br> 2, değer2 | options_ <i> parent_list_code </i>: maqsadida parent_key <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lishi: <br> 1, VALUE1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
 ExtrafieldParamHelpradio=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
-ExtrafieldParamHelpsellist=Qiymatlar roʻyxati jadvaldan olingan<br>Sintaksis: table_name:label_field:id_field::filtersql<br>Misol: c_typent: ::filtersql<br><br>- id_field birlamchi int kalitidirb0342fcczfda19> - filtersql - bu SQL sharti. Bu faqat faol qiymatni ko'rsatish uchun oddiy sinov (masalan, active=1) bo'lishi mumkin<span class='notranslate'><br>Shuningdek, joriy ob'ekt<span sinfining joriy identifikatori bo'lgan filtrda $ID$ dan ham foydalanishingiz mumkin. ='notranslate'><br></span>Filtrda SELECTdan foydalanish uchun in'ektsiyaga qarshi himoyani chetlab o'tish uchun $SEL$ kalit so'zidan foydalaning.<br>agar siz qo'shimcha maydonlarda filtrlashni xohlasangiz extra.fieldcode=... sintaksisidan foydalaning (bu erda maydon kodi - ekstrafield kodi)<br><br> boshqa qo'shimcha atributlar ro'yxatiga qarab ro'yxat:<br>c_typent:libelle:id:options_<i>parent_list_code<spante class='translate </i></span>|parent_column:filtr <br><br>Roʻyxat boshqa roʻyxatga bogʻliq boʻlishi uchun:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758baclum>0333
+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 necessarily 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=Qadriyatlar ro'yxati <br> jadvalidan olingan Sintaksis: table_name: label_field: id_field :: filtersql <br> Misol: c_typent: libelle: id :: filtersql <br> <br> filter faqat oddiy bo'lishi mumkin jodugarda $ ID $ ni ishlatishi mumkin, bu joriy ob'ektning identifikatori <br> Filtrda SELECT qilish uchun $ SEL $ <br> dan foydalaning, agar ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning. extra.fieldcode = ... (bu erda maydon kodi extrafield kodi) <br> <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxatini bo'lishi uchun: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtri <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lish uchun: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parametrlar ObjectName: Classpath <br> sintaksis: ObjectName: Classpath bo'lishi kerak
 ExtrafieldParamHelpSeparator=<br> oddiy ajratuvchisi uchun bo'sh joyni saqlang holat har bir foydalanuvchi seansida saqlanadi)
@@ -1197,6 +1197,7 @@ Skin=Teri mavzusi
 DefaultSkin=Standart teri mavzusi
 MaxSizeList=Ro'yxat uchun maksimal uzunlik
 DefaultMaxSizeList=Ro'yxatlar uchun standart maksimal uzunlik
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Qisqa ro'yxatlar uchun standart maksimal uzunlik (ya'ni mijozlar kartasida)
 MessageOfDay=Kunning xabari
 MessageLogin=Kirish sahifasidagi xabar
@@ -1860,7 +1861,7 @@ PastDelayVCalExport=Eskiroq voqeani eksport qilmang
 SecurityKey = Elektron kalit
 ##### ClickToDial #####
 ClickToDialSetup=To Dial modulini o'rnatish uchun bosing
-ClickToDialUrlDesc=Telefon piktogrammasi bosilganda URL chaqiriladi. URL manzilida siz teglardan foydalanishingiz mumkin<br><b>__PHONETO__b09a4b739f17f80 bo'ladi qo'ng'iroq qilish uchun shaxsning telefon raqami bilan almashtirildi<span class='notranslate'><br><b>__PHONEFROM__b09a4b739f017 qo'ng'iroq qilayotgan shaxsning telefon raqami (sizniki) bilan almashtiriladi<span class='notranslate'><br><b>__LOGIN__b09a4170z span> bu klik orqali kirish bilan almashtiriladi (foydalanuvchi kartasida belgilangan)<span class='notranslate'><br><b>__PASS__ </b> bu tugmani bosish paroli bilan almashtiriladi (foydalanuvchi kartasida belgilangan).
+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=Ushbu modul statsionar kompyuterdan foydalanilganda telefon raqamlarini bosish mumkin bo'lgan havolalarga o'zgartiradi. Bir marta bosish raqamga qo'ng'iroq qiladi. Bu ish stolida yumshoq telefondan foydalanilganda yoki masalan, SIP protokoliga asoslangan CTI tizimidan foydalanilganda telefon qo'ng'irog'ini boshlash uchun ishlatilishi mumkin. Eslatma: Smartfondan foydalanganda telefon raqamlari doim bosilishi mumkin.
 ClickToDialUseTelLink=Telefon raqamlarida faqat "tel:" havolasidan foydalaning
 ClickToDialUseTelLinkDesc=Agar sizning foydalanuvchilaringiz brauzer bilan bir xil kompyuterda o'rnatilgan va brauzeringizda "tel:" bilan boshlangan havolani bosganingizda qo'ng'iroq qiladigan dasturiy ta'minot yoki dasturiy ta'minot interfeysi bo'lsa, ushbu usuldan foydalaning. Agar sizga "sip:" bilan boshlanadigan havola yoki serverning to'liq echimi kerak bo'lsa (mahalliy dasturiy ta'minotni o'rnatishga hojat yo'q), buni "Yo'q" deb belgilashingiz va keyingi maydonni to'ldirishingiz kerak.
@@ -2291,7 +2292,7 @@ APIsAreNotEnabled=API modullari yoqilmagan
 YouShouldSetThisToOff=Buni 0 ga yoki o'chirib qo'yishingiz kerak
 InstallAndUpgradeLockedBy=O'rnatish va yangilanishlar <b> %s </b> fayli bilan qulflangan.
 InstallLockedBy=Oʻrnatish/qayta oʻrnatish <b>%s</b> fayli tomonidan bloklangan.
-InstallOfAddonIsNotBlocked=Qo'shimchalarning o'rnatilishi qulflanmagan. <b>installmodules.lock</b> faylini b0aee83365837fz<span class0 katalogiga yarating ='notranslate'>%s</span></b> tashqi qoʻshimchalar/modullarni oʻrnatishni bloklash.
+InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
 OldImplementation=Eski dastur
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Agar ba'zi onlayn to'lov modullari yoqilgan bo'lsa (Paypal, Stripe, ...), onlayn to'lovni amalga oshirish uchun PDF -ga havola qo'shing.
 DashboardDisableGlobal=Butun dunyo bo'ylab ochiq narsalarning bosh barmog'ini o'chirib qo'ying
@@ -2405,8 +2406,8 @@ NotAvailableByDefaultEnabledOnModuleActivation=Sukut bo'yicha yaratilmagan. Faqa
 CSSPage=CSS uslubi
 Defaultfortype=Standart
 DefaultForTypeDesc=Shablon turi uchun yangi elektron pochta yaratishda sukut bo'yicha qo'llaniladigan shablon
-OptionXShouldBeEnabledInModuleY="<b>%s</b>" varianti <span class modulida yoqilishi kerak ='notranslate'><b></span>%s</b>
-OptionXIsCorrectlyEnabledInModuleY="<b>%s</b>" varianti <span class= modulida yoqilgan 'notranslate'><b></span>%s</b>
+OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
 AllowOnLineSign=Onlayn imzoga ruxsat berish
 AtBottomOfPage=Sahifaning pastki qismida
 FailedAuth=muvaffaqiyatsiz autentifikatsiyalar
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/uz_UZ/assets.lang b/htdocs/langs/uz_UZ/assets.lang
index 9c78f7235d5..63ca936f84f 100644
--- a/htdocs/langs/uz_UZ/assets.lang
+++ b/htdocs/langs/uz_UZ/assets.lang
@@ -122,7 +122,6 @@ AssetDepreciationOptionDepreciationTypeLinear=Chiziqli
 AssetDepreciationOptionDepreciationTypeDegressive=Degressiv
 AssetDepreciationOptionDepreciationTypeExceptional=Istisno
 AssetDepreciationOptionDegressiveRate=Degressiv stavka
-AssetDepreciationOptionAcceleratedDepreciation=Tezlashtirilgan amortizatsiya (soliq)
 AssetDepreciationOptionDuration=Davomiyligi
 AssetDepreciationOptionDurationType=Tur muddati
 AssetDepreciationOptionDurationTypeAnnual=Yillik
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 4baaebe14e6..15caa29276d 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -188,7 +188,7 @@ SuppliersDraftInvoices=Xaridor hisob-fakturalari
 Unpaid=To'lanmagan
 ErrorNoPaymentDefined=Xato To'lov aniqlanmadi
 ConfirmDeleteBill=Ushbu hisob-fakturani o'chirishni xohlaysizmi?
-ConfirmValidateBill=Haqiqatan ham bu fakturani <b>%s<span class='notranslate'></b> havolasi bilan tasdiqlamoqchimisiz >?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Hisob-fakturani <b> %s </b> holatini qoralama holatiga o'zgartirishni xohlaysizmi?
 ConfirmClassifyPaidBill=Hisob-fakturani <b> %s </b> ni to'langan holatga o'zgartirishni xohlaysizmi?
 ConfirmCancelBill=Hisob-fakturani bekor qilishni xohlaysizmi <b> %s </b>?
@@ -571,7 +571,7 @@ PDFCrevetteDescription=Hisob-fakturaning PDF shablonini Crevette. Vaziyat-faktur
 TerreNumRefModelDesc1=Qaytariladigan raqam standart invoyslar uchun %syymm-nnnn va kredit eslatmalari uchun %syymm-nnnn formatida, yy yil, mm - oy va nnnn - uzilishsiz va 0 ga qaytmaydigan ketma-ket avtomatik oshiruvchi raqam
 MarsNumRefModelDesc1=Qaytish raqami %sstandart hisob-fakturalar uchun yymm-nnnn, almashtiriladigan hisob-fakturalar uchun %syymm-nnnn, %syymm-nnnn dastlabki toʻlov hisob-fakturalari uchun va %syymm-nnnn kredit notalari uchun bu erda yy yil, mm oy va nnnn ketma-ket avtomatik tanaffussiz va 0 ga qaytmaydigan sonni oshirish
 TerreNumRefModelError=$ Syymm bilan boshlangan qonun loyihasi allaqachon mavjud va ushbu ketma-ketlik modeliga mos kelmaydi. Ushbu modulni faollashtirish uchun uni olib tashlang yoki nomini o'zgartiring.
-CactusNumRefModelDesc1=Qaytish raqami %sstandart hisob-fakturalar uchun yymm-nnnn, kredit eslatmalari uchun %syymm-nnnn va <span class=' formatida. notranslate'>%s</span>yymm-nnnn avans to‘lov schyot-fakturalari uchun bu yerda yy yil, mm oy va nnnn uzilishsiz va 0 ga qaytmaydigan ketma-ket avtomatik oshiruvchi raqamdir.
+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 sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Erta yopilish sababi
 EarlyClosingComment=Erta yopilish eslatmasi
 ##### Types de contacts #####
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 97bbf3bf6c4..46274bd2722 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -136,7 +136,7 @@ PrintWithoutDetailsLabelDefault=Tafsilotlarsiz chop etishda satr yorlig'i sukut
 PrintWithoutDetails=Tafsilotlarsiz chop eting
 YearNotDefined=Yil aniqlanmagan
 TakeposBarcodeRuleToInsertProduct=Mahsulotni kiritish uchun shtrix kod qoidasi
-TakeposBarcodeRuleToInsertProductDesc=Skanerlangan shtrix-koddan mahsulot maʼlumotnomasi + miqdorni chiqarish qoidasi.<br>Agar boʻsh boʻlsa (standart qiymat), ilova mahsulotni topish uchun skanerlangan toʻliq shtrix-koddan foydalanadi.<br><br>Agar aniqlangan bo'lsa, sintaksis quyidagicha bo'lishi kerak:<br><span'>notranslate class='notranslate <b></span>ref:NB+qu:NB+qd:NB+other:NB</b><br> bu yerda skanerlangan shtrix-koddan maʼlumotlarni chiqarish uchun foydalaniladigan belgilar soni:<br><b>refb09a4b78z1f  : mahsulot ma'lumoti<br><b>qu</b>: elementni (birliklarni) kiritishda oʻrnatish elementni (oʻnlik kasr) kiritishda oʻrnatish<br><b>boshqab09a4b739f17f8>zs.
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Allaqachon chop etilgan
 HideCategories=Kategoriyalar tanlovining butun qismini yashirish
 HideStockOnLine=Onlayn zaxiralarni yashirish
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index a4807040306..d3988da7b66 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -178,7 +178,7 @@ AnnualByCompaniesDueDebtMode=Daromadlar va xarajatlar balansi, oldindan aniqlang
 AnnualByCompaniesInputOutputMode=Daromadlar va xarajatlar balansi, oldindan belgilangan guruhlar bo'yicha tafsilotlar, <b> %sInomes-Exenses%s </b> dedi <b> pul buxgalteriyasi a09a4b73.
 SeeReportInInputOutputMode=<b> %s to'lovni tahlil qilishs%s </b> ga asoslanib, <b> asosida yozilgan to'lovlarni ko'ring </b>, agar ular amalga oshirilmagan bo'lsa ham
 SeeReportInDueDebtMode=<b> %s yozilgan hujjatlarni tahlil qilish %s </b> ga asoslanib, ma'lum <b> yozilgan hujjatlar </b> even ifed
-SeeReportInBookkeepingMode=Qarang: <b>%sbuxgalteriya hisobi jadvali tahlili%s <span class='notranslate'><b>Buxgalteriya hisobi jadvali</b> asosidagi hisobot uchun notranslate'></b></span>
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Ko'rsatilgan summalar barcha soliqlarni hisobga olgan holda
 RulesAmountWithTaxExcluded=- Ko'rsatilgan schyot-fakturalar summalari barcha soliqlarsiz
 RulesResultDue=- Unga barcha hisob-fakturalar, xarajatlar, QQS, xayriyalar, maoshlar, ular to‘langan yoki to‘lanmaganligi kiradi. <br> - Bu schyot-fakturalarning hisob-kitob sanasiga va xarajatlar yoki soliq to'lovlari uchun to'lov sanasiga asoslanadi. Ish haqi uchun muddat tugash sanasi qo'llaniladi.
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 48c7424f311..207e9e16e55 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Rejalashtirilgan ishni o'qing
 Permission23102 = Rejalashtirilgan ishni yaratish / yangilash
 Permission23103 = Rejalashtirilgan ishni o'chirish
@@ -67,7 +66,7 @@ CronModuleHelp=Dolibarr moduli katalogining nomi (tashqi Dolibarr moduli bilan h
 CronClassFileHelp=Yuklanadigan nisbiy yo'l va fayl nomi (yo'l veb-serverning ildiz katalogiga nisbatan). <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun htdocs / product / class / <u> product.class.php </u>, sinf fayli nomi uchun qiymati <br> a049271ecaf / product07f.c8f
 CronObjectHelp=Yuklanadigan ob'ekt nomi. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
 CronMethodHelp=Ob'ektni ishga tushirish usuli. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
-CronArgsHelp=Usul argumentlari. <BR> Masalan, Dolibarr mahsuloti obyektining /htdocs/product/class/product.class.php olish usulini chaqirish uchun parametrlar qiymati<span class='notranslate' bo'lishi mumkin. ><br></span><i>0, ProductRef</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 parameters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Amalga oshirish uchun tizim buyruq satri.
 CronCreateJob=Yangi Rejalashtirilgan ish yarating
 CronFrom=Kimdan
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index cd74e7fc166..fe8efb660aa 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -95,7 +95,7 @@ ErrorModuleRequireJavascript=Bu funksiya ishlashi uchun JavaScript oʻchirib qo
 ErrorPasswordsMustMatch=Yozilgan har ikkala parol bir-biriga mos kelishi kerak
 ErrorContactEMail=Texnik xatolik yuz berdi. Iltimos, quyidagi e-pochta manziliga administrator bilan bog'laning <b>%s</b> va xatoni kiriting. Xabaringizda <b>%s</b> kodi yoki ekran nusxasini qo‘shing bu sahifa.
 ErrorWrongValueForField=Maydon <b> %s </b>: '<b> %s </b>' regex qoida <b>%s</b>
-ErrorHtmlInjectionForField=Maydon <b>%s</b>: qiymati ''notranslate= '><b></span>%s</b>' ruxsat etilmagan zararli maʼlumotlarni oʻz ichiga oladi
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Dala <b> %s </b>: «<b> %s </b>" bir qiymati dala <b> %s </b> topilmadi <b> %s </b>
 ErrorFieldRefNotIn=Maydon <b> %s </b>: '<b> %s </b>' <b>%s</b> emas
 ErrorMultipleRecordFoundFromRef=<b>%s</b> dan qidirilayotganda bir nechta yozuv topildi. Qaysi identifikatordan foydalanishni bilishning iloji yo'q.
@@ -263,7 +263,7 @@ ErrorReplaceStringEmpty=Xato, o'rnini bosadigan satr bo'sh
 ErrorProductNeedBatchNumber=Xato, '<b> %s </b>' mahsulotiga juda ko'p / seriya raqami kerak
 ErrorProductDoesNotNeedBatchNumber=Xato, '<b> %s </b>' mahsuloti ko'p / seriya raqamini qabul qilmaydi
 ErrorFailedToReadObject=Xato, <b> %s </b> turidagi ob'ekt o'qilmadi
-ErrorParameterMustBeEnabledToAllwoThisFeature=Xato, <b>%s</b> parametri <span class= yoqilgan boʻlishi kerak. 'notranslate'><b></span>conf/conf.php<> ichki ish rejalashtiruvchisi tomonidan buyruq qatori interfeysidan foydalanishga ruxsat berish
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Xato, ushbu kirish amal qilish muddati oralig'ida emas
 ErrorValueLength='<b> %s </b>' maydonining uzunligi '<b> %s </b>' dan yuqori bo'lishi kerak
 ErrorReservedKeyword='<b> %s </b>' so'zi zaxiralangan kalit so'z
@@ -311,7 +311,7 @@ ErrorValueCantBeNull=<b>%s</b> uchun qiymat null bo‘lishi mumkin emas
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Bank operatsiyasining sanasi faylni yuborish sanasidan past bo'lishi mumkin emas
 ErrorTooMuchFileInForm=Formadagi fayllar juda koʻp, maksimal soni %s fayl(lar)
 ErrorSessionInvalidatedAfterPasswordChange=Parol, elektron pochta manzili, holat yoki amal qilish sanasi oʻzgargandan keyin sessiya bekor qilingan. Iltimos, qayta kiring.
-ErrorExistingPermission = Ruxsat <b>%s</b> <span'nolate class='notranslate <b></span>%s</b> allaqachon mavjud
+ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
 ErrorFieldExist=<b>%s</b> uchun qiymat allaqachon mavjud
 ErrorEqualModule=<b>%s</b> moduli yaroqsiz
 ErrorFieldValue=<b>%s</b> uchun qiymat noto‘g‘ri
diff --git a/htdocs/langs/uz_UZ/eventorganization.lang b/htdocs/langs/uz_UZ/eventorganization.lang
index 52ee81e5554..dd8f22d493f 100644
--- a/htdocs/langs/uz_UZ/eventorganization.lang
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Ro'yxatdan o'tish narxi
 PriceOfRegistrationHelp=Ro'yxatdan o'tish yoki tadbirda qatnashish uchun to'lanadigan narx
 PriceOfBooth=Stendda turish uchun obuna narxi
 PriceOfBoothHelp=Stendda turish uchun obuna narxi
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Konferentsiyalar uchun ICS havolasi
 ConferenceOrBoothInformation=Konferentsiya yoki stend haqida ma'lumot
 Attendees=Ishtirokchilar
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 11d3af752e5..05c46845677 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -95,7 +95,7 @@ NbOfLinesImported=Muvaffaqiyatli import qilingan qatorlar soni: <b> %s </b>.
 DataComeFromNoWhere=Qo'shish uchun qiymat manba faylida yo'q.
 DataComeFromFileFieldNb=Qo'shiladigan qiymat manba faylidagi <b>%s</b> ustunidan olinadi.
 DataComeFromIdFoundFromRef=Manba faylidan keladigan qiymat foydalaniladigan asosiy ob'ektning identifikatorini topish uchun ishlatiladi (shuning uchun ob'ekt <b>%s</b> manba faylidan olingan koʻrsatma maʼlumotlar bazasida boʻlishi kerak).
-DataComeFromIdFoundFromCodeId=Manba faylidan keladigan kod qiymati foydalaniladigan asosiy ob'ekt identifikatorini topish uchun ishlatiladi (shuning uchun manba fayldagi kod <b><span sinf lug'atida mavjud bo'lishi kerak. ='notranslate'>%s</span></b>). E'tibor bering, agar siz identifikatorni bilsangiz, uni kod o'rniga manba faylida ham ishlatishingiz mumkin. Import ikkala holatda ham ishlashi kerak.
+DataComeFromIdFoundFromCodeId=The value of code that comes from 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=Dastlabki fayldan olingan ma'lumotlar quyidagi maydonga kiritiladi:
 DataIDSourceIsInsertedInto=Manba faylidagi ma'lumotlar yordamida topilgan asosiy ob'ektning identifikatori quyidagi maydonga kiritiladi:
 DataCodeIDSourceIsInsertedInto=Koddan topilgan ota -onaning identifikatori quyidagi maydonga kiritiladi:
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 2c803f4b6d1..f975342c053 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -182,12 +182,12 @@ IsAnAnswer=Dastlabki elektron pochtaning javobi
 RecordCreatedByEmailCollector=%s elektron pochtasidan elektron pochta yig'uvchisi %s tomonidan yaratilgan yozuv
 DefaultBlacklistMailingStatus=Yangi kontakt yaratishda "%s" maydonining standart qiymati
 DefaultStatusEmptyMandatory=Bo'sh, ammo majburiy
-WarningLimitSendByDay=OGOHLANTIRISH: Namunangizni sozlash yoki shartnomasi kunlik xatlar soningizni <b>%s<span class='notranslate' bilan cheklaydi. ></b></span>. Koʻproq yuborishga urinish misolingiz sekinlashishiga yoki toʻxtatilishiga olib kelishi mumkin. Agar sizga kattaroq kvota kerak bo'lsa, qo'llab-quvvatlash xizmatiga murojaat qiling.
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
 NoMoreRecipientToSendTo=E-pochtani yuborish uchun boshqa qabul qiluvchi yo'q
 EmailOptedOut=E-pochta egasi u bilan endi bu xat orqali bog‘lanmaslikni so‘radi
 EvenUnsubscribe=O'chirish xatlarini ham qo'shing
 EvenUnsubscribeDesc=Maqsad sifatida elektron pochta xabarlarini tanlaganingizda, rad etish xatlarini qo'shing. Masalan, majburiy elektron pochta xabarlari uchun foydalidir.
-XEmailsDoneYActionsDone=%s e-pochta xatlari oldindan malakali, %s xatlar muvaffaqiyatli qayta ishlandi (<span class='notranslate'>%s uchun) /bajarilgan harakatlar)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
 helpWithAi=Generate message from AI
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 86c2446086c..4d772dbfad4 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Jami (soliq bilan birga)
 TotalHT=Jami (soliqdan tashqari)
 TotalHTforthispage=Ushbu sahifa uchun jami (soliqdan tashqari)
 Totalforthispage=Ushbu sahifa uchun jami
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Jami (soliq bilan birga)
 TotalTTCToYourCredit=Sizning kreditingiz uchun jami (soliq)
 TotalVAT=Jami soliq
@@ -647,6 +649,7 @@ ReportName=Hisobot nomi
 ReportPeriod=Hisobot davri
 ReportDescription=Tavsif
 Report=Hisobot
+Reports=Reports
 Keyword=Kalit so'z
 Origin=Kelib chiqishi
 Legend=Afsona
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index a1c3f1383c7..c797d04b5c6 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -94,7 +94,7 @@ SeeExamples=Bu erda misollarni ko'ring
 EnabledDesc=Bu maydonni faollashtirish sharti.<br><br>Misollar:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
 VisibleDesc=Maydon ko'rinadimi? (Misollar: 0=Hech qachon koʻrinmaydi, 1=Roʻyxatda koʻrinadi va shakllarni yaratish/yangilash/koʻrish, 2=Faqat roʻyxatda koʻrinadi, 3=Faqat shakl yaratish/yangilash/koʻrishda koʻrinadi (roʻyxatlarda emas), 4=Roʻyxatlarda koʻrinadi va faqat shaklni yangilash/ko‘rish (yaratmaydi), 5=Ro‘yxatda ko‘rinadi va forma faqat ko‘rinadi (yaratmaydi, yangilanmaydi).<br><br> Salbiy qiymatdan foydalanish, bu maydon sukut boʻyicha roʻyxatda koʻrsatilmaydi, lekin koʻrish uchun tanlanishi mumkin).
 ItCanBeAnExpression=Bu ifoda bo'lishi mumkin. Misol:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Bu maydonni mos keluvchi PDF hujjatlarida ko‘rsating, siz “Joylashuv” maydoni bilan joylashuvni boshqarishingiz mumkin.<br><strong>Hujjat uchun:</strong><br>0 = ko'rsatilmaydi <br>1 = displey<spante class='translate ><br></span>2 = faqat bo'sh bo'lmasa ko'rsatish<br><br>b09b784 span>Hujjat qatorlari uchun:<span class='notranslate'></strong><br>0 = koʻrsatilmagan <br> = ustunda ko'rsatiladi<br>3 = tavsifdan keyin satr tavsifi ustunida ko'rsatiladi<br>4 = tavsifdan keyin tavsif ustunida ko'rsatiladi faqat bo'sh bo'lmasa
+DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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 formatida
 IsAMeasureDesc=Jami ro'yxatga kiritish uchun maydon qiymatini yig'ish mumkinmi? (Masalan: 1 yoki 0)
 SearchAllDesc=Ushbu maydon tezkor qidiruv vositasidan qidirish uchun foydalaniladimi? (Masalan: 1 yoki 0)
@@ -148,7 +148,7 @@ CSSListClass=Ro'yxat uchun CSS
 NotEditable=Tahrirlash mumkin emas
 ForeignKey=Chet el kaliti
 ForeignKeyDesc=Agar ushbu maydonning qiymati boshqa jadvalda mavjudligi kafolatlangan bo'lsa. Bu yerga mos qiymat sintaksisini kiriting: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Misol:<br>varchar(99)<br>elektron pochta<br>telefon ='notranslate'><br></span>ip<br>url<br>parol<span class='notranslate4'b>b span>double(24,8)<br>real<br>matn<br> <span class='notranslate'><br>date<br>datetime<br>vaqt tamg'asi<span'trans'no'no <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]ccb01<br>'1' yozuv yaratish uchun kombinatsiyadan keyin + tugmasi qo'shilganligini bildiradi<br>'filtr Universal filtr sintaksisi sharti, misol: '((status:=:1) VA (fk_user:=:__USER_ID__) AND (obyekt:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Bu maydon/atributning turi.
 AsciiToHtmlConverter=Ascii-dan HTML-ga o'zgartiruvchi
 AsciiToPdfConverter=Ascii-dan PDF-ga o'tkazuvchi
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Deskriptorga kod qo‘shib bo‘lmadi. Faylda “%
 DictionariesCreated=<b>%s</b> lug'ati muvaffaqiyatli yaratildi.
 DictionaryDeleted=<b>%s</b> lug'ati olib tashlandi.
 PropertyModuleUpdated=<b>%s</b> mulki muvaffaqiyatli yangilandi
-InfoForApiFile=* Faylni birinchi marta yaratganingizda, har bir obyekt uchun barcha usullar <strong> yaratiladi.</strong><br>* <strong>oʻchirishni bosganingizda</strong> ni bosganingizda, <span sinfi uchun barcha usullarni olib tashlaysiz. ='notranslate'><strong></span>tanlangan obyekt</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Modulni sozlash sahifasi
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Ommaviy elektron pochta moduli uchun yangi elektron maqsadli tanlovchilarni taqdim etish uchun sinf fayllarini bu yerda yaratishingiz va tahrirlashingiz mumkin
diff --git a/htdocs/langs/uz_UZ/oauth.lang b/htdocs/langs/uz_UZ/oauth.lang
index cc95ac43594..2a44cd3481d 100644
--- a/htdocs/langs/uz_UZ/oauth.lang
+++ b/htdocs/langs/uz_UZ/oauth.lang
@@ -29,7 +29,7 @@ OAUTH_GOOGLE_SECRET=OAuth Google Secret
 OAUTH_GITHUB_NAME=OAuth GitHub xizmati
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_URL_FOR_CREDENTIAL=<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">bu sahifaga o'ting<span class="fas fa-external-link-alt paddingleft"></span><span><spante class='notranslate ></a></span> yaratish yoki OAuth ID va siringizni olish uchun
+OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe testi
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
 OAUTH_ID=OAuth mijoz identifikatori
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index cc93d0d8b30..2ce8d43eb94 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=<b>%s</b> faylini yuklab bo‘lmadi.
 AddFolder=Jild yaratish
 FileWasCreateFolder=<b>%s</b> jild yaratildi
 FTPFailedToCreateFolder=<b>%s</b> jildini yaratib bo‘lmadi.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index 8355a88b00e..89b6fa4cbe6 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -34,4 +34,4 @@ ARollbackWasPerformedOnPostActions=Postning barcha harakatlarida orqaga qaytaris
 ValidationOfPaymentFailed=To'lov tasdiqlanmadi
 CardOwner=Karta egasi
 PayPalBalance=Paypal krediti
-OnlineSubscriptionPaymentLine=%s<br>da yozilgan onlayn obuna %s<span class=' orqali toʻlanadi notranslate'><br></span>Asl IP-manzili: %s<br>Tranzaksiya identifikatori: <span'class='8bz0f </span>
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index bd027e05832..d894ba6175f 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -433,4 +433,6 @@ ModifyValueExtrafields = Qo'shimcha maydonning qiymatini o'zgartirish
 OrProductsWithCategories=Yoki teglar/toifali mahsulotlar
 WarningTransferBatchStockMouvToGlobal = Agar siz ushbu mahsulotni seriyadan chiqarishni istasangiz, uning barcha seriyali zaxiralari global zaxiraga aylantiriladi
 WarningConvertFromBatchToSerial=Agar sizda mahsulot uchun 2 ga teng yoki kattaroq miqdor mavjud bo'lsa, ushbu tanlovga o'tish sizda bir xil partiyaning turli ob'ektlari bo'lgan mahsulotga ega bo'lishingizni anglatadi (agar siz noyob seriya raqamini xohlasangiz). Dublikat inventarizatsiya qilinmaguncha yoki uni tuzatish uchun qo'lda stok harakati amalga oshirilgunga qadar qoladi.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Haqiqatan ham qoralama holatiga qaytmoqchimisiz?<br>Hozirda inventarda oʻrnatilgan miqdorlar asliga qaytariladi.
diff --git a/htdocs/langs/uz_UZ/receiptprinter.lang b/htdocs/langs/uz_UZ/receiptprinter.lang
index 993c6c775d6..ce8c73eaaf2 100644
--- a/htdocs/langs/uz_UZ/receiptprinter.lang
+++ b/htdocs/langs/uz_UZ/receiptprinter.lang
@@ -10,6 +10,7 @@ ReceiptPrinterTemplateDesc=Shablonlarni sozlash
 ReceiptPrinterTypeDesc=Drayv turiga ko'ra "Parametrlar" maydoni uchun mumkin bo'lgan qiymatlarga misol
 ReceiptPrinterProfileDesc=Qabul qilish printeri profilining tavsifi
 ListPrinters=Printerlar ro'yxati
+FromServerPointOfView=From the web server point of view. This method must be reachable from the web server hosting.
 SetupReceiptTemplate=Shablonni sozlash
 CONNECTOR_DUMMY=Dummy printer
 CONNECTOR_NETWORK_PRINT=Tarmoq printeri
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
index d754acb8cc1..4ffa4e04f41 100644
--- a/htdocs/langs/uz_UZ/receptions.lang
+++ b/htdocs/langs/uz_UZ/receptions.lang
@@ -5,8 +5,6 @@ RefReception=Ref. ziyofat
 Reception=Qabul qilish
 Receptions=Qabullar
 AllReceptions=Barcha qabullar
-Reception=Qabul qilish
-Receptions=Qabullar
 ShowReception=Qabullarni ko'rsatish
 ReceptionsArea=Qabullar maydoni
 ListOfReceptions=Qabullar ro'yxati
diff --git a/htdocs/langs/uz_UZ/resource.lang b/htdocs/langs/uz_UZ/resource.lang
index 802c5fc9a5d..fa4aa2ac537 100644
--- a/htdocs/langs/uz_UZ/resource.lang
+++ b/htdocs/langs/uz_UZ/resource.lang
@@ -37,3 +37,5 @@ ImportDataset_resource_1=Resurslar
 
 ErrorResourcesAlreadyInUse=Ba'zi manbalardan foydalanilmoqda
 ErrorResourceUseInEvent=%s tadbirida ishlatiladigan %s
+
+MaxUsers=Maximum users (places, seats, etc.)
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index de41cbd95fc..c0d0c85e352 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Tasdiqlangan
 StatusSendingProcessedShort=Qayta ishlangan
 SendingSheet=Yuk jo'natmasi
 ConfirmDeleteSending=Ushbu yukni o'chirishni xohlaysizmi?
-ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmValidateSending=Haqiqatan ham bu jo‘natishni <b>%s</b> havolasi bilan tasdiqlamoqchimisiz ?
 ConfirmCancelSending=Ushbu yukni bekor qilmoqchi ekanligingizga aminmisiz?
 DocumentModelMerou=Merou A5 modeli
 WarningNoQtyLeftToSend=Ogohlantirish, jo'natilishini kutayotgan mahsulotlar yo'q.
@@ -81,6 +81,6 @@ CreationOptions=Yukni yaratish vaqtida mavjud variantlar
 ShipmentDistribution=Yuklarni taqsimlash
 
 ErrorTooManyCombinationBatchcode=%s qatori uchun jo‘natma yo‘q, chunki ombor, mahsulot, partiya kodining juda ko‘p kombinatsiyasi topilmadi (%s).
-ErrorNoCombinationBatchcode=%s qatorini ombor-mahsulot-lot/serial (%s, <span class='notranslate) birikmasi sifatida saqlab bo‘lmadi '>%s</span>, %s) zaxirada topilmadi.
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
 
 ErrorTooMuchShipped=Yuborilgan miqdor %s qatori uchun buyurtma qilingan miqdordan oshmasligi kerak
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 89299483ea1..bf4f5f1e9ce 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Kengaytirilgan aktsiyalarni uzatish
 ModuleStockTransferDesc=O'tkazma varaqlarini yaratish bilan birja transferini ilg'or boshqarish
 StockTransferNew=Yangi aktsiyalarni o'tkazish
 StockTransferList=Birja o'tkazmalari ro'yxati
-ConfirmValidateStockTransfer=Haqiqatan ham, bu aktsiyalarning transferini <b>%s<span class='notranslate'></b> bilan tasdiqlamoqchimisiz span>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=%s transferi bilan aksiyalar kamayishi
 ConfirmDestockCancel=%s transferi bilan aksiyalar kamayishini bekor qilish
 DestockAllProduct=Aksiyalarning kamayishi
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 65067f0e741..3a96aa0e21c 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -133,4 +133,4 @@ HideAllPerms=Barcha ruxsat qatorlarini yashirish
 UserPublicPageDesc=Ushbu foydalanuvchi uchun virtual kartani yoqishingiz mumkin. Foydalanuvchi profili va shtrix-kodi bilan url mavjud bo'lib, u smartfonga ega bo'lgan har bir kishi uni skanerlashi va kontaktingizni manzillar kitobiga qo'shishi mumkin.
 EnablePublicVirtualCard=Foydalanuvchining virtual tashrifnomasini yoqing
 UserEnabledDisabled=Foydalanuvchi holati oʻzgardi: %s
-AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
+AlternativeEmailForOAuth2=OAuth2 tizimiga kirish uchun muqobil elektron pochta
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index fd422e04533..f9e788323ea 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -63,8 +63,8 @@ YouCanEditHtmlSourceckeditor=HTML manba kodini tahrirlashdagi "Manba" tugmasi yo
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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 paddingright"></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>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></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>
 YouCanEditHtmlSource2=Almashish havolasi bilan birgalikda foydalaniladigan rasm uchun (faylning umumiy xesh tugmachasidan foydalangan holda ochiq kirish) sintaksis quyidagicha: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dff0a0z0z00090f0f08a0f09a0f09a09a09cb08a0a09a03c09a03c09c9c9c9c9c9c08f96f96f9f08f08f0f9fdf9fdfdfdfc7fd
-YouCanEditHtmlSource3=PHP obyekti tasvirining URL-manzilini olish uchun<br><strong>&lt; dan foydalaning. span>img src="<span class='notranslate'>&lt;?php chop etish getImagePublicURLOfObject($object, 1, "_small") ?b0012c7dcbe087z<span> class='notranslate'>&gt;</span></strong><br>
-YouCanEditHtmlSourceMore=<br>HTML yoki dinamik kodning boshqa namunalari <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki hujjatlaridab0e40dc6508d</span7d >.<span class='notranslate'><br>
+YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Sahifani / konteynerni klonlash
 CloneSite=Klon sayti
 SiteAdded=Veb-sayt qo'shildi
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 575d8215c8e..ccc46191657 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -47,7 +47,7 @@ MakeBankTransferOrder=Kredit o'tkazish to'g'risida so'rov yuboring
 WithdrawRequestsDone=%s to'g'ridan-to'g'ri debet to'lovi bo'yicha so'rovlar yozib olindi
 BankTransferRequestsDone=%s kredit o'tkazish bo'yicha so'rovlar yozib olindi
 ThirdPartyBankCode=Uchinchi tomonning bank kodi
-NoInvoiceCouldBeWithdrawed=Hech qanday hisob-faktura muvaffaqiyatli bajarilmadi. Hisob-fakturalar yaroqli IBANga ega kompaniyalarda ekanligini va IBANda UMR (Noyob mandat maʼlumotnomasi) rejimi <strong>%s< borligini tekshiring. span class='notranslate'></strong></span>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
 NoInvoiceCouldBeWithdrawedSupplier=Hech qanday hisob-faktura muvaffaqiyatli qayta ishlanmadi. Hisob-fakturalar to'g'ri IBANga ega kompaniyalarda ekanligini tekshiring.
 NoSalariesCouldBeWithdrawed=Hech qanday ish haqi muvaffaqiyatli qayta ishlanmadi. Ish haqi to'g'ri IBANga ega bo'lgan foydalanuvchilar uchun ekanligini 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.
@@ -66,9 +66,9 @@ WithdrawalRefusedConfirm=Jamiyat uchun pulni rad etishni xohlaganingizga aminmis
 RefusedData=Rad etilgan sana
 RefusedReason=Rad etish sababi
 RefusedInvoicing=Rad etish uchun hisob-kitob
-NoInvoiceRefused=Do not charge the customer for the refusal
-InvoiceRefused=Charge the customer for the refusal
-DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
+NoInvoiceRefused=Rad etish uchun mijozdan to'lov olmang
+InvoiceRefused=Rad etish uchun mijozdan haq to'lang
+DirectDebitRefusedInvoicingDesc=Bu rad etish mijozdan to‘lanishi kerakligini bildirish uchun belgi qo‘ying
 StatusDebitCredit=Holati debet / kredit
 StatusWaiting=Kutish
 StatusTrans=Yuborildi
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Kredit o'tkazish yo'li bilan to'lashni kutayotgan ish haqi
 RefSalary=Ish haqi
 NoSalaryInvoiceToWithdraw="%s" uchun maosh kutilmaydi. So‘rov yuborish uchun ish haqi kartasidagi “%s” sahifasiga o‘ting.
 SalaryInvoiceWaitingWithdraw=Kredit o'tkazish yo'li bilan to'lashni kutayotgan ish haqi
-
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 2bbddec407f..8b034e3d7df 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -9,16 +9,16 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Shartnoma tasdiqlangandan so'ng mijozni
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Savdo buyurtmasi yopilgandan so'ng avtomatik ravishda mijozning hisob-fakturasini yarating (yangi hisob-faktura buyurtma bilan bir xil miqdorda bo'ladi)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Chipta yaratishda avtomatik ravishda intervensiya yarating.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Savdo buyurtmasi toʻlovga oʻrnatilganda (va buyurtma miqdori imzolangan bogʻlangan takliflarning umumiy miqdori bilan bir xil boʻlsa) bogʻlangan manba takliflarini hisoblangan deb tasniflang.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Mijoz hisob-fakturasi tasdiqlanganda (va agar schyot-faktura summasi imzolangan bog‘langan takliflarning umumiy miqdori bilan bir xil bo‘lsa) bog‘langan manba takliflarini hisoblangan deb tasniflang.
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Mijoz hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori bog'langan savdo buyurtmalarining umumiy miqdori bilan bir xil bo'lsa) bog'langan manba savdo buyurtmasini to'langan deb tasniflang. Agar sizda n ta buyurtma uchun tasdiqlangan 1 ta hisob-faktura boʻlsa, bu barcha buyurtmalar uchun ham toʻlovni belgilashi mumkin.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Mijoz hisob-fakturasi toʻlanishi belgilanganida (va agar schyot-faktura summasi bogʻlangan savdo buyurtmalarining umumiy miqdori bilan bir xil boʻlsa) bogʻlangan manba savdo buyurtmalarini hisoblangan deb tasniflang. Agar sizda n ta buyurtma uchun toʻlangan 1 ta hisob-faktura boʻlsa, bu barcha buyurtmalar uchun ham toʻlovni belgilashi mumkin.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bog'langan manba savdo buyurtmalarini jo'natish tasdiqlanganda jo'natilgan deb tasniflang (va barcha jo'natmalar tomonidan jo'natilgan miqdor yangilash tartibidagi bilan bir xil bo'lsa)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Bog'langan manbalarni sotish buyurtmasini yuk yopilganda yuborilgan deb tasniflang (va agar barcha yuklar jo'natilgan miqdori yangilash tartibidagi kabi bo'lsa).
 # 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 proposals)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Bog'langan manba sotuvchisi taklifini sotuvchi hisob-fakturasi tasdiqlanganda hisoblangan deb tasniflang (va agar hisob-faktura miqdori bog'langan takliflarning umumiy miqdori bilan bir xil bo'lsa)
 # 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 orders)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Sotuvchi hisob-fakturasi tasdiqlanganda (va agar schyot-faktura summasi bog‘langan buyurtmalarning umumiy miqdori bilan bir xil bo‘lsa) bog‘langan manba xarid buyurtmasini to‘langan deb tasniflang.
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Bog'langan manba sotib olish buyurtmasini qabul qilish tasdiqlanganda olingan deb tasniflang (va barcha qabullar tomonidan qabul qilingan miqdor yangilash uchun xarid buyurtmasi bilan bir xil bo'lsa)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Bog'langan manba buyurtmasini qabulxona yopilganda olingan deb tasniflang (va barcha qabulxonalar tomonidan qabul qilingan miqdor yangilash uchun xarid buyurtmasidagi bilan bir xil bo'lsa)
 # Autoclassify shipment
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index b4b174e8ce9..27849bdfdeb 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -245,7 +245,7 @@ ActivatableOn=Có thể kích hoạt trên
 SourceFile=Tập tin nguồn
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
 Required=Được yêu cầu
-UsedOnlyWithTypeOption=Được dùng chỉ bởi một vài tùy chọn chương trình nghị sự 
+UsedOnlyWithTypeOption=Được dùng chỉ bởi một vài tùy chọn chương trình nghị sự
 Security=Bảo mật
 Passwords=Mật khẩu
 DoNotStoreClearPassword=Mã hóa mật khẩu được lưu trữ trong cơ sở dữ liệu (KHÔNG phải là văn bản thuần túy). Rất khuyến khích kích hoạt tùy chọn này.
@@ -323,7 +323,7 @@ FixOnTransifex=Sửa bản dịch trên nền tảng dịch trực tuyến của
 SubmitTranslation=Nếu bản dịch cho ngôn ngữ này chưa hoàn thành hoặc bạn thấy có lỗi, bạn có thể sửa lỗi này bằng cách chỉnh sửa các tệp trong thư mục <b>langs / %s</b> và gửi thay đổi của bạn tới www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Nếu bản dịch cho ngôn ngữ này chưa hoàn chỉnh hoặc bạn phát hiện thấy lỗi, bạn có thể sửa lỗi này bằng cách chỉnh sửa tệp vào thư mục <b>langs/%s </b> và gửi các tệp đã sửa đổi trên dolibarr.org/forum hoặc, nếu bạn là nhà phát triển, có PR trên github.com/Dolibarr/dolibarr
 ModuleSetup=Cài đặt module
-ModulesSetup=Thiết lập Mô-đun / Ứng dụng 
+ModulesSetup=Thiết lập Mô-đun / Ứng dụng
 ModuleFamilyBase=Hệ thống
 ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM)
 ModuleFamilySrm=Quản lý quan hệ nhà cung cấp (VRM)
@@ -1197,6 +1197,7 @@ Skin=Chủ đề giao diện
 DefaultSkin=Chủ đề giao diện mặc định
 MaxSizeList=Chiều dài tối đa cho danh sách
 DefaultMaxSizeList=Độ dài tối đa mặc định cho danh sách
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Độ dài tối đa mặc định cho danh sách ngắn (ví dụ: trong thẻ khách hàng)
 MessageOfDay=Tin trong ngày
 MessageLogin=Tin trang đăng nhập
@@ -1249,7 +1250,7 @@ SetupDescription2=Hai phần sau đây là bắt buộc (hai mục đầu tiên
 SetupDescription3=<a href="%s">%s -> %s</a> <br><br>Các tham số cơ bản được sử dụng để tùy chỉnh hành vi mặc định của ứng dụng của bạn (ví dụ: đối với các tính năng liên quan đến quốc gia).
 SetupDescription4=<a href="%s">%s -> %s</a> <br> Phần mềm này là một bộ gồm nhiều mô-đun/ứng dụng, tất cả đều ít nhiều độc lập nhau. Các mô-đun liên quan đến nhu cầu của bạn phải được kích hoạt và cấu hình. Các mục/tùy chọn sẽ được thêm vào menu với sự kích hoạt của một mô-đun.
 SetupDescription5=Các menu thiết lập khác quản lý các tham số tùy chọn.
-SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'></a>< /nhịp>
+SetupDescriptionLink=<a href="%s">%s - %s</a>
 SetupDescription3b=Các tham số cơ bản được sử dụng để tùy chỉnh hành vi mặc định của ứng dụng của bạn (ví dụ: đối với các tính năng liên quan đến quốc gia).
 SetupDescription4b=Phần mềm này là một bộ gồm nhiều mô-đun/ứng dụng. Các mô-đun liên quan đến nhu cầu của bạn phải được kích hoạt. Các mục menu sẽ xuất hiện khi kích hoạt các mô-đun này.
 AuditedSecurityEvents=Các sự kiện bảo mật được kiểm tra
@@ -2293,7 +2294,7 @@ InstallAndUpgradeLockedBy=Cài đặt và nâng cấp bị khóa bởi tệp <b>
 InstallLockedBy=Cài đặt/Cài đặt lại bị khóa bởi tệp <b>%s</b>
 InstallOfAddonIsNotBlocked=Cài đặt các addon không bị khóa. Tạo một tệp <b>installmodules.lock</b> vào thư mục <b>%s</b> để chặn cài đặt các tiện ích bổ sung/mô-đun bên ngoài.
 OldImplementation=Cách triển khai cũ
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Nếu một số mô-đun thanh toán trực tuyến được bật (Paypal, Stripe, ...), hãy thêm liên kết trên tệp PDF để tạo <span class='notranslate'>thanh toán</ trực tuyến nhịp>
+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=Vô hiệu hóa trên toàn cầu tất cả các ngón tay cái của các đối tượng đang mở
 BoxstatsDisableGlobal=Tắt thống kê toàn bộ hộp
 DashboardDisableBlocks=Thumbs của các đối tượng đang mở (để xử lý hoặc xử lý muộn) trên bảng điều khiển chính
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/vi_VN/assets.lang b/htdocs/langs/vi_VN/assets.lang
index f4c117b8626..c9469a11b4f 100644
--- a/htdocs/langs/vi_VN/assets.lang
+++ b/htdocs/langs/vi_VN/assets.lang
@@ -122,7 +122,6 @@ AssetDepreciationOptionDepreciationTypeLinear=tuyến tính
 AssetDepreciationOptionDepreciationTypeDegressive=thoái hóa
 AssetDepreciationOptionDepreciationTypeExceptional=Đặc biệt
 AssetDepreciationOptionDegressiveRate=Tỷ lệ giảm dần
-AssetDepreciationOptionAcceleratedDepreciation=Khấu hao nhanh (thuế)
 AssetDepreciationOptionDuration=Thời hạn
 AssetDepreciationOptionDurationType=Loại thời lượng
 AssetDepreciationOptionDurationTypeAnnual=Hàng năm
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index add9bbe610e..a6fc41bc215 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = Xem công việc theo lịch trình
 Permission23102 = Tạo/cập nhật công việc theo lịch trình
 Permission23103 = Xóa công việc theo lịch trình
diff --git a/htdocs/langs/vi_VN/eventorganization.lang b/htdocs/langs/vi_VN/eventorganization.lang
index 980adbb02a7..7c549e7b8ec 100644
--- a/htdocs/langs/vi_VN/eventorganization.lang
+++ b/htdocs/langs/vi_VN/eventorganization.lang
@@ -88,6 +88,7 @@ PriceOfRegistration=Giá đăng ký
 PriceOfRegistrationHelp=Giá phải trả để đăng ký hoặc tham gia sự kiện
 PriceOfBooth=Giá đăng ký đứng gian hàng
 PriceOfBoothHelp=Giá đăng ký đứng gian hàng
+EventOrganizationICSLinkProject=Link ICS for the event
 EventOrganizationICSLink=Liên kết ICS cho hội nghị
 ConferenceOrBoothInformation=Thông tin hội nghị hoặc gian hàng
 Attendees=Người tham dự
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 637400ebf3d..9d4e8c21463 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=Tổng (gồm thuế)
 TotalHT=Tổng cộng (chưa thuế)
 TotalHTforthispage=Tổng cộng (chưa thuế) cho trang này
 Totalforthispage=Tổng cộng cho trang này
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=Tổng (gồm thuế)
 TotalTTCToYourCredit=Tổng (gồm thuế) cho nợ của bạn
 TotalVAT=Tổng thuế
@@ -647,6 +649,7 @@ ReportName=Tên báo cáo
 ReportPeriod=Kỳ báo cáo
 ReportDescription=Mô tả
 Report=Báo cáo
+Reports=Báo cáo
 Keyword=Từ khóa
 Origin=Nguyên gốc
 Legend=Chú thích
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 18ed62a2dae..fb753024386 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -180,7 +180,7 @@ FailedToAddCodeIntoDescriptor=Không thêm được mã vào bộ mô tả. Ki
 DictionariesCreated=Từ điển <b>%s</b> đã được tạo thành công
 DictionaryDeleted=Đã xóa thành công từ điển <b>%s</b>
 PropertyModuleUpdated=Thuộc tính <b>%s</b> đã được cập nhật thành công
-InfoForApiFile=* Khi bạn tạo tệp lần đầu tiên thì tất cả các phương thức sẽ được tạo <strong>cho từng đối tượng.</strong><br>* Khi bạn nhấp vào <strong>remove</strong>, bạn chỉ cần xóa tất cả các phương thức cho lớp <span> ='notranslate'><strong></span>đối tượng được chọn</strong>.
+InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
 SetupFile=Trang để thiết lập mô-đun
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=Bạn có thể tạo và chỉnh sửa các tệp lớp tại đây để cung cấp bộ chọn mục tiêu email mới cho mô-đun gửi email hàng loạt
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 4d27075a02e..54cc3b724a7 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -336,3 +336,5 @@ FTPFailedToUploadFile=Không tải được tệp lên <b>%s</b>.
 AddFolder=Tạo thư mục
 FileWasCreateFolder=Thư mục <b>%s</b> đã được tạo
 FTPFailedToCreateFolder=Không tạo được thư mục <b>%s</b>.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/vi_VN/partnership.lang b/htdocs/langs/vi_VN/partnership.lang
index af2b551d97a..27c46457a5a 100644
--- a/htdocs/langs/vi_VN/partnership.lang
+++ b/htdocs/langs/vi_VN/partnership.lang
@@ -91,8 +91,7 @@ CountLastUrlCheckError=Số lỗi trong lần kiểm tra URL cuối cùng
 LastCheckBacklink=Ngày kiểm tra URL lần cuối
 
 NewPartnershipRequest=Yêu cầu hợp tác mới
-NewPartnershipRequestDesc=Biểu mẫu này cho phép bạn yêu cầu tham gia một trong các chương trình hợp tác của chúng tôi. Nếu bạn cần trợ giúp để điền vào biểu mẫu này, vui lòng liên hệ qua email <b>%s<span class='notranslate'></b></ khoảng>.
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Trang này phải chứa ít nhất một liên kết đến một trong các tên miền sau: %s
 
 IPOfApplicant=IP của người nộp đơn
-
diff --git a/htdocs/langs/vi_VN/paypal.lang b/htdocs/langs/vi_VN/paypal.lang
index 421108dff74..d96f11f7408 100644
--- a/htdocs/langs/vi_VN/paypal.lang
+++ b/htdocs/langs/vi_VN/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Thiết lập mô-đun PayPal
-PaypalDesc=Mô-đun này cho phép thanh toán của khách hàng thông qua <a href="http://www.paypal.com" target="_blank">PayPal</a> . Điều này có thể được sử dụng cho thanh toán đặc biệt hoặc thanh toán liên quan đến đối tượng Dolibarr (hóa đơn, đơn đặt hàng, ...)
+PaypalDesc=Mô-đun này cho phép khách hàng thanh toán qua <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a>. Điều này có thể được sử dụng để thanh toán không dự tính trước hoặc thanh toán liên quan đến đối tượng Dolibarr (hóa đơn, đơn đặt hàng, ...)
 PaypalOrCBDoPayment=Thanh toán bằng PayPal (Thẻ hoặc PayPal)
 PaypalDoPayment=Thanh toán bằng PayPal
 PAYPAL_API_SANDBOX=Chế độ kiểm tra / hộp cát
@@ -34,3 +34,4 @@ ARollbackWasPerformedOnPostActions=Một rollback đã được thực hiện tr
 ValidationOfPaymentFailed=Xác thực thanh toán không thành công
 CardOwner=Chủ thẻ
 PayPalBalance=Tín dụng Paypal
+OnlineSubscriptionPaymentLine=Đăng ký trực tuyến được ghi lại trên %s<br>Được thanh toán qua %s<br>Địa chỉ IP gốc: %s<br>ID giao dịch: %s
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 03ec9111e49..658250533e2 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -433,4 +433,6 @@ ModifyValueExtrafields = Sửa đổi giá trị của trường ngoại vi
 OrProductsWithCategories=Hoặc các sản phẩm có thẻ/danh mục
 WarningTransferBatchStockMouvToGlobal = Nếu bạn muốn giải tuần tự hóa sản phẩm này, tất cả hàng tồn kho được xê-ri hóa của nó sẽ được chuyển thành hàng tồn kho toàn cầu
 WarningConvertFromBatchToSerial=Nếu bạn hiện có số lượng cao hơn hoặc bằng 2 cho sản phẩm, việc chuyển sang lựa chọn này có nghĩa là bạn vẫn sẽ có một sản phẩm với các đối tượng khác nhau trong cùng một lô (trong khi bạn muốn có một số sê-ri duy nhất). Bản sao sẽ vẫn tồn tại cho đến khi hoàn thành việc kiểm kê hoặc di chuyển kho thủ công để khắc phục vấn đề này.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Bạn có chắc chắn muốn quay lại trạng thái Dự thảo không?<br>Số lượng hiện được đặt trong kho sẽ được đặt lại.
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index a61a2d87efc..b2eabd2853a 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -249,7 +249,7 @@ LatestProjects=Dự án %s mới nhất
 LatestModifiedProjects=Dự án sửa đổi %s mới nhất
 OtherFilteredTasks=Các nhiệm vụ được lọc khác
 NoAssignedTasks=Không tìm thấy nhiệm vụ được giao (chỉ định dự án / nhiệm vụ cho người dùng hiện tại từ hộp chọn trên cùng để nhập thời gian vào nó)
-ThirdPartyRequiredToGenerateInvoice=Một bên thứ ba phải được xác định trong dự án để có thể lập hóa đơn.
+ThirdPartyRequiredToGenerateIntervention=A third party must be defined on project to be able to create intervention.
 ThirdPartyRequiredToGenerateInvoice=Một bên thứ ba phải được xác định trong dự án để có thể lập hóa đơn.
 ChooseANotYetAssignedTask=Chọn một cônng việc chưa gán cho bạn
 # Comments trans
diff --git a/htdocs/langs/vi_VN/receiptprinter.lang b/htdocs/langs/vi_VN/receiptprinter.lang
index e12bcaf6c06..d85cdc02633 100644
--- a/htdocs/langs/vi_VN/receiptprinter.lang
+++ b/htdocs/langs/vi_VN/receiptprinter.lang
@@ -10,6 +10,7 @@ ReceiptPrinterTemplateDesc=Thiết lập mẫu
 ReceiptPrinterTypeDesc=Ví dụ về các giá trị có thể có cho trường "Tham số" theo loại trình điều khiển
 ReceiptPrinterProfileDesc=Mô tả hồ sơ của máy in hóa đơn
 ListPrinters=Danh sách máy in
+FromServerPointOfView=From the web server point of view. This method must be reachable from the web server hosting.
 SetupReceiptTemplate=Thiết lập mẫu
 CONNECTOR_DUMMY=Máy in giả
 CONNECTOR_NETWORK_PRINT=Máy in mạng
diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
index c68abc0bf7b..3e3d375d9a9 100644
--- a/htdocs/langs/vi_VN/resource.lang
+++ b/htdocs/langs/vi_VN/resource.lang
@@ -37,3 +37,5 @@ ImportDataset_resource_1=Tài nguyên
 
 ErrorResourcesAlreadyInUse=Một số tài nguyên đang được sử dụng
 ErrorResourceUseInEvent=%s được sử dụng trong %s sự kiện
+
+MaxUsers=Maximum users (places, seats, etc.)
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 4aac852f95d..63038b52aa9 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -282,7 +282,7 @@ ModuleStockTransferName=Chuyển nhượng cổ phiếu nâng cao
 ModuleStockTransferDesc=Quản lý nâng cao việc chuyển nhượng chứng khoán, với việc tạo bảng chuyển nhượng
 StockTransferNew=Chuyển nhượng cổ phiếu mới
 StockTransferList=Danh sách chuyển nhượng cổ phiếu
-ConfirmValidateStockTransfer=Bạn có chắc chắn muốn xác thực việc chuyển nhượng cổ phiếu này bằng tham chiếu <b>%s<span class='notranslate'></b></ khoảng> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Giảm cổ phiếu khi chuyển %s
 ConfirmDestockCancel=Hủy giảm cổ phiếu bằng cách chuyển %s
 DestockAllProduct=Giảm cổ phiếu
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 73a340d7c7d..9b161fa7f59 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -49,7 +49,7 @@ SetHereVirtualHost=<u>Sử dụng với Apache/NGinx/...</u><br>Tạo trên máy
 ExampleToUseInApacheVirtualHostConfig=Ví dụ để sử dụng trong thiết lập máy chủ ảo Apache:
 YouCanAlsoTestWithPHPS=<u>Sử dụng với máy chủ nhúng PHP</u> <br> Trên môi trường phát triển, bạn có thể muốn kiểm tra trang web với máy chủ web nhúng PHP (yêu cầu PHP 5.5) bằng cách chạy <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Chạy trang web của bạn với một nhà cung cấp dịch vụ lưu trữ Dolibarr Hosting khác</u><br>Nếu bạn không có sẵn máy chủ web như Apache hoặc NGinx trên internet, bạn có thể xuất và nhập trang web của mình vào một phiên bản Dolibarr khác do nhà cung cấp dịch vụ lưu trữ Dolibarr khác cung cấp tích hợp đầy đủ với mô-đun Trang web. Bạn có thể tìm thấy danh sách một số nhà cung cấp dịch vụ lưu trữ Dolibarr trên <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Ngoài ra, hãy kiểm tra xem người dùng máy chủ ảo (ví dụ: www-data) có <strong>%s</strong>  quyền đối với các tệp vào<br><strong>%s<span lớp ='notranslate'></strong></span>
+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=Đọc
 WritePerm=Viết
 TestDeployOnWeb=Kiểm tra / triển khai trên web
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 208771e21e2..b16924c1785 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=共计(含税)
 TotalHT=总计（不含税金）
 TotalHTforthispage=此页总计（不含税金）
 Totalforthispage=本页总计
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=共计(含税)
 TotalTTCToYourCredit=共计(含税)你的信用
 TotalVAT=增值税总金额
@@ -647,6 +649,7 @@ ReportName=报告名称
 ReportPeriod=报告期间
 ReportDescription=描述
 Report=报告
+Reports=报表
 Keyword=关键字
 Origin=原始
 Legend=图例
@@ -933,7 +936,7 @@ NotAllExportedMovementsCouldBeRecordedAsExported=并非所有导出的调拨都
 Miscellaneous=各项设定
 Calendar=日历
 GroupBy=分组：
-GroupByX=按 <span class='notranslate'>%s</span> 分组\n
+GroupByX=Group by %s
 ViewFlatList=查看全部列表
 ViewAccountList=查看账本
 ViewSubAccountList=查看子账户账本
@@ -1115,7 +1118,7 @@ ToRefuse=拒绝
 ToProcess=待处理
 ToApprove=审批
 GlobalOpenedElemView=全局视图
-NoArticlesFoundForTheKeyword=未找到与关键字“<span class='notranslate'><strong></span>”相关的文章\n %s </strong> '
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=没有找到该类别的文章
 ToAcceptRefuse=接受 |拒绝
 ContactDefault_agenda=事件
@@ -1139,7 +1142,7 @@ SelectYourGraphOptionsFirst=选择图表选项来构建图表
 Measures=措施
 XAxis=X轴
 YAxis=Y轴
-StatusOfRefMustBe=<span class='notranslate'>%s</span> 的状态\n 必须是 %s
+StatusOfRefMustBe=Status of %s must be %s
 DeleteFileHeader=确认文件删除
 DeleteFileText=您真的要删除该文件吗？
 ShowOtherLanguages=显示其他语言
@@ -1179,7 +1182,7 @@ ConfirmUpdatePrice=选择加价/减价率
 ConfirmAffectTagQuestion=您确定要将标签分配给 %s 选定的记录？
 ConfirmAffectUserQuestion=您确定要将用户分配给 %s 选定的记录？
 ConfirmSetSupervisorQuestion=您确定要将主管设置为 %s 选定的记录？
-ConfirmUpdatePriceQuestion=您确定要更新 <span class='notranslate'>%s</span> 的价格吗\n 选定的记录？
+ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
 CategTypeNotFound=未找到记录类型的标签类型
 SupervisorNotFound=未找到主管
 CopiedToClipboard=已复制到剪贴板
@@ -1234,7 +1237,7 @@ HideOnVCard=隐藏%s
 ShowOnVCard=Show %s
 AddToContacts=将地址添加到我的联系人
 LastAccess=上次访问时间
-UploadAnImageToSeeAPhotoHere=从标签 <span class='notranslate'>%s</span> 上传图像\n 在这里查看照片
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
 LastPasswordChangeDate=上次密码更改日期
 PublicVirtualCardUrl=虚拟名片页面 URL
 PublicVirtualCard=虚拟名片
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index 080ddb9c7fd..bab98436900 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -62,7 +62,7 @@ UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=測試文件上傳的表單（根據設置）
 ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
 ModuleIsEnabled=The module/application <b>%s</b> has been enabled
-IfModuleEnabled=注意：yes 僅在模塊 <span class='notranslate'><b></span> 時有效\n %s </b>  已啟用
+IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=刪除/重命名文件 <b> %s </b>  如果存在，則允許使用更新/安裝工具。
 RestoreLock=恢復文件<b> %s </b> ，僅具有讀取權限，以禁用更新/安裝工具的任何進一步使用。
 SecuritySetup=安全設置
@@ -106,7 +106,7 @@ NextValueForInvoices=下一個值（發票）
 NextValueForCreditNotes=下一個值（貸方票據）
 NextValueForDeposit=下一個值（首付款）
 NextValueForReplacements=下一個值（替換）
-MustBeLowerThanPHPLimit=注意：您的 PHP 配置目前限制上傳到 <span class='notranslate'><b></span> 的最大文件大小\n %s </b>  %s，無論該參數的值如何
+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=注意：您的 PHP 配置中沒有設置限制
 MaxSizeForUploadedFiles=上傳文件的最大大小（0 表示禁止上傳）
 UseCaptchaCode=在登錄頁面和一些公共頁面上使用圖形代碼（CAPTCHA）
@@ -159,7 +159,7 @@ SystemInfo=系統信息
 SystemToolsArea=系統工具區
 SystemToolsAreaDesc=該區域提供管理功能。使用菜單選擇所需的功能。
 Purge=清除
-PurgeAreaDesc=此頁面允許您刪除 Dolibarr 生成或存儲的所有文件（臨時文件或 <span class='notranslate'><b></span> 中的所有文件\n %s </b>  目錄）。通常不需要使用此功能。它是為 Dolibarr 由提供商託管的用戶提供的一種解決方法，該提供商不提供刪除 Web 服務器生成的文件的權限。
+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=刪除日誌文件，包括<b> %s </b>  為 Syslog 模塊定義（沒有丟失數據的風險）
 PurgeDeleteTemporaryFiles=刪除所有日誌和臨時文件（沒有丟失數據的風險）。參數可以是“tempfilesold”、“logfiles”或兩者都是“tempfilesold+logfiles”。注意：僅當臨時目錄創建時間超過 24 小時時，才會刪除臨時文件。
 PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
@@ -210,7 +210,7 @@ AutoDetectLang=自動檢測（瀏覽器語言）
 FeatureDisabledInDemo=演示中禁用的功能
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 BoxesDesc=小部件是顯示一些信息的組件，您可以添加這些信息來個性化某些頁面。您可以通過選擇目標頁面並單擊“激活”來選擇是否顯示小部件，或者單擊垃圾桶將其禁用。
-OnlyActiveElementsAreShown=僅來自 <span class='notranslate'><a href="%s"></span> 的元素\n 啟用模塊</a>  顯示。
+OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=模塊/應用程序確定軟件中可用的功能。有些模塊需要在激活模塊後授予用戶權限。點擊開/關按鈕<span class="small valignmiddle"> %s </span>  每個模塊的啟用或禁用模塊/應用程序。
 ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
 ModulesMarketPlaceDesc=您可以在互聯網上的外部網站上找到更多模塊下載...
@@ -250,8 +250,8 @@ Security=安全
 Passwords=密碼
 DoNotStoreClearPassword=加密存儲在數據庫中的密碼（不是純文本）。強烈建議激活此選項。
 MainDbPasswordFileConfEncrypted=加密存儲在conf.php中的數據庫密碼。強烈建議激活此選項。
-InstrucToEncodePass=將密碼編碼到 <b> conf.php </b>  文件，替換行 <br>  <b> $dolibarr_main_db_pass="..."; </b>  <br> 作者：<br>  <b> $dolibarr_main_db_pass="加密:%s"; </b> 
-InstrucToClearPass=將密碼解碼（清除）到 <b> conf.php </b>  文件，替換行 <br>  <b> $dolibarr_main_db_pass="已加密：..."; </b>  <br> 作者：<br>  <b> $dolibarr_main_db_pass="%s"; </b> 
+InstrucToEncodePass=將密碼編碼到 <b> conf.php </b>  文件，替換行 <br>  <b> $dolibarr_main_db_pass="..."; </b>  <br> 作者：<br>  <b> $dolibarr_main_db_pass="加密:%s"; </b>
+InstrucToClearPass=將密碼解碼（清除）到 <b> conf.php </b>  文件，替換行 <br>  <b> $dolibarr_main_db_pass="已加密：..."; </b>  <br> 作者：<br>  <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=保護生成的 PDF 文件。不建議這樣做，因為它會破壞批量 PDF 生成。
 ProtectAndEncryptPdfFilesDesc=對 PDF 文檔的保護使其可以使用任何 PDF 瀏覽器閱讀和打印。但是，編輯和復制已不再可能。請注意，使用此功能會使全局合併 PDF 的構建不起作用。
 Feature=特徵
@@ -268,10 +268,10 @@ OtherResources=其他資源
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=對於用戶或開發人員文檔（文檔、常見問題解答...），<br> 看看 Dolibarr Wiki：<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> 
+ForDocumentationSeeWiki=對於用戶或開發人員文檔（文檔、常見問題解答...），<br> 看看 Dolibarr Wiki：<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=其中一些資源僅在 <span class='notranslate'><b></span> 中提供\n 英語 </b> 。
+HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
 CurrentMenuHandler=當前菜單處理程序
 MeasuringUnit=測量單位
 LeftMargin=Left margin
@@ -320,7 +320,7 @@ UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=該功能在類 Unix 系統上不可用。在本地測試您的 sendmail 程序。
 FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=如果該語言的翻譯不完整或發現錯誤，您可以通過編輯目錄 <span class='notranslate'><b></span> 中的文件來更正此問題\n langs/%s </b>  並將您的更改提交至 www.transifex.com/dolibarr-association/dolibarr/
+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=模塊設置
 ModulesSetup=模塊/應用程序設置
@@ -345,11 +345,11 @@ ThisIsAlternativeProcessToFollow=This is an alternative setup to process manuall
 StepNb=步驟%s
 FindPackageFromWebSite=找到一個提供您需要的功能的軟件包（例如在官方網站%s）。
 DownloadPackageFromWebSite=下載包（例如從官方網站%s）。
-UnpackPackageInDolibarrRoot=將打包文件解壓/解壓到您的 Dolibarr 服務器目錄中：<b> %s </b> 
+UnpackPackageInDolibarrRoot=將打包文件解壓/解壓到您的 Dolibarr 服務器目錄中：<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=模塊部署完成。但是，您必須通過轉至頁面設置模塊來在應用程序中啟用和設置該模塊：<a href="%s"> %s </a> 。
-NotExistsDirect=備用根目錄未定義為現有目錄。 <br> 
-InfDirAlt=從版本 3 開始，可以定義備用根目錄。這允許您將插件和自定義模板存儲到專用目錄中。 <br> 只需在 Dolibarr 的根目錄創建一個目錄（例如：custom）。 <br> 
+NotExistsDirect=備用根目錄未定義為現有目錄。 <br>
+InfDirAlt=從版本 3 開始，可以定義備用根目錄。這允許您將插件和自定義模板存儲到專用目錄中。 <br> 只需在 Dolibarr 的根目錄創建一個目錄（例如：custom）。 <br>
 InfDirExample= <br> 然後在文件中聲明<strong> conf.php </strong>  <br>  $dolibarr_main_url_root_alt='/custom' <br> $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom' <br> 如果這些行用“#”註釋，要啟用它們，只需通過刪除“#”字符來取消註釋即可。
 YouCanSubmitFile=您可以從這裡上傳模塊包的 .zip 文件：
 CurrentVersion=多利巴爾當前版本
@@ -361,21 +361,21 @@ LastActivationIP=Latest activation IP
 LastActivationVersion=Latest activation version
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
-GenericMaskCodes=您可以輸入任何編號掩碼。在此掩碼中，可以使用以下標籤：<br>  <b> {000000} </b>  對應於每個 <span class='notranslate'>%s</span> 都會遞增的數字\n。輸入所需計數器長度的零個數。計數器將從左側開始補零，以便具有與掩碼一樣多的零。 <br>  <b> {000000+000} </b>  與前一個相同，但從第一個 <span class='notranslate'>%s</span> 開始應用與 + 號右側數字相對應的偏移量\n。 <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>  n 個字符的客戶端代碼 <br>  <b> {cccc000} </b>  n 個字符的客戶代碼後面是一個專門針對該客戶的計數器。該客戶專用計數器與全局計數器同時重置。 <br>  <b> {tttt} </b>  n 個字符上的第三方類型代碼（參見菜單主頁 - 設置 - 詞典 - 第三方類型）。如果添加此標籤，則每種類型的第三方的計數器都會不同。 <br> 
-GenericMaskCodes3=面具中的所有其他角色將保持不變。 <br> 不允許有空格。 <br> 
+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>  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>
-GenericMaskCodes4a= <u> 99號示例%s 第三方 TheCompany 的日期為 2023 年 1 月 31 日：</u>  <br> 
-GenericMaskCodes4b= <u> 2023 年 1 月 31 日創建的第三方示例：</u>  <br> 
-GenericMaskCodes4c= <u> 2023 年 1 月 31 日創建的產品示例：</u>  <br> 
+GenericMaskCodes4a= <u> 99號示例%s 第三方 TheCompany 的日期為 2023 年 1 月 31 日：</u>  <br>
+GenericMaskCodes4b= <u> 2023 年 1 月 31 日創建的第三方示例：</u>  <br>
+GenericMaskCodes4c= <u> 2023 年 1 月 31 日創建的產品示例：</u>  <br>
 GenericMaskCodes5= <b> ABC{yy}{mm}-{000000} </b>  將給出 <b> ABC2301-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> IN2301-0099-A </b>  如果公司類型為“Responsable Inscripto”，類型代碼為“A_RI”
 GenericNumRefModelDesc=根據定義的掩碼返回可定制的數字。
-ServerAvailableOnIPOrPort=服務器地址為 <b> %s </b>  在端口 <b> %s </b> 
-ServerNotAvailableOnIPOrPort=服務器在地址 <span class='notranslate'><b></span> 處不可用\n %s </b>  在端口 <b> %s </b> 
+ServerAvailableOnIPOrPort=服務器地址為 <b> %s </b>  在端口 <b> %s </b>
+ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
 DoTestServerAvailability=測試服務器連接
 DoTestSend=測試發送
 DoTestSendHTML=測試發送 HTML
-ErrorCantUseRazIfNoYearInMask=錯誤，如果序列為 {yy} 或 <span class='notranslate'>{yyyy}</span>，則無法使用選項 @ 每年重置計數器\n 不在面具中。
+ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=錯誤，無法使用選項 @ if 序列 {yy}{mm} 或 {yyyy}{mm} 不在面具中。
 UMask=Unix/Linux/BSD/Mac 文件系統上新文件的 UMask 參數。
 UMaskExplanation=此參數允許您定義 Dolibarr 在服務器上創建的文件的默認權限設置（例如在上傳期間）。 <br> 它必須是八進制值（例如，0666 表示所有人都可以讀寫）。建議值為 0600 或 0660 <br> 該參數在 Windows 服務器上無用。
@@ -390,7 +390,7 @@ LanguageFilesCachedIntoShmopSharedMemory=文件 .lang 加載到共享內存中
 LanguageFile=Language file
 ExamplesWithCurrentSetup=當前配置的示例
 ListOfDirectories=OpenDocument 模板目錄列表
-ListOfDirectoriesForModelGenODT=包含 OpenDocument 格式的模板文件的目錄列表。 <br>  <br> 將目錄的完整路徑放在這裡。 <br> 在每個目錄之間添加回車符。 <br> 要添加 GED 模塊的目錄，請在此處添加 <b> DOL_DATA_ROOT/ecm/yourdirectoryname </b> 。 <br>  <br> 這些目錄中的文件必須以 <span class='notranslate'><b></span> 結尾\n .odt </b>  或<b> .ods </b> 。
+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=在這些目錄中找到的 ODT/ODS 模板文件的數量
 ExampleOfDirectoriesForModelGen=語法示例：<br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed= <br> 要了解如何創建 odt 文檔模板，在將它們存儲到這些目錄之前，請閱讀 wiki 文檔：
@@ -406,7 +406,7 @@ ResponseTimeout=響應超時
 SmsTestMessage=測試從 __PHONEFROM__ 到 __PHONETO__ 的消息
 ModuleMustBeEnabledFirst=模塊<b> %s </b>  如果您需要此功能，必須先啟用。
 SecurityToken=保護 URL 的關鍵
-NoSmsEngine=沒有可用的短信發送器管理器。默認發行版中未安裝短信發送器管理器，因為它們依賴於外部供應商，但您可以在 <span class='notranslate'>%s</span> 上找到一些\n
+NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
 PDFDesc=PDF 生成的全局選項
 PDFOtherDesc=PDF Option specific to some modules
@@ -471,9 +471,9 @@ ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1
 LibraryToBuildPDF=用於 PDF 生成的庫
 LocalTaxDesc=某些國家/地區可能會對每個發票行徵收兩種或三種稅。如果是這種情況，請選擇第二個和第三個稅的類型及其稅率。可能的類型有：<br> 1：產品和服務適用地方稅，不含增值稅（地方稅按不含稅金額計算）<br> 2：產品和服務需繳納地方稅，包括增值稅（地方稅按金額+主要稅費計算）<br> 3：不含增值稅的產品適用地方稅（地方稅按不含稅金額計算）<br> 4：含增值稅產品適用地方稅（地方稅按金額+主要增值稅計算）<br> 5：服務需繳納地方稅，不含增值稅（地方稅按不含稅金額計算）<br> 6：服務需繳納地方稅，含增值稅（地方稅按金額+稅費計算）
 SMS=短信
-LinkToTestClickToDial=輸入要撥打的電話號碼，以顯示測試用戶 <span class='notranslate'><strong></span> 的 ClickToDial 網址的鏈接\n %s </strong> 
+LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=刷新鏈接
-LinkToTest=為用戶<span class='notranslate'><strong></span>生成可點擊鏈接\n %s </strong>  （點擊電話號碼進行測試）
+LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=保留為空以使用默認值
 KeepThisEmptyInMostCases=In most cases, you can keep this field empty.
 DefaultLink=默認鏈接
@@ -484,7 +484,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=產品或服務的批量條形碼初始化或重置
 CurrentlyNWithoutBarCode=目前，您有 <strong> %s </strong>  記錄在 <strong> %s </strong>  %s 沒有定義條形碼。
-InitEmptyBarCode=<span class='notranslate'>%s</span> 的初始值\n 空條形碼
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=擦除所有當前條形碼值
 ConfirmEraseAllCurrentBarCode=您確定要刪除所有當前條形碼值嗎？
 AllBarcodeReset=所有條形碼值已被刪除
@@ -1135,12 +1135,12 @@ LocalTax2IsUsedDesc=使用第三種稅種（第一種稅種除外）
 LocalTax2IsNotUsedDesc=請勿使用其他類型的稅（第一種稅除外）
 LocalTax2Management=第三類稅種
 LocalTax1ManagementES=可再生能源管理
-LocalTax1IsUsedDescES=創建潛在客戶、發票、訂單等時默認的 RE 費率遵循有效的標準規則：<br> 如果買家不受RE約束，則RE默認=0。規則結束。 <br> 如果買方須繳納 RE，則默認為 RE。規則結束。 <br> 
+LocalTax1IsUsedDescES=創建潛在客戶、發票、訂單等時默認的 RE 費率遵循有效的標準規則：<br> 如果買家不受RE約束，則RE默認=0。規則結束。 <br> 如果買方須繳納 RE，則默認為 RE。規則結束。 <br>
 LocalTax1IsNotUsedDescES=默認情況下，建議的 RE 為 0。規則結束。
 LocalTax1IsUsedExampleES=在西班牙，他們是受西班牙 IAE 某些特定部分管轄的專業人員。
 LocalTax1IsNotUsedExampleES=在西班牙，他們是專業人士和社團，並受西班牙 IAE 某些部分的管轄。
 LocalTax2ManagementES=IRPF管理
-LocalTax2IsUsedDescES=創建潛在客戶、發票、訂單等時默認的 IRPF 費率遵循現行標準規則：<br> 如果賣家不受 IRPF 約束，則 IRPF 默認=0。規則結束。 <br> 如果賣方受 IRPF 約束，則默認 IRPF。規則結束。 <br> 
+LocalTax2IsUsedDescES=創建潛在客戶、發票、訂單等時默認的 IRPF 費率遵循現行標準規則：<br> 如果賣家不受 IRPF 約束，則 IRPF 默認=0。規則結束。 <br> 如果賣方受 IRPF 約束，則默認 IRPF。規則結束。 <br>
 LocalTax2IsNotUsedDescES=默認情況下，建議的 IRPF 為 0。規則結束。
 LocalTax2IsUsedExampleES=在西班牙，提供服務的自由職業者和獨立專業人士以及選擇模塊稅務系統的公司。
 LocalTax2IsNotUsedExampleES=在西班牙，它們是不受模塊稅收制度約束的企業。
@@ -1197,6 +1197,7 @@ Skin=皮膚主題
 DefaultSkin=默認皮膚主題
 MaxSizeList=列表的最大長度
 DefaultMaxSizeList=列表的默認最大長度
+DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
 MessageOfDay=當天的消息
 MessageLogin=登錄頁面消息
@@ -1268,8 +1269,8 @@ BrowserOS=瀏覽器操作系統
 ListOfSecurityEvents=Dolibarr 安全事件列表
 SecurityEventsPurged=安全事件已清除
 TrackableSecurityEvents=Trackable security events
-LogEventDesc=啟用特定安全事件的日誌記錄。通過菜單<span class='notranslate'><b></span>管理日誌\n %s - %s </b> 。警告，此功能可能會在數據庫中生成大量數據。
-AreaForAdminOnly=設置參數可以通過<span class='notranslate'><b></span>設置\n 管理員用戶</b>  僅有的。
+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=系統信息是您在只讀模式下獲得的雜項技術信息，僅管理員可見。
 SystemAreaForAdminOnly=該區域僅供管理員用戶使用。 Dolibarr 用戶權限無法更改此限制。
 CompanyFundationDesc=編輯您的公司/組織的信息。點擊“%s完成後，頁面底部的“按鈕。
@@ -1283,11 +1284,11 @@ SessionTimeOut=會話超時
 SessionExplanation=如果會話清理器是由內部 PHP 會話清理器（而不是其他任何東西）完成的，則此數字保證會話在此延遲之前永遠不會過期。內部 PHP 會話清理器不保證會話在此延遲後過期。在此延遲之後，當會話清理器運行時，它將過期，因此每個 <b> %s/%s </b>  訪問，但僅在其他會話進行訪問期間（如果值為 0，則意味著會話的清除僅由外部進程完成）。 <br> 注意：在某些具有外部會話清理機制的服務器上（debian、ubuntu 下的 cron ...），會話可能會在外部設置定義的時間段後被銷毀，無論此處輸入的值是什麼。
 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=可用的觸發器
-TriggersDesc=觸發器是複製到目錄 <span class='notranslate'><b></span> 後修改 Dolibarr 工作流程行為的文件\n htdocs/core/triggers </b> 。他們實現了在 Dolibarr 事件上激活的新行動（新公司創建、發票驗證等）。
-TriggerDisabledByName=此文件中的觸發器已被 <span class='notranslate'><b></span> 禁用\n -NORUN </b>  他們名字的後綴。
-TriggerDisabledAsModuleDisabled=此文件中的觸發器作為模塊 <span class='notranslate'><b></span> 被禁用\n %s </b>  被禁用。
+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=無論激活的 Dolibarr 模塊是什麼，此文件中的觸發器始終處於活動狀態。
-TriggerActiveAsModuleActive=此文件中的觸發器作為模塊 <span class='notranslate'><b></span> 處於活動狀態\n %s </b>  已啟用。
+TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=選擇自動生成密碼所使用的方法。
 DictionaryDesc=插入所有參考數據。您可以將您的值添加到默認值。
 ConstDesc=此頁面允許您編輯（覆蓋）其他頁面中不可用的參數。這些大多是為開發人員/高級故障排除保留的參數。
@@ -1297,7 +1298,7 @@ LimitsSetup=限制/精度設置
 LimitsDesc=您可以在此處定義 Dolibarr 使用的限制、精度和優化
 MAIN_MAX_DECIMALS_UNIT=最大限度。單價的小數點
 MAIN_MAX_DECIMALS_TOT=最大限度。總價的小數點
-MAIN_MAX_DECIMALS_SHOWN=最大限度。價格小數點 <b> 顯示在屏幕上</b> 。添加省略號 <b> ... </b>  如果您想看到“ <span class='notranslate'><b></span> 在此參數之後（例如“2...”）\n ... </b> " 後綴為截斷價格。
+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=舍入範圍步長（適用於以 10 為基數以外的其他方式進行舍入的國家/地區。例如，如果按 0.05 步長進行舍入，則輸入 0.05）
 UnitPriceOfProduct=產品淨單價
 TotalPriceAfterRounding=四捨五入後的總價（不含/增值稅/含稅）
@@ -1320,11 +1321,11 @@ ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=現有備份文件
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=一周的第一天
-RunningUpdateProcessMayBeRequired=似乎需要運行升級過程（程序版本%s 與數據庫版本<span class='notranslate'>%s</span>不同\n）
-YouMustRunCommandFromCommandLineAfterLoginToUser=使用用戶 <span class='notranslate'><b></span> 登錄 shell 後，您必須從命令行運行此命令\n %s </b>  或者您必須在命令行末尾添加 -W 選項以提供 <b> %s </b>  密碼。
+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 函數在您的 PHP 中不可用
 DownloadMoreSkins=更多皮膚可供下載
-SimpleNumRefModelDesc=返回格式為 <span class='notranslate'>%s</span> 的參考號\nyymm-nnnn 其中 yy 是年份，mm 是月份，nnnn 是連續自動遞增數字，無需重置
+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
 SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
 AdvancedNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
 SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
@@ -1381,12 +1382,12 @@ 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=激活的模塊：<b> %s </b>  / <b> %s </b> 
+TotalNumberOfActivatedModules=激活的模塊：<b> %s </b>  / <b> %s </b>
 YouMustEnableOneModule=您必須至少啟用 1 個模塊
 YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=類 %s 在 PHP 路徑中找不到
 YesInSummer=是的，夏天
-OnlyFollowingModulesAreOpenedToExternalUsers=請注意，只有以下模塊可供外部用戶使用（無論此類用戶的權限如何），並且只有在授予權限的情況下：<br> 
+OnlyFollowingModulesAreOpenedToExternalUsers=請注意，只有以下模塊可供外部用戶使用（無論此類用戶的權限如何），並且只有在授予權限的情況下：<br>
 SuhosinSessionEncrypt=Suhosin 加密的會話存儲
 ConditionIsCurrently=目前狀況為 %s
 YouUseBestDriver=您使用驅動程序%s 這是目前可用的最好的驅動程序。
@@ -1451,7 +1452,7 @@ TechnicalServicesProvided=Technical services provided
 WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
 WebDavServer=Root URL of %s server: %s
 ##### WebCAL setup #####
-WebCalUrlForVCalExport=指向 <span class='notranslate'><b></span> 的導出鏈接\n %s </b>  格式可在以下鏈接中找到：%s
+WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
 BillsSetup=發票模塊設置
 BillsNumberingModule=發票和貸方票據編號模型
@@ -1663,7 +1664,7 @@ LDAPDescUsers=此頁面允許您在 LDAP 樹中為 Dolibarr 用戶上找到的
 LDAPDescGroups=此頁面允許您在 LDAP 樹中為 Dolibarr 組上找到的每個數據定義 LDAP 屬性名稱。
 LDAPDescMembers=此頁面允許您在 LDAP 樹中為 Dolibarr 成員模塊上找到的每個數據定義 LDAP 屬性名稱。
 LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=示例值專為 <span class='notranslate'><b></span> 設計\n OpenLDAP </b>  具有以下加載的架構：<b> core.schema、cosine.schema、inetorgperson.schema </b> ）。如果您使用 thoose 值和 OpenLDAP，請修改 LDAP 配置文件 <b> slapd.conf </b>  加載所有這些模式。
+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=對於經過身份驗證的訪問（例如，對於寫入訪問）
 PerfDolibarr=性能設置/優化報告
 YouMayFindPerfAdviceHere=此頁面提供一些與性能相關的檢查或建議。
@@ -1677,10 +1678,10 @@ MemcachedAvailableAndSetup=啟用了專門用於使用 memcached 服務器的 me
 OPCodeCache=操作碼緩存
 NoOPCodeCacheFound=未找到 OPCode 緩存。也許您正在使用 XCache 或 eAccelerator 以外的 OPCode 緩存（好），或者您可能沒有 OPCode 緩存（非常糟糕）。
 HTTPCacheStaticResources=HTTP cache for static resources (css, img, JavaScript)
-FilesOfTypeCached=<span class='notranslate'>%s</span> 類型的文件\n 由 HTTP 服務器緩存
-FilesOfTypeNotCached=<span class='notranslate'>%s</span> 類型的文件\n 不被 HTTP 服務器緩存
-FilesOfTypeCompressed=<span class='notranslate'>%s</span> 類型的文件\n 由 HTTP 服務器壓縮
-FilesOfTypeNotCompressed=<span class='notranslate'>%s</span> 類型的文件\n 不被 HTTP 服務器壓縮
+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=由服務器緩存
 CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
 CacheByClient=通過瀏覽器緩存
@@ -2433,3 +2434,12 @@ UrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
+AiDescription=AI (Artificial Intelligence) features
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different part of the application. Need external AI API.
+AI_KEY_API_CHATGPT= Key for ChatGPT IA api
+AiSetup=AI module setup
+AiCustomPrompt=AI customs prompt
+AI_CONFIGURATIONS_PROMPT=Custom prompt
+ImageGeneration=Image generation
+AIPromptForFeatures=AI custom prompts for features
+EnterAnIP=Enter an IP address
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 6f04fdbc1df..169497545ad 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -68,7 +68,7 @@ AccountCard=賬戶卡
 DeleteAccount=刪除帳戶
 ConfirmDeleteAccount=您確定要刪除該帳戶嗎？
 BankTransactionByCategories=按類別分類的銀行分錄
-BankTransactionForCategory=類別 <span class='notranslate'><b></span> 的銀行條目\n %s </b> 
+BankTransactionForCategory=Bank entries for category <b>%s</b>
 RemoveFromRubrique=刪除帶有類別的鏈接
 RemoveFromRubriqueConfirm=您確定要刪除條目和類別之間的鏈接嗎？
 ListBankTransactions=銀行分錄清單
@@ -115,7 +115,7 @@ MenuBankInternalTransfer=Internal transfer
 TransferDesc=使用內部轉賬從一個賬戶轉賬到另一個賬戶，應用程序將寫入兩條記錄：源賬戶中的借方和目標賬戶中的貸方。本次交易將使用相同的金額、標籤和日期。
 TransferFrom=從
 TransferTo=到
-TransferFromToDone=來自 <span class='notranslate'><b></span> 的轉賬\n %s </b>  至 <b> %s </b>  <b> %s </b>  %s 已被記錄。
+TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
 CheckTransmitter=發件人
 ValidateCheckReceipt=驗證此支票收據嗎？
 ConfirmValidateCheckReceipt=您確定要提交此支票收據進行驗證嗎？一旦驗證，將無法更改。
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
index cd6c84b2cfb..cd450d9014a 100644
--- a/htdocs/langs/zh_HK/bills.lang
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=客戶發票
 BillsCustomer=客戶發票
 BillsSuppliers=供應商發票
 BillsCustomersUnpaid=未付客戶發票
-BillsCustomersUnpaidForCompany=<span class='notranslate'>%s</span> 的未付客戶發票\n
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=未支付的供應商發票
-BillsSuppliersUnpaidForCompany=<span class='notranslate'>%s</span> 的未付款供應商發票\n
+BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
 BillsLate=逾期付款
 BillsStatistics=客戶發票統計
 BillsStatisticsSuppliers=供應商發票統計
@@ -79,7 +79,7 @@ ReceivedPayments=已收到付款
 ReceivedCustomersPayments=從客戶處收到的付款
 PayedSuppliersPayments=支付給供應商的款項
 ReceivedCustomersPaymentsToValid=收到客戶付款進行驗證
-PaymentsReportsForYear=<span class='notranslate'>%s</span> 的付款報告\n
+PaymentsReportsForYear=Payments reports for %s
 PaymentsReports=付款報告
 PaymentsAlreadyDone=付款已經完成
 PaymentsBackAlreadyDone=退款已經完成
@@ -93,6 +93,9 @@ CodePaymentMode=Payment method (code)
 LabelPaymentMode=Payment method (label)
 PaymentModeShort=Payment method
 PaymentTerm=Payment Term
+IdPaymentTerm=Payment term (id)
+CodePaymentTerm=Payment term (code)
+LabelPaymentTerm=Payment term (label)
 PaymentConditions=付款條件
 PaymentConditionsShort=付款條件
 PaymentAmount=支付金額
@@ -213,8 +216,8 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=如果所有其他選項都不適合
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=此選擇將用於所有其他情況。例如，因為您計劃創建替換發票。
-ConfirmCustomerPayment=您是否確認<span class='notranslate'><b></span>的付款輸入\n %s </b>  %s？
-ConfirmSupplierPayment=您是否確認<span class='notranslate'><b></span>的付款輸入\n %s </b>  %s？
+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=您確定要驗證此付款嗎？付款一經驗證，將無法進行任何更改。
 ValidateBill=驗證發票
 UnvalidateBill=Invalidate invoice
@@ -268,6 +271,8 @@ NoDraftBills=沒有草稿發票
 NoOtherDraftBills=沒有其他草稿發票
 NoDraftInvoices=沒有草稿發票
 RefBill=發票參考號
+RefSupplierBill=Supplier invoice ref
+SupplierOrderCreateBill=Create invoice
 ToBill=開單
 RemainderToBill=剩餘的賬單
 SendBillByMail=通過電子郵件發送發票
@@ -352,6 +357,7 @@ HelpAbandonOther=該金額已被放棄，因為它是一個錯誤（例如錯誤
 IdSocialContribution=社會/財政稅繳稅號
 PaymentId=付款編號
 PaymentRef=Payment ref.
+SourceInvoiceId=Source invoice id
 InvoiceId=發票編號
 InvoiceRef=發票參考號
 InvoiceDateCreation=發票創建日期
@@ -371,7 +377,7 @@ DisabledBecauseReplacedInvoice=由於發票已被替換，操作被禁用
 DescTaxAndDividendsArea=此區域顯示所有特殊費用付款的摘要。此處僅包含固定年份內的付款記錄。
 NbOfPayments=付款次數
 SplitDiscount=折扣一分為二
-ConfirmSplitDiscount=您確定要分割 <span class='notranslate'><b></span> 的折扣嗎\n %s </b>  %s 分成兩個較小的折扣？
+ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
 TypeAmountOfEachNewDiscount=兩部分各輸入金額：
 TotalOfTwoDiscountMustEqualsOriginal=兩次新折扣的總和必須等於原來的折扣金額。
 ConfirmRemoveDiscount=您確定要刪除此折扣嗎？
@@ -444,7 +450,7 @@ PaymentConditionShort14DENDMONTH=14 days of month-end
 PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
 PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
-FixAmount=固定金額 - 1 行，帶有標籤“<span class='notranslate'>%s</span>”\n'
+FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=可變金額 (%% 總。）
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
 VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index b738683c5cc..3214c63c92a 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -26,7 +26,7 @@ BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleMembersByType=Members by type and status
 BoxTitleMembersByTags=Members by tags and status
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-BoxTitleLastRssInfos=最新%s 來自<span class='notranslate'>%s</span>的新聞\n
+BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=產品/服務：最後%s 修改的
 BoxTitleProductsAlertStock=產品：庫存提醒
 BoxTitleLastSuppliers=最新%s 記錄的供應商
@@ -115,7 +115,7 @@ BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxCustomersOutstandingBillReached=Customers with outstanding limit reached
 # Pages
 UsersHome=Home users and groups
 MembersHome=Home Membership
diff --git a/htdocs/langs/zh_HK/commercial.lang b/htdocs/langs/zh_HK/commercial.lang
index bc01912b916..1c81a322d3f 100644
--- a/htdocs/langs/zh_HK/commercial.lang
+++ b/htdocs/langs/zh_HK/commercial.lang
@@ -14,7 +14,7 @@ ConfirmDeleteAction=您確定要刪除此活動嗎？
 CardAction=活動卡
 ActionOnCompany=關聯公司
 ActionOnContact=相關聯繫方式
-TaskRDVWith=與 <span class='notranslate'>%s</span> 會面\n
+TaskRDVWith=Meeting with %s
 ShowTask=顯示任務
 ShowAction=展會活動
 ActionsReport=活動報導
@@ -77,13 +77,17 @@ ToOfferALinkForOnlineSignature=Link for online signature
 WelcomeOnOnlineSignaturePageProposal=Welcome to the page to accept commercial proposals from %s
 WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page
 WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page
+WelcomeOnOnlineSignaturePageSociete_rib=Welcome to %s SEPA mandate PDF Signing Page
 ThisScreenAllowsYouToSignDocFromProposal=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online.
 ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online.
+ThisScreenAllowsYouToSignDocFromSociete_rib=This screen allow you to sign SEPA Mandate on PDF format online.
 ThisIsInformationOnDocumentToSignProposal=This is information on document to accept or refuse
 ThisIsInformationOnDocumentToSignContract=This is information on contract to sign
 ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign
+ThisIsInformationOnDocumentToSignSociete_rib=This is information on SEPA Mandate to sign
 SignatureProposalRef=Signature of quote/commercial proposal %s
 SignatureContractRef=Signature of contract %s
 SignatureFichinterRef=Signature of intervention %s
+SignatureSociete_ribRef=Signature of SEPA Mandate %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index b2863ab1205..ecafe19bc59 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Your contact details have been recorded. We will get back to you soon...
+ContactUsDesc=This form allows you to send us a message for a first contact.
 ErrorCompanyNameAlreadyExists=公司名稱%s 已經存在。選擇另一個。
 ErrorSetACountryFirst=把國家放在第一位
 SelectThirdParty=選擇第三方
@@ -37,7 +39,7 @@ ThirdPartyProspects=前景
 ThirdPartyProspectsStats=前景
 ThirdPartyCustomers=顧客
 ThirdPartyCustomersStats=顧客
-ThirdPartyCustomersWithIdProf12=擁有 <span class='notranslate'>%s</span> 的客戶\n 或%s
+ThirdPartyCustomersWithIdProf12=Customers with %s or %s
 ThirdPartySuppliers=供應商
 ThirdPartyType=第三方類型
 Individual=私人個體
@@ -46,7 +48,7 @@ ParentCompany=母公司
 Subsidiaries=子公司
 ReportByMonth=Report per month
 ReportByCustomers=每個客戶的報告
-ReportByThirdparties=Report per thirdparty
+ReportByThirdparties=Report per third party
 ReportByQuarter=按費率報告
 CivilityCode=文明守則
 RegisteredOffice=註冊辦事處
@@ -117,12 +119,20 @@ ProfId3Short=教授 ID 3
 ProfId4Short=教授 ID 4
 ProfId5Short=教授 ID 5
 ProfId6Short=教授 ID 6
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
 ProfId1=專業 ID 1
 ProfId2=專業 ID 2
 ProfId3=專業 ID 3
 ProfId4=專業 ID 4
 ProfId5=專業 ID 5
 ProfId6=專業 ID 6
+ProfId7=Professional ID 7
+ProfId8=Professional ID 8
+ProfId9=Professional ID 9
+ProfId10=Professional ID 10
 ProfId1AR=教授 ID 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2（收入野蠻人）
 ProfId3AR=-
@@ -201,12 +211,20 @@ ProfId3FR=教授 Id 3（NAF，舊 APE）
 ProfId4FR=教授 ID 4 (RCS/RM)
 ProfId5FR=教授 ID 5（EORI 號）
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=註冊號碼
 ProfId2GB=-
 ProfId3GB=碳化矽
@@ -245,7 +263,7 @@ ProfId5MA=身份證教授。 5（ICE）
 ProfId6MA=-
 ProfId1MX=教授 ID 1 (R.F.C)。
 ProfId2MX=教授 Id 2 (R..P. IMSS)
-ProfId3MX=教授 ID 3（專業章程）
+ProfId3MX=Prof Id 3 (Professional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -313,13 +331,13 @@ CustomerRelativeDiscount=相對客戶折扣
 SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=相對折扣
 CustomerAbsoluteDiscountShort=絕對折扣
-CompanyHasRelativeDiscount=該客戶的默認折扣為 <b> %s%% </b> 
+CompanyHasRelativeDiscount=該客戶的默認折扣為 <b> %s%% </b>
 CompanyHasNoRelativeDiscount=該客戶默認無相對折扣
 HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
 HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
-CompanyHasAbsoluteDiscount=該客戶可享受 <span class='notranslate'><b></span> 折扣（貸項票據或預付款）\n %s </b>  %s
+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=該客戶仍有 <span class='notranslate'><b></span> 的貸方票據\n %s </b>  %s
+CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=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
@@ -382,14 +400,14 @@ NewContact=新聯繫人
 NewContactAddress=新聯繫人/地址
 MyContacts=我的聯繫方式
 Capital=首都
-CapitalOf=<span class='notranslate'>%s</span> 的大寫字母\n
+CapitalOf=Capital of %s
 EditCompany=編輯公司
 ThisUserIsNot=該用戶不是潛在客戶、客戶或供應商
 VATIntraCheck=查看
 VATIntraCheckDesc=增值稅 ID 必須包含國家/地區前綴。鏈接<b> %s </b>  使用歐洲增值稅檢查服務 (VIES)，該服務需要從 Dolibarr 服務器訪問互聯網。
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=在歐盟委員會網站上查看共同體內增值稅 ID
-VATIntraManualCheck=您還可以在歐盟委員會網站上手動查看<a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> 
+VATIntraManualCheck=您還可以在歐盟委員會網站上手動查看<a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=檢查不可能。成員國不提供檢查服務 (%s）。
 NorProspectNorCustomer=不是潛在客戶，也不是客戶
 JuridicalStatus=企業實體類型
@@ -470,12 +488,12 @@ UniqueThirdParties=第三方總數
 InActivity=打開
 ActivityCeased=關閉
 ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=映射到 <span class='notranslate'>%s</span> 的產品/服務列表\n
+ProductsIntoElements=List of products/services mapped to %s
 CurrentOutstandingBill=當前未結帳單
 OutstandingBill=最大限度。對於未結帳單
 OutstandingBillReached=最大限度。未結帳單達到
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=返回格式為 <span class='notranslate'>%s</span> 的數字\nyymm-nnnn 為客戶代碼，%syymm-nnnn 表示供應商代碼，其中 yy 是年份，mm 是月份，nnnn 是連續的自動遞增數字，不會中斷，也不會返回到 0。
+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 sequential auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=該代碼是免費的。該代碼可以隨時修改。
 ManagingDirectors=經理姓名（首席執行官、董事、總裁...）
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -500,7 +518,7 @@ 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.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be careful, depending on your product price settings, you should change the third party before adding product to POS.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=email already exists please rewrite your company name
 TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
 CompanySection=Company section
@@ -508,3 +526,5 @@ ShowSocialNetworks=Show social networks
 HideSocialNetworks=Hide social networks
 ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
+AADEWebserviceCredentials=AADE Webservice Credentials
+ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 41996a7b6c8..dbd9fb34f57 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -162,28 +162,29 @@ CalcModeVATDebt=模式<b> %s承諾會計增值稅%s </b> 。
 CalcModeVATEngagement=模式<b> %s收入支出增值稅%s </b> 。
 CalcModeDebt=對已知記錄文件的分析
 CalcModeEngagement=已知付款記錄分析
+CalcModePayment=Analysis of known recorded payments
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
-CalcModeLT1= 模式<b> %s客戶發票上的 RE - 供應商發票%s </b> 
-CalcModeLT1Debt=模式<b> %s客戶發票上的 RE%s </b> 
-CalcModeLT1Rec= 模式<b> %s供應商發票上的 RE%s </b> 
-CalcModeLT2= 模式<b> %s客戶發票上的 IRPF - 供應商發票%s </b> 
-CalcModeLT2Debt=模式<b> %s客戶發票上的 IRPF%s </b> 
-CalcModeLT2Rec= 模式<b> %s供應商發票上的 IRPF%s </b> 
+CalcModeLT1= 模式<b> %s客戶發票上的 RE - 供應商發票%s </b>
+CalcModeLT1Debt=模式<b> %s客戶發票上的 RE%s </b>
+CalcModeLT1Rec= 模式<b> %s供應商發票上的 RE%s </b>
+CalcModeLT2= 模式<b> %s客戶發票上的 IRPF - 供應商發票%s </b>
+CalcModeLT2Debt=模式<b> %s客戶發票上的 IRPF%s </b>
+CalcModeLT2Rec= 模式<b> %s供應商發票上的 IRPF%s </b>
 AnnualSummaryDueDebtMode=收入和支出餘額，年度匯總
 AnnualSummaryInputOutputMode=收入和支出餘額，年度匯總
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=收入和支出餘額，按預定義組劃分的詳細信息，模式 <b> %s索賠-債務%s </b>  說<b> 承諾會計</b> 。
 AnnualByCompaniesInputOutputMode=收入和支出餘額，按預定義組劃分的詳細信息，模式 <b> %s收入-支出%s </b>  說<b> 現金會計</b> 。
-SeeReportInInputOutputMode=請參閱<b> %s付款分析%s </b>  基於<span class='notranslate'><b></span>的計算\n 記錄的付款</b>  即使尚未計入 Ledger，也已完成
-SeeReportInDueDebtMode=請參閱<b> %s記錄文檔分析%s </b>  基於已知的<span class='notranslate'><b></span>進行計算\n 錄製的文檔</b>  即使它們尚未計入 Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</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 bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- 顯示的金額包含所有稅費
 RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
 RulesResultDue=- 包括所有發票、費用、增值稅、捐贈、工資，無論是否支付。 <br> - 它基於發票的開票日期以及費用或稅款支付的到期日。對於工資，使用期末日期。
 RulesResultInOut=- 它包括發票、費用、增值稅和工資的實際付款。 <br> - 它基於發票、費用、增值稅、捐贈和工資的支付日期。
-RulesCADue=- 它包括客戶的到期發票，無論是否已付款。 <br> - 它基於這些發票的賬單日期。 <br> 
-RulesCAIn=- 它包括從客戶收到的發票的所有有效付款。 <br> - 基於這些發票的付款日期<br> 
+RulesCADue=- 它包括客戶的到期發票，無論是否已付款。 <br> - 它基於這些發票的賬單日期。 <br>
+RulesCAIn=- 它包括從客戶收到的發票的所有有效付款。 <br> - 基於這些發票的付款日期<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"
@@ -245,7 +246,7 @@ ToCreateAPredefinedInvoice=要創建模板發票，請創建標準發票，然
 LinkedOrder=訂單鏈接
 Mode1=方法一
 Mode2=方法二
-CalculationRuleDesc=要計算增值稅總額，有兩種方法：<br> 方法 1 是對每行的數據進行四捨五入，然後求和。 <br> 方法 2 是將每行上的所有增值稅相加，然後對結果進行四捨五入。 <br> 最終結果可能相差幾美分。默認模式為 <span class='notranslate'><b></span> 模式\n %s </b> 。
+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=根據供應商的情況，選擇適當的方法來應用相同的計算規則並得到與供應商期望的相同的結果。
 TurnoverPerProductInCommitmentAccountingNotRelevant=無法獲取按產品收集的營業額報告。此報告僅適用於已開具發票的營業額。
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
@@ -253,6 +254,8 @@ CalculationMode=計算方式
 AccountancyJournal=會計代碼日記帳
 ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
 ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on purchases
 ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
diff --git a/htdocs/langs/zh_HK/contracts.lang b/htdocs/langs/zh_HK/contracts.lang
index df1ca5be030..4d3b965bcb4 100644
--- a/htdocs/langs/zh_HK/contracts.lang
+++ b/htdocs/langs/zh_HK/contracts.lang
@@ -35,7 +35,7 @@ DeleteAContract=刪除合同
 ActivateAllOnContract=Activate all services
 CloseAContract=關閉合同
 ConfirmDeleteAContract=您確定要刪除此合同及其所有服務嗎？
-ConfirmValidateContract=您確定要以 <span class='notranslate'><b></span> 名義驗證此合同嗎\n %s </b> ？
+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=這將關閉所有服務（過期或未過期）。您確定要關閉此合同嗎？
 ConfirmCloseService=您確定要關閉此服務嗎？日期為 <b> %s </b> ？
@@ -78,12 +78,12 @@ CloseAllContracts=關閉所有合同行
 DeleteContractLine=刪除合同行
 ConfirmDeleteContractLine=您確定要刪除此合同行嗎？
 MoveToAnotherContract=將服務轉移到另一個合同中。
-ConfirmMoveToAnotherContract=我選擇了新的目標合同並確認我想將此服務移至此合同中。
+ConfirmMoveToAnotherContract=I chose a new target contract and confirm I want to move this service into this contract.
 ConfirmMoveToAnotherContractQuestion=選擇您想要將此服務移至哪個現有合同（同一第三方）？
 PaymentRenewContractId=續訂合同%s （服務%s）
 ExpiredSince=截止日期
 NoExpiredServices=沒有過期的活動服務
-ListOfServicesToExpireWithDuration=將於 <span class='notranslate'>%s</span> 到期的服務列表\n 天
+ListOfServicesToExpireWithDuration=List of Services to expire in %s days
 ListOfServicesToExpireWithDurationNeg=服務列表已過期超過 %s 天
 ListOfServicesToExpire=即將到期的服務列表
 NoteListOfYourExpiredServices=此列表僅包含您作為銷售代錶鍊接到的第三方的合同服務。
diff --git a/htdocs/langs/zh_HK/cron.lang b/htdocs/langs/zh_HK/cron.lang
index 177ca2636e4..6586d7bf25b 100644
--- a/htdocs/langs/zh_HK/cron.lang
+++ b/htdocs/langs/zh_HK/cron.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - cron
-# About page
-# Right
+# Permissions
 Permission23101 = 讀取預定作業
 Permission23102 = 創建/更新預定作業
 Permission23103 = 刪除預定作業
@@ -14,7 +13,7 @@ FileToLaunchCronJobs=命令行檢查並啟動合格的 cron 作業
 CronExplainHowToRunUnix=在 Unix 環境中，您應該使用以下 crontab 條目每 5 分鐘運行一次命令行
 CronExplainHowToRunWin=在 Microsoft(tm) Windows 環境中，您可以使用計劃任務工具每 5 分鐘運行一次命令行
 CronMethodDoesNotExists=Class %s does not contain any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronMethodNotAllowed=Method %s of class %s is in blocklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -63,11 +62,11 @@ CronStatusInactiveBtn=禁用
 CronTaskInactive=該作業已禁用（未安排）
 CronId=ID
 CronClassFile=帶類的文件名
-CronModuleHelp=Dolibarr 模塊目錄的名稱（也適用於外部 Dolibarr 模塊）。 <BR>  例如調用 Dolibarr Product 對象 /htdocs/ <span class='notranslate'><u></span> 的 fetch 方法\n 產品</u> /class/product.class.php，模塊的值為<br>  <i> 產品</i> 
-CronClassFileHelp=要加載的相對路徑和文件名（路徑相對於 Web 服務器根目錄）。 <BR>  例如調用 Dolibarr Product 對象 htdocs/product/class/ <span class='notranslate'><u></span> 的 fetch 方法\n 產品.class.php </u> ，類文件名的值為 <br>  <i> 產品/類/product.class.php </i> 
-CronObjectHelp=要加載的對象名稱。 <BR>  例如調用 Dolibarr Product 對象 /htdocs/product/class/product.class.php 的 fetch 方法，類文件名的值為 <br>  <i> 產品</i> 
-CronMethodHelp=要啟動的對象方法。 <BR>  例如調用 Dolibarr Product 對象 /htdocs/product/class/product.class.php 的 fetch 方法，method 的值為 <br>  <i> 獲取</i> 
-CronArgsHelp=方法參數。 <BR>  例如調用 Dolibarr Product 對象 /htdocs/product/class/product.class.php 的 fetch 方法，參數值可以是 <br>  <i> 0、ProductRef </i> 
+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=要加載的對象名稱。 <BR>  例如調用 Dolibarr Product 對象 /htdocs/product/class/product.class.php 的 fetch 方法，類文件名的值為 <br>  <i> 產品</i>
+CronMethodHelp=要啟動的對象方法。 <BR>  例如調用 Dolibarr Product 對象 /htdocs/product/class/product.class.php 的 fetch 方法，method 的值為 <br>  <i> 獲取</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 parameters can be<br><i>0, ProductRef</i>
 CronCommandHelp=要執行的系統命令行。
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -91,6 +90,7 @@ WarningCronDelayed=Attention, for performance purpose, whatever is next date of
 DATAPOLICYJob=Data cleaner and anonymizer
 JobXMustBeEnabled=Job %s must be enabled
 EmailIfError=Email for warning on error
+JobNotFound=Job %s not found in list of jobs (try to disable/enabled module)
 ErrorInBatch=Error when running the job %s
 
 # Cron Boxes
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index b1b00dd3a62..5fea1e573fd 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -15,14 +15,14 @@ ErrorGroupAlreadyExists=組%s 已經存在。
 ErrorEmailAlreadyExists=Email %s already exists.
 ErrorRecordNotFound=找不到記錄。
 ErrorRecordNotFoundShort=Not found
-ErrorFailToCopyFile=無法複製文件“<span class='notranslate'><b></span>”\n %s </b> ' 進入 ' <b> %s </b> '。
+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=無法重命名文件“<span class='notranslate'><b></span>”\n %s </b> ' 進入 ' <b> %s </b> '。
-ErrorFailToDeleteFile=無法刪除文件“<span class='notranslate'><b></span>”\n %s </b> '。
-ErrorFailToCreateFile=無法創建文件“<span class='notranslate'><b></span>”\n %s </b> '。
-ErrorFailToRenameDir=無法重命名目錄“<span class='notranslate'><b></span>”\n %s </b> ' 進入 ' <b> %s </b> '。
-ErrorFailToCreateDir=無法創建目錄“<span class='notranslate'><b></span>”\n %s </b> '。
-ErrorFailToDeleteDir=無法刪除目錄“<span class='notranslate'><b></span>”\n %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=該聯繫人已被定義為該類型的聯繫人。
@@ -51,7 +51,7 @@ ErrorBadDateFormat=值 '%s' 日期格式錯誤
 ErrorWrongDate=日期不正確！
 ErrorFailedToWriteInDir=無法寫入目錄 %s
 ErrorFailedToBuildArchive=Failed to build archive file %s
-ErrorFoundBadEmailInFile=發現 <span class='notranslate'>%s</span> 的電子郵件語法不正確\n 文件中的行（示例行 %s 電子郵件=%s）
+ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=用戶無法刪除。也許它與 Dolibarr 實體有關。
 ErrorFieldsRequired=一些必填字段已留空。
 ErrorSubjectIsRequired=The email subject is required
@@ -85,7 +85,7 @@ ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
 ErrorNoAccountancyModuleLoaded=沒有激活會計模塊
 ErrorExportDuplicateProfil=該導出集的配置文件名稱已存在。
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP 匹配不完整。
-ErrorLDAPMakeManualTest=目錄 <span class='notranslate'>%s</span> 中已生成 .ldif 文件\n。嘗試從命令行手動加載它以獲得有關錯誤的更多信息。
+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=如果字段“完成者”也已填寫，則無法保存“狀態未開始”的操作。
 ErrorPleaseTypeBankTransactionReportName=請輸入必須報告該條目的銀行對賬單名稱（格式 YYYYMM 或 YYYYMMDD）
 ErrorRecordHasChildren=無法刪除記錄，因為它有一些子記錄。
@@ -94,9 +94,9 @@ ErrorRecordIsUsedCantDelete=無法刪除記錄。它已被使用或包含到另
 ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=兩個輸入的密碼必須相互匹配
 ErrorContactEMail=A technical error occurred. 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=字段<b> %s </b> : ' <b> %s </b> ' 與正則表達式規則 <span class='notranslate'><b></span> 不匹配\n %s </b> 
+ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
-ErrorFieldValueNotIn=字段<b> %s </b> : ' <b> %s </b> ' 不是字段 <span class='notranslate'><b></span> 中找到的值\n %s </b>  <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=字段<b> %s </b> : ' <b> %s </b> ' 不是 <b> %s </b>  現有參考
 ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
 ErrorsOnXLines=%s 發現錯誤
@@ -118,14 +118,14 @@ ErrorProdIdAlreadyExist=%s 被分配給另外三分之一
 ErrorFailedToSendPassword=發送密碼失敗
 ErrorFailedToLoadRSSFile=無法獲取 RSS 源。如果錯誤消息未提供足夠的信息，請嘗試添加常量 MAIN_SIMPLEXMLLOAD_DEBUG。
 ErrorForbidden=拒絕訪問。 <br> 您嘗試訪問已禁用模塊的頁面、區域或功能，或者未處於經過身份驗證的會話中，或者您的用戶不允許訪問該頁面、區域或功能。
-ErrorForbidden2=您的 Dolibarr 管理員可以從菜單 <span class='notranslate'>%s</span> 定義此登錄的權限\n->%s。
+ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
 ErrorForbidden3=看來 Dolibarr 不是通過經過身份驗證的會話使用的。查看 Dolibarr 設置文檔以了解如何管理身份驗證（htaccess、mod_auth 或其他...）。
 ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=在此 PHP 中未找到 Imagick 類。無法進行預覽。管理員可以從菜單“設置 - 顯示”禁用此選項卡。
 ErrorRecordAlreadyExists=記錄已存在
 ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=無法讀取文件“<span class='notranslate'>%s</span>”\n'
-ErrorCantReadDir=無法讀取目錄“<span class='notranslate'>%s</span>”\n'
+ErrorCantReadFile=Failed to read file '%s'
+ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=登錄名或密碼值錯誤
 ErrorLoginDisabled=您的帳戶已禁用
 ErrorFailedToRunExternalCommand=無法運行外部命令。檢查它是否可用並且可由您的 PHP 服務器用戶運行。還要檢查該命令是否在 shell 級別上不受 apparmor 等安全層的保護。
@@ -140,7 +140,7 @@ ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You wil
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=用戶帳戶<b> %s </b>  用於執行 Web 服務器沒有權限
 ErrorNoActivatedBarcode=未激活條形碼類型
-ErrUnzipFails=解壓<span class='notranslate'>%s</span>失敗\n 與 ZipArchive
+ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=沒有引擎可壓縮/解壓縮 %s 這個 PHP 中的文件
 ErrorFileMustBeADolibarrPackage=文件%s 必須是 Dolibarr zip 包
 ErrorModuleFileRequired=You must select a Dolibarr module package file
@@ -341,9 +341,9 @@ WarningSafeModeOnCheckExecDir=警告，PHP 選項 <b> 安全模式 </b>  因此
 WarningBookmarkAlreadyExists=具有此標題或此目標 (URL) 的書籤已存在。
 WarningPassIsEmpty=警告，數據庫密碼為空。這是一個安全漏洞。您應該向數據庫添加密碼並更改conf.php 文件以反映這一點。
 WarningConfFileMustBeReadOnly=警告，您的配置文件 ( <b> htdocs/conf/conf.php </b> ) 可以被網絡服務器覆蓋。這是一個嚴重的安全漏洞。將文件的權限修改為Web 服務器使用的操作系統用戶的只讀模式。如果你的磁盤使用Windows和FAT格式，你必須知道這個文件系統不允許給文件添加權限，所以不能完全安全。
-WarningsOnXLines=關於 <span class='notranslate'><b></span> 的警告\n %s </b>  源記錄
+WarningsOnXLines=Warnings on <b>%s</b> source record(s)
 WarningNoDocumentModelActivated=尚未激活用於文檔生成的模型。在您檢查模塊設置之前，將默認選擇一個模型。
-WarningLockFileDoesNotExists=警告，安裝完成後，您必須通過添加文件 <span class='notranslate'><b></span> 來禁用安裝/遷移工具\n install.lock </b>  進入目錄<b> %s </b> 。忽略創建此文件會帶來嚴重的安全風險。
+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=只要漏洞存在，此安全警告就會保持有效。
 WarningCloseAlways=警告，即使源元素和目標元素之間的金額不同，也會完成關閉。請謹慎啟用此功能。
 WarningUsingThisBoxSlowDown=警告，使用此框會嚴重減慢所有顯示該框的頁面。
diff --git a/htdocs/langs/zh_HK/exports.lang b/htdocs/langs/zh_HK/exports.lang
index dafd7bf2b66..66b45b2f37d 100644
--- a/htdocs/langs/zh_HK/exports.lang
+++ b/htdocs/langs/zh_HK/exports.lang
@@ -57,7 +57,7 @@ FileMustHaveOneOfFollowingFormat=要導入的文件必須具有以下格式之
 DownloadEmptyExampleShort=Download a sample file
 DownloadEmptyExample=下載包含可導入字段的示例和信息的模板文件
 StarAreMandatory=Into the template file, all fields with a * are mandatory fields
-ChooseFormatOfFileToImport=單擊 <span class='notranslate'>%s</span> 選擇要用作導入文件格式的文件格式\n 圖標來選擇它...
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=上傳文件，然後點擊%s 圖標選擇文件作為源導入文件...
 SourceFileFormat=源文件格式
 FieldsInSourceFile=源文件中的字段
@@ -83,13 +83,13 @@ SelectFormat=選擇此導入文件格式
 RunImportFile=導入數據
 NowClickToRunTheImport=檢查導入模擬的結果。更正所有錯誤並重新測試。 <br> 當模擬報告沒有錯誤時，您可以繼續將數據導入數據庫。
 DataLoadedWithId=導入的數據將在每個數據庫表中具有一個具有以下導入 ID 的附加字段：<b> %s </b> ，以便在調查與此導入相關的問題時可以對其進行搜索。
-ErrorMissingMandatoryValue=源文件中 <span class='notranslate'><b></span> 列中的強制數據為空\n %s </b> 。
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=還有<b> %s </b>  其他源代碼行有錯誤，但輸出受到限制。
 TooMuchWarnings=還有<b> %s </b>  其他源代碼行帶有警告，但輸出受到限制。
 EmptyLine=空行（將被丟棄）
-CorrectErrorBeforeRunningImport=您<b> 必須</b>  更正所有錯誤<b> 在<span class='notranslate'></b></span>之前\n  運行最終導入。
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=文件已導入，編號為 <b> %s </b> 。
-YouCanUseImportIdToFindRecord=您可以通過過濾字段<span class='notranslate'><b></span>來查找數據庫中所有導入的記錄\n import_key='%s' </b> 。
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
 NbOfLinesOK=沒有錯誤和警告的行數：<b> %s </b> 。
 NbOfLinesImported=成功導入的行數：<b> %s </b> 。
 DataComeFromNoWhere=要插入的值來自源文件中的任何地方。
@@ -101,8 +101,8 @@ DataIDSourceIsInsertedInto=使用源文件中的數據找到的父對象的 ID 
 DataCodeIDSourceIsInsertedInto=從代碼中找到的父行的 id 將被插入到以下字段中：
 SourceRequired=數據值是必填項
 SourceExample=可能的數據值示例
-ExampleAnyRefFoundIntoElement=找到元素 <span class='notranslate'><b></span> 的任何引用\n %s </b> 
-ExampleAnyCodeOrIdFoundIntoDictionary=在字典中找到的任何代碼（或 ID）<b> %s </b> 
+ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=在字典中找到的任何代碼（或 ID）<b> %s </b>
 CSVFormatDesc= <b> 逗號分隔值 </b>  文件格式 (.csv)。 <br> 這是一種文本文件格式，其中字段由分隔符分隔 [ %s ]。如果在字段內容中找到分隔符，則字段將按四捨五入字符 [ %s ]。轉義圓字符的轉義字符是 [ %s ]。
 Excel95FormatDesc= <b> Excel </b>  文件格式 (.xls) <br> 這是本機 Excel 95 格式 (BIFF5)。
 Excel2007FormatDesc= <b> Excel </b>  文件格式 (.xlsx) <br> 這是本機 Excel 2007 格式 (SpreadsheetML)。
diff --git a/htdocs/langs/zh_HK/holiday.lang b/htdocs/langs/zh_HK/holiday.lang
index 9b740a37459..88bb3232983 100644
--- a/htdocs/langs/zh_HK/holiday.lang
+++ b/htdocs/langs/zh_HK/holiday.lang
@@ -5,7 +5,7 @@ Holiday=Leave
 CPTitreMenu=離開
 MenuReportMonth=月結單
 MenuAddCP=新請假申請
-MenuCollectiveAddCP=New collective leave request
+MenuCollectiveAddCP=New collective leave
 NotActiveModCP=您必須啟用“離開”模塊才能查看此頁面。
 AddCP=提出請假請求
 DateDebCP=開始日期
@@ -29,7 +29,7 @@ DescCP=描述
 SendRequestCP=創建休假請求
 DelayToRequestCP=休假請求必須至少<b> %s 天</b>  在他們面前。
 MenuConfCP=休假餘額
-SoldeCPUser=請假餘額（以天為單位）：<b> %s </b> 
+SoldeCPUser=請假餘額（以天為單位）：<b> %s </b>
 ErrorEndDateCP=您選擇的結束日期必須大於開始日期。
 ErrorSQLCreateCP=創建過程中出現SQL錯誤：
 ErrorIDFicheCP=發生錯誤，休假請求不存在。
@@ -95,21 +95,20 @@ UseralreadyCPexist=A leave request has already been done on this period for %s.
 groups=Groups
 users=Users
 AutoSendMail=Automatic mailing
-NewHolidayForGroup=New collective leave request
-SendRequestCollectiveCP=Send collective leave request
+NewHolidayForGroup=New collective leave
+SendRequestCollectiveCP=Create collective leave
 AutoValidationOnCreate=Automatic validation
 FirstDayOfHoliday=請假的開始日期
 LastDayOfHoliday=請假的結束日期
 HolidaysMonthlyUpdate=每月更新
 ManualUpdate=手動更新
-HolidaysCancelation=請假請求取消
+HolidaysCancelation=Leave request cancellation
 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
@@ -125,14 +124,14 @@ NoticePeriod=Notice period
 #Messages
 HolidaysToValidate=驗證休假請求
 HolidaysToValidateBody=以下是要驗證的請假請求
-HolidaysToValidateDelay=此休假請求將在 <span class='notranslate'>%s</span> 的時間內提出\n 天。
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
 HolidaysToValidateAlertSolde=提出此休假請求的用戶沒有足夠的可用天數。
 HolidaysValidated=已驗證的休假請求
-HolidaysValidatedBody=您的<span class='notranslate'>%s</span>請假申請\n 至 %s 已被驗證。
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
 HolidaysRefused=請求被拒絕
-HolidaysRefusedBody=您的<span class='notranslate'>%s</span>請假申請\n 至 %s 因以下原因被拒絕：
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
 HolidaysCanceled=已取消留下的請求
-HolidaysCanceledBody=您的<span class='notranslate'>%s</span>請假申請\n 至 %s 已被取消。
+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.
@@ -144,7 +143,7 @@ WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
 HolidayBalanceMonthlyUpdate=Monthly update of leave balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
+XIsAUsualNonWorkingDay=%s is usually a NON working day
 BlockHolidayIfNegative=Block if balance negative
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
diff --git a/htdocs/langs/zh_HK/install.lang b/htdocs/langs/zh_HK/install.lang
index 95252cfdca6..f2e7ea972c9 100644
--- a/htdocs/langs/zh_HK/install.lang
+++ b/htdocs/langs/zh_HK/install.lang
@@ -20,13 +20,13 @@ ErrorPHPDoesNotSupportSessions=您的 PHP 安裝不支持會話。 Dolibarr 工
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
 ErrorDirDoesNotExists=目錄%s 不存在。
 ErrorGoBackAndCorrectParameters=返回並檢查/更正參數。
-ErrorWrongValueForParameter=您可能為參數“<span class='notranslate'>%s</span>”輸入了錯誤的值\n'。
-ErrorFailedToCreateDatabase=無法創建數據庫“<span class='notranslate'>%s</span>”\n'。
-ErrorFailedToConnectToDatabase=無法連接到數據庫“<span class='notranslate'>%s</span>”\n'。
+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=數據庫版本（%s） 太老。版本%s 或更高的要求。
 ErrorPHPVersionTooLow=PHP 版本太舊。版本%s 或更高的要求。
 ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
-ErrorConnectedButDatabaseNotFound=連接到服務器成功，但數據庫“<span class='notranslate'>%s</span>”\n' 未找到。
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=數據庫 '%s' 已經存在。
 ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=如果數據庫不存在，請返回並選中“創建數據庫”選項。
@@ -66,7 +66,7 @@ CreateDatabaseObjects=數據庫對象創建
 ReferenceDataLoading=參考數據加載
 TablesAndPrimaryKeysCreation=表和主鍵創建
 CreateTableAndPrimaryKey=創建表%s
-CreateOtherKeysForTable=為表<span class='notranslate'>%s</span>創建外鍵和索引\n
+CreateOtherKeysForTable=Create foreign keys and indexes for table %s
 OtherKeysCreation=外鍵和索引創建
 FunctionsCreation=函數創建
 AdminAccountCreation=管理員登錄創建
@@ -88,7 +88,7 @@ LoginAlreadyExists=已經存在
 DolibarrAdminLogin=多利巴爾管理員登錄
 AdminLoginAlreadyExists=Dolibarr 管理員帳戶 ' <b> %s </b> ' 已經存在。如果您想創建另一個，請返回。
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=警告，出於安全原因，安裝過程完成後，您必須添加一個名為 <span class='notranslate'><b></span> 的文件\n install.lock </b>  進入 Dolibarr 文檔目錄，以防止再次意外/惡意使用安裝工具。
+WarningRemoveInstallDir=Warning, for security reasons, once the installation process is complete, you must 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=在此 PHP 中不可用
 ChoosedMigrateScript=選擇遷移腳本
 DataMigration=數據庫遷移（數據）
@@ -100,7 +100,7 @@ FreshInstallDesc=如果這是您第一次安裝，請使用此模式。如果沒
 Upgrade=升級
 UpgradeDesc=如果您已將舊的 Dolibarr 文件替換為新版本的文件，請使用此模式。這將升級您的數據庫和數據。
 Start=開始
-InstallNotAllowed=<span class='notranslate'><b></span> 不允許設置\n conf.php </b>  權限
+InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
 YouMustCreateWithPermission=您必須創建文件 %s 並在安裝過程中為 Web 服務器設置寫入權限。
 CorrectProblemAndReloadPage=請修復問題並按 F5 重新加載頁面。
 AlreadyDone=已經遷移
@@ -111,12 +111,12 @@ 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=<span class='notranslate'>%s</span> 方法檢測到的孤兒付款\n
+OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
 RemoveItManuallyAndPressF5ToContinue=手動將其刪除並按 F5 繼續。
 FieldRenamed=字段已重命名
 IfLoginDoesNotExistsCheckCreateUser=如果用戶尚不存在，則必須選中“創建用戶”選項
 ErrorConnection=服務器“<b> %s </b> ", 數據庫名稱 " <b> %s </b> ”，登錄“<b> %s </b> ”，或者數據庫密碼可能錯誤或者PHP客戶端版本相對於數據庫版本太舊。
-InstallChoiceRecommanded=建議選擇安裝版本 <b> %s </b>  從您當前的版本開始<b> %s </b> 
+InstallChoiceRecommanded=建議選擇安裝版本 <b> %s </b>  從您當前的版本開始<b> %s </b>
 InstallChoiceSuggested= <b> 安裝程序建議的安裝選擇</b> 。
 MigrateIsDoneStepByStep=目標版本 (%s）有幾個版本的差距。一旦完成，安裝嚮導將返回建議進一步遷移。
 CheckThatDatabasenameIsCorrect=檢查數據庫名稱“<b> %s </b> “ 是正確的。
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=遷移銷售訂單存儲的運輸
 MigrationShippingDelivery=升級運輸倉儲
 MigrationShippingDelivery2=升級運輸存儲2
 MigrationFinished=遷移完成
-LastStepDesc= <strong> 最後一步</strong> ：在此定義您希望用於連接 Dolibarr 的登錄名和密碼。 <b> 不要丟失此帳戶，因為它是管理所有其他/附加用戶帳戶的主帳戶。 </b> 
+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 main account to administer all other/additional user accounts.</b>
 ActivateModule=激活模塊%s
 ShowEditTechnicalParameters=單擊此處顯示/編輯高級參數（專家模式）
 WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
@@ -211,7 +211,7 @@ YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the i
 YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<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.
-ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
+ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must remove the file install.lock or create a file upgrade.unlock into the Dolibarr documents directory.
 Loaded=Loaded
 FunctionTest=Function test
 NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
diff --git a/htdocs/langs/zh_HK/interventions.lang b/htdocs/langs/zh_HK/interventions.lang
index bbc94c05825..a3edb27b712 100644
--- a/htdocs/langs/zh_HK/interventions.lang
+++ b/htdocs/langs/zh_HK/interventions.lang
@@ -14,10 +14,12 @@ InterventionContact=干預聯絡
 DeleteIntervention=刪除乾預
 ValidateIntervention=驗證干預措施
 ModifyIntervention=修改干預措施
+CloseIntervention=Close intervention
 DeleteInterventionLine=刪除乾預線
 ConfirmDeleteIntervention=您確定要刪除此干預嗎？
-ConfirmValidateIntervention=您確定要以 <span class='notranslate'><b></span> 名義驗證此干預嗎\n %s </b> ？
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
 ConfirmModifyIntervention=您確定要修改此干預措施嗎？
+ConfirmCloseIntervention=Are you sure you want to close this intervention?
 ConfirmDeleteInterventionLine=您確定要刪除此干預行嗎？
 ConfirmCloneIntervention=Are you sure you want to clone this intervention?
 NameAndSignatureOfInternalContact=干預者姓名及簽名：
@@ -36,6 +38,7 @@ InterventionModifiedInDolibarr=Intervention %s modified
 InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
 InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
 InterventionSentByEMail=Intervention %s sent by email
+InterventionClosedInDolibarr= Intervention %s closed
 InterventionDeletedInDolibarr=Intervention %s deleted
 InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index b72b47c566c..a7c7a4308c3 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -9,10 +9,10 @@ DIRECTION=ltr
 # cid0kr is for Korean
 # DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
 # freemono is for ru_RU or uk_UA, uz_UZ
-# freeserif is for Tamil
+# freeserif is for Tamil or Ethiopian
 FONTFORPDF=msungstdlight
 FONTSIZEFORPDF=10
-SeparatorDecimal=.
+SeparatorDecimal=。
 SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
@@ -29,279 +29,282 @@ 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
+DatabaseConnection=數據庫連接
 NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
-NoTranslation=No translation
+NoTranslation=沒有翻譯
 Translation=Translation
 Translations=Translations
 CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
+EmptySearchString=Enter non empty search criteria
 EnterADateCriteria=Enter a date criteria
-NoRecordFound=No record found
+NoRecordFound=沒有找到記錄
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
+NoError=沒有錯誤
+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
+ErrorFieldRequired=字段 '%s' 是必須的
+ErrorFieldFormat=字段 '%s' 價值不高
+ErrorFileDoesNotExists=文件%s 不存在
+ErrorFailedToOpenFile=無法打開文件%s
+ErrorCanNotCreateDir=無法創建目錄 %s
+ErrorCanNotReadDir=無法讀取目錄 %s
+ErrorConstantNotDefined=參數%s 沒有定義的
+ErrorUnknown=未知錯誤
+ErrorSQL=SQL錯誤
 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.
+ErrorGoToGlobalSetup=轉到“公司/組織”設置來解決此問題
+ErrorGoToModuleSetup=轉到模塊設置來修復此問題
+ErrorFailedToSendMail=發送郵件失敗（sender=%s, 接收者=%s）
+ErrorFileNotUploaded=文件未上傳。檢查大小是否未超過允許的最大值、磁盤上是否有可用空間以及該目錄中是否存在同名文件。
+ErrorInternalErrorDetected=檢測到錯誤
+ErrorWrongHostParameter=主機參數錯誤
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Company/Foundation and post the form again.
+ErrorRecordIsUsedByChild=刪除該記錄失敗。該記錄至少被一個子記錄使用。
+ErrorWrongValue=值錯誤
+ErrorWrongValueForParameterX=參數值錯誤 %s
+ErrorNoRequestInError=沒有錯誤的請求
+ErrorServiceUnavailableTryLater=目前不提供服務。稍後再試。
+ErrorDuplicateField=唯一字段中的重複值
+ErrorSomeErrorWereFoundRollbackIsDone=發現了一些錯誤。更改已回滾。
+ErrorConfigParameterNotDefined=參數<b> %s </b>  未在 Dolibarr 配置文件中定義 <b> conf.php </b> 。
+ErrorCantLoadUserFromDolibarrDatabase=找不到用戶<b> %s </b>  在 Dolibarr 數據庫中。
 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.
+ErrorFailedToSaveFile=錯誤，保存文件失敗。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
+ErrorInvalidSubtype=Selected Subtype is not allowed
 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
+SetDate=設置日期
+SelectDate=選擇日期
+SeeAlso=另請參閱%s
 SeeHere=See here
 ClickHere=Click here
 Here=Here
 Apply=Apply
-BackgroundColorByDefault=Default background color
+BackgroundColorByDefault=默認背景顏色
 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
+FileTransferComplete=文件上傳成功
 FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
+FileWasNotUploaded=已選擇一個文件作為附件，但尚未上傳。為此，單擊“附加文件”。
+NbOfEntries=條目數
+GoToWikiHelpPage=閱讀在線幫助（需要連接互聯網）
+GoToHelpPage=閱讀幫助
 DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
-RecordSaved=Record saved
-RecordDeleted=Record deleted
+RecordSaved=記錄已保存
+RecordDeleted=記錄已刪除
 RecordGenerated=Record generated
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
+LevelOfFeature=功能級別
+NotDefined=沒有定義的
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr 身份驗證模式設置為 <b> %s </b>  在配置文件中<b> conf.php </b> 。 <br> 這意味著密碼數據庫位於 Dolibarr 外部，因此更改此字段可能不會產生任何效果。
+Administrator=System administrator
+AdministratorDesc=System administrator (can administer user, permissions but also system setup and modules configuration)
+Undefined=不明確的
+PasswordForgotten=密碼忘記了？
 NoAccount=No account?
-SeeAbove=See above
-HomeArea=Home
-LastConnexion=Last login
-PreviousConnexion=Previous login
+SeeAbove=往上看
+HomeArea=家
+LastConnexion=上次登錄
+PreviousConnexion=上次登錄
 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
+ConnectedOnMultiCompany=連接環境
+ConnectedSince=連接自
+AuthenticationMode=認證方式
+RequestedUrl=請求的網址
+DatabaseTypeManager=數據庫類型管理器
+RequestLastAccessInError=最新數據庫訪問請求錯誤
+ReturnCodeLastAccessInError=最新數據庫訪問請求錯誤的返回碼
+InformationLastAccessInError=最新數據庫訪問請求錯誤信息
+DolibarrHasDetectedError=Dolibarr 檢測到技術錯誤
 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
+InformationToHelpDiagnose=此信息可用於診斷目的（您可以將選項 $dolibarr_main_prod 設置為“1”以隱藏敏感信息）
+MoreInformation=更多信息
+TechnicalInformation=技術信息
 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
+NotePublic=注（公開）
+NotePrivate=注（私人）
+PrecisionUnitIsLimitedToXDecimals=Dolibarr 設置為將單價精度限制為 <b> %s </b>  小數點。
+DoTest=測試
+ToFilter=篩選
 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
+WarningYouHaveAtLeastOneTaskLate=警告，您至少有一個元素超出了容差時間。
+yes=是的
+Yes=是的
+no=不
+No=不
+All=全部
+Home=家
+Help=幫助
+OnlineHelp=網上幫助
+PageWiki=維基頁面
 MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
+Always=總是
+Never=絕不
+Under=在下面
+Period=時期
+PeriodEndDate=期間的結束日期
 SelectedPeriod=Selected period
 PreviousPeriod=Previous period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
+Activate=啟用
+Activated=活性
+Closed=關閉
+Closed2=關閉
 NotClosed=Not closed
-Enabled=Enabled
+Enabled=啟用
 Enable=Enable
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
+Deprecated=已棄用
+Disable=禁用
+Disabled=殘疾人
+Add=添加
+AddLink=添加鏈接
 RemoveLink=Remove link
 AddToDraft=Add to draft
-Update=Update
-Close=Close
+Update=更新
+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
+Confirm=確認
+ConfirmSendCardByMail=您確實想將此卡片的內容郵寄至 <b> %s </b> ？
+Delete=刪除
+Remove=消除
+Resiliate=終止
+Cancel=取消
+Modify=調整
+Edit=編輯
+Validate=證實
 ValidateAndApprove=Validate and Approve
-ToValidate=To validate
+ToValidate=驗證
 NotValidated=Not validated
-Save=Save
-SaveAs=Save As
+Save=節省
+SaveAs=另存為
 SaveAndStay=Save and stay
 SaveAndNew=Save and new
-TestConnection=Test connection
-ToClone=Clone
+TestConnection=測試連接
+ToClone=克隆
 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
+ConfirmClone=選擇您要克隆的數據：
+NoCloneOptionsSpecified=沒有定義要克隆的數據。
+Of=的
+Go=去
+Run=跑步
+CopyOf=備份
+Show=展示
 Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-SearchMenuShortCut=Ctrl + shift + f
+ShowCardHere=出示卡片
+Search=搜索
+SearchOf=搜索
 QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
-Valid=Valid
-Approve=Approve
+Valid=有效的
+Approve=批准
 Disapprove=Disapprove
-ReOpen=Re-Open
+ReOpen=重新開放
 OpenVerb=Open
-Upload=Upload
-ToLink=Link
-Select=Select
+Upload=上傳
+ToLink=關聯
+Select=選擇
 SelectAll=Select all
-Choose=Choose
-Resize=Resize
+Choose=選擇
+Resize=調整大小
+Crop=Crop
 ResizeOrCrop=Resize or Crop
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
+Author=作者
+User=用戶
+Users=用戶
+Group=團體
+Groups=團體
 UserGroup=User group
 UserGroups=User groups
 NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Repeat your password
+Password=密碼
+PasswordRetype=重複您的密碼
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
+YourUserFile=Your user file
+Name=姓名
 NameSlashCompany=Name / Company
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
+Person=人
+Parameter=範圍
+Parameters=參數
+Value=價值
+PersonalValue=個人價值
 NewObject=New %s
-NewValue=New value
+NewValue=新價值
 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
+FieldXModified=Field %s modified
+FieldXModifiedFromYToZ=Field %s modified from %s to %s
+CurrentValue=當前值
+Code=代碼
+Type=類型
+Language=語言
+MultiLanguage=多語言
+Note=筆記
+Title=標題
+Label=標籤
+RefOrLabel=參考號或標籤
+Info=日誌
+Family=家庭
+Description=描述
+Designation=描述
 DescriptionOfLine=Description of line
 DateOfLine=Date of line
 DurationOfLine=Duration of line
 ParentLine=Parent line ID
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Total reports by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Login
-Setup=Setup
-Alert=Alert
+Model=文檔模板
+DefaultModel=默認文檔模板
+Action=事件
+About=關於
+Number=數字
+NumberByMonth=按月統計的報告總數
+AmountByMonth=按月金額
+Numero=數字
+Limit=限制
+Limits=限制
+Logout=登出
+NoLogoutProcessWithAuthMode=身份驗證模式沒有適用的斷開連接功能 <b> %s </b>
+Connection=登錄
+Setup=設置
+Alert=警報
 MenuWarnings=Alerts
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
+Previous=以前的
+Next=下一個
+Cards=牌
+Card=卡片
+Now=現在
 HourStart=Start hour
 Deadline=Deadline
-Date=Date
+Date=日期
 DateAndHour=Date and hour
 DateToday=Today's date
 DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
+DateStart=開始日期
+DateEnd=結束日期
+DateCreation=創建日期
 DateCreationShort=Creat. date
 IPCreation=Creation IP
-DateModification=Modification date
-DateModificationShort=Modif. date
+DateModification=修改日期
+DateModificationShort=修改。日期
 IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=Validation date
+DateLastModification=最新修改日期
+DateValidation=驗證日期
 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
+DateClosing=截止日期
+DateDue=到期日
+DateValue=起息日
+DateValueShort=起息日
+DateOperation=營業日期
+DateOperationShort=歌劇。日期
+DateLimit=限制日期
+DateRequest=查詢日期
+DateProcess=處理日期
+DateBuild=報告構建日期
+DatePayment=付款日期
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
@@ -311,82 +314,85 @@ 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
+UserClosing=Closing user
+UserClosingShort=Closing user
+DurationYear=年
+DurationMonth=月
+DurationWeek=星期
+DurationDay=天
+DurationYears=年
+DurationMonths=月
+DurationWeeks=週
+DurationDays=天
+Year=年
+Month=月
+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
+Day=天
+Hour=小時
+Minute=分鐘
+Second=第二
+Years=年
+Months=幾個月
+Days=天
+days=天
+Hours=小時
+Minutes=分鐘
+Seconds=秒數
 Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
+Today=今天
+Yesterday=昨天
+Tomorrow=明天
+Morning=早晨
+Afternoon=下午
+Quadri=誇德里
+MonthOfDay=當天的月份
 DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
-Rate=Rate
+SecondShort=sec
+Rate=速度
 CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
+UseLocalTax=含稅
+Bytes=字節
+KiloBytes=千字節
+MegaBytes=兆字節
+GigaBytes=千兆字節
+TeraBytes=太字節
 UserAuthor=Created by
 UserModif=Updated by
 b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
+Kb=鉀
+Mb=MB
+Gb=國標
+Tb=铽
+Cut=切
+Copy=複製
+Paste=粘貼
+Default=默認
+DefaultValue=默認值
 DefaultValues=Default values/filters/sorting
-Price=Price
+Price=價格
 PriceCurrency=Price (currency)
-UnitPrice=Unit price
-UnitPriceHT=Unit price (excl.)
+UnitPrice=單價
+UnitPriceHT=單價（不含）
 UnitPriceHTCurrency=Unit price (excl.) (currency)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
+UnitPriceTTC=單價
+PriceU=向上。
+PriceUHT=向上。 （網）
 PriceUHTCurrency=U.P (net) (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
+PriceUTTC=向上。 （含稅）
+Amount=數量
+AmountInvoice=發票金額
 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
+AmountPayment=支付金額
+AmountHTShort=金額（不含）
+AmountTTCShort=金額（含稅）
+AmountHT=金額（不含稅）
+AmountTTC=金額（含稅）
+AmountVAT=稅額
 MulticurrencyAlreadyPaid=Already paid, original currency
 MulticurrencyRemainderToPay=Remain to pay, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
@@ -394,41 +400,43 @@ 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)
+AmountLT1=稅額2
+AmountLT2=稅額3
+AmountLT1ES=金額 RE
+AmountLT2ES=金額 IRPF
+AmountTotal=總金額
+AmountAverage=平均金額
+PriceQtyMinHT=價格 最少數量（不含稅）
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
 PercentOfOriginalObject=Percent of original object
 AmountOrPercent=Amount or percent
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (excl.)
+Percentage=百分比
+Total=全部的
+SubTotal=小計
+TotalHTShort=總計（不含）
 TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
+TotalTTCShort=總計（含稅）
+TotalHT=總計（不含稅）
+TotalHTforthispage=本頁總計（不含稅）
 Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
+TotalTTC=總計（含稅）
+TotalTTCToYourCredit=您的信用總額（含稅）
+TotalVAT=稅金總額
 TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
+TotalLT1=總稅額 2
+TotalLT2=總稅額 3
+TotalLT1ES=總稀土
+TotalLT2ES=總IRPF
 TotalLT1IN=Total CGST
 TotalLT2IN=Total SGST
-HT=Excl. tax
-TTC=Inc. tax
+HT=排除。稅
+TTC=公司稅
 INCVATONLY=Inc. VAT
 INCT=Inc. all taxes
-VAT=Sales tax
+VAT=銷售稅
 VATIN=IGST
 VATs=Sales taxes
 VATINs=IGST taxes
@@ -436,186 +444,189 @@ LT1=Sales tax 2
 LT1Type=Sales tax 2 type
 LT2=Sales tax 3
 LT2Type=Sales tax 3 type
-LT1ES=RE
+LT1ES=關於
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
-VATRate=Tax Rate
+LT1GC=Additional cents
+VATRate=稅率
 RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
-Average=Average
-Sum=Sum
-Delta=Delta
+Average=平均的
+Sum=和
+Delta=三角洲
 StatusToPay=To pay
 RemainToPay=Remain to pay
-Module=Module/Application
+Module=模塊/應用
 Modules=Modules/Applications
-Option=Option
+Option=選項
 Filters=Filters
-List=List
-FullList=Full list
+List=列表
+FullList=完整列表
 FullConversation=Full conversation
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
+Statistics=統計數據
+OtherStatistics=其他統計數據
+Status=地位
 Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
+ShortInfo=信息。
+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
+RefSupplier=參考號小販
+RefPayment=參考號支付
+CommercialProposalsShort=商業提案
+Comment=評論
+Comments=評論
+ActionsToDo=要做的活動
+ActionsToDoShort=去做
+ActionsDoneShort=完畢
+ActionNotApplicable=不適用
+ActionRunningNotStarted=開始
+ActionRunningShort=進行中
+ActionDoneShort=完成的
+ActionUncomplete=不完整
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
+CompanyFoundation=公司/組織
 Accountant=Accountant
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events for this third party
+ContactsForCompany=該第三方的聯繫方式
+ContactsAddressesForCompany=該第三方的聯繫方式/地址
+AddressesForCompany=該第三方的地址
+ActionsOnCompany=該第三方的活動
 ActionsOnContact=Events for this contact/address
 ActionsOnContract=Events for this contract
-ActionsOnMember=Events about this member
+ActionsOnMember=關於該會員的活動
 ActionsOnProduct=Events about this product
 ActionsOnAsset=Events for this fixed asset
-NActionsLate=%s late
+NActionsLate=%s 晚的
 ToDo=To do
 Completed=Completed
 Running=In progress
 RequestAlreadyDone=Request already recorded
-Filter=Filter
+Filter=篩選
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
+RemoveFilter=移除過濾器
+ChartGenerated=生成圖表
+ChartNotGenerated=圖表未生成
 GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
+Generate=產生
+Duration=期間
+TotalDuration=總持續時間
+Summary=概括
+DolibarrStateBoard=數據庫統計
+DolibarrWorkBoard=未清項目
 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
+Available=可用的
+NotYetAvailable=尚不可用
+NotAvailable=無法使用
+Categories=標籤/類別
+Category=標籤/類別
+SelectTheTagsToAssign=Select the tags/categories to assign
+By=經過
+From=從
 FromDate=From
 FromLocation=From
-to=to
+to=到
 To=to
 ToDate=to
 ToLocation=to
 at=at
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other information
+and=和
+or=或者
+Other=其他
+Others=其他的
+OtherInformations=其他信息
 Workflow=Workflow
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
+Quantity=數量
+Qty=數量
+ChangedBy=更改者
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
 Approved=Approved
 Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
+ReCalculate=重新計算
+ResultKo=失敗
+Reporting=報告
+Reportings=報告
+Draft=草稿
+Drafts=草稿
 StatusInterInvoiced=Invoiced
-Validated=Validated
+Done=Done
+Validated=已驗證
 ValidatedToProduce=Validated (To produce)
-Opened=Open
+Opened=打開
 OpenAll=Open (All)
 ClosedAll=Closed (All)
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
+New=新的
+Discount=折扣
+Unknown=未知
+General=一般的
+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
+RotateImage=Rotate 90°
+Received=已收到
+Paid=有薪酬的
+Topic=主題
+ByCompanies=由第三方
+ByUsers=按用戶
+Links=鏈接
+Link=關聯
+Rejects=拒絕
+Preview=預覽
+NextStep=下一步
+Datas=數據
+None=沒有任何
+NoneF=沒有任何
 NoneOrSeveral=None or several
-Late=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
+Photo=圖片
+Photos=圖片
+AddPhoto=添加圖片
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
+Login=登錄
 LoginEmail=Login (email)
 LoginOrEmail=Login or Email
-CurrentLogin=Current login
+CurrentLogin=當前登錄
 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
+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=J
 MonthVeryShort02=F
 MonthVeryShort03=M
@@ -628,186 +639,188 @@ MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
-AttachedFiles=Attached files and documents
+AttachedFiles=附件和文件
 JoinMainDoc=Join main document
 JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 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
+DateFormatYYYYMMDD=年-月-日
+DateFormatYYYYMMDDHHMM=年-月-日 時:秒
+ReportName=報告名稱
+ReportPeriod=報告期
+ReportDescription=描述
+Report=報告
+Reports=Reports
+Keyword=關鍵詞
 Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
+Legend=傳奇
+Fill=充滿
+Reset=重置
+File=文件
+Files=文件
+NotAllowed=不允許
+ReadPermissionNotAllowed=不允許讀取權限
 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
+Example=例子
+Examples=例子
+NoExample=沒有例子
+FindBug=報告錯誤
+NbOfThirdParties=第三方數量
+NbOfLines=行數
+NbOfObjects=物體數量
 NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
+Referers=相關項目
+TotalQuantity=總數（量
+DateFromTo=來自%s 至 %s
+DateFrom=來自%s
+DateUntil=直到%s
+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
+Internal=內部的
+External=外部的
+Internals=內部的
+Externals=外部的
+Warning=警告
+Warnings=警告
+BuildDoc=構建文檔
+Entity=環境
+Entities=實體
+CustomerPreview=客戶預覽
+SupplierPreview=供應商預覽
+ShowCustomerPreview=顯示客戶預覽
+ShowSupplierPreview=顯示供應商預覽
+RefCustomer=參考號顧客
 InternalRef=Internal ref.
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
+Currency=貨幣
+InfoAdmin=管理員信息
+Undo=撤消
+Redo=重做
+ExpandAll=展開全部
+UndoExpandAll=撤消展開
 SeeAll=See all
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by email
-MailSentBy=Email sent by
+Reason=原因
+FeatureNotYetSupported=尚不支持的功能
+CloseWindow=關閉窗口
+Response=回复
+Priority=優先事項
+SendByMail=通過電子郵件發送
+MailSentBy=電子郵件發送者
+MailSentByTo=Email sent by %s to %s
 NotSent=Not sent
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
+TextUsedInTheMessageBody=電子郵件正文
+SendAcknowledgementByMail=發送確認電子郵件
 SendMail=Send email
 Email=Email
-NoEMail=No email
+NoEMail=沒有電子郵件
 AlreadyRead=Already read
 NotRead=Unread
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
+NoMobilePhone=沒有手機
+Owner=所有者
+FollowingConstantsWillBeSubstituted=以下常量將替換為相應的值。
+Refresh=刷新
+BackToList=返回目錄
 BackToTree=Back to tree
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
+GoBack=回去
+CanBeModifiedIfOk=有效的話可以修改
+CanBeModifiedIfKo=如果無效可以修改
 ValueIsValid=Value is valid
 ValueIsNotValid=Value is not valid
 RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record(s) modified
+RecordModifiedSuccessfully=記錄修改成功
+RecordsModified=%s 記錄已修改
 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
+ValidatedRecordWhereFound = Some of the selected records have already been validated. No records have been deleted.
+AutomaticCode=自動編碼
+FeatureDisabled=功能已禁用
+MoveBox=移動小部件
+Offered=提供
+NotEnoughPermissions=您沒有執行此操作的權限
 UserNotInHierachy=This action is reserved to the supervisors of this user
-SessionName=Session name
-Method=Method
-Receive=Receive
+SessionName=會話名稱
+Method=方法
+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
+PartialWoman=部分的
+TotalWoman=全部的
+NeverReceived=從未收到過
+Canceled=取消
+YouCanChangeValuesForThisListFromDictionarySetup=您可以從菜單設置 - 詞典更改此列表的值
 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
+Color=顏色
+Documents=鏈接文件
+Documents2=文件
+UploadDisabled=上傳已禁用
 MenuAccountancy=Accounting
-MenuECM=Documents
-MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
+MenuECM=文件
+MenuAWStats=AWS統計
+MenuMembers=會員
+MenuAgendaGoogle=谷歌議程
 MenuTaxesAndSpecialExpenses=Taxes | Special expenses
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetup=Dolibarr 限制（菜單 home-setup-security）：%s Kb，PHP 限制：%s 鉀
 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
+NoFileFound=沒有上傳任何文件
+CurrentUserLanguage=當前語言
+CurrentTheme=當前主題
+CurrentMenuManager=當前菜單管理器
 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
+DisabledModules=禁用模塊
+For=為了
+ForCustomer=對於客戶
+Signature=簽名
+HidePassword=顯示隱藏密碼的命令
+UnHidePassword=顯示帶有清晰密碼的真實命令
+Root=根
+RootOfMedias=Root of public media (/medias)
+Informations=信息
+Page=頁
+Notes=筆記
+AddNewLine=添加新行
+AddFile=添加文件
+FreeZone=自由文本產品
+FreeLineOfType=自由文本項，類型：
+CloneMainAttributes=克隆對象及其主要屬性
 ReGeneratePDF=Re-generate PDF
-PDFMerge=PDF Merge
-Merge=Merge
+PDFMerge=PDF合併
+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
+PrintContentArea=顯示打印主要內容區域的頁面
+MenuManager=菜單管理器
+WarningYouAreInMaintenanceMode=警告，您處於維護模式：僅登錄 <b> %s </b>  允許在此模式下使用應用程序。
+CoreErrorTitle=系統錯誤
+CoreErrorMessage=抱歉，發生錯誤。請聯繫您的系統管理員檢查日誌或禁用 $dolibarr_main_prod=1 以獲取更多信息。
+CreditCard=信用卡
 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
+AccordingToGeoIPDatabase=（根據GeoIP換算）
+Line=線
+NotSupported=不支持
+RequiredField=必填項目
+Result=結果
+ToTest=測試
+ValidateBefore=使用此功能之前必須驗證項目
+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
+Private=私人的
+Hidden=隱
+Resources=資源
+Source=來源
+Prefix=字首
+Before=前
+After=後
+IPAddress=IP地址
+Frequency=頻率
+IM=即時通訊
+NewAttribute=新屬性
+AttributeCode=屬性代碼
+URLPhoto=照片/徽標的 URL
 SetLinkToAnotherThirdParty=Link to another third party
 LinkTo=Link to
 LinkToProposal=Link to proposal
@@ -822,49 +835,49 @@ LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
 LinkToTicket=Link to ticket
 LinkToMo=Link to Mo
-CreateDraft=Create draft
+CreateDraft=創建草稿
 SetToDraft=Back to draft
-ClickToEdit=Click to edit
+ClickToEdit=點擊編輯
 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
+ObjectDeleted=對象%s 已刪除
+ByCountry=按國家/地區
+ByTown=按城鎮
+ByDate=按日期
+ByMonthYear=按月/年
+ByYear=按年份
+ByMonth=按月
+ByDay=白天
+BySalesRepresentative=由銷售代表
+LinkedToSpecificUsers=鏈接到特定用戶聯繫人
+NoResults=沒有結果
 AdminTools=Admin Tools
 SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
+ModulesSystemTools=模塊工具
+Test=測試
+Element=元素
+NoPhotoYet=還沒有可用的圖片
 Dashboard=Dashboard
 MyDashboard=My Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
+Deductible=免賠額
+from=從
+toward=朝向
+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
+HelpCopyToClipboard=使用 Ctrl+C 複製到剪貼板
+SaveUploadedFileWithMask=將文件保存在服務器上，名稱為“<strong> %s </strong> ”（否則“%s”）
+OriginFileName=原始文件名
+SetDemandReason=設置來源
+SetBankAccount=定義銀行賬戶
+AccountCurrency=賬戶幣種
+ViewPrivateNote=查看筆記
+XMoreLines=%s 隱藏行
 ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
+PublicUrl=公共網址
+AddBox=添加框
 SelectElementAndClick=Select an element and click on %s
 PrintFile=Print File %s
 ShowTransaction=Show entry on bank account
@@ -897,9 +910,12 @@ 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)?
+ConfirmMassClone=Bulk clone confirmation
+ConfirmMassCloneQuestion=Select project to clone to
+ConfirmMassCloneToOneProject=Clone to project %s
 RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
+ClassifyBilled=Classify Billed
+ClassifyUnbilled=Classify Unbilled
 Progress=Progress
 ProgressShort=Progr.
 FrontOffice=Front office
@@ -907,18 +923,20 @@ BackOffice=Back office
 Submit=Submit
 View=View
 Export=Export
+Import=Import
 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
+ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
+ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
 AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
 NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
 Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
+GroupByX=Group by %s
 ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
@@ -939,7 +957,7 @@ BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 WebSite=Website
 WebSites=Websites
-WebSiteAccounts=Website accounts
+WebSiteAccounts=Web access accounts
 ExpenseReport=Expense report
 ExpenseReports=Expense reports
 HR=HR
@@ -948,6 +966,7 @@ AutomaticallyCalculated=Automatically calculated
 TitleSetToDraft=Go back to draft
 ConfirmSetToDraft=Are you sure you want to go back to Draft status?
 ImportId=Import id
+Event=Event
 Events=Events
 EMailTemplates=Email templates
 FileNotShared=File not shared to external public
@@ -965,31 +984,31 @@ 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
+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
+SaturdayMin=薩
+SundayMin=蘇
+Day1=週一
+Day2=週二
+Day3=週三
+Day4=週四
+Day5=星期五
+Day6=週六
+Day0=星期日
+ShortMonday=中號
+ShortTuesday=時間
+ShortWednesday=瓦
+ShortThursday=時間
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
@@ -1067,6 +1086,7 @@ CommentPage=Comments space
 CommentAdded=Comment added
 CommentDeleted=Comment deleted
 Everybody=Everybody
+EverybodySmall=Everybody
 PayedBy=Paid by
 PayedTo=Paid to
 Monthly=Monthly
@@ -1079,7 +1099,7 @@ KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
 Deletedraft=Delete draft
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Public file shared via link
 SelectAThirdPartyFirst=Select a third party first...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventory
@@ -1113,7 +1133,7 @@ ContactDefault_project_task=Task
 ContactDefault_propal=Proposal
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
+ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
 CustomReports=Custom reports
@@ -1128,6 +1148,7 @@ DeleteFileText=Do you really want delete this file?
 ShowOtherLanguages=Show other languages
 SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
 NotUsedForThisCustomer=Not used for this customer
+NotUsedForThisVendor=Not used for this vendor
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Information
@@ -1148,14 +1169,14 @@ EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
 Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
+AffectTag=Assign a Tag
+AffectUser=Assign a User
+SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
+ConfirmAffectTag=Bulk Tag Assignment
+ConfirmAffectUser=Bulk User Assignment
+ProjectRole=Role assigned on each project/opportunity
+TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
 ConfirmUpdatePrice=Choose a increase/decrease price rate
 ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
@@ -1163,7 +1184,6 @@ ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s select
 ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
 ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
 CategTypeNotFound=No tag type found for type of records
-Rate=Rate
 SupervisorNotFound=Supervisor not found
 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.
@@ -1196,6 +1216,7 @@ CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
 Terminate=Terminate
 Terminated=Terminated
+Position=Position
 AddLineOnPosition=Add line on position (at the end if empty)
 ConfirmAllocateCommercial=Assign sales representative confirmation
 ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
@@ -1210,3 +1231,40 @@ CreatedByPublicPortal=Created from Public portal
 UserAgent=User Agent
 InternalUser=Internal user
 ExternalUser=External user
+NoSpecificContactAddress=No specific contact or address
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the third party is not enough or not accurate.
+HideOnVCard=Hide %s
+ShowOnVCard=Show %s
+AddToContacts=Add address to my contacts
+LastAccess=Last access
+UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
+LastPasswordChangeDate=Last password change date
+PublicVirtualCardUrl=Virtual business card page URL
+PublicVirtualCard=Virtual business card
+TreeView=Tree view
+DropFileToAddItToObject=Drop a file to add it to this object
+UploadFileDragDropSuccess=The file(s) have been uploaded successfully
+SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+InProgress=In progress
+DateOfPrinting=Date of printing
+ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
+UserNotYetValid=Not yet valid
+UserExpired=Expired
+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 if file exists
+AmountSalary=Salary amount
+InvoiceSubtype=Invoice subtype
+ConfirmMassReverse=Bulk Reverse confirmation
+ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+ElementType=Element type
+ElementId=Element Id
+Encrypted=Encrypted
+Settings=Settings
diff --git a/htdocs/langs/zh_HK/opensurvey.lang b/htdocs/langs/zh_HK/opensurvey.lang
index c286034e7be..02659f0acf1 100644
--- a/htdocs/langs/zh_HK/opensurvey.lang
+++ b/htdocs/langs/zh_HK/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=投票標題
 ToReceiveEMailForEachVote=每次投票都會收到一封電子郵件
 TypeDate=輸入日期
 TypeClassic=類型標準
-OpenSurveyStep2=從空閒日（灰色）中選擇您的日期。所選日期為綠色。您可以通過再次單擊先前選擇的日期來取消選擇該日期
+OpenSurveyStep2=Select your dates among the free days (gray). The selected days are green. You can unselect a day previously selected by clicking again on it
 RemoveAllDays=刪除所有日期
 CopyHoursOfFirstDay=複製第一天的時間
 RemoveAllHours=刪除所有時間
@@ -37,7 +37,7 @@ ExpireDate=限制日期
 NbOfSurveys=投票數
 NbOfVoters=選民人數
 SurveyResults=結果
-PollAdminDesc=您可以使用“編輯”按鈕更改本次投票的所有投票行。您還可以使用 <span class='notranslate'>%s</span> 刪除列或行\n。您還可以使用 <span class='notranslate'>%s</span> 添加新列\n。
+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 個選擇
 Against=反對
 YouAreInivitedToVote=邀請您為本次民意調查投票
@@ -61,3 +61,4 @@ SurveyExpiredInfo=投票已結束或投票延遲已到期。
 EmailSomeoneVoted=%s 已填滿一行。\n您可以在以下鏈接找到您的民意調查：\n%s
 ShowSurvey=Show survey
 UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+ListOfOpenSurveys=List of open surveys
diff --git a/htdocs/langs/zh_HK/orders.lang b/htdocs/langs/zh_HK/orders.lang
index f6bba3e2d62..79395539098 100644
--- a/htdocs/langs/zh_HK/orders.lang
+++ b/htdocs/langs/zh_HK/orders.lang
@@ -19,7 +19,7 @@ MakeOrder=下單
 SupplierOrder=採購訂單
 SuppliersOrders=訂單
 SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
+PurchaseOrderLines=Purchase order lines
 SuppliersOrdersRunning=當前採購訂單
 CustomerOrder=銷售訂單
 CustomersOrders=銷售訂單
@@ -72,7 +72,7 @@ Approve2Order=Approve order (second level)
 UserApproval=User for approval
 UserApproval2=User for approval (second level)
 ValidateOrder=驗證訂單
-UnvalidateOrder=取消訂單
+UnvalidateOrder=Invalidate order
 DeleteOrder=刪除訂單
 CancelOrder=取消訂單
 OrderReopened= Order %s re-open
@@ -103,10 +103,10 @@ disablelinefree=No free lines
 CloseOrder=關閉訂單
 ConfirmCloseOrder=您確定要將此訂單設置為已送達嗎？訂單交付後，可以將其設置為計費。
 ConfirmDeleteOrder=您確定要刪除此訂單嗎？
-ConfirmValidateOrder=您確定要驗證名稱為 <span class='notranslate'><b></span> 的訂單嗎\n %s </b> ？
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
 ConfirmUnvalidateOrder=您確定要恢復訂單嗎<b> %s </b>  草稿狀態？
 ConfirmCancelOrder=您確定要取消此訂單嗎？
-ConfirmMakeOrder=您確定要確認您是在 <span class='notranslate'><b></span> 下的訂單嗎\n %s </b> ？
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=生成發票
 ClassifyShipped=分類交付
 PassedInShippedStatus=classified delivered
@@ -130,7 +130,7 @@ DispatchSupplierOrder=接收採購訂單%s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
 SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted (%s)
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 4aab1dc731b..b375602ce96 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -31,7 +31,7 @@ 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.
+GraphInBarsAreLimitedToNMeasures=Graphics 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
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Sales order delivered
 Notify_ORDER_SUPPLIER_SENTBYMAIL=通過電子郵件發送的採購訂單
 Notify_ORDER_SUPPLIER_VALIDATE=已記錄採購訂單
 Notify_ORDER_SUPPLIER_APPROVE=採購訂單已批准
+Notify_ORDER_SUPPLIER_SUBMIT=Purchase order submitted
 Notify_ORDER_SUPPLIER_REFUSE=採購訂單被拒絕
 Notify_PROPAL_VALIDATE=客戶提案已驗證
 Notify_PROPAL_CLOSE_SIGNED=客戶提案已結束簽署
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=通過郵件發送客戶發票
 Notify_BILL_SUPPLIER_VALIDATE=供應商發票已驗證
 Notify_BILL_SUPPLIER_PAYED=供應商發票已支付
 Notify_BILL_SUPPLIER_SENTBYMAIL=通過郵件發送的供應商發票
-Notify_BILL_SUPPLIER_CANCELED=供應商發票已取消
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice canceled
 Notify_CONTRACT_VALIDATE=合同已驗證
 Notify_FICHINTER_VALIDATE=Intervention validated
+Notify_FICHINTER_CLOSE=Intervention closed
 Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
 Notify_FICHINTER_SENTBYMAIL=通過郵件發送干預措施
 Notify_SHIPPING_VALIDATE=發貨已驗證
@@ -118,9 +120,9 @@ DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=擁有多項活動的公司（所有主要模塊）
 CreatedBy=創建者：%s
 ModifiedBy=修改者 %s
-ValidatedBy=已由 <span class='notranslate'>%s</span> 驗證\n
+ValidatedBy=Validated by %s
 SignedBy=Signed by %s
-ClosedBy=由 <span class='notranslate'>%s</span> 關閉\n
+ClosedBy=Closed by %s
 CreatedById=創建的用戶id
 ModifiedById=進行最新更改的用戶 ID
 ValidatedById=驗證的用戶 ID
@@ -172,7 +174,7 @@ VolumeUnitmm3=毫米立方（微升）
 VolumeUnitfoot3=立方英尺
 VolumeUnitinch3=立方英寸
 VolumeUnitounce=盎司
-VolumeUnitlitre=升
+VolumeUnitlitre=liter
 VolumeUnitgallon=加侖
 SizeUnitm=米
 SizeUnitdm=DM
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=在 PHP 安裝上安裝或啟用 GD 庫以使用此選項。
 ProfIdShortDesc= <b> 教授 ID %s </b>  是取決於第三方國家的信息。 <br> 例如，對於國家/地區 <b> %s </b> ，它的代碼是<b> %s </b> 。
 DolibarrDemo=Dolibarr ERP/CRM 演示
 StatsByAmount=Statistics on amount of products/services
+StatsByAmountProducts=Statistics on amount of products
+StatsByAmountServices=Statistics on amount of services
 StatsByNumberOfUnits=產品/服務數量總和統計
+StatsByNumberOfUnitsProducts=Statistics for sum of qty of products
+StatsByNumberOfUnitsServices=Statistics for sum of qty of services
 StatsByNumberOfEntities=引用實體數量的統計信息（發票或訂單的數量...）
 NumberOf=Number of %s
 NumberOfUnits=Number of units on %s
@@ -198,6 +204,7 @@ AmountIn=Amount in %s
 NumberOfUnitsMos=Number of units to produce in manufacturing orders
 EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
 EMailTextInterventionValidated=干預%s 已被驗證。
+EMailTextInterventionClosed=The intervention %s has been closed.
 EMailTextInvoiceValidated=發票%s 已被驗證。
 EMailTextInvoicePayed=Invoice %s has been paid.
 EMailTextProposalValidated=提案%s 已被驗證。
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
 EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
 EMailTextOrderValidated=訂購%s 已被驗證。
 EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=訂購%s 已經批准了。
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=訂購%s 已獲得 <span class='notranslate'>%s</span> 批准\n。
-EMailTextOrderRefused=訂購%s 已被拒絕。
-EMailTextOrderRefusedBy=訂購%s 已被 <span class='notranslate'>%s</span> 拒絕\n。
+EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
+EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
+EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
+EMailTextSupplierOrderRefusedBy=Purchase order %s has been refused by %s.
 EMailTextExpeditionValidated=運送%s 已被驗證。
 EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
@@ -227,7 +233,7 @@ NewSizeAfterCropping=裁剪後的新尺寸
 DefineNewAreaToPick=在圖像上定義要選取的新區域（左鍵單擊圖像，然後拖動直到到達對角）
 CurrentInformationOnImage=該工具旨在幫助您調整圖像大小或裁剪圖像。這是當前編輯圖像的信息
 ImageEditor=圖片編輯器
-YouReceiveMailBecauseOfNotification=您收到此消息是因為您的電子郵件已添加到 <span class='notranslate'>%s</span> 的特定事件通知目標列表中\n <span class='notranslate'>%s</span> 的軟件\n。
+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=本次活動內容如下：
 ThisIsListOfModules=這是此演示配置文件預選的模塊列表（此演示中僅顯示最常見的模塊）。編輯此內容以獲得更個性化的演示，然後單擊“開始”。
 UseAdvancedPerms=使用部分模塊的高級權限
@@ -289,10 +295,12 @@ LinesToImport=Lines to import
 
 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
+ProductsServicesPerPopularity=Products|Services by popularity
+ProductsPerPopularity=Products by popularity
+ServicesPerPopularity=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...
 
@@ -328,3 +336,5 @@ FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
 AddFolder=Create folder
 FileWasCreateFolder=Folder <b>%s</b> has been created
 FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
+SelectADay=Select a day in calendar
+SelectANewDate=Select a new date
diff --git a/htdocs/langs/zh_HK/paybox.lang b/htdocs/langs/zh_HK/paybox.lang
index 5e5d347c26e..bea8c454c0c 100644
--- a/htdocs/langs/zh_HK/paybox.lang
+++ b/htdocs/langs/zh_HK/paybox.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBox模塊設置
-PayBoxDesc=此模塊提供允許在 <span class='notranslate'><a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"></span> 上付款的頁面\n 收款箱 </a>  由客戶。這可用於免費付款或針對特定 Dolibarr 對象（發票、訂單等）的付款
+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=以下 URL 可用於向客戶提供用於對 Dolibarr 對象進行付款的頁面
 PaymentForm=付款方式
 WelcomeOnPaymentPage=歡迎使用我們的在線支付服務
-ThisScreenAllowsYouToPay=您可以通過此屏幕向 <span class='notranslate'>%s</span> 進行在線付款\n。
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
 ThisIsInformationOnPayment=這是有關付款的信息
 ToComplete=去完成
 YourEMail=用於接收付款確認的電子郵件
@@ -13,7 +13,7 @@ PaymentCode=付款碼
 PayBoxDoPayment=使用 Paybox 付款
 YouWillBeRedirectedOnPayBox=您將被重定向到安全的 Paybox 頁面以輸入您的信用卡信息
 Continue=下一個
-SetupPayBoxToHavePaymentCreatedAutomatically=使用 URL <span class='notranslate'><b></span> 設置您的 Paybox\n %s </b>  通過 Paybox 驗證後自動創建付款。
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
 YourPaymentHasBeenRecorded=此頁面確認您的付款已被記錄。謝謝。
 YourPaymentHasNotBeenRecorded=您的付款尚未被記錄，交易已被取消。謝謝。
 AccountParameter=賬戶參數
diff --git a/htdocs/langs/zh_HK/paypal.lang b/htdocs/langs/zh_HK/paypal.lang
index 436b5eb2ee1..21a468f52b7 100644
--- a/htdocs/langs/zh_HK/paypal.lang
+++ b/htdocs/langs/zh_HK/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=貝寶模塊設置
-PaypalDesc=此模塊允許客戶通過 <span class='notranslate'><a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"></span> 付款\n 貝寶 </a> 。這可用於臨時付款或與 Dolibarr 對象（發票、訂單等）相關的付款
+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=使用 PayPal 付款（銀行卡或 PayPal）
 PaypalDoPayment=使用貝寶支付
 PAYPAL_API_SANDBOX=模式測試/沙箱
@@ -12,7 +12,7 @@ PAYPAL_API_INTEGRAL_OR_PAYPALONLY=提供“積分”付款（信用卡+PayPal）
 PaypalModeIntegral=不可缺少的
 PaypalModeOnlyPaypal=僅限貝寶
 ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=這是交易 ID：<b> %s </b> 
+ThisIsTransactionId=這是交易 ID：<b> %s </b>
 PAYPAL_ADD_PAYMENT_URL=通過電子郵件發送文檔時包含 PayPal 付款網址
 NewOnlinePaymentReceived=New online payment received
 NewOnlinePaymentFailed=New online payment tried but failed
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 302ab8ea374..9927d8ba2db 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -18,7 +18,7 @@ Reference=參考
 NewProduct=新產品
 NewService=新服務
 ProductVatMassChange=全球增值稅更新
-ProductVatMassChangeDesc=此工具更新 <span class='notranslate'><b></span> 上定義的增值稅率\n  <u> 全部 </u>  </b>  產品和服務！
+ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
 MassBarcodeInit=批量條形碼初始化
 MassBarcodeInitDesc=此頁面可用於初始化未定義條形碼的對像上的條形碼。檢查模塊條碼設置是否完成。
 ProductAccountancyBuyCode=會計代碼（採購）
@@ -80,10 +80,13 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=新價格
 MinPrice=分鐘。售價
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=售價不能低於該產品允許的最低價格 (%s 不含稅）。如果您輸入的折扣太重要，也會出現此消息。
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=關閉
-ErrorProductAlreadyExists=參考號為 <span class='notranslate'>%s</span> 的產品\n 已經存在。
+ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=參考值或標籤值錯誤。
 ErrorProductClone=嘗試克隆產品或服務時出現問題。
 ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
@@ -205,11 +208,6 @@ 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
@@ -218,6 +216,7 @@ unitMG=mg
 unitLB=pound
 unitOZ=ounce
 unitM=Meter
+unitLM=Linear meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -347,16 +346,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=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?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the 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
@@ -387,6 +387,7 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=No. of different values
 NbProducts=Number of products
 ParentProduct=Parent product
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Hide variant products
 ShowChildProducts=Show variant products
 NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
@@ -417,7 +418,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +431,8 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index aa083483465..4b2d27450d2 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -122,7 +122,7 @@ ChildOfTask=任務的孩子
 TaskHasChild=Task has child
 NotOwnerOfProject=不是這個私人項目的所有者
 AffectedTo=分配給
-CantRemoveProject=該項目無法刪除，因為它被其他一些對象（發票、訂單或其他）引用。請參閱選項卡“<span class='notranslate'>%s</span>”\n'。
+CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
 ValidateProject=Validate project
 ConfirmValidateProject=您確定要驗證該項目嗎？
 CloseAProject=關閉項目
@@ -249,7 +249,7 @@ 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.
+ThirdPartyRequiredToGenerateIntervention=A third party must be defined on project to be able to create intervention.
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
 ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
diff --git a/htdocs/langs/zh_HK/propal.lang b/htdocs/langs/zh_HK/propal.lang
index 125cee3cf8b..66dc2e74a40 100644
--- a/htdocs/langs/zh_HK/propal.lang
+++ b/htdocs/langs/zh_HK/propal.lang
@@ -12,9 +12,11 @@ NewPropal=新提案
 Prospect=前景
 DeleteProp=刪除商業提案
 ValidateProp=驗證商業提案
+CancelPropal=Cancel
 AddProp=創建提案
 ConfirmDeleteProp=您確定要刪除此商業提案嗎？
-ConfirmValidateProp=您確定要驗證名稱為 <span class='notranslate'><b></span> 的商業提案嗎\n %s </b> ？
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
+ConfirmCancelPropal=Are you sure you want to cancel commercial proposal <b>%s</b>?
 LastPropals=最新%s 提案
 LastModifiedProposals=最新%s 修改後的提案
 AllPropals=所有提案
@@ -27,13 +29,15 @@ NbOfProposals=商業提案數量
 ShowPropal=顯示提案
 PropalsDraft=草稿
 PropalsOpened=打開
+PropalStatusCanceled=Canceled (Abandoned)
 PropalStatusDraft=草案（需要驗證）
 PropalStatusValidated=已驗證（提案已開放）
 PropalStatusSigned=簽字（需要開具賬單）
 PropalStatusNotSigned=未簽署（已關閉）
 PropalStatusBilled=計費
+PropalStatusCanceledShort=Canceled
 PropalStatusDraftShort=草稿
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Open
 PropalStatusClosedShort=關閉
 PropalStatusSignedShort=簽
 PropalStatusNotSignedShort=未簽名
@@ -114,6 +118,7 @@ RefusePropal=Refuse proposal
 Sign=Sign
 SignContract=Sign contract
 SignFichinter=Sign intervention
+SignSociete_rib=Sign mandate
 SignPropal=Accept proposal
 Signed=signed
 SignedOnly=Signed only
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index c44b541e8ba..8d83942e282 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -116,9 +116,10 @@ EstimatedStockValue=輸入股票價值
 DeleteAWarehouse=刪除倉庫
 ConfirmDeleteWarehouse=您確定要刪除倉庫<b> %s </b> ？
 PersonalStock=個人股票%s
-ThisWarehouseIsPersonalStock=此倉庫代表 <span class='notranslate'>%s</span> 的個人庫存\n %s
+ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=選擇用於減少庫存的倉庫
 SelectWarehouseForStockIncrease=選擇用於增加庫存的倉庫
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=無股票行動
 DesiredStock=所需股票
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, fro
 ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 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>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 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
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Last BP
-CurrentPA=Curent BP
+CurrentPA=Current BP
 RecordedQty=Recorded Qty
 RealQty=Real Qty
 RealValue=Real Value
@@ -244,7 +246,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 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
+UpdateByScaning=Complete real qty by scanning
 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.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Advanced Stock Transfer
 ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet
 StockTransferNew=New stock transfer
 StockTransferList=Stock transfers list
-ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference <STRONG>%s</STRONG> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Decrease of stocks with transfer %s
 ConfirmDestockCancel=Cancel decrease of stocks with transfer %s
 DestockAllProduct=Decrease of stocks
@@ -307,19 +309,26 @@ StockTransferDecrementationCancel=Cancel decrease of source warehouses
 StockTransferIncrementationCancel=Cancel increase of destination warehouses
 StockStransferDecremented=Source warehouses decreased
 StockStransferDecrementedCancel=Decrease of source warehouses canceled
-StockStransferIncremented=Closed - Stocks transfered
-StockStransferIncrementedShort=Stocks transfered
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
 StockTransferSetup = Stocks Transfer module configuration
-Settings=Settings
 StockTransferSetupPage = Configuration page for stocks transfer module
 StockTransferRightRead=Read stocks transfers
 StockTransferRightCreateUpdate=Create/Update stocks transfers
 StockTransferRightDelete=Delete stocks transfers
 BatchNotFound=Lot / serial not found for this product
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
+ReverseConfirmed=Stock movement has been reversed successfully
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
diff --git a/htdocs/langs/zh_HK/stripe.lang b/htdocs/langs/zh_HK/stripe.lang
index 2c95bcfce27..da6a38d0da7 100644
--- a/htdocs/langs/zh_HK/stripe.lang
+++ b/htdocs/langs/zh_HK/stripe.lang
@@ -41,7 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Example of credit card for a test payment: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
@@ -50,6 +51,7 @@ StripeAccount=Stripe account
 StripeChargeList=List of Stripe charges
 StripeTransactionList=List of Stripe transactions
 StripeCustomerId=Stripe customer id
+StripePaymentId=Stripe payment id
 StripePaymentModes=Stripe payment modes
 LocalID=Local ID
 StripeID=Stripe ID
@@ -61,6 +63,7 @@ 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
+CreateBANOnStripe=Create bank 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
@@ -68,4 +71,10 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe back office. You can click here to switch on Stripe customer record: %s
+STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
+TERMINAL_LOCATION=Location (address) for Stripe Terminals
+RequestDirectDebitWithStripe=Request Direct Debit with Stripe
+RequesCreditTransferWithStripe=Request Credit Transfer with Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
+StripeConnect_Mode=Stripe Connect mode
diff --git a/htdocs/langs/zh_HK/suppliers.lang b/htdocs/langs/zh_HK/suppliers.lang
index 5fffb9104a6..b79d6a98c69 100644
--- a/htdocs/langs/zh_HK/suppliers.lang
+++ b/htdocs/langs/zh_HK/suppliers.lang
@@ -32,7 +32,7 @@ ConfirmDenyingThisOrder=您確定要拒絕此訂單<b> %s </b> ？
 ConfirmCancelThisOrder=您確定要取消此訂單<b> %s </b> ？
 AddSupplierOrder=創建採購訂單
 AddSupplierInvoice=創建供應商發票
-ListOfSupplierProductForSupplier=供應商 <span class='notranslate'><b></span> 的產品和價格列表\n %s </b> 
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
 SentToSuppliers=發送給供應商
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
diff --git a/htdocs/langs/zh_HK/users.lang b/htdocs/langs/zh_HK/users.lang
index cb36598fc0d..303fe3d66ac 100644
--- a/htdocs/langs/zh_HK/users.lang
+++ b/htdocs/langs/zh_HK/users.lang
@@ -9,7 +9,7 @@ SendNewPassword=重新生成並發送密碼
 SendNewPasswordLink=Send link to reset password
 ReinitPassword=重新生成密碼
 PasswordChangedTo=密碼更改為：%s
-SubjectNewPassword=您的 <span class='notranslate'>%s</span> 的新密碼\n
+SubjectNewPassword=Your new password for %s
 GroupRights=組權限
 UserRights=用戶權限
 Credentials=Credentials
@@ -25,18 +25,17 @@ ConfirmDisableUser=您確定要禁用用戶<b> %s </b> ？
 ConfirmDeleteUser=您確定要刪除用戶<b> %s </b> ？
 ConfirmDeleteGroup=您確定要刪除群組<b> %s </b> ？
 ConfirmEnableUser=您確定要啟用用戶<b> %s </b> ？
-ConfirmReinitPassword=您確定要為用戶 <span class='notranslate'><b></span> 生成新密碼嗎\n %s </b> ？
-ConfirmSendNewPassword=您確定要為用戶 <span class='notranslate'><b></span> 生成並發送新密碼嗎\n %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=新用戶
 CreateUser=創建用戶
 LoginNotDefined=未定義登錄。
 NameNotDefined=名稱未定義。
 ListOfUsers=用戶列表
-SuperAdministrator=超級管理員
-SuperAdministratorDesc=全局管理員
-AdministratorDesc=行政人員
+SuperAdministrator=Multicompany Administrator
+SuperAdministratorDesc=Multicompany system administrator (can change setup and users)
 DefaultRights=默認權限
-DefaultRightsDesc=在此定義 <u> 默認 </u>  自動授予 <span class='notranslate'><u></span> 的權限\n 新</u>  用戶（要修改現有用戶的權限，請轉到用戶卡）。
+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=多利巴爾用戶
 LastName=姓
 FirstName=名
@@ -46,7 +45,7 @@ CreateGroup=創建組
 RemoveFromGroup=從組中刪除
 PasswordChangedAndSentTo=密碼已更改並發送至 <b> %s </b> 。
 PasswordChangeRequest=Request to change password for <b>%s</b>
-PasswordChangeRequestSent=請求更改 <span class='notranslate'><b></span> 的密碼\n %s </b>  發送至 <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 (with a valid email), an email to reset password has been sent.
 IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent (remember to check your SPAM folder if you do not receive anything)
 ConfirmPasswordReset=Confirm password reset
@@ -81,7 +80,7 @@ UserWillBeInternalUser=創建的用戶將是內部用戶（因為未鏈接到特
 UserWillBeExternalUser=創建的用戶將是外部用戶（因為鏈接到特定的第三方）
 IdPhoneCaller=來電者身份
 NewUserCreated=用戶%s 已創建
-NewUserPassword=<span class='notranslate'>%s</span> 的密碼更改\n
+NewUserPassword=Password change for %s
 NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=用戶%s 修改的
 UserDisabled=用戶%s 殘疾人
@@ -110,8 +109,9 @@ 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
+UserLogoff=User logout: %s
+UserLogged=User logged: %s
+UserLoginFailed=User login failed: %s
 DateOfEmployment=Employment date
 DateEmployment=Employment
 DateEmploymentStart=Employment Start Date
@@ -120,10 +120,10 @@ 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.
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behavior.
 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
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he chose to see. To change the interface language visible by this user, go on tab %s
 DateLastLogin=Date last login
 DatePreviousLogin=Date previous login
 IPLastLogin=IP last login
@@ -132,3 +132,5 @@ ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
 UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
 EnablePublicVirtualCard=Enable the user's virtual business card
+UserEnabledDisabled=User status changed: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index 01ce5f781fc..c9f195b844c 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -32,7 +32,7 @@ InvoiceWaitingWithdraw=等待直接扣款的發票
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=提取金額
 AmountToTransfer=Amount to transfer
-NoInvoiceToWithdraw=沒有開具“<span class='notranslate'>%s</span>”的發票\n' 在等待。轉到選項卡“<span class='notranslate'>%s</span>”\n' 在發票卡上提出請求。
+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 '%s' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=用戶負責
 WithdrawalsSetup=直接借記付款設置
@@ -151,10 +151,10 @@ USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
 NoDefaultIBANFound=No default IBAN found for this third party
 ### Notifications
-InfoCreditSubject=直接借記付款訂單<span class='notranslate'>%s</span>的支付\n 由銀行
+InfoCreditSubject=Payment of direct debit payment order %s by the bank
 InfoCreditMessage=直接借記付款訂單%s 已由銀行付款<br> 付款數據：%s
 InfoTransSubject=傳輸直接借記付款訂單%s 到銀行
-InfoTransMessage=直接借記付款訂單%s 已由 <span class='notranslate'>%s</span> 發送至銀行\n %s。 <br>  <br> 
+InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
 InfoTransData=金額：%s <br> 方法：%s <br> 日期：%s
 InfoRejectSubject=直接借記付款訂單被拒絕
 InfoRejectMessage=你好，<br>  <br> 發票直接借記付款順序%s 與公司相關%s，數量為 %s 已被銀行拒絕。 <br>  <br> -- <br> %s
@@ -171,4 +171,3 @@ SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
 RefSalary=Salary
 NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
 SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
-
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 831fa690c91..df7d1255245 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -420,6 +420,8 @@ TotalTTCShort=總計（含稅）
 TotalHT=總計（不含稅）
 TotalHTforthispage=此頁總計（不含稅）
 Totalforthispage=此頁總計
+GrandTotal=Grand total
+TotalforAllPages=Total for all pages
 TotalTTC=金額總計(含稅)
 TotalTTCToYourCredit=信用總額度（含稅)
 TotalVAT=總稅金
@@ -647,6 +649,7 @@ ReportName=報表名稱
 ReportPeriod=報表期間
 ReportDescription=詳細描述
 Report=報表
+Reports=Reports
 Keyword=關鍵字
 Origin=原始
 Legend=舊有
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 478fa0a5b15..1074ccad2b8 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -117,7 +117,7 @@ class LangTest extends CommonClassTest
 
 			$result = $tmplangs->transnoentitiesnoconv("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertTrue(in_array($result, array('.',',','/',' ','','None')), 'Error on decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertTrue(in_array($result, array('.',',','/','。',' ','','None')), 'Error on decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			$result = $tmplangs->transnoentitiesnoconv("SeparatorThousand");
 			print __METHOD__." SeparatorThousand=".$result."\n";

From 4acf87f43d170e990e86bb47ee249bc0fdbb1cdf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 12:46:20 +0100
Subject: [PATCH 0041/1862] Fix warning

---
 test/phpunit/LangTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 1074ccad2b8..f7b43ddb6e3 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -165,13 +165,13 @@ class LangTest extends CommonClassTest
 				$reg = array();
 				$result = preg_match('/(.*)\'notranslate\'/im', $filecontent, $reg);	// A sequence of char we don't want
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
-				$this->assertTrue($result == 0, 'Found a sequence tag \'notranslate\' into the translation file '.$code.'/'.$file.' in line '.$reg[1]);
+				$this->assertTrue($result == 0, 'Found a sequence tag \'notranslate\' into the translation file '.$code.'/'.$file.' in line '.empty($reg[1]) ? '' : $reg[1]);
 
 				if (!in_array($code, array('ar_SA'))) {
 					$reg = array();
 					$result = preg_match('/(.*)<([^a-z\/\s,=\(]1)/im', $filecontent, $reg);	// A sequence of char we don't want
 					//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
-					$this->assertTrue($result == 0, 'Found a sequence tag <'.$reg[2].' into the translation file '.$code.'/'.$file.' in line '.$reg[1]);
+					$this->assertTrue($result == 0, 'Found a sequence tag <'.(empty($reg[2]) ? '': $reg[2]).' into the translation file '.$code.'/'.$file.' in line '.empty($reg[1]) ? '' : $reg[1]);
 				}
 			}
 		}

From ca7f06f7d375fe782d8043d77604a95e5af40756 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 13:53:51 +0100
Subject: [PATCH 0042/1862] Try to fix the "Return of error for #28319"

---
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php   | 2 +-
 htdocs/core/modules/product/doc/pdf_standard.modules.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 03b30d9c8ad..00c28594717 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -2046,7 +2046,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *  @param  int	    	$showaddress    0=no, 1=yes (usually set to 1 for first page, and 0 for next pages)
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
-	 *  @return	array							top shift of linked object lines
+	 *  @return	array						top shift of linked object lines
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index a89ab9fcbba..eba1ee529e0 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -703,11 +703,11 @@ class pdf_standard extends ModelePDFProduct
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param	string		$titlekey		Translation key to show as title of document
-	 *  @return	void
+	 *  @return	float|int                   Return topshift value
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
-		global $conf, $langs;
+		global $conf;
 
 		$ltrdirection = 'L';
 		if ($outputlangs->trans("DIRECTION") == 'rtl') {

From af01b3d73ac748402f539d6345e6c4117296c490 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 13:57:05 +0100
Subject: [PATCH 0043/1862] Qual: Re-enable open_basedir restriction in tests
 (#28315)

* Fix: Workaround for false security issue in tests

# Fix: Workaround for false security issue in tests

This is a quick workaround for the false security issues in tests
by setting the ['SELF'] variable to something that is
considered harmless

* Update windows-ci workflow

# Update windows-ci workflow

- Setup_conf.sh - Added caching feature;
- phpunit.bat - Example updated based on experience with php web server
- Provide dolibarr.log and phpunit output as artefacts.
- Convert PHPUNIT log to Github Annotations
- Setup php web server for API tests
- Enable caching sql initialisation

* Qual: Re-enable open_basedir restriction in tests

# Qual: Re-enable open_basedir restriction in tests

Using open_basedir restriction is closer to the production reality
and seemed to generate some issues on a windows development machine.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .github/workflows/windows-ci.yaml | 197 +++++++++++++++++++-----------
 test/phpunit/AllTests.php         |   4 +
 2 files changed, 127 insertions(+), 74 deletions(-)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index 50122652824..178fcf807c8 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -2,23 +2,28 @@
 name: Win CI
 on:
   push:
-    # branches:
-    #  - main
   pull_request:
-    # branches:
-    #  - main
   workflow_dispatch:
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  PHPUNIT_LOG: phpunit_tests.log
+  DOLIBARR_LOG: documents/dolibarr.log
+  PHPSERVER_LOG: phpserver.log
+  PHPSERVER_DOMAIN_PORT: 127.0.0.1:8000 # could be 127.0.0.1:8000 if config modified
+  CACHE_KEY_PART: ${{ ( github.event_name == 'pull_request' ) && github.base_ref }}${{ ( github.event_name == 'pull_request' ) && '-' }}${{ github.head_ref }}
+  PHP_INI_SCAN_DIR: "C:\\myphpini"
+  CKEY: win-ci-2
 
 jobs:
-  test:
+  win-test:
     strategy:
       matrix:
         os: [windows-latest]
-        #php_version: [7.4, 8.0] # Add more versions if needed
+        # php_version: [7.4, 8.0]  # Add more versions if needed
         php_version: [7.4] # Add more versions if needed
     runs-on: ${{ matrix.os }}
     steps:
@@ -47,82 +52,126 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # phpts: ts  # ts for thread-safe, default nts
 
-      - name: Get composer cache directory
-        id: composer-cache
-        if: false
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        if: false
+      # Restore cache
+      - name: Restore cache
+        id: cache
+        uses: actions/cache/restore@v4
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
+          path: |
+            db_init.sql
+            db_init.sql.md5
+          key: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ env.CACHE_KEY_PART }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ env.CACHE_KEY_PART }}-
+            ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ github.head_ref }}-
+            ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ github.base_ref }}-
+            ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-
 
-      - name: Install Composer dependencies
-        if: false
-        run: |
-          composer -n config -g vendor-dir htdocs/includes
-          # composer self-update 2.4.4
-          composer -n require \
-                        php-parallel-lint/php-parallel-lint ^1.2 \
-                        php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4
-          # which phpunit phpcs php-parallel-lint
-      - run: |
-          where php
-          php -v
-          php -r 'phpinfo();'
-          echo ok
-
-      - name: "Windows: Cygwin download"
-        if: false && runner.os == 'Windows'
-        run: |
-          Invoke-WebRequest 'https://cygwin.com/setup-x86_64.exe' -OutFile 'setup-x86_64.exe'
-
-      - name: "Windows: Cygwin setup"
-        if: false && runner.os == 'Windows'
+      - name: Create local php.ini
         shell: cmd
-        #run: .\setup-x86_64.exe --quiet-mode --site http://cygwin.mirror.constant.com --symlink-type=sys --packages mingw64-i686-binutils=2.37-2,mingw64-x86_64-binutils=2.37-2,curl,diffutils,git,m4,make,mercurial,mingw64-i686-gcc-core,mingw64-i686-gcc-g++,mingw64-x86_64-gcc-core,mingw64-x86_64-gcc-g++,patch,perl,rsync,unzip
-        run: .\setup-x86_64.exe --quiet-mode --site http://cygwin.mirror.constant.com --symlink-type=sys --packages sed
-
-      - name: Setup MSYS (provides 'bash' and other unix-tools on windows)
-        uses: msys2/setup-msys2@v2
         if: false
-        with:
-          path-type: inherit
-          cache: true
-          release: false
-          msystem: UCRT64
-          update: false
-          install: git mingw-w64-ucrt-x86_64-gcc
+        # Note: Setting the basedir before initialising the database results in open_basedir errors
+        # Objective: separate step, and before database initialisation to verify open_basedir restrictions
+        run: |-
+          ECHO "==== Show INI file usage before our configuration ==="
+          php --ini
+          ECHO "==== Set PHP_INI_SCAN_DIR to include the INI File we create ==="
+          mkdir %PHP_INI_SCAN_DIR%
+          SET INIFILE="%PHP_INI_SCAN_DIR%\dolibarr.ini"
+          SET HTDOCS_DIR=%CD%\htdocs
+          SET DATA_DIR=%CD%\documents
+          SET TEST_DIR=%CD%\test
+          SET INITDEMO_DIR=%CD%\dev\initdemo
+          ECHO "==== Create INI file to set open_basedir ==="
+          echo [php] > %INIFILE%
+          echo open_basedir^="%HTDOCS_DIR%;%DATA_DIR%;%TEST_DIR%;%INITDEMO_DIR%;%PHPROOT%" >> %INIFILE%
+          ECHO "==== Show contents of INI file to set open_basedir ==="
+          type %INIFILE%
+          REM Next line disables open_basedir limitation (to limit errors)
+          SET PHP_INI_SCAN_DIR=
+          ECHO "==== Verify it is used by PHP ==="
+          php --ini
 
       - name: Run Bash script
-        # shell: msys2 {0}
+        # Note this is bash (MSYS) on Windows
         shell: bash
+        # Note: Initialise the database (possibly from cache) and set some variables.
         run: |
-          # Replace the following commands with your bash script commands
-          # Example:
-          # ./script.sh arg1 arg2
-          # would be
-          # bash script.sh arg1 arg2
-          # env
-          php -r 'phpinfo();'
+          # Check if database cache is present (visually, to remove once ok)
+          ls -l
+          # Run bash script to initialise database
           ${SHELL} -xv dev/setup/phpunit/setup_conf.sh
           sed -i -e 's/stopOnFailure="[^"]*"/stopOnFailure="false"/' test/phpunit/phpunittest.xml
+          # Check if database cache is present after the script (visually, to remove once ok)
+          ls -l
+          echo "TEE=$(cygpath -w "$(which tee)")" >> "$GITHUB_ENV"
+          echo "BASEDIR=$(realpath .)" >> "$GITHUB_ENV"
+
+      - name: Start web server
+        id: server
+        if: false
+        # Objective: Start php server in separate step (but after open_basedir restriction setup!)
+        run: |
+          Start-Process -FilePath "php.exe" -WindowStyle Hidden -ArgumentList "-S ${{ env.PHPSERVER_DOMAIN_PORT }} -t htdocs > ${{ env.PHPSERVER_LOG }}" -PassThru
+          curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
+        shell: powershell
 
       - name: Run PHPUnit tests
-        shell: cmd
-        run: |-
-          php --ini
-          REM TODO Uncomment next line to restrict directory access
-          REM SET PHP_INI_SCAN_DIR=C:\myphpini
-          SET INIFILE="C:\myphpini\dolibarr.ini"
-          mkdir c:\myphpini
-          echo [php] > %INIFILE%
-          echo open_basedir^="%CD%;%PHPROOT%" >> %INIFILE%
-          type %INIFILE%
-          php --ini
-          php "%PHPROOT%\phpunit" -d memory_limit=-1 -c "test\phpunit\phpunittest.xml" "test\phpunit\AllTests.php"
         continue-on-error: true
+        shell: cmd
+        # setting up php.ini, starting the php server are currently in this step
+        run: |-
+          echo "BASEDIR=%CD%" >> %GITHUB_ENV%
+          start /B php -S %PHPSERVER_DOMAIN_PORT% -t htdocs >> %PHPSERVER_LOG% 2>&1
+          curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
+          ECHO "==== Show INI file usage before our configuration ==="
+          php --ini
+          ECHO "==== Set PHP_INI_SCAN_DIR to include the INI File we create ==="
+          mkdir %PHP_INI_SCAN_DIR%
+          SET INIFILE="%PHP_INI_SCAN_DIR%\dolibarr.ini"
+          SET HTDOCS_DIR=%CD%\htdocs
+          SET DATA_DIR=%CD%\documents
+          SET TEST_DIR=%CD%\test
+          SET INITDEMO_DIR=%CD%\dev\initdemo
+          ECHO "==== Create INI file to set open_basedir ==="
+          echo [php] > %INIFILE%
+          echo open_basedir^="%HTDOCS_DIR%;%DATA_DIR%;%TEST_DIR%;%INITDEMO_DIR%;%PHPROOT%" >> %INIFILE%
+          REM Unset PHP_INI_SCAN_DIR to disable open_basedir restritions (to limit debug effort)
+          REM SET PHP_INI_SCAN_DIR=
+          ECHO "==== Show contents of INI file to set open_basedir ==="
+          type %INIFILE%
+          ECHO "==== Verify it is used by PHP ==="
+          php --ini
+          echo $dolibarr_main_url_root="http://${{ env.PHPSERVER_DOMAIN_PORT }}"; >> htdocs/conf/conf.php
+          cat htdocs/conf/conf.php
+          curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
+          REM 'DOSKEY' USED to recover error code (no pipefile equivalent in windows?)
+          ( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
+          for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
+
+      - name: Convert Raw Log to Annotations
+        uses: mdeweerd/logToCheckStyle@v2024.2.9
+        if: ${{ failure() }}
+        with:
+          in: ${{ env.PHPUNIT_LOG }}
+
+      - name: Provide dolibarr and phpunit logs as artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ ! cancelled() }}
+        with:
+          name: win-ci-logs
+          path: |
+            ${{ env.PHPUNIT_LOG }}
+            ${{ env.DOLIBARR_LOG }}
+            ${{ env.PHPSERVER_LOG }}
+            db_init.sql
+            db_init.sql.md5
+          retention-days: 2
+
+      # Save cache
+      - name: "Save cache"
+        uses: actions/cache/save@v4
+        if: ${{ ! cancelled() }}
+        with:
+          key: ${{ steps.cache.outputs.cache-primary-key }}
+          path: db_init.*
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index af8a65784c0..9848ac2185e 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2012  Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -26,6 +27,9 @@
 print "PHP Version: ".phpversion()."\n";
 print "Memory limit: ". ini_get('memory_limit')."\n";
 
+// Workaround for false security issue with main.inc.php in tests:
+$_SERVER['PHP_SELF'] = "phpunit";
+
 global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';

From 37a31f75b747e09987bae69c7feae0313e14fadf Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 21 Feb 2024 13:59:41 +0100
Subject: [PATCH 0044/1862] Qual clean dolresource class (#28308)

* Use address, town, zip & email from CommonPeople

* Use element & table_element from CommonObject

* Updated PHPDoc

* Deleted unused properties

* Revert "Use element & table_element from CommonObject"

This reverts commit 88a06164d1c96994b259729885f267ee66434b79.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/commonpeople.class.php    |  2 +-
 htdocs/resource/class/dolresource.class.php | 30 ---------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/htdocs/core/class/commonpeople.class.php b/htdocs/core/class/commonpeople.class.php
index 7dce8b3c4dc..b9eb041712d 100644
--- a/htdocs/core/class/commonpeople.class.php
+++ b/htdocs/core/class/commonpeople.class.php
@@ -24,7 +24,7 @@
 
 
 /**
- *      Superclass for thirdparties, contacts, members or users
+ *      Support class for thirdparties, contacts, members, users or resources
  */
 trait CommonPeople
 {
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 802162fb6a7..38a880f1d6c 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -48,31 +48,6 @@ class Dolresource extends CommonObject
 	 */
 	public $picto = 'resource';
 
-	/**
-	 * @var string address variables
-	 */
-	public $address;
-
-	/**
-	 * @var string zip of town
-	 */
-	public $zip;
-
-	/**
-	 * @var string town
-	 */
-	public $town;
-
-	/**
-	 * @var int ID country
-	 */
-	public $fk_country;
-
-	/**
-	 * @var int ID state
-	 */
-	public $fk_state;
-
 	/**
 	 * @var string description
 	 */
@@ -83,11 +58,6 @@ class Dolresource extends CommonObject
 	 */
 	public $phone;
 
-	/**
-	 * @var string email address
-	 */
-	public $email;
-
 	/**
 	 * @var int Maximum users
 	 */

From a732e72be04ed993278154325afcfb72207ba57e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 14:41:13 +0100
Subject: [PATCH 0045/1862] Fix apstats

---
 dev/tools/apstats.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 4fb20de6c66..608dc2e57a3 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -663,11 +663,11 @@ if (!empty($output_arrtd)) {
 			} else {
 				$tmp .= '<tr class="hidden sourcephpstan">';
 			}
-			$tmp .= '<td>'.dolPrintLabel($reg[1]).'</td>';
+			$tmp .= '<td>'.dolPrintHTML($reg[1]).'</td>';
 			$tmp .= '<td class="">';
-			$tmp .= '<a href="'.dol_escape_htmltag($urlgit.$reg[1].'#L'.$reg[2]).'" target="_blank">'.dolPrintLabel($reg[2]).'</a>';
+			$tmp .= '<a href="'.($urlgit.$reg[1].'#L'.$reg[2]).'" target="_blank">'.dolPrintHTML($reg[2]).'</a>';
 			$tmp .= '</td>';
-			$tmp .= '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($reg[4]).'">'.dolPrintLabel($reg[4]).'</td>';
+			$tmp .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($reg[4]).'">'.dolPrintHTML($reg[4]).'</td>';
 			$tmp .= '</tr>'."\n";
 			$nblines++;
 		}
@@ -699,11 +699,11 @@ if (count($output_phan_json) != 0) {
 			} else {
 				$tmp = '<tr class="hidden sourcephan">';
 			}
-			$tmp .= '<td>'.dolPrintLabel($path).'</td>';
+			$tmp .= '<td>'.dolPrintHTML($path).'</td>';
 			$tmp .= '<td class="">';
 			$tmp .= '<a href="'.$code_url_attr.'" target="_blank">'.$line_range_txt.'</a>';
 			$tmp .= '</td>';
-			$tmp .= '<td class="tdoverflowmax300">'.dolPrintLabel($notice['description']).'</td>';
+			$tmp .= '<td class="tdoverflowmax300">'.dolPrintHTML($notice['description']).'</td>';
 			$tmp .= '</tr>';
 
 			$phan_items[] = $tmp;

From 85ed3ad6d0d36ddf75671eb500bb1c779f25113a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 14:51:44 +0100
Subject: [PATCH 0046/1862] restore dolPrintLabel()

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8ba1c90c7d5..0c4756b8cc7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1669,7 +1669,19 @@ function dol_escape_php($stringtoescape, $stringforquotes = 2)
 }
 
 /**
- * Return a string ready to be output on a HTML page.
+ * Return a string label (so on 1 line only and that should not contains any HTML) ready to be output on HTML page
+ * To use text that is not HTML content inside an attribute, use can simply only dol_escape_htmltag(). In doubt, use dolPrintHTMLForAttribute().
+ *
+ * @param	string	$s		String to print
+ * @return	string			String ready for HTML output
+ */
+function dolPrintLabel($s)
+{
+	return dol_escape_htmltag(dol_string_nohtmltag($s, 1, 'UTF-8', 0, 0), 0, 0, '', 0, 1);
+}
+
+/**
+ * Return a string (that can be on several lines) ready to be output on a HTML page.
  * To output a text inside an attribute, you can use dolPrintHTMLForAttribute() or dolPrintHTMLForTextArea() inside a textarea
  *
  * @param	string	$s				String to print

From 4a68630fbaf5e4cd74baf2aa88408b7546772dac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 14:55:44 +0100
Subject: [PATCH 0047/1862] Clean exakat

---
 .github/workflows/exakat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
index 16e87acd81a..3b1b2f656e0 100644
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Exakat
       uses: docker://exakat/exakat-ga
       with:
-        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
+        ignore_rules: 'Classes/UseInstanceof,Constants/ConstantStrangeNames,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
         ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/'
         file_extensions: php
         project_reports: Perfile

From f01fa6e098574ef5d7b3880e530be3ebc122b385 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 15:00:14 +0100
Subject: [PATCH 0048/1862] Fix datatable

---
 dev/tools/apstats.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 608dc2e57a3..44283bbc226 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -772,7 +772,11 @@ $html .= '</section>';
 if ($nblines != 0) {
 	$datatable_script .= '
  if (typeof(DataTable)==="function") {jQuery(".sourcephpstan").toggle(true);}
- let phpstantable = new DataTable("#technicaldebt table");
+ let phpstantable = new DataTable("#technicaldebt table", {
+    lengthMenu: [
+        [10, 25, 50, 100, -1],
+        [10, 25, 50, 100, \'All\']
+    ]});
 ';
 	$html .= '<section class="chapter" id="technicaldebt">'."\n";
 	$html .= '<h2><span class="fas fa-book-dead pictofixedwidth"></span>Technical debt <span class="opacitymedium">(PHPStan level '.$phpstanlevel.' -> '.$nblines.' warnings)</span></h2>'."\n";
@@ -783,7 +787,8 @@ if ($nblines != 0) {
 	$html .= '<thead><tr class="trgroup"><td>File</td><td>Line</td><td>Type</td></tr></thead><tbody>'."\n";
 	$html .= $tmp;
 	$html .= '<tbody></table>';
-	$html .= '<div><span class="seedetail" data-source="phpstan" id="sourcephpstan">Show all...</span></div>';
+	// Disabled, no more required as list is managed with datatable
+	//$html .= '<div><span class="seedetail" data-source="phpstan" id="sourcephpstan">Show all...</span></div>';
 	$html .= '</div></div>';
 
 	$html .= '</section>'."\n";

From 9bccfd95c9a4066190185889d0513dbb56f273f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 16:02:21 +0100
Subject: [PATCH 0049/1862] FIX bankaccount address not visible in view mode

---
 htdocs/compta/bank/card.php                | 30 +++++++++---------
 htdocs/compta/bank/class/account.class.php | 36 +++++++++++++++++++++-
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 54cd804d72e..3e447de7ea6 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -139,10 +139,10 @@ if (empty($reshook)) {
 		$object->cle_rib = trim(GETPOST("cle_rib"));
 		$object->bic = trim(GETPOST("bic"));
 		$object->iban = trim(GETPOST("iban"));
-		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
+		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 		$object->owner_zip = trim(GETPOST("owner_zip", 'alphanohtml'));
 		$object->owner_town = trim(GETPOST("owner_town", 'alphanohtml'));
@@ -252,7 +252,6 @@ if (empty($reshook)) {
 		$object->cle_rib = trim(GETPOST("cle_rib"));
 		$object->bic = trim(GETPOST("bic"));
 		$object->iban = trim(GETPOST("iban"));
-		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
@@ -279,6 +278,7 @@ if (empty($reshook)) {
 
 		$object->currency_code = trim(GETPOST("account_currency_code"));
 
+		$object->address = trim(GETPOST("account_address", "alphanohtml"));
 		$object->state_id = GETPOSTINT("account_state_id");
 		$object->country_id = GETPOSTINT("account_country_id");
 
@@ -462,8 +462,8 @@ if ($action == 'create') {
 	$type = (GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT); // add default value
 	if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-		print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
-		print(GETPOSTISSET('domiciliation') ? GETPOST('domiciliation') : $object->domiciliation);
+		print '<textarea class="flat quatrevingtpercent" name="account_address" rows="'.ROWS_2.'">';
+		print(GETPOSTISSET('account_address') ? GETPOST('account_address') : $object->address);
 		print "</textarea></td></tr>";
 	}
 
@@ -681,7 +681,6 @@ if ($action == 'create') {
 		$morehtmlref = '';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
@@ -848,7 +847,7 @@ if ($action == 'create') {
 			}
 
 			print '<tr><td>'.$langs->trans("BankAccountOwner").'</td><td>';
-			print $object->proprio;
+			print dol_escape_htmltag($object->proprio);
 			print "</td></tr>\n";
 
 			print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
@@ -856,11 +855,11 @@ if ($action == 'create') {
 			print "</td></tr>\n";
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerZip").'</td>';
-			print '<td>'.$object->owner_zip;
+			print '<td>'.dol_escape_htmltag($object->owner_zip);
 			print '</td></tr>';
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerTown").'</td>';
-			print '<td>'.$object->owner_town;
+			print '<td>'.dol_escape_htmltag($object->owner_town);
 			print '</td></tr>';
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerCountry").'</td>';
@@ -1003,8 +1002,8 @@ if ($action == 'create') {
 		$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type); // add default current value
 		if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
-			print $object->domiciliation;
+			print '<textarea class="flat quatrevingtpercent" name="account_address" rows="'.ROWS_2.'">';
+			print $object->address;
 			print "</textarea></td></tr>";
 		}
 
@@ -1183,16 +1182,17 @@ if ($action == 'create') {
 				}
 			}
 
-			print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-			print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="proprio" value="'.$object->proprio.'"></td>';
-			print '</tr>';
-
 			print '</table>';
+
 			print '<hr>';
 
 			print '<table class="border centpercent">';
 
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+			print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+			print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="proprio" value="'.$object->proprio.'"></td>';
+			print '</tr>';
+
+			print '<tr><td class="titlefieldcreate tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="owner_address" rows="'.ROWS_2.'">';
 			print $object->owner_address;
 			print "</textarea></td></tr>";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c24a5ab2231..21f943c9c88 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -190,6 +190,7 @@ class Account extends CommonObject
 	public $state_id;
 	public $state_code;
 	public $state;
+	public $country_id;
 
 	/**
 	 * Variable containing all account types with their respective translated label.
@@ -1636,6 +1637,40 @@ class Account extends CommonObject
 		return '';
 	}
 
+	/**
+	 * 	Return full address for banner
+	 *
+	 * 	@param		string		$htmlkey            HTML id to make banner content unique
+	 *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)
+	 *	@return		string							Full address string
+	 */
+	public function getBannerAddress($htmlkey, $object)
+	{
+		global $conf, $langs;
+
+		$out = '';
+
+		$outdone = 0;
+		$coords = $this->getFullAddress(1, ', ', getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT'));
+		if ($coords) {
+			if (!empty($conf->use_javascript_ajax)) {
+				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($coords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+				$out .= img_picto($langs->trans("Address"), 'map-marker-alt');
+				$out .= '</a> ';
+			}
+			$address = dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
+			if ($address) {
+				$out .= $address;
+				$outdone++;
+			}
+			$outdone++;
+		}
+
+		return $out;
+	}
+
+
 	/**
 	 * Return if a bank account is defined with detailed information (bank code, desk code, number and key).
 	 * More information on codes used by countries on page http://en.wikipedia.org/wiki/Bank_code
@@ -2739,7 +2774,6 @@ class AccountLine extends CommonObjectLine
 		return '';
 	}
 
-
 	/**
 	 *	Return if a bank line was dispatched into bookkeeping
 	 *

From 5e322d2807cc0c5168847ed24c1293cec953b870 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 16:02:31 +0100
Subject: [PATCH 0050/1862] Fix phpstan

---
 htdocs/core/lib/functions.lib.php                         | 1 -
 htdocs/expensereport/class/api_expensereports.class.php   | 2 +-
 htdocs/expensereport/class/paymentexpensereport.class.php | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0c4756b8cc7..f02017700e3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2686,7 +2686,6 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			$morehtmlref .= '<div class="refidno opacitymedium">'.$object->label.'</div>';
 		}
 	}
-
 	// Show address and email
 	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
 		$moreaddress = $object->getBannerAddress('refaddress', $object);	// address, email, url, social networks
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index a671b6ecdae..cfa8ecfb6df 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -632,7 +632,7 @@ class ExpenseReports extends DolibarrApi
 			$paymentExpenseReport->$field = $this->_checkValForAPI($field, $value, $paymentExpenseReport);
 		}
 
-		if ($paymentExpenseReport->create(DolibarrApiAccess::$user, 1) < 0) {
+		if ($paymentExpenseReport->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error creating paymentExpenseReport', array_merge(array($paymentExpenseReport->error), $paymentExpenseReport->errors));
 		}
 		if (isModEnabled("banque")) {
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 0f9f709bae9..0bcb616ba36 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -124,8 +124,6 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function create($user)
 	{
-		global $conf, $langs;
-
 		$error = 0;
 
 		$now = dol_now();

From bcd5baa62ecf50fc17c3d93b87c9e36672e5d65b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 16:02:21 +0100
Subject: [PATCH 0051/1862] Merge branch '19.0' of
 git@github.com:Dolibarr/dolibarr.git into 19.0

---
 htdocs/compta/bank/card.php                | 34 ++++++++++----------
 htdocs/compta/bank/class/account.class.php | 36 +++++++++++++++++++++-
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index dfe4b572fea..2d2470ea4c1 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -139,10 +139,10 @@ if (empty($reshook)) {
 		$object->cle_rib = trim(GETPOST("cle_rib"));
 		$object->bic = trim(GETPOST("bic"));
 		$object->iban = trim(GETPOST("iban"));
-		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
+		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 		$object->owner_zip = trim(GETPOST("owner_zip", 'alphanohtml'));
 		$object->owner_town = trim(GETPOST("owner_town", 'alphanohtml'));
@@ -252,7 +252,6 @@ if (empty($reshook)) {
 		$object->cle_rib = trim(GETPOST("cle_rib"));
 		$object->bic = trim(GETPOST("bic"));
 		$object->iban = trim(GETPOST("iban"));
-		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
@@ -279,8 +278,9 @@ if (empty($reshook)) {
 
 		$object->currency_code = trim(GETPOST("account_currency_code"));
 
-		$object->state_id = GETPOST("account_state_id", 'int');
-		$object->country_id = GETPOST("account_country_id", 'int');
+		$object->address = trim(GETPOST("account_address", "alphanohtml"));
+		$object->state_id = GETPOSTINT("account_state_id");
+		$object->country_id = GETPOSTINT("account_country_id");
 
 		$object->min_allowed = GETPOST("account_min_allowed", 'int');
 		$object->min_desired = GETPOST("account_min_desired", 'int');
@@ -462,8 +462,8 @@ if ($action == 'create') {
 	$type = (GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT); // add default value
 	if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-		print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
-		print(GETPOSTISSET('domiciliation') ? GETPOST('domiciliation') : $object->domiciliation);
+		print '<textarea class="flat quatrevingtpercent" name="account_address" rows="'.ROWS_2.'">';
+		print(GETPOSTISSET('account_address') ? GETPOST('account_address') : $object->address);
 		print "</textarea></td></tr>";
 	}
 
@@ -681,7 +681,6 @@ if ($action == 'create') {
 		$morehtmlref = '';
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
@@ -848,7 +847,7 @@ if ($action == 'create') {
 			}
 
 			print '<tr><td>'.$langs->trans("BankAccountOwner").'</td><td>';
-			print $object->proprio;
+			print dol_escape_htmltag($object->proprio);
 			print "</td></tr>\n";
 
 			print '<tr><td>'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
@@ -856,11 +855,11 @@ if ($action == 'create') {
 			print "</td></tr>\n";
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerZip").'</td>';
-			print '<td>'.$object->owner_zip;
+			print '<td>'.dol_escape_htmltag($object->owner_zip);
 			print '</td></tr>';
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerTown").'</td>';
-			print '<td>'.$object->owner_town;
+			print '<td>'.dol_escape_htmltag($object->owner_town);
 			print '</td></tr>';
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerCountry").'</td>';
@@ -1003,8 +1002,8 @@ if ($action == 'create') {
 		$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type); // add default current value
 		if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-			print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
-			print $object->domiciliation;
+			print '<textarea class="flat quatrevingtpercent" name="account_address" rows="'.ROWS_2.'">';
+			print $object->address;
 			print "</textarea></td></tr>";
 		}
 
@@ -1183,16 +1182,17 @@ if ($action == 'create') {
 				}
 			}
 
-			print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-			print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="proprio" value="'.$object->proprio.'"></td>';
-			print '</tr>';
-
 			print '</table>';
+
 			print '<hr>';
 
 			print '<table class="border centpercent">';
 
-			print '<tr><td class="titlefieldcreate">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
+			print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+			print '<td><input class="maxwidth200onsmartphone" type="text" class="flat" name="proprio" value="'.$object->proprio.'"></td>';
+			print '</tr>';
+
+			print '<tr><td class="titlefieldcreate tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="owner_address" rows="'.ROWS_2.'">';
 			print $object->owner_address;
 			print "</textarea></td></tr>";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index ff7293f0de4..add7a65b557 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -184,6 +184,7 @@ class Account extends CommonObject
 	public $state_id;
 	public $state_code;
 	public $state;
+	public $country_id;
 
 	/**
 	 * Variable containing all account types with their respective translated label.
@@ -1633,6 +1634,40 @@ class Account extends CommonObject
 		return '';
 	}
 
+	/**
+	 * 	Return full address for banner
+	 *
+	 * 	@param		string		$htmlkey            HTML id to make banner content unique
+	 *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)
+	 *	@return		string							Full address string
+	 */
+	public function getBannerAddress($htmlkey, $object)
+	{
+		global $conf, $langs;
+
+		$out = '';
+
+		$outdone = 0;
+		$coords = $this->getFullAddress(1, ', ', getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT'));
+		if ($coords) {
+			if (!empty($conf->use_javascript_ajax)) {
+				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($coords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+				$out .= img_picto($langs->trans("Address"), 'map-marker-alt');
+				$out .= '</a> ';
+			}
+			$address = dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
+			if ($address) {
+				$out .= $address;
+				$outdone++;
+			}
+			$outdone++;
+		}
+
+		return $out;
+	}
+
+
 	/**
 	 * Return if a bank account is defined with detailed information (bank code, desk code, number and key).
 	 * More information on codes used by countries on page http://en.wikipedia.org/wiki/Bank_code
@@ -2684,7 +2719,6 @@ class AccountLine extends CommonObjectLine
 		return '';
 	}
 
-
 	/**
 	 *	Return if a bank line was dispatched into bookkeeping
 	 *

From b6d0e1d21e0757e6c7f92b45ddb56ab701244677 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 16:09:03 +0100
Subject: [PATCH 0052/1862] Fix phpstan

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

diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 5f5adddad8c..a54f14dd4eb 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -418,7 +418,7 @@ class doc_generic_member_odt extends ModelePDFMember
 	/**
 	 * get substitution array for object
 	 *
-	 * @param Adherent      $object         member
+	 * @param CommonObject  $object         member
 	 * @param Translate     $outputlangs    translation object
 	 * @param string        $array_key      key for array
 	 * @return array                        array of substitutions

From de789e03df9242f830121c727e2207c6574ccaa5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 16:43:41 +0100
Subject: [PATCH 0053/1862] QUAL Deprecated "domiciliation". Replaced with
 "address"

---
 htdocs/compta/bank/card.php                   |  4 +-
 htdocs/compta/bank/class/account.class.php    |  5 +-
 .../class/bonprelevement.class.php            |  8 +--
 htdocs/core/boxes/box_comptes.php             |  9 +--
 htdocs/core/lib/pdf.lib.php                   |  6 +-
 .../societe/class/api_thirdparties.class.php  |  2 +-
 .../class/companybankaccount.class.php        | 63 ++++++++++++-------
 htdocs/societe/paymentmodes.php               | 18 ++++--
 htdocs/user/bank.php                          | 10 +--
 htdocs/user/class/userbankaccount.class.php   | 11 ++--
 10 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3e447de7ea6..4398be3467e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -141,8 +141,10 @@ if (empty($reshook)) {
 		$object->iban = trim(GETPOST("iban"));
 		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
+		$object->domiciliation = trim(GETPOST("account_address", "alphanohtml"));	// deprecated
+		$object->address = trim(GETPOST("account_address", "alphanohtml"));
+
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
-		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
 		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 		$object->owner_zip = trim(GETPOST("owner_zip", 'alphanohtml'));
 		$object->owner_town = trim(GETPOST("owner_town", 'alphanohtml'));
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 21f943c9c88..b141de263f1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1859,7 +1859,6 @@ class Account extends CommonObject
 		$this->specimen        = 1;
 		$this->ref             = 'MBA';
 		$this->label           = 'My Big Company Bank account';
-		$this->bank            = 'MyBank';
 		$this->courant         = Account::TYPE_CURRENT;
 		$this->clos            = Account::STATUS_OPEN;
 		$this->code_banque     = '30001';
@@ -1868,7 +1867,9 @@ class Account extends CommonObject
 		$this->cle_rib         = '85';
 		$this->bic             = 'AA12';
 		$this->iban            = 'FR7630001007941234567890185';
-		$this->domiciliation   = 'Banque de France';
+
+		$this->bank            = 'MyBank';
+		$this->address         = 'Rue de Paris';
 		$this->proprio         = 'Owner';
 		$this->owner_address   = 'Owner address';
 		$this->owner_zip       = 'Owner zip';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 10b7335522f..2cddd94f5c8 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2057,7 +2057,7 @@ class BonPrelevement extends CommonObject
 	 *	@param	float	$amount			amount
 	 *	@param	string	$ref		ref of invoice
 	 *	@param	int		$facid			id of invoice
-	 *  @param	string	$rib_dom		rib domiciliation
+	 *  @param	string	$rib_dom		bank address
 	 *  @param	string	$type			'direct-debit' or 'bank-transfer'
 	 *	@return	void
 	 *  @see EnregDestinataireSEPA()
@@ -2082,9 +2082,9 @@ class BonPrelevement extends CommonObject
 
 		fwrite($this->file, substr(strtoupper($client_nom)."                         ", 0, 24));
 
-		// Domiciliation facultative D1
-		$domiciliation = strtr($rib_dom, array(" " => "-", chr(13) => " ", chr(10) => ""));
-		fwrite($this->file, substr($domiciliation."                         ", 0, 24));
+		// Address optional D1
+		$address = strtr($rib_dom, array(" " => "-", chr(13) => " ", chr(10) => ""));
+		fwrite($this->file, substr($address."                         ", 0, 24));
 
 		// Zone Reservee D2
 
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 045ffec244b..046ce9034b0 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -76,22 +76,23 @@ class box_comptes extends ModeleBoxes
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
 		if ($user->hasRight('banque', 'lire')) {
-			$sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
+			$sql = "SELECT b.rowid, b.ref, b.label, b.bank, b.number, b.courant, b.clos, b.rappro, b.url";
 			$sql .= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
-			$sql .= ", b.domiciliation, b.proprio, b.owner_address";
+			$sql .= ", b.domiciliation as address, b.proprio, b.owner_address";
 			$sql .= ", b.account_number, b.currency_code";
 			$sql .= ", b.min_allowed, b.min_desired, comment";
 			$sql .= ', b.fk_accountancy_journal';
 			$sql .= ', aj.code as accountancy_journal';
 			$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
-			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid = b.fk_accountancy_journal';
 			$sql .= " WHERE b.entity = ".$conf->entity;
 			$sql .= " AND clos = 0";
-			//$sql.= " AND courant = 1";
 			$sql .= " ORDER BY label";
+
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+
 			$result = $this->db->query($sql);
 			if ($result) {
 				$num = $this->db->num_rows($result);
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 44f2d7e02eb..cf170a77c75 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -829,7 +829,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
  *  @param  int			$curx            		X
  *  @param  int			$cury            		Y
  *  @param  Account		$account         		Bank account object
- *  @param  int			$onlynumber      		Output only number (bank+desk+key+number according to country, but without name of bank and domiciliation)
+ *  @param  int			$onlynumber      		Output only number (bank+desk+key+number according to country, but without name of bank and address)
  *  @param	int			$default_font_size		Default font size
  *  @return	float                               The Y PDF position
  */
@@ -942,9 +942,9 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 	$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 
-	if (empty($onlynumber) && !empty($account->domiciliation)) {
+	if (empty($onlynumber) && (!empty($account->domiciliation) || !empty($account->address))) {
 		$pdf->SetXY($curx, $cury);
-		$val = $outputlangs->transnoentities("Residence").': '.$outputlangs->convToOutputCharset($account->domiciliation);
+		$val = $outputlangs->transnoentities("Residence").': '.$outputlangs->convToOutputCharset(empty($account->address) ? $account->domiciliation : $account->address);
 		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
 		//$nboflines=dol_nboflines_bis($val,120);
 		//$cury+=($nboflines*3)+2;
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index b0c101796f0..b7273e7fe6b 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1095,7 +1095,7 @@ class Thirdparties extends DolibarrApi
 		 * We select all the records that match the socid
 		 */
 
-		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation as address, proprio,";
 		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
 		if ($id) {
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 29ca86b3f2c..e67452d4347 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -164,14 +164,33 @@ class CompanyBankAccount extends Account
 	 * @var string label
 	 */
 	public $label;
-	public $bank;
 	public $code_banque;
 	public $code_guichet;
 	public $number;
 	public $cle_rib;
 	public $bic;
 	public $iban_prefix;
+
+	public $bank;
+	/**
+	 * @var string	Bank address
+	 * @deprecated Replaced with address
+	 */
 	public $domiciliation;
+	public $address;
+
+	/**
+	 * @var int state id
+	 */
+	public $state_id;
+
+	/**
+	 * @var int country id
+	 */
+	public $fk_country;
+
+	public $country_code;
+
 
 	/**
 	 * @var string owner
@@ -188,16 +207,6 @@ class CompanyBankAccount extends Account
 	 */
 	public $default_rib;
 
-	/**
-	 * @var int state id
-	 */
-	public $state_id;
-
-	/**
-	 * @var id country id
-	 */
-	public $fk_country;
-
 	/**
 	 * @var string currency code
 	 */
@@ -225,7 +234,6 @@ class CompanyBankAccount extends Account
 	public $cvn;
 	public $exp_date_month;
 	public $exp_date_year;
-	public $country_code;
 	public $approved;
 
 	/**
@@ -397,9 +405,12 @@ class CompanyBankAccount extends Account
 			return -1;
 		}
 
-		if (dol_strlen($this->domiciliation) > 255) {
+		if (!empty($this->domiciliation) && dol_strlen($this->domiciliation) > 255) {
 			$this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
 		}
+		if (!empty($this->address) && dol_strlen($this->address) > 255) {
+			$this->address = dol_trunc($this->address, 254, 'right', 'UTF-8', 1);
+		}
 		if (dol_strlen($this->owner_address) > 255) {
 			$this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
 		}
@@ -418,7 +429,7 @@ class CompanyBankAccount extends Account
 		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
 		$sql .= ",bic='".$this->db->escape($this->bic)."'";
 		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql .= ",domiciliation = '".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",domiciliation = '".$this->db->escape($this->address ? $this->address : $this->domiciliation)."'";
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",default_rib = ".((int) $this->default_rib);
@@ -481,13 +492,13 @@ class CompanyBankAccount extends Account
 			return -1;
 		}
 
-		$sql = "SELECT rowid, type, fk_soc as socid, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur, date_rum,";
-		$sql .= " stripe_card_ref, stripe_account, ext_payment_site";
-		$sql .= " ,last_main_doc";
-		$sql .= " ,model_pdf";
-
+		$sql = "SELECT rowid, label, type, fk_soc as socid, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban,";
+		$sql .= " domiciliation as address,";
+		$sql .= " proprio, owner_address, default_rib, datec, tms as datem, rum, frstrecur, date_rum,";
+		$sql .= " stripe_card_ref, stripe_account, ext_payment_site,";
+		$sql .= " last_main_doc, model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+
 		if ($id) {
 			$sql .= " WHERE rowid = ".((int) $id);
 		} elseif ($socid > 0) {
@@ -517,7 +528,10 @@ class CompanyBankAccount extends Account
 				$this->cle_rib         = $obj->cle_rib;
 				$this->bic             = $obj->bic;
 				$this->iban = $obj->iban;
-				$this->domiciliation   = $obj->domiciliation;
+
+				$this->domiciliation   = $obj->address;
+				$this->address         = $obj->address;
+
 				$this->proprio         = $obj->proprio;
 				$this->owner_address   = $obj->owner_address;
 				$this->label           = $obj->label;
@@ -675,10 +689,13 @@ class CompanyBankAccount extends Account
 		$this->cle_rib         = '50';
 		$this->bic             = 'CC12';
 		$this->iban            = 'FR999999999';
-		$this->domiciliation   = 'Bank address of customer corp';
+
+		$this->address         = 'Rue de Paris';
+		$this->country_id      = 1;
+
 		$this->proprio         = 'Owner';
 		$this->owner_address   = 'Owner address';
-		$this->country_id      = 1;
+		$this->owner_country_id = 1;
 
 		$this->rum             = 'UMR-CU1212-0007-5-1475405262';
 		$this->date_rum        = dol_now() - 10000;
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 5f15d0e031d..e77854e1fcf 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -175,7 +175,10 @@ if (empty($reshook)) {
 			$companybankaccount->cle_rib         = GETPOST('cle_rib', 'alpha');
 			$companybankaccount->bic             = GETPOST('bic', 'alpha');
 			$companybankaccount->iban            = GETPOST('iban', 'alpha');
-			$companybankaccount->domiciliation   = GETPOST('domiciliation', 'alpha');
+
+			$companybankaccount->domiciliation   = GETPOST('address', 'alpha');
+			$companybankaccount->address         = GETPOST('address', 'alpha');
+
 			$companybankaccount->proprio         = GETPOST('proprio', 'alpha');
 			$companybankaccount->owner_address   = GETPOST('owner_address', 'alpha');
 			$companybankaccount->frstrecur       = GETPOST('frstrecur', 'alpha');
@@ -305,7 +308,10 @@ if (empty($reshook)) {
 			$companybankaccount->cle_rib         = GETPOST('cle_rib', 'alpha');
 			$companybankaccount->bic             = GETPOST('bic', 'alpha');
 			$companybankaccount->iban            = GETPOST('iban', 'alpha');
-			$companybankaccount->domiciliation   = GETPOST('domiciliation', 'alpha');
+
+			$companybankaccount->domiciliation   = GETPOST('address', 'alpha');
+			$companybankaccount->address         = GETPOST('address', 'alpha');
+
 			$companybankaccount->proprio         = GETPOST('proprio', 'alpha');
 			$companybankaccount->owner_address   = GETPOST('owner_address', 'alpha');
 			$companybankaccount->frstrecur       = GETPOST('frstrecur', 'alpha');
@@ -2010,8 +2016,8 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 	}
 
 	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="4" cols="40" maxlength="255">';
-	print $companybankaccount->domiciliation;
+	print '<textarea name="address" rows="4" cols="40" maxlength="255">';
+	print $companybankaccount->address;
 	print "</textarea></td></tr>";
 
 	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
@@ -2181,8 +2187,8 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 	}
 
 	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td>';
-	print '<textarea name="domiciliation" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
-	print GETPOST('domiciliation');
+	print '<textarea name="address" rows="'.ROWS_4.'" class="quatrevingtpercent" maxlength="255">';
+	print GETPOST('address');
 	print "</textarea></td></tr>";
 
 	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index ca663c38448..f56186d6d99 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -125,7 +125,8 @@ if ($action == 'add' && !$cancel && $permissiontoaddbankaccount) {
 	$account->cle_rib         = GETPOST('cle_rib', 'alpha');
 	$account->bic             = GETPOST('bic', 'alpha');
 	$account->iban            = GETPOST('iban', 'alpha');
-	$account->domiciliation   = GETPOST('domiciliation', 'alpha');
+	$account->domiciliation   = GETPOST('address', 'alpha');
+	$account->address         = GETPOST('address', 'alpha');
 	$account->proprio         = GETPOST('proprio', 'alpha');
 	$account->owner_address   = GETPOST('owner_address', 'alpha');
 
@@ -156,7 +157,8 @@ if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 	$account->cle_rib         = GETPOST('cle_rib', 'alpha');
 	$account->bic             = GETPOST('bic', 'alpha');
 	$account->iban            = GETPOST('iban', 'alpha');
-	$account->domiciliation   = GETPOST('domiciliation', 'alpha');
+	$account->domiciliation   = GETPOST('address', 'alpha');
+	$account->address         = GETPOST('address', 'alpha');
 	$account->proprio         = GETPOST('proprio', 'alpha');
 	$account->owner_address   = GETPOST('owner_address', 'alpha');
 
@@ -1004,8 +1006,8 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->hasRight('user',
 	}
 
 	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-	print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
-	print dol_escape_htmltag($account->domiciliation);
+	print '<textarea name="address" rows="4" class="quatrevingtpercent">';
+	print dol_escape_htmltag($account->address);
 	print "</textarea></td></tr>";
 
 	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 0602ab390bf..156f204249d 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -135,7 +135,7 @@ class UserBankAccount extends Account
 		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
 		$sql .= ",bic='".$this->db->escape($this->bic)."'";
 		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",domiciliation='".$this->db->escape($this->address ? $this->address :$this->domiciliation)."'";
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",currency_code = '".$this->db->escape($this->currency_code)."'";
@@ -189,8 +189,8 @@ class UserBankAccount extends Account
 			return -1;
 		}
 
-		$sql = "SELECT ur.rowid, ur.fk_user, ur.entity, ur.bank, ur.number, ur.code_banque, ur.code_guichet, ur.cle_rib, ur.bic, ur.iban_prefix as iban, ur.domiciliation, ur.proprio";
-		$sql .= ", ur.owner_address, ur.label, ur.datec, ur.tms as datem";
+		$sql = "SELECT ur.rowid, ur.fk_user, ur.entity, ur.bank, ur.number, ur.code_banque, ur.code_guichet, ur.cle_rib, ur.bic, ur.iban_prefix as iban, ur.domiciliation as address";
+		$sql .= ", ur.proprio, ur.owner_address, ur.label, ur.datec, ur.tms as datem";
 		$sql .= ', ur.currency_code, ur.state_id, ur.fk_country as country_id';
 		$sql .= ', c.code as country_code, c.label as country';
 		$sql .= ', d.code_departement as state_code, d.nom as state';
@@ -222,7 +222,10 @@ class UserBankAccount extends Account
 				$this->cle_rib = $obj->cle_rib;
 				$this->bic = $obj->bic;
 				$this->iban = $obj->iban;
-				$this->domiciliation = $obj->domiciliation;
+
+				$this->domiciliation = $obj->address;
+				$this->address = $obj->address;
+
 				$this->proprio = $obj->proprio;
 				$this->owner_address = $obj->owner_address;
 				$this->label = $obj->label;

From 7eb3f03eb23d5ef05de0cf939cdc0167ed2aa1de Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:52:54 +0100
Subject: [PATCH 0054/1862] Fix: Remove unused invalid global $lang (#28327)

# Fix: Remove unused invalid global

$lang was invalid but not used in function -> removed.
---
 htdocs/emailcollector/lib/emailcollector.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index c8c7544c9f9..d63077049dd 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -169,7 +169,6 @@ function getFileData($jk, $fpos, $type, $mbox)
  **/
 function saveAttachment($path, $filename, $data)
 {
-	global $lang;
 	$tmp = explode('.', $filename);
 	$ext = array_pop($tmp);
 	$filename = implode('.', $tmp);

From 05f809818e31c1ebdc5a33e32efd7ad38039b088 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 21 Feb 2024 16:54:40 +0100
Subject: [PATCH 0055/1862] Fixed duplicate llxHeader (#28330)

---
 htdocs/fourn/commande/index.php | 1 -
 htdocs/fourn/commande/note.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index caaa44666ec..30a5e5a7045 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -55,7 +55,6 @@ $hookmanager->initHooks(array('orderssuppliersindex'));
  * 	View
  */
 
-llxHeader('', $langs->trans("SuppliersOrdersArea"));
 llxHeader('', $langs->trans("SuppliersOrdersArea"), '', '', 0, 0, '', '', '', 'mod-supplier-order page-stats');
 
 $commandestatic = new CommandeFournisseur($db);
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index f64eb6fb6a3..e8ad23b0246 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -79,7 +79,6 @@ if (empty($reshook)) {
 
 $title = $object->ref." - ".$langs->trans('Notes');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $title, $help_url);
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-supplier-order page-notes');
 
 $form = new Form($db);

From 6defdcd0182f6683f8e0cfc9a47f2091821fefe0 Mon Sep 17 00:00:00 2001
From: Eric <1468823+rycks@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:06:05 +0100
Subject: [PATCH 0056/1862] better fix with this->entity thanks to regis
 (#28331)

* better fix with this->entity thanks to regis

* Update fichinter.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/fichinter/class/fichinter.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 3bf1c5d5dfd..b7d7cf92a69 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -575,7 +575,7 @@ class Fichinter extends CommonObject
 			$sql .= ", date_valid = '".$this->db->idate($now)."'";
 			$sql .= ", fk_user_valid = ".((int) $user->id);
 			$sql .= " WHERE rowid = ".((int) $this->id);
-			$sql .= " AND entity IN (".getEntity('intervention').")";
+			$sql .= " AND entity = ".((int) $this->entity);
 
 			$sql .= " AND fk_statut = 0";
 
@@ -604,7 +604,7 @@ class Fichinter extends CommonObject
 
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'ficheinter/".$this->db->escape($this->newref)."'";
-					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity IN (".getEntity('intervention').")";
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".((int) $this->entity);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
 						$error++; $this->error = $this->db->lasterror();

From 05527d3998a5b8ecabe0110b3d3e13ec580bacce Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:31:08 +0100
Subject: [PATCH 0057/1862] Fix: Allow new & old names to check if module is
 loaded. (#28297)

* Fix: Allow new & old names to check if module is loaded.

# Fix: Allow new & old names to check if module is loaded.

The method 'isModEnabled()' was already checking some modules for
their new name, but after transitioning Conf this was not working
for 'member'.  Now testing for both names as 'Conf' can handle
both and deprecation will be reported.

Several issues were discovered after removing deprecated values.

* Update functions.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/lib/functions.lib.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f02017700e3..ff40c78e06b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -216,23 +216,31 @@ function isModEnabled($module)
 {
 	global $conf;
 
-	// Fix special cases
+	// Fix old names (map to new names)
 	$arrayconv = array(
-		'bank' => 'banque',
-		'category' => 'categorie',
-		'contract' => 'contrat',
-		'project' => 'projet',
-		'delivery_note' => 'expedition'
+		'adherent' =>	'member',
+		'banque' => 'bank',
+		'categorie' => 'category',
+		'commande' => 'order',
+		'contrat' => 'contract',
+		'expedition' => 'delivery_note',
+		'facture' => 'invoice',
+		'projet' => 'project',
+		'propale' => 'propal',
 	);
+
 	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
+		// Special cases: both use the same module.
 		$arrayconv['supplier_order'] = 'fournisseur';
 		$arrayconv['supplier_invoice'] = 'fournisseur';
 	}
+
+	$module_alt = $module;
 	if (!empty($arrayconv[$module])) {
-		$module = $arrayconv[$module];
+		$module_alt = $arrayconv[$module];
 	}
 
-	return !empty($conf->modules[$module]);
+	return !empty($conf->modules[$module]) || !empty($conf->modules[$module_alt]);
 	//return !empty($conf->$module->enabled);
 }
 

From b5400ff7a945acc6e55dda6b45fea7ca2d470beb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 17:41:19 +0100
Subject: [PATCH 0058/1862] Comment

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

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 11c00917743..15eed8aa705 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -246,7 +246,7 @@ if ($result) {
 				$lineisasale = 1;
 			}
 		}
-		//var_dump($obj->type_payment); var_dump($obj->type_payment_supplier);
+		//var_dump($obj->type_payment); //var_dump($obj->type_payment_supplier);
 		//var_dump($lineisapurchase); //var_dump($lineisasale);
 
 		// Set accountancy code for bank

From 5460b97e8b48e74e9d09efd9f41c01961332cdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?=
 <121813548+altairis-benjamin@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:08:35 +0100
Subject: [PATCH 0059/1862] NEW contact type on auto add contributor (#26077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* NEW contact type on auto add contributor

* ADD second option

* RESTORE ticket module for external and fix constant

* GetDolGlobalInt

* Update ticket.class.php

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/conf.class.php       |  2 +-
 htdocs/public/ticket/create_ticket.php |  2 ++
 htdocs/ticket/class/ticket.class.php   | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index a5fb08f490b..e9ef6837439 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -875,7 +875,7 @@ class Conf extends stdClass
 
 			// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 			if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) {
-				$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,reception,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
+				$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,reception,agenda,resource,adherent,blockedlog,ticket'; // '' means 'all'. Note that contact is added here as it should be a module later.
 			}
 			if (!empty($this->modules_parts['moduleforexternal'])) {		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
 				foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index a3d40468155..40509ffdfb4 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -337,6 +337,8 @@ if (empty($reshook)) {
 			$object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
 			$object->context['contactid'] = GETPOSTINT('contactid'); // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
 
+			$object->context['createdfrompublicinterface'] = 1; // To make a difference between a ticket created from the public interface and a ticket directly created from dolibarr
+
 			if ($nb_post_max > 0 && $nb_post_ip >= $nb_post_max) {
 				$error++;
 				array_push($object->errors, $langs->trans("AlreadyTooMuchPostOnThisIPAdress"));
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 7042af93bf9..9ffd2ea78c3 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -580,9 +580,20 @@ class Ticket extends CommonObject
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ticket");
 			}
 
-			if (!$error && getDolGlobalString('TICKET_ADD_AUTHOR_AS_CONTACT')) {
+			if (!$error && getDolGlobalString('TICKET_ADD_AUTHOR_AS_CONTACT') && empty($this->context["createdfrompublicinterface"])) {
 				// add creator as contributor
-				if ($this->add_contact($user->id, 'CONTRIBUTOR', 'internal') < 0) {
+
+				// We first check the type of contact (internal or external)
+				if (!empty($user->socid) && !empty($user->contact_id) && getDolGlobalInt('TICKET_ADD_AUTHOR_AS_CONTACT') == 2) {
+					$contact_type = 'external';
+					$contributor_id = $user->contact_id;
+				} else {
+					$contact_type = 'internal';
+					$contributor_id = $user->id;
+				}
+
+				// We add the creator as contributor
+				if ($this->add_contact($contributor_id, 'CONTRIBUTOR', $contact_type) < 0) {
 					$error++;
 				}
 			}

From 8655d5a86b5cc455ff5b2112b9751b70693f6dae Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:14:29 +0100
Subject: [PATCH 0060/1862] QUAL Use phan to help detect new issues (#27706)

* Qual: Add phan flow

- Add phan configuration (config, baseline, stubs);
- Add github action;
- Update apstats.php.

* Add directives to ignore false phan notices

* Qual: Add typing hints for extrafields TPL files

# Qual: Add typing hints for extrafields TPL files

Add typing hints for phan on view files

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .github/workflows/phan.yml                    |    55 +
 .phan/config.php                              |     4 +
 dev/tools/phan/.gitignore                     |     3 +
 dev/tools/phan/README.md                      |    46 +
 dev/tools/phan/baseline.txt                   |   328 +
 dev/tools/phan/config.php                     |   387 +
 dev/tools/phan/config_extended.php            |   196 +
 dev/tools/phan/run-phan.sh                    |    99 +
 dev/tools/phan/runPhanDocker.sh               |    27 +
 dev/tools/phan/stubs/GeoIP2.php               |  1293 ++
 dev/tools/phan/stubs/SimpleXML.phan_php       |    43 +
 dev/tools/phan/stubs/brotli.phan_php          |    29 +
 dev/tools/phan/stubs/calendar.phan_php        |    45 +
 dev/tools/phan/stubs/curl.phan_php            |   616 +
 dev/tools/phan/stubs/fileinfo.phan_php        |    30 +
 dev/tools/phan/stubs/ftp.phan_php             |    53 +
 dev/tools/phan/stubs/gd.phan_php              |   207 +
 dev/tools/phan/stubs/geoip.phan_php           |    44 +
 dev/tools/phan/stubs/geoip_inc.php            |   194 +
 dev/tools/phan/stubs/imap.phan_php            |   149 +
 dev/tools/phan/stubs/intl.phan_php            |  1807 ++
 dev/tools/phan/stubs/ldap.phan_php            |   157 +
 dev/tools/phan/stubs/mcrypt.phan_php          |    79 +
 dev/tools/phan/stubs/memcache.phan_php        |    72 +
 dev/tools/phan/stubs/module_numberwords.php   |    48 +
 dev/tools/phan/stubs/mysqli.phan_php          |   397 +
 dev/tools/phan/stubs/pdo_cubrid.phan_php      |     3 +
 dev/tools/phan/stubs/pdo_mysql.phan_php       |     3 +
 dev/tools/phan/stubs/pdo_pgsql.phan_php       |     3 +
 dev/tools/phan/stubs/pdo_sqlite.phan_php      |     3 +
 dev/tools/phan/stubs/pgsql.phan_php           |   974 +
 dev/tools/phan/stubs/restler.php              |  4958 +++++
 dev/tools/phan/stubs/session.phan_php         |    68 +
 dev/tools/phan/stubs/soap.phan_php            |   220 +
 dev/tools/phan/stubs/sockets.phan_php         |   260 +
 dev/tools/phan/stubs/stripe.php               | 15688 ++++++++++++++++
 dev/tools/phan/stubs/swiss-qr-bill.php        |  1021 +
 dev/tools/phan/stubs/zip.phan_php             |   161 +
 htdocs/adherents/class/adherent.class.php     |     1 +
 .../class/PSWebServiceLibrary.class.php       |     1 +
 htdocs/admin/mails_emailing.php               |     1 +
 htdocs/admin/system/dolibarr.php              |     1 +
 htdocs/admin/system/filecheck.php             |     1 +
 htdocs/admin/tools/update.php                 |     1 +
 htdocs/api/class/api_documents.class.php      |     1 +
 htdocs/api/class/api_setup.class.php          |     1 +
 htdocs/bom/tpl/objectline_create.tpl.php      |     2 +
 htdocs/bom/tpl/objectline_edit.tpl.php        |     2 +
 htdocs/bom/tpl/objectline_title.tpl.php       |     3 +
 htdocs/bom/tpl/objectline_view.tpl.php        |     3 +
 htdocs/compta/facture/card-rec.php            |     1 +
 htdocs/contrat/list.php                       |     1 +
 htdocs/core/actions_addupdatedelete.inc.php   |    17 +
 .../class/commonstickergenerator.class.php    |     2 +
 htdocs/core/class/dolreceiptprinter.class.php |     1 +
 htdocs/core/class/html.formmargin.class.php   |     3 +
 htdocs/core/class/html.formticket.class.php   |     1 +
 htdocs/core/class/rssparser.class.php         |     1 +
 htdocs/core/commonfieldsinexport.inc.php      |     1 +
 htdocs/core/commonfieldsinimport.inc.php      |     1 +
 htdocs/core/db/mysqli.class.php               |     1 +
 htdocs/core/extrafieldsinexport.inc.php       |     1 +
 htdocs/core/extrafieldsinimport.inc.php       |     1 +
 htdocs/core/lib/functions.lib.php             |     5 +
 htdocs/core/lib/functions2.lib.php            |     1 +
 htdocs/core/lib/json.lib.php                  |     3 +
 htdocs/core/lib/memory.lib.php                |     2 +
 .../action/doc/pdf_standard_actions.class.php |     1 +
 .../asset/doc/pdf_standard_asset.modules.php  |     2 +
 .../commande/doc/pdf_einstein.modules.php     |     2 +
 .../commande/doc/pdf_eratosthene.modules.php  |     2 +
 .../contract/doc/pdf_strato.modules.php       |     2 +
 .../delivery/doc/pdf_storm.modules.php        |     2 +
 .../delivery/doc/pdf_typhon.modules.php       |     1 +
 .../generate/modGeneratePassPerso.class.php   |     2 +
 .../core/modules/syslog/mod_syslog_file.php   |     1 +
 htdocs/core/search_page.php                   |     1 +
 htdocs/core/tpl/extrafields_add.tpl.php       |     7 +
 htdocs/core/tpl/extrafields_edit.tpl.php      |     8 +
 htdocs/core/tpl/login.tpl.php                 |     1 +
 htdocs/core/tpl/objectline_create.tpl.php     |     3 +
 htdocs/core/tpl/objectline_edit.tpl.php       |     1 +
 htdocs/core/tpl/objectline_title.tpl.php      |     5 +
 htdocs/core/tpl/objectline_view.tpl.php       |     8 +-
 htdocs/core/tpl/originproductline.tpl.php     |     1 +
 ...interface_50_modLdap_Ldapsynchro.class.php |     1 +
 .../interface_80_modStripe_Stripe.class.php   |     1 +
 htdocs/expedition/class/expedition.class.php  |     1 +
 htdocs/fichinter/list.php                     |     1 +
 htdocs/mrp/tpl/originproductline.tpl.php      |     2 +
 .../product/stock/tpl/extrafields_add.tpl.php |     7 +
 htdocs/societe/consumption.php                |     2 +
 .../class/supplier_proposal.class.php         |     1 +
 .../productattributevalueline_create.tpl.php  |     3 +
 .../productattributevalueline_view.tpl.php    |     3 +
 pyproject.toml                                |     2 +-
 96 files changed, 29903 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/phan.yml
 create mode 100644 .phan/config.php
 create mode 100644 dev/tools/phan/.gitignore
 create mode 100644 dev/tools/phan/README.md
 create mode 100644 dev/tools/phan/baseline.txt
 create mode 100644 dev/tools/phan/config.php
 create mode 100644 dev/tools/phan/config_extended.php
 create mode 100755 dev/tools/phan/run-phan.sh
 create mode 100755 dev/tools/phan/runPhanDocker.sh
 create mode 100644 dev/tools/phan/stubs/GeoIP2.php
 create mode 100644 dev/tools/phan/stubs/SimpleXML.phan_php
 create mode 100644 dev/tools/phan/stubs/brotli.phan_php
 create mode 100644 dev/tools/phan/stubs/calendar.phan_php
 create mode 100644 dev/tools/phan/stubs/curl.phan_php
 create mode 100644 dev/tools/phan/stubs/fileinfo.phan_php
 create mode 100644 dev/tools/phan/stubs/ftp.phan_php
 create mode 100644 dev/tools/phan/stubs/gd.phan_php
 create mode 100644 dev/tools/phan/stubs/geoip.phan_php
 create mode 100644 dev/tools/phan/stubs/geoip_inc.php
 create mode 100644 dev/tools/phan/stubs/imap.phan_php
 create mode 100644 dev/tools/phan/stubs/intl.phan_php
 create mode 100644 dev/tools/phan/stubs/ldap.phan_php
 create mode 100644 dev/tools/phan/stubs/mcrypt.phan_php
 create mode 100644 dev/tools/phan/stubs/memcache.phan_php
 create mode 100644 dev/tools/phan/stubs/module_numberwords.php
 create mode 100644 dev/tools/phan/stubs/mysqli.phan_php
 create mode 100644 dev/tools/phan/stubs/pdo_cubrid.phan_php
 create mode 100644 dev/tools/phan/stubs/pdo_mysql.phan_php
 create mode 100644 dev/tools/phan/stubs/pdo_pgsql.phan_php
 create mode 100644 dev/tools/phan/stubs/pdo_sqlite.phan_php
 create mode 100644 dev/tools/phan/stubs/pgsql.phan_php
 create mode 100644 dev/tools/phan/stubs/restler.php
 create mode 100644 dev/tools/phan/stubs/session.phan_php
 create mode 100644 dev/tools/phan/stubs/soap.phan_php
 create mode 100644 dev/tools/phan/stubs/sockets.phan_php
 create mode 100644 dev/tools/phan/stubs/stripe.php
 create mode 100644 dev/tools/phan/stubs/swiss-qr-bill.php
 create mode 100644 dev/tools/phan/stubs/zip.phan_php

diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml
new file mode 100644
index 00000000000..67bec077a13
--- /dev/null
+++ b/.github/workflows/phan.yml
@@ -0,0 +1,55 @@
+---
+on:
+  pull_request:
+  push:
+  schedule:
+    # execute once a day, the 1st
+    - cron: 10 9 * * *
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+env:
+  # Do pull analysis on schedule or manual dispatch
+  PHAN_CONFIG: >
+    ${{
+      ( github.event.schedule || github.event_name == 'workflow_dispatch' )
+        && 'dev/tools/phan/config_extended.php'
+        || 'dev/tools/phan/config.php'
+    }}
+  PHAN_BASELINE: dev/tools/phan/baseline.txt
+  PHAN_MIN_PHP: 7.0
+  PHAN_QUICK: ${{ github.event.schedule && '' || '--quick' }}
+  GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
+name: phan
+jobs:
+  phan:
+    name: Run phan
+    runs-on: ubuntu-latest
+    # Do not run schedule on forks
+    if: |
+      github.repository == 'Dolibarr/dolibarr'
+      || github.event.schedule == false
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          coverage: none # disable xdebug, pcov
+          tools: cs2pr,phan
+      - name: Run Phan analysis
+        run: |
+          phan $PHAN_QUICK -k $PHAN_CONFIG -B $PHAN_BASELINE --analyze-twice --minimum-target-php-version $PHAN_MIN_PHP --output-mode=checkstyle -o _phan.xml
+      - name: Add results to PR
+        if: ${{ always() }}
+        run: |
+          cs2pr --prepend-filename --prepend-source --notices-as-warnings _phan.xml
+      - name: Provide phan log as artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: phan-srcrt
+          # path: ${{ github.workspace }}/phan.log
+          path: ${{ github.workspace }}/_phan.xml
+          retention-days: 2
diff --git a/.phan/config.php b/.phan/config.php
new file mode 100644
index 00000000000..3dc6661f566
--- /dev/null
+++ b/.phan/config.php
@@ -0,0 +1,4 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+return include __DIR__ . "/../dev/tools/phan/config.php";
diff --git a/dev/tools/phan/.gitignore b/dev/tools/phan/.gitignore
new file mode 100644
index 00000000000..e3881e40403
--- /dev/null
+++ b/dev/tools/phan/.gitignore
@@ -0,0 +1,3 @@
+*.sw?
+composer.*
+vendor
diff --git a/dev/tools/phan/README.md b/dev/tools/phan/README.md
new file mode 100644
index 00000000000..c011b6aaf08
--- /dev/null
+++ b/dev/tools/phan/README.md
@@ -0,0 +1,46 @@
+### Static Code Checks using [phan]
+
+#### Installation, running
+
+`run-phan.sh` can install and run `phan`.
+
+See instructions in `run-phan.sh` for installing (or just run it).
+
+The configuration file in `PROJECT_DIR/.phan/config.php` also allows you to run
+`phan` independently from the script.
+
+#### Run options:
+
+No option : Runs the minimum checks
+
+Option 'full' : Runs all an extensive set of checks
+
+Option '1' : Writes the baseline
+
+Examples:
+
+- `run-phan.sh` runs the default checks
+- `run-phan.sh 1` updates the baseline for the default checks
+- `run-phan.sh full` runs the extended checks
+- `run-phan.sh full 1` updates the baseline for the extended checks
+
+#### Baseline
+
+The `baseline.txt` file in this directory defines the issues that are currently
+excluded from the final report. In principle you should not add any more
+exceptions to that file, but rather fix the issues or add [phan annotations]
+that provide more information or to exclude specific cases.
+
+#### Configuration
+
+`config.php` : Default configuration file
+
+`config_extended.php` : Configuration that enables more checks.
+
+`baseline.txt` : Ignored issues (with `config.php`)
+
+`baseline_extended.txt` : Ignored issues (with `config_extended.php`), not
+currently in git
+
+[phan]: https://github.com/phan/phan/wiki/Getting-Started
+[phan annotations]: https://github.com/phan/phan/wiki/Annotating-Your-Source-Code
diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
new file mode 100644
index 00000000000..dad508e8cf6
--- /dev/null
+++ b/dev/tools/phan/baseline.txt
@@ -0,0 +1,328 @@
+<?php
+/**
+ * This is an automatically generated baseline for Phan issues.
+ * When Phan is invoked with --load-baseline=path/to/baseline.php,
+ * The pre-existing issues listed in this file won't be emitted.
+ *
+ * This file can be updated by invoking Phan with --save-baseline=path/to/baseline.php
+ * (can be combined with --load-baseline)
+ */
+return [
+    // # Issue statistics:
+    // PhanPluginSuspiciousParamPosition : 160+ occurrences
+    // PhanPluginSuspiciousParamOrder : 130+ occurrences
+    // PhanParamSignatureMismatch : 45+ occurrences
+    // PhanPluginDuplicateIfStatements : 40+ occurrences
+    // PhanPluginDuplicateExpressionBinaryOp : 15+ occurrences
+    // PhanUndeclaredConstant : 15+ occurrences
+    // PhanUnreferencedUseNormal : 15+ occurrences
+    // PhanParamSuspiciousOrder : 10+ occurrences
+    // PhanPluginSuspiciousParamOrderInternal : 10+ occurrences
+    // PhanTypeArraySuspiciousNull : 10+ occurrences
+    // PhanTypeInvalidUnaryOperandNumeric : 10+ occurrences
+    // PhanRedefineFunctionInternal : 9 occurrences
+    // PhanPluginUnsafeEval : 7 occurrences
+    // PhanPluginDuplicateIfCondition : 6 occurrences
+    // PhanUndeclaredTypeParameter : 6 occurrences
+    // PhanParamTooMany : 4 occurrences
+    // PhanPluginDuplicateArrayKey : 4 occurrences
+    // PhanPluginInvalidPregRegexReplacement : 4 occurrences
+    // PhanUndeclaredFunctionInCallable : 4 occurrences
+    // PhanNoopArrayAccess : 2 occurrences
+    // PhanTypeMismatchForeach : 2 occurrences
+    // PhanAccessMethodProtected : 1 occurrence
+    // PhanAccessPropertyStaticAsNonStatic : 1 occurrence
+    // PhanNoopArray : 1 occurrence
+    // PhanNoopStringLiteral : 1 occurrence
+    // PhanParamTooFew : 1 occurrence
+    // PhanPowerOfZero : 1 occurrence
+    // PhanUnextractableAnnotationSuffix : 1 occurrence
+
+    // Currently, file_suppressions and directory_suppressions are the only supported suppressions
+    'file_suppressions' => [
+        'htdocs/accountancy/admin/account.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/accountancy/class/bookkeeping.class.php' => ['PhanUndeclaredTypeParameter'],
+        'htdocs/accountancy/class/lettering.class.php' => ['PhanParamSuspiciousOrder'],
+        'htdocs/accountancy/customer/lines.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/accountancy/customer/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/accountancy/expensereport/lines.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/accountancy/expensereport/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/accountancy/journal/purchasesjournal.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/accountancy/journal/sellsjournal.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/accountancy/supplier/lines.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/accountancy/supplier/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/adherents/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/adherents/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/adherents/stats/geo.php' => ['PhanTypeArraySuspiciousNull'],
+        'htdocs/adherents/subscription.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/adherents/type.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/admin/agenda_extsites.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/admin/dict.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/admin/emailcollector_card.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/admin/mails_templates.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/admin/receiptprinter.php' => ['PhanRedefineFunctionInternal'],
+        'htdocs/admin/system/database.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/admin/system/modules.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/admin/tools/listevents.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/admin/translation.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/admin/triggers.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/api/class/api.class.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanUnreferencedUseNormal'],
+        'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/bom/bom_list.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
+        'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/collab/index.php' => ['PhanParamTooMany'],
+        'htdocs/comm/action/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/comm/action/index.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeArraySuspiciousNull', 'PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/comm/action/pertype.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/comm/action/peruser.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/comm/action/rapport/index.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/comm/mailing/advtargetemailing.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/comm/mailing/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/comm/mailing/cibles.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/comm/mailing/info.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/comm/propal/list.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/commande/list.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/commande/list_det.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/accounting-files.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/compta/bank/bankentries_list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/bank/various_payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/bank/various_payment/info.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/compta/cashcontrol/class/cashcontrol.class.php' => ['PhanUndeclaredTypeParameter'],
+        'htdocs/compta/deplacement/class/deplacementstats.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/compta/facture/agenda-rec.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/facture/card.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/facture/class/facture.class.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/compta/facture/invoicetemplate_list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/facture/list.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/facture/prelevement.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/paiement/cheque/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/paiement/class/paiement.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/compta/paiement/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/prelevement/card.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
+        'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/prelevement/fiche-rejet.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/sociales/class/paymentsocialcontribution.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/compta/sociales/document.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/sociales/info.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/sociales/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/sociales/note.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/compta/tva/document.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/compta/tva/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/tva/payments.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/actions_massactions.inc.php' => ['PhanParamTooFew', 'PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
+        'htdocs/core/class/commonobject.class.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/commonstickergenerator.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/dolreceiptprinter.class.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
+        'htdocs/core/class/html.form.class.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/html.formmail.class.php' => ['PhanNoopArray'],
+        'htdocs/core/class/rssparser.class.php' => ['PhanPluginDuplicateIfStatements', 'PhanUndeclaredFunctionInCallable'],
+        'htdocs/core/class/translate.class.php' => ['PhanTypeMismatchForeach'],
+        'htdocs/core/class/utils.class.php' => ['PhanPluginSuspiciousParamPosition', 'PhanUnextractableAnnotationSuffix'],
+        'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch', 'PhanPluginDuplicateIfStatements'],
+        'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/filemanagerdol/connectors/php/connector.lib.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/company.lib.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginDuplicateIfCondition','PhanDeprecatedFunctionInternal'],
+        'htdocs/core/lib/ftp.lib.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginDuplicateIfCondition', 'PhanPluginInvalidPregRegexReplacement', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
+        'htdocs/core/lib/functions2.lib.php' => ['PhanParamSuspiciousOrder', 'PhanPluginUnsafeEval'],
+        'htdocs/core/lib/json.lib.php' => ['PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
+        'htdocs/core/lib/modulebuilder.lib.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/usergroups.lib.php' => ['PhanNoopArrayAccess'],
+        'htdocs/core/lib/website.lib.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/login/functions_ldap.php' => ['PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
+        'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
+        'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
+        'htdocs/core/modules/bank/doc/pdf_ban.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanUndeclaredTypeParameter'],
+        'htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/modules/cheque/doc/pdf_blochet.class.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanUndeclaredTypeParameter'],
+        'htdocs/core/modules/expedition/doc/pdf_espadon.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/modules/expedition/doc/pdf_merou.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/expedition/doc/pdf_rouget.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/expensereport/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/hrm/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal', 'PhanTypeArraySuspiciousNull'],
+        'htdocs/core/modules/oauth/generic_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/oauth/google_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/oauth/microsoft_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/oauth/stripelive_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/oauth/stripetest_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/printing/printgcp.modules.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/project/doc/pdf_baleine.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/project/doc/pdf_beluga.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/modules/rapport/pdf_paiement.class.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/societe/mod_codecompta_aquarium.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanPluginDuplicateIfCondition'],
+        'htdocs/core/modules/stock/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanUndeclaredTypeParameter'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder', 'PhanPluginDuplicateArrayKey'],
+        'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/tpl/objectline_create.tpl.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/debugbar/class/DataCollector/DolPhpCollector.php' => ['PhanPowerOfZero'],
+        'htdocs/debugbar/class/DataCollector/DolQueryCollector.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/debugbar/class/DataCollector/DolibarrCollector.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/don/card.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/don/class/api_donations.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/don/class/don.class.php' => ['PhanParamTooMany', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/don/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/don/paiement/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/ecm/index_auto.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUnreferencedUseNormal'],
+        'htdocs/eventorganization/class/conferenceorbooth.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/expedition/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/expensereport/card.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/expensereport/class/expensereportstats.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/expensereport/payment/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/exports/export.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/exports/index.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/fichinter/card-rec.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/fichinter/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/fourn/commande/card.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/fourn/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/fourn/facture/card.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/fourn/facture/list-rec.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/fourn/facture/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/fourn/paiement/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/holiday/view_log.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/imports/import.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/imports/index.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/install/fileconf.php' => ['PhanParamSuspiciousOrder'],
+        'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
+        'htdocs/loan/card.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/loan/document.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/loan/info.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/loan/note.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/loan/payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/loan/schedule.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/main.inc.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/margin/agentMargins.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/margin/checkMargins.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/margin/customerMargins.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/margin/productMargins.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/margin/tabs/thirdpartyMargins.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/master.inc.php' => ['PhanRedefineFunctionInternal'],
+        'htdocs/modulebuilder/index.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/mrp/class/mo.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
+        'htdocs/product/agenda.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/product/card.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/product/class/product.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/product/inventory/inventory.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/product/popuprop.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/product/price.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/product/stats/card.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/product/stats/commande.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/commande_fournisseur.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/contrat.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/facture.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/facture_fournisseur.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/facturerec.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/mo.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/propal.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stats/supplier_proposal.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/product/stock/movement_list.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/product/stock/product.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stock/stats/expedition.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stock/stats/mo.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/product/stock/stats/reception.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/projet/list.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
+        'htdocs/projet/tasks/time.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/public/bookcal/index.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/public/payment/newpayment.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/public/webportal/tpl/menu.tpl.php' => ['PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/public/webportal/webportal.main.inc.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/public/website/index.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/reception/list.php' => ['PhanNoopArrayAccess', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
+        'htdocs/salaries/class/salary.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/salaries/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/societe/class/societe.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/societe/list.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/societe/notify/card.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/societe/paymentmodes.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/societe/price.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/ticket/class/ticketstats.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/ticket/list.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/user/agenda_extsites.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/user/bank.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/user/card.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/user/class/user.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/user/list.php' => ['PhanPluginDuplicateIfStatements'],
+        'htdocs/user/notify/card.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/variants/class/ProductAttribute.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/webportal/class/html.formwebportal.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/webportal/controllers/default.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/document.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/invoicelist.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/login.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/membercard.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/orderlist.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/partnershipcard.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/webportal/controllers/propallist.controller.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/website/class/website.class.php' => ['PhanPluginSuspiciousParamOrder', 'PhanTypeArraySuspiciousNull'],
+        'htdocs/website/index.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/website/samples/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/json.lib.php' => ['PhanCompatibleNegativeStringOffset'],
+    ],
+    // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
+    // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)
+];
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
new file mode 100644
index 00000000000..9821b5049b7
--- /dev/null
+++ b/dev/tools/phan/config.php
@@ -0,0 +1,387 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
+define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
+define('PHAN_DIR', __DIR__);
+/**
+ * This configuration will be read and overlaid on top of the
+ * default configuration. Command line arguments will be applied
+ * after this file is read.
+ */
+return [
+	//	'processes' => 6,
+	'backward_compatibility_checks' => false,
+	'simplify_ast' => true,
+	'analyzed_file_extensions' => ['php','inc'],
+	'globals_type_map' => [
+		'conf' => '\Conf',
+		'db' => '\DoliDB',
+		'extrafields' => '\ExtraFields',
+		'hookmanager' => '\HookManager',
+		'langs' => '\Translate',
+		'mysoc' => '\Societe',
+		'nblines' => '\int',
+		'user' => '\User',
+	],
+
+	// Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`, `null`.
+	// If this is set to `null`,
+	// then Phan assumes the PHP version which is closest to the minor version
+	// of the php executable used to execute Phan.
+	//"target_php_version" => null,
+	"target_php_version" => '8.2',
+	//"target_php_version" => '7.3',
+	//"target_php_version" => '5.6',
+
+	// A list of directories that should be parsed for class and
+	// method information. After excluding the directories
+	// defined in exclude_analysis_directory_list, the remaining
+	// files will be statically analyzed for errors.
+	//
+	// Thus, both first-party and third-party code being used by
+	// your application should be included in this list.
+	'directory_list' => [
+		'htdocs',
+		PHAN_DIR . '/stubs/',
+	],
+
+	// A directory list that defines files that will be excluded
+	// from static analysis, but whose class and method
+	// information should be included.
+	//
+	// Generally, you'll want to include the directories for
+	// third-party code (such as "vendor/") in this list.
+	//
+	// n.b.: If you'd like to parse but not analyze 3rd
+	//	party code, directories containing that code
+	//	should be added to the `directory_list` as
+	//	to `exclude_analysis_directory_list`.
+	"exclude_analysis_directory_list" => [
+		'htdocs/includes/',
+		'htdocs/core/class/lessc.class.php', // External library
+		PHAN_DIR . '/stubs/',
+	],
+	//'exclude_file_regex' => '@^vendor/.*/(tests?|Tests?)/@',
+	'exclude_file_regex' => '@^('  // @phpstan-ignore-line
+		.'dummy'  // @phpstan-ignore-line
+		.'|htdocs/.*/canvas/.*/tpl/.*.tpl.php'  // @phpstan-ignore-line
+		.'|htdocs/modulebuilder/template/.*'  // @phpstan-ignore-line
+		// Included as stub (old version + incompatible typing hints)
+		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
+		// Included as stub (did not seem properly analysed by phan without it)
+		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		.')@',  // @phpstan-ignore-line
+
+	// A list of plugin files to execute.
+	// Plugins which are bundled with Phan can be added here by providing their name
+	// (e.g. 'AlwaysReturnPlugin')
+	//
+	// Documentation about available bundled plugins can be found
+	// at https://github.com/phan/phan/tree/master/.phan/plugins
+	//
+	// Alternately, you can pass in the full path to a PHP file
+	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
+	'plugins' => [
+		// checks if a function, closure or method unconditionally returns.
+		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
+		//'DeprecateAliasPlugin',
+		//'EmptyMethodAndFunctionPlugin',
+		'InvalidVariableIssetPlugin',
+		//'MoreSpecificElementTypePlugin',
+		'NoAssertPlugin',
+		'NotFullyQualifiedUsagePlugin',
+		//'PHPDocRedundantPlugin',
+		'PHPUnitNotDeadCodePlugin',
+		//'PossiblyStaticMethodPlugin',
+		'PreferNamespaceUsePlugin',
+		'PrintfCheckerPlugin',
+		'RedundantAssignmentPlugin',
+
+		'ConstantVariablePlugin', // Warns about values that are actually constant
+		//'HasPHPDocPlugin', // Requires PHPDoc
+		'InlineHTMLPlugin', // html in PHP file, or at end of file
+		//'NonBoolBranchPlugin', // Requires test on bool, nont on ints
+		//'NonBoolInLogicalArithPlugin',
+		'NumericalComparisonPlugin',
+		//'PHPDocToRealTypesPlugin',
+		'PHPDocInWrongCommentPlugin', // Missing /** (/* was used)
+		//'ShortArrayPlugin', // Checks that [] is used
+		//'StrictLiteralComparisonPlugin',
+		'UnknownClassElementAccessPlugin',
+		'UnknownElementTypePlugin',
+		'WhitespacePlugin',
+		//'RemoveDebugStatementPlugin', // Reports echo, print, ...
+		//'SimplifyExpressionPlugin',
+		//'StrictComparisonPlugin', // Expects ===
+		'SuspiciousParamOrderPlugin',
+		'UnsafeCodePlugin',
+		//'UnusedSuppressionPlugin',
+
+		'AlwaysReturnPlugin',
+		//'DollarDollarPlugin',
+		'DuplicateArrayKeyPlugin',
+		'DuplicateExpressionPlugin',
+		'PregRegexCheckerPlugin',
+		'PrintfCheckerPlugin',
+		'SleepCheckerPlugin',
+		// Checks for syntactically unreachable statements in
+		// the global scope or function bodies.
+		'UnreachableCodePlugin',
+		'UseReturnValuePlugin',
+		'EmptyStatementListPlugin',
+		'LoopVariableReusePlugin',
+	],
+
+	// Add any issue types (such as 'PhanUndeclaredMethod')
+	// here to inhibit them from being reported
+	'suppress_issue_types' => [
+		// Dolibarr uses a lot of internal deprecated stuff, not reporting
+		'PhanDeprecatedProperty',
+		'PhanDeprecatedFunction',
+		// Dolibarr has quite a few strange noop assignments like $abc=$abc;
+		'PhanPluginDuplicateExpressionAssignment',
+		// Nulls are likely mostly false positives
+		'PhanPluginConstantVariableNull',
+		'PhanTypeObjectUnsetDeclaredProperty',
+		// 'PhanPluginComparisonNotStrictForScalar',
+		'PhanPluginNonBoolBranch',
+		'PhanPluginShortArray',
+		'PhanPluginNumericalComparison',
+		'PhanPluginUnknownObjectMethodCall',
+		'PhanPluginCanUseParamType',
+		'PhanPluginNonBoolInLogicalArith',
+		'PhanPluginCanUseReturnType',
+		// 'PhanPluginNotFullyQualifiedFunctionCall',
+		'PhanPluginConstantVariableScalar',
+		// 'PhanPluginNoCommentOnPublicProperty',
+		'PhanPluginUnknownPropertyType',
+		// 'PhanPluginUnknownMethodParamType',
+		// 'PhanPluginNotFullyQualifiedOptimizableFunctionCall',
+		// 'PhanPluginUnknownMethodReturnType',
+		'PhanPluginUnknownArrayMethodParamType',
+		'PhanPluginWhitespaceTab',   // Dolibarr uses tabs
+		'PhanPluginWhitespaceTrailing',   // Should be handled by other tools
+		// 'PhanPluginCanUsePHP71Void',
+		'PhanPluginUnknownArrayMethodReturnType',
+		'PhanTypeMismatchArgumentInternal',
+		'PhanPluginDuplicateAdjacentStatement',
+		'PhanPluginCanUseNullableParamType',
+		'PhanTypeInvalidLeftOperandOfNumericOp',
+		'PhanTypeMismatchProperty',
+		// 'PhanPluginNoCommentOnPublicMethod',
+		'PhanRedefinedClassReference',
+		// 'PhanPluginNoCommentOnClass',
+		// 'PhanPluginNotFullyQualifiedGlobalConstant',
+		'PhanTypeMismatchDefault',
+		// 'PhanPluginPHPDocHashComment',
+		'PhanPluginShortArrayList',
+		'PhanPluginUnknownArrayPropertyType',
+		'PhanTypeInvalidDimOffset',
+		// 'PhanPluginNoCommentOnProtectedProperty',
+		// 'PhanPluginDescriptionlessCommentOnPublicMethod',
+		'PhanPluginUnknownClosureParamType',
+		'PhanPluginUnknownClosureReturnType',
+		// 'PhanPluginNoCommentOnProtectedMethod',
+		'PhanTypeArraySuspicious',
+		'PhanTypeMismatchPropertyProbablyReal',
+		// 'PhanPluginNoCommentOnPrivateMethod',
+		'PhanPluginUnknownArrayFunctionReturnType',
+		'PhanTypeInvalidLeftOperandOfAdd',
+		// 'PhanPluginNoCommentOnPrivateProperty',
+		// 'PhanPluginNoCommentOnFunction',
+		'PhanPluginCanUseNullableReturnType',
+		'PhanPluginUnknownArrayFunctionParamType',
+		// 'PhanPluginDescriptionlessCommentOnPublicProperty',
+		'PhanPluginUnknownFunctionParamType',
+		'PhanTypeSuspiciousStringExpression',
+		'PhanPluginRedundantAssignment',
+		'PhanTypeExpectedObjectPropAccess',
+		'PhanTypeInvalidRightOperandOfNumericOp',
+		'PhanPluginInlineHTML',
+		// 'PhanPluginUnknownFunctionReturnType',
+		// 'PhanPluginDescriptionlessCommentOnProtectedProperty',
+		'PhanPluginRedundantAssignmentInGlobalScope',
+		'PhanTypeMismatchDeclaredParamNullable',
+		'PhanTypeInvalidRightOperandOfAdd',
+		// 'PhanPluginDescriptionlessCommentOnPrivateProperty',
+		'PhanUndeclaredVariableDim',  // Array initialisation on undeclared var: $abc['x']='ab'
+		'PhanTypeInvalidPropertyName',
+		'PhanPluginDuplicateCatchStatementBody',
+		'PhanPluginUndeclaredVariableIsset',
+		'PhanTypeInvalidUnaryOperandIncOrDec',
+		// 'PhanPluginDescriptionlessCommentOnClass',
+		'PhanPluginEmptyStatementIf',
+		'PhanPluginInlineHTMLTrailing',
+		// 'PhanUndeclaredStaticMethod',
+		// 'PhanPluginDescriptionlessCommentOnPrivateMethod',
+		'PhanPluginPrintfIncompatibleArgumentType',
+		'PhanPossiblyNullTypeMismatchProperty',
+		'PhanRedefineClass',
+		'PhanRedefineFunction',
+		'PhanTypeInvalidLeftOperandOfBitwiseOp',
+		'PhanTypeMismatchDimAssignment',
+		// 'PhanPluginDescriptionlessCommentOnProtectedMethod',
+		'PhanPluginPrintfIncompatibleArgumentTypeWeak',
+		'PhanUndeclaredVariableAssignOp',
+		'PhanTypeExpectedObjectOrClassName',
+		'PhanEmptyFQSENInClasslike',
+		'PhanTypeMismatchArgumentInternalReal',
+		// 'PhanUnextractableAnnotationElementName',
+		// 'PhanCommentParamWithoutRealParam',
+		// 'PhanRedefinedExtendedClass',
+		'PhanTypeComparisonFromArray',
+		'PhanPluginConstantVariableBool',
+		'PhanPluginPrintfVariableFormatString',
+		'PhanTypeMismatchDimFetch',
+		'PhanTypeMismatchDimFetchNullable',
+		'PhanTypeSuspiciousNonTraversableForeach',
+		'PhanEmptyForeach',
+		'PhanTypeInvalidRightOperandOfBitwiseOp',
+		'PhanPluginDuplicateConditionalUnnecessary',
+		// 'PhanTraitParentReference',
+		'PhanPluginBothLiteralsBinaryOp',
+		// 'PhanTypeMismatchDeclaredParam',
+		// 'PhanCommentDuplicateMagicMethod',
+		'PhanParamSpecial1',
+		'PhanPluginInlineHTMLLeading',
+		'PhanPluginUseReturnValueInternalKnown',
+		'PhanRedefinedInheritedInterface',
+		'PhanTypeComparisonToArray',
+		'PhanTypeConversionFromArray',
+		// 'PhanTypeInvalidLeftOperandOfIntegerOp',
+		'PhanTypeMismatchArgumentInternalProbablyReal',
+		'PhanTypeMismatchBitwiseBinaryOperands',
+		'PhanTypeMismatchDimEmpty',
+		'PhanTypeSuspiciousEcho',
+		'PhanNoopBinaryOperator',
+		// 'PhanTypeInvalidBitwiseBinaryOperator',
+		// 'PhanPluginDescriptionlessCommentOnFunction',
+		'PhanPluginPHPDocInWrongComment',
+		'PhanRedefineClassInternal',
+		// 'PhanTypeInvalidThrowsIsInterface',
+		'PhanPluginRedundantAssignmentInLoop',
+		// 'PhanInvalidCommentForDeclarationType',
+		'PhanParamSignatureMismatchInternal',
+		// 'PhanPluginEmptyStatementForeachLoop',
+		// 'PhanCompatibleDimAlternativeSyntax',
+		'PhanInvalidFQSENInClasslike',
+		// 'PhanMismatchVariadicComment',
+		// 'PhanNoopConstant',
+		// 'PhanPluginUnknownArrayClosureParamType',
+		// 'PhanTypeInstantiateAbstractStatic',
+		'PhanEmptyForeachBody',
+		// 'PhanPluginEmptyStatementWhileLoop',
+		// 'PhanSyntaxReturnValueInVoid',
+		// 'PhanTypeInstantiateTraitStaticOrSelf',
+		// 'PhanUndeclaredInvokeInCallable',
+		'PhanNoopProperty',
+		'PhanNoopVariable',
+		// 'PhanPluginPrintfUnusedArgument',
+		// 'PhanSyntaxReturnExpectedValue',
+		// 'PhanAccessClassInternal',
+		// 'PhanCompatibleAccessMethodOnTraitDefinition',
+		// 'PhanNoopSwitchCases',
+		// 'PhanNoopTernary',
+		'PhanNoopUnaryOperator',
+		// 'PhanParamNameIndicatingUnusedInClosure',
+		// 'PhanParamSignatureRealMismatchTooFewParametersInternal',
+		// 'PhanPluginEmptyStatementSwitch',
+		'PhanPossiblyUnsetPropertyOfThis',
+		// 'PhanTypeInvalidLeftOperand',
+		// 'PhanTypeInvalidRightOperand',
+		// 'PhanTypeInvalidRightOperandOfIntegerOp',
+		'PhanTypeMismatchArgumentReal',
+		// 'PhanTypeMismatchDeclaredReturnNullable',
+
+		// 'PhanUndeclaredThis',
+		'PhanPluginMixedKeyNoKey',
+		'PhanPluginDuplicateConditionalNullCoalescing', // Suggests to optimize to ??
+		//'PhanUnreferencedClosure',  // False positives seen with closures in arrays, TODO: move closure checks closer to what is done by unused variable plugin
+		//'PhanPluginNoCommentOnProtectedMethod',
+		//'PhanPluginDescriptionlessCommentOnProtectedMethod',
+		//'PhanPluginNoCommentOnPrivateMethod',
+		//'PhanPluginDescriptionlessCommentOnPrivateMethod',
+		//'PhanPluginDescriptionlessCommentOnPrivateProperty',
+		// TODO: Fix edge cases in --automatic-fix for PhanPluginRedundantClosureComment
+		//'PhanPluginRedundantClosureComment',
+		// 'PhanPluginPossiblyStaticPublicMethod',
+		//'PhanPluginPossiblyStaticProtectedMethod',
+
+		// The types of ast\Node->children are all possibly unset.
+		'PhanTypePossiblyInvalidDimOffset', // Also checks optional array keys and requires that they are checked for existence.
+		'PhanUndeclaredGlobalVariable',
+		'PhanUndeclaredProperty',
+		'PhanPluginPrintfNotPercent',
+		'PhanPossiblyUndeclaredGlobalVariable',
+		// 'PhanPluginPossiblyStaticProtectedMethod',
+		'PhanTypeMismatchReturn',
+		// 'PhanPluginMoreSpecificActualReturnType',
+		'PhanTypeMismatchReturnProbablyReal',
+		'PhanPossiblyUndeclaredVariable',
+		'PhanTypeMismatchArgument',
+		//'PhanPluginUnreachableCode',
+		//'PhanTypeMismatchArgumentInternal',
+		//'PhanPluginAlwaysReturnMethod',
+		'PhanUndeclaredClassMethod',
+		'PhanUndeclaredMethod',
+		'PhanTypeMismatchArgumentProbablyReal',
+		'PhanPluginDuplicateExpressionAssignmentOperation',
+		'PhanTypeMismatchPropertyDefault',
+		// 'PhanPluginAlwaysReturnMethod',
+		// 'PhanPluginMissingReturnMethod',
+		'PhanUndeclaredTypeReturnType',
+		'PhanUndeclaredClassProperty',
+		'PhanTypeArraySuspiciousNullable',
+		// 'PhanPluginInconsistentReturnMethod',
+		'PhanTypeExpectedObjectPropAccessButGotNull',
+		// 'PhanUndeclaredClassAttribute',
+		'PhanNonClassMethodCall',
+		// 'PhanPluginNoAssert',
+		'PhanTypeMismatchReturnSuperType',
+		'PhanTypeMismatchArgumentSuperType',
+		'PhanPluginDuplicateConditionalTernaryDuplication',
+	],
+	// You can put relative paths to internal stubs in this config option.
+	// Phan will continue using its detailed type annotations,
+	// but load the constants, classes, functions, and classes (and their Reflection types)
+	// from these stub files (doubling as valid php files).
+	// Use a different extension from php (and preferably a separate folder)
+	// to avoid accidentally parsing these as PHP (includes projects depending on this).
+	// The 'mkstubs' script can be used to generate your own stubs (compatible with php 7.0+ right now)
+	// Note: The array key must be the same as the extension name reported by `php -m`,
+	// so that phan can skip loading the stubs if the extension is actually available.
+	'autoload_internal_extension_signatures' => [
+				// Stubs may be available at https://github.com/JetBrains/phpstorm-stubs/tree/master
+
+		// Xdebug stubs are bundled with Phan 0.10.1+/0.8.9+ for usage,
+		// because Phan disables xdebug by default.
+		//'xdebug'	=> 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
+		//'memcached'  => PHAN_DIR . '/your_internal_stubs_folder_name/memcached.phan_php',
+		//'PDO'  => PHAN_DIR . '/stubs/PDO.phan_php',
+		'brotli'  => PHAN_DIR . '/stubs/brotli.phan_php',
+		'curl'  => PHAN_DIR . '/stubs/curl.phan_php',
+		'calendar'  => PHAN_DIR . '/stubs/calendar.phan_php',
+		'fileinfo'  => PHAN_DIR . '/stubs/fileinfo.phan_php',
+		'ftp'  => PHAN_DIR . '/stubs/ftp.phan_php',
+		'gd'  => PHAN_DIR . '/stubs/gd.phan_php',
+		'geoip'  => PHAN_DIR . '/stubs/geoip.phan_php',
+		'imap'  => PHAN_DIR . '/stubs/imap.phan_php',
+		'intl'  => PHAN_DIR . '/stubs/intl.phan_php',
+		'ldap'  => PHAN_DIR . '/stubs/ldap.phan_php',
+		'mcrypt'  => PHAN_DIR . '/stubs/mcrypt.phan_php',
+		'memcache'  => PHAN_DIR . '/stubs/memcache.phan_php',
+		'mysqli'  => PHAN_DIR . '/stubs/mysqli.phan_php',
+		'pdo_cubrid'  => PHAN_DIR . '/stubs/pdo_cubrid.phan_php',
+		'pdo_mysql'  => PHAN_DIR . '/stubs/pdo_mysql.phan_php',
+		'pdo_pgsql'  => PHAN_DIR . '/stubs/pdo_pgsql.phan_php',
+		'pdo_sqlite'  => PHAN_DIR . '/stubs/pdo_sqlite.phan_php',
+		'pgsql'  => PHAN_DIR . '/stubs/pgsql.phan_php',
+		'session'  => PHAN_DIR . '/stubs/session.phan_php',
+		'simplexml'  => PHAN_DIR . '/stubs/SimpleXML.phan_php',
+		'soap'  => PHAN_DIR . '/stubs/soap.phan_php',
+		'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
+		'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
+	],
+
+];
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
new file mode 100644
index 00000000000..2e748430fe2
--- /dev/null
+++ b/dev/tools/phan/config_extended.php
@@ -0,0 +1,196 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
+define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
+define('PHAN_DIR', __DIR__);
+/**
+ * This configuration will be read and overlaid on top of the
+ * default configuration. Command line arguments will be applied
+ * after this file is read.
+ */
+return [
+	//	'processes' => 6,
+	'backward_compatibility_checks' => false,
+	'simplify_ast' => true,
+	'analyzed_file_extensions' => ['php','inc'],
+	'globals_type_map' => [
+		'conf' => '\Conf',
+		'db' => '\DoliDB',
+		'extrafields' => '\ExtraFields',
+		'hookmanager' => '\HookManager',
+		'langs' => '\Translate',
+		'mysoc' => '\Societe',
+		'nblines' => '\int',
+		'user' => '\User',
+	],
+
+	// Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`, `null`.
+	// If this is set to `null`,
+	// then Phan assumes the PHP version which is closest to the minor version
+	// of the php executable used to execute Phan.
+	//"target_php_version" => null,
+	"target_php_version" => '8.2',
+	//"target_php_version" => '7.3',
+	//"target_php_version" => '5.6',
+
+	// A list of directories that should be parsed for class and
+	// method information. After excluding the directories
+	// defined in exclude_analysis_directory_list, the remaining
+	// files will be statically analyzed for errors.
+	//
+	// Thus, both first-party and third-party code being used by
+	// your application should be included in this list.
+	'directory_list' => [
+		'htdocs',
+		PHAN_DIR . '/stubs/',
+	],
+
+	// A directory list that defines files that will be excluded
+	// from static analysis, but whose class and method
+	// information should be included.
+	//
+	// Generally, you'll want to include the directories for
+	// third-party code (such as "vendor/") in this list.
+	//
+	// n.b.: If you'd like to parse but not analyze 3rd
+	//	party code, directories containing that code
+	//	should be added to the `directory_list` as
+	//	to `exclude_analysis_directory_list`.
+	"exclude_analysis_directory_list" => [
+		'htdocs/includes/',
+		'htdocs/core/class/lessc.class.php', // External library
+		PHAN_DIR . '/stubs/',
+	],
+	//'exclude_file_regex' => '@^vendor/.*/(tests?|Tests?)/@',
+	'exclude_file_regex' => '@^('  // @phpstan-ignore-line
+		.'dummy'  // @phpstan-ignore-line
+		.'|htdocs/.*/canvas/.*/tpl/.*.tpl.php'  // @phpstan-ignore-line
+		.'|htdocs/modulebuilder/template/.*'  // @phpstan-ignore-line
+		// Included as stub (old version + incompatible typing hints)
+		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
+		// Included as stub (did not seem properly analysed by phan without it)
+		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		.')@',  // @phpstan-ignore-line
+
+	// A list of plugin files to execute.
+	// Plugins which are bundled with Phan can be added here by providing their name
+	// (e.g. 'AlwaysReturnPlugin')
+	//
+	// Documentation about available bundled plugins can be found
+	// at https://github.com/phan/phan/tree/master/.phan/plugins
+	//
+	// Alternately, you can pass in the full path to a PHP file
+	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
+	'plugins' => [
+		'DeprecateAliasPlugin',
+		//'EmptyMethodAndFunctionPlugin',
+		'InvalidVariableIssetPlugin',
+		//'MoreSpecificElementTypePlugin',
+		'NoAssertPlugin',
+		'NotFullyQualifiedUsagePlugin',
+		'PHPDocRedundantPlugin',
+		'PHPUnitNotDeadCodePlugin',
+		//'PossiblyStaticMethodPlugin',
+		'PreferNamespaceUsePlugin',
+		'PrintfCheckerPlugin',
+		'RedundantAssignmentPlugin',
+
+		'ConstantVariablePlugin', // Warns about values that are actually constant
+		//'HasPHPDocPlugin', // Requires PHPDoc
+		'InlineHTMLPlugin', // html in PHP file, or at end of file
+		'NonBoolBranchPlugin', // Requires test on bool, nont on ints
+		'NonBoolInLogicalArithPlugin',
+		'NumericalComparisonPlugin',
+		'PHPDocToRealTypesPlugin',
+		'PHPDocInWrongCommentPlugin', // Missing /** (/* was used)
+		//'ShortArrayPlugin', // Checks that [] is used
+		//'StrictLiteralComparisonPlugin',
+		'UnknownClassElementAccessPlugin',
+		'UnknownElementTypePlugin',
+		'WhitespacePlugin',
+		//'RemoveDebugStatementPlugin', // Reports echo, print, ...
+		'SimplifyExpressionPlugin',
+		//'StrictComparisonPlugin', // Expects ===
+		'SuspiciousParamOrderPlugin',
+		'UnsafeCodePlugin',
+		//'UnusedSuppressionPlugin',
+
+		'AlwaysReturnPlugin',
+		//'DollarDollarPlugin',
+		'DuplicateArrayKeyPlugin',
+		'DuplicateExpressionPlugin',
+		'PregRegexCheckerPlugin',
+		'PrintfCheckerPlugin',
+		'SleepCheckerPlugin',
+		// Checks for syntactically unreachable statements in
+		// the global scope or function bodies.
+		'UnreachableCodePlugin',
+		'UseReturnValuePlugin',
+		'EmptyStatementListPlugin',
+		'LoopVariableReusePlugin',
+	],
+
+	// Add any issue types (such as 'PhanUndeclaredMethod')
+	// here to inhibit them from being reported
+	'suppress_issue_types' => [
+		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
+		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
+		'PhanPluginShortArray',			// Dolibarr uses array()
+		'PhanPluginShortArrayList',		// Dolibarr uses array()
+		// The following may require that --quick is not used
+		'PhanPluginCanUseParamType',	// Does not seem useful: is reporting types already in PHPDoc?
+		'PhanPluginCanUseReturnType',	// Does not seem useful: is reporting types already in PHPDoc?
+		'PhanPluginCanUseNullableParamType',	// Does not seem useful: is reporting types already in PHPDoc?
+		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
+		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
+		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
+		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
+		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
+		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
+
+	],
+	// You can put relative paths to internal stubs in this config option.
+	// Phan will continue using its detailed type annotations,
+	// but load the constants, classes, functions, and classes (and their Reflection types)
+	// from these stub files (doubling as valid php files).
+	// Use a different extension from php (and preferably a separate folder)
+	// to avoid accidentally parsing these as PHP (includes projects depending on this).
+	// The 'mkstubs' script can be used to generate your own stubs (compatible with php 7.0+ right now)
+	// Note: The array key must be the same as the extension name reported by `php -m`,
+	// so that phan can skip loading the stubs if the extension is actually available.
+	'autoload_internal_extension_signatures' => [
+				// Stubs may be available at https://github.com/JetBrains/phpstorm-stubs/tree/master
+
+	// Xdebug stubs are bundled with Phan 0.10.1+/0.8.9+ for usage,
+	// because Phan disables xdebug by default.
+	//'xdebug'	=> 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
+	//'memcached'  => PHAN_DIR . '/your_internal_stubs_folder_name/memcached.phan_php',
+	//'PDO'  => PHAN_DIR . '/stubs/PDO.phan_php',
+	'brotli'  => PHAN_DIR . '/stubs/brotli.phan_php',
+	'curl'  => PHAN_DIR . '/stubs/curl.phan_php',
+	'calendar'  => PHAN_DIR . '/stubs/calendar.phan_php',
+	'fileinfo'  => PHAN_DIR . '/stubs/fileinfo.phan_php',
+	'ftp'  => PHAN_DIR . '/stubs/ftp.phan_php',
+	'gd'  => PHAN_DIR . '/stubs/gd.phan_php',
+	'geoip'  => PHAN_DIR . '/stubs/geoip.phan_php',
+	'imap'  => PHAN_DIR . '/stubs/imap.phan_php',
+	'intl'  => PHAN_DIR . '/stubs/intl.phan_php',
+	'ldap'  => PHAN_DIR . '/stubs/ldap.phan_php',
+	'mcrypt'  => PHAN_DIR . '/stubs/mcrypt.phan_php',
+	'memcache'  => PHAN_DIR . '/stubs/memcache.phan_php',
+	'mysqli'  => PHAN_DIR . '/stubs/mysqli.phan_php',
+	'pdo_cubrid'  => PHAN_DIR . '/stubs/pdo_cubrid.phan_php',
+	'pdo_mysql'  => PHAN_DIR . '/stubs/pdo_mysql.phan_php',
+	'pdo_pgsql'  => PHAN_DIR . '/stubs/pdo_pgsql.phan_php',
+	'pdo_sqlite'  => PHAN_DIR . '/stubs/pdo_sqlite.phan_php',
+	'pgsql'  => PHAN_DIR . '/stubs/pgsql.phan_php',
+	'session'  => PHAN_DIR . '/stubs/session.phan_php',
+	'simplexml'  => PHAN_DIR . '/stubs/SimpleXML.phan_php',
+	'soap'  => PHAN_DIR . '/stubs/soap.phan_php',
+	'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
+	'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
+	],
+
+	];
diff --git a/dev/tools/phan/run-phan.sh b/dev/tools/phan/run-phan.sh
new file mode 100755
index 00000000000..f73ee850044
--- /dev/null
+++ b/dev/tools/phan/run-phan.sh
@@ -0,0 +1,99 @@
+#!/bin/bash -xv
+# Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+
+
+#
+# Usage:
+#   Optionally set COMPOSER_CMD to allow running composer.
+#   Optionally point COMPOSER_VENDOR_DIR to your vendor path for composer.
+#
+#   Run phan by calling this script:
+#     ./run-phan.sh      # Only checks
+#     ./run-phan.sh 1    # Regenerate the baseline.txt file
+#
+#   You can run this from the root directory of dolibarr
+#     dev/tools/run-phan.sh
+#
+#   You can provide the environment variables on the CLI like this:
+#     COMPOSER_CMD="php ~/composer.phar" COMPOSER_VENDOR_DIR="~/vendor" ./run-phan.sh
+#
+#   or export them:
+#     export COMPOSER_CMD="~/composer.phar"
+#     export COMPOSER_VENDOR_DIR="~/vendor"
+#     ./run-phan.sh
+#
+#  Or some other method
+#
+#
+
+MYDIR=$(dirname "$(realpath "$0")")
+PROJECT_DIR=$(realpath "${MYDIR}/../../..")
+
+if [[ $(uname) = CYGWIN* ]] ; then
+	MYDIR="$(cygpath -w "$MYDIR")"
+	PROJECT_DIR="$(cygpath -w "$PROJECT_DIR")"
+fi
+BASELINE=${MYDIR}/baseline.txt
+PHAN_CONFIG=${PHAN_CONFIG:=${MYDIR}/config.php}
+export COMPOSER_VENDOR_DIR=${COMPOSER_VENDOR_DIR:=$MYDIR/vendor}
+COMPOSER_CMD=${COMPOSER_CMD:=${MYDIR}/../composer.phar}
+PHAN=${COMPOSER_VENDOR_DIR}/bin/phan
+PHP=${PHP:=php${MINPHPVERSION}}
+
+# Check if we should use the extended configuration
+if [ "$1" = "full" ] ; then
+	shift
+	PHAN_CONFIG=${MYDIR}/config_extended.php
+	BASELINE=${MYDIR}/baseline_extended.txt
+fi
+
+if [ "$1" = "1" ] ; then
+	shift
+	BASELINE_OPT=(--save-baseline "${BASELINE}")
+elif [ -r "${BASELINE}" ] ; then
+	BASELINE_OPT=(--load-baseline "${BASELINE}")
+fi
+export BASELINE_OPT
+
+
+
+echo "***** $(basename "$0") *****"
+
+
+if [ ! -x "${PHAN}" ] && [ "$(which phan 2>/dev/null)" != "" ] ; then
+	PHAN=phan
+fi
+
+if [ ! -x "${PHAN}" ] ; then
+	#
+	# Check composer is available
+	#
+	if [ ! -r "${COMPOSER_CMD}" ] ; then
+		echo composer is not available. Provide the path by setting COMPOSER_CMD=/path/to/composer
+		echo Example: export COMPOSER_CMD="~/composer.phar"
+		echo Example: export COMPOSER_CMD="/usr/local/bin/composer"
+		exit 1
+	fi
+
+
+	#
+	# Install/update phan
+	#
+	echo Install phan
+	if [ ! -r "${PHAN}" ] ; then
+		# shellcheck disable=2086
+		[[ ! -e "${COMPOSER_VENDOR_DIR}" ]] && "${PHP}" ${COMPOSER_CMD} install
+		# shellcheck disable=2086
+		[[ -e "${COMPOSER_VENDOR_DIR}" ]] && "${PHP}" ${COMPOSER_CMD} update
+		"${PHP}" "${COMPOSER_CMD}" require --dev phan/phan
+		echo
+	fi
+fi
+
+(
+	echo "cd '${PROJECT_DIR}'"
+	cd "${PROJECT_DIR}" || exit
+	echo "\"${PHAN}\" --analyze-twice --config-file \"${PHAN_CONFIG}\" --memory-limit 4096M ${BASELINE_OPT}""$*"
+	# shellcheck disable=2086,2090
+	"${PHAN}" --analyze-twice --config-file "${PHAN_CONFIG}" --memory-limit 4096M "${BASELINE_OPT[@]}" "$@"
+)
diff --git a/dev/tools/phan/runPhanDocker.sh b/dev/tools/phan/runPhanDocker.sh
new file mode 100755
index 00000000000..54a6d535729
--- /dev/null
+++ b/dev/tools/phan/runPhanDocker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# Script compatible with Cygwin
+# When argument is '1', save baseline
+#
+# Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+
+MYPATH=$(realpath "$(dirname "$(readlink -f "$0")")/../../..")
+if [[ $(uname) = CYGWIN* ]] ; then
+	MYPATH="$(cygpath -w "$MYPATH")"
+fi
+
+# BASELINE_PATH=.phan/baseline.txt
+CONFIG_PATH=dev/tools/phan/config.php
+BASELINE_PATH=dev/tools/phan/baseline.txt
+
+# When full is provided as an argument,
+# still use the baseline, but verify all
+# rules.
+if [ "$1" = "full" ] || [ "$2" = "full" ] ; then
+	CONFIG_PATH=dev/tools/phan/config_extended.php
+fi
+
+if [ "$1" = "1" ] ; then
+	docker run -v "$MYPATH:/mnt/src" phanphp/phan:latest  -k /mnt/src/${CONFIG_PATH} --analyze-twice --save-baseline /mnt/src/${BASELINE_PATH}
+else
+	docker run -v "$MYPATH:/mnt/src" phanphp/phan:latest  -k /mnt/src/${CONFIG_PATH} -B /mnt/src/${BASELINE_PATH} --analyze-twice
+fi
diff --git a/dev/tools/phan/stubs/GeoIP2.php b/dev/tools/phan/stubs/GeoIP2.php
new file mode 100644
index 00000000000..9ee16447fa2
--- /dev/null
+++ b/dev/tools/phan/stubs/GeoIP2.php
@@ -0,0 +1,1293 @@
+<?php
+// phpcs:disable PEAR.Commenting
+
+namespace MaxMind\Exception {
+	class WebServiceException extends \Exception
+	{
+	}
+	class HttpException extends \MaxMind\Exception\WebServiceException
+	{
+		public function __construct($message, $httpStatus, $uri, \Exception $previous = null)
+		{
+		}
+		public function getUri()
+		{
+		}
+		public function getStatusCode()
+		{
+		}
+	}
+	class InvalidRequestException extends \MaxMind\Exception\HttpException
+	{
+		public function __construct($message, $error, $httpStatus, $uri, \Exception $previous = null)
+		{
+		}
+		public function getErrorCode()
+		{
+		}
+	}
+	class AuthenticationException extends \MaxMind\Exception\InvalidRequestException
+	{
+	}
+	class InsufficientFundsException extends \MaxMind\Exception\InvalidRequestException
+	{
+	}
+	class InvalidInputException extends \MaxMind\Exception\WebServiceException
+	{
+	}
+	class IpAddressNotFoundException extends \MaxMind\Exception\InvalidRequestException
+	{
+	}
+	class PermissionRequiredException extends \MaxMind\Exception\InvalidRequestException
+	{
+	}
+}
+
+namespace MaxMind\WebService {
+	class Client
+	{
+		const VERSION = '0.2.0';
+		public function __construct($accountId, $licenseKey, $options = [])
+		{
+		}
+		public function post($service, $path, $input)
+		{
+		}
+		public function get($service, $path)
+		{
+		}
+	}
+}
+
+namespace MaxMind\WebService\Http {
+	interface Request
+	{
+		public function __construct($url, $options);
+		public function post($body);
+		public function get();
+	}
+	class CurlRequest implements \MaxMind\WebService\Http\Request
+	{
+		public function __construct($url, $options)
+		{
+		}
+		public function post($body)
+		{
+		}
+		public function get()
+		{
+		}
+	}
+	class RequestFactory
+	{
+		public function __construct()
+		{
+		}
+		public function request($url, $options)
+		{
+		}
+	}
+}
+
+namespace GeoIp2 {
+	interface ProviderInterface
+	{
+		/**
+		 * @param string $ipAddress an IPv4 or IPv6 address to lookup
+		 *
+		 * @return \GeoIp2\Model\Country a Country model for the requested IP address
+		 */
+		public function country(string $ipAddress) : \GeoIp2\Model\Country;
+		/**
+		 * @param string $ipAddress an IPv4 or IPv6 address to lookup
+		 *
+		 * @return \GeoIp2\Model\City a City model for the requested IP address
+		 */
+		public function city(string $ipAddress) : \GeoIp2\Model\City;
+	}
+}
+
+namespace GeoIp2\Database {
+	/**
+	 * Instances of this class provide a reader for the GeoIP2 database format.
+	 * IP addresses can be looked up using the database specific methods.
+	 *
+	 * ## Usage ##
+	 *
+	 * The basic API for this class is the same for every database. First, you
+	 * create a reader object, specifying a file name. You then call the method
+	 * corresponding to the specific database, passing it the IP address you want
+	 * to look up.
+	 *
+	 * If the request succeeds, the method call will return a model class for
+	 * the method you called. This model in turn contains multiple record classes,
+	 * each of which represents part of the data returned by the database. If
+	 * the database does not contain the requested information, the attributes
+	 * on the record class will have a `null` value.
+	 *
+	 * If the address is not in the database, an
+	 * {@link \GeoIp2\Exception\AddressNotFoundException} exception will be
+	 * thrown. If an invalid IP address is passed to one of the methods, a
+	 * SPL {@link \InvalidArgumentException} will be thrown. If the database is
+	 * corrupt or invalid, a {@link \MaxMind\Db\Reader\InvalidDatabaseException}
+	 * will be thrown.
+	 */
+	class Reader implements \GeoIp2\ProviderInterface
+	{
+		/**
+		 * Constructor.
+		 *
+		 * @param string $filename the path to the GeoIP2 database file
+		 * @param array  $locales  list of locale codes to use in name property
+		 *                         from most preferred to least preferred
+		 *
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function __construct(string $filename, array $locales = ['en'])
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 City model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function city(string $ipAddress) : \GeoIp2\Model\City
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 Country model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function country(string $ipAddress) : \GeoIp2\Model\Country
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 Anonymous IP model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function anonymousIp(string $ipAddress) : \GeoIp2\Model\AnonymousIp
+		{
+		}
+		/**
+		 * This method returns a GeoLite2 ASN model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function asn(string $ipAddress) : \GeoIp2\Model\Asn
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 Connection Type model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function connectionType(string $ipAddress) : \GeoIp2\Model\ConnectionType
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 Domain model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function domain(string $ipAddress) : \GeoIp2\Model\Domain
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 Enterprise model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function enterprise(string $ipAddress) : \GeoIp2\Model\Enterprise
+		{
+		}
+		/**
+		 * This method returns a GeoIP2 ISP model.
+		 *
+		 * @param string $ipAddress an IPv4 or IPv6 address as a string
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException  if the address is
+		 *                                                     not in the database
+		 * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database
+		 *                                                     is corrupt or invalid
+		 */
+		public function isp(string $ipAddress) : \GeoIp2\Model\Isp
+		{
+		}
+		/**
+		 * @throws \InvalidArgumentException if arguments are passed to the method
+		 * @throws \BadMethodCallException   if the database has been closed
+		 *
+		 * @return \MaxMind\Db\Reader\Metadata object for the database
+		 */
+		public function metadata() : \MaxMind\Db\Reader\Metadata
+		{
+		}
+		/**
+		 * Closes the GeoIP2 database and returns the resources to the system.
+		 */
+		public function close() : void
+		{
+		}
+	}
+}
+
+namespace GeoIp2\Exception {
+	/**
+	 * This class represents a generic error.
+	 */
+	// phpcs:disable
+	class GeoIp2Exception extends \Exception
+	{
+	}
+	/**
+	 * This class represents a generic error.
+	 */
+	// phpcs:disable
+	class AddressNotFoundException extends \GeoIp2\Exception\GeoIp2Exception
+	{
+	}
+	/**
+	 * This class represents a generic error.
+	 */
+	// phpcs:disable
+	class AuthenticationException extends \GeoIp2\Exception\GeoIp2Exception
+	{
+	}
+	/**
+	 *  This class represents an HTTP transport error.
+	 */
+	class HttpException extends \GeoIp2\Exception\GeoIp2Exception
+	{
+		/**
+		 * The URI queried.
+		 */
+		public string $uri;
+		public function __construct(string $message, int $httpStatus, string $uri, \Exception $previous = null)
+		{
+		}
+	}
+	/**
+	 * This class represents an error returned by MaxMind's GeoIP2
+	 * web service.
+	 */
+	class InvalidRequestException extends \GeoIp2\Exception\HttpException
+	{
+		/**
+		 * The code returned by the MaxMind web service.
+		 */
+		public string $error;
+		public function __construct(string $message, string $error, int $httpStatus, string $uri, \Exception $previous = null)
+		{
+		}
+	}
+	/**
+	 * This class represents a generic error.
+	 */
+	// phpcs:disable
+	class OutOfQueriesException extends \GeoIp2\Exception\GeoIp2Exception
+	{
+	}
+}
+
+namespace GeoIp2\Model {
+	/**
+	 * This class provides the GeoIP2 Anonymous IP model.
+	 */
+	class AnonymousIp implements \JsonSerializable
+	{
+		/**
+		 * @var bool this is true if the IP address belongs to
+		 *           any sort of anonymous network
+		 */
+		public readonly bool $isAnonymous;
+		/**
+		 * @var bool This is true if the IP address is
+		 *           registered to an anonymous VPN provider. If a VPN provider does not
+		 *           register subnets under names associated with them, we will likely only
+		 *           flag their IP ranges using the isHostingProvider property.
+		 */
+		public readonly bool $isAnonymousVpn;
+		/**
+		 * @var bool this is true if the IP address belongs
+		 *           to a hosting or VPN provider (see description of isAnonymousVpn property)
+		 */
+		public readonly bool $isHostingProvider;
+		/**
+		 * @var bool this is true if the IP address belongs to
+		 *           a public proxy
+		 */
+		public readonly bool $isPublicProxy;
+		/**
+		 * @var bool this is true if the IP address is
+		 *           on a suspected anonymizing network and belongs to a residential ISP
+		 */
+		public readonly bool $isResidentialProxy;
+		/**
+		 * @var bool this is true if the IP address is a Tor
+		 *           exit node
+		 */
+		public readonly bool $isTorExitNode;
+		/**
+		 * @var string the IP address that the data in the model is
+		 *             for
+		 */
+		public readonly string $ipAddress;
+		/**
+		 * @var string The network in CIDR notation associated with
+		 *             the record. In particular, this is the largest network where all of the
+		 *             fields besides $ipAddress have the same value.
+		 */
+		public readonly string $network;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw)
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+	/**
+	 * This class provides the GeoLite2 ASN model.
+	 */
+	class Asn implements \JsonSerializable
+	{
+		/**
+		 * @var int|null the autonomous system number
+		 *               associated with the IP address
+		 */
+		public readonly ?int $autonomousSystemNumber;
+		/**
+		 * @var string|null the organization
+		 *                  associated with the registered autonomous system number for the IP
+		 *                  address
+		 */
+		public readonly ?string $autonomousSystemOrganization;
+		/**
+		 * @var string the IP address that the data in the model is
+		 *             for
+		 */
+		public readonly string $ipAddress;
+		/**
+		 * @var string The network in CIDR notation associated with
+		 *             the record. In particular, this is the largest network where all of the
+		 *             fields besides $ipAddress have the same value.
+		 */
+		public readonly string $network;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw)
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+	/**
+	 * Model class for the data returned by GeoIP2 Country web service and database.
+	 *
+	 * See https://dev.maxmind.com/geoip/docs/web-services?lang=en for more details.
+	 */
+	class Country implements \JsonSerializable
+	{
+		/**
+		 * @var \GeoIp2\Record\Continent continent data for the
+		 *                               requested IP address
+		 */
+		public readonly \GeoIp2\Record\Continent $continent;
+		/**
+		 * @var \GeoIp2\Record\Country Country data for the requested
+		 *                             IP address. This object represents the country where MaxMind believes the
+		 *                             end user is located.
+		 */
+		public readonly \GeoIp2\Record\Country $country;
+		/**
+		 * @var \GeoIp2\Record\MaxMind data related to your MaxMind
+		 *                             account
+		 */
+		public readonly \GeoIp2\Record\MaxMind $maxmind;
+		/**
+		 * @var \GeoIp2\Record\Country Registered country
+		 *                             data for the requested IP address. This record represents the country
+		 *                             where the ISP has registered a given IP block and may differ from the
+		 *                             user's country.
+		 */
+		public readonly \GeoIp2\Record\Country $registeredCountry;
+		/**
+		 * @var \GeoIp2\Record\RepresentedCountry * Represented country data for the requested IP address. The represented
+		 *                                        country is used for things like military bases. It is only present when
+		 *                                        the represented country differs from the country.
+		 */
+		public readonly \GeoIp2\Record\RepresentedCountry $representedCountry;
+		/**
+		 * @var \GeoIp2\Record\Traits data for the traits of the
+		 *                            requested IP address
+		 */
+		public readonly \GeoIp2\Record\Traits $traits;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+	/**
+	 * Model class for the data returned by City Plus web service and City
+	 * database.
+	 *
+	 * See https://dev.maxmind.com/geoip/docs/web-services?lang=en for more
+	 * details.
+	 */
+	class City extends \GeoIp2\Model\Country
+	{
+		/**
+		 * @var \GeoIp2\Record\City city data for the requested IP
+		 *                          address
+		 */
+		public readonly \GeoIp2\Record\City $city;
+		/**
+		 * @var \GeoIp2\Record\Location location data for the
+		 *                              requested IP address
+		 */
+		public readonly \GeoIp2\Record\Location $location;
+		/**
+		 * @var \GeoIp2\Record\Subdivision An object
+		 *                                 representing the most specific subdivision returned. If the response
+		 *                                 did not contain any subdivisions, this method returns an empty
+		 *                                 \GeoIp2\Record\Subdivision object.
+		 */
+		public readonly \GeoIp2\Record\Subdivision $mostSpecificSubdivision;
+		/**
+		 * @var \GeoIp2\Record\Postal postal data for the
+		 *                            requested IP address
+		 */
+		public readonly \GeoIp2\Record\Postal $postal;
+		/**
+		 * @var array<\GeoIp2\Record\Subdivision> An array of \GeoIp2\Record\Subdivision
+		 *                                        objects representing the country subdivisions for the requested IP
+		 *                                        address. The number and type of subdivisions varies by country, but a
+		 *                                        subdivision is typically a state, province, county, etc. Subdivisions
+		 *                                        are ordered from most general (largest) to most specific (smallest).
+		 *                                        If the response did not contain any subdivisions, this method returns
+		 *                                        an empty array.
+		 */
+		public readonly array $subdivisions;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+	/**
+	 * This class provides the GeoIP2 Connection-Type model.
+	 */
+	class ConnectionType implements \JsonSerializable
+	{
+		/**
+		 * @var string|null The connection type may take the
+		 *                  following values: "Dialup", "Cable/DSL", "Corporate", "Cellular", and
+		 *                  "Satellite". Additional values may be added in the future.
+		 */
+		public readonly ?string $connectionType;
+		/**
+		 * @var string the IP address that the data in the model is
+		 *             for
+		 */
+		public readonly string $ipAddress;
+		/**
+		 * @var string The network in CIDR notation associated with
+		 *             the record. In particular, this is the largest network where all of the
+		 *             fields besides $ipAddress have the same value.
+		 */
+		public readonly string $network;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw)
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+	/**
+	 * This class provides the GeoIP2 Domain model.
+	 */
+	class Domain implements \JsonSerializable
+	{
+		/**
+		 * @var string|null The second level domain associated with the
+		 *                  IP address. This will be something like "example.com" or
+		 *                  "example.co.uk", not "foo.example.com".
+		 */
+		public readonly ?string $domain;
+		/**
+		 * @var string the IP address that the data in the model is
+		 *             for
+		 */
+		public readonly string $ipAddress;
+		/**
+		 * @var string The network in CIDR notation associated with
+		 *             the record. In particular, this is the largest network where all of the
+		 *             fields besides $ipAddress have the same value.
+		 */
+		public readonly string $network;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw)
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+	/**
+	 * Model class for the data returned by GeoIP2 Enterprise database lookups.
+	 *
+	 * See https://dev.maxmind.com/geoip/docs/web-services?lang=en for more
+	 * details.
+	 */
+	// phpcs:disable
+	class Enterprise extends \GeoIp2\Model\City
+	{
+	}
+	/**
+	 * Model class for the data returned by GeoIP2 Insights web service.
+	 *
+	 * See https://dev.maxmind.com/geoip/docs/web-services?lang=en for
+	 * more details.
+	 */
+	// phpcs:disable
+	class Insights extends \GeoIp2\Model\City
+	{
+	}
+	/**
+	 * This class provides the GeoIP2 ISP model.
+	 */
+	class Isp implements \JsonSerializable
+	{
+		/**
+		 * @var int|null the autonomous system number
+		 *               associated with the IP address
+		 */
+		public readonly ?int $autonomousSystemNumber;
+		/**
+		 * @var string|null the organization
+		 *                  associated with the registered autonomous system number for the IP
+		 *                  address
+		 */
+		public readonly ?string $autonomousSystemOrganization;
+		/**
+		 * @var string|null the name of the ISP associated with the IP
+		 *                  address
+		 */
+		public readonly ?string $isp;
+		/**
+		 * @var string|null The [mobile country code
+		 *                  (MCC)](https://en.wikipedia.org/wiki/Mobile_country_code) associated with
+		 *                  the IP address and ISP.
+		 */
+		public readonly ?string $mobileCountryCode;
+		/**
+		 * @var string|null The [mobile network code
+		 *                  (MNC)](https://en.wikipedia.org/wiki/Mobile_country_code) associated with
+		 *                  the IP address and ISP.
+		 */
+		public readonly ?string $mobileNetworkCode;
+		/**
+		 * @var string|null the name of the organization associated
+		 *                  with the IP address
+		 */
+		public readonly ?string $organization;
+		/**
+		 * @var string the IP address that the data in the model is
+		 *             for
+		 */
+		public readonly string $ipAddress;
+		/**
+		 * @var string The network in CIDR notation associated with
+		 *             the record. In particular, this is the largest network where all of the
+		 *             fields besides $ipAddress have the same value.
+		 */
+		public readonly string $network;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $raw)
+		{
+		}
+		public function jsonSerialize() : ?array
+		{
+		}
+	}
+}
+
+namespace GeoIp2\Record {
+	abstract class AbstractNamedRecord implements \JsonSerializable
+	{
+		/**
+		 * @var string|null The name based on the locales list
+		 *                  passed to the constructor. This attribute is returned by all location
+		 *                  services and databases.
+		 */
+		public readonly ?string $name;
+		/**
+		 * @var array An array map where the keys are locale codes
+		 *            and the values are names. This attribute is returned by all location
+		 *            services and databases.
+		 */
+		public readonly array $names;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	abstract class AbstractPlaceRecord extends \GeoIp2\Record\AbstractNamedRecord
+	{
+		/**
+		 * @var int|null A value from 0-100 indicating MaxMind's
+		 *               confidence that the location level is correct. This attribute is only available
+		 *               from the Insights service and the GeoIP2 Enterprise database.
+		 */
+		public readonly ?int $confidence;
+		/**
+		 * @var int|null The GeoName ID for the location level. This attribute
+		 *               is returned by all location services and databases.
+		 */
+		public readonly ?int $geonameId;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * City-level data associated with an IP address.
+	 *
+	 * This record is returned by all location services and databases besides
+	 * Country.
+	 */
+	// phpcs:disable
+	class City extends \GeoIp2\Record\AbstractPlaceRecord
+	{
+	}
+	/**
+	 * Contains data for the continent record associated with an IP address.
+	 *
+	 * This record is returned by all location services and databases.
+	 */
+	class Continent extends \GeoIp2\Record\AbstractNamedRecord
+	{
+		/**
+		 * @var string|null A two character continent code like "NA" (North
+		 *                  America) or "OC" (Oceania). This attribute is returned by all location
+		 *                  services and databases.
+		 */
+		public readonly ?string $code;
+		/**
+		 * @var int|null The GeoName ID for the continent. This
+		 *               attribute is returned by all location services and databases.
+		 */
+		public readonly ?int $geonameId;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data for the country record associated with an IP address.
+	 *
+	 * This record is returned by all location services and databases.
+	 */
+	class Country extends \GeoIp2\Record\AbstractPlaceRecord
+	{
+		/**
+		 * @var bool This is true if the country is a
+		 *           member state of the European Union. This attribute is returned by all
+		 *           location services and databases.
+		 */
+		public readonly bool $isInEuropeanUnion;
+		/**
+		 * @var string|null The two-character ISO 3166-1 alpha code
+		 *                  for the country. See https://en.wikipedia.org/wiki/ISO_3166-1. This
+		 *                  attribute is returned by all location services and databases.
+		 */
+		public readonly ?string $isoCode;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data for the location record associated with an IP address.
+	 *
+	 * This record is returned by all location services and databases besides
+	 * Country.
+	 */
+	class Location implements \JsonSerializable
+	{
+		/**
+		 * @var int|null The average income in US dollars
+		 *               associated with the requested IP address. This attribute is only available
+		 *               from the Insights service.
+		 */
+		public readonly ?int $averageIncome;
+		/**
+		 * @var int|null The approximate accuracy radius in
+		 *               kilometers around the latitude and longitude for the IP address. This is
+		 *               the radius where we have a 67% confidence that the device using the IP
+		 *               address resides within the circle centered at the latitude and longitude
+		 *               with the provided radius.
+		 */
+		public readonly ?int $accuracyRadius;
+		/**
+		 * @var float|null The approximate latitude of the location
+		 *                 associated with the IP address. This value is not precise and should not be
+		 *                 used to identify a particular address or household.
+		 */
+		public readonly ?float $latitude;
+		/**
+		 * @var float|null The approximate longitude of the location
+		 *                 associated with the IP address. This value is not precise and should not be
+		 *                 used to identify a particular address or household.
+		 */
+		public readonly ?float $longitude;
+		/**
+		 * @var int|null The metro code of the location if the location
+		 *               is in the US. MaxMind returns the same metro codes as the
+		 *               Google AdWords API. See
+		 *               https://developers.google.com/adwords/api/docs/appendix/cities-DMAregions.
+		 */
+		public readonly ?int $metroCode;
+		/**
+		 * @var int|null The estimated population per square
+		 *               kilometer associated with the IP address. This attribute is only available
+		 *               from the Insights service.
+		 */
+		public readonly ?int $populationDensity;
+		/**
+		 * @var string|null The time zone associated with location, as
+		 *                  specified by the IANA Time Zone Database, e.g., "America/New_York". See
+		 *                  https://www.iana.org/time-zones.
+		 */
+		public readonly ?string $timeZone;
+		public function __construct(array $record)
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data about your account.
+	 *
+	 * This record is returned by all location services and databases.
+	 */
+	class MaxMind implements \JsonSerializable
+	{
+		/**
+		 * @var int|null the number of remaining queries you
+		 *               have for the service you are calling
+		 */
+		public readonly ?int $queriesRemaining;
+		public function __construct(array $record)
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data for the postal record associated with an IP address.
+	 *
+	 * This record is returned by all location databases and services besides
+	 * Country.
+	 */
+	class Postal implements \JsonSerializable
+	{
+		/**
+		 * @var string|null The postal code of the location. Postal codes
+		 *                  are not available for all countries. In some countries, this will only
+		 *                  contain part of the postal code. This attribute is returned by all location
+		 *                  databases and services besides Country.
+		 */
+		public readonly ?string $code;
+		/**
+		 * @var int|null A value from 0-100 indicating MaxMind's
+		 *               confidence that the postal code is correct. This attribute is only
+		 *               available from the Insights service and the GeoIP2 Enterprise
+		 *               database.
+		 */
+		public readonly ?int $confidence;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record)
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data for the represented country associated with an IP address.
+	 *
+	 * This class contains the country-level data associated with an IP address
+	 * for the IP's represented country. The represented country is the country
+	 * represented by something like a military base.
+	 */
+	class RepresentedCountry extends \GeoIp2\Record\Country
+	{
+		/**
+		 * @var string|null A string indicating the type of entity that is
+		 *                  representing the country. Currently we only return <code>military</code>
+		 *                  but this could expand to include other types in the future.
+		 */
+		public readonly ?string $type;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data for the subdivisions associated with an IP address.
+	 *
+	 * This record is returned by all location databases and services besides
+	 * Country.
+	 */
+	class Subdivision extends \GeoIp2\Record\AbstractPlaceRecord
+	{
+		/**
+		 * @var string|null This is a string up to three characters long
+		 *                  contain the subdivision portion of the ISO 3166-2 code. See
+		 *                  https://en.wikipedia.org/wiki/ISO_3166-2. This attribute is returned by all
+		 *                  location databases and services except Country.
+		 */
+		public readonly ?string $isoCode;
+		/**
+		 * @ignore
+		 */
+		public function __construct(array $record, array $locales = ['en'])
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+	/**
+	 * Contains data for the traits record associated with an IP address.
+	 *
+	 * This record is returned by all location services and databases.
+	 */
+	class Traits implements \JsonSerializable
+	{
+		/**
+		 * @var int|null The autonomous system number
+		 *               associated with the IP address. See
+		 *               https://en.wikipedia.org/wiki/Autonomous_system_(Internet%29. This attribute
+		 *               is only available from the City Plus and Insights web services and the
+		 *               GeoIP2 Enterprise database.
+		 */
+		public readonly ?int $autonomousSystemNumber;
+		/**
+		 * @var string|null The organization
+		 *                  associated with the registered autonomous system number for the IP address.
+		 *                  See https://en.wikipedia.org/wiki/Autonomous_system_(Internet%29. This
+		 *                  attribute is only available from the City Plus and Insights web services and
+		 *                  the GeoIP2 Enterprise database.
+		 */
+		public readonly ?string $autonomousSystemOrganization;
+		/**
+		 * @var string|null The connection type may take the
+		 *                  following  values: "Dialup", "Cable/DSL", "Corporate", "Cellular", and
+		 *                  "Satellite". Additional values may be added in the future. This attribute is
+		 *                  only available from the City Plus and Insights web services and the GeoIP2
+		 *                  Enterprise database.
+		 */
+		public readonly ?string $connectionType;
+		/**
+		 * @var string|null The second level domain associated with the
+		 *                  IP address. This will be something like "example.com" or "example.co.uk",
+		 *                  not "foo.example.com". This attribute is only available from the
+		 *                  City Plus and Insights web services and the GeoIP2 Enterprise
+		 *                  database.
+		 */
+		public readonly ?string $domain;
+		/**
+		 * @var string|null The IP address that the data in the model
+		 *                  is for. If you performed a "me" lookup against the web service, this
+		 *                  will be the externally routable IP address for the system the code is
+		 *                  running on. If the system is behind a NAT, this may differ from the IP
+		 *                  address locally assigned to it. This attribute is returned by all end
+		 *                  points.
+		 */
+		public readonly ?string $ipAddress;
+		/**
+		 * @var bool This is true if the IP address belongs to
+		 *           any sort of anonymous network. This property is only available from GeoIP2
+		 *           Insights.
+		 */
+		public readonly bool $isAnonymous;
+		/**
+		 * @var bool This is true if the IP address is
+		 *           registered to an anonymous VPN provider. If a VPN provider does not register
+		 *           subnets under names associated with them, we will likely only flag their IP
+		 *           ranges using the isHostingProvider property. This property is only available
+		 *           from GeoIP2 Insights.
+		 */
+		public readonly bool $isAnonymousVpn;
+		/**
+		 * @var bool This is true if the IP address belongs to an [anycast
+		 *           network](https://en.wikipedia.org/wiki/Anycast). This property is not
+		 *           available from GeoLite databases or web services.
+		 */
+		public readonly bool $isAnycast;
+		/**
+		 * @var bool This is true if the IP address belongs
+		 *           to a hosting or VPN provider (see description of isAnonymousVpn property).
+		 *           This property is only available from GeoIP2 Insights.
+		 */
+		public readonly bool $isHostingProvider;
+		/**
+		 * @var bool This attribute is true if MaxMind
+		 *           believes this IP address to be a legitimate proxy, such as an internal
+		 *           VPN used by a corporation. This attribute is only available in the GeoIP2
+		 *           Enterprise database.
+		 */
+		public readonly bool $isLegitimateProxy;
+		/**
+		 * @var bool This is true if the IP address belongs to
+		 *           a public proxy. This property is only available from GeoIP2 Insights.
+		 */
+		public readonly bool $isPublicProxy;
+		/**
+		 * @var bool This is true if the IP address is
+		 *           on a suspected anonymizing network and belongs to a residential ISP. This
+		 *           property is only available from GeoIP2 Insights.
+		 */
+		public readonly bool $isResidentialProxy;
+		/**
+		 * @var bool This is true if the IP address is a Tor
+		 *           exit node. This property is only available from GeoIP2 Insights.
+		 */
+		public readonly bool $isTorExitNode;
+		/**
+		 * @var string|null The name of the ISP associated with the IP
+		 *                  address. This attribute is only available from the City Plus and Insights
+		 *                  web services and the GeoIP2 Enterprise database.
+		 */
+		public readonly ?string $isp;
+		/**
+		 * @var string|null The [mobile country code
+		 *                  (MCC)](https://en.wikipedia.org/wiki/Mobile_country_code) associated with
+		 *                  the IP address and ISP. This property is available from the City Plus and
+		 *                  Insights web services and the GeoIP2 Enterprise database.
+		 */
+		public readonly ?string $mobileCountryCode;
+		/**
+		 * @var string|null The [mobile network code
+		 *                  (MNC)](https://en.wikipedia.org/wiki/Mobile_country_code) associated with
+		 *                  the IP address and ISP. This property is available from the City Plus and
+		 *                  Insights web services and the GeoIP2 Enterprise database.
+		 */
+		public readonly ?string $mobileNetworkCode;
+		/**
+		 * @var string|null The network in CIDR notation associated with
+		 *                  the record. In particular, this is the largest network where all of the
+		 *                  fields besides $ipAddress have the same value.
+		 */
+		public readonly ?string $network;
+		/**
+		 * @var string|null The name of the organization
+		 *                  associated with the IP address. This attribute is only available from the
+		 *                  City Plus and Insights web services and the GeoIP2 Enterprise database.
+		 */
+		public readonly ?string $organization;
+		/**
+		 * @var float|null An indicator of how static or
+		 *                 dynamic an IP address is. This property is only available from GeoIP2
+		 *                 Insights.
+		 */
+		public readonly ?float $staticIpScore;
+		/**
+		 * @var int|null The estimated number of users sharing
+		 *               the IP/network during the past 24 hours. For IPv4, the count is for the
+		 *               individual IP. For IPv6, the count is for the /64 network. This property is
+		 *               only available from GeoIP2 Insights.
+		 */
+		public readonly ?int $userCount;
+		/**
+		 * @var string|null <p>The user type associated with the IP
+		 *  address. This can be one of the following values:</p>
+		 *  <ul>
+		 *    <li>business
+		 *    <li>cafe
+		 *    <li>cellular
+		 *    <li>college
+		 *    <li>consumer_privacy_network
+		 *    <li>content_delivery_network
+		 *    <li>dialup
+		 *    <li>government
+		 *    <li>hosting
+		 *    <li>library
+		 *    <li>military
+		 *    <li>residential
+		 *    <li>router
+		 *    <li>school
+		 *    <li>search_engine_spider
+		 *    <li>traveler
+		 * </ul>
+		 * <p>
+		 *   This attribute is only available from the Insights web service and the
+		 *   GeoIP2 Enterprise database.
+		 * </p>
+		 */
+		public readonly ?string $userType;
+		public function __construct(array $record)
+		{
+		}
+		public function jsonSerialize() : array
+		{
+		}
+	}
+}
+
+namespace GeoIp2 {
+	class Util
+	{
+		/**
+		 * This returns the network in CIDR notation for the given IP and prefix
+		 * length. This is for internal use only.
+		 *
+		 * @internal
+		 *
+		 * @ignore
+		 */
+		public static function cidr(string $ipAddress, int $prefixLen) : string
+		{
+		}
+	}
+}
+
+namespace GeoIp2\WebService {
+	/**
+	 * This class provides a client API for all the GeoIP2 web services.
+	 * The services are Country, City Plus, and Insights. Each service returns
+	 * a different set of data about an IP address, with Country returning the
+	 * least data and Insights the most.
+	 *
+	 * Each web service is represented by a different model class, and these model
+	 * classes in turn contain multiple record classes. The record classes have
+	 * attributes which contain data about the IP address.
+	 *
+	 * If the web service does not return a particular piece of data for an IP
+	 * address, the associated attribute is not populated.
+	 *
+	 * The web service may not return any information for an entire record, in
+	 * which case all of the attributes for that record class will be empty.
+	 *
+	 * ## Usage ##
+	 *
+	 * The basic API for this class is the same for all of the web service end
+	 * points. First you create a web service object with your MaxMind `$accountId`
+	 * and `$licenseKey`, then you call the method corresponding to a specific end
+	 * point, passing it the IP address you want to look up.
+	 *
+	 * If the request succeeds, the method call will return a model class for
+	 * the service you called. This model in turn contains multiple record
+	 * classes, each of which represents part of the data returned by the web
+	 * service.
+	 *
+	 * If the request fails, the client class throws an exception.
+	 */
+	class Client implements \GeoIp2\ProviderInterface
+	{
+		public const VERSION = 'v3.0.0';
+		/**
+		 * Constructor.
+		 *
+		 * @param int    $accountId  your MaxMind account ID
+		 * @param string $licenseKey your MaxMind license key
+		 * @param array  $locales    list of locale codes to use in name property
+		 *                           from most preferred to least preferred
+		 * @param array  $options    array of options. Valid options include:
+		 *                           * `host` - The host to use when querying the web
+		 *                           service. To query the GeoLite2 web service
+		 *                           instead of the GeoIP2 web service, set the
+		 *                           host to `geolite.info`. To query the Sandbox
+		 *                           GeoIP2 web service instead of the production
+		 *                           GeoIP2 web service, set the host to
+		 *                           `sandbox.maxmind.com`. The sandbox allows you to
+		 *                           experiment with the API without affecting your
+		 *                           production data.
+		 *                           * `timeout` - Timeout in seconds.
+		 *                           * `connectTimeout` - Initial connection timeout in seconds.
+		 *                           * `proxy` - The HTTP proxy to use. May include a schema, port,
+		 *                           username, and password, e.g.,
+		 *                           `http://username:password@127.0.0.1:10`.
+		 */
+		public function __construct(int $accountId, string $licenseKey, array $locales = ['en'], array $options = [])
+		{
+		}
+		/**
+		 * This method calls the City Plus service.
+		 *
+		 * @param string $ipAddress IPv4 or IPv6 address as a string. If no
+		 *                          address is provided, the address that the web service is called
+		 *                          from will be used.
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException if the address you
+		 *                                                    provided is not in our database (e.g., a private address).
+		 * @throws \GeoIp2\Exception\AuthenticationException  if there is a problem
+		 *                                                    with the account ID or license key that you provided
+		 * @throws \GeoIp2\Exception\OutOfQueriesException    if your account is out
+		 *                                                    of queries
+		 * @throws \GeoIp2\Exception\InvalidRequestException} if your request was received by the web service but is
+		 *                                                    invalid for some other reason.  This may indicate an issue
+		 *                                                    with this API. Please report the error to MaxMind.
+		 * @throws \GeoIp2\Exception\HttpException   if an unexpected HTTP error code or message was returned.
+		 *                                           This could indicate a problem with the connection between
+		 *                                           your server and the web service or that the web service
+		 *                                           returned an invalid document or 500 error code
+		 * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent
+		 *                                           class to the above exceptions. It will be thrown directly
+		 *                                           if a 200 status code is returned but the body is invalid.
+		 * @throws \InvalidArgumentException         if something other than a single IP address or "me" is
+		 *                                           passed to the method
+		 */
+		public function city(string $ipAddress = 'me') : \GeoIp2\Model\City
+		{
+		}
+		/**
+		 * This method calls the Country service.
+		 *
+		 * @param string $ipAddress IPv4 or IPv6 address as a string. If no
+		 *                          address is provided, the address that the web service is called
+		 *                          from will be used.
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException if the address you provided is not in our database (e.g.,
+		 *                                                    a private address).
+		 * @throws \GeoIp2\Exception\AuthenticationException  if there is a problem
+		 *                                                    with the account ID or license key that you provided
+		 * @throws \GeoIp2\Exception\OutOfQueriesException    if your account is out of queries
+		 * @throws \GeoIp2\Exception\InvalidRequestException} if your request was received by the web service but is
+		 *                                                    invalid for some other reason.  This may indicate an
+		 *                                                    issue with this API. Please report the error to MaxMind.
+		 * @throws \GeoIp2\Exception\HttpException   if an unexpected HTTP error
+		 *                                           code or message was returned. This could indicate a problem
+		 *                                           with the connection between your server and the web service
+		 *                                           or that the web service returned an invalid document or 500
+		 *                                           error code.
+		 * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent class to the above exceptions. It
+		 *                                           will be thrown directly if a 200 status code is returned but
+		 *                                           the body is invalid.
+		 * @throws \InvalidArgumentException         if something other than a single IP address or "me" is
+		 *                                           passed to the method
+		 */
+		public function country(string $ipAddress = 'me') : \GeoIp2\Model\Country
+		{
+		}
+		/**
+		 * This method calls the Insights service. Insights is only supported by
+		 * the GeoIP2 web service. The GeoLite2 web service does not support it.
+		 *
+		 * @param string $ipAddress IPv4 or IPv6 address as a string. If no
+		 *                          address is provided, the address that the web service is called
+		 *                          from will be used.
+		 *
+		 * @throws \GeoIp2\Exception\AddressNotFoundException if the address you
+		 *                                                    provided is not in our database (e.g., a private address).
+		 * @throws \GeoIp2\Exception\AuthenticationException  if there is a problem
+		 *                                                    with the account ID or license key that you provided
+		 * @throws \GeoIp2\Exception\OutOfQueriesException    if your account is out
+		 *                                                    of queries
+		 * @throws \GeoIp2\Exception\InvalidRequestException} if your request was received by the web service but is
+		 *                                                    invalid for some other reason.  This may indicate an
+		 *                                                    issue with this API. Please report the error to MaxMind.
+		 * @throws \GeoIp2\Exception\HttpException   if an unexpected HTTP error code or message was returned.
+		 *                                           This could indicate a problem with the connection between
+		 *                                           your server and the web service or that the web service
+		 *                                           returned an invalid document or 500 error code
+		 * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent
+		 *                                           class to the above exceptions. It will be thrown directly
+		 *                                           if a 200 status code is returned but the body is invalid.
+		 * @throws \InvalidArgumentException         if something other than a single IP address or "me" is
+		 *                                           passed to the method
+		 */
+		public function insights(string $ipAddress = 'me') : \GeoIp2\Model\Insights
+		{
+		}
+	}
+}
diff --git a/dev/tools/phan/stubs/SimpleXML.phan_php b/dev/tools/phan/stubs/SimpleXML.phan_php
new file mode 100644
index 00000000000..c9e4ad305b8
--- /dev/null
+++ b/dev/tools/phan/stubs/SimpleXML.phan_php
@@ -0,0 +1,43 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension SimpleXML@7.4.12
+
+namespace {
+class SimpleXMLElement implements \Traversable, \Countable {
+
+    // methods
+    final public function __construct($data, $options = null, $data_is_url = null, $ns = null, $is_prefix = null) {}
+    public function asXML($filename = null) {}
+    public function saveXML($filename = null) {}
+    public function xpath($path) {}
+    public function registerXPathNamespace($prefix, $ns) {}
+    public function attributes($ns = null, $is_prefix = null) {}
+    public function children($ns = null, $is_prefix = null) {}
+    public function getNamespaces($recursve = null) {}
+    public function getDocNamespaces($recursve = null, $from_root = null) {}
+    public function getName() {}
+    public function addChild($name, $value = null, $ns = null) {}
+    public function addAttribute($name, $value = null, $ns = null) {}
+    public function __toString() {}
+    public function count() {}
+}
+
+class SimpleXMLIterator extends \SimpleXMLElement implements \RecursiveIterator, \Iterator {
+
+    // properties
+    public $name;
+
+    // methods
+    public function rewind() {}
+    public function valid() {}
+    public function current() {}
+    public function key() {}
+    public function next() {}
+    public function hasChildren() {}
+    public function getChildren() {}
+}
+
+function simplexml_import_dom($node, $class_name = null) {}
+function simplexml_load_file($filename, $class_name = null, $options = null, $ns = null, $is_prefix = null) {}
+function simplexml_load_string($data, $class_name = null, $options = null, $ns = null, $is_prefix = null) {}
+}
diff --git a/dev/tools/phan/stubs/brotli.phan_php b/dev/tools/phan/stubs/brotli.phan_php
new file mode 100644
index 00000000000..db299a2abd9
--- /dev/null
+++ b/dev/tools/phan/stubs/brotli.phan_php
@@ -0,0 +1,29 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension brotli@0.14.2
+
+namespace {
+function brotli_compress($data, $quality = null, $mode = null) {}
+function brotli_compress_add($context, $data, $mode = null) {}
+function brotli_compress_init($quality = null, $mode = null) {}
+function brotli_uncompress($data, $max = null) {}
+function brotli_uncompress_add($context, $data, $mode = null) {}
+function brotli_uncompress_init() {}
+const BROTLI_COMPRESS_LEVEL_DEFAULT = 11;
+const BROTLI_COMPRESS_LEVEL_MAX = 11;
+const BROTLI_COMPRESS_LEVEL_MIN = 0;
+const BROTLI_FINISH = 2;
+const BROTLI_FONT = 2;
+const BROTLI_GENERIC = 0;
+const BROTLI_PROCESS = 0;
+const BROTLI_TEXT = 1;
+}
+
+namespace brotli {
+function compress($data, $quality = null, $mode = null) {}
+function compress_add($context, $data, $mode = null) {}
+function compress_init($quality = null, $mode = null) {}
+function uncompress($data, $max = null) {}
+function uncompress_add($context, $data, $mode = null) {}
+function uncompress_init() {}
+}
diff --git a/dev/tools/phan/stubs/calendar.phan_php b/dev/tools/phan/stubs/calendar.phan_php
new file mode 100644
index 00000000000..010fb37edb4
--- /dev/null
+++ b/dev/tools/phan/stubs/calendar.phan_php
@@ -0,0 +1,45 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension calendar@8.2.9
+
+namespace {
+function cal_days_in_month(int $calendar, int $month, int $year) : int {}
+function cal_from_jd(int $julian_day, int $calendar) : array {}
+function cal_info(int $calendar = -1) : array {}
+function cal_to_jd(int $calendar, int $month, int $day, int $year) : int {}
+function easter_date(?int $year = null, int $mode = \CAL_EASTER_DEFAULT) : int {}
+function easter_days(?int $year = null, int $mode = \CAL_EASTER_DEFAULT) : int {}
+function frenchtojd(int $month, int $day, int $year) : int {}
+function gregoriantojd(int $month, int $day, int $year) : int {}
+function jddayofweek(int $julian_day, int $mode = \CAL_DOW_DAYNO) : int|string {}
+function jdmonthname(int $julian_day, int $mode) : string {}
+function jdtofrench(int $julian_day) : string {}
+function jdtogregorian(int $julian_day) : string {}
+function jdtojewish(int $julian_day, bool $hebrew = false, int $flags = 0) : string {}
+function jdtojulian(int $julian_day) : string {}
+function jdtounix(int $julian_day) : int {}
+function jewishtojd(int $month, int $day, int $year) : int {}
+function juliantojd(int $month, int $day, int $year) : int {}
+function unixtojd(?int $timestamp = null) : false|int {}
+const CAL_DOW_DAYNO = 0;
+const CAL_DOW_LONG = 1;
+const CAL_DOW_SHORT = 2;
+const CAL_EASTER_ALWAYS_GREGORIAN = 2;
+const CAL_EASTER_ALWAYS_JULIAN = 3;
+const CAL_EASTER_DEFAULT = 0;
+const CAL_EASTER_ROMAN = 1;
+const CAL_FRENCH = 3;
+const CAL_GREGORIAN = 0;
+const CAL_JEWISH = 2;
+const CAL_JEWISH_ADD_ALAFIM = 4;
+const CAL_JEWISH_ADD_ALAFIM_GERESH = 2;
+const CAL_JEWISH_ADD_GERESHAYIM = 8;
+const CAL_JULIAN = 1;
+const CAL_MONTH_FRENCH = 5;
+const CAL_MONTH_GREGORIAN_LONG = 1;
+const CAL_MONTH_GREGORIAN_SHORT = 0;
+const CAL_MONTH_JEWISH = 4;
+const CAL_MONTH_JULIAN_LONG = 3;
+const CAL_MONTH_JULIAN_SHORT = 2;
+const CAL_NUM_CALS = 4;
+}
diff --git a/dev/tools/phan/stubs/curl.phan_php b/dev/tools/phan/stubs/curl.phan_php
new file mode 100644
index 00000000000..cbfab6c1a24
--- /dev/null
+++ b/dev/tools/phan/stubs/curl.phan_php
@@ -0,0 +1,616 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension curl@7.4.12
+
+namespace {
+class CURLFile {
+
+    // properties
+    public $mime;
+    public $name;
+    public $postname;
+
+    // methods
+    public function __construct($filename, $mimetype = null, $postname = null) {}
+    public function getFilename() {}
+    public function getMimeType() {}
+    public function setMimeType($name) {}
+    public function getPostFilename() {}
+    public function setPostFilename($name) {}
+}
+
+function curl_close($ch) {}
+function curl_copy_handle($ch) {}
+function curl_errno($ch) {}
+function curl_error($ch) {}
+function curl_escape($ch, $str) {}
+function curl_exec($ch) {}
+function curl_file_create($filename, $mimetype = null, $postname = null) {}
+function curl_getinfo($ch, $option = null) {}
+function curl_init($url = null) {}
+function curl_multi_add_handle($mh, $ch) {}
+function curl_multi_close($mh) {}
+function curl_multi_errno($mh) {}
+function curl_multi_exec($mh, &$still_running = null) {}
+function curl_multi_getcontent($ch) {}
+function curl_multi_info_read($mh, &$msgs_in_queue = null) {}
+function curl_multi_init() {}
+function curl_multi_remove_handle($mh, $ch) {}
+function curl_multi_select($mh, $timeout = null) {}
+function curl_multi_setopt($sh, $option, $value) {}
+function curl_multi_strerror($errornum) {}
+function curl_pause($ch, $bitmask) {}
+function curl_reset($ch) {}
+function curl_setopt($ch, $option, $value) {}
+function curl_setopt_array($ch, array $options) {}
+function curl_share_close($sh) {}
+function curl_share_errno($sh) {}
+function curl_share_init() {}
+function curl_share_setopt($sh, $option, $value) {}
+function curl_share_strerror($errornum) {}
+function curl_strerror($errornum) {}
+function curl_unescape($ch, $str) {}
+function curl_version($version = null) {}
+const CURLAUTH_ANY = -17;
+const CURLAUTH_ANYSAFE = -18;
+const CURLAUTH_BASIC = 1;
+const CURLAUTH_BEARER = 64;
+const CURLAUTH_DIGEST = 2;
+const CURLAUTH_DIGEST_IE = 16;
+const CURLAUTH_GSSAPI = 4;
+const CURLAUTH_GSSNEGOTIATE = 4;
+const CURLAUTH_NEGOTIATE = 4;
+const CURLAUTH_NONE = 0;
+const CURLAUTH_NTLM = 8;
+const CURLAUTH_NTLM_WB = 32;
+const CURLAUTH_ONLY = 2147483648;
+const CURLE_ABORTED_BY_CALLBACK = 42;
+const CURLE_BAD_CALLING_ORDER = 44;
+const CURLE_BAD_CONTENT_ENCODING = 61;
+const CURLE_BAD_DOWNLOAD_RESUME = 36;
+const CURLE_BAD_FUNCTION_ARGUMENT = 43;
+const CURLE_BAD_PASSWORD_ENTERED = 46;
+const CURLE_COULDNT_CONNECT = 7;
+const CURLE_COULDNT_RESOLVE_HOST = 6;
+const CURLE_COULDNT_RESOLVE_PROXY = 5;
+const CURLE_FAILED_INIT = 2;
+const CURLE_FILESIZE_EXCEEDED = 63;
+const CURLE_FILE_COULDNT_READ_FILE = 37;
+const CURLE_FTP_ACCESS_DENIED = 9;
+const CURLE_FTP_BAD_DOWNLOAD_RESUME = 36;
+const CURLE_FTP_CANT_GET_HOST = 15;
+const CURLE_FTP_CANT_RECONNECT = 16;
+const CURLE_FTP_COULDNT_GET_SIZE = 32;
+const CURLE_FTP_COULDNT_RETR_FILE = 19;
+const CURLE_FTP_COULDNT_SET_ASCII = 29;
+const CURLE_FTP_COULDNT_SET_BINARY = 17;
+const CURLE_FTP_COULDNT_STOR_FILE = 25;
+const CURLE_FTP_COULDNT_USE_REST = 31;
+const CURLE_FTP_PARTIAL_FILE = 18;
+const CURLE_FTP_PORT_FAILED = 30;
+const CURLE_FTP_QUOTE_ERROR = 21;
+const CURLE_FTP_SSL_FAILED = 64;
+const CURLE_FTP_USER_PASSWORD_INCORRECT = 10;
+const CURLE_FTP_WEIRD_227_FORMAT = 14;
+const CURLE_FTP_WEIRD_PASS_REPLY = 11;
+const CURLE_FTP_WEIRD_PASV_REPLY = 13;
+const CURLE_FTP_WEIRD_SERVER_REPLY = 8;
+const CURLE_FTP_WEIRD_USER_REPLY = 12;
+const CURLE_FTP_WRITE_ERROR = 20;
+const CURLE_FUNCTION_NOT_FOUND = 41;
+const CURLE_GOT_NOTHING = 52;
+const CURLE_HTTP_NOT_FOUND = 22;
+const CURLE_HTTP_PORT_FAILED = 45;
+const CURLE_HTTP_POST_ERROR = 34;
+const CURLE_HTTP_RANGE_ERROR = 33;
+const CURLE_HTTP_RETURNED_ERROR = 22;
+const CURLE_LDAP_CANNOT_BIND = 38;
+const CURLE_LDAP_INVALID_URL = 62;
+const CURLE_LDAP_SEARCH_FAILED = 39;
+const CURLE_LIBRARY_NOT_FOUND = 40;
+const CURLE_MALFORMAT_USER = 24;
+const CURLE_OBSOLETE = 50;
+const CURLE_OK = 0;
+const CURLE_OPERATION_TIMEDOUT = 28;
+const CURLE_OPERATION_TIMEOUTED = 28;
+const CURLE_OUT_OF_MEMORY = 27;
+const CURLE_PARTIAL_FILE = 18;
+const CURLE_READ_ERROR = 26;
+const CURLE_RECV_ERROR = 56;
+const CURLE_SEND_ERROR = 55;
+const CURLE_SHARE_IN_USE = 57;
+const CURLE_SSH = 79;
+const CURLE_SSL_CACERT = 60;
+const CURLE_SSL_CACERT_BADFILE = 77;
+const CURLE_SSL_CERTPROBLEM = 58;
+const CURLE_SSL_CIPHER = 59;
+const CURLE_SSL_CONNECT_ERROR = 35;
+const CURLE_SSL_ENGINE_NOTFOUND = 53;
+const CURLE_SSL_ENGINE_SETFAILED = 54;
+const CURLE_SSL_PEER_CERTIFICATE = 60;
+const CURLE_SSL_PINNEDPUBKEYNOTMATCH = 90;
+const CURLE_TELNET_OPTION_SYNTAX = 49;
+const CURLE_TOO_MANY_REDIRECTS = 47;
+const CURLE_UNKNOWN_TELNET_OPTION = 48;
+const CURLE_UNSUPPORTED_PROTOCOL = 1;
+const CURLE_URL_MALFORMAT = 3;
+const CURLE_URL_MALFORMAT_USER = 4;
+const CURLE_WEIRD_SERVER_REPLY = 8;
+const CURLE_WRITE_ERROR = 23;
+const CURLFTPAUTH_DEFAULT = 0;
+const CURLFTPAUTH_SSL = 1;
+const CURLFTPAUTH_TLS = 2;
+const CURLFTPMETHOD_MULTICWD = 1;
+const CURLFTPMETHOD_NOCWD = 2;
+const CURLFTPMETHOD_SINGLECWD = 3;
+const CURLFTPSSL_ALL = 3;
+const CURLFTPSSL_CCC_ACTIVE = 2;
+const CURLFTPSSL_CCC_NONE = 0;
+const CURLFTPSSL_CCC_PASSIVE = 1;
+const CURLFTPSSL_CONTROL = 2;
+const CURLFTPSSL_NONE = 0;
+const CURLFTPSSL_TRY = 1;
+const CURLFTP_CREATE_DIR = 1;
+const CURLFTP_CREATE_DIR_NONE = 0;
+const CURLFTP_CREATE_DIR_RETRY = 2;
+const CURLGSSAPI_DELEGATION_FLAG = 2;
+const CURLGSSAPI_DELEGATION_POLICY_FLAG = 1;
+const CURLHEADER_SEPARATE = 1;
+const CURLHEADER_UNIFIED = 0;
+const CURLINFO_APPCONNECT_TIME = 3145761;
+const CURLINFO_APPCONNECT_TIME_T = 6291512;
+const CURLINFO_CERTINFO = 4194338;
+const CURLINFO_CONDITION_UNMET = 2097187;
+const CURLINFO_CONNECT_TIME = 3145733;
+const CURLINFO_CONNECT_TIME_T = 6291508;
+const CURLINFO_CONTENT_LENGTH_DOWNLOAD = 3145743;
+const CURLINFO_CONTENT_LENGTH_DOWNLOAD_T = 6291471;
+const CURLINFO_CONTENT_LENGTH_UPLOAD = 3145744;
+const CURLINFO_CONTENT_LENGTH_UPLOAD_T = 6291472;
+const CURLINFO_CONTENT_TYPE = 1048594;
+const CURLINFO_COOKIELIST = 4194332;
+const CURLINFO_EFFECTIVE_URL = 1048577;
+const CURLINFO_FILETIME = 2097166;
+const CURLINFO_FILETIME_T = 6291470;
+const CURLINFO_FTP_ENTRY_PATH = 1048606;
+const CURLINFO_HEADER_OUT = 2;
+const CURLINFO_HEADER_SIZE = 2097163;
+const CURLINFO_HTTPAUTH_AVAIL = 2097175;
+const CURLINFO_HTTP_CODE = 2097154;
+const CURLINFO_HTTP_CONNECTCODE = 2097174;
+const CURLINFO_HTTP_VERSION = 2097198;
+const CURLINFO_LASTONE = 56;
+const CURLINFO_LOCAL_IP = 1048617;
+const CURLINFO_LOCAL_PORT = 2097194;
+const CURLINFO_NAMELOOKUP_TIME = 3145732;
+const CURLINFO_NAMELOOKUP_TIME_T = 6291507;
+const CURLINFO_NUM_CONNECTS = 2097178;
+const CURLINFO_OS_ERRNO = 2097177;
+const CURLINFO_PRETRANSFER_TIME = 3145734;
+const CURLINFO_PRETRANSFER_TIME_T = 6291509;
+const CURLINFO_PRIMARY_IP = 1048608;
+const CURLINFO_PRIMARY_PORT = 2097192;
+const CURLINFO_PRIVATE = 1048597;
+const CURLINFO_PROTOCOL = 2097200;
+const CURLINFO_PROXYAUTH_AVAIL = 2097176;
+const CURLINFO_PROXY_SSL_VERIFYRESULT = 2097199;
+const CURLINFO_REDIRECT_COUNT = 2097172;
+const CURLINFO_REDIRECT_TIME = 3145747;
+const CURLINFO_REDIRECT_TIME_T = 6291511;
+const CURLINFO_REDIRECT_URL = 1048607;
+const CURLINFO_REQUEST_SIZE = 2097164;
+const CURLINFO_RESPONSE_CODE = 2097154;
+const CURLINFO_RTSP_CLIENT_CSEQ = 2097189;
+const CURLINFO_RTSP_CSEQ_RECV = 2097191;
+const CURLINFO_RTSP_SERVER_CSEQ = 2097190;
+const CURLINFO_RTSP_SESSION_ID = 1048612;
+const CURLINFO_SCHEME = 1048625;
+const CURLINFO_SIZE_DOWNLOAD = 3145736;
+const CURLINFO_SIZE_DOWNLOAD_T = 6291464;
+const CURLINFO_SIZE_UPLOAD = 3145735;
+const CURLINFO_SIZE_UPLOAD_T = 6291463;
+const CURLINFO_SPEED_DOWNLOAD = 3145737;
+const CURLINFO_SPEED_DOWNLOAD_T = 6291465;
+const CURLINFO_SPEED_UPLOAD = 3145738;
+const CURLINFO_SPEED_UPLOAD_T = 6291466;
+const CURLINFO_SSL_ENGINES = 4194331;
+const CURLINFO_SSL_VERIFYRESULT = 2097165;
+const CURLINFO_STARTTRANSFER_TIME = 3145745;
+const CURLINFO_STARTTRANSFER_TIME_T = 6291510;
+const CURLINFO_TOTAL_TIME = 3145731;
+const CURLINFO_TOTAL_TIME_T = 6291506;
+const CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE = 30010;
+const CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE = 30009;
+const CURLMOPT_MAXCONNECTS = 6;
+const CURLMOPT_MAX_HOST_CONNECTIONS = 7;
+const CURLMOPT_MAX_PIPELINE_LENGTH = 8;
+const CURLMOPT_MAX_TOTAL_CONNECTIONS = 13;
+const CURLMOPT_PIPELINING = 3;
+const CURLMOPT_PUSHFUNCTION = 20014;
+const CURLMSG_DONE = 1;
+const CURLM_ADDED_ALREADY = 7;
+const CURLM_BAD_EASY_HANDLE = 2;
+const CURLM_BAD_HANDLE = 1;
+const CURLM_CALL_MULTI_PERFORM = -1;
+const CURLM_INTERNAL_ERROR = 4;
+const CURLM_OK = 0;
+const CURLM_OUT_OF_MEMORY = 3;
+const CURLOPT_ABSTRACT_UNIX_SOCKET = 10264;
+const CURLOPT_ACCEPTTIMEOUT_MS = 212;
+const CURLOPT_ACCEPT_ENCODING = 10102;
+const CURLOPT_ADDRESS_SCOPE = 171;
+const CURLOPT_APPEND = 50;
+const CURLOPT_AUTOREFERER = 58;
+const CURLOPT_BINARYTRANSFER = 19914;
+const CURLOPT_BUFFERSIZE = 98;
+const CURLOPT_CAINFO = 10065;
+const CURLOPT_CAPATH = 10097;
+const CURLOPT_CERTINFO = 172;
+const CURLOPT_CONNECTTIMEOUT = 78;
+const CURLOPT_CONNECTTIMEOUT_MS = 156;
+const CURLOPT_CONNECT_ONLY = 141;
+const CURLOPT_CONNECT_TO = 10243;
+const CURLOPT_COOKIE = 10022;
+const CURLOPT_COOKIEFILE = 10031;
+const CURLOPT_COOKIEJAR = 10082;
+const CURLOPT_COOKIELIST = 10135;
+const CURLOPT_COOKIESESSION = 96;
+const CURLOPT_CRLF = 27;
+const CURLOPT_CRLFILE = 10169;
+const CURLOPT_CUSTOMREQUEST = 10036;
+const CURLOPT_DEFAULT_PROTOCOL = 10238;
+const CURLOPT_DIRLISTONLY = 48;
+const CURLOPT_DISALLOW_USERNAME_IN_URL = 278;
+const CURLOPT_DNS_CACHE_TIMEOUT = 92;
+const CURLOPT_DNS_INTERFACE = 10221;
+const CURLOPT_DNS_LOCAL_IP4 = 10222;
+const CURLOPT_DNS_LOCAL_IP6 = 10223;
+const CURLOPT_DNS_SERVERS = 10211;
+const CURLOPT_DNS_SHUFFLE_ADDRESSES = 275;
+const CURLOPT_DNS_USE_GLOBAL_CACHE = 91;
+const CURLOPT_EGDSOCKET = 10077;
+const CURLOPT_ENCODING = 10102;
+const CURLOPT_EXPECT_100_TIMEOUT_MS = 227;
+const CURLOPT_FAILONERROR = 45;
+const CURLOPT_FILE = 10001;
+const CURLOPT_FILETIME = 69;
+const CURLOPT_FNMATCH_FUNCTION = 20200;
+const CURLOPT_FOLLOWLOCATION = 52;
+const CURLOPT_FORBID_REUSE = 75;
+const CURLOPT_FRESH_CONNECT = 74;
+const CURLOPT_FTPAPPEND = 50;
+const CURLOPT_FTPLISTONLY = 48;
+const CURLOPT_FTPPORT = 10017;
+const CURLOPT_FTPSSLAUTH = 129;
+const CURLOPT_FTP_ACCOUNT = 10134;
+const CURLOPT_FTP_ALTERNATIVE_TO_USER = 10147;
+const CURLOPT_FTP_CREATE_MISSING_DIRS = 110;
+const CURLOPT_FTP_FILEMETHOD = 138;
+const CURLOPT_FTP_RESPONSE_TIMEOUT = 112;
+const CURLOPT_FTP_SKIP_PASV_IP = 137;
+const CURLOPT_FTP_SSL = 119;
+const CURLOPT_FTP_SSL_CCC = 154;
+const CURLOPT_FTP_USE_EPRT = 106;
+const CURLOPT_FTP_USE_EPSV = 85;
+const CURLOPT_FTP_USE_PRET = 188;
+const CURLOPT_GSSAPI_DELEGATION = 210;
+const CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS = 271;
+const CURLOPT_HAPROXYPROTOCOL = 274;
+const CURLOPT_HEADER = 42;
+const CURLOPT_HEADERFUNCTION = 20079;
+const CURLOPT_HEADEROPT = 229;
+const CURLOPT_HTTP09_ALLOWED = 285;
+const CURLOPT_HTTP200ALIASES = 10104;
+const CURLOPT_HTTPAUTH = 107;
+const CURLOPT_HTTPGET = 80;
+const CURLOPT_HTTPHEADER = 10023;
+const CURLOPT_HTTPPROXYTUNNEL = 61;
+const CURLOPT_HTTP_CONTENT_DECODING = 158;
+const CURLOPT_HTTP_TRANSFER_DECODING = 157;
+const CURLOPT_HTTP_VERSION = 84;
+const CURLOPT_IGNORE_CONTENT_LENGTH = 136;
+const CURLOPT_INFILE = 10009;
+const CURLOPT_INFILESIZE = 14;
+const CURLOPT_INTERFACE = 10062;
+const CURLOPT_IPRESOLVE = 113;
+const CURLOPT_ISSUERCERT = 10170;
+const CURLOPT_KEEP_SENDING_ON_ERROR = 245;
+const CURLOPT_KEYPASSWD = 10026;
+const CURLOPT_KRB4LEVEL = 10063;
+const CURLOPT_KRBLEVEL = 10063;
+const CURLOPT_LOCALPORT = 139;
+const CURLOPT_LOCALPORTRANGE = 140;
+const CURLOPT_LOGIN_OPTIONS = 10224;
+const CURLOPT_LOW_SPEED_LIMIT = 19;
+const CURLOPT_LOW_SPEED_TIME = 20;
+const CURLOPT_MAIL_AUTH = 10217;
+const CURLOPT_MAIL_FROM = 10186;
+const CURLOPT_MAIL_RCPT = 10187;
+const CURLOPT_MAXCONNECTS = 71;
+const CURLOPT_MAXFILESIZE = 114;
+const CURLOPT_MAXREDIRS = 68;
+const CURLOPT_MAX_RECV_SPEED_LARGE = 30146;
+const CURLOPT_MAX_SEND_SPEED_LARGE = 30145;
+const CURLOPT_NETRC = 51;
+const CURLOPT_NETRC_FILE = 10118;
+const CURLOPT_NEW_DIRECTORY_PERMS = 160;
+const CURLOPT_NEW_FILE_PERMS = 159;
+const CURLOPT_NOBODY = 44;
+const CURLOPT_NOPROGRESS = 43;
+const CURLOPT_NOPROXY = 10177;
+const CURLOPT_NOSIGNAL = 99;
+const CURLOPT_PASSWORD = 10174;
+const CURLOPT_PATH_AS_IS = 234;
+const CURLOPT_PINNEDPUBLICKEY = 10230;
+const CURLOPT_PIPEWAIT = 237;
+const CURLOPT_PORT = 3;
+const CURLOPT_POST = 47;
+const CURLOPT_POSTFIELDS = 10015;
+const CURLOPT_POSTQUOTE = 10039;
+const CURLOPT_POSTREDIR = 161;
+const CURLOPT_PREQUOTE = 10093;
+const CURLOPT_PRE_PROXY = 10262;
+const CURLOPT_PRIVATE = 10103;
+const CURLOPT_PROGRESSFUNCTION = 20056;
+const CURLOPT_PROTOCOLS = 181;
+const CURLOPT_PROXY = 10004;
+const CURLOPT_PROXYAUTH = 111;
+const CURLOPT_PROXYHEADER = 10228;
+const CURLOPT_PROXYPASSWORD = 10176;
+const CURLOPT_PROXYPORT = 59;
+const CURLOPT_PROXYTYPE = 101;
+const CURLOPT_PROXYUSERNAME = 10175;
+const CURLOPT_PROXYUSERPWD = 10006;
+const CURLOPT_PROXY_CAINFO = 10246;
+const CURLOPT_PROXY_CAPATH = 10247;
+const CURLOPT_PROXY_CRLFILE = 10260;
+const CURLOPT_PROXY_KEYPASSWD = 10258;
+const CURLOPT_PROXY_PINNEDPUBLICKEY = 10263;
+const CURLOPT_PROXY_SERVICE_NAME = 10235;
+const CURLOPT_PROXY_SSLCERT = 10254;
+const CURLOPT_PROXY_SSLCERTTYPE = 10255;
+const CURLOPT_PROXY_SSLKEY = 10256;
+const CURLOPT_PROXY_SSLKEYTYPE = 10257;
+const CURLOPT_PROXY_SSLVERSION = 250;
+const CURLOPT_PROXY_SSL_CIPHER_LIST = 10259;
+const CURLOPT_PROXY_SSL_OPTIONS = 261;
+const CURLOPT_PROXY_SSL_VERIFYHOST = 249;
+const CURLOPT_PROXY_SSL_VERIFYPEER = 248;
+const CURLOPT_PROXY_TLS13_CIPHERS = 10277;
+const CURLOPT_PROXY_TLSAUTH_PASSWORD = 10252;
+const CURLOPT_PROXY_TLSAUTH_TYPE = 10253;
+const CURLOPT_PROXY_TLSAUTH_USERNAME = 10251;
+const CURLOPT_PROXY_TRANSFER_MODE = 166;
+const CURLOPT_PUT = 54;
+const CURLOPT_QUOTE = 10028;
+const CURLOPT_RANDOM_FILE = 10076;
+const CURLOPT_RANGE = 10007;
+const CURLOPT_READDATA = 10009;
+const CURLOPT_READFUNCTION = 20012;
+const CURLOPT_REDIR_PROTOCOLS = 182;
+const CURLOPT_REFERER = 10016;
+const CURLOPT_REQUEST_TARGET = 10266;
+const CURLOPT_RESOLVE = 10203;
+const CURLOPT_RESUME_FROM = 21;
+const CURLOPT_RETURNTRANSFER = 19913;
+const CURLOPT_RTSP_CLIENT_CSEQ = 193;
+const CURLOPT_RTSP_REQUEST = 189;
+const CURLOPT_RTSP_SERVER_CSEQ = 194;
+const CURLOPT_RTSP_SESSION_ID = 10190;
+const CURLOPT_RTSP_STREAM_URI = 10191;
+const CURLOPT_RTSP_TRANSPORT = 10192;
+const CURLOPT_SAFE_UPLOAD = -1;
+const CURLOPT_SASL_IR = 218;
+const CURLOPT_SERVICE_NAME = 10236;
+const CURLOPT_SHARE = 10100;
+const CURLOPT_SOCKS5_AUTH = 267;
+const CURLOPT_SOCKS5_GSSAPI_NEC = 180;
+const CURLOPT_SOCKS5_GSSAPI_SERVICE = 10179;
+const CURLOPT_SSH_AUTH_TYPES = 151;
+const CURLOPT_SSH_COMPRESSION = 268;
+const CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 = 10162;
+const CURLOPT_SSH_KNOWNHOSTS = 10183;
+const CURLOPT_SSH_PRIVATE_KEYFILE = 10153;
+const CURLOPT_SSH_PUBLIC_KEYFILE = 10152;
+const CURLOPT_SSLCERT = 10025;
+const CURLOPT_SSLCERTPASSWD = 10026;
+const CURLOPT_SSLCERTTYPE = 10086;
+const CURLOPT_SSLENGINE = 10089;
+const CURLOPT_SSLENGINE_DEFAULT = 90;
+const CURLOPT_SSLKEY = 10087;
+const CURLOPT_SSLKEYPASSWD = 10026;
+const CURLOPT_SSLKEYTYPE = 10088;
+const CURLOPT_SSLVERSION = 32;
+const CURLOPT_SSL_CIPHER_LIST = 10083;
+const CURLOPT_SSL_ENABLE_ALPN = 226;
+const CURLOPT_SSL_ENABLE_NPN = 225;
+const CURLOPT_SSL_FALSESTART = 233;
+const CURLOPT_SSL_OPTIONS = 216;
+const CURLOPT_SSL_SESSIONID_CACHE = 150;
+const CURLOPT_SSL_VERIFYHOST = 81;
+const CURLOPT_SSL_VERIFYPEER = 64;
+const CURLOPT_SSL_VERIFYSTATUS = 232;
+const CURLOPT_STDERR = 10037;
+const CURLOPT_STREAM_WEIGHT = 239;
+const CURLOPT_SUPPRESS_CONNECT_HEADERS = 265;
+const CURLOPT_TCP_FASTOPEN = 244;
+const CURLOPT_TCP_KEEPALIVE = 213;
+const CURLOPT_TCP_KEEPIDLE = 214;
+const CURLOPT_TCP_KEEPINTVL = 215;
+const CURLOPT_TCP_NODELAY = 121;
+const CURLOPT_TELNETOPTIONS = 10070;
+const CURLOPT_TFTP_BLKSIZE = 178;
+const CURLOPT_TFTP_NO_OPTIONS = 242;
+const CURLOPT_TIMECONDITION = 33;
+const CURLOPT_TIMEOUT = 13;
+const CURLOPT_TIMEOUT_MS = 155;
+const CURLOPT_TIMEVALUE = 34;
+const CURLOPT_TIMEVALUE_LARGE = 30270;
+const CURLOPT_TLS13_CIPHERS = 10276;
+const CURLOPT_TLSAUTH_PASSWORD = 10205;
+const CURLOPT_TLSAUTH_TYPE = 10206;
+const CURLOPT_TLSAUTH_USERNAME = 10204;
+const CURLOPT_TRANSFERTEXT = 53;
+const CURLOPT_TRANSFER_ENCODING = 207;
+const CURLOPT_UNIX_SOCKET_PATH = 10231;
+const CURLOPT_UNRESTRICTED_AUTH = 105;
+const CURLOPT_UPLOAD = 46;
+const CURLOPT_URL = 10002;
+const CURLOPT_USERAGENT = 10018;
+const CURLOPT_USERNAME = 10173;
+const CURLOPT_USERPWD = 10005;
+const CURLOPT_USE_SSL = 119;
+const CURLOPT_VERBOSE = 41;
+const CURLOPT_WILDCARDMATCH = 197;
+const CURLOPT_WRITEFUNCTION = 20011;
+const CURLOPT_WRITEHEADER = 10029;
+const CURLOPT_XOAUTH2_BEARER = 10220;
+const CURLPAUSE_ALL = 5;
+const CURLPAUSE_CONT = 0;
+const CURLPAUSE_RECV = 1;
+const CURLPAUSE_RECV_CONT = 0;
+const CURLPAUSE_SEND = 4;
+const CURLPAUSE_SEND_CONT = 0;
+const CURLPIPE_HTTP1 = 1;
+const CURLPIPE_MULTIPLEX = 2;
+const CURLPIPE_NOTHING = 0;
+const CURLPROTO_ALL = -1;
+const CURLPROTO_DICT = 512;
+const CURLPROTO_FILE = 1024;
+const CURLPROTO_FTP = 4;
+const CURLPROTO_FTPS = 8;
+const CURLPROTO_GOPHER = 33554432;
+const CURLPROTO_HTTP = 1;
+const CURLPROTO_HTTPS = 2;
+const CURLPROTO_IMAP = 4096;
+const CURLPROTO_IMAPS = 8192;
+const CURLPROTO_LDAP = 128;
+const CURLPROTO_LDAPS = 256;
+const CURLPROTO_POP3 = 16384;
+const CURLPROTO_POP3S = 32768;
+const CURLPROTO_RTMP = 524288;
+const CURLPROTO_RTMPE = 2097152;
+const CURLPROTO_RTMPS = 8388608;
+const CURLPROTO_RTMPT = 1048576;
+const CURLPROTO_RTMPTE = 4194304;
+const CURLPROTO_RTMPTS = 16777216;
+const CURLPROTO_RTSP = 262144;
+const CURLPROTO_SCP = 16;
+const CURLPROTO_SFTP = 32;
+const CURLPROTO_SMB = 67108864;
+const CURLPROTO_SMBS = 134217728;
+const CURLPROTO_SMTP = 65536;
+const CURLPROTO_SMTPS = 131072;
+const CURLPROTO_TELNET = 64;
+const CURLPROTO_TFTP = 2048;
+const CURLPROXY_HTTP = 0;
+const CURLPROXY_HTTPS = 2;
+const CURLPROXY_HTTP_1_0 = 1;
+const CURLPROXY_SOCKS4 = 4;
+const CURLPROXY_SOCKS4A = 6;
+const CURLPROXY_SOCKS5 = 5;
+const CURLPROXY_SOCKS5_HOSTNAME = 7;
+const CURLSHOPT_NONE = 0;
+const CURLSHOPT_SHARE = 1;
+const CURLSHOPT_UNSHARE = 2;
+const CURLSSH_AUTH_AGENT = 16;
+const CURLSSH_AUTH_ANY = -1;
+const CURLSSH_AUTH_DEFAULT = -1;
+const CURLSSH_AUTH_GSSAPI = 32;
+const CURLSSH_AUTH_HOST = 4;
+const CURLSSH_AUTH_KEYBOARD = 8;
+const CURLSSH_AUTH_NONE = 0;
+const CURLSSH_AUTH_PASSWORD = 2;
+const CURLSSH_AUTH_PUBLICKEY = 1;
+const CURLSSLOPT_ALLOW_BEAST = 1;
+const CURLSSLOPT_NO_REVOKE = 2;
+const CURLUSESSL_ALL = 3;
+const CURLUSESSL_CONTROL = 2;
+const CURLUSESSL_NONE = 0;
+const CURLUSESSL_TRY = 1;
+const CURLVERSION_NOW = 4;
+const CURL_FNMATCHFUNC_FAIL = 2;
+const CURL_FNMATCHFUNC_MATCH = 0;
+const CURL_FNMATCHFUNC_NOMATCH = 1;
+const CURL_HTTP_VERSION_1_0 = 1;
+const CURL_HTTP_VERSION_1_1 = 2;
+const CURL_HTTP_VERSION_2 = 3;
+const CURL_HTTP_VERSION_2TLS = 4;
+const CURL_HTTP_VERSION_2_0 = 3;
+const CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE = 5;
+const CURL_HTTP_VERSION_NONE = 0;
+const CURL_IPRESOLVE_V4 = 1;
+const CURL_IPRESOLVE_V6 = 2;
+const CURL_IPRESOLVE_WHATEVER = 0;
+const CURL_LOCK_DATA_CONNECT = 5;
+const CURL_LOCK_DATA_COOKIE = 2;
+const CURL_LOCK_DATA_DNS = 3;
+const CURL_LOCK_DATA_PSL = 6;
+const CURL_LOCK_DATA_SSL_SESSION = 4;
+const CURL_MAX_READ_SIZE = 524288;
+const CURL_NETRC_IGNORED = 0;
+const CURL_NETRC_OPTIONAL = 1;
+const CURL_NETRC_REQUIRED = 2;
+const CURL_PUSH_DENY = 1;
+const CURL_PUSH_OK = 0;
+const CURL_READFUNC_PAUSE = 268435457;
+const CURL_REDIR_POST_301 = 1;
+const CURL_REDIR_POST_302 = 2;
+const CURL_REDIR_POST_303 = 4;
+const CURL_REDIR_POST_ALL = 7;
+const CURL_RTSPREQ_ANNOUNCE = 3;
+const CURL_RTSPREQ_DESCRIBE = 2;
+const CURL_RTSPREQ_GET_PARAMETER = 8;
+const CURL_RTSPREQ_OPTIONS = 1;
+const CURL_RTSPREQ_PAUSE = 6;
+const CURL_RTSPREQ_PLAY = 5;
+const CURL_RTSPREQ_RECEIVE = 11;
+const CURL_RTSPREQ_RECORD = 10;
+const CURL_RTSPREQ_SETUP = 4;
+const CURL_RTSPREQ_SET_PARAMETER = 9;
+const CURL_RTSPREQ_TEARDOWN = 7;
+const CURL_SSLVERSION_DEFAULT = 0;
+const CURL_SSLVERSION_MAX_DEFAULT = 65536;
+const CURL_SSLVERSION_MAX_NONE = 0;
+const CURL_SSLVERSION_MAX_TLSv1_0 = 262144;
+const CURL_SSLVERSION_MAX_TLSv1_1 = 327680;
+const CURL_SSLVERSION_MAX_TLSv1_2 = 393216;
+const CURL_SSLVERSION_MAX_TLSv1_3 = 458752;
+const CURL_SSLVERSION_SSLv2 = 2;
+const CURL_SSLVERSION_SSLv3 = 3;
+const CURL_SSLVERSION_TLSv1 = 1;
+const CURL_SSLVERSION_TLSv1_0 = 4;
+const CURL_SSLVERSION_TLSv1_1 = 5;
+const CURL_SSLVERSION_TLSv1_2 = 6;
+const CURL_SSLVERSION_TLSv1_3 = 7;
+const CURL_TIMECOND_IFMODSINCE = 1;
+const CURL_TIMECOND_IFUNMODSINCE = 2;
+const CURL_TIMECOND_LASTMOD = 3;
+const CURL_TIMECOND_NONE = 0;
+const CURL_TLSAUTH_SRP = 1;
+const CURL_VERSION_ASYNCHDNS = 128;
+const CURL_VERSION_BROTLI = 8388608;
+const CURL_VERSION_CONV = 4096;
+const CURL_VERSION_CURLDEBUG = 8192;
+const CURL_VERSION_DEBUG = 64;
+const CURL_VERSION_GSSAPI = 131072;
+const CURL_VERSION_GSSNEGOTIATE = 32;
+const CURL_VERSION_HTTP2 = 65536;
+const CURL_VERSION_HTTPS_PROXY = 2097152;
+const CURL_VERSION_IDN = 1024;
+const CURL_VERSION_IPV6 = 1;
+const CURL_VERSION_KERBEROS4 = 2;
+const CURL_VERSION_KERBEROS5 = 262144;
+const CURL_VERSION_LARGEFILE = 512;
+const CURL_VERSION_LIBZ = 8;
+const CURL_VERSION_MULTI_SSL = 4194304;
+const CURL_VERSION_NTLM = 16;
+const CURL_VERSION_NTLM_WB = 32768;
+const CURL_VERSION_PSL = 1048576;
+const CURL_VERSION_SPNEGO = 256;
+const CURL_VERSION_SSL = 4;
+const CURL_VERSION_SSPI = 2048;
+const CURL_VERSION_TLSAUTH_SRP = 16384;
+const CURL_VERSION_UNIX_SOCKETS = 524288;
+const CURL_WRITEFUNC_PAUSE = 268435457;
+}
diff --git a/dev/tools/phan/stubs/fileinfo.phan_php b/dev/tools/phan/stubs/fileinfo.phan_php
new file mode 100644
index 00000000000..d00b9e06540
--- /dev/null
+++ b/dev/tools/phan/stubs/fileinfo.phan_php
@@ -0,0 +1,30 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension fileinfo@1.0.5
+
+namespace {
+class finfo {
+
+    // methods
+    public function finfo($options = null, $arg = null) {}
+    public function set_flags($options) {}
+    public function file($filename, $options = null, $context = null) {}
+    public function buffer($string, $options = null, $context = null) {}
+}
+
+function finfo_buffer($finfo, $string, $options = null, $context = null) {}
+function finfo_close($finfo) {}
+function finfo_file($finfo, $filename, $options = null, $context = null) {}
+function finfo_open($options = null, $arg = null) {}
+function finfo_set_flags($finfo, $options) {}
+function mime_content_type($string) {}
+const FILEINFO_CONTINUE = 32;
+const FILEINFO_DEVICES = 8;
+const FILEINFO_MIME = 1040;
+const FILEINFO_MIME_ENCODING = 1024;
+const FILEINFO_MIME_TYPE = 16;
+const FILEINFO_NONE = 0;
+const FILEINFO_PRESERVE_ATIME = 128;
+const FILEINFO_RAW = 256;
+const FILEINFO_SYMLINK = 2;
+}
diff --git a/dev/tools/phan/stubs/ftp.phan_php b/dev/tools/phan/stubs/ftp.phan_php
new file mode 100644
index 00000000000..fc81af75a38
--- /dev/null
+++ b/dev/tools/phan/stubs/ftp.phan_php
@@ -0,0 +1,53 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension ftp@7.4.12
+
+namespace {
+function ftp_alloc($ftp, $size, &$response = null) {}
+function ftp_append($ftp, $remote_file, $local_file, $mode = null) {}
+function ftp_cdup($ftp) {}
+function ftp_chdir($ftp, $directory) {}
+function ftp_chmod($ftp, $mode, $filename) {}
+function ftp_close($ftp) {}
+function ftp_connect($host, $port = null, $timeout = null) {}
+function ftp_delete($ftp, $file) {}
+function ftp_exec($ftp, $command) {}
+function ftp_fget($ftp, $fp, $remote_file, $mode = null, $resumepos = null) {}
+function ftp_fput($ftp, $remote_file, $fp, $mode = null, $startpos = null) {}
+function ftp_get($ftp, $local_file, $remote_file, $mode = null, $resume_pos = null) {}
+function ftp_get_option($ftp, $option) {}
+function ftp_login($ftp, $username, $password) {}
+function ftp_mdtm($ftp, $filename) {}
+function ftp_mkdir($ftp, $directory) {}
+function ftp_mlsd($ftp, $directory) {}
+function ftp_nb_continue($ftp) {}
+function ftp_nb_fget($ftp, $fp, $remote_file, $mode = null, $resumepos = null) {}
+function ftp_nb_fput($ftp, $remote_file, $fp, $mode = null, $startpos = null) {}
+function ftp_nb_get($ftp, $local_file, $remote_file, $mode = null, $resume_pos = null) {}
+function ftp_nb_put($ftp, $remote_file, $local_file, $mode = null, $startpos = null) {}
+function ftp_nlist($ftp, $directory) {}
+function ftp_pasv($ftp, $pasv) {}
+function ftp_put($ftp, $remote_file, $local_file, $mode = null, $startpos = null) {}
+function ftp_pwd($ftp) {}
+function ftp_quit($ftp) {}
+function ftp_raw($ftp, $command) {}
+function ftp_rawlist($ftp, $directory, $recursive = null) {}
+function ftp_rename($ftp, $src, $dest) {}
+function ftp_rmdir($ftp, $directory) {}
+function ftp_set_option($ftp, $option, $value) {}
+function ftp_site($ftp, $cmd) {}
+function ftp_size($ftp, $filename) {}
+function ftp_ssl_connect($host, $port = null, $timeout = null) {}
+function ftp_systype($ftp) {}
+const FTP_ASCII = 1;
+const FTP_AUTORESUME = -1;
+const FTP_AUTOSEEK = 1;
+const FTP_BINARY = 2;
+const FTP_FAILED = 0;
+const FTP_FINISHED = 1;
+const FTP_IMAGE = 2;
+const FTP_MOREDATA = 2;
+const FTP_TEXT = 1;
+const FTP_TIMEOUT_SEC = 0;
+const FTP_USEPASVADDRESS = 2;
+}
diff --git a/dev/tools/phan/stubs/gd.phan_php b/dev/tools/phan/stubs/gd.phan_php
new file mode 100644
index 00000000000..ebb999b2d94
--- /dev/null
+++ b/dev/tools/phan/stubs/gd.phan_php
@@ -0,0 +1,207 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension gd@8.2.11
+
+namespace {
+final class GdFont {
+}
+
+final class GdImage {
+}
+
+function gd_info() : array {}
+function imageaffine(\GdImage $image, array $affine, ?array $clip = null) : \GdImage|false {}
+function imageaffinematrixconcat(array $matrix1, array $matrix2) : array|false {}
+function imageaffinematrixget(int $type, $options) : array|false {}
+function imagealphablending(\GdImage $image, bool $enable) : bool {}
+function imageantialias(\GdImage $image, bool $enable) : bool {}
+function imagearc(\GdImage $image, int $center_x, int $center_y, int $width, int $height, int $start_angle, int $end_angle, int $color) : bool {}
+function imageavif(\GdImage $image, $file = null, int $quality = -1, int $speed = -1) : bool {}
+function imagebmp(\GdImage $image, $file = null, bool $compressed = true) : bool {}
+function imagechar(\GdImage $image, \GdFont|int $font, int $x, int $y, string $char, int $color) : bool {}
+function imagecharup(\GdImage $image, \GdFont|int $font, int $x, int $y, string $char, int $color) : bool {}
+function imagecolorallocate(\GdImage $image, int $red, int $green, int $blue) : false|int {}
+function imagecolorallocatealpha(\GdImage $image, int $red, int $green, int $blue, int $alpha) : false|int {}
+function imagecolorat(\GdImage $image, int $x, int $y) : false|int {}
+function imagecolorclosest(\GdImage $image, int $red, int $green, int $blue) : int {}
+function imagecolorclosestalpha(\GdImage $image, int $red, int $green, int $blue, int $alpha) : int {}
+function imagecolorclosesthwb(\GdImage $image, int $red, int $green, int $blue) : int {}
+function imagecolordeallocate(\GdImage $image, int $color) : bool {}
+function imagecolorexact(\GdImage $image, int $red, int $green, int $blue) : int {}
+function imagecolorexactalpha(\GdImage $image, int $red, int $green, int $blue, int $alpha) : int {}
+function imagecolormatch(\GdImage $image1, \GdImage $image2) : bool {}
+function imagecolorresolve(\GdImage $image, int $red, int $green, int $blue) : int {}
+function imagecolorresolvealpha(\GdImage $image, int $red, int $green, int $blue, int $alpha) : int {}
+function imagecolorset(\GdImage $image, int $color, int $red, int $green, int $blue, int $alpha = 0) : ?false {}
+function imagecolorsforindex(\GdImage $image, int $color) : array {}
+function imagecolorstotal(\GdImage $image) : int {}
+function imagecolortransparent(\GdImage $image, ?int $color = null) : int {}
+function imageconvolution(\GdImage $image, array $matrix, float $divisor, float $offset) : bool {}
+function imagecopy(\GdImage $dst_image, \GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height) : bool {}
+function imagecopymerge(\GdImage $dst_image, \GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height, int $pct) : bool {}
+function imagecopymergegray(\GdImage $dst_image, \GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $src_width, int $src_height, int $pct) : bool {}
+function imagecopyresampled(\GdImage $dst_image, \GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_width, int $dst_height, int $src_width, int $src_height) : bool {}
+function imagecopyresized(\GdImage $dst_image, \GdImage $src_image, int $dst_x, int $dst_y, int $src_x, int $src_y, int $dst_width, int $dst_height, int $src_width, int $src_height) : bool {}
+function imagecreate(int $width, int $height) : \GdImage|false {}
+function imagecreatefromavif(string $filename) : \GdImage|false {}
+function imagecreatefrombmp(string $filename) : \GdImage|false {}
+function imagecreatefromgd(string $filename) : \GdImage|false {}
+function imagecreatefromgd2(string $filename) : \GdImage|false {}
+function imagecreatefromgd2part(string $filename, int $x, int $y, int $width, int $height) : \GdImage|false {}
+function imagecreatefromgif(string $filename) : \GdImage|false {}
+function imagecreatefromjpeg(string $filename) : \GdImage|false {}
+function imagecreatefrompng(string $filename) : \GdImage|false {}
+function imagecreatefromstring(string $data) : \GdImage|false {}
+function imagecreatefromtga(string $filename) : \GdImage|false {}
+function imagecreatefromwbmp(string $filename) : \GdImage|false {}
+function imagecreatefromwebp(string $filename) : \GdImage|false {}
+function imagecreatefromxbm(string $filename) : \GdImage|false {}
+function imagecreatefromxpm(string $filename) : \GdImage|false {}
+function imagecreatetruecolor(int $width, int $height) : \GdImage|false {}
+function imagecrop(\GdImage $image, array $rectangle) : \GdImage|false {}
+function imagecropauto(\GdImage $image, int $mode = \IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1) : \GdImage|false {}
+function imagedashedline(\GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color) : bool {}
+function imagedestroy(\GdImage $image) : bool {}
+function imageellipse(\GdImage $image, int $center_x, int $center_y, int $width, int $height, int $color) : bool {}
+function imagefill(\GdImage $image, int $x, int $y, int $color) : bool {}
+function imagefilledarc(\GdImage $image, int $center_x, int $center_y, int $width, int $height, int $start_angle, int $end_angle, int $color, int $style) : bool {}
+function imagefilledellipse(\GdImage $image, int $center_x, int $center_y, int $width, int $height, int $color) : bool {}
+function imagefilledpolygon(\GdImage $image, array $points, int $num_points_or_color, ?int $color = null) : bool {}
+function imagefilledrectangle(\GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color) : bool {}
+function imagefilltoborder(\GdImage $image, int $x, int $y, int $border_color, int $color) : bool {}
+function imagefilter(\GdImage $image, int $filter, ...$args) : bool {}
+function imageflip(\GdImage $image, int $mode) : bool {}
+function imagefontheight(\GdFont|int $font) : int {}
+function imagefontwidth(\GdFont|int $font) : int {}
+function imageftbbox(float $size, float $angle, string $font_filename, string $string, array $options = []) : array|false {}
+function imagefttext(\GdImage $image, float $size, float $angle, int $x, int $y, int $color, string $font_filename, string $text, array $options = []) : array|false {}
+function imagegammacorrect(\GdImage $image, float $input_gamma, float $output_gamma) : bool {}
+function imagegd(\GdImage $image, ?string $file = null) : bool {}
+function imagegd2(\GdImage $image, ?string $file = null, int $chunk_size = unknown, int $mode = unknown) : bool {}
+function imagegetclip(\GdImage $image) : array {}
+function imagegetinterpolation(\GdImage $image) : int {}
+function imagegif(\GdImage $image, $file = null) : bool {}
+function imageinterlace(\GdImage $image, ?bool $enable = null) : bool {}
+function imageistruecolor(\GdImage $image) : bool {}
+function imagejpeg(\GdImage $image, $file = null, int $quality = -1) : bool {}
+function imagelayereffect(\GdImage $image, int $effect) : bool {}
+function imageline(\GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color) : bool {}
+function imageloadfont(string $filename) : \GdFont|false {}
+function imageopenpolygon(\GdImage $image, array $points, int $num_points_or_color, ?int $color = null) : bool {}
+function imagepalettecopy(\GdImage $dst, \GdImage $src) : void {}
+function imagepalettetotruecolor(\GdImage $image) : bool {}
+function imagepng(\GdImage $image, $file = null, int $quality = -1, int $filters = -1) : bool {}
+function imagepolygon(\GdImage $image, array $points, int $num_points_or_color, ?int $color = null) : bool {}
+function imagerectangle(\GdImage $image, int $x1, int $y1, int $x2, int $y2, int $color) : bool {}
+function imageresolution(\GdImage $image, ?int $resolution_x = null, ?int $resolution_y = null) : array|bool {}
+function imagerotate(\GdImage $image, float $angle, int $background_color, bool $ignore_transparent = false) : \GdImage|false {}
+function imagesavealpha(\GdImage $image, bool $enable) : bool {}
+function imagescale(\GdImage $image, int $width, int $height = -1, int $mode = \IMG_BILINEAR_FIXED) : \GdImage|false {}
+function imagesetbrush(\GdImage $image, \GdImage $brush) : bool {}
+function imagesetclip(\GdImage $image, int $x1, int $y1, int $x2, int $y2) : bool {}
+function imagesetinterpolation(\GdImage $image, int $method = \IMG_BILINEAR_FIXED) : bool {}
+function imagesetpixel(\GdImage $image, int $x, int $y, int $color) : bool {}
+function imagesetstyle(\GdImage $image, array $style) : bool {}
+function imagesetthickness(\GdImage $image, int $thickness) : bool {}
+function imagesettile(\GdImage $image, \GdImage $tile) : bool {}
+function imagestring(\GdImage $image, \GdFont|int $font, int $x, int $y, string $string, int $color) : bool {}
+function imagestringup(\GdImage $image, \GdFont|int $font, int $x, int $y, string $string, int $color) : bool {}
+function imagesx(\GdImage $image) : int {}
+function imagesy(\GdImage $image) : int {}
+function imagetruecolortopalette(\GdImage $image, bool $dither, int $num_colors) : bool {}
+function imagettfbbox(float $size, float $angle, string $font_filename, string $string, array $options = []) : array|false {}
+function imagettftext(\GdImage $image, float $size, float $angle, int $x, int $y, int $color, string $font_filename, string $text, array $options = []) : array|false {}
+function imagetypes() : int {}
+function imagewbmp(\GdImage $image, $file = null, ?int $foreground_color = null) : bool {}
+function imagewebp(\GdImage $image, $file = null, int $quality = -1) : bool {}
+function imagexbm(\GdImage $image, ?string $filename, ?int $foreground_color = null) : bool {}
+const GD_BUNDLED = 0;
+const GD_EXTRA_VERSION = '';
+const GD_MAJOR_VERSION = 2;
+const GD_MINOR_VERSION = 3;
+const GD_RELEASE_VERSION = 3;
+const GD_VERSION = '2.3.3';
+const IMG_AFFINE_ROTATE = 2;
+const IMG_AFFINE_SCALE = 1;
+const IMG_AFFINE_SHEAR_HORIZONTAL = 3;
+const IMG_AFFINE_SHEAR_VERTICAL = 4;
+const IMG_AFFINE_TRANSLATE = 0;
+const IMG_ARC_CHORD = 1;
+const IMG_ARC_EDGED = 4;
+const IMG_ARC_NOFILL = 2;
+const IMG_ARC_PIE = 0;
+const IMG_ARC_ROUNDED = 0;
+const IMG_AVIF = 256;
+const IMG_BELL = 1;
+const IMG_BESSEL = 2;
+const IMG_BICUBIC = 4;
+const IMG_BICUBIC_FIXED = 5;
+const IMG_BILINEAR_FIXED = 3;
+const IMG_BLACKMAN = 6;
+const IMG_BMP = 64;
+const IMG_BOX = 7;
+const IMG_BSPLINE = 8;
+const IMG_CATMULLROM = 9;
+const IMG_COLOR_BRUSHED = -3;
+const IMG_COLOR_STYLED = -2;
+const IMG_COLOR_STYLEDBRUSHED = -4;
+const IMG_COLOR_TILED = -5;
+const IMG_COLOR_TRANSPARENT = -6;
+const IMG_CROP_BLACK = 2;
+const IMG_CROP_DEFAULT = 0;
+const IMG_CROP_SIDES = 4;
+const IMG_CROP_THRESHOLD = 5;
+const IMG_CROP_TRANSPARENT = 1;
+const IMG_CROP_WHITE = 3;
+const IMG_EFFECT_ALPHABLEND = 1;
+const IMG_EFFECT_MULTIPLY = 4;
+const IMG_EFFECT_NORMAL = 2;
+const IMG_EFFECT_OVERLAY = 3;
+const IMG_EFFECT_REPLACE = 0;
+const IMG_FILTER_BRIGHTNESS = 2;
+const IMG_FILTER_COLORIZE = 4;
+const IMG_FILTER_CONTRAST = 3;
+const IMG_FILTER_EDGEDETECT = 5;
+const IMG_FILTER_EMBOSS = 6;
+const IMG_FILTER_GAUSSIAN_BLUR = 7;
+const IMG_FILTER_GRAYSCALE = 1;
+const IMG_FILTER_MEAN_REMOVAL = 9;
+const IMG_FILTER_NEGATE = 0;
+const IMG_FILTER_PIXELATE = 11;
+const IMG_FILTER_SCATTER = 12;
+const IMG_FILTER_SELECTIVE_BLUR = 8;
+const IMG_FILTER_SMOOTH = 10;
+const IMG_FLIP_BOTH = 3;
+const IMG_FLIP_HORIZONTAL = 1;
+const IMG_FLIP_VERTICAL = 2;
+const IMG_GAUSSIAN = 10;
+const IMG_GD2_COMPRESSED = 2;
+const IMG_GD2_RAW = 1;
+const IMG_GENERALIZED_CUBIC = 11;
+const IMG_GIF = 1;
+const IMG_HAMMING = 13;
+const IMG_HANNING = 14;
+const IMG_HERMITE = 12;
+const IMG_JPEG = 2;
+const IMG_JPG = 2;
+const IMG_MITCHELL = 15;
+const IMG_NEAREST_NEIGHBOUR = 16;
+const IMG_PNG = 4;
+const IMG_POWER = 17;
+const IMG_QUADRATIC = 18;
+const IMG_SINC = 19;
+const IMG_TGA = 128;
+const IMG_TRIANGLE = 20;
+const IMG_WBMP = 8;
+const IMG_WEBP = 32;
+const IMG_WEBP_LOSSLESS = 101;
+const IMG_WEIGHTED4 = 21;
+const IMG_XPM = 16;
+const PNG_ALL_FILTERS = 248;
+const PNG_FILTER_AVG = 64;
+const PNG_FILTER_NONE = 8;
+const PNG_FILTER_PAETH = 128;
+const PNG_FILTER_SUB = 16;
+const PNG_FILTER_UP = 32;
+const PNG_NO_FILTER = 0;
+}
diff --git a/dev/tools/phan/stubs/geoip.phan_php b/dev/tools/phan/stubs/geoip.phan_php
new file mode 100644
index 00000000000..6d8d937f9ec
--- /dev/null
+++ b/dev/tools/phan/stubs/geoip.phan_php
@@ -0,0 +1,44 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension geoip@1.1.1
+
+namespace {
+function geoip_asnum_by_name() {}
+function geoip_continent_code_by_name() {}
+function geoip_country_code3_by_name() {}
+function geoip_country_code3_by_name_v6() {}
+function geoip_country_code_by_name() {}
+function geoip_country_code_by_name_v6() {}
+function geoip_country_name_by_name() {}
+function geoip_country_name_by_name_v6() {}
+function geoip_database_info() {}
+function geoip_db_avail() {}
+function geoip_db_filename() {}
+function geoip_db_get_all_info() {}
+function geoip_domain_by_name() {}
+function geoip_id_by_name() {}
+function geoip_isp_by_name() {}
+function geoip_netspeedcell_by_name() {}
+function geoip_org_by_name() {}
+function geoip_record_by_name() {}
+function geoip_region_by_name() {}
+function geoip_region_name_by_code() {}
+function geoip_setup_custom_directory() {}
+function geoip_time_zone_by_country_and_region() {}
+const GEOIP_ASNUM_EDITION = 9;
+const GEOIP_CABLEDSL_SPEED = 2;
+const GEOIP_CITY_EDITION_REV0 = 6;
+const GEOIP_CITY_EDITION_REV1 = 2;
+const GEOIP_CORPORATE_SPEED = 3;
+const GEOIP_COUNTRY_EDITION = 1;
+const GEOIP_DIALUP_SPEED = 1;
+const GEOIP_DOMAIN_EDITION = 11;
+const GEOIP_ISP_EDITION = 4;
+const GEOIP_NETSPEED_EDITION = 10;
+const GEOIP_NETSPEED_EDITION_REV1 = 32;
+const GEOIP_ORG_EDITION = 5;
+const GEOIP_PROXY_EDITION = 8;
+const GEOIP_REGION_EDITION_REV0 = 7;
+const GEOIP_REGION_EDITION_REV1 = 3;
+const GEOIP_UNKNOWN_SPEED = 0;
+}
diff --git a/dev/tools/phan/stubs/geoip_inc.php b/dev/tools/phan/stubs/geoip_inc.php
new file mode 100644
index 00000000000..1c1d74a8fea
--- /dev/null
+++ b/dev/tools/phan/stubs/geoip_inc.php
@@ -0,0 +1,194 @@
+<?php
+// phpcs:disable Generic.Files.LineLength,PEAR.Commenting,PEAR.NamingConventions
+class GeoIP
+{
+	public $flags;
+	public $filehandle;
+	public $memory_buffer;
+	public $databaseType;
+	public $databaseSegments;
+	public $record_length;
+	public $shmid;
+	public $GEOIP_COUNTRY_CODE_TO_NUMBER = array("" => 0, "AP" => 1, "EU" => 2, "AD" => 3, "AE" => 4, "AF" => 5, "AG" => 6, "AI" => 7, "AL" => 8, "AM" => 9, "CW" => 10, "AO" => 11, "AQ" => 12, "AR" => 13, "AS" => 14, "AT" => 15, "AU" => 16, "AW" => 17, "AZ" => 18, "BA" => 19, "BB" => 20, "BD" => 21, "BE" => 22, "BF" => 23, "BG" => 24, "BH" => 25, "BI" => 26, "BJ" => 27, "BM" => 28, "BN" => 29, "BO" => 30, "BR" => 31, "BS" => 32, "BT" => 33, "BV" => 34, "BW" => 35, "BY" => 36, "BZ" => 37, "CA" => 38, "CC" => 39, "CD" => 40, "CF" => 41, "CG" => 42, "CH" => 43, "CI" => 44, "CK" => 45, "CL" => 46, "CM" => 47, "CN" => 48, "CO" => 49, "CR" => 50, "CU" => 51, "CV" => 52, "CX" => 53, "CY" => 54, "CZ" => 55, "DE" => 56, "DJ" => 57, "DK" => 58, "DM" => 59, "DO" => 60, "DZ" => 61, "EC" => 62, "EE" => 63, "EG" => 64, "EH" => 65, "ER" => 66, "ES" => 67, "ET" => 68, "FI" => 69, "FJ" => 70, "FK" => 71, "FM" => 72, "FO" => 73, "FR" => 74, "SX" => 75, "GA" => 76, "GB" => 77, "GD" => 78, "GE" => 79, "GF" => 80, "GH" => 81, "GI" => 82, "GL" => 83, "GM" => 84, "GN" => 85, "GP" => 86, "GQ" => 87, "GR" => 88, "GS" => 89, "GT" => 90, "GU" => 91, "GW" => 92, "GY" => 93, "HK" => 94, "HM" => 95, "HN" => 96, "HR" => 97, "HT" => 98, "HU" => 99, "ID" => 100, "IE" => 101, "IL" => 102, "IN" => 103, "IO" => 104, "IQ" => 105, "IR" => 106, "IS" => 107, "IT" => 108, "JM" => 109, "JO" => 110, "JP" => 111, "KE" => 112, "KG" => 113, "KH" => 114, "KI" => 115, "KM" => 116, "KN" => 117, "KP" => 118, "KR" => 119, "KW" => 120, "KY" => 121, "KZ" => 122, "LA" => 123, "LB" => 124, "LC" => 125, "LI" => 126, "LK" => 127, "LR" => 128, "LS" => 129, "LT" => 130, "LU" => 131, "LV" => 132, "LY" => 133, "MA" => 134, "MC" => 135, "MD" => 136, "MG" => 137, "MH" => 138, "MK" => 139, "ML" => 140, "MM" => 141, "MN" => 142, "MO" => 143, "MP" => 144, "MQ" => 145, "MR" => 146, "MS" => 147, "MT" => 148, "MU" => 149, "MV" => 150, "MW" => 151, "MX" => 152, "MY" => 153, "MZ" => 154, "NA" => 155, "NC" => 156, "NE" => 157, "NF" => 158, "NG" => 159, "NI" => 160, "NL" => 161, "NO" => 162, "NP" => 163, "NR" => 164, "NU" => 165, "NZ" => 166, "OM" => 167, "PA" => 168, "PE" => 169, "PF" => 170, "PG" => 171, "PH" => 172, "PK" => 173, "PL" => 174, "PM" => 175, "PN" => 176, "PR" => 177, "PS" => 178, "PT" => 179, "PW" => 180, "PY" => 181, "QA" => 182, "RE" => 183, "RO" => 184, "RU" => 185, "RW" => 186, "SA" => 187, "SB" => 188, "SC" => 189, "SD" => 190, "SE" => 191, "SG" => 192, "SH" => 193, "SI" => 194, "SJ" => 195, "SK" => 196, "SL" => 197, "SM" => 198, "SN" => 199, "SO" => 200, "SR" => 201, "ST" => 202, "SV" => 203, "SY" => 204, "SZ" => 205, "TC" => 206, "TD" => 207, "TF" => 208, "TG" => 209, "TH" => 210, "TJ" => 211, "TK" => 212, "TM" => 213, "TN" => 214, "TO" => 215, "TL" => 216, "TR" => 217, "TT" => 218, "TV" => 219, "TW" => 220, "TZ" => 221, "UA" => 222, "UG" => 223, "UM" => 224, "US" => 225, "UY" => 226, "UZ" => 227, "VA" => 228, "VC" => 229, "VE" => 230, "VG" => 231, "VI" => 232, "VN" => 233, "VU" => 234, "WF" => 235, "WS" => 236, "YE" => 237, "YT" => 238, "RS" => 239, "ZA" => 240, "ZM" => 241, "ME" => 242, "ZW" => 243, "A1" => 244, "A2" => 245, "O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250, "BL" => 251, "MF" => 252, "BQ" => 253, "SS" => 254);
+	public $GEOIP_COUNTRY_CODES = array("", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "CW", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", "SX", "GA", "GB", "GD", "GE", "GF", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IN", "IO", "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "RS", "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1", "AX", "GG", "IM", "JE", "BL", "MF", "BQ", "SS", "O1");
+	public $GEOIP_COUNTRY_CODES3 = array("", "AP", "EU", "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "CUW", "AGO", "ATA", "ARG", "ASM", "AUT", "AUS", "ABW", "AZE", "BIH", "BRB", "BGD", "BEL", "BFA", "BGR", "BHR", "BDI", "BEN", "BMU", "BRN", "BOL", "BRA", "BHS", "BTN", "BVT", "BWA", "BLR", "BLZ", "CAN", "CCK", "COD", "CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI", "CUB", "CPV", "CXR", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM", "DZA", "ECU", "EST", "EGY", "ESH", "ERI", "ESP", "ETH", "FIN", "FJI", "FLK", "FSM", "FRO", "FRA", "SXM", "GAB", "GBR", "GRD", "GEO", "GUF", "GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "SGS", "GTM", "GUM", "GNB", "GUY", "HKG", "HMD", "HND", "HRV", "HTI", "HUN", "IDN", "IRL", "ISR", "IND", "IOT", "IRQ", "IRN", "ISL", "ITA", "JAM", "JOR", "JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA", "PRK", "KOR", "KWT", "CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU", "LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MDG", "MHL", "MKD", "MLI", "MMR", "MNG", "MAC", "MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV", "MWI", "MEX", "MYS", "MOZ", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER", "PYF", "PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW", "PRY", "QAT", "REU", "ROU", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN", "SWE", "SGP", "SHN", "SVN", "SJM", "SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "STP", "SLV", "SYR", "SWZ", "TCA", "TCD", "ATF", "TGO", "THA", "TJK", "TKL", "TKM", "TUN", "TON", "TLS", "TUR", "TTO", "TUV", "TWN", "TZA", "UKR", "UGA", "UMI", "USA", "URY", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "MYT", "SRB", "ZAF", "ZMB", "MNE", "ZWE", "A1", "A2", "O1", "ALA", "GGY", "IMN", "JEY", "BLM", "MAF", "BES", "SSD", "O1");
+	public $GEOIP_COUNTRY_NAMES = array("", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates", "Afghanistan", "Antigua and Barbuda", "Anguilla", "Albania", "Armenia", "Curacao", "Angola", "Antarctica", "Argentina", "American Samoa", "Austria", "Australia", "Aruba", "Azerbaijan", "Bosnia and Herzegovina", "Barbados", "Bangladesh", "Belgium", "Burkina Faso", "Bulgaria", "Bahrain", "Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia", "Brazil", "Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize", "Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the", "Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook Islands", "Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape Verde", "Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti", "Denmark", "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia", "Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji", "Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe Islands", "France", "Sint Maarten (Dutch part)", "Gabon", "United Kingdom", "Grenada", "Georgia", "French Guiana", "Ghana", "Gibraltar", "Greenland", "Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia and the South Sandwich Islands", "Guatemala", "Guam", "Guinea-Bissau", "Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras", "Croatia", "Haiti", "Hungary", "Indonesia", "Ireland", "Israel", "India", "British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of", "Iceland", "Italy", "Jamaica", "Jordan", "Japan", "Kenya", "Kyrgyzstan", "Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", "Korea, Democratic People's Republic of", "Korea, Republic of", "Kuwait", "Cayman Islands", "Kazakhstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia", "Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg", "Latvia", "Libya", "Morocco", "Monaco", "Moldova, Republic of", "Madagascar", "Marshall Islands", "Macedonia", "Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands", "Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives", "Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia", "Niger", "Norfolk Island", "Nigeria", "Nicaragua", "Netherlands", "Norway", "Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French Polynesia", "Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint Pierre and Miquelon", "Pitcairn Islands", "Puerto Rico", "Palestinian Territory", "Portugal", "Palau", "Paraguay", "Qatar", "Reunion", "Romania", "Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands", "Seychelles", "Sudan", "Sweden", "Singapore", "Saint Helena", "Slovenia", "Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal", "Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab Republic", "Swaziland", "Turks and Caicos Islands", "Chad", "French Southern Territories", "Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan", "Tunisia", "Tonga", "Timor-Leste", "Turkey", "Trinidad and Tobago", "Tuvalu", "Taiwan", "Tanzania, United Republic of", "Ukraine", "Uganda", "United States Minor Outlying Islands", "United States", "Uruguay", "Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the Grenadines", "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.", "Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte", "Serbia", "South Africa", "Zambia", "Montenegro", "Zimbabwe", "Anonymous Proxy", "Satellite Provider", "Other", "Aland Islands", "Guernsey", "Isle of Man", "Jersey", "Saint Barthelemy", "Saint Martin", "Bonaire, Saint Eustatius and Saba", "South Sudan", "Other");
+	public $GEOIP_CONTINENT_CODES = array("--", "AS", "EU", "EU", "AS", "AS", "NA", "NA", "EU", "AS", "NA", "AF", "AN", "SA", "OC", "EU", "OC", "NA", "AS", "EU", "NA", "AS", "EU", "AF", "EU", "AS", "AF", "AF", "NA", "AS", "SA", "SA", "NA", "AS", "AN", "AF", "EU", "NA", "NA", "AS", "AF", "AF", "AF", "EU", "AF", "OC", "SA", "AF", "AS", "SA", "NA", "NA", "AF", "AS", "AS", "EU", "EU", "AF", "EU", "NA", "NA", "AF", "SA", "EU", "AF", "AF", "AF", "EU", "AF", "EU", "OC", "SA", "OC", "EU", "EU", "NA", "AF", "EU", "NA", "AS", "SA", "AF", "EU", "NA", "AF", "AF", "NA", "AF", "EU", "AN", "NA", "OC", "AF", "SA", "AS", "AN", "NA", "EU", "NA", "EU", "AS", "EU", "AS", "AS", "AS", "AS", "AS", "EU", "EU", "NA", "AS", "AS", "AF", "AS", "AS", "OC", "AF", "NA", "AS", "AS", "AS", "NA", "AS", "AS", "AS", "NA", "EU", "AS", "AF", "AF", "EU", "EU", "EU", "AF", "AF", "EU", "EU", "AF", "OC", "EU", "AF", "AS", "AS", "AS", "OC", "NA", "AF", "NA", "EU", "AF", "AS", "AF", "NA", "AS", "AF", "AF", "OC", "AF", "OC", "AF", "NA", "EU", "EU", "AS", "OC", "OC", "OC", "AS", "NA", "SA", "OC", "OC", "AS", "AS", "EU", "NA", "OC", "NA", "AS", "EU", "OC", "SA", "AS", "AF", "EU", "EU", "AF", "AS", "OC", "AF", "AF", "EU", "AS", "AF", "EU", "EU", "EU", "AF", "EU", "AF", "AF", "SA", "AF", "NA", "AS", "AF", "NA", "AF", "AN", "AF", "AS", "AS", "OC", "AS", "AF", "OC", "AS", "EU", "NA", "OC", "AS", "AF", "EU", "AF", "OC", "NA", "SA", "AS", "EU", "NA", "SA", "NA", "NA", "AS", "OC", "OC", "OC", "AS", "AF", "EU", "AF", "AF", "EU", "AF", "--", "--", "--", "EU", "EU", "EU", "EU", "NA", "NA", "NA", "AF", "--");
+}
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* geoip.inc
+ *
+ * Copyright (C) 2007 MaxMind LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+\define("GEOIP_COUNTRY_BEGIN", 16776960);
+\define("GEOIP_STATE_BEGIN_REV0", 16700000);
+\define("GEOIP_STATE_BEGIN_REV1", 16000000);
+\define("GEOIP_STANDARD", 0);
+\define("GEOIP_MEMORY_CACHE", 1);
+\define("GEOIP_SHARED_MEMORY", 2);
+\define("STRUCTURE_INFO_MAX_SIZE", 20);
+\define("DATABASE_INFO_MAX_SIZE", 100);
+\define("GEOIP_COUNTRY_EDITION", 1);
+\define("GEOIP_PROXY_EDITION", 8);
+\define("GEOIP_ASNUM_EDITION", 9);
+\define("GEOIP_NETSPEED_EDITION", 10);
+\define("GEOIP_REGION_EDITION_REV0", 7);
+\define("GEOIP_REGION_EDITION_REV1", 3);
+\define("GEOIP_CITY_EDITION_REV0", 6);
+\define("GEOIP_CITY_EDITION_REV1", 2);
+\define("GEOIP_ORG_EDITION", 5);
+\define("GEOIP_ISP_EDITION", 4);
+\define("SEGMENT_RECORD_LENGTH", 3);
+\define("STANDARD_RECORD_LENGTH", 3);
+\define("ORG_RECORD_LENGTH", 4);
+\define("MAX_RECORD_LENGTH", 4);
+\define("MAX_ORG_RECORD_LENGTH", 300);
+\define("GEOIP_SHM_KEY", 0x4f415401);
+\define("US_OFFSET", 1);
+\define("CANADA_OFFSET", 677);
+\define("WORLD_OFFSET", 1353);
+\define("FIPS_RANGE", 360);
+\define("GEOIP_UNKNOWN_SPEED", 0);
+\define("GEOIP_DIALUP_SPEED", 1);
+\define("GEOIP_CABLEDSL_SPEED", 2);
+\define("GEOIP_CORPORATE_SPEED", 3);
+\define("GEOIP_DOMAIN_EDITION", 11);
+\define("GEOIP_COUNTRY_EDITION_V6", 12);
+\define("GEOIP_LOCATIONA_EDITION", 13);
+\define("GEOIP_ACCURACYRADIUS_EDITION", 14);
+\define("GEOIP_CITYCOMBINED_EDITION", 15);
+\define("GEOIP_CITY_EDITION_REV1_V6", 30);
+\define("GEOIP_CITY_EDITION_REV0_V6", 31);
+\define("GEOIP_NETSPEED_EDITION_REV1", 32);
+\define("GEOIP_NETSPEED_EDITION_REV1_V6", 33);
+\define("GEOIP_USERTYPE_EDITION", 28);
+\define("GEOIP_USERTYPE_EDITION_V6", 29);
+\define("GEOIP_ASNUM_EDITION_V6", 21);
+\define("GEOIP_ISP_EDITION_V6", 22);
+\define("GEOIP_ORG_EDITION_V6", 23);
+\define("GEOIP_DOMAIN_EDITION_V6", 24);
+\define("CITYCOMBINED_FIXED_RECORD", 7);
+function geoip_load_shared_mem($file)
+{
+}
+function _setup_segments($gi)
+{
+}
+// This should be only used for variable-length records where
+// $start + $maxLength may be greater than the shared mem size
+function _sharedMemRead($gi, $start, $maxLength)
+{
+}
+/**
+ * @param string $filename
+ * @param int    $flags
+ * @return GeoIP
+ */
+function geoip_open($filename, $flags)
+{
+}
+/**
+ * @param GeoIP $gi
+ * @return bool
+ */
+function geoip_close($gi)
+{
+}
+function geoip_country_id_by_name_v6($gi, $name)
+{
+}
+function geoip_country_id_by_name($gi, $name)
+{
+}
+function geoip_country_code_by_name_v6($gi, $name)
+{
+}
+function geoip_country_code_by_name($gi, $name)
+{
+}
+function geoip_country_name_by_name_v6($gi, $name)
+{
+}
+function geoip_country_name_by_name($gi, $name)
+{
+}
+function geoip_country_id_by_addr_v6($gi, $addr)
+{
+}
+function geoip_country_id_by_addr($gi, $addr)
+{
+}
+/**
+ * @return string|false
+ */
+function geoip_country_code_by_addr_v6($gi, $addr)
+{
+}
+/**
+ * @param GeoIP $gi
+ * @return string|false
+ */
+function geoip_country_code_by_addr($gi, $addr)
+{
+}
+/**
+ * @param GeoIP $gi
+ * @return string|false
+ */
+function geoip_country_name_by_addr_v6($gi, $addr)
+{
+}
+/**
+ * @param GeoIP $gi
+ * @return string|false
+ */
+function geoip_country_name_by_addr($gi, $addr)
+{
+}
+function _geoip_seek_country_v6($gi, $ipnum)
+{
+}
+function _geoip_seek_country($gi, $ipnum)
+{
+}
+function _common_get_org($gi, $seek_org)
+{
+}
+function _get_org_v6($gi, $ipnum)
+{
+}
+function _get_org($gi, $ipnum)
+{
+}
+function geoip_name_by_addr_v6($gi, $addr)
+{
+}
+function geoip_name_by_addr($gi, $addr)
+{
+}
+function geoip_org_by_addr($gi, $addr)
+{
+}
+function _get_region($gi, $ipnum)
+{
+}
+function geoip_region_by_addr($gi, $addr)
+{
+}
+function _safe_substr($string, $start, $length)
+{
+}
diff --git a/dev/tools/phan/stubs/imap.phan_php b/dev/tools/phan/stubs/imap.phan_php
new file mode 100644
index 00000000000..1f30f8d0955
--- /dev/null
+++ b/dev/tools/phan/stubs/imap.phan_php
@@ -0,0 +1,149 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension imap@7.4.33
+
+namespace {
+function imap_8bit($text) {}
+function imap_alerts() {}
+function imap_append($stream_id, $folder, $message, $options = null, $date = null) {}
+function imap_base64($text) {}
+function imap_binary($text) {}
+function imap_body($stream_id, $msg_no, $options = null) {}
+function imap_bodystruct($stream_id, $msg_no, $section) {}
+function imap_check($stream_id) {}
+function imap_clearflag_full($stream_id, $sequence, $flag, $options = null) {}
+function imap_close($stream_id, $options = null) {}
+function imap_create($stream_id, $mailbox) {}
+function imap_createmailbox($stream_id, $mailbox) {}
+function imap_delete($stream_id, $msg_no, $options = null) {}
+function imap_deletemailbox($stream_id, $mailbox) {}
+function imap_errors() {}
+function imap_expunge($stream_id) {}
+function imap_fetch_overview($stream_id, $sequence, $options = null) {}
+function imap_fetchbody($stream_id, $msg_no, $section, $options = null) {}
+function imap_fetchheader($stream_id, $msg_no, $options = null) {}
+function imap_fetchmime($stream_id, $msg_no, $section, $options = null) {}
+function imap_fetchstructure($stream_id, $msg_no, $options = null) {}
+function imap_fetchtext($stream_id, $msg_no, $options = null) {}
+function imap_gc($stream_id, $flags = null) {}
+function imap_get_quota($stream_id, $qroot) {}
+function imap_get_quotaroot($stream_id, $mbox) {}
+function imap_getacl($stream_id, $mailbox) {}
+function imap_getmailboxes($stream_id, $ref, $pattern) {}
+function imap_getsubscribed($stream_id, $ref, $pattern) {}
+function imap_header($stream_id, $msg_no, $from_length = null, $subject_length = null, $default_host = null) {}
+function imap_headerinfo($stream_id, $msg_no, $from_length = null, $subject_length = null, $default_host = null) {}
+function imap_headers($stream_id) {}
+function imap_last_error() {}
+function imap_list($stream_id, $ref, $pattern) {}
+function imap_listmailbox($stream_id, $ref, $pattern) {}
+function imap_listscan($stream_id, $ref, $pattern, $content) {}
+function imap_listsubscribed($stream_id, $ref, $pattern) {}
+function imap_lsub($stream_id, $ref, $pattern) {}
+function imap_mail($to, $subject, $message, $additional_headers = null, $cc = null, $bcc = null, $rpath = null) {}
+function imap_mail_compose($envelope, $body) {}
+function imap_mail_copy($stream_id, $msglist, $mailbox, $options = null) {}
+function imap_mail_move($stream_id, $sequence, $mailbox, $options = null) {}
+function imap_mailboxmsginfo($stream_id) {}
+function imap_mime_header_decode($str) {}
+function imap_msgno($stream_id, $unique_msg_id) {}
+function imap_mutf7_to_utf8($in) {}
+function imap_num_msg($stream_id) {}
+function imap_num_recent($stream_id) {}
+function imap_open($mailbox, $user, $password, $options = null, $n_retries = null, $params = null) {}
+function imap_ping($stream_id) {}
+function imap_qprint($text) {}
+function imap_rename($stream_id, $old_name, $new_name) {}
+function imap_renamemailbox($stream_id, $old_name, $new_name) {}
+function imap_reopen($stream_id, $mailbox, $options = null, $n_retries = null) {}
+function imap_rfc822_parse_adrlist($address_string, $default_host) {}
+function imap_rfc822_parse_headers($headers, $default_host = null) {}
+function imap_rfc822_write_address($mailbox, $host, $personal) {}
+function imap_savebody($stream_id, $file, $msg_no, $section = null, $options = null) {}
+function imap_scan($stream_id, $ref, $pattern, $content) {}
+function imap_scanmailbox($stream_id, $ref, $pattern, $content) {}
+function imap_search($stream_id, $criteria, $options = null, $charset = null) {}
+function imap_set_quota($stream_id, $qroot, $mailbox_size) {}
+function imap_setacl($stream_id, $mailbox, $id, $rights) {}
+function imap_setflag_full($stream_id, $sequence, $flag, $options = null) {}
+function imap_sort($stream_id, $criteria, $reverse, $options = null, $search_criteria = null, $charset = null) {}
+function imap_status($stream_id, $mailbox, $options) {}
+function imap_subscribe($stream_id, $mailbox) {}
+function imap_thread($stream_id, $options = null) {}
+function imap_timeout($timeout_type, $timeout = null) {}
+function imap_uid($stream_id, $msg_no) {}
+function imap_undelete($stream_id, $msg_no, $flags = null) {}
+function imap_unsubscribe($stream_id, $mailbox) {}
+function imap_utf7_decode($buf) {}
+function imap_utf7_encode($buf) {}
+function imap_utf8($mime_encoded_text) {}
+function imap_utf8_to_mutf7($in) {}
+const CL_EXPUNGE = 32768;
+const CP_MOVE = 2;
+const CP_UID = 1;
+const ENC7BIT = 0;
+const ENC8BIT = 1;
+const ENCBASE64 = 3;
+const ENCBINARY = 2;
+const ENCOTHER = 5;
+const ENCQUOTEDPRINTABLE = 4;
+const FT_INTERNAL = 8;
+const FT_NOT = 4;
+const FT_PEEK = 2;
+const FT_PREFETCHTEXT = 32;
+const FT_UID = 1;
+const IMAP_CLOSETIMEOUT = 4;
+const IMAP_GC_ELT = 1;
+const IMAP_GC_ENV = 2;
+const IMAP_GC_TEXTS = 4;
+const IMAP_OPENTIMEOUT = 1;
+const IMAP_READTIMEOUT = 2;
+const IMAP_WRITETIMEOUT = 3;
+const LATT_HASCHILDREN = 32;
+const LATT_HASNOCHILDREN = 64;
+const LATT_MARKED = 4;
+const LATT_NOINFERIORS = 1;
+const LATT_NOSELECT = 2;
+const LATT_REFERRAL = 16;
+const LATT_UNMARKED = 8;
+const NIL = 0;
+const OP_ANONYMOUS = 4;
+const OP_DEBUG = 1;
+const OP_EXPUNGE = 128;
+const OP_HALFOPEN = 64;
+const OP_PROTOTYPE = 32;
+const OP_READONLY = 2;
+const OP_SECURE = 256;
+const OP_SHORTCACHE = 8;
+const OP_SILENT = 16;
+const SA_ALL = 31;
+const SA_MESSAGES = 1;
+const SA_RECENT = 2;
+const SA_UIDNEXT = 8;
+const SA_UIDVALIDITY = 16;
+const SA_UNSEEN = 4;
+const SE_FREE = 2;
+const SE_NOPREFETCH = 4;
+const SE_UID = 1;
+const SORTARRIVAL = 1;
+const SORTCC = 5;
+const SORTDATE = 0;
+const SORTFROM = 2;
+const SORTSIZE = 6;
+const SORTSUBJECT = 3;
+const SORTTO = 4;
+const SO_FREE = 8;
+const SO_NOSERVER = 16;
+const ST_SET = 4;
+const ST_SILENT = 2;
+const ST_UID = 1;
+const TYPEAPPLICATION = 3;
+const TYPEAUDIO = 4;
+const TYPEIMAGE = 5;
+const TYPEMESSAGE = 2;
+const TYPEMODEL = 7;
+const TYPEMULTIPART = 1;
+const TYPEOTHER = 8;
+const TYPETEXT = 0;
+const TYPEVIDEO = 6;
+}
diff --git a/dev/tools/phan/stubs/intl.phan_php b/dev/tools/phan/stubs/intl.phan_php
new file mode 100644
index 00000000000..bb6b8e5b923
--- /dev/null
+++ b/dev/tools/phan/stubs/intl.phan_php
@@ -0,0 +1,1807 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension intl@8.2.9
+
+namespace {
+class Collator {
+
+    // constants
+    const DEFAULT_VALUE = -1;
+    const PRIMARY = 0;
+    const SECONDARY = 1;
+    const TERTIARY = 2;
+    const DEFAULT_STRENGTH = 2;
+    const QUATERNARY = 3;
+    const IDENTICAL = 15;
+    const OFF = 16;
+    const ON = 17;
+    const SHIFTED = 20;
+    const NON_IGNORABLE = 21;
+    const LOWER_FIRST = 24;
+    const UPPER_FIRST = 25;
+    const FRENCH_COLLATION = 0;
+    const ALTERNATE_HANDLING = 1;
+    const CASE_FIRST = 2;
+    const CASE_LEVEL = 3;
+    const NORMALIZATION_MODE = 4;
+    const STRENGTH = 5;
+    const HIRAGANA_QUATERNARY_MODE = 6;
+    const NUMERIC_COLLATION = 7;
+    const SORT_REGULAR = 0;
+    const SORT_STRING = 1;
+    const SORT_NUMERIC = 2;
+
+    // properties
+    public $name;
+
+    // methods
+    public function __construct(string $locale) {}
+    public static function create(string $locale) : ?\Collator {}
+    public function compare(string $string1, string $string2) : false|int {}
+    public function sort(array &$array, int $flags = \Collator::SORT_REGULAR) : bool {}
+    public function sortWithSortKeys(array &$array) : bool {}
+    public function asort(array &$array, int $flags = \Collator::SORT_REGULAR) : bool {}
+    public function getAttribute(int $attribute) : false|int {}
+    public function setAttribute(int $attribute, int $value) : bool {}
+    public function getStrength() : int {}
+    public function setStrength(int $strength) {}
+    public function getLocale(int $type) : false|string {}
+    public function getErrorCode() : false|int {}
+    public function getErrorMessage() : false|string {}
+    public function getSortKey(string $string) : false|string {}
+}
+
+class IntlBreakIterator implements \IteratorAggregate, \Traversable {
+
+    // constants
+    const DONE = -1;
+    const WORD_NONE = 0;
+    const WORD_NONE_LIMIT = 100;
+    const WORD_NUMBER = 100;
+    const WORD_NUMBER_LIMIT = 200;
+    const WORD_LETTER = 200;
+    const WORD_LETTER_LIMIT = 300;
+    const WORD_KANA = 300;
+    const WORD_KANA_LIMIT = 400;
+    const WORD_IDEO = 400;
+    const WORD_IDEO_LIMIT = 500;
+    const LINE_SOFT = 0;
+    const LINE_SOFT_LIMIT = 100;
+    const LINE_HARD = 100;
+    const LINE_HARD_LIMIT = 200;
+    const SENTENCE_TERM = 0;
+    const SENTENCE_TERM_LIMIT = 100;
+    const SENTENCE_SEP = 100;
+    const SENTENCE_SEP_LIMIT = 200;
+
+    // methods
+    public static function createCharacterInstance(?string $locale = null) : ?\IntlBreakIterator {}
+    public static function createCodePointInstance() : \IntlCodePointBreakIterator {}
+    public static function createLineInstance(?string $locale = null) : ?\IntlBreakIterator {}
+    public static function createSentenceInstance(?string $locale = null) : ?\IntlBreakIterator {}
+    public static function createTitleInstance(?string $locale = null) : ?\IntlBreakIterator {}
+    public static function createWordInstance(?string $locale = null) : ?\IntlBreakIterator {}
+    private function __construct() {}
+    public function current() : int {}
+    public function first() : int {}
+    public function following(int $offset) : int {}
+    public function getErrorCode() : int {}
+    public function getErrorMessage() : string {}
+    public function getLocale(int $type) : false|string {}
+    public function getPartsIterator(string $type = \IntlPartsIterator::KEY_SEQUENTIAL) : \IntlPartsIterator {}
+    public function getText() : ?string {}
+    public function isBoundary(int $offset) : bool {}
+    public function last() : int {}
+    public function next(?int $offset = null) : int {}
+    public function preceding(int $offset) : int {}
+    public function previous() : int {}
+    public function setText(string $text) : ?bool {}
+    public function getIterator() : \Iterator {}
+}
+
+class IntlCalendar {
+
+    // constants
+    const FIELD_ERA = 0;
+    const FIELD_YEAR = 1;
+    const FIELD_MONTH = 2;
+    const FIELD_WEEK_OF_YEAR = 3;
+    const FIELD_WEEK_OF_MONTH = 4;
+    const FIELD_DATE = 5;
+    const FIELD_DAY_OF_YEAR = 6;
+    const FIELD_DAY_OF_WEEK = 7;
+    const FIELD_DAY_OF_WEEK_IN_MONTH = 8;
+    const FIELD_AM_PM = 9;
+    const FIELD_HOUR = 10;
+    const FIELD_HOUR_OF_DAY = 11;
+    const FIELD_MINUTE = 12;
+    const FIELD_SECOND = 13;
+    const FIELD_MILLISECOND = 14;
+    const FIELD_ZONE_OFFSET = 15;
+    const FIELD_DST_OFFSET = 16;
+    const FIELD_YEAR_WOY = 17;
+    const FIELD_DOW_LOCAL = 18;
+    const FIELD_EXTENDED_YEAR = 19;
+    const FIELD_JULIAN_DAY = 20;
+    const FIELD_MILLISECONDS_IN_DAY = 21;
+    const FIELD_IS_LEAP_MONTH = 22;
+    const FIELD_FIELD_COUNT = 23;
+    const FIELD_DAY_OF_MONTH = 5;
+    const DOW_SUNDAY = 1;
+    const DOW_MONDAY = 2;
+    const DOW_TUESDAY = 3;
+    const DOW_WEDNESDAY = 4;
+    const DOW_THURSDAY = 5;
+    const DOW_FRIDAY = 6;
+    const DOW_SATURDAY = 7;
+    const DOW_TYPE_WEEKDAY = 0;
+    const DOW_TYPE_WEEKEND = 1;
+    const DOW_TYPE_WEEKEND_OFFSET = 2;
+    const DOW_TYPE_WEEKEND_CEASE = 3;
+    const WALLTIME_FIRST = 1;
+    const WALLTIME_LAST = 0;
+    const WALLTIME_NEXT_VALID = 2;
+
+    // methods
+    private function __construct() {}
+    public static function createInstance($timezone = null, ?string $locale = null) : ?\IntlCalendar {}
+    public function equals(\IntlCalendar $other) : bool {}
+    public function fieldDifference(float $timestamp, int $field) : false|int {}
+    public function add(int $field, int $value) : bool {}
+    public function after(\IntlCalendar $other) : bool {}
+    public function before(\IntlCalendar $other) : bool {}
+    public function clear(?int $field = null) {}
+    public static function fromDateTime(\DateTime|string $datetime, ?string $locale = null) : ?\IntlCalendar {}
+    public function get(int $field) : false|int {}
+    public function getActualMaximum(int $field) : false|int {}
+    public function getActualMinimum(int $field) : false|int {}
+    public static function getAvailableLocales() : array {}
+    public function getDayOfWeekType(int $dayOfWeek) : false|int {}
+    public function getErrorCode() : false|int {}
+    public function getErrorMessage() : false|string {}
+    public function getFirstDayOfWeek() : false|int {}
+    public function getGreatestMinimum(int $field) : false|int {}
+    public static function getKeywordValuesForLocale(string $keyword, string $locale, bool $onlyCommon) : \IntlIterator|false {}
+    public function getLeastMaximum(int $field) : false|int {}
+    public function getLocale(int $type) : false|string {}
+    public function getMaximum(int $field) : false|int {}
+    public function getMinimalDaysInFirstWeek() : false|int {}
+    public function setMinimalDaysInFirstWeek(int $days) {}
+    public function getMinimum(int $field) : false|int {}
+    public static function getNow() : float {}
+    public function getRepeatedWallTimeOption() : int {}
+    public function getSkippedWallTimeOption() : int {}
+    public function getTime() : false|float {}
+    public function getTimeZone() : \IntlTimeZone|false {}
+    public function getType() : string {}
+    public function getWeekendTransition(int $dayOfWeek) : false|int {}
+    public function inDaylightTime() : bool {}
+    public function isEquivalentTo(\IntlCalendar $other) : bool {}
+    public function isLenient() : bool {}
+    public function isWeekend(?float $timestamp = null) : bool {}
+    public function roll(int $field, $value) : bool {}
+    public function isSet(int $field) : bool {}
+    public function set(int $year, int $month, int $dayOfMonth = unknown, int $hour = unknown, int $minute = unknown, int $second = unknown) {}
+    public function setFirstDayOfWeek(int $dayOfWeek) {}
+    public function setLenient(bool $lenient) {}
+    public function setRepeatedWallTimeOption(int $option) {}
+    public function setSkippedWallTimeOption(int $option) {}
+    public function setTime(float $timestamp) : bool {}
+    public function setTimeZone($timezone) : bool {}
+    public function toDateTime() : \DateTime|false {}
+}
+
+class IntlChar {
+
+    // constants
+    const UNICODE_VERSION = '12.1';
+    const CODEPOINT_MIN = 0;
+    const CODEPOINT_MAX = 1114111;
+    const NO_NUMERIC_VALUE = -123456789.0;
+    const PROPERTY_ALPHABETIC = 0;
+    const PROPERTY_BINARY_START = 0;
+    const PROPERTY_ASCII_HEX_DIGIT = 1;
+    const PROPERTY_BIDI_CONTROL = 2;
+    const PROPERTY_BIDI_MIRRORED = 3;
+    const PROPERTY_DASH = 4;
+    const PROPERTY_DEFAULT_IGNORABLE_CODE_POINT = 5;
+    const PROPERTY_DEPRECATED = 6;
+    const PROPERTY_DIACRITIC = 7;
+    const PROPERTY_EXTENDER = 8;
+    const PROPERTY_FULL_COMPOSITION_EXCLUSION = 9;
+    const PROPERTY_GRAPHEME_BASE = 10;
+    const PROPERTY_GRAPHEME_EXTEND = 11;
+    const PROPERTY_GRAPHEME_LINK = 12;
+    const PROPERTY_HEX_DIGIT = 13;
+    const PROPERTY_HYPHEN = 14;
+    const PROPERTY_ID_CONTINUE = 15;
+    const PROPERTY_ID_START = 16;
+    const PROPERTY_IDEOGRAPHIC = 17;
+    const PROPERTY_IDS_BINARY_OPERATOR = 18;
+    const PROPERTY_IDS_TRINARY_OPERATOR = 19;
+    const PROPERTY_JOIN_CONTROL = 20;
+    const PROPERTY_LOGICAL_ORDER_EXCEPTION = 21;
+    const PROPERTY_LOWERCASE = 22;
+    const PROPERTY_MATH = 23;
+    const PROPERTY_NONCHARACTER_CODE_POINT = 24;
+    const PROPERTY_QUOTATION_MARK = 25;
+    const PROPERTY_RADICAL = 26;
+    const PROPERTY_SOFT_DOTTED = 27;
+    const PROPERTY_TERMINAL_PUNCTUATION = 28;
+    const PROPERTY_UNIFIED_IDEOGRAPH = 29;
+    const PROPERTY_UPPERCASE = 30;
+    const PROPERTY_WHITE_SPACE = 31;
+    const PROPERTY_XID_CONTINUE = 32;
+    const PROPERTY_XID_START = 33;
+    const PROPERTY_CASE_SENSITIVE = 34;
+    const PROPERTY_S_TERM = 35;
+    const PROPERTY_VARIATION_SELECTOR = 36;
+    const PROPERTY_NFD_INERT = 37;
+    const PROPERTY_NFKD_INERT = 38;
+    const PROPERTY_NFC_INERT = 39;
+    const PROPERTY_NFKC_INERT = 40;
+    const PROPERTY_SEGMENT_STARTER = 41;
+    const PROPERTY_PATTERN_SYNTAX = 42;
+    const PROPERTY_PATTERN_WHITE_SPACE = 43;
+    const PROPERTY_POSIX_ALNUM = 44;
+    const PROPERTY_POSIX_BLANK = 45;
+    const PROPERTY_POSIX_GRAPH = 46;
+    const PROPERTY_POSIX_PRINT = 47;
+    const PROPERTY_POSIX_XDIGIT = 48;
+    const PROPERTY_CASED = 49;
+    const PROPERTY_CASE_IGNORABLE = 50;
+    const PROPERTY_CHANGES_WHEN_LOWERCASED = 51;
+    const PROPERTY_CHANGES_WHEN_UPPERCASED = 52;
+    const PROPERTY_CHANGES_WHEN_TITLECASED = 53;
+    const PROPERTY_CHANGES_WHEN_CASEFOLDED = 54;
+    const PROPERTY_CHANGES_WHEN_CASEMAPPED = 55;
+    const PROPERTY_CHANGES_WHEN_NFKC_CASEFOLDED = 56;
+    const PROPERTY_BINARY_LIMIT = 65;
+    const PROPERTY_BIDI_CLASS = 4096;
+    const PROPERTY_INT_START = 4096;
+    const PROPERTY_BLOCK = 4097;
+    const PROPERTY_CANONICAL_COMBINING_CLASS = 4098;
+    const PROPERTY_DECOMPOSITION_TYPE = 4099;
+    const PROPERTY_EAST_ASIAN_WIDTH = 4100;
+    const PROPERTY_GENERAL_CATEGORY = 4101;
+    const PROPERTY_JOINING_GROUP = 4102;
+    const PROPERTY_JOINING_TYPE = 4103;
+    const PROPERTY_LINE_BREAK = 4104;
+    const PROPERTY_NUMERIC_TYPE = 4105;
+    const PROPERTY_SCRIPT = 4106;
+    const PROPERTY_HANGUL_SYLLABLE_TYPE = 4107;
+    const PROPERTY_NFD_QUICK_CHECK = 4108;
+    const PROPERTY_NFKD_QUICK_CHECK = 4109;
+    const PROPERTY_NFC_QUICK_CHECK = 4110;
+    const PROPERTY_NFKC_QUICK_CHECK = 4111;
+    const PROPERTY_LEAD_CANONICAL_COMBINING_CLASS = 4112;
+    const PROPERTY_TRAIL_CANONICAL_COMBINING_CLASS = 4113;
+    const PROPERTY_GRAPHEME_CLUSTER_BREAK = 4114;
+    const PROPERTY_SENTENCE_BREAK = 4115;
+    const PROPERTY_WORD_BREAK = 4116;
+    const PROPERTY_BIDI_PAIRED_BRACKET_TYPE = 4117;
+    const PROPERTY_INT_LIMIT = 4121;
+    const PROPERTY_GENERAL_CATEGORY_MASK = 8192;
+    const PROPERTY_MASK_START = 8192;
+    const PROPERTY_MASK_LIMIT = 8193;
+    const PROPERTY_NUMERIC_VALUE = 12288;
+    const PROPERTY_DOUBLE_START = 12288;
+    const PROPERTY_DOUBLE_LIMIT = 12289;
+    const PROPERTY_AGE = 16384;
+    const PROPERTY_STRING_START = 16384;
+    const PROPERTY_BIDI_MIRRORING_GLYPH = 16385;
+    const PROPERTY_CASE_FOLDING = 16386;
+    const PROPERTY_ISO_COMMENT = 16387;
+    const PROPERTY_LOWERCASE_MAPPING = 16388;
+    const PROPERTY_NAME = 16389;
+    const PROPERTY_SIMPLE_CASE_FOLDING = 16390;
+    const PROPERTY_SIMPLE_LOWERCASE_MAPPING = 16391;
+    const PROPERTY_SIMPLE_TITLECASE_MAPPING = 16392;
+    const PROPERTY_SIMPLE_UPPERCASE_MAPPING = 16393;
+    const PROPERTY_TITLECASE_MAPPING = 16394;
+    const PROPERTY_UNICODE_1_NAME = 16395;
+    const PROPERTY_UPPERCASE_MAPPING = 16396;
+    const PROPERTY_BIDI_PAIRED_BRACKET = 16397;
+    const PROPERTY_STRING_LIMIT = 16398;
+    const PROPERTY_SCRIPT_EXTENSIONS = 28672;
+    const PROPERTY_OTHER_PROPERTY_START = 28672;
+    const PROPERTY_OTHER_PROPERTY_LIMIT = 28673;
+    const PROPERTY_INVALID_CODE = -1;
+    const CHAR_CATEGORY_UNASSIGNED = 0;
+    const CHAR_CATEGORY_GENERAL_OTHER_TYPES = 0;
+    const CHAR_CATEGORY_UPPERCASE_LETTER = 1;
+    const CHAR_CATEGORY_LOWERCASE_LETTER = 2;
+    const CHAR_CATEGORY_TITLECASE_LETTER = 3;
+    const CHAR_CATEGORY_MODIFIER_LETTER = 4;
+    const CHAR_CATEGORY_OTHER_LETTER = 5;
+    const CHAR_CATEGORY_NON_SPACING_MARK = 6;
+    const CHAR_CATEGORY_ENCLOSING_MARK = 7;
+    const CHAR_CATEGORY_COMBINING_SPACING_MARK = 8;
+    const CHAR_CATEGORY_DECIMAL_DIGIT_NUMBER = 9;
+    const CHAR_CATEGORY_LETTER_NUMBER = 10;
+    const CHAR_CATEGORY_OTHER_NUMBER = 11;
+    const CHAR_CATEGORY_SPACE_SEPARATOR = 12;
+    const CHAR_CATEGORY_LINE_SEPARATOR = 13;
+    const CHAR_CATEGORY_PARAGRAPH_SEPARATOR = 14;
+    const CHAR_CATEGORY_CONTROL_CHAR = 15;
+    const CHAR_CATEGORY_FORMAT_CHAR = 16;
+    const CHAR_CATEGORY_PRIVATE_USE_CHAR = 17;
+    const CHAR_CATEGORY_SURROGATE = 18;
+    const CHAR_CATEGORY_DASH_PUNCTUATION = 19;
+    const CHAR_CATEGORY_START_PUNCTUATION = 20;
+    const CHAR_CATEGORY_END_PUNCTUATION = 21;
+    const CHAR_CATEGORY_CONNECTOR_PUNCTUATION = 22;
+    const CHAR_CATEGORY_OTHER_PUNCTUATION = 23;
+    const CHAR_CATEGORY_MATH_SYMBOL = 24;
+    const CHAR_CATEGORY_CURRENCY_SYMBOL = 25;
+    const CHAR_CATEGORY_MODIFIER_SYMBOL = 26;
+    const CHAR_CATEGORY_OTHER_SYMBOL = 27;
+    const CHAR_CATEGORY_INITIAL_PUNCTUATION = 28;
+    const CHAR_CATEGORY_FINAL_PUNCTUATION = 29;
+    const CHAR_CATEGORY_CHAR_CATEGORY_COUNT = 30;
+    const CHAR_DIRECTION_LEFT_TO_RIGHT = 0;
+    const CHAR_DIRECTION_RIGHT_TO_LEFT = 1;
+    const CHAR_DIRECTION_EUROPEAN_NUMBER = 2;
+    const CHAR_DIRECTION_EUROPEAN_NUMBER_SEPARATOR = 3;
+    const CHAR_DIRECTION_EUROPEAN_NUMBER_TERMINATOR = 4;
+    const CHAR_DIRECTION_ARABIC_NUMBER = 5;
+    const CHAR_DIRECTION_COMMON_NUMBER_SEPARATOR = 6;
+    const CHAR_DIRECTION_BLOCK_SEPARATOR = 7;
+    const CHAR_DIRECTION_SEGMENT_SEPARATOR = 8;
+    const CHAR_DIRECTION_WHITE_SPACE_NEUTRAL = 9;
+    const CHAR_DIRECTION_OTHER_NEUTRAL = 10;
+    const CHAR_DIRECTION_LEFT_TO_RIGHT_EMBEDDING = 11;
+    const CHAR_DIRECTION_LEFT_TO_RIGHT_OVERRIDE = 12;
+    const CHAR_DIRECTION_RIGHT_TO_LEFT_ARABIC = 13;
+    const CHAR_DIRECTION_RIGHT_TO_LEFT_EMBEDDING = 14;
+    const CHAR_DIRECTION_RIGHT_TO_LEFT_OVERRIDE = 15;
+    const CHAR_DIRECTION_POP_DIRECTIONAL_FORMAT = 16;
+    const CHAR_DIRECTION_DIR_NON_SPACING_MARK = 17;
+    const CHAR_DIRECTION_BOUNDARY_NEUTRAL = 18;
+    const CHAR_DIRECTION_FIRST_STRONG_ISOLATE = 19;
+    const CHAR_DIRECTION_LEFT_TO_RIGHT_ISOLATE = 20;
+    const CHAR_DIRECTION_RIGHT_TO_LEFT_ISOLATE = 21;
+    const CHAR_DIRECTION_POP_DIRECTIONAL_ISOLATE = 22;
+    const CHAR_DIRECTION_CHAR_DIRECTION_COUNT = 23;
+    const BLOCK_CODE_NO_BLOCK = 0;
+    const BLOCK_CODE_BASIC_LATIN = 1;
+    const BLOCK_CODE_LATIN_1_SUPPLEMENT = 2;
+    const BLOCK_CODE_LATIN_EXTENDED_A = 3;
+    const BLOCK_CODE_LATIN_EXTENDED_B = 4;
+    const BLOCK_CODE_IPA_EXTENSIONS = 5;
+    const BLOCK_CODE_SPACING_MODIFIER_LETTERS = 6;
+    const BLOCK_CODE_COMBINING_DIACRITICAL_MARKS = 7;
+    const BLOCK_CODE_GREEK = 8;
+    const BLOCK_CODE_CYRILLIC = 9;
+    const BLOCK_CODE_ARMENIAN = 10;
+    const BLOCK_CODE_HEBREW = 11;
+    const BLOCK_CODE_ARABIC = 12;
+    const BLOCK_CODE_SYRIAC = 13;
+    const BLOCK_CODE_THAANA = 14;
+    const BLOCK_CODE_DEVANAGARI = 15;
+    const BLOCK_CODE_BENGALI = 16;
+    const BLOCK_CODE_GURMUKHI = 17;
+    const BLOCK_CODE_GUJARATI = 18;
+    const BLOCK_CODE_ORIYA = 19;
+    const BLOCK_CODE_TAMIL = 20;
+    const BLOCK_CODE_TELUGU = 21;
+    const BLOCK_CODE_KANNADA = 22;
+    const BLOCK_CODE_MALAYALAM = 23;
+    const BLOCK_CODE_SINHALA = 24;
+    const BLOCK_CODE_THAI = 25;
+    const BLOCK_CODE_LAO = 26;
+    const BLOCK_CODE_TIBETAN = 27;
+    const BLOCK_CODE_MYANMAR = 28;
+    const BLOCK_CODE_GEORGIAN = 29;
+    const BLOCK_CODE_HANGUL_JAMO = 30;
+    const BLOCK_CODE_ETHIOPIC = 31;
+    const BLOCK_CODE_CHEROKEE = 32;
+    const BLOCK_CODE_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS = 33;
+    const BLOCK_CODE_OGHAM = 34;
+    const BLOCK_CODE_RUNIC = 35;
+    const BLOCK_CODE_KHMER = 36;
+    const BLOCK_CODE_MONGOLIAN = 37;
+    const BLOCK_CODE_LATIN_EXTENDED_ADDITIONAL = 38;
+    const BLOCK_CODE_GREEK_EXTENDED = 39;
+    const BLOCK_CODE_GENERAL_PUNCTUATION = 40;
+    const BLOCK_CODE_SUPERSCRIPTS_AND_SUBSCRIPTS = 41;
+    const BLOCK_CODE_CURRENCY_SYMBOLS = 42;
+    const BLOCK_CODE_COMBINING_MARKS_FOR_SYMBOLS = 43;
+    const BLOCK_CODE_LETTERLIKE_SYMBOLS = 44;
+    const BLOCK_CODE_NUMBER_FORMS = 45;
+    const BLOCK_CODE_ARROWS = 46;
+    const BLOCK_CODE_MATHEMATICAL_OPERATORS = 47;
+    const BLOCK_CODE_MISCELLANEOUS_TECHNICAL = 48;
+    const BLOCK_CODE_CONTROL_PICTURES = 49;
+    const BLOCK_CODE_OPTICAL_CHARACTER_RECOGNITION = 50;
+    const BLOCK_CODE_ENCLOSED_ALPHANUMERICS = 51;
+    const BLOCK_CODE_BOX_DRAWING = 52;
+    const BLOCK_CODE_BLOCK_ELEMENTS = 53;
+    const BLOCK_CODE_GEOMETRIC_SHAPES = 54;
+    const BLOCK_CODE_MISCELLANEOUS_SYMBOLS = 55;
+    const BLOCK_CODE_DINGBATS = 56;
+    const BLOCK_CODE_BRAILLE_PATTERNS = 57;
+    const BLOCK_CODE_CJK_RADICALS_SUPPLEMENT = 58;
+    const BLOCK_CODE_KANGXI_RADICALS = 59;
+    const BLOCK_CODE_IDEOGRAPHIC_DESCRIPTION_CHARACTERS = 60;
+    const BLOCK_CODE_CJK_SYMBOLS_AND_PUNCTUATION = 61;
+    const BLOCK_CODE_HIRAGANA = 62;
+    const BLOCK_CODE_KATAKANA = 63;
+    const BLOCK_CODE_BOPOMOFO = 64;
+    const BLOCK_CODE_HANGUL_COMPATIBILITY_JAMO = 65;
+    const BLOCK_CODE_KANBUN = 66;
+    const BLOCK_CODE_BOPOMOFO_EXTENDED = 67;
+    const BLOCK_CODE_ENCLOSED_CJK_LETTERS_AND_MONTHS = 68;
+    const BLOCK_CODE_CJK_COMPATIBILITY = 69;
+    const BLOCK_CODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A = 70;
+    const BLOCK_CODE_CJK_UNIFIED_IDEOGRAPHS = 71;
+    const BLOCK_CODE_YI_SYLLABLES = 72;
+    const BLOCK_CODE_YI_RADICALS = 73;
+    const BLOCK_CODE_HANGUL_SYLLABLES = 74;
+    const BLOCK_CODE_HIGH_SURROGATES = 75;
+    const BLOCK_CODE_HIGH_PRIVATE_USE_SURROGATES = 76;
+    const BLOCK_CODE_LOW_SURROGATES = 77;
+    const BLOCK_CODE_PRIVATE_USE_AREA = 78;
+    const BLOCK_CODE_PRIVATE_USE = 78;
+    const BLOCK_CODE_CJK_COMPATIBILITY_IDEOGRAPHS = 79;
+    const BLOCK_CODE_ALPHABETIC_PRESENTATION_FORMS = 80;
+    const BLOCK_CODE_ARABIC_PRESENTATION_FORMS_A = 81;
+    const BLOCK_CODE_COMBINING_HALF_MARKS = 82;
+    const BLOCK_CODE_CJK_COMPATIBILITY_FORMS = 83;
+    const BLOCK_CODE_SMALL_FORM_VARIANTS = 84;
+    const BLOCK_CODE_ARABIC_PRESENTATION_FORMS_B = 85;
+    const BLOCK_CODE_SPECIALS = 86;
+    const BLOCK_CODE_HALFWIDTH_AND_FULLWIDTH_FORMS = 87;
+    const BLOCK_CODE_OLD_ITALIC = 88;
+    const BLOCK_CODE_GOTHIC = 89;
+    const BLOCK_CODE_DESERET = 90;
+    const BLOCK_CODE_BYZANTINE_MUSICAL_SYMBOLS = 91;
+    const BLOCK_CODE_MUSICAL_SYMBOLS = 92;
+    const BLOCK_CODE_MATHEMATICAL_ALPHANUMERIC_SYMBOLS = 93;
+    const BLOCK_CODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B = 94;
+    const BLOCK_CODE_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = 95;
+    const BLOCK_CODE_TAGS = 96;
+    const BLOCK_CODE_CYRILLIC_SUPPLEMENT = 97;
+    const BLOCK_CODE_CYRILLIC_SUPPLEMENTARY = 97;
+    const BLOCK_CODE_TAGALOG = 98;
+    const BLOCK_CODE_HANUNOO = 99;
+    const BLOCK_CODE_BUHID = 100;
+    const BLOCK_CODE_TAGBANWA = 101;
+    const BLOCK_CODE_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A = 102;
+    const BLOCK_CODE_SUPPLEMENTAL_ARROWS_A = 103;
+    const BLOCK_CODE_SUPPLEMENTAL_ARROWS_B = 104;
+    const BLOCK_CODE_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B = 105;
+    const BLOCK_CODE_SUPPLEMENTAL_MATHEMATICAL_OPERATORS = 106;
+    const BLOCK_CODE_KATAKANA_PHONETIC_EXTENSIONS = 107;
+    const BLOCK_CODE_VARIATION_SELECTORS = 108;
+    const BLOCK_CODE_SUPPLEMENTARY_PRIVATE_USE_AREA_A = 109;
+    const BLOCK_CODE_SUPPLEMENTARY_PRIVATE_USE_AREA_B = 110;
+    const BLOCK_CODE_LIMBU = 111;
+    const BLOCK_CODE_TAI_LE = 112;
+    const BLOCK_CODE_KHMER_SYMBOLS = 113;
+    const BLOCK_CODE_PHONETIC_EXTENSIONS = 114;
+    const BLOCK_CODE_MISCELLANEOUS_SYMBOLS_AND_ARROWS = 115;
+    const BLOCK_CODE_YIJING_HEXAGRAM_SYMBOLS = 116;
+    const BLOCK_CODE_LINEAR_B_SYLLABARY = 117;
+    const BLOCK_CODE_LINEAR_B_IDEOGRAMS = 118;
+    const BLOCK_CODE_AEGEAN_NUMBERS = 119;
+    const BLOCK_CODE_UGARITIC = 120;
+    const BLOCK_CODE_SHAVIAN = 121;
+    const BLOCK_CODE_OSMANYA = 122;
+    const BLOCK_CODE_CYPRIOT_SYLLABARY = 123;
+    const BLOCK_CODE_TAI_XUAN_JING_SYMBOLS = 124;
+    const BLOCK_CODE_VARIATION_SELECTORS_SUPPLEMENT = 125;
+    const BLOCK_CODE_ANCIENT_GREEK_MUSICAL_NOTATION = 126;
+    const BLOCK_CODE_ANCIENT_GREEK_NUMBERS = 127;
+    const BLOCK_CODE_ARABIC_SUPPLEMENT = 128;
+    const BLOCK_CODE_BUGINESE = 129;
+    const BLOCK_CODE_CJK_STROKES = 130;
+    const BLOCK_CODE_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT = 131;
+    const BLOCK_CODE_COPTIC = 132;
+    const BLOCK_CODE_ETHIOPIC_EXTENDED = 133;
+    const BLOCK_CODE_ETHIOPIC_SUPPLEMENT = 134;
+    const BLOCK_CODE_GEORGIAN_SUPPLEMENT = 135;
+    const BLOCK_CODE_GLAGOLITIC = 136;
+    const BLOCK_CODE_KHAROSHTHI = 137;
+    const BLOCK_CODE_MODIFIER_TONE_LETTERS = 138;
+    const BLOCK_CODE_NEW_TAI_LUE = 139;
+    const BLOCK_CODE_OLD_PERSIAN = 140;
+    const BLOCK_CODE_PHONETIC_EXTENSIONS_SUPPLEMENT = 141;
+    const BLOCK_CODE_SUPPLEMENTAL_PUNCTUATION = 142;
+    const BLOCK_CODE_SYLOTI_NAGRI = 143;
+    const BLOCK_CODE_TIFINAGH = 144;
+    const BLOCK_CODE_VERTICAL_FORMS = 145;
+    const BLOCK_CODE_NKO = 146;
+    const BLOCK_CODE_BALINESE = 147;
+    const BLOCK_CODE_LATIN_EXTENDED_C = 148;
+    const BLOCK_CODE_LATIN_EXTENDED_D = 149;
+    const BLOCK_CODE_PHAGS_PA = 150;
+    const BLOCK_CODE_PHOENICIAN = 151;
+    const BLOCK_CODE_CUNEIFORM = 152;
+    const BLOCK_CODE_CUNEIFORM_NUMBERS_AND_PUNCTUATION = 153;
+    const BLOCK_CODE_COUNTING_ROD_NUMERALS = 154;
+    const BLOCK_CODE_SUNDANESE = 155;
+    const BLOCK_CODE_LEPCHA = 156;
+    const BLOCK_CODE_OL_CHIKI = 157;
+    const BLOCK_CODE_CYRILLIC_EXTENDED_A = 158;
+    const BLOCK_CODE_VAI = 159;
+    const BLOCK_CODE_CYRILLIC_EXTENDED_B = 160;
+    const BLOCK_CODE_SAURASHTRA = 161;
+    const BLOCK_CODE_KAYAH_LI = 162;
+    const BLOCK_CODE_REJANG = 163;
+    const BLOCK_CODE_CHAM = 164;
+    const BLOCK_CODE_ANCIENT_SYMBOLS = 165;
+    const BLOCK_CODE_PHAISTOS_DISC = 166;
+    const BLOCK_CODE_LYCIAN = 167;
+    const BLOCK_CODE_CARIAN = 168;
+    const BLOCK_CODE_LYDIAN = 169;
+    const BLOCK_CODE_MAHJONG_TILES = 170;
+    const BLOCK_CODE_DOMINO_TILES = 171;
+    const BLOCK_CODE_SAMARITAN = 172;
+    const BLOCK_CODE_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED = 173;
+    const BLOCK_CODE_TAI_THAM = 174;
+    const BLOCK_CODE_VEDIC_EXTENSIONS = 175;
+    const BLOCK_CODE_LISU = 176;
+    const BLOCK_CODE_BAMUM = 177;
+    const BLOCK_CODE_COMMON_INDIC_NUMBER_FORMS = 178;
+    const BLOCK_CODE_DEVANAGARI_EXTENDED = 179;
+    const BLOCK_CODE_HANGUL_JAMO_EXTENDED_A = 180;
+    const BLOCK_CODE_JAVANESE = 181;
+    const BLOCK_CODE_MYANMAR_EXTENDED_A = 182;
+    const BLOCK_CODE_TAI_VIET = 183;
+    const BLOCK_CODE_MEETEI_MAYEK = 184;
+    const BLOCK_CODE_HANGUL_JAMO_EXTENDED_B = 185;
+    const BLOCK_CODE_IMPERIAL_ARAMAIC = 186;
+    const BLOCK_CODE_OLD_SOUTH_ARABIAN = 187;
+    const BLOCK_CODE_AVESTAN = 188;
+    const BLOCK_CODE_INSCRIPTIONAL_PARTHIAN = 189;
+    const BLOCK_CODE_INSCRIPTIONAL_PAHLAVI = 190;
+    const BLOCK_CODE_OLD_TURKIC = 191;
+    const BLOCK_CODE_RUMI_NUMERAL_SYMBOLS = 192;
+    const BLOCK_CODE_KAITHI = 193;
+    const BLOCK_CODE_EGYPTIAN_HIEROGLYPHS = 194;
+    const BLOCK_CODE_ENCLOSED_ALPHANUMERIC_SUPPLEMENT = 195;
+    const BLOCK_CODE_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT = 196;
+    const BLOCK_CODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C = 197;
+    const BLOCK_CODE_MANDAIC = 198;
+    const BLOCK_CODE_BATAK = 199;
+    const BLOCK_CODE_ETHIOPIC_EXTENDED_A = 200;
+    const BLOCK_CODE_BRAHMI = 201;
+    const BLOCK_CODE_BAMUM_SUPPLEMENT = 202;
+    const BLOCK_CODE_KANA_SUPPLEMENT = 203;
+    const BLOCK_CODE_PLAYING_CARDS = 204;
+    const BLOCK_CODE_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS = 205;
+    const BLOCK_CODE_EMOTICONS = 206;
+    const BLOCK_CODE_TRANSPORT_AND_MAP_SYMBOLS = 207;
+    const BLOCK_CODE_ALCHEMICAL_SYMBOLS = 208;
+    const BLOCK_CODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D = 209;
+    const BLOCK_CODE_ARABIC_EXTENDED_A = 210;
+    const BLOCK_CODE_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS = 211;
+    const BLOCK_CODE_CHAKMA = 212;
+    const BLOCK_CODE_MEETEI_MAYEK_EXTENSIONS = 213;
+    const BLOCK_CODE_MEROITIC_CURSIVE = 214;
+    const BLOCK_CODE_MEROITIC_HIEROGLYPHS = 215;
+    const BLOCK_CODE_MIAO = 216;
+    const BLOCK_CODE_SHARADA = 217;
+    const BLOCK_CODE_SORA_SOMPENG = 218;
+    const BLOCK_CODE_SUNDANESE_SUPPLEMENT = 219;
+    const BLOCK_CODE_TAKRI = 220;
+    const BLOCK_CODE_BASSA_VAH = 221;
+    const BLOCK_CODE_CAUCASIAN_ALBANIAN = 222;
+    const BLOCK_CODE_COPTIC_EPACT_NUMBERS = 223;
+    const BLOCK_CODE_COMBINING_DIACRITICAL_MARKS_EXTENDED = 224;
+    const BLOCK_CODE_DUPLOYAN = 225;
+    const BLOCK_CODE_ELBASAN = 226;
+    const BLOCK_CODE_GEOMETRIC_SHAPES_EXTENDED = 227;
+    const BLOCK_CODE_GRANTHA = 228;
+    const BLOCK_CODE_KHOJKI = 229;
+    const BLOCK_CODE_KHUDAWADI = 230;
+    const BLOCK_CODE_LATIN_EXTENDED_E = 231;
+    const BLOCK_CODE_LINEAR_A = 232;
+    const BLOCK_CODE_MAHAJANI = 233;
+    const BLOCK_CODE_MANICHAEAN = 234;
+    const BLOCK_CODE_MENDE_KIKAKUI = 235;
+    const BLOCK_CODE_MODI = 236;
+    const BLOCK_CODE_MRO = 237;
+    const BLOCK_CODE_MYANMAR_EXTENDED_B = 238;
+    const BLOCK_CODE_NABATAEAN = 239;
+    const BLOCK_CODE_OLD_NORTH_ARABIAN = 240;
+    const BLOCK_CODE_OLD_PERMIC = 241;
+    const BLOCK_CODE_ORNAMENTAL_DINGBATS = 242;
+    const BLOCK_CODE_PAHAWH_HMONG = 243;
+    const BLOCK_CODE_PALMYRENE = 244;
+    const BLOCK_CODE_PAU_CIN_HAU = 245;
+    const BLOCK_CODE_PSALTER_PAHLAVI = 246;
+    const BLOCK_CODE_SHORTHAND_FORMAT_CONTROLS = 247;
+    const BLOCK_CODE_SIDDHAM = 248;
+    const BLOCK_CODE_SINHALA_ARCHAIC_NUMBERS = 249;
+    const BLOCK_CODE_SUPPLEMENTAL_ARROWS_C = 250;
+    const BLOCK_CODE_TIRHUTA = 251;
+    const BLOCK_CODE_WARANG_CITI = 252;
+    const BLOCK_CODE_COUNT = 301;
+    const BLOCK_CODE_INVALID_CODE = -1;
+    const BPT_NONE = 0;
+    const BPT_OPEN = 1;
+    const BPT_CLOSE = 2;
+    const BPT_COUNT = 3;
+    const EA_NEUTRAL = 0;
+    const EA_AMBIGUOUS = 1;
+    const EA_HALFWIDTH = 2;
+    const EA_FULLWIDTH = 3;
+    const EA_NARROW = 4;
+    const EA_WIDE = 5;
+    const EA_COUNT = 6;
+    const UNICODE_CHAR_NAME = 0;
+    const UNICODE_10_CHAR_NAME = 1;
+    const EXTENDED_CHAR_NAME = 2;
+    const CHAR_NAME_ALIAS = 3;
+    const CHAR_NAME_CHOICE_COUNT = 4;
+    const SHORT_PROPERTY_NAME = 0;
+    const LONG_PROPERTY_NAME = 1;
+    const PROPERTY_NAME_CHOICE_COUNT = 2;
+    const DT_NONE = 0;
+    const DT_CANONICAL = 1;
+    const DT_COMPAT = 2;
+    const DT_CIRCLE = 3;
+    const DT_FINAL = 4;
+    const DT_FONT = 5;
+    const DT_FRACTION = 6;
+    const DT_INITIAL = 7;
+    const DT_ISOLATED = 8;
+    const DT_MEDIAL = 9;
+    const DT_NARROW = 10;
+    const DT_NOBREAK = 11;
+    const DT_SMALL = 12;
+    const DT_SQUARE = 13;
+    const DT_SUB = 14;
+    const DT_SUPER = 15;
+    const DT_VERTICAL = 16;
+    const DT_WIDE = 17;
+    const DT_COUNT = 18;
+    const JT_NON_JOINING = 0;
+    const JT_JOIN_CAUSING = 1;
+    const JT_DUAL_JOINING = 2;
+    const JT_LEFT_JOINING = 3;
+    const JT_RIGHT_JOINING = 4;
+    const JT_TRANSPARENT = 5;
+    const JT_COUNT = 6;
+    const JG_NO_JOINING_GROUP = 0;
+    const JG_AIN = 1;
+    const JG_ALAPH = 2;
+    const JG_ALEF = 3;
+    const JG_BEH = 4;
+    const JG_BETH = 5;
+    const JG_DAL = 6;
+    const JG_DALATH_RISH = 7;
+    const JG_E = 8;
+    const JG_FEH = 9;
+    const JG_FINAL_SEMKATH = 10;
+    const JG_GAF = 11;
+    const JG_GAMAL = 12;
+    const JG_HAH = 13;
+    const JG_TEH_MARBUTA_GOAL = 14;
+    const JG_HAMZA_ON_HEH_GOAL = 14;
+    const JG_HE = 15;
+    const JG_HEH = 16;
+    const JG_HEH_GOAL = 17;
+    const JG_HETH = 18;
+    const JG_KAF = 19;
+    const JG_KAPH = 20;
+    const JG_KNOTTED_HEH = 21;
+    const JG_LAM = 22;
+    const JG_LAMADH = 23;
+    const JG_MEEM = 24;
+    const JG_MIM = 25;
+    const JG_NOON = 26;
+    const JG_NUN = 27;
+    const JG_PE = 28;
+    const JG_QAF = 29;
+    const JG_QAPH = 30;
+    const JG_REH = 31;
+    const JG_REVERSED_PE = 32;
+    const JG_SAD = 33;
+    const JG_SADHE = 34;
+    const JG_SEEN = 35;
+    const JG_SEMKATH = 36;
+    const JG_SHIN = 37;
+    const JG_SWASH_KAF = 38;
+    const JG_SYRIAC_WAW = 39;
+    const JG_TAH = 40;
+    const JG_TAW = 41;
+    const JG_TEH_MARBUTA = 42;
+    const JG_TETH = 43;
+    const JG_WAW = 44;
+    const JG_YEH = 45;
+    const JG_YEH_BARREE = 46;
+    const JG_YEH_WITH_TAIL = 47;
+    const JG_YUDH = 48;
+    const JG_YUDH_HE = 49;
+    const JG_ZAIN = 50;
+    const JG_FE = 51;
+    const JG_KHAPH = 52;
+    const JG_ZHAIN = 53;
+    const JG_BURUSHASKI_YEH_BARREE = 54;
+    const JG_FARSI_YEH = 55;
+    const JG_NYA = 56;
+    const JG_ROHINGYA_YEH = 57;
+    const JG_MANICHAEAN_ALEPH = 58;
+    const JG_MANICHAEAN_AYIN = 59;
+    const JG_MANICHAEAN_BETH = 60;
+    const JG_MANICHAEAN_DALETH = 61;
+    const JG_MANICHAEAN_DHAMEDH = 62;
+    const JG_MANICHAEAN_FIVE = 63;
+    const JG_MANICHAEAN_GIMEL = 64;
+    const JG_MANICHAEAN_HETH = 65;
+    const JG_MANICHAEAN_HUNDRED = 66;
+    const JG_MANICHAEAN_KAPH = 67;
+    const JG_MANICHAEAN_LAMEDH = 68;
+    const JG_MANICHAEAN_MEM = 69;
+    const JG_MANICHAEAN_NUN = 70;
+    const JG_MANICHAEAN_ONE = 71;
+    const JG_MANICHAEAN_PE = 72;
+    const JG_MANICHAEAN_QOPH = 73;
+    const JG_MANICHAEAN_RESH = 74;
+    const JG_MANICHAEAN_SADHE = 75;
+    const JG_MANICHAEAN_SAMEKH = 76;
+    const JG_MANICHAEAN_TAW = 77;
+    const JG_MANICHAEAN_TEN = 78;
+    const JG_MANICHAEAN_TETH = 79;
+    const JG_MANICHAEAN_THAMEDH = 80;
+    const JG_MANICHAEAN_TWENTY = 81;
+    const JG_MANICHAEAN_WAW = 82;
+    const JG_MANICHAEAN_YODH = 83;
+    const JG_MANICHAEAN_ZAYIN = 84;
+    const JG_STRAIGHT_WAW = 85;
+    const JG_COUNT = 102;
+    const GCB_OTHER = 0;
+    const GCB_CONTROL = 1;
+    const GCB_CR = 2;
+    const GCB_EXTEND = 3;
+    const GCB_L = 4;
+    const GCB_LF = 5;
+    const GCB_LV = 6;
+    const GCB_LVT = 7;
+    const GCB_T = 8;
+    const GCB_V = 9;
+    const GCB_SPACING_MARK = 10;
+    const GCB_PREPEND = 11;
+    const GCB_REGIONAL_INDICATOR = 12;
+    const GCB_COUNT = 18;
+    const WB_OTHER = 0;
+    const WB_ALETTER = 1;
+    const WB_FORMAT = 2;
+    const WB_KATAKANA = 3;
+    const WB_MIDLETTER = 4;
+    const WB_MIDNUM = 5;
+    const WB_NUMERIC = 6;
+    const WB_EXTENDNUMLET = 7;
+    const WB_CR = 8;
+    const WB_EXTEND = 9;
+    const WB_LF = 10;
+    const WB_MIDNUMLET = 11;
+    const WB_NEWLINE = 12;
+    const WB_REGIONAL_INDICATOR = 13;
+    const WB_HEBREW_LETTER = 14;
+    const WB_SINGLE_QUOTE = 15;
+    const WB_DOUBLE_QUOTE = 16;
+    const WB_COUNT = 23;
+    const SB_OTHER = 0;
+    const SB_ATERM = 1;
+    const SB_CLOSE = 2;
+    const SB_FORMAT = 3;
+    const SB_LOWER = 4;
+    const SB_NUMERIC = 5;
+    const SB_OLETTER = 6;
+    const SB_SEP = 7;
+    const SB_SP = 8;
+    const SB_STERM = 9;
+    const SB_UPPER = 10;
+    const SB_CR = 11;
+    const SB_EXTEND = 12;
+    const SB_LF = 13;
+    const SB_SCONTINUE = 14;
+    const SB_COUNT = 15;
+    const LB_UNKNOWN = 0;
+    const LB_AMBIGUOUS = 1;
+    const LB_ALPHABETIC = 2;
+    const LB_BREAK_BOTH = 3;
+    const LB_BREAK_AFTER = 4;
+    const LB_BREAK_BEFORE = 5;
+    const LB_MANDATORY_BREAK = 6;
+    const LB_CONTINGENT_BREAK = 7;
+    const LB_CLOSE_PUNCTUATION = 8;
+    const LB_COMBINING_MARK = 9;
+    const LB_CARRIAGE_RETURN = 10;
+    const LB_EXCLAMATION = 11;
+    const LB_GLUE = 12;
+    const LB_HYPHEN = 13;
+    const LB_IDEOGRAPHIC = 14;
+    const LB_INSEPARABLE = 15;
+    const LB_INSEPERABLE = 15;
+    const LB_INFIX_NUMERIC = 16;
+    const LB_LINE_FEED = 17;
+    const LB_NONSTARTER = 18;
+    const LB_NUMERIC = 19;
+    const LB_OPEN_PUNCTUATION = 20;
+    const LB_POSTFIX_NUMERIC = 21;
+    const LB_PREFIX_NUMERIC = 22;
+    const LB_QUOTATION = 23;
+    const LB_COMPLEX_CONTEXT = 24;
+    const LB_SURROGATE = 25;
+    const LB_SPACE = 26;
+    const LB_BREAK_SYMBOLS = 27;
+    const LB_ZWSPACE = 28;
+    const LB_NEXT_LINE = 29;
+    const LB_WORD_JOINER = 30;
+    const LB_H2 = 31;
+    const LB_H3 = 32;
+    const LB_JL = 33;
+    const LB_JT = 34;
+    const LB_JV = 35;
+    const LB_CLOSE_PARENTHESIS = 36;
+    const LB_CONDITIONAL_JAPANESE_STARTER = 37;
+    const LB_HEBREW_LETTER = 38;
+    const LB_REGIONAL_INDICATOR = 39;
+    const LB_COUNT = 43;
+    const NT_NONE = 0;
+    const NT_DECIMAL = 1;
+    const NT_DIGIT = 2;
+    const NT_NUMERIC = 3;
+    const NT_COUNT = 4;
+    const HST_NOT_APPLICABLE = 0;
+    const HST_LEADING_JAMO = 1;
+    const HST_VOWEL_JAMO = 2;
+    const HST_TRAILING_JAMO = 3;
+    const HST_LV_SYLLABLE = 4;
+    const HST_LVT_SYLLABLE = 5;
+    const HST_COUNT = 6;
+    const FOLD_CASE_DEFAULT = 0;
+    const FOLD_CASE_EXCLUDE_SPECIAL_I = 1;
+
+    // methods
+    public static function hasBinaryProperty(int|string $codepoint, int $property) : ?bool {}
+    public static function charAge(int|string $codepoint) : ?array {}
+    public static function charDigitValue(int|string $codepoint) : ?int {}
+    public static function charDirection(int|string $codepoint) : ?int {}
+    public static function charFromName(string $name, int $type = \IntlChar::UNICODE_CHAR_NAME) : ?int {}
+    public static function charMirror(int|string $codepoint) : int|null|string {}
+    public static function charName(int|string $codepoint, int $type = \IntlChar::UNICODE_CHAR_NAME) : ?string {}
+    public static function charType(int|string $codepoint) : ?int {}
+    public static function chr(int|string $codepoint) : ?string {}
+    public static function digit(int|string $codepoint, int $base = 10) : false|int|null {}
+    public static function enumCharNames(int|string $start, int|string $end, callable $callback, int $type = \IntlChar::UNICODE_CHAR_NAME) : ?bool {}
+    public static function enumCharTypes(callable $callback) : void {}
+    public static function foldCase(int|string $codepoint, int $options = \IntlChar::FOLD_CASE_DEFAULT) : int|null|string {}
+    public static function forDigit(int $digit, int $base = 10) : int {}
+    public static function getBidiPairedBracket(int|string $codepoint) : int|null|string {}
+    public static function getBlockCode(int|string $codepoint) : ?int {}
+    public static function getCombiningClass(int|string $codepoint) : ?int {}
+    public static function getFC_NFKC_Closure(int|string $codepoint) : false|null|string {}
+    public static function getIntPropertyMaxValue(int $property) : int {}
+    public static function getIntPropertyMinValue(int $property) : int {}
+    public static function getIntPropertyValue(int|string $codepoint, int $property) : ?int {}
+    public static function getNumericValue(int|string $codepoint) : ?float {}
+    public static function getPropertyEnum(string $alias) : int {}
+    public static function getPropertyName(int $property, int $type = \IntlChar::LONG_PROPERTY_NAME) : false|string {}
+    public static function getPropertyValueEnum(int $property, string $name) : int {}
+    public static function getPropertyValueName(int $property, int $value, int $type = \IntlChar::LONG_PROPERTY_NAME) : false|string {}
+    public static function getUnicodeVersion() : array {}
+    public static function isalnum(int|string $codepoint) : ?bool {}
+    public static function isalpha(int|string $codepoint) : ?bool {}
+    public static function isbase(int|string $codepoint) : ?bool {}
+    public static function isblank(int|string $codepoint) : ?bool {}
+    public static function iscntrl(int|string $codepoint) : ?bool {}
+    public static function isdefined(int|string $codepoint) : ?bool {}
+    public static function isdigit(int|string $codepoint) : ?bool {}
+    public static function isgraph(int|string $codepoint) : ?bool {}
+    public static function isIDIgnorable(int|string $codepoint) : ?bool {}
+    public static function isIDPart(int|string $codepoint) : ?bool {}
+    public static function isIDStart(int|string $codepoint) : ?bool {}
+    public static function isISOControl(int|string $codepoint) : ?bool {}
+    public static function isJavaIDPart(int|string $codepoint) : ?bool {}
+    public static function isJavaIDStart(int|string $codepoint) : ?bool {}
+    public static function isJavaSpaceChar(int|string $codepoint) : ?bool {}
+    public static function islower(int|string $codepoint) : ?bool {}
+    public static function isMirrored(int|string $codepoint) : ?bool {}
+    public static function isprint(int|string $codepoint) : ?bool {}
+    public static function ispunct(int|string $codepoint) : ?bool {}
+    public static function isspace(int|string $codepoint) : ?bool {}
+    public static function istitle(int|string $codepoint) : ?bool {}
+    public static function isUAlphabetic(int|string $codepoint) : ?bool {}
+    public static function isULowercase(int|string $codepoint) : ?bool {}
+    public static function isupper(int|string $codepoint) : ?bool {}
+    public static function isUUppercase(int|string $codepoint) : ?bool {}
+    public static function isUWhiteSpace(int|string $codepoint) : ?bool {}
+    public static function isWhitespace(int|string $codepoint) : ?bool {}
+    public static function isxdigit(int|string $codepoint) : ?bool {}
+    public static function ord(int|string $character) : ?int {}
+    public static function tolower(int|string $codepoint) : int|null|string {}
+    public static function totitle(int|string $codepoint) : int|null|string {}
+    public static function toupper(int|string $codepoint) : int|null|string {}
+}
+
+class IntlCodePointBreakIterator extends \IntlBreakIterator {
+
+    // constants
+    const DONE = -1;
+    const WORD_NONE = 0;
+    const WORD_NONE_LIMIT = 100;
+    const WORD_NUMBER = 100;
+    const WORD_NUMBER_LIMIT = 200;
+    const WORD_LETTER = 200;
+    const WORD_LETTER_LIMIT = 300;
+    const WORD_KANA = 300;
+    const WORD_KANA_LIMIT = 400;
+    const WORD_IDEO = 400;
+    const WORD_IDEO_LIMIT = 500;
+    const LINE_SOFT = 0;
+    const LINE_SOFT_LIMIT = 100;
+    const LINE_HARD = 100;
+    const LINE_HARD_LIMIT = 200;
+    const SENTENCE_TERM = 0;
+    const SENTENCE_TERM_LIMIT = 100;
+    const SENTENCE_SEP = 100;
+    const SENTENCE_SEP_LIMIT = 200;
+
+    // methods
+    public function getLastCodePoint() : int {}
+}
+
+class IntlDateFormatter {
+
+    // constants
+    const FULL = 0;
+    const LONG = 1;
+    const MEDIUM = 2;
+    const SHORT = 3;
+    const NONE = -1;
+    const RELATIVE_FULL = 128;
+    const RELATIVE_LONG = 129;
+    const RELATIVE_MEDIUM = 130;
+    const RELATIVE_SHORT = 131;
+    const GREGORIAN = 1;
+    const TRADITIONAL = 0;
+
+    // methods
+    public function __construct(?string $locale, int $dateType = \IntlDateFormatter::FULL, int $timeType = \IntlDateFormatter::FULL, $timezone = null, $calendar = null, ?string $pattern = null) {}
+    public static function create(?string $locale, int $dateType = \IntlDateFormatter::FULL, int $timeType = \IntlDateFormatter::FULL, $timezone = null, \IntlCalendar|int|null $calendar = null, ?string $pattern = null) : ?\IntlDateFormatter {}
+    public function getDateType() : false|int {}
+    public function getTimeType() : false|int {}
+    public function getCalendar() : false|int {}
+    public function setCalendar(\IntlCalendar|int|null $calendar) : bool {}
+    public function getTimeZoneId() : false|string {}
+    public function getCalendarObject() : \IntlCalendar|false|null {}
+    public function getTimeZone() : \IntlTimeZone|false {}
+    public function setTimeZone($timezone) : ?bool {}
+    public function setPattern(string $pattern) : bool {}
+    public function getPattern() : false|string {}
+    public function getLocale(int $type = \ULOC_ACTUAL_LOCALE) : false|string {}
+    public function setLenient(bool $lenient) : void {}
+    public function isLenient() : bool {}
+    public function format($datetime) : false|string {}
+    public static function formatObject($datetime, $format = null, ?string $locale = null) : false|string {}
+    public function parse(string $string, &$offset = null) : false|float|int {}
+    public function localtime(string $string, &$offset = null) : array|false {}
+    public function getErrorCode() : int {}
+    public function getErrorMessage() : string {}
+}
+
+class IntlDatePatternGenerator {
+
+    // methods
+    public function __construct(?string $locale = null) {}
+    public static function create(?string $locale = null) : ?\IntlDatePatternGenerator {}
+    public function getBestPattern(string $skeleton) : false|string {}
+}
+
+class IntlException extends \Exception {
+
+    // properties
+    protected $message;
+    protected $code;
+    protected $file;
+    protected $line;
+}
+
+class IntlGregorianCalendar extends \IntlCalendar {
+
+    // constants
+    const FIELD_ERA = 0;
+    const FIELD_YEAR = 1;
+    const FIELD_MONTH = 2;
+    const FIELD_WEEK_OF_YEAR = 3;
+    const FIELD_WEEK_OF_MONTH = 4;
+    const FIELD_DATE = 5;
+    const FIELD_DAY_OF_YEAR = 6;
+    const FIELD_DAY_OF_WEEK = 7;
+    const FIELD_DAY_OF_WEEK_IN_MONTH = 8;
+    const FIELD_AM_PM = 9;
+    const FIELD_HOUR = 10;
+    const FIELD_HOUR_OF_DAY = 11;
+    const FIELD_MINUTE = 12;
+    const FIELD_SECOND = 13;
+    const FIELD_MILLISECOND = 14;
+    const FIELD_ZONE_OFFSET = 15;
+    const FIELD_DST_OFFSET = 16;
+    const FIELD_YEAR_WOY = 17;
+    const FIELD_DOW_LOCAL = 18;
+    const FIELD_EXTENDED_YEAR = 19;
+    const FIELD_JULIAN_DAY = 20;
+    const FIELD_MILLISECONDS_IN_DAY = 21;
+    const FIELD_IS_LEAP_MONTH = 22;
+    const FIELD_FIELD_COUNT = 23;
+    const FIELD_DAY_OF_MONTH = 5;
+    const DOW_SUNDAY = 1;
+    const DOW_MONDAY = 2;
+    const DOW_TUESDAY = 3;
+    const DOW_WEDNESDAY = 4;
+    const DOW_THURSDAY = 5;
+    const DOW_FRIDAY = 6;
+    const DOW_SATURDAY = 7;
+    const DOW_TYPE_WEEKDAY = 0;
+    const DOW_TYPE_WEEKEND = 1;
+    const DOW_TYPE_WEEKEND_OFFSET = 2;
+    const DOW_TYPE_WEEKEND_CEASE = 3;
+    const WALLTIME_FIRST = 1;
+    const WALLTIME_LAST = 0;
+    const WALLTIME_NEXT_VALID = 2;
+
+    // methods
+    public function __construct($timezoneOrYear = null, $localeOrMonth = null, $day = null, $hour = null, $minute = null, $second = null) {}
+    public function setGregorianChange(float $timestamp) : bool {}
+    public function getGregorianChange() : float {}
+    public function isLeapYear(int $year) : bool {}
+}
+
+class IntlIterator implements \Iterator, \Traversable {
+
+    // methods
+    public function current() : mixed {}
+    public function key() : mixed {}
+    public function next() : void {}
+    public function rewind() : void {}
+    public function valid() : bool {}
+}
+
+class IntlPartsIterator extends \IntlIterator {
+
+    // constants
+    const KEY_SEQUENTIAL = 0;
+    const KEY_LEFT = 1;
+    const KEY_RIGHT = 2;
+
+    // methods
+    public function getBreakIterator() : \IntlBreakIterator {}
+    public function getRuleStatus() : int {}
+}
+
+class IntlRuleBasedBreakIterator extends \IntlBreakIterator {
+
+    // constants
+    const DONE = -1;
+    const WORD_NONE = 0;
+    const WORD_NONE_LIMIT = 100;
+    const WORD_NUMBER = 100;
+    const WORD_NUMBER_LIMIT = 200;
+    const WORD_LETTER = 200;
+    const WORD_LETTER_LIMIT = 300;
+    const WORD_KANA = 300;
+    const WORD_KANA_LIMIT = 400;
+    const WORD_IDEO = 400;
+    const WORD_IDEO_LIMIT = 500;
+    const LINE_SOFT = 0;
+    const LINE_SOFT_LIMIT = 100;
+    const LINE_HARD = 100;
+    const LINE_HARD_LIMIT = 200;
+    const SENTENCE_TERM = 0;
+    const SENTENCE_TERM_LIMIT = 100;
+    const SENTENCE_SEP = 100;
+    const SENTENCE_SEP_LIMIT = 200;
+
+    // methods
+    public function __construct(string $rules, bool $compiled = false) {}
+    public function getBinaryRules() : false|string {}
+    public function getRules() : false|string {}
+    public function getRuleStatus() : int {}
+    public function getRuleStatusVec() : array|false {}
+}
+
+class IntlTimeZone {
+
+    // constants
+    const DISPLAY_SHORT = 1;
+    const DISPLAY_LONG = 2;
+    const DISPLAY_SHORT_GENERIC = 3;
+    const DISPLAY_LONG_GENERIC = 4;
+    const DISPLAY_SHORT_GMT = 5;
+    const DISPLAY_LONG_GMT = 6;
+    const DISPLAY_SHORT_COMMONLY_USED = 7;
+    const DISPLAY_GENERIC_LOCATION = 8;
+    const TYPE_ANY = 0;
+    const TYPE_CANONICAL = 1;
+    const TYPE_CANONICAL_LOCATION = 2;
+
+    // methods
+    private function __construct() {}
+    public static function countEquivalentIDs(string $timezoneId) : false|int {}
+    public static function createDefault() : \IntlTimeZone {}
+    public static function createEnumeration($countryOrRawOffset = null) : \IntlIterator|false {}
+    public static function createTimeZone(string $timezoneId) : ?\IntlTimeZone {}
+    public static function createTimeZoneIDEnumeration(int $type, ?string $region = null, ?int $rawOffset = null) : \IntlIterator|false {}
+    public static function fromDateTimeZone(\DateTimeZone $timezone) : ?\IntlTimeZone {}
+    public static function getCanonicalID(string $timezoneId, &$isSystemId = null) : false|string {}
+    public function getDisplayName(bool $dst = false, int $style = \IntlTimeZone::DISPLAY_LONG, ?string $locale = null) : false|string {}
+    public function getDSTSavings() : int {}
+    public static function getEquivalentID(string $timezoneId, int $offset) : false|string {}
+    public function getErrorCode() : false|int {}
+    public function getErrorMessage() : false|string {}
+    public static function getGMT() : \IntlTimeZone {}
+    public function getID() : false|string {}
+    public function getOffset(float $timestamp, bool $local, &$rawOffset, &$dstOffset) : bool {}
+    public function getRawOffset() : int {}
+    public static function getRegion(string $timezoneId) : false|string {}
+    public static function getTZDataVersion() : false|string {}
+    public static function getUnknown() : \IntlTimeZone {}
+    public static function getWindowsID(string $timezoneId) : false|string {}
+    public static function getIDForWindowsID(string $timezoneId, ?string $region = null) : false|string {}
+    public function hasSameRules(\IntlTimeZone $other) : bool {}
+    public function toDateTimeZone() : \DateTimeZone|false {}
+    public function useDaylightTime() : bool {}
+}
+
+class Locale {
+
+    // constants
+    const ACTUAL_LOCALE = 0;
+    const VALID_LOCALE = 1;
+    const DEFAULT_LOCALE = null;
+    const LANG_TAG = 'language';
+    const EXTLANG_TAG = 'extlang';
+    const SCRIPT_TAG = 'script';
+    const REGION_TAG = 'region';
+    const VARIANT_TAG = 'variant';
+    const GRANDFATHERED_LANG_TAG = 'grandfathered';
+    const PRIVATE_TAG = 'private';
+
+    // properties
+    public $name;
+
+    // methods
+    public static function getDefault() : string {}
+    public static function setDefault(string $locale) {}
+    public static function getPrimaryLanguage(string $locale) : ?string {}
+    public static function getScript(string $locale) : ?string {}
+    public static function getRegion(string $locale) : ?string {}
+    public static function getKeywords(string $locale) : array|false|null {}
+    public static function getDisplayScript(string $locale, ?string $displayLocale = null) : false|string {}
+    public static function getDisplayRegion(string $locale, ?string $displayLocale = null) : false|string {}
+    public static function getDisplayName(string $locale, ?string $displayLocale = null) : false|string {}
+    public static function getDisplayLanguage(string $locale, ?string $displayLocale = null) : false|string {}
+    public static function getDisplayVariant(string $locale, ?string $displayLocale = null) : false|string {}
+    public static function composeLocale(array $subtags) : false|string {}
+    public static function parseLocale(string $locale) : ?array {}
+    public static function getAllVariants(string $locale) : ?array {}
+    public static function filterMatches(string $languageTag, string $locale, bool $canonicalize = false) : ?bool {}
+    public static function lookup(array $languageTag, string $locale, bool $canonicalize = false, ?string $defaultLocale = null) : ?string {}
+    public static function canonicalize(string $locale) : ?string {}
+    public static function acceptFromHttp(string $header) : false|string {}
+}
+
+class MessageFormatter {
+
+    // methods
+    public function __construct(string $locale, string $pattern) {}
+    public static function create(string $locale, string $pattern) : ?\MessageFormatter {}
+    public function format(array $values) : false|string {}
+    public static function formatMessage(string $locale, string $pattern, array $values) : false|string {}
+    public function parse(string $string) : array|false {}
+    public static function parseMessage(string $locale, string $pattern, string $message) : array|false {}
+    public function setPattern(string $pattern) : bool {}
+    public function getPattern() : false|string {}
+    public function getLocale() : string {}
+    public function getErrorCode() : int {}
+    public function getErrorMessage() : string {}
+}
+
+class Normalizer {
+
+    // constants
+    const FORM_D = 4;
+    const NFD = 4;
+    const FORM_KD = 8;
+    const NFKD = 8;
+    const FORM_C = 16;
+    const NFC = 16;
+    const FORM_KC = 32;
+    const NFKC = 32;
+    const FORM_KC_CF = 48;
+    const NFKC_CF = 48;
+
+    // properties
+    public $name;
+
+    // methods
+    public static function normalize(string $string, int $form = \Normalizer::FORM_C) : false|string {}
+    public static function isNormalized(string $string, int $form = \Normalizer::FORM_C) : bool {}
+    public static function getRawDecomposition(string $string, int $form = \Normalizer::FORM_C) : ?string {}
+}
+
+class NumberFormatter {
+
+    // constants
+    const PATTERN_DECIMAL = 0;
+    const DECIMAL = 1;
+    const CURRENCY = 2;
+    const PERCENT = 3;
+    const SCIENTIFIC = 4;
+    const SPELLOUT = 5;
+    const ORDINAL = 6;
+    const DURATION = 7;
+    const PATTERN_RULEBASED = 9;
+    const IGNORE = 0;
+    const CURRENCY_ACCOUNTING = 12;
+    const DEFAULT_STYLE = 1;
+    const ROUND_CEILING = 0;
+    const ROUND_FLOOR = 1;
+    const ROUND_DOWN = 2;
+    const ROUND_UP = 3;
+    const ROUND_HALFEVEN = 4;
+    const ROUND_HALFDOWN = 5;
+    const ROUND_HALFUP = 6;
+    const PAD_BEFORE_PREFIX = 0;
+    const PAD_AFTER_PREFIX = 1;
+    const PAD_BEFORE_SUFFIX = 2;
+    const PAD_AFTER_SUFFIX = 3;
+    const PARSE_INT_ONLY = 0;
+    const GROUPING_USED = 1;
+    const DECIMAL_ALWAYS_SHOWN = 2;
+    const MAX_INTEGER_DIGITS = 3;
+    const MIN_INTEGER_DIGITS = 4;
+    const INTEGER_DIGITS = 5;
+    const MAX_FRACTION_DIGITS = 6;
+    const MIN_FRACTION_DIGITS = 7;
+    const FRACTION_DIGITS = 8;
+    const MULTIPLIER = 9;
+    const GROUPING_SIZE = 10;
+    const ROUNDING_MODE = 11;
+    const ROUNDING_INCREMENT = 12;
+    const FORMAT_WIDTH = 13;
+    const PADDING_POSITION = 14;
+    const SECONDARY_GROUPING_SIZE = 15;
+    const SIGNIFICANT_DIGITS_USED = 16;
+    const MIN_SIGNIFICANT_DIGITS = 17;
+    const MAX_SIGNIFICANT_DIGITS = 18;
+    const LENIENT_PARSE = 19;
+    const POSITIVE_PREFIX = 0;
+    const POSITIVE_SUFFIX = 1;
+    const NEGATIVE_PREFIX = 2;
+    const NEGATIVE_SUFFIX = 3;
+    const PADDING_CHARACTER = 4;
+    const CURRENCY_CODE = 5;
+    const DEFAULT_RULESET = 6;
+    const PUBLIC_RULESETS = 7;
+    const DECIMAL_SEPARATOR_SYMBOL = 0;
+    const GROUPING_SEPARATOR_SYMBOL = 1;
+    const PATTERN_SEPARATOR_SYMBOL = 2;
+    const PERCENT_SYMBOL = 3;
+    const ZERO_DIGIT_SYMBOL = 4;
+    const DIGIT_SYMBOL = 5;
+    const MINUS_SIGN_SYMBOL = 6;
+    const PLUS_SIGN_SYMBOL = 7;
+    const CURRENCY_SYMBOL = 8;
+    const INTL_CURRENCY_SYMBOL = 9;
+    const MONETARY_SEPARATOR_SYMBOL = 10;
+    const EXPONENTIAL_SYMBOL = 11;
+    const PERMILL_SYMBOL = 12;
+    const PAD_ESCAPE_SYMBOL = 13;
+    const INFINITY_SYMBOL = 14;
+    const NAN_SYMBOL = 15;
+    const SIGNIFICANT_DIGIT_SYMBOL = 16;
+    const MONETARY_GROUPING_SEPARATOR_SYMBOL = 17;
+    const TYPE_DEFAULT = 0;
+    const TYPE_INT32 = 1;
+    const TYPE_INT64 = 2;
+    const TYPE_DOUBLE = 3;
+    const TYPE_CURRENCY = 4;
+
+    // properties
+    public $name;
+
+    // methods
+    public function __construct(string $locale, int $style, ?string $pattern = null) {}
+    public static function create(string $locale, int $style, ?string $pattern = null) : ?\NumberFormatter {}
+    public function format(float|int $num, int $type = \NumberFormatter::TYPE_DEFAULT) : false|string {}
+    public function parse(string $string, int $type = \NumberFormatter::TYPE_DOUBLE, &$offset = null) : false|float|int {}
+    public function formatCurrency(float $amount, string $currency) : false|string {}
+    public function parseCurrency(string $string, &$currency, &$offset = null) : false|float {}
+    public function setAttribute(int $attribute, float|int $value) : bool {}
+    public function getAttribute(int $attribute) : false|float|int {}
+    public function setTextAttribute(int $attribute, string $value) : bool {}
+    public function getTextAttribute(int $attribute) : false|string {}
+    public function setSymbol(int $symbol, string $value) : bool {}
+    public function getSymbol(int $symbol) : false|string {}
+    public function setPattern(string $pattern) : bool {}
+    public function getPattern() : false|string {}
+    public function getLocale(int $type = \ULOC_ACTUAL_LOCALE) : false|string {}
+    public function getErrorCode() : int {}
+    public function getErrorMessage() : string {}
+}
+
+class ResourceBundle implements \IteratorAggregate, \Traversable, \Countable {
+
+    // methods
+    public function __construct(?string $locale, ?string $bundle, bool $fallback = true) {}
+    public static function create(?string $locale, ?string $bundle, bool $fallback = true) : ?\ResourceBundle {}
+    public function get($index, bool $fallback = true) : mixed {}
+    public function count() : int {}
+    public static function getLocales(string $bundle) : array|false {}
+    public function getErrorCode() : int {}
+    public function getErrorMessage() : string {}
+    public function getIterator() : \Iterator {}
+}
+
+class Spoofchecker {
+
+    // constants
+    const SINGLE_SCRIPT_CONFUSABLE = 1;
+    const MIXED_SCRIPT_CONFUSABLE = 2;
+    const WHOLE_SCRIPT_CONFUSABLE = 4;
+    const ANY_CASE = 8;
+    const SINGLE_SCRIPT = 16;
+    const INVISIBLE = 32;
+    const CHAR_LIMIT = 64;
+    const ASCII = 268435456;
+    const HIGHLY_RESTRICTIVE = 805306368;
+    const MODERATELY_RESTRICTIVE = 1073741824;
+    const MINIMALLY_RESTRICTIVE = 1342177280;
+    const UNRESTRICTIVE = 1610612736;
+    const SINGLE_SCRIPT_RESTRICTIVE = 536870912;
+
+    // methods
+    public function __construct() {}
+    public function isSuspicious(string $string, &$errorCode = null) : bool {}
+    public function areConfusable(string $string1, string $string2, &$errorCode = null) : bool {}
+    public function setAllowedLocales(string $locales) : void {}
+    public function setChecks(int $checks) : void {}
+    public function setRestrictionLevel(int $level) : void {}
+}
+
+class Transliterator {
+
+    // constants
+    const FORWARD = 0;
+    const REVERSE = 1;
+
+    // properties
+    public $id;
+
+    // methods
+    final private function __construct() {}
+    public static function create(string $id, int $direction = \Transliterator::FORWARD) : ?\Transliterator {}
+    public static function createFromRules(string $rules, int $direction = \Transliterator::FORWARD) : ?\Transliterator {}
+    public function createInverse() : ?\Transliterator {}
+    public static function listIDs() : array|false {}
+    public function transliterate(string $string, int $start = 0, int $end = -1) : false|string {}
+    public function getErrorCode() : false|int {}
+    public function getErrorMessage() : false|string {}
+}
+
+class UConverter {
+
+    // constants
+    const REASON_UNASSIGNED = 0;
+    const REASON_ILLEGAL = 1;
+    const REASON_IRREGULAR = 2;
+    const REASON_RESET = 3;
+    const REASON_CLOSE = 4;
+    const REASON_CLONE = 5;
+    const UNSUPPORTED_CONVERTER = -1;
+    const SBCS = 0;
+    const DBCS = 1;
+    const MBCS = 2;
+    const LATIN_1 = 3;
+    const UTF8 = 4;
+    const UTF16_BigEndian = 5;
+    const UTF16_LittleEndian = 6;
+    const UTF32_BigEndian = 7;
+    const UTF32_LittleEndian = 8;
+    const EBCDIC_STATEFUL = 9;
+    const ISO_2022 = 10;
+    const LMBCS_1 = 11;
+    const LMBCS_2 = 12;
+    const LMBCS_3 = 13;
+    const LMBCS_4 = 14;
+    const LMBCS_5 = 15;
+    const LMBCS_6 = 16;
+    const LMBCS_8 = 17;
+    const LMBCS_11 = 18;
+    const LMBCS_16 = 19;
+    const LMBCS_17 = 20;
+    const LMBCS_18 = 21;
+    const LMBCS_19 = 22;
+    const LMBCS_LAST = 22;
+    const HZ = 23;
+    const SCSU = 24;
+    const ISCII = 25;
+    const US_ASCII = 26;
+    const UTF7 = 27;
+    const BOCU1 = 28;
+    const UTF16 = 29;
+    const UTF32 = 30;
+    const CESU8 = 31;
+    const IMAP_MAILBOX = 32;
+
+    // methods
+    public function __construct(?string $destination_encoding = null, ?string $source_encoding = null) {}
+    public function convert(string $str, bool $reverse = false) : false|string {}
+    public function fromUCallback(int $reason, array $source, int $codePoint, &$error) : array|int|null|string {}
+    public static function getAliases(string $name) : array|false|null {}
+    public static function getAvailable() : array {}
+    public function getDestinationEncoding() : false|null|string {}
+    public function getDestinationType() : false|int|null {}
+    public function getErrorCode() : int {}
+    public function getErrorMessage() : ?string {}
+    public function getSourceEncoding() : false|null|string {}
+    public function getSourceType() : false|int|null {}
+    public static function getStandards() : ?array {}
+    public function getSubstChars() : false|null|string {}
+    public static function reasonText(int $reason) : string {}
+    public function setDestinationEncoding(string $encoding) : bool {}
+    public function setSourceEncoding(string $encoding) : bool {}
+    public function setSubstChars(string $chars) : bool {}
+    public function toUCallback(int $reason, string $source, string $codeUnits, &$error) : array|int|null|string {}
+    public static function transcode(string $str, string $toEncoding, string $fromEncoding, ?array $options = null) : false|string {}
+}
+
+function collator_asort(\Collator $object, array &$array, int $flags = \Collator::SORT_REGULAR) : bool {}
+function collator_compare(\Collator $object, string $string1, string $string2) : false|int {}
+function collator_create(string $locale) : ?\Collator {}
+function collator_get_attribute(\Collator $object, int $attribute) : false|int {}
+function collator_get_error_code(\Collator $object) : false|int {}
+function collator_get_error_message(\Collator $object) : false|string {}
+function collator_get_locale(\Collator $object, int $type) : false|string {}
+function collator_get_sort_key(\Collator $object, string $string) : false|string {}
+function collator_get_strength(\Collator $object) : int {}
+function collator_set_attribute(\Collator $object, int $attribute, int $value) : bool {}
+function collator_set_strength(\Collator $object, int $strength) : bool {}
+function collator_sort(\Collator $object, array &$array, int $flags = \Collator::SORT_REGULAR) : bool {}
+function collator_sort_with_sort_keys(\Collator $object, array &$array) : bool {}
+function datefmt_create(?string $locale, int $dateType = \IntlDateFormatter::FULL, int $timeType = \IntlDateFormatter::FULL, $timezone = null, \IntlCalendar|int|null $calendar = null, ?string $pattern = null) : ?\IntlDateFormatter {}
+function datefmt_format(\IntlDateFormatter $formatter, $datetime) : false|string {}
+function datefmt_format_object($datetime, $format = null, ?string $locale = null) : false|string {}
+function datefmt_get_calendar(\IntlDateFormatter $formatter) : false|int {}
+function datefmt_get_calendar_object(\IntlDateFormatter $formatter) : \IntlCalendar|false|null {}
+function datefmt_get_datetype(\IntlDateFormatter $formatter) : false|int {}
+function datefmt_get_error_code(\IntlDateFormatter $formatter) : int {}
+function datefmt_get_error_message(\IntlDateFormatter $formatter) : string {}
+function datefmt_get_locale(\IntlDateFormatter $formatter, int $type = \ULOC_ACTUAL_LOCALE) : false|string {}
+function datefmt_get_pattern(\IntlDateFormatter $formatter) : false|string {}
+function datefmt_get_timetype(\IntlDateFormatter $formatter) : false|int {}
+function datefmt_get_timezone(\IntlDateFormatter $formatter) : \IntlTimeZone|false {}
+function datefmt_get_timezone_id(\IntlDateFormatter $formatter) : false|string {}
+function datefmt_is_lenient(\IntlDateFormatter $formatter) : bool {}
+function datefmt_localtime(\IntlDateFormatter $formatter, string $string, &$offset = null) : array|false {}
+function datefmt_parse(\IntlDateFormatter $formatter, string $string, &$offset = null) : false|float|int {}
+function datefmt_set_calendar(\IntlDateFormatter $formatter, \IntlCalendar|int|null $calendar) : bool {}
+function datefmt_set_lenient(\IntlDateFormatter $formatter, bool $lenient) : void {}
+function datefmt_set_pattern(\IntlDateFormatter $formatter, string $pattern) : bool {}
+function datefmt_set_timezone(\IntlDateFormatter $formatter, $timezone) : ?bool {}
+function grapheme_extract(string $haystack, int $size, int $type = \GRAPHEME_EXTR_COUNT, int $offset = 0, &$next = null) : false|string {}
+function grapheme_stripos(string $haystack, string $needle, int $offset = 0) : false|int {}
+function grapheme_stristr(string $haystack, string $needle, bool $beforeNeedle = false) : false|string {}
+function grapheme_strlen(string $string) : false|int|null {}
+function grapheme_strpos(string $haystack, string $needle, int $offset = 0) : false|int {}
+function grapheme_strripos(string $haystack, string $needle, int $offset = 0) : false|int {}
+function grapheme_strrpos(string $haystack, string $needle, int $offset = 0) : false|int {}
+function grapheme_strstr(string $haystack, string $needle, bool $beforeNeedle = false) : false|string {}
+function grapheme_substr(string $string, int $offset, ?int $length = null) : false|string {}
+function idn_to_ascii(string $domain, int $flags = \IDNA_DEFAULT, int $variant = \INTL_IDNA_VARIANT_UTS46, &$idna_info = null) : false|string {}
+function idn_to_utf8(string $domain, int $flags = \IDNA_DEFAULT, int $variant = \INTL_IDNA_VARIANT_UTS46, &$idna_info = null) : false|string {}
+function intl_error_name(int $errorCode) : string {}
+function intl_get_error_code() : int {}
+function intl_get_error_message() : string {}
+function intl_is_failure(int $errorCode) : bool {}
+function intlcal_add(\IntlCalendar $calendar, int $field, int $value) : bool {}
+function intlcal_after(\IntlCalendar $calendar, \IntlCalendar $other) : bool {}
+function intlcal_before(\IntlCalendar $calendar, \IntlCalendar $other) : bool {}
+function intlcal_clear(\IntlCalendar $calendar, ?int $field = null) : bool {}
+function intlcal_create_instance($timezone = null, ?string $locale = null) : ?\IntlCalendar {}
+function intlcal_equals(\IntlCalendar $calendar, \IntlCalendar $other) : bool {}
+function intlcal_field_difference(\IntlCalendar $calendar, float $timestamp, int $field) : false|int {}
+function intlcal_from_date_time(\DateTime|string $datetime, ?string $locale = null) : ?\IntlCalendar {}
+function intlcal_get(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_actual_maximum(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_actual_minimum(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_available_locales() : array {}
+function intlcal_get_day_of_week_type(\IntlCalendar $calendar, int $dayOfWeek) : false|int {}
+function intlcal_get_error_code(\IntlCalendar $calendar) : false|int {}
+function intlcal_get_error_message(\IntlCalendar $calendar) : false|string {}
+function intlcal_get_first_day_of_week(\IntlCalendar $calendar) : false|int {}
+function intlcal_get_greatest_minimum(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_keyword_values_for_locale(string $keyword, string $locale, bool $onlyCommon) : \IntlIterator|false {}
+function intlcal_get_least_maximum(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_locale(\IntlCalendar $calendar, int $type) : false|string {}
+function intlcal_get_maximum(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_minimal_days_in_first_week(\IntlCalendar $calendar) : false|int {}
+function intlcal_get_minimum(\IntlCalendar $calendar, int $field) : false|int {}
+function intlcal_get_now() : float {}
+function intlcal_get_repeated_wall_time_option(\IntlCalendar $calendar) : int {}
+function intlcal_get_skipped_wall_time_option(\IntlCalendar $calendar) : int {}
+function intlcal_get_time(\IntlCalendar $calendar) : false|float {}
+function intlcal_get_time_zone(\IntlCalendar $calendar) : \IntlTimeZone|false {}
+function intlcal_get_type(\IntlCalendar $calendar) : string {}
+function intlcal_get_weekend_transition(\IntlCalendar $calendar, int $dayOfWeek) : false|int {}
+function intlcal_in_daylight_time(\IntlCalendar $calendar) : bool {}
+function intlcal_is_equivalent_to(\IntlCalendar $calendar, \IntlCalendar $other) : bool {}
+function intlcal_is_lenient(\IntlCalendar $calendar) : bool {}
+function intlcal_is_set(\IntlCalendar $calendar, int $field) : bool {}
+function intlcal_is_weekend(\IntlCalendar $calendar, ?float $timestamp = null) : bool {}
+function intlcal_roll(\IntlCalendar $calendar, int $field, $value) : bool {}
+function intlcal_set(\IntlCalendar $calendar, int $year, int $month, int $dayOfMonth = unknown, int $hour = unknown, int $minute = unknown, int $second = unknown) : bool {}
+function intlcal_set_first_day_of_week(\IntlCalendar $calendar, int $dayOfWeek) : bool {}
+function intlcal_set_lenient(\IntlCalendar $calendar, bool $lenient) : bool {}
+function intlcal_set_minimal_days_in_first_week(\IntlCalendar $calendar, int $days) : bool {}
+function intlcal_set_repeated_wall_time_option(\IntlCalendar $calendar, int $option) : bool {}
+function intlcal_set_skipped_wall_time_option(\IntlCalendar $calendar, int $option) : bool {}
+function intlcal_set_time(\IntlCalendar $calendar, float $timestamp) : bool {}
+function intlcal_set_time_zone(\IntlCalendar $calendar, $timezone) : bool {}
+function intlcal_to_date_time(\IntlCalendar $calendar) : \DateTime|false {}
+function intlgregcal_create_instance($timezoneOrYear = null, $localeOrMonth = null, $day = null, $hour = null, $minute = null, $second = null) : ?\IntlGregorianCalendar {}
+function intlgregcal_get_gregorian_change(\IntlGregorianCalendar $calendar) : float {}
+function intlgregcal_is_leap_year(\IntlGregorianCalendar $calendar, int $year) : bool {}
+function intlgregcal_set_gregorian_change(\IntlGregorianCalendar $calendar, float $timestamp) : bool {}
+function intltz_count_equivalent_ids(string $timezoneId) : false|int {}
+function intltz_create_default() : \IntlTimeZone {}
+function intltz_create_enumeration($countryOrRawOffset = null) : \IntlIterator|false {}
+function intltz_create_time_zone(string $timezoneId) : ?\IntlTimeZone {}
+function intltz_create_time_zone_id_enumeration(int $type, ?string $region = null, ?int $rawOffset = null) : \IntlIterator|false {}
+function intltz_from_date_time_zone(\DateTimeZone $timezone) : ?\IntlTimeZone {}
+function intltz_get_canonical_id(string $timezoneId, &$isSystemId = null) : false|string {}
+function intltz_get_display_name(\IntlTimeZone $timezone, bool $dst = false, int $style = \IntlTimeZone::DISPLAY_LONG, ?string $locale = null) : false|string {}
+function intltz_get_dst_savings(\IntlTimeZone $timezone) : int {}
+function intltz_get_equivalent_id(string $timezoneId, int $offset) : false|string {}
+function intltz_get_error_code(\IntlTimeZone $timezone) : false|int {}
+function intltz_get_error_message(\IntlTimeZone $timezone) : false|string {}
+function intltz_get_gmt() : \IntlTimeZone {}
+function intltz_get_id(\IntlTimeZone $timezone) : false|string {}
+function intltz_get_id_for_windows_id(string $timezoneId, ?string $region = null) : false|string {}
+function intltz_get_offset(\IntlTimeZone $timezone, float $timestamp, bool $local, &$rawOffset, &$dstOffset) : bool {}
+function intltz_get_raw_offset(\IntlTimeZone $timezone) : int {}
+function intltz_get_region(string $timezoneId) : false|string {}
+function intltz_get_tz_data_version() : false|string {}
+function intltz_get_unknown() : \IntlTimeZone {}
+function intltz_get_windows_id(string $timezoneId) : false|string {}
+function intltz_has_same_rules(\IntlTimeZone $timezone, \IntlTimeZone $other) : bool {}
+function intltz_to_date_time_zone(\IntlTimeZone $timezone) : \DateTimeZone|false {}
+function intltz_use_daylight_time(\IntlTimeZone $timezone) : bool {}
+function locale_accept_from_http(string $header) : false|string {}
+function locale_canonicalize(string $locale) : ?string {}
+function locale_compose(array $subtags) : false|string {}
+function locale_filter_matches(string $languageTag, string $locale, bool $canonicalize = false) : ?bool {}
+function locale_get_all_variants(string $locale) : ?array {}
+function locale_get_default() : string {}
+function locale_get_display_language(string $locale, ?string $displayLocale = null) : false|string {}
+function locale_get_display_name(string $locale, ?string $displayLocale = null) : false|string {}
+function locale_get_display_region(string $locale, ?string $displayLocale = null) : false|string {}
+function locale_get_display_script(string $locale, ?string $displayLocale = null) : false|string {}
+function locale_get_display_variant(string $locale, ?string $displayLocale = null) : false|string {}
+function locale_get_keywords(string $locale) : array|false|null {}
+function locale_get_primary_language(string $locale) : ?string {}
+function locale_get_region(string $locale) : ?string {}
+function locale_get_script(string $locale) : ?string {}
+function locale_lookup(array $languageTag, string $locale, bool $canonicalize = false, ?string $defaultLocale = null) : ?string {}
+function locale_parse(string $locale) : ?array {}
+function locale_set_default(string $locale) : bool {}
+function msgfmt_create(string $locale, string $pattern) : ?\MessageFormatter {}
+function msgfmt_format(\MessageFormatter $formatter, array $values) : false|string {}
+function msgfmt_format_message(string $locale, string $pattern, array $values) : false|string {}
+function msgfmt_get_error_code(\MessageFormatter $formatter) : int {}
+function msgfmt_get_error_message(\MessageFormatter $formatter) : string {}
+function msgfmt_get_locale(\MessageFormatter $formatter) : string {}
+function msgfmt_get_pattern(\MessageFormatter $formatter) : false|string {}
+function msgfmt_parse(\MessageFormatter $formatter, string $string) : array|false {}
+function msgfmt_parse_message(string $locale, string $pattern, string $message) : array|false {}
+function msgfmt_set_pattern(\MessageFormatter $formatter, string $pattern) : bool {}
+function normalizer_get_raw_decomposition(string $string, int $form = \Normalizer::FORM_C) : ?string {}
+function normalizer_is_normalized(string $string, int $form = \Normalizer::FORM_C) : bool {}
+function normalizer_normalize(string $string, int $form = \Normalizer::FORM_C) : false|string {}
+function numfmt_create(string $locale, int $style, ?string $pattern = null) : ?\NumberFormatter {}
+function numfmt_format(\NumberFormatter $formatter, float|int $num, int $type = \NumberFormatter::TYPE_DEFAULT) : false|string {}
+function numfmt_format_currency(\NumberFormatter $formatter, float $amount, string $currency) : false|string {}
+function numfmt_get_attribute(\NumberFormatter $formatter, int $attribute) : false|float|int {}
+function numfmt_get_error_code(\NumberFormatter $formatter) : int {}
+function numfmt_get_error_message(\NumberFormatter $formatter) : string {}
+function numfmt_get_locale(\NumberFormatter $formatter, int $type = \ULOC_ACTUAL_LOCALE) : false|string {}
+function numfmt_get_pattern(\NumberFormatter $formatter) : false|string {}
+function numfmt_get_symbol(\NumberFormatter $formatter, int $symbol) : false|string {}
+function numfmt_get_text_attribute(\NumberFormatter $formatter, int $attribute) : false|string {}
+function numfmt_parse(\NumberFormatter $formatter, string $string, int $type = \NumberFormatter::TYPE_DOUBLE, &$offset = null) : false|float|int {}
+function numfmt_parse_currency(\NumberFormatter $formatter, string $string, &$currency, &$offset = null) : false|float {}
+function numfmt_set_attribute(\NumberFormatter $formatter, int $attribute, float|int $value) : bool {}
+function numfmt_set_pattern(\NumberFormatter $formatter, string $pattern) : bool {}
+function numfmt_set_symbol(\NumberFormatter $formatter, int $symbol, string $value) : bool {}
+function numfmt_set_text_attribute(\NumberFormatter $formatter, int $attribute, string $value) : bool {}
+function resourcebundle_count(\ResourceBundle $bundle) : int {}
+function resourcebundle_create(?string $locale, ?string $bundle, bool $fallback = true) : ?\ResourceBundle {}
+function resourcebundle_get(\ResourceBundle $bundle, $index, bool $fallback = true) : mixed {}
+function resourcebundle_get_error_code(\ResourceBundle $bundle) : int {}
+function resourcebundle_get_error_message(\ResourceBundle $bundle) : string {}
+function resourcebundle_locales(string $bundle) : array|false {}
+function transliterator_create(string $id, int $direction = \Transliterator::FORWARD) : ?\Transliterator {}
+function transliterator_create_from_rules(string $rules, int $direction = \Transliterator::FORWARD) : ?\Transliterator {}
+function transliterator_create_inverse(\Transliterator $transliterator) : ?\Transliterator {}
+function transliterator_get_error_code(\Transliterator $transliterator) : false|int {}
+function transliterator_get_error_message(\Transliterator $transliterator) : false|string {}
+function transliterator_list_ids() : array|false {}
+function transliterator_transliterate(\Transliterator|string $transliterator, string $string, int $start = 0, int $end = -1) : false|string {}
+const GRAPHEME_EXTR_COUNT = 0;
+const GRAPHEME_EXTR_MAXBYTES = 1;
+const GRAPHEME_EXTR_MAXCHARS = 2;
+const IDNA_ALLOW_UNASSIGNED = 1;
+const IDNA_CHECK_BIDI = 4;
+const IDNA_CHECK_CONTEXTJ = 8;
+const IDNA_DEFAULT = 0;
+const IDNA_ERROR_BIDI = 2048;
+const IDNA_ERROR_CONTEXTJ = 4096;
+const IDNA_ERROR_DISALLOWED = 128;
+const IDNA_ERROR_DOMAIN_NAME_TOO_LONG = 4;
+const IDNA_ERROR_EMPTY_LABEL = 1;
+const IDNA_ERROR_HYPHEN_3_4 = 32;
+const IDNA_ERROR_INVALID_ACE_LABEL = 1024;
+const IDNA_ERROR_LABEL_HAS_DOT = 512;
+const IDNA_ERROR_LABEL_TOO_LONG = 2;
+const IDNA_ERROR_LEADING_COMBINING_MARK = 64;
+const IDNA_ERROR_LEADING_HYPHEN = 8;
+const IDNA_ERROR_PUNYCODE = 256;
+const IDNA_ERROR_TRAILING_HYPHEN = 16;
+const IDNA_NONTRANSITIONAL_TO_ASCII = 16;
+const IDNA_NONTRANSITIONAL_TO_UNICODE = 32;
+const IDNA_USE_STD3_RULES = 2;
+const INTL_ICU_DATA_VERSION = '65.1';
+const INTL_ICU_VERSION = '65.1';
+const INTL_IDNA_VARIANT_UTS46 = 1;
+const INTL_MAX_LOCALE_LEN = 156;
+const ULOC_ACTUAL_LOCALE = 0;
+const ULOC_VALID_LOCALE = 1;
+const U_AMBIGUOUS_ALIAS_WARNING = -122;
+const U_BAD_VARIABLE_DEFINITION = 65536;
+const U_BRK_ASSIGN_ERROR = 66053;
+const U_BRK_ERROR_LIMIT = 66062;
+const U_BRK_ERROR_START = 66048;
+const U_BRK_HEX_DIGITS_EXPECTED = 66049;
+const U_BRK_INIT_ERROR = 66058;
+const U_BRK_INTERNAL_ERROR = 66048;
+const U_BRK_MALFORMED_RULE_TAG = 66061;
+const U_BRK_MISMATCHED_PAREN = 66055;
+const U_BRK_NEW_LINE_IN_QUOTED_STRING = 66056;
+const U_BRK_RULE_EMPTY_SET = 66059;
+const U_BRK_RULE_SYNTAX = 66051;
+const U_BRK_SEMICOLON_EXPECTED = 66050;
+const U_BRK_UNCLOSED_SET = 66052;
+const U_BRK_UNDEFINED_VARIABLE = 66057;
+const U_BRK_UNRECOGNIZED_OPTION = 66060;
+const U_BRK_VARIABLE_REDFINITION = 66054;
+const U_BUFFER_OVERFLOW_ERROR = 15;
+const U_CE_NOT_FOUND_ERROR = 21;
+const U_COLLATOR_VERSION_MISMATCH = 28;
+const U_DIFFERENT_UCA_VERSION = -121;
+const U_ENUM_OUT_OF_SYNC_ERROR = 25;
+const U_ERROR_LIMIT = 66818;
+const U_ERROR_WARNING_LIMIT = -119;
+const U_ERROR_WARNING_START = -128;
+const U_FILE_ACCESS_ERROR = 4;
+const U_FMT_PARSE_ERROR_LIMIT = 65812;
+const U_FMT_PARSE_ERROR_START = 65792;
+const U_IDNA_ACE_PREFIX_ERROR = 66564;
+const U_IDNA_CHECK_BIDI_ERROR = 66562;
+const U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR = 66568;
+const U_IDNA_ERROR_LIMIT = 66569;
+const U_IDNA_ERROR_START = 66560;
+const U_IDNA_LABEL_TOO_LONG_ERROR = 66566;
+const U_IDNA_PROHIBITED_ERROR = 66560;
+const U_IDNA_STD3_ASCII_RULES_ERROR = 66563;
+const U_IDNA_UNASSIGNED_ERROR = 66561;
+const U_IDNA_VERIFICATION_ERROR = 66565;
+const U_IDNA_ZERO_LENGTH_LABEL_ERROR = 66567;
+const U_ILLEGAL_ARGUMENT_ERROR = 1;
+const U_ILLEGAL_CHARACTER = 65567;
+const U_ILLEGAL_CHAR_FOUND = 12;
+const U_ILLEGAL_CHAR_IN_SEGMENT = 65564;
+const U_ILLEGAL_ESCAPE_SEQUENCE = 18;
+const U_ILLEGAL_PAD_POSITION = 65800;
+const U_INDEX_OUTOFBOUNDS_ERROR = 8;
+const U_INTERNAL_PROGRAM_ERROR = 5;
+const U_INTERNAL_TRANSLITERATOR_ERROR = 65568;
+const U_INVALID_CHAR_FOUND = 10;
+const U_INVALID_FORMAT_ERROR = 3;
+const U_INVALID_FUNCTION = 65570;
+const U_INVALID_ID = 65569;
+const U_INVALID_PROPERTY_PATTERN = 65561;
+const U_INVALID_RBT_SYNTAX = 65560;
+const U_INVALID_STATE_ERROR = 27;
+const U_INVALID_TABLE_FILE = 14;
+const U_INVALID_TABLE_FORMAT = 13;
+const U_INVARIANT_CONVERSION_ERROR = 26;
+const U_MALFORMED_EXPONENTIAL_PATTERN = 65795;
+const U_MALFORMED_PRAGMA = 65562;
+const U_MALFORMED_RULE = 65537;
+const U_MALFORMED_SET = 65538;
+const U_MALFORMED_SYMBOL_REFERENCE = 65539;
+const U_MALFORMED_UNICODE_ESCAPE = 65540;
+const U_MALFORMED_VARIABLE_DEFINITION = 65541;
+const U_MALFORMED_VARIABLE_REFERENCE = 65542;
+const U_MEMORY_ALLOCATION_ERROR = 7;
+const U_MESSAGE_PARSE_ERROR = 6;
+const U_MISMATCHED_SEGMENT_DELIMITERS = 65543;
+const U_MISPLACED_ANCHOR_START = 65544;
+const U_MISPLACED_COMPOUND_FILTER = 65558;
+const U_MISPLACED_CURSOR_OFFSET = 65545;
+const U_MISPLACED_QUANTIFIER = 65546;
+const U_MISSING_OPERATOR = 65547;
+const U_MISSING_RESOURCE_ERROR = 2;
+const U_MISSING_SEGMENT_CLOSE = 65548;
+const U_MULTIPLE_ANTE_CONTEXTS = 65549;
+const U_MULTIPLE_COMPOUND_FILTERS = 65559;
+const U_MULTIPLE_CURSORS = 65550;
+const U_MULTIPLE_DECIMAL_SEPARATORS = 65793;
+const U_MULTIPLE_DECIMAL_SEPERATORS = 65793;
+const U_MULTIPLE_EXPONENTIAL_SYMBOLS = 65794;
+const U_MULTIPLE_PAD_SPECIFIERS = 65798;
+const U_MULTIPLE_PERCENT_SYMBOLS = 65796;
+const U_MULTIPLE_PERMILL_SYMBOLS = 65797;
+const U_MULTIPLE_POST_CONTEXTS = 65551;
+const U_NO_SPACE_AVAILABLE = 20;
+const U_NO_WRITE_PERMISSION = 30;
+const U_PARSE_ERROR = 9;
+const U_PARSE_ERROR_LIMIT = 65571;
+const U_PARSE_ERROR_START = 65536;
+const U_PATTERN_SYNTAX_ERROR = 65799;
+const U_PRIMARY_TOO_LONG_ERROR = 22;
+const U_REGEX_BAD_ESCAPE_SEQUENCE = 66307;
+const U_REGEX_BAD_INTERVAL = 66312;
+const U_REGEX_ERROR_LIMIT = 66326;
+const U_REGEX_ERROR_START = 66304;
+const U_REGEX_INTERNAL_ERROR = 66304;
+const U_REGEX_INVALID_BACK_REF = 66314;
+const U_REGEX_INVALID_FLAG = 66315;
+const U_REGEX_INVALID_STATE = 66306;
+const U_REGEX_LOOK_BEHIND_LIMIT = 66316;
+const U_REGEX_MAX_LT_MIN = 66313;
+const U_REGEX_MISMATCHED_PAREN = 66310;
+const U_REGEX_NUMBER_TOO_BIG = 66311;
+const U_REGEX_PROPERTY_SYNTAX = 66308;
+const U_REGEX_RULE_SYNTAX = 66305;
+const U_REGEX_SET_CONTAINS_STRING = 66317;
+const U_REGEX_UNIMPLEMENTED = 66309;
+const U_RESOURCE_TYPE_MISMATCH = 17;
+const U_RULE_MASK_ERROR = 65557;
+const U_SAFECLONE_ALLOCATED_WARNING = -126;
+const U_SORT_KEY_TOO_SHORT_WARNING = -123;
+const U_STANDARD_ERROR_LIMIT = 31;
+const U_STATE_OLD_WARNING = -125;
+const U_STATE_TOO_OLD_ERROR = 23;
+const U_STRINGPREP_CHECK_BIDI_ERROR = 66562;
+const U_STRINGPREP_PROHIBITED_ERROR = 66560;
+const U_STRINGPREP_UNASSIGNED_ERROR = 66561;
+const U_STRING_NOT_TERMINATED_WARNING = -124;
+const U_TOO_MANY_ALIASES_ERROR = 24;
+const U_TRAILING_BACKSLASH = 65552;
+const U_TRUNCATED_CHAR_FOUND = 11;
+const U_UNCLOSED_SEGMENT = 65563;
+const U_UNDEFINED_SEGMENT_REFERENCE = 65553;
+const U_UNDEFINED_VARIABLE = 65554;
+const U_UNEXPECTED_TOKEN = 65792;
+const U_UNMATCHED_BRACES = 65801;
+const U_UNQUOTED_SPECIAL = 65555;
+const U_UNSUPPORTED_ATTRIBUTE = 65803;
+const U_UNSUPPORTED_ERROR = 16;
+const U_UNSUPPORTED_ESCAPE_SEQUENCE = 19;
+const U_UNSUPPORTED_PROPERTY = 65802;
+const U_UNTERMINATED_QUOTE = 65556;
+const U_USELESS_COLLATOR_ERROR = 29;
+const U_USING_DEFAULT_WARNING = -127;
+const U_USING_FALLBACK_WARNING = -128;
+const U_VARIABLE_RANGE_EXHAUSTED = 65565;
+const U_VARIABLE_RANGE_OVERLAP = 65566;
+const U_ZERO_ERROR = 0;
+}
diff --git a/dev/tools/phan/stubs/ldap.phan_php b/dev/tools/phan/stubs/ldap.phan_php
new file mode 100644
index 00000000000..d0ed0b553a9
--- /dev/null
+++ b/dev/tools/phan/stubs/ldap.phan_php
@@ -0,0 +1,157 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension ldap@7.4.33
+
+namespace {
+function ldap_add($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_add_ext($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_bind($link_identifier, $bind_rdn = null, $bind_password = null) {}
+function ldap_bind_ext($link_identifier, $bind_rdn = null, $bind_password = null, $servercontrols = null) {}
+function ldap_close($link_identifier) {}
+function ldap_compare($link_identifier, $dn, $attribute, $value, $servercontrols = null) {}
+function ldap_connect($hostname = null, $port = null) {}
+function ldap_control_paged_result($link, $pagesize, $iscritical = null, $cookie = null) {}
+function ldap_control_paged_result_response($link, $result, &$cookie = null, &$estimated = null) {}
+function ldap_count_entries($link_identifier, $result_identifier) {}
+function ldap_delete($link_identifier, $dn, $servercontrols = null) {}
+function ldap_delete_ext($link_identifier, $dn, $servercontrols = null) {}
+function ldap_dn2ufn($dn) {}
+function ldap_err2str($errno) {}
+/** @return int */
+function ldap_errno($link_identifier) {}
+/** @return string */
+function ldap_error($link_identifier) {}
+function ldap_escape($value, $ignore = null, $flags = null) {}
+function ldap_exop($link, $reqoid, $reqdata = null, $servercontrols = null, &$retdata = null, &$retoid = null) {}
+function ldap_exop_passwd($link, $user = null, $oldpw = null, $newpw = null, &$serverctrls = null) {}
+function ldap_exop_refresh($link, $dn, $ttl) {}
+function ldap_exop_whoami($link) {}
+function ldap_explode_dn($dn, $with_attrib) {}
+function ldap_first_attribute($link_identifier, $result_entry_identifier) {}
+function ldap_first_entry($link_identifier, $result_identifier) {}
+function ldap_first_reference($link, $result) {}
+function ldap_free_result($link_identifier) {}
+function ldap_get_attributes($link_identifier, $result_entry_identifier) {}
+function ldap_get_dn($link_identifier, $result_entry_identifier) {}
+function ldap_get_entries($link_identifier, $result_identifier) {}
+function ldap_get_option($link_identifier, $option, &$retval) {}
+function ldap_get_values($link_identifier, $result_entry_identifier, $attribute) {}
+function ldap_get_values_len($link_identifier, $result_entry_identifier, $attribute) {}
+function ldap_list($link_identifier, $base_dn, $filter, $attributes = null, $attrsonly = null, $sizelimit = null, $timelimit = null, $deref = null, $servercontrols = null) {}
+function ldap_mod_add($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_mod_add_ext($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_mod_del($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_mod_del_ext($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_mod_replace($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_mod_replace_ext($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_modify($link_identifier, $dn, $entry, $servercontrols = null) {}
+function ldap_modify_batch($link_identifier, $dn, array $modifications_info, $servercontrols = null) {}
+function ldap_next_attribute($link_identifier, $result_entry_identifier) {}
+function ldap_next_entry($link_identifier, $result_identifier) {}
+function ldap_next_reference($link, $entry) {}
+function ldap_parse_exop($link, $result, &$retdata, &$retoid) {}
+function ldap_parse_reference($link, $entry, &$referrals) {}
+function ldap_parse_result($link, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$serverctrls = null) {}
+function ldap_read($link_identifier, $base_dn, $filter, $attributes = null, $attrsonly = null, $sizelimit = null, $timelimit = null, $deref = null, $servercontrols = null) {}
+function ldap_rename($link_identifier, $dn, $newrdn, $newparent, $deleteoldrdn, $servercontrols = null) {}
+function ldap_rename_ext($link_identifier, $dn, $newrdn, $newparent, $deleteoldrdn, $servercontrols = null) {}
+function ldap_sasl_bind($link, $binddn = null, $password = null, $sasl_mech = null, $sasl_realm = null, $sasl_authz_id = null, $props = null) {}
+function ldap_search($link_identifier, $base_dn, $filter, $attributes = null, $attrsonly = null, $sizelimit = null, $timelimit = null, $deref = null, $servercontrols = null) {}
+function ldap_set_option($link_identifier, $option, $newval) {}
+function ldap_set_rebind_proc($link, $callback) {}
+function ldap_sort($link, $result, $sortfilter) {}
+function ldap_start_tls($link_identifier) {}
+function ldap_unbind($link_identifier) {}
+const LDAP_CONTROL_ASSERT = '1.3.6.1.1.12';
+const LDAP_CONTROL_DONTUSECOPY = '1.3.6.1.1.22';
+const LDAP_CONTROL_MANAGEDSAIT = '2.16.840.1.113730.3.4.2';
+const LDAP_CONTROL_PAGEDRESULTS = '1.2.840.113556.1.4.319';
+const LDAP_CONTROL_PASSWORDPOLICYREQUEST = '1.3.6.1.4.1.42.2.27.8.5.1';
+const LDAP_CONTROL_PASSWORDPOLICYRESPONSE = '1.3.6.1.4.1.42.2.27.8.5.1';
+const LDAP_CONTROL_POST_READ = '1.3.6.1.1.13.2';
+const LDAP_CONTROL_PRE_READ = '1.3.6.1.1.13.1';
+const LDAP_CONTROL_PROXY_AUTHZ = '2.16.840.1.113730.3.4.18';
+const LDAP_CONTROL_SORTREQUEST = '1.2.840.113556.1.4.473';
+const LDAP_CONTROL_SORTRESPONSE = '1.2.840.113556.1.4.474';
+const LDAP_CONTROL_SUBENTRIES = '1.3.6.1.4.1.4203.1.10.1';
+const LDAP_CONTROL_SYNC = '1.3.6.1.4.1.4203.1.9.1.1';
+const LDAP_CONTROL_SYNC_DONE = '1.3.6.1.4.1.4203.1.9.1.3';
+const LDAP_CONTROL_SYNC_STATE = '1.3.6.1.4.1.4203.1.9.1.2';
+const LDAP_CONTROL_VALUESRETURNFILTER = '1.2.826.0.1.3344810.2.3';
+const LDAP_CONTROL_VLVREQUEST = '2.16.840.1.113730.3.4.9';
+const LDAP_CONTROL_VLVRESPONSE = '2.16.840.1.113730.3.4.10';
+const LDAP_CONTROL_X_DOMAIN_SCOPE = '1.2.840.113556.1.4.1339';
+const LDAP_CONTROL_X_EXTENDED_DN = '1.2.840.113556.1.4.529';
+const LDAP_CONTROL_X_INCREMENTAL_VALUES = '1.2.840.113556.1.4.802';
+const LDAP_CONTROL_X_PERMISSIVE_MODIFY = '1.2.840.113556.1.4.1413';
+const LDAP_CONTROL_X_SEARCH_OPTIONS = '1.2.840.113556.1.4.1340';
+const LDAP_CONTROL_X_TREE_DELETE = '1.2.840.113556.1.4.805';
+const LDAP_DEREF_ALWAYS = 3;
+const LDAP_DEREF_FINDING = 2;
+const LDAP_DEREF_NEVER = 0;
+const LDAP_DEREF_SEARCHING = 1;
+const LDAP_ESCAPE_DN = 2;
+const LDAP_ESCAPE_FILTER = 1;
+const LDAP_EXOP_MODIFY_PASSWD = '1.3.6.1.4.1.4203.1.11.1';
+const LDAP_EXOP_REFRESH = '1.3.6.1.4.1.1466.101.119.1';
+const LDAP_EXOP_START_TLS = '1.3.6.1.4.1.1466.20037';
+const LDAP_EXOP_TURN = '1.3.6.1.1.19';
+const LDAP_EXOP_WHO_AM_I = '1.3.6.1.4.1.4203.1.11.3';
+const LDAP_MODIFY_BATCH_ADD = 1;
+const LDAP_MODIFY_BATCH_ATTRIB = 'attrib';
+const LDAP_MODIFY_BATCH_MODTYPE = 'modtype';
+const LDAP_MODIFY_BATCH_REMOVE = 2;
+const LDAP_MODIFY_BATCH_REMOVE_ALL = 18;
+const LDAP_MODIFY_BATCH_REPLACE = 3;
+const LDAP_MODIFY_BATCH_VALUES = 'values';
+const LDAP_OPT_CLIENT_CONTROLS = 19;
+const LDAP_OPT_DEBUG_LEVEL = 20481;
+const LDAP_OPT_DEREF = 2;
+const LDAP_OPT_DIAGNOSTIC_MESSAGE = 50;
+const LDAP_OPT_ERROR_NUMBER = 49;
+const LDAP_OPT_ERROR_STRING = 50;
+const LDAP_OPT_HOST_NAME = 48;
+const LDAP_OPT_MATCHED_DN = 51;
+const LDAP_OPT_NETWORK_TIMEOUT = 20485;
+const LDAP_OPT_PROTOCOL_VERSION = 17;
+const LDAP_OPT_REFERRALS = 8;
+const LDAP_OPT_RESTART = 9;
+const LDAP_OPT_SERVER_CONTROLS = 18;
+const LDAP_OPT_SIZELIMIT = 3;
+const LDAP_OPT_TIMELIMIT = 4;
+const LDAP_OPT_TIMEOUT = 20482;
+const LDAP_OPT_X_KEEPALIVE_IDLE = 25344;
+const LDAP_OPT_X_KEEPALIVE_INTERVAL = 25346;
+const LDAP_OPT_X_KEEPALIVE_PROBES = 25345;
+const LDAP_OPT_X_SASL_AUTHCID = 24834;
+const LDAP_OPT_X_SASL_AUTHZID = 24835;
+const LDAP_OPT_X_SASL_MECH = 24832;
+const LDAP_OPT_X_SASL_NOCANON = 24843;
+const LDAP_OPT_X_SASL_REALM = 24833;
+const LDAP_OPT_X_SASL_USERNAME = 24844;
+const LDAP_OPT_X_TLS_ALLOW = 3;
+const LDAP_OPT_X_TLS_CACERTDIR = 24579;
+const LDAP_OPT_X_TLS_CACERTFILE = 24578;
+const LDAP_OPT_X_TLS_CERTFILE = 24580;
+const LDAP_OPT_X_TLS_CIPHER_SUITE = 24584;
+const LDAP_OPT_X_TLS_CRLCHECK = 24587;
+const LDAP_OPT_X_TLS_CRLFILE = 24592;
+const LDAP_OPT_X_TLS_CRL_ALL = 2;
+const LDAP_OPT_X_TLS_CRL_NONE = 0;
+const LDAP_OPT_X_TLS_CRL_PEER = 1;
+const LDAP_OPT_X_TLS_DEMAND = 2;
+const LDAP_OPT_X_TLS_DHFILE = 24590;
+const LDAP_OPT_X_TLS_HARD = 1;
+const LDAP_OPT_X_TLS_KEYFILE = 24581;
+const LDAP_OPT_X_TLS_NEVER = 0;
+const LDAP_OPT_X_TLS_PACKAGE = 24593;
+const LDAP_OPT_X_TLS_PROTOCOL_MIN = 24583;
+const LDAP_OPT_X_TLS_PROTOCOL_SSL2 = 512;
+const LDAP_OPT_X_TLS_PROTOCOL_SSL3 = 768;
+const LDAP_OPT_X_TLS_PROTOCOL_TLS1_0 = 769;
+const LDAP_OPT_X_TLS_PROTOCOL_TLS1_1 = 770;
+const LDAP_OPT_X_TLS_PROTOCOL_TLS1_2 = 771;
+const LDAP_OPT_X_TLS_RANDOM_FILE = 24585;
+const LDAP_OPT_X_TLS_REQUIRE_CERT = 24582;
+const LDAP_OPT_X_TLS_TRY = 4;
+}
diff --git a/dev/tools/phan/stubs/mcrypt.phan_php b/dev/tools/phan/stubs/mcrypt.phan_php
new file mode 100644
index 00000000000..bb7991004b7
--- /dev/null
+++ b/dev/tools/phan/stubs/mcrypt.phan_php
@@ -0,0 +1,79 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension mcrypt@1.0.6
+
+namespace {
+function mcrypt_create_iv($size, $source = null) {}
+function mcrypt_decrypt($cipher, $key, $data, $mode, $iv = null) {}
+function mcrypt_enc_get_algorithms_name($td) {}
+function mcrypt_enc_get_block_size($td) {}
+function mcrypt_enc_get_iv_size($td) {}
+function mcrypt_enc_get_key_size($td) {}
+function mcrypt_enc_get_modes_name($td) {}
+function mcrypt_enc_get_supported_key_sizes($td) {}
+function mcrypt_enc_is_block_algorithm($td) {}
+function mcrypt_enc_is_block_algorithm_mode($td) {}
+function mcrypt_enc_is_block_mode($td) {}
+function mcrypt_enc_self_test($td) {}
+function mcrypt_encrypt($cipher, $key, $data, $mode, $iv = null) {}
+function mcrypt_generic($td, $data) {}
+function mcrypt_generic_deinit($td) {}
+function mcrypt_generic_init($td, $key, $iv) {}
+function mcrypt_get_block_size($cipher, $module) {}
+function mcrypt_get_cipher_name($cipher) {}
+function mcrypt_get_iv_size($cipher, $module) {}
+function mcrypt_get_key_size($cipher, $module) {}
+function mcrypt_list_algorithms($lib_dir = null) {}
+function mcrypt_list_modes($lib_dir = null) {}
+function mcrypt_module_close($td) {}
+function mcrypt_module_get_algo_block_size($algorithm, $lib_dir = null) {}
+function mcrypt_module_get_algo_key_size($algorithm, $lib_dir = null) {}
+function mcrypt_module_get_supported_key_sizes($algorithm, $lib_dir = null) {}
+function mcrypt_module_is_block_algorithm($algorithm, $lib_dir = null) {}
+function mcrypt_module_is_block_algorithm_mode($mode, $lib_dir = null) {}
+function mcrypt_module_is_block_mode($mode, $lib_dir = null) {}
+function mcrypt_module_open($cipher, $cipher_directory, $mode, $mode_directory) {}
+function mcrypt_module_self_test($algorithm, $lib_dir = null) {}
+function mdecrypt_generic($td, $data) {}
+const MCRYPT_3DES = 'tripledes';
+const MCRYPT_ARCFOUR = 'arcfour';
+const MCRYPT_ARCFOUR_IV = 'arcfour-iv';
+const MCRYPT_BLOWFISH = 'blowfish';
+const MCRYPT_BLOWFISH_COMPAT = 'blowfish-compat';
+const MCRYPT_CAST_128 = 'cast-128';
+const MCRYPT_CAST_256 = 'cast-256';
+const MCRYPT_CRYPT = 'crypt';
+const MCRYPT_DECRYPT = 1;
+const MCRYPT_DES = 'des';
+const MCRYPT_DEV_RANDOM = 0;
+const MCRYPT_DEV_URANDOM = 1;
+const MCRYPT_ENCRYPT = 0;
+const MCRYPT_ENIGNA = 'crypt';
+const MCRYPT_GOST = 'gost';
+const MCRYPT_IDEA = 'idea';
+const MCRYPT_LOKI97 = 'loki97';
+const MCRYPT_MARS = 'mars';
+const MCRYPT_MODE_CBC = 'cbc';
+const MCRYPT_MODE_CFB = 'cfb';
+const MCRYPT_MODE_ECB = 'ecb';
+const MCRYPT_MODE_NOFB = 'nofb';
+const MCRYPT_MODE_OFB = 'ofb';
+const MCRYPT_MODE_STREAM = 'stream';
+const MCRYPT_PANAMA = 'panama';
+const MCRYPT_RAND = 2;
+const MCRYPT_RC2 = 'rc2';
+const MCRYPT_RC6 = 'rc6';
+const MCRYPT_RIJNDAEL_128 = 'rijndael-128';
+const MCRYPT_RIJNDAEL_192 = 'rijndael-192';
+const MCRYPT_RIJNDAEL_256 = 'rijndael-256';
+const MCRYPT_SAFER64 = 'safer-sk64';
+const MCRYPT_SAFER128 = 'safer-sk128';
+const MCRYPT_SAFERPLUS = 'saferplus';
+const MCRYPT_SERPENT = 'serpent';
+const MCRYPT_SKIPJACK = 'skipjack';
+const MCRYPT_THREEWAY = 'threeway';
+const MCRYPT_TRIPLEDES = 'tripledes';
+const MCRYPT_TWOFISH = 'twofish';
+const MCRYPT_WAKE = 'wake';
+const MCRYPT_XTEA = 'xtea';
+}
diff --git a/dev/tools/phan/stubs/memcache.phan_php b/dev/tools/phan/stubs/memcache.phan_php
new file mode 100644
index 00000000000..ac1577702e4
--- /dev/null
+++ b/dev/tools/phan/stubs/memcache.phan_php
@@ -0,0 +1,72 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension memcache@4.0.5.2
+
+namespace {
+class Memcache extends \MemcachePool {
+
+    // methods
+    public function connect() {}
+    public function pconnect() {}
+    public function addserver() {}
+}
+
+class MemcachePool {
+
+    // methods
+    public function connect() {}
+    public function addserver() {}
+    public function setserverparams() {}
+    public function setfailurecallback() {}
+    public function getserverstatus() {}
+    public function findserver() {}
+    public function getversion() {}
+    public function add() {}
+    public function set() {}
+    public function replace() {}
+    public function cas() {}
+    public function append() {}
+    public function prepend() {}
+    public function get($arg, &$arg, &$arg) {}
+    public function delete() {}
+    public function getstats() {}
+    public function getextendedstats() {}
+    public function setcompressthreshold() {}
+    public function increment() {}
+    public function decrement() {}
+    public function close() {}
+    public function flush() {}
+    public function setSaslAuthData() {}
+}
+
+function memcache_add() {}
+function memcache_add_server() {}
+function memcache_append() {}
+function memcache_cas() {}
+function memcache_close() {}
+function memcache_connect() {}
+function memcache_debug() {}
+function memcache_decrement() {}
+function memcache_delete() {}
+function memcache_flush() {}
+function memcache_get($arg, $arg, &$arg, &$arg) {}
+function memcache_get_extended_stats() {}
+function memcache_get_server_status() {}
+function memcache_get_stats() {}
+function memcache_get_version() {}
+function memcache_increment() {}
+function memcache_pconnect() {}
+function memcache_prepend() {}
+function memcache_replace() {}
+function memcache_set() {}
+function memcache_set_compress_threshold() {}
+function memcache_set_failure_callback() {}
+function memcache_set_sasl_auth_data() {}
+function memcache_set_server_params() {}
+const MEMCACHE_COMPRESSED = 2;
+const MEMCACHE_HAVE_SESSION = 1;
+const MEMCACHE_USER1 = 65536;
+const MEMCACHE_USER2 = 131072;
+const MEMCACHE_USER3 = 262144;
+const MEMCACHE_USER4 = 524288;
+}
diff --git a/dev/tools/phan/stubs/module_numberwords.php b/dev/tools/phan/stubs/module_numberwords.php
new file mode 100644
index 00000000000..3058342d232
--- /dev/null
+++ b/dev/tools/phan/stubs/module_numberwords.php
@@ -0,0 +1,48 @@
+<?php
+/* Copyright (C) 2009 Laurent Destailleur         <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+/**
+ *	\file			htdocs/core/modules/substitutions/functions_numberwords.lib.php
+ *	\brief			A set of functions for Dolibarr
+ *					This file contains functions for plugin numberwords.
+ */
+/**
+ * 		Function called to complete substitution array (before generating on ODT, or a personalized email)
+ * 		functions xxx_completesubstitutionarray are called by make_substitutions() if file
+ * 		is inside directory htdocs/core/substitutions
+ *
+ *		@param	array		$substitutionarray	Array with substitution key=>val
+ *		@param	Translate	$outlangs			Output langs
+ *		@param	Object		$object				Object to use to get values
+ * 		@return	void							The entry parameter $substitutionarray is modified
+ */
+function numberwords_completesubstitutionarray(&$substitutionarray, $outlangs, $object)
+{
+}
+/**
+ *  Return full text translated to language label for a key. Store key-label in a cache.
+ *
+ *	@param		Translate	$outlangs	Language for output
+ * 	@param		int		    $number		Number to encode in full text
+ *  @param      string	    $isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
+ *  @return     string				    Label translated in UTF8 (but without entities)
+ * 									    10 if setDefaultLang was en_US => ten
+ * 									    123 if setDefaultLang was fr_FR => cent vingt trois
+ */
+function numberwords_getLabelFromNumber($outlangs, $number, $isamount = '')
+{
+}
diff --git a/dev/tools/phan/stubs/mysqli.phan_php b/dev/tools/phan/stubs/mysqli.phan_php
new file mode 100644
index 00000000000..d116d5004bf
--- /dev/null
+++ b/dev/tools/phan/stubs/mysqli.phan_php
@@ -0,0 +1,397 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension mysqli@8.2.9
+
+namespace {
+class mysqli {
+
+    // properties
+    public $affected_rows;
+    public $client_info;
+    public $client_version;
+    public $connect_errno;
+    public $connect_error;
+    public $errno;
+    public $error;
+    public $error_list;
+    public $field_count;
+    public $host_info;
+    public $info;
+    public $insert_id;
+    public $protocol_version;
+    public $server_info;
+    public $server_version;
+    public $sqlstate;
+    public $stat;
+    public $thread_id;
+    public $warning_count;
+
+    // methods
+    public function __construct(?string $hostname = null, ?string $username = null, ?string $password = null, ?string $database = null, ?int $port = null, ?string $socket = null) {}
+    public function autocommit(bool $enable) : bool {}
+    public function begin_transaction(int $flags = 0, ?string $name = null) : bool {}
+    public function change_user(string $username, string $password, ?string $database) : bool {}
+    public function character_set_name() : string {}
+    public function close() {}
+    public function commit(int $flags = 0, ?string $name = null) : bool {}
+    public function connect(?string $hostname = null, ?string $username = null, ?string $password = null, ?string $database = null, ?int $port = null, ?string $socket = null) : bool {}
+    public function dump_debug_info() : bool {}
+    public function debug(string $options) {}
+    public function get_charset() : ?object {}
+    public function execute_query(string $query, ?array $params = null) : \mysqli_result|bool {}
+    public function get_client_info() : string {}
+    public function get_connection_stats() : array {}
+    public function get_server_info() : string {}
+    public function get_warnings() : \mysqli_warning|false {}
+    public function init() {}
+    public function kill(int $process_id) : bool {}
+    public function multi_query(string $query) : bool {}
+    public function more_results() : bool {}
+    public function next_result() : bool {}
+    public function ping() : bool {}
+    public static function poll(?array &$read, ?array &$error, array &$reject, int $seconds, int $microseconds = 0) : false|int {}
+    public function prepare(string $query) : \mysqli_stmt|false {}
+    public function query(string $query, int $result_mode = \MYSQLI_STORE_RESULT) : \mysqli_result|bool {}
+    public function real_connect(?string $hostname = null, ?string $username = null, ?string $password = null, ?string $database = null, ?int $port = null, ?string $socket = null, int $flags = 0) : bool {}
+    public function real_escape_string(string $string) : string {}
+    public function reap_async_query() : \mysqli_result|bool {}
+    public function escape_string(string $string) : string {}
+    public function real_query(string $query) : bool {}
+    public function release_savepoint(string $name) : bool {}
+    public function rollback(int $flags = 0, ?string $name = null) : bool {}
+    public function savepoint(string $name) : bool {}
+    public function select_db(string $database) : bool {}
+    public function set_charset(string $charset) : bool {}
+    public function options(int $option, $value) : bool {}
+    public function set_opt(int $option, $value) : bool {}
+    public function ssl_set(?string $key, ?string $certificate, ?string $ca_certificate, ?string $ca_path, ?string $cipher_algos) {}
+    public function stat() : false|string {}
+    public function stmt_init() : \mysqli_stmt|false {}
+    public function store_result(int $mode = 0) : \mysqli_result|false {}
+    public function thread_safe() : bool {}
+    public function use_result() : \mysqli_result|false {}
+    public function refresh(int $flags) : bool {}
+}
+
+final class mysqli_driver {
+
+    // properties
+    public $client_info;
+    public $client_version;
+    public $driver_version;
+    public $embedded;
+    public $reconnect;
+    public $report_mode;
+}
+
+class mysqli_result implements \IteratorAggregate, \Traversable {
+
+    // properties
+    public $current_field;
+    public $field_count;
+    public $lengths;
+    public $num_rows;
+    public $type;
+
+    // methods
+    public function __construct(\mysqli $mysql, int $result_mode = \MYSQLI_STORE_RESULT) {}
+    public function close() : void {}
+    public function free() : void {}
+    public function data_seek(int $offset) : bool {}
+    public function fetch_field() : false|object {}
+    public function fetch_fields() : array {}
+    public function fetch_field_direct(int $index) : false|object {}
+    public function fetch_all(int $mode = \MYSQLI_NUM) : array {}
+    public function fetch_array(int $mode = \MYSQLI_BOTH) : array|false|null {}
+    public function fetch_assoc() : array|false|null {}
+    public function fetch_object(string $class = 'stdClass', array $constructor_args = []) : false|null|object {}
+    public function fetch_row() : array|false|null {}
+    public function fetch_column(int $column = 0) : false|float|int|null|string {}
+    public function field_seek(int $index) : bool {}
+    public function free_result() : void {}
+    public function getIterator() : \Iterator {}
+}
+
+final class mysqli_sql_exception extends \RuntimeException {
+
+    // properties
+    protected $sqlstate;
+    protected $message;
+    protected $code;
+    protected $file;
+    protected $line;
+
+    // methods
+    public function getSqlState() : string {}
+}
+
+class mysqli_stmt {
+
+    // properties
+    public $affected_rows;
+    public $errno;
+    public $error;
+    public $error_list;
+    public $field_count;
+    public $id;
+    public $insert_id;
+    public $num_rows;
+    public $param_count;
+    public $sqlstate;
+
+    // methods
+    public function __construct(\mysqli $mysql, ?string $query = null) {}
+    public function attr_get(int $attribute) : int {}
+    public function attr_set(int $attribute, int $value) : bool {}
+    public function bind_param(string $types, mixed &...$vars) : bool {}
+    public function bind_result(mixed &...$vars) : bool {}
+    public function close() {}
+    public function data_seek(int $offset) : void {}
+    public function execute(?array $params = null) : bool {}
+    public function fetch() : ?bool {}
+    public function get_warnings() : \mysqli_warning|false {}
+    public function result_metadata() : \mysqli_result|false {}
+    public function more_results() : bool {}
+    public function next_result() : bool {}
+    public function num_rows() : int|string {}
+    public function send_long_data(int $param_num, string $data) : bool {}
+    public function free_result() : void {}
+    public function reset() : bool {}
+    public function prepare(string $query) : bool {}
+    public function store_result() : bool {}
+    public function get_result() : \mysqli_result|false {}
+}
+
+final class mysqli_warning {
+
+    // properties
+    public $errno;
+    public $message;
+    public $sqlstate;
+
+    // methods
+    private function __construct() {}
+    public function next() : bool {}
+}
+
+function mysqli_affected_rows(\mysqli $mysql) : int|string {}
+function mysqli_autocommit(\mysqli $mysql, bool $enable) : bool {}
+function mysqli_begin_transaction(\mysqli $mysql, int $flags = 0, ?string $name = null) : bool {}
+function mysqli_change_user(\mysqli $mysql, string $username, string $password, ?string $database) : bool {}
+function mysqli_character_set_name(\mysqli $mysql) : string {}
+function mysqli_close(\mysqli $mysql) : true {}
+function mysqli_commit(\mysqli $mysql, int $flags = 0, ?string $name = null) : bool {}
+function mysqli_connect(?string $hostname = null, ?string $username = null, ?string $password = null, ?string $database = null, ?int $port = null, ?string $socket = null) : \mysqli|false {}
+function mysqli_connect_errno() : int {}
+function mysqli_connect_error() : ?string {}
+function mysqli_data_seek(\mysqli_result $result, int $offset) : bool {}
+function mysqli_debug(string $options) : true {}
+function mysqli_dump_debug_info(\mysqli $mysql) : bool {}
+function mysqli_errno(\mysqli $mysql) : int {}
+function mysqli_error(\mysqli $mysql) : string {}
+function mysqli_error_list(\mysqli $mysql) : array {}
+function mysqli_escape_string(\mysqli $mysql, string $string) : string {}
+function mysqli_execute(\mysqli_stmt $statement, ?array $params = null) : bool {}
+function mysqli_execute_query(\mysqli $mysql, string $query, ?array $params = null) : \mysqli_result|bool {}
+function mysqli_fetch_all(\mysqli_result $result, int $mode = \MYSQLI_NUM) : array {}
+function mysqli_fetch_array(\mysqli_result $result, int $mode = \MYSQLI_BOTH) : array|false|null {}
+function mysqli_fetch_assoc(\mysqli_result $result) : array|false|null {}
+function mysqli_fetch_column(\mysqli_result $result, int $column = 0) : false|float|int|null|string {}
+function mysqli_fetch_field(\mysqli_result $result) : false|object {}
+function mysqli_fetch_field_direct(\mysqli_result $result, int $index) : false|object {}
+function mysqli_fetch_fields(\mysqli_result $result) : array {}
+function mysqli_fetch_lengths(\mysqli_result $result) : array|false {}
+function mysqli_fetch_object(\mysqli_result $result, string $class = 'stdClass', array $constructor_args = []) : false|null|object {}
+function mysqli_fetch_row(\mysqli_result $result) : array|false|null {}
+function mysqli_field_count(\mysqli $mysql) : int {}
+function mysqli_field_seek(\mysqli_result $result, int $index) : bool {}
+function mysqli_field_tell(\mysqli_result $result) : int {}
+function mysqli_free_result(\mysqli_result $result) : void {}
+function mysqli_get_charset(\mysqli $mysql) : ?object {}
+function mysqli_get_client_info(?\mysqli $mysql = null) : string {}
+function mysqli_get_client_stats() : array {}
+function mysqli_get_client_version() : int {}
+function mysqli_get_connection_stats(\mysqli $mysql) : array {}
+function mysqli_get_host_info(\mysqli $mysql) : string {}
+function mysqli_get_links_stats() : array {}
+function mysqli_get_proto_info(\mysqli $mysql) : int {}
+function mysqli_get_server_info(\mysqli $mysql) : string {}
+function mysqli_get_server_version(\mysqli $mysql) : int {}
+function mysqli_get_warnings(\mysqli $mysql) : \mysqli_warning|false {}
+function mysqli_info(\mysqli $mysql) : ?string {}
+function mysqli_init() : \mysqli|false {}
+function mysqli_insert_id(\mysqli $mysql) : int|string {}
+function mysqli_kill(\mysqli $mysql, int $process_id) : bool {}
+function mysqli_more_results(\mysqli $mysql) : bool {}
+function mysqli_multi_query(\mysqli $mysql, string $query) : bool {}
+function mysqli_next_result(\mysqli $mysql) : bool {}
+function mysqli_num_fields(\mysqli_result $result) : int {}
+function mysqli_num_rows(\mysqli_result $result) : int|string {}
+function mysqli_options(\mysqli $mysql, int $option, $value) : bool {}
+function mysqli_ping(\mysqli $mysql) : bool {}
+function mysqli_poll(?array &$read, ?array &$error, array &$reject, int $seconds, int $microseconds = 0) : false|int {}
+function mysqli_prepare(\mysqli $mysql, string $query) : \mysqli_stmt|false {}
+function mysqli_query(\mysqli $mysql, string $query, int $result_mode = \MYSQLI_STORE_RESULT) : \mysqli_result|bool {}
+function mysqli_real_connect(\mysqli $mysql, ?string $hostname = null, ?string $username = null, ?string $password = null, ?string $database = null, ?int $port = null, ?string $socket = null, int $flags = 0) : bool {}
+function mysqli_real_escape_string(\mysqli $mysql, string $string) : string {}
+function mysqli_real_query(\mysqli $mysql, string $query) : bool {}
+function mysqli_reap_async_query(\mysqli $mysql) : \mysqli_result|bool {}
+function mysqli_refresh(\mysqli $mysql, int $flags) : bool {}
+function mysqli_release_savepoint(\mysqli $mysql, string $name) : bool {}
+function mysqli_report(int $flags) : bool {}
+function mysqli_rollback(\mysqli $mysql, int $flags = 0, ?string $name = null) : bool {}
+function mysqli_savepoint(\mysqli $mysql, string $name) : bool {}
+function mysqli_select_db(\mysqli $mysql, string $database) : bool {}
+function mysqli_set_charset(\mysqli $mysql, string $charset) : bool {}
+function mysqli_set_opt(\mysqli $mysql, int $option, $value) : bool {}
+function mysqli_sqlstate(\mysqli $mysql) : string {}
+function mysqli_ssl_set(\mysqli $mysql, ?string $key, ?string $certificate, ?string $ca_certificate, ?string $ca_path, ?string $cipher_algos) : true {}
+function mysqli_stat(\mysqli $mysql) : false|string {}
+function mysqli_stmt_affected_rows(\mysqli_stmt $statement) : int|string {}
+function mysqli_stmt_attr_get(\mysqli_stmt $statement, int $attribute) : int {}
+function mysqli_stmt_attr_set(\mysqli_stmt $statement, int $attribute, int $value) : bool {}
+function mysqli_stmt_bind_param(\mysqli_stmt $statement, string $types, mixed &...$vars) : bool {}
+function mysqli_stmt_bind_result(\mysqli_stmt $statement, mixed &...$vars) : bool {}
+function mysqli_stmt_close(\mysqli_stmt $statement) : true {}
+function mysqli_stmt_data_seek(\mysqli_stmt $statement, int $offset) : void {}
+function mysqli_stmt_errno(\mysqli_stmt $statement) : int {}
+function mysqli_stmt_error(\mysqli_stmt $statement) : string {}
+function mysqli_stmt_error_list(\mysqli_stmt $statement) : array {}
+function mysqli_stmt_execute(\mysqli_stmt $statement, ?array $params = null) : bool {}
+function mysqli_stmt_fetch(\mysqli_stmt $statement) : ?bool {}
+function mysqli_stmt_field_count(\mysqli_stmt $statement) : int {}
+function mysqli_stmt_free_result(\mysqli_stmt $statement) : void {}
+function mysqli_stmt_get_result(\mysqli_stmt $statement) : \mysqli_result|false {}
+function mysqli_stmt_get_warnings(\mysqli_stmt $statement) : \mysqli_warning|false {}
+function mysqli_stmt_init(\mysqli $mysql) : \mysqli_stmt|false {}
+function mysqli_stmt_insert_id(\mysqli_stmt $statement) : int|string {}
+function mysqli_stmt_more_results(\mysqli_stmt $statement) : bool {}
+function mysqli_stmt_next_result(\mysqli_stmt $statement) : bool {}
+function mysqli_stmt_num_rows(\mysqli_stmt $statement) : int|string {}
+function mysqli_stmt_param_count(\mysqli_stmt $statement) : int {}
+function mysqli_stmt_prepare(\mysqli_stmt $statement, string $query) : bool {}
+function mysqli_stmt_reset(\mysqli_stmt $statement) : bool {}
+function mysqli_stmt_result_metadata(\mysqli_stmt $statement) : \mysqli_result|false {}
+function mysqli_stmt_send_long_data(\mysqli_stmt $statement, int $param_num, string $data) : bool {}
+function mysqli_stmt_sqlstate(\mysqli_stmt $statement) : string {}
+function mysqli_stmt_store_result(\mysqli_stmt $statement) : bool {}
+function mysqli_store_result(\mysqli $mysql, int $mode = 0) : \mysqli_result|false {}
+function mysqli_thread_id(\mysqli $mysql) : int {}
+function mysqli_thread_safe() : bool {}
+function mysqli_use_result(\mysqli $mysql) : \mysqli_result|false {}
+function mysqli_warning_count(\mysqli $mysql) : int {}
+const MYSQLI_ASSOC = 1;
+const MYSQLI_ASYNC = 8;
+const MYSQLI_AUTO_INCREMENT_FLAG = 512;
+const MYSQLI_BINARY_FLAG = 128;
+const MYSQLI_BLOB_FLAG = 16;
+const MYSQLI_BOTH = 3;
+const MYSQLI_CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS = 4194304;
+const MYSQLI_CLIENT_COMPRESS = 32;
+const MYSQLI_CLIENT_FOUND_ROWS = 2;
+const MYSQLI_CLIENT_IGNORE_SPACE = 256;
+const MYSQLI_CLIENT_INTERACTIVE = 1024;
+const MYSQLI_CLIENT_NO_SCHEMA = 16;
+const MYSQLI_CLIENT_SSL = 2048;
+const MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT = 64;
+const MYSQLI_CLIENT_SSL_VERIFY_SERVER_CERT = 1073741824;
+const MYSQLI_CURSOR_TYPE_FOR_UPDATE = 2;
+const MYSQLI_CURSOR_TYPE_NO_CURSOR = 0;
+const MYSQLI_CURSOR_TYPE_READ_ONLY = 1;
+const MYSQLI_CURSOR_TYPE_SCROLLABLE = 4;
+const MYSQLI_DATA_TRUNCATED = 101;
+const MYSQLI_DEBUG_TRACE_ENABLED = 0;
+const MYSQLI_ENUM_FLAG = 256;
+const MYSQLI_GROUP_FLAG = 32768;
+const MYSQLI_INIT_COMMAND = 3;
+const MYSQLI_IS_MARIADB = false;
+const MYSQLI_MULTIPLE_KEY_FLAG = 8;
+const MYSQLI_NOT_NULL_FLAG = 1;
+const MYSQLI_NO_DATA = 100;
+const MYSQLI_NO_DEFAULT_VALUE_FLAG = 4096;
+const MYSQLI_NUM = 2;
+const MYSQLI_NUM_FLAG = 32768;
+const MYSQLI_ON_UPDATE_NOW_FLAG = 8192;
+const MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS = 37;
+const MYSQLI_OPT_CONNECT_TIMEOUT = 0;
+const MYSQLI_OPT_INT_AND_FLOAT_NATIVE = 201;
+const MYSQLI_OPT_LOAD_DATA_LOCAL_DIR = 43;
+const MYSQLI_OPT_LOCAL_INFILE = 8;
+const MYSQLI_OPT_NET_CMD_BUFFER_SIZE = 202;
+const MYSQLI_OPT_NET_READ_BUFFER_SIZE = 203;
+const MYSQLI_OPT_READ_TIMEOUT = 11;
+const MYSQLI_OPT_SSL_VERIFY_SERVER_CERT = 21;
+const MYSQLI_PART_KEY_FLAG = 16384;
+const MYSQLI_PRI_KEY_FLAG = 2;
+const MYSQLI_READ_DEFAULT_FILE = 4;
+const MYSQLI_READ_DEFAULT_GROUP = 5;
+const MYSQLI_REFRESH_BACKUP_LOG = 2097152;
+const MYSQLI_REFRESH_GRANT = 1;
+const MYSQLI_REFRESH_HOSTS = 8;
+const MYSQLI_REFRESH_LOG = 2;
+const MYSQLI_REFRESH_MASTER = 128;
+const MYSQLI_REFRESH_REPLICA = 64;
+const MYSQLI_REFRESH_SLAVE = 64;
+const MYSQLI_REFRESH_STATUS = 16;
+const MYSQLI_REFRESH_TABLES = 4;
+const MYSQLI_REFRESH_THREADS = 32;
+const MYSQLI_REPORT_ALL = 255;
+const MYSQLI_REPORT_ERROR = 1;
+const MYSQLI_REPORT_INDEX = 4;
+const MYSQLI_REPORT_OFF = 0;
+const MYSQLI_REPORT_STRICT = 2;
+const MYSQLI_SERVER_PS_OUT_PARAMS = 4096;
+const MYSQLI_SERVER_PUBLIC_KEY = 35;
+const MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED = 16;
+const MYSQLI_SERVER_QUERY_NO_INDEX_USED = 32;
+const MYSQLI_SERVER_QUERY_WAS_SLOW = 2048;
+const MYSQLI_SET_CHARSET_DIR = 6;
+const MYSQLI_SET_CHARSET_NAME = 7;
+const MYSQLI_SET_FLAG = 2048;
+const MYSQLI_STMT_ATTR_CURSOR_TYPE = 1;
+const MYSQLI_STMT_ATTR_PREFETCH_ROWS = 2;
+const MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH = 0;
+const MYSQLI_STORE_RESULT = 0;
+const MYSQLI_STORE_RESULT_COPY_DATA = 16;
+const MYSQLI_TIMESTAMP_FLAG = 1024;
+const MYSQLI_TRANS_COR_AND_CHAIN = 1;
+const MYSQLI_TRANS_COR_AND_NO_CHAIN = 2;
+const MYSQLI_TRANS_COR_NO_RELEASE = 8;
+const MYSQLI_TRANS_COR_RELEASE = 4;
+const MYSQLI_TRANS_START_READ_ONLY = 4;
+const MYSQLI_TRANS_START_READ_WRITE = 2;
+const MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT = 1;
+const MYSQLI_TYPE_BIT = 16;
+const MYSQLI_TYPE_BLOB = 252;
+const MYSQLI_TYPE_CHAR = 1;
+const MYSQLI_TYPE_DATE = 10;
+const MYSQLI_TYPE_DATETIME = 12;
+const MYSQLI_TYPE_DECIMAL = 0;
+const MYSQLI_TYPE_DOUBLE = 5;
+const MYSQLI_TYPE_ENUM = 247;
+const MYSQLI_TYPE_FLOAT = 4;
+const MYSQLI_TYPE_GEOMETRY = 255;
+const MYSQLI_TYPE_INT24 = 9;
+const MYSQLI_TYPE_INTERVAL = 247;
+const MYSQLI_TYPE_JSON = 245;
+const MYSQLI_TYPE_LONG = 3;
+const MYSQLI_TYPE_LONGLONG = 8;
+const MYSQLI_TYPE_LONG_BLOB = 251;
+const MYSQLI_TYPE_MEDIUM_BLOB = 250;
+const MYSQLI_TYPE_NEWDATE = 14;
+const MYSQLI_TYPE_NEWDECIMAL = 246;
+const MYSQLI_TYPE_NULL = 6;
+const MYSQLI_TYPE_SET = 248;
+const MYSQLI_TYPE_SHORT = 2;
+const MYSQLI_TYPE_STRING = 254;
+const MYSQLI_TYPE_TIME = 11;
+const MYSQLI_TYPE_TIMESTAMP = 7;
+const MYSQLI_TYPE_TINY = 1;
+const MYSQLI_TYPE_TINY_BLOB = 249;
+const MYSQLI_TYPE_VAR_STRING = 253;
+const MYSQLI_TYPE_YEAR = 13;
+const MYSQLI_UNIQUE_KEY_FLAG = 4;
+const MYSQLI_UNSIGNED_FLAG = 32;
+const MYSQLI_USE_RESULT = 1;
+const MYSQLI_ZEROFILL_FLAG = 64;
+}
diff --git a/dev/tools/phan/stubs/pdo_cubrid.phan_php b/dev/tools/phan/stubs/pdo_cubrid.phan_php
new file mode 100644
index 00000000000..d9ba885a601
--- /dev/null
+++ b/dev/tools/phan/stubs/pdo_cubrid.phan_php
@@ -0,0 +1,3 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension pdo_mysql@7.1.33-55+0~20230829.86+debian10~1.gbp0254ab
diff --git a/dev/tools/phan/stubs/pdo_mysql.phan_php b/dev/tools/phan/stubs/pdo_mysql.phan_php
new file mode 100644
index 00000000000..a3733bdf4e0
--- /dev/null
+++ b/dev/tools/phan/stubs/pdo_mysql.phan_php
@@ -0,0 +1,3 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension pdo_mysql@8.2.9
diff --git a/dev/tools/phan/stubs/pdo_pgsql.phan_php b/dev/tools/phan/stubs/pdo_pgsql.phan_php
new file mode 100644
index 00000000000..6b1ac9f210e
--- /dev/null
+++ b/dev/tools/phan/stubs/pdo_pgsql.phan_php
@@ -0,0 +1,3 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension pdo_pgsql@7.1.33-55+0~20230829.86+debian10~1.gbp0254ab
diff --git a/dev/tools/phan/stubs/pdo_sqlite.phan_php b/dev/tools/phan/stubs/pdo_sqlite.phan_php
new file mode 100644
index 00000000000..a69f2210dd4
--- /dev/null
+++ b/dev/tools/phan/stubs/pdo_sqlite.phan_php
@@ -0,0 +1,3 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension pdo_sqlite@7.4.12
diff --git a/dev/tools/phan/stubs/pgsql.phan_php b/dev/tools/phan/stubs/pgsql.phan_php
new file mode 100644
index 00000000000..65f4715c182
--- /dev/null
+++ b/dev/tools/phan/stubs/pgsql.phan_php
@@ -0,0 +1,974 @@
+<?php
+// From https://raw.githubusercontent.com/php/php-src/master/ext/pgsql/pgsql.stub.php
+
+/** @generate-class-entries */
+
+namespace {
+    /* libpq version */
+
+    /**
+     * @var string
+     * @cvalue pgsql_libpq_version
+     */
+    const PGSQL_LIBPQ_VERSION = UNKNOWN;
+    /**
+     * @var string
+     * @cvalue pgsql_libpq_version
+     * @deprecated
+     */
+    const PGSQL_LIBPQ_VERSION_STR = UNKNOWN;
+
+    /* For connection option */
+
+    /**
+     * @var int
+     * @cvalue PGSQL_CONNECT_FORCE_NEW
+     */
+    const PGSQL_CONNECT_FORCE_NEW = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_CONNECT_ASYNC
+     */
+    const PGSQL_CONNECT_ASYNC = UNKNOWN;
+
+    /* For pg_fetch_array() */
+
+    /**
+     * @var int
+     * @cvalue PGSQL_ASSOC
+     */
+    const PGSQL_ASSOC = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_NUM
+     */
+    const PGSQL_NUM = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_BOTH
+     */
+    const PGSQL_BOTH = UNKNOWN;
+
+    /* For pg_last_notice() */
+
+    /**
+     * @var int
+     * @cvalue PGSQL_NOTICE_LAST
+     */
+    const PGSQL_NOTICE_LAST = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_NOTICE_ALL
+     */
+    const PGSQL_NOTICE_ALL = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_NOTICE_CLEAR
+     */
+    const PGSQL_NOTICE_CLEAR = UNKNOWN;
+
+    /* For pg_connection_status() */
+
+    /**
+     * @var int
+     * @cvalue CONNECTION_BAD
+     */
+    const PGSQL_CONNECTION_BAD = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue CONNECTION_OK
+     */
+    const PGSQL_CONNECTION_OK = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue CONNECTION_STARTED
+     */
+    const PGSQL_CONNECTION_STARTED = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue CONNECTION_MADE
+     */
+    const PGSQL_CONNECTION_MADE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue CONNECTION_AWAITING_RESPONSE
+     */
+    const PGSQL_CONNECTION_AWAITING_RESPONSE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue CONNECTION_AUTH_OK
+     */
+    const PGSQL_CONNECTION_AUTH_OK = UNKNOWN;
+#ifdef CONNECTION_SSL_STARTUP
+    /**
+     * @var int
+     * @cvalue CONNECTION_SSL_STARTUP
+     */
+    const PGSQL_CONNECTION_SSL_STARTUP = UNKNOWN;
+#endif
+    /**
+     * @var int
+     * @cvalue CONNECTION_SETENV
+     */
+    const PGSQL_CONNECTION_SETENV = UNKNOWN;
+
+    /* For pg_connect_poll() */
+    /**
+     * @var int
+     * @cvalue PGRES_POLLING_FAILED
+     */
+    const PGSQL_POLLING_FAILED = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_POLLING_READING
+     */
+    const PGSQL_POLLING_READING = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_POLLING_WRITING
+     */
+    const PGSQL_POLLING_WRITING = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_POLLING_OK
+     */
+    const PGSQL_POLLING_OK = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_POLLING_ACTIVE
+     */
+    const PGSQL_POLLING_ACTIVE = UNKNOWN;
+
+    /* For pg_transaction_status() */
+
+    /**
+     * @var int
+     * @cvalue PQTRANS_IDLE
+     */
+    const PGSQL_TRANSACTION_IDLE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQTRANS_ACTIVE
+     */
+    const PGSQL_TRANSACTION_ACTIVE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQTRANS_INTRANS
+     */
+    const PGSQL_TRANSACTION_INTRANS = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQTRANS_INERROR
+     */
+    const PGSQL_TRANSACTION_INERROR = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQTRANS_UNKNOWN
+     */
+    const PGSQL_TRANSACTION_UNKNOWN = UNKNOWN;
+
+    /* For pg_set_error_verbosity() */
+
+    /**
+     * @var int
+     * @cvalue PQERRORS_TERSE
+     */
+    const PGSQL_ERRORS_TERSE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQERRORS_DEFAULT
+     */
+    const PGSQL_ERRORS_DEFAULT = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQERRORS_VERBOSE
+     */
+    const PGSQL_ERRORS_VERBOSE = UNKNOWN;
+    #if PGVERSION_NUM > 110000
+    /**
+     * @var int
+     * @cvalue PQERRORS_SQLSTATE
+     */
+    const PGSQL_ERRORS_SQLSTATE = UNKNOWN;
+    #else
+    /**
+     * @var int
+     * @cvalue PQERRORS_TERSE
+     */
+    const PGSQL_ERRORS_SQLSTATE = UNKNOWN;
+    #endif
+
+    /* For lo_seek() */
+
+    /**
+     * @var int
+     * @cvalue SEEK_SET
+     */
+    const PGSQL_SEEK_SET = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue SEEK_CUR
+     */
+    const PGSQL_SEEK_CUR = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue SEEK_END
+     */
+    const PGSQL_SEEK_END = UNKNOWN;
+
+    /* For pg_result_status() return value type */
+
+    /**
+     * @var int
+     * @cvalue PGSQL_STATUS_LONG
+     */
+    const PGSQL_STATUS_LONG = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_STATUS_STRING
+     */
+    const PGSQL_STATUS_STRING = UNKNOWN;
+
+    /* For pg_result_status() return value */
+
+    /**
+     * @var int
+     * @cvalue PGRES_EMPTY_QUERY
+     */
+    const PGSQL_EMPTY_QUERY = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_COMMAND_OK
+     */
+    const PGSQL_COMMAND_OK = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_TUPLES_OK
+     */
+    const PGSQL_TUPLES_OK = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_COPY_OUT
+     */
+    const PGSQL_COPY_OUT = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_COPY_IN
+     */
+    const PGSQL_COPY_IN = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_BAD_RESPONSE
+     */
+    const PGSQL_BAD_RESPONSE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_NONFATAL_ERROR
+     */
+    const PGSQL_NONFATAL_ERROR = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGRES_FATAL_ERROR
+     */
+    const PGSQL_FATAL_ERROR = UNKNOWN;
+
+    /* For pg_result_error_field() field codes */
+
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SEVERITY
+     */
+    const PGSQL_DIAG_SEVERITY = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SQLSTATE
+     */
+    const PGSQL_DIAG_SQLSTATE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_MESSAGE_PRIMARY
+     */
+    const PGSQL_DIAG_MESSAGE_PRIMARY = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_MESSAGE_DETAIL
+     */
+    const PGSQL_DIAG_MESSAGE_DETAIL = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_MESSAGE_HINT
+     */
+    const PGSQL_DIAG_MESSAGE_HINT = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_STATEMENT_POSITION
+     */
+    const PGSQL_DIAG_STATEMENT_POSITION = UNKNOWN;
+#ifdef PG_DIAG_INTERNAL_POSITION
+    /**
+     * @var int
+     * @cvalue PG_DIAG_INTERNAL_POSITION
+     */
+    const PGSQL_DIAG_INTERNAL_POSITION = UNKNOWN;
+#endif
+#ifdef PG_DIAG_INTERNAL_QUERY
+    /**
+     * @var int
+     * @cvalue PG_DIAG_INTERNAL_QUERY
+     */
+    const PGSQL_DIAG_INTERNAL_QUERY = UNKNOWN;
+#endif
+    /**
+     * @var int
+     * @cvalue PG_DIAG_CONTEXT
+     */
+    const PGSQL_DIAG_CONTEXT = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SOURCE_FILE
+     */
+    const PGSQL_DIAG_SOURCE_FILE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SOURCE_LINE
+     */
+    const PGSQL_DIAG_SOURCE_LINE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SOURCE_FUNCTION
+     */
+    const PGSQL_DIAG_SOURCE_FUNCTION = UNKNOWN;
+#ifdef PG_DIAG_SCHEMA_NAME
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SCHEMA_NAME
+     */
+    const PGSQL_DIAG_SCHEMA_NAME = UNKNOWN;
+#endif
+#ifdef PG_DIAG_TABLE_NAME
+    /**
+     * @var int
+     * @cvalue PG_DIAG_TABLE_NAME
+     */
+    const PGSQL_DIAG_TABLE_NAME = UNKNOWN;
+#endif
+#ifdef PG_DIAG_COLUMN_NAME
+    /**
+     * @var int
+     * @cvalue PG_DIAG_COLUMN_NAME
+     */
+    const PGSQL_DIAG_COLUMN_NAME = UNKNOWN;
+#endif
+#ifdef PG_DIAG_DATATYPE_NAME
+    /**
+     * @var int
+     * @cvalue PG_DIAG_DATATYPE_NAME
+     */
+    const PGSQL_DIAG_DATATYPE_NAME = UNKNOWN;
+#endif
+#ifdef PG_DIAG_CONSTRAINT_NAME
+    /**
+     * @var int
+     * @cvalue PG_DIAG_CONSTRAINT_NAME
+     */
+    const PGSQL_DIAG_CONSTRAINT_NAME = UNKNOWN;
+#endif
+#ifdef PG_DIAG_SEVERITY_NONLOCALIZED
+    /**
+     * @var int
+     * @cvalue PG_DIAG_SEVERITY_NONLOCALIZED
+     */
+    const PGSQL_DIAG_SEVERITY_NONLOCALIZED = UNKNOWN;
+#endif
+
+    /* pg_convert options */
+
+    /**
+     * @var int
+     * @cvalue PGSQL_CONV_IGNORE_DEFAULT
+     */
+    const PGSQL_CONV_IGNORE_DEFAULT = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_CONV_FORCE_NULL
+     */
+    const PGSQL_CONV_FORCE_NULL = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_CONV_IGNORE_NOT_NULL
+     */
+    const PGSQL_CONV_IGNORE_NOT_NULL = UNKNOWN;
+
+    /* pg_insert/update/delete/select options */
+
+    /**
+     * @var int
+     * @cvalue PGSQL_DML_ESCAPE
+     */
+    const PGSQL_DML_ESCAPE = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_DML_NO_CONV
+     */
+    const PGSQL_DML_NO_CONV = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_DML_EXEC
+     */
+    const PGSQL_DML_EXEC = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_DML_ASYNC
+     */
+    const PGSQL_DML_ASYNC = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PGSQL_DML_STRING
+     */
+    const PGSQL_DML_STRING = UNKNOWN;
+#ifdef PQTRACE_SUPPPRESS_TIMESTAMPS
+    /**
+     * @var int
+     * @cvalue PQTRACE_SUPPRESS_TIMESTAMPS
+     */
+    const PGSQL_TRACE_SUPPRESS_TIMESTAMPS = UNKNOWN;
+#endif
+#ifdef PQTRACE_REGRESS_MODE
+    /**
+     * @var int
+     * @cvalue PQTRACE_REGRESS_MODE
+     */
+    const PGSQL_TRACE_REGRESS_MODE = UNKNOWN;
+#endif
+
+#ifdef HAVE_PG_CONTEXT_VISIBILITY
+    /* For pg_set_error_context_visibility() */
+
+    /**
+     * @var int
+     * @cvalue PQSHOW_CONTEXT_NEVER
+     */
+    const PGSQL_SHOW_CONTEXT_NEVER = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQSHOW_CONTEXT_ERRORS
+     */
+    const PGSQL_SHOW_CONTEXT_ERRORS = UNKNOWN;
+    /**
+     * @var int
+     * @cvalue PQSHOW_CONTEXT_ALWAYS
+     */
+    const PGSQL_SHOW_CONTEXT_ALWAYS = UNKNOWN;
+#endif
+
+    function pg_connect(string $connection_string, int $flags = 0): PgSql\Connection|false {}
+
+    function pg_pconnect(string $connection_string, int $flags = 0): PgSql\Connection|false {}
+
+    function pg_connect_poll(PgSql\Connection $connection): int {}
+
+    function pg_close(?PgSql\Connection $connection = null): true {}
+
+    /** @refcount 1 */
+    function pg_dbname(?PgSql\Connection $connection = null): string {}
+
+    function pg_last_error(?PgSql\Connection $connection = null): string {}
+
+    /**
+     * @alias pg_last_error
+     * @deprecated
+     */
+    function pg_errormessage(?PgSql\Connection $connection = null): string {}
+
+    /** @refcount 1 */
+    function pg_options(?PgSql\Connection $connection = null): string {}
+
+    /** @refcount 1 */
+    function pg_port(?PgSql\Connection $connection = null): string {}
+
+    /** @refcount 1 */
+    function pg_tty(?PgSql\Connection $connection = null): string {}
+
+    /** @refcount 1 */
+    function pg_host(?PgSql\Connection $connection = null): string {}
+
+    /**
+     * @return array<string, int|string|null>
+     * @refcount 1
+     */
+    function pg_version(?PgSql\Connection $connection = null): array {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_parameter_status($connection, string $name = UNKNOWN): string|false {}
+
+    function pg_ping(?PgSql\Connection $connection = null): bool {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_query($connection, string $query = UNKNOWN): PgSql\Result|false {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @alias pg_query
+     */
+    function pg_exec($connection, string $query = UNKNOWN): PgSql\Result|false {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @param string|array $query
+     * @refcount 1
+     */
+    function pg_query_params($connection, $query, array $params = UNKNOWN): PgSql\Result|false {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_prepare($connection, string $statement_name, string $query = UNKNOWN): PgSql\Result|false {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @param string|array $statement_name
+     * @refcount 1
+     */
+    function pg_execute($connection, $statement_name, array $params = UNKNOWN): PgSql\Result|false {}
+
+    function pg_num_rows(PgSql\Result $result): int {}
+
+    /**
+     * @alias pg_num_rows
+     * @deprecated
+     */
+    function pg_numrows(PgSql\Result $result): int {}
+
+    function pg_num_fields(PgSql\Result $result): int {}
+
+    /**
+     * @alias pg_num_fields
+     * @deprecated
+     */
+    function pg_numfields(PgSql\Result $result): int {}
+
+    function pg_affected_rows(PgSql\Result $result): int {}
+
+    /**
+     * @alias pg_affected_rows
+     * @deprecated
+     */
+    function pg_cmdtuples(PgSql\Result $result): int {}
+
+    function pg_last_notice(PgSql\Connection $connection, int $mode = PGSQL_NOTICE_LAST): array|string|bool {}
+
+    function pg_field_table(PgSql\Result $result, int $field, bool $oid_only = false): string|int|false {}
+
+    /** @refcount 1 */
+    function pg_field_name(PgSql\Result $result, int $field): string {}
+
+    /**
+     * @alias pg_field_name
+     * @deprecated
+     */
+    function pg_fieldname(PgSql\Result $result, int $field): string {}
+
+    function pg_field_size(PgSql\Result $result, int $field): int {}
+
+    /**
+     * @alias pg_field_size
+     * @deprecated
+     */
+    function pg_fieldsize(PgSql\Result $result, int $field): int {}
+
+    function pg_field_type(PgSql\Result $result, int $field): string {}
+
+    /**
+     * @alias pg_field_type
+     * @deprecated
+     */
+    function pg_fieldtype(PgSql\Result $result, int $field): string {}
+
+    /** @refcount 1 */
+    function pg_field_type_oid(PgSql\Result $result, int $field): string|int {}
+
+    function pg_field_num(PgSql\Result $result, string $field): int {}
+
+    /**
+     * @alias pg_field_num
+     * @deprecated
+     */
+    function pg_fieldnum(PgSql\Result $result, string $field): int {}
+
+    /**
+     * @param string|int|null $row
+     * @refcount 1
+     */
+    function pg_fetch_result(PgSql\Result $result, $row, string|int $field = UNKNOWN): string|false|null {}
+
+    /**
+     * @param string|int $row
+     * @alias pg_fetch_result
+     * @deprecated
+     */
+    function pg_result(PgSql\Result $result, $row, string|int $field = UNKNOWN): string|false|null {}
+
+    /**
+     * @return array<int|string, string|null>|false
+     * @refcount 1
+     */
+    function pg_fetch_row(PgSql\Result $result, ?int $row = null, int $mode = PGSQL_NUM): array|false {}
+
+    /**
+     * @return array<int|string, string|null>|false
+     * @refcount 1
+     */
+    function pg_fetch_assoc(PgSql\Result $result, ?int $row = null): array|false {}
+
+    /**
+     * @return array<int|string, string|null>|false
+     * @refcount 1
+     */
+    function pg_fetch_array(PgSql\Result $result, ?int $row = null, int $mode = PGSQL_BOTH): array|false {}
+
+    /** @refcount 1 */
+    function pg_fetch_object(PgSql\Result $result, ?int $row = null, string $class = "stdClass", array $constructor_args = []): object|false {}
+
+    /**
+     * @return array<int, array>
+     * @refcount 1
+     */
+    function pg_fetch_all(PgSql\Result $result, int $mode = PGSQL_ASSOC): array {}
+
+    /**
+     * @return array<int, string|null>
+     * @refcount 1
+     */
+    function pg_fetch_all_columns(PgSql\Result $result, int $field = 0): array {}
+
+    function pg_result_seek(PgSql\Result $result, int $row): bool {}
+
+    /** @param string|int|null $row */
+    function pg_field_prtlen(PgSql\Result $result, $row, string|int $field = UNKNOWN): int|false {}
+
+    /**
+     * @param string|int $row
+     * @deprecated
+     */
+    function pg_fieldprtlen(PgSql\Result $result, $row, string|int $field = UNKNOWN): int|false {}
+
+    /** @param string|int|null $row */
+    function pg_field_is_null(PgSql\Result $result, $row, string|int $field = UNKNOWN): int|false {}
+
+    /**
+     * @param string|int $row
+     * @deprecated
+     */
+    function pg_fieldisnull(PgSql\Result $result, $row, string|int $field = UNKNOWN): int|false {}
+
+    function pg_free_result(PgSql\Result $result): bool {}
+
+    /**
+     * @alias pg_free_result
+     * @deprecated
+     */
+    function pg_freeresult(PgSql\Result $result): bool {}
+
+    /** @refcount 1 */
+    function pg_last_oid(PgSql\Result $result): string|int|false {}
+
+    /**
+     * @alias pg_last_oid
+     * @deprecated
+     */
+    function pg_getlastoid(PgSql\Result $result): string|int|false {}
+
+    function pg_trace(string $filename, string $mode = "w", ?PgSql\Connection $connection = null, int $trace_mode = 0): bool {}
+
+    function pg_untrace(?PgSql\Connection $connection = null): true {}
+
+    /**
+     * @param PgSql\Connection $connection
+     * @param string|int $oid
+     * @refcount 1
+     */
+    function pg_lo_create($connection = UNKNOWN, $oid = UNKNOWN): string|int|false {}
+
+    /**
+     * @param PgSql\Connection $connection
+     * @param string|int $oid
+     * @alias pg_lo_create
+     * @deprecated
+     */
+    function pg_locreate($connection = UNKNOWN, $oid = UNKNOWN): string|int|false {}
+
+    /**
+     * @param PgSql\Connection $connection
+     * @param string|int $oid
+     */
+    function pg_lo_unlink($connection, $oid = UNKNOWN): bool {}
+
+    /**
+     * @param PgSql\Connection $connection
+     * @param string|int $oid
+     * @alias pg_lo_unlink
+     * @deprecated
+     */
+    function pg_lounlink($connection, $oid = UNKNOWN): bool {}
+
+    /**
+     * @param PgSql\Connection $connection
+     * @param string|int $oid
+     * @refcount 1
+     */
+    function pg_lo_open($connection, $oid = UNKNOWN, string $mode = UNKNOWN): PgSql\Lob|false {}
+
+    /**
+     * @param PgSql\Connection $connection
+     * @param string|int $oid
+     * @alias pg_lo_open
+     * @deprecated
+     */
+    function pg_loopen($connection, $oid = UNKNOWN, string $mode = UNKNOWN): PgSql\Lob|false {}
+
+    function pg_lo_close(PgSql\Lob $lob): bool {}
+
+    /**
+     * @alias pg_lo_close
+     * @deprecated
+     */
+    function pg_loclose(PgSql\Lob $lob): bool {}
+
+    /** @refcount 1 */
+    function pg_lo_read(PgSql\Lob $lob, int $length = 8192): string|false {}
+
+    /**
+     * @alias pg_lo_read
+     * @deprecated
+     */
+    function pg_loread(PgSql\Lob $lob, int $length = 8192): string|false {}
+
+    function pg_lo_write(PgSql\Lob $lob, string $data, ?int $length = null): int|false {}
+
+    /**
+     * @alias pg_lo_write
+     * @deprecated
+     */
+    function pg_lowrite(PgSql\Lob $lob, string $data, ?int $length = null): int|false {}
+
+    function pg_lo_read_all(PgSql\Lob $lob): int {}
+
+    /**
+     * @alias pg_lo_read_all
+     * @deprecated
+     */
+    function pg_loreadall(PgSql\Lob $lob): int {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @param string|int $filename
+     * @param string|int $oid
+     * @refcount 1
+     */
+    function pg_lo_import($connection, $filename = UNKNOWN, $oid = UNKNOWN): string|int|false {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @param string|int $filename
+     * @param string|int $oid
+     * @alias pg_lo_import
+     * @deprecated
+     */
+    function pg_loimport($connection, $filename = UNKNOWN, $oid = UNKNOWN): string|int|false {}
+
+    /**
+     * @param PgSql\Connection|string|int $connection
+     * @param string|int $oid
+     * @param string|int $filename
+     */
+    function pg_lo_export($connection, $oid = UNKNOWN, $filename = UNKNOWN): bool {}
+
+    /**
+     * @param PgSql\Connection|string|int $connection
+     * @param string|int $oid
+     * @param string|int $filename
+     * @alias pg_lo_export
+     * @deprecated
+     */
+    function pg_loexport($connection, $oid = UNKNOWN, $filename = UNKNOWN): bool {}
+
+    function pg_lo_seek(PgSql\Lob $lob, int $offset, int $whence = SEEK_CUR): bool {}
+
+    function pg_lo_tell(PgSql\Lob $lob): int {}
+
+    function pg_lo_truncate(PgSql\Lob $lob, int $size): bool {}
+
+    /** @param PgSql\Connection|int $connection */
+    function pg_set_error_verbosity($connection, int $verbosity = UNKNOWN): int|false {}
+
+    /** @param PgSql\Connection|string $connection */
+    function pg_set_client_encoding($connection, string $encoding = UNKNOWN): int {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @alias pg_set_client_encoding
+     * @deprecated
+     */
+    function pg_setclientencoding($connection, string $encoding = UNKNOWN): int {}
+
+    function pg_client_encoding(?PgSql\Connection $connection = null): string {}
+
+    /**
+     * @alias pg_client_encoding
+     * @deprecated
+     */
+    function pg_clientencoding(?PgSql\Connection $connection = null): string {}
+
+    function pg_end_copy(?PgSql\Connection $connection = null): bool {}
+
+    /** @param PgSql\Connection|string $connection */
+    function pg_put_line($connection, string $query = UNKNOWN): bool {}
+
+    /**
+     * @return array<int, string>|false
+     * @refcount 1
+     */
+    function pg_copy_to(PgSql\Connection $connection, string $table_name, string $separator = "\t", string $null_as = "\\\\N"): array|false {}
+
+    function pg_copy_from(PgSql\Connection $connection, string $table_name, array $rows, string $separator = "\t", string $null_as = "\\\\N"): bool {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_escape_string($connection, string $string = UNKNOWN): string {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_escape_bytea($connection, string $string = UNKNOWN): string {}
+
+    /** @refcount 1 */
+    function pg_unescape_bytea(string $string): string {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_escape_literal($connection, string $string = UNKNOWN): string|false {}
+
+    /**
+     * @param PgSql\Connection|string $connection
+     * @refcount 1
+     */
+    function pg_escape_identifier($connection, string $string = UNKNOWN): string|false {}
+
+    /** @refcount 1 */
+    function pg_result_error(PgSql\Result $result): string|false {}
+
+    /** @refcount 1 */
+    function pg_result_error_field(PgSql\Result $result, int $field_code): string|false|null {}
+
+    function pg_connection_status(PgSql\Connection $connection): int {}
+
+    function pg_transaction_status(PgSql\Connection $connection): int {}
+
+    function pg_connection_reset(PgSql\Connection $connection): bool {}
+
+    function pg_cancel_query(PgSql\Connection $connection): bool {}
+
+    function pg_connection_busy(PgSql\Connection $connection): bool {}
+
+    function pg_send_query(PgSql\Connection $connection, string $query): int|bool {}
+
+    function pg_send_query_params(PgSql\Connection $connection, string $query, array $params): int|bool {}
+
+    function pg_send_prepare(PgSql\Connection $connection, string $statement_name, string $query): int|bool {}
+
+    function pg_send_execute(PgSql\Connection $connection, string $statement_name, array $params): int|bool {}
+
+    /** @refcount 1 */
+    function pg_get_result(PgSql\Connection $connection): PgSql\Result|false {}
+
+    /** @refcount 1 */
+    function pg_result_status(PgSql\Result $result, int $mode = PGSQL_STATUS_LONG): string|int {}
+
+    /**
+     * @return array<int|string, int|string>
+     * @refcount 1
+     */
+    function pg_get_notify(PgSql\Connection $connection, int $mode = PGSQL_ASSOC): array|false {}
+
+    function pg_get_pid(PgSql\Connection $connection): int {}
+
+    /**
+     * @return resource|false
+     * @refcount 1
+     */
+    function pg_socket(PgSql\Connection $connection) {}
+
+    function pg_consume_input(PgSql\Connection $connection): bool {}
+
+    function pg_flush(PgSql\Connection $connection): int|bool {}
+
+    /**
+     * @return array<string, array>|false
+     * @refcount 1
+     */
+    function pg_meta_data(PgSql\Connection $connection, string $table_name, bool $extended = false): array|false {}
+
+    /**
+     * @return array<string, mixed>|false
+     * @refcount 1
+     */
+    function pg_convert(PgSql\Connection $connection, string $table_name, array $values, int $flags = 0): array|false {}
+
+    /** @refcount 1 */
+    function pg_insert(PgSql\Connection $connection, string $table_name, array $values, int $flags = PGSQL_DML_EXEC): PgSql\Result|string|bool {}
+
+    /** @refcount 1 */
+    function pg_update(PgSql\Connection $connection, string $table_name, array $values, array $conditions, int $flags = PGSQL_DML_EXEC): string|bool {}
+
+    /** @refcount 1 */
+    function pg_delete(PgSql\Connection $connection, string $table_name, array $conditions, int $flags = PGSQL_DML_EXEC): string|bool {}
+
+    /**
+     * @return array<int, array>|string|false
+     * @refcount 1
+     */
+    function pg_select(PgSql\Connection $connection, string $table_name, array $conditions = [], int $flags = PGSQL_DML_EXEC, int $mode = PGSQL_ASSOC): array|string|false {}
+
+#ifdef HAVE_PG_CONTEXT_VISIBILITY
+    function pg_set_error_context_visibility(PgSql\Connection $connection, int $visibility): int {}
+#endif
+}
+
+namespace PgSql {
+    /**
+     * @strict-properties
+     * @not-serializable
+     */
+    final class Connection
+    {
+    }
+
+    /**
+     * @strict-properties
+     * @not-serializable
+     */
+    final class Result
+    {
+    }
+
+    /**
+     * @strict-properties
+     * @not-serializable
+     */
+    final class Lob
+    {
+    }
+
+}
diff --git a/dev/tools/phan/stubs/restler.php b/dev/tools/phan/stubs/restler.php
new file mode 100644
index 00000000000..68dfd64b3a6
--- /dev/null
+++ b/dev/tools/phan/stubs/restler.php
@@ -0,0 +1,4958 @@
+<?php
+// phpcs:disable PEAR.Commenting,Generic.NamingConventions,PEAR.NamingConventions,Squiz.Scope.MethodScope.Missing
+namespace Luracast\Restler {
+	/**
+	 * Interface for the cache system that manages caching of given data
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iCache
+	{
+		/**
+		 * store data in the cache
+		 *
+		 * @abstract
+		 *
+		 * @param string $name
+		 * @param mixed  $data
+		 *
+		 * @return boolean true if successful
+		 */
+		public function set($name, $data);
+		/**
+		 * retrieve data from the cache
+		 *
+		 * @abstract
+		 *
+		 * @param string     $name
+		 * @param bool       $ignoreErrors
+		 *
+		 * @return mixed
+		 */
+		public function get($name, $ignoreErrors = false);
+		/**
+		 * delete data from the cache
+		 *
+		 * @abstract
+		 *
+		 * @param string     $name
+		 * @param bool       $ignoreErrors
+		 *
+		 * @return boolean true if successful
+		 */
+		public function clear($name, $ignoreErrors = false);
+		/**
+		 * check if the given name is cached
+		 *
+		 * @abstract
+		 *
+		 * @param string $name
+		 *
+		 * @return boolean true if cached
+		 */
+		public function isCached($name);
+	}
+	/**
+	 * Class ApcCache provides an APC based cache for Restler
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     Joel R. Simpson <joel.simpson@gmail.com>
+	 * @copyright  2013 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class ApcCache implements \Luracast\Restler\iCache
+	{
+		/**
+		 * The namespace that all of the cached entries will be stored under.  This allows multiple APIs to run concurrently.
+		 *
+		 * @var string
+		 */
+		public static $namespace = 'restler';
+		/**
+		 * store data in the cache
+		 *
+		 *
+		 * @param string $name
+		 * @param mixed $data
+		 *
+		 * @return boolean true if successful
+		 */
+		public function set($name, $data)
+		{
+		}
+		/**
+		 * retrieve data from the cache
+		 *
+		 *
+		 * @param string $name
+		 * @param bool $ignoreErrors
+		 *
+		 * @throws \Exception
+		 * @return mixed
+		 */
+		public function get($name, $ignoreErrors = false)
+		{
+		}
+		/**
+		 * delete data from the cache
+		 *
+		 *
+		 * @param string $name
+		 * @param bool $ignoreErrors
+		 *
+		 * @throws \Exception
+		 * @return boolean true if successful
+		 */
+		public function clear($name, $ignoreErrors = false)
+		{
+		}
+		/**
+		 * check if the given name is cached
+		 *
+		 *
+		 * @param string $name
+		 *
+		 * @return boolean true if cached
+		 */
+		public function isCached($name)
+		{
+		}
+	}
+	/**
+	 * Class that implements spl_autoload facilities and multiple
+	 * conventions support.
+	 * Supports composer libraries and 100% PSR-0 compliant.
+	 * In addition we enable namespace prefixing and class aliases.
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage Helper
+	 * @author     Nick Lombard <github@jigsoft.co.za>
+	 * @copyright  2012 Luracast
+	 *
+	 */
+	class AutoLoader
+	{
+		protected static $instance, $perfectLoaders, $rogueLoaders = array(), $classMap = array(), $aliases = array(
+			// aliases and prefixes instead of null list aliases
+			'Luracast\\Restler' => null,
+			'Luracast\\Restler\\Format' => null,
+			'Luracast\\Restler\\Data' => null,
+			'Luracast\\Restler\\Filter' => null,
+		);
+		/**
+		 * Singleton instance facility.
+		 *
+		 * @static
+		 * @return AutoLoader the current instance or new instance if none exists.
+		 */
+		public static function instance()
+		{
+		}
+		/**
+		 * Helper function to add a path to the include path.
+		 * AutoLoader uses the include path to discover classes.
+		 *
+		 * @static
+		 *
+		 * @param $path string absolute or relative path.
+		 *
+		 * @return bool false if the path cannot be resolved
+		 *              or the resolved absolute path.
+		 */
+		public static function addPath($path)
+		{
+		}
+		/**
+		 * Other autoLoaders interfere and cause duplicate class loading.
+		 * AutoLoader is capable enough to handle all standards so no need
+		 * for others stumbling about.
+		 *
+		 * @return callable the one true auto loader.
+		 */
+		public static function thereCanBeOnlyOne()
+		{
+		}
+		/**
+		 * Seen this before cache handler.
+		 * Facilitates both lookup and persist operations as well as convenience,
+		 * load complete map functionality. The key can only be given a non falsy
+		 * value once, this will be truthy for life.
+		 *
+		 * @param $key   mixed class name considered or a collection of
+		 *               classMap entries
+		 * @param $value mixed optional not required when doing a query on
+		 *               key. Default is false we haven't seen this
+		 *               class. Most of the time it will be the filename
+		 *               for include and is set to true if we are unable
+		 *               to load this class iow true == it does not exist.
+		 *               value may also be a callable auto loader function.
+		 *
+		 * @return mixed The known value for the key or false if key has no value
+		 */
+		public static function seen($key, $value = false)
+		{
+		}
+		/**
+		 * Protected constructor to enforce singleton pattern.
+		 * Populate a default include path.
+		 * All possible includes cant possibly be catered for and if you
+		 * require another path then simply add it calling set_include_path.
+		 */
+		protected function __construct()
+		{
+		}
+		/**
+		 * Auto loader callback through __invoke object as function.
+		 *
+		 * @param $className string class/interface name to auto load
+		 *
+		 * @return mixed|null the reference from the include or null
+		 */
+		public function __invoke($className)
+		{
+		}
+	}
+	/**
+	 * Parses the PHPDoc comments for metadata. Inspired by `Documentor` code base.
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage Helper
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class CommentParser
+	{
+		/**
+		 * name for the embedded data
+		 *
+		 * @var string
+		 */
+		public static $embeddedDataName = 'properties';
+		/**
+		 * Regular Expression pattern for finding the embedded data and extract
+		 * the inner information. It is used with preg_match.
+		 *
+		 * @var string
+		 */
+		public static $embeddedDataPattern = '/```(\\w*)[\\s]*(([^`]*`{0,2}[^`]+)*)```/ms';
+		/**
+		 * Pattern will have groups for the inner details of embedded data
+		 * this index is used to locate the data portion.
+		 *
+		 * @var int
+		 */
+		public static $embeddedDataIndex = 2;
+		/**
+		 * Delimiter used to split the array data.
+		 *
+		 * When the name portion is of the embedded data is blank auto detection
+		 * will be used and if URLEncodedFormat is detected as the data format
+		 * the character specified will be used as the delimiter to find split
+		 * array data.
+		 *
+		 * @var string
+		 */
+		public static $arrayDelimiter = ',';
+		/**
+		 * @var array annotations that support array value
+		 */
+		public static $allowsArrayValue = array('choice' => true, 'select' => true, 'properties' => true);
+		/**
+		 * character sequence used to escape \@
+		 */
+		const escapedAtChar = '\\@';
+		/**
+		 * character sequence used to escape end of comment
+		 */
+		const escapedCommendEnd = '{@*}';
+		/**
+		 * Instance of Restler class injected at runtime.
+		 *
+		 * @var Restler
+		 */
+		public $restler;
+		/**
+		 * Parse the comment and extract the data.
+		 *
+		 * @static
+		 *
+		 * @param      $comment
+		 * @param bool $isPhpDoc
+		 *
+		 * @return array associative array with the extracted values
+		 */
+		public static function parse($comment, $isPhpDoc = true)
+		{
+		}
+		/**
+		 * Removes the comment tags from each line of the comment.
+		 *
+		 * @static
+		 *
+		 * @param string $comment PhpDoc style comment
+		 *
+		 * @return string comments with out the tags
+		 */
+		public static function removeCommentTags($comment)
+		{
+		}
+	}
+}
+namespace {
+	/**
+	 * Interface iAuthenticate only exists for compatibility mode for Restler 2 and below, it should
+	 * not be used otherwise.
+	 */
+	interface iAuthenticate
+	{
+		public function __isAuthenticated();
+	}
+}
+namespace Luracast\Restler {
+	/**
+	 * Interface for composing response
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage result
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iCompose
+	{
+		/**
+		 * Result of an api call is passed to this method
+		 * to create a standard structure for the data
+		 *
+		 * @param mixed $result can be a primitive or array or object
+		 */
+		public function response($result);
+		/**
+		 * When the api call results in RestException this method
+		 * will be called to return the error message
+		 *
+		 * @param RestException $exception exception that has reasons for failure
+		 *
+		 * @return
+		 */
+		public function message(\Luracast\Restler\RestException $exception);
+	}
+	/**
+	 * Default Composer to provide standard structure for all HTTP responses
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage result
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Compose implements \Luracast\Restler\iCompose
+	{
+		/**
+		 * @var bool When restler is not running in production mode, this value will
+		 * be checked to include the debug information on error response
+		 */
+		public static $includeDebugInfo = true;
+		/**
+		 * Current Restler instance
+		 * Injected at runtime
+		 *
+		 * @var Restler
+		 */
+		public $restler;
+		/**
+		 * Result of an api call is passed to this method
+		 * to create a standard structure for the data
+		 *
+		 * @param mixed $result can be a primitive or array or object
+		 *
+		 * @return mixed
+		 */
+		public function response($result)
+		{
+		}
+		/**
+		 * When the api call results in RestException this method
+		 * will be called to return the error message
+		 *
+		 * @param RestException $exception exception that has reasons for failure
+		 *
+		 * @return array
+		 */
+		public function message(\Luracast\Restler\RestException $exception)
+		{
+		}
+	}
+}
+namespace Luracast\Restler\Data {
+	/**
+	 * Restler is using many ValueObjects across to make it easy for the developers
+	 * to use them with the help of code hinting etc.,
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iValueObject
+	{
+		/**
+		 * This static method is called for creating an instance of the class by
+		 * passing the initiation values as an array.
+		 *
+		 * @static
+		 * @abstract
+		 *
+		 * @param array $properties
+		 *
+		 * @return iValueObject
+		 */
+		public static function __set_state(array $properties);
+		/**
+		 * This method provides a string representation for the instance
+		 *
+		 * @return string
+		 */
+		public function __toString();
+	}
+	/**
+	 * ValueObject base class, you may use this class to create your
+	 * iValueObjects quickly
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class ValueObject implements \Luracast\Restler\Data\iValueObject
+	{
+		public function __toString()
+		{
+		}
+		public static function __set_state(array $properties)
+		{
+		}
+		public function __toArray()
+		{
+		}
+	}
+	/**
+	 * ValueObject for api method info. All needed information about a api method
+	 * is stored here
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class ApiMethodInfo extends \Luracast\Restler\Data\ValueObject
+	{
+		/**
+		 * @var string target url
+		 */
+		public $url;
+		/**
+		 * @var string
+		 */
+		public $className;
+		/**
+		 * @var string
+		 */
+		public $methodName;
+		/**
+		 * @var array parameters to be passed to the api method
+		 */
+		public $parameters = array();
+		/**
+		 * @var array information on parameters in the form of array(name => index)
+		 */
+		public $arguments = array();
+		/**
+		 * @var array default values for parameters if any
+		 * in the form of array(index => value)
+		 */
+		public $defaults = array();
+		/**
+		 * @var array key => value pair of method meta information
+		 */
+		public $metadata = array();
+		/**
+		 * @var int access level
+		 * 0 - @public - available for all
+		 * 1 - @hybrid - both public and protected (enhanced info for authorized)
+		 * 2 - @protected comment - only for authenticated users
+		 * 3 - protected method - only for authenticated users
+		 */
+		public $accessLevel = 0;
+	}
+	/**
+	 * Convenience class for Array manipulation
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Arr
+	{
+		/**
+		 * Deep copy given array
+		 *
+		 * @param array $arr
+		 *
+		 * @return array
+		 */
+		public static function copy(array $arr)
+		{
+		}
+	}
+	/**
+	 * Invalid Exception
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Invalid extends \Exception
+	{
+	}
+	/**
+	 * Validation classes should implement this interface
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iValidate
+	{
+		/**
+		 * method used for validation.
+		 *
+		 * @param mixed $input
+		 *            data that needs to be validated
+		 * @param ValidationInfo $info
+		 *            information to be used for validation
+		 * @return boolean false in case of failure or fixed value in the expected
+		 *         type
+		 * @throws \Luracast\Restler\RestException 400 with information about the
+		 * failed
+		 * validation
+		 */
+		public static function validate($input, \Luracast\Restler\Data\ValidationInfo $info);
+	}
+	/**
+	 * Convenience class that converts the given object
+	 * in to associative array
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Obj
+	{
+		/**
+		 * @var bool|string|callable
+		 */
+		public static $stringEncoderFunction = false;
+		/**
+		 * @var bool|string|callable
+		 */
+		public static $numberEncoderFunction = false;
+		/**
+		 * @var array key value pairs for fixing value types using functions.
+		 * For example
+		 *
+		 *      'id'=>'intval'      will make sure all values of the id properties
+		 *                          will be converted to integers intval function
+		 *      'password'=> null   will remove all the password entries
+		 */
+		public static $fix = array();
+		/**
+		 * @var string character that is used to identify sub objects
+		 *
+		 * For example
+		 *
+		 * when Object::$separatorChar = '.';
+		 *
+		 * array('my.object'=>true) will result in
+		 *
+		 * array(
+		 *    'my'=>array('object'=>true)
+		 * );
+		 */
+		public static $separatorChar = null;
+		/**
+		 * @var bool set it to true when empty arrays, blank strings, null values
+		 * to be automatically removed from response
+		 */
+		public static $removeEmpty = false;
+		/**
+		 * @var bool set it to true to remove all null values from the result
+		 */
+		public static $removeNull = false;
+		/**
+		 * Convenience function that converts the given object
+		 * in to associative array
+		 *
+		 * @static
+		 *
+		 * @param mixed $object                          that needs to be converted
+		 *
+		 * @param bool  $forceObjectTypeWhenEmpty        when set to true outputs
+		 *                                               actual type  (array or
+		 *                                               object) rather than
+		 *                                               always an array when the
+		 *                                               array/object is empty
+		 *
+		 * @return array
+		 */
+		public static function toArray($object, $forceObjectTypeWhenEmpty = false)
+		{
+		}
+		public function __get($name)
+		{
+		}
+		public function __set($name, $function)
+		{
+		}
+		public function __isset($name)
+		{
+		}
+		public function __unset($name)
+		{
+		}
+	}
+	/**
+	 * Convenience class for String manipulation
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Text
+	{
+		/**
+		 * Given haystack contains the needle or not?
+		 *
+		 * @param string $haystack
+		 * @param string $needle
+		 * @param bool $caseSensitive
+		 *
+		 * @return bool
+		 */
+		public static function contains($haystack, $needle, $caseSensitive = true)
+		{
+		}
+		/**
+		 * Given haystack begins with the needle or not?
+		 *
+		 * @param string $haystack
+		 * @param string $needle
+		 *
+		 * @return bool
+		 */
+		public static function beginsWith($haystack, $needle)
+		{
+		}
+		/**
+		 * Given haystack ends with the needle or not?
+		 *
+		 * @param string $haystack
+		 * @param string $needle
+		 *
+		 * @return bool
+		 */
+		public static function endsWith($haystack, $needle)
+		{
+		}
+		/**
+		 * Convert camelCased or underscored string in to a title
+		 *
+		 * @param string $name
+		 *
+		 * @return string
+		 */
+		public static function title($name)
+		{
+		}
+		/**
+		 * Convert given string to be used as a slug or css class
+		 *
+		 * @param string $name
+		 * @return string
+		 */
+		public static function slug($name)
+		{
+		}
+	}
+	/**
+	 * ValueObject for validation information. An instance is created and
+	 * populated by Restler to pass it to iValidate implementing classes for
+	 * validation
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class ValidationInfo implements \Luracast\Restler\Data\iValueObject
+	{
+		/**
+		 * @var mixed given value for the parameter
+		 */
+		public $value;
+		/**
+		 * @var string proper name for given parameter
+		 */
+		public $label;
+		/**
+		 * @var string html element that can be used to represent the parameter for
+		 *             input
+		 */
+		public $field;
+		/**
+		 * @var mixed default value for the parameter
+		 */
+		public $default;
+		/**
+		 * Name of the variable being validated
+		 *
+		 * @var string variable name
+		 */
+		public $name;
+		/**
+		 * @var bool is it required or not
+		 */
+		public $required;
+		/**
+		 * @var string body or header or query where this parameter is coming from
+		 * in the http request
+		 */
+		public $from;
+		/**
+		 * Data type of the variable being validated.
+		 * It will be mostly string
+		 *
+		 * @var string|array multiple types are specified it will be of
+		 *      type array otherwise it will be a string
+		 */
+		public $type;
+		/**
+		 * When the type is array, this field is used to define the type of the
+		 * contents of the array
+		 *
+		 * @var string|null when all the items in an array are of certain type, we
+		 * can set this property. It will be null if the items can be of any type
+		 */
+		public $contentType;
+		/**
+		 * Should we attempt to fix the value?
+		 * When set to false validation class should throw
+		 * an exception or return false for the validate call.
+		 * When set to true it will attempt to fix the value if possible
+		 * or throw an exception or return false when it cant be fixed.
+		 *
+		 * @var boolean true or false
+		 */
+		public $fix = false;
+		/**
+		 * @var array of children to be validated
+		 */
+		public $children = null;
+		// ==================================================================
+		//
+		// VALUE RANGE
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Given value should match one of the values in the array
+		 *
+		 * @var array of choices to match to
+		 */
+		public $choice;
+		/**
+		 * If the type is string it will set the lower limit for length
+		 * else will specify the lower limit for the value
+		 *
+		 * @var number minimum value
+		 */
+		public $min;
+		/**
+		 * If the type is string it will set the upper limit limit for length
+		 * else will specify the upper limit for the value
+		 *
+		 * @var number maximum value
+		 */
+		public $max;
+		// ==================================================================
+		//
+		// REGEX VALIDATION
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * RegEx pattern to match the value
+		 *
+		 * @var string regular expression
+		 */
+		public $pattern;
+		// ==================================================================
+		//
+		// CUSTOM VALIDATION
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Rules specified for the parameter in the php doc comment.
+		 * It is passed to the validation method as the second parameter
+		 *
+		 * @var array custom rule set
+		 */
+		public $rules;
+		/**
+		 * Specifying a custom error message will override the standard error
+		 * message return by the validator class
+		 *
+		 * @var string custom error response
+		 */
+		public $message;
+		// ==================================================================
+		//
+		// METHODS
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Name of the method to be used for validation.
+		 * It will be receiving two parameters $input, $rules (array)
+		 *
+		 * @var string validation method name
+		 */
+		public $method;
+		/**
+		 * Instance of the API class currently being called. It will be null most of
+		 * the time. Only when method is defined it will contain an instance.
+		 * This behavior is for lazy loading of the API class
+		 *
+		 * @var null|object will be null or api class instance
+		 */
+		public $apiClassInstance = null;
+		public static function numericValue($value)
+		{
+		}
+		public static function arrayValue($value)
+		{
+		}
+		public static function stringValue($value, $glue = ',')
+		{
+		}
+		public static function booleanValue($value)
+		{
+		}
+		public static function filterArray(array $data, $keepNumericKeys)
+		{
+		}
+		public function __toString()
+		{
+		}
+		public function __construct(array $info)
+		{
+		}
+		/**
+		 * Magic Method used for creating instance at run time
+		 */
+		public static function __set_state(array $info)
+		{
+		}
+	}
+	/**
+	 * Default Validator class used by Restler. It can be replaced by any
+	 * iValidate implementing class by setting Defaults::$validatorClass
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Validator implements \Luracast\Restler\Data\iValidate
+	{
+		public static $holdException = false;
+		public static $exceptions = array();
+		public static $preFilters = array(
+			//'*'            => 'some_global_filter', //applied to all parameters
+			'string' => 'trim',
+		);
+		/**
+		 * Validate alphabetic characters.
+		 *
+		 * Check that given value contains only alphabetic characters.
+		 *
+		 * @param                $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 *
+		 * @throws Invalid
+		 */
+		public static function alpha($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate UUID strings.
+		 *
+		 * Check that given value contains only alpha numeric characters and the length is 36 chars.
+		 *
+		 * @param                $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 *
+		 * @throws Invalid
+		 */
+		public static function uuid($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate alpha numeric characters.
+		 *
+		 * Check that given value contains only alpha numeric characters.
+		 *
+		 * @param                $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 *
+		 * @throws Invalid
+		 */
+		public static function alphanumeric($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate printable characters.
+		 *
+		 * Check that given value contains only printable characters.
+		 *
+		 * @param                $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 *
+		 * @throws Invalid
+		 */
+		public static function printable($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate hexadecimal digits.
+		 *
+		 * Check that given value contains only hexadecimal digits.
+		 *
+		 * @param                $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 *
+		 * @throws Invalid
+		 */
+		public static function hex($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Color specified as hexadecimals
+		 *
+		 * Check that given value contains only color.
+		 *
+		 * @param                     $input
+		 * @param ValidationInfo|null $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function color($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate Telephone number
+		 *
+		 * Check if the given value is numeric with or without a `+` prefix
+		 *
+		 * @param                $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 *
+		 * @throws Invalid
+		 */
+		public static function tel($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate Email
+		 *
+		 * Check if the given string is a valid email
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function email($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate IP Address
+		 *
+		 * Check if the given string is a valid ip address
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function ip($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate Url
+		 *
+		 * Check if the given string is a valid url
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function url($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * MySQL Date
+		 *
+		 * Check if the given string is a valid date in YYYY-MM-DD format
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function date($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * MySQL DateTime
+		 *
+		 * Check if the given string is a valid date and time in YYY-MM-DD HH:MM:SS format
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function datetime($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Alias for Time
+		 *
+		 * Check if the given string is a valid time in HH:MM:SS format
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function time24($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Time
+		 *
+		 * Check if the given string is a valid time in HH:MM:SS format
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function time($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Time in 12 hour format
+		 *
+		 * Check if the given string is a valid time 12 hour format
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return string
+		 * @throws Invalid
+		 */
+		public static function time12($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Unix Timestamp
+		 *
+		 * Check if the given value is a valid timestamp
+		 *
+		 * @param String         $input
+		 * @param ValidationInfo $info
+		 *
+		 * @return int
+		 * @throws Invalid
+		 */
+		public static function timestamp($input, \Luracast\Restler\Data\ValidationInfo $info = null)
+		{
+		}
+		/**
+		 * Validate the given input
+		 *
+		 * Validates the input and attempts to fix it when fix is requested
+		 *
+		 * @param mixed          $input
+		 * @param ValidationInfo $info
+		 * @param null           $full
+		 *
+		 * @throws \Exception
+		 * @return array|bool|float|int|mixed|null|number|string
+		 */
+		public static function validate($input, \Luracast\Restler\Data\ValidationInfo $info, $full = null)
+		{
+		}
+	}
+}
+namespace Luracast\Restler {
+	/**
+	 * Static class to hold all restler defaults, change the values to suit your
+	 * needs in the gateway file (index.php), you may also allow the api users to
+	 * change them per request by adding the properties to Defaults::$overridables
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Defaults
+	{
+		// ==================================================================
+		//
+		// Class Mappings
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var string of name of the class that implements
+		 * \Luracast\Restler\iCache the cache class to be used
+		 */
+		public static $cacheClass = 'Luracast\\Restler\\HumanReadableCache';
+		/**
+		 * @var string full path of the directory where all the generated files will
+		 * be kept. When set to null (default) it will use the cache folder that is
+		 * in the same folder as index.php (gateway)
+		 */
+		public static $cacheDirectory;
+		/**
+		 * @var string of name of the class that implements
+		 * \Luracast\Restler\Data\iValidate the validator class to be used
+		 */
+		public static $validatorClass = 'Luracast\\Restler\\Data\\Validator';
+		/**
+		 * @var string name of the class that implements \Luracast\Restler\iCompose
+		 * the class to be used to compose the response
+		 */
+		public static $composeClass = 'Luracast\\Restler\\Compose';
+		// ==================================================================
+		//
+		// Routing
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var bool should auto routing for public and protected api methods
+		 * should be enabled by default or not. Set this to false to get
+		 * Restler 1.0 style behavior
+		 */
+		public static $autoRoutingEnabled = true;
+		/**
+		 * @var boolean avoids creating multiple routes that can increase the
+		 * ambiguity when set to true. when a method parameter is optional it is
+		 * not mapped to the url and should only be used in request body or as
+		 * query string `/resource?id=value`. When a parameter is required and is
+		 * scalar, it will be mapped as part of the url `/resource/{id}`
+		 */
+		public static $smartAutoRouting = true;
+		/**
+		 * @var boolean enables more ways of finding the parameter data in the request.
+		 * If you need backward compatibility with Restler 2 or below turn this off
+		 */
+		public static $smartParameterParsing = true;
+		// ==================================================================
+		//
+		// API Version Management
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var null|string name that is used for vendor specific media type and
+		 * api version using the Accept Header for example
+		 * application/vnd.{vendor}-v1+json
+		 *
+		 * Keep this null if you do not want to use vendor MIME for specifying api version
+		 */
+		public static $apiVendor = null;
+		/**
+		 * @var bool set it to true to force vendor specific MIME for versioning.
+		 * It will be automatically set to true when Defaults::$vendor is not
+		 * null and client is requesting for the custom MIME type
+		 */
+		public static $useVendorMIMEVersioning = false;
+		/**
+		 * @var bool set it to true to use enableUrl based versioning
+		 */
+		public static $useUrlBasedVersioning = false;
+		// ==================================================================
+		//
+		// Request
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var string name to be used for the method parameter to capture the
+		 *             entire request data
+		 */
+		public static $fullRequestDataName = 'request_data';
+		/**
+		 * @var string name of the property that can sent through $_GET or $_POST to
+		 *             override the http method of the request. Set it to null or
+		 *             blank string to disable http method override through request
+		 *             parameters.
+		 */
+		public static $httpMethodOverrideProperty = 'http_method';
+		/**
+		 * @var bool should auto validating api parameters should be enabled by
+		 *           default or not. Set this to false to avoid validation.
+		 */
+		public static $autoValidationEnabled = true;
+		/**
+		 * @var string name of the class that implements iUser interface to identify
+		 *             the user for caching purposes
+		 */
+		public static $userIdentifierClass = 'Luracast\\Restler\\User';
+		// ==================================================================
+		//
+		// Response
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var bool HTTP status codes are set on all responses by default.
+		 * Some clients (like flash, mobile) have trouble dealing with non-200
+		 * status codes on error responses.
+		 *
+		 * You can set it to true to force a HTTP 200 status code on all responses,
+		 * even when errors occur. If you suppress status codes, look for an error
+		 * response to determine if an error occurred.
+		 */
+		public static $suppressResponseCode = false;
+		public static $supportedCharsets = array('utf-8', 'iso-8859-1');
+		public static $supportedLanguages = array('en', 'en-US');
+		public static $charset = 'utf-8';
+		public static $language = 'en';
+		/**
+		 * @var bool when set to true, it will exclude the response body
+		 */
+		public static $emptyBodyForNullResponse = true;
+		/**
+		 * @var bool when set to true, the response will not be outputted directly into the buffer.
+		 * If set, Restler::handle() will return the response as a string.
+		 */
+		public static $returnResponse = false;
+		/**
+		 * @var bool enables CORS support
+		 */
+		public static $crossOriginResourceSharing = false;
+		public static $accessControlAllowOrigin = '*';
+		public static $accessControlAllowMethods = 'GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD';
+		// ==================================================================
+		//
+		// Header
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var array default Cache-Control template that used to set the
+		 * Cache-Control header and has two values, first one is used when
+		 * Defaults::$headerExpires is 0 and second one when it has some time
+		 * value specified. When only one value is specified it will be used for
+		 * both cases
+		 */
+		public static $headerCacheControl = array(
+			'no-cache, must-revalidate',
+			/* "public, " or "private, " will be prepended based on api method
+			 * called (public or protected)
+			 */
+			'max-age={expires}, must-revalidate',
+		);
+		/**
+		 * @var int sets the content to expire immediately when set to zero
+		 * alternatively you can specify the number of seconds the content will
+		 * expire. This setting can be altered at api level using php doc comment
+		 * with @expires numOfSeconds
+		 */
+		public static $headerExpires = 0;
+		// ==================================================================
+		//
+		// Access Control
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var null|callable if the api methods are under access control mechanism
+		 * you can attach a function here that returns true or false to determine
+		 * visibility of a protected api method. this function will receive method
+		 * info as the only parameter.
+		 */
+		public static $accessControlFunction = null;
+		/**
+		 * @var int set the default api access mode
+		 *      value of 0 = public api
+		 *      value of 1 = hybrid api using `@access hybrid` comment
+		 *      value of 2 = protected api using `@access protected` comment
+		 *      value of 3 = protected api using `protected function` method
+		 */
+		public static $apiAccessLevel = 0;
+		/**
+		 * @var string authentication method to be called in iAuthenticate
+		 * Interface
+		 */
+		public static $authenticationMethod = '__isAllowed';
+		/**
+		 * @var int time in milliseconds for bandwidth throttling,
+		 * which is the minimum response time for each api request. You can
+		 * change it per api method by setting `@throttle 3000` in php doc
+		 * comment either at the method level or class level
+		 */
+		public static $throttle = 0;
+		// ==================================================================
+		//
+		// Overrides for API User
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var array use 'alternativeName'=> 'actualName' to set alternative
+		 * names that can be used to represent the api method parameters and/or
+		 * static properties of Defaults
+		 */
+		public static $aliases = array(
+			/**
+			 * suppress_response_codes=true as an URL parameter to force
+			 * a HTTP 200 status code on all responses
+			 */
+			'suppress_response_codes' => 'suppressResponseCode',
+		);
+		/**
+		 * @var array determines the defaults that can be overridden by the api
+		 * user by passing them as URL parameters
+		 */
+		public static $overridables = array('suppressResponseCode');
+		/**
+		 * @var array contains validation details for defaults to be used when
+		 * set through URL parameters
+		 */
+		public static $validation = array('suppressResponseCode' => array('type' => 'bool'), 'headerExpires' => array('type' => 'int', 'min' => 0));
+		// ==================================================================
+		//
+		// Overrides API Developer
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * @var array determines what are the phpdoc comment tags that will
+		 * override the Defaults here with their values
+		 */
+		public static $fromComments = array(
+			/**
+			 * use PHPDoc comments such as the following
+			 * `
+			 *
+			 * @cache no-cache, must-revalidate` to set the Cache-Control header
+			 *        for a specific api method
+			 */
+			'cache' => 'headerCacheControl',
+			/**
+			 * use PHPDoc comments such as the following
+			 * `
+			 *
+			 * @expires 50` to set the Expires header
+			 *          for a specific api method
+			 */
+			'expires' => 'headerExpires',
+			/**
+			 * use PHPDoc comments such as the following
+			 * `
+			 *
+			 * @throttle 300`
+			 *           to set the bandwidth throttling for 300 milliseconds
+			 *           for a specific api method
+			 */
+			'throttle' => 'throttle',
+			/**
+			 * enable or disable smart auto routing from method comments
+			 * this one is hardwired so cant be turned off
+			 * it is placed here just for documentation purpose
+			 */
+			'smart-auto-routing' => 'smartAutoRouting',
+		);
+		// ==================================================================
+		//
+		// Util
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Use this method to set value to a static properly of Defaults when
+		 * you want to make sure only proper values are taken in with the help of
+		 * validation
+		 *
+		 * @static
+		 *
+		 * @param string $name  name of the static property
+		 * @param mixed  $value value to set the property to
+		 *
+		 * @return bool
+		 */
+		public static function setProperty($name, $value)
+		{
+		}
+	}
+	class EventDispatcher
+	{
+		protected static $_waitList = array();
+		public static $self;
+		protected $events = array();
+		public function __construct()
+		{
+		}
+		public static function __callStatic($eventName, $params)
+		{
+		}
+		public function __call($eventName, $params)
+		{
+		}
+		public static function addListener($eventName, \Closure $callback)
+		{
+		}
+		public function on(array $eventHandlers)
+		{
+		}
+		/**
+		 * Fire an event to notify all listeners
+		 *
+		 * @param string $eventName name of the event
+		 * @param array  $params    event related data
+		 */
+		protected function dispatch($eventName, array $params = array())
+		{
+		}
+	}
+	/**
+	 * Interface iProvideMultiVersionApi
+	 * @package Luracast\Restler
+	 *
+	 *
+	 */
+	interface iProvideMultiVersionApi
+	{
+		/**
+		 * Maximum api version supported by the api class
+		 * @return int
+		 */
+		public static function __getMaximumSupportedVersion();
+	}
+	/**
+	 * Class Explorer
+	 *
+	 * @package Luracast\Restler
+	 *
+	 * @access  hybrid
+	 * @version 3.0.0rc6
+	 */
+	class Explorer implements \Luracast\Restler\iProvideMultiVersionApi
+	{
+		const SWAGGER = '2.0';
+		/**
+		 * @var array http schemes supported. http or https or both http and https
+		 */
+		public static $schemes = array();
+		/**
+		 * @var bool should protected resources be shown to unauthenticated users?
+		 */
+		public static $hideProtected = true;
+		/**
+		 * @var bool should we use format as extension?
+		 */
+		public static $useFormatAsExtension = true;
+		/*
+		 * @var bool can we accept scalar values (string, int, float etc) as the request body?
+		 */
+		public static $allowScalarValueOnRequestBody = false;
+		/**
+		 * @var array all http methods specified here will be excluded from
+		 * documentation
+		 */
+		public static $excludedHttpMethods = array('OPTIONS');
+		/**
+		 * @var array all paths beginning with any of the following will be excluded
+		 * from documentation
+		 */
+		public static $excludedPaths = array();
+		/**
+		 * @var bool
+		 */
+		public static $placeFormatExtensionBeforeDynamicParts = true;
+		/**
+		 * @var bool should we group all the operations with the same url or not
+		 */
+		public static $groupOperations = false;
+		/**
+		 * @var string class that holds metadata as static properties
+		 */
+		public static $infoClass = 'Luracast\\Restler\\ExplorerInfo';
+		/**
+		 * Injected at runtime
+		 *
+		 * @var Restler instance of restler
+		 */
+		public $restler;
+		/**
+		 * @var string when format is not used as the extension this property is
+		 * used to set the extension manually
+		 */
+		public $formatString = '';
+		/**
+		 * @var array type mapping for converting data types to JSON-Schema Draft 4
+		 * Which is followed by swagger 1.2 spec
+		 */
+		public static $dataTypeAlias = array(
+			//'string' => 'string',
+			'int' => 'integer',
+			'number' => 'number',
+			'float' => array('number', 'float'),
+			'bool' => 'boolean',
+			//'boolean' => 'boolean',
+			//'NULL' => 'null',
+			'array' => 'array',
+			//'object' => 'object',
+			'stdClass' => 'object',
+			'mixed' => 'string',
+			'date' => array('string', 'date'),
+			'datetime' => array('string', 'date-time'),
+		);
+		/**
+		 * @var array configurable symbols to differentiate public, hybrid and
+		 * protected api
+		 */
+		public static $apiDescriptionSuffixSymbols = array(
+			0 => ' 🔓',
+			//'&nbsp; <i class="fa fa-lg fa-unlock-alt"></i>', //public api
+			1 => ' ◑',
+			//'&nbsp; <i class="fa fa-lg fa-adjust"></i>', //hybrid api
+			2 => ' 🔐',
+		);
+		protected $models = array();
+		/**
+		 * @var bool|stdClass
+		 */
+		protected $_fullDataRequested = false;
+		protected $crud = array('POST' => 'create', 'GET' => 'retrieve', 'PUT' => 'update', 'DELETE' => 'delete', 'PATCH' => 'partial update');
+		protected static $prefixes = array('get' => 'retrieve', 'index' => 'list', 'post' => 'create', 'put' => 'update', 'patch' => 'modify', 'delete' => 'remove');
+		protected $_authenticated = false;
+		protected $cacheName = '';
+		/**
+		 * Serve static files for exploring
+		 *
+		 * Serves explorer html, css, and js files
+		 *
+		 * @url GET *
+		 */
+		public function get()
+		{
+		}
+		/**
+		 * @return stdClass
+		 */
+		public function swagger()
+		{
+		}
+		/**
+		 * Maximum api version supported by the api class
+		 * @return int
+		 */
+		public static function __getMaximumSupportedVersion()
+		{
+		}
+	}
+	/**
+	 * Class ExplorerInfo
+	 * @package    Luracast\Restler
+	 *
+	 * @version    3.0.0rc6
+	 */
+	class ExplorerInfo
+	{
+		public static $title = 'Restler API Explorer';
+		public static $description = 'Live API Documentation';
+		public static $termsOfService = null;
+		public static $contact = array('name' => 'Restler Support', 'url' => 'luracast.com/products/restler', 'email' => 'arul@luracast.com');
+		public static $license = array('name' => 'LGPL-2.1', 'url' => 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html');
+	}
+	/**
+	 * Interface for creating classes that perform authentication/access
+	 * verification
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage auth
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iFilter
+	{
+		/**
+		 * Access verification method.
+		 *
+		 * API access will be denied when this method returns false
+		 *
+		 * @abstract
+		 * @return boolean true when api access is allowed false otherwise
+		 */
+		public function __isAllowed();
+	}
+	/**
+	 * Api classes or filter classes can implement this interface to know about
+	 * authentication status
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iUseAuthentication
+	{
+		/**
+		 * This method will be called first for filter classes and api classes so
+		 * that they can respond accordingly for filer method call and api method
+		 * calls
+		 *
+		 * @abstract
+		 *
+		 * @param bool $isAuthenticated passes true when the authentication is
+		 * done false otherwise
+		 *
+		 * @return mixed
+		 */
+		public function __setAuthenticationStatus($isAuthenticated = false);
+	}
+}
+namespace Luracast\Restler\Filter {
+	/**
+	 * Describe the purpose of this class/interface/trait
+	 *
+	 * @category   Framework
+	 * @package    restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class RateLimit implements \Luracast\Restler\iFilter, \Luracast\Restler\iUseAuthentication
+	{
+		/**
+		 * @var \Luracast\Restler\Restler;
+		 */
+		public $restler;
+		/**
+		 * @var int
+		 */
+		public static $usagePerUnit = 1200;
+		/**
+		 * @var int
+		 */
+		public static $authenticatedUsagePerUnit = 5000;
+		/**
+		 * @var string
+		 */
+		public static $unit = 'hour';
+		/**
+		 * @var string group the current api belongs to
+		 */
+		public static $group = 'common';
+		protected static $units = array(
+			'second' => 1,
+			'minute' => 60,
+			'hour' => 3600,
+			// 60*60 seconds
+			'day' => 86400,
+			// 60*60*24 seconds
+			'week' => 604800,
+			// 60*60*24*7 seconds
+			'month' => 2592000,
+		);
+		/**
+		 * @var array all paths beginning with any of the following will be excluded
+		 * from documentation
+		 */
+		public static $excludedPaths = array('explorer');
+		/**
+		 * @param string $unit
+		 * @param int    $usagePerUnit
+		 * @param int    $authenticatedUsagePerUnit set it to false to give unlimited access
+		 *
+		 * @throws \InvalidArgumentException
+		 * @return void
+		 */
+		public static function setLimit($unit, $usagePerUnit, $authenticatedUsagePerUnit = null)
+		{
+		}
+		public function __isAllowed()
+		{
+		}
+		public function __setAuthenticationStatus($isAuthenticated = false)
+		{
+		}
+	}
+}
+namespace Luracast\Restler {
+	/**
+	 * Storing and retrieving a message or array of key value pairs for one time use using $_SESSION
+	 *
+	 * They are typically used in view templates when using HtmlFormat
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Flash implements \ArrayAccess
+	{
+		const SUCCESS = 'success';
+		const INFO = 'info';
+		const WARNING = 'warning';
+		const DANGER = 'danger';
+		/**
+		 * Flash a success message to user
+		 *
+		 * @param string $message
+		 * @param string $header
+		 *
+		 * @return Flash
+		 */
+		public static function success($message, $header = '')
+		{
+		}
+		/**
+		 * Flash a info message to user
+		 *
+		 * @param string $message
+		 * @param string $header
+		 *
+		 * @return Flash
+		 */
+		public static function info($message, $header = '')
+		{
+		}
+		/**
+		 * Flash a warning message to user
+		 *
+		 * @param string $message
+		 * @param string $header
+		 *
+		 * @return Flash
+		 */
+		public static function warning($message, $header = '')
+		{
+		}
+		/**
+		 * Flash a error message to user
+		 *
+		 * @param string $message
+		 * @param string $header
+		 *
+		 * @return Flash
+		 */
+		public static function danger($message, $header = '')
+		{
+		}
+		/**
+		 * Flash a message to user
+		 *
+		 * @param string $text message text
+		 * @param string $header
+		 * @param string $type
+		 *
+		 * @return Flash
+		 */
+		public static function message($text, $header = '', $type = \Luracast\Restler\Flash::WARNING)
+		{
+		}
+		/**
+		 * Set some data for one time use
+		 *
+		 * @param array $data array of key value pairs {@type associative}
+		 *
+		 * @return Flash
+		 */
+		public static function set(array $data)
+		{
+		}
+		public function __get($name)
+		{
+		}
+		public function __isset($name)
+		{
+		}
+		public function __destruct()
+		{
+		}
+		/**
+		 * Specify data which should be serialized to JSON
+		 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+		 * @return mixed data which can be serialized by <b>json_encode</b>,
+		 * which is a value of any type other than a resource.
+		 */
+		public function jsonSerialize()
+		{
+		}
+		public function offsetExists($offset)
+		{
+		}
+		public function offsetGet($offset)
+		{
+		}
+		public function offsetSet($offset, $value)
+		{
+		}
+		public function offsetUnset($offset)
+		{
+		}
+	}
+}
+namespace Luracast\Restler\Format {
+	/**
+	 * Interface for creating custom data formats
+	 * like xml, json, yaml, amf etc
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iFormat
+	{
+		/**
+		 * Get MIME type => Extension mappings as an associative array
+		 *
+		 * @return array list of mime strings for the format
+		 * @example array('application/json'=>'json');
+		 */
+		public function getMIMEMap();
+		/**
+		 * Set the selected MIME type
+		 *
+		 * @param string $mime
+		 *            MIME type
+		 */
+		public function setMIME($mime);
+		/**
+		 * Content-Type field of the HTTP header can send a charset
+		 * parameter in the HTTP header to specify the character
+		 * encoding of the document.
+		 * This information is passed
+		 * here so that Format class can encode data accordingly
+		 * Format class may choose to ignore this and use its
+		 * default character set.
+		 *
+		 * @param string $charset
+		 *            Example utf-8
+		 */
+		public function setCharset($charset);
+		/**
+		 * Content-Type accepted by the Format class
+		 *
+		 * @return string $charset Example utf-8
+		 */
+		public function getCharset();
+		/**
+		 * Get selected MIME type
+		 */
+		public function getMIME();
+		/**
+		 * Set the selected file extension
+		 *
+		 * @param string $extension
+		 *            file extension
+		 */
+		public function setExtension($extension);
+		/**
+		 * Get the selected file extension
+		 *
+		 * @return string file extension
+		 */
+		public function getExtension();
+		/**
+		 * Encode the given data in the format
+		 *
+		 * @param array $data
+		 *            resulting data that needs to
+		 *            be encoded in the given format
+		 * @param boolean $humanReadable
+		 *            set to TRUE when restler
+		 *            is not running in production mode. Formatter has to
+		 *            make the encoded output more human readable
+		 * @return string encoded string
+		 */
+		public function encode($data, $humanReadable = false);
+		/**
+		 * Decode the given data from the format
+		 *
+		 * @param string $data
+		 *            data sent from client to
+		 *            the api in the given format.
+		 * @return array associative array of the parsed data
+		 */
+		public function decode($data);
+		/**
+		 * @return boolean is parsing the request supported?
+		 */
+		public function isReadable();
+		/**
+		 * @return boolean is composing response supported?
+		 */
+		public function isWritable();
+	}
+	/**
+	 * Abstract class to implement common methods of iFormat
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	abstract class Format implements \Luracast\Restler\Format\iFormat
+	{
+		/**
+		 * override in the extending class
+		 */
+		const MIME = 'text/plain';
+		/**
+		 * override in the extending class
+		 */
+		const EXTENSION = 'txt';
+		/**
+		 * @var string charset encoding defaults to UTF8
+		 */
+		protected $charset = 'utf-8';
+		/**
+		 * Injected at runtime
+		 *
+		 * @var \Luracast\Restler\Restler
+		 */
+		public $restler;
+		/**
+		 * Get MIME type => Extension mappings as an associative array
+		 *
+		 * @return array list of mime strings for the format
+		 * @example array('application/json'=>'json');
+		 */
+		public function getMIMEMap()
+		{
+		}
+		/**
+		 * Set the selected MIME type
+		 *
+		 * @param string $mime
+		 *            MIME type
+		 */
+		public function setMIME($mime)
+		{
+		}
+		/**
+		 * Content-Type field of the HTTP header can send a charset
+		 * parameter in the HTTP header to specify the character
+		 * encoding of the document.
+		 * This information is passed
+		 * here so that Format class can encode data accordingly
+		 * Format class may choose to ignore this and use its
+		 * default character set.
+		 *
+		 * @param string $charset
+		 *            Example utf-8
+		 */
+		public function setCharset($charset)
+		{
+		}
+		/**
+		 * Content-Type accepted by the Format class
+		 *
+		 * @return string $charset Example utf-8
+		 */
+		public function getCharset()
+		{
+		}
+		/**
+		 * Get selected MIME type
+		 */
+		public function getMIME()
+		{
+		}
+		/**
+		 * Set the selected file extension
+		 *
+		 * @param string $extension
+		 *            file extension
+		 */
+		public function setExtension($extension)
+		{
+		}
+		/**
+		 * Get the selected file extension
+		 *
+		 * @return string file extension
+		 */
+		public function getExtension()
+		{
+		}
+		/**
+		 * @return boolean is parsing the request supported?
+		 */
+		public function isReadable()
+		{
+		}
+		/**
+		 * @return boolean is composing response supported?
+		 */
+		public function isWritable()
+		{
+		}
+		public function __toString()
+		{
+		}
+	}
+	abstract class DependentFormat extends \Luracast\Restler\Format\Format
+	{
+		/**
+		 * override in the extending class
+		 *
+		 * @example symfony/yaml:*
+		 */
+		const PACKAGE_NAME = 'vendor/project:version';
+		/**
+		 * override in the extending class
+		 *
+		 * fully qualified class name
+		 */
+		const EXTERNAL_CLASS = 'Namespace\\ClassName';
+		/**
+		 * Get external class => packagist package name as an associative array
+		 *
+		 * @return array list of dependencies for the format
+		 */
+		public function getDependencyMap()
+		{
+		}
+		protected function checkDependency($class = null)
+		{
+		}
+		public function __construct()
+		{
+		}
+	}
+	/**
+	 * AMF Binary Format for Restler Framework.
+	 * Native format supported by Adobe Flash and Adobe AIR
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class AmfFormat extends \Luracast\Restler\Format\DependentFormat
+	{
+		const MIME = 'application/x-amf';
+		const EXTENSION = 'amf';
+		const PACKAGE_NAME = 'zendframework/zendamf:dev-master';
+		const EXTERNAL_CLASS = 'ZendAmf\\Parser\\Amf3\\Deserializer';
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public function decode($data)
+		{
+		}
+	}
+	/**
+	 * Interface for creating formats that accept steams for decoding
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iDecodeStream
+	{
+		/**
+		 * Decode the given data stream
+		 *
+		 * @param string $stream A stream resource with data
+		 *                       sent from client to the api
+		 *                       in the given format.
+		 *
+		 * @return array associative array of the parsed data
+		 */
+		public function decodeStream($stream);
+	}
+	/**
+	 * Comma Separated Value Format
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class CsvFormat extends \Luracast\Restler\Format\Format implements \Luracast\Restler\Format\iDecodeStream
+	{
+		const MIME = 'text/csv';
+		const EXTENSION = 'csv';
+		public static $delimiter = ',';
+		public static $enclosure = '"';
+		public static $escape = '\\';
+		public static $haveHeaders = null;
+		/**
+		 * Encode the given data in the csv format
+		 *
+		 * @param array   $data
+		 *            resulting data that needs to
+		 *            be encoded in the given format
+		 * @param boolean $humanReadable
+		 *            set to TRUE when restler
+		 *            is not running in production mode. Formatter has to
+		 *            make the encoded output more human readable
+		 *
+		 * @return string encoded string
+		 *
+		 * @throws RestException 500 on unsupported data
+		 */
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		protected static function putRow($data)
+		{
+		}
+		/**
+		 * Decode the given data from the csv format
+		 *
+		 * @param string $data
+		 *            data sent from client to
+		 *            the api in the given format.
+		 *
+		 * @return array associative array of the parsed data
+		 */
+		public function decode($data)
+		{
+		}
+		protected static function getRow($data, $keys = false)
+		{
+		}
+		/**
+		 * Decode the given data stream
+		 *
+		 * @param string $stream A stream resource with data
+		 *                       sent from client to the api
+		 *                       in the given format.
+		 *
+		 * @return array associative array of the parsed data
+		 */
+		public function decodeStream($stream)
+		{
+		}
+	}
+	/**
+	 * Describe the purpose of this class/interface/trait
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	abstract class MultiFormat implements \Luracast\Restler\Format\iFormat
+	{
+		/**
+		 * override in the extending class
+		 */
+		const MIME = 'text/plain,text/html';
+		/**
+		 * override in the extending class
+		 */
+		const EXTENSION = 'txt,html';
+		/**
+		 * @var string charset encoding defaults to UTF8
+		 */
+		protected $charset = 'utf-8';
+		public static $mime;
+		public static $extension;
+		/**
+		 * Injected at runtime
+		 *
+		 * @var \Luracast\Restler\Restler
+		 */
+		public $restler;
+		/**
+		 * Get MIME type => Extension mappings as an associative array
+		 *
+		 * @return array list of mime strings for the format
+		 * @example array('application/json'=>'json');
+		 */
+		public function getMIMEMap()
+		{
+		}
+		/**
+		 * Set the selected MIME type
+		 *
+		 * @param string $mime
+		 *            MIME type
+		 */
+		public function setMIME($mime)
+		{
+		}
+		/**
+		 * Content-Type field of the HTTP header can send a charset
+		 * parameter in the HTTP header to specify the character
+		 * encoding of the document.
+		 * This information is passed
+		 * here so that Format class can encode data accordingly
+		 * Format class may choose to ignore this and use its
+		 * default character set.
+		 *
+		 * @param string $charset
+		 *            Example utf-8
+		 */
+		public function setCharset($charset)
+		{
+		}
+		/**
+		 * Content-Type accepted by the Format class
+		 *
+		 * @return string $charset Example utf-8
+		 */
+		public function getCharset()
+		{
+		}
+		/**
+		 * Get selected MIME type
+		 */
+		public function getMIME()
+		{
+		}
+		/**
+		 * Set the selected file extension
+		 *
+		 * @param string $extension
+		 *            file extension
+		 */
+		public function setExtension($extension)
+		{
+		}
+		/**
+		 * Get the selected file extension
+		 *
+		 * @return string file extension
+		 */
+		public function getExtension()
+		{
+		}
+		/**
+		 * @return boolean is parsing the request supported?
+		 */
+		public function isReadable()
+		{
+		}
+		/**
+		 * @return boolean is composing response supported?
+		 */
+		public function isWritable()
+		{
+		}
+		public function __toString()
+		{
+		}
+	}
+	abstract class DependentMultiFormat extends \Luracast\Restler\Format\MultiFormat
+	{
+		/**
+		 * Get external class => packagist package name as an associative array
+		 *
+		 * @return array list of dependencies for the format
+		 *
+		 * @example return ['Illuminate\\View\\View' => 'illuminate/view:4.2.*']
+		 */
+		public abstract function getDependencyMap();
+		protected function checkDependency($class = null)
+		{
+		}
+		public function __construct()
+		{
+		}
+	}
+	/**
+	 * Html template format
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class HtmlFormat extends \Luracast\Restler\Format\DependentFormat
+	{
+		const BLADE = 'Illuminate\\View\\View';
+		const TWIG = 'Twig\\Environment';
+		const MUSTACHE = 'Mustache_Engine';
+		public static $mime = 'text/html';
+		public static $extension = 'html';
+		public static $view;
+		public static $errorView = 'debug.php';
+		public static $template = 'php';
+		public static $handleSession = true;
+		public static $convertResponseToArray = false;
+		public static $useSmartViews = true;
+		/**
+		 * @var null|string defaults to template named folder in Defaults::$cacheDirectory
+		 */
+		public static $cacheDirectory = null;
+		/**
+		 * @var array global key value pair to be supplied to the templates. All
+		 * keys added here will be available as a variable inside the template
+		 */
+		public static $data = array();
+		/**
+		 * @var string set it to the location of your the view files. Defaults to
+		 * views folder which is same level as vendor directory.
+		 */
+		public static $viewPath;
+		/**
+		 * @var array template and its custom extension key value pair
+		 */
+		public static $customTemplateExtensions = array('blade' => 'blade.php');
+		/**
+		 * @var bool used internally for error handling
+		 */
+		protected static $parseViewMetadata = true;
+		/**
+		 * @var Restler;
+		 */
+		public $restler;
+		public function __construct()
+		{
+		}
+		public function getDependencyMap()
+		{
+		}
+		public static function blade(array $data, $debug = true)
+		{
+		}
+		/**
+		 * @param array|object $data
+		 * @param bool         $debug
+		 *
+		 * @return string
+		 * @throws \Twig\Error\LoaderError
+		 * @throws \Twig\Error\RuntimeError
+		 * @throws \Twig\Error\SyntaxError
+		 */
+		public static function twig($data, $debug = true)
+		{
+		}
+		/**
+		 * @param array|object $data
+		 * @param bool         $debug
+		 *
+		 * @return string
+		 */
+		public static function handlebar($data, $debug = true)
+		{
+		}
+		/**
+		 * @param array|object $data
+		 * @param bool         $debug
+		 *
+		 * @return string
+		 */
+		public static function mustache($data, $debug = true)
+		{
+		}
+		/**
+		 * @param array|object $data
+		 * @param bool         $debug
+		 *
+		 * @return string
+		 * @throws RestException
+		 */
+		public static function php($data, $debug = true)
+		{
+		}
+		/**
+		 * Encode the given data in the format
+		 *
+		 * @param array   $data                resulting data that needs to
+		 *                                     be encoded in the given format
+		 * @param boolean $humanReadable       set to TRUE when restler
+		 *                                     is not running in production mode.
+		 *                                     Formatter has to make the encoded
+		 *                                     output more human readable
+		 *
+		 * @return string encoded string
+		 * @throws \Exception
+		 */
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public static function guessViewName($path)
+		{
+		}
+		public static function getViewExtension()
+		{
+		}
+		public static function getViewFile($fullPath = false, $includeExtension = true)
+		{
+		}
+		/**
+		 * Decode the given data from the format
+		 *
+		 * @param string $data
+		 *            data sent from client to
+		 *            the api in the given format.
+		 *
+		 * @return array associative array of the parsed data
+		 *
+		 * @throws RestException
+		 */
+		public function decode($data)
+		{
+		}
+		/**
+		 * @return bool false as HTML format is write only
+		 */
+		public function isReadable()
+		{
+		}
+		/**
+		 * Get MIME type => Extension mappings as an associative array
+		 *
+		 * @return array list of mime strings for the format
+		 * @example array('application/json'=>'json');
+		 */
+		public function getMIMEMap()
+		{
+		}
+		/**
+		 * Set the selected MIME type
+		 *
+		 * @param string $mime MIME type
+		 */
+		public function setMIME($mime)
+		{
+		}
+		/**
+		 * Get selected MIME type
+		 */
+		public function getMIME()
+		{
+		}
+		/**
+		 * Get the selected file extension
+		 *
+		 * @return string file extension
+		 */
+		public function getExtension()
+		{
+		}
+		/**
+		 * Set the selected file extension
+		 *
+		 * @param string $extension file extension
+		 */
+		public function setExtension($extension)
+		{
+		}
+	}
+	/**
+	 * Javascript Object Notation Format
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class JsonFormat extends \Luracast\Restler\Format\Format
+	{
+		/**
+		 * @var boolean|null  shim for json_encode option JSON_PRETTY_PRINT set
+		 * it to null to use smart defaults
+		 */
+		public static $prettyPrint = null;
+		/**
+		 * @var boolean|null  shim for json_encode option JSON_UNESCAPED_SLASHES
+		 * set it to null to use smart defaults
+		 */
+		public static $unEscapedSlashes = null;
+		/**
+		 * @var boolean|null  shim for json_encode JSON_UNESCAPED_UNICODE set it
+		 * to null to use smart defaults
+		 */
+		public static $unEscapedUnicode = null;
+		/**
+		 * @var boolean|null  shim for json_decode JSON_BIGINT_AS_STRING set it to
+		 * null to
+		 * use smart defaults
+		 */
+		public static $bigIntAsString = null;
+		/**
+		 * @var boolean|null  shim for json_decode JSON_NUMERIC_CHECK set it to
+		 * null to
+		 * use smart defaults
+		 */
+		public static $numbersAsNumbers = null;
+		const MIME = 'application/json';
+		const EXTENSION = 'json';
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public function decode($data)
+		{
+		}
+		/**
+		 * Throws an exception if an error occurred during the last JSON encoding/decoding
+		 *
+		 * @return void
+		 * @throws \RuntimeException
+		 */
+		protected function handleJsonError()
+		{
+		}
+	}
+	/**
+	 * Javascript Object Notation Packaged in a method (JSONP)
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class JsFormat extends \Luracast\Restler\Format\JsonFormat
+	{
+		const MIME = 'text/javascript';
+		const EXTENSION = 'js';
+		public static $callbackMethodName = 'parseResponse';
+		public static $callbackOverrideQueryString = 'callback';
+		public static $includeHeaders = true;
+		public function encode($data, $human_readable = false)
+		{
+		}
+		public function isReadable()
+		{
+		}
+	}
+	/**
+	 * Plist Format for Restler Framework.
+	 * Plist is the native data exchange format for Apple iOS and Mac platform.
+	 * Use this format to talk to mac applications and iOS devices.
+	 * This class is capable of serving both xml plist and binary plist.
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class PlistFormat extends \Luracast\Restler\Format\DependentMultiFormat
+	{
+		/**
+		 * @var boolean set it to true binary plist is preferred
+		 */
+		public static $compact = null;
+		const MIME = 'application/xml,application/x-plist';
+		const EXTENSION = 'plist';
+		public function setMIME($mime)
+		{
+		}
+		/**
+		 * Encode the given data in plist format
+		 *
+		 * @param array   $data
+		 *            resulting data that needs to
+		 *            be encoded in plist format
+		 * @param boolean $humanReadable
+		 *            set to true when restler
+		 *            is not running in production mode. Formatter has to
+		 *            make the encoded output more human readable
+		 *
+		 * @return string encoded string
+		 */
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		/**
+		 * Decode the given data from plist format
+		 *
+		 * @param string $data
+		 *            data sent from client to
+		 *            the api in the given format.
+		 *
+		 * @return array associative array of the parsed data
+		 */
+		public function decode($data)
+		{
+		}
+		/**
+		 * Get external class => packagist package name as an associative array
+		 *
+		 * @return array list of dependencies for the format
+		 *
+		 * @example return ['Illuminate\\View\\View' => 'illuminate/view:4.2.*']
+		 */
+		public function getDependencyMap()
+		{
+		}
+	}
+	/**
+	 * Tab Separated Value Format
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class TsvFormat extends \Luracast\Restler\Format\CsvFormat
+	{
+		const MIME = 'text/csv';
+		const EXTENSION = 'csv';
+		public static $delimiter = "\t";
+		public static $enclosure = '"';
+		public static $escape = '\\';
+		public static $haveHeaders = null;
+	}
+	/**
+	 * Support for Multi Part Form Data and File Uploads
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class UploadFormat extends \Luracast\Restler\Format\Format
+	{
+		const MIME = 'multipart/form-data';
+		const EXTENSION = 'post';
+		public static $errors = array(0 => false, 1 => "The uploaded file exceeds the maximum allowed size", 2 => "The uploaded file exceeds the maximum allowed size", 3 => "The uploaded file was only partially uploaded", 4 => "No file was uploaded", 6 => "Missing a temporary folder", 7 => "Failed to write file to disk", 8 => "A PHP extension stopped the file upload");
+		/**
+		 * use it if you need to restrict uploads based on file type
+		 * setting it as an empty array allows all file types
+		 * default is to allow only png and jpeg images
+		 *
+		 * @var array
+		 */
+		public static $allowedMimeTypes = array('image/jpeg', 'image/png');
+		/**
+		 * use it to restrict uploads based on file size
+		 * set it to 0 to allow all sizes
+		 * please note that it upload restrictions in the server
+		 * takes precedence so it has to be lower than or equal to that
+		 * default value is 1MB (1024x1024)bytes
+		 * usual value for the server is 8388608
+		 *
+		 * @var int
+		 */
+		public static $maximumFileSize = 1048576;
+		/**
+		 * Your own validation function for validating each uploaded file
+		 * it can return false or throw an exception for invalid file
+		 * use anonymous function / closure in PHP 5.3 and above
+		 * use function name in other cases
+		 *
+		 * @var Callable
+		 */
+		public static $customValidationFunction;
+		/**
+		 * Since exceptions are triggered way before at the `get` stage
+		 *
+		 * @var bool
+		 */
+		public static $suppressExceptionsAsError = false;
+		protected static function checkFile(&$file, $doMimeCheck = false, $doSizeCheck = false)
+		{
+		}
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public function decode($data)
+		{
+		}
+		function isWritable()
+		{
+		}
+	}
+	/**
+	 * URL Encoded String Format
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class UrlEncodedFormat extends \Luracast\Restler\Format\Format
+	{
+		const MIME = 'application/x-www-form-urlencoded';
+		const EXTENSION = 'post';
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public function decode($data)
+		{
+		}
+		public static function encoderTypeFix(array $data)
+		{
+		}
+		public static function decoderTypeFix(array $data)
+		{
+		}
+	}
+	/**
+	 * XML Markup Format for Restler Framework
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class XmlFormat extends \Luracast\Restler\Format\Format
+	{
+		const MIME = 'application/xml';
+		const EXTENSION = 'xml';
+		// ==================================================================
+		//
+		// Properties related to reading/parsing/decoding xml
+		//
+		// ------------------------------------------------------------------
+		public static $importSettingsFromXml = false;
+		public static $parseAttributes = true;
+		public static $parseNamespaces = true;
+		public static $parseTextNodeAsProperty = true;
+		// ==================================================================
+		//
+		// Properties related to writing/encoding xml
+		//
+		// ------------------------------------------------------------------
+		public static $useTextNodeProperty = true;
+		public static $useNamespaces = true;
+		public static $cdataNames = array();
+		// ==================================================================
+		//
+		// Common Properties
+		//
+		// ------------------------------------------------------------------
+		public static $attributeNames = array();
+		public static $textNodeName = 'text';
+		public static $namespaces = array();
+		public static $namespacedProperties = array();
+		/**
+		 * Default name for the root node.
+		 *
+		 * @var string $rootNodeName
+		 */
+		public static $rootName = 'response';
+		public static $defaultTagName = 'item';
+		/**
+		 * When you decode an XML its structure is copied to the static vars
+		 * we can use this function to echo them out and then copy paste inside
+		 * our service methods
+		 *
+		 * @return string PHP source code to reproduce the configuration
+		 */
+		public static function exportCurrentSettings()
+		{
+		}
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public function write(\XMLWriter $xml, $data, $parent)
+		{
+		}
+		public function decode($data)
+		{
+		}
+		public function read(\SimpleXMLElement $xml, $namespaces = null)
+		{
+		}
+		public static function setType($value)
+		{
+		}
+	}
+	/**
+	 * YAML Format for Restler Framework
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage format
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class YamlFormat extends \Luracast\Restler\Format\DependentFormat
+	{
+		const MIME = 'text/plain';
+		const EXTENSION = 'yaml';
+		const PACKAGE_NAME = 'symfony/yaml:*';
+		const EXTERNAL_CLASS = 'Symfony\\Component\\Yaml\\Yaml';
+		public function encode($data, $humanReadable = false)
+		{
+		}
+		public function decode($data)
+		{
+		}
+	}
+}
+namespace Luracast\Restler {
+	/**
+	 * Default Cache that writes/reads human readable files for caching purpose
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class HumanReadableCache implements \Luracast\Restler\iCache
+	{
+		/**
+		 * @var string path of the folder to hold cache files
+		 */
+		public static $cacheDir;
+		public function __construct()
+		{
+		}
+		/**
+		 * store data in the cache
+		 *
+		 * @param string $name
+		 * @param mixed  $data
+		 *
+		 * @throws \Exception
+		 * @return boolean true if successful
+		 */
+		public function set($name, $data)
+		{
+		}
+		/**
+		 * retrieve data from the cache
+		 *
+		 * @param string $name
+		 * @param bool   $ignoreErrors
+		 *
+		 * @return mixed
+		 */
+		public function get($name, $ignoreErrors = false)
+		{
+		}
+		/**
+		 * delete data from the cache
+		 *
+		 * @param string $name
+		 * @param bool   $ignoreErrors
+		 *
+		 * @return boolean true if successful
+		 */
+		public function clear($name, $ignoreErrors = false)
+		{
+		}
+		/**
+		 * check if the given name is cached
+		 *
+		 * @param string $name
+		 *
+		 * @return boolean true if cached
+		 */
+		public function isCached($name)
+		{
+		}
+	}
+	/**
+	 * Interface for creating authentication classes
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage auth
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iAuthenticate extends \Luracast\Restler\iFilter
+	{
+		/**
+		 * @return string string to be used with WWW-Authenticate header
+		 * @example Basic
+		 * @example Digest
+		 * @example OAuth
+		 */
+		public function __getWWWAuthenticateString();
+	}
+	/**
+	 * Interface to identify the user
+	 *
+	 * When the user is known we will be able to monitor, rate limit and do more
+	 *
+	 * @category   Framework
+	 * @package    restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	interface iIdentifyUser
+	{
+		/**
+		 * A way to uniquely identify the current api consumer
+		 *
+		 * When his user id is known it should be used otherwise ip address
+		 * can be used
+		 *
+		 * @param bool $includePlatform Should we consider user alone or should
+		 *                              consider the application/platform/device
+		 *                              as well for generating unique id
+		 *
+		 * @return string
+		 */
+		public static function getUniqueIdentifier($includePlatform = false);
+		/**
+		 * User identity to be used for caching purpose
+		 *
+		 * When the dynamic cache service places an object in the cache, it needs to
+		 * label it with a unique identifying string known as a cache ID. This
+		 * method gives that identifier
+		 *
+		 * @return string
+		 */
+		public static function getCacheIdentifier();
+		/**
+		 * Authentication classes should call this method
+		 *
+		 * @param string $id user id as identified by the authentication classes
+		 *
+		 * @return void
+		 */
+		public static function setUniqueIdentifier($id);
+		/**
+		 * User identity for caching purpose
+		 *
+		 * In a role based access control system this will be based on role
+		 *
+		 * @param $id
+		 *
+		 * @return void
+		 */
+		public static function setCacheIdentifier($id);
+	}
+	/**
+	 * Special Exception for raising API errors
+	 * that can be used in API methods
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage exception
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class RestException extends \Exception
+	{
+		/**
+		 * HTTP status codes
+		 *
+		 * @var array
+		 */
+		public static $codes = array(
+			100 => 'Continue',
+			101 => 'Switching Protocols',
+			200 => 'OK',
+			201 => 'Created',
+			202 => 'Accepted',
+			203 => 'Non-Authoritative Information',
+			204 => 'No Content',
+			205 => 'Reset Content',
+			206 => 'Partial Content',
+			300 => 'Multiple Choices',
+			301 => 'Moved Permanently',
+			302 => 'Found',
+			303 => 'See Other',
+			304 => 'Not Modified',
+			305 => 'Use Proxy',
+			306 => '(Unused)',
+			307 => 'Temporary Redirect',
+			400 => 'Bad Request',
+			401 => 'Unauthorized',
+			402 => 'Payment Required',
+			403 => 'Forbidden',
+			404 => 'Not Found',
+			405 => 'Method Not Allowed',
+			406 => 'Not Acceptable',
+			407 => 'Proxy Authentication Required',
+			408 => 'Request Timeout',
+			409 => 'Conflict',
+			410 => 'Gone',
+			411 => 'Length Required',
+			412 => 'Precondition Failed',
+			413 => 'Request Entity Too Large',
+			414 => 'Request-URI Too Long',
+			415 => 'Unsupported Media Type',
+			416 => 'Requested Range Not Satisfiable',
+			417 => 'Expectation Failed',
+			429 => 'Too Many Requests',
+			//still in draft but used for rate limiting
+			500 => 'Internal Server Error',
+			501 => 'Not Implemented',
+			502 => 'Bad Gateway',
+			503 => 'Service Unavailable',
+			504 => 'Gateway Timeout',
+			505 => 'HTTP Version Not Supported',
+		);
+		/**
+		 * @param string      $httpStatusCode http status code
+		 * @param string|null $errorMessage   error message
+		 * @param array       $details        any extra detail about the exception
+		 * @param Exception   $previous       previous exception if any
+		 */
+		public function __construct($httpStatusCode, $errorMessage = null, array $details = array(), \Exception $previous = null)
+		{
+		}
+		/**
+		 * Get extra details about the exception
+		 *
+		 * @return array details array
+		 */
+		public function getDetails()
+		{
+		}
+		public function getStage()
+		{
+		}
+		public function getStages()
+		{
+		}
+		public function getErrorMessage()
+		{
+		}
+		public function getSource()
+		{
+		}
+	}
+	/**
+	 * Special RestException for forcing the exception even when
+	 * in hybrid method
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage exception
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class InvalidAuthCredentials extends \Luracast\Restler\RestException
+	{
+	}
+	/**
+	 * Class MemcacheCache provides a memcache based cache for Restler
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     Dave Drager <ddrager@gmail.com>
+	 * @copyright  2014 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 * @version    3.0.0rc5
+	 */
+	class MemcacheCache implements \Luracast\Restler\iCache
+	{
+		/**
+		 * The namespace that all of the cached entries will be stored under.  This allows multiple APIs to run concurrently.
+		 *
+		 * @var string
+		 */
+		public static $namespace;
+		/**
+		 * @var string the memcache server hostname / IP address. For the memcache
+		 * cache method.
+		 */
+		public static $memcacheServer = '127.0.0.1';
+		/**
+		 * @var int the memcache server port. For the memcache cache method.
+		 */
+		public static $memcachePort = 11211;
+		/**
+		 * @param string $namespace
+		 */
+		function __construct($namespace = 'restler')
+		{
+		}
+		/**
+		 * store data in the cache
+		 *
+		 *
+		 * @param string $name
+		 * @param mixed $data
+		 *
+		 * @return boolean true if successful
+		 */
+		public function set($name, $data)
+		{
+		}
+		/**
+		 * retrieve data from the cache
+		 *
+		 *
+		 * @param string $name
+		 * @param bool $ignoreErrors
+		 *
+		 * @throws \Exception
+		 * @return mixed
+		 */
+		public function get($name, $ignoreErrors = false)
+		{
+		}
+		/**
+		 * delete data from the cache
+		 *
+		 *
+		 * @param string $name
+		 * @param bool $ignoreErrors
+		 *
+		 * @throws \Exception
+		 * @return boolean true if successful
+		 */
+		public function clear($name, $ignoreErrors = false)
+		{
+		}
+		/**
+		 * check if the given name is cached
+		 *
+		 *
+		 * @param string $name
+		 *
+		 * @return boolean true if cached
+		 */
+		public function isCached($name)
+		{
+		}
+	}
+	/**
+	 * Static Class to pass through content outside of web root
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class PassThrough
+	{
+		public static $mimeTypes = array('js' => 'text/javascript', 'css' => 'text/css', 'png' => 'image/png', 'jpg' => 'image/jpeg', 'gif' => 'image/gif', 'html' => 'text/html');
+		/**
+		 * Serve a file outside web root
+		 *
+		 * Respond with a file stored outside web accessible path
+		 *
+		 * @param string $filename      full path for the file to be served
+		 * @param bool   $forceDownload should the we download instead of viewing
+		 * @param int    $expires       cache expiry in number of seconds
+		 * @param bool   $isPublic      cache control, is it public or private
+		 *
+		 * @throws RestException
+		 *
+		 */
+		public static function file($filename, $forceDownload = false, $expires = 0, $isPublic = true)
+		{
+		}
+	}
+	/**
+	 * Static class for handling redirection
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Redirect
+	{
+		/**
+		 * Redirect to given url
+		 *
+		 * @param string $url       relative path or full url
+		 * @param array  $params    associative array of query parameters
+		 * @param array  $flashData associative array of properties to be set in $_SESSION for one time use
+		 * @param int    $status    http status code to send the response with ideally 301 or 302
+		 *
+		 * @return array
+		 */
+		public static function to($url, array $params = array(), array $flashData = array(), $status = 302)
+		{
+		}
+		/**
+		 * Redirect back to the previous page
+		 *
+		 * Makes use of http referrer for redirection
+		 *
+		 * @return array
+		 */
+		public static function back()
+		{
+		}
+	}
+	/**
+	 * API Class to create Swagger Spec 1.1 compatible id and operation
+	 * listing
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Resources implements \Luracast\Restler\iUseAuthentication, \Luracast\Restler\iProvideMultiVersionApi
+	{
+		/**
+		 * @var bool should protected resources be shown to unauthenticated users?
+		 */
+		public static $hideProtected = true;
+		/**
+		 * @var bool should we use format as extension?
+		 */
+		public static $useFormatAsExtension = true;
+		/**
+		 * @var bool should we include newer apis in the list? works only when
+		 * Defaults::$useUrlBasedVersioning is set to true;
+		 */
+		public static $listHigherVersions = true;
+		/**
+		 * @var array all http methods specified here will be excluded from
+		 * documentation
+		 */
+		public static $excludedHttpMethods = array('OPTIONS');
+		/**
+		 * @var array all paths beginning with any of the following will be excluded
+		 * from documentation
+		 */
+		public static $excludedPaths = array();
+		/**
+		 * @var bool
+		 */
+		public static $placeFormatExtensionBeforeDynamicParts = true;
+		/**
+		 * @var bool should we group all the operations with the same url or not
+		 */
+		public static $groupOperations = false;
+		/**
+		 * @var null|callable if the api methods are under access control mechanism
+		 * you can attach a function here that returns true or false to determine
+		 * visibility of a protected api method. this function will receive method
+		 * info as the only parameter.
+		 */
+		public static $accessControlFunction = null;
+		/**
+		 * @var array type mapping for converting data types to javascript / swagger
+		 */
+		public static $dataTypeAlias = array('string' => 'string', 'int' => 'int', 'number' => 'float', 'float' => 'float', 'bool' => 'boolean', 'boolean' => 'boolean', 'NULL' => 'null', 'array' => 'Array', 'object' => 'Object', 'stdClass' => 'Object', 'mixed' => 'string', 'DateTime' => 'Date');
+		/**
+		 * @var array configurable symbols to differentiate public, hybrid and
+		 * protected api
+		 */
+		public static $apiDescriptionSuffixSymbols = array(
+			0 => '&nbsp; <i class="icon-unlock-alt icon-large"></i>',
+			//public api
+			1 => '&nbsp; <i class="icon-adjust icon-large"></i>',
+			//hybrid api
+			2 => '&nbsp; <i class="icon-lock icon-large"></i>',
+		);
+		/**
+		 * Injected at runtime
+		 *
+		 * @var Restler instance of restler
+		 */
+		public $restler;
+		/**
+		 * @var string when format is not used as the extension this property is
+		 * used to set the extension manually
+		 */
+		public $formatString = '';
+		protected $_models;
+		protected $_bodyParam;
+		/**
+		 * @var bool|stdClass
+		 */
+		protected $_fullDataRequested = false;
+		protected $crud = array('POST' => 'create', 'GET' => 'retrieve', 'PUT' => 'update', 'DELETE' => 'delete', 'PATCH' => 'partial update');
+		protected static $prefixes = array('get' => 'retrieve', 'index' => 'list', 'post' => 'create', 'put' => 'update', 'patch' => 'modify', 'delete' => 'remove');
+		protected $_authenticated = false;
+		protected $cacheName = '';
+		public function __construct()
+		{
+		}
+		/**
+		 * This method will be called first for filter classes and api classes so
+		 * that they can respond accordingly for filer method call and api method
+		 * calls
+		 *
+		 *
+		 * @param bool $isAuthenticated passes true when the authentication is
+		 *                              done, false otherwise
+		 *
+		 * @return mixed
+		 */
+		public function __setAuthenticationStatus($isAuthenticated = false)
+		{
+		}
+		/**
+		 * pre call for get($id)
+		 *
+		 * if cache is present, use cache
+		 */
+		public function _pre_get_json($id)
+		{
+		}
+		/**
+		 * post call for get($id)
+		 *
+		 * create cache if in production mode
+		 *
+		 * @param $responseData
+		 *
+		 * @internal param string $data composed json output
+		 *
+		 * @return string
+		 */
+		public function _post_get_json($responseData)
+		{
+		}
+		/**
+		 * @access hybrid
+		 *
+		 * @param string $id
+		 *
+		 * @throws RestException
+		 * @return null|stdClass
+		 *
+		 * @url    GET {id}
+		 */
+		public function get($id = '')
+		{
+		}
+		protected function _nickname(array $route)
+		{
+		}
+		protected function _noNamespace($className)
+		{
+		}
+		protected function _operationListing($resourcePath = '/')
+		{
+		}
+		protected function _resourceListing()
+		{
+		}
+		protected function _api($path, $description = '')
+		{
+		}
+		protected function _operation($route, $nickname, $httpMethod = 'GET', $summary = 'description', $notes = 'long description', $responseClass = 'void')
+		{
+		}
+		protected function _parameter($param)
+		{
+		}
+		protected function _appendToBody($p)
+		{
+		}
+		protected function _getBody()
+		{
+		}
+		protected function _model($className, $instance = null)
+		{
+		}
+		/**
+		 * Find the data type of the given value.
+		 *
+		 *
+		 * @param mixed $o given value for finding type
+		 *
+		 * @param bool $appendToModels if an object is found should we append to
+		 *                              our models list?
+		 *
+		 * @return string
+		 *
+		 * @access private
+		 */
+		public function getType($o, $appendToModels = false)
+		{
+		}
+		/**
+		 * pre call for index()
+		 *
+		 * if cache is present, use cache
+		 */
+		public function _pre_index_json()
+		{
+		}
+		/**
+		 * post call for index()
+		 *
+		 * create cache if in production mode
+		 *
+		 * @param $responseData
+		 *
+		 * @internal param string $data composed json output
+		 *
+		 * @return string
+		 */
+		public function _post_index_json($responseData)
+		{
+		}
+		/**
+		 * @access hybrid
+		 * @return \stdClass
+		 */
+		public function index()
+		{
+		}
+		protected function _loadResource($url)
+		{
+		}
+		protected function _mapResources(array $allRoutes, array &$map, $version = 1)
+		{
+		}
+		/**
+		 * Maximum api version supported by the api class
+		 * @return int
+		 */
+		public static function __getMaximumSupportedVersion()
+		{
+		}
+		/**
+		 * Verifies that the requesting user is allowed to view the docs for this API
+		 *
+		 * @param $route
+		 *
+		 * @return boolean True if the user should be able to view this API's docs
+		 */
+		protected function verifyAccess($route)
+		{
+		}
+	}
+	/**
+	 * REST API Server. It is the server part of the Restler framework.
+	 * inspired by the RestServer code from
+	 * <http://jacwright.com/blog/resources/RestServer.txt>
+	 *
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 *
+	 * @method static void onGet(Callable $function) fired before reading the request details
+	 * @method static void onRoute(Callable $function) fired before finding the api method
+	 * @method static void onNegotiate(Callable $function) fired before content negotiation
+	 * @method static void onPreAuthFilter(Callable $function) fired before pre auth filtering
+	 * @method static void onAuthenticate(Callable $function) fired before auth
+	 * @method static void onPostAuthFilter(Callable $function) fired before post auth filtering
+	 * @method static void onValidate(Callable $function) fired before validation
+	 * @method static void onCall(Callable $function) fired before api method call
+	 * @method static void onCompose(Callable $function) fired before composing response
+	 * @method static void onRespond(Callable $function) fired before sending response
+	 * @method static void onComplete(Callable $function) fired after sending response
+	 * @method static void onMessage(Callable $function) fired before composing error response
+	 *
+	 * @method void onGet(Callable $function) fired before reading the request details
+	 * @method void onRoute(Callable $function) fired before finding the api method
+	 * @method void onNegotiate(Callable $function) fired before content negotiation
+	 * @method void onPreAuthFilter(Callable $function) fired before pre auth filtering
+	 * @method void onAuthenticate(Callable $function) fired before auth
+	 * @method void onPostAuthFilter(Callable $function) fired before post auth filtering
+	 * @method void onValidate(Callable $function) fired before validation
+	 * @method void onCall(Callable $function) fired before api method call
+	 * @method void onCompose(Callable $function) fired before composing response
+	 * @method void onRespond(Callable $function) fired before sending response
+	 * @method void onComplete(Callable $function) fired after sending response
+	 * @method void onMessage(Callable $function) fired before composing error response
+	 *
+	 * @property bool|null  _authenticated
+	 * @property bool _authVerified
+	 */
+	class Restler extends \Luracast\Restler\EventDispatcher
+	{
+		const VERSION = '3.1.0';
+		// ==================================================================
+		//
+		// Public variables
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Reference to the last exception thrown
+		 * @var RestException
+		 */
+		public $exception = null;
+		/**
+		 * Used in production mode to store the routes and more
+		 *
+		 * @var iCache
+		 */
+		public $cache;
+		/**
+		 * URL of the currently mapped service
+		 *
+		 * @var string
+		 */
+		public $url;
+		/**
+		 * Http request method of the current request.
+		 * Any value between [GET, PUT, POST, DELETE]
+		 *
+		 * @var string
+		 */
+		public $requestMethod;
+		/**
+		 * Requested data format.
+		 * Instance of the current format class
+		 * which implements the iFormat interface
+		 *
+		 * @var iFormat
+		 * @example jsonFormat, xmlFormat, yamlFormat etc
+		 */
+		public $requestFormat;
+		/**
+		 * Response data format.
+		 *
+		 * Instance of the current format class
+		 * which implements the iFormat interface
+		 *
+		 * @var iFormat
+		 * @example jsonFormat, xmlFormat, yamlFormat etc
+		 */
+		public $responseFormat;
+		/**
+		 * Http status code
+		 *
+		 * @var int|null when specified it will override @status comment
+		 */
+		public $responseCode = null;
+		/**
+		 * @var string base url of the api service
+		 */
+		protected $baseUrl;
+		/**
+		 * @var bool Used for waiting till verifying @format
+		 *           before throwing content negotiation failed
+		 */
+		protected $requestFormatDiffered = false;
+		/**
+		 * method information including metadata
+		 *
+		 * @var ApiMethodInfo
+		 */
+		public $apiMethodInfo;
+		/**
+		 * @var int for calculating execution time
+		 */
+		protected $startTime;
+		/**
+		 * When set to false, it will run in debug mode and parse the
+		 * class files every time to map it to the URL
+		 *
+		 * @var boolean
+		 */
+		protected $productionMode = false;
+		public $refreshCache = false;
+		/**
+		 * Caching of url map is enabled or not
+		 *
+		 * @var boolean
+		 */
+		protected $cached;
+		/**
+		 * @var int
+		 */
+		protected $apiVersion = 1;
+		/**
+		 * @var int
+		 */
+		protected $requestedApiVersion = 1;
+		/**
+		 * @var int
+		 */
+		protected $apiMinimumVersion = 1;
+		/**
+		 * @var array
+		 */
+		protected $apiVersionMap = array();
+		/**
+		 * Associated array that maps formats to their respective format class name
+		 *
+		 * @var array
+		 */
+		protected $formatMap = array();
+		/**
+		 * List of the Mime Types that can be produced as a response by this API
+		 *
+		 * @var array
+		 */
+		protected $writableMimeTypes = array();
+		/**
+		 * List of the Mime Types that are supported for incoming requests by this API
+		 *
+		 * @var array
+		 */
+		protected $readableMimeTypes = array();
+		/**
+		 * Associated array that maps formats to their respective format class name
+		 *
+		 * @var array
+		 */
+		protected $formatOverridesMap = array('extensions' => array());
+		/**
+		 * list of filter classes
+		 *
+		 * @var array
+		 */
+		protected $filterClasses = array();
+		/**
+		 * instances of filter classes that are executed after authentication
+		 *
+		 * @var array
+		 */
+		protected $postAuthFilterClasses = array();
+		// ==================================================================
+		//
+		// Protected variables
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Data sent to the service
+		 *
+		 * @var array
+		 */
+		protected $requestData = array();
+		/**
+		 * list of authentication classes
+		 *
+		 * @var array
+		 */
+		protected $authClasses = array();
+		/**
+		 * list of error handling classes
+		 *
+		 * @var array
+		 */
+		protected $errorClasses = array();
+		protected $authenticated = false;
+		protected $authVerified = false;
+		/**
+		 * @var mixed
+		 */
+		protected $responseData;
+		/**
+		 * Constructor
+		 *
+		 * @param boolean $productionMode    When set to false, it will run in
+		 *                                   debug mode and parse the class files
+		 *                                   every time to map it to the URL
+		 *
+		 * @param bool    $refreshCache      will update the cache when set to true
+		 */
+		public function __construct($productionMode = false, $refreshCache = false)
+		{
+		}
+		/**
+		 * Main function for processing the api request
+		 * and return the response
+		 *
+		 * @throws Exception     when the api service class is missing
+		 * @throws RestException to send error response
+		 */
+		public function handle()
+		{
+		}
+		/**
+		 * read the request details
+		 *
+		 * Find out the following
+		 *  - baseUrl
+		 *  - url requested
+		 *  - version requested (if url based versioning)
+		 *  - http verb/method
+		 *  - negotiate content type
+		 *  - request data
+		 *  - set defaults
+		 */
+		protected function get()
+		{
+		}
+		/**
+		 * Returns a list of the mime types (e.g.  ["application/json","application/xml"]) that the API can respond with
+		 * @return array
+		 */
+		public function getWritableMimeTypes()
+		{
+		}
+		/**
+		 * Returns the list of Mime Types for the request that the API can understand
+		 * @return array
+		 */
+		public function getReadableMimeTypes()
+		{
+		}
+		/**
+		 * Call this method and pass all the formats that should be  supported by
+		 * the API Server. Accepts multiple parameters
+		 *
+		 * @param string ,... $formatName   class name of the format class that
+		 *                                  implements iFormat
+		 *
+		 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
+		 * @throws Exception
+		 */
+		public function setSupportedFormats($format = null, ...$formatName)
+		{
+		}
+		/**
+		 * Call this method and pass all the formats that can be used to override
+		 * the supported formats using `@format` comment. Accepts multiple parameters
+		 *
+		 * @param string ,... $formatName   class name of the format class that
+		 *                                  implements iFormat
+		 *
+		 * @example $restler->setOverridingFormats('JsonFormat', 'XmlFormat'...);
+		 * @throws Exception
+		 */
+		public function setOverridingFormats($format = null, ...$formatName)
+		{
+		}
+		/**
+		 * Set one or more string to be considered as the base url
+		 *
+		 * When more than one base url is provided, restler will make
+		 * use of $_SERVER['HTTP_HOST'] to find the right one
+		 *
+		 * @param string ,... $url
+		 */
+		public function setBaseUrls($url, ...$otherurls)
+		{
+		}
+		/**
+		 * Parses the request url and get the api path
+		 *
+		 * @return string api path
+		 */
+		protected function getPath()
+		{
+		}
+		/**
+		 * Parses the request to figure out format of the request data
+		 *
+		 * @throws RestException
+		 * @return iFormat any class that implements iFormat
+		 * @example JsonFormat
+		 */
+		protected function getRequestFormat()
+		{
+		}
+		public function getRequestStream()
+		{
+		}
+		/**
+		 * Parses the request data and returns it
+		 *
+		 * @param bool $includeQueryParameters
+		 *
+		 * @return array php data
+		 */
+		public function getRequestData($includeQueryParameters = true)
+		{
+		}
+		/**
+		 * Find the api method to execute for the requested Url
+		 */
+		protected function route()
+		{
+		}
+		/**
+		 * Negotiate the response details such as
+		 *  - cross origin resource sharing
+		 *  - media type
+		 *  - charset
+		 *  - language
+		 *
+		 * @throws RestException
+		 */
+		protected function negotiate()
+		{
+		}
+		protected function negotiateCORS()
+		{
+		}
+		// ==================================================================
+		//
+		// Protected functions
+		//
+		// ------------------------------------------------------------------
+		/**
+		 * Parses the request to figure out the best format for response.
+		 * Extension, if present, overrides the Accept header
+		 *
+		 * @throws RestException
+		 * @return iFormat
+		 * @example JsonFormat
+		 */
+		protected function negotiateResponseFormat()
+		{
+		}
+		protected function negotiateCharset()
+		{
+		}
+		protected function negotiateLanguage()
+		{
+		}
+		/**
+		 * Filer api calls before authentication
+		 */
+		protected function preAuthFilter()
+		{
+		}
+		protected function authenticate()
+		{
+		}
+		/**
+		 * Filer api calls after authentication
+		 */
+		protected function postAuthFilter()
+		{
+		}
+		protected function validate()
+		{
+		}
+		protected function call()
+		{
+		}
+		protected function compose()
+		{
+		}
+		public function composeHeaders(\Luracast\Restler\RestException $e = null)
+		{
+		}
+		protected function respond()
+		{
+		}
+		protected function message(\Exception $exception)
+		{
+		}
+		/**
+		 * Provides backward compatibility with older versions of Restler
+		 *
+		 * @param int $version restler version
+		 *
+		 * @throws \OutOfRangeException
+		 */
+		public function setCompatibilityMode($version = 2)
+		{
+		}
+		/**
+		 * @param int $version                 maximum version number supported
+		 *                                     by  the api
+		 * @param int $minimum                 minimum version number supported
+		 * (optional)
+		 *
+		 * @throws InvalidArgumentException
+		 * @return void
+		 */
+		public function setAPIVersion($version = 1, $minimum = 1)
+		{
+		}
+		/**
+		 * Classes implementing iFilter interface can be added for filtering out
+		 * the api consumers.
+		 *
+		 * It can be used for rate limiting based on usage from a specific ip
+		 * address or filter by country, device etc.
+		 *
+		 * @param $className
+		 */
+		public function addFilterClass($className)
+		{
+		}
+		/**
+		 * protected methods will need at least one authentication class to be set
+		 * in order to allow that method to be executed
+		 *
+		 * @param string $className     of the authentication class
+		 * @param string $resourcePath  optional url prefix for mapping
+		 */
+		public function addAuthenticationClass($className, $resourcePath = null)
+		{
+		}
+		/**
+		 * Add api classes through this method.
+		 *
+		 * All the public methods that do not start with _ (underscore)
+		 * will be will be exposed as the public api by default.
+		 *
+		 * All the protected methods that do not start with _ (underscore)
+		 * will exposed as protected api which will require authentication
+		 *
+		 * @param string $className       name of the service class
+		 * @param string $resourcePath    optional url prefix for mapping, uses
+		 *                                lowercase version of the class name when
+		 *                                not specified
+		 *
+		 * @return null
+		 *
+		 * @throws Exception when supplied with invalid class name
+		 */
+		public function addAPIClass($className, $resourcePath = null)
+		{
+		}
+		/**
+		 * Add class for custom error handling
+		 *
+		 * @param string $className   of the error handling class
+		 */
+		public function addErrorClass($className)
+		{
+		}
+		/**
+		 * protected methods will need at least one authentication class to be set
+		 * in order to allow that method to be executed.  When multiple authentication
+		 * classes are in use, this function provides better performance by setting
+		 * all auth classes through a single function call.
+		 *
+		 * @param array $classNames     array of associative arrays containing
+		 *                              the authentication class name & optional
+		 *                              url prefix for mapping.
+		 */
+		public function setAuthClasses(array $classNames)
+		{
+		}
+		/**
+		 * Add multiple api classes through this method.
+		 *
+		 * This method provides better performance when large number
+		 * of API classes are in use as it processes them all at once,
+		 * as opposed to hundreds (or more) addAPIClass calls.
+		 *
+		 *
+		 * All the public methods that do not start with _ (underscore)
+		 * will be will be exposed as the public api by default.
+		 *
+		 * All the protected methods that do not start with _ (underscore)
+		 * will exposed as protected api which will require authentication
+		 *
+		 * @param array $map        array of associative arrays containing
+		 *                          the class name & optional url prefix
+		 *                          for mapping.
+		 *
+		 * @return null
+		 *
+		 * @throws Exception when supplied with invalid class name
+		 */
+		public function mapAPIClasses(array $map)
+		{
+		}
+		/**
+		 * Associated array that maps formats to their respective format class name
+		 *
+		 * @return array
+		 */
+		public function getFormatMap()
+		{
+		}
+		/**
+		 * API version requested by the client
+		 * @return int
+		 */
+		public function getRequestedApiVersion()
+		{
+		}
+		/**
+		 * When false, restler will run in debug mode and parse the class files
+		 * every time to map it to the URL
+		 *
+		 * @return bool
+		 */
+		public function getProductionMode()
+		{
+		}
+		/**
+		 * Chosen API version
+		 *
+		 * @return int
+		 */
+		public function getApiVersion()
+		{
+		}
+		/**
+		 * Base Url of the API Service
+		 *
+		 * @return string
+		 *
+		 * @example http://localhost/restler3
+		 * @example http://restler3.com
+		 */
+		public function getBaseUrl()
+		{
+		}
+		/**
+		 * List of events that fired already
+		 *
+		 * @return array
+		 */
+		public function getEvents()
+		{
+		}
+		/**
+		 * Magic method to expose some protected variables
+		 *
+		 * @param string $name name of the hidden property
+		 *
+		 * @return null|mixed
+		 */
+		public function __get($name)
+		{
+		}
+		/**
+		 * Store the url map cache if needed
+		 */
+		public function __destruct()
+		{
+		}
+		/**
+		 * pre call
+		 *
+		 * call _pre_{methodName)_{extension} if exists with the same parameters as
+		 * the api method
+		 *
+		 * @example _pre_get_json
+		 *
+		 */
+		protected function preCall()
+		{
+		}
+		/**
+		 * post call
+		 *
+		 * call _post_{methodName}_{extension} if exists with the composed and
+		 * serialized (applying the repose format) response data
+		 *
+		 * @example _post_get_json
+		 */
+		protected function postCall()
+		{
+		}
+	}
+	/**
+	 * Router class that routes the urls to api methods along with parameters
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Routes
+	{
+		public static $prefixingParameterNames = array('id');
+		public static $fieldTypesByName = array('email' => 'email', 'password' => 'password', 'phone' => 'tel', 'mobile' => 'tel', 'tel' => 'tel', 'search' => 'search', 'date' => 'date', 'created_at' => 'datetime', 'modified_at' => 'datetime', 'url' => 'url', 'link' => 'url', 'href' => 'url', 'website' => 'url', 'color' => 'color', 'colour' => 'color');
+		protected static $routes = array();
+		protected static $models = array();
+		/**
+		 * Route the public and protected methods of an Api class
+		 *
+		 * @param string $className
+		 * @param string $resourcePath
+		 * @param int    $version
+		 *
+		 * @throws RestException
+		 */
+		public static function addAPIClass($className, $resourcePath = '', $version = 1)
+		{
+		}
+		/**
+		 * @access private
+		 */
+		public static function typeChar($type = null)
+		{
+		}
+		protected static function addPath($path, array $call, $httpMethod = 'GET', $version = 1)
+		{
+		}
+		/**
+		 * Find the api method for the given url and http method
+		 *
+		 * @param string $path       Requested url path
+		 * @param string $httpMethod GET|POST|PUT|PATCH|DELETE etc
+		 * @param int    $version    Api Version number
+		 * @param array  $data       Data collected from the request
+		 *
+		 * @throws RestException
+		 * @return ApiMethodInfo
+		 */
+		public static function find($path, $httpMethod, $version = 1, array $data = array())
+		{
+		}
+		public static function findAll(array $excludedPaths = array(), array $excludedHttpMethods = array(), $version = 1)
+		{
+		}
+		public static function verifyAccess($route)
+		{
+		}
+		/**
+		 * Populates the parameter values
+		 *
+		 * @param array $call
+		 * @param       $data
+		 *
+		 * @return ApiMethodInfo
+		 *
+		 * @access private
+		 */
+		protected static function populate(array $call, $data)
+		{
+		}
+		/**
+		 * @access private
+		 */
+		protected static function pathVarTypeOf($var)
+		{
+		}
+		protected static function typeMatch($type, $var)
+		{
+		}
+		protected static function parseMagic(\ReflectionClass $class, $forResponse = true)
+		{
+		}
+		/**
+		 * Get the type and associated model
+		 *
+		 * @param ReflectionClass $class
+		 * @param array           $scope
+		 *
+		 * @throws RestException
+		 * @throws \Exception
+		 * @return array
+		 *
+		 * @access protected
+		 */
+		protected static function getTypeAndModel(\ReflectionClass $class, array $scope, $prefix = '', array $rules = array())
+		{
+		}
+		/**
+		 * Import previously created routes from cache
+		 *
+		 * @param array $routes
+		 */
+		public static function fromArray(array $routes)
+		{
+		}
+		/**
+		 * Export current routes for cache
+		 *
+		 * @return array
+		 */
+		public static function toArray()
+		{
+		}
+		public static function type($var)
+		{
+		}
+		public static function scope(\ReflectionClass $class)
+		{
+		}
+	}
+	/**
+	 * Scope resolution class, manages instantiation and acts as a dependency
+	 * injection container
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Scope
+	{
+		public static $classAliases = array(
+			//Core
+			'Restler' => 'Luracast\\Restler\\Restler',
+			//Format classes
+			'AmfFormat' => 'Luracast\\Restler\\Format\\AmfFormat',
+			'JsFormat' => 'Luracast\\Restler\\Format\\JsFormat',
+			'JsonFormat' => 'Luracast\\Restler\\Format\\JsonFormat',
+			'HtmlFormat' => 'Luracast\\Restler\\Format\\HtmlFormat',
+			'PlistFormat' => 'Luracast\\Restler\\Format\\PlistFormat',
+			'UploadFormat' => 'Luracast\\Restler\\Format\\UploadFormat',
+			'UrlEncodedFormat' => 'Luracast\\Restler\\Format\\UrlEncodedFormat',
+			'XmlFormat' => 'Luracast\\Restler\\Format\\XmlFormat',
+			'YamlFormat' => 'Luracast\\Restler\\Format\\YamlFormat',
+			'CsvFormat' => 'Luracast\\Restler\\Format\\CsvFormat',
+			'TsvFormat' => 'Luracast\\Restler\\Format\\TsvFormat',
+			//Filter classes
+			'RateLimit' => 'Luracast\\Restler\\Filter\\RateLimit',
+			//UI classes
+			'Forms' => 'Luracast\\Restler\\UI\\Forms',
+			'Nav' => 'Luracast\\Restler\\UI\\Nav',
+			'Emmet' => 'Luracast\\Restler\\UI\\Emmet',
+			'T' => 'Luracast\\Restler\\UI\\Tags',
+			//API classes
+			'Resources' => 'Luracast\\Restler\\Resources',
+			'Explorer' => 'Luracast\\Restler\\Explorer\\v2\\Explorer',
+			'Explorer1' => 'Luracast\\Restler\\Explorer\\v1\\Explorer',
+			'Explorer2' => 'Luracast\\Restler\\Explorer\\v2\\Explorer',
+			//Cache classes
+			'HumanReadableCache' => 'Luracast\\Restler\\HumanReadableCache',
+			'ApcCache' => 'Luracast\\Restler\\ApcCache',
+			'MemcacheCache' => 'Luracast\\Restler\\MemcacheCache',
+			//Utility classes
+			'Object' => 'Luracast\\Restler\\Data\\Obj',
+			'Text' => 'Luracast\\Restler\\Data\\Text',
+			'Arr' => 'Luracast\\Restler\\Data\\Arr',
+			//Exception
+			'RestException' => 'Luracast\\Restler\\RestException',
+		);
+		/**
+		 * @var null|Callable adding a resolver function that accepts
+		 * the class name as the parameter and returns an instance of the class
+		 * as a singleton. Allows the use of your favourite DI container
+		 */
+		public static $resolver = null;
+		public static $properties = array();
+		protected static $instances = array();
+		protected static $registry = array();
+		/**
+		 * @param string   $name
+		 * @param callable $function
+		 * @param bool     $singleton
+		 */
+		public static function register($name, $function, $singleton = true)
+		{
+		}
+		public static function set($name, $instance)
+		{
+		}
+		public static function get($name)
+		{
+		}
+		/**
+		 * Get fully qualified class name for the given scope
+		 *
+		 * @param string $className
+		 * @param array  $scope local scope
+		 *
+		 * @return string|boolean returns the class name or false
+		 */
+		public static function resolve($className, array $scope)
+		{
+		}
+	}
+}
+namespace Luracast\Restler\UI {
+	/**
+	 * Class Emmet
+	 * @package Luracast\Restler\UI
+	 *
+	 * @version 3.1.0
+	 */
+	class Emmet
+	{
+		const DELIMITERS = '.#*>+^[=" ]{$@-#}';
+		/**
+		 * Create the needed tag hierarchy from emmet string
+		 *
+		 * @param string       $string
+		 *
+		 * @param array|string $data
+		 *
+		 * @return array|T
+		 */
+		public static function make($string, $data = null)
+		{
+		}
+		public static function tokenize($string)
+		{
+		}
+	}
+	/**
+	 * Utility class for automatically generating forms for the given http method
+	 * and api url
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Forms implements \Luracast\Restler\iFilter
+	{
+		const FORM_KEY = 'form_key';
+		public static $filterFormRequestsOnly = false;
+		public static $excludedPaths = array();
+		/**
+		 * @var bool should we fill up the form using given data?
+		 */
+		public static $preFill = true;
+		/**
+		 * @var ValidationInfo
+		 */
+		public static $validationInfo = null;
+		protected static $inputTypes = array('hidden', 'password', 'button', 'image', 'file', 'reset', 'submit', 'search', 'checkbox', 'radio', 'email', 'text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'range', 'search', 'tel', 'time', 'url', 'week');
+		protected static $fileUpload = false;
+		public static function setStyles(\Luracast\Restler\UI\HtmlForm $style)
+		{
+		}
+		/**
+		 * Get the form
+		 *
+		 * @param string $method   http method to submit the form
+		 * @param string $action   relative path from the web root. When set to null
+		 *                         it uses the current api method's path
+		 * @param bool   $dataOnly if you want to render the form yourself use this
+		 *                         option
+		 * @param string $prefix   used for adjusting the spacing in front of
+		 *                         form elements
+		 * @param string $indent   used for adjusting indentation
+		 *
+		 * @return array|T
+		 *
+		 * @throws RestException
+		 */
+		public static function get($method = 'POST', $action = null, $dataOnly = false, $prefix = '', $indent = '    ')
+		{
+		}
+		public static function style($name, array $metadata, $type = '')
+		{
+		}
+		public static function fields($dataOnly = false)
+		{
+		}
+		/**
+		 * @param ValidationInfo $p
+		 *
+		 * @param bool           $dataOnly
+		 *
+		 * @return array|T
+		 */
+		public static function field(\Luracast\Restler\Data\ValidationInfo $p, $dataOnly = false)
+		{
+		}
+		protected static function guessFieldType(\Luracast\Restler\Data\ValidationInfo $p, $type = 'type')
+		{
+		}
+		/**
+		 * Get the form key
+		 *
+		 * @param string $method   http method for form key
+		 * @param string $action   relative path from the web root. When set to null
+		 *                         it uses the current api method's path
+		 *
+		 * @return string generated form key
+		 */
+		public static function key($method = 'POST', $action = null)
+		{
+		}
+		/**
+		 * Access verification method.
+		 *
+		 * API access will be denied when this method returns false
+		 *
+		 * @return boolean true when api access is allowed false otherwise
+		 *
+		 * @throws RestException 403 security violation
+		 */
+		public function __isAllowed()
+		{
+		}
+	}
+	/**
+	 * Utility class for providing preset styles for html forms
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 * @version    3.0.0rc6
+	 */
+	class FormStyles
+	{
+		public static $html = array(
+			'form' => 'form[role=form id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
+			'input' => '.row>section>label{$label#}^input[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]',
+			'textarea' => '.row>label{$label#}^textarea[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}',
+			'radio' => '.row>section>label{$label#}^span>label*options>input[id=$id# name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]+{ $text#}',
+			'select' => '.row>label{$label#}^select[id=$id# name=$name# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
+			'submit' => '.row>label{ &nbsp; }^button[id=$id# type=submit disabled=$disabled#]{$label#}',
+			'fieldset' => 'fieldset>legend{$label#}',
+			'checkbox' => '.row>label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# accept=$accept# disabled=$disabled#]+{$label#}',
+			//------------- TYPE BASED STYLES ---------------------//
+			'checkbox-array' => 'fieldset>legend{$label#}+section*options>label>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# accept=$accept#]+{ $text#}',
+			'select-array' => 'label{$label#}+select[name=$name# required=$required# multiple style="height: auto;background-image: none; outline: inherit;"]>option[value=$value# selected=$selected#]{$text#}*options',
+		);
+		public static $bootstrap3 = array(
+			'form' => 'form[role=form id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
+			'input' => '.form-group.$error#>label{$label#}+input.form-control[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]+small.help-block>{$message#}',
+			'textarea' => '.form-group>label{$label#}+textarea.form-control[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}+small.help-block>{$message#}',
+			'radio' => 'fieldset>legend{$label#}>.radio*options>label>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]{$text#}+p.help-block>{$message#}',
+			'select' => '.form-group>label{$label#}+select.form-control[id=$id# name=$name# multiple=$multiple# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
+			'submit' => 'button.btn.btn-primary[id=$id# type=submit]{$label#} disabled=$disabled#',
+			'fieldset' => 'fieldset>legend{$label#}',
+			'checkbox' => '.checkbox>label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# disabled=$disabled#]+{$label#}^p.help-block>{$error#}',
+			//------------- TYPE BASED STYLES ---------------------//
+			'checkbox-array' => 'fieldset>legend{$label#}>.checkbox*options>label>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required#]{$text#}',
+			'select-array' => '.form-group>label{$label#}+select.form-control[name=$name# multiple=$multiple# required=$required#] size=$options#>option[value=$value# selected=$selected#]{$text#}*options',
+			//------------- CUSTOM STYLES ---------------------//
+			'radio-inline' => '.form-group>label{$label# : &nbsp;}+label.radio-inline*options>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required#]+{$text#}',
+		);
+		public static $foundation5 = array(
+			'form' => 'form[id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
+			'input' => 'label{$label#}+input[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]',
+			'textarea' => 'label{$label#}+textarea[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}',
+			'radio' => 'label{$label# : &nbsp;}+label.radio-inline*options>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]+{$text#}',
+			'select' => 'label{$label#}+select[id=$id# name=$name# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
+			'submit' => 'button.button[id=$id# type=submit disabled=$disabled#]{$label#}',
+			'fieldset' => 'fieldset>legend{$label#}',
+			'checkbox' => 'label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# disabled=$disabled#]+{ $label#}',
+			//------------- TYPE BASED STYLES ---------------------//
+			'checkbox-array' => 'fieldset>legend{$label#}+label*options>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus#]+{ $text#}',
+			'select-array' => 'label{$label#}+select[name=$name# required=$required# multiple style="height: auto;background-image: none; outline: inherit;"]>option[value=$value# selected=$selected#]{$text#}*options',
+		);
+	}
+	/**
+	 * Utility class for automatically creating data to build an navigation interface
+	 * based on available routes that are accessible by the current user
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Nav
+	{
+		protected static $tree = array();
+		public static $root = 'home';
+		/**
+		 * @var array all paths beginning with any of the following will be excluded
+		 * from documentation. if an empty string is given it will exclude the root
+		 */
+		public static $excludedPaths = array('');
+		/**
+		 * @var array prefix additional menu items with one of the following syntax
+		 *            [$path => $text]
+		 *            [$path]
+		 *            [$path => ['text' => $text, 'url' => $url, 'trail'=> $trail]]
+		 */
+		public static $prepends = array();
+		/**
+		 * @var array suffix additional menu items with one of the following syntax
+		 *            [$path => $text]
+		 *            [$path]
+		 *            [$path => ['text' => $text, 'url' => $url, 'trail'=> $trail]]
+		 */
+		public static $appends = array();
+		public static $addExtension = true;
+		protected static $extension = '';
+		protected static $activeTrail = '';
+		protected static $url;
+		public static function get($for = '', $activeTrail = null)
+		{
+		}
+		protected static function &nested(array &$tree, array $parts)
+		{
+		}
+		public static function addUrls(array $urls)
+		{
+		}
+		public static function add($url, $label = null, $trail = null)
+		{
+		}
+		public static function build(array $r)
+		{
+		}
+	}
+	/**
+	 * Utility class for generating html tags in an object oriented way
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 *
+	 * ============================ magic  properties ==============================
+	 * @property Tags parent parent tag
+	 * ============================== magic  methods ===============================
+	 * @method Tags name(string $value) name attribute
+	 * @method Tags action(string $value) action attribute
+	 * @method Tags placeholder(string $value) placeholder attribute
+	 * @method Tags value(string $value) value attribute
+	 * @method Tags required(boolean $value) required attribute
+	 * @method Tags class(string $value) required attribute
+	 *
+	 * =========================== static magic methods ============================
+	 * @method static Tags form() creates a html form
+	 * @method static Tags input() creates a html input element
+	 * @method static Tags button() creates a html button element
+	 *
+	 */
+	class Tags implements \ArrayAccess, \Countable
+	{
+		public static $humanReadable = true;
+		public static $initializer = null;
+		protected static $instances = array();
+		public $prefix = '';
+		public $indent = '    ';
+		public $tag;
+		protected $attributes = array();
+		protected $children = array();
+		protected $_parent;
+		public function __construct($name = null, array $children = array())
+		{
+		}
+		/**
+		 * Get Tag by id
+		 *
+		 * Retrieve a tag by its id attribute
+		 *
+		 * @param string $id
+		 *
+		 * @return Tags|null
+		 */
+		public static function byId($id)
+		{
+		}
+		/**
+		 * @param       $name
+		 * @param array $children
+		 *
+		 * @return Tags
+		 */
+		public static function __callStatic($name, array $children)
+		{
+		}
+		public function toString($prefix = '', $indent = '    ')
+		{
+		}
+		public function __toString()
+		{
+		}
+		public function toArray()
+		{
+		}
+		/**
+		 * Set the id attribute of the current tag
+		 *
+		 * @param string $value
+		 *
+		 * @return string
+		 */
+		public function id($value)
+		{
+		}
+		public function __get($name)
+		{
+		}
+		public function __set($name, $value)
+		{
+		}
+		public function __isset($name)
+		{
+		}
+		/**
+		 * @param $attribute
+		 * @param $value
+		 *
+		 * @return Tags
+		 */
+		public function __call($attribute, $value)
+		{
+		}
+		public function offsetGet($index)
+		{
+		}
+		public function offsetExists($index)
+		{
+		}
+		public function offsetSet($index, $value)
+		{
+		}
+		public function offsetUnset($index)
+		{
+		}
+		public function getContents()
+		{
+		}
+		public function count()
+		{
+		}
+	}
+}
+namespace Luracast\Restler {
+	/**
+	 * Information gathered about the api user is kept here using static methods
+	 * and properties for other classes to make use of them.
+	 * Typically Authentication classes populate them
+	 *
+	 * @category   Framework
+	 * @package    restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class User implements \Luracast\Restler\iIdentifyUser
+	{
+		public static $id = null;
+		public static $cacheId = null;
+		public static $ip;
+		public static $browser = '';
+		public static $platform = '';
+		public static function init()
+		{
+		}
+		public static function getUniqueIdentifier($includePlatform = false)
+		{
+		}
+		public static function getIpAddress($ignoreProxies = false)
+		{
+		}
+		/**
+		 * Authentication classes should call this method
+		 *
+		 * @param string $id user id as identified by the authentication classes
+		 *
+		 * @return void
+		 */
+		public static function setUniqueIdentifier($id)
+		{
+		}
+		/**
+		 * User identity to be used for caching purpose
+		 *
+		 * When the dynamic cache service places an object in the cache, it needs to
+		 * label it with a unique identifying string known as a cache ID. This
+		 * method gives that identifier
+		 *
+		 * @return string
+		 */
+		public static function getCacheIdentifier()
+		{
+		}
+		/**
+		 * User identity for caching purpose
+		 *
+		 * In a role based access control system this will be based on role
+		 *
+		 * @param $id
+		 *
+		 * @return void
+		 */
+		public static function setCacheIdentifier($id)
+		{
+		}
+	}
+	/**
+	 * Describe the purpose of this class/interface/trait
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @author     R.Arul Kumaran <arul@luracast.com>
+	 * @copyright  2010 Luracast
+	 * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+	 * @link       http://luracast.com/products/restler/
+	 *
+	 */
+	class Util
+	{
+		/**
+		 * @var Restler instance injected at runtime
+		 */
+		public static $restler;
+		/**
+		 * verify if the given data type string is scalar or not
+		 *
+		 * @static
+		 *
+		 * @param string $type data type as string
+		 *
+		 * @return bool true or false
+		 */
+		public static function isObjectOrArray($type)
+		{
+		}
+		/**
+		 * Get the value deeply nested inside an array / object
+		 *
+		 * Using isset() to test the presence of nested value can give a false positive
+		 *
+		 * This method serves that need
+		 *
+		 * When the deeply nested property is found its value is returned, otherwise
+		 * false is returned.
+		 *
+		 * @param array|object $from    array to extract the value from
+		 * @param string|array $key     ... pass more to go deeply inside the array
+		 *                              alternatively you can pass a single array
+		 *
+		 * @return null|mixed null when not found, value otherwise
+		 */
+		public static function nestedValue($from, $key)
+		{
+		}
+		public static function getResourcePath($className, $resourcePath = null, $prefix = '')
+		{
+		}
+		/**
+		 * Compare two strings and remove the common
+		 * sub string from the first string and return it
+		 *
+		 * @static
+		 *
+		 * @param string $fromPath
+		 * @param string $usingPath
+		 * @param string $char
+		 *            optional, set it as
+		 *            blank string for char by char comparison
+		 *
+		 * @return string
+		 */
+		public static function removeCommonPath($fromPath, $usingPath, $char = '/')
+		{
+		}
+		/**
+		 * Compare two strings and split the common
+		 * sub string from the first string and return it as array
+		 *
+		 * @static
+		 *
+		 * @param string $fromPath
+		 * @param string $usingPath
+		 * @param string $char
+		 *            optional, set it as
+		 *            blank string for char by char comparison
+		 *
+		 * @return array with 2 strings first is the common string and second is the remaining in $fromPath
+		 */
+		public static function splitCommonPath($fromPath, $usingPath, $char = '/')
+		{
+		}
+		/**
+		 * Parses the request to figure out the http request type
+		 *
+		 * @static
+		 *
+		 * @return string which will be one of the following
+		 *        [GET, POST, PUT, PATCH, DELETE]
+		 * @example GET
+		 */
+		public static function getRequestMethod()
+		{
+		}
+		/**
+		 * Pass any content negotiation header such as Accept,
+		 * Accept-Language to break it up and sort the resulting array by
+		 * the order of negotiation.
+		 *
+		 * @static
+		 *
+		 * @param string $accept header value
+		 *
+		 * @return array sorted by the priority
+		 */
+		public static function sortByPriority($accept)
+		{
+		}
+		public static function getShortName($className)
+		{
+		}
+	}
+}
+namespace {
+	/**
+	 * Include function in the root namespace to include files optimized
+	 * for the global context.
+	 *
+	 * @param $path string path of php file to include into the global context.
+	 *
+	 * @return mixed|bool false if the file could not be included.
+	 */
+	function Luracast_Restler_autoloaderInclude($path)
+	{
+	}
+}
+namespace {
+	function exceptions()
+	{
+	}
+	function parse_backtrace($raw, $skip = 1)
+	{
+	}
+	function render($data, $shadow = \true)
+	{
+	}
+}
diff --git a/dev/tools/phan/stubs/session.phan_php b/dev/tools/phan/stubs/session.phan_php
new file mode 100644
index 00000000000..fc93388c7ad
--- /dev/null
+++ b/dev/tools/phan/stubs/session.phan_php
@@ -0,0 +1,68 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension session@7.4.12
+
+namespace {
+class SessionHandler implements \SessionHandlerInterface, \SessionIdInterface {
+
+    // methods
+    public function open($save_path, $session_name) {}
+    public function close() {}
+    public function read($key) {}
+    public function write($key, $val) {}
+    public function destroy($key) {}
+    public function gc($maxlifetime) {}
+    public function create_sid() {}
+}
+
+interface SessionHandlerInterface {
+
+    // methods
+    function open($save_path, $session_name);
+    function close();
+    function read($key);
+    function write($key, $val);
+    function destroy($key);
+    function gc($maxlifetime);
+}
+
+interface SessionIdInterface {
+
+    // methods
+    function create_sid();
+}
+
+interface SessionUpdateTimestampHandlerInterface {
+
+    // methods
+    function validateId($key);
+    function updateTimestamp($key, $val);
+}
+
+function session_abort() {}
+function session_cache_expire($new_cache_expire = null) {}
+function session_cache_limiter($cache_limiter = null) {}
+function session_commit() {}
+function session_create_id($prefix = null) {}
+function session_decode($data) {}
+function session_destroy() {}
+function session_encode() {}
+function session_gc() {}
+function session_get_cookie_params() {}
+function session_id($id = null) {}
+function session_module_name($module = null) {}
+function session_name($name = null) {}
+function session_regenerate_id($delete_old_session = null) {}
+function session_register_shutdown() {}
+function session_reset() {}
+function session_save_path($path = null) {}
+function session_set_cookie_params($lifetime_or_options, $path = null, $domain = null, $secure = null, $httponly = null) {}
+function session_set_save_handler($open, $close = null, $read = null, $write = null, $destroy = null, $gc = null, $create_sid = null, $validate_sid = null, $update_timestamp = null) {}
+function session_start($options = null) {}
+function session_status() {}
+function session_unset() {}
+function session_write_close() {}
+const PHP_SESSION_ACTIVE = 2;
+const PHP_SESSION_DISABLED = 0;
+const PHP_SESSION_NONE = 1;
+}
diff --git a/dev/tools/phan/stubs/soap.phan_php b/dev/tools/phan/stubs/soap.phan_php
new file mode 100644
index 00000000000..616c51e5e0d
--- /dev/null
+++ b/dev/tools/phan/stubs/soap.phan_php
@@ -0,0 +1,220 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension soap@8.2.9
+
+namespace {
+class SoapClient {
+
+    // properties
+    private $uri;
+    private $style;
+    private $use;
+    private $location;
+    private $trace;
+    private $compression;
+    private $sdl;
+    private $typemap;
+    private $httpsocket;
+    private $httpurl;
+    private $_login;
+    private $_password;
+    private $_use_digest;
+    private $_digest;
+    private $_proxy_host;
+    private $_proxy_port;
+    private $_proxy_login;
+    private $_proxy_password;
+    private $_exceptions;
+    private $_encoding;
+    private $_classmap;
+    private $_features;
+    private $_connection_timeout;
+    private $_stream_context;
+    private $_user_agent;
+    private $_keep_alive;
+    private $_ssl_method;
+    private $_use_proxy;
+    private $_cookies;
+    private $__default_headers;
+    private $__soap_fault;
+    private $__last_request;
+    private $__last_response;
+    private $__last_request_headers;
+    private $__last_response_headers;
+    private $_soap_version;
+
+    // methods
+    public function __construct(?string $wsdl, array $options = []) {}
+    public function __call(string $name, array $args) : mixed {}
+    public function __soapCall(string $name, array $args, ?array $options = null, $inputHeaders = null, &$outputHeaders = null) : mixed {}
+    public function __getFunctions() : ?array {}
+    public function __getTypes() : ?array {}
+    public function __getLastRequest() : ?string {}
+    public function __getLastResponse() : ?string {}
+    public function __getLastRequestHeaders() : ?string {}
+    public function __getLastResponseHeaders() : ?string {}
+    public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false) : ?string {}
+    public function __setCookie(string $name, ?string $value = null) : void {}
+    public function __getCookies() : array {}
+    public function __setSoapHeaders($headers = null) : bool {}
+    public function __setLocation(?string $location = null) : ?string {}
+}
+
+class SoapFault extends \Exception {
+
+    // properties
+    protected $message;
+    protected $code;
+    protected $file;
+    protected $line;
+    public $faultcode;
+    public $faultcodens;
+    public $faultactor;
+    public $detail;
+    public $_name;
+    public $headerfault;
+    public $faultstring;
+
+    // methods
+    public function __construct(array|null|string $code, string $string, ?string $actor = null, mixed $details = null, ?string $name = null, mixed $headerFault = null) {}
+    public function __toString() : string {}
+}
+
+class SoapHeader {
+
+    // properties
+    public $data;
+    public $namespace;
+    public $name;
+    public $mustUnderstand;
+    public $actor;
+
+    // methods
+    public function __construct(string $namespace, string $name, mixed $data = null, bool $mustUnderstand = false, int|null|string $actor = null) {}
+}
+
+class SoapParam {
+
+    // properties
+    public $param_name;
+    public $param_data;
+
+    // methods
+    public function __construct(mixed $data, string $name) {}
+}
+
+class SoapServer {
+
+    // properties
+    private $__soap_fault;
+
+    // methods
+    public function __construct(?string $wsdl, array $options = []) {}
+    public function fault(string $code, string $string, string $actor = '', mixed $details = null, string $name = '') : void {}
+    public function addSoapHeader(\SoapHeader $header) : void {}
+    public function setPersistence(int $mode) : void {}
+    public function setClass(string $class, mixed ...$args) : void {}
+    public function setObject(object $object) : void {}
+    public function getFunctions() : array {}
+    public function addFunction($functions) : void {}
+    public function handle(?string $request = null) : void {}
+}
+
+class SoapVar {
+
+    // properties
+    public $enc_value;
+    public $enc_stype;
+    public $enc_ns;
+    public $enc_name;
+    public $enc_namens;
+    public $enc_type;
+
+    // methods
+    public function __construct(mixed $data, ?int $encoding, ?string $typeName = null, ?string $typeNamespace = null, ?string $nodeName = null, ?string $nodeNamespace = null) {}
+}
+
+function is_soap_fault(mixed $object) : bool {}
+function use_soap_error_handler(bool $enable = true) : bool {}
+const APACHE_MAP = 200;
+const SOAP_1_1 = 1;
+const SOAP_1_2 = 2;
+const SOAP_ACTOR_NEXT = 1;
+const SOAP_ACTOR_NONE = 2;
+const SOAP_ACTOR_UNLIMATERECEIVER = 3;
+const SOAP_AUTHENTICATION_BASIC = 0;
+const SOAP_AUTHENTICATION_DIGEST = 1;
+const SOAP_COMPRESSION_ACCEPT = 32;
+const SOAP_COMPRESSION_DEFLATE = 16;
+const SOAP_COMPRESSION_GZIP = 0;
+const SOAP_DOCUMENT = 2;
+const SOAP_ENCODED = 1;
+const SOAP_ENC_ARRAY = 300;
+const SOAP_ENC_OBJECT = 301;
+const SOAP_FUNCTIONS_ALL = 999;
+const SOAP_LITERAL = 2;
+const SOAP_PERSISTENCE_REQUEST = 2;
+const SOAP_PERSISTENCE_SESSION = 1;
+const SOAP_RPC = 1;
+const SOAP_SINGLE_ELEMENT_ARRAYS = 1;
+const SOAP_SSL_METHOD_SSLv2 = 1;
+const SOAP_SSL_METHOD_SSLv3 = 2;
+const SOAP_SSL_METHOD_SSLv23 = 3;
+const SOAP_SSL_METHOD_TLS = 0;
+const SOAP_USE_XSI_ARRAY_TYPE = 4;
+const SOAP_WAIT_ONE_WAY_CALLS = 2;
+const UNKNOWN_TYPE = 999998;
+const WSDL_CACHE_BOTH = 3;
+const WSDL_CACHE_DISK = 1;
+const WSDL_CACHE_MEMORY = 2;
+const WSDL_CACHE_NONE = 0;
+const XSD_1999_NAMESPACE = 'http://www.w3.org/1999/XMLSchema';
+const XSD_1999_TIMEINSTANT = 401;
+const XSD_ANYTYPE = 145;
+const XSD_ANYURI = 117;
+const XSD_ANYXML = 147;
+const XSD_BASE64BINARY = 116;
+const XSD_BOOLEAN = 102;
+const XSD_BYTE = 137;
+const XSD_DATE = 109;
+const XSD_DATETIME = 107;
+const XSD_DECIMAL = 103;
+const XSD_DOUBLE = 105;
+const XSD_DURATION = 106;
+const XSD_ENTITIES = 130;
+const XSD_ENTITY = 129;
+const XSD_FLOAT = 104;
+const XSD_GDAY = 113;
+const XSD_GMONTH = 114;
+const XSD_GMONTHDAY = 112;
+const XSD_GYEAR = 111;
+const XSD_GYEARMONTH = 110;
+const XSD_HEXBINARY = 115;
+const XSD_ID = 126;
+const XSD_IDREF = 127;
+const XSD_IDREFS = 128;
+const XSD_INT = 135;
+const XSD_INTEGER = 131;
+const XSD_LANGUAGE = 122;
+const XSD_LONG = 134;
+const XSD_NAME = 124;
+const XSD_NAMESPACE = 'http://www.w3.org/2001/XMLSchema';
+const XSD_NCNAME = 125;
+const XSD_NEGATIVEINTEGER = 133;
+const XSD_NMTOKEN = 123;
+const XSD_NMTOKENS = 144;
+const XSD_NONNEGATIVEINTEGER = 138;
+const XSD_NONPOSITIVEINTEGER = 132;
+const XSD_NORMALIZEDSTRING = 120;
+const XSD_NOTATION = 119;
+const XSD_POSITIVEINTEGER = 143;
+const XSD_QNAME = 118;
+const XSD_SHORT = 136;
+const XSD_STRING = 101;
+const XSD_TIME = 108;
+const XSD_TOKEN = 121;
+const XSD_UNSIGNEDBYTE = 142;
+const XSD_UNSIGNEDINT = 140;
+const XSD_UNSIGNEDLONG = 139;
+const XSD_UNSIGNEDSHORT = 141;
+}
diff --git a/dev/tools/phan/stubs/sockets.phan_php b/dev/tools/phan/stubs/sockets.phan_php
new file mode 100644
index 00000000000..7bbf2bf27c8
--- /dev/null
+++ b/dev/tools/phan/stubs/sockets.phan_php
@@ -0,0 +1,260 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension sockets@8.2.9
+
+namespace {
+final class AddressInfo {
+}
+
+final class Socket {
+}
+
+function socket_accept(\Socket $socket) : \Socket|false {}
+function socket_addrinfo_bind(\AddressInfo $address) : \Socket|false {}
+function socket_addrinfo_connect(\AddressInfo $address) : \Socket|false {}
+function socket_addrinfo_explain(\AddressInfo $address) : array {}
+function socket_addrinfo_lookup(string $host, ?string $service = null, array $hints = []) : array|false {}
+function socket_bind(\Socket $socket, string $address, int $port = 0) : bool {}
+function socket_clear_error(?\Socket $socket = null) : void {}
+function socket_close(\Socket $socket) : void {}
+function socket_cmsg_space(int $level, int $type, int $num = 0) : ?int {}
+function socket_connect(\Socket $socket, string $address, ?int $port = null) : bool {}
+function socket_create(int $domain, int $type, int $protocol) : \Socket|false {}
+function socket_create_listen(int $port, int $backlog = 128) : \Socket|false {}
+function socket_create_pair(int $domain, int $type, int $protocol, &$pair) : bool {}
+function socket_export_stream(\Socket $socket) {}
+function socket_get_option(\Socket $socket, int $level, int $option) : array|false|int {}
+function socket_getopt(\Socket $socket, int $level, int $option) : array|false|int {}
+function socket_getpeername(\Socket $socket, &$address, &$port = null) : bool {}
+function socket_getsockname(\Socket $socket, &$address, &$port = null) : bool {}
+function socket_import_stream($stream) : \Socket|false {}
+function socket_last_error(?\Socket $socket = null) : int {}
+function socket_listen(\Socket $socket, int $backlog = 0) : bool {}
+function socket_read(\Socket $socket, int $length, int $mode = \PHP_BINARY_READ) : false|string {}
+function socket_recv(\Socket $socket, &$data, int $length, int $flags) : false|int {}
+function socket_recvfrom(\Socket $socket, &$data, int $length, int $flags, &$address, &$port = null) : false|int {}
+function socket_recvmsg(\Socket $socket, array &$message, int $flags = 0) : false|int {}
+function socket_select(?array &$read, ?array &$write, ?array &$except, ?int $seconds, int $microseconds = 0) : false|int {}
+function socket_send(\Socket $socket, string $data, int $length, int $flags) : false|int {}
+function socket_sendmsg(\Socket $socket, array $message, int $flags = 0) : false|int {}
+function socket_sendto(\Socket $socket, string $data, int $length, int $flags, string $address, ?int $port = null) : false|int {}
+function socket_set_block(\Socket $socket) : bool {}
+function socket_set_nonblock(\Socket $socket) : bool {}
+function socket_set_option(\Socket $socket, int $level, int $option, $value) : bool {}
+function socket_setopt(\Socket $socket, int $level, int $option, $value) : bool {}
+function socket_shutdown(\Socket $socket, int $mode = 2) : bool {}
+function socket_strerror(int $error_code) : string {}
+function socket_write(\Socket $socket, string $data, ?int $length = null) : false|int {}
+const AF_INET = 2;
+const AF_INET6 = 10;
+const AF_UNIX = 1;
+const AI_ADDRCONFIG = 32;
+const AI_ALL = 16;
+const AI_CANONIDN = 128;
+const AI_CANONNAME = 2;
+const AI_IDN = 64;
+const AI_NUMERICHOST = 4;
+const AI_NUMERICSERV = 1024;
+const AI_PASSIVE = 1;
+const AI_V4MAPPED = 8;
+const IPPROTO_IP = 0;
+const IPPROTO_IPV6 = 41;
+const IPV6_HOPLIMIT = 52;
+const IPV6_MULTICAST_HOPS = 18;
+const IPV6_MULTICAST_IF = 17;
+const IPV6_MULTICAST_LOOP = 19;
+const IPV6_PKTINFO = 50;
+const IPV6_RECVHOPLIMIT = 51;
+const IPV6_RECVPKTINFO = 49;
+const IPV6_RECVTCLASS = 66;
+const IPV6_TCLASS = 67;
+const IPV6_UNICAST_HOPS = 16;
+const IPV6_V6ONLY = 26;
+const IP_MULTICAST_IF = 32;
+const IP_MULTICAST_LOOP = 34;
+const IP_MULTICAST_TTL = 33;
+const MCAST_BLOCK_SOURCE = 43;
+const MCAST_JOIN_GROUP = 42;
+const MCAST_JOIN_SOURCE_GROUP = 46;
+const MCAST_LEAVE_GROUP = 45;
+const MCAST_LEAVE_SOURCE_GROUP = 47;
+const MCAST_UNBLOCK_SOURCE = 44;
+const MSG_CMSG_CLOEXEC = 1073741824;
+const MSG_CONFIRM = 2048;
+const MSG_CTRUNC = 8;
+const MSG_DONTROUTE = 4;
+const MSG_DONTWAIT = 64;
+const MSG_EOF = 512;
+const MSG_EOR = 128;
+const MSG_ERRQUEUE = 8192;
+const MSG_MORE = 32768;
+const MSG_NOSIGNAL = 16384;
+const MSG_OOB = 1;
+const MSG_PEEK = 2;
+const MSG_TRUNC = 32;
+const MSG_WAITALL = 256;
+const MSG_WAITFORONE = 65536;
+const MSG_ZEROCOPY = 67108864;
+const PHP_BINARY_READ = 2;
+const PHP_NORMAL_READ = 1;
+const SCM_CREDENTIALS = 2;
+const SCM_RIGHTS = 1;
+const SKF_AD_ALU_XOR_X = 40;
+const SKF_AD_CPU = 36;
+const SKF_AD_HATYPE = 28;
+const SKF_AD_IFINDEX = 8;
+const SKF_AD_MARK = 20;
+const SKF_AD_MAX = 64;
+const SKF_AD_NLATTR = 12;
+const SKF_AD_NLATTR_NEST = 16;
+const SKF_AD_OFF = -4096;
+const SKF_AD_PAY_OFFSET = 52;
+const SKF_AD_PKTTYPE = 4;
+const SKF_AD_PROTOCOL = 0;
+const SKF_AD_QUEUE = 24;
+const SKF_AD_RANDOM = 56;
+const SKF_AD_RXHASH = 32;
+const SKF_AD_VLAN_TAG = 44;
+const SKF_AD_VLAN_TAG_PRESENT = 48;
+const SKF_AD_VLAN_TPID = 60;
+const SOCKET_E2BIG = 7;
+const SOCKET_EACCES = 13;
+const SOCKET_EADDRINUSE = 98;
+const SOCKET_EADDRNOTAVAIL = 99;
+const SOCKET_EADV = 68;
+const SOCKET_EAFNOSUPPORT = 97;
+const SOCKET_EAGAIN = 11;
+const SOCKET_EALREADY = 114;
+const SOCKET_EBADE = 52;
+const SOCKET_EBADF = 9;
+const SOCKET_EBADFD = 77;
+const SOCKET_EBADMSG = 74;
+const SOCKET_EBADR = 53;
+const SOCKET_EBADRQC = 56;
+const SOCKET_EBADSLT = 57;
+const SOCKET_EBUSY = 16;
+const SOCKET_ECHRNG = 44;
+const SOCKET_ECOMM = 70;
+const SOCKET_ECONNABORTED = 103;
+const SOCKET_ECONNREFUSED = 111;
+const SOCKET_ECONNRESET = 104;
+const SOCKET_EDESTADDRREQ = 89;
+const SOCKET_EDQUOT = 122;
+const SOCKET_EEXIST = 17;
+const SOCKET_EFAULT = 14;
+const SOCKET_EHOSTDOWN = 112;
+const SOCKET_EHOSTUNREACH = 113;
+const SOCKET_EIDRM = 43;
+const SOCKET_EINPROGRESS = 115;
+const SOCKET_EINTR = 4;
+const SOCKET_EINVAL = 22;
+const SOCKET_EIO = 5;
+const SOCKET_EISCONN = 106;
+const SOCKET_EISDIR = 21;
+const SOCKET_EISNAM = 120;
+const SOCKET_EL2HLT = 51;
+const SOCKET_EL2NSYNC = 45;
+const SOCKET_EL3HLT = 46;
+const SOCKET_EL3RST = 47;
+const SOCKET_ELNRNG = 48;
+const SOCKET_ELOOP = 40;
+const SOCKET_EMEDIUMTYPE = 124;
+const SOCKET_EMFILE = 24;
+const SOCKET_EMLINK = 31;
+const SOCKET_EMSGSIZE = 90;
+const SOCKET_EMULTIHOP = 72;
+const SOCKET_ENAMETOOLONG = 36;
+const SOCKET_ENETDOWN = 100;
+const SOCKET_ENETRESET = 102;
+const SOCKET_ENETUNREACH = 101;
+const SOCKET_ENFILE = 23;
+const SOCKET_ENOANO = 55;
+const SOCKET_ENOBUFS = 105;
+const SOCKET_ENOCSI = 50;
+const SOCKET_ENODATA = 61;
+const SOCKET_ENODEV = 19;
+const SOCKET_ENOENT = 2;
+const SOCKET_ENOLCK = 37;
+const SOCKET_ENOLINK = 67;
+const SOCKET_ENOMEDIUM = 123;
+const SOCKET_ENOMEM = 12;
+const SOCKET_ENOMSG = 42;
+const SOCKET_ENONET = 64;
+const SOCKET_ENOPROTOOPT = 92;
+const SOCKET_ENOSPC = 28;
+const SOCKET_ENOSR = 63;
+const SOCKET_ENOSTR = 60;
+const SOCKET_ENOSYS = 38;
+const SOCKET_ENOTBLK = 15;
+const SOCKET_ENOTCONN = 107;
+const SOCKET_ENOTDIR = 20;
+const SOCKET_ENOTEMPTY = 39;
+const SOCKET_ENOTSOCK = 88;
+const SOCKET_ENOTTY = 25;
+const SOCKET_ENOTUNIQ = 76;
+const SOCKET_ENXIO = 6;
+const SOCKET_EOPNOTSUPP = 95;
+const SOCKET_EPERM = 1;
+const SOCKET_EPFNOSUPPORT = 96;
+const SOCKET_EPIPE = 32;
+const SOCKET_EPROTO = 71;
+const SOCKET_EPROTONOSUPPORT = 93;
+const SOCKET_EPROTOTYPE = 91;
+const SOCKET_EREMCHG = 78;
+const SOCKET_EREMOTE = 66;
+const SOCKET_EREMOTEIO = 121;
+const SOCKET_ERESTART = 85;
+const SOCKET_EROFS = 30;
+const SOCKET_ESHUTDOWN = 108;
+const SOCKET_ESOCKTNOSUPPORT = 94;
+const SOCKET_ESPIPE = 29;
+const SOCKET_ESRMNT = 69;
+const SOCKET_ESTRPIPE = 86;
+const SOCKET_ETIME = 62;
+const SOCKET_ETIMEDOUT = 110;
+const SOCKET_ETOOMANYREFS = 109;
+const SOCKET_EUNATCH = 49;
+const SOCKET_EUSERS = 87;
+const SOCKET_EWOULDBLOCK = 11;
+const SOCKET_EXDEV = 18;
+const SOCKET_EXFULL = 54;
+const SOCK_DGRAM = 2;
+const SOCK_RAW = 3;
+const SOCK_RDM = 4;
+const SOCK_SEQPACKET = 5;
+const SOCK_STREAM = 1;
+const SOL_SOCKET = 1;
+const SOL_TCP = 6;
+const SOL_UDP = 17;
+const SOMAXCONN = 128;
+const SO_BINDTODEVICE = 25;
+const SO_BPF_EXTENSIONS = 48;
+const SO_BROADCAST = 6;
+const SO_DEBUG = 1;
+const SO_DONTROUTE = 5;
+const SO_ERROR = 4;
+const SO_INCOMING_CPU = 49;
+const SO_KEEPALIVE = 9;
+const SO_LINGER = 13;
+const SO_MARK = 36;
+const SO_MEMINFO = 55;
+const SO_OOBINLINE = 10;
+const SO_PASSCRED = 16;
+const SO_RCVBUF = 8;
+const SO_RCVLOWAT = 18;
+const SO_RCVTIMEO = 20;
+const SO_REUSEADDR = 2;
+const SO_REUSEPORT = 15;
+const SO_SNDBUF = 7;
+const SO_SNDLOWAT = 19;
+const SO_SNDTIMEO = 21;
+const SO_TYPE = 3;
+const SO_ZEROCOPY = 60;
+const TCP_CONGESTION = 13;
+const TCP_DEFER_ACCEPT = 9;
+const TCP_KEEPCNT = 6;
+const TCP_KEEPIDLE = 4;
+const TCP_KEEPINTVL = 5;
+const TCP_NODELAY = 1;
+const TCP_NOTSENT_LOWAT = 25;
+}
diff --git a/dev/tools/phan/stubs/stripe.php b/dev/tools/phan/stubs/stripe.php
new file mode 100644
index 00000000000..413fda3e8ea
--- /dev/null
+++ b/dev/tools/phan/stubs/stripe.php
@@ -0,0 +1,15688 @@
+<?php
+// phpcs:disable Generic.Files.LineLength.TooLong,Generic.NamingConventions,PEAR.Commenting,PEAR.NamingConventions
+namespace Stripe;
+
+/**
+ * Class StripeObject.
+ */
+class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable
+{
+	/** @var Util\RequestOptions */
+	protected $_opts;
+	/** @var array */
+	protected $_originalValues;
+	/** @var array */
+	protected $_values;
+	/** @var Util\Set */
+	protected $_unsavedValues;
+	/** @var Util\Set */
+	protected $_transientValues;
+	/** @var null|array */
+	protected $_retrieveOptions;
+	/** @var null|ApiResponse */
+	protected $_lastResponse;
+	/**
+	 * @return Util\Set Attributes that should not be sent to the API because
+	 *    they're not updatable (e.g. ID).
+	 */
+	public static function getPermanentAttributes()
+	{
+	}
+	/**
+	 * Additive objects are subobjects in the API that don't have the same
+	 * semantics as most subobjects, which are fully replaced when they're set.
+	 *
+	 * This is best illustrated by example. The `source` parameter sent when
+	 * updating a subscription is *not* additive; if we set it:
+	 *
+	 *     source[object]=card&source[number]=123
+	 *
+	 * We expect the old `source` object to have been overwritten completely. If
+	 * the previous source had an `address_state` key associated with it and we
+	 * didn't send one this time, that value of `address_state` is gone.
+	 *
+	 * By contrast, additive objects are those that will have new data added to
+	 * them while keeping any existing data in place. The only known case of its
+	 * use is for `metadata`, but it could in theory be more general. As an
+	 * example, say we have a `metadata` object that looks like this on the
+	 * server side:
+	 *
+	 *     metadata = ["old" => "old_value"]
+	 *
+	 * If we update the object with `metadata[new]=new_value`, the server side
+	 * object now has *both* fields:
+	 *
+	 *     metadata = ["old" => "old_value", "new" => "new_value"]
+	 *
+	 * This is okay in itself because usually users will want to treat it as
+	 * additive:
+	 *
+	 *     $obj->metadata["new"] = "new_value";
+	 *     $obj->save();
+	 *
+	 * However, in other cases, they may want to replace the entire existing
+	 * contents:
+	 *
+	 *     $obj->metadata = ["new" => "new_value"];
+	 *     $obj->save();
+	 *
+	 * This is where things get a little bit tricky because in order to clear
+	 * any old keys that may have existed, we actually have to send an explicit
+	 * empty string to the server. So the operation above would have to send
+	 * this form to get the intended behavior:
+	 *
+	 *     metadata[old]=&metadata[new]=new_value
+	 *
+	 * This method allows us to track which parameters are considered additive,
+	 * and lets us behave correctly where appropriate when serializing
+	 * parameters to be sent.
+	 *
+	 * @return Util\Set Set of additive parameters
+	 */
+	public static function getAdditiveParams()
+	{
+	}
+	public function __construct($id = null, $opts = null)
+	{
+	}
+	// Standard accessor magic methods
+	public function __set($k, $v)
+	{
+	}
+	/**
+	 * @param mixed $k
+	 *
+	 * @return bool
+	 */
+	public function __isset($k)
+	{
+	}
+	public function __unset($k)
+	{
+	}
+	public function &__get($k)
+	{
+	}
+	/**
+	 * Magic method for var_dump output. Only works with PHP >= 5.6.
+	 *
+	 * @return array
+	 */
+	public function __debugInfo()
+	{
+	}
+	// ArrayAccess methods
+	/**
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetSet($k, $v)
+	{
+	}
+	/**
+	 * @return bool
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetExists($k)
+	{
+	}
+	/**
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($k)
+	{
+	}
+	/**
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetGet($k)
+	{
+	}
+	/**
+	 * @return int
+	 */
+	#[\ReturnTypeWillChange]
+	public function count()
+	{
+	}
+	public function keys()
+	{
+	}
+	public function values()
+	{
+	}
+	/**
+	 * This unfortunately needs to be public to be used in Util\Util.
+	 *
+	 * @param array $values
+	 * @param null|array|string|Util\RequestOptions $opts
+	 *
+	 * @return static the object constructed from the given values
+	 */
+	public static function constructFrom($values, $opts = null)
+	{
+	}
+	/**
+	 * Refreshes this object using the provided values.
+	 *
+	 * @param array $values
+	 * @param null|array|string|Util\RequestOptions $opts
+	 * @param bool $partial defaults to false
+	 */
+	public function refreshFrom($values, $opts, $partial = false)
+	{
+	}
+	/**
+	 * Mass assigns attributes on the model.
+	 *
+	 * @param array $values
+	 * @param null|array|string|Util\RequestOptions $opts
+	 * @param bool $dirty defaults to true
+	 */
+	public function updateAttributes($values, $opts = null, $dirty = true)
+	{
+	}
+	/**
+	 * @param bool $force defaults to false
+	 *
+	 * @return array a recursive mapping of attributes to values for this object,
+	 *    including the proper value for deleted attributes
+	 */
+	public function serializeParameters($force = false)
+	{
+	}
+	public function serializeParamsValue($value, $original, $unsaved, $force, $key = null)
+	{
+	}
+	/**
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+	}
+	/**
+	 * Returns an associative array with the key and values composing the
+	 * Stripe object.
+	 *
+	 * @return array the associative array
+	 */
+	public function toArray()
+	{
+	}
+	/**
+	 * Returns a pretty JSON representation of the Stripe object.
+	 *
+	 * @return string the JSON representation of the Stripe object
+	 */
+	public function toJSON()
+	{
+	}
+	public function __toString()
+	{
+	}
+	/**
+	 * Sets all keys within the StripeObject as unsaved so that they will be
+	 * included with an update when `serializeParameters` is called. This
+	 * method is also recursive, so any StripeObjects contained as values or
+	 * which are values in a tenant array are also marked as dirty.
+	 */
+	public function dirty()
+	{
+	}
+	protected function dirtyValue($value)
+	{
+	}
+	/**
+	 * Produces a deep copy of the given object including support for arrays
+	 * and StripeObjects.
+	 *
+	 * @param mixed $obj
+	 */
+	protected static function deepCopy($obj)
+	{
+	}
+	/**
+	 * Returns a hash of empty values for all the values that are in the given
+	 * StripeObject.
+	 *
+	 * @param mixed $obj
+	 */
+	public static function emptyValues($obj)
+	{
+	}
+	/**
+	 * @return null|ApiResponse The last response from the Stripe API
+	 */
+	public function getLastResponse()
+	{
+	}
+	/**
+	 * Sets the last response from the Stripe API.
+	 *
+	 * @param ApiResponse $resp
+	 */
+	public function setLastResponse($resp)
+	{
+	}
+	/**
+	 * Indicates whether or not the resource has been deleted on the server.
+	 * Note that some, but not all, resources can indicate whether they have
+	 * been deleted.
+	 *
+	 * @return bool whether the resource is deleted
+	 */
+	public function isDeleted()
+	{
+	}
+}
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for resources that need to make API requests.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Request
+{
+	/**
+	 * @param null|array|mixed $params The list of parameters to validate
+	 *
+	 * @throws \Stripe\Exception\InvalidArgumentException if $params exists and is not an array
+	 */
+	protected static function _validateParams($params = null)
+	{
+	}
+	/**
+	 * @param string $method HTTP method ('get', 'post', etc.)
+	 * @param string $url URL for the request
+	 * @param array $params list of parameters for the request
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return array tuple containing (the JSON response, $options)
+	 */
+	protected function _request($method, $url, $params = [], $options = null)
+	{
+	}
+	/**
+	 * @param string $method HTTP method ('get', 'post', etc.)
+	 * @param string $url URL for the request
+	 * @param callable $readBodyChunk function that will receive chunks of data from a successful request body
+	 * @param array $params list of parameters for the request
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 */
+	protected function _requestStream($method, $url, $readBodyChunk, $params = [], $options = null)
+	{
+	}
+	/**
+	 * @param string $method HTTP method ('get', 'post', etc.)
+	 * @param string $url URL for the request
+	 * @param array $params list of parameters for the request
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return array tuple containing (the JSON response, $options)
+	 */
+	protected static function _staticRequest($method, $url, $params, $options)
+	{
+	}
+	/**
+	 * @param string $method HTTP method ('get', 'post', etc.)
+	 * @param string $url URL for the request
+	 * @param callable $readBodyChunk function that will receive chunks of data from a successful request body
+	 * @param array $params list of parameters for the request
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 */
+	protected static function _staticStreamingRequest($method, $url, $readBodyChunk, $params, $options)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * Class ApiResource.
+ */
+abstract class ApiResource extends \Stripe\StripeObject
+{
+	use \Stripe\ApiOperations\Request;
+	/**
+	 * @return \Stripe\Util\Set A list of fields that can be their own type of
+	 * API resource (say a nested card under an account for example), and if
+	 * that resource is set, it should be transmitted to the API on a create or
+	 * update. Doing so is not the default behavior because API resources
+	 * should normally be persisted on their own RESTful endpoints.
+	 */
+	public static function getSavedNestedResources()
+	{
+	}
+	/**
+	 * @var bool A flag that can be set a behavior that will cause this
+	 * resource to be encoded and sent up along with an update of its parent
+	 * resource. This is usually not desirable because resources are updated
+	 * individually on their own endpoints, but there are certain cases,
+	 * replacing a customer's source for example, where this is allowed.
+	 */
+	public $saveWithParent = false;
+	public function __set($k, $v)
+	{
+	}
+	/**
+	 * @throws Exception\ApiErrorException
+	 *
+	 * @return ApiResource the refreshed resource
+	 */
+	public function refresh()
+	{
+	}
+	/**
+	 * @return string the base URL for the given class
+	 */
+	public static function baseUrl()
+	{
+	}
+	/**
+	 * @return string the endpoint URL for the given class
+	 */
+	public static function classUrl()
+	{
+	}
+	/**
+	 * @param null|string $id the ID of the resource
+	 *
+	 * @throws Exception\UnexpectedValueException if $id is null
+	 *
+	 * @return string the instance endpoint URL for the given class
+	 */
+	public static function resourceUrl($id)
+	{
+	}
+	/**
+	 * @return string the full API URL for this API resource
+	 */
+	public function instanceUrl()
+	{
+	}
+}
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for listable resources. Adds a `all()` static method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait All
+{
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection of ApiResources
+	 */
+	public static function all($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Trait for creatable resources. Adds a `create()` static method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Create
+{
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return static the created resource
+	 */
+	public static function create($params = null, $options = null)
+	{
+	}
+}
+/**
+ * Trait for deletable resources. Adds a `delete()` method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Delete
+{
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return static the deleted resource
+	 */
+	public function delete($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Trait for resources that have nested resources.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait NestedResource
+{
+	/**
+	 * @param string $method
+	 * @param string $url
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @return \Stripe\StripeObject
+	 */
+	protected static function _nestedResourceOperation($method, $url, $params = null, $options = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param string $nestedPath
+	 * @param null|string $nestedId
+	 *
+	 * @return string
+	 */
+	protected static function _nestedResourceUrl($id, $nestedPath, $nestedId = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param string $nestedPath
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject
+	 */
+	protected static function _createNestedResource($id, $nestedPath, $params = null, $options = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param string $nestedPath
+	 * @param null|string $nestedId
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject
+	 */
+	protected static function _retrieveNestedResource($id, $nestedPath, $nestedId, $params = null, $options = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param string $nestedPath
+	 * @param null|string $nestedId
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject
+	 */
+	protected static function _updateNestedResource($id, $nestedPath, $nestedId, $params = null, $options = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param string $nestedPath
+	 * @param null|string $nestedId
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject
+	 */
+	protected static function _deleteNestedResource($id, $nestedPath, $nestedId, $params = null, $options = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param string $nestedPath
+	 * @param null|array $params
+	 * @param null|array|string $options
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject
+	 */
+	protected static function _allNestedResources($id, $nestedPath, $params = null, $options = null)
+	{
+	}
+}
+/**
+ * Trait for updatable resources. Adds an `update()` static method and a
+ * `save()` method to the class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Update
+{
+	/**
+	 * @param string $id the ID of the resource to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return static the updated resource
+	 */
+	public static function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return static the saved resource
+	 *
+	 * @deprecated The `save` method is deprecated and will be removed in a
+	 *     future major version of the library. Use the static method `update`
+	 *     on the resource instead.
+	 */
+	public function save($opts = null)
+	{
+	}
+}
+/**
+ * Trait for retrievable resources. Adds a `retrieve()` static method to the
+ * class.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Retrieve
+{
+	/**
+	 * @param array|string $id the ID of the API resource to retrieve,
+	 *                         or an options array containing an `id` key
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return static
+	 */
+	public static function retrieve($id, $opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * This is an object representing a Stripe account. You can retrieve it to see
+ * properties on the account like its current requirements or if the account is
+ * enabled to make live charges or receive payouts.
+ *
+ * For Custom accounts, the properties below are always returned. For other
+ * accounts, some properties are returned until that account has started to go
+ * through Connect Onboarding. Once you create an <a
+ * href="https://stripe.com/docs/api/account_links">Account Link</a> for a Standard
+ * or Express account, some parameters are no longer returned. These are marked as
+ * <strong>Custom Only</strong> or <strong>Custom and Express</strong> below. Learn
+ * about the differences <a href="https://stripe.com/docs/connect/accounts">between
+ * accounts</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $business_profile Business information about the account.
+ * @property null|string $business_type The business type.
+ * @property null|\Stripe\StripeObject $capabilities
+ * @property null|bool $charges_enabled Whether the account can create live charges.
+ * @property null|\Stripe\StripeObject $company
+ * @property null|\Stripe\StripeObject $controller
+ * @property null|string $country The account's country.
+ * @property null|int $created Time at which the account was connected. Measured in seconds since the Unix epoch.
+ * @property null|string $default_currency Three-letter ISO currency code representing the default currency for the account. This must be a currency that <a href="https://stripe.com/docs/payouts">Stripe supports in the account's country</a>.
+ * @property null|bool $details_submitted Whether account details have been submitted. Standard accounts cannot receive payouts before this is true.
+ * @property null|string $email An email address associated with the account. You can treat this as metadata: it is not used for authentication or messaging account holders.
+ * @property null|\Stripe\Collection<\Stripe\BankAccount|\Stripe\Card> $external_accounts External accounts (bank accounts and debit cards) currently attached to this account
+ * @property null|\Stripe\StripeObject $future_requirements
+ * @property null|\Stripe\Person $individual <p>This is an object representing a person associated with a Stripe account.</p><p>A platform cannot access a Standard or Express account's persons after the account starts onboarding, such as after generating an account link for the account. See the <a href="https://stripe.com/docs/connect/standard-accounts">Standard onboarding</a> or <a href="https://stripe.com/docs/connect/express-accounts">Express onboarding documentation</a> for information about platform pre-filling and account onboarding steps.</p><p>Related guide: <a href="https://stripe.com/docs/connect/identity-verification-api#person-information">Handling Identity Verification with the API</a>.</p>
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|bool $payouts_enabled Whether Stripe can send payouts to this account.
+ * @property null|\Stripe\StripeObject $requirements
+ * @property null|\Stripe\StripeObject $settings Options for customizing how the account functions within Stripe.
+ * @property null|\Stripe\StripeObject $tos_acceptance
+ * @property null|string $type The Stripe account type. Can be <code>standard</code>, <code>express</code>, or <code>custom</code>.
+ */
+class Account extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'account';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Update;
+	const BUSINESS_TYPE_COMPANY = 'company';
+	const BUSINESS_TYPE_GOVERNMENT_ENTITY = 'government_entity';
+	const BUSINESS_TYPE_INDIVIDUAL = 'individual';
+	const BUSINESS_TYPE_NON_PROFIT = 'non_profit';
+	const TYPE_CUSTOM = 'custom';
+	const TYPE_EXPRESS = 'express';
+	const TYPE_STANDARD = 'standard';
+	use \Stripe\ApiOperations\Retrieve {
+		retrieve as protected _retrieve;
+	}
+	public static function getSavedNestedResources()
+	{
+	}
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param null|array|string $id the ID of the account to retrieve, or an
+	 *                              options array containing an `id` key
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account
+	 */
+	public static function retrieve($id = null, $opts = null)
+	{
+	}
+	public function serializeParameters($force = false)
+	{
+	}
+	/**
+	 * @param null|array $clientId
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject object containing the response from the API
+	 */
+	public function deauthorize($clientId = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account the rejected account
+	 */
+	public function reject($params = null, $opts = null)
+	{
+	}
+	const PATH_CAPABILITIES = '/capabilities';
+	/**
+	 * @param string $id the ID of the account on which to retrieve the capabilities
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Capability> the list of capabilities
+	 */
+	public static function allCapabilities($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the capability belongs
+	 * @param string $capabilityId the ID of the capability to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Capability
+	 */
+	public static function retrieveCapability($id, $capabilityId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the capability belongs
+	 * @param string $capabilityId the ID of the capability to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Capability
+	 */
+	public static function updateCapability($id, $capabilityId, $params = null, $opts = null)
+	{
+	}
+	const PATH_EXTERNAL_ACCOUNTS = '/external_accounts';
+	/**
+	 * @param string $id the ID of the account on which to retrieve the external accounts
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card> the list of external accounts (BankAccount or Card)
+	 */
+	public static function allExternalAccounts($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account on which to create the external account
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public static function createExternalAccount($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the external account belongs
+	 * @param string $externalAccountId the ID of the external account to delete
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public static function deleteExternalAccount($id, $externalAccountId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the external account belongs
+	 * @param string $externalAccountId the ID of the external account to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public static function retrieveExternalAccount($id, $externalAccountId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the external account belongs
+	 * @param string $externalAccountId the ID of the external account to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public static function updateExternalAccount($id, $externalAccountId, $params = null, $opts = null)
+	{
+	}
+	const PATH_LOGIN_LINKS = '/login_links';
+	/**
+	 * @param string $id the ID of the account on which to create the login link
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\LoginLink
+	 */
+	public static function createLoginLink($id, $params = null, $opts = null)
+	{
+	}
+	const PATH_PERSONS = '/persons';
+	/**
+	 * @param string $id the ID of the account on which to retrieve the persons
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Person> the list of persons
+	 */
+	public static function allPersons($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account on which to create the person
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public static function createPerson($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the person belongs
+	 * @param string $personId the ID of the person to delete
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public static function deletePerson($id, $personId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the person belongs
+	 * @param string $personId the ID of the person to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public static function retrievePerson($id, $personId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the account to which the person belongs
+	 * @param string $personId the ID of the person to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public static function updatePerson($id, $personId, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Account Links are the means by which a Connect platform grants a connected
+ * account permission to access Stripe-hosted applications, such as Connect
+ * Onboarding.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/connect-onboarding">Connect
+ * Onboarding</a>.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $expires_at The timestamp at which this account link will expire.
+ * @property string $url The URL for the account link.
+ */
+class AccountLink extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'account_link';
+	use \Stripe\ApiOperations\Create;
+}
+namespace Stripe\ApiOperations;
+
+/**
+ * Trait for searchable resources.
+ *
+ * This trait should only be applied to classes that derive from StripeObject.
+ */
+trait Search
+{
+	/**
+	 * @param string $searchUrl
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult of ApiResources
+	 */
+	protected static function _searchResource($searchUrl, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Trait for retrievable singleton resources. Adds a `retrieve()` static method to the
+ * class.
+ *
+ * This trait should only be applied to classes that derive from SingletonApiResource.
+ */
+trait SingletonRetrieve
+{
+	/**
+	 * @param array|string $id the ID of the API resource to retrieve,
+	 *                         or an options array containing an `id` key
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return static
+	 */
+	public static function retrieve($opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * Class ApiRequestor.
+ */
+class ApiRequestor
+{
+	/**
+	 * ApiRequestor constructor.
+	 *
+	 * @param null|string $apiKey
+	 * @param null|string $apiBase
+	 */
+	public function __construct($apiKey = null, $apiBase = null)
+	{
+	}
+	/**
+	 * @param string     $method
+	 * @param string     $url
+	 * @param null|array $params
+	 * @param null|array $headers
+	 *
+	 * @throws Exception\ApiErrorException
+	 *
+	 * @return array tuple containing (ApiReponse, API key)
+	 */
+	public function request($method, $url, $params = null, $headers = null)
+	{
+	}
+	/**
+	 * @param string     $method
+	 * @param string     $url
+	 * @param callable $readBodyChunkCallable
+	 * @param null|array $params
+	 * @param null|array $headers
+	 *
+	 * @throws Exception\ApiErrorException
+	 */
+	public function requestStream($method, $url, $readBodyChunkCallable, $params = null, $headers = null)
+	{
+	}
+	/**
+	 * @param string $rbody a JSON string
+	 * @param int $rcode
+	 * @param array $rheaders
+	 * @param array $resp
+	 *
+	 * @throws Exception\UnexpectedValueException
+	 * @throws Exception\ApiErrorException
+	 */
+	public function handleErrorResponse($rbody, $rcode, $rheaders, $resp)
+	{
+	}
+	/**
+	 * @static
+	 *
+	 * @param HttpClient\ClientInterface $client
+	 */
+	public static function setHttpClient($client)
+	{
+	}
+	/**
+	 * @static
+	 *
+	 * @param HttpClient\StreamingClientInterface $client
+	 */
+	public static function setStreamingHttpClient($client)
+	{
+	}
+	/**
+	 * @static
+	 *
+	 * Resets any stateful telemetry data
+	 */
+	public static function resetTelemetry()
+	{
+	}
+}
+/**
+ * Class ApiResponse.
+ */
+class ApiResponse
+{
+	/**
+	 * @var null|array|CaseInsensitiveArray
+	 */
+	public $headers;
+	/**
+	 * @var string
+	 */
+	public $body;
+	/**
+	 * @var null|array
+	 */
+	public $json;
+	/**
+	 * @var int
+	 */
+	public $code;
+	/**
+	 * @param string $body
+	 * @param int $code
+	 * @param null|array|CaseInsensitiveArray $headers
+	 * @param null|array $json
+	 */
+	public function __construct($body, $code, $headers, $json)
+	{
+	}
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $domain_name
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ */
+class ApplePayDomain extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'apple_pay_domain';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	/**
+	 * @return string The class URL for this resource. It needs to be special
+	 *    cased because it doesn't fit into the standard resource pattern.
+	 */
+	public static function classUrl()
+	{
+	}
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string|\Stripe\Account $account ID of the Stripe account this fee was taken from.
+ * @property int $amount Amount earned, in %s.
+ * @property int $amount_refunded Amount in %s refunded (can be less than the amount attribute on the fee if a partial refund was issued)
+ * @property string|\Stripe\StripeObject $application ID of the Connect application that earned the fee.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact of this collected application fee on your account balance (not including refunds).
+ * @property string|\Stripe\Charge $charge ID of the charge that the application fee was taken from.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Charge $originating_transaction ID of the corresponding charge on the platform account, if this fee was the result of a charge using the <code>destination</code> parameter.
+ * @property bool $refunded Whether the fee has been fully refunded. If the fee is only partially refunded, this attribute will still be false.
+ * @property \Stripe\Collection<\Stripe\StripeObject> $refunds A list of refunds that have been applied to the fee.
+ */
+class ApplicationFee extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'application_fee';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Retrieve;
+	const PATH_REFUNDS = '/refunds';
+	/**
+	 * @param string $id the ID of the application fee on which to retrieve the fee refunds
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\ApplicationFeeRefund> the list of fee refunds
+	 */
+	public static function allRefunds($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the application fee on which to create the fee refund
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFeeRefund
+	 */
+	public static function createRefund($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the application fee to which the fee refund belongs
+	 * @param string $refundId the ID of the fee refund to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFeeRefund
+	 */
+	public static function retrieveRefund($id, $refundId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the application fee to which the fee refund belongs
+	 * @param string $refundId the ID of the fee refund to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFeeRefund
+	 */
+	public static function updateRefund($id, $refundId, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * <code>Application Fee Refund</code> objects allow you to refund an application
+ * fee that has previously been created but not yet refunded. Funds will be
+ * refunded to the Stripe account from which the fee was originally collected.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/destination-charges#refunding-app-fee">Refunding
+ * Application Fees</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount, in %s.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact on your account balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\ApplicationFee $fee ID of the application fee that was refunded.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ */
+class ApplicationFeeRefund extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'fee_refund';
+	use \Stripe\ApiOperations\Update {
+		save as protected _save;
+	}
+	/**
+	 * @return string the API URL for this Stripe refund
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param null|array|string $opts
+	 *
+	 * @return ApplicationFeeRefund the saved refund
+	 */
+	public function save($opts = null)
+	{
+	}
+}
+namespace Stripe\Apps;
+
+/**
+ * Secret Store is an API that allows Stripe Apps developers to securely persist
+ * secrets for use by UI Extensions and app backends.
+ *
+ * The primary resource in Secret Store is a <code>secret</code>. Other apps can't
+ * view secrets created by an app. Additionally, secrets are scoped to provide
+ * further permission control.
+ *
+ * All Dashboard users and the app backend share <code>account</code> scoped
+ * secrets. Use the <code>account</code> scope for secrets that don't change
+ * per-user, like a third-party API key.
+ *
+ * A <code>user</code> scoped secret is accessible by the app backend and one
+ * specific Dashboard user. Use the <code>user</code> scope for per-user secrets
+ * like per-user OAuth tokens, where different users might have different
+ * permissions.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/stripe-apps/store-auth-data-custom-objects">Store
+ * data between page reloads</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|int $expires_at The Unix timestamp for the expiry time of the secret, after which the secret deletes.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $name A name for the secret that's unique within the scope.
+ * @property null|string $payload The plaintext secret value to be stored.
+ * @property \Stripe\StripeObject $scope
+ */
+class Secret extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'apps.secret';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Apps\Secret the deleted secret
+	 */
+	public static function deleteWhere($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Apps\Secret the finded secret
+	 */
+	public static function find($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * Class SingletonApiResource.
+ */
+abstract class SingletonApiResource extends \Stripe\ApiResource
+{
+	/**
+	 * @return string the endpoint associated with this singleton class
+	 */
+	public static function classUrl()
+	{
+	}
+	/**
+	 * @return string the endpoint associated with this singleton API resource
+	 */
+	public function instanceUrl()
+	{
+	}
+}
+/**
+ * This is an object representing your Stripe balance. You can retrieve it to see
+ * the balance currently on your Stripe account.
+ *
+ * You can also retrieve the balance history, which contains a list of <a
+ * href="https://stripe.com/docs/reporting/balance-transaction-types">transactions</a>
+ * that contributed to the balance (charges, payouts, and so forth).
+ *
+ * The available and pending amounts for each currency are broken down further by
+ * payment source types.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/account-balances">Understanding Connect
+ * Account Balances</a>.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject[] $available Funds that are available to be transferred or paid out, whether automatically by Stripe or explicitly via the <a href="https://stripe.com/docs/api#transfers">Transfers API</a> or <a href="https://stripe.com/docs/api#payouts">Payouts API</a>. The available balance for each currency and payment type can be found in the <code>source_types</code> property.
+ * @property null|\Stripe\StripeObject[] $connect_reserved Funds held due to negative balances on connected Custom accounts. The connect reserve balance for each currency and payment type can be found in the <code>source_types</code> property.
+ * @property null|\Stripe\StripeObject[] $instant_available Funds that can be paid out using Instant Payouts.
+ * @property null|\Stripe\StripeObject $issuing
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject[] $pending Funds that are not yet available in the balance, due to the 7-day rolling pay cycle. The pending balance for each currency, and for each payment type, can be found in the <code>source_types</code> property.
+ */
+class Balance extends \Stripe\SingletonApiResource
+{
+	const OBJECT_NAME = 'balance';
+	use \Stripe\ApiOperations\SingletonRetrieve;
+}
+/**
+ * Balance transactions represent funds moving through your Stripe account. They're
+ * created for every type of transaction that comes into or flows out of your
+ * Stripe account balance.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/reports/balance-transaction-types">Balance
+ * Transaction Types</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Gross amount of the transaction, in %s.
+ * @property int $available_on The date the transaction's net funds will become available in the Stripe balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|float $exchange_rate The exchange rate used, if applicable, for this transaction. Specifically, if money was converted from currency A to currency B, then the <code>amount</code> in currency A, times <code>exchange_rate</code>, would be the <code>amount</code> in currency B. For example, suppose you charged a customer 10.00 EUR. Then the PaymentIntent's <code>amount</code> would be <code>1000</code> and <code>currency</code> would be <code>eur</code>. Suppose this was converted into 12.34 USD in your Stripe account. Then the BalanceTransaction's <code>amount</code> would be <code>1234</code>, <code>currency</code> would be <code>usd</code>, and <code>exchange_rate</code> would be <code>1.234</code>.
+ * @property int $fee Fees (in %s) paid for this transaction.
+ * @property \Stripe\StripeObject[] $fee_details Detailed breakdown of fees (in %s) paid for this transaction.
+ * @property int $net Net amount of the transaction, in %s.
+ * @property string $reporting_category <a href="https://stripe.com/docs/reports/reporting-categories">Learn more</a> about how reporting categories can help you understand balance transactions from an accounting perspective.
+ * @property null|string|\Stripe\StripeObject $source The Stripe object to which this transaction is related.
+ * @property string $status If the transaction's net funds are available in the Stripe balance yet. Either <code>available</code> or <code>pending</code>.
+ * @property string $type Transaction type: <code>adjustment</code>, <code>advance</code>, <code>advance_funding</code>, <code>anticipation_repayment</code>, <code>application_fee</code>, <code>application_fee_refund</code>, <code>charge</code>, <code>connect_collection_transfer</code>, <code>contribution</code>, <code>issuing_authorization_hold</code>, <code>issuing_authorization_release</code>, <code>issuing_dispute</code>, <code>issuing_transaction</code>, <code>payment</code>, <code>payment_failure_refund</code>, <code>payment_refund</code>, <code>payout</code>, <code>payout_cancel</code>, <code>payout_failure</code>, <code>refund</code>, <code>refund_failure</code>, <code>reserve_transaction</code>, <code>reserved_funds</code>, <code>stripe_fee</code>, <code>stripe_fx_fee</code>, <code>tax_fee</code>, <code>topup</code>, <code>topup_reversal</code>, <code>transfer</code>, <code>transfer_cancel</code>, <code>transfer_failure</code>, or <code>transfer_refund</code>. <a href="https://stripe.com/docs/reports/balance-transaction-types">Learn more</a> about balance transaction types and what they represent. If you are looking to classify transactions for accounting purposes, you might want to consider <code>reporting_category</code> instead.
+ */
+class BalanceTransaction extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'balance_transaction';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const TYPE_ADJUSTMENT = 'adjustment';
+	const TYPE_ADVANCE = 'advance';
+	const TYPE_ADVANCE_FUNDING = 'advance_funding';
+	const TYPE_ANTICIPATION_REPAYMENT = 'anticipation_repayment';
+	const TYPE_APPLICATION_FEE = 'application_fee';
+	const TYPE_APPLICATION_FEE_REFUND = 'application_fee_refund';
+	const TYPE_CHARGE = 'charge';
+	const TYPE_CONNECT_COLLECTION_TRANSFER = 'connect_collection_transfer';
+	const TYPE_CONTRIBUTION = 'contribution';
+	const TYPE_ISSUING_AUTHORIZATION_HOLD = 'issuing_authorization_hold';
+	const TYPE_ISSUING_AUTHORIZATION_RELEASE = 'issuing_authorization_release';
+	const TYPE_ISSUING_DISPUTE = 'issuing_dispute';
+	const TYPE_ISSUING_TRANSACTION = 'issuing_transaction';
+	const TYPE_PAYMENT = 'payment';
+	const TYPE_PAYMENT_FAILURE_REFUND = 'payment_failure_refund';
+	const TYPE_PAYMENT_REFUND = 'payment_refund';
+	const TYPE_PAYOUT = 'payout';
+	const TYPE_PAYOUT_CANCEL = 'payout_cancel';
+	const TYPE_PAYOUT_FAILURE = 'payout_failure';
+	const TYPE_REFUND = 'refund';
+	const TYPE_REFUND_FAILURE = 'refund_failure';
+	const TYPE_RESERVE_TRANSACTION = 'reserve_transaction';
+	const TYPE_RESERVED_FUNDS = 'reserved_funds';
+	const TYPE_STRIPE_FEE = 'stripe_fee';
+	const TYPE_STRIPE_FX_FEE = 'stripe_fx_fee';
+	const TYPE_TAX_FEE = 'tax_fee';
+	const TYPE_TOPUP = 'topup';
+	const TYPE_TOPUP_REVERSAL = 'topup_reversal';
+	const TYPE_TRANSFER = 'transfer';
+	const TYPE_TRANSFER_CANCEL = 'transfer_cancel';
+	const TYPE_TRANSFER_FAILURE = 'transfer_failure';
+	const TYPE_TRANSFER_REFUND = 'transfer_refund';
+}
+/**
+ * These bank accounts are payment methods on <code>Customer</code> objects.
+ *
+ * On the other hand <a
+ * href="https://stripe.com/docs/api#external_accounts">External Accounts</a> are
+ * transfer destinations on <code>Account</code> objects for <a
+ * href="https://stripe.com/docs/connect/custom-accounts">Custom accounts</a>. They
+ * can be bank accounts or debit cards as well, and are documented in the links
+ * above.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/bank-debits-transfers">Bank Debits and
+ * Transfers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\Account $account The ID of the account that the bank account is associated with.
+ * @property null|string $account_holder_name The name of the person or business that owns the bank account.
+ * @property null|string $account_holder_type The type of entity that holds the account. This can be either <code>individual</code> or <code>company</code>.
+ * @property null|string $account_type The bank account type. This can only be <code>checking</code> or <code>savings</code> in most countries. In Japan, this can only be <code>futsu</code> or <code>toza</code>.
+ * @property null|string[] $available_payout_methods A set of available payout methods for this bank account. Only values from this set should be passed as the <code>method</code> when creating a payout.
+ * @property null|string $bank_name Name of the bank associated with the routing number (e.g., <code>WELLS FARGO</code>).
+ * @property string $country Two-letter ISO code representing the country the bank account is located in.
+ * @property string $currency Three-letter <a href="https://stripe.com/docs/payouts">ISO code for the currency</a> paid out to the bank account.
+ * @property null|string|\Stripe\Customer $customer The ID of the customer that the bank account is associated with.
+ * @property null|bool $default_for_currency Whether this bank account is the default external account for its currency.
+ * @property null|string $fingerprint Uniquely identifies this particular bank account. You can use this attribute to check whether two bank accounts are the same.
+ * @property string $last4 The last four digits of the bank account number.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $routing_number The routing transit number for the bank account.
+ * @property string $status <p>For bank accounts, possible values are <code>new</code>, <code>validated</code>, <code>verified</code>, <code>verification_failed</code>, or <code>errored</code>. A bank account that hasn't had any activity or validation performed is <code>new</code>. If Stripe can determine that the bank account exists, its status will be <code>validated</code>. Note that there often isn’t enough information to know (e.g., for smaller credit unions), and the validation is not always run. If customer bank account verification has succeeded, the bank account status will be <code>verified</code>. If the verification failed for any reason, such as microdeposit failure, the status will be <code>verification_failed</code>. If a transfer sent to this bank account fails, we'll set the status to <code>errored</code> and will not continue to send transfers until the bank details are updated.</p><p>For external accounts, possible values are <code>new</code> and <code>errored</code>. Validations aren't run against external accounts because they're only used for payouts. This means the other statuses don't apply. If a transfer fails, the status is set to <code>errored</code> and transfers are stopped until account details are updated.</p>
+ */
+class BankAccount extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'bank_account';
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * Possible string representations of the bank verification status.
+	 *
+	 * @see https://stripe.com/docs/api/external_account_bank_accounts/object#account_bank_account_object-status
+	 */
+	const STATUS_NEW = 'new';
+	const STATUS_VALIDATED = 'validated';
+	const STATUS_VERIFIED = 'verified';
+	const STATUS_VERIFICATION_FAILED = 'verification_failed';
+	const STATUS_ERRORED = 'errored';
+	/**
+	 * @return string The instance URL for this resource. It needs to be special
+	 *    cased because it doesn't fit into the standard resource pattern.
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+	/**
+	 * @param string $_id
+	 * @param null|array $_params
+	 * @param null|array|string $_options
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function update($_id, $_params = null, $_options = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return BankAccount the verified bank account
+	 */
+	public function verify($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Interface for a Stripe client.
+ */
+interface BaseStripeClientInterface
+{
+	/**
+	 * Gets the API key used by the client to send requests.
+	 *
+	 * @return null|string the API key used by the client to send requests
+	 */
+	public function getApiKey();
+	/**
+	 * Gets the client ID used by the client in OAuth requests.
+	 *
+	 * @return null|string the client ID used by the client in OAuth requests
+	 */
+	public function getClientId();
+	/**
+	 * Gets the base URL for Stripe's API.
+	 *
+	 * @return string the base URL for Stripe's API
+	 */
+	public function getApiBase();
+	/**
+	 * Gets the base URL for Stripe's OAuth API.
+	 *
+	 * @return string the base URL for Stripe's OAuth API
+	 */
+	public function getConnectBase();
+	/**
+	 * Gets the base URL for Stripe's Files API.
+	 *
+	 * @return string the base URL for Stripe's Files API
+	 */
+	public function getFilesBase();
+}
+/**
+ * Interface for a Stripe client.
+ */
+interface StripeClientInterface extends \Stripe\BaseStripeClientInterface
+{
+	/**
+	 * Sends a request to Stripe's API.
+	 *
+	 * @param string $method the HTTP method
+	 * @param string $path the path of the request
+	 * @param array $params the parameters of the request
+	 * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+	 *
+	 * @return \Stripe\StripeObject the object returned by Stripe's API
+	 */
+	public function request($method, $path, $params, $opts);
+}
+/**
+ * Interface for a Stripe client.
+ */
+interface StripeStreamingClientInterface extends \Stripe\BaseStripeClientInterface
+{
+	public function requestStream($method, $path, $readBodyChunkCallable, $params, $opts);
+}
+class BaseStripeClient implements \Stripe\StripeClientInterface, \Stripe\StripeStreamingClientInterface
+{
+	/** @var string default base URL for Stripe's API */
+	const DEFAULT_API_BASE = 'https://api.stripe.com';
+	/** @var string default base URL for Stripe's OAuth API */
+	const DEFAULT_CONNECT_BASE = 'https://connect.stripe.com';
+	/** @var string default base URL for Stripe's Files API */
+	const DEFAULT_FILES_BASE = 'https://files.stripe.com';
+	/**
+	 * Initializes a new instance of the {@link BaseStripeClient} class.
+	 *
+	 * The constructor takes a single argument. The argument can be a string, in which case it
+	 * should be the API key. It can also be an array with various configuration settings.
+	 *
+	 * Configuration settings include the following options:
+	 *
+	 * - api_key (null|string): the Stripe API key, to be used in regular API requests.
+	 * - client_id (null|string): the Stripe client ID, to be used in OAuth requests.
+	 * - stripe_account (null|string): a Stripe account ID. If set, all requests sent by the client
+	 *   will automatically use the {@code Stripe-Account} header with that account ID.
+	 * - stripe_version (null|string): a Stripe API verion. If set, all requests sent by the client
+	 *   will include the {@code Stripe-Version} header with that API version.
+	 *
+	 * The following configuration settings are also available, though setting these should rarely be necessary
+	 * (only useful if you want to send requests to a mock server like stripe-mock):
+	 *
+	 * - api_base (string): the base URL for regular API requests. Defaults to
+	 *   {@link DEFAULT_API_BASE}.
+	 * - connect_base (string): the base URL for OAuth requests. Defaults to
+	 *   {@link DEFAULT_CONNECT_BASE}.
+	 * - files_base (string): the base URL for file creation requests. Defaults to
+	 *   {@link DEFAULT_FILES_BASE}.
+	 *
+	 * @param array<string, mixed>|string $config the API key as a string, or an array containing
+	 *                                            the client configuration settings
+	 */
+	public function __construct($config = [])
+	{
+	}
+	/**
+	 * Gets the API key used by the client to send requests.
+	 *
+	 * @return null|string the API key used by the client to send requests
+	 */
+	public function getApiKey()
+	{
+	}
+	/**
+	 * Gets the client ID used by the client in OAuth requests.
+	 *
+	 * @return null|string the client ID used by the client in OAuth requests
+	 */
+	public function getClientId()
+	{
+	}
+	/**
+	 * Gets the base URL for Stripe's API.
+	 *
+	 * @return string the base URL for Stripe's API
+	 */
+	public function getApiBase()
+	{
+	}
+	/**
+	 * Gets the base URL for Stripe's OAuth API.
+	 *
+	 * @return string the base URL for Stripe's OAuth API
+	 */
+	public function getConnectBase()
+	{
+	}
+	/**
+	 * Gets the base URL for Stripe's Files API.
+	 *
+	 * @return string the base URL for Stripe's Files API
+	 */
+	public function getFilesBase()
+	{
+	}
+	/**
+	 * Sends a request to Stripe's API.
+	 *
+	 * @param string $method the HTTP method
+	 * @param string $path the path of the request
+	 * @param array $params the parameters of the request
+	 * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+	 *
+	 * @return \Stripe\StripeObject the object returned by Stripe's API
+	 */
+	public function request($method, $path, $params, $opts)
+	{
+	}
+	/**
+	 * Sends a request to Stripe's API, passing chunks of the streamed response
+	 * into a user-provided $readBodyChunkCallable callback.
+	 *
+	 * @param string $method the HTTP method
+	 * @param string $path the path of the request
+	 * @param callable $readBodyChunkCallable a function that will be called
+	 * @param array $params the parameters of the request
+	 * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+	 *                                                with chunks of bytes from the body if the request is successful
+	 */
+	public function requestStream($method, $path, $readBodyChunkCallable, $params, $opts)
+	{
+	}
+	/**
+	 * Sends a request to Stripe's API.
+	 *
+	 * @param string $method the HTTP method
+	 * @param string $path the path of the request
+	 * @param array $params the parameters of the request
+	 * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+	 *
+	 * @return \Stripe\Collection of ApiResources
+	 */
+	public function requestCollection($method, $path, $params, $opts)
+	{
+	}
+	/**
+	 * Sends a request to Stripe's API.
+	 *
+	 * @param string $method the HTTP method
+	 * @param string $path the path of the request
+	 * @param array $params the parameters of the request
+	 * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+	 *
+	 * @return \Stripe\SearchResult of ApiResources
+	 */
+	public function requestSearchResult($method, $path, $params, $opts)
+	{
+	}
+}
+namespace Stripe\BillingPortal;
+
+/**
+ * A portal configuration describes the functionality and behavior of a portal
+ * session.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the configuration is active and can be used to create portal sessions.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the configuration.
+ * @property \Stripe\StripeObject $business_profile
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $default_return_url The default URL to redirect customers to when they click on the portal's link to return to your website. This can be <a href="https://stripe.com/docs/api/customer_portal/sessions/create#create_portal_session-return_url">overriden</a> when creating the session.
+ * @property \Stripe\StripeObject $features
+ * @property bool $is_default Whether the configuration is the default. If <code>true</code>, this configuration can be managed in the Dashboard and portal sessions will use this configuration unless it is overriden when creating the session.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $login_page
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
+ */
+class Configuration extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'billing_portal.configuration';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * The Billing customer portal is a Stripe-hosted UI for subscription and billing
+ * management.
+ *
+ * A portal configuration describes the functionality and features that you want to
+ * provide to your customers through the portal.
+ *
+ * A portal session describes the instantiation of the customer portal for a
+ * particular customer. By visiting the session's URL, the customer can manage
+ * their subscriptions and billing details. For security reasons, sessions are
+ * short-lived and will expire if the customer does not visit the URL. Create
+ * sessions on-demand when customers intend to manage their subscriptions and
+ * billing details.
+ *
+ * Learn more in the <a
+ * href="https://stripe.com/docs/billing/subscriptions/integrating-customer-portal">integration
+ * guide</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string|\Stripe\BillingPortal\Configuration $configuration The configuration used by this session, describing the features available.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $customer The ID of the customer for this session.
+ * @property null|\Stripe\StripeObject $flow Information about a specific flow for the customer to go through. See the <a href="https://stripe.com/docs/customer-management/portal-deep-links">docs</a> to learn more about using customer portal deep links and flows.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $locale The IETF language tag of the locale Customer Portal is displayed in. If blank or auto, the customer’s <code>preferred_locales</code> or browser’s locale is used.
+ * @property null|string $on_behalf_of The account for which the session was created on behalf of. When specified, only subscriptions and invoices with this <code>on_behalf_of</code> account appear in the portal. For more information, see the <a href="https://stripe.com/docs/connect/charges-transfers#on-behalf-of">docs</a>. Use the <a href="https://stripe.com/docs/api/accounts/object#account_object-settings-branding">Accounts API</a> to modify the <code>on_behalf_of</code> account's branding settings, which the portal displays.
+ * @property null|string $return_url The URL to redirect customers to when they click on the portal's link to return to your website.
+ * @property string $url The short-lived URL of the session that gives customers access to the customer portal.
+ */
+class Session extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'billing_portal.session';
+	use \Stripe\ApiOperations\Create;
+}
+namespace Stripe;
+
+/**
+ * This is an object representing a capability for a Stripe account.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/account-capabilities">Account
+ * capabilities</a>.
+ *
+ * @property string $id The identifier for the capability.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string|\Stripe\Account $account The account for which the capability enables functionality.
+ * @property null|\Stripe\StripeObject $future_requirements
+ * @property bool $requested Whether the capability has been requested.
+ * @property null|int $requested_at Time at which the capability was requested. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $requirements
+ * @property string $status The status of the capability. Can be <code>active</code>, <code>inactive</code>, <code>pending</code>, or <code>unrequested</code>.
+ */
+class Capability extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'capability';
+	use \Stripe\ApiOperations\Update;
+	const STATUS_ACTIVE = 'active';
+	const STATUS_INACTIVE = 'inactive';
+	const STATUS_PENDING = 'pending';
+	const STATUS_UNREQUESTED = 'unrequested';
+	/**
+	 * @return string the API URL for this Stripe account reversal
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+	/**
+	 * @param string $_id
+	 * @param null|array $_params
+	 * @param null|array|string $_options
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function update($_id, $_params = null, $_options = null)
+	{
+	}
+}
+/**
+ * You can store multiple cards on a customer in order to charge the customer
+ * later. You can also store multiple debit cards on a recipient in order to
+ * transfer to those cards later.
+ *
+ * Related guide: <a href="https://stripe.com/docs/sources/cards">Card Payments
+ * with Sources</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\Account $account The account this card belongs to. This attribute will not be in the card object if the card belongs to a customer or recipient instead.
+ * @property null|string $address_city City/District/Suburb/Town/Village.
+ * @property null|string $address_country Billing address country, if provided when creating card.
+ * @property null|string $address_line1 Address line 1 (Street address/PO Box/Company name).
+ * @property null|string $address_line1_check If <code>address_line1</code> was provided, results of the check: <code>pass</code>, <code>fail</code>, <code>unavailable</code>, or <code>unchecked</code>.
+ * @property null|string $address_line2 Address line 2 (Apartment/Suite/Unit/Building).
+ * @property null|string $address_state State/County/Province/Region.
+ * @property null|string $address_zip ZIP or postal code.
+ * @property null|string $address_zip_check If <code>address_zip</code> was provided, results of the check: <code>pass</code>, <code>fail</code>, <code>unavailable</code>, or <code>unchecked</code>.
+ * @property null|string[] $available_payout_methods A set of available payout methods for this card. Only values from this set should be passed as the <code>method</code> when creating a payout.
+ * @property string $brand Card brand. Can be <code>American Express</code>, <code>Diners Club</code>, <code>Discover</code>, <code>JCB</code>, <code>MasterCard</code>, <code>UnionPay</code>, <code>Visa</code>, or <code>Unknown</code>.
+ * @property null|string $country Two-letter ISO code representing the country of the card. You could use this attribute to get a sense of the international breakdown of cards you've collected.
+ * @property null|string $currency Three-letter <a href="https://stripe.com/docs/payouts">ISO code for currency</a>. Only applicable on accounts (not customers or recipients). The card can be used as a transfer destination for funds in this currency.
+ * @property null|string|\Stripe\Customer $customer The customer that this card belongs to. This attribute will not be in the card object if the card belongs to an account or recipient instead.
+ * @property null|string $cvc_check If a CVC was provided, results of the check: <code>pass</code>, <code>fail</code>, <code>unavailable</code>, or <code>unchecked</code>. A result of unchecked indicates that CVC was provided but hasn't been checked yet. Checks are typically performed when attaching a card to a Customer object, or when creating a charge. For more details, see <a href="https://support.stripe.com/questions/check-if-a-card-is-valid-without-a-charge">Check if a card is valid without a charge</a>.
+ * @property null|bool $default_for_currency Whether this card is the default external account for its currency.
+ * @property null|string $dynamic_last4 (For tokenized numbers only.) The last four digits of the device account number.
+ * @property int $exp_month Two-digit number representing the card's expiration month.
+ * @property int $exp_year Four-digit number representing the card's expiration year.
+ * @property null|string $fingerprint <p>Uniquely identifies this particular card number. You can use this attribute to check whether two customers who’ve signed up with you are using the same card number, for example. For payment methods that tokenize card information (Apple Pay, Google Pay), the tokenized number might be provided instead of the underlying card number.</p><p><em>Starting May 1, 2021, card fingerprint in India for Connect will change to allow two fingerprints for the same card --- one for India and one for the rest of the world.</em></p>
+ * @property string $funding Card funding type. Can be <code>credit</code>, <code>debit</code>, <code>prepaid</code>, or <code>unknown</code>.
+ * @property string $last4 The last four digits of the card.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $name Cardholder name.
+ * @property null|string $status For external accounts, possible values are <code>new</code> and <code>errored</code>. If a transfer fails, the status is set to <code>errored</code> and transfers are stopped until account details are updated.
+ * @property null|string $tokenization_method If the card number is tokenized, this is the method that was used. Can be <code>android_pay</code> (includes Google Pay), <code>apple_pay</code>, <code>masterpass</code>, <code>visa_checkout</code>, or null.
+ */
+class Card extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'card';
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * Possible string representations of the CVC check status.
+	 *
+	 * @see https://stripe.com/docs/api/cards/object#card_object-cvc_check
+	 */
+	const CVC_CHECK_FAIL = 'fail';
+	const CVC_CHECK_PASS = 'pass';
+	const CVC_CHECK_UNAVAILABLE = 'unavailable';
+	const CVC_CHECK_UNCHECKED = 'unchecked';
+	/**
+	 * Possible string representations of the funding of the card.
+	 *
+	 * @see https://stripe.com/docs/api/cards/object#card_object-funding
+	 */
+	const FUNDING_CREDIT = 'credit';
+	const FUNDING_DEBIT = 'debit';
+	const FUNDING_PREPAID = 'prepaid';
+	const FUNDING_UNKNOWN = 'unknown';
+	/**
+	 * Possible string representations of the tokenization method when using Apple Pay or Google Pay.
+	 *
+	 * @see https://stripe.com/docs/api/cards/object#card_object-tokenization_method
+	 */
+	const TOKENIZATION_METHOD_APPLE_PAY = 'apple_pay';
+	const TOKENIZATION_METHOD_GOOGLE_PAY = 'google_pay';
+	/**
+	 * @return string The instance URL for this resource. It needs to be special
+	 *    cased because cards are nested resources that may belong to different
+	 *    top-level resources.
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+	/**
+	 * @param string $_id
+	 * @param null|array $_params
+	 * @param null|array|string $_options
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function update($_id, $_params = null, $_options = null)
+	{
+	}
+}
+/**
+ * A customer's <code>Cash balance</code> represents real funds. Customers can add
+ * funds to their cash balance by sending a bank transfer. These funds can be used
+ * for payment and can eventually be paid out to your bank account.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $available A hash of all cash balances available to this customer. You cannot delete a customer with any cash balances, even if the balance is 0. Amounts are represented in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property string $customer The ID of the customer whose cash balance this object represents.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $settings
+ */
+class CashBalance extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'cash_balance';
+	/**
+	 * @return string the API URL for this balance transaction
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+	/**
+	 * @param string $_id
+	 * @param null|array $_params
+	 * @param null|array|string $_options
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function update($_id, $_params = null, $_options = null)
+	{
+	}
+}
+/**
+ * To charge a credit or a debit card, you create a <code>Charge</code> object. You
+ * can retrieve and refund individual charges as well as list all charges. Charges
+ * are identified by a unique, random ID.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/accept-a-payment-charges">Accept a
+ * payment with the Charges API</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $alternate_statement_descriptors
+ * @property int $amount Amount intended to be collected by this payment. A positive integer representing how much to charge in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a> (e.g., 100 cents to charge $1.00 or 100 to charge ¥100, a zero-decimal currency). The minimum amount is $0.50 US or <a href="https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts">equivalent in charge currency</a>. The amount value supports up to eight digits (e.g., a value of 99999999 for a USD charge of $999,999.99).
+ * @property int $amount_captured Amount in %s captured (can be less than the amount attribute on the charge if a partial capture was made).
+ * @property int $amount_refunded Amount in %s refunded (can be less than the amount attribute on the charge if a partial refund was issued).
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the charge.
+ * @property null|string|\Stripe\ApplicationFee $application_fee The application fee (if any) for the charge. <a href="https://stripe.com/docs/connect/direct-charges#collecting-fees">See the Connect documentation</a> for details.
+ * @property null|int $application_fee_amount The amount of the application fee (if any) requested for the charge. <a href="https://stripe.com/docs/connect/direct-charges#collecting-fees">See the Connect documentation</a> for details.
+ * @property null|string $authorization_code Authorization code on the charge.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the balance transaction that describes the impact of this charge on your account balance (not including refunds or disputes).
+ * @property \Stripe\StripeObject $billing_details
+ * @property null|string $calculated_statement_descriptor The full statement descriptor that is passed to card networks, and that is displayed on your customers' credit card and bank statements. Allows you to see what the statement descriptor looks like after the static and dynamic portions are combined.
+ * @property bool $captured If the charge was created without capturing, this Boolean represents whether it is still uncaptured or has since been captured.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer ID of the customer this charge is for if one exists.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\Account $destination ID of an existing, connected Stripe account to transfer funds to if <code>transfer_data</code> was specified in the charge request.
+ * @property null|string|\Stripe\Dispute $dispute Details about the dispute if the charge has been disputed.
+ * @property bool $disputed Whether the charge has been disputed.
+ * @property null|string|\Stripe\BalanceTransaction $failure_balance_transaction ID of the balance transaction that describes the reversal of the balance on your account due to payment failure.
+ * @property null|string $failure_code Error code explaining reason for charge failure if available (see <a href="https://stripe.com/docs/error-codes">the errors section</a> for a list of codes).
+ * @property null|string $failure_message Message to user further explaining reason for charge failure if available.
+ * @property null|\Stripe\StripeObject $fraud_details Information on fraud assessments for the charge.
+ * @property null|string|\Stripe\Invoice $invoice ID of the invoice this charge is for if one exists.
+ * @property null|\Stripe\StripeObject $level3
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) the charge was made on behalf of without triggering an automatic transfer. See the <a href="https://stripe.com/docs/connect/charges-transfers">Connect documentation</a> for details.
+ * @property null|\Stripe\StripeObject $outcome Details about whether the payment was accepted, and why. See <a href="https://stripe.com/docs/declines">understanding declines</a> for details.
+ * @property bool $paid <code>true</code> if the charge succeeded, or was successfully authorized for later capture.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent associated with this charge, if one exists.
+ * @property null|string $payment_method ID of the payment method used in this charge.
+ * @property null|\Stripe\StripeObject $payment_method_details Details about the payment method at the time of the transaction.
+ * @property null|\Stripe\StripeObject $radar_options Options to configure Radar. See <a href="https://stripe.com/docs/radar/radar-session">Radar Session</a> for more information.
+ * @property null|string $receipt_email This is the email address that the receipt for this charge was sent to.
+ * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this charge. This attribute will be <code>null</code> until a receipt has been sent.
+ * @property null|string $receipt_url This is the URL to view the receipt for this charge. The receipt is kept up-to-date to the latest state of the charge, including any refunds. If the charge is for an Invoice, the receipt will be stylized as an Invoice receipt.
+ * @property bool $refunded Whether the charge has been fully refunded. If the charge is only partially refunded, this attribute will still be false.
+ * @property null|\Stripe\Collection<\Stripe\Refund> $refunds A list of refunds that have been applied to the charge.
+ * @property null|string|\Stripe\Review $review ID of the review associated with this charge if one exists.
+ * @property null|\Stripe\StripeObject $shipping Shipping information for the charge.
+ * @property null|\Stripe\Account|\Stripe\BankAccount|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It contains the Source, Card, or BankAccount object used for the charge. For details about the payment method used for this charge, refer to <code>payment_method</code> or <code>payment_method_details</code> instead.
+ * @property null|string|\Stripe\Transfer $source_transfer The transfer ID which created this charge. Only present if the charge came from another Stripe account. <a href="https://stripe.com/docs/connect/destination-charges">See the Connect documentation</a> for details.
+ * @property null|string $statement_descriptor For card charges, use <code>statement_descriptor_suffix</code> instead. Otherwise, you can use this value as the complete description of a charge on your customers’ statements. Must contain at least one letter, maximum 22 characters.
+ * @property null|string $statement_descriptor_suffix Provides information about the charge that customers see on their statements. Concatenated with the prefix (shortened descriptor) or statement descriptor that’s set on the account to form the complete statement descriptor. Maximum 22 characters for the concatenated descriptor.
+ * @property string $status The status of the payment is either <code>succeeded</code>, <code>pending</code>, or <code>failed</code>.
+ * @property null|string|\Stripe\Transfer $transfer ID of the transfer to the <code>destination</code> account (only applicable if the charge was created using the <code>destination</code> parameter).
+ * @property null|\Stripe\StripeObject $transfer_data An optional dictionary including the account to automatically transfer to as part of a destination charge. <a href="https://stripe.com/docs/connect/destination-charges">See the Connect documentation</a> for details.
+ * @property null|string $transfer_group A string that identifies this transaction as part of a group. See the <a href="https://stripe.com/docs/connect/charges-transfers#transfer-options">Connect documentation</a> for details.
+ */
+class Charge extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'charge';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const STATUS_FAILED = 'failed';
+	const STATUS_PENDING = 'pending';
+	const STATUS_SUCCEEDED = 'succeeded';
+	/**
+	 * Possible string representations of decline codes.
+	 * These strings are applicable to the decline_code property of the \Stripe\Exception\CardException exception.
+	 *
+	 * @see https://stripe.com/docs/declines/codes
+	 */
+	const DECLINED_AUTHENTICATION_REQUIRED = 'authentication_required';
+	const DECLINED_APPROVE_WITH_ID = 'approve_with_id';
+	const DECLINED_CALL_ISSUER = 'call_issuer';
+	const DECLINED_CARD_NOT_SUPPORTED = 'card_not_supported';
+	const DECLINED_CARD_VELOCITY_EXCEEDED = 'card_velocity_exceeded';
+	const DECLINED_CURRENCY_NOT_SUPPORTED = 'currency_not_supported';
+	const DECLINED_DO_NOT_HONOR = 'do_not_honor';
+	const DECLINED_DO_NOT_TRY_AGAIN = 'do_not_try_again';
+	const DECLINED_DUPLICATED_TRANSACTION = 'duplicate_transaction';
+	const DECLINED_EXPIRED_CARD = 'expired_card';
+	const DECLINED_FRAUDULENT = 'fraudulent';
+	const DECLINED_GENERIC_DECLINE = 'generic_decline';
+	const DECLINED_INCORRECT_NUMBER = 'incorrect_number';
+	const DECLINED_INCORRECT_CVC = 'incorrect_cvc';
+	const DECLINED_INCORRECT_PIN = 'incorrect_pin';
+	const DECLINED_INCORRECT_ZIP = 'incorrect_zip';
+	const DECLINED_INSUFFICIENT_FUNDS = 'insufficient_funds';
+	const DECLINED_INVALID_ACCOUNT = 'invalid_account';
+	const DECLINED_INVALID_AMOUNT = 'invalid_amount';
+	const DECLINED_INVALID_CVC = 'invalid_cvc';
+	const DECLINED_INVALID_EXPIRY_YEAR = 'invalid_expiry_year';
+	const DECLINED_INVALID_NUMBER = 'invalid_number';
+	const DECLINED_INVALID_PIN = 'invalid_pin';
+	const DECLINED_ISSUER_NOT_AVAILABLE = 'issuer_not_available';
+	const DECLINED_LOST_CARD = 'lost_card';
+	const DECLINED_MERCHANT_BLACKLIST = 'merchant_blacklist';
+	const DECLINED_NEW_ACCOUNT_INFORMATION_AVAILABLE = 'new_account_information_available';
+	const DECLINED_NO_ACTION_TAKEN = 'no_action_taken';
+	const DECLINED_NOT_PERMITTED = 'not_permitted';
+	const DECLINED_OFFLINE_PIN_REQUIRED = 'offline_pin_required';
+	const DECLINED_ONLINE_OR_OFFLINE_PIN_REQUIRED = 'online_or_offline_pin_required';
+	const DECLINED_PICKUP_CARD = 'pickup_card';
+	const DECLINED_PIN_TRY_EXCEEDED = 'pin_try_exceeded';
+	const DECLINED_PROCESSING_ERROR = 'processing_error';
+	const DECLINED_REENTER_TRANSACTION = 'reenter_transaction';
+	const DECLINED_RESTRICTED_CARD = 'restricted_card';
+	const DECLINED_REVOCATION_OF_ALL_AUTHORIZATIONS = 'revocation_of_all_authorizations';
+	const DECLINED_REVOCATION_OF_AUTHORIZATION = 'revocation_of_authorization';
+	const DECLINED_SECURITY_VIOLATION = 'security_violation';
+	const DECLINED_SERVICE_NOT_ALLOWED = 'service_not_allowed';
+	const DECLINED_STOLEN_CARD = 'stolen_card';
+	const DECLINED_STOP_PAYMENT_ORDER = 'stop_payment_order';
+	const DECLINED_TESTMODE_DECLINE = 'testmode_decline';
+	const DECLINED_TRANSACTION_NOT_ALLOWED = 'transaction_not_allowed';
+	const DECLINED_TRY_AGAIN_LATER = 'try_again_later';
+	const DECLINED_WITHDRAWAL_COUNT_LIMIT_EXCEEDED = 'withdrawal_count_limit_exceeded';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Charge the captured charge
+	 */
+	public function capture($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<Charge> the charge search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Checkout;
+
+/**
+ * A Checkout Session represents your customer's session as they pay for one-time
+ * purchases or subscriptions through <a
+ * href="https://stripe.com/docs/payments/checkout">Checkout</a> or <a
+ * href="https://stripe.com/docs/payments/payment-links">Payment Links</a>. We
+ * recommend creating a new Session each time your customer attempts to pay.
+ *
+ * Once payment is successful, the Checkout Session will contain a reference to the
+ * <a href="https://stripe.com/docs/api/customers">Customer</a>, and either the
+ * successful <a
+ * href="https://stripe.com/docs/api/payment_intents">PaymentIntent</a> or an
+ * active <a href="https://stripe.com/docs/api/subscriptions">Subscription</a>.
+ *
+ * You can create a Checkout Session on your server and redirect to its URL to
+ * begin Checkout.
+ *
+ * Related guide: <a href="https://stripe.com/docs/checkout/quickstart">Checkout
+ * Quickstart</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $after_expiration When set, provides configuration for actions to take if this Checkout Session expires.
+ * @property null|bool $allow_promotion_codes Enables user redeemable promotion codes.
+ * @property null|int $amount_subtotal Total of all items before discounts or taxes are applied.
+ * @property null|int $amount_total Total of all items after discounts and taxes are applied.
+ * @property \Stripe\StripeObject $automatic_tax
+ * @property null|string $billing_address_collection Describes whether Checkout should collect the customer's billing address.
+ * @property null|string $cancel_url If set, Checkout displays a back button and customers will be directed to this URL if they decide to cancel payment and return to your website.
+ * @property null|string $client_reference_id A unique string to reference the Checkout Session. This can be a customer ID, a cart ID, or similar, and can be used to reconcile the Session with your internal systems.
+ * @property null|\Stripe\StripeObject $consent Results of <code>consent_collection</code> for this session.
+ * @property null|\Stripe\StripeObject $consent_collection When set, provides configuration for the Checkout Session to gather active consent from customers.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\StripeObject[] $custom_fields Collect additional information from your customer using custom fields. Up to 2 fields are supported.
+ * @property \Stripe\StripeObject $custom_text
+ * @property null|string|\Stripe\Customer $customer The ID of the customer for this Session. For Checkout Sessions in <code>payment</code> or <code>subscription</code> mode, Checkout will create a new customer object based on information provided during the payment flow unless an existing customer was provided when the Session was created.
+ * @property null|string $customer_creation Configure whether a Checkout Session creates a Customer when the Checkout Session completes.
+ * @property null|\Stripe\StripeObject $customer_details The customer details including the customer's tax exempt status and the customer's tax IDs. Only the customer's email is present on Sessions in <code>setup</code> mode.
+ * @property null|string $customer_email If provided, this value will be used when the Customer object is created. If not provided, customers will be asked to enter their email address. Use this parameter to prefill customer data if you already have an email on file. To access information about the customer once the payment flow is complete, use the <code>customer</code> attribute.
+ * @property int $expires_at The timestamp at which the Checkout Session will expire.
+ * @property null|string|\Stripe\Invoice $invoice ID of the invoice created by the Checkout Session, if it exists.
+ * @property null|\Stripe\StripeObject $invoice_creation Details on the state of invoice creation for the Checkout Session.
+ * @property null|\Stripe\Collection<\Stripe\LineItem> $line_items The line items purchased by the customer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $locale The IETF language tag of the locale Checkout is displayed in. If blank or <code>auto</code>, the browser's locale is used.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $mode The mode of the Checkout Session.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent The ID of the PaymentIntent for Checkout Sessions in <code>payment</code> mode.
+ * @property null|string|\Stripe\PaymentLink $payment_link The ID of the Payment Link that created this Session.
+ * @property null|string $payment_method_collection Configure whether a Checkout Session should collect a payment method.
+ * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for the PaymentIntent or SetupIntent of this CheckoutSession.
+ * @property string[] $payment_method_types A list of the types of payment methods (e.g. card) this Checkout Session is allowed to accept.
+ * @property string $payment_status The payment status of the Checkout Session, one of <code>paid</code>, <code>unpaid</code>, or <code>no_payment_required</code>. You can use this value to decide when to fulfill your customer's order.
+ * @property null|\Stripe\StripeObject $phone_number_collection
+ * @property null|string $recovered_from The ID of the original expired Checkout Session that triggered the recovery flow.
+ * @property null|string|\Stripe\SetupIntent $setup_intent The ID of the SetupIntent for Checkout Sessions in <code>setup</code> mode.
+ * @property null|\Stripe\StripeObject $shipping_address_collection When set, provides configuration for Checkout to collect a shipping address from a customer.
+ * @property null|\Stripe\StripeObject $shipping_cost The details of the customer cost of shipping, including the customer chosen ShippingRate.
+ * @property null|\Stripe\StripeObject $shipping_details Shipping information for this Checkout Session.
+ * @property \Stripe\StripeObject[] $shipping_options The shipping rate options applied to this Session.
+ * @property null|string $status The status of the Checkout Session, one of <code>open</code>, <code>complete</code>, or <code>expired</code>.
+ * @property null|string $submit_type Describes the type of transaction being performed by Checkout in order to customize relevant text on the page, such as the submit button. <code>submit_type</code> can only be specified on Checkout Sessions in <code>payment</code> mode, but not Checkout Sessions in <code>subscription</code> or <code>setup</code> mode.
+ * @property null|string|\Stripe\Subscription $subscription The ID of the subscription for Checkout Sessions in <code>subscription</code> mode.
+ * @property string $success_url The URL the customer will be directed to after the payment or subscription creation is successful.
+ * @property null|\Stripe\StripeObject $tax_id_collection
+ * @property null|\Stripe\StripeObject $total_details Tax and discount details for the computed total amount.
+ * @property null|string $url The URL to the Checkout Session. Redirect customers to this URL to take them to Checkout. If you’re using <a href="https://stripe.com/docs/payments/checkout/custom-domains">Custom Domains</a>, the URL will use your subdomain. Otherwise, it’ll use <code>checkout.stripe.com.</code> This value is only present when the session is active.
+ */
+class Session extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'checkout.session';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const BILLING_ADDRESS_COLLECTION_AUTO = 'auto';
+	const BILLING_ADDRESS_COLLECTION_REQUIRED = 'required';
+	const CUSTOMER_CREATION_ALWAYS = 'always';
+	const CUSTOMER_CREATION_IF_REQUIRED = 'if_required';
+	const MODE_PAYMENT = 'payment';
+	const MODE_SETUP = 'setup';
+	const MODE_SUBSCRIPTION = 'subscription';
+	const PAYMENT_METHOD_COLLECTION_ALWAYS = 'always';
+	const PAYMENT_METHOD_COLLECTION_IF_REQUIRED = 'if_required';
+	const PAYMENT_STATUS_NO_PAYMENT_REQUIRED = 'no_payment_required';
+	const PAYMENT_STATUS_PAID = 'paid';
+	const PAYMENT_STATUS_UNPAID = 'unpaid';
+	const STATUS_COMPLETE = 'complete';
+	const STATUS_EXPIRED = 'expired';
+	const STATUS_OPEN = 'open';
+	const SUBMIT_TYPE_AUTO = 'auto';
+	const SUBMIT_TYPE_BOOK = 'book';
+	const SUBMIT_TYPE_DONATE = 'donate';
+	const SUBMIT_TYPE_PAY = 'pay';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Checkout\Session the expired session
+	 */
+	public function expire($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem> list of LineItems
+	 */
+	public static function allLineItems($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * Class Collection.
+ *
+ * @template TStripeObject of StripeObject
+ * @template-implements \IteratorAggregate<TStripeObject>
+ *
+ * @property string $object
+ * @property string $url
+ * @property bool $has_more
+ * @property TStripeObject[] $data
+ */
+class Collection extends \Stripe\StripeObject implements \Countable, \IteratorAggregate
+{
+	const OBJECT_NAME = 'list';
+	use \Stripe\ApiOperations\Request;
+	/** @var array */
+	protected $filters = [];
+	/**
+	 * @return string the base URL for the given class
+	 */
+	public static function baseUrl()
+	{
+	}
+	/**
+	 * Returns the filters.
+	 *
+	 * @return array the filters
+	 */
+	public function getFilters()
+	{
+	}
+	/**
+	 * Sets the filters, removing paging options.
+	 *
+	 * @param array $filters the filters
+	 */
+	public function setFilters($filters)
+	{
+	}
+	/**
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetGet($k)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws Exception\ApiErrorException
+	 *
+	 * @return Collection<TStripeObject>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws Exception\ApiErrorException
+	 *
+	 * @return TStripeObject
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws Exception\ApiErrorException
+	 *
+	 * @return TStripeObject
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @return int the number of objects in the current page
+	 */
+	#[\ReturnTypeWillChange]
+	public function count()
+	{
+	}
+	/**
+	 * @return \ArrayIterator an iterator that can be used to iterate
+	 *    across objects in the current page
+	 */
+	#[\ReturnTypeWillChange]
+	public function getIterator()
+	{
+	}
+	/**
+	 * @return \ArrayIterator an iterator that can be used to iterate
+	 *    backwards across objects in the current page
+	 */
+	public function getReverseIterator()
+	{
+	}
+	/**
+	 * @return \Generator|TStripeObject[] A generator that can be used to
+	 *    iterate across all objects across all pages. As page boundaries are
+	 *    encountered, the next page will be fetched automatically for
+	 *    continued iteration.
+	 */
+	public function autoPagingIterator()
+	{
+	}
+	/**
+	 * Returns an empty collection. This is returned from {@see nextPage()}
+	 * when we know that there isn't a next page in order to replicate the
+	 * behavior of the API when it attempts to return a page beyond the last.
+	 *
+	 * @param null|array|string $opts
+	 *
+	 * @return Collection
+	 */
+	public static function emptyCollection($opts = null)
+	{
+	}
+	/**
+	 * Returns true if the page object contains no element.
+	 *
+	 * @return bool
+	 */
+	public function isEmpty()
+	{
+	}
+	/**
+	 * Fetches the next page in the resource list (if there is one).
+	 *
+	 * This method will try to respect the limit of the current page. If none
+	 * was given, the default limit will be fetched again.
+	 *
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @return Collection<TStripeObject>
+	 */
+	public function nextPage($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Fetches the previous page in the resource list (if there is one).
+	 *
+	 * This method will try to respect the limit of the current page. If none
+	 * was given, the default limit will be fetched again.
+	 *
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @return Collection<TStripeObject>
+	 */
+	public function previousPage($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Gets the first item from the current page. Returns `null` if the current page is empty.
+	 *
+	 * @return null|TStripeObject
+	 */
+	public function first()
+	{
+	}
+	/**
+	 * Gets the last item from the current page. Returns `null` if the current page is empty.
+	 *
+	 * @return null|TStripeObject
+	 */
+	public function last()
+	{
+	}
+}
+/**
+ * Stripe needs to collect certain pieces of information about each account
+ * created. These requirements can differ depending on the account's country. The
+ * Country Specs API makes these rules available to your integration.
+ *
+ * You can also view the information from this API call as <a
+ * href="/docs/connect/required-verification-information">an online guide</a>.
+ *
+ * @property string $id Unique identifier for the object. Represented as the ISO country code for this country.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $default_currency The default currency for this country. This applies to both payment methods and bank accounts.
+ * @property \Stripe\StripeObject $supported_bank_account_currencies Currencies that can be accepted in the specific country (for transfers).
+ * @property string[] $supported_payment_currencies Currencies that can be accepted in the specified country (for payments).
+ * @property string[] $supported_payment_methods Payment methods available in the specified country. You may need to enable some payment methods (e.g., <a href="https://stripe.com/docs/ach">ACH</a>) on your account before they appear in this list. The <code>stripe</code> payment method refers to <a href="https://stripe.com/docs/connect/destination-charges">charging through your platform</a>.
+ * @property string[] $supported_transfer_countries Countries that can accept transfers from the specified country.
+ * @property \Stripe\StripeObject $verification_fields
+ */
+class CountrySpec extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'country_spec';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+}
+/**
+ * A coupon contains information about a percent-off or amount-off discount you
+ * might want to apply to a customer. Coupons may be applied to <a
+ * href="https://stripe.com/docs/api#subscriptions">subscriptions</a>, <a
+ * href="https://stripe.com/docs/api#invoices">invoices</a>, <a
+ * href="https://stripe.com/docs/api/checkout/sessions">checkout sessions</a>, <a
+ * href="https://stripe.com/docs/api#quotes">quotes</a>, and more. Coupons do not
+ * work with conventional one-off <a
+ * href="https://stripe.com/docs/api#create_charge">charges</a> or <a
+ * href="https://stripe.com/docs/api/payment_intents">payment intents</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|int $amount_off Amount (in the <code>currency</code> specified) that will be taken off the subtotal of any invoices for this customer.
+ * @property null|\Stripe\StripeObject $applies_to
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency If <code>amount_off</code> has been set, the three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> of the amount to take off.
+ * @property null|\Stripe\StripeObject $currency_options Coupons defined in each available currency option. Each key must be a three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a> and a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $duration One of <code>forever</code>, <code>once</code>, and <code>repeating</code>. Describes how long a customer who applies this coupon will get the discount.
+ * @property null|int $duration_in_months If <code>duration</code> is <code>repeating</code>, the number of months the coupon applies. Null if coupon <code>duration</code> is <code>forever</code> or <code>once</code>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|int $max_redemptions Maximum number of times this coupon can be redeemed, in total, across all customers, before it is no longer valid.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $name Name of the coupon displayed to customers on for instance invoices or receipts.
+ * @property null|float $percent_off Percent that will be taken off the subtotal of any invoices for this customer for the duration of the coupon. For example, a coupon with percent_off of 50 will make a %s100 invoice %s50 instead.
+ * @property null|int $redeem_by Date after which the coupon can no longer be redeemed.
+ * @property int $times_redeemed Number of times this coupon has been applied to a customer.
+ * @property bool $valid Taking account of the above properties, whether this coupon can still be applied to a customer.
+ */
+class Coupon extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'coupon';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * Issue a credit note to adjust an invoice's amount after the invoice is
+ * finalized.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/invoices/credit-notes">Credit Notes</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The integer amount in %s representing the total amount of the credit note, including tax.
+ * @property int $amount_shipping This is the sum of all the shipping amounts.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer ID of the customer.
+ * @property null|string|\Stripe\CustomerBalanceTransaction $customer_balance_transaction Customer balance transaction related to this credit note.
+ * @property int $discount_amount The integer amount in %s representing the total amount of discount that was credited.
+ * @property \Stripe\StripeObject[] $discount_amounts The aggregate amounts calculated per discount for all line items.
+ * @property string|\Stripe\Invoice $invoice ID of the invoice.
+ * @property \Stripe\Collection<\Stripe\CreditNoteLineItem> $lines Line items that make up the credit note
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $memo Customer-facing text that appears on the credit note PDF.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $number A unique number that identifies this particular credit note and appears on the PDF of the credit note and its associated invoice.
+ * @property null|int $out_of_band_amount Amount that was credited outside of Stripe.
+ * @property string $pdf The link to download the PDF of the credit note.
+ * @property null|string $reason Reason for issuing this credit note, one of <code>duplicate</code>, <code>fraudulent</code>, <code>order_change</code>, or <code>product_unsatisfactory</code>
+ * @property null|string|\Stripe\Refund $refund Refund related to this credit note.
+ * @property null|\Stripe\StripeObject $shipping_cost The details of the cost of shipping, including the ShippingRate applied to the invoice.
+ * @property string $status Status of this credit note, one of <code>issued</code> or <code>void</code>. Learn more about <a href="https://stripe.com/docs/billing/invoices/credit-notes#voiding">voiding credit notes</a>.
+ * @property int $subtotal The integer amount in %s representing the amount of the credit note, excluding exclusive tax and invoice level discounts.
+ * @property null|int $subtotal_excluding_tax The integer amount in %s representing the amount of the credit note, excluding all tax and invoice level discounts.
+ * @property \Stripe\StripeObject[] $tax_amounts The aggregate amounts calculated per tax rate for all line items.
+ * @property int $total The integer amount in %s representing the total amount of the credit note, including tax and all discount.
+ * @property null|int $total_excluding_tax The integer amount in %s representing the total amount of the credit note, excluding tax, but including discounts.
+ * @property string $type Type of this credit note, one of <code>pre_payment</code> or <code>post_payment</code>. A <code>pre_payment</code> credit note means it was issued when the invoice was open. A <code>post_payment</code> credit note means it was issued when the invoice was paid.
+ * @property null|int $voided_at The time that the credit note was voided.
+ */
+class CreditNote extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'credit_note';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const REASON_DUPLICATE = 'duplicate';
+	const REASON_FRAUDULENT = 'fraudulent';
+	const REASON_ORDER_CHANGE = 'order_change';
+	const REASON_PRODUCT_UNSATISFACTORY = 'product_unsatisfactory';
+	const STATUS_ISSUED = 'issued';
+	const STATUS_VOID = 'void';
+	const TYPE_POST_PAYMENT = 'post_payment';
+	const TYPE_PRE_PAYMENT = 'pre_payment';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote the previewed credit note
+	 */
+	public static function preview($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CreditNoteLineItem> list of CreditNoteLineItems
+	 */
+	public static function previewLines($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote the voided credit note
+	 */
+	public function voidCreditNote($params = null, $opts = null)
+	{
+	}
+	const PATH_LINES = '/lines';
+	/**
+	 * @param string $id the ID of the credit note on which to retrieve the credit note line items
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CreditNoteLineItem> the list of credit note line items
+	 */
+	public static function allLines($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The integer amount in %s representing the gross amount being credited for this line item, excluding (exclusive) tax and discounts.
+ * @property null|int $amount_excluding_tax The integer amount in %s representing the amount being credited for this line item, excluding all tax and discounts.
+ * @property null|string $description Description of the item being credited.
+ * @property int $discount_amount The integer amount in %s representing the discount being credited for this line item.
+ * @property \Stripe\StripeObject[] $discount_amounts The amount of discount calculated per discount for this line item
+ * @property null|string $invoice_line_item ID of the invoice line item being credited
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|int $quantity The number of units of product being credited.
+ * @property \Stripe\StripeObject[] $tax_amounts The amount of tax calculated per tax rate for this line item
+ * @property \Stripe\TaxRate[] $tax_rates The tax rates which apply to the line item.
+ * @property string $type The type of the credit note line item, one of <code>invoice_line_item</code> or <code>custom_line_item</code>. When the type is <code>invoice_line_item</code> there is an additional <code>invoice_line_item</code> property on the resource the value of which is the id of the credited line item on the invoice.
+ * @property null|int $unit_amount The cost of each unit of product being credited.
+ * @property null|string $unit_amount_decimal Same as <code>unit_amount</code>, but contains a decimal value with at most 12 decimal places.
+ * @property null|string $unit_amount_excluding_tax The amount in %s representing the unit amount being credited for this line item, excluding all tax and discounts.
+ */
+class CreditNoteLineItem extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'credit_note_line_item';
+}
+/**
+ * This object represents a customer of your business. It lets you create recurring
+ * charges and track payments that belong to the same customer.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/save-during-payment">Save a card during
+ * payment</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $address The customer's address.
+ * @property null|int $balance Current balance, if any, being stored on the customer. If negative, the customer has credit to apply to their next invoice. If positive, the customer has an amount owed that will be added to their next invoice. The balance does not refer to any unpaid invoices; it solely takes into account amounts that have yet to be successfully applied to any invoice. This balance is only taken into account as invoices are finalized.
+ * @property null|\Stripe\CashBalance $cash_balance The current funds being held by Stripe on behalf of the customer. These funds can be applied towards payment intents with source &quot;cash_balance&quot;. The settings[reconciliation_mode] field describes whether these funds are applied to such payment intents manually or automatically.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> the customer can be charged in for recurring billing purposes.
+ * @property null|string|\Stripe\Account|\Stripe\BankAccount|\Stripe\Card|\Stripe\Source $default_source <p>ID of the default payment source for the customer.</p><p>If you are using payment methods created via the PaymentMethods API, see the <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> field instead.</p>
+ * @property null|bool $delinquent <p>When the customer's latest invoice is billed by charging automatically, <code>delinquent</code> is <code>true</code> if the invoice's latest charge failed. When the customer's latest invoice is billed by sending an invoice, <code>delinquent</code> is <code>true</code> if the invoice isn't paid by its due date.</p><p>If an invoice is marked uncollectible by <a href="https://stripe.com/docs/billing/automatic-collection">dunning</a>, <code>delinquent</code> doesn't get reset to <code>false</code>.</p>
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\Discount $discount Describes the current discount active on the customer, if there is one.
+ * @property null|string $email The customer's email address.
+ * @property null|\Stripe\StripeObject $invoice_credit_balance The current multi-currency balances, if any, being stored on the customer. If positive in a currency, the customer has a credit to apply to their next invoice denominated in that currency. If negative, the customer has an amount owed that will be added to their next invoice denominated in that currency. These balances do not refer to any unpaid invoices. They solely track amounts that have yet to be successfully applied to any invoice. A balance in a particular currency is only applied to any invoice as an invoice in that currency is finalized.
+ * @property null|string $invoice_prefix The prefix for the customer used to generate unique invoice numbers.
+ * @property null|\Stripe\StripeObject $invoice_settings
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $name The customer's full name or business name.
+ * @property null|int $next_invoice_sequence The suffix of the customer's next invoice number, e.g., 0001.
+ * @property null|string $phone The customer's phone number.
+ * @property null|string[] $preferred_locales The customer's preferred locales (languages), ordered by preference.
+ * @property null|\Stripe\StripeObject $shipping Mailing and shipping address for the customer. Appears on invoices emailed to this customer.
+ * @property null|\Stripe\Collection<\Stripe\Account|\Stripe\BankAccount|\Stripe\Card|\Stripe\Source> $sources The customer's payment sources, if any.
+ * @property null|\Stripe\Collection<\Stripe\Subscription> $subscriptions The customer's current subscriptions, if any.
+ * @property null|\Stripe\StripeObject $tax
+ * @property null|string $tax_exempt Describes the customer's tax exemption status. One of <code>none</code>, <code>exempt</code>, or <code>reverse</code>. When set to <code>reverse</code>, invoice and receipt PDFs include the text <strong>&quot;Reverse charge&quot;</strong>.
+ * @property null|\Stripe\Collection<\Stripe\TaxId> $tax_ids The customer's tax IDs.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this customer belongs to.
+ */
+class Customer extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'customer';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const TAX_EXEMPT_EXEMPT = 'exempt';
+	const TAX_EXEMPT_NONE = 'none';
+	const TAX_EXEMPT_REVERSE = 'reverse';
+	public static function getSavedNestedResources()
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @return \Stripe\Customer the updated customer
+	 */
+	public function deleteDiscount($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\PaymentMethod> list of PaymentMethods
+	 */
+	public static function allPaymentMethods($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $payment_method
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer the retrieved customer
+	 */
+	public function retrievePaymentMethod($payment_method, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<Customer> the customer search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+	const PATH_CASH_BALANCE = '/cash_balance';
+	/**
+	 * @param string $id the ID of the customer to which the cash balance belongs
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 * @param mixed $cashBalanceId
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CashBalance
+	 */
+	public static function retrieveCashBalance($id, $cashBalanceId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the cash balance belongs
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 * @param mixed $cashBalanceId
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CashBalance
+	 */
+	public static function updateCashBalance($id, $cashBalanceId, $params = null, $opts = null)
+	{
+	}
+	const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
+	/**
+	 * @param string $id the ID of the customer on which to retrieve the customer balance transactions
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CustomerBalanceTransaction> the list of customer balance transactions
+	 */
+	public static function allBalanceTransactions($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer on which to create the customer balance transaction
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerBalanceTransaction
+	 */
+	public static function createBalanceTransaction($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the customer balance transaction belongs
+	 * @param string $balanceTransactionId the ID of the customer balance transaction to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerBalanceTransaction
+	 */
+	public static function retrieveBalanceTransaction($id, $balanceTransactionId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the customer balance transaction belongs
+	 * @param string $balanceTransactionId the ID of the customer balance transaction to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerBalanceTransaction
+	 */
+	public static function updateBalanceTransaction($id, $balanceTransactionId, $params = null, $opts = null)
+	{
+	}
+	const PATH_CASH_BALANCE_TRANSACTIONS = '/cash_balance_transactions';
+	/**
+	 * @param string $id the ID of the customer on which to retrieve the customer cash balance transactions
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CustomerCashBalanceTransaction> the list of customer cash balance transactions
+	 */
+	public static function allCashBalanceTransactions($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the customer cash balance transaction belongs
+	 * @param string $cashBalanceTransactionId the ID of the customer cash balance transaction to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerCashBalanceTransaction
+	 */
+	public static function retrieveCashBalanceTransaction($id, $cashBalanceTransactionId, $params = null, $opts = null)
+	{
+	}
+	const PATH_SOURCES = '/sources';
+	/**
+	 * @param string $id the ID of the customer on which to retrieve the payment sources
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card|\Stripe\Source> the list of payment sources (BankAccount, Card or Source)
+	 */
+	public static function allSources($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer on which to create the payment source
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public static function createSource($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the payment source belongs
+	 * @param string $sourceId the ID of the payment source to delete
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public static function deleteSource($id, $sourceId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the payment source belongs
+	 * @param string $sourceId the ID of the payment source to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public static function retrieveSource($id, $sourceId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the payment source belongs
+	 * @param string $sourceId the ID of the payment source to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public static function updateSource($id, $sourceId, $params = null, $opts = null)
+	{
+	}
+	const PATH_TAX_IDS = '/tax_ids';
+	/**
+	 * @param string $id the ID of the customer on which to retrieve the tax ids
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TaxId> the list of tax ids
+	 */
+	public static function allTaxIds($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer on which to create the tax id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxId
+	 */
+	public static function createTaxId($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the tax id belongs
+	 * @param string $taxIdId the ID of the tax id to delete
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxId
+	 */
+	public static function deleteTaxId($id, $taxIdId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the customer to which the tax id belongs
+	 * @param string $taxIdId the ID of the tax id to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxId
+	 */
+	public static function retrieveTaxId($id, $taxIdId, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Each customer has a <a
+ * href="https://stripe.com/docs/api/customers/object#customer_object-balance"><code>balance</code></a>
+ * value, which denotes a debit or credit that's automatically applied to their
+ * next invoice upon finalization. You may modify the value directly by using the
+ * <a href="https://stripe.com/docs/api/customers/update">update customer API</a>,
+ * or by creating a Customer Balance Transaction, which increments or decrements
+ * the customer's <code>balance</code> by the specified <code>amount</code>.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/customer/balance">Customer Balance</a> to
+ * learn more.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The amount of the transaction. A negative value is a credit for the customer's balance, and a positive value is a debit to the customer's <code>balance</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\CreditNote $credit_note The ID of the credit note (if any) related to the transaction.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer The ID of the customer the transaction belongs to.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property int $ending_balance The customer's <code>balance</code> after the transaction was applied. A negative value decreases the amount due on the customer's next invoice. A positive value increases the amount due on the customer's next invoice.
+ * @property null|string|\Stripe\Invoice $invoice The ID of the invoice (if any) related to the transaction.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $type Transaction type: <code>adjustment</code>, <code>applied_to_invoice</code>, <code>credit_note</code>, <code>initial</code>, <code>invoice_overpaid</code>, <code>invoice_too_large</code>, <code>invoice_too_small</code>, <code>unspent_receiver_credit</code>, or <code>unapplied_from_invoice</code>. See the <a href="https://stripe.com/docs/billing/customer/balance#types">Customer Balance page</a> to learn more about transaction types.
+ */
+class CustomerBalanceTransaction extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'customer_balance_transaction';
+	const TYPE_ADJUSTMENT = 'adjustment';
+	const TYPE_APPLIED_TO_INVOICE = 'applied_to_invoice';
+	const TYPE_CREDIT_NOTE = 'credit_note';
+	const TYPE_INITIAL = 'initial';
+	const TYPE_INVOICE_OVERPAID = 'invoice_overpaid';
+	const TYPE_INVOICE_TOO_LARGE = 'invoice_too_large';
+	const TYPE_INVOICE_TOO_SMALL = 'invoice_too_small';
+	const TYPE_UNSPENT_RECEIVER_CREDIT = 'unspent_receiver_credit';
+	const TYPE_ADJUSTEMENT = 'adjustment';
+	/**
+	 * @return string the API URL for this balance transaction
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+	/**
+	 * @param string $_id
+	 * @param null|array $_params
+	 * @param null|array|string $_options
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function update($_id, $_params = null, $_options = null)
+	{
+	}
+}
+/**
+ * Customers with certain payments enabled have a cash balance, representing funds
+ * that were paid by the customer to a merchant, but have not yet been allocated to
+ * a payment. Cash Balance Transactions represent when funds are moved into or out
+ * of this balance. This includes funding by the customer, allocation to payments,
+ * and refunds to the customer.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $applied_to_payment
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer The customer whose available cash balance changed as a result of this transaction.
+ * @property int $ending_balance The total available cash balance for the specified currency after this transaction was applied. Represented in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|\Stripe\StripeObject $funded
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $net_amount The amount by which the cash balance changed, represented in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>. A positive value represents funds being added to the cash balance, a negative value represents funds being removed from the cash balance.
+ * @property null|\Stripe\StripeObject $refunded_from_payment
+ * @property string $type The type of the cash balance transaction. One of <code>applied_to_payment</code>, <code>unapplied_from_payment</code>, <code>refunded_from_payment</code>, <code>funded</code>, <code>return_initiated</code>, or <code>return_canceled</code>. New types may be added in future. See <a href="https://stripe.com/docs/payments/customer-balance#types">Customer Balance</a> to learn more about these types.
+ * @property null|\Stripe\StripeObject $unapplied_from_payment
+ */
+class CustomerCashBalanceTransaction extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'customer_cash_balance_transaction';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const TYPE_APPLIED_TO_PAYMENT = 'applied_to_payment';
+	const TYPE_FUNDED = 'funded';
+	const TYPE_FUNDING_REVERSED = 'funding_reversed';
+	const TYPE_REFUNDED_FROM_PAYMENT = 'refunded_from_payment';
+	const TYPE_RETURN_CANCELED = 'return_canceled';
+	const TYPE_RETURN_INITIATED = 'return_initiated';
+	const TYPE_UNAPPLIED_FROM_PAYMENT = 'unapplied_from_payment';
+}
+/**
+ * Class Discount.
+ *
+ * @property null|string $checkout_session The Checkout session that this coupon is applied to, if it is applied to a particular session in payment mode. Will not be present for subscription mode.
+ * @property \Stripe\Coupon $coupon Hash describing the coupon applied to create this discount.
+ * @property string|\Stripe\Customer $customer The ID of the customer associated with this discount.
+ * @property null|int $end If the coupon has a duration of repeating, the date that this discount will end. If the coupon has a duration of once or forever, this attribute will be null.
+ * @property string $id The ID of the discount object.
+ * @property null|string $invoice The invoice that the discount’s coupon was applied to, if it was applied directly to a particular invoice.
+ * @property null|string $invoice_item The invoice item id (or invoice line item id for invoice line items of type=‘subscription’) that the discount’s coupon was applied to, if it was applied directly to a particular invoice item or invoice line item.
+ * @property string $object String representing the object’s type. Objects of the same type share the same value.
+ * @property null|string $promotion_code The promotion code applied to create this discount.
+ * @property int $start Date that the coupon was applied.
+ * @property null|string $subscription The subscription that this coupon is applied to, if it is applied to a particular subscription.
+ */
+class Discount extends \Stripe\StripeObject
+{
+	const OBJECT_NAME = 'discount';
+}
+/**
+ * A dispute occurs when a customer questions your charge with their card issuer.
+ * When this happens, you're given the opportunity to respond to the dispute with
+ * evidence that shows that the charge is legitimate. You can find more information
+ * about the dispute process in our <a href="/docs/disputes">Disputes and Fraud</a>
+ * documentation.
+ *
+ * Related guide: <a href="https://stripe.com/docs/disputes">Disputes and
+ * Fraud</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Disputed amount. Usually the amount of the charge, but can differ (usually because of currency fluctuation or because only part of the order is disputed).
+ * @property \Stripe\BalanceTransaction[] $balance_transactions List of zero, one, or two balance transactions that show funds withdrawn and reinstated to your Stripe account as a result of this dispute.
+ * @property string|\Stripe\Charge $charge ID of the charge that was disputed.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\StripeObject $evidence
+ * @property \Stripe\StripeObject $evidence_details
+ * @property bool $is_charge_refundable If true, it is still possible to refund the disputed payment. Once the payment has been fully refunded, no further funds will be withdrawn from your Stripe account as a result of this dispute.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $network_reason_code Network-dependent reason code for the dispute.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent that was disputed.
+ * @property string $reason Reason given by cardholder for dispute. Possible values are <code>bank_cannot_process</code>, <code>check_returned</code>, <code>credit_not_processed</code>, <code>customer_initiated</code>, <code>debit_not_authorized</code>, <code>duplicate</code>, <code>fraudulent</code>, <code>general</code>, <code>incorrect_account_details</code>, <code>insufficient_funds</code>, <code>product_not_received</code>, <code>product_unacceptable</code>, <code>subscription_canceled</code>, or <code>unrecognized</code>. Read more about <a href="https://stripe.com/docs/disputes/categories">dispute reasons</a>.
+ * @property string $status Current status of dispute. Possible values are <code>warning_needs_response</code>, <code>warning_under_review</code>, <code>warning_closed</code>, <code>needs_response</code>, <code>under_review</code>, <code>charge_refunded</code>, <code>won</code>, or <code>lost</code>.
+ */
+class Dispute extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'dispute';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const REASON_BANK_CANNOT_PROCESS = 'bank_cannot_process';
+	const REASON_CHECK_RETURNED = 'check_returned';
+	const REASON_CREDIT_NOT_PROCESSED = 'credit_not_processed';
+	const REASON_CUSTOMER_INITIATED = 'customer_initiated';
+	const REASON_DEBIT_NOT_AUTHORIZED = 'debit_not_authorized';
+	const REASON_DUPLICATE = 'duplicate';
+	const REASON_FRAUDULENT = 'fraudulent';
+	const REASON_GENERAL = 'general';
+	const REASON_INCORRECT_ACCOUNT_DETAILS = 'incorrect_account_details';
+	const REASON_INSUFFICIENT_FUNDS = 'insufficient_funds';
+	const REASON_PRODUCT_NOT_RECEIVED = 'product_not_received';
+	const REASON_PRODUCT_UNACCEPTABLE = 'product_unacceptable';
+	const REASON_SUBSCRIPTION_CANCELED = 'subscription_canceled';
+	const REASON_UNRECOGNIZED = 'unrecognized';
+	const STATUS_CHARGE_REFUNDED = 'charge_refunded';
+	const STATUS_LOST = 'lost';
+	const STATUS_NEEDS_RESPONSE = 'needs_response';
+	const STATUS_UNDER_REVIEW = 'under_review';
+	const STATUS_WARNING_CLOSED = 'warning_closed';
+	const STATUS_WARNING_NEEDS_RESPONSE = 'warning_needs_response';
+	const STATUS_WARNING_UNDER_REVIEW = 'warning_under_review';
+	const STATUS_WON = 'won';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Dispute the closed dispute
+	 */
+	public function close($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $expires Time at which the key will expire. Measured in seconds since the Unix epoch.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $secret The key's secret. You can use this value to make authorized requests to the Stripe API.
+ */
+class EphemeralKey extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'ephemeral_key';
+	use \Stripe\ApiOperations\Create {
+		create as protected _create;
+	}
+	use \Stripe\ApiOperations\Delete;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\InvalidArgumentException if stripe_version is missing
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\EphemeralKey the created key
+	 */
+	public static function create($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Class ErrorObject.
+ *
+ * @property string $charge For card errors, the ID of the failed charge.
+ * @property string $code For some errors that could be handled
+ *    programmatically, a short string indicating the error code reported.
+ * @property string $decline_code For card errors resulting from a card issuer
+ *    decline, a short string indicating the card issuer's reason for the
+ *    decline if they provide one.
+ * @property string $doc_url A URL to more information about the error code
+ *    reported.
+ * @property string $message A human-readable message providing more details
+ *    about the error. For card errors, these messages can be shown to your
+ *    users.
+ * @property string $param If the error is parameter-specific, the parameter
+ *    related to the error. For example, you can use this to display a message
+ *    near the correct form field.
+ * @property PaymentIntent $payment_intent The PaymentIntent object for errors
+ *    returned on a request involving a PaymentIntent.
+ * @property PaymentMethod $payment_method The PaymentMethod object for errors
+ *    returned on a request involving a PaymentMethod.
+ * @property string $payment_method_type If the error is specific to the type
+ *    of payment method, the payment method type that had a problem. This
+ *    field is only populated for invoice-related errors.
+ * @property string $request_log_url A URL to the request log entry in your
+ *    dashboard.
+ * @property SetupIntent $setup_intent The SetupIntent object for errors
+ *    returned on a request involving a SetupIntent.
+ * @property StripeObject $source The source object for errors returned on a
+ *    request involving a source.
+ * @property string $type The type of error returned. One of `api_error`,
+ *   `card_error`, `idempotency_error`, or `invalid_request_error`.
+ */
+class ErrorObject extends \Stripe\StripeObject
+{
+	/**
+	 * Possible string representations of an error's code.
+	 *
+	 * @see https://stripe.com/docs/error-codes
+	 */
+	const CODE_ACCOUNT_COUNTRY_INVALID_ADDRESS = 'account_country_invalid_address';
+	const CODE_ACCOUNT_ERROR_COUNTRY_CHANGE_REQUIRES_ADDITIONAL_STEPS = 'account_error_country_change_requires_additional_steps';
+	const CODE_ACCOUNT_INFORMATION_MISMATCH = 'account_information_mismatch';
+	const CODE_ACCOUNT_INVALID = 'account_invalid';
+	const CODE_ACCOUNT_NUMBER_INVALID = 'account_number_invalid';
+	const CODE_ACSS_DEBIT_SESSION_INCOMPLETE = 'acss_debit_session_incomplete';
+	const CODE_ALIPAY_UPGRADE_REQUIRED = 'alipay_upgrade_required';
+	const CODE_AMOUNT_TOO_LARGE = 'amount_too_large';
+	const CODE_AMOUNT_TOO_SMALL = 'amount_too_small';
+	const CODE_API_KEY_EXPIRED = 'api_key_expired';
+	const CODE_AUTHENTICATION_REQUIRED = 'authentication_required';
+	const CODE_BALANCE_INSUFFICIENT = 'balance_insufficient';
+	const CODE_BANK_ACCOUNT_BAD_ROUTING_NUMBERS = 'bank_account_bad_routing_numbers';
+	const CODE_BANK_ACCOUNT_DECLINED = 'bank_account_declined';
+	const CODE_BANK_ACCOUNT_EXISTS = 'bank_account_exists';
+	const CODE_BANK_ACCOUNT_UNUSABLE = 'bank_account_unusable';
+	const CODE_BANK_ACCOUNT_UNVERIFIED = 'bank_account_unverified';
+	const CODE_BANK_ACCOUNT_VERIFICATION_FAILED = 'bank_account_verification_failed';
+	const CODE_BILLING_INVALID_MANDATE = 'billing_invalid_mandate';
+	const CODE_BITCOIN_UPGRADE_REQUIRED = 'bitcoin_upgrade_required';
+	const CODE_CARD_DECLINE_RATE_LIMIT_EXCEEDED = 'card_decline_rate_limit_exceeded';
+	const CODE_CARD_DECLINED = 'card_declined';
+	const CODE_CARDHOLDER_PHONE_NUMBER_REQUIRED = 'cardholder_phone_number_required';
+	const CODE_CHARGE_ALREADY_CAPTURED = 'charge_already_captured';
+	const CODE_CHARGE_ALREADY_REFUNDED = 'charge_already_refunded';
+	const CODE_CHARGE_DISPUTED = 'charge_disputed';
+	const CODE_CHARGE_EXCEEDS_SOURCE_LIMIT = 'charge_exceeds_source_limit';
+	const CODE_CHARGE_EXPIRED_FOR_CAPTURE = 'charge_expired_for_capture';
+	const CODE_CHARGE_INVALID_PARAMETER = 'charge_invalid_parameter';
+	const CODE_CLEARING_CODE_UNSUPPORTED = 'clearing_code_unsupported';
+	const CODE_COUNTRY_CODE_INVALID = 'country_code_invalid';
+	const CODE_COUNTRY_UNSUPPORTED = 'country_unsupported';
+	const CODE_COUPON_EXPIRED = 'coupon_expired';
+	const CODE_CUSTOMER_MAX_PAYMENT_METHODS = 'customer_max_payment_methods';
+	const CODE_CUSTOMER_MAX_SUBSCRIPTIONS = 'customer_max_subscriptions';
+	const CODE_DEBIT_NOT_AUTHORIZED = 'debit_not_authorized';
+	const CODE_EMAIL_INVALID = 'email_invalid';
+	const CODE_EXPIRED_CARD = 'expired_card';
+	const CODE_IDEMPOTENCY_KEY_IN_USE = 'idempotency_key_in_use';
+	const CODE_INCORRECT_ADDRESS = 'incorrect_address';
+	const CODE_INCORRECT_CVC = 'incorrect_cvc';
+	const CODE_INCORRECT_NUMBER = 'incorrect_number';
+	const CODE_INCORRECT_ZIP = 'incorrect_zip';
+	const CODE_INSTANT_PAYOUTS_LIMIT_EXCEEDED = 'instant_payouts_limit_exceeded';
+	const CODE_INSTANT_PAYOUTS_UNSUPPORTED = 'instant_payouts_unsupported';
+	const CODE_INSUFFICIENT_FUNDS = 'insufficient_funds';
+	const CODE_INTENT_INVALID_STATE = 'intent_invalid_state';
+	const CODE_INTENT_VERIFICATION_METHOD_MISSING = 'intent_verification_method_missing';
+	const CODE_INVALID_CARD_TYPE = 'invalid_card_type';
+	const CODE_INVALID_CHARACTERS = 'invalid_characters';
+	const CODE_INVALID_CHARGE_AMOUNT = 'invalid_charge_amount';
+	const CODE_INVALID_CVC = 'invalid_cvc';
+	const CODE_INVALID_EXPIRY_MONTH = 'invalid_expiry_month';
+	const CODE_INVALID_EXPIRY_YEAR = 'invalid_expiry_year';
+	const CODE_INVALID_NUMBER = 'invalid_number';
+	const CODE_INVALID_SOURCE_USAGE = 'invalid_source_usage';
+	const CODE_INVOICE_NO_CUSTOMER_LINE_ITEMS = 'invoice_no_customer_line_items';
+	const CODE_INVOICE_NO_PAYMENT_METHOD_TYPES = 'invoice_no_payment_method_types';
+	const CODE_INVOICE_NO_SUBSCRIPTION_LINE_ITEMS = 'invoice_no_subscription_line_items';
+	const CODE_INVOICE_NOT_EDITABLE = 'invoice_not_editable';
+	const CODE_INVOICE_ON_BEHALF_OF_NOT_EDITABLE = 'invoice_on_behalf_of_not_editable';
+	const CODE_INVOICE_PAYMENT_INTENT_REQUIRES_ACTION = 'invoice_payment_intent_requires_action';
+	const CODE_INVOICE_UPCOMING_NONE = 'invoice_upcoming_none';
+	const CODE_LIVEMODE_MISMATCH = 'livemode_mismatch';
+	const CODE_LOCK_TIMEOUT = 'lock_timeout';
+	const CODE_MISSING = 'missing';
+	const CODE_NO_ACCOUNT = 'no_account';
+	const CODE_NOT_ALLOWED_ON_STANDARD_ACCOUNT = 'not_allowed_on_standard_account';
+	const CODE_OUT_OF_INVENTORY = 'out_of_inventory';
+	const CODE_PARAMETER_INVALID_EMPTY = 'parameter_invalid_empty';
+	const CODE_PARAMETER_INVALID_INTEGER = 'parameter_invalid_integer';
+	const CODE_PARAMETER_INVALID_STRING_BLANK = 'parameter_invalid_string_blank';
+	const CODE_PARAMETER_INVALID_STRING_EMPTY = 'parameter_invalid_string_empty';
+	const CODE_PARAMETER_MISSING = 'parameter_missing';
+	const CODE_PARAMETER_UNKNOWN = 'parameter_unknown';
+	const CODE_PARAMETERS_EXCLUSIVE = 'parameters_exclusive';
+	const CODE_PAYMENT_INTENT_ACTION_REQUIRED = 'payment_intent_action_required';
+	const CODE_PAYMENT_INTENT_AUTHENTICATION_FAILURE = 'payment_intent_authentication_failure';
+	const CODE_PAYMENT_INTENT_INCOMPATIBLE_PAYMENT_METHOD = 'payment_intent_incompatible_payment_method';
+	const CODE_PAYMENT_INTENT_INVALID_PARAMETER = 'payment_intent_invalid_parameter';
+	const CODE_PAYMENT_INTENT_KONBINI_REJECTED_CONFIRMATION_NUMBER = 'payment_intent_konbini_rejected_confirmation_number';
+	const CODE_PAYMENT_INTENT_MANDATE_INVALID = 'payment_intent_mandate_invalid';
+	const CODE_PAYMENT_INTENT_PAYMENT_ATTEMPT_EXPIRED = 'payment_intent_payment_attempt_expired';
+	const CODE_PAYMENT_INTENT_PAYMENT_ATTEMPT_FAILED = 'payment_intent_payment_attempt_failed';
+	const CODE_PAYMENT_INTENT_UNEXPECTED_STATE = 'payment_intent_unexpected_state';
+	const CODE_PAYMENT_METHOD_BANK_ACCOUNT_ALREADY_VERIFIED = 'payment_method_bank_account_already_verified';
+	const CODE_PAYMENT_METHOD_BANK_ACCOUNT_BLOCKED = 'payment_method_bank_account_blocked';
+	const CODE_PAYMENT_METHOD_BILLING_DETAILS_ADDRESS_MISSING = 'payment_method_billing_details_address_missing';
+	const CODE_PAYMENT_METHOD_CURRENCY_MISMATCH = 'payment_method_currency_mismatch';
+	const CODE_PAYMENT_METHOD_INVALID_PARAMETER = 'payment_method_invalid_parameter';
+	const CODE_PAYMENT_METHOD_INVALID_PARAMETER_TESTMODE = 'payment_method_invalid_parameter_testmode';
+	const CODE_PAYMENT_METHOD_MICRODEPOSIT_FAILED = 'payment_method_microdeposit_failed';
+	const CODE_PAYMENT_METHOD_MICRODEPOSIT_VERIFICATION_AMOUNTS_INVALID = 'payment_method_microdeposit_verification_amounts_invalid';
+	const CODE_PAYMENT_METHOD_MICRODEPOSIT_VERIFICATION_AMOUNTS_MISMATCH = 'payment_method_microdeposit_verification_amounts_mismatch';
+	const CODE_PAYMENT_METHOD_MICRODEPOSIT_VERIFICATION_ATTEMPTS_EXCEEDED = 'payment_method_microdeposit_verification_attempts_exceeded';
+	const CODE_PAYMENT_METHOD_MICRODEPOSIT_VERIFICATION_DESCRIPTOR_CODE_MISMATCH = 'payment_method_microdeposit_verification_descriptor_code_mismatch';
+	const CODE_PAYMENT_METHOD_MICRODEPOSIT_VERIFICATION_TIMEOUT = 'payment_method_microdeposit_verification_timeout';
+	const CODE_PAYMENT_METHOD_PROVIDER_DECLINE = 'payment_method_provider_decline';
+	const CODE_PAYMENT_METHOD_PROVIDER_TIMEOUT = 'payment_method_provider_timeout';
+	const CODE_PAYMENT_METHOD_UNACTIVATED = 'payment_method_unactivated';
+	const CODE_PAYMENT_METHOD_UNEXPECTED_STATE = 'payment_method_unexpected_state';
+	const CODE_PAYMENT_METHOD_UNSUPPORTED_TYPE = 'payment_method_unsupported_type';
+	const CODE_PAYOUTS_NOT_ALLOWED = 'payouts_not_allowed';
+	const CODE_PLATFORM_ACCOUNT_REQUIRED = 'platform_account_required';
+	const CODE_PLATFORM_API_KEY_EXPIRED = 'platform_api_key_expired';
+	const CODE_POSTAL_CODE_INVALID = 'postal_code_invalid';
+	const CODE_PROCESSING_ERROR = 'processing_error';
+	const CODE_PRODUCT_INACTIVE = 'product_inactive';
+	const CODE_RATE_LIMIT = 'rate_limit';
+	const CODE_REFER_TO_CUSTOMER = 'refer_to_customer';
+	const CODE_REFUND_DISPUTED_PAYMENT = 'refund_disputed_payment';
+	const CODE_RESOURCE_ALREADY_EXISTS = 'resource_already_exists';
+	const CODE_RESOURCE_MISSING = 'resource_missing';
+	const CODE_RETURN_INTENT_ALREADY_PROCESSED = 'return_intent_already_processed';
+	const CODE_ROUTING_NUMBER_INVALID = 'routing_number_invalid';
+	const CODE_SECRET_KEY_REQUIRED = 'secret_key_required';
+	const CODE_SEPA_UNSUPPORTED_ACCOUNT = 'sepa_unsupported_account';
+	const CODE_SETUP_ATTEMPT_FAILED = 'setup_attempt_failed';
+	const CODE_SETUP_INTENT_AUTHENTICATION_FAILURE = 'setup_intent_authentication_failure';
+	const CODE_SETUP_INTENT_INVALID_PARAMETER = 'setup_intent_invalid_parameter';
+	const CODE_SETUP_INTENT_SETUP_ATTEMPT_EXPIRED = 'setup_intent_setup_attempt_expired';
+	const CODE_SETUP_INTENT_UNEXPECTED_STATE = 'setup_intent_unexpected_state';
+	const CODE_SHIPPING_CALCULATION_FAILED = 'shipping_calculation_failed';
+	const CODE_SKU_INACTIVE = 'sku_inactive';
+	const CODE_STATE_UNSUPPORTED = 'state_unsupported';
+	const CODE_TAX_ID_INVALID = 'tax_id_invalid';
+	const CODE_TAXES_CALCULATION_FAILED = 'taxes_calculation_failed';
+	const CODE_TERMINAL_LOCATION_COUNTRY_UNSUPPORTED = 'terminal_location_country_unsupported';
+	const CODE_TESTMODE_CHARGES_ONLY = 'testmode_charges_only';
+	const CODE_TLS_VERSION_UNSUPPORTED = 'tls_version_unsupported';
+	const CODE_TOKEN_ALREADY_USED = 'token_already_used';
+	const CODE_TOKEN_IN_USE = 'token_in_use';
+	const CODE_TRANSFER_SOURCE_BALANCE_PARAMETERS_MISMATCH = 'transfer_source_balance_parameters_mismatch';
+	const CODE_TRANSFERS_NOT_ALLOWED = 'transfers_not_allowed';
+	const CODE_URL_INVALID = 'url_invalid';
+	/**
+	 * Refreshes this object using the provided values.
+	 *
+	 * @param array $values
+	 * @param null|array|string|Util\RequestOptions $opts
+	 * @param bool $partial defaults to false
+	 */
+	public function refreshFrom($values, $opts, $partial = false)
+	{
+	}
+}
+/**
+ * Events are our way of letting you know when something interesting happens in
+ * your account. When an interesting event occurs, we create a new
+ * <code>Event</code> object. For example, when a charge succeeds, we create a
+ * <code>charge.succeeded</code> event; and when an invoice payment attempt fails,
+ * we create an <code>invoice.payment_failed</code> event. Note that many API
+ * requests may cause multiple events to be created. For example, if you create a
+ * new subscription for a customer, you will receive both a
+ * <code>customer.subscription.created</code> event and a
+ * <code>charge.succeeded</code> event.
+ *
+ * Events occur when the state of another API resource changes. The state of that
+ * resource at the time of the change is embedded in the event's data field. For
+ * example, a <code>charge.succeeded</code> event will contain a charge, and an
+ * <code>invoice.payment_failed</code> event will contain an invoice.
+ *
+ * As with other API resources, you can use endpoints to retrieve an <a
+ * href="https://stripe.com/docs/api#retrieve_event">individual event</a> or a <a
+ * href="https://stripe.com/docs/api#list_events">list of events</a> from the API.
+ * We also have a separate <a
+ * href="http://en.wikipedia.org/wiki/Webhook">webhooks</a> system for sending the
+ * <code>Event</code> objects directly to an endpoint on your server. Webhooks are
+ * managed in your <a href="https://dashboard.stripe.com/account/webhooks">account
+ * settings</a>, and our <a href="https://stripe.com/docs/webhooks">Using
+ * Webhooks</a> guide will help you get set up.
+ *
+ * When using <a href="https://stripe.com/docs/connect">Connect</a>, you can also
+ * receive notifications of events that occur in connected accounts. For these
+ * events, there will be an additional <code>account</code> attribute in the
+ * received <code>Event</code> object.
+ *
+ * <strong>NOTE:</strong> Right now, access to events through the <a
+ * href="https://stripe.com/docs/api#retrieve_event">Retrieve Event API</a> is
+ * guaranteed only for 30 days.
+ *
+ * This class includes constants for the possible string representations of
+ * event types. See https://stripe.com/docs/api#event_types for more details.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $account The connected account that originated the event.
+ * @property null|string $api_version The Stripe API version used to render <code>data</code>. <em>Note: This property is populated only for events on or after October 31, 2014</em>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\StripeObject $data
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $pending_webhooks Number of webhooks that have yet to be successfully delivered (i.e., to return a 20x response) to the URLs you've specified.
+ * @property null|\Stripe\StripeObject $request Information on the API request that instigated the event.
+ * @property string $type Description of the event (e.g., <code>invoice.created</code> or <code>charge.refunded</code>).
+ */
+class Event extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'event';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const ACCOUNT_APPLICATION_AUTHORIZED = 'account.application.authorized';
+	const ACCOUNT_APPLICATION_DEAUTHORIZED = 'account.application.deauthorized';
+	const ACCOUNT_EXTERNAL_ACCOUNT_CREATED = 'account.external_account.created';
+	const ACCOUNT_EXTERNAL_ACCOUNT_DELETED = 'account.external_account.deleted';
+	const ACCOUNT_EXTERNAL_ACCOUNT_UPDATED = 'account.external_account.updated';
+	const ACCOUNT_UPDATED = 'account.updated';
+	const APPLICATION_FEE_CREATED = 'application_fee.created';
+	const APPLICATION_FEE_REFUND_UPDATED = 'application_fee.refund.updated';
+	const APPLICATION_FEE_REFUNDED = 'application_fee.refunded';
+	const BALANCE_AVAILABLE = 'balance.available';
+	const BILLING_PORTAL_CONFIGURATION_CREATED = 'billing_portal.configuration.created';
+	const BILLING_PORTAL_CONFIGURATION_UPDATED = 'billing_portal.configuration.updated';
+	const BILLING_PORTAL_SESSION_CREATED = 'billing_portal.session.created';
+	const CAPABILITY_UPDATED = 'capability.updated';
+	const CASH_BALANCE_FUNDS_AVAILABLE = 'cash_balance.funds_available';
+	const CHARGE_CAPTURED = 'charge.captured';
+	const CHARGE_DISPUTE_CLOSED = 'charge.dispute.closed';
+	const CHARGE_DISPUTE_CREATED = 'charge.dispute.created';
+	const CHARGE_DISPUTE_FUNDS_REINSTATED = 'charge.dispute.funds_reinstated';
+	const CHARGE_DISPUTE_FUNDS_WITHDRAWN = 'charge.dispute.funds_withdrawn';
+	const CHARGE_DISPUTE_UPDATED = 'charge.dispute.updated';
+	const CHARGE_EXPIRED = 'charge.expired';
+	const CHARGE_FAILED = 'charge.failed';
+	const CHARGE_PENDING = 'charge.pending';
+	const CHARGE_REFUND_UPDATED = 'charge.refund.updated';
+	const CHARGE_REFUNDED = 'charge.refunded';
+	const CHARGE_SUCCEEDED = 'charge.succeeded';
+	const CHARGE_UPDATED = 'charge.updated';
+	const CHECKOUT_SESSION_ASYNC_PAYMENT_FAILED = 'checkout.session.async_payment_failed';
+	const CHECKOUT_SESSION_ASYNC_PAYMENT_SUCCEEDED = 'checkout.session.async_payment_succeeded';
+	const CHECKOUT_SESSION_COMPLETED = 'checkout.session.completed';
+	const CHECKOUT_SESSION_EXPIRED = 'checkout.session.expired';
+	const COUPON_CREATED = 'coupon.created';
+	const COUPON_DELETED = 'coupon.deleted';
+	const COUPON_UPDATED = 'coupon.updated';
+	const CREDIT_NOTE_CREATED = 'credit_note.created';
+	const CREDIT_NOTE_UPDATED = 'credit_note.updated';
+	const CREDIT_NOTE_VOIDED = 'credit_note.voided';
+	const CUSTOMER_CREATED = 'customer.created';
+	const CUSTOMER_DELETED = 'customer.deleted';
+	const CUSTOMER_DISCOUNT_CREATED = 'customer.discount.created';
+	const CUSTOMER_DISCOUNT_DELETED = 'customer.discount.deleted';
+	const CUSTOMER_DISCOUNT_UPDATED = 'customer.discount.updated';
+	const CUSTOMER_SOURCE_CREATED = 'customer.source.created';
+	const CUSTOMER_SOURCE_DELETED = 'customer.source.deleted';
+	const CUSTOMER_SOURCE_EXPIRING = 'customer.source.expiring';
+	const CUSTOMER_SOURCE_UPDATED = 'customer.source.updated';
+	const CUSTOMER_SUBSCRIPTION_CREATED = 'customer.subscription.created';
+	const CUSTOMER_SUBSCRIPTION_DELETED = 'customer.subscription.deleted';
+	const CUSTOMER_SUBSCRIPTION_PAUSED = 'customer.subscription.paused';
+	const CUSTOMER_SUBSCRIPTION_PENDING_UPDATE_APPLIED = 'customer.subscription.pending_update_applied';
+	const CUSTOMER_SUBSCRIPTION_PENDING_UPDATE_EXPIRED = 'customer.subscription.pending_update_expired';
+	const CUSTOMER_SUBSCRIPTION_RESUMED = 'customer.subscription.resumed';
+	const CUSTOMER_SUBSCRIPTION_TRIAL_WILL_END = 'customer.subscription.trial_will_end';
+	const CUSTOMER_SUBSCRIPTION_UPDATED = 'customer.subscription.updated';
+	const CUSTOMER_TAX_ID_CREATED = 'customer.tax_id.created';
+	const CUSTOMER_TAX_ID_DELETED = 'customer.tax_id.deleted';
+	const CUSTOMER_TAX_ID_UPDATED = 'customer.tax_id.updated';
+	const CUSTOMER_UPDATED = 'customer.updated';
+	const CUSTOMER_CASH_BALANCE_TRANSACTION_CREATED = 'customer_cash_balance_transaction.created';
+	const FILE_CREATED = 'file.created';
+	const FINANCIAL_CONNECTIONS_ACCOUNT_CREATED = 'financial_connections.account.created';
+	const FINANCIAL_CONNECTIONS_ACCOUNT_DEACTIVATED = 'financial_connections.account.deactivated';
+	const FINANCIAL_CONNECTIONS_ACCOUNT_DISCONNECTED = 'financial_connections.account.disconnected';
+	const FINANCIAL_CONNECTIONS_ACCOUNT_REACTIVATED = 'financial_connections.account.reactivated';
+	const FINANCIAL_CONNECTIONS_ACCOUNT_REFRESHED_BALANCE = 'financial_connections.account.refreshed_balance';
+	const IDENTITY_VERIFICATION_SESSION_CANCELED = 'identity.verification_session.canceled';
+	const IDENTITY_VERIFICATION_SESSION_CREATED = 'identity.verification_session.created';
+	const IDENTITY_VERIFICATION_SESSION_PROCESSING = 'identity.verification_session.processing';
+	const IDENTITY_VERIFICATION_SESSION_REDACTED = 'identity.verification_session.redacted';
+	const IDENTITY_VERIFICATION_SESSION_REQUIRES_INPUT = 'identity.verification_session.requires_input';
+	const IDENTITY_VERIFICATION_SESSION_VERIFIED = 'identity.verification_session.verified';
+	const INVOICE_CREATED = 'invoice.created';
+	const INVOICE_DELETED = 'invoice.deleted';
+	const INVOICE_FINALIZATION_FAILED = 'invoice.finalization_failed';
+	const INVOICE_FINALIZED = 'invoice.finalized';
+	const INVOICE_MARKED_UNCOLLECTIBLE = 'invoice.marked_uncollectible';
+	const INVOICE_PAID = 'invoice.paid';
+	const INVOICE_PAYMENT_ACTION_REQUIRED = 'invoice.payment_action_required';
+	const INVOICE_PAYMENT_FAILED = 'invoice.payment_failed';
+	const INVOICE_PAYMENT_SUCCEEDED = 'invoice.payment_succeeded';
+	const INVOICE_SENT = 'invoice.sent';
+	const INVOICE_UPCOMING = 'invoice.upcoming';
+	const INVOICE_UPDATED = 'invoice.updated';
+	const INVOICE_VOIDED = 'invoice.voided';
+	const INVOICEITEM_CREATED = 'invoiceitem.created';
+	const INVOICEITEM_DELETED = 'invoiceitem.deleted';
+	const INVOICEITEM_UPDATED = 'invoiceitem.updated';
+	const ISSUING_AUTHORIZATION_CREATED = 'issuing_authorization.created';
+	const ISSUING_AUTHORIZATION_REQUEST = 'issuing_authorization.request';
+	const ISSUING_AUTHORIZATION_UPDATED = 'issuing_authorization.updated';
+	const ISSUING_CARD_CREATED = 'issuing_card.created';
+	const ISSUING_CARD_UPDATED = 'issuing_card.updated';
+	const ISSUING_CARDHOLDER_CREATED = 'issuing_cardholder.created';
+	const ISSUING_CARDHOLDER_UPDATED = 'issuing_cardholder.updated';
+	const ISSUING_DISPUTE_CLOSED = 'issuing_dispute.closed';
+	const ISSUING_DISPUTE_CREATED = 'issuing_dispute.created';
+	const ISSUING_DISPUTE_FUNDS_REINSTATED = 'issuing_dispute.funds_reinstated';
+	const ISSUING_DISPUTE_SUBMITTED = 'issuing_dispute.submitted';
+	const ISSUING_DISPUTE_UPDATED = 'issuing_dispute.updated';
+	const ISSUING_TRANSACTION_CREATED = 'issuing_transaction.created';
+	const ISSUING_TRANSACTION_UPDATED = 'issuing_transaction.updated';
+	const MANDATE_UPDATED = 'mandate.updated';
+	const ORDER_CREATED = 'order.created';
+	const PAYMENT_INTENT_AMOUNT_CAPTURABLE_UPDATED = 'payment_intent.amount_capturable_updated';
+	const PAYMENT_INTENT_CANCELED = 'payment_intent.canceled';
+	const PAYMENT_INTENT_CREATED = 'payment_intent.created';
+	const PAYMENT_INTENT_PARTIALLY_FUNDED = 'payment_intent.partially_funded';
+	const PAYMENT_INTENT_PAYMENT_FAILED = 'payment_intent.payment_failed';
+	const PAYMENT_INTENT_PROCESSING = 'payment_intent.processing';
+	const PAYMENT_INTENT_REQUIRES_ACTION = 'payment_intent.requires_action';
+	const PAYMENT_INTENT_SUCCEEDED = 'payment_intent.succeeded';
+	const PAYMENT_LINK_CREATED = 'payment_link.created';
+	const PAYMENT_LINK_UPDATED = 'payment_link.updated';
+	const PAYMENT_METHOD_ATTACHED = 'payment_method.attached';
+	const PAYMENT_METHOD_AUTOMATICALLY_UPDATED = 'payment_method.automatically_updated';
+	const PAYMENT_METHOD_DETACHED = 'payment_method.detached';
+	const PAYMENT_METHOD_UPDATED = 'payment_method.updated';
+	const PAYOUT_CANCELED = 'payout.canceled';
+	const PAYOUT_CREATED = 'payout.created';
+	const PAYOUT_FAILED = 'payout.failed';
+	const PAYOUT_PAID = 'payout.paid';
+	const PAYOUT_UPDATED = 'payout.updated';
+	const PERSON_CREATED = 'person.created';
+	const PERSON_DELETED = 'person.deleted';
+	const PERSON_UPDATED = 'person.updated';
+	const PLAN_CREATED = 'plan.created';
+	const PLAN_DELETED = 'plan.deleted';
+	const PLAN_UPDATED = 'plan.updated';
+	const PRICE_CREATED = 'price.created';
+	const PRICE_DELETED = 'price.deleted';
+	const PRICE_UPDATED = 'price.updated';
+	const PRODUCT_CREATED = 'product.created';
+	const PRODUCT_DELETED = 'product.deleted';
+	const PRODUCT_UPDATED = 'product.updated';
+	const PROMOTION_CODE_CREATED = 'promotion_code.created';
+	const PROMOTION_CODE_UPDATED = 'promotion_code.updated';
+	const QUOTE_ACCEPTED = 'quote.accepted';
+	const QUOTE_CANCELED = 'quote.canceled';
+	const QUOTE_CREATED = 'quote.created';
+	const QUOTE_FINALIZED = 'quote.finalized';
+	const RADAR_EARLY_FRAUD_WARNING_CREATED = 'radar.early_fraud_warning.created';
+	const RADAR_EARLY_FRAUD_WARNING_UPDATED = 'radar.early_fraud_warning.updated';
+	const RECIPIENT_CREATED = 'recipient.created';
+	const RECIPIENT_DELETED = 'recipient.deleted';
+	const RECIPIENT_UPDATED = 'recipient.updated';
+	const REFUND_CREATED = 'refund.created';
+	const REFUND_UPDATED = 'refund.updated';
+	const REPORTING_REPORT_RUN_FAILED = 'reporting.report_run.failed';
+	const REPORTING_REPORT_RUN_SUCCEEDED = 'reporting.report_run.succeeded';
+	const REPORTING_REPORT_TYPE_UPDATED = 'reporting.report_type.updated';
+	const REVIEW_CLOSED = 'review.closed';
+	const REVIEW_OPENED = 'review.opened';
+	const SETUP_INTENT_CANCELED = 'setup_intent.canceled';
+	const SETUP_INTENT_CREATED = 'setup_intent.created';
+	const SETUP_INTENT_REQUIRES_ACTION = 'setup_intent.requires_action';
+	const SETUP_INTENT_SETUP_FAILED = 'setup_intent.setup_failed';
+	const SETUP_INTENT_SUCCEEDED = 'setup_intent.succeeded';
+	const SIGMA_SCHEDULED_QUERY_RUN_CREATED = 'sigma.scheduled_query_run.created';
+	const SKU_CREATED = 'sku.created';
+	const SKU_DELETED = 'sku.deleted';
+	const SKU_UPDATED = 'sku.updated';
+	const SOURCE_CANCELED = 'source.canceled';
+	const SOURCE_CHARGEABLE = 'source.chargeable';
+	const SOURCE_FAILED = 'source.failed';
+	const SOURCE_MANDATE_NOTIFICATION = 'source.mandate_notification';
+	const SOURCE_REFUND_ATTRIBUTES_REQUIRED = 'source.refund_attributes_required';
+	const SOURCE_TRANSACTION_CREATED = 'source.transaction.created';
+	const SOURCE_TRANSACTION_UPDATED = 'source.transaction.updated';
+	const SUBSCRIPTION_SCHEDULE_ABORTED = 'subscription_schedule.aborted';
+	const SUBSCRIPTION_SCHEDULE_CANCELED = 'subscription_schedule.canceled';
+	const SUBSCRIPTION_SCHEDULE_COMPLETED = 'subscription_schedule.completed';
+	const SUBSCRIPTION_SCHEDULE_CREATED = 'subscription_schedule.created';
+	const SUBSCRIPTION_SCHEDULE_EXPIRING = 'subscription_schedule.expiring';
+	const SUBSCRIPTION_SCHEDULE_RELEASED = 'subscription_schedule.released';
+	const SUBSCRIPTION_SCHEDULE_UPDATED = 'subscription_schedule.updated';
+	const TAX_RATE_CREATED = 'tax_rate.created';
+	const TAX_RATE_UPDATED = 'tax_rate.updated';
+	const TERMINAL_READER_ACTION_FAILED = 'terminal.reader.action_failed';
+	const TERMINAL_READER_ACTION_SUCCEEDED = 'terminal.reader.action_succeeded';
+	const TEST_HELPERS_TEST_CLOCK_ADVANCING = 'test_helpers.test_clock.advancing';
+	const TEST_HELPERS_TEST_CLOCK_CREATED = 'test_helpers.test_clock.created';
+	const TEST_HELPERS_TEST_CLOCK_DELETED = 'test_helpers.test_clock.deleted';
+	const TEST_HELPERS_TEST_CLOCK_INTERNAL_FAILURE = 'test_helpers.test_clock.internal_failure';
+	const TEST_HELPERS_TEST_CLOCK_READY = 'test_helpers.test_clock.ready';
+	const TOPUP_CANCELED = 'topup.canceled';
+	const TOPUP_CREATED = 'topup.created';
+	const TOPUP_FAILED = 'topup.failed';
+	const TOPUP_REVERSED = 'topup.reversed';
+	const TOPUP_SUCCEEDED = 'topup.succeeded';
+	const TRANSFER_CREATED = 'transfer.created';
+	const TRANSFER_REVERSED = 'transfer.reversed';
+	const TRANSFER_UPDATED = 'transfer.updated';
+	const TREASURY_CREDIT_REVERSAL_CREATED = 'treasury.credit_reversal.created';
+	const TREASURY_CREDIT_REVERSAL_POSTED = 'treasury.credit_reversal.posted';
+	const TREASURY_DEBIT_REVERSAL_COMPLETED = 'treasury.debit_reversal.completed';
+	const TREASURY_DEBIT_REVERSAL_CREATED = 'treasury.debit_reversal.created';
+	const TREASURY_DEBIT_REVERSAL_INITIAL_CREDIT_GRANTED = 'treasury.debit_reversal.initial_credit_granted';
+	const TREASURY_FINANCIAL_ACCOUNT_CLOSED = 'treasury.financial_account.closed';
+	const TREASURY_FINANCIAL_ACCOUNT_CREATED = 'treasury.financial_account.created';
+	const TREASURY_FINANCIAL_ACCOUNT_FEATURES_STATUS_UPDATED = 'treasury.financial_account.features_status_updated';
+	const TREASURY_INBOUND_TRANSFER_CANCELED = 'treasury.inbound_transfer.canceled';
+	const TREASURY_INBOUND_TRANSFER_CREATED = 'treasury.inbound_transfer.created';
+	const TREASURY_INBOUND_TRANSFER_FAILED = 'treasury.inbound_transfer.failed';
+	const TREASURY_INBOUND_TRANSFER_SUCCEEDED = 'treasury.inbound_transfer.succeeded';
+	const TREASURY_OUTBOUND_PAYMENT_CANCELED = 'treasury.outbound_payment.canceled';
+	const TREASURY_OUTBOUND_PAYMENT_CREATED = 'treasury.outbound_payment.created';
+	const TREASURY_OUTBOUND_PAYMENT_EXPECTED_ARRIVAL_DATE_UPDATED = 'treasury.outbound_payment.expected_arrival_date_updated';
+	const TREASURY_OUTBOUND_PAYMENT_FAILED = 'treasury.outbound_payment.failed';
+	const TREASURY_OUTBOUND_PAYMENT_POSTED = 'treasury.outbound_payment.posted';
+	const TREASURY_OUTBOUND_PAYMENT_RETURNED = 'treasury.outbound_payment.returned';
+	const TREASURY_OUTBOUND_TRANSFER_CANCELED = 'treasury.outbound_transfer.canceled';
+	const TREASURY_OUTBOUND_TRANSFER_CREATED = 'treasury.outbound_transfer.created';
+	const TREASURY_OUTBOUND_TRANSFER_EXPECTED_ARRIVAL_DATE_UPDATED = 'treasury.outbound_transfer.expected_arrival_date_updated';
+	const TREASURY_OUTBOUND_TRANSFER_FAILED = 'treasury.outbound_transfer.failed';
+	const TREASURY_OUTBOUND_TRANSFER_POSTED = 'treasury.outbound_transfer.posted';
+	const TREASURY_OUTBOUND_TRANSFER_RETURNED = 'treasury.outbound_transfer.returned';
+	const TREASURY_RECEIVED_CREDIT_CREATED = 'treasury.received_credit.created';
+	const TREASURY_RECEIVED_CREDIT_FAILED = 'treasury.received_credit.failed';
+	const TREASURY_RECEIVED_CREDIT_SUCCEEDED = 'treasury.received_credit.succeeded';
+	const TREASURY_RECEIVED_DEBIT_CREATED = 'treasury.received_debit.created';
+}
+namespace Stripe\Exception;
+
+/**
+ * The base interface for all Stripe exceptions.
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
+/**
+ * Implements properties and methods common to all (non-SPL) Stripe exceptions.
+ */
+abstract class ApiErrorException extends \Exception implements \Stripe\Exception\ExceptionInterface
+{
+	protected $error;
+	protected $httpBody;
+	protected $httpHeaders;
+	protected $httpStatus;
+	protected $jsonBody;
+	protected $requestId;
+	protected $stripeCode;
+	/**
+	 * Creates a new API error exception.
+	 *
+	 * @param string $message the exception message
+	 * @param null|int $httpStatus the HTTP status code
+	 * @param null|string $httpBody the HTTP body as a string
+	 * @param null|array $jsonBody the JSON deserialized body
+	 * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders the HTTP headers array
+	 * @param null|string $stripeCode the Stripe error code
+	 *
+	 * @return static
+	 */
+	public static function factory($message, $httpStatus = null, $httpBody = null, $jsonBody = null, $httpHeaders = null, $stripeCode = null)
+	{
+	}
+	/**
+	 * Gets the Stripe error object.
+	 *
+	 * @return null|\Stripe\ErrorObject
+	 */
+	public function getError()
+	{
+	}
+	/**
+	 * Sets the Stripe error object.
+	 *
+	 * @param null|\Stripe\ErrorObject $error
+	 */
+	public function setError($error)
+	{
+	}
+	/**
+	 * Gets the HTTP body as a string.
+	 *
+	 * @return null|string
+	 */
+	public function getHttpBody()
+	{
+	}
+	/**
+	 * Sets the HTTP body as a string.
+	 *
+	 * @param null|string $httpBody
+	 */
+	public function setHttpBody($httpBody)
+	{
+	}
+	/**
+	 * Gets the HTTP headers array.
+	 *
+	 * @return null|array|\Stripe\Util\CaseInsensitiveArray
+	 */
+	public function getHttpHeaders()
+	{
+	}
+	/**
+	 * Sets the HTTP headers array.
+	 *
+	 * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders
+	 */
+	public function setHttpHeaders($httpHeaders)
+	{
+	}
+	/**
+	 * Gets the HTTP status code.
+	 *
+	 * @return null|int
+	 */
+	public function getHttpStatus()
+	{
+	}
+	/**
+	 * Sets the HTTP status code.
+	 *
+	 * @param null|int $httpStatus
+	 */
+	public function setHttpStatus($httpStatus)
+	{
+	}
+	/**
+	 * Gets the JSON deserialized body.
+	 *
+	 * @return null|array<string, mixed>
+	 */
+	public function getJsonBody()
+	{
+	}
+	/**
+	 * Sets the JSON deserialized body.
+	 *
+	 * @param null|array<string, mixed> $jsonBody
+	 */
+	public function setJsonBody($jsonBody)
+	{
+	}
+	/**
+	 * Gets the Stripe request ID.
+	 *
+	 * @return null|string
+	 */
+	public function getRequestId()
+	{
+	}
+	/**
+	 * Sets the Stripe request ID.
+	 *
+	 * @param null|string $requestId
+	 */
+	public function setRequestId($requestId)
+	{
+	}
+	/**
+	 * Gets the Stripe error code.
+	 *
+	 * Cf. the `CODE_*` constants on {@see \Stripe\ErrorObject} for possible
+	 * values.
+	 *
+	 * @return null|string
+	 */
+	public function getStripeCode()
+	{
+	}
+	/**
+	 * Sets the Stripe error code.
+	 *
+	 * @param null|string $stripeCode
+	 */
+	public function setStripeCode($stripeCode)
+	{
+	}
+	/**
+	 * Returns the string representation of the exception.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+	}
+	protected function constructErrorObject()
+	{
+	}
+}
+/**
+ * ApiConnection is thrown in the event that the SDK can't connect to Stripe's
+ * servers. That can be for a variety of different reasons from a downed
+ * network to a bad TLS certificate.
+ */
+class ApiConnectionException extends \Stripe\Exception\ApiErrorException
+{
+}
+/**
+ * AuthenticationException is thrown when invalid credentials are used to
+ * connect to Stripe's servers.
+ */
+class AuthenticationException extends \Stripe\Exception\ApiErrorException
+{
+}
+class BadMethodCallException extends \BadMethodCallException implements \Stripe\Exception\ExceptionInterface
+{
+}
+/**
+ * CardException is thrown when a user enters a card that can't be charged for
+ * some reason.
+ */
+class CardException extends \Stripe\Exception\ApiErrorException
+{
+	protected $declineCode;
+	protected $stripeParam;
+	/**
+	 * Creates a new CardException exception.
+	 *
+	 * @param string $message the exception message
+	 * @param null|int $httpStatus the HTTP status code
+	 * @param null|string $httpBody the HTTP body as a string
+	 * @param null|array $jsonBody the JSON deserialized body
+	 * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders the HTTP headers array
+	 * @param null|string $stripeCode the Stripe error code
+	 * @param null|string $declineCode the decline code
+	 * @param null|string $stripeParam the parameter related to the error
+	 *
+	 * @return CardException
+	 */
+	public static function factory($message, $httpStatus = null, $httpBody = null, $jsonBody = null, $httpHeaders = null, $stripeCode = null, $declineCode = null, $stripeParam = null)
+	{
+	}
+	/**
+	 * Gets the decline code.
+	 *
+	 * @return null|string
+	 */
+	public function getDeclineCode()
+	{
+	}
+	/**
+	 * Sets the decline code.
+	 *
+	 * @param null|string $declineCode
+	 */
+	public function setDeclineCode($declineCode)
+	{
+	}
+	/**
+	 * Gets the parameter related to the error.
+	 *
+	 * @return null|string
+	 */
+	public function getStripeParam()
+	{
+	}
+	/**
+	 * Sets the parameter related to the error.
+	 *
+	 * @param null|string $stripeParam
+	 */
+	public function setStripeParam($stripeParam)
+	{
+	}
+}
+/**
+ * IdempotencyException is thrown in cases where an idempotency key was used
+ * improperly.
+ */
+class IdempotencyException extends \Stripe\Exception\ApiErrorException
+{
+}
+class InvalidArgumentException extends \InvalidArgumentException implements \Stripe\Exception\ExceptionInterface
+{
+}
+/**
+ * InvalidRequestException is thrown when a request is initiated with invalid
+ * parameters.
+ */
+class InvalidRequestException extends \Stripe\Exception\ApiErrorException
+{
+	protected $stripeParam;
+	/**
+	 * Creates a new InvalidRequestException exception.
+	 *
+	 * @param string $message the exception message
+	 * @param null|int $httpStatus the HTTP status code
+	 * @param null|string $httpBody the HTTP body as a string
+	 * @param null|array $jsonBody the JSON deserialized body
+	 * @param null|array|\Stripe\Util\CaseInsensitiveArray $httpHeaders the HTTP headers array
+	 * @param null|string $stripeCode the Stripe error code
+	 * @param null|string $stripeParam the parameter related to the error
+	 *
+	 * @return InvalidRequestException
+	 */
+	public static function factory($message, $httpStatus = null, $httpBody = null, $jsonBody = null, $httpHeaders = null, $stripeCode = null, $stripeParam = null)
+	{
+	}
+	/**
+	 * Gets the parameter related to the error.
+	 *
+	 * @return null|string
+	 */
+	public function getStripeParam()
+	{
+	}
+	/**
+	 * Sets the parameter related to the error.
+	 *
+	 * @param null|string $stripeParam
+	 */
+	public function setStripeParam($stripeParam)
+	{
+	}
+}
+namespace Stripe\Exception\OAuth;
+
+/**
+ * The base interface for all Stripe OAuth exceptions.
+ */
+interface ExceptionInterface extends \Stripe\Exception\ExceptionInterface
+{
+}
+/**
+ * Implements properties and methods common to all (non-SPL) Stripe OAuth
+ * exceptions.
+ */
+abstract class OAuthErrorException extends \Stripe\Exception\ApiErrorException
+{
+	protected function constructErrorObject()
+	{
+	}
+}
+/**
+ * InvalidClientException is thrown when the client_id does not belong to you,
+ * the stripe_user_id does not exist or is not connected to your application,
+ * or the API key mode (live or test mode) does not match the client_id mode.
+ */
+class InvalidClientException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+/**
+ * InvalidGrantException is thrown when a specified code doesn't exist, is
+ * expired, has been used, or doesn't belong to you; a refresh token doesn't
+ * exist, or doesn't belong to you; or if an API key's mode (live or test)
+ * doesn't match the mode of a code or refresh token.
+ */
+class InvalidGrantException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+/**
+ * InvalidRequestException is thrown when a code, refresh token, or grant
+ * type parameter is not provided, but was required.
+ */
+class InvalidRequestException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+/**
+ * InvalidScopeException is thrown when an invalid scope parameter is provided.
+ */
+class InvalidScopeException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+/**
+ * UnknownApiErrorException is thrown when the client library receives an
+ * error from the OAuth API it doesn't know about. Receiving this error usually
+ * means that your client library is outdated and should be upgraded.
+ */
+class UnknownOAuthErrorException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+/**
+ * UnsupportedGrantTypeException is thrown when an unuspported grant type
+ * parameter is specified.
+ */
+class UnsupportedGrantTypeException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+/**
+ * UnsupportedResponseTypeException is thrown when an unsupported response type
+ * parameter is specified.
+ */
+class UnsupportedResponseTypeException extends \Stripe\Exception\OAuth\OAuthErrorException
+{
+}
+namespace Stripe\Exception;
+
+/**
+ * PermissionException is thrown in cases where access was attempted on a
+ * resource that wasn't allowed.
+ */
+class PermissionException extends \Stripe\Exception\ApiErrorException
+{
+}
+/**
+ * RateLimitException is thrown in cases where an account is putting too much
+ * load on Stripe's API servers (usually by performing too many requests).
+ * Please back off on request rate.
+ */
+class RateLimitException extends \Stripe\Exception\InvalidRequestException
+{
+}
+/**
+ * SignatureVerificationException is thrown when the signature verification for
+ * a webhook fails.
+ */
+class SignatureVerificationException extends \Exception implements \Stripe\Exception\ExceptionInterface
+{
+	protected $httpBody;
+	protected $sigHeader;
+	/**
+	 * Creates a new SignatureVerificationException exception.
+	 *
+	 * @param string $message the exception message
+	 * @param null|string $httpBody the HTTP body as a string
+	 * @param null|string $sigHeader the `Stripe-Signature` HTTP header
+	 *
+	 * @return SignatureVerificationException
+	 */
+	public static function factory($message, $httpBody = null, $sigHeader = null)
+	{
+	}
+	/**
+	 * Gets the HTTP body as a string.
+	 *
+	 * @return null|string
+	 */
+	public function getHttpBody()
+	{
+	}
+	/**
+	 * Sets the HTTP body as a string.
+	 *
+	 * @param null|string $httpBody
+	 */
+	public function setHttpBody($httpBody)
+	{
+	}
+	/**
+	 * Gets the `Stripe-Signature` HTTP header.
+	 *
+	 * @return null|string
+	 */
+	public function getSigHeader()
+	{
+	}
+	/**
+	 * Sets the `Stripe-Signature` HTTP header.
+	 *
+	 * @param null|string $sigHeader
+	 */
+	public function setSigHeader($sigHeader)
+	{
+	}
+}
+class UnexpectedValueException extends \UnexpectedValueException implements \Stripe\Exception\ExceptionInterface
+{
+}
+/**
+ * UnknownApiErrorException is thrown when the client library receives an
+ * error from the API it doesn't know about. Receiving this error usually
+ * means that your client library is outdated and should be upgraded.
+ */
+class UnknownApiErrorException extends \Stripe\Exception\ApiErrorException
+{
+}
+namespace Stripe;
+
+/**
+ * <code>Exchange Rate</code> objects allow you to determine the rates that Stripe
+ * is currently using to convert from one currency to another. Since this number is
+ * variable throughout the day, there are various reasons why you might want to
+ * know the current rate (for example, to dynamically price an item for a user with
+ * a default payment in a foreign currency).
+ *
+ * If you want a guarantee that the charge is made with a certain exchange rate you
+ * expect is current, you can pass in <code>exchange_rate</code> to charges
+ * endpoints. If the value is no longer up to date, the charge won't go through.
+ * Please refer to our <a href="https://stripe.com/docs/exchange-rates">Exchange
+ * Rates API</a> guide for more details.
+ *
+ * @property string $id Unique identifier for the object. Represented as the three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a> in lowercase.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $rates Hash where the keys are supported currencies and the values are the exchange rate at which the base id currency converts to the key currency.
+ */
+class ExchangeRate extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'exchange_rate';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+}
+/**
+ * This is an object representing a file hosted on Stripe's servers. The file may
+ * have been uploaded by yourself using the <a
+ * href="https://stripe.com/docs/api#create_file">create file</a> request (for
+ * example, when uploading dispute evidence) or it may have been created by Stripe
+ * (for example, the results of a <a href="#scheduled_queries">Sigma scheduled
+ * query</a>).
+ *
+ * Related guide: <a href="https://stripe.com/docs/file-upload">File Upload
+ * Guide</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|int $expires_at The time at which the file expires and is no longer available in epoch seconds.
+ * @property null|string $filename A filename for the file, suitable for saving to a filesystem.
+ * @property null|\Stripe\Collection<\Stripe\FileLink> $links A list of <a href="https://stripe.com/docs/api#file_links">file links</a> that point at this file.
+ * @property string $purpose The <a href="https://stripe.com/docs/file-upload#uploading-a-file">purpose</a> of the uploaded file.
+ * @property int $size The size in bytes of the file object.
+ * @property null|string $title A user friendly title for the document.
+ * @property null|string $type The type of the file returned (e.g., <code>csv</code>, <code>pdf</code>, <code>jpg</code>, or <code>png</code>).
+ * @property null|string $url The URL from which the file can be downloaded using your live secret API key.
+ */
+class File extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'file';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const PURPOSE_ACCOUNT_REQUIREMENT = 'account_requirement';
+	const PURPOSE_ADDITIONAL_VERIFICATION = 'additional_verification';
+	const PURPOSE_BUSINESS_ICON = 'business_icon';
+	const PURPOSE_BUSINESS_LOGO = 'business_logo';
+	const PURPOSE_CUSTOMER_SIGNATURE = 'customer_signature';
+	const PURPOSE_DISPUTE_EVIDENCE = 'dispute_evidence';
+	const PURPOSE_DOCUMENT_PROVIDER_IDENTITY_DOCUMENT = 'document_provider_identity_document';
+	const PURPOSE_FINANCE_REPORT_RUN = 'finance_report_run';
+	const PURPOSE_IDENTITY_DOCUMENT = 'identity_document';
+	const PURPOSE_IDENTITY_DOCUMENT_DOWNLOADABLE = 'identity_document_downloadable';
+	const PURPOSE_PCI_DOCUMENT = 'pci_document';
+	const PURPOSE_SELFIE = 'selfie';
+	const PURPOSE_SIGMA_SCHEDULED_QUERY = 'sigma_scheduled_query';
+	const PURPOSE_TAX_DOCUMENT_USER_UPLOAD = 'tax_document_user_upload';
+	const PURPOSE_TERMINAL_READER_SPLASHSCREEN = 'terminal_reader_splashscreen';
+	// This resource can have two different object names. In latter API
+	// versions, only `file` is used, but since stripe-php may be used with
+	// any API version, we need to support deserializing the older
+	// `file_upload` object into the same class.
+	const OBJECT_NAME_ALT = 'file_upload';
+	use \Stripe\ApiOperations\Create {
+		create as protected _create;
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\File the created file
+	 */
+	public static function create($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * To share the contents of a <code>File</code> object with non-Stripe users, you
+ * can create a <code>FileLink</code>. <code>FileLink</code>s contain a URL that
+ * can be used to retrieve the contents of the file without authentication.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property bool $expired Whether this link is already expired.
+ * @property null|int $expires_at Time at which the link expires.
+ * @property string|\Stripe\File $file The file object this link points to.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $url The publicly accessible URL to download the file.
+ */
+class FileLink extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'file_link';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+namespace Stripe\FinancialConnections;
+
+/**
+ * A Financial Connections Account represents an account that exists outside of
+ * Stripe, to which you have been granted some degree of access.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $account_holder The account holder that this account belongs to.
+ * @property null|\Stripe\StripeObject $balance The most recent information about the account's balance.
+ * @property null|\Stripe\StripeObject $balance_refresh The state of the most recent attempt to refresh the account balance.
+ * @property string $category The type of the account. Account category is further divided in <code>subcategory</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $display_name A human-readable name that has been assigned to this account, either by the account holder or by the institution.
+ * @property string $institution_name The name of the institution that holds this account.
+ * @property null|string $last4 The last 4 digits of the account number. If present, this will be 4 numeric characters.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\FinancialConnections\AccountOwnership $ownership The most recent information about the account's owners.
+ * @property null|\Stripe\StripeObject $ownership_refresh The state of the most recent attempt to refresh the account owners.
+ * @property null|string[] $permissions The list of permissions granted by this account.
+ * @property string $status The status of the link to the account.
+ * @property string $subcategory <p>If <code>category</code> is <code>cash</code>, one of:</p><p>- <code>checking</code> - <code>savings</code> - <code>other</code></p><p>If <code>category</code> is <code>credit</code>, one of:</p><p>- <code>mortgage</code> - <code>line_of_credit</code> - <code>credit_card</code> - <code>other</code></p><p>If <code>category</code> is <code>investment</code> or <code>other</code>, this will be <code>other</code>.</p>
+ * @property string[] $supported_payment_method_types The <a href="https://stripe.com/docs/api/payment_methods/object#payment_method_object-type">PaymentMethod type</a>(s) that can be created from this account.
+ */
+class Account extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'financial_connections.account';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const CATEGORY_CASH = 'cash';
+	const CATEGORY_CREDIT = 'credit';
+	const CATEGORY_INVESTMENT = 'investment';
+	const CATEGORY_OTHER = 'other';
+	const STATUS_ACTIVE = 'active';
+	const STATUS_DISCONNECTED = 'disconnected';
+	const STATUS_INACTIVE = 'inactive';
+	const SUBCATEGORY_CHECKING = 'checking';
+	const SUBCATEGORY_CREDIT_CARD = 'credit_card';
+	const SUBCATEGORY_LINE_OF_CREDIT = 'line_of_credit';
+	const SUBCATEGORY_MORTGAGE = 'mortgage';
+	const SUBCATEGORY_OTHER = 'other';
+	const SUBCATEGORY_SAVINGS = 'savings';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Account the disconnected account
+	 */
+	public function disconnect($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\FinancialConnections\AccountOwner> list of BankConnectionsResourceOwners
+	 */
+	public static function allOwners($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Account the refreshed account
+	 */
+	public function refreshAccount($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $email The email address of the owner.
+ * @property string $name The full name of the owner.
+ * @property string $ownership The ownership object that this owner belongs to.
+ * @property null|string $phone The raw phone number of the owner.
+ * @property null|string $raw_address The raw physical address of the owner.
+ * @property null|int $refreshed_at The timestamp of the refresh that updated this owner.
+ */
+class AccountOwner extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'financial_connections.account_owner';
+}
+/**
+ * Describes a snapshot of the owners of an account at a particular point in time.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\Collection<\Stripe\FinancialConnections\AccountOwner> $owners A paginated list of owners for this account.
+ */
+class AccountOwnership extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'financial_connections.account_ownership';
+}
+/**
+ * A Financial Connections Session is the secure way to programmatically launch the
+ * client-side Stripe.js modal that lets your users link their accounts.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $account_holder The account holder for whom accounts are collected in this session.
+ * @property \Stripe\Collection<\Stripe\FinancialConnections\Account> $accounts The accounts that were collected as part of this Session.
+ * @property string $client_secret A value that will be passed to the client to launch the authentication flow.
+ * @property null|\Stripe\StripeObject $filters
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string[] $permissions Permissions requested for accounts collected during this session.
+ * @property null|string $return_url For webview integrations only. Upon completing OAuth login in the native browser, the user will be redirected to this URL to return to your app.
+ */
+class Session extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'financial_connections.session';
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+}
+namespace Stripe;
+
+/**
+ * Each customer has a <a
+ * href="https://stripe.com/docs/api/customers/object#customer_object-balance"><code>balance</code></a>
+ * that is automatically applied to future invoices and payments using the
+ * <code>customer_balance</code> payment method. Customers can fund this balance by
+ * initiating a bank transfer to any account in the
+ * <code>financial_addresses</code> field. Related guide: <a
+ * href="https://stripe.com/docs/payments/customer-balance/funding-instructions">Customer
+ * Balance - Funding Instructions</a> to learn more.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $bank_transfer
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $funding_type The <code>funding_type</code> of the returned instructions
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ */
+class FundingInstructions extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'funding_instructions';
+	const FUNDING_TYPE_BANK_TRANSFER = 'bank_transfer';
+}
+namespace Stripe\HttpClient;
+
+interface ClientInterface
+{
+	/**
+	 * @param string $method The HTTP method being used
+	 * @param string $absUrl The URL being requested, including domain and protocol
+	 * @param array $headers Headers to be used in the request (full strings, not KV pairs)
+	 * @param array $params KV pairs for parameters. Can be nested for arrays and hashes
+	 * @param bool $hasFile Whether or not $params references a file (via an @ prefix or
+	 *                      CURLFile)
+	 *
+	 * @throws \Stripe\Exception\ApiConnectionException
+	 * @throws \Stripe\Exception\UnexpectedValueException
+	 *
+	 * @return array an array whose first element is raw request body, second
+	 *    element is HTTP status code and third array of HTTP headers
+	 */
+	public function request($method, $absUrl, $headers, $params, $hasFile);
+}
+interface StreamingClientInterface
+{
+	/**
+	 * @param string $method The HTTP method being used
+	 * @param string $absUrl The URL being requested, including domain and protocol
+	 * @param array $headers Headers to be used in the request (full strings, not KV pairs)
+	 * @param array $params KV pairs for parameters. Can be nested for arrays and hashes
+	 * @param bool $hasFile Whether or not $params references a file (via an @ prefix or
+	 *                      CURLFile)
+	 * @param callable $readBodyChunkCallable a function that will be called with chunks of bytes from the body if the request is successful
+	 *
+	 * @throws \Stripe\Exception\ApiConnectionException
+	 * @throws \Stripe\Exception\UnexpectedValueException
+	 *
+	 * @return array an array whose first element is raw request body, second
+	 *    element is HTTP status code and third array of HTTP headers
+	 */
+	public function requestStream($method, $absUrl, $headers, $params, $hasFile, $readBodyChunkCallable);
+}
+class CurlClient implements \Stripe\HttpClient\ClientInterface, \Stripe\HttpClient\StreamingClientInterface
+{
+	protected static $instance;
+	public static function instance()
+	{
+	}
+	protected $defaultOptions;
+	/** @var \Stripe\Util\RandomGenerator */
+	protected $randomGenerator;
+	protected $userAgentInfo;
+	protected $enablePersistentConnections = true;
+	protected $enableHttp2;
+	protected $curlHandle;
+	protected $requestStatusCallback;
+	/**
+	 * CurlClient constructor.
+	 *
+	 * Pass in a callable to $defaultOptions that returns an array of CURLOPT_* values to start
+	 * off a request with, or an flat array with the same format used by curl_setopt_array() to
+	 * provide a static set of options. Note that many options are overridden later in the request
+	 * call, including timeouts, which can be set via setTimeout() and setConnectTimeout().
+	 *
+	 * Note that request() will silently ignore a non-callable, non-array $defaultOptions, and will
+	 * throw an exception if $defaultOptions returns a non-array value.
+	 *
+	 * @param null|array|callable $defaultOptions
+	 * @param null|\Stripe\Util\RandomGenerator $randomGenerator
+	 */
+	public function __construct($defaultOptions = null, $randomGenerator = null)
+	{
+	}
+	public function __destruct()
+	{
+	}
+	public function initUserAgentInfo()
+	{
+	}
+	public function getDefaultOptions()
+	{
+	}
+	public function getUserAgentInfo()
+	{
+	}
+	/**
+	 * @return bool
+	 */
+	public function getEnablePersistentConnections()
+	{
+	}
+	/**
+	 * @param bool $enable
+	 */
+	public function setEnablePersistentConnections($enable)
+	{
+	}
+	/**
+	 * @return bool
+	 */
+	public function getEnableHttp2()
+	{
+	}
+	/**
+	 * @param bool $enable
+	 */
+	public function setEnableHttp2($enable)
+	{
+	}
+	/**
+	 * @return null|callable
+	 */
+	public function getRequestStatusCallback()
+	{
+	}
+	/**
+	 * Sets a callback that is called after each request. The callback will
+	 * receive the following parameters:
+	 * <ol>
+	 *   <li>string $rbody The response body</li>
+	 *   <li>integer $rcode The response status code</li>
+	 *   <li>\Stripe\Util\CaseInsensitiveArray $rheaders The response headers</li>
+	 *   <li>integer $errno The curl error number</li>
+	 *   <li>string|null $message The curl error message</li>
+	 *   <li>boolean $shouldRetry Whether the request will be retried</li>
+	 *   <li>integer $numRetries The number of the retry attempt</li>
+	 * </ol>.
+	 *
+	 * @param null|callable $requestStatusCallback
+	 */
+	public function setRequestStatusCallback($requestStatusCallback)
+	{
+	}
+	// USER DEFINED TIMEOUTS
+	const DEFAULT_TIMEOUT = 80;
+	const DEFAULT_CONNECT_TIMEOUT = 30;
+	public function setTimeout($seconds)
+	{
+	}
+	public function setConnectTimeout($seconds)
+	{
+	}
+	public function getTimeout()
+	{
+	}
+	public function getConnectTimeout()
+	{
+	}
+	public function request($method, $absUrl, $headers, $params, $hasFile)
+	{
+	}
+	public function requestStream($method, $absUrl, $headers, $params, $hasFile, $readBodyChunk)
+	{
+	}
+	/**
+	 * Like `executeRequestWithRetries` except:
+	 *   1. Does not buffer the body of a successful (status code < 300)
+	 *      response into memory -- instead, calls the caller-provided
+	 *      $readBodyChunk with each chunk of incoming data.
+	 *   2. Does not retry if a network error occurs while streaming the
+	 *      body of a successful response.
+	 *
+	 * @param array $opts cURL options
+	 * @param string $absUrl
+	 * @param callable $readBodyChunk
+	 *
+	 * @return array
+	 */
+	public function executeStreamingRequestWithRetries($opts, $absUrl, $readBodyChunk)
+	{
+	}
+	/**
+	 * @param array $opts cURL options
+	 * @param string $absUrl
+	 */
+	public function executeRequestWithRetries($opts, $absUrl)
+	{
+	}
+}
+namespace Stripe\Identity;
+
+/**
+ * A VerificationReport is the result of an attempt to collect and verify data from
+ * a user. The collection of verification checks performed is determined from the
+ * <code>type</code> and <code>options</code> parameters used. You can find the
+ * result of each verification check performed in the appropriate sub-resource:
+ * <code>document</code>, <code>id_number</code>, <code>selfie</code>.
+ *
+ * Each VerificationReport contains a copy of any data collected by the user as
+ * well as reference IDs which can be used to access collected images through the
+ * <a href="https://stripe.com/docs/api/files">FileUpload</a> API. To configure and
+ * create VerificationReports, use the <a
+ * href="https://stripe.com/docs/api/identity/verification_sessions">VerificationSession</a>
+ * API.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/identity/verification-sessions#results">Accessing
+ * verification results</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $document Result from a document check
+ * @property null|\Stripe\StripeObject $id_number Result from an id_number check
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $options
+ * @property null|\Stripe\StripeObject $selfie Result from a selfie check
+ * @property string $type Type of report.
+ * @property null|string $verification_session ID of the VerificationSession that created this report.
+ */
+class VerificationReport extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'identity.verification_report';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const TYPE_DOCUMENT = 'document';
+	const TYPE_ID_NUMBER = 'id_number';
+}
+/**
+ * A VerificationSession guides you through the process of collecting and verifying
+ * the identities of your users. It contains details about the type of
+ * verification, such as what <a
+ * href="/docs/identity/verification-checks">verification check</a> to perform.
+ * Only create one VerificationSession for each verification in your system.
+ *
+ * A VerificationSession transitions through <a
+ * href="/docs/identity/how-sessions-work">multiple statuses</a> throughout its
+ * lifetime as it progresses through the verification flow. The VerificationSession
+ * contains the user's verified data after verification checks are complete.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/identity/verification-sessions">The Verification
+ * Sessions API</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $client_secret The short-lived client secret used by Stripe.js to <a href="https://stripe.com/docs/js/identity/modal">show a verification modal</a> inside your app. This client secret expires after 24 hours and can only be used once. Don’t store it, log it, embed it in a URL, or expose it to anyone other than the user. Make sure that you have TLS enabled on any page that includes the client secret. Refer to our docs on <a href="https://stripe.com/docs/identity/verification-sessions#client-secret">passing the client secret to the frontend</a> to learn more.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $last_error If present, this property tells you the last error encountered when processing the verification.
+ * @property null|string|\Stripe\Identity\VerificationReport $last_verification_report ID of the most recent VerificationReport. <a href="https://stripe.com/docs/identity/verification-sessions#results">Learn more about accessing detailed verification results.</a>
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $options
+ * @property null|\Stripe\StripeObject $redaction Redaction status of this VerificationSession. If the VerificationSession is not redacted, this field will be null.
+ * @property string $status Status of this VerificationSession. <a href="https://stripe.com/docs/identity/how-sessions-work">Learn more about the lifecycle of sessions</a>.
+ * @property string $type The type of <a href="https://stripe.com/docs/identity/verification-checks">verification check</a> to be performed.
+ * @property null|string $url The short-lived URL that you use to redirect a user to Stripe to submit their identity information. This URL expires after 48 hours and can only be used once. Don’t store it, log it, send it in emails or expose it to anyone other than the user. Refer to our docs on <a href="https://stripe.com/docs/identity/verify-identity-documents?platform=web&amp;type=redirect">verifying identity documents</a> to learn how to redirect users to Stripe.
+ * @property null|\Stripe\StripeObject $verified_outputs The user’s verified data.
+ */
+class VerificationSession extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'identity.verification_session';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_REQUIRES_INPUT = 'requires_input';
+	const STATUS_VERIFIED = 'verified';
+	const TYPE_DOCUMENT = 'document';
+	const TYPE_ID_NUMBER = 'id_number';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession the canceled verification session
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession the redacted verification session
+	 */
+	public function redact($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * Invoices are statements of amounts owed by a customer, and are either generated
+ * one-off, or generated periodically from a subscription.
+ *
+ * They contain <a href="https://stripe.com/docs/api#invoiceitems">invoice
+ * items</a>, and proration adjustments that may be caused by subscription
+ * upgrades/downgrades (if necessary).
+ *
+ * If your invoice is configured to be billed through automatic charges, Stripe
+ * automatically finalizes your invoice and attempts payment. Note that finalizing
+ * the invoice, <a
+ * href="https://stripe.com/docs/billing/invoices/workflow/#auto_advance">when
+ * automatic</a>, does not happen immediately as the invoice is created. Stripe
+ * waits until one hour after the last webhook was successfully sent (or the last
+ * webhook timed out after failing). If you (and the platforms you may have
+ * connected to) have no webhooks configured, Stripe waits one hour after creation
+ * to finalize the invoice.
+ *
+ * If your invoice is configured to be billed by sending an email, then based on
+ * your <a href="https://dashboard.stripe.com/account/billing/automatic">email
+ * settings</a>, Stripe will email the invoice to your customer and await payment.
+ * These emails can contain a link to a hosted page to pay the invoice.
+ *
+ * Stripe applies any customer credit on the account before determining the amount
+ * due for the invoice (i.e., the amount that will be actually charged). If the
+ * amount due for the invoice is less than Stripe's <a
+ * href="/docs/currencies#minimum-and-maximum-charge-amounts">minimum allowed
+ * charge per currency</a>, the invoice is automatically marked paid, and we add
+ * the amount due to the customer's credit balance which is applied to the next
+ * invoice.
+ *
+ * More details on the customer's credit balance are <a
+ * href="https://stripe.com/docs/billing/customer/balance">here</a>.
+ *
+ * Related guide: <a href="https://stripe.com/docs/billing/invoices/sending">Send
+ * Invoices to Customers</a>.
+ *
+ * @property null|string $id Unique identifier for the object. This property is always present unless the invoice is an upcoming invoice. See <a href="https://stripe.com/docs/api/invoices/upcoming">Retrieve an upcoming invoice</a> for more details.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $account_country The country of the business associated with this invoice, most often the business creating the invoice.
+ * @property null|string $account_name The public name of the business associated with this invoice, most often the business creating the invoice.
+ * @property null|(string|\Stripe\TaxId)[] $account_tax_ids The account tax IDs associated with the invoice. Only editable when the invoice is a draft.
+ * @property int $amount_due Final amount due at this time for this invoice. If the invoice's total is smaller than the minimum charge amount, for example, or if there is account credit that can be applied to the invoice, the <code>amount_due</code> may be 0. If there is a positive <code>starting_balance</code> for the invoice (the customer owes money), the <code>amount_due</code> will also take that into account. The charge that gets generated for the invoice will be for the amount specified in <code>amount_due</code>.
+ * @property int $amount_paid The amount, in %s, that was paid.
+ * @property int $amount_remaining The difference between amount_due and amount_paid, in %s.
+ * @property int $amount_shipping This is the sum of all the shipping amounts.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the invoice.
+ * @property null|int $application_fee_amount The fee in %s that will be applied to the invoice and transferred to the application owner's Stripe account when the invoice is paid.
+ * @property int $attempt_count Number of payment attempts made for this invoice, from the perspective of the payment retry schedule. Any payment attempt counts as the first attempt, and subsequently only automatic retries increment the attempt count. In other words, manual payment attempts after the first attempt do not affect the retry schedule.
+ * @property bool $attempted Whether an attempt has been made to pay the invoice. An invoice is not attempted until 1 hour after the <code>invoice.created</code> webhook, for example, so you might not want to display that invoice as unpaid to your users.
+ * @property null|bool $auto_advance Controls whether Stripe will perform <a href="https://stripe.com/docs/billing/invoices/workflow/#auto_advance">automatic collection</a> of the invoice. When <code>false</code>, the invoice's state will not automatically advance without an explicit action.
+ * @property \Stripe\StripeObject $automatic_tax
+ * @property null|string $billing_reason Indicates the reason why the invoice was created. <code>subscription_cycle</code> indicates an invoice created by a subscription advancing into a new period. <code>subscription_create</code> indicates an invoice created due to creating a subscription. <code>subscription_update</code> indicates an invoice created due to updating a subscription. <code>subscription</code> is set for all old invoices to indicate either a change to a subscription or a period advancement. <code>manual</code> is set for all invoices unrelated to a subscription (for example: created via the invoice editor). The <code>upcoming</code> value is reserved for simulated invoices per the upcoming invoice endpoint. <code>subscription_threshold</code> indicates an invoice created due to a billing threshold being reached.
+ * @property null|string|\Stripe\Charge $charge ID of the latest charge generated for this invoice, if any.
+ * @property string $collection_method Either <code>charge_automatically</code>, or <code>send_invoice</code>. When charging automatically, Stripe will attempt to pay this invoice using the default source attached to the customer. When sending an invoice, Stripe will email this invoice to the customer with payment instructions.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|\Stripe\StripeObject[] $custom_fields Custom fields displayed on the invoice.
+ * @property null|string|\Stripe\Customer $customer The ID of the customer who will be billed.
+ * @property null|\Stripe\StripeObject $customer_address The customer's address. Until the invoice is finalized, this field will equal <code>customer.address</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_email The customer's email. Until the invoice is finalized, this field will equal <code>customer.email</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_name The customer's name. Until the invoice is finalized, this field will equal <code>customer.name</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_phone The customer's phone number. Until the invoice is finalized, this field will equal <code>customer.phone</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|\Stripe\StripeObject $customer_shipping The customer's shipping information. Until the invoice is finalized, this field will equal <code>customer.shipping</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string $customer_tax_exempt The customer's tax exempt status. Until the invoice is finalized, this field will equal <code>customer.tax_exempt</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|\Stripe\StripeObject[] $customer_tax_ids The customer's tax IDs. Until the invoice is finalized, this field will contain the same tax IDs as <code>customer.tax_ids</code>. Once the invoice is finalized, this field will no longer be updated.
+ * @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the invoice. It must belong to the customer associated with the invoice. If not set, defaults to the subscription's default payment method, if any, or to the default payment method in the customer's invoice settings.
+ * @property null|string|\Stripe\Account|\Stripe\BankAccount|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the invoice. It must belong to the customer associated with the invoice and be in a chargeable state. If not set, defaults to the subscription's default source, if any, or to the customer's default source.
+ * @property \Stripe\TaxRate[] $default_tax_rates The tax rates applied to this invoice, if any.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users. Referenced as 'memo' in the Dashboard.
+ * @property null|\Stripe\Discount $discount Describes the current discount applied to this invoice, if there is one. Not populated if there are multiple discounts.
+ * @property null|(string|\Stripe\Discount)[] $discounts The discounts applied to the invoice. Line item discounts are applied before invoice discounts. Use <code>expand[]=discounts</code> to expand each discount.
+ * @property null|int $due_date The date on which payment for this invoice is due. This value will be <code>null</code> for invoices where <code>collection_method=charge_automatically</code>.
+ * @property null|int $ending_balance Ending customer balance after the invoice is finalized. Invoices are finalized approximately an hour after successful webhook delivery or when payment collection is attempted for the invoice. If the invoice has not been finalized yet, this will be null.
+ * @property null|string $footer Footer displayed on the invoice.
+ * @property null|\Stripe\StripeObject $from_invoice Details of the invoice that was cloned. See the <a href="https://stripe.com/docs/invoicing/invoice-revisions">revision documentation</a> for more details.
+ * @property null|string $hosted_invoice_url The URL for the hosted invoice page, which allows customers to view and pay an invoice. If the invoice has not been finalized yet, this will be null.
+ * @property null|string $invoice_pdf The link to download the PDF for the invoice. If the invoice has not been finalized yet, this will be null.
+ * @property null|\Stripe\StripeObject $last_finalization_error The error encountered during the previous attempt to finalize the invoice. This field is cleared when the invoice is successfully finalized.
+ * @property null|string|\Stripe\Invoice $latest_revision The ID of the most recent non-draft revision of this invoice
+ * @property \Stripe\Collection<\Stripe\InvoiceLineItem> $lines The individual line items that make up the invoice. <code>lines</code> is sorted as follows: (1) pending invoice items (including prorations) in reverse chronological order, (2) subscription items in reverse chronological order, and (3) invoice items added after invoice creation in chronological order.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|int $next_payment_attempt The time at which payment will next be attempted. This value will be <code>null</code> for invoices where <code>collection_method=send_invoice</code>.
+ * @property null|string $number A unique, identifying string that appears on emails sent to the customer for this invoice. This starts with the customer's unique invoice_prefix if it is specified.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the funds of the invoice payment are intended. If set, the invoice will be presented with the branding and support information of the specified account. See the <a href="https://stripe.com/docs/billing/invoices/connect">Invoices with Connect</a> documentation for details.
+ * @property bool $paid Whether payment was successfully collected for this invoice. An invoice can be paid (most commonly) with a charge or with credit from the customer's account balance.
+ * @property bool $paid_out_of_band Returns true if the invoice was manually marked paid, returns false if the invoice hasn't been paid yet or was paid on Stripe.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent The PaymentIntent associated with this invoice. The PaymentIntent is generated when the invoice is finalized, and can then be used to pay the invoice. Note that voiding an invoice will cancel the PaymentIntent.
+ * @property \Stripe\StripeObject $payment_settings
+ * @property int $period_end End of the usage period during which invoice items were added to this invoice.
+ * @property int $period_start Start of the usage period during which invoice items were added to this invoice.
+ * @property int $post_payment_credit_notes_amount Total amount of all post-payment credit notes issued for this invoice.
+ * @property int $pre_payment_credit_notes_amount Total amount of all pre-payment credit notes issued for this invoice.
+ * @property null|string|\Stripe\Quote $quote The quote this invoice was generated from.
+ * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this invoice.
+ * @property null|\Stripe\StripeObject $rendering_options Options for invoice PDF rendering.
+ * @property null|\Stripe\StripeObject $shipping_cost The details of the cost of shipping, including the ShippingRate applied on the invoice.
+ * @property null|\Stripe\StripeObject $shipping_details Shipping details for the invoice. The Invoice PDF will use the <code>shipping_details</code> value if it is set, otherwise the PDF will render the shipping address from the customer.
+ * @property int $starting_balance Starting customer balance before the invoice is finalized. If the invoice has not been finalized yet, this will be the current customer balance. For revision invoices, this also includes any customer balance that was applied to the original invoice.
+ * @property null|string $statement_descriptor Extra information about an invoice for the customer's credit card statement.
+ * @property null|string $status The status of the invoice, one of <code>draft</code>, <code>open</code>, <code>paid</code>, <code>uncollectible</code>, or <code>void</code>. <a href="https://stripe.com/docs/billing/invoices/workflow#workflow-overview">Learn more</a>
+ * @property \Stripe\StripeObject $status_transitions
+ * @property null|string|\Stripe\Subscription $subscription The subscription that this invoice was prepared for, if any.
+ * @property null|int $subscription_proration_date Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
+ * @property int $subtotal Total of all subscriptions, invoice items, and prorations on the invoice before any invoice level discount or exclusive tax is applied. Item discounts are already incorporated
+ * @property null|int $subtotal_excluding_tax The integer amount in %s representing the subtotal of the invoice before any invoice level discount or tax is applied. Item discounts are already incorporated
+ * @property null|int $tax The amount of tax on this invoice. This is the sum of all the tax amounts on this invoice.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this invoice belongs to.
+ * @property null|\Stripe\StripeObject $threshold_reason
+ * @property int $total Total after discounts and taxes.
+ * @property null|\Stripe\StripeObject[] $total_discount_amounts The aggregate amounts calculated per discount across all line items.
+ * @property null|int $total_excluding_tax The integer amount in %s representing the total amount of the invoice including all discounts but excluding all tax.
+ * @property \Stripe\StripeObject[] $total_tax_amounts The aggregate amounts calculated per tax rate for all line items.
+ * @property null|\Stripe\StripeObject $transfer_data The account (if any) the payment will be attributed to for tax reporting, and where funds from the payment will be transferred to for the invoice.
+ * @property null|int $webhooks_delivered_at Invoices are automatically paid or sent 1 hour after webhooks are delivered, or until all webhook delivery attempts have <a href="https://stripe.com/docs/billing/webhooks#understand">been exhausted</a>. This field tracks the time when webhooks for this invoice were successfully delivered. If the invoice had no webhooks to deliver, this will be set while the invoice is being created.
+ */
+class Invoice extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'invoice';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const BILLING_CHARGE_AUTOMATICALLY = 'charge_automatically';
+	const BILLING_SEND_INVOICE = 'send_invoice';
+	const BILLING_REASON_AUTOMATIC_PENDING_INVOICE_ITEM_INVOICE = 'automatic_pending_invoice_item_invoice';
+	const BILLING_REASON_MANUAL = 'manual';
+	const BILLING_REASON_QUOTE_ACCEPT = 'quote_accept';
+	const BILLING_REASON_SUBSCRIPTION = 'subscription';
+	const BILLING_REASON_SUBSCRIPTION_CREATE = 'subscription_create';
+	const BILLING_REASON_SUBSCRIPTION_CYCLE = 'subscription_cycle';
+	const BILLING_REASON_SUBSCRIPTION_THRESHOLD = 'subscription_threshold';
+	const BILLING_REASON_SUBSCRIPTION_UPDATE = 'subscription_update';
+	const BILLING_REASON_UPCOMING = 'upcoming';
+	const COLLECTION_METHOD_CHARGE_AUTOMATICALLY = 'charge_automatically';
+	const COLLECTION_METHOD_SEND_INVOICE = 'send_invoice';
+	const STATUS_DELETED = 'deleted';
+	const STATUS_DRAFT = 'draft';
+	const STATUS_OPEN = 'open';
+	const STATUS_PAID = 'paid';
+	const STATUS_UNCOLLECTIBLE = 'uncollectible';
+	const STATUS_VOID = 'void';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice the finalized invoice
+	 */
+	public function finalizeInvoice($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice the uncollectible invoice
+	 */
+	public function markUncollectible($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice the paid invoice
+	 */
+	public function pay($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice the sent invoice
+	 */
+	public function sendInvoice($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice the upcoming invoice
+	 */
+	public static function upcoming($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\InvoiceLineItem> list of InvoiceLineItems
+	 */
+	public static function upcomingLines($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice the voided invoice
+	 */
+	public function voidInvoice($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<Invoice> the invoice search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+	const PATH_LINES = '/lines';
+	/**
+	 * @param string $id the ID of the invoice on which to retrieve the line items
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem> the list of line items
+	 */
+	public static function allLines($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Invoice Items represent the component lines of an <a
+ * href="https://stripe.com/docs/api/invoices">invoice</a>. An invoice item is
+ * added to an invoice by creating or updating it with an <code>invoice</code>
+ * field, at which point it will be included as <a
+ * href="https://stripe.com/docs/api/invoices/line_item">an invoice line item</a>
+ * within <a
+ * href="https://stripe.com/docs/api/invoices/object#invoice_object-lines">invoice.lines</a>.
+ *
+ * Invoice Items can be created before you are ready to actually send the invoice.
+ * This can be particularly useful when combined with a <a
+ * href="https://stripe.com/docs/api/subscriptions">subscription</a>. Sometimes you
+ * want to add a charge or credit to a customer, but actually charge or credit the
+ * customer’s card only at the end of a regular billing cycle. This is useful for
+ * combining several charges (to minimize per-transaction fees), or for having
+ * Stripe tabulate your usage-based billing totals.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/invoicing/integration">Integrate with the
+ * Invoicing API</a>, <a
+ * href="https://stripe.com/docs/billing/invoices/subscription#adding-upcoming-invoice-items">Subscription
+ * Invoices</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in the <code>currency</code> specified) of the invoice item. This should always be equal to <code>unit_amount * quantity</code>.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string|\Stripe\Customer $customer The ID of the customer who will be billed when this invoice item is billed.
+ * @property int $date Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property bool $discountable If true, discounts will apply to this invoice item. Always false for prorations.
+ * @property null|(string|\Stripe\Discount)[] $discounts The discounts which apply to the invoice item. Item discounts are applied before invoice discounts. Use <code>expand[]=discounts</code> to expand each discount.
+ * @property null|string|\Stripe\Invoice $invoice The ID of the invoice this invoice item belongs to.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $period
+ * @property null|\Stripe\Plan $plan If the invoice item is a proration, the plan of the subscription that the proration was computed for.
+ * @property null|\Stripe\Price $price The price of the invoice item.
+ * @property bool $proration Whether the invoice item was created automatically as a proration adjustment when the customer switched plans.
+ * @property int $quantity Quantity of units for the invoice item. If the invoice item is a proration, the quantity of the subscription that the proration was computed for.
+ * @property null|string|\Stripe\Subscription $subscription The subscription that this invoice item has been created for, if any.
+ * @property null|string $subscription_item The subscription item that this invoice item has been created for, if any.
+ * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to the invoice item. When set, the <code>default_tax_rates</code> on the invoice do not apply to this invoice item.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this invoice item belongs to.
+ * @property null|int $unit_amount Unit amount (in the <code>currency</code> specified) of the invoice item.
+ * @property null|string $unit_amount_decimal Same as <code>unit_amount</code>, but contains a decimal value with at most 12 decimal places.
+ */
+class InvoiceItem extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'invoiceitem';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The amount, in %s.
+ * @property null|int $amount_excluding_tax The integer amount in %s representing the amount for this line item, excluding all tax and discounts.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\StripeObject[] $discount_amounts The amount of discount calculated per discount for this line item.
+ * @property bool $discountable If true, discounts will apply to this line item. Always false for prorations.
+ * @property null|(string|\Stripe\Discount)[] $discounts The discounts applied to the invoice line item. Line item discounts are applied before invoice discounts. Use <code>expand[]=discounts</code> to expand each discount.
+ * @property null|string $invoice_item The ID of the <a href="https://stripe.com/docs/api/invoiceitems">invoice item</a> associated with this line item if any.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format. Note that for line items with <code>type=subscription</code> this will reflect the metadata of the subscription that caused the line item to be created.
+ * @property \Stripe\StripeObject $period
+ * @property null|\Stripe\Plan $plan The plan of the subscription, if the line item is a subscription or a proration.
+ * @property null|\Stripe\Price $price The price of the line item.
+ * @property bool $proration Whether this is a proration.
+ * @property null|\Stripe\StripeObject $proration_details Additional details for proration line items
+ * @property null|int $quantity The quantity of the subscription, if the line item is a subscription or a proration.
+ * @property null|string $subscription The subscription that the invoice item pertains to, if any.
+ * @property null|string $subscription_item The subscription item that generated this line item. Left empty if the line item is not an explicit result of a subscription.
+ * @property null|\Stripe\StripeObject[] $tax_amounts The amount of tax calculated per tax rate for this line item
+ * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to the line item.
+ * @property string $type A string identifying the type of the source of this line item, either an <code>invoiceitem</code> or a <code>subscription</code>.
+ * @property null|string $unit_amount_excluding_tax The amount in %s representing the unit amount for this line item, excluding all tax and discounts.
+ */
+class InvoiceLineItem extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'line_item';
+}
+namespace Stripe\Issuing;
+
+/**
+ * When an <a href="https://stripe.com/docs/issuing">issued card</a> is used to
+ * make a purchase, an Issuing <code>Authorization</code> object is created. <a
+ * href="https://stripe.com/docs/issuing/purchases/authorizations">Authorizations</a>
+ * must be approved for the purchase to be completed successfully.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/purchases/authorizations">Issued Card
+ * Authorizations</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The total amount that was authorized or rejected. This amount is in the card's currency and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|\Stripe\StripeObject $amount_details Detailed breakdown of amount components. These amounts are denominated in <code>currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property bool $approved Whether the authorization has been approved.
+ * @property string $authorization_method How the card details were provided.
+ * @property \Stripe\BalanceTransaction[] $balance_transactions List of balance transactions associated with this authorization.
+ * @property \Stripe\Issuing\Card $card You can <a href="https://stripe.com/docs/issuing/cards">create physical or virtual cards</a> that are issued to cardholders.
+ * @property null|string|\Stripe\Issuing\Cardholder $cardholder The cardholder to whom this authorization belongs.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $merchant_amount The total amount that was authorized or rejected. This amount is in the <code>merchant_currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property string $merchant_currency The currency that was presented to the cardholder for the authorization. Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\StripeObject $merchant_data
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $network_data Details about the authorization, such as identifiers, set by the card network.
+ * @property null|\Stripe\StripeObject $pending_request The pending authorization request. This field will only be non-null during an <code>issuing_authorization.request</code> webhook.
+ * @property \Stripe\StripeObject[] $request_history History of every time a <code>pending_request</code> authorization was approved/declined, either by you directly or by Stripe (e.g. based on your spending_controls). If the merchant changes the authorization by performing an incremental authorization, you can look at this field to see the previous requests for the authorization. This field can be helpful in determining why a given authorization was approved/declined.
+ * @property string $status The current status of the authorization in its lifecycle.
+ * @property \Stripe\Issuing\Transaction[] $transactions List of <a href="https://stripe.com/docs/api/issuing/transactions">transactions</a> associated with this authorization.
+ * @property null|\Stripe\StripeObject $treasury <a href="https://stripe.com/docs/api/treasury">Treasury</a> details related to this authorization if it was created on a <a href="https://stripe.com/docs/api/treasury/financial_accounts">FinancialAccount</a>.
+ * @property \Stripe\StripeObject $verification_data
+ * @property null|string $wallet The digital wallet used for this transaction. One of <code>apple_pay</code>, <code>google_pay</code>, or <code>samsung_pay</code>. Will populate as <code>null</code> when no digital wallet was utilized.
+ */
+class Authorization extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'issuing.authorization';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Authorization the approved authorization
+	 */
+	public function approve($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Authorization the declined authorization
+	 */
+	public function decline($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * You can <a href="https://stripe.com/docs/issuing/cards">create physical or
+ * virtual cards</a> that are issued to cardholders.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $brand The brand of the card.
+ * @property null|string $cancellation_reason The reason why the card was canceled.
+ * @property \Stripe\Issuing\Cardholder $cardholder <p>An Issuing <code>Cardholder</code> object represents an individual or business entity who is <a href="https://stripe.com/docs/issuing">issued</a> cards.</p><p>Related guide: <a href="https://stripe.com/docs/issuing/cards#create-cardholder">How to create a Cardholder</a></p>
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Supported currencies are <code>usd</code> in the US, <code>eur</code> in the EU, and <code>gbp</code> in the UK.
+ * @property null|string $cvc The card's CVC. For security reasons, this is only available for virtual cards, and will be omitted unless you explicitly request it with <a href="https://stripe.com/docs/api/expanding_objects">the <code>expand</code> parameter</a>. Additionally, it's only available via the <a href="https://stripe.com/docs/api/issuing/cards/retrieve">&quot;Retrieve a card&quot; endpoint</a>, not via &quot;List all cards&quot; or any other endpoint.
+ * @property int $exp_month The expiration month of the card.
+ * @property int $exp_year The expiration year of the card.
+ * @property null|string $financial_account The financial account this card is attached to.
+ * @property string $last4 The last 4 digits of the card number.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $number The full unredacted card number. For security reasons, this is only available for virtual cards, and will be omitted unless you explicitly request it with <a href="https://stripe.com/docs/api/expanding_objects">the <code>expand</code> parameter</a>. Additionally, it's only available via the <a href="https://stripe.com/docs/api/issuing/cards/retrieve">&quot;Retrieve a card&quot; endpoint</a>, not via &quot;List all cards&quot; or any other endpoint.
+ * @property null|string|\Stripe\Issuing\Card $replaced_by The latest card that replaces this card, if any.
+ * @property null|string|\Stripe\Issuing\Card $replacement_for The card this card replaces, if any.
+ * @property null|string $replacement_reason The reason why the previous card needed to be replaced.
+ * @property null|\Stripe\StripeObject $shipping Where and how the card will be shipped.
+ * @property \Stripe\StripeObject $spending_controls
+ * @property string $status Whether authorizations can be approved on this card. May be blocked from activating cards depending on past-due Cardholder requirements. Defaults to <code>inactive</code>.
+ * @property string $type The type of the card.
+ * @property null|\Stripe\StripeObject $wallets Information relating to digital wallets (like Apple Pay and Google Pay).
+ */
+class Card extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'issuing.card';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * Class CardDetails.
+ *
+ * @property string $id
+ * @property string $object
+ * @property Card $card
+ * @property string $cvc
+ * @property int $exp_month
+ * @property int $exp_year
+ * @property string $number
+ */
+class CardDetails extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'issuing.card_details';
+}
+/**
+ * An Issuing <code>Cardholder</code> object represents an individual or business
+ * entity who is <a href="https://stripe.com/docs/issuing">issued</a> cards.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/cards#create-cardholder">How to create a
+ * Cardholder</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $billing
+ * @property null|\Stripe\StripeObject $company Additional information about a <code>company</code> cardholder.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $email The cardholder's email address.
+ * @property null|\Stripe\StripeObject $individual Additional information about an <code>individual</code> cardholder.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $name The cardholder's name. This will be printed on cards issued to them.
+ * @property null|string $phone_number The cardholder's phone number. This is required for all cardholders who will be creating EU cards. See the <a href="https://stripe.com/docs/issuing/3d-secure#when-is-3d-secure-applied">3D Secure documentation</a> for more details.
+ * @property \Stripe\StripeObject $requirements
+ * @property null|\Stripe\StripeObject $spending_controls Rules that control spending across this cardholder's cards. Refer to our <a href="https://stripe.com/docs/issuing/controls/spending-controls">documentation</a> for more details.
+ * @property string $status Specifies whether to permit authorizations on this cardholder's cards.
+ * @property string $type One of <code>individual</code> or <code>company</code>.
+ */
+class Cardholder extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'issuing.cardholder';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * As a <a href="https://stripe.com/docs/issuing">card issuer</a>, you can dispute
+ * transactions that the cardholder does not recognize, suspects to be fraudulent,
+ * or has other issues with.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/purchases/disputes">Disputing
+ * Transactions</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Disputed amount in the card's currency and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>. Usually the amount of the <code>transaction</code>, but can differ (usually because of currency fluctuation).
+ * @property null|\Stripe\BalanceTransaction[] $balance_transactions List of balance transactions associated with the dispute.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency The currency the <code>transaction</code> was made in.
+ * @property \Stripe\StripeObject $evidence
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $status Current status of the dispute.
+ * @property string|\Stripe\Issuing\Transaction $transaction The transaction being disputed.
+ * @property null|\Stripe\StripeObject $treasury <a href="https://stripe.com/docs/api/treasury">Treasury</a> details related to this dispute if it was created on a [FinancialAccount](/docs/api/treasury/financial_accounts
+ */
+class Dispute extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'issuing.dispute';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Dispute the submited dispute
+	 */
+	public function submit($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Any use of an <a href="https://stripe.com/docs/issuing">issued card</a> that
+ * results in funds entering or leaving your Stripe account, such as a completed
+ * purchase or refund, is represented by an Issuing <code>Transaction</code>
+ * object.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/issuing/purchases/transactions">Issued Card
+ * Transactions</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount The transaction amount, which will be reflected in your balance. This amount is in your currency and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|\Stripe\StripeObject $amount_details Detailed breakdown of amount components. These amounts are denominated in <code>currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>.
+ * @property null|string|\Stripe\Issuing\Authorization $authorization The <code>Authorization</code> object that led to this transaction.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the <a href="https://stripe.com/docs/api/balance_transactions">balance transaction</a> associated with this transaction.
+ * @property string|\Stripe\Issuing\Card $card The card used to make this transaction.
+ * @property null|string|\Stripe\Issuing\Cardholder $cardholder The cardholder to whom this transaction belongs.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Issuing\Dispute $dispute If you've disputed the transaction, the ID of the dispute.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $merchant_amount The amount that the merchant will receive, denominated in <code>merchant_currency</code> and in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a>. It will be different from <code>amount</code> if the merchant is taking payment in a different currency.
+ * @property string $merchant_currency The currency with which the merchant is taking payment.
+ * @property \Stripe\StripeObject $merchant_data
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $purchase_details Additional purchase information that is optionally provided by the merchant.
+ * @property null|\Stripe\StripeObject $treasury <a href="https://stripe.com/docs/api/treasury">Treasury</a> details related to this transaction if it was created on a [FinancialAccount](/docs/api/treasury/financial_accounts
+ * @property string $type The nature of the transaction.
+ * @property null|string $wallet The digital wallet used for this transaction. One of <code>apple_pay</code>, <code>google_pay</code>, or <code>samsung_pay</code>.
+ */
+class Transaction extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'issuing.transaction';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+namespace Stripe;
+
+/**
+ * A line item.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount_discount Total discount amount applied. If no discounts were applied, defaults to 0.
+ * @property int $amount_subtotal Total before any discounts or taxes are applied.
+ * @property int $amount_tax Total tax amount applied. If no tax was applied, defaults to 0.
+ * @property int $amount_total Total after discounts and taxes.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $description An arbitrary string attached to the object. Often useful for displaying to users. Defaults to product name.
+ * @property null|\Stripe\StripeObject[] $discounts The discounts applied to the line item.
+ * @property null|\Stripe\Price $price The price used to generate the line item.
+ * @property null|int $quantity The quantity of products being purchased.
+ * @property null|\Stripe\StripeObject[] $taxes The taxes applied to the line item.
+ */
+class LineItem extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'item';
+}
+/**
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $url The URL for the login link.
+ */
+class LoginLink extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'login_link';
+}
+/**
+ * A Mandate is a record of the permission a customer has given you to debit their
+ * payment method.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $customer_acceptance
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $multi_use
+ * @property string|\Stripe\PaymentMethod $payment_method ID of the payment method associated with this mandate.
+ * @property \Stripe\StripeObject $payment_method_details
+ * @property null|\Stripe\StripeObject $single_use
+ * @property string $status The status of the mandate, which indicates whether it can be used to initiate a payment.
+ * @property string $type The type of the mandate.
+ */
+class Mandate extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'mandate';
+	use \Stripe\ApiOperations\Retrieve;
+}
+abstract class OAuth
+{
+	/**
+	 * Generates a URL to Stripe's OAuth form.
+	 *
+	 * @param null|array $params
+	 * @param null|array $opts
+	 *
+	 * @return string the URL to Stripe's OAuth form
+	 */
+	public static function authorizeUrl($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Use an authoriztion code to connect an account to your platform and
+	 * fetch the user's credentials.
+	 *
+	 * @param null|array $params
+	 * @param null|array $opts
+	 *
+	 * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+	 *
+	 * @return StripeObject object containing the response from the API
+	 */
+	public static function token($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Disconnects an account from your platform.
+	 *
+	 * @param null|array $params
+	 * @param null|array $opts
+	 *
+	 * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+	 *
+	 * @return StripeObject object containing the response from the API
+	 */
+	public static function deauthorize($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Class OAuthErrorObject.
+ *
+ * @property string $error
+ * @property string $error_description
+ */
+class OAuthErrorObject extends \Stripe\StripeObject
+{
+	/**
+	 * Refreshes this object using the provided values.
+	 *
+	 * @param array $values
+	 * @param null|array|string|Util\RequestOptions $opts
+	 * @param bool $partial defaults to false
+	 */
+	public function refreshFrom($values, $opts, $partial = false)
+	{
+	}
+}
+/**
+ * A PaymentIntent guides you through the process of collecting a payment from your
+ * customer. We recommend that you create exactly one PaymentIntent for each order
+ * or customer session in your system. You can reference the PaymentIntent later to
+ * see the history of payment attempts for a particular session.
+ *
+ * A PaymentIntent transitions through <a
+ * href="https://stripe.com/docs/payments/intents#intent-statuses">multiple
+ * statuses</a> throughout its lifetime as it interfaces with Stripe.js to perform
+ * authentication flows and ultimately creates at most one successful charge.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/payment-intents">Payment Intents API</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount intended to be collected by this PaymentIntent. A positive integer representing how much to charge in the <a href="https://stripe.com/docs/currencies#zero-decimal">smallest currency unit</a> (e.g., 100 cents to charge $1.00 or 100 to charge ¥100, a zero-decimal currency). The minimum amount is $0.50 US or <a href="https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts">equivalent in charge currency</a>. The amount value supports up to eight digits (e.g., a value of 99999999 for a USD charge of $999,999.99).
+ * @property int $amount_capturable Amount that can be captured from this PaymentIntent.
+ * @property null|\Stripe\StripeObject $amount_details
+ * @property int $amount_received Amount that was collected by this PaymentIntent.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the PaymentIntent.
+ * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. The amount of the application fee collected will be capped at the total payment amount. For more information, see the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a>.
+ * @property null|\Stripe\StripeObject $automatic_payment_methods Settings to configure compatible payment methods from the <a href="https://dashboard.stripe.com/settings/payment_methods">Stripe Dashboard</a>
+ * @property null|int $canceled_at Populated when <code>status</code> is <code>canceled</code>, this is the time at which the PaymentIntent was canceled. Measured in seconds since the Unix epoch.
+ * @property null|string $cancellation_reason Reason for cancellation of this PaymentIntent, either user-provided (<code>duplicate</code>, <code>fraudulent</code>, <code>requested_by_customer</code>, or <code>abandoned</code>) or generated by Stripe internally (<code>failed_invoice</code>, <code>void_invoice</code>, or <code>automatic</code>).
+ * @property string $capture_method Controls when the funds will be captured from the customer's account.
+ * @property null|string $client_secret <p>The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete a payment from your frontend. It should not be stored, logged, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p><p>Refer to our docs to <a href="https://stripe.com/docs/payments/accept-a-payment?ui=elements">accept a payment</a> and learn about how <code>client_secret</code> should be handled.</p>
+ * @property string $confirmation_method
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer <p>ID of the Customer this PaymentIntent belongs to, if one exists.</p><p>Payment methods attached to other Customers cannot be used with this PaymentIntent.</p><p>If present in combination with <a href="https://stripe.com/docs/api#payment_intent_object-setup_future_usage">setup_future_usage</a>, this PaymentIntent's payment method will be attached to the Customer after the PaymentIntent has been confirmed and any required actions from the user are complete.</p>
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\Invoice $invoice ID of the invoice that created this PaymentIntent, if it exists.
+ * @property null|\Stripe\StripeObject $last_payment_error The payment error encountered in the previous PaymentIntent confirmation. It will be cleared if the PaymentIntent is later updated for any reason.
+ * @property null|string|\Stripe\Charge $latest_charge The latest charge created by this payment intent.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format. For more information, see the <a href="https://stripe.com/docs/payments/payment-intents/creating-payment-intents#storing-information-in-metadata">documentation</a>.
+ * @property null|\Stripe\StripeObject $next_action If present, this property tells you what actions you need to take in order for your customer to fulfill a payment using the provided source.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the funds of the PaymentIntent are intended. See the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a> for details.
+ * @property null|string|\Stripe\PaymentMethod $payment_method ID of the payment method used in this PaymentIntent.
+ * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for this PaymentIntent.
+ * @property string[] $payment_method_types The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
+ * @property null|\Stripe\StripeObject $processing If present, this property tells you about the processing state of the payment.
+ * @property null|string $receipt_email Email address that the receipt for the resulting payment will be sent to. If <code>receipt_email</code> is specified for a payment in live mode, a receipt will be sent regardless of your <a href="https://dashboard.stripe.com/account/emails">email settings</a>.
+ * @property null|string|\Stripe\Review $review ID of the review associated with this PaymentIntent, if any.
+ * @property null|string $setup_future_usage <p>Indicates that you intend to make future payments with this PaymentIntent's payment method.</p><p>Providing this parameter will <a href="https://stripe.com/docs/payments/save-during-payment">attach the payment method</a> to the PaymentIntent's Customer, if present, after the PaymentIntent is confirmed and any required actions from the user are complete. If no Customer was provided, the payment method can still be <a href="https://stripe.com/docs/api/payment_methods/attach">attached</a> to a Customer after the transaction completes.</p><p>When processing card payments, Stripe also uses <code>setup_future_usage</code> to dynamically optimize your payment flow and comply with regional legislation and network rules, such as <a href="https://stripe.com/docs/strong-customer-authentication">SCA</a>.</p>
+ * @property null|\Stripe\StripeObject $shipping Shipping information for this PaymentIntent.
+ * @property null|string|\Stripe\Account|\Stripe\BankAccount|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It is the ID of the Source object that is associated with this PaymentIntent, if one was supplied.
+ * @property null|string $statement_descriptor For non-card charges, you can use this value as the complete description that appears on your customers’ statements. Must contain at least one letter, maximum 22 characters.
+ * @property null|string $statement_descriptor_suffix Provides information about a card payment that customers see on their statements. Concatenated with the prefix (shortened descriptor) or statement descriptor that’s set on the account to form the complete statement descriptor. Maximum 22 characters for the concatenated descriptor.
+ * @property string $status Status of this PaymentIntent, one of <code>requires_payment_method</code>, <code>requires_confirmation</code>, <code>requires_action</code>, <code>processing</code>, <code>requires_capture</code>, <code>canceled</code>, or <code>succeeded</code>. Read more about each PaymentIntent <a href="https://stripe.com/docs/payments/intents#intent-statuses">status</a>.
+ * @property null|\Stripe\StripeObject $transfer_data The data with which to automatically create a Transfer when the payment is finalized. See the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a> for details.
+ * @property null|string $transfer_group A string that identifies the resulting payment as part of a group. See the PaymentIntents <a href="https://stripe.com/docs/payments/connected-accounts">use case for connected accounts</a> for details.
+ */
+class PaymentIntent extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'payment_intent';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_REQUIRES_ACTION = 'requires_action';
+	const STATUS_REQUIRES_CAPTURE = 'requires_capture';
+	const STATUS_REQUIRES_CONFIRMATION = 'requires_confirmation';
+	const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
+	const STATUS_SUCCEEDED = 'succeeded';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent the applied payment intent
+	 */
+	public function applyCustomerBalance($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent the canceled payment intent
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent the captured payment intent
+	 */
+	public function capture($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent the confirmed payment intent
+	 */
+	public function confirm($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent the incremented payment intent
+	 */
+	public function incrementAuthorization($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent the verified payment intent
+	 */
+	public function verifyMicrodeposits($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<PaymentIntent> the payment intent search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * A payment link is a shareable URL that will take your customers to a hosted
+ * payment page. A payment link can be shared and used multiple times.
+ *
+ * When a customer opens a payment link it will open a new <a
+ * href="https://stripe.com/docs/api/checkout/sessions">checkout session</a> to
+ * render the payment page. You can use <a
+ * href="https://stripe.com/docs/api/events/types#event_types-checkout.session.completed">checkout
+ * session events</a> to track payments through payment links.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/payment-links/api">Payment Links API</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the payment link's <code>url</code> is active. If <code>false</code>, customers visiting the URL will be shown a page saying that the link has been deactivated.
+ * @property \Stripe\StripeObject $after_completion
+ * @property bool $allow_promotion_codes Whether user redeemable promotion codes are enabled.
+ * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account.
+ * @property null|float $application_fee_percent This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account.
+ * @property \Stripe\StripeObject $automatic_tax
+ * @property string $billing_address_collection Configuration for collecting the customer's billing address.
+ * @property null|\Stripe\StripeObject $consent_collection When set, provides configuration to gather active consent from customers.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property \Stripe\StripeObject[] $custom_fields Collect additional information from your customer using custom fields. Up to 2 fields are supported.
+ * @property \Stripe\StripeObject $custom_text
+ * @property string $customer_creation Configuration for Customer creation during checkout.
+ * @property null|\Stripe\StripeObject $invoice_creation Configuration for creating invoice for payment mode payment links.
+ * @property null|\Stripe\Collection<\Stripe\LineItem> $line_items The line items representing what is being sold.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\Account $on_behalf_of The account on behalf of which to charge. See the <a href="https://support.stripe.com/questions/sending-invoices-on-behalf-of-connected-accounts">Connect documentation</a> for details.
+ * @property null|\Stripe\StripeObject $payment_intent_data Indicates the parameters to be passed to PaymentIntent creation during checkout.
+ * @property string $payment_method_collection Configuration for collecting a payment method during checkout.
+ * @property null|string[] $payment_method_types The list of payment method types that customers can use. When <code>null</code>, Stripe will dynamically show relevant payment methods you've enabled in your <a href="https://dashboard.stripe.com/settings/payment_methods">payment method settings</a>.
+ * @property \Stripe\StripeObject $phone_number_collection
+ * @property null|\Stripe\StripeObject $shipping_address_collection Configuration for collecting the customer's shipping address.
+ * @property \Stripe\StripeObject[] $shipping_options The shipping rate options applied to the session.
+ * @property string $submit_type Indicates the type of transaction being performed which customizes relevant text on the page, such as the submit button.
+ * @property null|\Stripe\StripeObject $subscription_data When creating a subscription, the specified configuration data will be used. There must be at least one line item with a recurring price to use <code>subscription_data</code>.
+ * @property \Stripe\StripeObject $tax_id_collection
+ * @property null|\Stripe\StripeObject $transfer_data The account (if any) the payments will be attributed to for tax reporting, and where funds from each payment will be transferred to.
+ * @property string $url The public URL that can be shared with customers.
+ */
+class PaymentLink extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'payment_link';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const BILLING_ADDRESS_COLLECTION_AUTO = 'auto';
+	const BILLING_ADDRESS_COLLECTION_REQUIRED = 'required';
+	const CUSTOMER_CREATION_ALWAYS = 'always';
+	const CUSTOMER_CREATION_IF_REQUIRED = 'if_required';
+	const PAYMENT_METHOD_COLLECTION_ALWAYS = 'always';
+	const PAYMENT_METHOD_COLLECTION_IF_REQUIRED = 'if_required';
+	const SUBMIT_TYPE_AUTO = 'auto';
+	const SUBMIT_TYPE_BOOK = 'book';
+	const SUBMIT_TYPE_DONATE = 'donate';
+	const SUBMIT_TYPE_PAY = 'pay';
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem> list of LineItems
+	 */
+	public static function allLineItems($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * PaymentMethod objects represent your customer's payment instruments. You can use
+ * them with <a
+ * href="https://stripe.com/docs/payments/payment-intents">PaymentIntents</a> to
+ * collect payments or save them to Customer objects to store instrument details
+ * for future payments.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/payments/payment-methods">Payment Methods</a> and
+ * <a href="https://stripe.com/docs/payments/more-payment-scenarios">More Payment
+ * Scenarios</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $acss_debit
+ * @property null|\Stripe\StripeObject $affirm
+ * @property null|\Stripe\StripeObject $afterpay_clearpay
+ * @property null|\Stripe\StripeObject $alipay
+ * @property null|\Stripe\StripeObject $au_becs_debit
+ * @property null|\Stripe\StripeObject $bacs_debit
+ * @property null|\Stripe\StripeObject $bancontact
+ * @property \Stripe\StripeObject $billing_details
+ * @property null|\Stripe\StripeObject $blik
+ * @property null|\Stripe\StripeObject $boleto
+ * @property null|\Stripe\StripeObject $card
+ * @property null|\Stripe\StripeObject $card_present
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer The ID of the Customer to which this PaymentMethod is saved. This will not be set when the PaymentMethod has not been saved to a Customer.
+ * @property null|\Stripe\StripeObject $customer_balance
+ * @property null|\Stripe\StripeObject $eps
+ * @property null|\Stripe\StripeObject $fpx
+ * @property null|\Stripe\StripeObject $giropay
+ * @property null|\Stripe\StripeObject $grabpay
+ * @property null|\Stripe\StripeObject $ideal
+ * @property null|\Stripe\StripeObject $interac_present
+ * @property null|\Stripe\StripeObject $klarna
+ * @property null|\Stripe\StripeObject $konbini
+ * @property null|\Stripe\StripeObject $link
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $oxxo
+ * @property null|\Stripe\StripeObject $p24
+ * @property null|\Stripe\StripeObject $paynow
+ * @property null|\Stripe\StripeObject $pix
+ * @property null|\Stripe\StripeObject $promptpay
+ * @property null|\Stripe\StripeObject $radar_options Options to configure Radar. See <a href="https://stripe.com/docs/radar/radar-session">Radar Session</a> for more information.
+ * @property null|\Stripe\StripeObject $sepa_debit
+ * @property null|\Stripe\StripeObject $sofort
+ * @property string $type The type of the PaymentMethod. An additional hash is included on the PaymentMethod with a name matching this value. It contains additional information specific to the PaymentMethod type.
+ * @property null|\Stripe\StripeObject $us_bank_account
+ * @property null|\Stripe\StripeObject $wechat_pay
+ */
+class PaymentMethod extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'payment_method';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod the attached payment method
+	 */
+	public function attach($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod the detached payment method
+	 */
+	public function detach($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * A <code>Payout</code> object is created when you receive funds from Stripe, or
+ * when you initiate a payout to either a bank account or debit card of a <a
+ * href="/docs/connect/bank-debit-card-payouts">connected Stripe account</a>. You
+ * can retrieve individual payouts, as well as list all payouts. Payouts are made
+ * on <a href="/docs/connect/manage-payout-schedule">varying schedules</a>,
+ * depending on your country and industry.
+ *
+ * Related guide: <a href="https://stripe.com/docs/payouts">Receiving Payouts</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in %s) to be transferred to your bank account or debit card.
+ * @property int $arrival_date Date the payout is expected to arrive in the bank. This factors in delays like weekends or bank holidays.
+ * @property bool $automatic Returns <code>true</code> if the payout was created by an <a href="https://stripe.com/docs/payouts#payout-schedule">automated payout schedule</a>, and <code>false</code> if it was <a href="https://stripe.com/docs/payouts#manual-payouts">requested manually</a>.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the balance transaction that describes the impact of this payout on your account balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\BankAccount|\Stripe\Card $destination ID of the bank account or card the payout was sent to.
+ * @property null|string|\Stripe\BalanceTransaction $failure_balance_transaction If the payout failed or was canceled, this will be the ID of the balance transaction that reversed the initial balance transaction, and puts the funds from the failed payout back in your balance.
+ * @property null|string $failure_code Error code explaining reason for payout failure if available. See <a href="https://stripe.com/docs/api#payout_failures">Types of payout failures</a> for a list of failure codes.
+ * @property null|string $failure_message Message to user further explaining reason for payout failure if available.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $method The method used to send this payout, which can be <code>standard</code> or <code>instant</code>. <code>instant</code> is only supported for payouts to debit cards. (See <a href="https://stripe.com/blog/instant-payouts-for-marketplaces">Instant payouts for marketplaces</a> for more information.)
+ * @property null|string|\Stripe\Payout $original_payout If the payout reverses another, this is the ID of the original payout.
+ * @property null|string|\Stripe\Payout $reversed_by If the payout was reversed, this is the ID of the payout that reverses this payout.
+ * @property string $source_type The source balance this payout came from. One of <code>card</code>, <code>fpx</code>, or <code>bank_account</code>.
+ * @property null|string $statement_descriptor Extra information about a payout to be displayed on the user's bank statement.
+ * @property string $status Current status of the payout: <code>paid</code>, <code>pending</code>, <code>in_transit</code>, <code>canceled</code> or <code>failed</code>. A payout is <code>pending</code> until it is submitted to the bank, when it becomes <code>in_transit</code>. The status then changes to <code>paid</code> if the transaction goes through, or to <code>failed</code> or <code>canceled</code> (within 5 business days). Some failed payouts may initially show as <code>paid</code> but then change to <code>failed</code>.
+ * @property string $type Can be <code>bank_account</code> or <code>card</code>.
+ */
+class Payout extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'payout';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const FAILURE_ACCOUNT_CLOSED = 'account_closed';
+	const FAILURE_ACCOUNT_FROZEN = 'account_frozen';
+	const FAILURE_BANK_ACCOUNT_RESTRICTED = 'bank_account_restricted';
+	const FAILURE_BANK_OWNERSHIP_CHANGED = 'bank_ownership_changed';
+	const FAILURE_COULD_NOT_PROCESS = 'could_not_process';
+	const FAILURE_DEBIT_NOT_AUTHORIZED = 'debit_not_authorized';
+	const FAILURE_DECLINED = 'declined';
+	const FAILURE_INCORRECT_ACCOUNT_HOLDER_ADDRESS = 'incorrect_account_holder_address';
+	const FAILURE_INCORRECT_ACCOUNT_HOLDER_NAME = 'incorrect_account_holder_name';
+	const FAILURE_INCORRECT_ACCOUNT_HOLDER_TAX_ID = 'incorrect_account_holder_tax_id';
+	const FAILURE_INSUFFICIENT_FUNDS = 'insufficient_funds';
+	const FAILURE_INVALID_ACCOUNT_NUMBER = 'invalid_account_number';
+	const FAILURE_INVALID_CURRENCY = 'invalid_currency';
+	const FAILURE_NO_ACCOUNT = 'no_account';
+	const FAILURE_UNSUPPORTED_CARD = 'unsupported_card';
+	const METHOD_INSTANT = 'instant';
+	const METHOD_STANDARD = 'standard';
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_IN_TRANSIT = 'in_transit';
+	const STATUS_PAID = 'paid';
+	const STATUS_PENDING = 'pending';
+	const TYPE_BANK_ACCOUNT = 'bank_account';
+	const TYPE_CARD = 'card';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout the canceled payout
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout the reversed payout
+	 */
+	public function reverse($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * This is an object representing a person associated with a Stripe account.
+ *
+ * A platform cannot access a Standard or Express account's persons after the
+ * account starts onboarding, such as after generating an account link for the
+ * account. See the <a
+ * href="https://stripe.com/docs/connect/standard-accounts">Standard onboarding</a>
+ * or <a href="https://stripe.com/docs/connect/express-accounts">Express onboarding
+ * documentation</a> for information about platform pre-filling and account
+ * onboarding steps.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/identity-verification-api#person-information">Handling
+ * Identity Verification with the API</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $account The account the person is associated with.
+ * @property null|\Stripe\StripeObject $address
+ * @property null|\Stripe\StripeObject $address_kana The Kana variation of the person's address (Japan only).
+ * @property null|\Stripe\StripeObject $address_kanji The Kanji variation of the person's address (Japan only).
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $dob
+ * @property null|string $email The person's email address.
+ * @property null|string $first_name The person's first name.
+ * @property null|string $first_name_kana The Kana variation of the person's first name (Japan only).
+ * @property null|string $first_name_kanji The Kanji variation of the person's first name (Japan only).
+ * @property null|string[] $full_name_aliases A list of alternate names or aliases that the person is known by.
+ * @property null|\Stripe\StripeObject $future_requirements Information about the upcoming new requirements for this person, including what information needs to be collected, and by when.
+ * @property null|string $gender The person's gender (International regulations require either &quot;male&quot; or &quot;female&quot;).
+ * @property null|bool $id_number_provided Whether the person's <code>id_number</code> was provided.
+ * @property null|bool $id_number_secondary_provided Whether the person's <code>id_number_secondary</code> was provided.
+ * @property null|string $last_name The person's last name.
+ * @property null|string $last_name_kana The Kana variation of the person's last name (Japan only).
+ * @property null|string $last_name_kanji The Kanji variation of the person's last name (Japan only).
+ * @property null|string $maiden_name The person's maiden name.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $nationality The country where the person is a national.
+ * @property null|string $phone The person's phone number.
+ * @property null|string $political_exposure Indicates if the person or any of their representatives, family members, or other closely related persons, declares that they hold or have held an important public job or function, in any jurisdiction.
+ * @property null|\Stripe\StripeObject $registered_address
+ * @property null|\Stripe\StripeObject $relationship
+ * @property null|\Stripe\StripeObject $requirements Information about the requirements for this person, including what information needs to be collected, and by when.
+ * @property null|bool $ssn_last_4_provided Whether the last four digits of the person's Social Security number have been provided (U.S. only).
+ * @property null|\Stripe\StripeObject $verification
+ */
+class Person extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'person';
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Update;
+	const GENDER_FEMALE = 'female';
+	const GENDER_MALE = 'male';
+	const POLITICAL_EXPOSURE_EXISTING = 'existing';
+	const POLITICAL_EXPOSURE_NONE = 'none';
+	const VERIFICATION_STATUS_PENDING = 'pending';
+	const VERIFICATION_STATUS_UNVERIFIED = 'unverified';
+	const VERIFICATION_STATUS_VERIFIED = 'verified';
+	/**
+	 * @return string the API URL for this Stripe account reversal
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+	/**
+	 * @param string $_id
+	 * @param null|array $_params
+	 * @param null|array|string $_options
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function update($_id, $_params = null, $_options = null)
+	{
+	}
+}
+/**
+ * You can now model subscriptions more flexibly using the <a
+ * href="https://stripe.com/docs/api#prices">Prices API</a>. It replaces the Plans
+ * API and is backwards compatible to simplify your migration.
+ *
+ * Plans define the base price, currency, and billing cycle for recurring purchases
+ * of products. <a href="https://stripe.com/docs/api#products">Products</a> help
+ * you track inventory or provisioning, and plans help you track pricing. Different
+ * physical goods or levels of service should be represented by products, and
+ * pricing options should be represented by plans. This approach lets you change
+ * prices without having to change your provisioning scheme.
+ *
+ * For example, you might have a single &quot;gold&quot; product that has plans for
+ * $10/month, $100/year, €9/month, and €90/year.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up
+ * a subscription</a> and more about <a
+ * href="https://stripe.com/docs/products-prices/overview">products and prices</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the plan can be used for new purchases.
+ * @property null|string $aggregate_usage Specifies a usage aggregation strategy for plans of <code>usage_type=metered</code>. Allowed values are <code>sum</code> for summing up all usage during a period, <code>last_during_period</code> for using the last usage record reported within a period, <code>last_ever</code> for using the last usage record ever (across period bounds) or <code>max</code> which uses the usage record with the maximum reported usage during a period. Defaults to <code>sum</code>.
+ * @property null|int $amount The unit amount in %s to be charged, represented as a whole integer if possible. Only set if <code>billing_scheme=per_unit</code>.
+ * @property null|string $amount_decimal The unit amount in %s to be charged, represented as a decimal string with at most 12 decimal places. Only set if <code>billing_scheme=per_unit</code>.
+ * @property string $billing_scheme Describes how to compute the price per period. Either <code>per_unit</code> or <code>tiered</code>. <code>per_unit</code> indicates that the fixed amount (specified in <code>amount</code>) will be charged per unit in <code>quantity</code> (for plans with <code>usage_type=licensed</code>), or per unit of total usage (for plans with <code>usage_type=metered</code>). <code>tiered</code> indicates that the unit pricing will be computed using a tiering strategy as defined using the <code>tiers</code> and <code>tiers_mode</code> attributes.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $interval The frequency at which a subscription is billed. One of <code>day</code>, <code>week</code>, <code>month</code> or <code>year</code>.
+ * @property int $interval_count The number of intervals (specified in the <code>interval</code> attribute) between subscription billings. For example, <code>interval=month</code> and <code>interval_count=3</code> bills every 3 months.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $nickname A brief description of the plan, hidden from customers.
+ * @property null|string|\Stripe\Product $product The product whose pricing this plan determines.
+ * @property null|\Stripe\StripeObject[] $tiers Each element represents a pricing tier. This parameter requires <code>billing_scheme</code> to be set to <code>tiered</code>. See also the documentation for <code>billing_scheme</code>.
+ * @property null|string $tiers_mode Defines if the tiering price should be <code>graduated</code> or <code>volume</code> based. In <code>volume</code>-based tiering, the maximum quantity within a period determines the per unit price. In <code>graduated</code> tiering, pricing can change as the quantity grows.
+ * @property null|\Stripe\StripeObject $transform_usage Apply a transformation to the reported usage or set quantity before computing the amount billed. Cannot be combined with <code>tiers</code>.
+ * @property null|int $trial_period_days Default number of trial days when subscribing a customer to this plan using <a href="https://stripe.com/docs/api#create_subscription-trial_from_plan"><code>trial_from_plan=true</code></a>.
+ * @property string $usage_type Configures how the quantity per period should be determined. Can be either <code>metered</code> or <code>licensed</code>. <code>licensed</code> automatically bills the <code>quantity</code> set when adding it to a subscription. <code>metered</code> aggregates the total usage based on usage records. Defaults to <code>licensed</code>.
+ */
+class Plan extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'plan';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * Prices define the unit cost, currency, and (optional) billing cycle for both
+ * recurring and one-time purchases of products. <a
+ * href="https://stripe.com/docs/api#products">Products</a> help you track
+ * inventory or provisioning, and prices help you track payment terms. Different
+ * physical goods or levels of service should be represented by products, and
+ * pricing options should be represented by prices. This approach lets you change
+ * prices without having to change your provisioning scheme.
+ *
+ * For example, you might have a single &quot;gold&quot; product that has prices
+ * for $10/month, $100/year, and €9 once.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up
+ * a subscription</a>, <a
+ * href="https://stripe.com/docs/billing/invoices/create">create an invoice</a>,
+ * and more about <a
+ * href="https://stripe.com/docs/products-prices/overview">products and prices</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the price can be used for new purchases.
+ * @property string $billing_scheme Describes how to compute the price per period. Either <code>per_unit</code> or <code>tiered</code>. <code>per_unit</code> indicates that the fixed amount (specified in <code>unit_amount</code> or <code>unit_amount_decimal</code>) will be charged per unit in <code>quantity</code> (for prices with <code>usage_type=licensed</code>), or per unit of total usage (for prices with <code>usage_type=metered</code>). <code>tiered</code> indicates that the unit pricing will be computed using a tiering strategy as defined using the <code>tiers</code> and <code>tiers_mode</code> attributes.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|\Stripe\StripeObject $currency_options Prices defined in each available currency option. Each key must be a three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a> and a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|\Stripe\StripeObject $custom_unit_amount When set, provides configuration for the amount to be adjusted by the customer during Checkout Sessions and Payment Links.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $lookup_key A lookup key used to retrieve prices dynamically from a static string. This may be up to 200 characters.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $nickname A brief description of the price, hidden from customers.
+ * @property string|\Stripe\Product $product The ID of the product this price is associated with.
+ * @property null|\Stripe\StripeObject $recurring The recurring components of a price such as <code>interval</code> and <code>usage_type</code>.
+ * @property null|string $tax_behavior Specifies whether the price is considered inclusive of taxes or exclusive of taxes. One of <code>inclusive</code>, <code>exclusive</code>, or <code>unspecified</code>. Once specified as either <code>inclusive</code> or <code>exclusive</code>, it cannot be changed.
+ * @property null|\Stripe\StripeObject[] $tiers Each element represents a pricing tier. This parameter requires <code>billing_scheme</code> to be set to <code>tiered</code>. See also the documentation for <code>billing_scheme</code>.
+ * @property null|string $tiers_mode Defines if the tiering price should be <code>graduated</code> or <code>volume</code> based. In <code>volume</code>-based tiering, the maximum quantity within a period determines the per unit price. In <code>graduated</code> tiering, pricing can change as the quantity grows.
+ * @property null|\Stripe\StripeObject $transform_quantity Apply a transformation to the reported usage or set quantity before computing the amount billed. Cannot be combined with <code>tiers</code>.
+ * @property string $type One of <code>one_time</code> or <code>recurring</code> depending on whether the price is for a one-time purchase or a recurring (subscription) purchase.
+ * @property null|int $unit_amount The unit amount in %s to be charged, represented as a whole integer if possible. Only set if <code>billing_scheme=per_unit</code>.
+ * @property null|string $unit_amount_decimal The unit amount in %s to be charged, represented as a decimal string with at most 12 decimal places. Only set if <code>billing_scheme=per_unit</code>.
+ */
+class Price extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'price';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const BILLING_SCHEME_PER_UNIT = 'per_unit';
+	const BILLING_SCHEME_TIERED = 'tiered';
+	const TAX_BEHAVIOR_EXCLUSIVE = 'exclusive';
+	const TAX_BEHAVIOR_INCLUSIVE = 'inclusive';
+	const TAX_BEHAVIOR_UNSPECIFIED = 'unspecified';
+	const TIERS_MODE_GRADUATED = 'graduated';
+	const TIERS_MODE_VOLUME = 'volume';
+	const TYPE_ONE_TIME = 'one_time';
+	const TYPE_RECURRING = 'recurring';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<Price> the price search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Products describe the specific goods or services you offer to your customers.
+ * For example, you might offer a Standard and Premium version of your goods or
+ * service; each version would be a separate Product. They can be used in
+ * conjunction with <a href="https://stripe.com/docs/api#prices">Prices</a> to
+ * configure pricing in Payment Links, Checkout, and Subscriptions.
+ *
+ * Related guides: <a
+ * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up
+ * a subscription</a>, <a
+ * href="https://stripe.com/docs/payments/payment-links/overview">share a Payment
+ * Link</a>, <a
+ * href="https://stripe.com/docs/payments/accept-a-payment#create-product-prices-upfront">accept
+ * payments with Checkout</a>, and more about <a
+ * href="https://stripe.com/docs/products-prices/overview">Products and Prices</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the product is currently available for purchase.
+ * @property null|string[] $attributes A list of up to 5 attributes that each SKU can provide values for (e.g., <code>[&quot;color&quot;, &quot;size&quot;]</code>).
+ * @property null|string $caption A short one-line description of the product, meant to be displayable to the customer. Only applicable to products of <code>type=good</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string[] $deactivate_on An array of connect application identifiers that cannot purchase this product. Only applicable to products of <code>type=good</code>.
+ * @property null|string|\Stripe\Price $default_price The ID of the <a href="https://stripe.com/docs/api/prices">Price</a> object that is the default price for this product.
+ * @property null|string $description The product's description, meant to be displayable to the customer. Use this field to optionally store a long form explanation of the product being sold for your own rendering purposes.
+ * @property string[] $images A list of up to 8 URLs of images for this product, meant to be displayable to the customer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $name The product's name, meant to be displayable to the customer.
+ * @property null|\Stripe\StripeObject $package_dimensions The dimensions of this product for shipping purposes.
+ * @property null|bool $shippable Whether this product is shipped (i.e., physical goods).
+ * @property null|string $statement_descriptor Extra information about a product which will appear on your customer's credit card statement. In the case that multiple products are billed at once, the first statement descriptor will be used.
+ * @property null|string|\Stripe\TaxCode $tax_code A <a href="https://stripe.com/docs/tax/tax-categories">tax code</a> ID.
+ * @property string $type The type of the product. The product is either of type <code>good</code>, which is eligible for use with Orders and SKUs, or <code>service</code>, which is eligible for use with Subscriptions and Plans.
+ * @property null|string $unit_label A label that represents units of this product. When set, this will be included in customers' receipts, invoices, Checkout, and the customer portal.
+ * @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch.
+ * @property null|string $url A URL of a publicly-accessible webpage for this product.
+ */
+class Product extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'product';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const TYPE_GOOD = 'good';
+	const TYPE_SERVICE = 'service';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<Product> the product search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * A Promotion Code represents a customer-redeemable code for a <a
+ * href="https://stripe.com/docs/api#coupons">coupon</a>. It can be used to create
+ * multiple codes for a single coupon.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the promotion code is currently active. A promotion code is only active if the coupon is also valid.
+ * @property string $code The customer-facing code. Regardless of case, this code must be unique across all active promotion codes for each customer.
+ * @property \Stripe\Coupon $coupon A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer. Coupons may be applied to <a href="https://stripe.com/docs/api#subscriptions">subscriptions</a>, <a href="https://stripe.com/docs/api#invoices">invoices</a>, <a href="https://stripe.com/docs/api/checkout/sessions">checkout sessions</a>, <a href="https://stripe.com/docs/api#quotes">quotes</a>, and more. Coupons do not work with conventional one-off <a href="https://stripe.com/docs/api#create_charge">charges</a> or <a href="https://stripe.com/docs/api/payment_intents">payment intents</a>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer The customer that this promotion code can be used by.
+ * @property null|int $expires_at Date at which the promotion code can no longer be redeemed.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|int $max_redemptions Maximum number of times this promotion code can be redeemed.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject $restrictions
+ * @property int $times_redeemed Number of times this promotion code has been used.
+ */
+class PromotionCode extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'promotion_code';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * A Quote is a way to model prices that you'd like to provide to a customer. Once
+ * accepted, it will automatically create an invoice, subscription or subscription
+ * schedule.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount_subtotal Total before any discounts or taxes are applied.
+ * @property int $amount_total Total after discounts and taxes are applied.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the quote.
+ * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. Only applicable if there are no line items with recurring prices on the quote.
+ * @property null|float $application_fee_percent A non-negative decimal between 0 and 100, with at most two decimal places. This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account. Only applicable if there are line items with recurring prices on the quote.
+ * @property \Stripe\StripeObject $automatic_tax
+ * @property string $collection_method Either <code>charge_automatically</code>, or <code>send_invoice</code>. When charging automatically, Stripe will attempt to pay invoices at the end of the subscription cycle or on finalization using the default payment method attached to the subscription or customer. When sending an invoice, Stripe will email your customer an invoice with payment instructions and mark the subscription as <code>active</code>. Defaults to <code>charge_automatically</code>.
+ * @property \Stripe\StripeObject $computed
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Customer $customer The customer which this quote belongs to. A customer is required before finalizing the quote. Once specified, it cannot be changed.
+ * @property null|(string|\Stripe\TaxRate)[] $default_tax_rates The tax rates applied to this quote.
+ * @property null|string $description A description that will be displayed on the quote PDF.
+ * @property (string|\Stripe\Discount)[] $discounts The discounts applied to this quote.
+ * @property int $expires_at The date on which the quote will be canceled if in <code>open</code> or <code>draft</code> status. Measured in seconds since the Unix epoch.
+ * @property null|string $footer A footer that will be displayed on the quote PDF.
+ * @property null|\Stripe\StripeObject $from_quote Details of the quote that was cloned. See the <a href="https://stripe.com/docs/quotes/clone">cloning documentation</a> for more details.
+ * @property null|string $header A header that will be displayed on the quote PDF.
+ * @property null|string|\Stripe\Invoice $invoice The invoice that was created from this quote.
+ * @property null|\Stripe\StripeObject $invoice_settings All invoices will be billed using the specified settings.
+ * @property null|\Stripe\Collection<\Stripe\LineItem> $line_items A list of items the customer is being quoted for.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $number A unique number that identifies this particular quote. This number is assigned once the quote is <a href="https://stripe.com/docs/quotes/overview#finalize">finalized</a>.
+ * @property null|string|\Stripe\Account $on_behalf_of The account on behalf of which to charge. See the <a href="https://support.stripe.com/questions/sending-invoices-on-behalf-of-connected-accounts">Connect documentation</a> for details.
+ * @property string $status The status of the quote.
+ * @property \Stripe\StripeObject $status_transitions
+ * @property null|string|\Stripe\Subscription $subscription The subscription that was created or updated from this quote.
+ * @property \Stripe\StripeObject $subscription_data
+ * @property null|string|\Stripe\SubscriptionSchedule $subscription_schedule The subscription schedule that was created or updated from this quote.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this quote belongs to.
+ * @property \Stripe\StripeObject $total_details
+ * @property null|\Stripe\StripeObject $transfer_data The account (if any) the payments will be attributed to for tax reporting, and where funds from each payment will be transferred to for each of the invoices.
+ */
+class Quote extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'quote';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const COLLECTION_METHOD_CHARGE_AUTOMATICALLY = 'charge_automatically';
+	const COLLECTION_METHOD_SEND_INVOICE = 'send_invoice';
+	const STATUS_ACCEPTED = 'accepted';
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_DRAFT = 'draft';
+	const STATUS_OPEN = 'open';
+	/**
+	 * @param callable $readBodyChunkCallable
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 */
+	public function pdf($readBodyChunkCallable, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote the accepted quote
+	 */
+	public function accept($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote the canceled quote
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote the finalized quote
+	 */
+	public function finalizeQuote($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem> list of LineItems
+	 */
+	public static function allComputedUpfrontLineItems($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem> list of LineItems
+	 */
+	public static function allLineItems($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Radar;
+
+/**
+ * An early fraud warning indicates that the card issuer has notified us that a
+ * charge may be fraudulent.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/disputes/measuring#early-fraud-warnings">Early
+ * Fraud Warnings</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $actionable An EFW is actionable if it has not received a dispute and has not been fully refunded. You may wish to proactively refund a charge that receives an EFW, in order to avoid receiving a dispute later.
+ * @property string|\Stripe\Charge $charge ID of the charge this early fraud warning is for, optionally expanded.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $fraud_type The type of fraud labelled by the issuer. One of <code>card_never_received</code>, <code>fraudulent_card_application</code>, <code>made_with_counterfeit_card</code>, <code>made_with_lost_card</code>, <code>made_with_stolen_card</code>, <code>misc</code>, <code>unauthorized_use_of_card</code>.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the Payment Intent this early fraud warning is for, optionally expanded.
+ */
+class EarlyFraudWarning extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'radar.early_fraud_warning';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const FRAUD_TYPE_CARD_NEVER_RECEIVED = 'card_never_received';
+	const FRAUD_TYPE_FRAUDULENT_CARD_APPLICATION = 'fraudulent_card_application';
+	const FRAUD_TYPE_MADE_WITH_COUNTERFEIT_CARD = 'made_with_counterfeit_card';
+	const FRAUD_TYPE_MADE_WITH_LOST_CARD = 'made_with_lost_card';
+	const FRAUD_TYPE_MADE_WITH_STOLEN_CARD = 'made_with_stolen_card';
+	const FRAUD_TYPE_MISC = 'misc';
+	const FRAUD_TYPE_UNAUTHORIZED_USE_OF_CARD = 'unauthorized_use_of_card';
+}
+/**
+ * Value lists allow you to group values together which can then be referenced in
+ * rules.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/radar/lists#managing-list-items">Default Stripe
+ * Lists</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $alias The name of the value list for use in rules.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $created_by The name or email address of the user who created this value list.
+ * @property string $item_type The type of items in the value list. One of <code>card_fingerprint</code>, <code>card_bin</code>, <code>email</code>, <code>ip_address</code>, <code>country</code>, <code>string</code>, <code>case_sensitive_string</code>, or <code>customer_id</code>.
+ * @property \Stripe\Collection<\Stripe\Radar\ValueListItem> $list_items List of items contained within this value list.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $name The name of the value list.
+ */
+class ValueList extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'radar.value_list';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * Value list items allow you to add specific values to a given Radar value list,
+ * which can then be used in rules.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/radar/lists#managing-list-items">Managing List
+ * Items</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $created_by The name or email address of the user who added this item to the value list.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $value The value of the item.
+ * @property string $value_list The identifier of the value list this item belongs to.
+ */
+class ValueListItem extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'radar.value_list_item';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+}
+namespace Stripe;
+
+/**
+ * Class RecipientTransfer.
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property int $amount_reversed
+ * @property string $balance_transaction
+ * @property string $bank_account
+ * @property string $card
+ * @property int $created
+ * @property string $currency
+ * @property int $date
+ * @property string $description
+ * @property string $destination
+ * @property string $failure_code
+ * @property string $failure_message
+ * @property bool $livemode
+ * @property \Stripe\StripeObject $metadata
+ * @property string $method
+ * @property string $recipient
+ * @property \Stripe\Collection $reversals
+ * @property bool $reversed
+ * @property string $source_type
+ * @property string $statement_descriptor
+ * @property string $status
+ * @property string $type
+ */
+class RecipientTransfer extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'recipient_transfer';
+}
+/**
+ * <code>Refund</code> objects allow you to refund a charge that has previously
+ * been created but not yet refunded. Funds will be refunded to the credit or debit
+ * card that was originally charged.
+ *
+ * Related guide: <a href="https://stripe.com/docs/refunds">Refunds</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount, in %s.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact on your account balance.
+ * @property null|string|\Stripe\Charge $charge ID of the charge that was refunded.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users. (Available on non-card refunds only)
+ * @property null|string|\Stripe\BalanceTransaction $failure_balance_transaction If the refund failed, this balance transaction describes the adjustment made on your account balance that reverses the initial balance transaction.
+ * @property null|string $failure_reason If the refund failed, the reason for refund failure if known. Possible values are <code>lost_or_stolen_card</code>, <code>expired_or_canceled_card</code>, <code>charge_for_pending_refund_disputed</code>, <code>insufficient_funds</code>, <code>declined</code>, <code>merchant_request</code> or <code>unknown</code>.
+ * @property null|string $instructions_email Email to which refund instructions, if required, are sent to.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $next_action
+ * @property null|string|\Stripe\PaymentIntent $payment_intent ID of the PaymentIntent that was refunded.
+ * @property null|string $reason Reason for the refund, either user-provided (<code>duplicate</code>, <code>fraudulent</code>, or <code>requested_by_customer</code>) or generated by Stripe internally (<code>expired_uncaptured_charge</code>).
+ * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this refund.
+ * @property null|string|\Stripe\TransferReversal $source_transfer_reversal The transfer reversal that is associated with the refund. Only present if the charge came from another Stripe account. See the Connect documentation for details.
+ * @property null|string $status Status of the refund. For credit card refunds, this can be <code>pending</code>, <code>succeeded</code>, or <code>failed</code>. For other types of refunds, it can be <code>pending</code>, <code>requires_action</code>, <code>succeeded</code>, <code>failed</code>, or <code>canceled</code>. Refer to our <a href="https://stripe.com/docs/refunds#failed-refunds">refunds</a> documentation for more details.
+ * @property null|string|\Stripe\TransferReversal $transfer_reversal If the accompanying transfer was reversed, the transfer reversal object. Only applicable if the charge was created using the destination parameter.
+ */
+class Refund extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'refund';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const FAILURE_REASON_EXPIRED_OR_CANCELED_CARD = 'expired_or_canceled_card';
+	const FAILURE_REASON_LOST_OR_STOLEN_CARD = 'lost_or_stolen_card';
+	const FAILURE_REASON_UNKNOWN = 'unknown';
+	const REASON_DUPLICATE = 'duplicate';
+	const REASON_EXPIRED_UNCAPTURED_CHARGE = 'expired_uncaptured_charge';
+	const REASON_FRAUDULENT = 'fraudulent';
+	const REASON_REQUESTED_BY_CUSTOMER = 'requested_by_customer';
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_PENDING = 'pending';
+	const STATUS_REQUIRES_ACTION = 'requires_action';
+	const STATUS_SUCCEEDED = 'succeeded';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Refund the canceled refund
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Reporting;
+
+/**
+ * The Report Run object represents an instance of a report type generated with
+ * specific run parameters. Once the object is created, Stripe begins processing
+ * the report. When the report has finished running, it will give you a reference
+ * to a file where you can retrieve your results. For an overview, see <a
+ * href="https://stripe.com/docs/reporting/statements/api">API Access to
+ * Reports</a>.
+ *
+ * Note that certain report types can only be run based on your live-mode data (not
+ * test-mode data), and will error when queried without a <a
+ * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $error If something should go wrong during the run, a message about the failure (populated when <code>status=failed</code>).
+ * @property bool $livemode <code>true</code> if the report is run on live mode data and <code>false</code> if it is run on test mode data.
+ * @property \Stripe\StripeObject $parameters
+ * @property string $report_type The ID of the <a href="https://stripe.com/docs/reports/report-types">report type</a> to run, such as <code>&quot;balance.summary.1&quot;</code>.
+ * @property null|\Stripe\File $result The file object representing the result of the report run (populated when <code>status=succeeded</code>).
+ * @property string $status Status of this report run. This will be <code>pending</code> when the run is initially created. When the run finishes, this will be set to <code>succeeded</code> and the <code>result</code> field will be populated. Rarely, we may encounter an error, at which point this will be set to <code>failed</code> and the <code>error</code> field will be populated.
+ * @property null|int $succeeded_at Timestamp at which this run successfully finished (populated when <code>status=succeeded</code>). Measured in seconds since the Unix epoch.
+ */
+class ReportRun extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'reporting.report_run';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+}
+/**
+ * The Report Type resource corresponds to a particular type of report, such as the
+ * &quot;Activity summary&quot; or &quot;Itemized payouts&quot; reports. These
+ * objects are identified by an ID belonging to a set of enumerated values. See <a
+ * href="https://stripe.com/docs/reporting/statements/api">API Access to Reports
+ * documentation</a> for those Report Type IDs, along with required and optional
+ * parameters.
+ *
+ * Note that certain report types can only be run based on your live-mode data (not
+ * test-mode data), and will error when queried without a <a
+ * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.
+ *
+ * @property string $id The <a href="https://stripe.com/docs/reporting/statements/api#available-report-types">ID of the Report Type</a>, such as <code>balance.summary.1</code>.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $data_available_end Most recent time for which this Report Type is available. Measured in seconds since the Unix epoch.
+ * @property int $data_available_start Earliest time for which this Report Type is available. Measured in seconds since the Unix epoch.
+ * @property null|string[] $default_columns List of column names that are included by default when this Report Type gets run. (If the Report Type doesn't support the <code>columns</code> parameter, this will be null.)
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $name Human-readable name of the Report Type
+ * @property int $updated When this Report Type was latest updated. Measured in seconds since the Unix epoch.
+ * @property int $version Version of the Report Type. Different versions report with the same ID will have the same purpose, but may take different run parameters or have different result schemas.
+ */
+class ReportType extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'reporting.report_type';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+}
+namespace Stripe;
+
+/**
+ * Class RequestTelemetry.
+ *
+ * Tracks client request telemetry
+ */
+class RequestTelemetry
+{
+	public $requestId;
+	public $requestDuration;
+	/**
+	 * Initialize a new telemetry object.
+	 *
+	 * @param string $requestId the request's request ID
+	 * @param int $requestDuration the request's duration in milliseconds
+	 */
+	public function __construct($requestId, $requestDuration)
+	{
+	}
+}
+/**
+ * Reviews can be used to supplement automated fraud detection with human
+ * expertise.
+ *
+ * Learn more about <a href="/radar">Radar</a> and reviewing payments <a
+ * href="https://stripe.com/docs/radar/reviews">here</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $billing_zip The ZIP or postal code of the card used, if applicable.
+ * @property null|string|\Stripe\Charge $charge The charge associated with this review.
+ * @property null|string $closed_reason The reason the review was closed, or null if it has not yet been closed. One of <code>approved</code>, <code>refunded</code>, <code>refunded_as_fraud</code>, <code>disputed</code>, or <code>redacted</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $ip_address The IP address where the payment originated.
+ * @property null|\Stripe\StripeObject $ip_address_location Information related to the location of the payment. Note that this information is an approximation and attempts to locate the nearest population center - it should not be used to determine a specific address.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property bool $open If <code>true</code>, the review needs action.
+ * @property string $opened_reason The reason the review was opened. One of <code>rule</code> or <code>manual</code>.
+ * @property null|string|\Stripe\PaymentIntent $payment_intent The PaymentIntent ID associated with this review, if one exists.
+ * @property string $reason The reason the review is currently open or closed. One of <code>rule</code>, <code>manual</code>, <code>approved</code>, <code>refunded</code>, <code>refunded_as_fraud</code>, <code>disputed</code>, or <code>redacted</code>.
+ * @property null|\Stripe\StripeObject $session Information related to the browsing session of the user who initiated the payment.
+ */
+class Review extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'review';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	/**
+	 * Possible string representations of the current, the opening or the closure reason of the review.
+	 * Not all of these enumeration apply to all of the ´reason´ fields. Please consult the Review object to
+	 * determine where these are apply.
+	 *
+	 * @see https://stripe.com/docs/api/radar/reviews/object
+	 */
+	const REASON_APPROVED = 'approved';
+	const REASON_DISPUTED = 'disputed';
+	const REASON_MANUAL = 'manual';
+	const REASON_REFUNDED = 'refunded';
+	const REASON_REFUNDED_AS_FRAUD = 'refunded_as_fraud';
+	const REASON_RULE = 'rule';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Review the approved review
+	 */
+	public function approve($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Search results for an API resource.
+ *
+ * This behaves similarly to <code>Collection</code> in that they both wrap
+ * around a list of objects and provide pagination. However the
+ * <code>SearchResult</code> object paginates by relying on a
+ * <code>next_page</code> token included in the response rather than using
+ * object IDs and a <code>starting_before</code>/<code>ending_after</code>
+ * parameter. Thus, <code>SearchResult</code> only supports forwards pagination.
+ *
+ * The {@see $total_count} property is only available when
+ * the `expand` parameter contains `total_count`.
+ *
+ * @template TStripeObject of StripeObject
+ * @template-implements \IteratorAggregate<TStripeObject>
+ *
+ * @property string $object
+ * @property string $url
+ * @property string $next_page
+ * @property int $total_count
+ * @property bool $has_more
+ * @property TStripeObject[] $data
+ */
+class SearchResult extends \Stripe\StripeObject implements \Countable, \IteratorAggregate
+{
+	const OBJECT_NAME = 'search_result';
+	use \Stripe\ApiOperations\Request;
+	/** @var array */
+	protected $filters = [];
+	/**
+	 * @return string the base URL for the given class
+	 */
+	public static function baseUrl()
+	{
+	}
+	/**
+	 * Returns the filters.
+	 *
+	 * @return array the filters
+	 */
+	public function getFilters()
+	{
+	}
+	/**
+	 * Sets the filters, removing paging options.
+	 *
+	 * @param array $filters the filters
+	 */
+	public function setFilters($filters)
+	{
+	}
+	/**
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetGet($k)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws Exception\ApiErrorException
+	 *
+	 * @return SearchResult<TStripeObject>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @return int the number of objects in the current page
+	 */
+	#[\ReturnTypeWillChange]
+	public function count()
+	{
+	}
+	/**
+	 * @return \ArrayIterator an iterator that can be used to iterate
+	 *    across objects in the current page
+	 */
+	#[\ReturnTypeWillChange]
+	public function getIterator()
+	{
+	}
+	/**
+	 * @return \Generator|TStripeObject[] A generator that can be used to
+	 *    iterate across all objects across all pages. As page boundaries are
+	 *    encountered, the next page will be fetched automatically for
+	 *    continued iteration.
+	 */
+	public function autoPagingIterator()
+	{
+	}
+	/**
+	 * Returns an empty set of search results. This is returned from
+	 * {@see nextPage()} when we know that there isn't a next page in order to
+	 * replicate the behavior of the API when it attempts to return a page
+	 * beyond the last.
+	 *
+	 * @param null|array|string $opts
+	 *
+	 * @return SearchResult
+	 */
+	public static function emptySearchResult($opts = null)
+	{
+	}
+	/**
+	 * Returns true if the page object contains no element.
+	 *
+	 * @return bool
+	 */
+	public function isEmpty()
+	{
+	}
+	/**
+	 * Fetches the next page in the resource list (if there is one).
+	 *
+	 * This method will try to respect the limit of the current page. If none
+	 * was given, the default limit will be fetched again.
+	 *
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @return SearchResult<TStripeObject>
+	 */
+	public function nextPage($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Gets the first item from the current page. Returns `null` if the current page is empty.
+	 *
+	 * @return null|TStripeObject
+	 */
+	public function first()
+	{
+	}
+	/**
+	 * Gets the last item from the current page. Returns `null` if the current page is empty.
+	 *
+	 * @return null|TStripeObject
+	 */
+	public function last()
+	{
+	}
+}
+namespace Stripe\Service;
+
+/**
+ * Abstract base class for all services.
+ */
+abstract class AbstractService
+{
+	/**
+	 * @var \Stripe\StripeClientInterface
+	 */
+	protected $client;
+	/**
+	 * @var \Stripe\StripeStreamingClientInterface
+	 */
+	protected $streamingClient;
+	/**
+	 * Initializes a new instance of the {@link AbstractService} class.
+	 *
+	 * @param \Stripe\StripeClientInterface $client
+	 */
+	public function __construct($client)
+	{
+	}
+	/**
+	 * Gets the client used by this service to send requests.
+	 *
+	 * @return \Stripe\StripeClientInterface
+	 */
+	public function getClient()
+	{
+	}
+	/**
+	 * Gets the client used by this service to send requests.
+	 *
+	 * @return \Stripe\StripeStreamingClientInterface
+	 */
+	public function getStreamingClient()
+	{
+	}
+	protected function request($method, $path, $params, $opts)
+	{
+	}
+	protected function requestStream($method, $path, $readBodyChunkCallable, $params, $opts)
+	{
+	}
+	protected function requestCollection($method, $path, $params, $opts)
+	{
+	}
+	protected function requestSearchResult($method, $path, $params, $opts)
+	{
+	}
+	protected function buildPath($basePath, ...$ids)
+	{
+	}
+}
+/**
+ * Abstract base class for all service factories used to expose service
+ * instances through {@link \Stripe\StripeClient}.
+ *
+ * Service factories serve two purposes:
+ *
+ * 1. Expose properties for all services through the `__get()` magic method.
+ * 2. Lazily initialize each service instance the first time the property for
+ *    a given service is used.
+ */
+abstract class AbstractServiceFactory
+{
+	/**
+	 * @param \Stripe\StripeClientInterface $client
+	 */
+	public function __construct($client)
+	{
+	}
+	/**
+	 * @param string $name
+	 *
+	 * @return null|string
+	 */
+	protected abstract function getServiceClass($name);
+	/**
+	 * @param string $name
+	 *
+	 * @return null|AbstractService|AbstractServiceFactory
+	 */
+	public function __get($name)
+	{
+	}
+	/**
+	 * @param string $name
+	 *
+	 * @return null|AbstractService|AbstractServiceFactory
+	 */
+	public function getService($name)
+	{
+	}
+}
+class AccountLinkService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Creates an AccountLink object that includes a single-use Stripe URL that the
+	 * platform can redirect their user to in order to take them through the Connect
+	 * Onboarding flow.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\AccountLink
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+class AccountService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of accounts connected to your platform via <a
+	 * href="/docs/connect">Connect</a>. If you’re not a platform, the list is empty.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Account>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of capabilities associated with the account. The capabilities are
+	 * returned sorted by creation date, with the most recent capability appearing
+	 * first.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Capability>
+	 */
+	public function allCapabilities($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * List external accounts for an account.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card>
+	 */
+	public function allExternalAccounts($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of people associated with the account’s legal entity. The people
+	 * are returned sorted by creation date, with the most recent people appearing
+	 * first.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Person>
+	 */
+	public function allPersons($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * With <a href="/docs/connect">Connect</a>, you can create Stripe accounts for
+	 * your users. To do this, you’ll first need to <a
+	 * href="https://dashboard.stripe.com/account/applications/settings">register your
+	 * platform</a>.
+	 *
+	 * If you’ve already collected information for your connected accounts, you <a
+	 * href="/docs/connect/best-practices#onboarding">can pre-fill that information</a>
+	 * when creating the account. Connect Onboarding won’t ask for the pre-filled
+	 * information during account onboarding. You can pre-fill any information on the
+	 * account.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Create an external account for a given account.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public function createExternalAccount($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a single-use login link for an Express account to access their Stripe
+	 * dashboard.
+	 *
+	 * <strong>You may only create login links for <a
+	 * href="/docs/connect/express-accounts">Express accounts</a> connected to your
+	 * platform</strong>.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\LoginLink
+	 */
+	public function createLoginLink($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new person.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public function createPerson($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * With <a href="/docs/connect">Connect</a>, you can delete accounts you manage.
+	 *
+	 * Accounts created using test-mode keys can be deleted at any time. Standard
+	 * accounts created using live-mode keys cannot be deleted. Custom or Express
+	 * accounts created using live-mode keys can only be deleted once all balances are
+	 * zero.
+	 *
+	 * If you want to delete your own account, use the <a
+	 * href="https://dashboard.stripe.com/account">account information tab in your
+	 * account settings</a> instead.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Delete a specified external account for a given account.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public function deleteExternalAccount($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes an existing person’s relationship to the account’s legal entity. Any
+	 * person with a relationship for an account can be deleted through the API, except
+	 * if the person is the <code>account_opener</code>. If your integration is using
+	 * the <code>executive</code> parameter, you cannot delete the only verified
+	 * <code>executive</code> on file.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public function deletePerson($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * With <a href="/docs/connect">Connect</a>, you may flag accounts as suspicious.
+	 *
+	 * Test-mode Custom and Express accounts can be rejected at any time. Accounts
+	 * created using live-mode keys may only be rejected once all balances are zero.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account
+	 */
+	public function reject($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves information about the specified Account Capability.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Capability
+	 */
+	public function retrieveCapability($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieve a specified external account for a given account.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public function retrieveExternalAccount($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an existing person.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public function retrievePerson($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a <a href="/docs/connect/accounts">connected account</a> by setting the
+	 * values of the parameters passed. Any parameters not provided are left unchanged.
+	 *
+	 * For Custom accounts, you can update any information on the account. For other
+	 * accounts, you can update all information until that account has started to go
+	 * through Connect Onboarding. Once you create an <a
+	 * href="/docs/api/account_links">Account Link</a> for a Standard or Express
+	 * account, some parameters can no longer be changed. These are marked as
+	 * <strong>Custom Only</strong> or <strong>Custom and Express</strong> below.
+	 *
+	 * To update your own account, use the <a
+	 * href="https://dashboard.stripe.com/account">Dashboard</a>. Refer to our <a
+	 * href="/docs/connect/updating-accounts">Connect</a> documentation to learn more
+	 * about updating accounts.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing Account Capability.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Capability
+	 */
+	public function updateCapability($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the metadata, account holder name, account holder type of a bank account
+	 * belonging to a <a href="/docs/connect/custom-accounts">Custom account</a>, and
+	 * optionally sets it as the default for its currency. Other bank account details
+	 * are not editable by design.
+	 *
+	 * You can re-enable a disabled bank account by performing an update call without
+	 * providing any arguments or changes.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card
+	 */
+	public function updateExternalAccount($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing person.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Person
+	 */
+	public function updatePerson($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an account.
+	 *
+	 * @param null|string $id
+	 * @param null|array $params
+	 * @param null|array|StripeUtilRequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Account
+	 */
+	public function retrieve($id = null, $params = null, $opts = null)
+	{
+	}
+}
+class ApplePayDomainService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * List apple pay domains.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\ApplePayDomain>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Create an apple pay domain.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplePayDomain
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Delete an apple pay domain.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplePayDomain
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieve an apple pay domain.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplePayDomain
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class ApplicationFeeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of application fees you’ve previously collected. The application
+	 * fees are returned in sorted order, with the most recent fees appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\ApplicationFee>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * You can see a list of the refunds belonging to a specific application fee. Note
+	 * that the 10 most recent refunds are always available by default on the
+	 * application fee object. If you need more than those 10, you can use this API
+	 * method and the <code>limit</code> and <code>starting_after</code> parameters to
+	 * page through additional refunds.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\ApplicationFeeRefund>
+	 */
+	public function allRefunds($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Refunds an application fee that has previously been collected but not yet
+	 * refunded. Funds will be refunded to the Stripe account from which the fee was
+	 * originally collected.
+	 *
+	 * You can optionally refund only part of an application fee. You can do so
+	 * multiple times, until the entire fee has been refunded.
+	 *
+	 * Once entirely refunded, an application fee can’t be refunded again. This method
+	 * will raise an error when called on an already-refunded application fee, or when
+	 * trying to refund more money than is left on an application fee.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFeeRefund
+	 */
+	public function createRefund($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an application fee that your account has collected. The
+	 * same information is returned when refunding the application fee.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFee
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * By default, you can see the 10 most recent refunds stored directly on the
+	 * application fee object, but you can also retrieve details about a specific
+	 * refund stored on the application fee.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFeeRefund
+	 */
+	public function retrieveRefund($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified application fee refund by setting the values of the
+	 * parameters passed. Any parameters not provided will be left unchanged.
+	 *
+	 * This request only accepts metadata as an argument.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ApplicationFeeRefund
+	 */
+	public function updateRefund($parentId, $id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Apps;
+
+/**
+ * Service factory class for API resources in the Apps namespace.
+ *
+ * @property SecretService $secrets
+ */
+class AppsServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class SecretService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * List all secrets stored on the given scope.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Apps\Secret>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Create or replace a secret in the secret store.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Apps\Secret
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a secret from the secret store by name and scope.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Apps\Secret
+	 */
+	public function deleteWhere($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Finds a secret in the secret store by name and scope.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Apps\Secret
+	 */
+	public function find($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class BalanceService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Retrieves the current account balance, based on the authentication that was used
+	 * to make the request.  For a sample request, see <a
+	 * href="/docs/connect/account-balances#accounting-for-negative-balances">Accounting
+	 * for negative balances</a>.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Balance
+	 */
+	public function retrieve($params = null, $opts = null)
+	{
+	}
+}
+class BalanceTransactionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of transactions that have contributed to the Stripe account
+	 * balance (e.g., charges, transfers, and so forth). The transactions are returned
+	 * in sorted order, with the most recent transactions appearing first.
+	 *
+	 * Note that this endpoint was previously called “Balance history” and used the
+	 * path <code>/v1/balance/history</code>.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\BalanceTransaction>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the balance transaction with the given ID.
+	 *
+	 * Note that this endpoint previously used the path
+	 * <code>/v1/balance/history/:id</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BalanceTransaction
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\BillingPortal;
+
+/**
+ * Service factory class for API resources in the BillingPortal namespace.
+ *
+ * @property ConfigurationService $configurations
+ * @property SessionService $sessions
+ */
+class BillingPortalServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class ConfigurationService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of configurations that describe the functionality of the customer
+	 * portal.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\BillingPortal\Configuration>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a configuration that describes the functionality and behavior of a
+	 * PortalSession.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BillingPortal\Configuration
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a configuration that describes the functionality of the customer
+	 * portal.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BillingPortal\Configuration
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a configuration that describes the functionality of the customer portal.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BillingPortal\Configuration
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class SessionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Creates a session of the customer portal.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BillingPortal\Session
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class ChargeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of charges you’ve previously created. The charges are returned in
+	 * sorted order, with the most recent charges appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Charge>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Capture the payment of an existing, uncaptured, charge. This is the second half
+	 * of the two-step payment flow, where first you <a href="#create_charge">created a
+	 * charge</a> with the capture option set to false.
+	 *
+	 * Uncaptured payments expire a set number of days after they are created (<a
+	 * href="/docs/charges/placing-a-hold">7 by default</a>). If they are not captured
+	 * by that point in time, they will be marked as refunded and will no longer be
+	 * capturable.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Charge
+	 */
+	public function capture($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * To charge a credit card or other payment source, you create a
+	 * <code>Charge</code> object. If your API key is in test mode, the supplied
+	 * payment source (e.g., card) won’t actually be charged, although everything else
+	 * will occur as if in live mode. (Stripe assumes that the charge would have
+	 * completed successfully).
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Charge
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a charge that has previously been created. Supply the
+	 * unique charge ID that was returned from your previous request, and Stripe will
+	 * return the corresponding charge information. The same information is returned
+	 * when creating or refunding the charge.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Charge
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for charges you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\Charge>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified charge by setting the values of the parameters passed. Any
+	 * parameters not provided will be left unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Charge
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Checkout;
+
+/**
+ * Service factory class for API resources in the Checkout namespace.
+ *
+ * @property SessionService $sessions
+ */
+class CheckoutServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class SessionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Checkout Sessions.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Checkout\Session>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving a Checkout Session, there is an includable
+	 * <strong>line_items</strong> property containing the first handful of those
+	 * items. There is also a URL where you can retrieve the full (paginated) list of
+	 * line items.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem>
+	 */
+	public function allLineItems($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a Session object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Checkout\Session
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * A Session can be expired when it is in one of these statuses: <code>open</code>.
+	 *
+	 * After it expires, a customer can’t complete a Session and customers loading the
+	 * Session see a message saying the Session is expired.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Checkout\Session
+	 */
+	public function expire($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a Session object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Checkout\Session
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+/**
+ * Service factory class for API resources in the root namespace.
+ *
+ * @property AccountLinkService $accountLinks
+ * @property AccountService $accounts
+ * @property ApplePayDomainService $applePayDomains
+ * @property ApplicationFeeService $applicationFees
+ * @property Apps\AppsServiceFactory $apps
+ * @property BalanceService $balance
+ * @property BalanceTransactionService $balanceTransactions
+ * @property BillingPortal\BillingPortalServiceFactory $billingPortal
+ * @property ChargeService $charges
+ * @property Checkout\CheckoutServiceFactory $checkout
+ * @property CountrySpecService $countrySpecs
+ * @property CouponService $coupons
+ * @property CreditNoteService $creditNotes
+ * @property CustomerService $customers
+ * @property DisputeService $disputes
+ * @property EphemeralKeyService $ephemeralKeys
+ * @property EventService $events
+ * @property ExchangeRateService $exchangeRates
+ * @property FileLinkService $fileLinks
+ * @property FileService $files
+ * @property FinancialConnections\FinancialConnectionsServiceFactory $financialConnections
+ * @property Identity\IdentityServiceFactory $identity
+ * @property InvoiceItemService $invoiceItems
+ * @property InvoiceService $invoices
+ * @property Issuing\IssuingServiceFactory $issuing
+ * @property MandateService $mandates
+ * @property OAuthService $oauth
+ * @property PaymentIntentService $paymentIntents
+ * @property PaymentLinkService $paymentLinks
+ * @property PaymentMethodService $paymentMethods
+ * @property PayoutService $payouts
+ * @property PlanService $plans
+ * @property PriceService $prices
+ * @property ProductService $products
+ * @property PromotionCodeService $promotionCodes
+ * @property QuoteService $quotes
+ * @property Radar\RadarServiceFactory $radar
+ * @property RefundService $refunds
+ * @property Reporting\ReportingServiceFactory $reporting
+ * @property ReviewService $reviews
+ * @property SetupAttemptService $setupAttempts
+ * @property SetupIntentService $setupIntents
+ * @property ShippingRateService $shippingRates
+ * @property Sigma\SigmaServiceFactory $sigma
+ * @property SourceService $sources
+ * @property SubscriptionItemService $subscriptionItems
+ * @property SubscriptionService $subscriptions
+ * @property SubscriptionScheduleService $subscriptionSchedules
+ * @property TaxCodeService $taxCodes
+ * @property TaxRateService $taxRates
+ * @property Terminal\TerminalServiceFactory $terminal
+ * @property TestHelpers\TestHelpersServiceFactory $testHelpers
+ * @property TokenService $tokens
+ * @property TopupService $topups
+ * @property TransferService $transfers
+ * @property Treasury\TreasuryServiceFactory $treasury
+ * @property WebhookEndpointService $webhookEndpoints
+ */
+class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class CountrySpecService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Lists all Country Spec objects available in the API.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CountrySpec>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a Country Spec for a given Country code.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CountrySpec
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class CouponService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your coupons.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Coupon>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * You can create coupons easily via the <a
+	 * href="https://dashboard.stripe.com/coupons">coupon management</a> page of the
+	 * Stripe dashboard. Coupon creation is also accessible via the API if you need to
+	 * create coupons on the fly.
+	 *
+	 * A coupon has either a <code>percent_off</code> or an <code>amount_off</code> and
+	 * <code>currency</code>. If you set an <code>amount_off</code>, that amount will
+	 * be subtracted from any invoice’s subtotal. For example, an invoice with a
+	 * subtotal of <currency>100</currency> will have a final total of
+	 * <currency>0</currency> if a coupon with an <code>amount_off</code> of
+	 * <amount>200</amount> is applied to it and an invoice with a subtotal of
+	 * <currency>300</currency> will have a final total of <currency>100</currency> if
+	 * a coupon with an <code>amount_off</code> of <amount>200</amount> is applied to
+	 * it.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Coupon
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * You can delete coupons via the <a
+	 * href="https://dashboard.stripe.com/coupons">coupon management</a> page of the
+	 * Stripe dashboard. However, deleting a coupon does not affect any customers who
+	 * have already applied the coupon; it means that new customers can’t redeem the
+	 * coupon. You can also delete coupons via the API.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Coupon
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the coupon with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Coupon
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the metadata of a coupon. Other coupon details (currency, duration,
+	 * amount_off) are, by design, not editable.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Coupon
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class CreditNoteService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of credit notes.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CreditNote>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving a credit note, you’ll get a <strong>lines</strong> property
+	 * containing the the first handful of those items. There is also a URL where you
+	 * can retrieve the full (paginated) list of line items.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CreditNoteLineItem>
+	 */
+	public function allLines($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Issue a credit note to adjust the amount of a finalized invoice. For a
+	 * <code>status=open</code> invoice, a credit note reduces its
+	 * <code>amount_due</code>. For a <code>status=paid</code> invoice, a credit note
+	 * does not affect its <code>amount_due</code>. Instead, it can result in any
+	 * combination of the following:.
+	 *
+	 * <ul> <li>Refund: create a new refund (using <code>refund_amount</code>) or link
+	 * an existing refund (using <code>refund</code>).</li> <li>Customer balance
+	 * credit: credit the customer’s balance (using <code>credit_amount</code>) which
+	 * will be automatically applied to their next invoice when it’s finalized.</li>
+	 * <li>Outside of Stripe credit: record the amount that is or will be credited
+	 * outside of Stripe (using <code>out_of_band_amount</code>).</li> </ul>
+	 *
+	 * For post-payment credit notes the sum of the refund, credit and outside of
+	 * Stripe amounts must equal the credit note total.
+	 *
+	 * You may issue multiple credit notes for an invoice. Each credit note will
+	 * increment the invoice’s <code>pre_payment_credit_notes_amount</code> or
+	 * <code>post_payment_credit_notes_amount</code> depending on its
+	 * <code>status</code> at the time of credit note creation.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Get a preview of a credit note without creating it.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote
+	 */
+	public function preview($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving a credit note preview, you’ll get a <strong>lines</strong>
+	 * property containing the first handful of those items. This URL you can retrieve
+	 * the full (paginated) list of line items.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CreditNoteLineItem>
+	 */
+	public function previewLines($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the credit note object with the given identifier.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing credit note.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Marks a credit note as void. Learn more about <a
+	 * href="/docs/billing/invoices/credit-notes#voiding">voiding credit notes</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CreditNote
+	 */
+	public function voidCreditNote($id, $params = null, $opts = null)
+	{
+	}
+}
+class CustomerService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your customers. The customers are returned sorted by creation
+	 * date, with the most recent customers appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Customer>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of transactions that updated the customer’s <a
+	 * href="/docs/billing/customer/balance">balances</a>.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CustomerBalanceTransaction>
+	 */
+	public function allBalanceTransactions($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of transactions that modified the customer’s <a
+	 * href="/docs/payments/customer-balance">cash balance</a>.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\CustomerCashBalanceTransaction>
+	 */
+	public function allCashBalanceTransactions($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of PaymentMethods for a given Customer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\PaymentMethod>
+	 */
+	public function allPaymentMethods($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * List sources for a specified customer.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card|\Stripe\Source>
+	 */
+	public function allSources($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of tax IDs for a customer.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TaxId>
+	 */
+	public function allTaxIds($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new customer object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an immutable transaction that updates the customer’s credit <a
+	 * href="/docs/billing/customer/balance">balance</a>.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerBalanceTransaction
+	 */
+	public function createBalanceTransaction($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieve funding instructions for a customer cash balance. If funding
+	 * instructions do not yet exist for the customer, new funding instructions will be
+	 * created. If funding instructions have already been created for a given customer,
+	 * the same funding instructions will be retrieved. In other words, we will return
+	 * the same funding instructions each time.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function createFundingInstructions($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * When you create a new credit card, you must specify a customer or recipient on
+	 * which to create it.
+	 *
+	 * If the card’s owner has no default card, then the new card will become the
+	 * default. However, if the owner already has a default, then it will not change.
+	 * To change the default, you should <a href="/docs/api#update_customer">update the
+	 * customer</a> to have a new <code>default_source</code>.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public function createSource($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new <code>TaxID</code> object for a customer.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxId
+	 */
+	public function createTaxId($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Permanently deletes a customer. It cannot be undone. Also immediately cancels
+	 * any active subscriptions on the customer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Removes the currently applied discount on a customer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function deleteDiscount($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public function deleteSource($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes an existing <code>TaxID</code> object.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxId
+	 */
+	public function deleteTaxId($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a Customer object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a specific customer balance transaction that updated the customer’s <a
+	 * href="/docs/billing/customer/balance">balances</a>.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerBalanceTransaction
+	 */
+	public function retrieveBalanceTransaction($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a customer’s cash balance.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CashBalance
+	 */
+	public function retrieveCashBalance($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a specific cash balance transaction, which updated the customer’s <a
+	 * href="/docs/payments/customer-balance">cash balance</a>.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerCashBalanceTransaction
+	 */
+	public function retrieveCashBalanceTransaction($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a PaymentMethod object for a given Customer.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function retrievePaymentMethod($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieve a specified source for a given customer.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public function retrieveSource($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the <code>TaxID</code> object with the given identifier.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxId
+	 */
+	public function retrieveTaxId($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for customers you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\Customer>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified customer by setting the values of the parameters passed.
+	 * Any parameters not provided will be left unchanged. For example, if you pass the
+	 * <strong>source</strong> parameter, that becomes the customer’s active source
+	 * (e.g., a card) to be used for all charges in the future. When you update a
+	 * customer to a new valid card source by passing the <strong>source</strong>
+	 * parameter: for each of the customer’s current subscriptions, if the subscription
+	 * bills automatically and is in the <code>past_due</code> state, then the latest
+	 * open invoice for the subscription with automatic collection enabled will be
+	 * retried. This retry will not count as an automatic retry, and will not affect
+	 * the next regularly scheduled payment for the invoice. Changing the
+	 * <strong>default_source</strong> for a customer will not trigger this behavior.
+	 *
+	 * This request accepts mostly the same arguments as the customer creation call.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Most credit balance transaction fields are immutable, but you may update its
+	 * <code>description</code> and <code>metadata</code>.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CustomerBalanceTransaction
+	 */
+	public function updateBalanceTransaction($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Changes the settings on a customer’s cash balance.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\CashBalance
+	 */
+	public function updateCashBalance($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public function updateSource($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\BankAccount|\Stripe\Card|\Stripe\Source
+	 */
+	public function verifySource($parentId, $id, $params = null, $opts = null)
+	{
+	}
+}
+class DisputeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your disputes.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Dispute>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Closing the dispute for a charge indicates that you do not have any evidence to
+	 * submit and are essentially dismissing the dispute, acknowledging it as lost.
+	 *
+	 * The status of the dispute will change from <code>needs_response</code> to
+	 * <code>lost</code>. <em>Closing a dispute is irreversible</em>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Dispute
+	 */
+	public function close($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the dispute with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Dispute
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * When you get a dispute, contacting your customer is always the best first step.
+	 * If that doesn’t work, you can submit evidence to help us resolve the dispute in
+	 * your favor. You can do this in your <a
+	 * href="https://dashboard.stripe.com/disputes">dashboard</a>, but if you prefer,
+	 * you can use the API to submit evidence programmatically.
+	 *
+	 * Depending on your dispute type, different evidence fields will give you a better
+	 * chance of winning your dispute. To figure out which evidence fields to provide,
+	 * see our <a href="/docs/disputes/categories">guide to dispute types</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Dispute
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class EphemeralKeyService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Invalidates a short-lived API key for a given resource.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\EphemeralKey
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a short-lived API key for a given resource.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\EphemeralKey
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+class EventService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * List events, going back up to 30 days. Each event data is rendered according to
+	 * Stripe API version at its creation time, specified in <a
+	 * href="/docs/api/events/object">event object</a> <code>api_version</code>
+	 * attribute (not according to your current Stripe API version or
+	 * <code>Stripe-Version</code> header).
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Event>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an event. Supply the unique identifier of the event,
+	 * which you might have received in a webhook.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Event
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class ExchangeRateService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of objects that contain the rates at which foreign currencies are
+	 * converted to one another. Only shows the currencies for which Stripe supports.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\ExchangeRate>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the exchange rates from the given currency to every supported
+	 * currency.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ExchangeRate
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class FileLinkService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of file links.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\FileLink>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new file link object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FileLink
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the file link with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FileLink
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing file link object. Expired links can no longer be updated.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FileLink
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class FileService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of the files that your account has access to. The files are
+	 * returned sorted by creation date, with the most recently created files appearing
+	 * first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\File>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing file object. Supply the unique file ID from
+	 * a file, and Stripe will return the corresponding file object. To access file
+	 * contents, see the <a href="/docs/file-upload#download-file-contents">File Upload
+	 * Guide</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\File
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Create a file.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @return \Stripe\File
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\FinancialConnections;
+
+class AccountService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Financial Connections <code>Account</code> objects.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\FinancialConnections\Account>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Lists all owners for a given <code>Account</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\FinancialConnections\AccountOwner>
+	 */
+	public function allOwners($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Disables your access to a Financial Connections <code>Account</code>. You will
+	 * no longer be able to access data associated with the account (e.g. balances,
+	 * transactions).
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Account
+	 */
+	public function disconnect($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Refreshes the data associated with a Financial Connections <code>Account</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Account
+	 */
+	public function refresh($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an Financial Connections <code>Account</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Account
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the FinancialConnections namespace.
+ *
+ * @property AccountService $accounts
+ * @property SessionService $sessions
+ */
+class FinancialConnectionsServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class SessionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * To launch the Financial Connections authorization flow, create a
+	 * <code>Session</code>. The session’s <code>client_secret</code> can be used to
+	 * launch the flow using Stripe.js.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Session
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a Financial Connections <code>Session</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\FinancialConnections\Session
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Identity;
+
+/**
+ * Service factory class for API resources in the Identity namespace.
+ *
+ * @property VerificationReportService $verificationReports
+ * @property VerificationSessionService $verificationSessions
+ */
+class IdentityServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class VerificationReportService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * List all verification reports.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Identity\VerificationReport>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an existing VerificationReport.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationReport
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class VerificationSessionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of VerificationSessions.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Identity\VerificationSession>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * A VerificationSession object can be canceled when it is in
+	 * <code>requires_input</code> <a
+	 * href="/docs/identity/how-sessions-work">status</a>.
+	 *
+	 * Once canceled, future submission attempts are disabled. This cannot be undone.
+	 * <a href="/docs/identity/verification-sessions#cancel">Learn more</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a VerificationSession object.
+	 *
+	 * After the VerificationSession is created, display a verification modal using the
+	 * session <code>client_secret</code> or send your users to the session’s
+	 * <code>url</code>.
+	 *
+	 * If your API key is in test mode, verification checks won’t actually process,
+	 * though everything else will occur as if in live mode.
+	 *
+	 * Related guide: <a href="/docs/identity/verify-identity-documents">Verify your
+	 * users’ identity documents</a>.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Redact a VerificationSession to remove all collected information from Stripe.
+	 * This will redact the VerificationSession and all objects related to it,
+	 * including VerificationReports, Events, request logs, etc.
+	 *
+	 * A VerificationSession object can be redacted when it is in
+	 * <code>requires_input</code> or <code>verified</code> <a
+	 * href="/docs/identity/how-sessions-work">status</a>. Redacting a
+	 * VerificationSession in <code>requires_action</code> state will automatically
+	 * cancel it.
+	 *
+	 * The redaction process may take up to four days. When the redaction process is in
+	 * progress, the VerificationSession’s <code>redaction.status</code> field will be
+	 * set to <code>processing</code>; when the process is finished, it will change to
+	 * <code>redacted</code> and an <code>identity.verification_session.redacted</code>
+	 * event will be emitted.
+	 *
+	 * Redaction is irreversible. Redacted objects are still accessible in the Stripe
+	 * API, but all the fields that contain personal data will be replaced by the
+	 * string <code>[redacted]</code> or a similar placeholder. The
+	 * <code>metadata</code> field will also be erased. Redacted objects cannot be
+	 * updated or used for any purpose.
+	 *
+	 * <a href="/docs/identity/verification-sessions#redact">Learn more</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession
+	 */
+	public function redact($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a VerificationSession that was previously created.
+	 *
+	 * When the session status is <code>requires_input</code>, you can use this method
+	 * to retrieve a valid <code>client_secret</code> or <code>url</code> to allow
+	 * re-submission.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a VerificationSession object.
+	 *
+	 * When the session status is <code>requires_input</code>, you can use this method
+	 * to update the verification check and options.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Identity\VerificationSession
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class InvoiceItemService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your invoice items. Invoice items are returned sorted by
+	 * creation date, with the most recently created invoice items appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\InvoiceItem>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an item to be added to a draft invoice (up to 250 items per invoice). If
+	 * no invoice is specified, the item will be on the next invoice created for the
+	 * customer specified.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\InvoiceItem
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes an invoice item, removing it from an invoice. Deleting invoice items is
+	 * only possible when they’re not attached to invoices, or if it’s attached to a
+	 * draft invoice.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\InvoiceItem
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the invoice item with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\InvoiceItem
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the amount or description of an invoice item on an upcoming invoice.
+	 * Updating an invoice item is only possible before the invoice it’s attached to is
+	 * closed.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\InvoiceItem
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class InvoiceService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * You can list all invoices, or list the invoices for a specific customer. The
+	 * invoices are returned sorted by creation date, with the most recently created
+	 * invoices appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Invoice>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving an invoice, you’ll get a <strong>lines</strong> property
+	 * containing the total count of line items and the first handful of those items.
+	 * There is also a URL where you can retrieve the full (paginated) list of line
+	 * items.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\InvoiceLineItem>
+	 */
+	public function allLines($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * This endpoint creates a draft invoice for a given customer. The invoice remains
+	 * a draft until you <a href="#finalize_invoice">finalize</a> the invoice, which
+	 * allows you to <a href="#pay_invoice">pay</a> or <a href="#send_invoice">send</a>
+	 * the invoice to your customers.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Permanently deletes a one-off invoice draft. This cannot be undone. Attempts to
+	 * delete invoices that are no longer in a draft state will fail; once an invoice
+	 * has been finalized or if an invoice is for a subscription, it must be <a
+	 * href="#void_invoice">voided</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Stripe automatically finalizes drafts before sending and attempting payment on
+	 * invoices. However, if you’d like to finalize a draft invoice manually, you can
+	 * do so using this method.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function finalizeInvoice($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Marking an invoice as uncollectible is useful for keeping track of bad debts
+	 * that can be written off for accounting purposes.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function markUncollectible($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Stripe automatically creates and then attempts to collect payment on invoices
+	 * for customers on subscriptions according to your <a
+	 * href="https://dashboard.stripe.com/account/billing/automatic">subscriptions
+	 * settings</a>. However, if you’d like to attempt payment on an invoice out of the
+	 * normal collection schedule or for some other reason, you can do so.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function pay($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the invoice with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for invoices you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\Invoice>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Stripe will automatically send invoices to customers according to your <a
+	 * href="https://dashboard.stripe.com/account/billing/automatic">subscriptions
+	 * settings</a>. However, if you’d like to manually send an invoice to your
+	 * customer out of the normal schedule, you can do so. When sending invoices that
+	 * have already been paid, there will be no reference to the payment in the email.
+	 *
+	 * Requests made in test-mode result in no emails being sent, despite sending an
+	 * <code>invoice.sent</code> event.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function sendInvoice($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * At any time, you can preview the upcoming invoice for a customer. This will show
+	 * you all the charges that are pending, including subscription renewal charges,
+	 * invoice item charges, etc. It will also show you any discounts that are
+	 * applicable to the invoice.
+	 *
+	 * Note that when you are viewing an upcoming invoice, you are simply viewing a
+	 * preview – the invoice has not yet been created. As such, the upcoming invoice
+	 * will not show up in invoice listing calls, and you cannot use the API to pay or
+	 * edit the invoice. If you want to change the amount that your customer will be
+	 * billed, you can add, remove, or update pending invoice items, or update the
+	 * customer’s discount.
+	 *
+	 * You can preview the effects of updating a subscription, including a preview of
+	 * what proration will take place. To ensure that the actual proration is
+	 * calculated exactly the same as the previewed proration, you should pass a
+	 * <code>proration_date</code> parameter when doing the actual subscription update.
+	 * The value passed in should be the same as the
+	 * <code>subscription_proration_date</code> returned on the upcoming invoice
+	 * resource. The recommended way to get only the prorations being previewed is to
+	 * consider only proration line items where <code>period[start]</code> is equal to
+	 * the <code>subscription_proration_date</code> on the upcoming invoice resource.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function upcoming($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving an upcoming invoice, you’ll get a <strong>lines</strong>
+	 * property containing the total count of line items and the first handful of those
+	 * items. There is also a URL where you can retrieve the full (paginated) list of
+	 * line items.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\InvoiceLineItem>
+	 */
+	public function upcomingLines($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Draft invoices are fully editable. Once an invoice is <a
+	 * href="/docs/billing/invoices/workflow#finalized">finalized</a>, monetary values,
+	 * as well as <code>collection_method</code>, become uneditable.
+	 *
+	 * If you would like to stop the Stripe Billing engine from automatically
+	 * finalizing, reattempting payments on, sending reminders for, or <a
+	 * href="/docs/billing/invoices/reconciliation">automatically reconciling</a>
+	 * invoices, pass <code>auto_advance=false</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Mark a finalized invoice as void. This cannot be undone. Voiding an invoice is
+	 * similar to <a href="#delete_invoice">deletion</a>, however it only applies to
+	 * finalized invoices and maintains a papertrail where the invoice can still be
+	 * found.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Invoice
+	 */
+	public function voidInvoice($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Issuing;
+
+class AuthorizationService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Issuing <code>Authorization</code> objects. The objects are
+	 * sorted in descending order by creation date, with the most recently created
+	 * object appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Issuing\Authorization>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Approves a pending Issuing <code>Authorization</code> object. This request
+	 * should be made within the timeout window of the <a
+	 * href="/docs/issuing/controls/real-time-authorizations">real-time
+	 * authorization</a> flow.  You can also respond directly to the webhook request to
+	 * approve an authorization (preferred). More details can be found <a
+	 * href="https://site-admin.stripe.com/docs/issuing/controls/real-time-authorizations#authorization-handling">here</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Authorization
+	 */
+	public function approve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Declines a pending Issuing <code>Authorization</code> object. This request
+	 * should be made within the timeout window of the <a
+	 * href="/docs/issuing/controls/real-time-authorizations">real time
+	 * authorization</a> flow. You can also respond directly to the webhook request to
+	 * decline an authorization (preferred). More details can be found <a
+	 * href="https://site-admin.stripe.com/docs/issuing/controls/real-time-authorizations#authorization-handling">here</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Authorization
+	 */
+	public function decline($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an Issuing <code>Authorization</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Authorization
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified Issuing <code>Authorization</code> object by setting the
+	 * values of the parameters passed. Any parameters not provided will be left
+	 * unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Authorization
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class CardholderService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Issuing <code>Cardholder</code> objects. The objects are
+	 * sorted in descending order by creation date, with the most recently created
+	 * object appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Issuing\Cardholder>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new Issuing <code>Cardholder</code> object that can be issued cards.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Cardholder
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an Issuing <code>Cardholder</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Cardholder
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified Issuing <code>Cardholder</code> object by setting the
+	 * values of the parameters passed. Any parameters not provided will be left
+	 * unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Cardholder
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class CardService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Issuing <code>Card</code> objects. The objects are sorted in
+	 * descending order by creation date, with the most recently created object
+	 * appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Issuing\Card>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an Issuing <code>Card</code> object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an Issuing <code>Card</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified Issuing <code>Card</code> object by setting the values of
+	 * the parameters passed. Any parameters not provided will be left unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class DisputeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Issuing <code>Dispute</code> objects. The objects are sorted
+	 * in descending order by creation date, with the most recently created object
+	 * appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Issuing\Dispute>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an Issuing <code>Dispute</code> object. Individual pieces of evidence
+	 * within the <code>evidence</code> object are optional at this point. Stripe only
+	 * validates that required evidence is present during submission. Refer to <a
+	 * href="/docs/issuing/purchases/disputes#dispute-reasons-and-evidence">Dispute
+	 * reasons and evidence</a> for more details about evidence requirements.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Dispute
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an Issuing <code>Dispute</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Dispute
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Submits an Issuing <code>Dispute</code> to the card network. Stripe validates
+	 * that all evidence fields required for the dispute’s reason are present. For more
+	 * details, see <a
+	 * href="/docs/issuing/purchases/disputes#dispute-reasons-and-evidence">Dispute
+	 * reasons and evidence</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Dispute
+	 */
+	public function submit($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified Issuing <code>Dispute</code> object by setting the values
+	 * of the parameters passed. Any parameters not provided will be left unchanged.
+	 * Properties on the <code>evidence</code> object can be unset by passing in an
+	 * empty string.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Dispute
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Issuing namespace.
+ *
+ * @property AuthorizationService $authorizations
+ * @property CardholderService $cardholders
+ * @property CardService $cards
+ * @property DisputeService $disputes
+ * @property TransactionService $transactions
+ */
+class IssuingServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class TransactionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Issuing <code>Transaction</code> objects. The objects are
+	 * sorted in descending order by creation date, with the most recently created
+	 * object appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Issuing\Transaction>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an Issuing <code>Transaction</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Transaction
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified Issuing <code>Transaction</code> object by setting the
+	 * values of the parameters passed. Any parameters not provided will be left
+	 * unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Transaction
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class MandateService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Retrieves a Mandate object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Mandate
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class OAuthService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Sends a request to Stripe's Connect API.
+	 *
+	 * @param string $method the HTTP method
+	 * @param string $path the path of the request
+	 * @param array $params the parameters of the request
+	 * @param array|\Stripe\Util\RequestOptions $opts the special modifiers of the request
+	 *
+	 * @return \Stripe\StripeObject the object returned by Stripe's Connect API
+	 */
+	protected function requestConnect($method, $path, $params, $opts)
+	{
+	}
+	/**
+	 * Generates a URL to Stripe's OAuth form.
+	 *
+	 * @param null|array $params
+	 * @param null|array $opts
+	 *
+	 * @return string the URL to Stripe's OAuth form
+	 */
+	public function authorizeUrl($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Use an authoriztion code to connect an account to your platform and
+	 * fetch the user's credentials.
+	 *
+	 * @param null|array $params
+	 * @param null|array $opts
+	 *
+	 * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject object containing the response from the API
+	 */
+	public function token($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Disconnects an account from your platform.
+	 *
+	 * @param null|array $params
+	 * @param null|array $opts
+	 *
+	 * @throws \Stripe\Exception\OAuth\OAuthErrorException if the request fails
+	 *
+	 * @return \Stripe\StripeObject object containing the response from the API
+	 */
+	public function deauthorize($params = null, $opts = null)
+	{
+	}
+}
+class PaymentIntentService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of PaymentIntents.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\PaymentIntent>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Manually reconcile the remaining amount for a customer_balance PaymentIntent.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function applyCustomerBalance($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * A PaymentIntent object can be canceled when it is in one of these statuses:
+	 * <code>requires_payment_method</code>, <code>requires_capture</code>,
+	 * <code>requires_confirmation</code>, <code>requires_action</code> or, <a
+	 * href="/docs/payments/intents">in rare cases</a>, <code>processing</code>.
+	 *
+	 * Once canceled, no additional charges will be made by the PaymentIntent and any
+	 * operations on the PaymentIntent will fail with an error. For PaymentIntents with
+	 * <code>status=’requires_capture’</code>, the remaining
+	 * <code>amount_capturable</code> will automatically be refunded.
+	 *
+	 * You cannot cancel the PaymentIntent for a Checkout Session. <a
+	 * href="/docs/api/checkout/sessions/expire">Expire the Checkout Session</a>
+	 * instead.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Capture the funds of an existing uncaptured PaymentIntent when its status is
+	 * <code>requires_capture</code>.
+	 *
+	 * Uncaptured PaymentIntents will be canceled a set number of days after they are
+	 * created (7 by default).
+	 *
+	 * Learn more about <a href="/docs/payments/capture-later">separate authorization
+	 * and capture</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function capture($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Confirm that your customer intends to pay with current or provided payment
+	 * method. Upon confirmation, the PaymentIntent will attempt to initiate a payment.
+	 * If the selected payment method requires additional authentication steps, the
+	 * PaymentIntent will transition to the <code>requires_action</code> status and
+	 * suggest additional actions via <code>next_action</code>. If payment fails, the
+	 * PaymentIntent will transition to the <code>requires_payment_method</code>
+	 * status. If payment succeeds, the PaymentIntent will transition to the
+	 * <code>succeeded</code> status (or <code>requires_capture</code>, if
+	 * <code>capture_method</code> is set to <code>manual</code>). If the
+	 * <code>confirmation_method</code> is <code>automatic</code>, payment may be
+	 * attempted using our <a
+	 * href="/docs/stripe-js/reference#stripe-handle-card-payment">client SDKs</a> and
+	 * the PaymentIntent’s <a
+	 * href="#payment_intent_object-client_secret">client_secret</a>. After
+	 * <code>next_action</code>s are handled by the client, no additional confirmation
+	 * is required to complete the payment. If the <code>confirmation_method</code> is
+	 * <code>manual</code>, all payment attempts must be initiated using a secret key.
+	 * If any actions are required for the payment, the PaymentIntent will return to
+	 * the <code>requires_confirmation</code> state after those actions are completed.
+	 * Your server needs to then explicitly re-confirm the PaymentIntent to initiate
+	 * the next payment attempt. Read the <a
+	 * href="/docs/payments/payment-intents/web-manual">expanded documentation</a> to
+	 * learn more about manual confirmation.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function confirm($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a PaymentIntent object.
+	 *
+	 * After the PaymentIntent is created, attach a payment method and <a
+	 * href="/docs/api/payment_intents/confirm">confirm</a> to continue the payment.
+	 * You can read more about the different payment flows available via the Payment
+	 * Intents API <a href="/docs/payments/payment-intents">here</a>.
+	 *
+	 * When <code>confirm=true</code> is used during creation, it is equivalent to
+	 * creating and confirming the PaymentIntent in the same call. You may use any
+	 * parameters available in the <a href="/docs/api/payment_intents/confirm">confirm
+	 * API</a> when <code>confirm=true</code> is supplied.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Perform an incremental authorization on an eligible <a
+	 * href="/docs/api/payment_intents/object">PaymentIntent</a>. To be eligible, the
+	 * PaymentIntent’s status must be <code>requires_capture</code> and <a
+	 * href="/docs/api/charges/object#charge_object-payment_method_details-card_present-incremental_authorization_supported">incremental_authorization_supported</a>
+	 * must be <code>true</code>.
+	 *
+	 * Incremental authorizations attempt to increase the authorized amount on your
+	 * customer’s card to the new, higher <code>amount</code> provided. As with the
+	 * initial authorization, incremental authorizations may be declined. A single
+	 * PaymentIntent can call this endpoint multiple times to further increase the
+	 * authorized amount.
+	 *
+	 * If the incremental authorization succeeds, the PaymentIntent object is returned
+	 * with the updated <a
+	 * href="/docs/api/payment_intents/object#payment_intent_object-amount">amount</a>.
+	 * If the incremental authorization fails, a <a
+	 * href="/docs/error-codes#card-declined">card_declined</a> error is returned, and
+	 * no fields on the PaymentIntent or Charge are updated. The PaymentIntent object
+	 * remains capturable for the previously authorized amount.
+	 *
+	 * Each PaymentIntent can have a maximum of 10 incremental authorization attempts,
+	 * including declines. Once captured, a PaymentIntent can no longer be incremented.
+	 *
+	 * Learn more about <a
+	 * href="/docs/terminal/features/incremental-authorizations">incremental
+	 * authorizations</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function incrementAuthorization($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a PaymentIntent that has previously been created.
+	 *
+	 * Client-side retrieval using a publishable key is allowed when the
+	 * <code>client_secret</code> is provided in the query string.
+	 *
+	 * When retrieved with a publishable key, only a subset of properties will be
+	 * returned. Please refer to the <a href="#payment_intent_object">payment
+	 * intent</a> object reference for more details.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for PaymentIntents you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\PaymentIntent>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates properties on a PaymentIntent object without confirming.
+	 *
+	 * Depending on which properties you update, you may need to confirm the
+	 * PaymentIntent again. For example, updating the <code>payment_method</code> will
+	 * always require you to confirm the PaymentIntent again. If you prefer to update
+	 * and confirm at the same time, we recommend updating properties via the <a
+	 * href="/docs/api/payment_intents/confirm">confirm API</a> instead.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Verifies microdeposits on a PaymentIntent object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentIntent
+	 */
+	public function verifyMicrodeposits($id, $params = null, $opts = null)
+	{
+	}
+}
+class PaymentLinkService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your payment links.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\PaymentLink>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving a payment link, there is an includable
+	 * <strong>line_items</strong> property containing the first handful of those
+	 * items. There is also a URL where you can retrieve the full (paginated) list of
+	 * line items.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem>
+	 */
+	public function allLineItems($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a payment link.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentLink
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieve a payment link.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentLink
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a payment link.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentLink
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class PaymentMethodService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of PaymentMethods for Treasury flows. If you want to list the
+	 * PaymentMethods attached to a Customer for payments, you should use the <a
+	 * href="/docs/api/payment_methods/customer_list">List a Customer’s
+	 * PaymentMethods</a> API instead.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\PaymentMethod>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Attaches a PaymentMethod object to a Customer.
+	 *
+	 * To attach a new PaymentMethod to a customer for future payments, we recommend
+	 * you use a <a href="/docs/api/setup_intents">SetupIntent</a> or a PaymentIntent
+	 * with <a
+	 * href="/docs/api/payment_intents/create#create_payment_intent-setup_future_usage">setup_future_usage</a>.
+	 * These approaches will perform any necessary steps to set up the PaymentMethod
+	 * for future payments. Using the <code>/v1/payment_methods/:id/attach</code>
+	 * endpoint without first using a SetupIntent or PaymentIntent with
+	 * <code>setup_future_usage</code> does not optimize the PaymentMethod for future
+	 * use, which makes later declines and payment friction more likely. See <a
+	 * href="/docs/payments/payment-intents#future-usage">Optimizing cards for future
+	 * payments</a> for more information about setting up future payments.
+	 *
+	 * To use this PaymentMethod as the default for invoice or subscription payments,
+	 * set <a
+	 * href="/docs/api/customers/update#update_customer-invoice_settings-default_payment_method"><code>invoice_settings.default_payment_method</code></a>,
+	 * on the Customer to the PaymentMethod’s ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod
+	 */
+	public function attach($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a PaymentMethod object. Read the <a
+	 * href="/docs/stripe-js/reference#stripe-create-payment-method">Stripe.js
+	 * reference</a> to learn how to create PaymentMethods via Stripe.js.
+	 *
+	 * Instead of creating a PaymentMethod directly, we recommend using the <a
+	 * href="/docs/payments/accept-a-payment">PaymentIntents</a> API to accept a
+	 * payment immediately or the <a
+	 * href="/docs/payments/save-and-reuse">SetupIntent</a> API to collect payment
+	 * method details ahead of a future payment.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Detaches a PaymentMethod object from a Customer. After a PaymentMethod is
+	 * detached, it can no longer be used for a payment or re-attached to a Customer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod
+	 */
+	public function detach($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a PaymentMethod object attached to the StripeAccount. To retrieve a
+	 * payment method attached to a Customer, you should use <a
+	 * href="/docs/api/payment_methods/customer">Retrieve a Customer’s
+	 * PaymentMethods</a>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a PaymentMethod object. A PaymentMethod must be attached a customer to
+	 * be updated.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PaymentMethod
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class PayoutService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of existing payouts sent to third-party bank accounts or that
+	 * Stripe has sent you. The payouts are returned in sorted order, with the most
+	 * recently created payouts appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Payout>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * A previously created payout can be canceled if it has not yet been paid out.
+	 * Funds will be refunded to your available balance. You may not cancel automatic
+	 * Stripe payouts.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * To send funds to your own bank account, you create a new payout object. Your <a
+	 * href="#balance">Stripe balance</a> must be able to cover the payout amount, or
+	 * you’ll receive an “Insufficient Funds” error.
+	 *
+	 * If your API key is in test mode, money won’t actually be sent, though everything
+	 * else will occur as if in live mode.
+	 *
+	 * If you are creating a manual payout on a Stripe account that uses multiple
+	 * payment source types, you’ll need to specify the source type balance that the
+	 * payout should draw from. The <a href="#balance_object">balance object</a>
+	 * details available and pending amounts by source type.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing payout. Supply the unique payout ID from
+	 * either a payout creation request or the payout list, and Stripe will return the
+	 * corresponding payout information.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Reverses a payout by debiting the destination bank account. Only payouts for
+	 * connected accounts to US bank accounts may be reversed at this time. If the
+	 * payout is in the <code>pending</code> status,
+	 * <code>/v1/payouts/:id/cancel</code> should be used instead.
+	 *
+	 * By requesting a reversal via <code>/v1/payouts/:id/reverse</code>, you confirm
+	 * that the authorized signatory of the selected bank account has authorized the
+	 * debit on the bank account and that no other authorization is required.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout
+	 */
+	public function reverse($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified payout by setting the values of the parameters passed. Any
+	 * parameters not provided will be left unchanged. This request accepts only the
+	 * metadata as arguments.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Payout
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class PlanService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your plans.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Plan>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * You can now model subscriptions more flexibly using the <a href="#prices">Prices
+	 * API</a>. It replaces the Plans API and is backwards compatible to simplify your
+	 * migration.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Plan
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deleting plans means new subscribers can’t be added. Existing subscribers aren’t
+	 * affected.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Plan
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the plan with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Plan
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified plan by setting the values of the parameters passed. Any
+	 * parameters not provided are left unchanged. By design, you cannot change a
+	 * plan’s ID, amount, currency, or billing cycle.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Plan
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class PriceService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your prices.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Price>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new price for an existing product. The price can be recurring or
+	 * one-time.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Price
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the price with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Price
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for prices you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\Price>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified price by setting the values of the parameters passed. Any
+	 * parameters not provided are left unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Price
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class ProductService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your products. The products are returned sorted by creation
+	 * date, with the most recently created products appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Product>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new product object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Product
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Delete a product. Deleting a product is only possible if it has no prices
+	 * associated with it. Additionally, deleting a product with <code>type=good</code>
+	 * is only possible if it has no SKUs associated with it.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Product
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing product. Supply the unique product ID from
+	 * either a product creation request or the product list, and Stripe will return
+	 * the corresponding product information.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Product
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for products you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\Product>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specific product by setting the values of the parameters passed. Any
+	 * parameters not provided will be left unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Product
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class PromotionCodeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your promotion codes.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\PromotionCode>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * A promotion code points to a coupon. You can optionally restrict the code to a
+	 * specific customer, redemption limit, and expiration date.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PromotionCode
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the promotion code with the given ID. In order to retrieve a promotion
+	 * code by the customer-facing <code>code</code> use <a
+	 * href="/docs/api/promotion_codes/list">list</a> with the desired
+	 * <code>code</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PromotionCode
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified promotion code by setting the values of the parameters
+	 * passed. Most fields are, by design, not editable.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\PromotionCode
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class QuoteService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Accepts the specified quote.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote
+	 */
+	public function accept($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of your quotes.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Quote>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving a quote, there is an includable <a
+	 * href="https://stripe.com/docs/api/quotes/object#quote_object-computed-upfront-line_items"><strong>computed.upfront.line_items</strong></a>
+	 * property containing the first handful of those items. There is also a URL where
+	 * you can retrieve the full (paginated) list of upfront line items.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem>
+	 */
+	public function allComputedUpfrontLineItems($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * When retrieving a quote, there is an includable <strong>line_items</strong>
+	 * property containing the first handful of those items. There is also a URL where
+	 * you can retrieve the full (paginated) list of line items.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\LineItem>
+	 */
+	public function allLineItems($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels the quote.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * A quote models prices and services for a customer. Default options for
+	 * <code>header</code>, <code>description</code>, <code>footer</code>, and
+	 * <code>expires_at</code> can be set in the dashboard via the <a
+	 * href="https://dashboard.stripe.com/settings/billing/quote">quote template</a>.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Finalizes the quote.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote
+	 */
+	public function finalizeQuote($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the quote with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * A quote models prices and services for a customer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Quote
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Download the PDF for a finalized quote.
+	 *
+	 * @param string $id
+	 * @param callable $readBodyChunkCallable
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 */
+	public function pdf($id, $readBodyChunkCallable, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Radar;
+
+class EarlyFraudWarningService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of early fraud warnings.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Radar\EarlyFraudWarning>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an early fraud warning that has previously been
+	 * created.
+	 *
+	 * Please refer to the <a href="#early_fraud_warning_object">early fraud
+	 * warning</a> object reference for more details.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\EarlyFraudWarning
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Radar namespace.
+ *
+ * @property EarlyFraudWarningService $earlyFraudWarnings
+ * @property ValueListItemService $valueListItems
+ * @property ValueListService $valueLists
+ */
+class RadarServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class ValueListItemService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of <code>ValueListItem</code> objects. The objects are sorted in
+	 * descending order by creation date, with the most recently created object
+	 * appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Radar\ValueListItem>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new <code>ValueListItem</code> object, which is added to the specified
+	 * parent value list.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueListItem
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a <code>ValueListItem</code> object, removing it from its parent value
+	 * list.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueListItem
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a <code>ValueListItem</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueListItem
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class ValueListService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of <code>ValueList</code> objects. The objects are sorted in
+	 * descending order by creation date, with the most recently created object
+	 * appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Radar\ValueList>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new <code>ValueList</code> object, which can then be referenced in
+	 * rules.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueList
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a <code>ValueList</code> object, also deleting any items contained
+	 * within the value list. To be deleted, a value list must not be referenced in any
+	 * rules.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueList
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a <code>ValueList</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueList
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a <code>ValueList</code> object by setting the values of the parameters
+	 * passed. Any parameters not provided will be left unchanged. Note that
+	 * <code>item_type</code> is immutable.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Radar\ValueList
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class RefundService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of all refunds you’ve previously created. The refunds are
+	 * returned in sorted order, with the most recent refunds appearing first. For
+	 * convenience, the 10 most recent refunds are always available by default on the
+	 * charge object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Refund>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels a refund with a status of <code>requires_action</code>.
+	 *
+	 * Refunds in other states cannot be canceled, and only refunds for payment methods
+	 * that require customer action will enter the <code>requires_action</code> state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Refund
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Create a refund.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Refund
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing refund.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Refund
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified refund by setting the values of the parameters passed. Any
+	 * parameters not provided will be left unchanged.
+	 *
+	 * This request only accepts <code>metadata</code> as an argument.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Refund
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Reporting;
+
+/**
+ * Service factory class for API resources in the Reporting namespace.
+ *
+ * @property ReportRunService $reportRuns
+ * @property ReportTypeService $reportTypes
+ */
+class ReportingServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+class ReportRunService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of Report Runs, with the most recent appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Reporting\ReportRun>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new object and begin running the report. (Certain report types require
+	 * a <a href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Reporting\ReportRun
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing Report Run.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Reporting\ReportRun
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class ReportTypeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a full list of Report Types.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Reporting\ReportType>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a Report Type. (Certain report types require a <a
+	 * href="https://stripe.com/docs/keys#test-live-modes">live-mode API key</a>.).
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Reporting\ReportType
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class ReviewService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of <code>Review</code> objects that have <code>open</code> set to
+	 * <code>true</code>. The objects are sorted in descending order by creation date,
+	 * with the most recently created object appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Review>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Approves a <code>Review</code> object, closing it and removing it from the list
+	 * of reviews.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Review
+	 */
+	public function approve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a <code>Review</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Review
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class SetupAttemptService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of SetupAttempts associated with a provided SetupIntent.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\SetupAttempt>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+}
+class SetupIntentService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of SetupIntents.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\SetupIntent>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * A SetupIntent object can be canceled when it is in one of these statuses:
+	 * <code>requires_payment_method</code>, <code>requires_confirmation</code>, or
+	 * <code>requires_action</code>.
+	 *
+	 * Once canceled, setup is abandoned and any operations on the SetupIntent will
+	 * fail with an error.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Confirm that your customer intends to set up the current or provided payment
+	 * method. For example, you would confirm a SetupIntent when a customer hits the
+	 * “Save” button on a payment method management page on your website.
+	 *
+	 * If the selected payment method does not require any additional steps from the
+	 * customer, the SetupIntent will transition to the <code>succeeded</code> status.
+	 *
+	 * Otherwise, it will transition to the <code>requires_action</code> status and
+	 * suggest additional actions via <code>next_action</code>. If setup fails, the
+	 * SetupIntent will transition to the <code>requires_payment_method</code> status.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent
+	 */
+	public function confirm($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a SetupIntent object.
+	 *
+	 * After the SetupIntent is created, attach a payment method and <a
+	 * href="/docs/api/setup_intents/confirm">confirm</a> to collect any required
+	 * permissions to charge the payment method later.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a SetupIntent that has previously been created.
+	 *
+	 * Client-side retrieval using a publishable key is allowed when the
+	 * <code>client_secret</code> is provided in the query string.
+	 *
+	 * When retrieved with a publishable key, only a subset of properties will be
+	 * returned. Please refer to the <a href="#setup_intent_object">SetupIntent</a>
+	 * object reference for more details.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a SetupIntent object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Verifies microdeposits on a SetupIntent object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent
+	 */
+	public function verifyMicrodeposits($id, $params = null, $opts = null)
+	{
+	}
+}
+class ShippingRateService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your shipping rates.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\ShippingRate>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new shipping rate object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ShippingRate
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns the shipping rate object with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ShippingRate
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing shipping rate object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\ShippingRate
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Sigma;
+
+class ScheduledQueryRunService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of scheduled query runs.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Sigma\ScheduledQueryRun>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an scheduled query run.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Sigma\ScheduledQueryRun
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Sigma namespace.
+ *
+ * @property ScheduledQueryRunService $scheduledQueryRuns
+ */
+class SigmaServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class SourceService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * List source transactions for a given source.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\SourceTransaction>
+	 */
+	public function allSourceTransactions($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new source object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Delete a specified source for a given customer.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source
+	 */
+	public function detach($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves an existing source object. Supply the unique source ID from a source
+	 * creation request and Stripe will return the corresponding up-to-date source
+	 * object information.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified source by setting the values of the parameters passed. Any
+	 * parameters not provided will be left unchanged.
+	 *
+	 * This request accepts the <code>metadata</code> and <code>owner</code> as
+	 * arguments. It is also possible to update type specific information for selected
+	 * payment methods. Please refer to our <a href="/docs/sources">payment method
+	 * guides</a> for more detail.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Verify a given source.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source
+	 */
+	public function verify($id, $params = null, $opts = null)
+	{
+	}
+}
+class SubscriptionItemService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your subscription items for a given subscription.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\SubscriptionItem>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * For the specified subscription item, returns a list of summary objects. Each
+	 * object in the list provides usage information that’s been summarized from
+	 * multiple usage records and over a subscription billing period (e.g., 15 usage
+	 * records in the month of September).
+	 *
+	 * The list is sorted in reverse-chronological order (newest first). The first list
+	 * item represents the most current usage period that hasn’t ended yet. Since new
+	 * usage records can still be added, the returned summary information for the
+	 * subscription item’s ID should be seen as unstable until the subscription billing
+	 * period ends.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\UsageRecordSummary>
+	 */
+	public function allUsageRecordSummaries($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Adds a new item to an existing subscription. No existing items will be changed
+	 * or replaced.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionItem
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a usage record for a specified subscription item and date, and fills it
+	 * with a quantity.
+	 *
+	 * Usage records provide <code>quantity</code> information that Stripe uses to
+	 * track how much a customer is using your service. With usage information and the
+	 * pricing model set up by the <a
+	 * href="https://stripe.com/docs/billing/subscriptions/metered-billing">metered
+	 * billing</a> plan, Stripe helps you send accurate invoices to your customers.
+	 *
+	 * The default calculation for usage is to add up all the <code>quantity</code>
+	 * values of the usage records within a billing period. You can change this default
+	 * behavior with the billing plan’s <code>aggregate_usage</code> <a
+	 * href="/docs/api/plans/create#create_plan-aggregate_usage">parameter</a>. When
+	 * there is more than one usage record with the same timestamp, Stripe adds the
+	 * <code>quantity</code> values together. In most cases, this is the desired
+	 * resolution, however, you can change this behavior with the <code>action</code>
+	 * parameter.
+	 *
+	 * The default pricing model for metered billing is <a
+	 * href="/docs/api/plans/object#plan_object-billing_scheme">per-unit pricing</a>.
+	 * For finer granularity, you can configure metered billing to have a <a
+	 * href="https://stripe.com/docs/billing/subscriptions/tiers">tiered pricing</a>
+	 * model.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\UsageRecord
+	 */
+	public function createUsageRecord($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes an item from the subscription. Removing a subscription item from a
+	 * subscription will not cancel the subscription.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionItem
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the subscription item with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionItem
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the plan or quantity of an item on a current subscription.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionItem
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class SubscriptionScheduleService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Retrieves the list of your subscription schedules.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\SubscriptionSchedule>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels a subscription schedule and its associated subscription immediately (if
+	 * the subscription schedule has an active subscription). A subscription schedule
+	 * can only be canceled if its status is <code>not_started</code> or
+	 * <code>active</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new subscription schedule object. Each customer can have up to 500
+	 * active or scheduled subscriptions.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Releases the subscription schedule immediately, which will stop scheduling of
+	 * its phases, but leave any existing subscription in place. A schedule can only be
+	 * released if its status is <code>not_started</code> or <code>active</code>. If
+	 * the subscription schedule is currently associated with a subscription, releasing
+	 * it will remove its <code>subscription</code> property and set the subscription’s
+	 * ID to the <code>released_subscription</code> property.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule
+	 */
+	public function release($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing subscription schedule. You only need to
+	 * supply the unique subscription schedule identifier that was returned upon
+	 * subscription schedule creation.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing subscription schedule.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class SubscriptionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * By default, returns a list of subscriptions that have not been canceled. In
+	 * order to list canceled subscriptions, specify <code>status=canceled</code>.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Subscription>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels a customer’s subscription immediately. The customer will not be charged
+	 * again for the subscription.
+	 *
+	 * Note, however, that any pending invoice items that you’ve created will still be
+	 * charged for at the end of the period, unless manually <a
+	 * href="#delete_invoiceitem">deleted</a>. If you’ve set the subscription to cancel
+	 * at the end of the period, any pending prorations will also be left in place and
+	 * collected at the end of the period. But if the subscription is set to cancel
+	 * immediately, pending prorations will be removed.
+	 *
+	 * By default, upon subscription cancellation, Stripe will stop automatic
+	 * collection of all finalized invoices for the customer. This is intended to
+	 * prevent unexpected payment attempts after the customer has canceled a
+	 * subscription. However, you can resume automatic collection of the invoices
+	 * manually after subscription cancellation to have us proceed. Or, you could check
+	 * for unpaid invoices before allowing the customer to cancel the subscription at
+	 * all.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new subscription on an existing customer. Each customer can have up to
+	 * 500 active or scheduled subscriptions.
+	 *
+	 * When you create a subscription with
+	 * <code>collection_method=charge_automatically</code>, the first invoice is
+	 * finalized as part of the request. The <code>payment_behavior</code> parameter
+	 * determines the exact behavior of the initial payment.
+	 *
+	 * To start subscriptions where the first invoice always begins in a
+	 * <code>draft</code> status, use <a
+	 * href="/docs/billing/subscriptions/subscription-schedules#managing">subscription
+	 * schedules</a> instead. Schedules provide the flexibility to model more complex
+	 * billing configurations that change over time.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Removes the currently applied discount on a subscription.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription
+	 */
+	public function deleteDiscount($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Initiates resumption of a paused subscription, optionally resetting the billing
+	 * cycle anchor and creating prorations. If a resumption invoice is generated, it
+	 * must be paid or marked uncollectible before the subscription will be unpaused.
+	 * If payment succeeds the subscription will become <code>active</code>, and if
+	 * payment fails the subscription will be <code>past_due</code>. The resumption
+	 * invoice will void automatically if not paid by the expiration date.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription
+	 */
+	public function resume($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the subscription with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Search for subscriptions you’ve previously created using Stripe’s <a
+	 * href="/docs/search#search-query-language">Search Query Language</a>. Don’t use
+	 * search in read-after-write flows where strict consistency is necessary. Under
+	 * normal operating conditions, data is searchable in less than a minute.
+	 * Occasionally, propagation of new or updated data can be up to an hour behind
+	 * during outages. Search functionality is not available to merchants in India.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<\Stripe\Subscription>
+	 */
+	public function search($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing subscription on a customer to match the specified
+	 * parameters. When changing plans or quantities, we will optionally prorate the
+	 * price we charge next month to make up for any price changes. To preview how the
+	 * proration will be calculated, use the <a href="#upcoming_invoice">upcoming
+	 * invoice</a> endpoint.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class TaxCodeService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * A list of <a href="https://stripe.com/docs/tax/tax-categories">all tax codes
+	 * available</a> to add to Products in order to allow specific tax calculations.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TaxCode>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing tax code. Supply the unique tax code ID and
+	 * Stripe will return the corresponding tax code information.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxCode
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class TaxRateService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your tax rates. Tax rates are returned sorted by creation
+	 * date, with the most recently created tax rates appearing first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TaxRate>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new tax rate.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxRate
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a tax rate with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxRate
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates an existing tax rate.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TaxRate
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Terminal;
+
+class ConfigurationService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of <code>Configuration</code> objects.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Terminal\Configuration>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new <code>Configuration</code> object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Configuration
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a <code>Configuration</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Configuration
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a <code>Configuration</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Configuration
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a new <code>Configuration</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Configuration
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class ConnectionTokenService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * To connect to a reader the Stripe Terminal SDK needs to retrieve a short-lived
+	 * connection token from Stripe, proxied through your server. On your backend, add
+	 * an endpoint that creates and returns a connection token.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\ConnectionToken
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+class LocationService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of <code>Location</code> objects.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Terminal\Location>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new <code>Location</code> object. For further details, including which
+	 * address fields are required in each country, see the <a
+	 * href="/docs/terminal/fleet/locations">Manage locations</a> guide.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Location
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a <code>Location</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Location
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a <code>Location</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Location
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a <code>Location</code> object by setting the values of the parameters
+	 * passed. Any parameters not provided will be left unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Location
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class ReaderService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of <code>Reader</code> objects.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Terminal\Reader>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels the current reader action.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function cancelAction($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new <code>Reader</code> object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a <code>Reader</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Initiates a payment flow on a Reader.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function processPaymentIntent($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Initiates a setup intent flow on a Reader.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function processSetupIntent($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Initiates a refund on a Reader.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function refundPayment($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a <code>Reader</code> object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Sets reader display to show cart details.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function setReaderDisplay($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates a <code>Reader</code> object by setting the values of the parameters
+	 * passed. Any parameters not provided will be left unchanged.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Terminal namespace.
+ *
+ * @property ConfigurationService $configurations
+ * @property ConnectionTokenService $connectionTokens
+ * @property LocationService $locations
+ * @property ReaderService $readers
+ */
+class TerminalServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service\TestHelpers;
+
+class CustomerService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Create an incoming testmode bank transfer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Customer
+	 */
+	public function fundCashBalance($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\TestHelpers\Issuing;
+
+class CardService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Updates the shipping status of the specified Issuing <code>Card</code> object to
+	 * <code>delivered</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function deliverCard($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the shipping status of the specified Issuing <code>Card</code> object to
+	 * <code>failure</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function failCard($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the shipping status of the specified Issuing <code>Card</code> object to
+	 * <code>returned</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function returnCard($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the shipping status of the specified Issuing <code>Card</code> object to
+	 * <code>shipped</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Issuing\Card
+	 */
+	public function shipCard($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Issuing namespace.
+ *
+ * @property CardService $cards
+ */
+class IssuingServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service\TestHelpers;
+
+class RefundService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Expire a refund with a status of <code>requires_action</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Refund
+	 */
+	public function expire($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\TestHelpers\Terminal;
+
+class ReaderService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Presents a payment method on a simulated reader. Can be used to simulate
+	 * accepting a payment, saving a card or refunding a transaction.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader
+	 */
+	public function presentPaymentMethod($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Terminal namespace.
+ *
+ * @property ReaderService $readers
+ */
+class TerminalServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service\TestHelpers;
+
+class TestClockService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Starts advancing a test clock to a specified time in the future. Advancement is
+	 * done when status changes to <code>Ready</code>.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TestHelpers\TestClock
+	 */
+	public function advance($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Returns a list of your test clocks.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TestHelpers\TestClock>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new test clock that can be attached to new customers and quotes.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TestHelpers\TestClock
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Deletes a test clock.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TestHelpers\TestClock
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a test clock.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TestHelpers\TestClock
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the TestHelpers namespace.
+ *
+ * @property CustomerService $customers
+ * @property Issuing\IssuingServiceFactory $issuing
+ * @property RefundService $refunds
+ * @property Terminal\TerminalServiceFactory $terminal
+ * @property TestClockService $testClocks
+ * @property Treasury\TreasuryServiceFactory $treasury
+ */
+class TestHelpersServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service\TestHelpers\Treasury;
+
+class InboundTransferService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Transitions a test mode created InboundTransfer to the <code>failed</code>
+	 * status. The InboundTransfer must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer
+	 */
+	public function fail($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Marks the test mode InboundTransfer object as returned and links the
+	 * InboundTransfer to a ReceivedDebit. The InboundTransfer must already be in the
+	 * <code>succeeded</code> state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer
+	 */
+	public function returnInboundTransfer($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Transitions a test mode created InboundTransfer to the <code>succeeded</code>
+	 * status. The InboundTransfer must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer
+	 */
+	public function succeed($id, $params = null, $opts = null)
+	{
+	}
+}
+class OutboundPaymentService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Transitions a test mode created OutboundPayment to the <code>failed</code>
+	 * status. The OutboundPayment must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment
+	 */
+	public function fail($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Transitions a test mode created OutboundPayment to the <code>posted</code>
+	 * status. The OutboundPayment must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment
+	 */
+	public function post($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Transitions a test mode created OutboundPayment to the <code>returned</code>
+	 * status. The OutboundPayment must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment
+	 */
+	public function returnOutboundPayment($id, $params = null, $opts = null)
+	{
+	}
+}
+class OutboundTransferService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Transitions a test mode created OutboundTransfer to the <code>failed</code>
+	 * status. The OutboundTransfer must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer
+	 */
+	public function fail($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Transitions a test mode created OutboundTransfer to the <code>posted</code>
+	 * status. The OutboundTransfer must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer
+	 */
+	public function post($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Transitions a test mode created OutboundTransfer to the <code>returned</code>
+	 * status. The OutboundTransfer must already be in the <code>processing</code>
+	 * state.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer
+	 */
+	public function returnOutboundTransfer($id, $params = null, $opts = null)
+	{
+	}
+}
+class ReceivedCreditService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Use this endpoint to simulate a test mode ReceivedCredit initiated by a third
+	 * party. In live mode, you can’t directly create ReceivedCredits initiated by
+	 * third parties.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\ReceivedCredit
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+class ReceivedDebitService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Use this endpoint to simulate a test mode ReceivedDebit initiated by a third
+	 * party. In live mode, you can’t directly create ReceivedDebits initiated by third
+	 * parties.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\ReceivedDebit
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Treasury namespace.
+ *
+ * @property InboundTransferService $inboundTransfers
+ * @property OutboundPaymentService $outboundPayments
+ * @property OutboundTransferService $outboundTransfers
+ * @property ReceivedCreditService $receivedCredits
+ * @property ReceivedDebitService $receivedDebits
+ */
+class TreasuryServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class TokenService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Creates a single-use token that represents a bank account’s details. This token
+	 * can be used with any API method in place of a bank account dictionary. This
+	 * token can be used only once, by attaching it to a <a href="#accounts">Custom
+	 * account</a>.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Token
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the token with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Token
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class TopupService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of top-ups.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Topup>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels a top-up. Only pending top-ups can be canceled.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Topup
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Top up the balance of an account.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Topup
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a top-up that has previously been created. Supply the
+	 * unique top-up ID that was returned from your previous request, and Stripe will
+	 * return the corresponding top-up information.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Topup
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the metadata of a top-up. Other top-up details are not editable by
+	 * design.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Topup
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+class TransferService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of existing transfers sent to connected accounts. The transfers
+	 * are returned in sorted order, with the most recently created transfers appearing
+	 * first.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Transfer>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * You can see a list of the reversals belonging to a specific transfer. Note that
+	 * the 10 most recent reversals are always available by default on the transfer
+	 * object. If you need more than those 10, you can use this API method and the
+	 * <code>limit</code> and <code>starting_after</code> parameters to page through
+	 * additional reversals.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TransferReversal>
+	 */
+	public function allReversals($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * To send funds from your Stripe account to a connected account, you create a new
+	 * transfer object. Your <a href="#balance">Stripe balance</a> must be able to
+	 * cover the transfer amount, or you’ll receive an “Insufficient Funds” error.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Transfer
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * When you create a new reversal, you must specify a transfer to create it on.
+	 *
+	 * When reversing transfers, you can optionally reverse part of the transfer. You
+	 * can do so as many times as you wish until the entire transfer has been reversed.
+	 *
+	 * Once entirely reversed, a transfer can’t be reversed again. This method will
+	 * return an error when called on an already-reversed transfer, or when trying to
+	 * reverse more money than is left on a transfer.
+	 *
+	 * @param string $parentId
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TransferReversal
+	 */
+	public function createReversal($parentId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing transfer. Supply the unique transfer ID
+	 * from either a transfer creation request or the transfer list, and Stripe will
+	 * return the corresponding transfer information.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Transfer
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * By default, you can see the 10 most recent reversals stored directly on the
+	 * transfer object, but you can also retrieve details about a specific reversal
+	 * stored on the transfer.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TransferReversal
+	 */
+	public function retrieveReversal($parentId, $id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified transfer by setting the values of the parameters passed.
+	 * Any parameters not provided will be left unchanged.
+	 *
+	 * This request accepts only metadata as an argument.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Transfer
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the specified reversal by setting the values of the parameters passed.
+	 * Any parameters not provided will be left unchanged.
+	 *
+	 * This request only accepts metadata and description as arguments.
+	 *
+	 * @param string $parentId
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TransferReversal
+	 */
+	public function updateReversal($parentId, $id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\Service\Treasury;
+
+class CreditReversalService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of CreditReversals.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\CreditReversal>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Reverses a ReceivedCredit and creates a CreditReversal object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\CreditReversal
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing CreditReversal by passing the unique
+	 * CreditReversal ID from either the CreditReversal creation request or
+	 * CreditReversal list.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\CreditReversal
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class DebitReversalService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of DebitReversals.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\DebitReversal>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Reverses a ReceivedDebit and creates a DebitReversal object.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\DebitReversal
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a DebitReversal object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\DebitReversal
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class FinancialAccountService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of FinancialAccounts.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\FinancialAccount>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates a new FinancialAccount. For now, each connected account can only have
+	 * one FinancialAccount.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of a FinancialAccount.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves Features information associated with the FinancialAccount.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount
+	 */
+	public function retrieveFeatures($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the details of a FinancialAccount.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the Features associated with a FinancialAccount.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount
+	 */
+	public function updateFeatures($id, $params = null, $opts = null)
+	{
+	}
+}
+class InboundTransferService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of InboundTransfers sent from the specified FinancialAccount.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\InboundTransfer>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancels an InboundTransfer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an InboundTransfer.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing InboundTransfer.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class OutboundPaymentService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of OutboundPayments sent from the specified FinancialAccount.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\OutboundPayment>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Cancel an OutboundPayment.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an OutboundPayment.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing OutboundPayment by passing the unique
+	 * OutboundPayment ID from either the OutboundPayment creation request or
+	 * OutboundPayment list.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class OutboundTransferService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of OutboundTransfers sent from the specified FinancialAccount.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\OutboundTransfer>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * An OutboundTransfer can be canceled if the funds have not yet been paid out.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer
+	 */
+	public function cancel($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Creates an OutboundTransfer.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing OutboundTransfer by passing the unique
+	 * OutboundTransfer ID from either the OutboundTransfer creation request or
+	 * OutboundTransfer list.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class ReceivedCreditService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of ReceivedCredits.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\ReceivedCredit>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing ReceivedCredit by passing the unique
+	 * ReceivedCredit ID from the ReceivedCredit list.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\ReceivedCredit
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class ReceivedDebitService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of ReceivedDebits.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\ReceivedDebit>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing ReceivedDebit by passing the unique
+	 * ReceivedDebit ID from the ReceivedDebit list.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\ReceivedDebit
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class TransactionEntryService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Retrieves a list of TransactionEntry objects.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\TransactionEntry>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves a TransactionEntry object.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\TransactionEntry
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+class TransactionService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Retrieves a list of Transaction objects.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\Treasury\Transaction>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the details of an existing Transaction.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\Transaction
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Service factory class for API resources in the Treasury namespace.
+ *
+ * @property CreditReversalService $creditReversals
+ * @property DebitReversalService $debitReversals
+ * @property FinancialAccountService $financialAccounts
+ * @property InboundTransferService $inboundTransfers
+ * @property OutboundPaymentService $outboundPayments
+ * @property OutboundTransferService $outboundTransfers
+ * @property ReceivedCreditService $receivedCredits
+ * @property ReceivedDebitService $receivedDebits
+ * @property TransactionEntryService $transactionEntries
+ * @property TransactionService $transactions
+ */
+class TreasuryServiceFactory extends \Stripe\Service\AbstractServiceFactory
+{
+	protected function getServiceClass($name)
+	{
+	}
+}
+namespace Stripe\Service;
+
+class WebhookEndpointService extends \Stripe\Service\AbstractService
+{
+	/**
+	 * Returns a list of your webhook endpoints.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\WebhookEndpoint>
+	 */
+	public function all($params = null, $opts = null)
+	{
+	}
+	/**
+	 * A webhook endpoint must have a <code>url</code> and a list of
+	 * <code>enabled_events</code>. You may optionally specify the Boolean
+	 * <code>connect</code> parameter. If set to true, then a Connect webhook endpoint
+	 * that notifies the specified <code>url</code> about events from all connected
+	 * accounts is created; otherwise an account webhook endpoint that notifies the
+	 * specified <code>url</code> only about events from your account is created. You
+	 * can also create webhook endpoints in the <a
+	 * href="https://dashboard.stripe.com/account/webhooks">webhooks settings</a>
+	 * section of the Dashboard.
+	 *
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\WebhookEndpoint
+	 */
+	public function create($params = null, $opts = null)
+	{
+	}
+	/**
+	 * You can also delete webhook endpoints via the <a
+	 * href="https://dashboard.stripe.com/account/webhooks">webhook endpoint
+	 * management</a> page of the Stripe dashboard.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\WebhookEndpoint
+	 */
+	public function delete($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Retrieves the webhook endpoint with the given ID.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\WebhookEndpoint
+	 */
+	public function retrieve($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * Updates the webhook endpoint. You may edit the <code>url</code>, the list of
+	 * <code>enabled_events</code>, and the status of your endpoint.
+	 *
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|\Stripe\Util\RequestOptions $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\WebhookEndpoint
+	 */
+	public function update($id, $params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * A SetupAttempt describes one attempted confirmation of a SetupIntent, whether
+ * that confirmation was successful or unsuccessful. You can use SetupAttempts to
+ * inspect details of a specific attempt at setting up a payment method using a
+ * SetupIntent.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-application">application</a> on the SetupIntent at the time of this confirmation.
+ * @property null|bool $attach_to_self <p>If present, the SetupIntent's payment method will be attached to the in-context Stripe Account.</p><p>It can only be used for this Stripe Account’s own money movement flows like InboundTransfer and OutboundTransfers. It cannot be set to true when setting up a PaymentMethod for a Customer, and defaults to false when attaching a PaymentMethod to a Customer.</p>
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-customer">customer</a> on the SetupIntent at the time of this confirmation.
+ * @property null|string[] $flow_directions <p>Indicates the directions of money movement for which this payment method is intended to be used.</p><p>Include <code>inbound</code> if you intend to use the payment method as the origin to pull funds from. Include <code>outbound</code> if you intend to use the payment method as the destination to send funds to. You can include both if you intend to use the payment method for both purposes.</p>
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Account $on_behalf_of The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-on_behalf_of">on_behalf_of</a> on the SetupIntent at the time of this confirmation.
+ * @property string|\Stripe\PaymentMethod $payment_method ID of the payment method used with this SetupAttempt.
+ * @property \Stripe\StripeObject $payment_method_details
+ * @property null|\Stripe\StripeObject $setup_error The error encountered during this attempt to confirm the SetupIntent, if any.
+ * @property string|\Stripe\SetupIntent $setup_intent ID of the SetupIntent that this attempt belongs to.
+ * @property string $status Status of this SetupAttempt, one of <code>requires_confirmation</code>, <code>requires_action</code>, <code>processing</code>, <code>succeeded</code>, <code>failed</code>, or <code>abandoned</code>.
+ * @property string $usage The value of <a href="https://stripe.com/docs/api/setup_intents/object#setup_intent_object-usage">usage</a> on the SetupIntent at the time of this confirmation, one of <code>off_session</code> or <code>on_session</code>.
+ */
+class SetupAttempt extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'setup_attempt';
+	use \Stripe\ApiOperations\All;
+}
+/**
+ * A SetupIntent guides you through the process of setting up and saving a
+ * customer's payment credentials for future payments. For example, you could use a
+ * SetupIntent to set up and save your customer's card without immediately
+ * collecting a payment. Later, you can use <a
+ * href="https://stripe.com/docs/api#payment_intents">PaymentIntents</a> to drive
+ * the payment flow.
+ *
+ * Create a SetupIntent as soon as you're ready to collect your customer's payment
+ * credentials. Do not maintain long-lived, unconfirmed SetupIntents as they may no
+ * longer be valid. The SetupIntent then transitions through multiple <a
+ * href="https://stripe.com/docs/payments/intents#intent-statuses">statuses</a> as
+ * it guides you through the setup process.
+ *
+ * Successful SetupIntents result in payment credentials that are optimized for
+ * future payments. For example, cardholders in <a
+ * href="/guides/strong-customer-authentication">certain regions</a> may need to be
+ * run through <a
+ * href="https://stripe.com/docs/strong-customer-authentication">Strong Customer
+ * Authentication</a> at the time of payment method collection in order to
+ * streamline later <a
+ * href="https://stripe.com/docs/payments/setup-intents">off-session payments</a>.
+ * If the SetupIntent is used with a <a
+ * href="https://stripe.com/docs/api#setup_intent_object-customer">Customer</a>,
+ * upon success, it will automatically attach the resulting payment method to that
+ * Customer. We recommend using SetupIntents or <a
+ * href="https://stripe.com/docs/api#payment_intent_object-setup_future_usage">setup_future_usage</a>
+ * on PaymentIntents to save payment methods in order to prevent saving invalid or
+ * unoptimized payment methods.
+ *
+ * By using SetupIntents, you ensure that your customers experience the minimum set
+ * of required friction, even as regulations change over time.
+ *
+ * Related guide: <a href="https://stripe.com/docs/payments/setup-intents">Setup
+ * Intents API</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the SetupIntent.
+ * @property null|bool $attach_to_self <p>If present, the SetupIntent's payment method will be attached to the in-context Stripe Account.</p><p>It can only be used for this Stripe Account’s own money movement flows like InboundTransfer and OutboundTransfers. It cannot be set to true when setting up a PaymentMethod for a Customer, and defaults to false when attaching a PaymentMethod to a Customer.</p>
+ * @property null|string $cancellation_reason Reason for cancellation of this SetupIntent, one of <code>abandoned</code>, <code>requested_by_customer</code>, or <code>duplicate</code>.
+ * @property null|string $client_secret <p>The client secret of this SetupIntent. Used for client-side retrieval using a publishable key.</p><p>The client secret can be used to complete payment setup from your frontend. It should not be stored, logged, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.</p>
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer <p>ID of the Customer this SetupIntent belongs to, if one exists.</p><p>If present, the SetupIntent's payment method will be attached to the Customer on successful setup. Payment methods attached to other Customers cannot be used with this SetupIntent.</p>
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string[] $flow_directions <p>Indicates the directions of money movement for which this payment method is intended to be used.</p><p>Include <code>inbound</code> if you intend to use the payment method as the origin to pull funds from. Include <code>outbound</code> if you intend to use the payment method as the destination to send funds to. You can include both if you intend to use the payment method for both purposes.</p>
+ * @property null|\Stripe\StripeObject $last_setup_error The error encountered in the previous SetupIntent confirmation.
+ * @property null|string|\Stripe\SetupAttempt $latest_attempt The most recent SetupAttempt for this SetupIntent.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Mandate $mandate ID of the multi use Mandate generated by the SetupIntent.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $next_action If present, this property tells you what actions you need to take in order for your customer to continue payment setup.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the setup is intended.
+ * @property null|string|\Stripe\PaymentMethod $payment_method ID of the payment method used with this SetupIntent.
+ * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for this SetupIntent.
+ * @property string[] $payment_method_types The list of payment method types (e.g. card) that this SetupIntent is allowed to set up.
+ * @property null|string|\Stripe\Mandate $single_use_mandate ID of the single_use Mandate generated by the SetupIntent.
+ * @property string $status <a href="https://stripe.com/docs/payments/intents#intent-statuses">Status</a> of this SetupIntent, one of <code>requires_payment_method</code>, <code>requires_confirmation</code>, <code>requires_action</code>, <code>processing</code>, <code>canceled</code>, or <code>succeeded</code>.
+ * @property string $usage <p>Indicates how the payment method is intended to be used in the future.</p><p>Use <code>on_session</code> if you intend to only reuse the payment method when the customer is in your checkout flow. Use <code>off_session</code> if your customer may or may not be in your checkout flow. If not provided, this value defaults to <code>off_session</code>.</p>
+ */
+class SetupIntent extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'setup_intent';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_REQUIRES_ACTION = 'requires_action';
+	const STATUS_REQUIRES_CONFIRMATION = 'requires_confirmation';
+	const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
+	const STATUS_SUCCEEDED = 'succeeded';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent the canceled setup intent
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent the confirmed setup intent
+	 */
+	public function confirm($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SetupIntent the verified setup intent
+	 */
+	public function verifyMicrodeposits($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Shipping rates describe the price of shipping presented to your customers and
+ * can be applied to <a
+ * href="https://stripe.com/docs/payments/checkout/shipping">Checkout Sessions</a>
+ * and <a href="https://stripe.com/docs/orders/shipping">Orders</a> to collect
+ * shipping costs.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Whether the shipping rate can be used for new purchases. Defaults to <code>true</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $delivery_estimate The estimated range for how long shipping will take, meant to be displayable to the customer. This will appear on CheckoutSessions.
+ * @property null|string $display_name The name of the shipping rate, meant to be displayable to the customer. This will appear on CheckoutSessions.
+ * @property null|\Stripe\StripeObject $fixed_amount
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $tax_behavior Specifies whether the rate is considered inclusive of taxes or exclusive of taxes. One of <code>inclusive</code>, <code>exclusive</code>, or <code>unspecified</code>.
+ * @property null|string|\Stripe\TaxCode $tax_code A <a href="https://stripe.com/docs/tax/tax-categories">tax code</a> ID. The Shipping tax code is <code>txcd_92010001</code>.
+ * @property string $type The type of calculation to use on the shipping rate. Can only be <code>fixed_amount</code> for now.
+ */
+class ShippingRate extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'shipping_rate';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const TAX_BEHAVIOR_EXCLUSIVE = 'exclusive';
+	const TAX_BEHAVIOR_INCLUSIVE = 'inclusive';
+	const TAX_BEHAVIOR_UNSPECIFIED = 'unspecified';
+	const TYPE_FIXED_AMOUNT = 'fixed_amount';
+}
+namespace Stripe\Sigma;
+
+/**
+ * If you have <a href="https://stripe.com/docs/sigma/scheduled-queries">scheduled
+ * a Sigma query</a>, you'll receive a
+ * <code>sigma.scheduled_query_run.created</code> webhook each time the query runs.
+ * The webhook contains a <code>ScheduledQueryRun</code> object, which you can use
+ * to retrieve the query results.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $data_load_time When the query was run, Sigma contained a snapshot of your Stripe data at this time.
+ * @property null|\Stripe\StripeObject $error
+ * @property null|\Stripe\File $file The file object representing the results of the query.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $result_available_until Time at which the result expires and is no longer available for download.
+ * @property string $sql SQL for the query.
+ * @property string $status The query's execution status, which will be <code>completed</code> for successful runs, and <code>canceled</code>, <code>failed</code>, or <code>timed_out</code> otherwise.
+ * @property string $title Title of the query.
+ */
+class ScheduledQueryRun extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'scheduled_query_run';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	public static function classUrl()
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * <code>Source</code> objects allow you to accept a variety of payment methods.
+ * They represent a customer's payment instrument, and can be used with the Stripe
+ * API just like a <code>Card</code> object: once chargeable, they can be charged,
+ * or can be attached to customers.
+ *
+ * Stripe doesn't recommend using the deprecated <a
+ * href="https://stripe.com/docs/api/sources">Sources API</a>. We recommend that
+ * you adopt the <a
+ * href="https://stripe.com/docs/api/payment_methods">PaymentMethods API</a>. This
+ * newer API provides access to our latest features and payment method types.
+ *
+ * Related guides: <a href="https://stripe.com/docs/sources">Sources API</a> and <a
+ * href="https://stripe.com/docs/sources/customers">Sources &amp; Customers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $ach_credit_transfer
+ * @property null|\Stripe\StripeObject $ach_debit
+ * @property null|\Stripe\StripeObject $acss_debit
+ * @property null|\Stripe\StripeObject $alipay
+ * @property null|int $amount A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a zero-decimal currency) representing the total amount associated with the source. This is the amount for which the source will be chargeable once ready. Required for <code>single_use</code> sources.
+ * @property null|\Stripe\StripeObject $au_becs_debit
+ * @property null|\Stripe\StripeObject $bancontact
+ * @property null|\Stripe\StripeObject $card
+ * @property null|\Stripe\StripeObject $card_present
+ * @property string $client_secret The client secret of the source. Used for client-side retrieval using a publishable key.
+ * @property null|\Stripe\StripeObject $code_verification
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $currency Three-letter <a href="https://stripe.com/docs/currencies">ISO code for the currency</a> associated with the source. This is the currency for which the source will be chargeable once ready. Required for <code>single_use</code> sources.
+ * @property null|string $customer The ID of the customer to which this source is attached. This will not be present when the source has not been attached to a customer.
+ * @property null|\Stripe\StripeObject $eps
+ * @property string $flow The authentication <code>flow</code> of the source. <code>flow</code> is one of <code>redirect</code>, <code>receiver</code>, <code>code_verification</code>, <code>none</code>.
+ * @property null|\Stripe\StripeObject $giropay
+ * @property null|\Stripe\StripeObject $ideal
+ * @property null|\Stripe\StripeObject $klarna
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $multibanco
+ * @property null|\Stripe\StripeObject $owner Information about the owner of the payment instrument that may be used or required by particular source types.
+ * @property null|\Stripe\StripeObject $p24
+ * @property null|\Stripe\StripeObject $receiver
+ * @property null|\Stripe\StripeObject $redirect
+ * @property null|\Stripe\StripeObject $sepa_credit_transfer
+ * @property null|\Stripe\StripeObject $sepa_debit
+ * @property null|\Stripe\StripeObject $sofort
+ * @property null|\Stripe\StripeObject $source_order
+ * @property null|string $statement_descriptor Extra information about a source. This will appear on your customer's statement every time you charge the source.
+ * @property string $status The status of the source, one of <code>canceled</code>, <code>chargeable</code>, <code>consumed</code>, <code>failed</code>, or <code>pending</code>. Only <code>chargeable</code> sources can be used to create a charge.
+ * @property null|\Stripe\StripeObject $three_d_secure
+ * @property string $type The <code>type</code> of the source. The <code>type</code> is a payment method, one of <code>ach_credit_transfer</code>, <code>ach_debit</code>, <code>alipay</code>, <code>bancontact</code>, <code>card</code>, <code>card_present</code>, <code>eps</code>, <code>giropay</code>, <code>ideal</code>, <code>multibanco</code>, <code>klarna</code>, <code>p24</code>, <code>sepa_debit</code>, <code>sofort</code>, <code>three_d_secure</code>, or <code>wechat</code>. An additional hash is included on the source with a name matching this value. It contains additional information specific to the <a href="https://stripe.com/docs/sources">payment method</a> used.
+ * @property null|string $usage Either <code>reusable</code> or <code>single_use</code>. Whether this source should be reusable or not. Some source types may or may not be reusable by construction, while others may leave the option at creation. If an incompatible value is passed, an error will be returned.
+ * @property null|\Stripe\StripeObject $wechat
+ */
+class Source extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'source';
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const FLOW_CODE_VERIFICATION = 'code_verification';
+	const FLOW_NONE = 'none';
+	const FLOW_RECEIVER = 'receiver';
+	const FLOW_REDIRECT = 'redirect';
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_CHARGEABLE = 'chargeable';
+	const STATUS_CONSUMED = 'consumed';
+	const STATUS_FAILED = 'failed';
+	const STATUS_PENDING = 'pending';
+	const USAGE_REUSABLE = 'reusable';
+	const USAGE_SINGLE_USE = 'single_use';
+	use \Stripe\ApiOperations\NestedResource;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\UnexpectedValueException if the source is not attached to a customer
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source the detached source
+	 */
+	public function detach($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\SourceTransaction> list of SourceTransactions
+	 */
+	public static function allSourceTransactions($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Source the verified source
+	 */
+	public function verify($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Class SourceTransaction.
+ *
+ * @property string $id
+ * @property string $object
+ * @property \Stripe\StripeObject $ach_credit_transfer
+ * @property int $amount
+ * @property int $created
+ * @property string $customer_data
+ * @property string $currency
+ * @property string $type
+ */
+class SourceTransaction extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'source_transaction';
+}
+/**
+ * Class Stripe.
+ */
+class Stripe
+{
+	/** @var string The Stripe API key to be used for requests. */
+	public static $apiKey;
+	/** @var string The Stripe client_id to be used for Connect requests. */
+	public static $clientId;
+	/** @var string The base URL for the Stripe API. */
+	public static $apiBase = 'https://api.stripe.com';
+	/** @var string The base URL for the OAuth API. */
+	public static $connectBase = 'https://connect.stripe.com';
+	/** @var string The base URL for the Stripe API uploads endpoint. */
+	public static $apiUploadBase = 'https://files.stripe.com';
+	/** @var null|string The version of the Stripe API to use for requests. */
+	public static $apiVersion = null;
+	/** @var null|string The account ID for connected accounts requests. */
+	public static $accountId = null;
+	/** @var string Path to the CA bundle used to verify SSL certificates */
+	public static $caBundlePath = null;
+	/** @var bool Defaults to true. */
+	public static $verifySslCerts = true;
+	/** @var array The application's information (name, version, URL) */
+	public static $appInfo = null;
+	/**
+	 * @var null|Util\LoggerInterface the logger to which the library will
+	 *   produce messages
+	 */
+	public static $logger = null;
+	/** @var int Maximum number of request retries */
+	public static $maxNetworkRetries = 0;
+	/** @var bool Whether client telemetry is enabled. Defaults to true. */
+	public static $enableTelemetry = true;
+	const VERSION = '10.7.0';
+	/**
+	 * @return string the API key used for requests
+	 */
+	public static function getApiKey()
+	{
+	}
+	/**
+	 * @return string the client_id used for Connect requests
+	 */
+	public static function getClientId()
+	{
+	}
+	/**
+	 * @return Util\LoggerInterface the logger to which the library will
+	 *   produce messages
+	 */
+	public static function getLogger()
+	{
+	}
+	/**
+	 * @param \Psr\Log\LoggerInterface|Util\LoggerInterface $logger the logger to which the library
+	 *                                                              will produce messages
+	 */
+	public static function setLogger($logger)
+	{
+	}
+	/**
+	 * Sets the API key to be used for requests.
+	 *
+	 * @param string $apiKey
+	 */
+	public static function setApiKey($apiKey)
+	{
+	}
+	/**
+	 * Sets the client_id to be used for Connect requests.
+	 *
+	 * @param string $clientId
+	 */
+	public static function setClientId($clientId)
+	{
+	}
+	/**
+	 * @return string The API version used for requests. null if we're using the
+	 *    latest version.
+	 */
+	public static function getApiVersion()
+	{
+	}
+	/**
+	 * @param string $apiVersion the API version to use for requests
+	 */
+	public static function setApiVersion($apiVersion)
+	{
+	}
+	/**
+	 * @return string
+	 */
+	public static function getCABundlePath()
+	{
+	}
+	/**
+	 * @param string $caBundlePath
+	 */
+	public static function setCABundlePath($caBundlePath)
+	{
+	}
+	/**
+	 * @return bool
+	 */
+	public static function getVerifySslCerts()
+	{
+	}
+	/**
+	 * @param bool $verify
+	 */
+	public static function setVerifySslCerts($verify)
+	{
+	}
+	/**
+	 * @return null|string The Stripe account ID for connected account
+	 *   requests
+	 */
+	public static function getAccountId()
+	{
+	}
+	/**
+	 * @param null|string $accountId the Stripe account ID to set for connected
+	 *                               account requests
+	 */
+	public static function setAccountId($accountId)
+	{
+	}
+	/**
+	 * @return null|array The application's information
+	 */
+	public static function getAppInfo()
+	{
+	}
+	/**
+	 * @param string $appName The application's name
+	 * @param null|string $appVersion The application's version
+	 * @param null|string $appUrl The application's URL
+	 * @param null|string $appPartnerId The application's partner ID
+	 */
+	public static function setAppInfo($appName, $appVersion = null, $appUrl = null, $appPartnerId = null)
+	{
+	}
+	/**
+	 * @return int Maximum number of request retries
+	 */
+	public static function getMaxNetworkRetries()
+	{
+	}
+	/**
+	 * @param int $maxNetworkRetries Maximum number of request retries
+	 */
+	public static function setMaxNetworkRetries($maxNetworkRetries)
+	{
+	}
+	/**
+	 * @return float Maximum delay between retries, in seconds
+	 */
+	public static function getMaxNetworkRetryDelay()
+	{
+	}
+	/**
+	 * @return float Maximum delay between retries, in seconds, that will be respected from the Stripe API
+	 */
+	public static function getMaxRetryAfter()
+	{
+	}
+	/**
+	 * @return float Initial delay between retries, in seconds
+	 */
+	public static function getInitialNetworkRetryDelay()
+	{
+	}
+	/**
+	 * @return bool Whether client telemetry is enabled
+	 */
+	public static function getEnableTelemetry()
+	{
+	}
+	/**
+	 * @param bool $enableTelemetry Enables client telemetry.
+	 *
+	 *                              Client telemetry enables timing and request metrics to be sent back to Stripe as an HTTP Header
+	 *                              with the current request. This enables Stripe to do latency and metrics analysis without adding extra
+	 *                              overhead (such as extra network calls) on the client.
+	 */
+	public static function setEnableTelemetry($enableTelemetry)
+	{
+	}
+}
+/**
+ * Client used to send requests to Stripe's API.
+ *
+ * @property \Stripe\Service\AccountLinkService $accountLinks
+ * @property \Stripe\Service\AccountService $accounts
+ * @property \Stripe\Service\ApplePayDomainService $applePayDomains
+ * @property \Stripe\Service\ApplicationFeeService $applicationFees
+ * @property \Stripe\Service\Apps\AppsServiceFactory $apps
+ * @property \Stripe\Service\BalanceService $balance
+ * @property \Stripe\Service\BalanceTransactionService $balanceTransactions
+ * @property \Stripe\Service\BillingPortal\BillingPortalServiceFactory $billingPortal
+ * @property \Stripe\Service\ChargeService $charges
+ * @property \Stripe\Service\Checkout\CheckoutServiceFactory $checkout
+ * @property \Stripe\Service\CountrySpecService $countrySpecs
+ * @property \Stripe\Service\CouponService $coupons
+ * @property \Stripe\Service\CreditNoteService $creditNotes
+ * @property \Stripe\Service\CustomerService $customers
+ * @property \Stripe\Service\DisputeService $disputes
+ * @property \Stripe\Service\EphemeralKeyService $ephemeralKeys
+ * @property \Stripe\Service\EventService $events
+ * @property \Stripe\Service\ExchangeRateService $exchangeRates
+ * @property \Stripe\Service\FileLinkService $fileLinks
+ * @property \Stripe\Service\FileService $files
+ * @property \Stripe\Service\FinancialConnections\FinancialConnectionsServiceFactory $financialConnections
+ * @property \Stripe\Service\Identity\IdentityServiceFactory $identity
+ * @property \Stripe\Service\InvoiceItemService $invoiceItems
+ * @property \Stripe\Service\InvoiceService $invoices
+ * @property \Stripe\Service\Issuing\IssuingServiceFactory $issuing
+ * @property \Stripe\Service\MandateService $mandates
+ * @property \Stripe\Service\OAuthService $oauth
+ * @property \Stripe\Service\PaymentIntentService $paymentIntents
+ * @property \Stripe\Service\PaymentLinkService $paymentLinks
+ * @property \Stripe\Service\PaymentMethodService $paymentMethods
+ * @property \Stripe\Service\PayoutService $payouts
+ * @property \Stripe\Service\PlanService $plans
+ * @property \Stripe\Service\PriceService $prices
+ * @property \Stripe\Service\ProductService $products
+ * @property \Stripe\Service\PromotionCodeService $promotionCodes
+ * @property \Stripe\Service\QuoteService $quotes
+ * @property \Stripe\Service\Radar\RadarServiceFactory $radar
+ * @property \Stripe\Service\RefundService $refunds
+ * @property \Stripe\Service\Reporting\ReportingServiceFactory $reporting
+ * @property \Stripe\Service\ReviewService $reviews
+ * @property \Stripe\Service\SetupAttemptService $setupAttempts
+ * @property \Stripe\Service\SetupIntentService $setupIntents
+ * @property \Stripe\Service\ShippingRateService $shippingRates
+ * @property \Stripe\Service\Sigma\SigmaServiceFactory $sigma
+ * @property \Stripe\Service\SourceService $sources
+ * @property \Stripe\Service\SubscriptionItemService $subscriptionItems
+ * @property \Stripe\Service\SubscriptionScheduleService $subscriptionSchedules
+ * @property \Stripe\Service\SubscriptionService $subscriptions
+ * @property \Stripe\Service\TaxCodeService $taxCodes
+ * @property \Stripe\Service\TaxRateService $taxRates
+ * @property \Stripe\Service\Terminal\TerminalServiceFactory $terminal
+ * @property \Stripe\Service\TestHelpers\TestHelpersServiceFactory $testHelpers
+ * @property \Stripe\Service\TokenService $tokens
+ * @property \Stripe\Service\TopupService $topups
+ * @property \Stripe\Service\TransferService $transfers
+ * @property \Stripe\Service\Treasury\TreasuryServiceFactory $treasury
+ * @property \Stripe\Service\WebhookEndpointService $webhookEndpoints
+ */
+class StripeClient extends \Stripe\BaseStripeClient
+{
+	public function __get($name)
+	{
+	}
+}
+/**
+ * Subscriptions allow you to charge a customer on a recurring basis.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/creating">Creating
+ * Subscriptions</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the subscription.
+ * @property null|float $application_fee_percent A non-negative decimal between 0 and 100, with at most two decimal places. This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account.
+ * @property \Stripe\StripeObject $automatic_tax
+ * @property int $billing_cycle_anchor Determines the date of the first full invoice, and, for plans with <code>month</code> or <code>year</code> intervals, the day of the month for subsequent invoices. The timestamp is in UTC format.
+ * @property null|\Stripe\StripeObject $billing_thresholds Define thresholds at which an invoice will be sent, and the subscription advanced to a new billing period
+ * @property null|int $cancel_at A date in the future at which the subscription will automatically get canceled
+ * @property bool $cancel_at_period_end If the subscription has been canceled with the <code>at_period_end</code> flag set to <code>true</code>, <code>cancel_at_period_end</code> on the subscription will be true. You can use this attribute to determine whether a subscription that has a status of active is scheduled to be canceled at the end of the current period.
+ * @property null|int $canceled_at If the subscription has been canceled, the date of that cancellation. If the subscription was canceled with <code>cancel_at_period_end</code>, <code>canceled_at</code> will reflect the time of the most recent update request, not the end of the subscription period when the subscription is automatically moved to a canceled state.
+ * @property string $collection_method Either <code>charge_automatically</code>, or <code>send_invoice</code>. When charging automatically, Stripe will attempt to pay this subscription at the end of the cycle using the default source attached to the customer. When sending an invoice, Stripe will email your customer an invoice with payment instructions and mark the subscription as <code>active</code>.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property int $current_period_end End of the current period that the subscription has been invoiced for. At the end of this period, a new invoice will be created.
+ * @property int $current_period_start Start of the current period that the subscription has been invoiced for.
+ * @property string|\Stripe\Customer $customer ID of the customer who owns the subscription.
+ * @property null|int $days_until_due Number of days a customer has to pay invoices generated by this subscription. This value will be <code>null</code> for subscriptions where <code>collection_method=charge_automatically</code>.
+ * @property null|string|\Stripe\PaymentMethod $default_payment_method ID of the default payment method for the subscription. It must belong to the customer associated with the subscription. This takes precedence over <code>default_source</code>. If neither are set, invoices will use the customer's <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> or <a href="https://stripe.com/docs/api/customers/object#customer_object-default_source">default_source</a>.
+ * @property null|string|\Stripe\Account|\Stripe\BankAccount|\Stripe\Card|\Stripe\Source $default_source ID of the default payment source for the subscription. It must belong to the customer associated with the subscription and be in a chargeable state. If <code>default_payment_method</code> is also set, <code>default_payment_method</code> will take precedence. If neither are set, invoices will use the customer's <a href="https://stripe.com/docs/api/customers/object#customer_object-invoice_settings-default_payment_method">invoice_settings.default_payment_method</a> or <a href="https://stripe.com/docs/api/customers/object#customer_object-default_source">default_source</a>.
+ * @property null|\Stripe\TaxRate[] $default_tax_rates The tax rates that will apply to any subscription item that does not have <code>tax_rates</code> set. Invoices created will have their <code>default_tax_rates</code> populated from the subscription.
+ * @property null|string $description The subscription's description, meant to be displayable to the customer. Use this field to optionally store an explanation of the subscription for rendering in Stripe surfaces.
+ * @property null|\Stripe\Discount $discount Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a subscription overrides a discount applied on a customer-wide basis.
+ * @property null|int $ended_at If the subscription has ended, the date the subscription ended.
+ * @property \Stripe\Collection<\Stripe\SubscriptionItem> $items List of subscription items, each with an attached price.
+ * @property null|string|\Stripe\Invoice $latest_invoice The most recent invoice this subscription has generated.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|int $next_pending_invoice_item_invoice Specifies the approximate timestamp on which any pending invoice items will be billed according to the schedule provided at <code>pending_invoice_item_interval</code>.
+ * @property null|string|\Stripe\Account $on_behalf_of The account (if any) the charge was made on behalf of for charges associated with this subscription. See the Connect documentation for details.
+ * @property null|\Stripe\StripeObject $pause_collection If specified, payment collection for this subscription will be paused.
+ * @property null|\Stripe\StripeObject $payment_settings Payment settings passed on to invoices created by the subscription.
+ * @property null|\Stripe\StripeObject $pending_invoice_item_interval Specifies an interval for how often to bill for any pending invoice items. It is analogous to calling <a href="https://stripe.com/docs/api#create_invoice">Create an invoice</a> for the given subscription at the specified interval.
+ * @property null|string|\Stripe\SetupIntent $pending_setup_intent You can use this <a href="https://stripe.com/docs/api/setup_intents">SetupIntent</a> to collect user authentication when creating a subscription without immediate payment or updating a subscription's payment method, allowing you to optimize for off-session payments. Learn more in the <a href="https://stripe.com/docs/billing/migration/strong-customer-authentication#scenario-2">SCA Migration Guide</a>.
+ * @property null|\Stripe\StripeObject $pending_update If specified, <a href="https://stripe.com/docs/billing/subscriptions/pending-updates">pending updates</a> that will be applied to the subscription once the <code>latest_invoice</code> has been paid.
+ * @property null|string|\Stripe\SubscriptionSchedule $schedule The schedule attached to the subscription
+ * @property int $start_date Date when the subscription was first created. The date might differ from the <code>created</code> date due to backdating.
+ * @property string $status <p>Possible values are <code>incomplete</code>, <code>incomplete_expired</code>, <code>trialing</code>, <code>active</code>, <code>past_due</code>, <code>canceled</code>, or <code>unpaid</code>.</p><p>For <code>collection_method=charge_automatically</code> a subscription moves into <code>incomplete</code> if the initial payment attempt fails. A subscription in this state can only have metadata and default_source updated. Once the first invoice is paid, the subscription moves into an <code>active</code> state. If the first invoice is not paid within 23 hours, the subscription transitions to <code>incomplete_expired</code>. This is a terminal state, the open invoice will be voided and no further invoices will be generated.</p><p>A subscription that is currently in a trial period is <code>trialing</code> and moves to <code>active</code> when the trial period is over.</p><p>If subscription <code>collection_method=charge_automatically</code> it becomes <code>past_due</code> when payment to renew it fails and <code>canceled</code> or <code>unpaid</code> (depending on your subscriptions settings) when Stripe has exhausted all payment retry attempts.</p><p>If subscription <code>collection_method=send_invoice</code> it becomes <code>past_due</code> when its invoice is not paid by the due date, and <code>canceled</code> or <code>unpaid</code> if it is still not paid by an additional deadline after that. Note that when a subscription has a status of <code>unpaid</code>, no subsequent invoices will be attempted (invoices will be created, but then immediately automatically closed). After receiving updated payment information from a customer, you may choose to reopen and pay their closed invoices.</p>
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this subscription belongs to.
+ * @property null|\Stripe\StripeObject $transfer_data The account (if any) the subscription's payments will be attributed to for tax reporting, and where funds from each payment will be transferred to for each of the subscription's invoices.
+ * @property null|int $trial_end If the subscription has a trial, the end of that trial.
+ * @property null|\Stripe\StripeObject $trial_settings Settings related to subscription trials.
+ * @property null|int $trial_start If the subscription has a trial, the beginning of that trial.
+ */
+class Subscription extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'subscription';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Search;
+	use \Stripe\ApiOperations\Update;
+	const PAYMENT_BEHAVIOR_ALLOW_INCOMPLETE = 'allow_incomplete';
+	const PAYMENT_BEHAVIOR_DEFAULT_INCOMPLETE = 'default_incomplete';
+	const PAYMENT_BEHAVIOR_ERROR_IF_INCOMPLETE = 'error_if_incomplete';
+	const PAYMENT_BEHAVIOR_PENDING_IF_INCOMPLETE = 'pending_if_incomplete';
+	const PRORATION_BEHAVIOR_ALWAYS_INVOICE = 'always_invoice';
+	const PRORATION_BEHAVIOR_CREATE_PRORATIONS = 'create_prorations';
+	const PRORATION_BEHAVIOR_NONE = 'none';
+	const STATUS_ACTIVE = 'active';
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_INCOMPLETE = 'incomplete';
+	const STATUS_INCOMPLETE_EXPIRED = 'incomplete_expired';
+	const STATUS_PAST_DUE = 'past_due';
+	const STATUS_PAUSED = 'paused';
+	const STATUS_TRIALING = 'trialing';
+	const STATUS_UNPAID = 'unpaid';
+	use \Stripe\ApiOperations\Delete {
+		delete as protected _delete;
+	}
+	public static function getSavedNestedResources()
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription the updated subscription
+	 */
+	public function deleteDiscount($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription the canceled subscription
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Subscription the resumed subscription
+	 */
+	public function resume($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SearchResult<Subscription> the subscription search results
+	 */
+	public static function search($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Subscription items allow you to create customer subscriptions with more than one
+ * plan, making it easy to represent complex billing relationships.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $billing_thresholds Define thresholds at which an invoice will be sent, and the related subscription advanced to a new billing period
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\Plan $plan <p>You can now model subscriptions more flexibly using the <a href="https://stripe.com/docs/api#prices">Prices API</a>. It replaces the Plans API and is backwards compatible to simplify your migration.</p><p>Plans define the base price, currency, and billing cycle for recurring purchases of products. <a href="https://stripe.com/docs/api#products">Products</a> help you track inventory or provisioning, and plans help you track pricing. Different physical goods or levels of service should be represented by products, and pricing options should be represented by plans. This approach lets you change prices without having to change your provisioning scheme.</p><p>For example, you might have a single &quot;gold&quot; product that has plans for $10/month, $100/year, €9/month, and €90/year.</p><p>Related guides: <a href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up a subscription</a> and more about <a href="https://stripe.com/docs/products-prices/overview">products and prices</a>.</p>
+ * @property \Stripe\Price $price <p>Prices define the unit cost, currency, and (optional) billing cycle for both recurring and one-time purchases of products. <a href="https://stripe.com/docs/api#products">Products</a> help you track inventory or provisioning, and prices help you track payment terms. Different physical goods or levels of service should be represented by products, and pricing options should be represented by prices. This approach lets you change prices without having to change your provisioning scheme.</p><p>For example, you might have a single &quot;gold&quot; product that has prices for $10/month, $100/year, and €9 once.</p><p>Related guides: <a href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up a subscription</a>, <a href="https://stripe.com/docs/billing/invoices/create">create an invoice</a>, and more about <a href="https://stripe.com/docs/products-prices/overview">products and prices</a>.</p>
+ * @property null|int $quantity The <a href="https://stripe.com/docs/subscriptions/quantities">quantity</a> of the plan to which the customer should be subscribed.
+ * @property string $subscription The <code>subscription</code> this <code>subscription_item</code> belongs to.
+ * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to this <code>subscription_item</code>. When set, the <code>default_tax_rates</code> on the subscription do not apply to this <code>subscription_item</code>.
+ */
+class SubscriptionItem extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'subscription_item';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const PATH_USAGE_RECORDS = '/usage_records';
+	/**
+	 * @param null|string $id the ID of the subscription item on which to create the usage record
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\UsageRecord
+	 */
+	public static function createUsageRecord($id, $params = null, $opts = null)
+	{
+	}
+	const PATH_USAGE_RECORD_SUMMARIES = '/usage_record_summaries';
+	/**
+	 * @param string $id the ID of the subscription item on which to retrieve the usage record summaries
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\UsageRecordSummary> the list of usage record summaries
+	 */
+	public static function allUsageRecordSummaries($id, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * A subscription schedule allows you to create and manage the lifecycle of a
+ * subscription by predefining expected changes.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/subscription-schedules">Subscription
+ * Schedules</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string|\Stripe\StripeObject $application ID of the Connect Application that created the schedule.
+ * @property null|int $canceled_at Time at which the subscription schedule was canceled. Measured in seconds since the Unix epoch.
+ * @property null|int $completed_at Time at which the subscription schedule was completed. Measured in seconds since the Unix epoch.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\StripeObject $current_phase Object representing the start and end dates for the current phase of the subscription schedule, if it is <code>active</code>.
+ * @property string|\Stripe\Customer $customer ID of the customer who owns the subscription schedule.
+ * @property \Stripe\StripeObject $default_settings
+ * @property string $end_behavior Behavior of the subscription schedule and underlying subscription when it ends. Possible values are <code>release</code> or <code>cancel</code> with the default being <code>release</code>. <code>release</code> will end the subscription schedule and keep the underlying subscription running.<code>cancel</code> will end the subscription schedule and cancel the underlying subscription.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\StripeObject[] $phases Configuration for the subscription schedule's phases.
+ * @property null|int $released_at Time at which the subscription schedule was released. Measured in seconds since the Unix epoch.
+ * @property null|string $released_subscription ID of the subscription once managed by the subscription schedule (if it is released).
+ * @property string $status The present status of the subscription schedule. Possible values are <code>not_started</code>, <code>active</code>, <code>completed</code>, <code>released</code>, and <code>canceled</code>. You can read more about the different states in our <a href="https://stripe.com/docs/billing/subscriptions/subscription-schedules">behavior guide</a>.
+ * @property null|string|\Stripe\Subscription $subscription ID of the subscription managed by the subscription schedule.
+ * @property null|string|\Stripe\TestHelpers\TestClock $test_clock ID of the test clock this subscription schedule belongs to.
+ */
+class SubscriptionSchedule extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'subscription_schedule';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule the canceled subscription schedule
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\SubscriptionSchedule the released subscription schedule
+	 */
+	public function release($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * <a href="https://stripe.com/docs/tax/tax-categories">Tax codes</a> classify
+ * goods and services for tax purposes.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property string $description A detailed description of which types of products the tax code represents.
+ * @property string $name A short name for the tax code.
+ */
+class TaxCode extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'tax_code';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+}
+/**
+ * You can add one or multiple tax IDs to a <a
+ * href="https://stripe.com/docs/api/customers">customer</a>. A customer's tax IDs
+ * are displayed on invoices and credit notes issued for the customer.
+ *
+ * Related guide: <a href="https://stripe.com/docs/billing/taxes/tax-ids">Customer
+ * Tax Identification Numbers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $country Two-letter ISO code representing the country of the tax ID.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string|\Stripe\Customer $customer ID of the customer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $type Type of the tax ID, one of <code>ae_trn</code>, <code>au_abn</code>, <code>au_arn</code>, <code>bg_uic</code>, <code>br_cnpj</code>, <code>br_cpf</code>, <code>ca_bn</code>, <code>ca_gst_hst</code>, <code>ca_pst_bc</code>, <code>ca_pst_mb</code>, <code>ca_pst_sk</code>, <code>ca_qst</code>, <code>ch_vat</code>, <code>cl_tin</code>, <code>eg_tin</code>, <code>es_cif</code>, <code>eu_oss_vat</code>, <code>eu_vat</code>, <code>gb_vat</code>, <code>ge_vat</code>, <code>hk_br</code>, <code>hu_tin</code>, <code>id_npwp</code>, <code>il_vat</code>, <code>in_gst</code>, <code>is_vat</code>, <code>jp_cn</code>, <code>jp_rn</code>, <code>jp_trn</code>, <code>ke_pin</code>, <code>kr_brn</code>, <code>li_uid</code>, <code>mx_rfc</code>, <code>my_frp</code>, <code>my_itn</code>, <code>my_sst</code>, <code>no_vat</code>, <code>nz_gst</code>, <code>ph_tin</code>, <code>ru_inn</code>, <code>ru_kpp</code>, <code>sa_vat</code>, <code>sg_gst</code>, <code>sg_uen</code>, <code>si_tin</code>, <code>th_vat</code>, <code>tr_tin</code>, <code>tw_vat</code>, <code>ua_vat</code>, <code>us_ein</code>, or <code>za_vat</code>. Note that some legacy tax IDs have type <code>unknown</code>
+ * @property string $value Value of the tax ID.
+ * @property null|\Stripe\StripeObject $verification Tax ID verification information.
+ */
+class TaxId extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'tax_id';
+	use \Stripe\ApiOperations\Delete;
+	const TYPE_AE_TRN = 'ae_trn';
+	const TYPE_AU_ABN = 'au_abn';
+	const TYPE_AU_ARN = 'au_arn';
+	const TYPE_BG_UIC = 'bg_uic';
+	const TYPE_BR_CNPJ = 'br_cnpj';
+	const TYPE_BR_CPF = 'br_cpf';
+	const TYPE_CA_BN = 'ca_bn';
+	const TYPE_CA_GST_HST = 'ca_gst_hst';
+	const TYPE_CA_PST_BC = 'ca_pst_bc';
+	const TYPE_CA_PST_MB = 'ca_pst_mb';
+	const TYPE_CA_PST_SK = 'ca_pst_sk';
+	const TYPE_CA_QST = 'ca_qst';
+	const TYPE_CH_VAT = 'ch_vat';
+	const TYPE_CL_TIN = 'cl_tin';
+	const TYPE_EG_TIN = 'eg_tin';
+	const TYPE_ES_CIF = 'es_cif';
+	const TYPE_EU_OSS_VAT = 'eu_oss_vat';
+	const TYPE_EU_VAT = 'eu_vat';
+	const TYPE_GB_VAT = 'gb_vat';
+	const TYPE_GE_VAT = 'ge_vat';
+	const TYPE_HK_BR = 'hk_br';
+	const TYPE_HU_TIN = 'hu_tin';
+	const TYPE_ID_NPWP = 'id_npwp';
+	const TYPE_IL_VAT = 'il_vat';
+	const TYPE_IN_GST = 'in_gst';
+	const TYPE_IS_VAT = 'is_vat';
+	const TYPE_JP_CN = 'jp_cn';
+	const TYPE_JP_RN = 'jp_rn';
+	const TYPE_JP_TRN = 'jp_trn';
+	const TYPE_KE_PIN = 'ke_pin';
+	const TYPE_KR_BRN = 'kr_brn';
+	const TYPE_LI_UID = 'li_uid';
+	const TYPE_MX_RFC = 'mx_rfc';
+	const TYPE_MY_FRP = 'my_frp';
+	const TYPE_MY_ITN = 'my_itn';
+	const TYPE_MY_SST = 'my_sst';
+	const TYPE_NO_VAT = 'no_vat';
+	const TYPE_NZ_GST = 'nz_gst';
+	const TYPE_PH_TIN = 'ph_tin';
+	const TYPE_RU_INN = 'ru_inn';
+	const TYPE_RU_KPP = 'ru_kpp';
+	const TYPE_SA_VAT = 'sa_vat';
+	const TYPE_SG_GST = 'sg_gst';
+	const TYPE_SG_UEN = 'sg_uen';
+	const TYPE_SI_TIN = 'si_tin';
+	const TYPE_TH_VAT = 'th_vat';
+	const TYPE_TR_TIN = 'tr_tin';
+	const TYPE_TW_VAT = 'tw_vat';
+	const TYPE_UA_VAT = 'ua_vat';
+	const TYPE_UNKNOWN = 'unknown';
+	const TYPE_US_EIN = 'us_ein';
+	const TYPE_ZA_VAT = 'za_vat';
+	const VERIFICATION_STATUS_PENDING = 'pending';
+	const VERIFICATION_STATUS_UNAVAILABLE = 'unavailable';
+	const VERIFICATION_STATUS_UNVERIFIED = 'unverified';
+	const VERIFICATION_STATUS_VERIFIED = 'verified';
+	/**
+	 * @return string the API URL for this tax id
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param array|string $_id
+	 * @param null|array|string $_opts
+	 *
+	 * @throws \Stripe\Exception\BadMethodCallException
+	 */
+	public static function retrieve($_id, $_opts = null)
+	{
+	}
+}
+/**
+ * Tax rates can be applied to <a
+ * href="https://stripe.com/docs/billing/invoices/tax-rates">invoices</a>, <a
+ * href="https://stripe.com/docs/billing/subscriptions/taxes">subscriptions</a> and
+ * <a
+ * href="https://stripe.com/docs/payments/checkout/set-up-a-subscription#tax-rates">Checkout
+ * Sessions</a> to collect tax.
+ *
+ * Related guide: <a href="https://stripe.com/docs/billing/taxes/tax-rates">Tax
+ * Rates</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $active Defaults to <code>true</code>. When set to <code>false</code>, this tax rate cannot be used with new applications or Checkout Sessions, but will still work for subscriptions and invoices that already have it set.
+ * @property null|string $country Two-letter country code (<a href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>).
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $description An arbitrary string attached to the tax rate for your internal use only. It will not be visible to your customers.
+ * @property string $display_name The display name of the tax rates as it will appear to your customer on their receipt email, PDF, and the hosted invoice page.
+ * @property bool $inclusive This specifies if the tax rate is inclusive or exclusive.
+ * @property null|string $jurisdiction The jurisdiction for the tax rate. You can use this label field for tax reporting purposes. It also appears on your customer’s invoice.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property float $percentage This represents the tax rate percent out of 100.
+ * @property null|string $state <a href="https://en.wikipedia.org/wiki/ISO_3166-2:US">ISO 3166-2 subdivision code</a>, without country prefix. For example, &quot;NY&quot; for New York, United States.
+ * @property null|string $tax_type The high-level tax type, such as <code>vat</code> or <code>sales_tax</code>.
+ */
+class TaxRate extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'tax_rate';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const TAX_TYPE_GST = 'gst';
+	const TAX_TYPE_HST = 'hst';
+	const TAX_TYPE_IGST = 'igst';
+	const TAX_TYPE_JCT = 'jct';
+	const TAX_TYPE_PST = 'pst';
+	const TAX_TYPE_QST = 'qst';
+	const TAX_TYPE_RST = 'rst';
+	const TAX_TYPE_SALES_TAX = 'sales_tax';
+	const TAX_TYPE_VAT = 'vat';
+}
+namespace Stripe\Terminal;
+
+/**
+ * A Configurations object represents how features should be configured for
+ * terminal readers.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $bbpos_wisepos_e
+ * @property null|bool $is_account_default Whether this Configuration is the default for your account
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $tipping
+ * @property null|\Stripe\StripeObject $verifone_p400
+ */
+class Configuration extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'terminal.configuration';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * A Connection Token is used by the Stripe Terminal SDK to connect to a reader.
+ *
+ * Related guide: <a href="https://stripe.com/docs/terminal/fleet/locations">Fleet
+ * Management</a>.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $location The id of the location that this connection token is scoped to. Note that location scoping only applies to internet-connected readers. For more details, see <a href="https://stripe.com/docs/terminal/fleet/locations#connection-tokens">the docs on scoping connection tokens</a>.
+ * @property string $secret Your application should pass this token to the Stripe Terminal SDK.
+ */
+class ConnectionToken extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'terminal.connection_token';
+	use \Stripe\ApiOperations\Create;
+}
+/**
+ * A Location represents a grouping of readers.
+ *
+ * Related guide: <a href="https://stripe.com/docs/terminal/fleet/locations">Fleet
+ * Management</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $address
+ * @property null|string $configuration_overrides The ID of a configuration that will be used to customize all readers in this location.
+ * @property string $display_name The display name of the location.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ */
+class Location extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'terminal.location';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+/**
+ * A Reader represents a physical device for accepting payment details.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/terminal/payments/connect-reader">Connecting to a
+ * Reader</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $action The most recent action performed by the reader.
+ * @property null|string $device_sw_version The current software version of the reader.
+ * @property string $device_type Type of reader, one of <code>bbpos_wisepad3</code>, <code>stripe_m2</code>, <code>bbpos_chipper2x</code>, <code>bbpos_wisepos_e</code>, <code>verifone_P400</code>, or <code>simulated_wisepos_e</code>.
+ * @property null|string $ip_address The local IP address of the reader.
+ * @property string $label Custom label given to the reader for easier identification.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string|\Stripe\Terminal\Location $location The location identifier of the reader.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $serial_number Serial number of the reader.
+ * @property null|string $status The networking status of the reader.
+ */
+class Reader extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'terminal.reader';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader the canceled reader
+	 */
+	public function cancelAction($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader the processed reader
+	 */
+	public function processPaymentIntent($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader the processed reader
+	 */
+	public function processSetupIntent($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader the refunded reader
+	 */
+	public function refundPayment($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Terminal\Reader the seted reader
+	 */
+	public function setReaderDisplay($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe\TestHelpers;
+
+/**
+ * A test clock enables deterministic control over objects in testmode. With a test
+ * clock, you can create objects at a frozen time in the past or future, and
+ * advance to a specific future time to observe webhooks and state changes. After
+ * the clock advances, you can either validate the current state of your scenario
+ * (and test your assumptions), change the current state of your scenario (and test
+ * more complex scenarios), or keep advancing forward in time.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property int $deletes_after Time at which this clock is scheduled to auto delete.
+ * @property int $frozen_time Time at which all objects belonging to this clock are frozen.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|string $name The custom name supplied at creation.
+ * @property string $status The status of the Test Clock.
+ */
+class TestClock extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'test_helpers.test_clock';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	const STATUS_ADVANCING = 'advancing';
+	const STATUS_INTERNAL_FAILURE = 'internal_failure';
+	const STATUS_READY = 'ready';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TestHelpers\TestClock the advanced test clock
+	 */
+	public function advance($params = null, $opts = null)
+	{
+	}
+}
+namespace Stripe;
+
+/**
+ * Tokenization is the process Stripe uses to collect sensitive card or bank
+ * account details, or personally identifiable information (PII), directly from
+ * your customers in a secure manner. A token representing this information is
+ * returned to your server to use. You should use our <a
+ * href="https://stripe.com/docs/payments">recommended payments integrations</a> to
+ * perform this process client-side. This ensures that no sensitive card data
+ * touches your server, and allows your integration to operate in a PCI-compliant
+ * way.
+ *
+ * If you cannot use client-side tokenization, you can also create tokens using the
+ * API with either your publishable or secret API key. Keep in mind that if your
+ * integration uses this method, you are responsible for any PCI compliance that
+ * may be required, and you must keep your secret API key safe. Unlike with
+ * client-side tokenization, your customer's information is not sent directly to
+ * Stripe, so we cannot determine how it is handled or stored.
+ *
+ * Tokens cannot be stored or used more than once. To store card or bank account
+ * information for later use, you can create <a
+ * href="https://stripe.com/docs/api#customers">Customer</a> objects or <a
+ * href="https://stripe.com/docs/api#external_accounts">Custom accounts</a>. Note
+ * that <a href="https://stripe.com/docs/radar">Radar</a>, our integrated solution
+ * for automatic fraud protection, performs best with integrations that use
+ * client-side tokenization.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/payments/accept-a-payment-charges#web-create-token">Accept
+ * a payment</a>
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\BankAccount $bank_account <p>These bank accounts are payment methods on <code>Customer</code> objects.</p><p>On the other hand <a href="https://stripe.com/docs/api#external_accounts">External Accounts</a> are transfer destinations on <code>Account</code> objects for <a href="https://stripe.com/docs/connect/custom-accounts">Custom accounts</a>. They can be bank accounts or debit cards as well, and are documented in the links above.</p><p>Related guide: <a href="https://stripe.com/docs/payments/bank-debits-transfers">Bank Debits and Transfers</a>.</p>
+ * @property null|\Stripe\Card $card <p>You can store multiple cards on a customer in order to charge the customer later. You can also store multiple debit cards on a recipient in order to transfer to those cards later.</p><p>Related guide: <a href="https://stripe.com/docs/sources/cards">Card Payments with Sources</a>.</p>
+ * @property null|string $client_ip IP address of the client that generated the token.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $type Type of the token: <code>account</code>, <code>bank_account</code>, <code>card</code>, or <code>pii</code>.
+ * @property bool $used Whether this token has already been used (tokens can be used only once).
+ */
+class Token extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'token';
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const TYPE_ACCOUNT = 'account';
+	const TYPE_BANK_ACCOUNT = 'bank_account';
+	const TYPE_CARD = 'card';
+	const TYPE_PII = 'pii';
+}
+/**
+ * To top up your Stripe balance, you create a top-up object. You can retrieve
+ * individual top-ups, as well as list all top-ups. Top-ups are identified by a
+ * unique, random ID.
+ *
+ * Related guide: <a href="https://stripe.com/docs/connect/top-ups">Topping Up your
+ * Platform Account</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount transferred.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction ID of the balance transaction that describes the impact of this top-up on your account balance. May not be specified depending on status of top-up.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|int $expected_availability_date Date the funds are expected to arrive in your Stripe account for payouts. This factors in delays like weekends or bank holidays. May not be specified depending on status of top-up.
+ * @property null|string $failure_code Error code explaining reason for top-up failure if available (see <a href="https://stripe.com/docs/api#errors">the errors section</a> for a list of codes).
+ * @property null|string $failure_message Message to user further explaining reason for top-up failure if available.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\Source $source For most Stripe users, the source of every top-up is a bank account. This hash is then the <a href="https://stripe.com/docs/api#source_object">source object</a> describing that bank account.
+ * @property null|string $statement_descriptor Extra information about a top-up. This will appear on your source's bank statement. It must contain at least one letter.
+ * @property string $status The status of the top-up is either <code>canceled</code>, <code>failed</code>, <code>pending</code>, <code>reversed</code>, or <code>succeeded</code>.
+ * @property null|string $transfer_group A string that identifies this top-up as part of a group.
+ */
+class Topup extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'topup';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_PENDING = 'pending';
+	const STATUS_REVERSED = 'reversed';
+	const STATUS_SUCCEEDED = 'succeeded';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Topup the canceled topup
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * A <code>Transfer</code> object is created when you move funds between Stripe
+ * accounts as part of Connect.
+ *
+ * Before April 6, 2017, transfers also represented movement of funds from a Stripe
+ * account to a card or bank account. This behavior has since been split out into a
+ * <a href="https://stripe.com/docs/api#payout_object">Payout</a> object, with
+ * corresponding payout endpoints. For more information, read about the <a
+ * href="https://stripe.com/docs/transfer-payout-split">transfer/payout split</a>.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/charges-transfers">Creating Separate
+ * Charges and Transfers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount in %s to be transferred.
+ * @property int $amount_reversed Amount in %s reversed (can be less than the amount attribute on the transfer if a partial reversal was issued).
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact of this transfer on your account balance.
+ * @property int $created Time that this record of the transfer was first created.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string|\Stripe\Account $destination ID of the Stripe account the transfer was sent to.
+ * @property null|string|\Stripe\Charge $destination_payment If the destination is a Stripe account, this will be the ID of the payment that the destination account received for the transfer.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property \Stripe\Collection<\Stripe\TransferReversal> $reversals A list of reversals that have been applied to the transfer.
+ * @property bool $reversed Whether the transfer has been fully reversed. If the transfer is only partially reversed, this attribute will still be false.
+ * @property null|string|\Stripe\Charge $source_transaction ID of the charge or payment that was used to fund the transfer. If null, the transfer was funded from the available balance.
+ * @property null|string $source_type The source balance this transfer came from. One of <code>card</code>, <code>fpx</code>, or <code>bank_account</code>.
+ * @property null|string $transfer_group A string that identifies this transaction as part of a group. See the <a href="https://stripe.com/docs/connect/charges-transfers#transfer-options">Connect documentation</a> for details.
+ */
+class Transfer extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'transfer';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\NestedResource;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const SOURCE_TYPE_BANK_ACCOUNT = 'bank_account';
+	const SOURCE_TYPE_CARD = 'card';
+	const SOURCE_TYPE_FPX = 'fpx';
+	const PATH_REVERSALS = '/reversals';
+	/**
+	 * @param string $id the ID of the transfer on which to retrieve the transfer reversals
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Collection<\Stripe\TransferReversal> the list of transfer reversals
+	 */
+	public static function allReversals($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the transfer on which to create the transfer reversal
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TransferReversal
+	 */
+	public static function createReversal($id, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the transfer to which the transfer reversal belongs
+	 * @param string $reversalId the ID of the transfer reversal to retrieve
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TransferReversal
+	 */
+	public static function retrieveReversal($id, $reversalId, $params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param string $id the ID of the transfer to which the transfer reversal belongs
+	 * @param string $reversalId the ID of the transfer reversal to update
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\TransferReversal
+	 */
+	public static function updateReversal($id, $reversalId, $params = null, $opts = null)
+	{
+	}
+}
+/**
+ * <a href="https://stripe.com/docs/connect">Stripe Connect</a> platforms can
+ * reverse transfers made to a connected account, either entirely or partially, and
+ * can also specify whether to refund any related application fees. Transfer
+ * reversals add to the platform's balance and subtract from the destination
+ * account's balance.
+ *
+ * Reversing a transfer that was made for a <a
+ * href="/docs/connect/destination-charges">destination charge</a> is allowed only
+ * up to the amount of the charge. It is possible to reverse a <a
+ * href="https://stripe.com/docs/connect/charges-transfers#transfer-options">transfer_group</a>
+ * transfer only if the destination account has enough balance to cover the
+ * reversal.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/connect/charges-transfers#reversing-transfers">Reversing
+ * Transfers</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount, in %s.
+ * @property null|string|\Stripe\BalanceTransaction $balance_transaction Balance transaction that describes the impact on your account balance.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string|\Stripe\Refund $destination_payment_refund Linked payment refund for the transfer reversal.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string|\Stripe\Refund $source_refund ID of the refund responsible for the transfer reversal.
+ * @property string|\Stripe\Transfer $transfer ID of the transfer that was reversed.
+ */
+class TransferReversal extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'transfer_reversal';
+	use \Stripe\ApiOperations\Update {
+		save as protected _save;
+	}
+	/**
+	 * @return string the API URL for this Stripe transfer reversal
+	 */
+	public function instanceUrl()
+	{
+	}
+	/**
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return TransferReversal the saved reversal
+	 */
+	public function save($opts = null)
+	{
+	}
+}
+namespace Stripe\Treasury;
+
+/**
+ * You can reverse some <a
+ * href="https://stripe.com/docs/api#received_credits">ReceivedCredits</a>
+ * depending on their network and source flow. Reversing a ReceivedCredit leads to
+ * the creation of a new object known as a CreditReversal.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $financial_account The FinancialAccount to reverse funds from.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $network The rails used to reverse the funds.
+ * @property string $received_credit The ReceivedCredit being reversed.
+ * @property string $status Status of the CreditReversal
+ * @property \Stripe\StripeObject $status_transitions
+ * @property null|string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class CreditReversal extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.credit_reversal';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const NETWORK_ACH = 'ach';
+	const NETWORK_STRIPE = 'stripe';
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_POSTED = 'posted';
+	const STATUS_PROCESSING = 'processing';
+}
+/**
+ * You can reverse some <a
+ * href="https://stripe.com/docs/api#received_debits">ReceivedDebits</a> depending
+ * on their network and source flow. Reversing a ReceivedDebit leads to the
+ * creation of a new object known as a DebitReversal.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $financial_account The FinancialAccount to reverse funds from.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property null|\Stripe\StripeObject $linked_flows Other flows linked to a DebitReversal.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $network The rails used to reverse the funds.
+ * @property string $received_debit The ReceivedDebit being reversed.
+ * @property string $status Status of the DebitReversal
+ * @property \Stripe\StripeObject $status_transitions
+ * @property null|string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class DebitReversal extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.debit_reversal';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const NETWORK_ACH = 'ach';
+	const NETWORK_CARD = 'card';
+	const STATUS_FAILED = 'failed';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_SUCCEEDED = 'succeeded';
+}
+/**
+ * Stripe Treasury provides users with a container for money called a
+ * FinancialAccount that is separate from their Payments balance. FinancialAccounts
+ * serve as the source and destination of Treasury’s money movement APIs.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string[] $active_features The array of paths to active Features in the Features hash.
+ * @property \Stripe\StripeObject $balance Balance information for the FinancialAccount
+ * @property string $country Two-letter country code (<a href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>).
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|\Stripe\Treasury\FinancialAccountFeatures $features Encodes whether a FinancialAccount has access to a particular Feature, with a <code>status</code> enum and associated <code>status_details</code>. Stripe or the platform can control Features via the requested field.
+ * @property \Stripe\StripeObject[] $financial_addresses The set of credentials that resolve to a FinancialAccount.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property null|\Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string[] $pending_features The array of paths to pending Features in the Features hash.
+ * @property null|\Stripe\StripeObject $platform_restrictions The set of functionalities that the platform can restrict on the FinancialAccount.
+ * @property null|string[] $restricted_features The array of paths to restricted Features in the Features hash.
+ * @property string $status The enum specifying what state the account is in.
+ * @property \Stripe\StripeObject $status_details
+ * @property string[] $supported_currencies The currencies the FinancialAccount can hold a balance in. Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase.
+ */
+class FinancialAccount extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.financial_account';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+	const STATUS_CLOSED = 'closed';
+	const STATUS_OPEN = 'open';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount the retrieved financial account
+	 */
+	public function retrieveFeatures($params = null, $opts = null)
+	{
+	}
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\FinancialAccount the updated financial account
+	 */
+	public function updateFeatures($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Encodes whether a FinancialAccount has access to a particular Feature, with a
+ * <code>status</code> enum and associated <code>status_details</code>. Stripe or
+ * the platform can control Features via the requested field.
+ *
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|\Stripe\StripeObject $card_issuing Toggle settings for enabling/disabling a feature
+ * @property null|\Stripe\StripeObject $deposit_insurance Toggle settings for enabling/disabling a feature
+ * @property null|\Stripe\StripeObject $financial_addresses Settings related to Financial Addresses features on a Financial Account
+ * @property null|\Stripe\StripeObject $inbound_transfers InboundTransfers contains inbound transfers features for a FinancialAccount.
+ * @property null|\Stripe\StripeObject $intra_stripe_flows Toggle settings for enabling/disabling a feature
+ * @property null|\Stripe\StripeObject $outbound_payments Settings related to Outbound Payments features on a Financial Account
+ * @property null|\Stripe\StripeObject $outbound_transfers OutboundTransfers contains outbound transfers features for a FinancialAccount.
+ */
+class FinancialAccountFeatures extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.financial_account_features';
+}
+/**
+ * Use <a
+ * href="https://stripe.com/docs/treasury/moving-money/financial-accounts/into/inbound-transfers">InboundTransfers</a>
+ * to add funds to your <a
+ * href="https://stripe.com/docs/api#financial_accounts">FinancialAccount</a> via a
+ * PaymentMethod that is owned by you. The funds will be transferred via an ACH
+ * debit.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property bool $cancelable Returns <code>true</code> if the InboundTransfer is able to be canceled.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\StripeObject $failure_details Details about this InboundTransfer's failure. Only set when status is <code>failed</code>.
+ * @property string $financial_account The FinancialAccount that received the funds.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property \Stripe\StripeObject $linked_flows
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property string $origin_payment_method The origin payment method to be debited for an InboundTransfer.
+ * @property null|\Stripe\StripeObject $origin_payment_method_details Details about the PaymentMethod for an InboundTransfer.
+ * @property null|bool $returned Returns <code>true</code> if the funds for an InboundTransfer were returned after the InboundTransfer went to the <code>succeeded</code> state.
+ * @property string $statement_descriptor Statement descriptor shown when funds are debited from the source. Not all payment networks support <code>statement_descriptor</code>.
+ * @property string $status Status of the InboundTransfer: <code>processing</code>, <code>succeeded</code>, <code>failed</code>, and <code>canceled</code>. An InboundTransfer is <code>processing</code> if it is created and pending. The status changes to <code>succeeded</code> once the funds have been &quot;confirmed&quot; and a <code>transaction</code> is created and posted. The status changes to <code>failed</code> if the transfer fails.
+ * @property \Stripe\StripeObject $status_transitions
+ * @property null|string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class InboundTransfer extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.inbound_transfer';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_SUCCEEDED = 'succeeded';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\InboundTransfer the canceled inbound transfer
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Use OutboundPayments to send funds to another party's external bank account or
+ * <a href="https://stripe.com/docs/api#financial_accounts">FinancialAccount</a>.
+ * To send money to an account belonging to the same user, use an <a
+ * href="https://stripe.com/docs/api#outbound_transfers">OutboundTransfer</a>.
+ *
+ * Simulate OutboundPayment state changes with the
+ * <code>/v1/test_helpers/treasury/outbound_payments</code> endpoints. These
+ * methods can only be called on test mode objects.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property bool $cancelable Returns <code>true</code> if the object can be canceled, and <code>false</code> otherwise.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $customer ID of the <a href="https://stripe.com/docs/api/customers">customer</a> to whom an OutboundPayment is sent.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string $destination_payment_method The PaymentMethod via which an OutboundPayment is sent. This field can be empty if the OutboundPayment was created using <code>destination_payment_method_data</code>.
+ * @property null|\Stripe\StripeObject $destination_payment_method_details Details about the PaymentMethod for an OutboundPayment.
+ * @property null|\Stripe\StripeObject $end_user_details Details about the end user.
+ * @property int $expected_arrival_date The date when funds are expected to arrive in the destination account.
+ * @property string $financial_account The FinancialAccount that funds were pulled from.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $returned_details Details about a returned OutboundPayment. Only set when the status is <code>returned</code>.
+ * @property string $statement_descriptor The description that appears on the receiving end for an OutboundPayment (for example, bank statement for external bank transfer).
+ * @property string $status Current status of the OutboundPayment: <code>processing</code>, <code>failed</code>, <code>posted</code>, <code>returned</code>, <code>canceled</code>. An OutboundPayment is <code>processing</code> if it has been created and is pending. The status changes to <code>posted</code> once the OutboundPayment has been &quot;confirmed&quot; and funds have left the account, or to <code>failed</code> or <code>canceled</code>. If an OutboundPayment fails to arrive at its destination, its status will change to <code>returned</code>.
+ * @property \Stripe\StripeObject $status_transitions
+ * @property string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class OutboundPayment extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.outbound_payment';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_POSTED = 'posted';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_RETURNED = 'returned';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundPayment the canceled outbound payment
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * Use OutboundTransfers to transfer funds from a <a
+ * href="https://stripe.com/docs/api#financial_accounts">FinancialAccount</a> to a
+ * PaymentMethod belonging to the same entity. To send funds to a different party,
+ * use <a href="https://stripe.com/docs/api#outbound_payments">OutboundPayments</a>
+ * instead. You can send funds over ACH rails or through a domestic wire transfer
+ * to a user's own external bank account.
+ *
+ * Simulate OutboundTransfer state changes with the
+ * <code>/v1/test_helpers/treasury/outbound_transfers</code> endpoints. These
+ * methods can only be called on test mode objects.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property bool $cancelable Returns <code>true</code> if the object can be canceled, and <code>false</code> otherwise.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string $destination_payment_method The PaymentMethod used as the payment instrument for an OutboundTransfer.
+ * @property \Stripe\StripeObject $destination_payment_method_details
+ * @property int $expected_arrival_date The date when funds are expected to arrive in the destination account.
+ * @property string $financial_account The FinancialAccount that funds were pulled from.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|\Stripe\StripeObject $returned_details Details about a returned OutboundTransfer. Only set when the status is <code>returned</code>.
+ * @property string $statement_descriptor Information about the OutboundTransfer to be sent to the recipient account.
+ * @property string $status Current status of the OutboundTransfer: <code>processing</code>, <code>failed</code>, <code>canceled</code>, <code>posted</code>, <code>returned</code>. An OutboundTransfer is <code>processing</code> if it has been created and is pending. The status changes to <code>posted</code> once the OutboundTransfer has been &quot;confirmed&quot; and funds have left the account, or to <code>failed</code> or <code>canceled</code>. If an OutboundTransfer fails to arrive at its destination, its status will change to <code>returned</code>.
+ * @property \Stripe\StripeObject $status_transitions
+ * @property string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class OutboundTransfer extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.outbound_transfer';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Retrieve;
+	const STATUS_CANCELED = 'canceled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_POSTED = 'posted';
+	const STATUS_PROCESSING = 'processing';
+	const STATUS_RETURNED = 'returned';
+	/**
+	 * @param null|array $params
+	 * @param null|array|string $opts
+	 *
+	 * @throws \Stripe\Exception\ApiErrorException if the request fails
+	 *
+	 * @return \Stripe\Treasury\OutboundTransfer the canceled outbound transfer
+	 */
+	public function cancel($params = null, $opts = null)
+	{
+	}
+}
+/**
+ * ReceivedCredits represent funds sent to a <a
+ * href="https://stripe.com/docs/api#financial_accounts">FinancialAccount</a> (for
+ * example, via ACH or wire). These money movements are not initiated from the
+ * FinancialAccount.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string $failure_code Reason for the failure. A ReceivedCredit might fail because the receiving FinancialAccount is closed or frozen.
+ * @property null|string $financial_account The FinancialAccount that received the funds.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property \Stripe\StripeObject $initiating_payment_method_details
+ * @property \Stripe\StripeObject $linked_flows
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $network The rails used to send the funds.
+ * @property null|\Stripe\StripeObject $reversal_details Details describing when a ReceivedCredit may be reversed.
+ * @property string $status Status of the ReceivedCredit. ReceivedCredits are created either <code>succeeded</code> (approved) or <code>failed</code> (declined). If a ReceivedCredit is declined, the failure reason can be found in the <code>failure_code</code> field.
+ * @property null|string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class ReceivedCredit extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.received_credit';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const FAILURE_CODE_ACCOUNT_CLOSED = 'account_closed';
+	const FAILURE_CODE_ACCOUNT_FROZEN = 'account_frozen';
+	const FAILURE_CODE_OTHER = 'other';
+	const NETWORK_ACH = 'ach';
+	const NETWORK_CARD = 'card';
+	const NETWORK_STRIPE = 'stripe';
+	const NETWORK_US_DOMESTIC_WIRE = 'us_domestic_wire';
+	const STATUS_FAILED = 'failed';
+	const STATUS_SUCCEEDED = 'succeeded';
+}
+/**
+ * ReceivedDebits represent funds pulled from a <a
+ * href="https://stripe.com/docs/api#financial_accounts">FinancialAccount</a>.
+ * These are not initiated from the FinancialAccount.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|string $failure_code Reason for the failure. A ReceivedDebit might fail because the FinancialAccount doesn't have sufficient funds, is closed, or is frozen.
+ * @property null|string $financial_account The FinancialAccount that funds were pulled from.
+ * @property null|string $hosted_regulatory_receipt_url A <a href="https://stripe.com/docs/treasury/moving-money/regulatory-receipts">hosted transaction receipt</a> URL that is provided when money movement is considered regulated under Stripe's money transmission licenses.
+ * @property null|\Stripe\StripeObject $initiating_payment_method_details
+ * @property \Stripe\StripeObject $linked_flows
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $network The network used for the ReceivedDebit.
+ * @property null|\Stripe\StripeObject $reversal_details Details describing when a ReceivedDebit might be reversed.
+ * @property string $status Status of the ReceivedDebit. ReceivedDebits are created with a status of either <code>succeeded</code> (approved) or <code>failed</code> (declined). The failure reason can be found under the <code>failure_code</code>.
+ * @property null|string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ */
+class ReceivedDebit extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.received_debit';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const FAILURE_CODE_ACCOUNT_CLOSED = 'account_closed';
+	const FAILURE_CODE_ACCOUNT_FROZEN = 'account_frozen';
+	const FAILURE_CODE_INSUFFICIENT_FUNDS = 'insufficient_funds';
+	const FAILURE_CODE_OTHER = 'other';
+	const NETWORK_ACH = 'ach';
+	const NETWORK_CARD = 'card';
+	const NETWORK_STRIPE = 'stripe';
+	const STATUS_FAILED = 'failed';
+	const STATUS_SUCCEEDED = 'succeeded';
+}
+/**
+ * Transactions represent changes to a <a
+ * href="https://stripe.com/docs/api#financial_accounts">FinancialAccount's</a>
+ * balance.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property int $amount Amount (in cents) transferred.
+ * @property \Stripe\StripeObject $balance_impact Change to a FinancialAccount's balance
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property string $description An arbitrary string attached to the object. Often useful for displaying to users.
+ * @property null|\Stripe\Collection<\Stripe\Treasury\TransactionEntry> $entries A list of TransactionEntries that are part of this Transaction. This cannot be expanded in any list endpoints.
+ * @property string $financial_account The FinancialAccount associated with this object.
+ * @property null|string $flow ID of the flow that created the Transaction.
+ * @property null|\Stripe\StripeObject $flow_details Details of the flow that created the Transaction.
+ * @property string $flow_type Type of the flow that created the Transaction.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string $status Status of the Transaction.
+ * @property \Stripe\StripeObject $status_transitions
+ */
+class Transaction extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.transaction';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const FLOW_TYPE_CREDIT_REVERSAL = 'credit_reversal';
+	const FLOW_TYPE_DEBIT_REVERSAL = 'debit_reversal';
+	const FLOW_TYPE_INBOUND_TRANSFER = 'inbound_transfer';
+	const FLOW_TYPE_ISSUING_AUTHORIZATION = 'issuing_authorization';
+	const FLOW_TYPE_OTHER = 'other';
+	const FLOW_TYPE_OUTBOUND_PAYMENT = 'outbound_payment';
+	const FLOW_TYPE_OUTBOUND_TRANSFER = 'outbound_transfer';
+	const FLOW_TYPE_RECEIVED_CREDIT = 'received_credit';
+	const FLOW_TYPE_RECEIVED_DEBIT = 'received_debit';
+	const STATUS_OPEN = 'open';
+	const STATUS_POSTED = 'posted';
+	const STATUS_VOID = 'void';
+}
+/**
+ * TransactionEntries represent individual units of money movements within a single
+ * <a href="https://stripe.com/docs/api#transactions">Transaction</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property \Stripe\StripeObject $balance_impact Change to a FinancialAccount's balance
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property string $currency Three-letter <a href="https://www.iso.org/iso-4217-currency-codes.html">ISO currency code</a>, in lowercase. Must be a <a href="https://stripe.com/docs/currencies">supported currency</a>.
+ * @property int $effective_at When the TransactionEntry will impact the FinancialAccount's balance.
+ * @property string $financial_account The FinancialAccount associated with this object.
+ * @property null|string $flow Token of the flow associated with the TransactionEntry.
+ * @property null|\Stripe\StripeObject $flow_details Details of the flow associated with the TransactionEntry.
+ * @property string $flow_type Type of the flow associated with the TransactionEntry.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property string|\Stripe\Treasury\Transaction $transaction The Transaction associated with this object.
+ * @property string $type The specific money movement that generated the TransactionEntry.
+ */
+class TransactionEntry extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'treasury.transaction_entry';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Retrieve;
+	const FLOW_TYPE_CREDIT_REVERSAL = 'credit_reversal';
+	const FLOW_TYPE_DEBIT_REVERSAL = 'debit_reversal';
+	const FLOW_TYPE_INBOUND_TRANSFER = 'inbound_transfer';
+	const FLOW_TYPE_ISSUING_AUTHORIZATION = 'issuing_authorization';
+	const FLOW_TYPE_OTHER = 'other';
+	const FLOW_TYPE_OUTBOUND_PAYMENT = 'outbound_payment';
+	const FLOW_TYPE_OUTBOUND_TRANSFER = 'outbound_transfer';
+	const FLOW_TYPE_RECEIVED_CREDIT = 'received_credit';
+	const FLOW_TYPE_RECEIVED_DEBIT = 'received_debit';
+	const TYPE_CREDIT_REVERSAL = 'credit_reversal';
+	const TYPE_CREDIT_REVERSAL_POSTING = 'credit_reversal_posting';
+	const TYPE_DEBIT_REVERSAL = 'debit_reversal';
+	const TYPE_INBOUND_TRANSFER = 'inbound_transfer';
+	const TYPE_INBOUND_TRANSFER_RETURN = 'inbound_transfer_return';
+	const TYPE_ISSUING_AUTHORIZATION_HOLD = 'issuing_authorization_hold';
+	const TYPE_ISSUING_AUTHORIZATION_RELEASE = 'issuing_authorization_release';
+	const TYPE_OTHER = 'other';
+	const TYPE_OUTBOUND_PAYMENT = 'outbound_payment';
+	const TYPE_OUTBOUND_PAYMENT_CANCELLATION = 'outbound_payment_cancellation';
+	const TYPE_OUTBOUND_PAYMENT_FAILURE = 'outbound_payment_failure';
+	const TYPE_OUTBOUND_PAYMENT_POSTING = 'outbound_payment_posting';
+	const TYPE_OUTBOUND_PAYMENT_RETURN = 'outbound_payment_return';
+	const TYPE_OUTBOUND_TRANSFER = 'outbound_transfer';
+	const TYPE_OUTBOUND_TRANSFER_CANCELLATION = 'outbound_transfer_cancellation';
+	const TYPE_OUTBOUND_TRANSFER_FAILURE = 'outbound_transfer_failure';
+	const TYPE_OUTBOUND_TRANSFER_POSTING = 'outbound_transfer_posting';
+	const TYPE_OUTBOUND_TRANSFER_RETURN = 'outbound_transfer_return';
+	const TYPE_RECEIVED_CREDIT = 'received_credit';
+	const TYPE_RECEIVED_DEBIT = 'received_debit';
+}
+namespace Stripe;
+
+/**
+ * Usage records allow you to report customer usage and metrics to Stripe for
+ * metered billing of subscription prices.
+ *
+ * Related guide: <a
+ * href="https://stripe.com/docs/billing/subscriptions/metered-billing">Metered
+ * Billing</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property int $quantity The usage quantity for the specified date.
+ * @property string $subscription_item The ID of the subscription item this usage record contains data for.
+ * @property int $timestamp The timestamp when this usage occurred.
+ */
+class UsageRecord extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'usage_record';
+}
+/**
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $invoice The invoice in which this usage period has been billed for.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $period
+ * @property string $subscription_item The ID of the subscription item this summary is describing.
+ * @property int $total_usage The total usage within this usage period.
+ */
+class UsageRecordSummary extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'usage_record_summary';
+}
+namespace Stripe\Util;
+
+class ApiVersion
+{
+	const CURRENT = '2022-11-15';
+}
+/**
+ * CaseInsensitiveArray is an array-like class that ignores case for keys.
+ *
+ * It is used to store HTTP headers. Per RFC 2616, section 4.2:
+ * Each header field consists of a name followed by a colon (":") and the field value. Field names
+ * are case-insensitive.
+ *
+ * In the context of stripe-php, this is useful because the API will return headers with different
+ * case depending on whether HTTP/2 is used or not (with HTTP/2, headers are always in lowercase).
+ */
+class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggregate
+{
+	public function __construct($initial_array = [])
+	{
+	}
+	/**
+	 * @return int
+	 */
+	#[\ReturnTypeWillChange]
+	public function count()
+	{
+	}
+	/**
+	 * @return \ArrayIterator
+	 */
+	#[\ReturnTypeWillChange]
+	public function getIterator()
+	{
+	}
+	/**
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetSet($offset, $value)
+	{
+	}
+	/**
+	 * @return bool
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetExists($offset)
+	{
+	}
+	/**
+	 * @return void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($offset)
+	{
+	}
+	/**
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetGet($offset)
+	{
+	}
+}
+/**
+ * Describes a logger instance.
+ *
+ * This is a subset of the interface of the same name in the PSR-3 logger
+ * interface. We guarantee to keep it compatible, but we'd redefined it here so
+ * that we don't have to pull in the extra dependencies for users who don't want
+ * it.
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data, the only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ */
+interface LoggerInterface
+{
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 */
+	public function error($message, array $context = []);
+}
+/**
+ * A very basic implementation of LoggerInterface that has just enough
+ * functionality that it can be the default for this library.
+ */
+class DefaultLogger implements \Stripe\Util\LoggerInterface
+{
+	/** @var int */
+	public $messageType = 0;
+	/** @var null|string */
+	public $destination;
+	public function error($message, array $context = [])
+	{
+	}
+}
+class ObjectTypes
+{
+	/**
+	 * @var array Mapping from object types to resource classes
+	 */
+	const mapping = [\Stripe\Account::OBJECT_NAME => \Stripe\Account::class, \Stripe\AccountLink::OBJECT_NAME => \Stripe\AccountLink::class, \Stripe\ApplePayDomain::OBJECT_NAME => \Stripe\ApplePayDomain::class, \Stripe\ApplicationFee::OBJECT_NAME => \Stripe\ApplicationFee::class, \Stripe\ApplicationFeeRefund::OBJECT_NAME => \Stripe\ApplicationFeeRefund::class, \Stripe\Apps\Secret::OBJECT_NAME => \Stripe\Apps\Secret::class, \Stripe\Balance::OBJECT_NAME => \Stripe\Balance::class, \Stripe\BalanceTransaction::OBJECT_NAME => \Stripe\BalanceTransaction::class, \Stripe\BankAccount::OBJECT_NAME => \Stripe\BankAccount::class, \Stripe\BillingPortal\Configuration::OBJECT_NAME => \Stripe\BillingPortal\Configuration::class, \Stripe\BillingPortal\Session::OBJECT_NAME => \Stripe\BillingPortal\Session::class, \Stripe\Capability::OBJECT_NAME => \Stripe\Capability::class, \Stripe\Card::OBJECT_NAME => \Stripe\Card::class, \Stripe\CashBalance::OBJECT_NAME => \Stripe\CashBalance::class, \Stripe\Charge::OBJECT_NAME => \Stripe\Charge::class, \Stripe\Checkout\Session::OBJECT_NAME => \Stripe\Checkout\Session::class, \Stripe\Collection::OBJECT_NAME => \Stripe\Collection::class, \Stripe\CountrySpec::OBJECT_NAME => \Stripe\CountrySpec::class, \Stripe\Coupon::OBJECT_NAME => \Stripe\Coupon::class, \Stripe\CreditNote::OBJECT_NAME => \Stripe\CreditNote::class, \Stripe\CreditNoteLineItem::OBJECT_NAME => \Stripe\CreditNoteLineItem::class, \Stripe\Customer::OBJECT_NAME => \Stripe\Customer::class, \Stripe\CustomerBalanceTransaction::OBJECT_NAME => \Stripe\CustomerBalanceTransaction::class, \Stripe\CustomerCashBalanceTransaction::OBJECT_NAME => \Stripe\CustomerCashBalanceTransaction::class, \Stripe\Discount::OBJECT_NAME => \Stripe\Discount::class, \Stripe\Dispute::OBJECT_NAME => \Stripe\Dispute::class, \Stripe\EphemeralKey::OBJECT_NAME => \Stripe\EphemeralKey::class, \Stripe\Event::OBJECT_NAME => \Stripe\Event::class, \Stripe\ExchangeRate::OBJECT_NAME => \Stripe\ExchangeRate::class, \Stripe\File::OBJECT_NAME => \Stripe\File::class, \Stripe\File::OBJECT_NAME_ALT => \Stripe\File::class, \Stripe\FileLink::OBJECT_NAME => \Stripe\FileLink::class, \Stripe\FinancialConnections\Account::OBJECT_NAME => \Stripe\FinancialConnections\Account::class, \Stripe\FinancialConnections\AccountOwner::OBJECT_NAME => \Stripe\FinancialConnections\AccountOwner::class, \Stripe\FinancialConnections\AccountOwnership::OBJECT_NAME => \Stripe\FinancialConnections\AccountOwnership::class, \Stripe\FinancialConnections\Session::OBJECT_NAME => \Stripe\FinancialConnections\Session::class, \Stripe\FundingInstructions::OBJECT_NAME => \Stripe\FundingInstructions::class, \Stripe\Identity\VerificationReport::OBJECT_NAME => \Stripe\Identity\VerificationReport::class, \Stripe\Identity\VerificationSession::OBJECT_NAME => \Stripe\Identity\VerificationSession::class, \Stripe\Invoice::OBJECT_NAME => \Stripe\Invoice::class, \Stripe\InvoiceItem::OBJECT_NAME => \Stripe\InvoiceItem::class, \Stripe\InvoiceLineItem::OBJECT_NAME => \Stripe\InvoiceLineItem::class, \Stripe\Issuing\Authorization::OBJECT_NAME => \Stripe\Issuing\Authorization::class, \Stripe\Issuing\Card::OBJECT_NAME => \Stripe\Issuing\Card::class, \Stripe\Issuing\CardDetails::OBJECT_NAME => \Stripe\Issuing\CardDetails::class, \Stripe\Issuing\Cardholder::OBJECT_NAME => \Stripe\Issuing\Cardholder::class, \Stripe\Issuing\Dispute::OBJECT_NAME => \Stripe\Issuing\Dispute::class, \Stripe\Issuing\Transaction::OBJECT_NAME => \Stripe\Issuing\Transaction::class, \Stripe\LineItem::OBJECT_NAME => \Stripe\LineItem::class, \Stripe\LoginLink::OBJECT_NAME => \Stripe\LoginLink::class, \Stripe\Mandate::OBJECT_NAME => \Stripe\Mandate::class, \Stripe\PaymentIntent::OBJECT_NAME => \Stripe\PaymentIntent::class, \Stripe\PaymentLink::OBJECT_NAME => \Stripe\PaymentLink::class, \Stripe\PaymentMethod::OBJECT_NAME => \Stripe\PaymentMethod::class, \Stripe\Payout::OBJECT_NAME => \Stripe\Payout::class, \Stripe\Person::OBJECT_NAME => \Stripe\Person::class, \Stripe\Plan::OBJECT_NAME => \Stripe\Plan::class, \Stripe\Price::OBJECT_NAME => \Stripe\Price::class, \Stripe\Product::OBJECT_NAME => \Stripe\Product::class, \Stripe\PromotionCode::OBJECT_NAME => \Stripe\PromotionCode::class, \Stripe\Quote::OBJECT_NAME => \Stripe\Quote::class, \Stripe\Radar\EarlyFraudWarning::OBJECT_NAME => \Stripe\Radar\EarlyFraudWarning::class, \Stripe\Radar\ValueList::OBJECT_NAME => \Stripe\Radar\ValueList::class, \Stripe\Radar\ValueListItem::OBJECT_NAME => \Stripe\Radar\ValueListItem::class, \Stripe\Refund::OBJECT_NAME => \Stripe\Refund::class, \Stripe\Reporting\ReportRun::OBJECT_NAME => \Stripe\Reporting\ReportRun::class, \Stripe\Reporting\ReportType::OBJECT_NAME => \Stripe\Reporting\ReportType::class, \Stripe\Review::OBJECT_NAME => \Stripe\Review::class, \Stripe\SearchResult::OBJECT_NAME => \Stripe\SearchResult::class, \Stripe\SetupAttempt::OBJECT_NAME => \Stripe\SetupAttempt::class, \Stripe\SetupIntent::OBJECT_NAME => \Stripe\SetupIntent::class, \Stripe\ShippingRate::OBJECT_NAME => \Stripe\ShippingRate::class, \Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => \Stripe\Sigma\ScheduledQueryRun::class, \Stripe\Source::OBJECT_NAME => \Stripe\Source::class, \Stripe\SourceTransaction::OBJECT_NAME => \Stripe\SourceTransaction::class, \Stripe\Subscription::OBJECT_NAME => \Stripe\Subscription::class, \Stripe\SubscriptionItem::OBJECT_NAME => \Stripe\SubscriptionItem::class, \Stripe\SubscriptionSchedule::OBJECT_NAME => \Stripe\SubscriptionSchedule::class, \Stripe\TaxCode::OBJECT_NAME => \Stripe\TaxCode::class, \Stripe\TaxId::OBJECT_NAME => \Stripe\TaxId::class, \Stripe\TaxRate::OBJECT_NAME => \Stripe\TaxRate::class, \Stripe\Terminal\Configuration::OBJECT_NAME => \Stripe\Terminal\Configuration::class, \Stripe\Terminal\ConnectionToken::OBJECT_NAME => \Stripe\Terminal\ConnectionToken::class, \Stripe\Terminal\Location::OBJECT_NAME => \Stripe\Terminal\Location::class, \Stripe\Terminal\Reader::OBJECT_NAME => \Stripe\Terminal\Reader::class, \Stripe\TestHelpers\TestClock::OBJECT_NAME => \Stripe\TestHelpers\TestClock::class, \Stripe\Token::OBJECT_NAME => \Stripe\Token::class, \Stripe\Topup::OBJECT_NAME => \Stripe\Topup::class, \Stripe\Transfer::OBJECT_NAME => \Stripe\Transfer::class, \Stripe\TransferReversal::OBJECT_NAME => \Stripe\TransferReversal::class, \Stripe\Treasury\CreditReversal::OBJECT_NAME => \Stripe\Treasury\CreditReversal::class, \Stripe\Treasury\DebitReversal::OBJECT_NAME => \Stripe\Treasury\DebitReversal::class, \Stripe\Treasury\FinancialAccount::OBJECT_NAME => \Stripe\Treasury\FinancialAccount::class, \Stripe\Treasury\FinancialAccountFeatures::OBJECT_NAME => \Stripe\Treasury\FinancialAccountFeatures::class, \Stripe\Treasury\InboundTransfer::OBJECT_NAME => \Stripe\Treasury\InboundTransfer::class, \Stripe\Treasury\OutboundPayment::OBJECT_NAME => \Stripe\Treasury\OutboundPayment::class, \Stripe\Treasury\OutboundTransfer::OBJECT_NAME => \Stripe\Treasury\OutboundTransfer::class, \Stripe\Treasury\ReceivedCredit::OBJECT_NAME => \Stripe\Treasury\ReceivedCredit::class, \Stripe\Treasury\ReceivedDebit::OBJECT_NAME => \Stripe\Treasury\ReceivedDebit::class, \Stripe\Treasury\Transaction::OBJECT_NAME => \Stripe\Treasury\Transaction::class, \Stripe\Treasury\TransactionEntry::OBJECT_NAME => \Stripe\Treasury\TransactionEntry::class, \Stripe\UsageRecord::OBJECT_NAME => \Stripe\UsageRecord::class, \Stripe\UsageRecordSummary::OBJECT_NAME => \Stripe\UsageRecordSummary::class, \Stripe\WebhookEndpoint::OBJECT_NAME => \Stripe\WebhookEndpoint::class];
+}
+/**
+ * A basic random generator. This is in a separate class so we the generator
+ * can be injected as a dependency and replaced with a mock in tests.
+ */
+class RandomGenerator
+{
+	/**
+	 * Returns a random value between 0 and $max.
+	 *
+	 * @param float $max (optional)
+	 *
+	 * @return float
+	 */
+	public function randFloat($max = 1.0)
+	{
+	}
+	/**
+	 * Returns a v4 UUID.
+	 *
+	 * @return string
+	 */
+	public function uuid()
+	{
+	}
+}
+class RequestOptions
+{
+	/**
+	 * @var array<string> a list of headers that should be persisted across requests
+	 */
+	public static $HEADERS_TO_PERSIST = ['Stripe-Account', 'Stripe-Version'];
+	/** @var array<string, string> */
+	public $headers;
+	/** @var null|string */
+	public $apiKey;
+	/** @var null|string */
+	public $apiBase;
+	/**
+	 * @param null|string $key
+	 * @param array<string, string> $headers
+	 * @param null|string $base
+	 */
+	public function __construct($key = null, $headers = [], $base = null)
+	{
+	}
+	/**
+	 * @return array<string, string>
+	 */
+	public function __debugInfo()
+	{
+	}
+	/**
+	 * Unpacks an options array and merges it into the existing RequestOptions
+	 * object.
+	 *
+	 * @param null|array|RequestOptions|string $options a key => value array
+	 * @param bool $strict when true, forbid string form and arbitrary keys in array form
+	 *
+	 * @return RequestOptions
+	 */
+	public function merge($options, $strict = false)
+	{
+	}
+	/**
+	 * Discards all headers that we don't want to persist across requests.
+	 */
+	public function discardNonPersistentHeaders()
+	{
+	}
+	/**
+	 * Unpacks an options array into an RequestOptions object.
+	 *
+	 * @param null|array|RequestOptions|string $options a key => value array
+	 * @param bool $strict when true, forbid string form and arbitrary keys in array form
+	 *
+	 * @throws \Stripe\Exception\InvalidArgumentException
+	 *
+	 * @return RequestOptions
+	 */
+	public static function parse($options, $strict = false)
+	{
+	}
+}
+class Set implements \IteratorAggregate
+{
+	public function __construct($members = [])
+	{
+	}
+	public function includes($elt)
+	{
+	}
+	public function add($elt)
+	{
+	}
+	public function discard($elt)
+	{
+	}
+	public function toArray()
+	{
+	}
+	/**
+	 * @return ArrayIterator
+	 */
+	#[\ReturnTypeWillChange]
+	public function getIterator()
+	{
+	}
+}
+abstract class Util
+{
+	/**
+	 * Whether the provided array (or other) is a list rather than a dictionary.
+	 * A list is defined as an array for which all the keys are consecutive
+	 * integers starting at 0. Empty arrays are considered to be lists.
+	 *
+	 * @param array|mixed $array
+	 *
+	 * @return bool true if the given object is a list
+	 */
+	public static function isList($array)
+	{
+	}
+	/**
+	 * Converts a response from the Stripe API to the corresponding PHP object.
+	 *
+	 * @param array $resp the response from the Stripe API
+	 * @param array $opts
+	 *
+	 * @return array|StripeObject
+	 */
+	public static function convertToStripeObject($resp, $opts)
+	{
+	}
+	/**
+	 * @param mixed|string $value a string to UTF8-encode
+	 *
+	 * @return mixed|string the UTF8-encoded string, or the object passed in if
+	 *    it wasn't a string
+	 */
+	public static function utf8($value)
+	{
+	}
+	/**
+	 * Compares two strings for equality. The time taken is independent of the
+	 * number of characters that match.
+	 *
+	 * @param string $a one of the strings to compare
+	 * @param string $b the other string to compare
+	 *
+	 * @return bool true if the strings are equal, false otherwise
+	 */
+	public static function secureCompare($a, $b)
+	{
+	}
+	/**
+	 * Recursively goes through an array of parameters. If a parameter is an instance of
+	 * ApiResource, then it is replaced by the resource's ID.
+	 * Also clears out null values.
+	 *
+	 * @param mixed $h
+	 *
+	 * @return mixed
+	 */
+	public static function objectsToIds($h)
+	{
+	}
+	/**
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public static function encodeParameters($params)
+	{
+	}
+	/**
+	 * @param array $params
+	 * @param null|string $parentKey
+	 *
+	 * @return array
+	 */
+	public static function flattenParams($params, $parentKey = null)
+	{
+	}
+	/**
+	 * @param array $value
+	 * @param string $calculatedKey
+	 *
+	 * @return array
+	 */
+	public static function flattenParamsList($value, $calculatedKey)
+	{
+	}
+	/**
+	 * @param string $key a string to URL-encode
+	 *
+	 * @return string the URL-encoded string
+	 */
+	public static function urlEncode($key)
+	{
+	}
+	public static function normalizeId($id)
+	{
+	}
+	/**
+	 * Returns UNIX timestamp in milliseconds.
+	 *
+	 * @return int current time in millis
+	 */
+	public static function currentTimeMillis()
+	{
+	}
+}
+namespace Stripe;
+
+abstract class Webhook
+{
+	const DEFAULT_TOLERANCE = 300;
+	/**
+	 * Returns an Event instance using the provided JSON payload. Throws an
+	 * Exception\UnexpectedValueException if the payload is not valid JSON, and
+	 * an Exception\SignatureVerificationException if the signature
+	 * verification fails for any reason.
+	 *
+	 * @param string $payload the payload sent by Stripe
+	 * @param string $sigHeader the contents of the signature header sent by
+	 *                          Stripe
+	 * @param string $secret secret used to generate the signature
+	 * @param int $tolerance maximum difference allowed between the header's
+	 *                       timestamp and the current time
+	 *
+	 * @throws Exception\UnexpectedValueException if the payload is not valid JSON,
+	 * @throws Exception\SignatureVerificationException if the verification fails
+	 *
+	 * @return Event the Event instance
+	 */
+	public static function constructEvent($payload, $sigHeader, $secret, $tolerance = self::DEFAULT_TOLERANCE)
+	{
+	}
+}
+/**
+ * You can configure <a href="https://stripe.com/docs/webhooks/">webhook
+ * endpoints</a> via the API to be notified about events that happen in your Stripe
+ * account or connected accounts.
+ *
+ * Most users configure webhooks from <a
+ * href="https://dashboard.stripe.com/webhooks">the dashboard</a>, which provides a
+ * user interface for registering and testing your webhook endpoints.
+ *
+ * Related guide: <a href="https://stripe.com/docs/webhooks/configure">Setting up
+ * Webhooks</a>.
+ *
+ * @property string $id Unique identifier for the object.
+ * @property string $object String representing the object's type. Objects of the same type share the same value.
+ * @property null|string $api_version The API version events are rendered as for this webhook endpoint.
+ * @property null|string $application The ID of the associated Connect application.
+ * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
+ * @property null|string $description An optional description of what the webhook is used for.
+ * @property string[] $enabled_events The list of events to enable for this endpoint. <code>['*']</code> indicates that all events are enabled, except those that require explicit selection.
+ * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
+ * @property \Stripe\StripeObject $metadata Set of <a href="https://stripe.com/docs/api/metadata">key-value pairs</a> that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+ * @property null|string $secret The endpoint's secret, used to generate <a href="https://stripe.com/docs/webhooks/signatures">webhook signatures</a>. Only returned at creation.
+ * @property string $status The status of the webhook. It can be <code>enabled</code> or <code>disabled</code>.
+ * @property string $url The URL of the webhook endpoint.
+ */
+class WebhookEndpoint extends \Stripe\ApiResource
+{
+	const OBJECT_NAME = 'webhook_endpoint';
+	use \Stripe\ApiOperations\All;
+	use \Stripe\ApiOperations\Create;
+	use \Stripe\ApiOperations\Delete;
+	use \Stripe\ApiOperations\Retrieve;
+	use \Stripe\ApiOperations\Update;
+}
+abstract class WebhookSignature
+{
+	const EXPECTED_SCHEME = 'v1';
+	/**
+	 * Verifies the signature header sent by Stripe. Throws an
+	 * Exception\SignatureVerificationException exception if the verification fails for
+	 * any reason.
+	 *
+	 * @param string $payload the payload sent by Stripe
+	 * @param string $header the contents of the signature header sent by
+	 *                       Stripe
+	 * @param string $secret secret used to generate the signature
+	 * @param int $tolerance maximum difference allowed between the header's
+	 *                       timestamp and the current time
+	 *
+	 * @throws Exception\SignatureVerificationException if the verification fails
+	 *
+	 * @return bool
+	 */
+	public static function verifyHeader($payload, $header, $secret, $tolerance = null)
+	{
+	}
+}
+// phpcs:enable
diff --git a/dev/tools/phan/stubs/swiss-qr-bill.php b/dev/tools/phan/stubs/swiss-qr-bill.php
new file mode 100644
index 00000000000..6c12c53ff5a
--- /dev/null
+++ b/dev/tools/phan/stubs/swiss-qr-bill.php
@@ -0,0 +1,1021 @@
+<?php
+// phpcs:disable PEAR.Commenting
+namespace Sprain\SwissQrBill\Constraint;
+
+/**
+ * @internal
+ */
+final class ValidCreditorInformationPaymentReferenceCombination extends \Symfony\Component\Validator\Constraint
+{
+	public string $message = 'The payment reference type "{{ referenceType }}" does not match with the iban type of "{{ iban }}".';
+	public function getTargets() : string
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class ValidCreditorInformationPaymentReferenceCombinationValidator extends \Symfony\Component\Validator\ConstraintValidator
+{
+	public function validate(mixed $qrBill, \Symfony\Component\Validator\Constraint $constraint) : void
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class ValidCreditorReference extends \Symfony\Component\Validator\Constraint
+{
+	public string $message = 'The string "{{ string }}" is not a valid Creditor Reference.';
+}
+/**
+ * @internal
+ */
+final class ValidCreditorReferenceValidator extends \Symfony\Component\Validator\ConstraintValidator
+{
+	public function validate(mixed $value, \Symfony\Component\Validator\Constraint $constraint) : void
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\DataGroup;
+
+/**
+ * @internal
+ */
+interface AddressInterface
+{
+	public function getName() : ?string;
+	public function getCountry() : ?string;
+	public function getFullAddress(bool $forReceipt = false) : string;
+}
+
+namespace Sprain\SwissQrBill\DataGroup\Element\Abstracts;
+
+/**
+ * @internal
+ */
+abstract class Address
+{
+	protected static function normalizeString(?string $string) : ?string
+	{
+	}
+	/**
+	 * @param string[] $lines
+	 * @return string[]
+	 */
+	protected static function clearMultilines(array $lines) : array
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\DataGroup;
+
+/**
+ * @internal
+ */
+interface QrCodeableInterface
+{
+	/**
+	 * @return list<string|int|null>
+	 */
+	public function getQrCodeData() : array;
+}
+
+namespace Sprain\SwissQrBill\Validator;
+
+/**
+ * @internal
+ */
+interface SelfValidatableInterface
+{
+	public function getViolations() : \Symfony\Component\Validator\ConstraintViolationListInterface;
+	public function isValid() : bool;
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void;
+}
+/**
+ * @internal
+ */
+trait SelfValidatableTrait
+{
+	private ?\Symfony\Component\Validator\Validator\ValidatorInterface $validator = null;
+	public function getViolations() : \Symfony\Component\Validator\ConstraintViolationListInterface
+	{
+	}
+	public function isValid() : bool
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\DataGroup\Element;
+
+final class AdditionalInformation implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public const TRAILER_EPD = 'EPD';
+	public static function create(?string $message, ?string $billInformation = null) : self
+	{
+	}
+	public function getMessage() : ?string
+	{
+	}
+	public function getBillInformation() : ?string
+	{
+	}
+	public function getFormattedString() : ?string
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+/**
+ * For available alternative schemes see link.
+ * @link https://www.paymentstandards.ch/en/home/software-partner/alternative-schemes.html
+ */
+final class AlternativeScheme implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public static function create(string $parameter) : self
+	{
+	}
+	public function getParameter() : string
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+class CombinedAddress extends \Sprain\SwissQrBill\DataGroup\Element\Abstracts\Address implements \Sprain\SwissQrBill\DataGroup\AddressInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface, \Sprain\SwissQrBill\DataGroup\QrCodeableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public const ADDRESS_TYPE = 'K';
+	public static function create(string $name, ?string $addressLine1, string $addressLine2, string $country) : self
+	{
+	}
+	public function getName() : string
+	{
+	}
+	public function getAddressLine1() : ?string
+	{
+	}
+	public function getAddressLine2() : string
+	{
+	}
+	public function getCountry() : string
+	{
+	}
+	public function getFullAddress(bool $forReceipt = false) : string
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+final class CreditorInformation implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public static function create(string $iban) : self
+	{
+	}
+	public function getIban() : string
+	{
+	}
+	public function getFormattedIban() : string
+	{
+	}
+	public function containsQrIban() : bool
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+final class Header implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public const QRTYPE_SPC = 'SPC';
+	public const VERSION_0200 = '0200';
+	public const CODING_LATIN = 1;
+	public static function create(string $qrType, string $version, int $coding) : self
+	{
+	}
+	public function getQrType() : string
+	{
+	}
+	public function getVersion() : string
+	{
+	}
+	public function getCoding() : int
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+final class PaymentAmountInformation implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public const CURRENCY_CHF = 'CHF';
+	public const CURRENCY_EUR = 'EUR';
+	public static function create(string $currency, ?float $amount = null) : self
+	{
+	}
+	public function getAmount() : ?float
+	{
+	}
+	public function getFormattedAmount() : ?string
+	{
+	}
+	public function getCurrency() : string
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+final class PaymentReference implements \Symfony\Component\Validator\GroupSequenceProviderInterface, \Sprain\SwissQrBill\DataGroup\QrCodeableInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public const TYPE_QR = 'QRR';
+	public const TYPE_SCOR = 'SCOR';
+	public const TYPE_NON = 'NON';
+	public static function create(string $type, ?string $reference = null) : self
+	{
+	}
+	public function getType() : string
+	{
+	}
+	public function getReference() : ?string
+	{
+	}
+	public function getFormattedReference() : ?string
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+	public function getGroupSequence() : array|\Symfony\Component\Validator\Constraints\GroupSequence
+	{
+	}
+}
+final class StructuredAddress extends \Sprain\SwissQrBill\DataGroup\Element\Abstracts\Address implements \Sprain\SwissQrBill\DataGroup\AddressInterface, \Sprain\SwissQrBill\Validator\SelfValidatableInterface, \Sprain\SwissQrBill\DataGroup\QrCodeableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public const ADDRESS_TYPE = 'S';
+	public static function createWithoutStreet(string $name, string $postalCode, string $city, string $country) : self
+	{
+	}
+	public static function createWithStreet(string $name, string $street, ?string $buildingNumber, string $postalCode, string $city, string $country) : self
+	{
+	}
+	public function getName() : string
+	{
+	}
+	public function getStreet() : ?string
+	{
+	}
+	public function getBuildingNumber() : ?string
+	{
+	}
+	public function getPostalCode() : string
+	{
+	}
+	public function getCity() : string
+	{
+	}
+	public function getCountry() : string
+	{
+	}
+	public function getFullAddress(bool $forReceipt = false) : string
+	{
+	}
+	public function getQrCodeData() : array
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\DataGroup\EmptyElement;
+
+/**
+ * @internal
+ */
+final class EmptyAdditionalInformation implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface
+{
+	public const TRAILER_EPD = 'EPD';
+	public function getQrCodeData() : array
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class EmptyAddress implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface
+{
+	public const ADDRESS_TYPE = '';
+	public function getQrCodeData() : array
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class EmptyLine implements \Sprain\SwissQrBill\DataGroup\QrCodeableInterface
+{
+	public function getQrCodeData() : array
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\Exception;
+
+final class InvalidFpdfImageFormat extends \Exception
+{
+}
+final class InvalidQrBillDataException extends \Exception
+{
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Output;
+
+interface OutputInterface
+{
+	public function getQrBill() : ?\Sprain\SwissQrBill\QrBill;
+	public function getLanguage() : ?string;
+	public function getPaymentPart() : ?string;
+	public function setPrintable(bool $printable) : static;
+	public function isPrintable() : bool;
+	public function setQrCodeImageFormat(string $imageFormat) : static;
+	public function getQrCodeImageFormat() : string;
+}
+abstract class AbstractOutput implements \Sprain\SwissQrBill\PaymentPart\Output\OutputInterface
+{
+	protected \Sprain\SwissQrBill\QrBill $qrBill;
+	protected string $language;
+	protected bool $printable;
+	protected string $qrCodeImageFormat;
+	public function __construct(\Sprain\SwissQrBill\QrBill $qrBill, string $language)
+	{
+	}
+	public function getQrBill() : ?\Sprain\SwissQrBill\QrBill
+	{
+	}
+	public function getLanguage() : ?string
+	{
+	}
+	public function setPrintable(bool $printable) : static
+	{
+	}
+	public function isPrintable() : bool
+	{
+	}
+	public function setQrCodeImageFormat(string $fileExtension) : static
+	{
+	}
+	public function getQrCodeImageFormat() : string
+	{
+	}
+	/**
+	 * @return list<Title|Text|Placeholder>
+	 */
+	protected function getInformationElements() : array
+	{
+	}
+	/**
+	 * @return list<Title|Text|Placeholder>
+	 */
+	protected function getInformationElementsOfReceipt() : array
+	{
+	}
+	/**
+	 * @return list<Title|Text>
+	 */
+	protected function getCurrencyElements() : array
+	{
+	}
+	/**
+	 * @return list<Title|Text|Placeholder>
+	 */
+	protected function getAmountElements() : array
+	{
+	}
+	/**
+	 * @return list<Title|Text|Placeholder>
+	 */
+	protected function getAmountElementsReceipt() : array
+	{
+	}
+	/**
+	 * @return list<FurtherInformation>
+	 */
+	protected function getFurtherInformationElements() : array
+	{
+	}
+	protected function getQrCode() : \Sprain\SwissQrBill\QrCode\QrCode
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Output\Element;
+
+interface OutputElementInterface
+{
+}
+/**
+ * @internal
+ */
+final class FurtherInformation implements \Sprain\SwissQrBill\PaymentPart\Output\Element\OutputElementInterface
+{
+	public static function create(string $furtherInformation) : self
+	{
+	}
+	public function getText() : string
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class Placeholder implements \Sprain\SwissQrBill\PaymentPart\Output\Element\OutputElementInterface
+{
+	public const FILE_TYPE_SVG = 'svg';
+	public const FILE_TYPE_PNG = 'png';
+	public const PLACEHOLDER_TYPE_PAYABLE_BY = ['type' => 'placeholder_payable_by', 'fileSvg' => __DIR__ . '/../../../../assets/marks_65x25mm.svg', 'filePng' => __DIR__ . '/../../../../assets/marks_65x25mm.png', 'width' => 65, 'height' => 25];
+	public const PLACEHOLDER_TYPE_PAYABLE_BY_RECEIPT = ['type' => 'placeholder_payable_by_receipt', 'fileSvg' => __DIR__ . '/../../../../assets/marks_52x20mm.svg', 'filePng' => __DIR__ . '/../../../../assets/marks_52x20mm.png', 'width' => 52, 'height' => 20];
+	public const PLACEHOLDER_TYPE_AMOUNT = ['type' => 'placeholder_amount', 'fileSvg' => __DIR__ . '/../../../../assets/marks_40x15mm.svg', 'filePng' => __DIR__ . '/../../../../assets/marks_40x15mm.png', 'width' => 40, 'height' => 15];
+	public const PLACEHOLDER_TYPE_AMOUNT_RECEIPT = ['type' => 'placeholder_amount_receipt', 'fileSvg' => __DIR__ . '/../../../../assets/marks_30x10mm.svg', 'filePng' => __DIR__ . '/../../../../assets/marks_30x10mm.png', 'width' => 30, 'height' => 10];
+	/**
+	 * @param array{type: string, fileSvg: string, filePng: string, width: int, height: int} $type
+	 */
+	public static function create(array $type) : self
+	{
+	}
+	public function getType() : ?string
+	{
+	}
+	public function getFile(string $type = self::FILE_TYPE_SVG) : string
+	{
+	}
+	public function getWidth() : ?int
+	{
+	}
+	public function getHeight() : ?int
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class Text implements \Sprain\SwissQrBill\PaymentPart\Output\Element\OutputElementInterface
+{
+	public static function create(string $text) : self
+	{
+	}
+	public function getText() : string
+	{
+	}
+}
+/**
+ * @internal
+ */
+final class Title implements \Sprain\SwissQrBill\PaymentPart\Output\Element\OutputElementInterface
+{
+	public static function create(string $title) : self
+	{
+	}
+	public function getTitle() : string
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Output\FpdfOutput;
+
+final class FpdfOutput extends \Sprain\SwissQrBill\PaymentPart\Output\AbstractOutput
+{
+	public function __construct(\Sprain\SwissQrBill\QrBill $qrBill, string $language, \Fpdf\Fpdf|\setasign\Fpdi\Fpdi $fpdf, float $offsetX = 0, float $offsetY = 0)
+	{
+	}
+	public function getPaymentPart() : ?string
+	{
+	}
+	public function setQrCodeImageFormat(string $fileExtension) : static
+	{
+	}
+}
+class UnsupportedEnvironmentException extends \RuntimeException
+{
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput;
+
+final class HtmlOutput extends \Sprain\SwissQrBill\PaymentPart\Output\AbstractOutput
+{
+	public function getPaymentPart() : ?string
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput\Template;
+
+class FurtherInformationElementTemplate
+{
+	public const TEMPLATE = <<<EOT
+<p>{{ text }}</p>
+EOT;
+}
+class PaymentPartTemplate
+{
+	public const TEMPLATE = <<<EOT
+<style>
+#qr-bill {
+    box-sizing: border-box;
+    border-collapse: collapse;
+    color: #000 !important;
+}
+
+#qr-bill * {
+    font-family: Arial, Frutiger, Helvetica, "Liberation Sans"  !important;
+}
+
+#qr-bill img.qr-bill-placeholder {
+    margin-top: 1pt;
+}
+
+#qr-bill-separate-info {
+    text-align: center;
+    font-size: 8pt !important;
+    line-height: 9pt;
+    border-bottom: 0.75pt solid black;
+    height: 5mm;
+    vertical-align: middle;
+}
+
+/* h1 / h2 */
+#qr-bill h1 {
+    font-size: 11pt !important;
+    line-height: 13pt !important;
+    font-weight: bold !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    height: 7mm !important;
+    color: #000 !important;
+}
+
+#qr-bill h2 {
+    font-weight: bold !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    color: #000 !important;
+}
+
+#qr-bill-payment-part h2 {
+    font-size: 8pt !important;
+    line-height: 11pt !important;
+    margin-top: 11pt !important;
+    color: #000 !important;
+}
+
+#qr-bill-receipt h2 {
+    font-size: 6pt !important;
+    line-height: 8pt !important;
+    margin-top: 8pt !important;
+    color: #000 !important;
+}
+
+#qr-bill-payment-part h2:first-child,
+#qr-bill-receipt h2:first-child {
+    margin-top: 0 !important;
+    color: #000 !important;
+}
+
+/* p */
+#qr-bill p {
+    font-weight: normal !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    color: #000 !important;
+}
+
+#qr-bill-receipt p {
+    font-size: 8pt !important;
+    line-height: 9pt !important;
+    color: #000 !important;
+}
+
+#qr-bill-payment-part p {
+    font-size: 10pt !important;
+    line-height: 11pt !important;
+    color: #000 !important;
+}
+
+#qr-bill-amount-area-receipt p{
+    line-height: 11pt !important;
+    color: #000 !important;
+}
+
+#qr-bill-amount-area p{
+    line-height: 13pt !important;
+    color: #000 !important;
+}
+
+#qr-bill-payment-further-information p {
+    font-size: 7pt !important;
+    line-height: 9pt !important;
+    color: #000 !important;
+}
+
+/* Receipt */
+#qr-bill-receipt {
+    box-sizing: border-box;
+    width: 62mm;
+    border-right: 0.2mm solid black;
+    padding-left: 5mm;
+    padding-top: 5mm;
+    vertical-align: top;
+}
+
+#qr-bill-information-receipt {
+    height: 56mm;
+}
+
+#qr-bill-amount-area-receipt {
+    height: 14mm;
+}
+
+#qr-bill-currency-receipt {
+    float: left;
+    margin-right: 2mm;
+}
+
+#qr-bill-acceptance-point {
+    height: 18mm;
+    text-align: right;
+    margin-right: 5mm;
+}
+
+#qr-bill img#placeholder_amount_receipt {
+    float: right;
+    margin-top: -9pt;
+    margin-right: 5mm;
+}
+
+/* Main part */
+#qr-bill-payment-part {
+    box-sizing: border-box;
+    width: 148mm;
+    padding-left: 5mm;
+    padding-top: 5mm;
+    padding-right: 5mm;
+    vertical-align: top;
+}
+
+#qr-bill-payment-part-left {
+    float: left;
+    box-sizing: border-box;
+    width: 51mm;
+}
+
+#qr-bill-swiss-qr-image {
+    width: 46mm;
+    height: 46mm;
+    margin: 5mm;
+    margin-left: 0;
+}
+
+#qr-bill-amount-area {
+    height: 22mm;
+}
+
+#qr-bill-currency {
+    float: left;
+    margin-right: 2mm;
+}
+
+#qr-bill-payment-further-information {
+    clear: both;
+}
+
+#qr-bill img#placeholder_amount {
+    margin-left: 11mm;
+    margin-top: -11pt;
+}
+
+{{ printable-content }}
+</style>
+
+<table id="qr-bill">
+    <tr id="qr-bill-separate-info">
+        <td colspan="99"><span id="qr-bill-separate-info-text">{{ text.separate }}</span></td>
+    </tr>
+    <tr>
+        <td id="qr-bill-receipt">
+            <h1>{{ text.receipt }}</h1>
+            <div id="qr-bill-information-receipt">
+                {{ information-content-receipt }}
+            </div>
+            <div id="qr-bill-amount-area-receipt">
+                <div id="qr-bill-currency-receipt">
+                    {{ currency-content }}
+                </div>
+                <div id="qr-bill-amount-receipt">
+                    {{ amount-content-receipt }}
+                </div>
+            </div>
+            <div id="qr-bill-acceptance-point">
+                <h2>{{ text.acceptancePoint }}</h2>
+            </div>
+        </td>
+
+        <td id="qr-bill-payment-part">
+            <div id="qr-bill-payment-part-left">
+                <h1>{{ text.paymentPart }}</h1>
+                <img src="{{ swiss-qr-image }}" id="qr-bill-swiss-qr-image">
+                <div id="qr-bill-amount-area">
+                    <div id="qr-bill-currency">
+                        {{ currency-content }}
+                    </div>
+                    <div id="qr-bill-amount">
+                        {{ amount-content }}
+                    </div>
+                </div>
+            </div>
+            <div id="qr-bill-payment-part-right">
+                <div id="qr-bill-information">
+                    {{ information-content }}
+                </div>
+            </div>
+            <div id="qr-bill-payment-further-information">
+                {{ further-information-content }}
+            </div>
+        </td>
+    </tr>
+</table>
+EOT;
+}
+class PlaceholderElementTemplate
+{
+	public const TEMPLATE = <<<EOT
+<img src="{{ file }}" style="width:{{ width }}mm; height:{{ height }}mm;" class="qr-bill-placeholder" id="{{ id }}">
+EOT;
+}
+class PrintableStylesTemplate
+{
+	public const TEMPLATE = <<<EOT
+#qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
+    display: none;
+}
+
+#qr-bill-receipt {
+    border-right: 0;
+}
+EOT;
+}
+class TextElementTemplate
+{
+	public const TEMPLATE = <<<EOT
+<p>{{ text }}</p>
+EOT;
+}
+class TitleElementTemplate
+{
+	public const TEMPLATE = <<<EOT
+<h2>{{ {{ title }} }}</h2>
+EOT;
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Output\TcPdfOutput;
+
+final class TcPdfOutput extends \Sprain\SwissQrBill\PaymentPart\Output\AbstractOutput
+{
+	public function __construct(\Sprain\SwissQrBill\QrBill $qrBill, string $language, \TCPDF|\setasign\Fpdi\Tcpdf\Fpdi $tcPdf, float $offsetX = 0, float $offsetY = 0)
+	{
+	}
+	public function getPaymentPart() : ?string
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\PaymentPart\Translation;
+
+final class Translation
+{
+	/**
+	 * @return array<string, string>|null
+	 */
+	public static function getAllByLanguage(string $language) : ?array
+	{
+	}
+	public static function get(string $key, string $language) : ?string
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill;
+
+final class QrBill implements \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public static function create() : self
+	{
+	}
+	public function getHeader() : \Sprain\SwissQrBill\DataGroup\Element\Header
+	{
+	}
+	public function setHeader(\Sprain\SwissQrBill\DataGroup\Element\Header $header) : self
+	{
+	}
+	public function getCreditorInformation() : ?\Sprain\SwissQrBill\DataGroup\Element\CreditorInformation
+	{
+	}
+	public function setCreditorInformation(\Sprain\SwissQrBill\DataGroup\Element\CreditorInformation $creditorInformation) : self
+	{
+	}
+	public function getCreditor() : ?\Sprain\SwissQrBill\DataGroup\AddressInterface
+	{
+	}
+	public function setCreditor(\Sprain\SwissQrBill\DataGroup\AddressInterface $creditor) : self
+	{
+	}
+	public function getPaymentAmountInformation() : ?\Sprain\SwissQrBill\DataGroup\Element\PaymentAmountInformation
+	{
+	}
+	public function setPaymentAmountInformation(\Sprain\SwissQrBill\DataGroup\Element\PaymentAmountInformation $paymentAmountInformation) : self
+	{
+	}
+	public function getUltimateDebtor() : ?\Sprain\SwissQrBill\DataGroup\AddressInterface
+	{
+	}
+	public function setUltimateDebtor(\Sprain\SwissQrBill\DataGroup\AddressInterface $ultimateDebtor) : self
+	{
+	}
+	public function getPaymentReference() : ?\Sprain\SwissQrBill\DataGroup\Element\PaymentReference
+	{
+	}
+	public function setPaymentReference(\Sprain\SwissQrBill\DataGroup\Element\PaymentReference $paymentReference) : self
+	{
+	}
+	public function getAdditionalInformation() : ?\Sprain\SwissQrBill\DataGroup\Element\AdditionalInformation
+	{
+	}
+	public function setAdditionalInformation(\Sprain\SwissQrBill\DataGroup\Element\AdditionalInformation $additionalInformation) : self
+	{
+	}
+	/**
+	 * @return list<AlternativeScheme>
+	 */
+	public function getAlternativeSchemes() : array
+	{
+	}
+	/**
+	 * @param list<AlternativeScheme> $alternativeSchemes
+	 */
+	public function setAlternativeSchemes(array $alternativeSchemes) : self
+	{
+	}
+	public function addAlternativeScheme(\Sprain\SwissQrBill\DataGroup\Element\AlternativeScheme $alternativeScheme) : self
+	{
+	}
+	/**
+	 * @throws InvalidQrBillDataException
+	 */
+	public function getQrCode(?string $fileFormat = null) : \Sprain\SwissQrBill\QrCode\QrCode
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\QrCode\Exception;
+
+class UnsupportedFileExtensionException extends \Exception
+{
+}
+
+namespace Sprain\SwissQrBill\QrCode;
+
+final class QrCode
+{
+	public const FILE_FORMAT_PNG = 'png';
+	public const FILE_FORMAT_SVG = 'svg';
+	public static function create(string $data, string $fileFormat = null) : self
+	{
+	}
+	public function writeFile(string $path) : void
+	{
+	}
+	/**
+	 * @deprecated Will be removed in v5. Use getDataUri() instead.
+	 */
+	public function writeDataUri() : string
+	{
+	}
+	public function getDataUri(string $format = self::FILE_FORMAT_SVG) : string
+	{
+	}
+	public function getAsString(string $format = self::FILE_FORMAT_SVG) : string
+	{
+	}
+	public function getText() : string
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\Reference;
+
+final class QrPaymentReferenceGenerator implements \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public static function generate(?string $customerIdentificationNumber, string $referenceNumber) : string
+	{
+	}
+	public function __construct(?string $customerIdentificationNumber, string $referenceNumber)
+	{
+	}
+	public function getCustomerIdentificationNumber() : ?string
+	{
+	}
+	public function getReferenceNumber() : ?string
+	{
+	}
+	public function doGenerate() : string
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+	public function validateFullReference(\Symfony\Component\Validator\Context\ExecutionContextInterface $context) : void
+	{
+	}
+}
+final class RfCreditorReferenceGenerator implements \Sprain\SwissQrBill\Validator\SelfValidatableInterface
+{
+	use \Sprain\SwissQrBill\Validator\SelfValidatableTrait;
+	public static function generate(string $reference) : string
+	{
+	}
+	public function __construct(string $reference)
+	{
+	}
+	public function doGenerate() : string
+	{
+	}
+	public static function loadValidatorMetadata(\Symfony\Component\Validator\Mapping\ClassMetadata $metadata) : void
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\String;
+
+/**
+ * @internal
+ */
+final class StringModifier
+{
+	public static function replaceLineBreaksAndTabsWithSpaces(?string $string) : string
+	{
+	}
+	public static function replaceMultipleSpacesWithOne(?string $string) : string
+	{
+	}
+	public static function stripWhitespace(?string $string) : string
+	{
+	}
+}
+
+namespace Sprain\SwissQrBill\Validator\Exception;
+
+class InvalidCreditorReferenceException extends \Exception
+{
+}
+class InvalidQrPaymentReferenceException extends \Exception
+{
+}
diff --git a/dev/tools/phan/stubs/zip.phan_php b/dev/tools/phan/stubs/zip.phan_php
new file mode 100644
index 00000000000..7d14f9ce049
--- /dev/null
+++ b/dev/tools/phan/stubs/zip.phan_php
@@ -0,0 +1,161 @@
+<?php
+// These stubs were generated by the phan stub generator.
+// @phan-stub-for-extension zip@1.15.6
+
+namespace {
+class ZipArchive implements \Countable {
+
+    // constants
+    const CREATE = 1;
+    const EXCL = 2;
+    const CHECKCONS = 4;
+    const OVERWRITE = 8;
+    const RDONLY = 16;
+    const FL_NOCASE = 1;
+    const FL_NODIR = 2;
+    const FL_COMPRESSED = 4;
+    const FL_UNCHANGED = 8;
+    const FL_ENC_GUESS = 0;
+    const FL_ENC_RAW = 64;
+    const FL_ENC_STRICT = 128;
+    const FL_ENC_UTF_8 = 2048;
+    const FL_ENC_CP437 = 4096;
+    const CM_DEFAULT = -1;
+    const CM_STORE = 0;
+    const CM_SHRINK = 1;
+    const CM_REDUCE_1 = 2;
+    const CM_REDUCE_2 = 3;
+    const CM_REDUCE_3 = 4;
+    const CM_REDUCE_4 = 5;
+    const CM_IMPLODE = 6;
+    const CM_DEFLATE = 8;
+    const CM_DEFLATE64 = 9;
+    const CM_PKWARE_IMPLODE = 10;
+    const CM_BZIP2 = 12;
+    const CM_LZMA = 14;
+    const CM_XZ = 95;
+    const CM_TERSE = 18;
+    const CM_LZ77 = 19;
+    const CM_WAVPACK = 97;
+    const CM_PPMD = 98;
+    const ER_OK = 0;
+    const ER_MULTIDISK = 1;
+    const ER_RENAME = 2;
+    const ER_CLOSE = 3;
+    const ER_SEEK = 4;
+    const ER_READ = 5;
+    const ER_WRITE = 6;
+    const ER_CRC = 7;
+    const ER_ZIPCLOSED = 8;
+    const ER_NOENT = 9;
+    const ER_EXISTS = 10;
+    const ER_OPEN = 11;
+    const ER_TMPOPEN = 12;
+    const ER_ZLIB = 13;
+    const ER_MEMORY = 14;
+    const ER_CHANGED = 15;
+    const ER_COMPNOTSUPP = 16;
+    const ER_EOF = 17;
+    const ER_INVAL = 18;
+    const ER_NOZIP = 19;
+    const ER_INTERNAL = 20;
+    const ER_INCONS = 21;
+    const ER_REMOVE = 22;
+    const ER_DELETED = 23;
+    const ER_ENCRNOTSUPP = 24;
+    const ER_RDONLY = 25;
+    const ER_NOPASSWD = 26;
+    const ER_WRONGPASSWD = 27;
+    const ER_OPNOTSUPP = 28;
+    const ER_INUSE = 29;
+    const ER_TELL = 30;
+    const ER_COMPRESSED_DATA = 31;
+    const OPSYS_DOS = 0;
+    const OPSYS_AMIGA = 1;
+    const OPSYS_OPENVMS = 2;
+    const OPSYS_UNIX = 3;
+    const OPSYS_VM_CMS = 4;
+    const OPSYS_ATARI_ST = 5;
+    const OPSYS_OS_2 = 6;
+    const OPSYS_MACINTOSH = 7;
+    const OPSYS_Z_SYSTEM = 8;
+    const OPSYS_Z_CPM = 9;
+    const OPSYS_CPM = 9;
+    const OPSYS_WINDOWS_NTFS = 10;
+    const OPSYS_MVS = 11;
+    const OPSYS_VSE = 12;
+    const OPSYS_ACORN_RISC = 13;
+    const OPSYS_VFAT = 14;
+    const OPSYS_ALTERNATE_MVS = 15;
+    const OPSYS_BEOS = 16;
+    const OPSYS_TANDEM = 17;
+    const OPSYS_OS_400 = 18;
+    const OPSYS_OS_X = 19;
+    const OPSYS_DEFAULT = 3;
+    const EM_NONE = 0;
+    const EM_AES_128 = 257;
+    const EM_AES_192 = 258;
+    const EM_AES_256 = 259;
+    const LIBZIP_VERSION = '1.5.1';
+
+    // properties
+    public $comment;
+    public $filename;
+    public $numFiles;
+    public $status;
+    public $statusSys;
+
+    // methods
+    public function open($filename, $flags = null) {}
+    public function setPassword($password) {}
+    public function close() {}
+    public function count() {}
+    public function getStatusString() {}
+    public function addEmptyDir($dirname) {}
+    public function addFromString($name, $content) {}
+    public function addFile($filepath, $entryname = null, $start = null, $length = null) {}
+    public function addGlob($pattern, $flags = null, $options = null) {}
+    public function addPattern($pattern, $path = null, $options = null) {}
+    public function renameIndex($index, $new_name) {}
+    public function renameName($name, $new_name) {}
+    public function setArchiveComment($comment) {}
+    public function getArchiveComment($flags = null) {}
+    public function setCommentIndex($index, $comment) {}
+    public function setCommentName($name, $comment) {}
+    public function getCommentIndex($index, $flags = null) {}
+    public function getCommentName($name, $flags = null) {}
+    public function deleteIndex($index) {}
+    public function deleteName($name) {}
+    public function statName($filename, $flags = null) {}
+    public function statIndex($index, $flags = null) {}
+    public function locateName($filename, $flags = null) {}
+    public function getNameIndex($index, $flags = null) {}
+    public function unchangeArchive() {}
+    public function unchangeAll() {}
+    public function unchangeIndex($index) {}
+    public function unchangeName($name) {}
+    public function extractTo($pathto, $files = null) {}
+    public function getFromName($entryname, $len = null, $flags = null) {}
+    public function getFromIndex($index, $len = null, $flags = null) {}
+    public function getStream($entryname) {}
+    public function setExternalAttributesName($name, $opsys, $attr, $flags = null) {}
+    public function setExternalAttributesIndex($index, $opsys, $attr, $flags = null) {}
+    public function getExternalAttributesName($name, &$opsys, &$attr, $flags = null) {}
+    public function getExternalAttributesIndex($index, &$opsys, &$attr, $flags = null) {}
+    public function setCompressionName($name, $method, $compflags = null) {}
+    public function setCompressionIndex($index, $method, $compflags = null) {}
+    public function setEncryptionName($name, $method, $password = null) {}
+    public function setEncryptionIndex($index, $method, $password = null) {}
+}
+
+function zip_close($zip) {}
+function zip_entry_close($zip_ent) {}
+function zip_entry_compressedsize($zip_entry) {}
+function zip_entry_compressionmethod($zip_entry) {}
+function zip_entry_filesize($zip_entry) {}
+function zip_entry_name($zip_entry) {}
+function zip_entry_open($zip_dp, $zip_entry, $mode = null) {}
+function zip_entry_read($zip_entry, $len = null) {}
+function zip_open($filename) {}
+function zip_read($zip) {}
+}
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 73e60632add..c03b28d37dd 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1832,6 +1832,7 @@ class Adherent extends CommonObject
 					$vattouse = get_default_tva($mysoc, $mysoc, $idprodsubscription);
 				}
 				//print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				$result = $invoice->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
 				if ($result <= 0) {
 					$this->error = $invoice->error;
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 647d68820e6..219eaeb6274 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -292,6 +292,7 @@ class PrestaShopWebservice
 			if (LIBXML_VERSION < 20900) {
 				// Avoid load of external entities (security problem).
 				// Required only if LIBXML_VERSION < 20900
+				// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 				libxml_disable_entity_loader(true);
 			}
 
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 5f14face633..bf619d5f554 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -450,6 +450,7 @@ if ($action == 'edit') {
 
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING);
 		} else {
 			$text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING')];
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 20c00764b53..a285ad3554c 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -55,6 +55,7 @@ if ($action == 'getlastversion') {
 		if (LIBXML_VERSION < 20900) {
 			// Avoid load of external entities (security problem).
 			// Required only if LIBXML_VERSION < 20900
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			libxml_disable_entity_loader(true);
 		}
 
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 320f032fb19..57b9ea2c7d8 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -179,6 +179,7 @@ if (GETPOST('target') == 'remote') {
 		if (LIBXML_VERSION < 20900) {
 			// Avoid load of external entities (security problem).
 			// Required only if LIBXML_VERSION < 20900
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			libxml_disable_entity_loader(true);
 		}
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index d2b5ed921a8..bd0ccce9e13 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -66,6 +66,7 @@ if ($action == 'getlastversion') {
 		if (LIBXML_VERSION < 20900) {
 			// Avoid load of external entities (security problem).
 			// Required only if LIBXML_VERSION < 20900
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			libxml_disable_entity_loader(true);
 		}
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index e4ae442e461..2c222dd5c08 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -761,6 +761,7 @@ class Documents extends DolibarrApi
 
 			if (is_object($object)) {
 				if ($fetchbyid) {
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$result = $object->fetch($ref);
 				} else {
 					$result = $object->fetch('', $ref);
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index fa0a9941a94..d950185e6a9 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -2091,6 +2091,7 @@ class Setup extends DolibarrApi
 		if (LIBXML_VERSION < 20900) {
 			// Avoid load of external entities (security problem).
 			// Required only if LIBXML_VERSION < 20900
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			libxml_disable_entity_loader(true);
 		}
 
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 49c4bb474bc..3791531ed5a 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -37,6 +37,8 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
 
 global $forceall, $forcetoshowtitlelines, $filtertype;
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 649115f1831..6f4ad4e5a85 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -40,6 +40,8 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
 
 global $forceall, $filtertype;
 
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 680ac6d1079..b2b8d94bc51 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -39,6 +39,9 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
+
 global $filtertype;
 if (empty($filtertype)) {
 	$filtertype = 0;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index f01a7600c18..179bec8f474 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -44,6 +44,9 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
+
 global $filtertype;
 if (empty($filtertype)) {
 	$filtertype = 0;
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 42644ebd12a..e9ce306b0a0 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1086,6 +1086,7 @@ if ($action == 'create') {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 		$list = ModelePDFFactures::liste_modeles($db);
 		print img_picto('', 'generic', 'class="pictofixedwidth"');
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
 		print "</td></tr>";
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index d6d688ef27a..72fd00021c8 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -762,6 +762,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans("Contracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "SendContractRef";
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index b50b05be147..9f5228561d0 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -22,6 +22,23 @@
  */
 
 
+'
+@phan-var-force CommonObject $this
+@phan-var-force ?string $action
+@phan-var-force ?string $cancel
+@phan-var-force CommonObject $object
+@phan-var-force string $permissiontoadd
+@phan-var-force ?string $permissionedit
+@phan-var-force string $permissiontodelete
+@phan-var-force string $backurlforlist
+@phan-var-force ?string $backtopage
+@phan-var-force ?string $noback
+@phan-var-force ?string $triggermodname
+@phan-var-force string $hidedetails
+@phan-var-force string $hidedesc
+@phan-var-force string $hideref
+';
+
 // $action or $cancel must be defined
 // $object must be defined
 // $permissiontoadd must be defined
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index fc625e49b57..fa98bed7b41 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -218,6 +218,8 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 	 * @param int	$epaisseur			Epaisseur
 	 * @param int	$taille             Size
 	 * @return void
+	 *
+	 * @phan-suppress PhanPluginSuspiciousParamPosition
 	 */
 	protected function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 5f4182f729e..ceed3bb58c4 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -695,6 +695,7 @@ class dolReceiptPrinter extends Printer
 		if (LIBXML_VERSION < 20900) {
 			// Avoid load of external entities (security problem).
 			// Required only if LIBXML_VERSION < 20900
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			libxml_disable_entity_loader(true);
 		}
 
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index fab8416ff2e..1d3e3330032 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -99,9 +99,12 @@ class FormMargin
 
 			$pv = $line->total_ht;
 			// We chose to have line->pa_ht always positive in database, so we guess the correct sign
+			// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 			$pa_ht = (($pv < 0 || ($pv == 0 && in_array($object->element, array('facture', 'facture_fourn')) && $object->type == $object::TYPE_CREDIT_NOTE)) ? -$line->pa_ht : $line->pa_ht);
 			if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {	// Special case for old situation mode
+				// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 				if (($object->element == 'facture' && $object->type == $object::TYPE_SITUATION)
+					// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 					|| ($object->element == 'facture' && $object->type == $object::TYPE_CREDIT_NOTE && getDolGlobalInt('INVOICE_USE_SITUATION_CREDIT_NOTE') && $object->situation_counter > 0)) {
 					// We need a compensation relative to $line->situation_percent
 					$pa = $line->qty * $pa_ht * ($line->situation_percent / 100);
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b921a6b9b3c..06e42777894 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -616,6 +616,7 @@ class FormTicket
 				// If no socid, set to -1 to avoid full contacts list
 				$selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
 				print img_picto('', 'contact', 'class="paddingright"');
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print $form->selectcontacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
 				print ' ';
 				$formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index ba2e91f832d..d8ae597f9d3 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -260,6 +260,7 @@ class RssParser
 				if (LIBXML_VERSION < 20900) {
 					// Avoid load of external entities (security problem).
 					// Required only if LIBXML_VERSION < 20900
+					// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 					libxml_disable_entity_loader(true);
 				}
 
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 98838e623bf..adf4eb594cd 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -1,4 +1,5 @@
 <?php
+'@phan-var-force DolibarrModules $this';
 
 if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement)) {
 	//print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
diff --git a/htdocs/core/commonfieldsinimport.inc.php b/htdocs/core/commonfieldsinimport.inc.php
index cf41efc169d..4949bd26ebb 100644
--- a/htdocs/core/commonfieldsinimport.inc.php
+++ b/htdocs/core/commonfieldsinimport.inc.php
@@ -1,4 +1,5 @@
 <?php
+'@phan-var-force DolibarrModules $this';
 
 if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement)) {
 	//print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index f5e791e35fd..53ccf8e19bf 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -1273,6 +1273,7 @@ class mysqliDoli extends mysqli
 		if (PHP_VERSION_ID >= 80100) {
 			parent::__construct();
 		} else {
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			parent::init();
 		}
 		if (strpos($host, 'ssl://') === 0) {
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index 7f79181f808..ddf6fa464ca 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -1,4 +1,5 @@
 <?php
+'@phan-var-force DolibarrModules $this';
 
 // $keyforselect = name of main table
 // keyforelement = name of picto
diff --git a/htdocs/core/extrafieldsinimport.inc.php b/htdocs/core/extrafieldsinimport.inc.php
index a97a9c3d17a..570df5f8e0f 100644
--- a/htdocs/core/extrafieldsinimport.inc.php
+++ b/htdocs/core/extrafieldsinimport.inc.php
@@ -1,4 +1,5 @@
 <?php
+'@phan-var-force DolibarrModules $this';
 
 // $keyforselect = name of main table
 // keyforelement = name of picto
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ff40c78e06b..c8f8a31b1dc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1575,6 +1575,7 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '', $bad
 		$forbidden_chars_to_remove = $badcharstoremove;
 	}
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 	return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
 }
 
@@ -1953,6 +1954,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 
 	if (!empty($message)) {
 		// Test log level
+		// @phan-suppress-next-line PhanPluginDuplicateArrayKey
 		$logLevels = array(LOG_EMERG => 'EMERG', LOG_ALERT => 'ALERT', LOG_CRIT => 'CRITICAL', LOG_ERR => 'ERR', LOG_WARNING => 'WARN', LOG_NOTICE => 'NOTICE', LOG_INFO => 'INFO', LOG_DEBUG => 'DEBUG');
 		if (!array_key_exists($level, $logLevels)) {
 			throw new Exception('Incorrect log level');
@@ -6491,6 +6493,7 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 	}*/
 
 	$ret = price($dimension, 0, $outputlangs, 0, 0, $round);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$ret .= ' '.measuringUnitString(0, $type, $unit, $use_short_label, $outputlangs);
 
 	return $ret;
@@ -7785,6 +7788,7 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 					if (LIBXML_VERSION < 20900) {
 						// Avoid load of external entities (security problem).
 						// Required only if LIBXML_VERSION < 20900
+						// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 						libxml_disable_entity_loader(true);
 					}
 
@@ -10628,6 +10632,7 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 		$newdelimiter = $delimiter;
 	} else {
 		// This is a simple string
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPositionInternal
 		$newdelimiter = preg_quote($delimiter, '/');
 	}
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index dde1f70357a..df55b335132 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1218,6 +1218,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	// To ensure that all variables within the MAX() brackets are integers
 	// This avoid bad detection of max when data are noised with non numeric values at the position of the numero
 	if (getDolGlobalInt('MAIN_NUMBERING_FILTER_ON_INT_ONLY')) {
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', 1);
 	}
 
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index c2a7fd730c1..858ed63ec20 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -29,6 +29,7 @@ if (!function_exists('json_encode')) {
 	 *
 	 * @param	mixed	$elements		PHP Object to json encode
 	 * @return 	string					Json encoded string
+	 * @phan-suppress PhanRedefineFunctionInternal
 	 */
 	function json_encode($elements)
 	{
@@ -226,6 +227,7 @@ if (!function_exists('json_decode')) {
 	 * @param	string	$json		Json encoded to PHP Object or Array
 	 * @param	bool	$assoc		False return an object, true return an array
 	 * @return 	mixed				Object or Array
+	 * @phan-suppress PhanRedefineFunctionInternal
 	 */
 	function json_decode($json, $assoc = false)
 	{
@@ -276,6 +278,7 @@ function dol_json_decode($json, $assoc = false)
 	// Return an array
 	if ($out != '') {
 		try {
+			// @phan-suppress-next-line PhanPluginUnsafeEval
 			eval('$array = '.$out.';');
 		} catch (Exception $e) {
 			$array = array();
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index fad999b0d70..2e3b00939c5 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -275,6 +275,7 @@ function dol_setshmop($memoryid, $data, $expire)
 		if ($shm_bytes_written1 + $shm_bytes_written2 != 6 + dol_strlen($newdata)) {
 			print "Couldn't write the entire length of data\n";
 		}
+		// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 		shmop_close($handle);
 		return ($shm_bytes_written1 + $shm_bytes_written2);
 	} else {
@@ -312,6 +313,7 @@ function dol_getshmop($memoryid)
 		} else {
 			return -1;
 		}
+		// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 		shmop_close($handle);
 	} else {
 		return null; // Can't open existing block, so we suppose it was not created, so nothing were cached yet for the memoryid
diff --git a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
index 71cb6599bce..6a4a448a43c 100644
--- a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
+++ b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
@@ -186,6 +186,7 @@ class pdf_standard_actions
 			$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 			$pdf->SetKeywords($outputlangs->convToOutputCharset($this->title." ".$this->subject));
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 			$nbpage = $this->_pages($pdf, $outputlangs); // Write content
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index 68dd17b6d99..15a9d3bf15c 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -320,6 +320,7 @@ class pdf_standard_asset extends ModelePDFAsset
 					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -1325,6 +1326,7 @@ class pdf_standard_asset extends ModelePDFAsset
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 8b50df38a3e..957a57c9f39 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -287,6 +287,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -1489,6 +1490,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 7c8847c93f1..82cc9b1a16a 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -324,6 +324,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -1663,6 +1664,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 607cfb8e8ef..3c8bd902f7d 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -242,6 +242,7 @@ class pdf_strato extends ModelePDFContract
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -780,6 +781,7 @@ class pdf_strato extends ModelePDFContract
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 866edf11997..968f7d47949 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -270,6 +270,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
@@ -1011,6 +1012,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index c698abcdbb8..a851802251f 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -239,6 +239,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				/*
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index d951f81cd15..e3769c66f78 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -153,6 +153,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 *  Build new password
 	 *
 	 *  @return     string      Return a new generated password
+	 *
+	 *  @phan-suppress PhanPossiblyInfiniteRecursionSameParams
 	 */
 	public function getNewGeneratedPassword()
 	{
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 4d361622af4..60e43dc16c1 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -158,6 +158,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				print 'Failed to open log file '.($dolibarr_main_prod ? basename($logfile) : $logfile);
 			}
 		} else {
+			// @phan-suppress PhanPluginDuplicateArrayKey
 			$logLevels = array(
 				LOG_EMERG => 'EMERG',
 				LOG_ALERT => 'ALERT',
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index b558aa32062..dc14e7026e0 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -146,6 +146,7 @@ if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartp
 			$accesskeyalreadyassigned[$accesskey] = $accesskey;
 		}
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$searchform .= printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, $val['img'], $showtitlebefore, ($i > 0 ? 0 : 1));
 
 		$i++;
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
index dc7a748d2a6..8067e4fedbc 100644
--- a/htdocs/core/tpl/extrafields_add.tpl.php
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -39,6 +39,13 @@ if (empty($conf) || !is_object($conf)) {
 if (!isset($parameters)) {
 	$parameters = array();
 }
+'
+@phan-var-force CommonObject $object
+@phan-var-force string $action
+@phan-var-force Conf $conf
+@phan-var-force Translate $conf
+@phan-var-force array<string,mixed> $parameters
+';
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 7c72025a457..e605fbd93fb 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -39,6 +39,14 @@ if (empty($conf) || !is_object($conf)) {
 if (!isset($parameters)) {
 	$parameters = array();
 }
+'
+@phan-var-force CommonObject $object
+@phan-var-force string $action
+@phan-var-force Conf $conf
+@phan-var-force Translate $conf
+@phan-var-force array<string,mixed> $parameters
+';
+
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 7bedfdecfef..4d5dc2833dc 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -424,6 +424,7 @@ if (getDolGlobalString('MAIN_EASTER_EGG_COMMITSTRIP')) {
 		if (LIBXML_VERSION < 20900) {
 			// Avoid load of external entities (security problem).
 			// Required only if LIBXML_VERSION < 20900
+			// @phan-suppress-next-line PhanDeprecatedFunctionInternal
 			libxml_disable_entity_loader(true);
 		}
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index eb1b1dddc53..49ab40cc215 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -41,6 +41,9 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
+
 $usemargins = 0;
 if (isModEnabled('margin') && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) {
 	$usemargins = 1;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 948ee08ae50..875aef0d376 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -136,6 +136,7 @@ $coldisplay++;
 
 	$situationinvoicelinewithparent = 0;
 	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
+		// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice
 			// Set constant to disallow editing during a situation cycle
 			$situationinvoicelinewithparent = 1;
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 8e16d09492d..121f0466db9 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -40,6 +40,9 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
+
 print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
 
 // Title line
@@ -68,6 +71,7 @@ if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') || getDolGlobalString('FACTU
 	print $langs->trans('VAT');
 }
 
+// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 if (in_array($object->element, array('propal', 'commande', 'facture', 'supplier_proposal', 'order_supplier', 'invoice_supplier')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 
@@ -108,6 +112,7 @@ if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 print '<th class="linecoldiscount right nowraponall">';
 print $langs->trans('ReductionShort');
 
+// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 6566fb911ac..24a298e1ba5 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -38,13 +38,17 @@
  *
  * $text, $description, $line
  */
-
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object
+ @phan-var-force 0|1 $forceall
+';
+
 global $mysoc;
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
@@ -76,6 +80,7 @@ $domData .= ' data-qty="'.$line->qty.'"';
 $domData .= ' data-product_type="'.$line->product_type.'"';
 
 $sign = 1;
+// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 if (getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE_SCREEN') && in_array($object->element, array('facture', 'invoice_supplier')) && $object->type == $object::TYPE_CREDIT_NOTE) {
 	$sign = -1;
 }
@@ -421,6 +426,7 @@ if ($outputalsopricetotalwithtax) {
 if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlines') {
 	$situationinvoicelinewithparent = 0;
 	if (isset($line->fk_prev_id) && in_array($object->element, array('facture', 'facturedet'))) {
+		// @phan-suppress-next-line PhanUndeclaredConstantOfClass
 		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice
 			// Set constant to disallow editing during a situation cycle
 			$situationinvoicelinewithparent = 1;
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 1018d7d6d75..40a3656a7fd 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -27,6 +27,7 @@ if (empty($conf) || !is_object($conf)) {
 
 <!-- BEGIN PHP TEMPLATE originproductline.tpl.php -->
 <?php
+'@phan-var-force CommonObject $this';
 print '<tr data-id="'.$this->tpl['id'].'" class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
 print '<td class="linecolref">'.$this->tpl['label'].'</td>';
 print '<td class="linecoldescription">'.$this->tpl['description'].'</td>';
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 17335fba96a..3f5c0c8ba77 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -232,6 +232,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 							$userAccountControl -= 2;
 						}
 						$info['userAccountControl'] = $userAccountControl;
+						// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 						$resUpdate = $ldap->update($dn, $info, $user, $dn);
 						if ($resUpdate < 0) {
 							$this->error = "ErrorLDAP " . $ldap->error;
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 6e175a65d86..d42c2c92264 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -163,6 +163,7 @@ class InterfaceStripe extends DolibarrTriggers
 									$taxids = $customer->allTaxIds($customer->id);
 									if (is_array($taxids->data)) {
 										foreach ($taxids->data as $taxidobj) {
+											// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 											$customer->deleteTaxId($customer->id, $taxidobj->id);
 										}
 									}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 633291018e7..e4d0918ea1f 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1629,6 +1629,7 @@ class Expedition extends CommonObject
 
 
 				if ($originline > 0 && $originline == $obj->fk_origin_line) {
+					'@phan-var-force ExpeditionLigne $line';  // $line from previous loop
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 9d4e3e23c8c..535b9c47913 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -143,6 +143,7 @@ $arrayfields = array(
 	'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
 	'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0), //type duration is here because in database, column 'duree' is double
 );
+'@phan-var-force array{label:string,type?:string,checked:int,position?:int,enabled?:int,langfile?:string,help:string} $arrayfields';
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 129ed20a990..b4fbbfa998e 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -22,6 +22,8 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this';
+
 global $db, $langs;
 
 if (empty($form) || !is_object($form)) {
diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php
index 782d14bdcbd..05a4436e82b 100644
--- a/htdocs/product/stock/tpl/extrafields_add.tpl.php
+++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php
@@ -39,6 +39,13 @@ if (empty($conf) || !is_object($conf)) {
 if (!isset($parameters)) {
 	$parameters = array();
 }
+'
+@phan-var-force CommonObject $object
+@phan-var-force string $action
+@phan-var-force Conf $conf
+@phan-var-force Translate $conf
+@phan-var-force array<string,mixed> $parameters
+';
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 7d34b75abb5..21303d5d907 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -514,8 +514,10 @@ if ($sql_select) {
 		if ($type_element == 'contract') {
 			print $documentstaticline->getLibStatut(5);
 		} elseif ($type_element == 'invoice') {
+			// @phan-suppress-next-line PhanParamTooMany
 			print $documentstatic->getLibStatut(5, $objp->paid);
 		} elseif ($type_element == 'supplier_invoice') {
+			// @phan-suppress-next-line PhanParamTooMany
 			print $documentstatic->getLibStatut(5, $objp->paid);
 		} else {
 			print $documentstatic->getLibStatut(5);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 52786d894de..2a3a2681b77 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -460,6 +460,7 @@ class SupplierProposal extends CommonObject
 
 						// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
 						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+						// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 						$result = $productsupplier->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->socid); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->socid
 						if ($result > 0) {
 							$pu = $productsupplier->fourn_pu; // Unit price supplier price set by get_buyprice
diff --git a/htdocs/variants/tpl/productattributevalueline_create.tpl.php b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
index 7eeee0636cd..92bfc8c3b88 100644
--- a/htdocs/variants/tpl/productattributevalueline_create.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
@@ -30,6 +30,9 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $this';
+
 global $forcetoshowtitlelines;
 
 // Define colspan for the button 'Add'
diff --git a/htdocs/variants/tpl/productattributevalueline_view.tpl.php b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
index 1a43e884d06..54349ca725f 100644
--- a/htdocs/variants/tpl/productattributevalueline_view.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
@@ -38,6 +38,9 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
+'@phan-var-force CommonObject $this
+ @phan-var-force CommonObject $object';
+
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
 $domData .= ' data-id="'.$line->id.'"';
diff --git a/pyproject.toml b/pyproject.toml
index ce6cd53fe6e..1700fc27828 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # `codespell` can be run as a standalone program from the CLI
 # with the appropriate default options.
 
-skip = "*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*/documents"
+skip = "*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents"
 
 quiet-level=2
 ignore-regex = '\\[fnrstv]'

From 54af8a88d86bf178b8c18f50ad7f24cb6e03dbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 21 Feb 2024 18:48:20 +0100
Subject: [PATCH 0061/1862] NEW multiselect with checkbox in categories/tags
 search for thirdparty list (#28335)

NEW multiselect with checkbox in categories/tags search for thirdparty list
---
 htdocs/societe/list.php | 94 +++++++++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 32866803df7..c2f994d2fd8 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -5,15 +5,15 @@
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2016-2018  Josep Lluis Amador      <joseplluis@lliuretic.cat>
+ * Copyright (C) 2016-2024  Josep Lluis Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2016       Ferran Marcet      	    <fmarcet@2byte.es>
  * Copyright (C) 2017       Rui Strecht      	    <rui.strecht@aliartalentos.com>
  * Copyright (C) 2017       Juanjo Menent      	    <jmenent@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
- * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
- * Copyright (C) 2022		Anthony Berton			<anthony.berton@bb2a.fr>
- * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2020       Open-Dsi                <support@open-dsi.fr>
+ * Copyright (C) 2021       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022       Anthony Berton          <anthony.berton@bb2a.fr>
+ * Copyright (C) 2023       William Mead            <william.mead@manchenumerique.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
@@ -44,7 +44,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
-
+if (isModEnabled('categorie')) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "commercial", "customers", "suppliers", "bills", "compta", "categories", "cashdesk"));
@@ -95,6 +98,23 @@ $search_vat = trim(GETPOST('search_vat', 'alpha'));
 $search_sale = GETPOST("search_sale", 'int');
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_categ_sup = GETPOST("search_categ_sup", 'int');
+$searchCategoryCustomerOperator = 0;
+$searchCategorySupplierOperator = 0;
+if (GETPOSTISSET('formfilteraction')) {
+	$searchCategoryCustomerOperator = GETPOSTINT('search_category_customer_operator');
+	$searchCategorySupplierOperator = GETPOSTINT('search_category_supplier_operator');
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
+	$searchCategorySupplierOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
+}
+$searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
+if (!empty($search_categ_cus) && empty($searchCategoryCustomerList)) {
+	$searchCategoryCustomerList = array($search_categ_cus);
+}
+$searchCategorySupplierList = GETPOST('search_category_supplier_list', 'array');
+if (!empty($search_categ_sup) && empty($searchCategorySupplierList)) {
+	$searchCategorySupplierList = array($search_categ_sup);
+}
 $search_country = GETPOST("search_country", 'intcomma');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_price_level = GETPOST('search_price_level', 'int');
@@ -370,6 +390,10 @@ if (empty($reshook)) {
 		$search_alias = '';
 		$search_categ_cus = 0;
 		$search_categ_sup = 0;
+		$searchCategoryCustomerOperator = 0;
+		$searchCategorySupplierOperator = 0;
+		$searchCategoryCustomerList = array();
+		$searchCategorySupplierList = array();
 		$search_sale = '';
 		$search_barcode = "";
 		$search_customer_code = '';
@@ -564,8 +588,7 @@ if ($search_sale && $search_sale != '-1') {
 		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = ".((int) $search_sale).")";
 	}
 }
-$searchCategoryCustomerList = $search_categ_cus ? array($search_categ_cus) : array();
-$searchCategoryCustomerOperator = 0;
+
 // Search for tag/category ($searchCategoryCustomerList is an array of ID)
 if (!empty($searchCategoryCustomerList)) {
 	$searchCategoryCustomerSqlList = array();
@@ -594,9 +617,7 @@ if (!empty($searchCategoryCustomerList)) {
 		}
 	}
 }
-// Search Supplier Categories
-$searchCategorySupplierList = $search_categ_sup ? array($search_categ_sup) : array();
-$searchCategorySupplierOperator = 0;
+
 // Search for tag/category ($searchCategorySupplierList is an array of ID)
 if (!empty($searchCategorySupplierList)) {
 	$searchCategorySupplierSqlList = array();
@@ -837,7 +858,15 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && ($
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+$paramsCat = '';
+foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+	$paramsCat .= "&search_category_customer_list[]=".urlencode($searchCategoryCustomer);
+}
+foreach ($searchCategorySupplierList as $searchCategorySupplier) {
+	$paramsCat .= "&search_category_supplier_list[]=".urlencode($searchCategorySupplier);
+}
+
+llxHeader('', $title, $help_url, '', 0, 0, array(), array(), $paramsCat);
 
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -864,6 +893,18 @@ if ($search_categ_cus > 0) {
 if ($search_categ_sup > 0) {
 	$param .= '&search_categ_sup='.urlencode($search_categ_sup);
 }
+if ($searchCategoryCustomerOperator == 1) {
+	$param .= "&search_category_customer_operator=".urlencode($searchCategoryCustomerOperator);
+}
+if ($searchCategorySupplierOperator == 1) {
+	$param .= "&search_category_supplier_operator=".urlencode($searchCategorySupplierOperator);
+}
+foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+	$param .= "&search_category_customer_list[]=".urlencode($searchCategoryCustomer);
+}
+foreach ($searchCategorySupplierList as $searchCategorySupplier) {
+	$param .= "&search_category_supplier_list[]=".urlencode($searchCategorySupplier);
+}
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
@@ -1142,6 +1183,14 @@ $objecttmp = new Societe($db);
 $trackid = 'thi'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+if (!empty($search_categ_cus) || !empty($search_categ_sup)) {
+	print "<div id='ways'>";
+	$c = new Categorie($db);
+	$ways = $c->print_all_ways(' &gt; ', 'societe/list.php');
+	print " &gt; ".$ways[0]."<br>\n";
+	print "</div><br>";
+}
+
 if ($search_all) {
 	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
@@ -1152,26 +1201,19 @@ if ($search_all) {
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 }
 
+// Filter on categories
 $moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p') {
-	if (isModEnabled('categorie') && $user->hasRight("categorie", "lire")) {
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('Categories');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
-		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
-		$moreforfilter .= '</div>';
+	if (isModEnabled('categorie') && $user->hasRight('categorie', 'read')) {
+		$formcategory = new FormCategory($db);
+		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_CUSTOMER, $searchCategoryCustomerList, 'minwidth300', $searchCategoryCustomerOperator ? $searchCategoryCustomerOperator : 0);
 	}
 }
 
 if (empty($type) || $type == 'f') {
-	if (isModEnabled("fournisseur") && isModEnabled('categorie') && $user->hasRight("categorie", "lire")) {
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('Categories');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
-		$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1, $langs->trans('SuppliersCategoriesShort'));
-		$moreforfilter .= '</div>';
+	if (isModEnabled("fournisseur") && isModEnabled('categorie') && $user->hasRight('categorie', 'read')) {
+		$formcategory = new FormCategory($db);
+		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_SUPPLIER, $searchCategorySupplierList, 'minwidth300', $searchCategorySupplierOperator ? $searchCategorySupplierOperator : 0);
 	}
 }
 

From 3a23581b9ea088751f11d28787612a99a33410b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 18:59:27 +0100
Subject: [PATCH 0062/1862] Mutualize code

---
 htdocs/accountancy/admin/productaccount.php         | 4 ++++
 htdocs/core/class/html.formcategory.class.php       | 2 --
 htdocs/knowledgemanagement/knowledgerecord_list.php | 4 ++++
 htdocs/product/inventory/list.php                   | 4 ++++
 htdocs/projet/list.php                              | 6 +++++-
 htdocs/projet/tasks/list.php                        | 4 ++++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 903375f5920..8eca43948e6 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -527,6 +527,9 @@ if ($resql) {
 	// Filter on categories
 	$moreforfilter = '';
 	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		$formcategory = new FormCategory($db);
+		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductList ? $searchCategoryProductList : 0);
+		/*
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
 		$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
@@ -534,6 +537,7 @@ if ($resql) {
 		$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
 		$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> <label for="search_category_product_operator"><span class="none">'.$langs->trans('UseOrOperatorForCategories').'</span></label>';
 		$moreforfilter .= '</div>';
+		*/
 	}
 
 	// Show/hide child products. Hidden by default
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 6ad18d5034d..310f3f7d53c 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -92,8 +92,6 @@ class FormCategory extends Form
 	 */
 	public function selectProductCategory($selected = 0, $htmlname = 'product_category_id', $showempty = 0)
 	{
-		global $conf;
-
 		$sql = "SELECT cp.fk_categorie as cat_index, cat.label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cp";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as cat ON cat.rowid = cp.fk_categorie";
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 84445dc5ffd..c56bb6aef75 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -499,6 +499,9 @@ $moreforfilter.= '</div>';*/
 // Filter on categories
 $moreforfilter = '';
 if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_KNOWLEDGEMANAGEMENT, $searchCategoryKnowledgemanagementList, 'minwidth300', $searchCategoryKnowledgemanagementList ? $searchCategoryKnowledgemanagementList : 0);
+	/*
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
 	$categoriesKnowledgeArr = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', '', 64, 0, 1);
@@ -506,6 +509,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= Form::multiselectarray('search_category_knowledgemanagement_list', $categoriesKnowledgeArr, $searchCategoryKnowledgemanagementList, 0, 0, 'minwidth300');
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_knowledgemanagement_operator" name="search_category_knowledgemanagement_operator" value="1"'.($searchCategoryKnowledgemanagementOperator == 1 ? ' checked="checked"' : '').'/><label class="none valignmiddle" for="search_category_knowledgemanagement_operator">'.$langs->trans('UseOrOperatorForCategories').'</label>';
 	$moreforfilter .= '</div>';
+	*/
 }
 
 $parameters = array();
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 727c767b7f7..947de8a3fc9 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -477,6 +477,9 @@ $moreforfilter.= '</div>';*/
 
 // Filter on categories
 if (getDolGlobalString('MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS') && isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductList ? $searchCategoryProductList : 0);
+	/*
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('ProductsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -486,6 +489,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS') && isModEnabled(
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/>';
 	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
 	$moreforfilter .= '</div>';
+	*/
 }
 
 $parameters = array();
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4643d2a440b..55937976c50 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1128,9 +1128,12 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array, 'minwidth300imp minwidth300 widthcentpercentminusx');
 }
+
 // Filter on customer categories
 if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
-	$moreforfilter .= '<div class="divsearchfield">';
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_CUSTOMER, $searchCategoryCustomerList, 'minwidth300', $searchCategoryCustomerList ? $searchCategoryCustomerList : 0);
+	/*$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
 	$categoriesArr = $form->select_all_categories(Categorie::TYPE_CUSTOMER, '', '', 64, 0, 1);
@@ -1139,6 +1142,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST') && isMod
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_customer_operator" name="search_category_customer_operator" value="1"'.($searchCategoryCustomerOperator == 1 ? ' checked="checked"' : '').'/>';
 	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_cus'); // Tooltip on click
 	$moreforfilter .= '</div>';
+	*/
 }
 
 if (getDolGlobalInt('PROJECT_ENABLE_SUB_PROJECT')) {
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 6a79519b616..1394d6da1fd 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -810,6 +810,9 @@ $moreforfilter .= '</div>';
 
 // Filter on customer categories
 if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_CUSTOMER, $searchCategoryCustomerList, 'minwidth300', $searchCategoryCustomerList ? $searchCategoryCustomerList : 0);
+	/*
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -819,6 +822,7 @@ if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST') && isModEna
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_customer_operator" name="search_category_customer_operator" value="1"'.($searchCategoryCustomerOperator == 1 ? ' checked="checked"' : '').'/>';
 	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_cus'); // Tooltip on click
 	$moreforfilter .= '</div>';
+	*/
 }
 
 if (!empty($moreforfilter)) {

From ff524c9a529e402f6b2563ac5520acbbf318669d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 19:05:08 +0100
Subject: [PATCH 0063/1862] Reduce label

---
 htdocs/core/class/html.formcategory.class.php | 7 +++++--
 htdocs/langs/en_US/main.lang                  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 310f3f7d53c..19530933d86 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -35,7 +35,7 @@ class FormCategory extends Form
 	 * @param 	string		$type								The categorie type (e.g Categorie::TYPE_WAREHOUSE)
 	 * @param 	array		$preSelected						A list with the elements that should pre-selected
 	 * @param	string		$morecss							More CSS
-	 * @param	int			$searchCategoryProductOperator		0 or 1 to enable the checkbox to search with a or (0=not preseleted, 1=preselected)
+	 * @param	int			$searchCategoryProductOperator		0 or 1 to enable the checkbox to search with a or (0=not preseleted, 1=preselected), -1=Not used
 	 * @param	int			$multiselect						0 or 1
 	 * @param	int			$nocateg							1=Add an entry '- No Category -'
 	 * @param	string		$showempty							1 or 'string' to add an empty entry
@@ -76,7 +76,10 @@ class FormCategory extends Form
 			$filter .= $formother->select_categories($type, $preSelected[0], $htmlName, $nocateg, $tmptitle, $morecss);
 		}
 		if ($searchCategoryProductOperator >= 0) {
-			$filter .= ' <input type="checkbox" class="valignmiddle" id="'.$htmlName2.'" name="'.$htmlName2.'" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/><label class="none valignmiddle" for="'.$htmlName2.'">'.$langs->trans('UseOrOperatorForCategories').'</label>';
+			$filter .= ' <input type="checkbox" class="valignmiddle" id="'.$htmlName2.'" name="'.$htmlName2.'" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').' title="'.dol_escape_htmltag($langs->trans('UseOrOperatorForCategories')).'" />';
+			$filter .= '<label class="none valignmiddle" for="'.$htmlName2.'" title="'.dol_escape_htmltag($langs->trans('UseOrOperatorForCategories')).'">';
+			$filter .= $langs->trans('UseOrOperatorShort');
+			$filter .= '</label>';
 		}
 		$filter .= "</div>";
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 9bbeb508726..d603986da72 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1272,3 +1272,4 @@ Settings=Settings
 FillMessageWithALayout=Fill message with a layout
 FillMessageWithAIContent=Fill message with AI content
 EnterYourAIPromptHere=Enter your AI prompt here
+UseOrOperatorShort=Use 'or'

From 0fa220d1386038a70f119917f196c01487f732fc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 19:09:37 +0100
Subject: [PATCH 0064/1862] FIx: modulenames (#28337)

* Fix modulename

* Fix modulename

* Fix modulename
---
 htdocs/core/customreports.php           | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/fourn/facture/card.php           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 11d5dcf7eda..e5898f45fd2 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -97,7 +97,7 @@ $ObjectClassName = '';
 // Objects available by default
 $arrayoftype = array(
 	'thirdparty' => array('langs'=>'companies', 'label' => 'ThirdParties', 'picto'=>'company', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
-	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societ'), 'ClassPath' => "/contact/class/contact.class.php"),
+	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/contact/class/contact.class.php"),
 	'proposal' => array('label' => 'Proposals', 'picto'=>'proposal', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
 	'order' => array('label' => 'Orders', 'picto'=>'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('commande'), 'ClassPath' => "/commande/class/commande.class.php"),
 	'invoice' => array('langs'=>'facture', 'label' => 'Invoices', 'picto'=>'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 28eee47364c..38a690e8fee 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2094,7 +2094,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->hasRight('service', 'creer'));
 			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->hasRight('service', 'read'));
 
-			if (isModEnabled('Stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, $user->hasRight('service', 'read') && $user->hasRight('stock', 'lire'));
 			}
 			if (isModEnabled('variants')) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index cb360b2749b..2f40dfc21fa 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3858,7 +3858,7 @@ if ($action == 'create') {
 				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
 
 				// Remainder to pay Multicurrency
-				if (isModEnabled('multicurreny') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+				if (isModEnabled('multicurrency') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 					print '<tr><td colspan="'.$nbcols.'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayMulticurrency');
@@ -3892,7 +3892,7 @@ if ($action == 'create') {
 				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
 
 				// Remainder to pay back Multicurrency
-				if (isModEnabled('multicurreny') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+				if (isModEnabled('multicurrency') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 					print '<tr><td colspan="'.$nbcols.'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayBackMulticurrency');

From 5a4c8c6ce75eed294ceafe8caa9e239a1eab7007 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 19:09:37 +0100
Subject: [PATCH 0065/1862] FIx: modulenames (#28337)

* Fix modulename

* Fix modulename

* Fix modulename
---
 htdocs/core/customreports.php           | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/fourn/facture/card.php           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index ff288424d37..e937a405918 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -94,7 +94,7 @@ $ObjectClassName = '';
 // Objects available by default
 $arrayoftype = array(
 	'thirdparty' => array('langs'=>'companies', 'label' => 'ThirdParties', 'picto'=>'company', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
-	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societ'), 'ClassPath' => "/contact/class/contact.class.php"),
+	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/contact/class/contact.class.php"),
 	'proposal' => array('label' => 'Proposals', 'picto'=>'proposal', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
 	'order' => array('label' => 'Orders', 'picto'=>'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('commande'), 'ClassPath' => "/commande/class/commande.class.php"),
 	'invoice' => array('langs'=>'facture', 'label' => 'Invoices', 'picto'=>'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5b62e9edcc9..21da4633251 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2093,7 +2093,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->hasRight('service', 'creer'));
 			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->hasRight('service', 'read'));
 
-			if (isModEnabled('Stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, $user->hasRight('service', 'read') && $user->hasRight('stock', 'lire'));
 			}
 			if (isModEnabled('variants')) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0d7bdce4acc..544ded32a6f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3858,7 +3858,7 @@ if ($action == 'create') {
 				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
 
 				// Remainder to pay Multicurrency
-				if (isModEnabled('multicurreny') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+				if (isModEnabled('multicurrency') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 					print '<tr><td colspan="'.$nbcols.'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayMulticurrency');
@@ -3892,7 +3892,7 @@ if ($action == 'create') {
 				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
 
 				// Remainder to pay back Multicurrency
-				if (isModEnabled('multicurreny') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+				if (isModEnabled('multicurrency') && $object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 					print '<tr><td colspan="'.$nbcols.'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayBackMulticurrency');

From e363e53516dd148447e9d9a719df47e4eddaca9a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 21 Feb 2024 19:09:37 +0100
Subject: [PATCH 0066/1862] FIx: modulenames (#28337)

* Fix modulename

* Fix modulename

* Fix modulename
---
 htdocs/core/customreports.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index f04dd7a991e..e7d6a7b5b63 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -94,7 +94,7 @@ $ObjectClassName = '';
 // Objects available by default
 $arrayoftype = array(
 	'thirdparty' => array('langs'=>'companies', 'label' => 'ThirdParties', 'picto'=>'company', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
-	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societ'), 'ClassPath' => "/contact/class/contact.class.php"),
+	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/contact/class/contact.class.php"),
 	'proposal' => array('label' => 'Proposals', 'picto'=>'proposal', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
 	'order' => array('label' => 'Orders', 'picto'=>'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('commande'), 'ClassPath' => "/commande/class/commande.class.php"),
 	'invoice' => array('langs'=>'facture', 'label' => 'Invoices', 'picto'=>'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/facture/class/facture.class.php"),

From defd08ad935a13f1448c1665dde8404651dd018f Mon Sep 17 00:00:00 2001
From: kkhelifa-opendsi <kkhelifa@open-dsi.fr>
Date: Wed, 21 Feb 2024 19:28:01 +0100
Subject: [PATCH 0067/1862] NEW: Add global
 PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK for this is based on
 compiled physical stock, not the sum of product stocks on existing links.
 (#28171)

Because products without a warehouse no longer appear.
---
 htdocs/product/reassort.php | 98 ++++++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 39 deletions(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 76c2e89c3e4..259c2385115 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -141,7 +141,11 @@ if (!empty($objp->stock_physique) && $objp->stock_physique < 0) {
 $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
 $sql .= ' p.fk_product_type, p.tms as datem,';
 $sql .= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
-$sql .= ' SUM(s.reel) as stock_physique';
+if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+	$sql .= ' p.stock as stock_physique';
+} else {
+	$sql .= ' SUM(s.reel) as stock_physique';
+}
 if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	$sql .= ', u.short_label as unit_short';
 }
@@ -150,7 +154,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+	$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s ON p.rowid = s.fk_product';
+}
 if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 }
@@ -175,43 +181,45 @@ if (!empty($search_categ) && $search_categ != '-1') {
 	}
 	$sql .= ")";
 }
-if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_VIRTUAL_WITH_NO_PHYSICAL')) {
-	$sql .= " AND EXISTS (SELECT e.rowid FROM ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock')."))";
-} else {
-	$sql .= " AND 
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+	if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_VIRTUAL_WITH_NO_PHYSICAL')) {
+		$sql .= " AND EXISTS (SELECT e.rowid FROM " . MAIN_DB_PREFIX . "entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (" . getEntity('stock') . "))";
+	} else {
+		$sql .= " AND
 		(
-			EXISTS 
-				(SELECT e.rowid 
-				 FROM ".MAIN_DB_PREFIX."entrepot as e 
-				 WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock').")) 
+			EXISTS
+				(SELECT e.rowid
+				 FROM " . MAIN_DB_PREFIX . "entrepot as e
+				 WHERE e.rowid = s.fk_entrepot AND e.entity IN (" . getEntity('stock') . "))
 			OR (
-				SELECT SUM(cd1.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd1 
-				LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c1 
-					ON c1.rowid = cd1.fk_commande 
+				SELECT SUM(cd1.qty) as qty
+				FROM " . MAIN_DB_PREFIX . "commande_fournisseurdet as cd1
+				LEFT JOIN " . MAIN_DB_PREFIX . "commande_fournisseur as c1
+					ON c1.rowid = cd1.fk_commande
 				WHERE c1.entity IN (1) AND cd1.fk_product = p.rowid AND c1.fk_statut in (3,4) AND cd1.qty <> 0
 			) IS NOT NULL
 			OR (
-				SELECT SUM(cd2.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."commandedet as cd2 
-				LEFT JOIN ".MAIN_DB_PREFIX."commande as c2 ON c2.rowid = cd2.fk_commande 
+				SELECT SUM(cd2.qty) as qty
+				FROM " . MAIN_DB_PREFIX . "commandedet as cd2
+				LEFT JOIN " . MAIN_DB_PREFIX . "commande as c2 ON c2.rowid = cd2.fk_commande
 				WHERE c2.entity IN (1) AND cd2.fk_product = p.rowid AND c2.fk_statut in (1,2) AND cd2.qty <> 0
 			) IS NOT NULL
 			OR (
-				SELECT SUM(ed3.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."expeditiondet as ed3 
-				LEFT JOIN ".MAIN_DB_PREFIX."expedition as e3 ON e3.rowid = ed3.fk_expedition 
-				LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd3 ON ed3.fk_origin_line = cd3.rowid 
-				LEFT JOIN ".MAIN_DB_PREFIX."commande as c3 ON c3.rowid = cd3.fk_commande 
+				SELECT SUM(ed3.qty) as qty
+				FROM " . MAIN_DB_PREFIX . "expeditiondet as ed3
+				LEFT JOIN " . MAIN_DB_PREFIX . "expedition as e3 ON e3.rowid = ed3.fk_expedition
+				LEFT JOIN " . MAIN_DB_PREFIX . "commandedet as cd3 ON ed3.fk_origin_line = cd3.rowid
+				LEFT JOIN " . MAIN_DB_PREFIX . "commande as c3 ON c3.rowid = cd3.fk_commande
 				WHERE e3.entity IN (1) AND cd3.fk_product = p.rowid AND c3.fk_statut IN (1,2) AND e3.fk_statut IN (1,2) AND ed3.qty <> 0
 			) IS NOT NULL
 			OR (
-				SELECT SUM(mp4.qty) as qty 
-				FROM ".MAIN_DB_PREFIX."mrp_production as mp4 
-				LEFT JOIN ".MAIN_DB_PREFIX."mrp_mo as m4 ON m4.rowid = mp4.fk_mo AND m4.entity IN (1) AND m4.status IN (1,2)
+				SELECT SUM(mp4.qty) as qty
+				FROM " . MAIN_DB_PREFIX . "mrp_production as mp4
+				LEFT JOIN " . MAIN_DB_PREFIX . "mrp_mo as m4 ON m4.rowid = mp4.fk_mo AND m4.entity IN (1) AND m4.status IN (1,2)
 				WHERE mp4.fk_product = p.rowid AND mp4.qty <> 0
 			) IS NOT NULL
 			) ";
+	}
 }
 if ($sall) {
 	$sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
@@ -245,12 +253,22 @@ if (!empty($canvas)) {
 if ($fourn_id > 0) {
 	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".((int) $fourn_id);
 }
+if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+	if ($search_toolowstock) {
+		$sql .= " AND p.stock < p.seuil_stock_alerte";
+	}
+	if ($search_stock_physique != '') {
+		$sql .= natural_search('p.stock', $search_stock_physique, 1, 1);
+	}
+}
 // Add where from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-$sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
-$sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
+	$sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
+}
 
 // Add GROUP BY from hooks
 $parameters = array();
@@ -258,19 +276,21 @@ $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $obj
 $sql .= $hookmanager->resPrint;
 
 $sql_having = '';
-if ($search_toolowstock) {
-	$sql_having .= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
-}
-if ($search_stock_physique != '') {
-	//$natural_search_physique = natural_search('HAVING SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
-	$natural_search_physique = natural_search('SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
-	$natural_search_physique = " " . substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
-	if (!empty($sql_having)) {
-		$sql_having .= " AND";
-	} else {
-		$sql_having .= " HAVING";
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+	if ($search_toolowstock) {
+		$sql_having .= " HAVING SUM(" . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ") < p.seuil_stock_alerte";
+	}
+	if ($search_stock_physique != '') {
+		//$natural_search_physique = natural_search('HAVING SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
+		$natural_search_physique = natural_search('SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
+		$natural_search_physique = " " . substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
+		if (!empty($sql_having)) {
+			$sql_having .= " AND";
+		} else {
+			$sql_having .= " HAVING";
+		}
+		$sql_having .= $natural_search_physique;
 	}
-	$sql_having .= $natural_search_physique;
 }
 
 // Add HAVING from hooks

From b4255e1b6c2159d0363dbe8396c3802d89095fe2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 21 Feb 2024 19:33:14 +0100
Subject: [PATCH 0068/1862] Rename var into
 PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK

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

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 259c2385115..786be0a7173 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -141,7 +141,7 @@ if (!empty($objp->stock_physique) && $objp->stock_physique < 0) {
 $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
 $sql .= ' p.fk_product_type, p.tms as datem,';
 $sql .= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
-if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK')) {
 	$sql .= ' p.stock as stock_physique';
 } else {
 	$sql .= ' SUM(s.reel) as stock_physique';
@@ -154,7 +154,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK')) {
 	$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s ON p.rowid = s.fk_product';
 }
 if (getDolGlobalString('PRODUCT_USE_UNITS')) {
@@ -181,7 +181,7 @@ if (!empty($search_categ) && $search_categ != '-1') {
 	}
 	$sql .= ")";
 }
-if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK')) {
 	if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_VIRTUAL_WITH_NO_PHYSICAL')) {
 		$sql .= " AND EXISTS (SELECT e.rowid FROM " . MAIN_DB_PREFIX . "entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (" . getEntity('stock') . "))";
 	} else {
@@ -253,7 +253,7 @@ if (!empty($canvas)) {
 if ($fourn_id > 0) {
 	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".((int) $fourn_id);
 }
-if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK')) {
 	if ($search_toolowstock) {
 		$sql .= " AND p.stock < p.seuil_stock_alerte";
 	}
@@ -265,7 +265,7 @@ if (getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK'))
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK')) {
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 	$sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
 }
@@ -276,7 +276,7 @@ $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $obj
 $sql .= $hookmanager->resPrint;
 
 $sql_having = '';
-if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_COMPILED_PHYSICAL_STOCK')) {
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_WITH_PRECALCULATED_DENORMALIZED_PHYSICAL_STOCK')) {
 	if ($search_toolowstock) {
 		$sql_having .= " HAVING SUM(" . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ") < p.seuil_stock_alerte";
 	}

From c0a5b4fe4c4862def65c84b3ba49ac9b8ef4f70a Mon Sep 17 00:00:00 2001
From: Can Arslan <138895927+mc2rcanarslan@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:44:06 -0700
Subject: [PATCH 0069/1862] FIX: removed unnecessary check (#28339)

* FIx: modulenames (#28337)

* Fix modulename

* Fix modulename

* Fix modulename

* FIX: removed unnecessary check

Condition is already checked on line 482

---------

Co-authored-by: MDW <mdeweerd@users.noreply.github.com>
---
 htdocs/recruitment/recruitmentcandidature_card.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index f812dd447d3..0ab047ef440 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -487,9 +487,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$fuser->fetch($object->fk_user_creat);
 			$morehtmlref .= $fuser->getNomUrl(-1);
 		}
-		if (!empty($object->email_msgid)) {
-			$morehtmlref .= ' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
-		}
+		$morehtmlref .= ' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
 	} /* elseif (!empty($object->origin_email)) {
 		$morehtmlref .= $langs->trans("CreatedBy").' : ';
 		$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');

From c396dcdfbbeb2180a13f9b756287619edd837aba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 00:09:45 +0100
Subject: [PATCH 0070/1862] Fix from #27211

---
 htdocs/core/lib/files.lib.php | 4 ++--
 htdocs/document.php           | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7b0ac3e6a78..7152e2778bb 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2564,7 +2564,7 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
  * @param	string		$original_file		Relative path with filename, relative to modulepart.
  * @param	string		$entity				Restrict onto entity (0=no restriction)
  * @param  	User|null	$fuser				User object (forced)
- * @param	string		$refname			Ref of object to check permission for external users (autodetect if not provided) or for hierarchy
+ * @param	string		$refname			Ref of object to check permission for external users (autodetect if not provided by taking the dirname of $original_file) 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()
@@ -2612,7 +2612,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	// Find the subdirectory name as the reference. For example original_file='10/myfile.pdf' -> refname='10'
 	if (empty($refname)) {
 		$refname = basename(dirname($original_file)."/");
-		if ($refname == 'thumbs') {
+		if ($refname == 'thumbs' || $refname == 'temp') {
 			// If we get the thumbs directory, we must go one step higher. For example original_file='10/thumbs/myfile_small.jpg' -> refname='10'
 			$refname = basename(dirname(dirname($original_file))."/");
 		}
diff --git a/htdocs/document.php b/htdocs/document.php
index f1d3c187ce1..82fd61a5874 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -209,16 +209,13 @@ $original_file = str_replace('../', '/', $original_file);
 $original_file = str_replace('..\\', '/', $original_file);
 
 
-// Find the subdirectory name as the reference
-$refname = basename(dirname($original_file)."/");
-
 // Security check
 if (empty($modulepart)) {
 	accessforbidden('Bad value for parameter modulepart');
 }
 
 // Check security and set return info with full path of file
-$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, $refname);
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, '');
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
@@ -282,7 +279,7 @@ if (!file_exists($fullpath_original_file_osencoded)) {
 // Hooks
 $hookmanager->initHooks(array('document'));
 $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
-	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,
+	'entity' => $entity, 'fullpath_original_file' => $fullpath_original_file,
 	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
 $object = new stdClass();
 $reshook = $hookmanager->executeHooks('downloadDocument', $parameters, $object, $action); // Note that $action and $object may have been

From 52646ee9f50980a690c15e4ffb901f1c851b017a Mon Sep 17 00:00:00 2001
From: Saami PERDRIX <142794129+atm-saamiperdrix@users.noreply.github.com>
Date: Thu, 22 Feb 2024 00:10:04 +0100
Subject: [PATCH 0071/1862] =?UTF-8?q?fix=20aper=C3=A7u/dl=20fichier=20quan?=
 =?UTF-8?q?d=20il=20est=20dans=20{userid}/temp=20(#27211)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/core/lib/files.lib.php | 2 +-
 htdocs/document.php           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4195dee8dc1..2fab41a2a03 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2295,7 +2295,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	// Find the subdirectory name as the reference. For example original_file='10/myfile.pdf' -> refname='10'
 	if (empty($refname)) {
 		$refname = basename(dirname($original_file)."/");
-		if ($refname == 'thumbs') {
+		if ($refname == 'thumbs' || $refname == 'temp') {
 			// If we get the thumbns directory, we must go one step higher. For example original_file='10/thumbs/myfile_small.jpg' -> refname='10'
 			$refname = basename(dirname(dirname($original_file))."/");
 		}
diff --git a/htdocs/document.php b/htdocs/document.php
index c13e8f42a73..532b1a53b52 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -207,7 +207,7 @@ $original_file = str_replace('..\\', '/', $original_file);
 
 
 // Find the subdirectory name as the reference
-$refname = basename(dirname($original_file)."/");
+//$refname = basename(dirname($original_file)."/");
 
 // Security check
 if (empty($modulepart)) {
@@ -215,11 +215,10 @@ if (empty($modulepart)) {
 }
 
 // Check security and set return info with full path of file
-$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, $refname);
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, '');
 $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;
 
 if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
@@ -283,7 +282,7 @@ if (!is_object($hookmanager)) {
 }
 $hookmanager->initHooks(array('document'));
 $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
-	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,
+	'entity' => $entity, 'refname' => '', 'fullpath_original_file' => $fullpath_original_file,
 	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
 $reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
 if ($reshook < 0) {
@@ -293,6 +292,7 @@ if ($reshook < 0) {
 	exit;
 }
 
+
 // Permissions are ok and file found, so we return it
 top_httphead($type);
 header('Content-Description: File Transfer');
@@ -300,6 +300,7 @@ if ($encoding) {
 	header('Content-Encoding: '.$encoding);
 }
 // Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
+
 if ($attachment) {
 	header('Content-Disposition: attachment; filename="'.$filename.'"');
 } else {

From efd2afb8f99bf03855b062f4031916449915852d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 00:11:48 +0100
Subject: [PATCH 0072/1862] comment

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

diff --git a/htdocs/document.php b/htdocs/document.php
index 82fd61a5874..8013a9739f8 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -219,7 +219,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.' '.$original_file.' '.$refname.' '.$accessallowed);exit;
+//var_dump($fullpath_original_file.' '.$original_file.' '.$accessallowed);exit;
 
 if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed

From f7e8725406653766d05d83b780720e58ab09771d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 00:12:33 +0100
Subject: [PATCH 0073/1862] Clean code

---
 htdocs/document.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/document.php b/htdocs/document.php
index 532b1a53b52..87b8828a4ad 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -206,9 +206,6 @@ $original_file = str_replace('../', '/', $original_file);
 $original_file = str_replace('..\\', '/', $original_file);
 
 
-// Find the subdirectory name as the reference
-//$refname = basename(dirname($original_file)."/");
-
 // Security check
 if (empty($modulepart)) {
 	accessforbidden('Bad value for parameter modulepart');
@@ -282,7 +279,7 @@ if (!is_object($hookmanager)) {
 }
 $hookmanager->initHooks(array('document'));
 $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
-	'entity' => $entity, 'refname' => '', 'fullpath_original_file' => $fullpath_original_file,
+	'entity' => $entity, 'fullpath_original_file' => $fullpath_original_file,
 	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
 $reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
 if ($reshook < 0) {

From 0505f8e563964ace708d53ddf2f158914c70b5c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 00:19:19 +0100
Subject: [PATCH 0074/1862] Merge branch '19.0' of
 git@github.com:Dolibarr/dolibarr.git into develop


From cfa1b78efe3cbf4fed8f819a902e420bf58295fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 00:44:21 +0100
Subject: [PATCH 0075/1862] FIX disabled pito of menu must be greyed.

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 93ecd74b481..667e22a6974 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2761,6 +2761,9 @@ a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
 button.ui-button.ui-corner-all.ui-widget:focus {
 	outline: none;
 }
+.tmenuimage {
+	color: var(--colortextbackhmenu);
+}
 
 /* For mainmenu, we always load the img */
 

From 3d688cfb55375f6f92fd153b8622cbfb7b2805a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 01:13:27 +0100
Subject: [PATCH 0076/1862] FIX Bad picto on list of permission of a user when
 user not admin

---
 htdocs/user/perms.php | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index e30e7f19f4f..987c88d7c68 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -591,18 +591,18 @@ if ($result) {
 
 		// Permission and tick (2 columns)
 		if (!empty($object->admin) && !empty($objMod->rights_admin_allowed)) {    // Permission granted because admin
+			print '<!-- perm is a perm allowed to any admin -->';
 			if ($caneditperms) {
 				print '<td class="center">'.img_picto($langs->trans("AdministratorDesc"), 'star').'</td>';
 			} else {
-				print '<td>&nbsp;</td>';
-			}
-			print '<td class="center nowrap">';
-			if (!$caneditperms) {
+				print '<td class="center nowrap">';
 				print img_picto($langs->trans("Active"), 'switch_on', '', false, 0, 0, '', 'opacitymedium');
-				//print img_picto($langs->trans("Active"), 'tick');
+				print '</td>';
 			}
+			print '<td>';
 			print '</td>';
 		} elseif (in_array($obj->id, $permsuser)) {					// Permission granted by user
+			print '<!-- user has perm -->';
 			if ($caneditperms) {
 				print '<td class="center">';
 				print '<a class="reposition addexpandedmodulesinparamlist" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&token='.newToken().'&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&updatedmodulename='.$obj->module.'">';
@@ -610,44 +610,41 @@ if ($result) {
 				print img_picto($langs->trans("Remove"), 'switch_on');
 				print '</a></td>';
 			} else {
-				print '<td>&nbsp;</td>';
-			}
-			print '<td class="center nowrap">';
-			if (!$caneditperms) {
+				print '<td class="center nowrap">';
 				print img_picto($langs->trans("Active"), 'switch_on', '', false, 0, 0, '', 'opacitymedium');
-				//print img_picto($langs->trans("Active"), 'tick');
+				print '</td>';
 			}
+			print '<td>';
 			print '</td>';
 		} elseif (isset($permsgroupbyentitypluszero) && is_array($permsgroupbyentitypluszero)) {
+			print '<!-- permsgroupbyentitypluszero -->';
 			if (in_array($obj->id, $permsgroupbyentitypluszero)) {	// Permission granted by group
 				print '<td class="center nowrap">';
 				print img_picto($langs->trans("Active"), 'switch_on', '', false, 0, 0, '', 'opacitymedium');
 				//print img_picto($langs->trans("Active"), 'tick');
 				print '</td>';
-				if ($caneditperms) {
-					print '<td class="">';
-					print $form->textwithtooltip($langs->trans("Inherited"), $langs->trans("PermissionInheritedFromAGroup"));
-					print '</td>';
-				} else {
-					print '<td>c&nbsp;</td>';
-				}
+				print '<td>';
+				print $form->textwithtooltip($langs->trans("Inherited"), $langs->trans("PermissionInheritedFromAGroup"));
+				print '</td>';
 			} else {
 				// Do not own permission
 				if ($caneditperms) {
-					print '<td class="center">';
+					print '<td class="center nowrap">';
 					print '<a class="reposition addexpandedmodulesinparamlist" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'&updatedmodulename='.$obj->module.'">';
 					//print img_edit_add($langs->trans("Add"));
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';
 				} else {
-					print '<td>';
-					print '&nbsp;';
+					print '<td class="center nowrap">';
+					print img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', 'opacitymedium');
 					print '</td>';
 				}
-				print '<td>&nbsp;</td>';
+				print '<td>';
+				print '</td>';
 			}
 		} else {
 			// Do not own permission
+			print '<!-- do not own permission -->';
 			if ($caneditperms) {
 				print '<td class="center">';
 				print '<a class="reposition addexpandedmodulesinparamlist" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'&updatedmodulename='.$obj->module.'">';
@@ -655,7 +652,7 @@ if ($result) {
 				print img_picto($langs->trans("Add"), 'switch_off');
 				print '</a></td>';
 			} else {
-				print '<td>aa';
+				print '<td>';
 				print img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', 'opacitymedium');
 				print '</td>';
 			}

From 9d48dcbd3d3690d1ab6acca10119b3673e594fd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 01:32:55 +0100
Subject: [PATCH 0077/1862] Fix phpstan

---
 htdocs/adherents/class/api_members.class.php  |  6 +--
 .../class/api_memberstypes.class.php          |  6 +--
 .../class/api_subscriptions.class.php         |  6 +--
 htdocs/bom/class/api_boms.class.php           |  9 ++---
 .../categories/class/api_categories.class.php |  6 +--
 .../action/class/api_agendaevents.class.php   |  7 ++--
 htdocs/contrat/class/api_contracts.class.php  |  7 ++--
 htdocs/don/class/api_donations.class.php      |  7 ++--
 .../expedition/class/api_shipments.class.php  |  7 ++--
 .../class/api_expensereports.class.php        |  7 ++--
 .../class/api_supplier_invoices.class.php     |  7 ++--
 .../fourn/class/api_supplier_orders.class.php |  6 +--
 .../class/api_knowledgemanagement.class.php   |  6 +--
 .../template/class/api_mymodule.class.php     |  6 +--
 htdocs/mrp/class/api_mos.class.php            |  7 ++--
 .../class/api_multicurrencies.class.php       |  6 +--
 .../class/api_partnerships.class.php          |  6 +--
 htdocs/product/class/api_products.class.php   |  8 ++--
 .../stock/class/api_stockmovements.class.php  |  6 +--
 .../stock/class/api_warehouses.class.php      |  6 +--
 htdocs/projet/class/api_projects.class.php    |  7 ++--
 htdocs/projet/class/api_tasks.class.php       |  7 ++--
 htdocs/salaries/class/api_salaries.class.php  |  6 +--
 htdocs/societe/class/api_contacts.class.php   |  6 +--
 .../societe/class/api_thirdparties.class.php  |  6 +--
 htdocs/ticket/class/api_tickets.class.php     |  7 ++--
 htdocs/user/class/api_users.class.php         |  2 +-
 htdocs/zapier/class/api_zapier.class.php      | 38 -------------------
 28 files changed, 80 insertions(+), 131 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index a47017446bb..d551f6b5af9 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -313,9 +313,9 @@ class Members extends DolibarrApi
 	/**
 	 * Update member
 	 *
-	 * @param int   $id             ID of member to update
-	 * @param array $request_data   Datas
-	 * @return Object				Updated object
+	 * @param 	int   		$id             ID of member to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	404		Member not found
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index f055542d6b4..c3d0e374746 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -179,9 +179,9 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Update member type
 	 *
-	 * @param int   $id             ID of member type to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   		$id             ID of member type to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	404		No Member Type found
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 285a1948602..a5f27263cbd 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -176,9 +176,9 @@ class Subscriptions extends DolibarrApi
 	/**
 	 * Update subscription
 	 *
-	 * @param int   $id             ID of subscription to update
-	 * @param array $request_data   Datas
-	 * @return Object
+	 * @param 	int   		$id             ID of subscription to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	404		No Subscription found
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 464f4193f35..6f1e8b31ced 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -180,7 +180,7 @@ class Boms extends DolibarrApi
 	 * Create bom object
 	 *
 	 * @param array $request_data   Request datas
-	 * @return int  ID of bom
+	 * @return int  				ID of bom
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	500		Error retrieving list of boms
@@ -214,10 +214,9 @@ class Boms extends DolibarrApi
 	/**
 	 * Update bom
 	 *
-	 * @param int   $id             Id of bom to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   		$id             Id of bom to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Object after update
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	404		BOM not found
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index b938298f2c1..79b5007a241 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -218,9 +218,9 @@ class Categories extends DolibarrApi
 	/**
 	 * Update category
 	 *
-	 * @param int   $id             Id of category to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   		$id             Id of category to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 9c266c92cb6..6aa5bd090d8 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -229,10 +229,9 @@ class AgendaEvents extends DolibarrApi
 	/**
 	 * Update Agenda Event general fields
 	 *
-	 * @param int   $id             Id of Agenda Event to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return Object|false			Object with cleaned properties
+	 * @param 	int   		$id             Id of Agenda Event to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object|false				Object with cleaned properties
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index b4f5c8ffcea..cee27733140 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -480,10 +480,9 @@ class Contracts extends DolibarrApi
 	/**
 	 * Update contract general fields (won't touch lines of contract)
 	 *
-	 * @param int   $id             Id of contract to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return array|mixed
+	 * @param 	int   	$id             	Id of contract to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index c8e3e94527f..5e13d12bd35 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -209,10 +209,9 @@ class Donations extends DolibarrApi
 	/**
 	 * Update order general fields (won't touch lines of order)
 	 *
-	 * @param int   $id             Id of order to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of order to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index d46d7e57ea5..2eb5f95d05e 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -419,10 +419,9 @@ class Shipments extends DolibarrApi
 	/**
 	 * Update shipment general fields (won't touch lines of shipment)
 	 *
-	 * @param int   $id             Id of shipment to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of shipment to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index cfa8ecfb6df..d8e650fb88d 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -407,10 +407,9 @@ class ExpenseReports extends DolibarrApi
 	/**
 	 * Update Expense Report general fields (won't touch lines of expensereport)
 	 *
-	 * @param int   $id             Id of Expense Report to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of Expense Report to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws	RestException	401		Not allowed
 	 * @throws  RestException	404		Expense report not found
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index c96182ec545..38ade727330 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -229,10 +229,9 @@ class SupplierInvoices extends DolibarrApi
 	/**
 	 * Update supplier invoice
 	 *
-	 * @param int   $id             Id of supplier invoice to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of supplier invoice to update
+	 * @param 	array 	$request_data  		Datas
+	 * @return 	Object|false				Updated object
 	 *
 	 * @throws RestException 403
 	 * @throws RestException 404
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index bcc657c5a7f..156b395c377 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -257,9 +257,9 @@ class SupplierOrders extends DolibarrApi
 	/**
 	 * Update supplier order
 	 *
-	 * @param int   $id             Id of supplier order to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   	$id             	Id of supplier order to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object|false				Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index 90d222b0e59..8bb3e044889 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -257,9 +257,9 @@ class KnowledgeManagement extends DolibarrApi
 	/**
 	 * Update knowledgerecord
 	 *
-	 * @param int   $id             Id of knowledgerecord to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   	$id             	Id of knowledgerecord to update
+	 * @param 	array 	$request_data  		Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws RestException
 	 *
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 615bd359b21..1908a2a0b4b 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -224,9 +224,9 @@ class MyModuleApi extends DolibarrApi
 	/**
 	 * Update myobject
 	 *
-	 * @param int   $id             Id of myobject to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   		$id             Id of myobject to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Object after update
 	 *
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 404 Not found
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index d11b66915c4..2951c1069eb 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -204,10 +204,9 @@ class Mos extends DolibarrApi
 	/**
 	 * Update MO
 	 *
-	 * @param int   $id             Id of MO to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of MO to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
index 8ec5efacd91..3158263c0b7 100644
--- a/htdocs/multicurrency/class/api_multicurrencies.class.php
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -235,9 +235,9 @@ class MultiCurrencies extends DolibarrApi
 	/**
 	 * Update Currency
 	 *
-	 * @param int   $id             Id of Currency to update
-	 * @param array $request_data   Datas
-	 * @return array				The updated Currency
+	 * @param 	int   $id             	Id of Currency to update
+	 * @param 	array $request_data   	Datas
+	 * @return 	Object					The updated Currency
 	 *
 	 * @throws RestException
 	 */
diff --git a/htdocs/partnership/class/api_partnerships.class.php b/htdocs/partnership/class/api_partnerships.class.php
index b1b23066143..0fda760e704 100644
--- a/htdocs/partnership/class/api_partnerships.class.php
+++ b/htdocs/partnership/class/api_partnerships.class.php
@@ -217,9 +217,9 @@ class Partnerships extends DolibarrApi
 	/**
 	 * Update partnership
 	 *
-	 * @param int   $id             Id of partnership to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   	$id             	Id of partnership to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws RestException
 	 *
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 2f57093862e..48ab72e66d4 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -332,17 +332,15 @@ class Products extends DolibarrApi
 	 * Update product.
 	 * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
 	 *
-	 * @param  int   $id           Id of product to update
-	 * @param  array $request_data Datas
-	 * @return int
+	 * @param  	int   	$id           		Id of product to update
+	 * @param  	array 	$request_data 		Datas
+	 * @return 	Object						Updated object
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
 	public function put($id, $request_data = null)
 	{
-		global $conf;
-
 		if (!DolibarrApiAccess::$user->hasRight('produit', 'creer')) {
 			throw new RestException(403);
 		}
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index b0a460f7b97..e2457e09f8d 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -211,9 +211,9 @@ class StockMovements extends DolibarrApi
 	/**
 	 * Update stock movement
 	 *
-	 * @param int   $id             Id of warehouse to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   	$id             	Id of warehouse to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	/*
 	public function put($id, $request_data = null)
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index c03ba11c01d..e39ede65299 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -188,9 +188,9 @@ class Warehouses extends DolibarrApi
 	/**
 	 * Update warehouse
 	 *
-	 * @param int   $id             Id of warehouse to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   	$id             	Id of warehouse to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 896c1219653..b3637643169 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -438,10 +438,9 @@ class Projects extends DolibarrApi
 	/**
 	 * Update project general fields (won't touch lines of project)
 	 *
-	 * @param int   $id             Id of project to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of project to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 28304406505..89907456672 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -435,10 +435,9 @@ class Tasks extends DolibarrApi
 	/**
 	 * Update task general fields (won't touch time spent of task)
 	 *
-	 * @param int   $id             Id of task to update
-	 * @param array $request_data   Datas
-	 *
-	 * @return int
+	 * @param 	int   	$id             	Id of task to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/salaries/class/api_salaries.class.php b/htdocs/salaries/class/api_salaries.class.php
index 6baa75b88ae..693c1978b31 100644
--- a/htdocs/salaries/class/api_salaries.class.php
+++ b/htdocs/salaries/class/api_salaries.class.php
@@ -162,9 +162,9 @@ class Salaries extends DolibarrApi
 	/**
 	 * Update salary
 	 *
-	 * @param int    $id              ID of salary
-	 * @param array  $request_data    data
-	 * @return int
+	 * @param 	int    	$id              	ID of salary
+	 * @param 	array  	$request_data    	Data
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index eda54cd3d41..7fd087024c3 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -309,9 +309,9 @@ class Contacts extends DolibarrApi
 	/**
 	 * Update contact
 	 *
-	 * @param int   $id             Id of contact to update
-	 * @param array $request_data   Datas
-	 * @return int
+	 * @param 	int   	$id             	Id of contact to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index b7273e7fe6b..8dc6b56262f 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -273,9 +273,9 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Update thirdparty
 	 *
-	 * @param int   $id             Id of thirdparty to update
-	 * @param array $request_data   Datas
-	 * @return array|mixed|boolean
+	 * @param 	int   			$id             Id of thirdparty to update
+	 * @param 	array 			$request_data   Datas
+	 * @return 	Object|false					Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 0b7f6625847..6163ae449b2 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -353,10 +353,9 @@ class Tickets extends DolibarrApi
 	/**
 	 * Update ticket
 	 *
-	 * @param int   $id             Id of ticket to update
-	 * @param array $request_data   Datas
-	 * @return int
-	 *
+	 * @param 	int   	$id             	Id of ticket to update
+	 * @param 	array 	$request_data   	Datas
+	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index d2f406442b2..ac40da2c6df 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -350,7 +350,7 @@ class Users extends DolibarrApi
 	 *
 	 * @param	int			$id					Id of account to update
 	 * @param	array		$request_data		Datas
-	 * @return	array|mixed						Record after update
+	 * @return 	Object							Updated object
 	 *
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 404 Not found
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 30ab25c938d..b18dd175029 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -259,44 +259,6 @@ class Zapier extends DolibarrApi
 		);
 	}
 
-	// /**
-	//  * Update hook
-	//  *
-	//  * @param int   $id             Id of hook to update
-	//  * @param array $request_data   Datas
-	//  * @return int
-	//  *
-	//  * @url	PUT /hooks/{id}
-	//  */
-	/*public function put($id, $request_data = null)
-	{
-		if (! DolibarrApiAccess::$user->hasRight('zapier', 'write')) {
-			throw new RestException(403);
-		}
-
-		$result = $this->hook->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Hook not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		foreach($request_data as $field => $value) {
-			if ($field == 'id') {
-				continue;
-			}
-			$this->hook->$field = $value;
-		}
-
-		if ($this->hook->update($id, DolibarrApiAccess::$user) > 0) {
-			return $this->get($id);
-		} else {
-			throw new RestException(500, $this->hook->error);
-		}
-	}*/
-
 	/**
 	 * Delete hook
 	 *

From c5b0a13557b9cd1fa8f740df9ed76d71b6a33471 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 02:23:31 +0100
Subject: [PATCH 0078/1862] Fix warning

---
 htdocs/core/customreports.php | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index e5898f45fd2..a331a8690a1 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1133,7 +1133,7 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	if ($level == 0) {
 		// Add the count of record only for the main/first level object. Parents are necessarily unique for each record.
 		$arrayofmesures[$tablealias.'.count'] = array(
-			'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans("Number"),
+			'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans("Number"),
 			'labelnohtml' => $labelofobject.': '.$langs->trans("Number"),
 			'position' => 0,
 			'table' => $object->table_element,
@@ -1148,28 +1148,28 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
 			$position = (empty($val['position']) ? 0 : intval($val['position']));
 			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
-				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 				'position' => ($position + ($count * 100000)).'.1',
 				'table' => $object->table_element,
 				'tablefromt' => $tablepath
 			);
 			$arrayofmesures[$tablealias.'.'.$key.'-average'] = array(
-				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 				'position' => ($position + ($count * 100000)).'.2',
 				'table' => $object->table_element,
 				'tablefromt' => $tablepath
 			);
 			$arrayofmesures[$tablealias.'.'.$key.'-min'] = array(
-				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 				'position' => ($position + ($count * 100000)).'.3',
 				'table' => $object->table_element,
 				'tablefromt' => $tablepath
 			);
 			$arrayofmesures[$tablealias.'.'.$key.'-max'] = array(
-				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 				'position' => ($position + ($count * 100000)).'.4',
 				'table' => $object->table_element,
@@ -1183,28 +1183,28 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
 				$position = (!empty($val['position']) ? $val['position'] : 0);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position+($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-average'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position+($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-min'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position+($count * 100000)).'.3',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-max'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position+($count * 100000)).'.4',
 					'table' => $object->table_element,
@@ -1301,21 +1301,21 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
 				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofxaxis[$tablealias.'.'.$key.'-year'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofxaxis[$tablealias.'.'.$key.'-month'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofxaxis[$tablealias.'.'.$key.'-day'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
@@ -1324,7 +1324,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 			} else {
 				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofxaxis[$tablealias.'.'.$key] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)),
 					'table' => $object->table_element,
@@ -1347,21 +1347,21 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
 				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
 				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
@@ -1369,7 +1369,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 				);
 			} else {
 				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
 					'table' => $object->table_element,
@@ -1463,21 +1463,21 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
 				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofgroupby[$tablealias.'.'.$key.'-year'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[$tablealias.'.'.$key.'-month'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[$tablealias.'.'.$key.'-day'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
@@ -1486,7 +1486,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			} else {
 				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofgroupby[$tablealias.'.'.$key] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)),
 					'table' => $object->table_element,
@@ -1509,21 +1509,21 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
 				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
@@ -1531,7 +1531,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 				);
 			} else {
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
-					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
 					'table' => $object->table_element,

From ae84bf87528899917fb9be337bc6e20805a035ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 02:36:21 +0100
Subject: [PATCH 0079/1862] Fix error if result empty

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

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index a331a8690a1..950f6f8d684 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -456,10 +456,12 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			$arrayofvaluesforgroupby['g_'.$gkey]['__NULL__'] = $langs->transnoentitiesnoconv("NotDefined");
 		}
 
-		asort($arrayofvaluesforgroupby['g_'.$gkey]);
+		if (is_array($arrayofvaluesforgroupby['g_'.$gkey])) {
+			asort($arrayofvaluesforgroupby['g_'.$gkey]);
+		}
 
 		// Add a protection/error to refuse the request if number of differentr values for the group by is higher than $MAXUNIQUEVALFORGROUP
-		if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
+		if (is_array($arrayofvaluesforgroupby['g_'.$gkey]) && count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
 			$langs->load("errors");
 
 			if (strpos($fieldtocount, 'te') === 0) {			// This is a field of an extrafield

From 7112c5a782591fd5beaf84cf50a39222eada510d Mon Sep 17 00:00:00 2001
From: Can Arslan <138895927+mc2rcanarslan@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:42:57 -0700
Subject: [PATCH 0080/1862] FIX: PHP Warning: Undefined variable $lib (#28342)

---
 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 ff26e87bc29..304e2ae8cc9 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4727,7 +4727,7 @@ class Societe extends CommonObject
 				$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 			}
 		}
-		return $lib;
+		return $lib ?? '';
 	}
 
 	/**

From 5faf933d268838e0e61166d201dc1f912b9c2f63 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 22 Feb 2024 02:45:36 +0100
Subject: [PATCH 0081/1862] #FIX modulenames (#28338)

* Fix: modulename

* Fix: modulename
---
 htdocs/accountancy/index.php            | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index be739ba02fb..09236110b0e 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -290,7 +290,7 @@ if (isModEnabled('accounting')) {
 	print $boxlist;
 
 	print '</div>';
-} elseif (isModEnabled('compta')) {
+} elseif (isModEnabled('comptabilite')) {
 	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print '<span class="opacitymedium">'.$langs->trans("Module10Desc")."</span>\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 38a690e8fee..ef2581aed68 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -299,7 +299,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			isModEnabled('salaries') ||
 			isModEnabled('supplier_invoice') ||
 			isModEnabled('loan') ||
-			isModEnabled('margins')
+			isModEnabled('margin')
 		) ? 1 : 0,
 		'perms'=>($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
 			|| $user->hasRight('tax', 'charges', 'lire') || $user->hasRight('salaries', 'read')

From 5f9047b2e3ae2fd951a2122e4a40fe0fa3fcb40c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 22 Feb 2024 02:45:36 +0100
Subject: [PATCH 0082/1862] #FIX modulenames (#28338)

* Fix: modulename

* Fix: modulename
---
 htdocs/accountancy/index.php            | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index be739ba02fb..09236110b0e 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -290,7 +290,7 @@ if (isModEnabled('accounting')) {
 	print $boxlist;
 
 	print '</div>';
-} elseif (isModEnabled('compta')) {
+} elseif (isModEnabled('comptabilite')) {
 	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print '<span class="opacitymedium">'.$langs->trans("Module10Desc")."</span>\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 21da4633251..1cf504a30fd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -299,7 +299,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			isModEnabled('salaries') ||
 			isModEnabled('supplier_invoice') ||
 			isModEnabled('loan') ||
-			isModEnabled('margins')
+			isModEnabled('margin')
 		) ? 1 : 0,
 		'perms'=>($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
 			|| $user->hasRight('tax', 'charges', 'lire') || $user->hasRight('salaries', 'read')

From d5d7003f085662a46a1ae0efd4c3c57589815e95 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 22 Feb 2024 02:54:37 +0100
Subject: [PATCH 0083/1862] Qual: Add test to validate module_names (#28340)

* Qual: Add test to validate module_names

# Qual: Add test to validate module_names

This ensures that all explitly tested module names appear in the reference list.
Displays messages when the module_name is deprecated

* Update CodingPhpTest.php

* Update CodingPhpTest.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 test/phpunit/CodingPhpTest.php         | 173 +++++++++++++++++++++++++
 test/phpunit/CommonClassTest.class.php |  14 +-
 2 files changed, 182 insertions(+), 5 deletions(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index fe3653a6bd5..7290d9562d6 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -119,6 +120,8 @@ class CodingPhpTest extends CommonClassTest
 			//print 'Check php file '.$file['relativename']."\n";
 			$filecontent = file_get_contents($file['fullname']);
 
+			$this->verifyIsModuleEnabledOk($filecontent, "htdocs/{$file['relativename']}");
+
 			if (preg_match('/\.class\.php/', $file['relativename'])
 				|| preg_match('/boxes\/box_/', $file['relativename'])
 				|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
@@ -276,6 +279,7 @@ class CodingPhpTest extends CommonClassTest
 			//exit;
 
 
+
 			// Check sql string DELETE|OR|AND|WHERE|INSERT ... yyy = ".$xxx
 			//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string, or an (int) if int, when forging sql request.
 			$ok = true;
@@ -575,4 +579,173 @@ class CodingPhpTest extends CommonClassTest
 
 		return;
 	}
+
+
+	/**
+	 * Verify that only known modules are used
+	 *
+	 * @param string $filecontent Contents to check for php code that uses a module name
+	 * @param string $filename    File name for the contents (used for reporting)
+	 *
+	 * @return void
+	 */
+	private function verifyIsModuleEnabledOk(&$filecontent, $filename)
+	{
+		// Verify that only known modules are used
+		preg_match_all("/isModEnabled\\(\s*[\"']([^\$\"']+)[\"']\\s*\\)/", $filecontent, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $key => $val) {
+			$module_name = $val[1];
+			$this->assertModuleIsOk($module_name, "isModEnabled('$module_name') in '$filename'");
+		}
+	}
+
+	/**
+	 * Assert that the module name is ok, generate appropriate notifications
+	 *
+	 * @param string $module_name Module name to check
+	 * @param string $message     Message to shown in case an assertion fails
+	 *
+	 * @return void
+	 */
+	private function assertModuleIsOk($module_name, $message = '')
+	{
+		if (isset(self::DEPRECATED_MODULE_MAPPING[$module_name])) {
+			$new_name = self::DEPRECATED_MODULE_MAPPING[$module_name];
+			print("\033[31mDeprecated module name, use '$new_name':\033[0m$message".PHP_EOL);
+
+			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_NOTICE);
+			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_DEPRECATED);
+		} else {
+			$this->assertTrue(
+				isset(self::VALID_MODULE_MAPPING[$module_name]),
+				"Unknown module: $message"
+			);
+		}
+	}
+
+	const DEPRECATED_MODULE_MAPPING = array(
+		'actioncomm' => 'agenda',
+		'adherent' => 'member',
+		'adherent_type' => 'member_type',
+		'banque' => 'bank',
+		'categorie' => 'category',
+		'commande' => 'order',
+		'contrat' => 'contract',
+		'entrepot' => 'stock',
+		'facture' => 'invoice',
+		'fichinter' => 'intervention',
+		'product_fournisseur_price' => 'productsupplierprice',
+		'product_price' => 'productprice',
+		'projet'  => 'project',
+		'propale' => 'propal',
+		'socpeople' => 'contact',
+	);
+	const VALID_MODULE_MAPPING = array(
+		'agenda' => 1,
+		'member' => 1,
+		'member_type' => 1,
+		'bank' => 1,
+		'category' => 1,
+		'order' => 1,
+		'contract' => 1,
+		'stock' => 1,
+		'invoice' => 1,
+		'intervention' => 1,
+		'productsupplierprice' => 1,
+		'productprice' => 1,
+		'project' => 1,
+		'propal' => 1,
+		'contact' => 1,
+		'accounting' => 1,
+		'ai' => 1,
+		'anothermodule' => 1,
+		'api' => 1,
+		'asset' => 1,
+		'barcode' => 1,
+		'blockedlog' => 1,
+		'bom' => 1,
+		'bookcal' => 1,
+		'bookmark' => 1,
+		'cashdesk' => 1,
+		'clicktodial' => 1,
+		'comptabilite' => 1,
+		'cron' => 1,
+		'datapolicy' => 1,
+		'debugbar' => 1,
+		'deplacement' => 1,
+		'don' => 1,
+		'dynamicprices' => 1,
+		'ecm' => 1,
+		'ecotax' => 1,
+		'emailcollector' => 1,
+		'eventorganization' => 1,
+		'expedition' => 1,
+		'expensereport' => 1,
+		'export' => 1,
+		'externalsite' => 1,
+		'fckeditor' => 1,
+		'ficheinter' => 1,
+		'fournisseur' => 1,
+		'ftp' => 1,
+		'google' => 1,
+		'gravatar' => 1,
+		'holiday' => 1,
+		'hrm' => 1,
+		'import' => 1,
+		'incoterm' => 1,
+		'intracommreport' => 1,
+		'knowledgemanagement' => 1,
+		'label' => 1,
+		'ldap' => 1,
+		'loan' => 1,
+		'mailing' => 1,
+		'mailman' => 1,
+		'mailmanspip' => 1,
+		'margin' => 1,
+		'memcached' => 1,
+		'modulebuilder' => 1,
+		'mrp' => 1,
+		'multicompany' => 1,
+		'multicurrency' => 1,
+		'mymodule' => 1,
+		'notification' => 1,
+		'numberwords' => 1,
+		'openstreetmap' => 1,
+		'opensurvey' => 1,
+		'partnership' => 1,
+		'paybox' => 1,
+		'paymentbybanktransfer' => 1,
+		'paypal' => 1,
+		'paypalplus' => 1,
+		'prelevement' => 1,
+		'product' => 1,
+		'productbatch' => 1,
+		'receiptprinter' => 1,
+		'reception' => 1,
+		'recruitment' => 1,
+		'resource' => 1,
+		'salaries' => 1,
+		'service' => 1,
+		'socialnetworks' => 1,
+		'societe' => 1,
+		'stocktransfer' => 1,
+		'stripe' => 1,
+		'supplier_invoice' => 1,
+		'supplier_order' => 1,
+		'supplier_proposal' => 1,
+		'syslog' => 1,
+		'takepos' => 1,
+		'tax' => 1,
+		'ticket' => 1,
+		'user' => 1,
+		'variants' => 1,
+		'webhook' => 1,
+		'webportal' => 1,
+		'webservices' => 1,
+		'website' => 1,
+		'workflow' => 1,
+		'workstation' => 1,
+		'zapier' => 1,
+	);
 }
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index caa13406e0d..17bc6dbc5c7 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -104,16 +105,19 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 		$lines = file($logfile);
 
 		$nbLinesToShow = 100;
+		if ($t instanceof PHPUnit\Framework\Error\Notice) {
+			$nbLinesToShow = 3;
+		}
 		$totalLines = count($lines);
-		$premiereLigne = max(0, $totalLines - $nbLinesToShow);
+		$first_line = max(0, $totalLines - $nbLinesToShow);
 
-		// Obtient les dernières lignes du tableau
-		$dernieresLignes = array_slice($lines, $premiereLigne, $nbLinesToShow);
+		// Get the last line of the log
+		$last_lines = array_slice($lines, $first_line, $nbLinesToShow);
 
 		// Show log file
 		print "\n----- Test fails. Show last ".$nbLinesToShow." lines of dolibarr.log file -----\n";
-		foreach ($dernieresLignes as $ligne) {
-			print $ligne . "<br>";
+		foreach ($last_lines as $line) {
+			print $line . "<br>";
 		}
 
 		parent::onNotSuccessfulTest($t);

From 288d14b7afddc6f9fa7cc38788c92c84dd548117 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 02:58:16 +0100
Subject: [PATCH 0084/1862] Fix changelog

---
 ChangeLog | 133 +++++++++++++++++++++++++++---------------------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b4c4aacec8..afb30c7d899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,72 +2,6 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-***** ChangeLog for 18.0.5 compared to 18.0.4 *****
-FIX: 17.0: deprecated field should only be a fallback
-FIX: 17.0 - php8 warnings: test for $field existence before checking if it is null or empty
-FIX: #24185: v18: display of the merged pdf lists
-FIX: #26416 BOM_SUB_BOM blank page
-FIX: #27166
-FIX: #27262 Recurrent invoice - user to string conversion
-FIX: #27970 #26283 #27970
-FIX: Accountancy - Level 3 of binding not working on supplier side (#27462)
-FIX: Accounting files export - Use th instead of td on all title columns (#28003)
-FIX: add action update_extras to don card
-FIX: Adding hooks init
-FIX: Adding the $encode parameter to recursive _replaceHtmlWithOdtTag() utilisation
-FIX: add new hook context for mo production card (#28037)
-FIX: avoid from re-initializing result on nested hook getEntity (#27799)
-FIX: avoid sql error (issue #26342)
-FIX: bad accountancy code autoselection for supplier ventilation
-FIX: Bad visible status of proposal after reopen
-FIX: Barcode header cell not well displayed
-FIX: BarCode Header not well displayed
-FIX: Bar code verification should be done by entity because generation does (#28087)
-FIX: can edit reminders on past events
-FIX: check parameter socid before cloning a customer proposal (#28085)
-FIX: crabe PDF is generating in conf->entity instead of object->entity
-FIX: CVE-2024-23817 (#28089)
-FIX: disable pointer events on jQuery-UI tooltips to prevent a glitch (fast-blinking tooltip)
-FIX: Error on emailreminder not reported
-FIX: Fatal error converting object of class User to string (php8)
-FIX: filter by entity on contact is missing
-FIX: Fix supplier invoice security check
-FIX: format of color in manifest is wrong when using a custom color
-FIX: #GHSA-7947-48q7-cp5m
-FIX: HTML injection vulnerability in Dolibarr Application Home Page
-FIX: invoice add line save devise
-FIX: Keep a link to enable a 'always_enabled' module to solve pb.
-FIX: label
-FIX: line special_code never saved (#28051)
-FIX: link to print when there is a search on multiselect fields
-FIX: Menu Create of project no working on smartphone with no top menu.
-FIX: missing $search_sale var (backport from v19)
-FIX: Missing begin transaction when updating supplier recurring invoice
-FIX: missing entity filter for check if period exists
-FIX: more correctly parse the select part to be replaced in sql queries
-FIX: MouvementStock::origin is not an object
-FIX: notification information on intervention validated confirmation message (v17+)
-FIX: not load all contacts by default when creating an event
-FIX: port in Docker MailDev
-FIX: propal use devise changes
-FIX: public user photo not visible if $dolibarr_main_instance_unique_id
-FIX: remove DISTINCT (backport from v19)
-FIX: remove specific name from v19
-FIX: Retours PR
-FIX: Return a better error message when token is not valid
-FIX: search by ref & rowid in don list
-FIX: search by thirdparty in don list
-FIX: several names for one const THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT
-FIX: SQL concatenation error
-FIX: [TAKEPOS] display prices with or without taxes depending on setup (TAKEPOS_CHANGE_PRICE_HT)
-FIX: Ternary operator condition is always true/false
-FIX: too long output
-FIX: Undefined property: Task::$fk_parent
-FIX: uniformization to use "intervention"
-FIX: Update loan.class.php (#27971)
-FIX: update price extrafield on propal card
-FIX: user filter in per user view of event list (#28049)
-FIX: use the currency for propal signature page
 
 ***** ChangeLog for 19.0.0 compared to 18.0.0 *****
 
@@ -319,6 +253,73 @@ The following changes may create regressions for some external modules, but were
 * The load of hook context productdao has been removed before calling loadvirtualstock. Modules must use the context of main parent page or 'all' for all cases.
 
 
+***** ChangeLog for 18.0.5 compared to 18.0.4 *****
+FIX: 17.0: deprecated field should only be a fallback
+FIX: 17.0 - php8 warnings: test for $field existence before checking if it is null or empty
+FIX: #24185: v18: display of the merged pdf lists
+FIX: #26416 BOM_SUB_BOM blank page
+FIX: #27166
+FIX: #27262 Recurrent invoice - user to string conversion
+FIX: #27970 #26283 #27970
+FIX: Accountancy - Level 3 of binding not working on supplier side (#27462)
+FIX: Accounting files export - Use th instead of td on all title columns (#28003)
+FIX: add action update_extras to don card
+FIX: Adding hooks init
+FIX: Adding the $encode parameter to recursive _replaceHtmlWithOdtTag() utilisation
+FIX: add new hook context for mo production card (#28037)
+FIX: avoid from re-initializing result on nested hook getEntity (#27799)
+FIX: avoid sql error (issue #26342)
+FIX: bad accountancy code autoselection for supplier ventilation
+FIX: Bad visible status of proposal after reopen
+FIX: Barcode header cell not well displayed
+FIX: BarCode Header not well displayed
+FIX: Bar code verification should be done by entity because generation does (#28087)
+FIX: can edit reminders on past events
+FIX: check parameter socid before cloning a customer proposal (#28085)
+FIX: crabe PDF is generating in conf->entity instead of object->entity
+FIX: CVE-2024-23817 (#28089)
+FIX: disable pointer events on jQuery-UI tooltips to prevent a glitch (fast-blinking tooltip)
+FIX: Error on emailreminder not reported
+FIX: Fatal error converting object of class User to string (php8)
+FIX: filter by entity on contact is missing
+FIX: Fix supplier invoice security check
+FIX: format of color in manifest is wrong when using a custom color
+FIX: #GHSA-7947-48q7-cp5m
+FIX: HTML injection vulnerability in Dolibarr Application Home Page
+FIX: invoice add line save devise
+FIX: Keep a link to enable a 'always_enabled' module to solve pb.
+FIX: label
+FIX: line special_code never saved (#28051)
+FIX: link to print when there is a search on multiselect fields
+FIX: Menu Create of project no working on smartphone with no top menu.
+FIX: missing $search_sale var (backport from v19)
+FIX: Missing begin transaction when updating supplier recurring invoice
+FIX: missing entity filter for check if period exists
+FIX: more correctly parse the select part to be replaced in sql queries
+FIX: MouvementStock::origin is not an object
+FIX: notification information on intervention validated confirmation message (v17+)
+FIX: not load all contacts by default when creating an event
+FIX: port in Docker MailDev
+FIX: propal use devise changes
+FIX: public user photo not visible if $dolibarr_main_instance_unique_id
+FIX: remove DISTINCT (backport from v19)
+FIX: remove specific name from v19
+FIX: Retours PR
+FIX: Return a better error message when token is not valid
+FIX: search by ref & rowid in don list
+FIX: search by thirdparty in don list
+FIX: several names for one const THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT
+FIX: SQL concatenation error
+FIX: [TAKEPOS] display prices with or without taxes depending on setup (TAKEPOS_CHANGE_PRICE_HT)
+FIX: Ternary operator condition is always true/false
+FIX: too long output
+FIX: Undefined property: Task::$fk_parent
+FIX: uniformization to use "intervention"
+FIX: Update loan.class.php (#27971)
+FIX: update price extrafield on propal card
+FIX: user filter in per user view of event list (#28049)
+FIX: use the currency for propal signature page
+
 ***** ChangeLog for 18.0.4 compared to 18.0.3 *****
 FIX: $this->newref already exists and could have been modified by trigger but we still use a local variable for the filesystem-based renaming
 FIX: 16.0 only, backport fix for SQL error on global search product

From 9ef57501a27c1d4607ac4691b760580d71819f67 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 11:22:43 +0100
Subject: [PATCH 0085/1862] Fix var_dump

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

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 91cc127f4d6..1a90e44154a 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -1283,7 +1283,7 @@ if (empty($action) || $action == 'view') {
 					print '</td>';
 					print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref;
 					// $def_tva is array[invoiceid][accountancy_code_sell_of_vat_rate_found][vatrate]=vatrate
-					//var_dump($arrayofvat[$key]); var_dump($key); var_dump($k);
+					//var_dump($arrayofvat[$key]); //var_dump($key); //var_dump($k);
 					$tmpvatrate = (empty($def_tva[$key][$k]) ? (empty($arrayofvat[$key][$k]) ? '' : $arrayofvat[$key][$k]) : implode(', ', $def_tva[$key][$k]));
 					print ' - '.$langs->trans("Taxes").' '.$tmpvatrate.' %';
 					print($numtax ? ' - Localtax '.$numtax : '');

From 5167fe2a62fb9f05b636e021296b86ba5b7dfe31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 11:32:21 +0100
Subject: [PATCH 0086/1862] Fix complete for #28349

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

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index d401d1ac29e..cf83e9228d7 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -537,6 +537,10 @@ class MyObject extends CommonObject
 				$record = new self($this->db);
 				$record->setVarsFromFetchObj($obj);
 
+				if (!empty($record->isextrafieldmanaged)) {
+					$record->fetch_optionals();
+				}
+
 				$records[$record->id] = $record;
 
 				$i++;

From 1fe93ab55ed5c336366605d62cb2c3decfd25823 Mon Sep 17 00:00:00 2001
From: Olivier ANDRADE SANCHEZ <oandrade@free.fr>
Date: Thu, 22 Feb 2024 11:32:30 +0100
Subject: [PATCH 0087/1862] [FIX] Add fetch_optionnals() to BOMLine for api
 calls (#28349)

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index eacbcec0f07..014a0a9940e 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1945,8 +1945,9 @@ class BOMLine extends CommonObjectLine
 			$num = $this->db->num_rows($resql);
 
 			while ($obj = $this->db->fetch_object($resql)) {
-				$record = new self($this->db);
+				$record = new self($this->db);                                
 				$record->setVarsFromFetchObj($obj);
+                                $record->fetch_optionals();
 
 				$records[$record->id] = $record;
 			}

From ba204f278711239d2eb29ee87750a204ba047024 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 11:33:05 +0100
Subject: [PATCH 0088/1862] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 014a0a9940e..c3415de8f7a 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1945,9 +1945,9 @@ class BOMLine extends CommonObjectLine
 			$num = $this->db->num_rows($resql);
 
 			while ($obj = $this->db->fetch_object($resql)) {
-				$record = new self($this->db);                                
+				$record = new self($this->db);
 				$record->setVarsFromFetchObj($obj);
-                                $record->fetch_optionals();
+								$record->fetch_optionals();
 
 				$records[$record->id] = $record;
 			}

From 9e1cb4c88a887ef6d70cd1805453854071b35a73 Mon Sep 17 00:00:00 2001
From: Eric <1468823+rycks@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:33:40 +0100
Subject: [PATCH 0089/1862] nom (deprecated) -> name (#28345)


From af062aa5f609c513c039f62bd7e12e8ed94f2e25 Mon Sep 17 00:00:00 2001
From: Eric <1468823+rycks@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:34:39 +0100
Subject: [PATCH 0090/1862] datenextrun is mandatory as dolibarr 16.0 (#28344)

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

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 627a13a7844..79782383330 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
- * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2023  Eric Seigne             <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
@@ -1445,6 +1445,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				$frequency = isset($this->cronjobs[$key]['frequency']) ? $this->cronjobs[$key]['frequency'] : '';
 				$unitfrequency = isset($this->cronjobs[$key]['unitfrequency']) ? $this->cronjobs[$key]['unitfrequency'] : '';
 				$priority = isset($this->cronjobs[$key]['priority']) ? $this->cronjobs[$key]['priority'] : '';
+				$datenextrun = isset($this->cronjobs[$key]['datenextrun']) ? $this->cronjobs[$key]['datenextrun'] : '';
 				$datestart = isset($this->cronjobs[$key]['datestart']) ? $this->cronjobs[$key]['datestart'] : '';
 				$dateend = isset($this->cronjobs[$key]['dateend']) ? $this->cronjobs[$key]['dateend'] : '';
 				$status = isset($this->cronjobs[$key]['status']) ? $this->cronjobs[$key]['status'] : '';
@@ -1480,7 +1481,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						$this->db->begin();
 
 						if (!$err) {
-							$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
+							$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datenextrun, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
 							if (is_int($frequency)) {
 								$sql .= ' frequency,';
 							}
@@ -1497,6 +1498,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 							$sql .= " VALUES (";
 							$sql .= "'".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."', ";
 							$sql .= "'".$this->db->idate($now)."', ";
+							$sql .= ($datenextrun ? "'".$this->db->idate($datenextrun)."'" : "'".$this->db->idate($now)."'").", ";
 							$sql .= ($datestart ? "'".$this->db->idate($datestart)."'" : "'".$this->db->idate($now)."'").", ";
 							$sql .= ($dateend ? "'".$this->db->idate($dateend)."'" : "NULL").", ";
 							$sql .= "'".$this->db->escape($label)."', ";

From 6bf8bd3920fa4c253a7ee8cd75eee49b417c1d52 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 11:47:00 +0100
Subject: [PATCH 0091/1862] Fix ->ventil property

---
 htdocs/compta/facture/class/facture.class.php      | 12 ++++++------
 htdocs/fourn/class/api_supplier_invoices.class.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index dd2f199d4d8..524c3be0c1e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3756,7 +3756,7 @@ class Facture extends CommonInvoice
 	 *  @param    	double		$remise_percent  	Percent of discount on line
 	 *  @param    	int|string	$date_start      	Date start of service
 	 *  @param    	int|string	$date_end        	Date end of service
-	 *  @param    	int			$ventil          	Code of dispatching into accountancy
+	 *  @param    	int			$fk_code_ventilation   	Code of dispatching into accountancy
 	 *  @param    	int			$info_bits			Bits of type of lines
 	 *  @param    	int			$fk_remise_except	Id discount used
 	 *  @param		string		$price_base_type	'HT' or 'TTC'
@@ -3790,7 +3790,7 @@ class Facture extends CommonInvoice
 		$remise_percent = 0,
 		$date_start = '',
 		$date_end = '',
-		$ventil = 0,
+		$fk_code_ventilation = 0,
 		$info_bits = 0,
 		$fk_remise_except = 0,
 		$price_base_type = 'HT',
@@ -3976,7 +3976,7 @@ class Facture extends CommonInvoice
 			$this->line->remise_percent = $remise_percent;
 			$this->line->date_start = $date_start;
 			$this->line->date_end = $date_end;
-			$this->line->ventil = $ventil;
+			$this->line->fk_code_ventilation = $fk_code_ventilation;
 			$this->line->rang = $ranktouse;
 			$this->line->info_bits = $info_bits;
 			$this->line->fk_remise_except = $fk_remise_except;
@@ -6179,7 +6179,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->total_localtax1		= $objp->total_localtax1;
 			$this->total_localtax2		= $objp->total_localtax2;
 			$this->total_ttc			= $objp->total_ttc;
-			$this->fk_code_ventilation = $objp->fk_code_ventilation;
+			$this->fk_code_ventilation  = $objp->fk_code_ventilation;
 			$this->rang					= $objp->rang;
 			$this->fk_fournprice = $objp->fk_fournprice;
 			$marginInfos				= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
@@ -6225,7 +6225,7 @@ class FactureLigne extends CommonInvoiceLine
 	 */
 	public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
 	{
-		global $langs, $user, $conf;
+		global $langs, $user;
 
 		$error = 0;
 
@@ -6332,7 +6332,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' (fk_facture, fk_parent_line, label, description, qty,';
 		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
 		$sql .= ' fk_product, product_type, remise_percent, subprice, ref_ext, fk_remise_except,';
-		$sql .= ' date_start, date_end, fk_code_ventilation, ';
+		$sql .= ' date_start, date_end, fk_code_ventilation,';
 		$sql .= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
 		$sql .= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
 		$sql .= ' situation_percent, fk_prev_id,';
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 38ade727330..c9c674d2c76 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -579,7 +579,7 @@ class SupplierInvoices extends DolibarrApi
 			$request_data->remise_percent,
 			$request_data->date_start,
 			$request_data->date_end,
-			$request_data->ventil,
+			$request_data->fk_code_ventilation,
 			$request_data->info_bits,
 			$request_data->price_base_type ? $request_data->price_base_type : 'HT',
 			$request_data->product_type,

From 95fe95056dc9ed7ecef4fc294ac7a3d2c1b66c25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 11:57:38 +0100
Subject: [PATCH 0092/1862] Clean deprecation

---
 .../class/fournisseur.facture-rec.class.php   | 17 +++++++++-----
 .../fourn/class/fournisseur.facture.class.php | 22 +++++++++++--------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 8f219648c51..4b216d5e323 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -380,7 +380,7 @@ class FactureFournisseurRec extends CommonInvoice
 						$facfourn_src->lines[$i]->fk_product,
 						$facfourn_src->lines[$i]->ref_supplier,
 						$facfourn_src->lines[$i]->label,
-						$facfourn_src->lines[$i]->description,
+						$facfourn_src->lines[$i]->desc ? $facfourn_src->lines[$i]->desc : $facfourn_src->lines[$i]->description,
 						$facfourn_src->lines[$i]->pu_ht,
 						$facfourn_src->lines[$i]->pu_ttc,
 						$facfourn_src->lines[$i]->qty,
@@ -718,7 +718,7 @@ class FactureFournisseurRec extends CommonInvoice
 		*/
 
 		$sql = 'SELECT l.rowid,';
-		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref, l.label, l.description,';
+		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref, l.label, l.description as desc,';
 		$sql .= ' l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except, l.vat_src_code, l.tva_tx,';
 		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type,';
 		$sql .= ' l.total_ht, l.total_tva, l.total_ttc, total_localtax1, total_localtax2,';
@@ -749,7 +749,8 @@ class FactureFournisseurRec extends CommonInvoice
 				$line->fk_product               = $objp->fk_product;
 				$line->ref_supplier             = $objp->ref;
 				$line->label                    = $objp->label;
-				$line->description              = $objp->description;
+				$line->description              = $objp->desc;
+				$line->desc                     = $objp->desc;
 				$line->pu_ht                    = $objp->pu_ht;
 				$line->pu_ttc                   = $objp->pu_ttc;
 				$line->qty                      = $objp->qty;
@@ -2003,6 +2004,9 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 	public $fk_product;
 	public $ref_supplier;
 	public $label;
+	/**
+	 * @deprecated	Use desc
+	 */
 	public $description;
 	public $pu_ht;
 	public $pu_ttc;
@@ -2088,7 +2092,7 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 	{
 		$sql = 'SELECT l.rowid,';
 		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product,';
-		$sql .= ' l.ref as ref_supplier, l.label, l.description, l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except,';
+		$sql .= ' l.ref as ref_supplier, l.label, l.description as desc, l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except,';
 		$sql .= ' l.vat_src_code, l.tva_tx, l.localtax1_tx, l.localtax1_type, l.localtax2_tx, l.localtax2_type,';
 		$sql .= ' l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc,';
 		$sql .= ' l.product_type, l.date_start, l.date_end,';
@@ -2112,7 +2116,8 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 			$this->fk_product               = $objp->fk_product;
 			$this->ref_supplier             = $objp->ref_supplier;
 			$this->label                    = $objp->label;
-			$this->description              = $objp->description;
+			$this->description              = $objp->desc;
+			$this->desc			            = $objp->desc;
 			$this->pu_ht                    = $objp->pu_ht;
 			$this->pu_ttc                   = $objp->pu_ttc;
 			$this->qty                      = $objp->qty;
@@ -2176,7 +2181,7 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 		$sql .= ', fk_product = ' . (int) $this->fk_product;
 		$sql .= ', ref = ' . (!empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'NULL');
 		$sql .= ", label = " . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : 'NULL');
-		$sql .= ", description = '" . $this->db->escape($this->description) . "'";
+		$sql .= ", description = '" . $this->db->escape($this->desc ? $this->desc : $this->description) . "'";
 		$sql .= ', pu_ht = ' . price2num($this->pu_ht);
 		$sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
 		$sql .= ', qty = ' . price2num($this->qty);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 811d5cb6b6c..9f1e9965aca 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -633,7 +633,7 @@ class FactureFournisseur extends CommonInvoice
 
 						$res = $this->updateline(
 							$idligne,
-							$this->lines[$i]->description,
+							$this->lines[$i]->desc ? $this->lines[$i]->desc : $this->lines[$i]->description,
 							$this->lines[$i]->subprice,
 							$this->lines[$i]->tva_tx.($this->lines[$i]->vat_src_code ? ' ('.$this->lines[$i]->vat_src_code.')' : ''),
 							$this->lines[$i]->localtax1_tx,
@@ -678,7 +678,7 @@ class FactureFournisseur extends CommonInvoice
 
 						$this->updateline(
 							$idligne,
-							$line->description,
+							$line->desc ? $line->desc : $line->description,
 							$line->pu_ht,
 							$line->tva_tx,
 							$line->localtax1_tx,
@@ -757,7 +757,7 @@ class FactureFournisseur extends CommonInvoice
 					}
 
 					$result_insert = $this->addline(
-						$_facrec->lines[$i]->description,
+						$_facrec->lines[$i]->desc ? $_facrec->lines[$i]->desc : $_facrec->lines[$i]->description,
 						$_facrec->lines[$i]->pu_ht,
 						$tva_tx,
 						$localtax1_tx,
@@ -1021,7 +1021,7 @@ class FactureFournisseur extends CommonInvoice
 		// phpcs:enable
 		$this->lines = array();
 
-		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
 		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn, f.fk_remise_except';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.barcode as product_barcode, p.description as product_desc';
@@ -1045,7 +1045,8 @@ class FactureFournisseur extends CommonInvoice
 
 					$line->id               = $obj->rowid;
 					$line->rowid            = $obj->rowid;
-					$line->description      = $obj->description;
+					$line->description      = $obj->desc;
+					$line->desc             = $obj->desc;
 					$line->date_start       = $obj->date_start;
 					$line->date_end         = $obj->date_end;
 					$line->product_ref      = $obj->product_ref;
@@ -2420,6 +2421,7 @@ class FactureFournisseur extends CommonInvoice
 		$line->context = $this->context;
 
 		$line->description = $desc;
+		$line->desc = $desc;
 
 		$line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
 		$line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
@@ -3207,7 +3209,7 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $user, $langs;
+		global $langs;
 
 		$langs->load("suppliers");
 		$outputlangs->load("products");
@@ -3470,6 +3472,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	/**
 	 * Description of the line
 	 * @var string
+	 * @deprecated		Use $desc
 	 */
 	public $description;
 
@@ -3634,7 +3637,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public function fetch($rowid)
 	{
-		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
 		$sql .= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2, f.fk_remise_except';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc';
@@ -3660,7 +3663,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->id = $obj->rowid;
 		$this->rowid = $obj->rowid;
 		$this->fk_facture_fourn = $obj->fk_facture_fourn;
-		$this->description		= $obj->description;
+		$this->description		= $obj->desc;
+		$this->desc				= $obj->desc;
 		$this->date_start = $obj->date_start;
 		$this->date_end = $obj->date_end;
 		$this->product_ref		= $obj->product_ref;
@@ -3816,7 +3820,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-		$sql .= " description = '".$this->db->escape($this->description)."'";
+		$sql .= " description = '".$this->db->escape(empty($this->description) ? $this->desc : $this->description)."'";
 		$sql .= ", ref = '".$this->db->escape($this->ref_supplier ? $this->ref_supplier : $this->ref)."'";
 		$sql .= ", date_start = ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : "null");
 		$sql .= ", date_end = ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : "null");

From 739efc80865ef43e876d1c9ce60c0f8c608e488c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 12:23:12 +0100
Subject: [PATCH 0093/1862] Clean code

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index b5f81a3737b..ff079efe387 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1171,8 +1171,6 @@ class Task extends CommonObjectLine
 					if ($loadextras) {
 						$tasks[$i]->fetch_optionals();
 					}
-
-					$tasks[$i]->obj = $obj; // Needed for tpl/extrafields_list_print
 				}
 
 				$i++;

From 23492676b007ae1f840abac83577f05c5f95512d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 12:30:35 +0100
Subject: [PATCH 0094/1862] Removed definitely modelpdf (replaced with
 model_pdf)

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

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 6fe7b1d3398..8e900c27462 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -176,7 +176,7 @@ class DolibarrApi
 		unset($object->timespent_fk_user);
 		unset($object->timespent_note);
 		unset($object->fk_delivery_address);
-		unset($object->modelpdf);
+		unset($object->model_pdf);
 		unset($object->sendtoid);
 		unset($object->name_bis);
 		unset($object->newref);
@@ -261,7 +261,6 @@ class DolibarrApi
 				unset($object->lines[$i]->thirdparty);
 				unset($object->lines[$i]->user);
 				unset($object->lines[$i]->model_pdf);
-				unset($object->lines[$i]->modelpdf);
 				unset($object->lines[$i]->note_public);
 				unset($object->lines[$i]->note_private);
 				unset($object->lines[$i]->fk_incoterms);

From 01e82a94b8600a090c7442ff820d85494115af1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 12:46:57 +0100
Subject: [PATCH 0095/1862] Fix phpstan

---
 htdocs/comm/propal/card.php                   |  2 +-
 htdocs/commande/card.php                      |  2 +-
 htdocs/compta/facture/card.php                |  4 ++--
 htdocs/compta/facture/class/facture.class.php |  4 ++--
 .../fourn/class/fournisseur.facture.class.php | 23 +++++++++++--------
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index bc289b36d38..02b2b91f36f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -853,7 +853,7 @@ if (empty($reshook)) {
 					$remise_percent = $originLine->remise_percent;
 					$date_start = $originLine->date_start;
 					$date_end = $originLine->date_end;
-					$ventil = 0;
+					$fk_code_ventilation = 0;
 					$info_bits = $originLine->info_bits;
 					$fk_remise_except = $originLine->fk_remise_except;
 					$price_base_type = 'HT';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e651b4e64f2..f11fb86068d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1541,7 +1541,7 @@ if (empty($reshook)) {
 					$remise_percent = $originLine->remise_percent;
 					$date_start = $originLine->date_start;
 					$date_end = $originLine->date_end;
-					$ventil = 0;
+					$fk_code_ventilation = 0;
 					$info_bits = $originLine->info_bits;
 					$fk_remise_except = $originLine->fk_remise_except;
 					$price_base_type = 'HT';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c11700f6aac..35ddb2c8eac 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2912,7 +2912,7 @@ if (empty($reshook)) {
 					$remise_percent = $originLine->remise_percent;
 					$date_start = $originLine->date_start;
 					$date_end = $originLine->date_end;
-					$ventil = 0;
+					$fk_code_ventilation = 0;
 					$info_bits = $originLine->info_bits;
 					$fk_remise_except = $originLine->fk_remise_except;
 					$price_base_type = 'HT';
@@ -2936,7 +2936,7 @@ if (empty($reshook)) {
 					$fk_unit = $originLine->fk_unit;
 					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit, $pu_ht_devise);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $fk_code_ventilation, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit, $pu_ht_devise);
 
 					if ($res > 0) {
 						$importCount++;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 524c3be0c1e..7e873aa6739 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3838,8 +3838,8 @@ class Facture extends CommonInvoice
 			if (empty($rang)) {
 				$rang = 0;
 			}
-			if (empty($ventil)) {
-				$ventil = 0;
+			if (empty($fk_code_ventilation)) {
+				$fk_code_ventilation = 0;
 			}
 			if (empty($txtva)) {
 				$txtva = 0;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 9f1e9965aca..03965b63211 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2046,9 +2046,9 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param    	double	$qty             	Quantity
 	 *	@param    	int		$fk_product      	Product/Service ID predefined
 	 *	@param    	double	$remise_percent  	Percentage discount of the line
-	 *	@param    	integer	$date_start      	Service start date
-	 * 	@param    	integer	$date_end        	Service expiry date
-	 * 	@param    	string	$ventil          	Accounting breakdown code
+	 *	@param    	int		$date_start      	Service start date
+	 * 	@param    	int		$date_end        	Service expiry date
+	 * 	@param    	int		$fk_code_ventilation   	Accounting breakdown code
 	 *	@param    	int		$info_bits			Line type bits
 	 *	@param    	string	$price_base_type 	HT or TTC
 	 *	@param		int		$type				Type of line (0=product, 1=service)
@@ -2064,11 +2064,11 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param    	int		$fk_remise_except	Id discount used
 	 *	@return    	int             			>0 if OK, <0 if KO
 	 */
-	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = 0, $array_options = [], $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $fk_code_ventilation = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = 0, $array_options = [], $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
 	{
 		global $langs, $mysoc, $conf;
 
-		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit,fk_remise_except=$fk_remise_except", LOG_DEBUG);
+		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$fk_code_ventilation,$info_bits,$price_base_type,$type,$fk_unit,fk_remise_except=$fk_remise_except", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		if ($this->statut == self::STATUS_DRAFT) {
@@ -2085,8 +2085,8 @@ class FactureFournisseur extends CommonInvoice
 			if (empty($rang)) {
 				$rang = 0;
 			}
-			if (empty($ventil)) {
-				$ventil = 0;
+			if (empty($fk_code_ventilation)) {
+				$fk_code_ventilation = 0;
 			}
 			if (empty($txtva)) {
 				$txtva = 0;
@@ -2244,7 +2244,7 @@ class FactureFournisseur extends CommonInvoice
 			$supplierinvoiceline->remise_percent = $remise_percent;
 			$supplierinvoiceline->date_start = $date_start;
 			$supplierinvoiceline->date_end = $date_end;
-			$supplierinvoiceline->fk_code_ventilation = $ventil;
+			$supplierinvoiceline->fk_code_ventilation = $fk_code_ventilation;
 			$supplierinvoiceline->rang = $rang;
 			$supplierinvoiceline->info_bits = $info_bits;
 			$supplierinvoiceline->fk_remise_except = $fk_remise_except;
@@ -3479,10 +3479,15 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $date_start;
 	public $date_end;
 
+	/**
+	 * @var int
+	 */
+	public $fk_code_ventilation;
+
 	public $skip_update_total; // Skip update price total for special lines
 
 	/**
-	 * @var int Situation advance percentage
+	 * @var int 	Situation progress percentage
 	 */
 	public $situation_percent;
 

From 8ba8b62180a61847089f9c673ef18c7219e4f5f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 13:11:32 +0100
Subject: [PATCH 0096/1862] Standardize field name

---
 htdocs/core/ajax/ziptown.php                  | 22 +++++++++----------
 htdocs/product/stock/class/entrepot.class.php |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 0ad94c69418..36c40dac2b1 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -70,9 +70,9 @@ if (GETPOST('zipcode') || GETPOST('town')) {
 	$town = GETPOST('town');
 
 	if (getDolGlobalString('MAIN_USE_ZIPTOWN_DICTIONNARY')) {   // Use zip-town table
-		$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
-		$sql .= ", c.rowid as fk_country, c.code as country_code, c.label as country";
-		$sql .= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
+		$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county as state_id, z.fk_pays as country_id";
+		$sql .= ", c.code as country_code, c.label as country_label";
+		$sql .= ", d.code_departement as state_code, d.nom as state_label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON z.fk_county = d.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
@@ -88,9 +88,9 @@ if (GETPOST('zipcode') || GETPOST('town')) {
 		$sql .= " ORDER BY z.zip, z.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
 	} else { // Use table of third parties
-		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
-		$sql .= ", c.code as country_code, c.label as country";
-		$sql .= ", d.code_departement as county_code , d.nom as county";
+		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as state_id, s.fk_pays as country_id";
+		$sql .= ", c.code as country_code, c.label as country_label";
+		$sql .= ", d.code_departement as state_code, d.nom as state_label";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'societe as s';
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON s.fk_departement = d.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
@@ -110,8 +110,8 @@ if (GETPOST('zipcode') || GETPOST('town')) {
 	//var_dump($db);
 	if ($resql) {
 		while ($row = $db->fetch_array($resql)) {
-			$country = $row['fk_country'] ? ($langs->transnoentitiesnoconv('Country'.$row['country_code']) != 'Country'.$row['country_code'] ? $langs->transnoentitiesnoconv('Country'.$row['country_code']) : $row['country']) : '';
-			$county = $row['fk_county'] ? ($langs->transnoentitiesnoconv($row['county_code']) != $row['county_code'] ? $langs->transnoentitiesnoconv($row['county_code']) : ($row['county'] != '-' ? $row['county'] : '')) : '';
+			$country = $row['country_id'] ? ($langs->transnoentitiesnoconv('Country'.$row['country_code']) != 'Country'.$row['country_code'] ? $langs->transnoentitiesnoconv('Country'.$row['country_code']) : $row['country_label']) : '';
+			$county = $row['state_id'] ? ($langs->transnoentitiesnoconv($row['state_code']) != $row['state_code'] ? $langs->transnoentitiesnoconv($row['state_code']) : ($row['state_label'] != '-' ? $row['state_label'] : '')) : '';
 
 			$row_array['label'] = $row['zip'].' '.$row['town'];
 			$row_array['label'] .= ($county || $country) ? ' (' : '';
@@ -127,11 +127,11 @@ if (GETPOST('zipcode') || GETPOST('town')) {
 				$row_array['value'] = $row['town'];
 				$row_array['zipcode'] = $row['zip'];
 			}
-			$row_array['selectcountry_id'] = $row['fk_country'];
-			$row_array['state_id'] = $row['fk_county'];
+			$row_array['selectcountry_id'] = $row['country_id'];
+			$row_array['state_id'] = $row['state_id'];
 
 			// TODO Use a cache here to avoid to make select_state in each pass (this make a SQL and lot of logs)
-			$row_array['states'] = $formcompany->select_state('', $row['fk_country'], '');
+			$row_array['states'] = $formcompany->select_state('', $row['country_id'], '');
 
 			array_push($return_arr, $row_array);
 		}
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 6f876f245a7..5e7bb9e8c6d 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -175,7 +175,6 @@ class Entrepot extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		global $conf;
 		$this->db = $db;
 
 		$this->labelStatus[self::STATUS_CLOSED] = 'Closed2';

From 757abcfaaeea4b78cab1850699b5974339a188aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 13:20:00 +0100
Subject: [PATCH 0097/1862] Fix warning

---
 htdocs/core/class/commonobject.class.php | 20 +++++++++++++-------
 htdocs/ticket/index.php                  |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 38a1ff9ad44..e593fb6f4d5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -207,7 +207,7 @@ abstract class CommonObject
 	public $actionmsg2;
 
 	/**
-	 * @var string		Contains canvas name if record is an alternative canvas record
+	 * @var string			Contains canvas name if record is an alternative canvas record
 	 */
 	public $canvas;
 
@@ -218,13 +218,13 @@ abstract class CommonObject
 	public $project;
 
 	/**
-	 * @var int 		The related project ID
+	 * @var int 			The related project ID
 	 * @see setProject(), project
 	 */
 	public $fk_project;
 
 	/**
-	 * @var Project 	The related project object
+	 * @var Project 		The related project object
 	 * @deprecated
 	 * @see project
 	 */
@@ -237,13 +237,13 @@ abstract class CommonObject
 	public $fk_projet;
 
 	/**
-	 * @var Contact 	A related contact object
+	 * @var Contact|null 	A related contact object
 	 * @see fetch_contact()
 	 */
 	public $contact;
 
 	/**
-	 * @var int 		The related contact ID
+	 * @var int 			The related contact ID
 	 * @see fetch_contact()
 	 */
 	public $contact_id;
@@ -255,13 +255,13 @@ abstract class CommonObject
 	public $thirdparty;
 
 	/**
-	 * @var User 		A related user
+	 * @var User 			A related user
 	 * @see fetch_user()
 	 */
 	public $user;
 
 	/**
-	 * @var string 		The type of originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type
+	 * @var string 			The type of originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type
 	 * @see fetch_origin()
 	 */
 	public $origin;
@@ -359,6 +359,12 @@ abstract class CommonObject
 	 */
 	public $state_id;
 
+	/**
+	 * var	int			State ID
+	 * @deprecated	Use state_id. We can remove this property when the field 'fk_departement' have been renamed into 'state_id' in all tables
+	 */
+	public $fk_departement;
+
 	/**
 	 * @var string		State code
 	 * @see getFullAddress(), $state
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 7f39992bdc5..7c0208936d7 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -207,7 +207,7 @@ if ($result) {
 		}
 	}
 
-	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';	// This define $badgeStatusX
 
 	$dataseries = array();
 	$colorseries = array();

From 009a4856b34ecfb87e43c6df4a904fe3baf3dbdb Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 22 Feb 2024 13:22:06 +0100
Subject: [PATCH 0098/1862] qual: phpstan - various fixes (#28351)

* qual: phpstan for htdocs/compta/tva/class/paymentvat.class.php

htdocs/compta/tva/class/paymentvat.class.php	540	Property CommonObject::$tms (int) does not accept string.

* qual: phpstan - various "$enabled (int) does not accept bool."

htdocs/core/boxes/box_actions.php	54	Property box_actions::$enabled (int) does not accept bool.

htdocs/core/boxes/box_actions_future.php	54	Property box_actions_future::$enabled (int) does not accept bool.

htdocs/core/boxes/box_activity.php	53	Property box_activity::$enabled (int) does not accept string.

* qual: phpstan for htdocs/core/boxes/box_activity.php

htdocs/core/boxes/box_activity.php	53	Property box_activity::$enabled (int) does not accept string.

* qual: phpstan for htdocs/core/modules/modTakePos.class.php

htdocs/core/modules/modTakePos.class.php	284	Property Societe::$code_client (string) does not accept int.

htdocs/core/modules/modTakePos.class.php	285	Property Societe::$code_fournisseur (string) does not accept int.
---
 htdocs/compta/tva/class/paymentvat.class.php | 2 +-
 htdocs/core/boxes/box_activity.php           | 2 +-
 htdocs/core/boxes/modules_boxes.php          | 2 +-
 htdocs/core/modules/modTakePos.class.php     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index a8f38ccb9d5..be9df9fe313 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -537,7 +537,7 @@ class PaymentVAT extends CommonObject
 		$this->id = 0;
 		$this->fk_tva = 0;
 		$this->datec = dol_now();
-		$this->tms = '';
+		$this->tms = dol_now();
 		$this->datep = '';
 		$this->amount = '';
 		$this->fk_typepaiement = 0;
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 52b8cb65504..b84e74dfe18 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -50,7 +50,7 @@ class box_activity extends ModeleBoxes
 		$this->db = $db;
 
 		// FIXME: Pb into some status
-		$this->enabled = (getDolGlobalString('MAIN_FEATURES_LEVEL')); // Not enabled by default due to bugs (see previous comments)
+		$this->enabled = getDolGlobalInt('MAIN_FEATURES_LEVEL'); // Not enabled by default due to bugs (see previous comments)
 
 		$this->hidden = !(
 			(isModEnabled('facture') && $user->hasRight('facture', 'read'))
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index e99f4660a30..1bfd9688e2c 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -64,7 +64,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 	public $max = 5;
 
 	/**
-	 * @var int Condition to have widget enabled
+	 * @var bool|int Condition to have widget enabled
 	 */
 	public $enabled = 1;
 
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index ed237feadf6..d61b3ba3628 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -281,8 +281,8 @@ class modTakePos extends DolibarrModules
 			if ($searchcompanyid == 0) {
 				$societe->name = $nametouse;
 				$societe->client = 1;
-				$societe->code_client = -1;
-				$societe->code_fournisseur = -1;
+				$societe->code_client = '-1';
+				$societe->code_fournisseur = '-1';
 				$societe->note_private = "Default customer automatically created by Point Of Sale module activation. Can be used as the default generic customer in the Point Of Sale setup. Can also be edited or removed if you don't need a generic customer.";
 
 				$searchcompanyid = $societe->create($user);

From 2b4bc3b4bce52cc5c6ae1c6ef5ea8350861793e3 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 22 Feb 2024 13:22:24 +0100
Subject: [PATCH 0099/1862] qual: phpstan for
 htdocs/resource/class/dolresource.class.php (#28352)

htdocs/resource/class/dolresource.class.php	723	Property Dolresource::$busy (int) does not accept string.

htdocs/resource/class/dolresource.class.php	726	Property Dolresource::$mandatory (int) does not accept string.
---
 htdocs/resource/class/dolresource.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 38a880f1d6c..687d484283c 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -720,10 +720,10 @@ class Dolresource extends CommonObject
 			$this->element_type = trim($this->element_type);
 		}
 		if (isset($this->busy)) {
-			$this->busy = trim($this->busy);
+			$this->busy = (int) $this->busy;
 		}
 		if (isset($this->mandatory)) {
-			$this->mandatory = trim($this->mandatory);
+			$this->mandatory = (int) $this->mandatory;
 		}
 
 		// Update request

From f1f516f54c198fdf6b32e2dd9af3a845d2e96641 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 22 Feb 2024 13:23:39 +0100
Subject: [PATCH 0100/1862] NEW: Global constant for deprecated module mapping
 (#28348)

* Qual: Add another deprecated module mapping

* NEW: Global constant for deprecated module mapping
---
 htdocs/core/lib/functions.lib.php | 34 +++++++++++++++++++++----------
 test/phpunit/CodingPhpTest.php    |  3 ++-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c8f8a31b1dc..d3f619d19b6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -206,6 +206,28 @@ function getDolUserInt($key, $default = 0, $tmpuser = null)
 	return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
+define(
+	'DEPRECATED_MODULE_MAPPING',
+	array(
+		'actioncomm' => 'agenda',
+		'adherent' => 'member',
+		'adherent_type' => 'member_type',
+		'banque' => 'bank',
+		'categorie' => 'category',
+		'commande' => 'order',
+		'contrat' => 'contract',
+		'entrepot' => 'stock',
+		'expedition' => 'delivery_note',
+		'facture' => 'invoice',
+		'fichinter' => 'intervention',
+		'product_fournisseur_price' => 'productsupplierprice',
+		'product_price' => 'productprice',
+		'projet'  => 'project',
+		'propale' => 'propal',
+		'socpeople' => 'contact',
+	)
+);
+
 /**
  * Is Dolibarr module enabled
  *
@@ -217,17 +239,7 @@ function isModEnabled($module)
 	global $conf;
 
 	// Fix old names (map to new names)
-	$arrayconv = array(
-		'adherent' =>	'member',
-		'banque' => 'bank',
-		'categorie' => 'category',
-		'commande' => 'order',
-		'contrat' => 'contract',
-		'expedition' => 'delivery_note',
-		'facture' => 'invoice',
-		'projet' => 'project',
-		'propale' => 'propal',
-	);
+	$arrayconv = DEPRECATED_MODULE_MAPPING;
 
 	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		// Special cases: both use the same module.
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 7290d9562d6..f39e2540ef3 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -633,6 +633,7 @@ class CodingPhpTest extends CommonClassTest
 		'commande' => 'order',
 		'contrat' => 'contract',
 		'entrepot' => 'stock',
+		'expedition' => 'delivery_note',
 		'facture' => 'invoice',
 		'fichinter' => 'intervention',
 		'product_fournisseur_price' => 'productsupplierprice',
@@ -647,6 +648,7 @@ class CodingPhpTest extends CommonClassTest
 		'member_type' => 1,
 		'bank' => 1,
 		'category' => 1,
+		'delivery_note' => 1,
 		'order' => 1,
 		'contract' => 1,
 		'stock' => 1,
@@ -680,7 +682,6 @@ class CodingPhpTest extends CommonClassTest
 		'ecotax' => 1,
 		'emailcollector' => 1,
 		'eventorganization' => 1,
-		'expedition' => 1,
 		'expensereport' => 1,
 		'export' => 1,
 		'externalsite' => 1,

From 38095cf8b8aa573d062d0a2fe1a2a702ca4cdd4f Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Thu, 22 Feb 2024 13:24:18 +0100
Subject: [PATCH 0101/1862] fix: enabled default wharehouse field on service if
 STOCK_SUPPORTS_SERVICES (#28354)

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 08d86258150..c4dc0d6dcbe 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1486,7 +1486,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
-		if ($type != 1 && isModEnabled('stock')) {
+		if (($type != 1 || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 			// Default warehouse
 			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
@@ -2053,7 +2053,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Stock
-			if ($object->isProduct() && isModEnabled('stock')) {
+			if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 				// Default warehouse
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
@@ -2557,7 +2557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Default warehouse
-			if ($object->isProduct() && isModEnabled('stock')) {
+			if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 				$warehouse = new Entrepot($db);
 				$warehouse->fetch($object->fk_default_warehouse);
 

From 999af4951ba9f791636d8c5887d211c4b09c5245 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 22 Feb 2024 13:27:04 +0100
Subject: [PATCH 0102/1862] qual: phpstan - various "$hidden (bool) does not
 accept string." (#28350)

* Update modWebsite.class.php

* Update DolibarrModules.class.php

* Update modCron.class.php

* Update modSocialNetworks.class.php

* qual: phpstan for htdocs/core/modules/modCollab.class.php

htdocs/core/modules/modCollab.class.php	68	Property DolibarrModules::$hidden (bool) does not accept string.
---
 htdocs/core/modules/DolibarrModules.class.php   | 2 +-
 htdocs/core/modules/modCollab.class.php         | 2 +-
 htdocs/core/modules/modCron.class.php           | 2 +-
 htdocs/core/modules/modSocialNetworks.class.php | 2 +-
 htdocs/core/modules/modWebsite.class.php        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 1b3b4b62d09..1604e31760e 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -397,7 +397,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $enabled_bydefault;
 
 	/**
-	 * @var bool Whether to hide the module.
+	 * @var bool|int Whether to hide the module.
 	 */
 	public $hidden = false;
 
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index d08a8438954..be1edcb8c62 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -65,7 +65,7 @@ class modCollab extends DolibarrModules
 
 		// Dependencies
 		//-------------
-		$this->hidden = getDolGlobalString('MODULE_COLLAB_DISABLED'); // A condition to disable module
+		$this->hidden = getDolGlobalInt('MODULE_COLLAB_DISABLED'); // A condition to disable module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 44d9962ef6c..29daa7d61bf 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -66,7 +66,7 @@ class modCron extends DolibarrModules
 
 		// Dependencies
 		//-------------
-		$this->hidden = getDolGlobalString('MODULE_CRON_DISABLED'); // A condition to disable module
+		$this->hidden = getDolGlobalInt('MODULE_CRON_DISABLED'); // A condition to disable module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index 4f007a0d9e3..a62b249f410 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -64,7 +64,7 @@ class modSocialNetworks extends DolibarrModules
 		$this->config_page_url = array(DOL_URL_ROOT.'/admin/dict.php?id=38');
 
 		// Dependencies
-		$this->hidden = getDolGlobalString('MODULE_SOCIALNETWORKS_DISABLED'); // A condition to hide module
+		$this->hidden = getDolGlobalInt('MODULE_SOCIALNETWORKS_DISABLED'); // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index f75acbf713b..d7afc7921b7 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -61,7 +61,7 @@ class modWebsite extends DolibarrModules
 		$this->config_page_url = array('website.php');
 
 		// Dependencies
-		$this->hidden = getDolGlobalString('MODULE_WEBSITE_DISABLED'); // A condition to disable module
+		$this->hidden = getDolGlobalInt('MODULE_WEBSITE_DISABLED'); // A condition to disable module
 		$this->depends = array('modFckeditor'); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with

From 637ffa837f4b22183d03c571e63a5b137d0fa115 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 13:28:18 +0100
Subject: [PATCH 0103/1862] Clean code

---
 .../modulebuilder/template/core/modules/modMyModule.class.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index d1b6a3244c5..11025ce3fff 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -136,7 +136,7 @@ class modMyModule extends DolibarrModules
 
 		// Dependencies
 		// A condition to hide module
-		$this->hidden = false;
+		$this->hidden = getDolGlobalInt('MODULE_MYMODULE_DISABLED'); // A condition to disable module;
 		// List of module class names that must be enabled if this module is enabled. Example: array('always'=>array('modModuleToEnable1','modModuleToEnable2'), 'FR'=>array('modModuleToEnableFR')...)
 		$this->depends = array();
 		// List of module class names to disable if this one is disabled. Example: array('modModuleToDisable1', ...)

From 838c748fae01f136da72b079dc29a4b25136394e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 17:30:54 +0100
Subject: [PATCH 0104/1862] Reduce variable parts into website template so risk
 of git conflict is lower

---
 htdocs/core/modules/DolibarrModules.class.php | 5 ++++-
 htdocs/website/class/website.class.php        | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 1604e31760e..5a708ecac02 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2264,7 +2264,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Adds generic parts
+	 * Save configuration for generic features.
+	 * This also generate website templates if the module provide some.
 	 *
 	 * @return int Error count (0 if OK)
 	 */
@@ -2295,6 +2296,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						$src = $srcroot.'/'.$cursorfile['name'];
 						$dest = DOL_DATA_ROOT.'/doctemplates/websites/'.$cursorfile['name'];
 
+						dol_delete_file($dest.'.zip');
+
 						// Compress it
 						global $errormsg;
 						$errormsg = '';
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 0aacecb7bb0..f7e5527f160 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1063,7 +1063,7 @@ class Website extends CommonObject
 			$allaliases = $objectpageold->pageurl;
 			$allaliases .= ($objectpageold->aliasalt ? ','.$objectpageold->aliasalt : '');
 
-			$line = '-- File generated by Dolibarr '.DOL_VERSION.' -- '.dol_print_date(dol_now('gmt'), 'standard', 'gmt').' UTC --;';
+			$line = '-- File generated by Dolibarr '.DOL_VERSION.' -- '.dol_print_date(dol_now('gmt'), 'standard', 'gmt').' UTC --;'."\n";
 			$line .= "\n";
 
 			if (!getDolGlobalInt('WEBSITE_EXPORT_KEEP_FILES_OF_PAGES')) {	// We don't need to keep the PHP files of pages and aliases (they are regenerated at import) so we remove them. You can ask to keep them in the export
@@ -1080,7 +1080,7 @@ class Website extends CommonObject
 			}
 
 			// This comment syntax is important, it is parsed by import to get information on page ID and all aliases to regenerate
-			$line .= '-- Page ID '.$oldpageid.' -> '.$objectpageold->newid.'__+MAX_llx_website_page__ - Aliases '.$allaliases.' --;'; // newid start at 1, 2...
+			$line .= '-- Page ID '.$objectpageold->newid.'__+MAX_llx_website_page__ - Aliases '.$allaliases.' --;'; // newid start at 1, 2...
 			$line .= "\n";
 			fwrite($fp, $line);
 
@@ -1151,6 +1151,8 @@ class Website extends CommonObject
 				$line .= "\n";
 				fwrite($fp, $line);
 			}
+
+			$line .= "\n";
 		}
 
 		$line = "\n-- For Dolibarr v14+ --;\n";

From 87a5ca77569f2a5b9f2ddb719c1a06ac324bc0e8 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 22 Feb 2024 19:14:31 +0100
Subject: [PATCH 0105/1862] qual: phpstan for $fk_unit (#28359)

* Update bom.class.php

* Update commonobjectline.class.php

* Update product.class.php

* phpcs

* phpcs

* phpcs

* phpcs

* phpcs

* phpcs
---
 htdocs/bom/class/bom.class.php               | 4 +++-
 htdocs/core/class/commonobjectline.class.php | 5 +++--
 htdocs/product/class/product.class.php       | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index c3415de8f7a..6935ac2594d 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1811,7 +1811,9 @@ class BOMLine extends CommonObjectLine
 	public $childBom = array();
 
 	/**
-	 * @var int Service unit
+	 * @var int|null                ID of the unit of measurement (rowid in llx_c_units table)
+	 * @see measuringUnitString()
+	 * @see getLabelOfUnit()
 	 */
 	public $fk_unit;
 
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 5efb3fadb2c..5536c93cf06 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -51,8 +51,9 @@ abstract class CommonObjectLine extends CommonObject
 	public $picto = 'line';
 
 	/**
-	 * Product/service unit code ('km', 'm', 'p', ...)
-	 * @var string
+	 * @var int|null                ID of the unit of measurement (rowid in llx_c_units table)
+	 * @see measuringUnitString()
+	 * @see getLabelOfUnit()
 	 */
 	public $fk_unit;
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e42e6161064..5b69e98fdd7 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -501,9 +501,9 @@ class Product extends CommonObject
 	public $ref_supplier;
 
 	/**
-	 * Unit code ('km', 'm', 'l', 'p', ...)
-	 *
-	 * @var string
+	 * @var int|null                ID of the unit of measurement (rowid in llx_c_units table)
+	 * @see measuringUnitString()
+	 * @see getLabelOfUnit()
 	 */
 	public $fk_unit;
 

From 8342b823c4c4d6c7fcfdc1bf798e758239aeaefd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 19:16:32 +0100
Subject: [PATCH 0106/1862] Fix $ventil warning

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7e873aa6739..63dd34574ac 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3820,7 +3820,7 @@ class Facture extends CommonInvoice
 
 		global $mysoc, $conf, $langs;
 
-		dol_syslog(get_class($this)."::addline id=$this->id, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, date_start=$date_start, date_end=$date_end, ventil=$ventil, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, desc=".dol_trunc($desc, 25), LOG_DEBUG);
+		dol_syslog(get_class($this)."::addline id=$this->id, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, date_start=$date_start, date_end=$date_end, fk_code_ventilation=$fk_code_ventilation, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, desc=".dol_trunc($desc, 25), LOG_DEBUG);
 
 		if ($this->status == self::STATUS_DRAFT) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

From 2a03df95b4ba756c5346c448f35f7fd0eea7f3a1 Mon Sep 17 00:00:00 2001
From: Can Arslan <138895927+mc2rcanarslan@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:17:38 -0700
Subject: [PATCH 0107/1862] FIX: duplicate with lines: 414-416 (#28358)

---
 htdocs/core/menus/init_menu_auguria.sql | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 5b3ee4be7ff..fee1bdc4b2c 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -415,11 +415,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("takepos") || isModEnabled("cashdesk"))', __HANDLER__, 'left', 6100__+MAX_llx_menu__, 'bank', 'cashcontrol', 14__+MAX_llx_menu__, '/compta/cashcontrol/cashcontrol_list.php?mainmenu=bank&amp;action=list', 'CashControl', 0, 'cashdesk', '$user->hasRight("cashdesk", "run")|| $user->hasRight("takepos", "run")', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("takepos") || isModEnabled("cashdesk") && $leftmenu=="cashcontrol")', __HANDLER__, 'left', 6101__+MAX_llx_menu__, 'bank', 'cashcontrol', 6100__+MAX_llx_menu__, '/compta/cashcontrol/cashcontrol_card.php?mainmenu=bank&amp;action=create', 'NewCashFence', 1, 'cashdesk', '$user->hasRight("cashdesk", "run")|| $user->hasRight("takepos", "run")', '', 2, 6, __ENTITY__);
 
--- Bank - Cash control POS
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("takepos") || isModEnabled("cashdesk"))', __HANDLER__, 'left', 6100__+MAX_llx_menu__, 'bank', 'cashcontrol', 14__+MAX_llx_menu__, '/compta/cashcontrol/cashcontrol_list.php?mainmenu=bank&amp;action=list', 'CashControl', 0, 'cashdesk', '$user->hasRight("cashdesk", "run")|| $user->hasRight("takepos", "run")', '', 2, 6, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(isModEnabled("takepos") || isModEnabled("cashdesk") && $leftmenu=="cashcontrol")', __HANDLER__, 'left', 6101__+MAX_llx_menu__, 'bank', 'cashcontrol', 6100__+MAX_llx_menu__, '/compta/cashcontrol/cashcontrol_card.php?mainmenu=bank&amp;action=create', 'NewCashFence', 1, 'cashdesk', '$user->hasRight("cashdesk", "run")|| $user->hasRight("takepos", "run")', '', 2, 6, __ENTITY__);
-
-
 -- Project
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("project")', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?mainmenu=project&amp;leftmenu=projects', 'LeadsOrProjects', 0, 'projects', '$user->hasRight("projet","lire")', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("project")', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?mainmenu=project&amp;leftmenu=projects&amp;action=create', 'New', 1, 'projects', '$user->hasRight("projet","creer")', '', 2, 1, __ENTITY__);

From bb178dc8abad61118584909c25948324cc7001b3 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 22 Feb 2024 19:18:00 +0100
Subject: [PATCH 0108/1862] qual: phpstan for htdocs/takepos/invoice.php
 (#28360)

htdocs/takepos/invoice.php	284	Property Paiement::$pos_change (float) does not accept string.
---
 htdocs/takepos/invoice.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index fd181ec80d9..5a0e1dce822 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -58,7 +58,7 @@ $hookmanager->initHooks(array('takeposinvoice'));
 $langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks", "banks"));
 
 $action = GETPOST('action', 'aZ09');
-$idproduct = GETPOST('idproduct', 'int');
+$idproduct = GETPOSTINT('idproduct');
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
 $mobilepage = GETPOST('mobilepage', 'alpha');
@@ -97,13 +97,13 @@ function fail($message)
 
 
 $number = GETPOST('number', 'alpha');
-$idline = GETPOST('idline', 'int');
-$selectedline = GETPOST('selectedline', 'int');
+$idline = GETPOSTINT('idline');
+$selectedline = GETPOSTINT('selectedline');
 $desc = GETPOST('desc', 'alphanohtml');
 $pay = GETPOST('pay', 'aZ09');
-$amountofpayment = price2num(GETPOST('amount', 'alpha'));
+$amountofpayment = GETPOSTFLOAT('amount');
 
-$invoiceid = GETPOST('invoiceid', 'int');
+$invoiceid = GETPOSTINT('invoiceid');
 
 $paycode = $pay;
 if ($pay == 'cash') {
@@ -281,7 +281,7 @@ if (empty($reshook)) {
 				$payment->fk_account = $bankaccount;
 				$payment->amounts[$invoice->id] = $amountofpayment;
 				if ($pay == 'LIQ') {
-					$payment->pos_change = price2num(GETPOST('excess', 'alpha'));
+					$payment->pos_change = GETPOSTFLOAT('excess');
 				}
 
 				// If user has not used change control, add total invoice payment
@@ -486,7 +486,7 @@ if (empty($reshook)) {
 		if ($action == 'creditnote') {
 			$placeid = $creditnote->id;
 		} else {
-			$placeid = (int) GETPOST('placeid', 'int');
+			$placeid = GETPOSTINT('placeid');
 		}
 		$invoice = new Facture($db);
 		$invoice->fetch($placeid);
@@ -1622,7 +1622,7 @@ if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 	if ($mobilepage == "products") {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$object = new Categorie($db);
-		$catid = GETPOST('catid', 'int');
+		$catid = GETPOSTINT('catid');
 		$result = $object->fetch($catid);
 		$prods = $object->getObjectsInCateg("product");
 		$htmlforlines = '';

From 132e98a4c7f0a50a2495fe65995cae682e25f5a3 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 22 Feb 2024 19:25:01 +0100
Subject: [PATCH 0109/1862] qual: phpstan for CommonObject->origin (#28361)

htdocs/commande/class/commande.class.php	538	Property CommonObject::$origin (string) does not accept $this(Commande).
htdocs/commande/class/commande.class.php	675	Property CommonObject::$origin (string) does not accept $this(Commande).
htdocs/compta/facture/class/facture.class.php	2859	Property CommonObject::$origin (string) does not accept $this(Facture).
htdocs/compta/facture/class/facture.class.php	3378	Property CommonObject::$origin (string) does not accept $this(Facture).
htdocs/compta/facture/class/facture.class.php	3696	Property CommonObject::$origin (string) does not accept $this(Facture).
htdocs/expedition/class/expedition.class.php	1245	Property CommonObject::$origin (string) does not accept null.
htdocs/expedition/class/expedition.class.php	1438	Property CommonObject::$origin (string) does not accept null.
htdocs/expedition/class/expedition.class.php	2326	Property CommonObject::$origin (string) does not accept $this(Expedition).
htdocs/expedition/class/expedition.class.php	2487	Property CommonObject::$origin (string) does not accept $this(Expedition).
htdocs/fourn/class/fournisseur.commande.class.php	1283	Property CommonObject::$origin (string) does not accept $this(CommandeFournisseur).
htdocs/fourn/class/fournisseur.commande.class.php	2278	Property CommonObject::$origin (string) does not accept $this(CommandeFournisseur).
htdocs/fourn/class/fournisseur.facture.class.php	1858	Property CommonObject::$origin (string) does not accept $this(FactureFournisseur).
htdocs/fourn/class/fournisseur.facture.class.php	1999	Property CommonObject::$origin (string) does not accept $this(FactureFournisseur).
htdocs/fourn/commande/dispatch.php	435	Property CommonObject::$origin (string) does not accept CommandeFournisseur.
htdocs/fourn/commande/dispatch.php	482	Property CommonObject::$origin (string) does not accept CommandeFournisseur.
htdocs/fourn/commande/dispatch.php	489	Property CommonObject::$origin (string) does not accept CommandeFournisseur.
htdocs/reception/class/reception.class.php	582	Property CommonObject::$origin (string) does not accept $this(Reception).
htdocs/reception/class/reception.class.php	1081	Property CommonObject::$origin (string) does not accept null.
htdocs/reception/class/reception.class.php	1674	Property CommonObject::$origin (string) does not accept $this(Reception).
htdocs/reception/class/reception.class.php	1833	Property CommonObject::$origin (string) does not accept $this(Reception).
htdocs/reception/class/reception.class.php	1967	Property CommonObject::$origin (string) does not accept $this(Reception).
htdocs/takepos/invoice.php	332	Property CommonObject::$origin (string) does not accept Facture.
htdocs/takepos/invoice.php	336	Property CommonObject::$origin (string) does not accept Facture.
---
 htdocs/core/class/commonobject.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e593fb6f4d5..d89c352b1a6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -261,7 +261,8 @@ abstract class CommonObject
 	public $user;
 
 	/**
-	 * @var string 			The type of originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type
+	 * @var string|CommonObject			The type of the originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type
+	 * 									Or for MouvementStock, the originating object itself.
 	 * @see fetch_origin()
 	 */
 	public $origin;

From 71dc610c25391468d1971463b9fb87569cd0829f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 19:26:47 +0100
Subject: [PATCH 0110/1862] Doc

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e593fb6f4d5..a4d92f2d8a0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -267,7 +267,13 @@ abstract class CommonObject
 	public $origin;
 
 	/**
-	 * @var int 		The id of originating object
+	 * @var string 		The type of originating object. Combined with $origin_id, it allows to reload $origin_object
+	 * @see fetch_origin()
+	 */
+	public $origin_type;
+
+	/**
+	 * @var int 		The id of originating object. Combined with $origin_type, it allows to reload $origin_object
 	 * @see fetch_origin()
 	 */
 	public $origin_id;

From 007b2bf75823746fd973ca7b053929f73cd199a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 19:29:31 +0100
Subject: [PATCH 0111/1862] Doygen

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d325224ec02..c56bd1cdf29 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -260,13 +260,6 @@ abstract class CommonObject
 	 */
 	public $user;
 
-	/**
-	 * @var string|CommonObject			The type of the originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type
-	 * 									Or for MouvementStock, the originating object itself.
-	 * @see fetch_origin()
-	 */
-	public $origin;
-
 	/**
 	 * @var string 		The type of originating object. Combined with $origin_id, it allows to reload $origin_object
 	 * @see fetch_origin()
@@ -284,6 +277,13 @@ abstract class CommonObject
 	 */
 	public $origin_object;
 
+	/**
+	 * @var string|CommonObject		Sometime the type of the originating object ('commande', 'facture', ...), sometime the object (like onh MouvementStock)
+	 * @deprecated					Use now $origin_type and $origin_id;
+	 * @see fetch_origin()
+	 */
+	public $origin;
+
 	// TODO Remove this. Has been replaced with ->origin_object.
 	// This is set by fetch_origin() from this->origin and this->origin_id
 	/** @deprecated */

From f35e55030ebd97476225657c5f5de769f9b1b273 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 19:49:43 +0100
Subject: [PATCH 0112/1862] Fix sql with field name "desc"

---
 htdocs/fourn/class/fournisseur.facture-rec.class.php |  6 +++---
 htdocs/fourn/class/fournisseur.facture.class.php     | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 4b216d5e323..faa0462978e 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -718,7 +718,7 @@ class FactureFournisseurRec extends CommonInvoice
 		*/
 
 		$sql = 'SELECT l.rowid,';
-		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref, l.label, l.description as desc,';
+		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref, l.label, l.description as line_desc,';
 		$sql .= ' l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except, l.vat_src_code, l.tva_tx,';
 		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type,';
 		$sql .= ' l.total_ht, l.total_tva, l.total_ttc, total_localtax1, total_localtax2,';
@@ -749,8 +749,8 @@ class FactureFournisseurRec extends CommonInvoice
 				$line->fk_product               = $objp->fk_product;
 				$line->ref_supplier             = $objp->ref;
 				$line->label                    = $objp->label;
-				$line->description              = $objp->desc;
-				$line->desc                     = $objp->desc;
+				$line->description              = $objp->line_desc;
+				$line->desc                     = $objp->line_desc;
 				$line->pu_ht                    = $objp->pu_ht;
 				$line->pu_ttc                   = $objp->pu_ttc;
 				$line->qty                      = $objp->qty;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 03965b63211..95e40dfd147 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1021,7 +1021,7 @@ class FactureFournisseur extends CommonInvoice
 		// phpcs:enable
 		$this->lines = array();
 
-		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as line_desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
 		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn, f.fk_remise_except';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.barcode as product_barcode, p.description as product_desc';
@@ -1045,8 +1045,8 @@ class FactureFournisseur extends CommonInvoice
 
 					$line->id               = $obj->rowid;
 					$line->rowid            = $obj->rowid;
-					$line->description      = $obj->desc;
-					$line->desc             = $obj->desc;
+					$line->description      = $obj->line_desc;
+					$line->desc             = $obj->line_desc;
 					$line->date_start       = $obj->date_start;
 					$line->date_end         = $obj->date_end;
 					$line->product_ref      = $obj->product_ref;
@@ -3642,7 +3642,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public function fetch($rowid)
 	{
-		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description as line_desc, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
 		$sql .= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2, f.fk_remise_except';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc';
@@ -3668,8 +3668,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->id = $obj->rowid;
 		$this->rowid = $obj->rowid;
 		$this->fk_facture_fourn = $obj->fk_facture_fourn;
-		$this->description		= $obj->desc;
-		$this->desc				= $obj->desc;
+		$this->description		= $obj->line_desc;
+		$this->desc				= $obj->line_desc;
 		$this->date_start = $obj->date_start;
 		$this->date_end = $obj->date_end;
 		$this->product_ref		= $obj->product_ref;

From ad662c468fbf73d0aadeaf8d8550665eb9e9b57f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 22 Feb 2024 19:52:24 +0100
Subject: [PATCH 0113/1862] Fix sql with field name "desc"

---
 htdocs/fourn/class/fournisseur.facture-rec.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index faa0462978e..ccb9f6749a4 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -2092,7 +2092,7 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 	{
 		$sql = 'SELECT l.rowid,';
 		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product,';
-		$sql .= ' l.ref as ref_supplier, l.label, l.description as desc, l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except,';
+		$sql .= ' l.ref as ref_supplier, l.label, l.description as line_desc, l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except,';
 		$sql .= ' l.vat_src_code, l.tva_tx, l.localtax1_tx, l.localtax1_type, l.localtax2_tx, l.localtax2_type,';
 		$sql .= ' l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc,';
 		$sql .= ' l.product_type, l.date_start, l.date_end,';
@@ -2116,8 +2116,8 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 			$this->fk_product               = $objp->fk_product;
 			$this->ref_supplier             = $objp->ref_supplier;
 			$this->label                    = $objp->label;
-			$this->description              = $objp->desc;
-			$this->desc			            = $objp->desc;
+			$this->description              = $objp->line_desc;
+			$this->desc			            = $objp->line_desc;
 			$this->pu_ht                    = $objp->pu_ht;
 			$this->pu_ttc                   = $objp->pu_ttc;
 			$this->qty                      = $objp->qty;

From 8aa3be1a8220252f29f09c94eb024fe4e9f0a39f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 13:28:17 +0100
Subject: [PATCH 0114/1862] Standardization

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

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index bbe78e764bc..449fcdfa7d7 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1997,7 +1997,13 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 
 	public $special_code = 0;
 
+	/**
+	 * @deprecated	Use user_creation_id
+	 */
 	public $fk_user_author;
+	/**
+	 * @deprecated	Use user_modification_id
+	 */
 	public $fk_user_modif;
 
 	public $fk_accounting_account;

From dd9af54a6ccbef36468d1bbdb9680e09dadc210c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 13:37:58 +0100
Subject: [PATCH 0115/1862] Deprecate var

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 63dd34574ac..425cf1fb7f1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -111,33 +111,35 @@ class Facture extends CommonInvoice
 
 	/**
 	 * @var int ID
-	 * @deprecated
-	 * @see $fk_user_author
+	 * @deprecated		Use $user_creation_id
 	 */
 	public $user_author;
 
 	/**
 	 * @var int ID
+	 * @deprecated		Use $user_creation_id
 	 */
 	public $fk_user_author;
 
 	/**
 	 * @var int ID
-	 * @deprecated
-	 * @see $fk_user_valid
+	 * @deprecated		Use $user_validation_id
 	 */
 	public $user_valid;
 
 	/**
 	 * @var int|null ID
+	 * @deprecated		Use $user_validation_id
 	 */
 	public $fk_user_valid;
 
 	/**
 	 * @var int ID
+	 * @deprecated		Use $user_modification_id
 	 */
 	public $fk_user_modif;
 
+
 	public $datem;
 
 	/**

From 70a061d0ce82c9c28d4d2a6759e817eb77289878 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 23 Feb 2024 13:38:28 +0100
Subject: [PATCH 0116/1862] Qual PHPStan Facture class (#28371)

* Fixed usage of deprecated $user_author

* Deleted unused properties

* Cleaned PHPDoc
---
 htdocs/compta/facture/card.php                |  4 ++--
 htdocs/compta/facture/class/facture.class.php | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 35ddb2c8eac..be692510ca6 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4169,8 +4169,8 @@ if ($action == 'create') {
 	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
 	$author = new User($db);
-	if ($object->user_author) {
-		$author->fetch($object->user_author);
+	if ($object->fk_user_author) {
+		$author->fetch($object->fk_user_author);
 	}
 
 	$objectidnext = $object->getIdReplacingInvoice();
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 63dd34574ac..af8054a28b3 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -107,15 +107,6 @@ class Facture extends CommonInvoice
 	 */
 	protected $table_ref_field = 'ref';
 
-	public $author;
-
-	/**
-	 * @var int ID
-	 * @deprecated
-	 * @see $fk_user_author
-	 */
-	public $user_author;
-
 	/**
 	 * @var int ID
 	 */
@@ -2525,7 +2516,6 @@ class Facture extends CommonInvoice
 		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
 		$sql .= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '') ? $this->db->escape($this->revenuestamp) : "null").",";
 		$sql .= " fk_statut=".(isset($this->status) ? $this->db->escape($this->status) : "null").",";
-		$sql .= " fk_user_author=".(isset($this->user_author) ? $this->db->escape($this->user_author) : "null").",";
 		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->db->escape($this->fk_user_valid) : "null").",";
 		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->db->escape($this->fk_facture_source) : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->db->escape($this->fk_project) : "null").",";
@@ -3773,7 +3763,7 @@ class Facture extends CommonInvoice
 	 *  @param		array		$array_options		extrafields array
 	 *  @param      int         $situation_percent  Situation advance percentage
 	 *  @param      int         $fk_prev_id         Previous situation line id reference
-	 *  @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 *  @param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @param		double		$pu_ht_devise		Unit price in foreign currency
 	 *  @param		string		$ref_ext		    External reference of the line
 	 *  @param		int			$noupdateafterinsertline	No update after insert of line
@@ -4068,7 +4058,7 @@ class Facture extends CommonInvoice
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
 	 *  @param		array		$array_options		extrafields array
 	 * 	@param      int         $situation_percent  Situation advance percentage
-	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @param		string		$ref_ext		    External reference of the line

From 2cd1a1a303c40c9d0fef5b3d1c4a6ff855974312 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 23 Feb 2024 13:39:17 +0100
Subject: [PATCH 0117/1862] Fix: Add parentheses to fix expression (#28365)

* Fix: Add parentheses to fix expression

# Fix: Add parentheses to fix expression

The priority of == is higher than bitwise & which is not what the
expression supposes.
(See https://www.php.net/manual/en/language.operators.precedence.php).

Detected as 'PhanPluginDuplicateExpressionBinaryOp: Both sides of the binary operator == are the same: 1' because of '1 == 1'

* Fix: Add parentheses to fix expression

# Fix: Add parentheses to fix expression

The priority of == is higher than bitwise & which is not what the
expression supposes.
(See https://www.php.net/manual/en/language.operators.precedence.php).

Detected as 'PhanPluginDuplicateExpressionBinaryOp: Both sides of the binary operator == are the same: 1' because of '1 == 1'

* Fix: Add parentheses to fix expression

# Fix: Add parentheses to fix expression

The priority of == is higher than bitwise & which is not what the
expression supposes.
(See https://www.php.net/manual/en/language.operators.precedence.php).

Detected as 'PhanPluginDuplicateExpressionBinaryOp: Both sides of the binary operator == are the same: 1' because of '1 == 1'
---
 .../accountancy/journal/purchasesjournal.php  |   5 +-
 htdocs/accountancy/journal/sellsjournal.php   |   7 +-
 htdocs/compta/facture/class/facture.class.php | 139 +++++++++---------
 3 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 796aae22225..d92f99e771b 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Eric Seigne             <eric.seigne@cap-rel.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -314,7 +315,7 @@ if ($result) {
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
-		$tva_npr = (($obj->info_bits & 1 == 1) ? 1 : 0);
+		$tva_npr = ((($obj->info_bits & 1) == 1) ? 1 : 0);
 		if ($tva_npr) { // If NPR, we add an entry for counterpartWe into tabother
 			$tabother[$obj->rowid][$compta_counterpart_tva_npr] += $obj->total_tva;
 		}
@@ -935,7 +936,7 @@ if (empty($action) || $action == 'view') {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
 
-	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
+	$listofchoices = array('notyet' => $langs->trans("NotYetInGeneralLedger"), 'already' => $langs->trans("AlreadyInGeneralLedger"));
 	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
 	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 1a90e44154a..3267f5ae397 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,7 +110,7 @@ if (empty($date_endmonth)) {
 	$pastmonth = $dates['pastmonth'];
 }
 if (getDolGlobalString('ACCOUNTANCY_JOURNAL_USE_CURRENT_MONTH')) {
-	$pastmonth+=1;
+	$pastmonth += 1;
 }
 
 if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
@@ -304,7 +305,7 @@ if ($result) {
 
 		$tabttc[$obj->rowid][$compta_soc] += $total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		$tva_npr = (($obj->info_bits & 1 == 1) ? 1 : 0);
+		$tva_npr = ((($obj->info_bits & 1) == 1) ? 1 : 0);
 		if (!$tva_npr) { // We ignore line if VAT is a NPR
 			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
 		}
@@ -992,7 +993,7 @@ if (empty($action) || $action == 'view') {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
 
-	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
+	$listofchoices = array('notyet' => $langs->trans("NotYetInGeneralLedger"), 'already' => $langs->trans("AlreadyInGeneralLedger"));
 	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
 	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index af8054a28b3..1385abbe14b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -20,6 +20,7 @@
  * Copyright (C) 2022       Sylvain Legrand         <contact@infras.fr>
  * Copyright (C) 2023      	Gauthier VERDOL       	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -294,69 +295,69 @@ class Facture extends CommonInvoice
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>1),
-		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>5),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20, 'index'=>1),
-		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>10),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>12),
-		'type' =>array('type'=>'smallint(6)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'subtype' =>array('type'=>'smallint(6)', 'label'=>'InvoiceSubtype', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 1),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 5),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 10),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 12),
+		'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
+		'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
 		//'increment' =>array('type'=>'varchar(10)', 'label'=>'Increment', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50),
-		'datef' =>array('type'=>'date', 'label'=>'DateInvoice', 'enabled'=>1, 'visible'=>1, 'position'=>20),
-		'date_valid' =>array('type'=>'date', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
-		'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateDue', 'enabled'=>1, 'visible'=>1, 'position'=>25),
-		'date_closing' =>array('type'=>'datetime', 'label'=>'Date closing', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'paye' =>array('type'=>'smallint(6)', 'label'=>'InvoicePaidCompletely', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 50),
+		'datef' => array('type' => 'date', 'label' => 'DateInvoice', 'enabled' => 1, 'visible' => 1, 'position' => 20),
+		'date_valid' => array('type' => 'date', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 22),
+		'date_lim_reglement' => array('type' => 'date', 'label' => 'DateDue', 'enabled' => 1, 'visible' => 1, 'position' => 25),
+		'date_closing' => array('type' => 'datetime', 'label' => 'Date closing', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'paye' => array('type' => 'smallint(6)', 'label' => 'InvoicePaidCompletely', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 80),
 		//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
 		//'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>91),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'close_code' =>array('type'=>'varchar(16)', 'label'=>'EarlyClosingReason', 'enabled'=>1, 'visible'=>-1, 'position'=>92),
-		'close_note' =>array('type'=>'varchar(128)', 'label'=>'EarlyClosingComment', 'enabled'=>1, 'visible'=>-1, 'position'=>93),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>1, 'position'=>95, 'isameasure'=>1),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>100, 'isameasure'=>1),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LT1', 'enabled'=>1, 'visible'=>-1, 'position'=>110, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LT2', 'enabled'=>1, 'visible'=>-1, 'position'=>120, 'isameasure'=>1),
-		'revenuestamp' =>array('type'=>'double(24,8)', 'label'=>'RevenueStamp', 'enabled'=>1, 'visible'=>-1, 'position'=>115, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'AmountTTC', 'enabled'=>1, 'visible'=>1, 'position'=>130, 'isameasure'=>1),
-		'fk_facture_source' =>array('type'=>'integer', 'label'=>'SourceInvoice', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'CurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>190),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>205),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>210),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>215),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-		'situation_cycle_ref' =>array('type'=>'smallint(6)', 'label'=>'Situation cycle ref', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION', 'visible'=>-1, 'position'=>230),
-		'situation_counter' =>array('type'=>'smallint(6)', 'label'=>'Situation counter', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION', 'visible'=>-1, 'position'=>235),
-		'situation_final' =>array('type'=>'smallint(6)', 'label'=>'Situation final', 'enabled'=>'empty($conf->global->INVOICE_USE_SITUATION) ? 0 : 1', 'visible'=>-1, 'position'=>240),
-		'retained_warranty' =>array('type'=>'double', 'label'=>'Retained warranty', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>245),
-		'retained_warranty_date_limit' =>array('type'=>'date', 'label'=>'Retained warranty date limit', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>250),
-		'retained_warranty_fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Retained warranty fk cond reglement', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>255),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>260),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>265),
-		'date_pointoftax' =>array('type'=>'date', 'label'=>'DatePointOfTax', 'enabled'=>'$conf->global->INVOICE_POINTOFTAX_DATE', 'visible'=>-1, 'position'=>270),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'MulticurrencyID', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>275),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Currency', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>280),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'CurrencyRate', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>285, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>290, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>291, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>292, 'isameasure'=>1),
-		'fk_fac_rec_source' =>array('type'=>'integer', 'label'=>'RecurringInvoiceSource', 'enabled'=>1, 'visible'=>-1, 'position'=>305),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>310),
-		'module_source' =>array('type'=>'varchar(32)', 'label'=>'POSModule', 'enabled'=>"(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'visible'=>-1, 'position'=>315),
-		'pos_source' =>array('type'=>'varchar(32)', 'label'=>'POSTerminal', 'enabled'=>"(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'visible'=>-1, 'position'=>320),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>506),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'notnull'=>-1, 'position'=>508),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>510),
-		'fk_user_closing' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Paid', 3=>'Abandonned')),
+		'close_code' => array('type' => 'varchar(16)', 'label' => 'EarlyClosingReason', 'enabled' => 1, 'visible' => -1, 'position' => 92),
+		'close_note' => array('type' => 'varchar(128)', 'label' => 'EarlyClosingComment', 'enabled' => 1, 'visible' => -1, 'position' => 93),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'AmountHT', 'enabled' => 1, 'visible' => 1, 'position' => 95, 'isameasure' => 1),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'AmountVAT', 'enabled' => 1, 'visible' => -1, 'position' => 100, 'isameasure' => 1),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'LT1', 'enabled' => 1, 'visible' => -1, 'position' => 110, 'isameasure' => 1),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'LT2', 'enabled' => 1, 'visible' => -1, 'position' => 120, 'isameasure' => 1),
+		'revenuestamp' => array('type' => 'double(24,8)', 'label' => 'RevenueStamp', 'enabled' => 1, 'visible' => -1, 'position' => 115, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'AmountTTC', 'enabled' => 1, 'visible' => 1, 'position' => 130, 'isameasure' => 1),
+		'fk_facture_source' => array('type' => 'integer', 'label' => 'SourceInvoice', 'enabled' => 1, 'visible' => -1, 'position' => 170),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => 1, 'visible' => -1, 'position' => 175),
+		'fk_account' => array('type' => 'integer', 'label' => 'Fk account', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'fk_currency' => array('type' => 'varchar(3)', 'label' => 'CurrencyCode', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'PaymentTerm', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 190),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 205),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 210),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 215),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 225),
+		'situation_cycle_ref' => array('type' => 'smallint(6)', 'label' => 'Situation cycle ref', 'enabled' => '$conf->global->INVOICE_USE_SITUATION', 'visible' => -1, 'position' => 230),
+		'situation_counter' => array('type' => 'smallint(6)', 'label' => 'Situation counter', 'enabled' => '$conf->global->INVOICE_USE_SITUATION', 'visible' => -1, 'position' => 235),
+		'situation_final' => array('type' => 'smallint(6)', 'label' => 'Situation final', 'enabled' => 'empty($conf->global->INVOICE_USE_SITUATION) ? 0 : 1', 'visible' => -1, 'position' => 240),
+		'retained_warranty' => array('type' => 'double', 'label' => 'Retained warranty', 'enabled' => '$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible' => -1, 'position' => 245),
+		'retained_warranty_date_limit' => array('type' => 'date', 'label' => 'Retained warranty date limit', 'enabled' => '$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible' => -1, 'position' => 250),
+		'retained_warranty_fk_cond_reglement' => array('type' => 'integer', 'label' => 'Retained warranty fk cond reglement', 'enabled' => '$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible' => -1, 'position' => 255),
+		'fk_incoterms' => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => '$conf->incoterm->enabled', 'visible' => -1, 'position' => 260),
+		'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'IncotermLabel', 'enabled' => '$conf->incoterm->enabled', 'visible' => -1, 'position' => 265),
+		'date_pointoftax' => array('type' => 'date', 'label' => 'DatePointOfTax', 'enabled' => '$conf->global->INVOICE_POINTOFTAX_DATE', 'visible' => -1, 'position' => 270),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'MulticurrencyID', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 275),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Currency', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 280),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'CurrencyRate', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 285, 'isameasure' => 1),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountHT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 290, 'isameasure' => 1),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountVAT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 291, 'isameasure' => 1),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountTTC', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 292, 'isameasure' => 1),
+		'fk_fac_rec_source' => array('type' => 'integer', 'label' => 'RecurringInvoiceSource', 'enabled' => 1, 'visible' => -1, 'position' => 305),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -1, 'position' => 310),
+		'module_source' => array('type' => 'varchar(32)', 'label' => 'POSModule', 'enabled' => "(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'visible' => -1, 'position' => 315),
+		'pos_source' => array('type' => 'varchar(32)', 'label' => 'POSTerminal', 'enabled' => "(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'visible' => -1, 'position' => 320),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 500),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModificationShort', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 502),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -1, 'position' => 506),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -1, 'notnull' => -1, 'position' => 508),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 510),
+		'fk_user_closing' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserClosing', 'enabled' => 1, 'visible' => -1, 'position' => 512),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 900),
+		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 1000, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', 2 => 'Paid', 3 => 'Abandonned')),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -819,7 +820,7 @@ class Facture extends CommonInvoice
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
 						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) {
-							$vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+							$vatrate .= ' ('.$newinvoiceline->vat_src_code.')';
 						}
 
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
@@ -1331,7 +1332,7 @@ class Facture extends CommonInvoice
 		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$objFrom);
+				$parameters = array('objFrom' => $objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -1464,7 +1465,7 @@ class Facture extends CommonInvoice
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('invoicedao'));
 
-			$parameters = array('objFrom'=>$object);
+			$parameters = array('objFrom' => $object);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
@@ -1599,7 +1600,7 @@ class Facture extends CommonInvoice
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('invoicedao'));
 
-			$parameters = array('objFrom'=>$object);
+			$parameters = array('objFrom' => $object);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
@@ -2092,7 +2093,7 @@ class Facture extends CommonInvoice
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('invoicedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result, 'notooltip' => $notooltip, 'addlinktonotes' => $addlinktonotes, 'save_lastsearch_value'=> $save_lastsearch_value, 'target' => $target);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result, 'notooltip' => $notooltip, 'addlinktonotes' => $addlinktonotes, 'save_lastsearch_value' => $save_lastsearch_value, 'target' => $target);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -2424,7 +2425,7 @@ class Facture extends CommonInvoice
 				if ($invoice->fetch($objp->rowid) > 0) {
 					if ($objp->situation_counter < $this->situation_counter
 						|| ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
-					   ) {
+					) {
 						$this->tab_previous_situation_invoice[] = $invoice;
 					} else {
 						$this->tab_next_situation_invoice[] = $invoice;
@@ -2618,7 +2619,7 @@ class Facture extends CommonInvoice
 				$facligne->rang = 1;
 				$linecount = count($this->lines);
 				for ($ii = 1; $ii <= $linecount; $ii++) {
-					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 				}
 			}
 
@@ -3260,7 +3261,7 @@ class Facture extends CommonInvoice
 		}
 
 		// Check for mandatory fields in $this
-		$array_to_check = array('REF_CLIENT'=>'RefCustomer');
+		$array_to_check = array('REF_CLIENT' => 'RefCustomer');
 		foreach ($array_to_check as $key => $val) {
 			$keymin = strtolower($key);
 			$vallabel = $this->$keymin;
@@ -4028,7 +4029,7 @@ class Facture extends CommonInvoice
 				return -2;
 			}
 		} else {
-			$this->errors[]='status of invoice must be Draft to allow use of ->addline()';
+			$this->errors[] = 'status of invoice must be Draft to allow use of ->addline()';
 			dol_syslog(get_class($this)."::addline status of invoice must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -4891,7 +4892,7 @@ class Facture extends CommonInvoice
 				if ($qualified) {
 					//$ref=$obj->ref;
 					$paymentornot = ($obj->fk_paiement ? 1 : 0);
-					$return[$obj->rowid] = array('ref'=>$obj->ref, 'status'=>$obj->fk_statut, 'type'=>$obj->type, 'paye'=>$obj->paye, 'paymentornot'=>$paymentornot);
+					$return[$obj->rowid] = array('ref' => $obj->ref, 'status' => $obj->fk_statut, 'type' => $obj->type, 'paye' => $obj->paye, 'paymentornot' => $paymentornot);
 				}
 			}
 
@@ -6162,7 +6163,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->date_start			= $this->db->jdate($objp->date_start);
 			$this->date_end				= $this->db->jdate($objp->date_end);
 			$this->info_bits			= $objp->info_bits;
-			$this->tva_npr = ($objp->info_bits & 1 == 1) ? 1 : 0;
+			$this->tva_npr = (($objp->info_bits & 1) == 1) ? 1 : 0;
 			$this->special_code = $objp->special_code;
 			$this->total_ht				= $objp->total_ht;
 			$this->total_tva			= $objp->total_tva;

From 77ae6888ffde4b72ffec235bf493450eef6ab48e Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Fri, 23 Feb 2024 13:39:49 +0100
Subject: [PATCH 0118/1862] qual: phpstan for $user_valid (#28362)

* Update commande.class.php

htdocs/commande/class/commande.class.php	248	PHPDoc type int of property Commande::$user_valid is not covariant with PHPDoc type User of overridden property CommonObject::$user_valid.

* Update facture.class.php

htdocs/compta/facture/class/facture.class.php	129	PHPDoc type int of property Facture::$user_valid is not covariant with PHPDoc type User of overridden property CommonObject::$user_valid.
---
 htdocs/commande/class/commande.class.php      | 5 -----
 htdocs/compta/facture/class/facture.class.php | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 75d9e0b3e75..187ed7b9452 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -242,11 +242,6 @@ class Commande extends CommonOrder
 	 */
 	public $user_author_id;
 
-	/**
-	 * @var int User validator ID
-	 */
-	public $user_valid;
-
 	/**
 	 * @var OrderLine one line of an order
 	 */
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1385abbe14b..4b9fcdbc08a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -113,13 +113,6 @@ class Facture extends CommonInvoice
 	 */
 	public $fk_user_author;
 
-	/**
-	 * @var int ID
-	 * @deprecated
-	 * @see $fk_user_valid
-	 */
-	public $user_valid;
-
 	/**
 	 * @var int|null ID
 	 */

From db2fc174cd4e9f9fc2f15a47cd783d1ea48ece0c Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Fri, 23 Feb 2024 13:40:22 +0100
Subject: [PATCH 0119/1862] qual: phpstan for
 htdocs/compta/paiement/class/paiement.class.php (#28364)

htdocs/compta/paiement/class/paiement.class.php	115	PHPDoc type array<int, float> of property Paiement::$multicurrency_tx is not covariant with PHPDoc type float of overridden property CommonObject::$multicurrency_tx.

htdocs/compta/paiement/class/paiement.class.php	120	PHPDoc type array<int, string> of property Paiement::$multicurrency_code is not covariant with PHPDoc type string of overridden property CommonObject::$multicurrency_code.
---
 htdocs/core/class/commonobject.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c56bd1cdf29..6ebd5112ec4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -477,12 +477,14 @@ abstract class CommonObject
 	public $fk_multicurrency;
 
 	/**
-	 * @var string		Multicurrency code
+	 * @var string|array<int,string>    Multicurrency code
+	 *                                  Or, just for the Paiement object, an array: invoice ID => currency code for that invoice.
 	 */
 	public $multicurrency_code;
 
 	/**
-	 * @var float		Multicurrency rate
+	 * @var float|array<int,float>      Multicurrency rate ("tx" = "taux" in French)
+	 *                                  Or, just for the Paiement object, an array: invoice ID => currency rate for that invoice.
 	 */
 	public $multicurrency_tx;
 

From be571fd3721c4374767523e7442f29c408442a26 Mon Sep 17 00:00:00 2001
From: AWeerWolf <74211972+AWeerWolf@users.noreply.github.com>
Date: Fri, 23 Feb 2024 13:40:30 +0100
Subject: [PATCH 0120/1862] #28334 (#28336)

Update lib_head.js.php concerning Date Format
Replace 1900 by 2000
---
 htdocs/core/js/lib_head.js.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index a2f98a6ba4b..f3209aebf2f 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -274,7 +274,7 @@ function formatDate(date,format)
 
 	var result="";
 
-	var year=date.getYear()+""; if (year.length < 4) { year=""+(year-0+1900); }
+	var year=date.getYear()+""; if (year.length < 4) { year=""+(year-0+2000); } /* #28334 */
 	var month=date.getMonth()+1;
 	var day=date.getDate();
 	var hour=date.getHours();
@@ -344,7 +344,7 @@ function getDateFromFormat(val,format)
 	if (val == '') return 0;
 
 	var now=new Date();
-	var year=now.getYear(); if (year.length < 4) { year=""+(year-0+1900); }
+	var year=now.getYear(); if (year.length < 4) { year=""+(year-0+2000); } /*  #28334 */
 	var month=now.getMonth()+1;
 	var day=now.getDate();
 	var hour=now.getHours();
@@ -369,7 +369,7 @@ function getDateFromFormat(val,format)
 
 		// alert('substr='+substr);
 		if (substr == "yyyy") year=getIntegerInString(val,d,4,4);
-		if (substr == "yy")   year=""+(getIntegerInString(val,d,2,2)-0+1900);
+		if (substr == "yy")   year=""+(getIntegerInString(val,d,2,2)-0+2000); /*  #28334 */
 		if (substr == "MM" ||substr == "M")
 		{
 			month=getIntegerInString(val,d,1,2);

From 2acfea2f0c7936ce66acc72322e9dbe98c90bc45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 15:24:47 +0100
Subject: [PATCH 0121/1862] Fix corrupted data

---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 9510ca261a5..db959613bbb 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -569,3 +569,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 ('HRM_EVALUATION_DELETE', 'HR Evaluation deleted', 'Executed when an evaluation is dleted', 'hrm', 4005);
 
 UPDATE llx_menu SET url = '/fourn/paiement/list.php?mainmenu=billing&leftmenu=suppliers_bills_payment' WHERE leftmenu = 'suppliers_bills_payment';
+
+UPDATE llx_paiement SET ref = rowid WHERE ref IS NULL OR ref = '';
+

From 7b1dc74b9e4b2068bdadb19b52e5b31ee07063e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 15:25:22 +0100
Subject: [PATCH 0122/1862] Fix corrupted data

---
 htdocs/install/mysql/migration/18.0.0-19.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index c0c984332b2..c355ca25b79 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -40,6 +40,8 @@ ALTER TABLE llx_product_perentity ADD COLUMN pmp double(24,8);
 
 ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer after fk_user_creat;
 
+UPDATE llx_paiement SET ref = rowid WHERE ref IS NULL OR ref = '';
+
 
 -- v19
 

From 1dbfd164bb4f08a8bb7c46e4c0518b554ce055bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 15:27:00 +0100
Subject: [PATCH 0123/1862] Fix corrupted data

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index d3bdc300ad4..9f5d1f13aa0 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -32,6 +32,11 @@
 -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
 
+-- V18 forgotten
+
+UPDATE llx_paiement SET ref = rowid WHERE ref IS NULL OR ref = '';
+
+
 -- V19 forgotten
 
 ALTER TABLE llx_resource ADD COLUMN phone varchar(255) DEFAULT NULL AFTER max_users;

From d84a886e8791edb342003279d9304cb8a9a5bdbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 16:05:45 +0100
Subject: [PATCH 0124/1862] FIX #28369

---
 htdocs/compta/bank/class/account.class.php |   6 +-
 htdocs/compta/paiement/list.php            |  38 ++++++--
 htdocs/fourn/paiement/list.php             | 100 ++++++++++++++-------
 htdocs/langs/en_US/bills.lang              |   1 +
 4 files changed, 104 insertions(+), 41 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index ca542017360..d83898fc304 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -2570,12 +2570,15 @@ class AccountLine extends CommonObjectLine
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0)
 	{
-		global $langs;
+		global $conf, $langs;
 
 		$result = '';
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("BankTransactionLine").'</u>:<br>';
 		$label .= '<b>'.$langs->trans("Ref").':</b> '.$this->ref;
+		if ($this->amount) {
+			$label .= '<br><strong>'.$langs->trans("Amount").':</strong> '.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency);
+		}
 
 		$linkstart = '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.((int) $this->id).'&save_lastsearch_values=1" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
@@ -2587,6 +2590,7 @@ class AccountLine extends CommonObjectLine
 		if ($withpicto != 2) {
 			$result .= ($this->ref ? $this->ref : $this->id);
 		}
+
 		$result .= $linkend;
 
 		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') {
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 7ac0669a28a..85c57d35385 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -183,6 +183,8 @@ if (GETPOST("orphelins", "alpha")) {
 	$sql = "SELECT p.rowid, p.ref, p.datep, p.amount, p.statut, p.num_paiement";
 	$sql .= ", c.code as paiement_code";
 
+	$sqlfields = $sql; // $sql fields to remove for count total
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
@@ -197,10 +199,13 @@ if (GETPOST("orphelins", "alpha")) {
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 } else {
-	$sql = "SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
+	$sql = "SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement, p.amount";
 	$sql .= ", c.code as paiement_code";
 	$sql .= ", ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal";
 	$sql .= ", s.rowid as socid, s.nom as name, s.email";
+	// We need an aggregate because we added a left join to get the thirdparty. In real world, it should be the same thirdparty if payment is same (but not in database structure)
+	// so SUM(pf.amount) should be equal to p.amount but if we filter on $socid, it may differ
+	$sql .= ", SUM(pf.amount) as totalamount, COUNT(f.rowid) as nbinvoices";
 
 	// Add fields from hooks
 	$parameters = array();
@@ -213,18 +218,21 @@ if (GETPOST("orphelins", "alpha")) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+
 	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
 	if ($socid > 0) {
-		$sql .= " AND f.fk_soc = ".((int) $socid);
+		$sql .= " AND EXISTS (SELECT f.fk_soc FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement_facture as pf";
+		$sql .= " WHERE p.rowid = pf.fk_paiement AND pf.fk_facture = f.rowid AND f.fk_soc = ".((int) $socid).")";
 	}
 	if ($userid) {
 		if ($userid == -1) {
-			$sql .= " AND f.fk_user_author IS NULL";
+			$sql .= " AND p.fk_user_creat IS NULL";
 		} else {
-			$sql .= " AND f.fk_user_author = ".((int) $userid);
+			$sql .= " AND p.fk_user_creat = ".((int) $userid);
 		}
 	}
 
@@ -248,7 +256,10 @@ if (GETPOST("orphelins", "alpha")) {
 		$sql .= natural_search('p.num_paiement', $search_payment_num);
 	}
 	if ($search_amount) {
-		$sql .= natural_search('p.amount', $search_amount, 1);
+		$sql .= " AND (".natural_search('p.amount', $search_amount, 1, 1);
+		$sql .= " OR ";
+		$sql .= natural_search('pf.amount', $search_amount, 1, 1);
+		$sql .= ")";
 	}
 	if ($search_company) {
 		$sql .= natural_search('s.nom', $search_company);
@@ -270,13 +281,18 @@ if (GETPOST("orphelins", "alpha")) {
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
+
+	$sql .= " GROUP BY p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement, p.amount";
+	$sql .= ", c.code";
+	$sql .= ", ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.fk_accountancy_journal";
+	$sql .= ", s.rowid, s.nom, s.email";
 }
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
-	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(DISTINCT p.rowid) as nbtotalofrecords', $sql);
 	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
 	$resql = $db->query($sqlforcount);
 	if ($resql) {
@@ -298,6 +314,7 @@ $sql .= $db->order($sortfield, $sortorder);
 if ($limit) {
 	$sql .= $db->plimit($limit + 1, $offset);
 }
+//print $sql;
 
 $resql = $db->query($sql);
 if (!$resql) {
@@ -532,6 +549,8 @@ while ($i < min($num, $limit)) {
 
 	$object->id = $objp->rowid;
 	$object->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+	$object->date = $db->jdate($objp->datep);
+	$object->amount = $objp->amount;
 
 	$companystatic->id = $objp->socid;
 	$companystatic->name = $objp->name;
@@ -629,7 +648,12 @@ while ($i < min($num, $limit)) {
 
 	// Amount
 	if (!empty($arrayfields['p.amount']['checked'])) {
-		print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
+		print '<td class="right">';
+		if ($objp->nbinvoices > 1 || ($objp->totalamount && $objp->amount != $objp->totalamount)) {
+			print $form->textwithpicto('', $langs->trans("PaymentMadeForSeveralInvoices"));
+		}
+		print '<span class="amount">'.price($objp->amount).'</span>';
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 05528f2d8a1..308ac2125e6 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -68,6 +68,7 @@ $search_payment_type	= GETPOST('search_payment_type');
 $search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+$search_sale = GETPOST('search_sale', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -113,6 +114,10 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 $hookmanager->initHooks(array('paymentsupplierlist'));
 $object = new PaiementFourn($db);
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 // Security check
 if ($user->socid) {
 	$socid = $user->socid;
@@ -176,33 +181,32 @@ $accountstatic = new Account($db);
 $companystatic = new Societe($db);
 $paymentfournstatic = new PaiementFourn($db);
 
-$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
-$sql .= ', s.rowid as socid, s.nom as name, s.email';
+$sql = 'SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement, p.amount';
 $sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
 $sql .= ', ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal';
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ', sc.fk_soc, sc.fk_user';
-}
-$sql .= ', SUM(pf.amount)';
+$sql .= ', s.rowid as socid, s.nom as name, s.email';
+// We need an aggregate because we added a left join to get the thirdparty. In real world, it should be the same thirdparty if payment is same (but not in database structure)
+// so SUM(pf.amount) should be equal to p.amount but if we filter on $socid, it may differ
+$sql .= ", SUM(pf.amount) as totalamount, COUNT(f.rowid) as nbinvoices";
+
+$sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
+
+$sql .= ' WHERE f.entity IN ('.getEntity('supplier_invoice').')';		// TODO We should use p.entity that does not exists yet in this table
+if ($socid > 0) {
+	$sql .= " AND EXISTS (SELECT f.fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
+	$sql .= " WHERE p.rowid = pf.fk_paiementfourn AND pf.fk_facturefourn = f.rowid AND f.fk_soc = ".((int) $socid).")";
 }
 
-$sql .= ' WHERE f.entity = '.$conf->entity;
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.((int) $user->id);
-}
-if ($socid > 0) {
-	$sql .= ' AND f.fk_soc = '.((int) $socid);
-}
+// Search criteria
 if ($search_ref) {
 	$sql .= natural_search('p.ref', $search_ref);
 }
@@ -217,13 +221,16 @@ if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
 if ($search_payment_type != '') {
-	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
+	$sql .= " AND c.code = '".$db->escape($search_payment_type)."'";
 }
 if ($search_cheque_num != '') {
 	$sql .= natural_search('p.num_paiement', $search_cheque_num);
 }
 if ($search_amount) {
-	$sql .= natural_search('p.amount', $search_amount, 1);
+	$sql .= " AND (".natural_search('p.amount', $search_amount, 1, 1);
+	$sql .= " OR ";
+	$sql .= natural_search('pf.amount', $search_amount, 1, 1);
+	$sql .= ")";
 }
 if ($search_bank_account > 0) {
 	$sql .= ' AND b.fk_account = '.((int) $search_bank_account);
@@ -231,29 +238,48 @@ if ($search_bank_account > 0) {
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
-$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle,';
+$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.fk_bank, p.statut, p.num_paiement, p.amount, s.rowid, s.nom, s.email, c.code, c.libelle,';
 $sql .= ' ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal';
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ', sc.fk_soc, sc.fk_user';
-}
-
-$sql .= $db->order($sortfield, $sortorder);
 
+// Count total nb of records
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {		// if total resultset is smaller then paging size (filtering), goto and load page 0
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(DISTINCT p.rowid) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
+// 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) {
@@ -476,6 +502,7 @@ while ($i < min($num, $limit)) {
 	$paymentfournstatic->id = $objp->rowid;
 	$paymentfournstatic->ref = $objp->ref;
 	$paymentfournstatic->datepaye = $db->jdate($objp->datep);
+	$paymentfournstatic->amount = $objp->amount;
 
 	$companystatic->id = $objp->socid;
 	$companystatic->name = $objp->name;
@@ -493,7 +520,9 @@ while ($i < min($num, $limit)) {
 
 	// Ref
 	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="nowraponall">'.$paymentfournstatic->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">';
+		print $paymentfournstatic->getNomUrl(1);
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -566,12 +595,17 @@ while ($i < min($num, $limit)) {
 
 	// Amount
 	if (!empty($arrayfields['p.amount']['checked'])) {
-		print '<td class="right"><span class="amount">'.price($objp->pamount).'</span></td>';
+		print '<td class="right">';
+		if ($objp->nbinvoices > 1 || ($objp->totalamount && $objp->amount != $objp->totalamount)) {
+			print $form->textwithpicto('', $langs->trans("PaymentMadeForSeveralInvoices"));
+		}
+		print '<span class="amount">'.price($objp->amount).'</span>';
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 		$totalarray['pos'][$checkedCount] = 'amount';
-		$totalarray['val']['amount'] += $objp->pamount;
+		$totalarray['val']['amount'] += $objp->amount;
 	}
 
 	// Buttons
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 0569c9b4b01..f5172f26ac0 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -641,3 +641,4 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+PaymentMadeForSeveralInvoices=Payment made for several invoices
\ No newline at end of file

From 36d364fb2dc04d58ca8aea9f214d16d08ef47bc6 Mon Sep 17 00:00:00 2001
From: Alban Durrheimer <alban@knot.city>
Date: Fri, 23 Feb 2024 16:50:21 +0100
Subject: [PATCH 0125/1862] Add sendEmailsRemindersOnSupplierInvoiceDueDate
 cron function (#28378)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/lib/functions.lib.php             |   3 +
 htdocs/core/modules/modFournisseur.class.php  |  16 +
 .../fourn/class/fournisseur.facture.class.php | 307 ++++++++++++++++++
 .../mysql/data/llx_c_email_templates.sql      |   9 +-
 .../install/mysql/migration/19.0.0-20.0.0.sql |   3 +
 htdocs/langs/en_US/bills.lang                 |   3 +
 htdocs/langs/fr_FR/bills.lang                 |   4 +
 7 files changed, 342 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d3f619d19b6..bc8d2e7a2e9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8753,6 +8753,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				if (is_object($object) && $object->element == 'supplier_proposal') {
 					$substitutionarray['__URL_SUPPLIER_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/supplier_proposal/card.php?id=".$object->id;
 				}
+				if (is_object($object) && $object->element == 'invoice_supplier') {
+					$substitutionarray['__URL_SUPPLIER_INVOICE__'] = DOL_MAIN_URL_ROOT."/fourn/facture/card.php?id=".$object->id;
+				}
 				if (is_object($object) && $object->element == 'shipping') {
 					$substitutionarray['__URL_SHIPMENT__'] = DOL_MAIN_URL_ROOT."/expedition/card.php?id=".$object->id;
 				}
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index eae67d17ad4..e850567eb6f 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -155,6 +155,22 @@ class modFournisseur extends DolibarrModules
 				'unitfrequency'=>3600 * 24,
 				'priority'=>51,
 				'status'=>1,
+				'test'=>'isModEnabled("supplier_invoice")',
+				'datestart'=>$datestart
+			),
+			1 => array(
+				'label' => 'SendEmailsRemindersOnSupplierInvoiceDueDate',
+				'jobtype' => 'method',
+				'class' => 'fourn/class/fournisseur.facture.class.php',
+				'objectname' => 'FactureFournisseur',
+				'method' => 'sendEmailsRemindersOnSupplierInvoiceDueDate',
+				'parameters' => '10,all,EmailTemplateCode,duedate',
+				'comment' => 'Send an email when we reach the supplier invoice due date (or supplier invoice date) - n days. First param is n, the number of days before due date (or supplier invoice date) to send the remind (or after if value is negative), second parameter is "all" or a payment mode code, third parameter is the code of the email template to use (an email template with the EmailTemplateCode must exists. The version of the email template in the language of the thirdparty will be used in priority. Language of the thirdparty will be also used to update the PDF of the sent supplier invoice). The fourth parameter is the string "duedate" (default) or "invoicedate" to define which date of the supplier invoice to use.',
+				'frequency' => 1,
+				'unitfrequency' => 3600 * 24,
+				'priority' => 50,
+				'status' => 0,
+				'test'=>'isModEnabled("supplier_invoice")',
 				'datestart'=>$datestart
 			));
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 95e40dfd147..c312029151b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3389,6 +3389,313 @@ class FactureFournisseur extends CommonInvoice
 			return 0;
 		}
 	}
+
+	/**
+	 *  Send reminders by emails for supplier invoices validated that are due.
+	 *  CAN BE A CRON TASK
+	 *
+	 *  @param	int			$nbdays				Delay before due date (or after if delay is negative)
+	 *  @param	string		$paymentmode		'' or 'all' by default (no filter), or 'LIQ', 'CHQ', CB', ...
+	 *  @param	int|string	$template			Name (or id) of email template (Must be a template of type 'invoice_supplier_send')
+	 *  @param	string		$datetouse			'duedate' (default) or 'invoicedate'
+	 *  @param	string		$forcerecipient		Force email of recipient (for example to send the email to an accountant supervisor instead of the customer)
+	 *  @return int         					0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function sendEmailsRemindersOnSupplierInvoiceDueDate($nbdays = 0, $paymentmode = 'all', $template = '', $datetouse = 'duedate', $forcerecipient = '')
+	{
+		global $conf, $langs, $user;
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+		$nbMailSend = 0;
+		$errorsMsg = array();
+
+		$langs->load('bills');
+
+		if (!isModEnabled(empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) ? 'fournisseur' : 'supplier_invoice')) {	// Should not happen. If module disabled, cron job should not be visible.
+			$this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv('Suppliers'));
+			return 0;
+		}
+		if (!in_array($datetouse, array('duedate', 'invoicedate'))) {
+			$this->output .= 'Bad value for parameter datetouse. Must be "duedate" or "invoicedate"';
+			return 0;
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$formmail = new FormMail($this->db);
+
+		$now = dol_now();
+		$tmpidate = dol_get_first_hour(dol_time_plus_duree($now, $nbdays, 'd'), 'gmt');
+
+		$tmpinvoice = new FactureFournisseur($this->db);
+
+		dol_syslog(__METHOD__." start", LOG_INFO);
+
+		// Select all action comm reminder
+		$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		if (!empty($paymentmode) && $paymentmode != 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
+		}
+		$sql .= " WHERE f.paye = 0";	// Only unpaid
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
+		if ($datetouse == 'invoicedate') {
+			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
+		} else {
+			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
+		}
+		$sql .= " AND f.entity IN (".getEntity('supplier_invoice', 0).")";	// One batch process only one company (no sharing)
+		if (!empty($paymentmode) && $paymentmode != 'all') {
+			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
+		}
+		// TODO Add a filter to check there is no payment started yet
+		if ($datetouse == 'invoicedate') {
+			$sql .= $this->db->order("datef", "ASC");
+		} else {
+			$sql .= $this->db->order("date_lim_reglement", "ASC");
+		}
+
+		$resql = $this->db->query($sql);
+
+		$stmpidate = dol_print_date($tmpidate, 'day', 'gmt');
+		if ($datetouse == 'invoicedate') {
+			$this->output .= $langs->transnoentitiesnoconv("SearchValidatedSupplierInvoicesWithDate", $stmpidate);
+		} else {
+			$this->output .= $langs->transnoentitiesnoconv("SearchUnpaidSupplierInvoicesWithDueDate", $stmpidate);
+		}
+		if (!empty($paymentmode) && $paymentmode != 'all') {
+			$this->output .= ' ('.$langs->transnoentitiesnoconv("PaymentMode").' '.$paymentmode.')';
+		}
+		$this->output .= '<br>';
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!$error) {
+					// Load event
+					$res = $tmpinvoice->fetch($obj->id);
+					if ($res > 0) {
+						$tmpinvoice->fetch_thirdparty();
+
+						$outputlangs = new Translate('', $conf);
+						if ($tmpinvoice->thirdparty->default_lang) {
+							$outputlangs->setDefaultLang($tmpinvoice->thirdparty->default_lang);
+							$outputlangs->loadLangs(array("main", "suppliers"));
+						} else {
+							$outputlangs = $langs;
+						}
+
+						// Select email template according to language of recipient
+						$templateId = 0;
+						$templateLabel = '';
+						if (empty($template) || $template == 'EmailTemplateCode') {
+							$templateLabel = '(SendingReminderEmailOnUnpaidSupplierInvoice)';
+						} else {
+							if (is_numeric($template)) {
+								$templateId = $template;
+							} else {
+								$templateLabel = $template;
+							}
+						}
+
+						$arraymessage = $formmail->getEMailTemplate($this->db, 'invoice_supplier_send', $user, $outputlangs, $templateId, 1, $templateLabel);
+						if (is_numeric($arraymessage) && $arraymessage <= 0) {
+							$langs->load("errors");
+							$this->output .= $langs->trans('ErrorFailedToFindEmailTemplate', $template);
+							return 0;
+						}
+
+						// PREPARE EMAIL
+						$errormesg = '';
+
+						// Make substitution in email content
+						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, '', $tmpinvoice);
+
+						complete_substitutions_array($substitutionarray, $outputlangs, $tmpinvoice);
+
+						// Topic
+						$sendTopic = make_substitutions(empty($arraymessage->topic) ? $outputlangs->transnoentitiesnoconv('InformationMessage') : $arraymessage->topic, $substitutionarray, $outputlangs, 1);
+
+						// Content
+						$content = $outputlangs->transnoentitiesnoconv($arraymessage->content);
+
+						$sendContent = make_substitutions($content, $substitutionarray, $outputlangs, 1);
+
+						// Recipient
+						$to = array();
+						if ($forcerecipient) {	// If a recipient was forced
+							$to = array($forcerecipient);
+						} else {
+							$res = $tmpinvoice->fetch_thirdparty();
+							$recipient = $tmpinvoice->thirdparty;
+							if ($res > 0) {
+								$tmparraycontact = $tmpinvoice->liste_contact(-1, 'internal', 0, 'SALESREPFOLL');
+								if (is_array($tmparraycontact) && count($tmparraycontact) > 0) {
+									foreach ($tmparraycontact as $data_email) {
+										if (!empty($data_email['email'])) {
+											$to[] = $data_email['email'];
+										}
+									}
+								}
+								if (empty($to) && !empty($recipient->email)) {
+									$to[] = $recipient->email;
+								}
+								if (empty($to)) {
+									$errormesg = "Failed to send remind to thirdparty id=".$tmpinvoice->socid.". No email defined for supplier invoice or customer.";
+									$error++;
+								}
+							} else {
+								$errormesg = "Failed to load recipient with thirdparty id=".$tmpinvoice->socid;
+								$error++;
+							}
+						}
+
+						// Sender
+						$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+						if (!empty($arraymessage->email_from)) {	// If a sender is defined into template, we use it in priority
+							$from = $arraymessage->email_from;
+						}
+						if (empty($from)) {
+							$errormesg = "Failed to get sender into global setup MAIN_MAIL_EMAIL_FROM";
+							$error++;
+						}
+
+						if (!$error && !empty($to)) {
+							$this->db->begin();
+
+							$to = implode(',', $to);
+							if (!empty($arraymessage->email_to)) {	// If a recipient is defined into template, we add it
+								$to = $to.','.$arraymessage->email_to;
+							}
+
+							// Errors Recipient
+							$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
+
+							$trackid = 'inv'.$tmpinvoice->id;
+							$sendcontext = 'standard';
+
+							$email_tocc = '';
+							if (!empty($arraymessage->email_tocc)) {	// If a CC is defined into template, we use it
+								$email_tocc = $arraymessage->email_tocc;
+							}
+
+							$email_tobcc = '';
+							if (!empty($arraymessage->email_tobcc)) {	// If a BCC is defined into template, we use it
+								$email_tobcc = $arraymessage->email_tobcc;
+							}
+
+							// Mail Creation
+							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), $email_tocc, $email_tobcc, 0, 1, $errors_to, '', $trackid, '', $sendcontext, '');
+
+							// Sending Mail
+							if ($cMailFile->sendfile()) {
+								$nbMailSend++;
+
+								// Add a line into event table
+								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+								// Insert record of emails sent
+								$actioncomm = new ActionComm($this->db);
+
+								$actioncomm->type_code = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+								$actioncomm->socid = $tmpinvoice->thirdparty->id; // To link to a company
+								$actioncomm->contact_id = 0;
+
+								$actioncomm->code = 'AC_EMAIL';
+								$actioncomm->label = 'sendEmailsRemindersOnInvoiceDueDateOK (nbdays='.$nbdays.' paymentmode='.$paymentmode.' template='.$template.' datetouse='.$datetouse.' forcerecipient='.$forcerecipient.')';
+								$actioncomm->note_private = $sendContent;
+								$actioncomm->fk_project = $tmpinvoice->fk_project;
+								$actioncomm->datep = dol_now();
+								$actioncomm->datef = $actioncomm->datep;
+								$actioncomm->percentage = -1; // Not applicable
+								$actioncomm->authorid = $user->id; // User saving action
+								$actioncomm->userownerid = $user->id; // Owner of action
+								// Fields when action is an email (content should be added into note)
+								$actioncomm->email_msgid = $cMailFile->msgid;
+								$actioncomm->email_subject = $sendTopic;
+								$actioncomm->email_from = $from;
+								$actioncomm->email_sender = '';
+								$actioncomm->email_to = $to;
+								//$actioncomm->email_tocc = $sendtocc;
+								//$actioncomm->email_tobcc = $sendtobcc;
+								//$actioncomm->email_subject = $subject;
+								$actioncomm->errors_to = $errors_to;
+
+								$actioncomm->elementtype = 'invoice_supplier';
+								$actioncomm->fk_element = $tmpinvoice->id;
+
+								//$actioncomm->extraparams = $extraparams;
+
+								$actioncomm->create($user);
+							} else {
+								$errormesg = $cMailFile->error.' : '.$to;
+								$error++;
+
+								// Add a line into event table
+								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+								// Insert record of emails sent
+								$actioncomm = new ActionComm($this->db);
+
+								$actioncomm->type_code = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+								$actioncomm->socid = $tmpinvoice->thirdparty->id; // To link to a company
+								$actioncomm->contact_id = 0;
+
+								$actioncomm->code = 'AC_EMAIL';
+								$actioncomm->label = 'sendEmailsRemindersOnInvoiceDueDateKO';
+								$actioncomm->note_private = $errormesg;
+								$actioncomm->fk_project = $tmpinvoice->fk_project;
+								$actioncomm->datep = dol_now();
+								$actioncomm->datef = $actioncomm->datep;
+								$actioncomm->percentage = -1; // Not applicable
+								$actioncomm->authorid = $user->id; // User saving action
+								$actioncomm->userownerid = $user->id; // Owner of action
+								// Fields when action is an email (content should be added into note)
+								$actioncomm->email_msgid = $cMailFile->msgid;
+								$actioncomm->email_from = $from;
+								$actioncomm->email_sender = '';
+								$actioncomm->email_to = $to;
+								//$actioncomm->email_tocc = $sendtocc;
+								//$actioncomm->email_tobcc = $sendtobcc;
+								//$actioncomm->email_subject = $subject;
+								$actioncomm->errors_to = $errors_to;
+
+								//$actioncomm->extraparams = $extraparams;
+
+								$actioncomm->create($user);
+							}
+
+							$this->db->commit();	// We always commit
+						}
+
+						if ($errormesg) {
+							$errorsMsg[] = $errormesg;
+						}
+					} else {
+						$errorsMsg[] = 'Failed to fetch record invoice with ID = '.$obj->id;
+						$error++;
+					}
+				}
+			}
+		} else {
+			$error++;
+		}
+
+		if (!$error) {
+			$this->output .= 'Nb of emails sent : '.$nbMailSend;
+
+			dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
+
+			return 0;
+		} else {
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error;
+
+			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
+
+			return $error;
+		}
+	}
 }
 
 
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index 5ad37ffa8e0..ccca15dbd15 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -34,10 +34,10 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private,
 -- Recruiting
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'       ,100,'isModEnabled("recruitment")',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
--- Event organization 
--- Message for default setup of EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF 
+-- Event organization
+-- Message for default setup of EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF
 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);
--- Message for default setup of EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH 
+-- Message for default setup of EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH
 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, '(EventOrganizationEmailBoothPayment)',        30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailBoothPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfBoothWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
@@ -51,3 +51,6 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, p
 INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipCanceled)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipRefused)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
 INSERT INTO llx_c_email_templates (entity, module, type_template, label, lang, position, topic, joinfiles, content) VALUES (0, 'partnership', 'partnership_send', '(SendingEmailOnPartnershipAccepted)', '', 100, '[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__', 0, '<body>\n <p>__(Hello)__,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n');
+
+-- Supplier
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'supplier_invoice','invoice_supplier_send','',0,null,null,'(SendingReminderEmailOnUnpaidSupplierInvoice)',100, 'isModEnabled("supplier_invoice")',1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(SupplierInvoice)__','__(Hello)__,<br /><br />__(SupplierInvoiceUnpaidContent)__<br />__URL_SUPPLIER_INVOICE__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',null, 0);
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 9f5d1f13aa0..edd224367ed 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -253,3 +253,6 @@ ALTER TABLE llx_socpeople ADD COLUMN geopoint point DEFAULT NULL;
 ALTER TABLE llx_socpeople ADD COLUMN georesultcode varchar(16) NULL;
 
 ALTER TABLE llx_socpeople ADD COLUMN name_alias varchar(255) NULL;
+
+-- Supplier
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'supplier_invoice','invoice_supplier_send','',0,null,null,'(SendingReminderEmailOnUnpaidSupplierInvoice)',100, 'isModEnabled("supplier_invoice")',1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(SupplierInvoice)__','__(Hello)__,<br /><br />__(SupplierInvoiceUnpaidContent)__<br />__URL_SUPPLIER_INVOICE__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',null, 0);
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index ef6634e523e..31b2655f403 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -653,4 +653,7 @@ InvoiceSubtype=Invoice Subtype
 SalaryInvoice=Salary 
 BillsAndSalaries=Bills & Salaries
 CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
+SearchUnpaidSupplierInvoicesWithDueDate=Search unpaid supplier invoices with a due date = %s
+SearchValidatedSupplierInvoicesWithDate=Search unpaid supplier invoices with a validation date = %s
+SendEmailsRemindersOnSupplierInvoiceDueDate=Send reminder by email for validated and unpaid supplier invoices
 PaymentMadeForSeveralInvoices=Payment made for several invoices
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 5d0e1a3b246..2126cff249f 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -653,3 +653,7 @@ InvoiceSubtype=Sous-type de facture
 SalaryInvoice=Salaire
 BillsAndSalaries=Factures et salaires
 CreateCreditNoteWhenClientInvoiceExists=Cette option est activée uniquement lorsqu'une ou plusieurs factures validées existent pour un client ou lorsque la constante INVOICE_CREDIT_NOTE_STANDALONE est utilisée (utile pour certains pays)
+SearchUnpaidSupplierInvoicesWithDueDate=Rechercher les factures fournisseur impayées avec date d'échéance = %s
+SearchValidatedSupplierInvoicesWithDate=Rechercher les factures fournisseur impayées avec une date de validation = %s
+SupplierInvoiceUnpaidContent=La facture fournisseur __REF__ n'a pas encore été payé :
+SendEmailsRemindersOnSupplierInvoiceDueDate=Envoyer un rappel par email pour les factures fournisseur validées et impayées

From a392ed0711888414c3e962d164f6631378c95646 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:54:23 +0100
Subject: [PATCH 0126/1862] Qual: Suppress PhanPluginSuspiciousParamPosition
 for file (#28381)

---
 htdocs/website/index.php | 58 +++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 729dd754bb2..d663c5b52d0 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1,7 +1,6 @@
 <?php
 /* Copyright (C) 2016-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020 	   Nicolas ZABOURI		<info@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +22,8 @@
  *		\brief      Page to website view/edit
  */
 
+/** @phan-file-suppress PhanPluginSuspiciousParamPosition */
+
 // We allow POST of rich content with js and style, but only for this php file and if into some given POST variable
 define('NOSCANPOSTFORINJECTION', array('PAGE_CONTENT', 'WEBSITE_JS_INLINE', 'WEBSITE_HTML_HEADER'));
 
@@ -183,6 +184,7 @@ if ($pageid < 0) {
 }
 if (($pageid > 0 || $pageref) && $action != 'addcontainer') {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
+	// @phan-suppress
 	if ($res == 0) {
 		$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
 	}
@@ -3296,7 +3298,7 @@ if (!GETPOST('hide_websitemenu')) {
 			if ($action == 'createfromclone') {
 				// Create an array for form
 				$formquestion = array(
-					array('type' => 'text', 'name' => 'siteref', 'label'=> $langs->trans("WebSite"), 'value'=> 'copy_of_'.$object->ref)
+					array('type' => 'text', 'name' => 'siteref', 'label' => $langs->trans("WebSite"), 'value' => 'copy_of_'.$object->ref)
 				);
 
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneSite'), '', 'confirm_createfromclone', $formquestion, 0, 1, 200);
@@ -3326,16 +3328,16 @@ if (!GETPOST('hide_websitemenu')) {
 						$textifempty = $langs->trans("Default");
 					}
 					$formquestion = array(
-						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
-						array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
-						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'moreattr'=>'autofocus="autofocus"', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
-						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> '')
+						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value' => $objectpage->pageurl),
+						array('type' => 'other', 'tdclass' => 'fieldrequired', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
+						array('type' => 'text', 'tdclass' => 'maxwidth200 fieldrequired', 'moreattr' => 'autofocus="autofocus"', 'name' => 'newtitle', 'label' => $langs->trans("WEBSITE_TITLE"), 'value' => $langs->trans("CopyOf").' '.$objectpage->title),
+						array('type' => 'text', 'tdclass' => 'maxwidth200', 'name' => 'newpageurl', 'label' => $langs->trans("WEBSITE_PAGENAME"), 'value' => '')
 						);
 					if (count($onlylang) > 1) {
-						$formquestion[] = array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly');
+						$formquestion[] = array('type' => 'checkbox', 'tdclass' => 'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss' => 'margintoponly');
 					}
 
-					$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
+					$value = $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
 					$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
 
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
@@ -3819,7 +3821,7 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($langs->trans('WEBSITE_CSS_INLINE'), $htmlhelp, 1, 'help', '', 0, 2, 'csstooltip');
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_CSS_INLINE_x'), 'y'=>GETPOST('WEBSITE_CSS_INLINE_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_CSS_INLINE_x'), 'y' => GETPOST('WEBSITE_CSS_INLINE_y'));
 	$doleditor = new DolEditor('WEBSITE_CSS_INLINE', $csscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'CSS', 'css');
 
@@ -3833,7 +3835,7 @@ if ($action == 'editcss') {
 
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_JS_INLINE_x'), 'y'=>GETPOST('WEBSITE_JS_INLINE_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_JS_INLINE_x'), 'y' => GETPOST('WEBSITE_JS_INLINE_y'));
 	$doleditor = new DolEditor('WEBSITE_JS_INLINE', $jscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'JS', 'javascript');
 
@@ -3849,7 +3851,7 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($textwithhelp, $htmlhelp2, 1, 'warning', '', 0, 2, 'htmlheadertooltip2');
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_HTML_HEADER_x'), 'y'=>GETPOST('WEBSITE_HTML_HEADER_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_HTML_HEADER_x'), 'y' => GETPOST('WEBSITE_HTML_HEADER_y'));
 	$doleditor = new DolEditor('WEBSITE_HTML_HEADER', $htmlheadercontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 
@@ -3860,7 +3862,7 @@ if ($action == 'editcss') {
 	print $langs->trans('WEBSITE_ROBOT');
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_ROBOT_x'), 'y'=>GETPOST('WEBSITE_ROBOT_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_ROBOT_x'), 'y' => GETPOST('WEBSITE_ROBOT_y'));
 	$doleditor = new DolEditor('WEBSITE_ROBOT', $robotcontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'Robot file', 'text');
 
@@ -3871,7 +3873,7 @@ if ($action == 'editcss') {
 	print $langs->trans('WEBSITE_HTACCESS');
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_HTACCESS_x'), 'y'=>GETPOST('WEBSITE_HTACCESS_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_HTACCESS_x'), 'y' => GETPOST('WEBSITE_HTACCESS_y'));
 	$doleditor = new DolEditor('WEBSITE_HTACCESS', $htaccesscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' .htaccess', 'text');
 
@@ -3885,7 +3887,7 @@ if ($action == 'editcss') {
 	print '</td><td>';
 	print $langs->trans("UseManifest").': '.$form->selectyesno('use_manifest', $website->use_manifest, 1).'<br>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_MANIFEST_JSON_x'), 'y'=>GETPOST('WEBSITE_MANIFEST_JSON_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_MANIFEST_JSON_x'), 'y' => GETPOST('WEBSITE_MANIFEST_JSON_y'));
 	$doleditor = new DolEditor('WEBSITE_MANIFEST_JSON', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
 	print '</td></tr>';
@@ -3896,7 +3898,7 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($langs->trans("File").' README.md', $htmlhelp, 1, 'help', '', 0, 2, 'readmetooltip');
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_README_x'), 'y'=>GETPOST('WEBSITE_README_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_README_x'), 'y' => GETPOST('WEBSITE_README_y'));
 	$doleditor = new DolEditor('WEBSITE_README', $readmecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' README.md', 'text');
 
@@ -3908,7 +3910,7 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($langs->trans("File").' LICENSE', $htmlhelp, 1, 'help', '', 0, 2, 'licensetooltip');
 	print '</td><td>';
 
-	$poscursor = array('x'=>GETPOST('WEBSITE_LICENSE_x'), 'y'=>GETPOST('WEBSITE_LICENSE_y'));
+	$poscursor = array('x' => GETPOST('WEBSITE_LICENSE_x'), 'y' => GETPOST('WEBSITE_LICENSE_y'));
 	$doleditor = new DolEditor('WEBSITE_LICENSE', $licensecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' LICENSE', 'text');
 
@@ -4460,7 +4462,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	$htmlhelp .= dol_htmlentitiesbr($htmlheadercontentdefault);
 	print $form->textwithpicto($langs->trans('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
 	print '</td><td>';
-	$poscursor = array('x'=>GETPOST('htmlheader_x'), 'y'=>GETPOST('htmlheader_y'));
+	$poscursor = array('x' => GETPOST('htmlheader_x'), 'y' => GETPOST('htmlheader_y'));
 	$doleditor = new DolEditor('htmlheader', $pagehtmlheader, '', '120', 'ace', 'In', true, false, 'ace', ROWS_3, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 	print '</td></tr>';
@@ -4492,7 +4494,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 		print '<br><input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto");
 		print ' ';
 		print $langs->trans("ImagesShouldBeSavedInto").' ';
-		$arraygrabimagesinto = array('root'=>$langs->trans("WebsiteRootOfImages"), 'subpage'=>$langs->trans("SubdirOfPage"));
+		$arraygrabimagesinto = array('root' => $langs->trans("WebsiteRootOfImages"), 'subpage' => $langs->trans("SubdirOfPage"));
 		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto') ? GETPOST('grabimagesinto') : 'root', 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '<br>';
 
@@ -4610,7 +4612,7 @@ if ($action == 'editsource') {
 		}
 	}
 
-	$poscursor = array('x'=>GETPOST('PAGE_CONTENT_x'), 'y'=>GETPOST('PAGE_CONTENT_y'));
+	$poscursor = array('x' => GETPOST('PAGE_CONTENT_x'), 'y' => GETPOST('PAGE_CONTENT_y'));
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('PAGE_CONTENT', $contentforedit, '', $maxheightwin, 'Full', '', true, true, 'ace', ROWS_5, '40%', 0, $poscursor);
 	$doleditor->Create(0, '', false, 'HTML Source', 'php');
@@ -4629,8 +4631,8 @@ if ($action == 'editcontent') {
 	$contentforedit = preg_replace('/(<img.*src=")(?!http)/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $contentforedit, -1, $nbrep);
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$poscursor = array('x'=>GETPOST('PAGE_CONTENT_x'), 'y'=>GETPOST('PAGE_CONTENT_y'));
-	$doleditor=new DolEditor('PAGE_CONTENT', $contentforedit, '', 500, 'Full', '', true, true, true, ROWS_5, '90%', 0, $poscursor);
+	$poscursor = array('x' => GETPOST('PAGE_CONTENT_x'), 'y' => GETPOST('PAGE_CONTENT_y'));
+	$doleditor = new DolEditor('PAGE_CONTENT', $contentforedit, '', 500, 'Full', '', true, true, true, ROWS_5, '90%', 0, $poscursor);
 	$doleditor->Create(0, '', false);
 }
 
@@ -4927,13 +4929,13 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
 					// Type of container
 					print '<td>';
 					$translateofrecordtype = array(
-						'website_csscontent'=>'WEBSITE_CSS_INLINE',
-						'website_jscontent'=>'WEBSITE_JS_INLINE',
-						'website_robotcontent'=>'WEBSITE_ROBOT',
-						'website_htmlheadercontent'=>'WEBSITE_HTML_HEADER',
-						'website_htaccess'=>'WEBSITE_HTACCESS',
-						'website_readme'=>'WEBSITE_README',
-						'website_manifestjson'=>'WEBSITE_MANIFEST_JSON'
+						'website_csscontent' => 'WEBSITE_CSS_INLINE',
+						'website_jscontent' => 'WEBSITE_JS_INLINE',
+						'website_robotcontent' => 'WEBSITE_ROBOT',
+						'website_htmlheadercontent' => 'WEBSITE_HTML_HEADER',
+						'website_htaccess' => 'WEBSITE_HTACCESS',
+						'website_readme' => 'WEBSITE_README',
+						'website_manifestjson' => 'WEBSITE_MANIFEST_JSON'
 					);
 					if (!empty($translateofrecordtype[$answerrecord['type']])) {
 						print $langs->trans($translateofrecordtype[$answerrecord['type']]);

From 25617ab98213266592170178d9da9fd163af5dfa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:55:15 +0100
Subject: [PATCH 0127/1862] Fix: Protect from negative array index access
 (#28379)

# Fix: Protect from negative array index access

Negative array index access can happen when $i is 0.
While this raises a notice before PHP7.1 it would compare to the last
value in the string so it's invalid.

Detected with phan: PhanCompatibleNegativeStringOffset
---
 htdocs/core/lib/json.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 858ed63ec20..b5a53c7f888 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -266,7 +267,7 @@ function dol_json_decode($json, $assoc = false)
 		} else {
 			$out .= $json[$i];
 		}
-		if ($json[$i] == '"' && $json[($i - 1)] != "\\") {
+		if ($i > 0 && $json[$i] == '"' && $json[($i - 1)] != "\\") {
 			$comment = !$comment;
 		}
 	}

From 3ef33e59a0c6d6d697e7c028be7db72a0a4e011b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 17:06:56 +0100
Subject: [PATCH 0128/1862] Doc

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d39c907fb73..a3046ce115d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8404,7 +8404,7 @@ class Form
 	 *	Return a HTML select string, built from an array of key+value.
 	 *  Note: Do not apply langs->trans function on returned content, content may be entity encoded twice.
 	 *
-	 * @param string 		$htmlname 			Name of html select area. Must start with "multi" if this is a multiselect
+	 * @param string 		$htmlname 			Name of html select area. Try to start name with "multi" or "search_multi" if this is a multiselect
 	 * @param array 		$array 				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>..., 'disabled'=>..., 'css'=>...))
 	 * @param string|string[] $id				Preselected key or preselected keys for multiselect. Use 'ifone' to autoselect record if there is only one record.
 	 * @param int|string 	$show_empty 		0 no empty value allowed, 1 or string to add an empty value into list (If 1: key is -1 and value is '' or '&nbsp;', If placeholder string: key is -1 and value is the string), <0 to add an empty value with key that is this value.

From 141d2d2aa903b4323d8f5ab47e7cff446d96a6d6 Mon Sep 17 00:00:00 2001
From: noec764 <58433943+noec764@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:07:38 +0100
Subject: [PATCH 0129/1862] FIX: Label must not be copied in desc (#28377)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Noé <noe@scopen.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/comm/propal/card.php       | 2 +-
 htdocs/compta/facture/card.php    | 1 +
 htdocs/fourn/commande/card.php    | 2 +-
 htdocs/supplier_proposal/card.php | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 02b2b91f36f..0b549ebf80f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -561,7 +561,7 @@ if (empty($reshook)) {
 							$num = count($lines);
 							for ($i = 0; $i < $num; $i++) {
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
-								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->label);
+								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
 
 								// Positive line
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index be692510ca6..641fd97428e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1690,6 +1690,7 @@ if (empty($reshook)) {
 
 									$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 									$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
+
 									if ($object->situation_counter == 1) {
 										$lines[$i]->situation_percent = 0;
 									}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 1134d10caaf..398eaaff9c0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1315,7 +1315,7 @@ if (empty($reshook)) {
 								}
 
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
-								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->product_desc);
+								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
 								$product_type = (!empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0);
 
 								// Reset fk_parent_line for no child products and special product
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 1127a921131..f9e829cac63 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -383,7 +383,7 @@ if (empty($reshook)) {
 							$num = count($lines);
 							for ($i = 0; $i < $num; $i++) {
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
-								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
+								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
 
 								// Positive line
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);

From d4faa5e2b51fdf2abe3b6bf80ba69641c97d5e32 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Fri, 23 Feb 2024 17:13:15 +0100
Subject: [PATCH 0130/1862] qual: phpstan - Property CommonObjectLine::$fk_unit
 (int|null) does not accept string|null. (#28372)

* Update propal.class.php

htdocs/comm/propal/class/propal.class.php	746	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

htdocs/comm/propal/class/propal.class.php	963	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

* Update commande.class.php

htdocs/commande/class/commande.class.php	1692	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

htdocs/commande/class/commande.class.php	3273	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

* Update facture.class.php

htdocs/compta/facture/class/facture.class.php	3990	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

htdocs/compta/facture/class/facture.class.php	4243	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

* Update fournisseur.commande.class.php

htdocs/fourn/class/fournisseur.commande.class.php	2149	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

htdocs/fourn/class/fournisseur.commande.class.php	3031	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

* Update fournisseur.facture.class.php

htdocs/fourn/class/fournisseur.facture.class.php	2257	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.

htdocs/fourn/class/fournisseur.facture.class.php	2453	Property CommonObjectLine::$fk_unit (int|null) does not accept string|null.
---
 htdocs/comm/propal/class/propal.class.php     |  4 +-
 htdocs/commande/class/commande.class.php      |  4 +-
 .../class/fournisseur.commande.class.php      | 52 +++++++++----------
 .../fourn/class/fournisseur.facture.class.php | 52 +++++++++----------
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index e7b60d6ad39..2a54cf84cf1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -585,7 +585,7 @@ class Propal extends CommonObject
 	 *		@param      int|string	$date_start       	Start date of the line
 	 *		@param      int|string	$date_end         	End date of the line
 	 *      @param		array		$array_options		extrafields array
-	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 		@param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 *      @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
 	 *      @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
 	 * 		@param		double		$pu_ht_devise		Unit price in currency
@@ -835,7 +835,7 @@ class Propal extends CommonObject
 	 *	@param      int|string	$date_start       	Start date of the line
 	 *	@param      int|string	$date_end         	End date of the line
 	 *  @param		array		$array_options		extrafields array
-	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
 	 * @param       integer $rang   line rank
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 187ed7b9452..27071e824ea 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1490,7 +1490,7 @@ class Commande extends CommonOrder
 	 *  @param		int				$pa_ht				Buying price (without tax)
 	 *  @param		string			$label				Label
 	 *  @param		array			$array_options		extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
-	 * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		int|null		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		string		    $origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
 	 *  @param		int			    $origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
 	 * 	@param		double			$pu_ht_devise		Unit price in currency
@@ -3099,7 +3099,7 @@ class Commande extends CommonOrder
 	 *  @param		string			$label				Label
 	 *  @param		int				$special_code		Special code (also used by externals modules!)
 	 *  @param		array			$array_options		extrafields array
-	 * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		int|null		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @param		double			$pu_ht_devise		Amount in currency
 	 * 	@param		int				$notrigger			disable line update trigger
 	 * 	@param		string			$ref_ext			external reference
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 17628d99b5f..1647eac9258 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1906,31 +1906,31 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 *	Add order line
 	 *
-	 *	@param      string	$desc            		Description
-	 *	@param      float	$pu_ht              	Unit price (used if $price_base_type is 'HT')
-	 *	@param      float	$qty             		Quantity
-	 *	@param      float	$txtva           		VAT Rate
-	 *	@param      float	$txlocaltax1        	Localtax1 tax
-	 *  @param      float	$txlocaltax2        	Localtax2 tax
-	 *	@param      int		$fk_product      		Id product
-	 *  @param      int		$fk_prod_fourn_price	Id supplier price
-	 *  @param      string	$ref_supplier			Supplier reference price
-	 *	@param      float	$remise_percent  		Remise
-	 *	@param      string	$price_base_type		HT or TTC
-	 *	@param		float	$pu_ttc					Unit price TTC (used if $price_base_type is 'TTC')
-	 *	@param		int		$type					Type of line (0=product, 1=service)
-	 *	@param		int		$info_bits				More information
-	 *  @param		int		$notrigger				Disable triggers
-	 *  @param		int		$date_start				Date start of service
-	 *  @param		int		$date_end				Date end of service
-	 *  @param		array	$array_options			extrafields array
-	 *  @param 		string	$fk_unit 				Code of the unit to use. Null to use the default one
-	 *  @param 		string	$pu_ht_devise			Amount in currency
-	 *  @param		string	$origin					'order', ...
-	 *  @param		int		$origin_id				Id of origin object
-	 *  @param		int		$rang					Rank
-	 * 	@param		int		$special_code			Special code
-	 *	@return     int             				Return integer <=0 if KO, >0 if OK
+	 *	@param      string		$desc            		Description
+	 *	@param      float		$pu_ht              	Unit price (used if $price_base_type is 'HT')
+	 *	@param      float		$qty             		Quantity
+	 *	@param      float		$txtva           		VAT Rate
+	 *	@param      float		$txlocaltax1        	Localtax1 tax
+	 *	@param      float		$txlocaltax2        	Localtax2 tax
+	 *	@param      int			$fk_product      		Id product
+	 *	@param      int			$fk_prod_fourn_price	Id supplier price
+	 *	@param      string		$ref_supplier			Supplier reference price
+	 *	@param      float		$remise_percent  		Remise
+	 *	@param      string		$price_base_type		HT or TTC
+	 *	@param		float		$pu_ttc					Unit price TTC (used if $price_base_type is 'TTC')
+	 *	@param		int			$type					Type of line (0=product, 1=service)
+	 *	@param		int			$info_bits				More information
+	 *	@param		int			$notrigger				Disable triggers
+	 *	@param		int			$date_start				Date start of service
+	 *	@param		int			$date_end				Date end of service
+	 *	@param		array		$array_options			extrafields array
+	 *	@param 		int|null	$fk_unit 				Code of the unit to use. Null to use the default one
+	 *	@param 		string		$pu_ht_devise			Amount in currency
+	 *	@param		string		$origin					'order', ...
+	 *	@param		int			$origin_id				Id of origin object
+	 *	@param		int			$rang					Rank
+	 *	@param		int			$special_code			Special code
+	 *	@return     int     	        				Return integer <=0 if KO, >0 if OK
 	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $fk_prod_fourn_price = 0, $ref_supplier = '', $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $type = 0, $info_bits = 0, $notrigger = 0, $date_start = null, $date_end = null, $array_options = [], $fk_unit = null, $pu_ht_devise = 0, $origin = '', $origin_id = 0, $rang = -1, $special_code = 0)
 	{
@@ -2888,7 +2888,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param      integer     $date_start     	Date start of service
 	 *  @param      integer     $date_end       	Date end of service
 	 *  @param		array		$array_options		Extrafields array
-	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		float		$pu_ht_devise		Unit price in currency
 	 *  @param		string		$ref_supplier		Supplier ref
 	 *	@return    	int         	    			Return integer < 0 if error, > 0 if ok
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index c312029151b..8c004650de0 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2038,31 +2038,31 @@ class FactureFournisseur extends CommonInvoice
 	 *	by the get_default_tva method(vendor_company, buying company, idprod) and the desc must
 	 *	already have the right value (the caller has to manage the multilanguage).
 	 *
-	 *	@param    	string	$desc            	Description of the line
-	 *	@param    	double	$pu              	Unit price (HT or TTC according to price_base_type, > 0 even for credit note)
-	 *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
-	 *	@param		double	$txlocaltax1		LocalTax1 Rate
-	 *	@param		double	$txlocaltax2		LocalTax2 Rate
-	 *	@param    	double	$qty             	Quantity
-	 *	@param    	int		$fk_product      	Product/Service ID predefined
-	 *	@param    	double	$remise_percent  	Percentage discount of the line
-	 *	@param    	int		$date_start      	Service start date
-	 * 	@param    	int		$date_end        	Service expiry date
-	 * 	@param    	int		$fk_code_ventilation   	Accounting breakdown code
-	 *	@param    	int		$info_bits			Line type bits
-	 *	@param    	string	$price_base_type 	HT or TTC
-	 *	@param		int		$type				Type of line (0=product, 1=service)
-	 *  @param      int		$rang            	Position of line
-	 *  @param		int		$notrigger			Disable triggers
-	 *  @param		array	$array_options		extrafields array
-	 * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
-	 *  @param      int     $origin_id          id origin document
-	 *  @param		double	$pu_devise			Amount in currency
-	 *  @param		string	$ref_supplier		Supplier ref
-	 *  @param      string  $special_code       Special code
-	 *  @param		int		$fk_parent_line		Parent line id
-	 *  @param    	int		$fk_remise_except	Id discount used
-	 *	@return    	int             			>0 if OK, <0 if KO
+	 *	@param      string      $desc                   Description of the line
+	 *	@param      double      $pu                     Unit price (HT or TTC according to price_base_type, > 0 even for credit note)
+	 *	@param      double      $txtva                  Force Vat rate to use, -1 for auto.
+	 *	@param      double      $txlocaltax1            LocalTax1 Rate
+	 *	@param      double      $txlocaltax2            LocalTax2 Rate
+	 *	@param      double      $qty                    Quantity
+	 *	@param      int         $fk_product             Product/Service ID predefined
+	 *	@param      double      $remise_percent         Percentage discount of the line
+	 *	@param      int         $date_start             Service start date
+	 *	@param      int         $date_end               Service expiry date
+	 *	@param      int         $fk_code_ventilation    Accounting breakdown code
+	 *	@param      int         $info_bits              Line type bits
+	 *	@param      string      $price_base_type        HT or TTC
+	 *	@param      int         $type                   Type of line (0=product, 1=service)
+	 *	@param      int         $rang                   Position of line
+	 *	@param      int         $notrigger              Disable triggers
+	 *	@param      array       $array_options          extrafields array
+	 *	@param      int|null    $fk_unit                Code of the unit to use. Null to use the default one
+	 *	@param      int         $origin_id              id origin document
+	 *	@param      double      $pu_devise              Amount in currency
+	 *	@param      string      $ref_supplier           Supplier ref
+	 *	@param      string      $special_code           Special code
+	 *	@param      int         $fk_parent_line         Parent line id
+	 *	@param      int         $fk_remise_except       Id discount used
+	 *	@return     int                                 >0 if OK, <0 if KO
 	 */
 	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $fk_code_ventilation = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = 0, $array_options = [], $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
 	{
@@ -2321,7 +2321,7 @@ class FactureFournisseur extends CommonInvoice
 	 * @param      	integer 	$date_start     	Date start of service
 	 * @param      	integer     $date_end       	Date end of service
 	 * @param		array		$array_options		extrafields array
-	 * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * @param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @param		double		$pu_devise			Amount in currency
 	 * @param		string		$ref_supplier		Supplier ref
 	 * @param	integer	$rang	line rank

From 692e10ec944b95064c4dd5927c82aae97127f400 Mon Sep 17 00:00:00 2001
From: noec764 <58433943+noec764@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:14:10 +0100
Subject: [PATCH 0131/1862] FIX: Error When cloning fourn price no default
 value for tva_tx (#28368)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Noé <noe@scopen.fr>
---
 htdocs/product/class/product.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3ba34b96728..e754148f6d5 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4723,8 +4723,8 @@ class Product extends CommonObject
 
 		// les prix de fournisseurs.
 		$sql = "INSERT ".$this->db->prefix()."product_fournisseur_price (";
-		$sql .= " datec, fk_product, fk_soc, price, quantity, fk_user)";
-		$sql .= " SELECT '".$this->db->idate($now)."', ".((int) $toId).", fk_soc, price, quantity, fk_user";
+		$sql .= " datec, fk_product, fk_soc, price, quantity, fk_user, tva_tx)";
+		$sql .= " SELECT '".$this->db->idate($now)."', ".((int) $toId).", fk_soc, price, quantity, fk_user, tva_tx";
 		$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price";
 		$sql .= " WHERE fk_product = ".((int) $fromId);
 

From 71e59190aa217aa4e8b61af345c83f68ddfc45d1 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 23 Feb 2024 17:15:40 +0100
Subject: [PATCH 0132/1862] New method for  calcule spent time in week passed 
 (#28314)

* create method for calcule spent time in week

* Fix method for get first day of week and send email

* update method by sending mail with content and inserting in actioncom

* fix undeclared variables

* fix other variable undeclared
---
 htdocs/projet/class/project.class.php | 172 ++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 734e0dfc986..b071f2db420 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2549,4 +2549,176 @@ class Project extends CommonObject
 
 		return $children;
 	}
+
+	/**
+	 * Method for calculating weekly hours worked and generating a report
+	 * @return int   0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function createWeeklyReport()
+	{
+		global $mysoc, $user;
+
+		$now = dol_now();
+		$nowDate = dol_getdate($now, true);
+
+		$firstDayOfWeekTS = dol_get_first_day_week($nowDate['mday'], $nowDate['mon'], $nowDate['year']);
+
+		$firstDayOfWeekDate = dol_mktime(0, 0, 0, $nowDate['mon'], $firstDayOfWeekTS['first_day'], $nowDate['year']);
+
+		$lastWeekStartTS = dol_time_plus_duree($firstDayOfWeekDate, -7, 'd');
+
+		$lastWeekEndTS = dol_time_plus_duree($lastWeekStartTS, 6, 'd');
+
+		$startDate = dol_print_date($lastWeekStartTS, '%Y-%m-%d 00:00:00');
+		$endDate = dol_print_date($lastWeekEndTS, '%Y-%m-%d 23:59:59');
+
+		$sql = "SELECT
+		u.rowid AS user_id,
+		CONCAT(u.firstname, ' ', u.lastname) AS name,
+		u.email,u.weeklyhours,
+		SUM(et.element_duration) AS total_seconds
+		FROM
+			llx_element_time AS et
+		JOIN
+			llx_user AS u ON et.fk_user = u.rowid
+		WHERE
+			et.element_date BETWEEN '".$this->db->escape($startDate)."' AND '".$this->db->escape($endDate)."'
+			AND et.elementtype = 'task'
+		GROUP BY
+			et.fk_user";
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			dol_print_error($this->db);
+			return -1;
+		} else {
+			$reportContent = "<span>Weekly time report from $startDate to $endDate </span><br><br>";
+			$reportContent .= '<table border="1" style="border-collapse: collapse;">';
+			$reportContent .= '<tr><th>Nom d\'utilisateur</th><th>Temps saisi (heures)</th><th>Temps travaillé par semaine (heures)</th></tr>';
+
+			$weekendEnabled = 0;
+			$to = '';
+			$nbMailSend = 0;
+			$error = 0;
+			$errors_to = 0;
+			while ($obj = $this->db->fetch_object($resql)) {
+				$to = $obj->email;
+				$numHolidays = num_public_holiday($lastWeekStartTS, $lastWeekEndTS, $mysoc->country_code, 1);
+				if (getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY') && getDolGlobalString('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY')) {
+					$numHolidays = $numHolidays - 2;
+					$weekendEnabled = 2;
+				}
+
+				$dailyHours = $obj->weeklyhours / (7 - $weekendEnabled);
+
+				// Adjust total on seconde
+				$adjustedSeconds = $obj->total_seconds + ($numHolidays * $dailyHours * 3600);
+
+				$totalHours = round($adjustedSeconds / 3600, 2);
+
+				$reportContent .= "<tr><td>{$obj->name}</td><td>{$totalHours}</td><td>".round($obj->weeklyhours, 2)."</td></tr>";
+
+				$reportContent .= '</table>';
+
+				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+
+				// PREPARE EMAIL
+				$errormesg = '';
+
+				$subject = 'Rapport hebdomadaire des temps travaillés';
+
+				$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+				if (empty($from)) {
+					$errormesg = "Failed to get sender into global setup MAIN_MAIL_EMAIL_FROM";
+					$error++;
+				}
+
+				$mail = new CMailFile($subject, $to, $from, $reportContent, array(), array(), array(), '', '', 0, -1, '', '', 0, 'text/html');
+
+				if ($mail->sendfile()) {
+					$nbMailSend++;
+
+					// Add a line into event table
+					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+					// Insert record of emails sent
+					$actioncomm = new ActionComm($this->db);
+
+					$actioncomm->type_code = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+					$actioncomm->socid = $this->thirdparty->id; // To link to a company
+					$actioncomm->contact_id = 0;
+
+					$actioncomm->code = 'AC_EMAIL';
+					$actioncomm->label = 'createWeeklyReportOK()';
+					$actioncomm->fk_project = $this->id;
+					$actioncomm->datep = dol_now();
+					$actioncomm->datef = $actioncomm->datep;
+					$actioncomm->percentage = -1; // Not applicable
+					$actioncomm->authorid = $user->id; // User saving action
+					$actioncomm->userownerid = $user->id; // Owner of action
+					// Fields when action is an email (content should be added into note)
+					$actioncomm->email_msgid = $mail->msgid;
+					$actioncomm->email_subject = $subject;
+					$actioncomm->email_from = $from;
+					$actioncomm->email_sender = '';
+					$actioncomm->email_to = $to;
+
+					$actioncomm->errors_to = $errors_to;
+
+					$actioncomm->elementtype = 'project_task';
+					$actioncomm->fk_element = $this->element;
+
+					$actioncomm->create($user);
+				} else {
+					$errormesg = $mail->error.' : '.$to;
+					$error++;
+
+					// Add a line into event table
+					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+					// Insert record of emails sent
+					$actioncomm = new ActionComm($this->db);
+
+					$actioncomm->type_code = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+					$actioncomm->socid = $this->thirdparty->id; // To link to a company
+					$actioncomm->contact_id = 0;
+
+					$actioncomm->code = 'AC_EMAIL';
+					$actioncomm->label = 'createWeeklyReportKO()';
+					$actioncomm->note_private = $errormesg;
+					$actioncomm->fk_project = $this->id;
+					$actioncomm->datep = dol_now();
+					$actioncomm->datef = $actioncomm->datep;
+					$actioncomm->authorid = $user->id; // User saving action
+					$actioncomm->userownerid = $user->id; // Owner of action
+					// Fields when action is an email (content should be added into note)
+					$actioncomm->email_msgid = $mail->msgid;
+					$actioncomm->email_from = $from;
+					$actioncomm->email_sender = '';
+					$actioncomm->email_to = $to;
+
+					$actioncomm->errors_to = $errors_to;
+
+					$actioncomm->elementtype = 'project_task';
+					$actioncomm->fk_element = $this->element;
+
+					$actioncomm->create($user);
+				}
+				$this->db->commit();
+			}
+		}
+		if ($errormesg) {
+			$errorsMsg[] = $errormesg;
+		}
+
+		if (!$error) {
+			$this->output .= 'Nb of emails sent : '.$nbMailSend;
+			dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
+			return 0;
+		} else {
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? implode(', ', $errorsMsg) : $error;
+			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
+			return $error;
+		}
+	}
 }

From 1e28f7205796d2d0df79636a643982519a03cfcd Mon Sep 17 00:00:00 2001
From: lvessiller-opendsi <lvessiller@open-dsi.fr>
Date: Fri, 23 Feb 2024 17:18:16 +0100
Subject: [PATCH 0133/1862] NEW warning message when cloning a product whose
 status is not to sell (#28374)

---
 htdocs/comm/propal/card.php      | 16 ++++++++++++
 htdocs/commande/card.php         | 20 +++++++++++++--
 htdocs/compta/facture/card.php   | 42 +++++++++++++++++++++++---------
 htdocs/langs/en_US/products.lang |  2 +-
 4 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 0b549ebf80f..f827bc3e6ae 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -226,6 +226,22 @@ if (empty($reshook)) {
 
 				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : null), (GETPOST('update_prices', 'aZ') ? true : false), (GETPOST('update_desc', 'aZ') ? true : false));
 				if ($result > 0) {
+					$warningMsgLineList = array();
+					// check all product lines are to sell otherwise add a warning message for each product line is not to sell
+					foreach ($object->lines as $line) {
+						if (!is_object($line->product)) {
+							$line->fetch_product();
+						}
+						if (is_object($line->product) && $line->product->id > 0) {
+							if (empty($line->product->tosell)) {
+								$warningMsgLineList[$line->id] = $langs->trans('WarningLineProductNotToSell', $line->product->ref);
+							}
+						}
+					}
+					if (!empty($warningMsgLineList)) {
+						setEventMessages('', $warningMsgLineList, 'warnings');
+					}
+
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
 				} else {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f11fb86068d..988879d2f7f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -187,8 +187,8 @@ if (empty($reshook)) {
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
-		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
-			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+		if (!($socid > 0)) {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('IdThirdParty')), null, 'errors');
 		} else {
 			if ($object->id > 0) {
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -196,6 +196,22 @@ if (empty($reshook)) {
 
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
+					$warningMsgLineList = array();
+					// check all product lines are to sell otherwise add a warning message for each product line is not to sell
+					foreach ($object->lines as $line) {
+						if (!is_object($line->product)) {
+							$line->fetch_product();
+						}
+						if (is_object($line->product) && $line->product->id > 0) {
+							if (empty($line->product->tosell)) {
+								$warningMsgLineList[$line->id] = $langs->trans('WarningLineProductNotToSell', $line->product->ref);
+							}
+						}
+					}
+					if (!empty($warningMsgLineList)) {
+						setEventMessages('', $warningMsgLineList, 'warnings');
+					}
+
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				} else {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 641fd97428e..8923f6bb48a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -218,18 +218,38 @@ if (empty($reshook)) {
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
-		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
-
-		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
-		$objectutil->socid = $socid;
-		$result = $objectutil->createFromClone($user, $id);
-		if ($result > 0) {
-			header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
-			exit();
+		if (!($socid > 0)) {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('IdThirdParty')), null, 'errors');
 		} else {
-			$langs->load("errors");
-			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
-			$action = '';
+			$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
+
+			$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+			$objectutil->socid = $socid;
+			$result = $objectutil->createFromClone($user, $id);
+			if ($result > 0) {
+				$warningMsgLineList = array();
+				// check all product lines are to sell otherwise add a warning message for each product line is not to sell
+				foreach ($objectutil->lines as $line) {
+					if (!is_object($line->product)) {
+						$line->fetch_product();
+					}
+					if (is_object($line->product) && $line->product->id > 0) {
+						if (empty($line->product->tosell)) {
+							$warningMsgLineList[$line->id] = $langs->trans('WarningLineProductNotToSell', $line->product->ref);
+						}
+					}
+				}
+				if (!empty($warningMsgLineList)) {
+					setEventMessages('', $warningMsgLineList, 'warnings');
+				}
+
+				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $result);
+				exit();
+			} else {
+				$langs->load("errors");
+				setEventMessages($objectutil->error, $objectutil->errors, 'errors');
+				$action = '';
+			}
 		}
 	} elseif ($action == 'reopen' && $usercanreopen) {
 		$result = $object->fetch($id);
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 77355fce385..93bf150de17 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -436,4 +436,4 @@ WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal
 AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
 AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
-
+WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned

From 1b4fb86c75338543db60f2b441a7e2b2e2c49e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20A?= <35066297+c3do@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:20:20 +0100
Subject: [PATCH 0134/1862] NEW Filter shipments by selecting multiple shipping
 methods (#28376)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Filter shipments by selecting multiple shipping methods

* FIX GETPOST from «array» to «array:int»

* FIX "Opening brace must be the last content on the line"

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/expedition/list.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b452d32fc75..28494156eb2 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -55,7 +55,7 @@ $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST("search_company", 'alpha');
-$search_shipping_method_id = GETPOST('search_shipping_method_id');
+$search_shipping_method_ids = GETPOST('search_shipping_method_ids', 'array:int');
 $search_tracking = GETPOST("search_tracking", 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
@@ -191,7 +191,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_type = '';
 	$search_country = '';
 	$search_tracking = '';
-	$search_shipping_method_id = '';
+	$search_shipping_method_ids = [];
 	$search_type_thirdparty = '';
 	$search_billed = '';
 	$search_datedelivery_start = '';
@@ -346,8 +346,8 @@ if ($search_state) {
 if ($search_country) {
 	$sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
 }
-if ($search_shipping_method_id > 0) {
-	$sql .= " AND e.fk_shipping_method = ".((int) $search_shipping_method_id);
+if (!empty($search_shipping_method_ids)) {
+	$sql .= " AND e.fk_shipping_method IN (".$db->sanitize(implode(',', $search_shipping_method_ids)).')';
 }
 if ($search_tracking) {
 	$sql .= natural_search("e.tracking_number", $search_tracking);
@@ -536,8 +536,10 @@ if ($search_sale > 0) {
 if ($search_company) {
 	$param .= "&search_company=".urlencode($search_company);
 }
-if ($search_shipping_method_id) {
-	$param .= "&search_shipping_method_id=".urlencode($search_shipping_method_id);
+if ($search_shipping_method_ids) {
+	foreach ($search_shipping_method_ids as $value) {
+		$param .= "&amp;search_shipping_method_ids[]=".urlencode($value);
+	}
 }
 if ($search_tracking) {
 	$param .= "&search_tracking=".urlencode($search_tracking);
@@ -767,7 +769,7 @@ if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 	// Delivery method
 	print '<td class="liste_titre center">';
 	$shipment->fetch_delivery_methods();
-	print $form->selectarray("search_shipping_method_id", $shipment->meths, $search_shipping_method_id, 1, 0, 0, "", 1, 0, 0, '', 'maxwidth150');
+	print $form->selectarray("search_shipping_method_ids[]", $shipment->meths, $search_shipping_method_ids, 1, 0, 0, 'multiple', 1, 0, 0, '', 'maxwidth150');
 	print "</td>\n";
 }
 // Tracking number

From f502435d6290d0723c3ccc1e7efe393a32143ca4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 17:24:02 +0100
Subject: [PATCH 0135/1862] FIX position of field in list of field in shipment
 list

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

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b8a07790426..e498c5028d3 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -135,9 +135,9 @@ $arrayfields = array(
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
-	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
-	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>'getDolGlobalString("WORKFLOW_BILL_ON_SHIPMENT") !== "0"')
+	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'position'=>1010, 'enabled'=>(getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
+	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'position'=>1020, 'checked'=>1, 'enabled'=>(getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
+	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1100, 'enabled'=>'getDolGlobalString("WORKFLOW_BILL_ON_SHIPMENT") !== "0"')
 );
 
 // Extra fields

From ac1e8ac617878c0919cb5c95cf5d4fb54ac490ed Mon Sep 17 00:00:00 2001
From: Vincent Maury <artec.vm@arnac.net>
Date: Fri, 23 Feb 2024 17:25:10 +0100
Subject: [PATCH 0136/1862] Fix tva_tx on deposit invoice (#28305)

* Fix tva_tx on deposit invoice

* Update card.php

* Update card.php

Modifs according to Eldy's suggestions :

introduce a hidden option
INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY, with possible values:

   - not defined, we keep vat to 0 (current code):
    - if value is string 'default', we do what you suggest, we use the default vat for company (in most cases it will be the higher vat rate in dictionary).
    - if value is a float, we use this float value.

* Update card.php
---
 htdocs/compta/facture/card.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8923f6bb48a..d2c34bf0302 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1307,7 +1307,22 @@ if (empty($reshook)) {
 						$totaldeposits = $facture_source->getSumDepositsUsed();
 						$remain_to_pay = abs($facture_source->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits);
 
-						$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 1, 0, 0, 0, 0, 0, '', '', 'TTC');
+						if (!empty($conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY) && $conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY == 'default') {
+							if ((empty($object->thirdparty) || !is_object($object->thirdparty) || get_class($object->thirdparty) != 'Societe')) {
+								$object->fetch_thirdparty();
+							}
+							if (!empty($object->thirdparty) && is_object($object->thirdparty) && get_class($object->thirdparty) == 'Societe') {
+								$tva_tx = get_default_tva($mysoc, $object->thirdparty);
+							} else {
+								$tva_tx = 0;
+							}
+						} elseif ((float) $conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY > 0) {
+							$tva_tx = (float) $conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY;
+						} else {
+							$tva_tx = 0;
+						}
+
+						$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 1, $tva_tx, 0, 0, 0, 0, '', '', 'TTC');
 					}
 				}
 

From 00e57fe76528efff51d3b7c8fd4b5b5161e2b634 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 17:36:15 +0100
Subject: [PATCH 0137/1862] Fix conf->global

---
 htdocs/compta/facture/card.php | 37 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d2c34bf0302..091af287d69 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -109,7 +109,7 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGloba
 // Number of lines for predefined product/service choices
 $NBLINES = 4;
 
-$usehm = (getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
+$usehm = getDolGlobalInt('MAIN_USE_HOURMIN_IN_DATE_RANGE');
 
 $object = new Facture($db);
 $extrafields = new ExtraFields($db);
@@ -465,7 +465,7 @@ if (empty($reshook)) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate&token='.newToken());
 			exit;
 		}
-		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+		if ($newdate > (dol_now('tzuserrel') + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
 			} else {
@@ -1048,7 +1048,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1107,7 +1107,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1307,7 +1307,7 @@ if (empty($reshook)) {
 						$totaldeposits = $facture_source->getSumDepositsUsed();
 						$remain_to_pay = abs($facture_source->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits);
 
-						if (!empty($conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY) && $conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY == 'default') {
+						if (getDolGlobalString('INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY') == 'default') {
 							if ((empty($object->thirdparty) || !is_object($object->thirdparty) || get_class($object->thirdparty) != 'Societe')) {
 								$object->fetch_thirdparty();
 							}
@@ -1316,8 +1316,8 @@ if (empty($reshook)) {
 							} else {
 								$tva_tx = 0;
 							}
-						} elseif ((float) $conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY > 0) {
-							$tva_tx = (float) $conf->global->INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY;
+						} elseif ((float) getDolGlobalString('INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY') > 0) {
+							$tva_tx = (float) getDolGlobalString('INVOICE_VAT_TO_USE_ON_CREDIT_NOTE_WHEN_GENERATED_FROM_REMAIN_TO_PAY');
 						} else {
 							$tva_tx = 0;
 						}
@@ -1346,7 +1346,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1406,7 +1406,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1638,7 +1638,7 @@ if (empty($reshook)) {
 									$tva, // vat rate
 									0, // localtax1_tx
 									0, // localtax2_tx
-									(!getDolGlobalString('INVOICE_PRODUCTID_DEPOSIT') ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+									getDolGlobalInt('INVOICE_PRODUCTID_DEPOSIT'), // fk_product
 									0, // remise_percent
 									0, // date_start
 									0, // date_end
@@ -1865,8 +1865,7 @@ if (empty($reshook)) {
 
 						// Now we create same links to contact than the ones found on origin object
 						/* Useless, already into the create
-						if (!empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
-						{
+						if (getDolGlobalString('MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN')) {
 							$originforcontact = $object->origin;
 							$originidforcontact = $object->origin_id;
 							if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
@@ -1925,7 +1924,7 @@ if (empty($reshook)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
 				setEventMessages($mesg, null, 'errors');
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -3865,7 +3864,7 @@ if ($action == 'create') {
 					$retained_warranty = $objectsrc->retained_warranty;
 				}
 			}
-			$retained_warranty_js_default = !empty($retained_warranty) ? $retained_warranty : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+			$retained_warranty_js_default = !empty($retained_warranty) ? $retained_warranty : getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT');
 
 			print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
 			print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
@@ -4168,8 +4167,6 @@ if ($action == 'create') {
 
 	// We can also use bcadd to avoid pb with floating points
 	// For example print 239.2 - 229.3 - 9.9; does not return 0.
-	// $resteapayer=bcadd($object->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
-	// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
 	$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 	// Multicurrency
@@ -4340,7 +4337,7 @@ if ($action == 'create') {
 									array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value));
 			}
 		}
-		if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) { 		// Can happen only if $conf->global->FACTURE_ENABLE_NEGATIVE is on
+		if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) { 		// Can happen only if getDolGlobalString('FACTURE_ENABLE_NEGATIVE') is on
 			$text .= '<br>'.img_warning().' '.$langs->trans("ErrorInvoiceOfThisTypeMustBePositive");
 		}
 
@@ -4548,8 +4545,8 @@ if ($action == 'create') {
 		$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'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_customer, $object, $usercancreate, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_customer, $object, $usercancreate, 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
 	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
@@ -4915,7 +4912,7 @@ if ($action == 'create') {
 					print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 					$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
 					$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
-					$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+					$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 					print $form->getSelectConditionsPaiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 					print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					print '</form>';

From f3a3de8ea24c102c3905f764a8bd319d277af535 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 23 Feb 2024 17:43:18 +0100
Subject: [PATCH 0138/1862] Qual: Fix/complete/refactor ModuleTest case.
 (#28373)

* Fix: Correct CommonClassTest's constructor

# Fix: Correct CommonClassTest's constructor

Dataproviders did not work because of the issue with the constructor

* Qual: Refactor module name list, add mapping to class name

# Qual: Refactor module name list, add mapping to class name

Based on ModuleTest and search for modules in the code, complete the
list of modules and map to the class names.

This will allow reuse in the ModuleTest.

* Qual: Refactor ModulesInit test

# Qual: Refactor ModulesInit test

Use the updated common module mapping list, more complete than
the original list.
Also refactor the test to use a data provider.

* Fix: valid module test must now use array_key_exists

# Fix: valid module test must now use array_key_exists

Because of the introduction of null key values, isset on the array no
longer works, using array_key_exists to test if the modulename is valid.

* fixup! Qual: Refactor module name list, add mapping to class name

* Qual: Less verbosity for tests

# Qual: Less verbosity for tests

The verbosity on setup/teardown/... is not really usefull and
makes the log less readable.  Reducing the verbosity while allowing
to set an environment variable PHPUNIT_DEBUG to enable it.
---
 test/phpunit/CodingPhpTest.php         | 128 +----------------
 test/phpunit/CommonClassTest.class.php | 185 +++++++++++++++++++++++--
 test/phpunit/ModulesTest.php           |  62 +++++----
 3 files changed, 212 insertions(+), 163 deletions(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index f39e2540ef3..c72f5859ea6 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -618,135 +618,9 @@ class CodingPhpTest extends CommonClassTest
 			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_DEPRECATED);
 		} else {
 			$this->assertTrue(
-				isset(self::VALID_MODULE_MAPPING[$module_name]),
+				array_key_exists($module_name, self::VALID_MODULE_MAPPING),
 				"Unknown module: $message"
 			);
 		}
 	}
-
-	const DEPRECATED_MODULE_MAPPING = array(
-		'actioncomm' => 'agenda',
-		'adherent' => 'member',
-		'adherent_type' => 'member_type',
-		'banque' => 'bank',
-		'categorie' => 'category',
-		'commande' => 'order',
-		'contrat' => 'contract',
-		'entrepot' => 'stock',
-		'expedition' => 'delivery_note',
-		'facture' => 'invoice',
-		'fichinter' => 'intervention',
-		'product_fournisseur_price' => 'productsupplierprice',
-		'product_price' => 'productprice',
-		'projet'  => 'project',
-		'propale' => 'propal',
-		'socpeople' => 'contact',
-	);
-	const VALID_MODULE_MAPPING = array(
-		'agenda' => 1,
-		'member' => 1,
-		'member_type' => 1,
-		'bank' => 1,
-		'category' => 1,
-		'delivery_note' => 1,
-		'order' => 1,
-		'contract' => 1,
-		'stock' => 1,
-		'invoice' => 1,
-		'intervention' => 1,
-		'productsupplierprice' => 1,
-		'productprice' => 1,
-		'project' => 1,
-		'propal' => 1,
-		'contact' => 1,
-		'accounting' => 1,
-		'ai' => 1,
-		'anothermodule' => 1,
-		'api' => 1,
-		'asset' => 1,
-		'barcode' => 1,
-		'blockedlog' => 1,
-		'bom' => 1,
-		'bookcal' => 1,
-		'bookmark' => 1,
-		'cashdesk' => 1,
-		'clicktodial' => 1,
-		'comptabilite' => 1,
-		'cron' => 1,
-		'datapolicy' => 1,
-		'debugbar' => 1,
-		'deplacement' => 1,
-		'don' => 1,
-		'dynamicprices' => 1,
-		'ecm' => 1,
-		'ecotax' => 1,
-		'emailcollector' => 1,
-		'eventorganization' => 1,
-		'expensereport' => 1,
-		'export' => 1,
-		'externalsite' => 1,
-		'fckeditor' => 1,
-		'ficheinter' => 1,
-		'fournisseur' => 1,
-		'ftp' => 1,
-		'google' => 1,
-		'gravatar' => 1,
-		'holiday' => 1,
-		'hrm' => 1,
-		'import' => 1,
-		'incoterm' => 1,
-		'intracommreport' => 1,
-		'knowledgemanagement' => 1,
-		'label' => 1,
-		'ldap' => 1,
-		'loan' => 1,
-		'mailing' => 1,
-		'mailman' => 1,
-		'mailmanspip' => 1,
-		'margin' => 1,
-		'memcached' => 1,
-		'modulebuilder' => 1,
-		'mrp' => 1,
-		'multicompany' => 1,
-		'multicurrency' => 1,
-		'mymodule' => 1,
-		'notification' => 1,
-		'numberwords' => 1,
-		'openstreetmap' => 1,
-		'opensurvey' => 1,
-		'partnership' => 1,
-		'paybox' => 1,
-		'paymentbybanktransfer' => 1,
-		'paypal' => 1,
-		'paypalplus' => 1,
-		'prelevement' => 1,
-		'product' => 1,
-		'productbatch' => 1,
-		'receiptprinter' => 1,
-		'reception' => 1,
-		'recruitment' => 1,
-		'resource' => 1,
-		'salaries' => 1,
-		'service' => 1,
-		'socialnetworks' => 1,
-		'societe' => 1,
-		'stocktransfer' => 1,
-		'stripe' => 1,
-		'supplier_invoice' => 1,
-		'supplier_order' => 1,
-		'supplier_proposal' => 1,
-		'syslog' => 1,
-		'takepos' => 1,
-		'tax' => 1,
-		'ticket' => 1,
-		'user' => 1,
-		'variants' => 1,
-		'webhook' => 1,
-		'webportal' => 1,
-		'webservices' => 1,
-		'website' => 1,
-		'workflow' => 1,
-		'workstation' => 1,
-		'zapier' => 1,
-	);
 }
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 17bc6dbc5c7..9e3aaf16569 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -37,6 +37,7 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class for PHPUnit tests
@@ -45,22 +46,31 @@ $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommonClassTest extends PHPUnit\Framework\TestCase
+abstract class CommonClassTest extends TestCase
 {
 	protected $savconf;
 	protected $savuser;
 	protected $savlangs;
 	protected $savdb;
 
+	/**
+	 * Number of Dolibarr log lines to show in case of error
+	 *
+	 * @var integer
+	 */
+	public $nbLinesToShow = 100;
+
 	/**
 	 * Constructor
 	 * We save global variables into local variables
 	 *
-	 * @param 	string	$name		Name
+	 * @param string       $name       Name
+	 * @param array        $data       Test data
+	 * @param string       $dataName   Test data name.
 	 */
-	public function __construct($name = '')
+	public function __construct($name = null, array $data = array(), $dataName = '')
 	{
-		parent::__construct($name);
+		parent::__construct($name, $data, $dataName);
 
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
@@ -71,7 +81,7 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
-		print "\n";
+		print PHP_EOL;
 	}
 
 	/**
@@ -85,11 +95,13 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('agenda')) {
-			print __METHOD__." module agenda must be enabled.\n";
+			print get_called_class()." module agenda must be enabled.".PHP_EOL;
 			die(1);
 		}
 
-		print __METHOD__."\n";
+		if (isset($_ENV['PHPUNIT_DEBUG'])) {
+			print get_called_class().PHP_EOL;
+		}
 	}
 
 	/**
@@ -104,7 +116,7 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 
 		$lines = file($logfile);
 
-		$nbLinesToShow = 100;
+		$nbLinesToShow = $this->nbLinesToShow;
 		if ($t instanceof PHPUnit\Framework\Error\Notice) {
 			$nbLinesToShow = 3;
 		}
@@ -115,10 +127,11 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 		$last_lines = array_slice($lines, $first_line, $nbLinesToShow);
 
 		// Show log file
-		print "\n----- Test fails. Show last ".$nbLinesToShow." lines of dolibarr.log file -----\n";
+		print PHP_EOL."----- Test fails. Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
 		foreach ($last_lines as $line) {
 			print $line . "<br>";
 		}
+		print PHP_EOL;
 
 		parent::onNotSuccessfulTest($t);
 	}
@@ -137,6 +150,9 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
+		if (isset($_ENV['PHPUNIT_DEBUG'])) {
+			print get_called_class().PHP_EOL;
+		}
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
 	}
@@ -148,7 +164,9 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 	 */
 	protected function tearDown(): void
 	{
-		print __METHOD__."\n";
+		if (isset($_ENV['PHPUNIT_DEBUG'])) {
+			print get_called_class().PHP_EOL;
+		}
 	}
 
 	/**
@@ -160,7 +178,150 @@ class CommonClassTest extends PHPUnit\Framework\TestCase
 	{
 		global $db;
 		$db->rollback();
-
-		print __METHOD__."\n";
+		if (isset($_ENV['PHPUNIT_DEBUG'])) {
+			print get_called_class().PHP_EOL;
+		}
 	}
+
+	/**
+	 * Map deprecated module names to new module names
+	 */
+	const DEPRECATED_MODULE_MAPPING = array(
+		'actioncomm' => 'agenda',
+		'adherent' => 'member',
+		'adherent_type' => 'member_type',
+		'banque' => 'bank',
+		'categorie' => 'category',
+		'commande' => 'order',
+		'contrat' => 'contract',
+		'entrepot' => 'stock',
+		'expedition' => 'delivery_note',
+		'facture' => 'invoice',
+		'ficheinter' => 'intervention',
+		'product_fournisseur_price' => 'productsupplierprice',
+		'product_price' => 'productprice',
+		'projet'  => 'project',
+		'propale' => 'propal',
+		'socpeople' => 'contact',
+	);
+
+	/**
+	 * Map module names to the 'class' name (the class is: mod<CLASSNAME>)
+	 * Value is null when the module is not internal to the default
+	 * Dolibarr setup.
+	 */
+	const VALID_MODULE_MAPPING = array(
+		'accounting' => 'Accounting',
+		'agenda' => 'Agenda',
+		'ai' => 'Ai',
+		'anothermodule' => null,  // Not used in code, used in translations.lang
+		'api' => 'Api',
+		'asset' => 'Asset',
+		'bank' => 'Banque',
+		'barcode' => 'Barcode',
+		'blockedlog' => 'BlockedLog',
+		'bom' => 'Bom',
+		'bookcal' => 'BookCal',
+		'bookmark' => 'Bookmark',
+		'cashdesk' => null,
+		'category' => 'Categorie',
+		'clicktodial' => 'ClickToDial',
+		'TBD_COLLAB' => 'Collab',  // TODO: fill in proper name
+		'comptabilite' => 'Comptabilite',
+		'contact' => null,  // TODO: fill in proper class
+		'contract' => 'Contrat',
+		'cron' => 'Cron',
+		'datapolicy' => 'DataPolicy',
+		'TBD_DAV' => 'Dav',  // TODO: fill in proper name
+		'debugbar' => 'DebugBar',
+		'delivery_note' => 'Expedition',
+		'deplacement' => 'Deplacement',
+		"TBD_DocGen" => 'DocumentGeneration',  // TODO: fill in proper name
+		'don' => 'Don',
+		'dynamicprices' => 'DynamicPrices',
+		'ecm' => 'ECM',
+		'ecotax' => null,  // TODO: External module ?
+		'emailcollector' => 'EmailCollector',
+		'eventorganization' => 'EventOrganization',
+		'expensereport' => 'ExpenseReport',
+		'export' => 'Export',
+		'TBD_EXTERNALRSS' => 'ExternalRss',  // TODO: fill in proper name
+		'externalsite' => 'ExternalSite',
+		'fckeditor' => 'Fckeditor',
+		'fournisseur' => 'Fournisseur',
+		'ftp' => 'FTP',
+		'TBD_GEOIPMAXMIND' => 'GeoIPMaxmind',  // TODO: fill in proper name
+		'google' => null,  // External ?
+		'gravatar' => 'Gravatar',
+		'holiday' => 'Holiday',
+		'hrm' => 'HRM',
+		'import' => 'Import',
+		'incoterm' => 'Incoterm',
+		'intervention' => 'Ficheinter',
+		'intracommreport' => 'Intracommreport',
+		'invoice' => 'Facture',
+		'knowledgemanagement' => 'KnowledgeManagement',
+		'label' => 'Label',
+		'ldap' => 'Ldap',
+		'loan' => 'Loan',
+		'mailing' => 'Mailing',
+		'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+		'mailmanspip' => 'MailmanSpip',
+		'margin' => 'Margin',
+		'member' => 'Adherent',
+		'member_type' => null,  // TODO: External module ?
+		'memcached' => null, // TODO: External module?
+		'modulebuilder' => 'ModuleBuilder',
+		'mrp' => 'Mrp',
+		'multicompany' => null, // Not provided by default, no module tests
+		'multicurrency' => 'MultiCurrency',
+		'mymodule' => null, // modMyModule - Name used in module builder (avoid false positives)
+		'notification' => 'Notification',
+		'numberwords' => null, // Not provided by default, no module tests
+		'TBD_OAUTH' => 'Oauth', // TODO: set proper name
+		'openstreetmap' => null,  // External module?
+		'opensurvey' => 'OpenSurvey',
+		'order' => 'Commande',
+		'partnership' => 'Partnership',
+		'paybox' => 'Paybox',
+		'paymentbybanktransfer' => 'PaymentByBankTransfer',
+		'paypal' => 'Paypal',
+		'paypalplus' => null,
+		'prelevement' => 'Prelevement',
+		'TBD_PRINTING' => 'Printing', // TODO: set proper name
+		'product' => 'Product',
+		'productbatch' => 'ProductBatch',
+		'productprice' => null,
+		'productsupplierprice' => null,
+		'project' => 'Projet',
+		'propal' => 'Propale',
+		'receiptprinter' => 'ReceiptPrinter',
+		'reception' => 'Reception',
+		'recruitment' => 'Recruitment',
+		'resource' => 'Resource',
+		'salaries' => 'Salaries',
+		'service' => 'Service',
+		'socialnetworks' => 'SocialNetworks',
+		'societe' => 'Societe',
+		'stock' => 'Stock',
+		'stocktransfer' => 'StockTransfer',
+		'stripe' => 'Stripe',
+		'supplier_invoice' => null,  // Special case, uses invoice
+		'supplier_order' => null,  // Special case, uses invoice
+		'supplier_proposal' => 'SupplierProposal',
+		'syslog' => 'Syslog',
+		'takepos' => 'TakePos',
+		'tax' => 'Tax',
+		'ticket' => 'Ticket',
+		'user' => 'User',
+		'variants' => 'Variants',
+		'webhook' => 'Webhook',
+		'webportal' => 'WebPortal',
+		'webservices' => 'WebServices',
+		'TBD_WS_CLIENT' => 'WebServicesClient',  // TODO: set proper name
+		'website' => 'Website',
+		'workflow' => 'Workflow',
+		'workstation' => 'Workstation',
+		'zapier' => 'Zapier',
+	);
 }
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 0d36b498c91..2745b875290 100644
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -38,6 +39,8 @@ if (empty($user->id)) {
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Class for PHPUnit tests
  *
@@ -45,45 +48,56 @@ $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ModulesTest extends CommonClassTest
+class ModulesTest extends CommonClassTest // TestCase //CommonClassTest
 {
+	/**
+	 * Return list of modules for which to test initialisation
+	 *
+	 * @return array<array{0:string}> List of module labels to test (class is mod<module_label>)
+	 */
+	public function moduleInitListProvider()
+	{
+		$full_list = self::VALID_MODULE_MAPPING;
+		$filtered_list = array_map(function ($value) {
+			return array($value);
+		}, array_filter($full_list, function ($value) {
+			return $value !== null;
+		}));
+		return $filtered_list;
+	}
+
 	/**
 	 * testModulesInit
 	 *
+	 * @param string	$modlabel	Module label (class is mod<modlabel>)
+	 *
 	 * @return int
+	 *
+	 * @dataProvider moduleInitListProvider
 	 */
-	public function testModulesInit()
+	public function testModulesInit(string $modlabel)
 	{
 		global $conf,$user,$langs,$db;
+
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
-		$modulelist = array('Accounting','Adherent','Agenda','Api','Asset','Banque','Barcode','BlockedLog','Bom','Bookmark',
-		'Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','DataPolicy','Dav','DebugBar','Deplacement','DocumentGeneration','Don','DynamicPrices',
-		'ECM','EmailCollector','EventOrganization','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Intracommreport',
-		'KnowledgeManagement','Label','Ldap','Loan',
-		'Mailing','MailmanSpip','Margin','ModuleBuilder','Mrp','MultiCurrency',
-		'Notification','Oauth','OpenSurvey','Paybox','PaymentByBankTransfer','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale',
-		'ReceiptPrinter','Reception','Recruitment','Resource',
-		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog',
-		'TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow','Workstation','Zapier');
-		foreach ($modulelist as $modlabel) {
-			require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
-			$class = 'mod'.$modlabel;
-			$mod = new $class($db);
+		$this->nbLinesToShow = 0; // Only 3 lines of the log.
 
+		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
+		$class = 'mod'.$modlabel;
+		$mod = new $class($db);
+
+		$result = $mod->remove();
+		$result = $mod->init();
+
+		$this->assertLessThan($result, 0, $modlabel." ".$mod->error);
+		print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
+
+		if (in_array($modlabel, array('Ldap', 'MailmanSpip'))) {
 			$result = $mod->remove();
-			$result = $mod->init();
-
-			$this->assertLessThan($result, 0, $modlabel." ".$mod->error);
-			print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
-
-			if (in_array($modlabel, array('Ldap', 'MailmanSpip'))) {
-				$result = $mod->remove();
-			}
 		}
 
 		return 0;

From 1d66f725f9a2805a4eb3bac62f8c7689b7011ca2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 23 Feb 2024 17:47:27 +0100
Subject: [PATCH 0139/1862] Code

---
 htdocs/core/class/html.formprojet.class.php | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index bb6584ad4ba..0c58136a322 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -130,23 +130,23 @@ class FormProjets extends Form
 	/**
 	 * Returns an array with projects qualified for a third party
 	 *
-	 * @param int 		$socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 * @param int 		$selected Id project preselected
-	 * @param string 	$htmlname Nom de la zone html
-	 * @param int 		$maxlength Maximum length of label
-	 * @param int 		$option_only Return only html options lines without the select tag
+	 * @param int 		$socid 			Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+	 * @param int 		$selected 		Id project preselected
+	 * @param string 	$htmlname 		Name of html component
+	 * @param int 		$maxlength 		Maximum length of label
+	 * @param int 		$option_only 	Return only html options lines without the select tag
 	 * @param int|string	$show_empty Add an empty line
 	 * @param int 		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-	 * @param int 		$forcefocus Force focus on field (works with javascript only)
-	 * @param int 		$disabled Disabled
-	 * @param int 		$mode 0 for HTML mode and 1 for array return (to be used by json_encode for example)
-	 * @param string 	$filterkey Key to filter on title or ref
-	 * @param int 		$nooutput No print output. Return it only.
-	 * @param int 		$forceaddid Force to add project id in list, event if not qualified
-	 * @param int 		$htmlid Html id to use instead of htmlname
-	 * @param string 	$morecss More CSS
-	 * @param string 	$morefilter More filters (Must be a sql sanitized string)
-	 * @return int|string|array                           HTML string or array of option or <0 if KO
+	 * @param int 		$forcefocus 	Force focus on field (works with javascript only)
+	 * @param int 		$disabled 		Disabled
+	 * @param int 		$mode 			0 for HTML mode and 1 for array return (to be used by json_encode for example)
+	 * @param string 	$filterkey 		Key to filter on title or ref
+	 * @param int 		$nooutput 		No print output. Return it only.
+	 * @param int 		$forceaddid 	Force to add project id in list, event if not qualified
+	 * @param int 		$htmlid 		Html id to use instead of htmlname
+	 * @param string 	$morecss 		More CSS
+	 * @param string 	$morefilter 	More filters (Must be a sql sanitized string)
+	 * @return int|string|array         HTML string or array of option or <0 if KO
 	 */
 	public function select_projects_list($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500', $morefilter = '')
 	{

From 23d912decd5afa6c8ea0fee6974c0290033cc2c5 Mon Sep 17 00:00:00 2001
From: Vincent Maury <artec.vm@arnac.net>
Date: Fri, 23 Feb 2024 17:47:55 +0100
Subject: [PATCH 0140/1862] Fix show desactproj in os card (#28039)

When creating or modifying order supplier with complete form, only active projects (if activated) are displayed in select (ajax or not)

But when using the small pencil, desactivated project are displayed
---
 htdocs/fourn/commande/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 398eaaff9c0..cedd378d0f8 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2086,7 +2086,7 @@ if ($action == 'create') {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 1, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);

From a99875524ff5295dc7a222053a7aa2b463654b81 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 23 Feb 2024 20:04:42 +0100
Subject: [PATCH 0141/1862] Fix: Spelling, PHan warnings, preg quoting, array
 size (#28380)

# Fix: Spelling, PHan warnings, preg quoting, array size

Initial reasons:
website.class.php: PhanPluginSuspiciousParamOrder: Suspicious order for arguments named pathofwebsiteold and pathofwebsitenew - These are being passed to parameters #1 (string $srcfile) and #2 (string $destfile) of \dolCopyDir(string $srcfile, string $destfile, string $newmask, int $overwriteifexists, array&lt;string,string&gt; $arrayreplacement = null, int $excludesubdir = 0, string[] $excludefileext = null) defined at htdocs/core/lib/files.lib.php:871
Warning: website.class.php: PhanTypeArraySuspiciousNull: Suspicious array access to $linefound[1] of type null
Warning: website.class.php: PhanTypeArraySuspiciousNull: Suspicious array access to $linefound[1] of type null

Also fixed spelling, added preg_quote, fixed spelling for several comments
and variables
---
 htdocs/website/class/website.class.php | 185 +++++++++++++------------
 1 file changed, 95 insertions(+), 90 deletions(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index f7e5527f160..d7d47bde917 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -726,6 +727,7 @@ class Website extends CommonObject
 		}
 
 		if (!$error) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			dolCopyDir($pathofwebsiteold, $pathofwebsitenew, getDolGlobalString('MAIN_UMASK'), 0, null, 2);
 
 			// Check symlink to medias and restore it if ko
@@ -1460,30 +1462,30 @@ class Website extends CommonObject
 		}
 
 		$arrayofspecialmainlanguages = array(
-			'en'=>'en_US',
-			'sq'=>'sq_AL',
-			'ar'=>'ar_SA',
-			'eu'=>'eu_ES',
-			'bn'=>'bn_DB',
-			'bs'=>'bs_BA',
-			'ca'=>'ca_ES',
-			'zh'=>'zh_CN',
-			'cs'=>'cs_CZ',
-			'da'=>'da_DK',
-			'et'=>'et_EE',
-			'ka'=>'ka_GE',
-			'el'=>'el_GR',
-			'he'=>'he_IL',
-			'kn'=>'kn_IN',
-			'km'=>'km_KH',
-			'ko'=>'ko_KR',
-			'lo'=>'lo_LA',
-			'nb'=>'nb_NO',
-			'fa'=>'fa_IR',
-			'sr'=>'sr_RS',
-			'sl'=>'sl_SI',
-			'uk'=>'uk_UA',
-			'vi'=>'vi_VN'
+			'en' => 'en_US',
+			'sq' => 'sq_AL',
+			'ar' => 'ar_SA',
+			'eu' => 'eu_ES',
+			'bn' => 'bn_DB',
+			'bs' => 'bs_BA',
+			'ca' => 'ca_ES',
+			'zh' => 'zh_CN',
+			'cs' => 'cs_CZ',
+			'da' => 'da_DK',
+			'et' => 'et_EE',
+			'ka' => 'ka_GE',
+			'el' => 'el_GR',
+			'he' => 'he_IL',
+			'kn' => 'kn_IN',
+			'km' => 'km_KH',
+			'ko' => 'ko_KR',
+			'lo' => 'lo_LA',
+			'nb' => 'nb_NO',
+			'fa' => 'fa_IR',
+			'sr' => 'sr_RS',
+			'sl' => 'sl_SI',
+			'uk' => 'uk_UA',
+			'vi' => 'vi_VN'
 		);
 
 		// Load tmppage if we have $websitepagefile defined
@@ -1731,19 +1733,19 @@ class Website extends CommonObject
 									if (!touch($destdir.'/containers/'."page" . $nextpage . ".tpl.php")) {
 										setEventMessages("Please check permission to create  <b>page" . $nextpage . ".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
 									}
-									$fileFounded = '';
+									$filesFound = '';
 									foreach ($arraySourcedir as $file) {
 										if ($file['name'] == $nomFichierModifie) {
 											$fileContent = file_get_contents($file['fullname']);
 											$matches = array();
 											if (preg_match("/page\d+\.tpl\.php/", $fileContent, $matches)) {
-												$fileFounded = $matches[0];
+												$filesFound = $matches[0];
 												break;
 											}
 										}
 									}
 									foreach ($arraySourcedir as $file) {
-										if ($file['name'] == $fileFounded) {
+										if ($file['name'] == $filesFound) {
 											if (!is_writable($file['fullname'])) {
 												dolChmod($file['fullname'], '0664');
 											}
@@ -1948,7 +1950,7 @@ class Website extends CommonObject
 		$fichierWithNoPage = [];
 		$fichierWithNoPageInDest = [];
 
-		//  filter files source
+		// Filter source files
 		foreach (dol_dir_list($dossierSource, "files") as $file) {
 			if (preg_match('/^page\d+/', $file['name']) && !str_contains($file['name'], '.old')) {
 				$fichiersSource[] = $file;
@@ -1957,7 +1959,7 @@ class Website extends CommonObject
 			}
 		}
 
-		//  filter files destination
+		// Filter destination files
 		foreach (dol_dir_list($dossierDestination, "all", 1) as $file) {
 			if (preg_match('/^page\d+/', $file['name']) && !str_contains($file['name'], '.old')) {
 				$fichiersDestination[] = $file;
@@ -1976,29 +1978,29 @@ class Website extends CommonObject
 		}
 
 		//search numPage where was declared
-		$fileFounded = array();
+		$filesFound = array();
 		foreach ($fichierWithNoPage as $filesource) {
 			$fileContent = file_get_contents($filesource['fullname']);
 			if (strpos($fileContent, "require './page".$numOfPageSource.".tpl.php'") !== false) {
-				$fileFounded = $filesource;
+				$filesFound = $filesource;
 				break;
 			}
 		}
 		// find file with same name and extract num page in destination folder
-		$numPageFounded = '';
+		$numPagesFound = '';
 		foreach ($fichierWithNoPageInDest as $filedest) {
-			if ($filedest['name'] === $fileFounded['name']) {
+			if ($filedest['name'] === $filesFound['name']) {
 				$fileContent = file_get_contents($filedest['fullname']);
 				if (preg_match("/page\d+\.tpl\.php/", $fileContent, $matches)) {
-					$numPageFounded = $matches[0];
+					$numPagesFound = $matches[0];
 					break;
 				}
 			}
 		}
-		//search file with the number of page founded
+		//search file with the number of pages found
 		$fileNeeded = array();
 		foreach ($fichiersDestination as $index => $file) {
-			if ($file['name'] == $numPageFounded) {
+			if ($file['name'] == $numPagesFound) {
 				$fileNeeded = $file;
 				break;
 			}
@@ -2019,7 +2021,7 @@ class Website extends CommonObject
 	}
 
 	/**
-	 * remove espace in string
+	 * Remove spaces in string
 	 * @param   string   $str    string
 	 * @return string
 	 */
@@ -2033,7 +2035,7 @@ class Website extends CommonObject
 	/**
 	 * show difference between to string
 	 * @param string  $str1   first string
-	 * @param string  $str2   seconde string
+	 * @param string  $str2   second string
 	 * @param array  $exceptNumPge    num of page files we don't want to change
 	 * @return array|int      -1 if KO, array if OK
 	 */
@@ -2046,70 +2048,73 @@ class Website extends CommonObject
 		$lines1 = explode("\n", $str1);
 		$lines2 = explode("\n", $str2);
 
-		$linesShouldnChange = array();
-		$linesShouldnNotChange = array();
+		$linesShouldChange = array();
+		$linesShouldNotChange = array();
 		$linefound = array();
 		$countNumPage = count($exceptNumPge);
 
-		for ($i = 0;$i< $countNumPage; $i++) {
+		for ($i = 0;$i < $countNumPage; $i++) {
+			$linefound[$i] = array();
 			$linefound[$i]['meta'] = '/content="' . preg_quote($exceptNumPge[$i], '/') . '" \/>/';
 			$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/';
 		}
 
-		$maxLines = max(count($lines1), count($lines2));
-		for ($lineNum = 0; $lineNum < $maxLines; $lineNum++) {
-			$lineContent1 = $lines1[$lineNum] ?? '';
-			$lineContent2 = $lines2[$lineNum] ?? '';
-			if (preg_match($linefound[0]['output'], $lineContent1)) {
-				$linesShouldnChange[] = $lineContent1;
-			}
-			if (preg_match($linefound[0]['meta'], $lineContent1)) {
-				$linesShouldnChange[] = $lineContent1;
-			}
-			if (preg_match($linefound[1]['output'], $lineContent2)) {
-				$linesShouldnNotChange[] = $lineContent2;
-			}
-			if (preg_match($linefound[1]['meta'], $lineContent2)) {
-				$linesShouldnNotChange[] = $lineContent2;
-			}
-			if ($lineContent1 !== $lineContent2) {
-				if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
-					// Ligne deleted de la source
-					$diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
-				} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
-					// Nouvelle ligne added dans la destination
-					$diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
-				} else {
-					// Différence found it
-					$diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
+		if ($countNumPage >= 2) {
+			$maxLines = max(count($lines1), count($lines2));
+			for ($lineNum = 0; $lineNum < $maxLines; $lineNum++) {
+				$lineContent1 = $lines1[$lineNum] ?? '';
+				$lineContent2 = $lines2[$lineNum] ?? '';
+				if (preg_match($linefound[0]['output'], $lineContent1)) {
+					$linesShouldChange[] = $lineContent1;
+				}
+				if (preg_match($linefound[0]['meta'], $lineContent1)) {
+					$linesShouldChange[] = $lineContent1;
+				}
+				if (preg_match($linefound[1]['output'], $lineContent2)) {
+					$linesShouldNotChange[] = $lineContent2;
+				}
+				if (preg_match($linefound[1]['meta'], $lineContent2)) {
+					$linesShouldNotChange[] = $lineContent2;
+				}
+				if ($lineContent1 !== $lineContent2) {
+					if (isset($lines1[$lineNum]) && !isset($lines2[$lineNum])) {
+						// Ligne deleted de la source
+						$diff["Supprimée à la ligne " . ($lineNum + 1)] = $lineContent1;
+					} elseif (!isset($lines1[$lineNum]) && isset($lines2[$lineNum])) {
+						// Nouvelle ligne added dans la destination
+						$diff["Ajoutée à la ligne " . ($lineNum + 1)] = $lineContent2;
+					} else {
+						// Différence found it
+						$diff["Modifiée à la ligne " . ($lineNum + 1)] = $lineContent2;
+					}
 				}
 			}
 		}
 
 
-		if (empty($linesShouldnChange)) {
-			$linesShouldnChange[0] = '<meta name="dolibarr:pageid" content="'.$exceptNumPge[0].'" />';
-			$linesShouldnChange[1] = '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$exceptNumPge[0].');';
+		if (empty($linesShouldChange)) {
+			$linesShouldChange[0] = '<meta name="dolibarr:pageid" content="'.$exceptNumPge[0].'" />';
+			$linesShouldChange[1] = '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$exceptNumPge[0].');';
 		}
 
-		$pairesRemplacement = array();
-		if (!empty($linesShouldnNotChange)) {
-			$i =0;
-			foreach ($linesShouldnNotChange as $numLigne => $ligneRemplacement) {
-				if (isset($linesShouldnChange[$numLigne])) {
-					$pairesRemplacement[$ligneRemplacement] = $linesShouldnChange[$numLigne];
+		$replacementMapping = array();
+		if (!empty($linesShouldNotChange)) {
+			$i = 0;
+			foreach ($linesShouldNotChange as $numLigne => $ligneRemplacement) {
+				if (isset($linesShouldChange[$numLigne])) {
+					$replacementMapping[$ligneRemplacement] = $linesShouldChange[$numLigne];
 				} else {
-					$pairesRemplacement[$ligneRemplacement] = $linesShouldnChange[$i];
+					$replacementMapping[$ligneRemplacement] = $linesShouldChange[$i];
 				}
 				$i++;
 			}
-			$diff['lignes_dont_change'] = $pairesRemplacement;
+			$diff['lignes_dont_change'] = $replacementMapping;
 		}
-		// search path of image and replace it with the correcte path
-		$pattern = '/medias\/image\/'.$this->ref.'\/([^\'"\s]+)/';
+		// search path of image and replace it with the correct path
+		$pattern = '/medias\/image\/'.preg_quote($this->ref, '/').'\/([^\'"\s]+)/';
 
 		foreach ($diff as $key => $value) {
-			// Assurez-vous que la valeur est une chaîne
+			// Ensure the value is a string
 			if (is_string($value)) {
 				if (preg_match($pattern, $value)) {
 					$newValue = preg_replace($pattern, 'medias/image/'.$this->name_template.'/$1', $value);
@@ -2121,23 +2126,23 @@ class Website extends CommonObject
 	}
 
 	/**
-	 * Replace line by line in file using num of line
+	 * Replace line by line in file using numbers of the lines
 	 *
-	 * @param 	string 		$desfFile   	path of file dest
+	 * @param 	string 		$inplaceFile	path of file to modify in place
 	 * @param 	array 		$differences 	array of differences between files
 	 * @return 	int  						Return 0 if we can replace, <0 if not (-2=not writable)
 	 */
-	protected function replaceLineUsingNum($desfFile, $differences)
+	protected function replaceLineUsingNum($inplaceFile, $differences)
 	{
-		if (file_exists($desfFile)) {
-			dolChmod($desfFile, '0664');
+		if (file_exists($inplaceFile)) {
+			dolChmod($inplaceFile, '0664');
 		}
-		if (!is_writable($desfFile)) {
+		if (!is_writable($inplaceFile)) {
 			return -2;
 		}
 
 		unset($differences['file_destination']);
-		$contentDest = file($desfFile, FILE_IGNORE_NEW_LINES);
+		$contentDest = file($inplaceFile, FILE_IGNORE_NEW_LINES);
 		foreach ($differences as $key => $ligneSource) {
 			$matches = array();
 			if (preg_match('/(Ajoutée|Modifiée) à la ligne (\d+)/', $key, $matches)) {
@@ -2157,10 +2162,10 @@ class Website extends CommonObject
 		// Reindex the table keys
 		$contentDest = array_values($contentDest);
 		$stringreplacement = implode("\n", $contentDest);
-		file_put_contents($desfFile, $stringreplacement);
+		file_put_contents($inplaceFile, $stringreplacement);
 		foreach ($differences['lignes_dont_change'] as $linechanged => $line) {
 			if (in_array($linechanged, $contentDest)) {
-				dolReplaceInFile($desfFile, array($linechanged => $line));
+				dolReplaceInFile($inplaceFile, array($linechanged => $line));
 			}
 		}
 

From 6115d58f47109dbbe27a62f82a4de72f4c6d1b10 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 23 Feb 2024 20:05:29 +0100
Subject: [PATCH 0142/1862] Qual: Optimize workflow (#28386)

# Qual: Optimize workflow

The log annotation based on the pre-commit logs is now simplified.
---
 .github/logToCs.py               | 588 -------------------------------
 .github/workflows/pre-commit.yml |  18 +-
 2 files changed, 5 insertions(+), 601 deletions(-)
 delete mode 100755 .github/logToCs.py

diff --git a/.github/logToCs.py b/.github/logToCs.py
deleted file mode 100755
index 7befd310a0a..00000000000
--- a/.github/logToCs.py
+++ /dev/null
@@ -1,588 +0,0 @@
-#!/usr/bin/env python3
-# pylint: disable=invalid-name
-"""
-Convert a log to CheckStyle format.
-
-Url: https://github.com/mdeweerd/LogToCheckStyle
-
-The log can then be used for generating annotations in a github action.
-
-Note: this script is very young and "quick and dirty".
-      Patterns can be added to "PATTERNS" to match more messages.
-
-# Examples
-
-Assumes that logToCs.py is available as .github/logToCs.py.
-
-## Example 1:
-
-
-```yaml
-      - run: |
-          pre-commit run -all-files | tee pre-commit.log
-          .github/logToCs.py pre-commit.log pre-commit.xml
-      - uses: staabm/annotate-pull-request-from-checkstyle-action@v1
-        with:
-          files: pre-commit.xml
-          notices-as-warnings: true # optional
-```
-
-## Example 2:
-
-
-```yaml
-      - run: |
-          pre-commit run --all-files | tee pre-commit.log
-      - name: Add results to PR
-        if: ${{ always() }}
-        run: |
-          .github/logToCs.py pre-commit.log | cs2pr
-```
-
-Author(s):
-  - https://github.com/mdeweerd
-
-License: MIT License
-
-"""
-
-import argparse
-import datetime as dt
-import json
-import os
-import re
-import sys
-import xml.etree.ElementTree as ET  # nosec
-
-
-def remove_prefix(string, prefix):
-    """
-    Remove prefix from string
-
-    Provided for backward compatibility.
-    """
-    if prefix and string.startswith(prefix):
-        return string[len(prefix) :]
-    return string
-
-
-def convert_notices_to_checkstyle(notices, root_path=None):
-    """
-    Convert annotation list to CheckStyle xml string
-    """
-    root = ET.Element("checkstyle")
-    for fields in notices:
-        add_error_entry(root, **fields, root_path=root_path)
-    return ET.tostring(root, encoding="utf_8").decode("utf_8")
-
-
-def convert_lines_to_notices(lines):
-    """
-    Convert provided message to CheckStyle format.
-    """
-    notices = []
-    for line in lines:
-        fields = parse_message(line)
-        if fields:
-            notices.append(fields)
-    return notices
-
-
-def convert_text_to_notices(text):
-    """
-    Convert provided message to CheckStyle format.
-    """
-    return parse_file(text)
-
-
-# Initial version for Checkrun from:
-# https://github.com/tayfun/flake8-your-pr/blob/50a175cde4dd26a656734c5b64ba1e5bb27151cb/src/main.py#L7C1-L123C36
-# MIT Licence
-class CheckRun:
-    """
-    Represents the check run
-    """
-
-    GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN", None)
-    GITHUB_EVENT_PATH = os.environ.get("GITHUB_EVENT_PATH", None)
-
-    URI = "https://api.github.com"
-    API_VERSION = "2022-11-28"
-    ACCEPT_HEADER_VALUE = "application/vnd.github+json"
-    AUTH_HEADER_VALUE = f"Bearer {GITHUB_TOKEN}"
-    # This is the max annotations Github API accepts in one go.
-    MAX_ANNOTATIONS = 50
-
-    def __init__(self):
-        """
-        Initialise Check Run object with information from checkrun
-        """
-        self.read_event_file()
-        self.read_meta_data()
-
-    def read_event_file(self):
-        """
-        Read the event file to get the event information later.
-        """
-        if self.GITHUB_EVENT_PATH is None:
-            raise ValueError("Not running in github workflow")
-        with open(self.GITHUB_EVENT_PATH, encoding="utf_8") as event_file:
-            self.event = json.loads(event_file.read())
-
-    def read_meta_data(self):
-        """
-        Get meta data from event information
-        """
-        self.repo_full_name = self.event["repository"]["full_name"]
-        pull_request = self.event.get("pull_request")
-        print("%r", self.event)
-        if pull_request:
-            self.head_sha = pull_request["head"]["sha"]
-        else:
-            print("%r", self.event)
-            check_suite = self.event.get("check_suite", None)
-            if check_suite is not None:
-                self.head_sha = check_suite["pull_requests"][0]["base"]["sha"]
-            else:
-                self.head_sha = None  # Can't annotate?
-
-    def submit(  # pylint: disable=too-many-arguments
-        self,
-        notices,
-        title=None,
-        summary=None,
-        text=None,
-        conclusion=None,
-    ):
-        """
-        Submit annotations to github
-
-        See:
-        https://docs.github.com/en/rest/checks/runs?apiVersion=2022-11-28
-              #update-a-check-run
-
-        :param conclusion: success, failure
-        """
-        # pylint: disable=import-outside-toplevel
-        import requests  # Import here to not impose presence of module
-
-        if self.head_sha is None:
-            return
-
-        output = {
-            "annotations": notices[: CheckRun.MAX_ANNOTATIONS],
-        }
-        if title is not None:
-            output["title"] = title
-        if summary is not None:
-            output["summary"] = summary
-        if text is not None:
-            output["text"] = text
-        if conclusion is None:
-            # action_required, cancelled, failure, neutral, success
-            # skipped, stale, timed_out
-            if bool(notices):
-                conclusion = "failure"
-            else:
-                conclusion = "success"
-
-        payload = {
-            "name": "log-to-pr-annotation",
-            "head_sha": self.head_sha,
-            "status": "completed",  # queued, in_progress, completed
-            "conclusion": conclusion,
-            # "started_at": dt.datetime.now(dt.timezone.utc).isoformat(),
-            "completed_at": dt.datetime.now(dt.timezone.utc).isoformat(),
-            "output": output,
-        }
-
-        # Create the check-run
-        response = requests.post(
-            f"{self.URI}/repos/{self.repo_full_name}/check-runs",
-            headers={
-                "Accept": self.ACCEPT_HEADER_VALUE,
-                "Authorization": self.AUTH_HEADER_VALUE,
-                "X-GitHub-Api-Version": self.API_VERSION,
-            },
-            json=payload,
-            timeout=30,
-        )
-        print(response.content)
-        response.raise_for_status()
-
-
-ANY_REGEX = r".*?"
-FILE_REGEX = r"\s*(?P<file_name>\S.*?)\s*?"
-FILEGROUP_REGEX = r"\s*(?P<file_group>\S.*?)\s*?"
-EOL_REGEX = r"[\r\n]"
-LINE_REGEX = r"\s*(?P<line>\d+?)\s*?"
-COLUMN_REGEX = r"\s*(?P<column>\d+?)\s*?"
-SEVERITY_REGEX = r"\s*(?P<severity>error|warning|notice|style|info)\s*?"
-MSG_REGEX = r"\s*(?P<message>.+?)\s*?"
-MULTILINE_MSG_REGEX = r"\s*(?P<message>(?:.|.[\r\n])+)"
-# cpplint confidence index
-CONFIDENCE_REGEX = r"\s*\[(?P<confidence>\d+)\]\s*?"
-
-
-# List of message patterns, add more specific patterns earlier in the list
-# Creating patterns by using constants makes them easier to define and read.
-PATTERNS = [
-    # beautysh
-    #  File ftp.sh: error: "esac" before "case" in line 90.
-    re.compile(
-        f"^File {FILE_REGEX}:{SEVERITY_REGEX}:"
-        f" {MSG_REGEX} in line {LINE_REGEX}.$"
-    ),
-    # beautysh
-    #  File socks4echo.sh: error: indent/outdent mismatch: -2.
-    re.compile(f"^File {FILE_REGEX}:{SEVERITY_REGEX}: {MSG_REGEX}$"),
-    # yamllint
-    # ##[group].pre-commit-config.yaml
-    # ##[error]97:14 [trailing-spaces] trailing spaces
-    # ##[endgroup]
-    re.compile(rf"^##\[group\]{FILEGROUP_REGEX}$"),  # Start file group
-    re.compile(
-        rf"^##\[{SEVERITY_REGEX}\]{LINE_REGEX}:{COLUMN_REGEX}{MSG_REGEX}$"
-    ),  # Msg
-    re.compile(r"^##(?P<file_endgroup>\[endgroup\])$"),  # End file group
-    #  File socks4echo.sh: error: indent/outdent mismatch: -2.
-    re.compile(f"^File {FILE_REGEX}:{SEVERITY_REGEX}: {MSG_REGEX}$"),
-    # Emacs style
-    #  path/to/file:845:5: error - Expected 1 space after closing brace
-    re.compile(
-        rf"^{FILE_REGEX}:{LINE_REGEX}:{COLUMN_REGEX}:{SEVERITY_REGEX}"
-        rf"-?\s{MSG_REGEX}$"
-    ),
-    # ESLint (JavaScript Linter), RoboCop, shellcheck
-    #  path/to/file.js:10:2: Some linting issue
-    #  path/to/file.rb:10:5: Style/Indentation: Incorrect indentation detected
-    #  path/to/script.sh:10:1: SC2034: Some shell script issue
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{COLUMN_REGEX}: {MSG_REGEX}$"),
-    # Cpplint default output:
-    #           '%s:%s:  %s  [%s] [%d]\n'
-    #   % (filename, linenum, message, category, confidence)
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{MSG_REGEX}{CONFIDENCE_REGEX}$"),
-    # MSVC
-    # file.cpp(10): error C1234: Some error message
-    re.compile(
-        f"^{FILE_REGEX}\\({LINE_REGEX}\\):{SEVERITY_REGEX}{MSG_REGEX}$"
-    ),
-    # Java compiler
-    # File.java:10: error: Some error message
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{SEVERITY_REGEX}:{MSG_REGEX}$"),
-    # Python
-    # File ".../logToCs.py", line 90 (note: code line follows)
-    re.compile(f'^File "{FILE_REGEX}", line {LINE_REGEX}$'),
-    # Pylint, others
-    # path/to/file.py:10: [C0111] Missing docstring
-    # others
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}: {MSG_REGEX}$"),
-    # Shellcheck:
-    # In script.sh line 76:
-    re.compile(
-        f"^In {FILE_REGEX} line {LINE_REGEX}:{EOL_REGEX}?"
-        f"({MULTILINE_MSG_REGEX})?{EOL_REGEX}{EOL_REGEX}"
-    ),
-    # eslint:
-    #  /path/to/filename
-    #    14:5  error  Unexpected trailing comma  comma-dangle
-    re.compile(
-        f"^{FILE_REGEX}{EOL_REGEX}"
-        rf"\s+{LINE_REGEX}:{COLUMN_REGEX}\s+{SEVERITY_REGEX}\s+{MSG_REGEX}$"
-    ),
-]
-
-# Exceptionnaly some regexes match messages that are not error.
-# This pattern matches those exceptions
-EXCLUDE_MSG_PATTERN = re.compile(
-    r"^("
-    r"Placeholder pattern"  # To remove on first message pattern
-    r")"
-)
-
-# Exceptionnaly some regexes match messages that are not error.
-# This pattern matches those exceptions
-EXCLUDE_FILE_PATTERN = re.compile(
-    r"^("
-    # Codespell:  (appears as a file name):
-    r"Used config files\b"
-    r")"
-)
-
-# Severities available in CodeSniffer report format
-SEVERITY_NOTICE = "notice"
-SEVERITY_WARNING = "warning"
-SEVERITY_ERROR = "error"
-
-
-def strip_ansi(text: str):
-    """
-    Strip ANSI escape sequences from string (colors, etc)
-    """
-    return re.sub(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", "", text)
-
-
-def parse_file(text):
-    """
-    Parse all messages in a file
-
-    Returns the fields in a dict.
-    """
-    # pylint: disable=too-many-branches,too-many-statements
-    # regex required to allow same group names
-    try:
-        import regex  # pylint: disable=import-outside-toplevel
-    except ImportError as exc:
-        raise ImportError(
-            "The 'parsefile' method requires 'python -m pip install regex'"
-        ) from exc
-
-    patterns = [pattern.pattern for pattern in PATTERNS]
-    # patterns = [PATTERNS[0].pattern]
-
-    file_group = None  # The file name for the group (if any)
-    full_regex = "(?:(?:" + (")|(?:".join(patterns)) + "))"
-    results = []
-
-    for fields in regex.finditer(
-        full_regex, strip_ansi(text), regex.MULTILINE | regex.IGNORECASE
-    ):
-        if not fields:
-            continue
-        result = fields.groupdict()
-
-        if len(result) == 0:
-            continue
-
-        severity = result.get("severity", None)
-        file_name = result.get("file_name", None)
-        confidence = result.pop("confidence", None)
-        new_file_group = result.pop("file_group", None)
-        file_endgroup = result.pop("file_endgroup", None)
-        message = result.get("message", None)
-
-        if new_file_group is not None:
-            # Start of file_group, just store file
-            file_group = new_file_group
-            continue
-
-        if file_endgroup is not None:
-            file_group = None
-            continue
-
-        if file_name is None:
-            if file_group is not None:
-                file_name = file_group
-                result["file_name"] = file_name
-            else:
-                # No filename, skip
-                continue
-        else:
-            if EXCLUDE_FILE_PATTERN.search(file_name):
-                # This file_name is excluded
-                continue
-
-        if message is not None:
-            if EXCLUDE_MSG_PATTERN.search(message):
-                # This message is excluded
-                continue
-
-        if confidence is not None:
-            # Convert confidence level of cpplint
-            # to warning, etc.
-            confidence = int(confidence)
-
-            if confidence <= 1:
-                severity = SEVERITY_NOTICE
-            elif confidence >= 5:
-                severity = SEVERITY_ERROR
-            else:
-                severity = SEVERITY_WARNING
-
-        if severity is None:
-            severity = SEVERITY_ERROR
-        else:
-            severity = severity.lower()
-
-        if severity in ["info", "style"]:
-            severity = SEVERITY_NOTICE
-
-        result["severity"] = severity
-
-        results.append(result)
-
-    return results
-
-
-def parse_message(message):
-    """
-    Parse message until it matches a pattern.
-
-    Returns the fields in a dict.
-    """
-    for pattern in PATTERNS:
-        fields = pattern.match(message, re.IGNORECASE)
-        if not fields:
-            continue
-        result = fields.groupdict()
-        if len(result) == 0:
-            continue
-
-        if "confidence" in result:
-            # Convert confidence level of cpplint
-            # to warning, etc.
-            confidence = int(result["confidence"])
-            del result["confidence"]
-
-            if confidence <= 1:
-                severity = SEVERITY_NOTICE
-            elif confidence >= 5:
-                severity = SEVERITY_ERROR
-            else:
-                severity = SEVERITY_WARNING
-            result["severity"] = severity
-
-        if "severity" not in result:
-            result["severity"] = SEVERITY_ERROR
-        else:
-            result["severity"] = result["severity"].lower()
-
-        if result["severity"] in ["info", "style"]:
-            result["severity"] = SEVERITY_NOTICE
-
-        return result
-
-    # Nothing matched
-    return None
-
-
-def add_error_entry(  # pylint: disable=too-many-arguments
-    root,
-    severity,
-    file_name,
-    line=None,
-    column=None,
-    message=None,
-    source=None,
-    root_path=None,
-):
-    """
-    Add error information to the CheckStyle output being created.
-    """
-    file_element = find_or_create_file_element(
-        root, file_name, root_path=root_path
-    )
-    error_element = ET.SubElement(file_element, "error")
-    error_element.set("severity", severity)
-    if line:
-        error_element.set("line", line)
-    if column:
-        error_element.set("column", column)
-    if message:
-        error_element.set("message", message)
-    if source:
-        # To verify if this is a valid attribute
-        error_element.set("source", source)
-
-
-def find_or_create_file_element(root, file_name: str, root_path=None):
-    """
-    Find/create file element in XML document tree.
-    """
-
-    if root_path is not None:
-        file_name = remove_prefix(file_name, root_path)
-    for file_element in root.findall("file"):
-        if file_element.get("name") == file_name:
-            return file_element
-    file_element = ET.SubElement(root, "file")
-    file_element.set("name", file_name)
-    return file_element
-
-
-def main():
-    """
-    Parse the script arguments and get the conversion done.
-    """
-    parser = argparse.ArgumentParser(
-        description="Convert messages to Checkstyle XML format."
-    )
-    parser.add_argument(
-        "input", help="Input file. Use '-' for stdin.", nargs="?", default="-"
-    )
-    parser.add_argument(
-        "output",
-        help="Output file. Use '-' for stdout.",
-        nargs="?",
-        default="-",
-    )
-    parser.add_argument(
-        "-i",
-        "--in",
-        dest="input_named",
-        help="Input filename. Overrides positional input.",
-    )
-    parser.add_argument(
-        "-o",
-        "--out",
-        dest="output_named",
-        help="Output filename. Overrides positional output.",
-    )
-    parser.add_argument(
-        "--root",
-        metavar="ROOT_PATH",
-        help="Root directory to remove from file paths."
-        "  Defaults to working directory.",
-        default=os.getcwd(),
-    )
-    parser.add_argument(
-        "--github-annotate",
-        action=argparse.BooleanOptionalAction,
-        help="Annotate when in Github workflow.",
-        # Currently disabled,
-        #  Future: (os.environ.get("GITHUB_EVENT_PATH", None) is not None),
-        default=False,
-    )
-
-    args = parser.parse_args()
-
-    if args.input == "-" and args.input_named:
-        with open(
-            args.input_named, encoding="utf_8", errors="surrogateescape"
-        ) as input_file:
-            text = input_file.read()
-    elif args.input != "-":
-        with open(
-            args.input, encoding="utf_8", errors="surrogateescape"
-        ) as input_file:
-            text = input_file.read()
-    else:
-        text = sys.stdin.read()
-
-    root_path = os.path.join(args.root, "")
-
-    try:
-        notices = convert_text_to_notices(text)
-    except ImportError:
-        notices = convert_lines_to_notices(re.split(r"[\r\n]+", text))
-
-    checkstyle_xml = convert_notices_to_checkstyle(
-        notices, root_path=root_path
-    )
-
-    if args.output == "-" and args.output_named:
-        with open(args.output_named, "w", encoding="utf_8") as output_file:
-            output_file.write(checkstyle_xml)
-    elif args.output != "-":
-        with open(args.output, "w", encoding="utf_8") as output_file:
-            output_file.write(checkstyle_xml)
-    else:
-        print(checkstyle_xml)
-
-    if args.github_annotate:
-        checkrun = CheckRun()
-        checkrun.submit(notices)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9127b43c005..384ef39880e 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -7,7 +7,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     env:
-      LOG_TO_CS: .github/logToCs.py
       RAW_LOG: pre-commit.log
       CS_XML: pre-commit.xml
     steps:
@@ -38,7 +37,7 @@ jobs:
         with:
           cache: pip
           python-version: "3.11"
-      - run: python -m pip install pre-commit regex
+      - run: python -m pip install pre-commit
       # Restore previous cache of precommit
       - uses: actions/cache/restore@v4
         with:
@@ -103,19 +102,12 @@ jobs:
           pre-commit run --hook-stage manual -a php-cs-with-cache | tee -a ${RAW_LOG}
           ls -l ~/.cache/pre-commit/
 
-      # If error, we convert log in the checkstyle format
-      - name: Convert Raw Log to CheckStyle format
-        if: ${{ failure() }}
-        run: |
-          python ${LOG_TO_CS} ${RAW_LOG} ${CS_XML}
-      # Annotate the git sources with the log messages
-      - name: Annotate Source Code with Messages
-        uses: staabm/annotate-pull-request-from-checkstyle-action@v1
+      - name: Convert Raw Log to Annotations
+        uses: mdeweerd/logToCheckStyle@v2024.2.9
         if: ${{ failure() }}
         with:
-          files: ${{ env.CS_XML }}
-          notices-as-warnings: true # optional
-          prepend-filename: true # optional
+          in: ${{ env.RAW_LOG }}
+
       # Save the precommit cache
       - uses: actions/cache/save@v4
         if: ${{ ! cancelled() }}

From 02180e45cdf334def4d6f9806f28bc6e25662a9d Mon Sep 17 00:00:00 2001
From: Yoan Mollard <ymollard@users.noreply.github.com>
Date: Sat, 24 Feb 2024 12:45:37 +0100
Subject: [PATCH 0143/1862] NEW Allow to set a default project for POS sales
 (#27042)

* Allow to set a default project for POS sales

* Fixed: Expected 1 space(s) after cast statement

* (int) getDolGlobalString() -> getDolGlobalInt()

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/langs/en_US/admin.lang     |  1 +
 htdocs/takepos/admin/terminal.php | 13 ++++++++++++-
 htdocs/takepos/invoice.php        | 10 ++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 921f827ca75..6182aa8f97b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1883,6 +1883,7 @@ CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when mak
 CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
 CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
 CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskDefaultProject=Assign all future sales to this project
 ##### 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.
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index fc57e9f0600..d62267f353f 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -75,7 +75,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	$res = dolibarr_set_const($db, "TAKEPOS_TERMINAL_NAME_".$terminaltouse, (!empty(GETPOST('terminalname'.$terminaltouse, 'restricthtml')) ? GETPOST('terminalname'.$terminaltouse, 'restricthtml') : $langs->trans("TerminalName", $terminaltouse)), 'chaine', 0, '', $conf->entity);
 
 	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY".$terminaltouse, (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
-
+	$res = dolibarr_set_const($db, "CASHDESK_ID_PROJECT".$terminaltouse, (GETPOST('projectid', 'int') > 0 ? GETPOST('projectid', 'int') : ''), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
@@ -157,6 +157,17 @@ print '<td>';
 print '<input type="text" name="terminalname'.$terminal.'" value="'.getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$terminal, $langs->trans("TerminalName", $terminal)).'" >';
 print '</td></tr>';
 
+if (isModEnabled('project')) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	$formproject = new FormProjets($db);
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDefaultProject").'</td><td>';
+	print img_picto('', 'project', 'class="pictofixedwidth"');
+	// select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '', $morefilter = '')
+	$projectid = getDolGlobalInt('CASHDESK_ID_PROJECT'.$terminaltouse);
+	print $formproject->select_projects(-1, $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 1, 'maxwidth500 widthcentpercentminusxx');
+	print '</td></tr>';
+}
+
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td>';
 print img_picto('', 'company', 'class="pictofixedwidth"');
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 5a0e1dce822..7751f38f271 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -81,6 +81,7 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la
 	}
 }
 
+$takeposterminal = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
 
 /**
  * Abort invoice creation with a given error message
@@ -135,13 +136,13 @@ $invoice = new Facture($db);
 if ($invoiceid > 0) {
 	$ret = $invoice->fetch($invoiceid);
 } else {
-	$ret = $invoice->fetch('', '(PROV-POS'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '') .'-'.$place.')');
+	$ret = $invoice->fetch('', '(PROV-POS'.$takeposterminal.'-'.$place.')');
 }
 if ($ret > 0) {
 	$placeid = $invoice->id;
 }
 
-$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$takeposterminal;
 
 $soc = new Societe($db);
 if ($invoice->socid > 0) {
@@ -150,6 +151,11 @@ if ($invoice->socid > 0) {
 	$soc->fetch(getDolGlobalString($constforcompanyid));
 }
 
+// Assign a default project, if relevant
+if (isModEnabled('project') && getDolGlobalInt("CASHDESK_ID_PROJECT".$takeposterminal)) {
+	$invoice->fk_project = getDolGlobalInt("CASHDESK_ID_PROJECT".$takeposterminal);
+}
+
 // Change the currency of invoice if it was modified
 if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"])) {
 	if ($invoice->multicurrency_code != $_SESSION["takeposcustomercurrency"]) {

From a0e6e0fac7d684b8ea9fbd3cc343eace21f97b43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 13:03:03 +0100
Subject: [PATCH 0144/1862] Fix avoid loosing setup of terminal when setting
 some option

---
 htdocs/takepos/admin/terminal.php | 79 ++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 22 deletions(-)

diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index d62267f353f..b23c851de58 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -74,15 +74,24 @@ if (GETPOST('action', 'alpha') == 'set') {
 
 	$res = dolibarr_set_const($db, "TAKEPOS_TERMINAL_NAME_".$terminaltouse, (!empty(GETPOST('terminalname'.$terminaltouse, 'restricthtml')) ? GETPOST('terminalname'.$terminaltouse, 'restricthtml') : $langs->trans("TerminalName", $terminaltouse)), 'chaine', 0, '', $conf->entity);
 
-	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY".$terminaltouse, (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_PROJECT".$terminaltouse, (GETPOST('projectid', 'int') > 0 ? GETPOST('projectid', 'int') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	if (isModEnabled('stripe') && getDolGlobalString('STRIPE_CARD_PRESENT')) {
+	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY".$terminaltouse, (GETPOSTINT('socid') > 0 ? GETPOSTINT('socid') : ''), 'chaine', 0, '', $conf->entity);
+
+	if (GETPOSTISSET('projectid')) {
+		$res = dolibarr_set_const($db, "CASHDESK_ID_PROJECT".$terminaltouse, (GETPOSTINT('projectid') > 0 ? GETPOSTINT('projectid') : ''), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse)) {
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$terminaltouse, GETPOST('CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
-	if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
+	if (GETPOSTISSET('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse)) {
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_SUMUP".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	}
 	foreach ($paiements as $modep) {
@@ -90,26 +99,52 @@ if (GETPOST('action', 'alpha') == 'set') {
 			continue;
 		}
 		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
-		$res = dolibarr_set_const($db, $name, (GETPOST($name, 'alpha') > 0 ? GETPOST($name, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+		if (GETPOSTISSET($name)) {
+			$res = dolibarr_set_const($db, $name, (GETPOST($name, 'alpha') > 0 ? GETPOST($name, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+		}
+	}
+	if (GETPOSTISSET('CASHDESK_ID_WAREHOUSE'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE".$terminaltouse, (GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminaltouse, GETPOST('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_PRINTER_TO_USE'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER3_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
-	$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE".$terminaltouse, (GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminaltouse, GETPOST('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER3_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 
-	$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') > 0 ? GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') : ''), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') > 0 ? GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') : ''), 'chaine', 0, '', $conf->entity);
+	}
 
-	$res = dolibarr_set_const($db, "TAKEPOS_ADDON".$terminaltouse, GETPOST('TAKEPOS_ADDON'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('TAKEPOS_ADDON'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, "TAKEPOS_ADDON".$terminaltouse, GETPOST('TAKEPOS_ADDON'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
 
-	// add free text on each terminal of cash desk
-	$res = dolibarr_set_const($db, 'TAKEPOS_HEADER'.$terminaltouse, GETPOST('TAKEPOS_HEADER'.$terminaltouse, 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, 'TAKEPOS_FOOTER'.$terminaltouse, GETPOST('TAKEPOS_FOOTER'.$terminaltouse, 'restricthtml'), 'chaine', 0, '', $conf->entity);
+	// Add free text on each terminal of cash desk
+	if (GETPOSTISSET('TAKEPOS_HEADER'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, 'TAKEPOS_HEADER'.$terminaltouse, GETPOST('TAKEPOS_HEADER'.$terminaltouse, 'restricthtml'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('TAKEPOS_FOOTER'.$terminaltouse)) {
+		$res = dolibarr_set_const($db, 'TAKEPOS_FOOTER'.$terminaltouse, GETPOST('TAKEPOS_FOOTER'.$terminaltouse, 'restricthtml'), 'chaine', 0, '', $conf->entity);
+	}
 
-	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
+	dol_syslog("admin/terminal.php: level ".GETPOST('level', 'alpha'));
 
 	if (!($res > 0)) {
 		$error++;

From 9d3d88437c9249bf19bb530c29afc7580cd74916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 24 Feb 2024 13:03:57 +0100
Subject: [PATCH 0145/1862] fix phpstan (#28390)

Property User::$socialnetworks (array) does not accept string.
---
 htdocs/public/users/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 37c890c260e..54a035ece6b 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -147,7 +147,7 @@ if (getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
 	$object->user_mobile = '';
 }
 if (getDolUserInt('USER_PUBLIC_HIDE_SOCIALNETWORKS', 0, $object)) {
-	$object->socialnetworks = '';
+	$object->socialnetworks = [];
 }
 // By default, personal address not visible
 if (!getDolUserInt('USER_PUBLIC_SHOW_BIRTH', 0, $object)) {

From e77cd248f006296228046ffd6691ad45e4b17d82 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 24 Feb 2024 13:04:22 +0100
Subject: [PATCH 0146/1862] Fix: Spelling in "hidden" files (#28391)

* Fix: Spelling in 'hidden' file

* Fix: Spelling in 'hidden' file

* Fix: Spelling in 'hidden' file
---
 .travis.yml                                   | 8 ++++----
 build/debian/apache/.htaccess                 | 2 +-
 dev/tools/php-cs-fixer/.php-cs-fixer.dist.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e86bb24cdb1..267f37a370a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -556,18 +556,18 @@ after_failure:
     # Show upgrade log files
     #for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
     #do
-      #echo "Debugging informations for file $ficlog"
+      #echo "Debugging information for file $ficlog"
       #cat $ficlog
     #done
     # Show Apache log file
-    echo "Debugging informations for file apache error.log"
+    echo "Debugging information for file apache error.log"
     sudo tail -n 200 /var/log/apache2/travis_error_log
     if [ "$DEBUG" = true ]; then
       # Dolibarr log file
-      echo "Debugging informations for file dolibarr.log (latest 50 lines)"
+      echo "Debugging information for file dolibarr.log (latest 50 lines)"
       tail -n 200 $TRAVIS_BUILD_DIR/documents/dolibarr.log
       # Database log file
-      echo "Debugging informations for file mysql error.log"
+      echo "Debugging information for file mysql error.log"
       sudo tail -n 200 /var/log/mysql/error.log
       # TODO: PostgreSQL log file
       echo
diff --git a/build/debian/apache/.htaccess b/build/debian/apache/.htaccess
index 3c3d2e02683..67a70b47e51 100644
--- a/build/debian/apache/.htaccess
+++ b/build/debian/apache/.htaccess
@@ -8,7 +8,7 @@ Denied from all
 </IfVersion>
 
 
-# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
+# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommended for static resources).
 # Note that you must also enable the module mod_expires.
 #ExpiresActive On
 #ExpiresByType image/x-icon A2592000
diff --git a/dev/tools/php-cs-fixer/.php-cs-fixer.dist.php b/dev/tools/php-cs-fixer/.php-cs-fixer.dist.php
index e6bcc7ad12e..5b97cfb88be 100644
--- a/dev/tools/php-cs-fixer/.php-cs-fixer.dist.php
+++ b/dev/tools/php-cs-fixer/.php-cs-fixer.dist.php
@@ -39,7 +39,7 @@ return (new PhpCsFixer\Config())
 
 		// Minimum version Dolibarr v18.0.0
 		// Compatibility with min 7.1 is announced with Dolibarr18.0 but
-		// app is still working with 7.0 so no reason to abandon compatiblity with this target for the moment.
+		// app is still working with 7.0 so no reason to abandon compatibility with this target for the moment.
 		// So we use target PHP70 for the moment.
 		'@PHP70Migration' => true,
 		//'@PHP71Migration' => true,

From a7eaa091dcab6e80dd01e91a18e50a38e5711b9e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 24 Feb 2024 13:09:13 +0100
Subject: [PATCH 0147/1862] Fix: Reviewed, fixed and optimized dol_dir_list
 (#28387)

# Fix: Reviewed, fixed and optimized dol_dir_list

Review: had some issues using the exclusion filter, may be unrelated to implementation.
Fixed: is_link was testing utf8 filename, not os filename version.
Optimized:
- Simplified is_dir branches
- Avoid computing the exclusion arrays multiple times
---
 htdocs/core/lib/files.lib.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index d87bfdf3da1..eb113f1ddb9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -80,12 +80,17 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 			}
 		}
 		dol_syslog("files.lib.php::dol_dir_list path=".$utf8_path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter).$error_info);
-		//print 'xxx'."files.lib.php::dol_dir_list path=".$utf8_path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
+		// print 'xxx'."files.lib.php::dol_dir_list path=".$utf8_path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($exclude_array);
 		if (!$filters_ok) {
 			// Return empty array when filters are invalid
 			return array();
 		}
+	} else {
+		// Already computed before
+		$exclude_array = $excludefilter;
 	}
+	// Define excludefilterarray (before while, for speed)
+	$excludefilterarray = array_merge(array('^\.'), $exclude_array);
 
 	$loaddate = ($mode == 1 || $mode == 2 || $nbsecondsold != 0 || $sortcriteria == 'date');
 	$loadsize = ($mode == 1 || $mode == 3 || $sortcriteria == 'size');
@@ -109,7 +114,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 			'types' => $types,
 			'recursive' => $recursive,
 			'filter' => $filter,
-			'excludefilter' => $excludefilter,
+			'excludefilter' => $exclude_array,  // Already converted to array.
 			'sortcriteria' => $sortcriteria,
 			'sortorder' => $sortorder,
 			'loaddate' => $loaddate,
@@ -131,6 +136,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 			$filedate = '';
 			$filesize = '';
 			$fileperm = '';
+
 			while (false !== ($os_file = readdir($dir))) {        // $utf8_file is always a basename (in directory $os_path)
 				$os_fullpathfile = ($os_path ? $os_path.'/' : '').$os_file;
 
@@ -143,13 +149,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 				$qualified = 1;
 
 				$utf8_fullpathfile = "$utf8_path/$utf8_file";  // Temp variable for speed
-				// Define excludefilterarray
-				$excludefilterarray = array('^\.');
-				if (is_array($excludefilter)) {
-					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
-				} elseif ($excludefilter) {
-					$excludefilterarray[] = $excludefilter;
-				}
+
 				// Check if file is qualified
 				foreach ($excludefilterarray as $filt) {
 					if (preg_match('/'.$filt.'/i', $utf8_file) || preg_match('/'.$filt.'/i', $utf8_fullpathfile)) {
@@ -162,7 +162,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 				if ($qualified) {
 					$isdir = is_dir($os_fullpathfile);
 					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types == "directories") || ($types == "all") || $recursive > 0)) {
+					if ($isdir) {
 						// Add entry into file_list array
 						if (($types == "directories") || ($types == "all")) {
 							if ($loaddate || $sortcriteria == 'date') {
@@ -195,12 +195,12 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 
 						// if we're in a directory and we want recursive behavior, call this function again
 						if ($recursive > 0) {
-							if (empty($donotfollowsymlinks) || !is_link($utf8_fullpathfile)) {
+							if (empty($donotfollowsymlinks) || !is_link($os_fullpathfile)) {
 								//var_dump('eee '. $utf8_fullpathfile. ' '.is_dir($utf8_fullpathfile).' '.is_link($utf8_fullpathfile));
-								$file_list = array_merge($file_list, dol_dir_list($utf8_fullpathfile, $types, $recursive + 1, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$utf8_file, $donotfollowsymlinks, $nbsecondsold));
+								$file_list = array_merge($file_list, dol_dir_list($utf8_fullpathfile, $types, $recursive + 1, $filter, $exclude_array, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$utf8_file, $donotfollowsymlinks, $nbsecondsold));
 							}
 						}
-					} elseif (!$isdir && (($types == "files") || ($types == "all"))) {
+					} elseif (in_array($types, array("files", "all"))) {
 						// Add file into file_list array
 						if ($loaddate || $sortcriteria == 'date') {
 							$filedate = dol_filemtime($utf8_fullpathfile);

From b72294bf4ca528e67d47696a93500215a9679b27 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 24 Feb 2024 14:07:21 +0100
Subject: [PATCH 0148/1862] Fix: Typing for PDF parameter (#28383)

* Fix: Typing for PDF parameter

# Fix: Typing for PDF parameter

Change PDF to known type.

* Fix: Typing for PDF parameter

# Fix: Typing for PDF parameter

Change PDF to known type.
---
 .../core/modules/bank/doc/pdf_ban.modules.php |  9 ++++----
 .../stocktransfer/doc/pdf_eagle.modules.php   | 21 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 009184887b3..067e4801d24 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -146,7 +147,7 @@ class pdf_ban extends ModeleBankAccountDoc
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -247,7 +248,7 @@ class pdf_ban extends ModeleBankAccountDoc
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -257,7 +258,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -275,7 +276,7 @@ class pdf_ban extends ModeleBankAccountDoc
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 25c440b9413..b5b967487c4 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -277,7 +278,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -420,7 +421,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 				$curY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
-				$TCacheEntrepots=array();
+				$TCacheEntrepots = array();
 				// Loop on each lines
 				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
@@ -616,10 +617,10 @@ class pdf_eagle extends ModelePDFStockTransfer
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY - 1, $this->page_largeur - $this->marge_droite, $nexY - 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -681,7 +682,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -691,7 +692,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -709,7 +710,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF				$pdf            Object PDF
+	 *	@param	TCPDF			$pdf            Object PDF
 	 *	@param  StockTransfer	$object         Object invoice
 	 *	@param  int				$deja_regle     Montant deja regle
 	 *	@param	int				$posy			Position depart
@@ -755,7 +756,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 		$totalQty = 0;
 		if (!empty($object->lines)) {
 			foreach ($object->lines as $line) {
-				$totalQty+=$line->qty;
+				$totalQty += $line->qty;
 			}
 		}
 		// Set trueVolume and volume_units not currently stored into database
@@ -892,8 +893,8 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		$pdf->line($this->posxwarehousedestination - 1, $tab_top, $this->posxwarehousedestination - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxwarehousedestination-2.5, $tab_top + 1);
-			$pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination+4), 2, $outputlangs->transnoentities("WarehouseTarget"), '', 'C');
+			$pdf->SetXY($this->posxwarehousedestination - 2.5, $tab_top + 1);
+			$pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination + 4), 2, $outputlangs->transnoentities("WarehouseTarget"), '', 'C');
 		}
 
 		/*if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) {

From 6190c6ad697975e6b4e479f819b00a590df666ff Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 24 Feb 2024 14:08:23 +0100
Subject: [PATCH 0149/1862] Qual: Initialize module mapping from common
 constant (#28384)

# Qual: Initialize module mapping from common constant

DRY: Use constant define din functions.lib for centralized updates
---
 htdocs/core/modules/import/modules_import.php | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index e9e82e7baa7..ce6956b0d0e 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -118,31 +119,7 @@ class ModeleImports
 	/**
 	 * @var	array	Element mapping from table name
 	 */
-	public static $mapTableToElement = array(
-		'actioncomm' => 'agenda',
-		'adherent' => 'member',
-		'adherent_type' => 'member_type',
-		//'bank_account' => 'bank_account',
-		'categorie' => 'category',
-		//'commande' => 'commande',
-		//'commande_fournisseur' => 'commande_fournisseur',
-		'contrat' => 'contract',
-		'entrepot' => 'stock',
-		//'expensereport' => 'expensereport',
-		'facture' => 'invoice',
-		//'facture_fourn' => 'facture_fourn',
-		'fichinter' => 'intervention',
-		//'holiday' => 'holiday',
-		//'product' => 'product',
-		'product_price' => 'productprice',
-		'product_fournisseur_price' => 'productsupplierprice',
-		'projet'  => 'project',
-		//'propal' => 'propal',
-		//'societe' => 'societe',
-		'socpeople' => 'contact',
-		//'supplier_proposal' => 'supplier_proposal',
-		//'ticket' => 'ticket',
-	);
+	public static $mapTableToElement = DEPRECATED_MODULE_MAPPING;
 
 	/**
 	 *  Constructor

From a74382c7686f05fd77fd6e385df52d0387f46134 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 14:09:42 +0100
Subject: [PATCH 0150/1862] Fix for #28388

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b4d928ada43..28fdb10609b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -633,7 +633,7 @@ if (empty($sortfield)) {
 	$tmp2 = explode(' ', $tmp1[0]);
 	$sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
 	$sortorder = (!empty($tmp2[1]) ? $tmp2[1] : '');
-	//var_dump($sortfield);var_dump($sortorder);
+	//var_dump($sortfield); //var_dump($sortorder);
 }
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")

From 8842f8ab10e15c67318e89fcb4bad21c934233eb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 24 Feb 2024 14:12:32 +0100
Subject: [PATCH 0151/1862] Qual: Refactor CodingPhpTest / CommonClassTest -
 less verbosity, but better when error (#28388)

* Qual: CommonClassTest - less verbosity, but better when error

# Qual: CommonClassTest - less verbosity, but better when error

- Report the test method and parameters in case of error.
- Less verbosity about setup.
- $_ENV was empty array, replaced with getenv()

* Qual: Refactor CodingPhpTest

# Qual: Refactor CodingPhpTest

- Use dataprovider (better progress report, better errors, better continuation)
- Use dol_dir_list's exclude_filter capability (do not traverse the excluded dirs)
- Reduce debug output from dolibarr.log (not really relevant for these tests).

* Fix: References to loop variables outside loop

# Fix: References to loop variables outside loop

The test referenced some undefined variables outside foreach loops ($val[0])

* Update CommonClassTest.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 test/phpunit/CodingPhpTest.php         | 952 +++++++++++++------------
 test/phpunit/CommonClassTest.class.php |  40 +-
 2 files changed, 506 insertions(+), 486 deletions(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index c72f5859ea6..7e134b07bbb 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -81,503 +81,515 @@ $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
  */
 class CodingPhpTest extends CommonClassTest
 {
+	/**
+	 * Return list of files for which to verify Php checks
+	 *
+	 * @return array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string} List of php files to check (dol_dir_list)
+	 */
+	public function phpFilesProvider()
+	{
+		// File functions are needed
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+
+		$excludeRegexList
+			= array(
+				'\/includes\/',
+				'\/install\/doctemplates\/websites\/',
+				'\/custom\/',
+				'\/dolimed',
+				'\/nltechno',
+				'\/teclib',
+			);
+		$fullRegex = '(?:'.implode('|', $excludeRegexList).')';
+		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', [$fullRegex], 'fullname', SORT_ASC, 0, 1, '', 1);
+
+		/*
+		$filteredArray =  array_filter(
+			$filesarray,
+			static function($file) use (&$fullRegex) {
+				return !preg_match($fullRegex, $file['relativename']);
+			}
+		));
+		*/
+		return array_map(function ($value) {
+			return array($value);
+		}, $filesarray);
+	}
+
 	/**
 	 * testPHP
 	 *
+	 * @param array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string} $file File information
 	 * @return string
+	 *
+	 * @dataProvider phpFilesProvider
 	 */
-	public function testPHP()
+	public function testPHP($file)
 	{
-		global $conf,$user,$langs,$db;
-		$conf = $this->savconf;
-		$user = $this->savuser;
-		$langs = $this->savlangs;
-		$db = $this->savdb;
+		$this->nbLinesToShow = 1;
+		//print 'Check php file '.$file['relativename']."\n";
+		$filecontent = file_get_contents($file['fullname']);
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname', SORT_ASC, 0, 1, '', 1);
+		$this->verifyIsModuleEnabledOk($filecontent, "htdocs/{$file['relativename']}");
 
-		foreach ($filesarray as $key => $file) {
-			if (preg_match('/\/(htdocs|html)\/includes\//', $file['fullname'])) {
-				continue;
-			}
-			if (preg_match('/\/(htdocs|html)\/install\/doctemplates\/websites\//', $file['fullname'])) {
-				continue;
-			}
-			if (preg_match('/\/(htdocs|html)\/custom\//', $file['fullname'])) {
-				continue;
-			}
-			if (preg_match('/\/(htdocs|html)\/dolimed/', $file['fullname'])) {
-				continue;
-			}
-			if (preg_match('/\/(htdocs|html)\/nltechno/', $file['fullname'])) {
-				continue;
-			}
-			if (preg_match('/\/(htdocs|html)\/teclib/', $file['fullname'])) {
-				continue;
-			}
-
-			//print 'Check php file '.$file['relativename']."\n";
-			$filecontent = file_get_contents($file['fullname']);
-
-			$this->verifyIsModuleEnabledOk($filecontent, "htdocs/{$file['relativename']}");
-
-			if (preg_match('/\.class\.php/', $file['relativename'])
-				|| preg_match('/boxes\/box_/', $file['relativename'])
-				|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
-				|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
-				|| in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) {
-				// Check into Class files
-				if (! in_array($file['name'], array(
-					'api.class.php',
-					'commonobject.class.php',
-					'conf.class.php',
-					'html.form.class.php',
-					'translate.class.php',
-					'utils.class.php',
-					'TraceableDB.php',
-					'multicurrency.class.php'
-				))) {
-					// Must not find $db->
-					$ok = true;
-					$matches = array();
-					// Check string $db-> inside a class.php file (it should be $this->db-> into such classes)
-					preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-					foreach ($matches as $key => $val) {
-						$ok = false;
-						break;
-					}
-					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-					$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename'].'. Inside a .class file, you should use $this->db-> instead.');
-					//exit;
-				}
-
-				if (preg_match('/\.class\.php/', $file['relativename']) && ! in_array($file['relativename'], array(
-					'adherents/canvas/actions_adherentcard_common.class.php',
-					'contact/canvas/actions_contactcard_common.class.php',
-					'compta/facture/class/facture.class.php',
-					'core/class/commonobject.class.php',
-					'core/class/extrafields.class.php',
-					'core/class/html.form.class.php',
-					'core/class/html.formfile.class.php',
-					'core/class/html.formcategory.class.php',
-					'core/class/html.formmail.class.php',
-					'core/class/html.formother.class.php',
-					'core/class/html.formsms.class.php',
-					'core/class/html.formticket.class.php',
-					'core/class/utils.class.php',
-					'fourn/class/fournisseur.facture.class.php',
-					'societe/canvas/actions_card_common.class.php',
-					'societe/canvas/individual/actions_card_individual.class.php',
-					'ticket/class/actions_ticket.class.php',
-					'ticket/class/ticket.class.php',
-					'webportal/class/context.class.php',
-					'webportal/class/html.formcardwebportal.class.php',
-					'webportal/class/html.formlistwebportal.class.php',
-					'webportal/controllers/document.controller.class.php',
-					'workstation/class/workstation.class.php',
-				))) {
-					// Must not find GETPOST
-					$ok = true;
-					$matches = array();
-					// Check string GETPOSTFLOAT a class.php file (should not be found into classes)
-					preg_match_all('/GETPOST\(["\'](....)/', $filecontent, $matches, PREG_SET_ORDER);
-					foreach ($matches as $key => $val) {
-						if (in_array($val[1], array('lang', 'forc', 'mass', 'conf'))) {
-							continue;
-						}
-						//var_dump($val);
-						$ok = false;
-						break;
-					}
-					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-					$this->assertTrue($ok, 'Found string GETPOST into a .class.php file in '.$file['relativename'].'.');
-				}
-			} else {
-				// Check into Include files
-				if (! in_array($file['name'], array(
-					'objectline_view.tpl.php',
-					'extrafieldsinexport.inc.php',
-					'extrafieldsinimport.inc.php',
-					'DolQueryCollector.php',
-					'DoliStorage.php'
-				))) {
-					// Must not found $this->db->
-					$ok = true;
-					$matches = array();
-					// Check string $this->db-> into a non class.php file (it should be $db-> into such classes)
-					preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-					foreach ($matches as $key => $val) {
-						$ok = false;
-						break;
-					}
-					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-					$this->assertTrue($ok, 'Found string "$this->db->" in '.$file['relativename']);
-					//exit;
-				}
-			}
-
-			// Check we don't miss top_httphead() into any ajax pages
-			if (preg_match('/ajax\//', $file['relativename'])) {
-				print "Analyze ajax page ".$file['relativename']."\n";
+		if (preg_match('/\.class\.php/', $file['relativename'])
+			|| preg_match('/boxes\/box_/', $file['relativename'])
+			|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
+			|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
+			|| in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) {
+			// Check into Class files
+			if (! in_array($file['name'], array(
+				'api.class.php',
+				'commonobject.class.php',
+				'conf.class.php',
+				'html.form.class.php',
+				'translate.class.php',
+				'utils.class.php',
+				'TraceableDB.php',
+				'multicurrency.class.php'
+			))) {
+				// Must not find $db->
 				$ok = true;
 				$matches = array();
-				preg_match_all('/top_httphead/', $filecontent, $matches, PREG_SET_ORDER);
-				if (count($matches) == 0) {
+				// Check string $db-> inside a class.php file (it should be $this->db-> into such classes)
+				preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+				foreach ($matches as $key => $val) {
 					$ok = false;
+					break;
 				}
 				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-				$this->assertTrue($ok, 'Did not find top_httphead into the ajax page '.$file['relativename']);
+				$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename'].'. Inside a .class file, you should use $this->db-> instead.');
 				//exit;
 			}
 
-			// Check if a var_dump has been forgotten
-			if (!preg_match('/test\/phpunit/', $file['fullname'])) {
-				if (! in_array($file['name'], array('class.nusoap_base.php'))) {
-					$ok = true;
-					$matches = array();
-					preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
-					//var_dump($matches);
-					foreach ($matches as $key => $val) {
-						if ($val[1] != '/' && $val[1] != '*') {
-							$ok = false;
-							break;
-						}
-						break;
+			if (preg_match('/\.class\.php/', $file['relativename']) && ! in_array($file['relativename'], array(
+				'adherents/canvas/actions_adherentcard_common.class.php',
+				'contact/canvas/actions_contactcard_common.class.php',
+				'compta/facture/class/facture.class.php',
+				'core/class/commonobject.class.php',
+				'core/class/extrafields.class.php',
+				'core/class/html.form.class.php',
+				'core/class/html.formfile.class.php',
+				'core/class/html.formcategory.class.php',
+				'core/class/html.formmail.class.php',
+				'core/class/html.formother.class.php',
+				'core/class/html.formsms.class.php',
+				'core/class/html.formticket.class.php',
+				'core/class/utils.class.php',
+				'fourn/class/fournisseur.facture.class.php',
+				'societe/canvas/actions_card_common.class.php',
+				'societe/canvas/individual/actions_card_individual.class.php',
+				'ticket/class/actions_ticket.class.php',
+				'ticket/class/ticket.class.php',
+				'webportal/class/context.class.php',
+				'webportal/class/html.formcardwebportal.class.php',
+				'webportal/class/html.formlistwebportal.class.php',
+				'webportal/controllers/document.controller.class.php',
+				'workstation/class/workstation.class.php',
+			))) {
+				// Must not find GETPOST
+				$ok = true;
+				$matches = array();
+				// Check string GETPOSTFLOAT a class.php file (should not be found into classes)
+				preg_match_all('/GETPOST\(["\'](....)/', $filecontent, $matches, PREG_SET_ORDER);
+				foreach ($matches as $key => $val) {
+					if (in_array($val[1], array('lang', 'forc', 'mass', 'conf'))) {
+						continue;
 					}
-					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-					$this->assertTrue($ok, 'Found string var_dump that is not just after /* or // in '.$file['relativename']);
-					//exit;
-				}
-			}
-
-			// Check get_class followed by __METHOD__
-			$ok = true;
-			$matches = array();
-			preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found string get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['relativename']);
-			//exit;
-
-			// Check string $this->db->idate without quotes
-			$ok = true;
-			$matches = array();
-			preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($val[1] != '\'"' && $val[1] != '\'\'') {
+					//var_dump($val);
 					$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 string GETPOST into a .class.php file in '.$file['relativename'].'.');
 			}
-			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found a $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename']);
-			//exit;
-
-
-
-			// Check sql string DELETE|OR|AND|WHERE|INSERT ... yyy = ".$xxx
-			//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string, or an (int) if int, when forging sql request.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/(DELETE|OR|AND|WHERE|INSERT)\s.*([^\s][^\s][^\s])\s*=\s*(\'|")\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($val[2] == 'ity' && $val[4] == 'con') {		// exclude entity = ".$conf->entity
-					continue;
-				}
-				if ($val[2] == 'ame' && $val[4] == 'db-' && preg_match('/WHERE name/', $val[0])) {		// exclude name = ".$db->encrypt(
-					continue;
-				}
-				if ($val[2] == 'ame' && $val[4] == 'thi' && preg_match('/WHERE name/', $val[0])) {		// exclude name = ".$this->db->encrypt(
-					continue;
-				}
-				var_dump($matches);
-				$ok = false;
-				break;
-			}
-			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
-			//exit;
-
-			// Check that forged sql string is using ' instead of " as string PHP quotes
-			$ok = true;
-			$matches = array();
-			preg_match_all('/\$sql \.= \'\s*VALUES.*\$/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				//if ($val[1] != '\'"' && $val[1] != '\'\'') {
-				var_dump($matches);
-				$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 forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
-			//exit;
-
-			// Check that forged sql string is using ' instead of " as string PHP quotes
-			$ok = true;
-			$matches = array();
-			preg_match_all('/\$sql \.?= \'SELECT.*\$/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				var_dump($matches);
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
-
-			// Check sql string VALUES ... , ".$xxx
-			//  with xxx that is not 'db-' (for $db->escape). It means we forget a ' if string, or an (int) if int, when forging sql request.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/(VALUES).*,\s*"\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($val[1] == 'VALUES' && $val[2] == 'db-') {		// exclude $db->escape(
-					continue;
-				}
-				if ($val[1] == 'VALUES' && $val[2] == 'thi' && preg_match('/this->db->encrypt/', $val[0])) {	// exclude ".$this->db->encrypt(
-					continue;
-				}
-				var_dump($matches);
-				$ok = false;
-				break;
-			}
-			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
-			//exit;
-
-			// Check '".$xxx non escaped
-
-			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($val[1] != 'db->' && $val[1] != 'esca') {
+		} else {
+			// Check into Include files
+			if (! in_array($file['name'], array(
+				'objectline_view.tpl.php',
+				'extrafieldsinexport.inc.php',
+				'extrafieldsinimport.inc.php',
+				'DolQueryCollector.php',
+				'DoliStorage.php'
+			))) {
+				// Must not found $this->db->
+				$ok = true;
+				$matches = array();
+				// Check string $this->db-> into a non class.php file (it should be $db-> into such classes)
+				preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+				foreach ($matches as $key => $val) {
 					$ok = false;
 					break;
 				}
+				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+				$this->assertTrue($ok, 'Found string "$this->db->" in '.$file['relativename']);
+				//exit;
 			}
-			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 1) in '.$file['relativename'].' - Bad.');
-
-			// Check string sql|set|WHERE|...'".$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
-					$ok = false;	// This will generate error
-					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 non escaped string in building of a sql request (case 2) in '.$file['relativename'].': '.$val[0].' - Bad.');
-			//exit;
-
-			// Check string sql|set...'.$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/(\$sql|SET\s|WHERE\s|INSERT\s|VALUES\s|VALUES\().+\s*\'\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
-					$ok = false;
-					var_dump($matches);
-					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 non escaped string in building of a sql request (case 3) in '.$file['relativename'].': '.$val[0].' - Bad.');
-			//exit;
-
-			// 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;
-				}
-				//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 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.
-			$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;
-				}
-				//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 non sanitized string in building of a IN or NOT IN sql request '.$file['relativename'].' - Bad.');
-			//exit;
-
-			// Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(') {
-					$ok = false;
-					break;
-				}
-			}
-			$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'", "'WEBSITE_LICENSE'",
-						'"mysqldump"', '"postgresqldump"',
-						"'db_pass_root'", "'db_pass'", '"pass"', '"pass1"', '"pass2"', '"password"', "'password'",
-						'"MAIN_MAIL_SMTPS_PW"', '"MAIN_MAIL_SMTPS_PW_EMAILING"', '"MAIN_MAIL_SMTPS_PW_TICKET"'))) {
-					$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();
-			// Check string ='print_liste_field_titre\(\$langs'.
-			preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
-
-
-			// Test we don't have <br />
-			$ok = true;
-			$matches = array();
-			preg_match_all('/<br\s+\/>/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($file['name'] != 'functions.lib.php') {
-					$ok = false;
-					break;
-				}
-			}
-			$this->assertTrue($ok, 'Found a tag <br /> that is for xml in file '.$file['relativename'].'. You must use html syntax <br> instead.');
-
-
-			// Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
-			$ok = true;
-			$matches = array();
-			preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if ($file['name'] != 'excludefile.php') {
-					$ok = false;
-					break;
-				}
-			}
-			$this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
-
-
-			// Test we don't have preg_grep with a param without preg_quote
-			$ok = true;
-			$matches = array();
-			preg_match_all('/preg_grep\(.*\$/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				if (strpos($val[0], 'preg_quote') === false) {
-					$ok = false;
-					break;
-				}
-			}
-			$this->assertTrue($ok, 'Found a preg_grep with a param that is a $var but without preg_quote in file '.$file['relativename'].'.');
-
-
-			// Test we don't have "if ($resql >"
-			$ok = true;
-			$matches = array();
-			preg_match_all('/if \(\$resql >/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found a if $resql with a > operator (when $resql is a boolean or resource) in file '.$file['relativename'].'. Please remove the > ... part.');
-
-			// Test we don't have empty($user->hasRight
-			$ok = true;
-			$matches = array();
-			preg_match_all('/empty\(\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found code empty($user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
-
-			// Test we don't have empty(DolibarrApiAccess::$user->hasRight
-			$ok = true;
-			$matches = array();
-			preg_match_all('/empty\(DolibarrApiAccess::\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found code empty(DolibarrApiAccess::$user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
-
-			// Test we don't have empty($user->hasRight
-			$ok = true;
-			$matches = array();
-			preg_match_all('/empty\(getDolGlobal/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found code empty(getDolGlobal... in file '.$file['relativename'].'. empty() must be used on a var not on a function.');
-
-			// Test we don't have @var array(
-			$ok = true;
-			$matches = array();
-			preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
-
-
-			// Test we don't have CURDATE()
-			$ok = true;
-			$matches = array();
-			preg_match_all('/CURDATE\(\)/', $filecontent, $matches, PREG_SET_ORDER);
-			foreach ($matches as $key => $val) {
-				$ok = false;
-				break;
-			}
-			$this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');
 		}
 
-		return;
+		// Check we don't miss top_httphead() into any ajax pages
+		if (preg_match('/ajax\//', $file['relativename'])) {
+			print "Analyze ajax page ".$file['relativename']."\n";
+			$ok = true;
+			$matches = array();
+			preg_match_all('/top_httphead/', $filecontent, $matches, PREG_SET_ORDER);
+			if (count($matches) == 0) {
+				$ok = false;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Did not find top_httphead into the ajax page '.$file['relativename']);
+			//exit;
+		}
+
+		// Check if a var_dump has been forgotten
+		if (!preg_match('/test\/phpunit/', $file['fullname'])) {
+			if (! in_array($file['name'], array('class.nusoap_base.php'))) {
+				$ok = true;
+				$matches = array();
+				preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
+				//var_dump($matches);
+				foreach ($matches as $key => $val) {
+					if ($val[1] != '/' && $val[1] != '*') {
+						$ok = false;
+						break;
+					}
+					break;
+				}
+				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+				$this->assertTrue($ok, 'Found string var_dump that is not just after /* or // in '.$file['relativename']);
+				//exit;
+			}
+		}
+
+		// Check get_class followed by __METHOD__
+		$ok = true;
+		$matches = array();
+		preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+		$this->assertTrue($ok, 'Found string get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['relativename']);
+		//exit;
+
+		// Check string $this->db->idate without quotes
+		$ok = true;
+		$matches = array();
+		preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($val[1] != '\'"' && $val[1] != '\'\'') {
+				$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 $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename']);
+		//exit;
+
+
+
+		// Check sql string DELETE|OR|AND|WHERE|INSERT ... yyy = ".$xxx
+		//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string, or an (int) if int, when forging sql request.
+		$ok = true;
+		$matches = array();
+		preg_match_all('/(DELETE|OR|AND|WHERE|INSERT)\s.*([^\s][^\s][^\s])\s*=\s*(\'|")\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($val[2] == 'ity' && $val[4] == 'con') {		// exclude entity = ".$conf->entity
+				continue;
+			}
+			if ($val[2] == 'ame' && $val[4] == 'db-' && preg_match('/WHERE name/', $val[0])) {		// exclude name = ".$db->encrypt(
+				continue;
+			}
+			if ($val[2] == 'ame' && $val[4] == 'thi' && preg_match('/WHERE name/', $val[0])) {		// exclude name = ".$this->db->encrypt(
+				continue;
+			}
+			var_dump($matches);
+			$ok = false;
+			break;
+		}
+		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+		$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
+		//exit;
+
+		// Check that forged sql string is using ' instead of " as string PHP quotes
+		$ok = true;
+		$matches = array();
+		preg_match_all('/\$sql \.= \'\s*VALUES.*\$/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			//if ($val[1] != '\'"' && $val[1] != '\'\'') {
+			var_dump($matches);
+			$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 forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
+		//exit;
+
+		// Check that forged sql string is using ' instead of " as string PHP quotes
+		$ok = true;
+		$matches = array();
+		preg_match_all('/\$sql \.?= \'SELECT.*\$/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			var_dump($matches);
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
+
+		// Check sql string VALUES ... , ".$xxx
+		//  with xxx that is not 'db-' (for $db->escape). It means we forget a ' if string, or an (int) if int, when forging sql request.
+		$ok = true;
+		$matches = array();
+		preg_match_all('/(VALUES).*,\s*"\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($val[1] == 'VALUES' && $val[2] == 'db-') {		// exclude $db->escape(
+				continue;
+			}
+			if ($val[1] == 'VALUES' && $val[2] == 'thi' && preg_match('/this->db->encrypt/', $val[0])) {	// exclude ".$this->db->encrypt(
+				continue;
+			}
+			var_dump($matches);
+			$ok = false;
+			break;
+		}
+		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+		$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
+		//exit;
+
+		// Check '".$xxx non escaped
+
+		// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+		$ok = true;
+		$matches = array();
+		preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($val[1] != 'db->' && $val[1] != 'esca') {
+				$ok = false;
+				break;
+			}
+		}
+		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+		$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 1) in '.$file['relativename'].' - Bad.');
+
+		// Check string sql|set|WHERE|...'".$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
+		$ok = true;
+		$matches = array();
+		$found = "";
+		preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
+				$found = $val[0];
+				$ok = false;	// This will generate error
+				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 non escaped string in building of a sql request (case 2) in '.$file['relativename'].': '.$found.' - Bad.');
+		//exit;
+
+		// Check string sql|set...'.$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
+		$ok = true;
+		$matches = array();
+		$found = "";
+		preg_match_all('/(\$sql|SET\s|WHERE\s|INSERT\s|VALUES\s|VALUES\().+\s*\'\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if (! in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
+				$found = $val[0];
+				$ok = false;
+				var_dump($matches);
+				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 non escaped string in building of a sql request (case 3) in '.$file['relativename'].': '.$found.' - Bad.');
+		//exit;
+
+		// 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;
+			}
+			//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 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.
+		$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;
+			}
+			//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 non sanitized string in building of a IN or NOT IN sql request '.$file['relativename'].' - Bad.');
+		//exit;
+
+		// Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
+		$ok = true;
+		$matches = array();
+		preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(') {
+				$ok = false;
+				break;
+			}
+		}
+		$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'", "'WEBSITE_LICENSE'",
+					'"mysqldump"', '"postgresqldump"',
+					"'db_pass_root'", "'db_pass'", '"pass"', '"pass1"', '"pass2"', '"password"', "'password'",
+					'"MAIN_MAIL_SMTPS_PW"', '"MAIN_MAIL_SMTPS_PW_EMAILING"', '"MAIN_MAIL_SMTPS_PW_TICKET"'))) {
+				$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();
+		// Check string ='print_liste_field_titre\(\$langs'.
+		preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
+
+
+		// Test we don't have <br />
+		$ok = true;
+		$matches = array();
+		preg_match_all('/<br\s+\/>/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($file['name'] != 'functions.lib.php') {
+				$ok = false;
+				break;
+			}
+		}
+		$this->assertTrue($ok, 'Found a tag <br /> that is for xml in file '.$file['relativename'].'. You must use html syntax <br> instead.');
+
+
+		// Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
+		$ok = true;
+		$matches = array();
+		preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if ($file['name'] != 'excludefile.php') {
+				$ok = false;
+				break;
+			}
+		}
+		$this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
+
+
+		// Test we don't have preg_grep with a param without preg_quote
+		$ok = true;
+		$matches = array();
+		preg_match_all('/preg_grep\(.*\$/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if (strpos($val[0], 'preg_quote') === false) {
+				$ok = false;
+				break;
+			}
+		}
+		$this->assertTrue($ok, 'Found a preg_grep with a param that is a $var but without preg_quote in file '.$file['relativename'].'.');
+
+
+		// Test we don't have "if ($resql >"
+		$ok = true;
+		$matches = array();
+		preg_match_all('/if \(\$resql >/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found a if $resql with a > operator (when $resql is a boolean or resource) in file '.$file['relativename'].'. Please remove the > ... part.');
+
+		// Test we don't have empty($user->hasRight
+		$ok = true;
+		$matches = array();
+		preg_match_all('/empty\(\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found code empty($user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
+
+		// Test we don't have empty(DolibarrApiAccess::$user->hasRight
+		$ok = true;
+		$matches = array();
+		preg_match_all('/empty\(DolibarrApiAccess::\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found code empty(DolibarrApiAccess::$user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
+
+		// Test we don't have empty($user->hasRight
+		$ok = true;
+		$matches = array();
+		preg_match_all('/empty\(getDolGlobal/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found code empty(getDolGlobal... in file '.$file['relativename'].'. empty() must be used on a var not on a function.');
+
+		// Test we don't have @var array(
+		$ok = true;
+		$matches = array();
+		preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
+
+
+		// Test we don't have CURDATE()
+		$ok = true;
+		$matches = array();
+		preg_match_all('/CURDATE\(\)/', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			$ok = false;
+			break;
+		}
+		$this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');
 	}
 
 
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 9e3aaf16569..7942108ea78 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -79,7 +79,9 @@ abstract class CommonClassTest extends TestCase
 		$this->savlangs = $langs;
 		$this->savdb = $db;
 
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
+			print get_called_class()." db->type=".$db->type." user->id=".$user->id;
+		}
 		//print " - db ".$db->db;
 		print PHP_EOL;
 	}
@@ -94,13 +96,8 @@ abstract class CommonClassTest extends TestCase
 		global $conf,$user,$langs,$db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		if (!isModEnabled('agenda')) {
-			print get_called_class()." module agenda must be enabled.".PHP_EOL;
-			die(1);
-		}
-
-		if (isset($_ENV['PHPUNIT_DEBUG'])) {
-			print get_called_class().PHP_EOL;
+		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
+			print get_called_class()."::".__FUNCTION__.PHP_EOL;
 		}
 	}
 
@@ -126,12 +123,24 @@ abstract class CommonClassTest extends TestCase
 		// Get the last line of the log
 		$last_lines = array_slice($lines, $first_line, $nbLinesToShow);
 
+		$failedTestMethod = $this->getName(false);
+		$className = get_called_class();
+
+		// Get the test method's reflection
+		$reflectionMethod = new ReflectionMethod($className, $failedTestMethod);
+
+		// Get the test method's data set
+		$argsText = $this->getDataSetAsString(true);
+
 		// Show log file
-		print PHP_EOL."----- Test fails. Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
+		print PHP_EOL;
+		print "----- $className::$failedTestMethod failed - $argsText.".PHP_EOL;
+		print "Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
 		foreach ($last_lines as $line) {
 			print $line . "<br>";
 		}
 		print PHP_EOL;
+		print "----- end of dolibarr.log for $className::$failedTestMethod".PHP_EOL;
 
 		parent::onNotSuccessfulTest($t);
 	}
@@ -150,10 +159,9 @@ abstract class CommonClassTest extends TestCase
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
-		if (isset($_ENV['PHPUNIT_DEBUG'])) {
-			print get_called_class().PHP_EOL;
+		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
+			print get_called_class().'::'.$this->getName(false)."::".__FUNCTION__.PHP_EOL;
 		}
-		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
 	}
 
@@ -164,8 +172,8 @@ abstract class CommonClassTest extends TestCase
 	 */
 	protected function tearDown(): void
 	{
-		if (isset($_ENV['PHPUNIT_DEBUG'])) {
-			print get_called_class().PHP_EOL;
+		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
+			print get_called_class().'::'.$this->getName(false)."::".__FUNCTION__.PHP_EOL;
 		}
 	}
 
@@ -178,8 +186,8 @@ abstract class CommonClassTest extends TestCase
 	{
 		global $db;
 		$db->rollback();
-		if (isset($_ENV['PHPUNIT_DEBUG'])) {
-			print get_called_class().PHP_EOL;
+		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
+			print get_called_class()."::".__FUNCTION__.PHP_EOL;
 		}
 	}
 

From de53f6e0c25e7a648c052250162e9d38330b9017 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 14:18:56 +0100
Subject: [PATCH 0152/1862] Fix phpstan

---
 htdocs/emailcollector/lib/emailcollector.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index d63077049dd..63a37a540cf 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -90,7 +90,7 @@ function emailcollectorPrepareHead($object)
  * Get parts of a message
  *
  * @param 	object 			$structure 		Structure of message
- * @return 	object|boolean 					Parties du message|false en cas d'erreur
+ * @return 	array[false						Array of parts of the message|false if error
  */
 function getParts($structure)
 {
@@ -119,6 +119,7 @@ function getAttachments($jk, $mbox)
 {
 	$structure = imap_fetchstructure($mbox, $jk, FT_UID);
 	$parts = getParts($structure);
+
 	$fpos = 2;
 	$attachments = array();
 	$nb = count($parts);

From 7e63df13af0ac699192817e9ab35cef1e855bde9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 14:22:44 +0100
Subject: [PATCH 0153/1862] Fix phpstan warnings

---
 .../task/doc/doc_generic_task_odt.modules.php | 76 +++++++++----------
 1 file changed, 34 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index e2593514e25..5b51371095b 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -141,7 +141,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
 		// phpcs:enable
-		global $conf, $extrafields;
+		global $extrafields;
 
 		if (!$object instanceof Project) {
 			dol_syslog("Expected Project object, got ".gettype($object), LOG_ERR);
@@ -185,7 +185,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
 	{
 		// phpcs:enable
-		global $conf, $extrafields;
+		global $extrafields;
 
 		$resarray = array(
 			'task_ref'=>$task->ref,
@@ -228,17 +228,15 @@ class doc_generic_task_odt extends ModelePDFTask
 	public function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
-		'projcontacts_id'=>$contact['id'],
-		'projcontacts_rowid'=>$contact['rowid'],
-		'projcontacts_role'=>$contact['libelle'],
-		'projcontacts_lastname'=>$contact['lastname'],
-		'projcontacts_firstname'=>$contact['firstname'],
-		'projcontacts_fullcivname'=>$contact['fullname'],
-		'projcontacts_socname'=>$contact['socname'],
-		'projcontacts_email'=>$contact['email']
+			'projcontacts_id'=>$contact['id'],
+			'projcontacts_rowid'=>$contact['rowid'],
+			'projcontacts_role'=>$contact['libelle'],
+			'projcontacts_lastname'=>$contact['lastname'],
+			'projcontacts_firstname'=>$contact['firstname'],
+			'projcontacts_fullcivname'=>$contact['fullname'],
+			'projcontacts_socname'=>$contact['socname'],
+			'projcontacts_email'=>$contact['email']
 		);
 	}
 
@@ -253,12 +251,10 @@ class doc_generic_task_odt extends ModelePDFTask
 	public function get_substitutionarray_project_file($file, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
-		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'], 'day'),
-		'projfile_size'=>$file['size']
+			'projfile_name'=>$file['name'],
+			'projfile_date'=>dol_print_date($file['date'], 'day'),
+			'projfile_size'=>$file['size']
 		);
 	}
 
@@ -273,16 +269,14 @@ class doc_generic_task_odt extends ModelePDFTask
 	public function get_substitutionarray_project_reference($refdetail, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
-		'projref_type'=>$refdetail['type'],
-		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'], 'day'),
-		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
-		'projref_status'=>$refdetail['status']
+			'projref_type'=>$refdetail['type'],
+			'projref_ref'=>$refdetail['ref'],
+			'projref_date'=>dol_print_date($refdetail['date'], 'day'),
+			'projref_socname'=>$refdetail['socname'],
+			'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
+			'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
+			'projref_status'=>$refdetail['status']
 		);
 	}
 
@@ -290,23 +284,23 @@ class doc_generic_task_odt extends ModelePDFTask
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
-	 *	@param  array			$taskressource			Reference array
+	 *	@param  array			$taskresource		Resource array
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	public function get_substitutionarray_tasksressource($taskressource, $outputlangs)
+	public function get_substitutionarray_tasksressource($taskresource, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
+
 		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
 		return array(
-		'taskressource_rowid'=>$taskressource['rowid'],
-		'taskressource_role'=>$taskressource['libelle'],
-		'taskressource_lastname'=>$taskressource['lastname'],
-		'taskressource_firstname'=>$taskressource['firstname'],
-		'taskressource_fullcivname'=>$taskressource['fullname'],
-		'taskressource_socname'=>$taskressource['socname'],
-		'taskressource_email'=>$taskressource['email']
+			'taskressource_rowid' => $taskresource['rowid'],
+			'taskressource_role' => $taskresource['libelle'],
+			'taskressource_lastname' => $taskresource['lastname'],
+			'taskressource_firstname' => $taskresource['firstname'],
+			'taskressource_fullcivname' => $taskresource['fullname'],
+			'taskressource_socname' => $taskresource['socname'],
+			'taskressource_email' => $taskresource['email']
 		);
 	}
 
@@ -314,7 +308,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
-	 *	@param  object			$tasktime			times object
+	 *	@param  array			$tasktime			times object
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
@@ -346,12 +340,10 @@ class doc_generic_task_odt extends ModelePDFTask
 	public function get_substitutionarray_task_file($file, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
-		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'], 'day'),
-		'tasksfile_size'=>$file['size']
+			'tasksfile_name'=>$file['name'],
+			'tasksfile_date'=>dol_print_date($file['date'], 'day'),
+			'tasksfile_size'=>$file['size']
 		);
 	}
 

From 88758c02b179154fd09254e4c912e5fc0672356e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 14:25:33 +0100
Subject: [PATCH 0154/1862] Fix phan

---
 .../doc/doc_generic_project_odt.modules.php   | 63 +++++++++----------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 28338ebd0bc..4e37cf0beeb 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -223,7 +223,6 @@ class doc_generic_project_odt extends ModelePDFProjects
 	public function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
 		$pc = 'projcontacts_'; // prefix to avoid typos
 
 		$ret = array(
@@ -281,8 +280,6 @@ class doc_generic_project_odt extends ModelePDFProjects
 	public function get_substitutionarray_project_file($file, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
 			'projfile_name'=>$file['name'],
 			'projfile_date'=>dol_print_date($file['date'], 'day'),
@@ -318,23 +315,23 @@ class doc_generic_project_odt extends ModelePDFProjects
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
-	 *	@param  array			$taskressource			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
+	 *	@param  array			$taskresource			Reference array
+	 *	@param  Translate		$outputlangs        	Lang object to use for output
+	 *  @return	array									Return a substitution array
 	 */
-	public function get_substitutionarray_tasksressource($taskressource, $outputlangs)
+	public function get_substitutionarray_tasksressource($taskresource, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
+
 		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
 		return array(
-		'taskressource_rowid'=>$taskressource['rowid'],
-		'taskressource_role'=>$taskressource['libelle'],
-		'taskressource_lastname'=>$taskressource['lastname'],
-		'taskressource_firstname'=>$taskressource['firstname'],
-		'taskressource_fullcivname'=>$taskressource['fullname'],
-		'taskressource_socname'=>$taskressource['socname'],
-		'taskressource_email'=>$taskressource['email']
+			'taskressource_rowid' => $taskresource['rowid'],
+			'taskressource_role' => $taskresource['libelle'],
+			'taskressource_lastname' => $taskresource['lastname'],
+			'taskressource_firstname' => $taskresource['firstname'],
+			'taskressource_fullcivname' => $taskresource['fullname'],
+			'taskressource_socname' => $taskresource['socname'],
+			'taskressource_email' => $taskresource['email']
 		);
 	}
 
@@ -342,28 +339,26 @@ class doc_generic_project_odt extends ModelePDFProjects
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
-	 *	@param  object			$tasktime			times object
+	 *	@param  array			$tasktime			Array of times object
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
 	public function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
-		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'], 'day'),
-		'tasktime_task_duration_sec'=>$tasktime['task_duration'],
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'], 'all'),
-		'tasktime_note'=>$tasktime['note'],
-		'tasktime_fk_user'=>$tasktime['fk_user'],
-		'tasktime_user_name'=>$tasktime['name'],
-		'tasktime_user_first'=>$tasktime['firstname'],
-		'tasktime_fullcivname'=>$tasktime['fullcivname'],
-		'tasktime_amountht'=>$tasktime['amountht'],
-		'tasktime_amountttc'=>$tasktime['amountttc'],
-		'tasktime_thm'=>$tasktime['thm'],
+			'tasktime_rowid'=>$tasktime['rowid'],
+			'tasktime_task_date'=>dol_print_date($tasktime['task_date'], 'day'),
+			'tasktime_task_duration_sec'=>$tasktime['task_duration'],
+			'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'], 'all'),
+			'tasktime_note'=>$tasktime['note'],
+			'tasktime_fk_user'=>$tasktime['fk_user'],
+			'tasktime_user_name'=>$tasktime['name'],
+			'tasktime_user_first'=>$tasktime['firstname'],
+			'tasktime_fullcivname'=>$tasktime['fullcivname'],
+			'tasktime_amountht'=>$tasktime['amountht'],
+			'tasktime_amountttc'=>$tasktime['amountttc'],
+			'tasktime_thm'=>$tasktime['thm'],
 		);
 	}
 
@@ -378,12 +373,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 	public function get_substitutionarray_task_file($file, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
-
 		return array(
-		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'], 'day'),
-		'tasksfile_size'=>$file['size']
+			'tasksfile_name'=>$file['name'],
+			'tasksfile_date'=>dol_print_date($file['date'], 'day'),
+			'tasksfile_size'=>$file['size']
 		);
 	}
 

From 87aded900f72a5f13bff35fde371b4b4bf087017 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 14:31:39 +0100
Subject: [PATCH 0155/1862] Fix doxygen

---
 htdocs/webservices/server_actioncomm.php       | 9 +++++----
 htdocs/webservices/server_contact.php          | 8 ++++----
 htdocs/webservices/server_invoice.php          | 2 +-
 htdocs/webservices/server_productorservice.php | 4 ++--
 htdocs/webservices/server_thirdparty.php       | 4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index c8eb29b3d92..6bd2c21a0b1 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -429,12 +429,12 @@ function getListActionCommType($authentication)
  * Create ActionComm
  *
  * @param	array		$authentication		Array of authentication information
- * @param	ActionComm	$actioncomm		    $actioncomm
+ * @param	array		$actioncomm		    $actioncomm
  * @return	array							Array result
  */
 function createActionComm($authentication, $actioncomm)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -460,6 +460,7 @@ function createActionComm($authentication, $actioncomm)
 		$newobject->socid = $actioncomm['socid'];
 		$newobject->fk_project = $actioncomm['projectid'];
 		$newobject->note = $actioncomm['note'];
+		$newobject->note_private = $actioncomm['note'];
 		$newobject->contact_id = $actioncomm['contactid'];
 		$newobject->userownerid = $actioncomm['userownerid'];
 		$newobject->label = $actioncomm['label'];
@@ -512,12 +513,12 @@ function createActionComm($authentication, $actioncomm)
  * Create ActionComm
  *
  * @param	array		$authentication		Array of authentication information
- * @param	ActionComm	$actioncomm		    $actioncomm
+ * @param	array		$actioncomm		    $actioncomm
  * @return	array							Array result
  */
 function updateActionComm($authentication, $actioncomm)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 73ef127fb77..0bf215eb94e 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -376,12 +376,12 @@ function getContact($authentication, $id, $ref_ext)
  * Create Contact
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Contact		$contact		    $contact
+ * @param	array		$contact		    $contact
  * @return	array							Array result
  */
 function createContact($authentication, $contact)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	$now = dol_now();
 
@@ -490,7 +490,7 @@ function createContact($authentication, $contact)
  */
 function getContactsForThirdParty($authentication, $idthirdparty)
 {
-	global $db, $conf, $langs;
+	global $db, $conf;
 
 	dol_syslog("Function: getContactsForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
@@ -613,7 +613,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
  * Update a contact
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Contact		$contact		    Contact
+ * @param	array		$contact		    Contact
  * @return	array							Array result
  */
 function updateContact($authentication, $contact)
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 050e55a338d..90d916e72b0 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -744,7 +744,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
  * Uddate an invoice, only change the state of an invoice
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Facture		$invoice			Invoice
+ * @param	array		$invoice			Invoice
  * @return	array							Array result
  */
 function updateInvoice($authentication, $invoice)
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 500f0aaf3d0..759878c37b5 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -499,7 +499,7 @@ function getProductOrService($authentication, $id = 0, $ref = '', $ref_ext = '',
  * Create an invoice
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Product		$product			Product
+ * @param	array		$product			Product
  * @return	array							Array result
  */
 function createProductOrService($authentication, $product)
@@ -665,7 +665,7 @@ function createProductOrService($authentication, $product)
  * Update a product or service
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Product		$product			Product
+ * @param	array		$product			Product
  * @return	array							Array result
  */
 function updateProductOrService($authentication, $product)
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 37ec4d8f2de..353387f7681 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -432,7 +432,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $bar
  * Create a thirdparty
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Societe		$thirdparty		    Thirdparty
+ * @param	array		$thirdparty		    Thirdparty
  * @return	array							Array result
  */
 function createThirdParty($authentication, $thirdparty)
@@ -564,7 +564,7 @@ function createThirdParty($authentication, $thirdparty)
  * Update a thirdparty
  *
  * @param	array		$authentication		Array of authentication information
- * @param	Societe		$thirdparty		    Thirdparty
+ * @param	array		$thirdparty		    Thirdparty
  * @return	array							Array result
  */
 function updateThirdParty($authentication, $thirdparty)

From 20b740dcc8f6e6ea6fdf5ee981fe59ef6a9ecdfc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 24 Feb 2024 15:38:20 +0100
Subject: [PATCH 0156/1862] Qual: Review pre-commit configure - re-enable
 no-commit-to-branch (#28385)

# Qual: Review pre-commit configure - re-enable no-commit-to-branch

This reviews some of the documentation inside the pre-commit-config.yaml file.
It also re-enables the no-commit-to-branch hook.

Also enable spelling on hidden files (changes to pyproject.toml +
exceptions file).
---
 .pre-commit-config.yaml                       | 42 +++++++++++--------
 .../codespell/codespell-lines-ignore.txt      |  3 ++
 pyproject.toml                                |  3 +-
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 866efcc2928..45f51d5c5db 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,22 +5,30 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
-      # This hook test the name of the branch and return error if the name is 'develop' or an official version 'x.y'
-      # so you can't commit if your branch name is not a custom branch name. Using a custom branch name is good
-      # practice that make easier to manage PR. You can enable/disable this if you want to commit or not on branch
-      # with common names.
-      #- id: no-commit-to-branch
-      #  args: [--branch, develop, --pattern, \d+.0]
-      # This check format of xml files
+      # This hook tests the name of the branch and return an error if the name is
+      #  'develop' or an official version 'x.y'
+      # So you can't commit if your branch name is not a custom branch name.
+      # Using a custom branch name is good practice that makes it easier to manage PRs.
+      # You can skip this:
+      #  - Permanently:
+      #      export SKIP=no-commit-to-branch   # In your .bashrc or session.
+      #  - Only this for one commit:
+      #      SKIP=no-commit-to-branch git commit -a -m "My message"
+      #  - Skipping all checks for a commit:
+      #      git commit -a -m "My message" --no-verify
+      #      (Recommendation: run git commit -a .. once, then with `--no-verify`)
+      - id: no-commit-to-branch
+        args: [--branch, develop, --pattern, \d+.0]
+      # This checks that xml files are correct
       - id: check-xml
         exclude: |
           (?x)^(htdocs/includes/.*)$
-      # This check format of yaml files
+      # This checks that yaml files are correct
       - id: check-yaml
         args: [--unsafe]
-      # This checl format of json files
+      # This checks that json files are correct
       - id: check-json
-      # Fix DOS end of files to get Unix end of files
+      # Fixes Fix files that have DOS end of line endings
       - id: mixed-line-ending
         # alternative for dev/tools/fixdosfiles.sh
         exclude: |
@@ -28,14 +36,14 @@ repos:
                |.*/CRLF.*.php  # Files in swiftmailer
                )$
         args: [--fix=lf]
-      # Remove trailing whitespace.
+      # Remove trailing whitespace
       - id: trailing-whitespace
         exclude_types: [markdown]
       # Fix the end of file
       - id: end-of-file-fixer
-      # Check if there is not completly merged conflict
+      # Check that there are no completely merged file conflicts
       - id: check-merge-conflict
-      # Chech the shebangs of shell files
+      # Check that files with shebangs have the executable bit set (in git)
       - id: check-executables-have-shebangs
       # Check that shell files are executables
       - id: check-shebang-scripts-are-executable
@@ -46,7 +54,7 @@ repos:
           |build/debian/dolibarr.config )$
       # Fix the first UTF8 byte
       - id: fix-byte-order-marker
-      # ???
+      # Check that there are no files that have are the same when uppercased (conflict on windows)
       - id: check-case-conflict
 
   # Beautify shell scripts
@@ -59,10 +67,10 @@ repos:
 
   # Run local script
   #
-  # For instance to update the license in edited files, you could add to local.sh:
+  # For example, to update the license in edited files, you could add to local.sh:
   #
   #   ```shell
-  #  #!/bin/bash
+  #   #!/bin/bash
   #   MYDIR=$(dirname "$0")
   #   git diff HEAD --name-only | grep -v includes | \
   #       xargs "$MYDIR/dev/tools/updatelicense.php"
@@ -183,8 +191,6 @@ repos:
           - dev/tools/codespell/codespell-ignore.txt
           - -x
           - dev/tools/codespell/codespell-lines-ignore.txt
-          - --uri-ignore-words-list
-          - ned
         exclude_types: [image]
         exclude: (?x)^(.phan/stubs/.*)$
         additional_dependencies: [tomli]
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index aeacfdccaa0..d0ebf648c39 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -265,6 +265,9 @@
 	public function getSumOfAmount($fuser = '', $dates = '', $datee = '')
 	return $TWeek;
 	unset($_SESSION["adresse"]);
+          - creat,unitl,alltime,datas,referers
+          - informations,medias,uptodate,reenable,crypted,developpers
+          - ned
  *	@param	array 		$TWeek			array of week numbers
  * @param	array		$TWeek					Array of week numbers
  * Copyright (C) 2019		Tim Otte    			<otte@meuser.it>
diff --git a/pyproject.toml b/pyproject.toml
index 1700fc27828..23f76292a93 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,8 +7,9 @@ build-backend = "setuptools.build_meta"
 # `codespell` can be run as a standalone program from the CLI
 # with the appropriate default options.
 
-skip = "*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents"
+skip = "*/.*/*,*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents"
 
+check-hidden = true
 quiet-level=2
 ignore-regex = '\\[fnrstv]'
 builtin = "clear,rare,informal,usage,code,names"

From f90675f7fdaaa285d10beb8e1c3ab90f50ff3e8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 17:44:30 +0100
Subject: [PATCH 0157/1862] FIX quote in sql request

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

diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index 2bbfc99555f..affb6575dcb 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -435,26 +435,26 @@ class modStockTransfer extends DolibarrModules
 
 		$sql = array();
 
-		// Rôles
-		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "internal"');
+		// Roles
+		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'internal'");
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsible for stock transfers", 1, NULL, 0)');
+			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'internal', 'STRESP', 'Responsible for stock transfers', 1, NULL, 0)");
 		}
 
-		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STFROM" AND element = "StockTransfer" AND source = "external"');
+		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STFROM' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact sending the stock transfer", 1, NULL, 0)');
+			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STFROM', 'Contact sending the stock transfer', 1, NULL, 0)");
 		}
 
-		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "external"');
+		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact receiving the stock transfer", 1, NULL, 0)');
+			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STDEST', 'Contact receiving the stock transfer', 1, NULL, 0)");
 		}
 
 		return $this->_init($sql, $options);

From 1a25a086cb6cb246b34f1fef544487a7ce211824 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 17:44:30 +0100
Subject: [PATCH 0158/1862] FIX quote in sql request

---
 htdocs/core/modules/modStockTransfer.class.php   | 14 +++++++-------
 htdocs/install/mysql/migration/18.0.0-19.0.0.sql |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index d2f4b0b5bb7..ecb103946cb 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -435,26 +435,26 @@ class modStockTransfer extends DolibarrModules
 
 		$sql = array();
 
-		// Rôles
-		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "internal"');
+		// Roles
+		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'internal'");
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsable du transfert de stocks", 1, NULL, 0)');
+			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'internal', 'STRESP', 'Responsible for stock transfers', 1, NULL, 0)");
 		}
 
-		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STFROM" AND element = "StockTransfer" AND source = "external"');
+		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STFROM' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact expéditeur transfert de stocks", 1, NULL, 0)');
+			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STFROM', 'Contact sending the stock transfer', 1, NULL, 0)");
 		}
 
-		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "external"');
+		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
 		if (empty($res)) {
-			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact destinataire transfert de stocks", 1, NULL, 0)');
+			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STDEST', 'Contact receiving the stock transfer', 1, NULL, 0)");
 		}
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index c355ca25b79..f528d39bdc6 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -211,3 +211,5 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (1,'66','Soci
 ALTER TABLE llx_prelevement_lignes ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_bom_bomline ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+UPDATE llx_c_type_contact SET element = 'stocktransfer' WHERE element = 'StockTransfer';

From a3c0c1958e58b5bc48ab70e5949e45ccd869c405 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 18:05:42 +0100
Subject: [PATCH 0159/1862] Fix EOL in log

---
 test/phpunit/CommonClassTest.class.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 7942108ea78..52960396f51 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -39,6 +39,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 use PHPUnit\Framework\TestCase;
 
+
 /**
  * Class for PHPUnit tests
  *
@@ -80,10 +81,9 @@ abstract class CommonClassTest extends TestCase
 		$this->savdb = $db;
 
 		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
-			print get_called_class()." db->type=".$db->type." user->id=".$user->id;
+			print get_called_class()." db->type=".$db->type." user->id=".$user->id.PHP_EOL;
 		}
 		//print " - db ".$db->db;
-		print PHP_EOL;
 	}
 
 	/**
@@ -137,9 +137,8 @@ abstract class CommonClassTest extends TestCase
 		print "----- $className::$failedTestMethod failed - $argsText.".PHP_EOL;
 		print "Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
 		foreach ($last_lines as $line) {
-			print $line . "<br>";
+			print $line.PHP_EOL;
 		}
-		print PHP_EOL;
 		print "----- end of dolibarr.log for $className::$failedTestMethod".PHP_EOL;
 
 		parent::onNotSuccessfulTest($t);
@@ -234,17 +233,17 @@ abstract class CommonClassTest extends TestCase
 		'cashdesk' => null,
 		'category' => 'Categorie',
 		'clicktodial' => 'ClickToDial',
-		'TBD_COLLAB' => 'Collab',  // TODO: fill in proper name
+		'collab' => 'Collab',  // TODO: fill in proper name
 		'comptabilite' => 'Comptabilite',
 		'contact' => null,  // TODO: fill in proper class
 		'contract' => 'Contrat',
 		'cron' => 'Cron',
 		'datapolicy' => 'DataPolicy',
-		'TBD_DAV' => 'Dav',  // TODO: fill in proper name
+		'dav' => 'Dav',
 		'debugbar' => 'DebugBar',
 		'delivery_note' => 'Expedition',
 		'deplacement' => 'Deplacement',
-		"TBD_DocGen" => 'DocumentGeneration',  // TODO: fill in proper name
+		"documentgeneration" => 'DocumentGeneration',  // TODO: fill in proper name
 		'don' => 'Don',
 		'dynamicprices' => 'DynamicPrices',
 		'ecm' => 'ECM',
@@ -253,12 +252,12 @@ abstract class CommonClassTest extends TestCase
 		'eventorganization' => 'EventOrganization',
 		'expensereport' => 'ExpenseReport',
 		'export' => 'Export',
-		'TBD_EXTERNALRSS' => 'ExternalRss',  // TODO: fill in proper name
+		'externalrss' => 'ExternalRss',  // TODO: fill in proper name
 		'externalsite' => 'ExternalSite',
 		'fckeditor' => 'Fckeditor',
 		'fournisseur' => 'Fournisseur',
 		'ftp' => 'FTP',
-		'TBD_GEOIPMAXMIND' => 'GeoIPMaxmind',  // TODO: fill in proper name
+		'geoipmaxmind' => 'GeoIPMaxmind',  // TODO: fill in proper name
 		'google' => null,  // External ?
 		'gravatar' => 'Gravatar',
 		'holiday' => 'Holiday',
@@ -277,7 +276,6 @@ abstract class CommonClassTest extends TestCase
 		'mailmanspip' => 'MailmanSpip',
 		'margin' => 'Margin',
 		'member' => 'Adherent',
-		'member_type' => null,  // TODO: External module ?
 		'memcached' => null, // TODO: External module?
 		'modulebuilder' => 'ModuleBuilder',
 		'mrp' => 'Mrp',
@@ -286,7 +284,7 @@ abstract class CommonClassTest extends TestCase
 		'mymodule' => null, // modMyModule - Name used in module builder (avoid false positives)
 		'notification' => 'Notification',
 		'numberwords' => null, // Not provided by default, no module tests
-		'TBD_OAUTH' => 'Oauth', // TODO: set proper name
+		'oauth' => 'Oauth',
 		'openstreetmap' => null,  // External module?
 		'opensurvey' => 'OpenSurvey',
 		'order' => 'Commande',
@@ -296,7 +294,7 @@ abstract class CommonClassTest extends TestCase
 		'paypal' => 'Paypal',
 		'paypalplus' => null,
 		'prelevement' => 'Prelevement',
-		'TBD_PRINTING' => 'Printing', // TODO: set proper name
+		'printing' => 'Printing', // TODO: set proper name
 		'product' => 'Product',
 		'productbatch' => 'ProductBatch',
 		'productprice' => null,
@@ -326,7 +324,7 @@ abstract class CommonClassTest extends TestCase
 		'webhook' => 'Webhook',
 		'webportal' => 'WebPortal',
 		'webservices' => 'WebServices',
-		'TBD_WS_CLIENT' => 'WebServicesClient',  // TODO: set proper name
+		'webservicesclient' => 'WebServicesClient',  // TODO: set proper name
 		'website' => 'Website',
 		'workflow' => 'Workflow',
 		'workstation' => 'Workstation',

From f216c742cb675eab2e5f18d92086e69482452bb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 19:19:25 +0100
Subject: [PATCH 0160/1862] Add phone_mobile for #28070

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 3 +++
 htdocs/install/mysql/tables/llx_societe.sql      | 1 +
 2 files changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index c6983ac5d3a..f45c3ed8d2f 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -258,3 +258,6 @@ ALTER TABLE llx_socpeople ADD COLUMN name_alias varchar(255) NULL;
 
 -- Supplier
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, enabled, active, topic, content, content_lines, joinfiles) VALUES (0, 'supplier_invoice','invoice_supplier_send','',0,null,null,'(SendingReminderEmailOnUnpaidSupplierInvoice)',100, 'isModEnabled("supplier_invoice")',1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(SupplierInvoice)__','__(Hello)__,<br /><br />__(SupplierInvoiceUnpaidContent)__<br />__URL_SUPPLIER_INVOICE__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',null, 0);
+
+
+ALTER TABLE llx_societe ADD COLUMN phone_mobile varchar(20) after phone;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 0826442fe25..cf6275e48c4 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -52,6 +52,7 @@ create table llx_societe
   georesultcode            varchar(16),
 
   phone                    varchar(20),                         		-- phone number
+  phone_mobile             varchar(20),                         		-- mobile phone number
   fax                      varchar(20),                         		-- fax number
   url                      varchar(255),                        		-- web site
   email                    varchar(128),                        		-- main email

From 64269f15977933c3fbf3adc780c234cca8392dce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 19:24:37 +0100
Subject: [PATCH 0161/1862] Add phone_mobile for #28070

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aeb8899ecc4..814f0cbc304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,6 @@ The following changes may create regressions for some external modules, but were
 * Properties ->date_update and ->date_modification were merged into date_modification.
 
 
-
 ***** ChangeLog for 19.0.0 compared to 18.0 *****
 
 For users:

From 78622c24a0d96cae55e578fbdb2c641396550149 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 24 Feb 2024 19:28:14 +0100
Subject: [PATCH 0162/1862] Doc

---
 dev/setup/pre-commit/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/setup/pre-commit/README.md b/dev/setup/pre-commit/README.md
index 9db2d529b8e..f6e82b6dcb5 100644
--- a/dev/setup/pre-commit/README.md
+++ b/dev/setup/pre-commit/README.md
@@ -87,3 +87,7 @@ There is much more you can do with pre-commit, check out its
 Now your commit is less likely to fail in the Continuous Intagration (CI) run
 on github.\
 CI also runs pre-commit to help maintain code quality.
+
+Note:
+Code for precommits are saved into: 
+.cache/pre-commit/repoyXXXXX/py_env-python3/lib/pythonX.Y/site-packages/pre_commit_hooks/no_commit_to_branch.py

From 5a0ae16c18839dddb905e0ca99d184503fba6aed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 09:28:14 +0100
Subject: [PATCH 0163/1862] PERF: Performance enhancement on Invoice/Paiement
 area page

---
 htdocs/compta/index.php                       | 60 ++++++++-----------
 .../install/mysql/migration/19.0.0-20.0.0.sql |  3 +
 .../install/mysql/tables/llx_facture.key.sql  |  1 +
 .../mysql/tables/llx_facture_fourn.key.sql    |  1 +
 4 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 3d8d6c10e1d..e5e49696f0f 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -137,28 +137,23 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_client, s.code_compta, s.email";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	$sql .= ", sum(pf.amount) as am";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays, ".MAIN_DB_PREFIX."facture as f";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE s.rowid = f.fk_soc";
-	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	}
-	if ($socid) {
+	$sql .= ", (SELECT SUM(pf.amount) FROM llx_paiement_facture as pf WHERE pf.fk_facture = f.rowid) as am";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
+	$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
+	if ($socid > 0) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
+	// Filter on sale representative
+	if (!$user->hasRight('societe', 'client', 'voir')) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $user->id).")";
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerLastModified', $parameters);
 	$sql .= $hookmanager->resPrint;
 
-	$sql .= " GROUP BY f.rowid, f.ref, f.fk_statut, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms, f.date_lim_reglement,";
-	$sql .= " s.nom, s.rowid, s.code_client, s.code_compta, s.email,";
-	$sql .= " cc.rowid, cc.code";
 	$sql .= " ORDER BY f.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -197,6 +192,7 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 				$tmpinvoice->total_tva = $obj->total_tva;
 				$tmpinvoice->total_ttc = $obj->total_ttc;
 				$tmpinvoice->statut = $obj->status;
+				$tmpinvoice->status = $obj->status;
 				$tmpinvoice->paye = $obj->paye;
 				$tmpinvoice->date_lim_reglement = $db->jdate($obj->datelimite);
 				$tmpinvoice->type = $obj->type;
@@ -210,7 +206,7 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 				$thirdpartystatic->client = 1;
 				$thirdpartystatic->code_client = $obj->code_client;
 				//$thirdpartystatic->code_fournisseur = $obj->code_fournisseur;
-				$thirdpartystatic->code_compta = $obj->code_compta;
+				$thirdpartystatic->code_compta_client = $obj->code_compta;
 				//$thirdpartystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
 				print '<tr class="oddeven">';
@@ -287,28 +283,23 @@ if ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
 	$sql .= ", s.nom as name";
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
-	$sql .= ", SUM(pf.amount) as am";
+	$sql .= ", (SELECT SUM(pf.amount) FROM llx_paiementfourn_facturefourn as pf WHERE pf.fk_facturefourn = ff.rowid) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity IN (".getEntity('facture_fourn').")";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	}
-	if ($socid) {
+	if ($socid > 0) {
 		$sql .= " AND ff.fk_soc = ".((int) $socid);
 	}
+	// Filter on sale representative
+	if (!$user->hasRight('societe', 'client', 'voir')) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = ff.fk_soc AND sc.fk_user = ".((int) $user->id).")";
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierLastModified', $parameters);
 	$sql .= $hookmanager->resPrint;
 
-	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.tms, ff.paye, ff.ref_supplier,";
-	$sql .= " s.nom, s.rowid, s.code_fournisseur, s.code_compta_fournisseur, s.email";
-	$sql .= " ORDER BY ff.tms DESC ";
+	$sql .= " ORDER BY ff.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
@@ -600,22 +591,21 @@ if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("comm
 	$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut as status, c.total_ht, c.total_tva, c.total_ttc,";
 	$sql .= " cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_source = c.rowid AND el.sourcetype = 'commande'";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	}
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	$sql .= " AND c.fk_statut = ".Commande::STATUS_CLOSED;
+	$sql .= " AND c.fk_statut = ".((int) Commande::STATUS_CLOSED);
 	$sql .= " AND c.facture = 0";
+	// Filter on sale representative
+	if (!$user->hasRight('societe', 'client', 'voir')) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id).")";
+	}
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerOrderToBill', $parameters);
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index f45c3ed8d2f..0728a44f540 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -261,3 +261,6 @@ INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private,
 
 
 ALTER TABLE llx_societe ADD COLUMN phone_mobile varchar(20) after phone;
+
+ALTER TABLE llx_facture ADD INDEX idx_facture_tms (tms);
+ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_tms (tms);
diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql
index ee25f8c09d8..702392a459d 100644
--- a/htdocs/install/mysql/tables/llx_facture.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture.key.sql
@@ -30,6 +30,7 @@ ALTER TABLE llx_facture ADD INDEX idx_facture_fk_account (fk_account);
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_currency (fk_currency);
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
 ALTER TABLE llx_facture ADD INDEX idx_facture_datef (datef);
+ALTER TABLE llx_facture ADD INDEX idx_facture_tms (tms);
 
 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_soc            FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_user_author    FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql
index 18036c19d92..0331f9e4ae2 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql
@@ -26,6 +26,7 @@ ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_soc (fk_soc);
 ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_user_author (fk_user_author);
 ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_user_valid (fk_user_valid);
 ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_fk_projet (fk_projet);
+ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_tms (tms);
 
 ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_soc            FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
 ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_user_author    FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);

From 34ad7e86708c5f7195eed54b63cb8761b1b6ef61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 09:30:20 +0100
Subject: [PATCH 0164/1862] Fix doxygen

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

diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 63a37a540cf..e1244b06eda 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -90,7 +90,7 @@ function emailcollectorPrepareHead($object)
  * Get parts of a message
  *
  * @param 	object 			$structure 		Structure of message
- * @return 	array[false						Array of parts of the message|false if error
+ * @return 	array|false						Array of parts of the message|false if error
  */
 function getParts($structure)
 {

From b08e17e76d4dbebf2845e41ba2f7d7ddb896401e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 09:36:14 +0100
Subject: [PATCH 0165/1862] QUAL Rename all input fields "tel" into "phone"

---
 htdocs/admin/accountant.php                              | 4 ++--
 htdocs/admin/company.php                                 | 2 +-
 htdocs/societe/canvas/individual/tpl/card_create.tpl.php | 2 +-
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 66a1aa7a3b1..4190c55a8e1 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -61,7 +61,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("phone", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -153,7 +153,7 @@ print '</td></tr>'."\n";
 // Telephone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input name="tel" id="phone" class="maxwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_PHONE') ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
+print '<input name="phone" id="phone" class="maxwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOSTISSET('phone') ? GETPOST('phone', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_PHONE') ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 87639008243..d6981147691 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -481,7 +481,7 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input class="maxwidth150 widthcentpercentminusx" name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_TEL') ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
+print '<input class="maxwidth150 widthcentpercentminusx" name="phone" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('phone') ? GETPOST('phone', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_TEL') ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index e46721b167c..d929b7c8df9 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -144,7 +144,7 @@ if (isModEnabled('barcode')) { ?>
 
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
-	<td><input type="text" name="tel" value="<?php echo $this->control->tpl['tel']; ?>"></td>
+	<td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
 </tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 9c53ad5b3d8..d8b78283b95 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -148,7 +148,7 @@ if ($this->control->tpl['fournisseur']) {
 
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
-	<td><input type="text" name="tel" value="<?php echo $this->control->tpl['tel']; ?>"></td>
+	<td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
 </tr>

From c9f718f1c1b6fbfff225cce7335ed2252c8e1c3b Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Sun, 25 Feb 2024 09:43:11 +0100
Subject: [PATCH 0166/1862] Attempt at fixing #28070 with mobile phone to a
 thirdparty (#28110)

* NEW #28070 Adding mobile phone to thirdparty

* fix indenting

* trying to fix build errors

* too many parentases and missing;

* Update actions_card_common.class.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .../canvas/actions_card_common.class.php      |  4 ++-
 .../canvas/company/tpl/card_create.tpl.php    |  2 ++
 .../canvas/company/tpl/card_edit.tpl.php      |  2 ++
 .../canvas/company/tpl/card_view.tpl.php      |  2 ++
 .../canvas/individual/tpl/card_create.tpl.php |  2 ++
 .../canvas/individual/tpl/card_edit.tpl.php   |  2 ++
 .../canvas/individual/tpl/card_view.tpl.php   |  2 ++
 htdocs/societe/card.php                       | 10 +++++++
 htdocs/societe/class/societe.class.php        | 23 +++++++++++++--
 htdocs/societe/list.php                       | 28 ++++++++++++++++++-
 10 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 8949242dfc3..a98680cfeb9 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -298,6 +298,7 @@ abstract class ActionsCardCommon
 			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
 			$this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_mobile'] 	= dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_MOB');
 			$this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
 			$this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 1);
 			$this->tpl['url'] 		= dol_print_url($this->object->url);
@@ -401,7 +402,8 @@ abstract class ActionsCardCommon
 		$this->object->town					= GETPOST("town");
 		$this->object->country_id = GETPOST("country_id") ? GETPOST("country_id") : $mysoc->country_id;
 		$this->object->state_id = GETPOST("state_id");
-		$this->object->phone				= GETPOST("tel");
+		$this->object->phone				= GETPOST("phone");
+		$this->object->phone_mobile			= GETPOST("phone_mobile");
 		$this->object->fax					= GETPOST("fax");
 		$this->object->email				= GETPOST("email", 'alphawithlgt');
 		$this->object->url					= GETPOST("url");
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index b18f0b31ec2..396edff865b 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -137,6 +137,8 @@ if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
 	<td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
+	<td><?php echo $langs->trans('PhoneMobile'); ?></td>
+	<td><input type="text" name="phone_mobile" value="<?php echo $this->control->tpl['phone_mobile']; ?>"></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
 </tr>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 651a9cc180d..74851c874ea 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -152,6 +152,8 @@ if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
 	<td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
+	<td><?php echo $langs->trans('PhoneMobile'); ?></td>
+	<td><input type="text" name="phone_mobile" value="<?php echo $this->control->tpl['phone_mobile']; ?>"></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
 </tr>
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index e4fa05d1b0e..f649f607280 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -111,6 +111,8 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
 	<td><?php echo $this->control->tpl['phone']; ?></td>
+	<td><?php echo $langs->trans('PhoneMobile'); ?></td>
+	<td><?php echo $this->control->tpl['phone_mobile']; ?></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><?php echo $this->control->tpl['fax']; ?></td>
 </tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index d929b7c8df9..d255656bd72 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -145,6 +145,8 @@ if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
 	<td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
+	<td><?php echo $langs->trans('PhoneMobile'); ?></td>
+	<td><input type="text" name="phone_mobile" value="<?php echo $this->control->tpl['phone_mobile']; ?>"></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
 </tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index d8b78283b95..46f2bb63afa 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -149,6 +149,8 @@ if ($this->control->tpl['fournisseur']) {
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
 	<td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
+	<td><?php echo $langs->trans('PhoneMobile'); ?></td>
+	<td><input type="text" name="phone_mobile" value="<?php echo $this->control->tpl['phone_mobile']; ?>"></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
 </tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index b23df41c5b9..3d5d98197f2 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -106,6 +106,8 @@ if ($this->control->tpl['action_delete']) {
 <tr>
 	<td><?php echo $langs->trans('Phone'); ?></td>
 	<td><?php echo $this->control->tpl['phone']; ?></td>
+	<td><?php echo $langs->trans('PhoneMobile'); ?></td>
+	<td><?php echo $this->control->tpl['phone_mobile']; ?></td>
 	<td><?php echo $langs->trans('Fax'); ?></td>
 	<td><?php echo $this->control->tpl['fax']; ?></td>
 </tr>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 02d42b389ad..f349ca32078 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -340,6 +340,7 @@ if (empty($reshook)) {
 			}
 
 			$object->phone					= GETPOST('phone', 'alpha');
+			$object->phone_mobile 			= (string) GETPOST("phone_mobile", 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
 			$object->no_email 				= GETPOST("no_email", "int");
@@ -992,6 +993,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		}
 
 		$object->phone				= GETPOST('phone', 'alpha');
+		$object->phone_mobile       = (string) GETPOST("phone_mobile", 'alpha');
 		$object->fax				= GETPOST('fax', 'alpha');
 		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -1475,6 +1477,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
 			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+
+			print '<td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').' <input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
+
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
@@ -1865,6 +1871,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				$object->phone					= GETPOST('phone', 'alpha');
+				$object->phone_mobile			= (string) GETPOST('phone_mobile', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 				$object->no_email				= GETPOST("no_email", "int");
@@ -2211,6 +2218,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
+				print '<td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', GETPOST('phone_mobile', 'alpha'), $object, 0).'</td>';
+				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').' <input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
+
 				print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
 				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 				print '</tr>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index df727b4f8ce..8390295fed6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -208,6 +208,7 @@ class Societe extends CommonObject
 		'fk_departement' =>array('type'=>'integer', 'label'=>'State', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		'fk_pays' =>array('type'=>'integer:Ccountry:core/class/ccountry.class.php', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
+		'phone_mobile' =>array('type'=>'varchar(20)', 'label'=>'PhoneMobile', 'enabled'=>1, 'visible'=>-1, 'position'=>102),
 		'fax' =>array('type'=>'varchar(20)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
 		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
 		'email' =>array('type'=>'varchar(128)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
@@ -351,6 +352,11 @@ class Societe extends CommonObject
 	 * @var string
 	 */
 	public $phone;
+	/**
+	 * PhoneMobile number
+	 * @var string
+	 */
+	public $phone_mobile;
 	/**
 	 * Fax number
 	 * @var string
@@ -1371,6 +1377,9 @@ class Societe extends CommonObject
 		$this->phone		= trim((string) $this->phone);
 		$this->phone		= preg_replace("/\s/", "", $this->phone);
 		$this->phone		= preg_replace("/\./", "", $this->phone);
+		$this->phone_mobile		= trim((string) $this->phone_mobile);
+		$this->phone_mobile		= preg_replace("/\s/", "", $this->phone_mobile);
+		$this->phone_mobile		= preg_replace("/\./", "", $this->phone_mobile);
 		$this->fax			= trim((string) $this->fax);
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
@@ -1521,6 +1530,7 @@ class Societe extends CommonObject
 			$sql .= ",fk_pays = ".((!empty($this->country_id) && $this->country_id > 0) ? ((int) $this->country_id) : 'null');
 
 			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
+			$sql .= ",phone_mobile = ".(!empty($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
 			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
 			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
 			$sql .= ",socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
@@ -1801,7 +1811,7 @@ class Societe extends CommonObject
 		$sql .= ', s.status, s.fk_warehouse';
 		$sql .= ', s.price_level';
 		$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
-		$sql .= ', s.phone, s.fax, s.email';
+		$sql .= ', s.phone, s.phone_mobile, s.fax, s.email';
 		$sql .= ', s.socialnetworks';
 		$sql .= ', s.url, s.zip, s.town, s.note_private, s.note_public, s.client, s.fournisseur';
 		$sql .= ', s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6';
@@ -1945,6 +1955,7 @@ class Societe extends CommonObject
 
 				$this->url = $obj->url;
 				$this->phone = $obj->phone;
+				$this->phone_mobile = $obj->phone_mobile;
 				$this->fax = $obj->fax;
 
 				$this->parent = $obj->parent;
@@ -2769,11 +2780,15 @@ class Societe extends CommonObject
 		if (!empty($this->url)) {
 			$datas['url'] = '<br>'.img_picto('', 'globe', 'class="pictofixedwidth"').$this->url;
 		}
-		if (!empty($this->phone) || !empty($this->fax)) {
+		if (!empty($this->phone) || !empty($this->phone_mobile) || !empty($this->fax)) {
 			$phonelist = array();
 			if ($this->phone) {
 				$phonelist[] = dol_print_phone($this->phone, $this->country_code, $this->id, 0, '', '&nbsp', 'phone');
 			}
+			// deliberately not making new list because fax uses same list as phone
+			if ($this->phone_mobile) {
+				$phonelist[] = dol_print_phone($this->phone_mobile, $this->country_code, $this->id, 0, '', '&nbsp', 'phone_mobile');
+			}
 			if ($this->fax) {
 				$phonelist[] = dol_print_phone($this->fax, $this->country_code, $this->id, 0, '', '&nbsp', 'fax');
 			}
@@ -4383,6 +4398,7 @@ class Societe extends CommonObject
 		}
 
 		$this->phone = getDolGlobalString('MAIN_INFO_SOCIETE_TEL');
+		$this->phone_mobile = getDolGlobalString('MAIN_INFO_SOCIETE_MOBILE');
 		$this->fax = getDolGlobalString('MAIN_INFO_SOCIETE_FAX');
 		$this->url = getDolGlobalString('MAIN_INFO_SOCIETE_WEB');
 
@@ -4477,6 +4493,7 @@ class Societe extends CommonObject
 		$this->url = 'http://www.specimen.com';
 
 		$this->phone = '0909090901';
+		$this->phone_mobile = '0909090901';
 		$this->fax = '0909090909';
 
 		$this->code_client = 'CC-'.dol_print_date($now, 'dayhourlog');
@@ -5321,7 +5338,7 @@ class Societe extends CommonObject
 			$this->client = $this->client | $soc_origin->client;
 			$this->fournisseur = $this->fournisseur | $soc_origin->fournisseur;
 			$listofproperties = array(
-				'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'fax', 'email', 'socialnetworks', 'url', 'barcode',
+				'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_mobile', 'fax', 'email', 'socialnetworks', 'url', 'barcode',
 				'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 				'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
 				'stcomm_id', 'outstanding_limit', 'order_min_amount', 'supplier_order_min_amount', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index c2f994d2fd8..b7103477be3 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -86,6 +86,7 @@ $search_state = trim(GETPOST("search_state", 'alpha'));
 $search_region = trim(GETPOST("search_region", 'alpha'));
 $search_email = trim(GETPOST('search_email', 'alpha'));
 $search_phone = trim(GETPOST('search_phone', 'alpha'));
+$search_phone_mobile = trim(GETPOST('search_phone_mobile', 'alpha'));
 $search_fax = trim(GETPOST('search_fax', 'alpha'));
 $search_url = trim(GETPOST('search_url', 'alpha'));
 $search_idprof1 = trim(GETPOST('search_idprof1', 'alpha'));
@@ -229,6 +230,7 @@ $fieldstosearchall = array(
 	's.siret'=>"ProfId2",
 	's.ape'=>"ProfId3",
 	's.phone'=>"Phone",
+	's.phone_mobile'=>"PhoneMobile",
 	's.fax'=>"Fax",
 );
 if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') {
@@ -287,6 +289,7 @@ $arrayfields = array(
 	's.fax'=>array('label'=>"Fax", 'position'=>28, 'checked'=>0),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'position'=>29, 'checked'=>$checkedtypetiers),
 	'staff.code'=>array('label'=>"Workforce", 'position'=>31, 'checked'=>0),
+	's.phone_mobile'=>array('label'=>"PhoneMobile", 'position'=>32, 'checked'=>0),
 	's.siren'=>array('label'=>"ProfId1Short", 'position'=>40, 'checked'=>$checkedprofid1),
 	's.siret'=>array('label'=>"ProfId2Short", 'position'=>41, 'checked'=>$checkedprofid2),
 	's.ape'=>array('label'=>"ProfId3Short", 'position'=>42, 'checked'=>$checkedprofid3),
@@ -408,6 +411,7 @@ if (empty($reshook)) {
 		$search_country = '';
 		$search_email = '';
 		$search_phone = '';
+		$search_phone_mobile = '';
 		$search_fax = '';
 		$search_url = '';
 		$search_idprof1 = '';
@@ -536,7 +540,7 @@ if ($resql) {
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.address, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
-$sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
+$sql .= " s.email, s.phone, s.phone_mobile, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
 $sql .= " s.tms as date_modification, s.datec as date_creation, s.import_key,";
 $sql .= " s.code_compta, s.code_compta_fournisseur, s.parent as fk_parent,s.price_level,";
 $sql .= " s2.nom as name2,";
@@ -705,6 +709,9 @@ if ($search_email) {
 if (strlen($search_phone)) {
 	$sql .= natural_search("s.phone", $search_phone);
 }
+if (strlen($search_phone_mobile)) {
+	$sql .= natural_search("s.phone_mobile", $search_phone_mobile);
+}
 if (strlen($search_fax)) {
 	$sql .= natural_search("s.fax", $search_fax);
 }
@@ -929,6 +936,9 @@ if ($search_town != '') {
 if ($search_phone != '') {
 	$param .= "&search_phone=".urlencode($search_phone);
 }
+if ($search_phone_mobile != '') {
+	$param .= "&search_phone_mobile=".urlencode($search_phone_mobile);
+}
 if ($search_fax != '') {
 	$param .= "&search_fax=".urlencode($search_fax);
 }
@@ -1372,6 +1382,12 @@ if (!empty($arrayfields['s.phone']['checked'])) {
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
 	print '</td>';
 }
+if (!empty($arrayfields['s.phone_mobile']['checked'])) {
+	// PhoneMobile
+	print '<td class="liste_titre">';
+	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_phone_mobile" value="'.dol_escape_htmltag($search_phone_mobile).'">';
+	print '</td>';
+}
 if (!empty($arrayfields['s.fax']['checked'])) {
 	// Fax
 	print '<td class="liste_titre">';
@@ -1599,6 +1615,10 @@ if (!empty($arrayfields['s.phone']['checked'])) {
 	print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
+if (!empty($arrayfields['s.phone_mobile']['checked'])) {
+	print_liste_field_titre($arrayfields['s.phone_mobile']['label'], $_SERVER["PHP_SELF"], "s.phone_mobile", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
 if (!empty($arrayfields['s.fax']['checked'])) {
 	print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
@@ -1955,6 +1975,12 @@ while ($i < $imaxinloop) {
 				$totalarray['nbfield']++;
 			}
 		}
+		if (!empty($arrayfields['s.phone_mobile']['checked'])) {
+			print '<td class="nowraponall">'.dol_print_phone($obj->phone_mobile, $companystatic->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone_mobile')."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		if (!empty($arrayfields['s.fax']['checked'])) {
 			print '<td class="nowraponall">'.dol_print_phone($obj->fax, $companystatic->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'fax')."</td>\n";
 			if (!$i) {

From a08cb4ca1e5e922622ebde46559ee1621aeeabe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 09:55:47 +0100
Subject: [PATCH 0167/1862] fix phpstan (#28408)

Property RecruitmentJobPosition::$import_key (string) does not accept null.
---
 htdocs/recruitment/class/recruitmentjobposition.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 115c390aeeb..57f900c86c1 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -268,7 +268,7 @@ class RecruitmentJobPosition extends CommonObject
 		// Reset some properties
 		unset($object->id);
 		unset($object->fk_user_creat);
-		$object->import_key = null;
+		unset($object->import_key);
 
 		// Clear fields
 		if (property_exists($object, 'ref')) {

From fc432928eaa170d9d18369d4d27e37ff866a7912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 09:56:05 +0100
Subject: [PATCH 0168/1862] fix phpstan (#28400)

* fix phpstan

Property PaymentVarious::$id (int) does not accept null.
Property PaymentVarious::$ref (string) does not accept null.

* Update emailcollector.lib.php
---
 htdocs/compta/bank/various_payment/card.php      | 5 +++--
 htdocs/emailcollector/lib/emailcollector.lib.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 6e6924727bb..9463e357b42 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2023       Joachim Kueter     		<git-jk@bloxera.com>
  *
@@ -264,7 +264,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 	$object->fetch($id);
 
 	if ($object->id > 0) {
-		$object->id = $object->ref = null;
+		unset($object->id);
+		unset($object->ref);
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index e1244b06eda..8bb69da5f3b 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,7 +102,7 @@ function getParts($structure)
  * Array with joined files
  *
  * @param 	object 			$part 		Part of message
- * @return 	object|boolean 				Definition of message|false en cas d'erreur
+ * @return 	object|boolean 				Definition of message|false in case of error
  */
 function getDParameters($part)
 {
@@ -112,7 +113,7 @@ function getDParameters($part)
  * Get attachments of a given mail
  *
  * @param 	integer $jk 	Number of email
- * @param 	object 	$mbox 	object connection imaap
+ * @param 	object 	$mbox 	object connection imap
  * @return 	array 			type, filename, pos
  */
 function getAttachments($jk, $mbox)

From 8588e973644669a5bc69c064d02618eeb03861ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 09:56:23 +0100
Subject: [PATCH 0169/1862] fix phpstan (#28397)

Property CommonObject::$ref (string) does not accept int.
---
 htdocs/core/class/fiscalyear.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 0162ee7de95..7d617e1ecb3 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2020       OScss-Shop          <support@oscss-shop.fr>
- * Copyright (C) 2023       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -317,7 +317,7 @@ class Fiscalyear extends CommonObject
 		global $conf, $langs, $user;
 
 		if (empty($this->ref)) {
-			$this->ref = $this->id;
+			$this->ref = (string) $this->id;
 		}
 
 		if (!empty($conf->dol_no_mouse_hover)) {

From af3761000a4abe1b15b1060610e7a17a96e8df9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 09:56:46 +0100
Subject: [PATCH 0170/1862] fix phpstan (#28406)

Property ExtraFields::$errno (string) does not accept int.
---
 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 2986940f30e..2153ad048a2 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -171,7 +171,7 @@ class ExtraFields
 			$err2 = $this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS')) {
 				$this->error = '';
-				$this->errno = 0;
+				$this->errno = '0';
 				return 1;
 			} else {
 				return -2;

From 6876f9fcc39ee1d331f69ccf81a336508eca39dc Mon Sep 17 00:00:00 2001
From: Goldron <david@goldron.fr>
Date: Sun, 25 Feb 2024 09:58:24 +0100
Subject: [PATCH 0171/1862] Fixes an error by initializing ->line in the
 insert_discount method. (#28407)

* Fixes an error by initializing ->line in the insert_discount method.

* Update propal.class.php

---------

Co-authored-by: David IGREJA <david@siladel.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/comm/propal/class/propal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 2a54cf84cf1..937b3424acb 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -514,7 +514,7 @@ class Propal extends CommonObject
 
 			$line = new PropaleLigne($this->db);
 
-			$this->line->context = $this->context;
+			$line->context = $this->context;
 
 			$line->fk_propal = $this->id;
 			$line->fk_remise_except = $remise->id;

From cac5d5e7c8172f7b83bbb21b7fe4bbaf09516519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:00:09 +0100
Subject: [PATCH 0172/1862] fix phpstan (#28398)

Property HookManager::$error (string) does not accept int.
---
 htdocs/core/class/hookmanager.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index b4c4f37e569..6c9cea6f6f7 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -239,7 +239,7 @@ class HookManager
 					$modulealreadyexecuted[$module] = $module;
 
 					// Clean class (an error may have been set from a previous call of another method for same module/hook)
-					$actionclassinstance->error = 0;
+					$actionclassinstance->error = '';
 					$actionclassinstance->errors = array();
 
 					if (getDolGlobalInt('MAIN_HOOK_DEBUG')) {

From 92103e20292f20c7410e96d02dcee90c1273ecfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:00:39 +0100
Subject: [PATCH 0173/1862] fix phpstan (#28399)

Property CommonObject::$fk_project (int) does not accept string.
---
 .../supplier_proposal/class/supplier_proposal.class.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 2a3a2681b77..b2a681606df 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2014      Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2016      Ferran Marcet            <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  * Copyright (C) 2022      Gauthier VERDOL     		<gauthier.verdol@atm-consulting.fr>
  *
@@ -1125,9 +1125,9 @@ class SupplierProposal extends CommonObject
 		if (!empty($fromid) && $fromid != $this->socid) {
 			if ($objsoc->fetch($fromid) > 0) {
 				$this->socid = $objsoc->id;
-				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-				$this->fk_project = '';
+				$this->cond_reglement_id = (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$this->mode_reglement_id = (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				unset($this->fk_project);
 			}
 
 			// TODO Change product price if multi-prices

From fe0123262d54a12a128b288dac255b3bdb96eff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:00:58 +0100
Subject: [PATCH 0174/1862] fix phpstan (#28401)

Property ProductCombinationLevel::$fk_product_attribute_combination (int) does not accept float.
---
 htdocs/variants/class/ProductCombination.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 46e41cb5680..25d69eaeac9 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -1151,7 +1151,7 @@ class ProductCombinationLevel
 		}
 
 		$this->id = $obj->rowid;
-		$this->fk_product_attribute_combination = (float) $obj->fk_product_attribute_combination;
+		$this->fk_product_attribute_combination = (int) $obj->fk_product_attribute_combination;
 		$this->fk_price_level = intval($obj->fk_price_level);
 		$this->variation_price = (float) $obj->variation_price;
 		$this->variation_price_percentage = (bool) $obj->variation_price_percentage;

From 2cfeacbd1eff919788954a31776f565f316e856a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:03:04 +0100
Subject: [PATCH 0175/1862] fix phpstan (#28402)

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 8dc6b56262f..fc14b2c8d1f 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018   Pierre Chéné            <pierre.chene44@gmail.com>
  * Copyright (C) 2019   Cedric Ancelin          <icedo.anc@gmail.com>
- * Copyright (C) 2020-2021  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023       Alexandre Janniaux  <alexandre.janniaux@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -472,9 +472,12 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @param int		$id					Id of thirdparty
 	 * @param int       $representative_id	Id of representative
-	 * @return Object|void
+	 * @return int							Return integer <=0 if KO, >0 if OK
 	 *
 	 * @url POST {id}/representative/{representative_id}
+	 *
+	 * @throws RestException 401 Access not allowed for your login
+ 	 * @throws RestException 404 User or Thirdparty not found
 	 */
 	public function addRepresentative($id, $representative_id)
 	{
@@ -503,9 +506,12 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @param int		$id					Id of thirdparty
 	 * @param int       $representative_id	Id of representative
-	 * @return Object|void
+	 * @return int							Return integer <=0 if KO, >0 if OK
 	 *
 	 * @url DELETE {id}/representative/{representative_id}
+	 *
+	 * @throws RestException 401 Access not allowed for your login
+ 	 * @throws RestException 404 User or Thirdparty not found
 	 */
 	public function deleteRepresentative($id, $representative_id)
 	{

From c159aff82fbef58b190eeb0f5e304c5cafe857be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 10:04:27 +0100
Subject: [PATCH 0176/1862] phpcs

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index fc14b2c8d1f..db163d36068 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -32,7 +32,7 @@ class Thirdparties extends DolibarrApi
 {
 	/**
 	 *
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var array   $FIELDS     Mandatory fields, checked when we create and update the object
 	 */
 	public static $FIELDS = array(
 		'name'
@@ -477,7 +477,7 @@ class Thirdparties extends DolibarrApi
 	 * @url POST {id}/representative/{representative_id}
 	 *
 	 * @throws RestException 401 Access not allowed for your login
- 	 * @throws RestException 404 User or Thirdparty not found
+	 * @throws RestException 404 User or Thirdparty not found
 	 */
 	public function addRepresentative($id, $representative_id)
 	{
@@ -511,7 +511,7 @@ class Thirdparties extends DolibarrApi
 	 * @url DELETE {id}/representative/{representative_id}
 	 *
 	 * @throws RestException 401 Access not allowed for your login
- 	 * @throws RestException 404 User or Thirdparty not found
+	 * @throws RestException 404 User or Thirdparty not found
 	 */
 	public function deleteRepresentative($id, $representative_id)
 	{

From b7b799b88e1fec4bb7ccf4e8ce7c19112ad9944f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:04:57 +0100
Subject: [PATCH 0177/1862] fix phpstan (#28403)

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index dec81f921ec..1852fc9f878 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -249,7 +249,7 @@ class FormSetup
 	 * saveConfFromPost
 	 *
 	 * @param 	bool 		$noMessageInUpdate display event message on errors and success
-	 * @return	 int        -1 if KO, 1 if OK
+	 * @return	int|null    Return -1 if KO, 1 if OK, null if no items
 	 */
 	public function saveConfFromPost($noMessageInUpdate = false)
 	{
@@ -266,7 +266,6 @@ class FormSetup
 			return $reshook;
 		}
 
-
 		if (empty($this->items)) {
 			return null;
 		}

From 5c33a3602d0923a3d498d37913b62d289ab43467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:05:11 +0100
Subject: [PATCH 0178/1862] fix phpstan (#28404)

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

diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 70f6334972d..cd4dca967dc 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -1225,8 +1225,8 @@ class Productlot extends CommonObject
 		$this->sellby = $now - 100000;
 		$this->datec = $now - 3600;
 		$this->tms = $now;
-		$this->fk_user_creat = null;
-		$this->fk_user_modif = null;
+		$this->fk_user_creat = 0;
+		$this->fk_user_modif = 0;
 		$this->import_key = '123456';
 	}
 

From b6fdae934a47f343862e5d2413772c8f07d180a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:05:26 +0100
Subject: [PATCH 0179/1862] fix phpstan (#28405)

Method DolibarrApi::_checkValForAPI() should return string but returns array.
---
 htdocs/api/class/api.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 8e900c27462..63d504b14cb 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -75,10 +75,10 @@ class DolibarrApi
 	 *
 	 * Display a short message an return a http code 200
 	 *
-	 * @param	string		$field		Field name
-	 * @param	mixed		$value		Value to check/clean
-	 * @param	Object		$object		Object
-	 * @return 	string					Value cleaned
+	 * @param	string			$field		Field name
+	 * @param	string|array	$value		Value to check/clean
+	 * @param	Object			$object		Object
+	 * @return 	string|array				Value cleaned
 	 */
 	protected function _checkValForAPI($field, $value, $object)
 	{

From 19427168c0aa2fe67f3466ba57fcfd1f6490f9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:06:21 +0100
Subject: [PATCH 0180/1862] enhance warnings messages (#28409)

---
 htdocs/admin/modulehelp.php     | 2 +-
 htdocs/admin/modules.php        | 2 +-
 htdocs/admin/system/modules.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index cbf9ac6fba6..8ef166d933c 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -200,7 +200,7 @@ foreach ($modulesdir as $dir) {
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						} else {
-							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
+							print info_admin("Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)", 0, 0, '1', 'warning');
 						}
 					} catch (Exception $e) {
 						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 27d0b5c0581..62c612ab24a 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -485,7 +485,7 @@ foreach ($modulesdir as $dir) {
 								dol_syslog("Module ".get_class($objMod)." not qualified");
 							}
 						} else {
-							print "admin/modules.php Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
+							print info_admin("admin/modules.php Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)", 0, 0, '1', 'warning');
 						}
 					} catch (Exception $e) {
 						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 4cd42fe0243..94c29927cb9 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -67,7 +67,7 @@ $arrayfields = array(
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
 $param = '';
-
+$info_admin = '';
 
 /*
  * Actions
@@ -120,7 +120,7 @@ foreach ($modulesdir as $dir) {
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						} else {
-							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
+							$info_admin .= info_admin("Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)", 0, 0, '1', 'warning');
 						}
 					}
 				}
@@ -202,7 +202,7 @@ foreach ($modules as $key => $module) {
  */
 
 llxHeader();
-
+print $info_admin;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

From b8acde3a4383be5705b3c2338a3b1f7453e2da9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 12:58:20 +0100
Subject: [PATCH 0181/1862] Fix field position

---
 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 706c32494b4..bf454b2a1ca 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -135,7 +135,7 @@ class EmailCollector extends CommonObject
 		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
 		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>"1", 'position'=>103, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
 		'oauth_service' => array('type'=>'varchar(128)', 'label'=>'oauthService', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>104, 'notnull'=>0, 'index'=>1, 'comment'=>"IMAP login oauthService", 'arrayofkeyval'=>array(), 'help'=>'TokenMustHaveBeenCreated'),
-		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>104, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
+		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>109, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
 		'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
 		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>50),
 		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1, 'csslist'=>'nowraponall'),

From fca9ebe72f8d793e5cc1ef63d330ebb2d28960bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 12:58:20 +0100
Subject: [PATCH 0182/1862] Fix field position

---
 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 df07651e7af..d68d6fbb99e 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -136,7 +136,7 @@ class EmailCollector extends CommonObject
 		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
 		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>"1", 'position'=>103, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
 		'oauth_service' => array('type'=>'varchar(128)', 'label'=>'oauthService', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>104, 'notnull'=>0, 'index'=>1, 'comment'=>"IMAP login oauthService", 'arrayofkeyval'=>array(), 'help'=>'TokenMustHaveBeenCreated'),
-		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>104, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
+		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>109, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
 		'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
 		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>50),
 		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1, 'csslist'=>'nowraponall'),

From 4c3830b90973640805be1a8d804e8cd3b59daaa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 13:06:31 +0100
Subject: [PATCH 0183/1862] Fix set the default value

---
 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 d68d6fbb99e..8a74a5a434a 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -152,7 +152,7 @@ class EmailCollector extends CommonObject
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>511, 'notnull'=>-1,),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Inactive', '1'=>'Active'))
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Inactive', '1'=>'Active'))
 	);
 
 

From 7ee8e2580d58d2a9ce43a14895c742d952d78997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 14:02:08 +0100
Subject: [PATCH 0184/1862] fix phpstan

---
 phpstan.neon | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpstan.neon b/phpstan.neon
index a4ddc377751..fcbfd171e80 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -52,7 +52,6 @@ parameters:
 		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Sprain\\SwissQrBill\\#'
 		- '#Constructor of class .* has an unused parameter #'
-		- '#Default value of the parameter#'
 	internalErrorsCountLimit: 50
 	cache:
 		nodesByFileCountMax: 512

From 05914b4c78162d3dfdaea7de746b1a90efedd370 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 16:57:45 +0100
Subject: [PATCH 0185/1862] Fix warning

---
 htdocs/core/lib/website.lib.php        | 6 +++---
 htdocs/core/website.inc.php            | 2 +-
 htdocs/website/class/website.class.php | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 912247eb0ff..4583852526a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -676,13 +676,13 @@ function getStructuredData($type, $data = array())
 		$ret .= '{
 			"@context": "https://schema.org",
 			"@type": "Organization",
-			"name": "'.dol_escape_json($data['name'] ? $data['name'] : $companyname).'",
-			"url": "'.dol_escape_json($data['url'] ? $data['url'] : $url).'",
+			"name": "'.dol_escape_json(!empty($data['name']) ? $data['name'] : $companyname).'",
+			"url": "'.dol_escape_json(!empty($data['url']) ? $data['url'] : $url).'",
 			"logo": "'.($data['logo'] ? dol_escape_json($data['logo']) : '/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo)).'",
 			"contactPoint": {
 				"@type": "ContactPoint",
 				"contactType": "Contact",
-				"email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"
+				"email": "'.dol_escape_json(!empty($data['email']) ? $data['email'] : $mysoc->email).'"
 			}'."\n";
 		if (is_array($mysoc->socialnetworks) && count($mysoc->socialnetworks) > 0) {
 			$ret .= ",\n";
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 9be644e0c16..9a340050d22 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -67,7 +67,7 @@ if (!is_object($weblangs)) {
 if (!is_object($pagelangs)) {
 	$pagelangs = new Translate('', $conf);
 }
-if ($pageid > 0) {
+if (!empty($pageid) && $pageid > 0) {
 	$websitepage->fetch($pageid);
 
 	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['weblangs-shortcode'])));
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index f5a4ec292bd..84a35074805 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -77,10 +77,15 @@ class Website extends CommonObject
 	public $description;
 
 	/**
-	 * @var string Main language of web site
+	 * @var string Main language on 5 chars of web site
 	 */
 	public $lang;
 
+	/**
+	 * @var string Main language on 2 chars of web site
+	 */
+	public $shortlang;
+
 	/**
 	 * @var string List of languages of web site ('fr', 'es_MX', ...)
 	 */

From 0a9d4540554627525539803c2e1104792a16219d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 17:01:37 +0100
Subject: [PATCH 0186/1862] Fix revert

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 84a35074805..f5a4ec292bd 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -77,15 +77,10 @@ class Website extends CommonObject
 	public $description;
 
 	/**
-	 * @var string Main language on 5 chars of web site
+	 * @var string Main language of web site
 	 */
 	public $lang;
 
-	/**
-	 * @var string Main language on 2 chars of web site
-	 */
-	public $shortlang;
-
 	/**
 	 * @var string List of languages of web site ('fr', 'es_MX', ...)
 	 */

From 076cde3005e3246b7821cd5e0b4f3b18ae1230e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 17:20:28 +0100
Subject: [PATCH 0187/1862] Fix warning

---
 htdocs/asset/class/asset.class.php                              | 2 +-
 htdocs/asset/class/assetmodel.class.php                         | 2 +-
 htdocs/bookcal/class/availabilities.class.php                   | 2 +-
 htdocs/bookcal/class/calendar.class.php                         | 2 +-
 htdocs/core/class/defaultvalues.class.php                       | 2 +-
 htdocs/core/class/timespent.class.php                           | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php      | 2 +-
 .../eventorganization/class/conferenceorboothattendee.class.php | 2 +-
 htdocs/hrm/class/evaluation.class.php                           | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                        | 2 +-
 htdocs/hrm/class/job.class.php                                  | 2 +-
 htdocs/hrm/class/position.class.php                             | 2 +-
 htdocs/hrm/class/skill.class.php                                | 2 +-
 htdocs/hrm/class/skilldet.class.php                             | 2 +-
 htdocs/hrm/class/skillrank.class.php                            | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php      | 2 +-
 htdocs/opensurvey/class/opensurveysondage.class.php             | 2 +-
 htdocs/partnership/class/partnership.class.php                  | 2 +-
 htdocs/partnership/class/partnership_type.class.php             | 2 +-
 htdocs/product/class/productfournisseurprice.class.php          | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php       | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php       | 2 +-
 htdocs/ticket/class/cticketcategory.class.php                   | 2 +-
 htdocs/user/class/user.class.php                                | 2 +-
 htdocs/webhook/class/target.class.php                           | 2 +-
 htdocs/workstation/class/workstation.class.php                  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 058c12b377f..f8835a4d44c 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -418,7 +418,7 @@ class Asset extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index b8eead48384..531937c699d 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -358,7 +358,7 @@ class AssetModel extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 3e8a0c4dab2..21f32a19efc 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -413,7 +413,7 @@ class Availabilities extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 4490852b2a8..29e64e1c69a 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -370,7 +370,7 @@ class Calendar extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 059f9a2f393..0302d06c277 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -269,7 +269,7 @@ class DefaultValues extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || ($key == 't.entity' && !is_array($value)) || ($key == 't.user_id' && !is_array($value))) {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (isset($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.page' || $key == 't.param' || $key == 't.type') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 9484c0e3f58..4deeeeab874 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -352,7 +352,7 @@ class TimeSpent extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 7dd88929a48..28cf4604b06 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -304,7 +304,7 @@ class ConferenceOrBooth extends ActionComm
 			foreach ($filter as $key => $value) {
 				if ($key == 't.id' || $key == 't.fk_project' || $key == 't.fk_soc' || $key == 't.fk_action') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 126f2e66941..b11cd1931c2 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -433,7 +433,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
 					$sqlwhere[] = $key.'='.((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 5e8cd595229..b0c647e55b1 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -416,7 +416,7 @@ class Evaluation extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 2778ac9e76c..b5c8abe5bdc 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -384,7 +384,7 @@ class EvaluationLine extends CommonObjectLine
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 2a306d5b8be..c53a239ac8a 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -385,7 +385,7 @@ class Job extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index ab6db1911f2..f006893227e 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -397,7 +397,7 @@ class Position extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key . ' IN (' . $this->db->sanitize($this->db->escape($value)) . ')';
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index bc9998adf82..f9ca03493ff 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -454,7 +454,7 @@ class Skill extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index e658e75b265..c79c79d1b8c 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -378,7 +378,7 @@ class Skilldet extends CommonObjectLine
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index dffb5600e46..028e4ad1ba3 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -425,7 +425,7 @@ class SkillRank extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif ($key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && $key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 390ccf22287..3a5c78b929f 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -399,7 +399,7 @@ class KnowledgeRecord extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 4fd68649ef6..025c3895113 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -798,7 +798,7 @@ class Opensurveysondage extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 3f8e6b176d8..f894d4ca51f 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -452,7 +452,7 @@ class Partnership extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index aba40325cfd..68d654b64e0 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -180,7 +180,7 @@ class PartnershipType extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index a8b2f56c553..1c7b9693072 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -348,7 +348,7 @@ class ProductFournisseurPrice extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index d632c7d30f3..efb9b69d7a5 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -384,7 +384,7 @@ class RecruitmentCandidature extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index feb94f13bd9..3e2a0d36fc4 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -399,7 +399,7 @@ class RecruitmentJobPosition extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 9033587e2df..f5f0dfd4f92 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -392,7 +392,7 @@ class CTicketCategory extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a0eed471a0b..3c3bded98fd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -4052,7 +4052,7 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 3030617098b..689d95a5d8e 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -394,7 +394,7 @@ class Target extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 543ded86b6c..ac25ea56c2e 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -397,7 +397,7 @@ class Workstation extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;

From 4897d1eb97800c7ab12cf9044177111ced1e14bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 17:20:28 +0100
Subject: [PATCH 0188/1862] Fix warning

---
 htdocs/asset/class/asset.class.php                       | 2 +-
 htdocs/asset/class/assetmodel.class.php                  | 2 +-
 htdocs/bookcal/class/availabilities.class.php            | 2 +-
 htdocs/bookcal/class/calendar.class.php                  | 2 +-
 htdocs/core/class/defaultvalues.class.php                | 2 +-
 htdocs/core/class/timespent.class.php                    | 2 +-
 htdocs/core/lib/xcal.lib.php                             | 9 +++++----
 .../eventorganization/class/conferenceorbooth.class.php  | 2 +-
 .../class/conferenceorboothattendee.class.php            | 2 +-
 htdocs/hrm/class/evaluation.class.php                    | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                 | 2 +-
 htdocs/hrm/class/job.class.php                           | 2 +-
 htdocs/hrm/class/position.class.php                      | 2 +-
 htdocs/hrm/class/skill.class.php                         | 2 +-
 htdocs/hrm/class/skilldet.class.php                      | 2 +-
 htdocs/hrm/class/skillrank.class.php                     | 2 +-
 .../knowledgemanagement/class/knowledgerecord.class.php  | 2 +-
 htdocs/opensurvey/class/opensurveysondage.class.php      | 2 +-
 htdocs/partnership/class/partnership.class.php           | 2 +-
 htdocs/partnership/class/partnership_type.class.php      | 2 +-
 htdocs/product/class/productfournisseurprice.class.php   | 2 +-
 .../recruitment/class/recruitmentcandidature.class.php   | 2 +-
 .../recruitment/class/recruitmentjobposition.class.php   | 2 +-
 htdocs/ticket/class/cticketcategory.class.php            | 2 +-
 htdocs/user/class/user.class.php                         | 2 +-
 htdocs/webhook/class/target.class.php                    | 2 +-
 htdocs/workstation/class/workstation.class.php           | 2 +-
 27 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 058c12b377f..f8835a4d44c 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -418,7 +418,7 @@ class Asset extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index b8eead48384..531937c699d 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -358,7 +358,7 @@ class AssetModel extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 3e8a0c4dab2..21f32a19efc 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -413,7 +413,7 @@ class Availabilities extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 4490852b2a8..29e64e1c69a 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -370,7 +370,7 @@ class Calendar extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 059f9a2f393..0302d06c277 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -269,7 +269,7 @@ class DefaultValues extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || ($key == 't.entity' && !is_array($value)) || ($key == 't.user_id' && !is_array($value))) {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (isset($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.page' || $key == 't.param' || $key == 't.type') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 9484c0e3f58..4deeeeab874 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -352,7 +352,7 @@ class TimeSpent extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 4ea8fffb327..bfca11682e4 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -401,8 +401,8 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 				$startdate	  = $event["startdate"];
 				$summary  	  = $event["summary"];
 				$url		  = $event["url"];
-				$author = $event["author"];
-				$category = $event["category"];
+				$author       = $event["author"];
+				$category     = empty($event["category"]) ? null : $event["category"];
 				if (!empty($event["image"])) {
 					$image = $event["image"];
 				}
@@ -419,9 +419,10 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 				fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
 				fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
 				fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
-				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
+				if (!empty($category)) {
+					fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
+				}
 				fwrite($fichier, "<description><![CDATA[");
-
 				if (!empty($image)) {
 					fwrite($fichier, '<p><img class="center" src="'.$image.'"/></p>');
 				}
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 7dd88929a48..28cf4604b06 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -304,7 +304,7 @@ class ConferenceOrBooth extends ActionComm
 			foreach ($filter as $key => $value) {
 				if ($key == 't.id' || $key == 't.fk_project' || $key == 't.fk_soc' || $key == 't.fk_action') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 126f2e66941..b11cd1931c2 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -433,7 +433,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
 					$sqlwhere[] = $key.'='.((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 5e8cd595229..b0c647e55b1 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -416,7 +416,7 @@ class Evaluation extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 2778ac9e76c..b5c8abe5bdc 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -384,7 +384,7 @@ class EvaluationLine extends CommonObjectLine
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 2a306d5b8be..c53a239ac8a 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -385,7 +385,7 @@ class Job extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index ab6db1911f2..f006893227e 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -397,7 +397,7 @@ class Position extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key . ' IN (' . $this->db->sanitize($this->db->escape($value)) . ')';
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index bc9998adf82..f9ca03493ff 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -454,7 +454,7 @@ class Skill extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index e658e75b265..c79c79d1b8c 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -378,7 +378,7 @@ class Skilldet extends CommonObjectLine
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index dffb5600e46..028e4ad1ba3 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -425,7 +425,7 @@ class SkillRank extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif ($key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && $key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 390ccf22287..3a5c78b929f 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -399,7 +399,7 @@ class KnowledgeRecord extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 4fd68649ef6..025c3895113 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -798,7 +798,7 @@ class Opensurveysondage extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 3f8e6b176d8..f894d4ca51f 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -452,7 +452,7 @@ class Partnership extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index aba40325cfd..68d654b64e0 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -180,7 +180,7 @@ class PartnershipType extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index a8b2f56c553..1c7b9693072 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -348,7 +348,7 @@ class ProductFournisseurPrice extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index d632c7d30f3..efb9b69d7a5 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -384,7 +384,7 @@ class RecruitmentCandidature extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index feb94f13bd9..3e2a0d36fc4 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -399,7 +399,7 @@ class RecruitmentJobPosition extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 9033587e2df..f5f0dfd4f92 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -392,7 +392,7 @@ class CTicketCategory extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a0eed471a0b..3c3bded98fd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -4052,7 +4052,7 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 3030617098b..689d95a5d8e 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -394,7 +394,7 @@ class Target extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 543ded86b6c..ac25ea56c2e 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -397,7 +397,7 @@ class Workstation extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;

From 66804093cd2e4e68fb19dc7ce1beb3b8cad2932e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 18:27:57 +0100
Subject: [PATCH 0189/1862] MQ and GP are same country for default vat
 definition

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bc8d2e7a2e9..c8b7adbb9aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7060,7 +7060,9 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 
 	// If the (seller country = buyer country) then the default VAT = VAT of the product sold. End of rule.
 	if (($seller_country_code == $buyer_country_code)
-	|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))) { // Warning ->country_code not always defined
+	|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))
+	|| (in_array($seller_country_code, array('MQ', 'GP')) && in_array($buyer_country_code, array('MQ', 'GP')))
+	) { // Warning ->country_code not always defined
 		//print 'VATRULE 2';
 		$tmpvat = get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 

From 2db3dc0eef8ef275c3afe4a3550c2da7f99756f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 18:36:40 +0100
Subject: [PATCH 0190/1862] Fix output for phpphan

---
 dev/tools/apstats.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 44283bbc226..28c1f84badb 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -669,12 +669,13 @@ if (!empty($output_arrtd)) {
 			$tmp .= '</td>';
 			$tmp .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($reg[4]).'">'.dolPrintHTML($reg[4]).'</td>';
 			$tmp .= '</tr>'."\n";
+
 			$nblines++;
 		}
 	}
 }
 
-
+$tmpphan = '';
 $phan_nblines = 0;
 if (count($output_phan_json) != 0) {
 	$phan_notices = json_decode($output_phan_json[count($output_phan_json) - 1], true);
@@ -695,18 +696,17 @@ if (count($output_phan_json) != 0) {
 			}
 			$code_url_attr = dol_escape_htmltag($urlgit.$path.$line_range);
 			if ($phan_nblines < 20) {
-				$tmp = '<tr class="nohidden">';
+				$tmpphan = '<tr class="nohidden">';
 			} else {
-				$tmp = '<tr class="hidden sourcephan">';
+				$tmpphan = '<tr class="hidden sourcephan">';
 			}
-			$tmp .= '<td>'.dolPrintHTML($path).'</td>';
-			$tmp .= '<td class="">';
-			$tmp .= '<a href="'.$code_url_attr.'" target="_blank">'.$line_range_txt.'</a>';
-			$tmp .= '</td>';
-			$tmp .= '<td class="tdoverflowmax300">'.dolPrintHTML($notice['description']).'</td>';
-			$tmp .= '</tr>';
+			$tmpphan .= '<td>'.dolPrintHTML($path).'</td>';
+			$tmpphan .= '<td class="">';
+			$tmpphan .= '<a href="'.$code_url_attr.'" target="_blank">'.$line_range_txt.'</a>';
+			$tmpphan .= '</td>';
+			$tmpphan .= '<td class="tdoverflowmax300">'.dolPrintHTML($notice['description']).'</td>';
+			$tmpphan .= '</tr>';
 
-			$phan_items[] = $tmp;
 			$phan_nblines++;
 		}
 	}
@@ -813,7 +813,7 @@ if ($phan_nblines != 0) {
 	$html .= '<div class="div-table-responsive">'."\n";
 	$html .= '<table class="list_technical_debt centpercent">'."\n";
 	$html .= '<thead><tr class="trgroup"><td>File</td><td>Line</td><td>Detail</td></tr></thead><tbody>'."\n";
-	$html .= implode("\n", $phan_items);
+	$html .= $tmpphan;
 	$html .= '</tbody></table>';
 	// Disabled, no more required as list is managed with datatable
 	//$html .= '<div><span class="seedetail" data-source="phan" id="sourcephan">Show all...</span></div>';

From 87d25869acbb4342ee37c9bb46e53e8476407d10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 18:55:22 +0100
Subject: [PATCH 0191/1862] Fix lost lines

---
 dev/tools/apstats.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 28c1f84badb..da238e0f43b 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -696,9 +696,9 @@ if (count($output_phan_json) != 0) {
 			}
 			$code_url_attr = dol_escape_htmltag($urlgit.$path.$line_range);
 			if ($phan_nblines < 20) {
-				$tmpphan = '<tr class="nohidden">';
+				$tmpphan .= '<tr class="nohidden">';
 			} else {
-				$tmpphan = '<tr class="hidden sourcephan">';
+				$tmpphan .= '<tr class="hidden sourcephan">';
 			}
 			$tmpphan .= '<td>'.dolPrintHTML($path).'</td>';
 			$tmpphan .= '<td class="">';
@@ -706,6 +706,7 @@ if (count($output_phan_json) != 0) {
 			$tmpphan .= '</td>';
 			$tmpphan .= '<td class="tdoverflowmax300">'.dolPrintHTML($notice['description']).'</td>';
 			$tmpphan .= '</tr>';
+			$tmpphan .= "\n";
 
 			$phan_nblines++;
 		}

From c171ce20650f362e81b34ca756046c3fe99c4e37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 19:04:05 +0100
Subject: [PATCH 0192/1862] Fix bad function

---
 htdocs/asset/class/asset.class.php                              | 2 +-
 htdocs/asset/class/assetmodel.class.php                         | 2 +-
 htdocs/bookcal/class/availabilities.class.php                   | 2 +-
 htdocs/bookcal/class/calendar.class.php                         | 2 +-
 htdocs/core/class/defaultvalues.class.php                       | 2 +-
 htdocs/core/class/timespent.class.php                           | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php      | 2 +-
 .../eventorganization/class/conferenceorboothattendee.class.php | 2 +-
 htdocs/hrm/class/evaluation.class.php                           | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                        | 2 +-
 htdocs/hrm/class/job.class.php                                  | 2 +-
 htdocs/hrm/class/position.class.php                             | 2 +-
 htdocs/hrm/class/skill.class.php                                | 2 +-
 htdocs/hrm/class/skilldet.class.php                             | 2 +-
 htdocs/hrm/class/skillrank.class.php                            | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php      | 2 +-
 htdocs/opensurvey/class/opensurveysondage.class.php             | 2 +-
 htdocs/partnership/class/partnership.class.php                  | 2 +-
 htdocs/partnership/class/partnership_type.class.php             | 2 +-
 htdocs/product/class/productfournisseurprice.class.php          | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php       | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php       | 2 +-
 htdocs/ticket/class/cticketcategory.class.php                   | 2 +-
 htdocs/user/class/user.class.php                                | 2 +-
 htdocs/webhook/class/target.class.php                           | 2 +-
 htdocs/workstation/class/workstation.class.php                  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index f8835a4d44c..94fad45138d 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -418,7 +418,7 @@ class Asset extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 531937c699d..3b557456e77 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -358,7 +358,7 @@ class AssetModel extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 21f32a19efc..040a06e62ca 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -413,7 +413,7 @@ class Availabilities extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 29e64e1c69a..a7bde4a7746 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -370,7 +370,7 @@ class Calendar extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 0302d06c277..734d78202a9 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -269,7 +269,7 @@ class DefaultValues extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || ($key == 't.entity' && !is_array($value)) || ($key == 't.user_id' && !is_array($value))) {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.page' || $key == 't.param' || $key == 't.type') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 4deeeeab874..cd0b1a655a2 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -352,7 +352,7 @@ class TimeSpent extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 28cf4604b06..60b8114dd80 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -304,7 +304,7 @@ class ConferenceOrBooth extends ActionComm
 			foreach ($filter as $key => $value) {
 				if ($key == 't.id' || $key == 't.fk_project' || $key == 't.fk_soc' || $key == 't.fk_action') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index b11cd1931c2..426ed9eaefc 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -433,7 +433,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
 					$sqlwhere[] = $key.'='.((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index b0c647e55b1..7689312ec39 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -416,7 +416,7 @@ class Evaluation extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index b5c8abe5bdc..da18ecd8a6e 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -384,7 +384,7 @@ class EvaluationLine extends CommonObjectLine
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index c53a239ac8a..ec0c67a0ad1 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -385,7 +385,7 @@ class Job extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index f006893227e..f1127f67e5a 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -397,7 +397,7 @@ class Position extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key . ' IN (' . $this->db->sanitize($this->db->escape($value)) . ')';
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index f9ca03493ff..01861a6b185 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -454,7 +454,7 @@ class Skill extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index c79c79d1b8c..b9df29a9daf 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -378,7 +378,7 @@ class Skilldet extends CommonObjectLine
 					$sqlwhere[] = $key.'='.$value;
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 028e4ad1ba3..2dcc3373f5e 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -425,7 +425,7 @@ class SkillRank extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && $key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && $key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 3a5c78b929f..370c29f1dce 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -399,7 +399,7 @@ class KnowledgeRecord extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 025c3895113..24fef99e5b8 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -798,7 +798,7 @@ class Opensurveysondage extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index f894d4ca51f..c4e3c0fd3b8 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -452,7 +452,7 @@ class Partnership extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 68d654b64e0..e3f7457919f 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -180,7 +180,7 @@ class PartnershipType extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 1c7b9693072..f037762b01f 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -348,7 +348,7 @@ class ProductFournisseurPrice extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index efb9b69d7a5..d7f1db2a564 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -384,7 +384,7 @@ class RecruitmentCandidature extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 3e2a0d36fc4..b3c9f92e12f 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -399,7 +399,7 @@ class RecruitmentJobPosition extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index f5f0dfd4f92..19b1572e2be 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -392,7 +392,7 @@ class CTicketCategory extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 3c3bded98fd..8f438adc5e4 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -4052,7 +4052,7 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 689d95a5d8e..d8f2a14a861 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -394,7 +394,7 @@ class Target extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index ac25ea56c2e..8e650fa9f3f 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -397,7 +397,7 @@ class Workstation extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (property_exists($this->fields, $key) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;

From 16b2cf28802333042c6ffde360af4cecc5164835 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 20:41:58 +0100
Subject: [PATCH 0193/1862] Fix creation of emailing

---
 htdocs/comm/mailing/card.php                |  9 +++++++--
 htdocs/comm/mailing/class/mailing.class.php | 14 ++++++++++++--
 htdocs/langs/en_US/mails.lang               |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 645d24a0e75..80eb874e179 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -547,7 +547,11 @@ if (empty($reshook)) {
 		$mesgs = array();
 
 		$object->messtype       = (string) GETPOST("messtype");
-		$object->email_from     = (string) GETPOST("from", 'alphawithlgt'); // Must allow 'name <email>'
+		if ($object->messtype == 'sms') {
+			$object->email_from     = (string) GETPOST("from_phone", 'alphawithlgt'); // Must allow 'name <email>'
+		} else {
+			$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");
@@ -823,7 +827,8 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	print '<tr class="fieldsforemail"><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.(GETPOSTISSET('from') ? GETPOST('from') : getDolGlobalString('MAILING_EMAIL_FROM')).'"></td></tr>';
-	print '<tr class="fieldsforsms hidden"><td class="fieldrequired titlefieldcreate">'.$langs->trans("PhoneFrom").'</td><td><input class="flat minwidth200" name="from" value="'.(GETPOSTISSET('from') ? GETPOST('from') : getDolGlobalString('MAILING_SMS_FROM')).'" placeholder="+123..."></td></tr>';
+
+	print '<tr class="fieldsforsms hidden"><td class="fieldrequired titlefieldcreate">'.$langs->trans("PhoneFrom").'</td><td><input class="flat minwidth200" name="fromphone" value="'.(GETPOSTISSET('fromphone') ? GETPOST('fromphone') : getDolGlobalString('MAILING_SMS_FROM')).'" placeholder="+123..."></td></tr>';
 
 	print '<tr class="fieldsforemail"><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.getDolGlobalString('MAILING_EMAIL_ERRORSTO', getDolGlobalString('MAIN_MAIL_ERRORS_TO')).'"></td></tr>';
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index fb378c8f8cd..8884af4f085 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -226,7 +226,11 @@ class Mailing extends CommonObject
 		$this->email_from = trim($this->email_from);
 
 		if (!$this->email_from) {
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("From"));
+			if ($this->messtype !== 'sms') {
+				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailFrom"));
+			} else {
+				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PhoneFrom"));
+			}
 			return -1;
 		}
 
@@ -287,6 +291,8 @@ class Mailing extends CommonObject
 	 */
 	public function update($user, $notrigger = 0)
 	{
+		global $langs;
+
 		// Check properties
 		if (preg_match('/^InvalidHTMLStringCantBeCleaned/', $this->body)) {
 			$this->error = 'InvalidHTMLStringCantBeCleaned';
@@ -331,7 +337,11 @@ class Mailing extends CommonObject
 				return -2;
 			}
 		} else {
-			$this->error = $this->db->lasterror();
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->error = $langs->trans("ErrorTitleAlreadyExists", $this->title);
+			} else {
+				$this->error = $this->db->lasterror();
+			}
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 704b4553dcc..159d1a0bd9e 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -7,7 +7,7 @@ AllEMailings=All eMailings
 MailCard=EMailing card
 MailRecipients=Recipients
 MailRecipient=Recipient
-MailTitle=Description
+MailTitle=Label
 MailFrom=From
 PhoneFrom=From
 MailErrorsTo=Errors to

From 08a61c542ad9d004b33dcc3a1e7ae9a611c3e734 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 20:53:42 +0100
Subject: [PATCH 0194/1862] Restore dolPrintLabel

---
 dev/tools/apstats.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index da238e0f43b..164713fa3bf 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -663,11 +663,11 @@ if (!empty($output_arrtd)) {
 			} else {
 				$tmp .= '<tr class="hidden sourcephpstan">';
 			}
-			$tmp .= '<td>'.dolPrintHTML($reg[1]).'</td>';
+			$tmp .= '<td>'.dolPrintLabel($reg[1]).'</td>';
 			$tmp .= '<td class="">';
-			$tmp .= '<a href="'.($urlgit.$reg[1].'#L'.$reg[2]).'" target="_blank">'.dolPrintHTML($reg[2]).'</a>';
+			$tmp .= '<a href="'.($urlgit.$reg[1].'#L'.$reg[2]).'" target="_blank">'.dolPrintLabel($reg[2]).'</a>';
 			$tmp .= '</td>';
-			$tmp .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($reg[4]).'">'.dolPrintHTML($reg[4]).'</td>';
+			$tmp .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($reg[4]).'">'.dolPrintLabel($reg[4]).'</td>';
 			$tmp .= '</tr>'."\n";
 
 			$nblines++;
@@ -700,11 +700,11 @@ if (count($output_phan_json) != 0) {
 			} else {
 				$tmpphan .= '<tr class="hidden sourcephan">';
 			}
-			$tmpphan .= '<td>'.dolPrintHTML($path).'</td>';
+			$tmpphan .= '<td>'.dolPrintLabel($path).'</td>';
 			$tmpphan .= '<td class="">';
 			$tmpphan .= '<a href="'.$code_url_attr.'" target="_blank">'.$line_range_txt.'</a>';
 			$tmpphan .= '</td>';
-			$tmpphan .= '<td class="tdoverflowmax300">'.dolPrintHTML($notice['description']).'</td>';
+			$tmpphan .= '<td class="tdoverflowmax300">'.dolPrintLabel($notice['description']).'</td>';
 			$tmpphan .= '</tr>';
 			$tmpphan .= "\n";
 

From 628feb9c341580a03c7b989386f1c552f6ba7a7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 21:10:35 +0100
Subject: [PATCH 0195/1862] Fix warning

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

diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 5b7a223a1c4..85744ccc24e 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -422,11 +422,11 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 					'ref'=>$invoice->ref,
 					'ref_supplier'=>$invoice->ref_supplier,
 					'ref_ext'=>$invoice->ref_ext,
-					'fk_user_author' => $invoice->fk_user_author,
-					'fk_user_valid' => $invoice->fk_user_valid,
-					'fk_thirdparty' => $invoice->fk_soc,
+					'fk_user_author' => $invoice->user_creation_id,
+					'fk_user_valid' => $invoice->user_validation_id,
+					'fk_thirdparty' => $invoice->socid,
 					'type'=>$invoice->type,
-					'status'=>$invoice->statut,
+					'status'=>$invoice->status,
 					'total_net'=>$invoice->total_ht,
 					'total_vat'=>$invoice->total_tva,
 					'total'=>$invoice->total_ttc,

From 26a3ca0413e8edf0a77e7311f75304f52ed83649 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 21:29:36 +0100
Subject: [PATCH 0196/1862] Fix warning php 8.1

---
 htdocs/public/demo/index.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index c71f1d86dc7..e8563e4a9d7 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -134,7 +134,6 @@ $filename = array();
 $modules = array();
 $orders = array();
 $categ = array();
-$dirmod = array();
 $i = 0; // is a sequencer of modules found
 $j = 0; // j is module number. Automatically affected if module number not defined.
 
@@ -174,7 +173,6 @@ foreach ($modulesdir as $dir) {
 							$filename[$i] = $modName;
 							$orders[$i]  = $objMod->family."_".$j; // Tri par famille puis numero module
 							//print "x".$modName." ".$orders[$i]."\n<br>";
-							$dirmod[$i] = $dirroot;
 							$j++;
 							$i++;
 						}

From 0140f5057dbcc07b6cd677ba509a993ec4ebdf0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 21:37:38 +0100
Subject: [PATCH 0197/1862] Fix warning

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9aede3af25a..64652fd3dd1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -713,7 +713,7 @@ if (!defined('NOLOGIN')) {
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
 		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') {  // We ask index page
 			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+				dol_syslog("Call index page from another url than demo page (call is done from page ".(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFER']).")");
 				$url = '';
 				$url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
 				$url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');

From 181c70f1162d90d8b3a61a19789b583604308ac5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 21:53:35 +0100
Subject: [PATCH 0198/1862] Do not use mysql port on command line if value is 0

---
 dev/initdemo/initdemopassword.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index e2929441e76..b70c97a831e 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -145,12 +145,16 @@ fi
 
 
 # ---------------------------- run sql file
+if [ "x$port" != "x0" ]
+then
+	export Pport="-P$port"
+fi
 if [ "x$passwd" != "x" ]
 then
 	export passwd="-p$passwd"
 fi
-#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
-#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+#echo "mysql $Pport -u$admin $passwd $base < $mydir/$dumpfile"
+#mysql $Pport -u$admin $passwd $base < $mydir/$dumpfile
 
 if [ "x${demopasshash}" != "xpassword_hash" ]
 then
@@ -162,19 +166,19 @@ else
 fi
 #rm /tmp/tmp.php
 
-echo "echo \"UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';\" | mysql -P$port $base"
-echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql -P$port $base
+echo "echo \"UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';\" | mysql $Pport $base"
+echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql $Pport $base
 export res=$?
 
 if [ $res -ne 0 ]; then
-	echo "Error to execute sql with mysql -P$port -u$admin -p***** $base"
+	echo "Error to execute sql with mysql $Pport -u$admin -p***** $base"
 	exit
 fi
 
 if [ -s "$mydir/initdemopostsql.sql" ]; then
 	echo A file initdemopostsql.sql was found, we execute it.
-	echo "mysql -P$port $base < \"$mydir/initdemopostsql.sql\""
-	mysql -P$port $base < "$mydir/initdemopostsql.sql"
+	echo "mysql $Pport $base < \"$mydir/initdemopostsql.sql\""
+	mysql $Pport $base < "$mydir/initdemopostsql.sql"
 else
 	echo No file initdemopostsql.sql found, so no extra sql action done.
 fi

From 72d84f546f56238f24499a1b4592a0451a80239a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 22:01:20 +0100
Subject: [PATCH 0199/1862] Fix can disable port on command line

---
 dev/initdemo/initdemopassword.sh | 112 ++++++++++++++++---------------
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index bcf2b14887e..b70c97a831e 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -5,15 +5,17 @@
 #
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
-# Usage: initdemopassword.sh confirm 
+# Usage: initdemopassword.sh confirm
 # usage: initdemopassword.sh confirm base port login pass
 #------------------------------------------------------
+# shellcheck disable=2006,2034,2046,2064,2068,2086,2155,2166,2186,2172,2268
+# shellcheck disable=2012,2016,2154
 
 
 export mydir=`echo "$0" | sed -e 's/initdemopassword.sh//'`;
 if [ "x$mydir" = 'x' -o "x$mydir" = 'x./' ]
 then
-    export mydir="."
+	export mydir="."
 fi
 export id=`id -u`;
 
@@ -56,103 +58,107 @@ then
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
+		--inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
 	valret=$?
 	case $valret in
-	  0)
-	base=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
+		0)
+			base=`cat $fichtemp` ;;
+		1)
+			exit ;;
+		255)
+			exit ;;
 	esac
 	rm $fichtemp
-	
+
 	# ---------------------------- database port
 	DIALOG=${DIALOG=dialog}
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
-	
+		--inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
+
 	valret=$?
-	
+
 	case $valret in
-	  0)
-	port=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
+		0)
+			port=`cat $fichtemp` ;;
+		1)
+			exit ;;
+		255)
+			exit ;;
 	esac
 	rm $fichtemp
-	
-	
+
+
 	# ----------------------------- demo login
 	DIALOG=${DIALOG=dialog}
 	DIALOG="$DIALOG --ascii-lines"
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Login to reset :" 16 55 dolibarrdemologin 2> $fichtemp
+		--inputbox "Login to reset :" 16 55 dolibarrdemologin 2> $fichtemp
 	valret=$?
 	case $valret in
-	  0)
-	demologin=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
+		0)
+			demologin=`cat $fichtemp` ;;
+		1)
+			exit ;;
+		255)
+			exit ;;
 	esac
 	rm fichtemp
-	
+
 	# ----------------------------- demo pass
 	DIALOG=${DIALOG=dialog}
 	DIALOG="$DIALOG --ascii-lines"
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Reset login password" --clear \
-	        --inputbox "Pass to set :" 16 55 dolibarrdemopass 2> $fichtemp
+		--inputbox "Pass to set :" 16 55 dolibarrdemopass 2> $fichtemp
 	valret=$?
 	case $valret in
-	  0)
-	demopass=`cat $fichtemp`;;
-	  1)
-	exit;;
-	  255)
-	exit;;
+		0)
+			demopass=`cat $fichtemp` ;;
+		1)
+			exit ;;
+		255)
+			exit ;;
 	esac
 	rm fichtemp
-	
-	
+
+
 	export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
 
 
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
 	$DIALOG --title "Reset login password" --clear \
-	        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
-	
+		--yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
+
 	case $? in
-	        0)      echo "Ok, start process...";;
-	        1)      exit;;
-	        255)    exit;;
+		0)      echo "Ok, start process..." ;;
+		1)      exit ;;
+		255)    exit ;;
 	esac
 
 fi
 
 
 # ---------------------------- run sql file
+if [ "x$port" != "x0" ]
+then
+	export Pport="-P$port"
+fi
 if [ "x$passwd" != "x" ]
 then
 	export passwd="-p$passwd"
 fi
-#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
-#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+#echo "mysql $Pport -u$admin $passwd $base < $mydir/$dumpfile"
+#mysql $Pport -u$admin $passwd $base < $mydir/$dumpfile
 
 if [ "x${demopasshash}" != "xpassword_hash" ]
 then
-	echo '<?php echo MD5("'$demopass'"); ?>' > /tmp/tmp.php 
+	echo '<?php echo MD5("'$demopass'"); ?>' > /tmp/tmp.php
 	newpass=`php -f /tmp/tmp.php`
 else
 	echo '<?php echo password_hash("'$demopass'", PASSWORD_DEFAULT); ?>' > /tmp/tmp.php
@@ -160,22 +166,22 @@ else
 fi
 #rm /tmp/tmp.php
 
-echo "echo \"UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';\" | mysql -P$port $base"
-echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql -P$port $base
+echo "echo \"UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';\" | mysql $Pport $base"
+echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql $Pport $base
 export res=$?
 
 if [ $res -ne 0 ]; then
-	echo "Error to execute sql with mysql -P$port -u$admin -p***** $base"
+	echo "Error to execute sql with mysql $Pport -u$admin -p***** $base"
 	exit
-fi 
+fi
 
 if [ -s "$mydir/initdemopostsql.sql" ]; then
 	echo A file initdemopostsql.sql was found, we execute it.
-	echo "mysql -P$port $base < \"$mydir/initdemopostsql.sql\""
-	mysql -P$port $base < "$mydir/initdemopostsql.sql"
+	echo "mysql $Pport $base < \"$mydir/initdemopostsql.sql\""
+	mysql $Pport $base < "$mydir/initdemopostsql.sql"
 else
 	echo No file initdemopostsql.sql found, so no extra sql action done.
-fi 
+fi
 
 
 if [ "x$res" = "x0" ]

From acd8168cb690bf1d3aab9ed14f37db801010a956 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:08:07 +0100
Subject: [PATCH 0200/1862] Fix: Fix var_dump checker (#28226)

* Fix: Fix var_dump checker

# Fix: Fix var_dump checker

The core issue was that in PHP whitespace includes newlines by default, the m modifier
is needed to not match multilines.

* Fix: Allow multiple var_dumps on single comment line, refactor

# Fix: Allow multiple var_dumps on single comment line, refactor

Updated the regex to not match a var_dump preceeded with a comment
somewhere on the line.

Refactored var_dump check in dedicated method.

* Qual: Test the test function !

# Qual: Test the test function !

Test that the test function detecting var_dump does detect them.

* Qual: CodingPhpTest - remove comments from file before checking

# Qual: CodingPhpTest - remove comments from file before checking

This helps remove false positives and may have a positive impact on performance.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 test/phpunit/CodingPhpTest.php | 213 +++++++++++++++++++++++++++------
 1 file changed, 177 insertions(+), 36 deletions(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 7e134b07bbb..5dd8a43257a 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -131,14 +131,20 @@ class CodingPhpTest extends CommonClassTest
 		//print 'Check php file '.$file['relativename']."\n";
 		$filecontent = file_get_contents($file['fullname']);
 
-		$this->verifyIsModuleEnabledOk($filecontent, "htdocs/{$file['relativename']}");
+		// We are not interested in the comments
+		$filecontent = $this->removePhpComments(file_get_contents($file['fullname']));
+
+		// File path for reports
+		$report_filepath = "htdocs/{$file['relativename']}";
+
+		$this->verifyIsModuleEnabledOk($filecontent, $report_filepath);
 
 		if (preg_match('/\.class\.php/', $file['relativename'])
 			|| preg_match('/boxes\/box_/', $file['relativename'])
 			|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
 			|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
 			|| in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) {
-			// Check into Class files
+			// Check Class files
 			if (! in_array($file['name'], array(
 				'api.class.php',
 				'commonobject.class.php',
@@ -152,18 +158,18 @@ class CodingPhpTest extends CommonClassTest
 				// Must not find $db->
 				$ok = true;
 				$matches = array();
-				// Check string $db-> inside a class.php file (it should be $this->db-> into such classes)
+				// Check string $db-> inside a class.php file (it should be $this->db-> in such classes)
 				preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 				foreach ($matches as $key => $val) {
 					$ok = false;
 					break;
 				}
 				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-				$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename'].'. Inside a .class file, you should use $this->db-> instead.');
+				$this->assertTrue($ok, 'Found string $db-> in a .class.php file in '.$file['relativename'].'. Inside a .class file, you should use $this->db-> instead.');
 				//exit;
 			}
 
-			if (preg_match('/\.class\.php/', $file['relativename']) && ! in_array($file['relativename'], array(
+			if (preg_match('/\.class\.php$/', $file['relativename']) && ! in_array($file['relativename'], array(
 				'adherents/canvas/actions_adherentcard_common.class.php',
 				'contact/canvas/actions_contactcard_common.class.php',
 				'compta/facture/class/facture.class.php',
@@ -191,7 +197,7 @@ class CodingPhpTest extends CommonClassTest
 				// Must not find GETPOST
 				$ok = true;
 				$matches = array();
-				// Check string GETPOSTFLOAT a class.php file (should not be found into classes)
+				// Check string GETPOSTFLOAT a class.php file (should not be found in classes)
 				preg_match_all('/GETPOST\(["\'](....)/', $filecontent, $matches, PREG_SET_ORDER);
 				foreach ($matches as $key => $val) {
 					if (in_array($val[1], array('lang', 'forc', 'mass', 'conf'))) {
@@ -201,11 +207,10 @@ class CodingPhpTest extends CommonClassTest
 					$ok = false;
 					break;
 				}
-				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-				$this->assertTrue($ok, 'Found string GETPOST into a .class.php file in '.$file['relativename'].'.');
+				$this->assertTrue($ok, 'Found string GETPOST in a .class.php file in '.$file['relativename'].'.');
 			}
 		} else {
-			// Check into Include files
+			// Check Include files
 			if (! in_array($file['name'], array(
 				'objectline_view.tpl.php',
 				'extrafieldsinexport.inc.php',
@@ -216,7 +221,7 @@ class CodingPhpTest extends CommonClassTest
 				// Must not found $this->db->
 				$ok = true;
 				$matches = array();
-				// Check string $this->db-> into a non class.php file (it should be $db-> into such classes)
+				// Check string $this->db-> in a non class.php file (it should be $db-> in such classes)
 				preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 				foreach ($matches as $key => $val) {
 					$ok = false;
@@ -228,9 +233,9 @@ class CodingPhpTest extends CommonClassTest
 			}
 		}
 
-		// Check we don't miss top_httphead() into any ajax pages
+		// Check we don't miss top_httphead() in any ajax pages
 		if (preg_match('/ajax\//', $file['relativename'])) {
-			print "Analyze ajax page ".$file['relativename']."\n";
+			//print "Analyze ajax page ".$file['relativename']."\n";
 			$ok = true;
 			$matches = array();
 			preg_match_all('/top_httphead/', $filecontent, $matches, PREG_SET_ORDER);
@@ -238,28 +243,13 @@ class CodingPhpTest extends CommonClassTest
 				$ok = false;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Did not find top_httphead into the ajax page '.$file['relativename']);
+			$this->assertTrue($ok, 'Did not find top_httphead in the ajax page '.$file['relativename']);
 			//exit;
 		}
 
-		// Check if a var_dump has been forgotten
+		// Check for unauthorised vardumps
 		if (!preg_match('/test\/phpunit/', $file['fullname'])) {
-			if (! in_array($file['name'], array('class.nusoap_base.php'))) {
-				$ok = true;
-				$matches = array();
-				preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
-				//var_dump($matches);
-				foreach ($matches as $key => $val) {
-					if ($val[1] != '/' && $val[1] != '*') {
-						$ok = false;
-						break;
-					}
-					break;
-				}
-				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-				$this->assertTrue($ok, 'Found string var_dump that is not just after /* or // in '.$file['relativename']);
-				//exit;
-			}
+			$this->verifyNoActiveVardump($filecontent, $report_filepath);
 		}
 
 		// Check get_class followed by __METHOD__
@@ -311,7 +301,7 @@ class CodingPhpTest extends CommonClassTest
 			break;
 		}
 		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-		$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
+		$this->assertTrue($ok, 'Found non quoted or not casted var in sql request '.$file['relativename'].' - Bad.');
 		//exit;
 
 		// Check that forged sql string is using ' instead of " as string PHP quotes
@@ -327,7 +317,7 @@ class CodingPhpTest extends CommonClassTest
 			//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 forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
+		$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables in file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
 		//exit;
 
 		// Check that forged sql string is using ' instead of " as string PHP quotes
@@ -339,7 +329,7 @@ class CodingPhpTest extends CommonClassTest
 			$ok = false;
 			break;
 		}
-		$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
+		$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables in file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
 
 		// Check sql string VALUES ... , ".$xxx
 		//  with xxx that is not 'db-' (for $db->escape). It means we forget a ' if string, or an (int) if int, when forging sql request.
@@ -358,7 +348,7 @@ class CodingPhpTest extends CommonClassTest
 			break;
 		}
 		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-		$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
+		$this->assertTrue($ok, 'Found non quoted or not casted var in sql request '.$file['relativename'].' - Bad.');
 		//exit;
 
 		// Check '".$xxx non escaped
@@ -514,7 +504,7 @@ class CodingPhpTest extends CommonClassTest
 				break;
 			}
 		}
-		$this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
+		$this->assertTrue($ok, 'Found a forbidden string sequence in '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
 
 
 		// Test we don't have preg_grep with a param without preg_quote
@@ -589,10 +579,93 @@ class CodingPhpTest extends CommonClassTest
 			$ok = false;
 			break;
 		}
-		$this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');
+		$this->assertTrue($ok, 'Found a CURDATE\(\) in code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');
 	}
 
 
+	/**
+	 * Verify that no active var_dump was left over in the code
+	 *
+	 * @param string $filecontent Contents to check for php code that uses a module name
+	 * @param string $filename    File name for the contents (used for reporting)
+	 *
+	 * @return void
+	 */
+	private function verifyNoActiveVardump(&$filecontent, $filename)
+	{
+		$ok = true;
+		$matches = array();
+		// Match!:
+		//  - Line-start, whitespace, var_dump
+		//  - Line-start, no-comment-leader, var_dump
+		//  no-commen-leader=
+		//    - Any character not / or *
+		//    - Any / not preceded with / and not followed by / or *
+		//    - Any * not preceded with /
+		preg_match_all('{^(?:^|^(?:[ \t]*|(?:(?:[^*/]|(?<![^/])/(?![*/])|(?!/)\*)(\S))))\bvar_dump\(}m', $filecontent, $matches, PREG_SET_ORDER);
+		$failing_string = "";
+		foreach ($matches as $key => $val) {
+			if (!isset($val[1]) || $val[1] != '/' && $val[1] != '*') {
+				$ok = false;
+				$failing_string = $val[0];
+				break;
+			}
+		}
+		$this->assertTrue($ok, "Found string var_dump that is not just after /* or // in '$filename': $failing_string");
+	}
+
+
+	/**
+	 * Provide test data for testing the method detecting var_dump presence.
+	 *
+	 * @return array<string,array{0:string,1:bool}> Test sets
+	 */
+	public function vardumpTesterProvider()
+	{
+		return [
+			 'var_dump at start of file' => ["var_dump(\$help)\n", true],
+			 'var_dump at start of line' => ["\nvar_dump(\$help)\n", true],
+			 'var_dump after comment next line' => ["/* Hello */\nvar_dump(\$help)\n", true],
+			 'var_dump with space' => [" var_dump(\$help)\n", true],
+			 'var_dump after comment' => [" // var_dump(\$help)\n", false],
+			 '2 var_dumps after comment' => [" // var_dump(\$help); var_dump(\$help)\n", false],
+			 'var_dump before and after comment' => [" var_dump(\$help); // var_dump(\$help)\n", true],
+		];
+	}
+
+	/**
+	 * Test that verifyNoActiveVardump generates a notification
+	 *
+	 * @param string $filecontent Fake file content
+	 * @param bool   $hasVardump  When true, expect var_dump detection
+	 *
+	 * @return void
+	 *
+	 * @dataProvider vardumpTesterProvider
+	 */
+	public function testVerifyNoActiveVardump(&$filecontent, $hasVardump)
+	{
+		$this->nbLinesToShow = 1;
+		// Create some dummy file content
+		$filename = $this->getName(false);
+
+		$notification = false;
+		ob_start(); // Do not disturb the output with tests that are meant to fail.
+		try {
+			$this->verifyNoActiveVardump($filecontent, $filename);
+		} catch (Throwable $e) {
+			$notification = (string) $e;
+		}
+		$output = ob_get_clean();
+
+		// Assert that a notification was generated
+		if ($hasVardump) {
+			$this->assertStringContainsString("Found string var_dump", $notification ?? '', "Expected notification not found.");
+		} else {
+			$this->assertFalse($notification, "Unexpection detection of var_dump");
+		}
+	}
+
 	/**
 	 * Verify that only known modules are used
 	 *
@@ -635,4 +708,72 @@ class CodingPhpTest extends CommonClassTest
 			);
 		}
 	}
+
+
+	/**
+	 * Remove php comments from source string
+	 *
+	 * @param string $string The string from which the PHP comments are removed
+	 *
+	 * @return string The string without the comments
+	 */
+	private function removePhpComments($string)
+	{
+		return preg_replace_callback(
+			'{(//.*?$)|(/\*.*?\*/)}ms',
+			static function ($match) {
+				if (isset($match[2])) {
+					// Count the number of newline characters in the comment
+					$num_newlines = substr_count($match[0], "\n");
+					// Generate whitespace equivalent to the number of newlines
+					if ($num_newlines == 0) {
+						// /* Comment on single line -> space
+						return " ";
+					} else {
+						// /* Comment on multiple lines -> new lines
+						return str_repeat("\n", $num_newlines);
+					}
+				} else {
+					// Double slash comment, just remove
+					return "";
+				}
+			},
+			$string
+		);
+	}
+
+	/**
+	 * Provide test data for testing the comments remover
+	 *
+	 * @return array<string,array{0:string,1:string}> Test sets
+	 */
+	public function commentRemovalTestProvider()
+	{
+		return [
+			 'complete line 1' => ["/*Comment complete line*/", " "],
+			 'complete line 2' => ["// Comment complete line", ""],
+			 'partial line 1' => ["a/*Comment complete line*/b", "a b"],
+			 'partial line 2' => ["a// Comment complete line", "a"],
+			 'multi line full 1' => ["/*Comment\ncomplete line*/", "\n"],
+			 'multi line full 2' => ["/*Comment\ncomplete line*/\n", "\n\n"],
+			 'multi line partials 1' => ["a/*Comment\ncomplete line*/b", "a\nb"],
+		];
+	}
+
+	/**
+	 * Test that comments are properly removed
+	 *
+	 * @param string $source	Fake file content
+	 * @param bool   $expected	When true, expect var_dump detection
+	 *
+	 * @return void
+	 *
+	 * @dataProvider commentRemovalTestProvider
+	 */
+	public function testRemovePhpComments(&$source, &$expected)
+	{
+		$this->nbLinesToShow = 0;
+
+		$this->assertEquals($expected, $this->removePhpComments($source), "Comments not removed as expected");
+	}
 }

From 3f8376c2b875074501cdad5fe48e67c1a22f652a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:08:45 +0100
Subject: [PATCH 0201/1862] fix odt templates lost (#28411)

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

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index df55b335132..27b78638c33 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1912,7 +1912,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 					}
 					if (is_dir($tmpdir)) {
 						// all type of template is allowed
-						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', null, 'name', SORT_ASC, 0);
 						if (count($tmpfiles)) {
 							$listoffiles = array_merge($listoffiles, $tmpfiles);
 						}

From a1d90ada653ff911bb8e65aa8ab58028295ce1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:09:50 +0100
Subject: [PATCH 0202/1862] NEW Can setup phone mobile for the main company
 (#28410)

* setup phone mobile for mysoc

* clean code
---
 htdocs/admin/company.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d6981147691..9eb4626c3bc 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -106,13 +106,14 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	$db->begin();
 
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("name", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TEL", GETPOST("phone", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MOBILE", GETPOST("phone_mobile", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -440,18 +441,18 @@ print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_NOM : ''))).'"'.(!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+print '<input name="name" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('name') ? GETPOST('name', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_NOM')))).'"'.(!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('MAIN_INFO_SOCIETE_ADDRESS') ? GETPOST('MAIN_INFO_SOCIETE_ADDRESS', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_ADDRESS') ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : '')).'</textarea></td></tr>'."\n";
+print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('MAIN_INFO_SOCIETE_ADDRESS') ? GETPOST('MAIN_INFO_SOCIETE_ADDRESS', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_ADDRESS'))).'</textarea></td></tr>'."\n";
 
 // Zip
 print '<tr class="oddeven" id="trzipbeforecountry"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_ZIP') ? $conf->global->MAIN_INFO_SOCIETE_ZIP : ''))).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_ZIP')))).'"></td></tr>'."\n";
 
 print '<tr class="oddeven" id="trtownbeforecountry"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_TOWN') ? $conf->global->MAIN_INFO_SOCIETE_TOWN : ''))).'"></td></tr>'."\n";
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_TOWN')))).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td>';
@@ -481,13 +482,19 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input class="maxwidth150 widthcentpercentminusx" name="phone" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('phone') ? GETPOST('phone', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_TEL') ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
+print '<input class="maxwidth150 widthcentpercentminusx" name="phone" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('phone') ? GETPOST('phone', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_TEL')))).'"></td></tr>';
+print '</td></tr>'."\n";
+
+// Phone mobile
+print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("PhoneMobile").'</label></td><td>';
+print img_picto('', 'object_phoning_mobile', '', false, 0, 0, '', 'pictofixedwidth');
+print '<input class="maxwidth150 widthcentpercentminusx" name="phone_mobile" id="phone_mobile" value="'.dol_escape_htmltag((GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_MOBILE')))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input class="maxwidth150" name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_FAX') ? $conf->global->MAIN_INFO_SOCIETE_FAX : ''))).'"></td></tr>';
+print '<input class="maxwidth150" name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_FAX')))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email

From 7374dd9c2de80123570be03753c306c90f2ac8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:10:04 +0100
Subject: [PATCH 0203/1862] fix phpstan (#28412)

Property CommonObject::$shipping_method_id (int) does not accept string.
---
 htdocs/reception/class/reception.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 44ff7c4a6fb..ee2587cc04e 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -937,7 +937,7 @@ class Reception extends CommonObject
 			$this->fk_user_valid = trim($this->fk_user_valid);
 		}
 		if (isset($this->shipping_method_id)) {
-			$this->shipping_method_id = trim($this->shipping_method_id);
+			$this->shipping_method_id = (int) $this->shipping_method_id;
 		}
 		if (isset($this->tracking_number)) {
 			$this->tracking_number = trim($this->tracking_number);

From 75131fcc8f96f8bf00e148a6bd1f6b83b5b74390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:10:38 +0100
Subject: [PATCH 0204/1862] fix phpstan (#28414)

Default value of the parameter #7 $save_lastsearch_value (string) of method Categorie::getNomUrl() is incompatible with type int.
---
 htdocs/categories/class/categorie.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 9fb167e4e46..0037dc520cf 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1707,7 +1707,7 @@ class Categorie extends CommonObject
 	 *  @param  	int     $save_lastsearch_value	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return		string					Chaine avec URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $moreparam = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = '')
+	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $moreparam = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = 0)
 	{
 		global $conf, $langs, $hookmanager;
 

From 0d60041d8fdc8389170fe0e1e5177ae093a500ff Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:11:25 +0100
Subject: [PATCH 0205/1862] Qual: Add custom phan plugin to detect var_dump
 (#28420)

# Qual: Add custom phan plugin to detect var_dump

This adds a custom plugin to detect the presence of var_dump.

Also disable a standard plugin in the extended configuration
(avoid reporting suggestions to add typing to the function
definitions (/declarations).
---
 dev/tools/phan/config.php                  | 11 +--
 dev/tools/phan/config_extended.php         | 12 ++--
 dev/tools/phan/plugins/NoVarDumpPlugin.php | 81 ++++++++++++++++++++++
 3 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 dev/tools/phan/plugins/NoVarDumpPlugin.php

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 9821b5049b7..1dc71344d2d 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -83,6 +83,7 @@ return [
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
 	'plugins' => [
+		__DIR__.'/plugins/NoVarDumpPlugin.php',
 		// checks if a function, closure or method unconditionally returns.
 		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
 		//'DeprecateAliasPlugin',
@@ -149,9 +150,13 @@ return [
 		'PhanPluginShortArray',
 		'PhanPluginNumericalComparison',
 		'PhanPluginUnknownObjectMethodCall',
-		'PhanPluginCanUseParamType',
 		'PhanPluginNonBoolInLogicalArith',
-		'PhanPluginCanUseReturnType',
+		// Fixers From PHPDocToRealTypesPlugin:
+		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+
 		// 'PhanPluginNotFullyQualifiedFunctionCall',
 		'PhanPluginConstantVariableScalar',
 		// 'PhanPluginNoCommentOnPublicProperty',
@@ -166,7 +171,6 @@ return [
 		'PhanPluginUnknownArrayMethodReturnType',
 		'PhanTypeMismatchArgumentInternal',
 		'PhanPluginDuplicateAdjacentStatement',
-		'PhanPluginCanUseNullableParamType',
 		'PhanTypeInvalidLeftOperandOfNumericOp',
 		'PhanTypeMismatchProperty',
 		// 'PhanPluginNoCommentOnPublicMethod',
@@ -190,7 +194,6 @@ return [
 		'PhanTypeInvalidLeftOperandOfAdd',
 		// 'PhanPluginNoCommentOnPrivateProperty',
 		// 'PhanPluginNoCommentOnFunction',
-		'PhanPluginCanUseNullableReturnType',
 		'PhanPluginUnknownArrayFunctionParamType',
 		// 'PhanPluginDescriptionlessCommentOnPublicProperty',
 		'PhanPluginUnknownFunctionParamType',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 2e748430fe2..9a721355daf 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -83,6 +83,7 @@ return [
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
 	'plugins' => [
+		__DIR__.'/plugins/NoVarDumpPlugin.php',
 		'DeprecateAliasPlugin',
 		//'EmptyMethodAndFunctionPlugin',
 		'InvalidVariableIssetPlugin',
@@ -102,7 +103,7 @@ return [
 		'NonBoolBranchPlugin', // Requires test on bool, nont on ints
 		'NonBoolInLogicalArithPlugin',
 		'NumericalComparisonPlugin',
-		'PHPDocToRealTypesPlugin',
+		// 'PHPDocToRealTypesPlugin',  // Report/Add types to function definitions
 		'PHPDocInWrongCommentPlugin', // Missing /** (/* was used)
 		//'ShortArrayPlugin', // Checks that [] is used
 		//'StrictLiteralComparisonPlugin',
@@ -138,10 +139,11 @@ return [
 		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
 		'PhanPluginShortArray',			// Dolibarr uses array()
 		'PhanPluginShortArrayList',		// Dolibarr uses array()
-		// The following may require that --quick is not used
-		'PhanPluginCanUseParamType',	// Does not seem useful: is reporting types already in PHPDoc?
-		'PhanPluginCanUseReturnType',	// Does not seem useful: is reporting types already in PHPDoc?
-		'PhanPluginCanUseNullableParamType',	// Does not seem useful: is reporting types already in PHPDoc?
+		// Fixers From PHPDocToRealTypesPlugin:
+		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
 		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
 		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
 		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
diff --git a/dev/tools/phan/plugins/NoVarDumpPlugin.php b/dev/tools/phan/plugins/NoVarDumpPlugin.php
new file mode 100644
index 00000000000..b2b093922f7
--- /dev/null
+++ b/dev/tools/phan/plugins/NoVarDumpPlugin.php
@@ -0,0 +1,81 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+
+declare(strict_types=1);
+
+use ast\Node;
+use Phan\PluginV3;
+use Phan\PluginV3\PluginAwarePostAnalysisVisitor;
+use Phan\PluginV3\PostAnalyzeNodeCapability;
+
+/**
+ * NoVarDumpPlugin hooks into one event:
+ *
+ * - getPostAnalyzeNodeVisitorClassName
+ *   This method returns a visitor that is called on every AST node from every
+ *   file being analyzed
+ *
+ * A plugin file must
+ *
+ * - Contain a class that inherits from \Phan\PluginV3
+ *
+ * - End by returning an instance of that class.
+ *
+ * It is assumed without being checked that plugins aren't
+ * mangling state within the passed code base or context.
+ *
+ * Note: When adding new plugins,
+ * add them to the corresponding section of README.md
+ */
+class NoVarDumpPlugin extends PluginV3 implements PostAnalyzeNodeCapability
+{
+	/**
+	 * @return string - name of PluginAwarePostAnalysisVisitor subclass
+	 */
+	public static function getPostAnalyzeNodeVisitorClassName(): string
+	{
+		return NoVarDumpVisitor::class;
+	}
+}
+
+/**
+ * When __invoke on this class is called with a node, a method
+ * will be dispatched based on the `kind` of the given node.
+ *
+ * Visitors such as this are useful for defining lots of different
+ * checks on a node based on its kind.
+ */
+class NoVarDumpVisitor extends PluginAwarePostAnalysisVisitor
+{
+	// A plugin's visitors should not override visit() unless they need to.
+
+	/**
+	 * @param Node $node A node to analyze
+	 *
+	 * @return void
+	 *
+	 * @override
+	 */
+	public function visitCall(Node $node): void
+	{
+		$name = $node->children['expr']->children['name'] ?? null;
+		if (!is_string($name)) {
+			return;
+		}
+		if (strcasecmp($name, 'var_dump') !== 0) {
+			return;
+		}
+		$this->emitPluginIssue(
+			$this->code_base,
+			$this->context,
+			'NoVarDumpPlugin',
+			'var_dump() should be commented in submitted code',
+			[]
+		);
+	}
+}
+
+// Every plugin needs to return an instance of itself at the
+// end of the file in which it's defined.
+return new NoVarDumpPlugin();

From aa25dc5bdc0bdd1b99094136f943e17f529d39f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:11:44 +0100
Subject: [PATCH 0206/1862] fix phpstan (#28417)

Default value of the parameter #2 $array_options (int) of method Delivery::update_line() is incompatible with type array.
---
 htdocs/delivery/class/delivery.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 26cea82e0d7..1dfc406a9b9 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011-2023 Philippe Grand	     <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry	     <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García         <marcosgdf@gmail.com>
- * Copyright (C) 2023      Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024 Frédéric France       <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -599,10 +599,10 @@ class Delivery extends CommonObject
 	 * Update a livraison line (only extrafields)
 	 *
 	 * @param 	int		$id					Id of line (livraison line)
-	 * @param	array		$array_options		extrafields array
+	 * @param	array	$array_options		extrafields array
 	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
-	public function update_line($id, $array_options = 0)
+	public function update_line($id, $array_options = [])
 	{
 		// phpcs:enable
 		global $conf;

From 6ab63d4f3379093752c4c475503ae615364cbbe3 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+BB2A-Anthony@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:12:32 +0100
Subject: [PATCH 0207/1862] look and feel yes no (#28421)

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
---
 htdocs/commande/list.php          | 2 +-
 htdocs/core/lib/functions.lib.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index d471e9d7ca4..de9e0bd9892 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -2727,7 +2727,7 @@ while ($i < $imaxinloop) {
 
 		// Billed
 		if (!empty($arrayfields['c.facture']['checked'])) {
-			print '<td class="center">'.yn($obj->billed).'</td>';
+			print '<td class="center">'.yn($obj->billed, 4).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c8b7adbb9aa..9af757a62ea 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7235,6 +7235,9 @@ function yn($yesno, $case = 1, $color = 0)
 		if ($case == 3) {
 			$result = '<input type="checkbox" value="1" checked disabled> '.$result;
 		}
+		if ($case == 4) {
+			$result = img_picto('check', 'check');
+		}
 
 		$classname = 'ok';
 	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {
@@ -7248,6 +7251,9 @@ function yn($yesno, $case = 1, $color = 0)
 		if ($case == 3) {
 			$result = '<input type="checkbox" value="0" disabled> '.$result;
 		}
+		if ($case == 4) {
+			$result = img_picto('uncheck', 'uncheck');
+		}
 
 		if ($color == 2) {
 			$classname = 'ok';

From 0de5807423c9498e8783c89c60d3d7b091b3c9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:14:02 +0100
Subject: [PATCH 0208/1862] fix phpstan (#28416)

Default value of the parameter #8 $filterkey (string) of method FormResource::select_resource_list() is incompatible with type array.
---
 htdocs/resource/class/html.formresource.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 0241e62a8fc..425ee481964 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) - 2013-2015 Jean-François FERRY	<jfefe@aternatik.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
  *
@@ -80,7 +80,7 @@ class FormResource
 	 * 	@param	bool	$multiple		add [] in the name of element and add 'multiple' attribute
 	 * 	@return	string|array			HTML string with
 	 */
-	public function select_resource_list($selected = 0, $htmlname = 'fk_resource', array $filter = [], $showempty = 0, $showtype = 0, $forcecombo = 0, $event = [], $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '', $multiple = false)
+	public function select_resource_list($selected = 0, $htmlname = 'fk_resource', array $filter = [], $showempty = 0, $showtype = 0, $forcecombo = 0, $event = [], $filterkey = [], $outputmode = 0, $limit = 20, $morecss = '', $multiple = false)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs;

From 3d3ef247c559854892d98d7a24e1a358c996972b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:14:39 +0100
Subject: [PATCH 0209/1862] Fix: Replace deprecated php aliases with actual
 functions (#28419)

* Fix: Handle facture modulepart depr + optimise

# Fix: Handle facture modulepart depr + optimise

Add a case for 'facture' to 'invoice' conversion for the 'modulepart'
(issue seen when introducing DolDeprationHandler).
Use elseif for optimisation.

* Fix: Replace deprecated php aliases with actual functions

# Fix: Replace deprecated php aliases with actual functions

Replacements of join with implode.

* Fix: Replace deprecated php aliases with actual functions

# Fix: Replace deprecated php aliases with actual functions

Replacements of join with implode.

* Fix: Replace deprecated php aliases with actual functions

# Fix: Replace deprecated php aliases with actual functions

Replacements of join with implode.
---
 htdocs/core/lib/files.lib.php                 |  12 +-
 .../fourn/class/fournisseur.facture.class.php | 106 +++++++++---------
 htdocs/product/stats/commande.php             |   4 +-
 htdocs/product/stats/commande_fournisseur.php |   2 +-
 4 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index eb113f1ddb9..bc316e5b80f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2660,14 +2660,14 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 	}
 	// Fix modulepart for backward compatibility
-	if ($modulepart == 'users') {
+	if ($modulepart == 'facture') {
+		$modulepart = 'invoice';
+	} elseif ($modulepart == 'users') {
 		$modulepart = 'user';
-	}
-	if ($modulepart == 'tva') {
+	} elseif ($modulepart == 'tva') {
 		$modulepart = 'tax-vat';
-	}
-	// Fix modulepart delivery
-	if ($modulepart == 'expedition' && strpos($original_file, 'receipt/') === 0) {
+	} elseif ($modulepart == 'expedition' && strpos($original_file, 'receipt/') === 0) {
+		// Fix modulepart delivery
 		$modulepart = 'delivery';
 	}
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 8c004650de0..5216aa24d81 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -250,55 +250,55 @@ class FactureFournisseur extends CommonInvoice
 	public $fk_fac_rec_source;
 
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
-		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>30),
-		'type' =>array('type'=>'smallint(6)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'subtype' =>array('type'=>'smallint(6)', 'label'=>'InvoiceSubtype', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>36),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>40),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'datef' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>55),
-		'libelle' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'paye' =>array('type'=>'smallint(6)', 'label'=>'Paye', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>65),
-		'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'remise' =>array('type'=>'double(24,8)', 'label'=>'Discount', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'close_code' =>array('type'=>'varchar(16)', 'label'=>'CloseCode', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'close_note' =>array('type'=>'varchar(128)', 'label'=>'CloseNote', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'TotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>130),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'fk_facture_source' =>array('type'=>'integer', 'label'=>'Fk facture source', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>145),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Account', 'enabled'=>'isModEnabled("banque")', 'visible'=>-1, 'position'=>150),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
-		'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateLimReglement', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>170),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>175),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPdf', 'enabled'=>1, 'visible'=>0, 'position'=>180),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'MulticurrencyId', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
-		'date_pointoftax' =>array('type'=>'date', 'label'=>'Date pointoftax', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
-		'date_valid' =>array('type'=>'date', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 15),
+		'ref_supplier' => array('type' => 'varchar(255)', 'label' => 'RefSupplier', 'enabled' => 1, 'visible' => -1, 'position' => 20),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25, 'index' => 1),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 30),
+		'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
+		'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 36),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 40),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'datef' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 55),
+		'libelle' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'paye' => array('type' => 'smallint(6)', 'label' => 'Paye', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 65),
+		'amount' => array('type' => 'double(24,8)', 'label' => 'Amount', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 70),
+		'remise' => array('type' => 'double(24,8)', 'label' => 'Discount', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'close_code' => array('type' => 'varchar(16)', 'label' => 'CloseCode', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'close_note' => array('type' => 'varchar(128)', 'label' => 'CloseNote', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'tva' => array('type' => 'double(24,8)', 'label' => 'Tva', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'Localtax1', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'Localtax2', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'TotalHT', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'TotalVAT', 'enabled' => 1, 'visible' => -1, 'position' => 110),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'TotalTTC', 'enabled' => 1, 'visible' => -1, 'position' => 115),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -1, 'position' => 125),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 130),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'fk_facture_source' => array('type' => 'integer', 'label' => 'Fk facture source', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 145),
+		'fk_account' => array('type' => 'integer', 'label' => 'Account', 'enabled' => 'isModEnabled("banque")', 'visible' => -1, 'position' => 150),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'PaymentTerm', 'enabled' => 1, 'visible' => -1, 'position' => 155),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => -1, 'position' => 160),
+		'date_lim_reglement' => array('type' => 'date', 'label' => 'DateLimReglement', 'enabled' => 1, 'visible' => -1, 'position' => 165),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 170),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 175),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'ModelPdf', 'enabled' => 1, 'visible' => 0, 'position' => 180),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 190),
+		'fk_incoterms' => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'IncotermLocation', 'enabled' => 1, 'visible' => -1, 'position' => 200),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'MulticurrencyId', 'enabled' => 1, 'visible' => -1, 'position' => 205),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'MulticurrencyCode', 'enabled' => 1, 'visible' => -1, 'position' => 210),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyRate', 'enabled' => 1, 'visible' => -1, 'position' => 215),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyTotalHT', 'enabled' => 1, 'visible' => -1, 'position' => 220),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyTotalVAT', 'enabled' => 1, 'visible' => -1, 'position' => 225),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyTotalTTC', 'enabled' => 1, 'visible' => -1, 'position' => 230),
+		'date_pointoftax' => array('type' => 'date', 'label' => 'Date pointoftax', 'enabled' => 1, 'visible' => -1, 'position' => 235),
+		'date_valid' => array('type' => 'date', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 240),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'Last main doc', 'enabled' => 1, 'visible' => -1, 'position' => 245),
+		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 900),
 	);
 
 
@@ -1350,7 +1350,7 @@ class FactureFournisseur extends CommonInvoice
 				$facligne->rang = 1;
 				$linecount = count($this->lines);
 				for ($ii = 1; $ii <= $linecount; $ii++) {
-					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
 				}
 			}
 
@@ -2658,7 +2658,7 @@ class FactureFournisseur extends CommonInvoice
 				}
 				if ($qualified) {
 					$paymentornot = ($obj->fk_paiementfourn ? 1 : 0);
-					$return[$obj->rowid] = array('ref'=>$obj->ref, 'status'=>$obj->fk_statut, 'type'=>$obj->type, 'paye'=>$obj->paye, 'paymentornot'=>$paymentornot);
+					$return[$obj->rowid] = array('ref' => $obj->ref, 'status' => $obj->fk_statut, 'type' => $obj->type, 'paye' => $obj->paye, 'paymentornot' => $paymentornot);
 				}
 			}
 
@@ -2922,7 +2922,7 @@ class FactureFournisseur extends CommonInvoice
 		}
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -3689,7 +3689,7 @@ class FactureFournisseur extends CommonInvoice
 
 			return 0;
 		} else {
-			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error;
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? implode(', ', $errorsMsg) : $error;
 
 			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 3532afb8116..eedd1cb47c8 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -69,7 +69,7 @@ if (!$sortfield) {
 $search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 if (GETPOSTISARRAY('search_status')) {
-	$search_status = join(',', GETPOST('search_status', 'array:intcomma'));
+	$search_status = implode(',', GETPOST('search_status', 'array:intcomma'));
 } else {
 	$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 }
@@ -100,7 +100,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object = $product;
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index a76c572af19..44e35990683 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -69,7 +69,7 @@ if (!$sortfield) {
 $search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 if (GETPOSTISARRAY('search_status')) {
-	$search_status = join(',', GETPOST('search_status', 'array:intcomma'));
+	$search_status = implode(',', GETPOST('search_status', 'array:intcomma'));
 } else {
 	$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 }

From 991b39c8a013eee70f4799808a12cd86525dda21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:14:55 +0100
Subject: [PATCH 0210/1862] fix phpstan (#28422)

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ff079efe387..265f218fc53 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
- * Copyright (C) 2018-2024  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2020       Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2022       Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2023      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
@@ -903,14 +903,14 @@ class Task extends CommonObjectLine
 	{
 		$this->id = 0;
 
-		$this->fk_project = '';
+		$this->fk_project = 0;
 		$this->ref = 'TK01';
-		$this->fk_task_parent = null;
+		$this->fk_task_parent = 0;
 		$this->label = 'Specimen task TK01';
 		$this->duration_effective = '';
-		$this->fk_user_creat = null;
+		$this->fk_user_creat = 1;
 		$this->progress = '25';
-		$this->status = null;
+		$this->status = 0;
 		$this->note = 'This is a specimen task not';
 	}
 

From d8e12140e059f1489b0cc17281128852babf2947 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 25 Feb 2024 22:16:32 +0100
Subject: [PATCH 0211/1862] Fix: Handle facture modulepart depr + optimise
 (#28418)

# Fix: Handle facture modulepart depr + optimise

Add a case for 'facture' to 'invoice' conversion for the 'modulepart'
(issue seen when introducing DolDeprationHandler).
Use elseif for optimisation.

From 9b8d39267a152c7aaa50b555d9f4753de58fc9e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 23:49:20 +0100
Subject: [PATCH 0212/1862] Debug v20

---
 htdocs/core/customreports.php     | 7 ++++++-
 htdocs/core/lib/functions.lib.php | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 950f6f8d684..816652f01ff 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -111,6 +111,7 @@ $arrayoftype = array(
 	'cotisation' => array('label' => 'Subscriptions', 'picto'=>'member', 'ObjectClassName' => 'Subscription', 'enabled' => isModEnabled('adherent'), 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
 );
 
+
 // Complete $arrayoftype by external modules
 $parameters = array('objecttype'=>$objecttype, 'tabfamily'=>$tabfamily);
 $reshook = $hookmanager->executeHooks('loadDataForCustomReports', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -302,7 +303,11 @@ $formother = new FormOther($db);
 if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	llxHeader('', $langs->transnoentitiesnoconv('CustomReports'), '');
 
-	print dol_get_fiche_head($head, 'customreports', $title, -1, $picto);
+	if (empty($head)) {
+		print dol_get_fiche_head($head, 'customreports', $title, -2, $picto);
+	} else {
+		print dol_get_fiche_head($head, 'customreports', $title, -1, $picto);
+	}
 }
 
 $newarrayoftype = array();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c8b7adbb9aa..779359719e5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2164,7 +2164,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
  *	@param	array	$links				Array of tabs (0=>url, 1=>label, 2=>code, 3=>not used, 4=>text after link, 5=>morecssonlink). Currently initialized by calling a function xxx_admin_prepare_head. Note that label into $links[$i][1] must be already HTML escaped.
  *	@param	string	$active     		Active tab name
  *	@param  string	$title      		Title
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after), -3=-2+'noborderbottom'
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no separation under tab (to start a tab just after), -3=-2+'noborderbottom'
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
@@ -2340,7 +2340,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	}
 
 	if (!$notab || $notab == -1 || $notab == -2 || $notab == -3) {
-		$out .= "\n".'<div id="dragDropAreaTabBar" class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : (($notab == -3 ? ' noborderbottom' : '').' tabBarWithBottom'))).'">'."\n";
+		$out .= "\n".'<div id="dragDropAreaTabBar" class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : (($notab == -3 ? ' noborderbottom' : '').' tabBarWithBottom')));
+		$out .= '">'."\n";
 	}
 	if (!empty($dragdropfile)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

From 7d4334a353223b5ee1f7e9ca226fa7fc552a69f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Feb 2024 23:58:37 +0100
Subject: [PATCH 0213/1862] Fix when first label is '0'

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

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 816652f01ff..f503e647dff 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -940,7 +940,7 @@ if ($sql) {
 				}
 				$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->transnoentitiesnoconv("Empty") : $langs->transnoentitiesnoconv("NotDefined")));
 
-				if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
+				if ($oldlabeltouse !== '' && ($labeltouse != $oldlabeltouse)) {
 					$xi++; // Increase $xi
 				}
 				//var_dump($labeltouse.' '.$oldlabeltouse.' '.$xi);

From 3e801c94ff88d4267fe80b1001bb5dc2a5db5cb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 13:43:34 +0100
Subject: [PATCH 0214/1862] NEW Look and field: The operator 'or' on category
 filter visible only when 2+ categories

---
 htdocs/core/class/html.formcategory.class.php | 20 +++++++++++++++----
 htdocs/langs/en_US/main.lang                  |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 19530933d86..5841f5035e1 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -35,7 +35,7 @@ class FormCategory extends Form
 	 * @param 	string		$type								The categorie type (e.g Categorie::TYPE_WAREHOUSE)
 	 * @param 	array		$preSelected						A list with the elements that should pre-selected
 	 * @param	string		$morecss							More CSS
-	 * @param	int			$searchCategoryProductOperator		0 or 1 to enable the checkbox to search with a or (0=not preseleted, 1=preselected), -1=Not used
+	 * @param	int			$searchCategoryProductOperator		Used only if $multiselect is 1. Set to 0 or 1 to enable the checkbox to search with a or (0=not preseleted, 1=preselected), -1=Checkbox never shown.
 	 * @param	int			$multiselect						0 or 1
 	 * @param	int			$nocateg							1=Add an entry '- No Category -'
 	 * @param	string		$showempty							1 or 'string' to add an empty entry
@@ -75,11 +75,23 @@ class FormCategory extends Form
 
 			$filter .= $formother->select_categories($type, $preSelected[0], $htmlName, $nocateg, $tmptitle, $morecss);
 		}
-		if ($searchCategoryProductOperator >= 0) {
-			$filter .= ' <input type="checkbox" class="valignmiddle" id="'.$htmlName2.'" name="'.$htmlName2.'" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').' title="'.dol_escape_htmltag($langs->trans('UseOrOperatorForCategories')).'" />';
-			$filter .= '<label class="none valignmiddle" for="'.$htmlName2.'" title="'.dol_escape_htmltag($langs->trans('UseOrOperatorForCategories')).'">';
+		if ($multiselect && $searchCategoryProductOperator >= 0) {
+			$filter .= ' <input type="checkbox" class="valignmiddle '.$htmlName2.'" id="'.$htmlName2.'" name="'.$htmlName2.'" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').' title="'.dol_escape_htmltag($langs->trans('UseOrOperatorForCategories')).'" />';
+			$filter .= '<label class="none valignmiddle '.$htmlName2.'" for="'.$htmlName2.'" title="'.dol_escape_htmltag($langs->trans('UseOrOperatorForCategories')).'">';
 			$filter .= $langs->trans('UseOrOperatorShort');
 			$filter .= '</label>';
+
+			$filter .= '<script>'."\n";;
+			$filter .= "var nbSelected = jQuery('#".$htmlName."').val().length;";
+			$filter .= "console.log('Nb of element now = '+nbSelected);\n";
+			$filter .= "if (nbSelected > 1) { jQuery('.".$htmlName2."').show(); } else { jQuery('.".$htmlName2."').hide(); }\n";
+			$filter .= "jQuery('#".$htmlName."').change(function() {\n";
+			$filter .= "console.log('Content of select box has been modified.');";
+			$filter .= 'var nbSelected = $(this).val().length;';
+			$filter .= "console.log('Nb of element now = '+nbSelected);\n";
+			$filter .= "if (nbSelected > 1) { jQuery('.".$htmlName2."').show(); } else { jQuery('.".$htmlName2."').hide(); }\n";
+			$filter .= '});'."\n";
+			$filter .= '</script>'."\n";
 		}
 		$filter .= "</div>";
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d603986da72..685acf120c2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1272,4 +1272,4 @@ Settings=Settings
 FillMessageWithALayout=Fill message with a layout
 FillMessageWithAIContent=Fill message with AI content
 EnterYourAIPromptHere=Enter your AI prompt here
-UseOrOperatorShort=Use 'or'
+UseOrOperatorShort=or

From 1141cdca18e1b09285b765cba81dd73ada39951a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 14:16:24 +0100
Subject: [PATCH 0215/1862] Link to whatsapp

---
 htdocs/install/mysql/data/llx_c_socialnetworks.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_socialnetworks.sql b/htdocs/install/mysql/data/llx_c_socialnetworks.sql
index 2283832a98f..a5800230cab 100644
--- a/htdocs/install/mysql/data/llx_c_socialnetworks.sql
+++ b/htdocs/install/mysql/data/llx_c_socialnetworks.sql
@@ -57,7 +57,7 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'viadeo', 'Viadeo', 'https://fr.viadeo.com/fr/{socialid}', 'fa-viadeo', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'viber', 'Viber', '{socialid}', '', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'vimeo', 'Vimeo', '{socialid}', 'fa-vimeo', 0);
-INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'whatsapp', 'Whatsapp', '{socialid}', 'fa-whatsapp', 1);
+INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'whatsapp', 'Whatsapp', 'https://web.whatsapp.com/send?phone={socialid}', 'fa-whatsapp', 1);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'wikipedia', 'Wikipedia', '{socialid}', 'fa-wikipedia-w', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'xing', 'Xing', '{socialid}', 'fa-xing', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'youtube', 'Youtube', 'https://www.youtube.com/{socialid}', 'fa-youtube', 1);

From fa2cfb97b16aa950ccf08c947989fd88f3022609 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 15:02:39 +0100
Subject: [PATCH 0216/1862] Fix bad parameter for GETPOST

---
 htdocs/admin/mails.php                                    | 4 ++--
 htdocs/admin/mails_emailing.php                           | 4 ++--
 htdocs/admin/mails_ticket.php                             | 8 ++++----
 htdocs/admin/menus/edit.php                               | 2 +-
 htdocs/comm/propal/stats/index.php                        | 4 ++--
 htdocs/commande/stats/index.php                           | 4 ++--
 htdocs/compta/facture/card.php                            | 4 ++--
 htdocs/compta/facture/stats/index.php                     | 4 ++--
 htdocs/core/actions_massactions.inc.php                   | 2 +-
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 2 +-
 htdocs/modulebuilder/admin/setup.php                      | 2 +-
 htdocs/mrp/mo_card.php                                    | 2 +-
 htdocs/projet/tasks/time.php                              | 2 +-
 htdocs/reception/card.php                                 | 2 +-
 htdocs/webportal/class/controller.class.php               | 6 +++---
 .../webportal/controllers/document.controller.class.php   | 2 ++
 16 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 443e5eb2e8f..cdda45c2a90 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -99,10 +99,10 @@ if ($action == 'update' && !$cancel) {
 			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
 		}
 		if (GETPOSTISSET("MAIN_MAIL_SMTPS_AUTH_TYPE")) {
-			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE", 'chaine'), 'chaine', 0, '', $conf->entity);
+			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		}
 		if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE")) {
-			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'chaine'), 'chaine', 0, '', $conf->entity);
+			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index bf619d5f554..059a99a7a1b 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -88,10 +88,10 @@ if ($action == 'update' && !$cancel) {
 		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_EMAILING", GETPOST("MAIN_MAIL_SMTPS_PW_EMAILING", 'none'), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING")) {
-		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING", 'chaine'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING")) {
-		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING", 'chaine'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	}
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_EMAILING", GETPOST("MAIN_MAIL_EMAIL_TLS_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS_EMAILING", GETPOST("MAIN_MAIL_EMAIL_STARTTLS_EMAILING"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index fbb5edddfc3..dd9f63c3ef6 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -86,10 +86,10 @@ if ($action == 'update' && !$cancel) {
 		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_TICKET", GETPOST("MAIN_MAIL_SMTPS_PW_TICKET", 'none'), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET")) {
-		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET", 'chaine'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET")) {
-		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET", 'chaine'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	}
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_TICKET", GETPOST("MAIN_MAIL_EMAIL_TLS_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS_TICKET", GETPOST("MAIN_MAIL_EMAIL_STARTTLS_TICKET"), 'chaine', 0, '', $conf->entity);
@@ -672,8 +672,8 @@ if ($action == 'edit') {
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : getDolGlobalString('MAIN_MAIL_EMAIL_FROM'));
+		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : getDolGlobalString('MAIN_MAIL_EMAIL_FROM'));
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
 		$formmail->fromid = $user->id;
 		$formmail->fromalsorobot = 1;
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 95de2e96b99..3b680f93a7b 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -362,7 +362,7 @@ if ($action == 'create') {
 
 	// Picto
 	print '<tr><td class="fieldrequired">'.$langs->trans('Image').'</td>';
-	print '<td><input type="text" class="minwidth300" name="picto" value="'.dol_escape_htmltag(GETPOST("picto", 'alphanohtmlallowclass')).'"></td><td>'.$langs->trans('Example').': fa-global</td></tr>';
+	print '<td><input type="text" class="minwidth300" name="picto" value="'.dol_escape_htmltag(GETPOST("picto", 'alphanohtml')).'"></td><td>'.$langs->trans('Example').': fa-global</td></tr>';
 
 	// URL
 	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td>';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 4e0a4071ae0..3603f89af2a 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -41,8 +41,8 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
 
 $object_status = GETPOST('object_status', 'intcomma');
-$typent_id = GETPOST('typent_id', 'int');
-$categ_id = GETPOST('categ_id', 'categ_id');
+$typent_id = GETPOSTINT('typent_id');
+$categ_id = GETPOSTINT('categ_id');
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index f7da50833e1..1a06944f272 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -62,8 +62,8 @@ if ($mode == 'supplier') {
 }
 
 
-$typent_id = GETPOST('typent_id', 'int');
-$categ_id = GETPOST('categ_id', 'categ_id');
+$typent_id = GETPOSTINT('typent_id');
+$categ_id = GETPOSTINT('categ_id');
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 091af287d69..f1ae8948052 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -442,13 +442,13 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setretainedwarranty' && $user->hasRight('facture', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
+		$result = $object->setRetainedWarranty(GETPOSTFLOAT('retained_warranty'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
 	} elseif ($action == 'setretainedwarrantydatelimit' && $user->hasRight('facture', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
+		$result = $object->setRetainedWarrantyDateLimit(GETPOSTFLOAT('retained_warranty_date_limit'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 4ae358d682d..f98216140f9 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -52,8 +52,8 @@ if ($mode == 'supplier' && !$user->hasRight('fournisseur', 'facture', 'lire')) {
 }
 
 $object_status = GETPOST('object_status', 'intcomma');
-$typent_id = GETPOST('typent_id', 'int');
-$categ_id = GETPOST('categ_id', 'categ_id');
+$typent_id = GETPOSTINT('typent_id');
+$categ_id = GETPOSTINT('categ_id');
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index e1762456dce..551c7b7c069 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1684,7 +1684,7 @@ if (!$error && ($massaction == 'increaseholiday' || ($action == 'increaseholiday
 	$objecttmp = new $objectclass($db);
 	$nbok = 0;
 	$typeholiday = GETPOST('typeholiday', 'alpha');
-	$nbdaysholidays = GETPOST('nbdaysholidays', 'double');
+	$nbdaysholidays = GETPOSTFLOAT('nbdaysholidays');	// May be 1.5
 
 	if ($nbdaysholidays <= 0) {
 		setEventMessages($langs->trans("WrongAmount"), "", 'errors');
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 957a57c9f39..a810b92a8d3 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -217,7 +217,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Possibility to use suffix for proforma
 				$suffix = '';
 				if (getDolGlobalString('PROFORMA_PDF_WITH_SUFFIX')) {
-					$suffix = (GETPOST('model', 2)=='proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : '';
+					$suffix = (GETPOST('model') == 'proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : '';
 					$suffix = dol_sanitizeFileName($suffix);
 				}
 
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index 02513e697be..3b189f9908a 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -45,7 +45,7 @@ if ($action == "update") {
 	$res4 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_NAME', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_NAME', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	$res5 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_URL', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_URL', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	$res6 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_FAMILY', GETPOST('MODULEBUILDER_SPECIFIC_FAMILY', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	$res7 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_AUTHOR', GETPOST('MODULEBUILDER_SPECIFIC_AUTHOR', 'html'), 'chaine', 0, '', $conf->entity);
+	$res7 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_AUTHOR', GETPOST('MODULEBUILDER_SPECIFIC_AUTHOR', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	$res8 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_VERSION', GETPOST('MODULEBUILDER_SPECIFIC_VERSION', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) {
 		setEventMessages('ErrorFailedToSaveDate', null, 'errors');
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 39ae023c7c3..5f6a90f964e 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -203,7 +203,7 @@ if (empty($reshook)) {
 		}
 
 		$error = 0;
-		$deleteChilds = GETPOST('deletechilds', 'boolean');
+		$deleteChilds = GETPOST('deletechilds', 'aZ');
 
 		// Start the database transaction
 		$db->begin();
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e050fc44c1d..bc970a38fd5 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -425,7 +425,7 @@ if ($action == 'confirm_generateinvoice') {
 
 		$db->begin();
 		$idprod = GETPOST('productid', 'int');
-		$generateinvoicemode = GETPOST('generateinvoicemode', 'string');
+		$generateinvoicemode = GETPOST('generateinvoicemode', 'alphanohtml');
 		$invoiceToUse = GETPOST('invoiceid', 'int');
 
 		$prodDurationHoursBase = 1.0;
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 73d31b376b8..79a9fe082ad 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -414,7 +414,7 @@ if (empty($reshook)) {
 					$sellbydate = str_replace('/', '-', $sellby);
 
 					if (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')) {
-						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'), price2num(GETPOST($cost_price, 'double'), 'MU'));
+						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'), GETPOSTFLOAT($cost_price, 'MU'));
 					} else {
 						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
 					}
diff --git a/htdocs/webportal/class/controller.class.php b/htdocs/webportal/class/controller.class.php
index 6c2c0aed3b3..0904b664847 100644
--- a/htdocs/webportal/class/controller.class.php
+++ b/htdocs/webportal/class/controller.class.php
@@ -164,11 +164,11 @@ class Controller
 	}
 
 	/**
-	 * Load a template
+	 * Load a template .tpl file
 	 *
-	 * @param	string	$templateName	Template name
+	 * @param	string	$templateName	Template file name (without the .tpl.php)
 	 * @param	mixed	$vars			Data to transmit to template
-	 * @return	bool	True if template found, else false
+	 * @return	bool					True if template found, else false
 	 */
 	public function loadTemplate($templateName, $vars = false)
 	{
diff --git a/htdocs/webportal/controllers/document.controller.class.php b/htdocs/webportal/controllers/document.controller.class.php
index 92cc37e9ad7..9f5cd408867 100644
--- a/htdocs/webportal/controllers/document.controller.class.php
+++ b/htdocs/webportal/controllers/document.controller.class.php
@@ -95,9 +95,11 @@ class DocumentController extends Controller
 		// Security check
 		if (empty($modulepart)) {
 			httponly_accessforbidden('Bad link. Bad value for parameter modulepart', 400);
+			exit;
 		}
 		if (empty($original_file)) {
 			httponly_accessforbidden('Bad link. Missing identification to find file (original_file)', 400);
+			exit;
 		}
 
 		// get original file

From 182d5eba5bbcde66ce57698223736bf7b6ae6b44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 15:15:08 +0100
Subject: [PATCH 0217/1862] Fix warnings

---
 htdocs/comm/action/card.php    | 2 +-
 htdocs/compta/facture/card.php | 6 +++---
 htdocs/contrat/card.php        | 2 +-
 htdocs/fichinter/card.php      | 2 +-
 htdocs/fourn/facture/card.php  | 4 ++--
 htdocs/user/card.php           | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index be75149de77..cc5c5c1c8dd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1666,7 +1666,7 @@ if ($action == 'create') {
 
 		//Reminder
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
-		print '<input class="width50" type="number" name="offsetvalue" value="'.(GETPOSTISSET('offsetvalue') ? GETPOST('offsetvalue', 'int') : getDolGlobalInt('AGENDA_REMINDER_DEFAULT_OFFSET', 30)).'"> ';
+		print '<input class="width50" type="number" name="offsetvalue" value="'.(GETPOSTISSET('offsetvalue') ? GETPOSTINT('offsetvalue') : getDolGlobalInt('AGENDA_REMINDER_DEFAULT_OFFSET', 30)).'"> ';
 		print $form->selectTypeDuration('offsetunit', 'i', array('y', 'm'));
 		print '</td></tr>';
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index f1ae8948052..28a7c1a39fc 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1372,7 +1372,7 @@ if (empty($reshook)) {
 				$object->ref_client         = $object->ref_customer;
 				$object->model_pdf          = GETPOST('model');
 				$object->fk_project         = GETPOST('projectid', 'int');
-				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
+				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
 				$object->fk_account         = GETPOST('fk_account', 'int');
 				$object->amount             = price2num(GETPOST('amount'));
@@ -1459,7 +1459,7 @@ if (empty($reshook)) {
 				$object->ref_customer		= GETPOST('ref_client');
 				$object->model_pdf          = GETPOST('model');
 				$object->fk_project			= GETPOST('projectid', 'int');
-				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
+				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account         = GETPOST('fk_account', 'int');
 				$object->amount             = price2num(GETPOST('amount'));
@@ -3496,7 +3496,7 @@ if ($action == 'create') {
 			// Deposit - Down payment
 			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOST('type') == 3 ? ' checked' : '').'> ';
+				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOSTINT('type') == 3 ? ' checked' : '').'> ';
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index beeb962fcd7..fb3290f6124 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1052,7 +1052,7 @@ if (empty($reshook)) {
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes') {
-		if (!GETPOST('socid', 3)) {
+		if (!GETPOSTINT('socid', 3)) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
 			if ($object->id > 0) {
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index c069e2d15b2..0252f22f91a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1602,7 +1602,7 @@ if ($action == 'create') {
 					if (getDolGlobalString('INTERVENTION_ADDLINE_FREEDUREATION')) {
 						$selectmode = 'text';
 					}
-					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
+					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOSTINT('durationhour') + 60 * GETPOSTINT('durationmin')), 0, $selectmode);
 				}
 				print '</td>';
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2f40dfc21fa..4493ae9ad39 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -994,7 +994,7 @@ if (empty($reshook)) {
 				$object->ref_supplier       = GETPOST('ref_supplier', 'alphanohtml');
 				$object->model_pdf          = GETPOST('model', 'alphanohtml');
 				$object->fk_project         = GETPOST('projectid', 'int');
-				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
+				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
 				$object->fk_account         = GETPOST('fk_account', 'int');
 				$object->amount             = price2num(GETPOST('amount'));
@@ -2403,7 +2403,7 @@ if ($action == 'create') {
 			// Deposit - Down payment
 			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
+				$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOSTINT('type') == 3 ? ' checked' : '') . '> ';
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 5ba45ed415a..1b34c59a653 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -70,7 +70,7 @@ $id = GETPOST('id', 'int');
 $action		= GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
-$group = GETPOST("group", "int", 3);
+$group = GETPOSTINT("group", 3);
 $cancel		= GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
 

From b3a2d17fe5b4d4f175db6625c88ed3d3985d7e74 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 16:35:01 +0100
Subject: [PATCH 0218/1862] FIX #28429

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

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index a8f940ba16e..843c0ceaf35 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -591,7 +591,7 @@ if (isModEnabled('ficheinter')) {
 		addSummaryTableLine(3, $num, $nbofloop, $total, "NoIntervention");
 		finishSimpleTable(true);
 
-		print "</table></div>";
+		$db->free($resql);
 	}
 }
 

From 052cdd02596311db368e82746e7a3f13a782bbaf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 16:35:01 +0100
Subject: [PATCH 0219/1862] FIX #28429

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

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index da07b9f9dd6..bc9a1565dc8 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -591,7 +591,7 @@ if (isModEnabled('ficheinter')) {
 		addSummaryTableLine(3, $num, $nbofloop, $total, "NoIntervention");
 		finishSimpleTable(true);
 
-		print "</table></div>";
+		$db->free($resql);
 	}
 }
 

From c1a81c39b76606350b17970c267560eedeca4182 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 18:06:35 +0100
Subject: [PATCH 0220/1862] Work on custom report

---
 htdocs/core/customreports.php | 52 +++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index f503e647dff..7b85a63c864 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -13,16 +13,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- * Note: This tool can be included into a list page with:
- * define('USE_CUSTOM_REPORT_AS_INCLUDE', 1);
- * include DOL_DOCUMENT_ROOT.'/core/customreports.php';
  */
 
 /**
- *   	\file       htdocs/core/customreports.php
- *		\ingroup    core
- *		\brief      Page to make custom reports. Page can be used alone or as a tab among other tabs of an object
+ * \file       htdocs/core/customreports.php
+ * \ingroup    core
+ * \brief      Page to make custom reports. Page can also be used alone or as a tab among other tabs of an object
+ *
+ * To include this tool into another PHP page:
+ * define('USE_CUSTOM_REPORT_AS_INCLUDE', 1);
+ * include DOL_DOCUMENT_ROOT.'/core/customreports.php';
  */
 
 if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
@@ -74,10 +74,23 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$pagenext = $page + 1;
 
 	$diroutputmassaction = $conf->user->dir_temp.'/'.$user->id.'/customreport';
+
+	$object = null;
+} else {
+	$langs->load("main");
+	$search_measures = array();
+
+	if (empty($object)) {
+		print 'Page is called as an include but $object is not defined. We stop here.';
+		exit(-1);
+	}
 }
 
+require_once DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/company.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php";
@@ -92,7 +105,6 @@ $hookmanager->initHooks(array('customreport')); // Note that conf->hooks_modules
 $title = '';
 $picto = '';
 $head = array();
-$object = null;
 $ObjectClassName = '';
 // Objects available by default
 $arrayoftype = array(
@@ -566,9 +578,11 @@ if (empty($conf->use_javascript_ajax)) {
 print '</div><div class="clearboth"></div>';
 
 // Filter (you can use param &show_search_component_params_hidden=1 for debug)
-print '<div class="divadvancedsearchfield quatrevingtpercent">';
-print $form->searchComponent(array($object->element => $object->fields), $search_component_params, array(), $search_component_params_hidden);
-print '</div>';
+if (!empty($object)) {
+	print '<div class="divadvancedsearchfield quatrevingtpercent">';
+	print $form->searchComponent(array($object->element => $object->fields), $search_component_params, array(), $search_component_params_hidden);
+	print '</div>';
+}
 
 // YAxis (add measures into array)
 $count = 0;
@@ -1101,16 +1115,15 @@ print '<div>';
 
 if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	print dol_get_fiche_end();
+
+	llxFooter();
+	// End of page
 }
 
-// End of page
-llxFooter();
-
 $db->close();
 
 
 
-
 /**
  * Fill arrayofmesures for an object
  *
@@ -1127,6 +1140,9 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 {
 	global $langs, $extrafields, $db;
 
+	if (empty($object)) {	// Protection against bad use of method
+		return array();
+	}
 	if ($level > 10) {	// Protection against infinite loop
 		return $arrayofmesures;
 	}
@@ -1259,6 +1275,9 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 {
 	global $langs, $extrafields, $db;
 
+	if (empty($object)) {	// Protection against bad use of method
+		return array();
+	}
 	if ($level >= 3) {	// Limit scan on 2 levels max
 		return $arrayofxaxis;
 	}
@@ -1425,6 +1444,9 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 {
 	global $langs, $extrafields, $db;
 
+	if (empty($object)) {	// Protection against bad use of method
+		return array();
+	}
 	if ($level >= 3) {
 		return $arrayofgroupby;
 	}

From 817b62868ec1d57304b04e5f6f639eaca644760b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 19:08:00 +0100
Subject: [PATCH 0221/1862] Doc

---
 htdocs/core/class/html.form.class.php |  6 +++---
 htdocs/core/customreports.php         | 25 ++++++++++++++++++-------
 htdocs/user/class/user.class.php      |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a3046ce115d..fc3d27f4ca6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8419,7 +8419,7 @@ class Form
 	 * @param int 			$addjscombo 		Add js combo
 	 * @param string 		$moreparamonempty 	Add more param on the empty option line. Not used if show_empty not set
 	 * @param int 			$disablebademail 	1=Check if a not valid email, 2=Check string '---', and if found into value, disable and colorize entry
-	 * @param int 			$nohtmlescape 		No html escaping.
+	 * @param int 			$nohtmlescape 		No html escaping (not recommended, use 'data-html' if you need to use label with HTML content).
 	 * @return string							HTML select string.
 	 * @see multiselectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
@@ -8522,12 +8522,12 @@ class Form
 						$out .= ' selected'; // To preselect a value
 					}
 				}
-				if ($nohtmlescape) {
+				if (!empty($nohtmlescape)) {
 					$out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';
 				}
 				if (is_array($tmpvalue)) {
 					foreach ($tmpvalue as $keyforvalue => $valueforvalue) {
-						if (preg_match('/^data-/', $keyforvalue)) {
+						if (preg_match('/^data-/', $keyforvalue)) {	// The best solution if you want to use HTML values into the list is to use data-html.
 							$out .= ' '.$keyforvalue.'="'.dol_escape_htmltag($valueforvalue).'"';
 						}
 					}
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 7b85a63c864..71d5c1def6d 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -36,10 +36,6 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$objecttype = GETPOST('objecttype', 'aZ09arobase');
 	$tabfamily  = GETPOST('tabfamily', 'aZ09');
 
-	if (empty($objecttype)) {
-		$objecttype = 'thirdparty';
-	}
-
 	$search_measures = GETPOST('search_measures', 'array');
 	if (empty($search_measures)) {
 		$search_measures = array(0 => 't.count');
@@ -80,12 +76,23 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$langs->load("main");
 	$search_measures = array();
 
+	if (empty($user) || empty($user->id)) {
+		print 'Page is called as an include but $user and its permission loaded with getrights() are not defined. We stop here.';
+		exit(-1);
+	}
 	if (empty($object)) {
 		print 'Page is called as an include but $object is not defined. We stop here.';
 		exit(-1);
 	}
 }
 
+if (!empty($object)) {
+	$objecttype = $object->element.($object->module ? '@'.$object->module : '');
+}
+if (empty($objecttype)) {
+	$objecttype = 'thirdparty';
+}
+
 require_once DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
@@ -157,10 +164,14 @@ if ($objecttype) {
 		dol_include_once($fileforclass);
 
 		$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
-		if (class_exists($ObjectClassName)) {
-			$object = new $ObjectClassName($db);
+		if (!empty($ObjectClassName)) {
+			if (class_exists($ObjectClassName)) {
+				$object = new $ObjectClassName($db);
+			} else {
+				print 'Failed to load class for type '.$objecttype.'. Class file found but Class object named '.$ObjectClassName.' not found.';
+			}
 		} else {
-			print 'Failed to load class for type '.$objecttype.'. Class file found but class object '.$ObjectClassName.' not found.';
+			print 'Failed to load class for type '.$objecttype.'. Class file name is unknown.';
 		}
 	} catch (Exception $e) {
 		print 'Failed to load class for type '.$objecttype.'. Class path not found.';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 2fd3ce119b4..996fbee5611 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1175,7 +1175,7 @@ class User extends CommonObject
 
 
 	/**
-	 *	Load permissions granted to user into object user
+	 *	Load permissions granted to a user->id into object user->rights
 	 *
 	 *	@param  string	$moduletag		Limit permission for a particular module ('' by default means load all permissions)
 	 *  @param	int		$forcereload	Force reload of permissions even if they were already loaded (ignore cache)

From 71374be506c1e7dd521b09aabe945d7f85a3ff89 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 19:14:00 +0100
Subject: [PATCH 0222/1862] Comment

---
 htdocs/core/js/lib_head.js.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index f3209aebf2f..0bbe8499662 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -194,8 +194,7 @@ var select2arrayoflanguage = {
 	noResults: function () { return "<?php echo dol_escape_js($langs->transnoentitiesnoconv("Select2NotFound")); ?>"; },
 	inputTooShort: function (input) {
 		var n = input.minimum;
-		/*console.log(input);
-		console.log(input.minimum);*/
+		/*console.log(input); console.log(input.minimum);*/
 		if (n > 1) return "<?php echo dol_escape_js($langs->transnoentitiesnoconv("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->transnoentitiesnoconv("Select2MoreCharacters")); ?>";
 			else return "<?php echo dol_escape_js($langs->transnoentitiesnoconv("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->transnoentitiesnoconv("Select2MoreCharacter")); ?>"
 		},

From 5fc6dbdf2fbbcddf0f222a913495904592c7fced Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 19:59:42 +0100
Subject: [PATCH 0223/1862] Fix avoid false positive of injection

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d663c5b52d0..9453d1b403c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -25,7 +25,7 @@
 /** @phan-file-suppress PhanPluginSuspiciousParamPosition */
 
 // We allow POST of rich content with js and style, but only for this php file and if into some given POST variable
-define('NOSCANPOSTFORINJECTION', array('PAGE_CONTENT', 'WEBSITE_JS_INLINE', 'WEBSITE_HTML_HEADER'));
+define('NOSCANPOSTFORINJECTION', array('PAGE_CONTENT', 'WEBSITE_JS_INLINE', 'WEBSITE_HTML_HEADER', 'htmlheader'));
 
 define('USEDOLIBARREDITOR', 1);
 define('FORCE_CKEDITOR', 1); // We need CKEditor, even if module is off.

From b4ea234b75641b008312976cb541d566360ee70a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 20:11:55 +0100
Subject: [PATCH 0224/1862] Work on customreports

---
 htdocs/core/class/html.form.class.php | 11 +++++++----
 htdocs/core/customreports.php         |  6 +++---
 htdocs/core/lib/ajax.lib.php          |  4 +++-
 htdocs/main.inc.php                   |  1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fc3d27f4ca6..6782fbc31a3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8807,7 +8807,7 @@ class Form
 		}
 
 		$useenhancedmultiselect = 0;
-		if (!empty($conf->use_javascript_ajax) && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+		if (!empty($conf->use_javascript_ajax) && !defined('MAIN_DO_NOT_USE_JQUERY_MULTISELECT') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {
 			if ($addjscombo) {
 				$useenhancedmultiselect = 1;	// Use the js multiselect in one line. Possible only if $addjscombo not 0.
 			}
@@ -8866,9 +8866,12 @@ class Form
 			if ($addjscombo == 1) {
 				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				$out .= 'function formatResult(record, container) {' . "\n";
-				// If property html set, we decode html entities and use this.
+				// If property data-html set, we decode html entities and use this.
 				// Note that HTML content must have been sanitized from js with dol_escape_htmltag(xxx, 0, 0, '', 0, 1) when building the select option.
-				$out .= '	if ($(record.element).attr("data-html") != undefined) { return htmlEntityDecodeJs($(record.element).attr("data-html")); }'."\n";
+				$out .= '	if ($(record.element).attr("data-html") != undefined && typeof htmlEntityDecodeJs === "function") {';
+				//$out .= '		console.log("aaa");';
+				$out .= '		return htmlEntityDecodeJs($(record.element).attr("data-html"));';
+				$out .= '	}'."\n";
 				$out .= '	return record.text;';
 				$out .= '}' . "\n";
 				$out .= 'function formatSelection(record) {' . "\n";
@@ -8889,7 +8892,7 @@ class Form
 				}
 				$out .= '		dir: \'ltr\',
 								containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag (ko with multiselect) */
-								dropdownCssClass: \'' . $morecss . '\',				/* Line to add class on the new <span class="select2-selection...> tag (ok with multiselect) */
+								dropdownCssClass: \'' . $morecss . '\',				/* Line to add class on the new <span class="select2-selection...> tag (ok with multiselect). Need full version of select2. */
 								// Specify format function for dropdown item
 								formatResult: formatResult,
 							 	templateResult: formatResult,		/* For 4.0 */
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 71d5c1def6d..203385e74bd 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -37,9 +37,6 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$tabfamily  = GETPOST('tabfamily', 'aZ09');
 
 	$search_measures = GETPOST('search_measures', 'array');
-	if (empty($search_measures)) {
-		$search_measures = array(0 => 't.count');
-	}
 
 	//$search_xaxis = GETPOST('search_xaxis', 'array');
 	if (GETPOST('search_xaxis', 'alpha') && GETPOST('search_xaxis', 'alpha') != '-1') {
@@ -86,6 +83,9 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	}
 }
 
+if (empty($search_measures)) {
+	$search_measures = array(0 => 't.count');
+}
 if (!empty($object)) {
 	$objecttype = $object->element.($object->module ? '@'.$object->module : '');
 }
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 136382d2d77..91f76b66cdd 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -526,7 +526,9 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 						if ($(data.element).attr("data-html") != undefined) {
 							/* If property html set, we decode html entities and use this. */
 							/* Note that HTML content must have been sanitized from js with dol_escape_htmltag(xxx, 0, 0, \'\', 0, 1) when building the select option. */
-							return htmlEntityDecodeJs($(data.element).attr("data-html"));
+							if (typeof htmlEntityDecodeJs === "function") {
+								return htmlEntityDecodeJs($(data.element).attr("data-html"));
+							}
 						}
 						return data.text;
 					},
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 65a2f37ca33..8da0a809522 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -236,6 +236,7 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type, $stopcode = 1)
 
 				if ($stopcode) {
 					$errormessage = 'Access refused to '.htmlentities($ip, ENT_COMPAT, 'UTF-8').' by SQL or Script injection protection in main.inc.php:analyseVarsForSqlAndScriptsInjection type='.htmlentities($type, ENT_COMPAT, 'UTF-8');
+					//$errormessage .= ' paramkey='.htmlentities($key, ENT_COMPAT, 'UTF-8');	// Disabled to avoid text injection
 
 					$errormessage2 = 'page='.htmlentities((empty($_SERVER["REQUEST_URI"]) ? '' : $_SERVER["REQUEST_URI"]), ENT_COMPAT, 'UTF-8');
 					$errormessage2 .= ' paramkey='.htmlentities($key, ENT_COMPAT, 'UTF-8');

From 017eb28ad3d63958496da4fc1a2e2735689f3299 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 20:39:46 +0100
Subject: [PATCH 0225/1862] Work on custom report

---
 htdocs/core/customreports.php | 288 +++++++++++++++++-----------------
 1 file changed, 147 insertions(+), 141 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 203385e74bd..31f4fa0ef04 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -32,7 +32,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 	$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 
-	$mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'graph';
+	$mode = GETPOST('mode', 'alpha');
 	$objecttype = GETPOST('objecttype', 'aZ09arobase');
 	$tabfamily  = GETPOST('tabfamily', 'aZ09');
 
@@ -71,7 +71,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$object = null;
 } else {
 	$langs->load("main");
-	$search_measures = array();
+	// $search_measures, $search_xaxis or $search_yaxis may have been defined by the parent.
 
 	if (empty($user) || empty($user->id)) {
 		print 'Page is called as an include but $user and its permission loaded with getrights() are not defined. We stop here.';
@@ -83,7 +83,10 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	}
 }
 
-if (empty($search_measures)) {
+if (empty($mode)) {
+	$mode = 'graph';
+}
+if (!isset($search_measures)) {
 	$search_measures = array(0 => 't.count');
 }
 if (!empty($object)) {
@@ -541,158 +544,161 @@ $startyear = $endyear - 2;
 
 $param = '';
 
-print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" autocomplete="off">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="viewgraph">';
-print '<input type="hidden" name="tabfamily" value="'.$tabfamily.'">';
 
-$viewmode = '';
+if (!defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" autocomplete="off">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="viewgraph">';
+	print '<input type="hidden" name="tabfamily" value="'.$tabfamily.'">';
 
-$viewmode .= '<div class="divadvancedsearchfield">';
-$arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
-$viewmode .= '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
-$viewmode .= $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, '', 1, 0, 0, '', 'graphtype width100');
-$viewmode .= '</div>';
+	$viewmode = '';
 
-$num = 0;
-$massactionbutton = '';
-$nav = '';
-$newcardbutton = '';
-$limit = 0;
+	$viewmode .= '<div class="divadvancedsearchfield">';
+	$arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
+	$viewmode .= '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
+	$viewmode .= $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, '', 1, 0, 0, '', 'graphtype width100');
+	$viewmode .= '</div>';
 
-print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
+	$num = 0;
+	$massactionbutton = '';
+	$nav = '';
+	$newcardbutton = '';
+	$limit = 0;
+
+	print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
 
 
-foreach ($newarrayoftype as $tmpkey => $tmpval) {
-	$newarrayoftype[$tmpkey]['label'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']);
-}
+	foreach ($newarrayoftype as $tmpkey => $tmpval) {
+		$newarrayoftype[$tmpkey]['label'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']);
+	}
 
-print '<div class="liste_titre liste_titre_bydiv liste_titre_bydiv_inlineblock centpercent">';
+	print '<div class="liste_titre liste_titre_bydiv liste_titre_bydiv_inlineblock centpercent">';
 
-// Select object
-print '<div class="divadvancedsearchfield center floatnone">';
-print '<div class="inline-block"><span class="opacitymedium">'.$langs->trans("StatisticsOn").'</span></div> ';
-print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1, '', 0, 1);
-if (empty($conf->use_javascript_ajax)) {
-	print '<input type="submit" class="button buttongen button-save nomargintop" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
-} else {
-	print '<!-- js code to reload page with good object type -->
-	<script nonce="'.getNonce().'" type="text/javascript">
-        jQuery(document).ready(function() {
-        	jQuery("#objecttype").change(function() {
-        		console.log("Reload for "+jQuery("#objecttype").val());
-                location.href = "'.$_SERVER["PHP_SELF"].'?objecttype="+jQuery("#objecttype").val()+"'.($tabfamily ? '&tabfamily='.urlencode($tabfamily) : '').(GETPOST('show_search_component_params_hidden', 'int') ? '&show_search_component_params_hidden='.((int) GETPOST('show_search_component_params_hidden', 'int')) : '').'";
-        	});
-        });
-    </script>';
-}
-print '</div><div class="clearboth"></div>';
+	// Select object
+	print '<div class="divadvancedsearchfield center floatnone">';
+	print '<div class="inline-block"><span class="opacitymedium">'.$langs->trans("StatisticsOn").'</span></div> ';
+	print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1, '', 0, 1);
+	if (empty($conf->use_javascript_ajax)) {
+		print '<input type="submit" class="button buttongen button-save nomargintop" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
+	} else {
+		print '<!-- js code to reload page with good object type -->
+		<script nonce="'.getNonce().'" type="text/javascript">
+	        jQuery(document).ready(function() {
+	        	jQuery("#objecttype").change(function() {
+	        		console.log("Reload for "+jQuery("#objecttype").val());
+	                location.href = "'.$_SERVER["PHP_SELF"].'?objecttype="+jQuery("#objecttype").val()+"'.($tabfamily ? '&tabfamily='.urlencode($tabfamily) : '').(GETPOST('show_search_component_params_hidden', 'int') ? '&show_search_component_params_hidden='.((int) GETPOST('show_search_component_params_hidden', 'int')) : '').'";
+	        	});
+	        });
+	    </script>';
+	}
+	print '</div><div class="clearboth"></div>';
 
-// Filter (you can use param &show_search_component_params_hidden=1 for debug)
-if (!empty($object)) {
-	print '<div class="divadvancedsearchfield quatrevingtpercent">';
-	print $form->searchComponent(array($object->element => $object->fields), $search_component_params, array(), $search_component_params_hidden);
+	// Filter (you can use param &show_search_component_params_hidden=1 for debug)
+	if (!empty($object)) {
+		print '<div class="divadvancedsearchfield quatrevingtpercent">';
+		print $form->searchComponent(array($object->element => $object->fields), $search_component_params, array(), $search_component_params_hidden);
+		print '</div>';
+	}
+
+	// YAxis (add measures into array)
+	$count = 0;
+	//var_dump($arrayofmesures);
+	print '<div class="divadvancedsearchfield clearboth">';
+	print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span><span class="fas fa-caret-left caretleftaxis" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span></div>';
+	$simplearrayofmesures = array();
+	foreach ($arrayofmesures as $key => $val) {
+		$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
+	}
+	print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
 	print '</div>';
-}
 
-// YAxis (add measures into array)
-$count = 0;
-//var_dump($arrayofmesures);
-print '<div class="divadvancedsearchfield clearboth">';
-print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span><span class="fas fa-caret-left caretleftaxis" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span></div>';
-$simplearrayofmesures = array();
-foreach ($arrayofmesures as $key => $val) {
-	$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
-}
-print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
-print '</div>';
-
-// XAxis
-$count = 0;
-print '<div class="divadvancedsearchfield">';
-print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span><span class="fas fa-caret-down caretdownaxis" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span></div>';
-//var_dump($arrayofxaxis);
-print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400');	// Fill the array $arrayofxaxis with possible fields
-print '</div>';
-
-// Group by
-$count = 0;
-print '<div class="divadvancedsearchfield">';
-print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("GroupBy")).'"></span></div>';
-print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy"));	// Fill the array $arrayofgroupby with possible fields
-print '</div>';
-
-
-if ($mode == 'grid') {
-	// YAxis
+	// XAxis
+	$count = 0;
 	print '<div class="divadvancedsearchfield">';
-	foreach ($object->fields as $key => $val) {
-		if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
-			if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) {
-				continue;
-			}
-			if (preg_match('/^fk_/', $key)) {
-				continue;
-			}
-			if (in_array($val['type'], array('html', 'text'))) {
-				continue;
-			}
-			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$arrayofyaxis['t.'.$key.'-year'] = array(
-					'label' => $langs->trans($val['label']).' ('.$YYYY.')',
-					'position' => $val['position'],
-					'table' => $object->table_element
-				);
-				$arrayofyaxis['t.'.$key.'-month'] = array(
-					'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')',
-					'position' => $val['position'],
-					'table' => $object->table_element
-				);
-				$arrayofyaxis['t.'.$key.'-day'] = array(
-					'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')',
-					'position' => $val['position'],
-					'table' => $object->table_element
-				);
-			} else {
-				$arrayofyaxis['t.'.$key] = array(
-					'label' => $val['label'],
-					'position' => (int) $val['position'],
-					'table' => $object->table_element
-				);
-			}
-		}
-	}
-	// Add measure from extrafields
-	if ($object->isextrafieldmanaged) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
-				$arrayofyaxis['te.'.$key] = array(
-					'label' => $extrafields->attributes[$object->table_element]['label'][$key],
-					'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key],
-					'table' => $object->table_element
-				);
-			}
-		}
-	}
-	$arrayofyaxis = dol_sort_array($arrayofyaxis, 'position');
-	$arrayofyaxislabel = array();
-	foreach ($arrayofyaxis as $key => $val) {
-		$arrayofyaxislabel[$key] = $val['label'];
-	}
-	print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-vertical paddingright" title="'.$langs->trans("YAxis").'"></span>'.$langs->trans("YAxis").'</div> ';
-	print $form->multiselectarray('search_yaxis', $arrayofyaxislabel, $search_yaxis, 0, 0, 'minwidth100', 1);
+	print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span><span class="fas fa-caret-down caretdownaxis" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span></div>';
+	//var_dump($arrayofxaxis);
+	print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400');	// Fill the array $arrayofxaxis with possible fields
 	print '</div>';
-}
 
-if ($mode == 'graph') {
-	//
-}
+	// Group by
+	$count = 0;
+	print '<div class="divadvancedsearchfield">';
+	print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("GroupBy")).'"></span></div>';
+	print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy"));	// Fill the array $arrayofgroupby with possible fields
+	print '</div>';
 
-print '<div class="divadvancedsearchfield">';
-print '<input type="submit" class="button buttongen button-save nomargintop" value="'.$langs->trans("Refresh").'">';
-print '</div>';
-print '</div>';
-print '</form>';
+
+	if ($mode == 'grid') {
+		// YAxis
+		print '<div class="divadvancedsearchfield">';
+		foreach ($object->fields as $key => $val) {
+			if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
+				if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) {
+					continue;
+				}
+				if (preg_match('/^fk_/', $key)) {
+					continue;
+				}
+				if (in_array($val['type'], array('html', 'text'))) {
+					continue;
+				}
+				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+					$arrayofyaxis['t.'.$key.'-year'] = array(
+						'label' => $langs->trans($val['label']).' ('.$YYYY.')',
+						'position' => $val['position'],
+						'table' => $object->table_element
+					);
+					$arrayofyaxis['t.'.$key.'-month'] = array(
+						'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')',
+						'position' => $val['position'],
+						'table' => $object->table_element
+					);
+					$arrayofyaxis['t.'.$key.'-day'] = array(
+						'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')',
+						'position' => $val['position'],
+						'table' => $object->table_element
+					);
+				} else {
+					$arrayofyaxis['t.'.$key] = array(
+						'label' => $val['label'],
+						'position' => (int) $val['position'],
+						'table' => $object->table_element
+					);
+				}
+			}
+		}
+		// Add measure from extrafields
+		if ($object->isextrafieldmanaged) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
+					$arrayofyaxis['te.'.$key] = array(
+						'label' => $extrafields->attributes[$object->table_element]['label'][$key],
+						'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key],
+						'table' => $object->table_element
+					);
+				}
+			}
+		}
+		$arrayofyaxis = dol_sort_array($arrayofyaxis, 'position');
+		$arrayofyaxislabel = array();
+		foreach ($arrayofyaxis as $key => $val) {
+			$arrayofyaxislabel[$key] = $val['label'];
+		}
+		print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-vertical paddingright" title="'.$langs->trans("YAxis").'"></span>'.$langs->trans("YAxis").'</div> ';
+		print $form->multiselectarray('search_yaxis', $arrayofyaxislabel, $search_yaxis, 0, 0, 'minwidth100', 1);
+		print '</div>';
+	}
+
+	if ($mode == 'graph') {
+		//
+	}
+
+	print '<div class="divadvancedsearchfield">';
+	print '<input type="submit" class="button buttongen button-save nomargintop" value="'.$langs->trans("Refresh").'">';
+	print '</div>';
+	print '</div>';
+	print '</form>';
+}
 
 // Generate the SQL request
 $sql = '';
@@ -1117,7 +1123,7 @@ if ($mode == 'graph') {
 	}
 }
 
-if ($sql) {
+if ($sql && !defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
 	// Show admin info
 	print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, 1, '', 'TechnicalInformation');
 }

From d4c1896552ade9e4071ca7636535120b496e31fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Feb 2024 21:47:12 +0100
Subject: [PATCH 0226/1862] Fix edit website css content

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9453d1b403c..0cf1abe101e 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -25,7 +25,7 @@
 /** @phan-file-suppress PhanPluginSuspiciousParamPosition */
 
 // We allow POST of rich content with js and style, but only for this php file and if into some given POST variable
-define('NOSCANPOSTFORINJECTION', array('PAGE_CONTENT', 'WEBSITE_JS_INLINE', 'WEBSITE_HTML_HEADER', 'htmlheader'));
+define('NOSCANPOSTFORINJECTION', array('PAGE_CONTENT', 'WEBSITE_CSS_INLINE', 'WEBSITE_JS_INLINE', 'WEBSITE_HTML_HEADER', 'htmlheader'));
 
 define('USEDOLIBARREDITOR', 1);
 define('FORCE_CKEDITOR', 1); // We need CKEditor, even if module is off.

From e969ddc386cf3e3900d4207a6f3338e937bc3b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 22:34:17 +0100
Subject: [PATCH 0227/1862] fix phpstan (#28436)

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

diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 5b00a1eabd1..9f3ce7d3468 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -405,7 +405,7 @@ function barcode_encode_genbarcode($code, $encoding)
  * @param	string	$mode   	png,gif,jpg (default='png')
  * @param	int		$total_y	the total height of the image ( default: scale * 60 )
  * @param	array	$space		default:  $space[top]   = 2 * $scale; $space[bottom]= 2 * $scale;  $space[left]  = 2 * $scale;  $space[right] = 2 * $scale;
- * @return	string|null
+ * @return	string|void
  */
 function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '')
 {
@@ -413,9 +413,6 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 	global $font_loc, $filebarcode;
 
 	//print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";
-	//var_dump($text);
-	//var_dump($bars);
-	//var_dump($font_loc);
 
 	/* set defaults */
 	if ($scale < 1) {
@@ -504,7 +501,7 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 		header("Content-Type: image/gif; name=\"barcode.gif\"");
 		imagegif($im);
 	} elseif (!empty($filebarcode)) {
-		// To write into  a file onto disk
+		// To write into a file onto disk
 		imagepng($im, $filebarcode);
 	} else {
 		header("Content-Type: image/png; name=\"barcode.png\"");

From 1692dad347957fbeeed677a1acd9e7114fe0ef5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 22:52:09 +0100
Subject: [PATCH 0228/1862] fix #28431 (#28439)

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 26f1c8c2f89..a9878be3a28 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018       Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2019       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2020       Open-Dsi      			<support@open-dsi.fr>
  *
@@ -1629,6 +1629,8 @@ while ($i < $imaxinloop) {
 				$option_link = 'customer';
 				if ($objsoc->client == 0 && $objsoc->fournisseur > 0) {
 					$option_link = 'supplier';
+				} elseif ($objsoc->client == 0 && $objsoc->fournisseur == 0) {
+					$option_link = '';
 				}
 				if ($contextpage == 'poslist') {
 					print $objsoc->name;

From 8262fb96057c02017ca738d8ede3a7c788f1a6e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 22:53:21 +0100
Subject: [PATCH 0229/1862] fix phpstan (#28440)

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

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index c54d8238da4..011c176e2f2 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -48,7 +48,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	public $table_element = 'eventorganization_conferenceorboothattendee';
 
 	/**
-	 * @var int  Does this object support multicompany module ?
+	 * @var int|string  Does this object support multicompany module ?
 	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 	 */
 	public $ismultientitymanaged = 'fk_project@projet';

From f0209f1b66e70dacf9b42a26ec74a71024c8ddb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 22:54:32 +0100
Subject: [PATCH 0230/1862] fix phpstan (#28441)

---
 .../class/conferenceorboothattendee.class.php              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 011c176e2f2..b137fd538ad 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -258,7 +258,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		if ($result > 0) {
 			$result = $this->fetch($result);
 			if ($result > 0) {
-				$this->ref = $this->id;
+				$this->ref = (string) $this->id;
 				$result = $this->update($user);
 			}
 		}
@@ -333,10 +333,9 @@ class ConferenceOrBoothAttendee extends CommonObject
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		} else {
-			$object->ref = $object->id;
+			$object->ref = (string) $object->id;
 			$result = $object->update($user);
 		}
 

From 52d1fe8c6744b0e3a88b8522812a6241d1d42bc6 Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:55:42 +0200
Subject: [PATCH 0231/1862] fix translation for non latin languages (#28437)

* fix translation for non latin languages

* fix translation for non latin languages
---
 htdocs/compta/resultat/index.php                | 2 +-
 htdocs/core/class/html.formaccounting.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index c55dec68b4a..871b096e4bd 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -178,7 +178,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountOnInOutBookkeepingRecord");
-	$description .= ' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->trans("Chartofaccounts")).')';
+	$description .= ' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->transnoentitiesnoconv("Chartofaccounts")).')';
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 90b17804022..b8b6cabe6c1 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -302,7 +302,7 @@ class FormAccounting extends Form
 				$out .= '</select>';
 				//if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 			} else {
-				$out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code, $langs->trans("Accounting"), $langs->trans("Setup"), $langs->trans("AccountingCategories"));
+				$out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code, $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("AccountingCategories"));
 			}
 		} else {
 			dol_print_error($this->db);

From bb12b0c8b957e0e2e5e11061f3d731a5c423d8c6 Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Mon, 26 Feb 2024 22:59:27 +0100
Subject: [PATCH 0232/1862] fix: display root account according root label in
 balance bookkeeping (#28435)

---
 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 01d89f1168d..af317e7a361 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -427,7 +427,7 @@ if ($action != 'export_csv') {
 
 				// Show first line of a break
 				print '<tr class="trforbreak">';
-				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$root_account_number.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
 				$displayed_account = $root_account_number;

From 96a727d1f00c39f70c14c963dec33f8ab639604a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:00:28 +0100
Subject: [PATCH 0233/1862] fix phpstan (#28434)

Default value of the parameter #5 $id (string) of function print_fiche_titre() is incompatible with type int.
---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 391dbe2e0b4..5246e9554f8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2014		Cédric GROSS				<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015	Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
- * Copyright (C) 2018-2024  Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2019-2023  Thibault Foucart            <support@ptibogxiv.net>
  * Copyright (C) 2020       Open-Dsi         			<support@open-dsi.fr>
  * Copyright (C) 2021       Gauthier VERDOL         	<gauthier.verdol@atm-consulting.fr>
@@ -5841,7 +5841,7 @@ function print_titre($title)
  *	@param	string	$mesg				Added message to show on right
  *	@param	string	$picto				Icon to use before title (should be a 32x32 transparent png file)
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
- * 	@param	int		$id					To force an id on html objects
+ * 	@param	string	$id					To force an id on html objects by example id="name" where name is id
  * 	@return	void
  *  @deprecated Use print load_fiche_titre instead
  */

From f0dc1358f96b0591d4ab88328e09c0a555b244e8 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+BB2A-Anthony@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:01:08 +0100
Subject: [PATCH 0234/1862] Order list det change to eprimental (#28438)

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
---
 htdocs/core/menus/init_menu_auguria.sql | 2 +-
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 5b975bca59e..b17ec92127d 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -183,7 +183,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("commande") && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=4', 'StatusOrderProcessed', 1, 'orders', '$user->hasRight("commande", "lire")', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("commande") && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->hasRight("commande", "lire")', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("commande")', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?mainmenu=commercial&amp;leftmenu=orders', 'Statistics', 1, 'orders', '(!empty($conf->global->MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS)?$user->hasRight("commande", "commande", "export"):$user->hasRight("commande", "lire"))', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("commande") && $conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)', __HANDLER__, 'left', 1210__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list_det.php?mainmenu=commercial&amp;leftmenu=orders', 'ListOrderLigne', 1, 'orders', '$user->hasRight("commande", "lire")', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("commande") && $conf->global->MAIN_FEATURES_LEVEL >= 1 && empty($user->socid)', __HANDLER__, 'left', 1210__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list_det.php?mainmenu=commercial&amp;leftmenu=orders', 'ListOrderLigne', 1, 'orders', '$user->hasRight("commande", "lire")', '', 2, 1, __ENTITY__);
 
 -- Commercial - Supplier's proposals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("supplier_proposal")', __HANDLER__, 'left', 1650__+MAX_llx_menu__, 'commercial', 'propals_supplier', 3__+MAX_llx_menu__, '/supplier_proposal/index.php?leftmenu=propals_supplier', 'SupplierProposalsShort', 0, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 4, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index ef2581aed68..e489f415fe0 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1378,7 +1378,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 				//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->hasRight('commande',  'lire'));
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->hasRight('commande', 'lire'));
 			}
-			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 && empty($user->socid)) {
+			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 && empty($user->socid)) {
 				$newmenu->add("/commande/list_det.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande', 'lire'));
 			}
 			if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {

From 84b01dc1f8d4bb2bbfffe22a03068884c2c56fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:02:53 +0100
Subject: [PATCH 0235/1862] fix phpstan (#28433)

Default value of the parameter #2 $mesgarray (string) of function get_htmloutput_mesg() is incompatible with type array<string>.
---
 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 5246e9554f8..045798228c0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9348,7 +9348,7 @@ function dol_htmloutput_events($disabledoutputofmessages = 0)
  *  @see    dol_htmloutput_errors()
  *  @see    setEventMessages()
  */
-function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $keepembedded = 0)
+function get_htmloutput_mesg($mesgstring = '', $mesgarray = [], $style = 'ok', $keepembedded = 0)
 {
 	global $conf, $langs;
 

From ac328d6acb93a25118a45b77aaab1e1067f536cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:03:42 +0100
Subject: [PATCH 0236/1862] fix phpstan (#28432)

Default value of the parameter #6 $noreplace (int) of function GETPOST() is incompatible with type string.
---
 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 045798228c0..42d1f1df716 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -656,7 +656,7 @@ function GETPOSTISARRAY($paramname, $method = 0)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)
  *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'
- *  @param	string	$noreplace	 Force disable of replacement of __xxx__ strings.
+ *  @param	int 	$noreplace	 Force disable of replacement of __xxx__ strings.
  *  @return string|array         Value found (string or array), or '' if check fails
  */
 function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null, $options = null, $noreplace = 0)

From 1d1e6ac562d8d77910273209a7676c164e297d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:04:07 +0100
Subject: [PATCH 0237/1862] fix typo (#28430)

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d7f94aa0908..5ab338489de 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -820,7 +820,7 @@ $moreforfilter = '';
 if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedlength"').$formother->select_categories(Categorie::TYPE_MEMBER, $search_categ, 'search_categ', 1, $langs->trans("MembersCategoriesShort"));
+	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_MEMBER, $search_categ, 'search_categ', 1, $langs->trans("MembersCategoriesShort"));
 	$moreforfilter .= '</div>';
 }
 $parameters = array();

From 1c3a035ae5ae8bc71777067bfc9fc51c859d0cb8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:10:16 +0100
Subject: [PATCH 0238/1862] Qual: New Phan plugin for testing that argument
 matches regex (#28424)

* Qual: New Phan plugin for testing that argument matches regex

# Qual: New Phan plugin for testing that argument matches regex

This Plugin - currently applied to GETPOST - allows verifying that a selected
argument of a function matches a regular expression.

* Qual: Add isModEnabled verification to phan

# Qual: Add isModEnabled verification in phan

Using ParamMatchRegexPlugin, add isModEnabled parameter verification.

* Qual: Verify sanitizeVal check value

# Qual: Verify sanitizeVal check value

Use ParamMatchPlugin to check sanitizeVal check value

* Qual: Extend ParamMatchRegexPlugin with class_method

# Qual: Extend ParamMatchRegexPlugin with class_method

Allow matching class methods for argument verification.

* Update config.php

* Qual: New Phan plugin for testing that argument matches regex

# Qual: New Phan plugin for testing that argument matches regex

This Plugin - currently applied to GETPOST - allows verifying that a selected
argument of a function matches a regular expression.

* Qual: Add isModEnabled verification to phan

# Qual: Add isModEnabled verification in phan

Using ParamMatchRegexPlugin, add isModEnabled parameter verification.

* Qual: Verify sanitizeVal check value

# Qual: Verify sanitizeVal check value

Use ParamMatchPlugin to check sanitizeVal check value

* Qual: Extend ParamMatchRegexPlugin with class_method

# Qual: Extend ParamMatchRegexPlugin with class_method

Allow matching class methods for argument verification.

* Report scalar values (see null, etc)

* Qual: Ignore false Phan Notification

* Qual: Ignore false Phan Notification

* Qual: Fix Phan needs specific message keys for coloring.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 dev/tools/phan/config.php                     | 188 +++++++++++++
 dev/tools/phan/config_extended.php            | 187 +++++++++++++
 dev/tools/phan/config_fixer.php               | 203 ++++++++++++++
 .../phan/plugins/ParamMatchRegexPlugin.php    | 248 ++++++++++++++++++
 htdocs/core/lib/functions.lib.php             |   1 +
 htdocs/modulebuilder/index.php                |   1 +
 6 files changed, 828 insertions(+)
 create mode 100644 dev/tools/phan/config_fixer.php
 create mode 100644 dev/tools/phan/plugins/ParamMatchRegexPlugin.php

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 1dc71344d2d..b5ac3bfafd8 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -4,6 +4,187 @@
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
 define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
 define('PHAN_DIR', __DIR__);
+$sanitizeRegex
+	= '/^(array:)?(?:'.implode(
+		'|',
+		array(
+			// Documented:
+			'none',
+			'array',
+			'int',
+			'intcomma',
+			'alpha',
+			'alphawithlgt',
+			'alphanohtml',
+			'MS',
+			'aZ',
+			'aZ09',
+			'aZ09arobase',
+			'aZ09comma',
+			'san_alpha',
+			'restricthtml',
+			'nohtml',
+			'custom',
+			// Not documented:
+			'email',
+			'restricthtmlallowclass',
+			'restricthtmlallowunvalid',
+			'restricthtmlnolink',
+			//'ascii',
+			//'categ_id',
+			//'chaine',
+
+			//'html',
+			//'boolean',
+			//'double',
+			//'float',
+			//'string',
+		)
+	).')*$/';
+
+/**
+ * Map deprecated module names to new module names
+ */
+$DEPRECATED_MODULE_MAPPING = array(
+	'actioncomm' => 'agenda',
+	'adherent' => 'member',
+	'adherent_type' => 'member_type',
+	'banque' => 'bank',
+	'categorie' => 'category',
+	'commande' => 'order',
+	'contrat' => 'contract',
+	'entrepot' => 'stock',
+	'expedition' => 'delivery_note',
+	'facture' => 'invoice',
+	'ficheinter' => 'intervention',
+	'product_fournisseur_price' => 'productsupplierprice',
+	'product_price' => 'productprice',
+	'projet'  => 'project',
+	'propale' => 'propal',
+	'socpeople' => 'contact',
+);
+
+/**
+ * Map module names to the 'class' name (the class is: mod<CLASSNAME>)
+ * Value is null when the module is not internal to the default
+ * Dolibarr setup.
+ */
+$VALID_MODULE_MAPPING = array(
+	'accounting' => 'Accounting',
+	'agenda' => 'Agenda',
+	'ai' => 'Ai',
+	'anothermodule' => null,
+	'api' => 'Api',
+	'asset' => 'Asset',
+	'bank' => 'Banque',
+	'barcode' => 'Barcode',
+	'blockedlog' => 'BlockedLog',
+	'bom' => 'Bom',
+	'bookcal' => 'BookCal',
+	'bookmark' => 'Bookmark',
+	'cashdesk' => null,  // TODO: fill in proper class
+	'category' => 'Categorie',
+	'clicktodial' => 'ClickToDial',
+	'collab' => 'Collab',
+	'comptabilite' => 'Comptabilite',
+	'contact' => null,  // TODO: fill in proper class
+	'contract' => 'Contrat',
+	'cron' => 'Cron',
+	'datapolicy' => 'DataPolicy',
+	'dav' => 'Dav',
+	'debugbar' => 'DebugBar',
+	'delivery_note' => 'Expedition',
+	'deplacement' => 'Deplacement',
+	"documentgeneration" => 'DocumentGeneration',
+	'don' => 'Don',
+	'dynamicprices' => 'DynamicPrices',
+	'ecm' => 'ECM',
+	'ecotax' => null,  // TODO: External module ?
+	'emailcollector' => 'EmailCollector',
+	'eventorganization' => 'EventOrganization',
+	'expensereport' => 'ExpenseReport',
+	'export' => 'Export',
+	'externalrss' => 'ExternalRss',
+	'externalsite' => 'ExternalSite',
+	'fckeditor' => 'Fckeditor',
+	'fournisseur' => 'Fournisseur',
+	'ftp' => 'FTP',
+	'geoipmaxmind' => 'GeoIPMaxmind',
+	'google' => null,  // External ?
+	'gravatar' => 'Gravatar',
+	'holiday' => 'Holiday',
+	'hrm' => 'HRM',
+	'import' => 'Import',
+	'incoterm' => 'Incoterm',
+	'intervention' => 'Ficheinter',
+	'intracommreport' => 'Intracommreport',
+	'invoice' => 'Facture',
+	'knowledgemanagement' => 'KnowledgeManagement',
+	'label' => 'Label',
+	'ldap' => 'Ldap',
+	'loan' => 'Loan',
+	'mailing' => 'Mailing',
+	'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+	'mailmanspip' => 'MailmanSpip',
+	'margin' => 'Margin',
+	'member' => 'Adherent',
+	'memcached' => null, // TODO: External module?
+	'modulebuilder' => 'ModuleBuilder',
+	'mrp' => 'Mrp',
+	'multicompany' => null, // Not provided by default, no module tests
+	'multicurrency' => 'MultiCurrency',
+	'mymodule' => null, // modMyModule - Name used in module builder (avoid false positives)
+	'notification' => 'Notification',
+	'numberwords' => null, // Not provided by default, no module tests
+	'oauth' => 'Oauth',
+	'openstreetmap' => null,  // External module?
+	'opensurvey' => 'OpenSurvey',
+	'order' => 'Commande',
+	'partnership' => 'Partnership',
+	'paybox' => 'Paybox',
+	'paymentbybanktransfer' => 'PaymentByBankTransfer',
+	'paypal' => 'Paypal',
+	'paypalplus' => null,
+	'prelevement' => 'Prelevement',
+	'printing' => 'Printing',
+	'product' => 'Product',
+	'productbatch' => 'ProductBatch',
+	'productprice' => null,
+	'productsupplierprice' => null,
+	'project' => 'Projet',
+	'propal' => 'Propale',
+	'receiptprinter' => 'ReceiptPrinter',
+	'reception' => 'Reception',
+	'recruitment' => 'Recruitment',
+	'resource' => 'Resource',
+	'salaries' => 'Salaries',
+	'service' => 'Service',
+	'socialnetworks' => 'SocialNetworks',
+	'societe' => 'Societe',
+	'stock' => 'Stock',
+	'stocktransfer' => 'StockTransfer',
+	'stripe' => 'Stripe',
+	'supplier_invoice' => null,  // Special case, uses invoice
+	'supplier_order' => null,  // Special case, uses invoice
+	'supplier_proposal' => 'SupplierProposal',
+	'syslog' => 'Syslog',
+	'takepos' => 'TakePos',
+	'tax' => 'Tax',
+	'ticket' => 'Ticket',
+	'user' => 'User',
+	'variants' => 'Variants',
+	'webhook' => 'Webhook',
+	'webportal' => 'WebPortal',
+	'webservices' => 'WebServices',
+	'webservicesclient' => 'WebServicesClient',
+	'website' => 'Website',
+	'workflow' => 'Workflow',
+	'workstation' => 'Workstation',
+	'zapier' => 'Zapier',
+);
+
+$moduleNameRegex = '/^(?:'.implode('|', array_merge(array_keys($DEPRECATED_MODULE_MAPPING), array_keys($VALID_MODULE_MAPPING), array('\$modulename'))).')$/';
+
 /**
  * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
@@ -71,6 +252,7 @@ return [
 		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
 		// Included as stub (did not seem properly analysed by phan without it)
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		// .'|htdocs/[^h].*/.*'  // For testing @phpstan-ignore-line
 		.')@',  // @phpstan-ignore-line
 
 	// A list of plugin files to execute.
@@ -82,8 +264,14 @@ return [
 	//
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
+	'ParamMatchRegexPlugin' => [
+		'/^GETPOST$/' => [1, $sanitizeRegex],
+		'/^isModEnabled$/' => [0, $moduleNameRegex],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex],
+	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
+		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
 		// checks if a function, closure or method unconditionally returns.
 		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
 		//'DeprecateAliasPlugin',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 9a721355daf..3b46fa7a49d 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -4,6 +4,187 @@
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
 define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
 define('PHAN_DIR', __DIR__);
+$sanitizeRegex
+	= '/^(array:)?(?:'.implode(
+		'|',
+		array(
+			// Documented:
+			'none',
+			'array',
+			'int',
+			'intcomma',
+			'alpha',
+			'alphawithlgt',
+			'alphanohtml',
+			'MS',
+			'aZ',
+			'aZ09',
+			'aZ09arobase',
+			'aZ09comma',
+			'san_alpha',
+			'restricthtml',
+			'nohtml',
+			'custom',
+			// Not documented:
+			'email',
+			'restricthtmlallowclass',
+			'restricthtmlallowunvalid',
+			'restricthtmlnolink',
+			//'ascii',
+			//'categ_id',
+			//'chaine',
+
+			//'html',
+			//'boolean',
+			//'double',
+			//'float',
+			//'string',
+		)
+	).')*$/';
+
+/**
+ * Map deprecated module names to new module names
+ */
+$DEPRECATED_MODULE_MAPPING = array(
+	'actioncomm' => 'agenda',
+	'adherent' => 'member',
+	'adherent_type' => 'member_type',
+	'banque' => 'bank',
+	'categorie' => 'category',
+	'commande' => 'order',
+	'contrat' => 'contract',
+	'entrepot' => 'stock',
+	'expedition' => 'delivery_note',
+	'facture' => 'invoice',
+	'ficheinter' => 'intervention',
+	'product_fournisseur_price' => 'productsupplierprice',
+	'product_price' => 'productprice',
+	'projet'  => 'project',
+	'propale' => 'propal',
+	'socpeople' => 'contact',
+);
+
+/**
+ * Map module names to the 'class' name (the class is: mod<CLASSNAME>)
+ * Value is null when the module is not internal to the default
+ * Dolibarr setup.
+ */
+$VALID_MODULE_MAPPING = array(
+	'accounting' => 'Accounting',
+	'agenda' => 'Agenda',
+	'ai' => 'Ai',
+	'anothermodule' => null,
+	'api' => 'Api',
+	'asset' => 'Asset',
+	'bank' => 'Banque',
+	'barcode' => 'Barcode',
+	'blockedlog' => 'BlockedLog',
+	'bom' => 'Bom',
+	'bookcal' => 'BookCal',
+	'bookmark' => 'Bookmark',
+	'cashdesk' => null,  // TODO: fill in proper class
+	'category' => 'Categorie',
+	'clicktodial' => 'ClickToDial',
+	'collab' => 'Collab',
+	'comptabilite' => 'Comptabilite',
+	'contact' => null,  // TODO: fill in proper class
+	'contract' => 'Contrat',
+	'cron' => 'Cron',
+	'datapolicy' => 'DataPolicy',
+	'dav' => 'Dav',
+	'debugbar' => 'DebugBar',
+	'delivery_note' => 'Expedition',
+	'deplacement' => 'Deplacement',
+	"documentgeneration" => 'DocumentGeneration',
+	'don' => 'Don',
+	'dynamicprices' => 'DynamicPrices',
+	'ecm' => 'ECM',
+	'ecotax' => null,  // TODO: External module ?
+	'emailcollector' => 'EmailCollector',
+	'eventorganization' => 'EventOrganization',
+	'expensereport' => 'ExpenseReport',
+	'export' => 'Export',
+	'externalrss' => 'ExternalRss',
+	'externalsite' => 'ExternalSite',
+	'fckeditor' => 'Fckeditor',
+	'fournisseur' => 'Fournisseur',
+	'ftp' => 'FTP',
+	'geoipmaxmind' => 'GeoIPMaxmind',
+	'google' => null,  // External ?
+	'gravatar' => 'Gravatar',
+	'holiday' => 'Holiday',
+	'hrm' => 'HRM',
+	'import' => 'Import',
+	'incoterm' => 'Incoterm',
+	'intervention' => 'Ficheinter',
+	'intracommreport' => 'Intracommreport',
+	'invoice' => 'Facture',
+	'knowledgemanagement' => 'KnowledgeManagement',
+	'label' => 'Label',
+	'ldap' => 'Ldap',
+	'loan' => 'Loan',
+	'mailing' => 'Mailing',
+	'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+	'mailmanspip' => 'MailmanSpip',
+	'margin' => 'Margin',
+	'member' => 'Adherent',
+	'memcached' => null, // TODO: External module?
+	'modulebuilder' => 'ModuleBuilder',
+	'mrp' => 'Mrp',
+	'multicompany' => null, // Not provided by default, no module tests
+	'multicurrency' => 'MultiCurrency',
+	'mymodule' => null, // modMyModule - Name used in module builder (avoid false positives)
+	'notification' => 'Notification',
+	'numberwords' => null, // Not provided by default, no module tests
+	'oauth' => 'Oauth',
+	'openstreetmap' => null,  // External module?
+	'opensurvey' => 'OpenSurvey',
+	'order' => 'Commande',
+	'partnership' => 'Partnership',
+	'paybox' => 'Paybox',
+	'paymentbybanktransfer' => 'PaymentByBankTransfer',
+	'paypal' => 'Paypal',
+	'paypalplus' => null,
+	'prelevement' => 'Prelevement',
+	'printing' => 'Printing',
+	'product' => 'Product',
+	'productbatch' => 'ProductBatch',
+	'productprice' => null,
+	'productsupplierprice' => null,
+	'project' => 'Projet',
+	'propal' => 'Propale',
+	'receiptprinter' => 'ReceiptPrinter',
+	'reception' => 'Reception',
+	'recruitment' => 'Recruitment',
+	'resource' => 'Resource',
+	'salaries' => 'Salaries',
+	'service' => 'Service',
+	'socialnetworks' => 'SocialNetworks',
+	'societe' => 'Societe',
+	'stock' => 'Stock',
+	'stocktransfer' => 'StockTransfer',
+	'stripe' => 'Stripe',
+	'supplier_invoice' => null,  // Special case, uses invoice
+	'supplier_order' => null,  // Special case, uses invoice
+	'supplier_proposal' => 'SupplierProposal',
+	'syslog' => 'Syslog',
+	'takepos' => 'TakePos',
+	'tax' => 'Tax',
+	'ticket' => 'Ticket',
+	'user' => 'User',
+	'variants' => 'Variants',
+	'webhook' => 'Webhook',
+	'webportal' => 'WebPortal',
+	'webservices' => 'WebServices',
+	'webservicesclient' => 'WebServicesClient',
+	'website' => 'Website',
+	'workflow' => 'Workflow',
+	'workstation' => 'Workstation',
+	'zapier' => 'Zapier',
+);
+
+$moduleNameRegex = '/^(?:'.implode('|', array_merge(array_keys($DEPRECATED_MODULE_MAPPING), array_keys($VALID_MODULE_MAPPING))).')$/';
+
 /**
  * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
@@ -82,8 +263,14 @@ return [
 	//
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
+	'ParamMatchRegexPlugin' => [
+		'/^GETPOST$/' => [1, $sanitizeRegex],
+		'/^isModEnabled$/' => [0, $moduleNameRegex],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex],
+	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
+		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
 		'DeprecateAliasPlugin',
 		//'EmptyMethodAndFunctionPlugin',
 		'InvalidVariableIssetPlugin',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
new file mode 100644
index 00000000000..d5607844f26
--- /dev/null
+++ b/dev/tools/phan/config_fixer.php
@@ -0,0 +1,203 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
+define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
+define('PHAN_DIR', __DIR__);
+/**
+ * This configuration will be read and overlaid on top of the
+ * default configuration. Command line arguments will be applied
+ * after this file is read.
+ */
+return [
+	//	'processes' => 6,
+	'backward_compatibility_checks' => false,
+	'simplify_ast' => true,
+	'analyzed_file_extensions' => ['php','inc'],
+	'globals_type_map' => [
+		'conf' => '\Conf',
+		'db' => '\DoliDB',
+		'extrafields' => '\ExtraFields',
+		'hookmanager' => '\HookManager',
+		'langs' => '\Translate',
+		'mysoc' => '\Societe',
+		'nblines' => '\int',
+		'user' => '\User',
+	],
+
+	// Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`, `null`.
+	// If this is set to `null`,
+	// then Phan assumes the PHP version which is closest to the minor version
+	// of the php executable used to execute Phan.
+	//"target_php_version" => null,
+	"target_php_version" => '8.2',
+	//"target_php_version" => '7.3',
+	//"target_php_version" => '5.6',
+
+	// A list of directories that should be parsed for class and
+	// method information. After excluding the directories
+	// defined in exclude_analysis_directory_list, the remaining
+	// files will be statically analyzed for errors.
+	//
+	// Thus, both first-party and third-party code being used by
+	// your application should be included in this list.
+	'directory_list' => [
+		'htdocs',
+		PHAN_DIR . '/stubs/',
+	],
+
+	// A directory list that defines files that will be excluded
+	// from static analysis, but whose class and method
+	// information should be included.
+	//
+	// Generally, you'll want to include the directories for
+	// third-party code (such as "vendor/") in this list.
+	//
+	// n.b.: If you'd like to parse but not analyze 3rd
+	//	party code, directories containing that code
+	//	should be added to the `directory_list` as
+	//	to `exclude_analysis_directory_list`.
+	"exclude_analysis_directory_list" => [
+		'htdocs/includes/',
+		'htdocs/core/class/lessc.class.php', // External library
+		PHAN_DIR . '/stubs/',
+	],
+	//'exclude_file_regex' => '@^vendor/.*/(tests?|Tests?)/@',
+	'exclude_file_regex' => '@^('  // @phpstan-ignore-line
+		.'dummy'  // @phpstan-ignore-line
+		.'|htdocs/.*/canvas/.*/tpl/.*.tpl.php'  // @phpstan-ignore-line
+		.'|htdocs/modulebuilder/template/.*'  // @phpstan-ignore-line
+		// Included as stub (old version + incompatible typing hints)
+		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
+		// Included as stub (did not seem properly analysed by phan without it)
+		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		.')@',  // @phpstan-ignore-line
+
+	// A list of plugin files to execute.
+	// Plugins which are bundled with Phan can be added here by providing their name
+	// (e.g. 'AlwaysReturnPlugin')
+	//
+	// Documentation about available bundled plugins can be found
+	// at https://github.com/phan/phan/tree/master/.phan/plugins
+	//
+	// Alternately, you can pass in the full path to a PHP file
+	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
+	'plugins' => [
+		//'DeprecateAliasPlugin',
+		// __DIR__.'/plugins/NoVarDumpPlugin.php',
+		//'PHPDocToRealTypesPlugin',
+
+	/*
+		//'EmptyMethodAndFunctionPlugin',
+		'InvalidVariableIssetPlugin',
+		//'MoreSpecificElementTypePlugin',
+		'NoAssertPlugin',
+		'NotFullyQualifiedUsagePlugin',
+		'PHPDocRedundantPlugin',
+		'PHPUnitNotDeadCodePlugin',
+		//'PossiblyStaticMethodPlugin',
+		'PreferNamespaceUsePlugin',
+		'PrintfCheckerPlugin',
+		'RedundantAssignmentPlugin',
+
+		'ConstantVariablePlugin', // Warns about values that are actually constant
+		//'HasPHPDocPlugin', // Requires PHPDoc
+		'InlineHTMLPlugin', // html in PHP file, or at end of file
+		'NonBoolBranchPlugin', // Requires test on bool, nont on ints
+		'NonBoolInLogicalArithPlugin',
+		'NumericalComparisonPlugin',
+		'PHPDocToRealTypesPlugin',
+		'PHPDocInWrongCommentPlugin', // Missing /** (/* was used)
+		//'ShortArrayPlugin', // Checks that [] is used
+		//'StrictLiteralComparisonPlugin',
+		'UnknownClassElementAccessPlugin',
+		'UnknownElementTypePlugin',
+		'WhitespacePlugin',
+		//'RemoveDebugStatementPlugin', // Reports echo, print, ...
+		//'StrictComparisonPlugin', // Expects ===
+		'SuspiciousParamOrderPlugin',
+		'UnsafeCodePlugin',
+		//'UnusedSuppressionPlugin',
+
+		'AlwaysReturnPlugin',
+		//'DollarDollarPlugin',
+		'DuplicateArrayKeyPlugin',
+		'DuplicateExpressionPlugin',
+		'PregRegexCheckerPlugin',
+		'PrintfCheckerPlugin',
+		'SleepCheckerPlugin',
+		// Checks for syntactically unreachable statements in
+		// the global scope or function bodies.
+		'UnreachableCodePlugin',
+		'UseReturnValuePlugin',
+		'EmptyStatementListPlugin',
+		'LoopVariableReusePlugin',
+	*/
+	],
+
+	// Add any issue types (such as 'PhanUndeclaredMethod')
+	// here to inhibit them from being reported
+	'suppress_issue_types' => [
+		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
+		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
+		'PhanPluginShortArray',			// Dolibarr uses array()
+		'PhanPluginShortArrayList',		// Dolibarr uses array()
+		// The following may require that --quick is not used
+		// Fixers From PHPDocToRealTypesPlugin:
+		'PhanPluginCanUseParamType',	// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType',	// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+
+		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
+		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
+		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
+		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
+		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
+		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
+
+	],
+	// You can put relative paths to internal stubs in this config option.
+	// Phan will continue using its detailed type annotations,
+	// but load the constants, classes, functions, and classes (and their Reflection types)
+	// from these stub files (doubling as valid php files).
+	// Use a different extension from php (and preferably a separate folder)
+	// to avoid accidentally parsing these as PHP (includes projects depending on this).
+	// The 'mkstubs' script can be used to generate your own stubs (compatible with php 7.0+ right now)
+	// Note: The array key must be the same as the extension name reported by `php -m`,
+	// so that phan can skip loading the stubs if the extension is actually available.
+	'autoload_internal_extension_signatures' => [
+				// Stubs may be available at https://github.com/JetBrains/phpstorm-stubs/tree/master
+
+	// Xdebug stubs are bundled with Phan 0.10.1+/0.8.9+ for usage,
+	// because Phan disables xdebug by default.
+	//'xdebug'	=> 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
+	//'memcached'  => PHAN_DIR . '/your_internal_stubs_folder_name/memcached.phan_php',
+	//'PDO'  => PHAN_DIR . '/stubs/PDO.phan_php',
+	'brotli'  => PHAN_DIR . '/stubs/brotli.phan_php',
+	'curl'  => PHAN_DIR . '/stubs/curl.phan_php',
+	'calendar'  => PHAN_DIR . '/stubs/calendar.phan_php',
+	'fileinfo'  => PHAN_DIR . '/stubs/fileinfo.phan_php',
+	'ftp'  => PHAN_DIR . '/stubs/ftp.phan_php',
+	'gd'  => PHAN_DIR . '/stubs/gd.phan_php',
+	'geoip'  => PHAN_DIR . '/stubs/geoip.phan_php',
+	'imap'  => PHAN_DIR . '/stubs/imap.phan_php',
+	'intl'  => PHAN_DIR . '/stubs/intl.phan_php',
+	'ldap'  => PHAN_DIR . '/stubs/ldap.phan_php',
+	'mcrypt'  => PHAN_DIR . '/stubs/mcrypt.phan_php',
+	'memcache'  => PHAN_DIR . '/stubs/memcache.phan_php',
+	'mysqli'  => PHAN_DIR . '/stubs/mysqli.phan_php',
+	'pdo_cubrid'  => PHAN_DIR . '/stubs/pdo_cubrid.phan_php',
+	'pdo_mysql'  => PHAN_DIR . '/stubs/pdo_mysql.phan_php',
+	'pdo_pgsql'  => PHAN_DIR . '/stubs/pdo_pgsql.phan_php',
+	'pdo_sqlite'  => PHAN_DIR . '/stubs/pdo_sqlite.phan_php',
+	'pgsql'  => PHAN_DIR . '/stubs/pgsql.phan_php',
+	'session'  => PHAN_DIR . '/stubs/session.phan_php',
+	'simplexml'  => PHAN_DIR . '/stubs/SimpleXML.phan_php',
+	'soap'  => PHAN_DIR . '/stubs/soap.phan_php',
+	'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
+	'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
+	],
+
+	];
diff --git a/dev/tools/phan/plugins/ParamMatchRegexPlugin.php b/dev/tools/phan/plugins/ParamMatchRegexPlugin.php
new file mode 100644
index 00000000000..248ed72843e
--- /dev/null
+++ b/dev/tools/phan/plugins/ParamMatchRegexPlugin.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * Copyright (C) 2024        MDW                            <mdeweerd@users.noreply.github.com>
+ *
+ * Phan Plugin to validate that arguments match a regex
+ *
+ *
+ *  "ParamMatchRegexPlugin" => [
+ *      "/^test1$/" => [ 0, "/^OK$/"],  // Argument 0 must be 'OK'
+ *      "/^test2$/" => [ 1, "/^NOK$/", "Test2Arg1NokError"], // Argument 1 must be 'NOK', error code
+ *      "/^\\MyTest::mymethod$/" => [ 0, "/^NOK$/"], // Argument 0 must be 'NOK'
+ *  ],
+ *  'plugins' => [
+ *      ".phan/plugins/ParamMatchRegexPlugin.php",
+ *      // [...]
+ *  ],
+ */
+declare(strict_types=1);
+
+
+use ast\Node;
+use Phan\Config;
+use Phan\AST\UnionTypeVisitor;
+//use Phan\Language\Element\FunctionInterface;
+use Phan\Language\UnionType;
+use Phan\Language\Type;
+use Phan\PluginV3;
+use Phan\PluginV3\PluginAwarePostAnalysisVisitor;
+use Phan\PluginV3\PostAnalyzeNodeCapability;
+use Phan\Exception\NodeException;
+use Phan\Language\FQSEN\FullyQualifiedClassName;
+use Phan\Exception\FQSENException;
+
+/**
+ * ParamMatchPlugin hooks into one event:
+ *
+ * - getPostAnalyzeNodeVisitorClassName
+ *   This method returns a visitor that is called on every AST node from every
+ *   file being analyzed
+ *
+ * A plugin file must
+ *
+ * - Contain a class that inherits from \Phan\PluginV3
+ *
+ * - End by returning an instance of that class.
+ *
+ * It is assumed without being checked that plugins aren't
+ * mangling state within the passed code base or context.
+ *
+ * Note: When adding new plugins,
+ * add them to the corresponding section of README.md
+ */
+class ParamMatchPlugin extends PluginV3 implements PostAnalyzeNodeCapability
+{
+	/**
+	 * @return string - name of PluginAwarePostAnalysisVisitor subclass
+	 */
+	public static function getPostAnalyzeNodeVisitorClassName(): string
+	{
+		return ParamMatchVisitor::class;
+	}
+}
+
+/**
+ * When __invoke on this class is called with a node, a method
+ * will be dispatched based on the `kind` of the given node.
+ *
+ * Visitors such as this are useful for defining lots of different
+ * checks on a node based on its kind.
+ */
+class ParamMatchVisitor extends PluginAwarePostAnalysisVisitor
+{
+	// A plugin's visitors should not override visit() unless they need to.
+
+	/**
+	 * @override
+	 * @param    Node $node Node to analyze
+	 *
+	 * @return void
+	 */
+	public function visitMethodCall(Node $node): void
+	{
+		$method_name = $node->children['method'] ?? null;
+		if (!\is_string($method_name)) {
+			return; // Not handled, TODO: handle variable(?) methods
+			// throw new NodeException($node);
+		}
+		try {
+			// Fetch the list of valid classes, and warn about any undefined classes.
+			$union_type = UnionTypeVisitor::unionTypeFromNode($this->code_base, $this->context, $node->children['expr']);
+		} catch (Exception $_) {
+			// Phan should already throw for this
+			return;
+		}
+
+		$class_list = [];
+		foreach ($union_type->getTypeSet() as $type) {
+			$class_fqsen = "NoFSQENType";
+			if ($type instanceof Type) {
+				try {
+					$class_fqsen = (string) FullyQualifiedClassName::fromFullyQualifiedString($type->getName());
+				} catch (FQSENException $_) {
+					// var_dump([$_, $node]);
+					continue;
+				}
+			} else {
+				//    var_dump( $type) ;
+				continue;
+			}
+			$class_name = (string) $class_fqsen;
+			$class_list[] = $class_name;
+		}
+
+		/* May need to check list of classes
+		*/
+
+		/*
+		if (!$class->hasMethodWithName($this->code_base, $method_name, true)) {
+			throw new NodeException($expr, 'does not have method');
+		}
+		$class_name = $class->getName();
+		*/
+		foreach ($class_list as $class_name) {
+			$this->checkRule($node, "$class_name::$method_name");
+		}
+	}
+
+	/**
+	 * @override
+	 * @param    Node $node Node to analyze
+	 *
+	 * @return void
+	 */
+	public function visitStaticCall(Node $node): void
+	{
+		$class_name = $node->children['class']->children['name'] ?? null;
+		if (!\is_string($class_name)) {
+			throw new NodeException($expr, 'does not have class');
+		}
+		try {
+			$class_name = (string) FullyQualifiedClassName::fromFullyQualifiedString($class_name);
+		} catch (FQSENException $_) {
+		}
+		$method_name = $node->children['method'] ?? null;
+
+		if (!\is_string($method_name)) {
+			return;
+		}
+		$this->checkRule($node, "$class_name::$method_name");
+	}
+	/**
+	 * @override
+	 *
+	 * @param Node $node A node to analyze
+	 *
+	 * @return void
+	 */
+	public function visitCall(Node $node): void
+	{
+		$name = $node->children['expr']->children['name'] ?? null;
+		if (!\is_string($name)) {
+			return;
+		}
+
+
+		$this->checkRule($node, $name);
+	}
+
+	/**
+	 *
+	 * @param Node   $node A node to analyze
+	 * @param string $name function name or fqsn of class::<method>
+	 *
+	 * @return void
+	 */
+	public function checkRule(Node $node, string $name)
+	{
+		$rules = Config::getValue('ParamMatchRegexPlugin');
+		foreach ($rules as $regex => $rule) {
+			if (preg_match($regex, $name)) {
+				$this->checkParam($node, $rule[0], $rule[1], $name, $rule[2] ?? null);
+			}
+		}
+	}
+
+	/**
+	 * Check that argument matches regex at node
+	 *
+	 * @param Node   $node         Visited node for which to verify arguments match regex
+	 * @param int    $argPosition  Position of argument to check
+	 * @param string $argRegex     Regex to validate against argument
+	 * @param string $functionName Function name for report
+	 * @param string $messageCode  Message code to provide in message
+	 *
+	 * @return void
+	 */
+	public function checkParam(Node $node, int $argPosition, string $argRegex, $functionName, $messageCode = null): void
+	{
+		$args = $node->children['args']->children;
+
+		if (!array_key_exists($argPosition, $args)) {
+			/*
+			$this->emitPluginIssue(
+			$this->code_base,
+			$this->context,
+			'ParamMatchMissingArgument',
+			"Argument at %s for %s is missing",
+			[$argPosition, $function_name]
+			);
+			*/
+			return;
+		}
+		$expr = $args[$argPosition];
+		try {
+			$expr_type = UnionTypeVisitor::unionTypeFromNode($this->code_base, $this->context, $expr, false);
+		} catch (Exception $_) {
+			return;
+		}
+
+		$expr_value = $expr_type->getRealUnionType()->asValueOrNullOrSelf();
+		if (!is_object($expr_value)) {
+			$list = [(string) $expr_value];
+		} elseif ($expr_value instanceof UnionType) {
+			$list = $expr_value->asScalarValues();
+		} else {
+			// Note: maybe more types could be supported
+			return;
+		}
+
+		foreach ($list as $argValue) {
+			if (!\preg_match($argRegex, (string) $argValue)) {
+				// Emit an issue if the argument does not match the expected regex pattern
+				// var_dump([$node,$expr_value,$expr_type->getRealUnionType()]); // Information about node
+				$this->emitPluginIssue(
+					$this->code_base,
+					$this->context,
+					$messageCode ?? 'ParamMatchRegexError',
+					"Argument {INDEX} function {FUNCTION} can have value {STRING_LITERAL} that does not match the expected pattern '{STRING_LITERAL}'",
+					[$argPosition, $functionName, json_encode($argValue), $argRegex]
+				);
+			}
+		}
+	}
+}
+
+// Every plugin needs to return an instance of itself at the
+// end of the file in which it's defined.
+return new ParamMatchPlugin();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 42d1f1df716..40e1aa39219 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -932,6 +932,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			$out = preg_replace('/([<>])([-+]?\d)/', '\1 \2', $out);
 		}
 
+		// @phan-suppress-next-line ParamMatchRegexError
 		$out = sanitizeVal($out, $check, $filter, $options);
 	}
 
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index aa0d49399a4..61c41d0782c 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -4186,6 +4186,7 @@ if ($module == 'initmodule') {
 								print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 								print $form->textwithpicto('', $langs->trans("InfoForApiFile"), 1, 'warning');
 								print ' &nbsp; ';
+								// @phan-suppress-next-line ParamMatchRegexError
 								if (!isModEnabled($modulelowercase)) {	// If module is not activated
 									print '<a href="#" class="classfortooltip" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("ApiExplorer").'</strike></a>';
 								} else {

From 39d873287938d5192b38c861595bf10331ab0fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:14:22 +0100
Subject: [PATCH 0239/1862] fix missing status if unread (status = 0) (#28443)

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index d4d498ab18d..186d1ce410f 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1424,8 +1424,8 @@ class Ticket extends CommonObject
 		// phpcs:enable
 		global $langs, $hookmanager;
 
-		$labelStatus = !empty($status) ? $this->labelStatus[$status] : '';
-		$labelStatusShort = !empty($status) ? $this->labelStatusShort[$status] : '';
+		$labelStatus = (isset($status) && !empty($this->labelStatus[$status])) ? $this->labelStatus[$status] : '';
+		$labelStatusShort = (isset($status) && !empty($this->labelStatusShort[$status]))? $this->labelStatusShort[$status] : '';
 
 		switch ($status) {
 			case self::STATUS_NOT_READ:

From 02ec0bcd74944836f6d1aed671a5e12a13971435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:14:34 +0100
Subject: [PATCH 0240/1862] fix phan (#28444)

---
 htdocs/accountancy/admin/account.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index b914ef5f769..5fff15480e0 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -152,6 +152,7 @@ if (empty($reshook)) {
 		$error = 0;
 
 		if ($chartofaccounts > 0 && $permissiontoadd) {
+			$country_code = '';
 			// Get language code for this $chartofaccounts
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_country as c, '.MAIN_DB_PREFIX.'accounting_system as a';
 			$sql .= ' WHERE c.rowid = a.fk_country AND a.rowid = '.(int) $chartofaccounts;

From cadbb0cea1f58f35fdf10ec47566ed6ce89daecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:14:53 +0100
Subject: [PATCH 0241/1862] fix phpstan (#28445)

Default value of the parameter #9 $fk_unit (string) of method BOM::addLine() is incompatible with type int.
---
 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 6935ac2594d..e36415b4077 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -600,7 +600,7 @@ class BOM extends CommonObject
 	 * @param	int		$fk_default_workstation	Default workstation
 	 * @return	int								Return integer <0 if KO, Id of created object if OK
 	 */
-	public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null, $fk_unit = '', $array_options = array(), $fk_default_workstation = null)
+	public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null, $fk_unit = 0, $array_options = array(), $fk_default_workstation = null)
 	{
 		global $mysoc, $conf, $langs, $user;
 

From 148d6d4c39aaf809e90c780728c45f7936797444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:15:57 +0100
Subject: [PATCH 0242/1862] add arrayfields in parameters for hook
 printFieldPreListTitle (#28428)

* add search member status if column not displayed

* Update list.php
---
 htdocs/adherents/list.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 5ab338489de..d2297697632 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2016  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2021-2023	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2023	Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -815,6 +815,10 @@ if ($search_all) {
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>'."\n";
 }
 
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
 $moreforfilter = '';
 // Filter on categories
 if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
@@ -823,7 +827,9 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_MEMBER, $search_categ, 'search_categ', 1, $langs->trans("MembersCategoriesShort"));
 	$moreforfilter .= '</div>';
 }
-$parameters = array();
+$parameters = array(
+	'arrayfields' => &$arrayfields,
+);
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
@@ -839,10 +845,6 @@ if (!empty($moreforfilter)) {
 	print '</div>';
 }
 
-$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
-$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
-
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 

From 7d28285ac7f41f9e59d03f8af0be50703080653c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2024 11:29:53 +0100
Subject: [PATCH 0243/1862] CSS

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

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 5fa292da439..6007b639120 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -277,11 +277,11 @@ if ($resql) {
 
 			// Label
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->title).'">';
-			print $projectstatic->title;
+			print dol_escape_htmltag($projectstatic->title);
 			print '</td>';
 
 			// Thirdparty
-			print '<td class="nowrap">';
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companystatic->name).'">';
 			if ($companystatic->id > 0) {
 				print $companystatic->getNomUrl(1, 'company', 16);
 			}
@@ -344,7 +344,7 @@ if ($resql) {
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder);
-		print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("Number", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right ');
 		print "</tr>\n";
 	}
 

From ce56fee2b46e50648d9a961f038c5be8d62897bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2024 12:28:16 +0100
Subject: [PATCH 0244/1862] Fix fatal error class not found

---
 htdocs/accountancy/admin/productaccount.php         |  9 ++++-----
 htdocs/compta/bank/list.php                         |  2 +-
 htdocs/knowledgemanagement/knowledgerecord_list.php | 13 +++----------
 htdocs/product/inventory/list.php                   |  4 +---
 htdocs/product/stock/list.php                       |  1 -
 htdocs/projet/list.php                              |  1 -
 htdocs/projet/tasks/list.php                        |  7 ++++---
 7 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 8eca43948e6..66b120cf1d5 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -26,17 +26,16 @@
  * \brief		To define accounting account on product / service
  */
 require '../../main.inc.php';
-
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (isModEnabled('categorie')) {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "compta", "accountancy", "products"));
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 3c8d4a68aaa..1a66ee4b4bb 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -28,11 +28,11 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index c56bb6aef75..97d48d8d00d 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -25,20 +25,13 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// load knowledgemanagement libraries
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
-
-// for other modules
-if (isModEnabled('categorie')) {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-}
-//dol_include_once('/othermodule/class/otherobject.class.php');
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "other"));
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 947de8a3fc9..396aca79e25 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -23,13 +23,11 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
-if (isModEnabled('categorie')) {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-}
 
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other"));
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 8fc6a31c813..919566195f4 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -29,7 +29,6 @@
 // Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-
 if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 55937976c50..1d3f9ee94bc 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -37,7 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-
 if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 1394d6da1fd..e6ace40c941 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -27,11 +27,12 @@
  */
 
 require "../../main.inc.php";
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'users', 'companies'));

From 0a345e37a0dca8f1293c9bfc0d86bbc3773d3721 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2024 13:01:42 +0100
Subject: [PATCH 0245/1862] Fix delete not used table

---
 .../template/sql/llx_c_action_trigger.sql       | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 htdocs/modulebuilder/template/sql/llx_c_action_trigger.sql

diff --git a/htdocs/modulebuilder/template/sql/llx_c_action_trigger.sql b/htdocs/modulebuilder/template/sql/llx_c_action_trigger.sql
deleted file mode 100644
index 432846d122d..00000000000
--- a/htdocs/modulebuilder/template/sql/llx_c_action_trigger.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- Uncomment and run the script to declare triggers to be used by the agenda module for automatic logging of events into agenda (table llx_actioncomm).
---
--- For example
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_DRAFT', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_CREATE', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_VALIDATE', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_MODIFY', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_ACCEPT', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_DENIED', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_REOPEN', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_UNVALIDATE', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- INSERT INTO `llx_c_action_trigger` (`rowid`, `elementtype`, `code`, `label`, `description`, `rang`) VALUES (NULL, 'mymodule', 'MYCLASSNAME_SENTBYMAIL', 'MYCLASSNAME create', 'A MYCLASSNAME is created', '0000000');
--- 
-
-
---ADD Call trigger IN TABLE
\ No newline at end of file

From 2ddfe02e0c1c98106dc6bd5957814b59cc204fe8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2024 13:08:15 +0100
Subject: [PATCH 0246/1862] Doc

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

diff --git a/htdocs/core/modules/modWebhook.class.php b/htdocs/core/modules/modWebhook.class.php
index 505b465bfbc..56697702645 100644
--- a/htdocs/core/modules/modWebhook.class.php
+++ b/htdocs/core/modules/modWebhook.class.php
@@ -62,9 +62,9 @@ class modWebhook extends DolibarrModules
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 
 		// Module description, used if translation string 'ModuleWebhookDesc' not found (Webhook is name of module).
-		$this->description = "WebhookDescription";
+		$this->description = "WebHook";
 		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "WebhookDescription";
+		$this->descriptionlong = "Interface to catch dolibarr triggers and send data of the event to an external URL";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = 'dolibarr';

From 9e2ae31af742a360860ae1c0f91f73af55154d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:00:46 +0100
Subject: [PATCH 0247/1862] fix phpstan (#28453)

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

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 7a563ac4c91..282917f2099 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -627,7 +627,7 @@ class FormProduct
 	 *  @param  string		$selected             Preselected value
 	 *  @param  int         $mode                1=Use label as value, 0=Use code
 	 *  @param  int         $showempty           1=show empty value, 0= no
-	 *  @return string
+	 *  @return string|int
 	 */
 	public function selectProductNature($name = 'finished', $selected = '', $mode = 0, $showempty = 1)
 	{

From 1122805bf046403d2741cfd6f563a13fd3953695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:01:09 +0100
Subject: [PATCH 0248/1862] fix phpstan (#28454)

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

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 113d7f8742c..c061fa61c19 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -64,7 +64,7 @@ class pdf_azur extends ModelePDFPropales
 	public $description;
 
 	/**
-	 * @var string	Save the name of generated file as the main doc when generating a doc with this template
+	 * @var int	Save the name of generated file as the main doc when generating a doc with this template
 	 */
 	public $update_main_doc_field;
 

From aa37b755e06745752250e55bb8ee51169142dd41 Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Tue, 27 Feb 2024 07:03:53 -0600
Subject: [PATCH 0249/1862] Update paiement.php (#28449)

PHP Warning:  Undefined variable $totalrecucreditnote
PHP Warning:  Undefined variable $totalrecudeposits
---
 htdocs/fourn/facture/paiement.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index de1e9ae45ae..007dd70dea0 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -602,6 +602,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						$total = 0;
 						$total_ttc = 0;
 						$totalrecu = 0;
+						$totalrecucreditnote = 0;	// PHP Warning:  Undefined variable $totalrecucreditnote
+						$totalrecudeposits = 0;		// PHP Warning:  Undefined variable $totalrecudeposits
 						while ($i < $num) {
 							$objp = $db->fetch_object($resql);
 

From 36f890f973d717754ad2cdc20bf68be0c66cc251 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:05:53 +0100
Subject: [PATCH 0250/1862] Fix: GETPOST(...,'int') to GETPOSTINT(...) (#28448)

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: GETPOST(...,'int') to GETPOSTINT(...)

# Fix: GETPOST(...,'int') to GETPOSTINT(...)

Converted using Phan plugin

* Fix: Update spelling exceptions

* Qual: Ignore Phan Notice
---
 .../codespell/codespell-lines-ignore.txt      |  31 +--
 htdocs/accountancy/admin/account.php          |  20 +-
 htdocs/accountancy/admin/accountmodel.php     |   6 +-
 htdocs/accountancy/admin/card.php             |   4 +-
 htdocs/accountancy/admin/categories.php       |  10 +-
 htdocs/accountancy/admin/categories_list.php  |  10 +-
 htdocs/accountancy/admin/defaultaccounts.php  |   8 +-
 htdocs/accountancy/admin/export.php           |   2 +-
 htdocs/accountancy/admin/fiscalyear.php       |   4 +-
 htdocs/accountancy/admin/fiscalyear_card.php  |   6 +-
 htdocs/accountancy/admin/fiscalyear_info.php  |   2 +-
 htdocs/accountancy/admin/index.php            |  26 +-
 htdocs/accountancy/admin/journals_list.php    |   6 +-
 htdocs/accountancy/admin/productaccount.php   |   8 +-
 htdocs/accountancy/admin/subaccount.php       |  10 +-
 htdocs/accountancy/bookkeeping/balance.php    |  22 +-
 htdocs/accountancy/bookkeeping/card.php       |   4 +-
 htdocs/accountancy/bookkeeping/export.php     |  78 +++---
 htdocs/accountancy/bookkeeping/list.php       |  76 +++---
 .../accountancy/bookkeeping/listbyaccount.php |  52 ++--
 htdocs/accountancy/closure/index.php          |  20 +-
 htdocs/accountancy/customer/card.php          |   4 +-
 htdocs/accountancy/customer/index.php         |   8 +-
 htdocs/accountancy/customer/lines.php         |  22 +-
 htdocs/accountancy/customer/list.php          |  20 +-
 htdocs/accountancy/expensereport/card.php     |   4 +-
 htdocs/accountancy/expensereport/index.php    |   8 +-
 htdocs/accountancy/expensereport/lines.php    |  22 +-
 htdocs/accountancy/expensereport/list.php     |  16 +-
 htdocs/accountancy/index.php                  |   4 +-
 htdocs/accountancy/journal/bankjournal.php    |  14 +-
 .../journal/expensereportsjournal.php         |   2 +-
 .../accountancy/journal/purchasesjournal.php  |   2 +-
 htdocs/accountancy/journal/sellsjournal.php   |   2 +-
 htdocs/accountancy/journal/variousjournal.php |   2 +-
 htdocs/accountancy/supplier/card.php          |   4 +-
 htdocs/accountancy/supplier/index.php         |   8 +-
 htdocs/accountancy/supplier/lines.php         |  22 +-
 htdocs/accountancy/supplier/list.php          |  20 +-
 htdocs/adherents/admin/member_emails.php      |   2 +-
 htdocs/adherents/admin/website.php            |   2 +-
 htdocs/adherents/agenda.php                   |   6 +-
 .../actions_adherentcard_common.class.php     |   8 +-
 htdocs/adherents/card.php                     |  42 ++--
 htdocs/adherents/document.php                 |   6 +-
 htdocs/adherents/index.php                    |   4 +-
 htdocs/adherents/ldap.php                     |   2 +-
 htdocs/adherents/list.php                     |  22 +-
 htdocs/adherents/note.php                     |   2 +-
 htdocs/adherents/partnership.php              |   6 +-
 htdocs/adherents/stats/index.php              |   4 +-
 htdocs/adherents/subscription.php             |  50 ++--
 htdocs/adherents/subscription/card.php        |   6 +-
 htdocs/adherents/subscription/info.php        |   2 +-
 htdocs/adherents/subscription/list.php        |  10 +-
 htdocs/adherents/type.php                     |  14 +-
 htdocs/adherents/type_ldap.php                |   2 +-
 htdocs/adherents/type_translation.php         |   4 +-
 htdocs/adherents/vcard.php                    |   2 +-
 htdocs/admin/accountant.php                   |   8 +-
 htdocs/admin/agenda_extsites.php              |   2 +-
 htdocs/admin/agenda_xcal.php                  |   4 +-
 htdocs/admin/barcode.php                      |   2 +-
 htdocs/admin/boxes.php                        |   8 +-
 htdocs/admin/company.php                      |   4 +-
 htdocs/admin/const.php                        |  10 +-
 htdocs/admin/debugbar.php                     |   4 +-
 htdocs/admin/defaultvalues.php                |   6 +-
 htdocs/admin/delais.php                       |   2 +-
 htdocs/admin/dict.php                         |  24 +-
 htdocs/admin/dolistore/ajax/image.php         |   4 +-
 htdocs/admin/emailcollector_card.php          |  10 +-
 htdocs/admin/emailcollector_list.php          |  14 +-
 htdocs/admin/events.php                       |   4 +-
 htdocs/admin/expensereport.php                |   6 +-
 htdocs/admin/expensereport_rules.php          |   6 +-
 htdocs/admin/external_rss.php                 |  18 +-
 htdocs/admin/facture.php                      |   2 +-
 htdocs/admin/hrm.php                          |   2 +-
 htdocs/admin/ihm.php                          |  10 +-
 htdocs/admin/ldap.php                         |   4 +-
 htdocs/admin/limits.php                       |   4 +-
 htdocs/admin/mailing.php                      |   4 +-
 htdocs/admin/mails.php                        |  16 +-
 htdocs/admin/mails_senderprofile_list.php     |  34 +--
 htdocs/admin/mails_templates.php              |  20 +-
 htdocs/admin/menus/edit.php                   |  18 +-
 htdocs/admin/menus/index.php                  |  14 +-
 htdocs/admin/modulehelp.php                   |   2 +-
 htdocs/admin/modules.php                      |   8 +-
 htdocs/admin/multicurrency.php                |   4 +-
 htdocs/admin/payment.php                      |   2 +-
 htdocs/admin/paymentbybanktransfer.php        |   6 +-
 htdocs/admin/pdf.php                          |   2 +-
 htdocs/admin/pdf_other.php                    |   8 +-
 htdocs/admin/perms.php                        |   4 +-
 htdocs/admin/prelevement.php                  |   6 +-
 htdocs/admin/receiptprinter.php               |   8 +-
 htdocs/admin/supplier_payment.php             |   2 +-
 htdocs/admin/taxes.php                        |   4 +-
 htdocs/admin/ticket.php                       |   8 +-
 htdocs/admin/ticket_public.php                |   2 +-
 htdocs/admin/tools/dolibarr_export.php        |   4 +-
 htdocs/admin/tools/export.php                 |   8 +-
 htdocs/admin/tools/export_files.php           |   4 +-
 htdocs/admin/tools/listevents.php             |  14 +-
 htdocs/admin/tools/listsessions.php           |   4 +-
 htdocs/admin/translation.php                  |  14 +-
 htdocs/admin/website.php                      |   6 +-
 htdocs/admin/website_options.php              |   4 +-
 htdocs/asset/accountancy_codes.php            |   2 +-
 htdocs/asset/agenda.php                       |   6 +-
 htdocs/asset/card.php                         |  22 +-
 .../class/assetdepreciationoptions.class.php  |   6 +-
 htdocs/asset/depreciation.php                 |   2 +-
 htdocs/asset/depreciation_options.php         |   2 +-
 htdocs/asset/disposal.php                     |   2 +-
 htdocs/asset/document.php                     |   6 +-
 htdocs/asset/list.php                         |  14 +-
 htdocs/asset/model/accountancy_codes.php      |   2 +-
 htdocs/asset/model/agenda.php                 |   6 +-
 htdocs/asset/model/card.php                   |   2 +-
 htdocs/asset/model/depreciation_options.php   |   2 +-
 htdocs/asset/model/list.php                   |  14 +-
 htdocs/asset/model/note.php                   |   2 +-
 htdocs/asset/note.php                         |   2 +-
 .../tpl/depreciation_options_edit.tpl.php     |   2 +-
 htdocs/barcode/printsheet.php                 |  18 +-
 htdocs/blockedlog/admin/blockedlog.php        |   2 +-
 htdocs/blockedlog/admin/blockedlog_list.php   |  36 +--
 htdocs/blockedlog/ajax/block-add.php          |   2 +-
 htdocs/blockedlog/ajax/block-info.php         |   2 +-
 htdocs/bom/ajax/ajax.php                      |   2 +-
 htdocs/bom/bom_agenda.php                     |   8 +-
 htdocs/bom/bom_card.php                       |  22 +-
 htdocs/bom/bom_document.php                   |   6 +-
 htdocs/bom/bom_list.php                       |  20 +-
 htdocs/bom/bom_net_needs.php                  |   4 +-
 htdocs/bom/bom_note.php                       |   2 +-
 htdocs/bom/tpl/objectline_create.tpl.php      |   4 +-
 htdocs/bom/tpl/objectline_edit.tpl.php        |   4 +-
 htdocs/bookcal/availabilities_agenda.php      |   6 +-
 htdocs/bookcal/availabilities_card.php        |  12 +-
 htdocs/bookcal/availabilities_contact.php     |  10 +-
 htdocs/bookcal/availabilities_document.php    |   6 +-
 htdocs/bookcal/availabilities_list.php        |  22 +-
 htdocs/bookcal/availabilities_note.php        |   2 +-
 htdocs/bookcal/bookcalindex.php               |   2 +-
 htdocs/bookcal/booking_list.php               |   4 +-
 htdocs/bookcal/calendar_agenda.php            |   6 +-
 htdocs/bookcal/calendar_card.php              |  12 +-
 htdocs/bookcal/calendar_contact.php           |  10 +-
 htdocs/bookcal/calendar_document.php          |   6 +-
 htdocs/bookcal/calendar_list.php              |  22 +-
 htdocs/bookcal/calendar_note.php              |   2 +-
 htdocs/bookmarks/card.php                     |  16 +-
 htdocs/bookmarks/list.php                     |  10 +-
 htdocs/categories/card.php                    |  10 +-
 htdocs/categories/edit.php                    |  10 +-
 htdocs/categories/index.php                   |   4 +-
 htdocs/categories/info.php                    |   2 +-
 htdocs/categories/photos.php                  |   2 +-
 htdocs/categories/traduction.php              |   2 +-
 htdocs/categories/viewcat.php                 |  12 +-
 htdocs/collab/index.php                       |   2 +-
 htdocs/comm/action/card.php                   | 120 ++++-----
 htdocs/comm/action/document.php               |   8 +-
 htdocs/comm/action/index.php                  |  40 +--
 htdocs/comm/action/info.php                   |   2 +-
 htdocs/comm/action/list.php                   |  78 +++---
 htdocs/comm/action/pertype.php                |  32 +--
 htdocs/comm/action/peruser.php                |  36 +--
 htdocs/comm/action/rapport/index.php          |   8 +-
 htdocs/comm/card.php                          |  16 +-
 htdocs/comm/contact.php                       |   6 +-
 htdocs/comm/index.php                         |   4 +-
 htdocs/comm/mailing/advtargetemailing.php     |  28 +--
 htdocs/comm/mailing/card.php                  |   2 +-
 htdocs/comm/mailing/cibles.php                |  14 +-
 htdocs/comm/mailing/info.php                  |   2 +-
 htdocs/comm/mailing/list.php                  |   8 +-
 htdocs/comm/mailing/note.php                  |   2 +-
 htdocs/comm/multiprix.php                     |   6 +-
 htdocs/comm/propal/agenda.php                 |   6 +-
 htdocs/comm/propal/card.php                   | 114 ++++-----
 htdocs/comm/propal/contact.php                |   8 +-
 htdocs/comm/propal/document.php               |   6 +-
 htdocs/comm/propal/index.php                  |   2 +-
 htdocs/comm/propal/list.php                   |  78 +++---
 htdocs/comm/propal/note.php                   |   2 +-
 htdocs/comm/propal/stats/index.php            |   6 +-
 htdocs/comm/prospect/index.php                |   2 +-
 htdocs/comm/recap-client.php                  |   2 +-
 htdocs/comm/remise.php                        |  12 +-
 htdocs/comm/remx.php                          |   6 +-
 htdocs/commande/agenda.php                    |   6 +-
 htdocs/commande/card.php                      |  76 +++---
 htdocs/commande/contact.php                   |   8 +-
 htdocs/commande/customer.php                  |   4 +-
 htdocs/commande/document.php                  |   6 +-
 htdocs/commande/index.php                     |   2 +-
 htdocs/commande/list.php                      |  60 ++---
 htdocs/commande/list_det.php                  |  52 ++--
 htdocs/commande/note.php                      |   4 +-
 htdocs/commande/stats/index.php               |   4 +-
 htdocs/compta/accounting-files.php            |  36 +--
 htdocs/compta/ajaxpayment.php                 |   2 +-
 .../bank/account_statement_document.php       |   6 +-
 htdocs/compta/bank/bankentries_list.php       |  60 ++---
 htdocs/compta/bank/card.php                   |  44 ++--
 htdocs/compta/bank/document.php               |   6 +-
 htdocs/compta/bank/graph.php                  |  10 +-
 htdocs/compta/bank/info.php                   |   4 +-
 htdocs/compta/bank/line.php                   |  18 +-
 htdocs/compta/bank/list.php                   |   6 +-
 htdocs/compta/bank/releve.php                 |   8 +-
 htdocs/compta/bank/transfer.php               |  16 +-
 htdocs/compta/bank/treso.php                  |   4 +-
 .../compta/bank/various_payment/document.php  |   8 +-
 htdocs/compta/bank/various_payment/info.php   |   4 +-
 htdocs/compta/bank/various_payment/list.php   |  30 +--
 .../compta/cashcontrol/cashcontrol_card.php   |  24 +-
 .../compta/cashcontrol/cashcontrol_list.php   |  18 +-
 htdocs/compta/cashcontrol/report.php          |   2 +-
 htdocs/compta/charges/index.php               |   8 +-
 htdocs/compta/clients.php                     |   4 +-
 htdocs/compta/deplacement/card.php            |  32 +--
 htdocs/compta/deplacement/document.php        |   6 +-
 htdocs/compta/deplacement/index.php           |   8 +-
 htdocs/compta/deplacement/info.php            |   2 +-
 htdocs/compta/deplacement/list.php            |   8 +-
 htdocs/compta/deplacement/stats/index.php     |   6 +-
 htdocs/compta/facture/agenda-rec.php          |   6 +-
 htdocs/compta/facture/agenda.php              |   6 +-
 htdocs/compta/facture/card-rec.php            |  52 ++--
 htdocs/compta/facture/card.php                | 238 +++++++++---------
 htdocs/compta/facture/class/facture.class.php |   6 +-
 htdocs/compta/facture/contact.php             |  10 +-
 htdocs/compta/facture/document.php            |   8 +-
 htdocs/compta/facture/index.php               |   2 +-
 .../compta/facture/invoicetemplate_list.php   |  40 +--
 htdocs/compta/facture/list.php                |  26 +-
 htdocs/compta/facture/note.php                |   4 +-
 htdocs/compta/facture/prelevement.php         |  18 +-
 htdocs/compta/facture/stats/index.php         |   6 +-
 htdocs/compta/index.php                       |   2 +-
 htdocs/compta/localtax/card.php               |  10 +-
 htdocs/compta/localtax/clients.php            |   8 +-
 htdocs/compta/localtax/index.php              |  16 +-
 htdocs/compta/localtax/list.php               |   6 +-
 htdocs/compta/localtax/quadri_detail.php      |  16 +-
 htdocs/compta/paiement.php                    |   8 +-
 htdocs/compta/paiement/card.php               |   8 +-
 htdocs/compta/paiement/cheque/card.php        |  38 +--
 htdocs/compta/paiement/cheque/list.php        |  18 +-
 htdocs/compta/paiement/info.php               |   2 +-
 htdocs/compta/paiement/list.php               |  26 +-
 htdocs/compta/paiement/rapport.php            |   6 +-
 htdocs/compta/paiement/tovalidate.php         |   4 +-
 htdocs/compta/paiement_charge.php             |   8 +-
 htdocs/compta/paiement_vat.php                |  16 +-
 htdocs/compta/payment_sc/card.php             |   2 +-
 htdocs/compta/payment_vat/card.php            |   2 +-
 htdocs/compta/paymentbybanktransfer/index.php |   2 +-
 htdocs/compta/prelevement/card.php            |  16 +-
 htdocs/compta/prelevement/create.php          |  12 +-
 htdocs/compta/prelevement/demandes.php        |   8 +-
 htdocs/compta/prelevement/factures.php        |  10 +-
 htdocs/compta/prelevement/fiche-rejet.php     |   6 +-
 htdocs/compta/prelevement/fiche-stat.php      |   6 +-
 htdocs/compta/prelevement/index.php           |   2 +-
 htdocs/compta/prelevement/line.php            |  18 +-
 htdocs/compta/prelevement/list.php            |  10 +-
 htdocs/compta/prelevement/orders_list.php     |   8 +-
 htdocs/compta/prelevement/rejets.php          |   6 +-
 htdocs/compta/prelevement/stats.php           |   2 +-
 htdocs/compta/recap-compta.php                |   6 +-
 htdocs/compta/resultat/clientfourn.php        |  24 +-
 htdocs/compta/resultat/index.php              |  20 +-
 htdocs/compta/resultat/result.php             |  24 +-
 htdocs/compta/sociales/card.php               |  30 +--
 htdocs/compta/sociales/document.php           |   6 +-
 htdocs/compta/sociales/info.php               |   4 +-
 htdocs/compta/sociales/list.php               |  42 ++--
 htdocs/compta/sociales/note.php               |   4 +-
 htdocs/compta/sociales/payments.php           |   8 +-
 htdocs/compta/stats/byratecountry.php         |  10 +-
 htdocs/compta/stats/cabyprodserv.php          |  10 +-
 htdocs/compta/stats/cabyuser.php              |  18 +-
 htdocs/compta/stats/casoc.php                 |  22 +-
 htdocs/compta/stats/index.php                 |  22 +-
 htdocs/compta/stats/supplier_turnover.php     |  20 +-
 .../stats/supplier_turnover_by_prodserv.php   |  10 +-
 .../stats/supplier_turnover_by_thirdparty.php |  10 +-
 htdocs/compta/tva/card.php                    |  26 +-
 htdocs/compta/tva/document.php                |   6 +-
 htdocs/compta/tva/index.php                   |   8 +-
 htdocs/compta/tva/info.php                    |   4 +-
 htdocs/compta/tva/initdatesforvat.inc.php     |  10 +-
 htdocs/compta/tva/list.php                    |  48 ++--
 htdocs/compta/tva/payments.php                |   6 +-
 htdocs/contact/agenda.php                     |   8 +-
 .../actions_contactcard_common.class.php      |   2 +-
 htdocs/contact/card.php                       |  36 +--
 htdocs/contact/consumption.php                |  10 +-
 htdocs/contact/document.php                   |   6 +-
 htdocs/contact/info.php                       |   2 +-
 htdocs/contact/ldap.php                       |   2 +-
 htdocs/contact/list.php                       |  36 +--
 htdocs/contact/note.php                       |   2 +-
 htdocs/contact/perso.php                      |   2 +-
 htdocs/contact/project.php                    |   2 +-
 htdocs/contact/vcard.php                      |   2 +-
 htdocs/contrat/agenda.php                     |   6 +-
 htdocs/contrat/card.php                       |  52 ++--
 htdocs/contrat/contact.php                    |   8 +-
 htdocs/contrat/document.php                   |   6 +-
 htdocs/contrat/index.php                      |   4 +-
 htdocs/contrat/list.php                       |  64 ++---
 htdocs/contrat/messaging.php                  |   8 +-
 htdocs/contrat/note.php                       |   4 +-
 htdocs/contrat/services_list.php              |  28 +--
 htdocs/contrat/ticket.php                     |   4 +-
 htdocs/core/actions_addupdatedelete.inc.php   |  20 +-
 htdocs/core/actions_builddoc.inc.php          |   4 +-
 htdocs/core/actions_dellink.inc.php           |   4 +-
 htdocs/core/actions_extrafields.inc.php       |   4 +-
 htdocs/core/actions_linkedfiles.inc.php       |  12 +-
 htdocs/core/actions_massactions.inc.php       |   8 +-
 htdocs/core/actions_setmoduleoptions.inc.php  |   4 +-
 htdocs/core/actions_setnotes.inc.php          |   6 +-
 htdocs/core/ajax/ajaxdirpreview.php           |   6 +-
 htdocs/core/ajax/ajaxdirtree.php              |   2 +-
 htdocs/core/ajax/ajaxinvoiceline.php          |   2 +-
 htdocs/core/ajax/ajaxstatusprospect.php       |   4 +-
 htdocs/core/ajax/ajaxtooltip.php              |   2 +-
 htdocs/core/ajax/bankconciliate.php           |  16 +-
 htdocs/core/ajax/box.php                      |   6 +-
 htdocs/core/ajax/check_notifications.php      |   2 +-
 htdocs/core/ajax/constantonoff.php            |   2 +-
 htdocs/core/ajax/contacts.php                 |   4 +-
 htdocs/core/ajax/extraparams.php              |   2 +-
 htdocs/core/ajax/fileupload.php               |   2 +-
 htdocs/core/ajax/objectonoff.php              |   4 +-
 htdocs/core/ajax/selectobject.php             |   2 +-
 htdocs/core/ajax/vatrates.php                 |   4 +-
 htdocs/core/bookmarks_page.php                |   6 +-
 .../boxes/box_graph_invoices_permonth.php     |   2 +-
 .../core/boxes/box_graph_invoices_peryear.php |   2 +-
 .../box_graph_invoices_supplier_permonth.php  |   2 +-
 .../core/boxes/box_graph_orders_permonth.php  |   2 +-
 .../box_graph_orders_supplier_permonth.php    |   2 +-
 .../boxes/box_graph_product_distribution.php  |   2 +-
 .../boxes/box_graph_propales_permonth.php     |   2 +-
 htdocs/core/class/commonobject.class.php      |   8 +-
 htdocs/core/class/extrafields.class.php       |  32 +--
 htdocs/core/class/html.formmail.class.php     |   2 +-
 htdocs/core/class/html.formsetup.class.php    |   4 +-
 htdocs/core/class/html.formticket.class.php   |  10 +-
 htdocs/core/datepicker.php                    |   2 +-
 htdocs/core/get_info.php                      |   2 +-
 htdocs/core/get_menudiv.php                   |   6 +-
 htdocs/core/lib/company.lib.php               |  22 +-
 htdocs/core/lib/files.lib.php                 |   2 +-
 htdocs/core/lib/security2.lib.php             |  16 +-
 htdocs/core/login/functions_googleoauth.php   |   2 +-
 htdocs/core/login/functions_openid.php        |   2 +-
 htdocs/core/menus/standard/auguria.lib.php    |   2 +-
 htdocs/core/menus/standard/auguria_menu.php   |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       |   4 +-
 htdocs/core/menus/standard/eldy_menu.php      |   2 +-
 .../mailings/eventorganization.modules.php    |   4 +-
 .../core/modules/mailings/fraise.modules.php  |  12 +-
 .../modules/mailings/partnership.modules.php  |   8 +-
 .../modules/mailings/thirdparties.modules.php |  12 +-
 .../thirdparties_services_expired.modules.php |   2 +-
 .../movement/doc/pdf_standard.modules.php     |  14 +-
 .../modules/oauth/google_oauthcallback.php    |   2 +-
 htdocs/core/multicompany_page.php             |   2 +-
 htdocs/core/photos_resize.php                 |   6 +-
 htdocs/core/search_page.php                   |   8 +-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |   6 +-
 htdocs/core/tpl/card_presend.tpl.php          |   2 +-
 htdocs/core/tpl/commonfields_add.tpl.php      |   6 +-
 htdocs/core/tpl/commonfields_edit.tpl.php     |   4 +-
 htdocs/core/tpl/contacts.tpl.php              |   2 +-
 .../tpl/document_actions_post_headers.tpl.php |   4 +-
 htdocs/core/tpl/extrafields_view.tpl.php      |   4 +-
 htdocs/core/tpl/massactions_pre.tpl.php       |   4 +-
 htdocs/core/tpl/objectline_create.tpl.php     |   4 +-
 htdocs/core/tpl/objectline_edit.tpl.php       |   6 +-
 htdocs/core/tpl/resource_view.tpl.php         |   4 +-
 htdocs/cron/card.php                          |  20 +-
 htdocs/cron/info.php                          |   2 +-
 htdocs/cron/list.php                          |  10 +-
 htdocs/datapolicy/admin/setup.php             |   4 +-
 htdocs/dav/fileserver.php                     |   4 +-
 htdocs/delivery/card.php                      |   8 +-
 htdocs/document.php                           |   2 +-
 htdocs/don/card.php                           |  20 +-
 htdocs/don/document.php                       |   8 +-
 htdocs/don/info.php                           |   4 +-
 htdocs/don/list.php                           |   6 +-
 htdocs/don/note.php                           |   4 +-
 htdocs/don/paiement/list.php                  |  22 +-
 htdocs/don/payment/card.php                   |   2 +-
 htdocs/don/payment/payment.php                |   8 +-
 htdocs/don/stats/index.php                    |   4 +-
 htdocs/ecm/dir_add_card.php                   |   8 +-
 htdocs/ecm/dir_card.php                       |   6 +-
 htdocs/ecm/file_card.php                      |   6 +-
 htdocs/ecm/file_note.php                      |  10 +-
 htdocs/ecm/index.php                          |  10 +-
 htdocs/ecm/index_auto.php                     |   8 +-
 htdocs/ecm/index_medias.php                   |  12 +-
 htdocs/ecm/search.php                         |   8 +-
 .../conferenceorbooth_card.php                |  14 +-
 .../conferenceorbooth_contact.php             |  12 +-
 .../conferenceorbooth_document.php            |   8 +-
 .../conferenceorbooth_list.php                |  24 +-
 .../conferenceorboothattendee_card.php        |  16 +-
 .../conferenceorboothattendee_list.php        |  26 +-
 .../conferenceorboothattendee_note.php        |   2 +-
 .../core/actions_massactions_mail.inc.php     |   2 +-
 htdocs/expedition/ajax/searchfrombarcode.php  |  10 +-
 htdocs/expedition/card.php                    | 116 ++++-----
 htdocs/expedition/contact.php                 |   8 +-
 htdocs/expedition/dispatch.php                |  22 +-
 htdocs/expedition/document.php                |   6 +-
 htdocs/expedition/index.php                   |   2 +-
 htdocs/expedition/list.php                    |  32 +--
 htdocs/expedition/note.php                    |   2 +-
 htdocs/expedition/shipment.php                |  16 +-
 htdocs/expedition/stats/index.php             |   4 +-
 htdocs/expedition/stats/month.php             |   2 +-
 htdocs/expensereport/ajax/ajaxik.php          |   8 +-
 htdocs/expensereport/card.php                 |  62 ++---
 htdocs/expensereport/document.php             |   6 +-
 htdocs/expensereport/index.php                |   8 +-
 htdocs/expensereport/info.php                 |   2 +-
 htdocs/expensereport/list.php                 |  36 +--
 htdocs/expensereport/note.php                 |   4 +-
 htdocs/expensereport/payment/card.php         |   2 +-
 htdocs/expensereport/payment/list.php         |  20 +-
 htdocs/expensereport/payment/payment.php      |   8 +-
 htdocs/expensereport/stats/index.php          |   8 +-
 htdocs/exports/export.php                     |   8 +-
 htdocs/externalsite/frames.php                |   2 +-
 htdocs/fichinter/agenda.php                   |   6 +-
 htdocs/fichinter/card-rec.php                 |  18 +-
 htdocs/fichinter/card.php                     |  68 ++---
 htdocs/fichinter/contact.php                  |   8 +-
 htdocs/fichinter/document.php                 |   6 +-
 htdocs/fichinter/index.php                    |   2 +-
 htdocs/fichinter/list.php                     |  12 +-
 htdocs/fichinter/note.php                     |   2 +-
 htdocs/fichinter/stats/index.php              |   6 +-
 htdocs/fourn/ajax/getSupplierPrices.php       |   2 +-
 htdocs/fourn/card.php                         |   8 +-
 .../fourn/class/fournisseur.facture.class.php |   6 +-
 htdocs/fourn/commande/card.php                |  68 ++---
 htdocs/fourn/commande/contact.php             |   6 +-
 htdocs/fourn/commande/dispatch.php            |  30 +--
 htdocs/fourn/commande/document.php            |   6 +-
 htdocs/fourn/commande/info.php                |   6 +-
 htdocs/fourn/commande/list.php                |  78 +++---
 htdocs/fourn/commande/note.php                |   2 +-
 htdocs/fourn/contact.php                      |   6 +-
 htdocs/fourn/facture/card-rec.php             |  80 +++---
 htdocs/fourn/facture/card.php                 | 162 ++++++------
 htdocs/fourn/facture/contact.php              |   6 +-
 htdocs/fourn/facture/document.php             |   6 +-
 htdocs/fourn/facture/index.php                |   2 +-
 htdocs/fourn/facture/info.php                 |   2 +-
 htdocs/fourn/facture/list-rec.php             |  40 +--
 htdocs/fourn/facture/list.php                 |  42 ++--
 htdocs/fourn/facture/note.php                 |   2 +-
 htdocs/fourn/facture/paiement.php             |   8 +-
 htdocs/fourn/facture/rapport.php              |   6 +-
 htdocs/fourn/index.php                        |   2 +-
 htdocs/fourn/paiement/card.php                |   4 +-
 htdocs/fourn/paiement/document.php            |   6 +-
 htdocs/fourn/paiement/info.php                |   2 +-
 htdocs/fourn/paiement/list.php                |  22 +-
 htdocs/fourn/product/list.php                 |   6 +-
 htdocs/fourn/recap-fourn.php                  |   2 +-
 htdocs/ftp/index.php                          |   4 +-
 htdocs/holiday/card.php                       |  22 +-
 htdocs/holiday/card_group.php                 |  18 +-
 htdocs/holiday/define_holiday.php             |   8 +-
 htdocs/holiday/document.php                   |   6 +-
 htdocs/holiday/info.php                       |   2 +-
 htdocs/holiday/list.php                       |  36 +--
 htdocs/holiday/month_report.php               |  14 +-
 htdocs/holiday/view_log.php                   |  16 +-
 htdocs/hrm/admin/admin_establishment.php      |   2 +-
 htdocs/hrm/establishment/card.php             |  12 +-
 htdocs/hrm/establishment/info.php             |   6 +-
 htdocs/hrm/evaluation_agenda.php              |   6 +-
 htdocs/hrm/evaluation_card.php                |  12 +-
 htdocs/hrm/evaluation_contact.php             |  10 +-
 htdocs/hrm/evaluation_document.php            |   6 +-
 htdocs/hrm/evaluation_list.php                |  20 +-
 htdocs/hrm/evaluation_note.php                |   2 +-
 htdocs/hrm/index.php                          |   2 +-
 htdocs/hrm/job_agenda.php                     |   6 +-
 htdocs/hrm/job_card.php                       |  12 +-
 htdocs/hrm/job_document.php                   |   6 +-
 htdocs/hrm/job_list.php                       |  20 +-
 htdocs/hrm/job_note.php                       |   2 +-
 htdocs/hrm/position.php                       |  20 +-
 htdocs/hrm/position_agenda.php                |   6 +-
 htdocs/hrm/position_card.php                  |  10 +-
 htdocs/hrm/position_document.php              |   6 +-
 htdocs/hrm/position_list.php                  |  20 +-
 htdocs/hrm/position_note.php                  |   2 +-
 htdocs/hrm/skill_agenda.php                   |   6 +-
 htdocs/hrm/skill_card.php                     |  18 +-
 htdocs/hrm/skill_document.php                 |   6 +-
 htdocs/hrm/skill_list.php                     |  20 +-
 htdocs/hrm/skill_note.php                     |   2 +-
 htdocs/hrm/skill_tab.php                      |   4 +-
 htdocs/imports/import.php                     |   6 +-
 htdocs/index.php                              |   4 +-
 .../containers/wrapper.php                    |   4 +-
 .../containers/wrapper.php                    |   4 +-
 .../containers/wrapper.php                    |   4 +-
 .../containers/wrapper.php                    |   4 +-
 .../containers/wrapper.php                    |   4 +-
 .../containers/wrapper.php                    |   4 +-
 htdocs/install/step1.php                      |   2 +-
 htdocs/intracommreport/card.php               |   2 +-
 htdocs/intracommreport/list.php               |  10 +-
 .../knowledgemanagementindex.php              |   2 +-
 .../knowledgerecord_agenda.php                |   8 +-
 .../knowledgerecord_card.php                  |   8 +-
 .../knowledgerecord_contact.php               |  10 +-
 .../knowledgerecord_document.php              |   6 +-
 .../knowledgerecord_list.php                  |  22 +-
 .../knowledgerecord_note.php                  |   2 +-
 htdocs/loan/calcmens.php                      |   4 +-
 htdocs/loan/card.php                          |  22 +-
 htdocs/loan/document.php                      |   6 +-
 htdocs/loan/info.php                          |   4 +-
 htdocs/loan/list.php                          |  12 +-
 htdocs/loan/note.php                          |   2 +-
 htdocs/loan/payment/card.php                  |   2 +-
 htdocs/loan/payment/payment.php               |  15 +-
 htdocs/loan/schedule.php                      |   6 +-
 htdocs/main.inc.php                           |  64 ++---
 htdocs/margin/agentMargins.php                |  18 +-
 htdocs/margin/checkMargins.php                |  12 +-
 htdocs/margin/customerMargins.php             |  26 +-
 htdocs/margin/productMargins.php              |  26 +-
 htdocs/margin/tabs/productMargins.php         |   6 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |   6 +-
 htdocs/master.inc.php                         |   4 +-
 htdocs/modulebuilder/index.php                |  40 +--
 htdocs/mrp/ajax/interface.php                 |   4 +-
 htdocs/mrp/mo_agenda.php                      |   6 +-
 htdocs/mrp/mo_card.php                        |  18 +-
 htdocs/mrp/mo_document.php                    |   6 +-
 htdocs/mrp/mo_list.php                        |  14 +-
 htdocs/mrp/mo_movements.php                   |  20 +-
 htdocs/mrp/mo_note.php                        |   2 +-
 htdocs/mrp/mo_production.php                  |  22 +-
 htdocs/multicurrency/multicurrency_rate.php   |  14 +-
 htdocs/opensurvey/card.php                    |   2 +-
 htdocs/opensurvey/list.php                    |   8 +-
 htdocs/partnership/admin/setup.php            |   2 +-
 htdocs/partnership/partnership_agenda.php     |   8 +-
 htdocs/partnership/partnership_card.php       |  14 +-
 htdocs/partnership/partnership_contact.php    |   8 +-
 htdocs/partnership/partnership_document.php   |   6 +-
 htdocs/partnership/partnership_list.php       |  24 +-
 htdocs/partnership/partnership_note.php       |   2 +-
 htdocs/paybox/admin/paybox.php                |   2 +-
 htdocs/paypal/admin/paypal.php                |   4 +-
 htdocs/product/admin/dynamic_prices.php       |  12 +-
 htdocs/product/agenda.php                     |   6 +-
 htdocs/product/ajax/product_lot.php           |   2 +-
 htdocs/product/ajax/products.php              |  26 +-
 htdocs/product/card.php                       |  72 +++---
 htdocs/product/composition/card.php           |   8 +-
 htdocs/product/document.php                   |   6 +-
 htdocs/product/dynamic_price/editor.php       |   4 +-
 htdocs/product/fournisseurs.php               |  10 +-
 htdocs/product/index.php                      |   2 +-
 .../inventory/ajax/searchfrombarcode.php      |  10 +-
 htdocs/product/inventory/card.php             |   4 +-
 htdocs/product/inventory/inventory.php        |  16 +-
 htdocs/product/inventory/list.php             |  22 +-
 htdocs/product/list.php                       |  28 +--
 htdocs/product/note.php                       |   2 +-
 htdocs/product/popuprop.php                   |   6 +-
 htdocs/product/price.php                      |  42 ++--
 htdocs/product/reassort.php                   |  14 +-
 htdocs/product/reassortlot.php                |  28 +--
 htdocs/product/stats/bom.php                  |   6 +-
 htdocs/product/stats/card.php                 |  16 +-
 htdocs/product/stats/commande.php             |  10 +-
 htdocs/product/stats/commande_fournisseur.php |  10 +-
 htdocs/product/stats/contrat.php              |   6 +-
 htdocs/product/stats/facture.php              |   6 +-
 htdocs/product/stats/facture_fournisseur.php  |  10 +-
 htdocs/product/stats/facturerec.php           |  10 +-
 htdocs/product/stats/mo.php                   |  10 +-
 htdocs/product/stats/propal.php               |  10 +-
 htdocs/product/stats/supplier_proposal.php    |  10 +-
 htdocs/product/stock/card.php                 |  16 +-
 htdocs/product/stock/fiche-valo.php           |   2 +-
 htdocs/product/stock/info.php                 |   2 +-
 htdocs/product/stock/list.php                 |  16 +-
 htdocs/product/stock/massstockmove.php        |  10 +-
 htdocs/product/stock/movement_card.php        |  50 ++--
 htdocs/product/stock/movement_list.php        |  68 ++---
 htdocs/product/stock/product.php              |  48 ++--
 htdocs/product/stock/productlot_card.php      |  26 +-
 htdocs/product/stock/productlot_document.php  |   6 +-
 htdocs/product/stock/productlot_list.php      |  20 +-
 htdocs/product/stock/productlot_note.php      |   2 +-
 htdocs/product/stock/replenish.php            |  22 +-
 htdocs/product/stock/replenishorders.php      |  18 +-
 .../stock/stats/commande_fournisseur.php      |  12 +-
 htdocs/product/stock/stats/expedition.php     |  12 +-
 htdocs/product/stock/stats/mo.php             |  10 +-
 htdocs/product/stock/stats/reception.php      |  12 +-
 htdocs/product/stock/stockatdate.php          |  30 +--
 .../stocktransfer/stocktransfer_agenda.php    |   6 +-
 .../stocktransfer/stocktransfer_card.php      |  20 +-
 .../stocktransfer/stocktransfer_contact.php   |   6 +-
 .../stocktransfer/stocktransfer_document.php  |   6 +-
 .../stocktransfer/stocktransfer_list.php      |  22 +-
 .../stocktransfer/stocktransfer_note.php      |   2 +-
 .../product/stock/tpl/stockcorrection.tpl.php |   6 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |   6 +-
 htdocs/product/stock/valo.php                 |   2 +-
 htdocs/product/traduction.php                 |   4 +-
 htdocs/projet/activity/index.php              |   2 +-
 htdocs/projet/activity/perday.php             |  26 +-
 htdocs/projet/activity/permonth.php           |  26 +-
 htdocs/projet/activity/perweek.php            |  26 +-
 htdocs/projet/admin/website.php               |   4 +-
 htdocs/projet/agenda.php                      |  10 +-
 htdocs/projet/ajax/projects.php               |   6 +-
 htdocs/projet/card.php                        |  30 +--
 htdocs/projet/comment.php                     |   6 +-
 htdocs/projet/contact.php                     |  14 +-
 htdocs/projet/document.php                    |   6 +-
 htdocs/projet/element.php                     |   4 +-
 htdocs/projet/index.php                       |   4 +-
 htdocs/projet/list.php                        |  94 +++----
 htdocs/projet/messaging.php                   |  10 +-
 htdocs/projet/note.php                        |   2 +-
 htdocs/projet/stats/index.php                 |   4 +-
 htdocs/projet/tasks.php                       |  46 ++--
 htdocs/projet/tasks/comment.php               |  10 +-
 htdocs/projet/tasks/contact.php               |  12 +-
 htdocs/projet/tasks/document.php              |   8 +-
 htdocs/projet/tasks/list.php                  |  42 ++--
 htdocs/projet/tasks/note.php                  |   4 +-
 htdocs/projet/tasks/stats/index.php           |   4 +-
 htdocs/projet/tasks/task.php                  |  12 +-
 htdocs/projet/tasks/time.php                  | 162 ++++++------
 htdocs/public/agenda/agendaexport.php         |  26 +-
 htdocs/public/bookcal/bookcalAjax.php         |   4 +-
 htdocs/public/bookcal/index.php               |  22 +-
 htdocs/public/company/new.php                 |   2 +-
 htdocs/public/demo/index.php                  |  10 +-
 .../public/eventorganization/attendee_new.php |   4 +-
 .../eventorganization/subscriptionok.php      |   2 +-
 htdocs/public/members/new.php                 |   6 +-
 htdocs/public/members/public_card.php         |   2 +-
 htdocs/public/members/public_list.php         |   4 +-
 htdocs/public/opensurvey/index.php            |   6 +-
 htdocs/public/opensurvey/studs.php            |   2 +-
 htdocs/public/partnership/new.php             |   8 +-
 htdocs/public/payment/newpayment.php          |  32 +--
 htdocs/public/payment/paymentok.php           |   2 +-
 htdocs/public/project/index.php               |   4 +-
 htdocs/public/project/new.php                 |   2 +-
 htdocs/public/project/suggestbooth.php        |   8 +-
 htdocs/public/project/suggestconference.php   |   8 +-
 htdocs/public/project/viewandvote.php         |   2 +-
 htdocs/public/recruitment/index.php           |   6 +-
 htdocs/public/ticket/ajax/ajax.php            |   2 +-
 htdocs/public/ticket/create_ticket.php        |   6 +-
 htdocs/public/ticket/list.php                 |   6 +-
 htdocs/public/users/view.php                  |   2 +-
 htdocs/public/website/javascript.js.php       |   2 +-
 htdocs/public/website/styles.css.php          |   2 +-
 htdocs/reception/card.php                     | 114 ++++-----
 htdocs/reception/contact.php                  |   8 +-
 htdocs/reception/dispatch.php                 |  26 +-
 htdocs/reception/document.php                 |   6 +-
 htdocs/reception/list.php                     |  44 ++--
 htdocs/reception/note.php                     |   2 +-
 htdocs/reception/stats/index.php              |   4 +-
 htdocs/reception/stats/month.php              |   8 +-
 htdocs/recruitment/index.php                  |   2 +-
 .../recruitmentcandidature_agenda.php         |   8 +-
 .../recruitmentcandidature_card.php           |  14 +-
 .../recruitmentcandidature_document.php       |   6 +-
 .../recruitmentcandidature_list.php           |  16 +-
 .../recruitmentcandidature_note.php           |   2 +-
 .../recruitmentjobposition_agenda.php         |   6 +-
 .../recruitmentjobposition_applications.php   |   6 +-
 .../recruitmentjobposition_card.php           |  12 +-
 .../recruitmentjobposition_document.php       |   6 +-
 .../recruitmentjobposition_list.php           |  14 +-
 .../recruitmentjobposition_note.php           |   2 +-
 htdocs/resource/agenda.php                    |   6 +-
 htdocs/resource/contact.php                   |   8 +-
 htdocs/resource/document.php                  |   6 +-
 htdocs/resource/element_resource.php          |  14 +-
 htdocs/resource/list.php                      |  14 +-
 htdocs/resource/note.php                      |   2 +-
 htdocs/salaries/ajax/ajaxsalaries.php         |   4 +-
 htdocs/salaries/card.php                      |  48 ++--
 htdocs/salaries/document.php                  |   8 +-
 htdocs/salaries/info.php                      |   6 +-
 htdocs/salaries/list.php                      |  30 +--
 htdocs/salaries/paiement_salary.php           |  14 +-
 htdocs/salaries/payment_salary/card.php       |   4 +-
 htdocs/salaries/payments.php                  |  40 +--
 htdocs/salaries/stats/index.php               |   8 +-
 htdocs/salaries/virement_request.php          |   8 +-
 htdocs/societe/admin/societe.php              |  20 +-
 htdocs/societe/agenda.php                     |   6 +-
 htdocs/societe/ajax/ajaxcompanies.php         |   6 +-
 htdocs/societe/ajax/company.php               |   4 +-
 htdocs/societe/card.php                       | 114 ++++-----
 htdocs/societe/consumption.php                |  10 +-
 htdocs/societe/contact.php                    |   2 +-
 htdocs/societe/document.php                   |   6 +-
 htdocs/societe/index.php                      |   6 +-
 htdocs/societe/list.php                       |  52 ++--
 htdocs/societe/messaging.php                  |   6 +-
 htdocs/societe/note.php                       |   2 +-
 htdocs/societe/notify/card.php                |  10 +-
 htdocs/societe/paymentmodes.php               |  34 +--
 htdocs/societe/price.php                      |  24 +-
 htdocs/societe/project.php                    |   4 +-
 htdocs/societe/societecontact.php             |  12 +-
 htdocs/societe/website.php                    |  10 +-
 htdocs/stripe/admin/stripe.php                |   8 +-
 htdocs/stripe/ajax/ajax.php                   |   4 +-
 htdocs/stripe/charge.php                      |   6 +-
 htdocs/stripe/payout.php                      |   6 +-
 htdocs/stripe/transaction.php                 |   6 +-
 htdocs/supplier_proposal/card.php             |  48 ++--
 htdocs/supplier_proposal/contact.php          |   6 +-
 htdocs/supplier_proposal/document.php         |   6 +-
 htdocs/supplier_proposal/index.php            |   2 +-
 htdocs/supplier_proposal/info.php             |   4 +-
 htdocs/supplier_proposal/list.php             |  44 ++--
 htdocs/supplier_proposal/note.php             |   2 +-
 htdocs/takepos/admin/orderprinters.php        |   2 +-
 htdocs/takepos/admin/printqr.php              |   2 +-
 htdocs/takepos/admin/terminal.php             |   4 +-
 htdocs/takepos/ajax/ajax.php                  |  12 +-
 htdocs/takepos/floors.php                     |   4 +-
 htdocs/takepos/freezone.php                   |   2 +-
 htdocs/takepos/genimg/index.php               |   6 +-
 htdocs/takepos/index.php                      |   2 +-
 htdocs/takepos/invoice.php                    |   2 +-
 htdocs/takepos/pay.php                        |   2 +-
 htdocs/takepos/phone.php                      |   8 +-
 htdocs/takepos/printbox.php                   |   2 +-
 htdocs/takepos/receipt.php                    |   6 +-
 htdocs/takepos/reduction.php                  |   2 +-
 htdocs/takepos/send.php                       |   2 +-
 htdocs/takepos/split.php                      |   4 +-
 htdocs/theme/eldy/info-box.inc.php            |   2 +-
 htdocs/theme/eldy/style.css.php               |   2 +-
 htdocs/theme/md/info-box.inc.php              |   4 +-
 htdocs/theme/md/style.css.php                 |   2 +-
 htdocs/ticket/agenda.php                      |  14 +-
 htdocs/ticket/card.php                        |  58 ++---
 htdocs/ticket/class/ticket.class.php          |   2 +-
 htdocs/ticket/contact.php                     |  16 +-
 htdocs/ticket/document.php                    |  12 +-
 htdocs/ticket/index.php                       |   8 +-
 htdocs/ticket/list.php                        |  44 ++--
 htdocs/ticket/messaging.php                   |  14 +-
 htdocs/ticket/stats/index.php                 |   6 +-
 htdocs/user/agenda.php                        |   6 +-
 htdocs/user/agenda_extsites.php               |   2 +-
 htdocs/user/bank.php                          |  12 +-
 htdocs/user/card.php                          |  48 ++--
 htdocs/user/clicktodial.php                   |   2 +-
 htdocs/user/document.php                      |   6 +-
 htdocs/user/group/card.php                    |   6 +-
 htdocs/user/group/ldap.php                    |   2 +-
 htdocs/user/group/list.php                    |  14 +-
 htdocs/user/group/perms.php                   |   8 +-
 htdocs/user/hierarchy.php                     |   4 +-
 htdocs/user/home.php                          |   4 +-
 htdocs/user/ldap.php                          |   2 +-
 htdocs/user/list.php                          |  18 +-
 htdocs/user/messaging.php                     |   4 +-
 htdocs/user/note.php                          |   2 +-
 htdocs/user/notify/card.php                   |  10 +-
 htdocs/user/param_ihm.php                     |   4 +-
 htdocs/user/passwordforgotten.php             |   6 +-
 htdocs/user/perms.php                         |   8 +-
 htdocs/user/vcard.php                         |   2 +-
 htdocs/user/virtualcard.php                   |   2 +-
 htdocs/variants/ajax/getCombinations.php      |   2 +-
 htdocs/variants/ajax/get_attribute_values.php |   2 +-
 htdocs/variants/card.php                      |   6 +-
 htdocs/variants/combinations.php              |  10 +-
 htdocs/variants/list.php                      |  20 +-
 htdocs/viewimage.php                          |   2 +-
 htdocs/webhook/target_card.php                |  12 +-
 htdocs/webhook/target_list.php                |  14 +-
 .../class/html.formcardwebportal.class.php    |   6 +-
 .../class/html.formlistwebportal.class.php    |  12 +-
 .../controllers/document.controller.class.php |   4 +-
 htdocs/website/index.php                      |  56 ++---
 htdocs/website/samples/wrapper.php            |   4 +-
 htdocs/website/websiteaccount_card.php        |   2 +-
 htdocs/workstation/workstation_agenda.php     |   6 +-
 htdocs/workstation/workstation_card.php       |   2 +-
 htdocs/workstation/workstation_document.php   |   6 +-
 htdocs/workstation/workstation_list.php       |  22 +-
 htdocs/workstation/workstation_note.php       |   2 +-
 827 files changed, 5130 insertions(+), 5136 deletions(-)

diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index d0ebf648c39..5ddee3b9244 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -28,7 +28,7 @@
 					$tmpprojtime = $element->getSumOfAmount($idofelementuser ? $elementuser : '', $dates, $datee); // $element is a task. $elementuser may be empty
 					$typea = ($data[$j]->typea == 'birth') ? $picb : $pice;
 					//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
-					GETPOST("mouvement", 'int'),
+					GETPOSTINT("mouvement"),
 					dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." from=".$overview[0]->from." to=".$overview[0]->to." subject=".$overview[0]->subject);
 					if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
 					jQuery("#mouvement option").removeAttr("selected").change();
@@ -59,20 +59,19 @@
 				$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
 				//si les reponses ne concerne pas la colonne effacée, on concatenate
-				GETPOST("mouvement", "int"),
 				GETPOST("mouvement", 'alpha'),
-				GETPOST("mouvement", 'int'),
+				GETPOSTINT("mouvement"),
 				foreach ($TWeek as $weekIndex => $weekNb) {
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
 				if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr("disabled");
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
 				print '<td class="center">'.dol_print_date($link->datea, "dayhour", "tzuser").'</td>';
 			$action = 'transfert';
-			$date_com = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			$date_com = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 			$date_next_execution = (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
-			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 12);
-			$datesubscription = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", "int"), GETPOST("reyear", "int"));
+			$datee = dol_get_last_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 12);
+			$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 			$ensemblereponses = $obj->reponses;
 			$object->datee = $datee;
 			$object->periode = $dateperiod;
@@ -114,20 +113,17 @@
 		$cle_rib = strtolower(checkES($rib, $CCC));
 		$date_com = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
-		$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		$datesubscription = dol_mktime(0, 0, 0, GETPOST("remonth", "int"), GETPOST("reday", "int"), GETPOST("reyear", "int"));
+		$datefrom = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
+		$datesubscription = dol_mktime(0, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 		$datetouse = ($this->date_end > 0) ? $this->date_end : ((isset($this->datee) && $this->datee > 0) ? $this->datee : 0);
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
 		$ensemblereponses = $obj->reponses;
 		$head[$h][1] = $langs->trans("Referers");
 		$head[$tab][1] = $langs->trans("Referers");
 		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT) : '')."<br>\n";
-		$reday = GETPOST('reday', 'int');
 		$reday = GETPOSTINT('reday');
 		$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_modification, p.budget_amount";
-		$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  = '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_modification, p.budget_amount';
-		$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 .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
@@ -187,11 +183,10 @@
 	$datee = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
 	$datee = dol_stringtotime($dateerfc);
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
-	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", "int"), GETPOST("reday", "int"), GETPOST("reyear", "int"));
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'), 'tzuserrel');
+	$datepaid = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
+	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
+	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
+	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"), 'tzuserrel');
 	$ensemblereponses = $obj->reponses;
 	$head[$h][1] = $langs->trans('Referers');
 	$morewherefilterarray[] = " t.datee <= '".$db->idate($search_date_end_end)."'";
@@ -238,8 +233,8 @@
 	foreach ($TWeek as $week_number) {
 	if (!empty($arrayfields['t.datee']['checked'])) {
 	if ($action == "transfert") {
-	if (GETPOST("reyear", "int") && GETPOST("remonth", "int") && GETPOST("reday", "int")) {
 	if (GETPOST('reday')) {
+	if (GETPOSTINT("reyear") && GETPOSTINT("remonth") && GETPOSTINT("reday")) {
 	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
 	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
@@ -299,9 +294,7 @@ $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.
 $sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode, cs.fk_account,";
 $sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total, cs.paye,";
 $sql .= " p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_modification, p.budget_amount,";
-$sql .= " p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount,";
 $sql .= " t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_modification,";
-$sql .= " t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_update,";
 $sql .= dolSqlDateFilter('p.datee', $search_eday, $search_emonth, $search_eyear);
 $sql = "SELECT ".$distinct." p.rowid as projectid, p.ref as projectref, p.title as projecttitle, p.fk_statut as projectstatus, p.datee as projectdatee, p.fk_opp_status, p.public, p.fk_user_creat as projectusercreate, p.usage_bill_time,";
 $sql = "SELECT id_users, nom as name, id_sondage, reponses";
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 5fff15480e0..f02c1e9f555 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -35,8 +35,8 @@ $langs->loadLangs(array('accountancy', 'admin', 'bills', 'compta', 'salaries'));
 
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
+$id = GETPOSTINT('id');
+$rowid = GETPOSTINT('rowid');
 $massaction = GETPOST('massaction', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
@@ -49,10 +49,10 @@ $search_accountparent = GETPOST('search_accountparent', 'alpha');
 $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
 $search_import_key = GETPOST('search_import_key', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $confirm = GETPOST('confirm', 'alpha');
 
-$chartofaccounts = GETPOST('chartofaccounts', 'int');
+$chartofaccounts = GETPOSTINT('chartofaccounts');
 
 $permissiontoadd = $user->hasRight('accounting', 'chartofaccount');
 $permissiontodelete = $user->hasRight('accounting', 'chartofaccount');
@@ -66,10 +66,10 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -147,8 +147,8 @@ if (empty($reshook)) {
 		$search_import_key = "";
 		$search_array_options = array();
 	}
-	if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0)	// explicit click on button 'Change and load' with js on
-		|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != getDolGlobalInt('CHARTOFACCOUNTS'))) {	// a submit of form is done and chartofaccounts combo has been modified
+	if ((GETPOSTINT('valid_change_chart') && GETPOSTINT('chartofaccounts') > 0)	// explicit click on button 'Change and load' with js on
+		|| (GETPOSTINT('chartofaccounts') > 0 && GETPOSTINT('chartofaccounts') != getDolGlobalInt('CHARTOFACCOUNTS'))) {	// a submit of form is done and chartofaccounts combo has been modified
 		$error = 0;
 
 		if ($chartofaccounts > 0 && $permissiontoadd) {
@@ -200,7 +200,7 @@ if (empty($reshook)) {
 
 	if ($action == 'disable' && $permissiontoadd) {
 		if ($accounting->fetch($id)) {
-			$mode = GETPOST('mode', 'int');
+			$mode = GETPOSTINT('mode');
 			$result = $accounting->accountDeactivate($id, $mode);
 		}
 
@@ -210,7 +210,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'enable' && $permissiontoadd) {
 		if ($accounting->fetch($id)) {
-			$mode = GETPOST('mode', 'int');
+			$mode = GETPOSTINT('mode');
 			$result = $accounting->accountActivate($id, $mode);
 		}
 		$action = 'update';
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 6035188be5d..1ba824eb86e 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -59,12 +59,12 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
+$listlimit = GETPOSTINT('listlimit') > 0 ? GETPOSTINT('listlimit') : 1000;
 $active = 1;
 
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -72,7 +72,7 @@ $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$search_country_id = GETPOST('search_country_id', 'int');
+$search_country_id = GETPOSTINT('search_country_id');
 
 
 // Security check
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 125261bdd8f..e4fde3aec38 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -37,9 +37,9 @@ $langs->loadLangs(array('accountancy', 'bills', 'compta'));
 
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$rowid = GETPOST('rowid', 'int');
+$rowid = GETPOSTINT('rowid');
 $cancel = GETPOST('cancel', 'alpha');
 
 $account_number = GETPOST('account_number', 'alphanohtml');
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index fbf21b04f56..131886d76f9 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -34,22 +34,22 @@ $error = 0;
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "accountancy", "compta"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $cancel = GETPOST('cancel', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cat_id = GETPOST('account_category', 'int');
+$cat_id = GETPOSTINT('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
-$cpt_id = GETPOST('cptid', 'int');
+$cpt_id = GETPOSTINT('cptid');
 
 if ($cat_id == 0) {
 	$cat_id = null;
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 7306dae94a6..7761efd6145 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -53,11 +53,11 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
+$listlimit = GETPOSTINT('listlimit') > 0 ? GETPOSTINT('listlimit') : 1000;
 
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -66,7 +66,7 @@ $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$search_country_id = GETPOST('search_country_id', 'int');
+$search_country_id = GETPOSTINT('search_country_id');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
@@ -472,7 +472,7 @@ if (GETPOST('from', 'alpha')) {
 	$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
 }
 if ($listlimit) {
-	$paramwithsearch .= '&listlimit='.urlencode(GETPOST('listlimit', 'int'));
+	$paramwithsearch .= '&listlimit='.urlencode(GETPOSTINT('listlimit'));
 }
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -977,7 +977,7 @@ function fieldListAccountingCategories($fieldlist, $obj = null, $tabname = '', $
 			$fieldname = 'country';
 			if ($context == 'add') {
 				$fieldname = 'country_id';
-				$preselectcountrycode = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : $mysoc->country_code;
+				$preselectcountrycode = GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : $mysoc->country_code;
 				print $form->select_country($preselectcountrycode, $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			} else {
 				$preselectcountrycode = (empty($obj->country_code) ? (empty($obj->country) ? $mysoc->country_code : $obj->country) : $obj->country_code);
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 3eace908373..65a447811cc 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -143,13 +143,13 @@ if ($action == 'update') {
 	}
 
 	$constname = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT';
-	$constvalue = GETPOST($constname, 'int');
+	$constvalue = GETPOSTINT($constname);
 	if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 		$error++;
 	}
 
 	$constname = 'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT';
-	$constvalue = GETPOST($constname, 'int');
+	$constvalue = GETPOSTINT($constname);
 	if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 		$error++;
 	}
@@ -163,7 +163,7 @@ if ($action == 'update') {
 }
 
 if ($action == 'setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT') {
-	$setDisableAuxiliaryAccountOnCustomerDeposit = GETPOST('value', 'int');
+	$setDisableAuxiliaryAccountOnCustomerDeposit = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT", $setDisableAuxiliaryAccountOnCustomerDeposit, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -177,7 +177,7 @@ if ($action == 'setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT') {
 }
 
 if ($action == 'setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT') {
-	$setDisableAuxiliaryAccountOnSupplierDeposit = GETPOST('value', 'int');
+	$setDisableAuxiliaryAccountOnSupplierDeposit = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT", $setDisableAuxiliaryAccountOnSupplierDeposit, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 902b184a48c..8a0d6764590 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -84,7 +84,7 @@ $model_option = array(
 if ($action == 'update') {
 	$error = 0;
 
-	$modelcsv = GETPOST('ACCOUNTING_EXPORT_MODELCSV', 'int');
+	$modelcsv = GETPOSTINT('ACCOUNTING_EXPORT_MODELCSV');
 
 	if (!empty($modelcsv)) {
 		if (!dolibarr_set_const($db, 'ACCOUNTING_EXPORT_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) {
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index cb142948096..8f2aff9a587 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 477fac08eee..e6408d33ab6 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $langs->loadLangs(array("admin", "compta"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $action = GETPOST('action', 'aZ09');
@@ -70,8 +70,8 @@ foreach ($tmpstatus2label as $key => $val) {
 	$status2label[$key] = $langs->trans($val);
 }
 
-$date_start = dol_mktime(0, 0, 0, GETPOST('fiscalyearmonth', 'int'), GETPOST('fiscalyearday', 'int'), GETPOST('fiscalyearyear', 'int'));
-$date_end = dol_mktime(0, 0, 0, GETPOST('fiscalyearendmonth', 'int'), GETPOST('fiscalyearendday', 'int'), GETPOST('fiscalyearendyear', 'int'));
+$date_start = dol_mktime(0, 0, 0, GETPOSTINT('fiscalyearmonth'), GETPOSTINT('fiscalyearday'), GETPOSTINT('fiscalyearyear'));
+$date_end = dol_mktime(0, 0, 0, GETPOSTINT('fiscalyearendmonth'), GETPOSTINT('fiscalyearendday'), GETPOSTINT('fiscalyearendyear'));
 
 $permissiontoadd = $user->hasRight('accounting', 'fiscalyear', 'write');
 
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index 39754c0345d..f1ad54d9bb9 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -38,7 +38,7 @@ if (!$user->hasRight('accounting', 'fiscalyear', 'write')) {
 	accessforbidden();
 }
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 
 // View
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index ea93f6751fa..748b55ed733 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -45,7 +45,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 
 $action = GETPOST('action', 'aZ09');
 
-$nbletter = GETPOST('ACCOUNTING_LETTERING_NBLETTERS', 'int');
+$nbletter = GETPOSTINT('ACCOUNTING_LETTERING_NBLETTERS');
 
 // Parameters ACCOUNTING_* and others
 $list = array(
@@ -70,7 +70,7 @@ $error = 0;
 
 if (in_array($action, array('setBANK_DISABLE_DIRECT_INPUT', 'setACCOUNTANCY_COMBO_FOR_AUX', 'setACCOUNTING_MANAGE_ZERO'))) {
 	$constname = preg_replace('/^set/', '', $action);
-	$constvalue = GETPOST('value', 'int');
+	$constvalue = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, $constname, $constvalue, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -102,7 +102,7 @@ if ($action == 'update') {
 			$constvalue = GETPOST($constname, 'alpha');
 
 			if ($constname == 'ACCOUNTING_DATE_START_BINDING') {
-				$constvalue = dol_mktime(0, 0, 0, GETPOST($constname.'month', 'int'), GETPOST($constname.'day', 'int'), GETPOST($constname.'year', 'int'));
+				$constvalue = dol_mktime(0, 0, 0, GETPOSTINT($constname.'month'), GETPOSTINT($constname.'day'), GETPOSTINT($constname.'year'));
 			}
 
 			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -128,7 +128,7 @@ if ($action == 'update') {
 }
 
 if ($action == 'setmanagezero') {
-	$setmanagezero = GETPOST('value', 'int');
+	$setmanagezero = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -142,7 +142,7 @@ if ($action == 'setmanagezero') {
 }
 
 if ($action == 'setdisabledirectinput') {
-	$setdisabledirectinput = GETPOST('value', 'int');
+	$setdisabledirectinput = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -156,7 +156,7 @@ if ($action == 'setdisabledirectinput') {
 }
 
 if ($action == 'setenabledraftexport') {
-	$setenabledraftexport = GETPOST('value', 'int');
+	$setenabledraftexport = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL", $setenabledraftexport, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -170,7 +170,7 @@ if ($action == 'setenabledraftexport') {
 }
 
 if ($action == 'setenablesubsidiarylist') {
-	$setenablesubsidiarylist = GETPOST('value', 'int');
+	$setenablesubsidiarylist = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -184,7 +184,7 @@ if ($action == 'setenablesubsidiarylist') {
 }
 
 if ($action == 'setdisablebindingonsales') {
-	$setdisablebindingonsales = GETPOST('value', 'int');
+	$setdisablebindingonsales = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -198,7 +198,7 @@ if ($action == 'setdisablebindingonsales') {
 }
 
 if ($action == 'setdisablebindingonpurchases') {
-	$setdisablebindingonpurchases = GETPOST('value', 'int');
+	$setdisablebindingonpurchases = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -212,7 +212,7 @@ if ($action == 'setdisablebindingonpurchases') {
 }
 
 if ($action == 'setdisablebindingonexpensereports') {
-	$setdisablebindingonexpensereports = GETPOST('value', 'int');
+	$setdisablebindingonexpensereports = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -226,7 +226,7 @@ if ($action == 'setdisablebindingonexpensereports') {
 }
 
 if ($action == 'setenablelettering') {
-	$setenablelettering = GETPOST('value', 'int');
+	$setenablelettering = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_LETTERING", $setenablelettering, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -240,7 +240,7 @@ if ($action == 'setenablelettering') {
 }
 
 if ($action == 'setenableautolettering') {
-	$setenableautolettering = GETPOST('value', 'int');
+	$setenableautolettering = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_AUTOLETTERING", $setenableautolettering, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -254,7 +254,7 @@ if ($action == 'setenableautolettering') {
 }
 
 if ($action == 'setenablevatreversecharge') {
-	$setenablevatreversecharge = GETPOST('value', 'int');
+	$setenablevatreversecharge = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE", $setenablevatreversecharge, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 6f001eec6e5..1df04810801 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -56,12 +56,12 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
+$listlimit = GETPOSTINT('listlimit') > 0 ? GETPOSTINT('listlimit') : 1000;
 $active = 1;
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -77,7 +77,7 @@ if (empty($sortorder)) {
 
 $error = 0;
 
-$search_country_id = GETPOST('search_country_id', 'int');
+$search_country_id = GETPOSTINT('search_country_id');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 66b120cf1d5..aa4c4a3eb00 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -57,13 +57,13 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $codeventil_buy = GETPOST('codeventil_buy', 'array');
 $codeventil_sell = GETPOST('codeventil_sell', 'array');
 $chk_prod = GETPOST('chk_prod', 'array');
-$default_account = GETPOST('default_account', 'int');
+$default_account = GETPOSTINT('default_account');
 $account_number_buy = GETPOST('account_number_buy');
 $account_number_sell = GETPOST('account_number_sell');
 $changeaccount = GETPOST('changeaccount', 'array');
 $changeaccount_buy = GETPOST('changeaccount_buy', 'array');
 $changeaccount_sell = GETPOST('changeaccount_sell', 'array');
-$searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'int') ? GETPOST('search_category_product_operator', 'int') : 0);
+$searchCategoryProductOperator = (GETPOSTINT('search_category_product_operator') ? GETPOSTINT('search_category_product_operator') : 0);
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -84,10 +84,10 @@ if (empty($accounting_product_mode)) {
 	$accounting_product_mode = 'ACCOUNTANCY_SELL';
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalInt('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalInt('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index fb9a61e36d0..b048663e405 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -35,8 +35,8 @@ $langs->loadLangs(array("accountancy", "admin", "bills", "compta", "errors", "hr
 $mesg = '';
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
+$id = GETPOSTINT('id');
+$rowid = GETPOSTINT('rowid');
 $massaction = GETPOST('massaction', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
@@ -44,7 +44,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'ac
 
 $search_subaccount = GETPOST('search_subaccount', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$search_type = GETPOST('search_type', 'int');
+$search_type = GETPOSTINT('search_type');
 
 // Security check
 if ($user->socid > 0) {
@@ -55,10 +55,10 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index dfbe2a06cff..b04e3f644e2 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -50,8 +50,8 @@ if ($type == 'sub') {
 }
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
 $show_subgroup = GETPOST('show_subgroup', 'alpha');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+$search_date_start = dol_mktime(0, 0, 0, GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
+$search_date_end = dol_mktime(23, 59, 59, GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 $search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
@@ -64,10 +64,10 @@ if ($search_accountancy_code_end == - 1) {
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -161,15 +161,15 @@ if (empty($reshook)) {
 
 	if (!empty($search_date_start)) {
 		$filter['t.doc_date>='] = $search_date_start;
-		$param .= '&date_startmonth=' . GETPOST('date_startmonth', 'int') . '&date_startday=' . GETPOST('date_startday', 'int') . '&date_startyear=' . GETPOST('date_startyear', 'int');
+		$param .= '&date_startmonth=' . GETPOSTINT('date_startmonth') . '&date_startday=' . GETPOSTINT('date_startday') . '&date_startyear=' . GETPOSTINT('date_startyear');
 	}
 	if (!empty($search_date_end)) {
 		$filter['t.doc_date<='] = $search_date_end;
-		$param .= '&date_endmonth=' . GETPOST('date_endmonth', 'int') . '&date_endday=' . GETPOST('date_endday', 'int') . '&date_endyear=' . GETPOST('date_endyear', 'int');
+		$param .= '&date_endmonth=' . GETPOSTINT('date_endmonth') . '&date_endday=' . GETPOSTINT('date_endday') . '&date_endyear=' . GETPOSTINT('date_endyear');
 	}
 	if (!empty($search_doc_date)) {
 		$filter['t.doc_date'] = $search_doc_date;
-		$param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+		$param .= '&doc_datemonth=' . GETPOSTINT('doc_datemonth') . '&doc_dateday=' . GETPOSTINT('doc_dateday') . '&doc_dateyear=' . GETPOSTINT('doc_dateyear');
 	}
 	if (!empty($search_accountancy_code_start)) {
 		if ($type == 'sub') {
@@ -587,20 +587,20 @@ if ($action != 'export_csv') {
 			if ($line->subledger_account) {
 				$urlzoom = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&search_accountancy_code_start=' . urlencode($line->subledger_account) . '&search_accountancy_code_end=' . urlencode($line->subledger_account);
 				if (GETPOSTISSET('date_startmonth')) {
-					$urlzoom .= '&search_date_startmonth=' . GETPOST('date_startmonth', 'int') . '&search_date_startday=' . GETPOST('date_startday', 'int') . '&search_date_startyear=' . GETPOST('date_startyear', 'int');
+					$urlzoom .= '&search_date_startmonth=' . GETPOSTINT('date_startmonth') . '&search_date_startday=' . GETPOSTINT('date_startday') . '&search_date_startyear=' . GETPOSTINT('date_startyear');
 				}
 				if (GETPOSTISSET('date_endmonth')) {
-					$urlzoom .= '&search_date_endmonth=' . GETPOST('date_endmonth', 'int') . '&search_date_endday=' . GETPOST('date_endday', 'int') . '&search_date_endyear=' . GETPOST('date_endyear', 'int');
+					$urlzoom .= '&search_date_endmonth=' . GETPOSTINT('date_endmonth') . '&search_date_endday=' . GETPOSTINT('date_endday') . '&search_date_endyear=' . GETPOSTINT('date_endyear');
 				}
 			}
 		} else {
 			if ($line->numero_compte) {
 				$urlzoom = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . urlencode($line->numero_compte) . '&search_accountancy_code_end=' . urlencode($line->numero_compte);
 				if (GETPOSTISSET('date_startmonth')) {
-					$urlzoom .= '&search_date_startmonth=' . GETPOST('date_startmonth', 'int') . '&search_date_startday=' . GETPOST('date_startday', 'int') . '&search_date_startyear=' . GETPOST('date_startyear', 'int');
+					$urlzoom .= '&search_date_startmonth=' . GETPOSTINT('date_startmonth') . '&search_date_startday=' . GETPOSTINT('date_startday') . '&search_date_startyear=' . GETPOSTINT('date_startyear');
 				}
 				if (GETPOSTISSET('date_endmonth')) {
-					$urlzoom .= '&search_date_endmonth=' . GETPOST('date_endmonth', 'int') . '&search_date_endday=' . GETPOST('date_endday', 'int') . '&search_date_endyear=' . GETPOST('date_endyear', 'int');
+					$urlzoom .= '&search_date_endmonth=' . GETPOSTINT('date_endmonth') . '&search_date_endday=' . GETPOSTINT('date_endday') . '&search_date_endyear=' . GETPOSTINT('date_endyear');
 				}
 			}
 		}
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 4fa8ff92697..444cb44d104 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -250,7 +250,7 @@ if ($action == "confirm_update") {
 		$object->label_compte = '';
 		$object->debit = 0;
 		$object->credit = 0;
-		$object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+		$object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
 		$object->doc_type = GETPOST('doc_type', 'alpha');
 		$object->piece_num = GETPOSTINT('next_num_mvt');
 		$object->doc_ref = GETPOST('doc_ref', 'alpha');
@@ -276,7 +276,7 @@ if ($action == "confirm_update") {
 }
 
 if ($action == 'setdate') {
-	$datedoc = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+	$datedoc = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
 	$result = $object->updateByMvt($piece_num, 'doc_date', $db->idate($datedoc), $mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index f6d4f4bfd30..b2d205f74eb 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -43,55 +43,55 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy", "compta"));
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
-$search_mvt_num = GETPOST('search_mvt_num', 'int');
+$search_mvt_num = GETPOSTINT('search_mvt_num');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-$search_date_startyear =  GETPOST('search_date_startyear', 'int');
-$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
-$search_date_startday =  GETPOST('search_date_startday', 'int');
-$search_date_endyear =  GETPOST('search_date_endyear', 'int');
-$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
-$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_startyear =  GETPOSTINT('search_date_startyear');
+$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
+$search_date_startday =  GETPOSTINT('search_date_startday');
+$search_date_endyear =  GETPOSTINT('search_date_endyear');
+$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
+$search_date_endday =  GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-$search_date_creation_startyear =  GETPOST('search_date_creation_startyear', 'int');
-$search_date_creation_startmonth =  GETPOST('search_date_creation_startmonth', 'int');
-$search_date_creation_startday =  GETPOST('search_date_creation_startday', 'int');
-$search_date_creation_endyear =  GETPOST('search_date_creation_endyear', 'int');
-$search_date_creation_endmonth =  GETPOST('search_date_creation_endmonth', 'int');
-$search_date_creation_endday =  GETPOST('search_date_creation_endday', 'int');
+$search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
+$search_date_creation_startyear =  GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startmonth =  GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startday =  GETPOSTINT('search_date_creation_startday');
+$search_date_creation_endyear =  GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endmonth =  GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endday =  GETPOSTINT('search_date_creation_endday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);
-$search_date_modification_startyear =  GETPOST('search_date_modification_startyear', 'int');
-$search_date_modification_startmonth =  GETPOST('search_date_modification_startmonth', 'int');
-$search_date_modification_startday =  GETPOST('search_date_modification_startday', 'int');
-$search_date_modification_endyear =  GETPOST('search_date_modification_endyear', 'int');
-$search_date_modification_endmonth =  GETPOST('search_date_modification_endmonth', 'int');
-$search_date_modification_endday =  GETPOST('search_date_modification_endday', 'int');
+$search_date_modification_startyear =  GETPOSTINT('search_date_modification_startyear');
+$search_date_modification_startmonth =  GETPOSTINT('search_date_modification_startmonth');
+$search_date_modification_startday =  GETPOSTINT('search_date_modification_startday');
+$search_date_modification_endyear =  GETPOSTINT('search_date_modification_endyear');
+$search_date_modification_endmonth =  GETPOSTINT('search_date_modification_endmonth');
+$search_date_modification_endday =  GETPOSTINT('search_date_modification_endday');
 $search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear);
 $search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear);
-$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
-$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
-$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
-$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
-$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
-$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
-$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
-$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
-$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
-$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
-$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
@@ -104,7 +104,7 @@ if (GETPOST("button_export_file_x") || GETPOST("button_export_file.x") || GETPOS
 	$action = 'export_file';
 }
 
-$search_account_category = GETPOST('search_account_category', 'int');
+$search_account_category = GETPOSTINT('search_account_category');
 
 $search_accountancy_code = GETPOST("search_accountancy_code", 'alpha');
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -134,11 +134,11 @@ $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -159,7 +159,7 @@ $hookmanager->initHooks(array('bookkeepingexport'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->hasRight('accounting', 'mouvements', 'export')) {
+if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOSTINT('page') == '' && !GETPOSTINT('noreset') && $user->hasRight('accounting', 'mouvements', 'export')) {
 	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values') && !GETPOST('search_accountancy_code_start')) {
 		$query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 		$query .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1";
@@ -459,7 +459,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setreexport') {
-		$setreexport = GETPOST('value', 'int');
+		$setreexport = GETPOSTINT('value');
 		if (!dolibarr_set_const($db, "ACCOUNTING_REEXPORT", $setreexport, 'yesno', 0, '', $conf->entity)) {
 			$error++;
 		}
@@ -614,7 +614,7 @@ if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-		$formatexport = GETPOST('formatexport', 'int');
+		$formatexport = GETPOSTINT('formatexport');
 		$notexportlettering = GETPOST('notexportlettering', 'alpha');
 
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 990d6e288c0..2c62409c4ae 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 // Get Parameters
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // action+display Parameters
 $action = GETPOST('action', 'aZ09');
@@ -53,53 +53,53 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
 
 // Search Parameters
-$search_mvt_num = GETPOST('search_mvt_num', 'int');
+$search_mvt_num = GETPOSTINT('search_mvt_num');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-$search_date_startyear =  GETPOST('search_date_startyear', 'int');
-$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
-$search_date_startday =  GETPOST('search_date_startday', 'int');
-$search_date_endyear =  GETPOST('search_date_endyear', 'int');
-$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
-$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_startyear =  GETPOSTINT('search_date_startyear');
+$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
+$search_date_startday =  GETPOSTINT('search_date_startday');
+$search_date_endyear =  GETPOSTINT('search_date_endyear');
+$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
+$search_date_endday =  GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-$search_date_creation_startyear =  GETPOST('search_date_creation_startyear', 'int');
-$search_date_creation_startmonth =  GETPOST('search_date_creation_startmonth', 'int');
-$search_date_creation_startday =  GETPOST('search_date_creation_startday', 'int');
-$search_date_creation_endyear =  GETPOST('search_date_creation_endyear', 'int');
-$search_date_creation_endmonth =  GETPOST('search_date_creation_endmonth', 'int');
-$search_date_creation_endday =  GETPOST('search_date_creation_endday', 'int');
+$search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
+$search_date_creation_startyear =  GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startmonth =  GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startday =  GETPOSTINT('search_date_creation_startday');
+$search_date_creation_endyear =  GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endmonth =  GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endday =  GETPOSTINT('search_date_creation_endday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);
-$search_date_modification_startyear =  GETPOST('search_date_modification_startyear', 'int');
-$search_date_modification_startmonth =  GETPOST('search_date_modification_startmonth', 'int');
-$search_date_modification_startday =  GETPOST('search_date_modification_startday', 'int');
-$search_date_modification_endyear =  GETPOST('search_date_modification_endyear', 'int');
-$search_date_modification_endmonth =  GETPOST('search_date_modification_endmonth', 'int');
-$search_date_modification_endday =  GETPOST('search_date_modification_endday', 'int');
+$search_date_modification_startyear =  GETPOSTINT('search_date_modification_startyear');
+$search_date_modification_startmonth =  GETPOSTINT('search_date_modification_startmonth');
+$search_date_modification_startday =  GETPOSTINT('search_date_modification_startday');
+$search_date_modification_endyear =  GETPOSTINT('search_date_modification_endyear');
+$search_date_modification_endmonth =  GETPOSTINT('search_date_modification_endmonth');
+$search_date_modification_endday =  GETPOSTINT('search_date_modification_endday');
 $search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear);
 $search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear);
-$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
-$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
-$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
-$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
-$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
-$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
-$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
-$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
-$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
-$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
-$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
 
-$search_account_category = GETPOST('search_account_category', 'int');
+$search_account_category = GETPOSTINT('search_account_category');
 
 $search_accountancy_code = GETPOST("search_accountancy_code", 'alpha');
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -129,11 +129,11 @@ $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -154,7 +154,7 @@ $hookmanager->initHooks(array('bookkeepinglist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->hasRight('accounting', 'mouvements', 'export')) {
+if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOSTINT('page') == '' && !GETPOSTINT('noreset') && $user->hasRight('accounting', 'mouvements', 'export')) {
 	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values') && !GETPOST('search_accountancy_code_start')) {
 		$query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 		$query .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1";
@@ -738,7 +738,7 @@ if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accountin
 if ($user->hasRight('accounting', 'mouvements', 'supprimer')) {
 	$arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('preunletteringauto', 'preunletteringmanual', 'predeletebookkeepingwriting'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('preunletteringauto', 'preunletteringmanual', 'predeletebookkeepingwriting'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index ed423ba1fdb..24856b36ae3 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
@@ -52,34 +52,34 @@ if ($type == 'sub') {
 	$context_default = 'bookkeepingbyaccountlist';
 }
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
-$search_date_startyear =  GETPOST('search_date_startyear', 'int');
-$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
-$search_date_startday =  GETPOST('search_date_startday', 'int');
-$search_date_endyear =  GETPOST('search_date_endyear', 'int');
-$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
-$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_startyear =  GETPOSTINT('search_date_startyear');
+$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
+$search_date_startday =  GETPOSTINT('search_date_startday');
+$search_date_endyear =  GETPOSTINT('search_date_endyear');
+$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
+$search_date_endday =  GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
-$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
-$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
-$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
-$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
-$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
+$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
-$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
-$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
-$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
-$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
-$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
 
-$search_account_category = GETPOST('search_account_category', 'int');
+$search_account_category = GETPOSTINT('search_account_category');
 
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
@@ -91,7 +91,7 @@ if ($search_accountancy_code_end == - 1) {
 }
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
-$search_mvt_num = GETPOST('search_mvt_num', 'int');
+$search_mvt_num = GETPOSTINT('search_mvt_num');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
@@ -104,11 +104,11 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -282,7 +282,7 @@ if (empty($reshook)) {
 	}
 	if (!empty($search_doc_date)) {
 		$filter['t.doc_date'] = $search_doc_date;
-		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
+		$param .= '&doc_datemonth='.GETPOSTINT('doc_datemonth').'&doc_dateday='.GETPOSTINT('doc_dateday').'&doc_dateyear='.GETPOSTINT('doc_dateyear');
 	}
 	if ($search_account_category != '-1' && !empty($search_account_category)) {
 		require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
@@ -650,7 +650,7 @@ if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accountin
 if ($user->hasRight('accounting', 'mouvements', 'supprimer')) {
 	$arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('preunletteringauto', 'preunletteringmanual', 'predeletebookkeepingwriting'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('preunletteringauto', 'preunletteringmanual', 'predeletebookkeepingwriting'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 772d1672542..1226ae9d167 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -34,9 +34,9 @@ $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'aZ09');
-$fiscal_period_id = GETPOST('fiscal_period_id', 'int');
-$validatemonth = GETPOST('validatemonth', 'int');
-$validateyear = GETPOST('validateyear', 'int');
+$fiscal_period_id = GETPOSTINT('fiscal_period_id');
+$validatemonth = GETPOSTINT('validatemonth');
+$validateyear = GETPOSTINT('validateyear');
 
 // Security check
 if (!isModEnabled('accounting')) {
@@ -104,8 +104,8 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if (isset($current_fiscal_period) && $user->hasRight('accounting', 'fiscalyear', 'write')) {
 		if ($action == 'confirm_step_1' && $confirm == "yes") {
-			$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-			$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+			$date_start = dol_mktime(0, 0, 0, GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
+			$date_end = dol_mktime(23, 59, 59, GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 
 			$result = $object->validateMovementForFiscalPeriod($date_start, $date_end);
 			if ($result > 0) {
@@ -119,7 +119,7 @@ if (empty($reshook)) {
 				$action = '';
 			}
 		} elseif ($action == 'confirm_step_2' && $confirm == "yes") {
-			$new_fiscal_period_id = GETPOST('new_fiscal_period_id', 'int');
+			$new_fiscal_period_id = GETPOSTINT('new_fiscal_period_id');
 			$separate_auxiliary_account = GETPOST('separate_auxiliary_account', 'aZ09');
 			$generate_bookkeeping_records = GETPOST('generate_bookkeeping_records', 'aZ09');
 
@@ -133,10 +133,10 @@ if (empty($reshook)) {
 				exit;
 			}
 		} elseif ($action == 'confirm_step_3' && $confirm == "yes") {
-			$inventory_journal_id = GETPOST('inventory_journal_id', 'int');
-			$new_fiscal_period_id = GETPOST('new_fiscal_period_id', 'int');
-			$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-			$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+			$inventory_journal_id = GETPOSTINT('inventory_journal_id');
+			$new_fiscal_period_id = GETPOSTINT('new_fiscal_period_id');
+			$date_start = dol_mktime(0, 0, 0, GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
+			$date_end = dol_mktime(23, 59, 59, GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 
 			$result = $object->insertAccountingReversal($current_fiscal_period['id'], $inventory_journal_id, $new_fiscal_period_id, $date_start, $date_end);
 			if ($result < 0) {
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 3102b023015..b2731d981c5 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -34,8 +34,8 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$codeventil = GETPOST('codeventil', 'int');
-$id = GETPOST('id', 'int');
+$codeventil = GETPOSTINT('codeventil');
+$id = GETPOSTINT('id');
 
 // Security check
 if (!isModEnabled('accounting')) {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 018f222daf8..391cac7daf4 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -37,8 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
-$validatemonth = GETPOST('validatemonth', 'int');
-$validateyear = GETPOST('validateyear', 'int');
+$validatemonth = GETPOSTINT('validatemonth');
+$validateyear = GETPOSTINT('validateyear');
 
 // Security check
 if (!isModEnabled('accounting')) {
@@ -54,8 +54,8 @@ if (!$user->hasRight('accounting', 'bind', 'write')) {
 $accountingAccount = new AccountingAccount($db);
 
 $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
-if (GETPOST("year", 'int')) {
-	$year_start = GETPOST("year", 'int');
+if (GETPOSTINT("year")) {
+	$year_start = GETPOSTINT("year");
 } else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) {
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 2a08eb3986c..5c9457d818f 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -45,7 +45,7 @@ $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_lineid = GETPOST('search_lineid', 'int');
+$search_lineid = GETPOSTINT('search_lineid');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -53,22 +53,22 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -131,7 +131,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) {
 	$error = 0;
 
-	if (!(GETPOST('account_parent', 'int') >= 0)) {
+	if (!(GETPOSTINT('account_parent') >= 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
@@ -140,7 +140,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('ac
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet";
-		$sql1 .= " SET fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= " SET fk_code_ventilation=".(GETPOSTINT('account_parent') > 0 ? GETPOSTINT('account_parent') : '0');
 		$sql1 .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
 
 		dol_syslog('accountancy/customer/lines.php::changeaccount sql= '.$sql1);
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index b34f29eef8f..d51b43eccd9 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -48,14 +48,14 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancycustomerlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$default_account = GETPOST('default_account', 'int');
+$default_account = GETPOSTINT('default_account');
 
 // Select Box
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_lineid = GETPOST('search_lineid', 'int');
+$search_lineid = GETPOSTINT('search_lineid');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -63,12 +63,12 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
@@ -80,10 +80,10 @@ if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDI
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 6d2bd442bf8..056dbb3d74e 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -38,8 +38,8 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$codeventil = GETPOST('codeventil', 'int');
-$id = GETPOST('id', 'int');
+$codeventil = GETPOSTINT('codeventil');
+$id = GETPOSTINT('id');
 
 // Security check
 if (!isModEnabled('accounting')) {
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 703417bb1f5..00f52f0dd49 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -33,12 +33,12 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
-$validatemonth = GETPOST('validatemonth', 'int');
-$validateyear = GETPOST('validateyear', 'int');
+$validatemonth = GETPOSTINT('validatemonth');
+$validateyear = GETPOSTINT('validateyear');
 
 $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
-if (GETPOST("year", 'int')) {
-	$year_start = GETPOST("year", 'int');
+if (GETPOSTINT("year")) {
+	$year_start = GETPOSTINT("year");
 } else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) {
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 8d170a557b1..4fbc0642bc9 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array("compta", "bills", "other", "accountancy", "trips", "pro
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$account_parent = GETPOST('account_parent', 'int');
+$account_parent = GETPOSTINT('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
 $search_login = GETPOST('search_login', 'alpha');
@@ -49,20 +49,20 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -121,7 +121,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) {
 	$error = 0;
 
-	if (!(GETPOST('account_parent', 'int') >= 0)) {
+	if (!(GETPOSTINT('account_parent') >= 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
@@ -130,7 +130,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('ac
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd";
-		$sql1 .= " SET erd.fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= " SET erd.fk_code_ventilation=".(GETPOSTINT('account_parent') > 0 ? GETPOSTINT('account_parent') : '0');
 		$sql1 .= ' WHERE erd.rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
 
 		dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= '.$sql1);
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index c688098058f..d70729d4521 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -58,12 +58,12 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 
@@ -73,10 +73,10 @@ if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDI
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 09236110b0e..db569da428c 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -57,8 +57,8 @@ $pcgver = getDolGlobalInt('CHARTOFACCOUNTS');
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'int');
-	$userid = GETPOST('userid', 'int');
+	$zone = GETPOSTINT('areacode');
+	$userid = GETPOSTINT('userid');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
 
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 993fce3899f..c091abb5b48 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -66,14 +66,14 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 $langs->loadLangs(array("companies", "other", "compta", "banks", "bills", "donations", "loan", "accountancy", "trips", "salaries", "hrm", "members"));
 
 // Multi journal
-$id_journal = GETPOST('id_journal', 'int');
+$id_journal = GETPOSTINT('id_journal');
 
-$date_startmonth = GETPOST('date_startmonth', 'int');
-$date_startday = GETPOST('date_startday', 'int');
-$date_startyear = GETPOST('date_startyear', 'int');
-$date_endmonth = GETPOST('date_endmonth', 'int');
-$date_endday = GETPOST('date_endday', 'int');
-$date_endyear = GETPOST('date_endyear', 'int');
+$date_startmonth = GETPOSTINT('date_startmonth');
+$date_startday = GETPOSTINT('date_startday');
+$date_startyear = GETPOSTINT('date_startyear');
+$date_endmonth = GETPOSTINT('date_endmonth');
+$date_endday = GETPOSTINT('date_endday');
+$date_endyear = GETPOSTINT('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping', 'aZ09');
 if ($in_bookkeeping == '') {
 	$in_bookkeeping = 'notyet';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index de47b55ab83..881070ad6fd 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "trips", "errors"));
 
-$id_journal = GETPOST('id_journal', 'int');
+$id_journal = GETPOSTINT('id_journal');
 $action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index d92f99e771b..227c2f0f280 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "errors"));
 
-$id_journal = GETPOST('id_journal', 'int');
+$id_journal = GETPOSTINT('id_journal');
 $action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 3267f5ae397..6e0640df092 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "errors"));
 
-$id_journal = GETPOST('id_journal', 'int');
+$id_journal = GETPOSTINT('id_journal');
 $action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php
index 62bd97df17f..4882b722053 100644
--- a/htdocs/accountancy/journal/variousjournal.php
+++ b/htdocs/accountancy/journal/variousjournal.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "accountancy", "compta", "other", "errors"));
 
-$id_journal = GETPOST('id_journal', 'int');
+$id_journal = GETPOSTINT('id_journal');
 $action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 99bfe67fce5..d384d7c944a 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -38,8 +38,8 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$codeventil = GETPOST('codeventil', 'int');
-$id = GETPOST('id', 'int');
+$codeventil = GETPOSTINT('codeventil');
+$id = GETPOSTINT('id');
 
 // Security check
 if (!isModEnabled('accounting')) {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index a74a9a04f54..ace576b4232 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
-$validatemonth = GETPOST('validatemonth', 'int');
-$validateyear = GETPOST('validateyear', 'int');
+$validatemonth = GETPOSTINT('validatemonth');
+$validateyear = GETPOSTINT('validateyear');
 
 // Security check
 if (!isModEnabled('accounting')) {
@@ -52,8 +52,8 @@ if (!$user->hasRight('accounting', 'bind', 'write')) {
 $accountingAccount = new AccountingAccount($db);
 
 $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
-if (GETPOST("year", 'int')) {
-	$year_start = GETPOST("year", 'int');
+if (GETPOSTINT("year")) {
+	$year_start = GETPOSTINT("year");
 } else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) {
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 576e4874a8d..3571a5e2df5 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -46,7 +46,7 @@ $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_lineid = GETPOST('search_lineid', 'int');
+$search_lineid = GETPOSTINT('search_lineid');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 //$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
@@ -55,22 +55,22 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -136,7 +136,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) {
 	$error = 0;
 
-	if (!(GETPOST('account_parent', 'int') >= 0)) {
+	if (!(GETPOSTINT('account_parent') >= 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
@@ -145,7 +145,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('ac
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
-		$sql1 .= " SET fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= " SET fk_code_ventilation=".(GETPOSTINT('account_parent') > 0 ? GETPOSTINT('account_parent') : '0');
 		$sql1 .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
 
 		dol_syslog('accountancy/supplier/lines.php::changeaccount sql= '.$sql1);
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index de9c72a56b5..a97bfb1d531 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -49,14 +49,14 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancysupplierlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$default_account = GETPOST('default_account', 'int');
+$default_account = GETPOSTINT('default_account');
 
 // Select Box
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_lineid = GETPOST('search_lineid', 'int');
+$search_lineid = GETPOSTINT('search_lineid');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
@@ -65,22 +65,22 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/adherents/admin/member_emails.php b/htdocs/adherents/admin/member_emails.php
index cc7b60f6233..c2907004341 100644
--- a/htdocs/adherents/admin/member_emails.php
+++ b/htdocs/adherents/admin/member_emails.php
@@ -105,7 +105,7 @@ if ($action == 'updateall') {
 
 // Action to update or add a constant
 if ($action == 'update' || $action == 'add') {
-	$constlineid = GETPOST('rowid', 'int');
+	$constlineid = GETPOSTINT('rowid');
 	$constname = GETPOST('constname', 'alpha');
 
 	$constvalue = (GETPOSTISSET('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname, 'alphanohtml') : GETPOST('constvalue'));
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 8ac296f9449..f922f1abb7f 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -63,7 +63,7 @@ if ($action == 'update') {
 	$showtable = GETPOST('MEMBER_SHOW_TABLE');
 	$showvoteallowed = GETPOST('MEMBER_SHOW_VOTE_ALLOWED');
 	$payonline = GETPOST('MEMBER_NEWFORM_PAYONLINE');
-	$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE', 'int');
+	$forcetype = GETPOSTINT('MEMBER_NEWFORM_FORCETYPE');
 	$forcemorphy = GETPOST('MEMBER_NEWFORM_FORCEMORPHY', 'aZ09');
 
 	$res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index ef217d65871..742905600af 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -38,13 +38,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array('companies', 'members'));
 
 // Get Parameters
-$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('rowid', 'int');
+$id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('rowid');
 
 // Pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 66e53b58109..d18ba0c335d 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -251,16 +251,16 @@ abstract class ActionsAdherentCardCommon
 		$this->object->old_name = GETPOST("old_name");
 		$this->object->old_firstname = GETPOST("old_firstname");
 
-		$this->object->fk_soc = GETPOST("fk_soc", 'int');
-		$this->object->socid = GETPOST("fk_soc", 'int');
+		$this->object->fk_soc = GETPOSTINT("fk_soc");
+		$this->object->socid = GETPOSTINT("fk_soc");
 		$this->object->lastname			= GETPOST("lastname");
 		$this->object->firstname		= GETPOST("firstname");
 		$this->object->civility_id = GETPOST("civility_id");
 		$this->object->address = GETPOST("address");
 		$this->object->zip = GETPOST("zipcode");
 		$this->object->town = GETPOST("town");
-		$this->object->country_id = GETPOST("country_id", 'int') ? GETPOST("country_id", 'int') : $mysoc->country_id;
-		$this->object->state_id = GETPOST("state_id", 'int');
+		$this->object->country_id = GETPOSTINT("country_id") ? GETPOSTINT("country_id") : $mysoc->country_id;
+		$this->object->state_id = GETPOSTINT("state_id");
 		$this->object->phone_perso = GETPOST("phone_perso");
 		$this->object->phone_mobile = GETPOST("phone_mobile");
 		$this->object->email = GETPOST("email", 'alphawithlgt');
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 7f41b76e564..8b96f6c3844 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -56,11 +56,11 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$rowid = GETPOST('rowid', 'int');
-$id = GETPOST('id') ? GETPOST('id', 'int') : $rowid;
-$typeid = GETPOST('typeid', 'int');
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$rowid = GETPOSTINT('rowid');
+$id = GETPOST('id') ? GETPOSTINT('id') : $rowid;
+$typeid = GETPOSTINT('typeid');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 $ref = GETPOST('ref', 'alpha');
 
 if (isModEnabled('mailmanspip')) {
@@ -256,8 +256,8 @@ if (empty($reshook)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
-		if (GETPOST("birthday", 'int') && GETPOST("birthmonth", 'int') && GETPOST("birthyear", 'int')) {
-			$birthdate = dol_mktime(12, 0, 0, GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
+		if (GETPOSTINT("birthday") && GETPOSTINT("birthmonth") && GETPOSTINT("birthyear")) {
+			$birthdate = dol_mktime(12, 0, 0, GETPOSTINT("birthmonth"), GETPOSTINT("birthday"), GETPOSTINT("birthyear"));
 		}
 		$lastname = GETPOST("lastname", 'alphanohtml');
 		$firstname = GETPOST("firstname", 'alphanohtml');
@@ -441,14 +441,14 @@ if (empty($reshook)) {
 		}
 		$birthdate = '';
 		if (GETPOSTISSET("birthday") && GETPOST("birthday") && GETPOSTISSET("birthmonth") && GETPOST("birthmonth") && GETPOSTISSET("birthyear") && GETPOST("birthyear")) {
-			$birthdate = dol_mktime(12, 0, 0, GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
+			$birthdate = dol_mktime(12, 0, 0, GETPOSTINT("birthmonth"), GETPOSTINT("birthday"), GETPOSTINT("birthyear"));
 		}
 		$datesubscription = '';
 		if (GETPOSTISSET("reday") && GETPOSTISSET("remonth") && GETPOSTISSET("reyear")) {
-			$datesubscription = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", "int"), GETPOST("reyear", "int"));
+			$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 		}
 
-		$typeid = GETPOST("typeid", 'int');
+		$typeid = GETPOSTINT("typeid");
 		$civility_id = GETPOST("civility_id", 'alphanohtml');
 		$lastname = GETPOST("lastname", 'alphanohtml');
 		$firstname = GETPOST("firstname", 'alphanohtml');
@@ -457,8 +457,8 @@ if (empty($reshook)) {
 		$address = GETPOST("address", 'alphanohtml');
 		$zip = GETPOST("zipcode", 'alphanohtml');
 		$town = GETPOST("town", 'alphanohtml');
-		$state_id = GETPOST("state_id", 'int');
-		$country_id = GETPOST("country_id", 'int');
+		$state_id = GETPOSTINT("state_id");
+		$country_id = GETPOSTINT("country_id");
 
 		$phone = GETPOST("phone", 'alpha');
 		$phone_perso = GETPOST("phone_perso", 'alpha');
@@ -471,8 +471,8 @@ if (empty($reshook)) {
 		$morphy = GETPOST("morphy", 'alphanohtml');
 		$public = GETPOST("public", 'alphanohtml');
 
-		$userid = GETPOST("userid", 'int');
-		$socid = GETPOST("socid", 'int');
+		$userid = GETPOSTINT("userid");
+		$socid = GETPOSTINT("socid");
 		$default_lang = GETPOST('default_lang', 'alpha');
 
 		$object->civility_id = $civility_id;
@@ -926,10 +926,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// Create mode
 	if ($action == 'create') {
 		$object->canvas = $canvas;
-		$object->state_id = GETPOST('state_id', 'int');
+		$object->state_id = GETPOSTINT('state_id');
 
 		// We set country_id, country_code and country for the selected country
-		$object->country_id = GETPOST('country_id', 'int') ? GETPOST('country_id', 'int') : $mysoc->country_id;
+		$object->country_id = GETPOSTINT('country_id') ? GETPOSTINT('country_id') : $mysoc->country_id;
 		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
@@ -1012,7 +1012,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$listetype = $adht->liste_array(1);
 		print img_picto('', $adht->picto, 'class="pictofixedwidth"');
 		if (count($listetype)) {
-			print $form->selectarray("typeid", $listetype, (GETPOST('typeid', 'int') ? GETPOST('typeid', 'int') : $typeid), (count($listetype) > 1 ? 1 : 0), 0, 0, '', 0, 0, 0, '', '', 1);
+			print $form->selectarray("typeid", $listetype, (GETPOSTINT('typeid') ? GETPOSTINT('typeid') : $typeid), (count($listetype) > 1 ? 1 : 0), 0, 0, '', 0, 0, 0, '', '', 1);
 		} else {
 			print '<span class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</span>';
 		}
@@ -1030,7 +1030,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Civility
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(GETPOST('civility_id', 'int') ? GETPOST('civility_id', 'int') : $object->civility_id, 'civility_id', 'maxwidth150', 1).'</td>';
+		print $formcompany->select_civility(GETPOSTINT('civility_id') ? GETPOSTINT('civility_id') : $object->civility_id, 'civility_id', 'maxwidth150', 1).'</td>';
 		print '</tr>';
 
 		// Lastname
@@ -1087,7 +1087,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			if ($soc->country_id) {
 				print img_picto('', 'state', 'class="pictofixedwidth"');
-				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : $soc->state_id, $soc->country_code);
+				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOSTINT('state_id') : $soc->state_id, $soc->country_code);
 			} else {
 				print $countrynotdefined;
 			}
@@ -1167,7 +1167,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$adht->fetch($object->typeid);
 
 		// We set country_id, and country_code, country of the chosen country
-		$country = GETPOST('country', 'int');
+		$country = GETPOSTINT('country');
 		if (!empty($country) || $object->country_id) {
 			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country) ? $country : $object->country_id);
 			$resql = $db->query($sql);
@@ -1240,7 +1240,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
 		if ($user->hasRight('adherent', 'creer')) {
-			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $object->typeid), 0, 0, 0, '', 0, 0, 0, '', '', 1);
+			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOSTINT("typeid") : $object->typeid), 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		} else {
 			print $adht->getNomUrl(1);
 			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 1f02258fae9..ac692433247 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -38,16 +38,16 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 $langs->loadLangs(array("companies", "members", "other"));
 
 
-$id = GETPOSTISSET('id') ? GETPOST('id', 'int') : GETPOST('rowid', 'int');
+$id = GETPOSTISSET('id') ? GETPOSTINT('id') : GETPOSTINT('rowid');
 $ref = GETPOST('ref', 'alphanohtml');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 3b78f0305dc..baa8560b9c6 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -53,11 +53,11 @@ $result = restrictedArea($user, 'adherent');
  * Actions
  */
 
-$userid = GETPOST('userid', 'int');
+$userid = GETPOSTINT('userid');
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'int');
+	$zone = GETPOSTINT('areacode');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 47fb5c00a64..edfa8adbb2f 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "members", "ldap", "admin"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alphanohtml');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index d2297697632..37aba189a17 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -43,7 +43,7 @@ $langs->loadLangs(array("members", "companies", "categories"));
 // Get parameters
 $action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
@@ -71,19 +71,19 @@ $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
 $search_type 		= GETPOST("search_type", 'alpha');
 $search_email 		= GETPOST("search_email", 'alpha');
-$search_categ 		= GETPOST("search_categ", 'int');
+$search_categ 		= GETPOSTINT("search_categ");
 $search_morphy 		= GETPOST("search_morphy", 'alpha');
 $search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
 
-$catid 		= GETPOST("catid", 'int');
-$socid 		= GETPOST('socid', 'int');
+$catid 		= GETPOSTINT("catid");
+$socid 		= GETPOSTINT('socid');
 
 $search_filter 		= GETPOST("search_filter", 'alpha');
 $search_status 		= GETPOST("search_status", 'intcomma');  // status
-$search_datec_start = dol_mktime(0, 0, 0, GETPOST('search_datec_start_month', 'int'), GETPOST('search_datec_start_day', 'int'), GETPOST('search_datec_start_year', 'int'));
-$search_datec_end = dol_mktime(23, 59, 59, GETPOST('search_datec_end_month', 'int'), GETPOST('search_datec_end_day', 'int'), GETPOST('search_datec_end_year', 'int'));
-$search_datem_start = dol_mktime(0, 0, 0, GETPOST('search_datem_start_month', 'int'), GETPOST('search_datem_start_day', 'int'), GETPOST('search_datem_start_year', 'int'));
-$search_datem_end = dol_mktime(23, 59, 59, GETPOST('search_datem_end_month', 'int'), GETPOST('search_datem_end_day', 'int'), GETPOST('search_datem_end_year', 'int'));
+$search_datec_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datec_start_month'), GETPOSTINT('search_datec_start_day'), GETPOSTINT('search_datec_start_year'));
+$search_datec_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datec_end_month'), GETPOSTINT('search_datec_end_day'), GETPOSTINT('search_datec_end_year'));
+$search_datem_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datem_start_month'), GETPOSTINT('search_datem_start_day'), GETPOSTINT('search_datem_start_year'));
+$search_datem_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datem_end_month'), GETPOSTINT('search_datem_end_day'), GETPOSTINT('search_datem_end_year'));
 
 $filter = GETPOST("filter", 'alpha');
 if ($filter) {
@@ -102,10 +102,10 @@ if ($search_status < -2) {
 }
 
 // Pagination parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -741,7 +741,7 @@ if ($user->hasRight('adherent', 'creer') && $user->hasRight('user', 'user', 'cre
 if ($user->hasRight('adherent', 'creer')) {
 	$arrayofmassactions['createsubscription'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("CreateSubscription");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 1adbdb2db03..180eee496b2 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("companies", "members", "bills"));
 
 // Get parameters
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alphanohtml');
 
 
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 2ec81fdbea9..9edc0603ce2 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 $langs->loadLangs(array("companies","members","partnership", "other"));
 
 // Get parameters
-$id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOSTINT('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -116,8 +116,8 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-$date_start = dol_mktime(0, 0, 0, GETPOST('date_partnership_startmonth', 'int'), GETPOST('date_partnership_startday', 'int'), GETPOST('date_partnership_startyear', 'int'));
-$date_end = dol_mktime(0, 0, 0, GETPOST('date_partnership_endmonth', 'int'), GETPOST('date_partnership_endday', 'int'), GETPOST('date_partnership_endyear', 'int'));
+$date_start = dol_mktime(0, 0, 0, GETPOSTINT('date_partnership_startmonth'), GETPOSTINT('date_partnership_startday'), GETPOSTINT('date_partnership_startyear'));
+$date_end = dol_mktime(0, 0, 0, GETPOSTINT('date_partnership_endmonth'), GETPOSTINT('date_partnership_endday'), GETPOSTINT('date_partnership_endyear'));
 
 if (empty($reshook)) {
 	$error = 0;
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 13dce1b030e..b6c2ea3a676 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int'); if ($userid < 0) {
+$userid = GETPOSTINT('userid'); if ($userid < 0) {
 	$userid = 0;
 }
-$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+$socid = GETPOSTINT('socid'); if ($socid < 0) {
 	$socid = 0;
 }
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3d479cd23c6..3efc9a74ef0 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -47,17 +47,17 @@ $confirm = GETPOST('confirm', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ09');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOSTINT('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
 $rowid = $id;
 $ref = GETPOST('ref', 'alphanohtml');
-$typeid = GETPOST('typeid', 'int');
+$typeid = GETPOSTINT('typeid');
 $cancel = GETPOST('cancel');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -86,9 +86,9 @@ $errmsg = '';
 $hookmanager->initHooks(array('subscription'));
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $datefrom = 0;
 $dateto = 0;
@@ -153,15 +153,15 @@ if (empty($reshook) && $action == 'confirm_create_thirdparty' && $confirm == 'ye
 if (empty($reshook) && $action == 'setuserid' && ($user->hasRight('user', 'self', 'creer') || $user->hasRight('user', 'user', 'creer'))) {
 	$error = 0;
 	if (!$user->hasRight('user', 'user', 'creer')) {    // If can edit only itself user, we can link to itself only
-		if (GETPOST("userid", 'int') != $user->id && GETPOST("userid", 'int') != $object->user_id) {
+		if (GETPOSTINT("userid") != $user->id && GETPOSTINT("userid") != $object->user_id) {
 			$error++;
 			setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 		}
 	}
 
 	if (!$error) {
-		if (GETPOST("userid", 'int') != $object->user_id) {  // If link differs from currently in database
-			$result = $object->setUserId(GETPOST("userid", 'int'));
+		if (GETPOSTINT("userid") != $object->user_id) {  // If link differs from currently in database
+			$result = $object->setUserId(GETPOSTINT("userid"));
 			if ($result < 0) {
 				dol_print_error(null, $object->error);
 			}
@@ -173,9 +173,9 @@ if (empty($reshook) && $action == 'setuserid' && ($user->hasRight('user', 'self'
 if (empty($reshook) && $action == 'setsocid') {
 	$error = 0;
 	if (!$error) {
-		if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+		if (GETPOSTINT('socid') != $object->fk_soc) {    // If link differs from currently in database
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-			$sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
+			$sql .= " WHERE fk_soc = '".GETPOSTINT('socid')."'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -183,14 +183,14 @@ if (empty($reshook) && $action == 'setsocid') {
 					$othermember = new Adherent($db);
 					$othermember->fetch($obj->rowid);
 					$thirdparty = new Societe($db);
-					$thirdparty->fetch(GETPOST('socid', 'int'));
+					$thirdparty->fetch(GETPOSTINT('socid'));
 					$error++;
 					setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
 				}
 			}
 
 			if (!$error) {
-				$result = $object->setThirdPartyId(GETPOST('socid', 'int'));
+				$result = $object->setThirdPartyId(GETPOSTINT('socid'));
 				if ($result < 0) {
 					dol_print_error(null, $object->error);
 				}
@@ -214,20 +214,20 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
 	$defaultdelay = !empty($adht->duration_value) ? $adht->duration_value : 1;
 	$defaultdelayunit = !empty($adht->duration_unit) ? $adht->duration_unit : 'y';
 	$paymentdate = ''; // Do not use 0 here, default value is '' that means not filled where 0 means 1970-01-01
-	if (GETPOST("reyear", "int") && GETPOST("remonth", "int") && GETPOST("reday", "int")) {
-		$datesubscription = dol_mktime(0, 0, 0, GETPOST("remonth", "int"), GETPOST("reday", "int"), GETPOST("reyear", "int"));
+	if (GETPOSTINT("reyear") && GETPOSTINT("remonth") && GETPOSTINT("reday")) {
+		$datesubscription = dol_mktime(0, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	}
-	if (GETPOST("endyear", 'int') && GETPOST("endmonth", 'int') && GETPOST("endday", 'int')) {
-		$datesubend = dol_mktime(0, 0, 0, GETPOST("endmonth", 'int'), GETPOST("endday", 'int'), GETPOST("endyear", 'int'));
+	if (GETPOSTINT("endyear") && GETPOSTINT("endmonth") && GETPOSTINT("endday")) {
+		$datesubend = dol_mktime(0, 0, 0, GETPOSTINT("endmonth"), GETPOSTINT("endday"), GETPOSTINT("endyear"));
 	}
-	if (GETPOST("paymentyear", 'int') && GETPOST("paymentmonth", 'int') && GETPOST("paymentday", 'int')) {
-		$paymentdate = dol_mktime(0, 0, 0, GETPOST("paymentmonth", 'int'), GETPOST("paymentday", 'int'), GETPOST("paymentyear", 'int'));
+	if (GETPOSTINT("paymentyear") && GETPOSTINT("paymentmonth") && GETPOSTINT("paymentday")) {
+		$paymentdate = dol_mktime(0, 0, 0, GETPOSTINT("paymentmonth"), GETPOSTINT("paymentday"), GETPOSTINT("paymentyear"));
 	}
 	$amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
 	$label = GETPOST("label");
 
 	// Payment information
-	$accountid = GETPOST("accountid", 'int');
+	$accountid = GETPOSTINT("accountid");
 	$operation = GETPOST("operation", "alphanohtml"); // Payment mode
 	$num_chq = GETPOST("num_chq", "alphanohtml");
 	$emetteur_nom = GETPOST("chqemetteur");
@@ -287,14 +287,14 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
 						$error++;
 						$action = 'addsubscription';
 					}
-					if (GETPOST("paymentsave") != 'invoiceonly' && !(GETPOST("accountid", 'int') > 0)) {
+					if (GETPOST("paymentsave") != 'invoiceonly' && !(GETPOSTINT("accountid") > 0)) {
 						$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
 						setEventMessages($errmsg, null, 'errors');
 						$error++;
 						$action = 'addsubscription';
 					}
 				} else {
-					if (GETPOST("accountid", 'int')) {
+					if (GETPOSTINT("accountid")) {
 						$errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
 						setEventMessages($errmsg, null, 'errors');
 						$error++;
@@ -980,7 +980,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 	$currentmonth = dol_print_date($now, "%m");
 	print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
 	if (GETPOST('reday')) {
-		$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datefrom = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 	}
 	if (!$datefrom) {
 		$datefrom = $object->datevalid;
@@ -1001,7 +1001,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 
 	// Date end subscription
 	if (GETPOST('endday')) {
-		$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
+		$dateto = dol_mktime(0, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
 	}
 	if (!$dateto) {
 		if (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH')) {
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 1cd7376ea75..b78303d6633 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -41,7 +41,7 @@ $object = new Subscription($db);
 $errmsg = '';
 
 $action = GETPOST("action", 'alpha');
-$rowid = GETPOST("rowid", "int") ? GETPOST("rowid", "int") : GETPOST("id", "int");
+$rowid = GETPOSTINT("rowid") ? GETPOSTINT("rowid") : GETPOSTINT("id");
 $typeid = GETPOSTINT("typeid");
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm');
@@ -86,8 +86,8 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'update' &&
 
 		$errmsg = '';
 
-		$newdatestart = dol_mktime(GETPOST('datesubhour', 'int'), GETPOST('datesubmin', 'int'), 0, GETPOST('datesubmonth', 'int'), GETPOST('datesubday', 'int'), GETPOST('datesubyear', 'int'));
-		$newdateend = dol_mktime(GETPOST('datesubendhour', 'int'), GETPOST('datesubendmin', 'int'), 0, GETPOST('datesubendmonth', 'int'), GETPOST('datesubendday', 'int'), GETPOST('datesubendyear', 'int'));
+		$newdatestart = dol_mktime(GETPOSTINT('datesubhour'), GETPOSTINT('datesubmin'), 0, GETPOSTINT('datesubmonth'), GETPOSTINT('datesubday'), GETPOSTINT('datesubyear'));
+		$newdateend = dol_mktime(GETPOSTINT('datesubendhour'), GETPOSTINT('datesubendmin'), 0, GETPOSTINT('datesubendmonth'), GETPOSTINT('datesubendday'), GETPOSTINT('datesubendyear'));
 
 		if ($object->fk_bank > 0) {
 			$accountline = new AccountLine($db);
diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
index 14afbafca50..6bdf0fd6f5d 100644
--- a/htdocs/adherents/subscription/info.php
+++ b/htdocs/adherents/subscription/info.php
@@ -36,7 +36,7 @@ if (!$user->hasRight('adherent', 'lire')) {
 	accessforbidden();
 }
 
-$rowid = GETPOST("rowid", 'int');
+$rowid = GETPOSTINT("rowid");
 
 
 
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index f411810242d..ddd2728d169 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("members", "companies", "banks"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -50,17 +50,17 @@ $search_lastname = GETPOST('search_lastname', 'alpha');
 $search_firstname = GETPOST('search_firstname', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
-$search_account = GETPOST('search_account', 'int');
+$search_account = GETPOSTINT('search_account');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_all = '';
 
 $date_select = GETPOST("date_select", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -345,7 +345,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4a1ee4b36a6..a56598e360a 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 // Load translation files required by the page
 $langs->load("members");
 
-$rowid  = GETPOST('rowid', 'int');
+$rowid  = GETPOSTINT('rowid');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -61,10 +61,10 @@ $status = GETPOST('status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -81,12 +81,12 @@ if (!$sortfield) {
 
 $label = GETPOST("label", "alpha");
 $morphy = GETPOST("morphy", "alpha");
-$status = GETPOST("status", "int");
-$subscription = GETPOST("subscription", "int");
+$status = GETPOSTINT("status");
+$subscription = GETPOSTINT("subscription");
 $amount = GETPOST('amount', 'alpha');
-$duration_value = GETPOST('duration_value', 'int');
+$duration_value = GETPOSTINT('duration_value');
 $duration_unit = GETPOST('duration_unit', 'alpha');
-$vote = GETPOST("vote", "int");
+$vote = GETPOSTINT("vote");
 $comment = GETPOST("comment", 'restricthtml');
 $mail_valid = GETPOST("mail_valid", 'restricthtml');
 $caneditamount = GETPOSTINT("caneditamount");
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index bd202e5a21a..88301150f13 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "members", "ldap"));
 
-$id = GETPOST('rowid', 'int');
+$id = GETPOSTINT('rowid');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 55ee3bbd697..4dd37b89e24 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('members', 'languages'));
 
-$id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOSTINT('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $ref = GETPOST('ref', 'alphanohtml');
@@ -279,7 +279,7 @@ if ($action == 'create' && $user->hasRight('adherent', 'configurer')) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vadd">';
-	print '<input type="hidden" name="rowid" value="'.GETPOST("rowid", 'int').'">';
+	print '<input type="hidden" name="rowid" value="'.GETPOSTINT("rowid").'">';
 
 	print dol_get_fiche_head();
 
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index cb8bd1603bb..cd39e578045 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alphanohtml');
 
 $object = new Adherent($db);
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 4190c55a8e1..f225f899ee8 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -58,9 +58,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOSTINT("state_id"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOSTINT('country_id'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("phone", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -138,7 +138,7 @@ print '<input name="town" class="minwidth100" id="town" value="'.dol_escape_html
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'globe-americas', 'class="pictofixedwidth"');
-print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_COUNTRY') ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'country_id');
+print $form->select_country((GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_COUNTRY') ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'country_id');
 if ($user->admin) {
 	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 }
@@ -147,7 +147,7 @@ print '</td></tr>'."\n";
 // State
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'state', 'class="pictofixedwidth"');
-print $formcompany->select_state((GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_STATE') ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_COUNTRY') ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
+print $formcompany->select_state((GETPOSTISSET('state_id') ? GETPOSTINT('state_id') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_STATE') ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : (getDolGlobalString('MAIN_INFO_ACCOUNTANT_COUNTRY') ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
 print '</td></tr>'."\n";
 
 // Telephone
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 0dca3ecbf1c..8ac54b3299e 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -154,7 +154,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 
 	// Save nb of agenda
 	if (!$error) {
-		$res = dolibarr_set_const($db, 'AGENDA_EXT_NB', trim(GETPOST('AGENDA_EXT_NB', 'int')), 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'AGENDA_EXT_NB', trim(GETPOSTINT('AGENDA_EXT_NB')), 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
 		}
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 3700ecf631f..5ac6e892611 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -48,10 +48,10 @@ if (GETPOSTISSET('MAIN_AGENDA_XCAL_EXPORTKEY')) {
 	$MAIN_AGENDA_XCAL_EXPORTKEY = trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha'));
 }
 if (GETPOSTISSET('MAIN_AGENDA_EXPORT_PAST_DELAY')) {
-	$MAIN_AGENDA_EXPORT_PAST_DELAY = intval(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'int'));
+	$MAIN_AGENDA_EXPORT_PAST_DELAY = intval(GETPOSTINT('MAIN_AGENDA_EXPORT_PAST_DELAY'));
 }
 if (GETPOSTISSET('MAIN_AGENDA_EXPORT_CACHE')) {
-	$MAIN_AGENDA_EXPORT_CACHE = intval(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'int'));
+	$MAIN_AGENDA_EXPORT_CACHE = intval(GETPOSTINT('MAIN_AGENDA_EXPORT_CACHE'));
 }
 if (GETPOSTISSET('AGENDA_EXPORT_FIX_TZ')) {
 	$AGENDA_EXPORT_FIX_TZ = trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha'));
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index be817438610..49f2dc3380c 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -70,7 +70,7 @@ if ($action == 'setbarcodethirdpartyon') {
 
 if ($action == 'setcoder') {
 	$coder = GETPOST('coder', 'alpha');
-	$code_id = GETPOST('code_id', 'int');
+	$code_id = GETPOSTINT('code_id');
 	$sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
 	$sqlp .= " SET coder = '".$db->escape($coder)."'";
 	$sqlp .= " WHERE rowid = ".((int) $code_id);
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 189fb532e1f..99d56c35658 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -36,7 +36,7 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
-$rowid = GETPOST('rowid', 'int');
+$rowid = GETPOSTINT('rowid');
 $action = GETPOST('action', 'aZ09');
 
 
@@ -50,7 +50,7 @@ $boxes = array();
  */
 
 if ($action == 'addconst') {
-	dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", GETPOST("MAIN_BOXES_MAXLINES", 'int'), '', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", GETPOSTINT("MAIN_BOXES_MAXLINES"), '', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", GETPOST("MAIN_ACTIVATE_FILECACHE", 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
@@ -165,10 +165,10 @@ if ($action == 'switch') {
 	$db->begin();
 
 	$objfrom = new ModeleBoxes($db);
-	$objfrom->fetch(GETPOST("switchfrom", 'int'));
+	$objfrom->fetch(GETPOSTINT("switchfrom"));
 
 	$objto = new ModeleBoxes($db);
-	$objto->fetch(GETPOST('switchto', 'int'));
+	$objto->fetch(GETPOSTINT('switchto'));
 
 	$resultupdatefrom = 0;
 	$resultupdateto = 0;
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 9eb4626c3bc..f07961486c6 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -92,7 +92,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		activateModulesRequiredByCountry($mysoc->country_code);
 	}
 
-	$tmparray = getState(GETPOST('state_id', 'int'), 'all', $db, $langs, 0);
+	$tmparray = getState(GETPOSTINT('state_id'), 'all', $db, $langs, 0);
 	if (!empty($tmparray['id'])) {
 		$mysoc->state_id   = $tmparray['id'];
 		$mysoc->state_code = $tmparray['code'];
@@ -218,7 +218,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA", GETPOST("tva", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT", GETPOST("socialobject", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START", GETPOST("SOCIETE_FISCAL_MONTH_START", 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START", GETPOSTINT("SOCIETE_FISCAL_MONTH_START"), 'chaine', 0, '', $conf->entity);
 
 	// Sale tax options
 	$usevat = GETPOST("optiontva", 'aZ09');
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index f290df752bc..792fe0b30cf 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -32,19 +32,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 // Load translation files required by the page
 $langs->load("admin");
 
-$rowid = GETPOST('rowid', 'int');
-$entity = GETPOST('entity', 'int');
+$rowid = GETPOSTINT('rowid');
+$entity = GETPOSTINT('entity');
 $action = GETPOST('action', 'aZ09');
-$debug = GETPOST('debug', 'int');
+$debug = GETPOSTINT('debug');
 $consts = GETPOST('const', 'array');
 $constname = GETPOST('constname', 'alphanohtml');
 $constvalue = GETPOST('constvalue', 'restricthtml'); // We should be able to send everything here
 $constnote = GETPOST('constnote', 'alpha');
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 0994918d462..d06fb6502a2 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -49,8 +49,8 @@ $action = GETPOST('action', 'aZ09');
 if ($action == 'set') {
 	$db->begin();
 
-	$result1 = dolibarr_set_const($db, "DEBUGBAR_LOGS_LINES_NUMBER", GETPOST('DEBUGBAR_LOGS_LINES_NUMBER', 'int'), 'chaine', 0, '', 0);
-	$result2 = dolibarr_set_const($db, "DEBUGBAR_USE_LOG_FILE", GETPOST('DEBUGBAR_USE_LOG_FILE', 'int'), 'chaine', 0, '', 0);
+	$result1 = dolibarr_set_const($db, "DEBUGBAR_LOGS_LINES_NUMBER", GETPOSTINT('DEBUGBAR_LOGS_LINES_NUMBER'), 'chaine', 0, '', 0);
+	$result2 = dolibarr_set_const($db, "DEBUGBAR_USE_LOG_FILE", GETPOSTINT('DEBUGBAR_USE_LOG_FILE'), 'chaine', 0, '', 0);
 	if ($result1 < 0 || $result2 < 0) {
 		$error++;
 	}
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 5c92e5acd14..0792ad97007 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -46,10 +46,10 @@ $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;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -366,7 +366,7 @@ if (!is_array($result) && $result < 0) {
 
 		// Page
 		print '<td>';
-		if ($action != 'edit' || GETPOST('rowid', 'int') != $defaultvalue->id) {
+		if ($action != 'edit' || GETPOSTINT('rowid') != $defaultvalue->id) {
 			print $defaultvalue->page;
 		} else {
 			print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($defaultvalue->page).'">';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index ef1d477a624..0a7a3ea4e7a 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -188,7 +188,7 @@ if ($action == 'update') {
 	// Update values
 	for ($i = 0; $i < 4; $i++) {
 		if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) {
-			dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+			dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOSTINT('MAIN_METEO'.$plus.'_LEVEL'.$i), 'chaine', 0, '', $conf->entity);
 		}
 	}
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 28fdb10609b..2afd06435b8 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -49,9 +49,9 @@ $langs->loadLangs(array("errors", "admin", "main", "companies", "resource", "hol
 
 $action = GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
-$entity = GETPOST('entity', 'int');
+$entity = GETPOSTINT('entity');
 $code = GETPOST('code', 'alpha');
 
 $acts = array(); $actl = array();
@@ -65,7 +65,7 @@ $listoffset = GETPOST('listoffset');
 $listlimit = GETPOST('listlimit') > 0 ? GETPOST('listlimit') : 1000; // To avoid too long dictionaries
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -74,7 +74,7 @@ $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$search_country_id = GETPOST('search_country_id', 'int');
+$search_country_id = GETPOSTINT('search_country_id');
 $search_code = GETPOST('search_code', 'alpha');
 $search_active = GETPOST('search_active', 'alpha');
 
@@ -931,13 +931,13 @@ if (empty($reshook)) {
 				}
 
 				if ($keycode == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
-					$sql .= (int) GETPOST('position', 'int');
+					$sql .= GETPOSTINT('position');
 				} elseif (GETPOST($keycode) == '' && !($keycode == 'code' && $id == 10)) {
 					$sql .= "null"; // For vat, we want/accept code = ''
 				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
 				} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
-					$sql .= (int) GETPOST($keycode, 'int');
+					$sql .= GETPOSTINT($keycode);
 				} else {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
 				}
@@ -952,8 +952,8 @@ if (empty($reshook)) {
 				setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
 
 				// Clean $_POST array, we keep only id of dictionary
-				if ($id == 10 && GETPOST('country', 'int') > 0) {
-					$search_country_id = GETPOST('country', 'int');
+				if ($id == 10 && GETPOSTINT('country') > 0) {
+					$search_country_id = GETPOSTINT('country');
 				}
 				$_POST = array('id'=>$id);
 			} else {
@@ -1000,13 +1000,13 @@ if (empty($reshook)) {
 				}
 				$sql .= $field."=";
 				if ($listfieldvalue[$i] == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
-					$sql .= (int) GETPOST('position', 'int');
+					$sql .= GETPOSTINT('position');
 				} elseif (GETPOST($keycode) == '' && !($keycode == 'code' && $id == 10)) {
 					$sql .= "null"; // For vat, we want/accept code = ''
 				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
 				} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
-					$sql .= (int) GETPOST($keycode, 'int');
+					$sql .= GETPOSTINT($keycode);
 				} else {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
 				}
@@ -2305,10 +2305,10 @@ if ($id > 0) {
 								$showfield = 0;
 							} elseif ($value == 'unicode') {
 								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-							} elseif ($value == 'label' && $tabname[GETPOST("id", 'int')] == 'c_units') {
+							} elseif ($value == 'label' && $tabname[GETPOSTINT("id")] == 'c_units') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->$value);
-							} elseif ($value == 'short_label' && $tabname[GETPOST("id", 'int')] == 'c_units') {
+							} elseif ($value == 'short_label' && $tabname[GETPOSTINT("id")] == 'c_units') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->$value);
 							} elseif (($value == 'unit') && ($tabname[$id] == 'c_paper_format')) {
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index 9ff92554e09..e5896a4eec1 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -40,8 +40,8 @@ top_httphead('image');
 
 $dolistore = new Dolistore();
 
-$id_product = GETPOST('id_product', 'int');
-$id_image   = GETPOST('id_image', 'int');
+$id_product = GETPOSTINT('id_product');
+$id_image   = GETPOSTINT('id_image');
 // quality : image resize with this in the URL : "cart_default", "home_default", "large_default", "medium_default", "small_default", "thickbox_default"
 $quality    = GETPOST('quality', 'alpha');
 
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index b061eabdfe2..844f897547f 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -53,7 +53,7 @@ if (!isModEnabled('emailcollector')) {
 $langs->loadLangs(array("admin", "mails", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
@@ -61,7 +61,7 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'emailcollectorcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$operationid = GETPOST('operationid', 'int');
+$operationid = GETPOSTINT('operationid');
 
 // Initialize technical objects
 $object = new EmailCollector($db);
@@ -154,7 +154,7 @@ if (GETPOST('addfilter', 'alpha')) {
 
 if ($action == 'deletefilter') {
 	$emailcollectorfilter = new EmailCollectorFilter($db);
-	$emailcollectorfilter->fetch(GETPOST('filterid', 'int'));
+	$emailcollectorfilter->fetch(GETPOSTINT('filterid'));
 	if ($emailcollectorfilter->id > 0) {
 		$result = $emailcollectorfilter->delete($user);
 		if ($result > 0) {
@@ -198,7 +198,7 @@ if (GETPOST('addoperation', 'alpha')) {
 
 if ($action == 'updateoperation') {
 	$emailcollectoroperation = new EmailCollectorAction($db);
-	$emailcollectoroperation->fetch(GETPOST('rowidoperation2', 'int'));
+	$emailcollectoroperation->fetch(GETPOSTINT('rowidoperation2'));
 
 	$emailcollectoroperation->actionparam = GETPOST('operationparam2', 'alphawithlgt');
 
@@ -221,7 +221,7 @@ if ($action == 'updateoperation') {
 }
 if ($action == 'deleteoperation') {
 	$emailcollectoroperation = new EmailCollectorAction($db);
-	$emailcollectoroperation->fetch(GETPOST('operationid', 'int'));
+	$emailcollectoroperation->fetch(GETPOSTINT('operationid'));
 	if ($emailcollectoroperation->id > 0) {
 		$result = $emailcollectoroperation->delete($user);
 		if ($result > 0) {
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 833e822c288..e431b1f19dc 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("admin", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -47,13 +47,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 	$page = 0;
@@ -99,8 +99,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -365,7 +365,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index afdeca4b7b2..6b321316f47 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -41,10 +41,10 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'au
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index a1360b92966..16f4e1acc36 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -152,13 +152,13 @@ if ($action == 'updateMask') {
 
 	$res3 = 0;
 	if (isModEnabled('project') && GETPOSTISSET('EXPENSEREPORT_PROJECT_IS_REQUIRED')) {  // Option may not be provided
-		$res3 = dolibarr_set_const($db, 'EXPENSEREPORT_PROJECT_IS_REQUIRED', GETPOST('EXPENSEREPORT_PROJECT_IS_REQUIRED', 'int'), 'chaine', 0, '', $conf->entity);
+		$res3 = dolibarr_set_const($db, 'EXPENSEREPORT_PROJECT_IS_REQUIRED', GETPOSTINT('EXPENSEREPORT_PROJECT_IS_REQUIRED'), 'chaine', 0, '', $conf->entity);
 	}
 
-	$dates = GETPOST('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', 'int');
+	$dates = GETPOSTINT('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH');
 	$res4 = dolibarr_set_const($db, 'EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', intval($dates), 'chaine', 0, '', $conf->entity);
 
-	$amounts = GETPOST('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', 'int');
+	$amounts = GETPOSTINT('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY');
 	$res5 = dolibarr_set_const($db, 'EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', intval($amounts), 'chaine', 0, '', $conf->entity);
 
 	if (!($res1 > 0) || !($res2 > 0) || !($res3 >= 0) || !($res4 >0) || !($res5 >0)) {
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 639fcf50077..b3f22626264 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -60,11 +60,11 @@ if (empty($reshook)) {
 	$error = false;
 
 	$action = GETPOST('action', 'aZ09');
-	$id = GETPOST('id', 'int');
+	$id = GETPOSTINT('id');
 
 	$apply_to = GETPOST('apply_to');
-	$fk_user = GETPOST('fk_user', 'int');
-	$fk_usergroup = GETPOST('fk_usergroup', 'int');
+	$fk_user = GETPOSTINT('fk_user');
+	$fk_usergroup = GETPOSTINT('fk_usergroup');
 	$restrictive = GETPOSTINT('restrictive');
 	$fk_c_type_fees = GETPOSTINT('fk_c_type_fees');
 	$code_expense_rules_type = GETPOST('code_expense_rules_type');
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index b9c200b3b50..4d1b5cc3bed 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -68,8 +68,8 @@ if ($result) {
 }
 
 if ($action == 'add' || GETPOST("modify")) {
-	$external_rss_title = "external_rss_title_".GETPOST("norss", 'int');
-	$external_rss_urlrss = "external_rss_urlrss_".GETPOST("norss", 'int');
+	$external_rss_title = "external_rss_title_".GETPOSTINT("norss");
+	$external_rss_urlrss = "external_rss_urlrss_".GETPOSTINT("norss");
 
 	if (GETPOST($external_rss_urlrss, 'alpha')) {
 		$boxlabel = '(ExternalRSSInformations)';
@@ -93,7 +93,7 @@ if ($action == 'add' || GETPOST("modify")) {
 		} else {
 			// Ajoute boite box_external_rss dans definition des boites
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
-			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
+			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOSTINT("norss").' ('.GETPOSTINT($external_rss_title)).")')";
 			if (!$db->query($sql)) {
 				dol_print_error($db);
 				$error++;
@@ -101,9 +101,9 @@ if ($action == 'add' || GETPOST("modify")) {
 			//print $sql;exit;
 		}
 
-		$result1 = dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), GETPOST($external_rss_title, 'alpha'), 'chaine', 0, '', $conf->entity);
+		$result1 = dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_".GETPOSTINT("norss"), GETPOSTINT($external_rss_title), 'chaine', 0, '', $conf->entity);
 		if ($result1) {
-			$consttosave = "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int');
+			$consttosave = "EXTERNAL_RSS_URLRSS_".GETPOSTINT("norss");
 			$urltosave = GETPOST($external_rss_urlrss, 'alpha');
 			$result2 = dolibarr_set_const($db, $consttosave, $urltosave, 'chaine', 0, '', $conf->entity);
 			//var_dump($result2);exit;
@@ -121,12 +121,12 @@ if ($action == 'add' || GETPOST("modify")) {
 }
 
 if (GETPOST("delete")) {
-	if (GETPOST("norss", 'int')) {
+	if (GETPOSTINT("norss")) {
 		$db->begin();
 
 		// Supprime boite box_external_rss de definition des boites
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
-		$sql .= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
+		$sql .= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOSTINT("norss"))." %'";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -161,9 +161,9 @@ if (GETPOST("delete")) {
 		}
 
 
-		$result1 = dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), $conf->entity);
+		$result1 = dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_".GETPOSTINT("norss"), $conf->entity);
 		if ($result1) {
-			$result2 = dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), $conf->entity);
+			$result2 = dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_".GETPOSTINT("norss"), $conf->entity);
 		}
 
 		if ($result1 && $result2) {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 30525d92a68..a28e5d57482 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -230,7 +230,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'set_INVOICE_CHECK_POSTERIOR_DATE') {
-	$check_posterior_date = GETPOST('INVOICE_CHECK_POSTERIOR_DATE', 'int');
+	$check_posterior_date = GETPOSTINT('INVOICE_CHECK_POSTERIOR_DATE');
 	$res = dolibarr_set_const($db, 'INVOICE_CHECK_POSTERIOR_DATE', $check_posterior_date, 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index ae0c57284df..e0c92c8f663 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -73,7 +73,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'update') {
-	$max_rank = GETPOST('HRM_MAXRANK', 'int');
+	$max_rank = GETPOSTINT('HRM_MAXRANK');
 
 	// We complete skill possible level notation if necessary
 	if (!empty($max_rank)) {
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 2e13c2d5c7a..1d27c5b2dbd 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -248,17 +248,17 @@ if ($action == 'update') {
 		dolibarr_set_const($db, "MAIN_LANG_DEFAULT", GETPOST("MAIN_LANG_DEFAULT", 'aZ09'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
 
-		dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", GETPOST("MAIN_SIZE_LISTE_LIMIT", 'int'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", GETPOST("main_size_shortliste_limit", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", GETPOSTINT("MAIN_SIZE_LISTE_LIMIT"), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", GETPOSTINT("main_size_shortliste_limit"), 'chaine', 0, '', $conf->entity);
 
 		if (GETPOSTISSET("MAIN_CHECKBOX_LEFT_COLUMN")) {
-			dolibarr_set_const($db, "MAIN_CHECKBOX_LEFT_COLUMN", GETPOST("MAIN_CHECKBOX_LEFT_COLUMN", 'int'), 'chaine', 0, '', $conf->entity);
+			dolibarr_set_const($db, "MAIN_CHECKBOX_LEFT_COLUMN", GETPOSTINT("MAIN_CHECKBOX_LEFT_COLUMN"), 'chaine', 0, '', $conf->entity);
 		}
 
 		//dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", GETPOST("MAIN_DISABLE_JAVASCRIPT", 'aZ09'), 'chaine', 0, '', $conf->entity);
 		//dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
 		//dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", GETPOST("MAIN_MENU_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_START_WEEK", GETPOST("MAIN_START_WEEK", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_START_WEEK", GETPOSTINT("MAIN_START_WEEK"), 'chaine', 0, '', $conf->entity);
 
 		dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", GETPOST("MAIN_DEFAULT_WORKING_HOURS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -318,7 +318,7 @@ if ($action == 'update') {
 		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
 	}
 
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup&mode=".$mode.(GETPOSTISSET('page_y') ? '&page_y='.GETPOST('page_y', 'int') : ''));
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup&mode=".$mode.(GETPOSTISSET('page_y') ? '&page_y='.GETPOSTINT('page_y') : ''));
 	exit;
 }
 
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index cc1fd97fe62..dcf59d40d8b 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -65,7 +65,7 @@ if (empty($reshook)) {
 		if (!dolibarr_set_const($db, 'LDAP_SERVER_TYPE', GETPOST("type", 'aZ09'), 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
-		if (!dolibarr_set_const($db, 'LDAP_USERACCOUNTCONTROL', GETPOST("userAccountControl", 'int'), 'chaine', 0, '', $conf->entity)) {
+		if (!dolibarr_set_const($db, 'LDAP_USERACCOUNTCONTROL', GETPOSTINT("userAccountControl"), 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
 		if (!dolibarr_set_const($db, 'LDAP_SERVER_PROTOCOLVERSION', GETPOST("LDAP_SERVER_PROTOCOLVERSION", 'aZ09'), 'chaine', 0, '', $conf->entity)) {
@@ -77,7 +77,7 @@ if (empty($reshook)) {
 		if (!dolibarr_set_const($db, 'LDAP_SERVER_HOST_SLAVE', GETPOST("slave", 'alphanohtml'), 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
-		if (!dolibarr_set_const($db, 'LDAP_SERVER_PORT', GETPOST("port", 'int'), 'chaine', 0, '', $conf->entity)) {
+		if (!dolibarr_set_const($db, 'LDAP_SERVER_PORT', GETPOSTINT("port"), 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
 		if (!dolibarr_set_const($db, 'LDAP_SERVER_DN', GETPOST("dn", 'alphanohtml'), 'chaine', 0, '', $conf->entity)) {
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 41699a84709..a4911e94e52 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -45,8 +45,8 @@ $mainmaxdecimalstot = 'MAIN_MAX_DECIMALS_TOT'.(!empty($currencycode) ? '_'.$curr
 $mainmaxdecimalsshown = 'MAIN_MAX_DECIMALS_SHOWN'.(!empty($currencycode) ? '_'.$currencycode : '');
 $mainroundingruletot = 'MAIN_ROUNDING_RULE_TOT'.(!empty($currencycode) ? '_'.$currencycode : '');
 
-$valmainmaxdecimalsunit = GETPOST($mainmaxdecimalsunit, 'int');
-$valmainmaxdecimalstot = GETPOST($mainmaxdecimalstot, 'int');
+$valmainmaxdecimalsunit = GETPOSTINT($mainmaxdecimalsunit);
+$valmainmaxdecimalstot = GETPOSTINT($mainmaxdecimalstot);
 $valmainmaxdecimalsshown = GETPOST($mainmaxdecimalsshown, 'alpha');	// Can be 'x.y' but also 'x...'
 $valmainroundingruletot = price2num(GETPOST($mainroundingruletot, 'alphanohtml'), '', 2);
 
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 417e90f9ef4..93a47a30e5e 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -51,7 +51,7 @@ if ($action == 'setvalue') {
 	$mailerror = GETPOST('MAILING_EMAIL_ERRORSTO', 'alpha');
 	$checkread = GETPOST('value', 'alpha');
 	$checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha');
-	$contactbulkdefault = GETPOST('MAILING_CONTACT_DEFAULT_BULK_STATUS', 'int');
+	$contactbulkdefault = GETPOSTINT('MAILING_CONTACT_DEFAULT_BULK_STATUS');
 	if (GETPOST('MAILING_DELAY', 'alpha') != '') {
 		$mailingdelay = price2num(GETPOST('MAILING_DELAY', 'alpha'), 3);		// Not less than 1 millisecond.
 	} else {
@@ -98,7 +98,7 @@ if ($action == 'setvalue') {
 	}
 }
 if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
-	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
+	$setonsearchandlistgooncustomerorsuppliercard = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index cdda45c2a90..e224b75a986 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -86,13 +86,13 @@ if ($action == 'update' && !$cancel) {
 	}
 
 	if (!$error) {
-		dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOSTINT("MAIN_DISABLE_ALL_MAILS"), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT", 'int'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, 'MAIN_MAIL_NO_WITH_TO_SELECTED', GETPOST('MAIN_MAIL_NO_WITH_TO_SELECTED', 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOSTINT("MAIN_MAIL_ENABLED_USER_DEST_SELECT"), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, 'MAIN_MAIL_NO_WITH_TO_SELECTED', GETPOSTINT('MAIN_MAIL_NO_WITH_TO_SELECTED'), 'chaine', 0, '', $conf->entity);
 		// Send mode parameters
 		dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE", 'aZ09'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOSTINT("MAIN_MAIL_SMTP_PORT"), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW")) {
@@ -104,11 +104,11 @@ if ($action == 'update' && !$cancel) {
 		if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE")) {
 			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		}
-		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOSTINT("MAIN_MAIL_EMAIL_TLS"), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOSTINT("MAIN_MAIL_EMAIL_STARTTLS"), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOSTINT("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED"), 'chaine', 0, '', $conf->entity);
 
-		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOSTINT("MAIN_MAIL_EMAIL_DKIM_ENABLED"), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index d0a452061de..1d718819e79 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("errors", "admin", "mails", "languages"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -44,14 +44,14 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -88,8 +88,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -203,7 +203,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if ($action == 'delete') {
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_email_senderprofile WHERE rowid = ".GETPOST('id', 'int');
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_email_senderprofile WHERE rowid = ".GETPOSTINT('id');
 		$resql = $db->query($sql);
 		if ($resql) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
@@ -268,7 +268,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -397,9 +397,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -453,11 +453,11 @@ if ($action != 'create') {
 		print '</td></tr>';
 		print '<tr><td>'.$langs->trans("User").'</td><td>';
 		print img_picto('', 'user', 'class="pictofixedwidth"');
-		print $form->select_dolusers((GETPOSTISSET('private') ? GETPOST('private', 'int') : $object->private), 'private', 1, null, 0, ($user->admin ? '' : $user->id));
+		print $form->select_dolusers((GETPOSTISSET('private') ? GETPOSTINT('private') : $object->private), 'private', 1, null, 0, ($user->admin ? '' : $user->id));
 		print '</td></tr>';
-		print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.(GETPOSTISSET('position') ? GETPOST('position', 'int') : $object->position).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.(GETPOSTISSET('position') ? GETPOSTINT('position') : $object->position).'"></td></tr>';
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
-		print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], (GETPOSTISSET('active') ? GETPOST('active', 'int') : $object->active), 0, 0, 0, '', 1);
+		print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], (GETPOSTISSET('active') ? GETPOSTINT('active') : $object->active), 0, 0, 0, '', 1);
 		print '</td></tr>';
 		print '</table>';
 
@@ -485,11 +485,11 @@ if ($action != 'create') {
 	print '</td></tr>';
 	print '<tr><td>'.$langs->trans("User").'</td><td>';
 	print img_picto('', 'user', 'class="pictofixedwidth"');
-	print $form->select_dolusers((GETPOSTISSET('private') ? GETPOST('private', 'int') : -1), 'private', 1, null, 0, ($user->admin ? '' : $user->id));
+	print $form->select_dolusers((GETPOSTISSET('private') ? GETPOSTINT('private') : -1), 'private', 1, null, 0, ($user->admin ? '' : $user->id));
 	print '</td></tr>';
-	print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.GETPOST('position', 'int').'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.GETPOSTINT('position').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-	print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], GETPOST('active', 'int'), 0);
+	print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], GETPOSTINT('active'), 0);
 	print '</td></tr>';
 	print '</table>';
 
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 13545002911..cc9b100d393 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -62,7 +62,7 @@ $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $mode = GETPOST('mode', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
 $search_label = GETPOST('search_label', 'alphanohtml'); // Must allow value like 'Abc Def' or '(MyTemplateName)'
 $search_type_template = GETPOST('search_type_template', 'alpha');
@@ -81,10 +81,10 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ? GETPOST('listlimit', 'alpha') : 1000;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -401,12 +401,12 @@ if (empty($reshook)) {
 					if (!$user->admin) {	// A non admin user can only edit its own template
 						$sql .= " ".((int) $user->id);
 					} else {
-						$sql .= " ".((int) GETPOST($keycode, 'int'));
+						$sql .= " ".(GETPOSTINT($keycode));
 					}
 				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
 				} elseif (in_array($keycode, array('joinfiles', 'defaultfortype', 'private', 'position', 'entity'))) {
-					$sql .= (int) GETPOST($keycode, 'int');
+					$sql .= GETPOSTINT($keycode);
 				} else {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
 				}
@@ -454,7 +454,7 @@ if (empty($reshook)) {
 				}
 
 				// Rename some POST variables into a generic name
-				if ($field == 'fk_user' && !(GETPOST('fk_user', 'int') > 0)) {
+				if ($field == 'fk_user' && !(GETPOSTINT('fk_user') > 0)) {
 					$_POST['fk_user'] = '';
 				}
 				if ($field == 'topic') {
@@ -483,12 +483,12 @@ if (empty($reshook)) {
 					if (!$user->admin) {	// A non admin user can only edit its own template
 						$sql .= " ".((int) $user->id);
 					} else {
-						$sql .= " ".((int) GETPOST($keycode, 'int'));
+						$sql .= " ".(GETPOSTINT($keycode));
 					}
 				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
 				} elseif (in_array($keycode, array('joinfiles', 'defaultfortype', 'private', 'position'))) {
-					$sql .= (int) GETPOST($keycode, 'int');
+					$sql .= GETPOSTINT($keycode);
 				} else {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
 				}
@@ -693,8 +693,8 @@ if ($action == 'create') {
 	$obj->label = GETPOST('label');
 	$obj->lang = GETPOST('lang');
 	$obj->type_template = GETPOST('type_template');
-	$obj->fk_user = GETPOST('fk_user', 'int');
-	$obj->private = GETPOST('private', 'int');
+	$obj->fk_user = GETPOSTINT('fk_user');
+	$obj->private = GETPOSTINT('private');
 	$obj->position = GETPOST('position');
 	$obj->topic = GETPOST('topic');
 	$obj->joinfiles = GETPOST('joinfiles');
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 3b680f93a7b..f2969e5ed69 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -133,7 +133,7 @@ if ($action == 'add') {
 		$menu->prefix = (string) GETPOST('picto', 'restricthtmlallowclass');
 		$menu->url = (string) GETPOST('url', 'alphanohtml');
 		$menu->langs = (string) GETPOST('langs', 'alphanohtml');
-		$menu->position = (int) GETPOST('position', 'int');
+		$menu->position = GETPOSTINT('position');
 		$menu->enabled = (string) GETPOST('enabled', 'alphanohtml');
 		$menu->perms = (string) GETPOST('perms', 'alphanohtml');
 		$menu->target = (string) GETPOST('target', 'alphanohtml');
@@ -187,14 +187,14 @@ if ($action == 'update') {
 
 		if (!$error) {
 			$menu = new Menubase($db);
-			$result = $menu->fetch(GETPOST('menuId', 'int'));
+			$result = $menu->fetch(GETPOSTINT('menuId'));
 			if ($result > 0) {
 				$menu->title = (string) GETPOST('titre', 'alphanohtml');
 				$menu->prefix = (string) GETPOST('picto', 'restricthtmlallowclass');
 				$menu->leftmenu = (string) GETPOST('leftmenu', 'aZ09');
 				$menu->url = (string) GETPOST('url', 'alphanohtml');
 				$menu->langs = (string) GETPOST('langs', 'alphanohtml');
-				$menu->position = (int) GETPOST('position', 'int');
+				$menu->position = GETPOSTINT('position');
 				$menu->enabled = (string) GETPOST('enabled', 'alphanohtml');
 				$menu->perms = (string) GETPOST('perms', 'alphanohtml');
 				$menu->target = (string) GETPOST('target', 'alphanohtml');
@@ -274,7 +274,7 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewMenu"), '', 'title_setup');
 
-	print '<form action="'.DOL_URL_ROOT.'/admin/menus/edit.php?action=add&token='.newToken().'&menuId='.GETPOST('menuId', 'int').'" method="post" name="formmenucreate">';
+	print '<form action="'.DOL_URL_ROOT.'/admin/menus/edit.php?action=add&token='.newToken().'&menuId='.GETPOSTINT('menuId').'" method="post" name="formmenucreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	print dol_get_fiche_head();
@@ -283,16 +283,16 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	// Id
-	$parent_rowid = GETPOST('menuId', 'int');
+	$parent_rowid = GETPOSTINT('menuId');
 	$parent_mainmenu = '';
 	$parent_leftmenu = '';
 	$parent_langs = '';
 	$parent_level = '';
 
-	if (GETPOST('menuId', 'int')) {
+	if (GETPOSTINT('menuId')) {
 		$sql = "SELECT m.rowid, m.mainmenu, m.leftmenu, m.level, m.langs";
 		$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-		$sql .= " WHERE m.rowid = ".((int) GETPOST('menuId', 'int'));
+		$sql .= " WHERE m.rowid = ".(GETPOSTINT('menuId'));
 		$res = $db->query($sql);
 		if ($res) {
 			while ($menu = $db->fetch_array($res)) {
@@ -408,7 +408,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="handler_origine" value="'.$menu_handler.'">';
-	print '<input type="hidden" name="menuId" value="'.GETPOST('menuId', 'int').'">';
+	print '<input type="hidden" name="menuId" value="'.GETPOSTINT('menuId').'">';
 
 	print dol_get_fiche_head();
 
@@ -416,7 +416,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	$menu = new Menubase($db);
-	$result = $menu->fetch(GETPOST('menuId', 'int'));
+	$result = $menu->fetch(GETPOSTINT('menuId'));
 	//var_dump($menu);
 
 	// Id
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index d18f205f4de..c6099a88c6c 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -75,7 +75,7 @@ if ($action == 'up') {
 	// Get current position
 	$sql = "SELECT m.rowid, m.position, m.type, m.fk_menu";
 	$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql .= " WHERE m.rowid = ".GETPOST("menuId", "int");
+	$sql .= " WHERE m.rowid = ".GETPOSTINT("menuId");
 	dol_syslog("admin/menus/index.php ".$sql);
 	$result = $db->query($sql);
 	$num = $db->num_rows($result);
@@ -92,7 +92,7 @@ if ($action == 'up') {
 	// Menu before
 	$sql = "SELECT m.rowid, m.position";
 	$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql .= " WHERE (m.position < ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid < ".GETPOST("menuId", "int")."))";
+	$sql .= " WHERE (m.position < ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid < ".GETPOSTINT("menuId")."))";
 	$sql .= " AND m.menu_handler='".$db->escape($menu_handler_to_search)."'";
 	$sql .= " AND m.entity = ".$conf->entity;
 	$sql .= " AND m.type = '".$db->escape($current['type'])."'";
@@ -126,7 +126,7 @@ if ($action == 'up') {
 	// Get current position
 	$sql = "SELECT m.rowid, m.position, m.type, m.fk_menu";
 	$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql .= " WHERE m.rowid = ".GETPOST("menuId", "int");
+	$sql .= " WHERE m.rowid = ".GETPOSTINT("menuId");
 	dol_syslog("admin/menus/index.php ".$sql);
 	$result = $db->query($sql);
 	$num = $db->num_rows($result);
@@ -143,7 +143,7 @@ if ($action == 'up') {
 	// Menu after
 	$sql = "SELECT m.rowid, m.position";
 	$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql .= " WHERE (m.position > ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid > ".GETPOST("menuId", "int")."))";
+	$sql .= " WHERE (m.position > ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid > ".GETPOSTINT("menuId")."))";
 	$sql .= " AND m.menu_handler='".$db->escape($menu_handler_to_search)."'";
 	$sql .= " AND m.entity = ".$conf->entity;
 	$sql .= " AND m.type = '".$db->escape($current['type'])."'";
@@ -174,7 +174,7 @@ if ($action == 'up') {
 	$db->begin();
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-	$sql .= " WHERE rowid = ".GETPOST('menuId', 'int');
+	$sql .= " WHERE rowid = ".GETPOSTINT('menuId');
 	$resql = $db->query($sql);
 	if ($resql) {
 		$db->commit();
@@ -231,11 +231,11 @@ print "<br>\n";
 if ($action == 'delete') {
 	$sql = "SELECT m.titre as title";
 	$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql .= " WHERE m.rowid = ".GETPOST('menuId', 'int');
+	$sql .= " WHERE m.rowid = ".GETPOSTINT('menuId');
 	$result = $db->query($sql);
 	$obj = $db->fetch_object($result);
 
-	print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->title), "confirm_delete");
+	print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOSTINT('menuId'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->title), "confirm_delete");
 }
 
 $newcardbutton = '';
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 8ef166d933c..dd91a52a04d 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('errors', 'admin', 'modulebuilder', 'exports'));
 
 $mode = GETPOST('mode', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if (empty($mode)) {
 	$mode = 'desc';
 }
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 62c612ab24a..d24c833cb85 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -56,7 +56,7 @@ if (GETPOSTISSET('mode')) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$page_y = GETPOST('page_y', 'int');
+$page_y = GETPOSTINT('page_y');
 $search_keyword = GETPOST('search_keyword', 'alpha');
 $search_status = GETPOST('search_status', 'alpha');
 $search_nature = GETPOST('search_nature', 'alpha');
@@ -66,9 +66,9 @@ $search_version = GETPOST('search_version', 'alpha');
 // For dolistore search
 $options              = array();
 $options['per_page']  = 20;
-$options['categorie'] = ((int) (GETPOST('categorie', 'int') ? GETPOST('categorie', 'int') : 0));
-$options['start']     = ((int) (GETPOST('start', 'int') ? GETPOST('start', 'int') : 0));
-$options['end']       = ((int) (GETPOST('end', 'int') ? GETPOST('end', 'int') : 0));
+$options['categorie'] = ((int) (GETPOSTINT('categorie') ? GETPOSTINT('categorie') : 0));
+$options['start']     = ((int) (GETPOSTINT('start') ? GETPOSTINT('start') : 0));
+$options['end']       = ((int) (GETPOSTINT('end') ? GETPOSTINT('end') : 0));
 $options['search']    = GETPOST('search_keyword', 'alpha');
 $dolistore            = new Dolistore(false);
 
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 08822da9a59..6121350b972 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -100,7 +100,7 @@ if ($action == 'add_currency') {
 	$error = 0;
 
 	if (GETPOST('updatecurrency', 'alpha')) {
-		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
+		$fk_multicurrency = GETPOSTINT('fk_multicurrency');
 		$rate = price2num(GETPOST('rate', 'alpha'));
 		$currency = new MultiCurrency($db);
 
@@ -117,7 +117,7 @@ if ($action == 'add_currency') {
 			}
 		}
 	} elseif (GETPOST('deletecurrency', 'alpha')) {
-		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
+		$fk_multicurrency = GETPOSTINT('fk_multicurrency');
 		$currency = new MultiCurrency($db);
 
 		if ($currency->fetch($fk_multicurrency) > 0) {
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 5fd744ca88b..55dc6212a60 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -79,7 +79,7 @@ if ($action == 'setparams') {
 		$error++;
 	}
 
-	$res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOSTINT('PAYMENTS_REPORT_GROUP_BY_MOD'), 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
 	}
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index e5fe6cc018c..43e2f1473d2 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -50,7 +50,7 @@ $type = 'paymentorder';
 if ($action == "set") {
 	$db->begin();
 
-	$id = GETPOST('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 'int');
+	$id = GETPOSTINT('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT');
 	$account = new Account($db);
 	if ($account->fetch($id) > 0) {
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT", $id, 'chaine', 0, '', $conf->entity);
@@ -115,7 +115,7 @@ if ($action == "set") {
 
 if ($action == "addnotif") {
 	$bon = new BonPrelevement($db);
-	$bon->addNotification($db, GETPOST('user', 'int'), $action);
+	$bon->addNotification($db, GETPOSTINT('user'), $action);
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
@@ -123,7 +123,7 @@ if ($action == "addnotif") {
 
 if ($action == "deletenotif") {
 	$bon = new BonPrelevement($db);
-	$bon->deleteNotificationById(GETPOST('notif', 'int'));
+	$bon->deleteNotificationById(GETPOSTINT('notif'));
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index e9af7bdc816..a792c664a6c 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -137,7 +137,7 @@ if ($action == 'update') {
 	}
 
 	if (GETPOSTISSET('MAIN_DOCUMENTS_LOGO_HEIGHT')) {
-		dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOSTINT("MAIN_DOCUMENTS_LOGO_HEIGHT"), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET('MAIN_INVERT_SENDER_RECIPIENT')) {
 		dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", GETPOST("MAIN_INVERT_SENDER_RECIPIENT"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 2c76236310c..31becefc379 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -75,10 +75,10 @@ if ($action == 'update') {
 		dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN", GETPOST("MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN"), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH')) {
-		dolibarr_set_const($db, "MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", GETPOST("MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", GETPOSTINT("MAIN_DOCUMENTS_WITH_PICTURE_WIDTH"), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET('INVOICE_ADD_ZATCA_QR_CODE')) {
-		dolibarr_set_const($db, "INVOICE_ADD_ZATCA_QR_CODE", GETPOST("INVOICE_ADD_ZATCA_QR_CODE", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INVOICE_ADD_ZATCA_QR_CODE", GETPOSTINT("INVOICE_ADD_ZATCA_QR_CODE"), 'chaine', 0, '', $conf->entity);
 		if (GETPOSTINT('INVOICE_ADD_ZATCA_QR_CODE') == 1) {
 			dolibarr_del_const($db, "INVOICE_ADD_SWISS_QR_CODE", $conf->entity);
 		}
@@ -90,10 +90,10 @@ if ($action == 'update') {
 		}
 	}
 	if (GETPOSTISSET('INVOICE_CATEGORY_OF_OPERATION')) {
-		dolibarr_set_const($db, "INVOICE_CATEGORY_OF_OPERATION", GETPOST("INVOICE_CATEGORY_OF_OPERATION", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INVOICE_CATEGORY_OF_OPERATION", GETPOSTINT("INVOICE_CATEGORY_OF_OPERATION"), 'chaine', 0, '', $conf->entity);
 	}
 	if (GETPOSTISSET('INVOICE_SHOW_SHIPPING_ADDRESS')) {
-		dolibarr_set_const($db, "INVOICE_SHOW_SHIPPING_ADDRESS", GETPOST("INVOICE_SHOW_SHIPPING_ADDRESS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INVOICE_SHOW_SHIPPING_ADDRESS", GETPOSTINT("INVOICE_SHOW_SHIPPING_ADDRESS"), 'chaine', 0, '', $conf->entity);
 		dolibarr_del_const($db, "INVOICE_SHOW_SHIPPING_ADDRESS", $conf->entity);
 	}
 
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index e7c4bd3fbb4..b74904f0a9f 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -47,14 +47,14 @@ $entity = $conf->entity;
 
 if ($action == 'add') {
 	$sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1";
-	$sql .= " WHERE id = ".GETPOST("pid", 'int');
+	$sql .= " WHERE id = ".GETPOSTINT("pid");
 	$sql .= " AND entity = ".$conf->entity;
 	$db->query($sql);
 }
 
 if ($action == 'remove') {
 	$sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0";
-	$sql .= " WHERE id = ".GETPOST('pid', 'int');
+	$sql .= " WHERE id = ".GETPOSTINT('pid');
 	$sql .= " AND entity = ".$conf->entity;
 	$db->query($sql);
 }
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 8e25b9295b9..f1add49e837 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -52,7 +52,7 @@ $error = 0;
 if ($action == "set") {
 	$db->begin();
 
-	$id = GETPOST('PRELEVEMENT_ID_BANKACCOUNT', 'int');
+	$id = GETPOSTINT('PRELEVEMENT_ID_BANKACCOUNT');
 	$account = new Account($db);
 	if ($account->fetch($id) > 0) {
 		$res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id, 'chaine', 0, '', $conf->entity);
@@ -118,7 +118,7 @@ if ($action == "set") {
 
 if ($action == "addnotif") {
 	$bon = new BonPrelevement($db);
-	$bon->addNotification($db, GETPOST('user', 'int'), $action);
+	$bon->addNotification($db, GETPOSTINT('user'), $action);
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
@@ -126,7 +126,7 @@ if ($action == "addnotif") {
 
 if ($action == "deletenotif") {
 	$bon = new BonPrelevement($db);
-	$bon->deleteNotificationById(GETPOST('notif', 'int'));
+	$bon->deleteNotificationById(GETPOSTINT('notif'));
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 2c7f58be336..6b7c5f686ed 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -44,12 +44,12 @@ $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 
 $printername = GETPOST('printername', 'alpha');
-$printerid = GETPOST('printerid', 'int');
+$printerid = GETPOSTINT('printerid');
 $parameter = GETPOST('parameter', 'alpha');
 
 $template = GETPOST('template', 'alphanohtml');
 $templatename = GETPOST('templatename', 'alpha');
-$templateid = GETPOST('templateid', 'int');
+$templateid = GETPOSTINT('templateid');
 
 $printer = new dolReceiptPrinter($db);
 
@@ -89,7 +89,7 @@ if ($action == 'addprinter' && $user->admin) {
 
 	if (!$error) {
 		$db->begin();
-		$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
+		$result = $printer->addPrinter($printername, GETPOSTINT('printertypeid'), GETPOSTINT('printerprofileid'), $parameter);
 		if ($result > 0) {
 			$error++;
 		}
@@ -139,7 +139,7 @@ if ($action == 'updateprinter' && $user->admin) {
 
 	if (!$error) {
 		$db->begin();
-		$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
+		$result = $printer->updatePrinter($printername, GETPOSTINT('printertypeid'), GETPOSTINT('printerprofileid'), $parameter, $printerid);
 		if ($result > 0) {
 			$error++;
 		}
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index c1e01049a65..c8ac3fa4423 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -131,7 +131,7 @@ if ($action == 'updateMask') {
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setparams') {
-	$res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOSTINT('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD'), 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
 	}
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index f917784870e..fc745fb998c 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -71,7 +71,7 @@ if ($action == 'update') {
 	$error = 0;
 
 	// Tax mode
-	$tax_mode = GETPOST('tax_mode', 'int');
+	$tax_mode = GETPOSTINT('tax_mode');
 
 	$db->begin();
 
@@ -122,7 +122,7 @@ if ($action == 'update') {
 
 	dolibarr_set_const($db, "MAIN_INFO_VAT_RETURN", GETPOST("MAIN_INFO_VAT_RETURN", 'alpha'), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_INFO_TVA_DAY_DEADLINE_SUBMISSION", GETPOST("deadline_day_vat", 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_TVA_DAY_DEADLINE_SUBMISSION", GETPOSTINT("deadline_day_vat"), 'chaine', 0, '', $conf->entity);
 
 	if (!$error) {
 		$db->commit();
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 6ca24301575..19405ddbf4b 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -86,7 +86,7 @@ if ($action == 'updateMask') {
 	}
 } elseif (preg_match('/set_(.*)/', $action, $reg)) {
 	$code = $reg[1];
-	$value = GETPOSTISSET($code) ? GETPOST($code, 'int') : 1;
+	$value = GETPOSTISSET($code) ? GETPOSTINT($code) : 1;
 	if ($code == 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS' && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
@@ -152,20 +152,20 @@ if ($action == 'updateMask') {
 	}
 
 	if (GETPOSTISSET('product_category_id')) {
-		$param_ticket_product_category = GETPOST('product_category_id', 'int');
+		$param_ticket_product_category = GETPOSTINT('product_category_id');
 		$res = dolibarr_set_const($db, 'TICKET_PRODUCT_CATEGORY', $param_ticket_product_category, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
 		}
 	}
 
-	$param_delay_first_response = GETPOST('delay_first_response', 'int');
+	$param_delay_first_response = GETPOSTINT('delay_first_response');
 	$res = dolibarr_set_const($db, 'TICKET_DELAY_BEFORE_FIRST_RESPONSE', $param_delay_first_response, 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
 	}
 
-	$param_delay_between_responses = GETPOST('delay_between_responses', 'int');
+	$param_delay_between_responses = GETPOSTINT('delay_between_responses');
 	$res = dolibarr_set_const($db, 'TICKET_DELAY_SINCE_LAST_RESPONSE', $param_delay_between_responses, 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index e58b0599b76..942ff6662c0 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -163,7 +163,7 @@ if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	}
 } elseif (preg_match('/set_(.*)/', $action, $reg)) {
 	$code = $reg[1];
-	$value = GETPOSTISSET($code) ? GETPOST($code, 'int') : 1;
+	$value = GETPOSTISSET($code) ? GETPOSTINT($code) : 1;
 	if ($code == 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS' && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 48781cd43e2..a3ffe8a8c53 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -34,7 +34,7 @@ $action = GETPOST('action', 'aZ09');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -44,7 +44,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index e01aa09e96b..a708e51adfa 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -38,10 +38,10 @@ $export_type = GETPOST('export_type', 'alpha');
 $file = dol_sanitizeFileName(GETPOST('filename_template', 'alpha'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -68,7 +68,7 @@ $utils = new Utils($db);
 
 if ($file && !$what) {
 	//print DOL_URL_ROOT.'/dolibarr_export.php';
-	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportMethod"))).(GETPOST('page_y', 'int') ? '&page_y='.GETPOST('page_y', 'int') : ''));
+	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportMethod"))).(GETPOSTINT('page_y') ? '&page_y='.GETPOSTINT('page_y') : ''));
 	exit;
 }
 
@@ -222,5 +222,5 @@ top_httphead();
 $db->close();
 
 // Redirect to backup page
-header("Location: dolibarr_export.php".(GETPOST('page_y', 'int') ? '?page_y='.GETPOST('page_y', 'int') : ''));
+header("Location: dolibarr_export.php".(GETPOSTINT('page_y') ? '?page_y='.GETPOSTINT('page_y') : ''));
 exit();
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 1907e451b53..551a90c7b67 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -47,7 +47,7 @@ $file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2|\.zst)$/i', '', $
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -59,7 +59,7 @@ if ($page < 0) {
 } elseif (empty($page)) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 669d1fefac6..54fa535d5fc 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -47,10 +47,10 @@ if ($user->socid > 0) {
 $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals"));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -64,7 +64,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-$search_rowid = GETPOST("search_rowid", "int");
+$search_rowid = GETPOSTINT("search_rowid");
 $search_code = GETPOST("search_code", "alpha");
 $search_ip   = GETPOST("search_ip", "alpha");
 $search_user = GETPOST("search_user", "alpha");
@@ -76,13 +76,13 @@ $optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always ''
 $now = dol_now();
 $nowarray = dol_getdate($now);
 
-if (GETPOST("date_startmonth", 'int') > 0) {
-	$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth", 'int'), GETPOST("date_startday", 'int'), GETPOST("date_startyear", 'int'), 'tzuserrel');
+if (GETPOSTINT("date_startmonth") > 0) {
+	$date_start = dol_mktime(0, 0, 0, GETPOSTINT("date_startmonth"), GETPOSTINT("date_startday"), GETPOSTINT("date_startyear"), 'tzuserrel');
 } else {
 	$date_start = '';
 }
-if (GETPOST("date_endmonth", 'int') > 0) {
-	$date_end = dol_get_last_hour(dol_mktime(23, 59, 59, GETPOST("date_endmonth", 'int'), GETPOST("date_endday", 'int'), GETPOST("date_endyear", 'int'), 'tzuserrel'), 'tzuserrel');
+if (GETPOSTINT("date_endmonth") > 0) {
+	$date_end = dol_get_last_hour(dol_mktime(23, 59, 59, GETPOSTINT("date_endmonth"), GETPOSTINT("date_endday"), GETPOSTINT("date_endyear"), 'tzuserrel'), 'tzuserrel');
 } else {
 	$date_end = '';
 }
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 1254bdeedc7..4a1861be87b 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -47,10 +47,10 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index e23297cc251..04b8cee7488 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -35,7 +35,7 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
-$id = GETPOST('rowid', 'int');
+$id = GETPOSTINT('rowid');
 $action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optionscss', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
@@ -51,10 +51,10 @@ if ($mode == 'searchkey') {
 }
 
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -120,7 +120,7 @@ if ($action == 'update') {
 	if (!$error) {
 		$db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."overwrite_trans set transkey = '".$db->escape($transkey)."', transvalue = '".$db->escape($transvalue)."' WHERE rowid = ".((int) GETPOST('rowid', 'int'));
+		$sql = "UPDATE ".MAIN_DB_PREFIX."overwrite_trans set transkey = '".$db->escape($transkey)."', transvalue = '".$db->escape($transvalue)."' WHERE rowid = ".(GETPOSTINT('rowid'));
 		$result = $db->query($sql);
 		if ($result) {
 			$db->commit();
@@ -397,7 +397,7 @@ if ($mode == 'overwrite') {
 
 			print '<td>'.$obj->lang.'</td>'."\n";
 			print '<td>';
-			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
+			if ($action == 'edit' && $obj->rowid == GETPOSTINT('rowid')) {
 				print '<input type="text" class="quatrevingtpercent" name="transkey" value="'.dol_escape_htmltag($obj->transkey).'">';
 			} else {
 				print $obj->transkey;
@@ -411,7 +411,7 @@ if ($mode == 'overwrite') {
 			print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
 			print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
 			*/
-			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
+			if ($action == 'edit' && $obj->rowid == GETPOSTINT('rowid')) {
 				print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
 			} else {
 				//print $obj->transkey.' '.$langsenfileonly->tab_translate[$obj->transkey];
@@ -426,7 +426,7 @@ if ($mode == 'overwrite') {
 			print '</td>';
 
 			print '<td class="center">';
-			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
+			if ($action == 'edit' && $obj->rowid == GETPOSTINT('rowid')) {
 				print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
 				print '<input type="submit" class="button buttongen button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index ade787ae727..3bceb532a83 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -49,10 +49,10 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -238,7 +238,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$db->begin();
 
 		$website = new Website($db);
-		$rowid = GETPOST('rowid', 'int');
+		$rowid = GETPOSTINT('rowid');
 		$website->fetch($rowid);
 
 		// Modify entry
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 215ac230493..680cd961729 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -40,10 +40,10 @@ $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php
index 4641f61a021..f68e835a1ff 100644
--- a/htdocs/asset/accountancy_codes.php
+++ b/htdocs/asset/accountancy_codes.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.ph
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 181c9c209ef..7520dda55fc 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array("assets", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -51,10 +51,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 95459707381..434ee1f3318 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 $langs->loadLangs(array("assets", "other"));
 
 // Get parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
@@ -123,10 +123,10 @@ if (empty($reshook)) {
 
 	// Action dispose object
 	if ($action == 'confirm_disposal' && $confirm == 'yes' && $permissiontoadd) {
-		$object->disposal_date = dol_mktime(12, 0, 0, GETPOST('disposal_datemonth', 'int'), GETPOST('disposal_dateday', 'int'), GETPOST('disposal_dateyear', 'int')); // for date without hour, we use gmt
-		$object->disposal_amount_ht = GETPOST('disposal_amount', 'int');
-		$object->fk_disposal_type = GETPOST('fk_disposal_type', 'int');
-		$disposal_invoice_id = GETPOST('disposal_invoice_id', 'int');
+		$object->disposal_date = dol_mktime(12, 0, 0, GETPOSTINT('disposal_datemonth'), GETPOSTINT('disposal_dateday'), GETPOSTINT('disposal_dateyear')); // for date without hour, we use gmt
+		$object->disposal_amount_ht = GETPOSTINT('disposal_amount');
+		$object->fk_disposal_type = GETPOSTINT('fk_disposal_type');
+		$disposal_invoice_id = GETPOSTINT('disposal_invoice_id');
 		$object->disposal_depreciated = ((GETPOST('disposal_depreciated') == '1' || GETPOST('disposal_depreciated') == 'on') ? 1 : 0);
 		$object->disposal_subject_to_vat = ((GETPOST('disposal_subject_to_vat') == '1' || GETPOST('disposal_subject_to_vat') == 'on') ? 1 : 0);
 
@@ -136,7 +136,7 @@ if (empty($reshook)) {
 		}
 		$action = '';
 	} elseif ($action == "add") {
-		$object->supplier_invoice_id = GETPOST('supplier_invoice_id', 'int');
+		$object->supplier_invoice_id = GETPOSTINT('supplier_invoice_id');
 	}
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -189,7 +189,7 @@ if ($action == 'create') {
 	}
 	if (GETPOSTISSET('supplier_invoice_id')) {
 		$object->fields['supplier_invoice_id'] = array('type' => 'integer:FactureFournisseur:fourn/class/fournisseur.facture.class.php:1:entity IN (__SHARED_ENTITIES__)', 'label' => 'SupplierInvoice', 'enabled' => '1', 'noteditable' => '1', 'position' => 280, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => '1',);
-		print '<input type="hidden" name="supplier_invoice_id" value="' . GETPOST('supplier_invoice_id', 'int') . '">';
+		print '<input type="hidden" name="supplier_invoice_id" value="' . GETPOSTINT('supplier_invoice_id') . '">';
 	}
 
 	print dol_get_fiche_head(array(), '');
@@ -266,10 +266,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Disposal
 		$langs->load('bills');
 
-		$disposal_date = dol_mktime(12, 0, 0, GETPOST('disposal_datemonth', 'int'), GETPOST('disposal_dateday', 'int'), GETPOST('disposal_dateyear', 'int')); // for date without hour, we use gmt
-		$disposal_amount = GETPOST('disposal_amount', 'int');
-		$fk_disposal_type = GETPOST('fk_disposal_type', 'int');
-		$disposal_invoice_id = GETPOST('disposal_invoice_id', 'int');
+		$disposal_date = dol_mktime(12, 0, 0, GETPOSTINT('disposal_datemonth'), GETPOSTINT('disposal_dateday'), GETPOSTINT('disposal_dateyear')); // for date without hour, we use gmt
+		$disposal_amount = GETPOSTINT('disposal_amount');
+		$fk_disposal_type = GETPOSTINT('fk_disposal_type');
+		$disposal_invoice_id = GETPOSTINT('disposal_invoice_id');
 		$disposal_depreciated = GETPOSTISSET('disposal_depreciated') ? GETPOST('disposal_depreciated') : 1;
 		$disposal_depreciated = !empty($disposal_depreciated) ? 1 : 0;
 		$disposal_subject_to_vat = GETPOSTISSET('disposal_subject_to_vat') ? GETPOST('disposal_subject_to_vat') : 1;
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index 15b7f24c216..99497d1b23a 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -236,11 +236,11 @@ class AssetDepreciationOptions extends CommonObject
 				if (in_array($field_info['type'], array('text', 'html'))) {
 					$value = GETPOST($html_name, 'restricthtml');
 				} elseif ($field_info['type'] == 'date') {
-					$value = dol_mktime(12, 0, 0, GETPOST($html_name . 'month', 'int'), GETPOST($html_name . 'day', 'int'), GETPOST($html_name . 'year', 'int')); // for date without hour, we use gmt
+					$value = dol_mktime(12, 0, 0, GETPOSTINT($html_name . 'month'), GETPOSTINT($html_name . 'day'), GETPOSTINT($html_name . 'year')); // for date without hour, we use gmt
 				} elseif ($field_info['type'] == 'datetime') {
-					$value = dol_mktime(GETPOST($html_name . 'hour', 'int'), GETPOST($html_name . 'min', 'int'), GETPOST($html_name . 'sec', 'int'), GETPOST($html_name . 'month', 'int'), GETPOST($html_name . 'day', 'int'), GETPOST($html_name . 'year', 'int'), 'tzuserrel');
+					$value = dol_mktime(GETPOSTINT($html_name . 'hour'), GETPOSTINT($html_name . 'min'), GETPOSTINT($html_name . 'sec'), GETPOSTINT($html_name . 'month'), GETPOSTINT($html_name . 'day'), GETPOSTINT($html_name . 'year'), 'tzuserrel');
 				} elseif ($field_info['type'] == 'duration') {
-					$value = 60 * 60 * GETPOST($html_name . 'hour', 'int') + 60 * GETPOST($html_name . 'min', 'int');
+					$value = 60 * 60 * GETPOSTINT($html_name . 'hour') + 60 * GETPOSTINT($html_name . 'min');
 				} elseif (preg_match('/^(integer|price|real|double)/', $field_info['type'])) {
 					$value = price2num(GETPOST($html_name, 'alphanohtml')); // To fix decimal separator according to lang setup
 				} elseif ($field_info['type'] == 'boolean') {
diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php
index 6c8659aad9c..f20ccdbe7e7 100644
--- a/htdocs/asset/depreciation.php
+++ b/htdocs/asset/depreciation.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.ph
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php
index 0b771b216d5..6202e4f2b6f 100644
--- a/htdocs/asset/depreciation_options.php
+++ b/htdocs/asset/depreciation_options.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.ph
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php
index 98f07003db1..6ef7433061d 100644
--- a/htdocs/asset/disposal.php
+++ b/htdocs/asset/disposal.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 460b30d1a90..69112f6e619 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -37,14 +37,14 @@ $langs->loadLangs(array('assets', 'companies', 'other', 'mails'));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index a2f421410ea..427307532e2 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("assets", "other"));
 // Get parameters
 $action			= GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction		= GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files		= GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files		= GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm		= GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel			= GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect		= GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -44,13 +44,13 @@ $contextpage	= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'as
 $backtopage		= GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode			= GETPOST('mode', 'alpha');  // mode view (kanban or common)
-$id				= GETPOST('id', 'int');
+$id				= GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -87,8 +87,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -396,7 +396,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php
index 292c69defa7..61db2261bb1 100644
--- a/htdocs/asset/model/accountancy_codes.php
+++ b/htdocs/asset/model/accountancy_codes.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index e0b62ecec79..04739e21408 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 $langs->loadLangs(array("assets", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -51,10 +51,10 @@ if (GETPOST('actioncode', 'array')) {
 //$search_rowid = GETPOST('search_rowid');
 //$search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php
index 3ab71c675c4..31544663a62 100644
--- a/htdocs/asset/model/card.php
+++ b/htdocs/asset/model/card.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
 $langs->loadLangs(array("assets", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php
index 0000f2bf723..5beeb1a7a33 100644
--- a/htdocs/asset/model/depreciation_options.php
+++ b/htdocs/asset/model/depreciation_options.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.ph
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index 00db6f0417c..51033b5c2b1 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("assets", "other"));
 
 $action			= GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction		= GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files		= GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files		= GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm		= GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel			= GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect		= GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -42,13 +42,13 @@ $contextpage	= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'as
 $backtopage		= GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -87,8 +87,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -399,7 +399,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php
index 0476b6f4a57..e704b6ae390 100644
--- a/htdocs/asset/model/note.php
+++ b/htdocs/asset/model/note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index d2a89f96f0f..a87f252acc9 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 $langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
index 649a00e0797..8031d3576f1 100644
--- a/htdocs/asset/tpl/depreciation_options_edit.tpl.php
+++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
@@ -124,7 +124,7 @@ if (empty($reshook)) {
 				print img_picto('', $field_info['picto'], '', false, 0, 0, '', 'pictofixedwidth');
 			}
 			if (in_array($field_info['type'], array('int', 'integer'))) {
-				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'int') : $assetdepreciationoptions->$field_key;
+				$value = GETPOSTISSET($html_name) ? GETPOSTINT($html_name) : $assetdepreciationoptions->$field_key;
 			} elseif ($field_info['type'] == 'double') {
 				$value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name, 'alphanohtml')) : $assetdepreciationoptions->$field_key;
 			} elseif (preg_match('/^(text|html)/', $field_info['type'])) {
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 132c368114c..9f39d925bb6 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -45,10 +45,10 @@ $year = dol_print_date($now, '%Y');
 $month = dol_print_date($now, '%m');
 $day = dol_print_date($now, '%d');
 $forbarcode = GETPOST('forbarcode', 'alphanohtml');
-$fk_barcode_type = GETPOST('fk_barcode_type', 'int');
+$fk_barcode_type = GETPOSTINT('fk_barcode_type');
 $mode = GETPOST('mode', 'aZ09');
 $modellabel = GETPOST("modellabel", 'aZ09'); // Doc template to use
-$numberofsticker = GETPOST('numberofsticker', 'int');
+$numberofsticker = GETPOSTINT('numberofsticker');
 
 $mesg = '';
 
@@ -86,8 +86,8 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if (GETPOST('submitproduct') && GETPOST('submitproduct')) {
 		$action = ''; // We reset because we don't want to build doc
-		if (GETPOST('productid', 'int') > 0) {
-			$result = $producttmp->fetch(GETPOST('productid', 'int'));
+		if (GETPOSTINT('productid') > 0) {
+			$result = $producttmp->fetch(GETPOSTINT('productid'));
 			if ($result < 0) {
 				setEventMessage($producttmp->error, 'errors');
 			}
@@ -105,8 +105,8 @@ if (empty($reshook)) {
 	}
 	if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty')) {
 		$action = ''; // We reset because we don't want to build doc
-		if (GETPOST('socid', 'int') > 0) {
-			$thirdpartytmp->fetch(GETPOST('socid', 'int'));
+		if (GETPOSTINT('socid') > 0) {
+			$thirdpartytmp->fetch(GETPOSTINT('socid'));
 			$forbarcode = $thirdpartytmp->barcode;
 			$fk_barcode_type = $thirdpartytmp->barcode_type_code;
 
@@ -334,7 +334,7 @@ print '	<div class="tagtr">';
 print '	<div class="tagtd">';
 print $langs->trans("NumberOfStickers").' &nbsp; ';
 print '</div><div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;">';
-print '<input size="4" type="text" name="numberofsticker" value="'.(GETPOST('numberofsticker') ? GETPOST('numberofsticker', 'int') : 10).'">';
+print '<input size="4" type="text" name="numberofsticker" value="'.(GETPOST('numberofsticker') ? GETPOSTINT('numberofsticker') : 10).'">';
 print '</div></div>';
 
 print '</div>';
@@ -410,7 +410,7 @@ if ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire')) {
 	print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"><label for="fillfromproduct"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").'</label>';
 	print '<br>';
 	print '<div class="showforproductselector">';
-	$form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
+	$form->select_produits(GETPOSTINT('productid'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
 	print ' &nbsp; <input type="submit" class="button small" id="submitproduct" name="submitproduct" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
 	print '</div>';
 }
@@ -419,7 +419,7 @@ if ($user->hasRight('societe', 'lire')) {
 	print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"><label for="fillfromthirdparty"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").'</label>';
 	print '<br>';
 	print '<div class="showforthirdpartyselector">';
-	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+	print $form->select_company(GETPOSTINT('socid'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
 	print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector small" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
 	print '</div>';
 }
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index bb8cd151bbd..8978814dcb5 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -40,7 +40,7 @@ if (!$user->admin || empty($conf->blockedlog->enabled)) {
 // Get Parameters
 $action     = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$withtab    = GETPOST('withtab', 'int');
+$withtab    = GETPOSTINT('withtab');
 
 
 /*
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 8a39531b7e0..6b4fbec24e3 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -46,17 +46,17 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bl
 $backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$search_showonlyerrors = GETPOST('search_showonlyerrors', 'int');
+$search_showonlyerrors = GETPOSTINT('search_showonlyerrors');
 if ($search_showonlyerrors < 0) {
 	$search_showonlyerrors = 0;
 }
 
-$search_startyear = GETPOST('search_startyear', 'int');
-$search_startmonth = GETPOST('search_startmonth', 'int');
-$search_startday = GETPOST('search_startday', 'int');
-$search_endyear = GETPOST('search_endyear', 'int');
-$search_endmonth = GETPOST('search_endmonth', 'int');
-$search_endday = GETPOST('search_endday', 'int');
+$search_startyear = GETPOSTINT('search_startyear');
+$search_startmonth = GETPOSTINT('search_startmonth');
+$search_startday = GETPOSTINT('search_startday');
+$search_endyear = GETPOSTINT('search_endyear');
+$search_endmonth = GETPOSTINT('search_endmonth');
+$search_endday = GETPOSTINT('search_endday');
 $search_id = GETPOST('search_id', 'alpha');
 $search_fk_user = GETPOST('search_fk_user', 'intcomma');
 $search_start = -1;
@@ -80,10 +80,10 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -159,9 +159,9 @@ if ($action === 'downloadblockchain') {
 		$sql = "SELECT rowid,date_creation,tms,user_fullname,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user,object_data";
 		$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
 		$sql .= " WHERE entity = ".$conf->entity;
-		if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0) {
-			$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 1);
-			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 12);
+		if (GETPOSTINT('monthtoexport') > 0 || GETPOSTINT('yeartoexport') > 0) {
+			$dates = dol_get_first_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 1);
+			$datee = dol_get_last_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 12);
 			$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
 		}
 		$sql .= " ORDER BY rowid ASC"; // Required so we get the first one
@@ -189,9 +189,9 @@ if ($action === 'downloadblockchain') {
 		$sql = "SELECT rowid, date_creation, tms, user_fullname, action, amounts, element, fk_object, date_object, ref_object, signature, fk_user, object_data, object_version";
 		$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
 		$sql .= " WHERE entity = ".((int) $conf->entity);
-		if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0) {
-			$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 1);
-			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 12);
+		if (GETPOSTINT('monthtoexport') > 0 || GETPOSTINT('yeartoexport') > 0) {
+			$dates = dol_get_first_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 1);
+			$datee = dol_get_last_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 12);
 			$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
 		}
 		$sql .= " ORDER BY rowid ASC"; // Required so later we can use the parameter $previoushash of checkSignature()
@@ -200,7 +200,7 @@ if ($action === 'downloadblockchain') {
 		if ($res) {
 			header('Content-Type: application/octet-stream');
 			header("Content-Transfer-Encoding: Binary");
-			header("Content-disposition: attachment; filename=\"unalterable-log-archive-".$dolibarr_main_db_name."-".(GETPOST('yeartoexport', 'int') > 0 ? GETPOST('yeartoexport', 'int').(GETPOST('monthtoexport', 'int') > 0 ? sprintf("%02d", GETPOST('monthtoexport', 'int')) : '').'-' : '').$previoushash.".csv\"");
+			header("Content-disposition: attachment; filename=\"unalterable-log-archive-".$dolibarr_main_db_name."-".(GETPOSTINT('yeartoexport') > 0 ? GETPOSTINT('yeartoexport').(GETPOSTINT('monthtoexport') > 0 ? sprintf("%02d", GETPOSTINT('monthtoexport')) : '').'-' : '').$previoushash.".csv\"");
 
 			print $langs->transnoentities('Id')
 				.';'.$langs->transnoentities('Date')
@@ -379,7 +379,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<div class="right">';
 print $langs->trans("RestrictYearToExport").': ';
-$smonth = GETPOST('monthtoexport', 'int');
+$smonth = GETPOSTINT('monthtoexport');
 // Month
 $retstring = '';
 $retstring .= '<select class="flat valignmiddle maxwidth75imp marginrightonly" id="monthtoexport" name="monthtoexport">';
@@ -391,7 +391,7 @@ for ($month = 1; $month <= 12; $month++) {
 }
 $retstring .= "</select>";
 print $retstring;
-print '<input type="text" name="yeartoexport" class="valignmiddle maxwidth50imp" value="'.GETPOST('yeartoexport', 'int').'">';
+print '<input type="text" name="yeartoexport" class="valignmiddle maxwidth50imp" value="'.GETPOSTINT('yeartoexport').'">';
 print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">';
 print '<input type="submit" name="downloadcsv" class="button" value="'.$langs->trans('DownloadLogCSV').'">';
 if (getDolGlobalString('BLOCKEDLOG_USE_REMOTE_AUTHORITY')) {
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index e2009a01da1..cebd9151b5b 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -38,7 +38,7 @@ if (!defined('NOREQUIREHTML')) {
 
 $res = require '../../main.inc.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $element = GETPOST('element', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index 8660ebbbc82..66d146cc533 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -41,7 +41,7 @@ if (!defined('NOREQUIREHTML')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $block = new BlockedLog($db);
 
 if ((!$user->admin && !$user->hasRight('blockedlog', 'read')) || empty($conf->blockedlog->enabled)) {
diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index eddb8a40dc5..943230cbed7 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 
 
 $action = GETPOST('action', 'aZ09');
-$idproduct = GETPOST('idproduct', 'int');
+$idproduct = GETPOSTINT('idproduct');
 
 
 /*
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d4fb24d6daa..82d832319c1 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 $langs->loadLangs(array('mrp', 'other'));
 
 // Get parameters
-$id     = GETPOST('id', 'int');
-$socid  = GETPOST('socid', 'int');
+$id     = GETPOSTINT('id');
+$socid  = GETPOSTINT('socid');
 $ref    = GETPOST('ref', 'alpha');
 
 $action     = GETPOST('action', 'aZ09');
@@ -56,10 +56,10 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 9abba40be0c..c4db4c61421 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -36,8 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
 $langs->loadLangs(array('mrp', 'other'));
 
 // Get parameters
-$id      = GETPOST('id', 'int');
-$lineid  = GETPOST('lineid', 'int');
+$id      = GETPOSTINT('id');
+$lineid  = GETPOSTINT('lineid');
 $ref     = GETPOST('ref', 'alpha');
 $action  = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -47,9 +47,9 @@ $backtopage  = GETPOST('backtopage', 'alpha');
 
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Initialize technical objects
 $object = new BOM($db);
@@ -155,7 +155,7 @@ if (empty($reshook)) {
 		$predef = '';
 
 		// Set if we used free entry or predefined product
-		$bom_child_id = (int) GETPOST('bom_id', 'int');
+		$bom_child_id = GETPOSTINT('bom_id');
 		if ($bom_child_id > 0) {
 			$bom_child = new BOM($db);
 			$res = $bom_child->fetch($bom_child_id);
@@ -163,12 +163,12 @@ if (empty($reshook)) {
 				$idprod = $bom_child->fk_product;
 			}
 		} else {
-			$idprod = (!empty(GETPOST('idprodservice', 'int')) ? GETPOST('idprodservice', 'int') : (int) GETPOST('idprod', 'int'));
+			$idprod = (!empty(GETPOSTINT('idprodservice')) ? GETPOSTINT('idprodservice') : GETPOSTINT('idprod'));
 		}
 
 		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
-		$disable_stock_change = GETPOST('disable_stock_change', 'int');
+		$disable_stock_change = GETPOSTINT('disable_stock_change');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
 		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 
@@ -247,7 +247,7 @@ if (empty($reshook)) {
 		// Set if we used free entry or predefined product
 		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
-		$disable_stock_change = GETPOST('disable_stock_change', 'int');
+		$disable_stock_change = GETPOSTINT('disable_stock_change');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
 		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 
@@ -608,7 +608,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1, '/bom/tpl');
 		}
 
 		// Form to add new line
@@ -660,7 +660,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1, '/bom/tpl');
 		}
 
 		// Form to add new line
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index df5a9044bf5..67ef5c7e1c7 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("mrp", "companies", "other", "mails"));
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Security check - Protection if external user
@@ -46,10 +46,10 @@ $ref = GETPOST('ref', 'alpha');
 // $result = restrictedArea($user, 'bom', $id);
 
 // Load variables for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index a4d3be63e5f..cd6aaf1eaee 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 $langs->loadLangs(array('mrp', 'other'));
 
 // Get Parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -47,7 +47,7 @@ $mode        = GETPOST('mode', 'aZ');  // mode view (kanban or common)
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
@@ -89,8 +89,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -322,7 +322,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -457,9 +457,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -480,7 +480,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
index 52b472428b6..00383849710 100644
--- a/htdocs/bom/bom_net_needs.php
+++ b/htdocs/bom/bom_net_needs.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 $langs->loadLangs(array("mrp", "other", "stocks"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$lineid = GETPOST('lineid', 'int');
+$id = GETPOSTINT('id');
+$lineid = GETPOSTINT('lineid');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm  = GETPOST('confirm', 'alpha');
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index aba22ade7ca..5237fc30066 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 $langs->loadLangs(array("mrp", "companies"));
 
 // Get parameters
-$id   = GETPOST('id', 'int');
+$id   = GETPOSTINT('id');
 $ref  = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 3791531ed5a..cf927bc763c 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -120,9 +120,9 @@ if (isModEnabled("product") || isModEnabled("service")) {
 	$statustoshow = -1;
 	if (getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
 		// hide products in closed warehouse, but show products for internal transfer
-		print $form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'), 1);
+		print $form->select_produits(GETPOSTINT('idprod'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOSTINT('combinations'), 1);
 	} else {
-		print $form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'), 1);
+		print $form->select_produits(GETPOSTINT('idprod'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOSTINT('combinations'), 1);
 	}
 	$urltocreateproduct = DOL_URL_ROOT.'/product/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
 	print '<a href="'.$urltocreateproduct.'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProduct").'"></span></a>';
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 6f4ad4e5a85..5535f3dbf5a 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -138,11 +138,11 @@ if ($filtertype != 1) {
 	}
 
 	$coldisplay++;
-	print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOSTISSET("qty_frozen") ? (GETPOST('qty_frozen', 'int') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')) . '>';
+	print '<td class="nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOSTISSET("qty_frozen") ? (GETPOSTINT('qty_frozen') ? ' checked="checked"' : '') : ($line->qty_frozen ? ' checked="checked"' : '')) . '>';
 	print '</td>';
 
 	$coldisplay++;
-	print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOSTISSET('disablestockchange') ? (GETPOST("disable_stock_change", 'int') ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')) . '">';
+	print '<td class="nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOSTISSET('disablestockchange') ? (GETPOSTINT("disable_stock_change") ? ' checked="checked"' : '') : ($line->disable_stock_change ? ' checked="checked"' : '')) . '">';
 	print '</td>';
 
 	$coldisplay++;
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index 484360aae04..20fdeceede1 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 $langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -54,10 +54,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index ae32bbe7b33..8845a16723b 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -34,9 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 $langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -148,10 +148,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -411,7 +411,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
@@ -429,7 +429,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1);
 		}
 
 		// Form to add new line
diff --git a/htdocs/bookcal/availabilities_contact.php b/htdocs/bookcal/availabilities_contact.php
index 07278fd60c7..cfd91d3b2f6 100644
--- a/htdocs/bookcal/availabilities_contact.php
+++ b/htdocs/bookcal/availabilities_contact.php
@@ -32,10 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Initialize technical objects
@@ -78,7 +78,7 @@ if (!$permissiontoread) {
  */
 
 if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
@@ -95,7 +95,7 @@ if ($action == 'addcontact' && $permission) {
 	}
 } elseif ($action == 'swapstatut' && $permission) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $permission) {
 	// Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index 723df675ef5..cbd0d169216 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -37,14 +37,14 @@ $langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index ca40cc6bc95..a98a6beb8bb 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -37,12 +37,12 @@ require_once __DIR__.'/class/availabilities.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "other"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -52,10 +52,10 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -93,8 +93,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -259,7 +259,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -416,9 +416,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -440,7 +440,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php
index 5b8b4dee169..3f7bf24edee 100644
--- a/htdocs/bookcal/availabilities_note.php
+++ b/htdocs/bookcal/availabilities_note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 $langs->loadLangs(array("agenda", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php
index cbffda374fd..018a6914676 100644
--- a/htdocs/bookcal/bookcalindex.php
+++ b/htdocs/bookcal/bookcalindex.php
@@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09');
 // if (! $user->hasRight('bookcal', 'myobject', 'read')) {
 // 	accessforbidden();
 // }
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 32d048a2b44..2503e170947 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -42,9 +42,9 @@ require_once __DIR__.'/class/calendar.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bookcal@bookcal", "other"));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $type = GETPOST('type', 'aZ09');
 
diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index deb1f993471..b7b2d319649 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php';
 $langs->loadLangs(array("bookcal@bookcal", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -53,10 +53,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php
index 45efc029195..6d8038b8d4a 100644
--- a/htdocs/bookcal/calendar_card.php
+++ b/htdocs/bookcal/calendar_card.php
@@ -84,9 +84,9 @@ dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
 $langs->loadLangs(array("bookcal@bookcal", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -204,10 +204,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -445,7 +445,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
@@ -463,7 +463,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1);
 		}
 
 		// Form to add new line
diff --git a/htdocs/bookcal/calendar_contact.php b/htdocs/bookcal/calendar_contact.php
index 8247fa2ca74..71821a0a8c3 100644
--- a/htdocs/bookcal/calendar_contact.php
+++ b/htdocs/bookcal/calendar_contact.php
@@ -62,10 +62,10 @@ dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
 // Load translation files required by the page
 $langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Initialize technical objects
@@ -108,7 +108,7 @@ if (!$permissiontoread) {
  */
 
 if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
@@ -125,7 +125,7 @@ if ($action == 'addcontact' && $permission) {
 	}
 } elseif ($action == 'swapstatut' && $permission) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $permission) {
 	// Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php
index 96b8b5b4d83..4a71e5d6457 100644
--- a/htdocs/bookcal/calendar_document.php
+++ b/htdocs/bookcal/calendar_document.php
@@ -86,14 +86,14 @@ $langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index 9230edb9285..e8fc92b546d 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("bookcal@bookcal", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -45,14 +45,14 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -90,8 +90,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -256,7 +256,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -398,9 +398,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -422,7 +422,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/bookcal/calendar_note.php b/htdocs/bookcal/calendar_note.php
index 31f47504264..5f13b1129e6 100644
--- a/htdocs/bookcal/calendar_note.php
+++ b/htdocs/bookcal/calendar_note.php
@@ -80,7 +80,7 @@ dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
 $langs->loadLangs(array("bookcal@bookcal", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index d9d887ab4d4..3e474c85762 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -34,12 +34,12 @@ $langs->loadLangs(array('bookmarks', 'other'));
 
 
 // Get Parameters
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $action = GETPOST("action", "alpha");
 $title = (string) GETPOST("title", "alpha");
 $url = (string) GETPOST("url", "alpha");
 $urlsource = GETPOST("urlsource", "alpha");
-$target = GETPOST("target", "int");
+$target = GETPOSTINT("target");
 $userid = GETPOSTINT("userid");
 $position = GETPOSTINT("position");
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -82,7 +82,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') {
 	}
 
 	if ($action == 'update') {
-		$object->fetch(GETPOST("id", 'int'));
+		$object->fetch(GETPOSTINT("id"));
 	}
 	// Check if null because user not admin can't set an user and send empty value here.
 	if (!empty($userid)) {
@@ -183,18 +183,18 @@ if ($action == 'create') {
 	if ($url && !preg_match('/^http/i', $url)) {
 		$defaulttarget = 0;
 	}
-	print $form->selectarray('target', $liste, GETPOSTISSET('target') ? GETPOST('target', 'int') : $defaulttarget, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+	print $form->selectarray('target', $liste, GETPOSTISSET('target') ? GETPOSTINT('target') : $defaulttarget, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</span></td></tr>';
 
 	// Visibility / Owner
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 	print img_picto('', 'user', 'class="pictofixedwidth"');
-	print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx');
+	print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOSTINT('userid') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx');
 	print '</td><td class="hideonsmartphone"></td></tr>';
 
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	print '<input class="flat width50" name="position" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
+	print '<input class="flat width50" name="position" value="'.(GETPOSTISSET("position") ? GETPOSTINT("position") : $object->position).'">';
 	print '</td><td class="hideonsmartphone"></td></tr>';
 
 	print '</table>';
@@ -284,7 +284,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 	if ($action == 'edit' && $user->admin) {
 		print img_picto('', 'user', 'class="pictofixedwidth"');
-		print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
+		print $form->select_dolusers(GETPOSTISSET('userid') ? GETPOSTINT('userid') : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
 	} else {
 		if ($object->fk_user > 0) {
 			$fuser = new User($db);
@@ -299,7 +299,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
 	if ($action == 'edit') {
-		print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
+		print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOSTINT("position") : $object->position).'">';
 	} else {
 		print $object->position;
 	}
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index b22c1d294b4..50212e04137 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -31,7 +31,7 @@ $langs->loadLangs(array('bookmarks', 'admin'));
 // Get Parameters
 $action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
@@ -40,14 +40,14 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss 	= GETPOST('optioncss', 'alpha');
 $mode 		= GETPOST('mode', 'aZ');
 
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $search_title = GETPOST('search_title', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -247,7 +247,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 9d66e35f9f1..06510e44aa7 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->load("categories");
 
 // Security check
-$socid = (int) GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (!$user->hasRight('categorie', 'lire')) {
 	accessforbidden();
 }
@@ -45,7 +45,7 @@ if (!$user->hasRight('categorie', 'lire')) {
 $action = GETPOST('action', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $origin		= GETPOST('origin', 'alpha');
-$catorigin  = (int) GETPOST('catorigin', 'int');
+$catorigin  = GETPOSTINT('catorigin');
 $type = GETPOST('type', 'aZ09');
 $urlfrom = GETPOST('urlfrom', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -53,9 +53,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $label = (string) GETPOST('label', 'alphanohtml');
 $description = (string) GETPOST('description', 'restricthtml');
 $color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
-$position = (int) GETPOST('position', 'int');
-$visible = (int) GETPOST('visible', 'int');
-$parent = (int) GETPOST('parent', 'int');
+$position = GETPOSTINT('position');
+$visible = GETPOSTINT('visible');
+$parent = GETPOSTINT('parent');
 
 if ($origin) {
 	if ($type == Categorie::TYPE_PRODUCT) {
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 16965accb55..a3fe18a25c1 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -34,20 +34,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->load("categories");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alphanohtml');
 $action = (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = (int) GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $label = (string) GETPOST('label', 'alphanohtml');
 $description = (string) GETPOST('description', 'restricthtml');
 $color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
-$position = (int) GETPOST('position', 'int');
-$visible = (int) GETPOST('visible', 'int');
-$parent = (int) GETPOST('parent', 'int');
+$position = GETPOSTINT('position');
+$visible = GETPOSTINT('visible');
+$parent = GETPOSTINT('parent');
 
 if ($id == "") {
 	dol_print_error(null, 'Missing parameter id');
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index eb322bbeb3f..d3eeb6b8e16 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -36,10 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // Load translation files required by the page
 $langs->load("categories");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
 $catname = GETPOST('catname', 'alpha');
-$nosearch = GETPOST('nosearch', 'int');
+$nosearch = GETPOSTINT('nosearch');
 
 $categstatic = new Categorie($db);
 if (is_numeric($type)) {
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index aceabfdaffb..59dedc1312e 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -37,7 +37,7 @@ if (!$user->hasRight('categorie', 'lire')) {
 $langs->loadLangs(array('categories', 'sendings'));
 
 $socid = 0;
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $label = GETPOST('label', 'alpha');
 
 // Security check
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 4757aab5fdd..bd40d078fa1 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 $langs->loadlangs(array('categories', 'bills'));
 
 
-$id      = GETPOST('id', 'int');
+$id      = GETPOSTINT('id');
 $label   = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 9293c62219b..1665c80150d 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('categories', 'languages'));
 
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $label  = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a7a13ff64d1..ddfe5fc9946 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -37,14 +37,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("categories", "compta"));
 
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $label      = GETPOST('label', 'alpha');
-$removeelem = GETPOST('removeelem', 'int');
-$elemid     = GETPOST('elemid', 'int');
+$removeelem = GETPOSTINT('removeelem');
+$elemid     = GETPOSTINT('elemid');
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -54,10 +54,10 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index 746cc019a8b..bee5d778dc7 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -41,7 +41,7 @@ $conf->dol_hide_leftmenu = 1; // Force hide of left menu.
 $error = 0;
 $website = GETPOST('website', 'alpha');
 $page = GETPOST('page', 'alpha');
-$pageid = GETPOST('pageid', 'int');
+$pageid = GETPOSTINT('pageid');
 $action = GETPOST('action', 'aZ09');
 
 if (GETPOST('delete')) {
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index cc5c5c1c8dd..bcad30ffa91 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -58,15 +58,15 @@ $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $socpeopleassigned = GETPOST('socpeopleassigned', 'array');
 $origin = GETPOST('origin', 'alpha');
-$originid = GETPOST('originid', 'int');
+$originid = GETPOSTINT('originid');
 $confirm = GETPOST('confirm', 'alpha');
 
 $fulldayevent = GETPOST('fullday', 'alpha');
 
-$aphour = GETPOST('aphour', 'int');
-$apmin = GETPOST('apmin', 'int');
-$p2hour = GETPOST('p2hour', 'int');
-$p2min = GETPOST('p2min', 'int');
+$aphour = GETPOSTINT('aphour');
+$apmin = GETPOSTINT('apmin');
+$p2hour = GETPOSTINT('p2hour');
+$p2min = GETPOSTINT('p2min');
 
 $addreminder = GETPOST('addreminder', 'alpha');
 $offsetvalue = GETPOSTINT('offsetvalue');
@@ -82,12 +82,12 @@ if ($complete == 'na' || $complete == -2) {
 if ($fulldayevent) {
 	$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 	// For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
-	$datep = dol_mktime('00', '00', 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
-	$datef = dol_mktime('23', '59', '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+	$datep = dol_mktime('00', '00', 0, GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
+	$datef = dol_mktime('23', '59', '59', GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 	//print $db->idate($datep); exit;
 } else {
-	$datep = dol_mktime($aphour, $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
-	$datef = dol_mktime($p2hour, $p2min, '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
+	$datep = dol_mktime($aphour, $apmin, 0, GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), 'tzuserrel');
+	$datef = dol_mktime($p2hour, $p2min, '59', GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), 'tzuserrel');
 }
 $reg = array();
 if (GETPOST('datep')) {
@@ -99,8 +99,8 @@ if (GETPOST('datep')) {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
-$id = GETPOST('id', 'int');
+$socid = GETPOSTINT('socid');
+$id = GETPOSTINT('id');
 if ($user->socid && ($socid != $user->socid)) {
 	accessforbidden();
 }
@@ -269,7 +269,7 @@ if (empty($reshook) && (GETPOST('addassignedtoresource') || GETPOST('updateassig
 if (empty($reshook) && $action == 'classin' && ($user->hasRight('agenda', 'allactions', 'create') ||
 	(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create')))) {
 	//$object->fetch($id);
-	$object->setProject(GETPOST('projectid', 'int'));
+	$object->setProject(GETPOSTINT('projectid'));
 }
 
 // Action clone object
@@ -283,7 +283,7 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes') {
 				reset($object->socpeopleassigned);
 				$object->contact_id = key($object->socpeopleassigned);
 			}
-			$result = $object->createFromClone($user, GETPOST('socid', 'int'));
+			$result = $object->createFromClone($user, GETPOSTINT('socid'));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit();
@@ -316,17 +316,17 @@ if (empty($reshook) && $action == 'add') {
 		exit;
 	}
 
-	$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOST("percentage", 'int')); // If status is -1 or 100, percentage is not defined and we must use status
+	$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOSTINT("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 	// Clean parameters
 	if ($fulldayevent) {
 		$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 		// For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
-		$datep = dol_mktime('00', '00', '00', GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
-		$datef = dol_mktime('23', '59', '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+		$datep = dol_mktime('00', '00', '00', GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
+		$datef = dol_mktime('23', '59', '59', GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 	} else {
-		$datep = dol_mktime(GETPOST("aphour", 'int'), GETPOST("apmin", 'int'), GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
-		$datef = dol_mktime(GETPOST("p2hour", 'int'), GETPOST("p2min", 'int'), GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
+		$datep = dol_mktime(GETPOSTINT("aphour"), GETPOSTINT("apmin"), GETPOSTINT("apsec"), GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), 'tzuserrel');
+		$datef = dol_mktime(GETPOSTINT("p2hour"), GETPOSTINT("p2min"), GETPOSTINT("apsec"), GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), 'tzuserrel');
 	}
 
 	// Check parameters
@@ -356,7 +356,7 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		// Initialisation object actioncomm
-		$object->priority = GETPOSTISSET("priority") ? GETPOST("priority", "int") : 0;
+		$object->priority = GETPOSTISSET("priority") ? GETPOSTINT("priority") : 0;
 		$object->fulldayevent = ($fulldayevent ? 1 : 0);
 		$object->location = GETPOST("location", 'alphanohtml');
 		$object->label = GETPOST('label', 'alphanohtml');
@@ -386,7 +386,7 @@ if (empty($reshook) && $action == 'add') {
 				}
 			}
 		}
-		$object->fk_project = GETPOSTISSET("projectid") ? GETPOST("projectid", 'int') : 0;
+		$object->fk_project = GETPOSTISSET("projectid") ? GETPOSTINT("projectid") : 0;
 
 		$taskid = GETPOSTINT('taskid');
 		if (!empty($taskid)) {
@@ -437,7 +437,7 @@ if (empty($reshook) && $action == 'add') {
 		$object->contact = $contact;
 	}
 
-	if (GETPOST('socid', 'int') > 0) {
+	if (GETPOSTINT('socid') > 0) {
 		$object->socid = GETPOSTINT('socid');
 		$object->fetch_thirdparty();
 
@@ -511,7 +511,7 @@ if (empty($reshook) && $action == 'add') {
 		if ($userepeatevent && !empty($selectedrecurrulefreq) && $selectedrecurrulefreq != 'no') {
 			$eventisrecurring = 1;
 			$object->recurid = dol_print_date(dol_now('gmt'), 'dayhourlog', 'gmt');
-			$object->recurdateend = dol_mktime(0, 0, 0, GETPOST('limitmonth', 'int'), GETPOST('limitday', 'int'), GETPOST('limityear', 'int'));
+			$object->recurdateend = dol_mktime(0, 0, 0, GETPOSTINT('limitmonth'), GETPOSTINT('limitday'), GETPOSTINT('limityear'));
 		} else {
 			unset($object->recurid);
 			unset($object->recurrule);
@@ -609,22 +609,22 @@ if (empty($reshook) && $action == 'add') {
 		if ($eventisrecurring) {
 			// We set first date of recurrence and offsets
 			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
-				$firstdatearray = dol_get_first_day_week(GETPOST("apday", 'int'), GETPOST("apmonth", 'int'), GETPOST("apyear", 'int'));
-				$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
+				$firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
+				$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
 				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
 				$dayoffset = 7;
 				$monthoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
 				$firstday = $selectedrecurrulebymonthday;
-				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOST("apmonth", 'int') + 1 : GETPOST("apmonth", 'int');//We begin the week after
-				$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), $firstmonth, $firstday, GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth");//We begin the week after
+				$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 				$dayoffset = 0;
 				$monthoffset = 1;
 			} else {
 				$error++;
 			}
 			// End date
-			$repeateventlimitdate = dol_mktime(23, 59, 59, GETPOSTISSET("limitmonth") ? GETPOST("limitmonth", 'int') : 1, GETPOSTISSET("limitday") ? GETPOST("limitday", 'int') : 1, GETPOSTISSET("limityear") && GETPOST("limityear", 'int') < 2100 ? GETPOST("limityear", 'int') : 2100, $tzforfullday ? $tzforfullday : 'tzuserrel');
+			$repeateventlimitdate = dol_mktime(23, 59, 59, GETPOSTISSET("limitmonth") ? GETPOSTINT("limitmonth") : 1, GETPOSTISSET("limitday") ? GETPOSTINT("limitday") : 1, GETPOSTISSET("limityear") && GETPOSTINT("limityear") < 2100 ? GETPOSTINT("limityear") : 2100, $tzforfullday ? $tzforfullday : 'tzuserrel');
 			// Set date of end of event
 			$deltatime = num_between_day($object->datep, $datep);
 			$datef = dol_time_plus_duree($datef, $deltatime, 'd');
@@ -743,11 +743,11 @@ if (empty($reshook) && $action == 'add') {
 if (empty($reshook) && $action == 'update') {
 	if (empty($cancel)) {
 		$fulldayevent = GETPOST('fullday');
-		$aphour = GETPOST('aphour', 'int');
-		$apmin = GETPOST('apmin', 'int');
-		$p2hour = GETPOST('p2hour', 'int');
-		$p2min = GETPOST('p2min', 'int');
-		$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOST("percentage", 'int')); // If status is -1 or 100, percentage is not defined and we must use status
+		$aphour = GETPOSTINT('aphour');
+		$apmin = GETPOSTINT('apmin');
+		$p2hour = GETPOSTINT('p2hour');
+		$p2min = GETPOSTINT('p2min');
+		$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOSTINT("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 		// Clean parameters
 		if ($aphour == -1) {
@@ -772,11 +772,11 @@ if (empty($reshook) && $action == 'update') {
 		if ($fulldayevent) {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 			// For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
-			$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
-			$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+			$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
+			$datef = dol_mktime($fulldayevent ? '23' : GETPOSTINT("p2hour"), $fulldayevent ? '59' : GETPOSTINT("p2min"), $fulldayevent ? '59' : GETPOSTINT("apsec"), GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 		} else {
-			$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
-			$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
+			$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), 'tzuserrel');
+			$datef = dol_mktime($fulldayevent ? '23' : GETPOSTINT("p2hour"), $fulldayevent ? '59' : GETPOSTINT("p2min"), $fulldayevent ? '59' : GETPOSTINT("apsec"), GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), 'tzuserrel');
 		}
 
 		if ($object->elementtype == 'ticket') {	// code should be TICKET_MSG, TICKET_MSG_PRIVATE, TICKET_MSG_SENTBYMAIL, TICKET_MSG_PRIVATE_SENTBYMAIL
@@ -805,21 +805,21 @@ if (empty($reshook) && $action == 'update') {
 		$object->datep       = $datep;
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
-		$object->priority    = GETPOST("priority", "int");
+		$object->priority    = GETPOSTINT("priority");
 		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
 		$object->location    = GETPOST('location', "alphanohtml");
-		$object->socid       = GETPOST("socid", "int");
+		$object->socid       = GETPOSTINT("socid");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		$object->socpeopleassigned = array();
 		foreach ($socpeopleassigned as $cid) {
 			$object->socpeopleassigned[$cid] = array('id' => $cid);
 		}
-		$object->contact_id = GETPOST("contactid", 'int');
+		$object->contact_id = GETPOSTINT("contactid");
 		if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
 			reset($object->socpeopleassigned);
 			$object->contact_id = key($object->socpeopleassigned);
 		}
-		$object->fk_project  = GETPOST("projectid", 'int');
+		$object->fk_project  = GETPOSTINT("projectid");
 		$object->note_private = trim(GETPOST("note", "restricthtml"));
 
 		if (GETPOST("elementtype", 'alpha')) {
@@ -830,7 +830,7 @@ if (empty($reshook) && $action == 'update') {
 				$hasPermissionOnLinkedObject = 1;
 			}
 			if ($hasPermissionOnLinkedObject) {
-				$object->fk_element = GETPOST("fk_element", 'int');
+				$object->fk_element = GETPOSTINT("fk_element");
 				$object->elementtype = GETPOST("elementtype", 'alpha');
 			}
 		}
@@ -876,7 +876,7 @@ if (empty($reshook) && $action == 'update') {
 
 		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 			if (GETPOST("doneby")) {
-				$object->userdoneid = GETPOST("doneby", "int");
+				$object->userdoneid = GETPOSTINT("doneby");
 			}
 		}
 
@@ -1448,7 +1448,7 @@ if ($action == 'create') {
 	// Done by
 	if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
+		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOSTINT("doneby") : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
 		print '</td></tr>';
 	}
 
@@ -1498,7 +1498,7 @@ if ($action == 'create') {
 	if (GETPOSTISSET('status')) {
 		$percent = GETPOST('status');
 	} elseif (GETPOSTISSET('percentage')) {
-		$percent = GETPOST('percentage', 'int');
+		$percent = GETPOSTINT('percentage');
 	} else {
 		if ($complete == '0' || GETPOST("afaire") == 1) {
 			$percent = '0';
@@ -1520,11 +1520,11 @@ if ($action == 'create') {
 	if (isModEnabled("societe")) {
 		// Related company
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
-		if (GETPOST('socid', 'int') > 0) {
+		if (GETPOSTINT('socid') > 0) {
 			$societe = new Societe($db);
-			$societe->fetch(GETPOST('socid', 'int'));
+			$societe->fetch(GETPOSTINT('socid'));
 			print $societe->getNomUrl(1);
-			print '<input type="hidden" id="socid" name="socid" value="'.GETPOST('socid', 'int').'">';
+			print '<input type="hidden" id="socid" name="socid" value="'.GETPOSTINT('socid').'">';
 		} else {
 			$events = array();
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
@@ -1540,11 +1540,11 @@ if ($action == 'create') {
 		// Related contact
 		print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 		$preselectedids = GETPOST('socpeopleassigned', 'array');
-		if (GETPOST('contactid', 'int')) {
-			$preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
+		if (GETPOSTINT('contactid')) {
+			$preselectedids[GETPOSTINT('contactid')] = GETPOSTINT('contactid');
 		}
 		if ($origin=='contact') {
-			$preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
+			$preselectedids[GETPOSTINT('originid')] = GETPOSTINT('originid');
 		}
 		// select "all" or "none" contact by default
 		if (getDolGlobalInt('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT')) {
@@ -1561,7 +1561,7 @@ if ($action == 'create') {
 	if (isModEnabled('project')) {
 		$langs->load("projects");
 
-		$projectid = GETPOST('projectid', 'int');
+		$projectid = GETPOSTINT('projectid');
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container">';
 		print img_picto('', 'project', 'class="pictofixedwidth"');
@@ -1596,7 +1596,7 @@ if ($action == 'create') {
 			$projectsListId = $projectid;
 		}
 
-		$tid = GETPOSTISSET("projecttaskid") ? GETPOST("projecttaskid", 'int') : (GETPOSTISSET("taskid") ? GETPOST("taskid", 'int') : '');
+		$tid = GETPOSTISSET("projecttaskid") ? GETPOSTINT("projecttaskid") : (GETPOSTISSET("taskid") ? GETPOSTINT("taskid") : '');
 
 		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500 widthcentpercentminusxx', $projectsListId);
 		print '</td></tr>';
@@ -1632,7 +1632,7 @@ if ($action == 'create') {
 	// Priority
 	if (getDolGlobalString('AGENDA_SUPPORT_PRIORITY_IN_EVENTS')) {
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
-		print '<input type="text" name="priority" value="'.(GETPOSTISSET('priority') ? GETPOST('priority', 'int') : ($object->priority ? $object->priority : '')).'" size="5">';
+		print '<input type="text" name="priority" value="'.(GETPOSTISSET('priority') ? GETPOSTINT('priority') : ($object->priority ? $object->priority : '')).'" size="5">';
 		print '</td></tr>';
 	}
 
@@ -1744,10 +1744,10 @@ if ($id > 0) {
 	$result5 = $object->fetch_optionals();
 
 	if ($listUserAssignedUpdated || $donotclearsession) {
-		$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOST("percentage", 'int')); // If status is -1 or 100, percentage is not defined and we must use status
+		$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOSTINT("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
-		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
+		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), 'tzuserrel');
+		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOSTINT("p2month"), GETPOSTINT("p2day"), GETPOSTINT("p2year"), 'tzuserrel');
 
 		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
 		$object->label       = GETPOST("label", "alphanohtml");
@@ -1757,13 +1757,13 @@ if ($id > 0) {
 		$object->priority    = GETPOST("priority", "alphanohtml");
 		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
 		$object->location    = GETPOST('location', "alphanohtml");
-		$object->socid       = GETPOST("socid", "int");
+		$object->socid       = GETPOSTINT("socid");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		foreach ($socpeopleassigned as $tmpid) {
 			$object->socpeopleassigned[$id] = array('id' => $tmpid);
 		}
-		$object->contact_id   = GETPOST("contactid", 'int');
-		$object->fk_project  = GETPOST("projectid", 'int');
+		$object->contact_id   = GETPOSTINT("contactid");
+		$object->fk_project  = GETPOSTINT("projectid");
 
 		$object->note_private = GETPOST("note", 'restricthtml');
 	}
@@ -2022,7 +2022,7 @@ if ($id > 0) {
 
 		// Status
 		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
-		$percent = GETPOSTISSET("percentage") ? GETPOST("percentage", "int") : $object->percentage;
+		$percent = GETPOSTISSET("percentage") ? GETPOSTINT("percentage") : $object->percentage;
 		$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 		print '</td></tr>';
 
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index a27f7bfef20..44107ddaaf1 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -42,12 +42,12 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'commercial', 'other', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -67,10 +67,10 @@ if ($id > 0) {
 $hookmanager->initHooks(array('actioncard', 'globalcard'));
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 62b5600af50..338887acab2 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -51,13 +51,13 @@ if (!getDolGlobalString('AGENDA_EXT_NB')) {
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
 $DELAYFORCACHE = 300;	// 300 seconds
 
-$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+$disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
-$check_holiday = GETPOST('check_holiday', 'int');
+$check_holiday = GETPOSTINT('check_holiday');
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
 $usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
-$showbirthday = empty($conf->use_javascript_ajax) ? GETPOST("showbirthday", "int") : 1;
+$showbirthday = empty($conf->use_javascript_ajax) ? GETPOSTINT("showbirthday") : 1;
 $search_categ_cus = GETPOST("search_categ_cus", "int", 3) ? GETPOST("search_categ_cus", "int", 3) : 0;
 
 // If not choice done on calendar owner (like on left menu link "Agenda"), we filter on user.
@@ -69,11 +69,11 @@ $newparam = '';
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -83,7 +83,7 @@ if (!$sortfield) {
 }
 
 // Security check
-$socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
+$socid = GETPOSTINT("search_socid") ? GETPOSTINT("search_socid") : GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -108,22 +108,22 @@ $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
 	$mode = $action;	// For backward compatibility
 }
-$resourceid = GETPOST("search_resourceid", "int");
-$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");
+$resourceid = GETPOSTINT("search_resourceid");
+$year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
+$month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
+$day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
 $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', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
-$maxprint = GETPOSTISSET("maxprint") ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW;
+$maxprint = GETPOSTISSET("maxprint") ? GETPOSTINT("maxprint") : $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'));
+$dateselect = dol_mktime(0, 0, 0, GETPOSTINT('dateselectmonth'), GETPOSTINT('dateselectday'), GETPOSTINT('dateselectyear'));
 if ($dateselect > 0) {
-	$day = GETPOST('dateselectday', 'int');
-	$month = GETPOST('dateselectmonth', 'int');
-	$year = GETPOST('dateselectyear', 'int');
+	$day = GETPOSTINT('dateselectday');
+	$month = GETPOSTINT('dateselectmonth');
+	$year = GETPOSTINT('dateselectyear');
 }
 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
@@ -148,16 +148,16 @@ if (empty($mode) && !GETPOSTISSET('mode')) {
 if ($mode == 'default') {	// When action is default, we want a calendar view and not the list
 	$mode = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
-if (GETPOST('viewcal', 'int') && GETPOST('mode', 'alpha') != 'show_day' && GETPOST('mode', 'alpha') != 'show_week') {
+if (GETPOSTINT('viewcal') && GETPOSTINT('mode') != 'show_day' && GETPOSTINT('mode') != 'show_week') {
 	$mode = 'show_month';
 	$day = '';
 } // View by month
-if (GETPOST('viewweek', 'int') || GETPOST('mode', 'alpha') == 'show_week') {
+if (GETPOSTINT('viewweek') || GETPOSTINT('mode') == 'show_week') {
 	$mode = 'show_week';
 	$week = ($week ? $week : date("W"));
 	$day = ($day ? $day : date("d"));
 } // View by week
-if (GETPOST('viewday', 'int') || GETPOST('mode', 'alpha') == 'show_day') {
+if (GETPOSTINT('viewday') || GETPOSTINT('mode') == 'show_day') {
 	$mode = 'show_day';
 	$day = ($day ? $day : date("d"));
 } // View by day
@@ -647,7 +647,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 		foreach ($showextcals as $val) {
 			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
 
-			if (!empty($val['default']) || GETPOST('check_ext'.$htmlname, 'int')) {
+			if (!empty($val['default']) || GETPOSTINT('check_ext'.$htmlname)) {
 				$default = "checked";
 			} else {
 				$default = '';
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 591fb5082d3..0b16f28193e 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -37,7 +37,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->load("commercial");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('actioncard', 'globalcard'));
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 55cb92d71f3..30a690b38cc 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -50,19 +50,19 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'ac
 $optioncss 	= GETPOST('optioncss', 'alpha');
 
 
-$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+$disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
 	$mode = $action;	// For backward compatibility
 }
-$resourceid = GETPOST("search_resourceid", "int") ? GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
+$resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid");
 $pid = GETPOST("search_projectid", 'int', 3) ? GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
 $search_status = (GETPOST("search_status", 'aZ09') != '') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOST('search_type', 'alphanohtml') ? GETPOST('search_type', 'alphanohtml') : GETPOST('type', 'alphanohtml');
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
-$day = GETPOST("day", 'int');
+$year = GETPOSTINT("year");
+$month = GETPOSTINT("month");
+$day = GETPOSTINT("day");
 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array')) {
@@ -80,11 +80,11 @@ $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
 
 // $dateselect is a day included inside the event range
-$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'), 'tzuserrel');
-$datestart_dtstart = dol_mktime(0, 0, 0, GETPOST('datestart_dtstartmonth', 'int'), GETPOST('datestart_dtstartday', 'int'), GETPOST('datestart_dtstartyear', 'int'), 'tzuserrel');
-$datestart_dtend = dol_mktime(23, 59, 59, GETPOST('datestart_dtendmonth', 'int'), GETPOST('datestart_dtendday', 'int'), GETPOST('datestart_dtendyear', 'int'), 'tzuserrel');
-$dateend_dtstart = dol_mktime(0, 0, 0, GETPOST('dateend_dtstartmonth', 'int'), GETPOST('dateend_dtstartday', 'int'), GETPOST('dateend_dtstartyear', 'int'), 'tzuserrel');
-$dateend_dtend = dol_mktime(23, 59, 59, GETPOST('dateend_dtendmonth', 'int'), GETPOST('dateend_dtendday', 'int'), GETPOST('dateend_dtendyear', 'int'), 'tzuserrel');
+$dateselect = dol_mktime(0, 0, 0, GETPOSTINT('dateselectmonth'), GETPOSTINT('dateselectday'), GETPOSTINT('dateselectyear'), 'tzuserrel');
+$datestart_dtstart = dol_mktime(0, 0, 0, GETPOSTINT('datestart_dtstartmonth'), GETPOSTINT('datestart_dtstartday'), GETPOSTINT('datestart_dtstartyear'), 'tzuserrel');
+$datestart_dtend = dol_mktime(23, 59, 59, GETPOSTINT('datestart_dtendmonth'), GETPOSTINT('datestart_dtendday'), GETPOSTINT('datestart_dtendyear'), 'tzuserrel');
+$dateend_dtstart = dol_mktime(0, 0, 0, GETPOSTINT('dateend_dtstartmonth'), GETPOSTINT('dateend_dtstartday'), GETPOSTINT('dateend_dtstartyear'), 'tzuserrel');
+$dateend_dtend = dol_mktime(23, 59, 59, GETPOSTINT('dateend_dtendmonth'), GETPOSTINT('dateend_dtendday'), GETPOSTINT('dateend_dtendyear'), 'tzuserrel');
 if ($search_status == '' && !GETPOSTISSET('search_status')) {
 	$search_status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
@@ -95,7 +95,7 @@ if (empty($mode) && !GETPOSTISSET('mode')) {
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
 $usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
-$showbirthday = empty($conf->use_javascript_ajax) ? (GETPOST("search_showbirthday", "int") ? GETPOST("search_showbirthday", "int") : GETPOST("showbirthday", "int")) : 1;
+$showbirthday = empty($conf->use_javascript_ajax) ? (GETPOSTINT("search_showbirthday") ? GETPOSTINT("search_showbirthday") : GETPOSTINT("showbirthday")) : 1;
 $search_categ_cus = GETPOST("search_categ_cus", "int", 3) ? GETPOST("search_categ_cus", "int", 3) : 0;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -114,10 +114,10 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 }
 
 // Pagination parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -137,7 +137,7 @@ if (!$sortfield) {
 }
 
 // Security check
-$socid = GETPOST("search_socid", 'int') ? GETPOST("search_socid", 'int') : GETPOST("socid", 'int');
+$socid = GETPOSTINT("search_socid") ? GETPOSTINT("search_socid") : GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -350,41 +350,41 @@ if ($search_title != '') {
 if ($search_note != '') {
 	$param .= '&search_note='.urlencode($search_note);
 }
-if (GETPOST('datestart_dtstartday', 'int')) {
-	$param .= '&datestart_dtstartday='.GETPOST('datestart_dtstartday', 'int');
+if (GETPOSTINT('datestart_dtstartday')) {
+	$param .= '&datestart_dtstartday='.GETPOSTINT('datestart_dtstartday');
 }
-if (GETPOST('datestart_dtstartmonth', 'int')) {
-	$param .= '&datestart_dtstartmonth='.GETPOST('datestart_dtstartmonth', 'int');
+if (GETPOSTINT('datestart_dtstartmonth')) {
+	$param .= '&datestart_dtstartmonth='.GETPOSTINT('datestart_dtstartmonth');
 }
-if (GETPOST('datestart_dtstartyear', 'int')) {
-	$param .= '&datestart_dtstartyear='.GETPOST('datestart_dtstartyear', 'int');
+if (GETPOSTINT('datestart_dtstartyear')) {
+	$param .= '&datestart_dtstartyear='.GETPOSTINT('datestart_dtstartyear');
 }
-if (GETPOST('datestart_dtendday', 'int')) {
-	$param .= '&datestart_dtendday='.GETPOST('datestart_dtendday', 'int');
+if (GETPOSTINT('datestart_dtendday')) {
+	$param .= '&datestart_dtendday='.GETPOSTINT('datestart_dtendday');
 }
-if (GETPOST('datestart_dtendmonth', 'int')) {
-	$param .= '&datestart_dtendmonth='.GETPOST('datestart_dtendmonth', 'int');
+if (GETPOSTINT('datestart_dtendmonth')) {
+	$param .= '&datestart_dtendmonth='.GETPOSTINT('datestart_dtendmonth');
 }
-if (GETPOST('datestart_dtendyear', 'int')) {
-	$param .= '&datestart_dtendyear='.GETPOST('datestart_dtendyear', 'int');
+if (GETPOSTINT('datestart_dtendyear')) {
+	$param .= '&datestart_dtendyear='.GETPOSTINT('datestart_dtendyear');
 }
-if (GETPOST('dateend_dtstartday', 'int')) {
-	$param .= '&dateend_dtstartday='.GETPOST('dateend_dtstartday', 'int');
+if (GETPOSTINT('dateend_dtstartday')) {
+	$param .= '&dateend_dtstartday='.GETPOSTINT('dateend_dtstartday');
 }
-if (GETPOST('dateend_dtstartmonth', 'int')) {
-	$param .= '&dateend_dtstartmonth='.GETPOST('dateend_dtstartmonth', 'int');
+if (GETPOSTINT('dateend_dtstartmonth')) {
+	$param .= '&dateend_dtstartmonth='.GETPOSTINT('dateend_dtstartmonth');
 }
-if (GETPOST('dateend_dtstartyear', 'int')) {
-	$param .= '&dateend_dtstartyear='.GETPOST('dateend_dtstartyear', 'int');
+if (GETPOSTINT('dateend_dtstartyear')) {
+	$param .= '&dateend_dtstartyear='.GETPOSTINT('dateend_dtstartyear');
 }
-if (GETPOST('dateend_dtendday', 'int')) {
-	$param .= '&dateend_dtendday='.GETPOST('dateend_dtendday', 'int');
+if (GETPOSTINT('dateend_dtendday')) {
+	$param .= '&dateend_dtendday='.GETPOSTINT('dateend_dtendday');
 }
-if (GETPOST('dateend_dtendmonth', 'int')) {
-	$param .= '&dateend_dtendmonth='.GETPOST('dateend_dtendmonth', 'int');
+if (GETPOSTINT('dateend_dtendmonth')) {
+	$param .= '&dateend_dtendmonth='.GETPOSTINT('dateend_dtendmonth');
 }
-if (GETPOST('dateend_dtendyear', 'int')) {
-	$param .= '&dateend_dtendyear='.GETPOST('dateend_dtendyear', 'int');
+if (GETPOSTINT('dateend_dtendyear')) {
+	$param .= '&dateend_dtendyear='.GETPOSTINT('dateend_dtendyear');
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
@@ -410,7 +410,7 @@ if ($user->hasRight('agenda', 'allactions', 'delete')) {
 if (isModEnabled('category') && $user->hasRight('agenda', 'myactions', 'create')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index f226da960c4..83ac43bc4e2 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -46,7 +46,7 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 
 $action = GETPOST('action', 'aZ09');
 
-$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+$disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
@@ -64,11 +64,11 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 // Sorting
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -79,7 +79,7 @@ if (!$sortfield) {
 
 
 // Security check
-$socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
+$socid = GETPOSTINT("search_socid") ? GETPOSTINT("search_socid") : GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -100,15 +100,15 @@ if (!$user->hasRight('agenda', 'allactions', 'read') || $filter == 'mine') {  //
 }
 
 $mode = 'show_pertype';
-$resourceid = GETPOST("search_resourceid", "int") ? GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
-$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");
+$resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid");
+$year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
+$month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
+$day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
 $pid = GETPOSTISSET("search_projectid") ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
-$maxprint = ((GETPOST("maxprint", 'int') != '') ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$maxprint = ((GETPOSTINT("maxprint") != '') ? GETPOSTINT("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
@@ -121,19 +121,19 @@ if (GETPOST('search_actioncode', 'array:aZ09')) {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
-$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
+$dateselect = dol_mktime(0, 0, 0, GETPOSTINT('dateselectmonth'), GETPOSTINT('dateselectday'), GETPOSTINT('dateselectyear'));
 if ($dateselect > 0) {
-	$day   = GETPOST('dateselectday', 'int');
-	$month = GETPOST('dateselectmonth', 'int');
-	$year  = GETPOST('dateselectyear', 'int');
+	$day   = GETPOSTINT('dateselectday');
+	$month = GETPOSTINT('dateselectmonth');
+	$year  = GETPOSTINT('dateselectyear');
 }
 
 // working hours
 $tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS') ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_h = GETPOST('begin_h', 'int') != '' ? GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
-$end_h   = GETPOST('end_h', 'int') ? GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
+$begin_h = GETPOSTINT('begin_h') != '' ? GETPOSTINT('begin_h') : ($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOSTINT('end_h') ? GETPOSTINT('end_h') : ($tmparray[1] != '' ? $tmparray[1] : 18);
 if ($begin_h < 0 || $begin_h > 23) {
 	$begin_h = 9;
 }
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index a3ae68e6bd3..2201fe9d360 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -47,7 +47,7 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 
 $action = GETPOST('action', 'aZ09');
 
-$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+$disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
@@ -64,11 +64,11 @@ $showbirthday = 0;
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -77,7 +77,7 @@ if (!$sortfield) {
 	$sortfield = "a.datec";
 }
 
-$socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
+$socid = GETPOSTINT("search_socid") ? GETPOSTINT("search_socid") : GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -97,15 +97,15 @@ if (!$user->hasRight('agenda', 'allactions', 'read') || $filter == 'mine') {  //
 }
 
 $mode = 'show_peruser';
-$resourceid = GETPOST("search_resourceid", "int") ? GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
-$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");
+$resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid");
+$year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
+$month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
+$day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
 $pid = GETPOSTISSET("search_projectid") ? 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', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
-$maxprint = ((GETPOST("maxprint", 'int') != '') ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$maxprint = ((GETPOSTINT("maxprint") != '') ? GETPOSTINT("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $search_categ_cus = GETPOST("search_categ_cus", "int", 3) ? GETPOST("search_categ_cus", "int", 3) : 0;
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
@@ -118,18 +118,18 @@ if (GETPOST('search_actioncode', 'array:aZ09')) {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
-$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
+$dateselect = dol_mktime(0, 0, 0, GETPOSTINT('dateselectmonth'), GETPOSTINT('dateselectday'), GETPOSTINT('dateselectyear'));
 if ($dateselect > 0) {
-	$day = GETPOST('dateselectday', 'int');
-	$month = GETPOST('dateselectmonth', 'int');
-	$year = GETPOST('dateselectyear', 'int');
+	$day = GETPOSTINT('dateselectday');
+	$month = GETPOSTINT('dateselectmonth');
+	$year = GETPOSTINT('dateselectyear');
 }
 
 $tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS') ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_h = GETPOST('begin_h', 'int') != '' ? GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
-$end_h   = GETPOST('end_h', 'int') ? GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
+$begin_h = GETPOSTINT('begin_h') != '' ? GETPOSTINT('begin_h') : ($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOSTINT('end_h') ? GETPOSTINT('end_h') : ($tmparray[1] != '' ? $tmparray[1] : 18);
 if ($begin_h < 0 || $begin_h > 23) {
 	$begin_h = 9;
 }
@@ -143,8 +143,8 @@ if ($end_h <= $begin_h) {
 $tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS') ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_d = GETPOST('begin_d', 'int') ? GETPOST('begin_d', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 1);
-$end_d   = GETPOST('end_d', 'int') ? GETPOST('end_d', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 5);
+$begin_d = GETPOSTINT('begin_d') ? GETPOSTINT('begin_d') : ($tmparray[0] != '' ? $tmparray[0] : 1);
+$end_d   = GETPOSTINT('end_d') ? GETPOSTINT('end_d') : ($tmparray[1] != '' ? $tmparray[1] : 5);
 if ($begin_d < 1 || $begin_d > 7) {
 	$begin_d = 1;
 }
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 5ef15ca226a..712c3ee0ccc 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 $langs->loadLangs(array("agenda", "commercial"));
 
 $action = GETPOST('action', 'aZ09');
-$month = GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$month = GETPOSTINT('month');
+$year = GETPOSTINT('year');
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index ac3c2b57bbb..72357539c84 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -91,12 +91,12 @@ if (isModEnabled('notification')) {
 
 $action = GETPOST('action', 'aZ09');
 
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -173,7 +173,7 @@ if (empty($reshook)) {
 	// Payment terms of the settlement
 	if ($action == 'setconditions' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'), GETPOSTINT('cond_reglement_id_deposit_percent'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -182,7 +182,7 @@ if (empty($reshook)) {
 	// Payment mode
 	if ($action == 'setmode' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -200,7 +200,7 @@ if (empty($reshook)) {
 	// Bank account
 	if ($action == 'setbankaccount' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -209,7 +209,7 @@ if (empty($reshook)) {
 	// customer preferred shipping method
 	if ($action == 'setshippingmethod' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		$result = $object->setShippingMethod(GETPOSTINT('shipping_method_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -297,7 +297,7 @@ if (empty($reshook)) {
 
 	// warehouse
 	if ($action == 'setwarehouse' && $user->hasRight('societe', 'creer')) {
-		$result = $object->setWarehouse(GETPOST('fk_warehouse', 'int'));
+		$result = $object->setWarehouse(GETPOSTINT('fk_warehouse'));
 	}
 }
 
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 255ab70afa7..ca78aa8f9c9 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -32,7 +32,7 @@ $langs->load("companies");
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -42,7 +42,7 @@ if (!$sortfield) {
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $type = GETPOST('type', 'alpha');
@@ -53,7 +53,7 @@ $contactname = GETPOST('contactname');
 $begin = GETPOST('begin', 'alpha');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 843c0ceaf35..67823d4b12f 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -54,10 +54,10 @@ $hookmanager->initHooks(array('commercialindex'));
 $langs->loadLangs(array("boxes", "commercial", "contracts", "orders", "propal", "supplier_proposal"));
 
 $action = GETPOST('action', 'aZ09');
-$bid = GETPOST('bid', 'int');
+$bid = GETPOSTINT('bid');
 
 // Securite access client
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 73fc1826706..4742d6b66e7 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -44,10 +44,10 @@ if (isModEnabled('categorie')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -62,12 +62,12 @@ if (!$sortfield) {
 }
 
 $id = GETPOSTINT('id');
-$rowid = GETPOST('rowid', 'int');
+$rowid = GETPOSTINT('rowid');
 $action = GETPOST('action', 'aZ09');
 $search_nom = GETPOST("search_nom");
 $search_prenom = GETPOST("search_prenom");
 $search_email = GETPOST("search_email");
-$template_id = GETPOST('template_id', 'int');
+$template_id = GETPOSTINT('template_id');
 
 // Do we click on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha')) {
@@ -134,14 +134,14 @@ if ($action == 'add') {
 				$dtarr = array();
 				$dtarr = explode('_', $key);
 				if (!array_key_exists('options_'.$dtarr[1].'_st_dt', $array_query)) {
-					$array_query['options_'.$dtarr[1].'_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear', 'int'));
+					$array_query['options_'.$dtarr[1].'_st_dt'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_st_dtmonth'), GETPOSTINT('options_'.$dtarr[1].'_st_dtday'), GETPOSTINT('options_'.$dtarr[1].'_st_dtyear'));
 				}
 			} elseif (preg_match("/end_dt/", $key)) {
 				// Special case for end date come with 3 inputs day, month, year
 				$dtarr = array();
 				$dtarr = explode('_', $key);
 				if (!array_key_exists('options_'.$dtarr[1].'_end_dt', $array_query)) {
-					$array_query['options_'.$dtarr[1].'_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear', 'int'));
+					$array_query['options_'.$dtarr[1].'_end_dt'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_end_dtmonth'), GETPOSTINT('options_'.$dtarr[1].'_end_dtday'), GETPOSTINT('options_'.$dtarr[1].'_end_dtyear'));
 				}
 			} else {
 				$array_query[$key] = GETPOST($key);
@@ -154,14 +154,14 @@ if ($action == 'add') {
 				$dtarr = array();
 				$dtarr = explode('_', $key);
 				if (!array_key_exists('options_'.$dtarr[1].'_st_dt_cnct', $array_query)) {
-					$array_query['options_'.$dtarr[1].'_st_dt_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear_cnct', 'int'));
+					$array_query['options_'.$dtarr[1].'_st_dt_cnct'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_st_dtmonth_cnct'), GETPOSTINT('options_'.$dtarr[1].'_st_dtday_cnct'), GETPOSTINT('options_'.$dtarr[1].'_st_dtyear_cnct'));
 				}
 			} elseif (preg_match("/end_dt/", $key)) {
 				// Special case for end date come with 3 inputs day, month, year
 				$dtarr = array();
 				$dtarr = explode('_', $key);
 				if (!array_key_exists('options_'.$dtarr[1].'_end_dt_cnct', $array_query)) {
-					$array_query['options_'.$dtarr[1].'_end_dt_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear_cnct', 'int'));
+					$array_query['options_'.$dtarr[1].'_end_dt_cnct'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_end_dtmonth_cnct'), GETPOSTINT('options_'.$dtarr[1].'_end_dtday_cnct'), GETPOSTINT('options_'.$dtarr[1].'_end_dtyear_cnct'));
 				}
 			} else {
 				$array_query[$key] = GETPOST($key);
@@ -185,7 +185,7 @@ if ($action == 'add') {
 				if ($key == $date_key) {
 					$dt = GETPOST($date_key);
 					if (!empty($dt)) {
-						$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key.'month', 'int'), GETPOST($date_key.'day', 'int'), GETPOST($date_key.'year', 'int'));
+						$array_query[$key] = dol_mktime(0, 0, 0, GETPOSTINT($date_key.'month'), GETPOSTINT($date_key.'day'), GETPOSTINT($date_key.'year'));
 					} else {
 						$array_query[$key] = '';
 					}
@@ -285,14 +285,14 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 					$dtarr = array();
 					$dtarr = explode('_', $key);
 					if (!array_key_exists('options_'.$dtarr[1].'_st_dt', $array_query)) {
-						$array_query['options_'.$dtarr[1].'_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear', 'int'));
+						$array_query['options_'.$dtarr[1].'_st_dt'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_st_dtmonth'), GETPOSTINT('options_'.$dtarr[1].'_st_dtday'), GETPOSTINT('options_'.$dtarr[1].'_st_dtyear'));
 					}
 				} elseif (preg_match("/end_dt/", $key)) {
 					// Special case for end date come with 3 inputs day, month, year
 					$dtarr = array();
 					$dtarr = explode('_', $key);
 					if (!array_key_exists('options_'.$dtarr[1].'_end_dt', $array_query)) {
-						$array_query['options_'.$dtarr[1].'_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear', 'int'));
+						$array_query['options_'.$dtarr[1].'_end_dt'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_end_dtmonth'), GETPOSTINT('options_'.$dtarr[1].'_end_dtday'), GETPOSTINT('options_'.$dtarr[1].'_end_dtyear'));
 						// print $array_query['options_'.$dtarr[1].'_end_dt'];
 						// 01/02/1013=1361228400
 					}
@@ -306,14 +306,14 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 					$dtarr = array();
 					$dtarr = explode('_', $key);
 					if (!array_key_exists('options_'.$dtarr[1].'_st_dt_cnct', $array_query)) {
-						$array_query['options_'.$dtarr[1].'_st_dt_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear_cnct', 'int'));
+						$array_query['options_'.$dtarr[1].'_st_dt_cnct'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_st_dtmonth_cnct'), GETPOSTINT('options_'.$dtarr[1].'_st_dtday_cnct'), GETPOSTINT('options_'.$dtarr[1].'_st_dtyear_cnct'));
 					}
 				} elseif (preg_match("/end_dt/", $key)) {
 					// Special case for end date come with 3 inputs day, month, year
 					$dtarr = array();
 					$dtarr = explode('_', $key);
 					if (!array_key_exists('options_'.$dtarr[1].'_end_dt_cnct', $array_query)) {
-						$array_query['options_'.$dtarr[1].'_end_dt_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear_cnct', 'int'));
+						$array_query['options_'.$dtarr[1].'_end_dt_cnct'] = dol_mktime(0, 0, 0, GETPOSTINT('options_'.$dtarr[1].'_end_dtmonth_cnct'), GETPOSTINT('options_'.$dtarr[1].'_end_dtday_cnct'), GETPOSTINT('options_'.$dtarr[1].'_end_dtyear_cnct'));
 						// print $array_query['cnct_options_'.$dtarr[1].'_end_dt'];
 						// 01/02/1013=1361228400
 					}
@@ -339,7 +339,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 					if ($key == $date_key) {
 						$dt = GETPOST($date_key);
 						if (!empty($dt)) {
-							$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key.'month', 'int'), GETPOST($date_key.'day', 'int'), GETPOST($date_key.'year', 'int'));
+							$array_query[$key] = dol_mktime(0, 0, 0, GETPOSTINT($date_key.'month'), GETPOSTINT($date_key.'day'), GETPOSTINT($date_key.'year'));
 						} else {
 							$array_query[$key] = '';
 						}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 80eb874e179..639a655efb7 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("mails", "admin"));
 
-$id = (GETPOST('mailid', 'int') ? GETPOST('mailid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('mailid') ? GETPOSTINT('mailid') : GETPOSTINT('id'));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 4dac837e45b..d0b95b32522 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -38,10 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 $langs->loadLangs(array("mails", "admin"));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -55,14 +55,14 @@ if (!$sortorder) {
 	$sortorder = "DESC,ASC";
 }
 
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
+$id = GETPOSTINT('id');
+$rowid = GETPOSTINT('rowid');
 $action = GETPOST('action', 'aZ09');
 $search_lastname = GETPOST("search_lastname", 'alphanohtml');
 $search_firstname = GETPOST("search_firstname", 'alphanohtml');
 $search_email = GETPOST("search_email", 'alphanohtml');
 $search_other = GETPOST("search_other", 'alphanohtml');
-$search_dest_status = GETPOST('search_dest_status', 'int');
+$search_dest_status = GETPOSTINT('search_dest_status');
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs('/mailings');
@@ -145,7 +145,7 @@ if ($action == 'add' && $user->hasRight('mailing', 'creer')) {		// Add recipient
 	}
 }
 
-if (GETPOST('clearlist', 'int') && $user->hasRight('mailing', 'creer')) {
+if (GETPOSTINT('clearlist') && $user->hasRight('mailing', 'creer')) {
 	// Loading Class
 	$obj = new MailingTargets($db);
 	$obj->clear_target($id);
@@ -155,7 +155,7 @@ if (GETPOST('clearlist', 'int') && $user->hasRight('mailing', 'creer')) {
 	*/
 }
 
-if (GETPOST('exportcsv', 'int') && $user->hasRight('mailing', 'lire')) {
+if (GETPOSTINT('exportcsv') && $user->hasRight('mailing', 'lire')) {
 	$completefilename = 'targets_emailing'.$object->id.'_'.dol_print_date(dol_now(), 'dayhourlog').'.csv';
 	header('Content-Type: text/csv');
 	header('Content-Disposition: attachment;filename='.$completefilename);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 12ca330896b..0bf7e9cb4ad 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load translation files required by the page
 $langs->load("mails");
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 0383ee5a5a1..082c75b6fe3 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -32,7 +32,7 @@ $langs->load('mails');
 // Get Parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -42,10 +42,10 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -314,7 +314,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/comm/mailing/note.php b/htdocs/comm/mailing/note.php
index 19e623d519b..6b7a5153bd7 100644
--- a/htdocs/comm/mailing/note.php
+++ b/htdocs/comm/mailing/note.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 $langs->loadLangs(array("mails", "mailing", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index d2729885b96..c9a4dd839ed 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -34,15 +34,15 @@ $langs->loadLangs(array('orders', 'companies'));
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
-$id = GETPOST('id', 'int');
-$_socid = GETPOST("id", 'int');
+$id = GETPOSTINT('id');
+$_socid = GETPOSTINT("id");
 // Security check
 if ($user->socid > 0) {
 	$_socid = $user->socid;
 }
 
 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOSTINT("socid");
 if ($user->socid > 0) {
 	$action = '';
 	$id = $user->socid;
diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index bcf710dac81..7a6f4d4d6e1 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array("propal", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -50,10 +50,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f827bc3e6ae..d22278ad585 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -72,24 +72,24 @@ if (isModEnabled('margin')) {
 
 $error = 0;
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $origin = GETPOST('origin', 'alpha');
-$originid = GETPOST('originid', 'int');
+$originid = GETPOSTINT('originid');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$lineid = GETPOST('lineid', 'int');
-$contactid = GETPOST('contactid', 'int');
-$projectid = GETPOST('projectid', 'int');
-$rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$lineid = GETPOSTINT('lineid');
+$contactid = GETPOSTINT('contactid');
+$projectid = GETPOSTINT('projectid');
+$rank = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Propal($db);
 $extrafields = new ExtraFields($db);
@@ -193,9 +193,9 @@ if (empty($reshook)) {
 						12,
 						0,
 						0,
-						GETPOST('date_deliverymonth', 'int'),
-						GETPOST('date_deliveryday', 'int'),
-						GETPOST('date_deliveryyear', 'int')
+						GETPOSTINT('date_deliverymonth'),
+						GETPOSTINT('date_deliveryday'),
+						GETPOSTINT('date_deliveryyear')
 					);
 					$date_delivery_old = $object->delivery_date;
 					if (!empty($date_delivery_old) && !empty($date_delivery)) {
@@ -224,7 +224,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : null), (GETPOST('update_prices', 'aZ') ? true : false), (GETPOST('update_desc', 'aZ') ? true : false));
+				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOSTINT('update_prices') ? true : false), (GETPOSTINT('update_desc') ? true : false));
 				if ($result > 0) {
 					$warningMsgLineList = array();
 					// check all product lines are to sell otherwise add a warning message for each product line is not to sell
@@ -302,7 +302,7 @@ if (empty($reshook)) {
 		exit();
 	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
 		// Validation
-		$idwarehouse = GETPOST('idwarehouse', 'int');
+		$idwarehouse = GETPOSTINT('idwarehouse');
 		$result = $object->valid($user);
 		if ($result > 0 && getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 			$result = $object->closeProposal($user, $object::STATUS_SIGNED);
@@ -338,7 +338,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate' && $usercancreate) {
-		$datep = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datep = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 		if (empty($datep)) {
 			$error++;
@@ -376,7 +376,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setecheance' && $usercancreate) {
-		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int')));
+		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear')));
 		if ($result >= 0) {
 			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
@@ -403,7 +403,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth', 'int'), GETPOST('date_livraisonday', 'int'), GETPOST('date_livraisonyear', 'int')));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOSTINT('date_livraisonmonth'), GETPOSTINT('date_livraisonday'), GETPOSTINT('date_livraisonyear')));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -415,7 +415,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'set_incoterms' && isModEnabled('incoterm') && $usercancreate) {
 		// Set incoterm
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	} elseif ($action == 'add' && $usercancreate) {
 		// Create proposal
 		$object->socid = $socid;
@@ -423,7 +423,7 @@ if (empty($reshook)) {
 
 		$datep = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 		$date_delivery = dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth'), GETPOST('date_livraisonday'), GETPOST('date_livraisonyear'));
-		$duration = GETPOST('duree_validite', 'int');
+		$duration = GETPOSTINT('duree_validite');
 
 		if (empty($datep)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePropal")), null, 'errors');
@@ -448,7 +448,7 @@ if (empty($reshook)) {
 
 			// If we select proposal to clone during creation (when option PROPAL_CLONE_ON_CREATE_PAGE is on)
 			if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal')) {
-				if ($object->fetch(GETPOST('copie_propal', 'int')) > 0) {
+				if ($object->fetch(GETPOSTINT('copie_propal')) > 0) {
 					$object->ref = GETPOST('ref');
 					$object->datep = $datep;
 					$object->date = $datep;
@@ -733,16 +733,16 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_closeas' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// Close proposal
-		if (!(GETPOST('statut', 'int') > 0)) {
+		if (!(GETPOSTINT('statut') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
 			$action = 'closeas';
-		} elseif (GETPOST('statut', 'int') == $object::STATUS_SIGNED || GETPOST('statut', 'int') == $object::STATUS_NOTSIGNED) {
+		} elseif (GETPOSTINT('statut') == $object::STATUS_SIGNED || GETPOSTINT('statut') == $object::STATUS_NOTSIGNED) {
 			$locationTarget = '';
 			// prevent browser refresh from closing proposal several times
 			if ($object->statut == $object::STATUS_VALIDATED || (getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE') && $object->statut == $object::STATUS_DRAFT)) {
 				$db->begin();
 
-				$result = $object->closeProposal($user, GETPOST('statut', 'int'), GETPOST('note_private', 'restricthtml'));
+				$result = $object->closeProposal($user, GETPOSTINT('statut'), GETPOSTINT('note_private'));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
@@ -756,19 +756,19 @@ if (empty($reshook)) {
 				$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
 				if (
-					!$error && GETPOST('statut', 'int') == $object::STATUS_SIGNED && GETPOST('generate_deposit', 'alpha') == 'on'
+					!$error && GETPOSTINT('statut') == $object::STATUS_SIGNED && GETPOSTINT('generate_deposit') == 'on'
 					&& !empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && $user->hasRight('facture', 'creer')
 				) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
-					$date = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'));
+					$date = dol_mktime(0, 0, 0, GETPOSTINT('datefmonth'), GETPOSTINT('datefday'), GETPOSTINT('datefyear'));
 					$forceFields = array();
 
 					if (GETPOSTISSET('date_pointoftax')) {
-						$forceFields['date_pointoftax'] = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
+						$forceFields['date_pointoftax'] = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'));
 					}
 
-					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOST('cond_reglement_id', 'int'), $user, 0, GETPOST('validate_generated_deposit', 'alpha') == 'on', $forceFields);
+					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOSTINT('cond_reglement_id'), $user, 0, GETPOSTINT('validate_generated_deposit') == 'on', $forceFields);
 
 					if ($deposit) {
 						setEventMessage('DepositGenerated');
@@ -936,9 +936,9 @@ if (empty($reshook)) {
 			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	} elseif ($action == "setabsolutediscount" && $usercancreate) {
-		if (GETPOST("remise_id", "int")) {
+		if (GETPOSTINT("remise_id")) {
 			if ($object->id > 0) {
-				$result = $object->insert_discount(GETPOST("remise_id", "int"));
+				$result = $object->insert_discount(GETPOSTINT("remise_id"));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -1020,7 +1020,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 
 			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
@@ -1159,7 +1159,7 @@ if (empty($reshook)) {
 					// If price per quantity
 					if ($prod->prices_by_qty[0]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-						$pqp = GETPOST('pbq', 'int');
+						$pqp = GETPOSTINT('pbq');
 
 						// Search price into product_price_by_qty from $prod->id
 						foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray) {
@@ -1180,7 +1180,7 @@ if (empty($reshook)) {
 					// If price per quantity and customer
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) { // yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-						$pqp = GETPOST('pbq', 'int');
+						$pqp = GETPOSTINT('pbq');
 
 						// Search price into product_price_by_qty from $prod->id
 						foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray) {
@@ -1510,13 +1510,13 @@ if (empty($reshook)) {
 		}
 
 		// Define special_code for special lines
-		$special_code = GETPOST('special_code', 'int');
+		$special_code = GETPOSTINT('special_code');
 		if (!GETPOST('qty')) {
 			$special_code = 3;
 		}
 
 		// Check minimum price
-		$productid = GETPOST('productid', 'int');
+		$productid = GETPOSTINT('productid');
 		if (!empty($productid)) {
 			$product = new Product($db);
 			$res = $product->fetch($productid);
@@ -1566,7 +1566,7 @@ if (empty($reshook)) {
 
 			if (!$user->hasRight('margins', 'creer')) {
 				foreach ($object->lines as &$line) {
-					if ($line->id == GETPOST('lineid', 'int')) {
+					if ($line->id == GETPOSTINT('lineid')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -1583,7 +1583,7 @@ if (empty($reshook)) {
 				$price_base_type = 'TTC';
 			}
 
-			$result = $object->updateline(GETPOST('lineid', 'int'), $pu, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $description, $price_base_type, $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, GETPOST("units"), $pu_ht_devise);
+			$result = $object->updateline(GETPOSTINT('lineid'), $pu, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $description, $price_base_type, $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, GETPOST("units"), $pu_ht_devise);
 
 			if ($result >= 0) {
 				$db->commit();
@@ -1640,38 +1640,38 @@ if (empty($reshook)) {
 		exit();
 	} elseif ($action == 'classin' && $usercancreate) {
 		// Set project
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	} elseif ($action == 'setavailability' && $usercancreate) {
 		// Delivery time
-		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));
+		$result = $object->set_availability($user, GETPOSTINT('availability_id'));
 	} elseif ($action == 'setdemandreason' && $usercancreate) {
 		// Origin of the commercial proposal
-		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));
+		$result = $object->set_demand_reason($user, GETPOSTINT('demand_reason_id'));
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		// Terms of payment
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'), GETPOSTINT('cond_reglement_id_deposit_percent'));
 		//} elseif ($action == 'setremisepercent' && $usercancreate) {
 		//	$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent'), '', 2));
 		//} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		//	$result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU', 2));
 	} elseif ($action == 'setmode' && $usercancreate) {
 		// Payment choice
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setbankaccount' && $usercancreate) {
 		// bank account
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	} elseif ($action == 'setshippingmethod' && $usercancreate) {
 		// shipping method
-		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		$result = $object->setShippingMethod(GETPOSTINT('shipping_method_id'));
 	} elseif ($action == 'setwarehouse' && $usercancreate) {
 		// warehouse
-		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
+		$result = $object->setWarehouse(GETPOSTINT('warehouse_id'));
 	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object, 2);
 		$attribute_name = GETPOST('attribute', 'restricthtml');
@@ -1715,7 +1715,7 @@ if (empty($reshook)) {
 		} elseif ($action == 'swapstatut') {
 			// Toggle the status of a contact
 			if ($object->fetch($id) > 0) {
-				$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+				$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 			} else {
 				dol_print_error($db);
 			}
@@ -1775,10 +1775,10 @@ if ($action == 'create') {
 
 	$currency_code = $conf->currency;
 
-	$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+	$cond_reglement_id = GETPOSTINT('cond_reglement_id');
 	$deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
-	$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
-	$fk_account = GETPOST('fk_account', 'int');
+	$mode_reglement_id = GETPOSTINT('mode_reglement_id');
+	$fk_account = GETPOSTINT('fk_account');
 
 	// Load objectsrc
 	if (!empty($origin) && !empty($originid)) {
@@ -1857,16 +1857,16 @@ if ($action == 'create') {
 	// If form was posted (but error returned), we must reuse the value posted in priority (standard Dolibarr behaviour)
 	if (!GETPOST('changecompany')) {
 		if (GETPOSTISSET('cond_reglement_id')) {
-			$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+			$cond_reglement_id = GETPOSTINT('cond_reglement_id');
 		}
 		if (GETPOSTISSET('deposit_percent')) {
 			$deposit_percent = price2num(GETPOST('deposit_percent', 'alpha'));
 		}
 		if (GETPOSTISSET('mode_reglement_id')) {
-			$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+			$mode_reglement_id = GETPOSTINT('mode_reglement_id');
 		}
 		if (GETPOSTISSET('cond_reglement_id')) {
-			$fk_account = GETPOST('fk_account', 'int');
+			$fk_account = GETPOSTINT('fk_account');
 		}
 	}
 
@@ -2000,7 +2000,7 @@ if ($action == 'create') {
 		// Source / Channel - What trigger creation
 		print '<tr class="field_demand_reason_id"><td class="titlefieldcreate">'.$langs->trans('Source').'</td><td class="valuefieldcreate">';
 		print img_picto('', 'question', 'class="pictofixedwidth"');
-		$form->selectInputReason((GETPOSTISSET('demand_reason_id') ? GETPOST('demand_reason_id', 'int') : ''), 'demand_reason_id', "SRC_PROP", 1, 'maxwidth200 widthcentpercentminusx');
+		$form->selectInputReason((GETPOSTISSET('demand_reason_id') ? GETPOSTINT('demand_reason_id') : ''), 'demand_reason_id', "SRC_PROP", 1, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 
 		// Shipping Method
@@ -2010,7 +2010,7 @@ if ($action == 'create') {
 			}
 			print '<tr class="field_shipping_method_id"><td class="titlefieldcreate">'.$langs->trans('SendingMethod').'</td><td class="valuefieldcreate">';
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
-			$form->selectShippingMethod((GETPOSTISSET('shipping_method_id') ? GETPOST('shipping_method_id', 'int') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
+			$form->selectShippingMethod((GETPOSTISSET('shipping_method_id') ? GETPOSTINT('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 			print '</td></tr>';
 		}
 
@@ -2030,7 +2030,7 @@ if ($action == 'create') {
 		}
 		print '</td><td class="valuefieldcreate">';
 		print img_picto('', 'clock', 'class="pictofixedwidth"');
-		$form->selectAvailabilityDelay((GETPOSTISSET('availability_id') ? GETPOST('availability_id', 'int') : ''), 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
+		$form->selectAvailabilityDelay((GETPOSTISSET('availability_id') ? GETPOSTINT('availability_id') : ''), 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 
 		// Delivery date (or manufacturing)
@@ -2258,7 +2258,7 @@ if ($action == 'create') {
 		$formquestion = array(
 			// 'text' => $langs->trans("ConfirmClone"),
 			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', $filter, '', 0, 0, null, 0, 'maxwidth300')),
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', $filter, '', 0, 0, null, 0, 'maxwidth300')),
 			array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans('PuttingPricesUpToDate'), 'value' => 0),
 			array('type' => 'checkbox', 'name' => 'update_desc', 'label' => $langs->trans('PuttingDescUpToDate'), 'value' => 0),
 		);
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 1da537b7d89..3e47a6921e3 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -37,9 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('facture', 'propal', 'orders', 'sendings', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 $action = GETPOST('action', 'aZ09');
 
 $object = new Propal($db);
@@ -87,7 +87,7 @@ if (empty($reshook)) {
 	// Add new contact
 	if ($action == 'addcontact' && $user->hasRight('propal', 'creer')) {
 		if ($object->id > 0) {
-			$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
@@ -106,7 +106,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'swapstatut' && $user->hasRight('propal', 'creer')) {
 		// Toggle the status of a contact
 		if ($object->id > 0) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		}
 	} elseif ($action == 'deletecontact' && $user->hasRight('propal', 'creer')) {
 		// Delete contact
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 00ec2367c8a..07ea2de457b 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -42,14 +42,14 @@ $langs->loadLangs(array('propal', 'compta', 'other', 'companies'));
 
 $action = GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index ce58344c3d9..ebc5905dc2a 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -42,7 +42,7 @@ $now = dol_now();
 $max = 5;
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b785152916b..7a1626674e5 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -63,11 +63,11 @@ if (isModEnabled("expedition")) {
 }
 
 // Get Parameters
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
@@ -76,8 +76,8 @@ $mode 		= GETPOST('mode', 'alpha');
 
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_user 	= GETPOST('search_user', 'int');
-$search_sale 	= GETPOST('search_sale', 'int');
+$search_user 	= GETPOSTINT('search_user');
+$search_sale 	= GETPOSTINT('search_sale');
 $search_ref 	= GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
 $search_refproject = GETPOST('search_refproject', 'alpha');
@@ -94,48 +94,48 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_product_category = GETPOSTINT('search_product_category');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
-$search_country = GETPOST("search_country", 'int');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_country = GETPOSTINT("search_country");
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_date_end_startday = GETPOST('search_date_end_startday', 'int');
-$search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
-$search_date_end_startyear = GETPOST('search_date_end_startyear', 'int');
-$search_date_end_endday = GETPOST('search_date_end_endday', 'int');
-$search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
-$search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
+$search_date_end_startday = GETPOSTINT('search_date_end_startday');
+$search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
+$search_date_end_startyear = GETPOSTINT('search_date_end_startyear');
+$search_date_end_endday = GETPOSTINT('search_date_end_endday');
+$search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
+$search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
 $search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
 $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);
-$search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
-$search_date_delivery_startmonth = GETPOST('search_date_delivery_startmonth', 'int');
-$search_date_delivery_startyear = GETPOST('search_date_delivery_startyear', 'int');
-$search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
-$search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
-$search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
+$search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
+$search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth');
+$search_date_delivery_startyear = GETPOSTINT('search_date_delivery_startyear');
+$search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday');
+$search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth');
+$search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear');
 $search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
-$search_availability = GETPOST('search_availability', 'int');
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
-$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
-$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
-$search_fk_input_reason = GETPOST("search_fk_input_reason", 'int');
-$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
-$search_date_signature_startday = GETPOST('search_date_signature_startday', 'int');
-$search_date_signature_startmonth = GETPOST('search_date_signature_startmonth', 'int');
-$search_date_signature_startyear = GETPOST('search_date_signature_startyear', 'int');
-$search_date_signature_endday = GETPOST('search_date_signature_endday', 'int');
-$search_date_signature_endmonth = GETPOST('search_date_signature_endmonth', 'int');
-$search_date_signature_endyear = GETPOST('search_date_signature_endyear', 'int');
+$search_availability = GETPOSTINT('search_availability');
+$search_categ_cus = GETPOSTINT("search_categ_cus");
+$search_fk_cond_reglement = GETPOSTINT("search_fk_cond_reglement");
+$search_fk_shipping_method = GETPOSTINT("search_fk_shipping_method");
+$search_fk_input_reason = GETPOSTINT("search_fk_input_reason");
+$search_fk_mode_reglement = GETPOSTINT("search_fk_mode_reglement");
+$search_date_signature_startday = GETPOSTINT('search_date_signature_startday');
+$search_date_signature_startmonth = GETPOSTINT('search_date_signature_startmonth');
+$search_date_signature_startyear = GETPOSTINT('search_date_signature_startyear');
+$search_date_signature_endday = GETPOSTINT('search_date_signature_endday');
+$search_date_signature_endmonth = GETPOSTINT('search_date_signature_endmonth');
+$search_date_signature_endyear = GETPOSTINT('search_date_signature_endyear');
 $search_date_signature_start = dol_mktime(0, 0, 0, $search_date_signature_startmonth, $search_date_signature_startday, $search_date_signature_startyear);
 $search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmonth, $search_date_signature_endday, $search_date_signature_endyear);
 $search_status = GETPOST('search_status', 'alpha');
@@ -144,10 +144,10 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $object_statut = GETPOST('search_statut', 'alpha');
 
 // Pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index bc408a1c6de..e412b5d1077 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -37,7 +37,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('propal', 'compta', 'bills', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 3603f89af2a..76809fc222f 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -44,8 +44,8 @@ $object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOSTINT('typent_id');
 $categ_id = GETPOSTINT('categ_id');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
@@ -53,7 +53,7 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 551172f2674..122d0f88811 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -36,7 +36,7 @@ if ($user->socid > 0) {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index b1f003f9e11..4881fce1920 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -34,7 +34,7 @@ if (isModEnabled('facture')) {
 }
 
 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOSTINT("socid");
 if ($user->socid > 0) {
 	$action = '';
 	$id = $user->socid;
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index f1c5f748e62..2a3ee4a4991 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'orders', 'bills'));
 
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 
-$socid = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$socid = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$socid = $user->socid;
@@ -66,7 +66,7 @@ if ($action == 'setremise') {
 	$object = new Societe($db);
 	$object->fetch($id);
 
-	$discount_type = GETPOST('discount_type', 'int');
+	$discount_type = GETPOSTINT('discount_type');
 
 	if (!empty($discount_type)) {
 		$result = $object->set_remise_supplier(price2num(GETPOST("remise")), GETPOST("note", "alphanohtml"), $user);
@@ -79,7 +79,7 @@ if ($action == 'setremise') {
 			header("Location: ".$backtopage);
 			exit;
 		} else {
-			header("Location: remise.php?id=".GETPOST("id", 'int'));
+			header("Location: remise.php?id=".GETPOSTINT("id"));
 			exit;
 		}
 	} else {
@@ -175,10 +175,10 @@ if ($socid > 0) {
 		// Discount type
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td><td>';
 		if ($isCustomer) {
-			print '<input type="radio" name="discount_type" id="discount_type_0" '.(GETPOSTISSET('discount_type') ? (GETPOST('discount_type', 'int') == 0 ? ' checked' : '') : ' checked').' value="0"> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
+			print '<input type="radio" name="discount_type" id="discount_type_0" '.(GETPOSTISSET('discount_type') ? (GETPOSTINT('discount_type') == 0 ? ' checked' : '') : ' checked').' value="0"> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 		}
 		if ($isSupplier) {
-			print ' <input type="radio" name="discount_type" id="discount_type_1"'.(GETPOSTISSET('discount_type') ? (GETPOST('discount_type', 'int') ? ' checked' : '') : ($isCustomer ? '' : ' checked')).' value="1"> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+			print ' <input type="radio" name="discount_type" id="discount_type_1"'.(GETPOSTISSET('discount_type') ? (GETPOSTINT('discount_type') ? ' checked' : '') : ($isCustomer ? '' : ' checked')).' value="1"> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 068fdff9052..994e30fb9f1 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -38,13 +38,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'bills', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
-$socid = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$socid = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -75,7 +75,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $permi
 	$amount_ttc_2 = price2num($amount_ttc_2);
 
 	$error = 0;
-	$remid = (GETPOST("remid", 'int') ? GETPOST("remid", 'int') : 0);
+	$remid = (GETPOSTINT("remid") ? GETPOSTINT("remid") : 0);
 	$discount = new DiscountAbsolute($db);
 	$res = $discount->fetch($remid);
 	if (!($res > 0)) {
diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index 49fe399610b..3c0eea17f23 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array("order", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -50,10 +50,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 988879d2f7f..c2c6cfe44cf 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -78,25 +78,25 @@ if (isModEnabled('productbatch')) {
 }
 
 
-$id        = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
+$id        = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('orderid'));
 $ref       =  GETPOST('ref', 'alpha');
-$socid     =  GETPOST('socid', 'int');
+$socid     =  GETPOSTINT('socid');
 $action    =  GETPOST('action', 'aZ09');
 $cancel    =  GETPOST('cancel', 'alpha');
 $confirm   =  GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$lineid    =  GETPOST('lineid', 'int');
-$contactid =  GETPOST('contactid', 'int');
-$projectid =  GETPOST('projectid', 'int');
+$lineid    =  GETPOSTINT('lineid');
+$contactid =  GETPOSTINT('contactid');
+$projectid =  GETPOSTINT('projectid');
 $origin    =  GETPOST('origin', 'alpha');
-$originid  = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int'));    // For backward compatibility
-$rank      = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$originid  = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id'));    // For backward compatibility
+$rank      = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Security check
 if (!empty($user->socid)) {
@@ -139,7 +139,7 @@ $permissiontoadd   = $usercancreate;     //  Used by the include of actions_addu
 
 $error = 0;
 
-$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+$date_delivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 
 /*
@@ -278,11 +278,11 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'classin' && $usercancreate) {
 		// Link to a project
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	} elseif ($action == 'add' && $usercancreate) {
 		// Add order
 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-		$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		$date_delivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		if ($datecommande == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
@@ -305,7 +305,7 @@ if (empty($reshook)) {
 			$object->date_commande = $datecommande;
 			$object->note_private = GETPOST('note_private', 'restricthtml');
 			$object->note_public = GETPOST('note_public', 'restricthtml');
-			$object->source = GETPOST('source_id', 'int');
+			$object->source = GETPOSTINT('source_id');
 			$object->fk_project = GETPOSTINT('projectid');
 			$object->ref_client = GETPOST('ref_client', 'alpha');
 			$object->model_pdf = GETPOST('model');
@@ -520,8 +520,8 @@ if (empty($reshook)) {
 
 			// Insert default contacts if defined
 			if ($object_id > 0) {
-				if (GETPOST('contactid', 'int')) {
-					$result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');
+				if (GETPOSTINT('contactid')) {
+					$result = $object->add_contact(GETPOSTINT('contactid'), 'CUSTOMER', 'external');
 					if ($result < 0) {
 						setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
 						$error++;
@@ -574,14 +574,14 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate' && $usercancreate) {
-		$date = dol_mktime(0, 0, 0, GETPOST('order_month', 'int'), GETPOST('order_day', 'int'), GETPOST('order_year', 'int'));
+		$date = dol_mktime(0, 0, 0, GETPOSTINT('order_month'), GETPOSTINT('order_day'), GETPOSTINT('order_year'));
 
 		$result = $object->set_date($user, $date);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		$date_delivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		$object->fetch($id);
 		$result = $object->setDeliveryDate($user, $date_delivery);
@@ -589,7 +589,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setmode' && $usercancreate) {
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -598,7 +598,7 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability(GETPOST('availability_id'));
 		if ($result < 0) {
@@ -638,19 +638,19 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setbankaccount' && $usercancreate) {
 		// bank account
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setshippingmethod' && $usercancreate) {
 		// shipping method
-		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		$result = $object->setShippingMethod(GETPOSTINT('shipping_method_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setwarehouse' && $usercancreate) {
 		// warehouse
-		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
+		$result = $object->setWarehouse(GETPOSTINT('warehouse_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -708,7 +708,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 
 			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
@@ -852,7 +852,7 @@ if (empty($reshook)) {
 					// If price per quantity
 					if ($prod->prices_by_qty[0]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-						$pqp = GETPOST('pbq', 'int');
+						$pqp = GETPOSTINT('pbq');
 
 						// Search price into product_price_by_qty from $prod->id
 						foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray) {
@@ -873,7 +873,7 @@ if (empty($reshook)) {
 					// If price per quantity and customer
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-						$pqp = GETPOST('pbq', 'int');
+						$pqp = GETPOSTINT('pbq');
 						// Search price into product_price_by_qty from $prod->id
 						foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray) {
 							if ($priceforthequantityarray['rowid'] != $pqp) {
@@ -1199,7 +1199,7 @@ if (empty($reshook)) {
 		$remise_percent = GETPOST('remise_percent') != '' ? price2num(GETPOST('remise_percent'), '', 2) : 0;
 
 		// Check minimum price
-		$productid = GETPOST('productid', 'int');
+		$productid = GETPOSTINT('productid');
 		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
@@ -1252,7 +1252,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			if (!$user->hasRight('margins', 'creer')) {
 				foreach ($object->lines as &$line) {
-					if ($line->id == GETPOST('lineid', 'int')) {
+					if ($line->id == GETPOSTINT('lineid')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -1267,7 +1267,7 @@ if (empty($reshook)) {
 				$price_base_type = 'TTC';
 			}
 
-			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $price_base_type, $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('units'), $pu_ht_devise);
+			$result = $object->updateline(GETPOSTINT('lineid'), $description, $pu, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $price_base_type, $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('units'), $pu_ht_devise);
 
 			if ($result >= 0) {
 				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
@@ -1323,7 +1323,7 @@ if (empty($reshook)) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); //  To re-display card in edit mode
 		exit();
 	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
-		$idwarehouse = GETPOST('idwarehouse', 'int');
+		$idwarehouse = GETPOSTINT('idwarehouse');
 
 		$qualified_for_stock_change = 0;
 		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
@@ -1359,14 +1359,14 @@ if (empty($reshook)) {
 				) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
-					$date = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'));
+					$date = dol_mktime(0, 0, 0, GETPOSTINT('datefmonth'), GETPOSTINT('datefday'), GETPOSTINT('datefyear'));
 					$forceFields = array();
 
 					if (GETPOSTISSET('date_pointoftax')) {
-						$forceFields['date_pointoftax'] = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
+						$forceFields['date_pointoftax'] = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'));
 					}
 
-					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOST('cond_reglement_id', 'int'), $user, 0, GETPOST('validate_generated_deposit', 'alpha') == 'on', $forceFields);
+					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOSTINT('cond_reglement_id'), $user, 0, GETPOSTINT('validate_generated_deposit') == 'on', $forceFields);
 
 					if ($deposit) {
 						setEventMessage('DepositGenerated');
@@ -1469,7 +1469,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate) {
-		$idwarehouse = GETPOST('idwarehouse', 'int');
+		$idwarehouse = GETPOSTINT('idwarehouse');
 
 		$qualified_for_stock_change = 0;
 		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
@@ -1633,7 +1633,7 @@ if (empty($reshook)) {
 		} elseif ($action == 'swapstatut') {
 			// bascule du statut d'un contact
 			if ($object->id > 0) {
-				$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+				$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 			} else {
 				dol_print_error($db);
 			}
@@ -1956,7 +1956,7 @@ if ($action == 'create' && $usercancreate) {
 		if (isModEnabled('expedition')) {
 			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
 			print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
-			$form->selectShippingMethod(((GETPOSTISSET('shipping_method_id') && GETPOST('shipping_method_id', 'int') != 0) ? GETPOST('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
+			$form->selectShippingMethod(((GETPOSTISSET('shipping_method_id') && GETPOSTINT('shipping_method_id') != 0) ? GETPOST('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 			print '</td></tr>';
 		}
 
@@ -2216,7 +2216,7 @@ if ($action == 'create' && $usercancreate) {
 					// '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', 'int') ? GETPOST('idwarehouse', 'int') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOSTINT('idwarehouse') ? GETPOSTINT('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
 				);
 			}
 
@@ -2428,7 +2428,7 @@ if ($action == 'create' && $usercancreate) {
 			$filter = '(s.client:IN:1,2,3)';
 			// Create an array for form
 			$formquestion = array(
-				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', $filter, '', 0, 0, null, 0, 'maxwidth300'))
+				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', $filter, '', 0, 0, null, 0, 'maxwidth300'))
 			);
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 		}
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index f031865993b..0df141b3c41 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -71,7 +71,7 @@ if (empty($reshook)) {
 		$result = $object->fetch($id);
 
 		if ($result > 0 && $id > 0) {
-			$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
@@ -90,14 +90,14 @@ if (empty($reshook)) {
 	} elseif ($action == 'swapstatut' && $user->hasRight('commande', 'creer')) {
 		// Toggle the status of a contact
 		if ($object->fetch($id)) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} else {
 			dol_print_error($db);
 		}
 	} elseif ($action == 'deletecontact' && $user->hasRight('commande', 'creer')) {
 		// Delete contact
 		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+		$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 828722687d4..07086496213 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -46,10 +46,10 @@ if (!$user->hasRight('facture', 'creer')) {
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "orders"));
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 864375fbf5d..550ed05cc01 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -42,14 +42,14 @@ $langs->loadLangs(array('companies', 'other', 'bills', 'orders'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 3d3bdc94425..0186d660953 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -50,7 +50,7 @@ $hookmanager->initHooks(array('ordersindex'));
 
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index de9e0bd9892..c9fa02304f5 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -56,29 +56,29 @@ $langs->loadLangs(array('orders', 'sendings', 'deliveries', 'companies', 'compta
 // Get Parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlist';
 $mode        = GETPOST('mode', 'alpha');
 
 // Search Parameters
-$search_datecloture_start = GETPOST('search_datecloture_start', 'int');
+$search_datecloture_start = GETPOSTINT('search_datecloture_start');
 if (empty($search_datecloture_start)) {
-	$search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+	$search_datecloture_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datecloture_startmonth'), GETPOSTINT('search_datecloture_startday'), GETPOSTINT('search_datecloture_startyear'));
 }
-$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
+$search_datecloture_end = GETPOSTINT('search_datecloture_end');
 if (empty($search_datecloture_end)) {
-	$search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+	$search_datecloture_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datecloture_endmonth'), GETPOSTINT('search_datecloture_endday'), GETPOSTINT('search_datecloture_endyear'));
 }
-$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
-$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
-$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
-$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
+$search_dateorder_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateorder_start_month'), GETPOSTINT('search_dateorder_start_day'), GETPOSTINT('search_dateorder_start_year'));
+$search_dateorder_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateorder_end_month'), GETPOSTINT('search_dateorder_end_day'), GETPOSTINT('search_dateorder_end_year'));
+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery_start_month'), GETPOSTINT('search_datedelivery_start_day'), GETPOSTINT('search_datedelivery_start_year'));
+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_end_month'), GETPOSTINT('search_datedelivery_end_day'), GETPOSTINT('search_datedelivery_end_year'));
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_product_category = GETPOSTINT('search_product_category');
 $search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -87,14 +87,14 @@ $search_parent_name = trim(GETPOST('search_parent_name', 'alphanohtml'));
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST('search_state', 'alpha');
-$search_country = GETPOST('search_country', 'int');
-$search_type_thirdparty = GETPOST('search_type_thirdparty', 'int');
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
+$search_country = GETPOSTINT('search_country');
+$search_type_thirdparty = GETPOSTINT('search_type_thirdparty');
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
 $search_total_ht  = GETPOST('search_total_ht', 'alpha');
 $search_total_vat = GETPOST('search_total_vat', 'alpha');
 $search_total_ttc = GETPOST('search_total_ttc', 'alpha');
-$search_warehouse = GETPOST('search_warehouse', 'int');
+$search_warehouse = GETPOSTINT('search_warehouse');
 
 $search_multicurrency_code = GETPOST('search_multicurrency_code', 'alpha');
 $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
@@ -103,26 +103,26 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 
 $search_login = GETPOST('search_login', 'alpha');
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
+$search_categ_cus = GETPOSTINT("search_categ_cus");
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOST('search_billed', 'int');
-$search_status = GETPOST('search_status', 'int');
+$search_billed = GETPOSTINT('search_billed');
+$search_status = GETPOSTINT('search_status');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
 
-$search_fk_cond_reglement = GETPOST('search_fk_cond_reglement', 'int');
-$search_fk_shipping_method = GETPOST('search_fk_shipping_method', 'int');
-$search_fk_mode_reglement = GETPOST('search_fk_mode_reglement', 'int');
-$search_fk_input_reason = GETPOST('search_fk_input_reason', 'int');
+$search_fk_cond_reglement = GETPOSTINT('search_fk_cond_reglement');
+$search_fk_shipping_method = GETPOSTINT('search_fk_shipping_method');
+$search_fk_mode_reglement = GETPOSTINT('search_fk_mode_reglement');
+$search_fk_input_reason = GETPOSTINT('search_fk_input_reason');
 
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -228,7 +228,7 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 }
 
 // Security check
-$id = (GETPOST('orderid') ? GETPOST('orderid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('orderid') ? GETPOSTINT('orderid') : GETPOSTINT('id'));
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -333,8 +333,8 @@ if (empty($reshook)) {
 
 	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
 		$orders = GETPOST('toselect', 'array');
-		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-		$validate_invoices = GETPOST('validate_invoices', 'int');
+		$createbills_onebythird = GETPOSTINT('createbills_onebythird');
+		$validate_invoices = GETPOSTINT('validate_invoices');
 
 		$errors = array();
 
@@ -376,7 +376,7 @@ if (empty($reshook)) {
 					$objecttmp->ref_client = $cmd->ref_client;
 				}
 
-				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+				$datefacture = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 				if (empty($datefacture)) {
 					$datefacture = dol_now();
 				}
@@ -1512,7 +1512,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-if (GETPOST('autoselectall', 'int')) {
+if (GETPOSTINT('autoselectall')) {
 	$selectedfields .= '<script>';
 	$selectedfields .= '   $(document).ready(function() {';
 	$selectedfields .= '        console.log("Autoclick on checkforselects");';
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index dfd511673d3..38e10afd97e 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -58,7 +58,7 @@ $langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlistdet';
@@ -66,18 +66,18 @@ $productobuy = GETPOST('productobuy', 'alpha');
 $productonly = GETPOST('productonly', 'alpha');
 $disablelinefree = GETPOST('disablelinefree', 'alpha');
 
-$search_datecloture_start = GETPOST('search_datecloture_start', 'int');
+$search_datecloture_start = GETPOSTINT('search_datecloture_start');
 if (empty($search_datecloture_start)) {
-	$search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+	$search_datecloture_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datecloture_startmonth'), GETPOSTINT('search_datecloture_startday'), GETPOSTINT('search_datecloture_startyear'));
 }
-$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
+$search_datecloture_end = GETPOSTINT('search_datecloture_end');
 if (empty($search_datecloture_end)) {
-	$search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+	$search_datecloture_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datecloture_endmonth'), GETPOSTINT('search_datecloture_endday'), GETPOSTINT('search_datecloture_endyear'));
 }
-$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
-$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
-$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
-$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
+$search_dateorder_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateorder_start_month'), GETPOSTINT('search_dateorder_start_day'), GETPOSTINT('search_dateorder_start_year'));
+$search_dateorder_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateorder_end_month'), GETPOSTINT('search_dateorder_end_day'), GETPOSTINT('search_dateorder_end_year'));
+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery_start_month'), GETPOSTINT('search_datedelivery_start_day'), GETPOSTINT('search_datedelivery_start_year'));
+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_end_month'), GETPOSTINT('search_datedelivery_end_day'), GETPOSTINT('search_datedelivery_end_year'));
 
 if (isModEnabled('categorie')) {
 	$search_product_category_array = GETPOST("search_category_".Categorie::TYPE_PRODUCT."_list", "array");
@@ -101,43 +101,43 @@ $search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state", 'alpha');
-$search_country = GETPOST("search_country", 'int');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_country = GETPOSTINT("search_country");
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$socid = GETPOST('socid', 'int');
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
+$socid = GETPOSTINT('socid');
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
 $search_total_ht = GETPOST('search_total_ht', 'alpha');
 $search_total_vat = GETPOST('search_total_vat', 'alpha');
 $search_total_ttc = GETPOST('search_total_ttc', 'alpha');
-$search_warehouse = GETPOST('search_warehouse', 'int');
+$search_warehouse = GETPOSTINT('search_warehouse');
 $search_multicurrency_code = GETPOST('search_multicurrency_code', 'alpha');
 $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
+$search_categ_cus = GETPOSTINT("search_categ_cus");
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOSTISSET('search_billed') ? GETPOST('search_billed', 'int') : GETPOST('billed', 'int');
-$search_status = GETPOST('search_status', 'int');
+$search_billed = GETPOSTISSET('search_billed') ? GETPOSTINT('search_billed') : GETPOSTINT('billed');
+$search_status = GETPOSTINT('search_status');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
-$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
-$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
-$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
-$search_fk_input_reason = GETPOST("search_fk_input_reason", 'int');
+$search_fk_cond_reglement = GETPOSTINT("search_fk_cond_reglement");
+$search_fk_shipping_method = GETPOSTINT("search_fk_shipping_method");
+$search_fk_mode_reglement = GETPOSTINT("search_fk_mode_reglement");
+$search_fk_input_reason = GETPOSTINT("search_fk_input_reason");
 
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
@@ -238,7 +238,7 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 }
 
 // Security check
-$id = (GETPOST('orderid') ? GETPOST('orderid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('orderid') ? GETPOSTINT('orderid') : GETPOSTINT('id'));
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -976,7 +976,7 @@ if ($resql) {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
-	if (GETPOST('autoselectall', 'int')) {
+	if (GETPOSTINT('autoselectall')) {
 		$selectedfields .= '<script>';
 		$selectedfields .= '   $(document).ready(function() {';
 		$selectedfields .= '        console.log("Autoclick on checkforselects");';
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 33fd5fd60e3..925001c2a7c 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -36,9 +36,9 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'orders'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 1a06944f272..778b7484187 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -65,8 +65,8 @@ if ($mode == 'supplier') {
 $typent_id = GETPOSTINT('typent_id');
 $categ_id = GETPOSTINT('categ_id');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 16be3add9b7..f6a67149aa8 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -61,26 +61,26 @@ const PAY_CREDIT = 1;
 $langs->loadLangs(array("accountancy", "bills", "companies", "salaries", "compta", "trips", "banks", "loan"));
 
 $date_start = GETPOST('date_start', 'alpha');
-$date_startDay = GETPOST('date_startday', 'int');
-$date_startMonth = GETPOST('date_startmonth', 'int');
-$date_startYear = GETPOST('date_startyear', 'int');
+$date_startDay = GETPOSTINT('date_startday');
+$date_startMonth = GETPOSTINT('date_startmonth');
+$date_startYear = GETPOSTINT('date_startyear');
 $date_start = dol_mktime(0, 0, 0, $date_startMonth, $date_startDay, $date_startYear, 'tzuserrel');
 $date_stop = GETPOST('date_stop', 'alpha');
-$date_stopDay = GETPOST('date_stopday', 'int');
-$date_stopMonth = GETPOST('date_stopmonth', 'int');
-$date_stopYear = GETPOST('date_stopyear', 'int');
+$date_stopDay = GETPOSTINT('date_stopday');
+$date_stopMonth = GETPOSTINT('date_stopmonth');
+$date_stopYear = GETPOSTINT('date_stopyear');
 $date_stop = dol_mktime(23, 59, 59, $date_stopMonth, $date_stopDay, $date_stopYear, 'tzuserrel');
 $action = GETPOST('action', 'aZ09');
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
+$projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('comptafileslist', 'globallist'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -122,7 +122,7 @@ if (isModEnabled('multicompany') && is_object($mc)) {
 	$arrayofentities = $mc->getEntitiesList();
 }
 
-$entity = (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : (GETPOSTISSET('search_entity') ? GETPOST('search_entity', 'int') : $conf->entity));
+$entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : (GETPOSTISSET('search_entity') ? GETPOSTINT('search_entity') : $conf->entity));
 if (isModEnabled('multicompany') && is_object($mc)) {
 	if (empty($entity) && getDolGlobalString('MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES')) {
 		$entity = '0,'.implode(',', array_keys($arrayofentities));
@@ -633,7 +633,7 @@ if (isModEnabled('multicompany') && is_object($mc)) {
 	print ' &nbsp; <span class="marginleftonly marginrightonly'.(!getDolGlobalString('MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES') ? ' opacitymedium' : '').'">'.$langs->trans("Entity").' : ';
 	if (getDolGlobalString('MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES')) {
 		$socid = $mc->id;
-		print $mc->select_entities(GETPOSTISSET('search_entity') ? GETPOST('search_entity', 'int') : $mc->id, 'search_entity', '', false, false, false, false, true);
+		print $mc->select_entities(GETPOSTISSET('search_entity') ? GETPOSTINT('search_entity') : $mc->id, 'search_entity', '', false, false, false, false, true);
 	} else {
 		print $mc->label;
 	}
@@ -676,14 +676,14 @@ print dol_get_fiche_end();
 
 $param = '';
 if (!empty($date_start) && !empty($date_stop)) {
-	$param .= '&date_startday='.GETPOST('date_startday', 'int');
-	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
-	$param .= '&date_startyear='.GETPOST('date_startyear', 'int');
-	$param .= '&date_stopday='.GETPOST('date_stopday', 'int');
-	$param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
-	$param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
+	$param .= '&date_startday='.GETPOSTINT('date_startday');
+	$param .= '&date_startmonth='.GETPOSTINT('date_startmonth');
+	$param .= '&date_startyear='.GETPOSTINT('date_startyear');
+	$param .= '&date_stopday='.GETPOSTINT('date_stopday');
+	$param .= '&date_stopmonth='.GETPOSTINT('date_stopmonth');
+	$param .= '&date_stopyear='.GETPOSTINT('date_stopyear');
 	foreach ($listofchoices as $choice => $val) {
-		if (GETPOST($choice, 'int')) {
+		if (GETPOSTINT($choice)) {
 			$param .= '&'.$choice.'=1';
 		}
 	}
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index b9e5ac63a7b..7a593ad368d 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -46,7 +46,7 @@ $langs->load('compta');
  */
 
 //init var
-$invoice_type = GETPOST('invoice_type', 'int');
+$invoice_type = GETPOSTINT('invoice_type');
 $amountPayment = GETPOST('amountPayment');
 $amounts = GETPOST('amounts'); // from text inputs : invoice amount payment (check required)
 $remains = GETPOST('remains'); // from dolibarr's object (no need to check)
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index bd210826e37..def4c89daa0 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -35,7 +35,7 @@ global $conf, $db, $langs;
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'companies', 'other'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('account'));
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -51,10 +51,10 @@ if ($user->socid) {
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index fbe7f7c247a..8ca2d819152 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -61,7 +61,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "bills", "categories", "companies", "margins", "salaries", "loan", "donations", "trips", "members", "compta", "accountancy"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
@@ -71,24 +71,24 @@ $massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'aZ09');
 $mode = GETPOST('mode', 'aZ');
 
-$dateop = dol_mktime(12, 0, 0, GETPOST("opmonth", 'int'), GETPOST("opday", 'int'), GETPOST("opyear", 'int'));
+$dateop = dol_mktime(12, 0, 0, GETPOSTINT("opmonth"), GETPOSTINT("opday"), GETPOSTINT("opyear"));
 $search_debit = GETPOST("search_debit", 'alpha');
 $search_credit = GETPOST("search_credit", 'alpha');
 $search_type = GETPOST("search_type", 'alpha');
-$search_account = GETPOST("search_account", 'int') ? GETPOST("search_account", 'int') : GETPOST("account", 'int');
+$search_account = GETPOSTINT("search_account") ? GETPOSTINT("search_account") : GETPOSTINT("account");
 $search_accountancy_code = GETPOST('search_accountancy_code', 'alpha') ? GETPOST('search_accountancy_code', 'alpha') : GETPOST('accountancy_code', 'alpha');
-$search_bid = GETPOST("search_bid", "int") ? GETPOST("search_bid", "int") : GETPOST("bid", "int");
+$search_bid = GETPOSTINT("search_bid") ? GETPOSTINT("search_bid") : GETPOSTINT("bid");
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_description = GETPOST("search_description", 'alpha');
-$search_dt_start = dol_mktime(0, 0, 0, GETPOST('search_start_dtmonth', 'int'), GETPOST('search_start_dtday', 'int'), GETPOST('search_start_dtyear', 'int'));
-$search_dt_end = dol_mktime(0, 0, 0, GETPOST('search_end_dtmonth', 'int'), GETPOST('search_end_dtday', 'int'), GETPOST('search_end_dtyear', 'int'));
-$search_dv_start = dol_mktime(0, 0, 0, GETPOST('search_start_dvmonth', 'int'), GETPOST('search_start_dvday', 'int'), GETPOST('search_start_dvyear', 'int'));
-$search_dv_end = dol_mktime(0, 0, 0, GETPOST('search_end_dvmonth', 'int'), GETPOST('search_end_dvday', 'int'), GETPOST('search_end_dvyear', 'int'));
+$search_dt_start = dol_mktime(0, 0, 0, GETPOSTINT('search_start_dtmonth'), GETPOSTINT('search_start_dtday'), GETPOSTINT('search_start_dtyear'));
+$search_dt_end = dol_mktime(0, 0, 0, GETPOSTINT('search_end_dtmonth'), GETPOSTINT('search_end_dtday'), GETPOSTINT('search_end_dtyear'));
+$search_dv_start = dol_mktime(0, 0, 0, GETPOSTINT('search_start_dvmonth'), GETPOSTINT('search_start_dvday'), GETPOSTINT('search_start_dvyear'));
+$search_dv_end = dol_mktime(0, 0, 0, GETPOSTINT('search_end_dvmonth'), GETPOSTINT('search_end_dvday'), GETPOSTINT('search_end_dvyear'));
 $search_thirdparty_user = GETPOST("search_thirdparty", 'alpha') ? GETPOST("search_thirdparty", 'alpha') : GETPOST("thirdparty", 'alpha');
 $search_req_nb = GETPOST("req_nb", 'alpha');
 $search_num_releve = GETPOST("search_num_releve", 'alpha');
-$search_conciliated = GETPOST("search_conciliated", 'int');
-$search_fk_bordereau = GETPOST("search_fk_bordereau", 'int');
+$search_conciliated = GETPOSTINT("search_conciliated");
+$search_fk_bordereau = GETPOSTINT("search_fk_bordereau");
 $optioncss = GETPOST('optioncss', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $num_releve = GETPOST("num_releve", "alpha");
@@ -96,11 +96,11 @@ if (empty($dateop)) {
 	$dateop = -1;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$pageplusone = GETPOST("pageplusone", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$pageplusone = GETPOSTINT("pageplusone");
 if ($pageplusone) {
 	$page = $pageplusone - 1;
 }
@@ -309,16 +309,16 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 			$param .= '&search_description='.urlencode($search_description);
 		}
 		if (dol_strlen($search_dt_start) > 0) {
-			$param .= '&search_start_dtmonth='.GETPOST('search_start_dtmonth', 'int').'&search_start_dtday='.GETPOST('search_start_dtday', 'int').'&search_start_dtyear='.GETPOST('search_start_dtyear', 'int');
+			$param .= '&search_start_dtmonth='.GETPOSTINT('search_start_dtmonth').'&search_start_dtday='.GETPOSTINT('search_start_dtday').'&search_start_dtyear='.GETPOSTINT('search_start_dtyear');
 		}
 		if (dol_strlen($search_dt_end) > 0) {
-			$param .= '&search_end_dtmonth='.GETPOST('search_end_dtmonth', 'int').'&search_end_dtday='.GETPOST('search_end_dtday', 'int').'&search_end_dtyear='.GETPOST('search_end_dtyear', 'int');
+			$param .= '&search_end_dtmonth='.GETPOSTINT('search_end_dtmonth').'&search_end_dtday='.GETPOSTINT('search_end_dtday').'&search_end_dtyear='.GETPOSTINT('search_end_dtyear');
 		}
 		if (dol_strlen($search_dv_start) > 0) {
-			$param .= '&search_start_dvmonth='.GETPOST('search_start_dvmonth', 'int').'&search_start_dvday='.GETPOST('search_start_dvday', 'int').'&search_start_dvyear='.GETPOST('search_start_dvyear', 'int');
+			$param .= '&search_start_dvmonth='.GETPOSTINT('search_start_dvmonth').'&search_start_dvday='.GETPOSTINT('search_start_dvday').'&search_start_dvyear='.GETPOSTINT('search_start_dvyear');
 		}
 		if (dol_strlen($search_dv_end) > 0) {
-			$param .= '&search_end_dvmonth='.GETPOST('search_end_dvmonth', 'int').'&search_end_dvday='.GETPOST('search_end_dvday', 'int').'&search_end_dvyear='.GETPOST('search_end_dvyear', 'int');
+			$param .= '&search_end_dvmonth='.GETPOSTINT('search_end_dvmonth').'&search_end_dvday='.GETPOSTINT('search_end_dvday').'&search_end_dvyear='.GETPOSTINT('search_end_dvyear');
 		}
 		if ($search_type) {
 			$param .= '&search_type='.urlencode($search_type);
@@ -351,8 +351,8 @@ if (GETPOST('save') && !$cancel && $user->hasRight('banque', 'modifier')) {
 	$cat1      = GETPOST("cat1", 'alpha');
 
 	$bankaccountid = $id;
-	if (GETPOST('add_account', 'int') > 0) {
-		$bankaccountid = GETPOST('add_account', 'int');
+	if (GETPOSTINT('add_account') > 0) {
+		$bankaccountid = GETPOSTINT('add_account');
 	}
 	if (!$dateop) {
 		$error++;
@@ -398,7 +398,7 @@ if (GETPOST('save') && !$cancel && $user->hasRight('banque', 'modifier')) {
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('banque', 'modifier')) {
 	$accline = new AccountLine($db);
-	$result = $accline->fetch(GETPOST("rowid", "int"));
+	$result = $accline->fetch(GETPOSTINT("rowid"));
 	$result = $accline->delete($user);
 	if ($result <= 0) {
 		setEventMessages($accline->error, $accline->errors, 'errors');
@@ -488,22 +488,22 @@ if ($search_bid > 0) {
 	$param .= '&search_bid='.urlencode($search_bid);
 }
 if (dol_strlen($search_dt_start) > 0) {
-	$param .= '&search_start_dtmonth='.GETPOST('search_start_dtmonth', 'int').'&search_start_dtday='.GETPOST('search_start_dtday', 'int').'&search_start_dtyear='.GETPOST('search_start_dtyear', 'int');
+	$param .= '&search_start_dtmonth='.GETPOSTINT('search_start_dtmonth').'&search_start_dtday='.GETPOSTINT('search_start_dtday').'&search_start_dtyear='.GETPOSTINT('search_start_dtyear');
 }
 if (dol_strlen($search_dt_end) > 0) {
-	$param .= '&search_end_dtmonth='.GETPOST('search_end_dtmonth', 'int').'&search_end_dtday='.GETPOST('search_end_dtday', 'int').'&search_end_dtyear='.GETPOST('search_end_dtyear', 'int');
+	$param .= '&search_end_dtmonth='.GETPOSTINT('search_end_dtmonth').'&search_end_dtday='.GETPOSTINT('search_end_dtday').'&search_end_dtyear='.GETPOSTINT('search_end_dtyear');
 }
 if (dol_strlen($search_dv_start) > 0) {
-	$param .= '&search_start_dvmonth='.GETPOST('search_start_dvmonth', 'int').'&search_start_dvday='.GETPOST('search_start_dvday', 'int').'&search_start_dvyear='.GETPOST('search_start_dvyear', 'int');
+	$param .= '&search_start_dvmonth='.GETPOSTINT('search_start_dvmonth').'&search_start_dvday='.GETPOSTINT('search_start_dvday').'&search_start_dvyear='.GETPOSTINT('search_start_dvyear');
 }
 if (dol_strlen($search_dv_end) > 0) {
-	$param .= '&search_end_dvmonth='.GETPOST('search_end_dvmonth', 'int').'&search_end_dvday='.GETPOST('search_end_dvday', 'int').'&search_end_dvyear='.GETPOST('search_end_dvyear', 'int');
+	$param .= '&search_end_dvmonth='.GETPOSTINT('search_end_dvmonth').'&search_end_dvday='.GETPOSTINT('search_end_dvday').'&search_end_dvyear='.GETPOSTINT('search_end_dvyear');
 }
 if ($search_req_nb) {
 	$param .= '&req_nb='.urlencode($search_req_nb);
 }
-if (GETPOST("search_thirdparty", 'int')) {
-	$param .= '&thirdparty='.urlencode(GETPOST("search_thirdparty", 'int'));
+if (GETPOSTINT("search_thirdparty")) {
+	$param .= '&thirdparty='.urlencode(GETPOSTINT("search_thirdparty"));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
@@ -795,7 +795,7 @@ if ($resql) {
 	// Confirmation delete
 	if ($action == 'delete') {
 		$text = $langs->trans('ConfirmDeleteTransaction');
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid", 'int'), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOSTINT("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
 	}
 
 	// Lines of title fields
@@ -815,7 +815,7 @@ if ($resql) {
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) {
-		print '<input type="hidden" name="bid" value="'.GETPOST("bid", 'int').'">';
+		print '<input type="hidden" name="bid" value="'.GETPOSTINT("bid").'">';
 	}
 
 	// Form to reconcile
@@ -832,7 +832,7 @@ if ($resql) {
 			$texttoshow .= $langs->trans("InputReceiptNumberBis");
 		}
 		print $texttoshow;
-		print '<input class="flat width175" pattern="[0-9]+" title="'.dol_escape_htmltag($texttoshow.($placeholder ? ': '.$placeholder : '')).'" id="num_releve" name="num_releve" placeholder="'.dol_escape_htmltag($placeholder).'" type="text" value="'.(GETPOST('num_releve', 'int') ? GETPOST('num_releve', 'int') : '').'">'; // The only default value is value we just entered
+		print '<input class="flat width175" pattern="[0-9]+" title="'.dol_escape_htmltag($texttoshow.($placeholder ? ': '.$placeholder : '')).'" id="num_releve" name="num_releve" placeholder="'.dol_escape_htmltag($placeholder).'" type="text" value="'.(GETPOSTINT('num_releve') ? GETPOSTINT('num_releve') : '').'">'; // The only default value is value we just entered
 		print '</div>';
 		if (is_array($options) && count($options)) {
 			print $langs->trans("EventualyAddCategory").': ';
@@ -936,7 +936,7 @@ if ($resql) {
 		//if (! $search_account > 0)
 		//{
 		print '<td class=right>';
-		$form->select_comptes(GETPOST('add_account', 'int') ? GETPOST('add_account', 'int') : $search_account, 'add_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''));
+		$form->select_comptes(GETPOSTINT('add_account') ? GETPOSTINT('add_account') : $search_account, 'add_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''));
 		print '</td>';
 		//}
 		print '<td class="right"><input name="adddebit" class="flat" type="text" size="4" value="'.GETPOST("adddebit", "alpha").'"></td>';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 4398be3467e..369749781b5 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -68,12 +68,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('bankcard', 'globalcard'));
 
 // Security check
-$id = GETPOST("id", 'int') ? GETPOST("id", 'int') : GETPOST('ref', 'alpha');
-$fieldid = GETPOST("id", 'int') ? 'rowid' : 'ref';
+$id = GETPOSTINT("id") ? GETPOSTINT("id") : GETPOSTINT('ref');
+$fieldid = GETPOSTINT("id") ? 'rowid' : 'ref';
 
-if (GETPOST("id", 'int') || GETPOST("ref")) {
-	if (GETPOST("id", 'int')) {
-		$object->fetch(GETPOST("id", 'int'));
+if (GETPOSTINT("id") || GETPOST("ref")) {
+	if (GETPOSTINT("id")) {
+		$object->fetch(GETPOSTINT("id"));
 	}
 	if (GETPOST("ref")) {
 		$object->fetch(0, GETPOST("ref"));
@@ -148,7 +148,7 @@ if (empty($reshook)) {
 		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 		$object->owner_zip = trim(GETPOST("owner_zip", 'alphanohtml'));
 		$object->owner_town = trim(GETPOST("owner_town", 'alphanohtml'));
-		$object->owner_country_id = GETPOST("owner_country_id", 'int');
+		$object->owner_country_id = GETPOSTINT("owner_country_id");
 
 		$object->ics = trim(GETPOST("ics", 'alpha'));
 		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
@@ -168,7 +168,7 @@ if (empty($reshook)) {
 
 		$object->solde = GETPOSTFLOAT("solde");
 		$object->balance = GETPOSTFLOAT("solde");
-		$object->date_solde = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST('reday', 'int'), GETPOST("reyear", 'int'));
+		$object->date_solde = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT('reday'), GETPOSTINT("reyear"));
 
 		$object->currency_code = trim(GETPOST("account_currency_code"));
 
@@ -238,7 +238,7 @@ if (empty($reshook)) {
 
 		// Update account
 		$object = new Account($db);
-		$object->fetch(GETPOST("id", 'int'));
+		$object->fetch(GETPOSTINT("id"));
 
 		$object->ref = dol_string_nospecial(trim(GETPOST('ref', 'alpha')));
 		$object->label = trim(GETPOST("label", 'alphanohtml'));
@@ -260,7 +260,7 @@ if (empty($reshook)) {
 		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 		$object->owner_zip = trim(GETPOST("owner_zip", 'alphanohtml'));
 		$object->owner_town = trim(GETPOST("owner_town", 'alphanohtml'));
-		$object->owner_country_id = GETPOST("owner_country_id", 'int');
+		$object->owner_country_id = GETPOSTINT("owner_country_id");
 
 		$object->ics = trim(GETPOST("ics", 'alpha'));
 		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
@@ -318,7 +318,7 @@ if (empty($reshook)) {
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
 
-				$_GET["id"] = GETPOST("id", 'int'); // Force chargement page en mode visu
+				$_GET["id"] = GETPOSTINT("id"); // Force chargement page en mode visu
 			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -336,7 +336,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->hasRight('banque', 'configurer')) {
 		// Delete
 		$object = new Account($db);
-		$object->fetch(GETPOST("id", "int"));
+		$object->fetch(GETPOSTINT("id"));
 		$result = $object->delete($user);
 
 		if ($result > 0) {
@@ -412,7 +412,7 @@ if ($action == 'create') {
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 	print '<td>';
-	$formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT, 'type');
+	$formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOSTINT('type') : Account::TYPE_CURRENT, 'type');
 	print '</td></tr>';
 
 	// Currency
@@ -430,7 +430,7 @@ if ($action == 'create') {
 	// Status
 	print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
 	print '<td>';
-	print $form->selectarray("clos", $object->status, (GETPOST('clos', 'int') != '' ? GETPOST('clos', 'int') : $object->clos), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth150onsmartphone');
+	print $form->selectarray("clos", $object->status, (GETPOSTINT('clos') != '' ? GETPOSTINT('clos') : $object->clos), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth150onsmartphone');
 	print '</td></tr>';
 
 	// Country
@@ -461,7 +461,7 @@ if ($action == 'create') {
 	}
 	print '</td></tr>';
 
-	$type = (GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT); // add default value
+	$type = (GETPOSTISSET("type") ? GETPOSTINT('type') : Account::TYPE_CURRENT); // add default value
 	if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 		print '<textarea class="flat quatrevingtpercent" name="account_address" rows="'.ROWS_2.'">';
@@ -534,7 +534,7 @@ if ($action == 'create') {
 	print '</table>';
 	print '<br>';
 
-	$type = (GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT); // add default value
+	$type = (GETPOSTISSET("type") ? GETPOSTINT('type') : Account::TYPE_CURRENT); // add default value
 	if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 		print '<table class="border centpercent">';
 
@@ -662,7 +662,7 @@ if ($action == 'create') {
 	print '</form>';
 } else {
 	// View and edit mode
-	if ((GETPOST("id", 'int') || GETPOST("ref")) && $action != 'edit') {
+	if ((GETPOSTINT("id") || GETPOST("ref")) && $action != 'edit') {
 		// Show tabs
 		$head = bank_prepare_head($object);
 
@@ -905,7 +905,7 @@ if ($action == 'create') {
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if (GETPOST('id', 'int') && $action == 'edit' && $user->hasRight('banque', 'configurer')) {
+	if (GETPOSTINT('id') && $action == 'edit' && $user->hasRight('banque', 'configurer')) {
 		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'bank_account');
 
 		if ($conf->use_javascript_ajax) {
@@ -929,7 +929,7 @@ if ($action == 'create') {
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formsoc">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">'."\n\n";
+		print '<input type="hidden" name="id" value="'.GETPOSTINT("id").'">'."\n\n";
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 		print dol_get_fiche_head(array(), 0, '', 0);
@@ -949,7 +949,7 @@ if ($action == 'create') {
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		$formbank->selectTypeOfBankAccount((GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type), 'type');
+		$formbank->selectTypeOfBankAccount((GETPOSTISSET('type') ? GETPOSTINT('type') : $object->type), 'type');
 		print '</td></tr>';
 
 		// Currency
@@ -970,7 +970,7 @@ if ($action == 'create') {
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOST("clos", "int") : $object->clos));
+		print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOSTINT("clos") : $object->clos));
 		print '</td></tr>';
 
 		// Country
@@ -1001,7 +1001,7 @@ if ($action == 'create') {
 		}
 		print '</td></tr>';
 
-		$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type); // add default current value
+		$type = (GETPOSTISSET('type') ? GETPOSTINT('type') : $object->type); // add default current value
 		if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 			print '<textarea class="flat quatrevingtpercent" name="account_address" rows="'.ROWS_2.'">';
@@ -1110,7 +1110,7 @@ if ($action == 'create') {
 
 		print '</table>';
 
-		$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type); // add default current value
+		$type = (GETPOSTISSET('type') ? GETPOSTINT('type') : $object->type); // add default current value
 		if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 			print '<br>';
 
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 5e3eef6e06e..c4265b4c184 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'companies', 'other'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('account'));
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -51,10 +51,10 @@ if ($user->socid) {
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 3430799ddc6..dd0b5d1cfe6 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -65,17 +65,17 @@ $datetime = dol_now();
 $year = dol_print_date($datetime, "%Y");
 $month = dol_print_date($datetime, "%m");
 $day = dol_print_date($datetime, "%d");
-if (GETPOST("year", 'int')) {
-	$year = sprintf("%04d", GETPOST("year", 'int'));
+if (GETPOSTINT("year")) {
+	$year = sprintf("%04d", GETPOSTINT("year"));
 }
-if (GETPOST("month", 'int')) {
-	$month = sprintf("%02d", GETPOST("month", 'int'));
+if (GETPOSTINT("month")) {
+	$month = sprintf("%02d", GETPOSTINT("month"));
 }
 
 
 $object = new Account($db);
 if (GETPOST('account') && !preg_match('/,/', GETPOST('account'))) {	// if for a particular account and not a list
-	$result = $object->fetch(GETPOST('account', 'int'));
+	$result = $object->fetch(GETPOSTINT('account'));
 }
 if (GETPOST("ref")) {
 	$result = $object->fetch(0, GETPOST("ref"));
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 78973debce8..36e525add58 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -34,8 +34,8 @@ $langs->loadLangs(array('banks', 'categories', 'companies'));
 
 
 // Get Parameters
-$id = GETPOST("rowid", 'int');
-$accountid = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
+$id = GETPOSTINT("rowid");
+$accountid = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('account'));
 $ref = GETPOST('ref', 'alpha');
 
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 0679b01951c..09b24fa6c70 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -54,7 +54,7 @@ if (isModEnabled('salaries')) {
 }
 
 
-$id = GETPOST('rowid', 'int');
+$id = GETPOSTINT('rowid');
 $rowid = GETPOSTINT('rowid');
 $accountoldid = GETPOSTINT('account');		// GETPOST('account') is old account id
 $accountid = GETPOSTINT('accountid');		// GETPOST('accountid') is new account id
@@ -102,20 +102,20 @@ if ($cancel) {
 
 if ($user->hasRight('banque', 'consolidate') && $action == 'donext') {
 	$al = new AccountLine($db);
-	$al->dateo_next(GETPOST("rowid", 'int'));
+	$al->dateo_next(GETPOSTINT("rowid"));
 } elseif ($user->hasRight('banque', 'consolidate') && $action == 'doprev') {
 	$al = new AccountLine($db);
-	$al->dateo_previous(GETPOST("rowid", 'int'));
+	$al->dateo_previous(GETPOSTINT("rowid"));
 } elseif ($user->hasRight('banque', 'consolidate') && $action == 'dvnext') {
 	$al = new AccountLine($db);
-	$al->datev_next(GETPOST("rowid", 'int'));
+	$al->datev_next(GETPOSTINT("rowid"));
 } elseif ($user->hasRight('banque', 'consolidate') && $action == 'dvprev') {
 	$al = new AccountLine($db);
-	$al->datev_previous(GETPOST("rowid", 'int'));
+	$al->datev_previous(GETPOSTINT("rowid"));
 }
 
 if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->hasRight('banque', 'modifier')) {
-	$cat1 = GETPOST("cat1", 'int');
+	$cat1 = GETPOSTINT("cat1");
 	if (!empty($rowid) && !empty($cat1)) {
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".((int) $rowid)." AND fk_categ = ".((int) $cat1);
 		if (!$db->query($sql)) {
@@ -139,8 +139,8 @@ if ($user->hasRight('banque', 'modifier') && $action == "update") {
 	$acsource->fetch($accountoldid);
 
 	$actarget = new Account($db);
-	if (GETPOST('accountid', 'int') > 0 && !$object->rappro && !$object->getVentilExportCompta()) {	// We ask to change bank account
-		$actarget->fetch(GETPOST('accountid', 'int'));
+	if (GETPOSTINT('accountid') > 0 && !$object->rappro && !$object->getVentilExportCompta()) {	// We ask to change bank account
+		$actarget->fetch(GETPOSTINT('accountid'));
 	} else {
 		$actarget->fetch($accountoldid);
 	}
@@ -351,7 +351,7 @@ if ($result) {
 
 		// Confirmations
 		if ($action == 'delete_categ') {
-			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".urlencode($rowid)."&cat1=".urlencode(GETPOST("fk_categ", 'int'))."&orig_account=".urlencode($orig_account), $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".urlencode($rowid)."&cat1=".urlencode(GETPOSTINT("fk_categ"))."&orig_account=".urlencode($orig_account), $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
 		}
 
 		print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 1a66ee4b4bb..97d34c16fba 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -48,7 +48,7 @@ $langs->loadLangs(array('banks', 'categories', 'accountancy', 'compta'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bankaccountlist'; // To manage different context of search
@@ -73,10 +73,10 @@ if ($user->socid) {
 
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index b57e7d5db3a..c745bd49245 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -51,7 +51,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 $langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan", "salaries"));
 
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('account', 'int') ? GETPOST('account', 'int') : GETPOST('id', 'int');
+$id = GETPOSTINT('account') ? GETPOSTINT('account') : GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $dvid = GETPOST('dvid', 'alpha');
 $numref = GETPOST('num', 'alpha');
@@ -76,11 +76,11 @@ if ($user->hasRight('banque', 'consolidate') && $action == 'dvprev' && !empty($d
 }
 
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$pageplusone = GETPOST("pageplusone", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$pageplusone = GETPOSTINT("pageplusone");
 if ($pageplusone) {
 	$page = $pageplusone - 1;
 }
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 178e46e6ce6..71c620c0a5d 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -78,13 +78,13 @@ if ($action == 'add' && $user->hasRight('banque', 'transfer')) {
 	$maxtab = 1;
 
 	while ($i < $MAXLINES) {
-		$dateo[$i] = dol_mktime(12, 0, 0, GETPOST($i.'_month', 'int'), GETPOST($i.'_day', 'int'), GETPOST($i.'_year', 'int'));
+		$dateo[$i] = dol_mktime(12, 0, 0, GETPOSTINT($i.'_month'), GETPOSTINT($i.'_day'), GETPOSTINT($i.'_year'));
 		$label[$i] = GETPOST($i.'_label', 'alpha');
 		$amount[$i] = price2num(GETPOST($i.'_amount', 'alpha'), 'MT', 2);
 		$amountto[$i] = price2num(GETPOST($i.'_amountto', 'alpha'), 'MT', 2);
-		$accountfrom[$i] = GETPOST($i.'_account_from', 'int');
-		$accountto[$i] = GETPOST($i.'_account_to', 'int');
-		$type[$i] = GETPOST($i.'_type', 'int');
+		$accountfrom[$i] = GETPOSTINT($i.'_account_from');
+		$accountto[$i] = GETPOSTINT($i.'_account_to');
+		$type[$i] = GETPOSTINT($i.'_type');
 
 		$tabnum[$i] = 0;
 		if (!empty($label[$i]) || !($amount[$i] <= 0) || !($accountfrom[$i] < 0) || !($accountto[$i]  < 0)) {
@@ -126,10 +126,10 @@ if ($action == 'add' && $user->hasRight('banque', 'transfer')) {
 			}
 
 			$tmpaccountfrom = new Account($db);
-			$tmpaccountfrom->fetch(GETPOST($n.'_account_from', 'int'));
+			$tmpaccountfrom->fetch(GETPOSTINT($n.'_account_from'));
 
 			$tmpaccountto = new Account($db);
-			$tmpaccountto->fetch(GETPOST($n.'_account_to', 'int'));
+			$tmpaccountto->fetch(GETPOSTINT($n.'_account_to'));
 
 			if ($tmpaccountto->currency_code == $tmpaccountfrom->currency_code) {
 				$amountto[$n] = $amount[$n];
@@ -319,12 +319,12 @@ for ($i = 1 ; $i < $MAXLINES; $i++) {
 
 	print '<tr class="oddeven nowraponall '.$classi.'"><td>';
 	print img_picto('', 'bank_account', 'class="paddingright"');
-	$form->select_comptes(($error ? GETPOST($i.'_account_from', 'int') : ''), $i.'_account_from', 0, '', 1, '', isModEnabled('multicurrency') ? 1 : 0, 'minwidth100');
+	$form->select_comptes(($error ? GETPOSTINT($i.'_account_from') : ''), $i.'_account_from', 0, '', 1, '', isModEnabled('multicurrency') ? 1 : 0, 'minwidth100');
 	print '</td>';
 
 	print '<td class="nowraponall">';
 	print img_picto('', 'bank_account', 'class="paddingright"');
-	$form->select_comptes(($error ? GETPOST($i.'_account_to', 'int') : ''), $i.'_account_to', 0, '', 1, '', isModEnabled('multicurrency') ? 1 : 0, 'minwidth100');
+	$form->select_comptes(($error ? GETPOSTINT($i.'_account_to') : ''), $i.'_account_to', 0, '', 1, '', isModEnabled('multicurrency') ? 1 : 0, 'minwidth100');
 	print "</td>\n";
 
 	// Payment mode
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 61f8fcf2936..ef683b833af 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -80,8 +80,8 @@ if (GETPOST("account") || GETPOST("ref")) {
 	}
 
 	$object = new Account($db);
-	if (GETPOST("account", 'int')) {
-		$result = $object->fetch(GETPOST("account", 'int'));
+	if (GETPOSTINT("account")) {
+		$result = $object->fetch(GETPOSTINT("account"));
 	}
 	if (GETPOST("ref")) {
 		$result = $object->fetch(0, GETPOST("ref"));
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index a88c71d535e..ca7fc8f2f9b 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -33,23 +33,23 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'banque', '', '', '');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index e244db093ac..80705447223 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -31,11 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index a2f0ee0e24c..95850bead49 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -42,18 +42,18 @@ $mode      = GETPOST('mode', 'alpha');
 $massaction = GETPOST('massaction', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$search_ref = GETPOST('search_ref', 'int');
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$search_ref = GETPOSTINT('search_ref');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$search_datep_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_datep_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
-$search_datev_start = dol_mktime(0, 0, 0, GETPOST('search_date_value_startmonth', 'int'), GETPOST('search_date_value_startday', 'int'), GETPOST('search_date_value_startyear', 'int'));
-$search_datev_end = dol_mktime(23, 59, 59, GETPOST('search_date_value_endmonth', 'int'), GETPOST('search_date_value_endday', 'int'), GETPOST('search_date_value_endyear', 'int'));
+$search_datep_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_startmonth'), GETPOSTINT('search_date_startday'), GETPOSTINT('search_date_startyear'));
+$search_datep_end = dol_mktime(23, 59, 59, GETPOSTINT('search_date_endmonth'), GETPOSTINT('search_date_endday'), GETPOSTINT('search_date_endyear'));
+$search_datev_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_value_startmonth'), GETPOSTINT('search_date_value_startday'), GETPOSTINT('search_date_value_startyear'));
+$search_datev_end = dol_mktime(23, 59, 59, GETPOSTINT('search_date_value_endmonth'), GETPOSTINT('search_date_value_endday'), GETPOSTINT('search_date_value_endyear'));
 $search_amount_deb = GETPOST('search_amount_deb', 'alpha');
 $search_amount_cred = GETPOST('search_amount_cred', 'alpha');
-$search_bank_account = GETPOST('search_account', 'int');
-$search_bank_entry = GETPOST('search_bank_entry', 'int');
+$search_bank_account = GETPOSTINT('search_account');
+$search_bank_entry = GETPOSTINT('search_bank_entry');
 $search_accountancy_account = GETPOST("search_accountancy_account");
 if ($search_accountancy_account == - 1) {
 	$search_accountancy_account = '';
@@ -63,22 +63,22 @@ if ($search_accountancy_subledger == - 1) {
 	$search_accountancy_subledger = '';
 }
 if (empty($search_datep_start)) {
-	$search_datep_start = GETPOST("search_datep_start", 'int');
+	$search_datep_start = GETPOSTINT("search_datep_start");
 }
 if (empty($search_datep_end)) {
-	$search_datep_end = GETPOST("search_datep_end", 'int');
+	$search_datep_end = GETPOSTINT("search_datep_end");
 }
 if (empty($search_datev_start)) {
-	$search_datev_start = GETPOST("search_datev_start", 'int');
+	$search_datev_start = GETPOSTINT("search_datev_start");
 }
 if (empty($search_datev_end)) {
-	$search_datev_end = GETPOST("search_datev_end", 'int');
+	$search_datev_end = GETPOSTINT("search_datev_end");
 }
-$search_type_id = GETPOST('search_type_id', 'int');
+$search_type_id = GETPOSTINT('search_type_id');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -174,7 +174,7 @@ $arrayfields = array(
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 561ee0ac68c..7c04430d3d7 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -35,21 +35,21 @@ require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php'
 
 $langs->loadLangs(array("install", "cashdesk", "admin", "banks"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $categid = GETPOST('categid');
 $label = GETPOST("label");
 
 $now = dol_now();
-$syear = (GETPOSTISSET('closeyear') ? GETPOST('closeyear', 'int') : dol_print_date($now, "%Y"));
-$smonth = (GETPOSTISSET('closemonth') ? GETPOST('closemonth', 'int') : dol_print_date($now, "%m"));
-$sday = (GETPOSTISSET('closeday') ? GETPOST('closeday', 'int') : dol_print_date($now, "%d"));
+$syear = (GETPOSTISSET('closeyear') ? GETPOSTINT('closeyear') : dol_print_date($now, "%Y"));
+$smonth = (GETPOSTISSET('closemonth') ? GETPOSTINT('closemonth') : dol_print_date($now, "%m"));
+$sday = (GETPOSTISSET('closeday') ? GETPOSTINT('closeday') : dol_print_date($now, "%d"));
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -164,9 +164,9 @@ if ($action == "start") {
 	}
 
 	if (!$error) {
-		$object->day_close = GETPOST('closeday', 'int');
-		$object->month_close = GETPOST('closemonth', 'int');
-		$object->year_close = GETPOST('closeyear', 'int');
+		$object->day_close = GETPOSTINT('closeday');
+		$object->month_close = GETPOSTINT('closemonth');
+		$object->year_close = GETPOSTINT('closeyear');
 
 		$object->opening = price2num(GETPOST('opening', 'alpha'));
 		$object->posmodule = GETPOST('posmodule', 'alpha');
@@ -388,7 +388,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 		if ($contextpage == 'takepos') {
 			print '<input type="hidden" name="contextpage" value="takepos">';
 		}
-		if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1') {
+		if ($action == 'start' && GETPOSTINT('posnumber') != '' && GETPOSTINT('posnumber') != '' && GETPOSTINT('posnumber') != '-1') {
 			print '<input type="hidden" name="action" value="add">';
 		} elseif ($action == 'close') {
 			print '<input type="hidden" name="action" value="valid">';
@@ -426,7 +426,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 			$selectedposnumber = 1;
 			$showempty = 0;
 		}
-		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ? GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
+		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ? GETPOSTINT('posnumber') : $selectedposnumber, $showempty);
 		//print '<input name="posnumber" type="text" class="maxwidth50" value="'.(GETPOSTISSET('posnumber')?GETPOST('posnumber', 'alpha'):'0').'">';
 		print '</td>';
 		// Year
@@ -699,7 +699,7 @@ if (empty($action) || $action == "view" || $action == "close") {
 			if ($contextpage == 'takepos') {
 				print '<input type="hidden" name="contextpage" value="takepos">';
 			}
-			if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1') {
+			if ($action == 'start' && GETPOSTINT('posnumber') != '' && GETPOSTINT('posnumber') != '' && GETPOSTINT('posnumber') != '-1') {
 				print '<input type="hidden" name="action" value="add">';
 			} elseif ($action == 'close') {
 				print '<input type="hidden" name="action" value="valid">';
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 2db0be641fd..2e57afab05e 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("banks", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -42,13 +42,13 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'ca
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'alpha');  // for mode view result
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
@@ -88,8 +88,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -358,9 +358,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index abf58daf200..83b0a56e563 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->loadLangs(array("bills", "banks"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $object = new CashControl($db);
 $object->fetch($id);
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 99553c95bb7..5d78d4ad4be 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -54,19 +54,19 @@ if ($user->socid) {
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
 $mode = GETPOST("mode", 'alpha');
-$year = GETPOST("year", 'int');
+$year = GETPOSTINT("year");
 $filtre = GETPOST("filtre", 'alpha');
 if (!$year) {
 	$year = date("Y", time());
 }
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$search_account = GETPOST('search_account', 'int');
+$search_account = GETPOSTINT('search_account');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index d128197a451..6b450fe5df1 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -45,10 +45,10 @@ $langs->load("companies");
 
 $mode = GETPOST("mode");
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index ab24151539f..34e00414b43 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -39,7 +39,7 @@ $langs->load("trips");
 
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -96,11 +96,11 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
 	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
-		$object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->date = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
 		$object->type = GETPOST('type', 'alpha');
-		$object->socid = (int) GETPOST('socid', 'int');
-		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->socid = GETPOSTINT('socid');
+		$object->fk_user = GETPOSTINT('fk_user');
 		$object->note_private = GETPOST('note_private', 'alpha');
 		$object->note_public = GETPOST('note_public', 'alpha');
 		$object->statut = Deplacement::STATUS_DRAFT;
@@ -140,11 +140,11 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
 	if (!GETPOST('cancel', 'alpha')) {
 		$result = $object->fetch($id);
 
-		$object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->date			= dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
 		$object->type			= GETPOST('type', 'alpha');
-		$object->socid = (int) GETPOST('socid', 'int');
-		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->socid = GETPOSTINT('socid');
+		$object->fk_user = GETPOSTINT('fk_user');
 		$object->note_private = GETPOST('note_private', 'alpha');
 		$object->note_public = GETPOST('note_public', 'alpha');
 
@@ -163,13 +163,13 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
 } elseif ($action == 'classin' && $user->hasRight('deplacement', 'creer')) {
 	// Set into a project
 	$object->fetch($id);
-	$result = $object->setProject(GETPOST('projectid', 'int'));
+	$result = $object->setProject(GETPOSTINT('projectid'));
 	if ($result < 0) {
 		dol_print_error($db, $object->error);
 	}
 } elseif ($action == 'setdated' && $user->hasRight('deplacement', 'creer')) {
 	// Set fields
-	$dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
+	$dated = dol_mktime(GETPOSTINT('datedhour'), GETPOSTINT('datedmin'), GETPOSTINT('datedsec'), GETPOSTINT('datedmonth'), GETPOSTINT('datedday'), GETPOSTINT('datedyear'));
 	$object->fetch($id);
 	$result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
 	if ($result < 0) {
@@ -177,7 +177,7 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
 	}
 } elseif ($action == 'setkm' && $user->hasRight('deplacement', 'creer')) {
 	$object->fetch($id);
-	$result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
+	$result = $object->setValueFrom('km', GETPOSTINT('km'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
 	if ($result < 0) {
 		dol_print_error($db, $object->error);
 	}
@@ -201,7 +201,7 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewTrip"));
 
-	$datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$datec = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -211,12 +211,12 @@ if ($action == 'create') {
 
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-	$form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
+	$form->select_type_fees(GETPOSTINT('type'), 'type', 1);
 	print '</td></tr>';
 
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-	print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print $form->select_dolusers(GETPOSTINT('fk_user'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td></tr>';
 
 	print "<tr>";
@@ -230,7 +230,7 @@ if ($action == 'create') {
 	// Company
 	print "<tr>";
 	print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
+	print $form->select_company(GETPOSTINT('socid'), 'socid', '', 1);
 	print '</td></tr>';
 
 	// Public note
@@ -301,13 +301,13 @@ if ($action == 'create') {
 			// Type
 			print "<tr>";
 			print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-			$form->select_type_fees(GETPOST('type', 'int') ? GETPOST('type', 'int') : $object->type, 'type', 0);
+			$form->select_type_fees(GETPOSTINT('type') ? GETPOSTINT('type') : $object->type, 'type', 0);
 			print '</td></tr>';
 
 			// Who
 			print "<tr>";
 			print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-			print $form->select_dolusers(GETPOST('fk_user', 'int') ? GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+			print $form->select_dolusers(GETPOSTINT('fk_user') ? GETPOSTINT('fk_user') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 			print '</td></tr>';
 
 			// Date
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 003418d2ab8..3948fc98308 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -38,17 +38,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'trips', 'companies', 'interventions'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 87b33aab5a1..d02a91bc477 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -32,16 +32,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
 $langs->loadLangs(array('companies', 'users', 'trips'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'deplacement', '', '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -54,7 +54,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.dated";
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index cfbbf33ab22..0f21e4a167c 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
 $langs->load("trips");
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index ae8954dc2f3..40e5b6cf9c5 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -36,20 +36,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array('companies', 'users', 'trips'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'deplacement', '', '');
 
-$search_ref = GETPOST('search_ref', 'int');
+$search_ref = GETPOSTINT('search_ref');
 $search_name = GETPOST('search_name', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 // $search_amount=GETPOST('search_amount','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;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 18f0544ee06..970f2b25eb1 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -34,13 +34,13 @@ $langs->loadLangs(array('trips', 'companies'));
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int'); if ($userid < 0) {
+$userid = GETPOSTINT('userid'); if ($userid < 0) {
 	$userid = 0;
 }
-$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+$socid = GETPOSTINT('socid'); if ($socid < 0) {
 	$socid = 0;
 }
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
 if ($user->socid > 0) {
diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index 5a233175c94..baee92ef2f1 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 $langs->loadLangs(array("bills", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -51,10 +51,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php
index 9f3bcc1dea6..25affb4c2f2 100644
--- a/htdocs/compta/facture/agenda.php
+++ b/htdocs/compta/facture/agenda.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 $langs->loadLangs(array("bills", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -50,10 +50,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index e9ce306b0a0..036af5a2864 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -50,7 +50,7 @@ $langs->loadLangs(array('bills', 'companies', 'compta', 'admin', 'other', 'produ
 
 $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
@@ -76,7 +76,7 @@ $selectedLines = GETPOST('toselect', 'array');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -318,11 +318,11 @@ if (empty($reshook)) {
 	} elseif ($action == 'setbankaccount' && $user->hasRight('facture', 'creer')) {
 		// Set bank account
 		$object->context['actionmsg'] = $langs->trans("FieldXModified", $langs->transnoentitiesnoconv("Bank"));
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	} elseif ($action == 'setfrequency' && $user->hasRight('facture', 'creer')) {
 		// Set frequency and unit frequency
 		$object->context['actionmsg'] = $langs->trans("FieldXModified", $langs->transnoentitiesnoconv("Frequency"));
-		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+		$object->setFrequencyAndUnit(GETPOSTINT('frequency'), GETPOSTINT('unit_frequency'));
 	} elseif ($action == 'setdate_when' && $user->hasRight('facture', 'creer')) {
 		// Set next date of execution
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
@@ -331,13 +331,13 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setnb_gen_max' && $user->hasRight('facture', 'creer')) {
 		// Set max period
-		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+		$object->setMaxPeriod(GETPOSTINT('nb_gen_max'));
 	} elseif ($action == 'setauto_validate' && $user->hasRight('facture', 'creer')) {
 		// Set auto validate
-		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
+		$object->setAutoValidate(GETPOSTINT('auto_validate'));
 	} elseif ($action == 'setgenerate_pdf' && $user->hasRight('facture', 'creer')) {
 		// Set generate pdf
-		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
+		$object->setGeneratepdf(GETPOSTINT('generate_pdf'));
 	} elseif ($action == 'setmodelpdf' && $user->hasRight('facture', 'creer')) {
 		// Set model pdf
 		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
@@ -380,7 +380,7 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	}
 
 	// Delete line
@@ -441,7 +441,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 
 			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
@@ -530,7 +530,7 @@ if (empty($reshook)) {
 				//}
 
 				// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-				$pqp = (GETPOST('pbq', 'int') ? GETPOST('pbq', 'int') : 0);
+				$pqp = (GETPOSTINT('pbq') ? GETPOSTINT('pbq') : 0);
 
 				$datapriceofproduct = $prod->getSellPrice($mysoc, $object->thirdparty, $pqp);
 
@@ -640,8 +640,8 @@ if (empty($reshook)) {
 				$fk_unit = GETPOST('units', 'alpha');
 			}
 
-			$date_start_fill = GETPOST('date_start_fill', 'int');
-			$date_end_fill = GETPOST('date_end_fill', 'int');
+			$date_start_fill = GETPOSTINT('date_start_fill');
+			$date_end_fill = GETPOSTINT('date_end_fill');
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
@@ -766,7 +766,7 @@ if (empty($reshook)) {
 		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
 
 		$objectline = new FactureLigneRec($db);
-		if ($objectline->fetch(GETPOST('lineid', 'int'))) {
+		if ($objectline->fetch(GETPOSTINT('lineid'))) {
 			$objectline->array_options = $array_options;
 			$result = $objectline->insertExtraFields();
 			if ($result < 0) {
@@ -785,7 +785,7 @@ if (empty($reshook)) {
 		}
 
 		// Define special_code for special lines
-		$special_code = GETPOST('special_code', 'int');
+		$special_code = GETPOSTINT('special_code');
 		if ($special_code == 3) {
 			$special_code = 0;	// Options should not exists on invoices
 		}
@@ -808,7 +808,7 @@ if (empty($reshook)) {
 		}
 
 		// Check minimum price
-		$productid = GETPOST('productid', 'int');
+		$productid = GETPOSTINT('productid');
 		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
@@ -830,11 +830,11 @@ if (empty($reshook)) {
 				$error++;
 			}
 		} else {
-			$type = GETPOST('type', 'int');
+			$type = GETPOSTINT('type');
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 
 			// Check parameters
-			if (GETPOST('type', 'int') < 0) {
+			if (GETPOSTINT('type') < 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 				$error++;
 			}
@@ -845,20 +845,20 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		$date_start_fill = GETPOST('date_start_fill', 'int');
-		$date_end_fill = GETPOST('date_end_fill', 'int');
+		$date_start_fill = GETPOSTINT('date_start_fill');
+		$date_end_fill = GETPOSTINT('date_end_fill');
 
 		// Update line
 		if (!$error) {
 			$result = $object->updateline(
-				GETPOST('lineid', 'int'),
+				GETPOSTINT('lineid'),
 				$description,
 				$pu_ht,
 				$qty,
 				$vat_rate,
 				$localtax1_rate,
 				$localtax1_rate,
-				GETPOST('productid', 'int'),
+				GETPOSTINT('productid'),
 				$remise_percent,
 				'HT',
 				$info_bits,
@@ -1040,14 +1040,14 @@ if ($action == 'create') {
 
 		// Payment term
 		print "<tr><td>".$langs->trans("PaymentConditions")."</td><td>";
-		print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $object->cond_reglement_id, 'cond_reglement_id', -1, 0, 0, '');
+		print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOSTINT('cond_reglement_id') : $object->cond_reglement_id, 'cond_reglement_id', -1, 0, 0, '');
 		//$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		print "</td></tr>";
 
 		// Payment mode
 		print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
 		print img_picto('', 'payment', 'class="pictofixedwidth"');
-		print $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $object->mode_reglement_id, 'mode_reglement_id', '', 0, 1, 0, 0, 1, '', 1);
+		print $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOSTINT('mode_reglement_id') : $object->mode_reglement_id, 'mode_reglement_id', '', 0, 1, 0, 0, 1, '', 1);
 		//$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', '', 1);
 		print "</td></tr>";
 
@@ -1060,7 +1060,7 @@ if ($action == 'create') {
 
 		//extrafields
 		$draft = new Facture($db);
-		$draft->fetch(GETPOST('facid', 'int'));
+		$draft->fetch(GETPOSTINT('facid'));
 
 		$extralabels = new ExtraFields($db);
 		$extralabels = $extrafields->fetch_name_optionals_label($draft->table_element);
@@ -1128,7 +1128,7 @@ if ($action == 'create') {
 
 		// Frequency + unit
 		print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
-		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;";
+		print "<input type='text' name='frequency' value='".GETPOSTINT('frequency')."' size='4' />&nbsp;";
 		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
@@ -1668,7 +1668,7 @@ if ($action == 'create') {
 
 
 		// Lines
-		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">';
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOSTINT('lineid')).'" method="POST">';
 		print '<input type="hidden" name="token" value="' . newToken().'">';
 		print '<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">';
 		print '<input type="hidden" name="mode" value="">';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 28a7c1a39fc..8f212f663ab 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -79,32 +79,32 @@ if (isModEnabled('margin')) {
 }
 
 // General $Variables
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int'));    // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid'));    // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$userid = GETPOST('userid', 'int');
+$lineid = GETPOSTINT('lineid');
+$userid = GETPOSTINT('userid');
 $search_ref = GETPOST('sf_ref', 'alpha') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
 $origin = GETPOST('origin', 'alpha');
-$originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
-$fac_rec = GETPOST('fac_rec', 'int');
-$facid = GETPOST('facid', 'int');
-$ref_client = GETPOST('ref_client', 'int');
-$rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
+$originid = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id')); // For backward compatibility
+$fac_rec = GETPOSTINT('fac_rec');
+$facid = GETPOSTINT('facid');
+$ref_client = GETPOSTINT('ref_client');
+$rank = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
+$projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0);
 $selectedLines = GETPOST('toselect', 'array');
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Number of lines for predefined product/service choices
 $NBLINES = 4;
@@ -223,7 +223,7 @@ if (empty($reshook)) {
 		} else {
 			$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-			$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+			$objectutil->date = dol_mktime(12, 0, 0, GETPOSTINT('newdatemonth'), GETPOSTINT('newdateday'), GETPOSTINT('newdateyear'));
 			$objectutil->socid = $socid;
 			$result = $objectutil->createFromClone($user, $id);
 			if ($result > 0) {
@@ -295,7 +295,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
-		$result = $object->deleteLine(GETPOST('lineid', 'int'));
+		$result = $object->deleteLine(GETPOSTINT('lineid'));
 		if ($result > 0) {
 			// reorder lines
 			$object->line_order(true);
@@ -413,17 +413,17 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'classin' && $usercancreate) {
 		$object->fetch($id);
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	} elseif ($action == 'setmode' && $usercancreate) {
 		$object->fetch($id);
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
 	} elseif ($action == 'setretainedwarrantyconditions' && $user->hasRight('facture', 'creer')) {
 		$object->fetch($id);
 		$object->retained_warranty_fk_cond_reglement = 0; // To clean property
-		$result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
+		$result = $object->setRetainedWarrantyPaymentTerms(GETPOSTINT('retained_warranty_fk_cond_reglement'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -455,11 +455,11 @@ if (empty($reshook)) {
 	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {	 // Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {	// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setinvoicedate' && $usercancreate) {
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
-		$newdate = dol_mktime(0, 0, 0, GETPOST('invoicedatemonth', 'int'), GETPOST('invoicedateday', 'int'), GETPOST('invoicedateyear', 'int'), 'tzserver');
+		$newdate = dol_mktime(0, 0, 0, GETPOSTINT('invoicedatemonth'), GETPOSTINT('invoicedateday'), GETPOSTINT('invoicedateyear'), 'tzserver');
 		if (empty($newdate)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate&token='.newToken());
@@ -489,7 +489,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'setdate_pointoftax' && $usercancreate) {
 		$object->fetch($id);
 
-		$date_pointoftax = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'), 'tzserver');
+		$date_pointoftax = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'), 'tzserver');
 
 		$object->date_pointoftax = $date_pointoftax;
 		$result = $object->update($user);
@@ -506,7 +506,7 @@ if (empty($reshook)) {
 		$db->begin();
 
 		if (!$error) {
-			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -536,7 +536,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setpaymentterm' && $usercancreate) {
 		$object->fetch($id);
-		$object->date_lim_reglement = dol_mktime(12, 0, 0, GETPOST('paymenttermmonth', 'int'), GETPOST('paymenttermday', 'int'), GETPOST('paymenttermyear', 'int'));
+		$object->date_lim_reglement = dol_mktime(12, 0, 0, GETPOSTINT('paymenttermmonth'), GETPOSTINT('paymenttermday'), GETPOSTINT('paymenttermyear'));
 		if ($object->date_lim_reglement < $object->date) {
 			$object->date_lim_reglement = $object->calculate_date_lim_reglement();
 			setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
@@ -578,9 +578,9 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'set_incoterms' && isModEnabled('incoterm')) {		// Set incoterm
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	} elseif ($action == 'setbankaccount' && $usercancreate) {	// bank account
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), '', 2));
@@ -589,10 +589,10 @@ if (empty($reshook)) {
 		$db->begin();
 
 		// We use the credit to reduce amount of invoice
-		if (GETPOST("remise_id", 'int') > 0) {
+		if (GETPOSTINT("remise_id") > 0) {
 			$ret = $object->fetch($id);
 			if ($ret > 0) {
-				$result = $object->insert_discount(GETPOST("remise_id", 'int'));
+				$result = $object->insert_discount(GETPOSTINT("remise_id"));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -602,10 +602,10 @@ if (empty($reshook)) {
 			}
 		}
 		// We use the credit to reduce remain to pay
-		if (GETPOST("remise_id_for_payment", 'int') > 0) {
+		if (GETPOSTINT("remise_id_for_payment") > 0) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($db);
-			$discount->fetch(GETPOST("remise_id_for_payment", 'int'));
+			$discount->fetch(GETPOSTINT("remise_id_for_payment"));
 
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
@@ -667,7 +667,7 @@ if (empty($reshook)) {
 		$object->set_ref_client(GETPOST('ref_client'));
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		// Classify to validated
-		$idwarehouse = GETPOST('idwarehouse', 'int');
+		$idwarehouse = GETPOSTINT('idwarehouse');
 
 		$object->fetch($id);
 		$object->fetch_thirdparty();
@@ -727,7 +727,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_modif' && $usercanunvalidate) {
 		// Go back to draft status (unvalidate)
-		$idwarehouse = GETPOST('idwarehouse', 'int');
+		$idwarehouse = GETPOSTINT('idwarehouse');
 
 		$object->fetch($id);
 		$object->fetch_thirdparty();
@@ -1007,7 +1007,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		if ($object->status == Facture::STATUS_VALIDATED && $object->paye == 0) {
 			$paiement = new Paiement($db);
-			$result = $paiement->fetch(GETPOST('paiement_id', 'int'));
+			$result = $paiement->fetch(GETPOSTINT('paiement_id'));
 			if ($result > 0) {
 				$result = $paiement->delete(); // If fetch ok and found
 				if ($result >= 0) {
@@ -1025,7 +1025,7 @@ if (empty($reshook)) {
 			$object->socid = GETPOSTINT('socid');
 		}
 
-		if (GETPOST('type', 'int') === '') {
+		if (GETPOSTINT('type') === '') {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 		}
 
@@ -1039,8 +1039,8 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		$dateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
-		$date_pointoftax = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'), 'tzserver');
+		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$date_pointoftax = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'), 'tzserver');
 
 		// Replacement invoice
 		if (GETPOST('type') == Facture::TYPE_REPLACEMENT) {
@@ -1054,7 +1054,7 @@ if (empty($reshook)) {
 				$action = 'create';
 			}
 
-			if (!(GETPOST('fac_replacement', 'int') > 0)) {
+			if (!(GETPOSTINT('fac_replacement') > 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReplaceInvoice")), null, 'errors');
 				$action = 'create';
@@ -1062,7 +1062,7 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				// This is a replacement invoice
-				$result = $object->fetch(GETPOST('fac_replacement', 'int'));
+				$result = $object->fetch(GETPOSTINT('fac_replacement'));
 				$object->fetch_thirdparty();
 
 				$object->date               = $dateinvoice;
@@ -1072,19 +1072,19 @@ if (empty($reshook)) {
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->ref_customer		= GETPOST('ref_client', 'alphanohtml');
 				$object->model_pdf          = GETPOST('model', 'alphanohtml');
-				$object->fk_project			= GETPOST('projectid', 'int');
-				$object->cond_reglement_id	= GETPOST('cond_reglement_id', 'int');
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
-				$object->fk_account         = GETPOST('fk_account', 'int');
+				$object->fk_project			= GETPOSTINT('projectid');
+				$object->cond_reglement_id	= GETPOSTINT('cond_reglement_id');
+				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
+				$object->fk_account         = GETPOSTINT('fk_account');
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU', 2);
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
-				$object->fk_incoterms       = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx   = GETPOSTINT('originmulticurrency_tx');
 
 				// Special properties of replacement invoice
-				$object->fk_facture_source = GETPOST('fac_replacement', 'int');
+				$object->fk_facture_source = GETPOSTINT('fac_replacement');
 				$object->type              = Facture::TYPE_REPLACEMENT;
 
 				$id = $object->createFromCurrent($user);
@@ -1096,7 +1096,7 @@ if (empty($reshook)) {
 
 		// Credit note invoice
 		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) {
-			$sourceinvoice = GETPOST('fac_avoir', 'int');
+			$sourceinvoice = GETPOSTINT('fac_avoir');
 			if (!($sourceinvoice > 0) && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
@@ -1133,16 +1133,16 @@ if (empty($reshook)) {
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->ref_customer		= GETPOST('ref_client', 'alphanohtml');
 				$object->model_pdf          = GETPOST('model');
-				$object->fk_project			= GETPOST('projectid', 'int');
+				$object->fk_project			= GETPOSTINT('projectid');
 				$object->cond_reglement_id	= 0;		// No payment term for a credit note
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
-				$object->fk_account         = GETPOST('fk_account', 'int');
+				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
+				$object->fk_account         = GETPOSTINT('fk_account');
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
-				$object->fk_incoterms       = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx   = GETPOSTINT('originmulticurrency_tx');
 
 				// Special properties of replacement invoice
 				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
@@ -1178,7 +1178,7 @@ if (empty($reshook)) {
 				// NOTE: fields total on credit note are stored as delta both on total of lines and on invoice total (good)
 				// NOTE: fields situation_percent on situation invoice are stored as cumulative values on lines (bad)
 				// NOTE: fields situation_percent on credit note are stored as delta on lines (good)
-				if (GETPOST('invoiceAvoirWithLines', 'int') == 1 && $id > 0) {
+				if (GETPOSTINT('invoiceAvoirWithLines') == 1 && $id > 0) {
 					if (!empty($facture_source->lines)) {
 						$fk_parent_line = 0;
 
@@ -1300,7 +1300,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
+				if (GETPOSTINT('invoiceAvoirWithPaymentRestAmount') == 1 && $id > 0) {
 					if ($facture_source->fetch($object->fk_facture_source) > 0) {
 						$totalpaid = $facture_source->getSommePaiement();
 						$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
@@ -1341,7 +1341,7 @@ if (empty($reshook)) {
 		}
 
 		// Standard invoice or Deposit invoice, created from a Predefined template invoice
-		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0) {
+		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT) && GETPOSTINT('fac_rec') > 0) {
 			if (empty($dateinvoice)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
@@ -1371,20 +1371,20 @@ if (empty($reshook)) {
 				$object->ref_customer       = GETPOST('ref_client');
 				$object->ref_client         = $object->ref_customer;
 				$object->model_pdf          = GETPOST('model');
-				$object->fk_project         = GETPOST('projectid', 'int');
+				$object->fk_project         = GETPOSTINT('projectid');
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
-				$object->fk_account         = GETPOST('fk_account', 'int');
+				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
+				$object->fk_account         = GETPOSTINT('fk_account');
 				$object->amount             = price2num(GETPOST('amount'));
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
-				$object->fk_incoterms       = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx   = GETPOSTINT('originmulticurrency_tx');
 
 				// Source facture
-				$object->fac_rec = GETPOST('fac_rec', 'int');
+				$object->fac_rec = GETPOSTINT('fac_rec');
 
 				$id = $object->create($user); // This include recopy of links from recurring invoice and recurring invoice lines
 			}
@@ -1396,7 +1396,7 @@ if (empty($reshook)) {
 			$valuestandardinvoice = price2num(str_replace('%', '', GETPOST('valuestandardinvoice', 'alpha')), 'MU');
 			$valuedeposit = price2num(str_replace('%', '', GETPOST('valuedeposit', 'alpha')), 'MU');
 
-			if (GETPOST('socid', 'int') < 1) {
+			if (GETPOSTINT('socid') < 1) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), null, 'errors');
 				$action = 'create';
@@ -1458,17 +1458,17 @@ if (empty($reshook)) {
 				$object->ref_client			= GETPOST('ref_client');
 				$object->ref_customer		= GETPOST('ref_client');
 				$object->model_pdf          = GETPOST('model');
-				$object->fk_project			= GETPOST('projectid', 'int');
+				$object->fk_project			= GETPOSTINT('projectid');
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
-				$object->fk_account         = GETPOST('fk_account', 'int');
+				$object->fk_account         = GETPOSTINT('fk_account');
 				$object->amount             = price2num(GETPOST('amount'));
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
-				$object->fk_incoterms       = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx   = GETPOSTINT('originmulticurrency_tx');
 
 				if (GETPOST('type') == Facture::TYPE_SITUATION) {
 					$object->situation_counter = 1;
@@ -1477,8 +1477,8 @@ if (empty($reshook)) {
 				}
 
 				if (in_array($object->type, $retainedWarrantyInvoiceAvailableType)) {
-					$object->retained_warranty = GETPOST('retained_warranty', 'int');
-					$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+					$object->retained_warranty = GETPOSTINT('retained_warranty');
+					$object->retained_warranty_fk_cond_reglement = GETPOSTINT('retained_warranty_fk_cond_reglement');
 				} else {
 					$object->retained_warranty = 0;
 					$object->retained_warranty_fk_cond_reglement = 0;
@@ -1904,12 +1904,12 @@ if (empty($reshook)) {
 					$id = $object->create($user);
 
 					for ($i = 1; $i <= $NBLINES; $i++) {
-						if (GETPOST('idprod'.$i, 'int')) {
+						if (GETPOSTINT('idprod'.$i)) {
 							$product = new Product($db);
-							$product->fetch(GETPOST('idprod'.$i, 'int'));
+							$product->fetch(GETPOSTINT('idprod'.$i));
 							$startday = dol_mktime(12, 0, 0, GETPOST('date_start'.$i.'month'), GETPOST('date_start'.$i.'day'), GETPOST('date_start'.$i.'year'));
 							$endday = dol_mktime(12, 0, 0, GETPOST('date_end'.$i.'month'), GETPOST('date_end'.$i.'day'), GETPOST('date_end'.$i.'year'));
-							$result = $object->addline($product->description, $product->price, price2num(GETPOST('qty'.$i), 'MS'), $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, GETPOST('idprod'.$i, 'int'), price2num(GETPOST('remise_percent'.$i), '', 2), $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit, 0, '', 1);
+							$result = $object->addline($product->description, $product->price, price2num(GETPOST('qty'.$i), 'MS'), $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, GETPOSTINT('idprod'.$i), price2num(GETPOST('remise_percent'.$i), '', 2), $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit, 0, '', 1);
 						}
 					}
 
@@ -1930,7 +1930,7 @@ if (empty($reshook)) {
 				$action = 'create';
 			}
 
-			if (!(GETPOST('situations', 'int') > 0)) {
+			if (!(GETPOSTINT('situations') > 0)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
 				setEventMessages($mesg, null, 'errors');
@@ -1938,8 +1938,8 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				$result = $object->fetch(GETPOST('situations', 'int'));
-				$object->fk_facture_source = GETPOST('situations', 'int');
+				$result = $object->fetch(GETPOSTINT('situations'));
+				$object->fk_facture_source = GETPOSTINT('situations');
 				$object->type = Facture::TYPE_SITUATION;
 
 				if (!empty($origin) && !empty($originid)) {
@@ -1950,13 +1950,13 @@ if (empty($reshook)) {
 
 					// retained warranty
 					if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
-						$retained_warranty = GETPOST('retained_warranty', 'int');
+						$retained_warranty = GETPOSTINT('retained_warranty');
 						if (price2num($retained_warranty) > 0) {
 							$object->retained_warranty = price2num($retained_warranty);
 						}
 
-						if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0) {
-							$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+						if (GETPOSTINT('retained_warranty_fk_cond_reglement') > 0) {
+							$object->retained_warranty_fk_cond_reglement = GETPOSTINT('retained_warranty_fk_cond_reglement');
 						}
 
 						$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
@@ -2006,12 +2006,12 @@ if (empty($reshook)) {
 				$object->note_private = trim(GETPOST('note', 'restricthtml'));
 				$object->ref_client = GETPOST('ref_client', 'alpha');
 				$object->model_pdf = GETPOST('model', 'alpha');
-				$object->fk_project = GETPOST('projectid', 'int');
-				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
-				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+				$object->fk_project = GETPOSTINT('projectid');
+				$object->cond_reglement_id = GETPOSTINT('cond_reglement_id');
+				$object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
 				//$object->remise_absolue =price2num(GETPOST('remise_absolue'), 'MU', 2);
 				//$object->remise_percent = price2num(GETPOST('remise_percent'), '', 2);
-				$object->fk_account = GETPOST('fk_account', 'int');
+				$object->fk_account = GETPOSTINT('fk_account');
 
 
 				// Special properties of replacement invoice
@@ -2119,7 +2119,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 
 			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
@@ -2232,7 +2232,7 @@ if (empty($reshook)) {
 				$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
 
 				// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-				$pqp = (GETPOST('pbq', 'int') ? GETPOST('pbq', 'int') : 0);
+				$pqp = (GETPOSTINT('pbq') ? GETPOSTINT('pbq') : 0);
 
 				$datapriceofproduct = $prod->getSellPrice($mysoc, $object->thirdparty, $pqp);
 
@@ -2592,13 +2592,13 @@ if (empty($reshook)) {
 		}
 
 		// Define special_code for special lines
-		$special_code = GETPOST('special_code', 'int');
+		$special_code = GETPOSTINT('special_code');
 		if ($special_code == 3) {
 			$special_code = 0;	// Options should not exists on invoices
 		}
 
 		$line = new FactureLigne($db);
-		$line->fetch(GETPOST('lineid', 'int'));
+		$line->fetch(GETPOSTINT('lineid'));
 		$percent = $line->get_prev_progress($object->id);
 		$progress = price2num(GETPOST('progress', 'alpha'));
 
@@ -2625,7 +2625,7 @@ if (empty($reshook)) {
 		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
 
 		// Check minimum price
-		$productid = GETPOST('productid', 'int');
+		$productid = GETPOSTINT('productid');
 		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
@@ -2693,7 +2693,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			if (empty($usercancreatemargin)) {
 				foreach ($object->lines as &$line) {
-					if ($line->id == GETPOST('lineid', 'int')) {
+					if ($line->id == GETPOSTINT('lineid')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -2709,7 +2709,7 @@ if (empty($reshook)) {
 			}
 
 			$result = $object->updateline(
-				GETPOST('lineid', 'int'),
+				GETPOSTINT('lineid'),
 				$description,
 				$pu,
 				$qty,
@@ -2722,7 +2722,7 @@ if (empty($reshook)) {
 				$price_base_type,
 				$info_bits,
 				$type,
-				GETPOST('fk_parent_line', 'int'),
+				GETPOSTINT('fk_parent_line'),
 				0,
 				$fournprice,
 				$buyingprice,
@@ -2796,7 +2796,7 @@ if (empty($reshook)) {
 			dol_print_error($db);
 		}
 		if (GETPOST('all_progress') != "") {
-			$all_progress = GETPOST('all_progress', 'int');
+			$all_progress = GETPOSTINT('all_progress');
 			foreach ($object->lines as $line) {
 				$percent = $line->get_prev_progress($object->id);
 				if ((float) $all_progress < (float) $percent) {
@@ -3055,7 +3055,7 @@ if (empty($reshook)) {
 		} elseif ($action == 'swapstatut') {
 			// toggle the status of a contact
 			if ($object->fetch($id)) {
-				$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+				$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 			} else {
 				dol_print_error($db);
 			}
@@ -3119,9 +3119,9 @@ if ($action == 'create') {
 
 	$currency_code = $conf->currency;
 
-	$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
-	$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
-	$fk_account = GETPOST('fk_account', 'int');
+	$cond_reglement_id = GETPOSTINT('cond_reglement_id');
+	$mode_reglement_id = GETPOSTINT('mode_reglement_id');
+	$fk_account = GETPOSTINT('fk_account');
 
 	// Load objectsrc
 	//$remise_absolue = 0;
@@ -3251,24 +3251,24 @@ if ($action == 'create') {
 	// If form was posted (but error returned), we must reuse the value posted in priority (standard Dolibarr behaviour)
 	if (!GETPOST('changecompany')) {
 		if (GETPOSTISSET('cond_reglement_id')) {
-			$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+			$cond_reglement_id = GETPOSTINT('cond_reglement_id');
 		}
 		if (GETPOSTISSET('mode_reglement_id')) {
-			$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+			$mode_reglement_id = GETPOSTINT('mode_reglement_id');
 		}
 		if (GETPOSTISSET('cond_reglement_id')) {
-			$fk_account = GETPOST('fk_account', 'int');
+			$fk_account = GETPOSTINT('fk_account');
 		}
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
 	if (empty($cond_reglement_id)) {
-		$cond_reglement_id = GETPOST("cond_reglement_id", 'int');
+		$cond_reglement_id = GETPOSTINT("cond_reglement_id");
 	}
 
 	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
 	if (empty($mode_reglement_id)) {
-		$mode_reglement_id = GETPOST("mode_reglement_id", 'int');
+		$mode_reglement_id = GETPOSTINT("mode_reglement_id");
 	}
 
 	// when bank account is empty (means not override by payment mode form a other object, like third-party), try to use default value
@@ -3335,12 +3335,12 @@ if ($action == 'create') {
 
 		$exampletemplateinvoice = new FactureRec($db);
 		$invoice_predefined = new FactureRec($db);
-		if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0) {
-			$invoice_predefined->fetch(GETPOST('fac_rec', 'int'));
+		if (empty($origin) && empty($originid) && GETPOSTINT('fac_rec') > 0) {
+			$invoice_predefined->fetch(GETPOSTINT('fac_rec'));
 		}
 
 		// Thirdparty
-		if ($soc->id > 0 && (!GETPOST('fac_rec', 'int') || !empty($invoice_predefined->frequency))) {
+		if ($soc->id > 0 && (!GETPOSTINT('fac_rec') || !empty($invoice_predefined->frequency))) {
 			// If thirdparty known and not a predefined invoiced without a recurring rule
 			print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 			print '<td colspan="2">';
@@ -3386,7 +3386,7 @@ if ($action == 'create') {
 				});
 				</script>';
 			}
-			if (!GETPOST('fac_rec', 'int')) {
+			if (!GETPOSTINT('fac_rec')) {
 				print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 			}
 			print '</td>';
@@ -3394,8 +3394,8 @@ if ($action == 'create') {
 		}
 
 		// Overwrite some values if creation of invoice is from a predefined invoice
-		if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0) {
-			$invoice_predefined->fetch(GETPOST('fac_rec', 'int'));
+		if (empty($origin) && empty($originid) && GETPOSTINT('fac_rec') > 0) {
+			$invoice_predefined->fetch(GETPOSTINT('fac_rec'));
 
 			$dateinvoice = $invoice_predefined->date_when; // To use next gen date by default later
 			if (empty($projectid)) {
@@ -3431,9 +3431,9 @@ if ($action == 'create') {
 					while ($i < $num) {
 						$objp = $db->fetch_object($resql);
 						print '<option value="'.$objp->rowid.'"';
-						if (GETPOST('fac_rec', 'int') == $objp->rowid) {
+						if (GETPOSTINT('fac_rec') == $objp->rowid) {
 							print ' selected';
-							$exampletemplateinvoice->fetch(GETPOST('fac_rec', 'int'));
+							$exampletemplateinvoice->fetch(GETPOSTINT('fac_rec'));
 						}
 						print '>'.$objp->title.' ('.price($objp->total_ttc).' '.$langs->trans("TTC").')</option>';
 						$i++;
@@ -3469,7 +3469,7 @@ if ($action == 'create') {
 
 		// Standard invoice
 		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int') ? '' : ' checked').'> ';
+		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOSTINT('type') ? '' : ' checked').'> ';
 		$tmp  = $tmp.'<label for="radio_standard" >'.$langs->trans("InvoiceStandardAsk").'</label>';
 		$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3, 'standardonsmartphone');
 		print '<table class="nobordernopadding"><tr>';
@@ -3540,7 +3540,7 @@ if ($action == 'create') {
 						'variablealllines' => $langs->transnoentitiesnoconv('VarAmountAllLines')
 					);
 					$typedeposit = GETPOST('typedeposit', 'aZ09');
-					$valuedeposit = GETPOST('valuedeposit', 'int');
+					$valuedeposit = GETPOSTINT('valuedeposit');
 					if (empty($typedeposit) && !empty($objectsrc->deposit_percent)) {
 						$origin_payment_conditions_deposit_percent = getDictionaryValue('c_payment_term', 'deposit_percent', $objectsrc->cond_reglement_id);
 						if (!empty($origin_payment_conditions_deposit_percent)) {
@@ -3573,10 +3573,10 @@ if ($action == 'create') {
 				print '</div></div>';
 
 				// Next situation invoice
-				$opt = $form->selectSituationInvoices(GETPOST('originid', 'int'), $socid);
+				$opt = $form->selectSituationInvoices(GETPOSTINT('originid'), $socid);
 
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOST('originid', 'int') ? ' checked' : '');
+				$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOSTINT('originid') ? ' checked' : '');
 				if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande')) {
 					$tmp .= ' disabled';
 				}
@@ -3606,7 +3606,7 @@ if ($action == 'create') {
 				if (is_array($facids)) {
 					foreach ($facids as $facparam) {
 						$options .= '<option value="'.$facparam ['id'].'"';
-						if ($facparam['id'] == GETPOST('fac_replacement', 'int')) {
+						if ($facparam['id'] == GETPOSTINT('fac_replacement')) {
 							$options .= ' selected';
 						}
 						$options .= '>'.$facparam['ref'];
@@ -3743,8 +3743,8 @@ if ($action == 'create') {
 					print $desc;
 
 					print '<div id="credit_note_options" class="clearboth paddingtop marginbottomonly">';
-					print '&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="$(\'#credit_note_options input[type=checkbox]\').not(this).prop(\'checked\', false);" '.(GETPOST('invoiceAvoirWithLines', 'int') > 0 ? 'checked' : '').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
-					print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="$(\'#credit_note_options input[type=checkbox]\').not(this).prop(\'checked\', false);" '.(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') > 0 ? 'checked' : '').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
+					print '&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="$(\'#credit_note_options input[type=checkbox]\').not(this).prop(\'checked\', false);" '.(GETPOSTINT('invoiceAvoirWithLines') > 0 ? 'checked' : '').' /> <label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
+					print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="$(\'#credit_note_options input[type=checkbox]\').not(this).prop(\'checked\', false);" '.(GETPOSTINT('invoiceAvoirWithPaymentRestAmount') > 0 ? 'checked' : '').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
 					print '</div>';
 
 					print '</div></div>';
@@ -3828,8 +3828,8 @@ if ($action == 'create') {
 			print '</td></tr>';
 		}
 
-		$newdateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver');
-		$date_pointoftax = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'), 'tzserver');
+		$newdateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');
+		$date_pointoftax = dol_mktime(0, 0, 0, GETPOSTINT('date_pointoftaxmonth'), GETPOSTINT('date_pointoftaxday'), GETPOSTINT('date_pointoftaxyear'), 'tzserver');
 
 		// Date invoice
 		print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td colspan="2">';
@@ -3854,11 +3854,11 @@ if ($action == 'create') {
 
 		if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 			$rwStyle = 'display:none;';
-			if (in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)) {
+			if (in_array(GETPOSTINT('type'), $retainedWarrantyInvoiceAvailableType)) {
 				$rwStyle = '';
 			}
 
-			$retained_warranty = GETPOST('retained_warranty', 'int');
+			$retained_warranty = GETPOSTINT('retained_warranty');
 			if (empty($retained_warranty)) {
 				if (!empty($objectsrc->retained_warranty)) { // use previous situation value
 					$retained_warranty = $objectsrc->retained_warranty;
@@ -3871,7 +3871,7 @@ if ($action == 'create') {
 
 			// Retained warranty payment term
 			print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
-			$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+			$retained_warranty_fk_cond_reglement = GETPOSTINT('retained_warranty_fk_cond_reglement');
 			if (empty($retained_warranty_fk_cond_reglement)) {
 				$retained_warranty_fk_cond_reglement = getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 				if (!empty($objectsrc->retained_warranty_fk_cond_reglement)) { // use previous situation value
@@ -3986,7 +3986,7 @@ if ($action == 'create') {
 
 		// Help of substitution key
 		$htmltext = '';
-		if (GETPOST('fac_rec', 'int') > 0) {
+		if (GETPOSTINT('fac_rec') > 0) {
 			$dateexample = ($newdateinvoice ? $newdateinvoice : $dateinvoice);
 			if (empty($dateexample)) {
 				$dateexample = dol_now();
@@ -4910,7 +4910,7 @@ if ($action == 'create') {
 					print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
 					print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-					$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+					$retained_warranty_fk_cond_reglement = GETPOSTINT('retained_warranty_fk_cond_reglement');
 					$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
 					$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 					print $form->getSelectConditionsPaiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 76941f3ee16..12bbd6fa5f0 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -538,12 +538,12 @@ class Facture extends CommonInvoice
 			// Fields coming from GUI.
 			// @TODO Value of template should be used as default value on the form on the GUI, and we should here always use the value from GUI
 			// set by posted page with $object->xxx = ... and this section should be removed.
-			$this->fk_project        = GETPOST('projectid', 'int') > 0 ? GETPOSTINT('projectid') : $_facrec->fk_project;
+			$this->fk_project        = GETPOSTINT('projectid') > 0 ? GETPOSTINT('projectid') : $_facrec->fk_project;
 			$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 ? GETPOSTINT('cond_reglement_id') : $_facrec->cond_reglement_id;
-			$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? GETPOSTINT('mode_reglement_id') : $_facrec->mode_reglement_id;
+			$this->cond_reglement_id = GETPOSTINT('cond_reglement_id') > 0 ? GETPOSTINT('cond_reglement_id') : $_facrec->cond_reglement_id;
+			$this->mode_reglement_id = GETPOSTINT('mode_reglement_id') > 0 ? GETPOSTINT('mode_reglement_id') : $_facrec->mode_reglement_id;
 			$this->fk_account        = GETPOST('fk_account') > 0 ? GETPOSTINT('fk_account') : $_facrec->fk_account;
 
 			// Set here to have this defined for substitution into notes, should be recalculated after adding lines to get same result
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 616a365e879..a6bb2603558 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -40,10 +40,10 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies'));
 
-$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
@@ -77,7 +77,7 @@ if (empty($reshook)) {
 	// Add new contact
 	if ($action == 'addcontact' && $user->hasRight('facture', 'creer')) {
 		if ($result > 0 && $id > 0) {
-			$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
@@ -95,7 +95,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'swapstatut' && $user->hasRight('facture', 'creer')) {
 		// Toggle the status of a contact
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 	} elseif ($action == 'deletecontact' && $user->hasRight('facture', 'creer')) {
 		// Delete contact
 		$result = $object->delete_contact($lineid);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a687998b04a..44519923cbe 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -43,17 +43,17 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array('propal', 'compta', 'other', 'bills', 'companies'));
 
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index fe614a7d2dc..ea2543aeb90 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -35,7 +35,7 @@ restrictedArea($user, 'facture');
 $langs->load('bills');
 
 // Filter to show only result of one customer
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 95b739eb5a7..13052314892 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array('companies', 'bills', 'compta', 'admin', 'other'));
 
 $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
@@ -55,10 +55,10 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'in
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
-$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
-$lineid = GETPOST('lineid', 'int');
+$id = (GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id'));
+$lineid = GETPOSTINT('lineid');
 $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
 	$socid = $user->socid;
@@ -75,32 +75,32 @@ $search_montant_vat = GETPOST('search_montant_vat');
 $search_montant_ttc = GETPOST('search_montant_ttc');
 $search_payment_mode = GETPOST('search_payment_mode');
 $search_payment_term = GETPOST('search_payment_term');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_date_when_startday = GETPOST('search_date_when_startday', 'int');
-$search_date_when_startmonth = GETPOST('search_date_when_startmonth', 'int');
-$search_date_when_startyear = GETPOST('search_date_when_startyear', 'int');
-$search_date_when_endday = GETPOST('search_date_when_endday', 'int');
-$search_date_when_endmonth = GETPOST('search_date_when_endmonth', 'int');
-$search_date_when_endyear = GETPOST('search_date_when_endyear', 'int');
+$search_date_when_startday = GETPOSTINT('search_date_when_startday');
+$search_date_when_startmonth = GETPOSTINT('search_date_when_startmonth');
+$search_date_when_startyear = GETPOSTINT('search_date_when_startyear');
+$search_date_when_endday = GETPOSTINT('search_date_when_endday');
+$search_date_when_endmonth = GETPOSTINT('search_date_when_endmonth');
+$search_date_when_endyear = GETPOSTINT('search_date_when_endyear');
 $search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);	// Use tzserver
 $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
-$search_recurring = GETPOST('search_recurring', 'int');
+$search_recurring = GETPOSTINT('search_recurring');
 $search_frequency = GETPOST('search_frequency', 'alpha');
 $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
-$search_status = GETPOST('search_status', 'int');
+$search_status = GETPOSTINT('search_status');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 391b9bb084d..d728541b8d9 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -64,15 +64,15 @@ if (isModEnabled('commande')) {
 $langs->loadLangs(array('bills', 'companies', 'products', 'categories'));
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
+$projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 
-$id = (GETPOST('id', 'int') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOSTINT('socid');
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -87,8 +87,8 @@ $lineid = GETPOSTINT('lineid');
 $userid = GETPOSTINT('userid');
 $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
-$search_type = GETPOST('search_type', 'int');
-$search_subtype = GETPOST('search_subtype', 'int');
+$search_type = GETPOSTINT('search_type');
+$search_subtype = GETPOSTINT('search_subtype');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -106,8 +106,8 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
-$search_paymentmode = GETPOST('search_paymentmode', 'int');
-$search_paymentterms = GETPOST('search_paymentterms', 'int');
+$search_paymentmode = GETPOSTINT('search_paymentmode');
+$search_paymentterms = GETPOSTINT('search_paymentterms');
 $search_module_source = GETPOST('search_module_source', 'alpha');
 $search_pos_source = GETPOST('search_pos_source', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
@@ -115,9 +115,9 @@ $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'alpha');
 $search_customer_code = GETPOST("search_customer_code", 'alphanohtml');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
 $search_date_startday = GETPOSTINT('search_date_startday');
 $search_date_startmonth = GETPOSTINT('search_date_startmonth');
 $search_date_startyear = GETPOSTINT('search_date_startyear');
@@ -142,8 +142,8 @@ $search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
 $search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_categ_cus = GETPOSTINT("search_categ_cus");
+$search_product_category = GETPOSTINT('search_product_category');
 $search_fac_rec_source_title = GETPOST("search_fac_rec_source_title", 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
@@ -157,7 +157,7 @@ $filtre = GETPOST('filtre', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 226984ec5f4..7c93f507ff9 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -37,9 +37,9 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 $object = new Facture($db);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 9942b002a73..e79cc953f3a 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -42,9 +42,9 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'withdrawals', 'companies'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $type = GETPOST('type', 'aZ09');
 
@@ -130,7 +130,7 @@ if (empty($reshook)) {
 
 	if ($action == "delete" && $usercancreate) {
 		if ($object->id > 0) {
-			$result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
+			$result = $object->demande_prelevement_delete($user, GETPOSTINT('did'));
 			if ($result == 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id.'&type='.$type);
 				exit;
@@ -140,7 +140,7 @@ if (empty($reshook)) {
 
 	// Make payment with Direct Debit Stripe
 	if ($action == 'sepastripedirectdebit' && $usercancreate) {
-		$result = $object->makeStripeSepaRequest($user, GETPOST('did', 'int'), 'direct-debit', 'facture');
+		$result = $object->makeStripeSepaRequest($user, GETPOSTINT('did'), 'direct-debit', 'facture');
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
@@ -155,7 +155,7 @@ if (empty($reshook)) {
 
 	// Make payment with Direct Debit Stripe
 	if ($action == 'sepastripecredittransfer' && $usercancreate) {
-		$result = $object->makeStripeSepaRequest($user, GETPOST('did', 'int'), 'bank-transfer', 'supplier_invoice');
+		$result = $object->makeStripeSepaRequest($user, GETPOSTINT('did'), 'bank-transfer', 'supplier_invoice');
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
@@ -179,7 +179,7 @@ if (empty($reshook)) {
 		$db->begin();
 
 		if (!$error) {
-			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -209,9 +209,9 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setmode' && $usercancreate) {
 		// payment mode
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 	} elseif ($action == 'setdatef' && $usercancreate) {
-		$newdate = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'), 'tzserver');
+		$newdate = dol_mktime(0, 0, 0, GETPOSTINT('datefmonth'), GETPOSTINT('datefday'), GETPOSTINT('datefyear'), 'tzserver');
 		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
@@ -234,7 +234,7 @@ if (empty($reshook)) {
 			dol_print_error($db, $object->error);
 		}
 	} elseif ($action == 'setdate_lim_reglement' && $usercancreate) {
-		$object->date_echeance = dol_mktime(12, 0, 0, GETPOST('date_lim_reglementmonth', 'int'), GETPOST('date_lim_reglementday', 'int'), GETPOST('date_lim_reglementyear', 'int'));
+		$object->date_echeance = dol_mktime(12, 0, 0, GETPOSTINT('date_lim_reglementmonth'), GETPOSTINT('date_lim_reglementday'), GETPOSTINT('date_lim_reglementyear'));
 		if (!empty($object->date_echeance) && $object->date_echeance < $object->date) {
 			$object->date_echeance = $object->date;
 			setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index f98216140f9..8e5ca60137a 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -55,8 +55,8 @@ $object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOSTINT('typent_id');
 $categ_id = GETPOSTINT('categ_id');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 $custcats = GETPOST('custcats', 'array');
 // Security check
 if ($user->socid > 0) {
@@ -65,7 +65,7 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index e5e49696f0f..c280a92183e 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -56,7 +56,7 @@ if (isModEnabled('commande')) {
 
 // Get parameters
 $action = GETPOST('action', 'aZ09');
-$bid = GETPOST('bid', 'int');
+$bid = GETPOSTINT('bid');
 
 // Security check
 $socid = '';
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 894aa3986d1..f52b3c2f72e 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -32,19 +32,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $action = GETPOST("action", "aZ09");
 $cancel = GETPOST('cancel', 'aZ09');
 
-$refund = GETPOST("refund", "int");
+$refund = GETPOSTINT("refund");
 if (empty($refund)) {
 	$refund = 0;
 }
 
-$lttype = GETPOST('localTaxType', 'int');
+$lttype = GETPOSTINT('localTaxType');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -188,7 +188,7 @@ if ($action == 'create') {
 		// Bank account
 		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
 		print img_picto('', 'bank_account', 'pictofixedwidth');
-		$form->select_comptes(GETPOST("accountid", "int"), "accountid", 0, "courant=1", 2, '', 0, 'maxwidth500 widthcentpercentminusx'); // Affiche liste des comptes courant
+		$form->select_comptes(GETPOSTINT("accountid"), "accountid", 0, "courant=1", 2, '', 0, 'maxwidth500 widthcentpercentminusx'); // Affiche liste des comptes courant
 		print '</td></tr>';
 
 		// Number
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index fc1dbded732..16d1af4f562 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -34,10 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
 
-$local = GETPOST('localTaxType', 'int');
+$local = GETPOSTINT('localTaxType');
 
 // Date range
-$year = GETPOST("year", "int");
+$year = GETPOSTINT("year");
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 	$year_start = $year_current;
@@ -93,14 +93,14 @@ if (empty($min)) {
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = getDolGlobalString('TAX_MODE');
 if (GETPOSTISSET("modetax")) {
-	$modetax = GETPOST("modetax", 'int');
+	$modetax = GETPOSTINT("modetax");
 }
 if (empty($modetax)) {
 	$modetax = 0;
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index caa5173a13c..0e6ffde780c 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -35,10 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
 
-$localTaxType = GETPOST('localTaxType', 'int');
+$localTaxType = GETPOSTINT('localTaxType');
 
 // Date range
-$year = GETPOST("year", "int");
+$year = GETPOSTINT("year");
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 	$year_start = $year_current;
@@ -49,11 +49,11 @@ if (empty($year)) {
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
+	$q = GETPOSTINT("q");
 	if (empty($q)) {
-		if (GETPOST("month", "int")) {
-			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false);
-			$date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+		if (GETPOSTINT("month")) {
+			$date_start = dol_get_first_day($year_start, GETPOSTINT("month"), false);
+			$date_end = dol_get_last_day($year_start, GETPOSTINT("month"), false);
 		} else {
 			$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
@@ -82,14 +82,14 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = getDolGlobalString('TAX_MODE');
 if (GETPOSTISSET("modetax")) {
-	$modetax = GETPOST("modetax", 'int');
+	$modetax = GETPOSTINT("modetax");
 }
 if (empty($modetax)) {
 	$modetax = 0;
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index f7e1a6a5431..6b11de62daa 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -28,16 +28,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 // Load translation files required by the page
 $langs->load("compta");
 
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 
 $result = restrictedArea($user, 'tax', '', '', 'charges');
-$ltt = GETPOST("localTaxType", 'int');
+$ltt = GETPOSTINT("localTaxType");
 $mode = GETPOST('mode', 'alpha');
 
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 6a508abb5f8..63df3750d22 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -45,9 +45,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.
 // Load translation files required by the page
 $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
 
-$local = GETPOST('localTaxType', 'int');
+$local = GETPOSTINT('localTaxType');
 // Date range
-$year = GETPOST("year", "int");
+$year = GETPOSTINT("year");
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 	$year_start = $year_current;
@@ -59,11 +59,11 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
+	$q = GETPOSTINT("q");
 	if (empty($q)) {
-		if (GETPOST("month", "int")) {
-			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false);
-			$date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+		if (GETPOSTINT("month")) {
+			$date_start = dol_get_first_day($year_start, GETPOSTINT("month"), false);
+			$date_end = dol_get_last_day($year_start, GETPOSTINT("month"), false);
 		} else {
 			$date_start = dol_get_first_day($year_start, !getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (!getDolGlobalString('MAIN_INFO_VAT_RETURN') || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) {
@@ -105,14 +105,14 @@ if (empty($min)) {
 $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local;
 $modetax = getDolGlobalInt('TAX_MODE');
 if (GETPOSTISSET("modetax")) {
-	$modetax = GETPOST("modetax", 'int');
+	$modetax = GETPOSTINT("modetax");
 }
 if (empty($modetax)) {
 	$modetax = 0;
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 8a066a3ba42..2a593eb6543 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -53,7 +53,7 @@ $socid      = GETPOSTINT('socid');
 
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 $amounts = array();
 $amountsresttopay = array();
@@ -164,7 +164,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOSTINT($key));
 			}
 		}
 
@@ -253,7 +253,7 @@ if (empty($reshook)) {
 
 		if (isModEnabled("banque")) {
 			// If the bank module is active, an account is required to input a payment
-			if (GETPOST('accountid', 'int') <= 0) {
+			if (GETPOSTINT('accountid') <= 0) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
 				$error++;
 			}
@@ -933,7 +933,7 @@ if (!GETPOST('action', 'aZ09')) {
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}
-	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$offset = $limit * $page;
 
 	if (!$sortorder) {
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 7252650d2e0..bfdd60e522f 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -43,13 +43,13 @@ if (isModEnabled('margin')) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($socid < 0) {
 	$socid = 0;
 }
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('facture', 'paiement')) {
-		$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
+		$datepaye = dol_mktime(GETPOSTINT('datephour'), GETPOSTINT('datepmin'), GETPOSTINT('datepsec'), GETPOSTINT('datepmonth'), GETPOSTINT('datepday'), GETPOSTINT('datepyear'));
 		$res = $object->update_date($datepaye);
 		if ($res === 0) {
 			setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
@@ -237,7 +237,7 @@ if (empty($reshook)) {
 				$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
 			}
 
-			$bankaccountid = GETPOST('accountid', 'int');
+			$bankaccountid = GETPOSTINT('accountid');
 			if ($bankaccountid > 0) {
 				$object->paiementcode = $object->type_code;
 				$object->amounts = $object->getAmountsArray();
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 898320fdb1c..b2dcd4f0bc5 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -51,7 +51,7 @@ $object = new RemiseCheque($db);
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -61,21 +61,21 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits";
 
 // filter by dates from / to
-$search_date_start_day = GETPOST('search_date_start_day', 'int');
-$search_date_start_month = GETPOST('search_date_start_month', 'int');
-$search_date_start_year = GETPOST('search_date_start_year', 'int');
-$search_date_end_day = GETPOST('search_date_end_day', 'int');
-$search_date_end_month = GETPOST('search_date_end_month', 'int');
-$search_date_end_year = GETPOST('search_date_end_year', 'int');
+$search_date_start_day = GETPOSTINT('search_date_start_day');
+$search_date_start_month = GETPOSTINT('search_date_start_month');
+$search_date_start_year = GETPOSTINT('search_date_start_year');
+$search_date_end_day = GETPOSTINT('search_date_end_day');
+$search_date_end_month = GETPOSTINT('search_date_end_month');
+$search_date_end_year = GETPOSTINT('search_date_end_year');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_start_month, $search_date_start_day, $search_date_start_year);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_end_month, $search_date_end_day, $search_date_end_year);
-$filteraccountid = GETPOST('accountid', 'int');
+$filteraccountid = GETPOSTINT('accountid');
 
 // Security check
 $fieldname = (!empty($ref) ? 'ref' : 'rowid');
@@ -100,9 +100,9 @@ $arrayofpaymentmodetomanage = explode(',', getDolGlobalString('BANK_PAYMENT_MODE
  */
 
 if ($action == 'setdate' && $user->hasRight('banque', 'cheque')) {
-	$result = $object->fetch(GETPOST('id', 'int'));
+	$result = $object->fetch(GETPOSTINT('id'));
 	if ($result > 0) {
-		$date = dol_mktime(0, 0, 0, GETPOST('datecreate_month', 'int'), GETPOST('datecreate_day', 'int'), GETPOST('datecreate_year', 'int'));
+		$date = dol_mktime(0, 0, 0, GETPOSTINT('datecreate_month'), GETPOSTINT('datecreate_day'), GETPOSTINT('datecreate_year'));
 
 		$result = $object->set_date($user, $date);
 		if ($result < 0) {
@@ -114,7 +114,7 @@ if ($action == 'setdate' && $user->hasRight('banque', 'cheque')) {
 }
 
 if ($action == 'setrefext' && $user->hasRight('banque', 'cheque')) {
-	$result = $object->fetch(GETPOST('id', 'int'));
+	$result = $object->fetch(GETPOSTINT('id'));
 	if ($result > 0) {
 		$ref_ext = GETPOST('ref_ext');
 
@@ -128,7 +128,7 @@ if ($action == 'setrefext' && $user->hasRight('banque', 'cheque')) {
 }
 
 if ($action == 'setref' && $user->hasRight('banque', 'cheque')) {
-	$result = $object->fetch(GETPOST('id', 'int'));
+	$result = $object->fetch(GETPOSTINT('id'));
 	if ($result > 0) {
 		$ref = GETPOST('ref');
 
@@ -141,12 +141,12 @@ if ($action == 'setref' && $user->hasRight('banque', 'cheque')) {
 	}
 }
 
-if ($action == 'create' && GETPOST("accountid", "int") > 0 && $user->hasRight('banque', 'cheque')) {
+if ($action == 'create' && GETPOSTINT("accountid") > 0 && $user->hasRight('banque', 'cheque')) {
 	if (GETPOSTISARRAY('toRemise')) {
 		$object->type = $type;
 		$arrayofid = GETPOST('toRemise', 'array:int');
 
-		$result = $object->create($user, GETPOST("accountid", "int"), 0, $arrayofid);
+		$result = $object->create($user, GETPOSTINT("accountid"), 0, $arrayofid);
 		if ($result > 0) {
 			if ($object->statut == 1) {     // If statut is validated, we build doc
 				$object->fetch($object->id); // To force to reload all properties in correct property name
@@ -175,9 +175,9 @@ if ($action == 'create' && GETPOST("accountid", "int") > 0 && $user->hasRight('b
 	}
 }
 
-if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->hasRight('banque', 'cheque')) {
+if ($action == 'remove' && $id > 0 && GETPOSTINT("lineid") > 0 && $user->hasRight('banque', 'cheque')) {
 	$object->id = $id;
-	$result = $object->removeCheck(GETPOST("lineid", "int"));
+	$result = $object->removeCheck(GETPOSTINT("lineid"));
 	if ($result === 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
@@ -223,7 +223,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->hasRight('banqu
 
 if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->hasRight('banque', 'cheque')) {
 	$reject_date = dol_mktime(0, 0, 0, GETPOST('rejectdate_month'), GETPOST('rejectdate_day'), GETPOST('rejectdate_year'));
-	$rejected_check = GETPOST('bankid', 'int');
+	$rejected_check = GETPOSTINT('bankid');
 
 	$object->fetch($id);
 	$paiement_id = $object->rejectCheck($rejected_check, $reject_date);
@@ -362,7 +362,7 @@ if ($action == 'new') {
 	 */
 	if ($action == 'reject_check') {
 		$formquestion = array(
-			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOST('lineid', 'int')),
+			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOSTINT('lineid')),
 			array('type' => 'date', 'name' => 'rejectdate_', 'label' => $langs->trans("RejectCheckDate"), 'value' => dol_now())
 		);
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("RejectCheck"), $langs->trans("ConfirmRejectCheck"), 'confirm_reject_check', $formquestion, '', 1);
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 8aa74f5fe2a..3d7129afbcd 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -42,22 +42,22 @@ if ($user->socid) {
 $result = restrictedArea($user, 'banque', '', '');
 
 $search_ref = GETPOST('search_ref', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_account = GETPOST('search_account', 'int');
+$search_account = GETPOSTINT('search_account');
 $search_amount = GETPOST('search_amount', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index 1cbee7a50cb..424a960061e 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 693f6c8de39..bbded249fb9 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -47,32 +47,32 @@ $confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
 
-$facid = GETPOST('facid', 'int');
-$socid = GETPOST('socid', 'int');
-$userid = GETPOST('userid', 'int');
+$facid = GETPOSTINT('facid');
+$socid = GETPOSTINT('socid');
+$userid = GETPOSTINT('userid');
 
 $search_ref = GETPOST("search_ref", "alpha");
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_company = GETPOST("search_company", 'alpha');
 $search_paymenttype = GETPOST("search_paymenttype");
-$search_account = GETPOST("search_account", "int");
+$search_account = GETPOSTINT("search_account");
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
 $search_status = GETPOST('search_status', 'intcomma');
-$search_sale = GETPOST('search_sale', 'int');
+$search_sale = GETPOSTINT('search_sale');
 
 $mode = GETPOST('mode', 'alpha');
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 if (empty($page) || $page == -1) {
 	$page = 0; // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 9685b6821c2..52c5bfb27fe 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -44,7 +44,7 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 	$dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
 }
 
-$year = GETPOST('year', 'int');
+$year = GETPOSTINT('year');
 if (!$year) {
 	$year = date("Y");
 }
@@ -71,14 +71,14 @@ if ($action == 'builddoc') {
 	// We save charset_output to restore it because write_file can change it if needed for
 	// output format that does not support UTF8.
 	$sav_charset_output = $outputlangs->charset_output;
-	if ($rap->write_file($dir, GETPOST("remonth", "int"), GETPOST("reyear", "int"), $outputlangs) > 0) {
+	if ($rap->write_file($dir, GETPOSTINT("remonth"), GETPOSTINT("reyear"), $outputlangs) > 0) {
 		$outputlangs->charset_output = $sav_charset_output;
 	} else {
 		$outputlangs->charset_output = $sav_charset_output;
 		dol_print_error($db, $obj->error);
 	}
 
-	$year = GETPOST("reyear", "int");
+	$year = GETPOSTINT("reyear");
 }
 
 
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 5caada7cd7e..8735b7c0ebd 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -35,10 +35,10 @@ if ($user->socid > 0) {
 }
 
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index c61dbcf3084..dce1a7f5d83 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -60,7 +60,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		exit;
 	}
 
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", "int"), GETPOST("reday", "int"), GETPOST("reyear", "int"));
+	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 
 	if (!(GETPOST("paiementtype") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
@@ -118,7 +118,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			}
 
 			if (!$error) {
-				$result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOSTINT('accountid'), '', '');
 				if (!($result > 0)) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
@@ -202,7 +202,7 @@ if ($action == 'create') {
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOSTISSET("remonth") ? $datepaye : -1) : '';
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
 	print "</td>";
@@ -218,7 +218,7 @@ if ($action == 'create') {
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-	print $form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $charge->accountid, "accountid", 0, '', 2, '', 0, 'maxwidth500 widthcentpercentminusx', 1); // Show opend bank account list
+	print $form->select_comptes(GETPOSTISSET("accountid") ? GETPOSTINT("accountid") : $charge->accountid, "accountid", 0, '', 2, '', 0, 'maxwidth500 widthcentpercentminusx', 1); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 3cac781c50e..30fb1768dc7 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -58,9 +58,9 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		exit;
 	}
 
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 
-	if (!(GETPOST("paiementtype", 'int') > 0)) {
+	if (!(GETPOSTINT("paiementtype") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 		$action = 'create';
@@ -70,7 +70,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		$error++;
 		$action = 'create';
 	}
-	if (isModEnabled("banque") && !(GETPOST("accountid", 'int') > 0)) {
+	if (isModEnabled("banque") && !(GETPOSTINT("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 		$action = 'create';
@@ -116,7 +116,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			}
 
 			if (!$error) {
-				$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOSTINT('accountid'), '', '');
 				if (!($result > 0)) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
@@ -201,14 +201,14 @@ if ($action == 'create') {
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOST("remonth", 'int') ? $datepaye : -1) : 0;
+	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
+	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOSTINT("remonth") ? $datepaye : -1) : 0;
 	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	print $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
+	print $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOSTINT("paiementtype") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
 	print "</td>\n";
 	print '</tr>';
 
@@ -216,7 +216,7 @@ if ($action == 'create') {
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'pictofixedwidth');
-	$form->select_comptes(GETPOST("accountid", "int") ? GETPOST("accountid", "int") : $tva->accountid, "accountid", 0, '', 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // Show opend bank account list
+	$form->select_comptes(GETPOSTINT("accountid") ? GETPOSTINT("accountid") : $tva->accountid, "accountid", 0, '', 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index fe6eb04fcde..7e6303486d0 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -40,7 +40,7 @@ if (isModEnabled("banque")) {
 $langs->loadLangs(array('bills', 'banks', 'companies'));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'aZ09');
 if ($user->socid) {
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index 12650cb0122..f27bec0c8b6 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -40,7 +40,7 @@ if (isModEnabled("banque")) {
 $langs->loadLangs(array('bills', 'banks', 'companies'));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 if ($user->socid) {
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 5f808e03e2e..8848d70c325 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 $langs->loadLangs(array('banks', 'categories', 'withdrawals'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index e9cf5f7dfa8..508c05c777f 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -38,17 +38,17 @@ $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawal
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $type = GETPOST('type', 'aZ09');
-$date_trans = dol_mktime(GETPOST('date_transhour', 'int'), GETPOST('date_transmin', 'int'), GETPOST('date_transsec', 'int'), GETPOST('date_transmonth', 'int'), GETPOST('date_transday', 'int'), GETPOST('date_transyear', 'int'));
+$date_trans = dol_mktime(GETPOSTINT('date_transhour'), GETPOSTINT('date_transmin'), GETPOSTINT('date_transsec'), GETPOSTINT('date_transmonth'), GETPOSTINT('date_transday'), GETPOSTINT('date_transyear'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -104,7 +104,7 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if ($action == 'setbankaccount' && $permissiontoadd) {
 		$object->oldcopy = dol_clone($object, 2);
-		$object->fk_bank_account = GETPOST('fk_bank_account', 'int');
+		$object->fk_bank_account = GETPOSTINT('fk_bank_account');
 		$object->update($user);
 	}
 
@@ -119,7 +119,7 @@ if (empty($reshook)) {
 	if ($action == 'infotrans' && $permissiontosend) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$dt = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 		/*
 		if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
@@ -150,7 +150,7 @@ if (empty($reshook)) {
 
 	// Set direct debit order to credited, create payment and close invoices
 	if ($action == 'setinfocredit' && $permissiontocreditdebit) {
-		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$dt = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 		if (($object->type != 'bank-transfer' && $object->statut == BonPrelevement::STATUS_CREDITED) || ($object->type == 'bank-transfer' && $object->statut == BonPrelevement::STATUS_DEBITED)) {
 			$error = 1;
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index f9cbe577064..1e44e0d7088 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -51,11 +51,11 @@ $mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'real';
 $type = GETPOST('type', 'aZ09');
 $sourcetype = GETPOST('sourcetype', 'aZ09');
 $format = GETPOST('format', 'aZ09');
-$id_bankaccount = GETPOST('id_bankaccount', 'int');
-$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+$id_bankaccount = GETPOSTINT('id_bankaccount');
+$executiondate = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -64,7 +64,7 @@ $offset = $limit * $page;
 $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -218,7 +218,7 @@ $arrayofselected = is_array($toselect) ? $toselect : array();
 // List of mass actions available
 $arrayofmassactions = array(
 );
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index a072d5774da..50177879826 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -37,8 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
-$status = GETPOST('status', 'int');
+$socid = GETPOSTINT('socid');
+$status = GETPOSTINT('status');
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
@@ -51,10 +51,10 @@ $search_facture = GETPOST('search_facture', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 157188d326f..358d5c9fff6 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -38,17 +38,17 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawals', 'salaries', 'suppliers'));
 
 // Get supervariables
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
-$userid = GETPOST('userid', 'int');
+$socid = GETPOSTINT('socid');
+$userid = GETPOSTINT('userid');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 28992168195..fe3334fcfb9 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -45,16 +45,16 @@ if ($user->socid > 0) {
 }
 
 // Get supervariables
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index dee3198493b..370a9a21ddc 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -35,16 +35,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
 // Get supervariables
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 341b378cc05..b8c75847372 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories', 'withdrawals'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 340e0cde34e..ff5bdf390b3 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -38,15 +38,15 @@ $langs->loadlangs(array('banks', 'categories', 'bills', 'companies', 'withdrawal
 
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
-$socid = GETPOST('socid', 'int');
+$id = GETPOSTINT('id');
+$socid = GETPOSTINT('socid');
 
 $type = GETPOST('type', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -84,8 +84,8 @@ $error = 0;
 
 if ($action == 'confirm_rejet' && $permissiontoadd) {
 	if (GETPOST("confirm") == 'yes') {
-		if (GETPOST('remonth', 'int')) {
-			$daterej = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		if (GETPOSTINT('remonth')) {
+			$daterej = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		}
 
 		if (empty($daterej)) {
@@ -108,7 +108,7 @@ if ($action == 'confirm_rejet' && $permissiontoadd) {
 			if ($lipre->fetch($id) == 0) {
 				$rej = new RejetPrelevement($db, $user, $type);
 
-				$result = $rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
+				$result = $rej->create($user, $id, GETPOSTINT('motif'), $daterej, $lipre->bon_rowid, GETPOSTINT('facturer'));
 
 				if ($result > 0) {
 					header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
@@ -239,7 +239,7 @@ if ($id) {
 		//Reason
 		print '<tr><td class="fieldrequired valid">'.$langs->trans("RefusedReason").'</td>';
 		print '<td class="valid">';
-		print $form->selectarray("motif", $rej->motifs, GETPOSTISSET('motif') ? GETPOST('motif', 'int') : '');
+		print $form->selectarray("motif", $rej->motifs, GETPOSTISSET('motif') ? GETPOSTINT('motif') : '');
 		print '</td></tr>';
 
 		//Facturer
@@ -247,7 +247,7 @@ if ($id) {
 		print $form->textwithpicto($langs->trans("RefusedInvoicing"), $langs->trans("DirectDebitRefusedInvoicingDesc"));
 		print '</td>';
 		print '<td class="valid">';
-		print $form->selectarray("facturer", $rej->labelsofinvoicing, GETPOSTISSET('facturer') ? GETPOST('facturer', 'int') : '', 0);
+		print $form->selectarray("facturer", $rej->labelsofinvoicing, GETPOSTISSET('facturer') ? GETPOSTINT('facturer') : '', 0);
 		print '</td></tr>';
 
 		print '</table>';
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index a03fa0e1148..e77bd4a2343 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('banks', 'withdrawals', 'companies', 'categories'));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -48,10 +48,10 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -70,7 +70,7 @@ $search_line = GETPOST('search_line', 'alpha');
 $search_bon = GETPOST('search_bon', 'alpha');
 $search_code = GETPOST('search_code', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
-$statut = GETPOST('statut', 'int');
+$statut = GETPOSTINT('statut');
 
 $bon = new BonPrelevement($db);
 $line = new LignePrelevement($db);
@@ -80,7 +80,7 @@ $userstatic = new User($db);
 $hookmanager->initHooks(array('withdrawalsreceiptslineslist'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 912e725e91d..5efc08d75ea 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -45,10 +45,10 @@ $mode = GETPOST('mode', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -64,7 +64,7 @@ if (!$sortfield) {
 }
 
 // Get supervariables
-$statut = GETPOST('statut', 'int');
+$statut = GETPOSTINT('statut');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
@@ -79,7 +79,7 @@ if ($type == 'bank-transfer') {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 30db9e40c50..68e5c098bcd 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -40,10 +40,10 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -52,7 +52,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 1ebee939615..ad8792944dd 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 $type = GETPOST('type', 'aZ09');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 2dda35eb209..17281ae721c 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -35,7 +35,7 @@ if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
 
-$id = GETPOST('id') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 
 // Security check
 if ($user->socid) {
@@ -52,10 +52,10 @@ if ($id > 0) {
 $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 62b86621a6a..efa2ed773d4 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -46,18 +46,18 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills', 'donation', 'salaries', 'accountancy', 'loan'));
 
-$date_startmonth = GETPOST('date_startmonth', 'int');
-$date_startday = GETPOST('date_startday', 'int');
-$date_startyear = GETPOST('date_startyear', 'int');
-$date_endmonth = GETPOST('date_endmonth', 'int');
-$date_endday = GETPOST('date_endday', 'int');
-$date_endyear = GETPOST('date_endyear', 'int');
+$date_startmonth = GETPOSTINT('date_startmonth');
+$date_startday = GETPOSTINT('date_startday');
+$date_startyear = GETPOSTINT('date_startyear');
+$date_endmonth = GETPOSTINT('date_endmonth');
+$date_endday = GETPOSTINT('date_endday');
+$date_endyear = GETPOSTINT('date_endyear');
 $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes';
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -70,7 +70,7 @@ if (!$sortorder) {
 }
 
 // Date range
-$year = GETPOST('year', 'int');		// this is used for navigation previous/next. It is the last year to show in filter
+$year = GETPOSTINT('year');		// this is used for navigation previous/next. It is the last year to show in filter
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -85,11 +85,11 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ? GETPOST("q", 'int') : 0;
+	$q = GETPOST("q") ? GETPOSTINT("q") : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start;
-		$month_start = GETPOST("month") ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+		$month_start = GETPOST("month") ? GETPOSTINT("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$month_end = "";
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
@@ -147,7 +147,7 @@ if (GETPOST("modecompta", 'alpha')) {
 $AccCat = new AccountancyCategory($db);
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index c769adfade6..167ca1793f6 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -36,12 +36,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills', 'donation', 'salaries'));
 
-$date_startday = GETPOST('date_startday', 'int');
-$date_startmonth = GETPOST('date_startmonth', 'int');
-$date_startyear = GETPOST('date_startyear', 'int');
-$date_endday = GETPOST('date_endday', 'int');
-$date_endmonth = GETPOST('date_endmonth', 'int');
-$date_endyear = GETPOST('date_endyear', 'int');
+$date_startday = GETPOSTINT('date_startday');
+$date_startmonth = GETPOSTINT('date_startmonth');
+$date_startyear = GETPOSTINT('date_startyear');
+$date_endday = GETPOSTINT('date_endday');
+$date_endmonth = GETPOSTINT('date_endmonth');
+$date_endyear = GETPOSTINT('date_endyear');
 
 $nbofyear = 4;
 
@@ -50,7 +50,7 @@ $nbofyear = 4;
 
 
 // Date range
-$year = GETPOST('year', 'int');		// this is used for navigation previous/next. It is the last year to show in filter
+$year = GETPOSTINT('year');		// this is used for navigation previous/next. It is the last year to show in filter
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -65,11 +65,11 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear,
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ? GETPOST("q", 'int') : 0;
+	$q = GETPOST("q") ? GETPOSTINT("q") : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + $nbofyear - (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
-		$month_start = GETPOST("month") ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+		$month_start = GETPOST("month") ? GETPOSTINT("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
 				$year_start--;
@@ -121,7 +121,7 @@ if (GETPOST("modecompta", 'alpha')) {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index b03d6299aea..0a38507ccb6 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -41,18 +41,18 @@ $mesg = '';
 $action = GETPOST('action', 'aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk');
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
+$id = GETPOSTINT('id');
+$rowid = GETPOSTINT('rowid');
 $cancel = GETPOST('cancel', 'alpha');
 $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'no';
 
 
-$date_startmonth = GETPOST('date_startmonth', 'int');
-$date_startday = GETPOST('date_startday', 'int');
-$date_startyear = GETPOST('date_startyear', 'int');
-$date_endmonth = GETPOST('date_endmonth', 'int');
-$date_endday = GETPOST('date_endday', 'int');
-$date_endyear = GETPOST('date_endyear', 'int');
+$date_startmonth = GETPOSTINT('date_startmonth');
+$date_startday = GETPOSTINT('date_startday');
+$date_startyear = GETPOSTINT('date_startyear');
+$date_endmonth = GETPOSTINT('date_endmonth');
+$date_endday = GETPOSTINT('date_endday');
+$date_endyear = GETPOSTINT('date_endyear');
 
 $nbofyear = 1;
 
@@ -60,7 +60,7 @@ $nbofyear = 1;
 //$conf->global->SOCIETE_FISCAL_MONTH_START = 7;
 
 // Date range
-$year = GETPOST('year', 'int');		// year with current month, is the month of the period we must show
+$year = GETPOSTINT('year');		// year with current month, is the month of the period we must show
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -75,11 +75,11 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ? GETPOST("q", 'int') : 0;
+	$q = GETPOST("q") ? GETPOSTINT("q") : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
-		$month_start = GETPOST("month", 'int') ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+		$month_start = GETPOSTINT("month") ? GETPOSTINT("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$date_startmonth = $month_start;
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
@@ -151,7 +151,7 @@ if (GETPOST("modecompta", 'alpha')) {
 $AccCat = new AccountancyCategory($db);
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 9911bb2f6e8..6bb11589a2d 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -47,7 +47,7 @@ if (isModEnabled('accounting')) {
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills', 'banks', 'hrm'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -55,15 +55,15 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 
-$fk_project = (GETPOST('fk_project') ? GETPOST('fk_project', 'int') : 0);
+$fk_project = (GETPOST('fk_project') ? GETPOSTINT('fk_project') : 0);
 
 $dateech = dol_mktime(GETPOST('echhour'), GETPOST('echmin'), GETPOST('echsec'), GETPOST('echmonth'), GETPOST('echday'), GETPOST('echyear'));
 $dateperiod = dol_mktime(GETPOST('periodhour'), GETPOST('periodmin'), GETPOST('periodsec'), GETPOST('periodmonth'), GETPOST('periodday'), GETPOST('periodyear'));
 $label = GETPOST('label', 'alpha');
 $actioncode = GETPOST('actioncode');
-$fk_user = GETPOST('userid', 'int') > 0 ? GETPOST('userid', 'int') : 0;
+$fk_user = GETPOSTINT('userid') > 0 ? GETPOSTINT('userid') : 0;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('taxcard', 'globalcard'));
@@ -91,7 +91,7 @@ $permissiondellink = $user->hasRight('tax', 'charges', 'creer'); // Used by the
 $upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -146,7 +146,7 @@ if (empty($reshook)) {
 
 	// payment mode
 	if ($action == 'setmode' && $permissiontoadd) {
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -154,7 +154,7 @@ if (empty($reshook)) {
 
 	// Bank account
 	if ($action == 'setbankaccount' && $permissiontoadd) {
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -204,9 +204,9 @@ if (empty($reshook)) {
 			$object->period = $dateperiod;
 			$object->amount = $amount;
 			$object->fk_user			= $fk_user;
-			$object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int');
-			$object->fk_account = (int) GETPOST('fk_account', 'int');
-			$object->fk_project = (int) GETPOST('fk_project', 'int');
+			$object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
+			$object->fk_account = GETPOSTINT('fk_account');
+			$object->fk_project = GETPOSTINT('fk_project');
 
 			$id = $object->create($user);
 			if ($id <= 0) {
@@ -271,14 +271,14 @@ if (empty($reshook)) {
 				$object->label = $langs->trans("CopyOf").' '.$object->label;
 			}
 
-			if (GETPOST('clone_for_next_month', 'int')) {	// This can be true only if TAX_ADD_CLONE_FOR_NEXT_MONTH_CHECKBOX has been set
+			if (GETPOSTINT('clone_for_next_month')) {	// This can be true only if TAX_ADD_CLONE_FOR_NEXT_MONTH_CHECKBOX has been set
 				$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
 				$object->period = dol_time_plus_duree($object->periode, 1, 'm');
 				$object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm');
 			} else {
 				// Note date_ech is often a little bit higher than dateperiod
-				$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
-				$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
+				$newdateperiod = dol_mktime(0, 0, 0, GETPOSTINT('clone_periodmonth'), GETPOSTINT('clone_periodday'), GETPOSTINT('clone_periodyear'));
+				$newdateech = dol_mktime(0, 0, 0, GETPOSTINT('clone_date_echmonth'), GETPOSTINT('clone_date_echday'), GETPOSTINT('clone_date_echyear'));
 				if ($newdateperiod) {
 					$object->periode = $newdateperiod;
 					$object->period = $newdateperiod;
@@ -423,13 +423,13 @@ if ($action == 'create') {
 
 	// Payment Mode
 	print '<tr><td>'.$langs->trans('DefaultPaymentMode').'</td><td colspan="2">';
-	$form->select_types_paiements(GETPOST('mode_reglement_id', 'int'), 'mode_reglement_id');
+	$form->select_types_paiements(GETPOSTINT('mode_reglement_id'), 'mode_reglement_id');
 	print '</td></tr>';
 
 	// Bank Account
 	if (isModEnabled("banque")) {
 		print '<tr><td>'.$langs->trans('DefaultBankAccount').'</td><td colspan="2">';
-		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes(GETPOST('fk_account', 'int'), 'fk_account', 0, '', 2, '', 0, '', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes(GETPOSTINT('fk_account'), 'fk_account', 0, '', 2, '', 0, '', 1);
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index ef68f325cc4..8c22eeed12d 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -42,15 +42,15 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'companies', 'compta', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 2d78bc86c66..24181ae4b7b 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -34,7 +34,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 
 $object = new ChargeSociales($db);
@@ -43,7 +43,7 @@ if ($id > 0) {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index a0145c6a260..e2f887eb034 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -49,36 +49,36 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sc
 $mode = GETPOST('mode', 'alpha');
 
 
-$search_ref = GETPOST('search_ref', 'int');
+$search_ref = GETPOSTINT('search_ref');
 $search_label = GETPOST('search_label', 'alpha');
-$search_typeid = GETPOST('search_typeid', 'int');
+$search_typeid = GETPOSTINT('search_typeid');
 $search_amount = GETPOST('search_amount', 'alpha');
-$search_status = GETPOST('search_status', 'int');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_status = GETPOSTINT('search_status');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_date_limit_startday = GETPOST('search_date_limit_startday', 'int');
-$search_date_limit_startmonth = GETPOST('search_date_limit_startmonth', 'int');
-$search_date_limit_startyear = GETPOST('search_date_limit_startyear', 'int');
-$search_date_limit_endday = GETPOST('search_date_limit_endday', 'int');
-$search_date_limit_endmonth = GETPOST('search_date_limit_endmonth', 'int');
-$search_date_limit_endyear = GETPOST('search_date_limit_endyear', 'int');
+$search_date_limit_startday = GETPOSTINT('search_date_limit_startday');
+$search_date_limit_startmonth = GETPOSTINT('search_date_limit_startmonth');
+$search_date_limit_startyear = GETPOSTINT('search_date_limit_startyear');
+$search_date_limit_endday = GETPOSTINT('search_date_limit_endday');
+$search_date_limit_endmonth = GETPOSTINT('search_date_limit_endmonth');
+$search_date_limit_endyear = GETPOSTINT('search_date_limit_endyear');
 $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_users = GETPOST('search_users');
-$search_type = GETPOST('search_type', 'int');
-$search_account = GETPOST('search_account', 'int');
+$search_type = GETPOSTINT('search_type');
+$search_account = GETPOSTINT('search_account');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 if (empty($page) || $page == -1) {
 	$page = 0; // If $page is not defined, or '' or -1
@@ -94,7 +94,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-$filtre = GETPOST("filtre", 'int');
+$filtre = GETPOSTINT("filtre");
 
 $arrayfields = array(
 	'cs.rowid'		=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
@@ -123,7 +123,7 @@ $permissiontoadd = $user->hasRight('tax', 'charges', 'creer');
 $permissiontodelete = $user->hasRight('tax', 'charges', 'supprimer');
 
 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/sociales/note.php b/htdocs/compta/sociales/note.php
index cdabc0cede5..2f5487497f6 100644
--- a/htdocs/compta/sociales/note.php
+++ b/htdocs/compta/sociales/note.php
@@ -35,7 +35,7 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array('compta', 'bills'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -47,7 +47,7 @@ if ($id > 0) {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 749e9497c25..fb3ecf981cb 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -50,14 +50,14 @@ $hookmanager->initHooks(array('specialexpensesindex'));
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills', 'hrm'));
 
-$year = GETPOST("year", 'int');
-$search_sc_type = GETPOST('search_sc_type', 'int');
+$year = GETPOSTINT("year");
+$search_sc_type = GETPOSTINT('search_sc_type');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index 60de44d0545..85906cd2c12 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -43,8 +43,8 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 $modecompta = (GETPOST('modecompta', 'alpha') ? GETPOST('modecompta', 'alpha') : $conf->global->ACCOUNTING_MODE);
 
 // Date range
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
+$year = GETPOSTINT("year");
+$month = GETPOSTINT("month");
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), '%Y');
 	$month_current = dol_print_date(dol_now(), '%m');
@@ -60,7 +60,7 @@ $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endda
 // Quarter
 $q = '';
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
+	$q = GETPOSTINT("q");
 	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
@@ -120,14 +120,14 @@ if (empty($min)) {
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = !getDolGlobalString('TAX_MODE') ? 0 : $conf->global->TAX_MODE;
 if (GETPOSTISSET("modetax")) {
-	$modetax = GETPOST("modetax", 'int');
+	$modetax = GETPOSTINT("modetax");
 }
 if (empty($modetax)) {
 	$modetax = 0;
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 34b0b614b7a..6a52f9ee62a 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 $langs->loadLangs(array("products", "categories", "errors", 'accountancy'));
 
 // Security pack (data & check)
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 if ($user->socid > 0) {
 	$socid = $user->socid;
@@ -64,8 +64,8 @@ if (!$sortfield) {
 }
 
 // Category
-$selected_cat = (int) GETPOST('search_categ', 'int');
-$selected_soc = (int) GETPOST('search_soc', 'int');
+$selected_cat = GETPOSTINT('search_categ');
+$selected_soc = GETPOSTINT('search_soc');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
@@ -73,7 +73,7 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 $categorie = new Categorie($db);
 
 // product/service
-$selected_type = GETPOST('search_type', 'int');
+$selected_type = GETPOSTINT('search_type');
 if ($selected_type == '') {
 	$selected_type = -1;
 }
@@ -103,7 +103,7 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
+	$q = GETPOSTINT("q");
 	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 7529db23725..768867e0ddc 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->load("accountancy");
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // Security check
 if ($user->socid > 0) {
@@ -63,14 +63,14 @@ if (!$sortfield) {
 }
 
 // Date range
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
-$date_startyear = GETPOST("date_startyear", 'int');
-$date_startmonth = GETPOST("date_startmonth", 'int');
-$date_startday = GETPOST("date_startday", 'int');
-$date_endyear = GETPOST("date_endyear", 'int');
-$date_endmonth = GETPOST("date_endmonth", 'int');
-$date_endday = GETPOST("date_endday", 'int');
+$year = GETPOSTINT("year");
+$month = GETPOSTINT("month");
+$date_startyear = GETPOSTINT("date_startyear");
+$date_startmonth = GETPOSTINT("date_startmonth");
+$date_startday = GETPOSTINT("date_startday");
+$date_endyear = GETPOSTINT("date_endyear");
+$date_endmonth = GETPOSTINT("date_endmonth");
+$date_endday = GETPOSTINT("date_endday");
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), '%Y');
 	$month_current = dol_print_date(dol_now(), '%m');
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index aada2d53b30..afd631a8cdc 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -55,10 +55,10 @@ if (!$sortfield) {
 	$sortfield = "nom";
 }
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // Category
-$selected_cat = (int) GETPOST('search_categ', 'int');
+$selected_cat = GETPOSTINT('search_categ');
 if ($selected_cat == -1) {
 	$selected_cat = '';
 }
@@ -82,18 +82,18 @@ if (isModEnabled('accounting')) {
 $hookmanager->initHooks(array('casoclist'));
 
 // Date range
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
+$year = GETPOSTINT("year");
+$month = GETPOSTINT("month");
 $search_societe = GETPOST("search_societe", 'alpha');
 $search_zip = GETPOST("search_zip", 'alpha');
 $search_town = GETPOST("search_town", 'alpha');
 $search_country = GETPOST("search_country", 'alpha');
-$date_startyear = GETPOST("date_startyear", 'int');
-$date_startmonth = GETPOST("date_startmonth", 'int');
-$date_startday = GETPOST("date_startday", 'int');
-$date_endyear = GETPOST("date_endyear", 'int');
-$date_endmonth = GETPOST("date_endmonth", 'int');
-$date_endday = GETPOST("date_endday", 'int');
+$date_startyear = GETPOSTINT("date_startyear");
+$date_startmonth = GETPOSTINT("date_startmonth");
+$date_startday = GETPOSTINT("date_startday");
+$date_endyear = GETPOSTINT("date_endyear");
+$date_endmonth = GETPOSTINT("date_endmonth");
+$date_endday = GETPOSTINT("date_endday");
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), '%Y');
 	$month_current = dol_print_date(dol_now(), '%m');
@@ -107,7 +107,7 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int") ? GETPOST("q", "int") : 0;
+	$q = GETPOSTINT("q") ? GETPOSTINT("q") : 0;
 	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 7bdf3a279ce..927b5760979 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -32,17 +32,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills', 'donation', 'salaries'));
 
-$date_startday = GETPOST('date_startday', 'int');
-$date_startmonth = GETPOST('date_startmonth', 'int');
-$date_startyear = GETPOST('date_startyear', 'int');
-$date_endday = GETPOST('date_endday', 'int');
-$date_endmonth = GETPOST('date_endmonth', 'int');
-$date_endyear = GETPOST('date_endyear', 'int');
+$date_startday = GETPOSTINT('date_startday');
+$date_startmonth = GETPOSTINT('date_startmonth');
+$date_startyear = GETPOSTINT('date_startyear');
+$date_endday = GETPOSTINT('date_endday');
+$date_endmonth = GETPOSTINT('date_endmonth');
+$date_endyear = GETPOSTINT('date_endyear');
 
 $nbofyear = 4;
 
 // Date range
-$year = GETPOST('year', 'int');
+$year = GETPOSTINT('year');
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -61,7 +61,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + $nbofyear - (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
-		$month_start = GETPOSTISSET("month") ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+		$month_start = GETPOSTISSET("month") ? GETPOSTINT("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
 				$year_start--;
@@ -112,10 +112,10 @@ if (GETPOST("modecompta", 'alpha')) {
 	$modecompta = GETPOST("modecompta", 'alpha');
 }
 
-$userid = GETPOST('userid', 'int');
+$userid = GETPOSTINT('userid');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -384,7 +384,7 @@ $now = dol_now();
 $casenow = dol_print_date($now, "%Y-%m");
 
 // Loop on each month
-$nb_mois_decalage = GETPOSTISSET('date_startmonth') ? (GETPOST('date_startmonth', 'int') - 1) : (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 0 : ($conf->global->SOCIETE_FISCAL_MONTH_START - 1));
+$nb_mois_decalage = GETPOSTISSET('date_startmonth') ? (GETPOSTINT('date_startmonth') - 1) : (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 0 : ($conf->global->SOCIETE_FISCAL_MONTH_START - 1));
 for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 	$mois_modulo = $mois; // ajout
 	if ($mois > 12) {
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index ca856e67747..2b819e74fa6 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -28,17 +28,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
 
-$date_startday = GETPOST('date_startday', 'int');
-$date_startmonth = GETPOST('date_startmonth', 'int');
-$date_startyear = GETPOST('date_startyear', 'int');
-$date_endday = GETPOST('date_endday', 'int');
-$date_endmonth = GETPOST('date_endmonth', 'int');
-$date_endyear = GETPOST('date_endyear', 'int');
+$date_startday = GETPOSTINT('date_startday');
+$date_startmonth = GETPOSTINT('date_startmonth');
+$date_startyear = GETPOSTINT('date_startyear');
+$date_endday = GETPOSTINT('date_endday');
+$date_endmonth = GETPOSTINT('date_endmonth');
+$date_endyear = GETPOSTINT('date_endyear');
 
 $nbofyear = 4;
 
 // Date range
-$year = GETPOST('year', 'int');
+$year = GETPOSTINT('year');
 if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
@@ -57,7 +57,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + $nbofyear - (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
-		$month_start = GETPOSTISSET("month") ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+		$month_start = GETPOSTISSET("month") ? GETPOSTINT("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
 				$year_start--;
@@ -91,8 +91,8 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 	}
 }
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 
 $tmps = dol_getdate($date_start);
 $year_start = $tmps['year'];
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index f49e79a18a0..e9568c4aa73 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -47,14 +47,14 @@ if (!$sortfield) {
 }
 
 // Category
-$selected_cat = (int) GETPOST('search_categ', 'int');
-$selected_soc = (int) GETPOST('search_soc', 'int');
+$selected_cat = GETPOSTINT('search_categ');
+$selected_soc = GETPOSTINT('search_soc');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
 }
 // product/service
-$selected_type = GETPOST('search_type', 'int');
+$selected_type = GETPOSTINT('search_type');
 if ($selected_type == '') {
 	$selected_type = -1;
 }
@@ -84,7 +84,7 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
+	$q = GETPOSTINT("q");
 	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
@@ -194,7 +194,7 @@ foreach ($allparams as $key => $value) {
 }
 
 // Security pack (data & check)
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 if ($user->socid > 0) {
 	$socid = $user->socid;
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index fe20a1e6bee..205f9000031 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -52,10 +52,10 @@ if (!$sortfield) {
 }
 
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // Category
-$selected_cat = (int) GETPOST('search_categ', 'int');
+$selected_cat = GETPOSTINT('search_categ');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
@@ -73,8 +73,8 @@ $search_country = GETPOST("search_country", 'alpha');
 
 
 // Date range
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
+$year = GETPOSTINT("year");
+$month = GETPOSTINT("month");
 $date_startyear = GETPOST("date_startyear", 'alpha');
 $date_startmonth = GETPOST("date_startmonth", 'alpha');
 $date_startday = GETPOST("date_startday", 'alpha');
@@ -94,7 +94,7 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int") ? GETPOST("q", "int") : 0;
+	$q = GETPOSTINT("q") ? GETPOSTINT("q") : 0;
 	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 127aca426d3..df825768fee 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -43,7 +43,7 @@ if (isModEnabled('accounting')) {
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -52,9 +52,9 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'my
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$refund = GETPOST("refund", "int");
+$refund = GETPOSTINT("refund");
 if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
-	$auto_create_payment = GETPOST("auto_create_paiement", "int");
+	$auto_create_payment = GETPOSTINT("auto_create_paiement");
 } else {
 	$auto_create_payment = !getDolGlobalString('CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT');
 }
@@ -63,8 +63,8 @@ if (empty($refund)) {
 	$refund = 0;
 }
 
-$datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
-$datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
+$datev = dol_mktime(12, 0, 0, GETPOSTINT("datevmonth"), GETPOSTINT("datevday"), GETPOSTINT("datevyear"));
+$datep = dol_mktime(12, 0, 0, GETPOSTINT("datepmonth"), GETPOSTINT("datepday"), GETPOSTINT("datepyear"));
 
 // Initialize technical objects
 $object = new Tva($db);
@@ -90,7 +90,7 @@ $permissiondellink = $user->hasRight('tax', 'charges', 'creer'); // Used by the
 $upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1].'/vat';
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 	// payment mode
 	if ($action == 'setmode' && $user->hasRight('tax', 'charges', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -144,7 +144,7 @@ if (empty($reshook)) {
 	// Bank account
 	if ($action == 'setbankaccount' && $user->hasRight('tax', 'charges', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -238,7 +238,7 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
-					$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
+					$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOSTINT('accountid'), '', '');
 					if (!($result > 0)) {
 						$error++;
 						setEventMessages($paiement->error, null, 'errors');
@@ -343,7 +343,7 @@ if (empty($reshook)) {
 				$object->label = $langs->trans("CopyOf").' '.$object->label;
 			}
 
-			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
+			$newdateperiod = dol_mktime(0, 0, 0, GETPOSTINT('clone_periodmonth'), GETPOSTINT('clone_periodday'), GETPOSTINT('clone_periodyear'));
 			if ($newdateperiod) {
 				$object->datev = $newdateperiod;
 			}
@@ -460,7 +460,7 @@ if ($action == 'create') {
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input class="minwidth300" name="label" id="label" value="'.(GETPOSTISSET("label") ? GETPOST("label", '', 2) : $label).'" autofocus></td></tr>';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-	print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate((GETPOSTINT("datevmonth") ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Amount
@@ -479,7 +479,7 @@ if ($action == 'create') {
 
 	// Type payment
 	print '<tr><td class="fieldrequired" id="label_type_payment">'.$langs->trans("PaymentMode").'</td><td>';
-	print $form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
+	print $form->select_types_paiements(GETPOSTINT("type_payment"), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
 	print "</td>\n";
 	print "</tr>";
 
@@ -487,7 +487,7 @@ if ($action == 'create') {
 		// Bank account
 		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
 		print img_picto('', 'bank_account', 'pictofixedwidth');
-		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // List of bank account available
+		$form->select_comptes(GETPOSTINT("accountid"), "accountid", 0, "courant=1", 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // List of bank account available
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index c7b9f2dcc61..ba9af57f4c5 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -43,15 +43,15 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'companies', 'compta', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 5b30b2a9214..db73cc25e56 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -40,9 +40,9 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 $now = dol_now();
 
 $refresh = GETPOSTISSET('submit') ? true : false;
-$year_current = GETPOSTISSET('year') ? GETPOST('year', 'int') : dol_print_date($now, '%Y', 'tzserver');
+$year_current = GETPOSTISSET('year') ? GETPOSTINT('year') : dol_print_date($now, '%Y', 'tzserver');
 $year_start = $year_current;
-$month_current = GETPOSTISSET('month') ? GETPOST('month', 'int') : dol_print_date($now, '%m', 'tzserver');
+$month_current = GETPOSTISSET('month') ? GETPOSTINT('month') : dol_print_date($now, '%m', 'tzserver');
 $month_start = $month_current;
 
 $refresh = true;
@@ -53,14 +53,14 @@ include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = getDolGlobalString('TAX_MODE');
 if (GETPOSTISSET("modetax")) {
-	$modetax = GETPOST("modetax", 'int');
+	$modetax = GETPOSTINT("modetax");
 }
 if (empty($modetax)) {
 	$modetax = 0;
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index a54be0cdf28..3e02aaa8c0c 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -30,13 +30,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 
 $object = new Tva($db);
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/compta/tva/initdatesforvat.inc.php b/htdocs/compta/tva/initdatesforvat.inc.php
index 59106f8750c..53cbd63b8cc 100644
--- a/htdocs/compta/tva/initdatesforvat.inc.php
+++ b/htdocs/compta/tva/initdatesforvat.inc.php
@@ -28,7 +28,7 @@ if (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START')) {
 }
 
 // Date range
-$year = GETPOST("year", "int");
+$year = GETPOSTINT("year");
 if (empty($year)) {
 	$year_current = $current_date['year'];
 	$year_start = $year_current;
@@ -40,11 +40,11 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');
 // Set default period if not defined
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int");
+	$q = GETPOSTINT("q");
 	if (empty($q)) {
-		if (GETPOST("month", 'int')) {
-			$date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), 'tzserver');
-			$date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), 'tzserver');
+		if (GETPOSTINT("month")) {
+			$date_start = dol_get_first_day($year_start, GETPOSTINT("month"), 'tzserver');
+			$date_end = dol_get_last_day($year_start, GETPOSTINT("month"), 'tzserver');
 		} else {
 			if (!getDolGlobalString('MAIN_INFO_VAT_RETURN') || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 4912417bdf9..32c982c080c 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('compta', 'bills'));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -53,20 +53,20 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 
 $search_ref					= GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
-$search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
-$search_datepayment_start = dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int'));
-$search_datepayment_end = dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int'));
-$search_type = GETPOST('search_type', 'int');
-$search_account				= GETPOST('search_account', 'int');
+$search_dateend_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateend_startmonth'), GETPOSTINT('search_dateend_startday'), GETPOSTINT('search_dateend_startyear'));
+$search_dateend_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateend_endmonth'), GETPOSTINT('search_dateend_endday'), GETPOSTINT('search_dateend_endyear'));
+$search_datepayment_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datepayment_startmonth'), GETPOSTINT('search_datepayment_startday'), GETPOSTINT('search_datepayment_startyear'));
+$search_datepayment_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datepayment_endmonth'), GETPOSTINT('search_datepayment_endday'), GETPOSTINT('search_datepayment_endyear'));
+$search_type = GETPOSTINT('search_type');
+$search_account				= GETPOSTINT('search_account');
 $search_amount 				= GETPOST('search_amount', 'alpha');
-$search_status = GETPOST('search_status', 'int');
-$ltt = GETPOST("ltt", "int");
+$search_status = GETPOSTINT('search_status');
+$ltt = GETPOSTINT("ltt");
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield					= GETPOST('sortfield', 'aZ09comma');
 $sortorder					= GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
 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;
@@ -105,7 +105,7 @@ $permissiontoadd = $user->hasRight('tax', 'charges', 'creer');
 $permissiontodelete = $user->hasRight('tax', 'charges', 'supprimer');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -281,40 +281,40 @@ if (!empty($search_label)) {
 	$param .= '&search_label="'.$search_label.'"';
 }
 if (!empty($search_dateend_start)) {
-	$param .= '&search_dateend_startyear='.GETPOST('search_dateend_startyear', 'int');
+	$param .= '&search_dateend_startyear='.GETPOSTINT('search_dateend_startyear');
 }
 if (!empty($search_dateend_start)) {
-	$param .= '&search_dateend_startmonth='.GETPOST('search_dateend_startmonth', 'int');
+	$param .= '&search_dateend_startmonth='.GETPOSTINT('search_dateend_startmonth');
 }
 if (!empty($search_dateend_start)) {
-	$param .= '&search_dateend_startday='.GETPOST('search_dateend_startday', 'int');
+	$param .= '&search_dateend_startday='.GETPOSTINT('search_dateend_startday');
 }
 if (!empty($search_dateend_end)) {
-	$param .= '&search_dateend_endyear='.GETPOST('search_dateend_endyear', 'int');
+	$param .= '&search_dateend_endyear='.GETPOSTINT('search_dateend_endyear');
 }
 if (!empty($search_dateend_end)) {
-	$param .= '&search_dateend_endmonth='.GETPOST('search_dateend_endmonth', 'int');
+	$param .= '&search_dateend_endmonth='.GETPOSTINT('search_dateend_endmonth');
 }
 if (!empty($search_dateend_end)) {
-	$param .= '&search_dateend_endday='.GETPOST('search_dateend_endday', 'int');
+	$param .= '&search_dateend_endday='.GETPOSTINT('search_dateend_endday');
 }
 if (!empty($search_datepayment_start)) {
-	$param .= '&search_datepayment_startyear='.GETPOST('search_datepayment_startyear', 'int');
+	$param .= '&search_datepayment_startyear='.GETPOSTINT('search_datepayment_startyear');
 }
 if (!empty($search_datepayment_start)) {
-	$param .= '&search_datepayment_startmonth='.GETPOST('search_datepayment_startmonth', 'int');
+	$param .= '&search_datepayment_startmonth='.GETPOSTINT('search_datepayment_startmonth');
 }
 if (!empty($search_datepayment_start)) {
-	$param .= '&search_datepayment_startday='.GETPOST('search_datepayment_startday', 'int');
+	$param .= '&search_datepayment_startday='.GETPOSTINT('search_datepayment_startday');
 }
 if (!empty($search_datepayment_end)) {
-	$param .= '&search_datepayment_endyear='.GETPOST('search_datepayment_endyear', 'int');
+	$param .= '&search_datepayment_endyear='.GETPOSTINT('search_datepayment_endyear');
 }
 if (!empty($search_datepayment_end)) {
-	$param .= '&search_datepayment_endmonth='.GETPOST('search_datepayment_endmonth', 'int');
+	$param .= '&search_datepayment_endmonth='.GETPOSTINT('search_datepayment_endmonth');
 }
 if (!empty($search_datepayment_end)) {
-	$param .= '&search_datepayment_endday='.GETPOST('search_datepayment_endday', 'int');
+	$param .= '&search_datepayment_endday='.GETPOSTINT('search_datepayment_endday');
 }
 if (!empty($search_type) && $search_type > 0) {
 	$param .= '&search_type='.$search_type;
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index e5cb19877e6..b877b472551 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -40,17 +40,17 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 $langs->loadLangs(array('compta', 'bills'));
 
 $mode = GETPOST("mode", 'alpha');
-$year = GETPOST("year", 'int');
+$year = GETPOSTINT("year");
 $filtre = GETPOST("filtre", 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 if (!$year && $mode != 'tvaonly') {
 	$year = date("Y", time());
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index a0134194b48..40d49e2404f 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -55,8 +55,8 @@ $mesg = ''; $error = 0; $errors = array();
 $action		= (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $confirm	= GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$id = GETPOST('id', 'int');
-$socid		= GETPOST('socid', 'int');
+$id = GETPOSTINT('id');
+$socid		= GETPOSTINT('socid');
 
 // Initialize objects
 $object = new Contact($db);
@@ -92,10 +92,10 @@ 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;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index d0db16191d0..ab35f938890 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -285,7 +285,7 @@ abstract class ActionsContactCardCommon
 		// phpcs:enable
 		global $langs, $mysoc;
 
-		$this->object->socid = GETPOST("socid", 'int');
+		$this->object->socid = GETPOSTINT("socid");
 		$this->object->lastname			= GETPOST("name");
 		$this->object->firstname		= GETPOST("firstname");
 		$this->object->civility_id = GETPOST("civility_id");
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 9d8ee6762ce..3ca3250d3c3 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -205,7 +205,7 @@ if (empty($reshook)) {
 			$object->canvas = $canvas;
 		}
 
-		$object->entity = (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
+		$object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity);
 		$object->socid = $socid;
 		$object->lastname = (string) GETPOST("lastname", 'alpha');
 		$object->firstname = (string) GETPOST("firstname", 'alpha');
@@ -214,8 +214,8 @@ if (empty($reshook)) {
 		$object->address = (string) GETPOST("address", 'alpha');
 		$object->zip = (string) GETPOST("zipcode", 'alpha');
 		$object->town = (string) GETPOST("town", 'alpha');
-		$object->country_id = (int) GETPOST("country_id", 'int');
-		$object->state_id = (int) GETPOST("state_id", 'int');
+		$object->country_id = GETPOSTINT("country_id");
+		$object->state_id = GETPOSTINT("state_id");
 		$object->socialnetworks = array();
 		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
@@ -238,7 +238,7 @@ if (empty($reshook)) {
 		$object->statut = 1; //Default status to Actif
 
 		// Note: Correct date should be completed with location to have exact GM time of birth.
-		$object->birthday = dol_mktime(0, 0, 0, GETPOST("birthdaymonth", 'int'), GETPOST("birthdayday", 'int'), GETPOST("birthdayyear", 'int'));
+		$object->birthday = dol_mktime(0, 0, 0, GETPOSTINT("birthdaymonth"), GETPOSTINT("birthdayday"), GETPOSTINT("birthdayyear"));
 		$object->birthday_alert = GETPOSTINT("birthday_alert");
 
 		//Default language
@@ -342,7 +342,7 @@ if (empty($reshook)) {
 			$action = 'edit';
 		}
 
-		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST("no_email", "int") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT("no_email") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
 			$action = 'edit';
@@ -356,7 +356,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$contactid = GETPOST("contactid", 'int');
+			$contactid = GETPOSTINT("contactid");
 			$object->fetch($contactid);
 			$object->fetchRoles();
 
@@ -413,11 +413,11 @@ if (empty($reshook)) {
 			$object->address = (string) GETPOST("address", 'alpha');
 			$object->zip = (string) GETPOST("zipcode", 'alpha');
 			$object->town = (string) GETPOST("town", 'alpha');
-			$object->state_id = GETPOST("state_id", 'int');
-			$object->country_id = GETPOST("country_id", 'int');
+			$object->state_id = GETPOSTINT("state_id");
+			$object->country_id = GETPOSTINT("country_id");
 
 			$object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-			$object->no_email = GETPOST("no_email", "int");
+			$object->no_email = GETPOSTINT("no_email");
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
@@ -430,7 +430,7 @@ if (empty($reshook)) {
 			$object->phone_perso = (string) GETPOST("phone_perso", 'alpha');
 			$object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
 			$object->fax = (string) GETPOST("fax", 'alpha');
-			$object->priv = (string) GETPOST("priv", 'int');
+			$object->priv = (string) GETPOSTINT("priv");
 			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
 			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
 
@@ -455,7 +455,7 @@ if (empty($reshook)) {
 
 					// Update mass emailing flag into table mailing_unsubscribe
 					if (GETPOSTISSET('no_email') && $object->email) {
-						$no_email = GETPOST('no_email', 'int');
+						$no_email = GETPOSTINT('no_email');
 						$result = $object->setNoEmail($no_email);
 						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -500,14 +500,14 @@ if (empty($reshook)) {
 
 	// Update extrafields
 	if ($action == "update_extras" && !empty($permissiontoadd)) {
-		$object->fetch(GETPOST('id', 'int'));
+		$object->fetch(GETPOSTINT('id'));
 
 		$attributekey = GETPOST('attribute', 'alpha');
 		$attributekeylong = 'options_'.$attributekey;
 
 		if (GETPOSTISSET($attributekeylong.'day') && GETPOSTISSET($attributekeylong.'month') && GETPOSTISSET($attributekeylong.'year')) {
 			// This is properties of a date
-			$object->array_options['options_'.$attributekey] = dol_mktime(GETPOST($attributekeylong.'hour', 'int'), GETPOST($attributekeylong.'min', 'int'), GETPOST($attributekeylong.'sec', 'int'), GETPOST($attributekeylong.'month', 'int'), GETPOST($attributekeylong.'day', 'int'), GETPOST($attributekeylong.'year', 'int'));
+			$object->array_options['options_'.$attributekey] = dol_mktime(GETPOSTINT($attributekeylong.'hour'), GETPOSTINT($attributekeylong.'min'), GETPOSTINT($attributekeylong.'sec'), GETPOSTINT($attributekeylong.'month'), GETPOSTINT($attributekeylong.'day'), GETPOSTINT($attributekeylong.'year'));
 			//var_dump(dol_print_date($object->array_options['options_'.$attributekey]));exit;
 		} else {
 			$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, 'alpha');
@@ -628,10 +628,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			 */
 			$object->canvas = $canvas;
 
-			$object->state_id = GETPOST("state_id", "int");
+			$object->state_id = GETPOSTINT("state_id");
 
 			// We set country_id, country_code and label for the selected country
-			$object->country_id = GETPOST("country_id") ? GETPOST("country_id", "int") : (empty($objsoc->country_id) ? $mysoc->country_id : $objsoc->country_id);
+			$object->country_id = GETPOST("country_id") ? GETPOSTINT("country_id") : (empty($objsoc->country_id) ? $mysoc->country_id : $objsoc->country_id);
 			if ($object->country_id) {
 				$tmparray = getCountry($object->country_id, 'all');
 				$object->country_code = $tmparray['code'];
@@ -848,7 +848,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 				print '<td>';
 				// Default value is in MAILING_CONTACT_DEFAULT_BULK_STATUS that you can modify in setup of module emailing
-				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2));
+				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2));
 				print '</td>';
 				print '</tr>';
 			}
@@ -1002,7 +1002,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 				print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
-				print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOST('socid', 'int') ? GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
+				print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOSTINT('socid') ? GETPOSTINT('socid') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
 				print '</td>';
 				print '</tr>';
 			}
@@ -1126,7 +1126,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 				print '<td>';
 				$useempty = (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2);
-				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $object->no_email), 1, false, $useempty);
+				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : $object->no_email), 1, false, $useempty);
 				print '</td>';
 				print '</tr>';
 			}
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 1e82f807105..21ba9ed848f 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $object = new Contact($db);
 if ($id > 0) {
@@ -49,10 +49,10 @@ if (empty($object->thirdparty)) {
 $socid = !empty($object->thirdparty->id) ? $object->thirdparty->id : null;
 
 // Sort & Order fields
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -69,8 +69,8 @@ if (!$sortfield) {
 // Search fields
 $sref = GETPOST("sref");
 $sprod_fulldescr = GETPOST("sprod_fulldescr");
-$month = GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$month = GETPOSTINT('month');
+$year = GETPOSTINT('year');
 
 // Clean up on 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
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 0ab502e6fa9..ede18370781 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 $langs->loadLangs(array('other', 'companies', 'contact'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -53,10 +53,10 @@ if (!empty($canvas)) {
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index f92734644de..d1248286792 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -35,7 +35,7 @@ $langs->load("companies");
 
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 4d74382ad4e..337966133c5 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -36,7 +36,7 @@ $langs->load("admin");
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index a9878be3a28..45a39bfee2f 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -49,7 +49,7 @@ $socialnetworks = getArrayOfSocialNetworks();
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contactlist';
@@ -60,8 +60,8 @@ if ($contextpage == 'poslist') {
 }
 
 // Security check
-$id = GETPOST('id', 'int');
-$contactid = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
+$contactid = GETPOSTINT('id');
 $ref = ''; // There is no ref for contacts
 if ($user->socid) {
 	$socid = $user->socid;
@@ -72,7 +72,7 @@ $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('searc
 $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
 $search_phone = GETPOST("search_phone", 'alpha');
 
-$search_id = GETPOST("search_id", "int");
+$search_id = GETPOSTINT("search_id");
 $search_firstlast_only = GETPOST("search_firstlast_only", 'alpha');
 $search_lastname = GETPOST("search_lastname", 'alpha');
 $search_firstname = GETPOST("search_firstname", 'alpha');
@@ -85,7 +85,7 @@ $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
 $search_fax = GETPOST("search_fax", 'alpha');
 $search_email = GETPOST("search_email", 'alpha');
 if (isModEnabled('mailing')) {
-	$search_no_email = GETPOSTISSET("search_no_email") ? GETPOST("search_no_email", 'int') : -1;
+	$search_no_email = GETPOSTISSET("search_no_email") ? GETPOSTINT("search_no_email") : -1;
 } else {
 	$search_no_email = -1;
 }
@@ -98,10 +98,10 @@ if (isModEnabled('socialnetworks')) {
 }
 $search_priv = GETPOST("search_priv", 'alpha');
 $search_sale = GETPOSTINT('search_sale');
-$search_categ = GETPOST("search_categ", 'int');
-$search_categ_thirdparty = GETPOST("search_categ_thirdparty", 'int');
-$search_categ_supplier = GETPOST("search_categ_supplier", 'int');
-$search_status = GETPOST("search_status", 'int');
+$search_categ = GETPOSTINT("search_categ");
+$search_categ_thirdparty = GETPOSTINT("search_categ_thirdparty");
+$search_categ_supplier = GETPOSTINT("search_categ_supplier");
+$search_status = GETPOSTINT("search_status");
 $search_type = GETPOST('search_type', 'alpha');
 $search_address = GETPOST('search_address', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
@@ -110,9 +110,9 @@ $search_import_key = GETPOST("search_import_key", 'alpha');
 $search_country = GETPOST("search_country", 'intcomma');
 $search_roles = GETPOST("search_roles", 'array');
 $search_level = GETPOST("search_level", 'array');
-$search_stcomm = GETPOST('search_stcomm', 'int');
-$search_birthday_start = dol_mktime(0, 0, 0, GETPOST('search_birthday_startmonth', 'int'), GETPOST('search_birthday_startday', 'int'), GETPOST('search_birthday_startyear', 'int'));
-$search_birthday_end = dol_mktime(23, 59, 59, GETPOST('search_birthday_endmonth', 'int'), GETPOST('search_birthday_endday', 'int'), GETPOST('search_birthday_endyear', 'int'));
+$search_stcomm = GETPOSTINT('search_stcomm');
+$search_birthday_start = dol_mktime(0, 0, 0, GETPOSTINT('search_birthday_startmonth'), GETPOSTINT('search_birthday_startday'), GETPOSTINT('search_birthday_startyear'));
+$search_birthday_end = dol_mktime(23, 59, 59, GETPOSTINT('search_birthday_endmonth'), GETPOSTINT('search_birthday_endday'), GETPOSTINT('search_birthday_endyear'));
 
 if ($search_status === '') {
 	$search_status = 1; // always display active customer first
@@ -128,14 +128,14 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $type = GETPOST("type", 'aZ');
 $view = GETPOST("view", 'alpha');
 
-$userid = GETPOST('userid', 'int');
+$userid = GETPOSTINT('userid');
 $begin = GETPOST('begin');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -288,8 +288,8 @@ if (!$permissiontoread) {
  */
 
 if ($action == "change" && $user->hasRight('takepos', 'run')) {	// Change customer for TakePOS
-	$idcustomer = GETPOST('idcustomer', 'int');
-	$idcontact = GETPOST('idcontact', 'int');
+	$idcustomer = GETPOSTINT('idcustomer');
+	$idcontact = GETPOSTINT('idcontact');
 
 	// Check if draft invoice already exists, if not create it
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' AND entity IN (".getEntity('invoice').")";
@@ -935,7 +935,7 @@ if (!empty($permissiontodelete)) {
 if (isModEnabled('category') && $user->hasRight('societe', 'creer')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 if ($contextpage != 'poslist') {
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 7dd2b319e67..1f7a328e614 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -35,7 +35,7 @@ $action = GETPOST('action', 'aZ09');
 // Load translation files required by the page
 $langs->load("companies");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $object = new Contact($db);
 if ($id > 0) {
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index c9e96439ef9..357b6401023 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index 9cc60d2cbe4..389bb693d1d 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 $langs->loadLangs(array("contacts", "companies", "projects"));
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $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
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 5760cc9e670..a8434eff2d9 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
 $contact = new Contact($db);
 
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 45f81b633c9..5c0506a94c7 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -50,7 +50,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
 // Security check
@@ -63,10 +63,10 @@ $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($id) ? 'rowid' : 'ref');
 $result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype);
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index fb3290f6124..231f433f3b4 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -61,16 +61,16 @@ $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = GETPOST('socid', 'int');
-$id = GETPOST('id', 'int');
+$socid = GETPOSTINT('socid');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $origin = GETPOST('origin', 'alpha');
-$originid = GETPOST('originid', 'int');
+$originid = GETPOSTINT('originid');
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 $datecontrat = '';
@@ -164,7 +164,7 @@ if (empty($reshook)) {
 			$date_end = dol_mktime(GETPOST('endhour'), GETPOST('endmin'), 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
 		}
 
-		$result = $object->active_line($user, GETPOST('ligne', 'int'), $date_start, $date_end, GETPOST('comment'));
+		$result = $object->active_line($user, GETPOSTINT('ligne'), $date_start, $date_end, GETPOST('comment'));
 
 		if ($result > 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -182,7 +182,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 		}
 		if (!$error) {
-			$result = $object->close_line($user, GETPOST('ligne', 'int'), $date_end, urldecode(GETPOST('comment')));
+			$result = $object->close_line($user, GETPOSTINT('ligne'), $date_end, urldecode(GETPOST('comment')));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
@@ -250,12 +250,12 @@ if (empty($reshook)) {
 			$object->socid = $socid;
 			$object->date_contrat = $datecontrat;
 
-			$object->commercial_suivi_id = GETPOST('commercial_suivi_id', 'int');
-			$object->commercial_signature_id = GETPOST('commercial_signature_id', 'int');
+			$object->commercial_suivi_id = GETPOSTINT('commercial_suivi_id');
+			$object->commercial_signature_id = GETPOSTINT('commercial_signature_id');
 
 			$object->note_private = GETPOST('note_private', 'alpha');
 			$object->note_public				= GETPOST('note_public', 'alpha');
-			$object->fk_project					= GETPOST('projectid', 'int');
+			$object->fk_project					= GETPOSTINT('projectid');
 			$object->remise_percent = price2num(GETPOST('remise_percent'), '', 2);
 			$object->ref = GETPOST('ref', 'alpha');
 			$object->ref_customer				= GETPOST('ref_customer', 'alpha');
@@ -451,7 +451,7 @@ if (empty($reshook)) {
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 
 			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
@@ -712,7 +712,7 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			$objectline = new ContratLigne($db);
-			if ($objectline->fetch(GETPOST('elrowid', 'int')) < 0) {
+			if ($objectline->fetch(GETPOSTINT('elrowid')) < 0) {
 				setEventMessages($objectline->error, $objectline->errors, 'errors');
 				$error++;
 			}
@@ -771,7 +771,7 @@ if (empty($reshook)) {
 				$remise = round(($price_ht * $remise_percent / 100), 2);
 			}
 
-			$objectline->fk_product = GETPOST('idprod', 'int');
+			$objectline->fk_product = GETPOSTINT('idprod');
 			$objectline->description = GETPOST('product_desc', 'restricthtml');
 			$objectline->price_ht = $price_ht;
 			$objectline->subprice = price2num(GETPOST('elprice'), 'MU');
@@ -822,7 +822,7 @@ if (empty($reshook)) {
 			$db->rollback();
 		}
 	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->hasRight('contrat', 'creer')) {
-		$result = $object->deleteLine(GETPOST('lineid', 'int'), $user);
+		$result = $object->deleteLine(GETPOSTINT('lineid'), $user);
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -1036,10 +1036,10 @@ if (empty($reshook)) {
 			}
 		} elseif ($action == 'swapstatut') {
 			// bascule du statut d'un contact
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} elseif ($action == 'deletecontact') {
 			// Efface un contact
-			$result = $object->delete_contact(GETPOST('lineid', 'int'));
+			$result = $object->delete_contact(GETPOSTINT('lineid'));
 
 			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -1111,7 +1111,7 @@ if ($action == 'create') {
 		$soc->fetch($socid);
 	}
 
-	if (GETPOST('origin') && GETPOST('originid', 'int')) {
+	if (GETPOST('origin') && GETPOSTINT('originid')) {
 		// Parse element/subelement (ex: project_task)
 		$regs = array();
 		$element = $subelement = GETPOST('origin');
@@ -1121,7 +1121,7 @@ if ($action == 'create') {
 		}
 
 		if ($element == 'project') {
-			$projectid = GETPOST('originid', 'int');
+			$projectid = GETPOSTINT('originid');
 		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
@@ -1161,7 +1161,7 @@ if ($action == 'create') {
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
 	} else {
-		$projectid = GETPOST('projectid', 'int');
+		$projectid = GETPOSTINT('projectid');
 		$note_private = GETPOST("note_private");
 		$note_public = GETPOST("note_public");
 	}
@@ -1358,7 +1358,7 @@ if ($action == 'create') {
 		} elseif ($action == 'clone') {
 			$filter = '(s.client:IN:1,2,3)';
 			// Clone confirmation
-			$formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', $filter)));
+			$formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', $filter)));
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 		}
 
@@ -1892,7 +1892,7 @@ if ($action == 'create') {
 				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
 				array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid', 'int'), $langs->trans("MoveToAnotherContract"), $langs->trans("ConfirmMoveToAnotherContract"), "confirm_move", $formquestion);
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOSTINT('rowid'), $langs->trans("MoveToAnotherContract"), $langs->trans("ConfirmMoveToAnotherContract"), "confirm_move", $formquestion);
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
 			}
 
@@ -1960,13 +1960,13 @@ if ($action == 'create') {
 			}
 
 			// Form to activate line
-			if ($user->hasRight('contrat', 'activer') && $action == 'activateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
+			if ($user->hasRight('contrat', 'activer') && $action == 'activateline' && $object->lines[$cursorline - 1]->id == GETPOSTINT('ligne')) {
 				print '<form name="active" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="confirm_active">';
 				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				print '<input type="hidden" name="ligne" value="'.GETPOST('ligne', 'int').'">';
+				print '<input type="hidden" name="ligne" value="'.GETPOSTINT('ligne').'">';
 				print '<input type="hidden" name="confirm" value="yes">';
 
 				print '<table class="noborder tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').' centpercent">';
@@ -2015,7 +2015,7 @@ if ($action == 'create') {
 				print '</form>';
 			}
 
-			if ($user->hasRight('contrat', 'activer') && $action == 'unactivateline' && $object->lines[$cursorline - 1]->id == GETPOST('ligne', 'int')) {
+			if ($user->hasRight('contrat', 'activer') && $action == 'unactivateline' && $object->lines[$cursorline - 1]->id == GETPOSTINT('ligne')) {
 				/**
 				 * Disable a contract line
 				 */
@@ -2084,7 +2084,7 @@ if ($action == 'create') {
 			$dateSelector = 1;
 
 			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 			<input type="hidden" name="token" value="'.newToken().'">
 			<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index df7331cb65a..2af94f7654c 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -40,8 +40,8 @@ $langs->loadLangs(array('contracts', 'companies'));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$socid = GETPOST('socid', 'int');
-$id = GETPOST('id', 'int');
+$socid = GETPOSTINT('socid');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -98,7 +98,7 @@ if (empty($reshook)) {
 	// Toggle the status of a contact
 	if ($action == 'swapstatut' && $user->hasRight('contrat', 'creer')) {
 		if ($object->fetch($id)) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} else {
 			dol_print_error($db, $object->error);
 		}
@@ -107,7 +107,7 @@ if (empty($reshook)) {
 	// Delete contact
 	if ($action == 'deletecontact' && $user->hasRight('contrat', 'creer')) {
 		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+		$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 9cea403d00c..df1fe678317 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array('other', 'products', 'contracts'));
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
 // Security check
@@ -53,10 +53,10 @@ if ($user->socid > 0) {
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index be492d4cea0..584ea7d0697 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -39,13 +39,13 @@ $langs->loadLangs(array('products', 'companies', 'contracts'));
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 $statut = GETPOST('statut') ? GETPOST('statut') : 1;
 
 // Security check
 $socid = 0;
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 72fd00021c8..8c5d25cbb97 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array('contracts', 'products', 'companies', 'compta'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contractlist'; // To manage different context of search
@@ -59,59 +59,59 @@ $search_email = GETPOST('search_email', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state", 'alpha');
-$search_country = GETPOST("search_country", 'int');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_country = GETPOSTINT("search_country");
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
 $search_contract = GETPOST('search_contract', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
 $search_all = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search_status = GETPOST('search_status', 'alpha');
-$socid = GETPOST('socid', 'int');
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
-$search_product_category = GETPOST('search_product_category', 'int');
-$search_dfmonth = GETPOST('search_dfmonth', 'int');
-$search_dfyear = GETPOST('search_dfyear', 'int');
+$socid = GETPOSTINT('socid');
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
+$search_product_category = GETPOSTINT('search_product_category');
+$search_dfmonth = GETPOSTINT('search_dfmonth');
+$search_dfyear = GETPOSTINT('search_dfyear');
 $search_op2df = GETPOST('search_op2df', 'alpha');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
-	$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
+	$searchCategoryCustomerOperator = GETPOSTINT('search_category_customer_operator');
 } elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
 	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
 
-$search_date_creation_startmonth = GETPOST('search_date_creation_startmonth', 'int');
-$search_date_creation_startyear = GETPOST('search_date_creation_startyear', 'int');
-$search_date_creation_startday = GETPOST('search_date_creation_startday', 'int');
+$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);	// Use tzserver
-$search_date_creation_endmonth = GETPOST('search_date_creation_endmonth', 'int');
-$search_date_creation_endyear = GETPOST('search_date_creation_endyear', 'int');
-$search_date_creation_endday = GETPOST('search_date_creation_endday', 'int');
+$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);	// Use tzserver
 
-$search_date_modif_startmonth = GETPOST('search_date_modif_startmonth', 'int');
-$search_date_modif_startyear = GETPOST('search_date_modif_startyear', 'int');
-$search_date_modif_startday = GETPOST('search_date_modif_startday', 'int');
+$search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth');
+$search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear');
+$search_date_modif_startday = GETPOSTINT('search_date_modif_startday');
 $search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear);	// Use tzserver
-$search_date_modif_endmonth = GETPOST('search_date_modif_endmonth', 'int');
-$search_date_modif_endyear = GETPOST('search_date_modif_endyear', 'int');
-$search_date_modif_endday = GETPOST('search_date_modif_endday', 'int');
+$search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth');
+$search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
+$search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -127,7 +127,7 @@ if (!$sortorder) {
 }
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -733,7 +733,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php
index 5eaaac8d51f..edaeb02525b 100644
--- a/htdocs/contrat/messaging.php
+++ b/htdocs/contrat/messaging.php
@@ -53,13 +53,13 @@ $search_agenda_label = GETPOST('search_agenda_label');
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ?GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -80,7 +80,7 @@ $object = new Contrat($db);
 $hookmanager->initHooks(array('agendacontract', 'globalcard'));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index ec9f9da7dc2..996eace982f 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -37,8 +37,8 @@ $langs->loadLangs(array('companies', 'contracts'));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$socid = GETPOST('socid', 'int');
-$id = GETPOST('id', 'int');
+$socid = GETPOSTINT('socid');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 69025a66d0f..eae46a028e6 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -44,10 +44,10 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -71,8 +71,8 @@ $search_total_ttc = GETPOST("search_total_ttc", 'alpha');
 $search_contract = GETPOST("search_contract", 'alpha');
 $search_service = GETPOST("search_service", 'alpha');
 $search_status = GETPOST("search_status", 'alpha');
-$search_product_category = GETPOST('search_product_category', 'int');
-$socid = GETPOST('socid', 'int');
+$search_product_category = GETPOSTINT('search_product_category');
+$socid = GETPOSTINT('socid');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contractservicelist'.$mode;
 
 $opouvertureprevuemonth = GETPOST('opouvertureprevuemonth');
@@ -80,19 +80,19 @@ $opouvertureprevueday = GETPOST('opouvertureprevueday');
 $opouvertureprevueyear = GETPOST('opouvertureprevueyear');
 $filter_opouvertureprevue = GETPOST('filter_opouvertureprevue');
 
-$op1month = GETPOST('op1month', 'int');
-$op1day = GETPOST('op1day', 'int');
-$op1year = GETPOST('op1year', 'int');
+$op1month = GETPOSTINT('op1month');
+$op1day = GETPOSTINT('op1day');
+$op1year = GETPOSTINT('op1year');
 $filter_op1 = GETPOST('filter_op1', 'alpha');
 
-$op2month = GETPOST('op2month', 'int');
-$op2day = GETPOST('op2day', 'int');
-$op2year = GETPOST('op2year', 'int');
+$op2month = GETPOSTINT('op2month');
+$op2day = GETPOSTINT('op2day');
+$op2year = GETPOSTINT('op2year');
 $filter_op2 = GETPOST('filter_op2', 'alpha');
 
-$opcloturemonth = GETPOST('opcloturemonth', 'int');
-$opclotureday = GETPOST('opclotureday', 'int');
-$opclotureyear = GETPOST('opclotureyear', 'int');
+$opcloturemonth = GETPOSTINT('opcloturemonth');
+$opclotureday = GETPOSTINT('opclotureday');
+$opclotureyear = GETPOSTINT('opclotureyear');
 $filter_opcloture = GETPOST('filter_opcloture', 'alpha');
 
 
@@ -107,7 +107,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Security check
-$contratid = GETPOST('id', 'int');
+$contratid = GETPOSTINT('id');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/contrat/ticket.php b/htdocs/contrat/ticket.php
index e4e1296ccdb..7c7cce00982 100644
--- a/htdocs/contrat/ticket.php
+++ b/htdocs/contrat/ticket.php
@@ -37,8 +37,8 @@ require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 
 $langs->loadLangs(array('companies', 'contracts', 'tickets'));
 
-$socid=GETPOST('socid', 'int');
-$id=GETPOST('id', 'int');
+$socid=GETPOSTINT('socid');
+$id=GETPOSTINT('id');
 $ref=GETPOST('ref', 'alpha');
 $action=GETPOST('action', 'alpha');
 
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 9f5228561d0..1fac2f45c9e 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -110,9 +110,9 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 				$value = GETPOST($key, 'restricthtml');
 			}
 		} elseif ($object->fields[$key]['type'] == 'date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int')); // for date without hour, we use gmt
+			$value = dol_mktime(12, 0, 0, GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year')); // for date without hour, we use gmt
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
-			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), GETPOST($key.'sec', 'int'), GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'), 'tzuserrel');
+			$value = dol_mktime(GETPOSTINT($key.'hour'), GETPOSTINT($key.'min'), GETPOSTINT($key.'sec'), GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year'), 'tzuserrel');
 		} elseif ($object->fields[$key]['type'] == 'duration') {
 			$value = 60 * 60 * GETPOSTINT($key.'hour') + 60 * GETPOSTINT($key.'min');
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
@@ -263,12 +263,12 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 				$value = GETPOST($key, 'restricthtml');
 			}
 		} elseif ($object->fields[$key]['type'] == 'date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int')); // for date without hour, we use gmt
+			$value = dol_mktime(12, 0, 0, GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year')); // for date without hour, we use gmt
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
-			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), GETPOST($key.'sec', 'int'), GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'), 'tzuserrel');
+			$value = dol_mktime(GETPOSTINT($key.'hour'), GETPOSTINT($key.'min'), GETPOSTINT($key.'sec'), GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year'), 'tzuserrel');
 		} elseif ($object->fields[$key]['type'] == 'duration') {
-			if (GETPOST($key.'hour', 'int') != '' || GETPOST($key.'min', 'int') != '') {
-				$value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
+			if (GETPOSTINT($key.'hour') != '' || GETPOSTINT($key.'min') != '') {
+				$value = 60 * 60 * GETPOSTINT($key.'hour') + 60 * GETPOSTINT($key.'min');
 			} else {
 				$value = '';
 			}
@@ -353,8 +353,8 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 
 // Action to update one modulebuilder field
 $reg = array();
-if (preg_match('/^set(\w+)$/', $action, $reg) && GETPOST('id', 'int') > 0 && !empty($permissiontoadd)) {
-	$object->fetch(GETPOST('id', 'int'));
+if (preg_match('/^set(\w+)$/', $action, $reg) && GETPOSTINT('id') > 0 && !empty($permissiontoadd)) {
+	$object->fetch(GETPOSTINT('id'));
 
 	$keyforfield = $reg[1];
 	if (property_exists($object, $keyforfield)) {
@@ -378,8 +378,8 @@ if (preg_match('/^set(\w+)$/', $action, $reg) && GETPOST('id', 'int') > 0 && !em
 }
 
 // Action to update one extrafield
-if ($action == "update_extras" && GETPOST('id', 'int') > 0 && !empty($permissiontoadd)) {
-	$object->fetch(GETPOST('id', 'int'));
+if ($action == "update_extras" && GETPOSTINT('id') > 0 && !empty($permissiontoadd)) {
+	$object->fetch(GETPOSTINT('id'));
 
 	$object->oldcopy = dol_clone($object, 2);
 
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 5efa4df394d..8e34bcdbc52 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -55,9 +55,9 @@ if ($action == 'builddoc' && ($permissiontoadd || !empty($usercangeneretedoc)))
 		// Special case to force bank account
 		//if (property_exists($object, 'fk_bank'))
 		//{
-		if (GETPOST('fk_bank', 'int')) {
+		if (GETPOSTINT('fk_bank')) {
 			// this field may come from an external module
-			$object->fk_bank = GETPOST('fk_bank', 'int');
+			$object->fk_bank = GETPOSTINT('fk_bank');
 		} elseif (!empty($object->fk_account)) {
 			$object->fk_bank = $object->fk_account;
 		}
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 3ba1df0b0e8..9d5bb687c64 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -26,9 +26,9 @@
 // $object must be defined
 // $permissiondellink must be defined
 
-$dellinkid = GETPOST('dellinkid', 'int');
+$dellinkid = GETPOSTINT('dellinkid');
 $addlink = GETPOST('addlink', 'alpha');
-$addlinkid = GETPOST('idtolinkto', 'int');
+$addlinkid = GETPOSTINT('idtolinkto');
 $addlinkref = GETPOST('reftolinkto', 'alpha');
 $cancellink = GETPOST('cancel', 'alpha');
 
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index a563b791f51..affca98a90d 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -200,7 +200,7 @@ if ($action == 'add') {
 					GETPOST('attrname', 'aZ09'),
 					GETPOST('label', 'alpha'),
 					$type,
-					GETPOST('pos', 'int'),
+					GETPOSTINT('pos'),
 					$extrasize,
 					$elementtype,
 					(GETPOST('unique', 'alpha') ? 1 : 0),
@@ -337,7 +337,7 @@ if ($action == 'update') {
 
 		if (!$error) {
 			if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) {
-				$pos = GETPOST('pos', 'int');
+				$pos = GETPOSTINT('pos');
 				// Construct array for parameter (value of select list)
 				$parameters = $param;
 				$parameters_array = explode("\r\n", $parameters);
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 28d5d33800c..ed0d8b4e8ec 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -28,7 +28,7 @@
 
 
 // Protection to understand what happen when submitting files larger than post_max_size
-if (GETPOST('uploadform', 'int') && empty($_POST) && empty($_FILES)) {
+if (GETPOSTINT('uploadform') && empty($_POST) && empty($_FILES)) {
 	dol_syslog("The PHP parameter 'post_max_size' is too low. All POST parameters and FILES were set to empty.");
 	$langs->loadLangs(array("errors", "install"));
 	print $langs->trans("ErrorFileSizeTooLarge").' ';
@@ -77,7 +77,7 @@ if (GETPOST('sendit', 'alpha') && getDolGlobalString('MAIN_UPLOAD_DOC') && !empt
 			if (GETPOST('section_dir', 'alpha')) {
 				$generatethumbs = 0;
 			}
-			$allowoverwrite = (GETPOST('overwritefile', 'int') ? 1 : 0);
+			$allowoverwrite = (GETPOSTINT('overwritefile') ? 1 : 0);
 
 			if (!empty($upload_dirold) && getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
@@ -130,7 +130,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto
 			$fileold = $upload_dirold."/".$urlfile;
 		}
 	}
-	$linkid = GETPOST('linkid', 'int');
+	$linkid = GETPOSTINT('linkid');
 
 	if ($urlfile) {
 		// delete of a file
@@ -192,7 +192,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 
 	$link = new Link($db);
-	$f = $link->fetch(GETPOST('linkid', 'int'));
+	$f = $link->fetch(GETPOSTINT('linkid'));
 	if ($f) {
 		$link->url = GETPOST('link', 'alpha');
 		if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://') {
@@ -299,12 +299,12 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto
 	}
 
 	// Update properties in ECM table
-	if (GETPOST('ecmfileid', 'int') > 0) {
+	if (GETPOSTINT('ecmfileid') > 0) {
 		$shareenabled = GETPOST('shareenabled', 'alpha');
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile = new EcmFiles($db);
-		$result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
+		$result = $ecmfile->fetch(GETPOSTINT('ecmfileid'));
 		if ($result > 0) {
 			if ($shareenabled) {
 				if (empty($ecmfile->share)) {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 551c7b7c069..651b48e40a4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -85,7 +85,7 @@ if (!$error && $massaction == 'confirm_presend') {
 	$listofobjectref = array();
 	$contactidtosend = array();
 	$attachedfilesThirdpartyObj = array();
-	$oneemailperrecipient = (GETPOST('oneemailperrecipient', 'int') ? 1 : 0);
+	$oneemailperrecipient = (GETPOSTINT('oneemailperrecipient') ? 1 : 0);
 
 	if (!$error) {
 		$objecttmp = new $objectclass($db);
@@ -1270,7 +1270,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoadd) {
 	$db->begin();
 	if (GETPOSTISSET('pricerate')) {
-		$pricepercentage=GETPOST('pricerate', 'int');
+		$pricepercentage=GETPOSTINT('pricerate');
 		if ($pricepercentage == 0) {
 			setEventMessages($langs->trans("RecordsModified", 0), null);
 		} else {
@@ -1768,7 +1768,7 @@ if (!$error && ($massaction == 'clonetasks' || ($action == 'clonetasks' && $conf
 			$taskid = $clone_task->create($user);
 
 			if ($taskid > 0) {
-				$result = $clone_task->add_contact(GETPOST("userid", 'int'), 'TASKEXECUTIVE', 'internal');
+				$result = $clone_task->add_contact(GETPOSTINT("userid"), 'TASKEXECUTIVE', 'internal');
 				$num++;
 			} else {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -1786,7 +1786,7 @@ if (!$error && ($massaction == 'clonetasks' || ($action == 'clonetasks' && $conf
 
 	if (!$error) {
 		setEventMessage($langs->trans('NumberOfTasksCloned', $num));
-		header("Refresh: 1;URL=".DOL_URL_ROOT.'/projet/tasks.php?id=' . GETPOST('projectid', 'int'));
+		header("Refresh: 1;URL=".DOL_URL_ROOT.'/projet/tasks.php?id=' . GETPOSTINT('projectid'));
 	}
 }
 
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 1ca6c3d3697..27fb7649100 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -42,10 +42,10 @@ if ($action == 'update' && is_array($arrayofparameters) && !empty($user->admin))
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
 			if (!empty($val['type']) && preg_match('/category:/', $val['type'])) {
-				if (GETPOST($key, 'int') == '-1') {
+				if (GETPOSTINT($key) == '-1') {
 					$val_const = '';
 				} else {
-					$val_const = GETPOST($key, 'int');
+					$val_const = GETPOSTINT($key);
 				}
 			} elseif ($val['type'] == 'html') {
 				$val_const = GETPOST($key, 'restricthtml');
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index 1e3efe420be..5f27c2a9091 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -59,9 +59,9 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$model = $object->model_pdf;
-			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+			$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+			$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+			$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 			//see #21072: Update a public note with a "document model not found" is not really a problem : the PDF is not created/updated
 			//but the note is saved, so just add a notification will be enough
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index f5ea99e4b36..11c2392f953 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -53,10 +53,10 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$urlsource = GETPOST("urlsource", 'alpha');
 	$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST("sortfield", 'aZ09comma');
 	$sortorder = GETPOST("sortorder", 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1
@@ -321,7 +321,7 @@ if ($type == 'directory') {
 					$param .= '&website='.urlencode(GETPOST('website', 'alpha'));
 				}
 				if (!preg_match('/pageid=/', $param)) {
-					$param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
+					$param .= '&pageid='.urlencode(GETPOSTINT('pageid'));
 				}
 				//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 			}
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 07c1b8b13b1..680e46a244c 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -74,7 +74,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 }
 
 $websitekey = GETPOST('websitekey', 'alpha');
-$pageid = GETPOST('pageid', 'int');
+$pageid = GETPOSTINT('pageid');
 
 // Load translation files required by the page
 $langs->load("ecm");
diff --git a/htdocs/core/ajax/ajaxinvoiceline.php b/htdocs/core/ajax/ajaxinvoiceline.php
index f575bf326ac..2ce44ea57e3 100644
--- a/htdocs/core/ajax/ajaxinvoiceline.php
+++ b/htdocs/core/ajax/ajaxinvoiceline.php
@@ -34,7 +34,7 @@ if (!defined('NOREQUIREAJAX')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-$invoice_id = GETPOST('id', 'int'); // id of thirdparty
+$invoice_id = GETPOSTINT('id'); // id of thirdparty
 $action = GETPOST('action', 'aZ09');
 $htmlname = GETPOST('htmlname', 'alpha');
 
diff --git a/htdocs/core/ajax/ajaxstatusprospect.php b/htdocs/core/ajax/ajaxstatusprospect.php
index 6fcb0dcfd78..1b389a32d4f 100644
--- a/htdocs/core/ajax/ajaxstatusprospect.php
+++ b/htdocs/core/ajax/ajaxstatusprospect.php
@@ -43,8 +43,8 @@ if (!defined('NOREQUIRESOC')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
-$idstatus = GETPOST('id', 'int');
-$idprospect = GETPOST('prospectid', 'int');
+$idstatus = GETPOSTINT('id');
+$idprospect = GETPOSTINT('prospectid');
 $action = GETPOST('action', 'aZ09');
 
 $prospectstatic = new Client($db);
diff --git a/htdocs/core/ajax/ajaxtooltip.php b/htdocs/core/ajax/ajaxtooltip.php
index f76498c3b3c..782123ca317 100644
--- a/htdocs/core/ajax/ajaxtooltip.php
+++ b/htdocs/core/ajax/ajaxtooltip.php
@@ -47,7 +47,7 @@ $objecttype = GETPOST('objecttype', 'aZ09arobase');	// 'module' or 'myobject@mym
 
 $params = array('fromajaxtooltip' => 1);
 if (GETPOSTISSET('infologin')) {
-	$params['infologin'] = GETPOST('infologin', 'int');
+	$params['infologin'] = GETPOSTINT('infologin');
 }
 if (GETPOSTISSET('option')) {
 	$params['option'] = GETPOST('option', 'restricthtml');
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index c67f1455b42..deed93cecc4 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -60,8 +60,8 @@ top_httphead();
 if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consolidate')) && $action == 'dvnext') {
 	// Increase date
 	$al = new AccountLine($db);
-	$al->datev_next(GETPOST('rowid', 'int'));
-	$al->fetch(GETPOST('rowid', 'int'));
+	$al->datev_next(GETPOSTINT('rowid'));
+	$al->fetch(GETPOSTINT('rowid'));
 
 	print '<span class="spanforajaxedit" id="datevalue_'.$al->id.'">'.dol_print_date($al->datev, "day").'</span>';
 
@@ -71,8 +71,8 @@ if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consoli
 if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consolidate')) && $action == 'dvprev') {
 	// Decrease date
 	$al = new AccountLine($db);
-	$al->datev_previous(GETPOST('rowid', 'int'));
-	$al->fetch(GETPOST('rowid', 'int'));
+	$al->datev_previous(GETPOSTINT('rowid'));
+	$al->fetch(GETPOSTINT('rowid'));
 
 	print '<span class="spanforajaxedit" id="datevalue_'.$al->id.'">'.dol_print_date($al->datev, "day").'</span>';
 
@@ -82,8 +82,8 @@ if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consoli
 if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consolidate')) && $action == 'donext') {
 	// Increase date
 	$al = new AccountLine($db);
-	$al->dateo_next(GETPOST('rowid', 'int'));
-	$al->fetch(GETPOST('rowid', 'int'));
+	$al->dateo_next(GETPOSTINT('rowid'));
+	$al->fetch(GETPOSTINT('rowid'));
 
 	print '<span class="spanforajaxedit" id="dateoperation_'.$al->id.'">'.dol_print_date($al->dateo, "day").'</span>';
 
@@ -93,8 +93,8 @@ if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consoli
 if (($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consolidate')) && $action == 'doprev') {
 	// Decrease date
 	$al = new AccountLine($db);
-	$al->dateo_previous(GETPOST('rowid', 'int'));
-	$al->fetch(GETPOST('rowid', 'int'));
+	$al->dateo_previous(GETPOSTINT('rowid'));
+	$al->fetch(GETPOSTINT('rowid'));
 
 	print '<span class="spanforajaxedit" id="dateoperation_'.$al->id.'">'.dol_print_date($al->dateo, "day").'</span>';
 
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 621d6878098..82bcdf68983 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -41,10 +41,10 @@ if (!defined('NOREQUIRESOC')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-$boxid = GETPOST('boxid', 'int');
+$boxid = GETPOSTINT('boxid');
 $boxorder = GETPOST('boxorder');
-$zone = GETPOST('zone', 'int');
-$userid = GETPOST('userid', 'int');
+$zone = GETPOSTINT('zone');
+$userid = GETPOSTINT('userid');
 
 // Security check
 if ($userid != $user->id) {
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 4408e327e2b..e636b499745 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -95,7 +95,7 @@ $eventfound = array();
 //$eventfound[]=array('type'=>'agenda', 'id'=>1, 'tipo'=>'eee', 'location'=>'aaa');
 
 // TODO Remove use of $_SESSION['auto_check_events_not_before']. Seems not used.
-if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto_check_events_not_before'] || GETPOST('forcechecknow', 'int')) {
+if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto_check_events_not_before'] || GETPOSTINT('forcechecknow')) {
 	/*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
 	if (!empty($_SESSION['auto_check_events_not_before']))
 	{
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index 603de7408c0..7a7139fa6ff 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $action = GETPOST('action', 'aZ09'); // set or del
 $name = GETPOST('name', 'alpha');
-$entity = GETPOST('entity', 'int');
+$entity = GETPOSTINT('entity');
 $value = (GETPOST('value', 'aZ09') != '' ? GETPOST('value', 'aZ09') : 1);
 
 // Security check
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index 4577fccf3c6..7c2f113510c 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -34,10 +34,10 @@ if (!defined('NOREQUIREAJAX')) {
 // Load Dolibarr environment
 require '../../main.inc.php';
 
-$id = GETPOST('id', 'int'); // id of thirdparty
+$id = GETPOSTINT('id'); // id of thirdparty
 $action = GETPOST('action', 'aZ09');
 $htmlname = GETPOST('htmlname', 'alpha');
-$showempty = GETPOST('showempty', 'int');
+$showempty = GETPOSTINT('showempty');
 
 // Security check
 $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 0adef3e9d74..9b63da251f5 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -39,7 +39,7 @@ if (!defined('NOREQUIRESOC')) {
 
 include '../../main.inc.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $element = GETPOST('element', 'aZ09arobase');
 $htmlelement = GETPOST('htmlelement', 'alpha');
 $type = GETPOST('type', 'alpha');
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 1825477758a..44e0c943bc1 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php';	// Class to u
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-$id = GETPOST('fk_element', 'int');
+$id = GETPOSTINT('fk_element');
 $element = GETPOST('element', 'alpha');	// 'myobject' (myobject=mymodule) or 'myobject@mymodule' or 'myobject_mysubobject' (myobject=mymodule)
 $elementupload = $element;
 
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 1bc87d06145..e70ea0b98e0 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -44,10 +44,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $element = GETPOST('element', 'alpha');	// 'myobject' (myobject=mymodule) or 'myobject@mymodule' or 'myobject_mysubobject' (myobject=mymodule)
 $field = GETPOST('field', 'alpha');
-$value = GETPOST('value', 'int');
+$value = GETPOSTINT('value');
 $format = 'int';
 
 // Load object according to $id and $element
diff --git a/htdocs/core/ajax/selectobject.php b/htdocs/core/ajax/selectobject.php
index edc5eb32998..aa702375d3e 100644
--- a/htdocs/core/ajax/selectobject.php
+++ b/htdocs/core/ajax/selectobject.php
@@ -45,7 +45,7 @@ $extrafields = new ExtraFields($db);
 
 $objectdesc = GETPOST('objectdesc', 'alphanohtml', 0, null, null, 1);
 $htmlname = GETPOST('htmlname', 'aZ09');
-$outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
+$outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0);
 $id = GETPOSTINT('id');
 $objectfield = GETPOST('objectfield', 'alpha');	// 'MyObject:field' or 'MyModule_MyObject:field' or 'MyObject:option_field' or 'MyModule_MyObject:option_field'
 
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index a1049287f53..06173974d97 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -33,11 +33,11 @@ if (!defined('NOREQUIREAJAX')) {
 // Load Dolibarr environment
 require '../../main.inc.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');	// 'getSellerVATRates' or 'getBuyerVATRates'
 $htmlname	= GETPOST('htmlname', 'alpha');
 $selected	= (GETPOST('selected') ? GETPOST('selected') : '-1');
-$productid = (GETPOST('productid', 'int') ? GETPOST('productid', 'int') : 0);
+$productid = (GETPOSTINT('productid') ? GETPOSTINT('productid') : 0);
 
 // Security check
 $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
diff --git a/htdocs/core/bookmarks_page.php b/htdocs/core/bookmarks_page.php
index e7ced61cff3..a24918273d8 100644
--- a/htdocs/core/bookmarks_page.php
+++ b/htdocs/core/bookmarks_page.php
@@ -56,10 +56,10 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
  */
 
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache) && GETPOST('cache', 'int')) {
-	header('Cache-Control: max-age='.GETPOST('cache', 'int').', public');
+if (empty($dolibarr_nocache) && GETPOSTINT('cache')) {
+	header('Cache-Control: max-age='.GETPOSTINT('cache').', public');
 	// For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server
-	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOST('cache', 'int')).' GMT');
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOSTINT('cache')).' GMT');
 	// HTTP/1.0
 	header('Pragma: token=public');
 } else {
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index c6db2ca40e5..74b31a3daaf 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -106,7 +106,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-				$endyear = GETPOST($param_year, 'int');
+				$endyear = GETPOSTINT($param_year);
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
index cd3ee464eb2..f6decd57660 100644
--- a/htdocs/core/boxes/box_graph_invoices_peryear.php
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -102,7 +102,7 @@ class box_graph_invoices_peryear extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-				$endyear = GETPOST($param_year, 'int');
+				$endyear = GETPOSTINT($param_year);
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 97fa847f897..818398324c8 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -102,7 +102,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-				$endyear = GETPOST($param_year, 'int');
+				$endyear = GETPOSTINT($param_year);
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index f0021fe403a..ce11fe9e93d 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -105,7 +105,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-				$endyear = GETPOST($param_year, 'int');
+				$endyear = GETPOSTINT($param_year);
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index ca1da74b1bc..9b7e40ab20f 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -104,7 +104,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-				$endyear = GETPOST($param_year, 'int');
+				$endyear = GETPOSTINT($param_year);
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 7bb406ff64e..a90b8604060 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -80,7 +80,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		$param_showordernb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
 		$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-			$year = GETPOST($param_year, 'int');
+			$year = GETPOSTINT($param_year);
 			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 796ba81a306..0192ecf2b12 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -105,7 +105,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
-				$endyear = GETPOST($param_year, 'int');
+				$endyear = GETPOSTINT($param_year);
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 33bd720fbdf..9f18717db03 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6177,11 +6177,11 @@ abstract class CommonObject
 			if (in_array($key_type, array('date'))) {
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-				$value_key = dol_mktime(0, 0, 0, GETPOST($postfieldkey."month", 'int'), GETPOST($postfieldkey."day", 'int'), GETPOST($postfieldkey."year", 'int'));
+				$value_key = dol_mktime(0, 0, 0, GETPOSTINT($postfieldkey."month"), GETPOSTINT($postfieldkey."day"), GETPOSTINT($postfieldkey."year"));
 			} elseif (in_array($key_type, array('datetime'))) {
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-				$value_key = dol_mktime(GETPOST($postfieldkey."hour", 'int'), GETPOST($postfieldkey."min", 'int'), 0, GETPOST($postfieldkey."month", 'int'), GETPOST($postfieldkey."day", 'int'), GETPOST($postfieldkey."year", 'int'));
+				$value_key = dol_mktime(GETPOSTINT($postfieldkey."hour"), GETPOSTINT($postfieldkey."min"), 0, GETPOSTINT($postfieldkey."month"), GETPOSTINT($postfieldkey."day"), GETPOSTINT($postfieldkey."year"));
 			} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
@@ -7760,9 +7760,9 @@ abstract class CommonObject
 					}
 					$paramforthenewlink = '';
 					$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
-					$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
+					$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOSTINT('id') : '');
 					$paramforthenewlink .= (GETPOSTISSET('origin') ? '&origin='.GETPOST('origin', 'aZ09') : '');
-					$paramforthenewlink .= (GETPOSTISSET('originid') ? '&originid='.GETPOST('originid', 'int') : '');
+					$paramforthenewlink .= (GETPOSTISSET('originid') ? '&originid='.GETPOSTINT('originid') : '');
 					$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';
 					// TODO Add JavaScript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page
 					$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 2153ad048a2..7bcdab198e0 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -2049,7 +2049,7 @@ class ExtraFields
 		$expand_display = false;
 		if (is_array($extrafield_param_list) && count($extrafield_param_list) > 0) {
 			$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
-			$expand_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? (empty($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) ? false : true) : ($extrafield_collapse_display_value == 2 ? false : true));
+			$expand_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOSTINT('ignorecollapsesetup')) ? (empty($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) ? false : true) : ($extrafield_collapse_display_value == 2 ? false : true));
 		}
 		$disabledcookiewrite = 0;
 		if ($mode == 'create') {
@@ -2207,13 +2207,13 @@ class ExtraFields
 
 				if (in_array($key_type, array('date'))) {
 					// Clean parameters
-					$value_key = dol_mktime(12, 0, 0, GETPOST("options_".$key."month", 'int'), GETPOST("options_".$key."day", 'int'), GETPOST("options_".$key."year", 'int'));
+					$value_key = dol_mktime(12, 0, 0, GETPOSTINT("options_".$key."month"), GETPOSTINT("options_".$key."day"), GETPOSTINT("options_".$key."year"));
 				} elseif (in_array($key_type, array('datetime'))) {
 					// Clean parameters
-					$value_key = dol_mktime(GETPOST("options_".$key."hour", 'int'), GETPOST("options_".$key."min", 'int'), GETPOST("options_".$key."sec", 'int'), GETPOST("options_".$key."month", 'int'), GETPOST("options_".$key."day", 'int'), GETPOST("options_".$key."year", 'int'), 'tzuserrel');
+					$value_key = dol_mktime(GETPOSTINT("options_".$key."hour"), GETPOSTINT("options_".$key."min"), GETPOSTINT("options_".$key."sec"), GETPOSTINT("options_".$key."month"), GETPOSTINT("options_".$key."day"), GETPOSTINT("options_".$key."year"), 'tzuserrel');
 				} elseif (in_array($key_type, array('datetimegmt'))) {
 					// Clean parameters
-					$value_key = dol_mktime(GETPOST("options_".$key."hour", 'int'), GETPOST("options_".$key."min", 'int'), GETPOST("options_".$key."sec", 'int'), GETPOST("options_".$key."month", 'int'), GETPOST("options_".$key."day", 'int'), GETPOST("options_".$key."year", 'int'), 'gmt');
+					$value_key = dol_mktime(GETPOSTINT("options_".$key."hour"), GETPOSTINT("options_".$key."min"), GETPOSTINT("options_".$key."sec"), GETPOSTINT("options_".$key."month"), GETPOSTINT("options_".$key."day"), GETPOSTINT("options_".$key."year"), 'gmt');
 				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
@@ -2304,14 +2304,14 @@ class ExtraFields
 						$value_key = array();
 						// values provided as a component year, month, day, etc.
 						if (GETPOST($dateparamname_start . 'year')) {
-							$value_key['start'] = dol_mktime(0, 0, 0, GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'));
+							$value_key['start'] = dol_mktime(0, 0, 0, GETPOSTINT($dateparamname_start . 'month'), GETPOSTINT($dateparamname_start . 'day'), GETPOSTINT($dateparamname_start . 'year'));
 						}
 						if (GETPOST($dateparamname_start . 'year')) {
-							$value_key['end'] = dol_mktime(23, 59, 59, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'));
+							$value_key['end'] = dol_mktime(23, 59, 59, GETPOSTINT($dateparamname_end . 'month'), GETPOSTINT($dateparamname_end . 'day'), GETPOSTINT($dateparamname_end . 'year'));
 						}
 					} elseif (GETPOST($keysuffix."options_".$key.$keyprefix."year")) {
 						// Clean parameters
-						$value_key = dol_mktime(12, 0, 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
+						$value_key = dol_mktime(12, 0, 0, GETPOSTINT($keysuffix."options_".$key.$keyprefix."month"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."day"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."year"));
 					} else {
 						continue; // Value was not provided, we should not set it.
 					}
@@ -2320,26 +2320,26 @@ class ExtraFields
 					$dateparamname_end   = $keysuffix . 'options_' . $key . $keyprefix . '_end';
 					if (GETPOST($dateparamname_start . 'year') && GETPOST($dateparamname_end . 'year')) {
 						// values provided as a date pair (start date + end date), each date being broken down as year, month, day, etc.
-						$dateparamname_end_hour = GETPOST($dateparamname_end . 'hour', 'int') != '-1' ? GETPOST($dateparamname_end . 'hour', 'int') : '23';
-						$dateparamname_end_min = GETPOST($dateparamname_end . 'min', 'int') != '-1' ? GETPOST($dateparamname_end . 'min', 'int') : '59';
-						$dateparamname_end_sec = GETPOST($dateparamname_end . 'sec', 'int') != '-1' ? GETPOST($dateparamname_end . 'sec', 'int') : '59';
+						$dateparamname_end_hour = GETPOSTINT($dateparamname_end . 'hour') != '-1' ? GETPOSTINT($dateparamname_end . 'hour') : '23';
+						$dateparamname_end_min = GETPOSTINT($dateparamname_end . 'min') != '-1' ? GETPOSTINT($dateparamname_end . 'min') : '59';
+						$dateparamname_end_sec = GETPOSTINT($dateparamname_end . 'sec') != '-1' ? GETPOSTINT($dateparamname_end . 'sec') : '59';
 						if ($key_type == 'datetimegmt') {
 							$value_key = array(
-								'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'gmt'),
-								'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'), 'gmt')
+								'start' => dol_mktime(GETPOSTINT($dateparamname_start . 'hour'), GETPOSTINT($dateparamname_start . 'min'), GETPOSTINT($dateparamname_start . 'sec'), GETPOSTINT($dateparamname_start . 'month'), GETPOSTINT($dateparamname_start . 'day'), GETPOSTINT($dateparamname_start . 'year'), 'gmt'),
+								'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOSTINT($dateparamname_end . 'month'), GETPOSTINT($dateparamname_end . 'day'), GETPOSTINT($dateparamname_end . 'year'), 'gmt')
 							);
 						} else {
 							$value_key = array(
-								'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'tzuserrel'),
-								'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'), 'tzuserrel')
+								'start' => dol_mktime(GETPOSTINT($dateparamname_start . 'hour'), GETPOSTINT($dateparamname_start . 'min'), GETPOSTINT($dateparamname_start . 'sec'), GETPOSTINT($dateparamname_start . 'month'), GETPOSTINT($dateparamname_start . 'day'), GETPOSTINT($dateparamname_start . 'year'), 'tzuserrel'),
+								'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOSTINT($dateparamname_end . 'month'), GETPOSTINT($dateparamname_end . 'day'), GETPOSTINT($dateparamname_end . 'year'), 'tzuserrel')
 							);
 						}
 					} elseif (GETPOST($keysuffix."options_".$key.$keyprefix."year")) {
 						// Clean parameters
 						if ($key_type == 'datetimegmt') {
-							$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."sec", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'), 'gmt');
+							$value_key = dol_mktime(GETPOSTINT($keysuffix."options_".$key.$keyprefix."hour"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."min"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."sec"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."month"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."day"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."year"), 'gmt');
 						} else {
-							$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."sec", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'), 'tzuserrel');
+							$value_key = dol_mktime(GETPOSTINT($keysuffix."options_".$key.$keyprefix."hour"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."min"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."sec"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."month"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."day"), GETPOSTINT($keysuffix."options_".$key.$keyprefix."year"), 'tzuserrel');
 						}
 					} else {
 						continue; // Value was not provided, we should not set it.
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 78e5d7e0e9e..731b0514ef9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -521,7 +521,7 @@ class FormMail extends Form
 
 			// Zone to select email template
 			if (count($modelmail_array) > 0) {
-				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOST('modelmailselected', 'int') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
+				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOSTINT('modelmailselected') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
 
 				// If list of template is filled
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 1852fc9f878..d6e0e56f688 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -774,10 +774,10 @@ class FormSetupItem
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if ($this->type != 'title') {
 			if (preg_match('/category:/', $this->type)) {
-				if (GETPOST($this->confKey, 'int') == '-1') {
+				if (GETPOSTINT($this->confKey) == '-1') {
 					$val_const = '';
 				} else {
-					$val_const = GETPOST($this->confKey, 'int');
+					$val_const = GETPOSTINT($this->confKey);
 				}
 			} elseif ($this->type == 'multiselect') {
 				$val = GETPOST($this->confKey, 'array');
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 06e42777894..b240c62cd7c 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -320,7 +320,7 @@ class FormTicket
 			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($this->db);
-			$objectsrc->fetch(GETPOST('originid', 'int'));
+			$objectsrc->fetch(GETPOSTINT('originid'));
 
 			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
@@ -639,7 +639,7 @@ class FormTicket
 			print $langs->trans("AssignedTo");
 			print '</td><td>';
 			print img_picto('', 'user', 'class="pictofixedwidth"');
-			print $form->select_dolusers(GETPOST('fk_user_assign', 'int'), 'fk_user_assign', 1);
+			print $form->select_dolusers(GETPOSTINT('fk_user_assign'), 'fk_user_assign', 1);
 			print '</td>';
 			print '</tr>';
 		}
@@ -648,7 +648,7 @@ class FormTicket
 			if (isModEnabled('project') && !$this->ispublic) {
 				$formproject = new FormProjets($this->db);
 				print '<tr><td><label for="project"><span class="">'.$langs->trans("Project").'</span></label></td><td>';
-				print img_picto('', 'project').$formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+				print img_picto('', 'project').$formproject->select_projects(-1, GETPOSTINT('projectid'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 				print '</td></tr>';
 			}
 		}
@@ -658,7 +658,7 @@ class FormTicket
 				$formcontract = new FormContract($this->db);
 				print '<tr><td><label for="contract"><span class="">'.$langs->trans("Contract").'</span></label></td><td>';
 				print img_picto('', 'contract');
-				print $formcontract->select_contract(-1, GETPOST('contactid', 'int'), 'contractid', 0, 1, 1);
+				print $formcontract->select_contract(-1, GETPOSTINT('contactid'), 'contractid', 0, 1, 1);
 				print '</td></tr>';
 			}
 		}
@@ -1371,7 +1371,7 @@ class FormTicket
 
 		print "\n<!-- Begin message_form TICKET -->\n";
 
-		$send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0;
+		$send_email = GETPOSTINT('send_email') ? GETPOSTINT('send_email') : 0;
 
 		// Example 1 : Adding jquery code
 		print '<script nonce="'.getNonce().'" type="text/javascript">
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index ce0b017cb25..4c7c9a0ccc6 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -126,7 +126,7 @@ if (isset($_GET["m"]) && isset($_GET["y"])) {
 // If parameters provided, we show calendar
 if ($qualified) {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
-	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
+	displayBox(GETPOSTINT("sd"), GETPOSTINT("m"), GETPOSTINT("y"));
 } else {
 	dol_print_error(null, 'ErrorBadParameters');
 }
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 5f468902d50..e5ab3e0c3cd 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -146,7 +146,7 @@ if (isModEnabled('modulebuilder')) {
 }
 
 // Logout link
-if (GETPOST('withlogout', 'int')) {
+if (GETPOSTINT('withlogout')) {
 	$toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 }
 
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index f7ed538c274..3f2c921ba5f 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -82,10 +82,10 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
  */
 
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache) && GETPOST('cache', 'int')) {
-	header('Cache-Control: max-age='.GETPOST('cache', 'int').', public, must-revalidate');
+if (empty($dolibarr_nocache) && GETPOSTINT('cache')) {
+	header('Cache-Control: max-age='.GETPOSTINT('cache').', public, must-revalidate');
 	// For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server
-	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOST('cache', 'int')).' GMT');
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOSTINT('cache')).' GMT');
 	// HTTP/1.0
 	header('Pragma: token=public');
 } else {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index a15b0f17cdb..515f4f4f443 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -998,14 +998,14 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$optioncss = GETPOST('optioncss', 'alpha');
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
-	$search_status = GETPOST("search_status", 'int');
+	$search_status = GETPOSTINT("search_status");
 	if ($search_status == '') {
 		$search_status = 1; // always display active customer first
 	}
 
-	$search_rowid   = GETPOST("search_rowid", 'int');
+	$search_rowid   = GETPOSTINT("search_rowid");
 	$search_name    = GETPOST("search_name", 'alpha');
 	$search_address = GETPOST("search_address", 'alpha');
 	$search_poste   = GETPOST("search_poste", 'alpha');
@@ -1015,8 +1015,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$search_birthday_dtend = GETPOST("search_birthday_dtend", 'alpha');
 
 	if ($search_birthday_dtstart != '' || $search_birthday_dtend != '') {
-		$search_birthday_dtstart = dol_mktime(0, 0, 0, GETPOST('search_birthday_dtstartmonth', 'int'), GETPOST('search_birthday_dtstartday', 'int'), GETPOST('search_birthday_dtstartyear', 'int'));
-		$search_birthday_dtend = dol_mktime(23, 59, 59, GETPOST('search_birthday_dtendmonth', 'int'), GETPOST('search_birthday_dtendday', 'int'), GETPOST('search_birthday_dtendyear', 'int'));
+		$search_birthday_dtstart = dol_mktime(0, 0, 0, GETPOSTINT('search_birthday_dtstartmonth'), GETPOSTINT('search_birthday_dtstartday'), GETPOSTINT('search_birthday_dtstartyear'));
+		$search_birthday_dtend = dol_mktime(23, 59, 59, GETPOSTINT('search_birthday_dtendmonth'), GETPOSTINT('search_birthday_dtendday'), GETPOSTINT('search_birthday_dtendyear'));
 	}
 	$socialnetworks = getArrayOfSocialNetworks();
 
@@ -1596,12 +1596,12 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	global $form;
 	global $param, $massactionbutton;
 
-	$start_year = GETPOST('dateevent_startyear', 'int');
-	$start_month = GETPOST('dateevent_startmonth', 'int');
-	$start_day = GETPOST('dateevent_startday', 'int');
-	$end_year = GETPOST('dateevent_endyear', 'int');
-	$end_month = GETPOST('dateevent_endmonth', 'int');
-	$end_day = GETPOST('dateevent_endday', 'int');
+	$start_year = GETPOSTINT('dateevent_startyear');
+	$start_month = GETPOSTINT('dateevent_startmonth');
+	$start_day = GETPOSTINT('dateevent_startday');
+	$end_year = GETPOSTINT('dateevent_endyear');
+	$end_month = GETPOSTINT('dateevent_endmonth');
+	$end_day = GETPOSTINT('dateevent_endday');
 	$tms_start = '';
 	$tms_end = '';
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index bc316e5b80f..963ac582189 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1973,7 +1973,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 		$linkObject->entity = $conf->entity;
 		$linkObject->url = $link;
 		$linkObject->objecttype = GETPOST('objecttype', 'alpha');
-		$linkObject->objectid = GETPOST('objectid', 'int');
+		$linkObject->objectid = GETPOSTINT('objectid');
 		$linkObject->label = GETPOST('label', 'alpha');
 		$res = $linkObject->create($user);
 
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index ed2bf27c331..d08912c169e 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -234,17 +234,17 @@ if (!function_exists('dol_loginfunction')) {
 		}
 
 		// Execute hook getLoginPageOptions (for table)
-		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));
+		$parameters = array('entity' => GETPOSTINT('entity'), 'switchentity' => GETPOSTINT('switchentity'));
 		$reshook = $hookmanager->executeHooks('getLoginPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
 		$morelogincontent = $hookmanager->resPrint;
 
 		// Execute hook getLoginPageExtraOptions (eg for js)
-		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));
+		$parameters = array('entity' => GETPOSTINT('entity'), 'switchentity' => GETPOSTINT('switchentity'));
 		$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
 		$moreloginextracontent = $hookmanager->resPrint;
 
 		//Redirect after connection
-		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));
+		$parameters = array('entity' => GETPOSTINT('entity'), 'switchentity' => GETPOSTINT('switchentity'));
 		$reshook = $hookmanager->executeHooks('redirectAfterConnection', $parameters); // Note that $action and $object may have been modified by some hooks.
 		$php_self = $hookmanager->resPrint;
 
@@ -318,11 +318,11 @@ if (!function_exists('dol_loginfunction')) {
 		}
 
 		// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
-		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
-		$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int');
-		$dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int');
-		$dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int');
-		$dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
+		$dol_hide_topmenu = GETPOSTINT('dol_hide_topmenu');
+		$dol_hide_leftmenu = GETPOSTINT('dol_hide_leftmenu');
+		$dol_optimize_smallscreen = GETPOSTINT('dol_optimize_smallscreen');
+		$dol_no_mouse_hover = GETPOSTINT('dol_no_mouse_hover');
+		$dol_use_jmobile = GETPOSTINT('dol_use_jmobile');
 
 		// Include login page template
 		include $template_dir.'login.tpl.php';
diff --git a/htdocs/core/login/functions_googleoauth.php b/htdocs/core/login/functions_googleoauth.php
index dda4a0e78cf..9a60b159586 100644
--- a/htdocs/core/login/functions_googleoauth.php
+++ b/htdocs/core/login/functions_googleoauth.php
@@ -53,7 +53,7 @@ function check_user_password_googleoauth($usertotest, $passwordtotest, $entityto
 
 			// We save data of form into a variable
 			$_SESSION['datafromloginform'] = array(
-				'entity'=>GETPOST('entity', 'int'),
+				'entity'=>GETPOSTINT('entity'),
 				'backtopage'=>GETPOST('backtopage'),
 				'tz'=>GETPOST('tz'),
 				'tz_string'=>GETPOST('tz_string'),
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index 425ad2d4234..7495cb3fe03 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -52,7 +52,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 		$protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
 		$openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
 		$openid->SetRequiredFields(array('email', 'fullname'));
-		$_SESSION['dol_entity'] = GETPOST("entity", 'int');
+		$_SESSION['dol_entity'] = GETPOSTINT("entity");
 		//$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
 		if ($openid->sendDiscoveryRequestToGetXRDS()) {
 			$openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index ff26edcd027..0f2d6695ee8 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -107,7 +107,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 			// TODO Find a generic solution
 			if (preg_match('/search_project_user=__search_project_user__/', $shorturl)) {
-				$search_project_user = GETPOST('search_project_user', 'int');
+				$search_project_user = GETPOSTINT('search_project_user');
 				if ($search_project_user) {
 					$shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
 				} else {
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index eee9f086be2..6aacd9bdae3 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -77,7 +77,7 @@ class MenuManager
 			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
 		}
 		if (GETPOSTISSET("idmenu")) {
-			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+			$_SESSION["idmenu"] = GETPOSTINT("idmenu");
 		}
 
 		// Read now mainmenu and leftmenu that define which menu to show
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e489f415fe0..df29edca3d5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2241,7 +2241,7 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 		if (isModEnabled('projet')) {
 			$langs->load("projects");
 
-			$search_project_user = GETPOST('search_project_user', 'int');
+			$search_project_user = GETPOSTINT('search_project_user');
 
 			$tmpentry = array(
 				'enabled'=>isModEnabled('projet'),
@@ -2397,7 +2397,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 				$langs->load("projects");
 
-				$search_project_user = GETPOST('search_project_user', 'int');
+				$search_project_user = GETPOSTINT('search_project_user');
 
 				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("TimeEntry"), 0, $user->hasRight('projet', 'lire'), '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
 			}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 1d3bb633db6..c6bb8ac861c 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -76,7 +76,7 @@ class MenuManager
 			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
 		}
 		if (GETPOSTISSET("idmenu")) {
-			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+			$_SESSION["idmenu"] = GETPOSTINT("idmenu");
 		}
 
 		// Read now mainmenu and leftmenu that define which menu to show
diff --git a/htdocs/core/modules/mailings/eventorganization.modules.php b/htdocs/core/modules/mailings/eventorganization.modules.php
index 0c578cb055d..d6261ae0d02 100644
--- a/htdocs/core/modules/mailings/eventorganization.modules.php
+++ b/htdocs/core/modules/mailings/eventorganization.modules.php
@@ -79,8 +79,8 @@ class mailing_eventorganization extends MailingTargets
 		$sql .= " AND e.fk_project = p.rowid";
 		$sql .= " AND p.entity IN (".getEntity('project').")";
 		$sql .= " AND e.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
-		if (GETPOST('filter_eventorganization', 'int') > 0) {
-			$sql .= " AND e.fk_project = ".((int) GETPOST('filter_eventorganization', 'int'));
+		if (GETPOSTINT('filter_eventorganization') > 0) {
+			$sql .= " AND e.fk_project = ".(GETPOSTINT('filter_eventorganization'));
 		}
 		if (empty($this->evenunsubscribe)) {
 			$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = e.email and mu.entity = ".((int) $conf->entity).")";
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 43ece5ec3f6..59e82deddc2 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -241,17 +241,17 @@ class mailing_fraise extends MailingTargets
 		$cibles = array();
 		$now = dol_now();
 
-		$dateendsubscriptionafter = dol_mktime(GETPOST('subscriptionafterhour', 'int'), GETPOST('subscriptionaftermin', 'int'), GETPOST('subscriptionaftersec', 'int'), GETPOST('subscriptionaftermonth', 'int'), GETPOST('subscriptionafterday', 'int'), GETPOST('subscriptionafteryear', 'int'));
-		$dateendsubscriptionbefore = dol_mktime(GETPOST('subscriptionbeforehour', 'int'), GETPOST('subscriptionbeforemin', 'int'), GETPOST('subscriptionbeforesec', 'int'), GETPOST('subscriptionbeforemonth', 'int'), GETPOST('subscriptionbeforeday', 'int'), GETPOST('subscriptionbeforeyear', 'int'));
+		$dateendsubscriptionafter = dol_mktime(GETPOSTINT('subscriptionafterhour'), GETPOSTINT('subscriptionaftermin'), GETPOSTINT('subscriptionaftersec'), GETPOSTINT('subscriptionaftermonth'), GETPOSTINT('subscriptionafterday'), GETPOSTINT('subscriptionafteryear'));
+		$dateendsubscriptionbefore = dol_mktime(GETPOSTINT('subscriptionbeforehour'), GETPOSTINT('subscriptionbeforemin'), GETPOSTINT('subscriptionbeforesec'), GETPOSTINT('subscriptionbeforemonth'), GETPOSTINT('subscriptionbeforeday'), GETPOSTINT('subscriptionbeforeyear'));
 
 		// La requete doit retourner: id, email, fk_contact, name, firstname
 		$sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
 		$sql .= " a.lastname, a.firstname,";
 		$sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		if (GETPOST('filter_category', 'int') > 0) {
+		if (GETPOSTINT('filter_category') > 0) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".(GETPOSTINT('filter_category'));
 		}
 		$sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
 		$sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
@@ -275,8 +275,8 @@ class mailing_fraise extends MailingTargets
 		}
 		$sql .= " AND a.fk_adherent_type = ta.rowid";
 		// Filter on type
-		if (GETPOST('filter_type', 'int') > 0) {
-			$sql .= " AND ta.rowid = ".((int) GETPOST('filter_type', 'int'));
+		if (GETPOSTINT('filter_type') > 0) {
+			$sql .= " AND ta.rowid = ".(GETPOSTINT('filter_type'));
 		}
 		if (empty($this->evenunsubscribe)) {
 			$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = a.email and mu.entity = ".((int) $conf->entity).")";
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index ef64329899a..e3d64ff8083 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -78,8 +78,8 @@ class mailing_partnership extends MailingTargets
 		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND pt.rowid = p.fk_type";
-		if (GETPOST('filter', 'int') > 0) {
-			$sql .= " AND pt.rowid=".((int) GETPOST('filter', 'int'));
+		if (GETPOSTINT('filter') > 0) {
+			$sql .= " AND pt.rowid=".(GETPOSTINT('filter'));
 		}
 		if (GETPOSTISSET('filter_status_partnership') && GETPOSTINT('filter_status_partnership') >= 0) {
 			$sql .= " AND p.status = ".GETPOSTINT('filter_status_partnership');
@@ -97,8 +97,8 @@ class mailing_partnership extends MailingTargets
 		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		$sql .= " AND p.fk_member = s.rowid";
 		$sql .= " AND pt.rowid = p.fk_type";
-		if (GETPOST('filter', 'int') > 0) {
-			$sql .= " AND pt.rowid=".((int) GETPOST('filter', 'int'));
+		if (GETPOSTINT('filter') > 0) {
+			$sql .= " AND pt.rowid=".(GETPOSTINT('filter'));
 		}
 		if (GETPOSTISSET('filter_status_partnership') && GETPOSTINT('filter_status_partnership') >= 0) {
 			$sql .= " AND p.status = ".GETPOSTINT('filter_status_partnership');
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 52882aeb856..60c1e2ed153 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -70,7 +70,7 @@ class mailing_thirdparties extends MailingTargets
 		$addDescription = "";
 		$addFilter = "";
 		if (GETPOSTISSET("filter_client_thirdparties") && GETPOST("filter_client_thirdparties") != '-1') {
-			$addFilter .= " AND s.client=".((int) GETPOST("filter_client_thirdparties", 'int'));
+			$addFilter .= " AND s.client=".(GETPOSTINT("filter_client_thirdparties"));
 			$addDescription = $langs->trans('ProspectCustomer')."=";
 			if (GETPOST("filter_client_thirdparties") == 0) {
 				$addDescription .= $langs->trans('NorProspectNorCustomer');
@@ -85,7 +85,7 @@ class mailing_thirdparties extends MailingTargets
 			}
 		}
 		if (GETPOSTISSET("filter_supplier_thirdparties") && GETPOST("filter_supplier_thirdparties") != '-1') {
-			$addFilter .= " AND s.fournisseur = ".((int) GETPOST("filter_supplier_thirdparties", 'int'));
+			$addFilter .= " AND s.fournisseur = ".(GETPOSTINT("filter_supplier_thirdparties"));
 			$addDescription = $langs->trans('Supplier')."=";
 			if (GETPOST("filter_supplier_thirdparties") == 0) {
 				$addDescription .= $langs->trans('No');
@@ -149,8 +149,8 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
-			if (GETPOST('filter_thirdparties', 'int') > 0) {
-				$sql .= " AND c.rowid=".((int) GETPOST('filter_thirdparties', 'int'));
+			if (GETPOSTINT('filter_thirdparties') > 0) {
+				$sql .= " AND c.rowid=".(GETPOSTINT('filter_thirdparties'));
 			}
 			if (empty($this->evenunsubscribe)) {
 				$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = s.email) = 0";
@@ -164,8 +164,8 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
-			if (GETPOST('filter_thirdparties', 'int') > 0) {
-				$sql .= " AND c.rowid=".((int) GETPOST('filter_thirdparties', 'int'));
+			if (GETPOSTINT('filter_thirdparties') > 0) {
+				$sql .= " AND c.rowid=".(GETPOSTINT('filter_thirdparties'));
 			}
 			if (empty($this->evenunsubscribe)) {
 				$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = s.email) = 0";
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 9440508ea0e..285b4ae3a26 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -88,7 +88,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 		global $conf;
 
 		// phpcs:enable
-		$key = GETPOST('filter', 'int');
+		$key = GETPOSTINT('filter');
 
 		$cibles = array();
 		$j = 0;
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 03ea0c86f45..ede0da6bb76 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -155,15 +155,15 @@ class pdf_standard extends ModelePDFMovement
 		 * TODO: get from object
 		 */
 
-		$id = GETPOST('id', 'int');
+		$id = GETPOSTINT('id');
 		$ref = GETPOST('ref', 'alpha');
-		$msid = GETPOST('msid', 'int');
+		$msid = GETPOSTINT('msid');
 		$product_id = GETPOST("product_id");
 		$action = GETPOST('action', 'aZ09');
 		$cancel = GETPOST('cancel', 'alpha');
 		$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'movementlist';
 
-		$idproduct = GETPOST('idproduct', 'int');
+		$idproduct = GETPOSTINT('idproduct');
 		$year = GETPOST("year");
 		$month = GETPOST("month");
 		$search_ref = GETPOST('search_ref', 'alpha');
@@ -175,10 +175,10 @@ class pdf_standard extends ModelePDFMovement
 		$search_user = trim(GETPOST("search_user"));
 		$search_batch = trim(GETPOST("search_batch"));
 		$search_qty = trim(GETPOST("search_qty"));
-		$search_type_mouvement = GETPOST('search_type_mouvement', 'int');
+		$search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-		$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+		$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 		$sortfield = GETPOST('sortfield', 'aZ09comma');
 		$sortorder = GETPOST('sortorder', 'aZ09comma');
 		if (empty($page) || $page == -1) {
@@ -192,7 +192,7 @@ class pdf_standard extends ModelePDFMovement
 			$sortorder = "DESC";
 		}
 
-		$pdluoid = GETPOST('pdluoid', 'int');
+		$pdluoid = GETPOSTINT('pdluoid');
 
 		// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		$hookmanager->initHooks(array('movementlist'));
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index e2c1b25926a..2fc4a4a4b09 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -104,7 +104,7 @@ if ($state) {
 
 // Add a test to check that the state parameter is provided into URL when we make the first call to ask the redirect or when we receive the callback
 // but not when callback was ok and we recall the page
-if ($action != 'delete' && !GETPOST('afteroauthloginreturn', 'int') && (empty($statewithscopeonly) || empty($requestedpermissionsarray))) {
+if ($action != 'delete' && !GETPOSTINT('afteroauthloginreturn') && (empty($statewithscopeonly) || empty($requestedpermissionsarray))) {
 	dol_syslog("state or statewithscopeonly and/or requestedpermissionsarray are empty");
 	setEventMessages($langs->trans('ScopeUndefined'), null, 'errors');
 	if (empty($backtourl)) {
diff --git a/htdocs/core/multicompany_page.php b/htdocs/core/multicompany_page.php
index dbd937a83cd..864dd76cc3d 100644
--- a/htdocs/core/multicompany_page.php
+++ b/htdocs/core/multicompany_page.php
@@ -42,7 +42,7 @@ if (!defined('NOREQUIREMENU')) {
 require_once '../main.inc.php';
 
 $action = GETPOST('action', 'aZ');
-$entityid = GETPOST('entity', 'int');
+$entityid = GETPOSTINT('entity');
 $backtourl = GETPOST('backtourl');
 if (empty($backtourl)) {
 	$backtourl = DOL_URL_ROOT;
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 09571f71e31..eecfe22c4b3 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("products", "other"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $modulepart = GETPOST('modulepart', 'alpha') ? GETPOST('modulepart', 'alpha') : 'produit|service';
 $original_file = GETPOST("file");
@@ -351,7 +351,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 
 	$fullpath = $dir."/".$original_file;
 
-	$result = dol_imageResizeOrCrop($fullpath, 0, GETPOST('sizex', 'int'), GETPOST('sizey', 'int'));
+	$result = dol_imageResizeOrCrop($fullpath, 0, GETPOSTINT('sizex'), GETPOSTINT('sizey'));
 
 	if ($result == $fullpath) {
 		// If image is related to a given object, we create also thumbs.
@@ -416,7 +416,7 @@ if ($action == 'confirm_crop') {
 
 	$fullpath = $dir."/".$original_file;
 
-	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOST('w', 'int'), GETPOST('h', 'int'), GETPOST('x', 'int'), GETPOST('y', 'int'));
+	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOSTINT('w'), GETPOSTINT('h'), GETPOSTINT('x'), GETPOSTINT('y'));
 
 	if ($result == $fullpath) {
 		if (is_object($object)) {
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index dc14e7026e0..adaa198087d 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -88,10 +88,10 @@ if ($action == 'redirect') {
  */
 
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache) && GETPOST('cache', 'int')) {
-	header('Cache-Control: max-age='.GETPOST('cache', 'int').', public');
+if (empty($dolibarr_nocache) && GETPOSTINT('cache')) {
+	header('Cache-Control: max-age='.GETPOSTINT('cache').', public');
 	// For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server
-	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOST('cache', 'int')).' GMT');
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOSTINT('cache')).' GMT');
 	// HTTP/1.0
 	header('Pragma: token=public');
 } else {
@@ -129,7 +129,7 @@ if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartp
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 } else {
 	$usedbyinclude = 1; // Used into next include
-	$showtitlebefore = GETPOST('showtitlebefore', 'int');
+	$showtitlebefore = GETPOSTINT('showtitlebefore');
 	$arrayresult = array();
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index bb9c33d83ae..a9fb094ed58 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -189,7 +189,7 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 </td>
 </tr>
 <!-- Position -->
-<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ? GETPOST('pos', 'int') : 100; ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ? GETPOSTINT('pos') : 100; ?>"></td></tr>
 <!-- Language file -->
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>
 <!-- Computed Value -->
@@ -211,10 +211,10 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 <tr class="extra_alwayseditable"><td><?php echo $form->textwithpicto($langs->trans("AlwaysEditable"), $langs->trans("EditableWhenDraftOnly")); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo((GETPOST('alwayseditable', 'alpha') || !GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
 <!-- Visibility -->
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc").'<br><br>'.$langs->trans("ItCanBeAnExpression")); ?>
-</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list', 'int') != '' ? GETPOST('list', 'int') : '1'; ?>"></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOSTINT('list') != '' ? GETPOSTINT('list') : '1'; ?>"></td></tr>
 <!-- Visibility for PDF-->
 <tr><td class="extra_pdf"><?php echo $form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")); ?>
-</td><td class="valeur"><input id="printable" class="minwidth100" type="text" name="printable" value="<?php echo dol_escape_htmltag(GETPOST('printable', 'int')); ?>"></td></tr>
+</td><td class="valeur"><input id="printable" class="minwidth100" type="text" name="printable" value="<?php echo dol_escape_htmltag(GETPOSTINT('printable')); ?>"></td></tr>
 <!-- Totalizable -->
 <tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo(GETPOST('totalizable', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <!-- Css edit -->
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index e358e2c0f76..87caa30a9dc 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -383,7 +383,7 @@ if ($action == 'presend') {
 	// Array of other parameters
 	$formmail->param['action'] = 'send';
 	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+	$formmail->param['models_id'] = GETPOSTINT('modelmailselected');
 	$formmail->param['id'] = $object->id;
 	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"].'?id='.$object->id;
 	$formmail->param['fileinit'] = array($file);
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index abdb45eff4e..e17510485ba 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -66,7 +66,7 @@ foreach ($object->fields as $key => $val) {
 		print img_picto('', $val['picto'], '', false, 0, 0, '', 'pictofixedwidth');
 	}
 	if (in_array($val['type'], array('int', 'integer'))) {
-		$value = GETPOST($key, 'int');
+		$value = GETPOSTINT($key);
 	} elseif ($val['type'] == 'double') {
 		$value = price2num(GETPOST($key, 'alphanohtml'));
 	} elseif (preg_match('/^text/', $val['type'])) {
@@ -86,9 +86,9 @@ foreach ($object->fields as $key => $val) {
 		}
 		$value = GETPOST($key, $check);
 	} elseif ($val['type'] == 'date') {
-		$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+		$value = dol_mktime(12, 0, 0, GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year'));
 	} elseif ($val['type'] == 'datetime') {
-		$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+		$value = dol_mktime(GETPOSTINT($key.'hour'), GETPOSTINT($key.'min'), 0, GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year'));
 	} elseif ($val['type'] == 'boolean') {
 		$value = (GETPOST($key) == 'on' ? 1 : 0);
 	} elseif ($val['type'] == 'price') {
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 65459e121f6..00610c0add8 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -69,7 +69,7 @@ foreach ($object->fields as $key => $val) {
 	}
 
 	if (in_array($val['type'], array('int', 'integer'))) {
-		$value = GETPOSTISSET($key) ? GETPOST($key, 'int') : $object->$key;
+		$value = GETPOSTISSET($key) ? GETPOSTINT($key) : $object->$key;
 	} elseif ($val['type'] == 'double') {
 		$value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $object->$key;
 	} elseif (preg_match('/^text/', $val['type'])) {
@@ -89,7 +89,7 @@ foreach ($object->fields as $key => $val) {
 		}
 		$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
 	} elseif (in_array($val['type'], array('date', 'datetime'))) {
-		$value = GETPOSTISSET($key) ? dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), GETPOST($key.'sec', 'int'), GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int')) : $object->$key;
+		$value = GETPOSTISSET($key) ? dol_mktime(GETPOSTINT($key.'hour'), GETPOSTINT($key.'min'), GETPOSTINT($key.'sec'), GETPOSTINT($key.'month'), GETPOSTINT($key.'day'), GETPOSTINT($key.'year')) : $object->$key;
 	} elseif ($val['type'] == 'price') {
 		$value = GETPOSTISSET($key) ? price2num(GETPOST($key)) : price2num($object->$key);
 	} elseif ($key == 'lang') {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 1ba771c4750..f687f2b883b 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -163,7 +163,7 @@ if ($permission) {
 
 		<div class="tagtd nowrap noborderbottom">
 			<?php
-			$selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ? 0 : $object->socid);
+			$selectedCompany = GETPOSTISSET("newcompany") ? GETPOSTINT("newcompany") : (empty($object->socid) ? 0 : $object->socid);
 			$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp');	// This also print the select component?>
 		</div>
 		<div class="tagtd noborderbottom minwidth500imp">
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index f01f286e1a6..512635e3cba 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -70,7 +70,7 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
 if ($action == 'deletefile' || $action == 'deletelink') {
 	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
 	print $form->formconfirm(
-		$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
+		$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOSTINT('linkid').(empty($param) ? '' : $param),
 		$langs->trans('DeleteFile'),
 		$langs->trans('ConfirmDeleteFile'),
 		'confirm_deletefile',
@@ -159,5 +159,5 @@ $formfile->list_of_documents(
 print "<br>";
 
 //List of links
-$formfile->listOfLinks($object, $permission, $action, GETPOST('linkid', 'int'), $param);
+$formfile->listOfLinks($object, $permission, $action, GETPOSTINT('linkid'), $param);
 print "<br>";
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 447b939940d..2867f2ec15e 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -225,7 +225,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
-				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(12, 0, 0, GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int')) : $datenotinstring;
+				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(12, 0, 0, GETPOSTINT("options_".$tmpkeyextra."month"), GETPOSTINT("options_".$tmpkeyextra."day"), GETPOSTINT("options_".$tmpkeyextra."year")) : $datenotinstring;
 			}
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('datetime'))) {
 				$datenotinstring = empty($object->array_options['options_'.$tmpkeyextra]) ? '' : $object->array_options['options_'.$tmpkeyextra];
@@ -234,7 +234,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
-				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(GETPOST("options_".$tmpkeyextra."hour", 'int'), GETPOST("options_".$tmpkeyextra."min", 'int'), GETPOST("options_".$tmpkeyextra."sec", 'int'), GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int'), 'tzuserrel') : $datenotinstring;
+				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(GETPOSTINT("options_".$tmpkeyextra."hour"), GETPOSTINT("options_".$tmpkeyextra."min"), GETPOSTINT("options_".$tmpkeyextra."sec"), GETPOSTINT("options_".$tmpkeyextra."month"), GETPOSTINT("options_".$tmpkeyextra."day"), GETPOSTINT("options_".$tmpkeyextra."year"), 'tzuserrel') : $datenotinstring;
 			}
 
 			//TODO Improve element and rights detection
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 1601ffabfbe..9d816929008 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -247,7 +247,7 @@ if ($massaction == 'presend') {
 	}
 
 
-	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : (GETPOST('oneemailperrecipient', 'int') ? 1 : -1);
+	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : (GETPOSTINT('oneemailperrecipient') ? 1 : -1);
 	if (in_array($objecttmp->element, array('conferenceorboothattendee'))) {
 		$formmail->withoptiononeemailperrecipient = 0;
 	}
@@ -303,7 +303,7 @@ if ($massaction == 'presend') {
 	// Tableau des parameters complementaires du post
 	$formmail->param['action'] = $action;
 	$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['models_id'] = GETPOSTINT('modelmailselected') ? GETPOSTINT('modelmailselected') : '-1';
 	$formmail->param['id'] = implode(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 	if (getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && count($listofselectedrecipientobjid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 49ab40cc215..f2412524f12 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -322,7 +322,7 @@ if ($nolinesbefore) {
 				}
 			}
 
-			$parentId = GETPOST('parentId', 'int');
+			$parentId = GETPOSTINT('parentId');
 
 			$addproducton = (isModEnabled('product') && $user->hasRight('produit', 'creer'));
 			$addserviceon = (isModEnabled('service') && $user->hasRight('service', 'creer'));
@@ -382,7 +382,7 @@ if ($nolinesbefore) {
 		}
 
 		if (is_object($hookmanager) && empty($senderissupplier)) {
-			$parameters = array('fk_parent_line'=>GETPOST('fk_parent_line', 'int'));
+			$parameters = array('fk_parent_line'=>GETPOSTINT('fk_parent_line'));
 			$reshook = $hookmanager->executeHooks('formCreateProductOptions', $parameters, $object, $action);
 			if (!empty($hookmanager->resPrint)) {
 				print $hookmanager->resPrint;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 875aef0d376..28e382c4f4b 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -129,7 +129,7 @@ $coldisplay++;
 
 	<?php
 	if (is_object($hookmanager)) {
-		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line', 'int') : $line->fk_parent_line);
+		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOSTINT('fk_parent_line') : $line->fk_parent_line);
 		$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
 		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
@@ -187,10 +187,10 @@ $coldisplay++;
 		}
 		echo '<br>';
 		echo $langs->trans('AutoFillDateFrom').' ';
-		echo $form->selectyesno('date_start_fill', GETPOSTISSET('date_start_fill') ? GETPOST('date_start_fill', 'int') : $line->date_start_fill, 1);
+		echo $form->selectyesno('date_start_fill', GETPOSTISSET('date_start_fill') ? GETPOSTINT('date_start_fill') : $line->date_start_fill, 1);
 		echo ' - ';
 		echo $langs->trans('AutoFillDateTo').' ';
-		echo $form->selectyesno('date_end_fill', GETPOSTISSET('date_end_fill') ? GETPOST('date_end_fill', 'int') : $line->date_end_fill, 1);
+		echo $form->selectyesno('date_end_fill', GETPOSTISSET('date_end_fill') ? GETPOSTINT('date_end_fill') : $line->date_end_fill, 1);
 	}
 
 	?>
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 740590cb34a..d62169697da 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -33,7 +33,7 @@ if ((array) $linked_resources && count($linked_resources) > 0) {
 
 		//$element_id = $linked_resource['rowid'];
 
-		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid', 'int')) {
+		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOSTINT('lineid')) {
 			print '<div class="tagtr oddeven">';
 			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
 			print '<input type="hidden" name="element" value="'.$element.'" />';
@@ -47,7 +47,7 @@ if ((array) $linked_resources && count($linked_resources) > 0) {
 			print '</div>';
 		} else {
 			$class = '';
-			if ($linked_resource['rowid'] == GETPOST('lineid', 'int')) {
+			if ($linked_resource['rowid'] == GETPOSTINT('lineid')) {
 				$class = 'highlight';
 			}
 
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index b7b564e1441..17fce5f159d 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -136,11 +136,11 @@ if ($action == 'add' && $permissiontoadd) {
 	$object->md5params = GETPOST('md5params');
 	$object->module_name = GETPOST('module_name');
 	$object->note_private = GETPOST('note', 'restricthtml');
-	$object->datestart = dol_mktime(GETPOST('datestarthour', 'int'), GETPOST('datestartmin', 'int'), 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
-	$object->dateend = dol_mktime(GETPOST('dateendhour', 'int'), GETPOST('dateendmin', 'int'), 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
-	$object->priority = GETPOST('priority', 'int');
-	$object->datenextrun = dol_mktime(GETPOST('datenextrunhour', 'int'), GETPOST('datenextrunmin', 'int'), 0, GETPOST('datenextrunmonth', 'int'), GETPOST('datenextrunday', 'int'), GETPOST('datenextrunyear', 'int'));
-	$object->unitfrequency = GETPOST('unitfrequency', 'int');
+	$object->datestart = dol_mktime(GETPOSTINT('datestarthour'), GETPOSTINT('datestartmin'), 0, GETPOSTINT('datestartmonth'), GETPOSTINT('datestartday'), GETPOSTINT('datestartyear'));
+	$object->dateend = dol_mktime(GETPOSTINT('dateendhour'), GETPOSTINT('dateendmin'), 0, GETPOSTINT('dateendmonth'), GETPOSTINT('dateendday'), GETPOSTINT('dateendyear'));
+	$object->priority = GETPOSTINT('priority');
+	$object->datenextrun = dol_mktime(GETPOSTINT('datenextrunhour'), GETPOSTINT('datenextrunmin'), 0, GETPOSTINT('datenextrunmonth'), GETPOSTINT('datenextrunday'), GETPOSTINT('datenextrunyear'));
+	$object->unitfrequency = GETPOSTINT('unitfrequency');
 	$object->frequency = GETPOSTINT('nbfrequency');
 	$object->maxrun = GETPOSTINT('maxrun');
 	$object->email_alert = GETPOST('email_alert');
@@ -173,11 +173,11 @@ if ($action == 'update' && $permissiontoadd) {
 	$object->md5params = GETPOST('md5params');
 	$object->module_name = GETPOST('module_name');
 	$object->note_private = GETPOST('note', 'restricthtml');
-	$object->datestart = dol_mktime(GETPOST('datestarthour', 'int'), GETPOST('datestartmin', 'int'), 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
-	$object->dateend = dol_mktime(GETPOST('dateendhour', 'int'), GETPOST('dateendmin', 'int'), 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
-	$object->priority = GETPOST('priority', 'int');
-	$object->datenextrun = dol_mktime(GETPOST('datenextrunhour', 'int'), GETPOST('datenextrunmin', 'int'), 0, GETPOST('datenextrunmonth', 'int'), GETPOST('datenextrunday', 'int'), GETPOST('datenextrunyear', 'int'));
-	$object->unitfrequency = GETPOST('unitfrequency', 'int');
+	$object->datestart = dol_mktime(GETPOSTINT('datestarthour'), GETPOSTINT('datestartmin'), 0, GETPOSTINT('datestartmonth'), GETPOSTINT('datestartday'), GETPOSTINT('datestartyear'));
+	$object->dateend = dol_mktime(GETPOSTINT('dateendhour'), GETPOSTINT('dateendmin'), 0, GETPOSTINT('dateendmonth'), GETPOSTINT('dateendday'), GETPOSTINT('dateendyear'));
+	$object->priority = GETPOSTINT('priority');
+	$object->datenextrun = dol_mktime(GETPOSTINT('datenextrunhour'), GETPOSTINT('datenextrunmin'), 0, GETPOSTINT('datenextrunmonth'), GETPOSTINT('datenextrunday'), GETPOSTINT('datenextrunyear'));
+	$object->unitfrequency = GETPOSTINT('unitfrequency');
 	$object->frequency = GETPOSTINT('nbfrequency');
 	$object->maxrun = GETPOSTINT('maxrun');
 	$object->email_alert = GETPOST('email_alert');
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index efc25321c60..cf1198e2b3d 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -35,7 +35,7 @@ if (!$user->hasRight('cron', 'read')) {
 	accessforbidden();
 }
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $object = new Cronjob($db);
 
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 797c341b96a..c00296a02eb 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -42,10 +42,10 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'cr
 
 $id = GETPOSTINT('id');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -61,11 +61,11 @@ if (!$sortorder) {
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ09');
 //Search criteria
-$search_status = (GETPOSTISSET('search_status') ? GETPOST('search_status', 'int') : GETPOST('status', 'int'));
+$search_status = (GETPOSTISSET('search_status') ? GETPOSTINT('search_status') : GETPOSTINT('status'));
 $search_label = GETPOST("search_label", 'alpha');
 $search_module_name = GETPOST("search_module_name", 'alpha');
 $search_lastresult = GETPOST("search_lastresult", "alphawithlgt");
-$search_processing = GETPOST("search_processing", "int");
+$search_processing = GETPOSTINT("search_processing");
 $securitykey = GETPOST('securitykey', 'alpha');
 
 $outputdir = $conf->cron->dir_output;
@@ -385,7 +385,7 @@ $arrayofmassactions = array(
 if ($user->hasRight('cron', 'delete')) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index e094f9ac53a..5bbfe34f6a1 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -88,10 +88,10 @@ foreach ($arrayofparameters as $title => $tab) {
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
 			if (preg_match('/category:/', $val['type'])) {
-				if (GETPOST($key, 'int') == '-1') {
+				if (GETPOSTINT($key) == '-1') {
 					$val_const = '';
 				} else {
-					$val_const = GETPOST($key, 'int');
+					$val_const = GETPOSTINT($key);
 				}
 			} else {
 				$val_const = GETPOST($key, 'alpha');
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index d6df1a7af4d..f4fad036d8d 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -81,7 +81,7 @@ if (getDolGlobalString('DAV_RESTRICT_ON_IP')) {
 }
 
 
-$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
+$entity = (GETPOSTINT('entity') ? GETPOSTINT('entity') : (!empty($conf->entity) ? $conf->entity : 1));
 
 // settings
 $publicDir = $conf->dav->multidir_output[$entity].'/public';
@@ -126,7 +126,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 	}
 
 	$authmode = explode(',', $dolibarr_main_authentication);
-	$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
+	$entity = (GETPOSTINT('entity') ? GETPOSTINT('entity') : (!empty($conf->entity) ? $conf->entity : 1));
 
 	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username) {
 		return false;
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index eaa0525458c..218ef5ec4a3 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -61,7 +61,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -101,7 +101,7 @@ if ($action == 'add') {
 	$object->date_delivery = dol_now();
 	$object->note          = GETPOST("note", 'restricthtml');
 	$object->note_private  = GETPOST("note", 'restricthtml');
-	$object->commande_id   = GETPOST("commande_id", 'int');
+	$object->commande_id   = GETPOSTINT("commande_id");
 	$object->fk_incoterms  = GETPOSTINT('incoterm_id');
 
 	/* ->entrepot_id seems to not exists
@@ -182,14 +182,14 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('expedit
 }
 
 if ($action == 'setdate_delivery' && $user->hasRight('expedition', 'delivery', 'creer')) {
-	$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+	$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 	$result = $object->setDeliveryDate($user, $datedelivery);
 	if ($result < 0) {
 		$mesg = '<div class="error">'.$object->error.'</div>';
 	}
 } elseif ($action == 'set_incoterms' && isModEnabled('incoterm')) {
 	// Set incoterm
-	$result = $object->setIncoterms((int) GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 }
 
 // Update extrafields
diff --git a/htdocs/document.php b/htdocs/document.php
index d89a09fd700..17f0d61676e 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -102,7 +102,7 @@ $original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'alpha');
 $urlsource = GETPOST('urlsource', 'alpha');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 
 // Security check
 if (empty($modulepart) && empty($hashp)) {
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 78f6bdb376b..adaa6686ebf 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -47,17 +47,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
 $langs->loadLangs(array('bills', 'companies', 'donations', 'users'));
 
-$id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT');
 $donation_date = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
-$public_donation = (int) GETPOST("public", 'int');
+$projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
+$public_donation = GETPOSTINT("public");
 
 $object = new Don($db);
 if ($id > 0 || $ref) {
@@ -225,7 +225,7 @@ if (empty($reshook)) {
 
 		$error = 0;
 
-		if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES') && !(GETPOST("socid", 'int') > 0)) {
+		if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES') && !(GETPOSTINT("socid") > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
 			$action = "create";
 			$error++;
@@ -243,7 +243,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$object->socid = (int) GETPOST("socid", 'int');
+			$object->socid = GETPOSTINT("socid");
 			$object->firstname = (string) GETPOST("firstname", 'alpha');
 			$object->lastname = (string) GETPOST("lastname", 'alpha');
 			$object->societe = (string) GETPOST("societe", 'alpha');
@@ -251,14 +251,14 @@ if (empty($reshook)) {
 			$object->amount = price2num(GETPOST("amount", 'alpha'), '', 2);
 			$object->zip = (string) GETPOST("zipcode", 'alpha');
 			$object->town = (string) GETPOST("town", 'alpha');
-			$object->country_id = (int) GETPOST('country_id', 'int');
+			$object->country_id = GETPOSTINT('country_id');
 			$object->email = (string) GETPOST('email', 'alpha');
 			$object->date = $donation_date;
 			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
 			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
 			$object->public = $public_donation;
-			$object->fk_project = (int) GETPOST("fk_project", 'int');
-			$object->modepaymentid = (int) GETPOST('modepayment', 'int');
+			$object->fk_project = GETPOSTINT("fk_project");
+			$object->modepaymentid = GETPOSTINT('modepayment');
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -527,7 +527,7 @@ if ($action == 'create') {
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-	$selected = GETPOST('modepayment', 'int');
+	$selected = GETPOSTINT('modepayment');
 	print img_picto('', 'payment', 'class="pictofixedwidth"');
 	print $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print "</td></tr>\n";
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 445d38a28b7..1674eddd54e 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -43,17 +43,17 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other', 'donations'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
+$projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index a2f9438eb33..dbf01bbb3b2 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -33,10 +33,10 @@ if (isModEnabled('project')) {
 
 $langs->load('donations');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
+$projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 
 $object = new Don($db);
 if ($id > 0 || $ref) {
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 9eb57b7a014..71bb09c41bc 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -39,10 +39,10 @@ $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; //
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $type = GETPOST('type', 'aZ');
 $mode = GETPOST('mode', 'alpha');
 if (empty($page) || $page == -1) {
@@ -266,7 +266,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index e60b9b71054..6a74d2c9e05 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -38,10 +38,10 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'donations'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
+$projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 
 $hookmanager->initHooks(array('donnote'));
 
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index efaae2c3653..26a4c4c55c2 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -39,29 +39,29 @@ $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; //
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-$paiementid				= GETPOST('paiementid', 'int');
+$paiementid				= GETPOSTINT('paiementid');
 
 $search_ref = GETPOST("search_ref", "alpha");
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_company = GETPOST("search_company", 'alpha');
 $search_paymenttype = GETPOST("search_paymenttype");
-$search_account = GETPOST("search_account", "int");
+$search_account = GETPOSTINT("search_account");
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
-$search_sale = GETPOST('search_sale', 'int');
+$search_sale = GETPOSTINT('search_sale');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $type = GETPOST('type', 'aZ');
 $mode = GETPOST('mode', 'alpha');
 if (empty($page) || $page == -1) {
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 5618a985706..434d75de273 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -36,7 +36,7 @@ if (isModEnabled("banque")) {
 $langs->loadLangs(array("bills", "banks", "companies", "donations"));
 
 // Security check
-$id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 if ($user->socid) {
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index cdac47510b9..3f704d8c20f 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("bills");
 
-$chid = GETPOST("rowid", 'int');
+$chid = GETPOSTINT("rowid");
 $action = GETPOST('action', 'aZ09');
 $amounts = array();
 $cancel = GETPOST('cancel');
@@ -67,7 +67,7 @@ if ($action == 'add_payment') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-	if (isModEnabled("banque") && !(GETPOST("accountid", 'int') > 0)) {
+	if (isModEnabled("banque") && !(GETPOSTINT("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 	}
@@ -97,7 +97,7 @@ if ($action == 'add_payment') {
 			$payment->chid         = $chid;
 			$payment->datep     = $datepaid;
 			$payment->amounts      = $amounts; // Tableau de montant
-			$payment->paymenttype  = GETPOST("paymenttype", 'int');
+			$payment->paymenttype  = GETPOSTINT("paymenttype");
 			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
 			$payment->note_public  = GETPOST("note_public", 'restricthtml');
 
@@ -111,7 +111,7 @@ if ($action == 'add_payment') {
 			}
 
 			if (!$error) {
-				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', GETPOSTINT('accountid'), '', '');
 				if (!($result > 0)) {
 					$errmsg = $payment->error;
 					setEventMessages($errmsg, null, 'errors');
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 6dc0fa264c5..1629ac2e984 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 7900949b179..955e8116253 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts", "categories"));
 
 // Get parameters
-$socid      = GETPOST('socid', 'int');
+$socid      = GETPOSTINT('socid');
 $action     = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -45,7 +45,7 @@ $confirm    = GETPOST('confirm', 'alpha');
 
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
-$pageid  = GETPOST('pageid', 'int');
+$pageid  = GETPOSTINT('pageid');
 if (empty($module)) {
 	$module = 'ecm';
 }
@@ -67,10 +67,10 @@ if ($module == 'ecm') {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index f4dd0d5e9d5..7e2bdfe8c6d 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -41,16 +41,16 @@ $confirm    = GETPOST('confirm', 'alpha');
 
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
-$pageid  = GETPOST('pageid', 'int');
+$pageid  = GETPOSTINT('pageid');
 if (empty($module)) {
 	$module = 'ecm';
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 78200dd9d87..e8055639b9a 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -38,7 +38,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Get parameters
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 
 // Security check
 if ($user->socid > 0) {
@@ -46,10 +46,10 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 6624936141b..5d247c992d8 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -35,13 +35,13 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('ecm'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Get parameters
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 // Security check
 if ($user->socid > 0) {
 	$action = '';
@@ -50,10 +50,10 @@ if ($user->socid > 0) {
 
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 2fce02da93a..08b3b74ada6 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -36,19 +36,19 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal', 'bills', 'contracts'));
 
 // Get parameters
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
-$section = GETPOST('section', 'int') ? GETPOST('section', 'int') : GETPOST('section_id', 'int');
+$section = GETPOSTINT('section') ? GETPOSTINT('section') : GETPOSTINT('section_id');
 if (!$section) {
 	$section = 0;
 }
 $section_dir = GETPOST('section_dir', 'alpha');
-$overwritefile = GETPOST('overwritefile', 'int');
+$overwritefile = GETPOSTINT('overwritefile');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index a5084938f88..cd19a296581 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Get parameters
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
-$section = GETPOST('section', 'int') ? GETPOST('section', 'int') : GETPOST('section_id', 'int');
+$section = GETPOSTINT('section') ? GETPOSTINT('section') : GETPOSTINT('section_id');
 $module = GETPOST('module', 'alpha');
 if (!$section) {
 	$section = 0;
@@ -46,10 +46,10 @@ $section_dir = GETPOST('section_dir', 'alpha');
 
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index ecfcf35d2c4..c5662a98835 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -39,24 +39,24 @@ $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal'
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $file_manager = GETPOST('file_manager', 'alpha');
-$section = GETPOST('section', 'int') ? GETPOST('section', 'int') : GETPOST('section_id', 'int');
+$section = GETPOSTINT('section') ? GETPOSTINT('section') : GETPOSTINT('section_id');
 if (!$section) {
 	$section = 0;
 }
 $section_dir = GETPOST('section_dir', 'alpha');
-$overwritefile = GETPOST('overwritefile', 'int');
+$overwritefile = GETPOSTINT('overwritefile');
 
 if (empty($action) && $file_manager) {
 	$action = 'file_manager';
 }
-$pageid  = GETPOST('pageid', 'int');
+$pageid  = GETPOSTINT('pageid');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index ca847e61fee..0ade7890db6 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -43,7 +43,7 @@ $result = restrictedArea($user, 'ecm', '');
 $user->getrights('ecm');
 
 // Get parameters
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section');
 if (!$section) {
@@ -52,17 +52,17 @@ if (!$section) {
 
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
-$pageid  = GETPOST('pageid', 'int');
+$pageid  = GETPOSTINT('pageid');
 if (empty($module)) {
 	$module = 'ecm';
 }
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 1f70b83797e..a4ed949fc04 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -49,9 +49,9 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 
 // Initialize technical objects
 $object = new ConferenceOrBooth($db);
@@ -73,8 +73,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -148,10 +148,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -435,7 +435,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="action" value="add">';
 	if ($withproject) {
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-		print '<input type="hidden" name="fk_project" value="'.GETPOST('fk_project', 'int').'">';
+		print '<input type="hidden" name="fk_project" value="'.GETPOSTINT('fk_project').'">';
 	}
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 5caead98011..fd335c1409e 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -39,10 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 $langs->loadLangs(array('companies', 'eventorganization', 'mails', 'others', 'projects'));
 
 // Variables GET
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -51,7 +51,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'co
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 
 
 // Initialize technical objects
@@ -107,7 +107,7 @@ if ($reshook < 0) {
 }
 
 if ($action == 'addcontact' && $permission) {	// Add a new contact
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
@@ -124,7 +124,7 @@ if ($action == 'addcontact' && $permission) {	// Add a new contact
 	}
 } elseif ($action == 'swapstatut' && $permission) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $permission) {
 	// Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index ee2b7c89e77..8b4db60d47d 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -48,15 +48,15 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'co
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 62350ccbd24..6b584a30e73 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -44,7 +44,7 @@ $langs->loadLangs(array("eventorganization", "other", "projects", "companies"));
 // Get Parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -53,15 +53,15 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
-$projectid = GETPOST('projectid', 'int');
+$id = GETPOSTINT('id');
+$projectid = GETPOSTINT('projectid');
 $projectref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -100,8 +100,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -596,7 +596,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -714,9 +714,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -742,7 +742,7 @@ if (!empty($permissiontodelete)) {
 if (!empty($permissiontoadd)) {
 	$arrayofmassactions['presetstatus'] = img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("ModifyStatus");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 6771a0bc135..7cd5f1d2e10 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 $langs->loadLangs(array("eventorganization", "other", "projects", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -47,11 +47,11 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeecard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 $mode = GETPOST('mode', 'alpha');
 
-$conf_or_booth_id = GETPOST('conforboothid', 'int');
-$fk_project = GETPOST('fk_project', 'int');
+$conf_or_booth_id = GETPOSTINT('conforboothid');
+$fk_project = GETPOSTINT('fk_project');
 $withproject = 1;
 
 // Initialize technical objects
@@ -87,8 +87,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -179,10 +179,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index b429e4675dd..d844673b9ce 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array("eventorganization", "other", "projects", "bills"));
 // Get Parameters
 $action      = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction  = GETPOST('massaction', 'alpha');   // The bulk action (combo box choice into lists)
-$show_files  = GETPOST('show_files', 'int');   // Show files area generated by bulk actions ?
+$show_files  = GETPOSTINT('show_files');   // Show files area generated by bulk actions ?
 $confirm     = GETPOST('confirm', 'alpha');   // Result of a confirmation
 $cancel      = GETPOST('cancel', 'alpha');   // We click on a Cancel button
 $toselect    = GETPOST('toselect', 'array');   // Array of ids of elements selected into a list
@@ -56,20 +56,20 @@ $backtopage  = GETPOST('backtopage', 'alpha');   // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ');   // Option for the css output (always '' except when 'print')
 $mode        = GETPOST('mode', 'aZ');
 
-$id = GETPOST('id', 'int');
-$conf_or_booth_id = GETPOST('conforboothid', 'int');
+$id = GETPOSTINT('id');
+$conf_or_booth_id = GETPOSTINT('conforboothid');
 
-$withproject = GETPOST('withproject', 'int');
-$fk_project = GETPOST('fk_project', 'int') ? GETPOST('fk_project', 'int') : GETPOST('projectid', 'int');
+$withproject = GETPOSTINT('withproject');
+$fk_project = GETPOSTINT('fk_project') ? GETPOSTINT('fk_project') : GETPOSTINT('projectid');
 $projectid = $fk_project;
 
 $withProjectUrl='';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -108,8 +108,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -698,9 +698,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -730,7 +730,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 0ca03d3bcc4..99768a9b738 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -80,7 +80,7 @@ dol_include_once('/eventorganization/lib/eventorganization_conferenceorboothatte
 $langs->loadLangs(array('eventorganization', 'companies'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index a50580e12e2..ce565d2a6b9 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -66,7 +66,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 	$listofobjectid = array();
 
 	$listofobjectref = array();
-	$oneemailperrecipient = (GETPOST('oneemailperrecipient', 'int') ? 1 : 0);
+	$oneemailperrecipient = (GETPOSTINT('oneemailperrecipient') ? 1 : 0);
 
 	if (!$error) {
 		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
diff --git a/htdocs/expedition/ajax/searchfrombarcode.php b/htdocs/expedition/ajax/searchfrombarcode.php
index dddeccb31ec..f1f354a0438 100644
--- a/htdocs/expedition/ajax/searchfrombarcode.php
+++ b/htdocs/expedition/ajax/searchfrombarcode.php
@@ -41,11 +41,11 @@ $action = GETPOST("action", "alpha");
 $barcode = GETPOST("barcode", "aZ09");
 $response = "";
 
-$fk_entrepot = GETPOST("fk_entrepot", "int");
-$fk_inventory = GETPOST("fk_inventory", "int");
-$fk_product = GETPOST("fk_product", "int");
-$reelqty = GETPOST("reelqty", "int");
-$batch = GETPOST("batch", "int");
+$fk_entrepot = GETPOSTINT("fk_entrepot");
+$fk_inventory = GETPOSTINT("fk_inventory");
+$fk_product = GETPOSTINT("fk_product");
+$reelqty = GETPOSTINT("reelqty");
+$batch = GETPOSTINT("batch");
 $mode = GETPOST("mode", "aZ");
 
 $warehousefound = 0;
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 15166f9455e..15397bf9327 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -74,26 +74,26 @@ if (isModEnabled('productbatch')) {
 }
 
 $origin = GETPOST('origin', 'alpha') ? GETPOST('origin', 'alpha') : 'expedition'; // Example: commande, propal
-$origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
+$origin_id = GETPOSTINT('id') ? GETPOSTINT('id') : '';
 $id = $origin_id;
 if (empty($origin_id)) {
-	$origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
+	$origin_id  = GETPOSTINT('origin_id'); // Id of order or propal
 }
 if (empty($origin_id)) {
-	$origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
+	$origin_id  = GETPOSTINT('object_id'); // Id of order or propal
 }
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOSTINT('lineid');
-$facid = GETPOST('facid', 'int');
+$facid = GETPOSTINT('facid');
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
 //PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Expedition($db);
 $objectorder = new Commande($db);
@@ -110,7 +110,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expeditioncard', 'globalcard'));
 
-$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+$date_delivery = dol_mktime(GETPOSTINT('date_deliveryhour'), GETPOSTINT('date_deliverymin'), 0, GETPOSTINT('date_deliverymonth'), GETPOSTINT('date_deliveryday'), GETPOSTINT('date_deliveryyear'));
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -177,7 +177,7 @@ if (empty($reshook)) {
 
 	// Set incoterm
 	if ($action == 'set_incoterms' && isModEnabled('incoterm')) {
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	}
 
 	if ($action == 'setref_customer') {
@@ -229,13 +229,13 @@ if (empty($reshook)) {
 		$object->note_private = GETPOST('note', 'restricthtml');
 		$object->origin = $origin;
 		$object->origin_id = $origin_id;
-		$object->fk_project = GETPOST('projectid', 'int');
-		$object->weight = GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
-		$object->sizeH = GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
-		$object->sizeW = GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
-		$object->sizeS = GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
-		$object->size_units = GETPOST('size_units', 'int');
-		$object->weight_units = GETPOST('weight_units', 'int');
+		$object->fk_project = GETPOSTINT('projectid');
+		$object->weight = GETPOSTINT('weight') == '' ? "NULL" : GETPOSTINT('weight');
+		$object->sizeH = GETPOSTINT('sizeH') == '' ? "NULL" : GETPOSTINT('sizeH');
+		$object->sizeW = GETPOSTINT('sizeW') == '' ? "NULL" : GETPOSTINT('sizeW');
+		$object->sizeS = GETPOSTINT('sizeS') == '' ? "NULL" : GETPOSTINT('sizeS');
+		$object->size_units = GETPOSTINT('size_units');
+		$object->weight_units = GETPOSTINT('weight_units');
 
 		$product = new Product($db);
 
@@ -249,11 +249,11 @@ if (empty($reshook)) {
 		$object->model_pdf = GETPOST('model');
 		$object->date_delivery = $date_delivery; // Date delivery planned
 		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
-		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
+		$object->shipping_method_id = GETPOSTINT('shipping_method_id');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
-		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+		$object->fk_incoterms = GETPOSTINT('incoterm_id');
 		$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 		$batch_line = array();
@@ -291,7 +291,7 @@ if (empty($reshook)) {
 					while (GETPOSTISSET($batch)) {
 						// save line of detail into sub_qty
 						$sub_qty[$j]['q'] = price2num(GETPOST($qty, 'alpha'), 'MS'); // the qty we want to move for this stock record
-						$sub_qty[$j]['id_batch'] = GETPOST($batch, 'int'); // the id into llx_product_batch of stock record to move
+						$sub_qty[$j]['id_batch'] = GETPOSTINT($batch); // the id into llx_product_batch of stock record to move
 						$subtotalqty += $sub_qty[$j]['q'];
 
 						//var_dump($qty);
@@ -312,7 +312,7 @@ if (empty($reshook)) {
 
 					$batch_line[$i]['detail'] = $sub_qty; // array of details
 					$batch_line[$i]['qty'] = $subtotalqty;
-					$batch_line[$i]['ix_l'] = GETPOST($idl, 'int');
+					$batch_line[$i]['ix_l'] = GETPOSTINT($idl);
 
 					$totalqty += $subtotalqty;
 				} else {
@@ -321,7 +321,7 @@ if (empty($reshook)) {
 						// We try to set an amount
 						// Case we don't use the list of available qty for each warehouse/lot
 						// GUI does not allow this yet
-						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse").' ('.$langs->trans("Line").' '.GETPOST($idl, 'int').')', null, 'errors');
+						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse").' ('.$langs->trans("Line").' '.GETPOSTINT($idl).')', null, 'errors');
 						$error++;
 					}
 				}
@@ -331,8 +331,8 @@ if (empty($reshook)) {
 				while (GETPOSTISSET($stockLocation)) {
 					// save sub line of warehouse
 					$stockLine[$i][$j]['qty'] = price2num(GETPOST($qty, 'alpha'), 'MS');
-					$stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
-					$stockLine[$i][$j]['ix_l'] = GETPOST($idl, 'int');
+					$stockLine[$i][$j]['warehouse_id'] = GETPOSTINT($stockLocation);
+					$stockLine[$i][$j]['ix_l'] = GETPOSTINT($idl);
 
 					$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 					$subtotalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
@@ -343,7 +343,7 @@ if (empty($reshook)) {
 				}
 			} else {
 				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty, 'int') > 0) {
+				if (GETPOSTINT($qty) > 0) {
 					$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 					$subtotalqty = price2num(GETPOST($qty, 'alpha'), 'MS');
 				}
@@ -387,10 +387,10 @@ if (empty($reshook)) {
 							}
 						}
 					} else {
-						if (GETPOST($qty, 'int') > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
+						if (GETPOSTINT($qty) > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
 							$ent = "entl".$i;
 							$idl = "idl".$i;
-							$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
+							$entrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : GETPOSTINT('entrepot_id');
 							if ($entrepot_id < 0) {
 								$entrepot_id = '';
 							}
@@ -398,7 +398,7 @@ if (empty($reshook)) {
 								$entrepot_id = 0;
 							}
 
-							$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), price2num(GETPOST($qty, 'alpha'), 'MS'), $array_options[$i]);
+							$ret = $object->addline($entrepot_id, GETPOSTINT($idl), price2num(GETPOSTINT($qty), 'MS'), $array_options[$i]);
 							if ($ret < 0) {
 								setEventMessages($object->error, $object->errors, 'errors');
 								$error++;
@@ -444,7 +444,7 @@ if (empty($reshook)) {
 			exit;
 		} else {
 			$db->rollback();
-			$_GET["commande_id"] = GETPOST('commande_id', 'int');
+			$_GET["commande_id"] = GETPOSTINT('commande_id');
 			$action = 'create';
 		}
 	} elseif ($action == 'create_delivery' && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer')) {
@@ -523,7 +523,7 @@ if (empty($reshook)) {
 		//	}
 		//}
 	} elseif ($action == 'setdate_livraison' && $user->hasRight('expedition', 'creer')) {
-		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		$object->fetch($id);
 		$result = $object->setDeliveryDate($user, $datedelivery);
@@ -546,24 +546,24 @@ if (empty($reshook)) {
 			$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
 		}
 		if ($action == 'settracking_url') {
-			$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+			$object->tracking_url = trim(GETPOSTINT('tracking_url'));
 		}
 		if ($action == 'settrueWeight') {
-			$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
-			$object->weight_units = GETPOST('weight_units', 'int');
+			$object->trueWeight = trim(GETPOSTINT('trueWeight'));
+			$object->weight_units = GETPOSTINT('weight_units');
 		}
 		if ($action == 'settrueWidth') {
-			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+			$object->trueWidth = trim(GETPOSTINT('trueWidth'));
 		}
 		if ($action == 'settrueHeight') {
-			$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
-			$object->size_units = GETPOST('size_units', 'int');
+			$object->trueHeight = trim(GETPOSTINT('trueHeight'));
+			$object->size_units = GETPOSTINT('size_units');
 		}
 		if ($action == 'settrueDepth') {
-			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+			$object->trueDepth = trim(GETPOSTINT('trueDepth'));
 		}
 		if ($action == 'setshipping_method_id') {
-			$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
+			$object->shipping_method_id = trim(GETPOSTINT('shipping_method_id'));
 		}
 
 		if (!$error) {
@@ -656,8 +656,8 @@ if (empty($reshook)) {
 						$lotStock = new Productbatch($db);
 						$batch = "batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
 						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
-						$batch_id = GETPOST($batch, 'int');
-						$batch_qty = GETPOST($qty, 'int');
+						$batch_id = GETPOSTINT($batch);
+						$batch_qty = GETPOSTINT($qty);
 						if (!empty($batch_id)) {
 							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0) {	// $line is ExpeditionLine
 								if ($lines[$i]->entrepot_id != 0) {
@@ -693,8 +693,8 @@ if (empty($reshook)) {
 					$lotStock = new Productbatch($db);
 					$batch = "batchl".$line_id."_0";
 					$qty = "qtyl".$line_id."_0";
-					$batch_id = GETPOST($batch, 'int');
-					$batch_qty = GETPOST($qty, 'int');
+					$batch_id = GETPOSTINT($batch);
+					$batch_qty = GETPOSTINT($qty);
 					$lineIdToAddLot = 0;
 					if ($batch_qty > 0 && !empty($batch_id)) {
 						if ($lotStock->fetch($batch_id) > 0) {
@@ -948,8 +948,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="action" value="add">';
 			print '<input type="hidden" name="origin" value="'.$origin.'">';
 			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-			if (GETPOST('entrepot_id', 'int')) {
-				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
+			if (GETPOSTINT('entrepot_id')) {
+				print '<input type="hidden" name="entrepot_id" value="'.GETPOSTINT('entrepot_id').'">';
 			}
 
 			print dol_get_fiche_head('');
@@ -990,7 +990,7 @@ if ($action == 'create') {
 
 			// Project
 			if (isModEnabled('project')) {
-				$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
+				$projectid = GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0;
 				if (empty($projectid) && !empty($object->fk_project)) {
 					$projectid = $object->fk_project;
 				}
@@ -1038,8 +1038,8 @@ if ($action == 'create') {
 			print $langs->trans("Weight");
 			print '</td><td colspan="3">';
 			print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
-			print '<input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
-			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
+			print '<input name="weight" size="4" value="'.GETPOSTINT('weight').'"> ';
+			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTINT('weight_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
@@ -1048,11 +1048,11 @@ if ($action == 'create') {
 			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
 			print ' </td><td colspan="3">';
 			print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
-			print '<input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
-			print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
-			print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
+			print '<input name="sizeW" size="4" value="'.GETPOSTINT('sizeW').'">';
+			print ' x <input name="sizeH" size="4" value="'.GETPOSTINT('sizeH').'">';
+			print ' x <input name="sizeS" size="4" value="'.GETPOSTINT('sizeS').'">';
 			print ' ';
-			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
+			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTINT('size_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
@@ -1062,7 +1062,7 @@ if ($action == 'create') {
 			print '<td colspan="3">';
 			$expe->fetch_delivery_methods();
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
-			print $form->selectarray("shipping_method_id", $expe->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
+			print $form->selectarray("shipping_method_id", $expe->meths, GETPOSTINT('shipping_method_id'), 1, 0, 0, "", 1);
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
@@ -1173,7 +1173,7 @@ if ($action == 'create') {
 				print "</tr>\n";
 			}
 
-			$warehouse_id = GETPOST('entrepot_id', 'int');
+			$warehouse_id = GETPOSTINT('entrepot_id');
 			$warehousePicking = array();
 			// get all warehouse children for picking
 			if ($warehouse_id > 0) {
@@ -1314,8 +1314,8 @@ if ($action == 'create') {
 							// Quantity to send
 							print '<td class="center">';
 							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
-								if (GETPOST('qtyl'.$indiceAsked, 'int')) {
-									$deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
+								if (GETPOSTINT('qtyl'.$indiceAsked)) {
+									$deliverableQty = GETPOSTINT('qtyl'.$indiceAsked);
 								}
 								print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl right" type="text" size="4" value="'.$deliverableQty.'">';
@@ -1336,7 +1336,7 @@ if ($action == 'create') {
 									// Show warehouse combo list
 									$ent = "entl".$indiceAsked;
 									$idl = "idl".$indiceAsked;
-									$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : $warehouse_id;
+									$tmpentrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : $warehouse_id;
 									if ($line->fk_product > 0) {
 										print '<!-- Show warehouse selection -->';
 
@@ -1525,7 +1525,7 @@ if ($action == 'create') {
 
 										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
-											$deliverableQty = GETPOST($inputName, 'int');
+											$deliverableQty = GETPOSTINT($inputName);
 										}
 
 										print '<input '.$tooltip.' class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
@@ -1639,7 +1639,7 @@ if ($action == 'create') {
 
 										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
-											$deliverableQty = GETPOST($inputName, 'int');
+											$deliverableQty = GETPOSTINT($inputName);
 										}
 
 										$tooltipClass = $tooltipTitle = '';
@@ -1693,7 +1693,7 @@ if ($action == 'create') {
 							}
 						}
 						if ($subj == 0) { // Line not shown yet, we show it
-							$warehouse_selected_id = GETPOST('entrepot_id', 'int');
+							$warehouse_selected_id = GETPOSTINT('entrepot_id');
 
 							print '<!-- line not shown yet, we show it -->';
 							print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 2feadc2cc73..86b3c547e5a 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -39,7 +39,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -85,7 +85,7 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if ($action == 'addcontact' && $user->hasRight('expedition', 'creer')) {
 		if ($result > 0 && $id > 0) {
-			$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 			$result    = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
@@ -105,10 +105,10 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'swapstatut' && $user->hasRight('expedition', 'creer')) {
 		// bascule du statut d'un contact
-		$result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int'));
+		$result = $objectsrc->swapContactStatus(GETPOSTINT('ligne'));
 	} elseif ($action == 'deletecontact' && $user->hasRight('expedition', 'creer')) {
 		// Efface un contact
-		$result = $objectsrc->delete_contact(GETPOST("lineid", 'int'));
+		$result = $objectsrc->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 72c74a3f357..2a72c02ead0 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -52,11 +52,11 @@ if (isModEnabled('productbatch')) {
 }
 
 	// Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $ref = GETPOST('ref');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 $action = GETPOST('action', 'aZ09');
-$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$fk_default_warehouse = GETPOSTINT('fk_default_warehouse');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -72,7 +72,7 @@ $hookmanager->initHooks(array('expeditiondispatch'));
 // Recuperation de l'id de projet
 $projectid = 0;
 if (GETPOSTISSET("projectid")) {
-	$projectid = GETPOST("projectid", 'int');
+	$projectid = GETPOSTINT("projectid");
 }
 
 $object = new Expedition($db);
@@ -156,8 +156,8 @@ if ($action == 'updatelines' && $usercancreate) {
 			$dDLC = '';
 			if ($modebatch == "batch") { //TODO: Make impossible to input non existing batch code
 				$lot = GETPOST('lot_number_'.$reg[1].'_'.$reg[2]);
-				$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'year', 'int'));
-				$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'year', 'int'));
+				$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'month'), GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'day'), GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'year'));
+				$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'month'), GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'day'), GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'year'));
 			}
 
 			$newqty = GETPOSTFLOAT($qty, 'MS');
@@ -288,7 +288,7 @@ if ($action == 'updatelines' && $usercancreate) {
 								$expeditionlinebatch->batch = $lot;
 								$expeditionlinebatch->qty = $newqty;
 								$expeditionlinebatch->fk_origin_stock = 0;
-								$expeditionlinebatch->fk_warehouse = GETPOST($ent, 'int');
+								$expeditionlinebatch->fk_warehouse = GETPOSTINT($ent);
 
 								$result = $expeditionlinebatch->create($idline);
 								if ($result < 0) {
@@ -353,7 +353,7 @@ if ($action == 'updatelines' && $usercancreate) {
 		exit;
 	}
 } elseif ($action == 'setdate_livraison' && $usercancreate) {
-	$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+	$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 	$object->fetch($id);
 	$result = $object->setDeliveryDate($user, $datedelivery);
@@ -888,7 +888,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 								// Qty to dispatch
 								print '<td class="right nowraponall">';
 								print '<a href="" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-								$suggestedvalue = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : $objd->qty);
+								$suggestedvalue = (GETPOSTISSET('qty'.$suffix) ? GETPOSTINT('qty'.$suffix) : $objd->qty);
 								//var_dump($suggestedvalue);exit;
 								print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-type="'.$type.'" data-index="'.$i.'" class="width50 right qtydispatchinput" value="'.$suggestedvalue.'" data-expected="'.$objd->qty.'">';
 								print '</td>';
@@ -1034,11 +1034,11 @@ if ($object->id > 0 || !empty($object->ref)) {
 							// Qty to dispatch
 							print '<td class="right">';
 							print '<a href="" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0));
+							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOSTINT('qty'.$suffix) : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0));
 							if (count($products_dispatched)) {
 								// There is already existing lines into llx_expeditiondet, this means a plan for the shipment has already been started.
 								// In such a case, we do not suggest new values, we suggest the value known.
-								$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (isset($products_dispatched[$objp->rowid]) ? $products_dispatched[$objp->rowid] : ''));
+								$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOSTINT('qty'.$suffix) : (isset($products_dispatched[$objp->rowid]) ? $products_dispatched[$objp->rowid] : ''));
 							}
 							print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-index="'.$i.'" data-type="text" class="width50 right qtydispatchinput" value="'.$amounttosuggest.'" data-expected="'.$amounttosuggest.'">';
 							print '</td>';
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index fdc58396d3d..50cbd1f0380 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -43,14 +43,14 @@ $langs->loadLangs(array('companies', 'other'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 8d8682be3fe..e8adbfe755d 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 $hookmanager = new HookManager($db);
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('sendingindex'));
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 79b3db94e5a..b1d33238f15 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -42,11 +42,11 @@ $langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills', 'product
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $toselect   = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'alpha');
@@ -60,23 +60,23 @@ $search_tracking = GETPOST("search_tracking", 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
-$search_country = GETPOST("search_country", 'int');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_billed = GETPOST("search_billed", 'int');
-$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));
-$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
-$search_datereceipt_start = dol_mktime(0, 0, 0, GETPOST('search_datereceipt_startmonth', 'int'), GETPOST('search_datereceipt_startday', 'int'), GETPOST('search_datereceipt_startyear', 'int'));
-$search_datereceipt_end = dol_mktime(23, 59, 59, GETPOST('search_datereceipt_endmonth', 'int'), GETPOST('search_datereceipt_endday', 'int'), GETPOST('search_datereceipt_endyear', 'int'));
+$search_country = GETPOSTINT("search_country");
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_billed = GETPOSTINT("search_billed");
+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery_startmonth'), GETPOSTINT('search_datedelivery_startday'), GETPOSTINT('search_datedelivery_startyear'));
+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_endmonth'), GETPOSTINT('search_datedelivery_endday'), GETPOSTINT('search_datedelivery_endyear'));
+$search_datereceipt_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datereceipt_startmonth'), GETPOSTINT('search_datereceipt_startday'), GETPOSTINT('search_datereceipt_startyear'));
+$search_datereceipt_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datereceipt_endmonth'), GETPOSTINT('search_datereceipt_endday'), GETPOSTINT('search_datereceipt_endyear'));
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
+$search_categ_cus = GETPOSTINT("search_categ_cus");
+$search_product_category = GETPOSTINT('search_product_category');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortfield) {
 	$sortfield = "e.ref";
 }
@@ -147,7 +147,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
-$expeditionid = GETPOST('id', 'int');
+$expeditionid = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index b2e6db874ba..bec93d8c8dc 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -36,7 +36,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('sendings', 'companies', 'bills', 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 1ff81cbe7d0..7a3347098ab 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -51,7 +51,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies', 'bills', 'propal', 'deliveries', 'stocks', 'productbatch', 'incoterm', 'other'));
 
-$id     = GETPOST('id', 'int'); // id of order
+$id     = GETPOSTINT('id'); // id of order
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -98,7 +98,7 @@ if (empty($reshook)) {
 	// Categorisation dans projet
 	if ($action == 'classin') {
 		$object->fetch($id);
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes') {
@@ -113,7 +113,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setdatedelivery' && $user->hasRight('commande', 'creer')) {
-		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		$object->fetch($id);
 		$result = $object->setDeliveryDate($user, $datedelivery);
@@ -133,7 +133,7 @@ if (empty($reshook)) {
 	*/
 	if ($action == 'setmode' && $user->hasRight('commande', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -157,13 +157,13 @@ if (empty($reshook)) {
 
 	if ($action == 'setconditions' && $user->hasRight('commande', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'set_incoterms' && isModEnabled('incoterm')) {
 		// Set incoterm
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -172,7 +172,7 @@ if (empty($reshook)) {
 	// shipping method
 	if ($action == 'setshippingmethod' && $user->hasRight('commande', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		$result = $object->setShippingMethod(GETPOSTINT('shipping_method_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -181,7 +181,7 @@ if (empty($reshook)) {
 	// warehouse
 	if ($action == 'setwarehouse' && $user->hasRight('commande', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
+		$result = $object->setWarehouse(GETPOSTINT('warehouse_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 7c0bbb5a317..b5309a134c7 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 398bc381715..79c35a70b9d 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
-$year = GETPOST('year', 'int');
+$year = GETPOSTINT('year');
 
 // Security check
 if ($user->socid) {
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index 7009fa41a69..ab49866a049 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -46,10 +46,10 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php'
 // Load translation files required by the page
 $langs->loadlangs(array('errors', 'trips'));
 
-$fk_expense = GETPOST('fk_expense', 'int');
-$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
-$vatrate = GETPOST('vatrate', 'int');
-$qty = GETPOST('qty', 'int');
+$fk_expense = GETPOSTINT('fk_expense');
+$fk_c_exp_tax_cat = GETPOSTINT('fk_c_exp_tax_cat');
+$vatrate = GETPOSTINT('vatrate');
+$qty = GETPOSTINT('qty');
 
 // Security check
 $result = restrictedArea($user, 'expensereport', $fk_expense, 'expensereport');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1b4a82db1b4..b8bae69f698 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -57,16 +57,16 @@ $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$id = GETPOST('id', 'int');
-$date_start = dol_mktime(0, 0, 0, GETPOST('date_debutmonth', 'int'), GETPOST('date_debutday', 'int'), GETPOST('date_debutyear', 'int'));
-$date_end = dol_mktime(0, 0, 0, GETPOST('date_finmonth', 'int'), GETPOST('date_finday', 'int'), GETPOST('date_finyear', 'int'));
-$date = dol_mktime(0, 0, 0, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
-$fk_project = GETPOST('fk_project', 'int');
+$id = GETPOSTINT('id');
+$date_start = dol_mktime(0, 0, 0, GETPOSTINT('date_debutmonth'), GETPOSTINT('date_debutday'), GETPOSTINT('date_debutyear'));
+$date_end = dol_mktime(0, 0, 0, GETPOSTINT('date_finmonth'), GETPOSTINT('date_finday'), GETPOSTINT('date_finyear'));
+$date = dol_mktime(0, 0, 0, GETPOSTINT('datemonth'), GETPOSTINT('dateday'), GETPOSTINT('dateyear'));
+$fk_project = GETPOSTINT('fk_project');
 $vatrate = GETPOST('vatrate', 'alpha');
 $ref = GETPOST("ref", 'alpha');
 $comments = GETPOST('comments', 'restricthtml');
-$fk_c_type_fees = GETPOST('fk_c_type_fees', 'int');
-$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('socid_id', 'int');
+$fk_c_type_fees = GETPOSTINT('fk_c_type_fees');
+$socid = GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('socid_id');
 
 $childids = $user->getAllChildIds(1);
 
@@ -96,9 +96,9 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 $object = new ExpenseReport($db);
@@ -226,7 +226,7 @@ if (empty($reshook)) {
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
 				$orig = clone $object;
 
-				$result = $object->createFromClone($user, GETPOST('fk_user_author', 'int'));
+				$result = $object->createFromClone($user, GETPOSTINT('fk_user_author'));
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
@@ -283,7 +283,7 @@ if (empty($reshook)) {
 		$fuser->fetch($object->fk_user_author);
 
 		$object->status = 1;
-		$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
+		$object->fk_c_paiement = GETPOSTINT('fk_c_paiement');
 		$object->fk_user_validator = GETPOSTINT('fk_user_validator');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
@@ -336,14 +336,14 @@ if (empty($reshook)) {
 			$object->fk_user_validator = GETPOSTINT('fk_user_validator');
 		}
 
-		$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
+		$object->fk_c_paiement = GETPOSTINT('fk_c_paiement');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->fk_user_modif = $user->id;
 
 		$result = $object->update($user);
 		if ($result > 0) {
-			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOSTINT('id'));
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -1143,7 +1143,7 @@ if (empty($reshook)) {
 			$value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
 		}
 
-		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
+		$fk_c_exp_tax_cat = GETPOSTINT('fk_c_exp_tax_cat');
 
 		$qty = price2num(GETPOST('qty', 'alpha'));
 		if (empty($qty)) {
@@ -1231,7 +1231,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOSTINT('id'));
 			exit;
 		} else {
 			$action = '';
@@ -1243,11 +1243,11 @@ if (empty($reshook)) {
 		$object->fetch($id);
 
 		$object_ligne = new ExpenseReportLine($db);
-		$object_ligne->fetch(GETPOST("rowid", 'int'));
+		$object_ligne->fetch(GETPOSTINT("rowid"));
 		$total_ht = $object_ligne->total_ht;
 		$total_tva = $object_ligne->total_tva;
 
-		$result = $object->deleteLine(GETPOST("rowid", 'int'), $user);
+		$result = $object->deleteLine(GETPOSTINT("rowid"), $user);
 		if ($result >= 0) {
 			if ($result > 0) {
 				// Define output language
@@ -1271,7 +1271,7 @@ if (empty($reshook)) {
 				}
 			}
 
-			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOSTINT('id'));
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -1295,9 +1295,9 @@ if (empty($reshook)) {
 			}
 		}
 
-		$rowid = GETPOST('rowid', 'int');
-		$type_fees_id = GETPOST('fk_c_type_fees', 'int');
-		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
+		$rowid = GETPOSTINT('rowid');
+		$type_fees_id = GETPOSTINT('fk_c_type_fees');
+		$fk_c_exp_tax_cat = GETPOSTINT('fk_c_exp_tax_cat');
 		$projet_id = $fk_project;
 		$comments = GETPOST('comments', 'restricthtml');
 		$qty = price2num(GETPOST('qty', 'alpha'));
@@ -1315,7 +1315,7 @@ if (empty($reshook)) {
 			$value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
 		}
 
-		if (!GETPOST('fk_c_type_fees', 'int') > 0) {
+		if (!GETPOSTINT('fk_c_type_fees') > 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$action = '';
@@ -1448,8 +1448,8 @@ if ($action == 'create') {
 	print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
 	print '<td>';
 	$defaultselectuser = $user->id;
-	if (GETPOST('fk_user_author', 'int') > 0) {
-		$defaultselectuser = GETPOST('fk_user_author', 'int');
+	if (GETPOSTINT('fk_user_author') > 0) {
+		$defaultselectuser = GETPOSTINT('fk_user_author');
 	}
 	$include_users = 'hierarchyme';
 	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expensereport', 'writeall_advance')) {
@@ -1473,8 +1473,8 @@ if ($action == 'create') {
 		if (getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR')) {
 			$defaultselectuser = getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR'); // Can force default approver
 		}
-		if (GETPOST('fk_user_validator', 'int') > 0) {
-			$defaultselectuser = GETPOST('fk_user_validator', 'int');
+		if (GETPOSTINT('fk_user_validator') > 0) {
+			$defaultselectuser = GETPOSTINT('fk_user_validator');
 		}
 		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || !getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE')) ? 0 : 1), $include_users);
 		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
@@ -1666,7 +1666,7 @@ if ($action == 'create') {
 				}
 				$formquestion = array(
 					'text' => '',
-					array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
+					array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOSTINT('fk_user_author') > 0 ? GETPOSTINT('fk_user_author') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
 				);
 				// Paiement incomplet. On demande si motif = escompte ou autre
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -1707,7 +1707,7 @@ if ($action == 'create') {
 			}
 
 			if ($action == 'delete_line') {
-				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid', 'int'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOSTINT('rowid'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
 			}
 
 			// Print form confirm
@@ -2090,7 +2090,7 @@ if ($action == 'create') {
 				foreach ($object->lines as &$line) {
 					$numline = $i + 1;
 
-					if ($action != 'editline' || $line->id != GETPOST('rowid', 'int')) {
+					if ($action != 'editline' || $line->id != GETPOSTINT('rowid')) {
 						print '<tr class="oddeven linetr" data-id="'.$line->id.'">';
 
 						// Num
@@ -2260,7 +2260,7 @@ if ($action == 'create') {
 						print '</tr>';
 					}
 
-					if ($action == 'editline' && $line->id == GETPOST('rowid', 'int')) {
+					if ($action == 'editline' && $line->id == GETPOSTINT('rowid')) {
 						// Add line with link to add new file or attach line to an existing file
 						$colspan = 11;
 						if (isModEnabled('project')) {
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index d801b93b484..ea22fc857c0 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("other", "trips", "companies", "interventions"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -46,10 +46,10 @@ $confirm = GETPOST('confirm', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 583773f6ffc..d92721f6eb2 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -42,16 +42,16 @@ $hookmanager->initHooks(array('expensereportindex'));
 $langs->loadLangs(array('companies', 'users', 'trips'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'expensereport', '', '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -64,7 +64,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.date_create";
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index f25781295a5..f4d82dc68e6 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->load("trips");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $childids = $user->getAllChildIds(1);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8307ee464e5..06fb2d4e9ac 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -45,7 +45,7 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
 
 $action      = GETPOST('action', 'aZ09');
 $massaction  = GETPOST('massaction', 'alpha');
-$show_files  = GETPOST('show_files', 'int');
+$show_files  = GETPOSTINT('show_files');
 $confirm     = GETPOST('confirm', 'alpha');
 $cancel      = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect    = GETPOST('toselect', 'array');
@@ -55,12 +55,12 @@ $mode        = GETPOST('mode', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'expensereport', '', '');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 // If we are on the view of a specific user
 if ($id > 0) {
 	$canread = 0;
@@ -82,10 +82,10 @@ $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -103,27 +103,27 @@ if (!$sortfield) {
 $sall			= trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 $search_ref			= GETPOST('search_ref', 'alpha');
-$search_user		= GETPOST('search_user', 'int');
+$search_user		= GETPOSTINT('search_user');
 $search_amount_ht	= GETPOST('search_amount_ht', 'alpha');
 $search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
 $search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
 $search_status		= (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 
-$search_date_startday		= GETPOST('search_date_startday', 'int');
-$search_date_startmonth		= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear		= GETPOST('search_date_startyear', 'int');
-$search_date_startendday	= GETPOST('search_date_startendday', 'int');
-$search_date_startendmonth	= GETPOST('search_date_startendmonth', 'int');
-$search_date_startendyear	= GETPOST('search_date_startendyear', 'int');
+$search_date_startday		= GETPOSTINT('search_date_startday');
+$search_date_startmonth		= GETPOSTINT('search_date_startmonth');
+$search_date_startyear		= GETPOSTINT('search_date_startyear');
+$search_date_startendday	= GETPOSTINT('search_date_startendday');
+$search_date_startendmonth	= GETPOSTINT('search_date_startendmonth');
+$search_date_startendyear	= GETPOSTINT('search_date_startendyear');
 $search_date_start			= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_startend		= dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear);
 
-$search_date_endday			= GETPOST('search_date_endday', 'int');
-$search_date_endmonth		= GETPOST('search_date_endmonth', 'int');
-$search_date_endyear		= GETPOST('search_date_endyear', 'int');
-$search_date_endendday		= GETPOST('search_date_endendday', 'int');
-$search_date_endendmonth	= GETPOST('search_date_endendmonth', 'int');
-$search_date_endendyear		= GETPOST('search_date_endendyear', 'int');
+$search_date_endday			= GETPOSTINT('search_date_endday');
+$search_date_endmonth		= GETPOSTINT('search_date_endmonth');
+$search_date_endyear		= GETPOSTINT('search_date_endyear');
+$search_date_endendday		= GETPOSTINT('search_date_endendday');
+$search_date_endendmonth	= GETPOSTINT('search_date_endendmonth');
+$search_date_endendyear		= GETPOSTINT('search_date_endendyear');
 $search_date_end			= dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);	// Use tzserver
 $search_date_endend			= dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
 
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index b13291998df..157403f4873 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('trips', 'companies', 'bills', 'orders'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 $childids = $user->getAllChildIds(1);
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index ef07a4f3ef4..caccb13d9d6 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -34,7 +34,7 @@ if (isModEnabled("banque")) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies', 'trips'));
 
-$id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 604d16a13e9..1f98dcc2d3d 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -50,7 +50,7 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
 $mode = GETPOST('mode', 'alpha');
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // Security check
 if ($user->socid) {
@@ -58,24 +58,24 @@ if ($user->socid) {
 }
 
 $search_ref				= GETPOST('search_ref', 'alpha');
-$search_date_startday	= GETPOST('search_date_startday', 'int');
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
-$search_date_endday		= GETPOST('search_date_endday', 'int');
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
-$search_date_endyear	= GETPOST('search_date_endyear', 'int');
+$search_date_startday	= GETPOSTINT('search_date_startday');
+$search_date_startmonth	= GETPOSTINT('search_date_startmonth');
+$search_date_startyear	= GETPOSTINT('search_date_startyear');
+$search_date_endday		= GETPOSTINT('search_date_endday');
+$search_date_endmonth	= GETPOSTINT('search_date_endmonth');
+$search_date_endyear	= GETPOSTINT('search_date_endyear');
 $search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_user			= GETPOST('search_user', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
 $search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
-$search_bank_account	= GETPOST('search_bank_account', 'int');
+$search_bank_account	= GETPOSTINT('search_bank_account');
 $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;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
 $sortorder				= GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
 
 if (empty($page) || $page == -1) {
 	$page = 0; // If $page is not defined, or '' or -1
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 9e1907d05e5..ce82f3d72a5 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -67,9 +67,9 @@ if ($action == 'add_payment') {
 		setEventMessages($expensereport->error, $expensereport->errors, 'errors');
 	}
 
-	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaid = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 
-	if (!(GETPOST("fk_typepayment", 'int') > 0)) {
+	if (!(GETPOSTINT("fk_typepayment") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 	}
@@ -236,7 +236,7 @@ if ($action == 'create' || empty($action)) {
 	print '<table class="border centpercent">'."\n";
 
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
-	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaid = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepayment = ($datepaid == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datepaid);
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1);
 	print "</td>";
@@ -252,7 +252,7 @@ if ($action == 'create' || empty($action)) {
 		print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 		print '<td colspan="2">';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : 0, "accountid", 0, '', 2); // Show open bank account list
+		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOSTINT("accountid") : 0, "accountid", 0, '', 2); // Show open bank account list
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 8add43345bb..cb943150e9b 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -38,11 +38,11 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
 $object_status = GETPOST('object_status', 'intcomma');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid'); if ($socid < 0) {
 	$socid = 0;
 }
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
 if ($user->socid > 0) {
@@ -55,7 +55,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'expensereport', $id, '');
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 39a32af553a..a6c3687c9c5 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -135,10 +135,10 @@ $array_filtervalue = isset($_SESSION["export_filtered_fields"]) ? $_SESSION["exp
 $datatoexport = GETPOST("datatoexport", "aZ09");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$step = GETPOST("step", "int") ? GETPOST("step", "int") : 1;
+$step = GETPOSTINT("step") ? GETPOSTINT("step") : 1;
 $export_name = GETPOST("export_name", "alphanohtml");
 $hexa = GETPOST("hexa", "alpha");
-$exportmodelid = GETPOST("exportmodelid", "int");
+$exportmodelid = GETPOSTINT("exportmodelid");
 $field = GETPOST("field", "alpha");
 
 $objexport = new Export($db);
@@ -303,8 +303,8 @@ if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes') {
 }
 
 if ($action == 'deleteprof') {
-	if (GETPOST("id", 'int')) {
-		$objexport->fetch(GETPOST('id', 'int'));
+	if (GETPOSTINT("id")) {
+		$objexport->fetch(GETPOSTINT('id'));
 		$result = $objexport->delete($user);
 	}
 }
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 97bfcaa108f..507cb9fbae3 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -35,7 +35,7 @@ $langs->load("other");
 
 $mainmenu = GETPOST('mainmenu', "aZ09");
 $leftmenu = GETPOST('leftmenu', "aZ09");
-$idmenu = GETPOST('idmenu', 'int');
+$idmenu = GETPOSTINT('idmenu');
 $theme = GETPOST('theme', 'aZ09');
 $codelang = GETPOST('lang', 'aZ09');
 $keyforcontent = GETPOST('keyforcontent', 'aZ09');
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
index 3b040c29526..9f49c3af6d2 100644
--- a/htdocs/fichinter/agenda.php
+++ b/htdocs/fichinter/agenda.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array("fichinter", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -51,10 +51,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index c832ca2b2ba..1ac2095ad1f 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -52,13 +52,13 @@ if (isModEnabled('contrat')) {
 $langs->loadLangs(array("interventions", "admin", "compta", "bills"));
 
 // Security check
-$id = (GETPOST('fichinterid', 'int') ? GETPOST('fichinterid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('fichinterid') ? GETPOSTINT('fichinterid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 $date_next_execution = GETPOST('date_next_execution', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -69,10 +69,10 @@ if ($action == "create" || $action == "add") {
 $result = restrictedArea($user, 'ficheinter', $id, $objecttype);
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -148,7 +148,7 @@ if ($action == 'add') {
 	$reday = GETPOST('reday');
 	$rehour = GETPOST('rehour');
 	$remin = GETPOST('remin');
-	$nb_gen_max = (GETPOST('nb_gen_max', 'int') ? GETPOST('nb_gen_max', 'int') : 0);
+	$nb_gen_max = (GETPOSTINT('nb_gen_max') ? GETPOSTINT('nb_gen_max') : 0);
 	if (GETPOST('frequency')) {
 		if (empty($reyear) || empty($remonth) || empty($reday)) {
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
@@ -242,7 +242,7 @@ if ($action == 'add') {
 } elseif ($action == 'setfrequency' && $user->hasRight('ficheinter', 'creer')) {
 	// Set frequency and unit frequency
 	$object->fetch($id);
-	$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+	$object->setFrequencyAndUnit(GETPOSTINT('frequency'), GETPOSTINT('unit_frequency'));
 } elseif ($action == 'setdate_when' && $user->hasRight('ficheinter', 'creer')) {
 	// Set next date of execution
 	$object->fetch($id);
@@ -253,7 +253,7 @@ if ($action == 'add') {
 } elseif ($action == 'setnb_gen_max' && $user->hasRight('ficheinter', 'creer')) {
 	// Set max period
 	$object->fetch($id);
-	$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+	$object->setMaxPeriod(GETPOSTINT('nb_gen_max'));
 }
 
 
@@ -377,7 +377,7 @@ if ($action == 'create') {
 		print '<tr><td class="titlefieldcreate">';
 		print $form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'));
 		print "</td><td>";
-		print '<input type="text" name="frequency" value="'.GETPOST('frequency', 'int').'" size="4">&nbsp;';
+		print '<input type="text" name="frequency" value="'.GETPOSTINT('frequency').'" size="4">&nbsp;';
 		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
@@ -391,7 +391,7 @@ if ($action == 'create') {
 
 		// Number max of generation
 		print "<tr><td>".$langs->trans("MaxPeriodNumber")."</td><td>";
-		print '<input type="text" name="nb_gen_max" value="'.GETPOST('nb_gen_max', 'int').'" size="5">';
+		print '<input type="text" name="nb_gen_max" value="'.GETPOSTINT('nb_gen_max').'" size="5">';
 		print "</td></tr>";
 
 		print "</table>";
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 0252f22f91a..91926349cd9 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -56,11 +56,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'interventions', 'stocks'));
 
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 $ref_client	= GETPOST('ref_client', 'alpha');
-$socid = (int) GETPOST('socid', 'int');
-$contratid = (int) GETPOST('contratid', 'int');
+$socid = GETPOSTINT('socid');
+$contratid = GETPOSTINT('contratid');
 $action		= GETPOST('action', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
@@ -71,14 +71,14 @@ $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id')); // For backward compatibility
 $note_public = GETPOST('note_public', 'restricthtml');
 $note_private = GETPOST('note_private', 'restricthtml');
-$lineid = GETPOST('line_id', 'int');
+$lineid = GETPOSTINT('line_id');
 
 $error = 0;
 
 //PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('interventioncard', 'globalcard'));
@@ -253,9 +253,9 @@ if (empty($reshook)) {
 	} elseif ($action == 'add' && $user->hasRight('ficheinter', 'creer')) {
 		$selectedLines = GETPOST('toselect', 'array');
 		$object->socid = $socid;
-		$object->duration = (int) GETPOST('duration', 'int');
-		$object->fk_project = (int) GETPOST('projectid', 'int');
-		$object->fk_contrat = (int) GETPOST('contratid', 'int');
+		$object->duration = GETPOSTINT('duration');
+		$object->fk_project = GETPOSTINT('projectid');
+		$object->fk_contrat = GETPOSTINT('contratid');
 		$object->author = $user->id;
 		$object->description = GETPOST('description', 'restricthtml');
 		$object->ref = $ref;
@@ -472,8 +472,8 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'update' && $user->hasRight('ficheinter', 'creer')) {
 		$object->socid = $socid;
-		$object->fk_project = (int) GETPOST('projectid', 'int');
-		$object->fk_contrat = (int) GETPOST('contratid', 'int');
+		$object->fk_project = GETPOSTINT('projectid');
+		$object->fk_contrat = GETPOSTINT('contratid');
 		$object->author = $user->id;
 		$object->description = GETPOST('description', 'restricthtml');
 		$object->ref = $ref;
@@ -485,13 +485,13 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'classin' && $user->hasRight('ficheinter', 'creer')) {
 		// Set into a project
-		$result = $object->setProject(GETPOST('projectid', 'int'));
+		$result = $object->setProject(GETPOSTINT('projectid'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
 	} elseif ($action == 'setcontract' && $user->hasRight('contrat', 'creer')) {
 		// Set into a contract
-		$result = $object->set_contrat($user, GETPOST('contratid', 'int'));
+		$result = $object->set_contrat($user, GETPOSTINT('contratid'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -520,11 +520,11 @@ if (empty($reshook)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description"));
 			$error++;
 		}
-		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) {
+		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && !GETPOSTINT('durationhour') && !GETPOSTINT('durationmin')) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration"));
 			$error++;
 		}
-		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0) {
+		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && GETPOSTINT('durationhour') >= 24 && GETPOSTINT('durationmin') > 0) {
 			$mesg = $langs->trans("ErrorValueTooHigh");
 			$error++;
 		}
@@ -532,8 +532,8 @@ if (empty($reshook)) {
 			$db->begin();
 
 			$desc = GETPOST('np_desc', 'restricthtml');
-			$date_intervention = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-			$duration = !getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
+			$date_intervention = dol_mktime(GETPOSTINT('dihour'), GETPOSTINT('dimin'), 0, GETPOSTINT('dimonth'), GETPOSTINT('diday'), GETPOSTINT('diyear'));
+			$duration = !getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? convertTime2Seconds(GETPOSTINT('durationhour'), GETPOSTINT('durationmin')) : 0;
 
 			// Extrafields
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -617,8 +617,8 @@ if (empty($reshook)) {
 		$object->fetch_thirdparty();
 
 		$desc = GETPOST('np_desc', 'restricthtml');
-		$date_inter = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-		$duration = convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int'));
+		$date_inter = dol_mktime(GETPOSTINT('dihour'), GETPOSTINT('dimin'), 0, GETPOSTINT('dimonth'), GETPOSTINT('diday'), GETPOSTINT('diyear'));
+		$duration = convertTime2Seconds(GETPOSTINT('durationhour'), GETPOSTINT('durationmin'));
 
 		$objectline->date = $date_inter;
 		$objectline->desc = $desc;
@@ -773,7 +773,7 @@ if (empty($reshook)) {
 	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $user->hasRight('ficheinter', 'creer')) {
 		if ($action == 'addcontact') {
 			if ($result > 0 && $id > 0) {
-				$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+				$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
@@ -791,10 +791,10 @@ if (empty($reshook)) {
 			}
 		} elseif ($action == 'swapstatut') {
 			// bascule du statut d'un contact
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} elseif ($action == 'deletecontact') {
 			// Efface un contact
-			$result = $object->delete_contact(GETPOST('lineid', 'int'));
+			$result = $object->delete_contact(GETPOSTINT('lineid'));
 
 			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -842,7 +842,7 @@ if ($action == 'create') {
 		$res = $soc->fetch($socid);
 	}
 
-	if (GETPOST('origin', 'alphanohtml') && GETPOST('originid', 'int')) {
+	if (GETPOSTINT('origin') && GETPOSTINT('originid')) {
 		// Parse element/subelement (ex: project_task)
 		$regs = array();
 		$element = $subelement = GETPOST('origin', 'alphanohtml');
@@ -852,7 +852,7 @@ if ($action == 'create') {
 		}
 
 		if ($element == 'project') {
-			$projectid = GETPOST('originid', 'int');
+			$projectid = GETPOSTINT('originid');
 		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
@@ -892,7 +892,7 @@ if ($action == 'create') {
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
 	} else {
-		$projectid = GETPOST('projectid', 'int');
+		$projectid = GETPOSTINT('projectid');
 	}
 
 	if (!$conf->global->FICHEINTER_ADDON) {
@@ -962,7 +962,7 @@ if ($action == 'create') {
 		if (isModEnabled('contrat')) {
 			$langs->load("contracts");
 			print '<tr><td>'.$langs->trans("Contract").'</td><td>';
-			$numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1, 1);
+			$numcontrat = $formcontract->select_contract($soc->id, GETPOSTINT('contratid'), 'contratid', 0, 1, 1);
 			if ($numcontrat == 0) {
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddContract").'"></span></a>';
 			}
@@ -1179,7 +1179,7 @@ if ($action == 'create') {
 							// 1),
 							// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
 							// => 1),
-							array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '', '', 0, 0, null, 0, 'minwidth200')));
+							array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', '', '', 0, 0, null, 0, 'minwidth200')));
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneIntervention', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
@@ -1350,7 +1350,7 @@ if ($action == 'create') {
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		if ($action == 'editline') {
 			print '<input type="hidden" name="action" value="updateline">';
-			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id', 'int').'">';
+			print '<input type="hidden" name="line_id" value="'.GETPOSTINT('line_id').'">';
 		} else {
 			print '<input type="hidden" name="action" value="addline">';
 		}
@@ -1392,7 +1392,7 @@ if ($action == 'create') {
 				$objp = $db->fetch_object($resql);
 
 				// Ligne en mode visu
-				if ($action != 'editline' || GETPOST('line_id', 'int') != $objp->rowid) {
+				if ($action != 'editline' || GETPOSTINT('line_id') != $objp->rowid) {
 					print '<tr class="oddeven">';
 
 					// No.
@@ -1460,7 +1460,7 @@ if ($action == 'create') {
 				}
 
 				// Line in update mode
-				if ($object->statut == 0 && $action == 'editline' && $user->hasRight('ficheinter', 'creer') && GETPOST('line_id', 'int') == $objp->rowid) {
+				if ($object->statut == 0 && $action == 'editline' && $user->hasRight('ficheinter', 'creer') && GETPOSTINT('line_id') == $objp->rowid) {
 					print '<tr class="oddeven nohover">';
 
 					// No.
@@ -1579,14 +1579,14 @@ if ($action == 'create') {
 				print '<td class="center nowrap">';
 				$now = dol_now();
 				$timearray = dol_getdate($now);
-				if (!GETPOST('diday', 'int')) {
+				if (!GETPOSTINT('diday')) {
 					if (getDolGlobalInt('FICHINTER_DATE_WITHOUT_HOUR')) {
 						$timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
 					} else {
 						$timewithnohour = dol_mktime($timearray['hours'], $timearray['minutes'], 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
 					}
 				} else {
-					$timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
+					$timewithnohour = dol_mktime(GETPOSTINT('dihour'), GETPOSTINT('dimin'), 0, GETPOSTINT('dimonth'), GETPOSTINT('diday'), GETPOSTINT('diyear'));
 				}
 				if (getDolGlobalInt('FICHINTER_DATE_WITHOUT_HOUR')) {
 					print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
@@ -1602,7 +1602,7 @@ if ($action == 'create') {
 					if (getDolGlobalString('INTERVENTION_ADDLINE_FREEDUREATION')) {
 						$selectmode = 'text';
 					}
-					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOSTINT('durationhour') + 60 * GETPOSTINT('durationmin')), 0, $selectmode);
+					$form->select_duration('duration', (!GETPOSTINT('durationhour') && !GETPOSTINT('durationmin')) ? 3600 : (60 * 60 * GETPOSTINT('durationhour') + 60 * GETPOSTINT('durationmin')), 0, $selectmode);
 				}
 				print '</td>';
 
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 2763783e4a0..f22385e695b 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('interventions', 'sendings', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -61,7 +61,7 @@ $usercancreate = $user->hasRight('ficheinter', 'creer');
 
 if ($action == 'addcontact' && $user->hasRight('ficheinter', 'creer')) {
 	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
@@ -81,10 +81,10 @@ if ($action == 'addcontact' && $user->hasRight('ficheinter', 'creer')) {
 	}
 } elseif ($action == 'swapstatut' && $user->hasRight('ficheinter', 'creer')) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $user->hasRight('ficheinter', 'creer')) {
 	// Deletes a contact
-	$result = $object->delete_contact(GETPOST('lineid', 'int'));
+	$result = $object->delete_contact(GETPOSTINT('lineid'));
 
 	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index c6b12144a5b..11e719a8b42 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -42,7 +42,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'fichinter', 'companies', 'interventions'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -55,10 +55,10 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index fc2e2c16ca7..05d125f0d0a 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -44,7 +44,7 @@ $hookmanager->initHooks(array('interventionindex'));
 $langs->load("interventions");
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 535b9c47913..64da4f12882 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -54,7 +54,7 @@ if (isModEnabled('contrat')) {
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'interventionlist';
@@ -77,15 +77,15 @@ $search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $optioncss = GETPOST('optioncss', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -151,7 +151,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -493,7 +493,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 845294ce56a..1bae3398b59 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -35,7 +35,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'interventions'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 6cb69cf99f6..2c90bef86d4 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -35,8 +35,8 @@ if (!$user->hasRight('ficheinter', 'lire')) {
 	accessforbidden();
 }
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
@@ -44,7 +44,7 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 2b4b10f6486..e5e1ba5d28a 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -39,7 +39,7 @@ if (!defined('NOREQUIRESOC')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 
-$idprod = GETPOST('idprod', 'int');
+$idprod = GETPOSTINT('idprod');
 
 $prices = array();
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 98810335643..818b1e5c0cd 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -61,7 +61,7 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 // Security check
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 if ($user->socid) {
 	$id = $user->socid;
 }
@@ -123,7 +123,7 @@ if (empty($reshook)) {
 	// Set payment terms of the settlement
 	if ($action == 'setconditions' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_supplier_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_supplier_id'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -131,7 +131,7 @@ if (empty($reshook)) {
 	// Payment mode
 	if ($action == 'setmode' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_supplier_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_supplier_id'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -140,7 +140,7 @@ if (empty($reshook)) {
 	// Bank account
 	if ($action == 'setbankaccount' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 5216aa24d81..cab15d4f618 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -425,12 +425,12 @@ class FactureFournisseur extends CommonInvoice
 			// Fields coming from GUI
 			// @TODO Value of template should be used as default value on the form on the GUI, and we should here always use the value from GUI
 			// set by posted page with $object->xxx = ... and this section should be removed.
-			$this->fk_project = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
+			$this->fk_project = GETPOSTINT('projectid') > 0 ? (GETPOSTINT('projectid')) : $_facrec->fk_project;
 			$this->note_public = GETPOST('note_public', 'restricthtml') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
 			$this->note_private = GETPOST('note_private', 'restricthtml') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
 			$this->model_pdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
-			$this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
-			$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
+			$this->cond_reglement_id = GETPOSTINT('cond_reglement_id') > 0 ? (GETPOSTINT('cond_reglement_id')) : $_facrec->cond_reglement_id;
+			$this->mode_reglement_id = GETPOSTINT('mode_reglement_id') > 0 ? (GETPOSTINT('mode_reglement_id')) : $_facrec->mode_reglement_id;
 			$this->fk_account = GETPOST('fk_account') > 0 ? ((int) GETPOST('fk_account')) : $_facrec->fk_account;
 
 			// Set here to have this defined for substitution into notes, should be recalculated after adding lines to get same result
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cedd378d0f8..74438fdcc70 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -72,7 +72,7 @@ if (isModEnabled('incoterm')) {
 
 
 // Get Parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action      = GETPOST('action', 'alpha');
 $confirm     = GETPOST('confirm', 'alpha');
@@ -80,20 +80,20 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'pu
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$socid     = GETPOST('socid', 'int');
-$projectid = GETPOST('projectid', 'int');
+$socid     = GETPOSTINT('socid');
+$projectid = GETPOSTINT('projectid');
 $cancel    = GETPOST('cancel', 'alpha');
-$lineid    = GETPOST('lineid', 'int');
+$lineid    = GETPOSTINT('lineid');
 $origin    = GETPOST('origin', 'alpha');
-$originid  = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
-$rank      = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$originid  = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id')); // For backward compatibility
+$rank      = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
-$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'));
+$datelivraison = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), GETPOSTINT('liv_sec'), GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 
 // Security check
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 
 	// Set incoterm
 	if ($action == 'set_incoterms' && $usercancreate) {
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -226,7 +226,7 @@ if (empty($reshook)) {
 
 	// payment conditions
 	if ($action == 'setconditions' && $usercancreate) {
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -234,7 +234,7 @@ if (empty($reshook)) {
 
 	// payment mode
 	if ($action == 'setmode' && $usercancreate) {
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -243,12 +243,12 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	}
 
 	// bank account
 	if ($action == 'setbankaccount' && $usercancreate) {
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -272,7 +272,7 @@ if (empty($reshook)) {
 
 	// Edit Thirdparty
 	if (getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
-		$new_socid = GETPOST('new_socid', 'int');
+		$new_socid = GETPOSTINT('new_socid');
 		if (!empty($new_socid) && $new_socid != $object->thirdparty->id) {
 			$db->begin();
 
@@ -432,7 +432,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 		}
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
@@ -757,7 +757,7 @@ if (empty($reshook)) {
 
 		$productsupplier = new ProductFournisseur($db);
 		if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {
-			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0) {
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOSTINT('qty')), $line->fk_product, 'none', GETPOSTINT('socid')) < 0) {
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 			}
 		}
@@ -986,7 +986,7 @@ if (empty($reshook)) {
 	if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $usercanapprove) {
 		$db->begin();
 
-		$idwarehouse = GETPOST('idwarehouse', 'int');
+		$idwarehouse = GETPOSTINT('idwarehouse');
 
 		$qualified_for_stock_change = 0;
 		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
@@ -1053,7 +1053,7 @@ if (empty($reshook)) {
 
 	// Force mandatory order method
 	if ($action == 'commande') {
-		$methodecommande = GETPOST('methodecommande', 'int');
+		$methodecommande = GETPOSTINT('methodecommande');
 
 		if ($cancel) {
 			$action = '';
@@ -1066,7 +1066,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder) {
 		$db->begin();
 
-		$result = $object->commande($user, GETPOST("datecommande"), GETPOST("methode", 'int'), GETPOST('comment', 'alphanohtml'));
+		$result = $object->commande($user, GETPOST("datecommande"), GETPOSTINT("methode"), GETPOSTINT('comment'));
 		if ($result > 0) {
 			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
@@ -1237,17 +1237,17 @@ if (empty($reshook)) {
 			// Creation commande
 			$object->ref_supplier  	= GETPOST('refsupplier');
 			$object->socid         	= $socid;
-			$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
-			$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
-			$object->fk_account        = GETPOST('fk_account', 'int');
+			$object->cond_reglement_id = GETPOSTINT('cond_reglement_id');
+			$object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
+			$object->fk_account        = GETPOSTINT('fk_account');
 			$object->note_private = GETPOST('note_private', 'restricthtml');
 			$object->note_public   	= GETPOST('note_public', 'restricthtml');
 			$object->delivery_date = $datelivraison;
-			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+			$object->fk_incoterms = GETPOSTINT('incoterm_id');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			$object->multicurrency_tx = price2num(GETPOST('originmulticurrency_tx', 'alpha'));
-			$object->fk_project       = GETPOST('projectid', 'int');
+			$object->fk_project       = GETPOSTINT('projectid');
 
 			// Fill array 'array_options' with data from add form
 			if (!$error) {
@@ -1436,8 +1436,8 @@ if (empty($reshook)) {
 		$ws_key         = $object->thirdparty->webservices_key;
 		$ws_user        = GETPOST('ws_user', 'alpha');
 		$ws_password    = GETPOST('ws_password', 'alpha');
-		$ws_entity      = GETPOST('ws_entity', 'int');
-		$ws_thirdparty  = GETPOST('ws_thirdparty', 'int');
+		$ws_entity      = GETPOSTINT('ws_entity');
+		$ws_thirdparty  = GETPOSTINT('ws_thirdparty');
 
 		// NS and Authentication parameters
 		$ws_ns = 'http://www.dolibarr.org/ns/';
@@ -1535,10 +1535,10 @@ if (empty($reshook)) {
 			}
 		} elseif ($action == 'swapstatut' && $object->id > 0) {
 			// bascule du statut d'un contact
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} elseif ($action == 'deletecontact' && $object->id > 0) {
 			// Efface un contact
-			$result = $object->delete_contact(GETPOST("lineid", 'int'));
+			$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -1922,7 +1922,7 @@ if ($action == 'create') {
 		$filter = '(s.fournisseur:=:1)';
 		// Create an array for form
 		$formquestion = array(
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', $filter))
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', $filter))
 		);
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -1977,7 +1977,7 @@ if ($action == 'create') {
 				//'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("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse', 'int'), 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+				array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOSTINT('idwarehouse'), 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
 			);
 		}
 		$text = $langs->trans("ConfirmApproveThisOrder", $object->ref);
@@ -2426,7 +2426,7 @@ if ($action == 'create') {
 		//$result = $object->getLinesArray();
 
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="'.newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
@@ -2696,7 +2696,7 @@ if ($action == 'create') {
 			print '<table class="noborder centpercent">';
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
 			print '<tr><td class="fieldrequired">'.$langs->trans("OrderDate").'</td><td>';
-			$date_com = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			$date_com = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 			print $form->selectDate($date_com ?: '', '', 0, 0, '', "commande", 1, 1);
 			print '</td></tr>';
 
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index e918d03420f..68bbdff836a 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -38,7 +38,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("facture", "orders", "sendings", "companies"));
 
-$id		= GETPOST('id', 'int');
+$id		= GETPOSTINT('id');
 $ref	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -92,14 +92,14 @@ if (empty($reshook)) {
 	} elseif ($action == 'swapstatut' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
 		// Toggle the status of a contact
 		if ($object->fetch($id)) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'deletecontact' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
 		// Deleting a contact
 		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+		$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 17e6b5ae890..61193e3e707 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -53,11 +53,11 @@ if (isModEnabled('productbatch')) {
 }
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $ref = GETPOST('ref');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 $action = GETPOST('action', 'aZ09');
-$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$fk_default_warehouse = GETPOSTINT('fk_default_warehouse');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('ordersupplierdispatch'));
 // Recuperation de l'id de projet
 $projectid = 0;
 if (GETPOSTISSET("projectid")) {
-	$projectid = GETPOST("projectid", 'int');
+	$projectid = GETPOSTINT("projectid");
 }
 
 $object = new CommandeFournisseur($db);
@@ -250,7 +250,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
-					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+					$dto = GETPOSTINT("dto_".$reg[1].'_'.$reg[2]);
 					if (!empty($dto)) {
 						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
 					}
@@ -262,7 +262,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			$qtytomove = GETPOSTFLOAT($qty);
 			$puformove = GETPOSTFLOAT($pu);
 			if ($qtytomove != 0) {
-				if (!(GETPOST($ent, 'int') > 0)) {
+				if (!(GETPOSTINT($ent) > 0)) {
 					dol_syslog('No dispatch for line '.$key.' as no warehouse was chosen.');
 					$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' '.($numline);
 					setEventMessages($langs->trans('ErrorFieldRequired', $text), null, 'errors');
@@ -278,7 +278,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
-							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
+							$dto = price2num(GETPOSTINT("dto_".$reg[1].'_'.$reg[2]), '');
 							if (empty($dto)) {
 								$dto = 0;
 							}
@@ -291,7 +291,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 								$sql .= ", price=".price2num(GETPOST($pu), 'MU')."*quantity";
 								$sql .= ", remise_percent = ".((float) $dto);
 								$sql .= " WHERE fk_soc=".((int) $object->socid);
-								$sql .= " AND fk_product=".((int) GETPOST($prod, 'int'));
+								$sql .= " AND fk_product=".(GETPOSTINT($prod));
 
 								$resql = $db->query($sql);
 							}
@@ -313,14 +313,14 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			$pu = 'pu_'.$reg[1].'_'.$reg[2];
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 			$lot = 'lot_number_'.$reg[1].'_'.$reg[2];
-			$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'year', 'int'));
-			$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'year', 'int'));
+			$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'month'), GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'day'), GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'year'));
+			$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'month'), GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'day'), GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'year'));
 
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 
 			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
-					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+					$dto = GETPOSTINT("dto_".$reg[1].'_'.$reg[2]);
 					if (!empty($dto)) {
 						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
 					}
@@ -334,7 +334,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			if ($qtytomove > 0) {
 				$productId = GETPOSTINT($prod);
 
-				if (!(GETPOST($ent, 'int') > 0)) {
+				if (!(GETPOSTINT($ent) > 0)) {
 					dol_syslog('No dispatch for line '.$key.' as no warehouse was chosen.');
 					$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' '.($numline).'-'.($reg[1] + 1);
 					setEventMessages($langs->trans('ErrorFieldRequired', $text), null, 'errors');
@@ -366,7 +366,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
-							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+							$dto = GETPOSTINT("dto_".$reg[1].'_'.$reg[2]);
 							//update supplier price
 							if (GETPOSTISSET($saveprice)) {
 								// TODO Use class
@@ -998,7 +998,7 @@ if ($id > 0 || !empty($ref)) {
 						// Qty to dispatch
 						print '<td class="right">';
 						print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-						print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'">';
+						print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOSTINT('qty'.$suffix) : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'">';
 						print '</td>';
 
 						print '<td>';
@@ -1232,7 +1232,7 @@ if ($id > 0 || !empty($ref)) {
 				$objp = $db->fetch_object($resql);
 
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
-					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid', 'int').'" method="POST">
+					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOSTINT('lineid').'" method="POST">
 					<input type="hidden" name="token" value="'.newToken().'">
 					<input type="hidden" name="action" value="updateline">
 					<input type="hidden" name="mode" value="">
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 9a9428ce2b0..e50cfbc2633 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -42,16 +42,16 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "other"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 63cd3cd45d5..2f80fe4ba45 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -39,14 +39,14 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
 // Get Parameters
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOST("page", 'int');
+$page = GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 84a06c05a5a..9630614fd9d 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -52,52 +52,52 @@ $langs->loadLangs(array("orders", "sendings", 'deliveries', 'companies', 'compta
 // Get Parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierorderlist';
 $mode = GETPOST('mode', 'alpha');
 
 // Search Criteria
-$search_date_order_startday = GETPOST('search_date_order_startday', 'int');
-$search_date_order_startmonth = GETPOST('search_date_order_startmonth', 'int');
-$search_date_order_startyear = GETPOST('search_date_order_startyear', 'int');
-$search_date_order_endday = GETPOST('search_date_order_endday', 'int');
-$search_date_order_endmonth = GETPOST('search_date_order_endmonth', 'int');
-$search_date_order_endyear = GETPOST('search_date_order_endyear', 'int');
+$search_date_order_startday = GETPOSTINT('search_date_order_startday');
+$search_date_order_startmonth = GETPOSTINT('search_date_order_startmonth');
+$search_date_order_startyear = GETPOSTINT('search_date_order_startyear');
+$search_date_order_endday = GETPOSTINT('search_date_order_endday');
+$search_date_order_endmonth = GETPOSTINT('search_date_order_endmonth');
+$search_date_order_endyear = GETPOSTINT('search_date_order_endyear');
 $search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear);	// Use tzserver
 $search_date_order_end = dol_mktime(23, 59, 59, $search_date_order_endmonth, $search_date_order_endday, $search_date_order_endyear);
 
-$search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
-$search_date_delivery_startmonth = GETPOST('search_date_delivery_startmonth', 'int');
-$search_date_delivery_startyear = GETPOST('search_date_delivery_startyear', 'int');
-$search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
-$search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
-$search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
+$search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
+$search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth');
+$search_date_delivery_startyear = GETPOSTINT('search_date_delivery_startyear');
+$search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday');
+$search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth');
+$search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear');
 $search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
 
-$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
-$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
-$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
-$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
-$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
-$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_startday = GETPOSTINT('search_date_valid_startday');
+$search_date_valid_startmonth = GETPOSTINT('search_date_valid_startmonth');
+$search_date_valid_startyear = GETPOSTINT('search_date_valid_startyear');
+$search_date_valid_endday = GETPOSTINT('search_date_valid_endday');
+$search_date_valid_endmonth = GETPOSTINT('search_date_valid_endmonth');
+$search_date_valid_endyear = GETPOSTINT('search_date_valid_endyear');
 $search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 
-$search_date_approve_startday = GETPOST('search_date_approve_startday', 'int');
-$search_date_approve_startmonth = GETPOST('search_date_approve_startmonth', 'int');
-$search_date_approve_startyear = GETPOST('search_date_approve_startyear', 'int');
-$search_date_approve_endday = GETPOST('search_date_approve_endday', 'int');
-$search_date_approve_endmonth = GETPOST('search_date_approve_endmonth', 'int');
-$search_date_approve_endyear = GETPOST('search_date_approve_endyear', 'int');
+$search_date_approve_startday = GETPOSTINT('search_date_approve_startday');
+$search_date_approve_startmonth = GETPOSTINT('search_date_approve_startmonth');
+$search_date_approve_startyear = GETPOSTINT('search_date_approve_startyear');
+$search_date_approve_endday = GETPOSTINT('search_date_approve_endday');
+$search_date_approve_endmonth = GETPOSTINT('search_date_approve_endmonth');
+$search_date_approve_endyear = GETPOSTINT('search_date_approve_endyear');
 $search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear);	// Use tzserver
 $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_product_category = GETPOSTINT('search_product_category');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_refsupp = GETPOST('search_refsupp', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -105,15 +105,15 @@ $search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state", 'alpha');
-$search_country = GETPOST("search_country", 'int');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_user = GETPOST('search_user', 'int');
+$search_country = GETPOSTINT("search_country");
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_user = GETPOSTINT('search_user');
 $search_request_author = GETPOST('search_request_author', 'alpha');
 $search_ht = GETPOST('search_ht', 'alpha');
 $search_ttc = GETPOST('search_ttc', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
-$socid = GETPOST('socid', 'int');
-$search_sale = GETPOST('search_sale', 'int');
+$socid = GETPOSTINT('socid');
+$search_sale = GETPOSTINT('search_sale');
 $search_total_ht = GETPOST('search_total_ht', 'alpha');
 $search_total_tva = GETPOST('search_total_tva', 'alpha');
 $search_total_ttc = GETPOST('search_total_ttc', 'alpha');
@@ -123,7 +123,7 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
 $search_multicurrency_montant_tva = GETPOST('search_multicurrency_montant_tva', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOST('search_billed', 'int');
+$search_billed = GETPOSTINT('search_billed');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
@@ -136,10 +136,10 @@ if (GETPOSTISARRAY('search_status')) {
 
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -221,7 +221,7 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 }
 
 // Security check
-$orderid = GETPOST('orderid', 'int');
+$orderid = GETPOSTINT('orderid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -369,8 +369,8 @@ if (empty($reshook)) {
 	// Mass action to generate vendor bills
 	if ($massaction == 'confirm_createsupplierbills') {
 		$orders = GETPOST('toselect', 'array');
-		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-		$validate_invoices = GETPOST('validate_invoices', 'int');
+		$createbills_onebythird = GETPOSTINT('createbills_onebythird');
+		$validate_invoices = GETPOSTINT('validate_invoices');
 
 		$TFact = array();
 		/** @var FactureFournisseur[] $TFactThird */
@@ -409,7 +409,7 @@ if (empty($reshook)) {
 				$objecttmp->ref_supplier = !empty($cmd->ref_supplier) ? $cmd->ref_supplier : $default_ref_supplier;
 				$default_ref_supplier+=1;
 
-				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+				$datefacture = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 				if (empty($datefacture)) {
 					$datefacture = dol_now();
 				}
@@ -1334,7 +1334,7 @@ if ($resql) {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
-	if (GETPOST('autoselectall', 'int')) {
+	if (GETPOSTINT('autoselectall')) {
 		$selectedfields .= '<script>';
 		$selectedfields .= '   $(document).ready(function() {';
 		$selectedfields .= '        console.log("Autoclick on checkforselects");';
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index e8ad23b0246..a70e3da5988 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -38,7 +38,7 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
 // Get Parameters
-$id = GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int');
+$id = GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id');
 $ref = GETPOST('ref');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 81dc77d93d7..6087d1bc00a 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,10 +41,10 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -57,7 +57,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "p.name";
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index a29f1f9dfff..4969b2b387f 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -49,28 +49,28 @@ $langs->loadLangs(array('bills', 'companies', 'compta', 'admin', 'other', 'produ
 
 $action = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicetemplatelist'; // To manage different context of search
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 // Security check
-$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id'));
 $lineid = GETPOSTINT('lineid');
 $title = GETPOST('title', 'alpha');
 $libelle = GETPOST('libelle', 'alpha');
 $ref_supplier = GETPOST('ref_supplier', 'alpha');
-$projectid = GETPOST('projectid', 'int');
+$projectid = GETPOSTINT('projectid');
 $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -172,16 +172,16 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		$frequency = GETPOST('frequency', 'int');
-		$reyear = GETPOST('reyear', 'int');
-		$remonth = GETPOST('remonth', 'int');
-		$reday = GETPOST('reday', 'int');
-		$rehour = GETPOST('rehour', 'int');
-		$remin = GETPOST('remin', 'int');
-		$nb_gen_max = GETPOST('nb_gen_max', 'int');
+		$frequency = GETPOSTINT('frequency');
+		$reyear = GETPOSTINT('reyear');
+		$remonth = GETPOSTINT('remonth');
+		$reday = GETPOSTINT('reday');
+		$rehour = GETPOSTINT('rehour');
+		$remin = GETPOSTINT('remin');
+		$nb_gen_max = GETPOSTINT('nb_gen_max');
 		//if (empty($nb_gen_max)) $nb_gen_max =0;
 
-		if (GETPOST('frequency', 'int')) {
+		if (GETPOSTINT('frequency')) {
 			if (empty($reyear) || empty($remonth) || empty($reday)) {
 				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
 				$action = "create";
@@ -205,8 +205,8 @@ if (empty($reshook)) {
 			$object->frequency = $frequency;
 			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
 			$object->nb_gen_max = $nb_gen_max;
-			$object->auto_validate = GETPOST('auto_validate', 'int');
-			$object->generate_pdf = GETPOST('generate_pdf', 'int');
+			$object->auto_validate = GETPOSTINT('auto_validate');
+			$object->generate_pdf = GETPOSTINT('generate_pdf');
 
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
 			$object->date_when = $date_next_execution;
@@ -214,7 +214,7 @@ if (empty($reshook)) {
 			$db->begin();
 
 			$oldinvoice = new FactureFournisseur($db);
-			$oldinvoice->fetch(GETPOST('facid', 'int'));
+			$oldinvoice->fetch(GETPOSTINT('facid'));
 
 			$object->cond_reglement_id = $oldinvoice->cond_reglement_id;
 			$object->cond_reglement_code = $oldinvoice->cond_reglement_code;
@@ -265,13 +265,13 @@ if (empty($reshook)) {
 	// Update field
 	// Set condition
 	if ($action == 'setconditions' && $usercancreate) {
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 	} elseif ($action == 'setmode' && $usercancreate) {
 		// Set mode
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 	} elseif ($action == 'classin' && $usercancreate) {
 		// Set project
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	} elseif ($action == 'setref_supplier' && $usercancreate) {
 		$result = $object->setValueFrom('ref_supplier', $ref_supplier, '', null, 'text', '', $user);
 
@@ -302,10 +302,10 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setbankaccount' && $usercancreate) {
 		// Set bank account
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	} elseif ($action == 'setfrequency' && $usercancreate) {
 		// Set frequency and unit frequency
-		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+		$object->setFrequencyAndUnit(GETPOSTINT('frequency'), GETPOSTINT('unit_frequency'));
 	} elseif ($action == 'setdate_when' && $usercancreate) {
 		// Set next date of execution
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
@@ -314,13 +314,13 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setnb_gen_max' && $usercancreate) {
 		// Set max period
-		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+		$object->setMaxPeriod(GETPOSTINT('nb_gen_max'));
 	} elseif ($action == 'setauto_validate' && $usercancreate) {
 		// Set auto validate
-		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
+		$object->setAutoValidate(GETPOSTINT('auto_validate'));
 	} elseif ($action == 'setgenerate_pdf' && $usercancreate) {
 		// Set generate pdf
-		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
+		$object->setGeneratepdf(GETPOSTINT('generate_pdf'));
 	} elseif ($action == 'setmodelpdf' && $usercancreate) {
 		// Set model pdf
 		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
@@ -363,7 +363,7 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setlibelle' && $usercancreate) {
 		// Set label
 		$object->fetch($id);
@@ -436,7 +436,7 @@ if (empty($reshook)) {
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 			$ref_fournisseur = (GETPOSTISSET('fourn_ref') ? GETPOST('fourn_ref', 'restricthtml') : '');
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 			$tva_tx = '';
 		}
 
@@ -547,7 +547,7 @@ if (empty($reshook)) {
 				}
 
 				// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
-				$pqp = (GETPOST('pbq', 'int') ? GETPOST('pbq', 'int') : 0);
+				$pqp = (GETPOSTINT('pbq') ? GETPOSTINT('pbq') : 0);
 
 				$datapriceofproduct = $prod->getSellPrice($mysoc, $object->thirdparty, $pqp);
 
@@ -656,8 +656,8 @@ if (empty($reshook)) {
 				$fk_unit = GETPOST('units', 'alpha');
 			}
 
-			$date_start_fill = !empty(GETPOST('date_start_fill', 'int')) ? GETPOST('date_start_fill', 'int') : null;
-			$date_end_fill = !empty(GETPOST('date_end_fill', 'int')) ? GETPOST('date_end_fill', 'int') : null;
+			$date_start_fill = !empty(GETPOSTINT('date_start_fill')) ? GETPOSTINT('date_start_fill') : null;
+			$date_end_fill = !empty(GETPOSTINT('date_end_fill')) ? GETPOSTINT('date_end_fill') : null;
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
@@ -759,7 +759,7 @@ if (empty($reshook)) {
 		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
 
 		$objectline = new FactureFournisseurLigneRec($db);
-		if ($objectline->fetch(GETPOST('lineid', 'int'))) {
+		if ($objectline->fetch(GETPOSTINT('lineid'))) {
 			$objectline->array_options = $array_options;
 			$result = $objectline->insertExtraFields();
 			if ($result < 0) {
@@ -778,7 +778,7 @@ if (empty($reshook)) {
 		}
 
 		// Define special_code for special lines
-		$special_code = GETPOST('special_code', 'int');
+		$special_code = GETPOSTINT('special_code');
 		if (! GETPOST('qty', 'alpha')) {
 			$special_code = 3;
 		}
@@ -786,7 +786,7 @@ if (empty($reshook)) {
 		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
 
 		// Check minimum price
-		$productid = GETPOST('productid', 'int');
+		$productid = GETPOSTINT('productid');
 		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
@@ -806,11 +806,11 @@ if (empty($reshook)) {
 				$error++;
 			}
 		} else {
-			$type = GETPOST('type', 'int');
+			$type = GETPOSTINT('type');
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 
 			// Check parameters
-			if (GETPOST('type', 'int') < 0) {
+			if (GETPOSTINT('type') < 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 				$error++;
 			}
@@ -821,12 +821,12 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		$date_start_fill = !empty(GETPOST('date_start_fill', 'int')) ? GETPOST('date_start_fill', 'int') : 'NULL';
-		$date_end_fill = !empty(GETPOST('date_end_fill', 'int')) ? GETPOST('date_end_fill', 'int') : 'NULL';
+		$date_start_fill = !empty(GETPOSTINT('date_start_fill')) ? GETPOSTINT('date_start_fill') : 'NULL';
+		$date_end_fill = !empty(GETPOSTINT('date_end_fill')) ? GETPOSTINT('date_end_fill') : 'NULL';
 
 		// Update line
 		if (! $error) {
-			$result = $object->updateline(GETPOST('lineid', 'int'), GETPOST('productid', 'int'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
+			$result = $object->updateline(GETPOSTINT('lineid'), GETPOSTINT('productid'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
 			if ($result >= 0) {
 				$object->fetch($object->id); // Reload lines
 
@@ -1038,7 +1038,7 @@ if ($action == 'create') {
 
 		// Frequency + unit
 		print '<tr><td class="titlefieldcreate">' . $form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency')) . "</td><td>";
-		print "<input type='text' name='frequency' value='" . GETPOST('frequency', 'int') . "' size='4' />&nbsp;" . $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
+		print "<input type='text' name='frequency' value='" . GETPOSTINT('frequency') . "' size='4' />&nbsp;" . $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
 		// Date next run
@@ -1554,7 +1554,7 @@ if ($action == 'create') {
 		print '<div class="clearboth"></div><br>';
 
 		// Lines
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOSTINT('lineid')) . '" method="POST">
         	<input type="hidden" name="token" value="' . newToken() . '">
         	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
         	<input type="hidden" name="mode" value="">
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 4493ae9ad39..2cab1b323d6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -69,7 +69,7 @@ if (isModEnabled('incoterm')) {
 	$langs->load('incoterm');
 }
 
-$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST("confirm");
@@ -78,17 +78,17 @@ $cancel		= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = '';
 
-$lineid		= GETPOST('lineid', 'int');
-$projectid = GETPOST('projectid', 'int');
+$lineid		= GETPOSTINT('lineid');
+$projectid = GETPOSTINT('projectid');
 $origin		= GETPOST('origin', 'alpha');
-$originid = GETPOST('originid', 'int');
-$fac_recid = GETPOST('fac_rec', 'int');
-$rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$originid = GETPOSTINT('originid');
+$fac_recid = GETPOSTINT('fac_rec');
+$rank = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicesuppliercard', 'globalcard'));
@@ -112,7 +112,7 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
@@ -193,7 +193,7 @@ if (empty($reshook)) {
 		if (GETPOST('newsupplierref', 'alphanohtml')) {
 			$objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
 		}
-		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+		$objectutil->date = dol_mktime(12, 0, 0, GETPOSTINT('newdatemonth'), GETPOSTINT('newdateday'), GETPOSTINT('newdateyear'));
 
 		$result = $objectutil->createFromClone($user, $id);
 		if ($result > 0) {
@@ -413,7 +413,7 @@ if (empty($reshook)) {
 		$db->begin();
 
 		if (!$error) {
-			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -443,19 +443,19 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'set_incoterms' && isModEnabled('incoterm')) {
 		// Set incoterm
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	} elseif ($action == 'setmode' && $usercancreate) {
 		// payment mode
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx', 'alpha')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOSTINT('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setbankaccount' && $usercancreate) {
 		// bank account
-		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	} elseif ($action == 'setvatreversecharge' && $usercancreate) {
 		// vat reverse charge
 		$vatreversecharge = GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
@@ -464,7 +464,7 @@ if (empty($reshook)) {
 
 	if ($action == 'settransportmode' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
 		// transport mode
-		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'int'));
+		$result = $object->setTransportMode(GETPOSTINT('transport_mode_id'));
 	} elseif ($action == 'setlabel' && $usercancreate) {
 		// Set label
 		$object->fetch($id);
@@ -474,7 +474,7 @@ if (empty($reshook)) {
 			dol_print_error($db);
 		}
 	} elseif ($action == 'setdatef' && $usercancreate) {
-		$newdate = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'), 'tzserver');
+		$newdate = dol_mktime(0, 0, 0, GETPOSTINT('datefmonth'), GETPOSTINT('datefday'), GETPOSTINT('datefyear'), 'tzserver');
 		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
@@ -500,7 +500,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setdate_lim_reglement' && $usercancreate) {
 		$object->fetch($id);
-		$object->date_echeance = dol_mktime(12, 0, 0, GETPOST('date_lim_reglementmonth', 'int'), GETPOST('date_lim_reglementday', 'int'), GETPOST('date_lim_reglementyear', 'int'));
+		$object->date_echeance = dol_mktime(12, 0, 0, GETPOSTINT('date_lim_reglementmonth'), GETPOSTINT('date_lim_reglementday'), GETPOSTINT('date_lim_reglementyear'));
 		if (!empty($object->date_echeance) && $object->date_echeance < $object->date) {
 			$object->date_echeance = $object->date;
 			setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
@@ -512,10 +512,10 @@ if (empty($reshook)) {
 	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		$db->begin();
 		// We use the credit to reduce amount of invoice
-		if (GETPOST("remise_id", "int")) {
+		if (GETPOSTINT("remise_id")) {
 			$ret = $object->fetch($id);
 			if ($ret > 0) {
-				$result = $object->insert_discount(GETPOST("remise_id", "int"));
+				$result = $object->insert_discount(GETPOSTINT("remise_id"));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -524,10 +524,10 @@ if (empty($reshook)) {
 			}
 		}
 		// We use the credit to reduce remain to pay
-		if (GETPOST("remise_id_for_payment", "int")) {
+		if (GETPOSTINT("remise_id_for_payment")) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($db);
-			$discount->fetch(GETPOST("remise_id_for_payment", "int"));
+			$discount->fetch(GETPOSTINT("remise_id_for_payment"));
 
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
@@ -774,15 +774,15 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		$dateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
-		$datedue = dol_mktime(0, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'), 'tzserver');
+		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$datedue = dol_mktime(0, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'), 'tzserver');
 		//var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
 		//var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
 		//var_dump($db->idate($dateinvoice));
 		//exit;
 
 		// Replacement invoice
-		if (GETPOST('type', 'int') === '') {
+		if (GETPOSTINT('type') === '') {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error++;
 		}
@@ -799,38 +799,38 @@ if (empty($reshook)) {
 				$action = 'create';
 			}
 
-			if (!(GETPOST('fac_replacement', 'int') > 0)) {
+			if (!(GETPOSTINT('fac_replacement') > 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReplaceInvoice")), null, 'errors');
 			}
 
 			if (!$error) {
 				// This is a replacement invoice
-				$result = $object->fetch(GETPOST('fac_replacement', 'int'));
+				$result = $object->fetch(GETPOSTINT('fac_replacement'));
 				$object->fetch_thirdparty();
 
 				$object->ref = GETPOST('ref', 'alphanohtml');
 				$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
-				$object->socid = GETPOST('socid', 'int');
+				$object->socid = GETPOSTINT('socid');
 				$object->libelle = GETPOST('label', 'alphanohtml');	// deprecated
 				$object->label = GETPOST('label', 'alphanohtml');
 				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->note_private = GETPOST('note_private', 'restricthtml');
-				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
-				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
-				$object->fk_account			= GETPOST('fk_account', 'int');
+				$object->cond_reglement_id = GETPOSTINT('cond_reglement_id');
+				$object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
+				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms = GETPOSTINT('incoterm_id');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
-				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
+				$object->multicurrency_tx = GETPOSTINT('originmulticurrency_tx');
+				$object->transport_mode_id	= GETPOSTINT('transport_mode_id');
 
 				// Proprietes particulieres a facture de replacement
-				$object->fk_facture_source = GETPOST('fac_replacement', 'int');
+				$object->fk_facture_source = GETPOSTINT('fac_replacement');
 				$object->type = FactureFournisseur::TYPE_REPLACEMENT;
 
 				$id = $object->createFromCurrent($user);
@@ -843,12 +843,12 @@ if (empty($reshook)) {
 
 		// Credit note invoice
 		if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE) {
-			$sourceinvoice = GETPOST('fac_avoir', 'int');
+			$sourceinvoice = GETPOSTINT('fac_avoir');
 			if (!($sourceinvoice > 0) && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
 			}
-			if (GETPOST('socid', 'int') < 1) {
+			if (GETPOSTINT('socid') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 				$action = 'create';
 				$error++;
@@ -879,13 +879,13 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				$tmpproject = GETPOST('projectid', 'int');
+				$tmpproject = GETPOSTINT('projectid');
 
 				// Creation facture
 				$object->ref                = GETPOST('ref', 'alphanohtml');
 				$object->ref_supplier       = GETPOST('ref_supplier', 'alphanohtml');
 				$object->subtype            = GETPOST('subtype', 'alphanohtml');
-				$object->socid				= GETPOST('socid', 'int');
+				$object->socid				= GETPOSTINT('socid');
 				$object->libelle            = GETPOST('label', 'alphanohtml');
 				$object->label				= GETPOST('label', 'alphanohtml');
 				$object->date               = $dateinvoice;
@@ -894,14 +894,14 @@ if (empty($reshook)) {
 				$object->note_private       = GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
-				$object->fk_account			= GETPOST('fk_account', 'int');
+				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->fk_incoterms       = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
-				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
+				$object->multicurrency_tx   = GETPOSTINT('originmulticurrency_tx');
+				$object->transport_mode_id	= GETPOSTINT('transport_mode_id');
 
 				// Proprietes particulieres a facture avoir
 				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
@@ -913,7 +913,7 @@ if (empty($reshook)) {
 					$error++;
 				}
 
-				if (GETPOST('invoiceAvoirWithLines', 'int') == 1 && $id > 0) {
+				if (GETPOSTINT('invoiceAvoirWithLines') == 1 && $id > 0) {
 					$facture_source = new FactureFournisseur($db); // fetch origin object
 					if ($facture_source->fetch($object->fk_facture_source) > 0) {
 						$fk_parent_line = 0;
@@ -949,7 +949,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
+				if (GETPOSTINT('invoiceAvoirWithPaymentRestAmount') == 1 && $id > 0) {
 					$facture_source = new FactureFournisseur($db); // fetch origin object if not previously defined
 					if ($facture_source->fetch($object->fk_facture_source) > 0) {
 						$totalpaid = $facture_source->getSommePaiement();
@@ -984,7 +984,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				$object->socid              = GETPOST('socid', 'int');
+				$object->socid              = GETPOSTINT('socid');
 				$object->type               = GETPOST('type', 'alphanohtml');
 				$object->subtype            = GETPOST('subtype', 'alphanohtml');
 				$object->ref                = GETPOST('ref', 'alphanohtml');
@@ -993,17 +993,17 @@ if (empty($reshook)) {
 				$object->note_private       = trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_supplier       = GETPOST('ref_supplier', 'alphanohtml');
 				$object->model_pdf          = GETPOST('model', 'alphanohtml');
-				$object->fk_project         = GETPOST('projectid', 'int');
+				$object->fk_project         = GETPOSTINT('projectid');
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
-				$object->fk_account         = GETPOST('fk_account', 'int');
+				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
+				$object->fk_account         = GETPOSTINT('fk_account');
 				$object->amount             = price2num(GETPOST('amount'));
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
-				$object->fk_incoterms       = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx   = GETPOSTINT('originmulticurrency_tx');
 
 				// Source facture
 				$object->fac_rec = $fac_recid;
@@ -1016,7 +1016,7 @@ if (empty($reshook)) {
 			}
 		} elseif ($fac_recid <= 0 && (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT)) {
 			// Standard invoice or Deposit invoice, not from a Predefined template invoice
-			if (GETPOST('socid', 'int') < 1) {
+			if (GETPOSTINT('socid') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 				$action = 'create';
 				$error++;
@@ -1047,15 +1047,15 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				$tmpproject = GETPOST('projectid', 'int');
+				$tmpproject = GETPOSTINT('projectid');
 
 				// Creation invoice
-				$object->socid				= GETPOST('socid', 'int');
+				$object->socid				= GETPOSTINT('socid');
 				$object->type				= GETPOST('type', 'alphanohtml');
 				$object->subtype            = GETPOST('subtype', 'alphanohtml');
 				$object->ref				= GETPOST('ref', 'alphanohtml');
 				$object->ref_supplier		= GETPOST('ref_supplier', 'alphanohtml');
-				$object->socid				= GETPOST('socid', 'int');
+				$object->socid				= GETPOSTINT('socid');
 				$object->libelle			= GETPOST('label', 'alphanohtml');	// deprecated
 				$object->label				= GETPOST('label', 'alphanohtml');
 				$object->date				= $dateinvoice;
@@ -1064,13 +1064,13 @@ if (empty($reshook)) {
 				$object->note_private		= GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
-				$object->fk_account			= GETPOST('fk_account', 'int');
+				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->fk_incoterms		= GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms		= GETPOSTINT('incoterm_id');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx	= GETPOSTINT('originmulticurrency_tx');
 				$object->transport_mode_id	= GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
@@ -1109,7 +1109,7 @@ if (empty($reshook)) {
 						$element = 'projet';
 					}
 					$object->origin    = GETPOST('origin', 'alpha');
-					$object->origin_id = GETPOST('originid', 'int');
+					$object->origin_id = GETPOSTINT('originid');
 
 
 					require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
@@ -1147,7 +1147,7 @@ if (empty($reshook)) {
 						}
 						$srcobject = new $classname($db);
 
-						$result = $srcobject->fetch(GETPOST('originid', 'int'));
+						$result = $srcobject->fetch(GETPOSTINT('originid'));
 
 						// If deposit invoice - down payment with 1 line (fixed amount or percent)
 						$typeamount = GETPOST('typedeposit', 'alpha');
@@ -1431,7 +1431,7 @@ if (empty($reshook)) {
 		if (GETPOST('productid') > 0) {
 			$productsupplier = new ProductFournisseur($db);
 			if (getDolGlobalString('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
-				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOST('productid', 'int'), 'restricthtml', GETPOST('socid', 'int')) < 0) {
+				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOSTINT('productid'), 'restricthtml', GETPOSTINT('socid')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
 			}
@@ -1477,14 +1477,14 @@ if (empty($reshook)) {
 		}
 
 		$result = $object->updateline(
-			GETPOST('lineid', 'int'),
+			GETPOSTINT('lineid'),
 			$label,
 			$up,
 			$tva_tx,
 			$localtax1_tx,
 			$localtax2_tx,
 			price2num(GETPOST('qty'), 'MS'),
-			GETPOST('productid', 'int'),
+			GETPOSTINT('productid'),
 			$price_base_type,
 			$info_bits,
 			$type,
@@ -1553,7 +1553,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 		}
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
@@ -2016,14 +2016,14 @@ if (empty($reshook)) {
 		} elseif ($action == 'swapstatut') {
 			// bascule du statut d'un contact
 			if ($object->fetch($id)) {
-				$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+				$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 			} else {
 				dol_print_error($db);
 			}
 		} elseif ($action == 'deletecontact') {
 			// Efface un contact
 			$object->fetch($id);
-			$result = $object->delete_contact(GETPOST("lineid", 'int'));
+			$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -2068,9 +2068,9 @@ if ($action == 'create') {
 	$currency_code = $conf->currency;
 
 	$societe = '';
-	if (GETPOST('socid', 'int') > 0) {
+	if (GETPOSTINT('socid') > 0) {
 		$societe = new Societe($db);
-		$societe->fetch(GETPOST('socid', 'int'));
+		$societe->fetch(GETPOSTINT('socid'));
 		if (isModEnabled("multicurrency") && !empty($societe->multicurrency_code)) {
 			$currency_code = $societe->multicurrency_code;
 		}
@@ -2189,9 +2189,9 @@ if ($action == 'create') {
 			}
 		}
 
-		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datetmp = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$dateinvoice = ($datetmp == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datetmp);
-		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
+		$datetmp = dol_mktime(12, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'));
 		$datedue = ($datetmp == '' ? -1 : $datetmp);
 
 		// Replicate extrafields
@@ -2203,9 +2203,9 @@ if ($action == 'create') {
 		$vat_reverse_charge = (empty($societe) ? '' : $societe->vat_reverse_charge);
 		$transport_mode_id = !empty($societe->transport_mode_supplier_id) ? $societe->transport_mode_supplier_id : 0;
 		$fk_account = !empty($societe->fk_account) ? $societe->fk_account : 0;
-		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datetmp = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$dateinvoice = ($datetmp == '' ? (getDolGlobalInt('MAIN_AUTOFILL_DATE') ? '' : -1) : $datetmp);
-		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
+		$datetmp = dol_mktime(12, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'));
 		$datedue = ($datetmp == '' ? -1 : $datetmp);
 
 		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
@@ -2226,13 +2226,13 @@ if ($action == 'create') {
 	// If form was posted (but error returned), we must reuse the value posted in priority (standard Dolibarr behaviour)
 	if (!GETPOST('changecompany')) {
 		if (GETPOSTISSET('cond_reglement_id')) {
-			$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+			$cond_reglement_id = GETPOSTINT('cond_reglement_id');
 		}
 		if (GETPOSTISSET('mode_reglement_id')) {
-			$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+			$mode_reglement_id = GETPOSTINT('mode_reglement_id');
 		}
 		if (GETPOSTISSET('cond_reglement_id')) {
-			$fk_account = GETPOST('fk_account', 'int');
+			$fk_account = GETPOSTINT('fk_account');
 		}
 	}
 
@@ -2394,7 +2394,7 @@ if ($action == 'create') {
 
 		// Standard invoice
 		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int') ? '' : 'checked').'> ';
+		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOSTINT('type') ? '' : 'checked').'> ';
 		$desc = $form->textwithpicto($tmp.'<label for="radio_standard">'.$langs->trans("InvoiceStandardAsk").'</label>', $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
 		print $desc;
 		print '</div></div>';
@@ -2449,7 +2449,7 @@ if ($action == 'create') {
 					print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit', 'aZ09'), 0, 0, 0, '', 1);
 					print '</td>';
 					print '<td class="nowrap" style="padding-left: 5px">';
-					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="' . GETPOST('valuedeposit', 'int') . '"/>';
+					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="' . GETPOSTINT('valuedeposit') . '"/>';
 					print '</td>';
 				}
 				print '</tr></table>';
@@ -2543,7 +2543,7 @@ if ($action == 'create') {
 						$newinvoice_static->paye = $valarray ['paye'];
 
 						$optionsav .= '<option value="'.$key.'"';
-						if ($key == GETPOST('fac_avoir', 'int')) {
+						if ($key == GETPOSTINT('fac_avoir')) {
 							$optionsav .= ' selected';
 						}
 						$optionsav .= '>';
@@ -2591,9 +2591,9 @@ if ($action == 'create') {
 					print $desc;
 
 					print '<div id="credit_note_options" class="clearboth">';
-					print '&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithLines', 'int') > 0 ? 'checked' : '').' /> ';
+					print '&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithLines" id="invoiceAvoirWithLines" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true); $(\'#invoiceAvoirWithPaymentRestAmount\').removeAttr(\'checked\');   }" '.(GETPOSTINT('invoiceAvoirWithLines') > 0 ? 'checked' : '').' /> ';
 					print '<label for="invoiceAvoirWithLines">'.$langs->trans('invoiceAvoirWithLines')."</label>";
-					print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') > 0 ? 'checked' : '').' /> ';
+					print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="if($(this).is(\':checked\') ) { $(\'#radio_creditnote\').prop(\'checked\', true);  $(\'#invoiceAvoirWithLines\').removeAttr(\'checked\');   }" '.(GETPOSTINT('invoiceAvoirWithPaymentRestAmount') > 0 ? 'checked' : '').' /> ';
 					print '<label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
 					print '</div>';
 
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index ece8d3ed69f..551d04d31c8 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -39,7 +39,7 @@ if (isModEnabled('project')) {
 
 $langs->loadLangs(array("bills", "other", "companies"));
 
-$id		= (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int'));
+$id		= (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid'));
 $ref	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -93,14 +93,14 @@ if (empty($reshook)) {
 	} elseif ($action == 'swapstatut' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
 		// bascule du statut d'un contact
 		if ($object->fetch($id)) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} else {
 			dol_print_error($db);
 		}
 	} elseif ($action == 'deletecontact' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
 		// Efface un contact
 		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+		$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index aa3ebb90761..1aaccf4eb14 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -42,7 +42,7 @@ if (isModEnabled('project')) {
 
 $langs->loadLangs(array('bills', 'other', 'companies'));
 
-$id = GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int');
+$id = GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $ref = GETPOST('ref', 'alpha');
@@ -55,10 +55,10 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 $hookmanager->initHooks(array('invoicesuppliercarddocument'));
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 4f7cc31e9f2..16629f0febd 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 $langs->loadLangs(['bills', 'boxes']);
 
 // Filter to show only result of one supplier
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index cdb15850ebe..1d7d168a6a6 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -37,7 +37,7 @@ if (isModEnabled('project')) {
 
 $langs->loadLangs(array("companies", "bills"));
 
-$id = GETPOST("facid", 'int') ? GETPOST("facid", 'int') : GETPOST("id", 'int');
+$id = GETPOSTINT("facid") ? GETPOSTINT("facid") : GETPOSTINT("id");
 $ref = GETPOST("ref", 'alpha');
 
 // Security check
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 156bdded630..d815eda212b 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -46,7 +46,7 @@ $langs->loadLangs(array('bills', 'compta', 'admin', 'other', 'suppliers'));
 
 $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
@@ -54,10 +54,10 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'su
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
-$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
-$lineid = GETPOST('lineid', 'int');
+$id = (GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id'));
+$lineid = GETPOSTINT('lineid');
 $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
 	$socid = $user->socid;
@@ -74,32 +74,32 @@ $search_montant_vat = GETPOST('search_montant_vat');
 $search_montant_ttc = GETPOST('search_montant_ttc');
 $search_payment_mode = GETPOST('search_payment_mode');
 $search_payment_term = GETPOST('search_payment_term');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_date_when_startday = GETPOST('search_date_when_startday', 'int');
-$search_date_when_startmonth = GETPOST('search_date_when_startmonth', 'int');
-$search_date_when_startyear = GETPOST('search_date_when_startyear', 'int');
-$search_date_when_endday = GETPOST('search_date_when_endday', 'int');
-$search_date_when_endmonth = GETPOST('search_date_when_endmonth', 'int');
-$search_date_when_endyear = GETPOST('search_date_when_endyear', 'int');
+$search_date_when_startday = GETPOSTINT('search_date_when_startday');
+$search_date_when_startmonth = GETPOSTINT('search_date_when_startmonth');
+$search_date_when_startyear = GETPOSTINT('search_date_when_startyear');
+$search_date_when_endday = GETPOSTINT('search_date_when_endday');
+$search_date_when_endmonth = GETPOSTINT('search_date_when_endmonth');
+$search_date_when_endyear = GETPOSTINT('search_date_when_endyear');
 $search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);	// Use tzserver
 $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
-$search_recurring = GETPOST('search_recurring', 'int');
+$search_recurring = GETPOSTINT('search_recurring');
 $search_frequency = GETPOST('search_frequency', 'alpha');
 $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
-$search_status = GETPOST('search_status', 'int');
+$search_status = GETPOSTINT('search_status');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 457bd35b0d4..59f7d3d7916 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -54,7 +54,7 @@ $langs->loadLangs(array('products', 'bills', 'companies', 'projects'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -67,8 +67,8 @@ $search_amount_no_tax = GETPOST("search_amount_no_tax", "alpha");
 $search_amount_all_tax = GETPOST("search_amount_all_tax", "alpha");
 $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refsupplier = GETPOST('search_refsupplier', 'alpha');
-$search_type = GETPOST('search_type', 'int');
-$search_subtype = GETPOST('search_subtype', 'int');
+$search_type = GETPOSTINT('search_type');
+$search_subtype = GETPOSTINT('search_subtype');
 $search_project = GETPOST('search_project', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $search_company_alias = GETPOST('search_company_alias', 'alpha');
@@ -83,30 +83,30 @@ $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOST('search_status', 'int');
-$search_paymentmode = GETPOST('search_paymentmode', 'int');
-$search_paymentcond = GETPOST('search_paymentcond', 'int');
+$search_status = GETPOSTINT('search_status');
+$search_paymentmode = GETPOSTINT('search_paymentmode');
+$search_paymentcond = GETPOSTINT('search_paymentcond');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'alpha');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
 $search_date_start = GETPOSTDATE('search_date_start', '', 'tzserver');
 $search_date_end = GETPOSTDATE('search_date_end', '23:59:59', 'tzserver');
-$search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
-$search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
-$search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
-$search_datelimit_endday = GETPOST('search_datelimit_endday', 'int');
-$search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
-$search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
+$search_datelimit_startday = GETPOSTINT('search_datelimit_startday');
+$search_datelimit_startmonth = GETPOSTINT('search_datelimit_startmonth');
+$search_datelimit_startyear = GETPOSTINT('search_datelimit_startyear');
+$search_datelimit_endday = GETPOSTINT('search_datelimit_endday');
+$search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
+$search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
-$search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_categ_sup = trim(GETPOSTINT("search_categ_sup"));
+$search_product_category = GETPOSTINT('search_product_category');
 
 $option = GETPOST('search_option');
 if ($option == 'late') {
@@ -115,10 +115,10 @@ if ($option == 'late') {
 $filter = GETPOST('filtre', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -133,7 +133,7 @@ if (!$sortfield) {
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 // Security check
 if ($user->socid > 0) {
@@ -962,7 +962,7 @@ if (isModEnabled('paymentbybanktransfer') && $user->hasRight("paymentbybanktrans
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index e66f1efb45b..40e58ef7937 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -37,7 +37,7 @@ if (isModEnabled('project')) {
 
 $langs->loadLangs(array("bills", "companies"));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int'));
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid'));
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 56b24d73985..730442f4935 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -61,7 +61,7 @@ $month = GETPOSTINT('month');
 $year = GETPOSTINT('year');
 
 $search_ref = GETPOST('search_ref', 'alpha');
-$search_account = GETPOST('search_account', 'int');
+$search_account = GETPOSTINT('search_account');
 $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');
@@ -216,7 +216,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOSTINT($key));
 			}
 		}
 
@@ -268,7 +268,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_paiement' && $confirm == 'yes') {
 		$error = 0;
 
-		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datepaye = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 		$multicurrency_code = array();
 		$multicurrency_tx = array();
@@ -385,7 +385,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	$object = new FactureFournisseur($db);
 	$result = $object->fetch($facid);
 
-	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$datefacture = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 	$dateinvoice = ($datefacture == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datefacture);
 
 	$sql = 'SELECT s.nom as name, s.rowid as socid,';
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index d2ff9442df6..8ccc16990ee 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -51,7 +51,7 @@ if (!$user->hasRight("societe", "client", "voir") || $socid) {
 	$dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
 }
 
-$year = GETPOST("year", 'int');
+$year = GETPOSTINT("year");
 if (!$year) {
 	$year = date("Y");
 }
@@ -73,14 +73,14 @@ if ($action == 'builddoc') {
 	// We save charset_output to restore it because write_file can change it if needed for
 	// output format that does not support UTF8.
 	$sav_charset_output = $outputlangs->charset_output;
-	if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0) {
+	if ($rap->write_file($dir, GETPOSTINT("remonth"), GETPOSTINT("reyear"), $outputlangs) > 0) {
 		$outputlangs->charset_output = $sav_charset_output;
 	} else {
 		$outputlangs->charset_output = $sav_charset_output;
 		dol_print_error($db, $obj->error);
 	}
 
-	$year = GETPOST("reyear", 'int');
+	$year = GETPOSTINT("reyear");
 }
 
 
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 0c30719d392..401bf7248ca 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 $langs->loadLangs(array("suppliers", "orders", "companies"));
 
 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 93de58280d7..19f94afdd9b 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('banks', 'bills', 'companies', 'suppliers'));
 
 
 // Get Parameters
-$id 		= GETPOST('id', 'int');
+$id 		= GETPOSTINT('id');
 $action		= GETPOST('action', 'alpha');
 $confirm 	= GETPOST('confirm', 'alpha');
 
@@ -130,7 +130,7 @@ if ($action == 'setnum_paiement' && GETPOST('num_paiement')) {
 
 if ($action == 'setdatep' && GETPOST('datepday')) {
 	$object->fetch($id);
-	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
+	$datepaye = dol_mktime(GETPOSTINT('datephour'), GETPOSTINT('datepmin'), GETPOSTINT('datepsec'), GETPOSTINT('datepmonth'), GETPOSTINT('datepday'), GETPOSTINT('datepyear'));
 	$res = $object->update_date($datepaye);
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index 2bd45de41d3..6bdecf49b37 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array('banks', 'bills', 'companies', 'suppliers', 'other'));
 
 
 // Get Parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -60,10 +60,10 @@ if ($user->socid) {
 $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index 5979c2ff1ee..4ec07225f49 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 $langs->loadLangs(array("bills", "suppliers", "companies"));
 
 // Get Parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Initialize Objects
 $object = new PaiementFourn($db);
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 9e55e193258..835025ebd38 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -49,28 +49,28 @@ $massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $search_ref				= GETPOST('search_ref', 'alpha');
-$search_date_startday	= GETPOST('search_date_startday', 'int');
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
-$search_date_endday		= GETPOST('search_date_endday', 'int');
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
-$search_date_endyear	= GETPOST('search_date_endyear', 'int');
+$search_date_startday	= GETPOSTINT('search_date_startday');
+$search_date_startmonth	= GETPOSTINT('search_date_startmonth');
+$search_date_startyear	= GETPOSTINT('search_date_startyear');
+$search_date_endday		= GETPOSTINT('search_date_endday');
+$search_date_endmonth	= GETPOSTINT('search_date_endmonth');
+$search_date_endyear	= GETPOSTINT('search_date_endyear');
 $search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_company			= GETPOST('search_company', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
 $search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
-$search_bank_account	= GETPOST('search_bank_account', 'int');
+$search_bank_account	= GETPOSTINT('search_bank_account');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
-$search_sale            = GETPOST('search_sale', 'int');
+$search_sale            = GETPOSTINT('search_sale');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
 $sortorder				= GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
 
 if (empty($page) || $page == -1) {
 	$page = 0; // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 8b3b873a26a..00d2e015751 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -46,10 +46,10 @@ $type = GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -175,7 +175,7 @@ if ($sRefSupplier) {
 	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);
 }
 if (GETPOST('type')) {
-	$sql .= " AND p.fk_product_type = ".GETPOST('type', 'int');
+	$sql .= " AND p.fk_product_type = ".GETPOSTINT('type');
 }
 if ($sref) {
 	$sql .= natural_search('p.ref', $sref);
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index d74756cf754..02419cea24c 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 $langs->loadLangs(array('bills', 'companies'));
 
 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOSTINT("socid");
 if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index b3b8a166cc5..a3b8612c9de 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -54,10 +54,10 @@ $confirm = GETPOST('confirm');
 $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 83828e91488..93d6cbe538a 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -49,10 +49,10 @@ $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$fuserid = (GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id);
-$socid = GETPOST('socid', 'int');
+$fuserid = (GETPOSTINT('fuserid') ? GETPOSTINT('fuserid') : $user->id);
+$socid = GETPOSTINT('socid');
 
 // Load translation files required by the page
 $langs->loadLangs(array("other", "holiday", "mails", "trips"));
@@ -183,7 +183,7 @@ if (empty($reshook)) {
 				$halfday = 1;
 			}
 
-			$approverid = GETPOST('valideur', 'int');
+			$approverid = GETPOSTINT('valideur');
 			$description = trim(GETPOST('description', 'restricthtml'));
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
@@ -306,7 +306,7 @@ if (empty($reshook)) {
 
 		$object->oldcopy = dol_clone($object, 2);
 
-		$object->fk_validator = GETPOST('valideur', 'int');
+		$object->fk_validator = GETPOSTINT('valideur');
 
 		if ($object->fk_validator != $object->oldcopy->fk_validator) {
 			$verif = $object->update($user);
@@ -360,7 +360,7 @@ if (empty($reshook)) {
 		if ($object->statut == Holiday::STATUS_DRAFT) {
 			// If this is the requester or has read/write rights
 			if ($cancreate) {
-				$approverid = GETPOST('valideur', 'int');
+				$approverid = GETPOSTINT('valideur');
 				// TODO Check this approver user id has the permission for approval
 
 				$description = trim(GETPOST('description', 'restricthtml'));
@@ -1123,7 +1123,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		if (!GETPOST('date_debut_')) {	// If visitor does not come from agenda
 			print $form->selectDate(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
 		} else {
-			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
+			$tmpdate = dol_mktime(0, 0, 0, GETPOSTINT('date_debut_month'), GETPOSTINT('date_debut_day'), GETPOSTINT('date_debut_year'));
 			print $form->selectDate($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
 		}
 		print ' &nbsp; &nbsp; ';
@@ -1140,7 +1140,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		if (!GETPOST('date_fin_')) {
 			print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
 		} else {
-			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month', 'int'), GETPOST('date_fin_day', 'int'), GETPOST('date_fin_year', 'int'));
+			$tmpdate = dol_mktime(0, 0, 0, GETPOSTINT('date_fin_month'), GETPOSTINT('date_fin_day'), GETPOSTINT('date_fin_year'));
 			print $form->selectDate($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
 		}
 		print ' &nbsp; &nbsp; ';
@@ -1164,8 +1164,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			if (getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR')) {
 				$defaultselectuser = getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR'); // Can force default approver
 			}
-			if (GETPOST('valideur', 'int') > 0) {
-				$defaultselectuser = GETPOST('valideur', 'int');
+			if (GETPOSTINT('valideur') > 0) {
+				$defaultselectuser = GETPOSTINT('valideur');
 			}
 			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 			print img_picto('', 'user', 'class="pictofixedwidth"').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
@@ -1314,7 +1314,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
 					print '</td>';
 					print '<td>';
-					$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
+					$tmpdate = dol_mktime(0, 0, 0, GETPOSTINT('date_debut_month'), GETPOSTINT('date_debut_day'), GETPOSTINT('date_debut_year'));
 					print $form->selectDate($tmpdate ? $tmpdate : $object->date_debut, 'date_debut_');
 					print ' &nbsp; &nbsp; ';
 					print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ? GETPOST('starthalfday') : $starthalfday));
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 3291aa7f380..8839f4122c2 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -47,14 +47,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 $action 		= GETPOST('action', 'aZ09');
 $cancel 		= GETPOST('cancel', 'alpha');
 $confirm 		= GETPOST('confirm', 'alpha');
-$id 			= GETPOST('id', 'int');
+$id 			= GETPOSTINT('id');
 $ref 			= GETPOST('ref', 'alpha');
-$fuserid 		= (GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id);
+$fuserid 		= (GETPOSTINT('fuserid') ? GETPOSTINT('fuserid') : $user->id);
 $users 			=  (GETPOST('users', 'array') ? GETPOST('users', 'array') : array($user->id));
 $groups 		= GETPOST('groups', 'array');
-$socid 			= GETPOST('socid', 'int');
-$autoValidation 	= GETPOST('autoValidation', 'int');
-$AutoSendMail   = GETPOST('AutoSendMail', 'int');
+$socid 			= GETPOSTINT('socid');
+$autoValidation 	= GETPOSTINT('autoValidation');
+$AutoSendMail   = GETPOSTINT('AutoSendMail');
 // Load translation files required by the page
 $langs->loadLangs(array("other", "holiday", "mails", "trips"));
 
@@ -558,7 +558,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		if (!GETPOST('date_debut_')) {
 			print $form->selectDate(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
 		} else {
-			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
+			$tmpdate = dol_mktime(0, 0, 0, GETPOSTINT('date_debut_month'), GETPOSTINT('date_debut_day'), GETPOSTINT('date_debut_year'));
 			print $form->selectDate($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
 		}
 		print ' &nbsp; &nbsp; ';
@@ -575,7 +575,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		if (!GETPOST('date_fin_')) {
 			print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
 		} else {
-			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month', 'int'), GETPOST('date_fin_day', 'int'), GETPOST('date_fin_year', 'int'));
+			$tmpdate = dol_mktime(0, 0, 0, GETPOSTINT('date_fin_month'), GETPOSTINT('date_fin_day'), GETPOSTINT('date_fin_year'));
 			print $form->selectDate($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
 		}
 		print ' &nbsp; &nbsp; ';
@@ -599,8 +599,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			if (getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR')) {
 				$defaultselectuser = getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR'); // Can force default approver
 			}
-			if (GETPOST('valideur', 'int') > 0) {
-				$defaultselectuser = GETPOST('valideur', 'int');
+			if (GETPOSTINT('valideur') > 0) {
+				$defaultselectuser = GETPOSTINT('valideur');
 			}
 			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 			print img_picto('', 'user').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 7ec7edac09c..262f018054e 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -41,16 +41,16 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('optioncss', 'aZ');
 
 $search_name = GETPOST('search_name', 'alpha');
-$search_supervisor = GETPOST('search_supervisor', 'int');
+$search_supervisor = GETPOSTINT('search_supervisor');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $confirm = GETPOST('confirm', 'alpha');
 
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -273,7 +273,7 @@ if ($massaction == 'preincreaseholiday') {
 	$formquestion [] = array( 'type' => 'other',
 		'name' => 'nbdaysholydays',
 		'label' => $langs->trans("NumberDayAddMass"),
-		'value' => '<input name="nbdaysholidays" class="maxwidth75" id="nbdaysholidays" value="'.GETPOST('nbdaysholidays', 'int').'">'
+		'value' => '<input name="nbdaysholidays" class="maxwidth75" id="nbdaysholidays" value="'.GETPOSTINT('nbdaysholidays').'">'
 	);
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassIncreaseHoliday"), $langs->trans("ConfirmMassIncreaseHolidayQuestion", count($toselect)), "increaseholiday", $formquestion, 1, 0, 200, 500, 1);
 }
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index c72a42e5631..e8469b8eb20 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -40,16 +40,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'holiday', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/holiday/info.php b/htdocs/holiday/info.php
index c667633e590..0e948a1b0a2 100644
--- a/htdocs/holiday/info.php
+++ b/htdocs/holiday/info.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 // Load translation files required by the page
 $langs->load("holiday");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index e09687f6939..e07efba6b2d 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 
 $action     = GETPOST('action', 'aZ09'); // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -57,7 +57,7 @@ $mode        = GETPOST('mode', 'alpha'); // for switch mode view result
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $childids = $user->getAllChildIds(1);
 
@@ -66,10 +66,10 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user-
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -85,19 +85,19 @@ if (!$sortfield) {
 
 $sall                = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref          = GETPOST('search_ref', 'alphanohtml');
-$search_day_create   = GETPOST('search_day_create', 'int');
-$search_month_create = GETPOST('search_month_create', 'int');
-$search_year_create  = GETPOST('search_year_create', 'int');
-$search_day_start    = GETPOST('search_day_start', 'int');
-$search_month_start  = GETPOST('search_month_start', 'int');
-$search_year_start   = GETPOST('search_year_start', 'int');
-$search_day_end      = GETPOST('search_day_end', 'int');
-$search_month_end    = GETPOST('search_month_end', 'int');
-$search_year_end     = GETPOST('search_year_end', 'int');
-$search_employee     = GETPOST('search_employee', 'int');
-$search_valideur     = GETPOST('search_valideur', 'int');
-$search_status       = GETPOSTISSET('search_status') ? GETPOST('search_status', 'int') : GETPOST('search_statut', 'int');
-$search_type         = GETPOST('search_type', 'int');
+$search_day_create   = GETPOSTINT('search_day_create');
+$search_month_create = GETPOSTINT('search_month_create');
+$search_year_create  = GETPOSTINT('search_year_create');
+$search_day_start    = GETPOSTINT('search_day_start');
+$search_month_start  = GETPOSTINT('search_month_start');
+$search_year_start   = GETPOSTINT('search_year_start');
+$search_day_end      = GETPOSTINT('search_day_end');
+$search_month_end    = GETPOSTINT('search_month_end');
+$search_year_end     = GETPOSTINT('search_year_end');
+$search_employee     = GETPOSTINT('search_employee');
+$search_valideur     = GETPOSTINT('search_valideur');
+$search_status       = GETPOSTISSET('search_status') ? GETPOSTINT('search_status') : GETPOSTINT('search_statut');
+$search_type         = GETPOSTINT('search_type');
 
 // Initialize technical objects
 $object = new Holiday($db);
@@ -474,7 +474,7 @@ if (!empty($permissiontodelete)) {
 if (!empty($permissiontoapprove)) {
 	$arrayofmassactions['preapproveleave'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Approve");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index c074eaccc6a..a29801a4d52 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -40,14 +40,14 @@ $massaction  = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ');
 $optioncss   = GETPOST('optioncss', 'aZ');
 $socid = 0;
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $search_ref         = GETPOST('search_ref', 'alphanohtml');
-$search_employee    = GETPOST('search_employee', 'int');
-$search_type        = GETPOST('search_type', 'int');
+$search_employee    = GETPOSTINT('search_employee');
+$search_type        = GETPOSTINT('search_type');
 $search_description = GETPOST('search_description', 'alphanohtml');
 
-$limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit       = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
 $sortorder   = GETPOST('sortorder', 'aZ09comma');
 
@@ -58,7 +58,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
@@ -146,8 +146,8 @@ $title = $langs->trans('CPTitreMenu');
 
 llxHeader('', $title);
 
-$search_month = GETPOST("remonth", 'int') ? GETPOST("remonth", 'int') : date("m", time());
-$search_year = GETPOST("reyear", 'int') ? GETPOST("reyear", 'int') : date("Y", time());
+$search_month = GETPOSTINT("remonth") ? GETPOSTINT("remonth") : date("m", time());
+$search_year = GETPOSTINT("reyear") ? GETPOSTINT("reyear") : date("Y", time());
 $year_month = sprintf("%04d", $search_year).'-'.sprintf("%02d", $search_month);
 
 $sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, cp.fk_type, cp.description, cp.halfday, cp.statut as status";
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 358e03ec203..f5e6bb89491 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 $action             = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction         = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $mode      = GETPOST('mode', 'alpha');
-$show_files         = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files         = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm            = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel             = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect           = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -49,20 +49,20 @@ $backtopage         = GETPOST('backtopage', 'alpha'); // Go back to a dedicated
 $optioncss          = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $search_id          = GETPOST('search_id', 'alphanohtml');
-$search_month       = GETPOST('search_month', 'int');
-$search_year        = GETPOST('search_year', 'int');
-$search_employee    = GETPOST('search_employee', 'int');
-$search_validator   = GETPOST('search_validator', 'int');
+$search_month       = GETPOSTINT('search_month');
+$search_year        = GETPOSTINT('search_year');
+$search_employee    = GETPOSTINT('search_employee');
+$search_validator   = GETPOSTINT('search_validator');
 $search_description = GETPOST('search_description', 'alphanohtml');
-$search_type        = GETPOST('search_type', 'int');
+$search_type        = GETPOSTINT('search_type');
 $search_prev_solde  = GETPOST('search_prev_solde', 'alphanohtml');
 $search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 9c0a8dad19a..5dacecd2c3c 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -60,7 +60,7 @@ if (empty($page) || $page == -1) {
 	$page = 0;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 904627e7cfb..d9b0900e5bc 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -35,7 +35,7 @@ $error = 0;
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // List of status
 static $tmpstatus2label = array(
@@ -100,7 +100,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 			$object->status = GETPOSTINT('status');
 			$object->fk_user_author	= $user->id;
 			$object->datec = dol_now();
-			$object->entity = GETPOST('entity', 'int') > 0 ? GETPOST('entity', 'int') : $conf->entity;
+			$object->entity = GETPOSTINT('entity') > 0 ? GETPOSTINT('entity') : $conf->entity;
 
 			$id = $object->create($user);
 
@@ -136,19 +136,19 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 			$object->country_id     = GETPOSTINT('country_id');
 			$object->fk_user_mod = $user->id;
 			$object->status         = GETPOSTINT('status');
-			$object->entity         = GETPOST('entity', 'int') > 0 ? GETPOST('entity', 'int') : $conf->entity;
+			$object->entity         = GETPOSTINT('entity') > 0 ? GETPOSTINT('entity') : $conf->entity;
 
 			$result = $object->update($user);
 
 			if ($result > 0) {
-				header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOSTINT('id'));
 				exit;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	} else {
-		header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOSTINT('id'));
 		exit;
 	}
 }
@@ -232,7 +232,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td>';
 	print '<td class="maxwidthonsmartphone">';
-	print $form->select_country(GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : ($object->country_id ? $object->country_id : $mysoc->country_id), 'country_id');
+	print $form->select_country(GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : ($object->country_id ? $object->country_id : $mysoc->country_id), 'country_id');
 	if ($user->admin) {
 		print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	}
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index d879cf0dea9..0df72d8c37c 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 $langs->loadLangs(array('admin', 'hrm'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -46,10 +46,10 @@ if (GETPOST('actioncode', 'array')) {
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 6a51a67396a..ce32527702f 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -58,10 +58,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 742b109fc1f..4ab248ef0fc 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skillrank.lib.php';
 $langs->loadLangs(array('hrm', 'other', 'products'));  // why products?
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -51,7 +51,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'evaluationcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new Evaluation($db);
@@ -143,10 +143,10 @@ if (empty($reshook)) {
 
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -469,7 +469,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print '<br>';
 
-		print '	<form name="form_save_rank" id="form_save_rank" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="form_save_rank" id="form_save_rank" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="saveSkill">
 		<input type="hidden" name="mode" value="">
@@ -490,7 +490,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		// Lines of evaluated skills
 		// $object is Evaluation
-		$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1);
 
 		if (empty($object->lines)) {
 			print '<tr><td colspan="4"><span class="opacitymedium">'.img_warning().' '.$langs->trans("TheJobProfileHasNoSkillsDefinedFixBefore").'</td></tr>';
diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php
index d99f76d4588..c3a53411b34 100644
--- a/htdocs/hrm/evaluation_contact.php
+++ b/htdocs/hrm/evaluation_contact.php
@@ -39,10 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
 
 // Get Parameters
-$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Initialize technical objects
@@ -76,7 +76,7 @@ $permission = $user->hasRight('hrm', 'evaluation', 'write');
 // Add a new contact
 
 if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
@@ -93,7 +93,7 @@ if ($action == 'addcontact' && $permission) {
 	}
 } elseif ($action == 'swapstatut' && $permission) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $permission) {
 	// Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index 4ec3fc93b2e..12731eedf19 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -43,14 +43,14 @@ $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 790326a2089..f9d820c9d89 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -45,7 +45,7 @@ $langs->loadLangs(array('hrm', 'other'));
 // Get Parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -54,14 +54,14 @@ $backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode        = GETPOST('mode', 'alpha'); // for mode view result
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -99,8 +99,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -402,9 +402,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -429,7 +429,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/hrm/evaluation_note.php b/htdocs/hrm/evaluation_note.php
index 37a8a479af7..1e078be00d9 100644
--- a/htdocs/hrm/evaluation_note.php
+++ b/htdocs/hrm/evaluation_note.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
 $langs->loadLangs(array('hrm', 'companies'));
 
 // Get parameters
-$id   = GETPOST('id', 'int');
+$id   = GETPOSTINT('id');
 $ref  = GETPOST('ref', 'alpha');
 
 $action     = GETPOST('action', 'aZ09');
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 5b465992fea..0bf7d5c5ff6 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -61,7 +61,7 @@ $hookmanager->initHooks('hrmindex');
 $langs->loadLangs(array('users', 'holiday', 'trips', 'boxes'));
 
 // Get Parameters
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 
 // Protection if external user
 if ($user->socid > 0) {
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index f13d0e88d8b..4b374757026 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -56,10 +56,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php
index 1cfbc38a80e..be87900e2c0 100644
--- a/htdocs/hrm/job_card.php
+++ b/htdocs/hrm/job_card.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
 $langs->loadLangs(array('hrm', 'other', 'products'));   // why products?
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -48,7 +48,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'jobcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new Job($db);
@@ -142,10 +142,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -414,7 +414,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOSTINT('lineid')) . '" method="POST">
 		<input type="hidden" name="token" value="' . newToken() . '">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
 		<input type="hidden" name="mode" value="">
@@ -432,7 +432,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1);
 		}
 
 		// Form to add new line
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index 3f9ff9a74dc..2c7e0887a35 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -41,14 +41,14 @@ $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 4bdd686561f..d184a6bb6bd 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -45,7 +45,7 @@ $langs->loadLangs(array('hrm', 'other'));
 // Get Parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -54,13 +54,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode        = GETPOST('mode', 'alpha'); // for view result with other mode
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -98,8 +98,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -379,9 +379,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -406,7 +406,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/hrm/job_note.php b/htdocs/hrm/job_note.php
index 61d82ec2781..ff377cdbbe9 100644
--- a/htdocs/hrm/job_note.php
+++ b/htdocs/hrm/job_note.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
 $langs->loadLangs(array('hrm', 'companies'));
 
 // Get parameters
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
 
 $action     = GETPOST('action', 'aZ09');
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index da268f7a6b7..69807b143f1 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -43,7 +43,7 @@ $langs->loadLangs(array("hrm", "other", 'products'));
 
 $action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files  = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files  = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm 	 = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel 	 = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect 	 = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -52,19 +52,19 @@ $optioncss 	 = GETPOST('optioncss', 'aZ'); // Option for the css output (always
 $backtopage  = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$id		 = GETPOST('id', 'int');
+$id		 = GETPOSTINT('id');
 $ref 	 = GETPOST('ref', 'alpha');
-$fk_job  = (GETPOSTISSET('fk_job') ? GETPOST('fk_job', 'int') : $id);
-$fk_user = GETPOST('fk_user', 'int');
+$fk_job  = (GETPOSTISSET('fk_job') ? GETPOSTINT('fk_job') : $id);
+$fk_user = GETPOSTINT('fk_user');
 //$start_date = date('Y-m-d', GETPOST('date_startyear', 'int').'-'.GETPOST('date_startmonth', 'int').'-'.GETPOST('date_startday', 'int'));
-$start_date = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+$start_date = dol_mktime(0, 0, 0, GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
 
 
 // Load variable for pagination
-$limit 	     = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 	     = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
 $sortorder   = GETPOST('sortorder', 'aZ09comma');
-$page 	     = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page 	     = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -105,8 +105,8 @@ foreach ($objectposition->fields as $key => $val) {
 		$search[$key] = GETPOST('search_' . $key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_' . $key . '_dtstartmonth', 'int'), GETPOST('search_' . $key . '_dtstartday', 'int'), GETPOST('search_' . $key . '_dtstartyear', 'int'));
-		$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_' . $key . '_dtendmonth', 'int'), GETPOST('search_' . $key . '_dtendday', 'int'), GETPOST('search_' . $key . '_dtendyear', 'int'));
+		$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_' . $key . '_dtstartmonth'), GETPOSTINT('search_' . $key . '_dtstartday'), GETPOSTINT('search_' . $key . '_dtstartyear'));
+		$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_' . $key . '_dtendmonth'), GETPOSTINT('search_' . $key . '_dtendday'), GETPOSTINT('search_' . $key . '_dtendyear'));
 	}
 }
 
@@ -482,7 +482,7 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'
 	if ($permissiontodelete) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"') . $langs->trans("Delete");
 	}
-	if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 		$arrayofmassactions = array();
 	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index 232acae98c3..3ecc73f3dc3 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -58,10 +58,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php
index dc83d41e0d5..ad28f36351a 100644
--- a/htdocs/hrm/position_card.php
+++ b/htdocs/hrm/position_card.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
 $action 	= GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$id 	= GETPOST('id', 'int');
+$id 	= GETPOSTINT('id');
 
 // Initialize technical objects
 $form = new Form($db);
@@ -75,8 +75,8 @@ $langs->loadLangs(array("hrm", "other"));
 
 
 // Get parameters
-$id 	= GETPOST('id', 'int');
-$fk_job = GETPOST('fk_job', 'int');
+$id 	= GETPOSTINT('id');
+$fk_job = GETPOSTINT('fk_job');
 
 $ref 	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -164,10 +164,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index d32e56ee93b..35bb7e2ffb4 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -42,14 +42,14 @@ $langs->loadLangs(array("hrm", "companies", "other", "mails"));
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 00d2b65feef..5d8dcf538e9 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -44,7 +44,7 @@ $langs->loadLangs(array('hrm', 'other'));
 // Get Parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -53,14 +53,14 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -99,8 +99,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -391,9 +391,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -418,7 +418,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/hrm/position_note.php b/htdocs/hrm/position_note.php
index d7a9efa6cba..d3e8121b893 100644
--- a/htdocs/hrm/position_note.php
+++ b/htdocs/hrm/position_note.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
 $langs->loadLangs(array('hrm', 'companies'));
 
 // Get parameters
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index e6b5368a782..743bb51e2e4 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -58,10 +58,10 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Get Parameters for Pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 4f873ad5f2d..6aeafeb78a3 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 $langs->loadLangs(array('hrm', 'other', 'products'));  // why products?
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -48,7 +48,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skillcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new Skill($db);
@@ -164,10 +164,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -503,7 +503,7 @@ if ($action != "create" && $action != "edit") {
 
 	$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 	$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-	$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+	$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 	$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
 	$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 	$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -511,13 +511,13 @@ if ($action != "create" && $action != "edit") {
 	$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 	$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-	$id = GETPOST('id', 'int');
+	$id = GETPOSTINT('id');
 
 	// Load variable for pagination
 	$limit = 0;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 	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;
@@ -548,8 +548,8 @@ if ($action != "create" && $action != "edit") {
 			$search[$key] = GETPOST('search_' . $key, 'alpha');
 		}
 		if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_' . $key . '_dtstartmonth', 'int'), GETPOST('search_' . $key . '_dtstartday', 'int'), GETPOST('search_' . $key . '_dtstartyear', 'int'));
-			$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_' . $key . '_dtendmonth', 'int'), GETPOST('search_' . $key . '_dtendday', 'int'), GETPOST('search_' . $key . '_dtendyear', 'int'));
+			$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_' . $key . '_dtstartmonth'), GETPOSTINT('search_' . $key . '_dtstartday'), GETPOSTINT('search_' . $key . '_dtstartyear'));
+			$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_' . $key . '_dtendmonth'), GETPOSTINT('search_' . $key . '_dtendday'), GETPOSTINT('search_' . $key . '_dtendyear'));
 		}
 	}
 
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index 6c898faced2..7d7b1ace384 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -42,14 +42,14 @@ $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
 // Get Parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get Parameters for Pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 780e57d3a74..fc867019aa9 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -46,7 +46,7 @@ $langs->loadLangs(array('hrm', 'other'));
 // Get Parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -55,13 +55,13 @@ $backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode        = GETPOST('mode', 'alpha'); // for mode view result
 
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -99,8 +99,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -389,9 +389,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -416,7 +416,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/hrm/skill_note.php b/htdocs/hrm/skill_note.php
index 645180ec4ec..4b2b4bfe427 100644
--- a/htdocs/hrm/skill_note.php
+++ b/htdocs/hrm/skill_note.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 $langs->loadLangs(array('hrm', 'companies'));
 
 // Get parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 4a1026a475d..861310b7849 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -51,11 +51,11 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sk
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $TSkillsToAdd = GETPOST('fk_skill', 'array');
 $objecttype = GETPOST('objecttype', 'alpha');
 $TNote = GETPOST('TNote', 'array');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 
 if (empty($objecttype)) {
 	$objecttype = 'job';
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index a13f7178e77..ef68400738d 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -136,7 +136,7 @@ $confirm			= GETPOST('confirm', 'alpha');
 $step				= (GETPOST('step') ? GETPOST('step') : 1);
 $import_name = GETPOST('import_name');
 $hexa				= GETPOST('hexa');
-$importmodelid = GETPOST('importmodelid', 'int');
+$importmodelid = GETPOSTINT('importmodelid');
 $excludefirstline = (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 2);
 $endatlinenb		= (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
 $updatekeys			= (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array());
@@ -219,8 +219,8 @@ if ($action=='downfield' || $action=='upfield')
 // }
 
 if ($action == 'deleteprof') {
-	if (GETPOST("id", 'int')) {
-		$objimport->fetch(GETPOST("id", 'int'));
+	if (GETPOSTINT("id")) {
+		$objimport->fetch(GETPOSTINT("id"));
 		$result = $objimport->delete($user);
 	}
 }
diff --git a/htdocs/index.php b/htdocs/index.php
index 7ed50b0761f..516afe06f43 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -58,8 +58,8 @@ if ($nbmodulesnotautoenabled <= getDolGlobalString('MAIN_MIN_NB_ENABLED_MODULE_F
 }
 if (GETPOST('addbox')) {	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'int');
-	$userid = GETPOST('userid', 'int');
+	$zone = GETPOSTINT('areacode');
+	$userid = GETPOSTINT('userid');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
 
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php
index e2d47656da1..a5350d6bad4 100644
--- a/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php
@@ -14,10 +14,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
index e2d47656da1..a5350d6bad4 100644
--- a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
@@ -14,10 +14,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
index e2d47656da1..a5350d6bad4 100644
--- a/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
@@ -14,10 +14,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
index e2d47656da1..a5350d6bad4 100644
--- a/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
@@ -14,10 +14,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
index e2d47656da1..a5350d6bad4 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
@@ -14,10 +14,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php
index 4ca5fbf8ba9..309d4f935fa 100644
--- a/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php
@@ -14,10 +14,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ?GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 1df7e952ad8..ffd1ff7b54e 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -53,7 +53,7 @@ $db_host = GETPOST('db_host', 'alpha') ? GETPOST('db_host', 'alpha') : (empty($a
 $db_name = GETPOST('db_name', 'aZ09') ? GETPOST('db_name', 'aZ09') : (empty($argv[10]) ? '' : $argv[10]);
 $db_user = GETPOST('db_user', 'alpha') ? GETPOST('db_user', 'alpha') : (empty($argv[11]) ? '' : $argv[11]);
 $db_pass = GETPOST('db_pass', 'none') ? GETPOST('db_pass', 'none') : (empty($argv[12]) ? '' : $argv[12]);
-$db_port = GETPOST('db_port', 'int') ? GETPOST('db_port', 'int') : (empty($argv[13]) ? '' : $argv[13]);
+$db_port = GETPOSTINT('db_port') ? GETPOSTINT('db_port') : (empty($argv[13]) ? '' : $argv[13]);
 $db_prefix = GETPOST('db_prefix', 'aZ09') ? GETPOST('db_prefix', 'aZ09') : (empty($argv[14]) ? '' : $argv[14]);
 $db_create_database = GETPOST('db_create_database', 'alpha') ? GETPOST('db_create_database', 'alpha') : (empty($argv[15]) ? '' : $argv[15]);
 $db_create_user = GETPOST('db_create_user', 'alpha') ? GETPOST('db_create_user', 'alpha') : (empty($argv[16]) ? '' : $argv[16]);
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 358385af8f7..50a1fdb9a84 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php
 $langs->loadLangs(array("intracommreport"));
 
 // Get Parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action');
 $year = GETPOSTINT('year');
 $month = GETPOSTINT('month');
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index bfe946431af..8e7ae4fa679 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -34,22 +34,22 @@ $langs->loadLangs(array('intracommreport'));
 // Get Parameters
 $action = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", 'alpha');
-$search_type = GETPOST("search_type", 'int');
+$search_type = GETPOSTINT("search_type");
 $optioncss = GETPOST('optioncss', 'alpha');
-$type = GETPOST("type", "int");
+$type = GETPOSTINT("type");
 
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index 9fbfce3b76f..e9577a3bf6d 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -39,7 +39,7 @@ $action = GETPOST('action', 'aZ09');
 // if (! $user->rights->knowledgemanagement->myobject->read) {
 // 	accessforbidden();
 // }
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 3d4445518ee..56cd8d53062 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -36,12 +36,12 @@ require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_kno
 $langs->loadLangs(array("knowledgemanagement", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -54,10 +54,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 23f09690b09..b44d5c3e5c5 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 $langs->loadLangs(array("knowledgemanagement", "ticket", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -44,7 +44,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new KnowledgeRecord($db);
@@ -139,10 +139,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index ced6e806c6f..e793d61dbe9 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_kno
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Initialize technical objects
@@ -64,7 +64,7 @@ $permission = $user->hasRight('knowledgemanagement', 'knowledgerecord', 'write')
  */
 
 if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
@@ -81,7 +81,7 @@ if ($action == 'addcontact' && $permission) {
 	}
 } elseif ($action == 'swapstatut' && $permission) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $permission) {
 	// Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 75780701b36..80761fbef89 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -38,14 +38,14 @@ $langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 97d48d8d00d..a2e0fa51aef 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("knowledgemanagement", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -47,20 +47,20 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'aZ09');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $searchCategoryKnowledgemanagementList = GETPOST('search_category_knowledgemanagement_list', 'array');
 $searchCategoryKnowledgemanagementOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
-	$searchCategoryKnowledgemanagementOperator = GETPOST('search_category_knowledgemanagement_operator', 'int');
+	$searchCategoryKnowledgemanagementOperator = GETPOSTINT('search_category_knowledgemanagement_operator');
 } elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
 	$searchCategoryKnowledgemanagementOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -101,8 +101,8 @@ foreach ($object->fields as $key => $val) {
 	}
 
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -410,9 +410,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -440,7 +440,7 @@ if (isModEnabled('category') && $user->hasRight('knowledgemanagement', 'knowledg
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 053b0264a02..7d5401cb9d0 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_kno
 $langs->loadLangs(array("knowledgemanagement", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index 73b222c8274..30a275fbd44 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -40,8 +40,8 @@ require DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 $mens = price2num(GETPOST('mens'));
 $capital = price2num(GETPOST('capital'));
 $rate = price2num(GETPOST('rate'));
-$echance = GETPOST('echeance', 'int');
-$nbterm = GETPOST('nbterm', 'int');
+$echance = GETPOSTINT('echeance');
+$nbterm = GETPOSTINT('nbterm');
 
 top_httphead();
 
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 981d805e52b..34f035e9d37 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -46,15 +46,15 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "compta", "loan"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 
-$projectid = GETPOST('projectid', 'int');
+$projectid = GETPOSTINT('projectid');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -104,8 +104,8 @@ if (empty($reshook)) {
 	// Add loan
 	if ($action == 'add' && $user->hasRight('loan', 'write')) {
 		if (!$cancel) {
-			$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int'));
-			$dateend = dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
+			$datestart = dol_mktime(12, 0, 0, GETPOSTINT('startmonth'), GETPOSTINT('startday'), GETPOSTINT('startyear'));
+			$dateend = dol_mktime(12, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
 			$capital = price2num(GETPOST('capital'));
 			$rate = price2num(GETPOST('rate'));
 
@@ -141,7 +141,7 @@ if (empty($reshook)) {
 				$object->note_private = GETPOST('note_private', 'restricthtml');
 				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->fk_project = GETPOSTINT('projectid');
-				$object->insurance_amount = GETPOST('insurance_amount', 'int');
+				$object->insurance_amount = GETPOSTINT('insurance_amount');
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');
@@ -179,8 +179,8 @@ if (empty($reshook)) {
 		if (!$cancel) {
 			$result = $object->fetch($id);
 
-			$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int'));
-			$dateend = dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
+			$datestart = dol_mktime(12, 0, 0, GETPOSTINT('startmonth'), GETPOSTINT('startday'), GETPOSTINT('startyear'));
+			$dateend = dol_mktime(12, 0, 0, GETPOSTINT('endmonth'), GETPOSTINT('endday'), GETPOSTINT('endyear'));
 			$capital = price2num(GETPOST('capital'));
 
 			if (!$capital) {
@@ -190,9 +190,9 @@ if (empty($reshook)) {
 				$object->datestart = $datestart;
 				$object->dateend = $dateend;
 				$object->capital = $capital;
-				$object->nbterm = GETPOST("nbterm", 'int');
+				$object->nbterm = GETPOSTINT("nbterm");
 				$object->rate = price2num(GETPOST("rate", 'alpha'));
-				$object->insurance_amount = price2num(GETPOST('insurance_amount', 'int'));
+				$object->insurance_amount = price2num(GETPOSTINT('insurance_amount'));
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');
@@ -276,7 +276,7 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewLoan"), '', 'money-bill-alt');
 
-	$datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$datec = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 	print '<form name="loan" method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 56bf59b10cc..19b7c76bfaf 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -36,7 +36,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("other", "companies", "compta", "bills", "loan"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -47,10 +47,10 @@ if ($user->socid) {
 $result = restrictedArea($user, 'loan', $id, '', '');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 5017ef4ce3f..436caf903d2 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -34,11 +34,11 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "loan"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index d7487780413..38c9b66f0a2 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("banks", "bills", "compta", "loan"));
 // Get parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -43,10 +43,10 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -97,14 +97,14 @@ $object->fields = dol_sort_array($object->fields, 'position');
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$search_ref = GETPOST('search_ref', 'int');
+$search_ref = GETPOSTINT('search_ref');
 $search_label = GETPOST('search_label', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
 $permissiontoadd = $user->hasRight('loan', 'write');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -260,7 +260,7 @@ $arrayofmassactions = array();
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index ff5938a63c7..27a9d0bc70b 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -41,7 +41,7 @@ $action = GETPOST('action', 'aZ09');
 $langs->loadLangs(array("loan"));
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $hookmanager->initHooks(array('loannote'));
 $result = restrictedArea($user, 'loan', $id, '&loan');
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index da6159fb493..1ec4aacd72d 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -33,7 +33,7 @@ if (isModEnabled("banque")) {
 $langs->loadLangs(array("bills", "banks", "companies", "loan"));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 if ($user->socid) {
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index b2d22fbd1b7..9e6cda0866d 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -33,17 +33,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
 $langs->loadLangs(array("bills", "loan"));
 
-$chid = GETPOST('id', 'int');
+$chid = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+$datepaid = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 // Security check
 $socid = 0;
 if ($user->socid > 0) {
 	$socid = $user->socid;
 } elseif (GETPOSTISSET('socid')) {
-	$socid = GETPOST('socid', 'int');
+	$socid = GETPOSTINT('socid');
 }
 if (!$user->hasRight('loan', 'write')) {
 	accessforbidden();
@@ -98,7 +98,7 @@ if ($action == 'add_payment') {
 		exit;
 	}
 
-	if (!GETPOST('paymenttype', 'int') > 0) {
+	if (!GETPOSTINT('paymenttype') > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 	}
@@ -106,7 +106,7 @@ if ($action == 'add_payment') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-	if (isModEnabled("banque") && !GETPOST('accountid', 'int') > 0) {
+	if (isModEnabled("banque") && !GETPOSTINT('accountid') > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 	}
@@ -153,7 +153,7 @@ if ($action == 'add_payment') {
 			$payment->amount_insurance	= $pay_amount_insurance;
 			$payment->amount_interest	= $pay_amount_interest;
 			$payment->fk_bank           = GETPOSTINT('accountid');
-			$payment->paymenttype       = GETPOST('paymenttype', 'int');
+			$payment->paymenttype       = GETPOSTINT('paymenttype');
 			$payment->num_payment		= GETPOST('num_payment', 'alphanohtml');
 			$payment->note_private      = GETPOST('note_private', 'restricthtml');
 			$payment->note_public       = GETPOST('note_public', 'restricthtml');
@@ -167,6 +167,7 @@ if ($action == 'add_payment') {
 			}
 
 			if (!$error) {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', $payment->fk_bank, '', '');
 				if (!($result > 0)) {
 					setEventMessages($payment->error, $payment->errors, 'errors');
@@ -302,7 +303,7 @@ if ($action == 'create') {
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td colspan="2">';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1); // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOSTINT("accountid") : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index e4a9424c21c..1864c309298 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -31,13 +31,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
 
-$loanid = GETPOST('loanid', 'int');
+$loanid = GETPOSTINT('loanid');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = 0;
 if (GETPOSTISSET('socid')) {
-	$socid = GETPOST('socid', 'int');
+	$socid = GETPOSTINT('socid');
 }
 if ($user->socid) {
 	$socid = $user->socid;
@@ -69,7 +69,7 @@ if ($action == 'createecheancier' && empty($pay_without_schedule)) {
 	$db->begin();
 	$i = 1;
 	while ($i < $object->nbterm + 1) {
-		$date = GETPOST('hi_date'.$i, 'int');
+		$date = GETPOSTINT('hi_date'.$i);
 		$mens = price2num(GETPOST('mens'.$i));
 		$int = price2num(GETPOST('hi_interets'.$i));
 		$insurance = price2num(GETPOST('hi_insurance'.$i));
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8da0a809522..4e1867a4f4c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -466,7 +466,7 @@ if (GETPOST('theme', 'aZ09')) {
 }
 
 // Set global MAIN_OPTIMIZEFORTEXTBROWSER (must be before login part)
-if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks')) {   // If we must enable text browser
+if (GETPOSTINT('textbrowser') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks')) {   // If we must enable text browser
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
 }
 
@@ -611,7 +611,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 		// If token is not provided or empty, error (we are in case it is mandatory)
 		if (!GETPOST('token', 'alpha') || GETPOST('token', 'alpha') == 'notrequired') {
 			top_httphead();
-			if (GETPOST('uploadform', 'int')) {
+			if (GETPOSTINT('uploadform')) {
 				dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused. File size too large or not provided.");
 				$langs->loadLangs(array("errors", "install"));
 				print $langs->trans("ErrorFileSizeTooLarge").' ';
@@ -828,7 +828,7 @@ if (!defined('NOLOGIN')) {
 		// TODO Remove use of $_COOKIE['login_dolibarr'] ? Replace $usertotest = with $usertotest = GETPOST("username", "alpha", $allowedmethodtopostusername);
 		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_@\-\.]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
 		$passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
-		$entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
+		$entitytotest = (GETPOSTINT('entity') ? GETPOSTINT('entity') : (!empty($conf->entity) ? $conf->entity : 1));
 
 		// Define if we received the correct data to go into the test of the login with the checkLoginPassEntity().
 		$goontestloop = false;
@@ -1012,11 +1012,11 @@ if (!defined('NOLOGIN')) {
 			}
 
 			$paramsurl = array();
-			if (GETPOST('textbrowser', 'int')) {
-				$paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOSTINT('textbrowser')) {
+				$paramsurl[] = 'textbrowser='.GETPOSTINT('textbrowser');
 			}
-			if (GETPOST('nojs', 'int')) {
-				$paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOSTINT('nojs')) {
+				$paramsurl[] = 'nojs='.GETPOSTINT('nojs');
 			}
 			if (GETPOST('lang', 'aZ09')) {
 				$paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
@@ -1096,11 +1096,11 @@ if (!defined('NOLOGIN')) {
 			}
 
 			$paramsurl = array();
-			if (GETPOST('textbrowser', 'int')) {
-				$paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOSTINT('textbrowser')) {
+				$paramsurl[] = 'textbrowser='.GETPOSTINT('textbrowser');
 			}
-			if (GETPOST('nojs', 'int')) {
-				$paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOSTINT('nojs')) {
+				$paramsurl[] = 'nojs='.GETPOSTINT('nojs');
 			}
 			if (GETPOST('lang', 'aZ09')) {
 				$paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
@@ -1319,7 +1319,7 @@ if (GETPOST('theme', 'aZ09')) {
 }
 
 // Set javascript option
-if (GETPOST('nojs', 'int')) {  // If javascript was not disabled on URL
+if (GETPOSTINT('nojs')) {  // If javascript was not disabled on URL
 	$conf->use_javascript_ajax = 0;
 } else {
 	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {
@@ -1336,19 +1336,19 @@ if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && !empty($user->conf->MA
 $conf->global->MAIN_OPTIMIZEFORCOLORBLIND = empty($user->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? '' : $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu'])) {
+if (GETPOSTINT('dol_hide_leftmenu') || !empty($_SESSION['dol_hide_leftmenu'])) {
 	$conf->dol_hide_leftmenu = 1;
 }
-if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu'])) {
+if (GETPOSTINT('dol_hide_topmenu') || !empty($_SESSION['dol_hide_topmenu'])) {
 	$conf->dol_hide_topmenu = 1;
 }
-if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) {
+if (GETPOSTINT('dol_optimize_smallscreen') || !empty($_SESSION['dol_optimize_smallscreen'])) {
 	$conf->dol_optimize_smallscreen = 1;
 }
-if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover'])) {
+if (GETPOSTINT('dol_no_mouse_hover') || !empty($_SESSION['dol_no_mouse_hover'])) {
 	$conf->dol_no_mouse_hover = 1;
 }
-if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile'])) {
+if (GETPOSTINT('dol_use_jmobile') || !empty($_SESSION['dol_use_jmobile'])) {
 	$conf->dol_use_jmobile = 1;
 }
 // If not on Desktop
@@ -1566,7 +1566,7 @@ if (!function_exists("llxHeader")) {
 		print '<body id="mainbody" class="'.$tmpcsstouse.'">'."\n";
 
 		// top menu and left menu area
-		if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && !GETPOST('dol_openinpopup', 'aZ09')) {
+		if ((empty($conf->dol_hide_topmenu) || GETPOSTINT('dol_invisible_topmenu')) && !GETPOSTINT('dol_openinpopup')) {
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
 
@@ -1800,8 +1800,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		}
 
 		// Auto refresh page
-		if (GETPOST('autorefresh', 'int') > 0) {
-			print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
+		if (GETPOSTINT('autorefresh') > 0) {
+			print '<meta http-equiv="refresh" content="'.GETPOSTINT('autorefresh').'">';
 		}
 
 		// Displays title
@@ -1833,8 +1833,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		print "\n";
 
-		if (GETPOST('version', 'int')) {
-			$ext = 'version='.GETPOST('version', 'int'); // useful to force no cache on css/js
+		if (GETPOSTINT('version')) {
+			$ext = 'version='.GETPOSTINT('version'); // useful to force no cache on css/js
 		}
 		// Refresh value of MAIN_IHM_PARAMS_REV before forging the parameter line.
 		if (GETPOST('dol_resetcache')) {
@@ -1845,26 +1845,26 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
 		if (GETPOSTISSET('dol_hide_topmenu')) {
-			$themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int');
+			$themeparam .= '&amp;dol_hide_topmenu='.GETPOSTINT('dol_hide_topmenu');
 		}
 		if (GETPOSTISSET('dol_hide_leftmenu')) {
-			$themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int');
+			$themeparam .= '&amp;dol_hide_leftmenu='.GETPOSTINT('dol_hide_leftmenu');
 		}
 		if (GETPOSTISSET('dol_optimize_smallscreen')) {
-			$themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int');
+			$themeparam .= '&amp;dol_optimize_smallscreen='.GETPOSTINT('dol_optimize_smallscreen');
 		}
 		if (GETPOSTISSET('dol_no_mouse_hover')) {
-			$themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int');
+			$themeparam .= '&amp;dol_no_mouse_hover='.GETPOSTINT('dol_no_mouse_hover');
 		}
 		if (GETPOSTISSET('dol_use_jmobile')) {
-			$themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int');
-			$conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
+			$themeparam .= '&amp;dol_use_jmobile='.GETPOSTINT('dol_use_jmobile');
+			$conf->dol_use_jmobile = GETPOSTINT('dol_use_jmobile');
 		}
 		if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
-			$themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int');
+			$themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOSTINT('THEME_DARKMODEENABLED');
 		}
 		if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-			$themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int');
+			$themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOSTINT('THEME_SATURATE_RATIO');
 		}
 
 		if (getDolGlobalString('MAIN_ENABLE_FONT_ROBOTO')) {
@@ -2167,7 +2167,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 	/*
 	 * Top menu
 	 */
-	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
+	if ((empty($conf->dol_hide_topmenu) || GETPOSTINT('dol_invisible_topmenu')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 		if (!isset($form) || !is_object($form)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($db);
@@ -2175,7 +2175,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		print "\n".'<!-- Start top horizontal -->'."\n";
 
-		print '<header id="id-top" class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+		print '<header id="id-top" class="side-nav-vert'.(GETPOSTINT('dol_invisible_topmenu') ? ' hidden' : '').'">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 
 		// Show menu entries
 		print '<div id="tmenu_tooltip'.(!getDolGlobalString('MAIN_MENU_INVERT') ? '' : 'invert').'" class="tmenu">'."\n";
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index a59b140f098..46fd62f5782 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -36,10 +36,10 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -50,7 +50,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 if ($user->hasRight('margins', 'read', 'all')) {
-	$agentid = GETPOST('agentid', 'int');
+	$agentid = GETPOSTINT('agentid');
 } else {
 	$agentid = $user->id;
 }
@@ -64,12 +64,12 @@ if (!$sortfield) {
 
 $startdate = $enddate = '';
 
-$startdateday   = GETPOST('startdateday', 'int');
-$startdatemonth = GETPOST('startdatemonth', 'int');
-$startdateyear  = GETPOST('startdateyear', 'int');
-$enddateday     = GETPOST('enddateday', 'int');
-$enddatemonth   = GETPOST('enddatemonth', 'int');
-$enddateyear    = GETPOST('enddateyear', 'int');
+$startdateday   = GETPOSTINT('startdateday');
+$startdatemonth = GETPOSTINT('startdatemonth');
+$startdateyear  = GETPOSTINT('startdateyear');
+$enddateday     = GETPOSTINT('enddateday');
+$enddatemonth   = GETPOSTINT('enddatemonth');
+$enddateyear    = GETPOSTINT('enddateyear');
 
 if (!empty($startdatemonth)) {
 	$startdate = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 257d56cb318..598cb5610e7 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -40,10 +40,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -59,8 +59,8 @@ if (!$sortfield) {
 
 $startdate = $enddate = '';
 
-$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
-$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear', 'int'));
+$startdate = dol_mktime(0, 0, 0, GETPOSTINT('startdatemonth'), GETPOSTINT('startdateday'), GETPOSTINT('startdateyear'));
+$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOSTINT('enddateyear'));
 
 $search_ref = GETPOST('search_ref', 'alpha');
 
@@ -167,10 +167,10 @@ if ($search_ref != '') {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
 if (!empty($startdate)) {
-	$param .= '&startdatemonth='.GETPOST('startdatemonth', 'int').'&startdateday='.GETPOST('startdateday', 'int').'&startdateyear='.GETPOST('startdateyear', 'int');
+	$param .= '&startdatemonth='.GETPOSTINT('startdatemonth').'&startdateday='.GETPOSTINT('startdateday').'&startdateyear='.GETPOSTINT('startdateyear');
 }
 if (!empty($enddate)) {
-	$param .= '&enddatemonth='.GETPOST('enddatemonth', 'int').'&enddateday='.GETPOST('enddateday', 'int').'&enddateyear='.GETPOST('enddateyear', 'int');
+	$param .= '&enddatemonth='.GETPOSTINT('enddatemonth').'&enddateday='.GETPOSTINT('enddateday').'&enddateyear='.GETPOSTINT('enddateyear');
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.$optioncss;
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index eda02b7998e..056b04d09ad 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -52,10 +52,10 @@ if (!$sortorder) {
 
 $startdate = $enddate = '';
 if (GETPOST('startdatemonth')) {
-	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
+	$startdate = dol_mktime(0, 0, 0, GETPOSTINT('startdatemonth'), GETPOSTINT('startdateday'), GETPOSTINT('startdateyear'));
 }
 if (GETPOST('enddatemonth')) {
-	$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear'));
+	$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOST('enddateyear'));
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -63,7 +63,7 @@ $object = new Societe($db);
 $hookmanager->initHooks(array('margincustomerlist'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $TSelectedProducts = GETPOST('products', 'array');
 $TSelectedCats = GETPOST('categories', 'array');
 
@@ -274,15 +274,15 @@ $sql .= $db->order($sortfield, $sortorder);
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
 $param = '&socid='.((int) $socid);
-if (GETPOST('startdatemonth', 'int')) {
-	$param .= '&startdateyear='.GETPOST('startdateyear', 'int');
-	$param .= '&startdatemonth='.GETPOST('startdatemonth', 'int');
-	$param .= '&startdateday='.GETPOST('startdateday', 'int');
+if (GETPOSTINT('startdatemonth')) {
+	$param .= '&startdateyear='.GETPOSTINT('startdateyear');
+	$param .= '&startdatemonth='.GETPOSTINT('startdatemonth');
+	$param .= '&startdateday='.GETPOSTINT('startdateday');
 }
-if (GETPOST('enddatemonth', 'int')) {
-	$param .= '&enddateyear='.GETPOST('enddateyear', 'int');
-	$param .= '&enddatemonth='.GETPOST('enddatemonth', 'int');
-	$param .= '&enddateday='.GETPOST('enddateday', 'int');
+if (GETPOSTINT('enddatemonth')) {
+	$param .= '&enddateyear='.GETPOSTINT('enddateyear');
+	$param .= '&enddatemonth='.GETPOSTINT('enddatemonth');
+	$param .= '&enddateday='.GETPOSTINT('enddateday');
 }
 $listofproducts = GETPOST('products', 'array:int');
 if (is_array($listofproducts)) {
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index b13f504fa94..b336a9a317d 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -43,10 +43,10 @@ $socid = 0;
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -65,10 +65,10 @@ if (!$sortfield) {
 
 $startdate = $enddate = '';
 if (GETPOST('startdatemonth')) {
-	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
+	$startdate = dol_mktime(0, 0, 0, GETPOSTINT('startdatemonth'), GETPOSTINT('startdateday'), GETPOSTINT('startdateyear'));
 }
 if (GETPOST('enddatemonth')) {
-	$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear'));
+	$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOST('enddateyear'));
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -230,15 +230,15 @@ $sql .= $db->order($sortfield, $sortorder);
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
 $param = '&id='.((int) $id);
-if (GETPOST('startdatemonth', 'int')) {
-	$param .= '&startdateyear='.GETPOST('startdateyear', 'int');
-	$param .= '&startdatemonth='.GETPOST('startdatemonth', 'int');
-	$param .= '&startdateday='.GETPOST('startdateday', 'int');
+if (GETPOSTINT('startdatemonth')) {
+	$param .= '&startdateyear='.GETPOSTINT('startdateyear');
+	$param .= '&startdatemonth='.GETPOSTINT('startdatemonth');
+	$param .= '&startdateday='.GETPOSTINT('startdateday');
 }
-if (GETPOST('enddatemonth', 'int')) {
-	$param .= '&enddateyear='.GETPOST('enddateyear', 'int');
-	$param .= '&enddatemonth='.GETPOST('enddatemonth', 'int');
-	$param .= '&enddateday='.GETPOST('enddateday', 'int');
+if (GETPOSTINT('enddatemonth')) {
+	$param .= '&enddateyear='.GETPOSTINT('enddateyear');
+	$param .= '&enddatemonth='.GETPOSTINT('enddatemonth');
+	$param .= '&enddateday='.GETPOSTINT('enddateday');
 }
 $listofcateg = GETPOST('categories', 'array:int');
 if (is_array($listofcateg)) {
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 1b7e9a1bb85..fda75f4081f 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 $langs->loadLangs(array("companies", "bills", "products", "margins"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -43,10 +43,10 @@ if (!empty($user->socid)) {
 
 $object = new Product($db);
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 20c16c4fcbd..9ae75238423 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -30,15 +30,15 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 $langs->loadLangs(array("companies", "bills", "products", "margins"));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 1da84df3e33..0eb37c28936 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -192,9 +192,9 @@ if (session_id() && !empty($_SESSION["dol_entity"])) {
 } elseif (!empty($_ENV["dol_entity"])) {
 	// Entity inside a CLI script
 	$conf->entity = $_ENV["dol_entity"];
-} elseif (GETPOSTISSET("loginfunction") && (GETPOST("entity", 'int') || GETPOST("switchentity", 'int'))) {
+} elseif (GETPOSTISSET("loginfunction") && (GETPOSTINT("entity") || GETPOSTINT("switchentity"))) {
 	// Just after a login page
-	$conf->entity = (GETPOSTISSET("entity") ? GETPOST("entity", 'int') : GETPOST("switchentity", 'int'));
+	$conf->entity = (GETPOSTISSET("entity") ? GETPOSTINT("entity") : GETPOSTINT("switchentity"));
 } elseif (defined('DOLENTITY') && is_numeric(constant('DOLENTITY'))) {
 	// For public page with MultiCompany module
 	$conf->entity = constant('DOLENTITY');
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 61c41d0782c..188c2938cda 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1736,21 +1736,21 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 				'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'alphawithlgt'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
 				'visible'=>GETPOST('propvisible', 'alphanohtml'),
 				'enabled'=>GETPOST('propenabled', 'alphanohtml'),
-				'position'=>GETPOST('propposition', 'int'),
-				'notnull'=>GETPOST('propnotnull', 'int'),
-				'index'=>GETPOST('propindex', 'int'),
+				'position'=>GETPOSTINT('propposition'),
+				'notnull'=>GETPOSTINT('propnotnull'),
+				'index'=>GETPOSTINT('propindex'),
 				'foreignkey'=>GETPOST('propforeignkey', 'alpha'),
-				'searchall'=>GETPOST('propsearchall', 'int'),
-				'isameasure'=>GETPOST('propisameasure', 'int'),
+				'searchall'=>GETPOSTINT('propsearchall'),
+				'isameasure'=>GETPOSTINT('propisameasure'),
 				'comment'=>GETPOST('propcomment', 'alpha'),
 				'help'=>GETPOST('prophelp', 'alpha'),
 				'css'=>GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
 				'cssview'=>GETPOST('propcssview', 'alpha'),
 				'csslist'=>GETPOST('propcsslist', 'alpha'),
 				'default'=>GETPOST('propdefault', 'restricthtml'),
-				'noteditable'=>intval(GETPOST('propnoteditable', 'int')),
+				'noteditable'=>intval(GETPOSTINT('propnoteditable')),
 				//'alwayseditable'=>intval(GETPOST('propalwayseditable', 'int')),
-				'validate' => GETPOST('propvalidate', 'int')
+				'validate' => GETPOSTINT('propvalidate')
 			);
 
 			if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
@@ -2445,7 +2445,7 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
 	}
 }
 // Delete permission
-if ($dirins && $action == 'confirm_deleteright' && !empty($module) && GETPOST('permskey', 'int')) {
+if ($dirins && $action == 'confirm_deleteright' && !empty($module) && GETPOSTINT('permskey')) {
 	$error = 0;
 	// load class and check if right exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
@@ -2461,7 +2461,7 @@ if ($dirins && $action == 'confirm_deleteright' && !empty($module) && GETPOST('p
 	}
 
 	$permissions = $moduleobj->rights;
-	$key = (int) GETPOST('permskey', 'int')-1;
+	$key = GETPOSTINT('permskey')-1;
 
 	if (!$error) {
 		// check if module is enabled
@@ -2607,7 +2607,7 @@ if ($action == 'reset' && $user->admin) {
 }
 
 // delete menu
-if ($dirins && $action == 'confirm_deletemenu' && GETPOST('menukey', 'int')) {
+if ($dirins && $action == 'confirm_deletemenu' && GETPOSTINT('menukey')) {
 	// check if module is enabled
 	if (isModEnabled(strtolower($module))) {
 		$result = unActivateModule(strtolower($module));
@@ -2638,7 +2638,7 @@ if ($dirins && $action == 'confirm_deletemenu' && GETPOST('menukey', 'int')) {
 	$result = array_map('strtolower', $objects);
 
 	$menus = $moduleobj->menu;
-	$key = (int) GETPOST('menukey', 'int');
+	$key = GETPOSTINT('menukey');
 	$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 
 	$checkcomment = checkExistComment($moduledescriptorfile, 0);
@@ -2819,7 +2819,7 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) {
 }
 
 // Modify a menu entry
-if ($dirins && $action == "update_menu" && GETPOST('menukey', 'int') && GETPOST('tabobj')) {
+if ($dirins && $action == "update_menu" && GETPOSTINT('menukey') && GETPOST('tabobj')) {
 	$objectname =  GETPOST('tabobj');
 	$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
 	$destdir = $dirins.'/'.strtolower($module);
@@ -2850,7 +2850,7 @@ if ($dirins && $action == "update_menu" && GETPOST('menukey', 'int') && GETPOST(
 			}
 		}
 		$menus = $moduleobj->menu;
-		$key = (int) GETPOST('menukey', 'int') - 1;
+		$key = GETPOSTINT('menukey') - 1;
 
 		$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		//stock forms in array
@@ -4690,7 +4690,7 @@ if ($module == 'initmodule') {
 
 			if ($action == 'deletedict') {
 				$formconfirm = $form->formconfirm(
-					$_SERVER["PHP_SELF"].'?dictionnarykey='.urlencode(GETPOST('dictionnarykey', 'int')).'&tab='.urlencode($tab).'&module='.urlencode($module),
+					$_SERVER["PHP_SELF"].'?dictionnarykey='.urlencode(GETPOSTINT('dictionnarykey')).'&tab='.urlencode($tab).'&module='.urlencode($module),
 					$langs->trans('Delete'),
 					$langs->trans('Confirm Delete Dictionnary', GETPOST('dictionnarykey', 'alpha')),
 					'confirm_deletedictionary',
@@ -4799,7 +4799,7 @@ if ($module == 'initmodule') {
 						$i = 0;
 						$maxi = count($dicts['tabname']);
 						while ($i < $maxi) {
-							if ($action == 'editdict' && $i == (int) GETPOST('dictionnarykey', 'int')-1) {
+							if ($action == 'editdict' && $i == GETPOSTINT('dictionnarykey')-1) {
 								print '<tr class="oddeven">';
 								print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 								print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -5058,9 +5058,9 @@ if ($module == 'initmodule') {
 
 			if ($action == 'deletemenu') {
 				$formconfirms = $form->formconfirm(
-					$_SERVER["PHP_SELF"].'?menukey='.urlencode(GETPOST('menukey', 'int')).'&tab='.urlencode($tab).'&module='.urlencode($module),
+					$_SERVER["PHP_SELF"].'?menukey='.urlencode(GETPOSTINT('menukey')).'&tab='.urlencode($tab).'&module='.urlencode($module),
 					$langs->trans('Delete'),
-					($menus[GETPOST('menukey')]['fk_menu'] === 'fk_mainmenu='.strtolower($module) ? $langs->trans('Warning: you will delete all menus linked to this one.', GETPOST('menukey', 'int')) : $langs->trans('Confirm Delete Menu', GETPOST('menukey', 'int'))),
+					($menus[GETPOST('menukey')]['fk_menu'] === 'fk_mainmenu='.strtolower($module) ? $langs->trans('Warning: you will delete all menus linked to this one.', GETPOSTINT('menukey')) : $langs->trans('Confirm Delete Menu', GETPOSTINT('menukey'))),
 					'confirm_deletemenu',
 					'',
 					0,
@@ -5202,7 +5202,7 @@ if ($module == 'initmodule') {
 
 						//$tabobject = '';	// We can't know what is $tabobject in most cases
 
-						if ($action == 'editmenu' && GETPOST('menukey', 'int') == $i) {
+						if ($action == 'editmenu' && GETPOSTINT('menukey') == $i) {
 							//var_dump($propPerms);exit;
 							print '<tr class="oddeven">';
 							print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -5490,7 +5490,7 @@ if ($module == 'initmodule') {
 
 			if ($action == 'deleteright') {
 				$formconfirm = $form->formconfirm(
-					$_SERVER["PHP_SELF"].'?permskey='.urlencode(GETPOST('permskey', 'int')).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj),
+					$_SERVER["PHP_SELF"].'?permskey='.urlencode(GETPOSTINT('permskey')).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj),
 					$langs->trans('Delete'),
 					$langs->trans('Confirm Delete Right', GETPOST('permskey', 'alpha')),
 					'confirm_deleteright',
@@ -5571,7 +5571,7 @@ if ($module == 'initmodule') {
 						$i++;
 
 						// section for editing right
-						if ($action == 'edit_right' && $perm[0] == (int) GETPOST('permskey', 'int')) {
+						if ($action == 'edit_right' && $perm[0] == GETPOSTINT('permskey')) {
 							print '<tr class="oddeven">';
 							print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="modifPerms">';
 							print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 83735a14dc2..17000dd0207 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -25,9 +25,9 @@ if (!defined('NOREQUIREAJAX')) {
 
 require '../../main.inc.php'; // Load $user and permissions
 
-$warehouse_id = GETPOST('warehouse_id', 'int');
+$warehouse_id = GETPOSTINT('warehouse_id');
 $batch = GETPOST('batch', 'alphanohtml');
-$fk_product = GETPOST('product_id', 'int');
+$fk_product = GETPOSTINT('product_id');
 $action = GETPOST('action', 'alphanohtml');
 
 $result = restrictedArea($user, 'mrp');
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 68d0f6b9f32..86f8778e799 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -38,7 +38,7 @@ dol_include_once('/mrp/lib/mrp_mo.lib.php');
 $langs->loadLangs(array("mrp", "other"));
 
 // Get parameters
-$id 		= GETPOST('id', 'int');
+$id 		= GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action 	= GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -55,10 +55,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 5f6a90f964e..d88c5755d45 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -44,7 +44,7 @@ $langs->loadLangs(array('mrp', 'other'));
 
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -53,8 +53,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'mo
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $TBomLineId = GETPOST('bomlineid', 'array');
-$lineid   = GETPOST('lineid', 'int');
-$socid = GETPOST("socid", 'int');
+$lineid   = GETPOSTINT('lineid');
+$socid = GETPOSTINT("socid");
 
 // Initialize technical objects
 $object = new Mo($db);
@@ -85,8 +85,8 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-if (GETPOST('fk_bom', 'int') > 0) {
-	$objectbom->fetch(GETPOST('fk_bom', 'int'));
+if (GETPOSTINT('fk_bom') > 0) {
+	$objectbom->fetch(GETPOSTINT('fk_bom'));
 
 	if ($action != 'add') {
 		// We force calling parameters if we are not in the submit of creation of MO
@@ -269,10 +269,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -332,7 +332,7 @@ llxHeader('', $title, '');
 
 // Part to create
 if ($action == 'create') {
-	if (GETPOST('fk_bom', 'int') > 0) {
+	if (GETPOSTINT('fk_bom') > 0) {
 		$titlelist = $langs->trans("ToConsume");
 		if ($objectbom->bomtype == 1) {
 			$titlelist = $langs->trans("ToObtain");
@@ -675,7 +675,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		//$result = $object->getLinesArray();
 		$object->fetchLines();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 0c7ef6da4e8..0e5d807f720 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -39,14 +39,14 @@ $langs->loadLangs(array("mrp", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 34f1c9ee2de..5a3442ace8d 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array("mrp", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -50,13 +50,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -94,8 +94,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -414,7 +414,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index ca9e1080733..31f2c784d98 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -40,7 +40,7 @@ dol_include_once('/mrp/lib/mrp_mo.lib.php');
 $langs->loadLangs(array("mrp", "stocks", "other"));
 
 // Get parameters
-$id          = GETPOST('id', 'int');
+$id          = GETPOSTINT('id');
 $ref         = GETPOST('ref', 'alpha');
 $action      = GETPOST('action', 'aZ09');
 $confirm     = GETPOST('confirm', 'alpha');
@@ -49,11 +49,11 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'mo
 $backtopage  = GETPOST('backtopage', 'alpha');
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $massaction  = GETPOST('massaction', 'aZ09');
-$lineid      = GETPOST('lineid', 'int');
+$lineid      = GETPOSTINT('lineid');
 
-$msid  = GETPOST('msid', 'int');
-$year  = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
+$msid  = GETPOSTINT('msid');
+$year  = GETPOSTINT("year");
+$month = GETPOSTINT("month");
 
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_movement = GETPOST("search_movement", 'alpha');
@@ -64,10 +64,10 @@ $search_inventorycode = trim(GETPOST("search_inventorycode", 'alpha'));
 $search_user = trim(GETPOST("search_user", 'alpha'));
 $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
-$search_type_mouvement = GETPOST('search_type_mouvement', 'int');
+$search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$page  = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$page  = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
@@ -236,10 +236,10 @@ if (empty($reshook)) {
 	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	if ($action == 'confirm_reopen') {
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 32d15e522b0..19b630aaf53 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -33,7 +33,7 @@ dol_include_once('/mrp/lib/mrp_mo.lib.php');
 $langs->loadLangs(array("mrp", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index a583d7a9478..9ffef5c2401 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -44,16 +44,16 @@ require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
 $langs->loadLangs(array("mrp", "stocks", "other", "product", "productbatch"));
 
 // Get parameters
-$id          = GETPOST('id', 'int');
+$id          = GETPOSTINT('id');
 $ref         = GETPOST('ref', 'alpha');
 $action      = GETPOST('action', 'aZ09');
 $confirm     = GETPOST('confirm', 'alpha');
 $cancel      = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');
-$lineid      = GETPOST('lineid', 'int');
-$fk_movement = GETPOST('fk_movement', 'int');
-$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$lineid      = GETPOSTINT('lineid');
+$fk_movement = GETPOSTINT('fk_movement');
+$fk_default_warehouse = GETPOSTINT('fk_default_warehouse');
 
 $collapse = GETPOST('collapse', 'aZ09comma');
 
@@ -170,10 +170,10 @@ if (empty($reshook)) {
 	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	if ($action == 'confirm_reopen' && $permissiontoadd) {
@@ -186,8 +186,8 @@ if (empty($reshook)) {
 
 		// Line to produce
 		$moline->fk_mo = $object->id;
-		$moline->qty = GETPOST('qtytoadd', 'int');
-		$moline->fk_product = GETPOST('productidtoadd', 'int');
+		$moline->qty = GETPOSTINT('qtytoadd');
+		$moline->fk_product = GETPOSTINT('productidtoadd');
 		if (GETPOST('addconsumelinebutton')) {
 			$moline->role = 'toconsume';
 		} else {
@@ -390,7 +390,7 @@ if (empty($reshook)) {
 			$consumptioncomplete = true;
 			$productioncomplete = true;
 
-			if (GETPOST('autoclose', 'int')) {
+			if (GETPOSTINT('autoclose')) {
 				foreach ($object->lines as $line) {
 					if ($line->role == 'toconsume') {
 						$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
@@ -476,14 +476,14 @@ if (empty($reshook)) {
 
 	if ($action == 'confirm_editline' && $permissiontoadd) {
 		$moline = new MoLine($db);
-		$res = $moline->fetch(GETPOST('lineid', 'int'));
+		$res = $moline->fetch(GETPOSTINT('lineid'));
 		if ($result > 0) {
 			$extrafields->fetch_name_optionals_label($moline->element);
 			foreach ($extrafields->attributes[$moline->table_element]['label'] as $key => $label) {
 				$value = GETPOST('options_'.$key, 'alphanohtml');
 				$moline->array_options["options_".$key] = $value;
 			}
-			$moline->qty = GETPOST('qty_lineProduce', 'int');
+			$moline->qty = GETPOSTINT('qty_lineProduce');
 			$res = $moline->update($user);
 			if ($res < 0) {
 				setEventMessages($moline->error, $moline->errors, 'errors');
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index cb1e1a6edc3..836b3de06de 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -45,25 +45,25 @@ $langs->loadLangs(array('admin', 'multicurrency'));
 // Get Parameters
 $action				= GETPOST('action', 'alpha');
 $massaction			= GETPOST('massaction', 'alpha');
-$show_files			= GETPOST('show_files', 'int');
+$show_files			= GETPOSTINT('show_files');
 $confirm			= GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$id_rate_selected = GETPOST('id_rate', 'int');
+$id_rate_selected = GETPOSTINT('id_rate');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_date_sync = dol_mktime(0, 0, 0, GETPOST('search_date_syncmonth', 'int'), GETPOST('search_date_syncday', 'int'), GETPOST('search_date_syncyear', 'int'));
-$search_date_sync_end	= dol_mktime(0, 0, 0, GETPOST('search_date_sync_endmonth', 'int'), GETPOST('search_date_sync_endday', 'int'), GETPOST('search_date_sync_endyear', 'int'));
+$search_date_sync = dol_mktime(0, 0, 0, GETPOSTINT('search_date_syncmonth'), GETPOSTINT('search_date_syncday'), GETPOSTINT('search_date_syncyear'));
+$search_date_sync_end	= dol_mktime(0, 0, 0, GETPOSTINT('search_date_sync_endmonth'), GETPOSTINT('search_date_sync_endday'), GETPOSTINT('search_date_sync_endyear'));
 $search_rate		= GETPOST('search_rate', 'alpha');
 $search_rate_indirect	= GETPOST('search_rate_indirect', 'alpha');
 $search_code		= GETPOST('search_code', 'alpha');
 $multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-$dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('dateinputday', 'int'), GETPOST('dateinputyear', 'int'));
+$dateinput 			= dol_mktime(0, 0, 0, GETPOSTINT('dateinputmonth'), GETPOSTINT('dateinputday'), GETPOSTINT('dateinputyear'));
 $rateinput 			= (float) price2num(GETPOST('rateinput', 'alpha'));
 $rateindirectinput 	= (float) price2num(GETPOST('rateinidirectinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield 			= GETPOST('sortfield', 'aZ09comma');
 $sortorder 			= GETPOST('sortorder', 'aZ09comma');
-$page = (GETPOST("page", 'int') ? GETPOST("page", 'int') : 0);
+$page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
 
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 306a3b590eb..33faff964fd 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -166,7 +166,7 @@ if (empty($reshook)) {
 
 	// Delete comment
 	if ($action == 'deletecomment') {
-		$idcomment = GETPOST('idcomment', 'int');
+		$idcomment = GETPOSTINT('idcomment');
 		if ($idcomment > 0) {
 			// Security check
 			if (!$user->hasRight('opensurvey', 'write')) {
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index f43e50cf44a..1cc35db3789 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -33,7 +33,7 @@ $langs->load("opensurvey");
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -48,10 +48,10 @@ $search_title = GETPOST('search_title', 'alpha');
 $search_status = GETPOST('search_status', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -262,7 +262,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 7639b936e3e..bda3a8054f4 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -65,7 +65,7 @@ if ($action == 'setting') {
 	$error += $partnership->insert_menus();
 
 	if (GETPOSTISSET("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL")) {
-		dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOSTINT("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL"), 'chaine', 0, '', $conf->entity);
 	}
 
 	dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index ede3011d778..e7b740e94a1 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -36,8 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 $langs->loadLangs(array("partnership", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$socid = GETPOST('socid', 'int');
+$id = GETPOSTINT('id');
+$socid = GETPOSTINT('socid');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -54,10 +54,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 1185e3e4bee..9746f0b1a69 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 $langs->loadLangs(array("partnership", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -42,7 +42,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
 // Initialize technical objects
@@ -126,7 +126,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	$fk_partner 	= ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
+	$fk_partner 	= ($managedfor == 'member') ? GETPOSTINT('fk_member') : GETPOSTINT('fk_soc');
 	$obj_partner 	= ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
 
 	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
@@ -238,10 +238,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -517,7 +517,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
@@ -535,7 +535,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1);
 		}
 
 		// Form to add new line
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index d1f4d64527c..44bd240acb2 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -34,10 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 // Initialize technical objects
@@ -79,7 +79,7 @@ if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
  */
 
 if ($action == 'addcontact' && $permission) {
-	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index c0d83257d3a..87d8c18402d 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -38,14 +38,14 @@ $langs->loadLangs(array("partnership", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 415190c7e26..3bd6005661f 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array("partnership", "members", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -51,14 +51,14 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
-$socid = GETPOST('socid', 'int');
-$memberid = GETPOST('rowid', 'int');
+$id = GETPOSTINT('id');
+$socid = GETPOSTINT('socid');
+$memberid = GETPOSTINT('rowid');
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -111,8 +111,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 $search_filter = GETPOST("search_filter", 'alpha');
@@ -615,9 +615,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -647,7 +647,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('prevalidate', 'presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('prevalidate', 'presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 7c370057e98..f0d40a38c93 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 $langs->loadLangs(array("partnership", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index d8a5422c6a1..820c29bc2c1 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -67,7 +67,7 @@ if ($action == 'setvalue' && $user->admin) {
 	if (!($result > 0)) {
 		$error++;
 	}
-	$result = dolibarr_set_const($db, "PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS", GETPOSTINT('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS'), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
 	}
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index bf71f80b1c6..83fa2eecf3b 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -65,7 +65,7 @@ if ($action == 'setvalue' && $user->admin) {
 	if (!($result > 0)) {
 		$error++;
 	}
-	$result = dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOSTINT('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS'), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
 	}
@@ -119,7 +119,7 @@ if ($action == 'setvalue' && $user->admin) {
 }
 
 if ($action == "setlive") {
-	$liveenable = GETPOST('value', 'int') ? 0 : 1;
+	$liveenable = GETPOSTINT('value') ? 0 : 1;
 	$res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index de81a0b0aab..ad2778c9485 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -32,11 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variab
 // Load translation files required by the page
 $langs->load("products");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $save = GETPOST('save', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
-$selection = GETPOST('selection', 'int');
+$selection = GETPOSTINT('selection');
 
 // Security check
 if (!$user->admin) {
@@ -69,7 +69,7 @@ if (!empty($action) && empty($cancel)) {
 	if ($action == 'create_variable' || $action == 'edit_variable') {
 		$price_globals->code = GETPOSTISSET('code') ? GETPOST('code', 'alpha') : $price_globals->code;
 		$price_globals->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_globals->description;
-		$price_globals->value = GETPOSTISSET('value') ? GETPOST('value', 'int') : $price_globals->value;
+		$price_globals->value = GETPOSTISSET('value') ? GETPOSTINT('value') : $price_globals->value;
 		//Check if record already exists only when saving
 		if (!empty($save)) {
 			foreach ($price_globals->listGlobalVariables() as $entry) {
@@ -105,11 +105,11 @@ if (!empty($action) && empty($cancel)) {
 
 	//Updaters actions
 	if ($action == 'create_updater' || $action == 'edit_updater') {
-		$price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;
+		$price_updaters->type = GETPOSTISSET('type') ? GETPOSTINT('type') : $price_updaters->type;
 		$price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;
 		$price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;
-		$price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
-		$price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;
+		$price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOSTINT('fk_variable') : $price_updaters->fk_variable;
+		$price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOSTINT('update_interval') : $price_updaters->update_interval;
 	}
 	if ($action == 'create_updater' && !empty($save)) {
 		//Verify if process() works
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 7179a411a82..5003be16077 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -50,16 +50,16 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
 	$id = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/ajax/product_lot.php b/htdocs/product/ajax/product_lot.php
index bd095ec7a8c..9b9014a5eca 100644
--- a/htdocs/product/ajax/product_lot.php
+++ b/htdocs/product/ajax/product_lot.php
@@ -42,7 +42,7 @@ require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
 $action = GETPOST('action', 'aZ09');
-$productId = GETPOST('product_id', 'int');
+$productId = GETPOSTINT('product_id');
 $batch = GETPOST('batch', 'alphanohtml');
 
 // Security check
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index fb0364c06e4..3f26a9ad2b4 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -43,20 +43,20 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
 require '../../main.inc.php';
 
 $htmlname = GETPOST('htmlname', 'aZ09');
-$socid = GETPOST('socid', 'int');
-$type = GETPOST('type', 'int');
-$mode = GETPOST('mode', 'int');
-$status = ((GETPOST('status', 'int') >= 0) ? GETPOST('status', 'int') : - 1);	// status buy when mode = customer , status purchase when mode = supplier
-$status_purchase = ((GETPOST('status_purchase', 'int') >= 0) ? GETPOST('status_purchase', 'int') : - 1);	// status purchase when mode = customer
-$outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
-$price_level = GETPOST('price_level', 'int');
+$socid = GETPOSTINT('socid');
+$type = GETPOSTINT('type');
+$mode = GETPOSTINT('mode');
+$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1);	// status buy when mode = customer , status purchase when mode = supplier
+$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1);	// status purchase when mode = customer
+$outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0);
+$price_level = GETPOSTINT('price_level');
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
-$price_by_qty_rowid = GETPOST('pbq', 'int');
-$finished = GETPOST('finished', 'int');
-$alsoproductwithnosupplierprice = GETPOST('alsoproductwithnosupplierprice', 'int');
+$id = GETPOSTINT('id');
+$price_by_qty_rowid = GETPOSTINT('pbq');
+$finished = GETPOSTINT('finished');
+$alsoproductwithnosupplierprice = GETPOSTINT('alsoproductwithnosupplierprice');
 $warehouseStatus = GETPOST('warehousestatus', 'alpha');
-$hidepriceinlabel = GETPOST('hidepriceinlabel', 'int');
+$hidepriceinlabel = GETPOSTINT('hidepriceinlabel');
 
 // Security check
 restrictedArea($user, 'produit|service|commande|propal|facture', 0, 'product&product');
@@ -228,7 +228,7 @@ if ($action == 'fetch' && !empty($id)) {
 		$product_outdefault_vat_code = $outdefault_vat_code;
 
 		// If we ask the price according to buyer, we change it.
-		if (GETPOST('addalsovatforthirdpartyid', 'int')) {
+		if (GETPOSTINT('addalsovatforthirdpartyid')) {
 			$thirdparty_buyer = new Societe($db);
 			$thirdparty_buyer->fetch($socid);
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 52edfa14ce8..cae180fd850 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -95,19 +95,19 @@ $mesg = ''; $error = 0; $errors = array();
 $refalreadyexists = 0;
 
 // Get parameters
-$id  = GETPOST('id', 'int');
+$id  = GETPOSTINT('id');
 if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {
 	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null);
 } else {
 	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
 }
-$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT);
+$type = (GETPOSTISSET('type') ? GETPOSTINT('type') : Product::TYPE_PRODUCT);
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$socid = GETPOST('socid', 'int');
-$duration_value = GETPOST('duration_value', 'int');
+$socid = GETPOSTINT('socid');
+$duration_value = GETPOSTINT('duration_value');
 $duration_unit = GETPOST('duration_unit', 'alpha');
 
 $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
@@ -248,7 +248,7 @@ if (empty($reshook)) {
 	// merge products
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) {
 		$error = 0;
-		$productOriginId = GETPOST('product_origin', 'int');
+		$productOriginId = GETPOSTINT('product_origin');
 		$productOrigin = new Product($db);
 
 		if ($productOriginId <= 0) {
@@ -505,7 +505,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$units = GETPOST('units', 'int');
+			$units = GETPOSTINT('units');
 
 			$object->entity				= $conf->entity;
 			$object->ref				= $ref;
@@ -568,7 +568,7 @@ if (empty($reshook)) {
 			$object->status             	 = GETPOST('statut');
 			$object->status_buy = GETPOST('statut_buy');
 			$object->status_batch = GETPOST('status_batch');
-			$object->sell_or_eat_by_mandatory = GETPOST('sell_or_eat_by_mandatory', 'int');
+			$object->sell_or_eat_by_mandatory = GETPOSTINT('sell_or_eat_by_mandatory');
 			$object->batch_mask = GETPOST('batch_mask');
 
 			$object->barcode_type = GETPOST('fk_barcode_type');
@@ -592,14 +592,14 @@ if (empty($reshook)) {
 			$object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private', 'restricthtml'));
 			$object->note               	 = $object->note_private; // deprecated
 			$object->customcode              = GETPOST('customcode', 'alphanohtml');
-			$object->country_id = GETPOST('country_id', 'int');
-			$object->state_id = GETPOST('state_id', 'int');
-			$object->lifetime               = GETPOST('lifetime', 'int');
-			$object->qc_frequency           = GETPOST('qc_frequency', 'int');
+			$object->country_id = GETPOSTINT('country_id');
+			$object->state_id = GETPOSTINT('state_id');
+			$object->lifetime               = GETPOSTINT('lifetime');
+			$object->qc_frequency           = GETPOSTINT('qc_frequency');
 			$object->duration_value     	 = $duration_value;
 			$object->duration_unit      	 = $duration_unit;
-			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse', 'int');
-			$object->fk_default_workstation	 = GETPOST('fk_default_workstation', 'int');
+			$object->fk_default_warehouse	 = GETPOSTINT('fk_default_warehouse');
+			$object->fk_default_workstation	 = GETPOSTINT('fk_default_workstation');
 			$object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ? GETPOST('seuil_stock_alerte') : 0;
 			$object->desiredstock          = GETPOST('desiredstock') ? GETPOST('desiredstock') : 0;
 			$object->canvas             	 = GETPOST('canvas');
@@ -615,14 +615,14 @@ if (empty($reshook)) {
 			$object->surface_units      	 = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
 			$object->volume             	 = GETPOST('volume');
 			$object->volume_units       	 = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
-			$finished = GETPOST('finished', 'int');
+			$finished = GETPOSTINT('finished');
 			if ($finished >= 0) {
 				$object->finished = $finished;
 			} else {
 				$object->finished = null;
 			}
 
-			$units = GETPOST('units', 'int');
+			$units = GETPOSTINT('units');
 			if ($units > 0) {
 				$object->fk_unit = $units;
 			} else {
@@ -759,23 +759,23 @@ if (empty($reshook)) {
 					$object->note = $object->note_private;
 				}
 				$object->customcode             = GETPOST('customcode', 'alpha');
-				$object->country_id = GETPOST('country_id', 'int');
-				$object->state_id = GETPOST('state_id', 'int');
-				$object->lifetime               = GETPOST('lifetime', 'int');
-				$object->qc_frequency           = GETPOST('qc_frequency', 'int');
-				$object->status                 = GETPOST('statut', 'int');
-				$object->status_buy             = GETPOST('statut_buy', 'int');
+				$object->country_id = GETPOSTINT('country_id');
+				$object->state_id = GETPOSTINT('state_id');
+				$object->lifetime               = GETPOSTINT('lifetime');
+				$object->qc_frequency           = GETPOSTINT('qc_frequency');
+				$object->status                 = GETPOSTINT('statut');
+				$object->status_buy             = GETPOSTINT('statut_buy');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
-				$object->sell_or_eat_by_mandatory = GETPOST('sell_or_eat_by_mandatory', 'int');
+				$object->sell_or_eat_by_mandatory = GETPOSTINT('sell_or_eat_by_mandatory');
 				$object->batch_mask = GETPOST('batch_mask', 'alpha');
-				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse', 'int');
-				$object->fk_default_workstation   = GETPOST('fk_default_workstation', 'int');
+				$object->fk_default_warehouse   = GETPOSTINT('fk_default_warehouse');
+				$object->fk_default_workstation   = GETPOSTINT('fk_default_workstation');
 				// removed from update view so GETPOST always empty
 				/*
 				$object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
 				$object->desiredstock           = GETPOST('desiredstock');
 				*/
-				$object->duration_value         = GETPOST('duration_value', 'int');
+				$object->duration_value         = GETPOSTINT('duration_value');
 				$object->duration_unit          = GETPOST('duration_unit', 'alpha');
 
 				$object->canvas                 = GETPOST('canvas');
@@ -793,21 +793,21 @@ if (empty($reshook)) {
 				$object->volume                 = GETPOST('volume');
 				$object->volume_units           = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
 
-				$finished = GETPOST('finished', 'int');
+				$finished = GETPOSTINT('finished');
 				if ($finished >= 0) {
 					$object->finished = $finished;
 				} else {
 					$object->finished = null;
 				}
 
-				$fk_default_bom = GETPOST('fk_default_bom', 'int');
+				$fk_default_bom = GETPOSTINT('fk_default_bom');
 				if ($fk_default_bom >= 0) {
 					$object->fk_default_bom = $fk_default_bom;
 				} else {
 					$object->fk_default_bom = null;
 				}
 
-				$units = GETPOST('units', 'int');
+				$units = GETPOSTINT('units');
 				if ($units > 0) {
 					$object->fk_unit = $units;
 				} else {
@@ -1360,7 +1360,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		print load_fiche_titre($title, $linkback, $picto);
 
 		// We set country_id, country_code and country for the selected country
-		$object->country_id = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : null;
+		$object->country_id = GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : null;
 		if ($object->country_id > 0) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
@@ -1462,7 +1462,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				// SellBy / EatBy mandatory list
 				if (!empty($sellOrEatByMandatoryList)) {
 					print '<tr><td>'.$langs->trans('BatchSellOrEatByMandatoryList', $langs->trans('SellByDate'), $langs->trans('EatByDate')).'</td><td>';
-					print $form->selectarray('sell_or_eat_by_mandatory', $sellOrEatByMandatoryList, GETPOST('sell_or_eat_by_mandatory', 'int'));
+					print $form->selectarray('sell_or_eat_by_mandatory', $sellOrEatByMandatoryList, GETPOSTINT('sell_or_eat_by_mandatory'));
 					print '</td></tr>';
 				}
 			}
@@ -1516,8 +1516,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				// Default warehouse
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
-				print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse', 'int'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
-				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?&action=create&type='.GETPOST('type', 'int')).'">';
+				print $formproduct->selectWarehouses(GETPOSTINT('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
+				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?&action=create&type='.GETPOSTINT('type')).'">';
 				print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
 				print '</a>';
 
@@ -1555,7 +1555,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			if ($type == 1) {
 				print '<tr><td>'.$langs->trans("Duration").'</td><td>';
 				print img_picto('', 'clock', 'class="pictofixedwidth"');
-				print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
+				print '<input name="duration_value" size="4" value="'.GETPOSTINT('duration_value').'">';
 				print $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
 
 				// Mandatory period
@@ -2079,7 +2079,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					// SellBy / EatBy mandatory list
 					if (!empty($sellOrEatByMandatoryList)) {
 						if (GETPOSTISSET('sell_or_eat_by_mandatory')) {
-							$sellOrEatByMandatorySelectedId = GETPOST('sell_or_eat_by_mandatory', 'int');
+							$sellOrEatByMandatorySelectedId = GETPOSTINT('sell_or_eat_by_mandatory');
 						} else {
 							$sellOrEatByMandatorySelectedId = $object->sell_or_eat_by_mandatory;
 						}
@@ -2258,7 +2258,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
 					print '<td>';
 					print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-					print $form->select_country(GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : $object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
+					print $form->select_country(GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : $object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
 					if ($user->admin) {
 						print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 					}
@@ -2274,7 +2274,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						}
 
 						print img_picto('', 'state', 'class="pictofixedwidth"');
-						print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
+						print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOSTINT('state_id') : $object->state_id, $object->country_code);
 						print '</td>';
 						print '</tr>';
 					}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 0590e1f541d..f8d5f38a59c 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'products', 'stocks'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -98,12 +98,12 @@ if (empty($reshook)) {
 	// Add subproduct to product
 	if ($action == 'add_prod' && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
 		$error = 0;
-		$maxprod = GETPOST("max_prod", 'int');
+		$maxprod = GETPOSTINT("max_prod");
 
 		for ($i = 0; $i < $maxprod; $i++) {
 			$qty = price2num(GETPOST("prod_qty_" . $i, 'alpha'), 'MS');
 			if ($qty > 0) {
-				if ($object->add_sousproduit($id, GETPOST("prod_id_" . $i, 'int'), $qty, GETPOST("prod_incdec_" . $i, 'int')) > 0) {
+				if ($object->add_sousproduit($id, GETPOSTINT("prod_id_" . $i), $qty, GETPOSTINT("prod_incdec_" . $i)) > 0) {
 					//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
 					$action = 'edit';
 				} else {
@@ -116,7 +116,7 @@ if (empty($reshook)) {
 					}
 				}
 			} else {
-				if ($object->del_sousproduit($id, GETPOST("prod_id_" . $i, 'int')) > 0) {
+				if ($object->del_sousproduit($id, GETPOSTINT("prod_id_" . $i)) > 0) {
 					$action = 'edit';
 				} else {
 					$error++;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index b3e56a9f5ac..5ee7dac86cb 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -46,7 +46,7 @@ $langs->loadLangs(array('other', 'products'));
 
 
 // Get parameters
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -62,10 +62,10 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 714a44081b0..b38d6b33da7 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'accountancy')); //"Back" translation is on this accountancy file
 
-$id = GETPOST('id', 'int');
-$eid = GETPOST('eid', 'int');
+$id = GETPOSTINT('id');
+$eid = GETPOSTINT('eid');
 $action = GETPOST('action', 'aZ09');
 $title = GETPOST('expression_title', 'alpha');
 $expression = GETPOST('expression');
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 87522b88255..b86f2c1d8ca 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -207,12 +207,12 @@ if (empty($reshook)) {
 			$tva_tx = price2num($tva_tx);
 		}
 
-		$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
-		$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
+		$price_expression = GETPOSTINT('eid') ? GETPOSTINT('eid') : ''; // Discard expression if not in expression mode
+		$delivery_time_days = GETPOSTINT('delivery_time_days') ? GETPOSTINT('delivery_time_days') : '';
 		$supplier_reputation = GETPOST('supplier_reputation');
 		$supplier_description = GETPOST('supplier_description', 'restricthtml');
 		$barcode = GETPOST('barcode', 'alpha');
-		$fk_barcode_type = GETPOST('fk_barcode_type', 'int');
+		$fk_barcode_type = GETPOSTINT('fk_barcode_type');
 		$packaging = price2num(GETPOST("packaging", 'alphanohtml'), 'MS');
 
 		if ($tva_tx == '') {
@@ -292,7 +292,7 @@ if (empty($reshook)) {
 				$supplier = new Fournisseur($db);
 				$result = $supplier->fetch($id_fourn);
 				if (GETPOSTISSET('ref_fourn_price_id')) {
-					$object->fetch_product_fournisseur_price(GETPOST('ref_fourn_price_id', 'int'));
+					$object->fetch_product_fournisseur_price(GETPOSTINT('ref_fourn_price_id'));
 				}
 				$extralabels = $extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
@@ -807,7 +807,7 @@ if ($id > 0 || $ref) {
 					print '<td>'.$langs->trans('GencodBuyPrice').'</td>';
 					print '<td>';
 					print img_picto('', 'barcode', 'class="pictofixedwidth"');
-					print $formbarcode->selectBarcodeType((GETPOSTISSET('fk_barcode_type') ? GETPOST('fk_barcode_type', 'int') : ($rowid ? $object->supplier_fk_barcode_type : getDolGlobalInt("PRODUIT_DEFAULT_BARCODE_TYPE"))), 'fk_barcode_type', 1);
+					print $formbarcode->selectBarcodeType((GETPOSTISSET('fk_barcode_type') ? GETPOSTINT('fk_barcode_type') : ($rowid ? $object->supplier_fk_barcode_type : getDolGlobalInt("PRODUIT_DEFAULT_BARCODE_TYPE"))), 'fk_barcode_type', 1);
 					print ' <input class="flat" name="barcode"  value="'.(GETPOSTISSET('barcode') ? GETPOST('barcode') : ($rowid ? $object->supplier_barcode : '')).'"></td>';
 					print '</tr>';
 				}
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index f26c28b840d..397b1660505 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 
-$type = GETPOST("type", 'int');
+$type = GETPOSTINT("type");
 if ($type == '' && !$user->hasRight('produit', 'lire') && $user->hasRight('service', 'lire')) {
 	$type = '1'; // Force global page on service page only
 }
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
index efe4d65f2d3..68b848bcc34 100644
--- a/htdocs/product/inventory/ajax/searchfrombarcode.php
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -43,11 +43,11 @@ $barcode = GETPOST("barcode", "aZ09");
 $product = GETPOST("product");
 $response = "";
 
-$fk_entrepot = GETPOST("fk_entrepot", "int");
-$fk_inventory = GETPOST("fk_inventory", "int");
-$fk_product = GETPOST("fk_product", "int");
-$reelqty = GETPOST("reelqty", "int");
-$batch = GETPOST("batch", "int");
+$fk_entrepot = GETPOSTINT("fk_entrepot");
+$fk_inventory = GETPOSTINT("fk_inventory");
+$fk_product = GETPOSTINT("fk_product");
+$reelqty = GETPOSTINT("reelqty");
+$batch = GETPOSTINT("batch");
 $mode = GETPOST("mode", "aZ");
 
 $warehousefound = 0;
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 55f04b96523..c8e467eb5d7 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 $langs->loadLangs(array("stocks", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
@@ -147,7 +147,7 @@ if (empty($reshook)) {
 		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MYOBJECT_MODIFY');
 	}*/
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index cd8ee975ed4..1a0eb8a668f 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -35,7 +35,7 @@ include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 $langs->loadLangs(array("stocks", "other", "productbatch"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -43,8 +43,8 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $listoffset = GETPOST('listoffset', 'alpha');
-$limit = GETPOST('limit', 'int') > 0 ? GETPOST('limit', 'int') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOSTINT('limit') > 0 ? GETPOSTINT('limit') : $conf->liste_limit;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
@@ -52,9 +52,9 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$fk_warehouse = GETPOST('fk_warehouse', 'int');
-$fk_product = GETPOST('fk_product', 'int');
-$lineid = GETPOST('lineid', 'int');
+$fk_warehouse = GETPOSTINT('fk_warehouse');
+$fk_product = GETPOSTINT('fk_product');
+$lineid = GETPOSTINT('lineid');
 $batch = GETPOST('batch', 'alphanohtml');
 $totalExpectedValuation = 0;
 $totalRealValuation = 0;
@@ -954,10 +954,10 @@ print '</tr>';
 if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
 	print '<tr>';
 	print '<td>';
-	print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? GETPOST('fk_warehouse', 'int') : $object->fk_warehouse), 'fk_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'maxwidth300');
+	print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? GETPOSTINT('fk_warehouse') : $object->fk_warehouse), 'fk_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'maxwidth300');
 	print '</td>';
 	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 $form->select_produits((GETPOSTISSET('fk_product') ? GETPOSTINT('fk_product') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
 	print '</td>';
 	if (isModEnabled('productbatch')) {
 		print '<td>';
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 396aca79e25..119a1be77f3 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("stocks", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -43,13 +43,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -86,13 +86,13 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 $searchCategoryProductOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
-	$searchCategoryProductOperator = GETPOST('search_category_product_operator', 'int');
+	$searchCategoryProductOperator = GETPOSTINT('search_category_product_operator');
 } elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
 	$searchCategoryProductOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
@@ -394,9 +394,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -424,7 +424,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index bed22f4b30d..de27e72adbb 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -65,7 +65,7 @@ if (isModEnabled('productbatch')) {
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
@@ -77,7 +77,7 @@ $search_ref_supplier = GETPOST("search_ref_supplier", 'alpha');
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_default_workstation = GETPOST("search_default_workstation", 'alpha');
-$search_type = GETPOST("search_type", 'int');
+$search_type = GETPOSTINT("search_type");
 $search_vatrate = GETPOST("search_vatrate", 'alpha');
 $searchCategoryProductOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
@@ -86,26 +86,26 @@ if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryProductOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
-$catid = GETPOST('catid', 'int');
+$catid = GETPOSTINT('catid');
 if (!empty($catid) && empty($searchCategoryProductList)) {
 	$searchCategoryProductList = array($catid);
 }
-$search_tosell = GETPOST("search_tosell", 'int');
-$search_tobuy = GETPOST("search_tobuy", 'int');
-$search_country = GETPOST("search_country", 'int');
-$search_state = GETPOST("state_id", 'int');
-$fourn_id = GETPOST("fourn_id", 'int');
-$search_tobatch = GETPOST("search_tobatch", 'int');
+$search_tosell = GETPOSTINT("search_tosell");
+$search_tobuy = GETPOSTINT("search_tobuy");
+$search_country = GETPOSTINT("search_country");
+$search_state = GETPOSTINT("state_id");
+$fourn_id = GETPOSTINT("fourn_id");
+$search_tobatch = GETPOSTINT("search_tobatch");
 $search_accountancy_code_sell = GETPOST("search_accountancy_code_sell", 'alpha');
 $search_accountancy_code_sell_intra = GETPOST("search_accountancy_code_sell_intra", 'alpha');
 $search_accountancy_code_sell_export = GETPOST("search_accountancy_code_sell_export", 'alpha');
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy", 'alpha');
 $search_accountancy_code_buy_intra = GETPOST("search_accountancy_code_buy_intra", 'alpha');
 $search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_export", 'alpha');
-$search_finished = GETPOST("search_finished", 'int');
-$search_units = GETPOST('search_units', 'int');
+$search_finished = GETPOSTINT("search_finished");
+$search_units = GETPOSTINT('search_units');
 $optioncss = GETPOST('optioncss', 'alpha');
-$type = GETPOST("type", "int");
+$type = GETPOSTINT("type");
 $mode = GETPOST('mode', 'alpha');
 
 // Show/hide child product variants
@@ -117,10 +117,10 @@ if (isModEnabled('variants')) {
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index ad397349125..c8348552835 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 // Load translation files required by the page
 $langs->load("companies");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 0c54b88c7d0..a116513c131 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('commande', 'propal', 'bills', 'other', 'products'));
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$type = GETPOST("type", "int");
+$type = GETPOSTINT("type");
 $mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : '';
 
 // Security check
@@ -44,10 +44,10 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index a2abdf524a3..ee636b4efcb 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -54,11 +54,11 @@ $langs->loadLangs(array('products', 'bills', 'companies', 'other'));
 $error = 0;
 $errors = array();
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$eid = GETPOST('eid', 'int');
+$eid = GETPOSTINT('eid');
 
 $search_soc = GETPOST('search_soc');
 
@@ -508,7 +508,7 @@ if (empty($reshook)) {
 
 
 	if ($action == 'delete' && $user->hasRight('produit', 'supprimer')) {
-		$result = $object->log_price_delete($user, GETPOST('lineid', 'int'));
+		$result = $object->log_price_delete($user, GETPOSTINT('lineid'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -517,7 +517,7 @@ if (empty($reshook)) {
 	// Set Price by quantity
 	if ($action == 'activate_price_by_qty') {
 		// Activating product price by quantity add a new price line with price_by_qty set to 1
-		$level = GETPOST('level', 'int');
+		$level = GETPOSTINT('level');
 		$ret = $object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 1);
 
 		if ($ret < 0) {
@@ -527,7 +527,7 @@ if (empty($reshook)) {
 	// Unset Price by quantity
 	if ($action == 'disable_price_by_qty') {
 		// Disabling product price by quantity add a new price line with price_by_qty set to 0
-		$level = GETPOST('level', 'int');
+		$level = GETPOSTINT('level');
 		$ret = $object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 0);
 
 		if ($ret < 0) {
@@ -536,14 +536,14 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'edit_price_by_qty') { // Edition d'un prix par quantité
-		$rowid = GETPOST('rowid', 'int');
+		$rowid = GETPOSTINT('rowid');
 	}
 
 	// Add or update price by quantity
 	if ($action == 'update_price_by_qty') {
 		// Récupération des variables
-		$rowid = GETPOST('rowid', 'int');
-		$priceid = GETPOST('priceid', 'int');
+		$rowid = GETPOSTINT('rowid');
+		$priceid = GETPOSTINT('priceid');
 		$newprice = price2num(GETPOST("price"), 'MU', 2);
 		// $newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management
 		$quantity = price2num(GETPOST('quantity'), 'MS', 2);
@@ -598,7 +598,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'delete_price_by_qty') {
-		$rowid = GETPOST('rowid', 'int');
+		$rowid = GETPOSTINT('rowid');
 		if (!empty($rowid)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
 			$sql .= " WHERE rowid = ".((int) $rowid);
@@ -610,7 +610,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'delete_all_price_by_qty') {
-		$priceid = GETPOST('priceid', 'int');
+		$priceid = GETPOSTINT('priceid');
 		if (!empty($rowid)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
 			$sql .= " WHERE fk_product_price = ".((int) $priceid);
@@ -629,10 +629,10 @@ if (empty($reshook)) {
 	if ($action == 'add_customer_price_confirm' && !$cancel && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
 		$maxpricesupplier = $object->min_recommended_price();
 
-		$update_child_soc = GETPOST('updatechildprice', 'int');
+		$update_child_soc = GETPOSTINT('updatechildprice');
 
 		// add price by customer
-		$prodcustprice->fk_soc = GETPOST('socid', 'int');
+		$prodcustprice->fk_soc = GETPOSTINT('socid');
 		$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
 		$prodcustprice->fk_product = $object->id;
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
@@ -738,7 +738,7 @@ if (empty($reshook)) {
 
 	if ($action == 'delete_customer_price' && ($user->hasRight('produit', 'supprimer') || $user->hasRight('service', 'supprimer'))) {
 		// Delete price by customer
-		$prodcustprice->id = GETPOST('lineid', 'int');
+		$prodcustprice->id = GETPOSTINT('lineid');
 		$result = $prodcustprice->delete($user);
 
 		if ($result < 0) {
@@ -752,9 +752,9 @@ if (empty($reshook)) {
 	if ($action == 'update_customer_price_confirm' && !$cancel && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
 		$maxpricesupplier = $object->min_recommended_price();
 
-		$update_child_soc = GETPOST('updatechildprice', 'int');
+		$update_child_soc = GETPOSTINT('updatechildprice');
 
-		$prodcustprice->fetch(GETPOST('lineid', 'int'));
+		$prodcustprice->fetch(GETPOSTINT('lineid'));
 
 		// update price by customer
 		$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
@@ -1921,10 +1921,10 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$prodcustprice = new ProductCustomerPrice($db);
 
-	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = (GETPOST("page", 'int') ? GETPOST("page", 'int') : 0);
+	$page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1
@@ -2035,7 +2035,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		print '<!-- edit_customer_price -->';
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
-		$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
+		$result = $prodcustprice->fetch(GETPOSTINT('lineid'));
 		if ($result < 0) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
@@ -2115,7 +2115,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
 
-		$filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
+		$filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOSTINT('socid'));
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -2128,10 +2128,10 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
 
-		$option = '&socid='.GETPOST('socid', 'int').'&id='.$object->id;
+		$option = '&socid='.GETPOSTINT('socid').'&id='.$object->id;
 
 		$staticsoc = new Societe($db);
-		$staticsoc->fetch(GETPOST('socid', 'int'));
+		$staticsoc->fetch(GETPOSTINT('socid'));
 
 		$title = $langs->trans('PriceByCustomerLog');
 		$title .= ' - '.$staticsoc->getNomUrl(1);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 786be0a7173..a6d380ecb91 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -41,18 +41,18 @@ $action = GETPOST('action', 'aZ09');
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
+$type = GETPOSTISSET('type') ? GETPOSTINT('type') : Product::TYPE_PRODUCT;
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_toolowstock = GETPOST('search_toolowstock');
 $tosell = GETPOST("tosell");
 $tobuy = GETPOST("tobuy");
-$fourn_id = GETPOST("fourn_id", 'int');
-$sbarcode = GETPOST("sbarcode", 'int');
+$fourn_id = GETPOSTINT("fourn_id");
+$sbarcode = GETPOSTINT("sbarcode");
 $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -62,7 +62,7 @@ if (!$sortfield) {
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -71,9 +71,9 @@ $offset = $limit * $page;
 // Load sale and categ filters
 $search_sale = GETPOST("search_sale");
 if (GETPOSTISSET('catid')) {
-	$search_categ = GETPOST('catid', 'int');
+	$search_categ = GETPOSTINT('catid');
 } else {
-	$search_categ = GETPOST('search_categ', 'int');
+	$search_categ = GETPOSTINT('search_categ');
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index ba066ce40d6..c09fe7a6cbf 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -50,7 +50,7 @@ $mode       = GETPOST('mode', 'aZ');
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
+$type = GETPOSTISSET('type') ? GETPOSTINT('type') : Product::TYPE_PRODUCT;
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_warehouse = GETPOST('search_warehouse', 'alpha');
 $search_batch = GETPOST('search_batch', 'alpha');
@@ -58,15 +58,15 @@ $search_toolowstock = GETPOST('search_toolowstock');
 $search_subjecttolotserial = GETPOST('search_subjecttolotserial');
 $tosell = GETPOST("tosell");
 $tobuy = GETPOST("tobuy");
-$fourn_id = GETPOST("fourn_id", 'int');
-$sbarcode = GETPOST("sbarcode", 'int');
+$fourn_id = GETPOSTINT("fourn_id");
+$sbarcode = GETPOSTINT("sbarcode");
 $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -79,11 +79,11 @@ $pagenext = $page + 1;
 $object = new Product($db);
 $search_sale = GETPOST("search_sale");
 if (GETPOSTISSET('catid')) {
-	$search_categ = GETPOST('catid', 'int');
+	$search_categ = GETPOSTINT('catid');
 } else {
-	$search_categ = GETPOST('search_categ', 'int');
+	$search_categ = GETPOSTINT('search_categ');
 }
-$search_warehouse_categ = GETPOST('search_warehouse_categ', 'int');
+$search_warehouse_categ = GETPOSTINT('search_warehouse_categ');
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -108,16 +108,16 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 $key = 'sellby';
-$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 $key = 'eatby';
-$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = GETPOST("canvas");
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 06fd8d17a41..ce698410b2e 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('mrp', 'products', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -50,10 +50,10 @@ $mesg = '';
 $option = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index f7dd11c382c..7021413e3b8 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -41,19 +41,19 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 160);
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'products', 'stocks', 'bills', 'other'));
 
-$id		= GETPOST('id', 'int'); // For this page, id can also be 'all'
+$id		= GETPOSTINT('id'); // For this page, id can also be 'all'
 $ref	= GETPOST('ref', 'alpha');
 $mode = (GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'byunit');
-$search_year   = GETPOST('search_year', 'int');
-$search_categ  = GETPOST('search_categ', 'int');
-$notab = GETPOST('notab', 'int');
+$search_year   = GETPOSTINT('search_year');
+$search_categ  = GETPOSTINT('search_categ');
+$notab = GETPOSTINT('notab');
 $type = GETPOST('type', 'alpha');
 
 $error = 0;
 $mesg = '';
 $graphfiles = array();
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
@@ -102,7 +102,7 @@ if (!($id > 0) && empty($ref) || $notab) {
 
 	llxHeader("", $langs->trans("ProductStatistics"));
 
-	$type = GETPOST('type', 'int');
+	$type = GETPOSTINT('type');
 
 	$helpurl = '';
 	if ($type == '0') {
@@ -255,7 +255,7 @@ if ($result || !($id > 0)) {
 
 
 	$param = '';
-	$param .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '&id='.$object->id).(($type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&search_year='.((int) $search_year).($notab ? '&notab='.$notab : '');
+	$param .= (GETPOSTISSET('id') ? '&id='.GETPOSTINT('id') : '&id='.$object->id).(($type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&search_year='.((int) $search_year).($notab ? '&notab='.$notab : '');
 	if ($socid > 0) {
 		$param .= '&socid='.((int) $socid);
 	}
@@ -519,7 +519,7 @@ if ($result || !($id > 0)) {
 			} else {
 				$dategenerated = ($mesg ? '<span class="error">'.$mesg.'</span>' : $langs->trans("ChartNotGenerated"));
 			}
-			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?'.(GETPOSTISSET('id') ? 'id='.GETPOST('id', 'int') : 'id='.$object->id).(((string) $type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&action=recalcul&mode='.urlencode($mode).'&search_year='.((int) $search_year).($search_categ > 0 ? '&search_categ='.((int) $search_categ) : '').'">';
+			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?'.(GETPOSTISSET('id') ? 'id='.GETPOSTINT('id') : 'id='.$object->id).(((string) $type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&action=recalcul&mode='.urlencode($mode).'&search_year='.((int) $search_year).($search_categ > 0 ? '&search_categ='.((int) $search_categ) : '').'">';
 			$linktoregenerate .= img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh');
 			$linktoregenerate .= '</a>';
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index eedd1cb47c8..4d3476f72d9 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'products', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -50,10 +50,10 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatsorder'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -66,8 +66,8 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "c.date_commande";
 }
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 if (GETPOSTISARRAY('search_status')) {
 	$search_status = implode(',', GETPOST('search_status', 'array:intcomma'));
 } else {
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 44e35990683..b56374addb6 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'products', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -50,10 +50,10 @@ $hookmanager->initHooks(array('productstatssupplierorder'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -66,8 +66,8 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "c.date_commande";
 }
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 if (GETPOSTISARRAY('search_status')) {
 	$search_status = implode(',', GETPOST('search_status', 'array:intcomma'));
 } else {
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e8c773099e7..33828c5faf5 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('contracts', 'products', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -46,10 +46,10 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatscontract'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 9eaf04992a3..cc81c4170b4 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'supplier_proposal'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -58,10 +58,10 @@ $search_array_options = $extrafields->getOptionalsFromPost('facture', '', 'searc
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 7951d82799e..61a98993331 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'companies', 'supplier_proposal'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -50,10 +50,10 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -66,8 +66,8 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "f.datef";
 }
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index 3374f353391..b2a0ae85510 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'supplier_proposal'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -53,10 +53,10 @@ $hookmanager->initHooks(array('productstatsinvoice'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -70,8 +70,8 @@ if (!$sortfield) {
 	$sortfield = "f.datec";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index bdd561f79fc..6060a224a87 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('mrp', 'products', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -48,10 +48,10 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -65,8 +65,8 @@ if (!$sortfield) {
 	$sortfield = "c.date_valid";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index e2f26e810b7..578bf62d489 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -50,10 +50,10 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 $hookmanager->initHooks(array('productstatspropal'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -67,8 +67,8 @@ if (!$sortfield) {
 	$sortfield = "p.datep";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 3f178ee0b7e..34cec31dc40 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'companies', 'supplier_proposal'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -49,10 +49,10 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierpropal'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -66,8 +66,8 @@ if (!$sortfield) {
 	$sortfield = "p.date_valid";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index a5c32a79043..9225e9aebd8 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -51,14 +51,14 @@ $langs->loadLangs(array('products', 'stocks', 'companies', 'categories'));
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm');
-$projectid = GETPOST('projectid', 'int');
+$projectid = GETPOSTINT('projectid');
 
-$id = GETPOST('id', 'int');
-$socid = GETPOST('socid', 'int');
+$id = GETPOSTINT('id');
+$socid = GETPOSTINT('socid');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
@@ -184,7 +184,7 @@ if (empty($reshook)) {
 
 	// Delete warehouse
 	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('stock', 'supprimer')) {
-		$object->fetch(GETPOST('id', 'int'));
+		$object->fetch(GETPOSTINT('id'));
 		$result = $object->delete($user);
 		if ($result > 0) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
@@ -257,7 +257,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'classin' && $usercancreate) {
 		// Link to a project
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	if ($cancel == $langs->trans("Cancel")) {
@@ -315,7 +315,7 @@ if ($action == 'create') {
 
 	// Parent entrepot
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
-	print img_picto('', 'stock').$formproduct->selectWarehouses((GETPOSTISSET('fk_parent') ? GETPOST('fk_parent', 'int') : 'ifone'), 'fk_parent', '', 1);
+	print img_picto('', 'stock').$formproduct->selectWarehouses((GETPOSTISSET('fk_parent') ? GETPOSTINT('fk_parent') : 'ifone'), 'fk_parent', '', 1);
 	print '</td></tr>';
 
 	// Project
@@ -397,7 +397,7 @@ if ($action == 'create') {
 
 	print '</form>';
 } else {
-	$id = GETPOST("id", 'int');
+	$id = GETPOSTINT("id");
 	if ($id > 0 || $ref) {
 		$object = new Entrepot($db);
 		$result = $object->fetch($id, $ref);
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 0e3f9367e16..e9e6c5034f5 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
 $result = restrictedArea($user, 'stock');
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index c49d7f2f208..84fea5ff91a 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 // Load translation files required by the page
 $langs->load("stocks");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 919566195f4..931da124450 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array("stocks", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -52,7 +52,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("sref", "alpha") ? GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
 $search_label = GETPOST("snom", "alpha") ? GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
-$search_status = GETPOST("search_status", "int");
+$search_status = GETPOSTINT("search_status");
 
 $search_category_list = array();
 if (isModEnabled('categorie')) {
@@ -60,10 +60,10 @@ if (isModEnabled('categorie')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -425,9 +425,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -445,7 +445,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']=img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 if (isModEnabled('category') && $user->hasRight('stock', 'creer')) {
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 84b8b8d0379..24ba968be41 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -53,18 +53,18 @@ $result = restrictedArea($user, 'produit|service');
 //checks if a product has been ordered
 
 $action = GETPOST('action', 'aZ09');
-$id_product = GETPOST('productid', 'int');
-$id_sw = GETPOST('id_sw', 'int');
-$id_tw = GETPOST('id_tw', 'int');
+$id_product = GETPOSTINT('productid');
+$id_sw = GETPOSTINT('id_sw');
+$id_tw = GETPOSTINT('id_tw');
 $batch = GETPOST('batch');
 $qty = GETPOST('qty');
 $idline = GETPOST('idline');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 1870535c45c..403b9984d34 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -52,17 +52,17 @@ if (isModEnabled('productbatch')) {
 // Security check
 $result = restrictedArea($user, 'stock');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$msid = GETPOST('msid', 'int');
-$product_id = GETPOST("product_id", 'int');
+$msid = GETPOSTINT('msid');
+$product_id = GETPOSTINT("product_id");
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'movementlist';
 
-$idproduct = GETPOST('idproduct', 'int');
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
+$idproduct = GETPOSTINT('idproduct');
+$year = GETPOSTINT("year");
+$month = GETPOSTINT("month");
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_movement = GETPOST("search_movement", 'alpha');
 $search_product_ref = trim(GETPOST("search_product_ref", 'alpha'));
@@ -72,10 +72,10 @@ $search_inventorycode = trim(GETPOST("search_inventorycode", 'alpha'));
 $search_user = trim(GETPOST("search_user", 'alpha'));
 $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
-$search_type_mouvement = GETPOST('search_type_mouvement', 'int');
+$search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
@@ -89,7 +89,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-$pdluoid = GETPOST('pdluoid', 'int');
+$pdluoid = GETPOSTINT('pdluoid');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new MouvementStock($db);
@@ -191,9 +191,9 @@ if ($action == "correct_stock") {
 		$origin_element = '';
 		$origin_id = null;
 
-		if (GETPOST('projectid', 'int')) {
+		if (GETPOSTINT('projectid')) {
 			$origin_element = 'project';
-			$origin_id = GETPOST('projectid', 'int');
+			$origin_id = GETPOSTINT('projectid');
 		}
 
 		if ($product->hasbatch()) {
@@ -201,14 +201,14 @@ if ($action == "correct_stock") {
 
 			//$eatby=GETPOST('eatby');
 			//$sellby=GETPOST('sellby');
-			$eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
-			$sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
+			$eatby = dol_mktime(0, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
+			$sellby = dol_mktime(0, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear'));
 
 			$result = $product->correct_stock_batch(
 				$user,
 				$id,
-				GETPOST("nbpiece", 'int'),
-				GETPOST("mouvement", 'int'),
+				GETPOSTINT("nbpiece"),
+				GETPOSTINT("mouvement"),
 				GETPOST("label", 'san_alpha'),
 				GETPOST('unitprice', 'alpha'),
 				$eatby,
@@ -222,7 +222,7 @@ if ($action == "correct_stock") {
 			$result = $product->correct_stock(
 				$user,
 				$id,
-				GETPOST("nbpiece", 'int'),
+				GETPOSTINT("nbpiece"),
 				GETPOST("mouvement", 'alpha'),
 				GETPOST("label", 'san_alpha'),
 				GETPOST('unitprice', 'alpha'),
@@ -254,7 +254,7 @@ if ($action == "transfert_stock" && !$cancel) {
 		$result = $product->fetch($product_id);
 	}
 
-	if (!(GETPOST("id_entrepot_destination", 'int') > 0)) {
+	if (!(GETPOSTINT("id_entrepot_destination") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -264,12 +264,12 @@ if ($action == "transfert_stock" && !$cancel) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		$action = 'transfert';
 	}
-	if (!GETPOST("nbpiece", 'int')) {
+	if (!GETPOSTINT("nbpiece")) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
 		$action = 'transfert';
 	}
-	if ($id == GETPOST("id_entrepot_destination", 'int')) {
+	if ($id == GETPOSTINT("id_entrepot_destination")) {
 		setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -328,7 +328,7 @@ if ($action == "transfert_stock" && !$cancel) {
 					$result1 = $product->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
-						GETPOST("nbpiece", 'int'),
+						GETPOSTINT("nbpiece"),
 						1,
 						GETPOST("label", 'san_alpha'),
 						$pricesrc,
@@ -340,8 +340,8 @@ if ($action == "transfert_stock" && !$cancel) {
 					// Add stock
 					$result2 = $product->correct_stock_batch(
 						$user,
-						GETPOST("id_entrepot_destination", 'int'),
-						GETPOST("nbpiece", 'int'),
+						GETPOSTINT("id_entrepot_destination"),
+						GETPOSTINT("nbpiece"),
 						0,
 						GETPOST("label", 'san_alpha'),
 						$pricedest,
@@ -356,7 +356,7 @@ if ($action == "transfert_stock" && !$cancel) {
 				$result1 = $product->correct_stock(
 					$user,
 					$id,
-					GETPOST("nbpiece", 'int'),
+					GETPOSTINT("nbpiece"),
 					1,
 					GETPOST("label", 'alpha'),
 					$pricesrc,
@@ -367,7 +367,7 @@ if ($action == "transfert_stock" && !$cancel) {
 				$result2 = $product->correct_stock(
 					$user,
 					GETPOST("id_entrepot_destination"),
-					GETPOST("nbpiece", 'int'),
+					GETPOSTINT("nbpiece"),
 					0,
 					GETPOST("label", 'alpha'),
 					$pricedest,
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index a666e4ac5b3..9eff95f02b0 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -60,22 +60,22 @@ $backtopage = GETPOST("backtopage", "alpha");
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$msid = GETPOST('msid', 'int');
-$idproduct = GETPOST('idproduct', 'int');
-$product_id = GETPOST("product_id", 'int');
-$show_files = GETPOST('show_files', 'int');
+$msid = GETPOSTINT('msid');
+$idproduct = GETPOSTINT('idproduct');
+$product_id = GETPOSTINT("product_id");
+$show_files = GETPOSTINT('show_files');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'), 'tzuserrel');
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'), 'tzuserrel');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
+$search_date_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_startmonth'), GETPOSTINT('search_date_startday'), GETPOSTINT('search_date_startyear'), 'tzuserrel');
+$search_date_end = dol_mktime(23, 59, 59, GETPOSTINT('search_date_endmonth'), GETPOSTINT('search_date_endday'), GETPOSTINT('search_date_endyear'), 'tzuserrel');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_movement = GETPOST("search_movement");
 $search_product_ref = trim(GETPOST("search_product_ref"));
@@ -85,16 +85,16 @@ $search_inventorycode = trim(GETPOST("search_inventorycode"));
 $search_user = trim(GETPOST("search_user"));
 $search_batch = trim(GETPOST("search_batch"));
 $search_qty = trim(GETPOST("search_qty"));
-$search_type_mouvement = GETPOST('search_type_mouvement', 'int');
-$search_fk_project=GETPOST("search_fk_project", 'int');
+$search_type_mouvement = GETPOSTINT('search_type_mouvement');
+$search_fk_project=GETPOSTINT("search_fk_project");
 
-$type = GETPOST("type", "int");
+$type = GETPOSTINT("type");
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -110,7 +110,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-$pdluoid = GETPOST('pdluoid', 'int');
+$pdluoid = GETPOSTINT('pdluoid');
 
 // Initialize technical objects
 $object = new MouvementStock($db);
@@ -366,9 +366,9 @@ if ($action == "correct_stock") {
 		$origin_element = '';
 		$origin_id = null;
 
-		if (GETPOST('projectid', 'int')) {
+		if (GETPOSTINT('projectid')) {
 			$origin_element = 'project';
-			$origin_id = GETPOST('projectid', 'int');
+			$origin_id = GETPOSTINT('projectid');
 		}
 
 		if ($product->hasbatch()) {
@@ -376,14 +376,14 @@ if ($action == "correct_stock") {
 
 			//$eatby=GETPOST('eatby');
 			//$sellby=GETPOST('sellby');
-			$eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
-			$sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
+			$eatby = dol_mktime(0, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
+			$sellby = dol_mktime(0, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear'));
 
 			$result = $product->correct_stock_batch(
 				$user,
 				$id,
-				GETPOST("nbpiece", 'int'),
-				GETPOST("mouvement", 'int'),
+				GETPOSTINT("nbpiece"),
+				GETPOSTINT("mouvement"),
 				GETPOST("label", 'alphanohtml'),
 				price2num(GETPOST('unitprice'), 'MT'),
 				$eatby,
@@ -399,8 +399,8 @@ if ($action == "correct_stock") {
 			$result = $product->correct_stock(
 				$user,
 				$id,
-				GETPOST("nbpiece", 'int'),
-				GETPOST("mouvement", "int"),
+				GETPOSTINT("nbpiece"),
+				GETPOSTINT("mouvement"),
 				GETPOST("label", 'alphanohtml'),
 				price2num(GETPOST('unitprice'), 'MT'),
 				GETPOST('inventorycode', 'alphanohtml'),
@@ -433,7 +433,7 @@ if ($action == "transfert_stock" && !$cancel) {
 		$result = $product->fetch($product_id);
 	}
 
-	if (!(GETPOST("id_entrepot_destination", 'int') > 0)) {
+	if (!(GETPOSTINT("id_entrepot_destination") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -443,12 +443,12 @@ if ($action == "transfert_stock" && !$cancel) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		$action = 'transfert';
 	}
-	if (!GETPOST("nbpiece", 'int')) {
+	if (!GETPOSTINT("nbpiece")) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
 		$action = 'transfert';
 	}
-	if ($id == GETPOST("id_entrepot_destination", 'int')) {
+	if ($id == GETPOSTINT("id_entrepot_destination")) {
 		setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -507,7 +507,7 @@ if ($action == "transfert_stock" && !$cancel) {
 					$result1 = $product->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
-						GETPOST("nbpiece", 'int'),
+						GETPOSTINT("nbpiece"),
 						1,
 						GETPOST("label", 'san_alpha'),
 						$pricesrc,
@@ -523,8 +523,8 @@ if ($action == "transfert_stock" && !$cancel) {
 					// Add stock
 					$result2 = $product->correct_stock_batch(
 						$user,
-						GETPOST("id_entrepot_destination", 'int'),
-						GETPOST("nbpiece", 'int'),
+						GETPOSTINT("id_entrepot_destination"),
+						GETPOSTINT("nbpiece"),
 						0,
 						GETPOST("label", 'san_alpha'),
 						$pricedest,
@@ -1074,7 +1074,7 @@ if (getDolGlobalString('STOCK_ALLOW_DELETE_OF_MOVEMENT') && $permissiontodelete)
 if (!empty($permissiontoadd)) {
 	$arrayofmassactions['prereverse'] = img_picto('', 'add', 'class="pictofixedwidth"').$langs->trans("Reverse");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'prereverse'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'prereverse'))) {
 	$arrayofmassactions = array();
 }
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 442fa454d95..672ca04fcba 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -65,15 +65,15 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $stocklimit = (float) GETPOST('seuil_stock_alerte');
 $desiredstock = GETPOST('desiredstock');
 $cancel = GETPOST('cancel', 'alpha');
 $fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
-$d_eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
-$d_sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
-$pdluoid = GETPOST('pdluoid', 'int');
+$d_eatby = dol_mktime(0, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
+$d_sellby = dol_mktime(0, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear'));
+$pdluoid = GETPOSTINT('pdluoid');
 $batchnumber = GETPOST('batch_number', 'san_alpha');
 if (!empty($batchnumber)) {
 	$batchnumber = trim($batchnumber);
@@ -181,7 +181,7 @@ if ($action == 'addlimitstockwarehouse' && $user->hasRight('produit', 'creer'))
 
 	if ($maj_ok) {
 		$pse = new ProductStockEntrepot($db);
-		if ($pse->fetch(0, $id, GETPOST('fk_entrepot', 'int')) > 0) {
+		if ($pse->fetch(0, $id, GETPOSTINT('fk_entrepot')) > 0) {
 			// Update
 			$pse->seuil_stock_alerte = $seuil_stock_alerte;
 			$pse->desiredstock = $desiredstock;
@@ -207,7 +207,7 @@ if ($action == 'addlimitstockwarehouse' && $user->hasRight('produit', 'creer'))
 if ($action == 'delete_productstockwarehouse' && $user->hasRight('produit', 'creer')) {
 	$pse = new ProductStockEntrepot($db);
 
-	$pse->fetch(GETPOST('fk_productstockwarehouse', 'int'));
+	$pse->fetch(GETPOSTINT('fk_productstockwarehouse'));
 	if ($pse->delete($user) > 0) {
 		setEventMessages($langs->trans('ProductStockWarehouseDeleted'), null, 'mesgs');
 	}
@@ -244,7 +244,7 @@ if ($action == 'setdesiredstock' && $user->hasRight('produit', 'creer')) {
 
 // Correct stock
 if ($action == "correct_stock" && !$cancel) {
-	if (!(GETPOST("id_entrepot", 'int') > 0)) {
+	if (!(GETPOSTINT("id_entrepot") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
 		$action = 'correction';
@@ -273,9 +273,9 @@ if ($action == "correct_stock" && !$cancel) {
 			$origin_element = '';
 			$origin_id = null;
 
-			if (GETPOST('projectid', 'int')) {
+			if (GETPOSTINT('projectid')) {
 				$origin_element = 'project';
-				$origin_id = GETPOST('projectid', 'int');
+				$origin_id = GETPOSTINT('projectid');
 			}
 
 			if (empty($object)) {
@@ -291,9 +291,9 @@ if ($action == "correct_stock" && !$cancel) {
 			if ($object->hasbatch()) {
 				$result = $object->correct_stock_batch(
 					$user,
-					GETPOST("id_entrepot", 'int'),
+					GETPOSTINT("id_entrepot"),
 					$nbpiece,
-					GETPOST("mouvement", 'int'),
+					GETPOSTINT("mouvement"),
 					GETPOST("label", 'alphanohtml'), // label movement
 					$priceunit,
 					$d_eatby,
@@ -307,9 +307,9 @@ if ($action == "correct_stock" && !$cancel) {
 			} else {
 				$result = $object->correct_stock(
 					$user,
-					GETPOST("id_entrepot", 'int'),
+					GETPOSTINT("id_entrepot"),
 					$nbpiece,
-					GETPOST("mouvement", 'int'),
+					GETPOSTINT("mouvement"),
 					GETPOST("label", 'alphanohtml'),
 					$priceunit,
 					GETPOST('inventorycode', 'alphanohtml'),
@@ -337,17 +337,17 @@ if ($action == "correct_stock" && !$cancel) {
 
 // Transfer stock from a warehouse to another warehouse
 if ($action == "transfert_stock" && !$cancel) {
-	if (!(GETPOST("id_entrepot", 'int') > 0) || !(GETPOST("id_entrepot_destination", 'int') > 0)) {
+	if (!(GETPOSTINT("id_entrepot") > 0) || !(GETPOSTINT("id_entrepot_destination") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
 		$action = 'transfert';
 	}
-	if (!GETPOST("nbpiece", 'int')) {
+	if (!GETPOSTINT("nbpiece")) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
 		$action = 'transfert';
 	}
-	if (GETPOST("id_entrepot", 'int') == GETPOST("id_entrepot_destination", 'int')) {
+	if (GETPOSTINT("id_entrepot") == GETPOSTINT("id_entrepot_destination")) {
 		setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -396,7 +396,7 @@ if ($action == "transfert_stock" && !$cancel) {
 						$error++;
 					}
 				} else {
-					$srcwarehouseid = GETPOST('id_entrepot', 'int');
+					$srcwarehouseid = GETPOSTINT('id_entrepot');
 					$batch = $batchnumber;
 					$eatby = $d_eatby;
 					$sellby = $d_sellby;
@@ -426,7 +426,7 @@ if ($action == "transfert_stock" && !$cancel) {
 					// Add stock
 					$result2 = $object->correct_stock_batch(
 						$user,
-						GETPOST("id_entrepot_destination", 'int'),
+						GETPOSTINT("id_entrepot_destination"),
 						$nbpiece,
 						0,
 						GETPOST("label", 'alphanohtml'),
@@ -445,7 +445,7 @@ if ($action == "transfert_stock" && !$cancel) {
 					// Remove stock
 					$result1 = $object->correct_stock(
 						$user,
-						GETPOST("id_entrepot", 'int'),
+						GETPOSTINT("id_entrepot"),
 						$nbpiece,
 						1,
 						GETPOST("label", 'alphanohtml'),
@@ -460,7 +460,7 @@ if ($action == "transfert_stock" && !$cancel) {
 					// Add stock
 					$result2 = $object->correct_stock(
 						$user,
-						GETPOST("id_entrepot_destination", 'int'),
+						GETPOSTINT("id_entrepot_destination"),
 						$nbpiece,
 						0,
 						GETPOST("label", 'alphanohtml'),
@@ -496,15 +496,15 @@ if ($action == "transfert_stock" && !$cancel) {
 // Update batch information
 if ($action == 'updateline' && GETPOST('save') == $langs->trans("Save")) {
 	$pdluo = new Productbatch($db);
-	$result = $pdluo->fetch(GETPOST('pdluoid', 'int'));
+	$result = $pdluo->fetch(GETPOSTINT('pdluoid'));
 
 	if ($result > 0) {
 		if ($pdluo->id) {
 			if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
 			} else {
-				$d_eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
-				$d_sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
+				$d_eatby = dol_mktime(0, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
+				$d_sellby = dol_mktime(0, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear'));
 				$pdluo->batch = $batchnumber;
 				$pdluo->eatby = $d_eatby;
 				$pdluo->sellby = $d_sellby;
@@ -1137,7 +1137,7 @@ if (!$variants || getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PA
 					$product_lot_static->eatby = $pdluo->eatby;
 					$product_lot_static->sellby = $pdluo->sellby;
 
-					if ($action == 'editline' && GETPOST('lineid', 'int') == $pdluo->id) { //Current line edit
+					if ($action == 'editline' && GETPOSTINT('lineid') == $pdluo->id) { //Current line edit
 						print "\n".'<tr>';
 						print '<td colspan="9">';
 						print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 4cca04d141b..b199e5b5295 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -40,8 +40,8 @@ global $conf, $db, $langs, $user;
 $langs->loadLangs(array('stocks', 'other', 'productbatch'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$lineid = GETPOST('lineid', 'int');
+$id = GETPOSTINT('id');
+$lineid = GETPOSTINT('lineid');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -72,15 +72,15 @@ if (empty($action) && empty($id) && empty($ref)) {
 }
 
 $batch = GETPOST('batch', 'alpha');
-$productid = GETPOST('productid', 'int');
+$productid = GETPOSTINT('productid');
 $ref = GETPOST('ref', 'alpha'); // ref is productid_batch
 
-$search_entity = GETPOST('search_entity', 'int');
-$search_fk_product = GETPOST('search_fk_product', 'int');
+$search_entity = GETPOSTINT('search_entity');
+$search_fk_product = GETPOSTINT('search_fk_product');
 $search_batch = GETPOST('search_batch', 'alpha');
-$search_fk_user_creat = GETPOST('search_fk_user_creat', 'int');
-$search_fk_user_modif = GETPOST('search_fk_user_modif', 'int');
-$search_import_key = GETPOST('search_import_key', 'int');
+$search_fk_user_creat = GETPOSTINT('search_fk_user_creat');
+$search_fk_user_modif = GETPOSTINT('search_fk_user_modif');
+$search_import_key = GETPOSTINT('search_import_key');
 
 if (empty($action) && empty($id) && empty($ref)) {
 	$action = 'list';
@@ -153,7 +153,7 @@ if (empty($reshook)) {
 	$backurlforlist = dol_buildpath('/product/stock/productlot_list.php', 1);
 
 	if ($action == 'seteatby' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) {
-		$newvalue = dol_mktime(12, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
+		$newvalue = dol_mktime(12, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
 
 		// check parameters
 		$object->eatby = $newvalue;
@@ -178,7 +178,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setsellby' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) {
-		$newvalue = dol_mktime(12, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
+		$newvalue = dol_mktime(12, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear'));
 
 		// check parameters
 		$object->sellby = $newvalue;
@@ -203,7 +203,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'seteol_date' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) {
-		$newvalue = dol_mktime(12, 0, 0, GETPOST('eol_datemonth', 'int'), GETPOST('eol_dateday', 'int'), GETPOST('eol_dateyear', 'int'));
+		$newvalue = dol_mktime(12, 0, 0, GETPOSTINT('eol_datemonth'), GETPOSTINT('eol_dateday'), GETPOSTINT('eol_dateyear'));
 		$result = $object->setValueFrom('eol_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
 			setEventMessages($object->error, null, 'errors');
@@ -214,7 +214,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setmanufacturing_date' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) {
-		$newvalue = dol_mktime(12, 0, 0, GETPOST('manufacturing_datemonth', 'int'), GETPOST('manufacturing_dateday', 'int'), GETPOST('manufacturing_dateyear', 'int'));
+		$newvalue = dol_mktime(12, 0, 0, GETPOSTINT('manufacturing_datemonth'), GETPOSTINT('manufacturing_dateday'), GETPOSTINT('manufacturing_dateyear'));
 		$result = $object->setValueFrom('manufacturing_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
 			setEventMessages($object->error, null, 'errors');
@@ -225,7 +225,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setscrapping_date' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) {
-		$newvalue = dol_mktime(12, 0, 0, GETPOST('scrapping_datemonth', 'int'), GETPOST('scrapping_dateday', 'int'), GETPOST('scrapping_dateyear', 'int'));
+		$newvalue = dol_mktime(12, 0, 0, GETPOSTINT('scrapping_datemonth'), GETPOSTINT('scrapping_dateday'), GETPOSTINT('scrapping_dateyear'));
 		$result = $object->setValueFrom('scrapping_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
 			setEventMessages($object->error, null, 'errors');
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 8cc4343ea63..9bd760e8e3b 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -43,7 +43,7 @@ global $conf, $db, $langs, $user;
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'products'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -60,10 +60,10 @@ $result = restrictedArea($user, 'produit|service');
 $hookmanager->initHooks(array('productlotdocuments'));
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 6bd524d7269..e73d364863f 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 $langs->loadLangs(array('stocks', 'productbatch', 'other', 'users'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -45,18 +45,18 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'pr
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
-$search_entity = GETPOST('search_entity', 'int');
+$search_entity = GETPOSTINT('search_entity');
 $search_product = GETPOST('search_product', 'alpha');
 $search_batch = GETPOST('search_batch', 'alpha');
-$search_fk_user_creat = GETPOST('search_fk_user_creat', 'int');
-$search_fk_user_modif = GETPOST('search_fk_user_modif', 'int');
-$search_import_key = GETPOST('search_import_key', 'int');
+$search_fk_user_creat = GETPOSTINT('search_fk_user_creat');
+$search_fk_user_modif = GETPOSTINT('search_fk_user_modif');
+$search_import_key = GETPOSTINT('search_import_key');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -93,8 +93,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -411,7 +411,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/product/stock/productlot_note.php b/htdocs/product/stock/productlot_note.php
index ee5c23ad162..0315f905a40 100644
--- a/htdocs/product/stock/productlot_note.php
+++ b/htdocs/product/stock/productlot_note.php
@@ -32,7 +32,7 @@ dol_include_once('/core/lib/product.lib.php');
 $langs->loadLangs(array('other', 'products'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 95db85f4cc1..14b8a9b7c45 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -55,17 +55,17 @@ $action = GETPOST('action', 'aZ09');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$type = GETPOST('type', 'int');
-$tobuy = GETPOST('tobuy', 'int');
+$type = GETPOSTINT('type');
+$tobuy = GETPOSTINT('tobuy');
 $salert = GETPOST('salert', 'alpha');
 $includeproductswithoutdesiredqty = GETPOST('includeproductswithoutdesiredqty', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 $draftorder = GETPOST('draftorder', 'alpha');
 
 
-$fourn_id = GETPOST('fourn_id', 'int');
-$fk_supplier = GETPOST('fk_supplier', 'int');
-$fk_entrepot = GETPOST('fk_entrepot', 'int');
+$fourn_id = GETPOSTINT('fourn_id');
+$fk_supplier = GETPOSTINT('fk_supplier');
+$fk_entrepot = GETPOSTINT('fk_entrepot');
 
 // List all visible warehouses
 $resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize(getEntity('stock')) .")");
@@ -89,11 +89,11 @@ $texte = '';
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$sortfield) {
@@ -153,7 +153,7 @@ if ($draftorder == 'on') {
 
 // Create orders
 if ($action == 'order' && GETPOST('valid')) {
-	$linecount = GETPOST('linecount', 'int');
+	$linecount = GETPOSTINT('linecount');
 	$box = 0;
 	$errorQty = 0;
 	unset($_POST['linecount']);
@@ -164,12 +164,12 @@ if ($action == 'order' && GETPOST('valid')) {
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$productsupplier = new ProductFournisseur($db);
 		for ($i = 0; $i < $linecount; $i++) {
-			if (GETPOST('choose'.$i, 'alpha') === 'on' && GETPOST('fourn'.$i, 'int') > 0) {
+			if (GETPOSTINT('choose'.$i) === 'on' && GETPOSTINT('fourn'.$i) > 0) {
 				//one line
 				$box = $i;
-				$supplierpriceid = GETPOST('fourn'.$i, 'int');
+				$supplierpriceid = GETPOSTINT('fourn'.$i);
 				//get all the parameters needed to create a line
-				$qty = GETPOST('tobuy'.$i, 'int');
+				$qty = GETPOSTINT('tobuy'.$i);
 				$idprod = $productsupplier->get_buyprice($supplierpriceid, $qty);
 				$res = $productsupplier->fetch($idprod);
 				if ($res && $idprod > 0) {
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 9a0e0847016..ed87bea7254 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -45,15 +45,15 @@ $sref = GETPOST('search_ref', 'alpha');
 $snom = GETPOST('search_nom', 'alpha');
 $suser = GETPOST('search_user', 'alpha');
 $sttc = GETPOST('search_ttc', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$search_product = GETPOST('search_product', 'int');
-$search_dateyear = GETPOST('search_dateyear', 'int');
-$search_datemonth = GETPOST('search_datemonth', 'int');
-$search_dateday = GETPOST('search_dateday', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$search_product = GETPOSTINT('search_product');
+$search_dateyear = GETPOSTINT('search_dateyear');
+$search_datemonth = GETPOSTINT('search_datemonth');
+$search_dateday = GETPOSTINT('search_dateday');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
@@ -62,7 +62,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = 'cf.date_creation';
 }
-$page = GETPOST('page', 'int') ? GETPOST('page', 'int') : 0;
+$page = GETPOSTINT('page') ? GETPOSTINT('page') : 0;
 if ($page < 0) {
 	$page = 0;
 }
@@ -160,8 +160,8 @@ if ($sall) {
 if (!empty($socid)) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
-if (GETPOST('statut', 'int')) {
-	$sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
+if (GETPOSTINT('statut')) {
+	$sql .= ' AND fk_statut = '.GETPOSTINT('statut');
 }
 $sql .= ' GROUP BY cf.rowid, cf.ref, cf.date_creation, cf.fk_statut';
 $sql .= ', cf.total_ttc, cf.fk_user_author, u.login, s.rowid, s.nom';
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 756f814f575..1603a1c1b23 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'orders'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $batch  	= GETPOST('batch', 'alpha');
-$objectid  = GETPOST('productid', 'int');
+$objectid  = GETPOSTINT('productid');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
@@ -56,10 +56,10 @@ $hookmanager->initHooks(array('batchproductstatssupplierorder'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -73,8 +73,8 @@ if (!$sortfield) {
 	$sortfield = "cf.date_commande";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index 5596ff381d5..9569c9e5794 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'supplier_proposal', 'productbatch'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $batch  	= GETPOST('batch', 'alpha');
-$objectid  = GETPOST('productid', 'int');
+$objectid  = GETPOSTINT('productid');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
@@ -56,10 +56,10 @@ $hookmanager->initHooks(array('batchproductstatsexpedition'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -73,8 +73,8 @@ if (!$sortfield) {
 	$sortfield = "exp.date_creation";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index b09a844f0f1..bbf7aeeb62e 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('mrp', 'products', 'companies', 'productbatch'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -49,10 +49,10 @@ if ($user->socid) {
 $hookmanager->initHooks(array('batchproductstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -66,8 +66,8 @@ if (!$sortfield) {
 	$sortfield = "c.date_valid";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 63c4b942310..2f088e1cb2f 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'products', 'supplier_proposal', 'productbatch'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $batch  	= GETPOST('batch', 'alpha');
-$objectid  = GETPOST('productid', 'int');
+$objectid  = GETPOSTINT('productid');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
@@ -56,10 +56,10 @@ $hookmanager->initHooks(array('batchproductstatsreception'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -73,8 +73,8 @@ if (!$sortfield) {
 	$sortfield = "recep.date_creation";
 }
 
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$search_month = '';
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 4bb7ad77326..e6d2f5a6757 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -51,14 +51,14 @@ $result = restrictedArea($user, 'produit|service');
 //checks if a product has been ordered
 
 $action = GETPOST('action', 'aZ09');
-$type = GETPOST('type', 'int');
+$type = GETPOSTINT('type');
 $mode = GETPOST('mode', 'alpha');
 
 $date = '';
 $dateendofday = '';
 if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateyear')) {
-	$date = dol_mktime(0, 0, 0, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
-	$dateendofday = dol_mktime(23, 59, 59, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
+	$date = dol_mktime(0, 0, 0, GETPOSTINT('datemonth'), GETPOSTINT('dateday'), GETPOSTINT('dateyear'));
+	$dateendofday = dol_mktime(23, 59, 59, GETPOSTINT('datemonth'), GETPOSTINT('dateday'), GETPOSTINT('dateyear'));
 }
 
 $search_ref = GETPOST('search_ref', 'alphanohtml');
@@ -66,15 +66,15 @@ $search_nom = GETPOST('search_nom', 'alphanohtml');
 
 $now = dol_now();
 
-$productid = GETPOST('productid', 'int');
+$productid = GETPOSTINT('productid');
 if (GETPOSTISARRAY('search_fk_warehouse')) {
 	$search_fk_warehouse = GETPOST('search_fk_warehouse', 'array:int');
 } else {
-	$search_fk_warehouse = array(GETPOST('search_fk_warehouse', 'int'));
+	$search_fk_warehouse = array(GETPOSTINT('search_fk_warehouse'));
 }
 // For backward compatibility
-if (GETPOST('fk_warehouse', 'int')) {
-	$search_fk_warehouse = array(GETPOST('fk_warehouse', 'int'));
+if (GETPOSTINT('fk_warehouse')) {
+	$search_fk_warehouse = array(GETPOSTINT('fk_warehouse'));
 }
 // Clean value -1
 foreach ($search_fk_warehouse as $key => $val) {
@@ -85,11 +85,11 @@ foreach ($search_fk_warehouse as $key => $val) {
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortfield) {
 	$sortfield = 'p.ref';
@@ -429,14 +429,14 @@ if (!empty($search_fk_warehouse)) {
 if ($productid > 0) {
 	$param .= '&productid='.(int) $productid;
 }
-if (GETPOST('dateday', 'int') > 0) {
-	$param .= '&dateday='.GETPOST('dateday', 'int');
+if (GETPOSTINT('dateday') > 0) {
+	$param .= '&dateday='.GETPOSTINT('dateday');
 }
-if (GETPOST('datemonth', 'int') > 0) {
-	$param .= '&datemonth='.GETPOST('datemonth', 'int');
+if (GETPOSTINT('datemonth') > 0) {
+	$param .= '&datemonth='.GETPOSTINT('datemonth');
 }
-if (GETPOST('dateyear', 'int') > 0) {
-	$param .= '&dateyear='.GETPOST('dateyear', 'int');
+if (GETPOSTINT('dateyear') > 0) {
+	$param .= '&dateyear='.GETPOSTINT('dateyear');
 }
 
 // TODO Move this into the title line ?
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index ada61f4f791..c1daca5153f 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_s
 $langs->loadLangs(array("stocks", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -52,10 +52,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index 65ce35d6aa0..abd9e80dbc6 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -43,7 +43,7 @@ if (isModEnabled('incoterm')) {
 
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
@@ -51,11 +51,11 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
-$qty = GETPOST('qty', 'int');
-$fk_product = GETPOST('fk_product', 'int');
-$fk_warehouse_source = GETPOST('fk_warehouse_source', 'int');
-$fk_warehouse_destination = GETPOST('fk_warehouse_destination', 'int');
-$lineid   = GETPOST('lineid', 'int');
+$qty = GETPOSTINT('qty');
+$fk_product = GETPOSTINT('fk_product');
+$fk_warehouse_source = GETPOSTINT('fk_warehouse_source');
+$fk_warehouse_destination = GETPOSTINT('fk_warehouse_destination');
+$lineid   = GETPOSTINT('lineid');
 $label = GETPOST('label', 'alpha');
 $batch = GETPOST('batch', 'alpha');
 $code_inv = GETPOST('inventorycode', 'alphanohtml');
@@ -152,10 +152,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	if ($action == 'addline' && $permissiontoadd) {
@@ -371,7 +371,7 @@ if (empty($reshook)) {
 
 	// Set incoterm
 	if ($action == 'set_incoterms' && isModEnabled('incoterm') && $permissiontoadd) {
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	}
 	// Actions to send emails
 	$triggersendname = 'STOCKTRANSFER_SENTBYMAIL';
@@ -749,7 +749,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$formproduct = new FormProduct($db);
 	print '<div class="div-table-responsive-no-min">';
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
index 95fae85acb2..33d2ff92f04 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -37,9 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_s
 // Load translation files required by the page
 $langs->loadLangs(array('facture', 'orders', 'sendings', 'companies', 'stocks'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 $action = GETPOST('action', 'alpha');
 
 $object = new StockTransfer($db);
@@ -77,7 +77,7 @@ $result = restrictedArea($user, 'stocktransfer', $id, '', 'stocktransfer');
 
 if ($action == 'addcontact' && $user->hasRight('stocktransfer', 'stocktransfer', 'write')) {
 	if ($object->id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$result = $object->add_contact($contactid, !empty($_POST["typecontact"]) ? $_POST["typecontact"] : $_POST["type"], $_POST["source"]);
 	}
 
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index 72b5352f740..06b2be4f50a 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -37,14 +37,14 @@ $langs->loadLangs(array("stocks", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 6ff09720df5..ea9875ad375 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("stocks", "other"));
 // Get parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -45,13 +45,13 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'st
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -89,8 +89,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -233,7 +233,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -382,9 +382,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -406,7 +406,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_note.php b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
index cef7273128d..a4b8128602e 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_note.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_s
 $langs->loadLangs(array("stocks", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 54ae8157210..b393de2bc48 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -45,7 +45,7 @@ if (empty($id)) {
 	$id = $object->id;
 }
 
-$pdluoid = GETPOST('pdluoid', 'int');
+$pdluoid = GETPOSTINT('pdluoid');
 
 $pdluo = new Productbatch($db);
 
@@ -146,7 +146,7 @@ print '<tr>';
 if ($object->element == 'product') {
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
-	$ident = (GETPOST("dwid") ? GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ? GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
+	$ident = (GETPOST("dwid") ? GETPOSTINT("dwid") : (GETPOST('id_entrepot') ? GETPOSTINT('id_entrepot') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
 	if (empty($ident) && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE')) {
 		$ident = getDolGlobalString('MAIN_DEFAULT_WAREHOUSE');
 	}
@@ -157,7 +157,7 @@ if ($object->element == 'stock') {
 	print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
 	print '<td>';
 	print img_picto('', 'product');
-	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
+	$form->select_produits(GETPOSTINT('product_id'), 'product_id', (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 	print '</td>';
 }
 print '<td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 0fb163e3a73..b5bf80f8947 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -40,7 +40,7 @@ if (empty($id)) {
 	$id = $object->id;
 }
 
-$pdluoid = GETPOST('pdluoid', 'int');
+$pdluoid = GETPOSTINT('pdluoid');
 
 $pdluo = new Productbatch($db);
 
@@ -73,7 +73,7 @@ if ($object->element == 'product') {
 	print '<td class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
 	print '<td>';
 	print img_picto('', 'stock');
-	$selected = (GETPOST("dwid") ? GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ? GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
+	$selected = (GETPOST("dwid") ? GETPOSTINT("dwid") : (GETPOST('id_entrepot') ? GETPOSTINT('id_entrepot') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
 	$warehousestatus = 'warehouseopen,warehouseinternal';
 	print $formproduct->selectWarehouses($selected, 'id_entrepot', $warehousestatus, 1, 0, 0, '', 0, 0, array(), 'minwidth75 maxwidth300 widthcentpercentminusx');
 	print '</td>';
@@ -82,7 +82,7 @@ if ($object->element == 'stock') {
 	print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
 	print '<td>';
 	print img_picto('', 'product');
-	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
+	$form->select_produits(GETPOSTINT('product_id'), 'product_id', (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 	print '</td>';
 }
 
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 038041a9ce2..259f139a177 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -49,7 +49,7 @@ $page = $_GET["page"];
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 73604a418a2..008e5af8ebd 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'languages'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
@@ -329,7 +329,7 @@ if ($action == 'add' && ($user->hasRight('produit', 'creer') || $user->hasRight(
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vadd">';
-	print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
+	print '<input type="hidden" name="id" value="'.GETPOSTINT("id").'">';
 
 	print dol_get_fiche_head();
 
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 6d7be3e49f7..a877b0880f7 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-$search_project_user = GETPOST('search_project_user', 'int');
+$search_project_user = GETPOSTINT('search_project_user');
 $mine = GETPOST('mode', 'aZ09') == 'mine' ? 1 : 0;
 if ($search_project_user == $user->id) {
 	$mine = 1;
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 0ad3131546a..ac2092946d7 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -40,8 +40,8 @@ $langs->loadLangs(array('projects', 'users', 'companies'));
 
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST("mode", 'alpha');
-$id = GETPOST('id', 'int');
-$taskid = GETPOST('taskid', 'int');
+$id = GETPOSTINT('id');
+$taskid = GETPOSTINT('taskid');
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'perdaycard';
 
@@ -50,7 +50,7 @@ if ($mode == 'mine') {
 	$mine = 1;
 }
 
-$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
+$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOSTINT("projectid");
 
 $hookmanager->initHooks(array('timesheetperdaycard'));
 
@@ -62,15 +62,15 @@ $result = restrictedArea($user, 'projet', $projectid);
 
 $now = dol_now();
 
-$year = GETPOST('reyear', 'int') ? GETPOST('reyear', 'int') : (GETPOST("year", "int") ? GETPOST("year", "int") : (GETPOST("addtimeyear", "int") ? GETPOST("addtimeyear", "int") : date("Y")));
-$month = GETPOST('remonth', 'int') ? GETPOST('remonth', 'int') : (GETPOST("month", "int") ? GETPOST("month", "int") : (GETPOST("addtimemonth", "int") ? GETPOST("addtimemonth", "int") : date("m")));
-$day = GETPOST('reday', 'int') ? GETPOST('reday', 'int') : (GETPOST("day", "int") ? GETPOST("day", "int") : (GETPOST("addtimeday", "int") ? GETPOST("addtimeday", "int") : date("d")));
-$week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
+$year = GETPOSTINT('reyear') ? GETPOSTINT('reyear') : (GETPOSTINT("year") ? GETPOSTINT("year") : (GETPOSTINT("addtimeyear") ? GETPOSTINT("addtimeyear") : date("Y")));
+$month = GETPOSTINT('remonth') ? GETPOSTINT('remonth') : (GETPOSTINT("month") ? GETPOSTINT("month") : (GETPOSTINT("addtimemonth") ? GETPOSTINT("addtimemonth") : date("m")));
+$day = GETPOSTINT('reday') ? GETPOSTINT('reday') : (GETPOSTINT("day") ? GETPOSTINT("day") : (GETPOSTINT("addtimeday") ? GETPOSTINT("addtimeday") : date("d")));
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 
 $day = (int) $day;
 
 //$search_categ = GETPOST("search_categ", 'alpha');
-$search_usertoprocessid = GETPOST('search_usertoprocessid', 'int');
+$search_usertoprocessid = GETPOSTINT('search_usertoprocessid');
 $search_task_ref = GETPOST('search_task_ref', 'alpha');
 $search_task_label = GETPOST('search_task_label', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
@@ -182,8 +182,8 @@ if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') |
 }
 
 if (GETPOST('submitdateselect')) {
-	if (GETPOST('remonth', 'int') && GETPOST('reday', 'int') && GETPOST('reyear', 'int')) {
-		$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	if (GETPOSTINT('remonth') && GETPOSTINT('reday') && GETPOSTINT('reyear')) {
+		$daytoparse = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 	}
 
 	$action = '';
@@ -286,7 +286,7 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 			$taskid = $object->id;
 
 			if (GETPOSTISSET($taskid.'progress')) {
-				$object->progress = GETPOST($taskid.'progress', 'int');
+				$object->progress = GETPOSTINT($taskid.'progress');
 			} else {
 				unset($object->progress);
 			}
@@ -294,8 +294,8 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 			$object->timespent_duration = $val;
 			$object->timespent_fk_user = $usertoprocess->id;
 			$object->timespent_note = GETPOST($key.'note');
-			if (GETPOST($key."hour", 'int') != '' && GETPOST($key."hour", 'int') >= 0) {	// If hour was entered
-				$object->timespent_datehour = dol_mktime(GETPOST($key."hour", 'int'), GETPOST($key."min", 'int'), 0, $monthofday, $dayofday, $yearofday);
+			if (GETPOSTINT($key."hour") != '' && GETPOSTINT($key."hour") >= 0) {	// If hour was entered
+				$object->timespent_datehour = dol_mktime(GETPOSTINT($key."hour"), GETPOSTINT($key."min"), 0, $monthofday, $dayofday, $yearofday);
 				$object->timespent_withhour = 1;
 			} else {
 				$object->timespent_datehour = dol_mktime(12, 0, 0, $monthofday, $dayofday, $yearofday);
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index edf14de65f6..84b3d3ed0a8 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -39,8 +39,8 @@ $langs->loadLangs(array('projects', 'users', 'companies'));
 
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST("mode", 'alpha');
-$id = GETPOST('id', 'int');
-$taskid = GETPOST('taskid', 'int');
+$id = GETPOSTINT('id');
+$taskid = GETPOSTINT('taskid');
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'perweekcard';
 
@@ -49,7 +49,7 @@ if ($mode == 'mine') {
 	$mine = 1;
 }
 
-$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
+$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOSTINT("projectid");
 
 $hookmanager->initHooks(array('timesheetpermonthcard'));
 
@@ -61,15 +61,15 @@ $result = restrictedArea($user, 'projet', $projectid);
 
 $now = dol_now();
 
-$year = GETPOST('reyear', 'int') ? GETPOST('reyear', 'int') : (GETPOST("year", 'int') ? GETPOST("year", "int") : date("Y"));
-$month = GETPOST('remonth', 'int') ? GETPOST('remonth', 'int') : (GETPOST("month", 'int') ? GETPOST("month", "int") : date("m"));
-$day = GETPOST('reday', 'int') ? GETPOST('reday', 'int') : (GETPOST("day", 'int') ? GETPOST("day", "int") : date("d"));
-$week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
+$year = GETPOSTINT('reyear') ? GETPOSTINT('reyear') : (GETPOSTINT("year") ? GETPOSTINT("year") : date("Y"));
+$month = GETPOSTINT('remonth') ? GETPOSTINT('remonth') : (GETPOSTINT("month") ? GETPOSTINT("month") : date("m"));
+$day = GETPOSTINT('reday') ? GETPOSTINT('reday') : (GETPOSTINT("day") ? GETPOSTINT("day") : date("d"));
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 
 $day = (int) $day;
 
 //$search_categ = GETPOST("search_categ", 'alpha');
-$search_usertoprocessid = GETPOST('search_usertoprocessid', 'int');
+$search_usertoprocessid = GETPOSTINT('search_usertoprocessid');
 $search_task_ref = GETPOST('search_task_ref', 'alpha');
 $search_task_label = GETPOST('search_task_label', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
@@ -182,8 +182,8 @@ if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') |
 }
 
 if (GETPOST('submitdateselect')) {
-	if (GETPOST('remonth', 'int') && GETPOST('reday', 'int') && GETPOST('reyear', 'int')) {
-		$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	if (GETPOSTINT('remonth') && GETPOSTINT('reday') && GETPOSTINT('reyear')) {
+		$daytoparse = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 	}
 
 	$action = '';
@@ -281,7 +281,7 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 						$object->fetch($tmptaskid);
 
 						if (GETPOSTISSET($tmptaskid.'progress')) {
-							$object->progress = GETPOST($tmptaskid.'progress', 'int');
+							$object->progress = GETPOSTINT($tmptaskid.'progress');
 						} else {
 							unset($object->progress);
 						}
@@ -308,8 +308,8 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 				$object->fetch($tmptaskid);
 				//var_dump($object->progress);
 				//var_dump(GETPOST($tmptaskid . 'progress', 'int')); exit;
-				if ($object->progress != GETPOST($tmptaskid.'progress', 'int')) {
-					$object->progress = GETPOST($tmptaskid.'progress', 'int');
+				if ($object->progress != GETPOSTINT($tmptaskid.'progress')) {
+					$object->progress = GETPOSTINT($tmptaskid.'progress');
 					$result = $object->update($user);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 7fc8c64215b..c568a282a0d 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -40,8 +40,8 @@ $langs->loadLangs(array('projects', 'users', 'companies'));
 
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST("mode", 'alpha');
-$id = GETPOST('id', 'int');
-$taskid = GETPOST('taskid', 'int');
+$id = GETPOSTINT('id');
+$taskid = GETPOSTINT('taskid');
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'perweekcard';
 
@@ -50,7 +50,7 @@ if ($mode == 'mine') {
 	$mine = 1;
 }
 
-$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
+$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOSTINT("projectid");
 
 $hookmanager->initHooks(array('timesheetperweekcard'));
 
@@ -62,15 +62,15 @@ $result = restrictedArea($user, 'projet', $projectid);
 
 $now = dol_now();
 
-$year = GETPOST('reyear', 'int') ? GETPOST('reyear', 'int') : (GETPOST("year", 'int') ? GETPOST("year", "int") : date("Y"));
-$month = GETPOST('remonth', 'int') ? GETPOST('remonth', 'int') : (GETPOST("month", 'int') ? GETPOST("month", "int") : date("m"));
-$day = GETPOST('reday', 'int') ? GETPOST('reday', 'int') : (GETPOST("day", 'int') ? GETPOST("day", "int") : date("d"));
-$week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
+$year = GETPOSTINT('reyear') ? GETPOSTINT('reyear') : (GETPOSTINT("year") ? GETPOSTINT("year") : date("Y"));
+$month = GETPOSTINT('remonth') ? GETPOSTINT('remonth') : (GETPOSTINT("month") ? GETPOSTINT("month") : date("m"));
+$day = GETPOSTINT('reday') ? GETPOSTINT('reday') : (GETPOSTINT("day") ? GETPOSTINT("day") : date("d"));
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 
 $day = (int) $day;
 
 //$search_categ = GETPOST("search_categ", 'alpha');
-$search_usertoprocessid = GETPOST('search_usertoprocessid', 'int');
+$search_usertoprocessid = GETPOSTINT('search_usertoprocessid');
 $search_task_ref = GETPOST('search_task_ref', 'alpha');
 $search_task_label = GETPOST('search_task_label', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
@@ -186,8 +186,8 @@ if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') |
 }
 
 if (GETPOST('submitdateselect')) {
-	if (GETPOST('remonth', 'int') && GETPOST('reday', 'int') && GETPOST('reyear', 'int')) {
-		$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	if (GETPOSTINT('remonth') && GETPOSTINT('reday') && GETPOSTINT('reyear')) {
+		$daytoparse = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 	}
 
 	$action = '';
@@ -285,7 +285,7 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 						$object->fetch($tmptaskid);
 
 						if (GETPOSTISSET($tmptaskid.'progress')) {
-							$object->progress = GETPOST($tmptaskid.'progress', 'int');
+							$object->progress = GETPOSTINT($tmptaskid.'progress');
 						} else {
 							unset($object->progress);
 						}
@@ -312,8 +312,8 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 				$object->fetch($tmptaskid);
 				//var_dump($object->progress);
 				//var_dump(GETPOST($tmptaskid . 'progress', 'int')); exit;
-				if ($object->progress != GETPOST($tmptaskid.'progress', 'int')) {
-					$object->progress = GETPOST($tmptaskid.'progress', 'int');
+				if ($object->progress != GETPOSTINT($tmptaskid.'progress')) {
+					$object->progress = GETPOSTINT($tmptaskid.'progress');
 					$result = $object->update($user);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index 60edde2c473..d79d55da84f 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -62,7 +62,7 @@ if ($action == 'setPROJECT_ENABLE_PUBLIC') {
 
 if ($action == 'update') {
 	$public = GETPOST('PROJECT_ENABLE_PUBLIC');
-	$defaultoppstatus = GETPOST('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', 'int');
+	$defaultoppstatus = GETPOSTINT('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD');
 	$res = dolibarr_set_const($db, "PROJET_VISIBILITY", $visibility, 'chaine', 0, '', $conf->entity);
 
 	$res = dolibarr_set_const($db, "PROJECT_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
@@ -142,7 +142,7 @@ if (getDolGlobalString('PROJECT_ENABLE_PUBLIC')) {
 	print '<tr class="oddeven drag" id="trforcetype"><td>';
 	print $langs->trans("DefaultOpportunityStatus");
 	print '</td><td class="right">';
-	print $formproject->selectOpportunityStatus('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', GETPOSTISSET('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD') ? GETPOST('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', 'int') : $defaultoppstatus, 1, 0, 0, 0, '', 0, 1);
+	print $formproject->selectOpportunityStatus('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', GETPOSTISSET('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD') ? GETPOSTINT('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD') : $defaultoppstatus, 1, 0, 0, 0, '', 0, 1);
 	print "</td></tr>\n";
 
 
diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php
index 8896165771d..3a07093cae1 100644
--- a/htdocs/projet/agenda.php
+++ b/htdocs/projet/agenda.php
@@ -32,16 +32,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->load("projects");
 
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
-$socid  = GETPOST('socid', 'int');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
@@ -68,7 +68,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $hookmanager->initHooks(array('projectcardinfo'));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $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 assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index fbb02a60a48..1b2b4a4b392 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -46,9 +46,9 @@ if (!defined('NOREQUIREHTML')) {
 require '../../main.inc.php';
 
 $htmlname = GETPOST('htmlname', 'aZ09');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $mode = GETPOST('mode', 'aZ09');
-$discard_closed = GETPOST('discardclosed', 'int');
+$discard_closed = GETPOSTINT('discardclosed');
 
 // Security check
 restrictedArea($user, 'projet', 0, 'projet&project');
@@ -84,7 +84,7 @@ if ($mode == 'gettasks') {
 	top_httphead();
 
 	$formproject = new FormProjets($db);
-	$formproject->selectTasks((!empty($socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
+	$formproject->selectTasks((!empty($socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOSTINT('projectid'), '');
 
 	$db->close();
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 44fedb360bb..3b6a798fe3a 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -45,7 +45,7 @@ if (isModEnabled('eventorganization')) {
 
 $langs->loadLangs($langsLoad);
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -60,13 +60,13 @@ if (!empty($backtopagejsfields)) {
 	$dol_openinpopup = $tmpbacktopagejsfields[0];
 }
 
-$status = GETPOST('status', 'int');
-$opp_status = GETPOST('opp_status', 'int');
+$status = GETPOSTINT('status');
+$opp_status = GETPOSTINT('opp_status');
 $opp_percent = price2num(GETPOST('opp_percent', 'alphanohtml'));
 $objcanvas = GETPOST("objcanvas", "alphanohtml");
 $comefromclone = GETPOST("comefromclone", "alphanohtml");
-$date_start = dol_mktime(0, 0, 0, GETPOST('projectstartmonth', 'int'), GETPOST('projectstartday', 'int'), GETPOST('projectstartyear', 'int'));
-$date_end = dol_mktime(0, 0, 0, GETPOST('projectendmonth', 'int'), GETPOST('projectendday', 'int'), GETPOST('projectendyear', 'int'));
+$date_start = dol_mktime(0, 0, 0, GETPOSTINT('projectstartmonth'), GETPOSTINT('projectstartday'), GETPOSTINT('projectstartyear'));
+$date_end = dol_mktime(0, 0, 0, GETPOSTINT('projectendmonth'), GETPOSTINT('projectendday'), GETPOSTINT('projectendyear'));
 $date_start_event = dol_mktime(GETPOSTINT('date_start_eventhour'), GETPOSTINT('date_start_eventmin'), GETPOSTINT('date_start_eventsec'), GETPOSTINT('date_start_eventmonth'), GETPOSTINT('date_start_eventday'), GETPOSTINT('date_start_eventyear'), 'tzuserrel');
 $date_end_event = dol_mktime(GETPOSTINT('date_end_eventhour'), GETPOSTINT('date_end_eventmin'), GETPOSTINT('date_end_eventsec'), GETPOSTINT('date_end_eventmonth'), GETPOSTINT('date_end_eventday'), GETPOSTINT('date_end_eventyear'), 'tzuserrel');
 $location = GETPOST('location', 'alphanohtml');
@@ -99,7 +99,7 @@ if ($id > 0 || !empty($ref)) {
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 //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 assignment.
 restrictedArea($user, 'projet', $object->id, 'projet&project');
 
@@ -210,7 +210,7 @@ if (empty($reshook)) {
 			$object->ref                  = GETPOST('ref', 'alphanohtml');
 			$object->fk_project           = GETPOSTINT('fk_project');
 			$object->title                = GETPOST('title', 'alphanohtml');
-			$object->socid                = GETPOST('socid', 'int');
+			$object->socid                = GETPOSTINT('socid');
 			$object->description          = GETPOST('description', 'restricthtml'); // Do not use 'alpha' here, we want field as it is
 			$object->public               = GETPOST('public', 'alphanohtml');
 			$object->opp_amount           = GETPOSTFLOAT('opp_amount');
@@ -308,10 +308,10 @@ if (empty($reshook)) {
 			$old_start_date = $object->date_start;
 
 			$object->ref          = GETPOST('ref', 'alpha');
-			$object->fk_project   = GETPOST('fk_project', 'int');
+			$object->fk_project   = GETPOSTINT('fk_project');
 			$object->title        = GETPOST('title', 'alphanohtml'); // Do not use 'alpha' here, we want field as it is
-			$object->statut       = GETPOST('status', 'int');
-			$object->socid        = GETPOST('socid', 'int');
+			$object->statut       = GETPOSTINT('status');
+			$object->socid        = GETPOSTINT('socid');
 			$object->description  = GETPOST('description', 'restricthtml'); // Do not use 'alpha' here, we want field as it is
 			$object->public       = GETPOST('public', 'alpha');
 			$object->date_start   = (!GETPOST('projectstart')) ? '' : $date_start;
@@ -396,8 +396,8 @@ if (empty($reshook)) {
 		} else {
 			$db->commit();
 
-			if (GETPOST('socid', 'int') > 0) {
-				$object->fetch_thirdparty(GETPOST('socid', 'int'));
+			if (GETPOSTINT('socid') > 0) {
+				$object->fetch_thirdparty(GETPOSTINT('socid'));
 			} else {
 				unset($object->thirdparty);
 			}
@@ -528,7 +528,7 @@ if (empty($reshook)) {
 		$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
 		$clone_notes = GETPOST('clone_notes') ? 1 : 0;
 		$move_date = GETPOST('move_date') ? 1 : 0;
-		$clone_thirdparty = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : 0;
+		$clone_thirdparty = GETPOSTINT('socid') ? GETPOSTINT('socid') : 0;
 
 		$result = $object->createFromClone($user, $object->id, $clone_contacts, $clone_tasks, $clone_project_files, $clone_task_files, $clone_notes, $move_date, 0, $clone_thirdparty);
 		if ($result <= 0) {
@@ -769,7 +769,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		if (getDolGlobalString('PROJECT_FILTER_FOR_THIRDPARTY_LIST')) {
 			$filter = getDolGlobalString('PROJECT_FILTER_FOR_THIRDPARTY_LIST');
 		}
-		$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filter, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
+		$text = img_picto('', 'company').$form->select_company(GETPOSTINT('socid'), 'socid', $filter, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		if (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') && empty($conf->dol_use_jmobile)) {
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
@@ -977,7 +977,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	if ($action == 'clone') {
 		$formquestion = array(
 			'text' => $langs->trans("ConfirmClone"),
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200 maxwidth250')),
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid') > 0 ? GETPOSTINT('socid') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200 maxwidth250')),
 			array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
 			array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
 			array('type' => 'checkbox', 'name' => 'move_date', 'label' => $langs->trans("CloneMoveDate"), 'value' => true),
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 4252c0d81cd..b8201e7c6e7 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -38,13 +38,13 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies'));
 
-$id = GETPOST('id', 'int');
-$idcomment = GETPOST('idcomment', 'int');
+$id = GETPOSTINT('id');
+$idcomment = GETPOSTINT('idcomment');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $objectref = GETPOST("taskref", 'alpha'); // task ref
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 
 // Security check
 $socid = 0;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 6561c87b4b1..0b76bd6b620 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -41,10 +41,10 @@ if (isModEnabled('eventorganization')) {
 
 $langs->loadLangs($langsLoad);
 
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$lineid = GETPOSTINT('lineid');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 $mine   = GETPOST('mode') == 'mine' ? 1 : 0;
@@ -89,7 +89,7 @@ if (empty($reshook)) {
 
 		//If no task available, redirec to to add confirm
 		$type_to = (GETPOST('typecontact') ? 'typecontact='.GETPOST('typecontact') : 'type='.GETPOST('type'));
-		$personToAffect = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$personToAffect = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$affect_to = (GETPOST('userid') ? 'userid='.$personToAffect : 'contactid='.$personToAffect);
 		$url_redirect='?id='.$object->id.'&'.$affect_to.'&'.$type_to.'&source='.$source;
 
@@ -163,7 +163,7 @@ if (empty($reshook)) {
 			exit;
 		}
 
-		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$groupid = GETPOSTINT('groupid');
 		$contactarray = array();
@@ -272,7 +272,7 @@ if (empty($reshook)) {
 	// Change contact's status
 	if ($action == 'swapstatut' && $user->hasRight('projet', 'creer')) {
 		if ($object->fetch($id)) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} else {
 			dol_print_error($db);
 		}
@@ -281,7 +281,7 @@ if (empty($reshook)) {
 	// Delete a contact
 	if (($action == 'deleteline' || $action == 'deletecontact') && $user->hasRight('projet', 'creer')) {
 		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+		$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: contact.php?id=".$object->id);
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index d849a95d9ea..59573f402f8 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -37,7 +37,7 @@ $hookmanager->initHooks(array('projectcarddocument'));
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 $mine 		= (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0);
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -54,10 +54,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Get parameters
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 6f92058c3d3..6f519a921e3 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -147,7 +147,7 @@ if (isModEnabled('eventorganization')) {
 //	$langs->load("stockstransfer");
 //}
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $datesrfc = GETPOST('datesrfc');	// deprecated
@@ -711,7 +711,7 @@ if ($action == "addelement") {
 } elseif ($action == "unlink") {
 	$tablename = GETPOST("tablename", "aZ09");
 	$projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
-	$elementselectid = GETPOST("elementselect", "int");
+	$elementselectid = GETPOSTINT("elementselect");
 
 	$result = $object->remove_element($tablename, $elementselectid, $projectField);
 	if ($result < 0) {
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index b1759b48a43..b99e23931ff 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -41,7 +41,7 @@ $hookmanager->initHooks(array('projectsindex'));
 $langs->loadLangs(array('projects', 'companies'));
 
 $action = GETPOST('action', 'aZ09');
-$search_project_user = GETPOST('search_project_user', 'int');
+$search_project_user = GETPOSTINT('search_project_user');
 $mine = GETPOST('mode', 'aZ09') == 'mine' ? 1 : 0;
 if ($mine == 0 && $search_project_user === '') {
 	$search_project_user = (empty($user->conf->MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX) ? '' : $user->conf->MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX);
@@ -74,7 +74,7 @@ if ($reshook < 0) {
 }
 if (empty($reshook)) {
 	if ($action == 'refresh_search_project_user') {
-		$search_project_user = GETPOST('search_project_user', 'int');
+		$search_project_user = GETPOSTINT('search_project_user');
 		$tabparam = array("MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX" => $search_project_user);
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 1d3f9ee94bc..e1fd9a43b35 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -50,7 +50,7 @@ if (isModEnabled('eventorganization') && $conf->eventorganization->enabled) {
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -61,7 +61,7 @@ $mode = GETPOST('mode', 'alpha');
 $title = $langs->trans("Projects");
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 //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 assignment.
 if ($socid > 0) {
 	$soc = new Societe($db);
@@ -74,10 +74,10 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -101,23 +101,23 @@ $search_opp_status = GETPOST("search_opp_status", 'alpha');
 $search_opp_percent = GETPOST("search_opp_percent", 'alpha');
 $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');
-$search_usage_bill_time = GETPOST('search_usage_bill_time', 'int');
-$search_usage_event_organization = GETPOST('search_usage_event_organization', 'int');
-$search_accept_conference_suggestions = GETPOST('search_accept_conference_suggestions', 'int');
-$search_accept_booth_suggestions = GETPOST('search_accept_booth_suggestions', 'int');
+$search_public = GETPOSTINT("search_public");
+$search_project_user = GETPOSTINT('search_project_user');
+$search_project_contact = GETPOSTINT('search_project_contact');
+$search_sale = GETPOSTINT('search_sale');
+$search_usage_opportunity = GETPOSTINT('search_usage_opportunity');
+$search_usage_task = GETPOSTINT('search_usage_task');
+$search_usage_bill_time = GETPOSTINT('search_usage_bill_time');
+$search_usage_event_organization = GETPOSTINT('search_usage_event_organization');
+$search_accept_conference_suggestions = GETPOSTINT('search_accept_conference_suggestions');
+$search_accept_booth_suggestions = GETPOSTINT('search_accept_booth_suggestions');
 $search_price_registration = GETPOST("search_price_registration", 'alpha');
 $search_price_booth = GETPOST("search_price_booth", 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_import_key = GETPOST('search_import_key', 'alpha');
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
-	$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
+	$searchCategoryCustomerOperator = GETPOSTINT('search_category_customer_operator');
 } elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
 	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
@@ -133,47 +133,47 @@ if ($mine) {
 	$mine = 0;
 }
 
-$search_sday	= GETPOST('search_sday', 'int');
-$search_smonth	= GETPOST('search_smonth', 'int');
-$search_syear	= GETPOST('search_syear', 'int');
-$search_eday	= GETPOST('search_eday', 'int');
-$search_emonth	= GETPOST('search_emonth', 'int');
-$search_eyear	= GETPOST('search_eyear', 'int');
+$search_sday	= GETPOSTINT('search_sday');
+$search_smonth	= GETPOSTINT('search_smonth');
+$search_syear	= GETPOSTINT('search_syear');
+$search_eday	= GETPOSTINT('search_eday');
+$search_emonth	= GETPOSTINT('search_emonth');
+$search_eyear	= GETPOSTINT('search_eyear');
 
-$search_date_start_startmonth = GETPOST('search_date_start_startmonth', 'int');
-$search_date_start_startyear = GETPOST('search_date_start_startyear', 'int');
-$search_date_start_startday = GETPOST('search_date_start_startday', 'int');
+$search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
+$search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
+$search_date_start_startday = GETPOSTINT('search_date_start_startday');
 $search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);	// Use tzserver
-$search_date_start_endmonth = GETPOST('search_date_start_endmonth', 'int');
-$search_date_start_endyear = GETPOST('search_date_start_endyear', 'int');
-$search_date_start_endday = GETPOST('search_date_start_endday', 'int');
+$search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth');
+$search_date_start_endyear = GETPOSTINT('search_date_start_endyear');
+$search_date_start_endday = GETPOSTINT('search_date_start_endday');
 $search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);	// Use tzserver
 
-$search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
-$search_date_end_startyear = GETPOST('search_date_end_startyear', 'int');
-$search_date_end_startday = GETPOST('search_date_end_startday', 'int');
+$search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
+$search_date_end_startyear = GETPOSTINT('search_date_end_startyear');
+$search_date_end_startday = GETPOSTINT('search_date_end_startday');
 $search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
-$search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
-$search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
-$search_date_end_endday = GETPOST('search_date_end_endday', 'int');
+$search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
+$search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
+$search_date_end_endday = GETPOSTINT('search_date_end_endday');
 $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
 
-$search_date_creation_startmonth = GETPOST('search_date_creation_startmonth', 'int');
-$search_date_creation_startyear = GETPOST('search_date_creation_startyear', 'int');
-$search_date_creation_startday = GETPOST('search_date_creation_startday', 'int');
+$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);	// Use tzserver
-$search_date_creation_endmonth = GETPOST('search_date_creation_endmonth', 'int');
-$search_date_creation_endyear = GETPOST('search_date_creation_endyear', 'int');
-$search_date_creation_endday = GETPOST('search_date_creation_endday', 'int');
+$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);	// Use tzserver
 
-$search_date_modif_startmonth = GETPOST('search_date_modif_startmonth', 'int');
-$search_date_modif_startyear = GETPOST('search_date_modif_startyear', 'int');
-$search_date_modif_startday = GETPOST('search_date_modif_startday', 'int');
+$search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth');
+$search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear');
+$search_date_modif_startday = GETPOSTINT('search_date_modif_startday');
 $search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear);	// Use tzserver
-$search_date_modif_endmonth = GETPOST('search_date_modif_endmonth', 'int');
-$search_date_modif_endyear = GETPOST('search_date_modif_endyear', 'int');
-$search_date_modif_endday = GETPOST('search_date_modif_endday', 'int');
+$search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth');
+$search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
+$search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
 $search_category_array = array();
@@ -518,7 +518,7 @@ if ($search_project_contact > 0) {
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql .= " WHERE p.entity IN (".getEntity('project', (GETPOST('search_current_entity', 'int') ? 0 : 1)).')';
+$sql .= " WHERE p.entity IN (".getEntity('project', (GETPOSTINT('search_current_entity') ? 0 : 1)).')';
 if (!$user->hasRight('projet', 'all', 'lire')) {
 	$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
 }
@@ -1663,7 +1663,7 @@ while ($i < $imaxinloop) {
 		// Project url
 		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax200">';
-			print $object->getNomUrl(1, (!empty(GETPOST('search_usage_event_organization', 'int')) ? 'eventorganization' : ''));
+			print $object->getNomUrl(1, (!empty(GETPOSTINT('search_usage_event_organization')) ? 'eventorganization' : ''));
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php
index 8b3f18ee663..50555e99995 100644
--- a/htdocs/projet/messaging.php
+++ b/htdocs/projet/messaging.php
@@ -32,16 +32,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->load("projects");
 
-$id     = GETPOST('id', 'int');
+$id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
-$socid  = GETPOST('socid', 'int');
+$socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
@@ -68,7 +68,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $hookmanager->initHooks(array('projectcardinfo'));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $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 assignment.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 41d3b3e61b8..27b32e8be0f 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 $langs->load('projects');
 
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $mine = (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'mine') ? 1 : 0;
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 25af61c3a7f..cb6c4720c30 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -34,8 +34,8 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $search_opp_status = GETPOST("search_opp_status", 'alpha');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 991d339e64b..98ed8f1b357 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -45,7 +45,7 @@ $langs->loadLangs($langsLoad);
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
@@ -54,10 +54,10 @@ $ref = GETPOST('ref', 'alpha');
 $taskref = GETPOST('taskref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
 $backtopage = GETPOST('backtopage', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
-$search_user_id = GETPOST('search_user_id', 'int');
+$search_user_id = GETPOSTINT('search_user_id');
 $search_taskref = GETPOST('search_taskref');
 $search_tasklabel = GETPOST('search_tasklabel');
 $search_taskdescription = GETPOST('search_taskdescription');
@@ -84,22 +84,22 @@ $search_progresscalc = GETPOST('search_progresscalc');
 $search_progressdeclare = GETPOST('search_progressdeclare');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
 
-$search_date_start_startmonth = GETPOST('search_date_start_startmonth', 'int');
-$search_date_start_startyear = GETPOST('search_date_start_startyear', 'int');
-$search_date_start_startday = GETPOST('search_date_start_startday', 'int');
+$search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
+$search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
+$search_date_start_startday = GETPOSTINT('search_date_start_startday');
 $search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);	// Use tzserver
-$search_date_start_endmonth = GETPOST('search_date_start_endmonth', 'int');
-$search_date_start_endyear = GETPOST('search_date_start_endyear', 'int');
-$search_date_start_endday = GETPOST('search_date_start_endday', 'int');
+$search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth');
+$search_date_start_endyear = GETPOSTINT('search_date_start_endyear');
+$search_date_start_endday = GETPOSTINT('search_date_start_endday');
 $search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);	// Use tzserver
 
-$search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
-$search_date_end_startyear = GETPOST('search_date_end_startyear', 'int');
-$search_date_end_startday = GETPOST('search_date_end_startday', 'int');
+$search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
+$search_date_end_startyear = GETPOSTINT('search_date_end_startyear');
+$search_date_end_startday = GETPOSTINT('search_date_end_startday');
 $search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
-$search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
-$search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
-$search_date_end_endday = GETPOST('search_date_end_endday', 'int');
+$search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
+$search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
+$search_date_end_endday = GETPOSTINT('search_date_end_endday');
 $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projecttasklist';
@@ -142,12 +142,12 @@ $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
 
-$progress = GETPOST('progress', 'int');
+$progress = GETPOSTINT('progress');
 $budget_amount = GETPOSTFLOAT('budget_amount');
 $label = GETPOST('label', 'alpha');
 $description = GETPOST('description', 'restricthtml');
-$planned_workloadhour = (GETPOST('planned_workloadhour', 'int') ? GETPOST('planned_workloadhour', 'int') : 0);
-$planned_workloadmin = (GETPOST('planned_workloadmin', 'int') ? GETPOST('planned_workloadmin', 'int') : 0);
+$planned_workloadhour = (GETPOSTINT('planned_workloadhour') ? GETPOSTINT('planned_workloadhour') : 0);
+$planned_workloadmin = (GETPOSTINT('planned_workloadmin') ? GETPOSTINT('planned_workloadmin') : 0);
 $planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60;
 
 // Definition of fields for list
@@ -310,8 +310,8 @@ if ($action == 'createtask' && $user->hasRight('projet', 'creer')) {
 	$error = 0;
 
 	// If we use user timezone, we must change also view/list to use user timezone everywhere
-	$date_start = dol_mktime(GETPOST('date_starthour', 'int'), GETPOST('date_startmin', 'int'), 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-	$date_end = dol_mktime(GETPOST('date_endhour', 'int'), GETPOST('date_endmin', 'int'), 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+	$date_start = dol_mktime(GETPOSTINT('date_starthour'), GETPOSTINT('date_startmin'), 0, GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
+	$date_end = dol_mktime(GETPOSTINT('date_endhour'), GETPOSTINT('date_endmin'), 0, GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 
 	if (!$cancel) {
 		if (empty($taskref)) {
@@ -355,7 +355,7 @@ if ($action == 'createtask' && $user->hasRight('projet', 'creer')) {
 			$taskid = $task->create($user);
 
 			if ($taskid > 0) {
-				$result = $task->add_contact(GETPOST("userid", 'int'), 'TASKEXECUTIVE', 'internal');
+				$result = $task->add_contact(GETPOSTINT("userid"), 'TASKEXECUTIVE', 'internal');
 			} else {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$langs->load("projects");
@@ -1154,7 +1154,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
 		} else {
-			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int')) {
+			if ($nboftaskshown < count($tasksarray) && !GETPOSTINT('search_user_id')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index fdc1ab20f41..c36cd2e6d30 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -37,15 +37,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies'));
 
-$id = GETPOST('id', 'int');
-$idcomment = GETPOST('idcomment', 'int');
+$id = GETPOSTINT('id');
+$idcomment = GETPOSTINT('idcomment');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $objectref = GETPOST("taskref", 'alpha'); // task ref
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
-$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ? GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ? GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
+$planned_workload = ((GETPOSTINT('planned_workloadhour') != '' || GETPOSTINT('planned_workloadmin') != '') ? (GETPOSTINT('planned_workloadhour') > 0 ? GETPOSTINT('planned_workloadhour') * 3600 : 0) + (GETPOSTINT('planned_workloadmin') > 0 ? GETPOSTINT('planned_workloadmin') * 60 : 0) : '');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcommentcard', 'globalcard'));
@@ -287,7 +287,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask');
 
 		if ($action == 'delete') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOST("id", "int").'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOSTINT("id").'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
 		}
 
 		if (!GETPOST('withproject') || empty($projectstatic->id)) {
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 1ec88d46a23..abb5653d4e7 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -33,11 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
 $object = new Task($db);
@@ -71,7 +71,7 @@ if ($action == 'addcontact' && $user->hasRight('projet', 'creer')) {
 			$idfortaskuser = ((GETPOST("userid") != 0 && GETPOST('userid') != -1) ? GETPOST("userid") : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
 			$typeid = GETPOST('type');
 		} else {
-			$idfortaskuser = ((GETPOST("contactid") > 0) ? GETPOST("contactid", 'int') : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+			$idfortaskuser = ((GETPOST("contactid") > 0) ? GETPOSTINT("contactid") : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
 			$typeid = GETPOST('typecontact');
 		}
 		if ($idfortaskuser == -2) {
@@ -105,7 +105,7 @@ if ($action == 'addcontact' && $user->hasRight('projet', 'creer')) {
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->hasRight('projet', 'creer')) {
 	if ($object->fetch($id, $ref)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -114,7 +114,7 @@ if ($action == 'swapstatut' && $user->hasRight('projet', 'creer')) {
 // Efface un contact
 if ($action == 'deleteline' && $user->hasRight('projet', 'creer')) {
 	$object->fetch($id, $ref);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
+	$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 	if ($result >= 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
@@ -408,7 +408,7 @@ if ($id > 0 || !empty($ref)) {
 			} else {
 				$contactsofproject = $projectstatic->getListContactId('internal');
 			}
-			print $form->select_dolusers((GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1, $langs->trans("ResourceNotAssignedToProject"));
+			print $form->select_dolusers((GETPOSTISSET('userid') ? GETPOSTINT('userid') : $user->id), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1, $langs->trans("ResourceNotAssignedToProject"));
 			print '</td>';
 			print '<td>';
 			$formcompany->selectTypeContact($object, '', 'type', 'internal', 'position');
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 93fad9aed2a..2d0632eea77 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -40,16 +40,16 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $mine = GETPOST('mode') == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e6ace40c941..8cfe753056a 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -39,16 +39,16 @@ $langs->loadLangs(array('projects', 'users', 'companies'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'aZ09');
 $mode = GETPOST('mode', 'aZ');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_categ = GETPOST("search_categ", 'int');
+$search_categ = GETPOSTINT("search_categ");
 
 $search_projectstatus = GETPOST('search_projectstatus');
 if (!isset($search_projectstatus) || $search_projectstatus === '') {
@@ -65,8 +65,8 @@ $search_task_ref = GETPOST('search_task_ref');
 $search_task_label = GETPOST('search_task_label');
 $search_task_description = GETPOST('search_task_description');
 $search_task_ref_parent = GETPOST('search_task_ref_parent');
-$search_project_user = GETPOST('search_project_user', 'int');
-$search_task_user = GETPOST('search_task_user', 'int');
+$search_project_user = GETPOSTINT('search_project_user');
+$search_task_user = GETPOSTINT('search_task_user');
 $search_task_progress = GETPOST('search_task_progress');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
 $search_societe = GETPOST('search_societe');
@@ -74,7 +74,7 @@ $search_societe_alias = GETPOST('search_societe_alias');
 $search_opp_status = GETPOST("search_opp_status", 'alpha');
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
-	$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
+	$searchCategoryCustomerOperator = GETPOSTINT('search_category_customer_operator');
 } elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
 	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
@@ -87,20 +87,20 @@ if ($mine) {
 }
 $type = GETPOST('type');
 
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
-$search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
-$search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
-$search_datelimit_endday = GETPOST('search_datelimit_endday', 'int');
-$search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
-$search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
+$search_datelimit_startday = GETPOSTINT('search_datelimit_startday');
+$search_datelimit_startmonth = GETPOSTINT('search_datelimit_startmonth');
+$search_datelimit_startyear = GETPOSTINT('search_datelimit_startyear');
+$search_datelimit_endday = GETPOSTINT('search_datelimit_endday');
+$search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
+$search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
 
@@ -125,10 +125,10 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -717,7 +717,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index c67780e8814..1f54ef3f26d 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -33,9 +33,9 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $mine = GETPOST('mode') == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
 // Security check
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 2c402efac39..dc25b73c609 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -37,8 +37,8 @@ if (!$user->hasRight('projet', 'lire')) {
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 7073ae74c64..ca98bc5330b 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -40,12 +40,12 @@ $langs->loadlangs(array('projects', 'companies'));
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $taskref = GETPOST("taskref", 'alpha'); // task ref
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
-$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ? GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ? GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
+$planned_workload = ((GETPOSTINT('planned_workloadhour') != '' || GETPOSTINT('planned_workloadmin') != '') ? (GETPOSTINT('planned_workloadhour') > 0 ? GETPOSTINT('planned_workloadhour') * 3600 : 0) + (GETPOSTINT('planned_workloadmin') > 0 ? GETPOSTINT('planned_workloadmin') * 60 : 0) : '');
 $mode = GETPOST('mode', 'alpha');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -108,8 +108,8 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'cree
 		}
 		$object->fk_task_parent = $task_parent;
 		$object->planned_workload = $planned_workload;
-		$object->date_start = dol_mktime(GETPOST('date_starthour', 'int'), GETPOST('date_startmin', 'int'), 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-		$object->date_end = dol_mktime(GETPOST('date_endhour', 'int'), GETPOST('date_endmin', 'int'), 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+		$object->date_start = dol_mktime(GETPOSTINT('date_starthour'), GETPOSTINT('date_startmin'), 0, GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
+		$object->date_end = dol_mktime(GETPOSTINT('date_endhour'), GETPOSTINT('date_endmin'), 0, GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
 		$object->budget_amount = GETPOSTFLOAT('budget_amount');
 
@@ -532,7 +532,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 		if ($action == 'delete') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOST("id", 'int').'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOSTINT("id").'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
 		}
 
 		if (!GETPOST('withproject') || empty($projectstatic->id)) {
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index bc970a38fd5..6065cda5c24 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -57,31 +57,31 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
-$id = GETPOST('id', 'int');
-$projectid = GETPOST('projectid', 'int');
+$id = GETPOSTINT('id');
+$projectid = GETPOSTINT('projectid');
 $ref = GETPOST('ref', 'alpha');
-$withproject = GETPOST('withproject', 'int');
+$withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 $tab = GETPOST('tab', 'aZ09');
 
-$search_day = GETPOST('search_day', 'int');
-$search_month = GETPOST('search_month', 'int');
-$search_year = GETPOST('search_year', 'int');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_day = GETPOSTINT('search_day');
+$search_month = GETPOSTINT('search_month');
+$search_year = GETPOSTINT('search_year');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_note = GETPOST('search_note', 'alpha');
-$search_duration = GETPOST('search_duration', 'int');
-$search_value = GETPOST('search_value', 'int');
+$search_duration = GETPOSTINT('search_duration');
+$search_value = GETPOSTINT('search_value');
 $search_task_ref = GETPOST('search_task_ref', 'alpha');
 $search_task_label = GETPOST('search_task_label', 'alpha');
-$search_user = GETPOST('search_user', 'int');
-$search_valuebilled = GETPOST('search_valuebilled', 'int');
+$search_user = GETPOSTINT('search_user');
+$search_valuebilled = GETPOSTINT('search_valuebilled');
 $search_product_ref = GETPOST('search_product_ref', 'alpha');
 $search_company = GETPOST('$search_company', 'alpha');
 $search_company_alias = GETPOST('$search_company_alias', 'alpha');
@@ -92,10 +92,10 @@ $search_timespent_startmin = GETPOSTINT("search_timespent_duration_startmin");
 $search_timespent_endhour = GETPOSTINT("search_timespent_duration_endhour");
 $search_timespent_endmin = GETPOSTINT("search_timespent_duration_endmin");
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }        // If $page is not defined, or '' or -1
@@ -203,13 +203,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if ($action == 'addtimespent' && $user->hasRight('projet', 'time')) {
 	$error = 0;
 
-	$timespent_durationhour = GETPOST('timespent_durationhour', 'int');
-	$timespent_durationmin = GETPOST('timespent_durationmin', 'int');
+	$timespent_durationhour = GETPOSTINT('timespent_durationhour');
+	$timespent_durationmin = GETPOSTINT('timespent_durationmin');
 	if (empty($timespent_durationhour) && empty($timespent_durationmin)) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors');
 		$error++;
 	}
-	if (!GETPOST("userid", 'int')) {
+	if (!GETPOSTINT("userid")) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorUserNotAssignedToTask'), null, 'errors');
 		$error++;
@@ -219,12 +219,12 @@ if ($action == 'addtimespent' && $user->hasRight('projet', 'time')) {
 		if ($id || $ref) {
 			$object->fetch($id, $ref);
 		} else {
-			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0) {
+			if (!GETPOSTINT('taskid') || GETPOSTINT('taskid') < 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
 				$action = 'createtime';
 				$error++;
 			} else {
-				$object->fetch(GETPOST('taskid', 'int'));
+				$object->fetch(GETPOSTINT('taskid'));
 			}
 		}
 
@@ -237,19 +237,19 @@ if ($action == 'addtimespent' && $user->hasRight('projet', 'time')) {
 				$error++;
 			} else {
 				$object->timespent_note = GETPOST("timespent_note", 'alpha');
-				if (GETPOST('progress', 'int') > 0) {
-					$object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
+				if (GETPOSTINT('progress') > 0) {
+					$object->progress = GETPOSTINT('progress'); // If progress is -1 (not defined), we do not change value
 				}
 				$object->timespent_duration = GETPOSTINT("timespent_durationhour") * 60 * 60; // We store duration in seconds
 				$object->timespent_duration += (GETPOSTINT('timespent_durationmin') ? GETPOSTINT('timespent_durationmin') : 0) * 60; // We store duration in seconds
 				if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0) {    // If hour was entered
-					$object->timespent_date = dol_mktime(GETPOST("timehour", 'int'), GETPOST("timemin", 'int'), 0, GETPOST("timemonth", 'int'), GETPOST("timeday", 'int'), GETPOST("timeyear", 'int'));
+					$object->timespent_date = dol_mktime(GETPOSTINT("timehour"), GETPOSTINT("timemin"), 0, GETPOSTINT("timemonth"), GETPOSTINT("timeday"), GETPOSTINT("timeyear"));
 					$object->timespent_withhour = 1;
 				} else {
-					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth", 'int'), GETPOST("timeday", 'int'), GETPOST("timeyear", 'int'));
+					$object->timespent_date = dol_mktime(12, 0, 0, GETPOSTINT("timemonth"), GETPOSTINT("timeday"), GETPOSTINT("timeyear"));
 				}
-				$object->timespent_fk_user = GETPOST("userid", 'int');
-				$object->timespent_fk_product = GETPOST("fk_product", 'int');
+				$object->timespent_fk_user = GETPOSTINT("userid");
+				$object->timespent_fk_product = GETPOSTINT("fk_product");
 
 				$result = $object->addTimeSpent($user);
 
@@ -279,11 +279,11 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 	}
 
 	if (!$error) {
-		if (GETPOST('taskid', 'int') != $id) {        // GETPOST('taskid') is id of new task
-			$id_temp = GETPOST('taskid', 'int'); // should not overwrite $id
+		if (GETPOSTINT('taskid') != $id) {        // GETPOST('taskid') is id of new task
+			$id_temp = GETPOSTINT('taskid'); // should not overwrite $id
 
 
-			$object->fetchTimeSpent(GETPOST('lineid', 'int'));
+			$object->fetchTimeSpent(GETPOSTINT('lineid'));
 
 			$result = 0;
 			if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
@@ -293,7 +293,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$object->fetch($id_temp, $ref);
 
 			$object->timespent_note = GETPOST("timespent_note_line", "alphanohtml");
-			$object->timespent_old_duration = GETPOST("old_duration", "int");
+			$object->timespent_old_duration = GETPOSTINT("old_duration");
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += (GETPOSTINT("new_durationmin") ? GETPOSTINT('new_durationmin') : 0) * 60; // We store duration in seconds
 			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {    // If hour was entered
@@ -302,10 +302,10 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
-			$object->timespent_fk_user = GETPOST("userid_line", 'int');
-			$object->timespent_fk_product = GETPOST("fk_product", 'int');
-			$object->timespent_invoiceid = GETPOST("invoiceid", 'int');
-			$object->timespent_invoicelineid = GETPOST("invoicelineid", 'int');
+			$object->timespent_fk_user = GETPOSTINT("userid_line");
+			$object->timespent_fk_product = GETPOSTINT("fk_product");
+			$object->timespent_invoiceid = GETPOSTINT("invoiceid");
+			$object->timespent_invoicelineid = GETPOSTINT("invoicelineid");
 
 			$result = 0;
 			if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
@@ -320,21 +320,21 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 		} else {
 			$object->fetch($id, $ref);
 
-			$object->timespent_id = GETPOST("lineid", 'int');
+			$object->timespent_id = GETPOSTINT("lineid");
 			$object->timespent_note = GETPOST("timespent_note_line", "alphanohtml");
-			$object->timespent_old_duration = GETPOST("old_duration", "int");
+			$object->timespent_old_duration = GETPOSTINT("old_duration");
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += (GETPOSTINT("new_durationmin") ? GETPOSTINT('new_durationmin') : 0) * 60; // We store duration in seconds
 			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {    // If hour was entered
-				$object->timespent_date = dol_mktime(GETPOST("timelinehour", 'int'), GETPOST("timelinemin", 'int'), 0, GETPOST("timelinemonth", 'int'), GETPOST("timelineday", 'int'), GETPOST("timelineyear", 'int'));
+				$object->timespent_date = dol_mktime(GETPOSTINT("timelinehour"), GETPOSTINT("timelinemin"), 0, GETPOSTINT("timelinemonth"), GETPOSTINT("timelineday"), GETPOSTINT("timelineyear"));
 				$object->timespent_withhour = 1;
 			} else {
-				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth", 'int'), GETPOST("timelineday", 'int'), GETPOST("timelineyear", 'int'));
+				$object->timespent_date = dol_mktime(12, 0, 0, GETPOSTINT("timelinemonth"), GETPOSTINT("timelineday"), GETPOSTINT("timelineyear"));
 			}
-			$object->timespent_fk_user = GETPOST("userid_line", 'int');
-			$object->timespent_fk_product = GETPOST("fk_product", 'int');
-			$object->timespent_invoiceid = GETPOST("invoiceid", 'int');
-			$object->timespent_invoicelineid = GETPOST("invoicelineid", 'int');
+			$object->timespent_fk_user = GETPOSTINT("userid_line");
+			$object->timespent_fk_product = GETPOSTINT("fk_product");
+			$object->timespent_invoiceid = GETPOSTINT("invoiceid");
+			$object->timespent_invoicelineid = GETPOSTINT("invoicelineid");
 			$result = 0;
 
 			if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
@@ -354,7 +354,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 }
 
 if ($action == 'confirm_deleteline' && $confirm == "yes" && ($user->hasRight('projet', 'time') || $user->hasRight('projet', 'all', 'creer'))) {
-	$object->fetchTimeSpent(GETPOST('lineid', 'int'));    // load properties like $object->timespent_xxx
+	$object->fetchTimeSpent(GETPOSTINT('lineid'));    // load properties like $object->timespent_xxx
 
 	if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
 		$result = $object->delTimeSpent($user);    // delete line with $object->timespent_id
@@ -385,8 +385,8 @@ if (!empty($project_ref) && !empty($withproject)) {
 
 // To show all time lines for project
 $projectidforalltimes = 0;
-if (GETPOST('projectid', 'int') > 0) {
-	$projectidforalltimes = GETPOST('projectid', 'int');
+if (GETPOSTINT('projectid') > 0) {
+	$projectidforalltimes = GETPOSTINT('projectid');
 
 	$result = $projectstatic->fetch($projectidforalltimes);
 	if (!empty($projectstatic->socid)) {
@@ -424,9 +424,9 @@ if ($action == 'confirm_generateinvoice') {
 		$fuser = new User($db);
 
 		$db->begin();
-		$idprod = GETPOST('productid', 'int');
+		$idprod = GETPOSTINT('productid');
 		$generateinvoicemode = GETPOST('generateinvoicemode', 'alphanohtml');
-		$invoiceToUse = GETPOST('invoiceid', 'int');
+		$invoiceToUse = GETPOSTINT('invoiceid');
 
 		$prodDurationHoursBase = 1.0;
 		$product_data_cache = array();
@@ -460,7 +460,7 @@ if ($action == 'confirm_generateinvoice') {
 		}
 
 		$tmpinvoice->socid = $projectstatic->thirdparty->id;
-		$tmpinvoice->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$tmpinvoice->date = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$tmpinvoice->fk_project = $projectstatic->id;
 		$tmpinvoice->cond_reglement_id = $projectstatic->thirdparty->cond_reglement_id;
 		$tmpinvoice->mode_reglement_id = $projectstatic->thirdparty->mode_reglement_id;
@@ -809,11 +809,11 @@ if ($action == 'confirm_generateinter') {
 		$fuser = new User($db);
 
 		$db->begin();
-		$interToUse = GETPOST('interid', 'int');
+		$interToUse = GETPOSTINT('interid');
 
 
 		$tmpinter->socid = $projectstatic->thirdparty->id;
-		$tmpinter->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$tmpinter->date = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$tmpinter->fk_project = $projectstatic->id;
 		$tmpinter->description = $projectstatic->title . (!empty($projectstatic->description) ? '-' . $projectstatic->label : '');
 
@@ -1129,7 +1129,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') {
-			$urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($object->id > 0 ? "id=" . $object->id : 'projectid=' . $projectstatic->id) . '&lineid=' . GETPOST("lineid", 'int') . ($withproject ? '&withproject=1' : '');
+			$urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($object->id > 0 ? "id=" . $object->id : 'projectid=' . $projectstatic->id) . '&lineid=' . GETPOSTINT("lineid") . ($withproject ? '&withproject=1' : '');
 			print $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 
@@ -1236,7 +1236,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		print dol_get_fiche_end();
 	} else {
 		if ($action == 'deleteline') {
-			$urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($object->id > 0 ? "id=" . $object->id : 'projectid=' . $projectstatic->id) . '&lineid=' . GETPOST("lineid", 'int') . ($withproject ? '&withproject=1' : '');
+			$urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($object->id > 0 ? "id=" . $object->id : 'projectid=' . $projectstatic->id) . '&lineid=' . GETPOSTINT("lineid") . ($withproject ? '&withproject=1' : '');
 			print $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 	}
@@ -1250,7 +1250,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
 			// We must use projectidprojectid if on list of timespent of project and id=taskid if on list of timespent of a task
-			$urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($projectstatic->id > 0 ? 'projectid=' . $projectstatic->id : ($object->id > 0 ? "id=" . $object->id : '')) . '&lineid=' . GETPOST('lineid', 'int') . ($withproject ? '&withproject=1' : '') . "&contextpage=" . urlencode($contextpage);
+			$urlafterconfirm = $_SERVER["PHP_SELF"] . "?" . ($projectstatic->id > 0 ? 'projectid=' . $projectstatic->id : ($object->id > 0 ? "id=" . $object->id : '')) . '&lineid=' . GETPOSTINT('lineid') . ($withproject ? '&withproject=1' : '') . "&contextpage=" . urlencode($contextpage);
 			$formconfirm = $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 
@@ -1782,7 +1782,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			$nboftasks = 0;
 			if (empty($id)) {
 				print '<td class="maxwidthonsmartphone">';
-				$nboftasks = $formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, 'progress');
+				$nboftasks = $formproject->selectTasks(-1, GETPOSTINT('taskid'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, 'progress');
 				print '</td>';
 			}
 
@@ -1800,7 +1800,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if ($projectstatic->public) {
 					$contactsofproject = array();
 				}
-				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'minwidth150imp maxwidth200');
+				print $form->select_dolusers((GETPOSTINT('userid') ? GETPOSTINT('userid') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'minwidth150imp maxwidth200');
 			} else {
 				if ($nboftasks) {
 					print img_error($langs->trans('FirstAddRessourceToAllocateTime')) . ' ' . $langs->trans('FirstAddRessourceToAllocateTime');
@@ -1835,7 +1835,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if (isModEnabled("service") && !empty($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
 					print '<td class="nowraponall">';
 					print img_picto('', 'service');
-					print $form->select_produits((GETPOSTISSET('fk_product')?GETPOST("fk_product", 'int'):''), 'fk_product', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 1, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth150', 0, '', null, 1);
+					print $form->select_produits((GETPOSTISSET('fk_product')?GETPOSTINT("fk_product"):''), 'fk_product', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 1, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth150', 0, '', null, 1);
 					print '</td>';
 				}
 			}
@@ -2096,8 +2096,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Action column
 			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 				print '<td class="center nowraponall">';
-				if (($action == 'editline' || $action == 'splitline') && GETPOST('lineid', 'int') == $task_time->rowid) {
-					print '<input type="hidden" name="lineid" value="' . GETPOST('lineid', 'int') . '">';
+				if (($action == 'editline' || $action == 'splitline') && GETPOSTINT('lineid') == $task_time->rowid) {
+					print '<input type="hidden" name="lineid" value="' . GETPOSTINT('lineid') . '">';
 					print '<input type="submit" class="button buttongen smallpaddingimp margintoponlyshort marginbottomonlyshort button-save" name="save" value="'.$langs->trans("Save").'">';
 					print '<br>';
 					print '<input type="submit" class="button buttongen smallpaddingimp margintoponlyshort marginbottomonlyshort button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -2136,7 +2136,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Date
 			if (!empty($arrayfields['t.element_date']['checked'])) {
 				print '<td class="nowrap">';
-				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				if ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					if (empty($task_time->element_date_withhour)) {
 						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
 					} else {
@@ -2228,8 +2228,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			if (!empty($arrayfields['t.element_ref']['checked'])) {
 				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {   // Not a dedicated task
 					print '<td class="nowrap">';
-					if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
-						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ? GETPOST('taskid', 'int') : $task_time->fk_element, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
+					if ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
+						$formproject->selectTasks(-1, GETPOSTINT('taskid') ? GETPOSTINT('taskid') : $task_time->fk_element, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 					} else {
 						$tasktmp->id = $task_time->fk_element;
 						$tasktmp->ref = $task_time->ref;
@@ -2260,7 +2260,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// By User
 			if (!empty($arrayfields['author']['checked'])) {
 				print '<td class="tdoverflowmax100">';
-				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				if ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					if (empty($object->id)) {
 						$object->fetch($id);
 					}
@@ -2290,7 +2290,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Note
 			if (!empty($arrayfields['t.note']['checked'])) {
-				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				if ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					print '<td class="small">';
 					print '<textarea name="timespent_note_line" width="95%" rows="' . ROWS_1 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
 					print '</td>';
@@ -2302,14 +2302,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
-			} elseif ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+			} elseif ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
 				print '<input type="hidden" name="timespent_note_line" value="' . dol_escape_htmltag($task_time->note, 0, 1) . '">';
 			}
 
 			// Time spent
 			if (!empty($arrayfields['t.element_duration']['checked'])) {
 				print '<td class="right nowraponall">';
-				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				if ($action == 'editline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					print '<input type="hidden" name="old_duration" value="'.$task_time->element_duration.'">';
 					print $form->select_duration('new_duration', $task_time->element_duration, 0, 'text');
 				} else {
@@ -2437,8 +2437,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Action column
 			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 				print '<td class="center nowraponall">';
-				if (($action == 'editline' || $action == 'splitline') && GETPOST('lineid', 'int') == $task_time->rowid) {
-					print '<input type="hidden" name="lineid" value="'.GETPOST('lineid', 'int').'">';
+				if (($action == 'editline' || $action == 'splitline') && GETPOSTINT('lineid') == $task_time->rowid) {
+					print '<input type="hidden" name="lineid" value="'.GETPOSTINT('lineid').'">';
 					print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-save small" name="save" value="'.$langs->trans("Save").'">';
 					print '<br>';
 					print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-cancel small" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -2480,14 +2480,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Add line to split
 
-			if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+			if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 				print '<!-- first line -->';
 				print '<tr class="oddeven">';
 
 				// Date
 				if (!empty($arrayfields['t.element_date']['checked'])) {
 					print '<td class="nowrap">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						if (empty($task_time->element_date_withhour)) {
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
 						} else {
@@ -2543,7 +2543,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// User
 				if (!empty($arrayfields['author']['checked'])) {
 					print '<td class="nowraponall">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						if (empty($object->id)) {
 							$object->fetch($id);
 						}
@@ -2571,20 +2571,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Note
 				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="tdoverflowmax300">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						print '<textarea name="timespent_note_line" width="95%" rows="' . ROWS_1 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				} elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				} elseif ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					print '<input type="hidden" name="timespent_note_line" rows="' . ROWS_1 . '" value="' . dol_escape_htmltag($task_time->note, 0, 1) . '">';
 				}
 
 				// Time spent
 				if (!empty($arrayfields['t.element_duration']['checked'])) {
 					print '<td class="right">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						print '<input type="hidden" name="old_duration" value="'.$task_time->element_duration.'">';
 						print $form->select_duration('new_duration', $task_time->element_duration, 0, 'text');
 					} else {
@@ -2643,7 +2643,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Date
 				if (!empty($arrayfields['t.element_date']['checked'])) {
 					print '<td class="nowrap">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						if (empty($task_time->element_date_withhour)) {
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
 						} else {
@@ -2699,7 +2699,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// User
 				if (!empty($arrayfields['author']['checked'])) {
 					print '<td class="nowraponall">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						if (empty($object->id)) {
 							$object->fetch($id);
 						}
@@ -2727,20 +2727,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Note
 				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="small tdoverflowmax300"">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						print '<textarea name="timespent_note_line_2" width="95%" rows="' . ROWS_1 . '">' . dol_escape_htmltag($task_time->note, 0, 1) . '</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				} elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				} elseif ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 					print '<input type="hidden" name="timespent_note_line_2" value="' . dol_escape_htmltag($task_time->note, 0, 1) . '">';
 				}
 
 				// Time spent
 				if (!empty($arrayfields['t.element_duration']['checked'])) {
 					print '<td class="right">';
-					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOSTINT('lineid') == $task_time->rowid) {
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
 					} else {
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index ede0e9e1ad6..484b3bab1d3 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -101,17 +101,17 @@ if (GETPOST("type", 'alpha')) {
 }
 
 $filters = array();
-if (GETPOST("year", 'int')) {
-	$filters['year'] = GETPOST("year", 'int');
+if (GETPOSTINT("year")) {
+	$filters['year'] = GETPOSTINT("year");
 }
-if (GETPOST("id", 'int')) {
-	$filters['id'] = GETPOST("id", 'int');
+if (GETPOSTINT("id")) {
+	$filters['id'] = GETPOSTINT("id");
 }
-if (GETPOST("idfrom", 'int')) {
-	$filters['idfrom'] = GETPOST("idfrom", 'int');
+if (GETPOSTINT("idfrom")) {
+	$filters['idfrom'] = GETPOSTINT("idfrom");
 }
-if (GETPOST("idto", 'int')) {
-	$filters['idto'] = GETPOST("idto", 'int');
+if (GETPOSTINT("idto")) {
+	$filters['idto'] = GETPOSTINT("idto");
 }
 if (GETPOST("project", 'alpha')) {
 	$filters['project'] = GETPOST("project", 'alpha');
@@ -128,16 +128,16 @@ if (GETPOST("notactiontype", 'alpha')) {
 if (GETPOST("actiontype", 'alpha')) {
 	$filters['actiontype'] = GETPOST("actiontype", 'alpha');
 }
-if (GETPOST("notolderthan", 'int')) {
-	$filters['notolderthan'] = GETPOST("notolderthan", "int");
+if (GETPOSTINT("notolderthan")) {
+	$filters['notolderthan'] = GETPOSTINT("notolderthan");
 } else {
 	$filters['notolderthan'] = getDolGlobalString('MAIN_AGENDA_EXPORT_PAST_DELAY');
 }
 if (GETPOST("module", 'alpha')) {
 	$filters['module'] = GETPOST("module", 'alpha');
 }
-if (GETPOST("status", 'int')) {
-	$filters['status'] = GETPOST("status", 'int');
+if (GETPOSTINT("status")) {
+	$filters['status'] = GETPOSTINT("status");
 }
 
 // Security check
@@ -268,7 +268,7 @@ if (getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE')) {
 	$cachedelay = getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE');
 }
 
-$exportholidays = GETPOST('includeholidays', 'int');
+$exportholidays = GETPOSTINT('includeholidays');
 
 // Build file
 if ($format == 'ical' || $format == 'vcal') {
diff --git a/htdocs/public/bookcal/bookcalAjax.php b/htdocs/public/bookcal/bookcalAjax.php
index 8fddaaece37..1c5db0273f6 100644
--- a/htdocs/public/bookcal/bookcalAjax.php
+++ b/htdocs/public/bookcal/bookcalAjax.php
@@ -46,8 +46,8 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
-$datetocheckbooking = GETPOST('datetocheck', 'int');
+$id = GETPOSTINT('id');
+$datetocheckbooking = GETPOSTINT('datetocheck');
 $error = 0;
 
 // Security check
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
index c5fc4ea5dca..63c14cba596 100644
--- a/htdocs/public/bookcal/index.php
+++ b/htdocs/public/bookcal/index.php
@@ -56,17 +56,17 @@ $langs->loadLangs(array("main", "other", "dict", "agenda", "errors", "companies"
 
 $action = GETPOST('action', 'aZ09');
 $id = GETPOSTINT('id');
-$id_availability = GETPOST('id_availability', 'int');
+$id_availability = GETPOSTINT('id_availability');
 
-$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");
-$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'), 'tzuserrel');
+$year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
+$month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
+$day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
+$dateselect = dol_mktime(0, 0, 0, GETPOSTINT('dateselectmonth'), GETPOSTINT('dateselectday'), GETPOSTINT('dateselectyear'), 'tzuserrel');
 if ($dateselect > 0) {
-	$day = GETPOST('dateselectday', 'int');
-	$month = GETPOST('dateselectmonth', 'int');
-	$year = GETPOST('dateselectyear', 'int');
+	$day = GETPOSTINT('dateselectday');
+	$month = GETPOSTINT('dateselectmonth');
+	$year = GETPOSTINT('dateselectyear');
 }
 $backtopage = GETPOST("backtopage", "alpha");
 
@@ -240,7 +240,7 @@ if ($action == 'add') {
 	}
 
 	if (!$error) {
-		$dateend = dol_time_plus_duree(GETPOST("datetimebooking", 'int'), GETPOST("durationbooking"), 'i');
+		$dateend = dol_time_plus_duree(GETPOSTINT("datetimebooking"), GETPOST("durationbooking"), 'i');
 
 		$actioncomm->label = $langs->trans("BookcalBookingTitle");
 		$actioncomm->type = 'AC_RDV';
@@ -312,7 +312,7 @@ if ($action == 'afteradd') {
 	print '<h2>';
 	print $langs->trans("BookingSuccessfullyBooked");
 	print '</h2>';
-	print $langs->trans("BookingReservationHourAfter", dol_print_date(GETPOST("datetimebooking", 'int'), "dayhourtext"));
+	print $langs->trans("BookingReservationHourAfter", dol_print_date(GETPOSTINT("datetimebooking"), "dayhourtext"));
 } else {
 	$param = '';
 
diff --git a/htdocs/public/company/new.php b/htdocs/public/company/new.php
index 38bb7f31d4e..289adc1020b 100644
--- a/htdocs/public/company/new.php
+++ b/htdocs/public/company/new.php
@@ -215,7 +215,7 @@ if (empty($reshook) && $action == 'add') {
 
 		$societe->name = GETPOST('name', 'alphanohtml');
 
-		$societe->client = GETPOST('client', 'int') ? GETPOST('client', 'int') : $societe->client;
+		$societe->client = GETPOSTINT('client') ? GETPOSTINT('client') : $societe->client;
 
 		$societe->address	= GETPOST('address', 'alphanohtml');
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index bdd8f8b8d07..d9c41aff847 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -40,11 +40,11 @@ require_once '../../core/lib/functions2.lib.php';
 
 $langs->loadLangs(array("main", "install", "other"));
 
-$conf->dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
-$conf->dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int');
-$conf->dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int');
-$conf->dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int');
-$conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
+$conf->dol_hide_topmenu = GETPOSTINT('dol_hide_topmenu');
+$conf->dol_hide_leftmenu = GETPOSTINT('dol_hide_leftmenu');
+$conf->dol_optimize_smallscreen = GETPOSTINT('dol_optimize_smallscreen');
+$conf->dol_no_mouse_hover = GETPOSTINT('dol_no_mouse_hover');
+$conf->dol_use_jmobile = GETPOSTINT('dol_use_jmobile');
 
 // Security check
 global $dolibarr_main_demo;
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index a80f742e64d..e7caa101e6a 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -79,9 +79,9 @@ $lastname = GETPOST('lastname');
 // Getting id from Post and decoding it
 $type = GETPOST('type', 'aZ09');
 if ($type == 'conf') {
-	$id = GETPOST('id', 'int');
+	$id = GETPOSTINT('id');
 } else {
-	$id = GETPOST('fk_project', 'int') ? GETPOST('fk_project', 'int') : GETPOST('id', 'int');
+	$id = GETPOSTINT('fk_project') ? GETPOSTINT('fk_project') : GETPOSTINT('id');
 }
 
 $conference = new ConferenceOrBooth($db);
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 4fa749af693..e432909c0a2 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -67,7 +67,7 @@ $object = new stdClass(); // For triggers
 $error = 0;
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 1e707cd73b7..5fb856036fe 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -246,7 +246,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
-	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST("birthmin", 'int'), GETPOST("birthsec", 'int'), GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
+	$birthday = dol_mktime(GETPOSTINT("birthhour"), GETPOSTINT("birthmin"), GETPOSTINT("birthsec"), GETPOSTINT("birthmonth"), GETPOSTINT("birthday"), GETPOSTINT("birthyear"));
 	if (GETPOST("birthmonth") && empty($birthday)) {
 		$error++;
 		$langs->load("errors");
@@ -659,7 +659,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	print img_picto('', 'country', 'class="pictofixedwidth paddingright"');
-	$country_id = GETPOST('country_id', 'int');
+	$country_id = GETPOSTINT('country_id');
 	if (!$country_id && getDolGlobalString('MEMBER_NEWFORM_FORCECOUNTRYCODE')) {
 		$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 	}
@@ -758,7 +758,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 	}
 
 	if (getDolGlobalString('MEMBER_NEWFORM_PAYONLINE')) {
-		$typeid = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
+		$typeid = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOSTINT('typeid');
 		$adht = new AdherentType($db);
 		$adht->fetch($typeid);
 		$caneditamount = $adht->caneditamount;
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 9c1e3e16375..65b6065a698 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -60,7 +60,7 @@ if (!isModEnabled('adherent')) {
 
 $langs->loadLangs(array("main", "members", "companies", "other"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $object = new Adherent($db);
 $extrafields = new ExtraFields($db);
 
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 811ec6dcec2..b9b388a718b 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -86,8 +86,8 @@ function llxFooterVierge()
 
 $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');
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 71d722e80b0..64b8bd5a2c3 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -48,15 +48,15 @@ $langs->loadLangs(array("companies", "other", "opensurveys"));
 $action   = GETPOST('action', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
 $SECUREKEY = GETPOST("securekey");
-$entity = GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
 $backtopage = '';
 $suffix = "";
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 9e1c34076bc..24fb71fab2d 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -288,7 +288,7 @@ if ($testmodifier) {
 }
 
 // Delete comment
-$idcomment = GETPOST('deletecomment', 'int');
+$idcomment = GETPOSTINT('deletecomment');
 if ($idcomment) {
 	if (!$canbemodified) {
 		httponly_accessforbidden('ErrorForbidden');
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 5745846f1c7..187eba32b6b 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -185,7 +185,7 @@ if (empty($reshook) && $action == 'add') {
 
 	$db->begin();
 
-	if (GETPOST('partnershiptype', 'int') <= 0) {
+	if (GETPOSTINT('partnershiptype') <= 0) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
 	}
@@ -228,7 +228,7 @@ if (empty($reshook) && $action == 'add') {
 		$partnership->date_creation 		 = dol_now();
 		$partnership->date_partnership_start = dol_now();
 		$partnership->fk_user_creat          = 0;
-		$partnership->fk_type                = GETPOST('partnershiptype', 'int');
+		$partnership->fk_type                = GETPOSTINT('partnershiptype');
 		$partnership->url                    = GETPOST('url');
 		//$partnership->typeid               = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
 		$partnership->ip = getUserRemoteIP();
@@ -608,7 +608,7 @@ if (getDolGlobalString('PARTNERSHIP_NEWFORM_FORCETYPE')) {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 if (!getDolGlobalString('PARTNERSHIP_NEWFORM_FORCETYPE')) {
 	print '<tr class="morphy"><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans('PartnershipType').' <span class="star">*</span></td><td>'."\n";
-	print $form->selectarray("partnershiptype", $listofpartnership, GETPOSTISSET('partnershiptype') ? GETPOST('partnershiptype', 'int') : 'ifone', 1);
+	print $form->selectarray("partnershiptype", $listofpartnership, GETPOSTISSET('partnershiptype') ? GETPOSTINT('partnershiptype') : 'ifone', 1);
 	print '</td></tr>'."\n";
 }
 // Company
@@ -649,7 +649,7 @@ print '</td></tr>';
 // Country
 print '<tr><td>'.$langs->trans('Country').'</td><td>';
 print img_picto('', 'country', 'class="pictofixedwidth"');
-$country_id = GETPOST('country_id', 'int');
+$country_id = GETPOSTINT('country_id');
 if (!$country_id && getDolGlobalString('PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE')) {
 	$country_id = getCountry($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 }
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index f566c080d62..918f256ba5b 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -115,7 +115,7 @@ if ($source == 'organizedeventregistration') {
 	// Finding the Attendee
 	$attendee = new ConferenceOrBoothAttendee($db);
 
-	$invoiceid = GETPOST('ref', 'int');
+	$invoiceid = GETPOSTINT('ref');
 	$invoice = new Facture($db);
 
 	$resultinvoice = $invoice->fetch($invoiceid);
@@ -372,7 +372,7 @@ if ($action == 'dopayment') {
 		$phoneNum = GETPOST("phoneNum", 'alpha');
 		$email = GETPOST("email", 'alpha');
 		$desc = GETPOST("desc", 'alpha');
-		$thirdparty_id = GETPOST('thirdparty_id', 'int');
+		$thirdparty_id = GETPOSTINT('thirdparty_id');
 
 		// Special case for Paypal-Indonesia
 		if ($shipToCountryCode == 'ID' && !preg_match('/\-/', $shipToState)) {
@@ -434,7 +434,7 @@ if ($action == 'dopayment') {
 	if ($paymentmethod == 'paybox') {
 		$PRICE = price2num(GETPOST("newamount"), 'MT');
 		$email = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL');
-		$thirdparty_id = GETPOST('thirdparty_id', 'int');
+		$thirdparty_id = GETPOSTINT('thirdparty_id');
 
 		$origfulltag = GETPOST("fulltag", 'alpha');
 
@@ -497,11 +497,11 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 
 	$stripeToken = GETPOST("stripeToken", 'alpha');
 	$email = GETPOST("email", 'alpha');
-	$thirdparty_id = GETPOST('thirdparty_id', 'int'); // Note that for payment following online registration for members, this is empty because thirdparty is created once payment is confirmed by paymentok.php
+	$thirdparty_id = GETPOSTINT('thirdparty_id'); // Note that for payment following online registration for members, this is empty because thirdparty is created once payment is confirmed by paymentok.php
 	$dol_type = (GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha'));
-	$dol_id = GETPOST('dol_id', 'int');
+	$dol_id = GETPOSTINT('dol_id');
 	$vatnumber = GETPOST('vatnumber', 'alpha');
-	$savesource = GETPOSTISSET('savesource') ? GETPOST('savesource', 'int') : 1;
+	$savesource = GETPOSTISSET('savesource') ? GETPOSTINT('savesource') : 1;
 
 	dol_syslog("POST stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_payment');
 	dol_syslog("POST email = ".$email, LOG_DEBUG, 0, '_payment');
@@ -531,7 +531,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 
 				$service = 'StripeTest';
 				$servicestatus = 0;
-				if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'int')) {
+				if (getDolGlobalString('STRIPE_LIVE') && !GETPOSTINT('forcesandbox')) {
 					$service = 'StripeLive';
 					$servicestatus = 1;
 				}
@@ -730,7 +730,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 	if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'int')) {
+		if (getDolGlobalString('STRIPE_LIVE') && !GETPOSTINT('forcesandbox')) {
 			$service = 'StripeLive';
 			$servicestatus = 1;
 		}
@@ -864,10 +864,10 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
 
 
 // Show sandbox warning
-if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal') && (getDolGlobalString('PAYPAL_API_SANDBOX') || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
+if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal') && (getDolGlobalString('PAYPAL_API_SANDBOX') || GETPOSTINT('forcesandbox'))) {		// We can force sand box with param 'forcesandbox'
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
 }
-if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'int'))) {
+if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOSTINT('forcesandbox'))) {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 
@@ -881,7 +881,7 @@ print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n
 print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
 print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECUREKEY).'">'."\n";
 print '<input type="hidden" name="e" value="'.$entity.'" />';
-print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOSTINT('forcesandbox').'" />';
 print '<input type="hidden" name="lang" value="'.$getpostlang.'">';
 print "\n";
 
@@ -1604,7 +1604,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 
 	if ($member->type) {
 		$oldtypeid = $member->typeid;
-		$newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
+		$newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOSTINT("typeid") : $member->typeid);
 
 		if (getDolGlobalString('MEMBER_ALLOW_CHANGE_OF_TYPE')) {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
@@ -2123,7 +2123,7 @@ if ($action != 'dopayment') {
 
 			if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) {
 				print '<div class="button buttonpayment" id="div_dopayment_stripe"><span class="fa fa-credit-card"></span> <input class="" type="submit" id="dopayment_stripe" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
-				print '<input type="hidden" name="noidempotency" value="'.GETPOST('noidempotency', 'int').'">';
+				print '<input type="hidden" name="noidempotency" value="'.GETPOSTINT('noidempotency').'">';
 				print '<br>';
 				print '<span class="buttonpaymentsmall">'.$langs->trans("CreditOrDebitCard").'</span>';
 				print '</div>';
@@ -2252,9 +2252,9 @@ if (preg_match('/^dopayment/', $action)) {			// If we chose/clicked on the payme
 		print '<input type="hidden" name="e" value="'.$entity.'" />';
 		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
 		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
-		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+		print '<input type="hidden" name="forcesandbox" value="'.GETPOSTINT('forcesandbox').'" />';
 		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
-		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
+		print '<input type="hidden" name="thirdparty_id" value="'.GETPOSTINT('thirdparty_id').'" />';
 		print '<input type="hidden" name="lang" value="'.$getpostlang.'">';
 
 		if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') || getDolGlobalString('STRIPE_USE_NEW_CHECKOUT')) {	// Use a SCA ready method
@@ -2275,7 +2275,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we chose/clicked on the payme
 			}
 
 			if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
-				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
+				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOSTINT('noidempotency') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
 				$paymentintent = $stripe->getPaymentIntent($amount, $currency, ($tag ? $tag : $fulltag), 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
 				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
 				//var_dump($paymentintent);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 3f9161b8052..fc9d9acd0d4 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -111,7 +111,7 @@ $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alp
 $ref = GETPOST('ref');
 
 $suffix = GETPOST("suffix", 'aZ09');
-$membertypeid = GETPOST("membertypeid", 'int');
+$membertypeid = GETPOSTINT("membertypeid");
 
 
 // Detect $paymentmethod
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 9c96239e51b..7d5df469aac 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -60,7 +60,7 @@ $langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $securekeyreceived = GETPOST("securekey", 'alpha');
 $securekeytocompare = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $id), 'md5');
 
@@ -220,7 +220,7 @@ print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n
 print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
 print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($securekeyreceived).'">'."\n";
 print '<input type="hidden" name="e" value="'.$entity.'" />';
-print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOSTINT('forcesandbox').'" />';
 print "\n";
 
 
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 09750f6ad3b..0b81973f821 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -539,7 +539,7 @@ print '</td></tr>';
 if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
-		print $formcompany->select_state(GETPOST("state_id", 'int'), $country_code);
+		print $formcompany->select_state(GETPOSTINT("state_id"), $country_code);
 	} else {
 		print '';
 	}
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 49ec4f9cd17..f97de413b3b 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -70,8 +70,8 @@ $email = GETPOST("email");
 $societe = GETPOST("societe");
 $label = GETPOST("label");
 $note = GETPOST("note");
-$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
-$dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
+$datestart = dol_mktime(0, 0, 0, GETPOSTINT('datestartmonth'), GETPOSTINT('datestartday'), GETPOSTINT('datestartyear'));
+$dateend = dol_mktime(23, 59, 59, GETPOSTINT('dateendmonth'), GETPOSTINT('dateendday'), GETPOSTINT('dateendyear'));
 $id = GETPOST('id');
 
 $project = new Project($db);
@@ -299,8 +299,8 @@ if (empty($reshook) && $action == 'add') {
 				$contact->address = (string) GETPOST("address", 'alpha');
 				$contact->zip = (string) GETPOST("zipcode", 'alpha');
 				$contact->town = (string) GETPOST("town", 'alpha');
-				$contact->country_id = (int) GETPOST("country_id", 'int');
-				$contact->state_id = (int) GETPOST("state_id", 'int');
+				$contact->country_id = GETPOSTINT("country_id");
+				$contact->state_id = GETPOSTINT("state_id");
 				$contact->email = $email;
 				$contact->statut = 1; //Default status to Actif
 
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 79a67502eba..f522afd6589 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -70,8 +70,8 @@ $email = GETPOST("email");
 $societe = GETPOST("societe");
 $label = GETPOST("label");
 $note = GETPOST("note");
-$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
-$dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
+$datestart = dol_mktime(0, 0, 0, GETPOSTINT('datestartmonth'), GETPOSTINT('datestartday'), GETPOSTINT('datestartyear'));
+$dateend = dol_mktime(23, 59, 59, GETPOSTINT('dateendmonth'), GETPOSTINT('dateendday'), GETPOSTINT('dateendyear'));
 
 $id = GETPOST('id');
 
@@ -300,8 +300,8 @@ if (empty($reshook) && $action == 'add') {
 				$contact->address = (string) GETPOST("address", 'alpha');
 				$contact->zip = (string) GETPOST("zipcode", 'alpha');
 				$contact->town = (string) GETPOST("town", 'alpha');
-				$contact->country_id = (int) GETPOST("country_id", 'int');
-				$contact->state_id = (int) GETPOST("state_id", 'int');
+				$contact->country_id = GETPOSTINT("country_id");
+				$contact->state_id = GETPOSTINT("state_id");
 				$contact->email = $email;
 				$contact->statut = 1; //Default status to Actif
 				$resultcreatecontact = $contact->create($user);
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index e754ea62539..c436a2ead90 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -225,7 +225,7 @@ print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n
 print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
 print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($securekeyreceived).'">'."\n";
 print '<input type="hidden" name="e" value="'.$entity.'" />';
-print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOSTINT('forcesandbox').'" />';
 print "\n";
 
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index d64a32492b4..753cf09eb1c 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -49,15 +49,15 @@ $langs->loadLangs(array("companies", "other", "recruitment"));
 $action   = GETPOST('action', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
 $SECUREKEY = GETPOST("securekey");
-$entity = GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
 $backtopage = '';
 $suffix = "";
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index 24d5c693109..33a2d210d72 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -53,7 +53,7 @@ if (!defined('NOBROWSERNOTIF')) {
 include_once '../../../main.inc.php'; // Load $user and permissions
 
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $email = GETPOST('email', 'custom', 0, FILTER_VALIDATE_EMAIL);
 
 
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 40509ffdfb4..6e13ce4117b 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -67,9 +67,9 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 $langs->loadLangs(array('companies', 'other', 'mails', 'ticket'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$msg_id = GETPOST('msg_id', 'int');
-$socid = GETPOST('socid', 'int');
+$id = GETPOSTINT('id');
+$msg_id = GETPOSTINT('msg_id');
+$socid = GETPOSTINT('socid');
 $suffix = "";
 
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 69a7fbd540e..d1e4e142a1c 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -204,8 +204,8 @@ if ($action == "view_ticketlist") {
 		$search_type = GETPOST("search_type", 'alpha');
 		$search_category = GETPOST("search_category", 'alpha');
 		$search_severity = GETPOST("search_severity", 'alpha');
-		$search_fk_user_create = GETPOST("search_fk_user_create", 'int');
-		$search_fk_user_assign = GETPOST("search_fk_user_assign", 'int');
+		$search_fk_user_create = GETPOSTINT("search_fk_user_create");
+		$search_fk_user_assign = GETPOSTINT("search_fk_user_assign");
 
 		// Store current page url
 		$url_page_current = dol_buildpath('/public/ticket/list.php', 1);
@@ -326,7 +326,7 @@ if ($action == "view_ticketlist") {
 
 		$limit = $conf->liste_limit;
 
-		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 		if (empty($page) || $page == -1) {
 			$page = 0;
 		}     // If $page is not defined, or '' or -1
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 54a035ece6b..ed7fd3d2352 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -49,7 +49,7 @@ $mode     = GETPOST('mode', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
 $backtopage = '';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $securekey = GETPOST('securekey', 'alpha');
 $suffix = GETPOST('suffix');
 
diff --git a/htdocs/public/website/javascript.js.php b/htdocs/public/website/javascript.js.php
index d592c94a6ae..4ad388c537c 100644
--- a/htdocs/public/website/javascript.js.php
+++ b/htdocs/public/website/javascript.js.php
@@ -69,7 +69,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $error = 0;
 $website = GETPOST('website', 'alpha');
-$websiteid = GETPOST('websiteid', 'int');
+$websiteid = GETPOSTINT('websiteid');
 $pageid = GETPOST('page', 'alpha') ? GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
 
 $accessallowed = 1;
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index 6bfb41ef180..82686e3e9e6 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -69,7 +69,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $error = 0;
 $website = GETPOST('website', 'alpha');
-$websiteid = GETPOST('websiteid', 'int');
+$websiteid = GETPOSTINT('websiteid');
 $pageid = GETPOST('page', 'alpha') ? GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
 
 $accessallowed = 1;
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 79a9fe082ad..b75bf1827df 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -71,20 +71,20 @@ if (isModEnabled('productbatch')) {
 }
 
 $origin = GETPOST('origin', 'alpha') ? GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
-$origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
+$origin_id = GETPOSTINT('id') ? GETPOSTINT('id') : '';
 $id = $origin_id;
 if (empty($origin_id)) {
-	$origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
+	$origin_id  = GETPOSTINT('origin_id'); // Id of order or propal
 }
 if (empty($origin_id)) {
-	$origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
+	$origin_id  = GETPOSTINT('object_id'); // Id of order or propal
 }
 if (empty($origin_id)) {
-	$origin_id  = GETPOST('originid', 'int'); // Id of order or propal
+	$origin_id  = GETPOSTINT('originid'); // Id of order or propal
 }
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOSTINT('lineid') ? GETPOSTINT('lineid') : 0;
-$facid = GETPOST('facid', 'int');
+$facid = GETPOSTINT('facid');
 
 $action	= GETPOST('action', 'alpha');
 //Select mail models is same action as presend
@@ -97,9 +97,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 //PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Reception($db);
 $objectorder = new CommandeFournisseur($db);
@@ -116,7 +116,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('receptioncard', 'globalcard'));
 
-$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+$date_delivery = dol_mktime(GETPOSTINT('date_deliveryhour'), GETPOSTINT('date_deliverymin'), 0, GETPOSTINT('date_deliverymonth'), GETPOSTINT('date_deliveryday'), GETPOSTINT('date_deliveryyear'));
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -243,7 +243,7 @@ if (empty($reshook)) {
 
 	// Set incoterm
 	if ($action == 'set_incoterms' && isModEnabled('incoterm') && $permissiontoadd) {
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	}
 
 	if ($action == 'setref_supplier' && $permissiontoadd) {
@@ -294,13 +294,13 @@ if (empty($reshook)) {
 		$object->note = GETPOST('note', 'alpha');
 		$object->origin = $origin;
 		$object->origin_id = $origin_id;
-		$object->fk_project = GETPOST('projectid', 'int');
-		$object->weight = GETPOST('weight', 'int') == '' ? null : GETPOST('weight', 'int');
-		$object->trueHeight = GETPOST('trueHeight', 'int') == '' ? null : GETPOST('trueHeight', 'int');
-		$object->trueWidth = GETPOST('trueWidth', 'int') == '' ? null : GETPOST('trueWidth', 'int');
-		$object->trueDepth = GETPOST('trueDepth', 'int') == '' ? null : GETPOST('trueDepth', 'int');
-		$object->size_units = GETPOST('size_units', 'int');
-		$object->weight_units = GETPOST('weight_units', 'int');
+		$object->fk_project = GETPOSTINT('projectid');
+		$object->weight = GETPOSTINT('weight') == '' ? null : GETPOSTINT('weight');
+		$object->trueHeight = GETPOSTINT('trueHeight') == '' ? null : GETPOSTINT('trueHeight');
+		$object->trueWidth = GETPOSTINT('trueWidth') == '' ? null : GETPOSTINT('trueWidth');
+		$object->trueDepth = GETPOSTINT('trueDepth') == '' ? null : GETPOSTINT('trueDepth');
+		$object->size_units = GETPOSTINT('size_units');
+		$object->weight_units = GETPOSTINT('weight_units');
 
 		// On va boucler sur chaque ligne du document d'origine pour completer object reception
 		// avec info diverses + qte a livrer
@@ -318,11 +318,11 @@ if (empty($reshook)) {
 		$object->model_pdf = GETPOST('model');
 		$object->date_delivery = $date_delivery; // Date delivery planned
 		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
-		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
+		$object->shipping_method_id = GETPOSTINT('shipping_method_id');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
-		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+		$object->fk_incoterms = GETPOSTINT('incoterm_id');
 		$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 		$batch_line = array();
@@ -366,7 +366,7 @@ if (empty($reshook)) {
 			for ($i = 1; $i <= $num; $i++) {
 				$idl = "idl".$i;	// id line source
 				$lineToTest = '';
-				$lineId = GETPOST($idl, 'int');
+				$lineId = GETPOSTINT($idl);
 				foreach ($objectsrc->lines as $linesrc) {
 					if ($linesrc->id == $lineId) {
 						$lineToTest = $linesrc;
@@ -387,11 +387,11 @@ if (empty($reshook)) {
 				//var_dump(GETPOST("productl".$i, 'int').' '.GETPOST('entl'.$i, 'int').' '.GETPOST($idl, 'int').' '.GETPOST($qty, 'int').' '.GETPOST($batch, 'alpha'));
 
 				//if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && getDolGlobalString('RECEPTION_GETS_ALL_ORDER_PRODUCTS')) || (GETPOST($qty, 'int') < 0 && getDolGlobalString('RECEPTION_ALLOW_NEGATIVE_QTY'))) {
-				if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && getDolGlobalString('RECEPTION_GETS_ALL_ORDER_PRODUCTS'))) {
+				if (GETPOSTINT($qty) > 0 || (GETPOSTINT($qty) == 0 && getDolGlobalString('RECEPTION_GETS_ALL_ORDER_PRODUCTS'))) {
 					$ent = "entl".$i;
 					$idl = "idl".$i;
 
-					$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
+					$entrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : GETPOSTINT('entrepot_id');
 
 					/*
 					if (!empty($lineToTest)) {
@@ -399,7 +399,7 @@ if (empty($reshook)) {
 					} else {
 						$fk_product = $linesrc->fk_product;
 					}*/
-					$fk_product = GETPOST("productl".$i, 'int');
+					$fk_product = GETPOSTINT("productl".$i);
 
 					if ($entrepot_id < 0) {
 						$entrepot_id = '';
@@ -414,9 +414,9 @@ if (empty($reshook)) {
 					$sellbydate = str_replace('/', '-', $sellby);
 
 					if (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')) {
-						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'), GETPOSTFLOAT($cost_price, 'MU'));
+						$ret = $object->addline($entrepot_id, GETPOSTINT($idl), GETPOSTINT($qty), $array_options[$i], GETPOSTINT($comment), strtotime($eatbydate), strtotime($sellbydate), GETPOSTINT($batch), GETPOSTFLOAT($cost_price, 'MU'));
 					} else {
-						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
+						$ret = $object->addline($entrepot_id, GETPOSTINT($idl), GETPOSTINT($qty), $array_options[$i], GETPOSTINT($comment), strtotime($eatbydate), strtotime($sellbydate), GETPOSTINT($batch));
 					}
 					if ($ret < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -449,7 +449,7 @@ if (empty($reshook)) {
 			exit;
 		} else {
 			$db->rollback();
-			$_GET["commande_id"] = GETPOST('commande_id', 'int');
+			$_GET["commande_id"] = GETPOSTINT('commande_id');
 			$action = 'create';
 		}
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $permissiontovalidate) {
@@ -500,7 +500,7 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 		}*/
 	} elseif ($action == 'setdate_livraison' && $permissiontoadd) {
-		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		$object->fetch($id);
 		$result = $object->setDeliveryDate($user, $datedelivery);
@@ -520,24 +520,24 @@ if (empty($reshook)) {
 			$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
 		}
 		if ($action == 'settracking_url') {
-			$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+			$object->tracking_url = trim(GETPOSTINT('tracking_url'));
 		}
 		if ($action == 'settrueWeight') {
-			$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
-			$object->weight_units = GETPOST('weight_units', 'int');
+			$object->trueWeight = trim(GETPOSTINT('trueWeight'));
+			$object->weight_units = GETPOSTINT('weight_units');
 		}
 		if ($action == 'settrueWidth') {
-			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+			$object->trueWidth = trim(GETPOSTINT('trueWidth'));
 		}
 		if ($action == 'settrueHeight') {
-			$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
-			$object->size_units = GETPOST('size_units', 'int');
+			$object->trueHeight = trim(GETPOSTINT('trueHeight'));
+			$object->size_units = GETPOSTINT('size_units');
 		}
 		if ($action == 'settrueDepth') {
-			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+			$object->trueDepth = trim(GETPOSTINT('trueDepth'));
 		}
 		if ($action == 'setshipping_method_id') {
-			$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
+			$object->shipping_method_id = trim(GETPOSTINT('shipping_method_id'));
 		}
 
 		if (!$error) {
@@ -658,7 +658,7 @@ if (empty($reshook)) {
 
 					$line->id = $line_id;
 					$line->fk_entrepot = GETPOSTINT($stockLocation);
-					$line->qty = GETPOST($qty, 'int');
+					$line->qty = GETPOSTINT($qty);
 					$line->comment = GETPOST($comment, 'alpha');
 
 					if (isModEnabled('productbatch')) {
@@ -683,7 +683,7 @@ if (empty($reshook)) {
 				} else { // Product no predefined
 					$qty = "qtyl".$line_id;
 					$line->id = $line_id;
-					$line->qty = GETPOST($qty, 'int');
+					$line->qty = GETPOSTINT($qty);
 					$line->fk_entrepot = 0;
 					if ($line->update($user) < 0) {
 						setEventMessages($line->error, $line->errors, 'errors');
@@ -802,8 +802,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="origin_id" value="'.$objectsrc->id.'">';
 			print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-			if (GETPOST('entrepot_id', 'int')) {
-				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
+			if (GETPOSTINT('entrepot_id')) {
+				print '<input type="hidden" name="entrepot_id" value="'.GETPOSTINT('entrepot_id').'">';
 			}
 
 			print dol_get_fiche_head('');
@@ -840,7 +840,7 @@ if ($action == 'create') {
 
 			// Project
 			if (isModEnabled('project')) {
-				$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
+				$projectid = GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0;
 				if (empty($projectid) && !empty($objectsrc->fk_project)) {
 					$projectid = $objectsrc->fk_project;
 				}
@@ -885,19 +885,19 @@ if ($action == 'create') {
 			// Weight
 			print '<tr><td>';
 			print $langs->trans("Weight");
-			print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
-			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
+			print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOSTINT('weight').'"> ';
+			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTINT('weight_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
 			// Dim
 			print '<tr><td>';
 			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-			print ' </td><td colspan="3"><input name="trueWidth" size="4" value="'.GETPOST('trueWidth', 'int').'">';
-			print ' x <input name="trueHeight" size="4" value="'.GETPOST('trueHeight', 'int').'">';
-			print ' x <input name="trueDepth" size="4" value="'.GETPOST('trueDepth', 'int').'">';
+			print ' </td><td colspan="3"><input name="trueWidth" size="4" value="'.GETPOSTINT('trueWidth').'">';
+			print ' x <input name="trueHeight" size="4" value="'.GETPOSTINT('trueHeight').'">';
+			print ' x <input name="trueDepth" size="4" value="'.GETPOSTINT('trueDepth').'">';
 			print ' ';
-			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
+			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTINT('size_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
@@ -906,7 +906,7 @@ if ($action == 'create') {
 			print "<tr><td>".$langs->trans("ReceptionMethod")."</td>";
 			print '<td colspan="3">';
 			$recept->fetch_delivery_methods();
-			print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
+			print $form->selectarray("shipping_method_id", $recept->meths, GETPOSTINT('shipping_method_id'), 1, 0, 0, "", 1);
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
@@ -985,7 +985,7 @@ if ($action == 'create') {
 					$ent = "entrepot_" . $paramSuffix;
 					$pu = "pu_" . $paramSuffix; // This is unit price including discount
 					$fk_commandefourndet = "fk_commandefourndet_" . $paramSuffix;
-					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'));
+					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet));
 				}
 
 				// with batch module enabled and product with lot/serial
@@ -1003,10 +1003,10 @@ if ($action == 'create') {
 					$ent = 'entrepot_' . $paramSuffix;
 					$pu = 'pu_' . $paramSuffix;
 					$lot = 'lot_number_' . $paramSuffix;
-					$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$paramSuffix.'month', 'int'), GETPOST('dluo_'.$paramSuffix.'day', 'int'), GETPOST('dluo_'.$paramSuffix.'year', 'int'));
-					$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$paramSuffix.'month', 'int'), GETPOST('dlc_'.$paramSuffix.'day', 'int'), GETPOST('dlc_'.$paramSuffix.'year', 'int'));
+					$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo_'.$paramSuffix.'month'), GETPOSTINT('dluo_'.$paramSuffix.'day'), GETPOSTINT('dluo_'.$paramSuffix.'year'));
+					$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc_'.$paramSuffix.'month'), GETPOSTINT('dlc_'.$paramSuffix.'day'), GETPOSTINT('dlc_'.$paramSuffix.'year'));
 					$fk_commandefourndet = 'fk_commandefourndet_'.$paramSuffix;
-					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
+					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOSTINT($lot));
 				}
 
 				// If create form is coming from same page, it means that post was sent but an error occurred
@@ -1025,10 +1025,10 @@ if ($action == 'create') {
 					$ent = 'entl'.$paramSuffix;
 					$pu = 'pul'.$paramSuffix;
 					$lot = 'batch'.$paramSuffix;
-					$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo'.$paramSuffix.'month', 'int'), GETPOST('dluo'.$paramSuffix.'day', 'int'), GETPOST('dluo'.$paramSuffix.'year', 'int'));
-					$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc'.$paramSuffix.'month', 'int'), GETPOST('dlc'.$paramSuffix.'day', 'int'), GETPOST('dlc'.$paramSuffix.'year', 'int'));
+					$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo'.$paramSuffix.'month'), GETPOSTINT('dluo'.$paramSuffix.'day'), GETPOSTINT('dluo'.$paramSuffix.'year'));
+					$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc'.$paramSuffix.'month'), GETPOSTINT('dlc'.$paramSuffix.'day'), GETPOSTINT('dlc'.$paramSuffix.'year'));
 					$fk_commandefourndet = 'fk_commandefournisseurdet'.$paramSuffix;
-					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' =>GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
+					$dispatchLines[$numAsked] = array('prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' =>GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOSTINT($lot));
 				}
 			}
 
@@ -1232,8 +1232,8 @@ if ($action == 'create') {
 					// Quantity to send
 					print '<td class="center">';
 					if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
-						if (GETPOST('qtyl'.$indiceAsked, 'int')) {
-							$defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
+						if (GETPOSTINT('qtyl'.$indiceAsked)) {
+							$defaultqty = GETPOSTINT('qtyl'.$indiceAsked);
 						}
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						print '<input class="right" name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
@@ -1255,7 +1255,7 @@ if ($action == 'create') {
 							// Show warehouse combo list
 							$ent = "entl".$indiceAsked;
 							$idl = "idl".$indiceAsked;
-							$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : $warehouse_id;
+							$tmpentrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : $warehouse_id;
 							if ($line->fk_product > 0) {
 								print '<!-- Show warehouse selection -->';
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index c0f2fd18685..8fddd6c5779 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 
 $langs->loadLangs(array("orders", "receptions", "companies"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -100,7 +100,7 @@ if (isModEnabled("reception")) {
 
 if ($action == 'addcontact' && $user->hasRight('reception', 'creer')) {
 	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
@@ -120,10 +120,10 @@ if ($action == 'addcontact' && $user->hasRight('reception', 'creer')) {
 	}
 } elseif ($action == 'swapstatut' && $user->hasRight('reception', 'creer')) {
 	// bascule du statut d'un contact
-	$result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $objectsrc->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $user->hasRight('reception', 'creer')) {
 	// Efface un contact
-	$result = $objectsrc->delete_contact(GETPOST("lineid", 'int'));
+	$result = $objectsrc->delete_contact(GETPOSTINT("lineid"));
 
 	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index aa3bd9991fc..a212ad31953 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -50,11 +50,11 @@ if (isModEnabled('productbatch')) {
 }
 
 	// Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $ref = GETPOST('ref');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 $action = GETPOST('action', 'aZ09');
-$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$fk_default_warehouse = GETPOSTINT('fk_default_warehouse');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('ordersupplierdispatch'));
 // Recuperation de l'id de projet
 $projectid = 0;
 if (GETPOSTISSET("projectid")) {
-	$projectid = GETPOST("projectid", 'int');
+	$projectid = GETPOSTINT("projectid");
 }
 
 $object = new Reception($db);
@@ -161,13 +161,13 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 			$dDLC = '';
 			if ($modebatch == "batch") {
 				$lot = GETPOST('lot_number_'.$reg[1].'_'.$reg[2]);
-				$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'year', 'int'));
-				$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'year', 'int'));
+				$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'month'), GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'day'), GETPOSTINT('dluo_'.$reg[1].'_'.$reg[2].'year'));
+				$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'month'), GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'day'), GETPOSTINT('dlc_'.$reg[1].'_'.$reg[2].'year'));
 			}
 
 			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
-					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+					$dto = GETPOSTINT("dto_".$reg[1].'_'.$reg[2]);
 					if (!empty($dto)) {
 						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
 					}
@@ -177,7 +177,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 
 			// We ask to move a qty
 			if (($modebatch == "batch" && GETPOST($qty) > 0) || ($modebatch == "barcode" && GETPOST($qty) != 0)) {
-				if (!(GETPOST($ent, 'int') > 0)) {
+				if (!(GETPOSTINT($ent) > 0)) {
 					dol_syslog('No dispatch for line '.$key.' as no warehouse was chosen.');
 					$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' '.($numline);
 					setEventMessages($langs->trans('ErrorFieldRequired', $text), null, 'errors');
@@ -245,7 +245,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 							*/
 						}
 					} else {
-						$result = $objectsrc->dispatchProduct($user, GETPOST($prod, 'int'), GETPOST($qty), GETPOST($ent, 'int'), GETPOST($pu), GETPOST('comment'), $dDLUO, $dDLC, $lot, GETPOST($fk_commandefourndet, 'int'), 0, $object->id);
+						$result = $objectsrc->dispatchProduct($user, GETPOSTINT($prod), GETPOST($qty), GETPOSTINT($ent), GETPOST($pu), GETPOST('comment'), $dDLUO, $dDLC, $lot, GETPOSTINT($fk_commandefourndet), 0, $object->id);
 						if ($result < 0) {
 							setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
 							$error++;
@@ -254,7 +254,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 
 					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
-							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
+							$dto = price2num(GETPOSTINT("dto_".$reg[1].'_'.$reg[2]), '');
 							if (empty($dto)) {
 								$dto = 0;
 							}
@@ -267,7 +267,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 								$sql .= ", price=".price2num(GETPOST($pu), 'MU')."*quantity";
 								$sql .= ", remise_percent = ".((float) $dto);
 								$sql .= " WHERE fk_soc=".((int) $object->socid);
-								$sql .= " AND fk_product=".((int) GETPOST($prod, 'int'));
+								$sql .= " AND fk_product=".(GETPOSTINT($prod));
 
 								$resql = $db->query($sql);
 							}
@@ -803,7 +803,7 @@ if ($id > 0 || !empty($ref)) {
 								// Qty to dispatch
 								print '<td class="right">';
 								print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-								print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-type="'.$type.'" data-index="'.$i.'" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : $objd->qty).'" data-expected="'.$objd->qty.'">';
+								print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-type="'.$type.'" data-index="'.$i.'" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOSTINT('qty'.$suffix) : $objd->qty).'" data-expected="'.$objd->qty.'">';
 								print '</td>';
 								print '<td>';
 								if (isModEnabled('productbatch') && $objp->tobatch > 0) {
@@ -976,7 +976,7 @@ if ($id > 0 || !empty($ref)) {
 							// Qty to dispatch
 							print '<td class="right">';
 							print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-							print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-index="'.$i.'" data-type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'" data-expected="'.$remaintodispatch.'">';
+							print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-index="'.$i.'" data-type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOSTINT('qty'.$suffix) : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'" data-expected="'.$remaintodispatch.'">';
 							print '</td>';
 							print '<td>';
 							if (isModEnabled('productbatch') && $objp->tobatch > 0) {
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index 30bb01e2d76..d834589f628 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -45,14 +45,14 @@ $langs->loadLangs(array('receptions', 'companies', 'other'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index a0e5b5df644..4ed9d014e0d 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("sendings", "receptions", "deliveries", 'companies', 'bi
 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $massaction = GETPOST('massaction', 'alpha');
 $toselect = GETPOST('toselect', 'array');
@@ -56,32 +56,32 @@ $search_company = GETPOST("search_company");
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
-$search_country = GETPOST("search_country", 'int');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
-$search_date_delivery_startmonth = GETPOST('search_date_delivery_startmonth', 'int');
-$search_date_delivery_startyear = GETPOST('search_date_delivery_startyear', 'int');
-$search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
-$search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
-$search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
+$search_country = GETPOSTINT("search_country");
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
+$search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth');
+$search_date_delivery_startyear = GETPOSTINT('search_date_delivery_startyear');
+$search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday');
+$search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth');
+$search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear');
 $search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
-$search_date_create_startday = GETPOST('search_date_create_startday', 'int');
-$search_date_create_startmonth = GETPOST('search_date_create_startmonth', 'int');
-$search_date_create_startyear = GETPOST('search_date_create_startyear', 'int');
-$search_date_create_endday = GETPOST('search_date_create_endday', 'int');
-$search_date_create_endmonth = GETPOST('search_date_create_endmonth', 'int');
-$search_date_create_endyear = GETPOST('search_date_create_endyear', 'int');
+$search_date_create_startday = GETPOSTINT('search_date_create_startday');
+$search_date_create_startmonth = GETPOSTINT('search_date_create_startmonth');
+$search_date_create_startyear = GETPOSTINT('search_date_create_startyear');
+$search_date_create_endday = GETPOSTINT('search_date_create_endday');
+$search_date_create_endmonth = GETPOSTINT('search_date_create_endmonth');
+$search_date_create_endyear = GETPOSTINT('search_date_create_endyear');
 $search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear);	// Use tzserver
 $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear);
-$search_billed = GETPOST("search_billed", 'int');
+$search_billed = GETPOSTINT("search_billed");
 $search_status = GETPOST('search_status', 'intcomma');
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortfield) {
 	$sortfield = "e.ref";
 }
@@ -143,7 +143,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 $error = 0;
 
 // Security check
-$receptionid = GETPOST('id', 'int');
+$receptionid = GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -215,8 +215,8 @@ if (empty($reshook)) {
 
 	if ($massaction == 'confirm_createbills') {
 		$receptions = GETPOST('toselect', 'array');
-		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-		$validate_invoices = GETPOST('validate_invoices', 'int');
+		$createbills_onebythird = GETPOSTINT('createbills_onebythird');
+		$validate_invoices = GETPOSTINT('validate_invoices');
 
 		$errors = array();
 
@@ -338,7 +338,7 @@ if (empty($reshook)) {
 					$objecttmp->ref_supplier = $langs->trans("Reception").' '.dol_print_date(dol_now(), 'dayhourlog').'-'.$rcp->socid;
 				}
 
-				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+				$datefacture = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 				if (empty($datefacture)) {
 					$datefacture = dol_now();
 				}
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 304f122ce8e..8f3d3d3670b 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 
 $langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index d8be5bd1862..7aaa4a69642 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -33,8 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index 0b371ecd1f5..4e3bc970cb2 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -28,9 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/receptionstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
-$year = GETPOST("year", 'int');
-$socid = GETPOST("socid", 'int');
-$userid = GETPOST("userid", 'int');
+$year = GETPOSTINT("year");
+$socid = GETPOSTINT("socid");
+$userid = GETPOSTINT("userid");
 
 // Security check
 if ($user->socid) {
@@ -50,7 +50,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mesg = '';
 
-print load_fiche_titre($langs->trans("StatisticsOfReceptions").' '.GETPOST("year", 'int'), $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfReceptions").' '.GETPOSTINT("year"), $mesg);
 $stats = new ReceptionStats($db, $socid, '', ($userid > 0 ? $userid : 0));
 $data = $stats->getNbByMonth($year);
 
diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index 237eb45bb1e..c8d525403bf 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09');
 $max = 5;
 $now = dol_now();
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index a42fd797d37..19d341267ca 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -35,12 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidat
 $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 
 if (GETPOST('actioncode', 'array')) {
@@ -54,10 +54,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 0ab047ef440..813f0b74677 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidat
 $langs->loadLangs(array("recruitment", "other", "users"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -43,7 +43,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'recruitmentcandidaturecard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new RecruitmentCandidature($db);
@@ -131,7 +131,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 	if ($action == 'confirm_decline' && $confirm == 'yes' && $permissiontoadd) {
 		$result = $object->setStatut($object::STATUS_REFUSED, null, '', $triggermodname);
@@ -141,7 +141,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_makeofferordecline' && $permissiontoadd && !GETPOST('cancel', 'alpha')) {
-		if (!(GETPOST('status', 'int') > 0)) {
+		if (!(GETPOSTINT('status') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
 			$action = 'makeofferordecline';
 		} else {
@@ -149,7 +149,7 @@ if (empty($reshook)) {
 			if ($object->status == $object::STATUS_VALIDATED) {
 				$db->begin();
 
-				if (GETPOST('status', 'int') == $object::STATUS_REFUSED) {
+				if (GETPOSTINT('status') == $object::STATUS_REFUSED) {
 					$result = $object->setStatut($object::STATUS_REFUSED, null, '', $triggermodname);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -171,7 +171,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_closeas' && $permissiontoadd && !GETPOST('cancel', 'alpha')) {
-		if (!(GETPOST('status', 'int') > 0)) {
+		if (!(GETPOSTINT('status') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
 			$action = 'makeofferordecline';
 		} else {
@@ -179,7 +179,7 @@ if (empty($reshook)) {
 			if ($object->status == $object::STATUS_CONTRACT_PROPOSED) {
 				$db->begin();
 
-				if (GETPOST('status', 'int') == $object::STATUS_CONTRACT_REFUSED) {
+				if (GETPOSTINT('status') == $object::STATUS_CONTRACT_REFUSED) {
 					$result = $object->setStatut($object::STATUS_CONTRACT_REFUSED, null, '', $triggermodname);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 7a4c0a8d997..29aa3de893c 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -37,14 +37,14 @@ $langs->loadLangs(array("recruitment", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 70ed891ed43..eb71f70cf0d 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -34,12 +34,12 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "other"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -47,13 +47,13 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : ((e
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'aZ');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -90,8 +90,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -541,7 +541,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index a7af0fac525..ba6660db5c4 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidat
 $langs->loadLangs(array("recruitment", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 9a9638bf10d..2440f0f343d 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposit
 $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -53,10 +53,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 49f54fcfe6f..3abda72c4eb 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposit
 $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -128,10 +128,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'RECRUITMENTJOBPOSITION_MODIFY');
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, 'RECRUITMENTJOBPOSITION_MODIFY');
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 0526cfceb39..d1e1ca6aad4 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposit
 $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -42,7 +42,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'recruitmentjobpositioncard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+$lineid = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new RecruitmentJobPosition($db);
@@ -130,13 +130,13 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 	if ($action == 'confirm_closeas' && $usercanclose && !GETPOST('cancel', 'alpha')) {
-		if (!(GETPOST('status', 'int') > 0)) {
+		if (!(GETPOSTINT('status') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
 			$action = 'closeas';
 		} else {
@@ -144,7 +144,7 @@ if (empty($reshook)) {
 			if ($object->status == $object::STATUS_VALIDATED) {
 				$db->begin();
 
-				$result = $object->cloture($user, GETPOST('status', 'int'), GETPOST('note_private', 'restricthtml'));
+				$result = $object->cloture($user, GETPOSTINT('status'), GETPOSTINT('note_private'));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index c795fc43350..045c64f0dd2 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -37,14 +37,14 @@ $langs->loadLangs(array("recruitment", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 9cb3e48d435..396fa2a780b 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("recruitment", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -43,13 +43,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -86,8 +86,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -386,7 +386,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index b9a01fceb4d..fec6fdd4b97 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposit
 $langs->loadLangs(array("recruitment", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 31e847f2f37..fa3c2d8a98a 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 $langs->load('companies');
 
 // Get parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -58,10 +58,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 9f330ef1397..5ecd8b2961f 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'resource', 'sendings'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -66,7 +66,7 @@ if (!$user->hasRight('resource', 'read')) {
 // Add a new contact
 if ($action == 'addcontact' && $user->hasRight('resource', 'write')) {
 	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
@@ -86,10 +86,10 @@ if ($action == 'addcontact' && $user->hasRight('resource', 'write')) {
 	}
 } elseif ($action == 'swapstatut' && $user->hasRight('resource', 'write')) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $user->hasRight('resource', 'write')) {
 	// Erase a contact
-	$result = $object->delete_contact(GETPOST('lineid', 'int'));
+	$result = $object->delete_contact(GETPOSTINT('lineid'));
 
 	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 21d21e0901c..790ccf85be0 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'resource', 'companies'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -52,10 +52,10 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 7c3694669ef..f92b6bbb7ac 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -54,20 +54,20 @@ $hookmanager->initHooks(array('element_resource'));
 $object->available_resources = array('dolresource');
 
 // Get parameters
-$id                     = GETPOST('id', 'int'); // resource id
-$element_id             = GETPOST('element_id', 'int'); // element_id
+$id                     = GETPOSTINT('id'); // resource id
+$element_id             = GETPOSTINT('element_id'); // element_id
 $element_ref            = GETPOST('ref', 'alpha'); // element ref
 $element                = GETPOST('element', 'alpha'); // element_type
 $action                 = GETPOST('action', 'alpha');
 $mode                   = GETPOST('mode', 'alpha');
-$lineid                 = GETPOST('lineid', 'int');
-$resource_id            = GETPOST('fk_resource', 'int');
+$lineid                 = GETPOSTINT('lineid');
+$resource_id            = GETPOSTINT('fk_resource');
 $resource_type          = GETPOST('resource_type', 'alpha');
-$busy                   = GETPOST('busy', 'int');
-$mandatory              = GETPOST('mandatory', 'int');
+$busy                   = GETPOSTINT('busy');
+$mandatory              = GETPOSTINT('mandatory');
 $cancel                 = GETPOST('cancel', 'alpha');
 $confirm                = GETPOST('confirm', 'alpha');
-$socid                  = GETPOST('socid', 'int');
+$socid                  = GETPOSTINT('socid');
 
 if (empty($mandatory)) {
 	$mandatory = 0;
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index e45886c9046..4ada45bd358 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -31,14 +31,14 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 $langs->loadLangs(array("resource", "companies", "other"));
 
 // Get parameters
-$id             = GETPOST('id', 'int');
+$id             = GETPOSTINT('id');
 $action         = GETPOST('action', 'alpha');
 $massaction     = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 
-$lineid         = GETPOST('lineid', 'int');
+$lineid         = GETPOSTINT('lineid');
 $element        = GETPOST('element', 'alpha');
-$element_id     = GETPOST('element_id', 'int');
-$resource_id    = GETPOST('resource_id', 'int');
+$element_id     = GETPOSTINT('element_id');
+$resource_id    = GETPOSTINT('resource_id');
 
 $sortorder      = GETPOST('sortorder', 'aZ09comma');
 $sortfield      = GETPOST('sortfield', 'aZ09comma');
@@ -61,7 +61,7 @@ $search_ref = GETPOST("search_ref", 'alpha');
 $search_type = GETPOST("search_type", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 $filter = array();
 
@@ -77,8 +77,8 @@ if (empty($arch)) {
 	$arch = 0;
 }
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index f40c7adbd03..391d8b929fa 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'interventions'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
index 1cbecf840d2..aec5e304e14 100644
--- a/htdocs/salaries/ajax/ajaxsalaries.php
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -52,10 +52,10 @@ restrictedArea($user, 'salaries');
 
 top_httphead('application/json');
 
-$fk_user = GETPOST('fk_user', 'int');
+$fk_user = GETPOSTINT('fk_user');
 $return_arr = array();
 
-if (!empty(GETPOST('fk_user', 'int'))) {
+if (!empty(GETPOSTINT('fk_user'))) {
 	$sql = "SELECT s.amount, s.rowid FROM ".MAIN_DB_PREFIX."salary as s";
 	$sql .= " WHERE s.fk_user = ".((int) $fk_user);
 	$sql .= " AND s.paye = 1";
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index d8ecef9087b..ebe929ffc6c 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -61,17 +61,17 @@ $confirm = GETPOST('confirm');
 
 $label = GETPOST('label', 'alphanohtml');
 $projectid = GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project');
-$accountid = GETPOST('accountid', 'int') > 0 ? GETPOST('accountid', 'int') : 0;
+$accountid = GETPOSTINT('accountid') > 0 ? GETPOSTINT('accountid') : 0;
 if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
-	$auto_create_paiement = GETPOST("auto_create_paiement", "int");
+	$auto_create_paiement = GETPOSTINT("auto_create_paiement");
 } else {
 	$auto_create_paiement = !getDolGlobalString('CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT');
 }
 
-$datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
-$datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
-$datesp = dol_mktime(12, 0, 0, GETPOST("datespmonth", 'int'), GETPOST("datespday", 'int'), GETPOST("datespyear", 'int'));
-$dateep = dol_mktime(12, 0, 0, GETPOST("dateepmonth", 'int'), GETPOST("dateepday", 'int'), GETPOST("dateepyear", 'int'));
+$datep = dol_mktime(12, 0, 0, GETPOSTINT("datepmonth"), GETPOSTINT("datepday"), GETPOSTINT("datepyear"));
+$datev = dol_mktime(12, 0, 0, GETPOSTINT("datevmonth"), GETPOSTINT("datevday"), GETPOSTINT("datevyear"));
+$datesp = dol_mktime(12, 0, 0, GETPOSTINT("datespmonth"), GETPOSTINT("datespday"), GETPOSTINT("datespyear"));
+$dateep = dol_mktime(12, 0, 0, GETPOSTINT("dateepmonth"), GETPOSTINT("dateepday"), GETPOSTINT("dateepyear"));
 $fk_user = GETPOSTINT('userid');
 
 $object = new Salary($db);
@@ -213,7 +213,7 @@ if ($action == 'reopen' && $permissiontoadd) {
 // payment mode
 if ($action == 'setmode' && $permissiontoadd) {
 	$object->fetch($id);
-	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+	$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -222,7 +222,7 @@ if ($action == 'setmode' && $permissiontoadd) {
 // bank account
 if ($action == 'setbankaccount' && $permissiontoadd) {
 	$object->fetch($id);
-	$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+	$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -238,8 +238,8 @@ if ($action == 'add' && empty($cancel)) {
 	$type_payment = GETPOSTINT("paymenttype");
 	$amount = price2num(GETPOST("amount", 'alpha'), 'MT', 2);
 
-	$object->accountid = GETPOST("accountid", 'int') > 0 ? GETPOST("accountid", "int") : 0;
-	$object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", "int") : 0;
+	$object->accountid = GETPOSTINT("accountid") > 0 ? GETPOSTINT("accountid") : 0;
+	$object->fk_user = GETPOSTINT("fk_user") > 0 ? GETPOSTINT("fk_user") : 0;
 	$object->datev = $datev;
 	$object->datep = $datep;
 	$object->amount = $amount;
@@ -253,7 +253,7 @@ if ($action == 'add' && empty($cancel)) {
 
 	// Set user current salary as ref salary for the payment
 	$fuser = new User($db);
-	$fuser->fetch(GETPOST("fk_user", "int"));
+	$fuser->fetch(GETPOSTINT("fk_user"));
 	$object->salary = $fuser->salary;
 
 	// Fill array 'array_options' with data from add form
@@ -317,7 +317,7 @@ if ($action == 'add' && empty($cancel)) {
 			}
 
 			if (!$error) {
-				$result = $paiement->addPaymentToBank($user, 'payment_salary', '(SalaryPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $paiement->addPaymentToBank($user, 'payment_salary', '(SalaryPayment)', GETPOSTINT('accountid'), '', '');
 				if (!($result > 0)) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
@@ -330,7 +330,7 @@ if ($action == 'add' && empty($cancel)) {
 
 			if (GETPOST('saveandnew', 'alpha')) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOST('paymenttype', 'aZ09')) . '&datepday=' . GETPOST("datepday", 'int') . '&datepmonth=' . GETPOST("datepmonth", 'int') . '&datepyear=' . GETPOST("datepyear", 'int'));
+				header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOSTINT('paymenttype')) . '&datepday=' . GETPOSTINT("datepday") . '&datepmonth=' . GETPOSTINT("datepmonth") . '&datepyear=' . GETPOSTINT("datepyear"));
 				exit;
 			} else {
 				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
@@ -414,8 +414,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 			$object->label = $langs->trans("CopyOf").' '.$object->label;
 		}
 
-		$newdatestart = dol_mktime(0, 0, 0, GETPOST('clone_date_startmonth', 'int'), GETPOST('clone_date_startday', 'int'), GETPOST('clone_date_startyear', 'int'));
-		$newdateend = dol_mktime(0, 0, 0, GETPOST('clone_date_endmonth', 'int'), GETPOST('clone_date_endday', 'int'), GETPOST('clone_date_endyear', 'int'));
+		$newdatestart = dol_mktime(0, 0, 0, GETPOSTINT('clone_date_startmonth'), GETPOSTINT('clone_date_startday'), GETPOSTINT('clone_date_startyear'));
+		$newdateend = dol_mktime(0, 0, 0, GETPOSTINT('clone_date_endmonth'), GETPOSTINT('clone_date_endday'), GETPOSTINT('clone_date_endyear'));
 
 		if ($newdatestart) {
 			$object->datesp = $newdatestart;
@@ -445,14 +445,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 
 // Action to update one extrafield
 if ($action == "update_extras" && $permissiontoadd) {
-	$object->fetch(GETPOST('id', 'int'));
+	$object->fetch(GETPOSTINT('id'));
 
 	$attributekey = GETPOST('attribute', 'alpha');
 	$attributekeylong = 'options_'.$attributekey;
 
 	if (GETPOSTISSET($attributekeylong.'day') && GETPOSTISSET($attributekeylong.'month') && GETPOSTISSET($attributekeylong.'year')) {
 		// This is properties of a date
-		$object->array_options['options_'.$attributekey] = dol_mktime(GETPOST($attributekeylong.'hour', 'int'), GETPOST($attributekeylong.'min', 'int'), GETPOST($attributekeylong.'sec', 'int'), GETPOST($attributekeylong.'month', 'int'), GETPOST($attributekeylong.'day', 'int'), GETPOST($attributekeylong.'year', 'int'));
+		$object->array_options['options_'.$attributekey] = dol_mktime(GETPOSTINT($attributekeylong.'hour'), GETPOSTINT($attributekeylong.'min'), GETPOSTINT($attributekeylong.'sec'), GETPOSTINT($attributekeylong.'month'), GETPOSTINT($attributekeylong.'day'), GETPOSTINT($attributekeylong.'year'));
 		//var_dump(dol_print_date($object->array_options['options_'.$attributekey]));exit;
 	} else {
 		$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, 'alpha');
@@ -504,12 +504,12 @@ if ($action == 'create' && $permissiontoadd) {
 		$pastmonthyear--;
 	}
 
-	$datespmonth = GETPOST('datespmonth', 'int');
-	$datespday = GETPOST('datespday', 'int');
-	$datespyear = GETPOST('datespyear', 'int');
-	$dateepmonth = GETPOST('dateepmonth', 'int');
-	$dateepday = GETPOST('dateepday', 'int');
-	$dateepyear = GETPOST('dateepyear', 'int');
+	$datespmonth = GETPOSTINT('datespmonth');
+	$datespday = GETPOSTINT('datespday');
+	$datespyear = GETPOSTINT('datespyear');
+	$dateepmonth = GETPOSTINT('dateepmonth');
+	$dateepday = GETPOSTINT('dateepday');
+	$dateepyear = GETPOSTINT('dateepyear');
 	$datesp = dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
 	$dateep = dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
 
@@ -568,7 +568,7 @@ if ($action == 'create' && $permissiontoadd) {
 	print '<tr><td class="titlefieldcreate">';
 	print $form->editfieldkey('Employee', 'fk_user', '', $object, 0, 'string', '', 1).'</td><td>';
 	$noactive = 0; // We keep active and unactive users
-	print img_picto('', 'user', 'class="paddingrighonly"').$form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, 'AND employee=1', 0, '', 'maxwidth300', $noactive);
+	print img_picto('', 'user', 'class="paddingrighonly"').$form->select_dolusers(GETPOSTINT('fk_user'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, 'AND employee=1', 0, '', 'maxwidth300', $noactive);
 	print '</td></tr>';
 
 	// Label
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 548fba7d6d8..f3d73ad78f2 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -44,19 +44,19 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 $label = GETPOST('label', 'alphanohtml');
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+$projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project'));
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 0135846a83e..41842b9d1d9 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -37,15 +37,15 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 $label = GETPOST('label', 'alphanohtml');
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+$projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 5c090626439..d8569747e30 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -48,10 +48,10 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -84,17 +84,17 @@ if (!$sortorder) {
 	$sortorder = "DESC,DESC";
 }
 
-$search_ref = GETPOST('search_ref', 'int');
+$search_ref = GETPOSTINT('search_ref');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$search_date_start_from = dol_mktime(0, 0, 0, GETPOST('search_date_start_frommonth', 'int'), GETPOST('search_date_start_fromday', 'int'), GETPOST('search_date_start_fromyear', 'int'));
-$search_date_start_to = dol_mktime(23, 59, 59, GETPOST('search_date_start_tomonth', 'int'), GETPOST('search_date_start_today', 'int'), GETPOST('search_date_start_toyear', 'int'));
-$search_date_end_from = dol_mktime(0, 0, 0, GETPOST('search_date_end_frommonth', 'int'), GETPOST('search_date_end_fromday', 'int'), GETPOST('search_date_end_fromyear', 'int'));
-$search_date_end_to = dol_mktime(23, 59, 59, GETPOST('search_date_end_tomonth', 'int'), GETPOST('search_date_end_today', 'int'), GETPOST('search_date_end_toyear', 'int'));
+$search_date_start_from = dol_mktime(0, 0, 0, GETPOSTINT('search_date_start_frommonth'), GETPOSTINT('search_date_start_fromday'), GETPOSTINT('search_date_start_fromyear'));
+$search_date_start_to = dol_mktime(23, 59, 59, GETPOSTINT('search_date_start_tomonth'), GETPOSTINT('search_date_start_today'), GETPOSTINT('search_date_start_toyear'));
+$search_date_end_from = dol_mktime(0, 0, 0, GETPOSTINT('search_date_end_frommonth'), GETPOSTINT('search_date_end_fromday'), GETPOSTINT('search_date_end_fromyear'));
+$search_date_end_to = dol_mktime(23, 59, 59, GETPOSTINT('search_date_end_tomonth'), GETPOSTINT('search_date_end_today'), GETPOSTINT('search_date_end_toyear'));
 $search_amount = GETPOST('search_amount', 'alpha');
-$search_account = GETPOST('search_account', 'int');
-$search_status = GETPOST('search_status', 'int');
-$search_type_id = GETPOST('search_type_id', 'int');
+$search_account = GETPOSTINT('search_account');
+$search_status = GETPOSTINT('search_status');
+$search_type_id = GETPOSTINT('search_type_id');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
@@ -108,8 +108,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -147,7 +147,7 @@ $permissiontoadd = $user->hasRight('salaries', 'write');
 $permissiontodelete = $user->hasRight('salaries', 'delete');
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -413,7 +413,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 3d8e9caf355..2fda40dddc6 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -46,7 +46,7 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -66,9 +66,9 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 		exit;
 	}
 
-	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'), 'tzuserrel');
+	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"), 'tzuserrel');
 
-	if (!(GETPOST("paiementtype", 'int') > 0)) {
+	if (!(GETPOSTINT("paiementtype") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 		$action = 'create';
@@ -78,7 +78,7 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 		$error++;
 		$action = 'create';
 	}
-	if (isModEnabled("banque") && !(GETPOST("accountid", 'int') > 0)) {
+	if (isModEnabled("banque") && !(GETPOSTINT("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 		$action = 'create';
@@ -125,7 +125,7 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 			}
 
 			if (!$error) {
-				$result = $paiement->addPaymentToBank($user, 'payment_salary', '(SalaryPayment)', GETPOST('accountid', 'int'), '', '');
+				$result = $paiement->addPaymentToBank($user, 'payment_salary', '(SalaryPayment)', GETPOSTINT('accountid'), '', '');
 
 				if (!($result > 0)) {
 					$error++;
@@ -212,7 +212,7 @@ if ($action == 'create') {
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOST("remonth") ? $datepaye : -1) : '';
 	print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1, 0, '', '', $salary->dateep, '', 1, $langs->trans("DateEnd"));
 	print "</td>";
@@ -227,7 +227,7 @@ if ($action == 'create') {
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $salary->accountid, "accountid", 0, '', 1); // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOSTINT("accountid") : $salary->accountid, "accountid", 0, '', 1); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index d5aff1dd250..2d84cace617 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('bills', 'banks', 'companies', 'salaries'));
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 if ($user->socid) {
@@ -77,7 +77,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('salarie
 }
 
 if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('salaries', 'write')) {
-	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'), 'tzuserrel');
+	$datepaye = dol_mktime(GETPOSTINT('datephour'), GETPOSTINT('datepmin'), GETPOSTINT('datepsec'), GETPOSTINT('datepmonth'), GETPOSTINT('datepday'), GETPOSTINT('datepyear'), 'tzuserrel');
 	$res = $object->updatePaymentDate($datepaye);
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 20382aeb55b..a00707b039b 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -49,10 +49,10 @@ $mode       = GETPOST('mode', 'alpha'); // mode view for result
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -84,23 +84,23 @@ if (!$sortorder) {
 	$sortorder = "DESC,DESC";
 }
 
-$search_ref = GETPOST('search_ref', 'int');
-$search_ref_salary = GETPOST('search_ref_salary', 'int');
+$search_ref = GETPOSTINT('search_ref');
+$search_ref_salary = GETPOSTINT('search_ref_salary');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
-$search_dateep_start = dol_mktime(0, 0, 0, GETPOST('search_dateep_startmonth', 'int'), GETPOST('search_dateep_startday', 'int'), GETPOST('search_dateep_startyear', 'int'));
-$search_dateep_end = dol_mktime(23, 59, 59, GETPOST('search_dateep_endmonth', 'int'), GETPOST('search_dateep_endday', 'int'), GETPOST('search_dateep_endyear', 'int'));
+$search_date_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_startmonth'), GETPOSTINT('search_date_startday'), GETPOSTINT('search_date_startyear'));
+$search_date_end = dol_mktime(23, 59, 59, GETPOSTINT('search_date_endmonth'), GETPOSTINT('search_date_endday'), GETPOSTINT('search_date_endyear'));
+$search_dateep_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateep_startmonth'), GETPOSTINT('search_dateep_startday'), GETPOSTINT('search_dateep_startyear'));
+$search_dateep_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateep_endmonth'), GETPOSTINT('search_dateep_endday'), GETPOSTINT('search_dateep_endyear'));
 $search_amount = GETPOST('search_amount', 'alpha');
-$search_account = GETPOST('search_account', 'int');
-$search_fk_bank = GETPOST('search_fk_bank', 'int');
-$search_chq_number = GETPOST('search_chq_number', 'int');
+$search_account = GETPOSTINT('search_account');
+$search_fk_bank = GETPOSTINT('search_fk_bank');
+$search_chq_number = GETPOSTINT('search_chq_number');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
 $search_type_id = '';
-if (!GETPOST('search_type_id', 'int')) {
+if (!GETPOSTINT('search_type_id')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
 	foreach ($filterarray as $val) {
@@ -110,7 +110,7 @@ if (!GETPOST('search_type_id', 'int')) {
 		}
 	}
 } else {
-	$search_type_id = GETPOST('search_type_id', 'int');
+	$search_type_id = GETPOSTINT('search_type_id');
 }
 
 $childids = $user->getAllChildIds(1);
@@ -153,7 +153,7 @@ $permissiontoadd = $user->hasRight('salaries', 'write');
 $permissiontodelete = $user->hasRight('salaries', 'delete');
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -370,16 +370,16 @@ if ($search_account) {
 	$param .= '&search_account='.urlencode($search_account);
 }
 if ($search_date_start) {
-	$param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int'));
+	$param .= '&search_date_startday='.urlencode(GETPOSTINT('search_date_startday')).'&search_date_startmonth='.urlencode(GETPOSTINT('search_date_startmonth')).'&search_date_startyear='.urlencode(GETPOSTINT('search_date_startyear'));
 }
 if ($search_dateep_start) {
-	$param .= '&search_dateep_startday='.urlencode(GETPOST('search_dateep_startday', 'int')).'&search_dateep_startmonth='.urlencode(GETPOST('search_dateep_startmonth', 'int')).'&search_dateep_startyear='.urlencode(GETPOST('search_dateep_startyear', 'int'));
+	$param .= '&search_dateep_startday='.urlencode(GETPOSTINT('search_dateep_startday')).'&search_dateep_startmonth='.urlencode(GETPOSTINT('search_dateep_startmonth')).'&search_dateep_startyear='.urlencode(GETPOSTINT('search_dateep_startyear'));
 }
 if ($search_date_end) {
-	$param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int'));
+	$param .= '&search_date_endday='.urlencode(GETPOSTINT('search_date_endday')).'&search_date_endmonth='.urlencode(GETPOSTINT('search_date_endmonth')).'&search_date_endyear='.urlencode(GETPOSTINT('search_date_endyear'));
 }
 if ($search_dateep_end) {
-	$param .= '&search_dateep_endday='.urlencode(GETPOST('search_dateep_endday', 'int')).'&search_dateep_endmonth='.urlencode(GETPOST('search_dateep_endmonth', 'int')).'&search_dateep_endyear='.urlencode(GETPOST('search_dateep_endyear', 'int'));
+	$param .= '&search_dateep_endday='.urlencode(GETPOSTINT('search_dateep_endday')).'&search_dateep_endmonth='.urlencode(GETPOSTINT('search_dateep_endmonth')).'&search_dateep_endyear='.urlencode(GETPOSTINT('search_dateep_endyear'));
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -390,7 +390,7 @@ $arrayofmassactions = array(
 	//'buildsepa'=>$langs->trans("BuildSepa"),	// TODO
 );
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index d9ea0e72a7c..8afe92dc1d8 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -34,18 +34,18 @@ $langs->loadLangs(array("salaries", "companies", "bills"));
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int');
+$userid = GETPOSTINT('userid');
 if ($userid < 0) {
 	$userid = 0;
 }
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($socid < 0) {
 	$socid = 0;
 }
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php
index 7829bc312a9..b640d1f3c58 100644
--- a/htdocs/salaries/virement_request.php
+++ b/htdocs/salaries/virement_request.php
@@ -58,16 +58,16 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm", "withdrawals"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $type = 'salaire';
 
 $label = GETPOST('label', 'alphanohtml');
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+$projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -177,7 +177,7 @@ if ($action == "new") {
 
 if ($action == "delete" && $permissiontodelete) {
 	if ($object->id > 0) {
-		$result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
+		$result = $object->demande_prelevement_delete($user, GETPOSTINT('did'));
 		if ($result == 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 8e349c5803d..b432cd98235 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -93,7 +93,7 @@ if ($action == 'updateoptions') {
 	}
 
 	if (GETPOST('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')) {
-		$customertypedefault = GETPOST('defaultcustomertype', 'int');
+		$customertypedefault = GETPOSTINT('defaultcustomertype');
 		$res = dolibarr_set_const($db, "THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT", $customertypedefault, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
@@ -169,7 +169,7 @@ if ($action == 'setdoc') {
 
 //Activate Set accountancy code customer invoice mandatory
 if ($action == "setaccountancycodecustomerinvoicemandatory") {
-	$setaccountancycodecustomerinvoicemandatory = GETPOST('value', 'int');
+	$setaccountancycodecustomerinvoicemandatory = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY", $setaccountancycodecustomerinvoicemandatory, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -183,7 +183,7 @@ if ($action == "setaccountancycodecustomerinvoicemandatory") {
 
 //Activate Set vat id unique
 if ($action == "setvatintraunique") {
-	$setvatintraunique = GETPOST('value', 'int');
+	$setvatintraunique = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_VAT_INTRA_UNIQUE", $setvatintraunique, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -197,7 +197,7 @@ if ($action == "setvatintraunique") {
 
 //Activate Set ref in list
 if ($action == "setaddrefinlist") {
-	$setaddrefinlist = GETPOST('value', 'int');
+	$setaddrefinlist = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -211,7 +211,7 @@ if ($action == "setaddrefinlist") {
 
 //Activate Set vat in list
 if ($action == "setvatinlist") {
-	$setvatinlist = GETPOST('value', 'int');
+	$setvatinlist = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_SHOW_VAT_IN_LIST", $setvatinlist, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -225,7 +225,7 @@ if ($action == "setvatinlist") {
 
 //Activate Set address in list
 if ($action == "setaddadressinlist") {
-	$val = GETPOST('value', 'int');
+	$val = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -239,7 +239,7 @@ if ($action == "setaddadressinlist") {
 
 //Activate Set email phone town in contact list
 if ($action == "setaddemailphonetownincontactlist") {
-	$val = GETPOST('value', 'int');
+	$val = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -253,7 +253,7 @@ if ($action == "setaddemailphonetownincontactlist") {
 
 //Activate Ask For Preferred Shipping Method
 if ($action == "setaskforshippingmet") {
-	$setaskforshippingmet = GETPOST('value', 'int');
+	$setaskforshippingmet = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -267,7 +267,7 @@ if ($action == "setaskforshippingmet") {
 
 // Activate "Disable prospect/customer type"
 if ($action == "setdisableprospectcustomer") {
-	$setdisableprospectcustomer = GETPOST('value', 'int');
+	$setdisableprospectcustomer = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
@@ -322,7 +322,7 @@ if ($action == 'sethideinactivethirdparty') {
 	}
 }
 if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
-	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
+	$setonsearchandlistgooncustomerorsuppliercard = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 41d5460566e..eab5c459f87 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -52,10 +52,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -76,7 +76,7 @@ $object = new Societe($db);
 $hookmanager->initHooks(array('agendathirdparty', 'globalcard'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index 203b40aaff2..b80c581b85b 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -43,7 +43,7 @@ if (!defined('NOREQUIRESOC')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-$id = GETPOST('socid', 'int') || GETPOST('id_fourn', 'int');
+$id = GETPOSTINT('socid') || GETPOSTINT('id_fourn');
 
 $object = new Societe($db);
 if ($id > 0) {
@@ -75,10 +75,10 @@ $return_arr = array();
 // Define filter on text typed
 $socid = GETPOST('newcompany');
 if (!$socid) {
-	$socid = GETPOST('socid', 'int');
+	$socid = GETPOSTINT('socid');
 }
 if (!$socid) {
-	$socid = GETPOST('id_fourn', 'int');
+	$socid = GETPOSTINT('id_fourn');
 }
 
 // Generate list of companies
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 19cee63dcb1..db97f1aa138 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -45,9 +45,9 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 $htmlname = GETPOST('htmlname', 'aZ09');
 $filter = GETPOST('filter', 'alpha');
-$outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
+$outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0);
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $excludeids = GETPOST('excludeids', 'intcomma');
 $showtype = GETPOSTINT('showtype', 'alpha');
 $showcode = GETPOSTINT('showcode', 'alpha');
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index f349ca32078..ef713898c70 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -110,7 +110,7 @@ if (!empty($backtopagejsfields)) {
 	$dol_openinpopup = $tmpbacktopagejsfields[0];
 }
 
-$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid = GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id');
 if ($user->socid) {
 	if (in_array($action, ['add', 'create', 'merge', 'confirm_merge', 'delete', 'confirm_delete'])) {
 		accessforbidden();
@@ -202,7 +202,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) {
-		$soc_origin_id = GETPOST('soc_origin', 'int');
+		$soc_origin_id = GETPOSTINT('soc_origin');
 		$soc_origin = new Societe($db);		// The thirdparty that we will delete
 
 		if ($soc_origin_id <= 0) {
@@ -283,21 +283,21 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('client', 'int') && GETPOST('client', 'int') < 0) {
+		if (GETPOSTINT('client') && GETPOSTINT('client') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
 			$error++;
 		}
-		if (GETPOSTISSET('fournisseur') && GETPOST('fournisseur', 'int') < 0) {
+		if (GETPOSTISSET('fournisseur') && GETPOSTINT('fournisseur') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
 			$error++;
 		}
 
-		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT('contact_no_email')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (isModEnabled('mailing') && GETPOST("private", 'int') == 1 && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && GETPOSTINT("private") == 1 && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT('contact_no_email')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
@@ -310,8 +310,8 @@ if (empty($reshook)) {
 				$object->canvas = $canvas;
 			}
 
-			if (GETPOST("private", 'int') == 1) {	// Ask to create a contact
-				$object->particulier		= GETPOST("private", 'int');
+			if (GETPOSTINT("private") == 1) {	// Ask to create a contact
+				$object->particulier		= GETPOSTINT("private");
 
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
@@ -321,14 +321,14 @@ if (empty($reshook)) {
 			} else {
 				$object->name				= GETPOST('name', 'alphanohtml');
 			}
-			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
+			$object->entity					= (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity);
 			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
-			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOST('parent_company_id', 'int') : $object->parent;
+			$object->parent					= GETPOSTISSET('parent_company_id') ? GETPOSTINT('parent_company_id') : $object->parent;
 			$object->address				= GETPOST('address', 'alphanohtml');
 			$object->zip					= GETPOST('zipcode', 'alphanohtml');
 			$object->town					= GETPOST('town', 'alphanohtml');
-			$object->country_id				= GETPOST('country_id', 'int');
-			$object->state_id				= GETPOST('state_id', 'int');
+			$object->country_id				= GETPOSTINT('country_id');
+			$object->state_id				= GETPOSTINT('state_id');
 
 			$object->socialnetworks = array();
 			if (isModEnabled('socialnetworks')) {
@@ -343,7 +343,7 @@ if (empty($reshook)) {
 			$object->phone_mobile 			= (string) GETPOST("phone_mobile", 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-			$object->no_email 				= GETPOST("no_email", "int");
+			$object->no_email 				= GETPOSTINT("no_email");
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -369,16 +369,16 @@ if (empty($reshook)) {
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-			$object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
-			$object->effectif_id			= GETPOST('effectif_id', 'int');
-			$object->typent_id				= GETPOST('typent_id', 'int');
+			$object->forme_juridique_code	= GETPOSTINT('forme_juridique_code');
+			$object->effectif_id			= GETPOSTINT('effectif_id');
+			$object->typent_id				= GETPOSTINT('typent_id');
 
 			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-			$object->client					= GETPOST('client', 'int');
-			$object->fournisseur			= GETPOST('fournisseur', 'int');
+			$object->client					= GETPOSTINT('client');
+			$object->fournisseur			= GETPOSTINT('fournisseur');
 
-			$object->commercial_id			= GETPOST('commercial_id', 'int');
+			$object->commercial_id			= GETPOSTINT('commercial_id');
 			$object->default_lang			= GETPOST('default_lang');
 
 			// Webservices url/key
@@ -406,7 +406,7 @@ if (empty($reshook)) {
 
 			// Incoterms
 			if (isModEnabled('incoterm')) {
-				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->fk_incoterms = GETPOSTINT('incoterm_id');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			}
 
@@ -457,7 +457,7 @@ if (empty($reshook)) {
 				}
 
 				// We set country_id, country_code and country for the selected country
-				$object->country_id = GETPOST('country_id', 'int') != '' ? GETPOST('country_id', 'int') : $mysoc->country_id;
+				$object->country_id = GETPOSTINT('country_id') != '' ? GETPOSTINT('country_id') : $mysoc->country_id;
 				if ($object->country_id) {
 					$tmparray = getCountry($object->country_id, 'all');
 					$object->country_code = $tmparray['code'];
@@ -495,7 +495,7 @@ if (empty($reshook)) {
 					if ($object->particulier) {
 						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
 						$contcats = GETPOST('contcats', 'array');
-						$no_email = GETPOST('contact_no_email', 'int');
+						$no_email = GETPOSTINT('contact_no_email');
 						$result = $object->create_individual($user, $no_email, $contcats);
 						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -648,7 +648,7 @@ if (empty($reshook)) {
 				if ($result > 0) {
 					// Update mass emailing flag into table mailing_unsubscribe
 					if (GETPOSTISSET('no_email') && $object->email) {
-						$no_email = GETPOST('no_email', 'int');
+						$no_email = GETPOSTINT('no_email');
 						$result = $object->setNoEmail($no_email);
 						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -800,19 +800,19 @@ if (empty($reshook)) {
 	// Set third-party type
 	if ($action == 'set_thirdpartytype' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($socid);
-		$result = $object->setThirdpartyType(GETPOST('typent_id', 'int'));
+		$result = $object->setThirdpartyType(GETPOSTINT('typent_id'));
 	}
 
 	// Set incoterm
 	if ($action == 'set_incoterms' && $user->hasRight('societe', 'creer') && isModEnabled('incoterm')) {
 		$object->fetch($socid);
-		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOSTINT('location_incoterms'));
 	}
 
 	// Set parent company
 	if ($action == 'set_thirdparty' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($socid);
-		$result = $object->setParent(GETPOST('parent_id', 'int'));
+		$result = $object->setParent(GETPOSTINT('parent_id'));
 	}
 
 	// Set sales representatives
@@ -823,7 +823,7 @@ if (empty($reshook)) {
 
 	// warehouse
 	if ($action == 'setwarehouse' && $user->hasRight('societe', 'creer')) {
-		$result = $object->setWarehouse(GETPOST('fk_warehouse', 'int'));
+		$result = $object->setWarehouse(GETPOSTINT('fk_warehouse'));
 	}
 
 	$id = $socid;
@@ -901,7 +901,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		/*
 		 *  Creation
 		 */
-		$private = GETPOST("private", "int");
+		$private = GETPOSTINT("private");
 		if (getDolGlobalString('THIRDPARTY_DEFAULT_CREATE_CONTACT') && !GETPOSTISSET('private')) {
 			$private = 1;
 		}
@@ -968,11 +968,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		$object->firstname = GETPOST('firstname', 'alphanohtml');
 		$object->particulier		= $private;
 		$object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
-		$object->client = GETPOST('client', 'int') ? GETPOST('client', 'int') : $object->client;
+		$object->client = GETPOSTINT('client') ? GETPOSTINT('client') : $object->client;
 
 		if (empty($duplicate_code_error)) {
 			$object->code_client		= GETPOST('customer_code', 'alpha');
-			$object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
+			$object->fournisseur		= GETPOST('fournisseur') ? GETPOSTINT('fournisseur') : $object->fournisseur;
 			$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
 		} else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), null, 'warnings');
@@ -981,7 +981,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		$object->address = GETPOST('address', 'alphanohtml');
 		$object->zip = GETPOST('zipcode', 'alphanohtml');
 		$object->town = GETPOST('town', 'alphanohtml');
-		$object->state_id = GETPOST('state_id', 'int');
+		$object->state_id = GETPOSTINT('state_id');
 
 		$object->socialnetworks = array();
 		if (isModEnabled('socialnetworks')) {
@@ -1005,24 +1005,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		$object->idprof4			= GETPOST('idprof4', 'alphanohtml');
 		$object->idprof5			= GETPOST('idprof5', 'alphanohtml');
 		$object->idprof6			= GETPOST('idprof6', 'alphanohtml');
-		$object->typent_id = GETPOST('typent_id', 'int');
-		$object->effectif_id		= GETPOST('effectif_id', 'int');
+		$object->typent_id = GETPOSTINT('typent_id');
+		$object->effectif_id		= GETPOSTINT('effectif_id');
 		$object->civility_id		= GETPOST('civility_id', 'alpha');
 
-		$object->tva_assuj = GETPOST('assujtva_value', 'int');
+		$object->tva_assuj = GETPOSTINT('assujtva_value');
 		$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
-		$object->status = GETPOST('status', 'int');
+		$object->status = GETPOSTINT('status');
 
 		//Local Taxes
-		$object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
-		$object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
+		$object->localtax1_assuj	= GETPOSTINT('localtax1assuj_value');
+		$object->localtax2_assuj	= GETPOSTINT('localtax2assuj_value');
 
-		$object->localtax1_value	= GETPOST('lt1', 'int');
-		$object->localtax2_value	= GETPOST('lt2', 'int');
+		$object->localtax1_value	= GETPOSTINT('lt1');
+		$object->localtax2_value	= GETPOSTINT('lt2');
 
 		$object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
 
-		$object->commercial_id = GETPOST('commercial_id', 'int');
+		$object->commercial_id = GETPOSTINT('commercial_id');
 		$object->default_lang = GETPOST('default_lang');
 
 		if (GETPOSTISSET('accountancy_code_sell')) {
@@ -1353,7 +1353,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Prospect/Customer
 			print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			$selected = (GETPOSTISSET('client') ? GETPOST('client', 'int') : $object->client);
+			$selected = (GETPOSTISSET('client') ? GETPOSTINT('client') : $object->client);
 			print $formcompany->selectProspectCustomerType($selected);
 			print '</td>';
 
@@ -1383,7 +1383,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (getDolGlobalString('THIRDPARTY_SUPPLIER_BY_DEFAULT')) {
 					$default = 1;
 				}
-				print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0), 1);
+				print $form->selectyesno("fournisseur", (GETPOSTINT('fournisseur') != '' ? GETPOSTINT('fournisseur') : (GETPOSTINT("type") == '' ? $default : $object->fournisseur)), 1, 0, (GETPOSTINT("type") == '' ? 1 : 0), 1);
 				print '</td>';
 
 
@@ -1525,7 +1525,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '<tr>';
 				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 				print '<td>';
-				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2));
+				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2));
 				print '</td>';
 				print '</tr>';
 			}
@@ -1747,7 +1747,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<td colspan="3" class="maxwidthonsmartphone">';
 			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', '0', 0, 0, 'AND u.statut = 1', 0, '', '', 0, 2);
 			// Note: If user has no right to "see all thirdparties", we force selection of sale representative to him, so after creation he can see the record.
-			$selected = (count(GETPOST('commercial', 'array')) > 0 ? GETPOST('commercial', 'array') : (GETPOST('commercial', 'int') > 0 ? array(GETPOST('commercial', 'int')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
+			$selected = (count(GETPOSTINT('commercial')) > 0 ? GETPOSTINT('commercial') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
 			print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $selected, null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print '</td></tr>';
 
@@ -1850,16 +1850,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$object->name = GETPOST('name', 'alphanohtml');
 				$object->name_alias = GETPOST('name_alias', 'alphanohtml');
 				$object->prefix_comm = GETPOST('prefix_comm', 'alphanohtml');
-				$object->client = GETPOST('client', 'int');
+				$object->client = GETPOSTINT('client');
 				$object->code_client = GETPOST('customer_code', 'alpha');
-				$object->fournisseur = GETPOST('fournisseur', 'int');
+				$object->fournisseur = GETPOSTINT('fournisseur');
 				$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
 				$object->address = GETPOST('address', 'alphanohtml');
 				$object->zip = GETPOST('zipcode', 'alphanohtml');
 				$object->town = GETPOST('town', 'alphanohtml');
-				$object->country_id = GETPOST('country_id') ? GETPOST('country_id', 'int') : $mysoc->country_id;
-				$object->state_id = GETPOST('state_id', 'int');
-				$object->parent = GETPOST('parent_company_id', 'int');
+				$object->country_id = GETPOST('country_id') ? GETPOSTINT('country_id') : $mysoc->country_id;
+				$object->state_id = GETPOSTINT('state_id');
+				$object->parent = GETPOSTINT('parent_company_id');
 
 				$object->socialnetworks = array();
 				if (isModEnabled('socialnetworks')) {
@@ -1874,7 +1874,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$object->phone_mobile			= (string) GETPOST('phone_mobile', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-				$object->no_email				= GETPOST("no_email", "int");
+				$object->no_email				= GETPOSTINT("no_email");
 				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->capital				= GETPOST('capital', 'alphanohtml');
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
@@ -1883,16 +1883,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$object->idprof4				= GETPOST('idprof4', 'alphanohtml');
 				$object->idprof5				= GETPOST('idprof5', 'alphanohtml');
 				$object->idprof6				= GETPOST('idprof6', 'alphanohtml');
-				$object->typent_id = GETPOST('typent_id', 'int');
-				$object->effectif_id = GETPOST('effectif_id', 'int');
+				$object->typent_id = GETPOSTINT('typent_id');
+				$object->effectif_id = GETPOSTINT('effectif_id');
 				$object->barcode				= GETPOST('barcode', 'alphanohtml');
-				$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+				$object->forme_juridique_code = GETPOSTINT('forme_juridique_code');
 				$object->default_lang = GETPOST('default_lang', 'alpha');
 
-				$object->tva_assuj				= GETPOST('assujtva_value', 'int');
+				$object->tva_assuj				= GETPOSTINT('assujtva_value');
 				$object->vat_reverse_charge		= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-				$object->status =				GETPOST('status', 'int');
+				$object->status =				GETPOSTINT('status');
 
 				// Webservices url/key
 				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -1919,7 +1919,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				//Incoterms
 				if (isModEnabled('incoterm')) {
-					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+					$object->fk_incoterms = GETPOSTINT('incoterm_id');
 					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
 
@@ -2267,7 +2267,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 					print '<td>';
 					$useempty = (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2);
-					print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $object->no_email), 1, false, $useempty);
+					print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : $object->no_email), 1, false, $useempty);
 					print '</td>';
 					print '</tr>';
 				}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 21303d5d907..6da2a9aa73c 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -53,10 +53,10 @@ if ($socid > 0) {
 }
 
 // Sort & Order fields
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $optioncss 	= GETPOST('optioncss', 'alpha');
 
 if (empty($page) || $page == -1) {
@@ -75,8 +75,8 @@ if (!$sortfield) {
 // Search fields
 $sref = GETPOST("sref");
 $sprod_fulldescr = GETPOST("sprod_fulldescr");
-$month = GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$month = GETPOSTINT('month');
+$year = GETPOSTINT('year');
 
 // Clean up on 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
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index e2522b534d5..3f121f52749 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -68,7 +68,7 @@ $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
 $cancel 	= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm 	= GETPOST('confirm');
-$socid 		= GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid 		= GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id');
 
 if ($user->socid) {
 	$socid = $user->socid;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 03ebec4b890..3b7c7081551 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -41,13 +41,13 @@ $langs->loadLangs(array("companies", "other"));
 // Get parameters
 $action 	= GETPOST('action', 'aZ09');
 $confirm 	= GETPOST('confirm');
-$id 		= (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id 		= (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref 		= GETPOST('ref', 'alpha');
 
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index a954f0a0426..d9dd58c3887 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -43,7 +43,7 @@ $hookmanager->initHooks(array('thirdpartiesindex'));
 
 
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -63,8 +63,8 @@ $resultboxes = FormOther::getBoxesArea($user, "3");
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'int');
-	$userid = GETPOST('userid', 'int');
+	$zone = GETPOSTINT('areacode');
+	$userid = GETPOSTINT('userid');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index b7103477be3..2ef9b22fe40 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -56,7 +56,7 @@ $langs->loadLangs(array("companies", "commercial", "customers", "suppliers", "bi
 // Get parameters
 $action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm 	= GETPOST('confirm', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartylist';
@@ -70,7 +70,7 @@ $mode = GETPOST("mode", 'alpha');
 $search_all = trim(GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
 
-$search_id = trim(GETPOST("search_id", "int"));
+$search_id = trim(GETPOSTINT("search_id"));
 $search_nom = trim(GETPOST("search_nom", 'restricthtml'));
 $search_alias = trim(GETPOST("search_alias", 'restricthtml'));
 $search_nom_only = trim(GETPOST("search_nom_only", 'restricthtml'));
@@ -96,9 +96,9 @@ $search_idprof4 = trim(GETPOST('search_idprof4', 'alpha'));
 $search_idprof5 = trim(GETPOST('search_idprof5', 'alpha'));
 $search_idprof6 = trim(GETPOST('search_idprof6', 'alpha'));
 $search_vat = trim(GETPOST('search_vat', 'alpha'));
-$search_sale = GETPOST("search_sale", 'int');
-$search_categ_cus = GETPOST("search_categ_cus", 'int');
-$search_categ_sup = GETPOST("search_categ_sup", 'int');
+$search_sale = GETPOSTINT("search_sale");
+$search_categ_cus = GETPOSTINT("search_categ_cus");
+$search_categ_sup = GETPOSTINT("search_categ_sup");
 $searchCategoryCustomerOperator = 0;
 $searchCategorySupplierOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
@@ -117,32 +117,32 @@ if (!empty($search_categ_sup) && empty($searchCategorySupplierList)) {
 	$searchCategorySupplierList = array($search_categ_sup);
 }
 $search_country = GETPOST("search_country", 'intcomma');
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$search_price_level = GETPOST('search_price_level', 'int');
-$search_staff = GETPOST("search_staff", 'int');
-$search_status = GETPOST("search_status", 'int');
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
+$search_price_level = GETPOSTINT('search_price_level');
+$search_staff = GETPOSTINT("search_staff");
+$search_status = GETPOSTINT("search_status");
 $search_type = GETPOST('search_type', 'alpha');
 $search_level = GETPOST("search_level", "array:alpha");
 $search_stcomm = GETPOST('search_stcomm', "array:int");
 $search_import_key  = trim(GETPOST("search_import_key", "alpha"));
 $search_parent_name = trim(GETPOST('search_parent_name', 'alpha'));
 
-$search_date_creation_startmonth = GETPOST('search_date_creation_startmonth', 'int');
-$search_date_creation_startyear = GETPOST('search_date_creation_startyear', 'int');
-$search_date_creation_startday = GETPOST('search_date_creation_startday', 'int');
+$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);	// Use tzserver
-$search_date_creation_endmonth = GETPOST('search_date_creation_endmonth', 'int');
-$search_date_creation_endyear = GETPOST('search_date_creation_endyear', 'int');
-$search_date_creation_endday = GETPOST('search_date_creation_endday', 'int');
+$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);	// Use tzserver
 
-$search_date_modif_startmonth = GETPOST('search_date_modif_startmonth', 'int');
-$search_date_modif_startyear = GETPOST('search_date_modif_startyear', 'int');
-$search_date_modif_startday = GETPOST('search_date_modif_startday', 'int');
+$search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth');
+$search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear');
+$search_date_modif_startday = GETPOSTINT('search_date_modif_startday');
 $search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear);	// Use tzserver
-$search_date_modif_endmonth = GETPOST('search_date_modif_endmonth', 'int');
-$search_date_modif_endyear = GETPOST('search_date_modif_endyear', 'int');
-$search_date_modif_endday = GETPOST('search_date_modif_endday', 'int');
+$search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth');
+$search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
+$search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
 
@@ -152,10 +152,10 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -320,7 +320,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -333,7 +333,7 @@ $result = restrictedArea($user, 'societe', $socid, '');
  */
 
 if ($action == "change" && $user->hasRight('takepos', 'run')) {	// Change customer for TakePOS
-	$idcustomer = GETPOST('idcustomer', 'int');
+	$idcustomer = GETPOSTINT('idcustomer');
 
 	// Check if draft invoice already exists, if not create it
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' AND entity IN (".getEntity('invoice').")";
@@ -1106,7 +1106,7 @@ if ($user->hasRight("societe", "creer")) {
 if ($user->hasRight('societe', 'supprimer')) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index 605a7fd42d8..b3846293463 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -52,10 +52,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -76,7 +76,7 @@ $object = new Societe($db);
 $hookmanager->initHooks(array('agendathirdparty', 'globalcard'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index d59ab88ada9..a80e7031c2a 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -37,7 +37,7 @@ $langs->load("companies");
 
 
 // Get parameters
-$id = GETPOST('id') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index c85afa9b9c5..e5dd3f08b31 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Noti
 
 $langs->loadLangs(array("companies", "mails", "admin", "other", "errors"));
 
-$socid     = GETPOST("socid", 'int');
+$socid     = GETPOSTINT("socid");
 $action    = GETPOST('action', 'aZ09');
 $contactid = GETPOST('contactid', 'alpha'); // May be an int or 'thirdparty'
-$actionid  = GETPOST('actionid', 'int');
+$actionid  = GETPOSTINT('actionid');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Security check
@@ -45,10 +45,10 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', '', '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -122,7 +122,7 @@ if (empty($reshook)) {
 
 	// Remove a notification
 	if ($action == 'delete') {
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOSTINT('actid');
 		$db->query($sql);
 	}
 }
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index e77854e1fcf..6af4a946941 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -52,12 +52,12 @@ $action = GETPOST("action", 'alpha', 3);
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage');
 
-$id = GETPOST("id", "int");
+$id = GETPOSTINT("id");
 $source = GETPOST("source", "alpha"); // source can be a source or a paymentmode
-$ribid = GETPOST("ribid", "int");
+$ribid = GETPOSTINT("ribid");
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -247,8 +247,8 @@ if (empty($reshook)) {
 			$companypaymentmode->number          = GETPOST('cardnumber', 'alpha');
 			$companypaymentmode->last_four       = substr(GETPOST('cardnumber', 'alpha'), -4);
 			$companypaymentmode->proprio         = GETPOST('proprio', 'alpha');
-			$companypaymentmode->exp_date_month  = GETPOST('exp_date_month', 'int');
-			$companypaymentmode->exp_date_year   = GETPOST('exp_date_year', 'int');
+			$companypaymentmode->exp_date_month  = GETPOSTINT('exp_date_month');
+			$companypaymentmode->exp_date_year   = GETPOSTINT('exp_date_year');
 			$companypaymentmode->cvn             = GETPOST('cvn', 'alpha');
 			$companypaymentmode->country_code    = $object->country_code;
 
@@ -316,7 +316,7 @@ if (empty($reshook)) {
 			$companybankaccount->owner_address   = GETPOST('owner_address', 'alpha');
 			$companybankaccount->frstrecur       = GETPOST('frstrecur', 'alpha');
 			$companybankaccount->rum             = GETPOST('rum', 'alpha');
-			$companybankaccount->date_rum        = dol_mktime(0, 0, 0, GETPOST('date_rummonth', 'int'), GETPOST('date_rumday', 'int'), GETPOST('date_rumyear', 'int'));
+			$companybankaccount->date_rum        = dol_mktime(0, 0, 0, GETPOSTINT('date_rummonth'), GETPOSTINT('date_rumday'), GETPOSTINT('date_rumyear'));
 			$companybankaccount->datec           = dol_now();
 			$companybankaccount->status          = 1;
 
@@ -406,8 +406,8 @@ if (empty($reshook)) {
 			$companypaymentmode->number          = GETPOST('cardnumber', 'alpha');
 			$companypaymentmode->last_four       = substr(GETPOST('cardnumber', 'alpha'), -4);
 			$companypaymentmode->proprio         = GETPOST('proprio', 'alpha');
-			$companypaymentmode->exp_date_month  = GETPOST('exp_date_month', 'int');
-			$companypaymentmode->exp_date_year   = GETPOST('exp_date_year', 'int');
+			$companypaymentmode->exp_date_month  = GETPOSTINT('exp_date_month');
+			$companypaymentmode->exp_date_year   = GETPOSTINT('exp_date_year');
 			$companypaymentmode->cvn             = GETPOST('cvn', 'alpha');
 			$companypaymentmode->datec           = dol_now();
 			$companypaymentmode->default_rib     = 0;
@@ -444,9 +444,9 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setasbankdefault' && GETPOST('ribid', 'int') > 0) {
+	if ($action == 'setasbankdefault' && GETPOSTINT('ribid') > 0) {
 		$companybankaccount = new CompanyBankAccount($db);
-		$res = $companybankaccount->setAsDefault(GETPOST('ribid', 'int'));
+		$res = $companybankaccount->setAsDefault(GETPOSTINT('ribid'));
 		if ($res) {
 			$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
@@ -521,8 +521,8 @@ if (empty($reshook)) {
 			'use_companybankid'=>GETPOST('companybankid'),
 			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
 		);
-		$_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid', 'int'), 'alpha');
-		$_POST['model'] = GETPOST('modelrib'.GETPOST('companybankid', 'int'), 'alpha');
+		$_POST['lang_id'] = GETPOSTINT('lang_idrib'.GETPOSTINT('companybankid'));
+		$_POST['model'] = GETPOSTINT('modelrib'.GETPOSTINT('companybankid'));
 	}
 
 	$id = $socid;
@@ -844,8 +844,8 @@ if (empty($reshook)) {
 				}
 
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-				if (GETPOST('page_y', 'int')) {
-					$url .= '&page_y='.GETPOST('page_y', 'int');
+				if (GETPOSTINT('page_y')) {
+					$url .= '&page_y='.GETPOSTINT('page_y');
 				}
 
 				header('Location: '.$url);
@@ -907,7 +907,7 @@ if ($socid && ($action == 'edit' || $action == 'editcard') && $permissiontoaddup
 		$actionforadd = 'updatecard';
 	}
 	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
-	print '<input type="hidden" name="id" value="'.GETPOST("id", "int").'">';
+	print '<input type="hidden" name="id" value="'.GETPOSTINT("id").'">';
 }
 if ($socid && ($action == 'create' || $action == 'createcard') && $permissiontoaddupdatepaymentinformation) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
@@ -2263,8 +2263,8 @@ if ($socid && $action == 'createcard' && $permissiontoaddupdatepaymentinformatio
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
 	print '<td>';
-	print $formother->select_month(GETPOST('exp_date_month', 'int'), 'exp_date_month', 1);
-	print $formother->selectyear(GETPOST('exp_date_year', 'int'), 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
+	print $formother->select_month(GETPOSTINT('exp_date_month'), 'exp_date_month', 1);
+	print $formother->selectyear(GETPOSTINT('exp_date_year'), 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("CVN").'</td>';
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index f9635e37adb..3e7302ca93f 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -55,7 +55,7 @@ $search_price 	= GETPOST('search_price');
 $search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
-$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid = GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -86,7 +86,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'add_customer_price_confirm' && !$cancel && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
-		if (!(GETPOST('prodid', 'int') > 0)) {
+		if (!(GETPOSTINT('prodid') > 0)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
 			$action = 'add_customer_price';
@@ -98,7 +98,7 @@ if (empty($reshook)) {
 			// add price by customer
 			$prodcustprice->fk_soc = $socid;
 			$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
-			$prodcustprice->fk_product = GETPOST('prodid', 'int');
+			$prodcustprice->fk_product = GETPOSTINT('prodid');
 			$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 			$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 			$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
@@ -157,7 +157,7 @@ if (empty($reshook)) {
 
 	if ($action == 'delete_customer_price' && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
 		// Delete price by customer
-		$prodcustprice->id = GETPOST('lineid', 'int');
+		$prodcustprice->id = GETPOSTINT('lineid');
 		$result = $prodcustprice->delete($user);
 
 		if ($result < 0) {
@@ -169,7 +169,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'update_customer_price_confirm' && !$cancel && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
-		$prodcustprice->fetch(GETPOST('lineid', 'int'));
+		$prodcustprice->fetch(GETPOSTINT('lineid'));
 
 		$update_child_soc = GETPOST('updatechildprice');
 
@@ -264,8 +264,8 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 	$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');
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1
@@ -345,14 +345,14 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		$text = $langs->trans('SellingPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
-		print '<input name="price" size="10" value="'.GETPOST('price', 'int').'">';
+		print '<input name="price" size="10" value="'.GETPOSTINT('price').'">';
 		print '</td></tr>';
 
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
-		print '<td><input name="price_min" size="10" value="'.GETPOST('price_min', 'int').'">';
+		print '<td><input name="price_min" size="10" value="'.GETPOSTINT('price_min').'">';
 		print '</td></tr>';
 
 		// Update all child soc
@@ -374,7 +374,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
-		$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
+		$result = $prodcustprice->fetch(GETPOSTINT('lineid'));
 
 		if ($result <= 0) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
@@ -453,7 +453,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		print '<!-- showlog_customer_price -->'."\n";
 
 		$filter = array(
-			't.fk_product' => GETPOST('prodid', 'int'),
+			't.fk_product' => GETPOSTINT('prodid'),
 			't.fk_soc' => $socid
 		);
 
@@ -468,7 +468,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			}
 		}
 
-		$option = '&socid='.GETPOST('socid', 'int').'&prodid='.GETPOST('prodid', 'int');
+		$option = '&socid='.GETPOSTINT('socid').'&prodid='.GETPOSTINT('prodid');
 
 		print_barre_liste($langs->trans('PriceByCustomerLog'), $page, $_SERVER ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index f491db5d48b..a4f490b031d 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -49,7 +49,7 @@ $toselect = GETPOST('toselect', 'array');
 
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -92,7 +92,7 @@ if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
 	$arrayofmassactions = array();
 }
 
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 7d109cfc3f4..70db93aebc8 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -38,15 +38,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $langs->loadLangs(array('companies', 'orders'));
 
 // Get parameters
-$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -82,7 +82,7 @@ if ($action == 'addcontact' && $user->hasRight('societe', 'creer')) {
 	$result = $object->fetch($id);
 
 	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
@@ -101,14 +101,14 @@ if ($action == 'addcontact' && $user->hasRight('societe', 'creer')) {
 } elseif ($action == 'swapstatut' && $user->hasRight('societe', 'creer')) {
 	// bascule du statut d'un contact
 	if ($object->fetch($id)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 	} else {
 		dol_print_error($db);
 	}
 } elseif ($action == 'deletecontact' && $user->hasRight('societe', 'creer')) {
 	// Efface un contact
 	$object->fetch($id);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
+	$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 9b7d0d44087..d7d9ae2bed2 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -43,10 +43,10 @@ $langs->loadLangs(array("companies", "website"));
 
 
 // Get parameters
-$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 
 $action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';               // The action 'add', 'create', 'edit', 'update', 'view', ...
-$show_files  = GETPOST('show_files', 'int');
+$show_files  = GETPOSTINT('show_files');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'websitelist';  // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');                                              // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ');                                                  // Option for the css output (always '' except when 'print')
@@ -54,10 +54,10 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -123,7 +123,7 @@ if ($id > 0) {
 }
 
 // Security check
-$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
 if ($user->socid) {
 	$id = $user->socid;
 }
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index ac6774d100c..d5a27ba20fb 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -93,15 +93,15 @@ if ($action == 'setvalue' && $user->admin) {
 	if (!($result > 0)) {
 		$error++;
 	}
-	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOSTINT('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
 	}
-	$result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOSTINT('STRIPE_USER_ACCOUNT_FOR_ACTIONS'), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
 	}
-	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOSTINT('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS'), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
 	}
@@ -158,7 +158,7 @@ if ($action == 'setvalue' && $user->admin) {
 }
 
 if ($action == "setlive") {
-	$liveenable = GETPOST('value', 'int');
+	$liveenable = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/stripe/ajax/ajax.php b/htdocs/stripe/ajax/ajax.php
index e6ee5b8dee7..26ff748c921 100644
--- a/htdocs/stripe/ajax/ajax.php
+++ b/htdocs/stripe/ajax/ajax.php
@@ -51,8 +51,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 $action = GETPOST('action', 'aZ09');
 $location = GETPOST('location', 'alphanohtml');
 $stripeacc = GETPOST('stripeacc', 'alphanohtml');
-$servicestatus = GETPOST('servicestatus', 'int');
-$amount = GETPOST('amount', 'int');
+$servicestatus = GETPOSTINT('servicestatus');
+$amount = GETPOSTINT('amount');
 
 if (!$user->hasRight('takepos', 'run')) {
 	accessforbidden('Not allowed to use TakePOS');
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index db7a093ffc8..4c279dd09e9 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -35,17 +35,17 @@ if (isModEnabled('accounting')) {
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index e083ca12754..c476f27b52d 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -35,17 +35,17 @@ if (isModEnabled('accounting')) {
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index f448ec37730..d44f54631a2 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -35,17 +35,17 @@ if (isModEnabled('accounting')) {
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index f9e829cac63..2500d9d00e1 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -58,26 +58,26 @@ if (isModEnabled('margin')) {
 
 $error = 0;
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 $origin = GETPOST('origin', 'alpha');
-$originid = GETPOST('originid', 'int');
+$originid = GETPOSTINT('originid');
 $confirm = GETPOST('confirm', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$contactid = GETPOST('contactid', 'int');
-$projectid = GETPOST('projectid', 'int');
-$rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$lineid = GETPOSTINT('lineid');
+$contactid = GETPOSTINT('contactid');
+$projectid = GETPOSTINT('projectid');
+$rank = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
 
 // PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+$hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Nombre de ligne pour choix de produit/service predefinis
 $NBLINES = 4;
@@ -257,7 +257,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int')));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year')));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -556,9 +556,9 @@ if (empty($reshook)) {
 			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	} elseif ($action == "setabsolutediscount" && $usercancreate) {
-		if (GETPOST("remise_id", 'int')) {
+		if (GETPOSTINT("remise_id")) {
 			if ($object->id > 0) {
-				$result = $object->insert_discount(GETPOST("remise_id", 'int'));
+				$result = $object->insert_discount(GETPOSTINT("remise_id"));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -592,7 +592,7 @@ if (empty($reshook)) {
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 		} else {
-			$idprod = GETPOST('idprod', 'int');
+			$idprod = GETPOSTINT('idprod');
 		}
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
@@ -997,11 +997,11 @@ if (empty($reshook)) {
 		}
 
 		// Check minimum price
-		$productid = GETPOST('productid', 'int');
+		$productid = GETPOSTINT('productid');
 		if (!empty($productid)) {
 			$productsupplier = new ProductFournisseur($db);
 			if (getDolGlobalString('SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY')) {
-				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), $productid, 'none', GETPOST('socid', 'int')) < 0) {
+				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), $productid, 'none', GETPOSTINT('socid')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
 			}
@@ -1035,7 +1035,7 @@ if (empty($reshook)) {
 			$fk_unit = GETPOST('units');
 
 			$result = $object->updateline(
-				GETPOST('lineid', 'int'),
+				GETPOSTINT('lineid'),
 				$ht,
 				price2num(GETPOST('qty'), 'MS', 2),
 				price2num(GETPOST('remise_percent'), '', 2),
@@ -1046,7 +1046,7 @@ if (empty($reshook)) {
 				$price_base_type,
 				$info_bits,
 				$special_code,
-				GETPOST('fk_parent_line', 'int'),
+				GETPOSTINT('fk_parent_line'),
 				0,
 				$fournprice,
 				$buyingprice,
@@ -1116,20 +1116,20 @@ if (empty($reshook)) {
 		$result = $object->availability(GETPOST('availability_id'));
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		// Terms of payments
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOSTINT('cond_reglement_id'));
 		//} elseif ($action == 'setremisepercent' && $usercancreate) {
 		//	$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent'), '', 2));
 		//} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		//	$result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU', 2));
 	} elseif ($action == 'setmode' && $usercancreate) {
 		// Payment mode
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$result = $object->setPaymentMethods(GETPOSTINT('mode_reglement_id'));
 	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object, 2);
 
@@ -1323,7 +1323,7 @@ if ($action == 'create') {
 		// Bank Account
 		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-			$form->select_comptes(GETPOST('fk_account') > 0 ? GETPOST('fk_account', 'int') : $fk_account, 'fk_account', 0, '', 1);
+			$form->select_comptes(GETPOST('fk_account') > 0 ? GETPOSTINT('fk_account') : $fk_account, 'fk_account', 0, '', 1);
 			print '</td></tr>';
 		}
 
@@ -1331,7 +1331,7 @@ if ($action == 'create') {
 		if (isModEnabled("expedition")) {
 			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
-			$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : "", 'shipping_method_id', '', 1);
+			$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOSTINT('shipping_method_id') : "", 'shipping_method_id', '', 1);
 			print '</td></tr>';
 		}
 
@@ -1540,7 +1540,7 @@ if ($action == 'create') {
 				'type' => 'other',
 				'name' => 'socid',
 				'label' => $langs->trans("SelectThirdParty"),
-				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', $filter))
+				'value' => $form->select_company(GETPOSTINT('socid'), 'socid', $filter))
 			);
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index fd853bf939e..5d59619415c 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 // Load translation files required by the page
 $langs->loadLangs(array("propal", "supplier_proposal", "facture", "orders", "sendings", "companies"));
 
-$id		= GETPOST('id', 'int');
+$id		= GETPOSTINT('id');
 $ref	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -92,14 +92,14 @@ if (empty($reshook)) {
 	} elseif ($action == 'swapstatut' && $permissiontoedit) {
 		// Toggle the status of a contact
 		if ($object->fetch($id)) {
-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+			$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'deletecontact' && $permissiontoedit) {
 		// Deleting a contact
 		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+		$result = $object->delete_contact(GETPOSTINT("lineid"));
 
 		if ($result >= 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 70c70a9bfe9..ee8a3e2a0b7 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('compta', 'supplier_proposal', 'other'));
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
-$id			= GETPOST('id', 'int');
+$id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
 // Security check
@@ -52,10 +52,10 @@ if (!empty($user->socid)) {
 $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 34bfb83eed3..21f15be1e32 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -38,7 +38,7 @@ $hookmanager->initHooks(array('suppliersproposalsindex'));
 $langs->loadLangs(array('supplier_proposal', 'companies'));
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 3dd6060f528..3f1afa83f5c 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -36,8 +36,8 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('supplier_proposal', 'compta'));
 
-$id = GETPOST('id', 'int');
-$socid = GETPOST('socid', 'int');
+$id = GETPOSTINT('id');
+$socid = GETPOSTINT('socid');
 
 // Security check
 if (!empty($user->socid)) {
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 782ceeb40df..3916568fcd1 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -49,18 +49,18 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'supplier_proposal', 'compta', 'bills', 'orders', 'products'));
 
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierproposallist';
 $mode = GETPOST('mode', 'alpha');
 
-$search_user = GETPOST('search_user', 'int');
-$search_sale = GETPOST('search_sale', 'int');
+$search_user = GETPOSTINT('search_user');
+$search_sale = GETPOSTINT('search_sale');
 $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_societe_alias = GETPOST('search_societe_alias', 'alpha');
@@ -68,24 +68,24 @@ $search_login = GETPOST('search_login', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
-$search_country = GETPOST("search_country", 'int');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_country = GETPOSTINT("search_country");
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_endday = GETPOSTINT('search_date_endday');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
-$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
-$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
-$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
-$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
-$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_startday = GETPOSTINT('search_date_valid_startday');
+$search_date_valid_startmonth = GETPOSTINT('search_date_valid_startmonth');
+$search_date_valid_startyear = GETPOSTINT('search_date_valid_startyear');
+$search_date_valid_endday = GETPOSTINT('search_date_valid_endday');
+$search_date_valid_endmonth = GETPOSTINT('search_date_valid_endmonth');
+$search_date_valid_endyear = GETPOSTINT('search_date_valid_endyear');
 $search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
-$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
 $search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
@@ -94,8 +94,8 @@ $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOST('search_status', 'int');
-$search_product_category = GETPOST('search_product_category', 'int');
+$search_status = GETPOSTINT('search_status');
+$search_product_category = GETPOSTINT('search_product_category');
 
 $object_statut = $db->escape(GETPOST('supplier_proposal_statut'));
 $search_btn = GETPOST('button_search', 'alpha');
@@ -106,10 +106,10 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all'
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 964653459f9..0a02922330e 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -36,7 +36,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('supplier_proposal', 'compta', 'bills'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index e851573cba4..543208b9c4b 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->loadLangs(array("main", "categories", "takepos", "printing"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
 $catname = GETPOST('catname', 'alpha');
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/takepos/admin/printqr.php b/htdocs/takepos/admin/printqr.php
index b5fe118e847..8d6a27faff0 100644
--- a/htdocs/takepos/admin/printqr.php
+++ b/htdocs/takepos/admin/printqr.php
@@ -31,7 +31,7 @@ if (!$user->admin) {
 
 $langs->load("cashdesk");
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 $_GET['optioncss'] = "print";
 
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index b23c851de58..469c96e90da 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
-$terminal = GETPOST('terminal', 'int');
+$terminal = GETPOSTINT('terminal');
 // If socid provided by ajax company selector
 if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY'.$terminal.'_id'])) {
 	$_GET['CASHDESK_ID_THIRDPARTY'.$terminal] = GETPOST('CASHDESK_ID_THIRDPARTY'.$terminal.'_id', 'alpha');
@@ -129,7 +129,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	}
 
 	if (GETPOSTISSET('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse)) {
-		$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') > 0 ? GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') : ''), 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOSTINT('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse) > 0 ? GETPOSTINT('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse) : ''), 'chaine', 0, '', $conf->entity);
 	}
 
 	if (GETPOSTISSET('TAKEPOS_ADDON'.$terminaltouse)) {
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 9f3856a703f..ee27b0541ba 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -46,9 +46,9 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 $category = GETPOST('category', 'alphanohtml');	// Can be id of category or 'supplements'
 $action = GETPOST('action', 'aZ09');
 $term = GETPOST('term', 'alpha');
-$id = GETPOST('id', 'int');
-$search_start = GETPOST('search_start', 'int');
-$search_limit = GETPOST('search_limit', 'int');
+$id = GETPOSTINT('id');
+$search_start = GETPOSTINT('search_start');
+$search_limit = GETPOSTINT('search_limit');
 
 if (!$user->hasRight('takepos', 'run')) {
 	accessforbidden();
@@ -68,9 +68,9 @@ $pricelevel = 1;	// default price level if PRODUIT_MULTIPRICES. TODO Get price l
 $thirdparty = new Societe($db);
 
 if ($action == 'getProducts') {
-	$tosell = GETPOSTISSET('tosell') ? GETPOST('tosell', 'int') : '';
-	$limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : 0;
-	$offset = GETPOSTISSET('offset') ? GETPOST('offset', 'int') : 0;
+	$tosell = GETPOSTISSET('tosell') ? GETPOSTINT('tosell') : '';
+	$limit = GETPOSTISSET('limit') ? GETPOSTINT('limit') : 0;
+	$offset = GETPOSTISSET('offset') ? GETPOSTINT('offset') : 0;
 
 	top_httphead('application/json');
 
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 5b064f261cb..6bb4f8ae4c2 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -41,11 +41,11 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk"));
 
-$floor = GETPOST('floor', 'int');
+$floor = GETPOSTINT('floor');
 if ($floor == "") {
 	$floor = 1;
 }
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $left = GETPOST('left', 'alpha');
 $top = GETPOST('top', 'alpha');
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 4e66b97f017..bfc26f3677c 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -51,7 +51,7 @@ $langs->loadLangs(array("bills", "cashdesk"));
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant
 
-$idline = GETPOST('idline', 'int');
+$idline = GETPOSTINT('idline');
 $action = GETPOST('action', 'aZ09');
 
 if (!$user->hasRight('takepos', 'run')) {
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 7da3994c4a5..09ce30defc5 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -41,9 +41,9 @@ if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	require '../../main.inc.php'; // Load $user and permissions
 }
 
-$id = GETPOST('id', 'int');
-$w = GETPOST('w', 'int');
-$h = GETPOST('h', 'int');
+$id = GETPOSTINT('id');
+$w = GETPOSTINT('w');
+$h = GETPOSTINT('h');
 $query = GETPOST('query', 'alpha');
 
 if (!isModEnabled('takepos')) {
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index fbf4dddcde7..f3dda5ffb83 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -51,7 +51,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant or multiple sales
 $action = GETPOST('action', 'aZ09');
-$setterminal = GETPOST('setterminal', 'int');
+$setterminal = GETPOSTINT('setterminal');
 $setcurrency = GETPOST('setcurrency', 'aZ09');
 
 $hookmanager->initHooks(array('takeposfrontend'));
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 7751f38f271..1e0faeb2b44 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -529,7 +529,7 @@ if (empty($reshook)) {
 
 		$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
 
-		$qty = GETPOSTISSET('qty') ? GETPOST('qty', 'int') : 1;
+		$qty = GETPOSTISSET('qty') ? GETPOSTINT('qty') : 1;
 		$price = $datapriceofproduct['pu_ht'];
 		$price_ttc = $datapriceofproduct['pu_ttc'];
 		//$price_min = $datapriceofproduct['price_min'];
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index e80a4a49c09..cb39394006c 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -48,7 +48,7 @@ $langs->loadLangs(array("main", "bills", "cashdesk", "banks"));
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant
 
-$invoiceid = GETPOST('invoiceid', 'int');
+$invoiceid = GETPOSTINT('invoiceid');
 
 $hookmanager->initHooks(array('takepospay'));
 
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 4f11672982e..97dde7a45bf 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -53,8 +53,8 @@ if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 }
 $action = GETPOST('action', 'aZ09');
-$setterminal = GETPOST('setterminal', 'int');
-$idproduct = GETPOST('idproduct', 'int');
+$setterminal = GETPOSTINT('setterminal');
+$idproduct = GETPOSTINT('idproduct');
 $mobilepage = GETPOST('mobilepage', 'alphanohtml');	// Set when page is loaded by a js .load()
 
 if ($setterminal > 0) {
@@ -150,8 +150,8 @@ if ($action == "productinfo") {
 		print '<br>';
 	}
 } elseif ($action == "editline") {
-	$placeid = GETPOST('placeid', 'int');
-	$selectedline = GETPOST('selectedline', 'int');
+	$placeid = GETPOSTINT('placeid');
+	$selectedline = GETPOSTINT('selectedline');
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
 	foreach ($invoice->lines as $line) {
diff --git a/htdocs/takepos/printbox.php b/htdocs/takepos/printbox.php
index 02192ba19f2..0f3ea149e8c 100644
--- a/htdocs/takepos/printbox.php
+++ b/htdocs/takepos/printbox.php
@@ -47,7 +47,7 @@ global $langs, $db;
 
 $langs->loadLangs(array("bills", "cashdesk"));
 
-$facid = GETPOST('facid', 'int');
+$facid = GETPOSTINT('facid');
 
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index f1020ad1348..df30a68acdb 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -53,10 +53,10 @@ $langs->loadLangs(array("main", "bills", "cashdesk", "companies"));
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 
-$facid = GETPOST('facid', 'int');
+$facid = GETPOSTINT('facid');
 
 $action = GETPOST('action', 'aZ09');
-$gift = GETPOST('gift', 'int');
+$gift = GETPOSTINT('gift');
 
 if (!$user->hasRight('takepos', 'run')) {
 	accessforbidden();
@@ -175,7 +175,7 @@ if (getDolGlobalString('TAKEPOS_SHOW_DATE_OF_PRINING')) {
 	<tbody>
 	<?php
 	if ($action == 'without_details') {
-		$qty = GETPOST('qty', 'int') > 0 ? GETPOST('qty', 'int') : 1;
+		$qty = GETPOSTINT('qty') > 0 ? GETPOSTINT('qty') : 1;
 		print '<tr>';
 		print '<td>' . GETPOST('label', 'alphanohtml') . '</td>';
 		print '<td class="right">' . $qty . '</td>';
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 22012b79763..2d9b3d96e6e 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 
-$invoiceid = GETPOST('invoiceid', 'int');
+$invoiceid = GETPOSTINT('invoiceid');
 
 if (!$user->hasRight('takepos', 'run')) {
 	accessforbidden();
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 8164c4bae96..708dcf713cc 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -44,7 +44,7 @@ require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-$facid = GETPOST('facid', 'int');
+$facid = GETPOSTINT('facid');
 $action = GETPOST('action', 'aZ09');
 $email = GETPOST('email', 'alpha');
 
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
index 5972e0f0367..df8342bcf38 100644
--- a/htdocs/takepos/split.php
+++ b/htdocs/takepos/split.php
@@ -57,8 +57,8 @@ if (!$user->hasRight('takepos', 'run')) {
  */
 
 if ($action=="split") {
-	$line = GETPOST('line', 'int');
-	$split = GETPOST('split', 'int');
+	$line = GETPOSTINT('line');
+	$split = GETPOSTINT('split');
 	if ($split==1) { // Split line
 		$invoice = new Facture($db);
 		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-SPLIT)');
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 8c38aa3f9d5..c8bb250ad55 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -316,7 +316,7 @@ if (!isset($conf->global->THEME_SATURATE_RATIO)) {
 	$conf->global->THEME_SATURATE_RATIO = 0.7;
 }
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-	$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+	$conf->global->THEME_SATURATE_RATIO = GETPOSTINT('THEME_SATURATE_RATIO');
 }
 
 ?>
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6c87c1c5ec1..2b894c4947e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -92,7 +92,7 @@ if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 }
 if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
-	$conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
+	$conf->global->THEME_DARKMODEENABLED = GETPOSTINT('THEME_DARKMODEENABLED'); // If darkmode was forced on URL
 }
 
 $langs->load("main", 0, 1);
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 370050732f2..d28a60a2ddd 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -22,7 +22,7 @@ if (!isset($conf->global->THEME_SATURATE_RATIO)) {
 	$conf->global->THEME_SATURATE_RATIO = 0.7;
 }
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-	$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+	$conf->global->THEME_SATURATE_RATIO = GETPOSTINT('THEME_SATURATE_RATIO');
 }
 
 ?>
@@ -417,7 +417,7 @@ if (!isset($conf->global->THEME_SATURATE_RATIO)) {
 	$conf->global->THEME_SATURATE_RATIO = 0.7;
 }
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-	$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
+	$conf->global->THEME_SATURATE_RATIO = GETPOSTINT('THEME_SATURATE_RATIO');
 }
 ?>
 .bg-infobox-project i.fa{
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 47267ab5dcd..4cdd5848e37 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -94,7 +94,7 @@ if (GETPOST('lang', 'aZ09')) {
 }
 
 if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
-	$conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
+	$conf->global->THEME_DARKMODEENABLED = GETPOSTINT('THEME_DARKMODEENABLED'); // If darkmode was forced on URL
 }
 
 $langs->load("main", 0, 1);
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index fe040dde435..ee55271a55d 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -40,19 +40,19 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array('companies', 'other', 'ticket'));
 
 // Get parameters
-$id       = GETPOST('id', 'int');
+$id       = GETPOSTINT('id');
 $ref      = GETPOST('ref', 'alpha');
 $track_id = GETPOST('track_id', 'alpha', 3);
-$socid    = GETPOST('socid', 'int');
+$socid    = GETPOSTINT('socid');
 $action   = GETPOST('action', 'aZ09');
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/agenda.php';
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
@@ -90,7 +90,7 @@ if (!$action) {
 
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -131,8 +131,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 // Set parent company
 if ($action == 'set_thirdparty' && $user->hasRight('ticket', 'write')) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
+	if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
+		$result = $object->setCustomer(GETPOSTINT('editcustomer'));
 		$url = $_SERVER["PHP_SELF"].'?track_id='.GETPOST('track_id', 'alpha');
 		header("Location: ".$url);
 		exit();
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index b8d0ec924c0..5ab6dfa2363 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -54,12 +54,12 @@ if (isModEnabled('contrat')) {
 $langs->loadLangs(array("companies", "other", "ticket"));
 
 // Get parameters
-$id        = GETPOST('id', 'int');
+$id        = GETPOSTINT('id');
 $ref       = GETPOST('ref', 'alpha');
 $track_id  = GETPOST('track_id', 'alpha', 3);
-$socid     = GETPOST('socid', 'int');
-$contactid = GETPOST('contactid', 'int');
-$projectid = GETPOST('projectid', 'int');
+$socid     = GETPOSTINT('socid');
+$contactid = GETPOSTINT('contactid');
+$projectid = GETPOSTINT('projectid');
 $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 
 $action    = GETPOST('action', 'aZ09');
@@ -229,7 +229,7 @@ if (empty($reshook)) {
 				$object->ref = $getRef;
 			}
 
-			$object->fk_soc 					= $object->socid = GETPOST("socid", 'int') > 0 ? GETPOST("socid", 'int') : 0;
+			$object->fk_soc 					= $object->socid = GETPOSTINT("socid") > 0 ? GETPOSTINT("socid") : 0;
 			$object->subject 					= GETPOST("subject", 'alphanohtml');
 			$object->message 					= GETPOST("message", 'restricthtml');
 
@@ -246,14 +246,14 @@ if (empty($reshook)) {
 			$notifyTiers 						= GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create 	= empty($notifyTiers) ? 0 : 1;
 
-			$fk_user_assign 				= GETPOST("fk_user_assign", 'int');
+			$fk_user_assign 				= GETPOSTINT("fk_user_assign");
 			if ($fk_user_assign > 0) {
 				$object->fk_user_assign 	= $fk_user_assign;
 				$object->status 			= $object::STATUS_ASSIGNED;
 			}
 
 			$object->fk_project 				= $projectid;
-			$object->fk_contract 				= GETPOST('fk_contract', 'int');
+			$object->fk_contract 				= GETPOSTINT('fk_contract');
 
 			$object->context['contact_id'] = GETPOSTINT('contact_id');
 
@@ -266,7 +266,7 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				// Add contact
-				$contactid = GETPOST('contactid', 'int');
+				$contactid = GETPOSTINT('contactid');
 				$type_contact = GETPOST("type", 'alpha');
 
 				// Category association
@@ -280,9 +280,9 @@ if (empty($reshook)) {
 
 				// Link ticket to project
 				if (GETPOST('origin', 'alpha') == 'projet') {
-					$projectid = GETPOST('originid', 'int');
+					$projectid = GETPOSTINT('originid');
 				} else {
-					$projectid = GETPOST('projectid', 'int');
+					$projectid = GETPOSTINT('projectid');
 				}
 
 				if ($projectid > 0) {
@@ -336,7 +336,7 @@ if (empty($reshook)) {
 	if ($action == 'update' && $permissiontoadd && $object->status < Ticket::STATUS_CLOSED) {
 		$error = 0;
 
-		$ret = $object->fetch(GETPOST('id', 'int'), GETPOST('ref', 'alpha'), GETPOST('track_id', 'alpha'));
+		$ret = $object->fetch(GETPOSTINT('id'), GETPOSTINT('ref'), GETPOSTINT('track_id'));
 		if ($ret < 0) {
 			$error++;
 			array_push($object->errors, $langs->trans('ErrorTicketIsNotValid'));
@@ -416,7 +416,7 @@ if (empty($reshook)) {
 	if ($action == "assign_user" && GETPOST('btn_assign_user', 'alpha') && $permissiontoadd) {
 		$object->fetch('', '', GETPOST("track_id", 'alpha'));
 		$useroriginassign = $object->fk_user_assign;
-		$usertoassign = GETPOST('fk_user_assign', 'int');
+		$usertoassign = GETPOSTINT('fk_user_assign');
 
 		/*if (! ($usertoassign > 0)) {
 		 $error++;
@@ -489,7 +489,7 @@ if (empty($reshook)) {
 	}
 
 	if (($action == "confirm_close" || $action == "confirm_abandon") && GETPOST('confirm', 'alpha') == 'yes' && $permissiontoadd) {
-		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+		$object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id'));
 
 		if ($object->close($user, ($action == "confirm_abandon" ? 1 : 0))) {
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
@@ -504,7 +504,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == "confirm_public_close" && GETPOST('confirm', 'alpha') == 'yes' && $permissiontoadd) {
-		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+		$object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id'));
 		if ($_SESSION['email_customer'] == $object->origin_email || $_SESSION['email_customer'] == $object->thirdparty->email) {
 			$object->context['contact_id'] = GETPOSTINT('contact_id');
 
@@ -522,7 +522,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_delete_ticket' && GETPOST('confirm', 'alpha') == "yes" && $permissiontodelete) {
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
 			if ($object->delete($user) > 0) {
 				setEventMessages('<div class="confirm">'.$langs->trans('TicketDeletedSuccess').'</div>', null, 'mesgs');
 				header("Location: ".DOL_URL_ROOT."/ticket/list.php");
@@ -537,8 +537,8 @@ if (empty($reshook)) {
 
 	// Set parent company
 	if ($action == 'set_thirdparty' && $user->hasRight('ticket', 'write')) {
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-			$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
+			$result = $object->setCustomer(GETPOSTINT('editcustomer'));
 			$url = $_SERVER["PHP_SELF"].'?track_id='.GETPOST('track_id', 'alpha');
 			header("Location: ".$url);
 			exit();
@@ -547,7 +547,7 @@ if (empty($reshook)) {
 
 	// Set progress status
 	if ($action == 'set_progression' && $user->hasRight('ticket', 'write')) {
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
 			$result = $object->setProgression(GETPOST('progress', 'alpha'));
 
 			$url = 'card.php?track_id='.$object->track_id;
@@ -558,7 +558,7 @@ if (empty($reshook)) {
 
 	// Set categories
 	if ($action == 'set_categories' && $user->hasRight('ticket', 'write')) {
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
 			$result = $object->setCategories(GETPOST('categories', 'array'));
 
 			$url = 'card.php?track_id='.$object->track_id;
@@ -569,7 +569,7 @@ if (empty($reshook)) {
 
 	// Set Subject
 	if ($action == 'setsubject' && $user->hasRight('ticket', 'write')) {
-		if ($object->fetch(GETPOST('id', 'int'))) {
+		if ($object->fetch(GETPOSTINT('id'))) {
 			if ($action == 'setsubject') {
 				$object->subject = GETPOST('subject', 'alphanohtml');
 			}
@@ -592,7 +592,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_reopen' && $user->hasRight('ticket', 'manage') && !GETPOST('cancel')) {
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
 			// prevent browser refresh from reopening ticket several times
 			if ($object->status == Ticket::STATUS_CLOSED || $object->status == Ticket::STATUS_CANCELED) {
 				$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
@@ -608,7 +608,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'classin' && $permissiontoadd) {
 		// Categorisation dans projet
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
 			$object->setProject($projectid);
 			$url = 'card.php?track_id='.$object->track_id;
 			header("Location: ".$url);
@@ -616,8 +616,8 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setcontract' && $permissiontoadd) {
 		// Categorisation dans contrat
-		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-			$object->setContract(GETPOST('contractid', 'int'));
+		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
+			$object->setContract(GETPOSTINT('contractid'));
 			$url = 'card.php?track_id='.$object->track_id;
 			header("Location: ".$url);
 			exit();
@@ -645,8 +645,8 @@ if (empty($reshook)) {
 		$action = 'view';
 	} elseif ($action == 'confirm_set_status' && $permissiontoadd && !GETPOST('cancel')) {
 		// Reopen ticket
-		if ($object->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) {
-			$new_status = GETPOST('new_status', 'int');
+		if ($object->fetch(GETPOSTINT('id'), GETPOSTINT('track_id')) >= 0) {
+			$new_status = GETPOSTINT('new_status');
 			//$old_status = $object->status;
 			$res = $object->setStatut($new_status);
 			if ($res) {
@@ -662,7 +662,7 @@ if (empty($reshook)) {
 
 	// Action to update an extrafield
 	if ($action == "update_extras" && $permissiontoadd) {
-		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+		$object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id'));
 
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) {
@@ -686,7 +686,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $permissiontoadd) {
-		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
+		$object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id'));
 
 		$object->type_code = GETPOST('update_value_type', 'aZ09');
 		$object->severity_code = GETPOST('update_value_severity', 'aZ09');
@@ -1557,7 +1557,7 @@ if ($action == 'create' || $action == 'presend') {
 
 			// Table of additional post parameters
 			$formticket->param['models'] = $modelmail;
-			$formticket->param['models_id'] = GETPOST('modelmailselected', 'int');
+			$formticket->param['models_id'] = GETPOSTINT('modelmailselected');
 			//$formticket->param['socid']=$object->fk_soc;
 			$formticket->param['returnurl'] = $_SERVER["PHP_SELF"].'?track_id='.$object->track_id;
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 9ffd2ea78c3..001d4b55bb7 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2620,7 +2620,7 @@ class Ticket extends CommonObject
 			$object->message = GETPOST("message", "restricthtml");
 			$object->private = GETPOST("private_message", "alpha");
 
-			$send_email = GETPOST('send_email', 'int');
+			$send_email = GETPOSTINT('send_email');
 
 			// Copy attached files (saved into $_SESSION) as linked files to ticket. Return array with final name used.
 			$resarray = $object->copyFilesForTicket();
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index a2bbe08be55..b7eb379c8b7 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -44,17 +44,17 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array('companies', 'ticket'));
 
 // Get parameters
-$socid = GETPOST("socid", 'int');
+$socid = GETPOSTINT("socid");
 $action = GETPOST("action", 'alpha');
 $track_id = GETPOST("track_id", 'alpha');
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $ref = GETPOST('ref', 'alpha');
 
 $type = GETPOST('type', 'alpha');
 $source = GETPOST('source', 'alpha');
 
-$ligne = GETPOST('ligne', 'int');
-$lineid = GETPOST('lineid', 'int');
+$ligne = GETPOSTINT('ligne');
+$lineid = GETPOSTINT('lineid');
 
 
 // Store current page url
@@ -63,7 +63,7 @@ $url_page_current = DOL_URL_ROOT.'/ticket/contact.php';
 $object = new Ticket($db);
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -89,7 +89,7 @@ if ($action == 'addcontact' && $user->hasRight('ticket', 'write')) {
 	$result = $object->fetch($id, '', $track_id);
 
 	if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$contactid = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 
 		$error = 0;
@@ -165,8 +165,8 @@ if ($action == 'deletecontact' && $user->hasRight('ticket', 'write')) {
 
 // Set parent company
 if ($action == 'set_thirdparty' && $user->hasRight('ticket', 'write')) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
+	if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
+		$result = $object->setCustomer(GETPOSTINT('editcustomer'));
 		$url = $_SERVER["PHP_SELF"].'?track_id='.GETPOST('track_id', 'alpha');
 		header("Location: ".$url);
 		exit();
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 00b848f240d..0d690214cc8 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -42,8 +42,8 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "other", "ticket", "mails"));
 
-$id       = GETPOST('id', 'int');
-$socid = GETPOST('socid', 'int');
+$id       = GETPOSTINT('id');
+$socid = GETPOSTINT('socid');
 $ref      = GETPOST('ref', 'alpha');
 $track_id = GETPOST('track_id', 'alpha');
 $action   = GETPOST('action', 'alpha');
@@ -53,10 +53,10 @@ $confirm  = GETPOST('confirm', 'alpha');
 $url_page_current = DOL_URL_ROOT.'/ticket/document.php';
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -102,8 +102,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 // Set parent company
 if ($action == 'set_thirdparty' && $user->hasRight('ticket', 'write')) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
+	if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
+		$result = $object->setCustomer(GETPOSTINT('editcustomer'));
 		$url = $_SERVER["PHP_SELF"].'?track_id='.GETPOST('track_id', 'alpha');
 		header("Location: ".$url);
 		exit();
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 7c0208936d7..14e0ab382d8 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -43,8 +43,8 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 // Get parameters
-$id = GETPOST('id', 'int');
-$msg_id = GETPOST('msg_id', 'int');
+$id = GETPOSTINT('id');
+$msg_id = GETPOSTINT('msg_id');
 
 $action = GETPOST('action', 'aZ09');
 
@@ -56,7 +56,7 @@ $userid = $user->id;
 
 $nowarray = dol_getdate(dol_now(), true);
 $nowyear = $nowarray['year'];
-$year = GETPOST('year', 'int') > 0 ? GETPOST('year', 'int') : $nowyear;
+$year = GETPOSTINT('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
@@ -103,7 +103,7 @@ $param_shownb = 'DOLUSERCOOKIE_ticket_by_status_shownb';
 $param_showtot = 'DOLUSERCOOKIE_ticket_by_status_showtot';
 $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 if (in_array('DOLUSERCOOKIE_ticket_by_status', $autosetarray)) {
-	$endyear = GETPOST($param_year, 'int');
+	$endyear = GETPOSTINT($param_year);
 	$shownb = GETPOST($param_shownb, 'alpha');
 	$showtot = GETPOST($param_showtot, 'alpha');
 } elseif (!empty($_COOKIE['DOLUSERCOOKIE_ticket_by_status'])) {
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index a451b39b058..16597f8cf8c 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -43,7 +43,7 @@ $langs->loadLangs(array("ticket", "companies", "other", "projects"));
 // Get parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -52,29 +52,29 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode = GETPOST('mode', 'alpha');
 
-$id = GETPOST('id', 'int');
-$msg_id     = GETPOST('msg_id', 'int');
-$socid      = GETPOST('socid', 'int');
-$contractid  = GETPOST('contractid', 'int');
-$projectid  = GETPOST('projectid', 'int');
+$id = GETPOSTINT('id');
+$msg_id     = GETPOSTINT('msg_id');
+$socid      = GETPOSTINT('socid');
+$contractid  = GETPOSTINT('contractid');
+$projectid  = GETPOSTINT('projectid');
 $project_ref = GETPOST('project_ref', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_fk_project = GETPOST('search_fk_project', 'int') ? GETPOST('search_fk_project', 'int') : GETPOST('projectid', 'int');
-$search_fk_contract = GETPOST('search_fk_contract', 'int') ? GETPOST('search_fk_contract', 'int') : GETPOST('contractid', 'int');
+$search_fk_project = GETPOSTINT('search_fk_project') ? GETPOSTINT('search_fk_project') : GETPOSTINT('projectid');
+$search_fk_contract = GETPOSTINT('search_fk_contract') ? GETPOSTINT('search_fk_contract') : GETPOSTINT('contractid');
 
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
-$search_dateread_start = dol_mktime(0, 0, 0, GETPOST('search_dateread_startmonth', 'int'), GETPOST('search_dateread_startday', 'int'), GETPOST('search_dateread_startyear', 'int'));
-$search_dateread_end = dol_mktime(23, 59, 59, GETPOST('search_dateread_endmonth', 'int'), GETPOST('search_dateread_endday', 'int'), GETPOST('search_dateread_endyear', 'int'));
-$search_dateclose_start = dol_mktime(0, 0, 0, GETPOST('search_dateclose_startmonth', 'int'), GETPOST('search_dateclose_startday', 'int'), GETPOST('search_dateclose_startyear', 'int'));
-$search_dateclose_end = dol_mktime(23, 59, 59, GETPOST('search_dateclose_endmonth', 'int'), GETPOST('search_dateclose_endday', 'int'), GETPOST('search_dateclose_endyear', 'int'));
+$search_date_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_startmonth'), GETPOSTINT('search_date_startday'), GETPOSTINT('search_date_startyear'));
+$search_date_end = dol_mktime(23, 59, 59, GETPOSTINT('search_date_endmonth'), GETPOSTINT('search_date_endday'), GETPOSTINT('search_date_endyear'));
+$search_dateread_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateread_startmonth'), GETPOSTINT('search_dateread_startday'), GETPOSTINT('search_dateread_startyear'));
+$search_dateread_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateread_endmonth'), GETPOSTINT('search_dateread_endday'), GETPOSTINT('search_dateread_endyear'));
+$search_dateclose_start = dol_mktime(0, 0, 0, GETPOSTINT('search_dateclose_startmonth'), GETPOSTINT('search_dateclose_startday'), GETPOSTINT('search_dateclose_startyear'));
+$search_dateclose_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateclose_endmonth'), GETPOSTINT('search_dateclose_endday'), GETPOSTINT('search_dateclose_endyear'));
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -120,8 +120,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = "";
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -658,9 +658,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -734,7 +734,7 @@ if ($permissiontoadd) {
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 7daf2518b1f..f8afb48b125 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -40,19 +40,19 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array('companies', 'other', 'ticket'));
 
 // Get parameters
-$id       = GETPOST('id', 'int');
+$id       = GETPOSTINT('id');
 $ref      = GETPOST('ref', 'alpha');
 $track_id = GETPOST('track_id', 'alpha', 3);
-$socid    = GETPOST('socid', 'int');
+$socid    = GETPOSTINT('socid');
 $action   = GETPOST('action', 'aZ09');
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/messaging.php';
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
@@ -87,7 +87,7 @@ if (!$action) {
 }
 
 // Security check
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -128,8 +128,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 // Set parent company
 if ($action == 'set_thirdparty' && $user->hasRight('ticket', 'write')) {
-	if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
-		$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
+	if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
+		$result = $object->setCustomer(GETPOSTINT('editcustomer'));
 		$url = $_SERVER["PHP_SELF"].'?track_id='.GETPOST('track_id', 'alpha');
 		header("Location: ".$url);
 		exit();
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 9351dc74a5c..f8e0c80c612 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -37,8 +37,8 @@ if (!$user->hasRight('ticket', 'read')) {
 
 $object_status = GETPOST('object_status', 'intcomma');
 
-$userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int');
+$userid = GETPOSTINT('userid');
+$socid = GETPOSTINT('socid');
 // Security check
 if ($user->socid > 0) {
 	$action = '';
@@ -46,7 +46,7 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOSTINT('year') : $nowyear;
 $startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index b159e72f297..65aa9624f1b 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 $langs->load("users");
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 if (!isset($id) || empty($id)) {
@@ -52,10 +52,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 730d2215306..50af80a987a 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -51,7 +51,7 @@ $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
 $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', 'A4A4A5');
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 if (!isset($id) || empty($id)) {
 	accessforbidden();
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index f56186d6d99..80e3d779389 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -50,9 +50,9 @@ if (isModEnabled('salaries')) {
 // Load translation files required by page
 $langs->loadLangs(array('companies', 'commercial', 'banks', 'bills', 'trips', 'holiday', 'salaries'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alphanohtml');
-$bankid = GETPOST('bankid', 'int');
+$bankid = GETPOSTINT('bankid');
 $action = GETPOST("action", 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
@@ -191,7 +191,7 @@ if ($action == 'delete_confirmed' && !$cancel && $permissiontoaddbankaccount) {
 
 // update birth
 if ($action == 'setbirth' && $canadduser && !$cancel) {
-	$object->birth = dol_mktime(0, 0, 0, GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
+	$object->birth = dol_mktime(0, 0, 0, GETPOSTINT('birthmonth'), GETPOSTINT('birthday'), GETPOSTINT('birthyear'));
 	$result = $object->update($user);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -246,7 +246,7 @@ if ($action == 'setnational_registration_number' && $canadduser && !$cancel) {
 if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 	// update default_c_exp_tax_cat
 	if ($action == 'setdefault_c_exp_tax_cat' && $canadduser) {
-		$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
+		$object->default_c_exp_tax_cat = GETPOSTINT('default_c_exp_tax_cat');
 		$result = $object->update($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -255,7 +255,7 @@ if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 	// update default range
 	if ($action == 'setdefault_range' && $canadduser) {
-		$object->default_range = GETPOST('default_range', 'int');
+		$object->default_range = GETPOSTINT('default_range');
 		$result = $object->update($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -298,7 +298,7 @@ if ($id && $bankid && $action == 'edit' && ($user->hasRight('user', 'user', 'cre
 	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" name="formbank" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
+	print '<input type="hidden" name="id" value="'.GETPOSTINT("id").'">';
 	print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 if ($id && $action == 'create' && $user->hasRight('user', 'user', 'creer')) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 1b34c59a653..afe86b1760d 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -66,7 +66,7 @@ if (isModEnabled('stock')) {
 // Load translation files required by page
 $langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks', 'other'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action		= GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
@@ -78,11 +78,11 @@ if (empty($id) && $action != 'create') {
 	$id = $user->id;
 }
 
-$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth', 'int'), GETPOST('dateemploymentday', 'int'), GETPOST('dateemploymentyear', 'int'));
-$dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int'));
-$datestartvalidity = dol_mktime(0, 0, 0, GETPOST('datestartvaliditymonth', 'int'), GETPOST('datestartvalidityday', 'int'), GETPOST('datestartvalidityyear', 'int'));
-$dateendvalidity = dol_mktime(0, 0, 0, GETPOST('dateendvaliditymonth', 'int'), GETPOST('dateendvalidityday', 'int'), GETPOST('dateendvalidityyear', 'int'));
-$dateofbirth = dol_mktime(0, 0, 0, GETPOST('dateofbirthmonth', 'int'), GETPOST('dateofbirthday', 'int'), GETPOST('dateofbirthyear', 'int'));
+$dateemployment = dol_mktime(0, 0, 0, GETPOSTINT('dateemploymentmonth'), GETPOSTINT('dateemploymentday'), GETPOSTINT('dateemploymentyear'));
+$dateemploymentend = dol_mktime(0, 0, 0, GETPOSTINT('dateemploymentendmonth'), GETPOSTINT('dateemploymentendday'), GETPOSTINT('dateemploymentendyear'));
+$datestartvalidity = dol_mktime(0, 0, 0, GETPOSTINT('datestartvaliditymonth'), GETPOSTINT('datestartvalidityday'), GETPOSTINT('datestartvalidityyear'));
+$dateendvalidity = dol_mktime(0, 0, 0, GETPOSTINT('dateendvaliditymonth'), GETPOSTINT('dateendvalidityday'), GETPOSTINT('dateendvalidityyear'));
+$dateofbirth = dol_mktime(0, 0, 0, GETPOSTINT('dateofbirthmonth'), GETPOSTINT('dateofbirthday'), GETPOSTINT('dateofbirthyear'));
 
 $childids = $user->getAllChildIds(1);	// For later, test on salary visibility
 
@@ -292,9 +292,9 @@ if (empty($reshook)) {
 			$object->note_public = GETPOST("note_public", 'restricthtml');
 			$object->note_private = GETPOST("note_private", 'restricthtml');
 			$object->ldap_sid = GETPOST("ldap_sid", 'alphanohtml');
-			$object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", 'int') : 0;
-			$object->fk_user_expense_validator = GETPOST("fk_user_expense_validator", 'int') > 0 ? GETPOST("fk_user_expense_validator", 'int') : 0;
-			$object->fk_user_holiday_validator = GETPOST("fk_user_holiday_validator", 'int') > 0 ? GETPOST("fk_user_holiday_validator", 'int') : 0;
+			$object->fk_user = GETPOSTINT("fk_user") > 0 ? GETPOSTINT("fk_user") : 0;
+			$object->fk_user_expense_validator = GETPOSTINT("fk_user_expense_validator") > 0 ? GETPOSTINT("fk_user_expense_validator") : 0;
+			$object->fk_user_holiday_validator = GETPOSTINT("fk_user_holiday_validator") > 0 ? GETPOSTINT("fk_user_holiday_validator") : 0;
 			$object->employee = GETPOST('employee', 'alphanohtml');
 
 			$object->thm = GETPOST("thm", 'alphanohtml') != '' ? GETPOST("thm", 'alphanohtml') : '';
@@ -325,9 +325,9 @@ if (empty($reshook)) {
 			}
 
 			// Set entity property
-			$entity = GETPOST('entity', 'int');
+			$entity = GETPOSTINT('entity');
 			if (isModEnabled('multicompany')) {
-				if (GETPOST('superadmin', 'int')) {
+				if (GETPOSTINT('superadmin')) {
 					$object->entity = 0;
 				} else {
 					if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
@@ -445,7 +445,7 @@ if (empty($reshook)) {
 				if (!empty($user->admin) && $user->id != $id) {
 					// admin flag can only be set/unset by an admin user and not four ourself
 					// A test is also done later when forging sql request
-					$object->admin = GETPOST("admin", "int");
+					$object->admin = GETPOSTINT("admin");
 				}
 				if ($user->admin && !$object->ldap_sid) {	// same test than on edit page
 					$object->login = GETPOST("login", 'alphanohtml');
@@ -453,8 +453,8 @@ if (empty($reshook)) {
 				$object->address = GETPOST('address', 'alphanohtml');
 				$object->zip = GETPOST('zipcode', 'alphanohtml');
 				$object->town = GETPOST('town', 'alphanohtml');
-				$object->country_id = GETPOST('country_id', 'int');
-				$object->state_id = GETPOST('state_id', 'int');
+				$object->country_id = GETPOSTINT('country_id');
+				$object->state_id = GETPOSTINT('state_id');
 				$object->office_phone = GETPOST("office_phone", 'alphanohtml');
 				$object->office_fax = GETPOST("office_fax", 'alphanohtml');
 				$object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
@@ -473,10 +473,10 @@ if (empty($reshook)) {
 				$object->signature = GETPOST("signature", 'restricthtml');
 				$object->accountancy_code = GETPOST("accountancy_code", 'alphanohtml');
 				$object->openid = GETPOST("openid", 'alphanohtml');
-				$object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", 'int') : 0;
-				$object->fk_user_expense_validator = GETPOST("fk_user_expense_validator", 'int') > 0 ? GETPOST("fk_user_expense_validator", 'int') : 0;
-				$object->fk_user_holiday_validator = GETPOST("fk_user_holiday_validator", 'int') > 0 ? GETPOST("fk_user_holiday_validator", 'int') : 0;
-				$object->employee = GETPOST('employee', 'int');
+				$object->fk_user = GETPOSTINT("fk_user") > 0 ? GETPOSTINT("fk_user") : 0;
+				$object->fk_user_expense_validator = GETPOSTINT("fk_user_expense_validator") > 0 ? GETPOSTINT("fk_user_expense_validator") : 0;
+				$object->fk_user_holiday_validator = GETPOSTINT("fk_user_holiday_validator") > 0 ? GETPOSTINT("fk_user_holiday_validator") : 0;
+				$object->employee = GETPOSTINT('employee');
 
 				$object->thm = GETPOST("thm", 'alphanohtml') != '' ? GETPOST("thm", 'alphanohtml') : '';
 				$object->thm = price2num($object->thm);
@@ -497,14 +497,14 @@ if (empty($reshook)) {
 				$object->birth = $dateofbirth;
 
 				if (isModEnabled('stock')) {
-					$object->fk_warehouse = GETPOST('fk_warehouse', 'int');
+					$object->fk_warehouse = GETPOSTINT('fk_warehouse');
 				}
 
 				$object->lang = GETPOST('default_lang', 'aZ09');
 
 				// Do we update also ->entity ?
 				if (isModEnabled('multicompany') && empty($user->entity) && !empty($user->admin)) {	// If multicompany is not enabled, we never update the entity of a user.
-					if (GETPOST('superadmin', 'int')) {
+					if (GETPOSTINT('superadmin')) {
 						$object->entity = 0;
 					} else {
 						if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
@@ -559,8 +559,8 @@ if (empty($reshook)) {
 				}
 
 				if (!$error && GETPOSTISSET('contactid')) {
-					$contactid = GETPOST('contactid', 'int');
-					$socid = GETPOST('socid', 'int');
+					$contactid = GETPOSTINT('contactid');
+					$socid = GETPOSTINT('socid');
 
 					if ($contactid > 0) {	// The 'contactid' is used inpriority over the 'socid'
 						$contact = new Contact($db);
@@ -1011,8 +1011,8 @@ if ($action == 'create' || $action == 'adduserldap') {
                             });
                     </script>';
 			}
-			$checked = (GETPOST('superadmin', 'int') ? ' checked' : '');
-			$disabled = (GETPOST('superadmin', 'int') ? '' : ' disabled');
+			$checked = (GETPOSTINT('superadmin') ? ' checked' : '');
+			$disabled = (GETPOSTINT('superadmin') ? '' : ' disabled');
 			print '<input type="checkbox" name="superadmin" id="superadmin" value="1"'.$checked.$disabled.' /> <label for="superadmin">'.$langs->trans("SuperAdministrator").'</span>';
 		}
 		print "</td></tr>\n";
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 4c3eaeea90e..12c0037573a 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 $langs->loadLangs(array('users', 'admin'));
 
 $action = (string) GETPOST('action', 'aZ09');
-$id = (int) GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
 $socid = 0;
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 566839648b6..a4198526658 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('users', 'other'));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userdoc'; // To manage different context of search
 
@@ -82,10 +82,10 @@ if ($user->id != $id && !$canreaduser) {
 }
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 5bb86512c89..37ab864ccde 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -51,14 +51,14 @@ if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 // Load translation files required by page
 $langs->loadLangs(array('users', 'other'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'groupcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$userid = GETPOST('user', 'int');
+$userid = GETPOSTINT('user');
 
 $object = new UserGroup($db);
 $extrafields = new ExtraFields($db);
@@ -222,7 +222,7 @@ if (empty($reshook)) {
 			if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 				$object->entity = 0;
 			} elseif (GETPOSTISSET("entity")) {
-				$object->entity = GETPOST("entity", "int");
+				$object->entity = GETPOSTINT("entity");
 			}
 
 			$ret = $object->update();
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 34aba0173b2..f27c1385697 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 // Load translation files required by page
 $langs->loadLangs(array('companies', 'ldap', 'users', 'admin'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 
 $socid = 0;
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index c68f55bd95c..c03b6264255 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("users"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -48,10 +48,10 @@ $search_group = GETPOST('search_group');
 $search = array();
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -235,9 +235,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -262,7 +262,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 3418e5a616a..0b4d80bcefb 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -39,11 +39,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
-$rights = GETPOST('rights', 'int');
+$rights = GETPOSTINT('rights');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'groupperms'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
@@ -317,7 +317,7 @@ if ($object->id > 0) {
 			$objMod = $modules[$obj->module];
 
 			if (GETPOSTISSET('forbreakperms_'.$obj->module)) {
-				$ishidden = GETPOST('forbreakperms_'.$obj->module, 'int');
+				$ishidden = GETPOSTINT('forbreakperms_'.$obj->module);
 			} elseif (in_array($j, $cookietohidegrouparray)) {	// If j is among list of hidden group
 				$ishidden = 1;
 			} else {
@@ -331,7 +331,7 @@ if ($object->id > 0) {
 
 				$j++;
 				if (GETPOSTISSET('forbreakperms_'.$obj->module)) {
-					$ishidden = GETPOST('forbreakperms_'.$obj->module, 'int');
+					$ishidden = GETPOSTINT('forbreakperms_'.$obj->module);
 				} elseif (in_array($j, $cookietohidegrouparray)) {	// If j is among list of hidden group
 					$ishidden = 1;
 				} else {
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index a9fdcd8ce56..57e34004faa 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -48,10 +48,10 @@ if (empty($mode)) {
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 
 
-$search_statut = GETPOST('search_statut', 'int');
+$search_statut = GETPOSTINT('search_statut');
 if ($search_statut == '' || $search_statut == '0') {
 	$search_statut = '1';
 }
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 5069059c9a2..f9aef49c949 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -63,8 +63,8 @@ $resultboxes = FormOther::getBoxesArea($user, "1");
 if (GETPOST('addbox')) {
 	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-	$zone = GETPOST('areacode', 'int');
-	$userid = GETPOST('userid', 'int');
+	$zone = GETPOSTINT('areacode');
+	$userid = GETPOSTINT('userid');
 	$boxorder = GETPOST('boxorder', 'aZ09');
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 3c2127290d2..ab95f1ad25e 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin', 'companies', 'ldap'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userldap'; // To manage different context of search
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ecc5c2a54f3..0d924c142cf 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('users', 'companies', 'hrm', 'salaries'));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -53,10 +53,10 @@ if ($user->socid > 0) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -91,8 +91,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -170,7 +170,7 @@ $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_job = GETPOST('search_job', 'alpha');
 $search_warehouse = GETPOST('search_warehouse', 'alpha');
 $search_supervisor = GETPOST('search_supervisor', 'intcomma');
-$search_categ = GETPOST("search_categ", 'int');
+$search_categ = GETPOSTINT("search_categ");
 $searchCategoryUserOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryUserOperator = GETPOSTINT('search_category_user_operator');
@@ -178,11 +178,11 @@ if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryUserOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryUserList = GETPOST('search_category_user_list', 'array');
-$catid = GETPOST('catid', 'int');
+$catid = GETPOSTINT('catid');
 if (!empty($catid) && empty($searchCategoryUserList)) {
 	$searchCategoryUserList = array($catid);
 }
-$catid = GETPOST('catid', 'int');
+$catid = GETPOSTINT('catid');
 if (!empty($catid) && empty($search_categ)) {
 	$search_categ = $catid;
 }
@@ -633,7 +633,7 @@ if ($permissiontoadd) {
 }
 //if ($permissiontodelete) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'presetsupervisor'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'presetsupervisor'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php
index ee0fd866e12..5ea25929406 100644
--- a/htdocs/user/messaging.php
+++ b/htdocs/user/messaging.php
@@ -53,10 +53,10 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index bae14744d69..dff31d91cde 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'usernote'; // To manage different context of search
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 5e5aa095c1a..5e90d52f0b2 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Noti
 // Load translation files required by page
 $langs->loadLangs(array('companies', 'mails', 'admin', 'other', 'errors'));
 
-$id = GETPOST("id", 'int');
+$id = GETPOSTINT("id");
 $ref = GETPOST('ref', 'alpha');
 
 if (!isset($id) || empty($id)) {
@@ -43,12 +43,12 @@ if (!isset($id) || empty($id)) {
 }
 
 $action = GETPOST('action', 'aZ09');
-$actionid = GETPOST('actionid', 'int');
+$actionid = GETPOSTINT('actionid');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -126,7 +126,7 @@ if ($action == 'add') {
 
 // Remove a notification
 if ($action == 'delete') {
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOSTINT("actid");
 	$db->query($sql);
 }
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 8804eabf05f..6ec1f7e3a2d 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages',
 // Defini si peux lire/modifier permissions
 $canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userihm'; // To manage different context of search
 
@@ -111,7 +111,7 @@ if (empty($reshook)) {
 			}
 
 			if (GETPOST("check_SIZE_LISTE_LIMIT") == "on") {
-				$tabparam["MAIN_SIZE_LISTE_LIMIT"] = GETPOST("MAIN_SIZE_LISTE_LIMIT", 'int');
+				$tabparam["MAIN_SIZE_LISTE_LIMIT"] = GETPOSTINT("MAIN_SIZE_LISTE_LIMIT");
 			} else {
 				$tabparam["MAIN_SIZE_LISTE_LIMIT"] = '';
 			}
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 2758204547f..93ca97dc41d 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -53,7 +53,7 @@ $username = GETPOST('username', 'alphanohtml');
 $passworduidhash = GETPOST('passworduidhash', 'alpha');
 $setnewpassword = GETPOST('setnewpassword', 'aZ09');
 
-$conf->entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : 1);
+$conf->entity = (GETPOSTINT('entity') ? GETPOSTINT('entity') : 1);
 
 // Instantiate hooks of thirdparty module only if not already define
 $hookmanager->initHooks(array('passwordforgottenpage'));
@@ -229,7 +229,7 @@ if (function_exists("imagecreatefrompng") && !$disabled) {
 }
 
 // Execute hook getPasswordForgottenPageOptions (for table)
-$parameters = array('entity' => GETPOST('entity', 'int'));
+$parameters = array('entity' => GETPOSTINT('entity'));
 $hookmanager->executeHooks('getPasswordForgottenPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks
 if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 	$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
@@ -238,7 +238,7 @@ if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 }
 
 // Execute hook getPasswordForgottenPageExtraOptions (eg for js)
-$parameters = array('entity' => GETPOST('entity', 'int'));
+$parameters = array('entity' => GETPOSTINT('entity'));
 $reshook = $hookmanager->executeHooks('getPasswordForgottenPageExtraOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
 $moreloginextracontent = $hookmanager->resPrint;
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 987c88d7c68..77ad13f1f75 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -39,11 +39,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
-$rights = GETPOST('rights', 'int');
+$rights = GETPOSTINT('rights');
 $updatedmodulename = GETPOST('updatedmodulename', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userperms'; // To manage different context of search
 
@@ -493,7 +493,7 @@ if ($result) {
 		*/
 
 		if (GETPOSTISSET('forbreakperms_'.$obj->module)) {
-			$ishidden = GETPOST('forbreakperms_'.$obj->module, 'int');
+			$ishidden = GETPOSTINT('forbreakperms_'.$obj->module);
 		} elseif (in_array($j, $cookietohidegrouparray)) {	// If j is among list of hidden group
 			$ishidden = 1;
 		} else {
@@ -517,7 +517,7 @@ if ($result) {
 
 			$j++;
 			if (GETPOSTISSET('forbreakperms_'.$obj->module)) {
-				$ishidden = GETPOST('forbreakperms_'.$obj->module, 'int');
+				$ishidden = GETPOSTINT('forbreakperms_'.$obj->module);
 			} elseif (in_array($j, $cookietohidegrouparray)) {	// If j is among list of hidden group
 				$ishidden = 1;
 			} else {
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index a59e4e62872..09300441456 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Security check
 $socid = 0;
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index b0e54d3153e..f1d13dbb02f 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 $langs->loadLangs(array("users", "companies", "admin", "website"));
 
 // Security check
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index dd1b49414c8..9d85be8cd13 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -53,7 +53,7 @@ $result = restrictedArea($user, 'variants');
 
 top_httphead('application/json');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 if (!$id) {
 	print json_encode(array(
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index 3950a262500..6d3c81d0c44 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -54,7 +54,7 @@ $result = restrictedArea($user, 'variants');
 
 top_httphead('application/json');
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 if (!$id) {
 	print json_encode(array(
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 501a209ad5f..fd58ad0b2c1 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -32,7 +32,7 @@ require 'lib/variants.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -309,7 +309,7 @@ if ($action == 'create') {
 
 		print load_fiche_titre($langs->trans("PossibleValues") . (!empty($object->lines) ? '<span class="opacitymedium colorblack paddingleft">(' . count($object->lines) . ')</span>' : ''));
 
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOSTINT('lineid')) . '" method="POST">
 		<input type="hidden" name="token" value="' . newToken() . '">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
 		<input type="hidden" name="mode" value="">
@@ -332,7 +332,7 @@ if ($action == 'create') {
 			print '<table id="tablelines" class="noborder centpercent">';
 		}
 
-		$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/variants/tpl', ($permissiontoedit ? 1 : 0));
+		$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1, '/variants/tpl', ($permissiontoedit ? 1 : 0));
 
 		if (!empty($object->lines) || ($permissiontoedit && $action != 'selectlines' && $action != 'editline')) {
 			print '</table>';
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 83449b1fccb..e34cf104d40 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.cla
 
 $langs->loadLangs(array("products", "other"));
 
-$id = GETPOST('id', 'int');
-$valueid = GETPOST('valueid', 'int');
+$id = GETPOSTINT('id');
+$valueid = GETPOSTINT('valueid');
 $ref = GETPOST('ref', 'alpha');
 $weight_impact = price2num(GETPOST('weight_impact', 'alpha'), 2);
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
@@ -47,7 +47,7 @@ $form = new Form($db);
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
+$show_files = GETPOSTINT('show_files');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $cancel = GETPOST('cancel', 'alpha');
@@ -115,8 +115,8 @@ if ($action == 'add') {
 }
 if ($action == 'create' && GETPOST('selectvariant', 'alpha')) {	// We click on select combination
 	$action = 'add';
-	$attribute_id = GETPOST('attribute', 'int');
-	$attribute_value_id = GETPOST('value', 'int');
+	$attribute_id = GETPOSTINT('attribute');
+	$attribute_value_id = GETPOSTINT('value');
 	if ($attribute_id> 0 && $attribute_value_id > 0) {
 		$feature = $attribute_id . '-' . $attribute_value_id;
 		$selectedvariant[$feature] = $feature;
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index a16e6677780..4115d3b4c8f 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("products", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -41,13 +41,13 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -83,8 +83,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 $search['nb_of_values'] = GETPOST('search_nb_of_values', 'alpha');
@@ -412,9 +412,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -439,7 +439,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 0c22ac89a53..c5b582cc254 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -133,7 +133,7 @@ $original_file = GETPOST('file', 'alphanohtml'); 	// Do not use urldecode here (
 $hashp = GETPOST('hashp', 'aZ09', 1);				// Must be read only by GET
 $modulepart = GETPOST('modulepart', 'alpha', 1);	// Must be read only by GET
 $urlsource = GETPOST('urlsource', 'alpha');
-$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity);
+$entity = (GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity);
 
 // Security check
 if (empty($modulepart) && empty($hashp)) {
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 69cc920f1c5..f12b7ee8869 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -35,7 +35,7 @@ global $conf, $db, $hookmanager, $langs, $user;
 $langs->loadLangs(array('other'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -43,7 +43,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOSTINT('lineid');
 
 // Initialize technical objects
 $object = new Target($db);
@@ -148,10 +148,10 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
+		$object->setProject(GETPOSTINT('projectid'));
 	}
 
 	// Actions to send emails
@@ -408,7 +408,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOSTINT('lineid')).'" method="POST">
 		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
@@ -426,7 +426,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+			$object->printObjectLines($action, $mysoc, null, GETPOSTINT('lineid'), 1);
 		}
 
 		// Form to add new line
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index ec84caa8e46..83deb784f41 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('other'));
 // Get Parameters
 $action      = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';    // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction  = GETPOST('massaction', 'alpha');    // The bulk action (combo box choice into lists)
-$show_files  = GETPOST('show_files', 'int');    // Show files area generated by bulk actions ?
+$show_files  = GETPOSTINT('show_files');    // Show files area generated by bulk actions ?
 $confirm     = GETPOST('confirm', 'alpha');    // Result of a confirmation
 $cancel      = GETPOST('cancel', 'alpha');    // We click on a Cancel button
 $toselect    = GETPOST('toselect', 'array');    // Array of ids of elements selected into a list
@@ -51,13 +51,13 @@ if (empty($mode)) {
 	$mode = 'modulesetup';
 }
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -95,8 +95,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -447,7 +447,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/webportal/class/html.formcardwebportal.class.php b/htdocs/webportal/class/html.formcardwebportal.class.php
index 1f4c31726ca..d0d9531436e 100644
--- a/htdocs/webportal/class/html.formcardwebportal.class.php
+++ b/htdocs/webportal/class/html.formcardwebportal.class.php
@@ -335,8 +335,8 @@ class FormCardWebPortal
 					}
 					$value = dol_mktime($timeHours, $timeMinutes, $timeSeconds, $dateMonth, $dateDay, $dateYear);
 				} elseif ($object->fields[$key]['type'] == 'duration') {
-					if (GETPOST($key . 'hour', 'int') != '' || GETPOST($key . 'min', 'int') != '') {
-						$value = 60 * 60 * GETPOST($key . 'hour', 'int') + 60 * GETPOST($key . 'min', 'int');
+					if (GETPOSTINT($key . 'hour') != '' || GETPOSTINT($key . 'min') != '') {
+						$value = 60 * 60 * GETPOSTINT($key . 'hour') + 60 * GETPOSTINT($key . 'min');
 					} else {
 						$value = '';
 					}
@@ -655,7 +655,7 @@ class FormCardWebPortal
 
 			$html .= '<div class="valuefieldcreate">';
 			if (in_array($val['type'], array('int', 'integer'))) {
-				$value = GETPOSTISSET($key) ? GETPOST($key, 'int') : $object->$key;
+				$value = GETPOSTISSET($key) ? GETPOSTINT($key) : $object->$key;
 			} elseif ($val['type'] == 'double') {
 				$value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $object->$key;
 			} elseif (preg_match('/^text/', $val['type'])) {
diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php
index 1ba917f382a..c850c424377 100644
--- a/htdocs/webportal/class/html.formlistwebportal.class.php
+++ b/htdocs/webportal/class/html.formlistwebportal.class.php
@@ -142,10 +142,10 @@ class FormListWebPortal
 		// set form list
 		$this->action = GETPOST('action', 'aZ09');
 		$this->object = $object;
-		$this->limit = GETPOSTISSET('limit') ? (int) GETPOST('limit', 'int') : -1;
+		$this->limit = GETPOSTISSET('limit') ? GETPOSTINT('limit') : -1;
 		$this->sortfield = GETPOST('sortfield', 'aZ09comma');
 		$this->sortorder = GETPOST('sortorder', 'aZ09comma');
-		$this->page = GETPOSTISSET('page') ? (int) GETPOST('page', 'int') : 1;
+		$this->page = GETPOSTISSET('page') ? GETPOSTINT('page') : 1;
 		$this->titleKey = $objectclass . 'ListTitle';
 
 		// Initialize array of search criteria
@@ -303,7 +303,7 @@ class FormListWebPortal
 		$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 		if ($object->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (" . getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)) . ")";
+			$sql .= " WHERE t.entity IN (" . getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)) . ")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
@@ -413,9 +413,9 @@ class FormListWebPortal
 					}
 				}
 			} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-				$param .= '&search_' . $key . 'month=' . ((int) GETPOST('search_' . $key . 'month', 'int'));
-				$param .= '&search_' . $key . 'day=' . ((int) GETPOST('search_' . $key . 'day', 'int'));
-				$param .= '&search_' . $key . 'year=' . ((int) GETPOST('search_' . $key . 'year', 'int'));
+				$param .= '&search_' . $key . 'month=' . (GETPOSTINT('search_' . $key . 'month'));
+				$param .= '&search_' . $key . 'day=' . (GETPOSTINT('search_' . $key . 'day'));
+				$param .= '&search_' . $key . 'year=' . (GETPOSTINT('search_' . $key . 'year'));
 			} elseif ($search[$key] != '') {
 				$param .= '&search_' . $key . '=' . urlencode($search[$key]);
 			}
diff --git a/htdocs/webportal/controllers/document.controller.class.php b/htdocs/webportal/controllers/document.controller.class.php
index 9f5cd408867..d09b4dc5fb2 100644
--- a/htdocs/webportal/controllers/document.controller.class.php
+++ b/htdocs/webportal/controllers/document.controller.class.php
@@ -89,8 +89,8 @@ class DocumentController extends Controller
 		$action = GETPOST('action', 'aZ09');
 		$original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).
 		$modulepart = GETPOST('modulepart', 'alpha');
-		$entity = GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity;
-		$socId = (int) GETPOST('soc_id', 'int');
+		$entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
+		$socId = GETPOSTINT('soc_id');
 
 		// Security check
 		if (empty($modulepart)) {
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0cf1abe101e..d55b81d1151 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -62,10 +62,10 @@ if (!$user->hasRight('website', 'read')) {
 $conf->dol_hide_leftmenu = 1; // Force hide of left menu.
 
 $error = 0;
-$websiteid = GETPOST('websiteid', 'int');
+$websiteid = GETPOSTINT('websiteid');
 $websitekey = GETPOST('website', 'alpha');
 $page = GETPOST('page', 'alpha');
-$pageid = GETPOST('pageid', 'int');
+$pageid = GETPOSTINT('pageid');
 $pageref = GETPOST('pageref', 'alphanohtml');
 
 $action = GETPOST('action', 'aZ09');
@@ -76,8 +76,8 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'websitelist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
-$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int');
+$dol_hide_topmenu = GETPOSTINT('dol_hide_topmenu');
+$dol_hide_leftmenu = GETPOSTINT('dol_hide_leftmenu');
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
 $type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
@@ -142,10 +142,10 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -342,8 +342,8 @@ if ($action == 'replacesite' || $mode == 'replacesite') {
 	$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
 	$langcode = GETPOST('optionlanguage', 'aZ09');
 	$otherfilters = array();
-	if (GETPOST('optioncategory', 'int') > 0) {
-		$otherfilters['category'] = GETPOST('optioncategory', 'int');
+	if (GETPOSTINT('optioncategory') > 0) {
+		$otherfilters['category'] = GETPOSTINT('optioncategory');
 	}
 
 	$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters, -1);
@@ -430,36 +430,36 @@ if ($action == 'renamefile') {	// Must be after include DOL_DOCUMENT_ROOT.'/core
 if ($action == 'setwebsiteonline' && $usercanedit) {
 	$website->setStatut($website::STATUS_VALIDATED, null, '', 'WEBSITE_MODIFY', 'status');
 
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('websitepage', 'int'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('websitepage'));
 	exit;
 }
 if ($action == 'setwebsiteoffline' && $usercanedit) {
 	$result = $website->setStatut($website::STATUS_DRAFT, null, '', 'WEBSITE_MODIFY', 'status');
 
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('websitepage', 'int'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('websitepage'));
 	exit;
 }
 if ($action == 'seteditinline') {	// No need of write permission
 	dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 1);
 	setEventMessages($langs->trans("FeatureNotYetAvailable"), null, 'warnings');
 	//dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 0); // Force disable of 'Include dynamic content'
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 if ($action == 'unseteditinline') {	// No need of write permission
 	dolibarr_del_const($db, 'WEBSITE_EDITINLINE');
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 if ($action == 'setshowsubcontainers') {	// No need of write permission
 	dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1);
 	//dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 0); // Force disable of edit inline
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 if ($action == 'unsetshowsubcontainers') {	// No need of write permission
 	dolibarr_del_const($db, 'WEBSITE_SUBCONTAINERSINLINE');
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 
@@ -505,7 +505,7 @@ if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $us
 
 	$db->begin();
 
-	$categoryid = GETPOST('setcategory', 'int');
+	$categoryid = GETPOSTINT('setcategory');
 	if ($categoryid > 0) {
 		$tmpwebsitepage = new WebsitePage($db);
 		$category = new Categorie($db);
@@ -544,7 +544,7 @@ if ($massaction == 'delcategory' && GETPOST('confirmmassaction', 'alpha') && $us
 
 	$db->begin();
 
-	$categoryid = GETPOST('setcategory', 'int');
+	$categoryid = GETPOSTINT('setcategory');
 	if ($categoryid > 0) {
 		$tmpwebsitepage = new WebsitePage($db);
 		$category = new Categorie($db);
@@ -648,8 +648,8 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && $userca
 		$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
 		$langcode = GETPOST('optionlanguage', 'aZ09');
 		$otherfilters = array();
-		if (GETPOST('optioncategory', 'int') > 0) {
-			$otherfilters['category'] = GETPOST('optioncategory', 'int');
+		if (GETPOSTINT('optioncategory') > 0) {
+			$otherfilters['category'] = GETPOSTINT('optioncategory');
 		}
 
 		// Now we reload list
@@ -1152,7 +1152,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 		$substitutionarray['__WEBSITE_CREATE_BY__'] = $user->getFullName($langs);
 
 		// Define id of page the new page is translation of
-		$pageidfortranslation = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
+		$pageidfortranslation = (GETPOSTINT('pageidfortranslation') > 0 ? GETPOSTINT('pageidfortranslation') : 0);
 		if ($pageidfortranslation > 0) {
 			// Check if the page we are translation of is already a translation of a source page. if yes, we will use source id instead
 			$objectpagetmp = new WebsitePage($db);
@@ -1353,7 +1353,7 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes' && $permissiontodelete)
 
 	$db->begin();
 
-	$res = $object->fetch(GETPOST('id', 'int'));
+	$res = $object->fetch(GETPOSTINT('id'));
 	$website = $object;
 
 	if ($res > 0) {
@@ -1468,8 +1468,8 @@ if (!GETPOSTISSET('pageid')) {
 		$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
 		$langcode = GETPOST('optionlanguage', 'aZ09');
 		$otherfilters = array();
-		if (GETPOST('optioncategory', 'int') > 0) {
-			$otherfilters['category'] = GETPOST('optioncategory', 'int');
+		if (GETPOSTINT('optioncategory') > 0) {
+			$otherfilters['category'] = GETPOSTINT('optioncategory');
 		}
 
 		$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters);
@@ -2009,12 +2009,12 @@ if ($action == 'updatemeta' && $usercanedit) {
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
 		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
-		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
+		$objectpage->fk_page = (GETPOSTINT('pageidfortranslation') > 0 ? GETPOSTINT('pageidfortranslation') : 0);
 		$objectpage->author_alias = trim(GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml'));
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS', 'alpha');
 		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
 
-		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
+		$newdatecreation = dol_mktime(GETPOSTINT('datecreationhour'), GETPOSTINT('datecreationmin'), GETPOSTINT('datecreationsec'), GETPOSTINT('datecreationmonth'), GETPOSTINT('datecreationday'), GETPOSTINT('datecreationyear'));
 		if ($newdatecreation) {
 			$objectpage->date_creation = $newdatecreation;
 		}
@@ -2168,7 +2168,7 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 		$db->begin();
 
 		$objectnew = new Website($db);
-		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ''));
+		$result = $objectnew->createFromClone($user, GETPOSTINT('id'), GETPOSTINT('siteref'), (GETPOSTINT('newlang') ? GETPOSTINT('newlang') : ''));
 
 		if ($result < 0) {
 			$error++;
@@ -2195,7 +2195,7 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 				setEventMessages($langs->trans("LanguageMustNotBeSameThanClonedPage"), null, 'errors');
 				$action = 'preview';
 			}
-			if (GETPOST('newwebsite', 'int') != $object->id) {
+			if (GETPOSTINT('newwebsite') != $object->id) {
 				$error++;
 				setEventMessages($langs->trans("WebsiteMustBeSameThanClonedPageIfTranslation"), null, 'errors');
 				$action = 'preview';
@@ -2205,7 +2205,7 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 		if (!$error) {
 			$db->begin();
 
-			$newwebsiteid = GETPOST('newwebsite', 'int');
+			$newwebsiteid = GETPOSTINT('newwebsite');
 			$pathofwebsitenew = $pathofwebsite;
 
 			$tmpwebsite = new Website($db);
@@ -4751,7 +4751,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
 			if ($permissiontodelete) {
 				$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 			}
-			if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+			if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 				$arrayofmassactions = array();
 			}
 
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 313dfd2c438..e6f78442c1e 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -15,10 +15,10 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOSTINT('entity') ? GETPOSTINT('entity') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
-$limit = GETPOST('limit', 'int');
+$limit = GETPOSTINT('limit');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 48123970e20..6194a540789 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php';
 $langs->loadLangs(array("website", "other"));
 
 // Get parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index 4825fc196b4..c5c998aef4f 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -37,7 +37,7 @@ global $conf, $db, $hookmanager, $langs, $user;
 $langs->loadLangs(array('mrp', 'other'));
 
 // Get parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -56,10 +56,10 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 3e5791f0108..0dc3d05c6d5 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -38,7 +38,7 @@ global $conf, $db, $hookmanager, $langs, $user;
 $langs->loadLangs(array('mrp', 'other'));
 
 // Get parameters
-$id          = GETPOST('id', 'int');
+$id          = GETPOSTINT('id');
 $ref         = GETPOST('ref', 'alpha');
 $action      = GETPOST('action', 'aZ09');
 $confirm     = GETPOST('confirm', 'alpha');
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index 5dba65f6776..2c5f77c6173 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -40,14 +40,14 @@ $langs->loadLangs(array('companies', 'mails', 'other', 'mrp'));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index f573f6d1a27..1e6b89f4937 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('mrp', 'other'));
 
 $action      = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction  = GETPOST('massaction', 'alpha');                                   // The bulk action (combo box choice into lists)
-$show_files  = GETPOST('show_files', 'int');                                    // Show files area generated by bulk actions ?
+$show_files  = GETPOSTINT('show_files');                                    // Show files area generated by bulk actions ?
 $confirm     = GETPOST('confirm', 'alpha');                                    // Result of a confirmation
 $cancel      = GETPOST('cancel', 'alpha');                                    // We click on a Cancel button
 $toselect    = GETPOST('toselect', 'array');                                 // Array of ids of elements selected into a list
@@ -47,14 +47,14 @@ $backtopage  = GETPOST('backtopage', 'alpha');
 $optioncss   = GETPOST('optioncss', 'aZ');                                                      // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 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;
@@ -93,8 +93,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -255,7 +255,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -400,9 +400,9 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
-		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
-		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
@@ -424,7 +424,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index 8f16aca5b3f..f2be1c32504 100644
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -35,7 +35,7 @@ global $conf, $db, $hookmanager, $langs, $user;
 $langs->loadLangs(array('mrp', 'companies'));
 
 // Get parameters
-$id         = GETPOST('id', 'int');
+$id         = GETPOSTINT('id');
 $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');

From c0a4c049a42bac3307160a89d0cf1d10107ebed0 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 27 Feb 2024 14:06:30 +0100
Subject: [PATCH 0251/1862] Fix php warning (#28442)

* Fix php warning

* Fix blank line
---
 ...nterface_20_modWorkflow_WorkflowManager.class.php | 12 ++++++++++--
 .../expedition/class/expeditionlinebatch.class.php   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index e2602d2afb9..945ece57a4b 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -398,7 +398,11 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 								}
 
 								foreach ($shipping->lines as $shippingline) {
-									$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
+									if (isset($qtyshipped[$shippingline->fk_product])) {
+										$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
+									} else {
+										$qtyshipped[$shippingline->fk_product] = $shippingline->qty;
+									}
 								}
 							}
 						}
@@ -411,7 +415,11 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $orderline->product_type > 0) {
 								continue;
 							}
-							$qtyordred[$orderline->fk_product] += $orderline->qty;
+							if (isset($qtyordred[$shippingline->fk_product])) {
+								$qtyordred[$orderline->fk_product] += $orderline->qty;
+							} else {
+								$qtyordred[$orderline->fk_product] = $orderline->qty;
+							}
 						}
 					}
 					//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
diff --git a/htdocs/expedition/class/expeditionlinebatch.class.php b/htdocs/expedition/class/expeditionlinebatch.class.php
index 032ab9aff34..9bd94895f31 100644
--- a/htdocs/expedition/class/expeditionlinebatch.class.php
+++ b/htdocs/expedition/class/expeditionlinebatch.class.php
@@ -226,8 +226,8 @@ class ExpeditionLineBatch extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$tmp = new self($this->db);
-				$tmp->sellby = $this->db->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
-				$tmp->eatby = $this->db->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
+				$tmp->sellby = $this->db->jdate(($fk_product > 0 && $obj->sellby) ? $obj->sellby : $obj->oldsellby);
+				$tmp->eatby = $this->db->jdate(($fk_product > 0 && $obj->eatby) ? $obj->eatby : $obj->oldeatby);
 				$tmp->batch = $obj->batch;
 				$tmp->id = $obj->rowid;
 				$tmp->fk_origin_stock = $obj->fk_origin_stock;

From 65da16f0de0e65efcb68922de1bf6f4a9daecb55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:06:45 +0100
Subject: [PATCH 0252/1862] fix phpstan (#28455)

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6782fbc31a3..50d22620a20 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2022  Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018       Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018       Christophe Battarel     <christophe@altairis.fr>
  * Copyright (C) 2018       Josep Lluis Amador      <joseplluis@lliuretic.cat>
@@ -2465,7 +2465,7 @@ class Form
 	 *										            'warehouseclosed' = count products from closed warehouses,
 	 *										            'warehouseinternal' = count products from warehouses for internal correct/transfer only
 	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
-	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @param		int 		$nooutput				No print if 1, return the output into a string
 	 *  @param		int			$status_purchase		Purchase status: -1=No filter on purchase status, 0=Products not on purchase, 1=Products on purchase
 	 *  @return		void|string
 	 */

From a351bc05e5619bd5db1c0a181ca2e1e4d5cdd864 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:08:07 +0100
Subject: [PATCH 0253/1862] New: Phan Plugin (with fixer) for
 GETPOST->GETPOSTINT (#28447)

* New: Phan Plugin (with fixer) for GETPOST->GETPOSTINT

# New: Phan Plugin (with fixer) for GETPOST->GETPOSTINT

This detects GETPOST calls with second parameter 'int' and can
convert to GETPOSTINT

* New: Fixer for deprecated module names
---
 dev/tools/phan/config_fixer.php               |  31 +++++
 .../plugins/DeprecatedModuleNameFixer.php     | 126 ++++++++++++++++++
 dev/tools/phan/plugins/GetPostFixerPlugin.php |  98 ++++++++++++++
 .../plugins/GetPostFixerPlugin/fixers.php     | 123 +++++++++++++++++
 4 files changed, 378 insertions(+)
 create mode 100644 dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
 create mode 100644 dev/tools/phan/plugins/GetPostFixerPlugin.php
 create mode 100644 dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php

diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index d5607844f26..841495e2a53 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -4,6 +4,30 @@
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
 define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
 define('PHAN_DIR', __DIR__);
+
+$DEPRECATED_MODULE_MAPPING = array(
+	'actioncomm' => 'agenda',
+	'adherent' => 'member',
+	'adherent_type' => 'member_type',
+	'banque' => 'bank',
+	'categorie' => 'category',
+	'commande' => 'order',
+	'contrat' => 'contract',
+	'entrepot' => 'stock',
+	'expedition' => 'delivery_note',
+	'facture' => 'invoice',
+	'ficheinter' => 'intervention',
+	'product_fournisseur_price' => 'productsupplierprice',
+	'product_price' => 'productprice',
+	'projet'  => 'project',
+	'propale' => 'propal',
+	'socpeople' => 'contact',
+);
+
+$deprecatedModuleNameRegex = '/^(?!(?:'.implode('|', array_keys($DEPRECATED_MODULE_MAPPING)).')$).*/';
+
+require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
+
 /**
  * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
@@ -71,6 +95,8 @@ return [
 		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
 		// Included as stub (did not seem properly analysed by phan without it)
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		//.'|htdocs/[^c][^o][^r][^e][^/].*'  // For testing @phpstan-ignore-line
+		//.'|htdocs/[^h].*' // For testing on restricted set @phpstan-ignore-line
 		.')@',  // @phpstan-ignore-line
 
 	// A list of plugin files to execute.
@@ -82,9 +108,14 @@ return [
 	//
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
+	'ParamMatchRegexPlugin' => [
+		'/^isModEnabled$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
+	],
 	'plugins' => [
+		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
 		//'DeprecateAliasPlugin',
 		// __DIR__.'/plugins/NoVarDumpPlugin.php',
+		__DIR__.'/plugins/GetPostFixerPlugin.php',
 		//'PHPDocToRealTypesPlugin',
 
 	/*
diff --git a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
new file mode 100644
index 00000000000..19caf46d95d
--- /dev/null
+++ b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
@@ -0,0 +1,126 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+
+declare(strict_types=1);
+
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+
+/**
+ * Implements --automatic-fix for GetPostFixerPlugin
+ *
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+		$DEPRECATED_MODULE_MAPPING = array(
+		'actioncomm' => 'agenda',
+		'adherent' => 'member',
+		'adherent_type' => 'member_type',
+		'banque' => 'bank',
+		'categorie' => 'category',
+		'commande' => 'order',
+		'contrat' => 'contract',
+		'entrepot' => 'stock',
+		'expedition' => 'delivery_note',
+		'facture' => 'invoice',
+		'ficheinter' => 'intervention',
+		'product_fournisseur_price' => 'productsupplierprice',
+		'product_price' => 'productprice',
+		'projet'  => 'project',
+		'propale' => 'propal',
+		'socpeople' => 'contact',
+		);
+
+		$line = $instance->getLine();
+		$expected_name = 'isModEnabled';
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) != 1) {
+				print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				print "Type$i: ".get_class($argument).PHP_EOL;
+			}
+
+			$arg1 = $arguments[0];
+
+			if ($arg1 instanceof ArgumentExpression && $arg1->expression instanceof StringLiteral) {
+				// Get the string value of the StringLiteral
+				$stringValue = $arg1->expression->getStringContentsText();
+			} else {
+				print "Expression is not string ".get_class($arg1)."/".get_class($arg1->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+			print "Fixture elem on $line - $actual_name('$stringValue') - $instance".PHP_EOL;
+
+			// Check that module is deprecated
+			if (isset($DEPRECATED_MODULE_MAPPING[$stringValue])) {
+				$replacement = $DEPRECATED_MODULE_MAPPING[$stringValue];
+			} else {
+				print "Module is not deprecated in $expected_name - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			// Get the first argument (delimiter)
+			$moduleargument = $arguments[0];
+
+			$arg_start_pos = $moduleargument->getStartPosition() + 1;
+			$arg_end_pos = $moduleargument->getEndPosition() - 1;
+
+			// Remove deprecated module name
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'DeprecatedModuleName',
+		$fix
+	);
+});
diff --git a/dev/tools/phan/plugins/GetPostFixerPlugin.php b/dev/tools/phan/plugins/GetPostFixerPlugin.php
new file mode 100644
index 00000000000..4953bf34943
--- /dev/null
+++ b/dev/tools/phan/plugins/GetPostFixerPlugin.php
@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+
+use ast\Node;
+use Phan\CodeBase;
+use Phan\Language\Context;
+use Phan\AST\UnionTypeVisitor;
+//use Phan\Language\Element\FunctionInterface;
+use Phan\Language\UnionType;
+use Phan\Language\Type;
+use Phan\PluginV3;
+use Phan\PluginV3\AnalyzeFunctionCallCapability;
+use Phan\Language\Element\FunctionInterface;
+use Phan\Config;
+
+/*
+ *    'GetPostFixerPlugin' => [ '\\Foo::bar', '\\Baz::bing' ],
+ *    'plugins' => [
+ *    	__DIR__.'plugins/GetPostFixerPlugin.php',
+ *    	[...]
+ *    ]
+ */
+
+/**
+ * Prints out call sites of given functions or methods.
+ */
+final class GetPostFixerPlugin extends PluginV3 implements AnalyzeFunctionCallCapability
+{
+	/**
+	 * @param CodeBase $code_base Code base
+	 *
+	 * @return array
+	 */
+	public function getAnalyzeFunctionCallClosures(CodeBase $code_base): array
+	{
+		static $function_call_closures;
+
+		if ($function_call_closures === null) {
+			$function_call_closures = [];
+			$self = $this;
+			$func = 'GETPOST';
+			$function_call_closures[$func]
+				= static function (CodeBase $code_base, Context $context, FunctionInterface $function, array $args, ?Node $node = null) use ($self, $func) {
+					self::handleCall($code_base, $context, $node, $function, $args, $func, $self);
+				};
+		}
+		return $function_call_closures;
+	}
+
+	/**
+	 * @param CodeBase $code_base  Code base
+	 * @param Context $context Context
+	 * @param ?Node $node Node
+	 * @param FunctionInterface $function  Visited function information
+	 * @param array $args Arguments to the function
+	 * @param string $func_to_analyze Name of the function to analyze (as we defined it)
+	 * @param GetPostFixerPlugin $self This visitor
+	 *
+	 * @return void
+	 */
+	private static function handleCall(CodeBase $code_base, Context $context, ?Node $node, FunctionInterface $function, array $args, string $func_to_analyze, $self): void
+	{
+		$expr = $args[1] ?? null;
+		if ($expr === null) {
+			return;
+		}
+		try {
+			$expr_type = UnionTypeVisitor::unionTypeFromNode($code_base, $context, $expr, false);
+		} catch (Exception $_) {
+			return;
+		}
+
+		$expr_value = $expr_type->getRealUnionType()->asValueOrNullOrSelf();
+		if (!is_string($expr_value)) {
+			return;
+		}
+		if ($expr_value !== 'int') {
+			return;
+		}
+
+		$self->emitIssue(
+			$code_base,
+			$context,
+			'GetPostShouldBeGetPostInt',
+			'Convert {FUNCTION} to {FUNCTION}',
+			[(string) $function->getFQSEN(), "GETPOSTINT"]
+		);
+	}
+}
+
+if (Config::isIssueFixingPluginEnabled()) {
+	require_once __DIR__ . '/GetPostFixerPlugin/fixers.php';
+}
+
+return new GetPostFixerPlugin();
diff --git a/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php b/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
new file mode 100644
index 00000000000..662a553eb62
--- /dev/null
+++ b/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
+
+declare(strict_types=1);
+
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+
+/**
+ * Implements --automatic-fix for GetPostFixerPlugin
+ *
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+		$line = $instance->getLine();
+		$new_name = (string) $instance->getTemplateParameters()[1];
+		if ($new_name !== "GETPOSTINT") {
+			return null;
+		}
+
+		$function_repr = (string) $instance->getTemplateParameters()[0];
+		if (!preg_match('{\\\\(\w+)}', $function_repr, $match)) {
+			return null;
+		}
+		$expected_name = $match[1];
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) != 3) {
+				print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				print "Type$i: ".get_class($argument).PHP_EOL;
+			}
+
+			$arg2 = $arguments[2];
+
+			if ($arg2 instanceof ArgumentExpression && $arg2->expression instanceof StringLiteral) {
+				// Get the string value of the StringLiteral
+				$stringValue = $arg2->expression->getStringContentsText();
+			} else {
+				print "Expression is not string ".get_class($arg2)."/".get_class($arg2->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+			print "Fixture elem on $line - $new_name - $function_repr - arg: $stringValue".PHP_EOL;
+
+			// Get the first argument (delimiter)
+			$delimiter = $arguments[1];
+			// Get the second argument
+			$secondArgument = $arguments[2];
+
+			// Get the start position of the delimiter
+			$arg_start_pos = $delimiter->getStartPosition();
+
+			// Get the end position of the second argument
+			$arg_end_pos = $secondArgument->getEndPosition();
+
+
+
+			// @phan-suppress-next-line PhanThrowTypeAbsentForCall
+			$start = $callableExpression->getStartPosition();
+			// @phan-suppress-next-line PhanThrowTypeAbsentForCall
+			$end = $callableExpression->getEndPosition();
+
+			// Remove second argument
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, "");
+
+			// Replace call with GETPOSTINT
+			$edits[] = new FileEdit($start, $end, (($file_contents[$start] ?? '') === '\\' ? '\\' : '') . $new_name);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'GetPostShouldBeGetPostInt',
+		$fix
+	);
+});

From a03c64ff4049782fab98cd86541f8c0786018634 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:29:44 +0100
Subject: [PATCH 0254/1862] Fix: Replace deprecated module tests embedded in
 strings (#28459)

---
 .../core/modules/mailings/fraise.modules.php  |   2 +-
 htdocs/core/modules/modAgenda.class.php       | 358 +++++++++---------
 htdocs/core/modules/modCategorie.class.php    | 226 +++++------
 .../class/conferenceorboothattendee.class.php |  48 +--
 .../class/fournisseur.commande.class.php      | 100 ++---
 .../class/fournisseur.facture-rec.class.php   |  90 ++---
 .../fourn/class/fournisseur.facture.class.php |   2 +-
 .../canvas/company/tpl/card_view.tpl.php      |   2 +-
 .../canvas/individual/tpl/card_view.tpl.php   |   2 +-
 htdocs/societe/class/societe.class.php        | 200 +++++-----
 htdocs/webservices/admin/index.php            |   6 +-
 11 files changed, 518 insertions(+), 518 deletions(-)

diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 59e82deddc2..1547ce1d866 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -41,7 +41,7 @@ class mailing_fraise extends MailingTargets
 
 	public $require_module = array('adherent');
 
-	public $enabled = 'isModEnabled("adherent")';
+	public $enabled = 'isModEnabled("member")';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 86fca2796c1..82c372f8249 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -107,15 +107,15 @@ class modAgenda extends DolibarrModules
 		// Boxes
 		//------
 		$this->boxes = array(
-			0=>array('file'=>'box_actions.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_actions_future.php', 'enabledbydefaulton'=>'Home')
+			0 => array('file' => 'box_actions.php', 'enabledbydefaulton' => 'Home'),
+			1 => array('file' => 'box_actions_future.php', 'enabledbydefaulton' => 'Home')
 		);
 
 		// Cronjobs
 		//------------
 		$datestart = dol_now();
 		$this->cronjobs = array(
-			0=>array('label'=>'SendEmailsReminders', 'jobtype'=>'method', 'class'=>'comm/action/class/actioncomm.class.php', 'objectname'=>'ActionComm', 'method'=>'sendEmailsReminder', 'parameters'=>'', 'comment'=>'SendEMailsReminder', 'frequency'=>5, 'unitfrequency'=>60, 'priority'=>10, 'status'=>1, 'test'=>'isModEnabled("agenda")', 'datestart'=>$datestart),
+			0 => array('label' => 'SendEmailsReminders', 'jobtype' => 'method', 'class' => 'comm/action/class/actioncomm.class.php', 'objectname' => 'ActionComm', 'method' => 'sendEmailsReminder', 'parameters' => '', 'comment' => 'SendEMailsReminder', 'frequency' => 5, 'unitfrequency' => 60, 'priority' => 10, 'status' => 1, 'test' => 'isModEnabled("agenda")', 'datestart' => $datestart),
 		);
 
 		// Permissions
@@ -205,206 +205,206 @@ class modAgenda extends DolibarrModules
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>0,
-			'type'=>'top',
-			'titre'=>'TMenuAgenda',
+			'fk_menu' => 0,
+			'type' => 'top',
+			'titre' => 'TMenuAgenda',
 			'prefix' => img_picto('', $this->picto, 'class="pictofixedwidth"'),
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php',
-			'langs'=>'agenda',
-			'position'=>86,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read") || $user->hasRight("resource", "read")',
-			'enabled'=>'isModEnabled("agenda") || isModEnabled("resource")',
-			'target'=>'',
-			'user'=>2,
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php',
+			'langs' => 'agenda',
+			'position' => 86,
+			'perms' => '$user->hasRight("agenda", "myactions", "read") || $user->hasRight("resource", "read")',
+			'enabled' => 'isModEnabled("agenda") || isModEnabled("resource")',
+			'target' => '',
+			'user' => 2,
 		);
 		$r++;
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=0',
-			'type'=>'left',
-			'titre'=>'Actions',
+			'fk_menu' => 'r=0',
+			'type' => 'left',
+			'titre' => 'Actions',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda',
-			'langs'=>'agenda',
-			'position'=>100,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2,
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda',
+			'langs' => 'agenda',
+			'position' => 100,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2,
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=1',
-			'type'=>'left',
-			'titre'=>'NewAction',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create',
-			'langs'=>'commercial',
-			'position'=>101,
-			'perms'=>'($user->hasRight("agenda", "myactions", "create") || $user->hasRight("agenda", "allactions", "create"))',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=1',
+			'type' => 'left',
+			'titre' => 'NewAction',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create',
+			'langs' => 'commercial',
+			'position' => 101,
+			'perms' => '($user->hasRight("agenda", "myactions", "create") || $user->hasRight("agenda", "allactions", "create"))',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		// Calendar
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=1',
-			'type'=>'left',
-			'titre'=>'Calendar',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda',
-			'langs'=>'agenda',
-			'position'=>140,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=1',
+			'type' => 'left',
+			'titre' => 'Calendar',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda',
+			'langs' => 'agenda',
+			'position' => 140,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=3',
-			'type'=>'left',
-			'titre'=>'MenuToDoMyActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
-			'langs'=>'agenda',
-			'position'=>141,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=3',
+			'type' => 'left',
+			'titre' => 'MenuToDoMyActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
+			'langs' => 'agenda',
+			'position' => 141,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=3',
-			'type'=>'left',
-			'titre'=>'MenuDoneMyActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
-			'langs'=>'agenda',
-			'position'=>142,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=3',
+			'type' => 'left',
+			'titre' => 'MenuDoneMyActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
+			'langs' => 'agenda',
+			'position' => 142,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=3',
-			'type'=>'left',
-			'titre'=>'MenuToDoActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
-			'langs'=>'agenda',
-			'position'=>143,
-			'perms'=>'$user->hasRight("agenda", "allactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=3',
+			'type' => 'left',
+			'titre' => 'MenuToDoActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
+			'langs' => 'agenda',
+			'position' => 143,
+			'perms' => '$user->hasRight("agenda", "allactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=3',
-			'type'=>'left',
-			'titre'=>'MenuDoneActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
-			'langs'=>'agenda',
-			'position'=>144,
-			'perms'=>'$user->hasRight("agenda", "allactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=3',
+			'type' => 'left',
+			'titre' => 'MenuDoneActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
+			'langs' => 'agenda',
+			'position' => 144,
+			'perms' => '$user->hasRight("agenda", "allactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 
 		// List
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=1',
-			'type'=>'left',
-			'titre'=>'List',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda',
-			'langs'=>'agenda',
-			'position'=>110,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=1',
+			'type' => 'left',
+			'titre' => 'List',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda',
+			'langs' => 'agenda',
+			'position' => 110,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=8',
-			'type'=>'left',
-			'titre'=>'MenuToDoMyActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
-			'langs'=>'agenda',
-			'position'=>111,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=8',
+			'type' => 'left',
+			'titre' => 'MenuToDoMyActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
+			'langs' => 'agenda',
+			'position' => 111,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=8',
-			'type'=>'left',
-			'titre'=>'MenuDoneMyActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
-			'langs'=>'agenda',
-			'position'=>112,
-			'perms'=>'$user->hasRight("agenda", "myactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=8',
+			'type' => 'left',
+			'titre' => 'MenuDoneMyActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
+			'langs' => 'agenda',
+			'position' => 112,
+			'perms' => '$user->hasRight("agenda", "myactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=8',
-			'type'=>'left',
-			'titre'=>'MenuToDoActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
-			'langs'=>'agenda',
-			'position'=>113,
-			'perms'=>'$user->hasRight("agenda", "allactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=8',
+			'type' => 'left',
+			'titre' => 'MenuToDoActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
+			'langs' => 'agenda',
+			'position' => 113,
+			'perms' => '$user->hasRight("agenda", "allactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=8',
-			'type'=>'left',
-			'titre'=>'MenuDoneActions',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
-			'langs'=>'agenda',
-			'position'=>114,
-			'perms'=>'$user->hasRight("agenda", "allactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=8',
+			'type' => 'left',
+			'titre' => 'MenuDoneActions',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
+			'langs' => 'agenda',
+			'position' => 114,
+			'perms' => '$user->hasRight("agenda", "allactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		// Reports
 		$this->menu[$r] = array(
-			'fk_menu'=>'r=1',
-			'type'=>'left',
-			'titre'=>'Reportings',
-			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda',
-			'langs'=>'agenda',
-			'position'=>160,
-			'perms'=>'$user->hasRight("agenda", "allactions", "read")',
-			'enabled'=>'isModEnabled("agenda")',
-			'target'=>'',
-			'user'=>2
+			'fk_menu' => 'r=1',
+			'type' => 'left',
+			'titre' => 'Reportings',
+			'mainmenu' => 'agenda',
+			'url' => '/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda',
+			'langs' => 'agenda',
+			'position' => 160,
+			'perms' => '$user->hasRight("agenda", "allactions", "read")',
+			'enabled' => 'isModEnabled("agenda")',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 		// Categories
@@ -413,11 +413,11 @@ class modAgenda extends DolibarrModules
 			'type' => 'left',
 			'titre' => 'Categories',
 			'mainmenu' => 'agenda',
-			'url'=>'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10',
+			'url' => '/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10',
 			'langs' => 'agenda',
 			'position' => 170,
 			'perms' => '$user->hasRight("agenda", "allactions", "read")',
-			'enabled' => 'isModEnabled("categorie")',
+			'enabled' => 'isModEnabled("category")',
 			'target' => '',
 			'user' => 2
 		);
@@ -432,13 +432,13 @@ class modAgenda extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = "ExportDataset_event1";
 		$this->export_permission[$r] = array(array("agenda", "export"));
-		$this->export_fields_array[$r] = array('ac.id'=>"IdAgenda", 'ac.ref_ext'=>"ExternalRef",'ac.ref'=>"Ref", 'ac.datec'=>"DateCreation", 'ac.datep'=>"DateActionBegin",
-			'ac.datep2'=>"DateActionEnd", 'ac.location' => 'Location', 'ac.label'=>"Title", 'ac.note'=>"Note", 'ac.percent'=>"Percentage", 'ac.durationp'=>"Duration",
-			'ac.fk_user_author'=>'CreatedById', 'ac.fk_user_action'=>'ActionsOwnedBy', 'ac.fk_user_mod'=>'ModifiedBy', 'ac.transparency'=>"Transparency", 'ac.priority'=>"Priority", 'ac.fk_element'=>"ElementID", 'ac.elementtype'=>"ElementType",
-			'cac.libelle'=>"ActionType", 'cac.code'=>"Code",
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town',
-			'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6',
-			's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
+		$this->export_fields_array[$r] = array('ac.id' => "IdAgenda", 'ac.ref_ext' => "ExternalRef",'ac.ref' => "Ref", 'ac.datec' => "DateCreation", 'ac.datep' => "DateActionBegin",
+			'ac.datep2' => "DateActionEnd", 'ac.location' => 'Location', 'ac.label' => "Title", 'ac.note' => "Note", 'ac.percent' => "Percentage", 'ac.durationp' => "Duration",
+			'ac.fk_user_author' => 'CreatedById', 'ac.fk_user_action' => 'ActionsOwnedBy', 'ac.fk_user_mod' => 'ModifiedBy', 'ac.transparency' => "Transparency", 'ac.priority' => "Priority", 'ac.fk_element' => "ElementID", 'ac.elementtype' => "ElementType",
+			'cac.libelle' => "ActionType", 'cac.code' => "Code",
+			's.rowid' => "IdCompany", 's.nom' => 'CompanyName', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town',
+			'co.code' => 'CountryCode', 's.phone' => 'Phone', 's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 's.idprof5' => 'ProfId5', 's.idprof6' => 'ProfId6',
+			's.code_compta' => 'CustomerAccountancyCode', 's.code_compta_fournisseur' => 'SupplierAccountancyCode', 's.tva_intra' => 'VATIntra',
 			'p.ref' => 'ProjectRef',
 		);
 		// Add multicompany field
@@ -448,21 +448,21 @@ class modAgenda extends DolibarrModules
 				$this->export_fields_array[$r]['ac.entity'] = 'Entity';
 			}
 		}
-		$this->export_TypeFields_array[$r] = array('ac.ref_ext'=>"Text", 'ac.ref'=>"Text", 'ac.datec'=>"Date", 'ac.datep'=>"Date",
-			'ac.datep2'=>"Date", 'ac.location' => 'Text', 'ac.label'=>"Text", 'ac.note'=>"Text", 'ac.percent'=>"Numeric",
-			'ac.durationp'=>"Duree",'ac.fk_user_author'=>'Numeric', 'ac.fk_user_action'=>'Numeric', 'ac.fk_user_mod'=>'Numeric', 'ac.transparency'=>"Numeric", 'ac.priority'=>"Numeric", 'ac.fk_element'=>"Numeric", 'ac.elementtype'=>"Text",
-			'cac.libelle'=>"List:c_actioncomm:libelle:libelle", 'cac.code'=>"Text",
-			'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', 's.idprof5'=>'Text', 's.idprof6'=>'Text',
-			's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
-			'p.ref' => 'Text', 'ac.entity'=>'List:entity:label:rowid'
+		$this->export_TypeFields_array[$r] = array('ac.ref_ext' => "Text", 'ac.ref' => "Text", 'ac.datec' => "Date", 'ac.datep' => "Date",
+			'ac.datep2' => "Date", 'ac.location' => 'Text', 'ac.label' => "Text", 'ac.note' => "Text", 'ac.percent' => "Numeric",
+			'ac.durationp' => "Duree",'ac.fk_user_author' => 'Numeric', 'ac.fk_user_action' => 'Numeric', 'ac.fk_user_mod' => 'Numeric', 'ac.transparency' => "Numeric", 'ac.priority' => "Numeric", 'ac.fk_element' => "Numeric", 'ac.elementtype' => "Text",
+			'cac.libelle' => "List:c_actioncomm:libelle:libelle", 'cac.code' => "Text",
+			'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', 's.idprof5' => 'Text', 's.idprof6' => 'Text',
+			's.code_compta' => 'Text', 's.code_compta_fournisseur' => 'Text', 's.tva_intra' => 'Text',
+			'p.ref' => 'Text', 'ac.entity' => 'List:entity:label:rowid'
 
 		);
-		$this->export_entities_array[$r] = array('ac.id'=>"action", 'ac.ref_ext'=>"action", 'ac.ref'=>"action", 'ac.datec'=>"action", 'ac.datep'=>"action",
-			'ac.datep2'=>"action", 'ac.location' => 'action', 'ac.label'=>"action", 'ac.note'=>"action", 'ac.percent'=>"action", 'ac.durationp'=>"action",'ac.fk_user_author'=>'user', 'ac.fk_user_action'=>'user', 'ac.fk_user_mod'=>'user', 'ac.transparency'=>"action", 'ac.priority'=>"action", 'ac.fk_element'=>"action", 'ac.elementtype'=>"action",
-			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company',
-			'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company',
-			's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company',
+		$this->export_entities_array[$r] = array('ac.id' => "action", 'ac.ref_ext' => "action", 'ac.ref' => "action", 'ac.datec' => "action", 'ac.datep' => "action",
+			'ac.datep2' => "action", 'ac.location' => 'action', 'ac.label' => "action", 'ac.note' => "action", 'ac.percent' => "action", 'ac.durationp' => "action",'ac.fk_user_author' => 'user', 'ac.fk_user_action' => 'user', 'ac.fk_user_mod' => 'user', 'ac.transparency' => "action", 'ac.priority' => "action", 'ac.fk_element' => "action", 'ac.elementtype' => "action",
+			's.rowid' => "company", 's.nom' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company',
+			'co.code' => 'company', 's.phone' => 'company', 's.siren' => 'company', 's.siret' => 'company', 's.ape' => 'company', 's.idprof4' => 'company', 's.idprof5' => 'company', 's.idprof6' => 'company',
+			's.code_compta' => 'company', 's.code_compta_fournisseur' => 'company', 's.tva_intra' => 'company',
 			'p.ref' => 'project',
 		);
 
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 43c92e4810c..20aced509b9 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -165,10 +165,10 @@ class modCategorie extends DolibarrModules
 		}
 
 		// Definition of vars
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel", 'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification");
-		$this->export_TypeFields_array[$r] = array('cat.rowid'=>'Numeric', 'cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text');
+		$this->export_fields_array[$r] = array('cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.type' => "Type", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategoryID", 'pcat.label' => "ParentCategoryLabel", 'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification");
+		$this->export_TypeFields_array[$r] = array('cat.rowid' => 'Numeric', 'cat.label' => "Text", 'cat.type' => "Numeric", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text');
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another picto
-		$this->export_help_array[$r] = array('cat.type'=>$typeexample);
+		$this->export_help_array[$r] = array('cat.type' => $typeexample);
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
@@ -182,9 +182,9 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("product") || isModEnabled("service")';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("produit", "export"));
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel", 'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref', 'p.label'=>'Label');
-		$this->export_TypeFields_array[$r] = array('cat.rowid'=>'Numeric', 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.label'=>'Text');
-		$this->export_entities_array[$r] = array('p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'); // We define here only fields that use another picto
+		$this->export_fields_array[$r] = array('cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategoryID", 'pcat.label' => "ParentCategoryLabel", 'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification", 'p.rowid' => 'ProductId', 'p.ref' => 'Ref', 'p.label' => 'Label');
+		$this->export_TypeFields_array[$r] = array('cat.rowid' => 'Numeric', 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text', 'p.rowid' => 'Numeric', 'p.ref' => 'Text', 'p.label' => 'Text');
+		$this->export_entities_array[$r] = array('p.rowid' => 'product', 'p.ref' => 'product', 'p.label' => 'product'); // We define here only fields that use another picto
 
 		$keyforselect = 'product';
 		$keyforelement = 'product';
@@ -208,28 +208,28 @@ class modCategorie extends DolibarrModules
 		$this->export_enabled[$r] = 'isModEnabled("supplier_order") || isModEnabled("supplier_invoice")';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("fournisseur", "lire"));
 		$this->export_fields_array[$r] = array(
-			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel",
-			'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification",
-			's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix", 's.fournisseur'=>"Supplier", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_fournisseur'=>"SupplierCode",
-			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode",
-			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
-			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital", 's.note_public'=>"NotePublic",
-			't.libelle'=>'ThirdPartyType'
+			'cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategoryID", 'pcat.label' => "ParentCategoryLabel",
+			'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification",
+			's.rowid' => 'IdThirdParty', 's.nom' => 'Name', 's.prefix_comm' => "Prefix", 's.fournisseur' => "Supplier", 's.datec' => "DateCreation", 's.tms' => "DateLastModification", 's.code_fournisseur' => "SupplierCode",
+			's.address' => "Address", 's.zip' => "Zip", 's.town' => "Town", 'c.label' => "Country", 'c.code' => "CountryCode",
+			's.phone' => "Phone", 's.fax' => "Fax", 's.url' => "Url", 's.email' => "Email",
+			's.siret' => "ProfId1", 's.siren' => "ProfId2", 's.ape' => "ProfId3", 's.idprof4' => "ProfId4", 's.tva_intra' => "VATIntraShort", 's.capital' => "Capital", 's.note_public' => "NotePublic",
+			't.libelle' => 'ThirdPartyType'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'cat.rowid'=>'Numeric', 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text',
-			's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.fournisseur'=>"Text", 's.datec'=>"Date", 's.tms'=>"Date", 's.code_fournisseur'=>"Text",
-			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
-			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text",
-			's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text",
-			't.libelle'=>'List:c_typent:libelle:code'
+			'cat.rowid' => 'Numeric', 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text',
+			's.rowid' => 'List:societe:nom', 's.nom' => 'Text', 's.prefix_comm' => "Text", 's.fournisseur' => "Text", 's.datec' => "Date", 's.tms' => "Date", 's.code_fournisseur' => "Text",
+			's.address' => "Text", 's.zip' => "Text", 's.town' => "Text", 'c.label' => "List:c_country:label:label", 'c.code' => "Text",
+			's.phone' => "Text", 's.fax' => "Text", 's.url' => "Text", 's.email' => "Text",
+			's.siret' => "Text", 's.siren' => "Text", 's.ape' => "Text", 's.idprof4' => "Text", 's.tva_intra' => "Text", 's.capital' => "Numeric", 's.note_public' => "Text",
+			't.libelle' => 'List:c_typent:libelle:code'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.fournisseur'=>"company", 's.datec'=>"company", 's.tms'=>"company", 's.code_fournisseur'=>"company",
-			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
-			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company",
-			's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company", 's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company",
-			't.libelle'=>'company'
+			's.rowid' => 'company', 's.nom' => 'company', 's.prefix_comm' => "company", 's.fournisseur' => "company", 's.datec' => "company", 's.tms' => "company", 's.code_fournisseur' => "company",
+			's.address' => "company", 's.zip' => "company", 's.town' => "company", 'c.label' => "company", 'c.code' => "company",
+			's.phone' => "company", 's.fax' => "company", 's.url' => "company", 's.email' => "company",
+			's.siret' => "company", 's.siren' => "company", 's.ape' => "company", 's.idprof4' => "company", 's.tva_intra' => "company", 's.capital' => "company", 's.note_public' => "company",
+			't.libelle' => 'company'
 		); // We define here only fields that use another picto
 
 		$keyforselect = 'societe';
@@ -256,28 +256,28 @@ class modCategorie extends DolibarrModules
 		$this->export_enabled[$r] = 'isModEnabled("societe")';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "export"));
 		$this->export_fields_array[$r] = array(
-			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel",
-			'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification",
-			's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix", 's.client'=>"Customer", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_client'=>"CustomerCode",
-			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode",
-			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
-			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital", 's.note_public'=>"NotePublic",
-			't.libelle'=>'ThirdPartyType', 'pl.code'=>'ProspectLevel', 'st.code'=>'ProspectStatus'
+			'cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategoryID", 'pcat.label' => "ParentCategoryLabel",
+			'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification",
+			's.rowid' => 'IdThirdParty', 's.nom' => 'Name', 's.prefix_comm' => "Prefix", 's.client' => "Customer", 's.datec' => "DateCreation", 's.tms' => "DateLastModification", 's.code_client' => "CustomerCode",
+			's.address' => "Address", 's.zip' => "Zip", 's.town' => "Town", 'c.label' => "Country", 'c.code' => "CountryCode",
+			's.phone' => "Phone", 's.fax' => "Fax", 's.url' => "Url", 's.email' => "Email",
+			's.siret' => "ProfId1", 's.siren' => "ProfId2", 's.ape' => "ProfId3", 's.idprof4' => "ProfId4", 's.tva_intra' => "VATIntraShort", 's.capital' => "Capital", 's.note_public' => "NotePublic",
+			't.libelle' => 'ThirdPartyType', 'pl.code' => 'ProspectLevel', 'st.code' => 'ProspectStatus'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'cat.rowid'=>'Numeric', 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text',
-			's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.client'=>"Text", 's.datec'=>"Date", 's.tms'=>"Date", 's.code_client'=>"Text",
-			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
-			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text",
-			's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text",
-			't.libelle'=>'List:c_typent:libelle:code', 'pl.code'=>'List:c_prospectlevel:label:code', 'st.code'=>'List:c_stcomm:libelle:code'
+			'cat.rowid' => 'Numeric', 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text',
+			's.rowid' => 'List:societe:nom', 's.nom' => 'Text', 's.prefix_comm' => "Text", 's.client' => "Text", 's.datec' => "Date", 's.tms' => "Date", 's.code_client' => "Text",
+			's.address' => "Text", 's.zip' => "Text", 's.town' => "Text", 'c.label' => "List:c_country:label:label", 'c.code' => "Text",
+			's.phone' => "Text", 's.fax' => "Text", 's.url' => "Text", 's.email' => "Text",
+			's.siret' => "Text", 's.siren' => "Text", 's.ape' => "Text", 's.idprof4' => "Text", 's.tva_intra' => "Text", 's.capital' => "Numeric", 's.note_public' => "Text",
+			't.libelle' => 'List:c_typent:libelle:code', 'pl.code' => 'List:c_prospectlevel:label:code', 'st.code' => 'List:c_stcomm:libelle:code'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.client'=>"company", 's.datec'=>"company", 's.tms'=>"company", 's.code_client'=>"company",
-			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
-			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company",
-			's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company", 's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company",
-			't.libelle'=>'company', 'pl.code'=>'company', 'st.code'=>'company'
+			's.rowid' => 'company', 's.nom' => 'company', 's.prefix_comm' => "company", 's.client' => "company", 's.datec' => "company", 's.tms' => "company", 's.code_client' => "company",
+			's.address' => "company", 's.zip' => "company", 's.town' => "company", 'c.label' => "company", 'c.code' => "company",
+			's.phone' => "company", 's.fax' => "company", 's.url' => "company", 's.email' => "company",
+			's.siret' => "company", 's.siren' => "company", 's.ape' => "company", 's.idprof4' => "company", 's.tva_intra' => "company", 's.capital' => "company", 's.note_public' => "company",
+			't.libelle' => 'company', 'pl.code' => 'company', 'st.code' => 'company'
 		); // We define here only fields that use another picto
 
 		$keyforselect = 'societe';
@@ -303,11 +303,11 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
 		$this->export_label[$r] = 'CatMemberList';
 		$this->export_icon[$r] = $this->picto;
-		$this->export_enabled[$r] = 'isModEnabled("adherent")';
+		$this->export_enabled[$r] = 'isModEnabled("member")';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("adherent", "export"));
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r] = array('cat.rowid'=>"Numeric", 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
-		$this->export_entities_array[$r] = array('p.rowid'=>'member', 'p.lastname'=>'member', 'p.firstname'=>'member'); // We define here only fields that use another picto
+		$this->export_fields_array[$r] = array('cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategoryID", 'pcat.label' => "ParentCategoryLabel", 'p.rowid' => 'MemberId', 'p.lastname' => 'LastName', 'p.firstname' => 'Firstname');
+		$this->export_TypeFields_array[$r] = array('cat.rowid' => "Numeric", 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text', 'p.lastname' => 'Text', 'p.firstname' => 'Text');
+		$this->export_entities_array[$r] = array('p.rowid' => 'member', 'p.lastname' => 'member', 'p.firstname' => 'member'); // We define here only fields that use another picto
 
 		$keyforselect = 'adherent';
 		$keyforelement = 'member';
@@ -331,27 +331,27 @@ class modCategorie extends DolibarrModules
 		$this->export_enabled[$r] = 'isModEnabled("societe")';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "contact", "export"));
 		$this->export_fields_array[$r] = array(
-			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel",
-			'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification",
+			'cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategoryID", 'pcat.label' => "ParentCategoryLabel",
+			'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification",
 			'p.rowid' => 'ContactId', 'civ.label' => 'UserTitle', 'p.lastname' => 'LastName', 'p.firstname' => 'Firstname',
 			'p.address' => 'Address', 'p.zip' => 'Zip', 'p.town' => 'Town', 'c.code' => 'CountryCode', 'c.label' => 'Country',
 			'p.birthday' => 'DateOfBirth', 'p.poste' => 'PostOrFunction',
 			'p.phone' => 'Phone', 'p.phone_perso' => 'PhonePerso', 'p.phone_mobile' => 'PhoneMobile', 'p.fax' => 'Fax', 'p.email' => 'Email',
 			'p.note_private' => 'NotePrivate', 'p.note_public' => 'NotePublic', 'p.statut' => 'Status',
-			's.nom'=>"Name", 's.client'=>"Customer", 's.fournisseur'=>"Supplier", 's.status'=>"Status",
-			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town",
-			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email"
+			's.nom' => "Name", 's.client' => "Customer", 's.fournisseur' => "Supplier", 's.status' => "Status",
+			's.address' => "Address", 's.zip' => "Zip", 's.town' => "Town",
+			's.phone' => "Phone", 's.fax' => "Fax", 's.url' => "Url", 's.email' => "Email"
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'cat.rowid'=>'Numeric', 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text',
-			'civ.label' => 'List:c_civility:label:label', 'p.rowid'=>'Numeric', 'p.lastname' => 'Text', 'p.firstname' => 'Text',
+			'cat.rowid' => 'Numeric', 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text',
+			'civ.label' => 'List:c_civility:label:label', 'p.rowid' => 'Numeric', 'p.lastname' => 'Text', 'p.firstname' => 'Text',
 			'p.address' => 'Text', 'p.zip' => 'Text', 'p.town' => 'Text', 'c.code' => 'Text', 'c.label' => 'List:c_country:label:label',
 			'p.birthday' => 'Date', 'p.poste' => 'Text',
 			'p.phone' => 'Text', 'p.phone_perso' => 'Text', 'p.phone_mobile' => 'Text', 'p.fax' => 'Text', 'p.email' => 'Text',
 			'p.note_private' => 'Text', 'p.note_public' => 'Text', 'p.statut' => 'Boolean',
-			's.nom'=>"Text", 's.client'=>"Boolean", 's.fournisseur'=>"Boolean", 's.status'=>"Boolean",
-			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text",
-			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text"
+			's.nom' => "Text", 's.client' => "Boolean", 's.fournisseur' => "Boolean", 's.status' => "Boolean",
+			's.address' => "Text", 's.zip' => "Text", 's.town' => "Text",
+			's.phone' => "Text", 's.fax' => "Text", 's.url' => "Text", 's.email' => "Text"
 		);
 		$this->export_entities_array[$r] = array(
 			'p.rowid' => 'contact', 'civ.label' => 'contact', 'p.lastname' => 'contact', 'p.firstname' => 'contact',
@@ -359,9 +359,9 @@ class modCategorie extends DolibarrModules
 			'p.birthday' => 'contact', 'p.poste' => 'contact',
 			'p.phone' => 'contact', 'p.phone_perso' => 'contact', 'p.phone_mobile' => 'contact', 'p.fax' => 'contact', 'p.email' => 'contact',
 			'p.note_private' => 'contact', 'p.note_public' => 'contact', 'p.statut' => 'contact',
-			's.nom'=>"company", 's.client'=>"company", 's.fournisseur'=>"company", 's.status'=>"company",
-			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company",
-			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company"
+			's.nom' => "company", 's.client' => "company", 's.fournisseur' => "company", 's.status' => "company",
+			's.address' => "company", 's.zip' => "company", 's.town' => "company",
+			's.phone' => "company", 's.fax' => "company", 's.url' => "company", 's.email' => "company"
 		); // We define here only fields that use another picto
 
 		$keyforselect = 'socpeople';
@@ -390,9 +390,9 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = "isModEnabled('project')";
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("projet", "export"));
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel", 'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification", 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref', 's.rowid'=>"IdThirdParty", 's.nom'=>"Name");
-		$this->export_TypeFields_array[$r] = array('cat.rowid'=>'Numeric', 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 's.rowid'=>"Numeric", 's.nom'=>"Text");
-		$this->export_entities_array[$r] = array('p.rowid'=>'project', 'p.ref'=>'project', 's.rowid'=>"company", 's.nom'=>"company"); // We define here only fields that use another picto
+		$this->export_fields_array[$r] = array('cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategory", 'pcat.label' => "ParentCategoryLabel", 'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification", 'p.rowid' => 'ProjectId', 'p.ref' => 'Ref', 's.rowid' => "IdThirdParty", 's.nom' => "Name");
+		$this->export_TypeFields_array[$r] = array('cat.rowid' => 'Numeric', 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text', 'p.rowid' => 'Numeric', 'p.ref' => 'Text', 's.rowid' => "Numeric", 's.nom' => "Text");
+		$this->export_entities_array[$r] = array('p.rowid' => 'project', 'p.ref' => 'project', 's.rowid' => "company", 's.nom' => "company"); // We define here only fields that use another picto
 
 		$keyforselect = 'projet';
 		$keyforelement = 'project';
@@ -416,9 +416,9 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = 'isModEnabled("user")';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("user", "export"));
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel", 'cat.color'=>"Color", 'cat.date_creation'=>"DateCreation", 'cat.tms'=>"DateLastModification", 'p.rowid'=>'UserID', 'p.login'=>'Login', 'p.lastname'=>'Lastname', 'p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r] = array('cat.rowid'=>"Numeric", 'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'Numeric', 'pcat.label'=>'Text', 'p.rowid'=>'Numeric', 'p.login'=>'Text', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
-		$this->export_entities_array[$r] = array('p.rowid'=>'user', 'p.login'=>'user', 'p.lastname'=>'user', 'p.firstname'=>'user'); // We define here only fields that use another picto
+		$this->export_fields_array[$r] = array('cat.rowid' => "CategId", 'cat.label' => "Label", 'cat.description' => "Description", 'cat.fk_parent' => "ParentCategory", 'pcat.label' => "ParentCategoryLabel", 'cat.color' => "Color", 'cat.date_creation' => "DateCreation", 'cat.tms' => "DateLastModification", 'p.rowid' => 'UserID', 'p.login' => 'Login', 'p.lastname' => 'Lastname', 'p.firstname' => 'Firstname');
+		$this->export_TypeFields_array[$r] = array('cat.rowid' => "Numeric", 'cat.label' => "Text", 'cat.description' => "Text", 'cat.fk_parent' => 'Numeric', 'pcat.label' => 'Text', 'p.rowid' => 'Numeric', 'p.login' => 'Text', 'p.lastname' => 'Text', 'p.firstname' => 'Text');
+		$this->export_entities_array[$r] = array('p.rowid' => 'user', 'p.login' => 'user', 'p.lastname' => 'user', 'p.firstname' => 'user'); // We define here only fields that use another picto
 
 		$keyforselect = 'user';
 		$keyforelement = 'user';
@@ -453,12 +453,12 @@ class modCategorie extends DolibarrModules
 		$this->import_label[$r] = "CatList"; // Translation key
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = array('ca'=>MAIN_DB_PREFIX.'categorie');
+		$this->import_tables_array[$r] = array('ca' => MAIN_DB_PREFIX.'categorie');
 		$this->import_fields_array[$r] = array(
-			'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
+			'ca.label' => "Label*", 'ca.type' => "Type*", 'ca.description' => "Description",
 			'ca.fk_parent' => 'ParentCategory'
 		);
-		$this->import_regex_array[$r] = array('ca.type'=>'^(0|1|2|3|4|5|6|7|8|9|10|11)$');
+		$this->import_regex_array[$r] = array('ca.type' => '^(0|1|2|3|4|5|6|7|8|9|10|11)$');
 		$this->import_convertvalue_array[$r] = array(
 			'ca.fk_parent' => array(
 				'rule'          => 'fetchidfromcodeandlabel',
@@ -471,10 +471,10 @@ class modCategorie extends DolibarrModules
 		);
 
 		$this->import_examplevalues_array[$r] = array(
-			'ca.label'=>"My Category Label", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description", // $typeexample built above in exports
+			'ca.label' => "My Category Label", 'ca.type' => $typeexample, 'ca.description' => "My Category description", // $typeexample built above in exports
 			'ca.fk_parent' => 'rowid or label'
 		);
-		$this->import_updatekeys_array[$r] = array('ca.label'=>'Label', 'ca.type' => 'Type');
+		$this->import_updatekeys_array[$r] = array('ca.label' => 'Label', 'ca.type' => 'Type');
 
 		// 0 Products
 		if (isModEnabled("product")) {
@@ -483,15 +483,15 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatProdLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'categorie_product');
-			$this->import_fields_array[$r] = array('cp.fk_categorie'=>"Category*", 'cp.fk_product'=>"Product*");
-			$this->import_regex_array[$r] = array('cp.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=0');
+			$this->import_tables_array[$r] = array('cp' => MAIN_DB_PREFIX.'categorie_product');
+			$this->import_fields_array[$r] = array('cp.fk_categorie' => "Category*", 'cp.fk_product' => "Product*");
+			$this->import_regex_array[$r] = array('cp.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=0');
 
 			$this->import_convertvalue_array[$r] = array(
-					'cp.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'cp.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
+					'cp.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 			);
-			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_product'=>"rowid or ref");
+			$this->import_examplevalues_array[$r] = array('cp.fk_categorie' => "rowid or label", 'cp.fk_product' => "rowid or ref");
 			$this->import_updatekeys_array[$r] = array('cp.fk_categorie' => 'Category', 'cp.fk_product' => 'ProductRef');
 		}
 
@@ -502,18 +502,18 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatSupLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
-			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"Supplier*");
+			$this->import_tables_array[$r] = array('cs' => MAIN_DB_PREFIX.'categorie_fournisseur');
+			$this->import_fields_array[$r] = array('cs.fk_categorie' => "Category*", 'cs.fk_soc' => "Supplier*");
 			$this->import_regex_array[$r] = array(
-				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=1',
-				'cs.fk_soc'=>'rowid@'.MAIN_DB_PREFIX.'societe:fournisseur>0'
+				'cs.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=1',
+				'cs.fk_soc' => 'rowid@'.MAIN_DB_PREFIX.'societe:fournisseur>0'
 			);
 
 			$this->import_convertvalue_array[$r] = array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
+					'cs.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
+					'cs.fk_soc' => array('rule' => 'fetchidfromref', 'classfile' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_soc'=>"rowid or name");
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie' => "rowid or label", 'cs.fk_soc' => "rowid or name");
 		}
 
 		// 2 Customers
@@ -523,18 +523,18 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatCusLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
-			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"Customer*");
+			$this->import_tables_array[$r] = array('cs' => MAIN_DB_PREFIX.'categorie_societe');
+			$this->import_fields_array[$r] = array('cs.fk_categorie' => "Category*", 'cs.fk_soc' => "Customer*");
 			$this->import_regex_array[$r] = array(
-				'cs.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=2',
-				'cs.fk_soc'=>'rowid@'.MAIN_DB_PREFIX.'societe:client>0'
+				'cs.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=2',
+				'cs.fk_soc' => 'rowid@'.MAIN_DB_PREFIX.'societe:client>0'
 			);
 
 			$this->import_convertvalue_array[$r] = array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
+					'cs.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
+					'cs.fk_soc' => array('rule' => 'fetchidfromref', 'classfile' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_soc'=>"rowid or name");
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie' => "rowid or label", 'cs.fk_soc' => "rowid or name");
 		}
 
 		// 3 Members
@@ -544,15 +544,15 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatMembersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cm'=>MAIN_DB_PREFIX.'categorie_contact');
-			$this->import_fields_array[$r] = array('cm.fk_categorie'=>"Category*", 'cm.fk_member'=>"Member*");
-			$this->import_regex_array[$r] = array('cm.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=3');
+			$this->import_tables_array[$r] = array('cm' => MAIN_DB_PREFIX.'categorie_contact');
+			$this->import_fields_array[$r] = array('cm.fk_categorie' => "Category*", 'cm.fk_member' => "Member*");
+			$this->import_regex_array[$r] = array('cm.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=3');
 
 			$this->import_convertvalue_array[$r] = array(
-				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cs.fk_member'=>array('rule'=>'fetchidfromref', 'classfile'=>'/adherents/class/adherent.class.php', 'class'=>'Adherent', 'method'=>'fetch', 'element'=>'Member')
+				'cs.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
+				'cs.fk_member' => array('rule' => 'fetchidfromref', 'classfile' => '/adherents/class/adherent.class.php', 'class' => 'Adherent', 'method' => 'fetch', 'element' => 'Member')
 			);
-			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_member'=>"rowid or ref");
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie' => "rowid or label", 'cs.fk_member' => "rowid or ref");
 		}
 
 		// 4 Contacts/Addresses
@@ -562,18 +562,18 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatContactsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cc'=>MAIN_DB_PREFIX.'categorie_contact');
-			$this->import_fields_array[$r] = array('cc.fk_categorie'=>"Category*", 'cc.fk_socpeople'=>"IdContact*");
+			$this->import_tables_array[$r] = array('cc' => MAIN_DB_PREFIX.'categorie_contact');
+			$this->import_fields_array[$r] = array('cc.fk_categorie' => "Category*", 'cc.fk_socpeople' => "IdContact*");
 			$this->import_regex_array[$r] = array(
-				'cc.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=4'
+				'cc.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=4'
 				//'cc.fk_socpeople'=>'rowid@'.MAIN_DB_PREFIX.'socpeople'
 			);
 
 			$this->import_convertvalue_array[$r] = array(
-				'cc.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+				'cc.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
 				//'cc.fk_socpeople'=>array('rule'=>'fetchidfromref','classfile'=>'/contact/class/contact.class.php','class'=>'Contact','method'=>'fetch','element'=>'Contact')
 			);
-			$this->import_examplevalues_array[$r] = array('cc.fk_categorie'=>"rowid or label", 'cc.fk_socpeople'=>"rowid");
+			$this->import_examplevalues_array[$r] = array('cc.fk_categorie' => "rowid or label", 'cc.fk_socpeople' => "rowid");
 		}
 
 		// 5 Bank accounts, TODO ?
@@ -585,15 +585,15 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'categorie_project');
-			$this->import_fields_array[$r] = array('cp.fk_categorie'=>"Category*", 'cp.fk_project'=>"Project*");
-			$this->import_regex_array[$r] = array('cp.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=6');
+			$this->import_tables_array[$r] = array('cp' => MAIN_DB_PREFIX.'categorie_project');
+			$this->import_fields_array[$r] = array('cp.fk_categorie' => "Category*", 'cp.fk_project' => "Project*");
+			$this->import_regex_array[$r] = array('cp.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=6');
 
 			$this->import_convertvalue_array[$r] = array(
-				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cs.fk_project'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project')
+				'cs.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
+				'cs.fk_project' => array('rule' => 'fetchidfromref', 'classfile' => '/projet/class/project.class.php', 'class' => 'Project', 'method' => 'fetch', 'element' => 'Project')
 			);
-			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_project'=>"rowid or ref");
+			$this->import_examplevalues_array[$r] = array('cp.fk_categorie' => "rowid or label", 'cp.fk_project' => "rowid or ref");
 		}
 
 		// 7 Users
@@ -603,15 +603,15 @@ class modCategorie extends DolibarrModules
 			$this->import_label[$r] = "CatUsersLinks"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('cu'=>MAIN_DB_PREFIX.'categorie_user');
-			$this->import_fields_array[$r] = array('cu.fk_categorie'=>"Category*", 'cu.fk_user'=>"User*");
-			$this->import_regex_array[$r] = array('cu.fk_categorie'=>'rowid@'.MAIN_DB_PREFIX.'categorie:type=7');
+			$this->import_tables_array[$r] = array('cu' => MAIN_DB_PREFIX.'categorie_user');
+			$this->import_fields_array[$r] = array('cu.fk_categorie' => "Category*", 'cu.fk_user' => "User*");
+			$this->import_regex_array[$r] = array('cu.fk_categorie' => 'rowid@'.MAIN_DB_PREFIX.'categorie:type=7');
 
 			$this->import_convertvalue_array[$r] = array(
-				'cu.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cu.fk_user'=>array('rule'=>'fetchidfromref', 'classfile'=>'/user/class/user.class.php', 'class'=>'User', 'method'=>'fetch', 'element'=>'User')
+				'cu.fk_categorie' => array('rule' => 'fetchidfromref', 'classfile' => '/categories/class/categorie.class.php', 'class' => 'Categorie', 'method' => 'fetch', 'element' => 'category'),
+				'cu.fk_user' => array('rule' => 'fetchidfromref', 'classfile' => '/user/class/user.class.php', 'class' => 'User', 'method' => 'fetch', 'element' => 'User')
 			);
-			$this->import_examplevalues_array[$r] = array('cu.fk_categorie'=>"rowid or label", 'cu.fk_user'=>"rowid or login");
+			$this->import_examplevalues_array[$r] = array('cu.fk_categorie' => "rowid or label", 'cu.fk_user' => "rowid or login");
 		}
 
 		// 8 Bank Lines, TODO ?
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index b137fd538ad..eecb06e137c 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -101,29 +101,29 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>2, 'index'=>1, 'comment'=>"Reference of object"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'comment' => "Reference of object"),
 		//'fk_actioncomm' => array('type'=>'integer:ActionComm:comm/action/class/actioncomm.class.php:1', 'label'=>'ConferenceOrBooth', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'picto'=>'agenda'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>20, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'autofocusoncreate'=>1, 'searchall'=>1, 'csslist'=>'tdoverflowmax150'),
-		'firstname' => array('type'=>'varchar(100)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'csslist'=>'tdoverflowmax125'),
-		'lastname' => array('type'=>'varchar(100)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>32, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'csslist'=>'tdoverflowmax125'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'email_company' => array('type'=>'mail', 'label'=>'EmailCompany', 'enabled'=>'1', 'position'=>41, 'notnull'=>0, 'visible'=>-2, 'searchall'=>1),
-		'date_subscription' => array('type'=>'datetime', 'label'=>'DateOfRegistration', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1, 'showoncombobox'=>'1',),
-		'fk_invoice' => array('type'=>'integer:Facture:compta/facture/class/facture.class.php', 'label'=>'Invoice', 'enabled'=>'isModEnabled("facture")', 'position'=>57, 'notnull'=>0, 'visible'=>1, 'index'=>0, 'picto'=>'bill', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'amount' => array('type'=>'price', 'label'=>'AmountPaid', 'enabled'=>'1', 'position'=>57, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"AmountOfRegistrationPaid",),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>3,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>3,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'css'=>'nowraponall'),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>-1, 'visible'=>-2),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'ip' => array('type'=>'varchar(250)', 'label'=>'IPAddress', 'enabled'=>'1', 'position'=>900, 'notnull'=>-1, 'visible'=>-2,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>0, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'),),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'position' => 20, 'notnull' => 1, 'visible' => 0, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'email' => array('type' => 'mail', 'label' => 'EmailAttendee', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'autofocusoncreate' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax150'),
+		'firstname' => array('type' => 'varchar(100)', 'label' => 'Firstname', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125'),
+		'lastname' => array('type' => 'varchar(100)', 'label' => 'Lastname', 'enabled' => '1', 'position' => 32, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125'),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'position' => 40, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'help' => "OrganizationEventLinkToThirdParty", 'picto' => 'company', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'email_company' => array('type' => 'mail', 'label' => 'EmailCompany', 'enabled' => '1', 'position' => 41, 'notnull' => 0, 'visible' => -2, 'searchall' => 1),
+		'date_subscription' => array('type' => 'datetime', 'label' => 'DateOfRegistration', 'enabled' => '1', 'position' => 56, 'notnull' => 1, 'visible' => 1, 'showoncombobox' => '1',),
+		'fk_invoice' => array('type' => 'integer:Facture:compta/facture/class/facture.class.php', 'label' => 'Invoice', 'enabled' => 'isModEnabled("invoice")', 'position' => 57, 'notnull' => 0, 'visible' => 1, 'index' => 0, 'picto' => 'bill', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'amount' => array('type' => 'price', 'label' => 'AmountPaid', 'enabled' => '1', 'position' => 57, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => '1', 'help' => "AmountOfRegistrationPaid",),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 3,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 3,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'css' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => -1, 'visible' => -2),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'ip' => array('type' => 'varchar(250)', 'label' => 'IPAddress', 'enabled' => '1', 'position' => 900, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'default' => 0, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Canceled'),),
 	);
 	public $rowid;
 	public $ref;
@@ -209,7 +209,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		if (isset($conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE)
 			&& getDolGlobalString('EVENTORGANIZATION_FILTERATTENDEES_TYPE') !== ''
 			&& getDolGlobalString('EVENTORGANIZATION_FILTERATTENDEES_TYPE') !== '-1') {
-				$this->fields['fk_soc']['type'] .= ' AND client = '.((int) getDolGlobalInt('EVENTORGANIZATION_FILTERATTENDEES_TYPE', 0));
+			$this->fields['fk_soc']['type'] .= ' AND client = '.((int) getDolGlobalInt('EVENTORGANIZATION_FILTERATTENDEES_TYPE', 0));
 		}
 
 		// Example to show how to set values of fields definition dynamically
@@ -841,7 +841,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('conferenceorboothattendeedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 1647eac9258..7a3ecf3dae6 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -355,51 +355,51 @@ class CommandeFournisseur extends CommonOrder
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
-		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefOrderSupplierShort', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'searchall'=>1),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>45),
-		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>710),
-		'date_approve' =>array('type'=>'datetime', 'label'=>'DateApprove', 'enabled'=>1, 'visible'=>-1, 'position'=>720),
-		'date_approve2' =>array('type'=>'datetime', 'label'=>'DateApprove2', 'enabled'=>1, 'visible'=>3, 'position'=>725),
-		'date_commande' =>array('type'=>'date', 'label'=>'OrderDateShort', 'enabled'=>1, 'visible'=>1, 'position'=>70),
-		'date_livraison' =>array('type'=>'datetime', 'label'=>'DeliveryDate', 'enabled'=>'empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)', 'visible'=>1, 'position'=>74),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>3, 'position'=>41),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>3, 'notnull'=>-1, 'position'=>80),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>3, 'position'=>711),
-		'fk_user_approve' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval', 'enabled'=>1, 'visible'=>3, 'position'=>721),
-		'fk_user_approve2' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval2', 'enabled'=>1, 'visible'=>3, 'position'=>726),
-		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>100),
-		'billed' =>array('type'=>'smallint(6)', 'label'=>'Billed', 'enabled'=>1, 'visible'=>1, 'position'=>710),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>1, 'position'=>130, 'isameasure'=>1),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>1, 'position'=>135, 'isameasure'=>1),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LT1', 'enabled'=>1, 'visible'=>3, 'position'=>140, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LT2', 'enabled'=>1, 'visible'=>3, 'position'=>145, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'AmountTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>150, 'isameasure'=>1),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>750, 'searchall'=>1),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>760, 'searchall'=>1),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>165),
-		'fk_input_method' =>array('type'=>'integer', 'label'=>'OrderMode', 'enabled'=>1, 'visible'=>3, 'position'=>170),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>3, 'position'=>175),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>3, 'position'=>180),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>0, 'position'=>190),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'isModEnabled("banque")', 'visible'=>3, 'position'=>200),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>3, 'position'=>205),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>3, 'position'=>210),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>0, 'position'=>215),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Currency', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>220),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'CurrencyRate', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>225),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>230),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>235),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>240),
-		'date_creation' =>array('type'=>'datetime', 'label'=>'Date creation', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>1, 'notnull'=>1, 'position'=>50),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>1000, 'index'=>1),
-		'tms'=>array('type'=>'datetime', 'label'=>"DateModificationShort", 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'position'=>700),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>701),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>0, 'position'=>900),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
+		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 25, 'searchall' => 1),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 35),
+		'ref_supplier' => array('type' => 'varchar(255)', 'label' => 'RefOrderSupplierShort', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'searchall' => 1),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 45),
+		'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 710),
+		'date_approve' => array('type' => 'datetime', 'label' => 'DateApprove', 'enabled' => 1, 'visible' => -1, 'position' => 720),
+		'date_approve2' => array('type' => 'datetime', 'label' => 'DateApprove2', 'enabled' => 1, 'visible' => 3, 'position' => 725),
+		'date_commande' => array('type' => 'date', 'label' => 'OrderDateShort', 'enabled' => 1, 'visible' => 1, 'position' => 70),
+		'date_livraison' => array('type' => 'datetime', 'label' => 'DeliveryDate', 'enabled' => 'empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)', 'visible' => 1, 'position' => 74),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => 3, 'position' => 41),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => 3, 'notnull' => -1, 'position' => 80),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => 3, 'position' => 711),
+		'fk_user_approve' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserApproval', 'enabled' => 1, 'visible' => 3, 'position' => 721),
+		'fk_user_approve2' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserApproval2', 'enabled' => 1, 'visible' => 3, 'position' => 726),
+		'source' => array('type' => 'smallint(6)', 'label' => 'Source', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 100),
+		'billed' => array('type' => 'smallint(6)', 'label' => 'Billed', 'enabled' => 1, 'visible' => 1, 'position' => 710),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'AmountHT', 'enabled' => 1, 'visible' => 1, 'position' => 130, 'isameasure' => 1),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'AmountVAT', 'enabled' => 1, 'visible' => 1, 'position' => 135, 'isameasure' => 1),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'LT1', 'enabled' => 1, 'visible' => 3, 'position' => 140, 'isameasure' => 1),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'LT2', 'enabled' => 1, 'visible' => 3, 'position' => 145, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'AmountTTC', 'enabled' => 1, 'visible' => -1, 'position' => 150, 'isameasure' => 1),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 750, 'searchall' => 1),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 760, 'searchall' => 1),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'ModelPDF', 'enabled' => 1, 'visible' => 0, 'position' => 165),
+		'fk_input_method' => array('type' => 'integer', 'label' => 'OrderMode', 'enabled' => 1, 'visible' => 3, 'position' => 170),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'PaymentTerm', 'enabled' => 1, 'visible' => 3, 'position' => 175),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => 3, 'position' => 180),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => 0, 'position' => 190),
+		'fk_account' => array('type' => 'integer', 'label' => 'BankAccount', 'enabled' => 'isModEnabled("bank")', 'visible' => 3, 'position' => 200),
+		'fk_incoterms' => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => 1, 'visible' => 3, 'position' => 205),
+		'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'IncotermLocation', 'enabled' => 1, 'visible' => 3, 'position' => 210),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fk multicurrency', 'enabled' => 1, 'visible' => 0, 'position' => 215),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Currency', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 220),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'CurrencyRate', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 225),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountHT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 230),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountVAT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 235),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountTTC', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 240),
+		'date_creation' => array('type' => 'datetime', 'label' => 'Date creation', 'enabled' => 1, 'visible' => -1, 'position' => 500),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => 1, 'notnull' => 1, 'position' => 50),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1000, 'index' => 1),
+		'tms' => array('type' => 'datetime', 'label' => "DateModificationShort", 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 501),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => 0, 'position' => 700),
+		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 701),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => 0, 'position' => 900),
 	);
 
 
@@ -1091,7 +1091,7 @@ class CommandeFournisseur extends CommonOrder
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1881,7 +1881,7 @@ class CommandeFournisseur extends CommonOrder
 		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$objFrom);
+				$parameters = array('objFrom' => $objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -2280,7 +2280,7 @@ class CommandeFournisseur extends CommonOrder
 
 					// Method change if qty < 0
 					if (getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN') && $qty < 0) {
-						$result = $mouv->livraison($user, $product, $entrepot, $qty*(-1), $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);
+						$result = $mouv->livraison($user, $product, $entrepot, $qty * (-1), $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);
 					} else {
 						$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch, '', 0, $inventorycode);
 					}
@@ -3526,7 +3526,7 @@ class CommandeFournisseur extends CommonOrder
 			$qtywished = array();
 
 			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
-			$filter = array('t.fk_commande'=>$this->id);
+			$filter = array('t.fk_commande' => $this->id);
 			if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 				$filter['t.status'] = 1; // Restrict to lines with status validated
 			}
@@ -3714,7 +3714,7 @@ class CommandeFournisseur extends CommonOrder
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		if (property_exists($this, 'socid') || property_exists($this, 'total_tva')) {
-			$return .='<br><span class="info-box-label amount">'.$this->socid.'</span>';
+			$return .= '<br><span class="info-box-label amount">'.$this->socid.'</span>';
 		}
 		if (property_exists($this, 'billed')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Billed").' : </span><span class="info-box-label">'.yn($this->billed).'</span>';
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index ccb9f6749a4..8a85a32e37a 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -192,52 +192,52 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
-		'ref_supplier' =>array('type'=>'varchar(180)', 'label'=>'RefSupplier', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>20),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>30),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>40),
-		'suspended' =>array('type'=>'integer', 'label'=>'Suspended', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-		'libelle' =>array('type'=>'varchar(100)', 'label'=>'Libelle', 'enabled'=>1, 'showoncombobox' => 0, 'visible'=>-1, 'position'=>15),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'titre' => array('type' => 'varchar(100)', 'label' => 'Titre', 'enabled' => 1, 'showoncombobox' => 1, 'visible' => -1, 'position' => 15),
+		'ref_supplier' => array('type' => 'varchar(180)', 'label' => 'RefSupplier', 'enabled' => 1, 'showoncombobox' => 1, 'visible' => -1, 'position' => 20),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25, 'index' => 1),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 30),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 40),
+		'suspended' => array('type' => 'integer', 'label' => 'Suspended', 'enabled' => 1, 'visible' => -1, 'position' => 225),
+		'libelle' => array('type' => 'varchar(100)', 'label' => 'Libelle', 'enabled' => 1, 'showoncombobox' => 0, 'visible' => -1, 'position' => 15),
 
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>65, 'isameasure'=>1),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'Total', 'enabled'=>1, 'visible'=>-1, 'position'=>70, 'isameasure'=>1),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>55, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>75, 'isameasure'=>1),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'Localtax1', 'enabled' => 1, 'visible' => -1, 'position' => 60, 'isameasure' => 1),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'Localtax2', 'enabled' => 1, 'visible' => -1, 'position' => 65, 'isameasure' => 1),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'Total', 'enabled' => 1, 'visible' => -1, 'position' => 70, 'isameasure' => 1),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'Tva', 'enabled' => 1, 'visible' => -1, 'position' => 55, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'Total ttc', 'enabled' => 1, 'visible' => -1, 'position' => 75, 'isameasure' => 1),
 
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>210),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>85),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>'isModEnabled("banque")', 'visible'=>-1, 'position'=>175),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Fk cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'Fk mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'date_lim_reglement' =>array('type'=>'date', 'label'=>'Date lim reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 210),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label' => 'Fk projet', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 85),
+		'fk_account' => array('type' => 'integer', 'label' => 'Fk account', 'enabled' => 'isModEnabled("bank")', 'visible' => -1, 'position' => 175),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'Fk cond reglement', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'Fk mode reglement', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'date_lim_reglement' => array('type' => 'date', 'label' => 'Date lim reglement', 'enabled' => 1, 'visible' => -1, 'position' => 100),
 
-		'note_private' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
-		'modelpdf' =>array('type'=>'varchar(255)', 'label'=>'Modelpdf', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+		'note_private' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 105),
+		'note_public' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 110),
+		'modelpdf' => array('type' => 'varchar(255)', 'label' => 'Modelpdf', 'enabled' => 1, 'visible' => -1, 'position' => 115),
 
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency tx', 'enabled'=>1, 'visible'=>-1, 'position'=>190, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ht', 'enabled'=>1, 'visible'=>-1, 'position'=>195, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total tva', 'enabled'=>1, 'visible'=>-1, 'position'=>200, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>205, 'isameasure'=>1),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fk multicurrency', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Multicurrency code', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'Multicurrency tx', 'enabled' => 1, 'visible' => -1, 'position' => 190, 'isameasure' => 1),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total ht', 'enabled' => 1, 'visible' => -1, 'position' => 195, 'isameasure' => 1),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total tva', 'enabled' => 1, 'visible' => -1, 'position' => 200, 'isameasure' => 1),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total ttc', 'enabled' => 1, 'visible' => -1, 'position' => 205, 'isameasure' => 1),
 
-		'usenewprice' =>array('type'=>'integer', 'label'=>'UseNewPrice', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'frequency' =>array('type'=>'integer', 'label'=>'Frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-		'unit_frequency' =>array('type'=>'varchar(2)', 'label'=>'Unit frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
+		'usenewprice' => array('type' => 'integer', 'label' => 'UseNewPrice', 'enabled' => 1, 'visible' => 0, 'position' => 155),
+		'frequency' => array('type' => 'integer', 'label' => 'Frequency', 'enabled' => 1, 'visible' => -1, 'position' => 150),
+		'unit_frequency' => array('type' => 'varchar(2)', 'label' => 'Unit frequency', 'enabled' => 1, 'visible' => -1, 'position' => 125),
 
-		'date_when' =>array('type'=>'datetime', 'label'=>'Date when', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'date_last_gen' =>array('type'=>'datetime', 'label'=>'Date last gen', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'nb_gen_done' =>array('type'=>'integer', 'label'=>'Nb gen done', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'nb_gen_max' =>array('type'=>'integer', 'label'=>'Nb gen max', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-		'revenuestamp' =>array('type'=>'double(24,8)', 'label'=>'RevenueStamp', 'enabled'=>1, 'visible'=>-1, 'position'=>160, 'isameasure'=>1),
-		'auto_validate' =>array('type'=>'integer', 'label'=>'Auto validate', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'generate_pdf' =>array('type'=>'integer', 'label'=>'Generate pdf', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+		'date_when' => array('type' => 'datetime', 'label' => 'Date when', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'date_last_gen' => array('type' => 'datetime', 'label' => 'Date last gen', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'nb_gen_done' => array('type' => 'integer', 'label' => 'Nb gen done', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'nb_gen_max' => array('type' => 'integer', 'label' => 'Nb gen max', 'enabled' => 1, 'visible' => -1, 'position' => 145),
+		'revenuestamp' => array('type' => 'double(24,8)', 'label' => 'RevenueStamp', 'enabled' => 1, 'visible' => -1, 'position' => 160, 'isameasure' => 1),
+		'auto_validate' => array('type' => 'integer', 'label' => 'Auto validate', 'enabled' => 1, 'visible' => -1, 'position' => 165),
+		'generate_pdf' => array('type' => 'integer', 'label' => 'Generate pdf', 'enabled' => 1, 'visible' => -1, 'position' => 170),
 
 	);
 	// END MODULEBUILDER PROPERTIES
@@ -1312,7 +1312,7 @@ class FactureFournisseurRec extends CommonInvoice
 			}
 
 			$saventity = $conf->entity;
-			$laststep="None";
+			$laststep = "None";
 
 			while ($i < $num) {     // Loop on each template invoice. If $num = 0, test is false at first pass.
 				$line = $this->db->fetch_object($resql);
@@ -1323,7 +1323,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 				$new_fac_fourn = null;
 				$facturerec = new FactureFournisseurRec($this->db);
-				$laststep="Fetch {$line->rowid}";
+				$laststep = "Fetch {$line->rowid}";
 				$facturerec->fetch($line->rowid);
 
 				if ($facturerec->id > 0) {
@@ -1349,7 +1349,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$new_fac_fourn->libelle = $facturerec->label;	// deprecated
 
 					$invoiceidgenerated = $new_fac_fourn->create($user);
-					$laststep="Create invoiceidgenerated $invoiceidgenerated";
+					$laststep = "Create invoiceidgenerated $invoiceidgenerated";
 					if ($invoiceidgenerated <= 0) {
 						$this->errors = $new_fac_fourn->errors;
 						$this->error = $new_fac_fourn->error;
@@ -1387,7 +1387,7 @@ class FactureFournisseurRec extends CommonInvoice
 				if (!$error && $invoiceidgenerated >= 0) {
 					$facturerec->nb_gen_done++;
 					$facturerec->date_last_gen = dol_now();
-					$facturerec->date_when= $facturerec->getNextDate();
+					$facturerec->date_when = $facturerec->getNextDate();
 					$facturerec->update($user);
 					$this->db->commit('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->title);
 					dol_syslog('createRecurringInvoices Process invoice template ' .$facturerec->title. ' is finished with a success generation');
@@ -1488,7 +1488,7 @@ class FactureFournisseurRec extends CommonInvoice
 		$result .= $linkend;
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index cab15d4f618..887b5ab425f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -278,7 +278,7 @@ class FactureFournisseur extends CommonInvoice
 		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 135),
 		'fk_facture_source' => array('type' => 'integer', 'label' => 'Fk facture source', 'enabled' => 1, 'visible' => -1, 'position' => 140),
 		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 145),
-		'fk_account' => array('type' => 'integer', 'label' => 'Account', 'enabled' => 'isModEnabled("banque")', 'visible' => -1, 'position' => 150),
+		'fk_account' => array('type' => 'integer', 'label' => 'Account', 'enabled' => 'isModEnabled("bank")', 'visible' => -1, 'position' => 150),
 		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'PaymentTerm', 'enabled' => 1, 'visible' => -1, 'position' => 155),
 		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => -1, 'position' => 160),
 		'date_lim_reglement' => array('type' => 'date', 'label' => 'DateLimReglement', 'enabled' => 1, 'visible' => -1, 'position' => 165),
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index f649f607280..ecd169d9009 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -249,7 +249,7 @@ for ($i = 1; $i <= 4; $i++) {
 	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (isModEnabled('adherent')) { ?>
+<?php if (isModEnabled('member')) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 3d5d98197f2..e684b5c502d 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -176,7 +176,7 @@ if ($this->control->tpl['action_delete']) {
 	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (isModEnabled('adherent')) { ?>
+<?php if (isModEnabled('member')) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8390295fed6..3405b222938 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -190,90 +190,90 @@ class Societe extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-		'parent' =>array('type'=>'integer', 'label'=>'Parent', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'nom' =>array('type'=>'varchar(128)', 'label'=>'Nom', 'enabled'=>1, 'visible'=>-1, 'position'=>35, 'showoncombobox'=>1),
-		'name_alias' =>array('type'=>'varchar(128)', 'label'=>'Name alias', 'enabled'=>1, 'visible'=>-1, 'position'=>36, 'showoncombobox'=>2),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>40, 'index'=>1),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>45),
-		'code_client' =>array('type'=>'varchar(24)', 'label'=>'CustomerCode', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'code_fournisseur' =>array('type'=>'varchar(24)', 'label'=>'SupplierCode', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'code_compta' =>array('type'=>'varchar(24)', 'label'=>'CustomerAccountancyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'code_compta_fournisseur' =>array('type'=>'varchar(24)', 'label'=>'SupplierAccountancyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'fk_departement' =>array('type'=>'integer', 'label'=>'State', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_pays' =>array('type'=>'integer:Ccountry:core/class/ccountry.class.php', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'phone_mobile' =>array('type'=>'varchar(20)', 'label'=>'PhoneMobile', 'enabled'=>1, 'visible'=>-1, 'position'=>102),
-		'fax' =>array('type'=>'varchar(20)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'email' =>array('type'=>'varchar(128)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'socialnetworks' =>array('type'=>'text', 'label'=>'Socialnetworks', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		'fk_effectif' =>array('type'=>'integer', 'label'=>'Workforce', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_typent' =>array('type'=>'integer', 'label'=>'TypeOfCompany', 'enabled'=>1, 'visible'=>-1, 'position'=>175, 'csslist'=>'minwidth200'),
-		'fk_forme_juridique' =>array('type'=>'integer', 'label'=>'JuridicalStatus', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'siren' =>array('type'=>'varchar(128)', 'label'=>'Idprof1', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'siret' =>array('type'=>'varchar(128)', 'label'=>'Idprof2', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'ape' =>array('type'=>'varchar(128)', 'label'=>'Idprof3', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
-		'idprof4' =>array('type'=>'varchar(128)', 'label'=>'Idprof4', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'idprof5' =>array('type'=>'varchar(128)', 'label'=>'Idprof5', 'enabled'=>1, 'visible'=>-1, 'position'=>206),
-		'idprof6' =>array('type'=>'varchar(128)', 'label'=>'Idprof6', 'enabled'=>1, 'visible'=>-1, 'position'=>207),
-		'tva_intra' =>array('type'=>'varchar(20)', 'label'=>'Tva intra', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'capital' =>array('type'=>'double(24,8)', 'label'=>'Capital', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'fk_stcomm' =>array('type'=>'integer', 'label'=>'CommercialStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
-		'prefix_comm' =>array('type'=>'varchar(5)', 'label'=>'Prefix comm', 'enabled'=>"getDolGlobalInt('SOCIETE_USEPREFIX')", 'visible'=>-1, 'position'=>235),
-		'client' =>array('type'=>'tinyint(4)', 'label'=>'Client', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
-		'fournisseur' =>array('type'=>'tinyint(4)', 'label'=>'Fournisseur', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
-		'supplier_account' =>array('type'=>'varchar(32)', 'label'=>'Supplier account', 'enabled'=>1, 'visible'=>-1, 'position'=>250),
-		'fk_prospectlevel' =>array('type'=>'varchar(12)', 'label'=>'ProspectLevel', 'enabled'=>1, 'visible'=>-1, 'position'=>255),
-		'customer_bad' =>array('type'=>'tinyint(4)', 'label'=>'Customer bad', 'enabled'=>1, 'visible'=>-1, 'position'=>260),
-		'customer_rate' =>array('type'=>'double', 'label'=>'Customer rate', 'enabled'=>1, 'visible'=>-1, 'position'=>265),
-		'supplier_rate' =>array('type'=>'double', 'label'=>'Supplier rate', 'enabled'=>1, 'visible'=>-1, 'position'=>270),
-		'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>275),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>280),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
+		'parent' => array('type' => 'integer', 'label' => 'Parent', 'enabled' => 1, 'visible' => -1, 'position' => 20),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'nom' => array('type' => 'varchar(128)', 'label' => 'Nom', 'enabled' => 1, 'visible' => -1, 'position' => 35, 'showoncombobox' => 1),
+		'name_alias' => array('type' => 'varchar(128)', 'label' => 'Name alias', 'enabled' => 1, 'visible' => -1, 'position' => 36, 'showoncombobox' => 2),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 40, 'index' => 1),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 45),
+		'code_client' => array('type' => 'varchar(24)', 'label' => 'CustomerCode', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'code_fournisseur' => array('type' => 'varchar(24)', 'label' => 'SupplierCode', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'code_compta' => array('type' => 'varchar(24)', 'label' => 'CustomerAccountancyCode', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'code_compta_fournisseur' => array('type' => 'varchar(24)', 'label' => 'SupplierAccountancyCode', 'enabled' => 1, 'visible' => -1, 'position' => 70),
+		'address' => array('type' => 'varchar(255)', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'zip' => array('type' => 'varchar(25)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'fk_departement' => array('type' => 'integer', 'label' => 'State', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'fk_pays' => array('type' => 'integer:Ccountry:core/class/ccountry.class.php', 'label' => 'Country', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'phone' => array('type' => 'varchar(20)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'phone_mobile' => array('type' => 'varchar(20)', 'label' => 'PhoneMobile', 'enabled' => 1, 'visible' => -1, 'position' => 102),
+		'fax' => array('type' => 'varchar(20)', 'label' => 'Fax', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => 1, 'visible' => -1, 'position' => 110),
+		'email' => array('type' => 'varchar(128)', 'label' => 'Email', 'enabled' => 1, 'visible' => -1, 'position' => 115),
+		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 120),
+		'fk_effectif' => array('type' => 'integer', 'label' => 'Workforce', 'enabled' => 1, 'visible' => -1, 'position' => 170),
+		'fk_typent' => array('type' => 'integer', 'label' => 'TypeOfCompany', 'enabled' => 1, 'visible' => -1, 'position' => 175, 'csslist' => 'minwidth200'),
+		'fk_forme_juridique' => array('type' => 'integer', 'label' => 'JuridicalStatus', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'fk_currency' => array('type' => 'varchar(3)', 'label' => 'Currency', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'siren' => array('type' => 'varchar(128)', 'label' => 'Idprof1', 'enabled' => 1, 'visible' => -1, 'position' => 190),
+		'siret' => array('type' => 'varchar(128)', 'label' => 'Idprof2', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'ape' => array('type' => 'varchar(128)', 'label' => 'Idprof3', 'enabled' => 1, 'visible' => -1, 'position' => 200),
+		'idprof4' => array('type' => 'varchar(128)', 'label' => 'Idprof4', 'enabled' => 1, 'visible' => -1, 'position' => 205),
+		'idprof5' => array('type' => 'varchar(128)', 'label' => 'Idprof5', 'enabled' => 1, 'visible' => -1, 'position' => 206),
+		'idprof6' => array('type' => 'varchar(128)', 'label' => 'Idprof6', 'enabled' => 1, 'visible' => -1, 'position' => 207),
+		'tva_intra' => array('type' => 'varchar(20)', 'label' => 'Tva intra', 'enabled' => 1, 'visible' => -1, 'position' => 210),
+		'capital' => array('type' => 'double(24,8)', 'label' => 'Capital', 'enabled' => 1, 'visible' => -1, 'position' => 215),
+		'fk_stcomm' => array('type' => 'integer', 'label' => 'CommercialStatus', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 220),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 225),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 230),
+		'prefix_comm' => array('type' => 'varchar(5)', 'label' => 'Prefix comm', 'enabled' => "getDolGlobalInt('SOCIETE_USEPREFIX')", 'visible' => -1, 'position' => 235),
+		'client' => array('type' => 'tinyint(4)', 'label' => 'Client', 'enabled' => 1, 'visible' => -1, 'position' => 240),
+		'fournisseur' => array('type' => 'tinyint(4)', 'label' => 'Fournisseur', 'enabled' => 1, 'visible' => -1, 'position' => 245),
+		'supplier_account' => array('type' => 'varchar(32)', 'label' => 'Supplier account', 'enabled' => 1, 'visible' => -1, 'position' => 250),
+		'fk_prospectlevel' => array('type' => 'varchar(12)', 'label' => 'ProspectLevel', 'enabled' => 1, 'visible' => -1, 'position' => 255),
+		'customer_bad' => array('type' => 'tinyint(4)', 'label' => 'Customer bad', 'enabled' => 1, 'visible' => -1, 'position' => 260),
+		'customer_rate' => array('type' => 'double', 'label' => 'Customer rate', 'enabled' => 1, 'visible' => -1, 'position' => 265),
+		'supplier_rate' => array('type' => 'double', 'label' => 'Supplier rate', 'enabled' => 1, 'visible' => -1, 'position' => 270),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'position' => 275),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 280),
 		//'remise_client' =>array('type'=>'double', 'label'=>'CustomerDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>285, 'isameasure'=>1),
 		//'remise_supplier' =>array('type'=>'double', 'label'=>'SupplierDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>290, 'isameasure'=>1),
-		'mode_reglement' =>array('type'=>'tinyint(4)', 'label'=>'Mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>295),
-		'cond_reglement' =>array('type'=>'tinyint(4)', 'label'=>'Cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>300),
-		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>301),
-		'mode_reglement_supplier' =>array('type'=>'integer', 'label'=>'Mode reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>305),
-		'cond_reglement_supplier' =>array('type'=>'integer', 'label'=>'Cond reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>308),
-		'outstanding_limit' =>array('type'=>'double(24,8)', 'label'=>'OutstandingBill', 'enabled'=>1, 'visible'=>-1, 'position'=>310, 'isameasure'=>1),
-		'order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Order min amount', 'enabled'=>'isModEnabled("commande") && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>315, 'isameasure'=>1),
-		'supplier_order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Supplier order min amount', 'enabled'=>'isModEnabled("commande") && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>320, 'isameasure'=>1),
-		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'Fk shipping method', 'enabled'=>1, 'visible'=>-1, 'position'=>330),
-		'tva_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Tva assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>335),
-		'localtax1_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Localtax1 assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>340),
-		'localtax1_value' =>array('type'=>'double(6,3)', 'label'=>'Localtax1 value', 'enabled'=>1, 'visible'=>-1, 'position'=>345),
-		'localtax2_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Localtax2 assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>350),
-		'localtax2_value' =>array('type'=>'double(6,3)', 'label'=>'Localtax2 value', 'enabled'=>1, 'visible'=>-1, 'position'=>355),
-		'vat_reverse_charge' =>array('type'=>'tinyint(4)', 'label'=>'Vat reverse charge', 'enabled'=>1, 'visible'=>-1, 'position'=>335),
-		'barcode' =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>1, 'visible'=>-1, 'position'=>360),
-		'price_level' =>array('type'=>'integer', 'label'=>'Price level', 'enabled'=>'$conf->global->PRODUIT_MULTIPRICES || getDolGlobalString("PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES")', 'visible'=>-1, 'position'=>365),
-		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>-1, 'position'=>370),
-		'canvas' =>array('type'=>'varchar(32)', 'label'=>'Canvas', 'enabled'=>1, 'visible'=>-1, 'position'=>375),
-		'fk_barcode_type' =>array('type'=>'integer', 'label'=>'Fk barcode type', 'enabled'=>1, 'visible'=>-1, 'position'=>405),
-		'webservices_url' =>array('type'=>'varchar(255)', 'label'=>'Webservices url', 'enabled'=>1, 'visible'=>-1, 'position'=>410),
-		'webservices_key' =>array('type'=>'varchar(128)', 'label'=>'Webservices key', 'enabled'=>1, 'visible'=>-1, 'position'=>415),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'Fk incoterms', 'enabled'=>1, 'visible'=>-1, 'position'=>425),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'Location incoterms', 'enabled'=>1, 'visible'=>-1, 'position'=>430),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>435),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>270),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>440),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>445),
-		'fk_account' =>array('type'=>'integer', 'label'=>'PaymentBankAccount', 'enabled'=>1, 'visible'=>-1, 'position'=>450),
-		'fk_warehouse' =>array('type'=>'integer', 'label'=>'Warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>455),
-		'logo' =>array('type'=>'varchar(255)', 'label'=>'Logo', 'enabled'=>1, 'visible'=>-1, 'position'=>400),
-		'logo_squarred' =>array('type'=>'varchar(255)', 'label'=>'Logo squarred', 'enabled'=>1, 'visible'=>-1, 'position'=>401),
-		'status' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000),
+		'mode_reglement' => array('type' => 'tinyint(4)', 'label' => 'Mode reglement', 'enabled' => 1, 'visible' => -1, 'position' => 295),
+		'cond_reglement' => array('type' => 'tinyint(4)', 'label' => 'Cond reglement', 'enabled' => 1, 'visible' => -1, 'position' => 300),
+		'deposit_percent' => array('type' => 'varchar(63)', 'label' => 'DepositPercent', 'enabled' => 1, 'visible' => -1, 'position' => 301),
+		'mode_reglement_supplier' => array('type' => 'integer', 'label' => 'Mode reglement supplier', 'enabled' => 1, 'visible' => -1, 'position' => 305),
+		'cond_reglement_supplier' => array('type' => 'integer', 'label' => 'Cond reglement supplier', 'enabled' => 1, 'visible' => -1, 'position' => 308),
+		'outstanding_limit' => array('type' => 'double(24,8)', 'label' => 'OutstandingBill', 'enabled' => 1, 'visible' => -1, 'position' => 310, 'isameasure' => 1),
+		'order_min_amount' => array('type' => 'double(24,8)', 'label' => 'Order min amount', 'enabled' => 'isModEnabled("order") && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible' => -1, 'position' => 315, 'isameasure' => 1),
+		'supplier_order_min_amount' => array('type' => 'double(24,8)', 'label' => 'Supplier order min amount', 'enabled' => 'isModEnabled("order") && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible' => -1, 'position' => 320, 'isameasure' => 1),
+		'fk_shipping_method' => array('type' => 'integer', 'label' => 'Fk shipping method', 'enabled' => 1, 'visible' => -1, 'position' => 330),
+		'tva_assuj' => array('type' => 'tinyint(4)', 'label' => 'Tva assuj', 'enabled' => 1, 'visible' => -1, 'position' => 335),
+		'localtax1_assuj' => array('type' => 'tinyint(4)', 'label' => 'Localtax1 assuj', 'enabled' => 1, 'visible' => -1, 'position' => 340),
+		'localtax1_value' => array('type' => 'double(6,3)', 'label' => 'Localtax1 value', 'enabled' => 1, 'visible' => -1, 'position' => 345),
+		'localtax2_assuj' => array('type' => 'tinyint(4)', 'label' => 'Localtax2 assuj', 'enabled' => 1, 'visible' => -1, 'position' => 350),
+		'localtax2_value' => array('type' => 'double(6,3)', 'label' => 'Localtax2 value', 'enabled' => 1, 'visible' => -1, 'position' => 355),
+		'vat_reverse_charge' => array('type' => 'tinyint(4)', 'label' => 'Vat reverse charge', 'enabled' => 1, 'visible' => -1, 'position' => 335),
+		'barcode' => array('type' => 'varchar(255)', 'label' => 'Barcode', 'enabled' => 1, 'visible' => -1, 'position' => 360),
+		'price_level' => array('type' => 'integer', 'label' => 'Price level', 'enabled' => '$conf->global->PRODUIT_MULTIPRICES || getDolGlobalString("PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES")', 'visible' => -1, 'position' => 365),
+		'default_lang' => array('type' => 'varchar(6)', 'label' => 'Default lang', 'enabled' => 1, 'visible' => -1, 'position' => 370),
+		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 375),
+		'fk_barcode_type' => array('type' => 'integer', 'label' => 'Fk barcode type', 'enabled' => 1, 'visible' => -1, 'position' => 405),
+		'webservices_url' => array('type' => 'varchar(255)', 'label' => 'Webservices url', 'enabled' => 1, 'visible' => -1, 'position' => 410),
+		'webservices_key' => array('type' => 'varchar(128)', 'label' => 'Webservices key', 'enabled' => 1, 'visible' => -1, 'position' => 415),
+		'fk_incoterms' => array('type' => 'integer', 'label' => 'Fk incoterms', 'enabled' => 1, 'visible' => -1, 'position' => 425),
+		'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'Location incoterms', 'enabled' => 1, 'visible' => -1, 'position' => 430),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 435),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -1, 'position' => 270),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fk multicurrency', 'enabled' => 1, 'visible' => -1, 'position' => 440),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Multicurrency code', 'enabled' => 1, 'visible' => -1, 'position' => 445),
+		'fk_account' => array('type' => 'integer', 'label' => 'PaymentBankAccount', 'enabled' => 1, 'visible' => -1, 'position' => 450),
+		'fk_warehouse' => array('type' => 'integer', 'label' => 'Warehouse', 'enabled' => 1, 'visible' => -1, 'position' => 455),
+		'logo' => array('type' => 'varchar(255)', 'label' => 'Logo', 'enabled' => 1, 'visible' => -1, 'position' => 400),
+		'logo_squarred' => array('type' => 'varchar(255)', 'label' => 'Logo squarred', 'enabled' => 1, 'visible' => -1, 'position' => 401),
+		'status' => array('type' => 'tinyint(4)', 'label' => 'Status', 'enabled' => 1, 'visible' => -1, 'position' => 500),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000),
 	);
 
 	/**
@@ -2681,7 +2681,7 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		$error = 0;
-		$this->context = array('commercial_modified'=>$commid);
+		$this->context = array('commercial_modified' => $commid);
 
 		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
 		if ($result < 0) {
@@ -3004,13 +3004,13 @@ class Societe extends CommonObject
 		global $action;
 		$hookmanager->initHooks(array('thirdpartydao'));
 		$parameters = array(
-			'id'=>$this->id,
+			'id' => $this->id,
 			'getnomurl' => &$result,
-			'withpicto '=> $withpicto,
-			'option'=> $option,
-			'maxlen'=> $maxlen,
-			'notooltip'=> $notooltip,
-			'save_lastsearch_value'=> $save_lastsearch_value
+			'withpicto ' => $withpicto,
+			'option' => $option,
+			'maxlen' => $maxlen,
+			'notooltip' => $notooltip,
+			'save_lastsearch_value' => $save_lastsearch_value
 		);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -3622,7 +3622,7 @@ class Societe extends CommonObject
 		global $conf;
 
 		if (getDolGlobalString('SOCIETE_CODECOMPTA_ADDON')) {
-			$module=getDolGlobalString('SOCIETE_CODECOMPTA_ADDON');
+			$module = getDolGlobalString('SOCIETE_CODECOMPTA_ADDON');
 			$res = false;
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3939,7 +3939,7 @@ class Societe extends CommonObject
 		$action = '';
 
 		$hookmanager->initHooks(array('idprofurl'));
-		$parameters = array('idprof'=>$idprof, 'company'=>$thirdparty);
+		$parameters = array('idprof' => $idprof, 'company' => $thirdparty);
 		$reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook)) {
 			if (getDolGlobalString('MAIN_DISABLEPROFIDRULES')) {
@@ -4442,7 +4442,7 @@ class Societe extends CommonObject
 		$this->forme_juridique_code = getDolGlobalString('MAIN_INFO_SOCIETE_FORME_JURIDIQUE');
 		$this->email = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
 		$this->default_lang = getDolGlobalString('MAIN_LANG_DEFAULT', 'auto');
-		$this->logo =getDolGlobalString('MAIN_INFO_SOCIETE_LOGO');
+		$this->logo = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO');
 		$this->logo_small = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SMALL');
 		$this->logo_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_MINI');
 		$this->logo_squarred = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED');
@@ -4743,7 +4743,7 @@ class Societe extends CommonObject
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax, 'refs'=>$arrayofref); // 'opened' is 'incl taxes'
+			return array('opened' => $outstandingOpened, 'total_ht' => $outstandingTotal, 'total_ttc' => $outstandingTotalIncTax, 'refs' => $arrayofref); // 'opened' is 'incl taxes'
 		} else {
 			return array();
 		}
@@ -4786,7 +4786,7 @@ class Societe extends CommonObject
 					$outstandingOpened += $obj->total_ttc;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax, 'refs'=>$arrayofref); // 'opened' is 'incl taxes'
+			return array('opened' => $outstandingOpened, 'total_ht' => $outstandingTotal, 'total_ttc' => $outstandingTotalIncTax, 'refs' => $arrayofref); // 'opened' is 'incl taxes'
 		} else {
 			return array();
 		}
@@ -4845,7 +4845,7 @@ class Societe extends CommonObject
 
 				if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
 					&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
-					) {
+				) {
 					$outstandingTotal += $obj->total_ht;
 					$outstandingTotalIncTax += $obj->total_ttc;
 				}
@@ -4877,7 +4877,7 @@ class Societe extends CommonObject
 					$arrayofrefopened[$obj->rowid] = $obj->ref;
 				}
 			}
-			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax, 'refs'=>$arrayofref, 'refsopened'=>$arrayofrefopened); // 'opened' is 'incl taxes'
+			return array('opened' => $outstandingOpened, 'total_ht' => $outstandingTotal, 'total_ttc' => $outstandingTotalIncTax, 'refs' => $arrayofref, 'refsopened' => $arrayofrefopened); // 'opened' is 'incl taxes'
 		} else {
 			dol_syslog("Sql error ".$this->db->lasterror, LOG_ERR);
 			return array();
@@ -4947,7 +4947,7 @@ class Societe extends CommonObject
 				dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
 			}
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-			$this->last_main_doc=$companybankaccount->last_main_doc;
+			$this->last_main_doc = $companybankaccount->last_main_doc;
 		} else {
 			// Positionne le modele sur le nom du modele a utiliser
 			if (!dol_strlen($modele)) {
@@ -5284,8 +5284,8 @@ class Societe extends CommonObject
 						'civility' => $obj->civility,
 						'lastname' => $obj->lastname,
 						'firstname' => $obj->firstname,
-						'email'=>$obj->email,
-						'login'=> (empty($obj->login) ? '' : $obj->login),
+						'email' => $obj->email,
+						'login' => (empty($obj->login) ? '' : $obj->login),
 						'photo' => (empty($obj->photo) ? '' : $obj->photo),
 						'statuscontact' => $obj->statuscontact,
 						'rowid' => $obj->rowid,
@@ -5484,7 +5484,7 @@ class Societe extends CommonObject
 
 
 			if (!$error) {
-				$this->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id, 'mergefromname'=>$soc_origin->name);
+				$this->context = array('merge' => 1, 'mergefromid' => $soc_origin->id, 'mergefromname' => $soc_origin->name);
 
 				// Call trigger
 				$result = $this->call_trigger('COMPANY_MODIFY', $user);
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 6c70a42cd95..91fcad393d0 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -105,11 +105,11 @@ $webservices = array(
 		'thirdparty'		=> 'isModEnabled("societe")',
 		'contact'			=> 'isModEnabled("societe")',
 		'productorservice'	=> '(isModEnabled("product") || isModEnabled("service"))',
-		'order'				=> 'isModEnabled("commande")',
-		'invoice'			=> 'isModEnabled("facture")',
+		'order'				=> 'isModEnabled("order")',
+		'invoice'			=> 'isModEnabled("invoice")',
 		'supplier_invoice'	=> 'isModEnabled("fournisseur")',
 		'actioncomm'		=> 'isModEnabled("agenda")',
-		'category'			=> 'isModEnabled("categorie")',
+		'category'			=> 'isModEnabled("category")',
 		'project'			=> 'isModEnabled("project")',
 		'other'				=> ''
 );

From ec8f2a420d9aa26f352e2d0109af5d746630261f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:29:58 +0100
Subject: [PATCH 0255/1862] Fix: Use of deprecated fichinter in dynamic
 modulename (#28456)

# Fix: Use of deprecated fichinter in dynamic modulename

The modulename is computed dynamically and could use deprecated fichinter
module name.
Also optimised the test.
---
 htdocs/api/index.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 2a9375f58c0..d55fe8d38d5 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -233,12 +233,10 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
 					$modulenameforenabled = $module;
 					if ($module == 'propale') {
 						$modulenameforenabled = 'propal';
-					}
-					if ($module == 'supplierproposal') {
+					} elseif ($module == 'supplierproposal') {
 						$modulenameforenabled = 'supplier_proposal';
-					}
-					if ($module == 'ficheinter') {
-						$modulenameforenabled = 'ficheinter';
+					} elseif ($module == 'ficheinter') {
+						$modulenameforenabled = 'intervention';
 					}
 
 					dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);

From fc597c4171d645ed520d3267bf87c0016e09256f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:30:37 +0100
Subject: [PATCH 0256/1862] Fix: Replace deprecated modulename with new in
 isModEnabled (#28452)

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.

* Fix: Replace deprecated modulename with new in isModEnabled

# Fix: Replace deprecated modulename with new in isModEnabled

Replacement of old module names performed with dedicated detection
and fixer in phan.
---
 htdocs/accountancy/admin/defaultaccounts.php  |  4 +-
 htdocs/accountancy/admin/productaccount.php   |  2 +-
 htdocs/adherents/admin/member.php             | 12 +--
 htdocs/adherents/card.php                     |  6 +-
 htdocs/adherents/class/adherent.class.php     |  4 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/adherents/subscription.php             | 24 +++---
 htdocs/adherents/subscription/card.php        |  8 +-
 htdocs/adherents/subscription/list.php        |  2 +-
 htdocs/admin/commande.php                     |  8 +-
 htdocs/admin/delivery.php                     |  2 +-
 htdocs/admin/dict.php                         | 14 ++--
 htdocs/admin/facture.php                      |  2 +-
 htdocs/admin/fckeditor.php                    |  4 +-
 htdocs/admin/ldap.php                         |  4 +-
 htdocs/admin/mails_templates.php              | 14 ++--
 htdocs/admin/pdf_other.php                    |  2 +-
 htdocs/admin/propal.php                       |  8 +-
 htdocs/admin/stock.php                        | 14 ++--
 htdocs/admin/supplier_proposal.php            |  2 +-
 htdocs/admin/workflow.php                     | 20 ++---
 htdocs/blockedlog/class/blockedlog.class.php  |  6 +-
 htdocs/comm/action/card.php                   |  6 +-
 htdocs/comm/action/class/actioncomm.class.php |  2 +-
 .../comm/action/class/cactioncomm.class.php   |  6 +-
 htdocs/comm/card.php                          | 54 ++++++-------
 htdocs/comm/index.php                         | 16 ++--
 htdocs/comm/mailing/advtargetemailing.php     |  2 +-
 htdocs/comm/propal/card.php                   | 24 +++---
 htdocs/comm/propal/list.php                   | 10 +--
 htdocs/comm/recap-client.php                  |  2 +-
 htdocs/commande/card.php                      | 22 ++---
 htdocs/commande/class/commande.class.php      |  2 +-
 htdocs/commande/index.php                     |  6 +-
 htdocs/commande/list.php                      | 18 ++---
 htdocs/commande/list_det.php                  | 20 ++---
 htdocs/compta/accounting-files.php            |  6 +-
 htdocs/compta/bank/bankentries_list.php       |  4 +-
 htdocs/compta/bank/card.php                   |  8 +-
 htdocs/compta/bank/class/account.class.php    |  2 +-
 .../bank/class/paymentvarious.class.php       |  6 +-
 htdocs/compta/bank/line.php                   |  4 +-
 htdocs/compta/bank/list.php                   |  6 +-
 htdocs/compta/bank/various_payment/card.php   |  8 +-
 htdocs/compta/bank/various_payment/list.php   |  4 +-
 htdocs/compta/charges/index.php               | 12 +--
 htdocs/compta/facture/card.php                | 26 +++---
 .../facture/class/api_invoices.class.php      |  8 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/compta/facture/list.php                |  6 +-
 htdocs/compta/facture/stats/index.php         |  6 +-
 htdocs/compta/index.php                       | 10 +--
 htdocs/compta/localtax/card.php               |  4 +-
 .../compta/localtax/class/localtax.class.php  |  6 +-
 htdocs/compta/paiement.php                    |  6 +-
 htdocs/compta/paiement/card.php               |  6 +-
 .../compta/paiement/class/paiement.class.php  |  2 +-
 htdocs/compta/paiement/list.php               |  4 +-
 htdocs/compta/paiement_charge.php             |  2 +-
 htdocs/compta/paiement_vat.php                |  2 +-
 htdocs/compta/payment_sc/card.php             |  4 +-
 htdocs/compta/payment_vat/card.php            |  4 +-
 htdocs/compta/recap-compta.php                |  4 +-
 htdocs/compta/resultat/clientfourn.php        |  2 +-
 htdocs/compta/resultat/index.php              |  8 +-
 htdocs/compta/sociales/card.php               | 10 +--
 .../class/paymentsocialcontribution.class.php |  2 +-
 htdocs/compta/sociales/list.php               |  2 +-
 htdocs/compta/sociales/payments.php           |  8 +-
 htdocs/compta/stats/cabyuser.php              |  4 +-
 htdocs/compta/stats/casoc.php                 |  4 +-
 htdocs/compta/tva/card.php                    | 10 +--
 htdocs/compta/tva/class/paymentvat.class.php  |  2 +-
 htdocs/compta/tva/class/tva.class.php         |  6 +-
 htdocs/compta/tva/list.php                    |  2 +-
 htdocs/compta/tva/payments.php                |  6 +-
 .../actions_contactcard_common.class.php      |  6 +-
 htdocs/contact/card.php                       | 22 ++---
 htdocs/contact/consumption.php                |  8 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/card.php                       |  4 +-
 htdocs/contrat/index.php                      |  2 +-
 htdocs/contrat/list.php                       |  6 +-
 htdocs/contrat/services_list.php              |  2 +-
 htdocs/core/actions_addupdatedelete.inc.php   |  4 +-
 htdocs/core/ajax/selectsearchbox.php          | 16 ++--
 htdocs/core/boxes/box_activity.php            |  8 +-
 .../core/boxes/box_dolibarr_state_board.php   | 10 +--
 .../boxes/box_graph_product_distribution.php  | 22 ++---
 htdocs/core/boxes/box_members_by_tags.php     |  2 +-
 htdocs/core/boxes/box_members_by_type.php     |  2 +-
 .../core/boxes/box_members_last_modified.php  |  2 +-
 .../boxes/box_members_last_subscriptions.php  |  2 +-
 .../box_members_subscriptions_by_year.php     |  2 +-
 htdocs/core/class/html.form.class.php         | 22 ++---
 htdocs/core/class/html.formmail.class.php     | 16 ++--
 htdocs/core/class/html.formticket.class.php   |  2 +-
 htdocs/core/customreports.php                 | 14 ++--
 htdocs/core/lib/admin.lib.php                 |  2 +-
 htdocs/core/lib/agenda.lib.php                |  4 +-
 htdocs/core/lib/company.lib.php               |  2 +-
 htdocs/core/lib/contact.lib.php               |  2 +-
 htdocs/core/lib/expedition.lib.php            |  2 +-
 htdocs/core/lib/functions.lib.php             |  8 +-
 htdocs/core/lib/invoice.lib.php               |  6 +-
 htdocs/core/lib/ldap.lib.php                  |  4 +-
 htdocs/core/lib/order.lib.php                 |  6 +-
 htdocs/core/lib/pdf.lib.php                   |  4 +-
 htdocs/core/lib/product.lib.php               | 10 +--
 htdocs/core/lib/project.lib.php               | 20 ++---
 htdocs/core/lib/propal.lib.php                |  4 +-
 htdocs/core/menus/standard/auguria.lib.php    |  6 +-
 htdocs/core/menus/standard/eldy.lib.php       | 80 +++++++++----------
 .../doc/pdf_standard.modules.php              |  4 +-
 .../mailings/advthirdparties.modules.php      |  2 +-
 .../modules/mailings/thirdparties.modules.php |  2 +-
 htdocs/core/modules/modCategorie.class.php    |  4 +-
 htdocs/core/modules/modUser.class.php         |  2 +-
 .../doc/doc_generic_project_odt.modules.php   | 24 +++---
 .../project/doc/pdf_beluga.modules.php        | 10 +--
 .../task/doc/doc_generic_task_odt.modules.php | 10 +--
 .../modules/rapport/pdf_paiement.class.php    | 12 +--
 htdocs/core/tpl/advtarget.tpl.php             |  6 +-
 htdocs/core/tpl/onlinepaymentlinks.tpl.php    |  8 +-
 ...e_20_modWorkflow_WorkflowManager.class.php | 18 ++---
 ..._50_modNotification_Notification.class.php |  4 +-
 htdocs/datapolicy/admin/setup.php             |  2 +-
 htdocs/delivery/card.php                      |  6 +-
 htdocs/delivery/class/delivery.class.php      |  2 +-
 htdocs/don/class/paymentdonation.class.php    |  2 +-
 htdocs/don/paiement/list.php                  |  4 +-
 htdocs/don/payment/card.php                   |  4 +-
 htdocs/don/payment/payment.php                |  2 +-
 htdocs/ecm/index_auto.php                     | 22 ++---
 htdocs/ecm/search.php                         | 20 ++---
 .../conferenceorbooth_card.php                |  2 +-
 .../conferenceorbooth_contact.php             |  2 +-
 .../conferenceorbooth_document.php            |  2 +-
 .../conferenceorbooth_list.php                |  2 +-
 .../conferenceorboothattendee_card.php        |  2 +-
 .../conferenceorboothattendee_list.php        |  4 +-
 htdocs/expedition/card.php                    |  8 +-
 htdocs/expedition/class/expedition.class.php  |  2 +-
 htdocs/expedition/contact.php                 |  4 +-
 htdocs/expedition/dispatch.php                |  4 +-
 htdocs/expedition/document.php                |  2 +-
 htdocs/expedition/list.php                    |  4 +-
 htdocs/expedition/note.php                    |  2 +-
 htdocs/expensereport/card.php                 | 10 +--
 .../class/api_expensereports.class.php        |  2 +-
 .../class/paymentexpensereport.class.php      |  2 +-
 htdocs/expensereport/payment/card.php         |  4 +-
 htdocs/expensereport/payment/list.php         |  2 +-
 htdocs/expensereport/payment/payment.php      |  4 +-
 htdocs/fichinter/card-rec.php                 | 14 ++--
 htdocs/fichinter/card.php                     | 10 +--
 htdocs/fichinter/index.php                    |  4 +-
 htdocs/fichinter/list.php                     | 10 +--
 htdocs/fourn/card.php                         | 10 +--
 .../class/api_supplier_invoices.class.php     |  4 +-
 htdocs/fourn/commande/card.php                |  6 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/facture/card.php                 | 10 +--
 htdocs/fourn/facture/list.php                 |  4 +-
 htdocs/fourn/facture/paiement.php             |  4 +-
 htdocs/fourn/paiement/card.php                |  2 +-
 htdocs/fourn/paiement/document.php            |  2 +-
 htdocs/fourn/paiement/list.php                |  2 +-
 htdocs/index.php                              | 12 +--
 htdocs/install/upgrade2.php                   |  6 +-
 .../class/knowledgerecord.class.php           |  2 +-
 .../knowledgerecord_card.php                  |  6 +-
 .../knowledgerecord_list.php                  |  2 +-
 htdocs/loan/card.php                          |  2 +-
 htdocs/loan/class/paymentloan.class.php       |  2 +-
 htdocs/loan/payment/card.php                  |  4 +-
 htdocs/loan/payment/payment.php               |  2 +-
 .../mailmanspip/class/mailmanspip.class.php   |  4 +-
 htdocs/main.inc.php                           | 10 +--
 htdocs/paybox/admin/paybox.php                |  2 +-
 htdocs/paypal/admin/paypal.php                |  2 +-
 htdocs/product/card.php                       | 16 ++--
 htdocs/product/class/product.class.php        |  6 +-
 htdocs/product/composition/card.php           |  6 +-
 htdocs/product/index.php                      |  2 +-
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list.php                       |  4 +-
 htdocs/product/reassort.php                   |  2 +-
 htdocs/product/reassortlot.php                |  4 +-
 htdocs/product/stats/card.php                 |  6 +-
 htdocs/product/stock/card.php                 |  6 +-
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 htdocs/product/stock/list.php                 |  6 +-
 htdocs/product/stock/movement_list.php        |  2 +-
 htdocs/product/stock/product.php              |  4 +-
 htdocs/product/stock/replenish.php            |  4 +-
 htdocs/projet/card.php                        | 14 ++--
 htdocs/projet/comment.php                     |  2 +-
 htdocs/projet/contact.php                     |  4 +-
 htdocs/projet/element.php                     | 36 ++++-----
 htdocs/projet/ganttview.php                   |  2 +-
 htdocs/projet/list.php                        |  8 +-
 htdocs/projet/tasks.php                       |  4 +-
 htdocs/projet/tasks/comment.php               |  2 +-
 htdocs/projet/tasks/contact.php               |  2 +-
 htdocs/projet/tasks/document.php              |  2 +-
 htdocs/projet/tasks/list.php                  |  4 +-
 htdocs/projet/tasks/note.php                  |  2 +-
 htdocs/projet/tasks/task.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  4 +-
 htdocs/public/members/new.php                 |  2 +-
 htdocs/public/members/public_card.php         |  2 +-
 htdocs/public/members/public_list.php         |  2 +-
 htdocs/public/payment/paymentok.php           | 22 ++---
 htdocs/public/stripe/ipn.php                  |  2 +-
 htdocs/public/webportal/tpl/home.tpl.php      |  4 +-
 htdocs/public/webportal/tpl/menu.tpl.php      |  6 +-
 htdocs/reception/card.php                     |  4 +-
 htdocs/reception/class/reception.class.php    |  2 +-
 htdocs/reception/dispatch.php                 |  2 +-
 htdocs/salaries/card.php                      | 14 ++--
 htdocs/salaries/class/api_salaries.class.php  |  4 +-
 htdocs/salaries/class/paymentsalary.class.php |  2 +-
 htdocs/salaries/list.php                      |  8 +-
 htdocs/salaries/paiement_salary.php           |  2 +-
 htdocs/salaries/payment_salary/card.php       |  2 +-
 htdocs/salaries/payments.php                  |  6 +-
 htdocs/salaries/virement_request.php          |  6 +-
 htdocs/societe/admin/societe.php              |  2 +-
 .../canvas/actions_card_common.class.php      |  2 +-
 htdocs/societe/card.php                       | 16 ++--
 htdocs/societe/class/societe.class.php        |  6 +-
 htdocs/societe/consumption.php                |  8 +-
 htdocs/societe/contact.php                    |  4 +-
 htdocs/societe/index.php                      |  2 +-
 htdocs/societe/list.php                       |  6 +-
 htdocs/societe/paymentmodes.php               | 12 +--
 htdocs/societe/societecontact.php             |  2 +-
 htdocs/supplier_proposal/card.php             |  6 +-
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/takepos/admin/terminal.php             |  4 +-
 htdocs/takepos/index.php                      |  2 +-
 htdocs/takepos/invoice.php                    |  4 +-
 htdocs/takepos/pay.php                        |  2 +-
 htdocs/ticket/card.php                        |  8 +-
 htdocs/ticket/class/ticket.class.php          |  4 +-
 htdocs/user/card.php                          | 16 ++--
 htdocs/user/list.php                          |  4 +-
 htdocs/user/param_ihm.php                     |  6 +-
 .../class/html.formcardwebportal.class.php    |  2 +-
 .../invoicelist.controller.class.php          |  2 +-
 .../membercard.controller.class.php           |  6 +-
 .../orderlist.controller.class.php            |  2 +-
 .../propallist.controller.class.php           |  2 +-
 htdocs/website/index.php                      |  8 +-
 255 files changed, 842 insertions(+), 842 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 65a447811cc..982448cebdd 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -92,7 +92,7 @@ if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 	$list_account[] = 'ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT';
 	$list_account[] = 'ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT';
 }
-if (isModEnabled('banque')) {
+if (isModEnabled('bank')) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH';
 }
 if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
@@ -101,7 +101,7 @@ if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 if (isModEnabled('don')) {
 	$list_account[] = 'DONATION_ACCOUNTINGACCOUNT';
 }
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	$list_account[] = 'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT';
 }
 if (isModEnabled('loan')) {
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index aa4c4a3eb00..b625446ca60 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -525,7 +525,7 @@ if ($resql) {
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		$formcategory = new FormCategory($db);
 		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductList ? $searchCategoryProductList : 0);
 		/*
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 3faf0de69b8..6a5139cf16b 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -114,7 +114,7 @@ if ($action == 'set_default') {
 	$res8 = dolibarr_set_const($db, 'MEMBER_SUBSCRIPTION_START_FIRST_DAY_OF', GETPOST('MEMBER_SUBSCRIPTION_START_FIRST_DAY_OF', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res9 = dolibarr_set_const($db, 'MEMBER_SUBSCRIPTION_START_AFTER', GETPOST('MEMBER_SUBSCRIPTION_START_AFTER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// Use vat for invoice creation
-	if (isModEnabled('facture')) {
+	if (isModEnabled('invoice')) {
 		$res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
 		if (isModEnabled("product") || isModEnabled("service")) {
@@ -394,13 +394,13 @@ print "</td></tr>\n";
 // Insert subscription into bank account
 print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices = array('0'=>$langs->trans("None"));
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	$arraychoices['bankdirect'] = $langs->trans("MoreActionBankDirect");
 }
-if (isModEnabled("banque") && isModEnabled("societe") && isModEnabled('facture')) {
+if (isModEnabled("bank") && isModEnabled("societe") && isModEnabled('invoice')) {
 	$arraychoices['invoiceonly'] = $langs->trans("MoreActionInvoiceOnly");
 }
-if (isModEnabled("banque") && isModEnabled("societe") && isModEnabled('facture')) {
+if (isModEnabled("bank") && isModEnabled("societe") && isModEnabled('invoice')) {
 	$arraychoices['bankviainvoice'] = $langs->trans("MoreActionBankViaInvoice");
 }
 print '<td>';
@@ -412,9 +412,9 @@ print '</td>';
 print "</tr>\n";
 
 // Use vat for invoice creation
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<td>';
 		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS', '0'), 0);
 		print '</td>';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 8b96f6c3844..eeff802a2e4 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1130,7 +1130,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</td></tr>\n";
 
 		// Categories
-		if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
 			print img_picto('', 'category').$form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
@@ -1384,7 +1384,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</td></tr>\n";
 
 		// Categories
-		if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td>';
 			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
@@ -1813,7 +1813,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Tags / Categories
-		if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
 			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index c03b28d37dd..c187fc05d75 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2258,7 +2258,7 @@ class Adherent extends CommonObject
 		}
 		$datas['address'] = '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 		// show categories for this record only in ajax to not overload lists
-		if (isModEnabled('categorie') && !$nofetch) {
+		if (isModEnabled('category') && !$nofetch) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_MEMBER, 1);
@@ -2997,7 +2997,7 @@ class Adherent extends CommonObject
 
 		$blockingerrormsg = '';
 
-		if (!isModEnabled('adherent')) { // Should not happen. If module disabled, cron job should not be visible.
+		if (!isModEnabled('member')) { // Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 37aba189a17..403026ff209 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -821,7 +821,7 @@ $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('che
 
 $moreforfilter = '';
 // Filter on categories
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_MEMBER, $search_categ, 'search_categ', 1, $langs->trans("MembersCategoriesShort"));
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3efc9a74ef0..e0c12678e2a 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -273,7 +273,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
 			$action = 'addsubscription';
 		} else {
 			// If an amount has been provided, we check also fields that becomes mandatory when amount is not null.
-			if (isModEnabled('banque') && GETPOST("paymentsave") != 'none') {
+			if (isModEnabled('bank') && GETPOST("paymentsave") != 'none') {
 				if (GETPOST("subscription")) {
 					if (!GETPOST("label")) {
 						$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
@@ -583,7 +583,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
 // Tags / Categories
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	print '<tr><td>'.$langs->trans("Categories").'</td>';
 	print '<td colspan="2">';
 	print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -744,7 +744,7 @@ if ($action != 'addsubscription' && $action != 'create_thirdparty') {
 		print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		if (isModEnabled('banque')) {
+		if (isModEnabled('bank')) {
 			print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		}
 		print "</tr>\n";
@@ -779,7 +779,7 @@ if ($action != 'addsubscription' && $action != 'create_thirdparty') {
 			print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
 			print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
 			print '<td class="right amount">'.price($objp->subscription).'</td>';
-			if (isModEnabled('banque')) {
+			if (isModEnabled('bank')) {
 				print '<td class="right">';
 				if ($objp->bid) {
 					$accountstatic->label = $objp->label;
@@ -808,7 +808,7 @@ if ($action != 'addsubscription' && $action != 'create_thirdparty') {
 
 		if (empty($num)) {
 			$colspan = 6;
-			if (isModEnabled('banque')) {
+			if (isModEnabled('bank')) {
 				$colspan++;
 			}
 			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
@@ -865,11 +865,11 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 			$bankviainvoice = 1;
 		}
 	} else {
-		if (getDolGlobalString('ADHERENT_BANK_USE') == 'bankviainvoice' && isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
+		if (getDolGlobalString('ADHERENT_BANK_USE') == 'bankviainvoice' && isModEnabled('bank') && isModEnabled('societe') && isModEnabled('invoice')) {
 			$bankviainvoice = 1;
-		} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'bankdirect' && isModEnabled('banque')) {
+		} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'bankdirect' && isModEnabled('bank')) {
 			$bankdirect = 1;
-		} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'invoiceonly' && isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
+		} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'invoiceonly' && isModEnabled('bank') && isModEnabled('societe') && isModEnabled('invoice')) {
 			$invoiceonly = 1;
 		}
 	}
@@ -1029,7 +1029,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 		print '"></td></tr>';
 
 		// Complementary action
-		if ((isModEnabled('banque') || isModEnabled('facture')) && !getDolGlobalString('ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS')) {
+		if ((isModEnabled('bank') || isModEnabled('invoice')) && !getDolGlobalString('ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS')) {
 			$company = new Societe($db);
 			if ($object->socid) {
 				$result = $company->fetch($object->socid);
@@ -1043,12 +1043,12 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 			print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'>';
 			print '<label for="none"> '.$langs->trans("None").'</label><br>';
 			// Add entry into bank account
-			if (isModEnabled('banque')) {
+			if (isModEnabled('bank')) {
 				print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
 				print '><label for="bankdirect">  '.$langs->trans("MoreActionBankDirect").'</label><br>';
 			}
 			// Add invoice with no payments
-			if (isModEnabled('societe') && isModEnabled('facture')) {
+			if (isModEnabled('societe') && isModEnabled('invoice')) {
 				print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
 				//if (empty($object->fk_soc)) print ' disabled';
 				print '><label for="invoiceonly"> '.$langs->trans("MoreActionInvoiceOnly");
@@ -1078,7 +1078,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 				print '</label><br>';
 			}
 			// Add invoice with payments
-			if (isModEnabled('banque') && isModEnabled('societe') && isModEnabled('facture')) {
+			if (isModEnabled('bank') && isModEnabled('societe') && isModEnabled('invoice')) {
 				print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
 				//if (empty($object->fk_soc)) print ' disabled';
 				print '><label for="bankviainvoice">  '.$langs->trans("MoreActionBankViaInvoice");
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index b78303d6633..6987a1015af 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -241,7 +241,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'edit') {
 	print '<input type="text" class="flat" name="note" value="'.$object->note_private.'"></td></tr>';
 
 	// Bank line
-	if (isModEnabled("banque") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
+	if (isModEnabled("bank") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
 		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
 		if ($object->fk_bank) {
 			$bankline = new AccountLine($db);
@@ -282,7 +282,7 @@ if ($rowid && $action != 'edit') {
 		$formquestion=array();
 		//$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
-		if (isModEnabled("banque") && getDolGlobalString('ADHERENT_BANK_USE')) {
+		if (isModEnabled("bank") && getDolGlobalString('ADHERENT_BANK_USE')) {
 			$text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoDeleteBankRecord");
 		}
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("DeleteSubscription"), $text, "confirm_delete", $formquestion, 0, 1);
@@ -337,7 +337,7 @@ if ($rowid && $action != 'edit') {
 	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)).'</td></tr>';
 
 	// Bank line
-	if (isModEnabled("banque") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
+	if (isModEnabled("bank") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
 		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
 		if ($object->fk_bank > 0) {
 			$bankline = new AccountLine($db);
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index ddd2728d169..28ad3ef7dd7 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -95,7 +95,7 @@ $arrayfields = array(
 	'd.firstname'=>array('label'=>"Firstname", 'checked'=>1),
 	'd.login'=>array('label'=>"Login", 'checked'=>1),
 	't.libelle'=>array('label'=>"Label", 'checked'=>1),
-	'd.bank'=>array('label'=>"BankAccount", 'checked'=>1, 'enabled'=>(isModEnabled('banque'))),
+	'd.bank'=>array('label'=>"BankAccount", 'checked'=>1, 'enabled'=>(isModEnabled('bank'))),
 	/*'d.note_public'=>array('label'=>"NotePublic", 'checked'=>0),
 	 'd.note_private'=>array('label'=>"NotePrivate", 'checked'=>0),*/
 	'c.dateadh'=>array('label'=>"DateSubscription", 'checked'=>1, 'position'=>100),
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 445535a55e4..9a4ba84d3c7 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -533,7 +533,7 @@ print '<td>';
 print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
 print '<td align="right">';
-if (!isModEnabled('facture')) {
+if (!isModEnabled('invoice')) {
 	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 }
 print '</td>';
@@ -542,8 +542,8 @@ print "</tr>\n";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
-if (!isModEnabled('facture')) {
-	if (isModEnabled("banque")) {
+if (!isModEnabled('invoice')) {
+	if (isModEnabled("bank")) {
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql .= " WHERE clos = 0";
@@ -581,7 +581,7 @@ print "</td></tr>";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
 print "<td>";
-if (!isModEnabled('facture')) {
+if (!isModEnabled('invoice')) {
 	print '<select class="flat" name="chq" id="chq">';
 	print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
 	print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER ? ' selected' : '').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->name ? $mysoc->name : $langs->trans("NotDefined")).')</option>';
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index e20c40a5db1..89c653c5b39 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -58,7 +58,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 
 // Shipment note
-if (isModEnabled('expedition') && !getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {
+if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {
 	// This option should always be set to on when module is on.
 	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);
 }
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2afd06435b8..6d2a0d032d7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -493,24 +493,24 @@ $tabcond[1] = (isModEnabled("societe"));
 $tabcond[2] = true;
 $tabcond[3] = true;
 $tabcond[4] = true;
-$tabcond[5] = (isModEnabled("societe") || isModEnabled('adherent'));
+$tabcond[5] = (isModEnabled("societe") || isModEnabled('member'));
 $tabcond[6] = isModEnabled('agenda');
 $tabcond[7] = isModEnabled('tax');
 $tabcond[8] = isModEnabled("societe");
 $tabcond[9] = true;
 $tabcond[10] = true;
 $tabcond[11] = (isModEnabled("societe"));
-$tabcond[12] = (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
-$tabcond[13] = (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
+$tabcond[12] = (isModEnabled('order') || isModEnabled("propal") || isModEnabled('invoice') || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
+$tabcond[13] = (isModEnabled('order') || isModEnabled("propal") || isModEnabled('invoice') || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
 $tabcond[14] = (isModEnabled("product") && (isModEnabled('ecotax') || getDolGlobalString('MAIN_SHOW_ECOTAX_DICTIONNARY')));
 $tabcond[15] = true;
 $tabcond[16] = (isModEnabled("societe") && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS'));
 $tabcond[17] = (isModEnabled('deplacement') || isModEnabled('expensereport'));
-$tabcond[18] = isModEnabled("expedition") || isModEnabled("reception");
+$tabcond[18] = isModEnabled("delivery_note") || isModEnabled("reception");
 $tabcond[19] = isModEnabled("societe");
 $tabcond[20] = isModEnabled("supplier_order");
 $tabcond[21] = isModEnabled("propal");
-$tabcond[22] = (isModEnabled('commande') || isModEnabled("propal"));
+$tabcond[22] = (isModEnabled('order') || isModEnabled("propal"));
 $tabcond[23] = true;
 $tabcond[24] = isModEnabled('resource');
 $tabcond[25] = isModEnabled('website');
@@ -518,8 +518,8 @@ $tabcond[25] = isModEnabled('website');
 $tabcond[27] = isModEnabled("societe");
 $tabcond[28] = isModEnabled('holiday');
 $tabcond[29] = isModEnabled('project');
-$tabcond[30] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('adherent'));	// stickers format dictionary
-$tabcond[31] = ((isModEnabled('facture') || isModEnabled('supplier_invoice')) && $mysoc->country_code == 'GR');
+$tabcond[30] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member'));	// stickers format dictionary
+$tabcond[31] = ((isModEnabled('invoice') || isModEnabled('supplier_invoice')) && $mysoc->country_code == 'GR');
 $tabcond[32] = (isModEnabled('holiday') || isModEnabled('hrm'));
 $tabcond[33] = isModEnabled('hrm');
 $tabcond[34] = isModEnabled('hrm');
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index a28e5d57482..8beab5a7ef5 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -672,7 +672,7 @@ print "</tr>\n";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
-if (isModEnabled('banque')) {
+if (isModEnabled('bank')) {
 	$sql = "SELECT rowid, label";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
 	$sql .= " WHERE clos = 0";
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 71105f078b5..5dc257a55d2 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -65,10 +65,10 @@ $conditions = array(
 	'NOTE_PRIVATE' => 1,
 	'SOCIETE' => 1,
 	'PRODUCTDESC' => (isModEnabled("product") || isModEnabled("service")),
-	'DETAILS' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande') || isModEnabled('supplier_proposal') || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
+	'DETAILS' => (isModEnabled('invoice') || isModEnabled("propal") || isModEnabled('order') || isModEnabled('supplier_proposal') || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
 	'USERSIGN' => 1,
 	'MAILING' => isModEnabled('mailing'),
-	'MAIL' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande')),
+	'MAIL' => (isModEnabled('invoice') || isModEnabled("propal") || isModEnabled('order')),
 	'TICKET' => isModEnabled('ticket'),
 	'SPECIALCHAR' => 1,
 );
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index dcf59d40d8b..53d52fdfe92 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -169,14 +169,14 @@ if (isModEnabled('societe')) {
 }
 
 // Synchro member active
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	print '<tr class="oddeven"><td>' . $langs->trans("LDAPDnMemberActive") . '</td><td>';
 	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_ACTIVE'), 'activemembers', array(), 2);
 	print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnMemberActiveExample") . '</span></td></tr>';
 }
 
 // Synchro member type active
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	print '<tr class="oddeven"><td>' . $langs->trans("LDAPDnMemberTypeActive") . '</td><td>';
 	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE'), 'activememberstypes', array(), 2);
 	print '</td><td><span class="opacitymedium">' . $langs->trans("LDAPDnMemberTypeActiveExample") . '</span></td></tr>';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index cc9b100d393..a8c07357a81 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langsArray=array("errors", "admin", "mails", "languages");
 
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	$langsArray[]='members';
 }
 if (isModEnabled('eventorganization')) {
@@ -183,7 +183,7 @@ $elementList = array();
 $elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
 $elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
 $elementList['user'] = img_picto('', 'user', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToUser'));
-if (isModEnabled('adherent') && $user->hasRight('adherent', 'lire')) {
+if (isModEnabled('member') && $user->hasRight('adherent', 'lire')) {
 	$elementList['member'] = img_picto('', 'object_member', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToMember'));
 }
 if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjobposition', 'read')) {
@@ -198,19 +198,19 @@ if (isModEnabled('project')) {
 if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 	$elementList['propal_send'] = img_picto('', 'propal', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
 }
-if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 	$elementList['order_send'] = img_picto('', 'order', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
 }
-if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 	$elementList['facture_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
 }
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
 }
 if (isModEnabled("reception")) {
 	$elementList['reception_send'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendReception'));
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
 }
 if (isModEnabled('supplier_proposal')) {
@@ -222,7 +222,7 @@ if (isModEnabled("supplier_order") && ($user->hasRight('fournisseur', 'commande'
 if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {
 	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
 }
-if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 	$elementList['contract'] = img_picto('', 'contract', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendContract'));
 }
 if (isModEnabled('ticket') && $user->hasRight('ticket', 'read')) {
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 31becefc379..20603909699 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -234,7 +234,7 @@ if (isModEnabled('supplier_order')) {
 	print '</div>';
 }
 
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	print load_fiche_titre($langs->trans("Invoices"), '', 'bill');
 
 	print '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 0f6d91f26eb..2eb1ed3c820 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -507,7 +507,7 @@ print '<td>';
 print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
 print '<td align="right">';
-if (!isModEnabled('facture')) {
+if (!isModEnabled('invoice')) {
 	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 }
 print '</td>';
@@ -516,8 +516,8 @@ print "</tr>\n";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
-if (!isModEnabled('facture')) {
-	if (isModEnabled("banque")) {
+if (!isModEnabled('invoice')) {
+	if (isModEnabled("bank")) {
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
 		$sql .= " WHERE clos = 0";
@@ -555,7 +555,7 @@ print "</td></tr>";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
 print "<td>";
-if (!isModEnabled('facture')) {
+if (!isModEnabled('invoice')) {
 	print '<select class="flat" name="chq" id="chq">';
 	print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
 	print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER ? ' selected' : '').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->name ? $mysoc->name : $langs->trans("NotDefined")).')</option>';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index c7d563058b9..b611e00c2ca 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -224,7 +224,7 @@ print '<!-- STOCK_CALCULATE_ON_BILL -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnBill").'</td>';
 print '<td class="right">';
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	if ($conf->use_javascript_ajax) {
 		if ($disabled) {
 			print img_picto($langs->trans("Disabled"), 'off', 'class="opacitymedium"');
@@ -246,7 +246,7 @@ print '<!-- STOCK_CALCULATE_ON_VALIDATE_ORDER -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnValidateOrder").'</td>';
 print '<td class="right">';
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	if ($conf->use_javascript_ajax) {
 		if ($disabled) {
 			print img_picto($langs->trans("Disabled"), 'off', 'class="opacitymedium"');
@@ -270,7 +270,7 @@ print '<!-- STOCK_CALCULATE_ON_SHIPMENT -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipment").'</td>';
 print '<td class="right">';
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT', array(), null, 0, 0, 0, 2, 1, '', '', 'reposition');
 	} else {
@@ -287,7 +287,7 @@ print '<!-- STOCK_CALCULATE_ON_SHIPMENT_CLOSE -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipmentOnClosing").'</td>';
 print '<td class="right">';
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE', array(), null, 0, 0, 0, 2, 1, '', '', 'reposition');
 	} else {
@@ -433,7 +433,7 @@ print "</td>\n";
 print "</tr>\n";
 
 // Option to force stock to be enough before adding a line into document
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
 	print '<td class="right">';
@@ -447,7 +447,7 @@ if (isModEnabled('facture')) {
 	print "</tr>\n";
 }
 
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
 	print '<td class="right">';
@@ -461,7 +461,7 @@ if (isModEnabled('commande')) {
 	print "</tr>\n";
 }
 
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
 	print '<td class="right">';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index ef3dfb2fd99..82a55ca18d6 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -532,7 +532,7 @@ print '<input type="submit" class="button button-edit" value="'.$langs->trans("M
 print "</td></tr>\n";
 print '</form>';
 
-if (isModEnabled('banque')) {
+if (isModEnabled('bank')) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td class="right">';
 	print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 41b77c4e7a0..1628db01977 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -63,36 +63,36 @@ $workflowcodes = array(
 	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array(
 		'family'=>'create',
 		'position'=>10,
-		'enabled'=>(isModEnabled("propal") && isModEnabled('commande')),
+		'enabled'=>(isModEnabled("propal") && isModEnabled('order')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array(
 		'family'=>'create',
 		'position'=>20,
-		'enabled'=>(isModEnabled('commande') && isModEnabled('facture')),
+		'enabled'=>(isModEnabled('order') && isModEnabled('invoice')),
 		'picto'=>'bill'
 	),
 	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array(
 		'family'=>'create',
 		'position'=>25,
-		'enabled'=>(isModEnabled('ticket') && isModEnabled('ficheinter')),
+		'enabled'=>(isModEnabled('ticket') && isModEnabled('intervention')),
 		'picto'=>'ticket'
 	),
 
-	'separator1'=>array('family'=>'separator', 'position'=>25, 'title'=>'', 'enabled'=>((isModEnabled("propal") && isModEnabled('commande')) || (isModEnabled('commande') && isModEnabled('facture')) || (isModEnabled('ticket') && isModEnabled('ficheinter')))),
+	'separator1'=>array('family'=>'separator', 'position'=>25, 'title'=>'', 'enabled'=>((isModEnabled("propal") && isModEnabled('order')) || (isModEnabled('order') && isModEnabled('invoice')) || (isModEnabled('ticket') && isModEnabled('intervention')))),
 
 	// Automatic classification of proposal
 	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array(
 		'family'=>'classify_proposal',
 		'position'=>30,
-		'enabled'=>(isModEnabled("propal") && isModEnabled('commande')),
+		'enabled'=>(isModEnabled("propal") && isModEnabled('order')),
 		'picto'=>'propal',
 		'warning'=>''
 	),
 	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array(
 		'family'=>'classify_proposal',
 		'position'=>31,
-		'enabled'=>(isModEnabled("propal") && isModEnabled('facture')),
+		'enabled'=>(isModEnabled("propal") && isModEnabled('invoice')),
 		'picto'=>'propal',
 		'warning'=>''
 	),
@@ -101,19 +101,19 @@ $workflowcodes = array(
 	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(  // when shipping validated
 		'family'=>'classify_order',
 		'position'=>40,
-		'enabled'=>(isModEnabled("expedition") && isModEnabled('commande')),
+		'enabled'=>(isModEnabled("delivery_note") && isModEnabled('order')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed
 		'family'=>'classify_order',
 		'position'=>41,
-		'enabled'=>(isModEnabled("expedition") && isModEnabled('commande')),
+		'enabled'=>(isModEnabled("delivery_note") && isModEnabled('order')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
 		'family'=>'classify_order',
 		'position'=>42,
-		'enabled'=>(isModEnabled('facture') && isModEnabled('commande')),
+		'enabled'=>(isModEnabled('invoice') && isModEnabled('order')),
 		'picto'=>'order',
 		'warning'=>''
 	), // For this option, if module invoice is disabled, it does not exists, so "Classify billed" for order must be done manually from order card.
@@ -166,7 +166,7 @@ $workflowcodes = array(
 	'WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE' => array(
 		'family' => 'classify_shipping',
 		'position' => 91,
-		'enabled' => isModEnabled("expedition") && isModEnabled("facture") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0',
+		'enabled' => isModEnabled("delivery_note") && isModEnabled("invoice") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0',
 		'picto' => 'shipment'
 	),
 
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 23c40994d9b..451720bbd59 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -146,7 +146,7 @@ class BlockedLog
 		$this->trackedevents = array();
 
 		// Customer Invoice/Facture / Payment
-		if (isModEnabled('facture')) {
+		if (isModEnabled('invoice')) {
 			$this->trackedevents['BILL_VALIDATE'] = 'logBILL_VALIDATE';
 			$this->trackedevents['BILL_DELETE'] = 'logBILL_DELETE';
 			$this->trackedevents['BILL_SENTBYMAIL'] = 'logBILL_SENTBYMAIL';
@@ -188,14 +188,14 @@ class BlockedLog
 		 */
 
 		// Members
-		if (isModEnabled('adherent')) {
+		if (isModEnabled('member')) {
 			$this->trackedevents['MEMBER_SUBSCRIPTION_CREATE'] = 'logMEMBER_SUBSCRIPTION_CREATE';
 			$this->trackedevents['MEMBER_SUBSCRIPTION_MODIFY'] = 'logMEMBER_SUBSCRIPTION_MODIFY';
 			$this->trackedevents['MEMBER_SUBSCRIPTION_DELETE'] = 'logMEMBER_SUBSCRIPTION_DELETE';
 		}
 
 		// Bank
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$this->trackedevents['PAYMENT_VARIOUS_CREATE'] = 'logPAYMENT_VARIOUS_CREATE';
 			$this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
 			$this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index bcad30ffa91..4eb7fa3ad6b 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1457,7 +1457,7 @@ if ($action == 'create') {
 		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
 	}
 
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
@@ -2027,7 +2027,7 @@ if ($id > 0) {
 		print '</td></tr>';
 
 		// Tags-Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -2452,7 +2452,7 @@ if ($id > 0) {
 		}
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_ACTIONCOMM, 1);
 			print "</td></tr>";
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 7bfbe08af9c..e42e58ec2fc 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1660,7 +1660,7 @@ class ActionComm extends CommonObject
 			$datas['note'] .= '</div>';
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (isModEnabled('categorie') && !$nofetch) {
+		if (isModEnabled('category') && !$nofetch) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 93191e69bea..ac9148579b1 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -213,10 +213,10 @@ class CActionComm
 						//var_dump($obj->type.' '.$obj->module.' '); var_dump($user->hasRight('facture', 'lire'));
 						$qualified = 0;
 						// Special cases
-						if ($obj->module == 'invoice' && isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+						if ($obj->module == 'invoice' && isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 							$qualified = 1;
 						}
-						if ($obj->module == 'order' && isModEnabled('commande') && !$user->hasRight('commande', 'lire')) {
+						if ($obj->module == 'order' && isModEnabled('order') && !$user->hasRight('commande', 'lire')) {
 							$qualified = 1;
 						}
 						if ($obj->module == 'propal' && isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
@@ -228,7 +228,7 @@ class CActionComm
 						if ($obj->module == 'order_supplier' && ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (!isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')))) {
 							$qualified = 1;
 						}
-						if ($obj->module == 'shipping' && isModEnabled("expedition") && $user->hasRight('expedition', 'lire')) {
+						if ($obj->module == 'shipping' && isModEnabled("delivery_note") && $user->hasRight('expedition', 'lire')) {
 							$qualified = 1;
 						}
 						// For case module = 'myobject@eventorganization'
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 72357539c84..c00ff438490 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -41,48 +41,48 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'banks'));
 
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$langs->load("contracts");
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$langs->load("orders");
 }
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	$langs->load("sendings");
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$langs->load("bills");
 }
 if (isModEnabled('project')) {
 	$langs->load("projects");
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$langs->load("interventions");
 }
 if (isModEnabled('notification')) {
@@ -440,7 +440,7 @@ if ($object->id > 0) {
 	print "</td>";
 	print '</tr>';
 
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		// Default bank account for payments
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -512,7 +512,7 @@ if ($object->id > 0) {
 	}
 
 	if ($object->client) {
-		if (isModEnabled('commande') && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
+		if (isModEnabled('order') && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
 			print '<!-- Minimum amount for orders -->'."\n";
 			print '<tr class="nowrap">';
 			print '<td>';
@@ -607,7 +607,7 @@ if ($object->id > 0) {
 	}
 
 	// Categories
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		$langs->load("categories");
 		print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
 		print '<td>';
@@ -623,7 +623,7 @@ if ($object->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
 	// Module Adherent
-	if (isModEnabled('adherent')) {
+	if (isModEnabled('member')) {
 		$langs->load("members");
 		$langs->load("users");
 
@@ -721,7 +721,7 @@ if ($object->id > 0) {
 		}
 	}
 
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 		// Box commandes
 		$tmp = $object->getOutstandingOrders();
 		$outstandingOpened = $tmp['opened'];
@@ -742,7 +742,7 @@ if ($object->id > 0) {
 		}
 	}
 
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		// Box factures
 		$tmp = $object->getOutstandingBills('customer', 0);
 		$outstandingOpened = $tmp['opened'];
@@ -917,7 +917,7 @@ if ($object->id > 0) {
 	/*
 	 * Latest orders
 	 */
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 		$param ="";
 
 		$sql = "SELECT s.nom, s.rowid";
@@ -1028,7 +1028,7 @@ if ($object->id > 0) {
 	/*
 	 *   Latest shipments
 	 */
-	if (isModEnabled("expedition") && $user->hasRight('expedition', 'lire')) {
+	if (isModEnabled("delivery_note") && $user->hasRight('expedition', 'lire')) {
 		$sql = 'SELECT e.rowid as id';
 		$sql .= ', e.ref, e.entity';
 		$sql .= ', e.date_creation';
@@ -1126,7 +1126,7 @@ if ($object->id > 0) {
 	/*
 	 * Latest contracts
 	 */
-	if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 		$sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut as contract_status, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup, c.entity,";
 		$sql .= " c.last_main_doc, c.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
@@ -1234,7 +1234,7 @@ if ($object->id > 0) {
 	/*
 	 * Latest interventions
 	 */
-	if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire')) {
+	if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire')) {
 		$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate, f.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
@@ -1320,7 +1320,7 @@ if ($object->id > 0) {
 	/*
 	 *   Latest invoices templates
 	 */
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$sql = 'SELECT f.rowid as id, f.titre as ref';
 		$sql .= ', f.total_ht';
 		$sql .= ', f.total_tva';
@@ -1421,7 +1421,7 @@ if ($object->id > 0) {
 	/*
 	 *   Latest invoices
 	 */
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$sql = 'SELECT f.rowid as facid, f.ref, f.type';
 		$sql .= ', f.total_ht';
 		$sql .= ', f.total_tva';
@@ -1579,7 +1579,7 @@ if ($object->id > 0) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
 		}
 
-		if (isModEnabled('commande') && $user->hasRight('commande', 'creer') && $object->status == 1) {
+		if (isModEnabled('order') && $user->hasRight('commande', 'creer') && $object->status == 1) {
 			$langs->load("orders");
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
 		}
@@ -1589,7 +1589,7 @@ if ($object->id > 0) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
 		}
 
-		if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'creer') && $object->status == 1) {
+		if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'creer') && $object->status == 1) {
 			$langs->load("fichinter");
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
 		}
@@ -1601,14 +1601,14 @@ if ($object->id > 0) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
 			}
 
-			if (isModEnabled('facture') && $object->status == 1) {
+			if (isModEnabled('invoice') && $object->status == 1) {
 				if (!$user->hasRight('facture', 'creer')) {
 					$langs->load("bills");
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
 				} else {
 					$langs->loadLangs(array("orders", "bills"));
 
-					if (isModEnabled('commande')) {
+					if (isModEnabled('order')) {
 						if ($object->client != 0 && $object->client != 2) {
 							if (!empty($orders2invoice) && $orders2invoice > 0) {
 								print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 67823d4b12f..77f0c7ea647 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -39,10 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
 
@@ -96,14 +96,14 @@ if (isModEnabled("propal")) {
 if (isModEnabled('supplier_proposal')) {
 	$supplierproposalstatic = new SupplierProposal($db);
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$orderstatic = new Commande($db);
 }
 if (isModEnabled("supplier_order")) {
 	$supplierorderstatic = new CommandeFournisseur($db);
 }
 
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$fichinterstatic = new Fichinter($db);
 }
 
@@ -323,7 +323,7 @@ if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "l
  * Draft sales orders
  */
 
-if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.total_tva, c.total_ttc, c.fk_statut as status";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
@@ -518,7 +518,7 @@ if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
 /*
  * Draft interventions
  */
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$sql = "SELECT f.rowid, f.ref, s.nom as name, f.fk_statut, f.duree as duration";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
@@ -817,7 +817,7 @@ if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $use
 /*
  * Latest contracts
  */
-if (isModEnabled('contrat') && $user->hasRight("contrat", "lire") && 0) { // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
+if (isModEnabled('contract') && $user->hasRight("contrat", "lire") && 0) { // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
 	$staticcontrat = new Contrat($db);
 
 	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
@@ -1014,7 +1014,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 /*
  * Opened (validated) order
  */
-if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 	$sql = "SELECT c.rowid as commandeid, c.total_ttc, c.total_ht, c.total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 4742d6b66e7..adfb7feeffb 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('mails', 'companies'));
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$langs->load("categories");
 }
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index d22278ad585..9c30198f3e7 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -757,7 +757,7 @@ if (empty($reshook)) {
 
 				if (
 					!$error && GETPOSTINT('statut') == $object::STATUS_SIGNED && GETPOSTINT('generate_deposit') == 'on'
-					&& !empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && $user->hasRight('facture', 'creer')
+					&& !empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer')
 				) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
@@ -1991,7 +1991,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("bank")) {
 			print '<tr class="field_fk_account"><td class="titlefieldcreate">'.$langs->trans('BankAccount').'</td><td class="valuefieldcreate">';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 			print '</td></tr>';
@@ -2004,7 +2004,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Shipping Method
-		if (isModEnabled("expedition")) {
+		if (isModEnabled("delivery_note")) {
 			if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($soc->shipping_method_id)) {
 				$shipping_method_id = $soc->shipping_method_id;
 			}
@@ -2025,7 +2025,7 @@ if ($action == 'create') {
 
 		// Delivery delay
 		print '<tr class="field_availability_id"><td class="titlefieldcreate">'.$langs->trans('AvailabilityPeriod');
-		if (isModEnabled('commande')) {
+		if (isModEnabled('order')) {
 			print ' ('.$langs->trans('AfterOrder').')';
 		}
 		print '</td><td class="valuefieldcreate">';
@@ -2284,7 +2284,7 @@ if ($action == 'create') {
 			// It may also break step of creating an order when invoicing must be done from orders and not from proposal
 			$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-			if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && $user->hasRight('facture', 'creer')) {
+			if (!empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer')) {
 				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
 				$object->fetchObjectLinked();
@@ -2674,7 +2674,7 @@ if ($action == 'create') {
 		// Delivery delay
 		print '<tr class="fielddeliverydelay"><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		if (isModEnabled('commande')) {
+		if (isModEnabled('order')) {
 			print $form->textwithpicto($langs->trans('AvailabilityPeriod'), $langs->trans('AvailabilityPeriod').' ('.$langs->trans('AfterOrder').')');
 		} else {
 			print $langs->trans('AvailabilityPeriod');
@@ -2695,7 +2695,7 @@ if ($action == 'create') {
 		print '</tr>';
 
 		// Shipping Method
-		if (isModEnabled("expedition")) {
+		if (isModEnabled("delivery_note")) {
 			print '<tr><td>';
 			print '<table class="nobordernopadding centpercent"><tr><td>';
 			print $langs->trans('SendingMethod');
@@ -2813,7 +2813,7 @@ if ($action == 'create') {
 			print '</tr>';
 		}
 
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("bank")) {
 			// Bank Account
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
@@ -3057,7 +3057,7 @@ if ($action == 'create') {
 				}
 
 				// Create a sale order
-				if (isModEnabled('commande') && $object->statut == Propal::STATUS_SIGNED) {
+				if (isModEnabled('order') && $object->statut == Propal::STATUS_SIGNED) {
 					if ($usercancreateorder) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
 					}
@@ -3073,7 +3073,7 @@ if ($action == 'create') {
 				}
 
 				// Create an intervention
-				if (isModEnabled("service") && isModEnabled('ficheinter') && $object->statut == Propal::STATUS_SIGNED) {
+				if (isModEnabled("service") && isModEnabled('intervention') && $object->statut == Propal::STATUS_SIGNED) {
 					if ($usercancreateintervention) {
 						$langs->load("interventions");
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
@@ -3081,7 +3081,7 @@ if ($action == 'create') {
 				}
 
 				// Create contract
-				if (isModEnabled('contrat') && $object->statut == Propal::STATUS_SIGNED) {
+				if (isModEnabled('contract') && $object->statut == Propal::STATUS_SIGNED) {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
@@ -3091,7 +3091,7 @@ if ($action == 'create') {
 
 				// Create an invoice and classify billed
 				if ($object->statut == Propal::STATUS_SIGNED && !getDolGlobalString('PROPOSAL_ARE_NOT_BILLABLE')) {
-					if (isModEnabled('facture') && $usercancreateinvoice) {
+					if (isModEnabled('invoice') && $usercancreateinvoice) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 					}
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 7a1626674e5..24c92ad317c 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -51,14 +51,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	$langs->loadLangs(array('sendings'));
 }
 
@@ -222,7 +222,7 @@ $arrayfields = array(
 	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
 	'p.date_signature'=>array('label'=>"DateSigning", 'checked'=>0),
 	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
-	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>isModEnabled("expedition")),
+	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>isModEnabled("delivery_note")),
 	'p.fk_input_reason'=>array('label'=>"Origin", 'checked'=>0, 'enabled'=>1),
 	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0),
 	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
@@ -1156,14 +1156,14 @@ if ($search_date_signature_endyear) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
 		$searchCategoryProductOperator = -1;
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$formcategory = new FormCategory($db);
 		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, array($search_product_category), 'maxwidth300', $searchCategoryProductOperator, 0, 0, $tmptitle);
 	}
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 4881fce1920..0c9a7454620 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$langs->load("bills");
 }
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c2c6cfe44cf..41cfb6dd96c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1355,7 +1355,7 @@ if (empty($reshook)) {
 
 				if (
 					GETPOST('generate_deposit', 'alpha') == 'on' && !empty($deposit_percent_from_payment_terms)
-					&& isModEnabled('facture') && $user->hasRight('facture', 'creer')
+					&& isModEnabled('invoice') && $user->hasRight('facture', 'creer')
 				) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
@@ -1946,14 +1946,14 @@ if ($action == 'create' && $usercancreate) {
 		print '</td></tr>';
 
 		// Bank Account
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("bank")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 			print '</td></tr>';
 		}
 
 		// Shipping Method
-		if (isModEnabled('expedition')) {
+		if (isModEnabled('delivery_note')) {
 			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
 			print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
 			$form->selectShippingMethod(((GETPOSTISSET('shipping_method_id') && GETPOSTINT('shipping_method_id') != 0) ? GETPOST('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
@@ -2242,7 +2242,7 @@ if ($action == 'create' && $usercancreate) {
 				// It may also break step of creating an order when invoicing must be done from proposals and not from orders
 				$deposit_percent_from_payment_terms = (float) getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-				if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && $user->hasRight('facture', 'creer')) {
+				if (!empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer')) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
 					$object->fetchObjectLinked();
@@ -2593,7 +2593,7 @@ if ($action == 'create' && $usercancreate) {
 			print '</td></tr>';
 
 			// Shipping Method
-			if (isModEnabled('expedition')) {
+			if (isModEnabled('delivery_note')) {
 				print '<tr><td>';
 				$editenable = $usercancreate;
 				print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, $editenable);
@@ -2750,7 +2750,7 @@ if ($action == 'create' && $usercancreate) {
 			}
 
 			// Bank Account
-			if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("banque")) {
+			if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("bank")) {
 				print '<tr><td>';
 				$editenable = $usercancreate;
 				print $form->editfieldkey("BankAccount", 'bankaccount', '', $object, $editenable);
@@ -2971,7 +2971,7 @@ if ($action == 'create' && $usercancreate) {
 				}*/
 
 				// Create intervention
-				$arrayforbutaction[] = array('lang'=>'interventions', 'enabled'=>(isModEnabled("ficheinter") && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0), 'perm'=>$user->hasRight('ficheinter', 'creer'), 'label'=>'AddIntervention', 'url'=>'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
+				$arrayforbutaction[] = array('lang'=>'interventions', 'enabled'=>(isModEnabled("intervention") && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0), 'perm'=>$user->hasRight('ficheinter', 'creer'), 'label'=>'AddIntervention', 'url'=>'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
 				/*if (isModEnabled('ficheinter')) {
 					$langs->load("interventions");
 
@@ -2985,7 +2985,7 @@ if ($action == 'create' && $usercancreate) {
 				}*/
 
 				// Create contract
-				$arrayforbutaction[] = array('lang'=>'contracts', 'enabled'=>(isModEnabled("contrat") && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)), 'perm'=>$user->hasRight('contrat', 'creer'), 'label'=>'AddContract', 'url'=>'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
+				$arrayforbutaction[] = array('lang'=>'contracts', 'enabled'=>(isModEnabled("contract") && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)), 'perm'=>$user->hasRight('contrat', 'creer'), 'label'=>'AddContract', 'url'=>'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
 				/*if (isModEnabled('contrat') && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
 					$langs->load("contracts");
 
@@ -2995,14 +2995,14 @@ if ($action == 'create' && $usercancreate) {
 				}*/
 
 				$numshipping = 0;
-				if (isModEnabled('expedition')) {
+				if (isModEnabled('delivery_note')) {
 					$numshipping = $object->countNbOfShipments();
 				}
 
 				// Create shipment
 				if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 					if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'creer')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer'))) {
-						$arrayforbutaction[] = array('lang'=>'sendings', 'enabled'=>(isModEnabled("expedition") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm'=>$user->hasRight('expedition', 'creer'), 'label'=>'CreateShipment', 'url'=>'/expedition/shipment.php?id='.$object->id);
+						$arrayforbutaction[] = array('lang'=>'sendings', 'enabled'=>(isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm'=>$user->hasRight('expedition', 'creer'), 'label'=>'CreateShipment', 'url'=>'/expedition/shipment.php?id='.$object->id);
 						/*
 						if ($user->hasRight('expedition', 'creer')) {
 						print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
@@ -3018,7 +3018,7 @@ if ($action == 'create' && $usercancreate) {
 				// Create bill
 				$arrayforbutaction[] = array(
 					'lang'=>'bills',
-					'enabled'=>(isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
+					'enabled'=>(isModEnabled('invoice') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
 					'perm'=>($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
 					'label'=>'CreateBill',
 					'url'=>'/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.urlencode($object->element).'&amp;originid='.$object->id.'&amp;socid='.$object->socid
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 27071e824ea..cb2f301c2d9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3825,7 +3825,7 @@ class Commande extends CommonOrder
 
 		$result = '';
 
-		if (isModEnabled("expedition") && ($option == '1' || $option == '2')) {
+		if (isModEnabled("delivery_note") && ($option == '1' || $option == '2')) {
 			$url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
 		} else {
 			$url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 0186d660953..564cfcde895 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -92,7 +92,7 @@ if ($tmp) {
 /*
  * Draft orders
  */
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
 	$sql .= ", s.client";
 	$sql .= ", s.code_client";
@@ -244,7 +244,7 @@ $max = 10;
 /*
  * Orders to process
  */
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
 	$sql .= ", s.client";
 	$sql .= ", s.code_client";
@@ -333,7 +333,7 @@ if (isModEnabled('commande')) {
 /*
  * Orders that are in process
  */
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
 	$sql .= ", s.client";
 	$sql .= ", s.code_client";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c9fa02304f5..b8308827c6c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -179,7 +179,7 @@ $arrayfields = array(
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60, 'csslist'=>'nowraponall'),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65, 'csslist'=>'nowraponall'),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("expedition")),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("delivery_note")),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
 	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
@@ -202,7 +202,7 @@ $arrayfields = array(
 	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
 	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135, 'searchall'=>1),
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>140),
-	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("expedition")), 'position'=>990),
+	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("delivery_note")), 'position'=>990),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
 	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
@@ -893,7 +893,7 @@ if ($search_billed != '' && $search_billed >= 0) {
 }
 if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
-		if ($search_status == 1 && !isModEnabled('expedition')) {
+		if ($search_status == 1 && !isModEnabled('delivery_note')) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated"
 		} else {
 			$sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled
@@ -1150,7 +1150,7 @@ if ($search_status == -2) {
 	$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
 }
 if ($search_status == -3) {
-	$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('expedition') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+	$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('delivery_note') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 }
 if ($search_status == -4) {
 	$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
@@ -1327,7 +1327,7 @@ if ($permissiontovalidate) {
 if ($permissiontoclose) {
 	$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
 }
-if (isModEnabled('facture') && $user->hasRight("facture", "creer")) {
+if (isModEnabled('invoice') && $user->hasRight("facture", "creer")) {
 	$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
 }
 if ($permissiontoclose) {
@@ -1466,7 +1466,7 @@ if ($user->hasRight("user", "user", "lire")) {
 }
 
 // If the user can view other products/services than his own
-if (isModEnabled('categorie') && $user->hasRight("categorie", "lire") && ($user->hasRight("produit", "lire") || $user->hasRight("service", "lire"))) {
+if (isModEnabled('category') && $user->hasRight("categorie", "lire") && ($user->hasRight("produit", "lire") || $user->hasRight("service", "lire"))) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -1475,7 +1475,7 @@ if (isModEnabled('categorie') && $user->hasRight("categorie", "lire") && ($user-
 	$moreforfilter .= '</div>';
 }
 // If Categories are enabled & user has rights to see
-if (isModEnabled('categorie') && $user->hasRight("categorie", "lire")) {
+if (isModEnabled('category') && $user->hasRight("categorie", "lire")) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
@@ -2192,7 +2192,7 @@ while ($i < $imaxinloop) {
 			}
 
 			// If module invoices enabled and user with invoice creation permissions
-			if (isModEnabled('facture') && getDolGlobalString('ORDER_BILLING_ALL_CUSTOMER')) {
+			if (isModEnabled('invoice') && getDolGlobalString('ORDER_BILLING_ALL_CUSTOMER')) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) {
 						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
@@ -2665,7 +2665,7 @@ while ($i < $imaxinloop) {
 								$stock_order = 0;
 								$stock_order_supplier = 0;
 								if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {    // What about other options ?
-									if (isModEnabled('commande')) {
+									if (isModEnabled('order')) {
 										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
 											$generic_product->load_stats_commande(0, '1,2');
 											$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 38e10afd97e..2be6cd61baf 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -48,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -79,7 +79,7 @@ $search_dateorder_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateorder_end_
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery_start_month'), GETPOSTINT('search_datedelivery_start_day'), GETPOSTINT('search_datedelivery_start_year'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_end_month'), GETPOSTINT('search_datedelivery_end_day'), GETPOSTINT('search_datedelivery_end_year'));
 
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$search_product_category_array = GETPOST("search_category_".Categorie::TYPE_PRODUCT."_list", "array");
 	$searchCategoryProductOperator = 0;
 	if (GETPOSTISSET('formfilteraction')) {
@@ -197,7 +197,7 @@ $arrayfields = array(
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled('expedition')),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled('delivery_note')),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
 	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
@@ -221,7 +221,7 @@ $arrayfields = array(
 	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
 	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position'=>135),
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position'=>140),
-	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled('expedition')), 'position'=>990),
+	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled('delivery_note')), 'position'=>990),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
 	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
@@ -472,7 +472,7 @@ if ($search_billed != '' && $search_billed >= 0) {
 }
 if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
-		if ($search_status == 1 && !isModEnabled('expedition')) {
+		if ($search_status == 1 && !isModEnabled('delivery_note')) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated"
 		} else {
 			$sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled
@@ -687,7 +687,7 @@ if ($resql) {
 		$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
 	}
 	if ($search_status == -3) {
-		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('expedition') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('delivery_note') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 	}
 	if ($search_status == -4) {
 		$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
@@ -937,11 +937,11 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// Filter on categories
-	if (isModEnabled("categorie") && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+	if (isModEnabled("category") && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 		$formcategory = new FormCategory($db);
 		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $search_product_category_array, 'minwidth300imp minwidth300', $searchCategoryProductOperator ? $searchCategoryProductOperator : 0);
 	}
-	if (isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled("category") && $user->hasRight('categorie', 'lire')) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
@@ -1678,7 +1678,7 @@ if ($resql) {
 			print $getNomUrl_cache[$obj->socid];
 
 			// If module invoices enabled and user with invoice creation permissions
-			if (isModEnabled('facture') && getDolGlobalString('ORDER_BILLING_ALL_CUSTOMER')) {
+			if (isModEnabled('invoice') && getDolGlobalString('ORDER_BILLING_ALL_CUSTOMER')) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) {
 						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
@@ -2124,7 +2124,7 @@ if ($resql) {
 							$stock_order = 0;
 							$stock_order_supplier = 0;
 							if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {    // What about other options ?
-								if (isModEnabled('commande')) {
+								if (isModEnabled('order')) {
 									if (empty($productstat_cache[$obj->fk_product]['stats_order_customer'])) {
 										$generic_product->load_stats_commande(0, '1,2');
 										$productstat_cache[$obj->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index f6a67149aa8..b22abd7b33a 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -135,13 +135,13 @@ if (empty($entity)) {
 $error = 0;
 
 $listofchoices = array(
-	'selectinvoices'=>array('label'=>'Invoices', 'picto'=>'bill', 'lang'=>'bills', 'enabled' => isModEnabled('facture'), 'perms' => $user->hasRight('facture', 'lire')),
+	'selectinvoices'=>array('label'=>'Invoices', 'picto'=>'bill', 'lang'=>'bills', 'enabled' => isModEnabled('invoice'), 'perms' => $user->hasRight('facture', 'lire')),
 	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'picto'=>'supplier_invoice', 'lang'=>'bills', 'enabled' => isModEnabled('supplier_invoice'), 'perms' => $user->hasRight('fournisseur', 'facture', 'lire')),
 	'selectexpensereports'=>array('label'=>'ExpenseReports', 'picto'=>'expensereport', 'lang'=>'trips', 'enabled' => isModEnabled('expensereport'), 'perms' => $user->hasRight('expensereport', 'lire')),
 	'selectdonations'=>array('label'=>'Donations', 'picto'=>'donation', 'lang'=>'donation', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('don', 'lire')),
 	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'picto'=>'bill', 'enabled' => isModEnabled('tax'), 'perms' => $user->hasRight('tax', 'charges', 'lire')),
 	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'picto'=>'salary', 'lang'=>'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => $user->hasRight('salaries', 'read')),
-	'selectvariouspayment'=>array('label'=>'VariousPayment', 'picto'=>'payment', 'enabled' => isModEnabled('banque'), 'perms' => $user->hasRight('banque', 'lire')),
+	'selectvariouspayment'=>array('label'=>'VariousPayment', 'picto'=>'payment', 'enabled' => isModEnabled('bank'), 'perms' => $user->hasRight('banque', 'lire')),
 	'selectloanspayment'=>array('label'=>'PaymentLoan','picto'=>'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
 );
 
@@ -643,7 +643,7 @@ if (isModEnabled('multicompany') && is_object($mc)) {
 print '<br>';
 
 // Project filter
-if (isModEnabled('projet')) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 	$langs->load('projects');
 	print '<span class="marginrightonly">'.$langs->trans('Project').":</span>";
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 8ca2d819152..e6eacc582a6 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1049,9 +1049,9 @@ if ($resql) {
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		// Categories
-		if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 			$langs->load('categories');
 
 			// Bank line
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 369749781b5..d6680d09e8e 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 if (isModEnabled('accounting')) {
@@ -477,7 +477,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Tags-Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 
@@ -762,7 +762,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield centpercent">';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_ACCOUNT, 1);
 			print "</td></tr>";
@@ -1037,7 +1037,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Tags-Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 3044834f328..d6568fb9855 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1462,7 +1462,7 @@ class Account extends CommonObject
 			$datas['accountancyjournal'] = '<br><b>'.$langs->trans('AccountancyJournal').':</b> '.$this->accountancy_journal;
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (isModEnabled('categorie') && !$nofetch) {
+		if (isModEnabled('category') && !$nofetch) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_ACCOUNT, 1);
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 1254809106d..81f5e8e6320 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -472,11 +472,11 @@ class PaymentVarious extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (isModEnabled("banque") && (empty($this->fk_account) || $this->fk_account <= 0)) {
+		if (isModEnabled("bank") && (empty($this->fk_account) || $this->fk_account <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -6;
 		}
-		if (isModEnabled("banque") && (empty($this->type_payment) || $this->type_payment <= 0)) {
+		if (isModEnabled("bank") && (empty($this->type_payment) || $this->type_payment <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -7;
 		}
@@ -530,7 +530,7 @@ class PaymentVarious extends CommonObject
 			$this->ref = (string) $this->id;
 
 			if ($this->id > 0) {
-				if (isModEnabled("banque") && !empty($this->amount)) {
+				if (isModEnabled("bank") && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 09b24fa6c70..c474b6ce2e1 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills', 'other'));
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	$langs->load("members");
 }
 if (isModEnabled('don')) {
@@ -621,7 +621,7 @@ if ($result) {
 		print "</tr>";
 
 		// Categories
-		if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 			$langs->load('categories');
 
 			// Bank line
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 97d34c16fba..d88cb100991 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -39,7 +39,7 @@ if (isModEnabled('accounting')) {
 if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -61,7 +61,7 @@ $search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') :
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $search_category_list ="";
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array");
 }
 
@@ -400,7 +400,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $moreforfilter = '';
 
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= $form->getFilterBox(Categorie::TYPE_ACCOUNT, $search_category_list);
 }
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 9463e357b42..4b1667cce1d 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -144,7 +144,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$error++;
 		}
-		if (isModEnabled("banque") && !$object->accountid > 0) {
+		if (isModEnabled("bank") && !$object->accountid > 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 			$error++;
@@ -435,7 +435,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Bank
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td>';
 		print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).'</td><td>';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
@@ -450,7 +450,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Number
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '</label></td>';
@@ -687,7 +687,7 @@ if ($id) {
 
 	$bankaccountnotfound = 0;
 
-	if (isModEnabled('banque')) {
+	if (isModEnabled('bank')) {
 		print '<tr>';
 		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 95850bead49..d750864de6f 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -163,8 +163,8 @@ $arrayfields = array(
 	'datev'			=>array('label'=>"DateValue", 'checked'=>-1, 'position'=>130),
 	'type'			=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>140),
 	'project'		=>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>isModEnabled('project')),
-	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>isModEnabled("banque")),
-	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>isModEnabled("banque")),
+	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>isModEnabled("bank")),
+	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>isModEnabled("bank")),
 	'account'		=>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>isModEnabled('accounting')),
 	'subledger'		=>array('label'=>"SubledgerAccount", 'checked'=>1, 'position'=>410, "enabled"=>isModEnabled('accounting')),
 	'debit'			=>array('label'=>"Debit", 'checked'=>1, 'position'=>500),
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 5d78d4ad4be..b67014218f5 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -147,7 +147,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 	}
 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -223,7 +223,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 			}
 			print $obj->num_payment.'</td>';
 			// Account
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td>';
 				if ($obj->fk_bank > 0) {
 					//$accountstatic->fetch($obj->fk_bank);
@@ -263,7 +263,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 		print '<td class="liste_total center">&nbsp;</td>';
 		print '<td class="liste_total center">&nbsp;</td>';
 		print '<td class="liste_total center">&nbsp;</td>';
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td class="liste_total center"></td>';
 		}
 		print '<td class="liste_total right">'.price($totalpaid)."</td>";
@@ -317,7 +317,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "ptva.rowid", "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "ptva.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 		}
 		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "ptva.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -356,7 +356,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 			print $obj->num_payment.'</td>';
 
 			// Account
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td>';
 				if ($obj->fk_bank > 0) {
 					//$accountstatic->fetch($obj->fk_bank);
@@ -392,7 +392,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 		print '<td class="liste_total"></td>';
 		print '<td class="liste_total"></td>';
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td class="liste_total"></td>';
 		}
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8f212f663ab..12fafdd5205 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -53,7 +53,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (isModEnabled('project')) {
@@ -3909,7 +3909,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 			print $form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
@@ -4814,7 +4814,7 @@ if ($action == 'create') {
 		}
 
 		// Bank Account
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<tr><td class="nowrap">';
 			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
@@ -5087,7 +5087,7 @@ if ($action == 'create') {
 		if (isModEnabled('project')) {
 			$nbrows++;
 		}
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$nbrows++;
 			$nbcols++;
 		}
@@ -5116,7 +5116,7 @@ if ($action == 'create') {
 			print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
 			print '<td></td>';
 			print '<td class="center">'.$langs->trans('Situation').'</td>';
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td class="right"></td>';
 			}
 			print '<td class="right">'.$langs->trans('AmountHT').'</td>';
@@ -5140,7 +5140,7 @@ if ($action == 'create') {
 					print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
 					print '<td></td>';
 					print '<td align="center" >'.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$prev_invoice->situation_counter.'</td>';
-					if (isModEnabled("banque")) {
+					if (isModEnabled("bank")) {
 						print '<td class="right"></td>';
 					}
 					print '<td class="right"><span class="amount">'.price($prev_invoice->total_ht).'</span></td>';
@@ -5160,7 +5160,7 @@ if ($action == 'create') {
 			print '<td>'.$object->getNomUrl(1).'</td>';
 			print '<td></td>';
 			print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td class="right"></td>';
 			}
 			print '<td class="right"><span class="amount">'.price($object->total_ht).'</span></td>';
@@ -5183,7 +5183,7 @@ if ($action == 'create') {
 				$i++;
 			}
 			print '</td>';
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td></td>';
 			}
 			print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
@@ -5215,7 +5215,7 @@ if ($action == 'create') {
 					print '<td>'.$next_invoice->getNomUrl(1).'</td>';
 					print '<td></td>';
 					print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
-					if (isModEnabled("banque")) {
+					if (isModEnabled("bank")) {
 						print '<td class="right"></td>';
 					}
 					print '<td class="right"><span class="amount">'.price($next_invoice->total_ht).'</span></td>';
@@ -5229,7 +5229,7 @@ if ($action == 'create') {
 
 				print '<tr class="oddeven">';
 				print '<td colspan="3" class="right"></td>';
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					print '<td class="right"></td>';
 				}
 				print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
@@ -5256,7 +5256,7 @@ if ($action == 'create') {
 		print '<td class="liste_titre">'.($object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')).'</td>';
 		print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('Date').'</span></td>';
 		print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('Type').'</span></td>';
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('BankAccount').'</span></td>';
 		}
 		print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
@@ -5306,7 +5306,7 @@ if ($action == 'create') {
 
 					$label = ($langs->trans("PaymentType".$objp->payment_code) != "PaymentType".$objp->payment_code) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
 					print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($label.' '.$objp->num_payment).'">'.dol_escape_htmltag($label.' '.$objp->num_payment).'</td>';
-					if (isModEnabled("banque")) {
+					if (isModEnabled("bank")) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
 						$bankaccountstatic->label = $objp->baref;
@@ -5730,7 +5730,7 @@ if ($action == 'create') {
 
 			// Create contract
 			if (getDolGlobalString('CONTRACT_CREATE_FROM_INVOICE')) {
-				if (isModEnabled('contrat') && $object->status == Facture::STATUS_VALIDATED) {
+				if (isModEnabled('contract') && $object->status == Facture::STATUS_VALIDATED) {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index a68ceeb3d0f..ee34766b45c 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1448,7 +1448,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			if (empty($accountid)) {
 				throw new RestException(400, 'Account ID is mandatory');
 			}
@@ -1506,7 +1506,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(400, 'Payment error : '.$paymentobj->error);
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$label = '(CustomerInvoicePayment)';
 
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
@@ -1569,7 +1569,7 @@ class Invoices extends DolibarrApi
 			}
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			if (empty($accountid)) {
 				throw new RestException(400, 'Account ID is mandatory');
 			}
@@ -1653,7 +1653,7 @@ class Invoices extends DolibarrApi
 			$this->db->rollback();
 			throw new RestException(400, 'Payment error : '.$paymentobj->error);
 		}
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$label = '(CustomerInvoicePayment)';
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
 				throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 12bbd6fa5f0..fc0ff165cd2 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5632,7 +5632,7 @@ class Facture extends CommonInvoice
 
 		$langs->load("bills");
 
-		if (!isModEnabled('facture')) {	// Should not happen. If module disabled, cron job should not be visible.
+		if (!isModEnabled('invoice')) {	// Should not happen. If module disabled, cron job should not be visible.
 			$this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Facture"));
 			return 0;
 		}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index d728541b8d9..274ea165a53 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -56,7 +56,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 
@@ -1300,7 +1300,7 @@ if ($user->hasRight("user", "user", "lire")) {
 	$moreforfilter .= '</div>';
 }
 // Filter on product tags
-if (isModEnabled('categorie') && $user->hasRight("categorie", "lire") && ($user->hasRight("produit", "lire") || $user->hasRight("service", "lire"))) {
+if (isModEnabled('category') && $user->hasRight("categorie", "lire") && ($user->hasRight("produit", "lire") || $user->hasRight("service", "lire"))) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -1308,7 +1308,7 @@ if (isModEnabled('categorie') && $user->hasRight("categorie", "lire") && ($user-
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
 	$moreforfilter .= '</div>';
 }
-if (isModEnabled('categorie') && $user->hasRight("categorie", "lire")) {
+if (isModEnabled('category') && $user->hasRight("categorie", "lire")) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 8e5ca60137a..e49a7c328d4 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -73,7 +73,7 @@ $endyear = $year;
 /*
  * View
  */
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$langs->load('categories');
 }
 $form = new Form($db);
@@ -298,7 +298,7 @@ if ($user->admin) {
 print '</td></tr>';
 
 // Category
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	if ($mode == 'customer') {
 		$cat_type = Categorie::TYPE_CUSTOMER;
 		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index c280a92183e..57748c27950 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -50,7 +50,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$langs->load("orders");
 }
 
@@ -103,7 +103,7 @@ print load_fiche_titre($langs->trans("InvoicesArea"), '', 'bill');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	print getNumberInvoicesPieChart('customers');
 	print '<br>';
 }
@@ -113,7 +113,7 @@ if (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) {
 	print '<br>';
 }
 
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	print getCustomerInvoiceDraftTable($max, $socid);
 	print '<br>';
 }
@@ -127,7 +127,7 @@ print '</div><div class="fichetwothirdright">';
 
 
 // Latest modified customer invoices
-if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 	$langs->load("boxes");
 	$tmpinvoice = new Facture($db);
 
@@ -580,7 +580,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 /*
  * Customers orders to be billed
  */
-if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("commande", "lire") && !getDolGlobalString('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')) {
+if (isModEnabled('invoice') && isModEnabled('order') && $user->hasRight("commande", "lire") && !getDolGlobalString('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')) {
 	$commandestatic = new Commande($db);
 	$langs->load("orders");
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index f52b3c2f72e..a7a7c5f5898 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -178,7 +178,7 @@ if ($action == 'create') {
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
 
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		// Type payment
 		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
 		print $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
@@ -247,7 +247,7 @@ if ($id) {
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		if ($object->fk_account > 0) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->fk_bank);
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 67d5b5b561d..ffc1c3314fb 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -485,11 +485,11 @@ class Localtax extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -4;
 		}
-		if (isModEnabled("banque") && (empty($this->accountid) || $this->accountid <= 0)) {
+		if (isModEnabled("bank") && (empty($this->accountid) || $this->accountid <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -5;
 		}
-		if (isModEnabled("banque") && (empty($this->paymenttype) || $this->paymenttype <= 0)) {
+		if (isModEnabled("bank") && (empty($this->paymenttype) || $this->paymenttype <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -5;
 		}
@@ -521,7 +521,7 @@ class Localtax extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
 			if ($this->id > 0) {
 				$ok = 1;
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					// Insertion dans llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 2a593eb6543..83620a7e0ad 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -174,7 +174,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			// If bank module is on, account is required to enter a payment
 			if (GETPOST('accountid') <= 0) {
 				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
@@ -251,7 +251,7 @@ if (empty($reshook)) {
 			$multicurrency_tx[$key] = $tmpinvoice->multicurrency_tx;
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			// If the bank module is active, an account is required to input a payment
 			if (GETPOSTINT('accountid') <= 0) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
@@ -501,7 +501,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Bank account
 		print '<tr>';
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			if ($facture->type != 2) {
 				print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
 			}
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index bfdd60e522f..23112324c96 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 if (isModEnabled('margin')) {
@@ -318,7 +318,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, '',
 
 $disable_delete = 0;
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	$bankline = new AccountLine($db);
 
 	if ($object->fk_account > 0) {
@@ -360,7 +360,7 @@ print '</td></tr>';
 */
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($object->fk_account > 0) {
 		if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 9ecab0282c6..b9fb85f148b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -707,7 +707,7 @@ class Paiement extends CommonObject
 		$error = 0;
 		$bank_line_id = 0;
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			if ($accountid <= 0) {
 				$this->error = 'Bad value for parameter accountid='.$accountid;
 				dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index bbded249fb9..769a0bd9ce7 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -103,8 +103,8 @@ $arrayfields = array(
 	'p.datep'			=> array('label'=>"Date", 'checked'=>1, 'position'=>20),
 	's.nom'				=> array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
 	'c.libelle'			=> array('label'=>"Type", 'checked'=>1, 'position'=>40),
-	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled("banque"))),
-	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("banque"))),
+	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled("bank"))),
+	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("bank"))),
 	'p.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
 	'p.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
 	'p.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>90, 'enabled'=>(getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION'))),
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index dce1a7f5d83..44a6cb3fe71 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -72,7 +72,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		$error++;
 		$action = 'create';
 	}
-	if (isModEnabled("banque") && !(GETPOST("accountid") > 0)) {
+	if (isModEnabled("bank") && !(GETPOST("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 		$action = 'create';
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 30fb1768dc7..20b574adac4 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -70,7 +70,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		$error++;
 		$action = 'create';
 	}
-	if (isModEnabled("banque") && !(GETPOSTINT("accountid") > 0)) {
+	if (isModEnabled("bank") && !(GETPOSTINT("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 		$action = 'create';
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 7e6303486d0..55df11fe81b 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -146,7 +146,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $
 print '<tr><td>'.$langs->trans('Note').'</td><td class="wordbreak sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlcleanlastbr($object->note_private)).'</td></tr>';
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index f27bec0c8b6..b49e93ebed3 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -188,7 +188,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $
 print '<tr><td>'.$langs->trans('Note').'</td><td class="wordbreak sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlcleanlastbr($object->note_private)).'</td></tr>';
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 17281ae721c..b65e13561d7 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$langs->load("bills");
 }
 
@@ -117,7 +117,7 @@ if ($id > 0) {
 	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1);
 	print dol_get_fiche_end();
 
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		// Invoice list
 		print load_fiche_titre($langs->trans("CustomerPreview"));
 
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index efa2ed773d4..7c14e3e1d1b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -1137,7 +1137,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 */
 	//$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
 
-	if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_VARPAY') && isModEnabled("banque") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_VARPAY') && isModEnabled("bank") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 167ca1793f6..bdcca353a85 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -215,7 +215,7 @@ if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('invoice') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -272,7 +272,7 @@ if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta
 	// Nothing from this table
 }
 
-if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('invoice') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	// On ajoute les paiements clients anciennes version, non lies par paiement_facture
 	if ($modecompta != 'CREANCES-DETTES') {
 		$sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
@@ -327,7 +327,7 @@ if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
 
-if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('invoice') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -799,7 +799,7 @@ if (isModEnabled('don') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "
  * Various Payments
  */
 
-if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_VARPAY') && isModEnabled("banque") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_VARPAY') && isModEnabled("bank") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	// decaiss
 
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 6bb11589a2d..c3fdb7f1296 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -427,7 +427,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Bank Account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td>'.$langs->trans('DefaultBankAccount').'</td><td colspan="2">';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes(GETPOSTINT('fk_account'), 'fk_account', 0, '', 2, '', 0, '', 1);
 		print '</td></tr>';
@@ -631,7 +631,7 @@ if ($id > 0) {
 		print '</td></tr>';
 
 		// Bank account
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<tr><td class="nowrap">';
 			print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
 			print $langs->trans('DefaultBankAccount');
@@ -663,7 +663,7 @@ if ($id > 0) {
 		print '<div class="underbanner clearboth"></div>';
 
 		$nbcols = 3;
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$nbcols++;
 		}
 
@@ -698,7 +698,7 @@ if ($id > 0) {
 			print '<td>'.$langs->trans("RefPayment").'</td>';
 			print '<td>'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("Type").'</td>';
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 			}
 			print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -721,7 +721,7 @@ if ($id > 0) {
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 					$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-					if (isModEnabled("banque")) {
+					if (isModEnabled("bank")) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
 						$bankaccountstatic->label = $objp->baref;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 0adbfcc4eab..13844252901 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -568,7 +568,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$error = 0;
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index e2f887eb034..951faa2c2b8 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -109,7 +109,7 @@ $arrayfields = array(
 	'cs.paye'		=>array('label'=>"Status", 'checked'=>1, 'position'=>110),
 );
 
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	$arrayfields['cs.fk_account'] = array('checked'=>-1, 'position'=>90, 'label'=>"DefaultBankAccount");
 }
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index fb3ecf981cb..dd5a463ecd1 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -226,7 +226,7 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 }
@@ -246,7 +246,7 @@ print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $pa
 print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "pc.num_paiement", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print_liste_field_titre("BankTransactionLine", $_SERVER["PHP_SELF"], "pc.fk_bank", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 }
@@ -324,7 +324,7 @@ while ($i < min($num, $limit)) {
 	print '<td>'.$obj->num_payment.'</td>';
 
 	// Account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		// Bank transaction
 		print '<td class="nowraponall">';
 		$accountlinestatic->id = $obj->fk_bank;
@@ -380,7 +380,7 @@ print '<td align="center" class="liste_total">&nbsp;</td>';
 print '<td align="center" class="liste_total">&nbsp;</td>';
 print '<td align="center" class="liste_total">&nbsp;</td>';
 print '<td align="center" class="liste_total">&nbsp;</td>';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<td></td>';
 	print '<td></td>';
 }
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 768867e0ddc..eb69cefa804 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -503,10 +503,10 @@ if (count($amount)) {
 		if (isModEnabled("propal") && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
 		}
-		if (isModEnabled('commande') && $key > 0) {
+		if (isModEnabled('order') && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
 		}
-		if (isModEnabled('facture') && $key > 0) {
+		if (isModEnabled('invoice') && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
 		}
 		print '</td>';
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index afd631a8cdc..6c1b1c3558a 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -691,10 +691,10 @@ if (count($amount)) {
 		if (isModEnabled("propal") && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
 		}
-		if (isModEnabled('commande') && $key > 0) {
+		if (isModEnabled('order') && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
 		}
-		if (isModEnabled('facture') && $key > 0) {
+		if (isModEnabled('invoice') && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
 		}
 		print '</td>';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index df825768fee..a77c5979c9d 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -483,7 +483,7 @@ if ($action == 'create') {
 	print "</td>\n";
 	print "</tr>";
 
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		// Bank account
 		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
 		print img_picto('', 'bank_account', 'pictofixedwidth');
@@ -633,7 +633,7 @@ if ($id > 0) {
 	print '</td></tr>';
 
 	// Bank account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
@@ -664,7 +664,7 @@ if ($id > 0) {
 	print '<div class="fichehalfright">';
 
 	$nbcols = 3;
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		$nbcols++;
 	}
 
@@ -699,7 +699,7 @@ if ($id > 0) {
 		print '<td>'.$langs->trans("RefPayment").'</td>';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("Type").'</td>';
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 		}
 		print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -716,7 +716,7 @@ if ($id > 0) {
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index be9df9fe313..0d2d82b0dd0 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -569,7 +569,7 @@ class PaymentVAT extends CommonObject
 
 		$error = 0;
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index d84a5c5c588..568fea68048 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -587,11 +587,11 @@ class Tva extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -4;
 		}
-		if (isModEnabled("banque") && (empty($this->accountid) || $this->accountid <= 0)) {
+		if (isModEnabled("bank") && (empty($this->accountid) || $this->accountid <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -5;
 		}
-		if (isModEnabled("banque") && (empty($this->type_payment) || $this->type_payment <= 0)) {
+		if (isModEnabled("bank") && (empty($this->type_payment) || $this->type_payment <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -5;
 		}
@@ -648,7 +648,7 @@ class Tva extends CommonObject
 
 			if ($this->id > 0) {
 				$ok = 1;
-				if (isModEnabled("banque") && !empty($this->amount)) {
+				if (isModEnabled("bank") && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 32c982c080c..31d96758fcc 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -91,7 +91,7 @@ $arrayfields = array(
 	't.status'			=>array('checked'=>1, 'position'=>90, 'label'=>"Status"),
 );
 
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	$arrayfields['t.fk_account'] = array('checked'=>1, 'position'=>60, 'label'=>"DefaultBankAccount");
 }
 
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index b877b472551..52405d5e6ce 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -170,7 +170,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "ptva.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "ptva.num_paiement", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print_liste_field_titre("BankTransactionLine", $_SERVER["PHP_SELF"], "ptva.fk_bank", "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "bank.ref", "", $param, '', $sortfield, $sortorder);
 	}
@@ -258,7 +258,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 			// Chq number
 			print '<td>' . dol_escape_htmltag($obj->num_payment) . '</td>';
 
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				// Bank transaction
 				print '<td>';
 				$accountlinestatic->id = $obj->fk_bank;
@@ -294,7 +294,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 		print '<td class="liste_total right"></td>'; // A total here has no sense
 		print '<td class="center liste_total">&nbsp;</td>';
 		print '<td class="center liste_total">&nbsp;</td>';
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td class="center liste_total">&nbsp;</td>';
 			print '<td class="center liste_total">&nbsp;</td>';
 		}
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index ab35f938890..f20a5c170a4 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -193,7 +193,7 @@ abstract class ActionsContactCardCommon
 
 			$this->object->load_ref_elements();
 
-			if (isModEnabled('commande')) {
+			if (isModEnabled('order')) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
 				$i++;
@@ -203,12 +203,12 @@ abstract class ActionsContactCardCommon
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
 				$i++;
 			}
-			if (isModEnabled('contrat')) {
+			if (isModEnabled('contract')) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForContracts");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
 				$i++;
 			}
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 				$i++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 3ca3250d3c3..0cf70884978 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -873,7 +873,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Categories
-			if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+			if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
 				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
@@ -1169,7 +1169,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 
 			// Categories
-			if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+			if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 				$arrayselected = array();
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
@@ -1197,7 +1197,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			$object->load_ref_elements();
 
-			if (isModEnabled('commande')) {
+			if (isModEnabled('order')) {
 				print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
 				print $object->ref_commande ? $object->ref_commande : ('<span class="opacitymedium">'.$langs->trans("NoContactForAnyOrder").'</span>');
 				print '</td></tr>';
@@ -1209,13 +1209,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 			}
 
-			if (isModEnabled('contrat')) {
+			if (isModEnabled('contract')) {
 				print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
 				print $object->ref_contrat ? $object->ref_contrat : ('<span class="opacitymedium">'.$langs->trans("NoContactForAnyContract").'</span>');
 				print '</td></tr>';
 			}
 
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
 				print $object->ref_facturation ? $object->ref_facturation : ('<span class="opacitymedium">'.$langs->trans("NoContactForAnyInvoice").'</span>');
 				print '</td></tr>';
@@ -1436,7 +1436,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Categories
-		if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
 			print '<td>';
 			print $form->showCategories($object->id, Categorie::TYPE_CONTACT, 1);
@@ -1462,29 +1462,29 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
-		if (isModEnabled('commande') || isModEnabled("expedition")) {
+		if (isModEnabled('order') || isModEnabled("delivery_note")) {
 			print '<tr><td class="titlefield tdoverflow">';
-			if (isModEnabled("expedition")) {
+			if (isModEnabled("delivery_note")) {
 				print $langs->trans("ContactForOrdersOrShipments");
 			} else {
 				print $langs->trans("ContactForOrders");
 			}
 			print '</td><td>';
 			$none = $langs->trans("NoContactForAnyOrder");
-			if (isModEnabled("expedition")) {
+			if (isModEnabled("delivery_note")) {
 				$none = $langs->trans("NoContactForAnyOrderOrShipments");
 			}
 			print $object->ref_commande ? $object->ref_commande : $none;
 			print '</td></tr>';
 		}
 
-		if (isModEnabled('contrat')) {
+		if (isModEnabled('contract')) {
 			print '<tr><td class="tdoverflow">'.$langs->trans("ContactForContracts").'</td><td>';
 			print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
 			print '</td></tr>';
 		}
 
-		if (isModEnabled('facture')) {
+		if (isModEnabled('invoice')) {
 			print '<tr><td class="tdoverflow">'.$langs->trans("ContactForInvoices").'</td><td>';
 			print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 			print '</td></tr>';
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 21ba9ed848f..9cf303b037e 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -158,18 +158,18 @@ if (!empty($object->thirdparty->client)) {
 	if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 	}
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 	}
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 	}
-	if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 	}
 }
 
-if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire')) {
+if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire')) {
 	$elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 45a39bfee2f..7d5d3858601 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1002,7 +1002,7 @@ if ($user->hasRight('societe', 'client', 'voir')) {
 	$moreforfilter .= '</div>';
 }
 
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ContactCategoriesShort');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 231f433f3b4..613403d2f44 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2176,7 +2176,7 @@ if ($action == 'create') {
 
 				// Create ... buttons
 				$arrayofcreatebutton = array();
-				if (isModEnabled('commande') && $object->status > 0 && $object->nbofservicesclosed < $nbofservices) {
+				if (isModEnabled('order') && $object->status > 0 && $object->nbofservicesclosed < $nbofservices) {
 					$arrayofcreatebutton[] = array(
 						'url' => '/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id,
 						'label' => $langs->trans('AddOrder'),
@@ -2184,7 +2184,7 @@ if ($action == 'create') {
 						'perm' => $user->hasRight('commande', 'creer')
 					);
 				}
-				if (isModEnabled('facture') && $object->status > 0 && $soc->client > 0) {
+				if (isModEnabled('invoice') && $object->status > 0 && $soc->client > 0) {
 					$arrayofcreatebutton[] = array(
 						'url' => '/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id,
 						'label' => $langs->trans('CreateBill'),
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 584ea7d0697..f4ea37d3d53 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -239,7 +239,7 @@ print "</table></div><br>";
 
 // Draft contracts
 
-if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 	$sql = "SELECT c.rowid, c.ref,";
 	$sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 8c5d25cbb97..2b852c38ac6 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-if (isModEnabled("categorie")) {
+if (isModEnabled("category")) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -799,7 +799,7 @@ if ($user->hasRight('user', 'user', 'lire')) {
 	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -808,7 +808,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user-
 	$moreforfilter .= '</div>';
 }
 // Filter on customer categories
-if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST') && isModEnabled("category") && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index eae46a028e6..a0d00d27442 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -528,7 +528,7 @@ $morefilter = '';
 $moreforfilter = '';
 
 // If the user can view categories of products
-if (isModEnabled('categorie') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+if (isModEnabled('category') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 1fac2f45c9e..5c37dacedbe 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -189,7 +189,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 		$result = $object->create($user);
 		if ($result > 0) {
 			// Creation OK
-			if (isModEnabled('categorie') && method_exists($object, 'setCategories')) {
+			if (isModEnabled('category') && method_exists($object, 'setCategories')) {
 				$categories = GETPOST('categories', 'array:int');
 				$object->setCategories($categories);
 			}
@@ -313,7 +313,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			}
 		}
 
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			$categories = GETPOST('categories', 'array');
 			if (method_exists($object, 'setCategories')) {
 				$object->setCategories($categories);
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index ba7725d06aa..f91e87c8d36 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -69,7 +69,7 @@ $arrayresult = array();
 
 // Define $searchform
 
-if (isModEnabled('adherent') && !getDolGlobalString('MAIN_SEARCHFORM_ADHERENT_DISABLED') && $user->hasRight('adherent', 'lire')) {
+if (isModEnabled('member') && !getDolGlobalString('MAIN_SEARCHFORM_ADHERENT_DISABLED') && $user->hasRight('adherent', 'lire')) {
 	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_member', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_member', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
@@ -102,13 +102,13 @@ if (isModEnabled('project') && !getDolGlobalString('MAIN_SEARCHFORM_TASK_DISABLE
 if (isModEnabled('propal') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED') && $user->hasRight('propal', 'lire')) {
 	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('commande') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED') && $user->hasRight('commande', 'lire')) {
+if (isModEnabled('order') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED') && $user->hasRight('commande', 'lire')) {
 	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('expedition') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) {
+if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) {
 	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_shipment', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_shipment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('facture') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
+if (isModEnabled('invoice') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
 	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
@@ -123,7 +123,7 @@ if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERM
 }
 
 // Customer payments
-if (isModEnabled('facture') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
+if (isModEnabled('invoice') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
 	$arrayresult['searchintocustomerpayments'] = array(
 		'position'=>170,
 		'img'=>'object_payment',
@@ -143,7 +143,7 @@ if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERM
 }
 
 // Miscellaneous payments
-if (isModEnabled('banque') && !getDolGlobalString('MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED') && $user->hasRight('banque', 'lire')) {
+if (isModEnabled('bank') && !getDolGlobalString('MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED') && $user->hasRight('banque', 'lire')) {
 	$arrayresult['searchintomiscpayments'] = array(
 		'position'=>180,
 		'img'=>'object_payment',
@@ -152,10 +152,10 @@ if (isModEnabled('banque') && !getDolGlobalString('MAIN_SEARCHFORM_MISC_PAYMENTS
 		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (isModEnabled('contrat') && !getDolGlobalString('MAIN_SEARCHFORM_CONTRACT_DISABLED') && $user->hasRight('contrat', 'lire')) {
+if (isModEnabled('contract') && !getDolGlobalString('MAIN_SEARCHFORM_CONTRACT_DISABLED') && $user->hasRight('contrat', 'lire')) {
 	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('ficheinter') && !getDolGlobalString('MAIN_SEARCHFORM_FICHINTER_DISABLED') && $user->hasRight('ficheinter', 'lire')) {
+if (isModEnabled('intervention') && !getDolGlobalString('MAIN_SEARCHFORM_FICHINTER_DISABLED') && $user->hasRight('ficheinter', 'lire')) {
 	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('knowledgemanagement') && !getDolGlobalString('MAIN_SEARCHFORM_KNOWLEDGEMANAGEMENT_DISABLED') && $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index b84e74dfe18..88571ed872b 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -53,8 +53,8 @@ class box_activity extends ModeleBoxes
 		$this->enabled = getDolGlobalInt('MAIN_FEATURES_LEVEL'); // Not enabled by default due to bugs (see previous comments)
 
 		$this->hidden = !(
-			(isModEnabled('facture') && $user->hasRight('facture', 'read'))
-			|| (isModEnabled('commande') && $user->hasRight('commande', 'read'))
+			(isModEnabled('invoice') && $user->hasRight('facture', 'read'))
+			|| (isModEnabled('order') && $user->hasRight('commande', 'read'))
 			|| (isModEnabled('propal') && $user->hasRight('propal', 'read'))
 		);
 	}
@@ -183,7 +183,7 @@ class box_activity extends ModeleBoxes
 		}
 
 		// list the summary of the orders
-		if (isModEnabled('commande') && $user->hasRight("commande", "lire")) {
+		if (isModEnabled('order') && $user->hasRight("commande", "lire")) {
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$commandestatic = new Commande($this->db);
 
@@ -270,7 +270,7 @@ class box_activity extends ModeleBoxes
 
 
 		// list the summary of the bills
-		if (isModEnabled('facture') && $user->hasRight("facture", "lire")) {
+		if (isModEnabled('invoice') && $user->hasRight("facture", "lire")) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$facturestatic = new Facture($this->db);
 
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index a076c096f4c..9785396a49a 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -102,7 +102,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 			);
 			$conditions = array(
 				'users' => $user->hasRight('user', 'user', 'lire'),
-				'members' => isModEnabled('adherent') && $user->hasRight('adherent', 'lire'),
+				'members' => isModEnabled('member') && $user->hasRight('adherent', 'lire'),
 				'customers' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS_STATS'),
 				'prospects' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS_STATS'),
 				'suppliers' => (
@@ -115,11 +115,11 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'products' => isModEnabled('product') && $user->hasRight('product', 'read'),
 				'services' => isModEnabled('service') && $user->hasRight('service', 'read'),
 				'proposals' => isModEnabled('propal') && $user->hasRight('propal', 'read'),
-				'orders' => isModEnabled('commande') && $user->hasRight('commande', 'lire'),
-				'invoices' => isModEnabled('facture') && $user->hasRight('facture', 'lire'),
+				'orders' => isModEnabled('order') && $user->hasRight('commande', 'lire'),
+				'invoices' => isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
 				'donations' => isModEnabled('don') && $user->hasRight('don', 'lire'),
-				'contracts' => isModEnabled('contrat') && $user->hasRight('contrat', 'lire'),
-				'interventions' => isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire'),
+				'contracts' => isModEnabled('contract') && $user->hasRight('contrat', 'lire'),
+				'interventions' => isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire'),
 				'supplier_orders' => isModEnabled('supplier_order') && $user->hasRight('fournisseur', 'commande', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS'),
 				'supplier_invoices' => isModEnabled('supplier_invoice') && $user->hasRight('fournisseur', 'facture', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS'),
 				'supplier_proposals' => isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS'),
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index a90b8604060..079aaff21b2 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -49,8 +49,8 @@ class box_graph_product_distribution extends ModeleBoxes
 		$this->db = $db;
 
 		$this->hidden = !(
-			(isModEnabled('facture') && $user->hasRight('facture', 'lire'))
-			|| (isModEnabled('commande') && $user->hasRight('commande', 'lire'))
+			(isModEnabled('invoice') && $user->hasRight('facture', 'lire'))
+			|| (isModEnabled('order') && $user->hasRight('commande', 'lire'))
 			|| (isModEnabled('propal') && $user->hasRight('propal', 'lire'))
 		);
 	}
@@ -96,13 +96,13 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showinvoicenb = 1;
 			$showordernb = 1;
 		}
-		if (!isModEnabled('facture') || !$user->hasRight('facture', 'lire')) {
+		if (!isModEnabled('invoice') || !$user->hasRight('facture', 'lire')) {
 			$showinvoicenb = 0;
 		}
 		if (isModEnabled('propal') || !$user->hasRight('propal', 'lire')) {
 			$showpropalnb = 0;
 		}
-		if (!isModEnabled('commande') || !$user->hasRight('commande', 'lire')) {
+		if (!isModEnabled('order') || !$user->hasRight('commande', 'lire')) {
 			$showordernb = 0;
 		}
 
@@ -203,7 +203,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
-		if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+		if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb) {
 				$langs->load("orders");
@@ -267,7 +267,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 
 
-		if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+		if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showinvoicenb) {
 				$langs->load("bills");
@@ -358,10 +358,10 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb ? ' checked' : '').'> '.$langs->trans("ForProposals");
 				$stringtoshow .= '&nbsp;';
 			}
-			if (isModEnabled('commande') || $user->hasRight('commande', 'lire')) {
+			if (isModEnabled('order') || $user->hasRight('commande', 'lire')) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
-			if (isModEnabled('facture') || $user->hasRight('facture', 'lire')) {
+			if (isModEnabled('invoice') || $user->hasRight('facture', 'lire')) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
 				$stringtoshow .= ' &nbsp; ';
 			}
@@ -384,13 +384,13 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
 				if (isModEnabled('propal') && $showpropalnb) {
 					$stringtoshow .= $px2->show();
-				} elseif (isModEnabled('commande') && $showordernb) {
+				} elseif (isModEnabled('order') && $showordernb) {
 					$stringtoshow .= $px3->show();
 				}
 				$stringtoshow .= '</div><div class="fichehalfright">';
-				if (isModEnabled('facture') && $showinvoicenb) {
+				if (isModEnabled('invoice') && $showinvoicenb) {
 					$stringtoshow .= $px1->show();
-				} elseif (isModEnabled('commande') && $showordernb) {
+				} elseif (isModEnabled('order') && $showordernb) {
 					$stringtoshow .= $px3->show();
 				}
 				$stringtoshow .= '</div></div></div>';
diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
index 587d7bdcd53..429b8fba2d7 100644
--- a/htdocs/core/boxes/box_members_by_tags.php
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -58,7 +58,7 @@ class box_members_by_tags extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
+		$this->hidden = !(isModEnabled('member') && $user->hasRight('adherent', 'lire'));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 6ce11bfca44..f5412dec5ea 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -58,7 +58,7 @@ class box_members_by_type extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
+		$this->hidden = !(isModEnabled('member') && $user->hasRight('adherent', 'lire'));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 0c7ed55eb57..2ef36c822dd 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -57,7 +57,7 @@ class box_members_last_modified extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
+		$this->hidden = !(isModEnabled('member') && $user->hasRight('adherent', 'lire'));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index 7375dda6562..92d0413c5e7 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -57,7 +57,7 @@ class box_members_last_subscriptions extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
+		$this->hidden = !(isModEnabled('member') && $user->hasRight('adherent', 'lire'));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index 6cb43a94187..09df79556bb 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -57,7 +57,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(isModEnabled('adherent') && $user->hasRight('adherent', 'lire'));
+		$this->hidden = !(isModEnabled('member') && $user->hasRight('adherent', 'lire'));
 	}
 
 	/**
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 50d22620a20..5c8ea19dc73 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9155,13 +9155,13 @@ class Form
 				// To work with non standard path
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/' . $element;
-					if (!isModEnabled('facture')) {
+					if (!isModEnabled('invoice')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
-					if (!isModEnabled('facture')) {
+					if (!isModEnabled('invoice')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'propal') {
@@ -9175,7 +9175,7 @@ class Form
 					}
 				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') {
 					$tplpath = 'expedition';
-					if (!isModEnabled('expedition')) {
+					if (!isModEnabled('delivery_note')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'reception') {
@@ -9185,12 +9185,12 @@ class Form
 					}
 				} elseif ($objecttype == 'delivery') {
 					$tplpath = 'delivery';
-					if (!isModEnabled('expedition')) {
+					if (!isModEnabled('delivery_note')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'ficheinter') {
 					$tplpath = 'fichinter';
-					if (!isModEnabled('ficheinter')) {
+					if (!isModEnabled('intervention')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'invoice_supplier') {
@@ -9292,34 +9292,34 @@ class Form
 					'label' => 'LinkToProposal',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('propal') . ')'),
 				'shipping' => array(
-					'enabled' => isModEnabled('expedition'),
+					'enabled' => isModEnabled('delivery_note'),
 					'perms' => 1,
 					'label' => 'LinkToExpedition',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('shipping') . ')'),
 				'order' => array(
-					'enabled' => isModEnabled('commande'),
+					'enabled' => isModEnabled('order'),
 					'perms' => 1,
 					'label' => 'LinkToOrder',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('commande') . ')'),
 				'invoice' => array(
-					'enabled' => isModEnabled('facture'),
+					'enabled' => isModEnabled('invoice'),
 					'perms' => 1,
 					'label' => 'LinkToInvoice',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('invoice') . ')'),
 				'invoice_template' => array(
-					'enabled' => isModEnabled('facture'),
+					'enabled' => isModEnabled('invoice'),
 					'perms' => 1,
 					'label' => 'LinkToTemplateInvoice',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('invoice') . ')'),
 				'contrat' => array(
-					'enabled' => isModEnabled('contrat'),
+					'enabled' => isModEnabled('contract'),
 					'perms' => 1,
 					'label' => 'LinkToContract',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht
 							FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "contrat as t, " . $this->db->prefix() . "contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('contract') . ') GROUP BY s.rowid, s.nom, s.client, t.rowid, t.ref, t.ref_customer, t.ref_supplier'
 				),
 				'fichinter' => array(
-					'enabled' => isModEnabled('ficheinter'),
+					'enabled' => isModEnabled('intervention'),
 					'perms' => 1,
 					'label' => 'LinkToIntervention',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('intervention') . ')'),
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 731b0514ef9..606becf17c2 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1917,36 +1917,36 @@ class FormMail extends Form
 			if ($onlinepaymentenabled && getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
 				$tmparray['__SECUREKEYPAYMENT__'] = getDolGlobalString('PAYMENT_SECURITY_TOKEN');
 				if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
-					if (isModEnabled('adherent')) {
+					if (isModEnabled('member')) {
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
 					if (isModEnabled('don')) {
 						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';
 					}
-					if (isModEnabled('facture')) {
+					if (isModEnabled('invoice')) {
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
-					if (isModEnabled('commande')) {
+					if (isModEnabled('order')) {
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
-					if (isModEnabled('contrat')) {
+					if (isModEnabled('contract')) {
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
 
 					//Online payment link
-					if (isModEnabled('adherent')) {
+					if (isModEnabled('member')) {
 						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 					}
 					if (isModEnabled('don')) {
 						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
 					}
-					if (isModEnabled('facture')) {
+					if (isModEnabled('invoice')) {
 						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 					}
-					if (isModEnabled('commande')) {
+					if (isModEnabled('order')) {
 						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 					}
-					if (isModEnabled('contrat')) {
+					if (isModEnabled('contract')) {
 						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 					}
 				}
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b240c62cd7c..4fa8ee3eac6 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -460,7 +460,7 @@ class FormTicket
 		}
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
 
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 31f4fa0ef04..49cecafe544 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -121,16 +121,16 @@ $arrayoftype = array(
 	'thirdparty' => array('langs'=>'companies', 'label' => 'ThirdParties', 'picto'=>'company', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
 	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/contact/class/contact.class.php"),
 	'proposal' => array('label' => 'Proposals', 'picto'=>'proposal', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
-	'order' => array('label' => 'Orders', 'picto'=>'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('commande'), 'ClassPath' => "/commande/class/commande.class.php"),
-	'invoice' => array('langs'=>'facture', 'label' => 'Invoices', 'picto'=>'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
-	'invoice_template'=>array('label' => 'PredefinedInvoices', 'picto'=>'bill', 'ObjectClassName' => 'FactureRec', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
-	'contract' => array('label' => 'Contracts', 'picto'=>'contract', 'ObjectClassName' => 'Contrat', 'enabled' => isModEnabled('contrat'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
-	'contractdet' => array('label' => 'ContractLines', 'picto'=>'contract', 'ObjectClassName' => 'ContratLigne', 'enabled' => isModEnabled('contrat'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
+	'order' => array('label' => 'Orders', 'picto'=>'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('order'), 'ClassPath' => "/commande/class/commande.class.php"),
+	'invoice' => array('langs'=>'facture', 'label' => 'Invoices', 'picto'=>'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('invoice'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
+	'invoice_template'=>array('label' => 'PredefinedInvoices', 'picto'=>'bill', 'ObjectClassName' => 'FactureRec', 'enabled' => isModEnabled('invoice'), 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
+	'contract' => array('label' => 'Contracts', 'picto'=>'contract', 'ObjectClassName' => 'Contrat', 'enabled' => isModEnabled('contract'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
+	'contractdet' => array('label' => 'ContractLines', 'picto'=>'contract', 'ObjectClassName' => 'ContratLigne', 'enabled' => isModEnabled('contract'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
 	'bom' => array('label' => 'BOM', 'picto'=>'bom', 'ObjectClassName' => 'Bom', 'enabled' => isModEnabled('bom')),
 	'mrp' => array('label' => 'MO', 'picto'=>'mrp', 'ObjectClassName' => 'Mo', 'enabled' => isModEnabled('mrp'), 'ClassPath' => "/mrp/class/mo.class.php"),
 	'ticket' => array('label' => 'Ticket', 'picto'=>'ticket', 'ObjectClassName' => 'Ticket', 'enabled' => isModEnabled('ticket')),
-	'member' => array('label' => 'Adherent', 'picto'=>'member', 'ObjectClassName' => 'Adherent', 'enabled' => isModEnabled('adherent'), 'ClassPath' => "/adherents/class/adherent.class.php", 'langs'=>'members'),
-	'cotisation' => array('label' => 'Subscriptions', 'picto'=>'member', 'ObjectClassName' => 'Subscription', 'enabled' => isModEnabled('adherent'), 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
+	'member' => array('label' => 'Adherent', 'picto'=>'member', 'ObjectClassName' => 'Adherent', 'enabled' => isModEnabled('member'), 'ClassPath' => "/adherents/class/adherent.class.php", 'langs'=>'members'),
+	'cotisation' => array('label' => 'Subscriptions', 'picto'=>'member', 'ObjectClassName' => 'Subscription', 'enabled' => isModEnabled('member'), 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
 );
 
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index efa664e26fc..270742a3c97 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1769,7 +1769,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 				print 'mymailmanlist<br>';
 				print 'mymailmanlist1,mymailmanlist2<br>';
 				print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
-				if (isModEnabled('categorie')) {
+				if (isModEnabled('category')) {
 					print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
 				}
 				print '</div>';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 3c5df955ae3..73b09437bbb 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -131,7 +131,7 @@ function print_actions_filter(
 		print '</div>';
 	}
 
-	if (isModEnabled('projet') && $user->hasRight('projet', 'lire')) {
+	if (isModEnabled('project') && $user->hasRight('projet', 'lire')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 		$formproject = new FormProjets($db);
 
@@ -141,7 +141,7 @@ function print_actions_filter(
 		print '</div>';
 	}
 
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 		$formother = new FormOther($db);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 515f4f4f443..65373fb5b3e 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -180,7 +180,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Related items
-	if ((isModEnabled('commande') || isModEnabled('propal') || isModEnabled('facture') || isModEnabled('ficheinter') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))
+	if ((isModEnabled('order') || isModEnabled('propal') || isModEnabled('invoice') || isModEnabled('intervention') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))
 		&& !getDolGlobalString('THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB')) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Referers");
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 6a6bcd45213..747540dbfde 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -93,7 +93,7 @@ function contact_prepare_head(Contact $object)
 	}
 
 	// Related items
-	if (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || isModEnabled('ficheinter') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
+	if (isModEnabled('order') || isModEnabled("propal") || isModEnabled('invoice') || isModEnabled('intervention') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
 		$head[$tab][1] = $langs->trans("Referers");
 		$head[$tab][2] = 'consumption';
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index f431a292704..78975768664 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -35,7 +35,7 @@
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (isModEnabled("expedition")) {
+	if (isModEnabled("delivery_note")) {
 		$langs->load("sendings");
 	}
 	$langs->load("orders");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 40e1aa39219..216472484e0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8362,7 +8362,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = '__THIRDPARTY_NOTE_PUBLIC__';
 				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = '__THIRDPARTY_NOTE_PRIVATE__';
 			}
-			if (isModEnabled('adherent') && (!is_object($object) || $object->element == 'adherent') && (empty($exclude) || !in_array('member', $exclude)) && (empty($include) || in_array('member', $include))) {
+			if (isModEnabled('member') && (!is_object($object) || $object->element == 'adherent') && (empty($exclude) || !in_array('member', $exclude)) && (empty($include) || in_array('member', $include))) {
 				$substitutionarray['__MEMBER_ID__'] = '__MEMBER_ID__';
 				$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = '__MEMBER_FIRSTNAME__';
@@ -8396,7 +8396,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				/*$substitutionarray['__PROJECT_NOTE_PUBLIC__'] = '__PROJECT_NOTE_PUBLIC__';
 				$substitutionarray['__PROJECT_NOTE_PRIVATE__'] = '__PROJECT_NOTE_PRIVATE__';*/
 			}
-			if (isModEnabled('contrat') && (!is_object($object) || $object->element == 'contract') && (empty($exclude) || !in_array('contract', $exclude)) && (empty($include) || in_array('contract', $include))) {
+			if (isModEnabled('contract') && (!is_object($object) || $object->element == 'contract') && (empty($exclude) || !in_array('contract', $exclude)) && (empty($include) || in_array('contract', $include))) {
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = 'Highest date planned for a service start';
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = 'Highest date and hour planned for service start';
 				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = 'Lowest data for planned expiration of service';
@@ -8405,7 +8405,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			if (isModEnabled("propal") && (!is_object($object) || $object->element == 'propal') && (empty($exclude) || !in_array('propal', $exclude)) && (empty($include) || in_array('propal', $include))) {
 				$substitutionarray['__ONLINE_SIGN_URL__'] = 'ToOfferALinkForOnlineSignature';
 			}
-			if (isModEnabled("ficheinter") && (!is_object($object) || $object->element == 'fichinter') && (empty($exclude) || !in_array('intervention', $exclude)) && (empty($include) || in_array('intervention', $include))) {
+			if (isModEnabled("intervention") && (!is_object($object) || $object->element == 'fichinter') && (empty($exclude) || !in_array('intervention', $exclude)) && (empty($include) || in_array('intervention', $include))) {
 				$substitutionarray['__ONLINE_SIGN_FICHINTER_URL__'] = 'ToOfferALinkForOnlineSignature';
 			}
 			$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'UrlToPayOnlineIfApplicable';
@@ -8422,7 +8422,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = 'Direct download url of a contract';
 			$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = 'Direct download url of a supplier proposal';
 
-			if (isModEnabled("expedition") && (!is_object($object) || $object->element == 'shipping')) {
+			if (isModEnabled("delivery_note") && (!is_object($object) || $object->element == 'shipping')) {
 				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 				$substitutionarray['__SHIPPINGMETHOD__'] = 'Shipping method';
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 9a21f14c45c..9e6a39c63f9 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -344,7 +344,7 @@ function getNumberInvoicesPieChart($mode)
 {
 	global $conf, $db, $langs, $user;
 
-	if (($mode == 'customers' && isModEnabled('facture') && $user->hasRight('facture', 'lire'))
+	if (($mode == 'customers' && isModEnabled('invoice') && $user->hasRight('facture', 'lire'))
 		|| ($mode == 'suppliers' && (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('fournisseur', 'facture', 'lire'))
 		) {
 		global $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus8, $badgeStatus11;
@@ -490,7 +490,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 
 	$result = '';
 
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$tmpinvoice = new Facture($db);
@@ -989,7 +989,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 
 	$result = '';
 
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$tmpinvoice = new Facture($db);
 
 		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms";
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 96d458f01c8..ccf1d9dabe8 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -64,14 +64,14 @@ function ldap_prepare_head()
 		$h++;
 	}
 
-	if (isModEnabled('adherent') && getDolGlobalString('LDAP_MEMBER_ACTIVE')) {
+	if (isModEnabled('member') && getDolGlobalString('LDAP_MEMBER_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
 		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
 		$head[$h][2] = 'members';
 		$h++;
 	}
 
-	if (isModEnabled('adherent') && getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE')) {
+	if (isModEnabled('member') && getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
 		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
 		$head[$h][2] = 'memberstypes';
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 2b39661e6e7..cb3f380fca3 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -34,7 +34,7 @@
 function commande_prepare_head(Commande $object)
 {
 	global $db, $langs, $conf, $user;
-	if (isModEnabled("expedition")) {
+	if (isModEnabled("delivery_note")) {
 		$langs->load("sendings");
 	}
 	$langs->load("orders");
@@ -42,7 +42,7 @@ function commande_prepare_head(Commande $object)
 	$h = 0;
 	$head = array();
 
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CustomerOrder");
 		$head[$h][2] = 'order';
@@ -230,7 +230,7 @@ function getCustomerOrderPieChart($socid = 0)
 
 	$result = '';
 
-	if (!isModEnabled('commande') || !$user->hasRight('commande', 'lire')) {
+	if (!isModEnabled('order') || !$user->hasRight('commande', 'lire')) {
 		return '';
 	}
 
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index cf170a77c75..4cfac0f4413 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -62,7 +62,7 @@ function pdf_admin_prepare_head()
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin');
 
-	if (isModEnabled("propal") || isModEnabled('facture') || isModEnabled('reception')) {
+	if (isModEnabled("propal") || isModEnabled('invoice') || isModEnabled('reception')) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_other.php';
 		$head[$h][1] = $langs->trans("Others");
 		$head[$h][2] = 'other';
@@ -1710,7 +1710,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 
 	// Add an additional description for the category products
-	if (getDolGlobalString('CATEGORY_ADD_DESC_INTO_DOC') && $idprod && isModEnabled('categorie')) {
+	if (getDolGlobalString('CATEGORY_ADD_DESC_INTO_DOC') && $idprod && isModEnabled('category')) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categstatic = new Categorie($db);
 		// recovering the list of all the categories linked to product
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a631d7ff826..976e6c4cf15 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -476,7 +476,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Sales orders
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 		$nblines++;
 		$ret = $product->load_stats_commande($socid);
 		if ($ret < 0) {
@@ -514,7 +514,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Customer invoices
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$nblines++;
 		$ret = $product->load_stats_facture($socid);
 		if ($ret < 0) {
@@ -533,7 +533,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Customer template invoices
-	if (isModEnabled("facture") && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled("invoice") && $user->hasRight('facture', 'lire')) {
 		$nblines++;
 		$ret = $product->load_stats_facturerec($socid);
 		if ($ret < 0) {
@@ -572,7 +572,7 @@ function show_stats_for_company($product, $socid)
 	}
 
 	// Contracts
-	if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 		$nblines++;
 		$ret = $product->load_stats_contrat($socid);
 		if ($ret < 0) {
@@ -679,7 +679,7 @@ function show_stats_for_batch($batch, $socid)
 	print '</tr>';
 
 	// Expeditions
-	if (isModEnabled('expedition') && $user->hasRight('expedition', 'lire')) {
+	if (isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')) {
 		$nblines++;
 		$ret = $batch->loadStatsExpedition($socid);
 		if ($ret < 0) {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 515542456cc..6b46a4dbfd2 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -127,9 +127,9 @@ function project_prepare_head(Project $project, $moreparam = '')
 	}
 
 	if (isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")
-		|| isModEnabled("propal") || isModEnabled('commande')
-		|| isModEnabled('facture') || isModEnabled('contrat')
-		|| isModEnabled('ficheinter') || isModEnabled('agenda') || isModEnabled('deplacement') || isModEnabled('stock')) {
+		|| isModEnabled("propal") || isModEnabled('order')
+		|| isModEnabled('invoice') || isModEnabled('contract')
+		|| isModEnabled('intervention') || isModEnabled('agenda') || isModEnabled('deplacement') || isModEnabled('stock')) {
 		$nbElements = 0;
 		// Enable caching of thirdrparty count Contacts
 		$cachekey = 'count_elements_project_'.$project->id;
@@ -143,13 +143,13 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled("propal")) {
 				$nbElements += $project->getElementCount('propal', 'propal');
 			}
-			if (isModEnabled('commande')) {
+			if (isModEnabled('order')) {
 				$nbElements += $project->getElementCount('order', 'commande');
 			}
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				$nbElements += $project->getElementCount('invoice', 'facture');
 			}
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				$nbElements += $project->getElementCount('invoice_predefined', 'facture_rec');
 			}
 			if (isModEnabled('supplier_proposal')) {
@@ -161,13 +161,13 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled("supplier_invoice")) {
 				$nbElements += $project->getElementCount('invoice_supplier', 'facture_fourn');
 			}
-			if (isModEnabled('contrat')) {
+			if (isModEnabled('contract')) {
 				$nbElements += $project->getElementCount('contract', 'contrat');
 			}
-			if (isModEnabled('ficheinter')) {
+			if (isModEnabled('intervention')) {
 				$nbElements += $project->getElementCount('intervention', 'fichinter');
 			}
-			if (isModEnabled("expedition")) {
+			if (isModEnabled("delivery_note")) {
 				$nbElements += $project->getElementCount('shipping', 'expedition');
 			}
 			if (isModEnabled('mrp')) {
@@ -197,7 +197,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled('salaries')) {
 				$nbElements += $project->getElementCount('salaries', 'payment_salary');
 			}
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				$nbElements += $project->getElementCount('variouspayment', 'payment_various');
 			}
 			dol_setcache($cachekey, $nbElements, 120);	// If setting cache fails, this is not a problem, so we do not test result.
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index f311fc57967..dceaf0bc8a3 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -42,8 +42,8 @@ function propal_prepare_head($object)
 	$head[$h][2] = 'comm';
 	$h++;
 
-	if ((empty($conf->commande->enabled) && ((isModEnabled("expedition") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))
-		|| (isModEnabled("expedition") && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) {
+	if ((empty($conf->commande->enabled) && ((isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))
+		|| (isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) {
 		$langs->load("sendings");
 		$text = '';
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 0f2d6695ee8..3b49d190016 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -356,7 +356,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid ? 1 : 0), 'auguria', $tabMenu);
 
 	// We update newmenu for special dynamic menus
-	if (isModEnabled('banque') && $user->hasRight('banque', 'lire') && $mainmenu == 'bank') {	// Entry for each bank account
+	if (isModEnabled('bank') && $user->hasRight('banque', 'lire') && $mainmenu == 'bank') {	// Entry for each bank account
 		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
@@ -410,7 +410,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					$nature = '';
 
 					// Must match array $sourceList defined into journals_list.php
-					if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
+					if ($objp->nature == 2 && isModEnabled('invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
 						$nature = "sells";
 					}
 					if ($objp->nature == 3
@@ -418,7 +418,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 						&& !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
 						$nature = "purchases";
 					}
-					if ($objp->nature == 4 && isModEnabled('banque')) {
+					if ($objp->nature == 4 && isModEnabled('bank')) {
 						$nature = "bank";
 					}
 					if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index df29edca3d5..8f8dd72b20b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -95,7 +95,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Members
 	$tmpentry = array(
-		'enabled' => isModEnabled('adherent'),
+		'enabled' => isModEnabled('member'),
 		'perms' => $user->hasRight('adherent', 'lire'),
 		'module' => 'adherent'
 	);
@@ -151,7 +151,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Products-Services
 	$tmpentry = array(
-		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),
+		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('delivery_note')),
 		'perms'=> ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
 		'module'=>'product|service'
 	);
@@ -203,7 +203,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Projects
 	$tmpentry = array(
-		'enabled'=> (isModEnabled('projet') ? 1 : 0),
+		'enabled'=> (isModEnabled('project') ? 1 : 0),
 		'perms'=> ($user->hasRight('projet', 'lire') ? 1 : 0),
 		'module'=>'projet'
 	);
@@ -243,12 +243,12 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$tmpentry = array(
 		'enabled'=>(
 			isModEnabled('propal')
-			|| isModEnabled('commande')
+			|| isModEnabled('order')
 			|| isModEnabled('fournisseur')
 			|| isModEnabled('supplier_proposal')
 			|| isModEnabled('supplier_order')
-			|| isModEnabled('contrat')
-			|| isModEnabled('ficheinter')
+			|| isModEnabled('contract')
+			|| isModEnabled('intervention')
 		) ? 1 : 0,
 		'perms'=>(
 			$user->hasRight('propal', 'read')
@@ -293,7 +293,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Billing - Financial
 	$tmpentry = array(
 		'enabled'=>(
-			isModEnabled('facture') ||
+			isModEnabled('invoice') ||
 			isModEnabled('don') ||
 			isModEnabled('tax') ||
 			isModEnabled('salaries') ||
@@ -327,7 +327,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Bank
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('banque') || isModEnabled('prelevement')),
+		'enabled'=>(isModEnabled('bank') || isModEnabled('prelevement')),
 		'perms'=>($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),
 		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
@@ -1211,7 +1211,7 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 				$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->hasRight("user", "user", "write") || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')), '', 'home');
 				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);
 				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);
-				if (isModEnabled('categorie')) {
+				if (isModEnabled('category')) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 				}
@@ -1283,7 +1283,7 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		}
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			$langs->load("categories");
 			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 				// Categories prospects/customers
@@ -1320,7 +1320,7 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->hasRight('societe',  'contact', 'lire'));
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			$langs->load("categories");
 			// Categories Contact
 			$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
@@ -1363,7 +1363,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 		}
 
 		// Customers orders
-		if (isModEnabled('commande')) {
+		if (isModEnabled('order')) {
 			$langs->load("orders");
 			$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->hasRight('commande', 'lire'), '', $mainmenu, 'orders', 200, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->hasRight('commande', 'creer'));
@@ -1371,7 +1371,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande', 'lire'));
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->hasRight('commande', 'lire'));
-				if (isModEnabled('expedition')) {
+				if (isModEnabled('delivery_note')) {
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->hasRight('commande', 'lire'));
 				}
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande', 'lire'));
@@ -1426,7 +1426,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 		}
 
 		// Contrat
-		if (isModEnabled('contrat')) {
+		if (isModEnabled('contract')) {
 			$langs->load("contracts");
 			$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->hasRight('contrat', 'lire'), '', $mainmenu, 'contracts', 2000, '', '', '', img_picto('', 'contract', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->hasRight('contrat', 'creer'));
@@ -1441,7 +1441,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 		}
 
 		// Interventions
-		if (isModEnabled('ficheinter')) {
+		if (isModEnabled('intervention')) {
 			$langs->load("interventions");
 			$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->hasRight('ficheinter', 'lire'), '', $mainmenu, 'ficheinter', 2200, '', '', '', img_picto('', 'intervention', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->hasRight('ficheinter', 'creer'), '', '', '', 201);
@@ -1472,7 +1472,7 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		$langs->load("companies");
 
 		// Customers invoices
-		if (isModEnabled('facture')) {
+		if (isModEnabled('invoice')) {
 			$langs->load("bills");
 			$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills', 0, '', '', '', img_picto('', 'bill', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->hasRight('facture', 'creer'));
@@ -1523,9 +1523,9 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		}
 
 		// Orders
-		if (isModEnabled('commande')) {
+		if (isModEnabled('order')) {
 			$langs->load("orders");
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->hasRight('commande', 'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
 			}
 			//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));
@@ -1625,7 +1625,7 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		}
 
 		// Various payment
-		if (isModEnabled('banque') && !getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')) {
+		if (isModEnabled('bank') && !getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')) {
 			$langs->load("banks");
 			$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->hasRight('banque', 'lire'), '', $mainmenu, 'tax_various', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
@@ -1673,10 +1673,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
 				$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
 				$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 60);
-				if (isModEnabled('banque')) {
+				if (isModEnabled('bank')) {
 					$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);
 				}
-				if (isModEnabled('facture') || isModEnabled('supplier_invoice')) {
+				if (isModEnabled('invoice') || isModEnabled('supplier_invoice')) {
 					$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 80);
 				}
 				if (isModEnabled('tax')) {
@@ -1696,7 +1696,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 
 			// Binding
 			// $newmenu->add("", $langs->trans("Binding"), 0, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch');
-			if (isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
+			if (isModEnabled('invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
 				$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'dispatch_customer');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
 					$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));
@@ -1741,7 +1741,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 							$nature = '';
 
 							// Must match array $sourceList defined into journals_list.php
-							if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
+							if ($objp->nature == 2 && isModEnabled('invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
 								$nature = "sells";
 							}
 							if ($objp->nature == 3
@@ -1749,7 +1749,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 								&& !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
 								$nature = "purchases";
 							}
-							if ($objp->nature == 4 && isModEnabled('banque')) {
+							if ($objp->nature == 4 && isModEnabled('bank')) {
 								$nature = "bank";
 							}
 							if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
@@ -1981,7 +1981,7 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
 
 		// Bank-Cash account
-		if (isModEnabled('banque')) {
+		if (isModEnabled('bank')) {
 			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->hasRight('banque', 'lire'), '', $mainmenu, 'bank', 0, '', '', '', img_picto('', 'bank_account', 'class="paddingright pictofixedwidth"'));
 
 			$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->hasRight('banque', 'configurer'));
@@ -1992,7 +1992,7 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->hasRight('banque', 'transfer'));
 		}
 
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			$langs->load("categories");
 			$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->hasRight('categorie', 'creer'), '', $mainmenu, 'tags');
 			$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');
@@ -2027,7 +2027,7 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		}
 
 		// Management of checks
-		if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT') && isModEnabled('banque') && (isModEnabled('facture') || getDolGlobalString('MAIN_MENU_CHEQUE_DEPOSIT_ON'))) {
+		if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT') && isModEnabled('bank') && (isModEnabled('invoice') || getDolGlobalString('MAIN_MENU_CHEQUE_DEPOSIT_ON'))) {
 			$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->hasRight('banque', 'cheque'), '', $mainmenu, 'checks', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 			if (preg_match('/checks/', $leftmenu)) {
 				$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->hasRight('banque', 'cheque'));
@@ -2076,12 +2076,12 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			if (isModEnabled('variants')) {
 				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('product', 'read'));
 			}
-			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
+			if (isModEnabled('propal') || isModEnabled('order') || isModEnabled('invoice') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
 				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->hasRight('product', 'read'));
 			}
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie',  'lire'));
@@ -2100,11 +2100,11 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			if (isModEnabled('variants')) {
 				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('service', 'read'));
 			}
-			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
+			if (isModEnabled('propal') || isModEnabled('order') || isModEnabled('invoice') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
 				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service', 'read'));
 			}
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie',  'lire'));
@@ -2126,7 +2126,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
 
 			// Categories for warehouses
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 			}
 		}
@@ -2156,7 +2156,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 		}
 
 		// Shipments
-		if (isModEnabled('expedition')) {
+		if (isModEnabled('delivery_note')) {
 			$langs->load("sendings");
 			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition', 'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition', 'creer'));
@@ -2238,13 +2238,13 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 	global $user, $conf, $langs;
 
 	if ($mainmenu == 'project') {
-		if (isModEnabled('projet')) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 
 			$search_project_user = GETPOSTINT('search_project_user');
 
 			$tmpentry = array(
-				'enabled'=>isModEnabled('projet'),
+				'enabled'=>isModEnabled('project'),
 				'perms'=>$user->hasRight('projet', 'lire'),
 				'module'=>'projet'
 			);
@@ -2279,7 +2279,7 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 			}
@@ -2389,11 +2389,11 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->hasRight('expensereport', 'lire'));
 				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->hasRight('expensereport', 'lire'));
 			}
-			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, ($user->hasRight('expensereport', 'lire')) && isModEnabled('banque'));
+			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, ($user->hasRight('expensereport', 'lire')) && isModEnabled('bank'));
 			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport', 'lire'));
 		}
 
-		if (isModEnabled('projet')) {
+		if (isModEnabled('project')) {
 			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 				$langs->load("projects");
 
@@ -2469,7 +2469,7 @@ function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 	global $user, $conf, $langs;
 
 	if ($mainmenu == 'members') {
-		if (isModEnabled('adherent')) {
+		if (isModEnabled('member')) {
 			// Load translation files required by the page
 			$langs->loadLangs(array("members", "compta"));
 
@@ -2487,7 +2487,7 @@ function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 
 			$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->hasRight('adherent', 'export'));
 
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'read'), '', $mainmenu, 'cat');
 			}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index f66eb100208..afdc64bf80c 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -1036,7 +1036,7 @@ class pdf_standard extends ModeleExpenseReport
 		$pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', 0);
 		$pdf->SetXY($tab3_posx + 35, $tab3_top + 1);
 		$pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$pdf->SetXY($tab3_posx + 65, $tab3_top + 1);
 			$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
 		}
@@ -1076,7 +1076,7 @@ class pdf_standard extends ModeleExpenseReport
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->p_code);
 
 				$pdf->MultiCell(40, 3, $oper, 0, 'L', 0);
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$pdf->SetXY($tab3_posx + 65, $tab3_top + $y + 1);
 					$pdf->MultiCell(30, 3, $row->baref, 0, 'L', 0);
 				}
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 19339df0ead..fe348963e14 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -248,7 +248,7 @@ class mailing_advthirdparties extends MailingTargets
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if (!isModEnabled("categorie")) {
+			if (!isModEnabled("category")) {
 				$num = 0; // Force empty list if category module is not enabled
 			}
 
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 60c1e2ed153..0d1c0b6931e 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -290,7 +290,7 @@ class mailing_thirdparties extends MailingTargets
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if (!isModEnabled("categorie")) {
+			if (!isModEnabled("category")) {
 				$num = 0; // Force empty list if category module is not enabled
 			}
 
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 20aced509b9..0ead1e5e844 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -136,7 +136,7 @@ class modCategorie extends DolibarrModules
 		if (isModEnabled("societe")) {
 			$typeexample .= ($typeexample ? " / " : "")."2=Customer-Prospect";
 		}
-		if (isModEnabled('adherent')) {
+		if (isModEnabled('member')) {
 			$typeexample .= ($typeexample ? " / " : "")."3=Member";
 		}
 		if (isModEnabled("societe")) {
@@ -538,7 +538,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 3 Members
-		if (isModEnabled('adherent')) {
+		if (isModEnabled('member')) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
 			$this->import_label[$r] = "CatMembersLinks"; // Translation key
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 4fce2b8021f..f571aad44ff 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -275,7 +275,7 @@ class modUser extends DolibarrModules
 		$keyforelement = 'user';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		if (!isModEnabled('adherent')) {
+		if (!isModEnabled('member')) {
 			unset($this->export_fields_array[$r]['u.fk_member']);
 			unset($this->export_entities_array[$r]['u.fk_member']);
 		}
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 4e37cf0beeb..611bd7f8aa1 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -42,13 +42,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (isModEnabled("supplier_invoice")) {
@@ -57,10 +57,10 @@ if (isModEnabled("supplier_invoice")) {
 if (isModEnabled("supplier_order")) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
 if (isModEnabled('deplacement')) {
@@ -69,7 +69,7 @@ if (isModEnabled('deplacement')) {
 if (isModEnabled('agenda')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 }
-if (isModEnabled('expedition')) {
+if (isModEnabled('delivery_note')) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 
@@ -942,19 +942,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListOrdersAssociatedProject",
 						'class' => 'Commande',
 						'table' => 'commande',
-						'test' => isModEnabled('commande') && $user->hasRight('commande', 'lire')
+						'test' => isModEnabled('order') && $user->hasRight('commande', 'lire')
 					),
 					'invoice' => array(
 						'title' => "ListInvoicesAssociatedProject",
 						'class' => 'Facture',
 						'table' => 'facture',
-						'test' => isModEnabled('facture') && $user->hasRight('facture', 'lire')
+						'test' => isModEnabled('invoice') && $user->hasRight('facture', 'lire')
 					),
 					'invoice_predefined' => array(
 						'title' => "ListPredefinedInvoicesAssociatedProject",
 						'class' => 'FactureRec',
 						'table' => 'facture_rec',
-						'test' => isModEnabled('facture') && $user->hasRight('facture', 'lire')
+						'test' => isModEnabled('invoice') && $user->hasRight('facture', 'lire')
 					),
 					'proposal_supplier' => array(
 						'title' => "ListSupplierProposalsAssociatedProject",
@@ -978,21 +978,21 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListContractAssociatedProject",
 						'class' => 'Contrat',
 						'table' => 'contrat',
-						'test' => isModEnabled('contrat') && $user->hasRight('contrat', 'lire')
+						'test' => isModEnabled('contract') && $user->hasRight('contrat', 'lire')
 					),
 					'intervention' => array(
 						'title' => "ListFichinterAssociatedProject",
 						'class' => 'Fichinter',
 						'table' => 'fichinter',
 						'disableamount' => 1,
-						'test' => isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire')
+						'test' => isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire')
 					),
 					'shipping' => array(
 						'title' => "ListShippingAssociatedProject",
 						'class' => 'Expedition',
 						'table' => 'expedition',
 						'disableamount' => 1,
-						'test' => isModEnabled('expedition') && $user->hasRight('expedition', 'lire')
+						'test' => isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')
 					),
 					'trip' => array(
 						'title' => "ListTripAssociatedProject",
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index d87238de508..021e855e417 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -330,7 +330,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'Commande',
 						'table'=>'commande',
 						'datefieldname'=>'date_commande',
-						'test'=> isModEnabled('commande') && $user->hasRight('commande', 'lire'),
+						'test'=> isModEnabled('order') && $user->hasRight('commande', 'lire'),
 						'lang'=>'orders'),
 					'invoice'=>array(
 						'name'=>"CustomersInvoices",
@@ -339,7 +339,7 @@ class pdf_beluga extends ModelePDFProjects
 						'margin'=>'add',
 						'table'=>'facture',
 						'datefieldname'=>'datef',
-						'test'=> isModEnabled('facture') && $user->hasRight('facture', 'lire'),
+						'test'=> isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
 						'lang'=>'bills'),
 					'invoice_predefined'=>array(
 						'name'=>"PredefinedInvoices",
@@ -347,7 +347,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'FactureRec',
 						'table'=>'facture_rec',
 						'datefieldname'=>'datec',
-						'test'=> isModEnabled('facture') && $user->hasRight('facture', 'lire'),
+						'test'=> isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
 						'lang'=>'bills'),
 					'order_supplier'=>array(
 						'name'=>"SuppliersOrders",
@@ -372,7 +372,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'Contrat',
 						'table'=>'contrat',
 						'datefieldname'=>'date_contrat',
-						'test'=> isModEnabled('contrat') && $user->hasRight('contrat', 'lire'),
+						'test'=> isModEnabled('contract') && $user->hasRight('contrat', 'lire'),
 						'lang'=>'contract'),
 					'intervention'=>array(
 						'name'=>"Interventions",
@@ -381,7 +381,7 @@ class pdf_beluga extends ModelePDFProjects
 						'table'=>'fichinter',
 						'datefieldname'=>'date_valid',
 						'disableamount'=>1,
-						'test'=>isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire'),
+						'test'=>isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire'),
 						'lang'=>'interventions'),
 					'trip'=>array(
 						'name'=>"TripsAndExpenses",
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 5b51371095b..c070f29ce02 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -43,13 +43,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (isModEnabled("supplier_invoice")) {
@@ -58,10 +58,10 @@ if (isModEnabled("supplier_invoice")) {
 if (isModEnabled("supplier_order")) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
 if (isModEnabled('deplacement')) {
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 1bc82c23810..8bb3ad2444d 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -215,14 +215,14 @@ class pdf_paiement extends CommonDocGenerator
 				$sql .= ", c.code as paiement_code, p.num_paiement as num_payment";
 				$sql .= ", p.amount as paiement_amount, f.total_ttc as facture_amount";
 				$sql .= ", pf.amount as pf_amount";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$sql .= ", ba.ref as bankaccount";
 				}
 				$sql .= ", p.rowid as prowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 				$sql .= ", ".MAIN_DB_PREFIX."facture as f,";
 				$sql .= " ".MAIN_DB_PREFIX."paiement_facture as pf,";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$sql .= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
 				}
 				$sql .= " ".MAIN_DB_PREFIX."societe as s";
@@ -230,7 +230,7 @@ class pdf_paiement extends CommonDocGenerator
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= " WHERE f.fk_soc = s.rowid AND pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$sql .= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
 				}
 				$sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -253,14 +253,14 @@ class pdf_paiement extends CommonDocGenerator
 				$sql .= ", c.code as paiement_code, p.num_paiement as num_payment";
 				$sql .= ", p.amount as paiement_amount, f.total_ttc as facture_amount";
 				$sql .= ", pf.amount as pf_amount";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$sql .= ", ba.ref as bankaccount";
 				}
 				$sql .= ", p.rowid as prowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 				$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f,";
 				$sql .= " ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$sql .= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
 				}
 				$sql .= " ".MAIN_DB_PREFIX."societe as s";
@@ -268,7 +268,7 @@ class pdf_paiement extends CommonDocGenerator
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= " WHERE f.fk_soc = s.rowid AND pf.fk_facturefourn = f.rowid AND pf.fk_paiementfourn = p.rowid";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$sql .= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
 				}
 				$sql .= " AND f.entity IN (".getEntity('invoice').")";
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 8d9b566794e..225707f0828 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -17,7 +17,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -256,7 +256,7 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) {
 	print '</td></tr>'."\n";
 }
 
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	// Customer Categories
 	print '<tr><td>'.$langs->trans("CustomersCategoryShort");
 	if (!empty($array_query['cust_categ'])) {
@@ -448,7 +448,7 @@ print '</td></tr></table>';
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
 
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	// Customer Categories
 	print '<tr><td>'.$langs->trans("ContactCategoriesShort");
 	if (!empty($array_query['contact_categ'])) {
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 0fc08a043f8..b5e24042ee3 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -30,7 +30,7 @@ print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><b
 print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':</span><br>';
 print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
 
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	print '<div id="order"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
@@ -52,7 +52,7 @@ if (isModEnabled('commande')) {
 	}
 	print '<br>';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	print '<div id="invoice"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
@@ -74,7 +74,7 @@ if (isModEnabled('facture')) {
 	}
 	print '<br>';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	print '<div id="contractline"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
@@ -96,7 +96,7 @@ if (isModEnabled('contrat')) {
 	}
 	print '<br>';
 }
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	print '<div id="membersubscription"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 945ece57a4b..0de09d491f0 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -73,7 +73,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		// Proposals to order
 		if ($action == 'PROPAL_CLOSE_SIGNED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (isModEnabled('commande') && getDolGlobalString('WORKFLOW_PROPAL_AUTOCREATE_ORDER')) {
+			if (isModEnabled('order') && getDolGlobalString('WORKFLOW_PROPAL_AUTOCREATE_ORDER')) {
 				$object->fetchObjectLinked();
 				if (!empty($object->linkedObjectsIds['commande'])) {
 					if (empty($object->context['closedfromonlinesignature'])) {
@@ -104,7 +104,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		// Order to invoice
 		if ($action == 'ORDER_CLOSE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (isModEnabled('facture') && getDolGlobalString('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) {
+			if (isModEnabled('invoice') && getDolGlobalString('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) {
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$newobject = new Facture($this->db);
 
@@ -151,7 +151,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 			// First classify billed the order to allow the proposal classify process
-			if (isModEnabled('commande') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER')) {
+			if (isModEnabled('order') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER')) {
 				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -189,7 +189,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 
 			// Set shipment to "Closed" if WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE is set (deprecated, has been replaced with WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE instead))
-			if (isModEnabled("expedition") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) {
+			if (isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) {
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -210,7 +210,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 
-			if (isModEnabled("expedition") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) {
+			if (isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) {
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -336,7 +336,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if ($action == 'BILL_PAYED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (isModEnabled('commande') && getDolGlobalString('WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER')) {
+			if (isModEnabled('order') && getDolGlobalString('WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER')) {
 				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -360,7 +360,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if (($action == 'SHIPPING_VALIDATE') || ($action == 'SHIPPING_CLOSED')) {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (isModEnabled('commande') && isModEnabled("expedition") && !empty($conf->workflow->enabled) &&
+			if (isModEnabled('order') && isModEnabled("delivery_note") && !empty($conf->workflow->enabled) &&
 				(
 					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING') && ($action == 'SHIPPING_VALIDATE')) ||
 					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED') && ($action == 'SHIPPING_CLOSED'))
@@ -516,7 +516,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if ($action == 'TICKET_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			// Auto link contract
-			if (!empty($conf->contract->enabled) && isModEnabled('ticket') && isModEnabled('ficheinter') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_TICKET_LINK_CONTRACT') && getDolGlobalString('TICKET_PRODUCT_CATEGORY') && !empty($object->fk_soc)) {
+			if (!empty($conf->contract->enabled) && isModEnabled('ticket') && isModEnabled('intervention') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_TICKET_LINK_CONTRACT') && getDolGlobalString('TICKET_PRODUCT_CATEGORY') && !empty($object->fk_soc)) {
 				$societe = new Societe($this->db);
 				$company_ids = (!getDolGlobalString('WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS')) ? [$object->fk_soc] : $societe->getParentsForCompany($object->fk_soc, [$object->fk_soc]);
 
@@ -550,7 +550,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 			// Automatically create intervention
-			if (isModEnabled('ficheinter') && isModEnabled('ticket') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_TICKET_CREATE_INTERVENTION')) {
+			if (isModEnabled('intervention') && isModEnabled('ticket') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_TICKET_CREATE_INTERVENTION')) {
 				$fichinter = new Fichinter($this->db);
 				$fichinter->socid = (int) $object->fk_soc;
 				$fichinter->fk_project = (int) $object->fk_project;
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index d3441ebec91..a056d47b48d 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -155,9 +155,9 @@ class InterfaceNotification extends DolibarrTriggers
 						$qualified = 0;
 					} elseif ($element == 'withdraw' && !isModEnabled('prelevement')) {
 						$qualified = 0;
-					} elseif ($element == 'shipping' && !isModEnabled('expedition')) {
+					} elseif ($element == 'shipping' && !isModEnabled('delivery_note')) {
 						$qualified = 0;
-					} elseif ($element == 'member' && !isModEnabled('adherent')) {
+					} elseif ($element == 'member' && !isModEnabled('member')) {
 						$qualified = 0;
 					} elseif (($element == 'expense_report' || $element == 'expensereport') && !isModEnabled('expensereport')) {
 						$qualified = 0;
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 5bbfe34f6a1..de7ec5c5b50 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -51,7 +51,7 @@ if (getDolGlobalString('DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT')) {
 		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
 	);
 }
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	$arrayofparameters['Member'] = array(
 		'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'member', 'class="pictofixedwidth"')),
 	);
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 218ef5ec4a3..7dccbfbdd44 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (isModEnabled("product") || isModEnabled("service")) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
-if (isModEnabled('expedition')) {
+if (isModEnabled('delivery_note')) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 if (isModEnabled('stock')) {
@@ -311,7 +311,7 @@ if ($action == 'create') {
 			 *   Delivery
 			 */
 
-			if ($typeobject == 'commande' && $expedition->origin_id > 0 && isModEnabled('commande')) {
+			if ($typeobject == 'commande' && $expedition->origin_id > 0 && isModEnabled('order')) {
 				$objectsrc = new Commande($db);
 				$objectsrc->fetch($expedition->origin_id);
 			}
@@ -391,7 +391,7 @@ if ($action == 'create') {
 			*/
 
 			// Document origine
-			if ($typeobject == 'commande' && $expedition->origin_id && isModEnabled('commande')) {
+			if ($typeobject == 'commande' && $expedition->origin_id && isModEnabled('order')) {
 				print '<tr><td class="titlefield">'.$langs->trans("RefOrder").'</td>';
 				$order = new Commande($db);
 				$order->fetch($expedition->origin_id);
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 1dfc406a9b9..a5017547c34 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index e3e0358fed4..6720301d326 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -579,7 +579,7 @@ class PaymentDonation extends CommonObject
 
 		$error = 0;
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 26a4c4c55c2..32162646c27 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -93,8 +93,8 @@ $arrayfields = array(
 	's.nom'				=> array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
 	'c.code'			=> array('label'=>"Type", 'checked'=>1, 'position'=>40),
 	'pd.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
-	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("banque"))),
-	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>70, 'enabled'=>(isModEnabled("banque"))),
+	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("bank"))),
+	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>70, 'enabled'=>(isModEnabled("bank"))),
 	'pd.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 434d75de273..5c4b6f719ee 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -125,7 +125,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $
 print '<tr><td>'.$langs->trans('Note').'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlcleanlastbr($object->note_public)).'</td></tr>';
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 3f704d8c20f..ebf7a741f80 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -67,7 +67,7 @@ if ($action == 'add_payment') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-	if (isModEnabled("banque") && !(GETPOSTINT("accountid") > 0)) {
+	if (isModEnabled("bank") && !(GETPOSTINT("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 	}
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index cd19a296581..a7560e312cb 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -323,17 +323,17 @@ if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 		$rowspan++;
 		$sectionauto[] = array('position'=>30, 'level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 	}
-	if (isModEnabled('contrat')) {
+	if (isModEnabled('contract')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contrat'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+		$sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contract'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 	}
-	if (isModEnabled('commande')) {
+	if (isModEnabled('order')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>isModEnabled('commande'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+		$sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>isModEnabled('order'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 	}
-	if (isModEnabled('facture')) {
+	if (isModEnabled('invoice')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('facture'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+		$sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('invoice'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 	}
 	if (isModEnabled('supplier_proposal')) {
 		$langs->load("supplier_proposal");
@@ -366,10 +366,10 @@ if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 		$rowspan++;
 		$sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
 	}
-	if (isModEnabled('ficheinter')) {
+	if (isModEnabled('intervention')) {
 		$langs->load("interventions");
 		$rowspan++;
-		$sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('ficheinter'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+		$sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('intervention'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 	}
 	if (isModEnabled('expensereport')) {
 		$langs->load("trips");
@@ -381,12 +381,12 @@ if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 		$rowspan++;
 		$sectionauto[] = array('position'=>170, 'level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 	}
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		$langs->load("banks");
 		$rowspan++;
-		$sectionauto[] = array('position'=>180, 'level'=>1, 'module'=>'banque', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+		$sectionauto[] = array('position'=>180, 'level'=>1, 'module'=>'banque', 'test'=>isModEnabled('bank'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
 		$rowspan++;
-		$sectionauto[] = array('position'=>190, 'level'=>1, 'module'=>'chequereceipt', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
+		$sectionauto[] = array('position'=>190, 'level'=>1, 'module'=>'chequereceipt', 'test'=>isModEnabled('bank'), 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
 	}
 	if (isModEnabled('mrp')) {
 		$langs->load("mrp");
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 0ade7890db6..33fa81665a3 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -127,17 +127,17 @@ if (isModEnabled("propal")) {
 	$rowspan++;
 	$sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$rowspan++;
-	$sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contrat'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+	$sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contract'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$rowspan++;
-	$sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>isModEnabled('commande'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+	$sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>isModEnabled('order'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$rowspan++;
-	$sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('facture'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+	$sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('invoice'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 }
 if (isModEnabled('supplier_proposal')) {
 	$langs->load("supplier_proposal");
@@ -161,10 +161,10 @@ if (isModEnabled('project')) {
 	$rowspan++;
 	$sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$langs->load("interventions");
 	$rowspan++;
-	$sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('ficheinter'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+	$sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('intervention'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 }
 if (isModEnabled('expensereport')) {
 	$langs->load("trips");
@@ -176,10 +176,10 @@ if (isModEnabled('holiday')) {
 	$rowspan++;
 	$sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 }
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	$langs->load("banks");
 	$rowspan++;
-	$sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+	$sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>isModEnabled('bank'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
 }
 if (isModEnabled('mrp')) {
 	$langs->load("mrp");
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index a4ed949fc04..06fb0af4299 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -328,7 +328,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="titlefield valignmiddle">'.$langs->trans("Categories").'</td><td class="valuefield">';
 		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index fd335c1409e..bb19456cd2c 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -287,7 +287,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 8b4db60d47d..a82d6a419c2 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -260,7 +260,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 6b584a30e73..ce211834b8c 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -443,7 +443,7 @@ if ($projectid > 0) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="titlefield valignmiddle">'.$langs->trans("Categories").'</td><td class="valuefield">';
 		print $form->showCategories($project->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 7cd5f1d2e10..a83218f0a12 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -332,7 +332,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, 'project', 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index d844673b9ce..0c9722c4b78 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -543,7 +543,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print '</td></tr>';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 15397bf9327..f0e85472b80 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -958,7 +958,7 @@ if ($action == 'create') {
 
 			// Ref
 			print '<tr><td class="titlefieldcreate fieldrequired">';
-			if ($origin == 'commande' && isModEnabled('commande')) {
+			if ($origin == 'commande' && isModEnabled('order')) {
 				print $langs->trans("RefOrder");
 			}
 			if ($origin == 'propal' && isModEnabled("propal")) {
@@ -1869,7 +1869,7 @@ if ($action == 'create') {
 	$totalWeight = $tmparray['weight'];
 	$totalVolume = $tmparray['volume'];
 
-	if (!empty($typeobject) && $typeobject === 'commande' && is_object($object->$typeobject) && $object->$typeobject->id && isModEnabled('commande')) {
+	if (!empty($typeobject) && $typeobject === 'commande' && is_object($object->$typeobject) && $object->$typeobject->id && isModEnabled('order')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -1920,7 +1920,7 @@ if ($action == 'create') {
 	print '<table class="border tableforfield centpercent">';
 
 	// Linked documents
-	if (!empty($typeobject) && $typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if (!empty($typeobject) && $typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		print '<tr><td>';
 		print $langs->trans("RefOrder").'</td>';
 		print '<td colspan="3">';
@@ -2677,7 +2677,7 @@ if ($action == 'create') {
 			}
 
 			// Create bill
-			if (isModEnabled('facture') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
+			if (isModEnabled('invoice') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
 						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid, '');
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index e4d0918ea1f..70a7b3a6a2d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionlinebatch.class.php';
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 86b3c547e5a..13403d14a3a 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -55,7 +55,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -191,7 +191,7 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border centpercent tableforfield">';
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		print '<tr><td class="titlefield">';
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 2a72c02ead0..8334b30bdef 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -423,7 +423,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 	// Print form confirm
 	print $formconfirm;
 
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -474,7 +474,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		print '<tr><td>';
 		print $langs->trans("RefOrder").'</td>';
 		print '<td colspan="3">';
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 50cbd1f0380..1f1f33c6151 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -77,7 +77,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b1d33238f15..de32d3fc972 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -652,7 +652,7 @@ if ($user->hasRight('user', 'user', 'lire')) {
 	$moreforfilter .= '</div>';
 }
 // If the user can view prospects other than his'
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -663,7 +663,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user-
 
 	$moreforfilter .= '</div>';
 }
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index bec93d8c8dc..d05220c1eda 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -52,7 +52,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index b8bae69f698..d5bdbdb3fb6 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1919,7 +1919,7 @@ if ($action == 'create') {
 			// List of payments already done
 			$nbcols = 3;
 			$nbrows = 0;
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				$nbrows++;
 				$nbcols++;
 			}
@@ -1930,7 +1930,7 @@ if ($action == 'create') {
 			print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
 			print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
 			print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 			}
 			print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
@@ -1973,7 +1973,7 @@ if ($action == 'create') {
 					$labeltype = $langs->trans("PaymentType".$objp->payment_code) != "PaymentType".$objp->payment_code ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 					// Bank account
-					if (isModEnabled("banque")) {
+					if (isModEnabled("bank")) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
 						$bankaccountstatic->label = $objp->baref;
@@ -2782,7 +2782,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	}
 
 	// If bank module is used
-	if ($user->hasRight('expensereport', 'to_paid') && isModEnabled("banque") && $object->status == ExpenseReport::STATUS_APPROVED) {
+	if ($user->hasRight('expensereport', 'to_paid') && isModEnabled("bank") && $object->status == ExpenseReport::STATUS_APPROVED) {
 		// Pay
 		if ($remaintopay == 0) {
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
@@ -2792,7 +2792,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	}
 
 	// If bank module is not used
-	if (($user->hasRight('expensereport', 'to_paid') || empty(isModEnabled("banque"))) && $object->status == ExpenseReport::STATUS_APPROVED) {
+	if (($user->hasRight('expensereport', 'to_paid') || empty(isModEnabled("bank"))) && $object->status == ExpenseReport::STATUS_APPROVED) {
 		//if ((round($remaintopay) == 0 || !isModEnabled("banque")) && $object->paid == 0)
 		if ($object->paid == 0) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=set_paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index d8e650fb88d..464ca7edf60 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -634,7 +634,7 @@ class ExpenseReports extends DolibarrApi
 		if ($paymentExpenseReport->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error creating paymentExpenseReport', array_merge(array($paymentExpenseReport->error), $paymentExpenseReport->errors));
 		}
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$paymentExpenseReport->addPaymentToBank(
 				DolibarrApiAccess::$user,
 				'payment_expensereport',
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 0bcb616ba36..ca7da95f824 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -533,7 +533,7 @@ class PaymentExpenseReport extends CommonObject
 
 		$error = 0;
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index caccb13d9d6..8edcfe60ca0 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -121,7 +121,7 @@ print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td class="valeur sen
 
 $disable_delete = 0;
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 1f98dcc2d3d..8034da0845a 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -107,7 +107,7 @@ $arrayfields = array(
 	'u.login'				=>array('label'=>"User", 'checked'=>1, 'position'=>30),
 	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
 	'pndf.num_payment'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
-	'ba.label'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled("banque"))),
+	'ba.label'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled("bank"))),
 	'pndf.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index ce82f3d72a5..0df2d3583a1 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -78,7 +78,7 @@ if ($action == 'add_payment') {
 		$error++;
 	}
 
-	if (isModEnabled("banque") && !($accountid > 0)) {
+	if (isModEnabled("bank") && !($accountid > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 	}
@@ -247,7 +247,7 @@ if ($action == 'create' || empty($action)) {
 	print "</td>\n";
 	print '</tr>';
 
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr>';
 		print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 		print '<td colspan="2">';
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 1ac2095ad1f..8d4303b9e8d 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -43,7 +43,7 @@ if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcontract.class.php';
 }
@@ -267,7 +267,7 @@ llxHeader('', $langs->trans("RepeatableIntervention"), $help_url);
 
 $form = new Form($db);
 $companystatic = new Societe($db);
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$contratstatic = new Contrat($db);
 }
 if (isModEnabled('project')) {
@@ -302,7 +302,7 @@ if ($action == 'create') {
 		if (isModEnabled('project') && $object->fk_project > 0) {
 			$rowspan++;
 		}
-		if (isModEnabled('contrat') && $object->fk_contrat > 0) {
+		if (isModEnabled('contract') && $object->fk_contrat > 0) {
 			$rowspan++;
 		}
 
@@ -355,7 +355,7 @@ if ($action == 'create') {
 		}
 
 		// Contrat
-		if (isModEnabled('contrat')) {
+		if (isModEnabled('contract')) {
 			$formcontract = new FormContract($db);
 			print "<tr><td>".$langs->trans("Contract")."</td><td>";
 			$contractid = GETPOST('contractid') ? GETPOST('contractid') : (!empty($object->fk_contrat) ? $object->fk_contrat : 0) ;
@@ -566,7 +566,7 @@ if ($action == 'create') {
 			print '<tr><td>'.$langs->trans("Description").'</td><td colspan="3">'.nl2br($object->description)."</td></tr>";
 
 			// Contract
-			if (isModEnabled('contrat')) {
+			if (isModEnabled('contract')) {
 				$langs->load('contracts');
 				print '<tr>';
 				print '<td>';
@@ -827,7 +827,7 @@ if ($action == 'create') {
 			print '<tr class="liste_titre">';
 			print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
 			print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
-			if (isModEnabled('contrat')) {
+			if (isModEnabled('contract')) {
 				print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
 			}
 			if (isModEnabled('project')) {
@@ -861,7 +861,7 @@ if ($action == 'create') {
 						print '<td>'.$langs->trans("None").'</td>';
 					}
 
-					if (isModEnabled('contrat')) {
+					if (isModEnabled('contract')) {
 						print '<td>';
 						if ($objp->fk_contrat > 0) {
 							$contratstatic->fetch($objp->fk_contrat);
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 91926349cd9..c5d1ad93933 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -43,7 +43,7 @@ if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
@@ -813,7 +813,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$formcontract = new FormContract($db);
 }
 if (isModEnabled('project')) {
@@ -959,7 +959,7 @@ if ($action == 'create') {
 		}
 
 		// Contract
-		if (isModEnabled('contrat')) {
+		if (isModEnabled('contract')) {
 			$langs->load("contracts");
 			print '<tr><td>'.$langs->trans("Contract").'</td><td>';
 			$numcontrat = $formcontract->select_contract($soc->id, GETPOSTINT('contratid'), 'contratid', 0, 1, 1);
@@ -1272,7 +1272,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Contract
-	if (isModEnabled('contrat')) {
+	if (isModEnabled('contract')) {
 		$langs->load('contracts');
 		print '<tr>';
 		print '<td>';
@@ -1701,7 +1701,7 @@ if ($action == 'create') {
 				}
 
 				// Invoicing
-				if (isModEnabled('facture') && $object->statut > Fichinter::STATUS_DRAFT) {
+				if (isModEnabled('invoice') && $object->statut > Fichinter::STATUS_DRAFT) {
 					$langs->load("bills");
 					if ($object->statut < Fichinter::STATUS_BILLED) {
 						if ($user->hasRight('facture', 'creer')) {
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 05d125f0d0a..335d5608727 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -172,7 +172,7 @@ if ($resql) {
 /*
  * Draft orders
  */
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$sql = "SELECT f.rowid, f.ref, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -295,7 +295,7 @@ if ($resql) {
  * interventions to process
  */
 
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 64da4f12882..ddc8d0c332b 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 
@@ -48,7 +48,7 @@ $langs->loadLangs(array('companies', 'bills', 'interventions'));
 if (isModEnabled('project')) {
 	$langs->load("projects");
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$langs->load("contracts");
 }
 
@@ -226,7 +226,7 @@ $companystatic = new Societe($db);
 if (isModEnabled('project')) {
 	$projetstatic = new Project($db);
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$contratstatic = new Contrat($db);
 }
 
@@ -258,7 +258,7 @@ $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.s
 if (isModEnabled('project')) {
 	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_customer, c.ref_supplier as contrat_ref_supplier";
 }
 // Add fields from extrafields
@@ -278,7 +278,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 if (isModEnabled('project')) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 818b1e5c0cd..56954e78e16 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 if (!empty($conf->accounting->enabled)) {
@@ -330,7 +330,7 @@ if ($object->id > 0) {
 	print "</td>";
 	print '</tr>';
 
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		// Default bank account for payments
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
@@ -397,7 +397,7 @@ if ($object->id > 0) {
 	}
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		$langs->load("categories");
 		print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 		print '<td>';
@@ -410,7 +410,7 @@ if ($object->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
-	if (isModEnabled('adherent')) {
+	if (isModEnabled('member')) {
 		$langs->load("members");
 		$langs->load("users");
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index c9c674d2c76..00ba4fa8532 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -435,7 +435,7 @@ class SupplierInvoices extends DolibarrApi
 			throw new RestException(404, 'Invoice not found');
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			if (empty($accountid)) {
 				throw new RestException(400, 'Bank account ID is mandatory');
 			}
@@ -484,7 +484,7 @@ class SupplierInvoices extends DolibarrApi
 			throw new RestException(400, 'Payment error : ' . $paiement->error);
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$result = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, $chqemetteur, $chqbank);
 			if ($result < 0) {
 				$this->db->rollback();
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 74438fdcc70..059e04db6b7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1775,7 +1775,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("bank")) {
 			$langs->load("bank");
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
@@ -2248,7 +2248,7 @@ if ($action == 'create') {
 		}
 
 		// Bank Account
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("bank")) {
 			print '<tr><td class="nowrap">';
 			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
@@ -2642,7 +2642,7 @@ if ($action == 'create') {
 
 				// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
 				if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1) {  // statut 2 means approved
-					if (!isModEnabled('facture')) {
+					if (!isModEnabled('invoice')) {
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
 					} else {
 						if (!empty($object->linkedObjectsIds['invoice_supplier'])) {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 9630614fd9d..ab1f551519e 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1308,7 +1308,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2cab1b323d6..2210f2c1493 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2667,7 +2667,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 			// when bank account is empty (means not override by payment mode form a other object, like third-party), try to use default value
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
@@ -3431,7 +3431,7 @@ if ($action == 'create') {
 			}
 
 			// Bank Account
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<tr><td class="nowrap">';
 				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 				print $langs->trans('BankAccount');
@@ -3609,7 +3609,7 @@ if ($action == 'create') {
 			if (isModEnabled('project')) {
 				$nbrows++;
 			}
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				$nbrows++;
 				$nbcols++;
 			}
@@ -3651,7 +3651,7 @@ if ($action == 'create') {
 				print '<td class="liste_titre">'.($object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')).'</td>';
 				print '<td>'.$langs->trans('Date').'</td>';
 				print '<td>'.$langs->trans('Type').'</td>';
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					print '<td class="right">'.$langs->trans('BankAccount').'</td>';
 				}
 				print '<td class="right">'.$langs->trans('Amount').'</td>';
@@ -3680,7 +3680,7 @@ if ($action == 'create') {
 						print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($s).'">';
 						print $s;
 						print '</td>';
-						if (isModEnabled("banque")) {
+						if (isModEnabled("bank")) {
 							$bankaccountstatic->id = $objp->baid;
 							$bankaccountstatic->ref = $objp->baref;
 							$bankaccountstatic->label = $objp->baref;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 59f7d3d7916..5fa0373d095 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1030,7 +1030,7 @@ if ($user->hasRight("user", "user", "lire")) {
 	$moreforfilter .= '</div>';
 }
 // If the user can view prospects other than his'
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -1039,7 +1039,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user-
 	$moreforfilter .= '</div>';
 }
 
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('SuppliersCategoriesShort');
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 730442f4935..92ac2fa8987 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -226,7 +226,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			// If bank module is on, account is required to enter a payment
 			if (GETPOST('accountid') <= 0) {
 				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
@@ -514,7 +514,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
 			$form->select_types_paiements(!GETPOST('paiementid') ? $obj->fk_mode_reglement : GETPOST('paiementid'), 'paiementid');
 			print '</td>';
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
 				print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 				print $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2, '', 0, 'widthcentpercentminusx maxwidth500', 1);
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 19f94afdd9b..d4ad615ee18 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -231,7 +231,7 @@ if ($result > 0) {
 
 	$allow_delete = 1;
 	// Bank account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		if ($object->fk_account) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->bank_line);
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index 6bdecf49b37..540ef560f3c 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -130,7 +130,7 @@ if ($object->id > 0) {
 
 	$allow_delete = 1;
 	// Bank account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		if ($object->fk_account) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->bank_line);
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 835025ebd38..49c9a20a1c4 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -102,7 +102,7 @@ $arrayfields = array(
 	's.nom'				=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
 	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
 	'p.num_paiement'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
-	'ba.label'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled("banque"))),
+	'ba.label'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled("bank"))),
 	'p.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/index.php b/htdocs/index.php
index 516afe06f43..0cb2d4a260c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -206,7 +206,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
 	}
 
 	// Number of sales orders
-	if (isModEnabled('commande')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$board = new Commande($db);
 		// Number of customer orders to be shipped (validated and in progress)
@@ -228,7 +228,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
 	}
 
 	// Number of contract / services enabled (delayed)
-	if (isModEnabled('contrat')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contract')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 		$board = new Contrat($db);
 		$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
@@ -246,7 +246,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
 	}
 
 	// Number of invoices customers (paid)
-	if (isModEnabled('facture') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('facture', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$board = new Facture($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
@@ -260,7 +260,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
 	}
 
 	// Number of transactions to conciliate
-	if (isModEnabled('banque')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+	if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
 		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$board = new Account($db);
 		$nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
@@ -271,7 +271,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
 
 
 	// Number of cheque to send
-	if (isModEnabled('banque')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+	if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
 		if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT')) {
 			include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
 			$board = new RemiseCheque($db);
@@ -290,7 +290,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
 	}
 
 	// Number of foundation members
-	if (isModEnabled('adherent')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
+	if (isModEnabled('member')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
 		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$board = new Adherent($db);
 		$dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 9941d21ce26..f7d513d4e3f 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -2040,7 +2040,7 @@ function migrate_modeles($db, $langs, $conf)
 
 	dolibarr_install_syslog("upgrade2::migrate_modeles");
 
-	if (isModEnabled('facture')) {
+	if (isModEnabled('invoice')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 		$modellist = ModelePDFFactures::liste_modeles($db);
 		if (count($modellist) == 0) {
@@ -2053,7 +2053,7 @@ function migrate_modeles($db, $langs, $conf)
 		}
 	}
 
-	if (isModEnabled('commande')) {
+	if (isModEnabled('order')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 		$modellist = ModelePDFCommandes::liste_modeles($db);
 		if (count($modellist) == 0) {
@@ -2066,7 +2066,7 @@ function migrate_modeles($db, $langs, $conf)
 		}
 	}
 
-	if (isModEnabled("expedition")) {
+	if (isModEnabled("delivery_note")) {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 		$modellist = ModelePdfExpedition::liste_modeles($db);
 		if (count($modellist) == 0) {
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 6ed03ae11f5..b8148c97f43 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -746,7 +746,7 @@ class KnowledgeRecord extends CommonObject
 		$labellang = ($this->lang ? $langs->trans('Language_'.$this->lang) : '');
 		$datas['lang'] = '<br><b>'.$langs->trans('Language').':</b> ' . picto_from_langcode($this->lang, 'class="paddingrightonly saturatemedium opacitylow"') . $labellang;
 		// show categories for this record only in ajax to not overload lists
-		if (isModEnabled('categorie') && !$nofetch) {
+		if (isModEnabled('category') && !$nofetch) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_KNOWLEDGEMANAGEMENT, 1);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index b44d5c3e5c5..1fa1a8a20f1 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -191,7 +191,7 @@ if ($action == 'create') {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 	$object->fields['answer']['enabled'] = 1;
 
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
 
 		if (count($cate_arbo)) {
@@ -248,7 +248,7 @@ if (($id || $ref) && $action == 'edit') {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 	$object->fields['answer']['enabled'] = 1;
 
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
 
 		if (count($cate_arbo)) {
@@ -433,7 +433,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$object->fields['answer']['enabled'] = 1;
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_KNOWLEDGEMANAGEMENT, 1);
 		print "</td></tr>";
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index a2e0fa51aef..c20ccb99e2c 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -491,7 +491,7 @@ $moreforfilter.= '</div>';*/
 
 // Filter on categories
 $moreforfilter = '';
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_KNOWLEDGEMANAGEMENT, $searchCategoryKnowledgemanagementList, 'minwidth300', $searchCategoryKnowledgemanagementList ? $searchCategoryKnowledgemanagementList : 0);
 	/*
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 34f035e9d37..fc41bac9d6b 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -290,7 +290,7 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth300" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label')).'" autofocus="autofocus"></td></tr>';
 
 	// Bank account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td class="fieldrequired">'.$langs->trans("BankAccount").'</td><td>';
 		$form->select_comptes(GETPOST("accountid"), "accountid", 0, "courant=1", 1); // Show list of bank account with courant
 		print '</td></tr>';
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index ec0a8dcbe29..b0064f2a62c 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -504,7 +504,7 @@ class PaymentLoan extends CommonObject
 		$error = 0;
 		$this->db->begin();
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 1ec4aacd72d..ec20266337e 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -25,7 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -130,7 +130,7 @@ print '<tr><td>'.$langs->trans('NotePrivate').'</td><td>'.nl2br($payment->note_p
 print '<tr><td>'.$langs->trans('NotePublic').'</td><td>'.nl2br($payment->note_public).'</td></tr>';
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($payment->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($payment->bank_line);
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 9e6cda0866d..508d37fcf55 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -106,7 +106,7 @@ if ($action == 'add_payment') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-	if (isModEnabled("banque") && !GETPOSTINT('accountid') > 0) {
+	if (isModEnabled("bank") && !GETPOSTINT('accountid') > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 	}
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index b7ef7d99eb9..462e553847e 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -306,7 +306,7 @@ class MailmanSpip
 			return -1;
 		}
 
-		if (isModEnabled('adherent')) {	// Synchro for members
+		if (isModEnabled('member')) {	// Synchro for members
 			if (getDolGlobalString('ADHERENT_MAILMAN_URL')) {
 				if ($listes == '' && getDolGlobalString('ADHERENT_MAILMAN_LISTS')) {
 					$lists = explode(',', getDolGlobalString('ADHERENT_MAILMAN_LISTS'));
@@ -376,7 +376,7 @@ class MailmanSpip
 			return -1;
 		}
 
-		if (isModEnabled('adherent')) {	// Synchro for members
+		if (isModEnabled('member')) {	// Synchro for members
 			if (getDolGlobalString('ADHERENT_MAILMAN_UNSUB_URL')) {
 				if ($listes == '' && getDolGlobalString('ADHERENT_MAILMAN_LISTS')) {
 					$lists = explode(',', getDolGlobalString('ADHERENT_MAILMAN_LISTS'));
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4e1867a4f4c..7e41e0b4d40 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2738,7 +2738,7 @@ function printDropdownQuickadd()
 				"title" => "MenuNewMember@members",
 				"name" => "Adherent@members",
 				"picto" => "object_member",
-				"activation" => isModEnabled('adherent') && $user->hasRight("adherent", "write"), // vs hooking
+				"activation" => isModEnabled('member') && $user->hasRight("adherent", "write"), // vs hooking
 				"position" => 5,
 			),
 			array(
@@ -2771,7 +2771,7 @@ function printDropdownQuickadd()
 				"title" => "NewOrder@orders",
 				"name" => "Order@orders",
 				"picto" => "object_order",
-				"activation" => isModEnabled('commande') && $user->hasRight("commande", "write"), // vs hooking
+				"activation" => isModEnabled('order') && $user->hasRight("commande", "write"), // vs hooking
 				"position" => 40,
 			),
 			array(
@@ -2779,7 +2779,7 @@ function printDropdownQuickadd()
 				"title" => "NewBill@bills",
 				"name" => "Bill@bills",
 				"picto" => "object_bill",
-				"activation" => isModEnabled('facture') && $user->hasRight("facture", "write"), // vs hooking
+				"activation" => isModEnabled('invoice') && $user->hasRight("facture", "write"), // vs hooking
 				"position" => 50,
 			),
 			array(
@@ -2787,7 +2787,7 @@ function printDropdownQuickadd()
 				"title" => "NewContractSubscription@contracts",
 				"name" => "Contract@contracts",
 				"picto" => "object_contract",
-				"activation" => isModEnabled('contrat') && $user->hasRight("contrat", "write"), // vs hooking
+				"activation" => isModEnabled('contract') && $user->hasRight("contrat", "write"), // vs hooking
 				"position" => 60,
 			),
 			array(
@@ -2827,7 +2827,7 @@ function printDropdownQuickadd()
 				"title" => "NewIntervention@interventions",
 				"name" => "Intervention@interventions",
 				"picto" => "intervention",
-				"activation" => isModEnabled('ficheinter') && $user->hasRight("ficheinter", "creer"), // vs hooking
+				"activation" => isModEnabled('intervention') && $user->hasRight("ficheinter", "creer"), // vs hooking
 				"position" => 110,
 			),
 			array(
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 820c29bc2c1..6f82bac1e10 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -227,7 +227,7 @@ print '<br><span class="opacitymedium">'.$langs->trans("Example").': '.$mysoc->n
 print '</td></tr>';
 
 
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
 	$form->select_comptes($conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 83fa2eecf3b..305a9960abf 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -245,7 +245,7 @@ print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.getD
 print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': '.$mysoc->name.'</span>';
 print '</td></tr>';
 
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
 	print img_picto('', 'bank_account').' ';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index cae180fd850..d9a95678e81 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -60,10 +60,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 if (isModEnabled('propal')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (isModEnabled('accounting')) {
@@ -83,7 +83,7 @@ $langs->loadLangs(array('products', 'other'));
 if (isModEnabled('stock')) {
 	$langs->load("stocks");
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$langs->load("bills");
 }
 if (isModEnabled('productbatch')) {
@@ -1685,7 +1685,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print "</td></tr>";
 			//}
 
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				// Categories
 				print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -2295,7 +2295,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Tags-Categories
-				if (isModEnabled('categorie')) {
+				if (isModEnabled('category')) {
 					print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 					$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
 					$c = new Categorie($db);
@@ -2825,7 +2825,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 				// Categories
-				if (isModEnabled('categorie')) {
+				if (isModEnabled('category')) {
 					print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 					print $form->showCategories($object->id, Categorie::TYPE_PRODUCT, 1);
 					print "</td></tr>";
@@ -2988,7 +2988,7 @@ if (getDolGlobalString('PRODUCT_ADD_FORM_ADD_TO') && $object->id && ($action ==
 	}
 
 	// Commande
-	if (isModEnabled('commande') && $user->hasRight('commande', 'creer')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'creer')) {
 		$commande = new Commande($db);
 
 		$langs->load("orders");
@@ -3008,7 +3008,7 @@ if (getDolGlobalString('PRODUCT_ADD_FORM_ADD_TO') && $object->id && ($action ==
 	}
 
 	// Factures
-	if (isModEnabled('facture') && $user->hasRight('facture', 'creer')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'creer')) {
 		$invoice = new Facture($db);
 
 		$langs->load("bills");
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5b69e98fdd7..e097e270fb3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5365,7 +5365,7 @@ class Product extends CommonObject
 			}
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (isModEnabled('categorie') && !$nofetch) {
+		if (isModEnabled('category') && !$nofetch) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
@@ -5865,14 +5865,14 @@ class Product extends CommonObject
 
 		//dol_syslog("load_virtual_stock");
 
-		if (isModEnabled('commande')) {
+		if (isModEnabled('order')) {
 			$result = $this->load_stats_commande(0, '1,2', 1);
 			if ($result < 0) {
 				dol_print_error($this->db, $this->error);
 			}
 			$stock_commande_client = $this->stats_commande['qty'];
 		}
-		if (isModEnabled("expedition")) {
+		if (isModEnabled("delivery_note")) {
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 			$filterShipmentStatus = '';
 			if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index f8d5f38a59c..54310e0d759 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -197,7 +197,7 @@ if ($action == 'search') {
 		}
 		$sql .= natural_search($params, $key);
 	}
-	if (isModEnabled('categorie') && !empty($parent) && $parent != -1) {
+	if (isModEnabled('category') && !empty($parent) && $parent != -1) {
 		$sql .= " AND cp.fk_categorie ='".$db->escape($parent)."'";
 	}
 	$sql .= " ORDER BY p.ref ASC";
@@ -625,7 +625,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<br>';
 
 			$rowspan = 1;
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				$rowspan++;
 			}
 
@@ -638,7 +638,7 @@ if ($id > 0 || !empty($ref)) {
 			print $langs->trans("KeywordFilter").': ';
 			print '<input type="text" name="key" value="'.$key.'"> &nbsp; ';
 			print '</div>';
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				print '<div class="inline-block">'.$langs->trans("CategoryFilter").': ';
 				print $form->select_all_categories(Categorie::TYPE_PRODUCT, $parent, 'parent').' &nbsp; </div>';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 397b1660505..28af89a6246 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -215,7 +215,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 }
 
 
-if (isModEnabled('categorie') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_PRODUCTS')) {
+if (isModEnabled('category') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_PRODUCTS')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	print '<br>';
 	print '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 119a1be77f3..38e51960c08 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -474,7 +474,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (getDolGlobalString('MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS') && isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS') && isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductList ? $searchCategoryProductList : 0);
 	/*
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index de27e72adbb..387e4a43b53 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -50,7 +50,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 if (isModEnabled('workstation')) {
 	require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
 }
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 }
@@ -926,7 +926,7 @@ if ($sall) {
 
 // Filter on categories
 $moreforfilter = '';
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'read')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'read')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductOperator ? $searchCategoryProductOperator : 0);
 }
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a6d380ecb91..0c91c149e8f 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -409,7 +409,7 @@ if ($resql) {
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
 		$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index c09fe7a6cbf..008ee43e68a 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -560,14 +560,14 @@ if ($search_categ > 0) {
 
 // Filter on categories
 $moreforfilter = '';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= img_picto($langs->trans('ProductsCategoriesShort'), 'category', 'class="pictofixedwidth"');
 	$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, $langs->trans("ProductsCategoryShort"), 'maxwidth400');
 	$moreforfilter .= '</div>';
 }
 // Filter on warehouse categories
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= img_picto($langs->trans('StockCategoriesShort'), 'category', 'class="pictofixedwidth"');
 	$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_WAREHOUSE, $search_warehouse_categ, 'search_warehouse_categ', 1, $langs->trans("StockCategoriesShort"), 'maxwidth400');
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 7021413e3b8..b9413e921bc 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -214,7 +214,7 @@ if ($result || !($id > 0)) {
 		print '</td></tr>';
 
 		// Tag
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
 			$moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"');
 			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, 1, 'widthcentpercentminusx maxwidth400');
@@ -368,7 +368,7 @@ if ($result || !($id > 0)) {
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("SuppliersOrders")));
 	}
 
-	if (isModEnabled('facture')) {
+	if (isModEnabled('invoice')) {
 		$graphfiles['invoices'] = array('modulepart'=>'productstats_invoices',
 			'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("Invoices")));
@@ -380,7 +380,7 @@ if ($result || !($id > 0)) {
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("SupplierInvoices")));
 	}
 
-	if (isModEnabled('contrat')) {
+	if (isModEnabled('contract')) {
 		$graphfiles['contracts'] = array('modulepart'=>'productstats_contracts',
 			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("Contracts")));
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 9225e9aebd8..1a4aedaefa6 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -382,7 +382,7 @@ if ($action == 'create') {
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
@@ -555,7 +555,7 @@ if ($action == 'create') {
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
 				print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
 				print "</td></tr>";
@@ -961,7 +961,7 @@ if ($action == 'create') {
 			}
 
 			// Tags-Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
 				$c = new Categorie($db);
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 5e7bb9e8c6d..010d657cb93 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -737,7 +737,7 @@ class Entrepot extends CommonObject
 			$datas['locationsummary'] = '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (!$nofetch && isModEnabled('categorie')) {
+		if (!$nofetch && isModEnabled('category')) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories_warehouse'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_WAREHOUSE, 1, 1);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 931da124450..5eab969d4ce 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -29,7 +29,7 @@
 // Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -55,7 +55,7 @@ $search_label = GETPOST("snom", "alpha") ? GETPOST("snom", "alpha") : GETPOST("s
 $search_status = GETPOSTINT("search_status");
 
 $search_category_list = array();
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$search_category_list = GETPOST("search_category_".Categorie::TYPE_WAREHOUSE."_list", "array");
 }
 
@@ -496,7 +496,7 @@ if ($search_all) {
 
 $moreforfilter = '';
 
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_WAREHOUSE, $search_category_list);
 }
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 9eff95f02b0..234271ac2fb 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -939,7 +939,7 @@ if ($warehouse->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
 		print $form->showCategories($warehouse->id, Categorie::TYPE_WAREHOUSE, 1);
 		print "</td></tr>";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 672ca04fcba..07ff350b921 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -780,7 +780,7 @@ if ($id > 0 || $ref) {
 			$found = 0;
 			$helpondiff = '<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
 			// Number of sales orders running
-			if (isModEnabled('commande')) {
+			if (isModEnabled('order')) {
 				if ($found) {
 					$helpondiff .= '<br>';
 				} else {
@@ -795,7 +795,7 @@ if ($id > 0 || $ref) {
 			}
 
 			// Number of product from sales order already sent (partial shipping)
-			if (isModEnabled("expedition")) {
+			if (isModEnabled("delivery_note")) {
 				require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 				$filterShipmentStatus = '';
 				if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 14b8a9b7c45..1adc5d07f47 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -415,7 +415,7 @@ if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrep
 $sql .= ', s.fk_product';
 
 if ($usevirtualstock) {
-	if (isModEnabled('commande')) {
+	if (isModEnabled('order')) {
 		$sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd1.qty) IS NULL", "0", "SUM(cd1.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlCommandesCli .= " FROM ".MAIN_DB_PREFIX."commandedet as cd1, ".MAIN_DB_PREFIX."commande as c1";
 		$sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'commande').")";
@@ -425,7 +425,7 @@ if ($usevirtualstock) {
 		$sqlCommandesCli = '0';
 	}
 
-	if (isModEnabled("expedition")) {
+	if (isModEnabled("delivery_note")) {
 		$sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,";
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 3b6a798fe3a..84cd7ade199 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -878,7 +878,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	$doleditor->Create();
 	print '</td></tr>';
 
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
@@ -1270,7 +1270,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print '</td></tr>';
 
 		// Tags-Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			$arrayselected = array();
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
@@ -1442,7 +1442,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print '</td></tr>';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 			print "</td></tr>";
@@ -1645,13 +1645,13 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			if (!getDolGlobalString('PROJECT_HIDE_CREATE_OBJECT_BUTTON')) {
 				$arrayforbutaction = array(
 					10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					20 => array('lang'=>'orders', 'enabled'=>isModEnabled("commande"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					30 => array('lang'=>'bills', 'enabled'=>isModEnabled("facture"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					30 => array('lang'=>'bills', 'enabled'=>isModEnabled("invoice"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 					40 => array('lang'=>'supplier_proposal', 'enabled'=>isModEnabled("supplier_proposal"), 'perm'=>$user->hasRight('supplier_proposal', 'creer'), 'label' => 'AddSupplierProposal', 'url'=>'/supplier_proposal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 					50 => array('lang'=>'suppliers', 'enabled'=>isModEnabled("supplier_order"), 'perm'=>$user->hasRight('fournisseur', 'commande', 'creer'), 'label' => 'AddSupplierOrder', 'url'=>'/fourn/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 					60 => array('lang'=>'suppliers', 'enabled'=>isModEnabled("supplier_invoice"), 'perm'=>$user->hasRight('fournisseur', 'facture', 'creer'), 'label' => 'AddSupplierInvoice', 'url'=>'/fourn/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					70 => array('lang'=>'interventions', 'enabled'=>isModEnabled("ficheinter"), 'perm'=>$user->hasRight('fichinter', 'creer'), 'label' => 'AddIntervention', 'url'=>'/fichinter/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					80 => array('lang'=>'contracts', 'enabled'=>isModEnabled("contrat"), 'perm'=>$user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url'=>'/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					70 => array('lang'=>'interventions', 'enabled'=>isModEnabled("intervention"), 'perm'=>$user->hasRight('fichinter', 'creer'), 'label' => 'AddIntervention', 'url'=>'/fichinter/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					80 => array('lang'=>'contracts', 'enabled'=>isModEnabled("contract"), 'perm'=>$user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url'=>'/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 					90 => array('lang'=>'trips', 'enabled'=>isModEnabled("expensereport"), 'perm'=>$user->hasRight('expensereport', 'creer'), 'label' => 'AddTrip', 'url'=>'/expensereport/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 				   100 => array('lang'=>'donations', 'enabled'=>isModEnabled("don"), 'perm'=>$user->hasRight('don', 'creer'), 'label' => 'AddDonation', 'url'=>'/don/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 				);
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index b8201e7c6e7..48803930572 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -174,7 +174,7 @@ print nl2br($object->description);
 print '</td></tr>';
 
 // Categories
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 	print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 	print "</td></tr>";
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 0b76bd6b620..c9c32359711 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -483,7 +483,7 @@ if ($id > 0 || !empty($ref)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 6f519a921e3..dd053b04549 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -41,16 +41,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (isModEnabled('agenda')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 }
-if (isModEnabled('banque')) {
+if (isModEnabled('bank')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 }
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 if (isModEnabled('deplacement')) {
@@ -59,17 +59,17 @@ if (isModEnabled('deplacement')) {
 if (isModEnabled('don')) {
 	require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 }
-if (isModEnabled('expedition')) {
+if (isModEnabled('delivery_note')) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 if (isModEnabled('expensereport')) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
 if (isModEnabled('loan')) {
@@ -110,16 +110,16 @@ if (isModEnabled('stocktransfer')) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta'));
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$langs->load("bills");
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	$langs->load("orders");
 }
 if (isModEnabled("propal")) {
 	$langs->load("propal");
 }
-if (isModEnabled('ficheinter')) {
+if (isModEnabled('intervention')) {
 	$langs->load("interventions");
 }
 if (isModEnabled('deplacement')) {
@@ -358,7 +358,7 @@ print dol_htmlentitiesbr($object->description);
 print '</td></tr>';
 
 // Categories
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 	print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 	print "</td></tr>";
@@ -415,7 +415,7 @@ $listofreferent = array(
 		'lang'=>'orders',
 		'buttonnew'=>'CreateOrder',
 		'testnew'=>$user->hasRight('commande', 'creer'),
-		'test'=>isModEnabled('commande') && $user->hasRight('commande', 'lire')
+		'test'=>isModEnabled('order') && $user->hasRight('commande', 'lire')
 	),
 	'invoice'=>array(
 		'name'=>"CustomersInvoices",
@@ -428,7 +428,7 @@ $listofreferent = array(
 		'lang'=>'bills',
 		'buttonnew'=>'CreateBill',
 		'testnew'=>$user->hasRight('facture', 'creer'),
-		'test'=>isModEnabled('facture') && $user->hasRight('facture', 'lire')
+		'test'=>isModEnabled('invoice') && $user->hasRight('facture', 'lire')
 	),
 	'invoice_predefined'=>array(
 		'name'=>"PredefinedInvoices",
@@ -440,7 +440,7 @@ $listofreferent = array(
 		'lang'=>'bills',
 		'buttonnew'=>'CreateBill',
 		'testnew'=>$user->hasRight('facture', 'creer'),
-		'test'=>isModEnabled('facture') && $user->hasRight('facture', 'lire')
+		'test'=>isModEnabled('invoice') && $user->hasRight('facture', 'lire')
 	),
 	'proposal_supplier'=>array(
 		'name'=>"SupplierProposals",
@@ -489,7 +489,7 @@ $listofreferent = array(
 		'lang'=>'contracts',
 		'buttonnew'=>'AddContract',
 		'testnew'=>$user->hasRight('contrat', 'creer'),
-		'test'=>isModEnabled('contrat') && $user->hasRight('contrat', 'lire')
+		'test'=>isModEnabled('contract') && $user->hasRight('contrat', 'lire')
 	),
 	'intervention'=>array(
 		'name'=>"Interventions",
@@ -503,7 +503,7 @@ $listofreferent = array(
 		'lang'=>'interventions',
 		'buttonnew'=>'AddIntervention',
 		'testnew'=>$user->hasRight('ficheinter', 'creer'),
-		'test'=>isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire')
+		'test'=>isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire')
 	),
 	'shipping'=>array(
 		'name'=>"Shippings",
@@ -515,7 +515,7 @@ $listofreferent = array(
 		'lang'=>'sendings',
 		'buttonnew'=>'CreateShipment',
 		'testnew'=>0,
-		'test'=>isModEnabled('expedition') && $user->hasRight('expedition', 'lire')
+		'test'=>isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')
 	),
 	'mrp'=>array(
 		'name'=>"MO",
@@ -651,7 +651,7 @@ $listofreferent = array(
 		'lang'=>'banks',
 		'buttonnew'=>'AddVariousPayment',
 		'testnew'=>$user->hasRight('banque', 'modifier'),
-		'test'=>isModEnabled("banque") && $user->hasRight('banque', 'lire') && !getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')
+		'test'=>isModEnabled("bank") && $user->hasRight('banque', 'lire') && !getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')
 	),
 		/* No need for this, available on dedicated tab "Agenda/Events"
 		 'agenda'=>array(
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index b1f74cc5cbc..63bbbc3ff6e 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -222,7 +222,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index e1fd9a43b35..ddeb182586f 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -178,7 +178,7 @@ $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $se
 
 $search_category_array = array();
 
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
 }
 
@@ -1123,13 +1123,13 @@ if ($user->hasRight('user', 'user', 'lire')) {
 }
 
 // Filter on categories
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array, 'minwidth300imp minwidth300 widthcentpercentminusx');
 }
 
 // Filter on customer categories
-if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST') && isModEnabled("category") && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_CUSTOMER, $searchCategoryCustomerList, 'minwidth300', $searchCategoryCustomerList ? $searchCategoryCustomerList : 0);
 	/*$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 98ed8f1b357..d8c6ca3b391 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -672,7 +672,7 @@ if ($id > 0 || !empty($ref)) {
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie')) {
+	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index c36cd2e6d30..8363c284ba2 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -258,7 +258,7 @@ if ($id > 0 || !empty($ref)) {
 			print '</td></tr>';
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($projectstatic->id, 'project', 1);
 				print "</td></tr>";
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index abb5653d4e7..3ae0f6d39e5 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -294,7 +294,7 @@ if ($id > 0 || !empty($ref)) {
 			print '</td></tr>';
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($projectstatic->id, 'project', 1);
 				print "</td></tr>";
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 2d0632eea77..33d0ec29877 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -251,7 +251,7 @@ if ($object->id > 0) {
 		print '</td></tr>';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8cfe753056a..8524b0ccb1e 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -781,7 +781,7 @@ if ($search_all) {
 $moreforfilter = '';
 
 // Filter on categories
-if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ProjectCategories');
@@ -810,7 +810,7 @@ $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form-
 $moreforfilter .= '</div>';
 
 // Filter on customer categories
-if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST') && isModEnabled("category") && $user->hasRight('categorie', 'lire')) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_CUSTOMER, $searchCategoryCustomerList, 'minwidth300', $searchCategoryCustomerList ? $searchCategoryCustomerList : 0);
 	/*
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 1f54ef3f26d..5ef996d2ae5 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -241,7 +241,7 @@ if ($object->id > 0) {
 		print '</td></tr>';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index ca98bc5330b..d9face5c16a 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -367,7 +367,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</td></tr>';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 6065cda5c24..e55a8f4fd3d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1049,7 +1049,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '</td></tr>';
 
 			// Categories
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				print '<tr><td class="valignmiddle">' . $langs->trans("Categories") . '</td><td>';
 				print $form->showCategories($projectstatic->id, 'project', 1);
 				print "</td></tr>";
@@ -1110,7 +1110,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				//'builddoc'=>$langs->trans("PDFMerge"),
 			);
 		}
-		if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'creer')) {
+		if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'creer')) {
 			$langs->load("interventions");
 			$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
 		}
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 5fb856036fe..9d2c29f6068 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -81,7 +81,7 @@ $error = 0;
 $langs->loadLangs(array("main", "members", "companies", "install", "other", "errors"));
 
 // Security check
-if (!isModEnabled('adherent')) {
+if (!isModEnabled('member')) {
 	httponly_accessforbidden('Module Membership not enabled');
 }
 
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 65b6065a698..ead24c23bd1 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -53,7 +53,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Security check
-if (!isModEnabled('adherent')) {
+if (!isModEnabled('member')) {
 	httponly_accessforbidden('Module Membership not enabled');
 }
 
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index b9b388a718b..a39d3670b03 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -49,7 +49,7 @@ if (is_numeric($entity)) {
 require '../../main.inc.php';
 
 // Security check
-if (!isModEnabled('adherent')) {
+if (!isModEnabled('member')) {
 	httponly_accessforbidden('Module Membership not enabled');
 }
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index fc9d9acd0d4..d31715b03ca 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -591,11 +591,11 @@ if ($ispaymentok) {
 				$emetteur_banque = '';
 				// Define default choice for complementary actions
 				$option = '';
-				if (getDolGlobalString('ADHERENT_BANK_USE') == 'bankviainvoice' && isModEnabled("banque") && isModEnabled("societe") && isModEnabled('facture')) {
+				if (getDolGlobalString('ADHERENT_BANK_USE') == 'bankviainvoice' && isModEnabled("bank") && isModEnabled("societe") && isModEnabled('invoice')) {
 					$option = 'bankviainvoice';
-				} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'bankdirect' && isModEnabled("banque")) {
+				} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'bankdirect' && isModEnabled("bank")) {
 					$option = 'bankdirect';
-				} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'invoiceonly' && isModEnabled("banque") && isModEnabled("societe") && isModEnabled('facture')) {
+				} elseif (getDolGlobalString('ADHERENT_BANK_USE') == 'invoiceonly' && isModEnabled("bank") && isModEnabled("societe") && isModEnabled('invoice')) {
 					$option = 'invoiceonly';
 				}
 				if (empty($option)) {
@@ -905,7 +905,7 @@ if ($ispaymentok) {
 					}
 				}
 
-				if (!$error && isModEnabled("banque")) {
+				if (!$error && isModEnabled("bank")) {
 					$bankaccountid = 0;
 					if ($paymentmethod == 'paybox') {
 						$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
@@ -994,7 +994,7 @@ if ($ispaymentok) {
 			}
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
@@ -1033,7 +1033,7 @@ if ($ispaymentok) {
 							}
 						}
 
-						if (!$error && isModEnabled("banque")) {
+						if (!$error && isModEnabled("bank")) {
 							$bankaccountid = 0;
 							if ($paymentmethod == 'paybox') {
 								$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
@@ -1170,7 +1170,7 @@ if ($ispaymentok) {
 					}
 				}
 
-				if (!$error && isModEnabled("banque")) {
+				if (!$error && isModEnabled("bank")) {
 					$bankaccountid = 0;
 					if ($paymentmethod == 'paybox') {
 						$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
@@ -1300,7 +1300,7 @@ if ($ispaymentok) {
 						}
 					}
 
-					if (!$error && isModEnabled("banque")) {
+					if (!$error && isModEnabled("bank")) {
 						$bankaccountid = 0;
 						if ($paymentmethod == 'paybox') {
 							$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
@@ -1530,7 +1530,7 @@ if ($ispaymentok) {
 						}
 					}
 
-					if (!$error && isModEnabled("banque")) {
+					if (!$error && isModEnabled("bank")) {
 						$bankaccountid = 0;
 						if ($paymentmethod == 'paybox') {
 							$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
@@ -1702,7 +1702,7 @@ if ($ispaymentok) {
 			$contract_lines = (array_key_exists('COL', $tmptag) && $tmptag['COL'] > 0) ? $tmptag['COL'] : null;
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
-			if (isModEnabled('facture')) {
+			if (isModEnabled('invoice')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
@@ -1741,7 +1741,7 @@ if ($ispaymentok) {
 							}
 						}
 
-						if (!$error && isModEnabled("banque")) {
+						if (!$error && isModEnabled("bank")) {
 							$bankaccountid = 0;
 							if ($paymentmethod == 'paybox') {
 								$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 93825adf77a..3888b247006 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -466,7 +466,7 @@ if ($event->type == 'payout.created') {
 				}
 			}
 
-			if (!$error && isModEnabled('banque')) {
+			if (!$error && isModEnabled('bank')) {
 				// Search again the payment to see if it is already linked to a bank payment record (We should always find the payment that was created before).
 				$ispaymentdone = 0;
 				$sql = "SELECT p.rowid, p.fk_bank FROM llx_paiement as p";
diff --git a/htdocs/public/webportal/tpl/home.tpl.php b/htdocs/public/webportal/tpl/home.tpl.php
index a0c201ca6dc..e1c83c75f3a 100644
--- a/htdocs/public/webportal/tpl/home.tpl.php
+++ b/htdocs/public/webportal/tpl/home.tpl.php
@@ -18,13 +18,13 @@ global $conf, $langs;
 				<?php print '<a class="home-links-card__link" href="' . $context->getControllerUrl('propallist') . '" title="' . $langs->trans('WebPortalPropalListDesc') . '">' . $langs->trans('WebPortalPropalListTitle') . '</a>'; ?>
 			</article>
 			<?php endif; ?>
-			<?php if (isModEnabled('commande') && getDolGlobalInt('WEBPORTAL_ORDER_LIST_ACCESS')) : ?>
+			<?php if (isModEnabled('order') && getDolGlobalInt('WEBPORTAL_ORDER_LIST_ACCESS')) : ?>
 			<article class="home-links-card --order-list">
 				<div class="home-links-card__icon" ></div>
 				<?php print '<a class="home-links-card__link" href="' . $context->getControllerUrl('orderlist') . '" title="' . $langs->trans('WebPortalOrderListDesc') . '">' . $langs->trans('WebPortalOrderListTitle') . '</a>'; ?>
 			</article>
 			<?php endif; ?>
-			<?php if (isModEnabled('facture') && getDolGlobalInt('WEBPORTAL_INVOICE_LIST_ACCESS')) : ?>
+			<?php if (isModEnabled('invoice') && getDolGlobalInt('WEBPORTAL_INVOICE_LIST_ACCESS')) : ?>
 			<article class="home-links-card --invoice-list">
 				<div class="home-links-card__icon" ></div>
 				<?php print '<a class="home-links-card__link" href="' . $context->getControllerUrl('invoicelist') . '" title="' . $langs->trans('WebPortalInvoiceListDesc') . '">' . $langs->trans('WebPortalInvoiceListTitle') . '</a>'; ?>
diff --git a/htdocs/public/webportal/tpl/menu.tpl.php b/htdocs/public/webportal/tpl/menu.tpl.php
index bb615c24135..2275d8e8496 100644
--- a/htdocs/public/webportal/tpl/menu.tpl.php
+++ b/htdocs/public/webportal/tpl/menu.tpl.php
@@ -24,7 +24,7 @@ if ($context->userIsLog()) {
 	}
 
 	// menu orders
-	if (isModEnabled('commande') && getDolGlobalInt('WEBPORTAL_ORDER_LIST_ACCESS')) {
+	if (isModEnabled('order') && getDolGlobalInt('WEBPORTAL_ORDER_LIST_ACCESS')) {
 		$navMenu['order_list'] = array(
 			'id' => 'order_list',
 			'rank' => 20,
@@ -35,7 +35,7 @@ if ($context->userIsLog()) {
 	}
 
 	// menu invoices
-	if (isModEnabled('facture') && getDolGlobalInt('WEBPORTAL_INVOICE_LIST_ACCESS')) {
+	if (isModEnabled('invoice') && getDolGlobalInt('WEBPORTAL_INVOICE_LIST_ACCESS')) {
 		$navMenu['invoice_list'] = array(
 			'id' => 'invoice_list',
 			'rank' => 30,
@@ -47,7 +47,7 @@ if ($context->userIsLog()) {
 
 	// menu member
 	$cardAccess = getDolGlobalString('WEBPORTAL_MEMBER_CARD_ACCESS');
-	if (isModEnabled('adherent')
+	if (isModEnabled('member')
 		&& in_array($cardAccess, array('visible', 'edit'))
 		&& $context->logged_member
 		&& $context->logged_member->id > 0
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index b75bf1827df..1c633da8e30 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1424,7 +1424,7 @@ if ($action == 'create') {
 	$totalVolume = $tmparray['volume'];
 
 
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -1479,7 +1479,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent tableforfield">';
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		print '<tr><td>';
 		print $langs->trans("RefOrder").'</td>';
 		print '<td colspan="3">';
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index ee2587cc04e..2ab50c297f4 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (isModEnabled('commande')) {
+if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index a212ad31953..ab5e4dc9972 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -389,7 +389,7 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border tableforfield" width="100%">';
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('order')) {
 		print '<tr><td>';
 		print $langs->trans("RefOrder").'</td>';
 		print '<td colspan="3">';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index ebe929ffc6c..a44e82e6eb9 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -282,7 +282,7 @@ if ($action == 'add' && empty($cancel)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 		$error++;
 	}
-	if (isModEnabled("banque") && !empty($auto_create_paiement) && !$object->accountid > 0) {
+	if (isModEnabled("bank") && !empty($auto_create_paiement) && !$object->accountid > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 		$error++;
 	}
@@ -622,7 +622,7 @@ if ($action == 'create' && $permissiontoadd) {
 	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";	// Date payment
 
 	// Bank
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td id="label_fk_account">';
 		print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).'</td><td>';
 		print img_picto('', 'bank_account', 'class="paddingrighonly"');
@@ -650,7 +650,7 @@ if ($action == 'create' && $permissiontoadd) {
 	print '</td></tr>';
 
 	// Number
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		// Number
 		print '<tr class="hide_if_no_auto_create_payment"><td><label for="num_payment">'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
@@ -945,7 +945,7 @@ if ($id > 0) {
 	print '</td></tr>';
 
 	// Default Bank Account
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('DefaultBankAccount');
@@ -974,7 +974,7 @@ if ($id > 0) {
 	print '<div class="fichehalfright">';
 
 	$nbcols = 3;
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		$nbcols++;
 	}
 
@@ -1008,7 +1008,7 @@ if ($id > 0) {
 		print '<td>'.$langs->trans("RefPayment").'</td>';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("Type").'</td>';
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 		}
 		print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -1032,7 +1032,7 @@ if ($id > 0) {
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour', 'tzuserrel')."</td>\n";
 				$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-				if (isModEnabled("banque")) {
+				if (isModEnabled("bank")) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
diff --git a/htdocs/salaries/class/api_salaries.class.php b/htdocs/salaries/class/api_salaries.class.php
index 693c1978b31..fad592803c4 100644
--- a/htdocs/salaries/class/api_salaries.class.php
+++ b/htdocs/salaries/class/api_salaries.class.php
@@ -330,7 +330,7 @@ class Salaries extends DolibarrApi
 		if ($paymentsalary->create(DolibarrApiAccess::$user, 1) < 0) {
 			throw new RestException(500, 'Error creating paymentsalary', array_merge(array($paymentsalary->error), $paymentsalary->errors));
 		}
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			$paymentsalary->addPaymentToBank(
 				DolibarrApiAccess::$user,
 				'payment_salary',
@@ -444,7 +444,7 @@ class Salaries extends DolibarrApi
 	{
 		$paymentsalary = array();
 		$fields = Salaries::$FIELDSPAYMENT;
-		if (isModEnabled("banque")) array_push($fields, "accountid");
+		if (isModEnabled("bank")) array_push($fields, "accountid");
 		foreach ($fields as $field) {
 			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 7c27aa44b28..ef54b12b43a 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -596,7 +596,7 @@ class PaymentSalary extends CommonObject
 
 		$error = 0;
 
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index d8569747e30..91f57d2d880 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -527,7 +527,7 @@ print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1,
 print '</td>';
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<td class="liste_titre">';
 	print $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth125', 1);
 	print '</td>';
@@ -581,7 +581,7 @@ print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname", "", $par
 $totalarray['nbfield']++;
 print_liste_field_titre("DefaultPaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
 $totalarray['nbfield']++;
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print_liste_field_titre("DefaultBankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -731,7 +731,7 @@ while ($i < $imaxinloop) {
 		}
 
 		// Account
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			print '<td>';
 			if ($obj->fk_account > 0) {
 				//$accountstatic->fetch($obj->fk_bank);
@@ -820,7 +820,7 @@ if ($num == 0) {
 		}
 	}*/
 	$colspan = 9;
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		$colspan++;
 	}
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 2fda40dddc6..6e5b19c857e 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -78,7 +78,7 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 		$error++;
 		$action = 'create';
 	}
-	if (isModEnabled("banque") && !(GETPOSTINT("accountid") > 0)) {
+	if (isModEnabled("bank") && !(GETPOSTINT("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 		$action = 'create';
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 2d84cace617..16dc023c176 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -172,7 +172,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $
 print '<tr><td>'.$langs->trans('Note').'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlcleanlastbr($object->note_private)).'</td></tr>';
 
 // Bank account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index a00707b039b..2b77863cb04 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -482,7 +482,7 @@ print '</td>';
 // Chq number
 print '<td class="liste_titre"><input name="search_chq_number" class="flat width50" type="text" value="'.$db->escape($search_chq_number).'"></td>';
 
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	// Bank transaction
 	print '<td class="liste_titre">';
 	print '<input class="flat width50" type="text" name="search_fk_bank" value="'.$db->escape($search_fk_bank).'">';
@@ -539,7 +539,7 @@ print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pst.code", "", $pa
 $totalarray['nbfield']++;
 print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "s.num_payment", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
 $totalarray['nbfield']++;
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print_liste_field_titre("BankTransactionLine", $_SERVER["PHP_SELF"], "s.fk_bank", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 	print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
@@ -702,7 +702,7 @@ while ($i < $imaxinloop) {
 		}
 
 		// Account
-		if (isModEnabled("banque")) {
+		if (isModEnabled("bank")) {
 			// Bank transaction
 			print '<td>';
 			$accountlinestatic->id = $obj->fk_bank;
diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php
index b640d1f3c58..2c9b444655e 100644
--- a/htdocs/salaries/virement_request.php
+++ b/htdocs/salaries/virement_request.php
@@ -313,7 +313,7 @@ if ($action == 'editmode') {
 print '</td></tr>';
 
 // Default Bank Account
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<tr><td class="nowrap">';
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('DefaultBankAccount');
@@ -375,7 +375,7 @@ if ($resql) {
 	print '<td>'.$langs->trans("RefPayment").'</td>';
 	print '<td>'.$langs->trans("Date").'</td>';
 	print '<td>'.$langs->trans("Type").'</td>';
-	if (isModEnabled("banque")) {
+	if (isModEnabled("bank")) {
 		print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 	}
 	print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -391,7 +391,7 @@ if ($resql) {
 			print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour', 'tzuserrel')."</td>\n";
 			$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 			print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-			if (isModEnabled("banque")) {
+			if (isModEnabled("bank")) {
 				$bankaccountstatic->id = $objp->baid;
 				$bankaccountstatic->ref = $objp->baref;
 				$bankaccountstatic->label = $objp->baref;
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index b432cd98235..1000eaf142a 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -874,7 +874,7 @@ if (getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
 print '</a></td>';
 print '</tr>';
 
-if (isModEnabled("expedition")) {
+if (isModEnabled("delivery_note")) {
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
 		print '<tr class="oddeven">';
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index a98680cfeb9..5125bfdc389 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -345,7 +345,7 @@ abstract class ActionsCardCommon
 			}
 
 			// Linked member
-			if (isModEnabled('adherent')) {
+			if (isModEnabled('member')) {
 				$langs->load("members");
 				$adh = new Adherent($this->db);
 				$result = $adh->fetch('', '', $this->object->id);
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ef713898c70..facb6cc3d9c 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -50,7 +50,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 if (isModEnabled('accounting')) {
@@ -77,10 +77,10 @@ if ($mysoc->country_code == 'GR') {
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	$langs->load("members");
 }
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$langs->load("categories");
 }
 if (isModEnabled('incoterm')) {
@@ -1692,7 +1692,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Categories
-			if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+			if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 				$langs->load('categories');
 
 				// Customer
@@ -2446,7 +2446,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Categories
-				if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+				if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 					// Customer
 					print '<tr class="visibleifcustomer"><td>'.$form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0).'</td>';
 					print '<td colspan="3">';
@@ -2902,7 +2902,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<table class="border tableforfield centpercent">';
 
 			// Tags / categories
-			if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+			if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 				// Customer
 				if ($object->prospect || $object->client || getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT')) {
 					print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
@@ -3069,7 +3069,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
 			// Module Adherent
-			if (isModEnabled('adherent')) {
+			if (isModEnabled('member')) {
 				$langs->load("members");
 				print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 				print '<td>';
@@ -3145,7 +3145,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
-				if (isModEnabled('adherent')) {
+				if (isModEnabled('member')) {
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
 					if ($result == 0 && ($object->client == 1 || $object->client == 3) && getDolGlobalString('MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS')) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3405b222938..118dca102bf 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1664,7 +1664,7 @@ class Societe extends CommonObject
 
 				if (!$error && $nbrowsaffected) {
 					// Update information on linked member if it is an update
-					if (!$nosyncmember && isModEnabled('adherent')) {
+					if (!$nosyncmember && isModEnabled('member')) {
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
@@ -2835,7 +2835,7 @@ class Societe extends CommonObject
 			$datas['accountancycustomercode'] = '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (!$nofetch && isModEnabled('categorie') && $this->client) {
+		if (!$nofetch && isModEnabled('category') && $this->client) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories_customer'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
@@ -2848,7 +2848,7 @@ class Societe extends CommonObject
 			$datas['accountancysuppliercode'] = '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (!$nofetch && isModEnabled('categorie') && $this->fournisseur) {
+		if (!$nofetch && isModEnabled('category') && $this->fournisseur) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories_supplier'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 6da2a9aa73c..8a828fb6c39 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -172,18 +172,18 @@ if ($object->client) {
 	if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 	}
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+	if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 	}
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 	}
-	if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 	}
 }
 
-if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire')) {
+if (isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire')) {
 	$elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
 }
 
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 3f121f52749..1fd810a9793 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -43,14 +43,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	$langs->load("categories");
 }
 if (isModEnabled('incoterm')) {
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index d9dd58c3887..3f008867bd3 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -203,7 +203,7 @@ $thirdpartygraph .= '</table>';
 $thirdpartygraph .= '</div>';
 
 $thirdpartycateggraph = '';
-if (isModEnabled('categorie') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES')) {
+if (isModEnabled('category') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$elementtype = 'societe';
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 2ef9b22fe40..1864043e62b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 }
@@ -1214,14 +1214,14 @@ if ($search_all) {
 // Filter on categories
 $moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p') {
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'read')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'read')) {
 		$formcategory = new FormCategory($db);
 		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_CUSTOMER, $searchCategoryCustomerList, 'minwidth300', $searchCategoryCustomerOperator ? $searchCategoryCustomerOperator : 0);
 	}
 }
 
 if (empty($type) || $type == 'f') {
-	if (isModEnabled("fournisseur") && isModEnabled('categorie') && $user->hasRight('categorie', 'read')) {
+	if (isModEnabled("fournisseur") && isModEnabled('category') && $user->hasRight('categorie', 'read')) {
 		$formcategory = new FormCategory($db);
 		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_SUPPLIER, $searchCategorySupplierList, 'minwidth300', $searchCategorySupplierOperator ? $searchCategorySupplierOperator : 0);
 	}
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 6af4a946941..665a76d03da 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -972,13 +972,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 		}
-		if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+		if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 		}
-		if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+		if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 		}
-		if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+		if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 			$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 		}
 
@@ -1068,13 +1068,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (isModEnabled('propal') && $user->hasRight('propal', 'lire')) {
 			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 		}
-		if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
+		if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 		}
-		if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
+		if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 		}
-		if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {
+		if (isModEnabled('contract') && $user->hasRight('contrat', 'lire')) {
 			$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 		}
 	}
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 70db93aebc8..3dc6e26dee1 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -205,7 +205,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 
 		// additional list with adherents of company
-		if (isModEnabled('adherent') && $user->hasRight('adherent', 'lire')) {
+		if (isModEnabled('member') && $user->hasRight('adherent', 'lire')) {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 2500d9d00e1..e8fc5bf25d1 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1321,14 +1321,14 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("bank")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
 			$form->select_comptes(GETPOST('fk_account') > 0 ? GETPOSTINT('fk_account') : $fk_account, 'fk_account', 0, '', 1);
 			print '</td></tr>';
 		}
 
 		// Shipping Method
-		if (isModEnabled("expedition")) {
+		if (isModEnabled("delivery_note")) {
 			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
 			$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOSTINT('shipping_method_id') : "", 'shipping_method_id', '', 1);
@@ -1791,7 +1791,7 @@ if ($action == 'create') {
 			print '</tr>';
 		}*/
 
-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("bank")) {
 			// Bank Account
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 3916568fcd1..3fb07664ffa 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -696,7 +696,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 469c96e90da..f417c2a9988 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -216,7 +216,7 @@ print ajax_constantonoff("TAKEPOS_FORBID_SALES_TO_DEFAULT_CUSTOMER", array(), $c
 print '</td></tr>';
 
 $atleastonefound = 0;
-if (isModEnabled("banque")) {
+if (isModEnabled("bank")) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
@@ -527,7 +527,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-if ($atleastonefound == 0 && isModEnabled("banque")) {
+if ($atleastonefound == 0 && isModEnabled("bank")) {
 	print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
 }
 
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index f3dda5ffb83..c3a1f934e2d 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1310,7 +1310,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 		}
 	}
 
-	if (empty($paiementsModes) && isModEnabled("banque")) {
+	if (empty($paiementsModes) && isModEnabled("bank")) {
 		$langs->load('errors');
 		setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("TakePOS")), null, 'errors');
 		setEventMessages($langs->trans("ProblemIsInSetupOfTerminal", $_SESSION["takeposterminal"]), null, 'errors');
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1e0faeb2b44..6e6e7739411 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -195,7 +195,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if ($bankaccount <= 0 && $pay != "delayed" && isModEnabled("banque")) {
+		if ($bankaccount <= 0 && $pay != "delayed" && isModEnabled("bank")) {
 			$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));
 			$error++;
 		}
@@ -1438,7 +1438,7 @@ $( document ).ready(function() {
 
 	// Module Adherent
 	$s = '';
-	if (isModEnabled('adherent') && $invoice->socid > 0 && $invoice->socid != getDolGlobalInt($constforcompanyid)) {
+	if (isModEnabled('member') && $invoice->socid > 0 && $invoice->socid != getDolGlobalInt($constforcompanyid)) {
 		$s = '<span class="small">';
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$langs->load("members");
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index cb39394006c..e0858b6b45c 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -246,7 +246,7 @@ if ($resql) {
 			$arrayOfValidBankAccount[getDolGlobalInt($accountname)] = getDolGlobalInt($accountname);
 			$arrayOfValidPaymentModes[] = $obj;
 		}
-		if (!isModEnabled('banque')) {
+		if (!isModEnabled('bank')) {
 			if ($paycode == 'CASH' || $paycode == 'CB') {
 				$arrayOfValidPaymentModes[] = $obj;
 			}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5ab6dfa2363..f595ae566cf 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -44,7 +44,7 @@ if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
-if (isModEnabled('contrat')) {
+if (isModEnabled('contract')) {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formcontract.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
@@ -1010,7 +1010,7 @@ if ($action == 'create' || $action == 'presend') {
 		// Contract
 		if (getDolGlobalString('TICKET_LINK_TO_CONTRACT_WITH_HARDLINK')) {
 			// Deprecated. Duplicate feature. Ticket can already be linked to contract with the generic "Link to" feature.
-			if (isModEnabled('contrat')) {
+			if (isModEnabled('contract')) {
 				$langs->load('contracts');
 				$morehtmlref .= '<br>';
 				if ($permissiontoedit) {
@@ -1158,7 +1158,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '</tr>';
 
 		// Timing (Duration sum of linked fichinter)
-		if (isModEnabled('ficheinter')) {
+		if (isModEnabled('intervention')) {
 			$object->fetchObjectLinked();
 			$num = count($object->linkedObjects);
 			$timing = 0;
@@ -1197,7 +1197,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '<input type="hidden" name="trackid" value="'.$trackid.'">';
 
 		// Categories
-		if (isModEnabled('categorie')) {
+		if (isModEnabled('category')) {
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent tableforfield">';
 			print '<tr>';
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 001d4b55bb7..4b0ba6f813d 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1559,7 +1559,7 @@ class Ticket extends CommonObject
 			$datas['date_modification'] = '<br><b>'.$langs->trans('DateModification').':</b> '.dol_print_date($this->date_modification, 'dayhour');
 		}
 		// show categories for this record only in ajax to not overload lists
-		if (isModEnabled('categorie') && !$nofetch) {
+		if (isModEnabled('category') && !$nofetch) {
 			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 			$form = new Form($this->db);
 			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_TICKET, 1);
@@ -1927,7 +1927,7 @@ class Ticket extends CommonObject
 				$error = 0;
 
 				// Valid and close fichinter linked
-				if (isModEnabled('ficheinter') && getDolGlobalString('WORKFLOW_TICKET_CLOSE_INTERVENTION')) {
+				if (isModEnabled('intervention') && getDolGlobalString('WORKFLOW_TICKET_CLOSE_INTERVENTION')) {
 					dol_syslog("We have closed the ticket, so we close all linked interventions");
 					$this->fetchObjectLinked($this->id, $this->element, null, 'fichinter');
 					if ($this->linkedObjectsIds) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index afe86b1760d..8f8cf80e2aa 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -53,10 +53,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 if (isModEnabled('ldap')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 }
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 if (isModEnabled('stock')) {
@@ -357,7 +357,7 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = "create"; // Go back to create page
 				} else {
-					if (isModEnabled("categorie")) {
+					if (isModEnabled("category")) {
 						// Categories association
 						$usercats = GETPOST('usercats', 'array');
 						$object->setCategories($usercats);
@@ -1265,7 +1265,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Categories
-	if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
+	if (isModEnabled('category') && $user->hasRight("categorie", "read")) {
 		print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td><td>';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
 		print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), 0, 0, 'maxwdith300 widthcentpercentminusx', 0, '90%');
@@ -1734,7 +1734,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Categories
-			if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
+			if (isModEnabled('category') && $user->hasRight("categorie", "read")) {
 				print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
 				print '<td colspan="3">';
 				print $form->showCategories($object->id, Categorie::TYPE_USER, 1);
@@ -1814,7 +1814,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Module Adherent
-			if (isModEnabled('adherent')) {
+			if (isModEnabled('member')) {
 				$langs->load("members");
 				print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 				print '<td>';
@@ -2693,7 +2693,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>';
 
 			// Categories
-			if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
+			if (isModEnabled('category') && $user->hasRight("categorie", "read")) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td>';
 				print '<td>';
 				print img_picto('', 'category', 'class="pictofixedwidth"');
@@ -2748,7 +2748,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Module Adherent
-			if (isModEnabled('adherent')) {
+			if (isModEnabled('member')) {
 				$langs->load("members");
 				print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 				print '<td>';
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 0d924c142cf..cb40dba7c17 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -28,7 +28,7 @@
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-if (isModEnabled('categorie')) {
+if (isModEnabled('category')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -701,7 +701,7 @@ $moreforfilter = '';
  $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
+if (isModEnabled('category') && $user->hasRight("categorie", "read")) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('Category');
 	$moreforfilter .= img_picto($langs->trans("Category"), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1, $tmptitle);
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 6ec1f7e3a2d..c59313ec708 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -209,16 +209,16 @@ if (isModEnabled('holiday') || isModEnabled('expensereport')) {
 if (isModEnabled("product") || isModEnabled("service")) {
 	$tmparray['product/index.php?mainmenu=products&leftmenu='] = array('label'=>'ProductsAndServicesArea', 'picto'=>'product');
 }
-if (isModEnabled("propal") || isModEnabled('commande') || isModEnabled('ficheinter') || isModEnabled('contrat')) {
+if (isModEnabled("propal") || isModEnabled('order') || isModEnabled('intervention') || isModEnabled('contract')) {
 	$tmparray['comm/index.php?mainmenu=commercial&leftmenu='] = array('label'=>'CommercialArea', 'picto'=>'commercial');
 }
-if (isModEnabled('facture')) {
+if (isModEnabled('invoice')) {
 	$tmparray['compta/index.php?mainmenu=billing&leftmenu='] = array('label'=>'InvoicesArea', 'picto'=>'bill');
 }
 if (isModEnabled('comptabilite') || isModEnabled('accounting')) {
 	$tmparray['compta/index.php?mainmenu=accountancy&leftmenu='] = array('label'=>'AccountancyTreasuryArea', 'picto'=>'bill');
 }
-if (isModEnabled('adherent')) {
+if (isModEnabled('member')) {
 	$tmparray['adherents/index.php?mainmenu=members&leftmenu='] = array('label'=>'MembersArea', 'picto'=>'member');
 }
 if (isModEnabled('agenda')) {
diff --git a/htdocs/webportal/class/html.formcardwebportal.class.php b/htdocs/webportal/class/html.formcardwebportal.class.php
index d0d9531436e..702d4dfb3cb 100644
--- a/htdocs/webportal/class/html.formcardwebportal.class.php
+++ b/htdocs/webportal/class/html.formcardwebportal.class.php
@@ -382,7 +382,7 @@ class FormCardWebPortal
 					}
 				}
 
-				if (isModEnabled('categorie')) {
+				if (isModEnabled('category')) {
 					$categories = GETPOST('categories', 'array');
 					if (method_exists($object, 'setCategories')) {
 						$object->setCategories($categories);
diff --git a/htdocs/webportal/controllers/invoicelist.controller.class.php b/htdocs/webportal/controllers/invoicelist.controller.class.php
index a58b5be7cb4..3f8fa6ff31b 100644
--- a/htdocs/webportal/controllers/invoicelist.controller.class.php
+++ b/htdocs/webportal/controllers/invoicelist.controller.class.php
@@ -40,7 +40,7 @@ class InvoiceListController extends Controller
 	 */
 	public function checkAccess()
 	{
-		$this->accessRight = isModEnabled('facture') && getDolGlobalInt('WEBPORTAL_INVOICE_LIST_ACCESS');
+		$this->accessRight = isModEnabled('invoice') && getDolGlobalInt('WEBPORTAL_INVOICE_LIST_ACCESS');
 
 		return parent::checkAccess();
 	}
diff --git a/htdocs/webportal/controllers/membercard.controller.class.php b/htdocs/webportal/controllers/membercard.controller.class.php
index a984d66f1bb..d3415f04086 100644
--- a/htdocs/webportal/controllers/membercard.controller.class.php
+++ b/htdocs/webportal/controllers/membercard.controller.class.php
@@ -43,7 +43,7 @@ class MemberCardController extends Controller
 	{
 		$context = Context::getInstance();
 		$cardAccess = getDolGlobalString('WEBPORTAL_MEMBER_CARD_ACCESS');
-		$this->accessRight = isModEnabled('adherent') && in_array($cardAccess, array('visible', 'edit')) && $context->logged_member && $context->logged_member->id > 0;
+		$this->accessRight = isModEnabled('member') && in_array($cardAccess, array('visible', 'edit')) && $context->logged_member && $context->logged_member->id > 0;
 
 		return parent::checkAccess();
 	}
@@ -72,8 +72,8 @@ class MemberCardController extends Controller
 
 		// set form card
 		$cardAccess = getDolGlobalString('WEBPORTAL_MEMBER_CARD_ACCESS');
-		$permissiontoread = (int) isModEnabled('adherent') && in_array($cardAccess, array('visible', 'edit'));
-		$permissiontoadd = (int) isModEnabled('adherent') && in_array($cardAccess, array('edit'));
+		$permissiontoread = (int) isModEnabled('member') && in_array($cardAccess, array('visible', 'edit'));
+		$permissiontoadd = (int) isModEnabled('member') && in_array($cardAccess, array('edit'));
 		$permissiontodelete = 0;
 		$permissionnote = 0;
 		$permissiondellink = 0;
diff --git a/htdocs/webportal/controllers/orderlist.controller.class.php b/htdocs/webportal/controllers/orderlist.controller.class.php
index 204f00db2ba..5d104cb344c 100644
--- a/htdocs/webportal/controllers/orderlist.controller.class.php
+++ b/htdocs/webportal/controllers/orderlist.controller.class.php
@@ -42,7 +42,7 @@ class OrderListController extends Controller
 	 */
 	public function checkAccess()
 	{
-		$this->accessRight = isModEnabled('commande') && getDolGlobalInt('WEBPORTAL_ORDER_LIST_ACCESS');
+		$this->accessRight = isModEnabled('order') && getDolGlobalInt('WEBPORTAL_ORDER_LIST_ACCESS');
 
 		return parent::checkAccess();
 	}
diff --git a/htdocs/webportal/controllers/propallist.controller.class.php b/htdocs/webportal/controllers/propallist.controller.class.php
index 533327a42b6..5c6ca9668db 100644
--- a/htdocs/webportal/controllers/propallist.controller.class.php
+++ b/htdocs/webportal/controllers/propallist.controller.class.php
@@ -64,7 +64,7 @@ class PropalListController extends Controller
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
-		if (isModEnabled('expedition')) {
+		if (isModEnabled('delivery_note')) {
 			$langs->loadLangs(array('sendings'));
 		}
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d55b81d1151..25fe96f7efe 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3074,7 +3074,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"></span>', '/website/index.php?action=file_manager&website='.urlencode($website->ref).'&section_dir='.urlencode('image/'.$website->ref.'/'), $disabled);
 
-			if (isModEnabled('categorie')) {
+			if (isModEnabled('category')) {
 				//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='.urlencode($website->ref), $disabled);
 			}
@@ -4376,7 +4376,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	print '</td></tr>';
 
 	// Categories
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		$langs->load('categories');
 
 		if (!GETPOSTISSET('categories')) {
@@ -4704,7 +4704,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
 	print '</div>';
 
 	// Categories
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		print '<div class="tagtr">';
 		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium tdoverflowmax100onsmartphone" style="padding-right: 10px !important">';
 		print $langs->trans("Category");
@@ -4841,7 +4841,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
 
 					// Categories - Tags
 					print '<td class="center">';
-					if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+					if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 						// Get current categories
 						$existing = $c->containing($answerrecord->id, Categorie::TYPE_WEBSITE_PAGE, 'object');
 						if (is_array($existing)) {

From 049eaa18201953c91859be4a820edb5cd74cc5ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Feb 2024 15:33:48 +0100
Subject: [PATCH 0257/1862] Compact code

---
 htdocs/accountancy/admin/account.php            | 4 ++--
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index f02c1e9f555..85f230168c3 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -66,10 +66,10 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 0086243bff2..41264b0a467 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -106,7 +106,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');

From 8af8fc98daeeacb56b6a0dc07fade33e00f04d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:42:09 +0100
Subject: [PATCH 0258/1862] fix phpstan (#28461)

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

diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 6d58b9a6198..ff8fb505202 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2008-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ class FormBarCode
 	 *  @param	int		$selected       Id code pre-selected
 	 *  @param 	array	$barcodelist	Array of barcodes generators
 	 *  @param  int		$code_id        Id du code barre
-	 *  @param  int		$idForm			Id du formulaire
+	 *  @param  string	$idForm			Id of html form, ex id="idform"
 	 * 	@return	string					HTML select string
 	 */
 	public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
@@ -118,7 +118,7 @@ class FormBarCode
 	 *  @return void
 	 *  @deprecated
 	 */
-	public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
+	public function select_barcode_type($selected = 0, $htmlname = 'barcodetype_id', $useempty = 0)
 	{
 		// phpcs:enable
 		print $this->selectBarcodeType($selected, $htmlname, $useempty);
@@ -132,7 +132,7 @@ class FormBarCode
 	 *  @param  int     $useempty          Display empty value in select
 	 *  @return string
 	 */
-	public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
+	public function selectBarcodeType($selected = 0, $htmlname = 'barcodetype_id', $useempty = 0)
 	{
 		global $langs, $conf;
 
@@ -187,7 +187,7 @@ class FormBarCode
 	 *  @return	void
 	 *  @deprecated
 	 */
-	public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
+	public function form_barcode_type($page, $selected = 0, $htmlname = 'barcodetype_id')
 	{
 		// phpcs:enable
 		print $this->formBarcodeType($page, $selected, $htmlname);
@@ -201,7 +201,7 @@ class FormBarCode
 	 *  @param  string      $htmlname       Nom du formulaire select
 	 *  @return string
 	 */
-	public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
+	public function formBarcodeType($page, $selected = 0, $htmlname = 'barcodetype_id')
 	{
 		global $langs, $conf;
 		$out = '';

From 92e790effe7586ef8b57fe09d8070ad89f41c653 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:43:04 +0100
Subject: [PATCH 0259/1862] Fix: GETPOST -> GETPOSTINT (#28460)

---
 htdocs/core/customreports.php | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 49cecafe544..1ada4100484 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -55,10 +55,10 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$search_graph = GETPOST('search_graph', 'restricthtml');
 
 	// Load variable for pagination
-	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
@@ -118,24 +118,24 @@ $head = array();
 $ObjectClassName = '';
 // Objects available by default
 $arrayoftype = array(
-	'thirdparty' => array('langs'=>'companies', 'label' => 'ThirdParties', 'picto'=>'company', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
-	'contact' => array('label' => 'Contacts', 'picto'=>'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/contact/class/contact.class.php"),
-	'proposal' => array('label' => 'Proposals', 'picto'=>'proposal', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
-	'order' => array('label' => 'Orders', 'picto'=>'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('order'), 'ClassPath' => "/commande/class/commande.class.php"),
-	'invoice' => array('langs'=>'facture', 'label' => 'Invoices', 'picto'=>'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('invoice'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
-	'invoice_template'=>array('label' => 'PredefinedInvoices', 'picto'=>'bill', 'ObjectClassName' => 'FactureRec', 'enabled' => isModEnabled('invoice'), 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
-	'contract' => array('label' => 'Contracts', 'picto'=>'contract', 'ObjectClassName' => 'Contrat', 'enabled' => isModEnabled('contract'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
-	'contractdet' => array('label' => 'ContractLines', 'picto'=>'contract', 'ObjectClassName' => 'ContratLigne', 'enabled' => isModEnabled('contract'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
-	'bom' => array('label' => 'BOM', 'picto'=>'bom', 'ObjectClassName' => 'Bom', 'enabled' => isModEnabled('bom')),
-	'mrp' => array('label' => 'MO', 'picto'=>'mrp', 'ObjectClassName' => 'Mo', 'enabled' => isModEnabled('mrp'), 'ClassPath' => "/mrp/class/mo.class.php"),
-	'ticket' => array('label' => 'Ticket', 'picto'=>'ticket', 'ObjectClassName' => 'Ticket', 'enabled' => isModEnabled('ticket')),
-	'member' => array('label' => 'Adherent', 'picto'=>'member', 'ObjectClassName' => 'Adherent', 'enabled' => isModEnabled('member'), 'ClassPath' => "/adherents/class/adherent.class.php", 'langs'=>'members'),
-	'cotisation' => array('label' => 'Subscriptions', 'picto'=>'member', 'ObjectClassName' => 'Subscription', 'enabled' => isModEnabled('member'), 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
+	'thirdparty' => array('langs' => 'companies', 'label' => 'ThirdParties', 'picto' => 'company', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
+	'contact' => array('label' => 'Contacts', 'picto' => 'contact', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/contact/class/contact.class.php"),
+	'proposal' => array('label' => 'Proposals', 'picto' => 'proposal', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
+	'order' => array('label' => 'Orders', 'picto' => 'order', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('order'), 'ClassPath' => "/commande/class/commande.class.php"),
+	'invoice' => array('langs' => 'facture', 'label' => 'Invoices', 'picto' => 'bill', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('invoice'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
+	'invoice_template' => array('label' => 'PredefinedInvoices', 'picto' => 'bill', 'ObjectClassName' => 'FactureRec', 'enabled' => isModEnabled('invoice'), 'ClassPath' => "/compta/class/facturerec.class.php", 'langs' => 'bills'),
+	'contract' => array('label' => 'Contracts', 'picto' => 'contract', 'ObjectClassName' => 'Contrat', 'enabled' => isModEnabled('contract'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs' => 'contracts'),
+	'contractdet' => array('label' => 'ContractLines', 'picto' => 'contract', 'ObjectClassName' => 'ContratLigne', 'enabled' => isModEnabled('contract'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs' => 'contracts'),
+	'bom' => array('label' => 'BOM', 'picto' => 'bom', 'ObjectClassName' => 'Bom', 'enabled' => isModEnabled('bom')),
+	'mrp' => array('label' => 'MO', 'picto' => 'mrp', 'ObjectClassName' => 'Mo', 'enabled' => isModEnabled('mrp'), 'ClassPath' => "/mrp/class/mo.class.php"),
+	'ticket' => array('label' => 'Ticket', 'picto' => 'ticket', 'ObjectClassName' => 'Ticket', 'enabled' => isModEnabled('ticket')),
+	'member' => array('label' => 'Adherent', 'picto' => 'member', 'ObjectClassName' => 'Adherent', 'enabled' => isModEnabled('member'), 'ClassPath' => "/adherents/class/adherent.class.php", 'langs' => 'members'),
+	'cotisation' => array('label' => 'Subscriptions', 'picto' => 'member', 'ObjectClassName' => 'Subscription', 'enabled' => isModEnabled('member'), 'ClassPath' => "/adherents/class/subscription.class.php", 'langs' => 'members'),
 );
 
 
 // Complete $arrayoftype by external modules
-$parameters = array('objecttype'=>$objecttype, 'tabfamily'=>$tabfamily);
+$parameters = array('objecttype' => $objecttype, 'tabfamily' => $tabfamily);
 $reshook = $hookmanager->executeHooks('loadDataForCustomReports', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -586,7 +586,7 @@ if (!defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
 	        jQuery(document).ready(function() {
 	        	jQuery("#objecttype").change(function() {
 	        		console.log("Reload for "+jQuery("#objecttype").val());
-	                location.href = "'.$_SERVER["PHP_SELF"].'?objecttype="+jQuery("#objecttype").val()+"'.($tabfamily ? '&tabfamily='.urlencode($tabfamily) : '').(GETPOST('show_search_component_params_hidden', 'int') ? '&show_search_component_params_hidden='.((int) GETPOST('show_search_component_params_hidden', 'int')) : '').'";
+	                location.href = "'.$_SERVER["PHP_SELF"].'?objecttype="+jQuery("#objecttype").val()+"'.($tabfamily ? '&tabfamily='.urlencode($tabfamily) : '').(GETPOSTINT('show_search_component_params_hidden') ? '&show_search_component_params_hidden='.((int) GETPOSTINT('show_search_component_params_hidden')) : '').'";
 	        	});
 	        });
 	    </script>';
@@ -1225,28 +1225,28 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.1',
+					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-average'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.2',
+					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-min'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.3',
+					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-max'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position+($count * 100000)).'.4',
+					'position' => ($position + ($count * 100000)).'.4',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);

From a6db30f1dfb9c5eba2e711f40f3008cafbb8f9eb Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 27 Feb 2024 16:53:59 +0100
Subject: [PATCH 0260/1862] fix ref and verify date and time

---
 htdocs/bookcal/availabilities_card.php        | 31 +++++++++++++++++--
 htdocs/bookcal/class/availabilities.class.php |  2 +-
 htdocs/langs/en_US/errors.lang                |  2 ++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index ae32bbe7b33..6289b476ae8 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -105,6 +105,10 @@ if (!$permissiontoread) {
 }
 
 
+
+
+
+
 /*
  * Actions
  */
@@ -132,9 +136,30 @@ if (empty($reshook)) {
 
 	$triggermodname = 'BOOKCAL_AVAILABILITIES_MODIFY'; // Name of trigger action code to execute when we modify record
 
-	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
-	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	$dateStartTimestamp = dol_stringtotime(GETPOST('start'));
+	$dateEndTimestamp = dol_stringtotime(GETPOST('end'));
 
+	$startHour = intval(GETPOST('startHour'));
+	$endHour = intval(GETPOST('endHour'));
+
+	// check hours
+	if ($startHour > $endHour) {
+		if ($dateStartTimestamp === $dateEndTimestamp) {
+			$error++;
+			setEventMessages($langs->trans("ErrorEndTimeMustBeGreaterThanStartTime"), null, 'errors');
+		}
+	}
+
+	// check date
+	if ($dateStartTimestamp > $dateEndTimestamp) {
+		$error++;
+		setEventMessages($langs->trans("ErrorIncoherentDates"), null, 'errors');
+	}
+
+	if (!$error) {
+		// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	}
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
@@ -203,7 +228,7 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Availabilities")), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].''.($error = 0 ? '' : '?action=create').'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($backtopage) {
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 5e9ffe56f5c..013f4ce453a 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -539,7 +539,7 @@ class Availabilities extends CommonObject
 		if (!empty($num)) {
 			// Validate
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " SET label = '".$this->db->escape($num)."',";
 			$sql .= " status = ".self::STATUS_VALIDATED;
 			if (!empty($this->fields['date_validation'])) {
 				$sql .= ", date_validation = '".$this->db->idate($now)."'";
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index cf721af6915..5013eb85361 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -332,6 +332,8 @@ ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
 ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
 ErrorCheckTheCommandInsideTheAdvancedOptions=Check the command used for the export into the Advanced options of the export
 
+ErrorEndTimeMustBeGreaterThanStartTime=End time must be greater than start time
+ErrorIncoherentDates=Date start must be less than date end
 # 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.

From 4f0dc0f0cf2a383ae27f8f380aa6fddcaf611ca4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 27 Feb 2024 17:06:17 +0100
Subject: [PATCH 0261/1862] Test index hint

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 3d8d6c10e1d..d64a02b762d 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -139,6 +139,9 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays, ".MAIN_DB_PREFIX."facture as f";
+	if (getDolGlobalString("INVOICE_LAST_MODIFIED_INVOICE_FORCE_INDEX_TMS")) {
+		$sql .= " USE INDEX (idx_facture_tms)";
+	}
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
 	if (!$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

From 0ca145bfd062dd18e16bda6fd3d04dfcb06acecd Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 27 Feb 2024 17:27:49 +0100
Subject: [PATCH 0262/1862] fix ref and verify date and time

---
 htdocs/bookcal/availabilities_card.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index 6289b476ae8..9cbd48253e6 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -156,10 +156,10 @@ if (empty($reshook)) {
 		setEventMessages($langs->trans("ErrorIncoherentDates"), null, 'errors');
 	}
 
-	if (!$error) {
+
 		// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
-	}
+
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
@@ -227,8 +227,7 @@ if ($action == 'create') {
 	}
 
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Availabilities")), '', 'object_'.$object->picto);
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].''.($error = 0 ? '' : '?action=create').'">';
+	print '<form method="POST" action="'.($error == 0 ? $_SERVER["PHP_SELF"] : $_SERVER["PHP_SELF"].'?action=create').'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($backtopage) {

From fd8ad1f7c06aecb58747d2e6e1078e90ec40b9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:27:16 +0100
Subject: [PATCH 0263/1862] add css in list cron (#28487)

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

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index c00296a02eb..f3a87e0ad60 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
  * Copyright (C) 2013      Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2021 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2019      Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024 Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -444,7 +444,7 @@ $selectedfields = '';
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="noborder">';
+print '<table class="noborder liste">';
 
 print '<tr class="liste_titre_filter">';
 // Action column

From abbec034c6dc40f8523564fc23d4ae8c1491f329 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:36:29 +0100
Subject: [PATCH 0264/1862] Qual: Several typing hints/some fixes. (#28483)

* Update documentation to improve static tool messages

* Suppress PhanPluginSuspiciousParamOrder

* Fix typing hint

* Fix typing hint (number->int)

* Fix typing hint (PDF->TCPDF)

* Fix typing hint (PDF->TCPDF)

* Modify code to hint typing check

* Correct Noop statement (createfromclone)

* Remove useless if/else with same result

* Suppress PhanRedefineFunctionInternal

* Suppress PhanParamSuspiciousOrder

* Suppress PhanPluginDuplicateArrayKey

* Suppress multiple phan messages

* Ignore PhanPluginSuspiciousParamOrder

* Add phan typing

* Remove useless if statement

* Remove useless if/else condition

* Remove useless if

* Remove useless if

* Join duplicate if/else statements

* Fix useless if

* Fix useless if

* Fix phan notice by optimizing 2**$i to 1<<$i
---
 htdocs/accountancy/admin/account.php          | 28 +++---
 .../accountancy/class/bookkeeping.class.php   |  7 +-
 htdocs/accountancy/journal/bankjournal.php    | 50 ++++++----
 .../cashcontrol/class/cashcontrol.class.php   | 45 ++++-----
 htdocs/core/lib/functions2.lib.php            |  9 +-
 .../contract/doc/pdf_strato.modules.php       |  9 +-
 .../expedition/doc/pdf_espadon.modules.php    | 15 +--
 .../stocktransfer/doc/pdf_eagle.modules.php   |  2 +-
 .../core/modules/syslog/mod_syslog_file.php   |  4 +-
 .../class/DataCollector/DolPhpCollector.php   |  3 +-
 htdocs/fourn/commande/card.php                | 35 ++++---
 htdocs/imports/import.php                     | 63 ++++++-------
 htdocs/install/fileconf.php                   | 15 +--
 htdocs/master.inc.php                         |  2 +
 .../stock/class/mouvementstock.class.php      | 53 +++++------
 htdocs/product/stock/movement_list.php        | 54 ++++++-----
 htdocs/projet/list.php                        | 53 +++++------
 htdocs/projet/tasks/time.php                  | 29 +++---
 htdocs/reception/list.php                     | 57 ++++++------
 htdocs/societe/class/societe.class.php        | 21 +++--
 htdocs/ticket/list.php                        | 35 +++----
 htdocs/user/list.php                          | 91 +++++++++----------
 htdocs/website/class/website.class.php        |  2 +-
 23 files changed, 348 insertions(+), 334 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 85f230168c3..7532b8fc9f4 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
  * Copyright (C) 2016-2018  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -84,15 +85,15 @@ if (!$sortorder) {
 }
 
 $arrayfields = array(
-	'aa.account_number'=>array('label'=>"AccountNumber", 'checked'=>1),
-	'aa.label'=>array('label'=>"Label", 'checked'=>1),
-	'aa.labelshort'=>array('label'=>"LabelToShow", 'checked'=>1),
-	'aa.account_parent'=>array('label'=>"Accountparent", 'checked'=>1),
-	'aa.pcg_type'=>array('label'=>"Pcgtype", 'checked'=>1, 'help'=>'PcgtypeDesc'),
-	'categories'=>array('label'=>"AccountingCategories", 'checked'=>-1, 'help'=>'AccountingCategoriesDesc'),
-	'aa.reconcilable'=>array('label'=>"Reconcilable", 'checked'=>1),
-	'aa.import_key'=>array('label'=>"ImportId", 'checked'=>-1, 'help'=>''),
-	'aa.active'=>array('label'=>"Activated", 'checked'=>1)
+	'aa.account_number' => array('label' => "AccountNumber", 'checked' => 1),
+	'aa.label' => array('label' => "Label", 'checked' => 1),
+	'aa.labelshort' => array('label' => "LabelToShow", 'checked' => 1),
+	'aa.account_parent' => array('label' => "Accountparent", 'checked' => 1),
+	'aa.pcg_type' => array('label' => "Pcgtype", 'checked' => 1, 'help' => 'PcgtypeDesc'),
+	'categories' => array('label' => "AccountingCategories", 'checked' => -1, 'help' => 'AccountingCategoriesDesc'),
+	'aa.reconcilable' => array('label' => "Reconcilable", 'checked' => 1),
+	'aa.import_key' => array('label' => "ImportId", 'checked' => -1, 'help' => ''),
+	'aa.active' => array('label' => "Activated", 'checked' => 1)
 );
 
 if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
@@ -410,6 +411,7 @@ if ($resql) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accounting_account', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
@@ -506,7 +508,7 @@ if ($resql) {
 	}
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -568,7 +570,7 @@ if ($resql) {
 	}
 
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -709,7 +711,7 @@ if ($resql) {
 		}
 
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -803,7 +805,7 @@ if ($resql) {
 
 	$db->free($resql);
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 588b21ed668..a7d946f5ec7 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2015-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -555,7 +556,7 @@ class BookKeeping extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1971,7 +1972,7 @@ class BookKeeping extends CommonObject
 	/**
 	 * Transform transaction
 	 *
-	 * @param  number   $direction      If 0: tmp => real, if 1: real => tmp
+	 * @param  int      $direction      If 0: tmp => real, if 1: real => tmp
 	 * @param  string   $piece_num      Piece num = Transaction ref
 	 * @return int                      int Return integer <0 if KO, >0 if OK
 	 */
@@ -2197,7 +2198,7 @@ class BookKeeping extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 			}
 
-			$result = array('id'=>$obj->rowid, 'account_number'=>$obj->account_number, 'label'=>$obj->label);
+			$result = array('id' => $obj->rowid, 'account_number' => $obj->account_number, 'label' => $obj->label);
 			return $result;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index c091abb5b48..9e6b39a9b00 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2018		Ferran Marcet	        <fmarcet@2byte.es>
  * Copyright (C) 2018		Eric Seigne	            <eric.seigne@cap-rel.fr>
  * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -194,6 +195,21 @@ $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 $journal_label = $accountingjournalstatic->label;
 
+$tabcompany = array();
+$tabuser = array();
+$tabpay = array();
+$tabbq = array();
+$tabtp = array();
+$tabtype = array();
+$tabmoreinfo = array();
+
+'
+@phan-var-force array<array{id:mixed,name:mixed,code_compta:string,email:string}> $tabcompany
+@phan-var-force array<array{id:int,name:string,lastname:string,firstname:string,email:string,accountancy_code:string,status:int> $tabuser
+@phan-var-force array<int,array{date:string,type_payment:string,ref:string,fk_bank:int,ban_account_ref:string,fk_bank_account:int,lib:string,type:string}> $tabpay
+@phan-var-force array<array{lib:string,date?:int|string,type_payment?:string,ref?:string,fk_bank?:int,ban_account_ref?:string,fk_bank_account?:int,type?:string,bank_account_ref?:string,paymentid?:int,paymentsupplierid?:int,soclib?:string,paymentscid?:int,paymentdonationid?:int,paymentsubscriptionid?:int,paymentvatid?:int,paymentsalid?:int,paymentexpensereport?:int,paymentvariousid?:int,account_various?:string,paymentloanid?:int}> $tabtp
+';
+
 //print $sql;
 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -210,14 +226,6 @@ if ($result) {
 	$account_pay_subscription = getDolGlobalString('ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT', 'NotDefined'); // NotDefined is a reserved word
 	$account_transfer = getDolGlobalString('ACCOUNTING_ACCOUNT_TRANSFER_CASH', 'NotDefined'); // NotDefined is a reserved word
 
-	$tabcompany = array();
-	$tabuser = array();
-	$tabpay = array();
-	$tabbq = array();
-	$tabtp = array();
-	$tabtype = array();
-	$tabmoreinfo = array();
-
 	// Loop on each line into llx_bank table. For each line, we should get:
 	// one line tabpay = line into bank
 	// one line for bank record = tabbq
@@ -342,11 +350,13 @@ if ($result) {
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabpay[$obj->rowid]['type'] = $links[$key]['type'];
 					$tabtype[$obj->rowid] = $links[$key]['type'];
-				} elseif (in_array($links[$key]['type'], array('company', 'user'))) {
-					if ($tabpay[$obj->rowid]['type'] == 'unknown') {
-						// We can guess here it is a bank record for a thirdparty company or a user.
-						// But we won't be able to record somewhere else than into a waiting account, because there is no other journal to record the contreparty.
-					}
+					/* phpcs:disable -- Code does nothing at this moment -> commented
+					} elseif (in_array($links[$key]['type'], array('company', 'user'))) {
+						if ($tabpay[$obj->rowid]['type'] == 'unknown') {
+							// We can guess here it is a bank record for a thirdparty company or a user.
+							// But we won't be able to record somewhere else than into a waiting account, because there is no other journal to record the contreparty.
+						}
+					*/ // phpcs::enable
 				}
 
 				// Special case to ask later to add more request to get information for old links without company link.
@@ -467,7 +477,7 @@ if ($result) {
 						$userstatic->email = $tmpsalary->user->email;
 						$userstatic->firstname = $tmpsalary->user->firstname;
 						$userstatic->lastname = $tmpsalary->user->lastname;
-						$userstatic->statut = $tmpsalary->user->statut;
+						$userstatic->statut = $tmpsalary->user->status;
 						$userstatic->accountancy_code = $tmpsalary->user->accountancy_code;
 
 						if ($userstatic->id > 0) {
@@ -487,7 +497,7 @@ if ($result) {
 								'firstname' => $userstatic->firstname,
 								'email' => $userstatic->email,
 								'accountancy_code' => $compta_user,
-								'status' => $userstatic->statut
+								'status' => $userstatic->status
 								);
 							}
 						}
@@ -554,8 +564,8 @@ if ($result) {
 						foreach ($arrayofamounts as $invoiceid => $amount) {
 							$tmpinvoice->fetch($invoiceid);
 							$tmpinvoice->fetch_thirdparty();
-							if ($tmpinvoice->thirdparty->code_compta) {
-								$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta] += $amount;
+							if ($tmpinvoice->thirdparty->code_compta_client) {
+								$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta_client] += $amount;
 							}
 						}
 					}
@@ -1072,8 +1082,8 @@ if (empty($action) || $action == 'view') {
 	$description = $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$listofchoices = array(
-		'notyet'=>$langs->trans("NotYetInGeneralLedger"),
-		'already'=>$langs->trans("AlreadyInGeneralLedger")
+		'notyet' => $langs->trans("NotYetInGeneralLedger"),
+		'already' => $langs->trans("AlreadyInGeneralLedger")
 	);
 	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
 	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
@@ -1432,7 +1442,7 @@ $db->close();
 /**
  * Return source for doc_ref of a bank transaction
  *
- * @param 	string 	$val			Array of val
+ * @param 	array 	$val			Array of val
  * @param 	string	$typerecord		Type of record ('payment', 'payment_supplier', 'payment_expensereport', 'payment_vat', ...)
  * @return 	string					A string label to describe a record into llx_bank_url
  */
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index f66106d5ddd..15959866819 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2016 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018 Andreu Bisquerra     <jove@bisquerra.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -80,26 +81,26 @@ class CashControl extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	public $fields = array(
-	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
-	'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>15),
-	'ref' =>array('type'=>'varchar(64)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>18),
-	'posmodule' =>array('type'=>'varchar(30)', 'label'=>'Module', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>19),
-	'posnumber' =>array('type'=>'varchar(30)', 'label'=>'Terminal', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>20, 'css'=>'center'),
-	'label' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>0, 'position'=>24),
-	'opening' =>array('type'=>'price', 'label'=>'Opening', 'enabled'=>1, 'visible'=>1, 'position'=>25, 'csslist'=>'amount'),
-	'cash' =>array('type'=>'price', 'label'=>'Cash', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'csslist'=>'amount'),
-	'cheque' =>array('type'=>'price', 'label'=>'Cheque', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'csslist'=>'amount'),
-	'card' =>array('type'=>'price', 'label'=>'CreditCard', 'enabled'=>1, 'visible'=>1, 'position'=>36, 'csslist'=>'amount'),
-	'year_close' =>array('type'=>'integer', 'label'=>'Year close', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'css'=>'center'),
-	'month_close' =>array('type'=>'integer', 'label'=>'Month close', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'css'=>'center'),
-	'day_close' =>array('type'=>'integer', 'label'=>'Day close', 'enabled'=>1, 'visible'=>1, 'position'=>60, 'css'=>'center'),
-	'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
-	'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>505),
-	'fk_user_creat' =>array('type'=>'integer:User', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>600),
-	'fk_user_valid' =>array('type'=>'integer:User', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>602),
-	'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>0, 'position'=>700),
-	'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated')),
+	'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 10),
+	'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 15),
+	'ref' => array('type' => 'varchar(64)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 18),
+	'posmodule' => array('type' => 'varchar(30)', 'label' => 'Module', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 19),
+	'posnumber' => array('type' => 'varchar(30)', 'label' => 'Terminal', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 20, 'css' => 'center'),
+	'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 0, 'position' => 24),
+	'opening' => array('type' => 'price', 'label' => 'Opening', 'enabled' => 1, 'visible' => 1, 'position' => 25, 'csslist' => 'amount'),
+	'cash' => array('type' => 'price', 'label' => 'Cash', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'csslist' => 'amount'),
+	'cheque' => array('type' => 'price', 'label' => 'Cheque', 'enabled' => 1, 'visible' => 1, 'position' => 33, 'csslist' => 'amount'),
+	'card' => array('type' => 'price', 'label' => 'CreditCard', 'enabled' => 1, 'visible' => 1, 'position' => 36, 'csslist' => 'amount'),
+	'year_close' => array('type' => 'integer', 'label' => 'Year close', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 50, 'css' => 'center'),
+	'month_close' => array('type' => 'integer', 'label' => 'Month close', 'enabled' => 1, 'visible' => 1, 'position' => 55, 'css' => 'center'),
+	'day_close' => array('type' => 'integer', 'label' => 'Day close', 'enabled' => 1, 'visible' => 1, 'position' => 60, 'css' => 'center'),
+	'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500),
+	'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 502),
+	'tms' => array('type' => 'timestamp', 'label' => 'Tms', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 505),
+	'fk_user_creat' => array('type' => 'integer:User', 'label' => 'UserCreation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 600),
+	'fk_user_valid' => array('type' => 'integer:User', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 602),
+	'import_key' => array('type' => 'varchar(14)', 'label' => 'Import key', 'enabled' => 1, 'visible' => 0, 'position' => 700),
+	'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 1000, 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated')),
 	);
 
 	/**
@@ -241,7 +242,7 @@ class CashControl extends CommonObject
 	 * Validate cash fence
 	 *
 	 * @param 	User 		$user		User
-	 * @param 	number 		$notrigger	No trigger
+	 * @param 	int 		$notrigger	No trigger
 	 * @return 	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function valid(User $user, $notrigger = 0)
@@ -450,7 +451,7 @@ class CashControl extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('cashfencedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 27b78638c33..1335da5649a 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1006,6 +1006,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$regKey = array();
 	while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey)) {
 		$maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
+		// @phan-suppress-next-line PhanParamSuspiciousOrder
 		$maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
 		$tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
 	}
@@ -1194,8 +1195,10 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
 	$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
 	$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+	// @phan-suppress-next-line PhanParamSuspiciousOrder
 	$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);
 	if ($maskrefclient) {
+		// @phan-suppress-next-line PhanParamSuspiciousOrder
 		$maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
 	}
 	if ($masktype) {
@@ -1268,6 +1271,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
 		$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);
 		if ($maskrefclient) {
+			// @phan-suppress-next-line PhanParamSuspiciousOrder
 			$maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
 		}
 		if ($masktype) {
@@ -1335,7 +1339,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);
+			// @phan-suppress-next-line PhanParamSuspiciousOrder
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);
+			// @phan-suppress-next-line PhanParamSuspiciousOrder
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);
 
 			// Get counter in database
@@ -1657,7 +1663,7 @@ function numero_semaine($time)
 	// Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
 	$numeroSemaine = (
 		(
-		date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
+			date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
 		-
 		date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
 		) / 7
@@ -2840,6 +2846,7 @@ function phpSyntaxError($code)
 	ob_start();
 	$code = substr($code, strlen('<?php '));
 	$braces || $code = "if(0){{$code}\n}";
+	// @phan-suppress-next-line PhanPluginUnsafeEval
 	if (eval($code) === false) {
 		if ($braces) {
 			$braces = PHP_INT_MAX;
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 3c8bd902f7d..249e5ecbbf5 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013-2020  Philippe Grand	            <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2018-2020  Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -195,7 +196,7 @@ class pdf_strato extends ModelePDFContract
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -467,7 +468,7 @@ class pdf_strato extends ModelePDFContract
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -477,7 +478,7 @@ class pdf_strato extends ModelePDFContract
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -794,7 +795,7 @@ class pdf_strato extends ModelePDFContract
 	/**
 	 *   	Show footer of page. Need this->emetteur object
 	 *
-	 *   	@param	PDF			$pdf     			PDF
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Contrat		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index a79335a4899..885b61da806 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018-2020	Frédéric France    	<frederic.france@netlogic.fr>
  * Copyright (C) 2023 		Charlene Benke    	<charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -229,7 +230,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -274,6 +275,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -442,7 +444,7 @@ class pdf_espadon extends ModelePdfExpedition
 									if (empty($height_trackingnumber)) {
 										$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 									} else {
-										$height_note = $this->page_hauteur - ($tab_top + $heightforfooter)+ $height_trackingnumber + 1;
+										$height_note = $this->page_hauteur - ($tab_top + $heightforfooter) + $height_trackingnumber + 1;
 										$tab_top = $tab_topbeforetrackingnumber;
 									}
 									$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 2);
@@ -675,10 +677,10 @@ class pdf_espadon extends ModelePdfExpedition
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -743,7 +745,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -753,7 +755,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1381,6 +1383,7 @@ class pdf_espadon extends ModelePdfExpedition
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index b5b967487c4..725abb6a34b 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -1222,7 +1222,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 	/**
 	 *  Show footer of page. Need this->emetteur object
 	 *
-	 *  @param	PDF				$pdf     			PDF
+	 *  @param	TCPDF			$pdf     			PDF
 	 *  @param	StockTransfer	$object				Object to show
 	 *  @param	Translate		$outputlangs		Object lang for output
 	 *  @param	int				$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 60e43dc16c1..a6df4ed82a5 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -1,4 +1,6 @@
 <?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandler.php';
 
@@ -133,6 +135,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 * @param  	array 	$content 			Array containing the info about the message
 	 * @param	string	$suffixinfilename	When output is a file, append this suffix into default log filename.
 	 * @return	void
+	 * @phan-suppress PhanPluginDuplicateArrayKey
 	 */
 	public function export($content, $suffixinfilename = '')
 	{
@@ -158,7 +161,6 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				print 'Failed to open log file '.($dolibarr_main_prod ? basename($logfile) : $logfile);
 			}
 		} else {
-			// @phan-suppress PhanPluginDuplicateArrayKey
 			$logLevels = array(
 				LOG_EMERG => 'EMERG',
 				LOG_ALERT => 'ALERT',
diff --git a/htdocs/debugbar/class/DataCollector/DolPhpCollector.php b/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
index bca2b2a7071..c4ff10dbc61 100644
--- a/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -137,7 +138,7 @@ class PhpCollector extends DataCollector implements Renderable
 	public function errorHandler($severity, $message, $fileName, $line)
 	{
 		for ($i = 0; $i < 15; $i++) {
-			if ($type = $severity & (2 ** $i)) {
+			if ($type = $severity & (1 << $i)) {
 				$label = $this->friendlyErrorType($type);
 				$this->messages[] = [
 					'message' => $message . ' (' . $fileName . ':' . $line . ')',
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 059e04db6b7..adc56f49324 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2022      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023 	   Joachim Kueter       <git-jk@bloxera.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -173,7 +174,7 @@ $error = 0;
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -553,7 +554,7 @@ if (empty($reshook)) {
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
-					$product_desc='';
+					$product_desc = '';
 				}
 
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
@@ -1146,10 +1147,8 @@ if (empty($reshook)) {
 					$langs->load("deliveries");
 					setEventMessages($langs->trans("DeliveryStateSaved"), null);
 					$action = '';
-				} elseif ($result == -3) {
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
+					//if ($result == -3) {}
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -1442,11 +1441,11 @@ if (empty($reshook)) {
 		// NS and Authentication parameters
 		$ws_ns = 'http://www.dolibarr.org/ns/';
 		$ws_authentication = array(
-			'dolibarrkey'=>$ws_key,
-			'sourceapplication'=>'DolibarrWebServiceClient',
-			'login'=>$ws_user,
-			'password'=>$ws_password,
-			'entity'=>$ws_entity
+			'dolibarrkey' => $ws_key,
+			'sourceapplication' => 'DolibarrWebServiceClient',
+			'login' => $ws_user,
+			'password' => $ws_password,
+			'entity' => $ws_entity
 		);
 
 		//Is sync supplier web services module activated? and everything filled?
@@ -1501,7 +1500,7 @@ if (empty($reshook)) {
 				'lines'         => $order_lines
 			);
 
-			$ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order);
+			$ws_parameters = array('authentication' => $ws_authentication, 'order' => $order);
 			$result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
 
 			if (empty($result_order["result"]["result_code"])) { //No result, check error str
@@ -2036,7 +2035,7 @@ if ($action == 'create') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
-	$parameters = array('formConfirm' => $formconfirm, 'lineid'=>$lineid);
+	$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;
@@ -2805,11 +2804,11 @@ if ($action == 'create') {
 			// NS and Authentication parameters
 			$ws_ns = 'http://www.dolibarr.org/ns/';
 			$ws_authentication = array(
-			'dolibarrkey'=>$ws_key,
-			'sourceapplication'=>'DolibarrWebServiceClient',
-			'login'=>$ws_user,
-			'password'=>$ws_password,
-			'entity'=>''
+			'dolibarrkey' => $ws_key,
+			'sourceapplication' => 'DolibarrWebServiceClient',
+			'login' => $ws_user,
+			'password' => $ws_password,
+			'entity' => ''
 			);
 
 			print load_fiche_titre($langs->trans('CreateRemoteOrder'), '');
@@ -2865,7 +2864,7 @@ if ($action == 'create') {
 				$soapclient_user->decodeUTF8(false);
 
 				//Get the thirdparty associated to user
-				$ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
+				$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ws_user);
 				$result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
 				$user_status_code = $result_user["result"]["result_code"];
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index ef68400738d..43dd1645035 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2022      Charlene Benke		<charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -58,7 +59,7 @@ $entitytoicon = array(
 	'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
-	'virtualproduct'=>'product',
+	'virtualproduct' => 'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
 	'stock'        => 'stock',
@@ -67,11 +68,11 @@ $entitytoicon = array(
 	'stockbatch'   => 'stock',
 	'category'     => 'category',
 	'shipment'     => 'sending',
-	'shipment_line'=> 'sending',
-	'reception'=> 'sending',
-	'reception_line'=> 'sending',
-	'expensereport'=> 'trip',
-	'expensereport_line'=> 'trip',
+	'shipment_line' => 'sending',
+	'reception' => 'sending',
+	'reception_line' => 'sending',
+	'expensereport' => 'trip',
+	'expensereport_line' => 'trip',
 	'holiday'      => 'holiday',
 	'contract_line' => 'contract',
 	'translation'  => 'generic',
@@ -113,16 +114,16 @@ $entitytolang = array(
 	'other'        => 'Other',
 	'trip'         => 'TripsAndExpenses',
 	'shipment'     => 'Shipments',
-	'shipment_line'=> 'ShipmentLine',
+	'shipment_line' => 'ShipmentLine',
 	'project'      => 'Projects',
 	'projecttask'  => 'Tasks',
 	'task_time'    => 'TaskTimeSpent',
 	'action'       => 'Event',
-	'expensereport'=> 'ExpenseReport',
-	'expensereport_line'=> 'ExpenseReportLine',
+	'expensereport' => 'ExpenseReport',
+	'expensereport_line' => 'ExpenseReportLine',
 	'holiday'      => 'TitreRequestCP',
 	'contract'     => 'Contract',
-	'contract_line'=> 'ContractLine',
+	'contract_line' => 'ContractLine',
 	'translation'  => 'Translation',
 	'bom'          => 'BOM',
 	'bomline'      => 'BOMLine'
@@ -895,21 +896,21 @@ if ($step == 4 && $datatoimport) {
 		$isrequired = preg_match('/\*$/', $label);
 		if (!empty($isrequired)) {
 			$newlabel = substr($label, 0, -1);
-			$fieldstarget_tmp[$key] = array("label"=>$newlabel, "required"=>true);
+			$fieldstarget_tmp[$key] = array("label" => $newlabel, "required" => true);
 		} else {
-			$fieldstarget_tmp[$key] = array("label"=>$label, "required"=>false);
+			$fieldstarget_tmp[$key] = array("label" => $label, "required" => false);
 		}
 		if (!empty($array_match_database_to_file[$key])) {
 			$fieldstarget_tmp[$key]["imported"] = true;
-			$fieldstarget_tmp[$key]["position"] = $array_match_database_to_file[$key]-1;
+			$fieldstarget_tmp[$key]["position"] = $array_match_database_to_file[$key] - 1;
 			$keytoswap = $key;
 			while (!empty($array_match_database_to_file[$keytoswap])) {
-				if ($position+1 > $array_match_database_to_file[$keytoswap]) {
-					$keytoswapwith = $array_match_database_to_file[$keytoswap]-1;
-					$tmp = [$keytoswap=>$fieldstarget_tmp[$keytoswap]];
+				if ($position + 1 > $array_match_database_to_file[$keytoswap]) {
+					$keytoswapwith = $array_match_database_to_file[$keytoswap] - 1;
+					$tmp = [$keytoswap => $fieldstarget_tmp[$keytoswap]];
 					unset($fieldstarget_tmp[$keytoswap]);
 					$fieldstarget_tmp = arrayInsert($fieldstarget_tmp, $keytoswapwith, $tmp);
-					$keytoswapwith = $arraykeysfieldtarget[$array_match_database_to_file[$keytoswap]-1];
+					$keytoswapwith = $arraykeysfieldtarget[$array_match_database_to_file[$keytoswap] - 1];
 					$tmp = $fieldstarget_tmp[$keytoswapwith];
 					unset($fieldstarget_tmp[$keytoswapwith]);
 					$fieldstarget_tmp[$keytoswapwith] = $tmp;
@@ -1115,7 +1116,7 @@ if ($step == 4 && $datatoimport) {
 		foreach ($tmparray as $tmpkey => $tmpval) {
 			$labeltoshow .= ($labeltoshow ? ' '.$langs->trans('or').' ' : '').$langs->transnoentities($tmpval);
 		}
-		$optionsall[$code] = array('labelkey'=>$line['label'], 'labelkeyarray'=>$tmparray, 'label'=>$labeltoshow, 'required'=>(empty($line["required"]) ? 0 : 1), 'position'=>!empty($line['position']) ? $line['position'] : 0);
+		$optionsall[$code] = array('labelkey' => $line['label'], 'labelkeyarray' => $tmparray, 'label' => $labeltoshow, 'required' => (empty($line["required"]) ? 0 : 1), 'position' => !empty($line['position']) ? $line['position'] : 0);
 		// TODO Get type from a new array into module descriptor.
 		//$picto = 'email';
 		$picto = '';
@@ -1164,7 +1165,7 @@ if ($step == 4 && $datatoimport) {
 		//var_dump($_SESSION['dol_array_match_file_to_database']);
 
 		$selectforline = '';
-		$selectforline .= '<select id="selectorderimport_'.($i+1).'" class="targetselectchange minwidth300" name="select_'.($i+1).'">';
+		$selectforline .= '<select id="selectorderimport_'.($i + 1).'" class="targetselectchange minwidth300" name="select_'.($i + 1).'">';
 		if (!empty($line["imported"])) {
 			$selectforline .= '<option value="-1">&nbsp;</option>';
 		} else {
@@ -1268,10 +1269,10 @@ if ($step == 4 && $datatoimport) {
 			} elseif ($modetoautofillmapping == 'session' && !empty($_SESSION['dol_array_match_file_to_database_select'])) {
 				$tmpselectioninsession = dolExplodeIntoArray($_SESSION['dol_array_match_file_to_database_select'], ',', '=');
 				//var_dump($code);
-				if (!empty($tmpselectioninsession[($i+1)]) && $tmpselectioninsession[($i+1)] == $tmpcode) {
+				if (!empty($tmpselectioninsession[($i + 1)]) && $tmpselectioninsession[($i + 1)] == $tmpcode) {
 					$selectforline .= ' selected';
 				}
-				$selectforline .= ' data-debug="'.$tmpcode.'-'.$code.'-'.$j.'-'.(!empty($tmpselectioninsession[($i+1)]) ? $tmpselectioninsession[($i+1)] : "").'"';
+				$selectforline .= ' data-debug="'.$tmpcode.'-'.$code.'-'.$j.'-'.(!empty($tmpselectioninsession[($i + 1)]) ? $tmpselectioninsession[($i + 1)] : "").'"';
 			}
 			$selectforline .= ' data-html="'.dol_escape_htmltag($labelhtml).'"';
 			$selectforline .= '>';
@@ -1280,7 +1281,7 @@ if ($step == 4 && $datatoimport) {
 			$j++;
 		}
 		$selectforline .= '</select>';
-		$selectforline .= ajax_combobox('selectorderimport_'.($i+1));
+		$selectforline .= ajax_combobox('selectorderimport_'.($i + 1));
 
 		print $selectforline;
 
@@ -1496,7 +1497,7 @@ if ($step == 4 && $datatoimport) {
 		print '<tr class="oddeven">';
 		print '<td><input name="import_name" class="minwidth300" value="'.$nameofimportprofile.'"></td>';
 		print '<td>';
-		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
+		$arrayvisibility = array('private' => $langs->trans("Private"), 'all' => $langs->trans("Everybody"));
 		print $form->selectarray('visibility', $arrayvisibility, 'private');
 		print '</td>';
 		print '<td class="right">';
@@ -1876,7 +1877,7 @@ if ($step == 5 && $datatoimport) {
 				//dol_syslog("line ".$sourcelinenb.' - '.$nboflines.' - '.$excludefirstline.' - '.$endatlinenb);
 				$arrayrecord = $obj->import_read_record();
 				if ($arrayrecord === false) {
-					$arrayofwarnings[$sourcelinenb][0] = array('lib'=>'File has '.$nboflines.' lines. However we reach the end of file or an empty line at record '.$sourcelinenb.'. This may occurs when some records are split onto several lines and not correctly delimited by the "Char delimiter", or if there is line with no data on all fields.', 'type'=>'EOF_RECORD_ON_SEVERAL_LINES');
+					$arrayofwarnings[$sourcelinenb][0] = array('lib' => 'File has '.$nboflines.' lines. However we reach the end of file or an empty line at record '.$sourcelinenb.'. This may occurs when some records are split onto several lines and not correctly delimited by the "Char delimiter", or if there is line with no data on all fields.', 'type' => 'EOF_RECORD_ON_SEVERAL_LINES');
 					$endoffile++;
 					continue;
 				}
@@ -1940,7 +1941,7 @@ if ($step == 5 && $datatoimport) {
 				$i++;
 				$resqlafterimport = $db->query($sqlafterimport);
 				if (!$resqlafterimport) {
-					$arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
+					$arrayoferrors['none'][] = array('lib' => $langs->trans("Error running final request: ".$sqlafterimport));
 					$error++;
 				}
 			}
@@ -2286,7 +2287,7 @@ if ($step == 6 && $datatoimport) {
 			$sourcelinenb++;
 			$arrayrecord = $obj->import_read_record();
 			if ($arrayrecord === false) {
-				$arrayofwarnings[$sourcelinenb][0] = array('lib'=>'File has '.$nboflines.' lines. However we reach the end of file or an empty line at record '.$sourcelinenb.'. This may occurs when some records are split onto several lines and not correctly delimited by the "Char delimiter", or if there is line with no data on all fields.', 'type'=>'EOF_RECORD_ON_SEVERAL_LINES');
+				$arrayofwarnings[$sourcelinenb][0] = array('lib' => 'File has '.$nboflines.' lines. However we reach the end of file or an empty line at record '.$sourcelinenb.'. This may occurs when some records are split onto several lines and not correctly delimited by the "Char delimiter", or if there is line with no data on all fields.', 'type' => 'EOF_RECORD_ON_SEVERAL_LINES');
 				$endoffile++;
 				continue;
 			}
@@ -2361,7 +2362,7 @@ if ($step == 6 && $datatoimport) {
 				$i++;
 				$resqlafterimport = $db->query($sqlafterimport);
 				if (!$resqlafterimport) {
-					$arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
+					$arrayoferrors['none'][] = array('lib' => $langs->trans("Error running final request: ".$sqlafterimport));
 					$error++;
 				}
 			}
@@ -2467,12 +2468,8 @@ function show_elem($fieldssource, $pos, $key)
 			if (!utf8_check($example)) {
 				$example = mb_convert_encoding($example, 'UTF-8', 'ISO-8859-1');
 			}
-			if (!empty($conf->dol_optimize_smallscreen)) {
-				//print '<br>';
-				print ' - ';
-			} else {
-				print ' - ';
-			}
+			// if (!empty($conf->dol_optimize_smallscreen)) { //print '<br>'; }
+			print ' - ';
 			print '<i class="opacitymedium">'.dol_escape_htmltag($example).'</i>';
 		}
 		print '</td>';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 7d211faae21..64b360472bb 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2004       Sebastien DiCintio      <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -188,7 +189,7 @@ if (!empty($force_install_noedit)) {
 				   name="main_data_dir"
 				   value="<?php print $dolibarr_main_data_root ?>"
 <?php if (!empty($force_install_noedit)) {
-			print ' disabled';
+	print ' disabled';
 } ?>
 			>
 		</td>
@@ -220,7 +221,7 @@ if (!empty($force_install_noedit)) {
 				   name="main_url"
 				   value="<?php print $dolibarr_main_url_root; ?> "
 <?php if (!empty($force_install_noedit)) {
-		print ' disabled';
+	print ' disabled';
 }
 ?>
 			>
@@ -493,6 +494,7 @@ if (!empty($force_install_noedit)) {
 				   name="db_pass"
 				   value="<?php
 					// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+					// @phan-suppress-next-line PhanParamSuspiciousOrder
 					$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
 					if (!empty($dolibarr_main_prod) && empty($_SESSION['dol_save_pass'])) {    // So value can't be found if install page still accessible
 						$autofill = '';
@@ -500,7 +502,7 @@ if (!empty($force_install_noedit)) {
 					print dol_escape_htmltag($autofill);
 					?>"
 				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) {
-						print ' disabled';
+					print ' disabled';
 				} ?>
 			>
 		</td>
@@ -576,14 +578,15 @@ if (!empty($force_install_noedit)) {
 				   class="needroot text-security"
 				   value="<?php
 					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
+					// @phan-suppress-next-line PhanParamSuspiciousOrder
 					$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
 					if (!empty($dolibarr_main_prod)) {
 						$autofill = '';
 					}
 					// Do not autofill password if instance is a production instance
 					if (!empty($_SERVER["SERVER_NAME"]) && !in_array(
-						$_SERVER["SERVER_NAME"],
-						array('127.0.0.1', 'localhost', 'localhostgit')
+					$_SERVER["SERVER_NAME"],
+					array('127.0.0.1', 'localhost', 'localhostgit')
 					)
 					) {
 						$autofill = '';
@@ -591,7 +594,7 @@ if (!empty($force_install_noedit)) {
 					print dol_escape_htmltag($autofill);
 					?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {
-						print ' disabled'; /* May be removed by javascript*/
+					print ' disabled'; /* May be removed by javascript*/
 				} ?>
 			>
 		</td>
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 0eb37c28936..2539d9748c1 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -44,6 +45,7 @@ if (!function_exists('is_countable')) {
 	 * function is_countable (to remove when php version supported will be >= 7.3)
 	 * @param mixed $c data to check if countable
 	 * @return bool
+	 * @phan-suppress PhanRedefineFunctionInternal
 	 */
 	function is_countable($c)
 	{
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index cd5eae2e6d8..6b310bdac1a 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2014	   Cedric GROSS	        <c.gross@kreiz-it.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -122,25 +123,25 @@ class MouvementStock extends CommonObject
 
 
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'datem' =>array('type'=>'datetime', 'label'=>'Datem', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-		'fk_product' =>array('type'=>'integer:Product:product/class/product.class.php:1', 'label'=>'Product', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'fk_entrepot' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30),
-		'value' =>array('type'=>'double', 'label'=>'Value', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'price' =>array('type'=>'double(24,8)', 'label'=>'Price', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'type_mouvement' =>array('type'=>'smallint(6)', 'label'=>'Type mouvement', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'label' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'fk_origin' =>array('type'=>'integer', 'label'=>'Fk origin', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'origintype' =>array('type'=>'varchar(32)', 'label'=>'Origintype', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>75),
-		'inventorycode' =>array('type'=>'varchar(128)', 'label'=>'InventoryCode', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'batch' =>array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'eatby' =>array('type'=>'date', 'label'=>'Eatby', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'sellby' =>array('type'=>'date', 'label'=>'Sellby', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk project', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10, 'showoncombobox' => 1),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
+		'datem' => array('type' => 'datetime', 'label' => 'Datem', 'enabled' => 1, 'visible' => -1, 'position' => 20),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:1', 'label' => 'Product', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'fk_entrepot' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),
+		'value' => array('type' => 'double', 'label' => 'Value', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'price' => array('type' => 'double(24,8)', 'label' => 'Price', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'type_mouvement' => array('type' => 'smallint(6)', 'label' => 'Type mouvement', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'fk_origin' => array('type' => 'integer', 'label' => 'Fk origin', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'origintype' => array('type' => 'varchar(32)', 'label' => 'Origintype', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 70),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'visible' => -1, 'notnull' => 1, 'position' => 75),
+		'inventorycode' => array('type' => 'varchar(128)', 'label' => 'InventoryCode', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'batch' => array('type' => 'varchar(30)', 'label' => 'Batch', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'eatby' => array('type' => 'date', 'label' => 'Eatby', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'sellby' => array('type' => 'date', 'label' => 'Sellby', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Fk project', 'enabled' => 1, 'visible' => -1, 'position' => 100),
 	);
 
 
@@ -545,11 +546,11 @@ class MouvementStock extends CommonObject
 					} else {
 						$newpmp = $oldpmp;
 					}
-				} elseif ($type == 1 || $type == 2) {
-					// After a stock decrease, we don't change value of the AWP/PMP of a product.
-					$newpmp = $oldpmp;
 				} else {
-					// Type of movement unknown
+					// ($type == 1 || $type == 2)
+					//   -> After a stock decrease, we don't change value of the AWP/PMP of a product.
+					// else
+					//   Type of movement unknown
 					$newpmp = $oldpmp;
 				}
 			}
@@ -579,11 +580,11 @@ class MouvementStock extends CommonObject
 				if ($id_product_batch > 0) {
 					$result = $this->createBatch($id_product_batch, $qty);
 					if ($result == -2 && $fk_product_stock > 0) {	// The entry for this product batch does not exists anymore, bu we already have a llx_product_stock, so we recreate the batch entry in product_batch
-						$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
+						$param_batch = array('fk_product_stock' => $fk_product_stock, 'batchnumber' => $batch);
 						$result = $this->createBatch($param_batch, $qty);
 					}
 				} else {
-					$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
+					$param_batch = array('fk_product_stock' => $fk_product_stock, 'batchnumber' => $batch);
 					$result = $this->createBatch($param_batch, $qty);
 				}
 				if ($result < 0) {
@@ -1139,7 +1140,7 @@ class MouvementStock extends CommonObject
 		$label .= '<div width="100%">';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->id;
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' :  '<span class="stockmovementexit">') . $this->qty . '</span>';
+		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">') . $this->qty . '</span>';
 		$label .= '<br><b>'.$langs->trans('Qty').':</b> ' . $qtylabel;
 		if ($this->batch) {
 			$label .= '<br><b>'.$langs->trans('Batch').':</b> '.$this->batch;
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 234271ac2fb..18d40cdcc82 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -86,7 +87,7 @@ $search_user = trim(GETPOST("search_user"));
 $search_batch = trim(GETPOST("search_batch"));
 $search_qty = trim(GETPOST("search_qty"));
 $search_type_mouvement = GETPOSTINT('search_type_mouvement');
-$search_fk_project=GETPOSTINT("search_fk_project");
+$search_fk_project = GETPOSTINT("search_fk_project");
 
 $type = GETPOSTINT("type");
 
@@ -126,22 +127,22 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $arrayfields = array(
-	'm.rowid'=>array('label'=>"Ref", 'checked'=>1, 'position'=>1),
-	'm.datem'=>array('label'=>"Date", 'checked'=>1, 'position'=>2),
-	'p.ref'=>array('label'=>"ProductRef", 'checked'=>1, 'css'=>'maxwidth100', 'position'=>3),
-	'p.label'=>array('label'=>"ProductLabel", 'checked'=>0, 'position'=>5),
-	'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(isModEnabled('productbatch'))),
-	'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(isModEnabled('productbatch'))),
-	'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
-	'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
-	'm.fk_user_author'=>array('label'=>"Author", 'checked'=>0, 'position'=>120),
-	'm.inventorycode'=>array('label'=>"InventoryCodeShort", 'checked'=>1, 'position'=>130),
-	'm.label'=>array('label'=>"MovementLabel", 'checked'=>1, 'position'=>140),
-	'm.type_mouvement'=>array('label'=>"TypeMovement", 'checked'=>0, 'position'=>150),
-	'origin'=>array('label'=>"Origin", 'checked'=>1, 'position'=>155),
-	'm.fk_projet'=>array('label'=>'Project', 'checked'=>0, 'position'=>180),
-	'm.value'=>array('label'=>"Qty", 'checked'=>1, 'position'=>200),
-	'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210, 'enabled'=>(!getDolGlobalInt('STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE')))
+	'm.rowid' => array('label' => "Ref", 'checked' => 1, 'position' => 1),
+	'm.datem' => array('label' => "Date", 'checked' => 1, 'position' => 2),
+	'p.ref' => array('label' => "ProductRef", 'checked' => 1, 'css' => 'maxwidth100', 'position' => 3),
+	'p.label' => array('label' => "ProductLabel", 'checked' => 0, 'position' => 5),
+	'm.batch' => array('label' => "BatchNumberShort", 'checked' => 1, 'position' => 8, 'enabled' => (isModEnabled('productbatch'))),
+	'pl.eatby' => array('label' => "EatByDate", 'checked' => 0, 'position' => 9, 'enabled' => (isModEnabled('productbatch'))),
+	'pl.sellby' => array('label' => "SellByDate", 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
+	'e.ref' => array('label' => "Warehouse", 'checked' => 1, 'position' => 100, 'enabled' => (!($id > 0))), // If we are on specific warehouse, we hide it
+	'm.fk_user_author' => array('label' => "Author", 'checked' => 0, 'position' => 120),
+	'm.inventorycode' => array('label' => "InventoryCodeShort", 'checked' => 1, 'position' => 130),
+	'm.label' => array('label' => "MovementLabel", 'checked' => 1, 'position' => 140),
+	'm.type_mouvement' => array('label' => "TypeMovement", 'checked' => 0, 'position' => 150),
+	'origin' => array('label' => "Origin", 'checked' => 1, 'position' => 155),
+	'm.fk_projet' => array('label' => 'Project', 'checked' => 0, 'position' => 180),
+	'm.value' => array('label' => "Qty", 'checked' => 1, 'position' => 200),
+	'm.price' => array('label' => "UnitPurchaseValue", 'checked' => 0, 'position' => 210, 'enabled' => (!getDolGlobalInt('STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE')))
 	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
 );
@@ -1101,11 +1102,7 @@ if ($id > 0) {
 
 $newcardbutton = '';
 
-if ($id > 0) {
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
-} else {
-	print_barre_liste($title, $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)
 $topicmail = "SendStockMovement";
@@ -1130,7 +1127,7 @@ if ($search_all) {
 
 $moreforfilter = '';
 
-$parameters = array('arrayfields'=>&$arrayfields);
+$parameters = array('arrayfields' => &$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $warehouse, $action); // Note that $action and $warehouse may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
@@ -1272,7 +1269,7 @@ if (!empty($arrayfields['m.price']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $warehouse, $action); // Note that $action and $warehouse may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -1359,7 +1356,7 @@ if (!empty($arrayfields['m.price']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $warehouse, $action); // Note that $action and $warehouse may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['m.datec']['checked'])) {
@@ -1494,7 +1491,8 @@ while ($i < $imaxinloop) {
 		if (!empty($arrayfields['m.rowid']['checked'])) {
 			print '<td class="nowraponall">';
 			//print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
-			print $object->getNomUrl(1);;
+			print $object->getNomUrl(1);
+			;
 			print '</td>'; // This is primary not movement id
 		}
 		if (!empty($arrayfields['m.datem']['checked'])) {
@@ -1593,7 +1591,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -1632,7 +1630,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index ddeb182586f..1b030ac72f7 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2018 	   Ferran Marcet	    <fmarcet@2byte.es>
  * Copyright (C) 2019 	   Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2020	   Tobias Sean			<tobias.sekan@startmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -226,11 +227,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['p.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -238,12 +239,12 @@ foreach ($object->fields as $key => $val) {
 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'=>(!isModEnabled('societe') ? 0 : 1));
-$arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'checked'=>0, 'position'=>22);
-$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, 'enabled'=>(!getDolGlobalString('PROJECT_USE_OPPORTUNITIES') ? 0 : 1), 'position'=>106);
-$arrayfields['u.login'] = array('label'=>"Author", 'checked'=>-1, 'position'=>165);
+$arrayfields['s.nom'] = array('label' => $langs->trans("ThirdParty"), 'checked' => 1, 'position' => 21, 'enabled' => (!isModEnabled('societe') ? 0 : 1));
+$arrayfields['s.name_alias'] = array('label' => "AliasNameShort", 'checked' => 0, 'position' => 22);
+$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, 'enabled' => (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES') ? 0 : 1), 'position' => 106);
+$arrayfields['u.login'] = array('label' => "Author", 'checked' => -1, 'position' => 165);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
 	//$arrayfields['p.usage_opportunity']['visible'] = 1;	// Not require, filter on search_opp_status is enough
@@ -274,7 +275,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -395,11 +396,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			if ($nbok > 1) {
-				setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-			} else {
-				setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-			}
+			setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -495,7 +492,7 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 $sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as p";
-if (!empty($extrafields->attributes[$object->table_element]['label']) &&is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
@@ -1015,8 +1012,8 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'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"),
 );
@@ -1049,8 +1046,8 @@ if ($search_usage_event_organization == 1) {
 }
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewProject'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('projet', 'creer'));
 
@@ -1250,7 +1247,7 @@ if (!empty($arrayfields['p.datee']['checked'])) {
 // Visibility
 if (!empty($arrayfields['p.public']['checked'])) {
 	print '<td class="liste_titre center">';
-	$array = array(''=>'', 0 => $langs->trans("PrivateProject"), 1 => $langs->trans("SharedProject"));
+	$array = array('' => '', 0 => $langs->trans("PrivateProject"), 1 => $langs->trans("SharedProject"));
 	print $form->selectarray('search_public', $array, $search_public, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth75');
 	print '</td>';
 }
@@ -1334,7 +1331,7 @@ if (!empty($arrayfields['u.login']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Creation date
@@ -1489,7 +1486,7 @@ if (!empty($arrayfields['u.login']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1618,7 +1615,7 @@ while ($i < $imaxinloop) {
 		}
 
 		$selected = in_array($object->id, $arrayofselected);
-		$arrayofdata = array('assignedusers' => $stringassignedusers, 'thirdparty'=>$companystatic, 'selected' => $selected);
+		$arrayofdata = array('assignedusers' => $stringassignedusers, 'thirdparty' => $companystatic, 'selected' => $selected);
 
 		print $object->getKanbanView('', $arrayofdata);
 
@@ -1982,7 +1979,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -2065,7 +2062,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql' => $sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e55a8f4fd3d..4ddc831827a 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2021  Christophe Battarel		<christophe@altairis.fr>
  * Copyright (C) 2023      	Gauthier VERDOL       	<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -262,11 +263,7 @@ if ($action == 'addtimespent' && $user->hasRight('projet', 'time')) {
 			}
 		}
 	} else {
-		if (empty($id)) {
-			$action = 'createtime';
-		} else {
-			$action = 'createtime';
-		}
+		$action = 'createtime';
 	}
 }
 
@@ -1268,25 +1265,25 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 		// Definition of fields for list
 		$arrayfields = array();
-		$arrayfields['t.element_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
-		$arrayfields['p.fk_soc'] = array('label'=>$langs->trans("ThirdParty"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1','checked'=>1);
-		$arrayfields['s.name_alias'] = array('label'=>$langs->trans("AliasNameShort"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1');
+		$arrayfields['t.element_date'] = array('label' => $langs->trans("Date"), 'checked' => 1);
+		$arrayfields['p.fk_soc'] = array('label' => $langs->trans("ThirdParty"), 'type' => 'integer:Societe:/societe/class/societe.class.php:1','checked' => 1);
+		$arrayfields['s.name_alias'] = array('label' => $langs->trans("AliasNameShort"), 'type' => 'integer:Societe:/societe/class/societe.class.php:1');
 		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 			if (! empty($allprojectforuser)) {
 				$arrayfields['p.project_ref'] = ['label' => $langs->trans('RefProject'), 'checked' => 1];
 				$arrayfields['p.project_label'] = ['label' => $langs->trans('ProjectLabel'), 'checked' => 1];
 			}
-			$arrayfields['t.element_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
-			$arrayfields['t.element_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
+			$arrayfields['t.element_ref'] = array('label' => $langs->trans("RefTask"), 'checked' => 1);
+			$arrayfields['t.element_label'] = array('label' => $langs->trans("LabelTask"), 'checked' => 1);
 		}
 		$arrayfields['author'] = array('label' => $langs->trans("By"), 'checked' => 1);
 		$arrayfields['t.note'] = array('label' => $langs->trans("Note"), 'checked' => 1);
 		if (isModEnabled('service') && !empty($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
 			$arrayfields['t.fk_product'] = array('label' => $langs->trans("Product"), 'checked' => 1);
 		}
-		$arrayfields['t.element_duration'] = array('label'=>$langs->trans("Duration"), 'checked'=>1);
-		$arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>isModEnabled("salaries"));
-		$arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((getDolGlobalInt('PROJECT_HIDE_TASKS') || !getDolGlobalInt('PROJECT_BILL_TIME_SPENT')) ? 0 : 1) && $projectstatic->usage_bill_time));
+		$arrayfields['t.element_duration'] = array('label' => $langs->trans("Duration"), 'checked' => 1);
+		$arrayfields['value'] = array('label' => $langs->trans("Value"), 'checked' => 1, 'enabled' => isModEnabled("salaries"));
+		$arrayfields['valuebilled'] = array('label' => $langs->trans("Billed"), 'checked' => 1, 'enabled' => (((getDolGlobalInt('PROJECT_HIDE_TASKS') || !getDolGlobalInt('PROJECT_BILL_TIME_SPENT')) ? 0 : 1) && $projectstatic->usage_bill_time));
 		// Extra fields
 		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -1835,7 +1832,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if (isModEnabled("service") && !empty($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
 					print '<td class="nowraponall">';
 					print img_picto('', 'service');
-					print $form->select_produits((GETPOSTISSET('fk_product')?GETPOSTINT("fk_product"):''), 'fk_product', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 1, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth150', 0, '', null, 1);
+					print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOSTINT("fk_product") : ''), 'fk_product', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 1, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth150', 0, '', null, 1);
 					print '</td>';
 				}
 			}
@@ -2397,8 +2394,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 						if ($task_time->invoice_id) {
 							$result = $tmpinvoice->fetch($task_time->invoice_id);
 							if ($result > 0) {
-								if ($action=='editline' && $_GET['lineid'] == $task_time->rowid) {
-									print $formproject->selectInvoiceAndLine($task_time->invoice_id, $task_time->invoice_line_id, 'invoiceid', 'invoicelineid', 'maxwidth500', array('p.rowid'=>$projectstatic->id));
+								if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+									print $formproject->selectInvoiceAndLine($task_time->invoice_id, $task_time->invoice_line_id, 'invoiceid', 'invoicelineid', 'maxwidth500', array('p.rowid' => $projectstatic->id));
 								} else {
 									print $tmpinvoice->getNomUrl(1);
 									if (!empty($task_time->invoice_line_id)) {
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 4ed9d014e0d..6551eb35d36 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2023      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,9 +110,9 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'e.ref'=>"Ref",
-	's.nom'=>"ThirdParty",
-	'e.note_public'=>'NotePublic',
+	'e.ref' => "Ref",
+	's.nom' => "ThirdParty",
+	'e.note_public' => 'NotePublic',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["e.note_private"] = "NotePrivate";
@@ -119,19 +120,19 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'e.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
-	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>'getDolGlobalString("WORKFLOW_BILL_ON_RECEPTION") !== "0"')
+	'e.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	'e.ref_supplier' => array('label' => $langs->trans("RefSupplier"), 'checked' => 1),
+	's.nom' => array('label' => $langs->trans("ThirdParty"), 'checked' => 1),
+	's.town' => array('label' => $langs->trans("Town"), 'checked' => 1),
+	's.zip' => array('label' => $langs->trans("Zip"), 'checked' => 1),
+	'state.nom' => array('label' => $langs->trans("StateShort"), 'checked' => 0),
+	'country.code_iso' => array('label' => $langs->trans("Country"), 'checked' => 0),
+	'typent.code' => array('label' => $langs->trans("ThirdPartyType"), 'checked' => $checkedtypetiers),
+	'e.date_delivery' => array('label' => $langs->trans("DateDeliveryPlanned"), 'checked' => 1),
+	'e.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'e.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),
+	'e.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
+	'e.billed' => array('label' => $langs->trans("Billed"), 'checked' => 1, 'position' => 1000, 'enabled' => 'getDolGlobalString("WORKFLOW_BILL_ON_RECEPTION") !== "0"')
 );
 
 // Extra fields
@@ -162,7 +163,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -225,7 +226,7 @@ if (empty($reshook)) {
 		$TFactThirdNbLines = array();
 
 		$nb_bills_created = 0;
-		$lastid= 0;
+		$lastid = 0;
 		$lastref = '';
 
 		$db->begin();
@@ -459,7 +460,7 @@ if (empty($reshook)) {
 								$array_options = $lines[$i]->array_options;
 							}
 
-							$objecttmp->context['createfromclone'];
+							$objecttmp->context['createfromclone'] = 'createfromclone';
 
 							$rang = $i;
 							//there may already be rows from previous receptions
@@ -537,7 +538,7 @@ if (empty($reshook)) {
 
 				$id = $objecttmp->id; // For builddoc action
 				$lastref = $objecttmp->ref; // generated ref
-				$object  =$objecttmp;
+				$object  = $objecttmp;
 
 				// Fac builddoc
 				$donotredirect = 1;
@@ -868,8 +869,8 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 // if (!empty($socid)) $url .= '&socid='.$socid;
 // $newcardbutton = dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', $url, '', $user->rights->expedition->creer);
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewReception'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/reception/card.php?action=create2', '', $user->hasRight('reception', 'creer'));
 
@@ -943,7 +944,7 @@ $moreforfilter = '';
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters = array('type'=>$type);
+	$parameters = array('type' => $type);
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '</div>';
@@ -1037,7 +1038,7 @@ if (!empty($arrayfields['l.date_delivery']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -1059,7 +1060,7 @@ if (!empty($arrayfields['e.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['e.fk_statut']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_status', array('0' => $langs->trans('StatusReceptionDraftShort'), '1' => $langs->trans('StatusReceptionValidatedShort'), '2' => $langs->trans('StatusReceptionProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Status billed
@@ -1135,7 +1136,7 @@ if (!empty($arrayfields['l.date_delivery']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, '$totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, '$totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['e.datec']['checked'])) {
@@ -1351,7 +1352,7 @@ while ($i < $imaxinloop) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -1423,7 +1424,7 @@ if ($num == 0) {
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
-$parameters = array('arrayfields'=>$arrayfields, 'totalarray' => $totalarray, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'totalarray' => $totalarray, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 118dca102bf..2885555b01a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -20,6 +20,7 @@
  * Copyright (C) 2022		ButterflyOfFire         <butterflyoffire+dolibarr@protonmail.com>
  * Copyright (C) 2023       Alexandre Janniaux      <alexandre.janniaux@gmail.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -328,21 +329,21 @@ class Societe extends CommonObject
 
 	/**
 	 * @var string State code
-	 * @deprecated Use state_code instead
+	 * @deprecated Use $state_code instead
 	 * @see $state_code
 	 */
 	public $departement_code;
 
 	/**
 	 * @var string
-	 * @deprecated Use state instead
+	 * @deprecated Use $state instead
 	 * @see $state
 	 */
 	public $departement;
 
 	/**
 	 * @var string
-	 * @deprecated Use country instead
+	 * @deprecated Use $country instead
 	 * @see $country
 	 */
 	public $pays;
@@ -425,7 +426,7 @@ class Societe extends CommonObject
 
 	/**
 	 * @var string Professional ID 1
-	 * @deprecated
+	 * @deprecated Use $idprof1 instead
 	 * @see $idprof1
 	 */
 	public $siren;
@@ -439,7 +440,7 @@ class Societe extends CommonObject
 
 	/**
 	 * @var string Professional ID 2
-	 * @deprecated
+	 * @deprecated Use $idprof2 instead
 	 * @see $idprof2
 	 */
 	public $siret;
@@ -452,7 +453,7 @@ class Societe extends CommonObject
 
 	/**
 	 * @var string Professional ID 3
-	 * @deprecated
+	 * @deprecated Use $idprof3 instead
 	 * @see $idprof3
 	 */
 	public $ape;
@@ -638,7 +639,7 @@ class Societe extends CommonObject
 	/**
 	 * Duplicate of code_compta_client (for backward compatibility)
 	 * @var string
-	 * @deprecated
+	 * @deprecated  Use $code_compta_client
 	 * @see $code_compta_client
 	 */
 	public $code_compta;
@@ -662,14 +663,14 @@ class Societe extends CommonObject
 	public $accountancy_code_supplier;
 
 	/**
-	 * Accounting code for product (for level 3 of suggestion of prouct accounting account)
+	 * Accounting code for product (for level 3 of suggestion of product accounting account)
 	 * @var string
 	 */
 	public $code_compta_product;
 
 	/**
 	 * @var string
-	 * @deprecated Note is split in public and private notes
+	 * @deprecated Use $note_public, $note_private - Note is split in public and private notes
 	 * @see $note_public, $note_private
 	 */
 	public $note;
@@ -2247,7 +2248,7 @@ class Societe extends CommonObject
 	 *  Define third party as a customer
 	 *
 	 *	@return		int		Return integer <0 if KO, >0 if OK
-	 *  @deprecated
+	 *  @deprecated Use setAsCustomer() instead
 	 *  @see setAsCustomer()
 	 */
 	public function set_as_client()
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 16597f8cf8c..5370e41ef85 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2019-2021	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2019-2020  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2023		Charlene Benke		<charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -143,11 +144,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -267,11 +268,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				if ($nbok > 1) {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				} else {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				}
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -313,11 +310,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				if ($nbok > 1) {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				} else {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				}
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -763,8 +756,8 @@ if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewTicket'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('ticket', 'write'));
 
@@ -942,7 +935,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -984,7 +977,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1200,7 +1193,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -1243,7 +1236,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index cb40dba7c17..a5d146dc282 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,15 +103,15 @@ $form = new Form($db);
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'u.login'=>"Login",
-	'u.lastname'=>"Lastname",
-	'u.firstname'=>"Firstname",
-	'u.accountancy_code'=>"AccountancyCode",
-	'u.office_phone'=>"PhonePro",
-	'u.user_mobile'=>"PhoneMobile",
-	'u.email'=>"EMail",
-	'u.note_public'=>"NotePublic",
-	'u.note_private'=>"NotePrivate"
+	'u.login' => "Login",
+	'u.lastname' => "Lastname",
+	'u.firstname' => "Firstname",
+	'u.accountancy_code' => "AccountancyCode",
+	'u.office_phone' => "PhonePro",
+	'u.user_mobile' => "PhoneMobile",
+	'u.email' => "EMail",
+	'u.note_public' => "NotePublic",
+	'u.note_private' => "NotePrivate"
 );
 if (isModEnabled('api')) {
 	$fieldstosearchall['u.api_key'] = "ApiKey";
@@ -121,29 +122,29 @@ $permissiontowritehr = $user->hasRight('hrm', 'write_personal_information', 'wri
 
 // Definition of fields for list
 $arrayfields = array(
-	'u.rowid'=>array('label'=>"TechnicalID", 'checked'=>-1, 'position'=>5),
-	'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10),
-	'u.lastname'=>array('label'=>"Lastname", 'checked'=>1, 'position'=>15),
-	'u.firstname'=>array('label'=>"Firstname", 'checked'=>1, 'position'=>20),
-	'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled('multicompany') && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE'))),
-	'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
-	'u.employee'=>array('label'=>"Employee", 'checked'=>($contextpage == 'employeelist' ? 1 : 0), 'position'=>25),
-	'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27, 'csslist'=>'maxwidth150'),
-	'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30),
-	'u.office_phone'=>array('label'=>"PhonePro", 'checked'=>1, 'position'=>31),
-	'u.user_mobile'=>array('label'=>"PhoneMobile", 'checked'=>1, 'position'=>32),
-	'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
-	'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>(isModEnabled('api') && $user->admin)),
-	'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
-	'u.ref_employee'=>array('label'=>"RefEmployee", 'checked'=>-1, 'position'=>60, 'enabled'=>(isModEnabled('hrm') && $permissiontoreadhr)),
-	'u.national_registration_number'=>array('label'=>"NationalRegistrationNumber", 'checked'=>-1, 'position'=>61, 'enabled'=>(isModEnabled('hrm') && $permissiontoreadhr)),
-	'u.job'=>array('label'=>"PostOrFunction", 'checked'=>-1, 'position'=>50),
-	'u.salary'=>array('label'=>"Salary", 'checked'=>-1, 'position'=>80, 'enabled'=>(isModEnabled('salaries') && $user->hasRight("salaries", "readall")), 'isameasure'=>1),
-	'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
-	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
-	'u.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'u.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'u.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+	'u.rowid' => array('label' => "TechnicalID", 'checked' => -1, 'position' => 5),
+	'u.login' => array('label' => "Login", 'checked' => 1, 'position' => 10),
+	'u.lastname' => array('label' => "Lastname", 'checked' => 1, 'position' => 15),
+	'u.firstname' => array('label' => "Firstname", 'checked' => 1, 'position' => 20),
+	'u.entity' => array('label' => "Entity", 'checked' => 1, 'position' => 50, 'enabled' => (isModEnabled('multicompany') && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE'))),
+	'u.gender' => array('label' => "Gender", 'checked' => 0, 'position' => 22),
+	'u.employee' => array('label' => "Employee", 'checked' => ($contextpage == 'employeelist' ? 1 : 0), 'position' => 25),
+	'u.fk_user' => array('label' => "HierarchicalResponsible", 'checked' => 1, 'position' => 27, 'csslist' => 'maxwidth150'),
+	'u.accountancy_code' => array('label' => "AccountancyCode", 'checked' => 0, 'position' => 30),
+	'u.office_phone' => array('label' => "PhonePro", 'checked' => 1, 'position' => 31),
+	'u.user_mobile' => array('label' => "PhoneMobile", 'checked' => 1, 'position' => 32),
+	'u.email' => array('label' => "EMail", 'checked' => 1, 'position' => 35),
+	'u.api_key' => array('label' => "ApiKey", 'checked' => 0, 'position' => 40, "enabled" => (isModEnabled('api') && $user->admin)),
+	'u.fk_soc' => array('label' => "Company", 'checked' => ($contextpage == 'employeelist' ? 0 : 1), 'position' => 45),
+	'u.ref_employee' => array('label' => "RefEmployee", 'checked' => -1, 'position' => 60, 'enabled' => (isModEnabled('hrm') && $permissiontoreadhr)),
+	'u.national_registration_number' => array('label' => "NationalRegistrationNumber", 'checked' => -1, 'position' => 61, 'enabled' => (isModEnabled('hrm') && $permissiontoreadhr)),
+	'u.job' => array('label' => "PostOrFunction", 'checked' => -1, 'position' => 50),
+	'u.salary' => array('label' => "Salary", 'checked' => -1, 'position' => 80, 'enabled' => (isModEnabled('salaries') && $user->hasRight("salaries", "readall")), 'isameasure' => 1),
+	'u.datelastlogin' => array('label' => "LastConnexion", 'checked' => 1, 'position' => 100),
+	'u.datepreviouslogin' => array('label' => "PreviousConnexion", 'checked' => 0, 'position' => 110),
+	'u.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'u.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	'u.statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -332,11 +333,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				if ($nbok > 1) {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				} else {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				}
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -657,9 +654,9 @@ if (!empty($socid)) {
 }
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('HierarchicView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php?mode=hierarchy'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', (($mode == 'hierarchy') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('HierarchicView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php?mode=hierarchy'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', (($mode == 'hierarchy') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
@@ -762,7 +759,7 @@ if (!empty($arrayfields['u.firstname']['checked'])) {
 }
 if (!empty($arrayfields['u.gender']['checked'])) {
 	print '<td class="liste_titre center">';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+	$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
@@ -819,7 +816,7 @@ if (!empty($arrayfields['u.datepreviouslogin']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['u.datec']['checked'])) {
@@ -835,7 +832,7 @@ if (!empty($arrayfields['u.tms']['checked'])) {
 if (!empty($arrayfields['u.statut']['checked'])) {
 	// Status
 	print '<td class="liste_titre center parentonrightofpage">';
-	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_statut', array('-1' => '', '0' => $langs->trans('Disabled'), '1' => $langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column
@@ -940,7 +937,7 @@ if (!empty($arrayfields['u.datepreviouslogin']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['u.datec']['checked'])) {
@@ -978,7 +975,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // --------------------------------------------------------------------
 $i = 0;
 $savnbfield = $totalarray['nbfield'];
-$totalarray = array('val'=>array('u.salary'=>0));
+$totalarray = array('val' => array('u.salary' => 0));
 $totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
@@ -1309,7 +1306,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$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;
 		// Date creation
@@ -1376,7 +1373,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d7d47bde917..b7fb7ec2c6b 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -2059,7 +2059,7 @@ class Website extends CommonObject
 			$linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/';
 		}
 
-		if ($countNumPage >= 2) {
+		if (isset($linefound[1])) {
 			$maxLines = max(count($lines1), count($lines2));
 			for ($lineNum = 0; $lineNum < $maxLines; $lineNum++) {
 				$lineContent1 = $lines1[$lineNum] ?? '';

From 01b2e4a62c16bf55de9d58ee9bf7f96e9e7efd6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:07:02 +0100
Subject: [PATCH 0265/1862] fix phpstan (#28480)

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

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index adda77c0fad..5008cfc093b 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -834,7 +834,7 @@ class FormOther
 	 *  @deprecated Use instead selectColor
 	 *  @see selectColor()
 	 */
-	public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
+	public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = [])
 	{
 		// phpcs:enable
 		print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
@@ -854,7 +854,7 @@ class FormOther
 	 *  @return	string
 	 *  @see showColor()
 	 */
-	public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = array(), $morecss = '', $setpropertyonselect = '', $default = '')
+	public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = [], $morecss = '', $setpropertyonselect = '', $default = '')
 	{
 		// Deprecation warning
 		if ($form_name) {

From 0b2ce5c2aeee8a04d36ce01866d63441b966fe25 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:07:46 +0100
Subject: [PATCH 0266/1862] Fix: author email (#28479)

---
 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 216472484e0..1619f147c3b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -22,7 +22,7 @@
  * Copyright (C) 2022       Charlene Benke           	<charlene@patas-monkey.com>
  * Copyright (C) 2023       Joachim Kueter              <git-jk@bloxera.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Lenin Rivas					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		Lenin Rivas					<lenin.rivas777@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 1738347d2003531b55666b2ee38ea74f52375ab8 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 16:09:19 +0100
Subject: [PATCH 0267/1862] FIX type of paiementCode by casting with string
 (#28477)

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

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index ee34766b45c..74221f0e178 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1496,7 +1496,7 @@ class Invoices extends DolibarrApi
 		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
 		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paymentobj->paiementid = $paymentid;
-		$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
+		$paymentobj->paiementcode = (string) dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
 		$paymentobj->num_payment = $num_payment;
 		$paymentobj->note_private = $comment;
 

From 00385af6f0a1d5215dcc50b84dd0747a658eae2c Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 16:12:47 +0100
Subject: [PATCH 0268/1862] FIX type of multicurrency_amount (#28476)

---
 htdocs/compta/facture/class/api_invoices.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 74221f0e178..61258a62655 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1494,7 +1494,11 @@ class Invoices extends DolibarrApi
 		$paymentobj = new Paiement($this->db);
 		$paymentobj->datepaye     = $datepaye;
 		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$multicurrencyAmountsConverted = [];
+		foreach ($multicurrency_amounts as $key => $value) {
+			$multicurrencyAmountsConverted[$key] = (float) $value;
+		}
+		$paymentobj->multicurrency_amounts = $multicurrencyAmountsConverted; // Array with all payments dispatching
 		$paymentobj->paiementid = $paymentid;
 		$paymentobj->paiementcode = (string) dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
 		$paymentobj->num_payment = $num_payment;

From d4ced85527c138b6c935cc97f75d2ae0b6655c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:19:38 +0100
Subject: [PATCH 0269/1862] fix phpstan (#28473)

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

diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 0c58136a322..020d01fd626 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -75,7 +75,7 @@ class FormProjets extends Form
 	 * @param int 		$nooutput 		No print output. Return it only.
 	 * @param int 		$forceaddid 	Force to add project id in list, event if not qualified
 	 * @param string 	$morecss 		More css
-	 * @param int 		$htmlid 		Html id to use instead of htmlname
+	 * @param string	$htmlid 		Html id to use instead of htmlname, by example id="htmlid"
 	 * @param string 	$morefilter 	More filters (Must be a sql sanitized string)
 	 * @return string                   Return html content
 	 */

From 0f3009d8214d127d99dad037e81c7e0efaebb66f Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 16:20:06 +0100
Subject: [PATCH 0270/1862] Fix type of variable in Deplacement class (#28472)

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

diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index e101aab8317..8a91ee9b50a 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -88,7 +88,7 @@ class Deplacement extends CommonObject
 	public $fk_user;
 
 	/**
-	 * @var string km value formatted
+	 * @var float km value formatted
 	 */
 	public $km;
 

From c0cd4e1aaafaee77dc71483d273a4407d013417c Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 16:52:30 +0100
Subject: [PATCH 0271/1862] Fix return method by adding type int (#28493)

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index ab1fa81adc1..e782e83f662 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1688,7 +1688,7 @@ class CMailFile
 	 * @param	array	$mimetype_list		Tableau
 	 * @param 	array	$mimefilename_list	Tableau
 	 * @param	array	$cidlist			Array of CID if file must be completed with CID code
-	 * @return	string						String with files encoded
+	 * @return	string|int						String with files encoded
 	 */
 	private function write_files($filename_list, $mimetype_list, $mimefilename_list, $cidlist)
 	{

From 0033429991930e20adf5a6d882f8ae7defc531d4 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 16:54:03 +0100
Subject: [PATCH 0272/1862] Fix type of ref in tva card (#28492)

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

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index a77c5979c9d..47669898244 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -330,7 +330,7 @@ if (empty($reshook)) {
 
 		if ($object->id > 0) {
 			$object->id = 0;
-			$object->ref = null;
+			$object->ref = '';
 			$object->paye = 0;
 
 			if (GETPOST('amount', 'alphanohtml')) {

From ccb562cc0b406dc3e3ae5d90ce0e0707753081a4 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 16:55:11 +0100
Subject: [PATCH 0273/1862] FIX type of variable does not accept null (#28490)

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

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index c3fdb7f1296..1c503429393 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -259,7 +259,8 @@ if (empty($reshook)) {
 		$originalId = $object->id;
 
 		if ($object->id > 0) {
-			$object->id = $object->ref = null;
+			$object->id = 0;
+			$object->ref = '';
 			$object->paye = 0;
 			if (GETPOST('amount', 'alphanohtml')) {
 				$object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);

From cec3a6c8e88c2d724a85c9bfc82b3e9fa0628421 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 28 Feb 2024 17:03:53 +0100
Subject: [PATCH 0274/1862] Qual: Add AbstractRestApiTest class, refactor
 RestApiUserTest, add RestApiMosTest (#28484)

* New: AbstractRestAPITest class

* Qual: Create RestAPIMosTest
---
 dev/setup/phpunit/PHPUNIT.BAT        |  13 +-
 test/phpunit/AbstractRestAPITest.php | 107 +++++++++++++++++
 test/phpunit/RestAPIMosTest.php      | 173 +++++++++++++++++++++++++++
 test/phpunit/RestAPIUserTest.php     |  74 +-----------
 4 files changed, 287 insertions(+), 80 deletions(-)
 create mode 100644 test/phpunit/AbstractRestAPITest.php
 create mode 100644 test/phpunit/RestAPIMosTest.php

diff --git a/dev/setup/phpunit/PHPUNIT.BAT b/dev/setup/phpunit/PHPUNIT.BAT
index b931a081528..cd36711f8b0 100644
--- a/dev/setup/phpunit/PHPUNIT.BAT
+++ b/dev/setup/phpunit/PHPUNIT.BAT
@@ -1,9 +1,4 @@
-@ECHO OFF
-REM SAMPLE WINDOWS SCRIPT TO START TESTS
-REM
-REM CURRENTLY THIS SCRIPT MUST BE LOCATED AT THE ROOT OF THE PROJECT.
-REM A copy of phpunit-9.5.phar is required
-
+REM @ECHO OFF
 
 SET OPEN_BASEDIR=%~dp0
 SET DD_TRACE_CLI_ENABLED=1
@@ -17,8 +12,10 @@ REM
 REM The DOMAIN/Port value should be the same as in htdocs/conf/conf.php
 REM (This is only needed if did not set up another server locally
 REM  for your test installation database).
-SET PHPSERVER_DOMAIN_PORT=127.0.0.1:80
+SET PHPSERVER_DOMAIN_PORT=127.0.0.1:8080
 SET PHPSERVER_LOG=%~dp0/php_serv.log
+
+echo if (class_exists('PHPUnit\Framework\TestSuite')) { $dolibarr_main_url_root='http://%PHPSERVER_DOMAIN_PORT%'; } >> %~dp0\htdocs\conf\conf.php
 GOTO :START
 
 REM The error handler
@@ -37,7 +34,7 @@ for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV
 
 :FOUND_PID
 echo "Server PID: %php_pid%"
-curl "http://%PHPSERVER_DOMAIN_PORT%"
+REM curl "http://%PHPSERVER_DOMAIN_PORT%"
 
 
 SET MEMOPT=-d memory-limit=-1
diff --git a/test/phpunit/AbstractRestAPITest.php b/test/phpunit/AbstractRestAPITest.php
new file mode 100644
index 00000000000..fa1cb867283
--- /dev/null
+++ b/test/phpunit/AbstractRestAPITest.php
@@ -0,0 +1,107 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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/
+ */
+
+/**
+ *      \file       test/phpunit/AbstractRestAPITest.php
+ *      \ingroup    test
+ *      \brief      Abstract Class for Rest API Tests
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
+require_once dirname(__FILE__).'/CommonClassTest.class.php';
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+$conf->global->MAIN_UMASK = '0666';
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+abstract class AbstractRestAPITest extends CommonClassTest
+{
+	protected $api_url;
+	protected $api_key;
+
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		self::assertTrue(isModEnabled('api'), " module api must be enabled.");
+	}
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		global $conf,$user,$langs,$db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
+		$addheaders = array('Content-Type: application/json', 'Accept: application/json');
+
+		$method = get_called_class()."::".__FUNCTION__;
+		$test = "API Test Setup - ";
+		$login = 'admin';
+		$password = 'admin';
+		$url = $this->api_url.'/login?login='.$login.'&password='.$password;
+		// Call the API login method to save api_key for this test class.
+		// At first call, if token is not defined a random value is generated and returned.
+		$result = getURLContent($url, 'GET', '', 1, $addheaders, array('http', 'https'), 2);
+		print "$method result = ".var_export($result, true)."\n";
+		print "$method curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals('', $result['curl_error_no'], "$test Should not have a curl error");
+		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+
+		$this->assertNotNull($object, "$test Parsing of JSON result must not be null");
+		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), "$test Error".(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
+		$this->assertEquals('200', $object['success']['code']);
+
+		$this->api_key = $object['success']['token'];
+
+		print "$method api_key: $this->api_key \n";
+	}
+}
diff --git a/test/phpunit/RestAPIMosTest.php b/test/phpunit/RestAPIMosTest.php
new file mode 100644
index 00000000000..d16640fffd3
--- /dev/null
+++ b/test/phpunit/RestAPIMosTest.php
@@ -0,0 +1,173 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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/
+ */
+
+/**
+ *      \file       test/phpunit/RestAPIUserTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+require_once __DIR__."/AbstractRestAPITest.php";
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class RestAPIMosTest extends AbstractRestAPITest
+{
+	/**
+	 *
+	 * @param string		$endpoint 	Endpoint - "user/id"
+	 * @param string		$test_title	Text to be added to output
+	 * @param 'POST'|'GET'	$method		Call Method
+	 * @param mixed			$data		Data that will be JSON encoded
+	 * @param int			$expected_error	Expected error code
+	 *
+	 * @return mixed	Decodes JSON value returned by the service
+	 *
+	 */
+	private function getUrl($endpoint, $test_title = "", $method = "GET", $data = null, $expected_error = 0)
+	{
+
+		// Encode parameters in JSON body when POST, as URL query key/values otherwise.
+		$params = '';
+		$body = null;
+		if ($method === 'POST') {
+			$body = json_encode($data);
+		} elseif (!empty($data)) {
+			$params = '?'.http_build_query($data);
+		}
+
+
+		$addheaders = array(
+		'Content-Type: application/json','Accept: application/json', "DOLAPIKEY: {$this->api_key}");
+
+		// $url = $this->api_url.'/'.$endpoint.'?'.http_build_query(['api_key'=>$this->api_key]);
+		//
+		$url = $this->api_url.'/'.$endpoint.$params;
+
+		// getURLContent($url, $postorget, $param, $followlocation, $addheaders, $allowedschemes, $localurl, $ssl_verifypeer)
+
+		$result = getURLContent($url, $method, $body, 1, $addheaders, array('http', 'https'), 2);
+
+		$this->assertEquals('', $result['curl_error_no'], "{$test_title}Should not have a curl error");
+
+		$object = json_decode($result['content'], true);
+
+		$dbg_info = PHP_EOL.json_encode($result, JSON_PRETTY_PRINT);
+
+		$this->assertNotNull($object, "{$test_title}Parsing of JSON result must not be null$dbg_info");
+
+		$result['content'] = $object;
+		$dbg_info = PHP_EOL.json_encode($result, JSON_PRETTY_PRINT);
+
+		$this->assertEquals($expected_error, (empty($object['error']['code']) ? 0 : $object['error']['code']), "{$test_title}Error code is not $expected_error$dbg_info");
+
+		return $result;
+	}
+
+	/**
+	 * testRestMoCreate
+	 *
+	 * @return int
+	 */
+	public function testRestMoCreate()
+	{
+
+		$test = "Create MO ";
+		$data = [
+			'ref' => 'Try1',
+			'mrptype' => 0,
+			'fk_product' => 1,
+			'qty' => 1,
+			'status' => 1, // 0=Draft,1=Validated,2=InProgress,3=Produced,9=Canceled
+		];
+		$result = $this->getUrl('mos', $test, 'POST', $data);
+
+		print json_encode($result, JSON_PRETTY_PRINT);
+		$this->assertTrue(is_int($result['content']), "$test Result data is expected to be integer");
+
+		/// return $object['id'];
+		return $result['content'];
+	}
+
+
+	/**
+	 * testRestMoProduceAndConsumete
+	 *
+	 * @depends testRestMoCreate
+	 *
+	 * @param int $mos_id Id of MO that was created
+	 * @return void
+	 */
+	public function testRestMoList($mos_id)
+	{
+
+		$test = "Produce MO ";
+
+		//$data = ['ref' => 'Try1', 'mrptype' => 0, 'fk_product' => 1, 'qty' => 1, 'status' => 0,  ];
+		$data = null;
+		$result = $this->getUrl("mos", $test, 'GET', ['sortfield' => 't.rowid', 'sortorder' => 'DESC', 'limit' => 100]);
+
+		// print json_encode($result, JSON_PRETTY_PRINT);
+
+		$this->assertEquals($mos_id, $result['content'][0]['id'] ?? null, "{$test}First item in reversed list should be new item");
+	}
+
+	/**
+	 * testRestMoProduceAndConsume
+	 *
+	 * @depends testRestMoCreate
+	 *
+	 * @param int $mos_id Id of MO that was created
+	 * @return int
+	 */
+	public function testRestMoProduceAndConsume($mos_id)
+	{
+
+		$test = "Produce and Consume MO ";
+
+		$mos_state_id = 1; // $depends;
+
+
+
+		$data
+			= [
+		 "inventorylabel" => "Produce and consume using API",
+		 "inventorycode" => "PRODUCEAPI-YY-MM-DD",
+		 "autoclose" => 1,
+		 "arraytoconsume" => [],
+		 "arraytoproduce" => [$mod_id] ];
+
+		$result = $this->getUrl("mos/{$mos_state_id}/produceandconsume", $test, 'POST', $data);
+
+		print json_encode($result, JSON_PRETTY_PRINT);
+		$this->assertTrue(is_int($result['content']), "{$test}Result data is expected to be integer");
+
+		/// return $object['id'];
+		return $result['content'];
+	}
+}
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 851a26abec4..1d95870abc9 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -25,22 +25,10 @@
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
-require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
-require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
-require_once dirname(__FILE__).'/CommonClassTest.class.php';
-
-if (empty($user->id)) {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
-}
-$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
-$conf->global->MAIN_UMASK = '0666';
 
+require_once __DIR__."/AbstractRestAPITest.php";
 
 /**
  * Class for PHPUnit tests
@@ -49,66 +37,8 @@ $conf->global->MAIN_UMASK = '0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class RestAPIUserTest extends CommonClassTest
+class RestAPIUserTest extends AbstractRestAPITest
 {
-	protected $api_url;
-	protected $api_key;
-
-	/**
-	 * setUpBeforeClass
-	 *
-	 * @return void
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		global $conf,$user,$langs,$db;
-		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
-
-		if (!isModEnabled('api')) {
-			print __METHOD__." module api must be enabled.\n";
-			die(1);
-		}
-
-		print __METHOD__."\n";
-	}
-
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return  void
-	*/
-	protected function setUp(): void
-	{
-		global $conf,$user,$langs,$db;
-		$conf = $this->savconf;
-		$user = $this->savuser;
-		$langs = $this->savlangs;
-		$db = $this->savdb;
-
-		$this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
-
-		$test = "API Test Setup - ";
-		$login = 'admin';
-		$password = 'admin';
-		$url = $this->api_url.'/login?login='.$login.'&password='.$password;
-		// Call the API login method to save api_key for this test class.
-		// At first call, if token is not defined a random value is generated and returned.
-		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-		print __METHOD__." result = ".var_export($result, true)."\n";
-		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-		$this->assertEquals('', $result['curl_error_no'], "$test Should not have a curl error");
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
-
-		$this->assertNotNull($object, "$test Parsing of JSON result must not be null");
-		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), "$test Error".(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
-		$this->assertEquals('200', $object['success']['code']);
-
-		$this->api_key = $object['success']['token'];
-
-		print __METHOD__." api_key: $this->api_key \n";
-	}
-
-
 	/**
 	 * testRestGetUser
 	 *

From a1462d6f29d61e9ad937f95519040c263d1f007a Mon Sep 17 00:00:00 2001
From: Mohamed DAOUD <daoud.mouhamed@gmail.com>
Date: Wed, 28 Feb 2024 18:40:53 +0100
Subject: [PATCH 0275/1862] Fix GETPOST to GETPOSTINT issue (#28506)

* Fix GETPOST to GETPOSTINT issue

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/product/list.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 387e4a43b53..214802925b8 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -90,19 +90,19 @@ $catid = GETPOSTINT('catid');
 if (!empty($catid) && empty($searchCategoryProductList)) {
 	$searchCategoryProductList = array($catid);
 }
-$search_tosell = GETPOSTINT("search_tosell");
-$search_tobuy = GETPOSTINT("search_tobuy");
+$search_tosell = GETPOST("search_tosell");
+$search_tobuy = GETPOST("search_tobuy");
 $search_country = GETPOSTINT("search_country");
 $search_state = GETPOSTINT("state_id");
 $fourn_id = GETPOSTINT("fourn_id");
-$search_tobatch = GETPOSTINT("search_tobatch");
+$search_tobatch = GETPOST("search_tobatch");
 $search_accountancy_code_sell = GETPOST("search_accountancy_code_sell", 'alpha');
 $search_accountancy_code_sell_intra = GETPOST("search_accountancy_code_sell_intra", 'alpha');
 $search_accountancy_code_sell_export = GETPOST("search_accountancy_code_sell_export", 'alpha');
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy", 'alpha');
 $search_accountancy_code_buy_intra = GETPOST("search_accountancy_code_buy_intra", 'alpha');
 $search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_export", 'alpha');
-$search_finished = GETPOSTINT("search_finished");
+$search_finished = GETPOST("search_finished");
 $search_units = GETPOSTINT('search_units');
 $optioncss = GETPOST('optioncss', 'alpha');
 $type = GETPOSTINT("type");

From a0c4af79293bbca41233f5ae7eba7cb417635e8c Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 18:52:05 +0100
Subject: [PATCH 0276/1862] Fix amount type in api_invoices (#28475)

* Fix amount type in api_invoices

* Update api_invoices.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .../compta/facture/class/api_invoices.class.php  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 61258a62655..2c4995989e1 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1478,27 +1478,23 @@ class Invoices extends DolibarrApi
 		// Clean parameters amount if payment is for a credit note
 		if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
 			$resteapayer = price2num($resteapayer, 'MT');
-			$amounts[$id] = price2num(-1 * $resteapayer, 'MT');
+			$amounts[$id] = (float) price2num(-1 * $resteapayer, 'MT');
 			// Multicurrency
 			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-			$multicurrency_amounts[$id] = price2num(-1 * $newvalue, 'MT');
+			$multicurrency_amounts[$id] = (float) price2num(-1 * $newvalue, 'MT');
 		} else {
 			$resteapayer = price2num($resteapayer, 'MT');
-			$amounts[$id] = $resteapayer;
+			$amounts[$id] = (float) $resteapayer;
 			// Multicurrency
 			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-			$multicurrency_amounts[$id] = $newvalue;
+			$multicurrency_amounts[$id] = (float) $newvalue;
 		}
 
 		// Creation of payment line
 		$paymentobj = new Paiement($this->db);
 		$paymentobj->datepaye     = $datepaye;
-		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$multicurrencyAmountsConverted = [];
-		foreach ($multicurrency_amounts as $key => $value) {
-			$multicurrencyAmountsConverted[$key] = (float) $value;
-		}
-		$paymentobj->multicurrency_amounts = $multicurrencyAmountsConverted; // Array with all payments dispatching
+		$paymentobj->amounts      = $amounts;
+		$paymentobj->multicurrency_amounts = $multicurrency_amounts;
 		$paymentobj->paiementid = $paymentid;
 		$paymentobj->paiementcode = (string) dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
 		$paymentobj->num_payment = $num_payment;

From d59e3e5bc8da8252bee5d8102f2e7bca21f51638 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Wed, 28 Feb 2024 18:54:41 +0100
Subject: [PATCH 0277/1862] FIX subscription must be editable when accounting
 isn't reconciled (#28469)

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

diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index a9446083faf..c258485760b 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -358,7 +358,7 @@ if ($rowid && $action != 'edit') {
 	print '<div class="tabsAction">';
 
 	if ($user->hasRight('adherent', 'cotisation', 'creer')) {
-		if (!empty($bankline->rappro) || empty($bankline)) {
+		if (empty($bankline->rappro) || empty($bankline)) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify")."</a></div>";
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.$langs->trans("BankLineConciliated").'" href="#">'.$langs->trans("Modify")."</a></div>";

From 7c36864ff9ea86eba1fe616d606cf070f2b2ab42 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:03:26 +0100
Subject: [PATCH 0278/1862] FIX saveFile by adding null in return (#28508)

* FIX saveFile by adding null in return

* Update html_generic.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/modules/dons/html_generic.modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/dons/html_generic.modules.php b/htdocs/core/modules/dons/html_generic.modules.php
index fa16c9a03b1..49bd1a7a29a 100644
--- a/htdocs/core/modules/dons/html_generic.modules.php
+++ b/htdocs/core/modules/dons/html_generic.modules.php
@@ -166,9 +166,9 @@ class html_generic extends ModeleDon
 	/**
 	 *  Write the object to document file to disk
 	 *
-	 *  @param	string			$path	        Path for the file
+	 *  @param	string			$path	    Path for the file
 	 *  @param	string			$contents	Contents of the file
-	 *  @return	NULL
+	 *  @return	int							Return code
 	 */
 	private function saveFile($path, $contents)
 	{
@@ -178,7 +178,7 @@ class html_generic extends ModeleDon
 		fclose($handle);
 		dolChmod($path);
 
-		return;
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From b41020a801f49547d7e3391e088c7636fc550d32 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:05:33 +0100
Subject: [PATCH 0279/1862] Fix method by changing return type  (#28507)

* FIX return method getListOfCharacterSet by adding null type

* Fix return method getListOfCollation by adding return null
---
 htdocs/core/db/pgsql.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 1e218d9cd1f..35ce3ff072b 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1332,7 +1332,7 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 *	Return list of available charset that can be used to store data in database
 	 *
-	 *	@return		array		List of Charset
+	 *	@return		array|null		List of Charset
 	 */
 	public function getListOfCharacterSet()
 	{
@@ -1371,7 +1371,7 @@ class DoliDBPgsql extends DoliDB
 	/**
 	 *	Return list of available collation that can be used for database
 	 *
-	 *	@return		array		Liste of Collation
+	 *	@return		array|null		Liste of Collation
 	 */
 	public function getListOfCollation()
 	{

From 6c5855c99fd72c36503e0a77d8aa9a1963109eec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 28 Feb 2024 20:07:26 +0100
Subject: [PATCH 0280/1862] Clean code

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1619f147c3b..f8357732cef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2800,7 +2800,7 @@ function dol_bc($var, $moreclass = '')
  */
 function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = null, $mode = 0, $extralangcode = '')
 {
-	global $conf, $langs, $hookmanager;
+	global $langs, $hookmanager;
 
 	$ret = '';
 	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR', 'CN'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
@@ -2889,6 +2889,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
  *  @param	int		$ts			Timestamp (If is_gmt is true, timestamp is already includes timezone and daylight saving offset, if is_gmt is false, timestamp is a GMT timestamp and we must compensate with server PHP TZ)
  *  @param	bool	$is_gmt		See comment of timestamp parameter
  *	@return	string				A formatted string
+ *  @see dol_stringtotime()
  */
 function dol_strftime($fmt, $ts = false, $is_gmt = false)
 {
@@ -3552,7 +3553,7 @@ function getArrayOfSocialNetworks()
  */
 function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetworks = array())
 {
-	global $conf, $user, $langs;
+	global $user, $langs;
 
 	$htmllink = $value;
 

From b666d17eede5ac8ab98394796e9a104fb61d72d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 28 Feb 2024 20:18:35 +0100
Subject: [PATCH 0281/1862] FIX #28504

---
 htdocs/core/class/menubase.class.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 96cf95ceb6a..b86ee41f60f 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -126,12 +126,6 @@ class Menubase
 	 */
 	public $langs;
 
-	/**
-	 * @var string Not used
-	 * @deprecated
-	 */
-	public $level;
-
 	/**
 	 * @var string Name family/module for left menu (setup, info, ...)
 	 */
@@ -183,7 +177,7 @@ class Menubase
 	 */
 	public function create($user = null)
 	{
-		global $conf, $langs;
+		global $conf;
 
 		// Clean parameters
 		if (!isset($this->enabled)) {
@@ -209,9 +203,6 @@ class Menubase
 		if (empty($this->position)) {
 			$this->position = 0;
 		}
-		if (!$this->level) {
-			$this->level = 0;
-		}
 
 		// Check parameters
 		if (empty($this->menu_handler)) {

From aea79e6fbffff769dfaa4d9d4f27f8cdaa7d8e4c Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:21:29 +0100
Subject: [PATCH 0282/1862] FIX return type of return by adding null in return
 (#28503)

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

diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 0484968f526..5cfbfe2ed09 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -2281,7 +2281,7 @@ class Lessc
 	 *
 	 * @param mixed $in Input
 	 * @param bool $force Force rebuild?
-	 * @return array lessphp cache structure
+	 * @return array|null lessphp cache structure
 	 */
 	public function cachedCompile($in, $force = false)
 	{

From 67d6c988998ca044723ef6b3692a2a914f8993f3 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:22:17 +0100
Subject: [PATCH 0283/1862] FIX return by adding null (#28502)

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

diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 5841f5035e1..34a1961bc84 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -136,7 +136,7 @@ class FormCategory extends Form
 			return $num_rows;
 		} else {
 			dol_print_error($this->db);
-			return;
+			return null;
 		}
 	}
 }

From c8f8286fa3f5deb307e76104eef6fe2f20810ab4 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:23:49 +0100
Subject: [PATCH 0284/1862] Fix return type in howdocuments (#28500)

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c8589d9b088..5c527e016c2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -332,7 +332,7 @@ class FormFile
 	 *      @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)
+	 * 		@return		string|int             					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', $tooltipontemplatecombo = '')
 	{

From 946abbfbd1ff943778a6550acefcb644abbd81b9 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:33:36 +0100
Subject: [PATCH 0285/1862] Fix variable and return in method (#28498)

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index d6e0e56f688..32215871529 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -683,7 +683,7 @@ class FormSetupItem
 			$this->fieldValue = getDolGlobalString($this->confKey);
 			return true;
 		} else {
-			$this->fieldValue = null;
+			$this->fieldValue = '';
 			return false;
 		}
 	}
@@ -1103,7 +1103,7 @@ class FormSetupItem
 		} elseif (!empty($errors)) {
 			$this->errors[] = $errors;
 		}
-		return;
+		return null;
 	}
 
 	/**

From eda3b8e1617874193f775359771611e90b9f6aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:36:53 +0100
Subject: [PATCH 0286/1862] fix phpstan (#28497)

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

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index f142c22c87a..b3be55a633f 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -143,7 +143,7 @@ class FormCompany extends Form
 	 *	@param	int		$empty			Add empty value in list
 	 *	@return	void
 	 */
-	public function form_prospect_level($page, $selected = '', $htmlname = 'prospect_level_id', $empty = 0)
+	public function form_prospect_level($page, $selected = 0, $htmlname = 'prospect_level_id', $empty = 0)
 	{
 		// phpcs:enable
 		global $user, $langs;
@@ -195,7 +195,7 @@ class FormCompany extends Form
 	 *	@param	int		$empty			Add empty value in list
 	 *	@return	void
 	 */
-	public function formProspectContactLevel($page, $selected = '', $htmlname = 'prospect_contact_level_id', $empty = 0)
+	public function formProspectContactLevel($page, $selected = 0, $htmlname = 'prospect_contact_level_id', $empty = 0)
 	{
 		global $user, $langs;
 
@@ -643,7 +643,7 @@ class FormCompany extends Form
 	 *  @param	string		$morecss		More CSS on select component
 	 * 	@return int 						The selected third party ID
 	 */
-	public function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
+	public function selectCompaniesForNewContact($object, $var_id, $selected = 0, $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
 	{
 		global $conf, $hookmanager;
 

From d4a548a48f664a5f7217a1291827db8b9fd06098 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Wed, 28 Feb 2024 20:57:03 +0100
Subject: [PATCH 0287/1862] Fix return method select_conditions_paiements
 (#28495)

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5c8ea19dc73..ce7594a56f1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4323,7 +4323,7 @@ class Form
 	 *                                0 : use default deposit percentage from entry
 	 *                                > 0 : force deposit percentage (for example, from company object)
 	 * @param int $noprint if set to one we return the html to print, if 0 (default) we print it
-	 * @return    void
+	 * @return    void|string
 	 * @deprecated
 	 */
 	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1, $noprint = 0)

From 32995e3b7306bab263aefbdb890edbc1481d8c92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 28 Feb 2024 21:11:47 +0100
Subject: [PATCH 0288/1862] Fix #28478

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

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 2c4995989e1..e86e221bbb7 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1630,9 +1630,9 @@ class Invoices extends DolibarrApi
 			if ($is_multicurrency) {
 				$amounts[$id] = null;
 				// Multicurrency
-				$multicurrency_amounts[$id] = $amount;
+				$multicurrency_amounts[$id] = (float) $amount;
 			} else {
-				$amounts[$id] = $amount;
+				$amounts[$id] = (float) $amount;
 				// Multicurrency
 				$multicurrency_amounts[$id] = null;
 			}
@@ -1644,7 +1644,7 @@ class Invoices extends DolibarrApi
 		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
 		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paymentobj->paiementid   = $paymentid;
-		$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
+		$paymentobj->paiementcode = (string) dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
 		$paymentobj->num_payment  = $num_payment;
 		$paymentobj->note_private = $comment;
 		$paymentobj->ref_ext      = $ref_ext;

From 3c1c6f61ff64ea1c254f2887fd61c9b07445c985 Mon Sep 17 00:00:00 2001
From: Mohamed DAOUD <daoud.mouhamed@gmail.com>
Date: Wed, 28 Feb 2024 21:36:16 +0100
Subject: [PATCH 0289/1862] warnings fix some php warnings (#28467)

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

diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 6194a540789..8621c398af9 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -209,13 +209,13 @@ if ($action == 'create') {
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
-	if ($backtopageforcancel) {
+	if (!empty($backtopageforcancel)) {
 		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
-	if ($backtopagejsfields) {
+	if (!empty($backtopagejsfields)) {
 		print '<input type="hidden" name="backtopagejsfields" value="'.$backtopagejsfields.'">';
 	}
-	if ($dol_openinpopup) {
+	if (!empty($dol_openinpopup)) {
 		print '<input type="hidden" name="dol_openinpopup" value="'.$dol_openinpopup.'">';
 	}
 

From eb6aa92359b6f1e7c7327f13f3b44cb9adb05176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:43:23 +0100
Subject: [PATCH 0290/1862] fix isModEnabled for all case (#28465)

* Update conf.class.php

* new test

* new test

* new test

* ficheinter not fichinter
---
 htdocs/core/lib/functions.lib.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f8357732cef..6f47523cc3c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -219,7 +219,7 @@ define(
 		'entrepot' => 'stock',
 		'expedition' => 'delivery_note',
 		'facture' => 'invoice',
-		'fichinter' => 'intervention',
+		'ficheinter' => 'intervention',
 		'product_fournisseur_price' => 'productsupplierprice',
 		'product_price' => 'productprice',
 		'projet'  => 'project',
@@ -240,6 +240,7 @@ function isModEnabled($module)
 
 	// Fix old names (map to new names)
 	$arrayconv = DEPRECATED_MODULE_MAPPING;
+	$arrayconvbis = array_flip(DEPRECATED_MODULE_MAPPING);
 
 	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		// Special cases: both use the same module.
@@ -251,8 +252,12 @@ function isModEnabled($module)
 	if (!empty($arrayconv[$module])) {
 		$module_alt = $arrayconv[$module];
 	}
+	$module_bis = $module;
+	if (!empty($arrayconvbis[$module])) {
+		$module_bis = $arrayconvbis[$module];
+	}
 
-	return !empty($conf->modules[$module]) || !empty($conf->modules[$module_alt]);
+	return !empty($conf->modules[$module]) || !empty($conf->modules[$module_alt]) || !empty($conf->modules[$module_bis]);
 	//return !empty($conf->$module->enabled);
 }
 

From 1b4a1510ecceee7fcf170f2c301c382b04b14776 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:47:28 +0100
Subject: [PATCH 0291/1862] Modify module mapping principle (#28511)

---
 htdocs/core/lib/functions.lib.php             | 53 ++++++++++++-------
 htdocs/core/modules/import/modules_import.php |  2 +-
 test/phpunit/CodingPhpTest.php                |  7 +--
 test/phpunit/CommonClassTest.class.php        | 13 ++++-
 4 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6f47523cc3c..c2851a3ffcb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -206,25 +206,40 @@ function getDolUserInt($key, $default = 0, $tmpuser = null)
 	return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
+
+/**
+ * This mapping defines the conversion to the current internal
+ * names from the alternative allowed names (including effectively deprecated
+ * and future new names (not yet used as internal names).
+ *
+ * This allows to map any temporary or future name to the effective internal name.
+ *
+ * The value is typically the name of module's root directory.
+ */
 define(
-	'DEPRECATED_MODULE_MAPPING',
+	'MODULE_MAPPING',
 	array(
-		'actioncomm' => 'agenda',
-		'adherent' => 'member',
-		'adherent_type' => 'member_type',
-		'banque' => 'bank',
-		'categorie' => 'category',
-		'commande' => 'order',
-		'contrat' => 'contract',
-		'entrepot' => 'stock',
-		'expedition' => 'delivery_note',
-		'facture' => 'invoice',
-		'ficheinter' => 'intervention',
-		'product_fournisseur_price' => 'productsupplierprice',
-		'product_price' => 'productprice',
-		'projet'  => 'project',
-		'propale' => 'propal',
-		'socpeople' => 'contact',
+		// Map deprecated names to internal names
+		'adherent' => 'member',  // Has new directory
+		'member_type' => 'adherent_type',   // No directory, but file called adherent_type
+		'banque' => 'bank',   // Has new directory
+		'contrat' => 'contract', // Has new directory
+		'entrepot' => 'stock',   // Has new directory
+		'projet'  => 'project', // Has new directory
+
+		'actioncomm' => 'agenda',  // NO module directory (public dir agenda)
+		'product_price' => 'productprice', // NO directory
+		'product_fournisseur_price' => 'productsupplierprice', // NO directory
+
+		// Map future names to current internal names
+		'category' => 'categorie', // Has old directory
+		'order' => 'commande',    // Has old directory
+		'shipping' => 'expedition', // Has old directory
+		'invoice' => 'facture', // Has old directory
+		'intervention' => 'fichinter', // Has old directory
+		'ficheinter' => 'fichinter',  // Backup for 'fichinter'
+		'propal' => 'propale', // Has old directory
+		'contact' => 'socpeople', // Has old directory
 	)
 );
 
@@ -239,8 +254,8 @@ function isModEnabled($module)
 	global $conf;
 
 	// Fix old names (map to new names)
-	$arrayconv = DEPRECATED_MODULE_MAPPING;
-	$arrayconvbis = array_flip(DEPRECATED_MODULE_MAPPING);
+	$arrayconv = MODULE_MAPPING;
+	$arrayconvbis = array_flip(MODULE_MAPPING);
 
 	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		// Special cases: both use the same module.
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index ce6956b0d0e..537284e238f 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -119,7 +119,7 @@ class ModeleImports
 	/**
 	 * @var	array	Element mapping from table name
 	 */
-	public static $mapTableToElement = DEPRECATED_MODULE_MAPPING;
+	public static $mapTableToElement = MODULE_MAPPING;
 
 	/**
 	 *  Constructor
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 5dd8a43257a..0fd96ee1374 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -695,15 +695,16 @@ class CodingPhpTest extends CommonClassTest
 	 */
 	private function assertModuleIsOk($module_name, $message = '')
 	{
-		if (isset(self::DEPRECATED_MODULE_MAPPING[$module_name])) {
-			$new_name = self::DEPRECATED_MODULE_MAPPING[$module_name];
+		if (isset(self::EFFECTIVE_DEPRECATED_MODULE_MAPPING[$module_name])) {
+			$new_name = self::EFFECTIVE_DEPRECATED_MODULE_MAPPING[$module_name];
 			print("\033[31mDeprecated module name, use '$new_name':\033[0m$message".PHP_EOL);
 
 			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_NOTICE);
 			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_DEPRECATED);
 		} else {
 			$this->assertTrue(
-				array_key_exists($module_name, self::VALID_MODULE_MAPPING),
+				array_key_exists($module_name, self::VALID_MODULE_MAPPING)
+				|| array_key_exists($module_name, self::DEPRECATED_MODULE_MAPPIG),
 				"Unknown module: $message"
 			);
 		}
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 52960396f51..e5c63965f55 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -39,7 +39,6 @@ $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 use PHPUnit\Framework\TestCase;
 
-
 /**
  * Class for PHPUnit tests
  *
@@ -204,7 +203,7 @@ abstract class CommonClassTest extends TestCase
 		'entrepot' => 'stock',
 		'expedition' => 'delivery_note',
 		'facture' => 'invoice',
-		'ficheinter' => 'intervention',
+		'fichinter' => 'intervention',
 		'product_fournisseur_price' => 'productsupplierprice',
 		'product_price' => 'productprice',
 		'projet'  => 'project',
@@ -212,6 +211,16 @@ abstract class CommonClassTest extends TestCase
 		'socpeople' => 'contact',
 	);
 
+	const EFFECTIVE_DEPRECATED_MODULE_MAPPING = array(
+		'adherent' => 'member',
+		'adherent_type' => 'member_type',
+		'banque' => 'bank',
+		'contrat' => 'contract',
+		'entrepot' => 'stock',
+		'ficheinter' => 'fichinter',
+		'projet'  => 'project',
+	);
+
 	/**
 	 * Map module names to the 'class' name (the class is: mod<CLASSNAME>)
 	 * Value is null when the module is not internal to the default

From 20c1992aec28bf93148e032cdb653cde2abe007c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:56:00 +0100
Subject: [PATCH 0292/1862] fix translate with memcached and multilangs
 (#28510)

* fix translate with memcached and multilangs

* fix
---
 htdocs/core/class/translate.class.php | 39 +++++++++++++--------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 336241261ad..5cd303acaa0 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -31,7 +31,7 @@
 class Translate
 {
 	/**
-	 * @var string      Directory containing the /langs subdirectory
+	 * @var string[]      Directory containing the /langs subdirectory
 	 */
 	public $dir;
 
@@ -248,10 +248,12 @@ class Translate
 	 * 	@param	string	$forcelangdir				To force a different lang directory
 	 *  @param  int     $loadfromfileonly   		1=Do not load overwritten translation from file or old conf.
 	 *  @param  int     $forceloadifalreadynotfound	Force attempt to reload lang file if it was previously not found
+	 *  @param  array   $tabtranslatedomain			Store translations to be stored in cache
+	 *  @param  string  $langkey                    To create key for cachekey in recursivity
 	 *	@return	int									Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 *  @see loadLangs()
 	 */
-	public function load($domain, $alt = 0, $stopafterdirection = 0, $forcelangdir = '', $loadfromfileonly = 0, $forceloadifalreadynotfound = 0)
+	public function load($domain, $alt = 0, $stopafterdirection = 0, $forcelangdir = '', $loadfromfileonly = 0, $forceloadifalreadynotfound = 0, &$tabtranslatedomain = [], $langkey = '')
 	{
 		global $conf, $db;
 
@@ -294,6 +296,7 @@ class Translate
 
 		$fileread = 0;
 		$langofdir = (empty($forcelangdir) ? $this->defaultlang : $forcelangdir);
+		$langkey = (empty($langkey) ? $langofdir : $langkey);
 
 		// Redefine alt
 		$langarray = explode('_', $langofdir);
@@ -309,6 +312,7 @@ class Translate
 			return -1;
 		}
 
+		$usecachekey = '';
 		foreach ($this->dir as $searchdir) {
 			// Directory of translation files
 			$file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang";
@@ -328,7 +332,7 @@ class Translate
 				$usecachekey = '';
 				// Using a memcached server
 				if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {
-					$usecachekey = $newdomain . '_' . $langofdir . '_' . md5($file_lang); // Should not contains special chars
+					$usecachekey = $newdomain . '_' . $langkey . '_' . md5($file_lang); // Should not contains special chars
 				} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {
 					// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
 					$usecachekey = $newdomain;
@@ -336,14 +340,10 @@ class Translate
 
 				if ($usecachekey) {
 					//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-					//global $aaa; $aaa+=1;
-					//print $aaa." ".$usecachekey."\n";
 					require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
 					$tmparray = dol_getcache($usecachekey);
 					if (is_array($tmparray) && count($tmparray)) {
 						$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
-						//print $newdomain."\n";
-						//var_dump($this->tab_translate);
 						if ($alt == 2) {
 							$fileread = 1;
 						}
@@ -354,7 +354,7 @@ class Translate
 				if (!$found) {
 					if ($fp = @fopen($file_lang, "rt")) {
 						if ($usecachekey) {
-							$tabtranslatedomain = array(); // To save lang content in cache
+							// $tabtranslatedomain = array(); // To save lang content in cache
 						}
 
 						/**
@@ -392,16 +392,6 @@ class Translate
 						fclose($fp);
 						$fileread = 1;
 
-						// TODO Move cache write out of loop on dirs
-						// To save lang content for usecachekey into cache
-						if ($usecachekey && count($tabtranslatedomain)) {
-							$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
-							if ($ressetcache < 0) {
-								$error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;
-								dol_syslog($error, LOG_ERR);
-							}
-						}
-
 						if (!getDolGlobalString('MAIN_FORCELANGDIR')) {
 							break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.
 						}
@@ -421,7 +411,7 @@ class Translate
 			if ($langofdir == 'ar_AR') {
 				$langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'
 			}
-			$this->load($domain, $alt + 1, $stopafterdirection, $langofdir);
+			$this->load($domain, $alt + 1, $stopafterdirection, $langofdir, 0, 0, $tabtranslatedomain, $langkey);
 		}
 
 		// Now we complete with reference file (en_US)
@@ -429,7 +419,7 @@ class Translate
 			// This function MUST NOT contains call to syslog
 			//dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);
 			$langofdir = 'en_US';
-			$this->load($domain, $alt + 1, $stopafterdirection, $langofdir);
+			$this->load($domain, $alt + 1, $stopafterdirection, $langofdir, 0, 0, $tabtranslatedomain, $langkey);
 		}
 
 		// We are in the pass of the reference file. No more files to scan to complete.
@@ -459,6 +449,15 @@ class Translate
 			}
 		}
 
+		// To save lang content for usecachekey into cache
+		if ($usecachekey && count($tabtranslatedomain)) {
+			$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
+			if ($ressetcache < 0) {
+				$error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;
+				dol_syslog($error, LOG_ERR);
+			}
+		}
+
 		// Check to be sure that SeparatorDecimal differs from SeparatorThousand
 		if (
 			!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"])

From 12757dda6f0b3e135ce45e2141124a669721cb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 22:57:30 +0100
Subject: [PATCH 0293/1862] Update .gitignore (#28513)

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index ea477725a2c..efe6c66dfc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,10 @@ doc/install.lock
 /composer.json
 /composer.lock
 
+# to execute pre-commit
+local.sh
+
+# ignore cache builds
 /build/phpstan/phpstan
 /build/phpstan/bootstrap_custom.php
 phpstan_custom.neon

From c332251816aaa7896f80bded79da4de579727d92 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 28 Feb 2024 23:01:01 +0100
Subject: [PATCH 0294/1862] Fix: Replace deprecated module names in code
 strings (#28462)

* Fix: Replace deprecated module names in code strings

# Fix: Replace deprecated module names in code strings

A few cases that slipped through the manual replacements

* Qual: Enable deprecation notices in CodingPhpTest for isModEnabled

# Qual: Enable deprecation notices in CodingPhpTest for isModEnabled

As all detections are now fixed, we can enable the deprecation notice
trigger in the CodingPhpTest.
---
 htdocs/comm/propal/class/propal.class.php     | 112 +++++++++---------
 htdocs/commande/class/commande.class.php      | 104 ++++++++--------
 .../facture/class/facture-rec.class.php       |  80 ++++++-------
 test/phpunit/CodingPhpTest.php                |   2 +-
 4 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 937b3424acb..f7c25ae4545 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -322,55 +322,55 @@ class Propal extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
-		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>40),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'position'=>23),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>24),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'datep' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'fin_validite' =>array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-		'date_cloture' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>85),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user cloture', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'price' =>array('type'=>'double', 'label'=>'Price', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>125, 'isameasure'=>1),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'VAT', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LocalTax1', 'enabled'=>1, 'visible'=>-1, 'position'=>135, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LocalTax2', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'isModEnabled("banque")', 'visible'=>-1, 'position'=>150),
-		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
-		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>161),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>170),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>175),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>180),
-		'date_livraison' =>array('type'=>'date', 'label'=>'DateDeliveryPlanned', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'ShippingMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>'isModEnabled("stock")', 'visible'=>-1, 'position'=>191),
-		'fk_availability' =>array('type'=>'integer', 'label'=>'Availability', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>0, 'position'=>200), // deprecated
-		'fk_input_reason' =>array('type'=>'integer', 'label'=>'InputReason', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>220),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>225),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'MulticurrencyID', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCurrency', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>235),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>240, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>245, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>250, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>255, 'isameasure'=>1),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>260),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 20),
+		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 22),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 40),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'position' => 23),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Fk projet', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 24),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'datep' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'fin_validite' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 70),
+		'date_cloture' => array('type' => 'datetime', 'label' => 'DateClosing', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 85),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'fk_user_cloture' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user cloture', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'price' => array('type' => 'double', 'label' => 'Price', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'TotalHT', 'enabled' => 1, 'visible' => -1, 'position' => 125, 'isameasure' => 1),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'VAT', 'enabled' => 1, 'visible' => -1, 'position' => 130, 'isameasure' => 1),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'LocalTax1', 'enabled' => 1, 'visible' => -1, 'position' => 135, 'isameasure' => 1),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'LocalTax2', 'enabled' => 1, 'visible' => -1, 'position' => 140, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'TotalTTC', 'enabled' => 1, 'visible' => -1, 'position' => 145, 'isameasure' => 1),
+		'fk_account' => array('type' => 'integer', 'label' => 'BankAccount', 'enabled' => 'isModEnabled("bank")', 'visible' => -1, 'position' => 150),
+		'fk_currency' => array('type' => 'varchar(3)', 'label' => 'Currency', 'enabled' => 1, 'visible' => -1, 'position' => 155),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'PaymentTerm', 'enabled' => 1, 'visible' => -1, 'position' => 160),
+		'deposit_percent' => array('type' => 'varchar(63)', 'label' => 'DepositPercent', 'enabled' => 1, 'visible' => -1, 'position' => 161),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => -1, 'position' => 165),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 170),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 175),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'PDFTemplate', 'enabled' => 1, 'visible' => 0, 'position' => 180),
+		'date_livraison' => array('type' => 'date', 'label' => 'DateDeliveryPlanned', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'fk_shipping_method' => array('type' => 'integer', 'label' => 'ShippingMethod', 'enabled' => 1, 'visible' => -1, 'position' => 190),
+		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Fk warehouse', 'enabled' => 'isModEnabled("stock")', 'visible' => -1, 'position' => 191),
+		'fk_availability' => array('type' => 'integer', 'label' => 'Availability', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'fk_delivery_address' => array('type' => 'integer', 'label' => 'DeliveryAddress', 'enabled' => 1, 'visible' => 0, 'position' => 200), // deprecated
+		'fk_input_reason' => array('type' => 'integer', 'label' => 'InputReason', 'enabled' => 1, 'visible' => -1, 'position' => 205),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 215),
+		'fk_incoterms' => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => '$conf->incoterm->enabled', 'visible' => -1, 'position' => 220),
+		'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'IncotermLabel', 'enabled' => '$conf->incoterm->enabled', 'visible' => -1, 'position' => 225),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'MulticurrencyID', 'enabled' => 1, 'visible' => -1, 'position' => 230),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'MulticurrencyCurrency', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 235),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyRate', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 240, 'isameasure' => 1),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountHT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 245, 'isameasure' => 1),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountVAT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 250, 'isameasure' => 1),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountTTC', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 255, 'isameasure' => 1),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -1, 'position' => 260),
+		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 900),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -1536,7 +1536,7 @@ class Propal extends CommonObject
 		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$this, 'clonedObj'=>$object);
+				$parameters = array('objFrom' => $this, 'clonedObj' => $object);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -2714,12 +2714,12 @@ class Propal extends CommonObject
 				$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_TOBILL') ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
 
 				// The connected company is classified as a client
-				$soc=new Societe($this->db);
+				$soc = new Societe($this->db);
 				$soc->id = $this->socid;
 				$result = $soc->setAsCustomer();
 
 				if ($result < 0) {
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -2;
 				}
@@ -2744,7 +2744,7 @@ class Propal extends CommonObject
 			}
 
 			if (!$error) {
-				$this->oldcopy= clone $this;
+				$this->oldcopy = clone $this;
 				$this->statut = $status;
 				$this->status = $status;
 				$this->date_signature = $date_signature;
@@ -2753,7 +2753,7 @@ class Propal extends CommonObject
 
 			if (!$notrigger && empty($error)) {
 				// Call trigger
-				$result=$this->call_trigger($trigger_name, $user);
+				$result = $this->call_trigger($trigger_name, $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -3974,7 +3974,7 @@ class Propal extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -4092,7 +4092,7 @@ class Propal extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$arraydata['authorlink'].'</span>';
 		}
 		if (property_exists($this, 'total_ht')) {
-			$return .='<br><span class="info-box-label amount" title="'.$langs->trans("AmountHT").'">'.price($this->total_ht).'</span>';
+			$return .= '<br><span class="info-box-label amount" title="'.$langs->trans("AmountHT").'">'.price($this->total_ht).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
 			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index cb2f301c2d9..e7f81eb8af5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -313,56 +313,56 @@ class Commande extends CommonOrder
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20, 'index'=>1),
-		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>25),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>26),
-		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>28),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>25),
-		'date_commande' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>1, 'position'=>60, 'csslist'=>'nowraponall'),
-		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62, 'csslist'=>'nowraponall'),
-		'date_cloture' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>65, 'csslist'=>'nowraponall'),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'VAT', 'enabled'=>1, 'visible'=>-1, 'position'=>125, 'isameasure'=>1),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LocalTax1', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LocalTax2', 'enabled'=>1, 'visible'=>-1, 'position'=>135, 'isameasure'=>1),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>150),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'isModEnabled("banque")', 'visible'=>-1, 'position'=>170),
-		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'MulticurrencyID', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>181),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'date_livraison' =>array('type'=>'date', 'label'=>'DateDeliveryPlanned', 'enabled'=>1, 'visible'=>-1, 'position'=>190, 'csslist'=>'nowraponall'),
-		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'ShippingMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>'isModEnabled("stock")', 'visible'=>-1, 'position'=>200),
-		'fk_availability' =>array('type'=>'integer', 'label'=>'Availability', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'fk_input_reason' =>array('type'=>'integer', 'label'=>'InputReason', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 25),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 26),
+		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 28),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 20),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 25),
+		'date_commande' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 1, 'position' => 60, 'csslist' => 'nowraponall'),
+		'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 62, 'csslist' => 'nowraponall'),
+		'date_cloture' => array('type' => 'datetime', 'label' => 'DateClosing', 'enabled' => 1, 'visible' => -1, 'position' => 65, 'csslist' => 'nowraponall'),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'fk_user_cloture' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserClosing', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'source' => array('type' => 'smallint(6)', 'label' => 'Source', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'VAT', 'enabled' => 1, 'visible' => -1, 'position' => 125, 'isameasure' => 1),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'LocalTax1', 'enabled' => 1, 'visible' => -1, 'position' => 130, 'isameasure' => 1),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'LocalTax2', 'enabled' => 1, 'visible' => -1, 'position' => 135, 'isameasure' => 1),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'TotalHT', 'enabled' => 1, 'visible' => -1, 'position' => 140, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'TotalTTC', 'enabled' => 1, 'visible' => -1, 'position' => 145, 'isameasure' => 1),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 150),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'PDFTemplate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
+		'fk_account' => array('type' => 'integer', 'label' => 'BankAccount', 'enabled' => 'isModEnabled("bank")', 'visible' => -1, 'position' => 170),
+		'fk_currency' => array('type' => 'varchar(3)', 'label' => 'MulticurrencyID', 'enabled' => 1, 'visible' => -1, 'position' => 175),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'PaymentTerm', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'deposit_percent' => array('type' => 'varchar(63)', 'label' => 'DepositPercent', 'enabled' => 1, 'visible' => -1, 'position' => 181),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'PaymentMode', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'date_livraison' => array('type' => 'date', 'label' => 'DateDeliveryPlanned', 'enabled' => 1, 'visible' => -1, 'position' => 190, 'csslist' => 'nowraponall'),
+		'fk_shipping_method' => array('type' => 'integer', 'label' => 'ShippingMethod', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Fk warehouse', 'enabled' => 'isModEnabled("stock")', 'visible' => -1, 'position' => 200),
+		'fk_availability' => array('type' => 'integer', 'label' => 'Availability', 'enabled' => 1, 'visible' => -1, 'position' => 205),
+		'fk_input_reason' => array('type' => 'integer', 'label' => 'InputReason', 'enabled' => 1, 'visible' => -1, 'position' => 210),
 		//'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>230),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>235),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>240),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCurrency', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>245),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>250, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>255, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>260, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'isModEnabled("multicurrency")', 'visible'=>-1, 'position'=>265, 'isameasure'=>1),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>270),
-		'module_source' =>array('type'=>'varchar(32)', 'label'=>'POSModule', 'enabled'=>1, 'visible'=>-1, 'position'=>275),
-		'pos_source' =>array('type'=>'varchar(32)', 'label'=>'POSTerminal', 'enabled'=>1, 'visible'=>-1, 'position'=>280),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>300),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>302),
-		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>304, 'csslist'=>'nowraponall'),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>306),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>400),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 225),
+		'fk_incoterms' => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => '$conf->incoterm->enabled', 'visible' => -1, 'position' => 230),
+		'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'IncotermLabel', 'enabled' => '$conf->incoterm->enabled', 'visible' => -1, 'position' => 235),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fk multicurrency', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 240),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'MulticurrencyCurrency', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 245),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyRate', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 250, 'isameasure' => 1),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountHT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 255, 'isameasure' => 1),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountVAT', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 260, 'isameasure' => 1),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountTTC', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 265, 'isameasure' => 1),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -1, 'position' => 270),
+		'module_source' => array('type' => 'varchar(32)', 'label' => 'POSModule', 'enabled' => 1, 'visible' => -1, 'position' => 275),
+		'pos_source' => array('type' => 'varchar(32)', 'label' => 'POSTerminal', 'enabled' => 1, 'visible' => -1, 'position' => 280),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -1, 'position' => 300),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 302),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 304, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 306),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 400),
+		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => -1, 'position' => 500),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -1282,7 +1282,7 @@ class Commande extends CommonOrder
 		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$objFrom);
+				$parameters = array('objFrom' => $objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -1441,7 +1441,7 @@ class Commande extends CommonOrder
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('orderdao'));
 
-			$parameters = array('objFrom'=>$object);
+			$parameters = array('objFrom' => $object);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
@@ -3914,7 +3914,7 @@ class Commande extends CommonOrder
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 2e10c0077b6..14e090339bb 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -174,45 +174,45 @@ class FactureRec extends CommonInvoice
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20, 'index'=>1),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'subtype' =>array('type'=>'smallint(6)', 'label'=>'InvoiceSubtype', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>55, 'isameasure'=>1),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>65, 'isameasure'=>1),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'Total', 'enabled'=>1, 'visible'=>-1, 'position'=>70, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>75, 'isameasure'=>1),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>85),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Fk cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'Fk mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'date_lim_reglement' =>array('type'=>'date', 'label'=>'Date lim reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>110),
-		'modelpdf' =>array('type'=>'varchar(255)', 'label'=>'Modelpdf', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'date_when' =>array('type'=>'datetime', 'label'=>'Date when', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'date_last_gen' =>array('type'=>'datetime', 'label'=>'Date last gen', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'nb_gen_done' =>array('type'=>'integer', 'label'=>'Nb gen done', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'nb_gen_max' =>array('type'=>'integer', 'label'=>'Nb gen max', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-		'frequency' =>array('type'=>'integer', 'label'=>'Frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-		'unit_frequency' =>array('type'=>'varchar(2)', 'label'=>'UnitFrequency', 'enabled'=>1, 'visible'=>-1, 'position'=>152),
-		'usenewprice' =>array('type'=>'integer', 'label'=>'UseNewPrice', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'revenuestamp' =>array('type'=>'double(24,8)', 'label'=>'RevenueStamp', 'enabled'=>1, 'visible'=>-1, 'position'=>160, 'isameasure'=>1),
-		'auto_validate' =>array('type'=>'integer', 'label'=>'Auto validate', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'generate_pdf' =>array('type'=>'integer', 'label'=>'Generate pdf', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>'isModEnabled("banque")', 'visible'=>-1, 'position'=>175),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency tx', 'enabled'=>1, 'visible'=>-1, 'position'=>190, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ht', 'enabled'=>1, 'visible'=>-1, 'position'=>195, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total tva', 'enabled'=>1, 'visible'=>-1, 'position'=>200, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>205, 'isameasure'=>1),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>210),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>215),
-		'suspended' =>array('type'=>'integer', 'label'=>'Suspended', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'titre' => array('type' => 'varchar(100)', 'label' => 'Titre', 'enabled' => 1, 'showoncombobox' => 1, 'visible' => -1, 'position' => 15),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'Tva', 'enabled' => 1, 'visible' => -1, 'position' => 55, 'isameasure' => 1),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'Localtax1', 'enabled' => 1, 'visible' => -1, 'position' => 60, 'isameasure' => 1),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'Localtax2', 'enabled' => 1, 'visible' => -1, 'position' => 65, 'isameasure' => 1),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'Total', 'enabled' => 1, 'visible' => -1, 'position' => 70, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'Total ttc', 'enabled' => 1, 'visible' => -1, 'position' => 75, 'isameasure' => 1),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Fk projet', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 85),
+		'fk_cond_reglement' => array('type' => 'integer', 'label' => 'Fk cond reglement', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'fk_mode_reglement' => array('type' => 'integer', 'label' => 'Fk mode reglement', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'date_lim_reglement' => array('type' => 'date', 'label' => 'Date lim reglement', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 105),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 110),
+		'modelpdf' => array('type' => 'varchar(255)', 'label' => 'Modelpdf', 'enabled' => 1, 'visible' => -1, 'position' => 115),
+		'date_when' => array('type' => 'datetime', 'label' => 'Date when', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'date_last_gen' => array('type' => 'datetime', 'label' => 'Date last gen', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'nb_gen_done' => array('type' => 'integer', 'label' => 'Nb gen done', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'nb_gen_max' => array('type' => 'integer', 'label' => 'Nb gen max', 'enabled' => 1, 'visible' => -1, 'position' => 145),
+		'frequency' => array('type' => 'integer', 'label' => 'Frequency', 'enabled' => 1, 'visible' => -1, 'position' => 150),
+		'unit_frequency' => array('type' => 'varchar(2)', 'label' => 'UnitFrequency', 'enabled' => 1, 'visible' => -1, 'position' => 152),
+		'usenewprice' => array('type' => 'integer', 'label' => 'UseNewPrice', 'enabled' => 1, 'visible' => 0, 'position' => 155),
+		'revenuestamp' => array('type' => 'double(24,8)', 'label' => 'RevenueStamp', 'enabled' => 1, 'visible' => -1, 'position' => 160, 'isameasure' => 1),
+		'auto_validate' => array('type' => 'integer', 'label' => 'Auto validate', 'enabled' => 1, 'visible' => -1, 'position' => 165),
+		'generate_pdf' => array('type' => 'integer', 'label' => 'Generate pdf', 'enabled' => 1, 'visible' => -1, 'position' => 170),
+		'fk_account' => array('type' => 'integer', 'label' => 'Fk account', 'enabled' => 'isModEnabled("bank")', 'visible' => -1, 'position' => 175),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fk multicurrency', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Multicurrency code', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'Multicurrency tx', 'enabled' => 1, 'visible' => -1, 'position' => 190, 'isameasure' => 1),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total ht', 'enabled' => 1, 'visible' => -1, 'position' => 195, 'isameasure' => 1),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total tva', 'enabled' => 1, 'visible' => -1, 'position' => 200, 'isameasure' => 1),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total ttc', 'enabled' => 1, 'visible' => -1, 'position' => 205, 'isameasure' => 1),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 210),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 215),
+		'suspended' => array('type' => 'integer', 'label' => 'Suspended', 'enabled' => 1, 'visible' => -1, 'position' => 225),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -1503,7 +1503,7 @@ class FactureRec extends CommonInvoice
 		$result .= $linkend;
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 0fd96ee1374..8aebf3216fa 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -700,7 +700,7 @@ class CodingPhpTest extends CommonClassTest
 			print("\033[31mDeprecated module name, use '$new_name':\033[0m$message".PHP_EOL);
 
 			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_NOTICE);
-			//trigger_error("Deprecated module name, use '$new_name': $message", E_USER_DEPRECATED);
+			trigger_error("Deprecated module name, use '$new_name': $message", E_USER_DEPRECATED);
 		} else {
 			$this->assertTrue(
 				array_key_exists($module_name, self::VALID_MODULE_MAPPING)

From e827f0a5ab53adb7b5bf5169956ed8adbd37466e Mon Sep 17 00:00:00 2001
From: Sylvain Legrand <sylvain.legrand@infras.fr>
Date: Wed, 28 Feb 2024 23:02:46 +0100
Subject: [PATCH 0295/1862] Use the date pre-fill function also in edit mode
 (#28470)

* Use the date pre-fill function also in edit mode

Supports date prefill function (with last found dates) in row edit mode

* Update objectline_edit.tpl.php
---
 htdocs/core/tpl/objectline_edit.tpl.php | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 28e382c4f4b..aacf0be0b0d 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -358,11 +358,43 @@ $coldisplay++;
 	<?php } ?>
 	<td colspan="<?php echo $coldisplay - (!getDolGlobalString('MAIN_VIEW_LINE_NUMBER') ? 0 : 1) ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
+	$prefillDates = false;
+	if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines)) {
+		for ($j = $i - 1; $j >= 0; $j--) {
+			$lastline = $object->lines[$j];
+			if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end))) {
+				$date_start_prefill = $lastline->date_start;
+				$date_end_prefill = $lastline->date_end;
+				$prefillDates = true;
+				break;
+			}
+		}
+	}
 	$hourmin = (isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : '');
 	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);
 	print ' '.$langs->trans('to').' ';
 	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end ? 0 : 1, "updateline", 1, 0);
+	if ($prefillDates) {
+		echo ' <span class="small"><a href="#" id="prefill_service_dates">'.$langs->trans('FillWithLastServiceDates').'</a></span>';
+	}
 	print '<script>';
+	if ($prefillDates) {
+		?>
+		function prefill_service_dates()
+		{
+			$('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, 'day')); ?>").trigger('change');
+			$('#date_end').val("<?php echo dol_escape_js(dol_print_date($date_end_prefill, 'day')); ?>").trigger('change');
+
+			return false; // Prevent default link behaviour (which is go to href URL)
+		}
+
+		$(document).ready(function()
+		{
+			$('#prefill_service_dates').click(prefill_service_dates);
+		});
+
+		<?php
+	}
 	if (!$line->date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
 			print 'jQuery("#date_starthour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';

From 7391ad42edafdfc80ed03a8baca3aee159ec7f5c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 28 Feb 2024 23:25:16 +0100
Subject: [PATCH 0296/1862] Qual: Enable detection of deprecated modulename &
 GETPOST(...,'int') (#28457)

* Qual: Enable detection of deprecated modulename & GETPOST(...,'int')

# Qual: Enable detection of deprecated modulename & GETPOST(...,'int')

Enable phan rules to verify deprecated modulename usage and GETPOST(...,'int')
usage in the code.

* Qual: Try type hint on  to help avoid notification

* Qual: Accept 3 parameters for GETPOST to GETPOSTINT conversion

* Qual: Convert GETPOST(...,'int',VALUE) to GETPOSTINT(...,VALUE)

# Qual: Convert GETPOST(...,'int',VALUE) to GETPOSTINT(...,VALUE)

Following the update to the fixer to also convert GETPOST... with 3 parameters.
The files are now converted.
---
 dev/tools/phan/PHAN.BAT                       |  46 ++
 dev/tools/phan/config.php                     |   6 +-
 dev/tools/phan/config_extended.php            |   7 +-
 dev/tools/phan/config_fixer.php               |   3 +
 .../plugins/GetPostFixerPlugin/fixers.php     |   2 +-
 htdocs/comm/action/card.php                   |  64 +--
 htdocs/comm/action/index.php                  |  22 +-
 htdocs/comm/action/list.php                   |  43 +-
 htdocs/comm/action/pertype.php                |  10 +-
 htdocs/comm/action/peruser.php                |  14 +-
 htdocs/compta/bank/line.php                   |   3 +-
 htdocs/core/ajax/row.php                      |   5 +-
 htdocs/core/ajax/saveinplace.php              |   3 +-
 htdocs/core/ajax/ziptown.php                  |   3 +-
 htdocs/core/class/commonobject.class.php      |   4 +-
 htdocs/core/lib/functions.lib.php             |   1 +
 htdocs/main.inc.php                           |  20 +-
 htdocs/modulebuilder/index.php                | 482 +++++++++---------
 htdocs/projet/activity/perday.php             |  13 +-
 htdocs/projet/activity/permonth.php           |  11 +-
 htdocs/projet/activity/perweek.php            |  13 +-
 21 files changed, 426 insertions(+), 349 deletions(-)
 create mode 100644 dev/tools/phan/PHAN.BAT

diff --git a/dev/tools/phan/PHAN.BAT b/dev/tools/phan/PHAN.BAT
new file mode 100644
index 00000000000..930dc30595d
--- /dev/null
+++ b/dev/tools/phan/PHAN.BAT
@@ -0,0 +1,46 @@
+@ECHO OFF
+REM Usage (use from root of project):
+REM  - Standard checks:
+REM    PHAN.BAT
+REM  - Extended checks:
+REM    PHAN.BAT extended
+REM  - Use fixer configuration:
+REM    PHAN.BAT fix
+REM
+REM  Standard phan options can be added on the command line.
+
+set MEMOPT=--memory-limit=4G
+set CONFIG=--config-file
+set CONFIG_FILE=dev/tools/phan/config.php
+set FIX=
+set USERARGS=
+SET TWICE=--analyze-twice
+
+rem Iterate through each argument
+for %%i in (%*) do (
+    if "%%i"=="--memory-limit" (
+        set MEMOPT=""
+    )
+    if "%%i"=="extended" (
+	set CONFIG="--config-file"
+	set CONFIG_FILE=dev/tools/phan/config_extended.php
+        goto :nextloop
+    )
+    if "%%i"=="fix" (
+        set FIX="--automatic-fix"
+	set CONFIG="--config-file"
+	set CONFIG_FILE=dev/tools/phan/config_fixer.php
+	set TWICE=
+        goto :nextloop
+    )
+    if "%%i"=="--config-file" (
+        set CONFIG=
+        set CONFIG_FILE=
+    )
+    set "USERARGS=%USERARGS% %%i"
+
+    :nextloop
+    REM NEXTLOOP
+)
+
+../phan/vendor/bin/phan.bat %TWICE% %MEMOPT% %FIX% %CONFIG% %CONFIG_FILE% %USERARGS%
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index b5ac3bfafd8..2031e32501c 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -184,6 +184,7 @@ $VALID_MODULE_MAPPING = array(
 );
 
 $moduleNameRegex = '/^(?:'.implode('|', array_merge(array_keys($DEPRECATED_MODULE_MAPPING), array_keys($VALID_MODULE_MAPPING), array('\$modulename'))).')$/';
+$deprecatedModuleNameRegex = '/^(?!(?:'.implode('|', array_keys($DEPRECATED_MODULE_MAPPING)).')$).*/';
 
 /**
  * This configuration will be read and overlaid on top of the
@@ -266,12 +267,15 @@ return [
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
 	'ParamMatchRegexPlugin' => [
 		'/^GETPOST$/' => [1, $sanitizeRegex],
-		'/^isModEnabled$/' => [0, $moduleNameRegex],
+		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
+		// Note: trick to have different key for same regex:
+		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
 		'/^sanitizeVal$/' => [1, $sanitizeRegex],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
+		__DIR__.'/plugins/GetPostFixerPlugin.php',   // Only detects without --automatic-fix
 		// checks if a function, closure or method unconditionally returns.
 		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
 		//'DeprecateAliasPlugin',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 3b46fa7a49d..c6dbc07a314 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -185,6 +185,8 @@ $VALID_MODULE_MAPPING = array(
 
 $moduleNameRegex = '/^(?:'.implode('|', array_merge(array_keys($DEPRECATED_MODULE_MAPPING), array_keys($VALID_MODULE_MAPPING))).')$/';
 
+$deprecatedModuleNameRegex = '/^(?!(?:'.implode('|', array_keys($DEPRECATED_MODULE_MAPPING)).')$).*/';
+
 /**
  * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
@@ -265,12 +267,15 @@ return [
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
 	'ParamMatchRegexPlugin' => [
 		'/^GETPOST$/' => [1, $sanitizeRegex],
-		'/^isModEnabled$/' => [0, $moduleNameRegex],
+		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
+		// Note: trick to have different key for same regex:
+		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
 		'/^sanitizeVal$/' => [1, $sanitizeRegex],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
+		__DIR__.'/plugins/GetPostFixerPlugin.php',   // Only detects without --automatic-fix
 		'DeprecateAliasPlugin',
 		//'EmptyMethodAndFunctionPlugin',
 		'InvalidVariableIssetPlugin',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 841495e2a53..04ae1d7207c 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
+
 /* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  */
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
diff --git a/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php b/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
index 662a553eb62..a20c92a448e 100644
--- a/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
+++ b/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
@@ -46,7 +46,7 @@ call_user_func(static function (): void {
 				continue;
 			}
 			$arguments = $node->children;
-			if (count($arguments) != 3) {
+			if (!in_array(count($arguments), [3, 5])) {  // ',' included !
 				print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
 				continue;
 			}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 4eb7fa3ad6b..5c3a365d883 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2023 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019	   Ferran Marcet	    <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -145,13 +146,13 @@ if ($reshook < 0) {
 
 $TRemindTypes = array();
 if (getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
-	$TRemindTypes['browser'] = array('label'=>$langs->trans('BrowserPush'), 'disabled'=>(!getDolGlobalString('AGENDA_REMINDER_BROWSER') ? 1 : 0));
+	$TRemindTypes['browser'] = array('label' => $langs->trans('BrowserPush'), 'disabled' => (!getDolGlobalString('AGENDA_REMINDER_BROWSER') ? 1 : 0));
 }
 if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
-	$TRemindTypes['email'] = array('label'=>$langs->trans('EMail'), 'disabled'=>(!getDolGlobalString('AGENDA_REMINDER_EMAIL') ? 1 : 0));
+	$TRemindTypes['email'] = array('label' => $langs->trans('EMail'), 'disabled' => (!getDolGlobalString('AGENDA_REMINDER_EMAIL') ? 1 : 0));
 }
 
-$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
+$TDurationTypes = array('y' => $langs->trans('Years'), 'm' => $langs->trans('Month'), 'w' => $langs->trans('Weeks'), 'd' => $langs->trans('Days'), 'h' => $langs->trans('Hours'), 'i' => $langs->trans('Minutes'));
 
 $result = restrictedArea($user, 'agenda', $object, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
 
@@ -229,7 +230,7 @@ if (empty($reshook) && (GETPOST('addassignedtouser') || GETPOST('updateassignedt
 		if (!empty($_SESSION['assignedtouser'])) {
 			$assignedtouser = json_decode($_SESSION['assignedtouser'], true);
 		}
-		$assignedtouser[GETPOST('assignedtouser')] = array('id'=>GETPOSTINT('assignedtouser'), 'transparency'=>GETPOST('transparency'), 'mandatory'=>1);
+		$assignedtouser[GETPOST('assignedtouser')] = array('id' => GETPOSTINT('assignedtouser'), 'transparency' => GETPOST('transparency'), 'mandatory' => 1);
 		$_SESSION['assignedtouser'] = json_encode($assignedtouser);
 	}
 	$donotclearsession = 1;
@@ -251,7 +252,7 @@ if (empty($reshook) && (GETPOST('addassignedtoresource') || GETPOST('updateassig
 		if (!empty($_SESSION['assignedtoresource'])) {
 			$assignedtoresource = json_decode($_SESSION['assignedtoresource'], true);
 		}
-		$assignedtoresource[GETPOST('assignedtoresource')] = array('id'=>GETPOSTINT('assignedtoresource'), 'transparency'=>GETPOST('transparency'), 'mandatory'=>1);
+		$assignedtoresource[GETPOST('assignedtoresource')] = array('id' => GETPOSTINT('assignedtoresource'), 'transparency' => GETPOST('transparency'), 'mandatory' => 1);
 		$_SESSION['assignedtoresource'] = json_encode($assignedtoresource);
 	}
 	$donotclearsession = 1;
@@ -419,7 +420,7 @@ if (empty($reshook) && $action == 'add') {
 				$object->transparency = $transparency;
 			}
 
-			$object->userassigned[$value['id']] = array('id'=>$value['id'], 'transparency'=>$transparency);
+			$object->userassigned[$value['id']] = array('id' => $value['id'], 'transparency' => $transparency);
 
 			$i++;
 		}
@@ -476,7 +477,8 @@ if (empty($reshook) && $action == 'add') {
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
 	if ($ret < 0) {
-		$error++; $donotclearsession = 1;
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 	}
 
@@ -857,7 +859,7 @@ if (empty($reshook) && $action == 'update') {
 		} else {
 			$assignedtouser = (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : 0);
 			if ($assignedtouser) {
-				$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
+				$listofuserid[$assignedtouser] = array('id' => $assignedtouser, 'mandatory' => 0, 'transparency' => ($user->id == $assignedtouser ? $transparency : '')); // Owner first
 			}
 		}
 		$object->userassigned = array();
@@ -867,7 +869,7 @@ if (empty($reshook) && $action == 'update') {
 			if ($i == 0) {
 				$object->userownerid = $val['id'];
 			}
-			$object->userassigned[$val['id']] = array('id'=>$val['id'], 'mandatory'=>0, 'transparency'=>($user->id == $val['id'] ? $transparency : ''));
+			$object->userassigned[$val['id']] = array('id' => $val['id'], 'mandatory' => 0, 'transparency' => ($user->id == $val['id'] ? $transparency : ''));
 			$i++;
 		}
 
@@ -1180,9 +1182,9 @@ $form = new Form($db);
 $formproject = new FormProjets($db);
 
 $arrayrecurrulefreq = array(
-	'no'=>$langs->trans("OnceOnly"),
-	'MONTHLY'=>$langs->trans("EveryMonth"),
-	'WEEKLY'=>$langs->trans("EveryWeek")
+	'no' => $langs->trans("OnceOnly"),
+	'MONTHLY' => $langs->trans("EveryMonth"),
+	'WEEKLY' => $langs->trans("EveryWeek")
 	// 'DAILY'=>$langs->trans("EveryDay")
 );
 
@@ -1386,12 +1388,12 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
-	if (GETPOST('datep', 'int', 1)) {
-		$datep = dol_stringtotime(GETPOST('datep', 'int', 1), 'tzuserrel');
+	if (GETPOSTINT('datep', 1)) {
+		$datep = dol_stringtotime(GETPOSTINT('datep', 1), 'tzuserrel');
 	}
 	$datef = ($datef ? $datef : $object->datef);
-	if (GETPOST('datef', 'int', 1)) {
-		$datef = dol_stringtotime(GETPOST('datef', 'int', 1), 'tzuserrel');
+	if (GETPOSTINT('datef', 1)) {
+		$datef = dol_stringtotime(GETPOSTINT('datef', 1), 'tzuserrel');
 	}
 	if (empty($datef) && !empty($datep)) {
 		if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || !getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT')) {
@@ -1426,7 +1428,7 @@ if ($action == 'create') {
 	if (empty($donotclearsession)) {
 		$assignedtouser = GETPOST("assignedtouser") ? GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
 		if ($assignedtouser) {
-			$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0); // Owner first
+			$listofuserid[$assignedtouser] = array('id' => $assignedtouser, 'mandatory' => 0); // Owner first
 		}
 		//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
 		$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
@@ -1473,7 +1475,7 @@ if ($action == 'create') {
 		if (empty($donotclearsession)) {
 			$assignedtoresource = GETPOST("assignedtoresource");
 			if ($assignedtoresource) {
-				$listofresourceid[$assignedtoresource] = array('id'=>$assignedtoresource, 'mandatory'=>0); // Owner first
+				$listofresourceid[$assignedtoresource] = array('id' => $assignedtoresource, 'mandatory' => 0); // Owner first
 			}
 			$_SESSION['assignedtoresource'] = json_encode($listofresourceid);
 		} else {
@@ -1494,7 +1496,7 @@ if ($action == 'create') {
 	// Status
 	print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
 	print '<td>';
-	$percent = $complete !=='' ? $complete : -1;
+	$percent = $complete !== '' ? $complete : -1;
 	if (GETPOSTISSET('status')) {
 		$percent = GETPOST('status');
 	} elseif (GETPOSTISSET('percentage')) {
@@ -1543,7 +1545,7 @@ if ($action == 'create') {
 		if (GETPOSTINT('contactid')) {
 			$preselectedids[GETPOSTINT('contactid')] = GETPOSTINT('contactid');
 		}
-		if ($origin=='contact') {
+		if ($origin == 'contact') {
 			$preselectedids[GETPOSTINT('originid')] = GETPOSTINT('originid');
 		}
 		// select "all" or "none" contact by default
@@ -1970,12 +1972,12 @@ if ($id > 0) {
 		if (empty($donotclearsession)) {
 			if ($object->userownerid > 0) {
 				$listofuserid[$object->userownerid] = array(
-					'id'=>$object->userownerid,
-					'type'=>'user',
+					'id' => $object->userownerid,
+					'type' => 'user',
 					//'transparency'=>$object->userassigned[$user->id]['transparency'],
-					'transparency'=>$object->transparency, // Force transparency on ownerfrom event
-					'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
-					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
+					'transparency' => $object->transparency, // Force transparency on ownerfrom event
+					'answer_status' => $object->userassigned[$object->userownerid]['answer_status'],
+					'mandatory' => $object->userassigned[$object->userownerid]['mandatory']
 				);
 			}
 			if (!empty($object->userassigned)) {	// Now concat assigned users
@@ -2253,9 +2255,9 @@ if ($id > 0) {
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
-			$formconfirm.=$hookmanager->resPrint;
+			$formconfirm .= $hookmanager->resPrint;
 		} elseif ($reshook > 0) {
-			$formconfirm=$hookmanager->resPrint;
+			$formconfirm = $hookmanager->resPrint;
 		}
 
 		// Print form confirm
@@ -2403,10 +2405,10 @@ if ($id > 0) {
 		if (empty($donotclearsession)) {
 			if ($object->userownerid > 0) {
 				$listofuserid[$object->userownerid] = array(
-					'id'=>$object->userownerid,
-					'transparency'=>$object->transparency, // Force transparency on owner from property of event
-					'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
-					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
+					'id' => $object->userownerid,
+					'transparency' => $object->transparency, // Force transparency on owner from property of event
+					'answer_status' => $object->userassigned[$object->userownerid]['answer_status'],
+					'mandatory' => $object->userassigned[$object->userownerid]['mandatory']
 				);
 			}
 			if (!empty($object->userassigned)) {	// Now concat assigned users
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 338887acab2..a2b18358c1d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  * Copyright (C) 2018-2021 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -55,10 +56,10 @@ $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
 $check_holiday = GETPOSTINT('check_holiday');
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
+$filtert = GETPOSTINT("search_filtert", 3) ? GETPOSTINT("search_filtert", 3) : GETPOSTINT("filtert", 3);
+$usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", 3) : GETPOSTINT("usergroup", 3);
 $showbirthday = empty($conf->use_javascript_ajax) ? GETPOSTINT("showbirthday") : 1;
-$search_categ_cus = GETPOST("search_categ_cus", "int", 3) ? GETPOST("search_categ_cus", "int", 3) : 0;
+$search_categ_cus = GETPOSTINT("search_categ_cus", 3) ? GETPOSTINT("search_categ_cus", 3) : 0;
 
 // If not choice done on calendar owner (like on left menu link "Agenda"), we filter on user.
 if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
@@ -113,7 +114,7 @@ $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
 $month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
 $week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 $day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
-$pid = GETPOST("search_projectid", "int", 3) ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
+$pid = GETPOSTINT("search_projectid", 3) ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
 $maxprint = GETPOSTISSET("maxprint") ? GETPOSTINT("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW;
@@ -523,7 +524,8 @@ $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', '
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
 
 // Add more views from hooks
-$parameters = array(); $object = null;
+$parameters = array();
+$object = null;
 $reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
 if (empty($reshook)) {
 	$viewmode .= $hookmanager->resPrint;
@@ -550,7 +552,8 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 }
 
 // Define the legend/list of calendard to show
-$s = ''; $link = '';
+$s = '';
+$link = '';
 
 $showextcals = $listofextcals;
 $bookcalcalendars = array();
@@ -1455,7 +1458,8 @@ if (count($listofextcals)) {
 
 
 // Complete $eventarray with events coming from external module
-$parameters = array(); $object = null;
+$parameters = array();
+$object = null;
 $reshook = $hookmanager->executeHooks('getCalendarEvents', $parameters, $object, $action);
 if (!empty($hookmanager->resArray['eventarray'])) {
 	foreach ($hookmanager->resArray['eventarray'] as $keyDate => $events) {
@@ -1486,7 +1490,7 @@ if (!is_array($theme_datacolor)) {
 	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 }
 
-$massactionbutton ='';
+$massactionbutton = '';
 
 print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
 
@@ -1520,7 +1524,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 		print '  <td class="center bold uppercase tdfordaytitle'.($i == 0 ? ' borderleft' : '').'">';
 		$numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
 		if (!empty($conf->dol_optimize_smallscreen)) {
-			$labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
+			$labelshort = array(0 => 'SundayMin', 1 => 'MondayMin', 2 => 'TuesdayMin', 3 => 'WednesdayMin', 4 => 'ThursdayMin', 5 => 'FridayMin', 6 => 'SaturdayMin');
 			print $langs->trans($labelshort[$numdayinweek]);
 		} else {
 			print $langs->trans("Day".$numdayinweek);
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 30a690b38cc..bb80ee84540 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -57,7 +58,7 @@ if (empty($mode) && preg_match('/show_/', $action)) {
 	$mode = $action;	// For backward compatibility
 }
 $resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid");
-$pid = GETPOST("search_projectid", 'int', 3) ? GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
+$pid = GETPOSTINT("search_projectid", 3) ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
 $search_status = (GETPOST("search_status", 'aZ09') != '') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOST('search_type', 'alphanohtml') ? GETPOST('search_type', 'alphanohtml') : GETPOST('type', 'alphanohtml');
 $year = GETPOSTINT("year");
@@ -93,10 +94,10 @@ if (empty($mode) && !GETPOSTISSET('mode')) {
 }
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
+$filtert = GETPOSTINT("search_filtert", 3) ? GETPOSTINT("search_filtert", 3) : GETPOSTINT("filtert", 3);
+$usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", 3) : GETPOSTINT("usergroup", 3);
 $showbirthday = empty($conf->use_javascript_ajax) ? (GETPOSTINT("search_showbirthday") ? GETPOSTINT("search_showbirthday") : GETPOSTINT("showbirthday")) : 1;
-$search_categ_cus = GETPOST("search_categ_cus", "int", 3) ? GETPOST("search_categ_cus", "int", 3) : 0;
+$search_categ_cus = GETPOSTINT("search_categ_cus", 3) ? GETPOSTINT("search_categ_cus", 3) : 0;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new ActionComm($db);
@@ -157,19 +158,19 @@ if (!$user->hasRight('agenda', 'allactions', 'read') || $filter == 'mine') {	//
 }
 
 $arrayfields = array(
-	'a.id'=>array('label'=>"Ref", 'checked'=>1),
-	'owner'=>array('label'=>"Owner", 'checked'=>1),
-	'c.libelle'=>array('label'=>"Type", 'checked'=>1),
-	'a.label'=>array('label'=>"Title", 'checked'=>1),
-	'a.note'=>array('label'=>'Description', 'checked'=>0),
-	'a.datep'=>array('label'=>"DateStart", 'checked'=>1),
-	'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	'a.fk_contact'=>array('label'=>"Contact", 'checked'=>0),
-	'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>1, 'enabled'=>(getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT'))),
-	'a.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>510),
-	'a.tms'=>array('label'=>'DateModification', 'checked'=>0, 'position'=>520),
-	'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
+	'a.id' => array('label' => "Ref", 'checked' => 1),
+	'owner' => array('label' => "Owner", 'checked' => 1),
+	'c.libelle' => array('label' => "Type", 'checked' => 1),
+	'a.label' => array('label' => "Title", 'checked' => 1),
+	'a.note' => array('label' => 'Description', 'checked' => 0),
+	'a.datep' => array('label' => "DateStart", 'checked' => 1),
+	'a.datep2' => array('label' => "DateEnd", 'checked' => 1),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1),
+	'a.fk_contact' => array('label' => "Contact", 'checked' => 0),
+	'a.fk_element' => array('label' => "LinkedObject", 'checked' => 1, 'enabled' => (getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT'))),
+	'a.datec' => array('label' => 'DateCreation', 'checked' => 0, 'position' => 510),
+	'a.tms' => array('label' => 'DateModification', 'checked' => 0, 'position' => 520),
+	'a.percent' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -204,7 +205,7 @@ if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday")) {
 	exit;
 }
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -814,7 +815,7 @@ if (!empty($arrayfields['a.fk_element']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -892,7 +893,7 @@ if (!empty($arrayfields['a.fk_element']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -1196,7 +1197,7 @@ while ($i < $imaxinloop) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 83ac43bc4e2..a190a675b77 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -49,8 +50,8 @@ $action = GETPOST('action', 'aZ09');
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
+$filtert = GETPOSTINT("search_filtert", 3) ? GETPOSTINT("search_filtert", 3) : GETPOSTINT("filtert", 3);
+$usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", 3) : GETPOSTINT("usergroup", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 
 // $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
@@ -105,7 +106,7 @@ $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
 $month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
 $week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 $day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
-$pid = GETPOSTISSET("search_projectid") ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
+$pid = GETPOSTISSET("search_projectid") ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
 $maxprint = ((GETPOSTINT("maxprint") != '') ? GETPOSTINT("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
@@ -463,7 +464,8 @@ $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsm
 $viewmode .= '<span class="marginrightonly"></span>';
 
 // Add more views from hooks
-$parameters = array(); $object = null;
+$parameters = array();
+$object = null;
 $reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
 if (empty($reshook)) {
 	$viewmode .= $hookmanager->resPrint;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 2201fe9d360..035a4687ea1 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2023 Florian HENRY <florian.henry@scopen.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,8 +51,8 @@ $action = GETPOST('action', 'aZ09');
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
+$filtert = GETPOSTINT("search_filtert", 3) ? GETPOSTINT("search_filtert", 3) : GETPOSTINT("filtert", 3);
+$usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", 3) : GETPOSTINT("usergroup", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 $showbirthday = 0;
@@ -102,12 +103,12 @@ $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
 $month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
 $week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 $day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
-$pid = GETPOSTISSET("search_projectid") ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
+$pid = GETPOSTISSET("search_projectid") ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
 $maxprint = ((GETPOSTINT("maxprint") != '') ? GETPOSTINT("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$search_categ_cus = GETPOST("search_categ_cus", "int", 3) ? GETPOST("search_categ_cus", "int", 3) : 0;
+$search_categ_cus = GETPOSTINT("search_categ_cus", 3) ? GETPOSTINT("search_categ_cus", 3) : 0;
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array:aZ09')) {
 	$actioncode = GETPOST('search_actioncode', 'array:aZ09', 3);
@@ -466,7 +467,8 @@ $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsm
 $viewmode .= '<span class="marginrightonly"></span>';
 
 // Add more views from hooks
-$parameters = array(); $object = null;
+$parameters = array();
+$object = null;
 $reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
 if (empty($reshook)) {
 	$viewmode .= $hookmanager->resPrint;
@@ -938,7 +940,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		if ($filtert > 0) {
 			$sql .= " AND u.rowid = ".((int) $filtert);
 		}
-		if ($usergroup > 0)	{
+		if ($usergroup > 0) {
 			$sql .= " AND ug.fk_usergroup = ".((int) $usergroup);
 		}
 		if ($user->socid > 0) {
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index c474b6ce2e1..5b27d9ccd39 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -362,7 +363,7 @@ if ($result) {
 
 		print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1'.(GETPOST('account', 'int', 1) ? '&id='.GETPOST('account', 'int', 1) : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1'.(GETPOSTINT('account', 1) ? '&id='.GETPOSTINT('account', 1) : '').'">'.$langs->trans("BackToList").'</a>';
 
 
 		dol_banner_tab($bankline, 'rowid', $linkback);
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index e8fa7ab7165..c1e9d0e34d4 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2021 Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -66,7 +67,7 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 
 // Registering the location of boxes
 if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
-	&& GETPOST('fk_element', 'aZ09', 3) && GETPOST('element_id', 'int', 3)) {
+	&& GETPOSTINT('fk_element', 3) && GETPOSTINT('element_id', 3)) {
 	$roworder = GETPOST('roworder', 'alpha', 3);
 	$table_element_line = GETPOST('table_element_line', 'aZ09', 3);
 	$fk_element = GETPOST('fk_element', 'aZ09', 3);
@@ -126,7 +127,7 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 			$perm = 1;
 		}
 	}
-	$parameters = array('roworder'=> &$roworder, 'table_element_line' => &$table_element_line, 'fk_element' => &$fk_element, 'element_id' => &$element_id, 'perm' => &$perm);
+	$parameters = array('roworder' => &$roworder, 'table_element_line' => &$table_element_line, 'fk_element' => &$fk_element, 'element_id' => &$element_id, 'perm' => &$perm);
 	$row = new GenericObject($db);
 	$row->table_element_line = $table_element_line;
 	$row->fk_element = $fk_element;
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index f44dc385e39..6b337a88c68 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011-2012 Regis Houssin  <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -169,7 +170,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
 		} elseif ($type == 'datepicker') {
-			$timestamp = GETPOST('timestamp', 'int', 2);
+			$timestamp = GETPOSTINT('timestamp', 2);
 			$format = 'date';
 			$newvalue = ($timestamp / 1000);
 		} elseif ($type == 'select') {
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 36c40dac2b1..999ba16e49e 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010      Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2023 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -142,7 +143,7 @@ if (GETPOST('zipcode') || GETPOST('town')) {
 	top_httphead('text/html');
 
 	$formcompany = new FormCompany($db);
-	print $formcompany->select_state(GETPOST('selected', 'int', 1), GETPOST('country_codeid', 'int', 1), GETPOST('htmlname', 'alpha', 1), GETPOST('morecss', 'alpha', 1));
+	print $formcompany->select_state(GETPOSTINT('selected', 1), GETPOSTINT('country_codeid', 1), GETPOSTINT('htmlname', 1), GETPOSTINT('morecss', 1));
 }
 
 $db->close();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9f18717db03..5cf411ade65 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8712,7 +8712,7 @@ abstract class CommonObject
 								}
 							}
 							$datekey = $keyprefix.'options_'.$key.$keysuffix;
-							$value = (GETPOSTISSET($datekey)) ? dol_mktime(12, 0, 0, GETPOST($datekey.'month', 'int', 3), GETPOST($datekey.'day', 'int', 3), GETPOST($datekey.'year', 'int', 3)) : $datenotinstring;
+							$value = (GETPOSTISSET($datekey)) ? dol_mktime(12, 0, 0, GETPOSTINT($datekey.'month', 3), GETPOSTINT($datekey.'day', 3), GETPOSTINT($datekey.'year', 3)) : $datenotinstring;
 						}
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('datetime'))) {
 							$datenotinstring = null;
@@ -8723,7 +8723,7 @@ abstract class CommonObject
 								}
 							}
 							$timekey = $keyprefix.'options_'.$key.$keysuffix;
-							$value = (GETPOSTISSET($timekey)) ? dol_mktime(GETPOST($timekey.'hour', 'int', 3), GETPOST($timekey.'min', 'int', 3), GETPOST($timekey.'sec', 'int', 3), GETPOST($timekey.'month', 'int', 3), GETPOST($timekey.'day', 'int', 3), GETPOST($timekey.'year', 'int', 3), 'tzuserrel') : $datenotinstring;
+							$value = (GETPOSTISSET($timekey)) ? dol_mktime(GETPOSTINT($timekey.'hour', 3), GETPOSTINT($timekey.'min', 3), GETPOSTINT($timekey.'sec', 3), GETPOSTINT($timekey.'month', 3), GETPOSTINT($timekey.'day', 3), GETPOSTINT($timekey.'year', 3), 'tzuserrel') : $datenotinstring;
 						}
 						// Convert float submitted string into real php numeric (value in memory must be a php numeric)
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double'))) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c2851a3ffcb..7c537c88f53 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -999,6 +999,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
  */
 function GETPOSTINT($paramname, $method = 0)
 {
+	// @phan-suppress-next-line GetPostShouldBeGetPostInt
 	return (int) GETPOST($paramname, 'int', $method, null, null, 0);
 }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7e41e0b4d40..70452b297ed 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -746,16 +746,16 @@ if (!defined('NOLOGIN')) {
 		// It is not already authenticated and it requests the login / password
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-		$dol_dst_observed = GETPOST("dst_observed", 'int', 3);
-		$dol_dst_first = GETPOST("dst_first", 'int', 3);
-		$dol_dst_second = GETPOST("dst_second", 'int', 3);
-		$dol_screenwidth = GETPOST("screenwidth", 'int', 3);
-		$dol_screenheight = GETPOST("screenheight", 'int', 3);
-		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int', 3);
-		$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int', 3);
-		$dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int', 3);
-		$dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int', 3);
-		$dol_use_jmobile = GETPOST('dol_use_jmobile', 'int', 3); // 0=default, 1=to say we use app from a webview app, 2=to say we use app from a webview app and keep ajax
+		$dol_dst_observed = GETPOSTINT("dst_observed", 3);
+		$dol_dst_first = GETPOSTINT("dst_first", 3);
+		$dol_dst_second = GETPOSTINT("dst_second", 3);
+		$dol_screenwidth = GETPOSTINT("screenwidth", 3);
+		$dol_screenheight = GETPOSTINT("screenheight", 3);
+		$dol_hide_topmenu = GETPOSTINT('dol_hide_topmenu', 3);
+		$dol_hide_leftmenu = GETPOSTINT('dol_hide_leftmenu', 3);
+		$dol_optimize_smallscreen = GETPOSTINT('dol_optimize_smallscreen', 3);
+		$dol_no_mouse_hover = GETPOSTINT('dol_no_mouse_hover', 3);
+		$dol_use_jmobile = GETPOSTINT('dol_use_jmobile', 3); // 0=default, 1=to say we use app from a webview app, 2=to say we use app from a webview app and keep ajax
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 188c2938cda..a6789e1f909 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -75,12 +75,12 @@ $file = GETPOST('file', 'alpha');
 $modulename = dol_sanitizeFileName(GETPOST('modulename', 'alpha'));
 $objectname = dol_sanitizeFileName(GETPOST('objectname', 'alpha'));
 $dicname = dol_sanitizeFileName(GETPOST('dicname', 'alpha'));
-$editorname= GETPOST('editorname', 'alpha');
-$editorurl= GETPOST('editorurl', 'alpha');
-$version= GETPOST('version', 'alpha');
-$family= GETPOST('family', 'alpha');
-$picto= GETPOST('idpicto', 'alpha');
-$idmodule= GETPOST('idmodule', 'alpha');
+$editorname = GETPOST('editorname', 'alpha');
+$editorurl = GETPOST('editorurl', 'alpha');
+$version = GETPOST('version', 'alpha');
+$family = GETPOST('family', 'alpha');
+$picto = GETPOST('idpicto', 'alpha');
+$idmodule = GETPOST('idmodule', 'alpha');
 
 // Security check
 if (!isModEnabled('modulebuilder')) {
@@ -168,11 +168,11 @@ foreach ($dirsrootforscan as $tmpdirread) {
 				}
 				if ($modulenamewithcase) {
 					$listofmodules[$dircustomcursor['name']] = array(
-						'modulenamewithcase'=>$modulenamewithcase,
-						'moduledescriptorrelpath'=> $moduledescriptorrelpath,
-						'moduledescriptorfullpath'=>$moduledescriptorfullpath,
-						'moduledescriptorrootpath'=>$tmpdirread,
-						'moduletype'=>$moduletype
+						'modulenamewithcase' => $modulenamewithcase,
+						'moduledescriptorrelpath' => $moduledescriptorrelpath,
+						'moduledescriptorfullpath' => $moduledescriptorfullpath,
+						'moduledescriptorrootpath' => $tmpdirread,
+						'moduletype' => $moduletype
 					);
 				}
 				//var_dump($listofmodules);
@@ -182,10 +182,10 @@ foreach ($dirsrootforscan as $tmpdirread) {
 
 	if ($forceddirread && empty($listofmodules)) {    // $forceddirread is 1 if we forced dir to read with dirins=... or with module=...@mydir
 		$listofmodules[strtolower($module)] = array(
-			'modulenamewithcase'=>$module,
-			'moduledescriptorrelpath'=> 'notyetimplemented',
-			'moduledescriptorfullpath'=> 'notyetimplemented',
-			'moduledescriptorrootpath'=> 'notyetimplemented',
+			'modulenamewithcase' => $module,
+			'moduledescriptorrelpath' => 'notyetimplemented',
+			'moduledescriptorfullpath' => 'notyetimplemented',
+			'moduledescriptorrootpath' => 'notyetimplemented',
 		);
 	}
 
@@ -231,8 +231,8 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 		$destdir = $dirins.'/'.strtolower($modulename);
 
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename
 		);
 		$result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
 		//dol_mkdir($destfile);
@@ -337,21 +337,21 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 		foreach ($listofphpfilestoedit as $phpfileval) {
 			//var_dump($phpfileval['fullname']);
 			$arrayreplacement = array(
-				'mymodule'=>strtolower($modulename),
-				'MyModule'=>$modulename,
-				'MYMODULE'=>strtoupper($modulename),
-				'My module'=>$modulename,
-				'my module'=>$modulename,
-				'Mon module'=>$modulename,
-				'mon module'=>$modulename,
-				'htdocs/modulebuilder/template'=>strtolower($modulename),
-				'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
-				'Editor name'=>$editorname,
-				'https://www.example.com'=>$editorurl,
-				'$this->version = \'1.0\''=>'$this->version = \''.$version.'\'',
-				'$this->picto = \'generic\';'=>(empty($picto)) ? '$this->picto = \'generic\'' : '$this->picto = \''.$picto.'\';',
-				"modulefamily" =>$family,
-				'500000'=>$idmodule
+				'mymodule' => strtolower($modulename),
+				'MyModule' => $modulename,
+				'MYMODULE' => strtoupper($modulename),
+				'My module' => $modulename,
+				'my module' => $modulename,
+				'Mon module' => $modulename,
+				'mon module' => $modulename,
+				'htdocs/modulebuilder/template' => strtolower($modulename),
+				'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
+				'Editor name' => $editorname,
+				'https://www.example.com' => $editorurl,
+				'$this->version = \'1.0\'' => '$this->version = \''.$version.'\'',
+				'$this->picto = \'generic\';' => (empty($picto)) ? '$this->picto = \'generic\'' : '$this->picto = \''.$picto.'\';',
+				"modulefamily" => $family,
+				'500000' => $idmodule
 			);
 
 			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
@@ -452,18 +452,18 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 	if ($result > 0) {
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'myobject'=>strtolower($objectname),
-			'MyObject'=>$objectname,
-			'MYOBJECT'=>strtoupper($objectname),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'myobject' => strtolower($objectname),
+			'MyObject' => $objectname,
+			'MYOBJECT' => strtoupper($objectname),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		if (count($objects) > 1) {
@@ -509,19 +509,19 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'My Object'=>$objectname,
-			'MyObject'=>$objectname,
-			'my object'=>strtolower($objectname),
-			'myobject'=>strtolower($objectname),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'My Object' => $objectname,
+			'MyObject' => $objectname,
+			'my object' => strtolower($objectname),
+			'myobject' => strtolower($objectname),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile1, $arrayreplacement);
@@ -558,15 +558,15 @@ if ($dirins && $action == 'inithook' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -592,15 +592,15 @@ if ($dirins && $action == 'inittrigger' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -626,15 +626,15 @@ if ($dirins && $action == 'initwidget' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -660,15 +660,15 @@ if ($dirins && $action == 'initemailing' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -694,15 +694,15 @@ if ($dirins && $action == 'initcss' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -733,15 +733,15 @@ if ($dirins && $action == 'initjs' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -772,20 +772,20 @@ if ($dirins && $action == 'initcli' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'__MYCOMPANY_NAME__'=>$mysoc->name,
-			'__KEYWORDS__'=>$modulename,
-			'__USER_FULLNAME__'=>$user->getFullName($langs),
-			'__USER_EMAIL__'=>$user->email,
-			'__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'__MYCOMPANY_NAME__' => $mysoc->name,
+			'__KEYWORDS__' => $modulename,
+			'__USER_FULLNAME__' => $user->getFullName($langs),
+			'__USER_EMAIL__' => $user->email,
+			'__YYYY-MM-DD__' => dol_print_date($now, 'dayrfc'),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -812,20 +812,20 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 
 		//var_dump($phpfileval['fullname']);
 		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'__MYCOMPANY_NAME__'=>$mysoc->name,
-			'__KEYWORDS__'=>$modulename,
-			'__USER_FULLNAME__'=>$user->getFullName($langs),
-			'__USER_EMAIL__'=>$user->email,
-			'__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'__MYCOMPANY_NAME__' => $mysoc->name,
+			'__KEYWORDS__' => $modulename,
+			'__USER_FULLNAME__' => $user->getFullName($langs),
+			'__USER_EMAIL__' => $user->email,
+			'__YYYY-MM-DD__' => dol_print_date($now, 'dayrfc'),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
@@ -834,7 +834,7 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 		$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
 		$destdir = $dirins.'/'.strtolower($module);
 		$objects = dolGetListOfObjectClasses($destdir);
-		foreach ($objects as $path=>$obj) {
+		foreach ($objects as $path => $obj) {
 			writePropsInAsciiDoc($path, $obj, $destfile);
 		}
 
@@ -915,7 +915,7 @@ if ($dirins && $action == 'addlanguage' && !empty($module)) {
 			$arrayofreplacement = array();
 			if (!dol_is_dir($srcfile) || !dol_is_file($srcfile)) {
 				$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template/langs/en_US';
-				$arrayofreplacement = array('mymodule'=>$modulelowercase);
+				$arrayofreplacement = array('mymodule' => $modulelowercase);
 			}
 			$result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayofreplacement);
 		}
@@ -976,7 +976,7 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 			// Update descriptor file to comment file
 			if (in_array($tab, array('css', 'js'))) {
 				$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
-				$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
+				$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m' => '                // \'/'.$relativefilename.'\',');
 				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 			}
 
@@ -1290,21 +1290,21 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 	if (!$error) {
 		// Copy some files
 		$filetogenerate = array(
-			'myobject_card.php'=>strtolower($objectname).'_card.php',
-			'myobject_note.php'=>strtolower($objectname).'_note.php',
-			'myobject_contact.php'=>strtolower($objectname).'_contact.php',
-			'myobject_document.php'=>strtolower($objectname).'_document.php',
-			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
-			'myobject_list.php'=>strtolower($objectname).'_list.php',
-			'admin/myobject_extrafields.php'=>'admin/'.strtolower($objectname).'_extrafields.php',
-			'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
+			'myobject_card.php' => strtolower($objectname).'_card.php',
+			'myobject_note.php' => strtolower($objectname).'_note.php',
+			'myobject_contact.php' => strtolower($objectname).'_contact.php',
+			'myobject_document.php' => strtolower($objectname).'_document.php',
+			'myobject_agenda.php' => strtolower($objectname).'_agenda.php',
+			'myobject_list.php' => strtolower($objectname).'_list.php',
+			'admin/myobject_extrafields.php' => 'admin/'.strtolower($objectname).'_extrafields.php',
+			'lib/mymodule_myobject.lib.php' => 'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
 			//'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
-			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
-			'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
-			'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
-			'sql/llx_mymodule_myobject_extrafields.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.key.sql',
+			'sql/llx_mymodule_myobject.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
+			'sql/llx_mymodule_myobject.key.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
+			'sql/llx_mymodule_myobject_extrafields.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
+			'sql/llx_mymodule_myobject_extrafields.key.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.key.sql',
 			//'scripts/mymodule.php'=>'scripts/'.strtolower($objectname).'.php',
-			'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+			'class/myobject.class.php' => 'class/'.strtolower($objectname).'.class.php',
 			//'class/api_mymodule.class.php'=>'class/api_'.strtolower($module).'.class.php',
 		);
 
@@ -1312,9 +1312,9 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 			dol_mkdir($destdir.'/core/modules/'.strtolower($module));
 
 			$filetogenerate += array(
-				'core/modules/mymodule/mod_myobject_advanced.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php',
-				'core/modules/mymodule/mod_myobject_standard.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php',
-				'core/modules/mymodule/modules_myobject.php'=>'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php',
+				'core/modules/mymodule/mod_myobject_advanced.php' => 'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php',
+				'core/modules/mymodule/mod_myobject_standard.php' => 'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php',
+				'core/modules/mymodule/modules_myobject.php' => 'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php',
 			);
 		}
 		if (GETPOST('includedocgeneration', 'aZ09')) {
@@ -1322,8 +1322,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 			dol_mkdir($destdir.'/core/modules/'.strtolower($module).'/doc');
 
 			$filetogenerate += array(
-				'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php',
-				'core/modules/mymodule/doc/pdf_standard_myobject.modules.php'=>'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php'
+				'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php' => 'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php',
+				'core/modules/mymodule/doc/pdf_standard_myobject.modules.php' => 'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php'
 			);
 		}
 		if (GETPOST('generatepermissions', 'aZ09')) {
@@ -1341,7 +1341,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 			}
 			$rights = $moduleobj->rights;
 			$moduledescriptorfile = $destdir.'/core/modules/mod'.$module.'.class.php';
-			$checkComment=checkExistComment($moduledescriptorfile, 1);
+			$checkComment = checkExistComment($moduledescriptorfile, 1);
 			if ($checkComment < 0) {
 				setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Permissions"), "mod".$module."class.php"), null, 'warnings');
 			} else {
@@ -1534,18 +1534,18 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 
 			//var_dump($phpfileval['fullname']);
 			$arrayreplacement = array(
-				'mymodule'=>strtolower($module),
-				'MyModule'=>$module,
-				'MYMODULE'=>strtoupper($module),
-				'My module'=>$module,
-				'my module'=>$module,
-				'mon module'=>$module,
-				'Mon module'=>$module,
-				'htdocs/modulebuilder/template/'=>strtolower($modulename),
-				'myobject'=>strtolower($objectname),
-				'MyObject'=>$objectname,
+				'mymodule' => strtolower($module),
+				'MyModule' => $module,
+				'MYMODULE' => strtoupper($module),
+				'My module' => $module,
+				'my module' => $module,
+				'mon module' => $module,
+				'Mon module' => $module,
+				'htdocs/modulebuilder/template/' => strtolower($modulename),
+				'myobject' => strtolower($objectname),
+				'MyObject' => $objectname,
 				//'MYOBJECT'=>strtoupper($objectname),
-				'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+				'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 			);
 
 			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
@@ -1730,25 +1730,25 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 
 		if (!$error && !GETPOST('regenerateclasssql') && !GETPOST('regeneratemissing')) {
 			$addfieldentry = array(
-				'name'=>GETPOST('propname', 'aZ09'),
-				'label'=>GETPOST('proplabel', 'alpha'),
-				'type'=>strtolower(GETPOST('proptype', 'alpha')),
-				'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'alphawithlgt'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
-				'visible'=>GETPOST('propvisible', 'alphanohtml'),
-				'enabled'=>GETPOST('propenabled', 'alphanohtml'),
-				'position'=>GETPOSTINT('propposition'),
-				'notnull'=>GETPOSTINT('propnotnull'),
-				'index'=>GETPOSTINT('propindex'),
-				'foreignkey'=>GETPOST('propforeignkey', 'alpha'),
-				'searchall'=>GETPOSTINT('propsearchall'),
-				'isameasure'=>GETPOSTINT('propisameasure'),
-				'comment'=>GETPOST('propcomment', 'alpha'),
-				'help'=>GETPOST('prophelp', 'alpha'),
-				'css'=>GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
-				'cssview'=>GETPOST('propcssview', 'alpha'),
-				'csslist'=>GETPOST('propcsslist', 'alpha'),
-				'default'=>GETPOST('propdefault', 'restricthtml'),
-				'noteditable'=>intval(GETPOSTINT('propnoteditable')),
+				'name' => GETPOST('propname', 'aZ09'),
+				'label' => GETPOST('proplabel', 'alpha'),
+				'type' => strtolower(GETPOST('proptype', 'alpha')),
+				'arrayofkeyval' => GETPOST('proparrayofkeyval', 'alphawithlgt'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
+				'visible' => GETPOST('propvisible', 'alphanohtml'),
+				'enabled' => GETPOST('propenabled', 'alphanohtml'),
+				'position' => GETPOSTINT('propposition'),
+				'notnull' => GETPOSTINT('propnotnull'),
+				'index' => GETPOSTINT('propindex'),
+				'foreignkey' => GETPOST('propforeignkey', 'alpha'),
+				'searchall' => GETPOSTINT('propsearchall'),
+				'isameasure' => GETPOSTINT('propisameasure'),
+				'comment' => GETPOST('propcomment', 'alpha'),
+				'help' => GETPOST('prophelp', 'alpha'),
+				'css' => GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
+				'cssview' => GETPOST('propcssview', 'alpha'),
+				'csslist' => GETPOST('propcsslist', 'alpha'),
+				'default' => GETPOST('propdefault', 'restricthtml'),
+				'noteditable' => intval(GETPOSTINT('propnoteditable')),
 				//'alwayseditable'=>intval(GETPOST('propalwayseditable', 'int')),
 				'validate' => GETPOSTINT('propvalidate')
 			);
@@ -1927,27 +1927,27 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname) {
 
 		// Delete some files
 		$filetodelete = array(
-			'myobject_card.php'=>strtolower($objectname).'_card.php',
-			'myobject_note.php'=>strtolower($objectname).'_note.php',
-			'myobject_contact.php'=>strtolower($objectname).'_contact.php',
-			'myobject_document.php'=>strtolower($objectname).'_document.php',
-			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
-			'myobject_list.php'=>strtolower($objectname).'_list.php',
-			'admin/myobject_extrafields.php'=>'admin/'.strtolower($objectname).'_extrafields.php',
-			'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
-			'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
-			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
-			'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
-			'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
-			'sql/llx_mymodule_myobject_extrafields.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.key.sql',
-			'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
-			'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
-			'class/api_myobject.class.php'=>'class/api_'.strtolower($module).'.class.php',
-			'core/modules/mymodule/mod_myobject_advanced.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php',
-			'core/modules/mymodule/mod_myobject_standard.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php',
-			'core/modules/mymodule/modules_myobject.php'=>'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php',
-			'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php',
-			'core/modules/mymodule/doc/pdf_standard_myobject.modules.php'=>'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php'
+			'myobject_card.php' => strtolower($objectname).'_card.php',
+			'myobject_note.php' => strtolower($objectname).'_note.php',
+			'myobject_contact.php' => strtolower($objectname).'_contact.php',
+			'myobject_document.php' => strtolower($objectname).'_document.php',
+			'myobject_agenda.php' => strtolower($objectname).'_agenda.php',
+			'myobject_list.php' => strtolower($objectname).'_list.php',
+			'admin/myobject_extrafields.php' => 'admin/'.strtolower($objectname).'_extrafields.php',
+			'lib/mymodule_myobject.lib.php' => 'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
+			'test/phpunit/MyObjectTest.php' => 'test/phpunit/'.strtolower($objectname).'Test.php',
+			'sql/llx_mymodule_myobject.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
+			'sql/llx_mymodule_myobject_extrafields.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
+			'sql/llx_mymodule_myobject.key.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
+			'sql/llx_mymodule_myobject_extrafields.key.sql' => 'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.key.sql',
+			'scripts/myobject.php' => 'scripts/'.strtolower($objectname).'.php',
+			'class/myobject.class.php' => 'class/'.strtolower($objectname).'.class.php',
+			'class/api_myobject.class.php' => 'class/api_'.strtolower($module).'.class.php',
+			'core/modules/mymodule/mod_myobject_advanced.php' => 'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php',
+			'core/modules/mymodule/mod_myobject_standard.php' => 'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php',
+			'core/modules/mymodule/modules_myobject.php' => 'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php',
+			'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php' => 'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php',
+			'core/modules/mymodule/doc/pdf_standard_myobject.modules.php' => 'core/modules/'.strtolower($module).'/doc/pdf_standard_'.strtolower($objectname).'.modules.php'
 		);
 
 		//menu for the object selected
@@ -2071,7 +2071,7 @@ if (($dirins && $action == 'confirm_deletedictionary' && $dicname) || ($dirins &
 	}
 
 	if (!empty(GETPOST('dictionnarykey'))) {
-		$newdicname = $dicts['tabname'][GETPOST('dictionnarykey')-1];
+		$newdicname = $dicts['tabname'][GETPOST('dictionnarykey') - 1];
 	}
 
 	//chercher la table dicname
@@ -2276,13 +2276,13 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 
 	//check existing object permission
 	$counter = 0;
-	$permsForObject =array();
+	$permsForObject = array();
 	$permissions = $moduleobj->rights;
 	$allObject = array();
 
 	$countPerms = count($permissions);
 
-	for ($i =0; $i<$countPerms; $i++) {
+	for ($i = 0; $i < $countPerms; $i++) {
 		if ($permissions[$i][4] == $objectForPerms) {
 			$counter++;
 			if (count($permsForObject) < 3) {
@@ -2294,7 +2294,7 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 
 	// check if label of object already exists
 	$countPermsObj = count($permsForObject);
-	for ($j = 0; $j<$countPermsObj; $j++) {
+	for ($j = 0; $j < $countPermsObj; $j++) {
 		if (in_array($crud, $permsForObject[$j])) {
 			$error++;
 			setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($crud), $langs->transnoentities($objectForPerms)), null, 'errors');
@@ -2305,10 +2305,10 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 		$key = $countPerms + 1;
 		//prepare right to add
 		$rightToAdd = [
-			0=> $id,
-			1=>$label,
-			4=>$objectForPerms,
-			5=>$crud
+			0 => $id,
+			1 => $label,
+			4 => $objectForPerms,
+			5 => $crud
 		];
 
 		if (isModEnabled(strtolower($module))) {
@@ -2340,7 +2340,7 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 
 
 // Update permission
-if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& empty($cancel)) {
+if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright') && empty($cancel)) {
 	$error = 0;
 	// load class and check if right exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
@@ -2383,21 +2383,21 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
 	}
 
 	$permissions = $moduleobj->rights;
-	$key =(int) GETPOST('counter')-1;
+	$key = (int) GETPOST('counter') - 1;
 	//get permission want to delete from permissions array
 	$x1 = $permissions[$key][1];
 	$x2 = $permissions[$key][4];
 	$x3 = $permissions[$key][5];
 	//check existing object permission
 	$counter = 0;
-	$permsForObject =array();
+	$permsForObject = array();
 	$permissions = $moduleobj->rights;
 	$firstRight = 0;
 	$existRight = 0;
 	$allObject = array();
 
 	$countPerms = count($permissions);
-	for ($i =0; $i<$countPerms; $i++) {
+	for ($i = 0; $i < $countPerms; $i++) {
 		if ($permissions[$i][4] == $objectForPerms) {
 			$counter++;
 			if (count($permsForObject) < 3) {
@@ -2409,7 +2409,7 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
 
 	if ($label != $x1 && $crud != $x3) {
 		$countPermsObj = count($permsForObject);
-		for ($j = 0; $j<$countPermsObj; $j++) {
+		for ($j = 0; $j < $countPermsObj; $j++) {
 			if (in_array($label, $permsForObject[$j])) {
 				$error++;
 				setEventMessages($langs->trans("ErrorExistingPermission", $langs->transnoentities($label), $langs->transnoentities($objectForPerms)), null, 'errors');
@@ -2461,7 +2461,7 @@ if ($dirins && $action == 'confirm_deleteright' && !empty($module) && GETPOSTINT
 	}
 
 	$permissions = $moduleobj->rights;
-	$key = GETPOSTINT('permskey')-1;
+	$key = GETPOSTINT('permskey') - 1;
 
 	if (!$error) {
 		// check if module is enabled
@@ -2748,7 +2748,7 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) {
 	$objects = dolGetListOfObjectClasses($destdir);
 
 	if (GETPOST('type', 'alpha') == 'left') {
-		if (empty(GETPOST('leftmenu')) && count($objects) >0) {
+		if (empty(GETPOST('leftmenu')) && count($objects) > 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorCoherenceMenu", $langs->transnoentities("leftmenu"), $langs->transnoentities("type")), null, 'errors');
 		}
@@ -2905,7 +2905,7 @@ if ($dirins && $action == "update_menu" && GETPOSTINT('menukey') && GETPOST('tab
 				if ($result < 0) {
 					setEventMessages($langs->trans('ErrorMenuExistValue'), null, 'errors');
 					//var_dump($_SESSION);exit;
-					header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key+1));
+					header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key + 1));
 					exit;
 				}
 
@@ -4186,8 +4186,8 @@ if ($module == 'initmodule') {
 								print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 								print $form->textwithpicto('', $langs->trans("InfoForApiFile"), 1, 'warning');
 								print ' &nbsp; ';
-								// @phan-suppress-next-line ParamMatchRegexError
-								if (!isModEnabled($modulelowercase)) {	// If module is not activated
+								// Comparing to null (phan considers $modulelowercase can be null here)
+								if ($modulelowercase !== null && !isModEnabled($modulelowercase)) {	// If module is not activated
 									print '<a href="#" class="classfortooltip" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("ApiExplorer").'</strike></a>';
 								} else {
 									print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("ApiExplorer").'</a>';
@@ -4799,14 +4799,14 @@ if ($module == 'initmodule') {
 						$i = 0;
 						$maxi = count($dicts['tabname']);
 						while ($i < $maxi) {
-							if ($action == 'editdict' && $i == GETPOSTINT('dictionnarykey')-1) {
+							if ($action == 'editdict' && $i == GETPOSTINT('dictionnarykey') - 1) {
 								print '<tr class="oddeven">';
 								print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 								print '<input type="hidden" name="token" value="'.newToken().'">';
 								print '<input type="hidden" name="tab" value="dictionaries">';
 								print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
 								print '<input type="hidden" name="action" value="updatedictionary">';
-								print '<input type="hidden" name="dictionnarykey" value="'.($i+1).'">';
+								print '<input type="hidden" name="dictionnarykey" value="'.($i + 1).'">';
 
 								print '<td class="tdsticky tdstickygray">';
 								print($i + 1);
@@ -4902,8 +4902,8 @@ if ($module == 'initmodule') {
 								print '</td>';
 
 								print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
-								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editdict&token='.newToken().'&dictionnarykey='.urlencode($i+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_edit().'</a>';
-								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletedict&token='.newToken().'&dictionnarykey='.urlencode($i+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_delete().'</a>';
+								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editdict&token='.newToken().'&dictionnarykey='.urlencode($i + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_edit().'</a>';
+								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletedict&token='.newToken().'&dictionnarykey='.urlencode($i + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_delete().'</a>';
 								print '</td>';
 
 								print '</tr>';
@@ -5043,7 +5043,7 @@ if ($module == 'initmodule') {
 			$menus = $moduleobj->menu;
 
 			$permissions = $moduleobj->rights;
-			$crud = array('read'=>'CRUDRead', 'write'=>'CRUDCreateWrite', 'delete'=>'Delete');
+			$crud = array('read' => 'CRUDRead', 'write' => 'CRUDCreateWrite', 'delete' => 'Delete');
 
 			//grouped permissions
 			$groupedRights = array();
@@ -5118,7 +5118,7 @@ if ($module == 'initmodule') {
 				print_liste_field_titre("", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'center ', $langs->trans(''));
 				print "</tr>\n";
 
-				$r = count($menus)+1;
+				$r = count($menus) + 1;
 				// for adding menu on module
 				print '<tr>';
 				print '<td class="center tdsticky tdstickygray"><input type="hidden" readonly class="center maxwidth50" name="propenabled" value="#"></td>';
@@ -5143,7 +5143,7 @@ if ($module == 'initmodule') {
 				print '<td class="left"><input id="url" type="text" class="left maxwidth100" name="url" value="'.dol_escape_htmltag(GETPOST('url', 'alpha')).'"></td>';
 				print '<td class="left"><input type="text" class="left maxwidth75" name="langs" value="'.strtolower($module).'@'.strtolower($module).'" readonly></td>';
 				// Position
-				print '<td class="center"><input type="text" class="center maxwidth50 tdstickygray" name="position" value="'.(1000+$r).'" readonly></td>';
+				print '<td class="center"><input type="text" class="center maxwidth50 tdstickygray" name="position" value="'.(1000 + $r).'" readonly></td>';
 				// Enabled
 				print '<td class="center">';
 				print '<input type="enabled" class="maxwidth125" value="'.dol_escape_htmltag(GETPOSTISSET('enabled') ? GETPOST('enabled') : 'isModEnabled(\''.$module.'\')').'">';
@@ -5375,7 +5375,7 @@ if ($module == 'initmodule') {
 							print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
 							if ($menu['titre'] != 'Module'.$module.'Name') {
 								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($i).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
-								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i-1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i - 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
 							}
 							print '</td>';
 						}
@@ -5474,7 +5474,7 @@ if ($module == 'initmodule') {
 			$dir = $dirread.'/'.$modulelowercase.'/class';
 			$listofobject = dol_dir_list($dir, 'files', 0, '\.class\.php$');
 			$objects = array('myobject');
-			$reg =array();
+			$reg = array();
 			foreach ($listofobject as $fileobj) {
 				$tmpcontent = file_get_contents($fileobj['fullname']);
 				if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg)) {
@@ -5483,7 +5483,7 @@ if ($module == 'initmodule') {
 			}
 
 			// declared select list for actions and labels permissions
-			$crud = array('read'=>'CRUDRead', 'write'=>'CRUDCreateWrite', 'delete'=>'Delete');
+			$crud = array('read' => 'CRUDRead', 'write' => 'CRUDCreateWrite', 'delete' => 'Delete');
 			$labels = array("Read objects of ".$module, "Create/Update objects of ".$module, "Delete objects of ".$module);
 
 			$action = GETPOST('action', 'alpha');
@@ -5590,7 +5590,7 @@ if ($module == 'initmodule') {
 							print '<td>';
 							print '<select name="crud">';
 							print '<option value="'.dol_escape_htmltag($perm[5]).'">'.$langs->trans($perm[5]).'</option>';
-							foreach ($crud as $i=> $x) {
+							foreach ($crud as $i => $x) {
 								if ($perm[5] != $i) {
 									print '<option value="'.$i.'">'.$langs->trans(ucfirst($x)).'</option>';
 								}
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index ac2092946d7..2e5e1606202 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.com>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +51,7 @@ if ($mode == 'mine') {
 	$mine = 1;
 }
 
-$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOSTINT("projectid");
+$projectid = GETPOSTISSET("id") ? GETPOSTINT("id", 1) : GETPOSTINT("projectid");
 
 $hookmanager->initHooks(array('timesheetperdaycard'));
 
@@ -124,9 +125,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Definition of fields for list
 $arrayfields = array();
-$arrayfields['t.planned_workload'] = array('label'=>'PlannedWorkload', 'checked'=>1, 'enabled'=>1, 'position'=>0);
-$arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'enabled'=>1, 'position'=>0);
-$arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'enabled'=>1, 'position'=>15);
+$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => 1, 'enabled' => 1, 'position' => 0);
+$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => 1, 'enabled' => 1, 'position' => 0);
+$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1, 'enabled' => 1, 'position' => 15);
 /*$arrayfields=array(
  // Project
  'p.opp_amount'=>array('label'=>$langs->trans("OpportunityAmountShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>103),
@@ -140,7 +141,7 @@ $arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'ena
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => (abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 		}
 	}
 }
@@ -645,7 +646,7 @@ $isavailable[$daytoparse] = $isavailablefordayanduser; // in projectLinesPerWeek
 
 $test = num_public_holiday($daytoparsegmt, $daytoparsegmt + 86400, $mysoc->country_code);
 if ($test) {
-	$isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
+	$isavailable[$daytoparse] = array('morning' => false, 'afternoon' => false, 'morning_reason' => 'public_holiday', 'afternoon_reason' => 'public_holiday');
 }
 
 $tmparray = dol_getdate($daytoparse, true); // detail of current day
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 84b3d3ed0a8..7e1e2d82ccf 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -49,7 +50,7 @@ if ($mode == 'mine') {
 	$mine = 1;
 }
 
-$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOSTINT("projectid");
+$projectid = GETPOSTISSET("id") ? GETPOSTINT("id", 1) : GETPOSTINT("projectid");
 
 $hookmanager->initHooks(array('timesheetpermonthcard'));
 
@@ -125,9 +126,9 @@ $arrayfields = array();
  'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
  'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
  );*/
-$arrayfields['t.planned_workload'] = array('label'=>'PlannedWorkload', 'checked'=>1, 'enabled'=>1, 'position'=>5);
-$arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'enabled'=>1, 'position'=>10);
-$arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'enabled'=>1, 'position'=>15);
+$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => 1, 'enabled' => 1, 'position' => 5);
+$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => 1, 'enabled' => 1, 'position' => 10);
+$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1, 'enabled' => 1, 'position' => 15);
 /*foreach($object->fields as $key => $val)
  {
  // If $val['visible']==0, then we never show the field
@@ -138,7 +139,7 @@ $arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'ena
 if (!empty($extrafields->attributes['projet_task']['label']) && is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
 		if (!empty($extrafields->attributes['projet_task']['list'][$key])) {
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes['projet_task']['label'][$key], 'checked' => (($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes['projet_task']['pos'][$key], 'enabled' => (abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
 		}
 	}
 }
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index c568a282a0d..97d38e4eb96 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.com>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +51,7 @@ if ($mode == 'mine') {
 	$mine = 1;
 }
 
-$projectid = GETPOSTISSET("id") ? GETPOST("id", "int", 1) : GETPOSTINT("projectid");
+$projectid = GETPOSTISSET("id") ? GETPOSTINT("id", 1) : GETPOSTINT("projectid");
 
 $hookmanager->initHooks(array('timesheetperweekcard'));
 
@@ -129,9 +130,9 @@ $arrayfields = array();
  'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
  'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
  );*/
-$arrayfields['t.planned_workload'] = array('label'=>'PlannedWorkload', 'checked'=>1, 'enabled'=>1, 'position'=>5);
-$arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'enabled'=>1, 'position'=>10);
-$arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'enabled'=>1, 'position'=>15);
+$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => 1, 'enabled' => 1, 'position' => 5);
+$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => 1, 'enabled' => 1, 'position' => 10);
+$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1, 'enabled' => 1, 'position' => 15);
 /*foreach($object->fields as $key => $val)
  {
  // If $val['visible']==0, then we never show the field
@@ -142,7 +143,7 @@ $arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'ena
 if (!empty($extrafields->attributes['projet_task']['label']) && is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
 		if (!empty($extrafields->attributes['projet_task']['list'][$key])) {
-			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes['projet_task']['label'][$key], 'checked' => (($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes['projet_task']['pos'][$key], 'enabled' => (abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
 		}
 	}
 }
@@ -536,7 +537,7 @@ for ($idw = 0; $idw < 7; $idw++) {
 
 	$test = num_public_holiday($dayinloopfromfirstdaytoshowgmt, $dayinloopfromfirstdaytoshowgmt + 86400, $mysoc->country_code);
 	if ($test) {
-		$isavailable[$dayinloopfromfirstdaytoshow] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
+		$isavailable[$dayinloopfromfirstdaytoshow] = array('morning' => false, 'afternoon' => false, 'morning_reason' => 'public_holiday', 'afternoon_reason' => 'public_holiday');
 	}
 }
 

From 648a58e869798cfa4b885b7522acfacebfaba411 Mon Sep 17 00:00:00 2001
From: Hasanuzzaman Sattar <h.sattar@alsoft.org>
Date: Thu, 29 Feb 2024 04:11:21 +0530
Subject: [PATCH 0297/1862] NEW Dolibarr can now re-open ticket upon customer
 reply on the same ticket via email#28303  (#28451)

* #28303

* #28303

* #28303
---
 .../class/emailcollector.class.php            | 45 +++++++++++++------
 htdocs/ticket/card.php                        |  6 ++-
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 94c24646345..86672a0f225 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2648,6 +2648,7 @@ class EmailCollector extends CommonObject
 								//var_dump($alreadycreated);
 								//var_dump($operation['type']);
 								//var_dump($actioncomm);
+								//var_dump($objectemail);
 								//exit;
 
 								if ($errorforthisaction) {
@@ -2658,22 +2659,40 @@ class EmailCollector extends CommonObject
 										$errorforactions++;
 										$this->errors = $actioncomm->errors;
 									} else {
-										if (($fk_element_type == 'ticket') && (!empty($attachments))) {
-											// There is an attachment for the ticket -> store attachment
-											$ticket = New Ticket($this->db);
-											$ticket->fetch($fk_element_id);
-											$destdir = $conf->ticket->dir_output.'/'.$ticket->ref;
-											if (!dol_is_dir($destdir)) {
-												dol_mkdir($destdir);
-											}
-											if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
-												foreach ($attachments as $attachment) {
-													$attachment->save($destdir.'/');
+										if ($fk_element_type == "ticket") {
+											if ($objectemail->status == Ticket::STATUS_CLOSED || $objectemail->status == Ticket::STATUS_CANCELED) {
+												if ($objectemail->fk_user_assign != null) {
+													$res = $objectemail->setStatut(Ticket::STATUS_ASSIGNED);
+												} else {
+													$res = $objectemail->setStatut(Ticket::STATUS_NOT_READ);
+												}
+
+												if ($res) {
+													$operationslog .= '<br>Ticket Re-Opened successfully -> ref='.$objectemail->ref;
+												} else {
+													$errorforactions++;
+													$this->error = 'Error while changing the tcket status -> ref='.$objectemail->ref;
+													$this->errors[] = $this->error;
+												}
+											}
+											if (!empty($attachments)) {
+												// There is an attachment for the ticket -> store attachment
+												$ticket = New Ticket($this->db);
+												$ticket->fetch($fk_element_id);
+												$destdir = $conf->ticket->dir_output.'/'.$ticket->ref;
+												if (!dol_is_dir($destdir)) {
+													dol_mkdir($destdir);
+												}
+												if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
+													foreach ($attachments as $attachment) {
+														$attachment->save($destdir.'/');
+													}
+												} else {
+													$this->getmsg($connection, $imapemail, $destdir);
 												}
-											} else {
-												$this->getmsg($connection, $imapemail, $destdir);
 											}
 										}
+
 										$operationslog .= '<br>Event created -> id='.dol_escape_htmltag($actioncomm->id);
 									}
 								}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index f595ae566cf..037ec5c57c4 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -595,7 +595,11 @@ if (empty($reshook)) {
 		if ($object->fetch(GETPOSTINT('id'), '', GETPOSTINT('track_id')) >= 0) {
 			// prevent browser refresh from reopening ticket several times
 			if ($object->status == Ticket::STATUS_CLOSED || $object->status == Ticket::STATUS_CANCELED) {
-				$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
+				if ($object->fk_user_assign != null) {
+					$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
+				} else {
+					$res = $object->setStatut(Ticket::STATUS_NOT_READ);
+				}
 				if ($res) {
 					$url = 'card.php?track_id='.$object->track_id;
 					header("Location: ".$url);

From 32a49475909bb57df3cae53f05ff8cd09cf57b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 28 Feb 2024 23:42:23 +0100
Subject: [PATCH 0298/1862] fix phpstan (#28514)

* fix phpstan

* fix phpstan

* fix phpstan
---
 htdocs/core/class/html.formother.class.php  |  5 +++--
 htdocs/core/class/html.formprojet.class.php | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 5008cfc093b..86f850f7cdf 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
  * Copyright (C) 2007      Patrick Raguin 		<patrick.raguin@gmail.com>
  * Copyright (C) 2019       Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -662,7 +663,7 @@ class FormOther
 	 *  @param	string	$morecss				More css
 	 *  @return	void
 	 */
-	public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
+	public function selectProjectTasks($selectedtask = 0, $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
 	{
 		global $user, $langs;
 
@@ -998,7 +999,7 @@ class FormOther
 	 *	@param	int		$y      	Hauteur de l'image en pixels
 	 *	@return	void
 	 */
-	public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
+	public function CreateColorIcon($color, $module, $name, $x = 12, $y = 12)
 	{
 		// phpcs:enable
 		global $conf;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 020d01fd626..9bbc5e75018 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -2,6 +2,7 @@
 /* Copyright (c) 2013 Florian Henry  <florian.henry@open-concept.pro>
  * Copyright (C) 2015 Marcos García  <marcosgdf@gmail.com>
  * Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
+ * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,12 +144,12 @@ class FormProjets extends Form
 	 * @param string 	$filterkey 		Key to filter on title or ref
 	 * @param int 		$nooutput 		No print output. Return it only.
 	 * @param int 		$forceaddid 	Force to add project id in list, event if not qualified
-	 * @param int 		$htmlid 		Html id to use instead of htmlname
+	 * @param string	$htmlid 		Html id to use instead of htmlname
 	 * @param string 	$morecss 		More CSS
 	 * @param string 	$morefilter 	More filters (Must be a sql sanitized string)
 	 * @return int|string|array         HTML string or array of option or <0 if KO
 	 */
-	public function select_projects_list($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500', $morefilter = '')
+	public function select_projects_list($socid = -1, $selected = 0, $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500', $morefilter = '')
 	{
 		// phpcs:enable
 		global $user, $conf, $langs;
@@ -334,7 +335,7 @@ class FormProjets extends Form
 	 * @param User $usertofilter User object to use for filtering
 	 * @return int                    Nbr of tasks if OK, <0 if KO
 	 */
-	public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showmore = 'all', $usertofilter = null)
+	public function selectTasks($socid = -1, $selected = 0, $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showmore = 'all', $usertofilter = null)
 	{
 		global $user, $conf, $langs;
 
@@ -520,7 +521,7 @@ class FormProjets extends Form
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
 	 * @param string $table_element Table of the element to update
-	 * @param string $socid If of thirdparty to use as filter or 'id1,id2,...'
+	 * @param int|string $socid If of thirdparty to use as filter or 'id1,id2,...'
 	 * @param string $morecss More CSS
 	 * @param int $limitonstatus Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
 	 * @param string $projectkey Equivalent key  to fk_projet for actual table_element
@@ -802,7 +803,7 @@ class FormProjets extends Form
 	 * @param int $selectedInvoiceId Id invoice preselected
 	 * @param int $selectedLineId Id invoice line preselected
 	 * @param string $htmlNameInvoice Name of HTML select for Invoice
-	 * @param int $htmlNameInvoiceLine Name of HTML select for Invoice Line
+	 * @param string $htmlNameInvoiceLine Name of HTML select for Invoice Line
 	 * @param string $morecss More css added to the select component
 	 * @param array $filters Array of filters
 	 * @param int $lineOnly return only option for line

From 0580ac2ca6353b1a097823916b7f76e0bc9528e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 00:52:56 +0100
Subject: [PATCH 0299/1862] Better accessibility

---
 htdocs/bookmarks/bookmarks.lib.php         |  2 +-
 htdocs/core/menus/standard/auguria.lib.php |  4 +---
 htdocs/core/menus/standard/eldy.lib.php    |  4 +---
 htdocs/core/menus/standard/empty.php       |  4 +---
 htdocs/langs/en_US/main.lang               |  2 ++
 htdocs/main.inc.php                        |  8 ++++----
 htdocs/reception/index.php                 | 16 +++++-----------
 htdocs/supplier_proposal/index.php         |  4 +++-
 8 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 53e9879e176..711e4fa5a49 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -123,7 +123,7 @@ function printDropdownBookmarksList()
 
 			$searchForm .= '<input name="bookmark" id="top-bookmark-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Bookmarks').'" autocomplete="off" >';
 		} else {
-			$searchForm .= '<select name"=bookmark" id="boxbookmark" class="topmenu-bookmark-dropdown .dropdown-toggle">';
+			$searchForm .= '<select name="bookmark" id="boxbookmark" class="topmenu-bookmark-dropdown .dropdown-toggle maxwidth100">';
 			//$searchForm .= '<option>--'.$langs->trans("Bookmarks").'--</option>';
 			$searchForm .= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
 			$searchForm .= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" ';
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 3b49d190016..2b0fa54f453 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -193,10 +193,8 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
  */
 function print_start_menu_array_auguria()
 {
-	global $conf;
-
 	print '<div class="tmenudiv">';
-	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';
+	print '<ul role="navigation" class="tmenu"'.(getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' alt="Top menu"' : '').'>';
 }
 
 /**
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8f8dd72b20b..0bc601388b6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -607,10 +607,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
  */
 function print_start_menu_array()
 {
-	global $conf;
-
 	print '<div class="tmenudiv">';
-	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';
+	print '<ul role="navigation" class="tmenu"'.(getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' title="Top menu"' : '').'>';
 }
 
 /**
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index c67e783bd48..9f74d1aad15 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -477,10 +477,8 @@ class MenuManager
  */
 function print_start_menu_array_empty()
 {
-	global $conf;
-
 	print '<div class="tmenudiv">';
-	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';
+	print '<ul role="navigation" class="tmenu"'.(getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' title="Top menu"' : '').'>';
 }
 
 /**
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 685acf120c2..a1413b895b0 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1273,3 +1273,5 @@ FillMessageWithALayout=Fill message with a layout
 FillMessageWithAIContent=Fill message with AI content
 EnterYourAIPromptHere=Enter your AI prompt here
 UseOrOperatorShort=or
+GoOnList=Go on list
+ShowSearchFields=Do a search
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7e41e0b4d40..10a1066cffc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2419,8 +2419,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 			$nophoto = '/public/theme/common/user_woman.png';
 		}
 
-		$userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
-		$userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
+		$userImage = '<img class="photo photouserphoto userphoto" alt="" src="'.DOL_URL_ROOT.$nophoto.'">';
+		$userDropDownImage = '<img class="photo dropdown-user-image" alt="" src="'.DOL_URL_ROOT.$nophoto.'">';
 	}
 
 	$dropdownBody = '';
@@ -2605,7 +2605,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	} else {
 		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
-	    	<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'">
+	    	<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" alt="'.$langs->trans("MyUserCard").'">
 	    	'.$userImage.'
 	    		<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
 	    		</a>
@@ -3265,7 +3265,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Left menu"').'>'."\n\n";
+		print '<div class="vmenu"'.(getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' alt="Left menu"' : '').'>'."\n\n";
 
 		// Show left menu with other forms
 		$menumanager->menu_array = $menu_array_before;
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 4c923a3f307..d340d3420a8 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -79,8 +79,6 @@ if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This may be u
  * Draft receptions
  */
 
-$clause = " WHERE ";
-
 $sql = "SELECT e.rowid, e.ref, e.ref_supplier,";
 $sql .= " s.nom as name, s.rowid as socid,";
 $sql .= " c.ref as commande_fournisseur_ref, c.rowid as commande_fournisseur_id";
@@ -89,11 +87,9 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_t
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (!$user->hasRight('societe', 'client', 'voir')) {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-	$sql .= $clause." sc.fk_user = ".((int) $user->id);
-	$clause = " AND ";
+	$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = e.fk_soc AND sc.fk_user = ".((int) $user->id).")";
 }
-$sql .= $clause." e.fk_statut = 0";
+$sql .= " WHERE e.fk_statut = 0";
 $sql .= " AND e.entity IN (".getEntity('reception').")";
 if ($socid) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
@@ -213,9 +209,6 @@ if ($resql) {
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->hasRight('societe', 'client', 'voir')) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
@@ -223,7 +216,7 @@ if ($socid > 0) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
 if (!$user->hasRight('societe', 'client', 'voir')) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id).")";
 }
 $sql .= " ORDER BY c.rowid ASC";
 $resql = $db->query($sql);
@@ -236,7 +229,8 @@ if ($resql) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("SuppliersOrdersToProcess").' <span class="badge">'.$num.'</span></th></tr>';
+		print '<th colspan="3">'.$langs->trans("SuppliersOrdersToProcess");
+		print ' <a href="'.DOL_URL_ROOT.'/reception/list.php?search_status=1" alt="'.$langs->trans("GoOnList").'"><span class="badge">'.$num.'</span></a>';
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 21f15be1e32..6bfc7547d72 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -328,7 +328,9 @@ if (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'l
 		if ($num > 0) {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
+			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened");
+			print ' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?search_status=1" alt="'.$langs->trans("GoOnList").'"><span class="badge">'.$num.'</span></a>';
+			print '</th></tr>';
 
 			$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop) {

From a36580096711ac33f73812c72b88a6b161ee41af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 02:46:01 +0100
Subject: [PATCH 0300/1862] CSS

---
 htdocs/admin/ihm.php                    |  2 +-
 htdocs/core/class/html.form.class.php   |  2 +-
 htdocs/core/lib/functions.lib.php       |  2 +-
 htdocs/core/lib/usergroups.lib.php      |  4 ++--
 htdocs/core/menus/standard/eldy.lib.php |  4 ++--
 htdocs/langs/en_US/main.lang            |  3 ++-
 htdocs/main.inc.php                     |  5 +++++
 htdocs/theme/eldy/dropdown.inc.php      |  7 ++++---
 htdocs/theme/eldy/style.css.php         |  2 +-
 htdocs/theme/md/dropdown.inc.php        | 10 +++++++---
 htdocs/theme/md/style.css.php           |  3 ++-
 11 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 1d27c5b2dbd..d1d80394832 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -121,7 +121,7 @@ if ($action == 'update') {
 		}
 
 		if (GETPOSTISSET('THEME_TOPMENU_DISABLE_IMAGE')) {
-			$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
+			$val = GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
 			if (!$val) {
 				dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
 			} else {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ce7594a56f1..5bfcbd6587a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9969,7 +9969,7 @@ class Form
 						$ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
 					}
 				}
-				$ret .= '<img alt="Photo" class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . ' photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';
+				$ret .= '<img alt="" class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . ' photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';
 				if ($addlinktofullsize) {
 					$ret .= '</a>';
 				}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7c537c88f53..c33108fc51e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2335,7 +2335,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		if (empty($tabsname)) {
 			$tabsname = str_replace("@", "", $picto);
 		}
-		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem valignmiddle">';
+		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
 		$out .= '<div class="tab"><a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a></div>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 55228d7b43d..30db640ed07 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -526,14 +526,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		/*
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-		 print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
+		 print '<td>'.(getDolGlobalString('THEME_TOPMENU_DISABLE_IMAGE',$langs->trans("Default")).'</td>';
 		 print '<td class="left" class="nowrap" width="20%"><input name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TEXTLINK)?" 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_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray(getDolGlobalString('THEME_TOPMENU_DISABLE_IMAGE'),array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';
 		 }
 		 else
 		 {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 0bc601388b6..47cfd7c081d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -643,12 +643,12 @@ function print_start_menu_entry($idsel, $classname, $showmode)
  */
 function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
 {
-	global $conf, $langs;
+	global $langs;
 
 	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);
 	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);
 
-	//$conf->global->THEME_TOPMENU_DISABLE_TEXT=1;
+	//$conf->global->THEME_TOPMENU_DISABLE_IMAGE=1;
 	if ($showmode == 1) {
 		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 		print '<div class="'.$id.' '.$idsel.' topmenuimage">';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a1413b895b0..c610fed538a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1274,4 +1274,5 @@ FillMessageWithAIContent=Fill message with AI content
 EnterYourAIPromptHere=Enter your AI prompt here
 UseOrOperatorShort=or
 GoOnList=Go on list
-ShowSearchFields=Do a search
\ No newline at end of file
+ShowSearchFields=Do a search
+MyUserCard=My user file
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7de90577858..6188b79ed32 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1330,7 +1330,12 @@ if (GETPOSTINT('nojs')) {  // If javascript was not disabled on URL
 // Set MAIN_OPTIMIZEFORTEXTBROWSER for user (must be after login part)
 if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
+	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') == 1) {
+		$conf->global->THEME_TOPMENU_DISABLE_IMAGE = 1;
+	}
 }
+//var_dump($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+//var_dump($user->conf->THEME_TOPMENU_DISABLE_IMAGE);
 
 // set MAIN_OPTIMIZEFORCOLORBLIND for user
 $conf->global->MAIN_OPTIMIZEFORCOLORBLIND = empty($user->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? '' : $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index de150845d05..aabf6977fa3 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -156,8 +156,9 @@ div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::af
 }
 
 /*
-* MENU Dropdown
-*/
+ * MENU Dropdown
+ */
+ 
 .login_block.usedropdown .logout-btn{
 	display: none;
 }
@@ -207,7 +208,7 @@ div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::af
 }
 
 div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-quickadd-dropdown {
-	<?php if (!getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE')) { ?>
+	<?php if (!$disableimages) { ?>
 		line-height: 46px;
 	<?php } ?>
 }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2b894c4947e..82e8ff4ebda 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -278,7 +278,7 @@ $heightmenu = 50; /* height of top menu, part with image */
 $heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 180;
-if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
+if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$disableimages = 1;
 	$maxwidthloginblock = $maxwidthloginblock + 50;
 	$minwidthtmenu = 0;
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 634ea3c7c71..5ade6b0ea31 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -37,7 +37,7 @@ div#topmenu-quickadd-dropdown {
 }
 div#topmenu-bookmark-dropdown {
 	position: fixed;
-	<?php echo $right; ?>: 55px;
+	<?php echo $right; ?>: <?php print empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER) ? 55 : 85; ?>px;
 	top: 0px;
 }
 div#topmenu-login-dropdown {
@@ -135,7 +135,7 @@ button.dropdown-item.global-search-item {
 
 
 /* CSS to hide the arrow to show open/close */
-div#topmenu-global-search-dropdown, , div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
+div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
 	padding-right: 2px;
 }
 div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::after, div#topmenu-bookmark-dropdown a::after {
@@ -221,7 +221,11 @@ div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::af
 }
 
 div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-login-dropdown {
-	line-height: <?php echo(getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46'); ?>px;
+	<?php if ($disableimages) { ?>
+		line-height: 35px;
+	<?php } else { ?>
+		line-height: 46px;
+	<?php } ?>
 }
 a.top-menu-dropdown-link {
 	padding: 8px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4cdd5848e37..933bbc3b378 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -70,6 +70,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (empty($user->id) && !empty($_SESSION['dol_login'])) {
 	$user->fetch('', $_SESSION['dol_login'], '', 1);
 	$user->getrights();
+	//$user->loadPersonalConf();
 
 	// Reload menu now we have the good user (and we need the good menu to have ->showmenu('topnb') correct.
 	$menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
@@ -2775,7 +2776,7 @@ $heightmenu = 48; /* height of top menu, part with image */
 $heightmenu2 = 48; /* height of top menu, ârt with login  */
 $disableimages = 0;
 $maxwidthloginblock = 110;
-if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
+if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$heightmenu = 30;
 	$disableimages = 1;
 	$maxwidthloginblock = 180;

From fd216d99ed76dcbaab837c6e9c447c859fa8d60b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 11:45:50 +0100
Subject: [PATCH 0301/1862] NEW Add ALT+s to save a website page in edit mode

---
 htdocs/website/index.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 25fe96f7efe..c4083ba3dfc 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3146,7 +3146,18 @@ if (!GETPOST('hide_websitemenu')) {
 
 	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesiteconfirm')) || in_array($mode, array('replacesite'))) {
 		if ($action == 'editcss') {
-			print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone small" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+			// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
+			// accesskey is for Mac:               CTRL + key for all browsers
+			$stringforfirstkey = $langs->trans("KeyboardShortcut");
+			if ($conf->browser->name == 'chrome') {
+				$stringforfirstkey .= ' ALT +';
+			} elseif ($conf->browser->name == 'firefox') {
+				$stringforfirstkey .= ' ALT + SHIFT +';
+			} else {
+				$stringforfirstkey .= ' CTL +';
+			}
+
+			print '<input type="submit" accesskey="s" title="'.dol_escape_htmltag($stringforfirstkey.' s').'" id="savefileandstay" class="button buttonforacesave hideonsmartphone small" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 		}
 		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
 			print '<input type="submit" id="savefile" class="button buttonforacesave button-save small" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
@@ -3541,7 +3552,18 @@ if (!GETPOST('hide_websitemenu')) {
 		}
 		if (!in_array($mode, array('replacesite')) && !in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite'))) {
 			if ($action == 'editsource' || $action == 'editmeta') {
-				print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone small" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+				// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
+				// accesskey is for Mac:               CTRL + key for all browsers
+				$stringforfirstkey = $langs->trans("KeyboardShortcut");
+				if ($conf->browser->name == 'chrome') {
+					$stringforfirstkey .= ' ALT +';
+				} elseif ($conf->browser->name == 'firefox') {
+					$stringforfirstkey .= ' ALT + SHIFT +';
+				} else {
+					$stringforfirstkey .= ' CTL +';
+				}
+
+				print '<input type="submit" accesskey="s" title="'.dol_escape_htmltag($stringforfirstkey.' s').'" id="savefileandstay" class="button buttonforacesave hideonsmartphone small" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 			}
 			if (preg_match('/^create/', $action)) {
 				print '<input type="submit" id="savefile" class="button buttonforacesave button-save small" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';

From 697540efa882b69898a7d0d0b7eb7dc9d7d2c544 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 11:52:53 +0100
Subject: [PATCH 0302/1862] Fix use of customreports in include

---
 htdocs/core/customreports.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 1ada4100484..0dbe8585141 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1135,9 +1135,10 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 
 	llxFooter();
 	// End of page
+
+	$db->close();
 }
 
-$db->close();
 
 
 

From 6c01459e9e9a9610daebd2143e39a1d6ed9e8459 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 13:03:04 +0100
Subject: [PATCH 0303/1862] Can hide the legend

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

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 0dbe8585141..7cd80d5db19 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -285,6 +285,7 @@ $search_component_params_hidden = implode(' AND ', array_merge($arrayofandtagshi
 
 $MAXUNIQUEVALFORGROUP = 20;
 $MAXMEASURESINBARGRAPH = 20;
+$SHOWLEGEND = (isset($SHOWLEGEND) ? $SHOWLEGEND : 1);
 
 $YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
 $MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
@@ -1095,6 +1096,7 @@ if ($mode == 'graph') {
 		}
 
 		$px1->SetLegend($legend);
+		$px1->setShowLegend($SHOWLEGEND);
 		$px1->SetMinValue($px1->GetFloorMinValue());
 		$px1->SetMaxValue($px1->GetCeilMaxValue());
 		$px1->SetWidth($WIDTH);

From 9557ef56a7e859677af36e3251afb59cf24d3ba6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 13:36:21 +0100
Subject: [PATCH 0304/1862] Move lib into lib file

---
 htdocs/core/customreports.php         | 472 +------------------------
 htdocs/core/lib/customreports.lib.php | 490 ++++++++++++++++++++++++++
 2 files changed, 491 insertions(+), 471 deletions(-)
 create mode 100644 htdocs/core/lib/customreports.lib.php

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 7cd80d5db19..1841254fe3d 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -101,6 +101,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/company.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/customreports.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php";
@@ -1140,474 +1141,3 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 
 	$db->close();
 }
-
-
-
-
-/**
- * Fill arrayofmesures for an object
- *
- * @param 	mixed		$object			Any object
- * @param	string		$tablealias		Alias of table
- * @param	string		$labelofobject	Label of object
- * @param	array		$arrayofmesures	Array of measures already filled
- * @param	int			$level 			Level
- * @param	int			$count			Count
- * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
- * @return 	array						Array of measures
- */
-function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesures, $level = 0, &$count = 0, &$tablepath = '')
-{
-	global $langs, $extrafields, $db;
-
-	if (empty($object)) {	// Protection against bad use of method
-		return array();
-	}
-	if ($level > 10) {	// Protection against infinite loop
-		return $arrayofmesures;
-	}
-
-	if (empty($tablepath)) {
-		$tablepath = $object->table_element.'='.$tablealias;
-	} else {
-		$tablepath .= ','.$object->table_element.'='.$tablealias;
-	}
-
-	if ($level == 0) {
-		// Add the count of record only for the main/first level object. Parents are necessarily unique for each record.
-		$arrayofmesures[$tablealias.'.count'] = array(
-			'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans("Number"),
-			'labelnohtml' => $labelofobject.': '.$langs->trans("Number"),
-			'position' => 0,
-			'table' => $object->table_element,
-			'tablefromt' => $tablepath
-		);
-	}
-
-	// Note: here $tablealias can be 't' or 't__fk_contract' or 't_fk_contract_fk_soc'
-
-	// Add main fields of object
-	foreach ($object->fields as $key => $val) {
-		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
-			$position = (empty($val['position']) ? 0 : intval($val['position']));
-			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
-				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
-				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-				'position' => ($position + ($count * 100000)).'.1',
-				'table' => $object->table_element,
-				'tablefromt' => $tablepath
-			);
-			$arrayofmesures[$tablealias.'.'.$key.'-average'] = array(
-				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
-				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-				'position' => ($position + ($count * 100000)).'.2',
-				'table' => $object->table_element,
-				'tablefromt' => $tablepath
-			);
-			$arrayofmesures[$tablealias.'.'.$key.'-min'] = array(
-				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
-				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-				'position' => ($position + ($count * 100000)).'.3',
-				'table' => $object->table_element,
-				'tablefromt' => $tablepath
-			);
-			$arrayofmesures[$tablealias.'.'.$key.'-max'] = array(
-				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
-				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-				'position' => ($position + ($count * 100000)).'.4',
-				'table' => $object->table_element,
-				'tablefromt' => $tablepath
-			);
-		}
-	}
-	// Add extrafields to Measures
-	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
-				$position = (!empty($val['position']) ? $val['position'] : 0);
-				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.1',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-average'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.2',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-min'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.3',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-max'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.4',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			}
-		}
-	}
-	// Add fields for parent objects
-	foreach ($object->fields as $key => $val) {
-		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
-			$tmptype = explode(':', $val['type'], 4);
-			if ($tmptype[0] == 'integer' && !empty($tmptype[1]) && !empty($tmptype[2])) {
-				$newobject = $tmptype[1];
-				dol_include_once($tmptype[2]);
-				if (class_exists($newobject)) {
-					$tmpobject = new $newobject($db);
-					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
-					$count++;
-					$arrayofmesures = fillArrayOfMeasures($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofmesures, $level + 1, $count, $tablepath);
-				} else {
-					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
-				}
-			}
-		}
-	}
-
-	return $arrayofmesures;
-}
-
-
-/**
- * Fill arrayofmesures for an object
- *
- * @param 	mixed		$object			Any object
- * @param	string		$tablealias		Alias of table ('t' for example)
- * @param	string		$labelofobject	Label of object
- * @param	array		$arrayofxaxis	Array of xaxis already filled
- * @param	int			$level 			Level
- * @param	int			$count			Count
- * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
- * @return 	array						Array of xaxis
- */
-function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis, $level = 0, &$count = 0, &$tablepath = '')
-{
-	global $langs, $extrafields, $db;
-
-	if (empty($object)) {	// Protection against bad use of method
-		return array();
-	}
-	if ($level >= 3) {	// Limit scan on 2 levels max
-		return $arrayofxaxis;
-	}
-
-	if (empty($tablepath)) {
-		$tablepath = $object->table_element.'='.$tablealias;
-	} else {
-		$tablepath .= ','.$object->table_element.'='.$tablealias;
-	}
-
-	$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
-	$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
-	$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
-	$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
-	$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
-	$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
-
-	/*if ($level > 0) {
-		var_dump($object->element.' '.$object->isextrafieldmanaged);
-	}*/
-
-	// Note: here $tablealias can be 't' or 't__fk_contract' or 't_fk_contract_fk_soc'
-
-	// Add main fields of object
-	foreach ($object->fields as $key => $val) {
-		if (empty($val['measure'])) {
-			if (in_array($key, array(
-				'id', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
-				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
-				continue;
-			}
-			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
-				continue;
-			}
-			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
-				continue;
-			}
-			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
-				continue;
-			}
-			if (preg_match('/^pass/', $key)) {
-				continue;
-			}
-			if (in_array($val['type'], array('html', 'text'))) {
-				continue;
-			}
-			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($val['position']) ? 0 : intval($val['position']));
-				$arrayofxaxis[$tablealias.'.'.$key.'-year'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)).'.1',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofxaxis[$tablealias.'.'.$key.'-month'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)).'.2',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofxaxis[$tablealias.'.'.$key.'-day'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)).'.3',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			} else {
-				$position = (empty($val['position']) ? 0 : intval($val['position']));
-				$arrayofxaxis[$tablealias.'.'.$key] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)),
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			}
-		}
-	}
-
-	// Add extrafields to X-Axis
-	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
-				continue;
-			}
-			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
-				continue;
-			}
-
-			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
-				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.1',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.2',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.3',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			} else {
-				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			}
-		}
-	}
-
-	// Add fields for parent objects
-	foreach ($object->fields as $key => $val) {
-		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
-			$tmptype = explode(':', $val['type'], 4);
-			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
-				$newobject = $tmptype[1];
-				dol_include_once($tmptype[2]);
-				if (class_exists($newobject)) {
-					$tmpobject = new $newobject($db);
-					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
-					$count++;
-					$arrayofxaxis = fillArrayOfXAxis($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofxaxis, $level + 1, $count, $tablepath);
-				} else {
-					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
-				}
-			}
-		}
-	}
-
-	return $arrayofxaxis;
-}
-
-
-/**
- * Fill arrayofgrupby for an object
- *
- * @param 	mixed		$object			Any object
- * @param	string		$tablealias		Alias of table
- * @param	string		$labelofobject	Label of object
- * @param	array		$arrayofgroupby	Array of groupby already filled
- * @param	int			$level 			Level
- * @param	int			$count			Count
- * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
- * @return 	array						Array of groupby
- */
-function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroupby, $level = 0, &$count = 0, &$tablepath = '')
-{
-	global $langs, $extrafields, $db;
-
-	if (empty($object)) {	// Protection against bad use of method
-		return array();
-	}
-	if ($level >= 3) {
-		return $arrayofgroupby;
-	}
-
-	if (empty($tablepath)) {
-		$tablepath = $object->table_element.'='.$tablealias;
-	} else {
-		$tablepath .= ','.$object->table_element.'='.$tablealias;
-	}
-
-	$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
-	$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
-	$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
-	$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
-	$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
-	$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
-
-	// Note: here $tablealias can be 't' or 't__fk_contract' or 't_fk_contract_fk_soc'
-
-	// Add main fields of object
-	foreach ($object->fields as $key => $val) {
-		if (empty($val['isameasure'])) {
-			if (in_array($key, array(
-				'id', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
-				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
-				continue;
-			}
-			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
-				continue;
-			}
-			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
-				continue;
-			}
-			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
-				continue;
-			}
-			if (preg_match('/^pass/', $key)) {
-				continue;
-			}
-			if (in_array($val['type'], array('html', 'text'))) {
-				continue;
-			}
-			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($val['position']) ? 0 : intval($val['position']));
-				$arrayofgroupby[$tablealias.'.'.$key.'-year'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)).'.1',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofgroupby[$tablealias.'.'.$key.'-month'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)).'.2',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofgroupby[$tablealias.'.'.$key.'-day'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)).'.3',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			} else {
-				$position = (empty($val['position']) ? 0 : intval($val['position']));
-				$arrayofgroupby[$tablealias.'.'.$key] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
-					'position' => ($position + ($count * 100000)),
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			}
-		}
-	}
-
-	// Add extrafields to Group by
-	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
-				continue;
-			}
-			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
-				continue;
-			}
-
-			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
-				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
-				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.1',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.2',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => ($position + ($count * 100000)).'.3',
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			} else {
-				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
-					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
-					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
-					'table' => $object->table_element,
-					'tablefromt' => $tablepath
-				);
-			}
-		}
-	}
-
-	// Add fields for parent objects
-	foreach ($object->fields as $key => $val) {
-		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
-			$tmptype = explode(':', $val['type'], 4);
-			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
-				$newobject = $tmptype[1];
-				dol_include_once($tmptype[2]);
-				if (class_exists($newobject)) {
-					$tmpobject = new $newobject($db);
-					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
-					$count++;
-					$arrayofgroupby = fillArrayOfGroupBy($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofgroupby, $level + 1, $count, $tablepath);
-				} else {
-					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
-				}
-			}
-		}
-	}
-
-	return $arrayofgroupby;
-}
diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
new file mode 100644
index 00000000000..496b5a605ac
--- /dev/null
+++ b/htdocs/core/lib/customreports.lib.php
@@ -0,0 +1,490 @@
+<?php
+/* Copyright (C) 2024 Laurent Destailleur  <eldy@users.sourceforge.net>
+*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file		htdocs/core/lib/customreports.lib.php
+ *  \brief		Set of function to manipulate custom reports
+ */
+
+/**
+ * Fill arrayofmesures for an object
+ *
+ * @param 	mixed		$object			Any object
+ * @param	string		$tablealias		Alias of table
+ * @param	string		$labelofobject	Label of object
+ * @param	array		$arrayofmesures	Array of measures already filled
+ * @param	int			$level 			Level
+ * @param	int			$count			Count
+ * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
+ * @return 	array						Array of measures
+ */
+function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesures, $level = 0, &$count = 0, &$tablepath = '')
+{
+	global $langs, $extrafields, $db;
+
+	if (empty($object)) {	// Protection against bad use of method
+		return array();
+	}
+	if ($level > 10) {	// Protection against infinite loop
+		return $arrayofmesures;
+	}
+
+	if (empty($tablepath)) {
+		$tablepath = $object->table_element.'='.$tablealias;
+	} else {
+		$tablepath .= ','.$object->table_element.'='.$tablealias;
+	}
+
+	if ($level == 0) {
+		// Add the count of record only for the main/first level object. Parents are necessarily unique for each record.
+		$arrayofmesures[$tablealias.'.count'] = array(
+			'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans("Number"),
+			'labelnohtml' => $labelofobject.': '.$langs->trans("Number"),
+			'position' => 0,
+			'table' => $object->table_element,
+			'tablefromt' => $tablepath
+		);
+	}
+
+	// Note: here $tablealias can be 't' or 't__fk_contract' or 't_fk_contract_fk_soc'
+
+	// Add main fields of object
+	foreach ($object->fields as $key => $val) {
+		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
+			$position = (empty($val['position']) ? 0 : intval($val['position']));
+			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+				'position' => ($position + ($count * 100000)).'.1',
+				'table' => $object->table_element,
+				'tablefromt' => $tablepath
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-average'] = array(
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+				'position' => ($position + ($count * 100000)).'.2',
+				'table' => $object->table_element,
+				'tablefromt' => $tablepath
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-min'] = array(
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+				'position' => ($position + ($count * 100000)).'.3',
+				'table' => $object->table_element,
+				'tablefromt' => $tablepath
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-max'] = array(
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+				'position' => ($position + ($count * 100000)).'.4',
+				'table' => $object->table_element,
+				'tablefromt' => $tablepath
+			);
+		}
+	}
+	// Add extrafields to Measures
+	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
+				$position = (!empty($val['position']) ? $val['position'] : 0);
+				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-average'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-min'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-max'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.4',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			}
+		}
+	}
+	// Add fields for parent objects
+	foreach ($object->fields as $key => $val) {
+		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
+			$tmptype = explode(':', $val['type'], 4);
+			if ($tmptype[0] == 'integer' && !empty($tmptype[1]) && !empty($tmptype[2])) {
+				$newobject = $tmptype[1];
+				dol_include_once($tmptype[2]);
+				if (class_exists($newobject)) {
+					$tmpobject = new $newobject($db);
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
+					$count++;
+					$arrayofmesures = fillArrayOfMeasures($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofmesures, $level + 1, $count, $tablepath);
+				} else {
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
+				}
+			}
+		}
+	}
+
+	return $arrayofmesures;
+}
+
+
+/**
+ * Fill arrayofmesures for an object
+ *
+ * @param 	mixed		$object			Any object
+ * @param	string		$tablealias		Alias of table ('t' for example)
+ * @param	string		$labelofobject	Label of object
+ * @param	array		$arrayofxaxis	Array of xaxis already filled
+ * @param	int			$level 			Level
+ * @param	int			$count			Count
+ * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
+ * @return 	array						Array of xaxis
+ */
+function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis, $level = 0, &$count = 0, &$tablepath = '')
+{
+	global $langs, $extrafields, $db;
+
+	if (empty($object)) {	// Protection against bad use of method
+		return array();
+	}
+	if ($level >= 3) {	// Limit scan on 2 levels max
+		return $arrayofxaxis;
+	}
+
+	if (empty($tablepath)) {
+		$tablepath = $object->table_element.'='.$tablealias;
+	} else {
+		$tablepath .= ','.$object->table_element.'='.$tablealias;
+	}
+
+	$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+	$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+	$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+	$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+	$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+	$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+	/*if ($level > 0) {
+	 var_dump($object->element.' '.$object->isextrafieldmanaged);
+	 }*/
+
+	// Note: here $tablealias can be 't' or 't__fk_contract' or 't_fk_contract_fk_soc'
+
+	// Add main fields of object
+	foreach ($object->fields as $key => $val) {
+		if (empty($val['measure'])) {
+			if (in_array($key, array(
+				'id', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
+				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
+				continue;
+			}
+			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
+				continue;
+			}
+			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
+				continue;
+			}
+			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
+				continue;
+			}
+			if (preg_match('/^pass/', $key)) {
+				continue;
+			}
+			if (in_array($val['type'], array('html', 'text'))) {
+				continue;
+			}
+			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
+				$arrayofxaxis[$tablealias.'.'.$key.'-year'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofxaxis[$tablealias.'.'.$key.'-month'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofxaxis[$tablealias.'.'.$key.'-day'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			} else {
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
+				$arrayofxaxis[$tablealias.'.'.$key] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)),
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			}
+		}
+	}
+
+	// Add extrafields to X-Axis
+	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
+				continue;
+			}
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
+				continue;
+			}
+
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
+				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
+				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			} else {
+				$arrayofxaxis[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			}
+		}
+	}
+
+	// Add fields for parent objects
+	foreach ($object->fields as $key => $val) {
+		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
+			$tmptype = explode(':', $val['type'], 4);
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
+				$newobject = $tmptype[1];
+				dol_include_once($tmptype[2]);
+				if (class_exists($newobject)) {
+					$tmpobject = new $newobject($db);
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
+					$count++;
+					$arrayofxaxis = fillArrayOfXAxis($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofxaxis, $level + 1, $count, $tablepath);
+				} else {
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
+				}
+			}
+		}
+	}
+
+	return $arrayofxaxis;
+}
+
+
+/**
+ * Fill arrayofgrupby for an object
+ *
+ * @param 	mixed		$object			Any object
+ * @param	string		$tablealias		Alias of table
+ * @param	string		$labelofobject	Label of object
+ * @param	array		$arrayofgroupby	Array of groupby already filled
+ * @param	int			$level 			Level
+ * @param	int			$count			Count
+ * @param	string		$tablepath		Path of all tables ('t' or 't,contract' or 't,contract,societe'...)
+ * @return 	array						Array of groupby
+ */
+function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroupby, $level = 0, &$count = 0, &$tablepath = '')
+{
+	global $langs, $extrafields, $db;
+
+	if (empty($object)) {	// Protection against bad use of method
+		return array();
+	}
+	if ($level >= 3) {
+		return $arrayofgroupby;
+	}
+
+	if (empty($tablepath)) {
+		$tablepath = $object->table_element.'='.$tablealias;
+	} else {
+		$tablepath .= ','.$object->table_element.'='.$tablealias;
+	}
+
+	$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+	$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+	$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+	$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+	$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+	$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+	// Note: here $tablealias can be 't' or 't__fk_contract' or 't_fk_contract_fk_soc'
+
+	// Add main fields of object
+	foreach ($object->fields as $key => $val) {
+		if (empty($val['isameasure'])) {
+			if (in_array($key, array(
+				'id', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
+				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
+				continue;
+			}
+			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
+				continue;
+			}
+			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
+				continue;
+			}
+			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
+				continue;
+			}
+			if (preg_match('/^pass/', $key)) {
+				continue;
+			}
+			if (in_array($val['type'], array('html', 'text'))) {
+				continue;
+			}
+			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
+				$arrayofgroupby[$tablealias.'.'.$key.'-year'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofgroupby[$tablealias.'.'.$key.'-month'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofgroupby[$tablealias.'.'.$key.'-day'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			} else {
+				$position = (empty($val['position']) ? 0 : intval($val['position']));
+				$arrayofgroupby[$tablealias.'.'.$key] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)),
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			}
+		}
+	}
+
+	// Add extrafields to Group by
+	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
+				continue;
+			}
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
+				continue;
+			}
+
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
+				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
+				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-day'] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			} else {
+				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key] = array(
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val),
+					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
+					'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
+					'table' => $object->table_element,
+					'tablefromt' => $tablepath
+				);
+			}
+		}
+	}
+
+	// Add fields for parent objects
+	foreach ($object->fields as $key => $val) {
+		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
+			$tmptype = explode(':', $val['type'], 4);
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
+				$newobject = $tmptype[1];
+				dol_include_once($tmptype[2]);
+				if (class_exists($newobject)) {
+					$tmpobject = new $newobject($db);
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
+					$count++;
+					$arrayofgroupby = fillArrayOfGroupBy($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofgroupby, $level + 1, $count, $tablepath);
+				} else {
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
+				}
+			}
+		}
+	}
+
+	return $arrayofgroupby;
+}

From 1e11de0624d3dea40c3eaa94cf7b56a93fbc1eb6 Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:27:05 +0200
Subject: [PATCH 0305/1862] FIX #28491 (#28522)

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3d7460d34d9..521523f5ace 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2554,7 +2554,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<tr><td class="tdoverflow">'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td>';
 				if ($caneditfield) {
 					print img_picto('', 'state', 'class="pictofixedwidth"');
-					print $formcompany->select_state($object->state_id, $object->country_code, 'state_id');
+					print $formcompany->select_state_ajax('country_id', $object->state_id, $object->country_id, 'state_id');
 				} else {
 					print $object->state;
 				}

From 042ef30a9f88e9a80c6d1631f2c06955d1ee8135 Mon Sep 17 00:00:00 2001
From: Hasanuzzaman Sattar <h.sattar@alsoft.org>
Date: Thu, 29 Feb 2024 19:11:59 +0530
Subject: [PATCH 0306/1862] FIX #28518 (#28520)

* #28518

* Update interface_50_modTicket_TicketEmail.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .../triggers/interface_50_modTicket_TicketEmail.class.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index f18526a9d19..0afe5a7150b 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -246,13 +246,15 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					$linked_contacts = array_merge($linked_contacts, $object->listeContact(-1, 'internal'));
 					if (empty($linked_contacts) && !empty($conf->global->TICKET_NOTIFY_AT_CLOSING) && !empty($object->fk_soc)) {
 						$object->fetch_thirdparty();
-						$linked_contacts[] = $object->thirdparty->email;
+						$linked_contacts[]['email'] = $object->thirdparty->email;
 					}
 
 					$contactid = GETPOST('contactid', 'int');
 					$res = 0;
 
 					if ($contactid > 0) {
+						// TODO This security test has no sens. We must check that $contactid is inside $linked_contacts[]['id'] when $linked_contacts[]['source'] = 'external' or 'thirdparty'
+						// Refuse email if not
 						$contact = new Contact($this->db);
 						$res = $contact->fetch($contactid);
 						if (! in_array($contact, $linked_contacts)) {

From 83e4aac78a711d069726fe9d0e603bcad7fbe751 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 14:42:15 +0100
Subject: [PATCH 0307/1862] Doc

---
 htdocs/ticket/class/ticket.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4b0ba6f813d..81ed702b94e 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2270,7 +2270,7 @@ class Ticket extends CommonObject
 	 *    @param    int     $list           0:Return array contains all properties, 1:Return array contains just id
 	 *    @param    string  $code           Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
 	 *    @param    int     $status         Status of user or company
-	 *    @return   array|int               Array of contacts
+	 *    @return   array|int               Array of array('email'=>..., 'lastname'=>...)
 	 */
 	public function listeContact($statusoflink = -1, $source = 'external', $list = 0, $code = '', $status = -1)
 	{
@@ -2344,7 +2344,7 @@ class Ticket extends CommonObject
 
 				if (!$list) {
 					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
-					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_contact_label);
+					$labelType = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_contact_label);
 					$tab[$i] = array(
 							'source' => $obj->source,
 							'socid' => $obj->socid,
@@ -2356,7 +2356,8 @@ class Ticket extends CommonObject
 							'email' => $obj->email,
 							'rowid' => $obj->rowid,
 							'code' => $obj->code,
-							'libelle' => $libelle_type,
+							'libelle' => $labelType,		// deprecated, replaced with labeltype
+							'labeltype' => $labelType,
 							'status' => $obj->statuslink,
 							'statuscontact'=>$obj->statuscontact,
 							'fk_c_type_contact' => $obj->fk_c_type_contact,

From 3944eb362528d010749f3a33248e0bb1ef1acd12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 15:16:51 +0100
Subject: [PATCH 0308/1862] NEW Support a date selector with type 'html'

---
 htdocs/adherents/subscription.php     |  2 +-
 htdocs/core/class/html.form.class.php | 22 ++++++++--------------
 htdocs/langs/en_US/main.lang          |  3 ++-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index e0c12678e2a..90ee4d4cf74 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -608,7 +608,7 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) {
 
 // Public
 $linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '');
-print '<tr><td>'.$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist).'</td><td class="valeur">'.yn($object->public).'</td></tr>';
+print '<tr><td>'.$form->textwithpicto($langs->trans("PublicFile"), $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist), 1, 'help', '', 0, 3, 'publicfile').'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 // Other attributes
 $cols = 2;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5bfcbd6587a..33260bc65ff 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6882,6 +6882,10 @@ class Form
 		if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {
 			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
 		}
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
+			// If we use a text browser or screen reader, we use the 'combo' date selector
+			$usecalendar = 'html';
+		}
 
 		if ($d) {
 			// Show date with popup
@@ -6916,8 +6920,8 @@ class Form
 					$retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";
 					$retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";
 					$retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";
-				} elseif ($usecalendar == 'jquery') {
-					if (!$disabled) {
+				} elseif ($usecalendar == 'jquery' || $usecalendar == 'html') {
+					if (!$disabled && $usecalendar != 'html') {
 						// Output javascript for datepicker
 						$minYear = getDolGlobalInt('MIN_YEAR_SELECT_DATE', (date('Y') - 100));
 						$maxYear = getDolGlobalInt('MAX_YEAR_SELECT_DATE', (date('Y') + 100));
@@ -6959,19 +6963,9 @@ class Form
 					$retstring .= '>';
 
 					// Icone calendrier
-					if (!$disabled) {
-						/* Not required. Managed by option buttonImage of jquery
-						$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');
-						$retstring.='<script nonce="'.getNonce().'" type="text/javascript">';
-						$retstring.="jQuery(document).ready(function() {";
-						$retstring.='	jQuery("#'.$prefix.'id").click(function() {';
-						$retstring.="    	jQuery('#".$prefix."').focus();";
-						$retstring.='    });';
-						$retstring.='});';
-						$retstring.="</script>";*/
-					} else {
+					if ($disabled) {
 						$retstringbutton = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
-						$retsring = $retstringbutton . $retstring;
+						$retstring = $retstringbutton . $retstring;
 					}
 
 					$retstring .= '</div>';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c610fed538a..129a7d0feb0 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1275,4 +1275,5 @@ EnterYourAIPromptHere=Enter your AI prompt here
 UseOrOperatorShort=or
 GoOnList=Go on list
 ShowSearchFields=Do a search
-MyUserCard=My user file
\ No newline at end of file
+MyUserCard=My user file
+PublicFile=Public file
\ No newline at end of file

From ef31b0969b3c3ebd2c37b4d9d21dd367f427c8ac Mon Sep 17 00:00:00 2001
From: gti-eu <60189441+gti-eu@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:25:20 +0100
Subject: [PATCH 0309/1862] Fix entity when creating project (#28519)

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index b071f2db420..dee6d2bcef5 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -494,7 +494,7 @@ class Project extends CommonObject
 		$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
-		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".setEntity($this);
 		$sql .= ", ".(!isset($this->ip) ? 'NULL' : "'".$this->db->escape($this->ip)."'");
 		$sql .= ")";
 

From 88fde71187195d3d86f0f054da86ae0d139f2a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:25:38 +0100
Subject: [PATCH 0310/1862] Update codespell-dict.txt (#28517)

---
 dev/tools/codespell/codespell-dict.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt
index 00764f45d53..c40c7608602 100644
--- a/dev/tools/codespell/codespell-dict.txt
+++ b/dev/tools/codespell/codespell-dict.txt
@@ -9,6 +9,7 @@ aploha->alpha
 aplohanothtml->alphanohtml
 aplphanothtml->alphanohtml
 choosed->chosen
+dokument->document
 dolibar->dolibarr
 dollibar->dolibarr
 dollibarr->dolibarr

From c5fccd41108e3279d38f08816555733ce1954a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:26:53 +0100
Subject: [PATCH 0311/1862] fix phpstan (#28516)

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
---
 htdocs/compta/deplacement/card.php                    | 10 +++++-----
 htdocs/compta/deplacement/class/deplacement.class.php |  4 ++--
 htdocs/core/lib/agenda.lib.php                        |  4 ++--
 htdocs/core/lib/barcode.lib.php                       |  3 ++-
 htdocs/core/lib/company.lib.php                       |  4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 34e00414b43..785bc96edc5 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,7 +97,7 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
 		$error = 0;
 
 		$object->date = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
-		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
+		$object->km = (float) price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
 		$object->type = GETPOST('type', 'alpha');
 		$object->socid = GETPOSTINT('socid');
 		$object->fk_user = GETPOSTINT('fk_user');
@@ -140,9 +140,9 @@ if ($action == 'validate' && $user->hasRight('deplacement', 'creer')) {
 	if (!GETPOST('cancel', 'alpha')) {
 		$result = $object->fetch($id);
 
-		$object->date			= dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
-		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
-		$object->type			= GETPOST('type', 'alpha');
+		$object->date = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
+		$object->km = (float) price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formatted amount
+		$object->type = GETPOST('type', 'alpha');
 		$object->socid = GETPOSTINT('socid');
 		$object->fk_user = GETPOSTINT('fk_user');
 		$object->note_private = GETPOST('note_private', 'alpha');
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 8a91ee9b50a..62208f5066c 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -215,7 +215,7 @@ class Deplacement extends CommonObject
 	public function update($user)
 	{
 		// Clean parameters
-		$this->km = price2num($this->km);
+		$this->km = (float) price2num($this->km);
 
 		// Check parameters
 		if (!is_numeric($this->km)) {
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 73b09437bbb..6e2772e1e59 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2022-2024  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024	Frédéric France				<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@
  * @param	int				$usergroupid		Id of group to filter on users
  * @param	string			$excludetype		A type to exclude ('systemauto', 'system', '')
  * @param	int   			$resourceid			Preselected value of resource for filter on resource
- * @param	array   		$search_categ_cus	Tag id
+ * @param	int     		$search_categ_cus	Tag id
  * @return	void
  */
 function print_actions_filter(
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 9f3ce7d3468..a236d108771 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2016 Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2004-2010 Folke Ashberg: Some lines of code were inspired from work
  *                         of Folke Ashberg into PHP-Barcode 0.3pl2, available as GPL
  *                         source code at http://www.ashberg.de/bar.
@@ -407,7 +408,7 @@ function barcode_encode_genbarcode($code, $encoding)
  * @param	array	$space		default:  $space[top]   = 2 * $scale; $space[bottom]= 2 * $scale;  $space[left]  = 2 * $scale;  $space[right] = 2 * $scale;
  * @return	string|void
  */
-function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '')
+function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = [])
 {
 	global $bar_color, $bg_color, $text_color;
 	global $font_loc, $filebarcode;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 65373fb5b3e..f09dda32803 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013-2014  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013       Christophe Battarel     <contact@altairis.fr>
  * Copyright (C) 2013-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Rui Strecht             <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
@@ -596,7 +596,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
  *    Return state translated from an id. Return value is always utf8 encoded and without entities.
  *
  *    @param    int			$id         	id of state (province/departement)
- *    @param    int			$withcode   	'0'=Return label,
+ *    @param    string		$withcode   	'0'=Return label,
  *    										'1'=Return string code + label,
  *    						  				'2'=Return code,
  *    						  				'all'=return array('id'=>,'code'=>,'label'=>)

From a5624528322878e0313a276f8899613daf5d9cb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 15:45:27 +0100
Subject: [PATCH 0312/1862] Try to restore consistency into isModEnabled. The
 array must contains old name -> new name

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c33108fc51e..62c8bc0ec3f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -219,27 +219,25 @@ function getDolUserInt($key, $default = 0, $tmpuser = null)
 define(
 	'MODULE_MAPPING',
 	array(
-		// Map deprecated names to internal names
+		// Map deprecated names to new names
 		'adherent' => 'member',  // Has new directory
 		'member_type' => 'adherent_type',   // No directory, but file called adherent_type
 		'banque' => 'bank',   // Has new directory
 		'contrat' => 'contract', // Has new directory
 		'entrepot' => 'stock',   // Has new directory
 		'projet'  => 'project', // Has new directory
+		'categorie' => 'category', // Has old directory
+		'commande' => 'order',    // Has old directory
+		'expedition' => 'shipping', // Has old directory
+		'facture' => 'invoice', // Has old directory
+		'fichinter' => 'intervention', // Has old directory
+		'ficheinter' => 'intervention',  // Backup for 'fichinter'
+		'propale' => 'propal', // Has old directory
+		'socpeople' => 'contact', // Has old directory
 
 		'actioncomm' => 'agenda',  // NO module directory (public dir agenda)
 		'product_price' => 'productprice', // NO directory
 		'product_fournisseur_price' => 'productsupplierprice', // NO directory
-
-		// Map future names to current internal names
-		'category' => 'categorie', // Has old directory
-		'order' => 'commande',    // Has old directory
-		'shipping' => 'expedition', // Has old directory
-		'invoice' => 'facture', // Has old directory
-		'intervention' => 'fichinter', // Has old directory
-		'ficheinter' => 'fichinter',  // Backup for 'fichinter'
-		'propal' => 'propale', // Has old directory
-		'contact' => 'socpeople', // Has old directory
 	)
 );
 

From 700c0e3e736e220b56dd2df88d2421acd65f4b28 Mon Sep 17 00:00:00 2001
From: atm-adrien <67913809+atm-adrien@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:49:26 +0100
Subject: [PATCH 0313/1862] FIX : Add new hidden conf "DISABLE_QTY_OVERWRITTEN"
 (#28523)

* FIX : Add new hidden conf "DISABLE_QTY_OVERWRITTEN"

* FIX : Change conf name

* FIX : PR returns
---
 htdocs/product/inventory/inventory.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 4ca3768fa11..b924b9c442c 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -1045,8 +1045,9 @@ if ($resql) {
 		// Expected quantity = Quantity in stock when we start inventory
 		print '<td class="right expectedqty" id="id_'.$obj->rowid.'" title="Stock viewed at last update: '.$obj->qty_stock.'">';
 		$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 (($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) && !getDolGlobalString('DISABLE_QTY_OVERWRITE')) {
 			if (isModEnabled('productbatch') && $product_static->hasbatch()) {
 				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
 			} else {

From d55650f206f2d29e8f6e6b8f9726de9abcbb51a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 16:10:14 +0100
Subject: [PATCH 0314/1862] FIX #24174

---
 htdocs/fourn/commande/card.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index adc56f49324..b41024bbc26 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1053,7 +1053,7 @@ if (empty($reshook)) {
 	}
 
 	// Force mandatory order method
-	if ($action == 'commande') {
+	if ($action == 'commande') {	// Not a real action so no permission test
 		$methodecommande = GETPOSTINT('methodecommande');
 
 		if ($cancel) {
@@ -1189,11 +1189,10 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$upload_dir = $conf->fournisseur->commande->dir_output;
-	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
-	if ($action == 'update_extras') {
+	if ($action == 'update_extras' && $permissiontoadd) {
 		$object->oldcopy = dol_clone($object, 2);
 
 		// Fill array 'array_options' with data from add form
@@ -1221,7 +1220,7 @@ if (empty($reshook)) {
 	/*
 	 * Create an order
 	 */
-	if ($action == 'add' && $usercancreate) {
+	if ($action == 'add' && $permissiontoadd) {
 		$error = 0;
 		$selectedLines = GETPOST('toselect', 'array');
 		if ($socid < 1) {
@@ -1430,7 +1429,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'webservice' && $permissiontoadd && GETPOST('mode', 'alpha') == "send" && !GETPOST('cancel', 'alpha')) {
 		$ws_url         = $object->thirdparty->webservices_url;
 		$ws_key         = $object->thirdparty->webservices_key;
 		$ws_user        = GETPOST('ws_user', 'alpha');
@@ -1448,8 +1447,8 @@ if (empty($reshook)) {
 			'entity' => $ws_entity
 		);
 
-		//Is sync supplier web services module activated? and everything filled?
-		if (empty($conf->syncsupplierwebservices->enabled)) {
+		// Is sync supplier web services module activated? and everything filled?
+		if (isModEnabled('syncsupplierwebservices')) {
 			setEventMessages($langs->trans("WarningModuleNotActive", $langs->transnoentities("Module2650Name")), null, 'mesgs');
 		} elseif (empty($ws_url) || empty($ws_key)) {
 			setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
@@ -1513,7 +1512,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $permissiontoadd) {
 		if ($action == 'addcontact') {
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
@@ -2165,7 +2164,7 @@ if ($action == 'create') {
 		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('PaymentConditions');
 		print '<td>';
-		if ($action != 'editconditions') {
+		if ($action != 'editconditions' && $permissiontoadd) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 		}
 		print '</tr></table>';
@@ -2184,7 +2183,7 @@ if ($action == 'create') {
 		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode') {
+		if ($action != 'editmode' && $permissiontoadd) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
@@ -2204,7 +2203,7 @@ if ($action == 'create') {
 			print '<table class="nobordernopadding centpercent"><tr><td>';
 			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 			print '</td>';
-			if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
+			if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT && $permissiontoadd) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			}
 			print '</tr></table>';
@@ -2252,7 +2251,7 @@ if ($action == 'create') {
 			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
 			print '<td>';
-			if ($action != 'editbankaccount' && $usercancreate) {
+			if ($action != 'editbankaccount' && $permissiontoadd) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 			}
 			print '</tr></table>';

From c18ea8a4566c226ba36c429ab240e602a818a9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Benke?=
 <1179011+defrance@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:15:14 +0100
Subject: [PATCH 0315/1862] php V8 Warning (empty value) (#26869)

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/comm/propal/list.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 24c92ad317c..1bceb107128 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2013      Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2016-2021 Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2017-2018 Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2017-2023 Charlene Benke			<charlene@patas-monkey.com>
  * Copyright (C) 2018	   Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2019-2021 Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2021	   Anthony Berton			<anthony.berton@bb2a.fr>
@@ -1935,7 +1935,9 @@ if ($search_date_signature_endyear) {
 				}
 
 				print '<td class="center">';
-				print $typenArray[$obj->typent_code];
+				if (!empty($obj->typent_code)) {
+					print $typenArray[$obj->typent_code];
+				}
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2008,10 +2010,12 @@ if ($search_date_signature_endyear) {
 			}
 			// Source - input reason
 			if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-				print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($form->cache_demand_reason[$obj->fk_input_reason]['label']).'">';
+				$labelInputReason = '';
 				if ($obj->fk_input_reason > 0) {
-					print $form->cache_demand_reason[$obj->fk_input_reason]['label'];
+					$labelInputReason = $form->cache_demand_reason[$obj->fk_input_reason]['label'];
 				}
+				print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($labelInputReason).'">';
+				print dol_escape_htmltag($labelInputReason);
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;

From dd3415b1ac533fb2c327a8b92078b6b334b6a140 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 16:41:00 +0100
Subject: [PATCH 0316/1862] Fix phan error and remove false alert

---
 dev/tools/phan/config.php            |  1 +
 dev/tools/phan/config_extended.php   |  2 +-
 dev/tools/phan/config_fixer.php      |  2 +-
 htdocs/accountancy/admin/account.php | 13 +++++++------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 2031e32501c..e20476455ed 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -391,6 +391,7 @@ return [
 		'PhanPluginUnknownFunctionParamType',
 		'PhanTypeSuspiciousStringExpression',
 		'PhanPluginRedundantAssignment',
+
 		'PhanTypeExpectedObjectPropAccess',
 		'PhanTypeInvalidRightOperandOfNumericOp',
 		'PhanPluginInlineHTML',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index c6dbc07a314..01e34d0a727 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -343,7 +343,7 @@ return [
 		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
 		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
 		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
-
+		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
 	],
 	// You can put relative paths to internal stubs in this config option.
 	// Phan will continue using its detailed type annotations,
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 04ae1d7207c..97b421ac07e 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -190,7 +190,7 @@ return [
 		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
 		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
 		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
-
+		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
 	],
 	// You can put relative paths to internal stubs in this config option.
 	// Phan will continue using its detailed type annotations,
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 7532b8fc9f4..e64af930999 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -203,21 +203,21 @@ if (empty($reshook)) {
 		if ($accounting->fetch($id)) {
 			$mode = GETPOSTINT('mode');
 			$result = $accounting->accountDeactivate($id, $mode);
+			if ($result < 0) {
+				setEventMessages($accounting->error, $accounting->errors, 'errors');
+			}
 		}
 
 		$action = 'update';
-		if ($result < 0) {
-			setEventMessages($accounting->error, $accounting->errors, 'errors');
-		}
 	} elseif ($action == 'enable' && $permissiontoadd) {
 		if ($accounting->fetch($id)) {
 			$mode = GETPOSTINT('mode');
 			$result = $accounting->accountActivate($id, $mode);
+			if ($result < 0) {
+				setEventMessages($accounting->error, $accounting->errors, 'errors');
+			}
 		}
 		$action = 'update';
-		if ($result < 0) {
-			setEventMessages($accounting->error, $accounting->errors, 'errors');
-		}
 	}
 }
 
@@ -387,6 +387,7 @@ if ($resql) {
 	}
 
 	// List of mass actions available
+	$arrayofmassactions = array();
 	if ($user->hasRight('accounting', 'chartofaccount')) {
 		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	}

From ef224a7a45ea8c321c49a2ee1696a08d41817d55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 16:48:52 +0100
Subject: [PATCH 0317/1862] Clean code

---
 htdocs/accountancy/admin/account.php               |  2 +-
 htdocs/accountancy/admin/subaccount.php            |  2 +-
 htdocs/accountancy/bookkeeping/export.php          |  2 +-
 htdocs/accountancy/bookkeeping/list.php            |  2 +-
 htdocs/adherents/list.php                          |  2 +-
 htdocs/adherents/subscription/list.php             |  2 +-
 htdocs/admin/emailcollector_list.php               |  2 +-
 htdocs/admin/mails_senderprofile_list.php          |  2 +-
 htdocs/admin/system/modules.php                    |  2 +-
 htdocs/bom/bom_list.php                            |  2 +-
 htdocs/bookcal/availabilities_list.php             |  2 +-
 htdocs/bookcal/calendar_list.php                   |  2 +-
 htdocs/bookmarks/list.php                          |  2 +-
 htdocs/comm/mailing/list.php                       |  2 +-
 htdocs/comm/propal/list.php                        |  2 +-
 htdocs/commande/list.php                           |  2 +-
 htdocs/commande/list_det.php                       |  2 +-
 htdocs/compta/bank/list.php                        |  2 +-
 htdocs/compta/bank/various_payment/list.php        |  2 +-
 htdocs/compta/facture/invoicetemplate_list.php     |  4 ++--
 htdocs/compta/facture/list.php                     |  2 +-
 htdocs/compta/paiement/cheque/list.php             |  2 +-
 htdocs/compta/paiement/list.php                    |  2 +-
 htdocs/compta/prelevement/list.php                 |  2 +-
 htdocs/compta/prelevement/orders_list.php          |  2 +-
 htdocs/compta/tva/list.php                         |  2 +-
 htdocs/contact/list.php                            |  2 +-
 htdocs/contrat/services_list.php                   |  2 +-
 htdocs/core/class/html.form.class.php              | 14 +++++++-------
 htdocs/core/lib/company.lib.php                    |  2 +-
 htdocs/don/list.php                                |  2 +-
 htdocs/don/paiement/list.php                       |  2 +-
 .../eventorganization/conferenceorbooth_list.php   |  2 +-
 .../conferenceorboothattendee_list.php             |  2 +-
 htdocs/expedition/list.php                         |  2 +-
 htdocs/expensereport/payment/list.php              |  2 +-
 htdocs/fichinter/list.php                          |  2 +-
 htdocs/fourn/facture/list-rec.php                  |  4 ++--
 htdocs/fourn/facture/list.php                      |  2 +-
 htdocs/fourn/paiement/list.php                     |  2 +-
 htdocs/holiday/define_holiday.php                  |  2 +-
 htdocs/holiday/list.php                            |  2 +-
 htdocs/holiday/view_log.php                        |  2 +-
 htdocs/hrm/evaluation_list.php                     |  2 +-
 htdocs/hrm/job_list.php                            |  2 +-
 htdocs/hrm/position_list.php                       |  2 +-
 htdocs/hrm/skill_list.php                          |  2 +-
 htdocs/intracommreport/list.php                    |  2 +-
 .../knowledgemanagement/knowledgerecord_list.php   |  2 +-
 htdocs/loan/list.php                               |  2 +-
 htdocs/modulebuilder/template/myobject_list.php    |  2 +-
 htdocs/mrp/mo_list.php                             |  2 +-
 htdocs/mrp/mo_movements.php                        |  2 +-
 htdocs/partnership/partnership_list.php            |  2 +-
 htdocs/product/inventory/list.php                  |  2 +-
 htdocs/product/list.php                            |  2 +-
 htdocs/product/stock/list.php                      |  2 +-
 htdocs/product/stock/movement_list.php             |  2 +-
 htdocs/product/stock/productlot_list.php           |  2 +-
 .../stock/stocktransfer/stocktransfer_list.php     |  2 +-
 htdocs/projet/list.php                             |  2 +-
 htdocs/projet/tasks/list.php                       |  4 ++--
 htdocs/projet/tasks/time.php                       |  2 +-
 htdocs/reception/list.php                          |  2 +-
 htdocs/recruitment/recruitmentcandidature_list.php |  2 +-
 htdocs/salaries/list.php                           |  2 +-
 htdocs/societe/list.php                            |  4 ++--
 htdocs/societe/website.php                         |  2 +-
 htdocs/supplier_proposal/list.php                  |  2 +-
 htdocs/user/group/list.php                         |  2 +-
 htdocs/user/list.php                               |  2 +-
 htdocs/variants/list.php                           |  2 +-
 htdocs/website/index.php                           |  2 +-
 htdocs/workstation/workstation_list.php            |  2 +-
 74 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index e64af930999..20d561ed752 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -456,7 +456,7 @@ if ($resql) {
 	print '<br>';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index b048663e405..54550180947 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -329,7 +329,7 @@ if ($resql) {
 	print '<div class="info">'.$langs->trans("WarningCreateSubAccounts").'</div>';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	$moreforfilter = '';
diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index b2d205f74eb..dd68ab09998 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -898,7 +898,7 @@ if (!getDolGlobalString('ACCOUNTING_REEXPORT')) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2c62409c4ae..064ec0547f1 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -798,7 +798,7 @@ if ($massaction == 'preunletteringauto') {
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 403026ff209..371d197f8fb 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -816,7 +816,7 @@ if ($search_all) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 $moreforfilter = '';
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 28ad3ef7dd7..6c3d7a228ce 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -414,7 +414,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index e431b1f19dc..8a04945c453 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -414,7 +414,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 1d718819e79..4adc4878e0e 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -536,7 +536,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 94c29927cb9..8316969135a 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -224,7 +224,7 @@ $mode = '';
 $arrayofmassactions = array();
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 $moreforfilter = '';
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index cd6aaf1eaee..a1bb6de9595 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -547,7 +547,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index a98a6beb8bb..76a217451e6 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -507,7 +507,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index e8fc92b546d..11b2dccafaf 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -490,7 +490,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 50212e04137..86f6dbcef7b 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -296,7 +296,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 082c75b6fe3..42673dea754 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -377,7 +377,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 1bceb107128..63ae45c6308 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1193,7 +1193,7 @@ if ($search_date_signature_endyear) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b8308827c6c..37cf3d1e97e 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1509,7 +1509,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 if (GETPOSTINT('autoselectall')) {
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 2be6cd61baf..eb8f9311f1d 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -973,7 +973,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 	if (GETPOSTINT('autoselectall')) {
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index d88cb100991..6b4d5d623d3 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -423,7 +423,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index d750864de6f..abf92b1237b 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -465,7 +465,7 @@ $arrayofmassactions = array();
 $moreforfilter= '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 13052314892..0013cd92406 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -533,7 +533,7 @@ $arrayofmassactions = array(
 $massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 //$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -574,7 +574,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 274ea165a53..cea102af870 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1335,7 +1335,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 
 // Show the massaction checkboxes only when this page is not opend from the Extended POS
 if ($massactionbutton && $contextpage != 'poslist') {
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 3d7129afbcd..c17cb3a73e1 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -274,7 +274,7 @@ if ($resql) {
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$massactionbutton = '';
 	if ($massactionbutton) {
 		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 769a0bd9ce7..b3b7de15c38 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -396,7 +396,7 @@ if ($search_all) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $massactionbutton = '';
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index e77bd4a2343..7f7e83b9502 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -323,7 +323,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 5efc08d75ea..48d871f0b22 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -314,7 +314,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 31d96758fcc..9a36f881ae4 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -401,7 +401,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 7d5d3858601..6ad1a75ad81 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1046,7 +1046,7 @@ print $hookmanager->resPrint;
 print '</div>';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= ((count($arrayofmassactions) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index a0d00d27442..4f92114505d 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -556,7 +556,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 33260bc65ff..c87e028e720 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8924,18 +8924,18 @@ class Form
 
 
 	/**
-	 *    Show a multiselect dropbox from an array. If a saved selection of fields exists for user (into $user->conf->MAIN_SELECTEDFIELDS_contextofpage), we use this one instead of default.
+	 * Show a multiselect dropbox from an array. If a saved selection of fields exists for user (into $user->conf->MAIN_SELECTEDFIELDS_contextofpage), we use this one instead of default.
 	 *
-	 * @param string $htmlname Name of HTML field
-	 * @param array $array Array with array of fields we could show. This array may be modified according to setup of user.
-	 * @param string $varpage Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
-	 * @param string $pos Position colon on liste value 'left' or '' (meaning 'right').
-	 * @return    string                    HTML multiselect string
+	 * @param string 	$htmlname 	Name of HTML field
+	 * @param array 	$array 		Array with array of fields we could show. This array may be modified according to setup of user.
+	 * @param string 	$varpage 	Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
+	 * @param string 	$pos 		Position colon on liste value 'left' or '' (meaning 'right').
+	 * @return string            	HTML multiselect string
 	 * @see selectarray()
 	 */
 	public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage, $pos = '')
 	{
-		global $conf, $langs, $user, $extrafields;
+		global $langs, $user;
 
 		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return '';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index f09dda32803..864bfabd0c5 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1151,7 +1151,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$mode = 'view';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 71bb09c41bc..9cba55f01d7 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -308,7 +308,7 @@ if ($search_all) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 32162646c27..70112d0b0f1 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -326,7 +326,7 @@ if ($search_all) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $massactionbutton = '';
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index ce211834b8c..e648af10fb2 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -827,7 +827,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 0c9722c4b78..ae874c2fcd1 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -803,7 +803,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index de32d3fc972..ccfd824db35 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -686,7 +686,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', ''));
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
 }
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 8034da0845a..1dc7e453e5f 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -355,7 +355,7 @@ if ($moreforfilter) {
 $arrayofmassactions = array();
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index ddc8d0c332b..177f8117d88 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -562,7 +562,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index d815eda212b..46c864aaa0c 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -527,7 +527,7 @@ $arrayofmassactions = array(
 $massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 //$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -569,7 +569,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 5fa0373d095..dbceca56a4b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1064,7 +1064,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 49c9a20a1c4..28665f0a8c5 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -377,7 +377,7 @@ if ($moreforfilter) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if (!empty($massactionbutton)) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 262f018054e..e1cff740510 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -330,7 +330,7 @@ if (count($typeleaves) == 0) {
 	$selectedfields = '';
 	if ($massactionbutton) {
 		$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-		$selectedfields .= ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+		$selectedfields .= ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 	}
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index e07efba6b2d..63af2a22c65 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -582,7 +582,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 $include = '';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index f5e6bb89491..4d8e19e8526 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -309,7 +309,7 @@ $disabled = 0;
 $include = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index f9d820c9d89..b34b6285ee4 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -495,7 +495,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index d184a6bb6bd..2049387eb1e 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -470,7 +470,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 5d8dcf538e9..bc7ff33f827 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -481,7 +481,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index fc867019aa9..1f392a16ff6 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -483,7 +483,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 8e7ae4fa679..8c5e2e7fe02 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -431,7 +431,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index c20ccb99e2c..2777bd5d92f 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -523,7 +523,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 38c9b66f0a2..e4db0081d44 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -320,7 +320,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 41264b0a467..06cd5c81f7a 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -581,7 +581,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 5a3442ace8d..c06b3f0d517 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -474,7 +474,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 31f2c784d98..deb9d39a97a 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -599,7 +599,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 3bd6005661f..2fcd215c197 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -721,7 +721,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 38e51960c08..64ac82d10f1 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -508,7 +508,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 214802925b8..5bbda11dc4d 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -954,7 +954,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 5eab969d4ce..bc801ba1bb8 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -523,7 +523,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 18d40cdcc82..f053f3d06fa 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1142,7 +1142,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index e73d364863f..3e2b4e3fddf 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -475,7 +475,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index ea9875ad375..3e9c5adc0c1 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -470,7 +470,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 1b030ac72f7..4e06ca01148 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1156,7 +1156,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8524b0ccb1e..cf3f3dc1405 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -294,7 +294,7 @@ if ($search_task_user > 0) {
 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 
 
 if ($id) {
@@ -836,7 +836,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 4ddc831827a..85b372e248b 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1548,7 +1548,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		$tasks = array();
 
 		$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-		$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+		$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 
 		$sql = "SELECT t.rowid, t.fk_element, t.element_date, t.element_datehour, t.element_date_withhour, t.element_duration, t.fk_user, t.note, t.thm,";
 		$sql .= " t.fk_product,";
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 6551eb35d36..9f33c9caea4 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -951,7 +951,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', ''));
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
 }
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index eb71f70cf0d..16aa9af1985 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -606,7 +606,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 91f57d2d880..4a0f9bc0552 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -473,7 +473,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1864043e62b..155eab9e0c5 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1245,8 +1245,8 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
-//$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+//$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= ((count($arrayofmassactions) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index d7d9ae2bed2..69e77953a77 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -419,7 +419,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 3fb07664ffa..178e55fb4b3 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -719,7 +719,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index c03b6264255..78fc1c83d99 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -329,7 +329,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage=empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index a5d146dc282..307d68b8d79 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -729,7 +729,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 4115d3b4c8f..2797c305cc4 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -506,7 +506,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index c4083ba3dfc..43f3e2e9686 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -4791,7 +4791,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
 
 			$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-			//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+			//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 			$selectedfields = '';
 			$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 1e6b89f4937..6f78f3ab4b3 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -491,7 +491,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table

From b62222c7e4b7e6d95458a32a841746b94d8680e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 16:51:17 +0100
Subject: [PATCH 0318/1862] Fix bad const

---
 test/phpunit/CodingPhpTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 8aebf3216fa..0d192ad6b33 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -704,7 +704,7 @@ class CodingPhpTest extends CommonClassTest
 		} else {
 			$this->assertTrue(
 				array_key_exists($module_name, self::VALID_MODULE_MAPPING)
-				|| array_key_exists($module_name, self::DEPRECATED_MODULE_MAPPIG),
+				|| array_key_exists($module_name, self::DEPRECATED_MODULE_MAPPING),
 				"Unknown module: $message"
 			);
 		}

From ed3b04a1c7bea28ad7a89a58706c155862af9253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:59:32 +0100
Subject: [PATCH 0319/1862] fix phpstan (#28525)

---
 htdocs/core/lib/company.lib.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 864bfabd0c5..54b4400b333 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -679,7 +679,7 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
  *    @param      Translate $outputlangs    Output language
  *    @return     string     			    Label translated of currency
  */
-function currency_name($code_iso, $withcode = '', $outputlangs = null)
+function currency_name($code_iso, $withcode = 0, $outputlangs = null)
 {
 	global $langs, $db;
 
@@ -1550,14 +1550,14 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 /**
  *    	Show html area with actions to do
  *
- * 		@param	Conf		$conf		        Object conf
- * 		@param	Translate	$langs		        Object langs
- * 		@param	DoliDB		$db			        Object db
- * 		@param	Adherent|Societe    $filterobj  Object thirdparty or member
- * 		@param	Contact		$objcon	            Object contact
- *      @param  int			$noprint	        Return string but does not output it
- *      @param  int			$actioncode 	    Filter on actioncode
- *      @return	string|void					    Return html part or void if noprint is 1
+ * 		@param	Conf				$conf		    Object conf
+ * 		@param	Translate			$langs		    Object langs
+ * 		@param	DoliDB				$db			    Object db
+ * 		@param	Adherent|Societe    $filterobj  	Object thirdparty or member
+ * 		@param	Contact				$objcon	        Object contact
+ *      @param  int					$noprint	    Return string but does not output it
+ *      @param  string|string[]		$actioncode 	Filter on actioncode
+ *      @return	string|void					    	Return html part or void if noprint is 1
  */
 function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '')
 {

From 4c116e1577ff543fb15cc9b8cd1f3bc0564fb91f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 17:59:17 +0100
Subject: [PATCH 0320/1862] Doc

---
 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 2cb7b41316a..8bc8cb9a9c1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8850,7 +8850,7 @@ abstract class CommonObject
 
 
 	/**
-	 * Function to prepare a part of the query for insert.
+	 * Function to return the array of data key-value from the ->fields and all the ->properties of an object.
 	 * Note $this->${field} are set by the page that make the createCommon or the updateCommon.
 	 * $this->${field} should be a clean value. The page can run
 	 *

From 9a41edfdc4959a5ef455ace6a53f45e8d3c154f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 18:22:48 +0100
Subject: [PATCH 0321/1862] Add code for better transition of using
 user_creation_id and user_modification_id

---
 htdocs/core/class/commonobject.class.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5cf411ade65..e5fa13c6521 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9714,20 +9714,26 @@ abstract class CommonObject
 
 		$fieldvalues = $this->setSaveQuery();
 
+		// Note: Here, $fieldvalues contains same keys (or less) that are inside ->fields
+
 		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
 			$fieldvalues['date_creation'] = $this->db->idate($now);
 		}
 		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
 			$fieldvalues['fk_user_creat'] = $user->id;
 		}
+		if (array_key_exists('user_creation_id', $fieldvalues) && !($fieldvalues['user_creation_id'] > 0)) {
+			$fieldvalues['user_creation_id'] = $user->id;
+		}
 		if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {
 			$fieldvalues['pass_crypted'] = dol_hash($this->pass);
 		}
-		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 		if (array_key_exists('ref', $fieldvalues)) {
 			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
 		}
 
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
+
 		$keys = array();
 		$values = array(); // Array to store string forged for SQL syntax
 		foreach ($fieldvalues as $k => $v) {
@@ -10011,17 +10017,23 @@ abstract class CommonObject
 
 		$fieldvalues = $this->setSaveQuery();
 
+		// Note: Here, $fieldvalues contains same keys (or less) that are inside ->fields
+
 		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
 			$fieldvalues['date_modification'] = $this->db->idate($now);
 		}
 		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) {
 			$fieldvalues['fk_user_modif'] = $user->id;
 		}
-		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
+		if (array_key_exists('user_modification_id', $fieldvalues) && !($fieldvalues['user_modification_id'] > 0)) {
+			$fieldvalues['user_modification_id'] = $user->id;
+		}
 		if (array_key_exists('ref', $fieldvalues)) {
 			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
 		}
 
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
+
 		// Add quotes and escape on fields with type string
 		$keys = array();
 		$values = array();

From 284fb49f607b8dec04bf0234528273af3a62d04b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 19:35:34 +0100
Subject: [PATCH 0322/1862] Try a better fix for #28526

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8bc8cb9a9c1..ed3203848bc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -570,6 +570,19 @@ abstract class CommonObject
 	public $user_modification_id;
 
 
+	/**
+	 * @var int ID
+	 * @deprecated	Use $user_creation_id
+	 */
+	public $fk_user_creat;
+
+	/**
+	 * @var int ID
+	 * @deprecated 	Use $user_modification_id
+	 */
+	public $fk_user_modif;
+
+
 	public $next_prev_filter;
 
 	/**
@@ -9048,6 +9061,11 @@ abstract class CommonObject
 		}
 		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
 			$fieldvalues['fk_user_creat'] = $user->id;
+			$this->fk_user_creat = $user->id;
+		}
+		if (array_key_exists('user_modification_id', $fieldvalues) && !($fieldvalues['user_modification_id'] > 0)) {
+			$fieldvalues['user_modification_id'] = $user->id;
+			$this->user_modification_id = $user->id;
 		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 		if (array_key_exists('ref', $fieldvalues)) {

From a0fc77cd76a5ca9b229d8503cc85ddc46bd84445 Mon Sep 17 00:00:00 2001
From: thomas-Ngr <tnegre@open-dsi.fr>
Date: Thu, 29 Feb 2024 19:40:51 +0100
Subject: [PATCH 0323/1862] Fix Form::load_cache_vatrates() countries dict
 (#28528)

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cd9f44130b9..e262eb163c9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6348,7 +6348,7 @@ class Form
 				if (!empty($user) && $user->admin && preg_match('/\'(..)\'/', $country_code, $reg)) {
 					$langs->load("errors");
 					$new_country_code = $reg[1];
-					$country_id = dol_getIdFromCode($this->db, $new_country_code, 'c_pays', 'code', 'rowid');
+					$country_id = dol_getIdFromCode($this->db, $new_country_code, 'c_country', 'code', 'rowid');
 					$this->error .= '<br>'.$langs->trans("ErrorFixThisHere", DOL_URL_ROOT.'/admin/dict.php?id=10'.($country_id > 0 ? '&countryidforinsert='.$country_id : ''));
 				}
 				$this->error .= '</span>';

From 821f327da4c7d8d075598f39b65b1741c019f80c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 19:47:58 +0100
Subject: [PATCH 0324/1862] Fix name of webservice

---
 htdocs/core/class/commonobject.class.php | 14 ++++++++++++++
 htdocs/fourn/commande/card.php           |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e5fa13c6521..a85f2485179 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -692,6 +692,18 @@ abstract class CommonObject
 	 */
 	public $user_modification_id;
 
+	/**
+	 * @var int ID
+	 * @deprecated	Use $user_creation_id
+	 */
+	public $fk_user_creat;
+
+	/**
+	 * @var int ID
+	 * @deprecated 	Use $user_modification_id
+	 */
+	public $fk_user_modif;
+
 
 	public $next_prev_filter;
 
@@ -9721,9 +9733,11 @@ abstract class CommonObject
 		}
 		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
 			$fieldvalues['fk_user_creat'] = $user->id;
+			$this->fk_user_creat = $user->id;
 		}
 		if (array_key_exists('user_creation_id', $fieldvalues) && !($fieldvalues['user_creation_id'] > 0)) {
 			$fieldvalues['user_creation_id'] = $user->id;
+			$this->user_modification_id = $user->id;
 		}
 		if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {
 			$fieldvalues['pass_crypted'] = dol_hash($this->pass);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index b41024bbc26..58bd75669d7 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1448,8 +1448,8 @@ if (empty($reshook)) {
 		);
 
 		// Is sync supplier web services module activated? and everything filled?
-		if (isModEnabled('syncsupplierwebservices')) {
-			setEventMessages($langs->trans("WarningModuleNotActive", $langs->transnoentities("Module2650Name")), null, 'mesgs');
+		if (isModEnabled('webservicesclient')) {
+			setEventMessages($langs->trans("WarningModuleNotActive", $langs->transnoentities("Module2660Name")), null, 'mesgs');
 		} elseif (empty($ws_url) || empty($ws_key)) {
 			setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
 		} elseif (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) {

From 034d6d8174b279fd2a80b6f86558f2e0635763dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 19:54:41 +0100
Subject: [PATCH 0325/1862] Fix bad property name

---
 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 a85f2485179..be8f26bbd47 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9737,7 +9737,7 @@ abstract class CommonObject
 		}
 		if (array_key_exists('user_creation_id', $fieldvalues) && !($fieldvalues['user_creation_id'] > 0)) {
 			$fieldvalues['user_creation_id'] = $user->id;
-			$this->user_modification_id = $user->id;
+			$this->user_creation_id = $user->id;
 		}
 		if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {
 			$fieldvalues['pass_crypted'] = dol_hash($this->pass);

From 0e0a7b0d21554decd9e360648c4324093e6724bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 20:05:37 +0100
Subject: [PATCH 0326/1862] Clean code

---
 htdocs/core/modules/modWebServicesClient.class.php | 2 +-
 htdocs/fourn/commande/card.php                     | 2 +-
 htdocs/societe/card.php                            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index bdd2f222cf6..c88080cc605 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -76,7 +76,7 @@ class modWebServicesClient extends DolibarrModules
 
 		// Permissions
 		$this->rights = array();
-		$this->rights_class = 'syncsupplierwebservices';
+		$this->rights_class = 'webservicesclient';
 		$r = 0;
 	}
 }
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 58bd75669d7..f1b8dafbf38 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2654,7 +2654,7 @@ if ($action == 'create') {
 				}
 
 				// Create a remote order using WebService only if module is activated
-				if (!empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) { // 2 means accepted
+				if (isModEnabled('webservicesclient') && $object->statut >= 2) { // 2 means accepted
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=webservice&token='.newToken().'&mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
 				}
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index facb6cc3d9c..aa8e03f9d5e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2501,7 +2501,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Webservices url/key
-				if (!empty($conf->syncsupplierwebservices->enabled)) {
+				if (isModEnabled('webservicesclient')) {
 					print '<tr><td>'.$form->editfieldkey('WebServiceURL', 'webservices_url', '', $object, 0).'</td>';
 					print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
 					print '<td>'.$form->editfieldkey('WebServiceKey', 'webservices_key', '', $object, 0).'</td>';
@@ -3101,7 +3101,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			*/
 
 			// Webservices url/key
-			if (!empty($conf->syncsupplierwebservices->enabled)) {
+			if (isModEnabled('webservicesclient')) {
 				print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
 				print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
 			}

From 59b0d6ca1b133965b14ab8be18d46d539d4c08b7 Mon Sep 17 00:00:00 2001
From: Bahfir Abbes <bafbes@gmail.com>
Date: Thu, 29 Feb 2024 20:15:23 +0100
Subject: [PATCH 0327/1862] Fix:False constant name (#28532)

Fix:False constant name
---
 htdocs/mrp/class/mo.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 3aec46aa856..061f8461495 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1627,8 +1627,8 @@ class Mo extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (getDolGlobalString('MO_ADDON_PDF')) {
-				$modele = getDolGlobalString('MO_ADDON_PDF');
+			} elseif (getDolGlobalString('MRP_MO_ADDON_PDF')) {
+				$modele = getDolGlobalString('MRP_MO_ADDON_PDF');
 			}
 		}
 

From ef050962977986488f94fbaaf8fa44d436c929d0 Mon Sep 17 00:00:00 2001
From: Bahfir Abbes <bafbes@gmail.com>
Date: Thu, 29 Feb 2024 20:15:23 +0100
Subject: [PATCH 0328/1862] Fix:False constant name (#28532)

Conflicts:
	htdocs/mrp/class/mo.class.php

Fix:False constant name
---
 htdocs/mrp/class/mo.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index e3d3999196d..2341f1fd406 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1631,8 +1631,8 @@ class Mo extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (getDolGlobalString('MO_ADDON_PDF')) {
-				$modele = $conf->global->MO_ADDON_PDF;
+			} elseif (getDolGlobalString('MRP_MO_ADDON_PDF')) {
+				$modele = getDolGlobalString('MRP_MO_ADDON_PDF');
 			}
 		}
 

From 632b06c5d8560328c2f7a47472206ffb21678b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Thu, 29 Feb 2024 20:22:38 +0100
Subject: [PATCH 0329/1862] ajout unitprice dans import FIX #28382 (#28531)

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

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 34f303fec9c..d26f893386e 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -368,7 +368,7 @@ class modFacture extends DolibarrModules
 			'fd.remise_percent' => 'Reduc. (%)',
 			// remise
 			// fk_remise_except
-			// subprice
+			'fd.subprice' => 'UnitPriceHT',
 			// price
 			'fd.total_ht' => 'LineTotalHT',
 			'fd.total_tva' => 'LineTotalVAT',
@@ -433,7 +433,7 @@ class modFacture extends DolibarrModules
 			'fd.remise_percent' => '0',
 			// remise
 			// fk_remise_except
-			// subprice
+			'fd.subprice' => '100',
 			// price
 			'fd.total_ht' => '100',
 			'fd.total_tva' => '21',

From e6c4583bc46ed07aba68066517c32f4aa3a09117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Thu, 29 Feb 2024 20:23:08 +0100
Subject: [PATCH 0330/1862] Prevent infinite loop with add notrigger parameter
 to the functions create, update & setMultiLangs (#28530)

---
 htdocs/categories/class/categorie.class.php | 23 +++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 6e88c1d2373..063207be7d8 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -416,12 +416,13 @@ class Categorie extends CommonObject
 	 *  Add category into database
 	 *
 	 *  @param	User	$user		Object user
+	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return	int 				-1 : SQL error
 	 *          					-2 : new ID unknown
 	 *          					-3 : Invalid category
 	 * 								-4 : category already exists
 	 */
-	public function create($user)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs, $hookmanager;
 		$langs->load('categories');
@@ -505,7 +506,7 @@ class Categorie extends CommonObject
 					}
 				}
 
-				if (!$error) {
+				if (!$error && !$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('CATEGORY_CREATE', $user);
 					if ($result < 0) {
@@ -536,11 +537,12 @@ class Categorie extends CommonObject
 	 * 	Update category
 	 *
 	 *	@param	User	$user		Object user
+	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 * 	@return	int		 			1 : OK
 	 *          					-1 : SQL error
 	 *          					-2 : invalid category
 	 */
-	public function update(User $user)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -586,7 +588,7 @@ class Categorie extends CommonObject
 				}
 			}
 
-			if (!$error) {
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('CATEGORY_MODIFY', $user);
 				if ($result < 0) {
@@ -1913,10 +1915,11 @@ class Categorie extends CommonObject
 	 *	Update ou cree les traductions des infos produits
 	 *
 	 *	@param	User	$user		Object user
+	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *
 	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
-	public function setMultiLangs($user)
+	public function setMultiLangs(User $user, $notrigger = 0)
 	{
 		global $langs;
 
@@ -1971,10 +1974,12 @@ class Categorie extends CommonObject
 		}
 
 		// Call trigger
-		$result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);
-		if ($result < 0) {
-			$this->error = $this->db->lasterror();
-			return -1;
+		if (!$notrigger) {
+			$result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);
+			if ($result < 0) {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
 		}
 		// End call triggers
 

From df8a6bd33666b78d5bd1c31d38c19404c606a492 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 20:39:21 +0100
Subject: [PATCH 0331/1862] Fix warning

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index be8f26bbd47..14fa0eb3565 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -583,11 +583,17 @@ abstract class CommonObject
 	 */
 	public $total_ttc;
 
+
 	/**
 	 * @var CommonObjectLine[]
 	 */
 	public $lines;
 
+	/**
+	 * @var string	Action code to use to record auto event in agenda. For exemple 'AC_OTH_AUTO'
+	 */
+	public $actiontypecode;
+
 	/**
 	 * @var mixed		Comments
 	 * @see fetchComments()

From f717343d70f884626c2511758af3ada55344aecb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 21:42:33 +0100
Subject: [PATCH 0332/1862] Clean code

---
 htdocs/accountancy/admin/accountmodel.php | 70 ++---------------------
 1 file changed, 5 insertions(+), 65 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 1ba824eb86e..6186bd2dc13 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -53,6 +53,8 @@ $id = 31;
 $rowid = GETPOST('rowid', 'alpha');
 $code = GETPOST('code', 'alpha');
 
+$acts = array();
+$actl = array();
 $acts[0] = "activate";
 $acts[1] = "disable";
 $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
@@ -314,19 +316,8 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 }
 
 // activate
-if ($action == $acts[0]) {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$db->escape($code)."'";
-	}
-
+if ($action == 'activate') {
+	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE rowid = ".((int) $rowid);
 	$result = $db->query($sql);
 	if (!$result) {
 		dol_print_error($db);
@@ -335,58 +326,7 @@ if ($action == $acts[0]) {
 
 // disable
 if ($action == $acts[1]) {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$db->escape($code)."'";
-	}
-
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
-	}
-}
-
-// favorite
-if ($action == 'activate_favorite') {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$db->escape($code)."'";
-	}
-
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
-	}
-}
-
-// disable favorite
-if ($action == 'disable_favorite') {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$db->escape($code)."'";
-	}
-
+	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE rowid = ".((int) $rowid);
 	$result = $db->query($sql);
 	if (!$result) {
 		dol_print_error($db);

From eae14a4022de613b72930f0c314c9024625b7b0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Feb 2024 23:45:02 +0100
Subject: [PATCH 0333/1862] Fix test on country similarty for MQ and GP

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 62c8bc0ec3f..56f7a222aa4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6876,7 +6876,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
  */
 function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournprice = 0)
 {
-	global $db, $conf, $mysoc;
+	global $db, $mysoc;
 
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -6888,8 +6888,10 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
 		$product = new Product($db);
 		$product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdpartytouse->country_code) {
-			// If country to consider is ours
+		if (($mysoc->country_code == $thirdpartytouse->country_code)
+			|| (in_array($mysoc->country_code, array('FR', 'MC')) && in_array($thirdpartytouse->country_code, array('FR', 'MC')))
+			|| (in_array($mysoc->country_code, array('MQ', 'GP')) && in_array($thirdpartytouse->country_code, array('MQ', 'GP'))) {
+			// If country of thirdparty to consider is ours
 			if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
 				$result = $product->get_buyprice($idprodfournprice, 0, 0, 0);
 				if ($result > 0) {

From 7722f0e7d48252834ff0c3c54d03b8d2756dc107 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 1 Mar 2024 01:11:41 +0100
Subject: [PATCH 0334/1862] Fix syntax error

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 56f7a222aa4..ba02ca41753 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6890,7 +6890,8 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
 
 		if (($mysoc->country_code == $thirdpartytouse->country_code)
 			|| (in_array($mysoc->country_code, array('FR', 'MC')) && in_array($thirdpartytouse->country_code, array('FR', 'MC')))
-			|| (in_array($mysoc->country_code, array('MQ', 'GP')) && in_array($thirdpartytouse->country_code, array('MQ', 'GP'))) {
+			|| (in_array($mysoc->country_code, array('MQ', 'GP')) && in_array($thirdpartytouse->country_code, array('MQ', 'GP')))
+			) {
 			// If country of thirdparty to consider is ours
 			if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
 				$result = $product->get_buyprice($idprodfournprice, 0, 0, 0);

From 04c560faa4a20a7d6e7c32aff7226f740884ed66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 1 Mar 2024 01:52:40 +0100
Subject: [PATCH 0335/1862] Fix warning

---
 htdocs/accountancy/admin/accountmodel.php                     | 2 +-
 htdocs/accountancy/admin/categories.php                       | 2 +-
 htdocs/accountancy/admin/categories_list.php                  | 2 +-
 htdocs/accountancy/admin/fiscalyear.php                       | 2 +-
 htdocs/accountancy/admin/journals_list.php                    | 2 +-
 htdocs/accountancy/admin/productaccount.php                   | 2 +-
 htdocs/accountancy/admin/subaccount.php                       | 2 +-
 htdocs/accountancy/bookkeeping/balance.php                    | 2 +-
 htdocs/accountancy/bookkeeping/export.php                     | 2 +-
 htdocs/accountancy/bookkeeping/list.php                       | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php              | 2 +-
 htdocs/accountancy/customer/lines.php                         | 2 +-
 htdocs/accountancy/customer/list.php                          | 2 +-
 htdocs/accountancy/expensereport/lines.php                    | 2 +-
 htdocs/accountancy/expensereport/list.php                     | 2 +-
 htdocs/accountancy/supplier/lines.php                         | 2 +-
 htdocs/accountancy/supplier/list.php                          | 2 +-
 htdocs/adherents/agenda.php                                   | 2 +-
 htdocs/adherents/document.php                                 | 2 +-
 htdocs/adherents/list.php                                     | 2 +-
 htdocs/adherents/subscription.php                             | 2 +-
 htdocs/adherents/subscription/list.php                        | 2 +-
 htdocs/adherents/type.php                                     | 2 +-
 htdocs/admin/const.php                                        | 2 +-
 htdocs/admin/defaultvalues.php                                | 2 +-
 htdocs/admin/dict.php                                         | 2 +-
 htdocs/admin/emailcollector_list.php                          | 2 +-
 htdocs/admin/events.php                                       | 2 +-
 htdocs/admin/mails_senderprofile_list.php                     | 2 +-
 htdocs/admin/mails_templates.php                              | 2 +-
 htdocs/admin/tools/dolibarr_export.php                        | 2 +-
 htdocs/admin/tools/export.php                                 | 2 +-
 htdocs/admin/tools/export_files.php                           | 2 +-
 htdocs/admin/tools/listevents.php                             | 2 +-
 htdocs/admin/tools/listsessions.php                           | 2 +-
 htdocs/admin/translation.php                                  | 2 +-
 htdocs/admin/website.php                                      | 2 +-
 htdocs/admin/website_options.php                              | 2 +-
 htdocs/asset/agenda.php                                       | 2 +-
 htdocs/asset/document.php                                     | 2 +-
 htdocs/asset/list.php                                         | 2 +-
 htdocs/asset/model/agenda.php                                 | 2 +-
 htdocs/asset/model/list.php                                   | 2 +-
 htdocs/blockedlog/admin/blockedlog_list.php                   | 2 +-
 htdocs/bom/bom_agenda.php                                     | 2 +-
 htdocs/bom/bom_document.php                                   | 2 +-
 htdocs/bookcal/availabilities_agenda.php                      | 2 +-
 htdocs/bookcal/availabilities_document.php                    | 2 +-
 htdocs/bookcal/availabilities_list.php                        | 2 +-
 htdocs/bookcal/calendar_agenda.php                            | 2 +-
 htdocs/bookcal/calendar_document.php                          | 2 +-
 htdocs/bookcal/calendar_list.php                              | 2 +-
 htdocs/bookmarks/list.php                                     | 2 +-
 htdocs/categories/viewcat.php                                 | 2 +-
 htdocs/comm/action/document.php                               | 2 +-
 htdocs/comm/action/index.php                                  | 2 +-
 htdocs/comm/action/list.php                                   | 2 +-
 htdocs/comm/action/pertype.php                                | 2 +-
 htdocs/comm/action/peruser.php                                | 2 +-
 htdocs/comm/action/rapport/index.php                          | 2 +-
 htdocs/comm/card.php                                          | 2 +-
 htdocs/comm/contact.php                                       | 2 +-
 htdocs/comm/mailing/advtargetemailing.php                     | 2 +-
 htdocs/comm/mailing/cibles.php                                | 2 +-
 htdocs/comm/propal/agenda.php                                 | 2 +-
 htdocs/comm/propal/document.php                               | 2 +-
 htdocs/comm/propal/list.php                                   | 2 +-
 htdocs/commande/agenda.php                                    | 2 +-
 htdocs/commande/customer.php                                  | 2 +-
 htdocs/commande/document.php                                  | 2 +-
 htdocs/commande/list.php                                      | 2 +-
 htdocs/commande/list_det.php                                  | 2 +-
 htdocs/compta/accounting-files.php                            | 2 +-
 htdocs/compta/bank/account_statement_document.php             | 2 +-
 htdocs/compta/bank/bankentries_list.php                       | 2 +-
 htdocs/compta/bank/document.php                               | 2 +-
 htdocs/compta/bank/list.php                                   | 2 +-
 htdocs/compta/bank/releve.php                                 | 2 +-
 htdocs/compta/bank/various_payment/document.php               | 2 +-
 htdocs/compta/bank/various_payment/list.php                   | 2 +-
 htdocs/compta/cashcontrol/cashcontrol_card.php                | 2 +-
 htdocs/compta/cashcontrol/cashcontrol_list.php                | 2 +-
 htdocs/compta/charges/index.php                               | 2 +-
 htdocs/compta/clients.php                                     | 2 +-
 htdocs/compta/deplacement/document.php                        | 2 +-
 htdocs/compta/deplacement/index.php                           | 2 +-
 htdocs/compta/deplacement/list.php                            | 2 +-
 htdocs/compta/facture/agenda-rec.php                          | 2 +-
 htdocs/compta/facture/agenda.php                              | 2 +-
 htdocs/compta/facture/card-rec.php                            | 2 +-
 htdocs/compta/facture/document.php                            | 2 +-
 htdocs/compta/facture/invoicetemplate_list.php                | 2 +-
 htdocs/compta/facture/list.php                                | 2 +-
 htdocs/compta/paiement.php                                    | 2 +-
 htdocs/compta/paiement/cheque/card.php                        | 2 +-
 htdocs/compta/paiement/cheque/list.php                        | 2 +-
 htdocs/compta/paiement/list.php                               | 2 +-
 htdocs/compta/paiement/tovalidate.php                         | 2 +-
 htdocs/compta/prelevement/card.php                            | 2 +-
 htdocs/compta/prelevement/create.php                          | 2 +-
 htdocs/compta/prelevement/demandes.php                        | 2 +-
 htdocs/compta/prelevement/factures.php                        | 2 +-
 htdocs/compta/prelevement/fiche-rejet.php                     | 2 +-
 htdocs/compta/prelevement/fiche-stat.php                      | 2 +-
 htdocs/compta/prelevement/line.php                            | 2 +-
 htdocs/compta/prelevement/list.php                            | 2 +-
 htdocs/compta/prelevement/orders_list.php                     | 2 +-
 htdocs/compta/prelevement/rejets.php                          | 2 +-
 htdocs/compta/recap-compta.php                                | 2 +-
 htdocs/compta/resultat/clientfourn.php                        | 2 +-
 htdocs/compta/sociales/document.php                           | 2 +-
 htdocs/compta/sociales/list.php                               | 2 +-
 htdocs/compta/sociales/payments.php                           | 2 +-
 htdocs/compta/tva/document.php                                | 2 +-
 htdocs/compta/tva/payments.php                                | 2 +-
 htdocs/contact/agenda.php                                     | 2 +-
 htdocs/contact/consumption.php                                | 2 +-
 htdocs/contact/document.php                                   | 2 +-
 htdocs/contact/list.php                                       | 2 +-
 htdocs/contrat/agenda.php                                     | 2 +-
 htdocs/contrat/document.php                                   | 2 +-
 htdocs/contrat/index.php                                      | 2 +-
 htdocs/contrat/list.php                                       | 2 +-
 htdocs/contrat/messaging.php                                  | 2 +-
 htdocs/contrat/services_list.php                              | 2 +-
 htdocs/core/ajax/ajaxdirpreview.php                           | 2 +-
 htdocs/core/customreports.php                                 | 2 +-
 htdocs/core/lib/company.lib.php                               | 2 +-
 htdocs/core/modules/movement/doc/pdf_standard.modules.php     | 2 +-
 htdocs/cron/list.php                                          | 2 +-
 htdocs/don/document.php                                       | 2 +-
 htdocs/don/list.php                                           | 2 +-
 htdocs/don/paiement/list.php                                  | 2 +-
 htdocs/ecm/dir_add_card.php                                   | 2 +-
 htdocs/ecm/dir_card.php                                       | 2 +-
 htdocs/ecm/file_card.php                                      | 2 +-
 htdocs/ecm/file_note.php                                      | 2 +-
 htdocs/ecm/index.php                                          | 2 +-
 htdocs/ecm/index_auto.php                                     | 2 +-
 htdocs/ecm/index_medias.php                                   | 2 +-
 htdocs/ecm/search.php                                         | 2 +-
 htdocs/eventorganization/conferenceorbooth_document.php       | 2 +-
 htdocs/eventorganization/conferenceorbooth_list.php           | 2 +-
 htdocs/eventorganization/conferenceorboothattendee_list.php   | 2 +-
 htdocs/expedition/document.php                                | 2 +-
 htdocs/expedition/list.php                                    | 2 +-
 htdocs/expensereport/document.php                             | 2 +-
 htdocs/expensereport/index.php                                | 2 +-
 htdocs/fichinter/agenda.php                                   | 2 +-
 htdocs/fichinter/card-rec.php                                 | 2 +-
 htdocs/fichinter/document.php                                 | 2 +-
 htdocs/fichinter/list.php                                     | 2 +-
 htdocs/fourn/commande/document.php                            | 2 +-
 htdocs/fourn/commande/list.php                                | 2 +-
 htdocs/fourn/contact.php                                      | 2 +-
 htdocs/fourn/facture/card-rec.php                             | 2 +-
 htdocs/fourn/facture/document.php                             | 2 +-
 htdocs/fourn/facture/list-rec.php                             | 2 +-
 htdocs/fourn/facture/list.php                                 | 2 +-
 htdocs/fourn/paiement/document.php                            | 2 +-
 htdocs/fourn/product/list.php                                 | 2 +-
 htdocs/ftp/index.php                                          | 2 +-
 htdocs/holiday/define_holiday.php                             | 2 +-
 htdocs/holiday/document.php                                   | 2 +-
 htdocs/holiday/list.php                                       | 2 +-
 htdocs/holiday/month_report.php                               | 2 +-
 htdocs/holiday/view_log.php                                   | 2 +-
 htdocs/hrm/establishment/info.php                             | 2 +-
 htdocs/hrm/evaluation_agenda.php                              | 2 +-
 htdocs/hrm/evaluation_document.php                            | 2 +-
 htdocs/hrm/evaluation_list.php                                | 2 +-
 htdocs/hrm/job_agenda.php                                     | 2 +-
 htdocs/hrm/job_document.php                                   | 2 +-
 htdocs/hrm/job_list.php                                       | 2 +-
 htdocs/hrm/position_agenda.php                                | 2 +-
 htdocs/hrm/position_document.php                              | 2 +-
 htdocs/hrm/position_list.php                                  | 2 +-
 htdocs/hrm/skill_agenda.php                                   | 2 +-
 htdocs/hrm/skill_card.php                                     | 2 +-
 htdocs/hrm/skill_document.php                                 | 2 +-
 htdocs/hrm/skill_list.php                                     | 2 +-
 htdocs/intracommreport/list.php                               | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_agenda.php         | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_document.php       | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_list.php           | 2 +-
 htdocs/loan/document.php                                      | 2 +-
 htdocs/loan/list.php                                          | 2 +-
 htdocs/margin/agentMargins.php                                | 2 +-
 htdocs/margin/checkMargins.php                                | 2 +-
 htdocs/margin/customerMargins.php                             | 2 +-
 htdocs/margin/productMargins.php                              | 2 +-
 htdocs/margin/tabs/productMargins.php                         | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php                      | 2 +-
 htdocs/mrp/mo_document.php                                    | 2 +-
 htdocs/mrp/mo_list.php                                        | 2 +-
 htdocs/opensurvey/list.php                                    | 2 +-
 htdocs/partnership/partnership_agenda.php                     | 2 +-
 htdocs/partnership/partnership_document.php                   | 2 +-
 htdocs/partnership/partnership_list.php                       | 2 +-
 htdocs/product/agenda.php                                     | 2 +-
 htdocs/product/document.php                                   | 2 +-
 htdocs/product/inventory/inventory.php                        | 2 +-
 htdocs/product/inventory/list.php                             | 2 +-
 htdocs/product/list.php                                       | 2 +-
 htdocs/product/popuprop.php                                   | 2 +-
 htdocs/product/reassort.php                                   | 2 +-
 htdocs/product/reassortlot.php                                | 2 +-
 htdocs/product/stats/bom.php                                  | 2 +-
 htdocs/product/stats/commande.php                             | 2 +-
 htdocs/product/stats/commande_fournisseur.php                 | 2 +-
 htdocs/product/stats/contrat.php                              | 2 +-
 htdocs/product/stats/facture.php                              | 2 +-
 htdocs/product/stats/facture_fournisseur.php                  | 2 +-
 htdocs/product/stats/facturerec.php                           | 2 +-
 htdocs/product/stats/mo.php                                   | 2 +-
 htdocs/product/stats/propal.php                               | 2 +-
 htdocs/product/stats/supplier_proposal.php                    | 2 +-
 htdocs/product/stock/list.php                                 | 2 +-
 htdocs/product/stock/massstockmove.php                        | 2 +-
 htdocs/product/stock/movement_card.php                        | 2 +-
 htdocs/product/stock/movement_list.php                        | 2 +-
 htdocs/product/stock/productlot_document.php                  | 2 +-
 htdocs/product/stock/productlot_list.php                      | 2 +-
 htdocs/product/stock/replenish.php                            | 2 +-
 htdocs/product/stock/replenishorders.php                      | 2 +-
 htdocs/product/stock/stats/commande_fournisseur.php           | 2 +-
 htdocs/product/stock/stats/expedition.php                     | 2 +-
 htdocs/product/stock/stats/mo.php                             | 2 +-
 htdocs/product/stock/stats/reception.php                      | 2 +-
 htdocs/product/stock/stockatdate.php                          | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_agenda.php   | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_document.php | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_list.php     | 2 +-
 htdocs/projet/agenda.php                                      | 2 +-
 htdocs/projet/list.php                                        | 2 +-
 htdocs/projet/messaging.php                                   | 2 +-
 htdocs/projet/tasks.php                                       | 2 +-
 htdocs/projet/tasks/document.php                              | 2 +-
 htdocs/projet/tasks/list.php                                  | 2 +-
 htdocs/projet/tasks/time.php                                  | 2 +-
 htdocs/public/members/public_list.php                         | 2 +-
 htdocs/public/opensurvey/index.php                            | 2 +-
 htdocs/public/recruitment/index.php                           | 2 +-
 htdocs/public/ticket/list.php                                 | 2 +-
 htdocs/reception/document.php                                 | 2 +-
 htdocs/reception/list.php                                     | 2 +-
 htdocs/recruitment/recruitmentcandidature_agenda.php          | 2 +-
 htdocs/recruitment/recruitmentcandidature_document.php        | 2 +-
 htdocs/recruitment/recruitmentcandidature_list.php            | 2 +-
 htdocs/recruitment/recruitmentjobposition_agenda.php          | 2 +-
 htdocs/recruitment/recruitmentjobposition_document.php        | 2 +-
 htdocs/recruitment/recruitmentjobposition_list.php            | 2 +-
 htdocs/resource/agenda.php                                    | 2 +-
 htdocs/resource/document.php                                  | 2 +-
 htdocs/resource/list.php                                      | 2 +-
 htdocs/salaries/document.php                                  | 2 +-
 htdocs/salaries/list.php                                      | 2 +-
 htdocs/salaries/payments.php                                  | 2 +-
 htdocs/societe/agenda.php                                     | 2 +-
 htdocs/societe/list.php                                       | 2 +-
 htdocs/societe/messaging.php                                  | 2 +-
 htdocs/societe/notify/card.php                                | 2 +-
 htdocs/societe/price.php                                      | 2 +-
 htdocs/societe/societecontact.php                             | 2 +-
 htdocs/societe/website.php                                    | 2 +-
 htdocs/stripe/charge.php                                      | 2 +-
 htdocs/stripe/payout.php                                      | 2 +-
 htdocs/stripe/transaction.php                                 | 2 +-
 htdocs/supplier_proposal/document.php                         | 2 +-
 htdocs/supplier_proposal/list.php                             | 2 +-
 htdocs/ticket/agenda.php                                      | 2 +-
 htdocs/ticket/document.php                                    | 2 +-
 htdocs/ticket/list.php                                        | 2 +-
 htdocs/ticket/messaging.php                                   | 2 +-
 htdocs/user/agenda.php                                        | 2 +-
 htdocs/user/document.php                                      | 2 +-
 htdocs/user/group/list.php                                    | 2 +-
 htdocs/user/hierarchy.php                                     | 2 +-
 htdocs/user/list.php                                          | 2 +-
 htdocs/user/messaging.php                                     | 2 +-
 htdocs/user/notify/card.php                                   | 2 +-
 htdocs/variants/list.php                                      | 2 +-
 htdocs/webhook/target_list.php                                | 2 +-
 htdocs/website/index.php                                      | 2 +-
 htdocs/workstation/workstation_agenda.php                     | 2 +-
 htdocs/workstation/workstation_document.php                   | 2 +-
 htdocs/workstation/workstation_list.php                       | 2 +-
 287 files changed, 287 insertions(+), 287 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 6186bd2dc13..8ff908b61e8 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -66,7 +66,7 @@ $active = 1;
 
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 131886d76f9..465f2836122 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -49,7 +49,7 @@ if ($cat_id == 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 7761efd6145..848b6f14d52 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -57,7 +57,7 @@ $listlimit = GETPOSTINT('listlimit') > 0 ? GETPOSTINT('listlimit') : 1000;
 
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 8f2aff9a587..d1ba74b8b56 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -32,7 +32,7 @@ $action = GETPOST('action', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 1df04810801..5aca1af44a3 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -61,7 +61,7 @@ $active = 1;
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index b625446ca60..164b5c72c04 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -87,7 +87,7 @@ if (empty($accounting_product_mode)) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalInt('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 54550180947..188915b0ec0 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -58,7 +58,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 13d9fe6dc16..a3edb6e68e0 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -67,7 +67,7 @@ $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index dd68ab09998..0b826be4a1e 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -138,7 +138,7 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNT
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 064ec0547f1..06921fc9d38 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -133,7 +133,7 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNT
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 24856b36ae3..4a39d78e5ef 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -108,7 +108,7 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNT
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 5c9457d818f..5994dba600e 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -68,7 +68,7 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index d51b43eccd9..6ef21c0f21e 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -83,7 +83,7 @@ if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDI
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 4fbc0642bc9..2320620fec7 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -62,7 +62,7 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index d70729d4521..8f996c42412 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -76,7 +76,7 @@ if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDI
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 3571a5e2df5..496a32b9825 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -70,7 +70,7 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index a97bfb1d531..db087830144 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -80,7 +80,7 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 742905600af..a42090f5b3c 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -44,7 +44,7 @@ $id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('rowid');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index ac692433247..e92e1da0d41 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -47,7 +47,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 371d197f8fb..45b3e121d99 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -105,7 +105,7 @@ if ($search_status < -2) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 90ee4d4cf74..9da83c5faf3 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -57,7 +57,7 @@ $cancel = GETPOST('cancel');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 6c3d7a228ce..efd6c1b1c47 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -60,7 +60,7 @@ $date_select = GETPOST("date_select", 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index a56598e360a..738ee68c23b 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -64,7 +64,7 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 792fe0b30cf..317e838e922 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -44,7 +44,7 @@ $constnote = GETPOST('constnote', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 0792ad97007..ee27ea183e9 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -49,7 +49,7 @@ $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'cr
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 6d2a0d032d7..a07b083ca12 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -65,7 +65,7 @@ $listoffset = GETPOST('listoffset');
 $listlimit = GETPOST('listlimit') > 0 ? GETPOST('listlimit') : 1000; // To avoid too long dictionaries
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 8a04945c453..c8c4869e7d9 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -53,7 +53,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 	$page = 0;
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 6b321316f47..323483601a1 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -44,7 +44,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 4adc4878e0e..e57e3794d3f 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -51,7 +51,7 @@ $rowid = GETPOST('rowid', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index a8c07357a81..9bbeade4cdd 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -84,7 +84,7 @@ $listlimit = GETPOST('listlimit', 'alpha') > 0 ? GETPOST('listlimit', 'alpha') :
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index a3ffe8a8c53..fb65a08dd92 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -34,7 +34,7 @@ $action = GETPOST('action', 'aZ09');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index a708e51adfa..860cef0e9cd 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -41,7 +41,7 @@ $file = dol_sanitizeFileName(GETPOST('filename_template', 'alpha'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 551a90c7b67..446a013df81 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -47,7 +47,7 @@ $file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2|\.zst)$/i', '', $
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 54fa535d5fc..b56acffee17 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -50,7 +50,7 @@ $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals"));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 4a1861be87b..0fdf1a0e561 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -50,7 +50,7 @@ if ($user->socid > 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 04b8cee7488..c8f47d241c6 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -54,7 +54,7 @@ if ($mode == 'searchkey') {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 3bceb532a83..b517491d14c 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -52,7 +52,7 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 680cd961729..8066ac8604d 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 7520dda55fc..f25da35dd6a 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -54,7 +54,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 69112f6e619..bf585199df1 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -44,7 +44,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 427307532e2..c8c105ab5c8 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -50,7 +50,7 @@ $id				= GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 04739e21408..ff190403410 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index 51033b5c2b1..f5c987e15f7 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -48,7 +48,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 6b4fbec24e3..305c34413e5 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -83,7 +83,7 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 82d832319c1..f6229b309a1 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -59,7 +59,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 67ef5c7e1c7..458d9d0b1aa 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -49,7 +49,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index 20fdeceede1..ac313e7b699 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -57,7 +57,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index cbd0d169216..433d92b144f 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -44,7 +44,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 76a217451e6..83df6105c77 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -55,7 +55,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index b7b2d319649..b3b131a8a7e 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -56,7 +56,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php
index 4a71e5d6457..c11253b4503 100644
--- a/htdocs/bookcal/calendar_document.php
+++ b/htdocs/bookcal/calendar_document.php
@@ -93,7 +93,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index 11b2dccafaf..fd187d7c757 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -52,7 +52,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 86f6dbcef7b..f333df50690 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -47,7 +47,7 @@ $search_title = GETPOST('search_title', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index ddfe5fc9946..d95e2c17619 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -57,7 +57,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 44107ddaaf1..ccda6ff5be1 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('actioncard', 'globalcard'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index a2b18358c1d..45c6579b4a7 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -70,7 +70,7 @@ $newparam = '';
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index bb80ee84540..03efd125979 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -118,7 +118,7 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index a190a675b77..f93373fc0f7 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -65,7 +65,7 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 // Sorting
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 035a4687ea1..70b325ed45f 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -65,7 +65,7 @@ $showbirthday = 0;
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 712c3ee0ccc..88e030f7431 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -42,7 +42,7 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index c00ff438490..b202ea2b3da 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -96,7 +96,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index ca78aa8f9c9..a0eec00fa04 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -32,7 +32,7 @@ $langs->load("companies");
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index adfb7feeffb..bb296e516ee 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -47,7 +47,7 @@ if (isModEnabled('category')) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d0b95b32522..c6686cae946 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array("mails", "admin"));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index 7a6f4d4d6e1..a61ed2e0270 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -53,7 +53,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 07ea2de457b..e0dbd6b45b1 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -49,7 +49,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 63ae45c6308..c98e2f12da7 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -147,7 +147,7 @@ $object_statut = GETPOST('search_statut', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index 3c0eea17f23..9ffb69fbb9c 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -53,7 +53,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 07086496213..4f826bf3af3 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -49,7 +49,7 @@ $langs->loadLangs(array("companies", "orders"));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 550ed05cc01..06ada04a04f 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -49,7 +49,7 @@ $ref		= GETPOST('ref');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 37cf3d1e97e..2fd664cbb68 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -122,7 +122,7 @@ $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/ma
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index eb8f9311f1d..9dcbe3711c1 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -137,7 +137,7 @@ $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/ma
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index b22abd7b33a..bb4b30474b7 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -80,7 +80,7 @@ $hookmanager->initHooks(array('comptafileslist', 'globallist'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index def4c89daa0..26613a6bb49 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -54,7 +54,7 @@ if ($user->socid) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index e6eacc582a6..5c09181dd3f 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -99,7 +99,7 @@ if (empty($dateop)) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $pageplusone = GETPOSTINT("pageplusone");
 if ($pageplusone) {
 	$page = $pageplusone - 1;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index c4265b4c184..006d8e72a4f 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -54,7 +54,7 @@ if ($user->socid) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 6b4d5d623d3..05c2ef6de13 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -76,7 +76,7 @@ $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index c745bd49245..97e855217a6 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -79,7 +79,7 @@ if ($user->hasRight('banque', 'consolidate') && $action == 'dvprev' && !empty($d
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $pageplusone = GETPOSTINT("pageplusone");
 if ($pageplusone) {
 	$page = $pageplusone - 1;
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index ca7fc8f2f9b..83bafc6aaad 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'banque', '', '', '');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index abf92b1237b..ffb7e72bbea 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -78,7 +78,7 @@ $search_type_id = GETPOSTINT('search_type_id');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 7c04430d3d7..fe4d5a15f77 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -49,7 +49,7 @@ $sday = (GETPOSTISSET('closeday') ? GETPOSTINT('closeday') : dol_print_date($now
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 2e57afab05e..a6c9cf5a361 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -48,7 +48,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index b67014218f5..534b4a45d01 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -66,7 +66,7 @@ $search_account = GETPOSTINT('search_account');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 6b450fe5df1..c7963e95090 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -48,7 +48,7 @@ $mode = GETPOST("mode");
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 3948fc98308..d950e51d852 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -48,7 +48,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index d02a91bc477..588ca81e0e8 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -41,7 +41,7 @@ $result = restrictedArea($user, 'deplacement', '', '');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 40e5b6cf9c5..a4b9ecad849 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -48,7 +48,7 @@ $search_company = GETPOST('search_company', 'alpha');
 // $search_amount=GETPOST('search_amount','alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index baee92ef2f1..6f1ed587758 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -54,7 +54,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php
index 25affb4c2f2..ab0edfbf10a 100644
--- a/htdocs/compta/facture/agenda.php
+++ b/htdocs/compta/facture/agenda.php
@@ -53,7 +53,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 036af5a2864..ab544c4ff70 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -76,7 +76,7 @@ $selectedLines = GETPOST('toselect', 'array');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 44519923cbe..47c6faf0c76 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -53,7 +53,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 0013cd92406..540242d2763 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -100,7 +100,7 @@ $search_status = GETPOSTINT('search_status');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cea102af870..5b9d6136b3f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -157,7 +157,7 @@ $filtre = GETPOST('filtre', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 83620a7e0ad..4d24a875fb1 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -53,7 +53,7 @@ $socid      = GETPOSTINT('socid');
 
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 $amounts = array();
 $amountsresttopay = array();
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index b2dcd4f0bc5..097006e12e2 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -51,7 +51,7 @@ $object = new RemiseCheque($db);
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index c17cb3a73e1..c7150a80504 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -57,7 +57,7 @@ $mode = GETPOST('mode', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index b3b7de15c38..c5c478e4672 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -72,7 +72,7 @@ $mode = GETPOST('mode', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 if (empty($page) || $page == -1) {
 	$page = 0; // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 8735b7c0ebd..7a79d37cc5c 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -38,7 +38,7 @@ if ($user->socid > 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 508c05c777f..a63f457062f 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -48,7 +48,7 @@ $date_trans = dol_mktime(GETPOSTINT('date_transhour'), GETPOSTINT('date_transmin
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 1e44e0d7088..930c01db9fe 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -55,7 +55,7 @@ $id_bankaccount = GETPOSTINT('id_bankaccount');
 $executiondate = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 50177879826..4422ff3da33 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -54,7 +54,7 @@ $search_societe = GETPOST('search_societe', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 358d5c9fff6..09015486e30 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -48,7 +48,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index fe3334fcfb9..aafc6f17833 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -54,7 +54,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 370a9a21ddc..b0fadbafd1b 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -44,7 +44,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index ff5bdf390b3..de713bb137b 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -46,7 +46,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 7f7e83b9502..0ac2ddfc701 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -51,7 +51,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 48d871f0b22..6bf465d1ea1 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -48,7 +48,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 68e5c098bcd..88d1f736422 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -43,7 +43,7 @@ $type = GETPOST('type', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index b65e13561d7..bff81de3bda 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -55,7 +55,7 @@ $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 7c14e3e1d1b..c300817bfa4 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -57,7 +57,7 @@ $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccount
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 8c22eeed12d..c66056c47ca 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -50,7 +50,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 951faa2c2b8..1d107b9a555 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -78,7 +78,7 @@ $search_account = GETPOSTINT('search_account');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 if (empty($page) || $page == -1) {
 	$page = 0; // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index dd5a463ecd1..22bde6bf509 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -57,7 +57,7 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index ba9af57f4c5..f2670861833 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -51,7 +51,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 52405d5e6ce..f67add4b840 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -50,7 +50,7 @@ if (!$year && $mode != 'tvaonly') {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 40d49e2404f..af06f40761f 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -95,7 +95,7 @@ $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'ro
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 9cf303b037e..fb761a5b541 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -52,7 +52,7 @@ $socid = !empty($object->thirdparty->id) ? $object->thirdparty->id : null;
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index ede18370781..1a98fb921fa 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -56,7 +56,7 @@ if (!empty($canvas)) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 6ad1a75ad81..6ae0192bfe1 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -135,7 +135,7 @@ $begin = GETPOST('begin');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 5c0506a94c7..848f1a088d7 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -66,7 +66,7 @@ $result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype);
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index df1fe678317..6f19a21fa69 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -56,7 +56,7 @@ if ($user->socid > 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index f4ea37d3d53..28f6c49a9fb 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('products', 'companies', 'contracts'));
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 $statut = GETPOST('statut') ? GETPOST('statut') : 1;
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 2b852c38ac6..455d801cb3e 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -111,7 +111,7 @@ $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $se
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php
index edaeb02525b..f7e1b285291 100644
--- a/htdocs/contrat/messaging.php
+++ b/htdocs/contrat/messaging.php
@@ -59,7 +59,7 @@ $ref		= GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ?GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 4f92114505d..928482bc1be 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -47,7 +47,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 11c2392f953..0f869a97ac0 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -56,7 +56,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST("sortfield", 'aZ09comma');
 	$sortorder = GETPOST("sortorder", 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 1841254fe3d..02b795734af 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -58,7 +58,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 54b4400b333..c71fe088869 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -998,7 +998,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$optioncss = GETPOST('optioncss', 'alpha');
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 	$search_status = GETPOSTINT("search_status");
 	if ($search_status == '') {
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index ede0da6bb76..cfaffb265a2 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -178,7 +178,7 @@ class pdf_standard extends ModelePDFMovement
 		$search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
 		$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+		$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 		$sortfield = GETPOST('sortfield', 'aZ09comma');
 		$sortorder = GETPOST('sortorder', 'aZ09comma');
 		if (empty($page) || $page == -1) {
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index f3a87e0ad60..e1010ce2559 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -45,7 +45,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 1674eddd54e..4176ac74d7a 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -53,7 +53,7 @@ $projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 9cba55f01d7..6a40d1bbe97 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -42,7 +42,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sc
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $type = GETPOST('type', 'aZ');
 $mode = GETPOST('mode', 'alpha');
 if (empty($page) || $page == -1) {
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 70112d0b0f1..2762f271fa2 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -61,7 +61,7 @@ $search_sale = GETPOSTINT('search_sale');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $type = GETPOST('type', 'aZ');
 $mode = GETPOST('mode', 'alpha');
 if (empty($page) || $page == -1) {
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 955e8116253..ad2b5b387c3 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -70,7 +70,7 @@ if ($module == 'ecm') {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 7e2bdfe8c6d..7444815a11e 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -50,7 +50,7 @@ if (empty($module)) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index e8055639b9a..a2551c18932 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -49,7 +49,7 @@ if ($user->socid > 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 5d247c992d8..580f8ab03dd 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -53,7 +53,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 08b3b74ada6..e0c191e8e23 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -48,7 +48,7 @@ $overwritefile = GETPOSTINT('overwritefile');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index a7560e312cb..0751cfd6f5d 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -49,7 +49,7 @@ $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index c5662a98835..8c888b6792a 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -56,7 +56,7 @@ $pageid  = GETPOSTINT('pageid');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 33fa81665a3..202ea14afb7 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -62,7 +62,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index a82d6a419c2..16ab981af3b 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -56,7 +56,7 @@ $project_ref = GETPOST('project_ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index e648af10fb2..41caf186654 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -61,7 +61,7 @@ $projectref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index ae874c2fcd1..94145c852e1 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -69,7 +69,7 @@ $withProjectUrl='';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 1f1f33c6151..d34d4b0a72d 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -50,7 +50,7 @@ $ref		= GETPOST('ref');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index ccfd824db35..c68cef6ebb6 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -76,7 +76,7 @@ $search_product_category = GETPOSTINT('search_product_category');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortfield) {
 	$sortfield = "e.ref";
 }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index ea22fc857c0..c28c5251dc1 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -49,7 +49,7 @@ $childids = $user->getAllChildIds(1);
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index d92721f6eb2..d1ed103e721 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -51,7 +51,7 @@ $result = restrictedArea($user, 'expensereport', '', '');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
index 9f49c3af6d2..ec91ebd4ae9 100644
--- a/htdocs/fichinter/agenda.php
+++ b/htdocs/fichinter/agenda.php
@@ -54,7 +54,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 8d4303b9e8d..bd1670c51e8 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -72,7 +72,7 @@ $result = restrictedArea($user, 'ficheinter', $id, $objecttype);
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 11e719a8b42..5ec97fd1908 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -58,7 +58,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 177f8117d88..ff5ca9fa367 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -85,7 +85,7 @@ $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$us
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index e50cfbc2633..56320809feb 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -51,7 +51,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index ab1f551519e..f23fc3c07bf 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -139,7 +139,7 @@ $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgener
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 6087d1bc00a..0be5b7bb135 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -44,7 +44,7 @@ if ($user->socid > 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index 4969b2b387f..d4581c706b3 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -58,7 +58,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'su
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 // Security check
 $id = (GETPOSTINT('facid') ? GETPOSTINT('facid') : GETPOSTINT('id'));
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 1aaccf4eb14..ea6fe3335d0 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -58,7 +58,7 @@ $hookmanager->initHooks(array('invoicesuppliercarddocument'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 46c864aaa0c..ef7bb7bc175 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -99,7 +99,7 @@ $search_status = GETPOSTINT('search_status');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index dbceca56a4b..3426dd33313 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -118,7 +118,7 @@ $filter = GETPOST('filtre', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index 540ef560f3c..b407c489822 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -63,7 +63,7 @@ $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn',
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 00d2e015751..5549f799ddd 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -49,7 +49,7 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index a3b8612c9de..0d3bf9a9496 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -57,7 +57,7 @@ $download_dir = $conf->ftp->dir_temp;
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index e1cff740510..b2ed2279bbc 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -50,7 +50,7 @@ $sortorder = GETPOST('sortorder', 'aZ09comma');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $confirm = GETPOST('confirm', 'alpha');
 
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index e8469b8eb20..94c60cf964e 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -49,7 +49,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 63af2a22c65..fb9f7632250 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -69,7 +69,7 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user-
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index a29801a4d52..f38ee1a7069 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -58,7 +58,7 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 4d8e19e8526..3c0a8154dac 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -62,7 +62,7 @@ $search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 0df72d8c37c..2d9ebbd1968 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -49,7 +49,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index ce32527702f..a65c659e867 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -61,7 +61,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index 12731eedf19..a83905abff9 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -50,7 +50,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index b34b6285ee4..861b25a1507 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -61,7 +61,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index 4b374757026..074f5e008f1 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -59,7 +59,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index 2c7e0887a35..2155f033088 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -48,7 +48,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 2049387eb1e..24686b42715 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -60,7 +60,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index 3ecc73f3dc3..ae37771e4c2 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -61,7 +61,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 35bb7e2ffb4..539a8405f4a 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -49,7 +49,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index bc7ff33f827..c72b7d2af20 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -60,7 +60,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index 743bb51e2e4..92fa94e9c4d 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -61,7 +61,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 6aeafeb78a3..7ae07c6a26f 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -517,7 +517,7 @@ if ($action != "create" && $action != "edit") {
 	$limit = 0;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 	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;
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index 7d7b1ace384..418208e0465 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -49,7 +49,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 1f392a16ff6..344e91be8dd 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -61,7 +61,7 @@ $id         = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 8c5e2e7fe02..3611ae2c51e 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -49,7 +49,7 @@ $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user-
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 56cd8d53062..77c814d60c9 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -57,7 +57,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 80761fbef89..fa4d8f75ed7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -45,7 +45,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 2777bd5d92f..9e77ee2e30e 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -60,7 +60,7 @@ if (GETPOSTISSET('formfilteraction')) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 19b7c76bfaf..1b6f586bb58 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -50,7 +50,7 @@ $result = restrictedArea($user, 'loan', $id, '', '');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index e4db0081d44..50f9b572833 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -46,7 +46,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 46fd62f5782..1113fe8ae4e 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -39,7 +39,7 @@ $mesg = '';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 598cb5610e7..730f5ea1479 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -43,7 +43,7 @@ $optioncss  = GETPOST('optioncss', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 056b04d09ad..d377da14927 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index b336a9a317d..be679953190 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -46,7 +46,7 @@ $mesg = '';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index fda75f4081f..a921bebd8c2 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -46,7 +46,7 @@ $object = new Product($db);
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 9ae75238423..6318eee1520 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -38,7 +38,7 @@ if (!empty($user->socid)) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 0e5d807f720..c8f09b37a9b 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -46,7 +46,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index c06b3f0d517..535576c789c 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -56,7 +56,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 1cc35db3789..e993190c45c 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -51,7 +51,7 @@ $search_status = GETPOST('search_status', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index e7b740e94a1..0f0fd217047 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -57,7 +57,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index 87d8c18402d..3b9e46c9639 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -45,7 +45,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 2fcd215c197..ba50933b9ec 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -58,7 +58,7 @@ $memberid = GETPOSTINT('rowid');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 5003be16077..81d18818a48 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -59,7 +59,7 @@ if ($user->socid) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 5ee7dac86cb..1435fa74b3a 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -65,7 +65,7 @@ $hookmanager->initHooks(array('productdocuments'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 1a0eb8a668f..f9aeb2f03ca 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -44,7 +44,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'in
 $backtopage = GETPOST('backtopage', 'alpha');
 $listoffset = GETPOST('listoffset', 'alpha');
 $limit = GETPOSTINT('limit') > 0 ? GETPOSTINT('limit') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 64ac82d10f1..8b57061e08e 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -49,7 +49,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 5bbda11dc4d..b82db510d94 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -120,7 +120,7 @@ $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user-
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index a116513c131..4cd1297d617 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -47,7 +47,7 @@ if (!empty($user->socid)) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 0c91c149e8f..a7ca019a763 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -52,7 +52,7 @@ $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 008ee43e68a..d78e47d5dfe 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -66,7 +66,7 @@ $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index ce698410b2e..b0257248690 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -53,7 +53,7 @@ $option = '';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 4d3476f72d9..0e7f8c297b5 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatsorder'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index b56374addb6..b71ab30826b 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -53,7 +53,7 @@ $mesg = '';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 33828c5faf5..8223a333022 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -49,7 +49,7 @@ $hookmanager->initHooks(array('productstatscontract'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index cc81c4170b4..b0b5ba6ea89 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -61,7 +61,7 @@ $showmessage = GETPOST('showmessage');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 61a98993331..7f68d34490d 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatssupplierinvoice'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index b2a0ae85510..6ba186fb886 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -56,7 +56,7 @@ $showmessage = GETPOST('showmessage');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 6060a224a87..998ca70a3db 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -51,7 +51,7 @@ $hookmanager->initHooks(array('productstatsmo'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 578bf62d489..becd2350fdd 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatspropal'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 34cec31dc40..704ec0457c4 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -52,7 +52,7 @@ $hookmanager->initHooks(array('productstatssupplierpropal'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index bc801ba1bb8..d41180191b7 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -63,7 +63,7 @@ if (isModEnabled('category')) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 24ba968be41..88b51aa78ab 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -64,7 +64,7 @@ $idline = GETPOST('idline');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 403b9984d34..5eb441f835e 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -75,7 +75,7 @@ $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index f053f3d06fa..969b058cf81 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -95,7 +95,7 @@ $type = GETPOSTINT("type");
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 9bd760e8e3b..3adc9370df5 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -63,7 +63,7 @@ $hookmanager->initHooks(array('productlotdocuments'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 3e2b4e3fddf..0b61dffa99d 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -56,7 +56,7 @@ $search_import_key = GETPOSTINT('search_import_key');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1adc5d07f47..ee51a45c4d5 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -89,7 +89,7 @@ $texte = '';
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index ed87bea7254..86573d63deb 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -45,7 +45,7 @@ $sref = GETPOST('search_ref', 'alpha');
 $snom = GETPOST('search_nom', 'alpha');
 $suser = GETPOST('search_user', 'alpha');
 $sttc = GETPOST('search_ttc', 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $search_product = GETPOSTINT('search_product');
 $search_dateyear = GETPOSTINT('search_dateyear');
 $search_datemonth = GETPOSTINT('search_datemonth');
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 1603a1c1b23..2d77dc86512 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -59,7 +59,7 @@ $showmessage = GETPOST('showmessage');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index 9569c9e5794..75be59f5d18 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -59,7 +59,7 @@ $showmessage = GETPOST('showmessage');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index bbf7aeeb62e..174dea1507c 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -52,7 +52,7 @@ $hookmanager->initHooks(array('batchproductstatsmo'));
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 2f088e1cb2f..26e6455ad32 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -59,7 +59,7 @@ $showmessage = GETPOST('showmessage');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index e6d2f5a6757..6b39de66295 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -85,7 +85,7 @@ foreach ($search_fk_warehouse as $key => $val) {
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index c1daca5153f..9f328000513 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -55,7 +55,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index 06b2be4f50a..7e851677dc1 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -44,7 +44,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 3e9c5adc0c1..864a9957c7f 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -51,7 +51,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php
index 3a07093cae1..d06cde2a04b 100644
--- a/htdocs/projet/agenda.php
+++ b/htdocs/projet/agenda.php
@@ -41,7 +41,7 @@ $contextpage = GETPOST('contextpage', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4e06ca01148..04463dc292f 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -78,7 +78,7 @@ $diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user-
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php
index 50555e99995..ea2ff3e7a89 100644
--- a/htdocs/projet/messaging.php
+++ b/htdocs/projet/messaging.php
@@ -41,7 +41,7 @@ $contextpage = GETPOST('contextpage', 'aZ09');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index d8c6ca3b391..4ae290dcf7a 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -57,7 +57,7 @@ $taskref = GETPOST('taskref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 33d0ec29877..207f331d327 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -49,7 +49,7 @@ $project_ref = GETPOST('project_ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index cf3f3dc1405..e47933d0efe 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -128,7 +128,7 @@ $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 85b372e248b..d4a18ca5fcc 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -96,7 +96,7 @@ $search_timespent_endmin = GETPOSTINT("search_timespent_duration_endmin");
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }        // If $page is not defined, or '' or -1
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index a39d3670b03..1401d22b82a 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -87,7 +87,7 @@ function llxFooterVierge()
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 64b8bd5a2c3..ef274a9efe5 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -56,7 +56,7 @@ $suffix = "";
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 753cf09eb1c..070e489af48 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -57,7 +57,7 @@ $suffix = "";
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index d1e4e142a1c..f257972f69c 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -326,7 +326,7 @@ if ($action == "view_ticketlist") {
 
 		$limit = $conf->liste_limit;
 
-		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+		$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 		if (empty($page) || $page == -1) {
 			$page = 0;
 		}     // If $page is not defined, or '' or -1
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index d834589f628..36d9a6efb15 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -52,7 +52,7 @@ $ref		= GETPOST('ref');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 9f33c9caea4..347ed2c756a 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -82,7 +82,7 @@ $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alph
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortfield) {
 	$sortfield = "e.ref";
 }
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 19d341267ca..a8339a0ca7b 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -57,7 +57,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 29aa3de893c..741e0107a45 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -44,7 +44,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 16aa9af1985..53f3ee74511 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -53,7 +53,7 @@ $lineid = GETPOSTINT('lineid');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 2440f0f343d..665f26bc75d 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -56,7 +56,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 045c64f0dd2..11e4fe7bb62 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -44,7 +44,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 396fa2a780b..b1e24a0fc52 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -49,7 +49,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index fa3c2d8a98a..61c17c3a66c 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -61,7 +61,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 790ccf85be0..9bf219dfcec 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 4ada45bd358..585d643bd26 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -78,7 +78,7 @@ if (empty($arch)) {
 }
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index f3d73ad78f2..89f6ee1b1f9 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -56,7 +56,7 @@ $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 4a0f9bc0552..0c7dea4f3c9 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -51,7 +51,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 2b77863cb04..b9f93125294 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -52,7 +52,7 @@ $mode       = GETPOST('mode', 'alpha'); // mode view for result
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index eab5c459f87..5acb9e4f050 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -55,7 +55,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 155eab9e0c5..df441063a51 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -155,7 +155,7 @@ $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user-
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index b3846293463..50ff1d6b7d7 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -55,7 +55,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index e5dd3f08b31..d2bad348b37 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -48,7 +48,7 @@ $result = restrictedArea($user, 'societe', '', '');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 3e7302ca93f..31d8f9cec31 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -265,7 +265,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 3dc6e26dee1..4411b7a1c37 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -46,7 +46,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 69e77953a77..1557332ec18 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -57,7 +57,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 4c279dd09e9..947fccafdb3 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -45,7 +45,7 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index c476f27b52d..0abc7a5063d 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -45,7 +45,7 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index d44f54631a2..bdca6980414 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -45,7 +45,7 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index ee8a3e2a0b7..650d89ffdc5 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 178e55fb4b3..eaa09a1b157 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -109,7 +109,7 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index ee55271a55d..74cb95e87d5 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -52,7 +52,7 @@ $url_page_current = DOL_URL_ROOT.'/ticket/agenda.php';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 0d690214cc8..12ec2a2d953 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -56,7 +56,7 @@ $url_page_current = DOL_URL_ROOT.'/ticket/document.php';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 5370e41ef85..a5ea8eaf13b 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -75,7 +75,7 @@ $search_dateclose_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateclose_endm
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index f8afb48b125..98fb7551fe1 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -52,7 +52,7 @@ $url_page_current = DOL_URL_ROOT.'/ticket/messaging.php';
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index 65aa9624f1b..a9887cc577c 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -55,7 +55,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index a4198526658..1c1f0895d46 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -85,7 +85,7 @@ if ($user->id != $id && !$canreaduser) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 78fc1c83d99..f491bdad587 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -51,7 +51,7 @@ $search = array();
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 57e34004faa..e5861cf00bc 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -48,7 +48,7 @@ if (empty($mode)) {
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 
 $search_statut = GETPOSTINT('search_statut');
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 307d68b8d79..b74db885f69 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -57,7 +57,7 @@ if ($user->socid > 0) {
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php
index 5ea25929406..d9db450b985 100644
--- a/htdocs/user/messaging.php
+++ b/htdocs/user/messaging.php
@@ -56,7 +56,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 5e90d52f0b2..dce0a64db09 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -48,7 +48,7 @@ $actionid = GETPOSTINT('actionid');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 2797c305cc4..3fd8e4b3b4c 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -47,7 +47,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index 83deb784f41..d1c307ba730 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -57,7 +57,7 @@ $id = GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 43f3e2e9686..92c1f56adad 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -145,7 +145,7 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index c5c998aef4f..cf25d186ae8 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -59,7 +59,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index 2c5f77c6173..e1b891da1ce 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -47,7 +47,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 6f78f3ab4b3..3ee747367d9 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -54,7 +54,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 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;

From 4f3a6d1959c0bdfb67b2728f5e0c0036364bbbfe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 1 Mar 2024 01:58:06 +0100
Subject: [PATCH 0336/1862] Removed false positive

---
 dev/tools/phan/config_extended.php | 1 +
 dev/tools/phan/config_fixer.php    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 01e34d0a727..ad7f49b2755 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -341,6 +341,7 @@ return [
 		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
 		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
 		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginDuplicateAdjacentStatement',
 		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
 		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
 		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 97b421ac07e..3a923aab530 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -188,6 +188,7 @@ return [
 		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
 		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
 		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginDuplicateAdjacentStatement',
 		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
 		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
 		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning

From 255af0fb3320b0f004219cab9ead3dfba1d3d60d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 1 Mar 2024 12:37:56 +0100
Subject: [PATCH 0337/1862] feat: add price label UI #28544

---
 htdocs/product/class/product.class.php        | 20 ++++++-
 .../class/productcustomerprice.class.php      | 23 ++++++++
 htdocs/product/price.php                      | 55 ++++++++++++++++++-
 3 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1cfc859b2b9..0cd4a63b0f6 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -178,6 +178,7 @@ class Product extends CommonObject
 	 * @var string
 	 */
 	public $price_base_type;
+	public $price_label;
 
 	//! Arrays for multiprices
 	public $multiprices = array();
@@ -674,6 +675,7 @@ class Product extends CommonObject
 		$this->price = (float) price2num($this->price);
 		$this->price_min_ttc = (float) price2num($this->price_min_ttc);
 		$this->price_min = (float) price2num($this->price_min);
+		$this->price_label = trim($this->price_label);
 		if (empty($this->tva_tx)) {
 			$this->tva_tx = 0;
 		}
@@ -816,6 +818,7 @@ class Product extends CommonObject
 					$sql .= ", price";
 					$sql .= ", price_ttc";
 					$sql .= ", price_base_type";
+					$sql .= ", price_label";
 					$sql .= ", tobuy";
 					$sql .= ", tosell";
 					if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
@@ -843,6 +846,7 @@ class Product extends CommonObject
 					$sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
 					$sql .= ", ".((int) $user->id);
 					$sql .= ", ".((int) $this->type);
+					$sql .= ", ".(!empty($this->price_label) ? "'".$this->db->escape($this->price_label)."'" : "null");
 					$sql .= ", ".price2num($price_ht, 'MT');
 					$sql .= ", ".price2num($price_ttc, 'MT');
 					$sql .= ", '".$this->db->escape($this->price_base_type)."'";
@@ -1954,9 +1958,9 @@ class Product extends CommonObject
 		}
 
 		// Add new price
-		$sql = "INSERT INTO ".$this->db->prefix()."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
+		$sql = "INSERT INTO ".$this->db->prefix()."product_price(price_level,date_price, fk_product, fk_user_author, price_label, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
 		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
-		$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
+		$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".(empty($this->price_label)?"null":"'".$this->db->escape($this->price_label)."'").", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
 		$sql .= " ".price2num($this->localtax1_tx).", ".price2num($this->localtax2_tx).", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".price2num($this->price_min).", ".price2num($this->price_min_ttc).", ".price2num($this->price_by_qty).", ".((int) $conf->entity).",".($this->fk_price_expression > 0 ? ((int) $this->fk_price_expression) : 'null');
 		$sql .= ")";
 
@@ -2301,10 +2305,11 @@ class Product extends CommonObject
 	 * @param  int    $ignore_autogen    Used to avoid infinite loops
 	 * @param  array  $localtaxes_array  Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
 	 * @param  string $newdefaultvatcode Default vat code
+	 * @param  string $price_label       Price Label
 	 * @param  int    $notrigger         Disable triggers
 	 * @return int                            Return integer <0 if KO, >0 if OK
 	 */
-	public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $notrigger = 0)
+	public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $price_label = '', $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -2431,6 +2436,7 @@ class Product extends CommonObject
 			$sql .= " localtax1_type = ".($localtaxtype1 != '' ? "'".$this->db->escape($localtaxtype1)."'" : "'0'").",";
 			$sql .= " localtax2_type = ".($localtaxtype2 != '' ? "'".$this->db->escape($localtaxtype2)."'" : "'0'").",";
 			$sql .= " default_vat_code = ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
+			$sql .= " price_label = ".(!empty($price_label) ? "'".$this->db->escape($price_label)."'" : "null").",";
 			$sql .= " tva_tx = ".(float) price2num($newvat).",";
 			$sql .= " recuperableonly = '".$this->db->escape($newnpr)."'";
 			$sql .= " WHERE rowid = ".((int) $id);
@@ -2448,6 +2454,7 @@ class Product extends CommonObject
 				$this->multiprices_recuperableonly[$level] = $newnpr;
 
 				$this->price = $price;
+				$this->price_label = $price_label;
 				$this->price_ttc = $price_ttc;
 				$this->price_min = $price_min;
 				$this->price_min_ttc = $price_min_ttc;
@@ -2455,6 +2462,7 @@ class Product extends CommonObject
 				$this->default_vat_code = $newdefaultvatcode;
 				$this->tva_tx = $newvat;
 				$this->tva_npr = $newnpr;
+
 				//Local taxes
 				$this->localtax1_tx = $localtax1;
 				$this->localtax2_tx = $localtax2;
@@ -2572,6 +2580,7 @@ class Product extends CommonObject
 		}
 		$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.sell_or_eat_by_mandatory, p.batch_mask, p.fk_unit,";
 		$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf,";
+		$sql .= " p.price_label,";
 		if ($separatedStock) {
 			$sql .= " SUM(sp.reel) as stock";
 		} else {
@@ -2615,6 +2624,7 @@ class Product extends CommonObject
 			}
 			$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.sell_or_eat_by_mandatory, p.batch_mask, p.fk_unit,";
 			$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
+			$sql .= " ,p.price_label";
 			if (!$separatedStock) {
 				$sql .= ", p.stock";
 			}
@@ -2638,6 +2648,7 @@ class Product extends CommonObject
 				$this->note = $obj->note_private; // deprecated
 
 				$this->type = $obj->fk_product_type;
+				$this->price_label = $obj->price_label;
 				$this->status = $obj->tosell;
 				$this->status_buy = $obj->tobuy;
 				$this->status_batch = $obj->tobatch;
@@ -2734,6 +2745,7 @@ class Product extends CommonObject
 					for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
+						$sql .= " ,price_label";
 						$sql .= " FROM ".$this->db->prefix()."product_price";
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
 						$sql .= " AND price_level=".((int) $i);
@@ -4802,6 +4814,7 @@ class Product extends CommonObject
 		$sql .= ", price_min";
 		$sql .= ", price_min_ttc";
 		$sql .= ", price_base_type";
+		$sql .= ", price_label";
 		$sql .= ", default_vat_code";
 		$sql .= ", tva_tx";
 		$sql .= ", recuperableonly";
@@ -4829,6 +4842,7 @@ class Product extends CommonObject
 		$sql .= ", price_min";
 		$sql .= ", price_min_ttc";
 		$sql .= ", price_base_type";
+		$sql .= ", price_label";
 		$sql .= ", default_vat_code";
 		$sql .= ", tva_tx";
 		$sql .= ", recuperableonly";
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 2c63a76b059..025e7c9ca8e 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -42,6 +42,7 @@ class ProductCustomerPrice extends CommonObject
 		'price_ttc' => array('type' => 'decimal(20,6)', 'label' => 'TTC', 'enabled' => 1, 'visible' => 1, 'position' => 8, 'notnull' => -1, 'comment' => 'Price TTC'),
 		'price_min' => array('type' => 'decimal(20,6)', 'label' => 'MinPriceHT', 'enabled' => 1, 'visible' => 1, 'position' => 9, 'notnull' => -1, 'comment' => 'Minimum Price'),
 		'price_min_ttc' => array('type' => 'decimal(20,6)', 'label' => 'MinPriceTTC', 'enabled' => 1, 'visible' => 1, 'position' => 10, 'notnull' => -1, 'comment' => 'Minimum Price TTC'),
+		'price_label' => array('type' => 'varchar(255)', 'label' => 'PriceLabel', 'enabled' => 1, 'visible' => 1, 'position' => 20, 'notnull' => -1, 'comment' => 'Price Label'),
 		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>1, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
 	);
 
@@ -89,6 +90,7 @@ class ProductCustomerPrice extends CommonObject
 	public $localtax1_tx;
 	public $localtax2_type;
 	public $localtax2_tx;
+	public $price_label;
 
 	/**
 	 * @var int User ID
@@ -168,6 +170,9 @@ class ProductCustomerPrice extends CommonObject
 		if (isset($this->fk_user)) {
 			$this->fk_user = (int) $this->fk_user;
 		}
+		if (isset($this->price_label)) {
+			$this->price_label = trim($this->price_label);
+		}
 		if (isset($this->import_key)) {
 			$this->import_key = trim($this->import_key);
 		}
@@ -226,6 +231,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= "localtax2_type,";
 		$sql .= "localtax2_tx,";
 		$sql .= "fk_user,";
+		$sql .= "price_label,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
 		$sql .= " ".((int) $conf->entity).",";
@@ -246,6 +252,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " ".(empty($this->localtax2_type) ? "'0'" : "'".$this->db->escape($this->localtax2_type)."'").",";
 		$sql .= " ".(!isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx)).",";
 		$sql .= " ".((int) $user->id).",";
+		$sql .=  " ".(!isset($this->price_label) ? 'NULL' : "'".$this->db->escape($this->price_label)."'").",";
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'");
 		$sql .= ")";
 
@@ -319,6 +326,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " t.localtax1_tx,";
 		$sql .= " t.localtax2_tx,";
 		$sql .= " t.fk_user,";
+		$sql .= " t.price_label,";
 		$sql .= " t.import_key";
 		$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
@@ -348,6 +356,7 @@ class ProductCustomerPrice extends CommonObject
 				$this->localtax1_tx = $obj->localtax1_tx;
 				$this->localtax2_tx = $obj->localtax2_tx;
 				$this->fk_user = $obj->fk_user;
+				$this->price_label = $obj->price_label;
 				$this->import_key = $obj->import_key;
 
 				$this->db->free($resql);
@@ -405,6 +414,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " t.localtax1_type,";
 		$sql .= " t.localtax2_type,";
 		$sql .= " t.fk_user,";
+		$sql .= " t.price_label,";
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
@@ -467,6 +477,7 @@ class ProductCustomerPrice extends CommonObject
 				$line->localtax1_type = $obj->localtax1_type;
 				$line->localtax2_type = $obj->localtax2_type;
 				$line->fk_user = $obj->fk_user;
+				$line->price_label = $obj->price_label;
 				$line->import_key = $obj->import_key;
 				$line->socname = $obj->socname;
 				$line->prodref = $obj->prodref;
@@ -519,6 +530,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " t.localtax1_tx,";
 		$sql .= " t.localtax2_tx,";
 		$sql .= " t.fk_user,";
+		$sql .= " t.price_label,";
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
@@ -574,6 +586,7 @@ class ProductCustomerPrice extends CommonObject
 				$line->localtax1_tx = $obj->localtax1_tx;
 				$line->localtax2_tx = $obj->localtax2_tx;
 				$line->fk_user = $obj->fk_user;
+				$line->price_label = $obj->price_label;
 				$line->import_key = $obj->import_key;
 				$line->socname = $obj->socname;
 				$line->prodref = $obj->prodref;
@@ -646,6 +659,9 @@ class ProductCustomerPrice extends CommonObject
 		if (isset($this->fk_user)) {
 			$this->fk_user = (int) $this->fk_user;
 		}
+		if (isset($this->price_label)) {
+			$this->price_label = trim($this->price_label);
+		}
 		if (isset($this->import_key)) {
 			$this->import_key = trim($this->import_key);
 		}
@@ -706,6 +722,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= "localtax1_type,";
 		$sql .= "localtax2_type,";
 		$sql .= "fk_user,";
+		$sql .= "price_label,";
 		$sql .= "import_key";
 
 		$sql .= ") 		";
@@ -729,6 +746,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " t.localtax1_type,";
 		$sql .= " t.localtax2_type,";
 		$sql .= " t.fk_user,";
+		$sql .= " t.price_label,";
 		$sql .= " t.import_key";
 
 		$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
@@ -764,6 +782,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " localtax1_type=".(!empty($this->localtax1_type) ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'").",";
 		$sql .= " localtax2_type=".(!empty($this->localtax2_type) ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'").",";
 		$sql .= " fk_user=".$user->id.",";
+		$sql .= " price_label=".(isset($this->price_label) ? "'".$this->db->escape($this->price_label)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 
 		$sql .= " WHERE rowid=".((int) $this->id);
@@ -860,6 +879,7 @@ class ProductCustomerPrice extends CommonObject
 							$prodsocpriceupd->price_base_type = $this->price_base_type;
 							$prodsocpriceupd->tva_tx = $this->tva_tx;
 							$prodsocpriceupd->recuperableonly = $this->recuperableonly;
+							$prodsocpriceupd->price_label = $this->price_label;
 
 							$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
 							if ($resultupd < 0) {
@@ -878,6 +898,7 @@ class ProductCustomerPrice extends CommonObject
 						$prodsocpricenew->price_base_type = $this->price_base_type;
 						$prodsocpricenew->tva_tx = $this->tva_tx;
 						$prodsocpricenew->recuperableonly = $this->recuperableonly;
+						$prodsocpricenew->price_label = $this->price_label;
 
 						$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
 						if ($resultupd < 0) {
@@ -1023,6 +1044,7 @@ class ProductCustomerPrice extends CommonObject
 		$this->localtax1_tx = '';
 		$this->localtax2_tx = '';
 		$this->fk_user = 0;
+		$this->price_label = '';
 		$this->import_key = '';
 	}
 }
@@ -1075,6 +1097,7 @@ class PriceByCustomerLine
 	 * @var int User ID
 	 */
 	public $fk_user;
+	public $price_label;
 
 	public $import_key;
 	public $socname;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index ee636b4efcb..e915e3aa46a 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -123,6 +123,8 @@ if (empty($reshook)) {
 	if (($action == 'update_vat') && !$cancel && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
 		$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
+		$price_label = GETPOST('price_label', 'alpha');
+
 		// We must define tva_tx, npr and local taxes
 		$tva_tx = $tva_tx_txt;
 		$reg = array();
@@ -190,6 +192,7 @@ if (empty($reshook)) {
 		$object->localtax2_tx = $localtax2;
 		$object->localtax1_type = $localtax1_type;
 		$object->localtax2_type = $localtax2_type;
+		$object->price_label = $price_label;
 
 		$db->begin();
 
@@ -216,7 +219,7 @@ if (empty($reshook)) {
 					//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
 					$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
 					$level = $i;
-					$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
+					$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
 
 					if ($ret < 0) {
 						$error++;
@@ -238,7 +241,7 @@ if (empty($reshook)) {
 				//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
 				$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them when required.
 				$level = 0;
-				$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
+				$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
 
 				if ($ret < 0) {
 					$error++;
@@ -382,6 +385,7 @@ if (empty($reshook)) {
 			$newprice_min = price2num(GETPOST('price_min', 'alpha'), '', 2);
 			$newpricebase = GETPOST('price_base_type', 'alpha');
 			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+			$price_label = GETPOST('price_label', 'alpha');
 
 			$tva_tx = $tva_tx_txt;
 			$vatratecode = '';
@@ -447,6 +451,7 @@ if (empty($reshook)) {
 
 			$pricestoupdate[0] = array(
 				'price' => $newprice,
+				'price_label' => $price_label,
 				'price_min' => $newprice_min,
 				'price_base_type' => $newpricebase,
 				'default_vat_code' => $vatratecode,
@@ -478,7 +483,7 @@ if (empty($reshook)) {
 
 				// If price has changed, we update it
 				if (!array_key_exists($key, $object->multiprices) || $object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'] || $object->multiprices_tva_tx[$key] != $newvattx) {
-					$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
+					$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code'], $val['price_label']);
 				} else {
 					$res = 0;
 				}
@@ -638,6 +643,7 @@ if (empty($reshook)) {
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+		$prodcustprice->price_label = GETPOST("price_label", 'alpha');
 
 		$tva_tx_txt = GETPOST("tva_tx", 'alpha');
 
@@ -761,6 +767,7 @@ if (empty($reshook)) {
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+		$prodcustprice->price_label = GETPOST("price_label", 'alpha');
 
 		$tva_tx_txt = GETPOST("tva_tx");
 
@@ -1234,7 +1241,11 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 			print '<i class="opacitymedium"> - ' . price($object->price_min_ttc).' '.$langs->trans('TTC') . '</i>';
 		}
 	}
+	print '</td></tr>';
 
+	// Price Label
+	print '<tr class="field_price_label"><td>'.$langs->trans("PriceLabel").'</td><td>';
+	print $object->price_label;
 	print '</td></tr>';
 
 	// Price by quantity
@@ -1521,6 +1532,14 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 		print '</td>';
 		print '</tr>';
 
+		// Price Label
+		print '<tr><td>';
+		print $langs->trans('PriceLabel');
+		print '</td><td>';
+		print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$object->price_label.'">';
+		print '</td>';
+		print '</tr>';
+
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
@@ -1661,6 +1680,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 	$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
 	$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
 	$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
+	$sql .= " ,p.price_label";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
 	$sql .= " ".MAIN_DB_PREFIX."user as u";
 	$sql .= " WHERE fk_product = ".((int) $object->id);
@@ -1867,6 +1887,11 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 				}
 				print '</td>';
 
+				// Price Label
+				print '<td class="right">';
+				print $objp->price_label;
+				print '</td>';
+
 				// User
 				print '<td class="right">';
 				if ($objp->user_id > 0) {
@@ -1876,6 +1901,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 				}
 				print '</td>';
 
+
 				// Action
 				if ($user->hasRight('produit', 'supprimer')) {
 					$candelete = 0;
@@ -2012,6 +2038,14 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		}
 		print '</td></tr>';
 
+		// Price Label
+		print '<tr><td>';
+		print $langs->trans('PriceLabel');
+		print '</td><td>';
+		print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$object->price_label.'">';
+		print '</td>';
+		print '</tr>';
+
 		print '</table>';
 
 		print '</div>';
@@ -2099,6 +2133,16 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		}
 		print '</tr>';
 
+
+
+		// Price Label
+		print '<tr><td>';
+		print $langs->trans('PriceLabel');
+		print '</td><td>';
+		print '<input name="price_label" maxlength="255" class="minwidth300 maxwidth400onsmartphone" value="'.$prodcustprice->price_label.'">';
+		print '</td>';
+		print '</tr>';
+
 		print '</table>';
 
 
@@ -2161,6 +2205,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+			print '<td class="right">'.$langs->trans("PriceLabel").'</td>';
 			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
@@ -2225,6 +2270,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 				print '<td class="right">'.price($line->price_min).'</td>';
 				print '<td class="right">'.price($line->price_min_ttc).'</td>';
+				print '<td class="right">'.$line->price_label.'</td>';
 
 				// User
 				$userstatic = new User($db);
@@ -2297,6 +2343,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		}
 		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
 		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("PriceLabel").'</td>';
 		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
 		print '<td></td>';
 		print '</tr>';
@@ -2356,6 +2403,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 		print '<td class="right">'.price($object->price_min).'</td>';
 		print '<td class="right">'.price($object->price_min_ttc).'</td>';
+		print '<td class="right">'.$object->price_label.'</td>';
 		print '<td class="right">';
 		print '</td>';
 		if ($user->hasRight('produit', 'supprimer') || $user->hasRight('service', 'supprimer')) {
@@ -2434,6 +2482,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 				print '<td class="right">'.price($line->price_min).'</td>';
 				print '<td class="right">'.price($line->price_min_ttc).'</td>';
+				print '<td class="right">'.$line->price_label.'</td>';
 
 				// User
 				$userstatic = new User($db);

From 2d936bf1c9f1ccba28596645854228e30e54fc61 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 1 Mar 2024 12:38:06 +0100
Subject: [PATCH 0338/1862] FIX postgresql error (#28542)

* FIX postgresql error

* FIX better index name
---
 htdocs/install/mysql/migration/18.0.0-19.0.0.sql      | 5 ++++-
 htdocs/install/mysql/tables/llx_expensereport.key.sql | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index f528d39bdc6..70bf4fe7628 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -204,7 +204,10 @@ ALTER TABLE llx_salary ADD COLUMN note_public text;
 
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN element_type varchar(50) DEFAULT 'supplier_order' NOT NULL;
 
-ALTER TABLE llx_expensereport DROP INDEX idx_expensereport_fk_refuse, ADD INDEX idx_expensereport_fk_refuse(fk_user_refuse);
+-- VMYSQL4.1 DROP INDEX idx_expensereport_fk_refuse ON llx_expensereport;
+-- VPGSQL8.2 DROP INDEX idx_expensereport_fk_refuse;
+
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_refuse(fk_user_refuse);
 
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (1,'66','Société publique locale');
 
diff --git a/htdocs/install/mysql/tables/llx_expensereport.key.sql b/htdocs/install/mysql/tables/llx_expensereport.key.sql
index 329bb9089ff..8557fcee666 100644
--- a/htdocs/install/mysql/tables/llx_expensereport.key.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.key.sql
@@ -1,6 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2008-2010 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2008-2024 Regis Houssin        <regis.houssin@inodbox.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -31,6 +31,5 @@ ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_refuse (fk_user_ref
 
 --ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_author		FOREIGN KEY (fk_user_author)	 REFERENCES llx_user (rowid);
 --ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_valid 		FOREIGN KEY (fk_user_valid)		 REFERENCES llx_user (rowid);
---ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_approve 		FOREIGN KEY (fk_user_approve)	 REFERENCES llx_user (rowid);
---ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_refuse				FOREIGN KEY (fk_user_refuse)     REFERENCES llx_user (rowid);
-
+--ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_approve 	FOREIGN KEY (fk_user_approve)	 REFERENCES llx_user (rowid);
+--ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_refuse		FOREIGN KEY (fk_user_refuse)     REFERENCES llx_user (rowid);

From 73359442d4044a7e881c7f09a48ac83a60cba5bc Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Fri, 1 Mar 2024 05:38:56 -0600
Subject: [PATCH 0339/1862] Update paiement.php (#28539)

Fix #28485
---
 htdocs/fourn/facture/paiement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 007dd70dea0..0e4245d9b23 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -834,7 +834,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
 					print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
 				}
-				print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('PayedSuppliersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
+				print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id.'&socid='.$object->socid.'&type='.$object->type, $langs->trans('PayedSuppliersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
 			}
 
 			print '</form>';

From 016de3ef66ce56e89d438ab4dcc9bf8993096b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:39:23 +0100
Subject: [PATCH 0340/1862] fix codespell (#28536)

* fix codespell

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
---
 dev/setup/pre-commit/README.md                        | 6 +++---
 htdocs/core/class/commonobject.class.php              | 4 ++--
 htdocs/core/lib/files.lib.php                         | 4 ++--
 htdocs/core/modules/member/doc/pdf_standard.class.php | 3 ++-
 htdocs/projet/class/project.class.php                 | 4 +++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dev/setup/pre-commit/README.md b/dev/setup/pre-commit/README.md
index f6e82b6dcb5..1f3740144c2 100644
--- a/dev/setup/pre-commit/README.md
+++ b/dev/setup/pre-commit/README.md
@@ -38,8 +38,8 @@ the project: `pre-commit-config.yaml`.
 ### Tips
 
 After installing `pre-commit` onto your local git clone, pre-commit will run
-on every commit. The first time, all tools required by pre-commit will be installed 
-into ~/.cache/pre-commit 
+on every commit. The first time, all tools required by pre-commit will be installed
+into ~/.cache/pre-commit
 
 When it finds some issue, the git commit will be aborted, so you can fix it,
 or verify it.
@@ -89,5 +89,5 @@ on github.\
 CI also runs pre-commit to help maintain code quality.
 
 Note:
-Code for precommits are saved into: 
+Code for precommits are saved into:
 .cache/pre-commit/repoyXXXXX/py_env-python3/lib/pythonX.Y/site-packages/pre_commit_hooks/no_commit_to_branch.py
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 14fa0eb3565..12ca9e77c2b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017-2019 Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2017      Rui Strecht          <rui.strecht@aliartalentos.com>
- * Copyright (C) 2018-2024 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2021      Grégory Blémand      <gregory.blemand@atm-consulting.fr>
@@ -590,7 +590,7 @@ abstract class CommonObject
 	public $lines;
 
 	/**
-	 * @var string	Action code to use to record auto event in agenda. For exemple 'AC_OTH_AUTO'
+	 * @var string	Action code to use to record auto event in agenda. By example 'AC_OTH_AUTO'
 	 */
 	public $actiontypecode;
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 963ac582189..a518ec79f9d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2012-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2019-2024  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023       Lenin Rivas         <lenin.rivas777@gmail.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -2620,7 +2620,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
  * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  * @return	array						Array with properties (full path, date, ...) of to most recent file
  */
-function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
+function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = 0, $mode = '')
 {
 	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
 	return isset($tmparray[0]) ? $tmparray[0] : null;
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 5b2e2ed5703..15e58685878 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo	<jlb@j1b.org>
  * Copyright (C) 2006-2013 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 Francis Appels  <francis.appels@yahoo.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +120,7 @@ class pdf_standard extends CommonStickerGenerator
 
 		$member = new Adherent($db);
 		$member->id = $idmember;
-		$member->ref = $idmember;
+		$member->ref = (string) $idmember;
 
 		// Define photo
 		$dir = $conf->adherent->dir_output;
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index dee6d2bcef5..893ced6f27c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2019      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1495,7 +1496,8 @@ class Project extends CommonObject
 		$this->date_start = $now;
 		$this->date_end = $now + (3600 * 24 * 365);
 		$this->note_public = 'SPECIMEN';
-		$this->fk_element = 20000;
+		$this->note_private = 'Private Note';
+		$this->fk_project = 0;
 		$this->opp_amount = 20000;
 		$this->budget_amount = 10000;
 

From 4b7d25975f41ae722cc929c918c89b04af9ef1ec Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Fri, 1 Mar 2024 05:45:08 -0600
Subject: [PATCH 0341/1862] Update html.form.class.php (#28540)

* Update html.form.class.php

Fix PHP Warning:  Undefined array key "labeladddateof"

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/html.form.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8be98a09173..29cb68f171d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7171,8 +7171,8 @@ class Form
 				$arrayofdateof = $adddateof;
 			}
 			foreach ($arrayofdateof as $valuedateof) {
-				$tmpadddateof = $valuedateof['adddateof'] != '' ? $valuedateof['adddateof'] : 0;
-				$tmplabeladddateof = $valuedateof['labeladddateof'];
+				$tmpadddateof = empty($valuedateof['adddateof']) ? 0 : $valuedateof['adddateof'];
+				$tmplabeladddateof = empty($valuedateof['labeladddateof']) ? '' : $valuedateof['labeladddateof'];
 				$tmparray = dol_getdate($tmpadddateof);
 				if (empty($tmplabeladddateof)) {
 					$tmplabeladddateof = $langs->trans("DateInvoice");

From 449d31a424f57b48815c78f18e9ac32f9b6265c8 Mon Sep 17 00:00:00 2001
From: smselver <50632715+smselver@users.noreply.github.com>
Date: Fri, 1 Mar 2024 03:46:18 -0800
Subject: [PATCH 0342/1862] make some small grammatical upgrade to README
 (#28537)

* make some small grammatical upgrade to README

* fixed exemple in htdocs/common/core

---------

Co-authored-by: steve <steve.s@onedmaterial.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 README.md                                | 10 +++++-----
 htdocs/core/class/commonobject.class.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f4087ec5a93..52b74a1fcdf 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,13 @@
 [![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…).
+Dolibarr ERP & CRM is a modern software package that helps manage your organization's activities (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software suite (written in PHP with optional JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
+It's an Open-Source Software suite (written in PHP with optional JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
 
 You can freely use, study, modify or distribute it according to its license.
 
-You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
+You can use it as a standalone application or as a web application to access it from the Internet or from a LAN.
 
 Dolibarr has a large community ready to help you, free forums and [preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
 
@@ -19,7 +19,7 @@ Dolibarr has a large community ready to help you, free forums and [preferred par
 
 ## LICENSE
 
-Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).
+Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either Version 3 of the License, or (at your option) any later version (GPL-3+).
 
 See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) file for a full copy of the license.
 
@@ -29,7 +29,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 ### Simple setup
 
-If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
+If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just a few clicks, you can use one of the packaged versions:
 
 - [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
 - [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 12ca9e77c2b..a42df1a6755 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -590,7 +590,7 @@ abstract class CommonObject
 	public $lines;
 
 	/**
-	 * @var string	Action code to use to record auto event in agenda. By example 'AC_OTH_AUTO'
+	 * @var string	Action code to use to record auto event in agenda. For example 'AC_OTH_AUTO'
 	 */
 	public $actiontypecode;
 

From c069f3f161afe7dd811b836a244566ecdb46cd65 Mon Sep 17 00:00:00 2001
From: Christian Humpel <78662388+Humml87@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:47:37 +0100
Subject: [PATCH 0343/1862] FIX #28533 Mo::deleteLine removes the "main" MoLine
 if consumed line is delete (#28535)

* fix #28533

* qual for github actions

* fix use $this->db in classes

---------

Co-authored-by: christian.humpel <christian.humpel@gmail.com>
---
 htdocs/mrp/class/mo.class.php | 168 +++++++++++++++++++++-------------
 htdocs/mrp/mo_production.php  |   2 +-
 2 files changed, 103 insertions(+), 67 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2341f1fd406..090bdc067c8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -891,78 +891,58 @@ class Mo extends CommonObject
 	 */
 	public function deleteLine(User $user, $idline, $notrigger = false)
 	{
-		global $langs;
-		$langs->loadLangs(array('stocks', 'mrp'));
+		$error = 0;
 
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
-		$productstatic = new Product($this->db);
-		$fk_movement = GETPOST('fk_movement', 'int');
-		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);
 
-		if (!empty($arrayoflines)) {
-			$this->db->begin();
+		$moline = new MoLine($this->db);
+		$moline->fetch($idline);
 
-			$stockmove = new MouvementStock($this->db);
-			$stockmove->setOrigin($this->element, $this->id);
-
-			if (!empty($fk_movement)) {
-				$moline = new MoLine($this->db);
-				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, array('customsql' => 'fk_stock_movement ='.$fk_movement));
-				$moline = array_shift($TArrayMoLine);
-
-				$movement = new MouvementStock($this->db);
-				$movement->fetch($fk_movement);
-				$productstatic->fetch($movement->product_id);
-				$qtytoprocess = $movement->qty;
-
-				// Reverse stock movement
-				$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
-				$codemovementCancel = $langs->trans("StockIncrease");
-
-				if (($qtytoprocess >= 0)) {
-					$idstockmove = $stockmove->reception($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', $movement->batch, dol_now(), 0, $codemovementCancel);
-				} else {
-					$idstockmove = $stockmove->livraison($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $movement->batch, 0, $codemovementCancel);
-				}
-				if ($idstockmove < 0) {
-					$this->error++;
-					$this->db->rollback();
-					setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-				} else {
-					$this->db->commit();
-				}
-				return $moline->delete($user, $notrigger);
-			} else {
-				foreach ($arrayoflines as $key => $arrayofline) {
-					$lineDetails = $arrayoflines[$key];
-					$productstatic->fetch($lineDetails['fk_product']);
-					$qtytoprocess = $lineDetails['qty'];
-
-					// Reverse stock movement
-					$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
-					$codemovementCancel = $langs->trans("StockIncrease");
-
-					if ($qtytoprocess >= 0) {
-						$idstockmove = $stockmove->reception($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, '', '', $lineDetails['batch'], dol_now(), 0, $codemovementCancel);
-					} else {
-						$idstockmove = $stockmove->livraison($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $lineDetails['batch'], 0, $codemovementCancel);
-					}
-					if ($idstockmove < 0) {
-						$this->error++;
-						$this->db->rollback();
-						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-					} else {
-						$this->db->commit();
-					}
-				}
-				return $this->deleteLineCommon($user, $idline, $notrigger);
-			}
-		} else {
-			return $this->deleteLineCommon($user, $idline, $notrigger);
+		$affectedLinkedMoLines;
+		// Check if it's linked or a main line
+		if (empty($moline->fk_mrp_production)) {
+			// Check if the main line has linked lines
+			$affectedLinkedMoLines = $this->fetchLinesLinked('consumed', $moline->id);
 		}
+
+		$this->db->begin();
+
+		// undo stockmovements and remove linked lines
+		if (!empty($affectedLinkedMoLines)) {
+			foreach ($affectedLinkedMoLines as $linkedLine) {
+				if (!$error) {
+					$linkedMoline = new MoLine($this->db);
+					$linkedMoline->fetch($linkedLine['rowid']);
+					$result = $linkedMoline->delete($user, $notrigger);
+
+					if ($result < 0) {
+						$error++;
+						setEventMessages($linkedMoline->error, $linkedMoline->errors, 'errors');
+					}
+				}
+			}
+		}
+
+		if (!$error) {
+			$result = $moline->delete($user, $notrigger);
+
+			if ($result < 0) {
+				$error++;
+				setEventMessages($moline->error, $moline->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			$result = 1;
+		} else {
+			$this->db->rollback();
+			$result = -1;
+		}
+		return $result;
 	}
 
 
@@ -2222,7 +2202,63 @@ class MoLine extends CommonObjectLine
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
-		return $this->deleteCommon($user, $notrigger);
-		//return $this->deleteCommon($user, $notrigger, 1);
+		global $langs;
+
+		$error = 0;
+		$result = -1;
+
+		// the stockmovements it was created for this line revise
+		if (!empty($this->fk_warehouse)) {
+			$langs->loadLangs(array('stocks', 'mrp'));
+
+			// load the mo for this line
+			$tmpmo = new Mo($this->db);
+			$tmpmo->fetch($this->fk_mo);
+
+			// load the (old) linked stockmovement and the associated product
+			$linkedMovement = new MouvementStock($this->db);
+			$linkedMovement->fetch($this->fk_stock_movement);
+			$productForLinkedMovement = new Product($this->db);
+			$productForLinkedMovement->fetch($linkedMovement->product_id);
+
+			// create new stockmovement to revise the linked stockmovement
+			$stockmove = new MouvementStock($this->db);
+			$stockmove->setOrigin($tmpmo->element, $tmpmo->id);
+
+			// Reverse stock movement
+			$labelmovementCancel = $langs->trans("CancelProductionForRef", $productForLinkedMovement->ref);
+			$codemovementCancel = dol_print_date(dol_now(), 'dayhourlog');
+
+			$idstockmove = -1;
+			if (($linkedMovement->qty < 0)) {
+				$qtytoprocess = $linkedMovement->qty * -1;
+				$idstockmove = $stockmove->reception($user, $linkedMovement->product_id, $linkedMovement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', $linkedMovement->batch, dol_now(), 0, $codemovementCancel);
+			} else {
+				$idstockmove = $stockmove->livraison($user, $linkedMovement->product_id, $linkedMovement->warehouse_id, $linkedMovement->qty, 0, $labelmovementCancel, dol_now(), '', '', $linkedMovement->batch, 0, $codemovementCancel);
+			}
+
+			if ($idstockmove < 0) {
+				$this->error++;
+				setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$result = $this->deleteCommon($user, $notrigger);
+			if ($result < 0) {
+				$this->error++;
+				setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			$result = 1;
+		} else {
+			$this->db->rollback();
+			$result = -1;
+		}
+
+		return $result;
 	}
 }
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 0caba7cb777..1dafabc87a7 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1288,7 +1288,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line2['rowid']);
 							print '<td class="center">';
 							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');

From 0ac22e1f75c15d268604f2e43c86db5b3f479f94 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 1 Mar 2024 12:49:35 +0100
Subject: [PATCH 0344/1862] FIX avoid warning "error parsing attribute name in
 Entity" (#28543)

---
 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 8b109dbee3b..a979f18e3a3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7653,7 +7653,7 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 					} else {
 						$out = '<?xml encoding="UTF-8"><div class="tricktoremove">'.dol_nl2br($out).'</div>';
 					}
-					$dom->loadHTML($out, LIBXML_HTML_NODEFDTD | LIBXML_ERR_NONE | LIBXML_HTML_NOIMPLIED | LIBXML_NONET | LIBXML_NOWARNING | LIBXML_NOXMLDECL);
+					$dom->loadHTML($out, LIBXML_HTML_NODEFDTD | LIBXML_ERR_NONE | LIBXML_HTML_NOIMPLIED | LIBXML_NONET | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_NOXMLDECL);
 					$out = trim($dom->saveHTML());
 
 					// Remove the trick added to solve pb with text without parent tag

From 57f4fc14d8cbb8d86840105890b1eb7a856cd3a7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:50:51 +0100
Subject: [PATCH 0345/1862] Fix: phpunit - Add adapter to "not existing
 directory" assertion (#28534)

# Fix: phpunit - Add adapter to "not existing directory" assertion

This is a helper function added to the common test class which is useful
to maintain cross phpunit version compatibility without triggering a
deprecation error for internal phpunit test functions.

Used in a testcase for dol_dir_move in a pending PR
---
 test/phpunit/CommonClassTest.class.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index e5c63965f55..0e5f49dd24b 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -339,4 +339,24 @@ abstract class CommonClassTest extends TestCase
 		'workstation' => 'Workstation',
 		'zapier' => 'Zapier',
 	);
+
+	/**
+	 * Assert that a directory does not exist without triggering deprecation
+	 *
+	 * @param string $directory The directory to test
+	 * @param string $message   The message to show if the directory exists
+	 *
+	 * @return void
+	 */
+	protected function assertDirectoryNotExistsCompat($directory, $message = '')
+	{
+		$phpunitVersion = \PHPUnit\Runner\Version::id();
+
+		// Check if PHPUnit version is less than 9.0.0
+		if (version_compare($phpunitVersion, '9.0.0', '<')) {
+			$this->assertDirectoryNotExists($directory, $message);
+		} else {
+			$this->assertDirectoryDoesNotExist($directory, $message);
+		}
+	}
 }

From 3c055f671ebcc19c2b3d72ca6b30d71f82319b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:51:48 +0100
Subject: [PATCH 0346/1862] fix phpstan (#28545)

* fix phpstan

* fix phpstan
---
 .../core/class/commonnumrefgenerator.class.php  | 13 +++++++------
 .../barcode/mod_barcode_product_standard.php    | 17 +----------------
 .../barcode/mod_barcode_thirdparty_standard.php |  6 +-----
 .../modules/barcode/modules_barcode.class.php   |  2 +-
 .../modules/contract/mod_contract_magre.php     | 10 ++++++++--
 .../modules/contract/mod_contract_olive.php     | 17 ++++++++++++-----
 .../modules/contract/mod_contract_serpis.php    | 11 ++++++++---
 .../modules/holiday/mod_holiday_immaculate.php  | 10 ++++++++--
 .../modules/holiday/mod_holiday_madonna.php     | 11 ++++++++---
 .../core/modules/member/mod_member_advanced.php | 12 ++++++++----
 .../core/modules/member/mod_member_simple.php   | 12 ++++++++----
 .../modules/member/modules_member.class.php     | 12 +-----------
 .../product/mod_codeproduct_elephant.php        |  8 +-------
 .../modules/product/mod_codeproduct_leopard.php |  7 +------
 .../modules/product/modules_product.class.php   |  9 +--------
 .../core/modules/product_batch/mod_lot_free.php |  8 +-------
 .../core/modules/product_batch/mod_sn_free.php  |  7 +------
 .../modules/societe/mod_codeclient_elephant.php |  8 +-------
 .../modules/societe/mod_codeclient_leopard.php  |  6 +-----
 .../modules/societe/mod_codeclient_monkey.php   |  7 +------
 .../modules/societe/modules_societe.class.php   |  9 +--------
 21 files changed, 80 insertions(+), 122 deletions(-)

diff --git a/htdocs/core/class/commonnumrefgenerator.class.php b/htdocs/core/class/commonnumrefgenerator.class.php
index a4359db0aa5..c4edb202031 100644
--- a/htdocs/core/class/commonnumrefgenerator.class.php
+++ b/htdocs/core/class/commonnumrefgenerator.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,32 +55,32 @@ abstract class CommonNumRefGenerator
 	protected $db;
 
 	/**
-	 * @var int<0,1>            Code facultatif
+	 * @var int<0,1>            Is Code optional 0 or 1
 	 */
 	public $code_null;
 
 	/**
-	 * @var int<0,1>            Code modifiable
+	 * @var int<0,1>            Is Code editable 0 or 1
 	 */
 	public $code_modifiable;
 
 	/**
-	 * @var int<0,1>            Code modifiable si il est invalid
+	 * @var int<0,1>            Is Code editable if invalid 0 or 1
 	 */
 	public $code_modifiable_invalide;
 
 	/**
-	 * @var int<0,1>            Code modifiable si il est null
+	 * @var int<0,1>            Is Code editable if null
 	 */
 	public $code_modifiable_null;
 
 	/**
-	 * @var int<0,1>            Automatic numbering
+	 * @var int<0,1>            Automatic numbering 0 or 1
 	 */
 	public $code_auto;
 
 	/**
-	 * @var int<0,1>            Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
+	 * @var int<0,1>             The third party prefix field must be filled in when using {pre}
 	 */
 	public $prefixIsRequired;
 
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index b338c65ea28..ceaf9cc1169 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,32 +36,16 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 {
 	public $name = 'Standard'; // Model Name
 
-	public $code_modifiable; // Editable code
-
-	public $code_modifiable_invalide; // Modified code if it is invalid
-
-	public $code_modifiable_null; // Modified code if it is null
-
-	public $code_null; // Optional code
-
 	/**
 	 * Dolibarr version of the loaded document
 	 * @var string
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	/**
-	 * @var int Automatic numbering
-	 */
-	public $code_auto;
-
 	public $searchcode; // Search string
 
 	public $numbitcounter; // Number of digits the counter
 
-	public $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
-
-
 	/**
 	 *	Constructor
 	 */
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index 2c7a716aded..10e33d763f1 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2022      Faustin Boitel <fboitel@enseirb-matmeca.fr>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,11 +51,6 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	/**
-	 * @var int Automatic numbering
-	 */
-	public $code_auto;
-
 	public $searchcode; // Search string
 
 	public $numbitcounter; // Number of digits the counter
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 4137ec09571..f8026af15e1 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +57,6 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 
 	// variables inherited from CommonNumRefGenerator
 	public $code_null;
-	public $code_auto;
 
 
 	/**
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index 9797d077a6b..f68e180a65c 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011       Juanjo Menent	        <jmenent@2byte.es>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,8 +35,14 @@ class mod_contract_magre extends ModelNumRefContracts
 	public $name = 'Magre';
 	public $version = 'dolibarr';
 	public $error = '';
-	public $code_auto = 1;
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_auto = 1;
+	}
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 0f7bffaebfe..2fd4d27f6fe 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Floran Henry  <florian.henry@open-concept.pro>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,13 +37,19 @@ class mod_contract_olive extends ModelNumRefContracts
 	// variables inherited from ModelNumRefContracts class
 	public $name = 'Olive';
 	public $version = 'dolibarr';
-	public $code_null = 1;
-	public $code_modifiable = 1;
-	public $code_modifiable_invalide = 1;
-	public $code_modifiable_null = 1;
-	public $code_auto = 0;
 
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_null = 1;
+		$this->code_modifiable = 1;
+		$this->code_modifiable_invalide = 1;
+		$this->code_modifiable_null = 1;
+		$this->code_auto = 0;
+	}
 	/**
 	 *	Return description of module
 	 *
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index 81386498593..fe155099ac7 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,9 +33,6 @@ class mod_contract_serpis extends ModelNumRefContracts
 	// variables inherited from ModelNumRefContracts class
 	public $name = 'Serpis';
 	public $version = 'dolibarr';
-	public $error = '';
-	public $code_auto = 1;
-
 
 	// variables not inherited
 
@@ -43,6 +41,13 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 */
 	public $prefix = 'CT';
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_auto = 1;
+	}
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index 556c79db2b5..ca246324929 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011-2019		Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2018			Charlene Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,9 +35,14 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	// variables inherited from ModelNumRefHolidays class
 	public $name = 'Immaculate';
 	public $version = 'dolibarr';
-	public $error = '';
-	public $code_auto = 1;
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_auto = 1;
+	}
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 85681c7b99f..d2eeceeafc2 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2018-2023 Charlene Benke		<charlene@patas-monkey.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,9 +34,6 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	// variables inherited from ModelNumRefHolidays class
 	public $name = 'Madonna';
 	public $version = 'dolibarr';
-	public $error = '';
-	public $code_auto = 1;
-
 
 	// variables not inherited
 
@@ -44,6 +42,13 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 */
 	public $prefix = 'HL';
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_auto = 1;
+	}
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/member/mod_member_advanced.php b/htdocs/core/modules/member/mod_member_advanced.php
index 1d1d3dad21f..2147961ea82 100644
--- a/htdocs/core/modules/member/mod_member_advanced.php
+++ b/htdocs/core/modules/member/mod_member_advanced.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2021		Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024	Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,9 +35,6 @@ class mod_member_advanced extends ModeleNumRefMembers
 	// variables inherited from ModeleNumRefMembers class
 	public $name = 'Advanced';
 	public $version = 'dolibarr';
-	public $error = '';
-	public $code_auto = 1;
-
 
 	// variables not inherited
 
@@ -46,6 +43,13 @@ class mod_member_advanced extends ModeleNumRefMembers
 	 */
 	public $prefix = 'MEM';
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_auto = 1;
+	}
 
 	/**
 	 *  Return description of numbering module
diff --git a/htdocs/core/modules/member/mod_member_simple.php b/htdocs/core/modules/member/mod_member_simple.php
index 1c228b1729f..c76d7a38c38 100644
--- a/htdocs/core/modules/member/mod_member_simple.php
+++ b/htdocs/core/modules/member/mod_member_simple.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2021		Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024	Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,9 +35,6 @@ class mod_member_simple extends ModeleNumRefMembers
 	// variables inherited from ModeleNumRefMembers class
 	public $name = 'Simple';
 	public $version = 'dolibarr';
-	public $error = '';
-	public $code_auto = 1;
-
 
 	// variables not inherited
 
@@ -46,6 +43,13 @@ class mod_member_simple extends ModeleNumRefMembers
 	 */
 	public $prefix = '';
 
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_auto = 1;
+	}
 
 	/**
 	 *  Return description of numbering module
diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
index 897bdd03086..ca21a6d7820 100644
--- a/htdocs/core/modules/member/modules_member.class.php
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,17 +64,6 @@ abstract class ModelePDFMember extends CommonDocGenerator
  */
 abstract class ModeleNumRefMembers extends CommonNumRefGenerator
 {
-	public $code_modifiable; // Editable code
-
-	public $code_modifiable_invalide; // Modified code if it is invalid
-
-	public $code_modifiable_null; // Modified code if it is null
-
-	public $code_null; //
-
-	public $code_auto;
-
-
 	/**
 	 *  Return description of module parameters
 	 *
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index e6469e087b4..d0bc9d30e16 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,13 +38,6 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	// variables inherited from ModelProductCode class
 	public $name = 'Elephant';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
-	public $prefixIsRequired;
-
 
 	// variables not inherited
 
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 89c3ef5638c..921f2a2617f 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,12 +42,6 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	// variables inherited from ModelProductCode class
 	public $name = 'Leopard';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
-
 
 	/**
 	 *	Constructor
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 126684966a8..893dc9dc2dc 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,14 +61,6 @@ abstract class ModelePDFProduct extends CommonDocGenerator
  */
 abstract class ModeleProductCode extends CommonNumRefGenerator
 {
-
-	// variables inherited from CommonNumRefGenerator class
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_auto;
-
-
 	/**
 	 *  Return next value available
 	 *
diff --git a/htdocs/core/modules/product_batch/mod_lot_free.php b/htdocs/core/modules/product_batch/mod_lot_free.php
index 721d6b3268e..4a7de7a4499 100644
--- a/htdocs/core/modules/product_batch/mod_lot_free.php
+++ b/htdocs/core/modules/product_batch/mod_lot_free.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2022-2023 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024	Frédéric France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,12 +42,6 @@ class mod_lot_free extends ModeleNumRefBatch
 	// variables inherited from ModeleNumRefBatch class
 	public $name = 'lot_free';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
-
 
 	/**
 	 *	Constructor
diff --git a/htdocs/core/modules/product_batch/mod_sn_free.php b/htdocs/core/modules/product_batch/mod_sn_free.php
index c34b1703637..bd795c726a1 100644
--- a/htdocs/core/modules/product_batch/mod_sn_free.php
+++ b/htdocs/core/modules/product_batch/mod_sn_free.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,12 +41,6 @@ class mod_sn_free extends ModeleNumRefBatch
 	// variables inherited from ModeleThirdPartyCode class
 	public $name = 'sn_free';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
-
 
 	/**
 	 *	Constructor
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index c82ed88b925..9039c9a2907 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013-2018 Philippe Grand      	<philippe.grand@atoo-net.com>
- * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024	Frédéric France		<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,12 +39,6 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	// variables inherited from ModeleThirdPartyCode class
 	public $name = 'Elephant';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
-	public $prefixIsRequired;
 
 	// variables not inherited
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index ca0be8edb33..9729c15e7d7 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,11 +42,6 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	// variables inherited from ModeleThirdPartyCode class
 	public $name = 'Leopard';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
 
 
 	/**
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 1f6b771896c..1d843fd007e 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2006-2007	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,12 +37,6 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	// variables inherited from ModeleThirdPartyCode class
 	public $name = 'Monkey';
 	public $version = 'dolibarr';
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_modifiable_null;
-	public $code_auto;
-	public $prefixIsRequired;
 
 	// variables not inherited
 	public $prefixcustomer = 'CU';
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index efd226af406..1408c2cdf99 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,14 +60,6 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
  */
 abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
 {
-
-	// variables inherited from CommonNumRefGenerator class
-	public $code_null;
-	public $code_modifiable;
-	public $code_modifiable_invalide;
-	public $code_auto;
-
-
 	/**
 	 * Constructor
 	 *

From cb302fbb631854a1ea60f5e0421313a4defd2136 Mon Sep 17 00:00:00 2001
From: noec764 <58433943+noec764@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:55:07 +0100
Subject: [PATCH 0347/1862] FIX: Special code is now transmitted by args only
 in order supplier (#28546)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Noé <noe@scopen.fr>
---
 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 c9e5e8f4fee..2c1e723df00 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1350,8 +1350,6 @@ if (empty($reshook)) {
 									$tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
 								}
 
-								$object->special_code = $lines[$i]->special_code;
-
 								$result = $object->addline(
 									$desc,
 									$lines[$i]->subprice,
@@ -1374,7 +1372,9 @@ if (empty($reshook)) {
 									$lines[$i]->fk_unit,
 									0,
 									$element,
-									!empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid
+									!empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid,
+									-1,
+									$lines[$i]->special_code
 								);
 
 								if ($result < 0) {

From 34c98ce4aa842101dae5cc6b707792a389dc3de4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 14:07:14 +0100
Subject: [PATCH 0348/1862] Fix constant name

---
 htdocs/includes/OAuth/OAuth2/Service/Microsoft.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php b/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
index 6c3b18b3c0f..2bac0430101 100644
--- a/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
+++ b/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
@@ -38,11 +38,11 @@ class Microsoft extends AbstractService
     const SCOPE_APPLICATIONS = 'applications';
     const SCOPE_APPLICATIONS_CREATE = 'applications_create';
     const SCOPE_IMAP = 'imap';
-    const SOCPE_IMAP_ACCESSASUSERALL = 'https://outlook.office365.com/IMAP.AccessAsUser.All';
-    const SOCPE_SMTPSEND = 'https://outlook.office365.com/SMTP.Send';
-    const SOCPE_USERREAD = 'User.Read';
-    const SOCPE_MAILREAD = 'Mail.Read';
-    const SOCPE_MAILSEND = 'Mail.Send';
+    const SCOPE_IMAP_ACCESSASUSERALL = 'https://outlook.office365.com/IMAP.AccessAsUser.All';
+    const SCOPE_SMTPSEND = 'https://outlook.office365.com/SMTP.Send';
+    const SCOPE_USERREAD = 'User.Read';
+    const SCOPE_MAILREAD = 'Mail.Read';
+    const SCOPE_MAILSEND = 'Mail.Send';
 
     protected $storage;
 

From c4142496df6b0113bf6376ee9a192df41c213f8a Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 16:32:33 +0100
Subject: [PATCH 0349/1862] Fix problem with param action

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

diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index 9cbd48253e6..f3fe963f906 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -227,9 +227,13 @@ if ($action == 'create') {
 	}
 
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Availabilities")), '', 'object_'.$object->picto);
-	print '<form method="POST" action="'.($error == 0 ? $_SERVER["PHP_SELF"] : $_SERVER["PHP_SELF"].'?action=create').'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
+	if ($error != 0) {
+		print '<input type="hidden" name="action" value="create">';
+	} else {
+		print '<input type="hidden" name="action" value="add">';
+	}
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}

From 17015095aa8aeecdcda3218f4d25eb15e71834b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 18:15:58 +0100
Subject: [PATCH 0350/1862] Add option to allow better compatibility with
 computed fields using unsecured chars

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8b109dbee3b..fa2d6f0f30f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9629,7 +9629,11 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 		if ($onlysimplestring == '1') {
 			// We must accept: '1 && getDolGlobalInt("doesnotexist1") && getDolGlobalString("MAIN_FEATURES_LEVEL")'
 			// We must accept: '$user->hasRight("cabinetmed", "read") && !$object->canvas=="patient@cabinetmed"'
-			if (preg_match('/[^a-z0-9\s'.preg_quote('^$_+-.*>&|=!?():"\',/@', '/').']/i', $s)) {
+			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@';
+			if (getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL')) {
+				$specialcharsallowed .= getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL');
+			}
+			if (preg_match('/[^a-z0-9\s'.preg_quote($specialcharsallowed, '/').']/i', $s)) {
 				if ($returnvalue) {
 					return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;
 				} else {
@@ -9656,7 +9660,11 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 			// We can exclude $ char that are not: $db, $langs, $leftmenu, $topmenu, $user, $langs, $objectoffield, $object...,
 		} elseif ($onlysimplestring == '2') {
 			// We must accept: (($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"
-			if (preg_match('/[^a-z0-9\s'.preg_quote('^$_+-.*>&|=!?():"\',/@[]', '/').']/i', $s)) {
+			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@[]';
+			if (getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL')) {
+				$specialcharsallowed .= getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL');
+			}
+			if (preg_match('/[^a-z0-9\s'.preg_quote($specialcharsallowed, '/').']/i', $s)) {
 				if ($returnvalue) {
 					return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;
 				} else {

From af8e086aacb29fd366d426b9a87c4693397ead85 Mon Sep 17 00:00:00 2001
From: Liammer <104431491+Liammer@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:24:31 +0100
Subject: [PATCH 0351/1862] Update adherent.class.php (#28554)

To not send the Email to cancelled members. They already asked not to be members anymore. Sending reminders can be exhausting.
---
 htdocs/adherents/class/adherent.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 8717ecd010a..25fa2b6a257 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3102,6 +3102,7 @@ class Adherent extends CommonObject
 
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'adherent';
 			$sql .= " WHERE entity = ".((int) $conf->entity); // Do not use getEntity('adherent').")" here, we want the batch to be on its entity only;
+			$sql .= " AND statut = 1";
 			$sql .= " AND datefin = '".$this->db->idate($datetosearchfor)."'";
 			//$sql .= " LIMIT 10000";
 

From a96f1a85d667c0a9e0ddc359fbed74829d2e1f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:24:41 +0100
Subject: [PATCH 0352/1862] fix phpstan (#28555)

* fix phpstan

* fix phpstan
---
 .../class/price_global_variable.class.php     |  9 +++---
 .../price_global_variable_updater.class.php   | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index e14075cfd48..13cf5233342 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -169,11 +170,11 @@ class PriceGlobalVariable
 	/**
 	 *  Update object into database
 	 *
-	 *  @param	User	$user        User that modifies
-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
+	 *  @param	User|null	$user       User that modifies
+	 *  @param  int			$notrigger	0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 	Return integer <0 if KO, >0 if OK
 	 */
-	public function update($user = 0, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		$error = 0;
 
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 5097d8ac7ba..d36c0477bf4 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,11 +190,11 @@ class PriceGlobalVariableUpdater
 	/**
 	 *  Update object into database
 	 *
-	 *  @param	User	$user        User that modifies
-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
+	 *  @param	User|null	$user       User that modifies
+	 *  @param  int			$notrigger	0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 	Return integer <0 if KO, >0 if OK
 	 */
-	public function update($user = 0, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -557,12 +558,12 @@ class PriceGlobalVariableUpdater
 	/**
 	 *  Update next_update into database
 	 *
-	 *  @param	string	$next_update Next update to write
-	 *  @param	User	$user        User that modifies
-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
+	 *  @param	string		$next_update	Next update to write
+	 *  @param	User|null	$user       	User that modifies
+	 *  @param  int			$notrigger		0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 		Return integer <0 if KO, >0 if OK
 	 */
-	public function update_next_update($next_update, $user = 0, $notrigger = 0)
+	public function update_next_update($next_update, $user = null, $notrigger = 0)
 	{
 		// phpcs:enable
 		$error = 0;
@@ -602,12 +603,12 @@ class PriceGlobalVariableUpdater
 	/**
 	 *  Update last_status into database
 	 *
-	 *  @param	string	$last_status Status to write
-	 *  @param	User	$user        User that modifies
-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
+	 *  @param	string		$last_status	Status to write
+	 *  @param	User|null	$user       	User that modifies
+	 *  @param  int			$notrigger		0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 		Return integer <0 if KO, >0 if OK
 	 */
-	public function update_status($last_status, $user = 0, $notrigger = 0)
+	public function update_status($last_status, $user = null, $notrigger = 0)
 	{
 		// phpcs:enable
 		$error = 0;

From 3c28480fda5f1c39a78ff5a3f6dccb3e6aa8fd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Benke?=
 <1179011+defrance@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:26:36 +0100
Subject: [PATCH 0353/1862] Update list.php add some init field array (#28550)

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6a089f7a87d..a6fa25cfd13 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1821,6 +1821,9 @@ if ($resql) {
 		$totalarray['val']['f.total_tva'] = 0;
 		$totalarray['val']['f.total_ht'] = 0;
 		$totalarray['val']['f.total_ttc'] = 0;
+		$totalarray['val']['totalam'] = 0;
+		$totalarray['val']['rtp'] = 0;
+
 
 		$with_margin_info = false;
 		if (isModEnabled('margin') && (

From 8419cb2f0f14e94aaa7c5b8e004d2dc39aa39793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:27:00 +0100
Subject: [PATCH 0354/1862] fix phpstan (#28548)

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a518ec79f9d..f82a0fccd6e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2620,7 +2620,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
  * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
  * @return	array						Array with properties (full path, date, ...) of to most recent file
  */
-function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = 0, $mode = '')
+function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = 0, $mode = 0)
 {
 	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
 	return isset($tmparray[0]) ? $tmparray[0] : null;

From de76330aae03c7a936f46716a6bde7149c9520a4 Mon Sep 17 00:00:00 2001
From: atm-adrien <67913809+atm-adrien@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:39:32 +0100
Subject: [PATCH 0355/1862] FIX : Adding the dependencies list feature for
 extrafields "select" (#28549)

* FIX : Adding thez dependencies list feature for select fields

* FIX : Adding some spaces

* FIX : View
---
 htdocs/core/class/commonobject.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 449bb20dbdc..3fd14f2ca3c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7326,6 +7326,7 @@ abstract class CommonObject
 				}
 				$out .= '<option value="'.$keyb.'"';
 				$out .= (((string) $value == (string) $keyb) ? ' selected' : '');
+				if (!empty($parent)) $isDependList =1;
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
 				$out .= '>'.$valb.'</option>';
 			}
@@ -7950,6 +7951,9 @@ abstract class CommonObject
 			}
 		} elseif ($type == 'select') {
 			$value = isset($param['options'][$value]) ? $param['options'][$value] : '';
+			if (strpos($value, "|") !== false) {
+				$value = explode('|', $value)[0];
+			}
 		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);

From 1b1edaf0a64b25c99f258eda2dd4844c98a9085a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 18:40:48 +0100
Subject: [PATCH 0356/1862] php syntax

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3fd14f2ca3c..fc9b51c4630 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7326,7 +7326,9 @@ abstract class CommonObject
 				}
 				$out .= '<option value="'.$keyb.'"';
 				$out .= (((string) $value == (string) $keyb) ? ' selected' : '');
-				if (!empty($parent)) $isDependList =1;
+				if (!empty($parent)) {
+					$isDependList = 1;
+				}
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
 				$out .= '>'.$valb.'</option>';
 			}
@@ -7776,7 +7778,7 @@ abstract class CommonObject
 			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 
-		if ($isDependList==1) {
+		if ($isDependList == 1) {
 			$out .= $this->getJSListDependancies('_common');
 		}
 		/* Add comments

From 07a5a8f7dd76dd8e4cde7c80826258de9606568a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 18:46:27 +0100
Subject: [PATCH 0357/1862] Fix bad filter propagated

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

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index fb2081cb563..57868a64822 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -508,7 +508,7 @@ if ($id > 0 || $ref) {
 					$filter = '(fournisseur:=:1)';
 					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', $filter, 'SelectThirdParty', 0, 0, $events);
 
-					$parameters = array('filtre'=>"fournisseur=1", 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
+					$parameters = array('filter'=>$filter, 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
 					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
 					if (empty($reshook)) {
 						if (empty($form->result)) {

From 3ac149af81eb665c1eee7f6460a27bd9b2fd8ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:47:06 +0100
Subject: [PATCH 0358/1862] Limite la liste des fournisseurs aux fournisseurs
 actifs (#28556)

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

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 57868a64822..dd42d203d7f 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -505,7 +505,7 @@ if ($id > 0 || $ref) {
 				} else {
 					$events = array();
 					$events[] = array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
-					$filter = '(fournisseur:=:1)';
+					$filter = '(fournisseur:=:1) AND (status:=:1)';
 					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', $filter, 'SelectThirdParty', 0, 0, $events);
 
 					$parameters = array('filter'=>$filter, 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);

From c1fc2bd9aa789cc5f2e46ef8ae4320f6ee1d4be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:48:11 +0100
Subject: [PATCH 0359/1862] NEW Api can force invoice ref (#28547)

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

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index e86e221bbb7..af115c3aab2 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2020   Thibault FOUCART		<support@ptibogxiv.net>
  * Copyright (C) 2023	Joachim Kueter			<git-jk@bloxera.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -930,14 +931,15 @@ class Invoices extends DolibarrApi
 	 *   "notrigger": 0
 	 * }
 	 *
-	 * @param   int $id             Invoice ID
-	 * @param   int $idwarehouse    Warehouse ID
-	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-	 * @return	Object|false		Object with cleaned properties
+	 * @param   int $id             	Invoice ID
+	 * @param   string $force_number   	force ref invoice
+	 * @param   int $idwarehouse    	Warehouse ID
+	 * @param   int $notrigger      	1=Does not execute triggers, 0= execute triggers
+	 * @return	Object|false			Object with cleaned properties
 	 *
 	 * @url POST    {id}/validate
 	 */
-	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	public function validate($id, $force_number = '', $idwarehouse = 0, $notrigger = 0)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('facture', 'creer')) {
 			throw new RestException(403);
@@ -951,7 +953,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
+		$result = $this->invoice->validate(DolibarrApiAccess::$user, $force_number, $idwarehouse, $notrigger);
 		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}

From 9ab1f56f834c6b6edb308b2ad6d63067101a16b3 Mon Sep 17 00:00:00 2001
From: Delthair <41671350+Delthair@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:49:37 +0100
Subject: [PATCH 0360/1862] Update expensereport.lib.php (#28553)

ISSUE #28552
---
 htdocs/core/lib/expensereport.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index ae9ca936c47..58401b4cc59 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -81,7 +81,7 @@ function expensereport_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation', 'add', 'external');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'add', 'external');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'remove');
 

From 6e7263a04756399d5283f2fcdf8df9d906507c29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 19:25:06 +0100
Subject: [PATCH 0361/1862] =?UTF-8?q?Revert=20"FIX=20#28533=20Mo::deleteLi?=
 =?UTF-8?q?ne=20removes=20the=20"main"=20MoLine=20if=20consumed=20line=20?=
 =?UTF-8?q?=E2=80=A6"=20(#28564)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c069f3f161afe7dd811b836a244566ecdb46cd65.
---
 htdocs/mrp/class/mo.class.php | 154 +++++++++++++---------------------
 htdocs/mrp/mo_production.php  |   2 +-
 2 files changed, 60 insertions(+), 96 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 090bdc067c8..2341f1fd406 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -891,58 +891,78 @@ class Mo extends CommonObject
 	 */
 	public function deleteLine(User $user, $idline, $notrigger = false)
 	{
-		$error = 0;
+		global $langs;
+		$langs->loadLangs(array('stocks', 'mrp'));
 
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
+		$productstatic = new Product($this->db);
+		$fk_movement = GETPOST('fk_movement', 'int');
+		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);
 
-		$moline = new MoLine($this->db);
-		$moline->fetch($idline);
+		if (!empty($arrayoflines)) {
+			$this->db->begin();
 
-		$affectedLinkedMoLines;
-		// Check if it's linked or a main line
-		if (empty($moline->fk_mrp_production)) {
-			// Check if the main line has linked lines
-			$affectedLinkedMoLines = $this->fetchLinesLinked('consumed', $moline->id);
-		}
+			$stockmove = new MouvementStock($this->db);
+			$stockmove->setOrigin($this->element, $this->id);
 
-		$this->db->begin();
+			if (!empty($fk_movement)) {
+				$moline = new MoLine($this->db);
+				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, array('customsql' => 'fk_stock_movement ='.$fk_movement));
+				$moline = array_shift($TArrayMoLine);
 
-		// undo stockmovements and remove linked lines
-		if (!empty($affectedLinkedMoLines)) {
-			foreach ($affectedLinkedMoLines as $linkedLine) {
-				if (!$error) {
-					$linkedMoline = new MoLine($this->db);
-					$linkedMoline->fetch($linkedLine['rowid']);
-					$result = $linkedMoline->delete($user, $notrigger);
+				$movement = new MouvementStock($this->db);
+				$movement->fetch($fk_movement);
+				$productstatic->fetch($movement->product_id);
+				$qtytoprocess = $movement->qty;
 
-					if ($result < 0) {
-						$error++;
-						setEventMessages($linkedMoline->error, $linkedMoline->errors, 'errors');
+				// Reverse stock movement
+				$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
+				$codemovementCancel = $langs->trans("StockIncrease");
+
+				if (($qtytoprocess >= 0)) {
+					$idstockmove = $stockmove->reception($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', $movement->batch, dol_now(), 0, $codemovementCancel);
+				} else {
+					$idstockmove = $stockmove->livraison($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $movement->batch, 0, $codemovementCancel);
+				}
+				if ($idstockmove < 0) {
+					$this->error++;
+					$this->db->rollback();
+					setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+				} else {
+					$this->db->commit();
+				}
+				return $moline->delete($user, $notrigger);
+			} else {
+				foreach ($arrayoflines as $key => $arrayofline) {
+					$lineDetails = $arrayoflines[$key];
+					$productstatic->fetch($lineDetails['fk_product']);
+					$qtytoprocess = $lineDetails['qty'];
+
+					// Reverse stock movement
+					$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
+					$codemovementCancel = $langs->trans("StockIncrease");
+
+					if ($qtytoprocess >= 0) {
+						$idstockmove = $stockmove->reception($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, '', '', $lineDetails['batch'], dol_now(), 0, $codemovementCancel);
+					} else {
+						$idstockmove = $stockmove->livraison($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $lineDetails['batch'], 0, $codemovementCancel);
+					}
+					if ($idstockmove < 0) {
+						$this->error++;
+						$this->db->rollback();
+						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+					} else {
+						$this->db->commit();
 					}
 				}
+				return $this->deleteLineCommon($user, $idline, $notrigger);
 			}
-		}
-
-		if (!$error) {
-			$result = $moline->delete($user, $notrigger);
-
-			if ($result < 0) {
-				$error++;
-				setEventMessages($moline->error, $moline->errors, 'errors');
-			}
-		}
-
-		if (!$error) {
-			$this->db->commit();
-			$result = 1;
 		} else {
-			$this->db->rollback();
-			$result = -1;
+			return $this->deleteLineCommon($user, $idline, $notrigger);
 		}
-		return $result;
 	}
 
 
@@ -2202,63 +2222,7 @@ class MoLine extends CommonObjectLine
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
-		global $langs;
-
-		$error = 0;
-		$result = -1;
-
-		// the stockmovements it was created for this line revise
-		if (!empty($this->fk_warehouse)) {
-			$langs->loadLangs(array('stocks', 'mrp'));
-
-			// load the mo for this line
-			$tmpmo = new Mo($this->db);
-			$tmpmo->fetch($this->fk_mo);
-
-			// load the (old) linked stockmovement and the associated product
-			$linkedMovement = new MouvementStock($this->db);
-			$linkedMovement->fetch($this->fk_stock_movement);
-			$productForLinkedMovement = new Product($this->db);
-			$productForLinkedMovement->fetch($linkedMovement->product_id);
-
-			// create new stockmovement to revise the linked stockmovement
-			$stockmove = new MouvementStock($this->db);
-			$stockmove->setOrigin($tmpmo->element, $tmpmo->id);
-
-			// Reverse stock movement
-			$labelmovementCancel = $langs->trans("CancelProductionForRef", $productForLinkedMovement->ref);
-			$codemovementCancel = dol_print_date(dol_now(), 'dayhourlog');
-
-			$idstockmove = -1;
-			if (($linkedMovement->qty < 0)) {
-				$qtytoprocess = $linkedMovement->qty * -1;
-				$idstockmove = $stockmove->reception($user, $linkedMovement->product_id, $linkedMovement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', $linkedMovement->batch, dol_now(), 0, $codemovementCancel);
-			} else {
-				$idstockmove = $stockmove->livraison($user, $linkedMovement->product_id, $linkedMovement->warehouse_id, $linkedMovement->qty, 0, $labelmovementCancel, dol_now(), '', '', $linkedMovement->batch, 0, $codemovementCancel);
-			}
-
-			if ($idstockmove < 0) {
-				$this->error++;
-				setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-			}
-		}
-
-		if (!$error) {
-			$result = $this->deleteCommon($user, $notrigger);
-			if ($result < 0) {
-				$this->error++;
-				setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-			}
-		}
-
-		if (!$error) {
-			$this->db->commit();
-			$result = 1;
-		} else {
-			$this->db->rollback();
-			$result = -1;
-		}
-
-		return $result;
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 }
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 1dafabc87a7..0caba7cb777 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1288,7 +1288,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line2['rowid']);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
 							print '<td class="center">';
 							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');

From b870a84d8a8084a9624c79aa8d2a59a18313d7b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 20:19:37 +0100
Subject: [PATCH 0362/1862] FIX #28564

---
 htdocs/mrp/class/mo.class.php | 44 ++++++++++++++++++++++++++---------
 htdocs/mrp/mo_production.php  |  4 ++--
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2341f1fd406..e3438cad7e0 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -900,17 +900,21 @@ class Mo extends CommonObject
 		}
 		$productstatic = new Product($this->db);
 		$fk_movement = GETPOST('fk_movement', 'int');
-		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);
+		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);	// Get lines consummed under the one to delete
+
+		$result = 0;
+
+		$this->db->begin();
 
 		if (!empty($arrayoflines)) {
-			$this->db->begin();
-
+			// If there is child lines
 			$stockmove = new MouvementStock($this->db);
 			$stockmove->setOrigin($this->element, $this->id);
 
 			if (!empty($fk_movement)) {
+				// The fk_movement was not recorded so we try to guess the product and quantity to restore.
 				$moline = new MoLine($this->db);
-				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, array('customsql' => 'fk_stock_movement ='.$fk_movement));
+				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, array('customsql' => 'fk_stock_movement = '.(int) $fk_movement));
 				$moline = array_shift($TArrayMoLine);
 
 				$movement = new MouvementStock($this->db);
@@ -929,13 +933,12 @@ class Mo extends CommonObject
 				}
 				if ($idstockmove < 0) {
 					$this->error++;
-					$this->db->rollback();
 					setEventMessages($stockmove->error, $stockmove->errors, 'errors');
 				} else {
-					$this->db->commit();
+					$result = $moline->delete($user, $notrigger);
 				}
-				return $moline->delete($user, $notrigger);
 			} else {
+				// Loop on each child lines
 				foreach ($arrayoflines as $key => $arrayofline) {
 					$lineDetails = $arrayoflines[$key];
 					$productstatic->fetch($lineDetails['fk_product']);
@@ -945,6 +948,7 @@ class Mo extends CommonObject
 					$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
 					$codemovementCancel = $langs->trans("StockIncrease");
 
+
 					if ($qtytoprocess >= 0) {
 						$idstockmove = $stockmove->reception($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, '', '', $lineDetails['batch'], dol_now(), 0, $codemovementCancel);
 					} else {
@@ -952,17 +956,35 @@ class Mo extends CommonObject
 					}
 					if ($idstockmove < 0) {
 						$this->error++;
-						$this->db->rollback();
 						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
 					} else {
-						$this->db->commit();
+						$moline = new MoLine($this->db);
+						$moline->fetch($lineDetails['rowid']);
+
+						$resdel = $moline->delete($user, $notrigger);
+						if ($resdel < 0) {
+							$this->error++;
+							setEventMessages($moline->error, $moline->errors, 'errors');
+						}
 					}
 				}
-				return $this->deleteLineCommon($user, $idline, $notrigger);
+
+				if (empty($this->error)) {
+					$result = $this->deleteLineCommon($user, $idline, $notrigger);
+				}
 			}
 		} else {
-			return $this->deleteLineCommon($user, $idline, $notrigger);
+			// No child lines
+			$result = $this->deleteLineCommon($user, $idline, $notrigger);
 		}
+
+		if (!empty($this->error) || $result <= 0) {
+			$this->db->rollback();
+		} else {
+			$this->db->commit();
+		}
+
+		return $result;
 	}
 
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 0caba7cb777..d28b856e6a8 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1278,7 +1278,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Action Edit line
 						if ($object->status == Mo::STATUS_DRAFT) {
-							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
+							$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line2['rowid']);
 							print '<td class="center">';
 							print '<a class="reposition" href="' . $href . '">';
 							print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
@@ -1288,7 +1288,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Action delete line
 						if ($permissiontodelete) {
-							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line2['rowid']).'&fk_movement='.((int) $line2['fk_stock_movement']);
 							print '<td class="center">';
 							print '<a class="reposition" href="'.$href.'">';
 							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');

From b94303462257aed71f2abfd09e9a3b9b2698636a Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 20:38:27 +0100
Subject: [PATCH 0363/1862] FIX return in method put on api_ticket (#28563)

* FIX return in method put on api_ticket

* Update api_tickets.class.php

* Update api_tickets.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/ticket/class/api_tickets.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 6163ae449b2..28e87fc428f 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -382,11 +382,11 @@ class Tickets extends DolibarrApi
 			$this->ticket->$field = $value;
 		}
 
-		if ($this->ticket->update(DolibarrApiAccess::$user)) {
+		if ($this->ticket->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->ticket->error);
 		}
-
-		return false;
 	}
 
 	/**

From 7e8b45f287ad0347ab9b01502b4273f709ede986 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 1 Mar 2024 20:39:52 +0100
Subject: [PATCH 0364/1862] Qual: Improve PhpUnit logging in case of error.
 (#28562)

# Qual: Improve PhpUnit logging in case of error.

- Log exception message with extra log information.
- Do not output markers for dolibarr.log if no log lines should be shown.
- Use GitHub action style prefixes to group messages
---
 test/phpunit/CommonClassTest.class.php | 47 ++++++++++++++++++++------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 0e5f49dd24b..0322cdd28bc 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -116,11 +116,7 @@ abstract class CommonClassTest extends TestCase
 		if ($t instanceof PHPUnit\Framework\Error\Notice) {
 			$nbLinesToShow = 3;
 		}
-		$totalLines = count($lines);
-		$first_line = max(0, $totalLines - $nbLinesToShow);
 
-		// Get the last line of the log
-		$last_lines = array_slice($lines, $first_line, $nbLinesToShow);
 
 		$failedTestMethod = $this->getName(false);
 		$className = get_called_class();
@@ -131,14 +127,25 @@ abstract class CommonClassTest extends TestCase
 		// Get the test method's data set
 		$argsText = $this->getDataSetAsString(true);
 
-		// Show log file
+		$totalLines = count($lines);
+		$first_line = max(0, $totalLines - $nbLinesToShow);
+		// Get the last line of the log
+		$last_lines = array_slice($lines, $first_line, $nbLinesToShow);
+
 		print PHP_EOL;
-		print "----- $className::$failedTestMethod failed - $argsText.".PHP_EOL;
-		print "Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
-		foreach ($last_lines as $line) {
-			print $line.PHP_EOL;
+		// Use GitHub Action compatible group output (:warning: arguments not encoded)
+		print "##[group]$className::$failedTestMethod failed - $argsText.".PHP_EOL;
+		print "## Exception: {$t->getMessage()}".PHP_EOL;
+
+		if ($nbLinesToShow) {
+			// Show partial log file contents when requested.
+			print "## Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
+			foreach ($last_lines as $line) {
+				print $line.PHP_EOL;
+			}
+			print "## end of dolibarr.log for $className::$failedTestMethod".PHP_EOL;
 		}
-		print "----- end of dolibarr.log for $className::$failedTestMethod".PHP_EOL;
+		print "##[endgroup]".PHP_EOL;
 
 		parent::onNotSuccessfulTest($t);
 	}
@@ -359,4 +366,24 @@ abstract class CommonClassTest extends TestCase
 			$this->assertDirectoryDoesNotExist($directory, $message);
 		}
 	}
+
+	/**
+	 * Assert that a file does not exist without triggering deprecation
+	 *
+	 * @param string $file      The file to test
+	 * @param string $message   The message to show if the directory exists
+	 *
+	 * @return void
+	 */
+	protected function assertFileNotExistsCompat($file, $message = '')
+	{
+		$phpunitVersion = \PHPUnit\Runner\Version::id();
+
+		// Check if PHPUnit version is less than 9.0.0
+		if (version_compare($phpunitVersion, '9.0.0', '<')) {
+			$this->assertFileNotExists($file, $message);
+		} else {
+			$this->assertFileDoesNotExist($file, $message);
+		}
+	}
 }

From e39070af37f902d22feb6c820f6903a9116d4415 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 20:41:16 +0100
Subject: [PATCH 0365/1862] Fix return type by changin boot to string (#28557)

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

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 8a85a32e37a..820c92baa11 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -1249,7 +1249,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 * Format string to output with by striking the string if max number of generation was reached
 	 *
 	 * @param	string		$ret	Default value to output
-	 * @return	boolean				False by default, True if maximum number of generation is reached
+	 * @return	string				False by default, True if maximum number of generation is reached
 	 */
 	public function strikeIfMaxNbGenReached($ret)
 	{

From e0c161e4c2ee6b5ce347b1f6da3345e06fe3e695 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 20:47:47 +0100
Subject: [PATCH 0366/1862] fix assigne variable (#28559)

* fix assigne variable

* Update paiement.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/fourn/facture/paiement.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index cb36f12fe4f..4f1c81602a1 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -311,7 +311,13 @@ if (empty($reshook)) {
 			// Creation of payment line
 			$paiement = new PaiementFourn($db);
 			$paiement->datepaye     = $datepaye;
-			$paiement->amounts      = $amounts; // Array of amounts
+
+			$correctedAmounts = [];
+			foreach ($amounts as $key => $value) {
+				$correctedAmounts[$key] = (float) $value;
+			}
+
+			$paiement->amounts      = $correctedAmounts; // Array of amounts
 			$paiement->multicurrency_amounts = $multicurrency_amounts;
 			$paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching
 			$paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching

From 262f5ffd217c7e6c80b2de08c200b854515fe282 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 20:48:14 +0100
Subject: [PATCH 0367/1862] change assignement type to int (#28561)

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index b7fb7ec2c6b..f22db99fd9c 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -923,7 +923,7 @@ class Website extends CommonObject
 		$this->lang = 'en';
 		$this->otherlang = 'fr,es';
 		$this->status = 1;
-		$this->fk_default_home = null;
+		$this->fk_default_home = 0;
 		$this->virtualhost = 'http://myvirtualhost';
 		$this->fk_user_creat = $user->id;
 		$this->fk_user_modif = $user->id;

From 389d58284663efa9135d3ba7fe94b2faa7d365d2 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 20:48:52 +0100
Subject: [PATCH 0368/1862] Fix return in deleteLine and cast a variable to
 string (#28558)

---
 htdocs/fourn/class/api_supplier_invoices.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 00ba4fa8532..fe44a813231 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -474,7 +474,7 @@ class SupplierInvoices extends DolibarrApi
 		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
 		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paiement->paiementid = $payment_mode_id;
-		$paiement->paiementcode = dol_getIdFromCode($this->db, $payment_mode_id, 'c_paiement', 'id', 'code', 1);
+		$paiement->paiementcode = (string) dol_getIdFromCode($this->db, $payment_mode_id, 'c_paiement', 'id', 'code', 1);
 		$paiement->num_payment = $num_payment;
 		$paiement->note_public = $comment;
 
@@ -704,7 +704,12 @@ class SupplierInvoices extends DolibarrApi
 
 		$updateRes = $this->invoice->deleteLine($lineid);
 		if ($updateRes > 0) {
-			return $this->get($id);
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'line '.$lineid.' deleted'
+				)
+			);
 		} else {
 			throw new RestException(405, $this->invoice->error);
 		}

From 351ea07229bdb53cf0825ef1c4d26de5526bf11a Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 20:49:23 +0100
Subject: [PATCH 0369/1862] Fix return type when output is 1 (#28501)

* Fix return type when output is 1

* update doc method
---
 htdocs/core/class/html.formcontract.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index fc869901f01..954f0b6ea75 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -61,7 +61,7 @@ class FormContract
 	 *	@param	int		$showRef	Show customer and supplier reference on each contract (when found)
 	 *  @param	int		$noouput	1=Return the output instead of display
 	 *  @param	string	$morecss	More CSS
-	 *	@return int         		Nbr of contract if OK, <0 if KO
+	 *	@return int|string          If nooutput = 0: Nbr of contract if OK, <0 if KO, If nooutput = 1: The HTML select string
 	 */
 	public function select_contract($socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150')
 	{

From 19a22f6b6dac089e85c09d2f2cdbefd59db9f974 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Mar 2024 20:55:01 +0100
Subject: [PATCH 0370/1862] Fix #28509

---
 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 f4e3dd0f5f3..f266588d090 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -770,7 +770,7 @@ abstract class CommonObject
 	public $output;
 
 	/**
-	 * @var array 		extra parameters
+	 * @var array|string	extra parameters. Try to store here the array of parameters. Old code is sometimes storing a string.
 	 */
 	public $extraparams = array();
 

From dd7be6c9324f8f3852002a7175662161e5d60185 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 21:00:49 +0100
Subject: [PATCH 0371/1862] Fix return type string instead of int (#28499)

* Fix return type string instead of int

* update doc method for return
---
 htdocs/core/class/html.formintervention.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index d6f7a8bf795..08587f3fad2 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -59,7 +59,7 @@ class FormIntervention
 	 *	@param	int		$maxlength	Maximum length of label
 	 *	@param	int		$showempty	Show empty line ('1' or string to show for empty line)
 	 *	@param	bool	$draftonly	Show only drafts intervention
-	 *	@return int         		Nbre of project if OK, <0 if KO
+	 *	@return string         		HTML code for the select list if OK, empty if KO
 	 */
 	public function select_interventions($socid = -1, $selected = 0, $htmlname = 'interventionid', $maxlength = 16, $showempty = 1, $draftonly = false)
 	{

From 94b9686db5df1c1703f113fb90e9b3f7baf292e3 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 21:02:35 +0100
Subject: [PATCH 0372/1862] Fix type of variable in api_invoices (#28474)

* Fix type of variable in api_invoices

* remove coma

* replace strtotime

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/compta/facture/class/api_invoices.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index af115c3aab2..ef52e74f6c8 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1494,9 +1494,9 @@ class Invoices extends DolibarrApi
 
 		// Creation of payment line
 		$paymentobj = new Paiement($this->db);
-		$paymentobj->datepaye     = $datepaye;
-		$paymentobj->amounts      = $amounts;
-		$paymentobj->multicurrency_amounts = $multicurrency_amounts;
+		$paymentobj->datepaye     = dol_stringtotime($datepaye);
+		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paymentobj->paiementid = $paymentid;
 		$paymentobj->paiementcode = (string) dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
 		$paymentobj->num_payment = $num_payment;

From 7b92c9912b14a709b6b0dca53a7b4d21381d2355 Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 21:13:12 +0100
Subject: [PATCH 0373/1862] Fix return type by adding string in select_comptes
 method (#28496)

* Fix return type by addin string in select_comptes method

* update return doc for method

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 938333ef730..6c4a8bd4e55 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4904,7 +4904,7 @@ class Form
 	 * @param int 		$showcurrency 	Show currency in label
 	 * @param string 	$morecss 		More CSS
 	 * @param int 		$nooutput 		1=Return string, do not send to output
-	 * @return int                   	Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...)
+	 * @return int|string              	If noouput=0: Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...), If nooutput=1: Return a HTML select string.
 	 */
 	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '', $nooutput = 0)
 	{

From 74ecd5c660347560c50d1386a9d07ee4ad4e4a0f Mon Sep 17 00:00:00 2001
From: lamrani abdelwadoud <lamrani002@gmail.com>
Date: Fri, 1 Mar 2024 21:13:40 +0100
Subject: [PATCH 0374/1862] FIX return method DeleteLine in api_boms file
 (#28471)

* FIX return method DeleteLine in api_boms file

* update type of return in deleteLine method
---
 htdocs/bom/class/api_boms.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 6f1e8b31ced..f551600797a 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -438,7 +438,7 @@ class Boms extends DolibarrApi
 	 *
 	 * @url	DELETE {id}/lines/{lineid}
 	 *
-	 * @return int
+	 * @return array
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	404		BOM not found
@@ -473,7 +473,12 @@ class Boms extends DolibarrApi
 
 		$updateRes = $this->bom->deleteLine(DolibarrApiAccess::$user, $lineid);
 		if ($updateRes > 0) {
-			return $this->get($id);
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'line ' .$lineid. ' deleted'
+				)
+			);
 		} else {
 			throw new RestException(500, $this->bom->error);
 		}

From 595d735feec89f8054be35c14db84f6fc01907da Mon Sep 17 00:00:00 2001
From: Thomas C <56068416+Thomas905@users.noreply.github.com>
Date: Fri, 1 Mar 2024 21:17:52 +0100
Subject: [PATCH 0375/1862] NEW : Statistic page donation (#28463)

* v1 statistic page don

* add link

* fix phpstan

* fix

* fix

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/menus/standard/eldy.lib.php |   1 +
 htdocs/don/class/donstats.class.php     |  41 +++-
 htdocs/don/stats/index.php              | 239 +++++++++++++++---------
 htdocs/langs/en_US/donations.lang       |   1 +
 4 files changed, 185 insertions(+), 97 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 47cfd7c081d..c8561fd1f11 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1547,6 +1547,7 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 				$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->hasRight('don', 'creer'));
 				$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->hasRight('don', 'lire'));
 				$newmenu->add("/don/paiement/list.php?leftmenu=donations", $langs->trans("Payments"), 1, $user->hasRight('don', 'lire'));
+				$newmenu->add("/don/stats/index.php", $langs->trans("Statistics"), 1, $user->hasRight('don', 'lire'));
 			}
 			// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->hasRight('don',  'lire'));
 		}
diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index a4b8043f5ae..15ab2e454e3 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -28,7 +28,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
 include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-
 /**
  *	Class to manage donations statistics
  */
@@ -57,6 +56,10 @@ class DonationStats extends Stats
 	 */
 	public $where;
 
+	/**
+	 * @var string JOIN
+	 */
+	public $join;
 
 	/**
 	 * Constructor
@@ -65,8 +68,10 @@ class DonationStats extends Stats
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
+	 * @param   int		$typentid  	Id of type of third party for filter
+	 * @param   int		$status    	Status of donation for filter
 	 */
-	public function __construct($db, $socid, $mode, $userid = 0)
+	public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $status = 4)
 	{
 		global $conf;
 
@@ -76,17 +81,31 @@ class DonationStats extends Stats
 		$this->socid = ($socid > 0 ? $socid : 0);
 		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
+		$this->join = '';
+
+		if ($status == 0 || $status == 1 || $status == 2) {
+			$this->where = ' d.fk_statut IN ('.$db->sanitize($status).')';
+		} elseif ($status == 3) {
+			$this->where = ' d.fk_statut IN (-1)';
+		} elseif ($status == 4) {
+			$this->where = ' d.fk_statut >= 0';
+		}
 
 		$object = new Don($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as d";
-		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
-		//$this->field='weight';	// Warning, unit of weight is NOT USED AND MUST BE
-		$this->where .= " d.fk_statut > 0"; // Not draft and not cancelled
 
-		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
+		if ($socid !== "-1" && $socid > 0) {
+			$this->where .= " AND d.fk_soc = ".((int) $socid);
+		}
+
 		$this->where .= " AND d.entity = ".$conf->entity;
 		if ($this->userid > 0) {
-			$this->where .= ' WHERE c.fk_user_author = '.((int) $this->userid);
+			$this->where .= ' AND d.fk_user_author = '.((int) $this->userid);
+		}
+
+		if ($typentid) {
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = d.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.((int) $typentid);
 		}
 	}
 
@@ -101,13 +120,13 @@ class DonationStats extends Stats
 	{
 		$sql = "SELECT date_format(d.datedon,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
 		$sql .= " WHERE d.datedon BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
 
-		$res = $this->_getNbByMonth($year, $sql, $format);
-		return $res;
+		return $this->_getNbByMonth($year, $sql, $format);
 	}
 
 	/**
@@ -120,6 +139,7 @@ class DonationStats extends Stats
 	{
 		$sql = "SELECT date_format(d.datedon,'%Y') as dm, COUNT(*) as nb, SUM(d.".$this->field.")";
 		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -138,6 +158,7 @@ class DonationStats extends Stats
 	{
 		$sql = "SELECT date_format(d.datedon,'%m') as dm, sum(d.".$this->field.")";
 		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
 		$sql .= " WHERE ".dolSqlDateFilter('d.datedon', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -156,6 +177,7 @@ class DonationStats extends Stats
 	{
 		$sql = "SELECT date_format(d.datedon,'%m') as dm, avg(d.".$this->field.")";
 		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
 		$sql .= " WHERE ".dolSqlDateFilter('d.datedon', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -173,6 +195,7 @@ class DonationStats extends Stats
 	{
 		$sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 1629ac2e984..1bb4458c37e 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -29,10 +29,16 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/donstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+if (isModEnabled('category')) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
+// Load translation files required by the page
+$langs->loadLangs("donations");
+
 $userid = GETPOSTINT('userid');
 $socid = GETPOSTINT('socid');
 // Security check
@@ -41,44 +47,44 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
+$status = GETPOSTINT('status');
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
+$typent_id = GETPOSTINT('typent_id');
 $year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
-$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalInt('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
-
-// Load translation files required by the page
-$langs->loadLangs(array("companies", "other", "sendings"));
+$mode = GETPOST("mode") ? GETPOST("mode") : 'customer';
+$custcats = GETPOST('custcats', 'array');
 
 // Security check
 $result = restrictedArea($user, 'don');
 
-
 /*
  * View
  */
-
 $form = new Form($db);
-$title = $langs->trans("DonationsStatistics");
-llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-donation page-stats');
+$formcompany = new FormCompany($db);
 
-print load_fiche_titre($langs->trans("DonationsStatistics"), $mesg);
+llxHeader();
 
+$dir = $conf->don->dir_temp;
+
+print load_fiche_titre($langs->trans("DonationsStatistics"), '', 'donation');
 
 dol_mkdir($dir);
 
-$stats = new DonationStats($db, $socid, '', ($userid > 0 ? $userid : 0));
+$stats = new DonationStats($db, $socid, '',  ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($status > 0 ? $status : 4));
+
+if (is_array($custcats) && !empty($custcats)) {
+	$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (d.fk_soc = cat.fk_soc)';
+	$stats->where .= ' AND cat.fk_categorie IN ('.$db->sanitize(implode(',', $custcats)).')';
+}
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
-//var_dump($data);exit;
-// $data = array(array('Lib',val1,val2,val3),...)
 
-
-if (!$user->hasRight('societe', 'client', 'voir')) {
-	$filenamenb = $dir.'/donationnbinyear-'.$user->id.'-'.$year.'.png';
-} else {
-	$filenamenb = $dir.'/donationnbinyear-'.$year.'.png';
-}
+$filenamenb = $dir."/salariesnbinyear-".$year.".png";
+$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=donationStats&amp;file=donationinyear-'.$year.'.png';
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
@@ -99,11 +105,67 @@ if (!$mesg) {
 	$px1->SetShading(3);
 	$px1->SetHorizTickIncrement(1);
 	$px1->mode = 'depth';
-	$px1->SetTitle($langs->trans("NumberOfDonationsByMonth"));
+	$px1->SetTitle($langs->trans("NumberByMonth"));
 
 	$px1->draw($filenamenb, $fileurlnb);
 }
 
+$data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
+
+$filenameamount = $dir."/donationamount-".$year.".png";
+$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=donationStats&amp;file=donationamoutinyear-'.$year.'.png';
+
+$px2 = new DolGraph();
+$mesg = $px2->isGraphKo();
+if (!$mesg) {
+	$px2->SetData($data);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear) {
+		$legend[]=$i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("Amount"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode='depth';
+	$px2->SetTitle($langs->trans("AmountTotal"));
+
+	$px2->draw($filenameamount, $fileurlamount);
+}
+
+$data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
+
+$filename_avg = $dir."/donationaverage-".$year.".png";
+$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=donationStats&file=donationaverageinyear-'.$year.'.png';
+
+$px3 = new DolGraph();
+$mesg = $px3->isGraphKo();
+if (!$mesg) {
+	$px3->SetData($data);
+	$i = $startyear;
+	$legend = array();
+	while ($i <= $endyear) {
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
+
+	$px3->draw($filename_avg, $fileurl_avg);
+}
 
 // Show array
 $data = $stats->getAllByYear();
@@ -133,33 +195,62 @@ print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
 // Show filter box
 print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-print '<table class="border centpercent">';
+print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
+
 // Company
-print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-print img_picto('', 'company', 'class="pictofixedwidth"');
-print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+if (empty(!$conf->global->DONATION_USE_THIRDPARTIES)) {
+	print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
+	print '</td></tr>';
+}
+
+// ThirdParty Type
+print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
+$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT);
+print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
+if ($user->admin) {
+	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+}
 print '</td></tr>';
+
+// Category
+if (isModEnabled('category')) {
+	$cat_type = Categorie::TYPE_CUSTOMER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+	print '<tr><td>'.$cat_label.'</td><td>';
+	$cate_arbo = $form->select_all_categories($cat_type, null, 'parent', null, null, 1);
+	print img_picto('', 'category', 'class="pictofixedwidth"');
+	print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), 0, 0, 'widthcentpercentminusx maxwidth300');
+	print '</td></tr>';
+}
+
 // User
-print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
+print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
 print img_picto('', 'user', 'class="pictofixedwidth"');
 print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
+
+// Status
+print '<tr><td>'.$langs->trans("Status").'</td><td>';
+$liststatus = array(
+	'2' => $langs->trans("DonationStatusPaid"),
+	'0' => $langs->trans("DonationStatusPromiseNotValidated"),
+	'1' => $langs->trans("DonationStatusPromiseValidated"),
+	'3' => $langs->trans("Canceled")
+);
+print $form->selectarray('status', $liststatus, 4, 1);
+
 // Year
-print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-if (!in_array($year, $arrayyears)) {
-	$arrayyears[$year] = $year;
-}
-if (!in_array($nowyear, $arrayyears)) {
-	$arrayyears[$nowyear] = $nowyear;
-}
+print '<tr><td>'.$langs->trans("Year").'</td><td>';
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
+
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -167,33 +258,46 @@ print '</form>';
 print '<br><br>';
 
 print '<div class="div-table-responsive-no-min">';
-print '<table class="border centpercent">';
-print '<tr height="24">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre" height="24">';
 print '<td class="center">'.$langs->trans("Year").'</td>';
 print '<td class="right">'.$langs->trans("NbOfDonations").'</td>';
-/*print '<td class="center">'.$langs->trans("AmountTotal").'</td>';
-print '<td class="center">'.$langs->trans("AmountAverage").'</td>';*/
+print '<td class="right">%</td>';
+print '<td class="right">'.$langs->trans("AmountTotal").'</td>';
+print '<td class="right">%</td>';
+print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
+print '<td class="right">%</td>';
 print '</tr>';
 
 $oldyear = 0;
 foreach ($data as $val) {
 	$year = $val['year'];
-	while (!empty($year) && $oldyear > $year + 1) { // If we have empty year
+	while (!empty($year) && $oldyear > $year + 1) {
 		$oldyear--;
-		print '<tr height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'">'.$oldyear.'</a></td>';
 
 		print '<td class="right">0</td>';
-		/*print '<td class="right">0</td>';
-		print '<td class="right">0</td>';*/
+		print '<td class="right"></td>';
+		print '<td class="right amount">0</td>';
+		print '<td class="right"></td>';
+		print '<td class="right amount">0</td>';
+		print '<td class="right"></td>';
 		print '</tr>';
 	}
 
-	print '<tr height="24">';
-	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a></td>';
+	$greennb = (empty($val['nb_diff']) || $val['nb_diff'] >= 0);
+	$greentotal = (empty($val['total_diff']) || $val['total_diff'] >= 0);
+	$greenavg = (empty($val['avg_diff']) || $val['avg_diff'] >= 0);
+
+	print '<tr class="oddeven" height="24">';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	/*print '<td class="right">'.price(price2num($val['total'],'MT'),1).'</td>';
-	print '<td class="right">'.price(price2num($val['avg'],'MT'),1).'</td>';*/
+	print '<td class="right opacitylow" style="'.($greennb ? 'color: green;' : 'color: red;').'">'.(!empty($val['nb_diff']) && $val['nb_diff'] < 0 ? '' : '+').round(!empty($val['nb_diff']) ? $val['nb_diff'] : 0).'%</td>';
+	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
+	print '<td class="right opacitylow" style="'.($greentotal ? 'color: green;' : 'color: red;').'">'.( !empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'%</td>';
+	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
+	print '<td class="right opacitylow" style="'.($greenavg ? 'color: green;' : 'color: red;').'">'.(!empty($val['avg_diff']) && $val['avg_diff'] < 0 ? '' : '+').round(!empty($val['avg_diff']) ? $val['avg_diff'] : 0).'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
@@ -201,10 +305,8 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-
 print '</div><div class="fichetwothirdright">';
 
-
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) {
@@ -212,55 +314,16 @@ if ($mesg) {
 } else {
 	print $px1->show();
 	print "<br>\n";
-	/*print $px2->show();
+	print $px2->show();
 	print "<br>\n";
-	print $px3->show();*/
+	print $px3->show();
 }
 print '</td></tr></table>';
 
-
 print '</div></div>';
 print '<div class="clearboth"></div>';
 
 print dol_get_fiche_end();
 
-
-
-// TODO USe code similar to commande/stats/index.php instead of this one.
-/*
-print '<table class="border centpercent">';
-print '<tr><td class="center">'.$langs->trans("Year").'</td>';
-print '<td width="40%" class="center">'.$langs->trans("NbOfSendings").'</td></tr>';
-
-$sql = "SELECT count(*) as nb, date_format(date_expedition,'%Y') as dm";
-$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
-$sql.= " WHERE fk_statut > 0";
-$sql.= " AND entity = ".$conf->entity;
-$sql.= " GROUP BY dm DESC";
-
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num)
-	{
-		$row = $db->fetch_row($resql);
-		$nbproduct = $row[0];
-		$year = $row[1];
-		print "<tr>";
-		print '<td class="center"><a href="month.php?year='.$year.'">'.$year.'</a></td><td class="center">'.$nbproduct.'</td></tr>';
-		$i++;
-	}
-}
-$db->free($resql);
-
-print '</table>';
-*/
-
-print '<br>';
-print '<i>'.$langs->trans("StatsOnDonationsOnlyValidated").'</i>';
-
 llxFooter();
-
 $db->close();
diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
index e60a65efb46..eaebe7c2b03 100644
--- a/htdocs/langs/en_US/donations.lang
+++ b/htdocs/langs/en_US/donations.lang
@@ -35,3 +35,4 @@ DonationPayments=Donation payments
 DonationValidated=Donation %s validated
 DonationUseThirdparties=Use the address of an existing thirdparty as the address of the donor
 DonationsStatistics=Donation's statistics
+NbOfDonations=Number of donations

From 239652647ab6151481980251af4fcb61b41b2990 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 2 Mar 2024 02:37:55 +0100
Subject: [PATCH 0376/1862] Fix $db

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

diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index 15ab2e454e3..1e8f9f09d47 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -84,7 +84,7 @@ class DonationStats extends Stats
 		$this->join = '';
 
 		if ($status == 0 || $status == 1 || $status == 2) {
-			$this->where = ' d.fk_statut IN ('.$db->sanitize($status).')';
+			$this->where = ' d.fk_statut IN ('.$this->db->sanitize($status).')';
 		} elseif ($status == 3) {
 			$this->where = ' d.fk_statut IN (-1)';
 		} elseif ($status == 4) {

From d0e6933b6da160b9b80d8f465905aecd5be37b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:39:30 +0100
Subject: [PATCH 0377/1862] fix phpstan (#28567)

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2feb0e85511..629cf050548 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1684,7 +1684,7 @@ function dol_escape_json($stringtoescape)
  *  Returns text escaped for inclusion into a php string, build with double quotes " or '
  *
  *  @param      string		$stringtoescape		String to escape
- *  @param		string		$stringforquotes	2=String for doublequotes, 1=String for simple quotes
+ *  @param		int<1,2>	$stringforquotes	2=String for doublequotes, 1=String for simple quotes
  *  @return     string     		 				Escaped string for json content.
  */
 function dol_escape_php($stringtoescape, $stringforquotes = 2)
@@ -1695,8 +1695,7 @@ function dol_escape_php($stringtoescape, $stringforquotes = 2)
 
 	if ($stringforquotes == 2) {
 		return str_replace('"', "'", $stringtoescape);
-	}
-	if ($stringforquotes == 1) {
+	} elseif ($stringforquotes == 1) {
 		// We remove the \ char.
 		// If we allow the \ char, we can have $stringtoescape =
 		// abc\';phpcodedanger;  so the escapement will become

From d0fe3c9a6b6e502e657762fd6e2ebfa209f43b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:39:53 +0100
Subject: [PATCH 0378/1862] fix phpstan (#28569)

* fix bad use of properties

* fix bad use of properties

* fix bad use of properties
---
 htdocs/salaries/class/paymentsalary.class.php | 14 ++++++++++----
 htdocs/salaries/payments.php                  |  5 +++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index ef54b12b43a..0f2760668df 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2011-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -983,11 +984,16 @@ class PaymentSalary extends CommonObject
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		if (property_exists($this, 'fk_bank')) {
-			$return .= ' |  <span class="info-box-label">'.$this->fk_bank.'</span>';
+		if (property_exists($this, 'fk_bank') && is_numeric($this->fk_bank)) {
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$account = new AccountLine($this->db);
+			$account->fetch($this->fk_bank);
+			$return .= ' |  <span class="info-box-label">'.$account->getNomUrl(1).'</span>';
 		}
-		if (property_exists($this, 'fk_user_author')) {
-			$return .= '<br><span class="info-box-status">'.$this->fk_user_author.'</span>';
+		if (property_exists($this, 'fk_user_author') && is_numeric($this->fk_user_author)) {
+			$userstatic = new User($this->db);
+			$userstatic->fetch($this->fk_user_author);
+			$return .= '<br><span class="info-box-status">'.$userstatic->getNomUrl(1).'</span>';
 		}
 
 		if (property_exists($this, 'fk_typepayment')) {
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index b9f93125294..3921451d174 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2015-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -613,8 +614,8 @@ while ($i < $imaxinloop) {
 
 	$accountlinestatic->id = $obj->fk_bank;
 	$accountlinestatic->ref = $obj->fk_bank;
-	$paymentsalstatic->fk_bank = $accountlinestatic->getNomUrl(1);
-	$paymentsalstatic->fk_user_author = $userstatic->getNomUrl(1);
+	$paymentsalstatic->fk_bank = $accountlinestatic->id;
+	$paymentsalstatic->fk_user_author = $userstatic->id;
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {

From 39debebe270002fee12eb913d08807db05d5197e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:40:06 +0100
Subject: [PATCH 0379/1862] fix phpstan (#28570)

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

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 282917f2099..d272bc6e95a 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2017 Francis Appels       <francis.appels@yahoo.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -235,8 +236,8 @@ class FormProduct
 	 * Return full path to current warehouse in $tab (recursive function)
 	 *
 	 * @param	array	$tab			warehouse data in $this->cache_warehouses line
-	 * @param	String	$final_label	full label with all parents, separated by ' >> ' (completed on each call)
-	 * @return	String					full label with all parents, separated by ' >> '
+	 * @param	string	$final_label	full label with all parents, separated by ' >> ' (completed on each call)
+	 * @return	string					full label with all parents, separated by ' >> '
 	 */
 	private function get_parent_path($tab, $final_label = '')
 	{
@@ -550,7 +551,7 @@ class FormProduct
 	 *  @param  int|string	$adddefault			 1=Add empty unit called "Default", ''=Add empty value
 	 *  @param  int         $mode                1=Use short label as value, 0=Use rowid, 2=Use scale (power)
 	 *  @param	string		$morecss			 More CSS
-	 *  @return string
+	 *  @return string|-1
 	 */
 	public function selectMeasuringUnits($name = 'measuring_units', $measuring_style = '', $default = '0', $adddefault = 0, $mode = 0, $morecss = 'maxwidth125')
 	{

From 99d7b76ba94e364a47a4a6c8b2b42034f481c32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:40:25 +0100
Subject: [PATCH 0380/1862] fix phpstan (#28568)

---
 .../generate/modGeneratePassNone.class.php      | 17 ++---------------
 .../generate/modGeneratePassPerso.class.php     | 15 +--------------
 .../generate/modGeneratePassStandard.class.php  | 17 ++---------------
 .../security/generate/modules_genpassword.php   | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index d9688edfcd2..e5f1f77c00c 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,20 +38,6 @@ class modGeneratePassNone extends ModeleGenPassword
 
 	public $picto = 'fa-keyboard';
 
-	/**
-	 * Minimum length (text visible by end user)
-	 *
-	 * @var int
-	 */
-	public $length;
-
-	/**
-	 * Minimum length in number of characters
-	 *
-	 * @var integer
-	 */
-	public $length2;
-
 	/**
 	 *	Constructor
 	 *
@@ -62,7 +49,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	public function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "none";
-		$this->length = 0;
+		$this->length = '0';
 		$this->length2 = 0;
 
 		$this->db = $db;
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index e3769c66f78..a588e62eeef 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2006-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2014		Teddy Andreotti		<125155@supinfo.com>
  * Copyright (C) 2017		Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,20 +40,6 @@ class modGeneratePassPerso extends ModeleGenPassword
 
 	public $picto = 'fa-shield-alt';
 
-	/**
-	 * Minimum length (text visible by end user)
-	 *
-	 * @var int
-	 */
-	public $length;
-
-	/**
-	 * Minimum length in number of characters
-	 *
-	 * @var integer
-	 */
-	public $length2;
-
 	public $NbMaj;
 	public $NbNum;
 	public $NbSpe;
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 026ec34a852..53f40260dbc 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,20 +38,6 @@ class modGeneratePassStandard extends ModeleGenPassword
 
 	public $picto = 'fa-shield-alt';
 
-	/**
-	 * Minimum length (text visible by end user)
-	 *
-	 * @var int
-	 */
-	public $length;
-
-	/**
-	 * Minimum length in number of characters
-	 *
-	 * @var integer
-	 */
-	public $length2;
-
 	/**
 	 *	Constructor
 	 *
@@ -62,7 +49,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	public function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "standard";
-		$this->length = 12;
+		$this->length = '12';
 		$this->length2 = 12;
 
 		$this->db = $db;
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index ec17cac6e9b..a463f11b061 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,6 +64,20 @@ abstract class ModeleGenPassword
 	 */
 	public $user;
 
+	/**
+	 * Minimum length (text visible by end user)
+	 *
+	 * @var string
+	 */
+	public $length;
+
+	/**
+	 * Minimum length in number of characters
+	 *
+	 * @var integer
+	 */
+	public $length2;
+
 	/**
 	 * 		Return if a module can be used or not
 	 *

From b1f01b1e705c54d9a30bb98ed8f669bf1de459ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:40:59 +0100
Subject: [PATCH 0381/1862] fix phpstan (#28571)

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 265f218fc53..f474d200783 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -451,7 +451,7 @@ class Task extends CommonObjectLine
 
 		// Clean parameters
 		if (isset($this->fk_project)) {
-			$this->fk_project = trim($this->fk_project);
+			$this->fk_project = (int) $this->fk_project;
 		}
 		if (isset($this->ref)) {
 			$this->ref = trim($this->ref);
@@ -472,7 +472,7 @@ class Task extends CommonObjectLine
 			$this->planned_workload = trim($this->planned_workload);
 		}
 		if (isset($this->budget_amount)) {
-			$this->budget_amount = trim($this->budget_amount);
+			$this->budget_amount = (float) $this->budget_amount;
 		}
 
 		if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {

From 04749842b2dbbd1daecc68dfbbed08ded4b71ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:41:12 +0100
Subject: [PATCH 0382/1862] fix phpstan property does not accept string
 (#28574)

* fix phpstan property does not accept string

* fix phpstan property does not accept string
---
 htdocs/stripe/class/stripe.class.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index b00c46b6dc6..70ed30c225f 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018-2021 	Thibault FOUCART       <support@ptibogxiv.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,6 +49,9 @@ class Stripe extends CommonObject
 	 */
 	public $id;
 
+	/**
+	 * @var string
+	 */
 	public $mode;
 
 	/**
@@ -55,11 +59,21 @@ class Stripe extends CommonObject
 	 */
 	public $entity;
 
+	/**
+	 * @var string
+	 */
 	public $statut;
 
 	public $type;
 
+	/**
+	 * @var string
+	 */
 	public $code;
+
+	/**
+	 * @var string
+	 */
 	public $declinecode;
 
 	/**

From b131013c82ff67fb2831c2e51d4ae9aa8a20dba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:41:46 +0100
Subject: [PATCH 0383/1862] fix parameter of method is incompatible with type
 int (#28573)

fix parameter of method is incompatible with type int
---
 htdocs/expedition/class/expedition.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 70a7b3a6a2d..d5d689618d8 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2133,7 +2133,7 @@ class Expedition extends CommonObject
 	 *  @param  int      $id     only this carrier, all if none
 	 *  @return void
 	 */
-	public function list_delivery_methods($id = '')
+	public function list_delivery_methods($id = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -2143,7 +2143,7 @@ class Expedition extends CommonObject
 
 		$sql = "SELECT em.rowid, em.code, em.libelle as label, em.description, em.tracking, em.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		if ($id != '') {
+		if (!empty($id)) {
 			$sql .= " WHERE em.rowid=".((int) $id);
 		}
 

From 2a52a35dc1bfffd8067e6bab7f211bc5ec03de6b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 2 Mar 2024 12:42:20 +0100
Subject: [PATCH 0384/1862] Qual: Improve logging on phpunit error by limiting
 to new log lines (#28575)

# Qual: Improve logging on phpunit error by limiting to new log lines

Log only the new files since the start of the failed test within the limit
of the number of requested lines.

To do this, the log file size is recorded in setUp() to show only the data
beyond this limit on error.
---
 test/phpunit/CommonClassTest.class.php | 45 ++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 0322cdd28bc..bd1bfa4948b 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -60,6 +60,16 @@ abstract class CommonClassTest extends TestCase
 	 */
 	public $nbLinesToShow = 100;
 
+	/**
+	 * Log file from which to extract lines in case of failing test
+	 */
+	public $logfile = DOL_DATA_ROOT.'/dolibarr.log';
+
+	/**
+	 * Log file size before a test started (=in setUp() call)
+	 */
+	public $logSizeAtSetup = 0;
+
 	/**
 	 * Constructor
 	 * We save global variables into local variables
@@ -108,15 +118,25 @@ abstract class CommonClassTest extends TestCase
 	 */
 	protected function onNotSuccessfulTest(Throwable $t): void
 	{
-		$logfile = DOL_DATA_ROOT.'/dolibarr.log';
 
-		$lines = file($logfile);
+		// Get the lines that were added since the start of the test
+
+		$filecontent = (string) @file_get_contents($this->logfile);
+		$currentSize = strlen($filecontent);
+		if ($currentSize >= $this->logSizeAtSetup) {
+			$filecontent = substr($filecontent, $this->logSizeAtSetup);
+		}
+		$lines = preg_split("/\r?\n/", $filecontent, -1, PREG_SPLIT_NO_EMPTY);
+
+
+		// Determine the number of lines to show
 
 		$nbLinesToShow = $this->nbLinesToShow;
 		if ($t instanceof PHPUnit\Framework\Error\Notice) {
 			$nbLinesToShow = 3;
 		}
 
+		// Determine test information to show
 
 		$failedTestMethod = $this->getName(false);
 		$className = get_called_class();
@@ -132,18 +152,26 @@ abstract class CommonClassTest extends TestCase
 		// Get the last line of the log
 		$last_lines = array_slice($lines, $first_line, $nbLinesToShow);
 
+
+		// Show log information
+
 		print PHP_EOL;
 		// Use GitHub Action compatible group output (:warning: arguments not encoded)
 		print "##[group]$className::$failedTestMethod failed - $argsText.".PHP_EOL;
 		print "## Exception: {$t->getMessage()}".PHP_EOL;
 
 		if ($nbLinesToShow) {
-			// Show partial log file contents when requested.
-			print "## Show last ".$nbLinesToShow." lines of dolibarr.log file -----".PHP_EOL;
-			foreach ($last_lines as $line) {
-				print $line.PHP_EOL;
+			$newLines = count($last_lines);
+			if ($newLines > 0) {
+				// Show partial log file contents when requested.
+				print "## Show last ".count($last_lines)." lines of dolibarr.log file -----".PHP_EOL;
+				foreach ($last_lines as $line) {
+					print $line.PHP_EOL;
+				}
+				print "## end of dolibarr.log for $className::$failedTestMethod".PHP_EOL;
+			} else {
+				print "## No new lines in 'dolibarr.log' since start of this test.".PHP_EOL;
 			}
-			print "## end of dolibarr.log for $className::$failedTestMethod".PHP_EOL;
 		}
 		print "##[endgroup]".PHP_EOL;
 
@@ -164,6 +192,9 @@ abstract class CommonClassTest extends TestCase
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
+		// Record the filesize to determine which part of the log to show on error
+		$this->logSizeAtSetup = (int) filesize($this->logfile);
+
 		if ((int) getenv('PHPUNIT_DEBUG') > 0) {
 			print get_called_class().'::'.$this->getName(false)."::".__FUNCTION__.PHP_EOL;
 		}

From 2044a133e9734af33d60911c2eb2ad5455df81e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2024 13:15:20 +0100
Subject: [PATCH 0385/1862] Fix warning

---
 htdocs/core/class/conf.class.php           |  8 ++++----
 htdocs/core/lib/functions.lib.php          |  1 +
 test/phpunit/BuildDocTest.php              | 16 ++++++++++------
 test/phpunit/WebservicesInvoicesTest.php   |  5 ++++-
 test/phpunit/WebservicesProductsTest.php   |  5 ++++-
 test/phpunit/WebservicesThirdpartyTest.php |  5 ++++-
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e9ef6837439..647354ef247 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -566,8 +566,8 @@ class Conf extends stdClass
 
 			// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
 
-			// Module fournisseur
-			if (!empty($this->fournisseur)) {
+			// Module supplier is on
+			if (isModEnabled('fournisseur')) {
 				$this->fournisseur->commande = new stdClass();
 				$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
 				$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
@@ -592,8 +592,8 @@ class Conf extends stdClass
 				$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility
 				$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility
 
-				// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice
-				if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties
+				// To prepare split of module supplier into module 'supplier' + 'supplier_order' + 'supplier_invoice'
+				if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties
 					$this->supplier_order = new stdClass();
 					$this->supplier_order->enabled = 1;
 					$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2feb0e85511..d454e76bebd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -234,6 +234,7 @@ define(
 		'ficheinter' => 'intervention',  // Backup for 'fichinter'
 		'propale' => 'propal', // Has old directory
 		'socpeople' => 'contact', // Has old directory
+		'fournisseur' => 'supplier',  // Has old directory
 
 		'actioncomm' => 'agenda',  // NO module directory (public dir agenda)
 		'product_price' => 'productprice', // NO directory
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index b5bbc17e2ce..2ef528c7b84 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -87,11 +87,15 @@ class BuildDocTest extends CommonClassTest
 	{
 		global $conf,$user,$langs,$db;
 
-		if (!isModEnabled('facture')) {
+		if (!isModEnabled('supplier')) {
+			print __METHOD__." supplier module not enabled\n";
+			die(1);
+		}
+		if (!isModEnabled('invoice')) {
 			print __METHOD__." invoice module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('commande')) {
+		if (!isModEnabled('order')) {
 			print __METHOD__." order module not enabled\n";
 			die(1);
 		}
@@ -99,15 +103,15 @@ class BuildDocTest extends CommonClassTest
 			print __METHOD__." propal module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('projet')) {
+		if (!isModEnabled('project')) {
 			print __METHOD__." project module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('expedition')) {
+		if (!isModEnabled('shipping')) {
 			print __METHOD__." shipment module not enabled\n";
 			die(1);
 		}
-		if (!isModEnabled('ficheinter')) {
+		if (!isModEnabled('intervention')) {
 			print __METHOD__." intervention module not enabled\n";
 			die(1);
 		}
@@ -233,7 +237,7 @@ class BuildDocTest extends CommonClassTest
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
-		$conf->fournisseur->facture->dir_output .= '/temp';
+		$conf->fournisseur->facture->dir_output .= '/temp';	// To not poluate the existing dir_output dir
 		$localobject = new FactureFournisseur($db);
 		$localobject->initAsSpecimen();
 
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 7a2404f2dd7..a11a7a43569 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -231,7 +231,10 @@ class WebservicesInvoicesTest extends CommonClassTest
 		}
 
 		print __METHOD__." result=".$result['result']['result_code']." ".$result['result']['result_label']."\n";
-		$this->assertEquals('OK', $result['result']['result_code']);
+
+		$resultcode = empty($result['result']['result_code']) ? 'KO' : $result['result']['result_code'];
+
+		$this->assertEquals('OK', $resultcode);
 		$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 
 
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 920254f618d..25e350d4a86 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -126,7 +126,10 @@ class WebservicesProductsTest extends CommonClassTest
 		}
 		print var_export($result, true);
 		print __METHOD__." count(result)=".(is_array($result) ? count($result) : '')."\n";
-		$this->assertEquals('OK', $result['result']['result_code']);
+
+		$resultcode = empty($result['result']['result_code']) ? 'KO' : $result['result']['result_code'];
+
+		$this->assertEquals('OK', $resultcode);
 
 		return $result['id'];
 	}
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index d3de9ec4a72..4df603a910d 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -348,7 +348,10 @@ class WebservicesThirdpartyTest extends CommonClassTest
 		}
 
 		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
-		$this->assertEquals('OK', $result['result']['result_code']);
+
+		$resultcode = empty($result['result']['result_code']) ? 'KO' : $result['result']['result_code'];
+
+		$this->assertEquals('OK', $resultcode);
 
 		return $result;
 	}

From cb6c65183dd57d62160f2fd92b2ed66efdaa0ebd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2024 13:53:10 +0100
Subject: [PATCH 0386/1862] Fix bad condition on project field

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

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 69a69891536..48e8b510877 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -102,7 +102,7 @@ $arrayfields = array(
 	'cs.fk_type'	=>array('label'=>"Type", 'checked'=>1, 'position'=>30),
 	'cs.date_ech'	=>array('label'=>"Date", 'checked'=>1, 'position'=>40),
 	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>50),
-	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled('project'))),
+	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled('project'))),
 	'cs.fk_user'	=>array('label'=>"Employee", 'checked'=>1, 'position'=>70),
 	'cs.fk_mode_reglement'	=>array('checked'=>-1, 'position'=>80, 'label'=>"DefaultPaymentMode"),
 	'cs.amount'		=>array('label'=>"Amount", 'checked'=>1, 'position'=>100),

From 39458e7c313a1411e228d81d0c3686bdb4313217 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2024 14:28:04 +0100
Subject: [PATCH 0387/1862] Better error management

---
 htdocs/core/class/dolreceiptprinter.class.php | 3 +++
 htdocs/takepos/ajax/ajax.php                  | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index ceed3bb58c4..0efd7b5a923 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -1028,6 +1028,9 @@ class dolReceiptPrinter extends Printer
 			}
 			if (!$error) {
 				$parameter = (isset($obj['parameter']) ? $obj['parameter'] : '');
+
+				dol_syslog("initPrinter printerid=".$printerid." parameter=".$parameter);
+
 				try {
 					$type = $obj['fk_type'];
 					switch ($type) {
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index ee27b0541ba..887785c5137 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -397,15 +397,18 @@ if ($action == 'getProducts') {
 	}
 } elseif ($action == "opendrawer" && $term != '') {
 	top_httphead('application/html');
-
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 	$printer = new dolReceiptPrinter($db);
 	// check printer for terminal
 	if (getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term) > 0) {
 		$printer->initPrinter(getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term));
 		// open cashdrawer
-		$printer->pulse();
-		$printer->close();
+		if ($printer->getPrintConnector()) {
+			$printer->pulse();
+			$printer->close();
+		} else {
+			print 'Failed to init printer with ID='.getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term);
+		}
 	}
 } elseif ($action == "printinvoiceticket" && $term != '' && $id > 0 && $user->hasRight('facture', 'lire')) {
 	top_httphead('application/html');

From 717297ef295f69c627295eff4f0dfdee3b37f2e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2024 14:49:27 +0100
Subject: [PATCH 0388/1862] FIX Wrong currency shown in TakePOS payment page

---
 htdocs/takepos/pay.php | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index f2e58f98573..df498a5fec7 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -248,6 +248,7 @@ if ($resql) {
 		}
 	}
 }
+
 ?>
 
 <script>
@@ -509,20 +510,51 @@ if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
 ?>
 </script>
 
+<?php
+$showothercurrency = 0;
+if (isModEnabled('multicurrency') && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+	//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+	$showothercurrency = 1;
+	include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+	$multicurrency = new MultiCurrency($db);
+	$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+}
+?>
+
 <div style="position:relative; padding-top: 20px; left:5%; height:140px; width:90%;">
 	<div class="paymentbordline paymentbordlinetotal center">
-		<span class="takepospay colorwhite"><?php echo $langs->trans('TotalTTC'); ?>: <span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
+		<span class="takepospay colorwhite"><?php echo $langs->trans('TotalTTC'); ?>: <span id="totaldisplay" class="colorwhite"><?php
+		echo price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency);
+		if ($showothercurrency) {
+			print ' &nbsp; <span id="linecolht-span-total opacitymedium" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+		}
+		?></span></span>
 	</div>
 	<?php if ($remaintopay != $invoice->total_ttc) { ?>
 		<div class="paymentbordline paymentbordlineremain center">
-			<span class="takepospay colorwhite"><?php echo $langs->trans('RemainToPay'); ?>: <span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
+			<span class="takepospay colorwhite"><?php echo $langs->trans('RemainToPay'); ?>: <span id="remaintopaydisplay" class="colorwhite"><?php
+			echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code);
+			if ($showothercurrency) {
+				print ' &nbsp; <span id="linecolht-span-total opacitymedium" style="font-size:0.9em; font-style:italic;">(' . price($remaintopay * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+			}
+			?></span></span>
 		</div>
 	<?php } ?>
 	<div class="paymentbordline paymentbordlinereceived center">
-		<span class="takepospay colorwhite"><?php echo $langs->trans("Received"); ?>: <span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span>
+		<span class="takepospay colorwhite"><?php echo $langs->trans("Received"); ?>: <span class="change1 colorred"><?php
+			echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code);
+		if ($showothercurrency) {
+			print ' &nbsp; <span id="linecolht-span-total opacitymedium" style="font-size:0.9em; font-style:italic;">(' . price(0 * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+		}
+		?></span><input type="hidden" id="change1" class="change1" value="0"></span>
 	</div>
 	<div class="paymentbordline paymentbordlinechange center">
-		<span class="takepospay colorwhite"><?php echo $langs->trans("Change"); ?>: <span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span>
+		<span class="takepospay colorwhite"><?php echo $langs->trans("Change"); ?>: <span class="change2 colorwhite"><?php
+			echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code);
+		if ($showothercurrency) {
+			print ' &nbsp; <span id="linecolht-span-total opacitymedium" style="font-size:0.9em; font-style:italic;">(' . price(0 * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+		}
+		?></span><input type="hidden" id="change2" class="change2" value="0"></span>
 	</div>
 	<?php
 	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {

From 074041d925ded7951bed03ce0bf0a47ccbc5f535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 16:37:53 +0100
Subject: [PATCH 0389/1862] fix default value is incompatible with int (#28579)

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 629cf050548..b99f499e884 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2903,10 +2903,10 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 /**
  *	Format a string.
  *
- *	@param	string	$fmt		Format of strftime function (http://php.net/manual/fr/function.strftime.php)
- *  @param	int		$ts			Timestamp (If is_gmt is true, timestamp is already includes timezone and daylight saving offset, if is_gmt is false, timestamp is a GMT timestamp and we must compensate with server PHP TZ)
- *  @param	bool	$is_gmt		See comment of timestamp parameter
- *	@return	string				A formatted string
+ *	@param	string		$fmt		Format of strftime function (http://php.net/manual/fr/function.strftime.php)
+ *  @param	int|false	$ts			Timestamp (If is_gmt is true, timestamp is already includes timezone and daylight saving offset, if is_gmt is false, timestamp is a GMT timestamp and we must compensate with server PHP TZ)
+ *  @param	bool		$is_gmt		See comment of timestamp parameter
+ *	@return	string					A formatted string
  *  @see dol_stringtotime()
  */
 function dol_strftime($fmt, $ts = false, $is_gmt = false)

From fba15178eb9c52c3c8fd62bbace8416521d6c213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 16:38:35 +0100
Subject: [PATCH 0390/1862] all initAsSpecimen return int (#28577)

* all initAsSpecimen return int

* all initAsSpecimen return int

* all initAsSpecimen return int
---
 htdocs/accountancy/class/bookkeeping.class.php       |  6 ++++--
 htdocs/adherents/class/adherent_type.class.php       |  5 ++++-
 htdocs/asset/class/asset.class.php                   |  5 +++--
 htdocs/asset/class/assetmodel.class.php              |  5 +++--
 htdocs/bom/class/bom.class.php                       |  9 ++++++---
 htdocs/bookcal/class/availabilities.class.php        |  5 +++--
 htdocs/bookcal/class/calendar.class.php              |  6 +++---
 htdocs/categories/class/categorie.class.php          |  4 +++-
 .../comm/action/class/actioncommreminder.class.php   |  5 +++--
 htdocs/comm/propal/class/propal.class.php            |  6 ++++--
 htdocs/commande/class/commande.class.php             |  6 ++++--
 htdocs/compta/bank/class/account.class.php           |  6 ++++--
 htdocs/compta/bank/class/bankcateg.class.php         |  5 ++++-
 htdocs/compta/bank/class/paymentvarious.class.php    |  6 ++++--
 htdocs/compta/facture/class/facture-rec.class.php    |  6 ++++--
 htdocs/compta/facture/class/facture.class.php        |  5 ++++-
 htdocs/compta/facture/class/paymentterm.class.php    |  5 ++++-
 htdocs/compta/localtax/class/localtax.class.php      |  5 ++++-
 .../paiement/cheque/class/remisecheque.class.php     |  5 ++++-
 htdocs/compta/paiement/class/cpaiement.class.php     |  6 ++++--
 htdocs/compta/paiement/class/paiement.class.php      |  6 ++++--
 .../compta/sociales/class/cchargesociales.class.php  |  5 ++++-
 .../compta/sociales/class/chargesociales.class.php   |  6 ++++--
 .../class/paymentsocialcontribution.class.php        |  5 ++++-
 htdocs/compta/tva/class/paymentvat.class.php         |  5 ++++-
 htdocs/compta/tva/class/tva.class.php                |  6 ++++--
 htdocs/contact/class/contact.class.php               |  2 ++
 htdocs/contrat/class/contrat.class.php               |  6 ++++--
 htdocs/core/class/cgenericdic.class.php              |  5 ++++-
 htdocs/core/class/ctyperesource.class.php            |  5 ++++-
 htdocs/core/class/defaultvalues.class.php            |  6 +++---
 htdocs/core/class/discount.class.php                 |  5 ++++-
 htdocs/core/class/emailsenderprofile.class.php       |  5 +++--
 htdocs/core/class/events.class.php                   |  5 ++++-
 htdocs/core/class/menubase.class.php                 |  6 ++++--
 htdocs/core/class/timespent.class.php                |  8 ++++----
 htdocs/cron/class/cronjob.class.php                  |  5 ++++-
 htdocs/datapolicy/class/datapolicycron.class.php     |  4 ++--
 htdocs/delivery/class/delivery.class.php             |  4 +++-
 htdocs/don/class/don.class.php                       |  8 +++++---
 htdocs/don/class/paymentdonation.class.php           |  5 ++++-
 htdocs/ecm/class/ecmdirectory.class.php              |  5 ++++-
 htdocs/ecm/class/ecmfiles.class.php                  |  6 ++++--
 htdocs/emailcollector/class/emailcollector.class.php |  5 +++--
 .../class/emailcollectoraction.class.php             |  5 +++--
 .../class/emailcollectorfilter.class.php             |  5 +++--
 .../class/conferenceorbooth.class.php                |  5 +++--
 .../class/conferenceorboothattendee.class.php        |  5 +++--
 htdocs/expedition/class/expedition.class.php         |  6 ++++--
 htdocs/expensereport/class/expensereport.class.php   |  7 ++++---
 .../class/paymentexpensereport.class.php             |  5 ++++-
 htdocs/fichinter/class/fichinter.class.php           |  6 ++++--
 htdocs/fichinter/class/fichinterrec.class.php        |  7 +++++--
 htdocs/fourn/class/fournisseur.commande.class.php    |  6 ++++--
 .../class/fournisseur.commande.dispatch.class.php    |  5 ++++-
 htdocs/fourn/class/fournisseur.facture-rec.class.php |  6 ++++--
 htdocs/fourn/class/fournisseur.facture.class.php     | 12 +++++++-----
 htdocs/fourn/class/paiementfourn.class.php           |  5 ++++-
 htdocs/holiday/class/holiday.class.php               |  6 ++++--
 htdocs/hrm/class/establishment.class.php             |  6 ++++--
 htdocs/hrm/class/evaluation.class.php                |  5 +++--
 htdocs/hrm/class/evaluationdet.class.php             |  5 +++--
 htdocs/hrm/class/job.class.php                       |  5 +++--
 htdocs/hrm/class/position.class.php                  |  5 +++--
 htdocs/hrm/class/skill.class.php                     |  5 +++--
 htdocs/hrm/class/skilldet.class.php                  |  5 +++--
 htdocs/hrm/class/skillrank.class.php                 |  5 +++--
 .../class/knowledgerecord.class.php                  |  6 ++++--
 htdocs/loan/class/loan.class.php                     |  6 ++++--
 .../modulebuilder/template/class/myobject.class.php  |  6 +++---
 htdocs/mrp/class/mo.class.php                        |  6 ++++--
 htdocs/opensurvey/class/opensurveysondage.class.php  |  6 ++++--
 htdocs/partnership/class/partnership.class.php       |  5 +++--
 htdocs/partnership/class/partnership_type.class.php  |  5 +++--
 htdocs/product/class/product.class.php               |  6 ++++--
 htdocs/product/class/productbatch.class.php          |  5 ++++-
 htdocs/product/class/productcustomerprice.class.php  |  5 ++++-
 .../product/class/productfournisseurprice.class.php  |  5 +++--
 htdocs/product/class/propalmergepdfproduct.class.php |  5 ++++-
 .../dynamic_price/class/price_expression.class.php   |  5 ++++-
 .../class/price_global_variable.class.php            |  4 +++-
 .../class/price_global_variable_updater.class.php    |  4 +++-
 htdocs/product/inventory/class/inventory.class.php   |  7 +++++--
 htdocs/product/stock/class/entrepot.class.php        |  6 ++++--
 htdocs/product/stock/class/mouvementstock.class.php  |  7 ++++---
 htdocs/product/stock/class/productlot.class.php      |  6 ++++--
 .../stock/class/productstockentrepot.class.php       |  6 ++++--
 .../stocktransfer/class/stocktransfer.class.php      |  6 +++---
 .../stocktransfer/class/stocktransferline.class.php  |  5 +++--
 htdocs/projet/class/project.class.php                |  4 +++-
 htdocs/projet/class/task.class.php                   |  4 +++-
 htdocs/reception/class/reception.class.php           |  6 ++++--
 .../class/recruitmentcandidature.class.php           |  5 +++--
 .../class/recruitmentjobposition.class.php           |  5 +++--
 htdocs/salaries/class/paymentsalary.class.php        |  6 ++++--
 htdocs/salaries/class/salary.class.php               |  5 ++++-
 htdocs/societe/class/companybankaccount.class.php    |  5 ++++-
 htdocs/societe/class/companypaymentmode.class.php    |  6 +++---
 htdocs/societe/class/societe.class.php               |  3 ++-
 htdocs/societe/class/societeaccount.class.php        |  5 +++--
 .../class/supplier_proposal.class.php                |  4 +++-
 htdocs/ticket/class/cticketcategory.class.php        |  5 +++--
 htdocs/ticket/class/ticket.class.php                 |  3 ++-
 htdocs/user/class/user.class.php                     |  3 ++-
 htdocs/user/class/usergroup.class.php                |  6 ++++--
 htdocs/webhook/class/target.class.php                |  6 ++++--
 htdocs/website/class/website.class.php               |  6 ++++--
 htdocs/website/class/websitepage.class.php           |  5 ++++-
 htdocs/workstation/class/workstation.class.php       |  6 +++---
 htdocs/zapier/class/hook.class.php                   |  6 +++---
 test/phpunit/CommonClassTest.class.php               |  1 +
 111 files changed, 400 insertions(+), 198 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a7d946f5ec7..f8b3215e083 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2015-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2020  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1723,7 +1723,7 @@ class BookKeeping extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1753,6 +1753,8 @@ class BookKeeping extends CommonObject
 		$this->journal_label = 'Journal de vente';
 		$this->piece_num = 1234;
 		$this->date_creation = $now;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index b0a9d88eaef..44f51ff9aca 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2018-2019  Thibault Foucart		<support@ptibogxiv.net>
  * Copyright (C) 2021     	Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -883,7 +884,7 @@ class AdherentType extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -907,6 +908,8 @@ class AdherentType extends CommonObject
 		$this->members = array(
 			$user->id => $user
 		);
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 38da4658d25..4b468a5633c 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2018  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1508,7 +1509,7 @@ class Asset extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1516,7 +1517,7 @@ class Asset extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 0694ae75fd6..12132d4b65a 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2021  Open-Dsi  			<support@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -774,7 +775,7 @@ class AssetModel extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -782,7 +783,7 @@ class AssetModel extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index e36415b4077..ba88dfff476 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2019	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2023	Benjamin Falière	<benjamin.faliere@altairis.fr>
  * Copyright (C) 2023	Charlene Benke		<charlene@patas-monkey.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1368,13 +1369,15 @@ class BOM extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->initAsSpecimenCommon();
 		$this->ref = 'BOM-123';
 		$this->date_creation = dol_now() - 20000;
+
+		return 1;
 	}
 
 
@@ -2128,10 +2131,10 @@ class BOMLine extends CommonObjectLine
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 5e9ffe56f5c..a839ae3e52c 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -926,7 +927,7 @@ class Availabilities extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -934,7 +935,7 @@ class Availabilities extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 5f7352bd493..eec383501db 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur      <eldy@users.sourceforge.net>
- * Copyright (C) 2023  Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -915,7 +915,7 @@ class Calendar extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -923,7 +923,7 @@ class Calendar extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b16a0608680..1f901d7381e 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -2078,7 +2078,7 @@ class Categorie extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -2092,6 +2092,8 @@ class Categorie extends CommonObject
 		$this->description = 'This is a description';
 		$this->socid = 1;
 		$this->type = self::TYPE_PRODUCT;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 81d6249eaad..4880e42300d 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -264,10 +265,10 @@ class ActionCommReminder extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f7c25ae4545..39c01663d93 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -13,7 +13,7 @@
  * 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-2024  Frédéric France         <frederic.france@free.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>
@@ -3598,7 +3598,7 @@ class Propal extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -3683,6 +3683,8 @@ class Propal extends CommonObject
 
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e7f81eb8af5..d89d3b39dfb 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
  * Copyright (C) 2016-2022 Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2021-2023 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2022      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -3972,7 +3972,7 @@ class Commande extends CommonOrder
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -4056,6 +4056,8 @@ class Commande extends CommonOrder
 
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index d6568fb9855..980139ac752 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015-2017	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  * Copyright (C) 2019		JC Prieto				<jcprieto@virtual20.com><prietojc@gmail.com>
- * Copyright (C) 2022-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1851,7 +1851,7 @@ class Account extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1876,6 +1876,8 @@ class Account extends CommonObject
 		$this->owner_town      = 'Owner town';
 		$this->owner_country_id = 'Owner country_id';
 		$this->country_id      = 1;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index ad9d08b9fbc..ae96f872ce9 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2016 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -354,11 +355,13 @@ class BankCateg // extends CommonObject
 	 * Used to build previews or test instances.
 	 * id must be 0 if object instance is a specimen.
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
 		$this->label = '';
+
+		return 1;
 	}
 }
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 81f5e8e6320..33ac0d8f817 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -402,7 +402,7 @@ class PaymentVarious extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -419,6 +419,8 @@ class PaymentVarious extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_author = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 14e090339bb..50317b0ece3 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2017-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2017-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1710,7 +1710,7 @@ class FactureRec extends CommonInvoice
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -1830,6 +1830,8 @@ class FactureRec extends CommonInvoice
 		}
 
 		$this->usenewprice = 0;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fc0ff165cd2..3f12e4e045f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -21,6 +21,7 @@
  * Copyright (C) 2023      	Gauthier VERDOL       	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -4996,7 +4997,7 @@ class Facture extends CommonInvoice
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -5145,6 +5146,8 @@ class Facture extends CommonInvoice
 			$this->lines[$xnbp] = $line;
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 5d665921bc9..f23c8131d9f 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -432,7 +433,7 @@ class PaymentTerm // extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -446,5 +447,7 @@ class PaymentTerm // extends CommonObject
 		$this->type_cdr = '';
 		$this->nbjour = '';
 		$this->decalage = '';
+
+		return 1;
 	}
 }
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index ffc1c3314fb..579890f9b38 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011-2014	Juanjo Menent	<jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -320,7 +321,7 @@ class Localtax extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -338,6 +339,8 @@ class Localtax extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_creat = $user->id;
 		$this->fk_user_modif = $user->id;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index a659a0b460a..2be5b322d69 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2016 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -872,7 +873,7 @@ class RemiseCheque extends CommonObject
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -887,6 +888,8 @@ class RemiseCheque extends CommonObject
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
 		$this->date_bordereau = $nownotime;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index 8b77c745061..a8a49ca43d3 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2023       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -360,7 +360,7 @@ class Cpaiement extends CommonDict
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -372,5 +372,7 @@ class Cpaiement extends CommonDict
 		$this->active = 1;
 		$this->accountancy_code = '';
 		$this->module = '';
+
+		return 1;
 	}
 }
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index b9fb85f148b..013c0fcebad 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015       Juanjo Menent		 <jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet		 <fmarcet@2byte.es>
  * Copyright (C) 2018       Thibault FOUCART		 <support@ptibogxiv.net>
- * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Andreu Bisquerra Gaya <jove@bisquerra.com>
  * Copyright (C) 2021       OpenDsi					<support@open-dsi.fr>
  * Copyright (C) 2023       Joachim Kueter			<git-jk@bloxera.com>
@@ -1258,7 +1258,7 @@ class Paiement extends CommonObject
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -1274,6 +1274,8 @@ class Paiement extends CommonObject
 		$this->specimen = 1;
 		$this->facid = 1;
 		$this->datepaye = $nownotime;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index 287dda0dcb2..5141708f815 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -514,7 +515,7 @@ class Cchargesociales
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -527,6 +528,8 @@ class Cchargesociales
 		$this->fk_pays = 0;
 		$this->module = '';
 		$this->accountancy_code = '';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 066e007ad16..e81d5b80e5d 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016-2022 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2017      Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2021      Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  *
@@ -737,7 +737,7 @@ class ChargeSociales extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -754,6 +754,8 @@ class ChargeSociales extends CommonObject
 		$this->label = 'Social contribution label';
 		$this->type = 1;
 		$this->type_label = 'Type of social contribution';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 13844252901..2a724f56d42 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2002       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2022       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -527,7 +528,7 @@ class PaymentSocialContribution extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -544,6 +545,8 @@ class PaymentSocialContribution extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index 0d2d82b0dd0..f45cc80e909 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -530,7 +531,7 @@ class PaymentVAT extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -547,6 +548,8 @@ class PaymentVAT extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 568fea68048..9b6081e6d7f 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2017  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -413,7 +413,7 @@ class Tva extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -428,6 +428,8 @@ class Tva extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 65cf34dcaeb..9b6752305a7 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2019      Nicolas ZABOURI 	           <info@inovea-conseil.com>
  * Copyright (C) 2020      Open-Dsi  	               <support@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1683,6 +1684,7 @@ class Contact extends CommonObject
 
 		$this->socid = $socid;
 		$this->statut = 1;
+
 		return 1;
 	}
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 66f4aad8596..8139d7aa755 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -9,7 +9,7 @@
  * 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-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2015-2018	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
@@ -2442,7 +2442,7 @@ class Contrat extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -2507,6 +2507,8 @@ class Contrat extends CommonObject
 			$this->lines[$xnbp] = $line;
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index 7e163c56acb..9c617d9c78d 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -471,7 +472,7 @@ class CGenericDic extends CommonDict
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -480,5 +481,7 @@ class CGenericDic extends CommonDict
 		$this->code = 'CODE';
 		$this->label = 'Label';
 		$this->active = 1;
+
+		return 1;
 	}
 }
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 717b7c43ec6..5d839fb0f26 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -425,7 +426,7 @@ class Ctyperesource extends CommonDict
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -434,6 +435,8 @@ class Ctyperesource extends CommonDict
 		$this->code = '';
 		$this->label = '';
 		$this->active = 0;
+
+		return 1;
 	}
 }
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index acd56ec12a5..8389630123a 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Florian HENRY <florian.henry@scopen.fr>
- * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -346,10 +346,10 @@ class DefaultValues extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 6f8157ca22c..bb597cb713b 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024      Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -731,7 +732,7 @@ class DiscountAbsolute extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return	int
 	 */
 	public function initAsSpecimen()
 	{
@@ -742,5 +743,7 @@ class DiscountAbsolute extends CommonObject
 		$this->amount_ttc     = 11.96;
 		$this->tva_tx         = 19.6;
 		$this->description    = 'Specimen discount';
+
+		return 1;
 	}
 }
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 2370ceaaad6..ec1eea0116c 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -371,11 +372,11 @@ class EmailSenderProfile extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
 
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 104a99d2f3d..a5dc47bb64c 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2019	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2023		William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -305,7 +306,7 @@ class Events // extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -318,5 +319,7 @@ class Events // extends CommonObject
 		$this->ip = '1.2.3.4';
 		$this->user_agent = 'Mozilla specimen User Agent X.Y';
 		$this->prefix_session = dol_getprefix();
+
+		return 1;
 	}
 }
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index b86ee41f60f..ebda232e331 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2009	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2018-2023  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -478,7 +478,7 @@ class Menubase
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -499,6 +499,8 @@ class Menubase
 		$this->enabled = '';
 		$this->user = 0;
 		$this->tms = dol_now();
+
+		return 1;
 	}
 
 
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 1c5868176c7..36cedd67896 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur      <eldy@users.sourceforge.net>
- * Copyright (C) 2023  Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) 2023  Gauthier VERDOL       	<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -923,15 +923,15 @@ class TimeSpent extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		// Set here init that are not commonf fields
+		// Set here init that are not common fields
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 9644153c2e4..eea29c83601 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2023-2024	William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -934,7 +935,7 @@ class Cronjob extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return	void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -972,6 +973,8 @@ class Cronjob extends CommonObject
 		$this->nbrun = 0;
 		$this->maxrun = 100;
 		$this->libname = '';
+
+		return 1;
 	}
 
 
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 3dc187455fb..d83e4534acd 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI     <info@inovea-conseil.com>
- * Copyright (C) 2018-2023  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -486,7 +486,7 @@ class DataPolicyCron
 							if ($object->isObjectUsed($obj->rowid) == 0) {			// If object to clean is used
 								foreach ($params['fields_anonym'] as $field => $val) {
 									if ($val == 'MAKEANONYMOUS') {
-										$object->$field = $field.'-anonymous-'.$obj->rowid;
+										$object->$field = $field.'-anonymous-'.$obj->rowid; // @phpstan-ignore-line
 									} else {
 										$object->$field = $val;
 									}
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index a5017547c34..6e634bfb669 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -965,7 +965,7 @@ class Delivery extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1012,6 +1012,8 @@ class Delivery extends CommonObject
 		$line->total_ht       = 100;
 
 		$this->lines[$i] = $line;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 19cc0ed8dee..dbdd5caf745 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2019      Thibault FOUCART     <support@ptibogxiv.net>
- * Copyright (C) 2019-2020 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2021      Maxime DEMAREST      <maxime@indelog.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -234,7 +234,7 @@ class Don extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -283,7 +283,9 @@ class Don extends CommonObject
 		$this->email = 'email@email.com';
 		$this->phone = '0123456789';
 		$this->phone_mobile = '0606060606';
-		$this->statut = 1;
+		$this->status = 1;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 6720301d326..3d5a1e9071f 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015       Alexandre Spangaro	  	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -540,7 +541,7 @@ class PaymentDonation extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -558,6 +559,8 @@ class PaymentDonation extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_creat = dol_now();
 		$this->fk_user_modif = dol_now();
+
+		return 1;
 	}
 
 
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 6e73b229858..905eabdb5c1 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -450,7 +451,7 @@ class EcmDirectory extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -459,6 +460,8 @@ class EcmDirectory extends CommonObject
 		$this->label = 'MyDirectory';
 		$this->fk_parent = 0;
 		$this->description = 'This is a directory';
+
+		return 1;
 	}
 
 
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 5e1c0107cfa..ce77414b31b 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018       Francis Appels      <francis.appels@yahoo.com>
- * Copyright (C) 2019-2024  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -957,7 +957,7 @@ class EcmFiles extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -983,6 +983,8 @@ class EcmFiles extends CommonObject
 		$this->acl = '';
 		$this->src_object_type = 'product';
 		$this->src_object_id = 1;
+
+		return 1;
 	}
 }
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 86672a0f225..bffa405796e 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -698,14 +699,14 @@ class EmailCollector extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->host = 'localhost';
 		$this->login = 'alogin';
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 6a49ee7fa87..bdefd8a1f87 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -449,10 +450,10 @@ class EmailCollectorAction extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 6618633a6b3..52acc3440d7 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -463,10 +464,10 @@ class EmailCollectorFilter extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index d71fc6b2a9f..69cfcbf7b23 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -749,11 +750,11 @@ class ConferenceOrBooth extends ActionComm
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index eecb06e137c..6df9bad4a72 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -946,11 +947,11 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index d5d689618d8..4704baf9bb3 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2003,7 +2003,7 @@ class Expedition extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -2055,6 +2055,8 @@ class Expedition extends CommonObject
 			$this->lines[] = $line;
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 46b7706d4f6..38d86dc15c7 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 		Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 		Alexandre Spangaro  	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (c) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (c) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -876,7 +876,7 @@ class ExpenseReport extends CommonObject
 	 *  Used to build previews or test instances.
 	 *  id must be 0 if object instance is a specimen.
 	 *
-	 *  @return void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -898,7 +898,6 @@ class ExpenseReport extends CommonObject
 		$type_fees_id = 2; // TF_TRIP
 
 		$this->status = 5;
-		$this->fk_statut = 5;
 
 		$this->fk_user_author = $user->id;
 		$this->fk_user_validator = $user->id;
@@ -932,6 +931,8 @@ class ExpenseReport extends CommonObject
 			$this->total_tva += $line->total_tva;
 			$this->total_ttc += $line->total_ttc;
 		}
+
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index ca7da95f824..09ea23d79c1 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI  <info@inovea-conseil.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -495,7 +496,7 @@ class PaymentExpenseReport extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -512,6 +513,8 @@ class PaymentExpenseReport extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 6e8195ac3d9..0b29b094202 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2020 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
- * Copyright (C) 2018-2024 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2023-2024      William Mead         <william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1401,7 +1401,7 @@ class Fichinter extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1433,6 +1433,8 @@ class Fichinter extends CommonObject
 
 			$this->duration += $line->duration;
 		}
+
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index f81c1812b1c..9e529651f8a 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015       Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2016-2018  Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -304,7 +305,7 @@ class FichinterRec extends Fichinter
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $rowid;
-				$this->title				= $obj->title;
+				$this->title = $obj->title;
 				$this->ref                  = $obj->title;
 				$this->description = $obj->description;
 				$this->datec				= $obj->datec;
@@ -674,7 +675,7 @@ class FichinterRec extends Fichinter
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -685,6 +686,8 @@ class FichinterRec extends Fichinter
 		parent::initAsSpecimen();
 
 		$this->usenewprice = 1;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7a3ecf3dae6..2e128bcd7ec 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018-2022  Ferran Marcet         	<fmarcet@2byte.es>
  * Copyright (C) 2021       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
@@ -3079,7 +3079,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -3156,6 +3156,8 @@ class CommandeFournisseur extends CommonOrder
 
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index b8bc60a463d..2b415cfc936 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014 Juanjo Menent	      <jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -619,7 +620,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	 *	Initialise object with example values
 	 *	Id must be 0 if object instance is a specimen
 	 *
-	 *	@return	void
+	 *	@return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -638,6 +639,8 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$this->batch = '';
 		$this->eatby = '';
 		$this->sellby = '';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 820c92baa11..f592f36ea9f 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2017-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2017-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1651,7 +1651,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -1771,6 +1771,8 @@ class FactureFournisseurRec extends CommonInvoice
 		}
 
 		$this->usenewprice = 0;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 887b5ab425f..87af56e106c 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016-2023	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
  *
@@ -2989,7 +2989,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -3077,9 +3077,11 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-		$this->total_ht       = $xnbp * 100;
-		$this->total_tva      = $xnbp * 19.6;
-		$this->total_ttc      = $xnbp * 119.6;
+		$this->total_ht = $xnbp * 100;
+		$this->total_tva = $xnbp * 19.6;
+		$this->total_ttc = $xnbp * 119.6;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 7a33f41eb06..132af79c05f 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2018       Frédéric France         <frederic.francenetlogic.fr>
  * Copyright (C) 2023      Joachim Kueter		  <git-jk@bloxera.com>
  * Copyright (C) 2023      Sylvain Legrand		  <technique@infras.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -725,7 +726,7 @@ class PaiementFourn extends Paiement
 	 *	id must be 0 if object instance is a specimen.
 	 *
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen($option = '')
 	{
@@ -740,6 +741,8 @@ class PaiementFourn extends Paiement
 		$this->facid = 1;
 		$this->socid = 1;
 		$this->datepaye = $nownotime;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 6d22e0a915d..b778a22466d 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2012-2016	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2016       Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2344,7 +2344,7 @@ class Holiday extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -2364,6 +2364,8 @@ class Holiday extends CommonObject
 		$this->fk_type = 1;
 		$this->statut = Holiday::STATUS_VALIDATED;
 		$this->status = Holiday::STATUS_VALIDATED;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 291546f253b..6825247be89 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015		Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -541,12 +541,14 @@ class Establishment extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
 		$this->ref = '0';
 		$this->label = 'Department AAA';
+
+		return 1;
 	}
 }
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index c900f583cb4..be133e09c62 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -906,7 +907,7 @@ class Evaluation extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -914,7 +915,7 @@ class Evaluation extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 6e9099a2f73..216b5ff1704 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -874,7 +875,7 @@ class EvaluationLine extends CommonObjectLine
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -882,7 +883,7 @@ class EvaluationLine extends CommonObjectLine
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 34f0960cb94..743a5f75e02 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -914,7 +915,7 @@ class Job extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -922,7 +923,7 @@ class Job extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 4577c13ba33..14fe2f18be4 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -956,7 +957,7 @@ class Position extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -964,7 +965,7 @@ class Position extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 3eed59b8665..6d3be881130 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -955,7 +956,7 @@ class Skill extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -963,7 +964,7 @@ class Skill extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 78318fc1514..8865aa94db8 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -864,7 +865,7 @@ class Skilldet extends CommonObjectLine
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -872,7 +873,7 @@ class Skilldet extends CommonObjectLine
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index c66a86c5e0d..788cf2a1ded 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -912,7 +913,7 @@ class SkillRank extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -920,7 +921,7 @@ class SkillRank extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index b8148c97f43..5e8011fd645 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -958,12 +959,13 @@ class KnowledgeRecord extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->question = "ABCD";
-		$this->initAsSpecimenCommon();
+
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 89b7a974854..3eb5b1bdc45 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2023  Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2024  Frédéric France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -609,7 +609,7 @@ class Loan extends CommonObject
 	 *  Used to build previews or test instances.
 	 * 	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -631,6 +631,8 @@ class Loan extends CommonObject
 		$this->capital = 20000;
 		$this->nbterm = 48;
 		$this->rate = 4.3;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index cf83e9228d7..c0363bbc5b6 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur      <eldy@users.sourceforge.net>
- * Copyright (C) 2023  Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1118,7 +1118,7 @@ class MyObject extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1126,7 +1126,7 @@ class MyObject extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index eb72e1cdaab..24595cab867 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1589,13 +1589,15 @@ class Mo extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		$ret = $this->initAsSpecimenCommon();
 
 		$this->lines = array();
+
+		return $ret;
 	}
 
 	/**
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 538b9df3268..e69330ceddd 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García	    <marcosgdf@gmail.com>
- * Copyright (C) 2020-2024  Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024  Frédéric France		<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -615,7 +615,7 @@ class Opensurveysondage extends CommonObject
 	 *	Initialise object with example values
 	 *	Id must be 0 if object instance is a specimen
 	 *
-	 *	@return	void
+	 *	@return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -630,6 +630,8 @@ class Opensurveysondage extends CommonObject
 		$this->status = 1;
 		$this->format = 'classic';
 		$this->mailsonde = 0;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 811697a1216..f3779321a51 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021 NextGestion         <contact@nextgestion.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1161,11 +1162,11 @@ class Partnership extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index f02aa2c011c..06f7ab7b35c 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2018-2019  Thibault Foucart		<support@ptibogxiv.net>
  * Copyright (C) 2021     	Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -415,7 +416,7 @@ class PartnershipType extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -423,6 +424,6 @@ class PartnershipType extends CommonObject
 		// $this->property1 = ...
 		// $this->property2 = ...
 
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1cfc859b2b9..262fbeaeb6c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2014		Ion agorria			    <ion@agorria.com>
  * Copyright (C) 2016-2018	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Gustavo Novaro
- * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -6341,7 +6341,7 @@ class Product extends CommonObject
 	 *  Used to build previews or test instances.
 	 *    id must be 0 if object instance is a specimen.
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -6380,6 +6380,8 @@ class Product extends CommonObject
 		$this->volume_units = 0;
 
 		$this->barcode = -1; // Create barcode automatically
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 5f5987b439f..a447910fe5d 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2014 Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -335,7 +336,7 @@ class Productbatch extends CommonObject
 	 *	Initialise object with example values
 	 *	Id must be 0 if object instance is a specimen
 	 *
-	 *	@return	void
+	 *	@return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -347,6 +348,8 @@ class Productbatch extends CommonObject
 		$this->eatby = '';
 		$this->batch = '';
 		$this->import_key = '';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 2c63a76b059..a32fea0c6b6 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Florian Henry   <florian.henry@open-concept.pro>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1000,7 +1001,7 @@ class ProductCustomerPrice extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1024,6 +1025,8 @@ class ProductCustomerPrice extends CommonObject
 		$this->localtax2_tx = '';
 		$this->fk_user = 0;
 		$this->import_key = '';
+
+		return 1;
 	}
 }
 
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 6812ce9f498..e178fce18e3 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021 Alexis LAURIER <contact@alexislaurier.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -779,11 +780,11 @@ class ProductFournisseurPrice extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index a16edd1f53f..965a251a1f0 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2015 	Laurent Destailleur   	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 		Florian HENRY 			<florian.henry@open-concept.pro>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -547,7 +548,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *	Initialise object with example values
 	 *	Id must be 0 if object instance is a specimen
 	 *
-	 *	@return	void
+	 *	@return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -560,6 +561,8 @@ class Propalmergepdfproduct extends CommonObject
 		$this->datec = '';
 		$this->tms = dol_now();
 		$this->import_key = '';
+
+		return 1;
 	}
 }
 
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index 5a0fa5243ff..ef99ef8603c 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -325,11 +326,13 @@ class PriceExpression
 	 *  Initialise object with example values
 	 *  Id must be 0 if object instance is a specimen
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
 		$this->expression = '';
+
+		return 1;
 	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index 13cf5233342..6b81d780c49 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -281,7 +281,7 @@ class PriceGlobalVariable
 	 *	Initialise object with example values
 	 *	Id must be 0 if object instance is a specimen
 	 *
-	 *	@return	void
+	 *	@return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -289,6 +289,8 @@ class PriceGlobalVariable
 		$this->code = '';
 		$this->description = '';
 		$this->value = '';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index d36c0477bf4..42030aa290e 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -306,7 +306,7 @@ class PriceGlobalVariableUpdater
 	 *	Initialise object with example values
 	 *	Id must be 0 if object instance is a specimen
 	 *
-	 *	@return	void
+	 *	@return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -318,6 +318,8 @@ class PriceGlobalVariableUpdater
 		$this->update_interval = 0;
 		$this->next_update = 0;
 		$this->last_status = '';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index ae477dafd8e..d20e7336110 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -739,12 +740,14 @@ class Inventory extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		$ret = $this->initAsSpecimenCommon();
 		$this->title = '';
+
+		return $ret;
 	}
 
 	/**
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 010d657cb93..c3106759f8e 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2008 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016	   Francis Appels       <francis.appels@yahoo.com>
- * Copyright (C) 2019-2024  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -841,7 +841,7 @@ class Entrepot extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -862,6 +862,8 @@ class Entrepot extends CommonObject
 		$this->town = 'MyTown';
 		$this->country_id = 1;
 		$this->country_code = 'FR';
+
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 6b310bdac1a..80751ebbec7 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2014	   Cedric GROSS	        <c.gross@kreiz-it.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1066,16 +1067,16 @@ class MouvementStock extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
-		global $user, $langs, $conf, $mysoc;
-
 		// Initialize parameters
 		$this->id = 0;
 
 		// There is no specific properties. All data into insert are provided as method parameter.
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index cd4dca967dc..28f8b53c88b 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2022  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023	   	Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1205,7 +1205,7 @@ class Productlot extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1228,6 +1228,8 @@ class Productlot extends CommonObject
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
 		$this->import_key = '123456';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 7d9e7c07d2b..f4dbdca4a75 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2024  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -596,7 +596,7 @@ class ProductStockEntrepot extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -608,5 +608,7 @@ class ProductStockEntrepot extends CommonObject
 		$this->seuil_stock_alerte = '';
 		$this->desiredstock = '';
 		$this->import_key = '';
+
+		return 1;
 	}
 }
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index ba3ab193089..ed7c6394d61 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2022       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -929,11 +929,11 @@ class StockTransfer extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 4e6847287ca..bc0c56baa3f 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -911,11 +912,11 @@ class StockTransferLine extends CommonObjectLine
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 893ced6f27c..4f6e2b36480 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1477,7 +1477,7 @@ class Project extends CommonObject
 	 *  Used to build previews or test instances.
 	 * 	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1520,6 +1520,8 @@ class Project extends CommonObject
 		 $xnbp++;
 		 }
 		 */
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index f474d200783..df339ae9004 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -897,7 +897,7 @@ class Task extends CommonObjectLine
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -912,6 +912,8 @@ class Task extends CommonObjectLine
 		$this->progress = '25';
 		$this->status = 0;
 		$this->note = 'This is a specimen task not';
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 2ab50c297f4..0aeb300a666 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
- * Copyright (C) 2022-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1414,7 +1414,7 @@ class Reception extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -1465,6 +1465,8 @@ class Reception extends CommonObject
 			$this->lines[] = $line;
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index ae119deae92..0d02a59a573 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2020  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -906,11 +907,11 @@ class RecruitmentCandidature extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 049456248dd..3fa9c360610 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2020       Laurent Destailleur	<eldy@users.sourceforge.net>
 /* Copyright (C) 2022       Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -973,11 +974,11 @@ class RecruitmentJobPosition extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 0f2760668df..18f3d1263e1 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2011-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -556,7 +556,7 @@ class PaymentSalary extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -573,6 +573,8 @@ class PaymentSalary extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_author = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index c7cbc98ccb3..85b2b312f16 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2011-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -305,7 +306,7 @@ class Salary extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -323,6 +324,8 @@ class Salary extends CommonObject
 		$this->fk_bank = 0;
 		$this->fk_user_author = 0;
 		$this->fk_user_modif = 0;
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index e67452d4347..6b95ec4ab79 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2013   	Peter Fontaine          <contact@peterfontaine.fr>
  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -673,7 +674,7 @@ class CompanyBankAccount extends Account
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -702,5 +703,7 @@ class CompanyBankAccount extends Account
 		$this->frstrecur       = 'FRST';
 
 		$this->socid           = 1;
+
+		return 1;
 	}
 }
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index ce94ae75e38..99901fc00c8 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2024       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2024       Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -552,10 +552,10 @@ class CompanyPaymentMode extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2885555b01a..abdd447f9a1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2017       Rui Strecht			    <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018	    Philippe Grand	        <philippe.grand@atoo-net.com>
  * Copyright (C) 2019-2020  Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2019-2024  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
  * Copyright (C) 2022		ButterflyOfFire         <butterflyoffire+dolibarr@protonmail.com>
  * Copyright (C) 2023       Alexandre Janniaux      <alexandre.janniaux@gmail.com>
@@ -4514,6 +4514,7 @@ class Societe extends CommonObject
 		$this->idprof4 = 'idprof4';
 		$this->idprof5 = 'idprof5';
 		$this->idprof6 = 'idprof6';
+
 		return 1;
 	}
 
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 41bf4164981..c4a3f1fa824 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -561,10 +562,10 @@ class SocieteAccount extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b2a681606df..05f790292a4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2289,7 +2289,7 @@ class SupplierProposal extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -2362,6 +2362,8 @@ class SupplierProposal extends CommonObject
 
 			$xnbp++;
 		}
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index e783a40372a..923219858f7 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -637,10 +638,10 @@ class CTicketCategory extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index d2f8fd9bb31..beace9b3dbd 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2018 Jean-François Ferry <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel <christophe@altairis.fr>
- * Copyright (C) 2019-2023 Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2020      Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2023      Charlene Benke 	   <charlene@patas-monkey.com>
  * Copyright (C) 2023	   Benjamin Falière	   <benjamin.faliere@altairis.fr>
@@ -1291,6 +1291,7 @@ class Ticket extends CommonObject
 		$this->date_last_msg_sent = dol_now();
 		$this->date_close = dol_now();
 		$this->tms = dol_now();
+
 		return 1;
 	}
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 996fbee5611..0d442f9e121 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018       charlene Benke          <charlie@patas-monkey.com>
  * Copyright (C) 2018-2021       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2019-2024  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -3471,6 +3471,7 @@ class User extends CommonObject
 		$this->status = 1;
 
 		$this->entity = 1;
+
 		return 1;
 	}
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index b3a60d92d90..48ec6758351 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014		Alexis Algoud		 <alexis@atm-consulting.fr>
  * Copyright (C) 2018       Nicolas ZABOURI		 <info@inovea-conseil.com>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
- * Copyright (C) 2023       Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -947,7 +947,7 @@ class UserGroup extends CommonObject
 	 *  Used to build previews or test instances.
 	 *	id must be 0 if object instance is a specimen.
 	 *
-	 *  @return	void
+	 *  @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -967,6 +967,8 @@ class UserGroup extends CommonObject
 		$this->members = array(
 			$user->id => $user
 		);
+
+		return 1;
 	}
 
 	/**
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 1858d3791cb..6d538208dfa 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -858,13 +859,14 @@ class Target extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
 		$this->url = "https://thisisunurl";
 		$this->trigger_codes = "ThisIsATestCode";
-		$this->initAsSpecimenCommon();
+
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index f22db99fd9c..a4b80193d02 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -909,7 +909,7 @@ class Website extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -929,6 +929,8 @@ class Website extends CommonObject
 		$this->fk_user_modif = $user->id;
 		$this->date_creation = dol_now();
 		$this->tms = dol_now();
+
+		return 1;
 	}
 
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 5e408330b4f..737e57ac3ec 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020 	   Nicolas ZABOURI		<info@inovea-conseil.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -857,7 +858,7 @@ class WebsitePage extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
@@ -884,5 +885,7 @@ class WebsitePage extends CommonObject
 		$this->date_modification = $now - (24 * 7 * 3600);
 		$this->fk_user_creat = $user->id;
 		$this->author_alias = 'mypublicpseudo';
+
+		return 1;
 	}
 }
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index e38039e19c3..506071a26f2 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017       Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2023-2024  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -855,11 +855,11 @@ class Workstation extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 
 	/**
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 17c8d0c2160..68bda9bedb8 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -648,10 +648,10 @@ class Hook extends CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimen()
 	{
-		$this->initAsSpecimenCommon();
+		return $this->initAsSpecimenCommon();
 	}
 }
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index bd1bfa4948b..daf33bbff69 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 9fc7749b961ce4b9f9bbaf3c05edafa559c86638 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 2 Mar 2024 16:38:53 +0100
Subject: [PATCH 0391/1862] Qual: Show exception type in error detail on
 phpunit error (#28576)

# Qual: Show exception type in error detail on phpunit error

Knowing the exception type can be helpful - it's not reported in the
summary.
---
 test/phpunit/CommonClassTest.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index daf33bbff69..262dc2ad002 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -159,7 +159,7 @@ abstract class CommonClassTest extends TestCase
 		print PHP_EOL;
 		// Use GitHub Action compatible group output (:warning: arguments not encoded)
 		print "##[group]$className::$failedTestMethod failed - $argsText.".PHP_EOL;
-		print "## Exception: {$t->getMessage()}".PHP_EOL;
+		print "## ".get_class($t).": {$t->getMessage()}".PHP_EOL;
 
 		if ($nbLinesToShow) {
 			$newLines = count($last_lines);

From fa27adec1bb2e90d1c9cf8569c217cfefff1484f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2024 16:52:12 +0100
Subject: [PATCH 0392/1862] Clean trans

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 15 ++-------------
 htdocs/comm/mailing/card.php          |  2 +-
 htdocs/langs/en_US/datapolicy.lang    | 12 ------------
 htdocs/langs/en_US/mails.lang         |  1 -
 htdocs/langs/en_US/main.lang          |  3 ++-
 htdocs/langs/en_US/other.lang         | 14 ++++++++------
 6 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2c79a8cea03..7604b8ce86f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -19,20 +19,9 @@ body:
   - type: input
     id: environment-version
     attributes:
-      label: Environment Version
+      label: Dolibarr Version
       description: Affected Dolibarr version(s)
-
-  - type: input
-    id: environment-os
-    attributes:
-      label: Environment OS
-      description: Server OS type and version
-
-  - type: input
-    id: environment-webserver
-    attributes:
-      label: Environment Web server
-      description: Webserver type and version
+      placeholder: 19.0, develop, ...
 
   - type: input
     id: environment-php
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 639a655efb7..b8cb4c1f8d3 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -880,7 +880,7 @@ if ($action == 'create') {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
 		} elseif ($action == 'delete') {
 			// Confirm delete
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
 		}
 
 		if ($action != 'edit' && $action != 'edittxt' &&$action != 'edithtml') {
diff --git a/htdocs/langs/en_US/datapolicy.lang b/htdocs/langs/en_US/datapolicy.lang
index 4f3f3682ab1..69482b5884b 100644
--- a/htdocs/langs/en_US/datapolicy.lang
+++ b/htdocs/langs/en_US/datapolicy.lang
@@ -39,12 +39,7 @@ DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
 DATAPOLICY_CONTACT_FOURNISSEUR = Supplier
 DATAPOLICY_ADHERENT = Member
 DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail = Emails Setup
-DATAPOLICYSUBJECTMAIL = Subject of the email
-DATAPOLICYCONTENTMAIL = Content of the email
 DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT = Message after agreement
-DATAPOLICYREFUSE = Message after disagreement
 SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
 SendAgreement = Send emails
 AllAgreementSend = All emails have been sent
@@ -60,12 +55,6 @@ DATAPOLICY_consentement = Consent obtained for the processing of personal data
 DATAPOLICY_opposition_traitement = Opposes to the processing of his personal data
 DATAPOLICY_opposition_prospection = Opposes to the processing of his personal data for the purposes of prospecting
 
-#
-# Popup
-#
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a third party
-DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
-
 #
 # Button for portability
 #
@@ -80,7 +69,6 @@ ANONYMISER_AT = Anonymised the %s
 
 DATAPOLICY_date = Date of agreement/disagreement GDPR
 DATAPOLICY_send = Date agreement email sent
-DATAPOLICY_SEND = Send GDPR email
 MailSent = Email has been sent
 
 # ERROR
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 159d1a0bd9e..d2e29b3941a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -30,7 +30,6 @@ NewSMSing=New smsing
 EditMailing=Edit emailing
 ResetMailing=Resend emailing
 DeleteMailing=Delete emailing
-DeleteAMailing=Delete an emailing
 PreviewMailing=Preview emailing
 CreateMailing=Create emailing
 TestMailing=Test
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 129a7d0feb0..95042a5cc24 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -383,6 +383,7 @@ PriceUHT=U.P. (net)
 PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
+Amounts=Amounts
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
 AmountInvoicedHT=Amount invoiced (excl. tax)
@@ -1276,4 +1277,4 @@ UseOrOperatorShort=or
 GoOnList=Go on list
 ShowSearchFields=Do a search
 MyUserCard=My user file
-PublicFile=Public file
\ No newline at end of file
+PublicFile=Public file
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 0e1503187a6..a1e25cea1af 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -185,7 +185,7 @@ 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.
-EnterNewPasswordHere=Enter your new password here 
+EnterNewPasswordHere=Enter your new password here
 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.
@@ -260,10 +260,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 
+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 
+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
@@ -275,7 +275,9 @@ TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID
 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
- 
+ObjectId=Object ID
+FullData=Full data
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
@@ -337,4 +339,4 @@ AddFolder=Create folder
 FileWasCreateFolder=Folder <b>%s</b> has been created
 FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
 SelectADay=Select a day in calendar
-SelectANewDate=Select a new date
\ No newline at end of file
+SelectANewDate=Select a new date

From ff0eea8ce6bbc3426fbf23012a9cdd988a806f79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2024 16:56:04 +0100
Subject: [PATCH 0393/1862] Removed field that are never filled

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7604b8ce86f..57628ed8ac5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,22 +35,10 @@ body:
       label: Environment Database
       description: Database type and version
 
-  - type: input
-    id: environment-urls
-    attributes:
-      label: Environment URL(s)
-      description: Affected URL(s)
-
-  - type: textarea
-    id: expected-behaviour
-    attributes:
-      label: Expected and actual behavior
-      description: Verbose description
-
   - type: textarea
     id: reproduce
     attributes:
-      label: Steps to reproduce the behavior
+      label: Steps to reproduce the behavior and expected behavior
       description: Verbose description
 
   - type: textarea

From 4b2fb64b51f6329119d15013a1f9b941cf2157a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 2 Mar 2024 18:34:40 +0100
Subject: [PATCH 0394/1862] css

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index b61ec85ab97..bdbc1777acd 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1273,7 +1273,7 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
-	print '<td class="liste_titre right parentonrightofpage">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'center search_status width100 onrightofpage', 1);
 	print '</td>';
@@ -1492,6 +1492,7 @@ while ($i < $imaxinloop) {
 	$userstatic->firstname = $obj->firstname;
 	$userstatic->email = $obj->user_email;
 	$userstatic->statut = $obj->user_statut;
+	$userstatic->status = $obj->user_statut;
 	$userstatic->entity = $obj->entity;
 	$userstatic->photo = $obj->photo;
 	$userstatic->office_phone = $obj->office_phone;

From f875201b4687c9e860c80333a95c3b7409dbd2e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 2 Mar 2024 18:59:57 +0100
Subject: [PATCH 0395/1862] Fix #19404 FIX #22721

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 65a00f8affc..94db1f445ac 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2691,7 +2691,7 @@ class FactureFournisseur extends CommonInvoice
 			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= ' WHERE ff.paye = 0';
-		$sql .= ' AND ff.fk_statut > 0';
+		$sql .= " AND ff.fk_statut IN (".self::STATUS_VALIDATED.")";
 		$sql .= " AND ff.entity = ".$conf->entity;
 		if ($user->socid) {
 			$sql .= ' AND ff.fk_soc = '.((int) $user->socid);

From cc1199664cd077187a83c160c8f14f884786478a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 2 Mar 2024 19:19:18 +0100
Subject: [PATCH 0396/1862] fix default value is incompatible with type string
 (#28584)

---
 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 ef6205953e4..0fd4bc4acc1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4516,7 +4516,7 @@ function getPictoForType($key)
  *  @param		int			$notitle				1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *  @param		string		$alt					Force alt for bind people
  *  @param		string		$morecss				Add more class css on img tag (For example 'myclascss').
- *  @param		string		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
+ *  @param		int 		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
  *  @return     string       				    	Return img tag
  *  @see        img_object(), img_picto_common()
  */

From eb1f6be1e21a112092ca5258f9fdf04ee18a506e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 2 Mar 2024 19:57:59 +0100
Subject: [PATCH 0397/1862] Qual: Add information from backtrace when mysql
 request fails. (#28583)

# Qual: Add information from backtrace when mysql request fails.

This helps locate the line that was responsible for the SQL request
---
 htdocs/core/db/mysqli.class.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 53ccf8e19bf..f3c0c3cce62 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -358,7 +358,7 @@ class DoliDBMysqli extends DoliDB
 				if (getDolGlobalInt('SYSLOG_LEVEL') < LOG_DEBUG) {
 					dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
 				}
-				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
+				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror.self::getCallerInfoString(), LOG_ERR);
 				//var_dump(debug_print_backtrace());
 			}
 			$this->lastquery = $query;
@@ -368,6 +368,24 @@ class DoliDBMysqli extends DoliDB
 		return $ret;
 	}
 
+	/**
+	 * Get caller info
+	 *
+	 * @return string
+	 */
+	final protected static function getCallerInfoString()
+	{
+		$backtrace = debug_backtrace();
+		$msg = "";
+		if (count($backtrace) >= 1) {
+			$trace = $backtrace[1];
+			if (isset($trace['file'], $trace['line'])) {
+				$msg = " From {$trace['file']}:{$trace['line']}.";
+			}
+		}
+		return $msg;
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Returns the current line (as an object) for the resultset cursor

From 21feee3bc8b2ebe8a87b8fa56f023faa5835ba44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 13:11:54 +0100
Subject: [PATCH 0398/1862] FIX Better test on validity of compute field syntax
 with parenthesis

---
 htdocs/core/lib/functions.lib.php | 42 +++++++++++++++++++------------
 test/phpunit/SecurityTest.php     | 15 +++++++++--
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1fe4661236e..c0ecd6acefc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9641,18 +9641,23 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 					return '';
 				}
 			}
-			$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $s);	// accept parenthesis in '...->method(...'
-			$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-			$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-			$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('
-			$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('
-			$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);	// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
+			$savescheck = '';
+			$scheck = $s;
+			while ($scheck && $savescheck != $scheck) {
+				$savescheck = $scheck;
+				$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $scheck);	// accept parenthesis in '...->method(...'
+				$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
+				$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
+				$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('
+				$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('
+				$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);	// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
+			}
 			//print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";
 			if (strpos($scheck, '(') !== false) {
 				if ($returnvalue) {
-					return 'Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s;
+					return 'Bad string syntax to evaluate (mode 1, found call of a function or method without using the direct name of the function): '.$s;
 				} else {
-					dol_syslog('Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s);
+					dol_syslog('Bad string syntax to evaluate (mode 1, found call of a function or method without using the direct name of the function): '.$s);
 					return '';
 				}
 			}
@@ -9672,18 +9677,23 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 					return '';
 				}
 			}
-			$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $s);	// accept parenthesis in '...->method(...'
-			$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-			$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-			$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('
-			$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('
-			$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);		// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
+			$savescheck = '';
+			$scheck = $s;
+			while ($scheck && $savescheck != $scheck) {
+				$savescheck = $scheck;
+				$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $scheck);	// accept parenthesis in '...->method(...'
+				$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
+				$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
+				$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('
+				$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('
+				$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);		// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
+			}
 			//print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";
 			if (strpos($scheck, '(') !== false) {
 				if ($returnvalue) {
-					return 'Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s;
+					return 'Bad string syntax to evaluate (mode 2, found call of a function or method without using the direct name of the function): '.$s;
 				} else {
-					dol_syslog('Bad string syntax to evaluate (found call of a function or method without using direct name): '.$s);
+					dol_syslog('Bad string syntax to evaluate (mode 2, found call of a function or method without using the direct name of the function): '.$s);
 					return '';
 				}
 			}
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 4615efe8c22..66a40206bb3 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -1061,6 +1061,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		// Declare classes found into string to evaluate
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+
 		$result=dol_eval('1==1', 1, 0);
 		print "result1 = ".$result."\n";
 		$this->assertTrue($result);
@@ -1069,8 +1073,15 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print "result2 = ".$result."\n";
 		$this->assertFalse($result);
 
-		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$s = '((($reloadedobj = new ClassThatDoesNotExists($db)) && ($reloadedobj->fetchNoCompute($objectoffield->fk_product) > 0)) ? \'1\' : \'0\')';
+		$result3a = dol_eval($s, 1, 1, '2');
+		print "result3a = ".$result."\n";
+		$this->assertTrue(is_null($result3a));
+
+		$s = '((($reloadedobj = new Project($db)) && ($reloadedobj->fetchNoCompute($objectoffield->fk_product) > 0)) ? \'1\' : \'0\')';
+		$result3b = dol_eval($s, 1, 1, '2');
+		print "result3b = ".$result."\n";
+		$this->assertEquals('0', $result3b);
 
 		$s = '(($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"';
 		$result=dol_eval($s, 1, 1, '2');

From 16319e5103baf93a142eb12ec7b2bffdb5466b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 15:48:36 +0100
Subject: [PATCH 0399/1862] fix codespell (#28594)

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index e3438cad7e0..b8e2ec9e940 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -900,7 +900,7 @@ class Mo extends CommonObject
 		}
 		$productstatic = new Product($this->db);
 		$fk_movement = GETPOST('fk_movement', 'int');
-		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);	// Get lines consummed under the one to delete
+		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);	// Get lines consumed under the one to delete
 
 		$result = 0;
 

From a26d81ad39fcff7e4c039aa130f88a6e133b44ff Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Sun, 3 Mar 2024 08:49:18 -0600
Subject: [PATCH 0400/1862] Patch 6 (#28593)

* css

* Fix #19404 FIX #22721

* Update facture.class.php

FIX  #22948

* Update facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
---
 htdocs/compta/facture/class/facture.class.php    | 4 ++--
 htdocs/fourn/class/fournisseur.facture.class.php | 2 +-
 htdocs/fourn/facture/list.php                    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 3f12e4e045f..c37501e3377 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4164,8 +4164,8 @@ class Facture extends CommonInvoice
 			$price = $pu;
 			$remise = 0;
 			if ($remise_percent > 0) {
-				$remise = round(($pu * $remise_percent / 100), 2);
-				$price = ($pu - $remise);
+				$remise = round(((float) $pu * (float) $remise_percent / 100), 2);
+				$price = ((float) $pu - $remise);
 			}
 			$price = price2num($price);
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 87af56e106c..b63a17aa5a3 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2687,7 +2687,7 @@ class FactureFournisseur extends CommonInvoice
 			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= ' WHERE ff.paye = 0';
-		$sql .= ' AND ff.fk_statut > 0';
+		$sql .= " AND ff.fk_statut IN (".self::STATUS_VALIDATED.")";
 		$sql .= " AND ff.entity = ".$conf->entity;
 		if ($user->socid) {
 			$sql .= ' AND ff.fk_soc = '.((int) $user->socid);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3426dd33313..bfdd8fdbdad 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1306,7 +1306,7 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
-	print '<td class="liste_titre right parentonrightofpage">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'center search_status width100 onrightofpage', 1);
 	print '</td>';
@@ -1525,6 +1525,7 @@ while ($i < $imaxinloop) {
 	$userstatic->firstname = $obj->firstname;
 	$userstatic->email = $obj->user_email;
 	$userstatic->statut = $obj->user_statut;
+	$userstatic->status = $obj->user_statut;
 	$userstatic->entity = $obj->entity;
 	$userstatic->photo = $obj->photo;
 	$userstatic->office_phone = $obj->office_phone;

From da3a24c3f3fa5f24a95276e2bedc3c1f6950740f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 15:53:31 +0100
Subject: [PATCH 0401/1862] fix phpstan (#28597)

* fix phpstan

* fix phpstan
---
 .../supplier_proposal/doc/pdf_aurore.modules.php       |  3 ++-
 .../supplier_proposal/doc/pdf_zenith.modules.php       | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index deffaf0e905..f53f7eba871 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -711,7 +712,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		int|float	$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	int
 	 */
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index 82b1dbaabf3..2c10cdefc1c 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
- * Copyright (C) 2018-2022 Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France       <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -840,10 +840,10 @@ class pdf_zenith extends ModelePDFSupplierProposal
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
-	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		SupplierProposal		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		TCPDF				$pdf     		Object PDF
+	 *   @param		SupplierProposal	$object			Object to show
+	 *   @param		int|float			$posy			Y
+	 *   @param		Translate			$outputlangs	Langs object
 	 *   @return	integer
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)

From 51f6111519f098852d5e38588da467356aa370cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 15:56:09 +0100
Subject: [PATCH 0402/1862] Comment

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 1f901d7381e..74310aea526 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1853,9 +1853,9 @@ class Categorie extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Return tableau de toutes les photos de la categorie
+	 *    Return an array with all photos inside the directory
 	 *
-	 *    @param      string	$dir        Repertoire a scanner
+	 *    @param      string	$dir        Dir to scan
 	 *    @param      int		$nbmax      Nombre maximum de photos (0=pas de max)
 	 *    @return     array       			Tableau de photos
 	 */

From 71bb3a1275d9d04953dd7b44bc9465982e4e4292 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 3 Mar 2024 15:59:08 +0100
Subject: [PATCH 0403/1862] Fix: Use accessible path for CategorieTest (#28600)

* Fix: Use accessible path for CategorieTest

# Fix: Use accessible path for CategorieTest

The test was using '/' (root of the filesystem) which was outside
the open_basedir paths.  Modified the path to the medias directory to allow the test to pass with open_basedir restriction in effect.

* Update CategorieTest.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 test/phpunit/CategorieTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index b57932bebde..cef67a66b70 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -214,7 +214,7 @@ class CategorieTest extends CommonClassTest
 		$this->assertLessThan($result, 0);
 		*/
 
-		$retarray = $localobject->liste_photos('/');
+		$retarray = $localobject->liste_photos(DOL_DATA_ROOT."/categorie");
 		print __METHOD__." retarray size=".count($retarray)."\n";
 		$this->assertTrue(is_array($retarray));
 

From a094cf73c29d5a76198990f607717d73f6ffbad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 16:00:13 +0100
Subject: [PATCH 0404/1862] fix phpstan and phpdoc (#28596)

* fix phpstan

* fix phpstan

* fix phpstan
---
 .../product/class/html.formproduct.class.php  | 12 ++---
 htdocs/webportal/class/context.class.php      | 51 +++++++++++++++++--
 htdocs/webportal/class/controller.class.php   | 22 ++++++++
 3 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d272bc6e95a..660ed67acba 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -261,7 +261,7 @@ class FormProduct
 	/**
 	 *  Return list of warehouses
 	 *
-	 *  @param  string|int|array  $selected           Id of preselected warehouse ('' or '-1' for no value, 'ifone' and 'ifonenodefault' = select value if one value otherwise no value, '-2' to use the default value from setup)
+	 *  @param  string|int|array  $selected     Id of preselected warehouse ('' or '-1' for no value, 'ifone' and 'ifonenodefault' = select value if one value otherwise no value, '-2' to use the default value from setup)
 	 *  @param  string      $htmlname           Name of html select html
 	 *  @param  string      $filterstatus       warehouse status filter, following comma separated filter options can be used
 	 *                                          'warehouseopen' = select products from open warehouses,
@@ -491,10 +491,10 @@ class FormProduct
 	/**
 	 *    Display form to select warehouse
 	 *
-	 *    @param    string  $page        Page
-	 *    @param    int     $selected    Id of warehouse
-	 *    @param    string  $htmlname    Name of select html field
-	 *    @param    int     $addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *    @param    string      $page        Page
+	 *    @param    string|int  $selected    Id of warehouse
+	 *    @param    string      $htmlname    Name of select html field
+	 *    @param    int         $addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *    @return   void
 	 */
 	public function formSelectWarehouses($page, $selected = '', $htmlname = 'warehouse_id', $addempty = 0)
@@ -692,7 +692,7 @@ class FormProduct
 	/**
 	 *  Return list of lot numbers (stock from product_batch) with stock location and stock qty
 	 *
-	 *  @param	int		$selected		Id of preselected lot stock id ('' for no value, 'ifone'=select value if one value otherwise no value)
+	 *  @param	string|int	$selected	Id of preselected lot stock id ('' for no value, 'ifone'=select value if one value otherwise no value)
 	 *  @param  string	$htmlname		Name of html select html
 	 *  @param  string	$filterstatus	lot status filter, following comma separated filter options can be used
 	 *  @param  int		$empty			1=Can be empty, 0 if not
diff --git a/htdocs/webportal/class/context.class.php b/htdocs/webportal/class/context.class.php
index d590c4fcf6d..d14efdc2d98 100644
--- a/htdocs/webportal/class/context.class.php
+++ b/htdocs/webportal/class/context.class.php
@@ -1,4 +1,26 @@
 <?php
+/* Copyright (C) 2023-2024 	Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/webportal/class/context.class.php
+ * \ingroup    webportal
+ * \brief      File of context class for WebPortal
+ */
 
 require_once __DIR__ . '/controller.class.php';
 require_once __DIR__ . '/webPortalTheme.class.php';
@@ -20,10 +42,24 @@ class Context
 	 */
 	public $db;
 
+	/**
+	 * @var string
+	 */
 	public $title;
+
+	/**
+	 * @var string
+	 */
 	public $desc;
 
+	/**
+	 * @var string
+	 */
 	public $meta_title;
+
+	/**
+	 * @var string
+	 */
 	public $meta_desc;
 
 	/**
@@ -32,7 +68,14 @@ class Context
 	 */
 	public $appliName;
 
+	/**
+	 * @var string
+	 */
 	public $controller;
+
+	/**
+	 * @var boolean
+	 */
 	public $controller_found = false;
 
 	/**
@@ -264,7 +307,7 @@ class Context
 	 * @return	string
 	 * @deprecated see getControllerUrl()
 	 */
-	public function getRootUrl($controller = false, $moreParams = '', $addToken = true)
+	public function getRootUrl($controller = '', $moreParams = '', $addToken = true)
 	{
 		return self::getControllerUrl($controller, $moreParams, $addToken);
 	}
@@ -277,7 +320,7 @@ class Context
 	 * @param	bool			$addToken		Add token hash only if controller is set
 	 * @return	string
 	 */
-	public function getControllerUrl($controller = false, $moreParams = '', $addToken = true)
+	public function getControllerUrl($controller = '', $moreParams = '', $addToken = true)
 	{
 		// TODO : addToken parameter on auto to detect (create or edit) action and add token on url
 		$url = $this->rootUrl;
@@ -303,12 +346,12 @@ class Context
 	 * Used for external link (like email or web page)
 	 * so remove token and contextual behavior associate with current user
 	 *
-	 * @param 	bool			$controller				Controller
+	 * @param 	string			$controller				Controller
 	 * @param 	string|array	$moreParams				More parameters
 	 * @param	array			$Tparams				Parameters
 	 * @return	string
 	 */
-	static public function getPublicControllerUrl($controller = false, $moreParams = '', $Tparams = array())
+	static public function getPublicControllerUrl($controller = '', $moreParams = '', $Tparams = array())
 	{
 		$url = self::getRootConfigUrl();
 
diff --git a/htdocs/webportal/class/controller.class.php b/htdocs/webportal/class/controller.class.php
index 0904b664847..ddc3ae103df 100644
--- a/htdocs/webportal/class/controller.class.php
+++ b/htdocs/webportal/class/controller.class.php
@@ -1,4 +1,26 @@
 <?php
+/* Copyright (C) 2023-2024 	Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/webportal/class/controller.class.php
+ * \ingroup    webportal
+ * \brief      File of controller class for WebPortal
+ */
 
 /**
  *  Class to manage pages

From 5714ff8b161aba66a5805fdfcff9f3fd30a2ab6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 16:31:22 +0100
Subject: [PATCH 0405/1862] Fix regression in dol_dir_list()

---
 htdocs/admin/translation.php  |  1 +
 htdocs/core/lib/files.lib.php | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c8f47d241c6..2c71f7592c4 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -290,6 +290,7 @@ foreach ($modulesdir as $keydir => $tmpsearchdir) {
 	$dir_lang_osencoded = dol_osencode($dir_lang);
 
 	$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ? SORT_ASC : SORT_DESC), 1);
+
 	foreach ($filearray as $file) {
 		$tmpfile = preg_replace('/.lang/i', '', basename($file['name']));
 		$moduledirname = (basename(dirname(dirname($dir_lang))));
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index f82a0fccd6e..9d7b2222040 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,19 +44,19 @@ function dol_basename($pathfile)
  * Scan a directory and return a list of files/directories.
  * Content for string is UTF8 and dir separator is "/".
  *
- * @param	string		$utf8_path     	Starting path from which to search. This is a full path.
- * @param	string		$types        	Can be "directories", "files", or "all"
- * @param	int			$recursive		Determines whether subdirectories are searched
- * @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function,
- *                                      but must not contains the start and end '/'. Filter is checked into basename only.
- * @param	string[]	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked both into fullpath and into basename (So '^xxx' may exclude 'xxx/dirscanned/...' and dirscanned/xxx').
- * @param	string		$sortcriteria	Sort criteria ('','fullname','relativename','name','date','size')
- * @param	int 		$sortorder		Sort order (SORT_ASC, SORT_DESC)
- * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only, 4=Force load of perm
- * @param	int			$nohook			Disable all hooks
- * @param	string		$relativename	For recursive purpose only. Must be "" at first call.
- * @param	int 		$donotfollowsymlinks	Do not follow symbolic links
- * @param	int 		$nbsecondsold	Only files older than $nbsecondsold
+ * @param	string			$utf8_path     	Starting path from which to search. This is a full path.
+ * @param	string			$types        	Can be "directories", "files", or "all"
+ * @param	int				$recursive		Determines whether subdirectories are searched
+ * @param	string			$filter        	Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function,
+ *                  	                    but must not contains the start and end '/'. Filter is checked into basename only.
+ * @param	string|string[]	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked both into fullpath and into basename (So '^xxx' may exclude 'xxx/dirscanned/...' and dirscanned/xxx').
+ * @param	string			$sortcriteria	Sort criteria ('','fullname','relativename','name','date','size')
+ * @param	int 			$sortorder		Sort order (SORT_ASC, SORT_DESC)
+ * @param	int				$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only, 4=Force load of perm
+ * @param	int				$nohook			Disable all hooks
+ * @param	string			$relativename	For recursive purpose only. Must be "" at first call.
+ * @param	int 			$donotfollowsymlinks	Do not follow symbolic links
+ * @param	int 			$nbsecondsold	Only files older than $nbsecondsold
  * @return	array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}> Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  * @see dol_dir_list_in_database()
  */
@@ -70,7 +70,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 		$filters_ok = true;
 		$error_info = "";
 		// Ensure we have an array for the exclusions
-		$exclude_array = $excludefilter === null ? array() : (is_array($excludefilter) ? $excludefilter : array($excludefilter));
+		$exclude_array = ($excludefilter === null || $excludefilter === '') ? array() : (is_array($excludefilter) ? $excludefilter : array($excludefilter));
 		foreach ((array($filter) + $exclude_array) as $f) {
 			// Check that all '/' are escaped.
 			if ((int) preg_match('/(?:^|[^\\\\])\//', $f) > 0) {
@@ -87,8 +87,9 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 		}
 	} else {
 		// Already computed before
-		$exclude_array = $excludefilter;
+		$exclude_array = ($excludefilter === null || $excludefilter === '') ? array() : (is_array($excludefilter) ? $excludefilter : array($excludefilter));
 	}
+
 	// Define excludefilterarray (before while, for speed)
 	$excludefilterarray = array_merge(array('^\.'), $exclude_array);
 

From b518bb0c9af8451fe529c05924d71c0f991dd207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 16:51:16 +0100
Subject: [PATCH 0406/1862] fix phpstan (#28604)

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

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index b3be55a633f..5c6154a4605 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2014		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2017		Rui Strecht			<rui.strecht@aliartalentos.com>
  * Copyright (C) 2020       Open-Dsi         	<support@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -635,7 +636,7 @@ class FormCompany extends Form
 	 *
 	 *  @param  object		$object         Object we try to find contacts
 	 *  @param  string		$var_id         Name of id field
-	 *  @param  string		$selected       Pre-selected third party
+	 *  @param  int 		$selected       Pre-selected third party
 	 *  @param  string		$htmlname       Name of HTML form
 	 * 	@param	array		$limitto		Disable answers that are not id in this array list
 	 *  @param	int			$forceid		This is to force another object id than object->id
@@ -643,7 +644,7 @@ class FormCompany extends Form
 	 *  @param	string		$morecss		More CSS on select component
 	 * 	@return int 						The selected third party ID
 	 */
-	public function selectCompaniesForNewContact($object, $var_id, $selected = 0, $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
+	public function selectCompaniesForNewContact($object, $var_id, $selected = 0, $htmlname = 'newcompany', $limitto = [], $forceid = 0, $moreparam = '', $morecss = '')
 	{
 		global $conf, $hookmanager;
 

From 8b756678191d6ef24ab5b3c3ae75169e0f29dac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 16:52:02 +0100
Subject: [PATCH 0407/1862] fix phpstan $amounts (array) does not accept array
 (#28603)

* fix phpstan $amounts (array) does not accept array

* fix phpstan $amounts (array) does not accept array
---
 htdocs/compta/paiement.php                      |  8 ++++----
 htdocs/compta/paiement/class/paiement.class.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4d24a875fb1..63938b6742c 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -8,8 +8,8 @@
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Teddy Andreotti         <125155@supinfo.com>
  * Copyright (C) 2015       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2023  		  Lenin Rivas	            <lenin.rivas777@gmail.com>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2023  		Lenin Rivas	            <lenin.rivas777@gmail.com>
  * Copyright (C) 2023       Sylvain Legrand	        <technique@infras.fr>
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
  *
@@ -261,8 +261,8 @@ if (empty($reshook)) {
 
 		// Creation of payment line
 		$paiement = new Paiement($db);
-		$paiement->datepaye     = $datepaye;
-		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->datepaye = $datepaye;
+		$paiement->amounts = $amounts; // Array with all payments dispatching with invoice id
 		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching
 		$paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 013c0fcebad..54768afbba2 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -7,9 +7,9 @@
  * Copyright (C) 2014       Marcos García 		 <marcosgdf@gmail.com>
  * Copyright (C) 2015       Juanjo Menent		 <jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet		 <fmarcet@2byte.es>
- * Copyright (C) 2018       Thibault FOUCART		 <support@ptibogxiv.net>
+ * Copyright (C) 2018       Thibault FOUCART		<support@ptibogxiv.net>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2020       Andreu Bisquerra Gaya <jove@bisquerra.com>
+ * Copyright (C) 2020       Andreu Bisquerra Gaya 	<jove@bisquerra.com>
  * Copyright (C) 2021       OpenDsi					<support@open-dsi.fr>
  * Copyright (C) 2023       Joachim Kueter			<git-jk@bloxera.com>
  * Copyright (C) 2023       Sylvain Legrand			<technique@infras.fr>
@@ -100,22 +100,22 @@ class Paiement extends CommonObject
 	public $multicurrency_amount;
 
 	/**
-	 * @var array<int,float>				array: invoice ID => amount for that invoice (in the main currency)
+	 * @var float[] array: invoice ID => amount for that invoice (in the main currency)
 	 */
 	public $amounts = array();
 
 	/**
-	 * @var array<int,float>				array: invoice ID => amount for that invoice (in the invoice's currency)
+	 * @var float[] array: invoice ID => amount for that invoice (in the invoice's currency)
 	 */
 	public $multicurrency_amounts = array();
 
 	/**
-	 * @var array<int,float>				Multicurrency rate (array: invoice ID => currency rate ("taux" in French) for that invoice)
+	 * @var float[] Multicurrency rate (array: invoice ID => currency rate ("taux" in French) for that invoice)
 	 */
 	public $multicurrency_tx = array();
 
 	/**
-	 * @var array<int,string>				Multicurrency code (array: invoice ID => currency code for that invoice)
+	 * @var string[] Multicurrency code (array: invoice ID => currency code for that invoice)
 	 */
 	public $multicurrency_code = array();
 

From 9c3a3758396f2b1e5f0bf8fdc5a211b9c3689f49 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 3 Mar 2024 16:56:12 +0100
Subject: [PATCH 0408/1862] Fix: Use accessible temporarypath for CMailFileTest
 (#28599)

# Fix: Use accessible temporarypath for CMailFileTest

'/tmp' does not exist on all systems and is subject to open_basedir
restrictions.  Selected another temporary path for the test.
---
 test/phpunit/CMailFileTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index d0b5d480a82..0cf5aa83216 100644
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -155,8 +155,8 @@ class CMailFileTest extends CommonClassTest
 		$msg .= ' <p>From wikipedia</p> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot" />';
 		$msg .= '</body></html>';
 
-
-		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', '/tmp');
+		$tmp_dir =  $conf->admin->dir_temp.'/'.__FUNCTION__.getmypid().'_tmp';
+		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', $tmp_dir);
 
 		$result = count($localobject->html_images);
 		print __METHOD__ . " result count image detected in the mail=" . $result . "\n";

From 40f98d529ed7228d84d93bfb1772bde2bf185b77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 16:58:03 +0100
Subject: [PATCH 0409/1862] Fix phpcs

---
 test/phpunit/CMailFileTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index 0cf5aa83216..1898a9fba34 100644
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -155,7 +155,7 @@ class CMailFileTest extends CommonClassTest
 		$msg .= ' <p>From wikipedia</p> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot" />';
 		$msg .= '</body></html>';
 
-		$tmp_dir =  $conf->admin->dir_temp.'/'.__FUNCTION__.getmypid().'_tmp';
+		$tmp_dir = $conf->admin->dir_temp.'/'.__FUNCTION__.getmypid().'_tmp';
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', $tmp_dir);
 
 		$result = count($localobject->html_images);

From 41bdcff4da175afe13d4bb1e8d51bb38eb139723 Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Sun, 3 Mar 2024 09:58:52 -0600
Subject: [PATCH 0410/1862] Update facture.class.php (#28591)

* Update facture.class.php

FIX  #22948

* Update facture.class.php
---
 htdocs/compta/facture/class/facture.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 41daf8bd39c..73a184c96c0 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4167,8 +4167,8 @@ class Facture extends CommonInvoice
 			$price = $pu;
 			$remise = 0;
 			if ($remise_percent > 0) {
-				$remise = round(($pu * $remise_percent / 100), 2);
-				$price = ($pu - $remise);
+				$remise = round(((float) $pu * (float) $remise_percent / 100), 2);
+				$price = ((float) $pu - $remise);
 			}
 			$price = price2num($price);
 

From 3663b9b305040247fe1902502361a69405562cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:00:06 +0100
Subject: [PATCH 0411/1862] fix phpstan (#28589)

* fix phpstan

* Update functions.lib.php
---
 htdocs/core/lib/functions.lib.php             | 6 +++---
 htdocs/salaries/class/paymentsalary.class.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0fd4bc4acc1..4dde6a63754 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5104,7 +5104,7 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"', $more
 		$titlealt = $langs->trans('Delete');
 	}
 
-	return img_picto($titlealt, 'delete.png', $other, false, 0, 0, '', $morecss);
+	return img_picto($titlealt, 'delete.png', $other, 0, 0, 0, '', $morecss);
 }
 
 /**
@@ -5425,7 +5425,7 @@ function img_search($titlealt = 'default', $other = '')
 		$titlealt = $langs->trans('Search');
 	}
 
-	$img = img_picto($titlealt, 'search.png', $other, false, 1);
+	$img = img_picto($titlealt, 'search.png', $other, 0, 1);
 
 	$input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';
 	$input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
@@ -5448,7 +5448,7 @@ function img_searchclear($titlealt = 'default', $other = '')
 		$titlealt = $langs->trans('Search');
 	}
 
-	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
+	$img = img_picto($titlealt, 'searchclear.png', $other, 0, 1);
 
 	$input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';
 	$input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 18f3d1263e1..0de7eaaf457 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -62,7 +62,7 @@ class PaymentSalary extends CommonObject
 	public $fk_salary;
 
 	/**
-	 * @var int				Payment creation date
+	 * @var int|string				Payment creation date
 	 */
 	public $datec = '';
 

From faf00c35e36e82fa48c0170821138772a42cb99d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:01:17 +0100
Subject: [PATCH 0412/1862] Fix: Skip UtilsTest on windows where ls is not
 available (#28601)

# Fix: Skip UtilsTest on windows where ls is not available

The test in question uses 'ls' which is not available on windows.
This change limits the execution to non windows systems.
---
 test/phpunit/CommonClassTest.class.php | 18 ++++++++++++++++++
 test/phpunit/UtilsTest.php             |  5 +++++
 2 files changed, 23 insertions(+)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 262dc2ad002..eae67cb1dda 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -418,4 +418,22 @@ abstract class CommonClassTest extends TestCase
 			$this->assertFileDoesNotExist($file, $message);
 		}
 	}
+
+
+	/**
+	 * Skip test if test is not running on "Unix"
+	 *
+	 * @param string $message Message to indicate which test requires "Unix"
+	 *
+	 * @return bool True if this is not *nix, and fake assert generated
+	 */
+	protected function fakeAssertIfNotUnix($message)
+	{
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$this->assertTrue(true, "Dummy test to not mark the test as risky");
+			// $this->markTestSkipped("PHPUNIT is running on windows.  $message");
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/test/phpunit/UtilsTest.php b/test/phpunit/UtilsTest.php
index ddb87e0f83e..354a325b8cc 100644
--- a/test/phpunit/UtilsTest.php
+++ b/test/phpunit/UtilsTest.php
@@ -55,6 +55,11 @@ class UtilsTest extends CommonClassTest
 	 */
 	public function testExecuteCLI()
 	{
+		// Needs ls. Skip test if not running on *nix system.
+		if ($this->fakeAssertIfNotUnix(__METHOD__." only works on *nix")) {
+			return;
+		}
+
 		global $conf,$user,$langs,$db;
 		$conf = $this->savconf;
 		$user = $this->savuser;

From 9e1cfb7c52f8c2ec67562b60fbfc359a20eb069a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20A?= <35066297+c3do@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:07:58 +0100
Subject: [PATCH 0413/1862] FIX issue #23022 (#28590)

* FIX issue #23022

* no longer necessary

* no longer necessary

* no longer necessary

* no longer necessary

* no longer necessary

* no longer necessary

* no longer necessary
---
 htdocs/core/lib/company.lib.php         | 1 +
 htdocs/partnership/partnership_list.php | 4 ----
 htdocs/societe/agenda.php               | 3 ---
 htdocs/societe/document.php             | 3 ---
 htdocs/societe/messaging.php            | 3 ---
 htdocs/societe/note.php                 | 3 ---
 htdocs/societe/price.php                | 3 ---
 htdocs/societe/project.php              | 3 ---
 8 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c71fe088869..487782f7f39 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -314,6 +314,7 @@ function societe_prepare_head(Societe $object)
 	if ($user->socid == 0) {
 		// Notifications
 		if (isModEnabled('notification')) {
+			$langs->load('mails');
 			$nbNotif = 0;
 			// Enable caching of thirdparty count notifications
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index ba50933b9ec..452e03be496 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -489,10 +489,6 @@ if ($managedfor == "member") {
 		$adht = new AdherentType($db);
 		$result = $adhstat->fetch($memberid);
 
-		if (isModEnabled('notification')) {
-			$langs->load("mails");
-		}
-
 		$adht->fetch($adhstat->typeid);
 
 		$head = member_prepare_head($adhstat);
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 5acb9e4f050..cffa65d43f1 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -129,9 +129,6 @@ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',
 $help_url = '';
 llxHeader('', $title, $help_url);
 
-if (isModEnabled('notification')) {
-	$langs->load("mails");
-}
 $head = societe_prepare_head($object);
 
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 3b7c7081551..aab773fa19a 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -118,9 +118,6 @@ $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
 // Show tabs
-if (isModEnabled('notification')) {
-	$langs->load("mails");
-}
 $head = societe_prepare_head($object);
 
 print dol_get_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index 50ff1d6b7d7..01791b4a188 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -128,9 +128,6 @@ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',
 }
 llxHeader('', $title);
 
-if (isModEnabled('notification')) {
-	$langs->load("mails");
-}
 $head = societe_prepare_head($object);
 
 print dol_get_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, $object->picto);
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index a80e7031c2a..7213426011e 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -93,9 +93,6 @@ if ($object->id > 0) {
 	/*
 	 * Affichage onglets
 	 */
-	if (isModEnabled('notification')) {
-		$langs->load("mails");
-	}
 
 	$head = societe_prepare_head($object);
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 31d8f9cec31..e7ba363e045 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -204,9 +204,6 @@ $object = new Societe($db);
 $result = $object->fetch($socid);
 llxHeader("", $langs->trans("ThirdParty").'-'.$langs->trans('PriceByCustomer'));
 
-if (isModEnabled('notification')) {
-	$langs->load("mails");
-}
 $head = societe_prepare_head($object);
 
 print dol_get_fiche_head($head, 'price', $langs->trans("ThirdParty"), -1, 'company');
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index a4f490b031d..3ab7e0d712e 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -124,9 +124,6 @@ if ($socid) {
 	}
 	llxHeader('', $title);
 
-	if (isModEnabled('notification')) {
-		$langs->load("mails");
-	}
 	$head = societe_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');

From e2fba5d03f84c714e2f4180f1c29ad7bc66194dd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:08:57 +0100
Subject: [PATCH 0414/1862] Qual: FactureTest - use assertions rather than
 dying in the setup. (#28585)

# Qual: FactureTest - use assertions rather than dying in the setup.

The 'die()' instructions have been replaced - not all tests should fail
because the preconditions for a test case are not met.
---
 test/phpunit/FactureTest.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 28c4ad210dc..a7d26438352 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -56,20 +56,9 @@ class FactureTest extends CommonClassTest
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
-
-		if (!isModEnabled('facture')) {
-			print __METHOD__." module customer invoice must be enabled.\n";
-			die(1);
-		}
-		if (isModEnabled('ecotaxdeee')) {
-			print __METHOD__." ecotaxdeee module must not be enabled.\n";
-			die(1);
-		}
-
-		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
-
-		print __METHOD__."\n";
+		self::assertTrue(isModEnabled('facture'), " module customer invoice must be enabled");
+		self::assertFalse(isModEnabled('ecotaxdeee'), " module customer invoice must be enabled");
+		parent::setUpBeforeClass();
 	}
 
 

From e1b3a639c4832d0a3a11bba715a745ffccb3e808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:09:24 +0100
Subject: [PATCH 0415/1862] fix phpstan default value is incompatible with type
 string (#28592)

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4dde6a63754..762ce407775 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5699,7 +5699,7 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
  *	@param  string	$sortorder   Current sort order
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
  *  @param	string	$tooltip	 Tooltip
- *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
+ *  @param	int		$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	void
  */
 function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $tooltip = "", $forcenowrapcolumntitle = 0)
@@ -5722,7 +5722,7 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
  *  @param	string	$prefix		 		Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
  *  @param	string	$disablesortlink	1=Disable sort link
  *  @param	string	$tooltip	 		Tooltip
- *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
+ *  @param	int 	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	string
  */
 function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '', $forcenowrapcolumntitle = 0)

From f5c0cfcf6bb17dd33744ec17af8b283f2bc6008a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:09:55 +0100
Subject: [PATCH 0416/1862] fix phpstan (#28588)

---
 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 762ce407775..77bfb98042f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4511,7 +4511,7 @@ function getPictoForType($key)
  *                                  				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_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<0,1>    $pictoisfullpath		If true or 1, image path is a full path, 0 if not
  *	@param		int			$srconly				Return only content of the src attribute of img.
  *  @param		int			$notitle				1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *  @param		string		$alt					Force alt for bind people
@@ -4520,7 +4520,7 @@ function getPictoForType($key)
  *  @return     string       				    	Return img tag
  *  @see        img_object(), img_picto_common()
  */
-function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '', $marginleftonlyshort = 2)
+function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srconly = 0, $notitle = 0, $alt = '', $morecss = '', $marginleftonlyshort = 2)
 {
 	global $conf;
 
@@ -4877,7 +4877,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
  *	@return	string						Return img tag
  *	@see	img_picto(), img_picto_common()
  */
-function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
+function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srconly = 0, $notitle = 0)
 {
 	if (strpos($picto, '^') === 0) {
 		return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);

From 1e41588cfe57acbeee003cca3a24a393c63fc85e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:40:30 +0100
Subject: [PATCH 0417/1862] Fix: Improve cache key generation for windows-ci
 (#28602)

# Fix: Improve cache key generation for windows-ci

Caches did not restore as expected.  This change attemps to fix it.
---
 .github/workflows/windows-ci.yaml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index 178fcf807c8..3584aa5ab07 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -1,41 +1,39 @@
 ---
 name: Win CI
+# yamllint disable-line rule:truthy
 on:
   push:
   pull_request:
   workflow_dispatch:
-
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
+    }}
   cancel-in-progress: true
-
 env:
   PHPUNIT_LOG: phpunit_tests.log
   DOLIBARR_LOG: documents/dolibarr.log
   PHPSERVER_LOG: phpserver.log
-  PHPSERVER_DOMAIN_PORT: 127.0.0.1:8000 # could be 127.0.0.1:8000 if config modified
-  CACHE_KEY_PART: ${{ ( github.event_name == 'pull_request' ) && github.base_ref }}${{ ( github.event_name == 'pull_request' ) && '-' }}${{ github.head_ref }}
-  PHP_INI_SCAN_DIR: "C:\\myphpini"
+  PHPSERVER_DOMAIN_PORT: 127.0.0.1:8000  # could be 127.0.0.1:8000 if config modified
+  CACHE_KEY_PART: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.base_ref, github.head_ref) || github.ref_name }}
+  PHP_INI_SCAN_DIR: C:\myphpini
   CKEY: win-ci-2
-
+  GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
 jobs:
   win-test:
     strategy:
       matrix:
         os: [windows-latest]
         # php_version: [7.4, 8.0]  # Add more versions if needed
-        php_version: [7.4] # Add more versions if needed
+        php_version: [7.4]  # Add more versions if needed
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
       - name: Setup MariaDB
         uses: ankane/setup-mariadb@v1
         with:
           # mariadb-version: ${{ matrix.mariadb-version }}
-          database: travis # Specify your database name
-
+          database: travis  # Specify your database name
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -60,13 +58,13 @@ jobs:
           path: |
             db_init.sql
             db_init.sql.md5
-          key: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ env.CACHE_KEY_PART }}-${{ github.run_id }}
+          key: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ env.CACHE_KEY_PART
+            }}-${{ github.run_id }}
           restore-keys: |
             ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ env.CACHE_KEY_PART }}-
             ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ github.head_ref }}-
             ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-${{ github.base_ref }}-
             ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}-
-
       - name: Create local php.ini
         shell: cmd
         if: false
@@ -91,7 +89,6 @@ jobs:
           SET PHP_INI_SCAN_DIR=
           ECHO "==== Verify it is used by PHP ==="
           php --ini
-
       - name: Run Bash script
         # Note this is bash (MSYS) on Windows
         shell: bash
@@ -106,7 +103,6 @@ jobs:
           ls -l
           echo "TEE=$(cygpath -w "$(which tee)")" >> "$GITHUB_ENV"
           echo "BASEDIR=$(realpath .)" >> "$GITHUB_ENV"
-
       - name: Start web server
         id: server
         if: false
@@ -115,7 +111,6 @@ jobs:
           Start-Process -FilePath "php.exe" -WindowStyle Hidden -ArgumentList "-S ${{ env.PHPSERVER_DOMAIN_PORT }} -t htdocs > ${{ env.PHPSERVER_LOG }}" -PassThru
           curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
         shell: powershell
-
       - name: Run PHPUnit tests
         continue-on-error: true
         shell: cmd
@@ -148,13 +143,11 @@ jobs:
           REM 'DOSKEY' USED to recover error code (no pipefile equivalent in windows?)
           ( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
           for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
-
       - name: Convert Raw Log to Annotations
         uses: mdeweerd/logToCheckStyle@v2024.2.9
         if: ${{ failure() }}
         with:
           in: ${{ env.PHPUNIT_LOG }}
-
       - name: Provide dolibarr and phpunit logs as artifact
         uses: actions/upload-artifact@v4
         if: ${{ ! cancelled() }}
@@ -169,7 +162,7 @@ jobs:
           retention-days: 2
 
       # Save cache
-      - name: "Save cache"
+      - name: Save cache
         uses: actions/cache/save@v4
         if: ${{ ! cancelled() }}
         with:

From d199b042b4260c47f102369db1ca2df216f05858 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 18:50:28 +0100
Subject: [PATCH 0418/1862] Prepare 19.0.1

---
 ChangeLog               | 47 +++++++++++++++++++++++++++++++++++++++++
 htdocs/filefunc.inc.php |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index afb30c7d899..56ebe50a7f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,53 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 19.0.1 compared to 19.0.0 *****
+
+FIX: 16.0 - parent company gets emptied when updating a third party from the card in edit mode (#28269)
+FIX: #22948
+FIX: #28205
+FIX: 28251 Fixing subpermission name on api_multicurrencies.class.php (#28252)
+FIX: #28369
+FIX: #28429
+FIX: #28491 (#28522)
+FIX: #28518 (#28520)
+FIX: #28533 Mo::deleteLine removes the "main" MoLine if consumed line is delete (#28535)
+FIX: #28564
+FIX: Adding the dependencies list feature for extrafields "select" (#28549)
+FIX: Add new hidden conf "DISABLE_QTY_OVERWRITTEN" (#28523)
+FIX: avoid error "Column 'entity' in where clause is ambiguous" (#28270)
+FIX: avoid Unknown column 'pfp.ref_fourn' (#28145)
+FIX: avoid warning "error parsing attribute name in Entity" (#28543)
+FIX: Bad column for total in bom list
+FIX: Bad condition on button back to draft on recruitment job.
+FIX: Bad CRLF when sending text only content. Fix dol_htmlwithnojs()
+FIX: Bad picto on list of permission of a user when user not admin
+FIX: bad timzeone for the start/end date of an event
+FIX: Better test on validity of compute field syntax with parenthesis
+FIX: close #28279
+FIX: disabled pito of menu must be greyed.
+FIX: Don't display column when it's out of date (#28271)
+FIX: duplicate with lines: 414-416 (#28358)
+FIX: Error When cloning fourn price no default value for tva_tx (#28368)
+FIX: migration missing 2 columns in llx_resource and 1 in llx_user
+FIX: missing trans
+FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
+FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156)
+FIX: Pb in redirect of a website page in USEDOLIBARRSERVER mode
+FIX: PHP Warning: Undefined variable $lib (#28342)
+FIX: Picto for mime
+FIX: position of field in list of field in shipment list
+FIX: postgresql error (#28542)
+FIX: quote in sql request
+FIX: Responsive on admin project
+FIX: Shipment closing action has wrong value (#28174)
+FIX: some tooltips has disappeared on invoice action button
+FIX: Special code is now transmitted by args only in order supplier (#28546)
+FIX: subscription must be editable when accounting isn't reconciled (#28469)
+FIX: Value of field int = 0 from modulebuilder must nto be set to null
+
+
 ***** ChangeLog for 19.0.0 compared to 18.0.0 *****
 
 For users:
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 948381bd828..4c4df29af50 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', '19.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '19.0.1'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From af6a091ab2e6915325ad5c849247ca2a7854a163 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 18:55:10 +0100
Subject: [PATCH 0419/1862] Fix 19.0.1

---
 ChangeLog                                 | 2 +-
 htdocs/comm/card.php                      | 2 +-
 htdocs/core/class/commoninvoice.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56ebe50a7f6..de0cb66b968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,7 +34,7 @@ FIX: Error When cloning fourn price no default value for tva_tx (#28368)
 FIX: migration missing 2 columns in llx_resource and 1 in llx_user
 FIX: missing trans
 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
-FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Not truncate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
 FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156)
 FIX: Pb in redirect of a website page in USEDOLIBARRSERVER mode
 FIX: PHP Warning: Undefined variable $lib (#28342)
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 39e9267cd16..38fa5139376 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -219,7 +219,7 @@ if (empty($reshook)) {
 	if ($action == 'setassujtva' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$object->tva_assuj = GETPOST('assujtva_value');
-		$result = $object->update($object->id);
+		$result = $object->update($object->id, $user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 5c9d90b11cc..a7c5788aee3 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1146,7 +1146,7 @@ abstract class CommonInvoice extends CommonObject
 				$sql .= " AND fk_facture = ".((int) $this->id);				// Add a protection to not pay another invoice than current one
 			}
 			if ($type != 'direct-debit') {
-				if ($$sourcetype == 'salary') {
+				if ($sourcetype == 'salary') {
 					$sql .= " AND fk_salary = ".((int) $this->id);			// Add a protection to not pay another salary than current one
 				} else {
 					$sql .= " AND fk_facture_fourn = ".((int) $this->id);	// Add a protection to not pay another invoice than current one

From 6f58a45220e3292b7fbe7edd508297c150d2643f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 3 Mar 2024 18:55:30 +0100
Subject: [PATCH 0420/1862] fix phpstan (#28605)

* fix phpstan

* fix phpstan

* fix too few parameters

* fix typo

* ActionComm::$ref is not covariant with PHPDoc type string

* fix default values
---
 htdocs/comm/action/class/actioncomm.class.php |  7 ++++---
 htdocs/comm/card.php                          |  4 ++--
 htdocs/core/class/commoninvoice.class.php     |  3 ++-
 htdocs/core/lib/functions.lib.php             |  4 ++--
 htdocs/datapolicy/class/datapolicy.class.php  |  3 ++-
 htdocs/public/partnership/new.php             |  7 +++++--
 htdocs/societe/class/societe.class.php        | 12 +++++++-----
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index e42e58ec2fc..d8c8694ede9 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2017  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2015	    Marcos García		    <marcosgdf@gmail.com>
  * Copyright (C) 2018	    Nicolas ZABOURI	        <info@inovea-conseil.com>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ class ActionComm extends CommonObject
 	public $id;
 
 	/**
-	 * @var int Id of the event. Use $id as possible
+	 * @var string Id of the event. Use $id as possible
 	 */
 	public $ref;
 
@@ -614,7 +614,8 @@ class ActionComm extends CommonObject
 		dol_syslog(get_class($this)."::add", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$this->ref = $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
+			$this->ref = (string) $this->id;
 			$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm SET ref='".$this->db->escape($this->ref)."' WHERE id=".$this->id;
 			$resql = $this->db->query($sql);
 			if (!$resql) {
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b202ea2b3da..0b07926aad8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2020 Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2013      Alexandre Spangaro          <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2021 Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2024  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2020      Open-Dsi         		   <support@open-dsi.fr>
  * Copyright (C) 2022      Anthony Berton     			<anthony.berton@bb2a.fr>
@@ -219,7 +219,7 @@ if (empty($reshook)) {
 	if ($action == 'setassujtva' && $user->hasRight('societe', 'creer')) {
 		$object->fetch($id);
 		$object->tva_assuj = GETPOSTINT('assujtva_value');
-		$result = $object->update($object->id);
+		$result = $object->update($object->id, $user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 449fcdfa7d7..708e198ac98 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1149,7 +1150,7 @@ abstract class CommonInvoice extends CommonObject
 				$sql .= " AND fk_facture = ".((int) $this->id);				// Add a protection to not pay another invoice than current one
 			}
 			if ($type != 'direct-debit') {
-				if ($$sourcetype == 'salary') {
+				if ($sourcetype == 'salary') {
 					$sql .= " AND fk_salary = ".((int) $this->id);			// Add a protection to not pay another salary than current one
 				} else {
 					$sql .= " AND fk_facture_fourn = ".((int) $this->id);	// Add a protection to not pay another invoice than current one
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 77bfb98042f..b3fa056e897 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5720,7 +5720,7 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
  *	@param  string	$sortfield   		Current field used to sort (Ex: 'd.datep,d.id')
  *	@param  string	$sortorder   		Current sort order (Ex: 'asc,desc')
  *  @param	string	$prefix		 		Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
- *  @param	string	$disablesortlink	1=Disable sort link
+ *  @param	int 	$disablesortlink	1=Disable sort link
  *  @param	string	$tooltip	 		Tooltip
  *  @param	int 	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	string
@@ -6546,7 +6546,7 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
  * 	@return	mixed			   					0 if not found, localtax rate if found
  *  @see get_default_tva()
  */
-function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_seller = "", $vatnpr = 0)
+function get_localtax($vatrate, $local, $thirdparty_buyer = null, $thirdparty_seller = null, $vatnpr = 0)
 {
 	global $db, $conf, $mysoc;
 
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index 43498d01606..d6c0ec80d1c 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -306,7 +307,7 @@ class DataPolicy
 			if ($resultmail) {
 				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
 				$societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-				$societe->update($societe->id);
+				$societe->update($societe->id, $user);
 			} else {
 				dol_print_error($db);
 			}
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 187eba32b6b..87a4ba5df97 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
@@ -315,7 +315,10 @@ if (empty($reshook) && $action == 'add') {
 				$company->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
 			}
 
-			$company->update(0);
+			$res = $company->update(0, $user);
+			if ($res < 0) {
+				setEventMessages($company->error, $company->errors, 'errors');
+			}
 		}
 
 		// Fill array 'array_options' with data from add form
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index abdd447f9a1..73b871bc7f0 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1347,7 +1347,7 @@ class Societe extends CommonObject
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
 	 *      @return int  			           			Return integer <0 if KO, >=0 if OK
 	 */
-	public function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
+	public function update($id, User $user, $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -2490,9 +2490,9 @@ class Societe extends CommonObject
 	 * 	@param	string	$filter			Other filter
 	 * 	@param	integer	$maxvalue		Filter on max value for discount
 	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *	@return	int					Return integer <0 if KO, Credit note amount otherwise
+	 *	@return	int						Return integer <0 if KO, Credit note amount otherwise
 	 */
-	public function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
+	public function getAvailableDiscounts($user = null, $filter = '', $maxvalue = 0, $discount_type = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
@@ -3391,7 +3391,7 @@ class Societe extends CommonObject
 	 *	@param	int			$type		Should be 0 to say customer
 	 *  @return void
 	 */
-	public function get_codeclient($objsoc = 0, $type = 0)
+	public function get_codeclient($objsoc = null, $type = 0)
 	{
 		// phpcs:enable
 		global $conf;
@@ -3405,6 +3405,7 @@ class Societe extends CommonObject
 					break;
 				}
 			}
+			/** @var ModeleThirdPartyCode $mod */
 			$mod = new $module($this->db);
 
 			$this->code_client = $mod->getNextValue($objsoc, $type);
@@ -3423,7 +3424,7 @@ class Societe extends CommonObject
 	 *	@param	int			$type		Should be 1 to say supplier
 	 *  @return void
 	 */
-	public function get_codefournisseur($objsoc = 0, $type = 1)
+	public function get_codefournisseur($objsoc = null, $type = 1)
 	{
 		// phpcs:enable
 		global $conf;
@@ -3437,6 +3438,7 @@ class Societe extends CommonObject
 					break;
 				}
 			}
+			/** @var ModeleThirdPartyCode $mod */
 			$mod = new $module($this->db);
 
 			$this->code_fournisseur = $mod->getNextValue($objsoc, $type);

From 17ff0972ab407eb7c55cce6ffa72553c1e001696 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 19:35:37 +0100
Subject: [PATCH 0421/1862] Fix use of invoke into computed fields

---
 htdocs/core/lib/functions.lib.php |  9 +++++++--
 test/phpunit/SecurityTest.php     | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cf8bb9b324e..cbf8fee96e0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9289,22 +9289,27 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 
 		// We block use of php exec or php file functions
 		$forbiddenphpstrings = array('$$');
-		$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
+		$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST', 'ReflectionFunction'));
 
 		$forbiddenphpfunctions = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen");
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond"));	// native dolibarr functions
-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("base64_decode", "rawurldecode", "urldecode")); // decode string functions
+		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("base64_decode", "rawurldecode", "urldecode", "str_rot13", "hex2bin")); // decode string functions used to obfuscated function name
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 
+		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function
+
 		$forbiddenphpregex = 'global\s+\$|\b('.implode('|', $forbiddenphpfunctions).')\b';
 
+		$forbiddenphpmethodsregex = '->('.implode('|', $forbiddenphpmethods).')';
+
 		do {
 			$oldstringtoclean = $s;
 			$s = str_ireplace($forbiddenphpstrings, '__forbiddenstring__', $s);
 			$s = preg_replace('/'.$forbiddenphpregex.'/i', '__forbiddenstring__', $s);
+			$s = preg_replace('/'.$forbiddenphpmethodsregex.'/i', '__forbiddenstring__', $s);
 			//$s = preg_replace('/\$[a-zA-Z0-9_\->\$]+\(/i', '', $s);	// Remove $function( call and $mycall->mymethod(
 		} while ($oldstringtoclean != $s);
 
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 545306f5734..fb3132a17ff 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -960,6 +960,16 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print "result = ".$result."\n";
 		$this->assertEquals('Parent project not found', $result);
 
+		$s = 'new abc->invoke(\'whoami\')';
+		$result=dol_eval($s, 1, 1, '2');
+		print "result = ".$result."\n";
+		$this->assertEquals('Bad string syntax to evaluate: new abc__forbiddenstring__(\'whoami\')', $result);
+
+		$s = 'new ReflectionFunction(\'abc\')';
+		$result=dol_eval($s, 1, 1, '2');
+		print "result = ".$result."\n";
+		$this->assertEquals('Bad string syntax to evaluate: new __forbiddenstring__(\'abc\')', $result);
+
 		$result=dol_eval('$a=function() { }; $a;', 1, 1, '');
 		print "result = ".$result."\n";
 		$this->assertContains('Bad string syntax to evaluate', $result);

From 1c286825ac8b53fdc4d9066eb4553af097edce48 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 21:10:31 +0100
Subject: [PATCH 0422/1862] Fix default filter

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index c6686cae946..81db51f4ca8 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -62,7 +62,7 @@ $search_lastname = GETPOST("search_lastname", 'alphanohtml');
 $search_firstname = GETPOST("search_firstname", 'alphanohtml');
 $search_email = GETPOST("search_email", 'alphanohtml');
 $search_other = GETPOST("search_other", 'alphanohtml');
-$search_dest_status = GETPOSTINT('search_dest_status');
+$search_dest_status = GETPOST('search_dest_status');	// Must be '' if not set, so do not use GETPOSTINT here.
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs('/mailings');
@@ -605,7 +605,7 @@ if ($object->fetch($id) >= 0) {
 		$sql .= natural_search("mc.other", $search_other);
 		$asearchcriteriahasbeenset++;
 	}
-	if ($search_dest_status != '' && $search_dest_status >= -1) {
+	if ($search_dest_status != '' && (int) $search_dest_status >= -1) {
 		$sql .= " AND mc.statut = ".((int) $search_dest_status);
 		$asearchcriteriahasbeenset++;
 	}

From b2fd10e8f8fabfaf50e7aad3f67ada9bba450c78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 21:12:11 +0100
Subject: [PATCH 0423/1862] Fix status

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 81db51f4ca8..4a81bd1368a 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -582,7 +582,7 @@ if ($object->fetch($id) >= 0) {
 	}
 
 	// List of selected targets
-	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.tms,";
+	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut as status, mc.date_envoi, mc.tms,";
 	$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text,";
 	$sql .= " COUNT(mu.rowid) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
@@ -783,6 +783,7 @@ if ($object->fetch($id) >= 0) {
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+
 			$objectstaticmember = new Adherent($db);
 			$objectstaticuser = new User($db);
 			$objectstaticcompany = new Societe($db);

From 581378f24d8ed57fd9f678bff906a86e0b649007 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Mar 2024 21:14:49 +0100
Subject: [PATCH 0424/1862] css

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 4a81bd1368a..d38984a2b79 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -823,7 +823,7 @@ if ($object->fetch($id) >= 0) {
 
 				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
 
-				print '<td><span class="small">'.dol_escape_htmltag($obj->other).'</small></td>';
+				print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($obj->other).'"><span class="small">'.dol_escape_htmltag($obj->other).'</small></td>';
 
 				print '<td class="center tdoverflowmax150">';
 				if (empty($obj->source_id) || empty($obj->source_type)) {

From 5c4ba8c17713a841d0a5d19cdc56325341e7e595 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 09:25:58 +0100
Subject: [PATCH 0425/1862] CSS

---
 htdocs/compta/prelevement/list.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 0ac2ddfc701..c21f88d2157 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -415,13 +415,14 @@ while ($i < $imaxinloop) {
 
 	$object = $bon;
 	if ($object->checkIfSalaryBonPrelevement()) {
+		$fullname = explode(' ', $obj->name);
+
 		$userstatic->id = $obj->socid;
 		$userstatic->email = $obj->email;
-
-		$fullname = explode(' ', $obj->name);
 		$userstatic->firstname = $fullname[0];
 		$userstatic->lastname = isset($fullname[1]) ? $fullname[1] : '';
 	}
+
 	$company->id = $obj->socid;
 	$company->name = $obj->name;
 	$company->email = $obj->email;
@@ -476,7 +477,8 @@ while ($i < $imaxinloop) {
 		print substr('000000'.$obj->rowid_ligne, -6);
 		print '</a></td>';
 
-		print '<td>';
+		// Ref invoice or salary
+		print '<td class="nowraponall">';
 		$link_to_bill = '/compta/facture/card.php?facid=';
 		$link_title = 'Invoice';
 		$link_picto = 'bill';
@@ -501,12 +503,11 @@ while ($i < $imaxinloop) {
 		print '</a>';
 		print '</td>';
 
-		print '<td>';
-
-		print(!$bon->checkIfSalaryBonPrelevement() ? $company->getNomUrl(1) : $userstatic->getNomUrl(1));
+		// Thirdparty (company or user)
+		print '<td class="tdoverflowmax150">';
+		print(!$bon->checkIfSalaryBonPrelevement() ? $company->getNomUrl(1) : $userstatic->getNomUrl(-1));
 		print "</td>\n";
 
-
 		print '<td class="center">';
 		$link_to_tab = '/comm/card.php?socid=';
 		$link_code = $obj->code_client;
@@ -514,11 +515,12 @@ while ($i < $imaxinloop) {
 			$link_to_tab = '/fourn/card.php?socid=';
 			$link_code = $obj->code_fournisseur;
 		}
-		print '<a href="'.DOL_URL_ROOT.$link_to_tab.$company->id.'">'.$link_code."</a></td>\n";
+		print '<a href="'.DOL_URL_ROOT.$link_to_tab.$company->id.'">'.$link_code."</a>";
+		print "</td>\n";
 
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
-		print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
+		print '<td class="nowraponall right"><span class="amount">'.price($obj->amount)."</span></td>\n";
 
 		// Action column
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

From 12c7e4e2ec86cc19df72d16f1841049a96fcb275 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 09:26:59 +0100
Subject: [PATCH 0426/1862] css

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2cddd94f5c8..9b3b16b60fc 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2762,7 +2762,7 @@ class BonPrelevement extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="amount">'.price($this->total).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';

From 63ef1b6c1f73d59205f24efd3431ea02716d579b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 10:41:46 +0100
Subject: [PATCH 0427/1862] Fix regression with GETPOSTINT, not same than
 GETPOST(..., 'int')

---
 htdocs/comm/propal/list.php                   |  9 ++------
 htdocs/commande/list.php                      |  4 ++--
 htdocs/commande/list_det.php                  |  6 ++---
 htdocs/compta/bank/list.php                   |  2 +-
 .../compta/facture/invoicetemplate_list.php   |  2 +-
 htdocs/compta/sociales/list.php               |  2 +-
 htdocs/compta/tva/list.php                    |  3 +--
 htdocs/core/menus/init_menu_auguria.sql       |  2 +-
 htdocs/cron/list.php                          |  2 +-
 htdocs/fichinter/list.php                     |  2 +-
 htdocs/fourn/commande/list.php                |  4 +---
 htdocs/fourn/facture/list-rec.php             |  2 +-
 htdocs/fourn/facture/list.php                 |  4 +---
 htdocs/holiday/list.php                       | 20 ++++++++---------
 htdocs/holiday/view_log.php                   |  2 +-
 htdocs/salaries/list.php                      |  4 ++--
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/user/hierarchy.php                     | 14 ++++++------
 htdocs/user/list.php                          | 22 +++++++++----------
 19 files changed, 48 insertions(+), 60 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c98e2f12da7..8618b1049fd 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -141,7 +141,6 @@ $search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmo
 $search_status = GETPOST('search_status', 'alpha');
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$object_statut = GETPOST('search_statut', 'alpha');
 
 // Pagination
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -373,7 +372,6 @@ if (empty($reshook)) {
 		$search_date_delivery_end = '';
 		$search_availability = '';
 		$search_status = '';
-		$object_statut = '';
 		$search_categ_cus = 0;
 		$search_fk_cond_reglement = '';
 		$search_fk_shipping_method = '';
@@ -390,9 +388,6 @@ if (empty($reshook)) {
 		$toselect = array();
 		$search_array_options = array();
 	}
-	if ($object_statut != '') {
-		$search_status = $object_statut;
-	}
 
 	// Mass actions
 	$objectclass = 'Propal';
@@ -1467,7 +1462,7 @@ if ($search_date_signature_endyear) {
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked'])) {
 		print '<td class="liste_titre center parentonrightofpage">';
-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status width100 onrightofpage');
+		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_status', 'search_status width100 onrightofpage');
 		print '</td>';
 	}
 	// Action column
@@ -1623,7 +1618,7 @@ if ($search_date_signature_endyear) {
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.login']['checked'])) {
-		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder);
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['sale_representative']['checked'])) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2fd664cbb68..408b10ae81c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -105,8 +105,8 @@ $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc',
 $search_login = GETPOST('search_login', 'alpha');
 $search_categ_cus = GETPOSTINT("search_categ_cus");
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOSTINT('search_billed');
-$search_status = GETPOSTINT('search_status');
+$search_billed = GETPOST('search_billed', 'int');
+$search_status = GETPOST('search_status', 'intcomma');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 9dcbe3711c1..75237945ea4 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -119,10 +119,8 @@ $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc',
 $search_login = GETPOST('search_login', 'alpha');
 $search_categ_cus = GETPOSTINT("search_categ_cus");
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOSTISSET('search_billed') ? GETPOSTINT('search_billed') : GETPOSTINT('billed');
-$search_status = GETPOSTINT('search_status');
-$search_btn = GETPOST('button_search', 'alpha');
-$search_remove_btn = GETPOST('button_removefilter', 'alpha');
+$search_billed = GETPOST('search_billed', 'intcomma') ? GETPOST('search_billed', 'intcomma') : GETPOST('billed', 'intcomma');
+$search_status = GETPOST('search_status', 'intcomma');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 05c2ef6de13..ef9206a74ed 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -57,7 +57,7 @@ $mode = GETPOST('mode', 'aZ');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_number = GETPOST('search_number', 'alpha');
-$search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened'
+$search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') : 'opened'; // 'all' or '' means 'opened'
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $search_category_list ="";
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 540242d2763..d7191fa1590 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -95,7 +95,7 @@ $search_recurring = GETPOSTINT('search_recurring');
 $search_frequency = GETPOST('search_frequency', 'alpha');
 $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
-$search_status = GETPOSTINT('search_status');
+$search_status = GETPOST('search_status', 'intcomma');
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 900a3453867..5882cc612b8 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -53,7 +53,7 @@ $search_ref = GETPOSTINT('search_ref');
 $search_label = GETPOST('search_label', 'alpha');
 $search_typeid = GETPOSTINT('search_typeid');
 $search_amount = GETPOST('search_amount', 'alpha');
-$search_status = GETPOSTINT('search_status');
+$search_status = GETPOST('search_status', 'intcomma');
 $search_date_startday = GETPOSTINT('search_date_startday');
 $search_date_startmonth = GETPOSTINT('search_date_startmonth');
 $search_date_startyear = GETPOSTINT('search_date_startyear');
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 9a36f881ae4..d67ac1d12f3 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -60,8 +60,7 @@ $search_datepayment_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datepayment_
 $search_type = GETPOSTINT('search_type');
 $search_account				= GETPOSTINT('search_account');
 $search_amount 				= GETPOST('search_amount', 'alpha');
-$search_status = GETPOSTINT('search_status');
-$ltt = GETPOSTINT("ltt");
+$search_status = GETPOST('search_status', 'intcomma');
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield					= GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index b17ec92127d..e661fb3db4c 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -493,7 +493,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?mainmenu=hrm&amp;action=create', 'New', 1, 'holiday', '$user->hasRight("holiday","write")', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5002__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card_group.php?mainmenu=hrm&amp;action=create', 'NewHolidayForGroup', 1, 'holiday', '$user->hasRight("holiday","write")', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;leftmenu=hrm', 'List', 1, 'holiday', '$user->hasRight("holiday","read")', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;search_statut=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->hasRight("holiday","read")', '', 0, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;search_status=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->hasRight("holiday","read")', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5005__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?mainmenu=hrm', 'MenuConfCP', 1, 'holiday', '$user->hasRight("holiday","define_holiday")', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5006__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/view_log.php?mainmenu=hrm', 'MenuLogCP', 1, 'holiday', '$user->hasRight("holiday","define_holiday")', '', 0, 3, __ENTITY__);
 
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index e1010ce2559..8aa30543b4a 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -61,7 +61,7 @@ if (!$sortorder) {
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ09');
 //Search criteria
-$search_status = (GETPOSTISSET('search_status') ? GETPOSTINT('search_status') : GETPOSTINT('status'));
+$search_status = GETPOST('search_status', 'intcomma');
 $search_label = GETPOST("search_label", 'alpha');
 $search_module_name = GETPOST("search_module_name", 'alpha');
 $search_lastresult = GETPOST("search_lastresult", "alphawithlgt");
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index ff5ca9fa367..d554bcb4927 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -655,7 +655,7 @@ if (!empty($arrayfields['fd.description']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 if (!empty($arrayfields['fd.date']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre center">';
 	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_start ?: -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index f23fc3c07bf..d412fa6d6ee 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -109,8 +109,6 @@ $search_country = GETPOSTINT("search_country");
 $search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
 $search_user = GETPOSTINT('search_user');
 $search_request_author = GETPOST('search_request_author', 'alpha');
-$search_ht = GETPOST('search_ht', 'alpha');
-$search_ttc = GETPOST('search_ttc', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOSTINT('socid');
 $search_sale = GETPOSTINT('search_sale');
@@ -123,7 +121,7 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
 $search_multicurrency_montant_tva = GETPOST('search_multicurrency_montant_tva', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOSTINT('search_billed');
+$search_billed = GETPOST('search_billed', 'intcomma');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index ef7bb7bc175..578d58a0117 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -94,7 +94,7 @@ $search_recurring = GETPOSTINT('search_recurring');
 $search_frequency = GETPOST('search_frequency', 'alpha');
 $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
-$search_status = GETPOSTINT('search_status');
+$search_status = GETPOST('search_status', 'intcomma');
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index bfdd8fdbdad..3aa79940b91 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -83,7 +83,7 @@ $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOSTINT('search_status');
+$search_status = GETPOST('search_status', 'intcomma');	// Can be '' or a numeric
 $search_paymentmode = GETPOSTINT('search_paymentmode');
 $search_paymentcond = GETPOSTINT('search_paymentcond');
 $search_town = GETPOST('search_town', 'alpha');
@@ -103,8 +103,6 @@ $search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
 $search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
-$search_btn = GETPOST('button_search', 'alpha');
-$search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_categ_sup = trim(GETPOSTINT("search_categ_sup"));
 $search_product_category = GETPOSTINT('search_product_category');
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index fb9f7632250..58a073fcad3 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -85,18 +85,18 @@ if (!$sortfield) {
 
 $sall                = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref          = GETPOST('search_ref', 'alphanohtml');
-$search_day_create   = GETPOSTINT('search_day_create');
-$search_month_create = GETPOSTINT('search_month_create');
-$search_year_create  = GETPOSTINT('search_year_create');
-$search_day_start    = GETPOSTINT('search_day_start');
-$search_month_start  = GETPOSTINT('search_month_start');
-$search_year_start   = GETPOSTINT('search_year_start');
-$search_day_end      = GETPOSTINT('search_day_end');
-$search_month_end    = GETPOSTINT('search_month_end');
-$search_year_end     = GETPOSTINT('search_year_end');
+$search_day_create   = GETPOST('search_day_create', 'int');
+$search_month_create = GETPOST('search_month_create', 'int');
+$search_year_create  = GETPOST('search_year_create', 'int');
+$search_day_start    = GETPOST('search_day_start', 'int');
+$search_month_start  = GETPOST('search_month_start', 'int');
+$search_year_start   = GETPOST('search_year_start', 'int');
+$search_day_end      = GETPOST('search_day_end', 'int');
+$search_month_end    = GETPOST('search_month_end', 'int');
+$search_year_end     = GETPOST('search_year_end', 'int');
 $search_employee     = GETPOSTINT('search_employee');
 $search_valideur     = GETPOSTINT('search_valideur');
-$search_status       = GETPOSTISSET('search_status') ? GETPOSTINT('search_status') : GETPOSTINT('search_statut');
+$search_status       = GETPOST('search_status', 'intcomma');
 $search_type         = GETPOSTINT('search_type');
 
 // Initialize technical objects
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 3c0a8154dac..589d1b0d82e 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -246,7 +246,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if (!empty($search_id)) {
-	$param .= '&search_statut='.urlencode($search_statut);
+	$param .= '&search_status='.urlencode($search_status);
 }
 if (!empty($search_month) && $search_month > 0) {
 	$param .= '&search_month='.urlencode($search_month);
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 0c7dea4f3c9..1102c26fa00 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -93,8 +93,8 @@ $search_date_end_from = dol_mktime(0, 0, 0, GETPOSTINT('search_date_end_frommont
 $search_date_end_to = dol_mktime(23, 59, 59, GETPOSTINT('search_date_end_tomonth'), GETPOSTINT('search_date_end_today'), GETPOSTINT('search_date_end_toyear'));
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOSTINT('search_account');
-$search_status = GETPOSTINT('search_status');
-$search_type_id = GETPOSTINT('search_type_id');
+$search_status = GETPOST('search_status', 'intcomma');
+$search_type_id = GETPOST('search_type_id', 'intcomma');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index eaa09a1b157..b2934afcb1a 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -94,7 +94,7 @@ $search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOSTINT('search_status');
+$search_status = GETPOST('search_status', 'intcomma');
 $search_product_category = GETPOSTINT('search_product_category');
 
 $object_statut = $db->escape(GETPOST('supplier_proposal_statut'));
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index e5861cf00bc..e7a12510b73 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -51,13 +51,13 @@ $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
 
-$search_statut = GETPOSTINT('search_statut');
-if ($search_statut == '' || $search_statut == '0') {
-	$search_statut = '1';
+$search_status = GETPOST('search_status', 'intcomma');
+if ($search_status == '' || $search_status == '0') {
+	$search_status = '1';
 }
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
-	$search_statut = "";
+	$search_status = "";
 }
 
 if ($contextpage == 'employeelist') {
@@ -106,7 +106,7 @@ llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', 'bodyfor
 
 
 // Load hierarchy of users
-$user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_statut >= 0) ? "statut = ".$search_statut : '');
+$user_arbo = $userstatic->get_full_tree(0, ($search_status != '' && $search_status >= 0) ? "statut = ".$search_status : '');
 
 
 // Count total nb of records
@@ -169,7 +169,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 
 	//var_dump($data);
 
-	$param = "&search_statut=".urlencode($search_statut);
+	$param = "&search_status=".urlencode($search_status);
 	$param = "&contextpage=".urlencode($contextpage);
 
 	$newcardbutton = '';
@@ -212,7 +212,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Status
 	print '<td class="liste_titre right">';
-	print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
+	print $form->selectarray('search_status', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td>';
 	// Action column
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index b74db885f69..c7793975b0f 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -166,7 +166,7 @@ $search_phonepro = GETPOST('search_phonepro', 'alpha');
 $search_phonemobile = GETPOST('search_phonemobile', 'alpha');
 $search_email = GETPOST('search_email', 'alpha');
 $search_api_key = GETPOST('search_api_key', 'alphanohtml');
-$search_statut = GETPOST('search_statut', 'intcomma');
+$search_status = GETPOST('search_status', 'intcomma');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_job = GETPOST('search_job', 'alpha');
 $search_warehouse = GETPOST('search_warehouse', 'alpha');
@@ -189,8 +189,8 @@ if (!empty($catid) && empty($search_categ)) {
 }
 
 // Default search
-if ($search_statut == '') {
-	$search_statut = '1';
+if ($search_status == '') {
+	$search_status = '1';
 }
 if ($contextpage == 'employeelist' && !GETPOSTISSET('search_employee')) {
 	$search_employee = 1;
@@ -259,7 +259,7 @@ if (empty($reshook)) {
 		$search_phonepro = "";
 		$search_phonemobile = "";
 		$search_email = "";
-		$search_statut = "";
+		$search_status = "";
 		$search_thirdparty = "";
 		$search_job = "";
 		$search_warehouse = "";
@@ -449,8 +449,8 @@ if ($search_api_key != '') {
 if ($search_job != '') {
 	$sql .= natural_search(array('u.job'), $search_job);
 }
-if ($search_statut != '' && $search_statut >= 0) {
-	$sql .= " AND u.statut IN (".$db->sanitize($search_statut).")";
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= " AND u.statut IN (".$db->sanitize($search_status).")";
 }
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
@@ -599,8 +599,8 @@ if ($search_api_key != '') {
 if ($search_supervisor > 0) {
 	$param .= "&amp;search_supervisor=".urlencode($search_supervisor);
 }
-if ($search_statut != '') {
-	$param .= "&amp;search_statut=".urlencode($search_statut);
+if ($search_status != '') {
+	$param .= "&amp;search_status=".urlencode($search_status);
 }
 if ($optioncss != '') {
 	$param .= '&amp;optioncss='.urlencode($optioncss);
@@ -661,9 +661,9 @@ $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
 /*$moreparam = array('morecss'=>'btnTitleSelected');
-$morehtmlright = dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
+$morehtmlright = dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_status != '' && $search_status >= 0) ? '?search_status='.$search_status : ''), '', 1, $moreparam);
 $moreparam = array('morecss'=>'marginleftonly');
-$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
+$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_status != '' && $search_status >= 0) ? '?search_status='.$search_status : ''), '', 1, $moreparam);
 */
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
 
@@ -832,7 +832,7 @@ if (!empty($arrayfields['u.tms']['checked'])) {
 if (!empty($arrayfields['u.statut']['checked'])) {
 	// Status
 	print '<td class="liste_titre center parentonrightofpage">';
-	print $form->selectarray('search_statut', array('-1' => '', '0' => $langs->trans('Disabled'), '1' => $langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_status', array('-1' => '', '0' => $langs->trans('Disabled'), '1' => $langs->trans('Enabled')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column

From 67d637554c65cda6f18078366282433f605648a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 10:55:52 +0100
Subject: [PATCH 0428/1862] Fix regression with GETPOSTINT, not same than
 GETPOST(..., 'int')

---
 htdocs/compta/bank/various_payment/list.php |  4 ++--
 htdocs/compta/deplacement/list.php          |  2 +-
 htdocs/compta/sociales/list.php             |  2 +-
 htdocs/loan/list.php                        |  2 +-
 htdocs/projet/list.php                      | 15 +++++++--------
 htdocs/projet/tasks/list.php                | 19 +++++++++----------
 htdocs/salaries/list.php                    |  2 +-
 htdocs/salaries/payments.php                |  4 ++--
 8 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index ffb7e72bbea..33f9f0154cd 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -43,7 +43,7 @@ $massaction = GETPOST('massaction', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-$search_ref = GETPOSTINT('search_ref');
+$search_ref = GETPOST('search_ref', 'alpha');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_datep_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_startmonth'), GETPOSTINT('search_date_startday'), GETPOSTINT('search_date_startyear'));
@@ -53,7 +53,7 @@ $search_datev_end = dol_mktime(23, 59, 59, GETPOSTINT('search_date_value_endmont
 $search_amount_deb = GETPOST('search_amount_deb', 'alpha');
 $search_amount_cred = GETPOST('search_amount_cred', 'alpha');
 $search_bank_account = GETPOSTINT('search_account');
-$search_bank_entry = GETPOSTINT('search_bank_entry');
+$search_bank_entry = GETPOST('search_bank_entry', 'alpha');
 $search_accountancy_account = GETPOST("search_accountancy_account");
 if ($search_accountancy_account == - 1) {
 	$search_accountancy_account = '';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index a4b9ecad849..c3eac0cb087 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -42,7 +42,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'deplacement', '', '');
 
-$search_ref = GETPOSTINT('search_ref');
+$search_ref = GETPOST('search_ref', 'alpha');
 $search_name = GETPOST('search_name', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 // $search_amount=GETPOST('search_amount','alpha');
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 5882cc612b8..10cc824c9cd 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -49,7 +49,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sc
 $mode = GETPOST('mode', 'alpha');
 
 
-$search_ref = GETPOSTINT('search_ref');
+$search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_typeid = GETPOSTINT('search_typeid');
 $search_amount = GETPOST('search_amount', 'alpha');
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 50f9b572833..5fad24be651 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -97,7 +97,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$search_ref = GETPOSTINT('search_ref');
+$search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 04463dc292f..aa1d3218a22 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -102,16 +102,16 @@ $search_opp_status = GETPOST("search_opp_status", 'alpha');
 $search_opp_percent = GETPOST("search_opp_percent", 'alpha');
 $search_opp_amount = GETPOST("search_opp_amount", 'alpha');
 $search_budget_amount = GETPOST("search_budget_amount", 'alpha');
-$search_public = GETPOSTINT("search_public");
+$search_public = GETPOST("search_public", 'intcomma');
 $search_project_user = GETPOSTINT('search_project_user');
 $search_project_contact = GETPOSTINT('search_project_contact');
 $search_sale = GETPOSTINT('search_sale');
-$search_usage_opportunity = GETPOSTINT('search_usage_opportunity');
-$search_usage_task = GETPOSTINT('search_usage_task');
-$search_usage_bill_time = GETPOSTINT('search_usage_bill_time');
-$search_usage_event_organization = GETPOSTINT('search_usage_event_organization');
-$search_accept_conference_suggestions = GETPOSTINT('search_accept_conference_suggestions');
-$search_accept_booth_suggestions = GETPOSTINT('search_accept_booth_suggestions');
+$search_usage_opportunity = GETPOST('search_usage_opportunity', 'intcomma');
+$search_usage_task = GETPOST('search_usage_task', 'intcomma');
+$search_usage_bill_time = GETPOST('search_usage_bill_time', 'intcomma');
+$search_usage_event_organization = GETPOST('search_usage_event_organization', 'intcomma');
+$search_accept_conference_suggestions = GETPOST('search_accept_conference_suggestions', 'intcomma');
+$search_accept_booth_suggestions = GETPOST('search_accept_booth_suggestions', 'intcomma');
 $search_price_registration = GETPOST("search_price_registration", 'alpha');
 $search_price_booth = GETPOST("search_price_booth", 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
@@ -2041,7 +2041,6 @@ while ($i < $imaxinloop) {
 
 		print '</tr>'."\n";
 	}
-	//}
 
 	$i++;
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index e47933d0efe..714371b8d44 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -49,16 +49,7 @@ $id = GETPOSTINT('id');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_categ = GETPOSTINT("search_categ");
-
-$search_projectstatus = GETPOST('search_projectstatus');
-if (!isset($search_projectstatus) || $search_projectstatus === '') {
-	if ($search_all != '') {
-		$search_projectstatus = -1;
-	} else {
-		$search_projectstatus = 1;
-	}
-}
-
+$search_projectstatus = GETPOST('search_projectstatus', 'intcomma');
 $search_project_ref = GETPOST('search_project_ref');
 $search_project_title = GETPOST('search_project_title');
 $search_task_ref = GETPOST('search_task_ref');
@@ -80,6 +71,14 @@ if (GETPOSTISSET('formfilteraction')) {
 }
 $searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
 
+if (!isset($search_projectstatus) || $search_projectstatus === '') {
+	if ($search_all != '') {
+		$search_projectstatus = -1;
+	} else {
+		$search_projectstatus = 1;
+	}
+}
+
 $mine = GETPOST('mode', 'alpha') == 'mine' ? 1 : 0;
 if ($mine) {
 	$search_task_user = $user->id;
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 1102c26fa00..aa8e62caf52 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -84,7 +84,7 @@ if (!$sortorder) {
 	$sortorder = "DESC,DESC";
 }
 
-$search_ref = GETPOSTINT('search_ref');
+$search_ref = GETPOST('search_ref', 'alpha');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_date_start_from = dol_mktime(0, 0, 0, GETPOSTINT('search_date_start_frommonth'), GETPOSTINT('search_date_start_fromday'), GETPOSTINT('search_date_start_fromyear'));
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 3921451d174..a2e98275e2c 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -85,8 +85,8 @@ if (!$sortorder) {
 	$sortorder = "DESC,DESC";
 }
 
-$search_ref = GETPOSTINT('search_ref');
-$search_ref_salary = GETPOSTINT('search_ref_salary');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_ref_salary = GETPOST('search_ref_salary', 'alpha');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_date_start = dol_mktime(0, 0, 0, GETPOSTINT('search_date_startmonth'), GETPOSTINT('search_date_startday'), GETPOSTINT('search_date_startyear'));

From 0f295fb09d86fce60381dfd0fc100506e25c7ccc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 11:00:21 +0100
Subject: [PATCH 0429/1862] Fix regression with GETPOSTINT, not same than
 GETPOST(..., 'int')

---
 htdocs/compta/facture/list.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 812fd700513..1a82e95d19d 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -63,8 +63,7 @@ if (isModEnabled('order')) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'products', 'categories'));
 
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 $id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
@@ -83,12 +82,11 @@ if ($contextpage == 'poslist') {
 	$optioncss = 'print';
 }
 
-$lineid = GETPOSTINT('lineid');
 $userid = GETPOSTINT('userid');
 $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
-$search_type = GETPOSTINT('search_type');
-$search_subtype = GETPOSTINT('search_subtype');
+$search_type = GETPOST('search_type', 'intcomma');
+$search_subtype = GETPOST('search_subtype', 'intcomma');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
@@ -152,7 +150,6 @@ $search_late = GETPOST('search_late');
 if ($search_late == 'late') {
 	$search_status = '1';
 }
-$filtre = GETPOST('filtre', 'alpha');
 
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -628,7 +625,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT';
-if ($sall || $search_user > 0) {
+if ($search_all || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
 $sql .= ' f.rowid as id, f.ref, f.ref_client, f.fk_soc, f.type, f.subtype, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total_ht, f.total_tva, f.total_ttc,';
@@ -650,9 +647,9 @@ $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0).
 // A Better solution to be able to sort on already paid or remain to pay is to store amount_payed in a denormalized field.
-// We disable this. It create a bug when searching with sall and sorting on status. Also it create performance troubles.
+// We disable this. It create a bug when searching with search_all and sorting on status. Also it create performance troubles.
 /*
-if (!$sall) {
+if (!$search_all) {
 	$sql .= ', SUM(pf.amount) as dynamount_payed, SUM(pf.multicurrency_amount) as multicurrency_dynamount_payed';
 }
 */
@@ -682,7 +679,7 @@ if ($sortfield == "f.datef") {
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 }
-if ($sall) {
+if ($search_all) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid = pd.fk_facture';
 }
 if (!empty($search_fac_rec_source_title)) {
@@ -947,8 +944,8 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
 // Add HAVING from hooks
@@ -994,7 +991,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->id;
 
@@ -1017,8 +1014,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-if ($sall) {
-	$param .= '&sall='.urlencode($sall);
+if ($search_all) {
+	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_date_startday) {
 	$param .= '&search_date_startday='.urlencode($search_date_startday);
@@ -1276,11 +1273,11 @@ if ($massaction == 'makepayment') {
 	print $formconfirm;
 }
 
-if ($sall) {
+if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).implode(', ', $fieldstosearchall).'</div>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 }
 
 // If the user can view prospects other than his'

From fa0f5650ddb71a6dbd8454cb8d4a1f99a590b652 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 12:22:45 +0100
Subject: [PATCH 0430/1862] Comment

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

diff --git a/SECURITY.md b/SECURITY.md
index 758abfc6fb4..0cc37b96ce6 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,7 +11,9 @@ Security report are valid only on current stable version (see https://dolibarr.o
 To report a vulnerability, for a private report, you can:
 
 - Send your report on Vulnerability Disclosure Program (VDP) [https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US](https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US) (recommended for everybody)
+<!--
 - Or if you have permissions, use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new)
+-->
 - Or send an email to security@dolibarr.org with clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
 
 ## Hunting vulnerabilities on Dolibarr

From 583480edbe7b10417cea543d96adc6e7c2e2e52b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 14:02:49 +0100
Subject: [PATCH 0431/1862] FIX permission on payment file of a tax

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 769c9a7e7df..b4b64f07c48 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -888,7 +888,10 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$feature = 'agenda';
 			$dbtablename = 'actioncomm';
 		}
-		if ($feature == 'payment_sc') {
+		if ($feature == 'payment_sc' && empty($parenttableforentity)) {
+			// If we check perm on payment page but $parenttableforentity not defined, we force value on parent table
+			$parenttableforentity = '';
+			$dbtablename = "chargesociales";
 			$feature = "chargesociales";
 			$objectid = $object->fk_charge;
 		}
@@ -896,7 +899,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		$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', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'payment_sc', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for object Societe
 		$checkparentsoc = array('agenda', 'contact', 'contrat'); // 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

From e82c6af5bcc7dad4c68d4d11e57965e56c653844 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 14:02:49 +0100
Subject: [PATCH 0432/1862] FIX permission on payment file of a tax

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7eb552fac92..32a53dde33d 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -889,7 +889,10 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$feature = 'agenda';
 			$dbtablename = 'actioncomm';
 		}
-		if ($feature == 'payment_sc') {
+		if ($feature == 'payment_sc' && empty($parenttableforentity)) {
+			// If we check perm on payment page but $parenttableforentity not defined, we force value on parent table
+			$parenttableforentity = '';
+			$dbtablename = "chargesociales";
 			$feature = "chargesociales";
 			$objectid = $object->fk_charge;
 		}
@@ -897,7 +900,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		$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', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'payment_sc', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for object Societe
 		$checkparentsoc = array('agenda', 'contact', 'contrat'); // 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

From 0c86f6456590a5a1eb72eb21f001141c082f1006 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 14:02:49 +0100
Subject: [PATCH 0433/1862] FIX permission on payment file of a tax

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 2f4d4fe2f83..7cd07b3edcd 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -884,7 +884,10 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$feature = 'agenda';
 			$dbtablename = 'actioncomm';
 		}
-		if ($feature == 'payment_sc') {
+		if ($feature == 'payment_sc' && empty($parenttableforentity)) {
+			// If we check perm on payment page but $parenttableforentity not defined, we force value on parent table
+			$parenttableforentity = '';
+			$dbtablename = "chargesociales";
 			$feature = "chargesociales";
 			$objectid = $object->fk_charge;
 		}
@@ -892,7 +895,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		$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', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'payment_sc', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website', 'recruitment', 'chargesociales'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for object Societe
 		$checkparentsoc = array('agenda', 'contact', 'contrat'); // 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

From db7a62f644ffcb1068535b2f56d5a6a5c10bd4aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 14:46:33 +0100
Subject: [PATCH 0434/1862] FIX fatal error Unsupported operand types when
 recording load payment

---
 htdocs/loan/payment/payment.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 6a136f8ba2e..d65f48665a3 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -114,16 +114,16 @@ if ($action == 'add_payment') {
 	if (!$error) {
 		$paymentid = 0;
 
-		$pay_amount_capital = price2num(GETPOST('amount_capital'));
-		$pay_amount_insurance = price2num(GETPOST('amount_insurance'));
+		$pay_amount_capital = (float) price2num(GETPOST('amount_capital'));
+		$pay_amount_insurance = (float) price2num(GETPOST('amount_insurance'));
 		// User can't set interest him self if schedule is set (else value in schedule can be incoherent)
 		if (!empty($line)) {
 			$pay_amount_interest = $line->amount_interest;
 		} else {
-			$pay_amount_interest = price2num(GETPOST('amount_interest'));
+			$pay_amount_interest = (float) price2num(GETPOST('amount_interest'));
 		}
-		$remaindertopay = price2num(GETPOST('remaindertopay'));
-		$amount = $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
+		$remaindertopay = (float) price2num(GETPOST('remaindertopay'));
+		$amount = (float) price2num($pay_amount_capital + $pay_amount_insurance + $pay_amount_interest, 'MT');
 
 		// This term is allready paid
 		if (!empty($line) && !empty($line->fk_bank)) {

From 61dd78b95e1eccf94e44c7404efbf34ce9b16762 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 17:49:43 +0100
Subject: [PATCH 0435/1862] Fix regression. Removed bad fixer. GETPOST(... int)
 is not GETPOSTINT

---
 dev/tools/phan/plugins/GetPostFixerPlugin.php |  98 --------------
 .../plugins/GetPostFixerPlugin/fixers.php     | 123 ------------------
 htdocs/core/lib/functions.lib.php             |   1 -
 3 files changed, 222 deletions(-)
 delete mode 100644 dev/tools/phan/plugins/GetPostFixerPlugin.php
 delete mode 100644 dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php

diff --git a/dev/tools/phan/plugins/GetPostFixerPlugin.php b/dev/tools/phan/plugins/GetPostFixerPlugin.php
deleted file mode 100644
index 4953bf34943..00000000000
--- a/dev/tools/phan/plugins/GetPostFixerPlugin.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- */
-
-use ast\Node;
-use Phan\CodeBase;
-use Phan\Language\Context;
-use Phan\AST\UnionTypeVisitor;
-//use Phan\Language\Element\FunctionInterface;
-use Phan\Language\UnionType;
-use Phan\Language\Type;
-use Phan\PluginV3;
-use Phan\PluginV3\AnalyzeFunctionCallCapability;
-use Phan\Language\Element\FunctionInterface;
-use Phan\Config;
-
-/*
- *    'GetPostFixerPlugin' => [ '\\Foo::bar', '\\Baz::bing' ],
- *    'plugins' => [
- *    	__DIR__.'plugins/GetPostFixerPlugin.php',
- *    	[...]
- *    ]
- */
-
-/**
- * Prints out call sites of given functions or methods.
- */
-final class GetPostFixerPlugin extends PluginV3 implements AnalyzeFunctionCallCapability
-{
-	/**
-	 * @param CodeBase $code_base Code base
-	 *
-	 * @return array
-	 */
-	public function getAnalyzeFunctionCallClosures(CodeBase $code_base): array
-	{
-		static $function_call_closures;
-
-		if ($function_call_closures === null) {
-			$function_call_closures = [];
-			$self = $this;
-			$func = 'GETPOST';
-			$function_call_closures[$func]
-				= static function (CodeBase $code_base, Context $context, FunctionInterface $function, array $args, ?Node $node = null) use ($self, $func) {
-					self::handleCall($code_base, $context, $node, $function, $args, $func, $self);
-				};
-		}
-		return $function_call_closures;
-	}
-
-	/**
-	 * @param CodeBase $code_base  Code base
-	 * @param Context $context Context
-	 * @param ?Node $node Node
-	 * @param FunctionInterface $function  Visited function information
-	 * @param array $args Arguments to the function
-	 * @param string $func_to_analyze Name of the function to analyze (as we defined it)
-	 * @param GetPostFixerPlugin $self This visitor
-	 *
-	 * @return void
-	 */
-	private static function handleCall(CodeBase $code_base, Context $context, ?Node $node, FunctionInterface $function, array $args, string $func_to_analyze, $self): void
-	{
-		$expr = $args[1] ?? null;
-		if ($expr === null) {
-			return;
-		}
-		try {
-			$expr_type = UnionTypeVisitor::unionTypeFromNode($code_base, $context, $expr, false);
-		} catch (Exception $_) {
-			return;
-		}
-
-		$expr_value = $expr_type->getRealUnionType()->asValueOrNullOrSelf();
-		if (!is_string($expr_value)) {
-			return;
-		}
-		if ($expr_value !== 'int') {
-			return;
-		}
-
-		$self->emitIssue(
-			$code_base,
-			$context,
-			'GetPostShouldBeGetPostInt',
-			'Convert {FUNCTION} to {FUNCTION}',
-			[(string) $function->getFQSEN(), "GETPOSTINT"]
-		);
-	}
-}
-
-if (Config::isIssueFixingPluginEnabled()) {
-	require_once __DIR__ . '/GetPostFixerPlugin/fixers.php';
-}
-
-return new GetPostFixerPlugin();
diff --git a/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php b/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
deleted file mode 100644
index a20c92a448e..00000000000
--- a/dev/tools/phan/plugins/GetPostFixerPlugin/fixers.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- */
-
-declare(strict_types=1);
-
-use Microsoft\PhpParser\Node\Expression\CallExpression;
-use Microsoft\PhpParser\Node\QualifiedName;
-use Phan\AST\TolerantASTConverter\NodeUtils;
-use Phan\CodeBase;
-use Phan\IssueInstance;
-use Phan\Library\FileCacheEntry;
-use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
-use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
-use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
-use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
-use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
-use Microsoft\PhpParser\Node\StringLiteral;
-
-/**
- * Implements --automatic-fix for GetPostFixerPlugin
- *
- * This is a prototype, there are various features it does not implement.
- */
-
-call_user_func(static function (): void {
-	/**
-	 * @param $code_base @unused-param
-	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
-	 */
-	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
-		$line = $instance->getLine();
-		$new_name = (string) $instance->getTemplateParameters()[1];
-		if ($new_name !== "GETPOSTINT") {
-			return null;
-		}
-
-		$function_repr = (string) $instance->getTemplateParameters()[0];
-		if (!preg_match('{\\\\(\w+)}', $function_repr, $match)) {
-			return null;
-		}
-		$expected_name = $match[1];
-		$edits = [];
-		foreach ($contents->getNodesAtLine($line) as $node) {
-			if (!$node instanceof ArgumentExpressionList) {
-				continue;
-			}
-			$arguments = $node->children;
-			if (!in_array(count($arguments), [3, 5])) {  // ',' included !
-				print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
-				continue;
-			}
-
-			$is_actual_call = $node->parent instanceof CallExpression;
-			if (!$is_actual_call) {
-				print "Not actual call - Skip $instance".PHP_EOL;
-				continue;
-			}
-			$callable = $node->parent;
-
-			$callableExpression = $callable->callableExpression;
-
-			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
-				$actual_name = $callableExpression->getResolvedName();
-			} else {
-				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
-				continue;
-			}
-
-			if ((string) $actual_name !== (string) $expected_name) {
-				print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
-				continue;
-			}
-
-			foreach ($arguments as $i => $argument) {
-				print "Type$i: ".get_class($argument).PHP_EOL;
-			}
-
-			$arg2 = $arguments[2];
-
-			if ($arg2 instanceof ArgumentExpression && $arg2->expression instanceof StringLiteral) {
-				// Get the string value of the StringLiteral
-				$stringValue = $arg2->expression->getStringContentsText();
-			} else {
-				print "Expression is not string ".get_class($arg2)."/".get_class($arg2->expression)."- Skip $instance".PHP_EOL;
-				continue;
-			}
-			print "Fixture elem on $line - $new_name - $function_repr - arg: $stringValue".PHP_EOL;
-
-			// Get the first argument (delimiter)
-			$delimiter = $arguments[1];
-			// Get the second argument
-			$secondArgument = $arguments[2];
-
-			// Get the start position of the delimiter
-			$arg_start_pos = $delimiter->getStartPosition();
-
-			// Get the end position of the second argument
-			$arg_end_pos = $secondArgument->getEndPosition();
-
-
-
-			// @phan-suppress-next-line PhanThrowTypeAbsentForCall
-			$start = $callableExpression->getStartPosition();
-			// @phan-suppress-next-line PhanThrowTypeAbsentForCall
-			$end = $callableExpression->getEndPosition();
-
-			// Remove second argument
-			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, "");
-
-			// Replace call with GETPOSTINT
-			$edits[] = new FileEdit($start, $end, (($file_contents[$start] ?? '') === '\\' ? '\\' : '') . $new_name);
-		}
-		if ($edits) {
-			return new FileEditSet($edits);
-		}
-		return null;
-	};
-	IssueFixer::registerFixerClosure(
-		'GetPostShouldBeGetPostInt',
-		$fix
-	);
-});
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c0c257ecbab..a65603ce58f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -998,7 +998,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
  */
 function GETPOSTINT($paramname, $method = 0)
 {
-	// @phan-suppress-next-line GetPostShouldBeGetPostInt
 	return (int) GETPOST($paramname, 'int', $method, null, null, 0);
 }
 

From 29d87ec14a8a5c2a3db6a0f4e497200565e5e375 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Mon, 4 Mar 2024 17:58:21 +0100
Subject: [PATCH 0436/1862] Fixed lastresult type (#28628)

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

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index c362ffbf427..3f1b42aa5c2 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -1454,7 +1454,7 @@ class Utils
 				$job->pid = null;
 
 				// Set last result as an error and add the reason on the last output
-				$job->lastresult = -1;
+				$job->lastresult = strval(-1);
 				$job->lastoutput = 'Job killed by job cleanUnfinishedCronjob';
 
 				if ($job->update($user) < 0) {

From a0444ef55d379a633554dfd32f1d914e2df07abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 17:58:43 +0100
Subject: [PATCH 0437/1862] fix can't delete pdf if ref is not encoded (#28630)

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ea9b87b1de6..c156eccb5f3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4477,7 +4477,7 @@ if ($action == 'create') {
 		$file = GETPOST('file', 'alpha');
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"].'?facid='.$object->id.'&file='.$file,
+			$_SERVER["PHP_SELF"].'?facid='.$object->id.'&file='.urlencode($file),
 			$langs->trans('DeleteFileHeader'),
 			$langs->trans('DeleteFileText')."<br><br>".$file,
 			'remove_file',

From 21688a00ddc107abe4642d79c76c05ecabd6527d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:00:31 +0100
Subject: [PATCH 0438/1862] Update bookcalindex.php (#28615)

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

diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php
index 018a6914676..07f23ae6c20 100644
--- a/htdocs/bookcal/bookcalindex.php
+++ b/htdocs/bookcal/bookcalindex.php
@@ -64,7 +64,7 @@ $formfile = new FormFile($db);
 
 llxHeader("", $langs->trans("BookCalArea"));
 
-print load_fiche_titre($langs->trans("BookCalArea"), '', 'bookcal.png@bookcal');
+print load_fiche_titre($langs->trans("BookCalArea"), '', 'agenda');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 

From 723b1b06e702c2b5f3db2ff52b431910ad4fa50d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 18:06:55 +0100
Subject: [PATCH 0439/1862] Debug v20

---
 htdocs/bookcal/bookcalindex.php               |   2 +-
 htdocs/bookcal/class/availabilities.class.php |   2 +-
 htdocs/bookcal/class/calendar.class.php       |   2 +-
 htdocs/core/modules/modAi.class.php           | 151 +-----------------
 4 files changed, 6 insertions(+), 151 deletions(-)

diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php
index 07f23ae6c20..c54181584d0 100644
--- a/htdocs/bookcal/bookcalindex.php
+++ b/htdocs/bookcal/bookcalindex.php
@@ -64,7 +64,7 @@ $formfile = new FormFile($db);
 
 llxHeader("", $langs->trans("BookCalArea"));
 
-print load_fiche_titre($langs->trans("BookCalArea"), '', 'agenda');
+print load_fiche_titre($langs->trans("BookCalArea"), '', 'fa-calendar-check');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index a839ae3e52c..e06d0244f01 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -62,7 +62,7 @@ class Availabilities extends CommonObject
 	/**
 	 * @var string String with name of icon for availabilities. Must be a 'fa-xxx' fontawesome code (or 'fa-xxx_fa_color_size') or 'availabilities@bookcal' if picto is file 'img/object_availabilities.png'.
 	 */
-	public $picto = 'fa-file';
+	public $picto = 'fa-calendar-check';
 
 
 	const STATUS_DRAFT = 0;
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index eec383501db..a4a59c6d48c 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -62,7 +62,7 @@ class Calendar extends CommonObject
 	/**
 	 * @var string String with name of icon for calendar. Must be a 'fa-xxx' fontawesome code (or 'fa-xxx_fa_color_size') or 'calendar@bookcal' if picto is file 'img/object_calendar.png'.
 	 */
-	public $picto = 'fa-file';
+	public $picto = 'fa-calendar-check';
 
 
 	const STATUS_DRAFT = 0;
diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php
index bd243070ec2..44d06ce83a4 100644
--- a/htdocs/core/modules/modAi.class.php
+++ b/htdocs/core/modules/modAi.class.php
@@ -259,37 +259,6 @@ class modAi extends DolibarrModules
 		$r = 0;
 		// Add here entries to declare new permissions
 		/* BEGIN MODULEBUILDER PERMISSIONS */
-		$this->rights[$r][0] = $this->numero . sprintf('%02d', (0 * 10) + 1);
-		$this->rights[$r][1] = 'Read objects of Ai';
-		$this->rights[$r][4] = 'availabilities';
-		$this->rights[$r][5] = 'read';
-		$r++;
-		$this->rights[$r][0] = $this->numero . sprintf('%02d', (0 * 10) + 2);
-		$this->rights[$r][1] = 'Create/Update objects of Ai';
-		$this->rights[$r][4] = 'availabilities';
-		$this->rights[$r][5] = 'write';
-		$r++;
-		$this->rights[$r][0] = $this->numero . sprintf('%02d', (0 * 10) + 3);
-		$this->rights[$r][1] = 'Delete objects of Ai';
-		$this->rights[$r][4] = 'availabilities';
-		$this->rights[$r][5] = 'delete';
-		$r++;
-		$this->rights[$r][0] = $this->numero . sprintf('%02d', (1 * 10) + 1);
-		$this->rights[$r][1] = 'Read Calendar object of Ai';
-		$this->rights[$r][4] = 'calendar';
-		$this->rights[$r][5] = 'read';
-		$r++;
-		$this->rights[$r][0] = $this->numero . sprintf('%02d', (1 * 10) + 2);
-		$this->rights[$r][1] = 'Create/Update Calendar object of Ai';
-		$this->rights[$r][4] = 'calendar';
-		$this->rights[$r][5] = 'write';
-		$r++;
-		$this->rights[$r][0] = $this->numero . sprintf('%02d', (1 * 10) + 3);
-		$this->rights[$r][1] = 'Delete Calendar object of Ai';
-		$this->rights[$r][4] = 'calendar';
-		$this->rights[$r][5] = 'delete';
-		$r++;
-
 		/* END MODULEBUILDER PERMISSIONS */
 
 		// Main menu entries to add
@@ -297,128 +266,14 @@ class modAi extends DolibarrModules
 		$r = 0;
 		// Add here entries to declare new menus
 		/* BEGIN MODULEBUILDER TOPMENU */
-		/*$this->menu[$r++] = array(
-			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'top', // This is a Top menu entry
-			'titre'=>'ModuleAiName',
-			'prefix' => img_picto('', $this->picto, 'class="pictofixedwidth valignmiddle"'),
-			'mainmenu'=>'ai',
-			'leftmenu'=>'',
-			'url'=>'/ai/aiindex.php',
-			'langs'=>'ai', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->ai->enabled', // Define condition to show or hide menu entry. Use '$conf->ai->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->ai->availabilities->read', // Use 'perms'=>'$user->rights->ai->availabilities->read' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
-		);*/
 		/* END MODULEBUILDER TOPMENU */
 
-		/* BEGIN MODULEBUILDER LEFTMENU CALENDAR */
-		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=agenda',
-			'type'=>'left',
-			'titre'=> 'MenuBookcalIndex',
-			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em92"'),
-			'mainmenu'=>'agenda',
-			'leftmenu'=> 'ai',
-			'url'=> '/ai/aiindex.php',
-			'langs'=> 'ai',
-			'position'=> 1100+$r,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->ai->read',
-			'user'=> 0
-		);
-
-		$this->menu[$r++]=array(
-			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=ai',
-			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'Calendar',
-			'mainmenu'=>'agenda',
-			'leftmenu'=>'ai_list',
-			'url'=>'/ai/list.php',
-			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'ai',
-			'position'=>1100+$r,
-			// Define condition to show or hide menu entry. Use '$conf->ai->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->ai->enabled',
-			// Use 'perms'=>'$user->rights->ai->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->ai->read',
-			'target'=>'',
-			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2,
-		);
-		$this->menu[$r++]=array(
-			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=ai_list',
-			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'NewKey',
-			'mainmenu'=>'agenda',
-			'leftmenu'=>'ai_new_key',
-			'url'=>'/ai/ai_card.php?action=create',
-			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'ai',
-			'position'=>1100+$r,
-			// Define condition to show or hide menu entry. Use '$conf->ai->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->ai->enabled',
-			// Use 'perms'=>'$user->rights->ai->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->ai->read',
-			'target'=>'',
-			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2
-		);
-		/* END MODULEBUILDER LEFTMENU CALENDAR */
+		/* BEGIN MODULEBUILDER LEFTMENU AI */
+		/* END MODULEBUILDER LEFTMENU AI */
 
 		/* BEGIN MODULEBUILDER LEFTMENU AVAILABILITIES
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=ai',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',                          // This is a Left menu entry
-			'titre'=>'Availabilities',
-			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
-			'mainmenu'=>'ai',
-			'leftmenu'=>'availabilities',
-			'url'=>'/ai/aiindex.php',
-			'langs'=>'ai@ai',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->ai->enabled',  // Define condition to show or hide menu entry. Use '$conf->ai->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->ai->availabilities->read',			                // Use 'perms'=>'$user->rights->ai->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=ai,fk_leftmenu=availabilities',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'List_Availabilities',
-			'mainmenu'=>'ai',
-			'leftmenu'=>'ai_availabilities_list',
-			'url'=>'/ai/availabilities_list.php',
-			'langs'=>'ai@ai',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->ai->enabled',  // Define condition to show or hide menu entry. Use '$conf->ai->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->ai->availabilities->read',			                // Use 'perms'=>'$user->rights->ai->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=ai,fk_leftmenu=availabilities',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'New_Availabilities',
-			'mainmenu'=>'ai',
-			'leftmenu'=>'ai_availabilities_new',
-			'url'=>'/ai/availabilities_card.php?action=create',
-			'langs'=>'ai@ai',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->ai->enabled',  // Define condition to show or hide menu entry. Use '$conf->ai->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->ai->availabilities->write',			                // Use 'perms'=>'$user->rights->ai->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-		);
-		*/
-
 		/* END MODULEBUILDER LEFTMENU AVAILABILITIES */
+
 		// Exports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT AVAILABILITIES */

From f103278bb4bd6680a2a500d32dc75d783cb27af4 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Mon, 4 Mar 2024 18:08:07 +0100
Subject: [PATCH 0440/1862] Qual phpstan cron card (#28626)

* Fixed unitfrequency type. Fixed localization.

* Cleaned code & comments. Added contributor details.
---
 htdocs/cron/card.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 17fce5f159d..68dbac1b3e7 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concpt.pro>
  * Copyright (C) 2013-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.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
@@ -29,7 +30,7 @@ require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-// librairie jobs
+// Cron job libraries
 require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.formcron.class.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php';
@@ -73,11 +74,10 @@ if (!empty($cancel)) {
 	} else {
 		if ($backtopage) {
 			header("Location: ".$backtopage);
-			exit;
 		} else {
 			header("Location: ".DOL_URL_ROOT.'/cron/list.php');
-			exit;
 		}
+		exit;
 	}
 }
 
@@ -98,7 +98,6 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontodelete) {
 if ($action == 'confirm_execute' && $confirm == "yes" && $permissiontoexecute) {
 	if (getDolGlobalString('CRON_KEY') && $conf->global->CRON_KEY != $securitykey) {
 		setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-		$action = '';
 	} else {
 		$now = dol_now(); // Date we start
 
@@ -106,7 +105,6 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $permissiontoexecute) {
 
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action = '';
 		} else {
 			$res = $object->reprogram_jobs($user->login, $now);
 			if ($res > 0) {
@@ -115,13 +113,12 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $permissiontoexecute) {
 				} else {
 					setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
 				}
-				$action = '';
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
-				$action = '';
 			}
 		}
 	}
+	$action = '';
 }
 
 
@@ -140,7 +137,7 @@ if ($action == 'add' && $permissiontoadd) {
 	$object->dateend = dol_mktime(GETPOSTINT('dateendhour'), GETPOSTINT('dateendmin'), 0, GETPOSTINT('dateendmonth'), GETPOSTINT('dateendday'), GETPOSTINT('dateendyear'));
 	$object->priority = GETPOSTINT('priority');
 	$object->datenextrun = dol_mktime(GETPOSTINT('datenextrunhour'), GETPOSTINT('datenextrunmin'), 0, GETPOSTINT('datenextrunmonth'), GETPOSTINT('datenextrunday'), GETPOSTINT('datenextrunyear'));
-	$object->unitfrequency = GETPOSTINT('unitfrequency');
+	$object->unitfrequency = GETPOST('unitfrequency', 'alpha');
 	$object->frequency = GETPOSTINT('nbfrequency');
 	$object->maxrun = GETPOSTINT('maxrun');
 	$object->email_alert = GETPOST('email_alert');
@@ -150,7 +147,7 @@ if ($action == 'add' && $permissiontoadd) {
 	// Add cron task
 	$result = $object->create($user);
 
-	// test du Resultat de la requete
+	// Test request result
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'create';
@@ -177,7 +174,7 @@ if ($action == 'update' && $permissiontoadd) {
 	$object->dateend = dol_mktime(GETPOSTINT('dateendhour'), GETPOSTINT('dateendmin'), 0, GETPOSTINT('dateendmonth'), GETPOSTINT('dateendday'), GETPOSTINT('dateendyear'));
 	$object->priority = GETPOSTINT('priority');
 	$object->datenextrun = dol_mktime(GETPOSTINT('datenextrunhour'), GETPOSTINT('datenextrunmin'), 0, GETPOSTINT('datenextrunmonth'), GETPOSTINT('datenextrunday'), GETPOSTINT('datenextrunyear'));
-	$object->unitfrequency = GETPOSTINT('unitfrequency');
+	$object->unitfrequency = GETPOST('unitfrequency', 'alpha');
 	$object->frequency = GETPOSTINT('nbfrequency');
 	$object->maxrun = GETPOSTINT('maxrun');
 	$object->email_alert = GETPOST('email_alert');
@@ -185,7 +182,7 @@ if ($action == 'update' && $permissiontoadd) {
 	// Add cron task
 	$result = $object->update($user);
 
-	// test du Resultat de la requete
+	// Test request result
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
@@ -201,7 +198,7 @@ if ($action == 'activate' && $permissiontoadd) {
 	// Add cron task
 	$result = $object->update($user);
 
-	// test du Resultat de la requete
+	// Test request result
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
@@ -218,7 +215,7 @@ if ($action == 'inactive' && $permissiontoadd) {
 	// Add cron task
 	$result = $object->update($user);
 
-	// test du Resultat de la requete
+	// Test request result
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
@@ -679,7 +676,7 @@ if (($action == "create") || ($action == "edit")) {
 		print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks');
 	}
 	if ($object->unitfrequency == "2678400") {
-		print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Month');
+		print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Months');
 	}
 	print "</td></tr>";
 

From cf7f40b739e8b5da4e31243456744c09d66735b8 Mon Sep 17 00:00:00 2001
From: thomas-Ngr <tnegre@open-dsi.fr>
Date: Mon, 4 Mar 2024 18:11:50 +0100
Subject: [PATCH 0441/1862] new fetch() for classes Fournisseur and Client
 (#28621)

* New : introduce Fournisseur::fetch() and Client::fetch(). Add new parameters  and  to Societe::fetch()

* societe::fetch: both is_client and is_fournisseur false by default

* Simplify code
---
 htdocs/fourn/class/fournisseur.class.php | 23 +++++++++++++++++++++
 htdocs/societe/class/client.class.php    | 26 ++++++++++++++++++++++++
 htdocs/societe/class/societe.class.php   | 13 +++++++++++-
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index cf3263ec3df..4ee18163e16 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -49,6 +49,29 @@ class Fournisseur extends Societe
 		$this->fournisseur = 1;
 	}
 
+	/**
+	 *    Load a third party from database into memory
+	 *
+	 *    @param	int		$rowid			Id of third party to load
+	 *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
+	 *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
+	 *    @param    string	$barcode       	Barcode of third party to load
+	 *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
+	 *    @param    string	$email   		Email of third party (Warning, this can return several records)
+	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
+	 * 	  @param	bool	$is_client		Is the thirdparty a client ?
+	 *    @param	bool	$is_supplier	Is the thirdparty a supplier ?
+	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
+	 */
+	public function fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '', $is_client = false, $is_supplier = true)
+	{
+		return parent::fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias, $is_client, $is_supplier);
+	}
 
 	/**
 	 * Return nb of orders
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 67b3bef8ee8..b1fad2a4be8 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -48,6 +48,32 @@ class Client extends Societe
 		$this->fournisseur = 0;
 	}
 
+
+	/**
+	 *    Load a third party from database into memory
+	 *
+	 *    @param	int		$rowid			Id of third party to load
+	 *    @param    string	$ref			Reference of third party, name (Warning, this can return several records)
+	 *    @param    string	$ref_ext       	External reference of third party (Warning, this information is a free field not provided by Dolibarr)
+	 *    @param    string	$barcode       	Barcode of third party to load
+	 *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof5		Prof id 5 of third party (Warning, this can return several records)
+	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
+	 *    @param    string	$email   		Email of third party (Warning, this can return several records)
+	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
+	 * 	  @param	bool	$is_client		Is the thirdparty a client ?
+	 *    @param	bool	$is_supplier	Is the thirdparty a supplier ?
+	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
+	 */
+	public function fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '', $is_client = true, $is_supplier = false)
+	{
+		return parent::fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias, $is_client, $is_supplier);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load indicators into this->nb for board
 	 *
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 73b871bc7f0..9dd643d37ed 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1797,9 +1797,11 @@ class Societe extends CommonObject
 	 *    @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
 	 *    @param    string	$email   		Email of third party (Warning, this can return several records)
 	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
+	 * 	  @param	bool	$is_client		Is the thirdparty a client ?
+	 *    @param	bool	$is_supplier	Is the thirdparty a supplier ?
 	 *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
-	public function fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
+	public function fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '', $is_client = false, $is_supplier = false)
 	{
 		global $langs;
 		global $conf;
@@ -1869,6 +1871,15 @@ class Societe extends CommonObject
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise_supplier as sr2 ON sr2.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise_supplier WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
 		}
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
+
+		// Filter on client or supplier, for Client::fetch() and Fournisseur::fetch()
+		if ($is_client) {
+			$sql .= ' AND s.client > 0';
+		}
+		if ($is_supplier) {
+			$sql .= ' AND s.fournisseur > 0';
+		} // if both false, no test (the thirdparty can be client and/or supplier)
+
 		if ($rowid) {
 			$sql .= ' AND s.rowid = '.((int) $rowid);
 		}

From 47dfcf9bfcd5c38b7e4c9cb33c222a9e9b31df95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:13:32 +0100
Subject: [PATCH 0442/1862] clean code (#28616)

---
 htdocs/bookcal/admin/calendar_extrafields.php | 33 ++---------
 htdocs/bookcal/booking_list.php               |  6 +-
 htdocs/bookcal/calendar_agenda.php            |  3 +-
 htdocs/bookcal/calendar_card.php              | 58 ++-----------------
 htdocs/bookcal/calendar_contact.php           | 34 +----------
 htdocs/bookcal/calendar_document.php          | 57 ++----------------
 htdocs/bookcal/calendar_list.php              |  3 +-
 htdocs/bookcal/calendar_note.php              | 57 ++----------------
 8 files changed, 29 insertions(+), 222 deletions(-)

diff --git a/htdocs/bookcal/admin/calendar_extrafields.php b/htdocs/bookcal/admin/calendar_extrafields.php
index 72c84e50e35..46a7a39ebb4 100644
--- a/htdocs/bookcal/admin/calendar_extrafields.php
+++ b/htdocs/bookcal/admin/calendar_extrafields.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,39 +28,13 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once '../lib/bookcal.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('bookcal@bookcal', 'admin'));
+$langs->loadLangs(array('agenda', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -106,7 +81,7 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 $head = bookcalAdminPrepareHead();
 
-print dol_get_fiche_head($head, 'calendar_extrafields', $langs->trans($page_name), -1, 'bookcal@bookcal');
+print dol_get_fiche_head($head, 'calendar_extrafields', $langs->trans($page_name), -1, 'agenda');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 2503e170947..b4ac4cabe1b 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012  Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2010-2014  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017       Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2023-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,13 +34,13 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php';
 
 // load module libraries
 require_once __DIR__.'/class/calendar.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 $id = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index b3b131a8a7e..391c65e81ed 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
 $id = GETPOSTINT('id');
diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php
index 6d8038b8d4a..2b86d58e41d 100644
--- a/htdocs/bookcal/calendar_card.php
+++ b/htdocs/bookcal/calendar_card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,66 +23,17 @@
  *		\brief      Page to create/edit/view calendar
  */
 
-//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('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("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_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');				    // Disable session
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-dol_include_once('/bookcal/class/calendar.class.php');
-dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 // Get parameters
 $id = GETPOSTINT('id');
diff --git a/htdocs/bookcal/calendar_contact.php b/htdocs/bookcal/calendar_contact.php
index 71821a0a8c3..4eb679a97f3 100644
--- a/htdocs/bookcal/calendar_contact.php
+++ b/htdocs/bookcal/calendar_contact.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,36 +24,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -60,7 +32,7 @@ dol_include_once('/bookcal/class/calendar.class.php');
 dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
+$langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 $id     = (GETPOST('id') ? GETPOSTINT('id') : GETPOSTINT('facid')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php
index c11253b4503..32aaf416f35 100644
--- a/htdocs/bookcal/calendar_document.php
+++ b/htdocs/bookcal/calendar_document.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,66 +23,18 @@
  *  \brief      Tab for documents linked to Calendar
  */
 
-//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('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("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-dol_include_once('/bookcal/class/calendar.class.php');
-dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
+$langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
 
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index fd187d7c757..a513aab7d31 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once __DIR__.'/class/calendar.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "other"));
+$langs->loadLangs(array("agenda", "other"));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
diff --git a/htdocs/bookcal/calendar_note.php b/htdocs/bookcal/calendar_note.php
index 5f13b1129e6..7eb44b892e2 100644
--- a/htdocs/bookcal/calendar_note.php
+++ b/htdocs/bookcal/calendar_note.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,62 +23,14 @@
  *  \brief      Tab for notes on Calendar
  */
 
-//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('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("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
-dol_include_once('/bookcal/class/calendar.class.php');
-dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/bookcal/class/calendar.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_calendar.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bookcal@bookcal", "companies"));
+$langs->loadLangs(array("agenda", "companies"));
 
 // Get parameters
 $id = GETPOSTINT('id');

From 1cf5f3135580d6ab90fb899d406f19aa11c80a0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 18:15:21 +0100
Subject: [PATCH 0443/1862] Fix #28620

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 41cfb6dd96c..3b40b864f5a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -891,8 +891,8 @@ if (empty($reshook)) {
 					}
 				}
 
-				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
-				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
+				$tmpvat = (float) price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+				$tmpprodvat = (float) price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// Set unit price to use
 				if (!empty($price_ht) || $price_ht === '0') {

From f166f15f7d8dfd15ae2e53fec92935e4b815c6ab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:21:32 +0100
Subject: [PATCH 0444/1862] Qual: Backport/pre commit / log annotation
 simplification (#28614)

* Qual: ci: Run pre-commit/php-cs with cache (#28079)

This adds a hook to .pre-commit-config.yaml and updates the workflow
to run php-cs with cache when it is run for all files.
When running on changed files only, the cache is not useful.

The php-codesniffer ruleset.xml was cleaned up (duplicates removal/formatted)

* Fix: Make all 'relative paths' absolute (#28196)

# Fix: Make all 'relative paths' absolute

The phpcs ruleset xml file's relative exclude patterns are relative to
the filename(s) provided on the command line.
Hence with partial verifications, the path exclusion does not function
as we would like.
Removing the relative-path attribute from the patterns the exclusion
works.
At the same time, the patterns were optimized and a comment was added.

* Qual: Optimize workflow (#28386)

# Qual: Optimize workflow

The log annotation based on the pre-commit logs is now simplified.
---
 .github/logToCs.py               | 588 -------------------------------
 .github/workflows/pre-commit.yml |  18 +-
 2 files changed, 5 insertions(+), 601 deletions(-)
 delete mode 100755 .github/logToCs.py

diff --git a/.github/logToCs.py b/.github/logToCs.py
deleted file mode 100755
index 7befd310a0a..00000000000
--- a/.github/logToCs.py
+++ /dev/null
@@ -1,588 +0,0 @@
-#!/usr/bin/env python3
-# pylint: disable=invalid-name
-"""
-Convert a log to CheckStyle format.
-
-Url: https://github.com/mdeweerd/LogToCheckStyle
-
-The log can then be used for generating annotations in a github action.
-
-Note: this script is very young and "quick and dirty".
-      Patterns can be added to "PATTERNS" to match more messages.
-
-# Examples
-
-Assumes that logToCs.py is available as .github/logToCs.py.
-
-## Example 1:
-
-
-```yaml
-      - run: |
-          pre-commit run -all-files | tee pre-commit.log
-          .github/logToCs.py pre-commit.log pre-commit.xml
-      - uses: staabm/annotate-pull-request-from-checkstyle-action@v1
-        with:
-          files: pre-commit.xml
-          notices-as-warnings: true # optional
-```
-
-## Example 2:
-
-
-```yaml
-      - run: |
-          pre-commit run --all-files | tee pre-commit.log
-      - name: Add results to PR
-        if: ${{ always() }}
-        run: |
-          .github/logToCs.py pre-commit.log | cs2pr
-```
-
-Author(s):
-  - https://github.com/mdeweerd
-
-License: MIT License
-
-"""
-
-import argparse
-import datetime as dt
-import json
-import os
-import re
-import sys
-import xml.etree.ElementTree as ET  # nosec
-
-
-def remove_prefix(string, prefix):
-    """
-    Remove prefix from string
-
-    Provided for backward compatibility.
-    """
-    if prefix and string.startswith(prefix):
-        return string[len(prefix) :]
-    return string
-
-
-def convert_notices_to_checkstyle(notices, root_path=None):
-    """
-    Convert annotation list to CheckStyle xml string
-    """
-    root = ET.Element("checkstyle")
-    for fields in notices:
-        add_error_entry(root, **fields, root_path=root_path)
-    return ET.tostring(root, encoding="utf_8").decode("utf_8")
-
-
-def convert_lines_to_notices(lines):
-    """
-    Convert provided message to CheckStyle format.
-    """
-    notices = []
-    for line in lines:
-        fields = parse_message(line)
-        if fields:
-            notices.append(fields)
-    return notices
-
-
-def convert_text_to_notices(text):
-    """
-    Convert provided message to CheckStyle format.
-    """
-    return parse_file(text)
-
-
-# Initial version for Checkrun from:
-# https://github.com/tayfun/flake8-your-pr/blob/50a175cde4dd26a656734c5b64ba1e5bb27151cb/src/main.py#L7C1-L123C36
-# MIT Licence
-class CheckRun:
-    """
-    Represents the check run
-    """
-
-    GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN", None)
-    GITHUB_EVENT_PATH = os.environ.get("GITHUB_EVENT_PATH", None)
-
-    URI = "https://api.github.com"
-    API_VERSION = "2022-11-28"
-    ACCEPT_HEADER_VALUE = "application/vnd.github+json"
-    AUTH_HEADER_VALUE = f"Bearer {GITHUB_TOKEN}"
-    # This is the max annotations Github API accepts in one go.
-    MAX_ANNOTATIONS = 50
-
-    def __init__(self):
-        """
-        Initialise Check Run object with information from checkrun
-        """
-        self.read_event_file()
-        self.read_meta_data()
-
-    def read_event_file(self):
-        """
-        Read the event file to get the event information later.
-        """
-        if self.GITHUB_EVENT_PATH is None:
-            raise ValueError("Not running in github workflow")
-        with open(self.GITHUB_EVENT_PATH, encoding="utf_8") as event_file:
-            self.event = json.loads(event_file.read())
-
-    def read_meta_data(self):
-        """
-        Get meta data from event information
-        """
-        self.repo_full_name = self.event["repository"]["full_name"]
-        pull_request = self.event.get("pull_request")
-        print("%r", self.event)
-        if pull_request:
-            self.head_sha = pull_request["head"]["sha"]
-        else:
-            print("%r", self.event)
-            check_suite = self.event.get("check_suite", None)
-            if check_suite is not None:
-                self.head_sha = check_suite["pull_requests"][0]["base"]["sha"]
-            else:
-                self.head_sha = None  # Can't annotate?
-
-    def submit(  # pylint: disable=too-many-arguments
-        self,
-        notices,
-        title=None,
-        summary=None,
-        text=None,
-        conclusion=None,
-    ):
-        """
-        Submit annotations to github
-
-        See:
-        https://docs.github.com/en/rest/checks/runs?apiVersion=2022-11-28
-              #update-a-check-run
-
-        :param conclusion: success, failure
-        """
-        # pylint: disable=import-outside-toplevel
-        import requests  # Import here to not impose presence of module
-
-        if self.head_sha is None:
-            return
-
-        output = {
-            "annotations": notices[: CheckRun.MAX_ANNOTATIONS],
-        }
-        if title is not None:
-            output["title"] = title
-        if summary is not None:
-            output["summary"] = summary
-        if text is not None:
-            output["text"] = text
-        if conclusion is None:
-            # action_required, cancelled, failure, neutral, success
-            # skipped, stale, timed_out
-            if bool(notices):
-                conclusion = "failure"
-            else:
-                conclusion = "success"
-
-        payload = {
-            "name": "log-to-pr-annotation",
-            "head_sha": self.head_sha,
-            "status": "completed",  # queued, in_progress, completed
-            "conclusion": conclusion,
-            # "started_at": dt.datetime.now(dt.timezone.utc).isoformat(),
-            "completed_at": dt.datetime.now(dt.timezone.utc).isoformat(),
-            "output": output,
-        }
-
-        # Create the check-run
-        response = requests.post(
-            f"{self.URI}/repos/{self.repo_full_name}/check-runs",
-            headers={
-                "Accept": self.ACCEPT_HEADER_VALUE,
-                "Authorization": self.AUTH_HEADER_VALUE,
-                "X-GitHub-Api-Version": self.API_VERSION,
-            },
-            json=payload,
-            timeout=30,
-        )
-        print(response.content)
-        response.raise_for_status()
-
-
-ANY_REGEX = r".*?"
-FILE_REGEX = r"\s*(?P<file_name>\S.*?)\s*?"
-FILEGROUP_REGEX = r"\s*(?P<file_group>\S.*?)\s*?"
-EOL_REGEX = r"[\r\n]"
-LINE_REGEX = r"\s*(?P<line>\d+?)\s*?"
-COLUMN_REGEX = r"\s*(?P<column>\d+?)\s*?"
-SEVERITY_REGEX = r"\s*(?P<severity>error|warning|notice|style|info)\s*?"
-MSG_REGEX = r"\s*(?P<message>.+?)\s*?"
-MULTILINE_MSG_REGEX = r"\s*(?P<message>(?:.|.[\r\n])+)"
-# cpplint confidence index
-CONFIDENCE_REGEX = r"\s*\[(?P<confidence>\d+)\]\s*?"
-
-
-# List of message patterns, add more specific patterns earlier in the list
-# Creating patterns by using constants makes them easier to define and read.
-PATTERNS = [
-    # beautysh
-    #  File ftp.sh: error: "esac" before "case" in line 90.
-    re.compile(
-        f"^File {FILE_REGEX}:{SEVERITY_REGEX}:"
-        f" {MSG_REGEX} in line {LINE_REGEX}.$"
-    ),
-    # beautysh
-    #  File socks4echo.sh: error: indent/outdent mismatch: -2.
-    re.compile(f"^File {FILE_REGEX}:{SEVERITY_REGEX}: {MSG_REGEX}$"),
-    # yamllint
-    # ##[group].pre-commit-config.yaml
-    # ##[error]97:14 [trailing-spaces] trailing spaces
-    # ##[endgroup]
-    re.compile(rf"^##\[group\]{FILEGROUP_REGEX}$"),  # Start file group
-    re.compile(
-        rf"^##\[{SEVERITY_REGEX}\]{LINE_REGEX}:{COLUMN_REGEX}{MSG_REGEX}$"
-    ),  # Msg
-    re.compile(r"^##(?P<file_endgroup>\[endgroup\])$"),  # End file group
-    #  File socks4echo.sh: error: indent/outdent mismatch: -2.
-    re.compile(f"^File {FILE_REGEX}:{SEVERITY_REGEX}: {MSG_REGEX}$"),
-    # Emacs style
-    #  path/to/file:845:5: error - Expected 1 space after closing brace
-    re.compile(
-        rf"^{FILE_REGEX}:{LINE_REGEX}:{COLUMN_REGEX}:{SEVERITY_REGEX}"
-        rf"-?\s{MSG_REGEX}$"
-    ),
-    # ESLint (JavaScript Linter), RoboCop, shellcheck
-    #  path/to/file.js:10:2: Some linting issue
-    #  path/to/file.rb:10:5: Style/Indentation: Incorrect indentation detected
-    #  path/to/script.sh:10:1: SC2034: Some shell script issue
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{COLUMN_REGEX}: {MSG_REGEX}$"),
-    # Cpplint default output:
-    #           '%s:%s:  %s  [%s] [%d]\n'
-    #   % (filename, linenum, message, category, confidence)
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{MSG_REGEX}{CONFIDENCE_REGEX}$"),
-    # MSVC
-    # file.cpp(10): error C1234: Some error message
-    re.compile(
-        f"^{FILE_REGEX}\\({LINE_REGEX}\\):{SEVERITY_REGEX}{MSG_REGEX}$"
-    ),
-    # Java compiler
-    # File.java:10: error: Some error message
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}:{SEVERITY_REGEX}:{MSG_REGEX}$"),
-    # Python
-    # File ".../logToCs.py", line 90 (note: code line follows)
-    re.compile(f'^File "{FILE_REGEX}", line {LINE_REGEX}$'),
-    # Pylint, others
-    # path/to/file.py:10: [C0111] Missing docstring
-    # others
-    re.compile(f"^{FILE_REGEX}:{LINE_REGEX}: {MSG_REGEX}$"),
-    # Shellcheck:
-    # In script.sh line 76:
-    re.compile(
-        f"^In {FILE_REGEX} line {LINE_REGEX}:{EOL_REGEX}?"
-        f"({MULTILINE_MSG_REGEX})?{EOL_REGEX}{EOL_REGEX}"
-    ),
-    # eslint:
-    #  /path/to/filename
-    #    14:5  error  Unexpected trailing comma  comma-dangle
-    re.compile(
-        f"^{FILE_REGEX}{EOL_REGEX}"
-        rf"\s+{LINE_REGEX}:{COLUMN_REGEX}\s+{SEVERITY_REGEX}\s+{MSG_REGEX}$"
-    ),
-]
-
-# Exceptionnaly some regexes match messages that are not error.
-# This pattern matches those exceptions
-EXCLUDE_MSG_PATTERN = re.compile(
-    r"^("
-    r"Placeholder pattern"  # To remove on first message pattern
-    r")"
-)
-
-# Exceptionnaly some regexes match messages that are not error.
-# This pattern matches those exceptions
-EXCLUDE_FILE_PATTERN = re.compile(
-    r"^("
-    # Codespell:  (appears as a file name):
-    r"Used config files\b"
-    r")"
-)
-
-# Severities available in CodeSniffer report format
-SEVERITY_NOTICE = "notice"
-SEVERITY_WARNING = "warning"
-SEVERITY_ERROR = "error"
-
-
-def strip_ansi(text: str):
-    """
-    Strip ANSI escape sequences from string (colors, etc)
-    """
-    return re.sub(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", "", text)
-
-
-def parse_file(text):
-    """
-    Parse all messages in a file
-
-    Returns the fields in a dict.
-    """
-    # pylint: disable=too-many-branches,too-many-statements
-    # regex required to allow same group names
-    try:
-        import regex  # pylint: disable=import-outside-toplevel
-    except ImportError as exc:
-        raise ImportError(
-            "The 'parsefile' method requires 'python -m pip install regex'"
-        ) from exc
-
-    patterns = [pattern.pattern for pattern in PATTERNS]
-    # patterns = [PATTERNS[0].pattern]
-
-    file_group = None  # The file name for the group (if any)
-    full_regex = "(?:(?:" + (")|(?:".join(patterns)) + "))"
-    results = []
-
-    for fields in regex.finditer(
-        full_regex, strip_ansi(text), regex.MULTILINE | regex.IGNORECASE
-    ):
-        if not fields:
-            continue
-        result = fields.groupdict()
-
-        if len(result) == 0:
-            continue
-
-        severity = result.get("severity", None)
-        file_name = result.get("file_name", None)
-        confidence = result.pop("confidence", None)
-        new_file_group = result.pop("file_group", None)
-        file_endgroup = result.pop("file_endgroup", None)
-        message = result.get("message", None)
-
-        if new_file_group is not None:
-            # Start of file_group, just store file
-            file_group = new_file_group
-            continue
-
-        if file_endgroup is not None:
-            file_group = None
-            continue
-
-        if file_name is None:
-            if file_group is not None:
-                file_name = file_group
-                result["file_name"] = file_name
-            else:
-                # No filename, skip
-                continue
-        else:
-            if EXCLUDE_FILE_PATTERN.search(file_name):
-                # This file_name is excluded
-                continue
-
-        if message is not None:
-            if EXCLUDE_MSG_PATTERN.search(message):
-                # This message is excluded
-                continue
-
-        if confidence is not None:
-            # Convert confidence level of cpplint
-            # to warning, etc.
-            confidence = int(confidence)
-
-            if confidence <= 1:
-                severity = SEVERITY_NOTICE
-            elif confidence >= 5:
-                severity = SEVERITY_ERROR
-            else:
-                severity = SEVERITY_WARNING
-
-        if severity is None:
-            severity = SEVERITY_ERROR
-        else:
-            severity = severity.lower()
-
-        if severity in ["info", "style"]:
-            severity = SEVERITY_NOTICE
-
-        result["severity"] = severity
-
-        results.append(result)
-
-    return results
-
-
-def parse_message(message):
-    """
-    Parse message until it matches a pattern.
-
-    Returns the fields in a dict.
-    """
-    for pattern in PATTERNS:
-        fields = pattern.match(message, re.IGNORECASE)
-        if not fields:
-            continue
-        result = fields.groupdict()
-        if len(result) == 0:
-            continue
-
-        if "confidence" in result:
-            # Convert confidence level of cpplint
-            # to warning, etc.
-            confidence = int(result["confidence"])
-            del result["confidence"]
-
-            if confidence <= 1:
-                severity = SEVERITY_NOTICE
-            elif confidence >= 5:
-                severity = SEVERITY_ERROR
-            else:
-                severity = SEVERITY_WARNING
-            result["severity"] = severity
-
-        if "severity" not in result:
-            result["severity"] = SEVERITY_ERROR
-        else:
-            result["severity"] = result["severity"].lower()
-
-        if result["severity"] in ["info", "style"]:
-            result["severity"] = SEVERITY_NOTICE
-
-        return result
-
-    # Nothing matched
-    return None
-
-
-def add_error_entry(  # pylint: disable=too-many-arguments
-    root,
-    severity,
-    file_name,
-    line=None,
-    column=None,
-    message=None,
-    source=None,
-    root_path=None,
-):
-    """
-    Add error information to the CheckStyle output being created.
-    """
-    file_element = find_or_create_file_element(
-        root, file_name, root_path=root_path
-    )
-    error_element = ET.SubElement(file_element, "error")
-    error_element.set("severity", severity)
-    if line:
-        error_element.set("line", line)
-    if column:
-        error_element.set("column", column)
-    if message:
-        error_element.set("message", message)
-    if source:
-        # To verify if this is a valid attribute
-        error_element.set("source", source)
-
-
-def find_or_create_file_element(root, file_name: str, root_path=None):
-    """
-    Find/create file element in XML document tree.
-    """
-
-    if root_path is not None:
-        file_name = remove_prefix(file_name, root_path)
-    for file_element in root.findall("file"):
-        if file_element.get("name") == file_name:
-            return file_element
-    file_element = ET.SubElement(root, "file")
-    file_element.set("name", file_name)
-    return file_element
-
-
-def main():
-    """
-    Parse the script arguments and get the conversion done.
-    """
-    parser = argparse.ArgumentParser(
-        description="Convert messages to Checkstyle XML format."
-    )
-    parser.add_argument(
-        "input", help="Input file. Use '-' for stdin.", nargs="?", default="-"
-    )
-    parser.add_argument(
-        "output",
-        help="Output file. Use '-' for stdout.",
-        nargs="?",
-        default="-",
-    )
-    parser.add_argument(
-        "-i",
-        "--in",
-        dest="input_named",
-        help="Input filename. Overrides positional input.",
-    )
-    parser.add_argument(
-        "-o",
-        "--out",
-        dest="output_named",
-        help="Output filename. Overrides positional output.",
-    )
-    parser.add_argument(
-        "--root",
-        metavar="ROOT_PATH",
-        help="Root directory to remove from file paths."
-        "  Defaults to working directory.",
-        default=os.getcwd(),
-    )
-    parser.add_argument(
-        "--github-annotate",
-        action=argparse.BooleanOptionalAction,
-        help="Annotate when in Github workflow.",
-        # Currently disabled,
-        #  Future: (os.environ.get("GITHUB_EVENT_PATH", None) is not None),
-        default=False,
-    )
-
-    args = parser.parse_args()
-
-    if args.input == "-" and args.input_named:
-        with open(
-            args.input_named, encoding="utf_8", errors="surrogateescape"
-        ) as input_file:
-            text = input_file.read()
-    elif args.input != "-":
-        with open(
-            args.input, encoding="utf_8", errors="surrogateescape"
-        ) as input_file:
-            text = input_file.read()
-    else:
-        text = sys.stdin.read()
-
-    root_path = os.path.join(args.root, "")
-
-    try:
-        notices = convert_text_to_notices(text)
-    except ImportError:
-        notices = convert_lines_to_notices(re.split(r"[\r\n]+", text))
-
-    checkstyle_xml = convert_notices_to_checkstyle(
-        notices, root_path=root_path
-    )
-
-    if args.output == "-" and args.output_named:
-        with open(args.output_named, "w", encoding="utf_8") as output_file:
-            output_file.write(checkstyle_xml)
-    elif args.output != "-":
-        with open(args.output, "w", encoding="utf_8") as output_file:
-            output_file.write(checkstyle_xml)
-    else:
-        print(checkstyle_xml)
-
-    if args.github_annotate:
-        checkrun = CheckRun()
-        checkrun.submit(notices)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index d0cdcb90ef3..1ae4d3387f8 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -7,7 +7,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     env:
-      LOG_TO_CS: .github/logToCs.py
       RAW_LOG: pre-commit.log
       CS_XML: pre-commit.xml
     steps:
@@ -37,7 +36,7 @@ jobs:
         with:
           cache: pip
           python-version: "3.11"
-      - run: python -m pip install pre-commit regex
+      - run: python -m pip install pre-commit
       # Restore previous cache of precommit
       - uses: actions/cache/restore@v4
         with:
@@ -102,19 +101,12 @@ jobs:
           pre-commit run --hook-stage manual -a php-cs-with-cache | tee -a ${RAW_LOG}
           ls -l ~/.cache/pre-commit/
 
-      # If error, we convert log in the checkstyle format
-      - name: Convert Raw Log to CheckStyle format
-        if: ${{ failure() }}
-        run: |
-          python ${LOG_TO_CS} ${RAW_LOG} ${CS_XML}
-      # Annotate the git sources with the log messages
-      - name: Annotate Source Code with Messages
-        uses: staabm/annotate-pull-request-from-checkstyle-action@v1
+      - name: Convert Raw Log to Annotations
+        uses: mdeweerd/logToCheckStyle@v2024.2.9
         if: ${{ failure() }}
         with:
-          files: ${{ env.CS_XML }}
-          notices-as-warnings: true # optional
-          prepend-filename: true # optional
+          in: ${{ env.RAW_LOG }}
+
       # Save the precommit cache
       - uses: actions/cache/save@v4
         if: ${{ ! cancelled() }}

From d0c0dee616968d13f14385d975266c9857ba97a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:23:03 +0100
Subject: [PATCH 0445/1862] fix typo in ChangeLog (#28613)

* fix typo in ChangeLog

* Update ChangeLog
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de0cb66b968..bb3afe1e22e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,7 @@ FIX: Bad column for total in bom list
 FIX: Bad condition on button back to draft on recruitment job.
 FIX: Bad CRLF when sending text only content. Fix dol_htmlwithnojs()
 FIX: Bad picto on list of permission of a user when user not admin
-FIX: bad timzeone for the start/end date of an event
+FIX: bad timezone for the start/end date of an event
 FIX: Better test on validity of compute field syntax with parenthesis
 FIX: close #28279
 FIX: disabled pito of menu must be greyed.
@@ -47,7 +47,7 @@ FIX: Shipment closing action has wrong value (#28174)
 FIX: some tooltips has disappeared on invoice action button
 FIX: Special code is now transmitted by args only in order supplier (#28546)
 FIX: subscription must be editable when accounting isn't reconciled (#28469)
-FIX: Value of field int = 0 from modulebuilder must nto be set to null
+FIX: Value of field int = 0 from modulebuilder must not be set to null
 
 
 ***** ChangeLog for 19.0.0 compared to 18.0.0 *****

From 55c0efae3fb5f8d387eec9674fa5c784a3caa9d2 Mon Sep 17 00:00:00 2001
From: noec764 <58433943+noec764@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:26:38 +0100
Subject: [PATCH 0446/1862] FIX: Special code is now transmitted by args only
 in order supplier (#28619)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Noé <noe@scopen.fr>
---
 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 17b99779094..4fa93836b76 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1344,8 +1344,6 @@ if (empty($reshook)) {
 									$tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
 								}
 
-								$object->special_code = $lines[$i]->special_code;
-
 								$result = $object->addline(
 									$desc,
 									$lines[$i]->subprice,
@@ -1368,7 +1366,9 @@ if (empty($reshook)) {
 									$lines[$i]->fk_unit,
 									0,
 									$element,
-									!empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid
+									!empty($lines[$i]->id) ? $lines[$i]->id : $lines[$i]->rowid,
+									-1,
+									$lines[$i]->special_code
 								);
 
 								if ($result < 0) {

From 6878a834a5f739cd1f704523d71c5d0ef6ddba63 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:26:57 +0100
Subject: [PATCH 0447/1862] Fix: Remove extra space in translation key (#28611)

# Fix: Remove extra space in translation key

Fix the extra space in the key 'ImpossibleToContactAuthority' when calling trans.
---
 htdocs/blockedlog/class/authority.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 683276a82fb..7a4836f21fd 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -316,7 +316,7 @@ class BlockedLogAuthority
 				if ($res['content'] === 'blockalreadyadded' || $res['content'] === 'blockadded') {
 					$block->setCertified();
 				} else {
-					$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
+					$this->error = $langs->trans('ImpossibleToContactAuthority', $url);
 					return -1;
 				}
 			}

From 7090af2b51ebe51f1cde0ec5542bb677375cb8f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:27:20 +0100
Subject: [PATCH 0448/1862] fix phpstan (#28609)

* fix phpstan

* Update emailsenderprofile.class.php
---
 htdocs/core/class/emailsenderprofile.class.php | 5 +----
 htdocs/core/lib/functions.lib.php              | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index ec1eea0116c..00a8d800251 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -3,7 +3,6 @@
  * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,8 +27,6 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 
 /**
@@ -48,7 +45,7 @@ class EmailSenderProfile extends CommonObject
 	public $table_element = 'c_email_senderprofile';
 
 	/**
-	 * @var array  Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int|string  Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
 	public $ismultientitymanaged = 1;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a65603ce58f..6780c85e858 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7684,7 +7684,7 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
  *
  *	@param	string	$stringtoclean			String to clean
  *  @param	array	$disallowed_tags		Array of tags not allowed
- *  @param	string	$cleanalsosomestyles	Clean also some tags
+ *  @param	int 	$cleanalsosomestyles	Clean also some tags
  *	@return string	    					String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_onlythesehtmlattributes()
@@ -8048,7 +8048,7 @@ function dol_htmlcleanlastbr($stringtodecode)
  * @param   string	$a					Operand a
  * @param   string	$b					Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...)
  * @param   string	$c					Operand c
- * @param	string	$keepsomeentities	Entities but &, <, >, " are not converted.
+ * @param	int 	$keepsomeentities	Entities but &, <, >, " are not converted.
  * @return  string						String decoded
  */
 function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
@@ -8086,7 +8086,7 @@ function dol_htmlentities($string, $flags = ENT_QUOTES | ENT_SUBSTITUTE, $encodi
  *	Example, if string contains euro symbol that has ascii code 128
  *
  *	@param	string		$s      	String to check
- *  @param	string		$clean		Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formatted file.
+ *  @param	int 		$clean		Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formatted file.
  *	@return	int|string  	   		0 if bad iso, 1 if good iso, Or the clean string if $clean is 1
  *  @deprecated Duplicate of ascii_check()
  *  @see ascii_check()
@@ -9538,7 +9538,7 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
  *
  *  @param      array		$array      		Array to sort (array of array('key1'=>val1,'key2'=>val2,'key3'...) or array of objects)
  *  @param      string		$index				Key in array to use for sorting criteria
- *  @param      int			$order				Sort order ('asc' or 'desc')
+ *  @param      string		$order				Sort order ('asc' or 'desc')
  *  @param      int			$natsort			If values are strings (I said value not type): 0=Use alphabetical order, 1=use "natural" sort (natsort)
  *   											If values are numeric (I said value not type): 0=Use numeric order (even if type is string) so use a "natural" sort, 1=use "natural" sort too (same than 0), -1=Force alphabetical order
  *  @param      int			$case_sensitive		1=sort is case sensitive, 0=not case sensitive

From 44ce77dd3729fec133cefdbc3ff3e9d9064669bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:27:49 +0100
Subject: [PATCH 0449/1862] fix phpstan (#28606)

---
 htdocs/core/class/dolgeoip.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 80856441d2d..9ab52db0b86 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2009-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2009-2012  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,11 +35,18 @@
 class DolGeoIP
 {
 	/**
-	 * @var GeoIp2\Database\Reader
+	 * @var GeoIp2\Database\Reader|string
 	 */
 	public $gi;
 
+	/**
+	 * @var string
+	 */
 	public $error;
+
+	/**
+	 * @var string
+	 */
 	public $errorlabel;
 
 	/**

From b30dd4e70778011d30b480bba838bc3bc10349ee Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:28:24 +0100
Subject: [PATCH 0450/1862] Fix: Cache issue in windows-ci - add
 enableCrossOsArchive (#28607)

# Fix: Cache issue in windows-ci - add enableCrossOsArchive

There is an issue in actions/cache on windows and adding 'enableCrossOsArchive: true'
should fix it according to
https://github.com/actions/cache/issues/1275#issuecomment-1925217178
---
 .github/workflows/windows-ci.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index 3584aa5ab07..c0e44dbb74f 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -55,6 +55,8 @@ jobs:
         id: cache
         uses: actions/cache/restore@v4
         with:
+          # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
+          enableCrossOsArchive: true 
           path: |
             db_init.sql
             db_init.sql.md5
@@ -166,5 +168,7 @@ jobs:
         uses: actions/cache/save@v4
         if: ${{ ! cancelled() }}
         with:
+          # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
+          enableCrossOsArchive: true 
           key: ${{ steps.cache.outputs.cache-primary-key }}
           path: db_init.*

From 8528b3f36372f961f35a923ca83b9ba4bf91963b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 18:33:32 +0100
Subject: [PATCH 0451/1862] Clean conf

---
 dev/tools/phan/config.php                            | 1 -
 dev/tools/phan/config_extended.php                   | 1 -
 dev/tools/phan/config_fixer.php                      | 2 +-
 dev/tools/phan/plugins/DeprecatedModuleNameFixer.php | 2 --
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index e20476455ed..682a8b42b26 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -275,7 +275,6 @@ return [
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
-		__DIR__.'/plugins/GetPostFixerPlugin.php',   // Only detects without --automatic-fix
 		// checks if a function, closure or method unconditionally returns.
 		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
 		//'DeprecateAliasPlugin',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index ad7f49b2755..a186b90bd25 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -275,7 +275,6 @@ return [
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
-		__DIR__.'/plugins/GetPostFixerPlugin.php',   // Only detects without --automatic-fix
 		'DeprecateAliasPlugin',
 		//'EmptyMethodAndFunctionPlugin',
 		'InvalidVariableIssetPlugin',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 3a923aab530..e13e371b8df 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -118,7 +118,7 @@ return [
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
 		//'DeprecateAliasPlugin',
 		// __DIR__.'/plugins/NoVarDumpPlugin.php',
-		__DIR__.'/plugins/GetPostFixerPlugin.php',
+		//__DIR__.'/plugins/GetPostFixerPlugin.php',
 		//'PHPDocToRealTypesPlugin',
 
 	/*
diff --git a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
index 19caf46d95d..d8cfcfb141a 100644
--- a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
+++ b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
@@ -18,8 +18,6 @@ use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
 use Microsoft\PhpParser\Node\StringLiteral;
 
 /**
- * Implements --automatic-fix for GetPostFixerPlugin
- *
  * This is a prototype, there are various features it does not implement.
  */
 

From c62355858376371f6cf74cd9aea0fa24ee393196 Mon Sep 17 00:00:00 2001
From: JeromeBARBOTIN <162124543+JeromeBARBOTIN@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:52:41 +0100
Subject: [PATCH 0452/1862] Verification of variables (#28629)

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 12fafdd5205..47efd560c4a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1764,25 +1764,25 @@ if (empty($reshook)) {
 
 										// Date start
 										$date_start = false;
-										if ($lines[$i]->date_debut_prevue) {
+										if (isset($lines[$i]->date_debut_prevue)) {
 											$date_start = $lines[$i]->date_debut_prevue;
 										}
-										if ($lines[$i]->date_debut_reel) {
+										if (isset($lines[$i]->date_debut_reel)) {
 											$date_start = $lines[$i]->date_debut_reel;
 										}
-										if ($lines[$i]->date_start) {
+										if (isset($lines[$i]->date_start)) {
 											$date_start = $lines[$i]->date_start;
 										}
 
 										// Date end
 										$date_end = false;
-										if ($lines[$i]->date_fin_prevue) {
+										if (isset($lines[$i]->date_fin_prevue)) {
 											$date_end = $lines[$i]->date_fin_prevue;
 										}
-										if ($lines[$i]->date_fin_reel) {
+										if (isset($lines[$i]->date_fin_reel)) {
 											$date_end = $lines[$i]->date_fin_reel;
 										}
-										if ($lines[$i]->date_end) {
+										if (isset($lines[$i]->date_end)) {
 											$date_end = $lines[$i]->date_end;
 										}
 

From 6cc9ac55429f37b83f058993875e62181bfec534 Mon Sep 17 00:00:00 2001
From: Christian Humpel <78662388+Humml87@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:59:37 +0100
Subject: [PATCH 0453/1862] FIX: Count of virtual stock at Services and MoLine
 with disabled stock change (#28580)

* fix the count of virtual stock

* - fix "Found non sanitized string" ?

---------

Co-authored-by: christian.humpel <christian.humpel@gmail.com>
---
 htdocs/product/class/product.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5288300c443..b959d87063f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3469,6 +3469,8 @@ class Product extends CommonObject
 		// phpcs:enable
 		global $conf, $user, $hookmanager, $action;
 
+		$serviceStockIsEnabled = isModEnabled("service") && getDolGlobalString('STOCK_SUPPORTS_SERVICES');
+
 		$sql = "SELECT COUNT(DISTINCT m.fk_soc) as nb_customers, COUNT(DISTINCT m.rowid) as nb,";
 		$sql .= " COUNT(mp.rowid) as nb_rows, SUM(mp.qty) as qty, role";
 		$sql .= " FROM ".$this->db->prefix()."mrp_production as mp";
@@ -3480,6 +3482,7 @@ class Product extends CommonObject
 		$sql .= " WHERE m.rowid = mp.fk_mo";
 		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'mrp').")";
 		$sql .= " AND mp.fk_product = ".((int) $this->id);
+		$sql .= " AND mp.disable_stock_change IN (0)";
 		if (!$user->hasRight('societe', 'client', 'voir') && !$socid && !$forVirtualStock) {
 			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
@@ -3492,6 +3495,9 @@ class Product extends CommonObject
 		if (!empty($dateofvirtualstock)) {
 			$sql .= " AND m.date_valid <= '".$this->db->idate($dateofvirtualstock)."'"; // better date to code ? end of production ?
 		}
+		if (!$serviceStockIsEnabled) {
+			$sql .= "AND EXISTS (SELECT p.rowid FROM ".$this->db->prefix()."product AS p WHERE p.rowid = ".((int) $this->id)." AND p.fk_product_type IN (0))";
+		}
 		$sql .= " GROUP BY role";
 
 		$this->stats_mrptoconsume['customers'] = 0;

From 3bafcf5d001691dc9f7475f8ba00b4a32c889d2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 19:41:21 +0100
Subject: [PATCH 0454/1862] Fix CLI tools must return a positive value on error
 for better cross platform compatibility

---
 dev/tools/rector/rector.php                   |  25 ++++
 .../rector/src/Renaming/UsePositiveExit.php   | 115 ++++++++++++++++++
 scripts/bank/export-bank-receipts.php         |  12 +-
 .../company/sync_contacts_dolibarr2ldap.php   |   8 +-
 .../email_expire_services_to_customers.php    |   6 +-
 ...ail_expire_services_to_representatives.php |   6 +-
 scripts/cron/cron_run_jobs.php                |  28 ++---
 scripts/doc/regenerate_docs.php               |   4 +-
 scripts/emailings/mailing-send.php            |   8 +-
 scripts/emailings/reset-invalid-emails.php    |  12 +-
 .../email_unpaid_invoices_to_customers.php    |   8 +-
 ...ail_unpaid_invoices_to_representatives.php |   8 +-
 scripts/invoices/rebuild_merge_pdf.php        |  18 +--
 .../members/sync_members_dolibarr2ldap.php    |  12 +-
 .../members/sync_members_ldap2dolibarr.php    |  10 +-
 .../sync_members_types_dolibarr2ldap.php      |   8 +-
 .../sync_members_types_ldap2dolibarr.php      |   8 +-
 scripts/product/migrate_picture_path.php      |   4 +-
 scripts/product/regenerate_thumbs.php         |   4 +-
 scripts/user/migrate_picture_path.php         |   4 +-
 scripts/user/sync_groups_dolibarr2ldap.php    |   6 +-
 scripts/user/sync_groups_ldap2dolibarr.php    |   6 +-
 scripts/user/sync_users_dolibarr2ldap.php     |   6 +-
 scripts/user/sync_users_ldap2dolibarr.php     |   8 +-
 .../website/migrate-news-joomla2dolibarr.php  |  14 +--
 scripts/website/regenerate-pages.php          |   8 +-
 scripts/withdrawals/build_withdrawal_file.php |   4 +-
 27 files changed, 250 insertions(+), 110 deletions(-)
 create mode 100644 dev/tools/rector/src/Renaming/UsePositiveExit.php

diff --git a/dev/tools/rector/rector.php b/dev/tools/rector/rector.php
index dceb00bfb4b..0d527997b83 100644
--- a/dev/tools/rector/rector.php
+++ b/dev/tools/rector/rector.php
@@ -1,4 +1,28 @@
 <?php
+/* Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       dev/tools/rector/rector.php
+ *		\ingroup    core
+ *		\brief      Toolt to run rector
+ *
+ *		cd dev/tools/rector
+ *		./vendor/bin/rector process [--dry-run] [--clear-cache] ../../../htdocs/core/
+ */
 
 declare(strict_types=1);
 
@@ -56,6 +80,7 @@ return static function (RectorConfig $rectorConfig): void {
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\EmptyUserRightsToFunction::class);
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\GlobalToFunction::class);
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\UserRightsToFunction::class);
+	//$rectorConfig->rule(Dolibarr\Rector\Renaming\UsePositiveExit::class);
 
 	// Add all predefined rules to migrate to up to php 71.
 	// Warning this break tab spacing of arrays on several lines
diff --git a/dev/tools/rector/src/Renaming/UsePositiveExit.php b/dev/tools/rector/src/Renaming/UsePositiveExit.php
new file mode 100644
index 00000000000..bc39092acd2
--- /dev/null
+++ b/dev/tools/rector/src/Renaming/UsePositiveExit.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * This rule to replace exit does not work because "exit" is not a function
+ */
+
+namespace Dolibarr\Rector\Renaming;
+
+use PhpParser\Node;
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
+use PhpParser\Node\Expr\BinaryOp\Concat;
+use PhpParser\Node\Expr\BinaryOp\Equal;
+use PhpParser\Node\Expr\BooleanNot;
+use PhpParser\Node\Expr\Empty_;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\Isset_;
+use PhpParser\Node\Expr\PropertyFetch;
+use PhpParser\Node\Name;
+use PhpParser\Node\Scalar\String_;
+use Rector\Core\NodeManipulator\BinaryOpManipulator;
+use Rector\Core\Rector\AbstractRector;
+use Rector\Php71\ValueObject\TwoNodeMatch;
+use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector;
+
+/**
+ * Class with Rector custom rule to fix code
+ */
+class UsePositiveExit extends AbstractRector
+{
+	/**
+	 * @var \Rector\Core\NodeManipulator\BinaryOpManipulator
+	 */
+	private $binaryOpManipulator;
+
+	/**
+	 * Constructor
+	 *
+	 * @param BinaryOpManipulator $binaryOpManipulator The $binaryOpManipulator
+	 */
+	public function __construct(BinaryOpManipulator $binaryOpManipulator)
+	{
+		$this->binaryOpManipulator = $binaryOpManipulator;
+	}
+
+	/**
+	 * getRuleDefinition
+	 *
+	 * @return RuleDefinition
+	 * @throws PoorDocumentationException
+	 */
+	public function getRuleDefinition(): RuleDefinition
+	{
+		return new RuleDefinition(
+			'Change exit(-x) int exit(x)',
+			[new CodeSample(
+				'exit(-2)',
+				'exit(2)'
+			)]
+		);
+	}
+
+	/**
+	 * Return a node type from https://github.com/rectorphp/php-parser-nodes-docs/
+	 *
+	 * @return string[]
+	 */
+	public function getNodeTypes(): array
+	{
+		return [FuncCall::class];
+	}
+
+	/**
+	 * refactor
+	 *
+	 * @param 	Node 					$node 		A node
+	 * @return	FuncCall|BooleanNot
+	 */
+	public function refactor(Node $node)
+	{
+		if ($node instanceof FuncCall) {
+			$tmpfunctionname = $this->getName($node);
+			// If function is ok. We must avoid a lot of cases like isset(), empty()
+			if (in_array($tmpfunctionname, array('exit'))) {
+				var_dump($tmpfunctionname);
+				//print "tmpfunctionname=".$tmpfunctionname."\n";
+				$args = $node->getArgs();
+				$nbofparam = count($args);
+
+				if ($nbofparam >= 1) {
+					$tmpargs = $args;
+					foreach ($args as $key => $arg) {	// only 1 element in this array
+						//var_dump($key);
+						//var_dump($arg->value);exit;
+						if (empty($arg->value)) {
+							return;
+						}
+						$a = new FuncCall(new Name('exit'), [new Arg(abs($arg->value))]);
+						//$tmpargs[$key] = new Arg($a);
+						return $a;
+
+						//$r = new FuncCall(new Name($tmpfunctionname), $tmpargs);
+						//return $r;
+					}
+				}
+			}
+			return $node;
+		}
+
+		return null;
+	}
+}
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 87cd5a4cffa..6d58005227e 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -34,7 +34,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -69,7 +69,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (!isset($argv[3]) || !$argv[3]) {
 	print "Usage: ".$script_file." bank_ref [bank_receipt_number|all] (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
-	exit(-1);
+	exit(1);
 }
 $bankref = $argv[1];
 $num = $argv[2];
@@ -115,7 +115,7 @@ $acct = new Account($db);
 $result = $acct->fetch('', $bankref);
 if ($result <= 0) {
 	print "Failed to find bank account with ref ".$bankref.".\n";
-	exit(-1);
+	exit(1);
 } else {
 	print "Export for bank account ".$acct->ref." (".$acct->label.").\n";
 }
@@ -126,7 +126,7 @@ $file = "export_".$model.".modules.php";
 $classname = "Export".$model;
 if (!dol_is_file($dir.$file)) {
 	print "No driver to export with format ".$model."\n";
-	exit(-1);
+	exit(1);
 }
 require_once $dir.$file;
 $objmodel = new $classname($db);
@@ -232,7 +232,7 @@ if ($resql) {
 				$db->free($resql2);
 			} else {
 				dol_print_error($db);
-				exit(-1);
+				exit(1);
 			}
 
 			$total = $balancebefore[$objp->num_releve];
@@ -414,7 +414,7 @@ if ($resql) {
 	}
 } else {
 	dol_print_error($db);
-	$ret = -1;
+	$ret = 1;
 }
 
 $db->close();
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index ce45cb11f29..350f851a54d 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -35,7 +35,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -61,7 +61,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: $script_file now [-y]\n";
-	exit(-1);
+	exit(1);
 }
 
 foreach ($argv as $key => $val) {
@@ -74,7 +74,7 @@ $now = $argv[1];
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-only mode\n";
-	exit(-1);
+	exit(1);
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -108,7 +108,7 @@ if (!$confirmed) {
 /*
  * if (!getDolGlobalString('LDAP_CONTACT_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
- * exit(-1);
+ * exit(1);
  * }
  */
 
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 9f6364b4f46..1344066af17 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -37,7 +37,7 @@ $path = __DIR__.'/';
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm')) || !in_array($argv[2], array('thirdparties', 'contacts'))) {
@@ -47,7 +47,7 @@ if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm'
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add param delay (nb of days), only services with expired date < today + delay are included.\n";
 	print "If you add param after (nb of days), only services with expired date >= today + delay are included.\n";
-	exit(-1);
+	exit(1);
 }
 $mode = $argv[1];
 $targettype = $argv[2];
@@ -227,7 +227,7 @@ if ($resql) {
 	dol_print_error($db);
 	dol_syslog("email_expire_services_to_customers.php: Error");
 
-	exit(-1);
+	exit(1);
 }
 
 /**
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 282d348e184..a1b859d644f 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -37,7 +37,7 @@ $path = __DIR__.'/';
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm'))) {
@@ -46,7 +46,7 @@ if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm'
 	print "Send an email to remind all contracts services to expire, to users that are sale representative for.\n";
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add a delay (nb of days), only services with expired date < today + delay are included.\n";
-	exit(-1);
+	exit(1);
 }
 $mode = $argv[1];
 
@@ -176,7 +176,7 @@ if ($resql) {
 	dol_print_error($db);
 	dol_syslog("email_expire_services_to_representatives.php: Error");
 
-	exit(-1);
+	exit(1);
 }
 
 /**
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 3aa4f601bc1..279e4489e70 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -56,7 +56,7 @@ $path = __DIR__.'/';
 // Error if Web mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -66,13 +66,13 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 // Check parameters
 if (!isset($argv[1]) || !$argv[1]) {
 	usage($path, $script_file);
-	exit(-1);
+	exit(1);
 }
 $key = $argv[1];
 
 if (!isset($argv[2]) || !$argv[2]) {
 	usage($path, $script_file);
-	exit(-1);
+	exit(1);
 }
 
 $userlogin = $argv[2];
@@ -97,18 +97,18 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." - userlogin=
 // Check module cron is activated
 if (!isModEnabled('cron')) {
 	print "Error: module Scheduled jobs (cron) not activated\n";
-	exit(-1);
+	exit(1);
 }
 
 // Check security key
 if ($key != getDolGlobalString('CRON_KEY')) {
 	print "Error: securitykey is wrong\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-only mode\n";
-	exit(-1);
+	exit(1);
 }
 
 // If param userlogin is reserved word 'firstadmin'
@@ -132,12 +132,12 @@ $result = $user->fetch('', $userlogin, '', 1);
 if ($result < 0) {
 	echo "User Error: ".$user->error;
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-	exit(-1);
+	exit(1);
 } else {
 	if (empty($user->id)) {
 		echo "User login: ".$userlogin." does not exists\n";
 		dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
-		exit(-1);
+		exit(1);
 	}
 }
 
@@ -171,7 +171,7 @@ if (!empty($id)) {
 	if (!is_numeric($id)) {
 		echo "Error: Bad value for parameter job id\n";
 		dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
-		exit();
+		exit(2);
 	}
 	$filter['t.rowid'] = $id;
 }
@@ -180,7 +180,7 @@ $result = $object->fetchAll('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0,
 if ($result < 0) {
 	echo "Error: ".$object->error;
 	dol_syslog("cron_run_jobs.php fetch Error ".$object->error, LOG_ERR);
-	exit(-1);
+	exit(1);
 }
 
 // TODO Duplicate code. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
@@ -212,12 +212,12 @@ if (is_array($object->lines) && (count($object->lines) > 0)) {
 				if ($result < 0) {
 					echo "\nUser Error: ".$user->error."\n";
 					dol_syslog("cron_run_jobs.php: User Error:".$user->error, LOG_ERR);
-					exit(-1);
+					exit(1);
 				} else {
 					if ($result == 0) {
 						echo "\nUser login: ".$userlogin." does not exist for entity ".$conf->entity."\n";
 						dol_syslog("cron_run_jobs.php: User login: ".$userlogin." does not exist", LOG_ERR);
-						exit(-1);
+						exit(1);
 					}
 				}
 				$user->getrights();
@@ -251,7 +251,7 @@ if (is_array($object->lines) && (count($object->lines) > 0)) {
 				echo " - Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
 				echo "Failed to fetch job ".$line->id."\n";
 				dol_syslog("cron_run_jobs.php::fetch Error ".$cronjob->error, LOG_ERR);
-				exit(-1);
+				exit(1);
 			}
 			// Execute job
 			$result = $cronjob->run_jobs($userlogin);
@@ -275,7 +275,7 @@ if (is_array($object->lines) && (count($object->lines) > 0)) {
 				echo " - Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
 				echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
 				dol_syslog("cron_run_jobs.php::reprogram_jobs Error ".$cronjob->error, LOG_ERR);
-				exit(-1);
+				exit(1);
 			}
 
 			echo " - reprogrammed\n";
diff --git a/scripts/doc/regenerate_docs.php b/scripts/doc/regenerate_docs.php
index 192b473f0f3..feef8577101 100755
--- a/scripts/doc/regenerate_docs.php
+++ b/scripts/doc/regenerate_docs.php
@@ -34,7 +34,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 @set_time_limit(0); // No timeout for this script
@@ -69,7 +69,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 if (empty($argv[1])) {
 	print "Usage:    $script_file  subdirtoscan (test|confirm)\n";
 	print "Example:  $script_file  propale test\n";
-	exit(-1);
+	exit(1);
 }
 
 print '--- start'."\n";
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 2b55389be41..bd3f7e45953 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -37,12 +37,12 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." (ID_MAILING|all) [userloginforsignature] [maxnbofemails]\n";
-	exit(-1);
+	exit(1);
 }
 
 $id = $argv[1];
@@ -76,7 +76,7 @@ $langs->loadLangs(array("main", "mails"));
 
 if (!isModEnabled('mailing')) {
 	print 'Module Emailing not enabled';
-	exit(-1);
+	exit(1);
 }
 
 $hookmanager->initHooks(array('cli'));
@@ -98,7 +98,7 @@ if (getDolGlobalString('MAILING_LIMIT_SENDBYCLI') == '-1') {
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-only mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $user = new User($db);
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index 45abb45715d..653fc0b1e7e 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -36,14 +36,14 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[3]) || !$argv[3]) {
 	print "Usage: ".$script_file." inputfile-with-invalid-emails type [test|confirm]\n";
 	print "- inputfile-with-invalid-emails is a file with list of invalid email\n";
 	print "- type can be 'all' or 'thirdparties', 'contacts', 'members', 'users'\n";
-	exit(-1);
+	exit(1);
 }
 $fileofinvalidemail = $argv[1];
 $type = $argv[2];
@@ -59,7 +59,7 @@ $error = 0;
 
 if (!isModEnabled('mailing')) {
 	print 'Module Emailing not enabled';
-	exit(-1);
+	exit(1);
 }
 
 $hookmanager->initHooks(array('cli'));
@@ -76,12 +76,12 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
 if (!in_array($type, array('all', 'thirdparties', 'contacts', 'users', 'members'))) {
 	print "Bad value for parameter type.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $db->begin();
@@ -90,7 +90,7 @@ $db->begin();
 $myfile = fopen($fileofinvalidemail, "r");
 if (!$myfile) {
 	echo "Failed to open file";
-	exit(-1);
+	exit(1);
 }
 
 $tmp = 1;
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index ea544538b07..ea892b8d804 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -37,7 +37,7 @@ $path = __DIR__.'/';
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[2]) || !$argv[2] || !in_array($argv[1], array('test', 'confirm')) || !in_array($argv[2], array('thirdparties', 'contacts'))) {
@@ -47,7 +47,7 @@ if (!isset($argv[2]) || !$argv[2] || !in_array($argv[1], array('test', 'confirm'
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add param delay (nb of days), only invoice with due date < today + delay are included.\n";
 	print "If you add param after (nb of days), only invoice with due date >= today + delay are included.\n";
-	exit(-1);
+	exit(1);
 }
 $mode = $argv[1];
 $targettype = $argv[2];
@@ -85,7 +85,7 @@ if ($mode != 'confirm') {
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
@@ -230,7 +230,7 @@ if ($resql) {
 	dol_print_error($db);
 	dol_syslog("email_unpaid_invoices_to_customers.php: Error");
 
-	exit(-1);
+	exit(1);
 }
 
 /**
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 48f399fed57..510cb42d772 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -37,7 +37,7 @@ $path = __DIR__.'/';
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm'))) {
@@ -46,7 +46,7 @@ if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm'
 	print "Send an email to users to remind all unpaid customer invoices user is sale representative for.\n";
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add a delay (nb of days), only invoice with due date < today + delay are included.\n";
-	exit(-1);
+	exit(1);
 }
 $mode = $argv[1];
 
@@ -81,7 +81,7 @@ if ($mode != 'confirm') {
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
@@ -186,7 +186,7 @@ if ($resql) {
 	dol_print_error($db);
 	dol_syslog("email_unpaid_invoices_to_representatives.php: Error");
 
-	exit(-1);
+	exit(1);
 }
 
 /**
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 0c1545cf309..49ac8fb5e6b 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -34,7 +34,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 // Include Dolibarr environment
@@ -66,12 +66,12 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 // Check parameters
 if (!isset($argv[1])) {
 	rebuild_merge_pdf_usage();
-	exit(-1);
+	exit(1);
 }
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $diroutputpdf = $conf->facture->dir_output.'/temp';
@@ -139,7 +139,7 @@ foreach ($argv as $key => $value) {
 		$paymentdatebefore = dol_stringtotime($argv[$key + 2].'235959');
 		if (empty($paymentdateafter) || empty($paymentdatebefore)) {
 			print 'Error: Bad date format or value'."\n";
-			exit(-1);
+			exit(1);
 		}
 		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter, 'day', 'gmt')." and ".dol_print_date($paymentdatebefore, 'day', 'gmt').".\n";
 	}
@@ -162,7 +162,7 @@ foreach ($argv as $key => $value) {
 		$result = $bankaccount->fetch(0, $paymentonbankref);
 		if ($result <= 0) {
 			print 'Error: Bank account with ref "'.$paymentonbankref.'" not found'."\n";
-			exit(-1);
+			exit(1);
 		}
 		$paymentonbankid = $bankaccount->id;
 		print 'Rebuild PDF for invoices with at least one payment on financial account '.$bankaccount->ref."\n";
@@ -211,23 +211,23 @@ foreach ($argv as $key => $value) {
 
 	if (!$found && preg_match('/filter=/i', $value)) {
 		rebuild_merge_pdf_usage();
-		exit(-1);
+		exit(1);
 	}
 }
 
 // Check if an option and a filter has been provided
 if (empty($option) && count($filter) <= 0) {
 	rebuild_merge_pdf_usage();
-	exit(-1);
+	exit(1);
 }
 // Check if there is no incompatible choice
 if (in_array('payments', $filter) && in_array('nopayment', $filter)) {
 	rebuild_merge_pdf_usage();
-	exit(-1);
+	exit(1);
 }
 if (in_array('bank', $filter) && in_array('nopayment', $filter)) {
 	rebuild_merge_pdf_usage();
-	exit(-1);
+	exit(1);
 }
 
 // Define SQL and SQL request to select invoices
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 93868a493d9..367d8cb301d 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -35,7 +35,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -62,7 +62,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: $script_file now [-y]\n";
-	exit(-1);
+	exit(1);
 }
 
 foreach ($argv as $key => $val) {
@@ -73,7 +73,7 @@ foreach ($argv as $key => $val) {
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $now = $argv[1];
@@ -109,7 +109,7 @@ if (!$confirmed) {
 /*
  * if (getDolGlobalString('LDAP_MEMBER_ACTIVE') {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
- * exit(-1);
+ * exit(1);
  * }
  */
 
@@ -133,12 +133,12 @@ if ($resql) {
 		$result = $member->fetch($obj->rowid);
 		if ($result < 0) {
 			dol_print_error($db, $member->error);
-			exit(-1);
+			exit(1);
 		}
 		$result = $member->fetch_subscriptions();
 		if ($result < 0) {
 			dol_print_error($db, $member->error);
-			exit(-1);
+			exit(1);
 		}
 
 		print $langs->transnoentities("UpdateMember")." rowid=".$member->id." ".$member->getFullName($langs);
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index d5c8d664bc5..e7ca87ede7c 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -35,7 +35,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -98,7 +98,7 @@ $required_fields = array_unique(array_values(array_filter($required_fields, "dol
 
 if (!isset($argv[2]) || !is_numeric($argv[2])) {
 	print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type  [--server=ldapserverhost] [-y]\n";
-	exit(-1);
+	exit(1);
 }
 
 $typeid = (int) $argv[2];
@@ -142,7 +142,7 @@ print "\n";
 // Check parameters
 if (!getDolGlobalString('LDAP_MEMBER_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
-	exit(-1);
+	exit(1);
 }
 if ($typeid <= 0) {
 	print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
@@ -151,7 +151,7 @@ if ($typeid <= 0) {
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!$confirmed) {
@@ -183,7 +183,7 @@ if ($resql) {
 	}
 } else {
 	dol_print_error($db);
-	exit(-1);
+	exit(1);
 }
 
 $ldap = new Ldap();
diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php
index dcc37dc18b0..47fb87bd576 100755
--- a/scripts/members/sync_members_types_dolibarr2ldap.php
+++ b/scripts/members/sync_members_types_dolibarr2ldap.php
@@ -36,12 +36,12 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." now\n";
-	exit(-1);
+	exit(1);
 }
 
 $now = $argv[1];
@@ -68,13 +68,13 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 /*
  * if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
- * exit(-1);
+ * exit(1);
  * }
  */
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index aece7c2829f..494771f7236 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -37,7 +37,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -73,7 +73,7 @@ $required_fields = array_unique(array_values(array_filter($required_fields, "dol
 if (!isset($argv[1])) {
 	// print "Usage: $script_file (nocommitiferror|commitiferror) [id_group]\n";
 	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
-	exit(-1);
+	exit(1);
 }
 
 foreach ($argv as $key => $val) {
@@ -93,7 +93,7 @@ foreach ($argv as $key => $val) {
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -124,7 +124,7 @@ if (!$confirmed) {
 
 if (!getDolGlobalString('LDAP_MEMBER_TYPE_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
-	exit(-1);
+	exit(1);
 }
 
 $ldap = new Ldap();
diff --git a/scripts/product/migrate_picture_path.php b/scripts/product/migrate_picture_path.php
index 1bc036710d9..51dedcc4b72 100755
--- a/scripts/product/migrate_picture_path.php
+++ b/scripts/product/migrate_picture_path.php
@@ -35,7 +35,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 @set_time_limit(0); // No timeout for this script
@@ -68,7 +68,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (!isset($argv[1]) || $argv[1] != 'product') {
 	print "Usage:  $script_file product\n";
-	exit(-1);
+	exit(1);
 }
 
 print '--- start'."\n";
diff --git a/scripts/product/regenerate_thumbs.php b/scripts/product/regenerate_thumbs.php
index 56ac6266e0b..220f81c0117 100755
--- a/scripts/product/regenerate_thumbs.php
+++ b/scripts/product/regenerate_thumbs.php
@@ -34,7 +34,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 @set_time_limit(0); // No timeout for this script
@@ -68,7 +68,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 if (empty($argv[1])) {
 	print "Usage:    $script_file  subdirtoscan\n";
 	print "Example:  $script_file  produit\n";
-	exit(-1);
+	exit(1);
 }
 
 print '--- start'."\n";
diff --git a/scripts/user/migrate_picture_path.php b/scripts/user/migrate_picture_path.php
index e4df16b9801..8690c5a0b29 100755
--- a/scripts/user/migrate_picture_path.php
+++ b/scripts/user/migrate_picture_path.php
@@ -35,7 +35,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 @set_time_limit(0); // No timeout for this script
@@ -68,7 +68,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (!isset($argv[1]) || $argv[1] != 'user') {
 	print "Usage:  $script_file user\n";
-	exit(-1);
+	exit(1);
 }
 
 print '--- start'."\n";
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index de6e16cfbf8..80023f433e0 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -35,12 +35,12 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." now\n";
-	exit(-1);
+	exit(1);
 }
 $now = $argv[1];
 
@@ -66,7 +66,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 /*
  * if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
- * exit(-1);
+ * exit(1);
  * }
  */
 
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 66b2b35c07f..9a91d90ede5 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -36,7 +36,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -73,7 +73,7 @@ $required_fields = array_unique(array_values(array_filter($required_fields, "dol
 if (!isset($argv[1])) {
 	// print "Usage: $script_file (nocommitiferror|commitiferror) [id_group]\n";
 	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
-	exit(-1);
+	exit(1);
 }
 
 foreach ($argv as $key => $val) {
@@ -123,7 +123,7 @@ if (!$confirmed) {
 
 if (!getDolGlobalString('LDAP_GROUP_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for groups not defined inside Dolibarr");
-	exit(-1);
+	exit(1);
 }
 
 $ldap = new Ldap();
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 7c0e652219c..93c7c61440a 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -35,12 +35,12 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: $script_file now\n";
-	exit(-1);
+	exit(1);
 }
 $now = $argv[1];
 
@@ -66,7 +66,7 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
 /*
  * if (! getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
- * exit(-1);
+ * exit(1);
  * }
  */
 
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 86affad9f7e..40a88d6bad0 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -35,7 +35,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -91,7 +91,7 @@ $required_fields = array_unique(array_values(array_filter($required_fields, "dol
 
 if (!isset($argv[1])) {
 	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
-	exit(-1);
+	exit(1);
 }
 
 foreach ($argv as $key => $val) {
@@ -142,7 +142,7 @@ if (!$confirmed) {
 
 if (!getDolGlobalString('LDAP_USER_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for users not defined inside Dolibarr");
-	exit(-1);
+	exit(1);
 }
 
 // Load table of correspondence of countries
@@ -169,7 +169,7 @@ if ($resql) {
 	}
 } else {
 	dol_print_error($db);
-	exit(-1);
+	exit(1);
 }
 
 $ldap = new Ldap();
diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index fbfd77a5230..765a98e12bb 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -33,7 +33,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 @set_time_limit(0); // No timeout for this script
@@ -55,7 +55,7 @@ if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($w
 	print "Usage: $script_file (test|confirm) website login:pass@serverjoomla/tableprefix/databasejoomla [nbmaxrecord]\n";
 	print "\n";
 	print "Load joomla news and create them into Dolibarr database (if they don't already exist).\n";
-	exit(-1);
+	exit(1);
 }
 
 require $path."../../htdocs/master.inc.php";
@@ -74,7 +74,7 @@ $langs->load('main');
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $joomlaserverinfoarray = preg_split('/(:|@|\/)/', $joomlaserverinfo);
@@ -90,7 +90,7 @@ $website = new Website($db);
 $result = $website->fetch(0, $websiteref);
 if ($result <= 0) {
 	print 'Error, web site '.$websiteref.' not found'."\n";
-	exit(-1);
+	exit(1);
 }
 $websiteid = $website->id;
 $importid = dol_print_date(dol_now(), 'dayhourlog');
@@ -98,7 +98,7 @@ $importid = dol_print_date(dol_now(), 'dayhourlog');
 $dbjoomla = getDoliDBInstance('mysqli', $joomlahost, $joomlalogin, $joomlapass, $joomladatabase, $joomlaport);
 if ($dbjoomla->error) {
 	dol_print_error($dbjoomla, "host=".$joomlahost.", port=".$joomlaport.", user=".$joomlalogin.", databasename=".$joomladatabase.", ".$dbjoomla->error);
-	exit(-1);
+	exit(1);
 }
 
 $sql = 'SELECT c.id, c.title, c.alias, c.created, c.introtext, `fulltext`, c.metadesc, c.metakey, c.language, c.created, c.publish_up, u.username FROM '.$joomlaprefix.'_content as c';
@@ -116,12 +116,12 @@ if (!$resql) {
 $blogpostheader = file_get_contents($path.'blogpost-header.txt');
 if ($blogpostheader === false) {
 	print "Error: Failed to load file content of 'blogpost-header.txt'\n";
-	exit(-1);
+	exit(1);
 }
 $blogpostfooter = file_get_contents($path.'blogpost-footer.txt');
 if ($blogpostfooter === false) {
 	print "Error: Failed to load file content of 'blogpost-footer.txt'\n";
-	exit(-1);
+	exit(1);
 }
 
 
diff --git a/scripts/website/regenerate-pages.php b/scripts/website/regenerate-pages.php
index 7329d4d1ba3..3b64c469830 100755
--- a/scripts/website/regenerate-pages.php
+++ b/scripts/website/regenerate-pages.php
@@ -33,7 +33,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 @set_time_limit(0); // No timeout for this script
@@ -50,7 +50,7 @@ if (empty($argv[2]) || !in_array($argv[1], array('test', 'confirm')) || empty($w
 	print "Usage: $script_file (test|confirm) website [nbmaxrecord]\n";
 	print "\n";
 	print "Regenerate all pages of a web site.\n";
-	exit(-1);
+	exit(1);
 }
 
 require $path."../../htdocs/master.inc.php";
@@ -69,14 +69,14 @@ $langs->load('main');
 
 if (!empty($dolibarr_main_db_readonly)) {
 	print "Error: instance in read-onyl mode\n";
-	exit(-1);
+	exit(1);
 }
 
 $website = new Website($db);
 $result = $website->fetch(0, $websiteref);
 if ($result <= 0) {
 	print 'Error, web site '.$websiteref.' not found'."\n";
-	exit(-1);
+	exit(1);
 }
 
 $websitepagestatic = new WebsitePage($db);
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index 66d2cc52689..22ff81f2824 100755
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -34,7 +34,7 @@ $path = __DIR__.'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -70,7 +70,7 @@ if (!isset($argv[1])) { // Check parameters
 	print "This script check invoices with a withdrawal request and\n";
 	print "then create payment and build a withdraw file.\n";
 	print "Usage: ".$script_file." simu|real\n";
-	exit(-1);
+	exit(1);
 }
 
 $withdrawreceipt = new BonPrelevement($db);

From fe5401d7e2a9d8d741401040e2b3209ca79ee73e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 19:50:36 +0100
Subject: [PATCH 0455/1862] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 1bd5f9e2f65..2a78269244d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,7 +23,8 @@ The following changes may create regressions for some external modules, but were
 * Some API HTTP return code were moved from 401 to 403 to better follow REST specification.
 * dolibarrtriggers class VERSION_XXX constants have been deprecated. Please use array dictionary VERSIONS['XXX'].
 * Properties ->date_update and ->date_modification were merged into date_modification.
-
+* All CLI tools (into /scripts) return a positive value to the shell if error (0 remains success) for a better
+  cross platform compatibility. On linux the exit(-1) was caught as 255, it may be now exit(1) so will be caught as 1.
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****

From 53e47df05385e5e373c15fe4ed330258bef71bca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 20:05:18 +0100
Subject: [PATCH 0456/1862] Use new return code rule

---
 test/phpunit/ScriptsTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index a26c9abbf85..09a8d473658 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -104,7 +104,7 @@ class ScriptsTest extends CommonClassTest
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
 		$this->assertEquals($result, 'Failed to find bank account with ref BANKDUMMY.');
-		$this->assertEquals($returnvar, 255);
+		$this->assertEquals($returnvar, 1);
 
 		return $result;
 	}
@@ -131,7 +131,7 @@ class ScriptsTest extends CommonClassTest
 		print __METHOD__." output=".join("\n",$output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
 		$this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
-		$this->assertEquals($returnvar,255);
+		$this->assertEquals($returnvar, 1);
 		*/
 		$this->assertEquals(0, 0);
 

From 04670b92b3f793ecd2e133d310174e62a2bc46e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2024 20:13:08 +0100
Subject: [PATCH 0457/1862] Fix var_dump

---
 dev/tools/rector/src/Renaming/UsePositiveExit.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tools/rector/src/Renaming/UsePositiveExit.php b/dev/tools/rector/src/Renaming/UsePositiveExit.php
index bc39092acd2..9fbe4e4e3c7 100644
--- a/dev/tools/rector/src/Renaming/UsePositiveExit.php
+++ b/dev/tools/rector/src/Renaming/UsePositiveExit.php
@@ -85,7 +85,6 @@ class UsePositiveExit extends AbstractRector
 			$tmpfunctionname = $this->getName($node);
 			// If function is ok. We must avoid a lot of cases like isset(), empty()
 			if (in_array($tmpfunctionname, array('exit'))) {
-				var_dump($tmpfunctionname);
 				//print "tmpfunctionname=".$tmpfunctionname."\n";
 				$args = $node->getArgs();
 				$nbofparam = count($args);

From 6f8b941c96afb55d4849a21c88b8dd1106b42f99 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:13:34 +0100
Subject: [PATCH 0458/1862] Fix: Script tests on Windows where PHP executable
 is not in path. (#28565)

# Fix: Script tests (on Windows)

- Set `exit(255)` instead of `exit(-1)` in `scripts/bank/export-bank-receipts.php`.
  On *nix, the -1 converts into an exist code of 255 but on windows it
  is -1, making the test fail.
- Add a helper method to execute php scripts using the php binary used
  to run phpunit.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 test/phpunit/CommonClassTest.class.php | 24 ++++++++++++++++++++++++
 test/phpunit/ScriptsTest.php           | 14 +++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index eae67cb1dda..2be3f58362f 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -379,6 +379,30 @@ abstract class CommonClassTest extends TestCase
 		'zapier' => 'Zapier',
 	);
 
+
+	/**
+	 * Run php script (file) using the php binary used for running phpunit.
+	 *
+	 * The PHP executable may not be in the path, or refer to an uncontrolled
+	 * version.
+	 * This ensures that the php script is properly run on multiple platforms.
+	 *
+	 * @param string $phpScriptCommand The command and arguments are run by the php binary.
+	 * @param array  $output           The output returned by the command
+	 * @param int   $exitCode The exit code returned for the execution.
+	 * @return false|string  False on failure, else last line if the output from the command
+	 */
+	protected function runPhpScript($phpScriptCommand, &$output, &$exitCode)
+	{
+		$phpExecutable = PHP_BINARY;
+
+		// Build the command to execute the PHP script
+		$command = "$phpExecutable $phpScriptCommand";
+
+		// Execute the command
+		return exec($command, $output, $exitCode);
+	}
+
 	/**
 	 * Assert that a directory does not exist without triggering deprecation
 	 *
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 09a8d473658..048189b0bd0 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -98,7 +98,7 @@ class ScriptsTest extends CommonClassTest
 		$returnvar = 0;
 		$output = array();
 
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
@@ -156,21 +156,21 @@ class ScriptsTest extends CommonClassTest
 		$output = array();
 
 		$script = dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
 		$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php thirdparties');
 
 		$script = dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
 		$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php contacts');
 
 		$script = dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
@@ -197,21 +197,21 @@ class ScriptsTest extends CommonClassTest
 		$output = array();
 
 		$script = dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
 		$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
 
 		$script = dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";
 		$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php contacts');
 
 		$script = dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
-		$result = exec($script, $output, $returnvar);
+		$result = $this->runPhpScript($script, $output, $returnvar);
 		print __METHOD__." result=".$result."\n";
 		print __METHOD__." output=".join("\n", $output)."\n";
 		print __METHOD__." returnvar=".$returnvar."\n";

From 52df5140a47017dc82f7c3765d69a70f3571a8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:14:30 +0100
Subject: [PATCH 0459/1862] fix phpstan (#28632)

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

diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 3a6929dd230..fa2d119ddd5 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017       Florian HENRY           <florian.henry@atm-consulting.fr>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,10 +47,14 @@ class LoanSchedule extends CommonObject
 
 	public $bank_account;
 	public $bank_line;
+
+	/**
+	 * @var int|string Creation date
+	 */
 	public $datec;
 
 	/**
-	 * @var string Payment date
+	 * @var int|string Payment date
 	 */
 	public $datep;
 

From 31ba3a3723a85089e783add6880b23b32e12a895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:14:52 +0100
Subject: [PATCH 0460/1862] fix phpstan (#28633)

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 487782f7f39..c5209a3790d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -528,7 +528,7 @@ function societe_admin_prepare_head()
  *    @param	int			$searchlabel    Label of country to search (warning: searching on label is not reliable)
  *    @return	mixed       				Integer with country id or String with country code or translated country name or Array('id','code','label') or 'NotDefined'
  */
-function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '', $entconv = 1, $searchlabel = '')
+function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs = null, $entconv = 1, $searchlabel = '')
 {
 	global $db, $langs;
 
@@ -608,7 +608,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
  *    @param    int		    $entconv       	0=Return value without entities and not converted to output charset, 1=Ready for html output
  *    @return   string|array       			String with state code or state name or Array('id','code','label')/Array('id','code','label','region_code','region')
  */
-function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlangs = '', $entconv = 1)
+function getState($id, $withcode = '', $dbtouse = null, $withregion = 0, $outputlangs = null, $entconv = 1)
 {
 	global $db, $langs;
 
@@ -1560,7 +1560,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
  *      @param  string|string[]		$actioncode 	Filter on actioncode
  *      @return	string|void					    	Return html part or void if noprint is 1
  */
-function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '')
+function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = null, $noprint = 0, $actioncode = '')
 {
 	global $user, $conf;
 
@@ -1591,7 +1591,7 @@ function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprin
  *      @param	string			   $module		   You can add module name here if elementtype in table llx_actioncomm is objectkey@module
  *      @return	string|void				           Return html part or void if noprint is 1
  */
-function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC', $module = '')
+function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC', $module = '')
 {
 	global $user, $conf, $hookmanager;
 	global $form;

From ce010a54c7315b5a890fa39cb01bc88c734758c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 00:15:33 +0100
Subject: [PATCH 0461/1862] Clean code and prepare a more powerfull phpunit
 check for sql forging.

---
 ChangeLog                                     |   1 +
 htdocs/accountancy/admin/accountmodel.php     |  18 +--
 htdocs/accountancy/admin/categories_list.php  |  30 ++---
 htdocs/accountancy/admin/journals_list.php    |  22 ++--
 htdocs/accountancy/admin/productaccount.php   |  14 +--
 htdocs/accountancy/bookkeeping/export.php     |   2 +-
 .../class/accountancycategory.class.php       |  12 +-
 .../class/accountingaccount.class.php         |   4 +-
 .../class/accountingjournal.class.php         |  21 ++--
 .../accountancy/class/bookkeeping.class.php   |  16 +--
 htdocs/accountancy/class/lettering.class.php  |  28 ++---
 htdocs/accountancy/customer/index.php         |  30 ++---
 htdocs/accountancy/customer/lines.php         |   2 +-
 htdocs/accountancy/expensereport/index.php    |  10 +-
 htdocs/accountancy/supplier/index.php         |  10 +-
 htdocs/adherents/card.php                     |   3 +-
 htdocs/adherents/class/adherent.class.php     |  12 +-
 .../adherents/class/adherent_type.class.php   |   4 +-
 htdocs/adherents/class/subscription.class.php |   2 +-
 htdocs/admin/dict.php                         |   8 +-
 htdocs/admin/emailcollector_list.php          |   2 +-
 htdocs/asset/class/asset.class.php            |  42 +++----
 htdocs/asset/class/assetmodel.class.php       |  43 +++----
 htdocs/bom/bom_list.php                       |   6 +-
 htdocs/bom/class/bom.class.php                |  24 ++--
 htdocs/bookcal/class/availabilities.class.php |  42 +++----
 htdocs/bookcal/class/calendar.class.php       |  42 +++----
 htdocs/categories/class/categorie.class.php   |  42 +++----
 htdocs/compta/facture/class/facture.class.php |  24 ++--
 htdocs/core/boxes/modules_boxes.php           |   5 +-
 htdocs/core/class/commonobject.class.php      |  37 +++---
 htdocs/core/class/timespent.class.php         |  42 +++----
 htdocs/core/lib/functions.lib.php             |   3 +
 htdocs/core/modules/DolibarrModules.class.php |   4 +-
 htdocs/core/modules/modBookCal.class.php      |   8 +-
 htdocs/hrm/class/evaluation.class.php         |  30 ++---
 htdocs/hrm/class/evaluationdet.class.php      |  30 ++---
 htdocs/hrm/class/job.class.php                |  30 ++---
 htdocs/hrm/class/position.class.php           |  30 ++---
 htdocs/hrm/class/skill.class.php              |  30 ++---
 htdocs/hrm/class/skilldet.class.php           |  30 ++---
 htdocs/hrm/class/skillrank.class.php          |  30 ++---
 htdocs/install/upgrade2.php                   | 116 +++++-------------
 htdocs/langs/en_US/orders.lang                |   2 +-
 .../mailmanspip/class/mailmanspip.class.php   |   7 +-
 .../template/class/myobject.class.php         |  52 +-------
 .../class/partnership_type.class.php          |  40 +++---
 htdocs/product/class/product.class.php        |   4 +-
 htdocs/product/class/productbatch.class.php   |   3 +-
 .../class/stocktransfer.class.php             |  42 +++----
 .../class/stocktransferline.class.php         |  40 +++---
 htdocs/webhook/class/target.class.php         |  33 ++---
 htdocs/website/class/websitepage.class.php    |  56 +++------
 test/phpunit/CodingPhpTest.php                |  48 +++++++-
 54 files changed, 504 insertions(+), 764 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a78269244d..278fc2984c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ The following changes may create regressions for some external modules, but were
 * Properties ->date_update and ->date_modification were merged into date_modification.
 * All CLI tools (into /scripts) return a positive value to the shell if error (0 remains success) for a better
   cross platform compatibility. On linux the exit(-1) was caught as 255, it may be now exit(1) so will be caught as 1.
+* the parameter $filter of method fetchAll does not accept array of SQL but must be a string of an Universal Search Filter syntax.
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 8ff908b61e8..8523baecacc 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -194,7 +194,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		if ($tabrowid[$id]) {
 			// Get free id for insert
 			$newid = 0;
-			$sql = "SELECT MAX(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]);
 			$result = $db->query($sql);
 			if ($result) {
 				$obj = $db->fetch_object($result);
@@ -205,12 +205,12 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 
 		// Add new entry
-		$sql = "INSERT INTO ".$tabname[$id]." (";
+		$sql = "INSERT INTO ".$db->sanitize($tabname[$id])." (";
 		// List of fields
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
-			$sql .= $tabrowid[$id].",";
+			$sql .= $db->sanitize($tabrowid[$id]).",";
 		}
-		$sql .= $tabfieldinsert[$id];
+		$sql .= $db->sanitize($tabfieldinsert[$id]);
 		$sql .= ",active)";
 		$sql .= " VALUES(";
 
@@ -260,10 +260,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 
 		// Modify entry
-		$sql = "UPDATE ".$tabname[$id]." SET ";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
 		// Modifie valeur des champs
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-			$sql .= $tabrowid[$id]."=";
+			$sql .= $db->sanitize($tabrowid[$id])." = ";
 			$sql .= "'".$db->escape($rowid)."', ";
 		}
 		$i = 0;
@@ -302,7 +302,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 		$rowidcol = "rowid";
 	}
 
-	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
+	$sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -317,7 +317,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 
 // activate
 if ($action == 'activate') {
-	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE rowid = ".((int) $rowid);
+	$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE rowid = ".((int) $rowid);
 	$result = $db->query($sql);
 	if (!$result) {
 		dol_print_error($db);
@@ -326,7 +326,7 @@ if ($action == 'activate') {
 
 // disable
 if ($action == $acts[1]) {
-	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE rowid = ".((int) $rowid);
+	$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE rowid = ".((int) $rowid);
 	$result = $db->query($sql);
 	if (!$result) {
 		dol_print_error($db);
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 848b6f14d52..5f6959cccd8 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -202,7 +202,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		if ($tabrowid[$id]) {
 			// Get free id for insert
 			$newid = 0;
-			$sql = "SELECT MAX(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]);
 			$result = $db->query($sql);
 			if ($result) {
 				$obj = $db->fetch_object($result);
@@ -213,12 +213,12 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 
 		// Add new entry
-		$sql = "INSERT INTO ".$tabname[$id]." (";
+		$sql = "INSERT INTO ".$db->sanitize($tabname[$id])." (";
 		// List of fields
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
-			$sql .= $tabrowid[$id].",";
+			$sql .= $db->sanitize($tabrowid[$id]).",";
 		}
-		$sql .= $tabfieldinsert[$id];
+		$sql .= $db->sanitize($tabfieldinsert[$id]);
 		$sql .= ",active)";
 		$sql .= " VALUES(";
 
@@ -266,10 +266,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 
 		// Modify entry
-		$sql = "UPDATE ".$tabname[$id]." SET ";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
 		// Modifie valeur des champs
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-			$sql .= $tabrowid[$id]."=";
+			$sql .= $db->sanitize($tabrowid[$id])." = ";
 			$sql .= "'".$db->escape($rowid)."', ";
 		}
 		$i = 0;
@@ -313,7 +313,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 		$rowidcol = "rowid";
 	}
 
-	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
+	$sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -335,9 +335,9 @@ if ($action == $acts[0]) {
 	}
 
 	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE code = '".$db->escape($code)."'";
 	}
 
 	$result = $db->query($sql);
@@ -355,9 +355,9 @@ if ($action == $acts[1]) {
 	}
 
 	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE code = '".$db->escape($code)."'";
 	}
 
 	$result = $db->query($sql);
@@ -375,9 +375,9 @@ if ($action == 'activate_favorite') {
 	}
 
 	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 1 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
 	}
 
 	$result = $db->query($sql);
@@ -395,9 +395,9 @@ if ($action == 'disable_favorite') {
 	}
 
 	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 0 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
 	}
 
 	$result = $db->query($sql);
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 5aca1af44a3..3c4365844e8 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -186,7 +186,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		if ($tabrowid[$id]) {
 			// Get free id for insert
 			$newid = 0;
-			$sql = "SELECT MAX(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]);
 			$result = $db->query($sql);
 			if ($result) {
 				$obj = $db->fetch_object($result);
@@ -197,12 +197,12 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 
 		// Add new entry
-		$sql = "INSERT INTO ".$tabname[$id]." (";
+		$sql = "INSERT INTO ".$db->sanitize($tabname[$id])." (";
 		// List of fields
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
 			$sql .= $tabrowid[$id].",";
 		}
-		$sql .= $tabfieldinsert[$id];
+		$sql .= $db->sanitize($tabfieldinsert[$id]);
 		$sql .= ",active,entity)";
 		$sql .= " VALUES(";
 
@@ -247,10 +247,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 
 		// Modify entry
-		$sql = "UPDATE ".$tabname[$id]." SET ";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
 		// Modifie valeur des champs
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-			$sql .= $tabrowid[$id]."=";
+			$sql .= $db->sanitize($tabrowid[$id])." = ";
 			$sql .= "'".$db->escape($rowid)."', ";
 		}
 		$i = 0;
@@ -262,7 +262,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			$i++;
 		}
-		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql .= " WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 		$sql .= " AND entity = ".((int) $conf->entity);
 
 		dol_syslog("actionmodify", LOG_DEBUG);
@@ -287,7 +287,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 		$rowidcol = "rowid";
 	}
 
-	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
+	$sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	$sql .= " AND entity = ".((int) $conf->entity);
 
 	dol_syslog("delete", LOG_DEBUG);
@@ -310,9 +310,9 @@ if ($action == $acts[0]) {
 	}
 
 	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$db->escape($code)."'";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE code = '".$db->escape($code)."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
 
@@ -331,9 +331,9 @@ if ($action == $acts[1]) {
 	}
 
 	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$db->escape($code)."'";
+		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE code='".$db->escape($code)."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
 
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 164b5c72c04..a0556a5753a 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -212,19 +212,19 @@ if ($action == 'update') {
 							$nb_exists = $db->num_rows($resql_exists);
 							if ($nb_exists <= 0) {
 								// insert
-								$sql  = "INSERT INTO " . MAIN_DB_PREFIX . "product_perentity (fk_product, entity, " . $db->escape($accountancy_field_name) . ")";
+								$sql  = "INSERT INTO " . MAIN_DB_PREFIX . "product_perentity (fk_product, entity, " . $db->sanitize($accountancy_field_name) . ")";
 								$sql .= " VALUES (" . ((int) $productid) . ", " . ((int) $conf->entity) . ", '" . $db->escape($accounting->account_number) . "')";
 							} else {
 								$obj_exists = $db->fetch_object($resql_exists);
 								// update
 								$sql  = "UPDATE " . MAIN_DB_PREFIX . "product_perentity";
-								$sql .= " SET " . $accountancy_field_name . " = '" . $db->escape($accounting->account_number) . "'";
+								$sql .= " SET " . $db->sanitize($accountancy_field_name) . " = '" . $db->escape($accounting->account_number) . "'";
 								$sql .= " WHERE rowid = " . ((int) $obj_exists->rowid);
 							}
 						}
 					} else {
 						$sql = " UPDATE ".MAIN_DB_PREFIX."product";
-						$sql .= " SET ".$accountancy_field_name." = '".$db->escape($accounting->account_number)."'";
+						$sql .= " SET ".$db->sanitize($accountancy_field_name)." = '".$db->escape($accounting->account_number)."'";
 						$sql .= " WHERE rowid = ".((int) $productid);
 					}
 
@@ -323,16 +323,16 @@ $sql .= " aa.rowid as aaid";
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ppe." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ppe." . $db->sanitize($accountancy_field_name) . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
 } else {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = p." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = p." . $db->sanitize($accountancy_field_name) . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
 }
 if (!empty($searchCategoryProductList)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if (strlen(trim($search_current_account))) {
-	$sql .= natural_search((!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p." : "ppe.") . $accountancy_field_name, $search_current_account);
+	$sql .= natural_search((!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p." : "ppe.") . $db->sanitize($accountancy_field_name), $search_current_account);
 }
 if ($search_current_account_valid == 'withoutvalidaccount') {
 	$sql .= " AND aa.account_number IS NULL";
@@ -346,7 +346,7 @@ if ($searchCategoryProductOperator == 1) {
 		if (intval($searchCategoryProduct) == -2) {
 			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
 		} elseif (intval($searchCategoryProduct) > 0) {
-			$searchCategoryProductSqlList[] = "cp.fk_categorie = ".$db->escape($searchCategoryProduct);
+			$searchCategoryProductSqlList[] = "cp.fk_categorie = ".((int) $searchCategoryProduct);
 		}
 	}
 	if (!empty($searchCategoryProductSqlList)) {
diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 0b826be4a1e..5a782c8718f 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -657,7 +657,7 @@ if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements
 
 						if ($setfields) {
 							$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-							$sql .= " SET ".$setfields;
+							$sql .= " SET ".$db->sanitize($setfields);
 							$sql .= " WHERE rowid = ".((int) $movement->id);
 
 							$result = $db->query($sql);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 4e9a8f93b09..5cd2e95de28 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -211,7 +211,7 @@ class AccountancyCategory // extends CommonObject
 		if ($this->rowid > 0) {
 			$sql .= " ".((int) $this->rowid).",";
 		}
-		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->code) ? "NULL" : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
 		$sql .= " ".(!isset($this->range_account) ? 'NULL' : "'".$this->db->escape($this->range_account)."'").",";
 		$sql .= " ".(!isset($this->sens) ? 'NULL' : "'".$this->db->escape($this->sens)."'").",";
@@ -357,12 +357,12 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " range_account=".(isset($this->range_account) ? "'".$this->db->escape($this->range_account)."'" : "null").",";
-		$sql .= " sens=".(isset($this->sens) ? $this->sens : "null").",";
-		$sql .= " category_type=".(isset($this->category_type) ? $this->category_type : "null").",";
+		$sql .= " sens=".(isset($this->sens) ? ((int) $this->sens) : "null").",";
+		$sql .= " category_type=".(isset($this->category_type) ? ((int) $this->category_type) : "null").",";
 		$sql .= " formula=".(isset($this->formula) ? "'".$this->db->escape($this->formula)."'" : "null").",";
-		$sql .= " position=".(isset($this->position) ? $this->position : "null").",";
-		$sql .= " fk_country=".(isset($this->fk_country) ? $this->fk_country : "null").",";
-		$sql .= " active=".(isset($this->active) ? $this->active : "null");
+		$sql .= " position=".(isset($this->position) ? ((int) $this->position) : "null").",";
+		$sql .= " fk_country=".(isset($this->fk_country) ? ((int) $this->fk_country) : "null").",";
+		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index de202b575e5..b31f39c366d 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -632,7 +632,7 @@ class AccountingAccount extends CommonObject
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
-			$sql .= "SET ".$fieldtouse." = '0'";
+			$sql .= "SET ".$this->db->sanitize($fieldtouse)." = 0";
 			$sql .= " WHERE rowid = ".((int) $id);
 
 			dol_syslog(get_class($this)."::accountDeactivate ".$fieldtouse, LOG_DEBUG);
@@ -670,7 +670,7 @@ class AccountingAccount extends CommonObject
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
-		$sql .= " SET ".$fieldtouse." = '1'";
+		$sql .= " SET ".$this->db->sanitize($fieldtouse)." = 1";
 		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::account_activate ".$fieldtouse, LOG_DEBUG);
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 771e9554ebd..1c1ba9d8ba0 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -161,14 +161,13 @@ class AccountingJournal extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int $limit offset limit
-	 * @param int $offset offset limit
-	 * @param array $filter filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param string 	$sortorder 	Sort Order
+	 * @param string 	$sortfield 	Sort field
+	 * @param int 		$limit 		limit
+	 * @param int 		$offset 	offset limit
+	 * @param array 	$filter 	filter array
+	 * @param string 	$filtermode filter mode (AND or OR)
+	 * @return int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -179,16 +178,16 @@ class AccountingJournal extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.code' || $key == 't.label' || $key == 't.nature') {
-					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
+					$sqlwhere[] = $key."='".$this->db->escape($value)."'";
 				} elseif ($key == 't.rowid' || $key == 't.active') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key.'='.((int) $value);
 				}
 			}
 		}
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
+			$sql .= " AND ".$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f8b3215e083..cef6d2e7891 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -853,7 +853,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param 	string 	$sortorder 		Sort Order
 	 * @param 	string 	$sortfield 		Sort field
-	 * @param 	int 	$limit 			offset limit
+	 * @param 	int 	$limit 			limit
 	 * @param 	int 	$offset 		offset limit
 	 * @param 	array 	$filter 		filter array
 	 * @param 	string 	$filtermode 	filter mode (AND or OR)
@@ -944,7 +944,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
+			$sql .= " AND ".$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
 		}
 		// Filter by ledger account or subledger account
 		if (!empty($option)) {
@@ -1114,7 +1114,7 @@ class BookKeeping extends CommonObject
 			$sql .= " AND t.date_export IS NULL";
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(" ".$filtermode." ", $sqlwhere);
+			$sql .= ' AND '.$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
 		}
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
@@ -1237,7 +1237,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
+			$sql .= " AND ".$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
 		}
 
 		if (!empty($option)) {
@@ -1448,7 +1448,7 @@ class BookKeeping extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element.$mode;
-		$sql .= " SET ".$field." = ".(is_numeric($value) ? ((float) $value) : "'".$this->db->escape($value)."'");
+		$sql .= " SET ".$this->db->sanitize($field)." = ".(is_numeric($value) ? ((float) $value) : "'".$this->db->escape($value)."'");
 		$sql .= " WHERE piece_num = ".((int) $piece_num);
 		$sql .= $sql_filter;
 
@@ -2277,7 +2277,7 @@ class BookKeeping extends CommonObject
 					$sql_list[] = "('" . $this->db->idate($fiscal_period['date_start']) . "' <= {$alias}doc_date AND {$alias}doc_date <= '" . $this->db->idate($fiscal_period['date_end']) . "')";
 				}
 			}
-			self::$can_modify_bookkeeping_sql_cached[$alias] = !empty($sql_list) ? ' AND (' . implode(' OR ', $sql_list) . ')' : '';
+			self::$can_modify_bookkeeping_sql_cached[$alias] = !empty($sql_list) ? ' AND (' . $this->db->sanitize(implode(' OR ', $sql_list), 1, 1, 1) . ')' : '';
 		}
 
 		return self::$can_modify_bookkeeping_sql_cached[$alias];
@@ -2459,7 +2459,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
 		$sql .= " WHERE entity = " . ((int) $conf->entity);
 		if (!empty($filter)) {
-			$sql .= " AND (" . $filter . ')';
+			$sql .= " AND (" . $this->db->sanitize($filter, 1, 1, 1) . ')';
 		}
 		$sql .= $this->db->order('date_start', 'ASC');
 
@@ -2496,7 +2496,7 @@ class BookKeeping extends CommonObject
 
 		$sql = "SELECT YEAR(b.doc_date) as year";
 		for ($i = 1; $i <= 12; $i++) {
-			$sql .= ", SUM(" . $this->db->ifsql("MONTH(b.doc_date)=" . $i, "1", "0") . ") AS month" . $i;
+			$sql .= ", SUM(".$this->db->ifsql("MONTH(b.doc_date) = ".((int) $i), "1", "0") . ") AS month".((int) $i);
 		}
 		$sql .= ", COUNT(b.rowid) as total";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as b";
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index 5686bab7de9..07329030e4b 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -671,11 +671,11 @@ class Lettering extends BookKeeping
 		$bookkeeping_lines_by_type = array();
 		foreach (self::$doc_type_infos as $doc_type => $doc_type_info) {
 			// Get all fk_doc by doc_type from bank ids
-			$sql = "SELECT DISTINCT dp." . $doc_type_info['doc_payment_table_fk_doc'] . " AS fk_doc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . $doc_type_info['payment_table'] . " AS p";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $doc_type_info['doc_payment_table'] . " AS dp ON dp." . $doc_type_info['doc_payment_table_fk_payment'] . " = p.rowid";
-			$sql .= " WHERE p." . $doc_type_info['payment_table_fk_bank'] . " IN (" . $this->db->sanitize(implode(',', $bank_ids)) . ")";
-			$sql .= " AND dp." . $doc_type_info['doc_payment_table_fk_doc'] . " > 0";
+			$sql = "SELECT DISTINCT dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_doc']) . " AS fk_doc";
+			$sql .= " FROM " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['payment_table']) . " AS p";
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['doc_payment_table']) . " AS dp ON dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_payment']) . " = p.rowid";
+			$sql .= " WHERE p." . $this->db->sanitize($doc_type_info['payment_table_fk_bank']) . " IN (" . $this->db->sanitize(implode(',', $bank_ids)) . ")";
+			$sql .= " AND dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_doc']) . " > 0";
 
 			dol_syslog(__METHOD__ . " - Get all fk_doc by doc_type from list of bank ids for '" . $doc_type . "'", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -726,11 +726,11 @@ class Lettering extends BookKeeping
 		$bank_ids = array();
 
 		// Get all fk_doc by doc_type from bank ids
-		$sql = "SELECT DISTINCT p." . $doc_type_info['payment_table_fk_bank'] . " AS fk_doc";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $doc_type_info['payment_table'] . " AS p";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $doc_type_info['doc_payment_table'] . " AS dp ON dp." . $doc_type_info['doc_payment_table_fk_payment'] . " = p.rowid";
-		$sql .= " WHERE dp." . $doc_type_info['doc_payment_table_fk_doc'] . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
-		$sql .= " AND p." . $doc_type_info['payment_table_fk_bank'] . " > 0";
+		$sql = "SELECT DISTINCT p." . $this->db->sanitize($doc_type_info['payment_table_fk_bank']) . " AS fk_doc";
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['payment_table']) . " AS p";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($doc_type_info['doc_payment_table']) . " AS dp ON dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_payment']) . " = p.rowid";
+		$sql .= " WHERE dp." . $this->db->sanitize($doc_type_info['doc_payment_table_fk_doc']) . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
+		$sql .= " AND p." . $this->db->sanitize($doc_type_info['payment_table_fk_bank']) . " > 0";
 
 		dol_syslog(__METHOD__ . " - Get all bank ids from list of document ids of a type '" . $doc_type . "'", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -781,10 +781,10 @@ class Lettering extends BookKeeping
 		$link_by_element = array();
 		$element_by_link = array();
 		foreach ($doc_type_info['linked_info'] as $linked_info) {
-			$sql = "SELECT DISTINCT tl2." . $linked_info['fk_link'] . " AS fk_link, tl2." . $linked_info['fk_doc'] . " AS fk_doc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . $linked_info['table'] . " AS tl";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $linked_info['table'] . " AS tl2 ON tl2." . $linked_info['fk_link'] . " = tl." . $linked_info['fk_link'];
-			$sql .= " WHERE tl." . $linked_info['fk_doc'] . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
+			$sql = "SELECT DISTINCT tl2." . $this->db->sanitize($linked_info['fk_link']) . " AS fk_link, tl2." . $this->db->sanitize($linked_info['fk_doc']) . " AS fk_doc";
+			$sql .= " FROM " . MAIN_DB_PREFIX . $this->db->sanitize($linked_info['table']) . " AS tl";
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->db->sanitize($linked_info['table']) . " AS tl2 ON tl2." . $this->db->sanitize($linked_info['fk_link']) . " = tl." . $this->db->sanitize($linked_info['fk_link']);
+			$sql .= " WHERE tl." . $this->db->sanitize($linked_info['fk_doc']) . " IN (" . $this->db->sanitize(implode(',', $document_ids)) . ")";
 
 			dol_syslog(__METHOD__ . " - Get document lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 391cac7daf4..c5bd8949880 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -157,10 +157,10 @@ if ($action == 'validatehistory') {
 	}
 	$alias_societe_perentity = !getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED') ? "s" : "spe";
 	$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
-	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa  ON ".$db->sanitize($alias_product_perentity).".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa2 ON ".$db->sanitize($alias_product_perentity).".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa3 ON ".$db->sanitize($alias_product_perentity).".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".$db->prefix()."accounting_account as aa4 ON ".$db->sanitize($alias_societe_perentity).".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
 	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 	$sql .= " AND l.product_type <= 2";
 	$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
@@ -347,7 +347,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/customer/list.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -362,7 +362,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef)=".$j, "fd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -484,7 +484,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/customer/lines.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -499,7 +499,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef)=".$j, "fd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -595,7 +595,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -605,7 +605,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= "  SUM(".$db->ifsql("MONTH(f.datef)=".$j, "fd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+		$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -655,7 +655,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 			if ($j > 12) {
 				$j -= 12;
 			}
-			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
 		print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -668,14 +668,14 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 					$j -= 12;
 				}
 				$sql .= " SUM(".$db->ifsql(
-					"MONTH(f.datef)=".$j,
+					"MONTH(f.datef) = ".((int) $j),
 					" (".$db->ifsql(
 								"fd.total_ht < 0",
 								" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
 								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
 							).")",
 					0
-				).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+				).") AS month".str_pad((int) $j, 2, '0', STR_PAD_LEFT).",";
 			}
 			$sql .= "  SUM(".$db->ifsql(
 				"fd.total_ht < 0",
@@ -690,14 +690,14 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 					$j -= 12;
 				}
 				$sql .= " SUM(".$db->ifsql(
-					"MONTH(f.datef)=".$j,
+					"MONTH(f.datef) = ".((int) $j),
 					" (".$db->ifsql(
 						"fd.total_ht < 0",
 						" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty)))",
 						"  (fd.total_ht - (fd.buy_price_ht * fd.qty))"
 					).")",
 					0
-				).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+				).") AS month".str_pad((int) $j, 2, '0', STR_PAD_LEFT).",";
 			}
 			$sql .= "  SUM(".$db->ifsql(
 				"fd.total_ht < 0",
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 5994dba600e..74753c65977 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -140,7 +140,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('ac
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet";
-		$sql1 .= " SET fk_code_ventilation=".(GETPOSTINT('account_parent') > 0 ? GETPOSTINT('account_parent') : '0');
+		$sql1 .= " SET fk_code_ventilation = ".(GETPOSTINT('account_parent') > 0 ? GETPOSTINT('account_parent') : 0);
 		$sql1 .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
 
 		dol_syslog('accountancy/customer/lines.php::changeaccount sql= '.$sql1);
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 00f52f0dd49..f72ad2b3037 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -223,7 +223,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_month='.$tmp['mon'].'&search_year='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/list.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -238,7 +238,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(er.date_debut)=".$j, "erd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(er.date_debut) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= " SUM(erd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -338,7 +338,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -349,7 +349,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= " SUM(".$db->ifsql("MONTH(er.date_debut)=".$j, "erd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= " SUM(".$db->ifsql("MONTH(er.date_debut) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= " ROUND(SUM(erd.total_ht),2) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -436,7 +436,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= " SUM(".$db->ifsql("MONTH(er.date_create)=".$j, "erd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+		$sql .= " SUM(".$db->ifsql("MONTH(er.date_create) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= " SUM(erd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index ace576b4232..dea3d7b875a 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -340,7 +340,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/list.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -355,7 +355,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef)=".$j, "ffd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM ".$db->prefix()."facture_fourn_det as ffd";
@@ -487,7 +487,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef)=".$j, "ffd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM ".$db->prefix()."facture_fourn_det as ffd";
@@ -571,7 +571,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -581,7 +581,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef)=".$j, "ffd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+		$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(ffd.total_ht) as total";
 	$sql .= " FROM ".$db->prefix()."facture_fourn_det as ffd";
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index eeff802a2e4..151859f52d7 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1169,7 +1169,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// We set country_id, and country_code, country of the chosen country
 		$country = GETPOSTINT('country');
 		if (!empty($country) || $object->country_id) {
-			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country) ? $country : $object->country_id);
+			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country";
+			$sql .= " WHERE rowid = ".(int) (!empty($country) ? $country : $object->country_id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 951b19a439d..7a88f72e0d0 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -754,13 +754,13 @@ class Adherent extends CommonObject
 		$sql .= ", login = ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
 		$sql .= ", societe = ".($this->company ? "'".$this->db->escape($this->company)."'" : ($this->societe ? "'".$this->db->escape($this->societe)."'" : "null"));
 		if ($this->socid) {
-			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->db->escape($this->socid) : "null");	 // Must be modified only when creating from a third-party
+			$sql .= ", fk_soc = ".($this->socid > 0 ? (int) $this->socid : "null");	 // Must be modified only when creating from a third-party
 		}
 		$sql .= ", address = ".($this->address ? "'".$this->db->escape($this->address)."'" : "null");
 		$sql .= ", zip = ".($this->zip ? "'".$this->db->escape($this->zip)."'" : "null");
 		$sql .= ", town = ".($this->town ? "'".$this->db->escape($this->town)."'" : "null");
-		$sql .= ", country = ".($this->country_id > 0 ? $this->db->escape($this->country_id) : "null");
-		$sql .= ", state_id = ".($this->state_id > 0 ? $this->db->escape($this->state_id) : "null");
+		$sql .= ", country = ".($this->country_id > 0 ? (int) $this->country_id : "null");
+		$sql .= ", state_id = ".($this->state_id > 0 ? (int) $this->state_id : "null");
 		$sql .= ", email = '".$this->db->escape($this->email)."'";
 		$sql .= ", url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 		$sql .= ", socialnetworks = ".($this->socialnetworks ? "'".$this->db->escape(json_encode($this->socialnetworks))."'" : "null");
@@ -771,9 +771,9 @@ class Adherent extends CommonObject
 		$sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
 		$sql .= ", public = '".$this->db->escape($this->public)."'";
-		$sql .= ", statut = ".$this->db->escape($this->statut);
+		$sql .= ", statut = ".(int) $this->statut;
 		$sql .= ", default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
-		$sql .= ", fk_adherent_type = ".$this->db->escape($this->typeid);
+		$sql .= ", fk_adherent_type = ".(int) $this->typeid;
 		$sql .= ", morphy = '".$this->db->escape($this->morphy)."'";
 		$sql .= ", birth = ".($this->birth ? "'".$this->db->idate($this->birth)."'" : "null");
 
@@ -1284,7 +1284,7 @@ class Adherent extends CommonObject
 		}
 
 		// Add link to third party for current member
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid > 0 ? $thirdpartyid : 'null');
+		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid > 0 ? (int) $thirdpartyid : 'null');
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 44f51ff9aca..aab2322d098 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -246,7 +246,7 @@ class AdherentType extends CommonObject
 				} else {
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
 					$sql2 .= ")";
-					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " VALUES(".((int) $this->id).",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					$sql2 .= ")";
 				}
@@ -395,7 +395,7 @@ class AdherentType extends CommonObject
 		$sql .= "libelle = '".$this->db->escape($this->label)."',";
 		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
-		$sql .= "amount = ".((empty($this->amount) && $this->amount == '') ? 'null' : ((float) $this->amount)).",";
+		$sql .= "amount = ".((empty($this->amount) && $this->amount == '') ? "null" : ((float) $this->amount)).",";
 		$sql .= "caneditamount = ".((int) $this->caneditamount).",";
 		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
 		$sql .= "note = '".$this->db->escape($this->note_public)."',";
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index d0ddd730d61..111cb2c04ea 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -279,7 +279,7 @@ class Subscription extends CommonObject
 		$sql .= " fk_type = ".((int) $this->fk_type).",";
 		$sql .= " fk_adherent = ".((int) $this->fk_adherent).",";
 		$sql .= " note = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null').",";
-		$sql .= " subscription = ".price2num($this->amount).",";
+		$sql .= " subscription = ".(float) price2num($this->amount).",";
 		$sql .= " dateadh = '".$this->db->idate($this->dateh)."',";
 		$sql .= " datef = '".$this->db->idate($this->datef)."',";
 		$sql .= " datec = '".$this->db->idate($this->datec)."',";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index a07b083ca12..0abc9213fb7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1014,9 +1014,9 @@ if (empty($reshook)) {
 				$i++;
 			}
 			if (in_array($rowidcol, array('code', 'code_iso'))) {
-				$sql .= " WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+				$sql .= " WHERE ".$db->sanitize($rowidcol)." = '".$db->escape($rowid)."'";
 			} else {
-				$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+				$sql .= " WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 			}
 			if (in_array('entity', $listfieldmodify)) {
 				$sql .= " AND entity = ".((int) getEntity($tablename, 0));
@@ -1284,9 +1284,9 @@ if ($id > 0) {
 		$sql .= natural_search($tablecode, $search_code);
 	}
 	if ($search_active == 'yes') {
-		$sql .= " AND ".$tableprefix."active = 1";
+		$sql .= " AND ".$db->sanitize($tableprefix)."active = 1";
 	} elseif ($search_active == 'no') {
-		$sql .= " AND ".$tableprefix."active = 0";
+		$sql .= " AND ".$db->sanitize($tableprefix)."active = 0";
 	}
 	//var_dump($sql);
 
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index c8c4869e7d9..8d0c4ff1f27 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -245,7 +245,7 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->sanitize($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 4b468a5633c..296659dda53 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -389,18 +389,17 @@ class Asset extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -414,24 +413,13 @@ class Asset extends CommonObject
 			$sql .= " WHERE 1 = 1";
 		}
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 12132d4b65a..768e2cd8e33 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -339,18 +339,17 @@ class AssetModel extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield   	 Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -363,25 +362,13 @@ class AssetModel extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index a1bb6de9595..cbf1f8cccf5 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -339,17 +339,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->sanitize($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->sanitize($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->sanitize($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index ba88dfff476..e2ffdea9382 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -509,23 +509,13 @@ class BOM extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index e06d0244f01..5b81b8605d3 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -383,18 +383,17 @@ class Availabilities extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -407,25 +406,14 @@ class Availabilities extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index a4a59c6d48c..ea0e5e13bba 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -341,15 +341,16 @@ class Calendar extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -363,25 +364,14 @@ class Calendar extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 74310aea526..9cd365428f5 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -863,18 +863,19 @@ class Categorie extends CommonObject
 	/**
 	 * Return list of fetched instance of elements having this category
 	 *
-	 * @param   string     	$type       Type of category ('customer', 'supplier', 'contact', 'product', 'member', 'knowledge_management', ...)
-	 * @param   int        	$onlyids    Return only ids of objects (consume less memory)
-	 * @param	int			$limit		Limit
-	 * @param	int			$offset		Offset
-	 * @param	string		$sortfield	Sort fields
-	 * @param	string		$sortorder	Sort order ('ASC' or 'DESC');
-	 * @param   array       $filter     Filter array. Example array('field'=>'valueforlike', 'customsql'=>...)
-	 * @param   string      $filtermode Filter mode (AND or OR)
-	 * @return  CommonObject[]|int[]|int              	Return -1 if KO, array of instance of object if OK
+	 * @param   string     	$type       	Type of category ('customer', 'supplier', 'contact', 'product', 'member', 'knowledge_management', ...)
+	 * @param   int        	$onlyids    	Return only ids of objects (consume less memory)
+	 * @param	int			$limit			Limit
+	 * @param	int			$offset			Offset
+	 * @param	string		$sortfield		Sort fields
+	 * @param	string		$sortorder		Sort order ('ASC' or 'DESC');
+	 * @param  	string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  	string      $filtermode   	No more used
+	 * @return  CommonObject[]|int[]|int    Return -1 if KO, array of instance of object if OK
 	 * @see containsObject()
 	 */
-	public function getObjectsInCateg($type, $onlyids = 0, $limit = 0, $offset = 0, $sortfield = '', $sortorder = 'ASC', $filter = array(), $filtermode = 'AND')
+	public function getObjectsInCateg($type, $onlyids = 0, $limit = 0, $offset = 0, $sortfield = '', $sortorder = 'ASC', $filter = '', $filtermode = 'AND')
 	{
 		global $user;
 
@@ -898,20 +899,15 @@ class Categorie extends CommonObject
 		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
 			$sql .= " AND o.rowid = ".((int) $user->socid);
 		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 'o.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
+
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit > 0 || $offset > 0) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c37501e3377..b9d5e4b7dca 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2508,18 +2508,18 @@ class Facture extends CommonInvoice
 		$sql .= " paye=".(isset($this->paye) ? $this->db->escape($this->paye) : 0).",";
 		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
 		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
-		$sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
-		$sql .= " localtax1=".(isset($this->total_localtax1) ? $this->total_localtax1 : "null").",";
-		$sql .= " localtax2=".(isset($this->total_localtax2) ? $this->total_localtax2 : "null").",";
-		$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
-		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
-		$sql .= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '') ? $this->db->escape($this->revenuestamp) : "null").",";
-		$sql .= " fk_statut=".(isset($this->status) ? $this->db->escape($this->status) : "null").",";
-		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->db->escape($this->fk_user_valid) : "null").",";
-		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->db->escape($this->fk_facture_source) : "null").",";
-		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->db->escape($this->fk_project) : "null").",";
-		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->db->escape($this->cond_reglement_id) : "null").",";
-		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->db->escape($this->mode_reglement_id) : "null").",";
+		$sql .= " total_tva=".(isset($this->total_tva) ? (float) $this->total_tva : "null").",";
+		$sql .= " localtax1=".(isset($this->total_localtax1) ? (float) $this->total_localtax1 : "null").",";
+		$sql .= " localtax2=".(isset($this->total_localtax2) ? (float) $this->total_localtax2 : "null").",";
+		$sql .= " total_ht=".(isset($this->total_ht) ? (float) $this->total_ht : "null").",";
+		$sql .= " total_ttc=".(isset($this->total_ttc) ? (float) $this->total_ttc : "null").",";
+		$sql .= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '') ? (int) $this->revenuestamp : "null").",";
+		$sql .= " fk_statut=".(isset($this->status) ? (int) $this->status : "null").",";
+		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? (int) $this->fk_user_valid : "null").",";
+		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? (int) $this->fk_facture_source : "null").",";
+		$sql .= " fk_projet=".(isset($this->fk_project) ? (int) $this->fk_project : "null").",";
+		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->escape($this->cond_reglement_id) : "null").",";
+		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? (int) $this->mode_reglement_id : "null").",";
 		$sql .= " date_lim_reglement=".(strval($this->date_lim_reglement) != '' ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'null').",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1bfd9688e2c..9be28e8bfc0 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -168,7 +168,8 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 		$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b";
 		$sql .= " WHERE b.entity = ".$conf->entity;
 		$sql .= " AND b.rowid = ".((int) $rowid);
-		dol_syslog(get_class($this)."::fetch rowid=".$rowid);
+
+		dol_syslog(get_class($this)."::fetch rowid=".((int) $rowid));
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -202,7 +203,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 		global $langs, $user, $conf;
 
 		if (!empty($this->hidden)) {
-			return '\n<!-- Box ".get_class($this)." hidden -->\n'; // Nothing done if hidden (for example when user has no permission)
+			return "\n<!-- Box ".get_class($this)." hidden -->\n"; // Nothing done if hidden (for example when user has no permission)
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f266588d090..f40841ba11b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10268,14 +10268,15 @@ abstract class CommonObject
 	/**
 	 * Delete all child object from a parent ID
 	 *
-	 * @param		int		$parentId      Parent Id
-	 * @param		string	$parentField   Name of Foreign key parent column
-	 * @param 		array 	$filter		an array filter
-	 * @param		string	$filtermode	AND or OR
-	 * @return		int						Return integer <0 if KO, >0 if OK
-	 * @throws Exception
+	 * @param	int			$parentId      	Parent Id
+	 * @param	string		$parentField   	Name of Foreign key parent column
+	 * @param 	string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  	string      $filtermode   	No more used
+	 * @return	int							Return integer <0 if KO, >0 if OK
+	 * @throws 	Exception
 	 */
-	public function deleteByParentField($parentId = 0, $parentField = '', $filter = array(), $filtermode = "AND")
+	public function deleteByParentField($parentId = 0, $parentField = '', $filter = '', $filtermode = "AND")
 	{
 		global $user;
 
@@ -10288,21 +10289,13 @@ abstract class CommonObject
 			$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element;
 			$sql .= " WHERE ".$parentField." = ".(int) $parentId;
 
-			// Manage filters
-			$sqlwhere = array();
-			if (count($filter) > 0) {
-				foreach ($filter as $key => $value) {
-					if ($key == 'customsql') {
-						$sqlwhere[] = $value;
-					} elseif (strpos($value, '%') === false) {
-						$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-					} else {
-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-					}
-				}
-			}
-			if (count($sqlwhere) > 0) {
-				$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+			// Manage filter
+			$errormessage = '';
+			$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+			if ($errormessage) {
+				$this->errors[] = $errormessage;
+				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				return -1;
 			}
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 36cedd67896..23544f73edd 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -321,15 +321,16 @@ class TimeSpent extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		global $conf;
 
@@ -345,25 +346,14 @@ class TimeSpent extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6780c85e858..afdcc39cb52 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12697,6 +12697,9 @@ function jsonOrUnserialize($stringtodecode)
  */
 function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand = 0, $nopar = 0, $noerror = 0)
 {
+	if ($filter === '') {
+		return '';
+	}
 	if (!preg_match('/^\(.*\)$/', $filter)) {    // If $filter does not start and end with ()
 		$filter = '(' . $filter . ')';
 	}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 5a708ecac02..520a7ecc1f1 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1746,7 +1746,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			return 0;
 		}
 
-		dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		foreach ($this->const as $key => $value) {
 			$name      = $this->const[$key][0];
@@ -1788,7 +1788,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						$err++;
 					}
 				} else {
-					dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_DEBUG);
+					dol_syslog(__METHOD__." constant '".$name."' already exists", LOG_DEBUG);
 				}
 			} else {
 				$err++;
diff --git a/htdocs/core/modules/modBookCal.class.php b/htdocs/core/modules/modBookCal.class.php
index aea486d455a..6ae92d3142a 100644
--- a/htdocs/core/modules/modBookCal.class.php
+++ b/htdocs/core/modules/modBookCal.class.php
@@ -584,10 +584,10 @@ class modBookCal extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")"
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".$this->db->escape(strtolower($myTmpObjectKey))."' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".$this->db->escape(strtolower($myTmpObjectKey))."', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".$this->db->escape(strtolower($myTmpObjectKey))."_odt' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".$this->db->escape(strtolower($myTmpObjectKey))."_odt', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")"
 				));
 			}
 		}
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index be133e09c62..50d2dce5c1c 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -390,8 +390,9 @@ class Evaluation extends CommonObject
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -410,25 +411,14 @@ class Evaluation extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 216b5ff1704..247e9feaeb4 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -356,8 +356,9 @@ class EvaluationLine extends CommonObjectLine
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -376,25 +377,14 @@ class EvaluationLine extends CommonObjectLine
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 743a5f75e02..4799957bae6 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -360,8 +360,9 @@ class Job extends CommonObject
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -380,25 +381,14 @@ class Job extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 14fe2f18be4..18f28abb5ac 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -369,8 +369,9 @@ class Position extends CommonObject
 	 * @param string $sortfield Sort field
 	 * @param int $limit limit
 	 * @param int $offset Offset
-	 * @param array $filter Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param string $filtermode Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -389,25 +390,14 @@ class Position extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key . '=' . $value;
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key . ' = \'' . $this->db->idate($value) . '\'';
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key . ' IN (' . $this->db->sanitize($this->db->escape($value)) . ')';
-				} else {
-					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 6d3be881130..60292ff94d8 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -428,8 +428,9 @@ class Skill extends CommonObject
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -448,25 +449,14 @@ class Skill extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 8865aa94db8..fb69b0454cd 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -351,8 +351,9 @@ class Skilldet extends CommonObjectLine
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -371,25 +372,14 @@ class Skilldet extends CommonObjectLine
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 788cf2a1ded..9babe71a842 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -399,8 +399,9 @@ class SkillRank extends CommonObject
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
@@ -419,25 +420,14 @@ class SkillRank extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && $key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index f7d513d4e3f..536d9d7bee5 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1575,7 +1575,7 @@ function migrate_price_facture($db, $langs, $conf)
 				$facligne->total_ttc = $total_ttc;
 
 				dolibarr_install_syslog("upgrade2: line ".$rowid.": facid=".$obj->facid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-				print ". ";
+				print '. ';
 				$facligne->update_total();
 
 
@@ -1676,29 +1676,9 @@ function migrate_price_propal($db, $langs, $conf)
 				$propalligne->total_ttc = $total_ttc;
 
 				dolibarr_install_syslog("upgrade2: Line ".$rowid.": propalid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-				print ". ";
+				print '. ';
 				$propalligne->update_total();
 
-
-				/* On touche pas a propal mere
-				 $propal = new Propal($db);
-				 $propal->id=$obj->rowid;
-				 if ( $propal->fetch($propal->id) >= 0 )
-				 {
-				 if ( $propal->update_price() > 0 )
-				 {
-				 print ". ";
-				 }
-				 else
-				 {
-				 print "Error id=".$propal->id;
-				 }
-				 }
-				 else
-				 {
-				 print "Error #3";
-				 }
-				 */
 				$i++;
 			}
 		} else {
@@ -1780,7 +1760,7 @@ function migrate_price_contrat($db, $langs, $conf)
 				$contratligne->total_ttc = $total_ttc;
 
 				dolibarr_install_syslog("upgrade2: Line ".$rowid.": contratdetid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent."  -> ".$total_ht.", ".$total_tva." , ".$total_ttc);
-				print ". ";
+				print '. ';
 				$contratligne->update_total();
 
 				$i++;
@@ -1861,28 +1841,9 @@ function migrate_price_commande($db, $langs, $conf)
 				$commandeligne->total_ttc = $total_ttc;
 
 				dolibarr_install_syslog("upgrade2: Line ".$rowid." : commandeid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global."  -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-				print ". ";
+				print '. ';
 				$commandeligne->update_total();
 
-				/* On touche pas a facture mere
-				 $commande = new Commande($db);
-				 $commande->id = $obj->rowid;
-				 if ( $commande->fetch($commande->id) >= 0 )
-				 {
-				 if ( $commande->update_price() > 0 )
-				 {
-				 print ". ";
-				 }
-				 else
-				 {
-				 print "Error id=".$commande->id;
-				 }
-				 }
-				 else
-				 {
-				 print "Error #3";
-				 }
-				 */
 				$i++;
 			}
 		} else {
@@ -1973,28 +1934,9 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
 				$commandeligne->total_ttc = $total_ttc;
 
 				dolibarr_install_syslog("upgrade2: Line ".$rowid.": commandeid=".$obj->rowid." pu=".$pu."  qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-				print ". ";
+				print '. ';
 				$commandeligne->update_total();
 
-				/* On touche pas a facture mere
-				 $commande = new Commande($db);
-				 $commande->id = $obj->rowid;
-				 if ( $commande->fetch($commande->id) >= 0 )
-				 {
-				 if ( $commande->update_price() > 0 )
-				 {
-				 print ". ";
-				 }
-				 else
-				 {
-				 print "Error id=".$commande->id;
-				 }
-				 }
-				 else
-				 {
-				 print "Error #3";
-				 }
-				 */
 				$i++;
 			}
 		} else {
@@ -2125,7 +2067,7 @@ function migrate_commande_expedition($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			}
@@ -2205,7 +2147,7 @@ function migrate_commande_livraison($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			}
@@ -2301,7 +2243,7 @@ function migrate_detail_livraison($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			}
@@ -2373,7 +2315,7 @@ function migrate_stocks($db, $langs, $conf)
 					$error++;
 					dol_print_error($db);
 				}
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		}
@@ -2437,7 +2379,7 @@ function migrate_menus($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			}
@@ -2505,7 +2447,7 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			} else {
@@ -2589,7 +2531,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
 					$error++;
 					dol_print_error($db);
 				}
-				//print ". ";
+				//print '. ';
 				$i++;
 			}
 		} else {
@@ -2648,7 +2590,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
 					$error++;
 					dol_print_error($db);
 				}
-				//print ". ";
+				//print '. ';
 				$i++;
 			}
 		} else {
@@ -2725,7 +2667,7 @@ function migrate_project_user_resp($db, $langs, $conf)
 							dol_print_error($db);
 						}
 					}
-					print ". ";
+					print '. ';
 
 					$i++;
 				}
@@ -2803,7 +2745,7 @@ function migrate_project_task_actors($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			}
@@ -2884,7 +2826,7 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			} else {
@@ -2964,7 +2906,7 @@ function migrate_element_time($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$oldtime++;
 					if (!empty($totaltime[$obj->fk_element])) {
 						$totaltime[$obj->fk_element] += $newtime;
@@ -3073,7 +3015,7 @@ function migrate_customerorder_shipping($db, $langs, $conf)
 							$error++;
 							dol_print_error($db);
 						}
-						print ". ";
+						print '. ';
 						$i++;
 					}
 				} else {
@@ -3160,7 +3102,7 @@ function migrate_shipping_delivery($db, $langs, $conf)
 							$error++;
 							dol_print_error($db);
 						}
-						print ". ";
+						print '. ';
 					} else {
 						$error++;
 						dol_print_error($db);
@@ -3248,7 +3190,7 @@ function migrate_shipping_delivery2($db, $langs, $conf)
 					$error++;
 					dol_print_error($db);
 				}
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
@@ -3315,7 +3257,7 @@ function migrate_actioncomm_element($db, $langs, $conf)
 				// We will drop at next version because a migrate should be runnable several times if it fails.
 				//$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."actioncomm DROP COLUMN ".$field;
 				//$db->query($sqlDrop);
-				//print ". ";
+				//print '. ';
 			} else {
 				dol_print_error($db);
 				$db->rollback();
@@ -3392,7 +3334,7 @@ function migrate_mode_reglement($db, $langs, $conf)
 							dol_print_error($db);
 							$error++;
 						}
-						print ". ";
+						print '. ';
 					}
 
 					if (!$error) {
@@ -3536,7 +3478,7 @@ function migrate_categorie_association($db, $langs, $conf)
 						$error++;
 						dol_print_error($db);
 					}
-					print ". ";
+					print '. ';
 					$i++;
 				}
 			} else {
@@ -3604,7 +3546,7 @@ function migrate_event_assignement($db, $langs, $conf)
 					$error++;
 					dol_print_error($db);
 				}
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
@@ -3670,7 +3612,7 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 					$error++;
 					dol_print_error($db);
 				}
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
@@ -3837,7 +3779,7 @@ function migrate_remise_entity($db, $langs, $conf)
 					dol_print_error($db);
 				}
 
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
@@ -3928,7 +3870,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 					dol_print_error($db);
 				}
 
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
@@ -3993,7 +3935,7 @@ function migrate_user_rights_entity($db, $langs, $conf)
 					dol_print_error($db);
 				}
 
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
@@ -4058,7 +4000,7 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 					dol_print_error($db);
 				}
 
-				print ". ";
+				print '. ';
 				$i++;
 			}
 		} else {
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index acee379edad..b7b702892fb 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -99,7 +99,7 @@ ListOfOrders=List of orders
 ListOrderLigne=Lines of orders
 productobuy=Products to buy only
 productonly=Products only
-disablelinefree=No free lines
+disablelinefree=Predefined products only
 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?
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 462e553847e..9d9d065ed19 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -156,7 +156,7 @@ class MailmanSpip
 	 *  Fonction qui donne les droits redacteurs dans spip
 	 *
 	 *	@param	Adherent	$object		Object with data (->firstname, ->lastname, ->email and ->login)
-	 *  @return	int					=0 if KO, >0 if OK
+	 *  @return	int						=0 if KO, >0 if OK
 	 */
 	public function add_to_spip($object)
 	{
@@ -171,7 +171,10 @@ class MailmanSpip
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 					$mdpass = dol_hash($object->pass);
 					$htpass = crypt($object->pass, makesalt());
-					$query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname, $object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
+
+					$query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut)";
+					$query .= " VALUES('".$mydb->escape(dolGetFirstLastname($object->firstname, $object->lastname))."', '".$mydb->escape($object->email)."',";
+					$query .= " '".$mydb->escape($object->login)."', '".$mydb->escape($mdpass)."', '".$mydb->escape($htpass)."', FLOOR(32000*RAND()), '1comite')";
 
 					$result = $mydb->query($query);
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c0363bbc5b6..7d8a3e0556a 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -442,7 +442,7 @@ class MyObject extends CommonObject
 	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
-	 * @param  string      	$filtermode   	Filter mode (AND or OR)
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 1000, $offset = 0, string $filter = '', $filtermode = 'AND')
@@ -462,63 +462,15 @@ class MyObject extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
-		// Manage filter
-		/* We keep this part of code that is still used by a lot of old class. The 'else" shows how to switch to Universal Search filters
-		$sqlwhere = array();
-		if (is_array($filter) && count($filter) > 0) {
-			dol_syslog("Warning: Use of an array  as filter is now forbidden and deprecated. Use an universal SQL filter string instead", LOG_WARNING);
-			foreach ($filter as $key => $value) {
-				$columnName = preg_replace('/^t\./', '', $key);
-				if ($key === 'customsql') {
-					// Never use 'customsql' with a value from a user input since it is injected as is. The value must be hard coded.
-					$sqlwhere[] = $value;
-					continue;
-				} elseif (isset($this->fields[$columnName])) {
-					$type = $this->fields[$columnName]['type'];
-					if (preg_match('/^integer/', $type)) {
-						if (is_int($value)) {
-							// single value
-							$sqlwhere[] = $key . " = " . intval($value);
-						} elseif (is_array($value)) {
-							if (empty($value)) {
-								continue;
-							}
-							$sqlwhere[] = $key . ' IN (' . $this->db->sanitize(implode(',', array_map('intval', $value))) . ')';
-						}
-						continue;
-					} elseif (in_array($type, array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $key . " = '" . $this->db->idate($value) . "'";
-						continue;
-					}
-				}
 
-				// when the $key doesn't fall into the previously handled categories, we do as if the column were a varchar/text
-				if (is_array($value) && count($value)) {
-					$value = implode(',', array_map(function ($v) {
-						return "'" . $this->db->sanitize($this->db->escape($v)) . "'";
-					}, $value));
-					$sqlwhere[] = $key . ' IN (' . $this->db->sanitize($value, true) . ')';
-				} elseif (is_scalar($value)) {
-					if (strpos($value, '%') === false) {
-						$sqlwhere[] = $key . " = '" . $this->db->sanitize($this->db->escape($value)) . "'";
-					} else {
-						$sqlwhere[] = $key . " LIKE '%" . $this->db->escape($this->db->escapeforlike($value)) . "%'";
-					}
-				}
-			}
-		} else { */
+		// Manage filter
 		$errormessage = '';
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
 			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
-
 			return -1;
 		}
-		/*}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
-		}*/
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 06f7ab7b35c..97e87ce88e0 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -151,13 +151,14 @@ class PartnershipType extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -175,25 +176,14 @@ class PartnershipType extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 262fbeaeb6c..feb1dde19ce 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1697,7 +1697,7 @@ class Product extends CommonObject
 						$sql2 .= ", note";
 					}
 					$sql2 .= ")";
-					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
+					$sql2 .= " VALUES(".((int) $this->id).",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
 					$sql2 .= " '".$this->db->escape($this->description)."'";
 					if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 						$sql2 .= ", '".$this->db->escape($this->other)."'";
@@ -1737,7 +1737,7 @@ class Product extends CommonObject
 						$sql2 .= ", note";
 					}
 					$sql2 .= ")";
-					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " VALUES(".((int) $this->id).",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
 					$sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 						$sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index a447910fe5d..2da779311c4 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -386,6 +386,7 @@ class Productbatch extends CommonObject
 	public function find($fk_product_stock = 0, $eatby = null, $sellby = null, $batch_number = '', $fk_warehouse = 0)
 	{
 		$where = array();
+
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.tms,";
@@ -414,7 +415,7 @@ class Productbatch extends CommonObject
 		}
 
 		if (!empty($where)) {
-			$sql .= " AND (".implode(" OR ", $where).")";
+			$sql .= " AND (".$this->db->sanitize(implode(" OR ", $where), 1, 1, 1).")";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index ed7c6394d61..75a74314c1f 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -407,18 +407,17 @@ class StockTransfer extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -431,23 +430,14 @@ class StockTransfer extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index bc0c56baa3f..dbd2db3bce4 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -299,15 +299,16 @@ class StockTransferLine extends CommonObjectLine
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -321,23 +322,14 @@ class StockTransferLine extends CommonObjectLine
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 6d538208dfa..1b7ae1004f3 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -362,11 +362,12 @@ class Target extends CommonObject
 	 * @param  string      $sortfield    Sort field
 	 * @param  int         $limit        limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		global $conf;
 
@@ -382,25 +383,13 @@ class Target extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 737e57ac3ec..bcaeca4bd7e 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -356,16 +356,17 @@ class WebsitePage extends CommonObject
 	/**
 	 * Return array of all web site pages.
 	 *
-	 * @param  string      $websiteid    Web site
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$websiteid   	Web site
+	 * @param  string      	$sortorder   	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($websiteid, $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($websiteid, $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -398,36 +399,13 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.((int) $websiteid);
-		// Manage filter (same than into countAll)
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 'rowid' || $key == 't.fk_website' || $key == 'fk_website' || $key == 'status' || $key == 't.status') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif ($key == 'type_container' || $key == 't.type_container') {
-					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
-				} elseif ($key == 'lang' || $key == 't.lang') {
-					$listoflang = array();
-					$foundnull = 0;
-					foreach (explode(',', $value) as $tmpvalue) {
-						if ($tmpvalue == 'null') {
-							$foundnull++;
-							continue;
-						}
-						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
-					}
-					$stringtouse = $key." IN (".$this->db->sanitize(implode(',', $listoflang), 1).")";
-					if ($foundnull) {
-						$stringtouse = "(".$stringtouse." OR ".$key." IS NULL)";
-					}
-					$sqlwhere[] = $stringtouse;
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND (".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 0d192ad6b33..202c3b6564e 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -370,7 +370,7 @@ class CodingPhpTest extends CommonClassTest
 		$ok = true;
 		$matches = array();
 		$found = "";
-		preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
+		preg_match_all('/(sql|SET|WHERE|where|INSERT|insert|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
 		foreach ($matches as $key => $val) {
 			if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
 				$found = $val[0];
@@ -401,6 +401,52 @@ class CodingPhpTest extends CommonClassTest
 		$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 3) in '.$file['relativename'].': '.$found.' - Bad.');
 		//exit;
 
+		// Check string sql|set...=".... without (int). It means we forget a cast (int) when forging sql request.
+		$ok = true;
+		$matches = array();
+		$found = "";
+		// $sql .= " field = ".(isset($this->field) ? $this->escape($this->field) : "null")... is KO
+		// $sql .= " field = ".(isset($this->field) ? "'".$this->escape($this->field)."'" : "null")... is OK
+		/*
+		preg_match_all('/(\$sql|VALUES\()[^\'\n]*[^\'\n]"\s*\.\s*([^\n]+)\n/m', $filecontent, $matches, PREG_SET_ORDER);
+		foreach ($matches as $key => $val) {
+			if (! preg_match('/^(implode\(\' OR \', \$search|implode\(\' AND \', \$search|MAIN_DB_PREFIX|accountancy_code|\w+::|\$key|\$db->prefix|\$this->db->prefix|\$predefinedgroupwhere|\$db->sanitize|\$this->db->sanitize|\$db->ifsql|\$db->decrypt|\(int\)|\(float\)|\(\(int\)|\(\(float\)|\$conf->entity|getEntity|\$this->from)/', $val[2])) {
+				//print "Found a suspicious string: ".$val[2]."\n";
+				if (preg_match('/.+\?.+:.+/', $val[2])) {
+					// We found a string that follow the " in $sql .= " "..... and does not contains simple quote for escapement nor casting
+					// May be it is later, into the b or c in case of  a ? b : c
+					// Example:
+					// $val[2] is (isset($this->field) ? $this->escape($this->field) : "null")... is KO
+					// $val[2] is (isset($this->field) ? "'".$this->escape($this->field)."'" : "null")... is OK
+					$tmps = $val[2];
+					$tmps = preg_replace('/^[^\?]+\?/', '', $tmps);
+					$tmps2 = explode(':', $tmps, 2);
+					$tmps2a = trim($tmps2[0]);
+					if (!empty($tmps2[1])) {
+						$tmps2b = trim($tmps2[1]);
+					} else {
+						$tmps2b = '';
+					}
+				} else {
+					$tmps2a = $val[2];
+					$tmps2b = '';
+				}
+				if (preg_match('/^(\(*["\']|\(+int\)|\(+float\)|\(*\d|GETPOSTINT|getDolGlobalInt|dolSqlDateFilter|\$user->id|\$conf->entity|\$this->entity|\$this->where|\(?\$this->societe|str_pad\(\(int)/', $tmps2a)
+					&& (empty($tmps2b) || preg_match('/^(\(*["\']|\(+int\)|\(+float\)|\(*\d|GETPOSTINT|getDolGlobalInt|dolSqlDateFilter|\$user->id|\$conf->entity|\$this->entity|\$this->where|\(?\$this->societe|str_pad\(\(int)/', $tmps2b))) {
+					continue;	// No problem
+				}
+
+				var_dump($val);
+
+				$found = $val[0];
+				$ok = false;
+				break;
+			}
+		}
+		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+		$this->assertTrue($ok, 'Found non escaped or non casted string in building of a sql request (case 4) in '.$file['relativename'].': '.$found.' - Bad.');
+		*/
+
 		// 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.

From 94a82716b76904ee7623adfbc9167b221c6ef2c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 00:26:24 +0100
Subject: [PATCH 0462/1862] Fix regression with GETPOSTINT

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 92c1f56adad..31b79d9722e 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -430,36 +430,36 @@ if ($action == 'renamefile') {	// Must be after include DOL_DOCUMENT_ROOT.'/core
 if ($action == 'setwebsiteonline' && $usercanedit) {
 	$website->setStatut($website::STATUS_VALIDATED, null, '', 'WEBSITE_MODIFY', 'status');
 
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('websitepage'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.urlencode(GETPOST('website')).'&pageid='.GETPOSTINT('websitepage'));
 	exit;
 }
 if ($action == 'setwebsiteoffline' && $usercanedit) {
 	$result = $website->setStatut($website::STATUS_DRAFT, null, '', 'WEBSITE_MODIFY', 'status');
 
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('websitepage'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.urlencode(GETPOST('website')).'&pageid='.GETPOSTINT('websitepage'));
 	exit;
 }
 if ($action == 'seteditinline') {	// No need of write permission
 	dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 1);
 	setEventMessages($langs->trans("FeatureNotYetAvailable"), null, 'warnings');
 	//dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 0); // Force disable of 'Include dynamic content'
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.urlencode(GETPOST('website')).'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 if ($action == 'unseteditinline') {	// No need of write permission
 	dolibarr_del_const($db, 'WEBSITE_EDITINLINE');
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.urlencode(GETPOST('website')).'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 if ($action == 'setshowsubcontainers') {	// No need of write permission
 	dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1);
 	//dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 0); // Force disable of edit inline
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.urlencode(GETPOST('website')).'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 if ($action == 'unsetshowsubcontainers') {	// No need of write permission
 	dolibarr_del_const($db, 'WEBSITE_SUBCONTAINERSINLINE');
-	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOSTINT('website').'&pageid='.GETPOSTINT('pageid'));
+	header("Location: ".$_SERVER["PHP_SELF"].'?website='.urlencode(GETPOST('website')).'&pageid='.GETPOSTINT('pageid'));
 	exit;
 }
 

From c3db669a10a76f4dff6803180ef1c42cead7266d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 00:38:20 +0100
Subject: [PATCH 0463/1862] Fix fetchAll for website pages

---
 htdocs/website/class/websitepage.class.php | 37 +++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index bcaeca4bd7e..4f652111131 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -361,7 +361,7 @@ class WebsitePage extends CommonObject
 	 * @param  string      	$sortfield    	Sort field
 	 * @param  int         	$limit        	limit
 	 * @param  int         	$offset       	Offset
-	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * @param  string|array	$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 	int <0 if KO, array of pages if OK
@@ -400,6 +400,41 @@ class WebsitePage extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.((int) $websiteid);
 
+		// Deprecated. If we receive an array, we use it. Prefer using the USF syntax.
+		if (is_array($filter)) {
+			$sqlwhere = array();
+
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid' || $key == 'rowid' || $key == 't.fk_website' || $key == 'fk_website' || $key == 'status' || $key == 't.status') {
+						$sqlwhere[] = $key." = ".((int) $value);
+					} elseif ($key == 'type_container' || $key == 't.type_container') {
+						$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
+					} elseif ($key == 'lang' || $key == 't.lang') {
+						$listoflang = array();
+						$foundnull = 0;
+						foreach (explode(',', $value) as $tmpvalue) {
+							if ($tmpvalue == 'null') {
+								$foundnull++;
+								continue;
+							}
+							$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
+						}
+						$stringtouse = $this->db->sanitize($key)." IN (".$this->db->sanitize(implode(',', $listoflang), 1).")";
+						if ($foundnull) {
+							$stringtouse = "(".$stringtouse." OR ".$this->db->sanitize($key)." IS NULL)";
+						}
+						$sqlwhere[] = $stringtouse;
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
+					}
+				}
+			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " AND (".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+		}
+
 		$errormessage = '';
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {

From 8abb608c170f8db738c6efeba8f712e71dc88928 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 00:42:44 +0100
Subject: [PATCH 0464/1862] Fix fetchAll for website pages

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

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 4f652111131..0b78a35107b 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -433,6 +433,8 @@ class WebsitePage extends CommonObject
 			if (count($sqlwhere) > 0) {
 				$sql .= " AND (".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 			}
+
+			$filter = '';
 		}
 
 		$errormessage = '';

From aedffc6ceeecfb73804867689e14ebf159df2fab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 00:52:01 +0100
Subject: [PATCH 0465/1862] Fix cast

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b9d5e4b7dca..aaea8d21780 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2518,19 +2518,19 @@ class Facture extends CommonInvoice
 		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? (int) $this->fk_user_valid : "null").",";
 		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? (int) $this->fk_facture_source : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? (int) $this->fk_project : "null").",";
-		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->escape($this->cond_reglement_id) : "null").",";
+		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? (int) $this->cond_reglement_id : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? (int) $this->mode_reglement_id : "null").",";
 		$sql .= " date_lim_reglement=".(strval($this->date_lim_reglement) != '' ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'null').",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null").",";
-		$sql .= " situation_cycle_ref=".(empty($this->situation_cycle_ref) ? "null" : $this->db->escape($this->situation_cycle_ref)).",";
-		$sql .= " situation_counter=".(empty($this->situation_counter) ? "null" : $this->db->escape($this->situation_counter)).",";
-		$sql .= " situation_final=".(empty($this->situation_final) ? "0" : $this->db->escape($this->situation_final)).",";
-		$sql .= " retained_warranty=".(empty($this->retained_warranty) ? "0" : $this->db->escape($this->retained_warranty)).",";
+		$sql .= " situation_cycle_ref=".(empty($this->situation_cycle_ref) ? "null" : (int) $this->situation_cycle_ref)."',";
+		$sql .= " situation_counter=".(empty($this->situation_counter) ? "null" : (int) $this->situation_counter)."',";
+		$sql .= " situation_final=".(empty($this->situation_final) ? "0" : (int) $this->situation_final).",";
+		$sql .= " retained_warranty=".(empty($this->retained_warranty) ? "0" : (float) $this->retained_warranty).",";
 		$sql .= " retained_warranty_date_limit=".(strval($this->retained_warranty_date_limit) != '' ? "'".$this->db->idate($this->retained_warranty_date_limit)."'" : 'null').",";
-		$sql .= " retained_warranty_fk_cond_reglement=".(isset($this->retained_warranty_fk_cond_reglement) ? intval($this->retained_warranty_fk_cond_reglement) : "null");
+		$sql .= " retained_warranty_fk_cond_reglement=".(isset($this->retained_warranty_fk_cond_reglement) ? (int) $this->retained_warranty_fk_cond_reglement : "null");
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();

From 31ae1bf97fbb87b8839293e01ddcedf5b8041362 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 01:05:50 +0100
Subject: [PATCH 0466/1862] Fix restore stop on failure. No need to continue,
 we must fix first. Make travis error analysis easier too.

---
 htdocs/compta/facture/class/facture.class.php | 4 ++--
 test/phpunit/CodingPhpTest.php                | 4 ++--
 test/phpunit/phpunittest.xml                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index aaea8d21780..352e23c0431 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2525,8 +2525,8 @@ class Facture extends CommonInvoice
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null").",";
-		$sql .= " situation_cycle_ref=".(empty($this->situation_cycle_ref) ? "null" : (int) $this->situation_cycle_ref)."',";
-		$sql .= " situation_counter=".(empty($this->situation_counter) ? "null" : (int) $this->situation_counter)."',";
+		$sql .= " situation_cycle_ref=".(empty($this->situation_cycle_ref) ? "null" : (int) $this->situation_cycle_ref).",";
+		$sql .= " situation_counter=".(empty($this->situation_counter) ? "null" : (int) $this->situation_counter).",";
 		$sql .= " situation_final=".(empty($this->situation_final) ? "0" : (int) $this->situation_final).",";
 		$sql .= " retained_warranty=".(empty($this->retained_warranty) ? "0" : (float) $this->retained_warranty).",";
 		$sql .= " retained_warranty_date_limit=".(strval($this->retained_warranty_date_limit) != '' ? "'".$this->db->idate($this->retained_warranty_date_limit)."'" : 'null').",";
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 202c3b6564e..1643f12afae 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -407,7 +407,7 @@ class CodingPhpTest extends CommonClassTest
 		$found = "";
 		// $sql .= " field = ".(isset($this->field) ? $this->escape($this->field) : "null")... is KO
 		// $sql .= " field = ".(isset($this->field) ? "'".$this->escape($this->field)."'" : "null")... is OK
-		/*
+
 		preg_match_all('/(\$sql|VALUES\()[^\'\n]*[^\'\n]"\s*\.\s*([^\n]+)\n/m', $filecontent, $matches, PREG_SET_ORDER);
 		foreach ($matches as $key => $val) {
 			if (! preg_match('/^(implode\(\' OR \', \$search|implode\(\' AND \', \$search|MAIN_DB_PREFIX|accountancy_code|\w+::|\$key|\$db->prefix|\$this->db->prefix|\$predefinedgroupwhere|\$db->sanitize|\$this->db->sanitize|\$db->ifsql|\$db->decrypt|\(int\)|\(float\)|\(\(int\)|\(\(float\)|\$conf->entity|getEntity|\$this->from)/', $val[2])) {
@@ -445,7 +445,7 @@ class CodingPhpTest extends CommonClassTest
 		}
 		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
 		$this->assertTrue($ok, 'Found non escaped or non casted string in building of a sql request (case 4) in '.$file['relativename'].': '.$found.' - Bad.');
-		*/
+
 
 		// Checks with IN
 
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index ce189fe6326..7fa17448216 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -8,7 +8,7 @@
   convertWarningsToExceptions="true"
   colors="true"
   processIsolation="false"
-  stopOnFailure="false">
+  stopOnFailure="true">
   <php>
     <ini name="max_execution_time" value="1800"/>
     <!-- Also don't forget to change suhosin.memory_limit=4G -->

From 41c8c23dbbce80a1f0ae0f8cc3f7c647c5b97928 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 01:07:19 +0100
Subject: [PATCH 0467/1862] Disable not complete test

---
 test/phpunit/CodingPhpTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 1643f12afae..202c3b6564e 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -407,7 +407,7 @@ class CodingPhpTest extends CommonClassTest
 		$found = "";
 		// $sql .= " field = ".(isset($this->field) ? $this->escape($this->field) : "null")... is KO
 		// $sql .= " field = ".(isset($this->field) ? "'".$this->escape($this->field)."'" : "null")... is OK
-
+		/*
 		preg_match_all('/(\$sql|VALUES\()[^\'\n]*[^\'\n]"\s*\.\s*([^\n]+)\n/m', $filecontent, $matches, PREG_SET_ORDER);
 		foreach ($matches as $key => $val) {
 			if (! preg_match('/^(implode\(\' OR \', \$search|implode\(\' AND \', \$search|MAIN_DB_PREFIX|accountancy_code|\w+::|\$key|\$db->prefix|\$this->db->prefix|\$predefinedgroupwhere|\$db->sanitize|\$this->db->sanitize|\$db->ifsql|\$db->decrypt|\(int\)|\(float\)|\(\(int\)|\(\(float\)|\$conf->entity|getEntity|\$this->from)/', $val[2])) {
@@ -445,7 +445,7 @@ class CodingPhpTest extends CommonClassTest
 		}
 		//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
 		$this->assertTrue($ok, 'Found non escaped or non casted string in building of a sql request (case 4) in '.$file['relativename'].': '.$found.' - Bad.');
-
+		*/
 
 		// Checks with IN
 

From f0693549b38225458f5b6167c3cb3b79f08045c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 01:12:28 +0100
Subject: [PATCH 0468/1862] Fix bad message

---
 test/phpunit/FactureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index a7d26438352..e2f9fa5f68c 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -57,7 +57,7 @@ class FactureTest extends CommonClassTest
 	public static function setUpBeforeClass(): void
 	{
 		self::assertTrue(isModEnabled('facture'), " module customer invoice must be enabled");
-		self::assertFalse(isModEnabled('ecotaxdeee'), " module customer invoice must be enabled");
+		self::assertFalse(isModEnabled('ecotaxdeee'), " module ecotaxdeee must not be enabled");
 		parent::setUpBeforeClass();
 	}
 

From 847c7a73c84b2464e7ac372b1c3ed23bd5290327 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 01:30:36 +0100
Subject: [PATCH 0469/1862] Doc

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index cef6d2e7891..0d4389f9abd 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -944,7 +944,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
+			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
 		}
 		// Filter by ledger account or subledger account
 		if (!empty($option)) {
@@ -1838,10 +1838,10 @@ class BookKeeping extends CommonObject
 	}
 
 	/**
-	 * Load all information of accountancy document
+	 * Load all accounting lines related to a given transaction ID $piecenum
 	 *
 	 * @param  int     $piecenum   Id of line to get
-	 * @param  string  $mode       Mode
+	 * @param  string  $mode       Mode ('' or '_tmp')
 	 * @return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAllPerMvt($piecenum, $mode = '')

From c544efec7fa2904a7f0618554b2d7320e0304192 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 03:51:36 +0100
Subject: [PATCH 0470/1862] QUAL: Remove use of customurl filter. Must use the
 USF syntax.

---
 htdocs/accountancy/bookkeeping/export.php     |  2 +-
 .../class/accountingjournal.class.php         |  4 +-
 .../accountancy/class/bookkeeping.class.php   |  8 +--
 htdocs/admin/defaultvalues.php                |  2 +-
 htdocs/bom/class/bom.class.php                | 44 +++++-------
 htdocs/bookcal/class/availabilities.class.php |  4 +-
 htdocs/bookcal/class/calendar.class.php       |  2 +-
 htdocs/compta/bank/bankentries_list.php       |  3 +-
 htdocs/compta/bank/various_payment/card.php   |  4 +-
 htdocs/core/class/commonobject.class.php      | 14 ++--
 htdocs/core/class/commonobjectline.class.php  | 17 ++---
 htdocs/core/class/cproductnature.class.php    |  2 -
 htdocs/core/class/cunits.class.php            |  9 +--
 htdocs/core/class/defaultvalues.class.php     | 67 ++++++++++--------
 htdocs/core/lib/functions.lib.php             |  1 +
 htdocs/core/lib/project.lib.php               |  6 +-
 htdocs/core/tpl/card_presend.tpl.php          |  4 +-
 htdocs/cron/class/cronjob.class.php           |  5 +-
 htdocs/ecm/class/ecmfiles.class.php           | 18 ++---
 .../class/conferenceorbooth.class.php         | 42 +++++------
 .../class/conferenceorboothattendee.class.php | 44 +++++-------
 ...ventorganization_conferenceorbooth.lib.php |  4 +-
 .../class/fournisseur.commande.class.php      |  1 +
 .../fournisseur.commande.dispatch.class.php   | 25 +++----
 htdocs/hrm/class/evaluation.class.php         |  4 +-
 htdocs/hrm/class/evaluationdet.class.php      | 14 ++--
 htdocs/hrm/class/job.class.php                | 18 ++---
 htdocs/hrm/class/position.class.php           |  4 +-
 htdocs/hrm/class/skill.class.php              | 16 ++---
 htdocs/hrm/class/skilldet.class.php           | 14 ++--
 htdocs/hrm/class/skillrank.class.php          | 21 +++---
 htdocs/hrm/evaluation_card.php                |  2 +-
 htdocs/hrm/lib/hrm_skillrank.lib.php          |  2 +-
 htdocs/hrm/skill_tab.php                      |  2 +-
 .../class/knowledgerecord.class.php           |  6 +-
 htdocs/loan/class/loanschedule.class.php      |  2 -
 .../template/class/myobject.class.php         |  2 +-
 htdocs/mrp/class/mo.class.php                 | 70 +++++++++++--------
 .../class/opensurveysondage.class.php         | 42 +++++------
 .../partnership/class/partnership.class.php   |  6 +-
 .../class/partnership_type.class.php          |  2 +-
 .../class/productcustomerprice.class.php      | 10 +--
 .../class/productfournisseurprice.class.php   |  4 +-
 .../class/productstockentrepot.class.php      | 25 +++----
 .../class/stocktransfer.class.php             |  2 +-
 .../stocktransfer/stocktransfer_card.php      |  2 +-
 htdocs/public/bookcal/index.php               |  2 +-
 .../public/eventorganization/attendee_new.php |  4 +-
 htdocs/public/opensurvey/index.php            |  2 +-
 htdocs/public/partnership/new.php             |  2 +-
 htdocs/public/recruitment/index.php           |  2 +-
 .../class/recruitmentcandidature.class.php    | 44 +++++-------
 .../class/recruitmentjobposition.class.php    | 42 +++++------
 htdocs/resource/class/dolresource.class.php   |  8 ++-
 htdocs/societe/class/societe.class.php        |  2 +-
 htdocs/takepos/ajax/ajax.php                  |  4 +-
 htdocs/ticket/class/cticketcategory.class.php | 42 +++++------
 htdocs/ticket/class/ticket.class.php          | 12 ++--
 htdocs/user/class/user.class.php              | 33 ++++-----
 htdocs/webhook/class/target.class.php         | 12 ++--
 .../workstation/class/workstation.class.php   | 44 +++++-------
 htdocs/zapier/class/hook.class.php            | 40 +++++------
 62 files changed, 402 insertions(+), 495 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 5a782c8718f..6f3c34b279e 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -608,7 +608,7 @@ if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements
 	// Replace this with the query($sqlforexport) on a limited block and loop on each line to export them.
 	$limit = 0;
 	$offset = 0;
-	$result = $object->fetchAll($sortorder, $sortfield, $limit, $offset, $filter, 'AND', (!getDolGlobalString('ACCOUNTING_REEXPORT') ? 0 : 1));
+	$result = $object->fetchAll($sortorder, $sortfield, $limit, $offset, $filter, 'AND', (getDolGlobalString('ACCOUNTING_REEXPORT') ? 1 : 0));
 
 	if ($result < 0) {
 		$error++;
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 1c1ba9d8ba0..be305e9b5c1 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -178,7 +178,7 @@ class AccountingJournal extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.code' || $key == 't.label' || $key == 't.nature') {
-					$sqlwhere[] = $key."='".$this->db->escape($value)."'";
+					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 't.rowid' || $key == 't.active') {
 					$sqlwhere[] = $key.'='.((int) $value);
 				}
@@ -187,7 +187,7 @@ class AccountingJournal extends CommonObject
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
+			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0d4389f9abd..a49570fccbf 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -915,7 +915,7 @@ class BookKeeping extends CommonObject
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key.' = '.((int) $value);
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($this->db->escapeforlike($value)).'%\'';
 				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
@@ -1114,7 +1114,7 @@ class BookKeeping extends CommonObject
 			$sql .= " AND t.date_export IS NULL";
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
+			$sql .= ' AND '.implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
 		}
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
@@ -1231,13 +1231,13 @@ class BookKeeping extends CommonObject
 				} elseif ($key == 't.reconciled_option') {
 					$sqlwhere[] = 't.lettering_code IS NULL';
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $key." LIKE '%".$this->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
 		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".$this->db->sanitize(implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere), 1, 1, 1);
+			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
 		}
 
 		if (!empty($option)) {
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index ee27ea183e9..430befce12b 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -356,7 +356,7 @@ print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("
 print '</td>'."\n";
 print '</tr>'."\n";
 
-$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type'=>$mode,'t.entity'=>array($user->entity,$conf->entity)));
+$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type'=>$mode, 't.entity'=>array($user->entity,$conf->entity)));
 
 if (!is_array($result) && $result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index e2ffdea9382..566298ea8df 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1275,7 +1275,7 @@ class BOM extends CommonObject
 		$this->lines = array();
 
 		$objectline = new BOMLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_bom:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
@@ -1885,18 +1885,17 @@ class BOMLine extends CommonObjectLine
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string		$filtermode		No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -1909,23 +1908,14 @@ class BOMLine extends CommonObjectLine
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 5b81b8605d3..f24d258e987 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -392,7 +392,7 @@ class Availabilities extends CommonObject
 	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -936,7 +936,7 @@ class Availabilities extends CommonObject
 		$this->lines = array();
 
 		$objectline = new AvailabilitiesLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_availabilities = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_availabilities:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index ea0e5e13bba..8d05d2739ea 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -926,7 +926,7 @@ class Calendar extends CommonObject
 		$this->lines = array();
 
 		$objectline = new CalendarLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_calendar = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_calendar:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->setErrorsFromObject($objectline);
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 5c09181dd3f..8a3c2c1c13e 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -539,7 +539,8 @@ if ($id > 0 || !empty($ref)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 	$bankcateg = new BankCateg($db);
 
-	foreach ($bankcateg->fetchAll() as $bankcategory) {
+	$arrayofbankcateg = $bankcateg->fetchAll();
+	foreach ($arrayofbankcateg as $bankcategory) {
 		$options[$bankcategory->id] = $bankcategory->label;
 	}
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 4b1667cce1d..b35350f2ee4 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -356,7 +356,9 @@ $options = array();
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 $bankcateg = new BankCateg($db);
 
-foreach ($bankcateg->fetchAll() as $bankcategory) {
+$arrayofbankcategs = $bankcateg->fetchAll();
+
+foreach ($arrayofbankcategs as $bankcategory) {
 	$options[$bankcategory->id] = $bankcategory->label;
 }
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f40841ba11b..564f7d84493 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10169,20 +10169,20 @@ abstract class CommonObject
 
 		// Delete cascade first
 		if (is_array($this->childtablesoncascade) && !empty($this->childtablesoncascade)) {
-			foreach ($this->childtablesoncascade as $table) {
-				$deleteFromObject = explode(':', $table);
+			foreach ($this->childtablesoncascade as $tabletodelete) {
+				$deleteFromObject = explode(':', $tabletodelete, 4);
 				if (count($deleteFromObject) >= 2) {
 					$className = str_replace('@', '', $deleteFromObject[0]);
 					$filePath = $deleteFromObject[1];
 					$columnName = $deleteFromObject[2];
-					$TMoreSQL = array();
+					$filter = '';
 					if (!empty($deleteFromObject[3])) {
-						$TMoreSQL['customsql'] = $deleteFromObject[3];
+						$filter = $deleteFromObject[3];
 					}
 					if (dol_include_once($filePath)) {
 						$childObject = new $className($this->db);
 						if (method_exists($childObject, 'deleteByParentField')) {
-							$result = $childObject->deleteByParentField($this->id, $columnName, $TMoreSQL);
+							$result = $childObject->deleteByParentField($this->id, $columnName, $filter);
 							if ($result < 0) {
 								$error++;
 								$this->errors[] = $childObject->error;
@@ -10200,7 +10200,7 @@ abstract class CommonObject
 					}
 				} else {
 					// Delete record in child table
-					$sql = "DELETE FROM ".$this->db->prefix().$table." WHERE ".$this->fk_element." = ".((int) $this->id);
+					$sql = "DELETE FROM ".$this->db->prefix().$tabletodelete." WHERE ".$this->fk_element." = ".((int) $this->id);
 
 					$resql = $this->db->query($sql);
 					if (!$resql) {
@@ -10287,7 +10287,7 @@ abstract class CommonObject
 			$this->db->begin();
 
 			$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element;
-			$sql .= " WHERE ".$parentField." = ".(int) $parentId;
+			$sql .= " WHERE ".$this->db->sanitize($parentField)." = ".(int) $parentId;
 
 			// Manage filter
 			$errormessage = '';
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 5536c93cf06..cda83ffdaa5 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -198,15 +198,16 @@ abstract class CommonObjectLine extends CommonObject
 	/**
 	 * Empty function to prevent errors on call of this function must be overload if useful
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int $limit offset limit
-	 * @param int $offset offset limit
-	 * @param array $filter filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param  string      		$sortorder    	Sort Order
+	 * @param  string      		$sortfield    	Sort field
+	 * @param  int         		$limit        	Limit the number of lines returned
+	 * @param  int         		$offset       	Offset
+	 * @param  string|array		$filter       	Filter as an Universal Search string.
+	 * 											Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      		$filtermode   	No more used
+	 * @return array|int        	         	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		return 0;
 	}
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index 237518055c8..b395bf8983f 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -161,8 +161,6 @@ class CProductNature extends CommonDict
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = "SELECT";
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 2c819437f19..7db6859f82b 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -229,18 +229,19 @@ class CUnits extends CommonDict
 		$sql .= " t.scale,";
 		$sql .= " t.active";
 		$sql .= " FROM ".$this->db->prefix()."c_units as t";
+
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
-					$sqlwhere[] = $key." = ".((int) $value);
+					$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
-					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
+					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 8389630123a..db0d57f63ec 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -243,18 +243,17 @@ class DefaultValues extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string|array	$filter       	Filter as an Universal Search string or Array (array use is deprecated)
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -263,27 +262,39 @@ class DefaultValues extends CommonObject
 		$sql .= $this->getFieldList();
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		$sql .= " WHERE 1 = 1";
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || ($key == 't.entity' && !is_array($value)) || ($key == 't.user_id' && !is_array($value))) {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 't.page' || $key == 't.param' || $key == 't.type') {
-					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (is_array($value)) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize(implode(',', $value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+
+		// Deprecated. For compatibility.
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid' || ($key == 't.entity' && !is_array($value)) || ($key == 't.user_id' && !is_array($value))) {
+						$sqlwhere[] = $key." = ".((int) $value);
+					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+					} elseif ($key == 't.page' || $key == 't.param' || $key == 't.type') {
+						$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
+					} elseif (is_array($value)) {
+						$sqlwhere[] = $key." IN (".$this->db->sanitize(implode(',', $value)).")";
+					} else {
+						$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index afdcc39cb52..5e58c3499a8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12719,6 +12719,7 @@ function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand =
 	$t = preg_replace_callback('/'.$regexstring.'/i', 'dolForgeDummyCriteriaCallback', $filter);
 	$t = str_replace(array('and','or','AND','OR',' '), '', $t);		// Remove the only strings allowed between each () criteria
 	// If the string result contains something else than '()', the syntax was wrong
+
 	if (preg_match('/[^\(\)]/', $t)) {
 		$tmperrorstr = 'Bad syntax of the search string';
 		$errorstr = 'Bad syntax of the search string: '.$filter;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 6b46a4dbfd2..e58bd5e34bf 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -240,7 +240,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 		} else {
 			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 			$conforbooth=new ConferenceOrBooth($db);
-			$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$project->id));
+			$result = $conforbooth->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $project->id).")");
 			//,
 			if (!is_array($result) && $result<0) {
 				setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
@@ -256,8 +256,8 @@ function project_prepare_head(Project $project, $moreparam = '')
 		} else {
 			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 			$conforboothattendee=new ConferenceOrBoothAttendee($db);
-			$result = $conforboothattendee->fetchAll('', '', 0, 0, array('t.fk_project'=>$project->id));
-			//,
+			$result = $conforboothattendee->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $project->id).')');
+
 			if (!is_array($result) && $result<0) {
 				setEventMessages($conforboothattendee->error, $conforboothattendee->errors, 'errors');
 			} else {
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 87caa30a9dc..ea44ee232c7 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -220,11 +220,11 @@ if ($action == 'presend') {
 			}
 		}
 	}
+
 	if (getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 		$listeuser = array();
 		$fuserdest = new User($db);
-
-		$result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, array('customsql'=>"t.statut=1 AND t.employee=1 AND t.email IS NOT NULL AND t.email <> ''"), 'AND', true);
+		$result = $fuserdest->fetchAll('ASC', 't.lastname', 0, 0, "(t.statut:=:1) AND (t.employee:=:1) AND (t.email:isnot:NULL) AND (t.email:!=:'')", 'AND', true);
 		if ($result > 0 && is_array($fuserdest->users) && count($fuserdest->users) > 0) {
 			foreach ($fuserdest->users as $uuserdest) {
 				$listeuser[$uuserdest->id] = $uuserdest->user_get_property($uuserdest->id, 'email');
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index eea29c83601..b9fef39837f 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -571,13 +571,14 @@ class Cronjob extends CommonObject
 		} elseif ($status == 2) {
 			$sql .= " AND t.status = 2";
 		}
+
 		// Manage filter
 		if (is_array($filter) && count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sql .= " AND ".$key." = ".((int) $value);
+					$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
 				} else {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index ce77414b31b..0f622d01370 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -530,14 +530,13 @@ class EcmFiles extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param 	string $sortorder 	Sort Order
+	 * @param 	string $sortfield 	Sort field
+	 * @param 	int    $limit     	limit
+	 * @param 	int    $offset    	offset limit
+	 * @param 	array  $filter    	filter array
+	 * @param 	string $filtermode 	filter mode (AND or OR)
+	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -573,10 +572,11 @@ class EcmFiles extends CommonObject
 				if ($key == 't.src_object_id') {
 					$sqlwhere[] = $key." = ".((int) $value);
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
+
 		$sql .= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		 if (isModEnabled('multicompany')) {
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 69cfcbf7b23..f6f14fdf863 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -273,15 +273,16 @@ class ConferenceOrBooth extends ActionComm
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		//TODO set percent according status
 		global $conf;
@@ -299,25 +300,14 @@ class ConferenceOrBooth extends ActionComm
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.id' || $key == 't.fk_project' || $key == 't.fk_soc' || $key == 't.fk_action') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 6df9bad4a72..ea292e437d2 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -401,18 +401,17 @@ class ConferenceOrBoothAttendee extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...). WARNING: customerurl must be a sanitized SQL string.
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -426,25 +425,14 @@ class ConferenceOrBoothAttendee extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_soc' || $key == 't.fk_project' || $key == 't.fk_actioncomm') {
-					$sqlwhere[] = $key.'='.((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index 1db8454fee9..1f89e43eaba 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -139,7 +139,7 @@ function conferenceorboothProjectPrepareHead($object)
 	} else {
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 		$conforbooth=new ConferenceOrBooth($db);
-		$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
+		$result = $conforbooth->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $object->id).')');
 		if (!is_array($result) && $result<0) {
 			setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
 		} else {
@@ -165,7 +165,7 @@ function conferenceorboothProjectPrepareHead($object)
 	} else {
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 		$attendees=new ConferenceOrBoothAttendee($db);
-		$result = $attendees->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
+		$result = $attendees->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $object->id).')');
 		if (!is_array($result) && $result<0) {
 			setEventMessages($attendees->error, $attendees->errors, 'errors');
 		} else {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2e128bcd7ec..32b4d27d4c8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3528,6 +3528,7 @@ class CommandeFournisseur extends CommonOrder
 			$qtywished = array();
 
 			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
+
 			$filter = array('t.fk_commande' => $this->id);
 			if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 				$filter['t.status'] = 1; // Restrict to lines with status validated
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 2b415cfc936..74dec969d11 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -646,14 +646,13 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param string $sortorder 	Sort Order
+	 * @param string $sortfield 	Sort field
+	 * @param int    $limit     	limit
+	 * @param int    $offset    	offset limit
+	 * @param array  $filter    	filter array
+	 * @param string $filtermode 	filter mode (AND or OR)
+	 * @return 						int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -661,7 +660,6 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.fk_commande,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_commandefourndet,";
@@ -675,7 +673,6 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$sql .= " t.batch,";
 		$sql .= " t.eatby,";
 		$sql .= " t.sellby";
-
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 
 		// Manage filter
@@ -683,13 +680,13 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.comment') {
-					$sqlwhere [] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere [] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				} elseif ($key == 't.datec' || $key == 't.tms' || $key == 't.eatby' || $key == 't.sellby' || $key == 't.batch') {
-					$sqlwhere [] = $key." = '".$this->db->escape($value)."'";
+					$sqlwhere [] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'qty') {
-					$sqlwhere [] = $key." = ".((float) $value);
+					$sqlwhere [] = $this->db->sanitize($key)." = ".((float) $value);
 				} else {
-					$sqlwhere [] = $key." = ".((int) $value);
+					$sqlwhere [] = $this->db->sanitize($key)." = ".((int) $value);
 				}
 			}
 		}
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 50d2dce5c1c..7716ebc8afc 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -232,7 +232,7 @@ class Evaluation extends CommonObject
 		if ($resultcreate > 0) {
 			require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
 			$skillRank = new SkillRank($this->db);
-			$TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job." AND objecttype='job'"));
+			$TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, '(fk_object:=:'.((int) $this->fk_job).") AND (objecttype:=:'job')");
 
 			if (is_array($TRequiredRanks) && !empty($TRequiredRanks)) {
 				$this->lines = array();
@@ -918,7 +918,7 @@ class Evaluation extends CommonObject
 		$this->lines = array();
 
 		$objectline = new EvaluationLine($this->db);
-		$result = $objectline->fetchAll('ASC', '', 0, 0, array('customsql'=>'fk_evaluation = '.$this->id));
+		$result = $objectline->fetchAll('ASC', '', 0, 0, '(fk_evaluation:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 247e9feaeb4..5d0794abd5e 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -352,16 +352,16 @@ class EvaluationLine extends CommonObjectLine
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		global $conf;
 
@@ -886,7 +886,7 @@ class EvaluationLine extends CommonObjectLine
 		$this->lines = array();
 
 		$objectline = new EvaluationLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_evaluationdet = '.$this->id));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_evaluationdet:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 4799957bae6..943bdaaf470 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
- * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
- * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+/* Copyright (C) 2017  	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 	Greg Rastklan       <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 	Jean-Pascal BOUDET  <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 	Grégory BLEMAND     <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024	Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,10 +153,10 @@ class Job extends CommonObject
 
 	// /**
 	//  * @var array    List of child tables. To know object to delete on cascade.
-	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               If name matches '@ClassNAme:FilePathClass:ParentFkFieldName' it will
 	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
 	//  */
-	protected $childtablesoncascade = array("@SkillRank:hrm/class/skillrank.class.php:fk_object:objecttype='job'");
+	protected $childtablesoncascade = array("@SkillRank:hrm/class/skillrank.class.php:fk_object:(objecttype:=:'job')");
 
 	// /**
 	//  * @var JobLine[]     Array of subtable lines
@@ -926,7 +926,7 @@ class Job extends CommonObject
 		$this->lines = array();
 
 		$objectline = new JobLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_job = '.$this->id));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_job:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 18f28abb5ac..a3416651d72 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -968,7 +968,7 @@ class Position extends CommonObject
 		$this->lines = array();
 
 		$objectline = new PositionLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql' => 'fk_position = ' . $this->id));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_position:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
@@ -1045,7 +1045,7 @@ class Position extends CommonObject
 	{
 		$TPosition = array();
 
-		$TPosition = $this->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_user=' . $userid));
+		$TPosition = $this->fetchAll('ASC', 't.rowid', 0, 0, '(fk_user:=:'.((int) $userid).')');
 
 		return $TPosition;
 	}
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 60292ff94d8..f3cdd4a1178 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -424,19 +424,17 @@ class Skill extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -967,7 +965,7 @@ class Skill extends CommonObject
 		$this->lines = array();
 
 		$objectline = new Skilldet($this->db);
-		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$this->id));
+		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, '(fk_skill:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index fb69b0454cd..ea61efb2f9a 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -347,19 +347,17 @@ class Skilldet extends CommonObjectLine
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 9babe71a842..90c64b8fb42 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -218,8 +218,9 @@ class SkillRank extends CommonObject
 	{
 		global $langs;
 
-		$sqlfilter = 'fk_object='.((int) $this->fk_object)." AND objecttype='".$this->db->escape($this->objecttype)."' AND fk_skill = ".((int) $this->fk_skill);
-		$alreadyLinked = $this->fetchAll('ASC', 'rowid', 0, 0, array('customsql' => $sqlfilter));
+		$filter = '(fk_object:=:'.((int) $this->fk_object).") AND (objecttype:=:'".$this->db->escape($this->objecttype)."') AND (fk_skill:=:".((int) $this->fk_skill).")";
+
+		$alreadyLinked = $this->fetchAll('ASC', 'rowid', 0, 0, $filter);
 		if (!empty($alreadyLinked)) {
 			$this->error = $langs->trans('ErrSkillAlreadyAdded');
 			return -1;
@@ -395,19 +396,17 @@ class SkillRank extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset      	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -925,7 +924,7 @@ class SkillRank extends CommonObject
 
 		/*
 		$objectline = new SkillRankLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_skillrank = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_skillrank:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 4ab248ef0fc..5cddbd523be 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -169,7 +169,7 @@ if (empty($reshook)) {
 	if ($action == 'close') {
 		// save evaldet lines to user;
 		$sk = new SkillRank($db);
-		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, array("customsql"=>"fk_object = ".$object->fk_user ." AND objecttype ='".SkillRank::SKILLRANK_TYPE_USER."'"), 'AND');
+		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, "(fk_object:=:".((int) $object->fk_user).") AND (objecttype:=:'".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."')", 'AND');
 
 		$errors = 0;
 		// we go through the evaldets of the eval
diff --git a/htdocs/hrm/lib/hrm_skillrank.lib.php b/htdocs/hrm/lib/hrm_skillrank.lib.php
index 03415c55259..1d0083ea37f 100644
--- a/htdocs/hrm/lib/hrm_skillrank.lib.php
+++ b/htdocs/hrm/lib/hrm_skillrank.lib.php
@@ -113,7 +113,7 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
 
 	// On charge les différentes notes possibles pour la compétence $fk_skill
 	$skilldet = new Skilldet($db);
-	$Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill));
+	$Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, '(fk_skill:=:'.((int) $fk_skill).')');
 
 	if (!is_array($Lines) && $Lines<0) {
 		setEventMessages($skilldet->error, $skilldet->errors, 'errors');
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 861310b7849..d35ca37f313 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -159,7 +159,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'saveSkill') {
 		if (!empty($TNote)) {
 			foreach ($TNote as $skillId => $rank) {
-				$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . ((int) $id) . " AND objecttype='" . $db->escape($objecttype) . "' AND fk_skill = " . ((int) $skillId)));
+				$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, '(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->rankorder = $rank;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 5e8011fd645..5e6ed1b5ebb 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -401,12 +401,10 @@ class KnowledgeRecord extends CommonObject
 					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
@@ -978,7 +976,7 @@ class KnowledgeRecord extends CommonObject
 		$this->lines = array();
 
 		$objectline = new KnowledgeRecordLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_knowledgerecord = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_knowledgerecord:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index fa2d119ddd5..da102386706 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -436,8 +436,6 @@ class LoanSchedule extends CommonObject
 	 */
 	public function fetchAll($loanid)
 	{
-		global $langs;
-
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.fk_loan,";
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 7d8a3e0556a..13e7e3d46d0 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -1091,7 +1091,7 @@ class MyObject extends CommonObject
 		$this->lines = array();
 
 		$objectline = new MyObjectLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_myobject = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_myobject:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->setErrorsFromObject($objectline);
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2cace106809..1d84352bdc8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -506,10 +506,8 @@ class Mo extends CommonObject
 					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
@@ -911,7 +909,7 @@ class Mo extends CommonObject
 			if (!empty($fk_movement)) {
 				// The fk_movement was not recorded so we try to guess the product and quantity to restore.
 				$moline = new MoLine($this->db);
-				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, array('customsql' => 'fk_stock_movement = '.(int) $fk_movement));
+				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, '(fk_stock_movement:=:'.((int) $fk_movement).')');
 				$moline = array_shift($TArrayMoLine);
 
 				$movement = new MouvementStock($this->db);
@@ -1613,11 +1611,11 @@ class Mo extends CommonObject
 
 		$objectline = new MoLine($this->db);
 
-		$TFilters = array('customsql'=>'fk_mo = '.((int) $this->id));
+		$filter = '(fk_mo:=:'.((int) $this->id).')';
 		if (!empty($rolefilter)) {
-			$TFilters['role'] = $rolefilter;
+			$filter .= " AND (role:=:'".$this->db->escape($rolefilter)."')";
 		}
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, $filter);
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
@@ -2146,18 +2144,16 @@ class MoLine extends CommonObjectLine
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string|array $filter       	Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      	$filtermode   	Filter mode (AND or OR)
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -2170,23 +2166,35 @@ class MoLine extends CommonObjectLine
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+
+		// Deprecated.
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid') {
+						$sqlwhere[] = $key." = ".((int) $value);
+					} elseif (strpos($key, 'date') !== false) {
+						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+					} else {
+						$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index e69330ceddd..1fe88d65be8 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -803,15 +803,16 @@ class Opensurveysondage extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -825,25 +826,14 @@ class Opensurveysondage extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index f3779321a51..1b47c556e7f 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -454,12 +454,10 @@ class Partnership extends CommonObject
 					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
@@ -1179,7 +1177,7 @@ class Partnership extends CommonObject
 		$this->lines = array();
 
 		$objectline = new PartnershipLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_partnership = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_partnership:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 97e87ce88e0..3ef52447968 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -160,7 +160,7 @@ class PartnershipType extends CommonObject
 	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		global $conf;
 
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index a32fea0c6b6..39dda63688f 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -421,15 +421,15 @@ class ProductCustomerPrice extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {				// To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
+					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'soc.nom') {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				} elseif ($key == 'prod.ref' || $key == 'prod.label') {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				} elseif ($key == 't.price' || $key == 't.price_ttc') {
-					$sql .= " AND ".$key." LIKE '%".price2num($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." = ".((float) price2num($value));
 				} else {
-					$sql .= " AND ".$key." = ".((int) $value);
+					$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
 				}
 			}
 		}
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index e178fce18e3..b0a30b3d41a 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -350,12 +350,10 @@ class ProductFournisseurPrice extends CommonObject
 					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
 				} elseif (strpos($value, '%') === false) {
 					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index f4dbdca4a75..a8937fced52 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -230,16 +230,15 @@ class ProductStockEntrepot extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int	 $fk_product Product from which we want to get limit and desired stock by warehouse
-	 * @param int	 $fk_entrepot Warehouse in which we want to get products limit and desired stock
-	 * @param string $sortorder  Sort Order
-	 * @param string $sortfield  Sort field
-	 * @param int    $limit      offset limit
-	 * @param int    $offset     offset limit
-	 * @param array  $filter     filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int|array Return integer <0 if KO, array if OK
+	 * @param int	 $fk_product 	Product from which we want to get limit and desired stock by warehouse
+	 * @param int	 $fk_entrepot 	Warehouse in which we want to get products limit and desired stock
+	 * @param string $sortorder  	Sort Order
+	 * @param string $sortfield  	Sort field
+	 * @param int    $limit      	limit
+	 * @param int    $offset     	offset limit
+	 * @param array  $filter     	filter array
+	 * @param string $filtermode 	filter mode (AND or OR)
+	 * @return int|array 			Return integer <0 if KO, array if OK
 	 */
 	public function fetchAll($fk_product = 0, $fk_entrepot = 0, $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -247,24 +246,20 @@ class ProductStockEntrepot extends CommonObject
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_entrepot,";
 		$sql .= " t.seuil_stock_alerte,";
 		$sql .= " t.desiredstock,";
 		$sql .= " t.import_key";
-
-
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
-
 		$sql .= " WHERE 1=1";
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key." LIKE '%".$this->db->escape($value)."%'";
+				$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 			}
 		}
 		if (count($sqlwhere) > 0) {
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 75a74314c1f..4d1111f1d84 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -936,7 +936,7 @@ class StockTransfer extends CommonObject
 		$this->lines = array();
 
 		$objectline = new StockTransferLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'rang', 0, 0, array('customsql'=>'fk_stocktransfer = '.$this->id));
+		$result = $objectline->fetchAll('ASC', 'rang', 0, 0, "(fk_stocktransfer:=:".((int) $this->id).")");
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index abd9e80dbc6..da94893f777 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -194,7 +194,7 @@ if (empty($reshook)) {
 
 		if (empty($error)) {
 			$line = new StockTransferLine($db);
-			$records = $line->fetchAll('', '', 0, 0, array('customsql'=>' fk_stocktransfer = '.((int) $id).' AND fk_product = '.((int) $fk_product).' AND fk_warehouse_source = '.((int) $fk_warehouse_source).' AND fk_warehouse_destination = '.((int) $fk_warehouse_destination).' AND ('.(empty($batch) ? 'batch = "" or batch IS NULL' : "batch = '".$db->escape($batch)."'").')'));
+			$records = $line->fetchAll('', '', 0, 0, '(fk_stocktransfer:=:'.((int) $id).') AND (fk_product:=:'.((int) $fk_product).') AND (fk_warehouse_source:=:'.((int) $fk_warehouse_source).') AND (fk_warehouse_destination:=:'.((int) $fk_warehouse_destination).') AND ('.(empty($batch) ? "(batch:=:'') OR (batch:IS:NULL)" : "batch:=:'".$db->escape($batch)."'").')');
 			if (!empty($records[key($records)])) {
 				$line = $records[key($records)];
 			}
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
index 63c14cba596..e0630108c1a 100644
--- a/htdocs/public/bookcal/index.php
+++ b/htdocs/public/bookcal/index.php
@@ -418,7 +418,7 @@ if ($action == 'afteradd') {
 		// Load into an array all days with availabilities of the calendar for the current month $todayarray['mon'] and $todayarray['year']
 		$arrayofavailabledays = array();
 
-		$arrayofavailabilities = $availability->fetchAll('', '', 0, 0, array('status' => '1', 'fk_bookcal_calendar' => $id));
+		$arrayofavailabilities = $availability->fetchAll('', '', 0, 0, '(status:=:1) AND (fk_bookcal_calendar:=:'.((int) $id).')');
 		if ($arrayofavailabilities < 0) {
 			setEventMessages($availability->error, $availability->errors, 'errors');
 		} else {
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index e7caa101e6a..edccbf8006a 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -268,10 +268,10 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 		$filter = array();
 
 		if ($type == 'global') {
-			$filter = array('t.fk_project'=>((int) $id), 'customsql'=>'t.email="'.$db->escape($email).'"');
+			$filter = "(t.fk_project:=:".((int) $id).") AND (t.email:=:'".$db->escape($email)."')";
 		}
 		if ($type == 'conf') {
-			$filter = array('t.fk_actioncomm'=>((int) $id), 'customsql'=>'t.email="'.$db->escape($email).'"');
+			$filter = "(t.fk_actioncomm:=:".((int) $id).") AND (t.email:=:'".$db->escape($email)."')";
 		}
 
 		// Check if there is already an attendee into table eventorganization_conferenceorboothattendee for same event (or conference/booth)
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index ef274a9efe5..772245f3d51 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -169,7 +169,7 @@ if (getDolGlobalString('OPENSURVEY_IMAGE_PUBLIC_INTERFACE')) {
 }
 
 
-$results = $object->fetchAll($sortfield, $sortorder, 0, 0, array('status' => 1));
+$results = $object->fetchAll($sortfield, $sortorder, 0, 0, '(status:=:1)');
 $now = dol_now();
 
 if (is_array($results)) {
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 87a4ba5df97..280e0d45c55 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -597,7 +597,7 @@ jQuery(document).ready(function () {
 
 // Type
 $partnershiptype = new PartnershipType($db);
-$listofpartnershipobj = $partnershiptype->fetchAll('', '', 1000, 0, array('active'=>1));
+$listofpartnershipobj = $partnershiptype->fetchAll('', '', 1000, 0, '(active:=:1)');
 $listofpartnership = array();
 foreach ($listofpartnershipobj as $partnershipobj) {
 	$listofpartnership[$partnershipobj->id] = $partnershipobj->label;
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 070e489af48..bcd27f58b18 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -170,7 +170,7 @@ if (getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE')) {
 }
 
 
-$results = $object->fetchAll($sortfield, $sortorder, 0, 0, array('status' => 1));
+$results = $object->fetchAll($sortfield, $sortorder, 0, 0, '(status:=:1)');
 $now = dol_now();
 
 if (is_array($results)) {
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 0d02a59a573..22be8d3b914 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -356,15 +356,16 @@ class RecruitmentCandidature extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -378,25 +379,14 @@ class RecruitmentCandidature extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
@@ -924,7 +914,7 @@ class RecruitmentCandidature extends CommonObject
 		$this->lines = array();
 
 		$objectline = new RecruitmentCandidatureLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_recruitmentcandidature = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_recruitmentcandidature:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 3fa9c360610..c5acff1ab8a 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -371,15 +371,16 @@ class RecruitmentJobPosition extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -393,25 +394,14 @@ class RecruitmentJobPosition extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 687d484283c..7463e565d40 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -636,18 +636,20 @@ class Dolresource extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
 		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
+
 		// Manage filter
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {
-					$sql .= " AND ".$key." = '".$this->db->idate($value)."'";
+					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 				} elseif (strpos($key, 'ef.') !== false) {
-					$sql .= $value;
+					$sql .= ((float) $value);
 				} else {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
+
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			$sql .= $this->db->plimit($limit, $offset);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9dd643d37ed..4c8ffc7e701 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2162,7 +2162,7 @@ class Societe extends CommonObject
 
 			if (!$error) {
 				foreach ($this->childtablesoncascade as $tabletodelete) {
-					$deleteFromObject = explode(':', $tabletodelete);
+					$deleteFromObject = explode(':', $tabletodelete, 4);
 					if (count($deleteFromObject) >= 2) {
 						$className = str_replace('@', '', $deleteFromObject[0]);
 						$filepath = $deleteFromObject[1];
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 887785c5137..a3092f66627 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -93,9 +93,9 @@ if ($action == 'getProducts') {
 
 	$result = $object->fetch($category);
 	if ($result > 0) {
-		$filter = array();
+		$filter = '';
 		if ($tosell != '') {
-			$filter = array('customsql' => 'o.tosell = '.((int) $tosell));
+			$filter = '(o.tosell:=:'.((int) $tosell).')';
 		}
 		$prods = $object->getObjectsInCateg("product", 0, $limit, $offset, getDolGlobalString('TAKEPOS_SORTPRODUCTFIELD'), 'ASC', $filter);
 		// Removed properties we don't need
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 923219858f7..f852ca9b717 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -360,15 +360,16 @@ class CTicketCategory extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -382,25 +383,14 @@ class CTicketCategory extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index beace9b3dbd..74c16a11c16 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -848,19 +848,19 @@ class Ticket extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
+					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
 				} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code') || ($key == 't.fk_soc')) {
-					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
+					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_statut') {
 					if (is_array($value) && count($value) > 0) {
-						$sql .= " AND ".$key." IN (".$this->db->sanitize(implode(',', $value)).")";
+						$sql .= " AND ".$this->db->sanitize($key)." IN (".$this->db->sanitize(implode(',', $value)).")";
 					} else {
-						$sql .= " AND ".$key.' = '.((int) $value);
+						$sql .= " AND ".$this->db->sanitize($key).' = '.((int) $value);
 					}
 				} elseif ($key == 't.fk_contract') {
-					$sql .= " AND ".$key.' = '.((int) $value);
+					$sql .= " AND ".$this->db->sanitize($key).' = '.((int) $value);
 				} else {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
+					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 0d442f9e121..316f21b482e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -715,7 +715,8 @@ class User extends CommonObject
 			require_once DOL_DOCUMENT_ROOT.'/core/class/defaultvalues.class.php';
 
 			$defaultValues = new DefaultValues($this->db);
-			$result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity)));	// User 0 (all) + me (if defined)
+			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')');	// User 0 (all) + me (if defined)
+			//$result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity)));	// User 0 (all) + me (if defined)
 
 			if (!is_array($result) && $result < 0) {
 				setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
@@ -4036,12 +4037,13 @@ class User extends CommonObject
 	 *  @param	string		$sortfield		sort field
 	 *  @param	int			$limit			limit page
 	 *  @param	int			$offset			page
-	 *  @param	array		$filter			Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 *  @param  string      $filtermode		Filter mode (AND or OR)
+	 * 	@param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * 	@param  string      $filtermode   	No more used
 	 *  @param  bool        $entityfilter	Activate entity filter
 	 *  @return int							Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array(), $filtermode = 'AND', $entityfilter = false)
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND', $entityfilter = false)
 	{
 		global $conf, $user;
 
@@ -4066,23 +4068,14 @@ class User extends CommonObject
 		}
 
 		// Manage filter
-		$sqlwhere = array();
-		if (!empty($filter)) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
+
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 1b7ae1004f3..0b8446e329f 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -358,14 +358,14 @@ class Target extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
@@ -868,7 +868,7 @@ class Target extends CommonObject
 		$this->lines = array();
 
 		$objectline = new TargetLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_target = '.((int) $this->id)));
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_target:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
 			$this->error = $objectline->error;
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 506071a26f2..82f2e02468e 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -406,18 +406,17 @@ class Workstation extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -430,25 +429,14 @@ class Workstation extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 68bda9bedb8..98c8c06af93 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -388,15 +388,16 @@ class Hook extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit       	limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
+	 * @param  string      	$filtermode   	No more used
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		global $conf;
 
@@ -409,23 +410,14 @@ class Hook extends CommonObject
 		// TODO Get all fields
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.entity = '.((int) $conf->entity);
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 'customsql') {
-					$sqlwhere[] = $value;
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {

From cda8a7d2418d87ea10077f5b8f63623318ad95bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 03:57:56 +0100
Subject: [PATCH 0471/1862] 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 5e58c3499a8..311351618c8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2333,7 +2333,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			$tabsname = str_replace("@", "", $picto);
 		}
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out .= '<div class="tab"><a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a></div>'; // Do not use "reposition" class in the "More".
+		$out .= '<div class="tab valignmiddle"><a href="#" class="tab moretab inline-block tabunactive valignmiddle"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a></div>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
 		$out .= '</div>';

From d7f3feba747b9177a80d11384cbb3bae84dc9642 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 03:57:56 +0100
Subject: [PATCH 0472/1862] Merge branch '18.0' of
 git@github.com:Dolibarr/dolibarr.git into 19.0

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

From bf6c662d25e988f454f8aa4e439ccb055f78e9ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 04:06:21 +0100
Subject: [PATCH 0473/1862] Fix phpunit

---
 htdocs/core/class/commonobjectline.class.php  |  2 +-
 .../fournisseur.commande.dispatch.class.php   | 55 ++++++++++++-------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index cda83ffdaa5..1a0f1f15ed0 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -196,7 +196,7 @@ abstract class CommonObjectLine extends CommonObject
 	}
 
 	/**
-	 * Empty function to prevent errors on call of this function must be overload if useful
+	 * Empty function to prevent errors on call of this function. Must be overload if useful
 	 *
 	 * @param  string      		$sortorder    	Sort Order
 	 * @param  string      		$sortfield    	Sort field
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 74dec969d11..5998b330c14 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -646,15 +646,15 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string $sortorder 	Sort Order
-	 * @param string $sortfield 	Sort field
-	 * @param int    $limit     	limit
-	 * @param int    $offset    	offset limit
-	 * @param array  $filter    	filter array
-	 * @param string $filtermode 	filter mode (AND or OR)
-	 * @return 						int Return integer <0 if KO, >0 if OK
+	 * @param string 		$sortorder 		Sort Order
+	 * @param string 		$sortfield 		Sort field
+	 * @param int    		$limit     		limit
+	 * @param int    		$offset    		offset limit
+	 * @param string|array  $filter    		filter array
+	 * @param string 		$filtermode 	filter mode (AND or OR)
+	 * @return 								int Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -676,22 +676,35 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.comment') {
-					$sqlwhere [] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
-				} elseif ($key == 't.datec' || $key == 't.tms' || $key == 't.eatby' || $key == 't.sellby' || $key == 't.batch') {
-					$sqlwhere [] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
-				} elseif ($key == 'qty') {
-					$sqlwhere [] = $this->db->sanitize($key)." = ".((float) $value);
-				} else {
-					$sqlwhere [] = $this->db->sanitize($key)." = ".((int) $value);
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.comment') {
+						$sqlwhere [] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					} elseif ($key == 't.datec' || $key == 't.tms' || $key == 't.eatby' || $key == 't.sellby' || $key == 't.batch') {
+						$sqlwhere [] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
+					} elseif ($key == 'qty') {
+						$sqlwhere [] = $this->db->sanitize($key)." = ".((float) $value);
+					} else {
+						$sqlwhere [] = $this->db->sanitize($key)." = ".((int) $value);
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' WHERE '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {

From 93ccee2efbfd3d73aa465fb5b697f2cbd76253cb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 5 Mar 2024 11:06:52 +0100
Subject: [PATCH 0474/1862] FIX wrong GETPOST check (#28643)

* FIX wrong GETPOST check

* FIX why GETPOST("search_type", "int") is not the same result of
GETPOSTINT("search_type") ?
---
 htdocs/product/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b82db510d94..2d47c9a7e5e 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -77,7 +77,7 @@ $search_ref_supplier = GETPOST("search_ref_supplier", 'alpha');
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_default_workstation = GETPOST("search_default_workstation", 'alpha');
-$search_type = GETPOSTINT("search_type");
+$search_type = GETPOST("search_type", "int");
 $search_vatrate = GETPOST("search_vatrate", 'alpha');
 $searchCategoryProductOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {

From 5c80d4b4fd637e210a0f9d0bcf9a013835f6bd4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 Mar 2024 15:43:11 +0100
Subject: [PATCH 0475/1862] CSS

---
 htdocs/theme/eldy/global.inc.php                 | 11 ++++++++++-
 htdocs/variants/class/ProductAttribute.class.php |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 992013d3a24..d1799aae1c3 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -8152,8 +8152,17 @@ table.jPicker {
 	}
 }
 
-
 <?php
+if (getDolUserString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
+	// Set a max height on multiselect when using multiselect
+?>
+	select[multiple] {
+	    height: 42px;
+	}
+<?php
+}
+
+
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/emaillayout.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 5387ee3fbfa..f0014a0a7ab 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -18,6 +18,7 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
 /**
  * Class ProductAttribute
  * Used to represent a product attribute

From f1501878c01ae3947b6d385b918b43e40677c688 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 Mar 2024 15:53:23 +0100
Subject: [PATCH 0476/1862] CSS

---
 htdocs/theme/md/style.css.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 933bbc3b378..1114991417b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -7998,8 +7998,16 @@ table.jPicker {
 	}
 }
 
-
 <?php
+if (getDolUserString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
+	// Set a max height on multiselect when using multiselect
+?>
+	select[multiple] {
+	    height: 42px;
+	}
+<?php
+}
+
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
 include dol_buildpath($path.'/theme/eldy/emaillayout.inc.php', 0); // actually md use same style as eldy theme
 include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);

From 13f3dcf39c5f789307785147e0d14703ef95cdb9 Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Tue, 5 Mar 2024 08:56:38 -0600
Subject: [PATCH 0477/1862] FIX #28641 (#28642)

* FIX #28641

FIX #28641 Annoying autocomplete on datepicker

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/html.form.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6c4a8bd4e55..4f3da187b8a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6903,7 +6903,7 @@ class Form
 					$retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidthdate" maxlength="11" value="' . $formated_date . '"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
-					$retstring .= '>';
+					$retstring .= ' autocomplete="off">';
 
 					// Icon calendar
 					$retstringbuttom = '';
@@ -6960,7 +6960,7 @@ class Form
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
-					$retstring .= '>';
+					$retstring .= ' autocomplete="off">';
 
 					// Icone calendrier
 					if ($disabled) {

From cb77ff0a16b1575016eb202811b58bbcaafcfca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:11:32 +0100
Subject: [PATCH 0478/1862] Set import_key in import when update record
 (#28644)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix can't delete pdf if ref is not encoded (#28630)

* fix typo in ChangeLog (#28613)

* fix typo in ChangeLog

* Update ChangeLog

* FIX: Count of virtual stock at Services and MoLine with disabled stock change (#28580)

* fix the count of virtual stock

* - fix "Found non sanitized string" ?

---------

Co-authored-by: christian.humpel <christian.humpel@gmail.com>

* Set import_key in import when update record

* Set import_key in import when update record

---------

Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Christian Humpel <78662388+Humml87@users.noreply.github.com>
Co-authored-by: christian.humpel <christian.humpel@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/compta/facture/card.php                     | 2 +-
 htdocs/core/modules/import/import_csv.modules.php  | 2 +-
 htdocs/core/modules/import/import_xlsx.modules.php | 2 +-
 htdocs/product/class/product.class.php             | 6 ++++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 47efd560c4a..dd784b53419 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4511,7 +4511,7 @@ if ($action == 'create') {
 		$file = GETPOST('file', 'alpha');
 
 		$formconfirm = $form->formconfirm(
-			$_SERVER["PHP_SELF"].'?facid='.$object->id.'&file='.$file,
+			$_SERVER["PHP_SELF"].'?facid='.$object->id.'&file='.urlencode($file),
 			$langs->trans('DeleteFileHeader'),
 			$langs->trans('DeleteFileText')."<br><br>".$file,
 			'remove_file',
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 48e4a1defa2..bb3f6ae561e 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -965,7 +965,7 @@ class ImportCsv extends ModeleImports
 								foreach ($data as $key => $val) {
 									$set[] = $key." = ".$val;
 								}
-								$sqlstart .= " SET ".implode(', ', $set);
+								$sqlstart .= " SET ".implode(', ', $set).", import_key = '".$this->db->escape($importid)."'";
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 740603b836e..5e9ca592a0c 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -1006,7 +1006,7 @@ class ImportXlsx extends ModeleImports
 								foreach ($data as $key => $val) {
 									$set[] = $key." = ".$val;
 								}
-								$sqlstart .= " SET " . implode(', ', $set);
+								$sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index feb1dde19ce..28d9e7a1ce8 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3535,6 +3535,8 @@ class Product extends CommonObject
 		// phpcs:enable
 		global $conf, $user, $hookmanager, $action;
 
+		$serviceStockIsEnabled = isModEnabled("service") && getDolGlobalString('STOCK_SUPPORTS_SERVICES');
+
 		$sql = "SELECT COUNT(DISTINCT m.fk_soc) as nb_customers, COUNT(DISTINCT m.rowid) as nb,";
 		$sql .= " COUNT(mp.rowid) as nb_rows, SUM(mp.qty) as qty, role";
 		$sql .= " FROM ".$this->db->prefix()."mrp_production as mp";
@@ -3546,6 +3548,7 @@ class Product extends CommonObject
 		$sql .= " WHERE m.rowid = mp.fk_mo";
 		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'mrp').")";
 		$sql .= " AND mp.fk_product = ".((int) $this->id);
+		$sql .= " AND mp.disable_stock_change IN (0)";
 		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
 			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
@@ -3558,6 +3561,9 @@ class Product extends CommonObject
 		if (!empty($dateofvirtualstock)) {
 			$sql .= " AND m.date_valid <= '".$this->db->idate($dateofvirtualstock)."'"; // better date to code ? end of production ?
 		}
+		if (!$serviceStockIsEnabled) {
+			$sql .= "AND EXISTS (SELECT p.rowid FROM ".$this->db->prefix()."product AS p WHERE p.rowid = ".((int) $this->id)." AND p.fk_product_type IN (0))";
+    }
 		if (!empty($warehouseid)) {
 			$sql.= " AND m.fk_warehouse = ".((int) $warehouseid);
 		}

From beba98be64386b169067be1c35823814767e3598 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 Mar 2024 16:28:59 +0100
Subject: [PATCH 0479/1862] Fix phan

---
 htdocs/asset/class/asset.class.php      |  3 ++-
 htdocs/asset/class/assetmodel.class.php |  3 ++-
 htdocs/hrm/class/evaluation.class.php   | 14 ++++++--------
 htdocs/hrm/class/job.class.php          | 12 +++++-------
 htdocs/hrm/class/position.class.php     | 18 ++++++++----------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 296659dda53..7eeae3336c0 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -398,7 +398,7 @@ class Asset extends CommonObject
 	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -412,6 +412,7 @@ class Asset extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
+
 		// Manage filter
 		$errormessage = '';
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 768e2cd8e33..8bbfda125e7 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -348,7 +348,7 @@ class AssetModel extends CommonObject
 	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -363,6 +363,7 @@ class AssetModel extends CommonObject
 			$sql .= " WHERE 1 = 1";
 		}
 
+		// Manage filter
 		$errormessage = '';
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 7716ebc8afc..30dfb7863f2 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -386,19 +386,17 @@ class Evaluation extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 943bdaaf470..684bc39b3c3 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -356,19 +356,17 @@ class Job extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	limit
+	 * @param  int         	$offset       	Offset
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index a3416651d72..5ed5f467ad3 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -365,19 +365,17 @@ class Position extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int $limit limit
-	 * @param int $offset Offset
-	 * @param  string		$filter       	Filter as an Universal Search string.
+	 * @param 	string 		$sortorder 		Sort Order
+	 * @param 	string 		$sortfield 		Sort field
+	 * @param 	int 		$limit 			limit
+	 * @param 	int 		$offset 		Offset
+	 * @param  	string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
-	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  	string      $filtermode   	No more used
+	 * @return 	array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();

From dc72cd390b70901d06f1143b992ae52b64e50f53 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:31:45 +0100
Subject: [PATCH 0480/1862] Qual: Clean up caches when PR is closed (#28648)

# Qual: Clean up caches when PR is closed

This will clean up caches when a PR is closed.

This requires that `actions:write` is enabled.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .github/workflows/cache-clean-pr.yml | 36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/workflows/cache-clean-pr.yml

diff --git a/.github/workflows/cache-clean-pr.yml b/.github/workflows/cache-clean-pr.yml
new file mode 100644
index 00000000000..51a4282a0e9
--- /dev/null
+++ b/.github/workflows/cache-clean-pr.yml
@@ -0,0 +1,36 @@
+---
+name: Cleanup caches of a closed branch
+# See https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
+on:
+  pull_request:
+    types: [closed]
+  workflow_dispatch:
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      # `actions:write` permission is required to delete caches
+      #   See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
+      actions: write
+      contents: read
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+          REPO=${{ github.repository }}
+          BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys. 
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 2664661afc46259d0d050e6b0a705e48b190f240 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 5 Mar 2024 16:32:40 +0100
Subject: [PATCH 0481/1862] qual: phan for htdocs/core/lib/functions.lib.php
 (#28640)

68 entries for "Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299"

Examples (first 10):

htdocs/accountancy/admin/categories.php	155	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/accountancy/admin/categories.php	189	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/accountancy/bookkeeping/card.php	778	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/eventorganization.php	341	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/hrm.php	596	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/hrm.php	603	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/hrm.php	627	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/knowledgemanagement.php	293	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/knowledgemanagement.php	300	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

htdocs/admin/multicurrency.php	115	TypeError PhanTypeMismatchArgumentProbablyReal Argument 1 ($mesg) is null of type null but \setEventMessages() takes string (no real type) defined at htdocs/core/lib/functions.lib.php:9299 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
---
 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 311351618c8..162d25420c1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9288,7 +9288,7 @@ function setEventMessage($mesgs, $style = 'mesgs', $noduplicate = 0)
  *	Set event messages in dol_events session object. Will be output by calling dol_htmloutput_events.
  *  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function.
  *
- *	@param	string		$mesg			Message string
+ *	@param	string|null	$mesg			Message string
  *	@param	array|null	$mesgs			Message array
  *  @param  string		$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
  *  @param	string		$messagekey		A key to be used to allow the feature "Never show this message again"

From bc2f527e411c60b325e8833f62459d2ef060c6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 5 Mar 2024 17:11:46 +0100
Subject: [PATCH 0482/1862] add phpdoc (#28639)

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc
---
 htdocs/adherents/class/adherent.class.php     | 36 ++++++++-
 htdocs/comm/action/class/ical.class.php       | 40 ++++++++--
 .../fourn/class/fournisseur.product.class.php | 13 +++-
 htdocs/imports/class/import.class.php         | 75 ++++++++++++++++++-
 .../class/intracommreport.class.php           | 15 +++-
 .../mailmanspip/class/mailmanspip.class.php   | 17 ++++-
 .../core/modules/modMyModule.class.php        | 13 ++--
 7 files changed, 186 insertions(+), 23 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 7a88f72e0d0..85087330092 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2018	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2024	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2024	Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019	Thibault FOUCART		<support@ptibogxiv.net>
@@ -74,7 +74,9 @@ class Adherent extends CommonObject
 	 */
 	public $picto = 'member';
 
-
+	/**
+	 * @var string[] array of messages
+	 */
 	public $mesgs;
 
 	/**
@@ -217,6 +219,9 @@ class Adherent extends CommonObject
 	 */
 	public $gender;
 
+	/**
+	 * @var int|string date of birth
+	 */
 	public $birth;
 
 	/**
@@ -249,22 +254,49 @@ class Adherent extends CommonObject
 
 	// Fields loaded by fetch_subscriptions() from member table
 
+	/**
+	 * @var int|string date
+	 */
 	public $first_subscription_date;
 
+	/**
+	 * @var int|string date
+	 */
 	public $first_subscription_date_start;
 
+	/**
+	 * @var int|string date
+	 */
 	public $first_subscription_date_end;
 
+	/**
+	 * @var int|string date
+	 */
 	public $first_subscription_amount;
 
+	/**
+	 * @var int|string date
+	 */
 	public $last_subscription_date;
 
+	/**
+	 * @var int|string date
+	 */
 	public $last_subscription_date_start;
 
+	/**
+	 * @var int|string date
+	 */
 	public $last_subscription_date_end;
 
+	/**
+	 * @var int|string date
+	 */
 	public $last_subscription_amount;
 
+	/**
+	 * @var array
+	 */
 	public $subscriptions = array();
 
 	/**
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index a6dce13a694..20b34678a5d 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2011	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013-2014 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012	   Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,13 +38,39 @@ class ICal
 	 */
 	public $file;
 
-	// Text in file
+	/**
+	 * @var string  Text in file
+	 */
 	public $file_text;
-	public $cal; // Array to save iCalendar parse data
-	public $event_count; // Number of Events
-	public $todo_count; // Number of Todos
-	public $freebusy_count; // Number of Freebusy
-	public $last_key; //Help variable save last key (multiline string)
+
+	/**
+	 * @var array Array to save iCalendar parse data
+	 */
+	public $cal;
+
+	/**
+	 * @var int Number of Events
+	 */
+	public $event_count;
+
+	/**
+	 * @var int Number of Todos
+	 */
+	public $todo_count;
+
+	/**
+	 * @var int Number of Freebusy
+	 */
+	public $freebusy_count;
+
+	/**
+	 * @var string Help variable save last key (multiline string)
+	 */
+	public $last_key;
+
+	/**
+	 * @var string error message
+	 */
 	public $error;
 
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 035c088db87..f2397aa763c 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012		Christophe Battarel	  <christophe.battarel@altairis.fr>
  * Copyright (C) 2015		Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2016-2023	Charlene Benke         <charlene@patas-monkey.com>
- * Copyright (C) 2019-2024  Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France       <frederic.france@free.fr>
  * Copyright (C) 2020       Pierre Ardoin         <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -165,8 +165,15 @@ class ProductFournisseur extends Product
 	 */
 	public $fk_supplier_price_expression;
 
-	public $supplier_reputation; // reputation of supplier
-	public $reputations = array(); // list of available supplier reputations
+	/**
+	 * @var string reputation of supplier
+	 */
+	public $supplier_reputation;
+
+	/**
+	 * @var string[] list of available supplier reputations
+	 */
+	public $reputations = array();
 
 	// Multicurreny
 	public $fourn_multicurrency_id;
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 05d8b4bb54b..eac1d838cf8 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2011       Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020		Ahmad Jamaly Rabib	<rabib@metroworks.co.jp>
- * Copyright (C) 2021		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2024  Frédéric France		<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,28 +49,99 @@ class Import
 	 */
 	public $errno;
 
+	/**
+	 * @var array
+	 */
 	public $array_import_module;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_perms;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_icon;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_code;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_label;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_tables;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_tables_creator;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_fields;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_fieldshidden;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_entities;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_regex;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_updatekeys;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_preselected_updatekeys;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_examplevalues;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_convertvalue;
+
+	/**
+	 * @var array
+	 */
 	public $array_import_run_sql_after;
 
 	// To store import templates
 	public $id;
 	public $hexa; // List of fields in the export profile
 	public $datatoimport;
-	public $model_name; // Name of export profile
+
+	/**
+	 * @var string Name of export profile
+	 */
+	public $model_name;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user;
 
 
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 9f689743e2a..aa6007eb227 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
  * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
- * Copyright (C) 2020-2024  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,8 +55,10 @@ class IntracommReport extends CommonObject
 
 	public $picto = 'intracommreport';
 
-
-	public $label; 		// ref ???
+	/**
+	 * @var string ref ???
+	 */
+	public $label;
 
 	public $period;
 
@@ -67,7 +69,14 @@ class IntracommReport extends CommonObject
 	 */
 	public $declaration_number;
 
+	/**
+	 * @var string
+	 */
 	public $exporttype;			// deb or des
+
+	/**
+	 * @var string
+	 */
 	public $type_declaration;	// 'introduction' or 'expedition'
 	public $numero_declaration;
 
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 9d9d065ed19..ba70a2dc710 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2009       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,9 +54,24 @@ class MailmanSpip
 	 */
 	public $errors = array();
 
+	/**
+	 * @var array
+	 */
 	public $mladded_ok;
+
+	/**
+	 * @var array
+	 */
 	public $mladded_ko;
+
+	/**
+	 * @var array
+	 */
 	public $mlremoved_ok;
+
+	/**
+	 * @var array
+	 */
 	public $mlremoved_ko;
 
 
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 11025ce3fff..0b166dd54b1 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -148,7 +148,7 @@ class modMyModule extends DolibarrModules
 		$this->langfiles = array("mymodule@mymodule");
 
 		// Prerequisites
-		$this->phpmin = array(7, 0); // Minimum version of PHP required by module
+		$this->phpmin = array(7, 1); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
 		$this->need_javascript_ajax = 0;
 
@@ -179,9 +179,12 @@ class modMyModule extends DolibarrModules
 		// Array to add new pages in new tabs
 		$this->tabs = array();
 		// Example:
-		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mymodule:$user->hasRight('mymodule', 'read'):/mymodule/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->hasRight('othermodule', 'read'):/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mymodule:$user->hasRight('mymodule', 'read'):/mymodule/mynewtab1.php?id=__ID__');
+		// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mymodule:$user->hasRight('othermodule', 'read'):/mymodule/mynewtab2.php?id=__ID__',
+		// To remove an existing tab identified by code tabname
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');
 		//
 		// Where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)

From a2c92f183cc54c35013469638780c28e65df0b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 5 Mar 2024 17:12:36 +0100
Subject: [PATCH 0483/1862] Phpstan fix (#28637)

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
---
 htdocs/core/class/html.formadmin.class.php    | 3 ++-
 htdocs/core/modules/DolibarrModules.class.php | 5 +++--
 htdocs/reception/class/reception.class.php    | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 125bb04a30e..7b1eb01c1a2 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Patrick Raguin 		<patrick.raguin@gmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -184,7 +185,7 @@ class FormAdmin
 	 *    @param    string		$htmlname        Name of html select
 	 *    @param    array		$dirmenuarray    Array of directories to scan
 	 *    @param    string		$moreattrib      More attributes on html select tag
-	 *    @return	integer|null
+	 *    @return	integer|void
 	 */
 	public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
 	{
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 520a7ecc1f1..d98127a6e59 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018       Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2019-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -335,7 +335,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 
 	/**
-	 * @var string[] List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule')
+	 * @var array 	List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule')
+	 * 				Another example : array('always'=>array("modBanque", "modFacture", "modProduct", "modCategorie"), 'FR'=>array('modBlockedLog'));
 	 * @see $requiredby
 	 */
 	public $depends;
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 0aeb300a666..5d7b262f22e 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -922,7 +922,7 @@ class Reception extends CommonObject
 			$this->ref = trim($this->ref);
 		}
 		if (isset($this->entity)) {
-			$this->entity = trim($this->entity);
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->ref_supplier)) {
 			$this->ref_supplier = trim($this->ref_supplier);
@@ -931,10 +931,10 @@ class Reception extends CommonObject
 			$this->socid = trim($this->socid);
 		}
 		if (isset($this->fk_user_author)) {
-			$this->fk_user_author = trim($this->fk_user_author);
+			$this->fk_user_author = (int) $this->fk_user_author;
 		}
 		if (isset($this->fk_user_valid)) {
-			$this->fk_user_valid = trim($this->fk_user_valid);
+			$this->fk_user_valid = (int) $this->fk_user_valid;
 		}
 		if (isset($this->shipping_method_id)) {
 			$this->shipping_method_id = (int) $this->shipping_method_id;

From 0ba3567ad6b203207224506a604f57e8c37b9457 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 5 Mar 2024 17:13:41 +0100
Subject: [PATCH 0484/1862] qual: phan for htdocs/accountancy/admin/card.php
 (#28638)

* qual: phan for htdocs/accountancy/admin/card.php

htdocs/accountancy/admin/card.php	89	Plugin PhanPluginDuplicateExpressionAssignment Both sides of the assignment = are the same: $account_number

htdocs/accountancy/admin/card.php	152	Plugin PhanPluginDuplicateExpressionAssignment Both sides of the assignment = are the same: $account_number

* typo
---
 htdocs/accountancy/admin/card.php | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index e4fde3aec38..8dcbff61b8d 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -85,17 +85,11 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
 			// Clean code
 
 			// To manage zero or not at the end of the accounting account
-			if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
-				$account_number = $account_number;
-			} else {
+			if (!getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
 				$account_number = clean_account($account_number);
 			}
 
-			if (GETPOSTINT('account_parent') <= 0) {
-				$account_parent = 0;
-			} else {
-				$account_parent = GETPOSTINT('account_parent');
-			}
+			$account_parent = (GETPOSTINT('account_parent') > 0) ? GETPOSTINT('account_parent') : 0;
 
 			$object->fk_pcg_version = $obj->pcg_version;
 			$object->pcg_type = GETPOST('pcg_type', 'alpha');
@@ -148,17 +142,11 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
 			// Clean code
 
 			// To manage zero or not at the end of the accounting account
-			if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
-				$account_number = $account_number;
-			} else {
+			if (!getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
 				$account_number = clean_account($account_number);
 			}
 
-			if (GETPOSTINT('account_parent') <= 0) {
-				$account_parent = 0;
-			} else {
-				$account_parent = GETPOSTINT('account_parent');
-			}
+			$account_parent = (GETPOSTINT('account_parent') > 0) ? GETPOSTINT('account_parent') : 0;
 
 			$object->fk_pcg_version = $obj->pcg_version;
 			$object->pcg_type = GETPOST('pcg_type', 'alpha');

From 26c307c0a422558d6224b9366bd938ccd3b6fb9d Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Tue, 5 Mar 2024 17:16:11 +0100
Subject: [PATCH 0485/1862] Fix extrafield ajax search default on edit (#28631)

---
 htdocs/core/class/html.form.class.php | 49 +++++++++++++++++----------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 29cb68f171d..40e93918771 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8014,22 +8014,22 @@ class Form
 	 * Can use autocomplete with ajax after x key pressed or a full combo, depending on setup.
 	 * This is the generic method that will replace all specific existing methods.
 	 *
-	 * @param 	string 	$objectdesc 			'ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'. For hard coded custom needs. Try to prefer method using $objectfield instead of $objectdesc.
-	 * @param 	string 	$htmlname 				Name of HTML select component
-	 * @param 	int 	$preselectedvalue 		Preselected value (ID of element)
-	 * @param 	string 	$showempty 				''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
-	 * @param 	string 	$searchkey 				Search criteria
-	 * @param 	string 	$placeholder 			Place holder
-	 * @param 	string 	$morecss 				More CSS
-	 * @param 	string 	$moreparams 			More params provided to ajax call
-	 * @param 	int 	$forcecombo 			Force to load all values and output a standard combobox (with no beautification)
-	 * @param 	int 	$disabled 				1=Html component is disabled
-	 * @param 	string 	$selected_input_value 	Value of preselected input text (for use with ajax)
-	 * @param	string	$objectfield			Object:Field that contains the definition (in table $fields or $extrafields). Example: 'Object:xxx' or 'Module_Object:xxx' or 'Object:options_xxx' or 'Module_Object:options_xxx'
+	 * @param 	string $objectdesc           'ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'. For hard coded custom needs. Try to prefer method using $objectfield instead of $objectdesc.
+	 * @param 	string $htmlname             Name of HTML select component
+	 * @param 	int    $preSelectedValue     Preselected value (ID of element)
+	 * @param 	string $showempty            ''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
+	 * @param 	string $searchkey            Search criteria
+	 * @param 	string $placeholder          Place holder
+	 * @param 	string $morecss              More CSS
+	 * @param 	string $moreparams           More params provided to ajax call
+	 * @param 	int    $forcecombo           Force to load all values and output a standard combobox (with no beautification)
+	 * @param 	int    $disabled             1=Html component is disabled
+	 * @param 	string $selected_input_value Value of preselected input text (for use with ajax)
+	 * @param	string $objectfield          Object:Field that contains the definition (in table $fields or $extrafields). Example: 'Object:xxx' or 'Module_Object:xxx' or 'Object:options_xxx' or 'Module_Object:options_xxx'
 	 * @return  string	                      	Return HTML string
 	 * @see selectForFormsList(), select_thirdparty_list()
 	 */
-	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '', $objectfield = '')
+	public function selectForForms($objectdesc, $htmlname, $preSelectedValue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '', $objectfield = '')
 	{
 		global $conf, $extrafields, $user;
 
@@ -8128,10 +8128,23 @@ class Form
 		if (!empty($conf->use_javascript_ajax) && getDolGlobalString($confkeyforautocompletemode) && !$forcecombo) {
 			// No immediate load of all database
 			$placeholder = '';
-			if ($preselectedvalue && empty($selected_input_value)) {
-				$objecttmp->fetch($preselectedvalue);
+
+			if ($preSelectedValue && empty($selected_input_value)) {
+				$objecttmp->fetch($preSelectedValue);
 				$selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);
-				//unset($objecttmp);
+
+				$oldValueForShowOnCombobox = 0;
+				foreach ($objecttmp->fields as $fieldK => $fielV) {
+					if (!$fielV['showoncombobox'] || empty($objecttmp->$fieldK)) continue;
+
+					if (!$oldValueForShowOnCombobox) {
+						$selected_input_value = '';
+					}
+
+					$selected_input_value .= $oldValueForShowOnCombobox ? ' - ' : '';
+					$selected_input_value .= $objecttmp->$fieldK;
+					$oldValueForShowOnCombobox = empty($fielV['showoncombobox']) ? 0 : $fielV['showoncombobox'];
+				}
 			}
 
 			// Set url and param to call to get json of the search results
@@ -8139,12 +8152,12 @@ class Form
 			$urloption = 'htmlname=' . urlencode($htmlname) . '&outjson=1&objectdesc=' . urlencode($objectdescorig) . '&objectfield='.urlencode($objectfield) . ($sortfield ? '&sortfield=' . urlencode($sortfield) : '');
 
 			// Activate the auto complete using ajax call.
-			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, getDolGlobalString($confkeyforautocompletemode), 0, array());
+			$out .= ajax_autocompleter($preSelectedValue, $htmlname, $urlforajaxcall, $urloption, getDolGlobalString($confkeyforautocompletemode), 0);
 			$out .= '<!-- force css to be higher than dialog popup --><style type="text/css">.ui-autocomplete { z-index: 1010; }</style>';
 			$out .= '<input type="text" class="' . $morecss . '"' . ($disabled ? ' disabled="disabled"' : '') . ' name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '') . ' />';
 		} else {
 			// Immediate load of table record.
-			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled, $sortfield, $filter);
+			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preSelectedValue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled, $sortfield, $filter);
 		}
 
 		return $out;

From 8d9e9f13cfead5ff6ddb8acf72d4bbbc6a3398ef Mon Sep 17 00:00:00 2001
From: thomas-Ngr <tnegre@open-dsi.fr>
Date: Tue, 5 Mar 2024 17:18:36 +0100
Subject: [PATCH 0486/1862] fix #28374 : tosell is not used anymore on
 products, use status (#28647)

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9c30198f3e7..7a3b3c13cba 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -233,7 +233,7 @@ if (empty($reshook)) {
 							$line->fetch_product();
 						}
 						if (is_object($line->product) && $line->product->id > 0) {
-							if (empty($line->product->tosell)) {
+							if (empty($line->product->status)) {
 								$warningMsgLineList[$line->id] = $langs->trans('WarningLineProductNotToSell', $line->product->ref);
 							}
 						}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3b40b864f5a..92621cdfcac 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -203,7 +203,7 @@ if (empty($reshook)) {
 							$line->fetch_product();
 						}
 						if (is_object($line->product) && $line->product->id > 0) {
-							if (empty($line->product->tosell)) {
+							if (empty($line->product->status)) {
 								$warningMsgLineList[$line->id] = $langs->trans('WarningLineProductNotToSell', $line->product->ref);
 							}
 						}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index dd784b53419..ca53310fb71 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -234,7 +234,7 @@ if (empty($reshook)) {
 						$line->fetch_product();
 					}
 					if (is_object($line->product) && $line->product->id > 0) {
-						if (empty($line->product->tosell)) {
+						if (empty($line->product->status)) {
 							$warningMsgLineList[$line->id] = $langs->trans('WarningLineProductNotToSell', $line->product->ref);
 						}
 					}

From dffa96768077df862e6f5debfc3fede131158601 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 Mar 2024 17:23:33 +0100
Subject: [PATCH 0487/1862] Sanitize table name

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a49570fccbf..362728c367b 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1211,17 +1211,17 @@ class BookKeeping extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=' || $key == 't.doc_date>' || $key == 't.doc_date<') {
-					$sqlwhere[] = $key."'".$this->db->idate($value)."'";
+					$sqlwhere[] = $this->db->sanitize($key)."'".$this->db->idate($value)."'";
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key."'".$this->db->escape($value)."'";
+					$sqlwhere[] = $this->db->sanitize($key)."'".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key." = ".((int) $value);
+					$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key." LIKE '".$this->db->escape($value)."%'";
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '".$this->db->escape($value)."%'";
 				} elseif ($key == 't.subledger_label') {
-					$sqlwhere[] = $key." LIKE '".$this->db->escape($value)."%'";
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '".$this->db->escape($value)."%'";
 				} elseif ($key == 't.code_journal' && !empty($value)) {
 					if (is_array($value)) {
 						$sqlwhere[] = natural_search("t.code_journal", implode(',', $value), 3, 1);
@@ -1231,7 +1231,7 @@ class BookKeeping extends CommonObject
 				} elseif ($key == 't.reconciled_option') {
 					$sqlwhere[] = 't.lettering_code IS NULL';
 				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->escape($this->db->escapeforlike($value))."%'";
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}

From de139de23dde3c688b655da2930e6d0140208891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 5 Mar 2024 17:24:18 +0100
Subject: [PATCH 0488/1862] clean some files (#28649)

* clean some files

* clean some files
---
 .../webportal/css/themes/custom.css.php       | 23 ++++++++++
 htdocs/public/webportal/index.php             | 29 +++++++++++--
 htdocs/public/webportal/logout.php            |  8 ++--
 .../public/webportal/webportal.main.inc.php   | 42 +++++++++++++------
 htdocs/webportal/lib/webportal.lib.php        |  3 +-
 5 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/htdocs/public/webportal/css/themes/custom.css.php b/htdocs/public/webportal/css/themes/custom.css.php
index e6bbf6d48ae..bdb1de8d7bb 100644
--- a/htdocs/public/webportal/css/themes/custom.css.php
+++ b/htdocs/public/webportal/css/themes/custom.css.php
@@ -1,4 +1,27 @@
 <?php
+/* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/public/webportal/css/themes/custom.css.php
+ * \ingroup webportal
+ * \brief   Custom css files for WebPortal
+ */
 
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
diff --git a/htdocs/public/webportal/index.php b/htdocs/public/webportal/index.php
index fecaecd29ed..9e293d5a04f 100644
--- a/htdocs/public/webportal/index.php
+++ b/htdocs/public/webportal/index.php
@@ -1,9 +1,30 @@
 <?php
+/* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/public/webportal/index.php
+ * \ingroup webportal
+ * \brief   index files for WebPortal
+ */
+
+include 'webportal.main.inc.php';
 
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res = 0;
-if (!$res && file_exists('./webportal.main.inc.php')) $res = @include './webportal.main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res) die('Include of WebPortal main fails');
 
 /** @var Context $context */
 
diff --git a/htdocs/public/webportal/logout.php b/htdocs/public/webportal/logout.php
index 5cc4b00de7e..ec8a4c5f136 100644
--- a/htdocs/public/webportal/logout.php
+++ b/htdocs/public/webportal/logout.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
  */
 
 /**
- * \file		htdocs/user/logout.php
+ * \file		htdocs/public/webportal/logout.php
  * \ingroup		webportal
  * \brief		Page called to disconnect a user
  */
@@ -33,10 +34,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res = 0;
-if (!$res && file_exists('./webportal.main.inc.php')) $res = @include './webportal.main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res) die('Include of WebPortal main fails');
+include 'webportal.main.inc.php';
 
 global $db;
 
diff --git a/htdocs/public/webportal/webportal.main.inc.php b/htdocs/public/webportal/webportal.main.inc.php
index f72337314c1..c56e7d9bfba 100644
--- a/htdocs/public/webportal/webportal.main.inc.php
+++ b/htdocs/public/webportal/webportal.main.inc.php
@@ -1,4 +1,28 @@
 <?php
+/* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/public/webportal/webportal.main.inc.php
+ * \ingroup webportal
+ * \brief   Main include file for WebPortal
+ */
+
 if (!defined('WEBPORTAL')) { define('WEBPORTAL', 1); }
 if (!defined('NOLOGIN')) { define('NOLOGIN', 1); }
 if (!defined('NOREQUIREUSER')) { define('NOREQUIREUSER', 1); }
@@ -38,20 +62,14 @@ if (!function_exists('dol_getprefix')) {
 }
 
 
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res = 0;
-if (!$res && file_exists('../../main.inc.php')) $res = @include '../../main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res && file_exists('../../../main.inc.php')) $res = @include '../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../main.inc.php')) $res = @include '../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../../main.inc.php')) $res = @include '../../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../../../main.inc.php')) $res = @include '../../../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res) die('Include of main fails');
+include '../../main.inc.php';
+
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societeaccount.class.php';
-dol_include_once('/public/webportal/lib/webportal.lib.php');
-dol_include_once('/webportal/class/context.class.php');
-dol_include_once('/webportal/class/webportalmember.class.php');
-dol_include_once('/webportal/class/webportalpartnership.class.php');
+require_once DOL_DOCUMENT_ROOT . '/public/webportal/lib/webportal.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/webportal/class/context.class.php';
+require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalmember.class.php';
+require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalpartnership.class.php';
 
 // Init session. Name of session is specific to WEBPORTAL instance.
 // Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
diff --git a/htdocs/webportal/lib/webportal.lib.php b/htdocs/webportal/lib/webportal.lib.php
index 16d3ecc9876..ca95ad67bbe 100644
--- a/htdocs/webportal/lib/webportal.lib.php
+++ b/htdocs/webportal/lib/webportal.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
  */
 
 /**
- * \file    lib/webportal.lib.php
+ * \file    htdocs/webportal/lib/webportal.lib.php
  * \ingroup webportal
  * \brief   Library files with common functions for WebPortal
  */

From 75f1de8f8f5140235b45f80633f65192ab14b847 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Tue, 5 Mar 2024 18:07:05 +0100
Subject: [PATCH 0489/1862] Fix: Deposit lines are not created correctly
 (#28646)

* FIX: The minimum price in proposals is not checked correctly

* Fix: Deposit lines are not created correctly

* Fix: Volver a dejar como estaba

* Fix: Deposit lines are not created correctly
---
 htdocs/compta/facture/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 0dd1b661b33..bb96c2c2f81 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2013       Jean-Francois FERRY     <jfefe@aternatik.fr>
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014-2019  Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2014-2024  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
@@ -1596,7 +1596,7 @@ if (empty($reshook)) {
 									null,
 									0,
 									'',
-									1
+									(!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)?0:1)
 								);
 							}
 

From cb20a1d0335561c8c5eb1d1d35bd1c3ec88c10d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 21:18:14 +0100
Subject: [PATCH 0490/1862] Fix css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d1799aae1c3..7b3cd0697cb 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -8155,11 +8155,11 @@ table.jPicker {
 <?php
 if (getDolUserString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	// Set a max height on multiselect when using multiselect
-?>
+	?>
 	select[multiple] {
-	    height: 42px;
+		height: 42px;
 	}
-<?php
+	<?php
 }
 
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1114991417b..e1d69443c5a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -8001,11 +8001,11 @@ table.jPicker {
 <?php
 if (getDolUserString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	// Set a max height on multiselect when using multiselect
-?>
+	?>
 	select[multiple] {
-	    height: 42px;
+		height: 42px;
 	}
-<?php
+	<?php
 }
 
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);

From 95b7fe7dd3dafb918d7ed0261671dfcfc423d11d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 21:19:42 +0100
Subject: [PATCH 0491/1862] Fix phpcs

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 28d9e7a1ce8..80e85cf7341 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3563,7 +3563,7 @@ class Product extends CommonObject
 		}
 		if (!$serviceStockIsEnabled) {
 			$sql .= "AND EXISTS (SELECT p.rowid FROM ".$this->db->prefix()."product AS p WHERE p.rowid = ".((int) $this->id)." AND p.fk_product_type IN (0))";
-    }
+		}
 		if (!empty($warehouseid)) {
 			$sql.= " AND m.fk_warehouse = ".((int) $warehouseid);
 		}

From fd2352645de445716eeaa5a72c8415f9da45d1a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 22:59:55 +0100
Subject: [PATCH 0492/1862] Fix warning

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

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index b31f39c366d..057c307e1f6 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -173,13 +173,13 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Load record in memory
 	 *
-	 * @param 	int 	       $rowid 				    Id
-	 * @param 	string 	       $account_number 	        Account number
-	 * @param 	int|boolean    $limittocurrentchart     1 or true=Load record only if it is into current active chart of account
-	 * @param   string         $limittoachartaccount    'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
-	 * @return 	int                                     Return integer <0 if KO, 0 if not found, Id of record if OK and found
+	 * @param 	int       		$rowid 				    	Id
+	 * @param 	string 	       	$account_number 	        Account number
+	 * @param 	int|boolean    	$limittocurrentchart     	1 or true=Load record only if it is into current active chart of account
+	 * @param   string         	$limittoachartaccount    	'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
+	 * @return 	int                                     	Return integer <0 if KO, 0 if not found, Id of record if OK and found
 	 */
-	public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
+	public function fetch($rowid = 0, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
 	{
 		global $conf;
 

From 64093cc3786d2439b90833cf0155d0c3809b9437 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 23:00:51 +0100
Subject: [PATCH 0493/1862] Fix warning

---
 htdocs/accountancy/admin/productaccount.php | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index a0556a5753a..e93164b01be 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -267,18 +267,18 @@ $form = new FormAccounting($db);
 // so we need to get those the rowid of those default value first
 $accounting = new AccountingAccount($db);
 // TODO: we should need to check if result is already exists accountaccount rowid.....
-$aarowid_servbuy            = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_BUY_ACCOUNT'), 1);
-$aarowid_servbuy_intra      = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT'), 1);
-$aarowid_servbuy_export     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT'), 1);
-$aarowid_prodbuy            = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_BUY_ACCOUNT'), 1);
-$aarowid_prodbuy_intra      = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT'), 1);
-$aarowid_prodbuy_export     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT'), 1);
-$aarowid_servsell           = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_SOLD_ACCOUNT'), 1);
-$aarowid_servsell_intra     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT'), 1);
-$aarowid_servsell_export    = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT'), 1);
-$aarowid_prodsell           = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUNT'), 1);
-$aarowid_prodsell_intra     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT'), 1);
-$aarowid_prodsell_export    = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT'), 1);
+$aarowid_servbuy            = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_SERVICE_BUY_ACCOUNT'), 1);
+$aarowid_servbuy_intra      = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT'), 1);
+$aarowid_servbuy_export     = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT'), 1);
+$aarowid_prodbuy            = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_PRODUCT_BUY_ACCOUNT'), 1);
+$aarowid_prodbuy_intra      = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT'), 1);
+$aarowid_prodbuy_export     = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT'), 1);
+$aarowid_servsell           = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_SERVICE_SOLD_ACCOUNT'), 1);
+$aarowid_servsell_intra     = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT'), 1);
+$aarowid_servsell_export    = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT'), 1);
+$aarowid_prodsell           = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUNT'), 1);
+$aarowid_prodsell_intra     = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT'), 1);
+$aarowid_prodsell_export    = $accounting->fetch(0, getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT'), 1);
 
 $aacompta_servbuy           = getDolGlobalString('ACCOUNTING_SERVICE_BUY_ACCOUNT', $langs->trans("CodeNotDef"));
 $aacompta_servbuy_intra     = getDolGlobalString('ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT', $langs->trans("CodeNotDef"));

From c27551cbb7673c2136f21ca91df256d26d682d93 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Mar 2024 23:29:41 +0100
Subject: [PATCH 0494/1862] Add a more complete message

---
 htdocs/public/payment/paymentok.php | 10 +++++-----
 htdocs/public/stripe/ipn.php        |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d31715b03ca..f5950f629d7 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -882,7 +882,7 @@ if ($ispaymentok) {
 				} else {
 					$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+					$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 					$ispostactionok = -1;
 					$error++; // Not yet supported
 				}
@@ -1011,7 +1011,7 @@ if ($ispaymentok) {
 						} else {
 							$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-							$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+							$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 							$ispostactionok = -1;
 							$error++;
 						}
@@ -1278,7 +1278,7 @@ if ($ispaymentok) {
 					} else {
 						$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+						$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 						$ispostactionok = -1;
 						$error++; // Not yet supported
 					}
@@ -1508,7 +1508,7 @@ if ($ispaymentok) {
 					} else {
 						$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+						$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 						$ispostactionok = -1;
 						$error++; // Not yet supported
 					}
@@ -1719,7 +1719,7 @@ if ($ispaymentok) {
 						} else {
 							$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-							$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+							$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 							$ispostactionok = -1;
 							$error++;
 						}
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 3888b247006..1cbedcc9342 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -404,6 +404,8 @@ if ($event->type == 'payout.created') {
 		$payment_amount = $payment_amountInDolibarr;
 		// TODO Check payment_amount in Stripe (received) is same than the one in Dolibarr
 
+		$postactionmessages = array();
+
 		if ($paymentTypeId == "CB" && ($paymentTypeIdInDolibarr == 'card' || empty($paymentTypeIdInDolibarr))) {
 			// Case payment type in Stripe and into prelevement_demande are both CARD.
 			// For this case, payment should already have been recorded so we just update flag of payment request if not yet 1
@@ -422,7 +424,7 @@ if ($event->type == 'payout.created') {
 			} else {
 				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching
 
-				$postactionmessages[] = 'Payment was done in a different currency than currency expected of company';
+				$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 				$ispostactionok = -1;
 				// Not yet supported, so error
 				$error++;

From 5c4c39da2ac62db2e2188bc9526f8dfbbe6e0380 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 00:46:04 +0100
Subject: [PATCH 0495/1862] Debug module AI

---
 htdocs/ai/admin/custom_prompt.php          | 98 ++++++++++++----------
 htdocs/ai/admin/setup.php                  |  9 +-
 htdocs/ai/ajax/generate_content.php        | 10 ++-
 htdocs/ai/class/ai.class.php               | 62 ++++++++++----
 htdocs/core/class/html.formsetup.class.php |  4 +
 htdocs/langs/en_US/admin.lang              |  8 +-
 6 files changed, 125 insertions(+), 66 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 56c29fa0e5e..c784e9ae3b8 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -38,11 +38,6 @@ if (empty($action)) {
 	$action = 'edit';
 }
 
-$value = GETPOST('value', 'alpha');
-$label = GETPOST('label', 'alpha');
-$scandir = GETPOST('scan_dir', 'alpha');
-$type = 'myobject';
-
 $error = 0;
 $setupnotempty = 0;
 
@@ -71,8 +66,12 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 // List of AI features
 $arrayofaifeatures = array(
-	'emailing' => 'Emailing',
-	'imagegeneration' => 'ImageGeneration'
+	'textgeneration' => array('label' => 'TextGeneration', 'picto'=>'', 'status'=>'development'),
+	'imagegeneration' => array('label' => 'ImageGeneration', 'picto'=>'', 'status'=>'notused'),
+	'videogeneration' => array('label' => 'VideoGeneration', 'picto'=>'', 'status'=>'notused'),
+	'transcription' => array('label' => 'Transcription', 'picto'=>'', 'status'=>'notused'),
+	'translation' => array('label' => 'Translation', 'picto'=>'', 'status'=>'notused'),
+	'audiotext' => array('label' => 'AudioText', 'picto'=>'', 'status'=>'notused')
 );
 
 
@@ -80,12 +79,12 @@ $arrayofaifeatures = array(
  * Actions
  */
 
-$modulename = GETPOST('module_name');
+$functioncode = GETPOST('functioncode', 'alpha');
 $pre_prompt = GETPOST('prePrompt', 'alpha');
 $post_prompt = GETPOST('postPrompt', 'alpha');
 // get all configs in const AI
 
-$currentConfigurationsJson = dolibarr_get_const($db, 'AI_CONFIGURATIONS_PROMPT', $conf->entity);
+$currentConfigurationsJson = getDolGlobalString('AI_CONFIGURATIONS_PROMPT');
 $currentConfigurations = json_decode($currentConfigurationsJson, true);
 
 if ($action == 'update' && GETPOST('cancel')) {
@@ -93,7 +92,7 @@ if ($action == 'update' && GETPOST('cancel')) {
 }
 if ($action == 'update' && !GETPOST('cancel')) {
 	$error = 0;
-	if (empty($modulename)) {
+	if (empty($functioncode)) {
 		$error++;
 		setEventMessages($langs->trans('ErrorInputRequired'), null, 'errors');
 	}
@@ -101,12 +100,12 @@ if ($action == 'update' && !GETPOST('cancel')) {
 		$currentConfigurations = [];
 	}
 
-	if (empty($modulename) || (empty($pre_prompt) && empty($post_prompt))) {
-		if (isset($currentConfigurations[$modulename])) {
-			unset($currentConfigurations[$modulename]);
+	if (empty($functioncode) || (empty($pre_prompt) && empty($post_prompt))) {
+		if (isset($currentConfigurations[$functioncode])) {
+			unset($currentConfigurations[$functioncode]);
 		}
 	} else {
-		$currentConfigurations[$modulename] = [
+		$currentConfigurations[$functioncode] = [
 			'prePrompt' => $pre_prompt,
 			'postPrompt' => $post_prompt,
 		];
@@ -172,10 +171,12 @@ if ($action == 'edit') {
 	$out .= '</td>';
 	$out .= '<td>';
 	// Combo list of AI features
-	$out .= '<select name="module_name" id="module_select" class="flat minwidth500">';
+	$out .= '<select name="functioncode" id="functioncode" class="flat minwidth500">';
 	$out .= '<option>&nbsp;</option>';
 	foreach ($arrayofaifeatures as $key => $val) {
-		$out .= '<option value="'.$val.'">'.$langs->trans($arrayofaifeatures[$key]).'</option>';
+		$labelhtml = $langs->trans($arrayofaifeatures[$key]['label']).($arrayofaifeatures[$key]['status'] == 'notused' ? ' <span class="opacitymedium">('.$langs->trans("NotUsed").')</span>' : "");
+		$labeltext = $langs->trans($arrayofaifeatures[$key]['label']);
+		$out .= '<option value="'.$key.'" data-html="'.dol_escape_htmltag($labelhtml).'">'.dol_escape_htmltag($labeltext).'</option>';
 	}
 	/*
 	$sql = "SELECT name FROM llx_const WHERE name LIKE 'MAIN_MODULE_%' AND value = '1'";
@@ -191,7 +192,7 @@ if ($action == 'edit') {
 	}
 	*/
 	$out .= '</select>';
-	$out .= ajax_combobox("module_select");
+	$out .= ajax_combobox("functioncode");
 
 	$out .= '</td>';
 	$out .= '</tr>';
@@ -223,37 +224,42 @@ if ($action == 'edit') {
 
 
 if ($action == 'edit' || $action == 'create') {
-	$out = '<table class="noborder centpercent">';
-	foreach ($currentConfigurations as $key => $config) {
-		if (!preg_match('/^[a-z]+$/i', $key)) {	// Ignore empty saved setup
-			continue;
+	$out = '';
+
+	if (!empty($currentConfigurations)) {
+		$out = '<table class="noborder centpercent">';
+		foreach ($currentConfigurations as $key => $config) {
+			if (!empty($key) && !preg_match('/^[a-z]+$/i', $key)) {	// Ignore empty saved setup
+				continue;
+			}
+
+			$out .= '<thead>';
+			$out .= '<tr class="liste_titre">';
+			$out .= '<td>'.$arrayofaifeatures[$key]['picto'].' '.$langs->trans($arrayofaifeatures[$key]['label']).'</td>';
+			$out .= '<td></td>';
+			$out .= '</tr>';
+			$out .= '</thead>';
+			$out .= '<tbody>';
+			$out .= '<tr class="oddeven">';
+			$out .= '<td class="col-setup-title">';
+			$out .= '<span id="prePrompt" class="spanforparamtooltip">pre-Prompt</span>';
+			$out .= '</td>';
+			$out .= '<td>';
+			$out .= '<input name="prePrompt" id="prePromptInput" class="flat minwidth500" value="'.$config['prePrompt'].'">';
+			$out .= '</td>';
+			$out .= '</tr>';
+			$out .= '<tr class="oddeven">';
+			$out .= '<td class="col-setup-title">';
+			$out .= '<span id="postPrompt" class="spanforparamtooltip">Post-prompt</span>';
+			$out .= '</td>';
+			$out .= '<td>';
+			$out .= '<input name="postPrompt" id="postPromptInput" class="flat minwidth500" value="'.$config['postPrompt'].'">';
+			$out .= '</td>';
+			$out .= '</tr>';
 		}
-		$out .= '<thead>';
-		$out .= '<tr class="liste_titre">';
-		$out .= '<td>'.$langs->trans($arrayofaifeatures[$key]).'</td>';
-		$out .= '<td></td>';
-		$out .= '</tr>';
-		$out .= '</thead>';
-		$out .= '<tbody>';
-		$out .= '<tr class="oddeven">';
-		$out .= '<td class="col-setup-title">';
-		$out .= '<span id="prePrompt" class="spanforparamtooltip">pre-Prompt</span>';
-		$out .= '</td>';
-		$out .= '<td>';
-		$out .= '<input name="prePrompt" id="prePromptInput" class="flat minwidth500" value="'.$config['prePrompt'].'">';
-		$out .= '</td>';
-		$out .= '</tr>';
-		$out .= '<tr class="oddeven">';
-		$out .= '<td class="col-setup-title">';
-		$out .= '<span id="postPrompt" class="spanforparamtooltip">Post-prompt</span>';
-		$out .= '</td>';
-		$out .= '<td>';
-		$out .= '<input name="postPrompt" id="postPromptInput" class="flat minwidth500" value="'.$config['postPrompt'].'">';
-		$out .= '</td>';
-		$out .= '</tr>';
+		$out .= '</tbody>';
+		$out .= '</table>';
 	}
-	$out .= '</tbody>';
-	$out .= '</table>';
 
 	$out .= '</form>';
 
diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index 4fdb1f02435..73e4765d7a4 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -61,14 +61,19 @@ if (!class_exists('FormSetup')) {
 
 $formSetup = new FormSetup($db);
 
+// List all available IA
 $arrayofia = array('chatgpt');
 
 foreach ($arrayofia as $ia) {
 	// Setup conf AI_PUBLIC_INTERFACE_TOPIC
-	$item = $formSetup->newItem('AI_KEY_API_'.strtoupper($ia));
+	/*$item = $formSetup->newItem('AI_API_'.strtoupper($ia).'_ENDPOINT');	// Name of constant must end with _KEY so it is encrypted when saved into database.
 	$item->defaultFieldValue = '';
-}
+	$item->cssClass = 'minwidth500';*/
 
+	$item = $formSetup->newItem('AI_API_'.strtoupper($ia).'_KEY');	// Name of constant must end with _KEY so it is encrypted when saved into database.
+	$item->defaultFieldValue = '';
+	$item->cssClass = 'minwidth500';
+}
 
 $setupnotempty =+ count($formSetup->items);
 
diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index 34d7f196753..9b1adf13b84 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -45,6 +45,11 @@ require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/ai/class/ai.class.php';
 
+
+/*
+ * View
+ */
+
 top_httphead();
 
 //get data from AJAX
@@ -54,11 +59,12 @@ $jsonData = json_decode($rawData, true);
 if (is_null($jsonData)) {
 	dol_print_error('data with format JSON valide.');
 }
-$chatGPT = new Ai($db);
+$ai = new Ai($db);
 
 $instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
+$function = 'textgeneration';
 
-$generatedContent = $chatGPT->generateContent($instructions, 'gpt-3.5-turbo', 'MAILING');
+$generatedContent = $ai->generateContent($instructions, 'auto', $function);
 
 if (is_array($generatedContent) && $generatedContent['error']) {
 	print "Error : " . $generatedContent['message'];
diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 2771c1b0e06..399b3adb1ee 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -50,38 +50,72 @@ class Ai
 	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->apiEndpoint = dolibarr_get_const($this->db, 'AI_API_ENDPOINT');
-		$this->apiKey = dolibarr_get_const($this->db, 'AI_KEY_API_CHATGPT');
+
+		$this->apiKey = getDolGlobalString('AI_API_CHATGPT_KEY');
 	}
 
 	/**
 	 * Generate response of instructions
-	 * @param   string  $instructions   instruction for generate content
-	 * @param   string  $model          model name (chat,text,image...)
-	 * @param   string  $moduleName     Name of module
-	 * @return   mixed   $response
+	 *
+	 * @param   string  	$instructions   instruction for generate content
+	 * @param   string  	$model          model name ('gpt-3.5-turbo')
+	 * @param   string  	$function     	code of the feature we want to use ('emailing', 'transcription', 'audiotext', 'imagegeneration', 'translation')
+	 * @return  mixed   	$response
 	 */
-	public function generateContent($instructions, $model = 'gpt-3.5-turbo', $moduleName = 'MAILING')
+	public function generateContent($instructions, $model = 'auto', $function = 'textgeneration')
 	{
-		global $conf;
+		if (empty($this->apiEndpoint)) {
+			if ($function == 'textgeneration') {
+				$this->apiEndpoint = 'https://api.openai.com/v1/chat/completions';
+				if ($model == 'auto') {
+					$model = getDolGlobalString('AI_API_CHATGPT_MODEL_TEXT', 'gpt-3.5-turbo');
+				}
+			}
+			if ($function == 'imagegeneration') {
+				$this->apiEndpoint = 'https://api.openai.com/v1/images/generations';
+				if ($model == 'auto') {
+					$model = getDolGlobalString('AI_API_CHATGPT_MODEL_IMAGE', 'dall-e-3');
+				}
+			}
+			if ($function == 'audiotext') {
+				$this->apiEndpoint = 'https://api.openai.com/v1/audio/speech';
+				if ($model == 'auto') {
+					$model = getDolGlobalString('AI_API_CHATGPT_MODEL_AUDIO', 'tts-1');
+				}
+			}
+			if ($function == 'transcription') {
+				$this->apiEndpoint = 'https://api.openai.com/v1/audio/transcriptions';
+				if ($model == 'auto') {
+					$model = getDolGlobalString('AI_API_CHATGPT_MODEL_TRANSCRIPT', 'whisper-1');
+				}
+			}
+			if ($function == 'translation') {
+				$this->apiEndpoint = 'https://api.openai.com/v1/audio/translations';
+				if ($model == 'auto') {
+					$model = getDolGlobalString('AI_API_CHATGPT_MODEL_TRANSLATE', 'whisper-1');
+				}
+			}
+		}
+
 		try {
-			$configurationsJson = dolibarr_get_const($this->db, 'AI_CONFIGURATIONS_PROMPT', $conf->entity);
+			$configurationsJson = getDolGlobalString('AI_CONFIGURATIONS_PROMPT');
 			$configurations = json_decode($configurationsJson, true);
 
 			$prePrompt = '';
 			$postPrompt = '';
 
-			if (isset($configurations[$moduleName])) {
-				if (isset($configurations[$moduleName]['prePrompt'])) {
-					$prePrompt = $configurations[$moduleName]['prePrompt'];
+			if (isset($configurations[$function])) {
+				if (isset($configurations[$function]['prePrompt'])) {
+					$prePrompt = $configurations[$function]['prePrompt'];
 				}
 
-				if (isset($configurations[$moduleName]['postPrompt'])) {
-					$postPrompt = $configurations[$moduleName]['postPrompt'];
+				if (isset($configurations[$function]['postPrompt'])) {
+					$postPrompt = $configurations[$function]['postPrompt'];
 				}
 			}
 			$fullInstructions = $prePrompt.' '.$instructions.' .'.$postPrompt;
 
+			// TODO Replace this with a simple call of getDolURLContent();
 			$ch = curl_init($this->apiEndpoint);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode([
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 32215871529..e5199267d31 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -573,6 +573,7 @@ class FormSetup
 	}
 }
 
+
 /**
  * This class help to create item for class formSetup
  */
@@ -646,6 +647,9 @@ class FormSetupItem
 
 	public $enabled = 1;
 
+	/**
+	 * @var string	The css to use on the input field of item
+	 */
 	public $cssClass = '';
 
 	/**
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6182aa8f97b..b7dd42c84e2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2437,11 +2437,15 @@ ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
 CustomPrompt=Custom prompts
 AiDescription=AI (Artificial Intelligence) features
-AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API. 
-AI_KEY_API_CHATGPT= Key for ChatGPT AI api
+AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
+AI_API_CHATGPT_ENDPOINT=Endpoint for ChatGPT AI api
+AI_API_CHATGPT_KEY=Key for ChatGPT AI api
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
+TextGeneration=Text generation
 ImageGeneration=Image generation
+VideoGeneration=Video generation
+AudioText=Audio - Text
 AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address

From 43b1adb4c6551cf26d5cd516f609af80b21301a9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 01:40:06 +0100
Subject: [PATCH 0496/1862] Fix bad var name in security setup page

---
 htdocs/admin/system/security.php | 4 ++--
 htdocs/langs/en_US/errors.lang   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 6ad04701a52..199b715d2ef 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -272,7 +272,7 @@ print '<br>';
 if (file_exists($installlock)) {	// If install not locked, no need to show this.
 	if (file_exists($upgradeunlock)) {
 		print '<strong>'.$langs->trans("DolibarrUpgrade").'</strong>: ';
-		print img_warning().' '.$langs->trans("UpgradeHasBeenUnlocked", $upgradeunlock);
+		print img_warning().' '.$langs->trans("WarningUpgradeHasBeenUnlocked", $upgradeunlock);
 		print '<br>';
 	}
 }
@@ -756,7 +756,7 @@ print '<br>';
 print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
 print '<br>';
 
-print '<strong>WEBSITE_MAIN_SECURITY_FORCESTS</strong> = '.getDolGlobalString('>WEBSITE_MAIN_SECURITY_FORCESTS', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\")</span><br>";
+print '<strong>WEBSITE_MAIN_SECURITY_FORCESTS</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCESTS', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\")</span><br>";
 print '<br>';
 
 print '<strong>WEBSITE_MAIN_SECURITY_FORCEPP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCEPP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"camera: (); microphone: ();\")</span><br>";
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b4883e7f6f4..625cb2bfc51 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -343,6 +343,7 @@ WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php
 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.
+WarningUpgradeHasBeenUnlocked=Warning, upgrade process has been unlocked for everybody
 WarningUntilDirRemoved=This security warning will remain active as long as the vulnerability is present.
 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.

From 1552fac711177f376dee15e39812107619d681db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 01:54:41 +0100
Subject: [PATCH 0497/1862] Fix strict-origin

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 199b715d2ef..fce38310605 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -753,7 +753,7 @@ print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.getDolGlobalString('W
 print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com *.googleapis.com; script-src *.transifex.com *.google-analytics.com *.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src * data:;\")</span><br>";
 print '<br>';
 
-print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
+print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").'=\"strict-origin\" '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
 print '<br>';
 
 print '<strong>WEBSITE_MAIN_SECURITY_FORCESTS</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCESTS', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\")</span><br>";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 548d2fb2099..44b62e8bb8f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1669,9 +1669,9 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 
 	// Referrer-Policy
 	// Say if we must provide the referrer when we jump onto another web page.
-	// Default browser are 'strict-origin-when-cross-origin' (only domain is sent on other domain switching), we want more so we use 'same-origin' so browser doesn't send any referrer when going into another web site domain.
+	// Default browser are 'strict-origin-when-cross-origin' (only domain is sent on other domain switching), we want more so we use 'strict-origin' so browser doesn't send any referrer when going into another web site domain.
 	if (!defined('MAIN_SECURITY_FORCERP')) {
-		$referrerpolicy = getDolGlobalString('MAIN_SECURITY_FORCERP', "same-origin");
+		$referrerpolicy = getDolGlobalString('MAIN_SECURITY_FORCERP', "strict-origin");
 
 		header("Referrer-Policy: ".$referrerpolicy);
 	}

From 1a9fa740a5fbe8301a83851c76cdc7bd166be540 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 13:32:15 +0100
Subject: [PATCH 0498/1862] Fix quote

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index fce38310605..8aee55d46ba 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -753,7 +753,7 @@ print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.getDolGlobalString('W
 print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com *.googleapis.com; script-src *.transifex.com *.google-analytics.com *.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src * data:;\")</span><br>";
 print '<br>';
 
-print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").'=\"strict-origin\" '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
+print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined")."=\"strict-origin\" ".$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
 print '<br>';
 
 print '<strong>WEBSITE_MAIN_SECURITY_FORCESTS</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCESTS', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\")</span><br>";

From f1aa29507a62786c8de29fb0afc5c38e477f04bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 15:01:25 +0100
Subject: [PATCH 0499/1862] Fix sec more complete list of forbidden function

---
 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 6fe032f5456..0298ce0d439 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9738,6 +9738,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
+		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 
 		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function

From a644adbfe5334b156e8b4321c4769c025128684e Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Mar 2024 15:57:34 +0100
Subject: [PATCH 0500/1862] New hook for getElementProperties

---
 htdocs/core/lib/functions.lib.php | 131 ++++++++++++++++++------------
 1 file changed, 79 insertions(+), 52 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 162d25420c1..d69dd57271f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12058,16 +12058,16 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 /**
  * Get an array with properties of an element.
  *
- * @param   string 	$element_type 	Element type (Value of $object->element). Example:
- * 									'action', 'facture', 'project', 'project_task' or
- * 									'myobject@mymodule' or
- * 									'myobject_mysubobject' (where mymodule = myobject, like 'project_task')
+ * @param   string $elementType       Element type (Value of $object->element). Example:
+ *                                    'action', 'facture', 'project', 'project_task' or
+ *                                    'myobject@mymodule' or
+ *                                    'myobject_mysubobject' (where mymodule = myobject, like 'project_task')
  * @return  array					array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>)
  * @see fetchObjectByElement(), getMultiDirOutput()
  */
-function getElementProperties($element_type)
+function getElementProperties($elementType)
 {
-	global $conf;
+	global $conf, $db, $hookmanager;
 
 	$regs = array();
 
@@ -12076,13 +12076,13 @@ function getElementProperties($element_type)
 	$classfile = $classname = $classpath = $subdir = $dir_output = '';
 
 	// Parse element/subelement
-	$module = $element_type;
-	$element = $element_type;
-	$subelement = $element_type;
-	$table_element = $element_type;
+	$module = $elementType;
+	$element = $elementType;
+	$subelement = $elementType;
+	$table_element = $elementType;
 
 	// If we ask a resource form external module (instead of default path)
-	if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs)) {	// 'myobject@mymodule'
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $elementType, $regs)) {	// 'myobject@mymodule'
 		$element = $subelement = $regs[1];
 		$module = $regs[2];
 	}
@@ -12095,138 +12095,138 @@ function getElementProperties($element_type)
 	}
 
 	// For compatibility and to work with non standard path
-	if ($element_type == "action") {
+	if ($elementType == "action") {
 		$classpath = 'comm/action/class';
 		$subelement = 'Actioncomm';
 		$module = 'agenda';
 		$table_element = 'actioncomm';
-	} elseif ($element_type == 'cronjob') {
+	} elseif ($elementType == 'cronjob') {
 		$classpath = 'cron/class';
 		$module = 'cron';
 		$table_element = 'cron';
-	} elseif ($element_type == 'adherent_type') {
+	} elseif ($elementType == 'adherent_type') {
 		$classpath = 'adherents/class';
 		$classfile = 'adherent_type';
 		$module = 'adherent';
 		$subelement = 'adherent_type';
 		$classname = 'AdherentType';
 		$table_element = 'adherent_type';
-	} elseif ($element_type == 'bank_account') {
+	} elseif ($elementType == 'bank_account') {
 		$classpath = 'compta/bank/class';
 		$module = 'bank';	// We need $conf->bank->dir_output and not $conf->banque->dir_output
 		$classfile = 'account';
 		$classname = 'Account';
-	} elseif ($element_type == 'category') {
+	} elseif ($elementType == 'category') {
 		$classpath = 'categories/class';
 		$module = 'categorie';
 		$subelement = 'categorie';
 		$table_element = 'categorie';
-	} elseif ($element_type == 'contact') {
+	} elseif ($elementType == 'contact') {
 		$classpath = 'contact/class';
 		$classfile = 'contact';
 		$module = 'societe';
 		$subelement = 'contact';
 		$table_element = 'socpeople';
-	} elseif ($element_type == 'inventory') {
+	} elseif ($elementType == 'inventory') {
 		$module = 'product';
 		$classpath = 'product/inventory/class';
-	} elseif ($element_type == 'stock') {
+	} elseif ($elementType == 'stock') {
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
 		$table_element = 'entrepot';
-	} elseif ($element_type == 'project') {
+	} elseif ($elementType == 'project') {
 		$classpath = 'projet/class';
 		$module = 'projet';
 		$table_element = 'projet';
-	} elseif ($element_type == 'project_task') {
+	} elseif ($elementType == 'project_task') {
 		$classpath = 'projet/class';
 		$module = 'projet';
 		$subelement = 'task';
 		$table_element = 'projet_task';
-	} elseif ($element_type == 'facture' || $element_type == 'invoice') {
+	} elseif ($elementType == 'facture' || $elementType == 'invoice') {
 		$classpath = 'compta/facture/class';
 		$module = 'facture';
 		$subelement = 'facture';
 		$table_element = 'facture';
-	} elseif ($element_type == 'commande' || $element_type == 'order') {
+	} elseif ($elementType == 'commande' || $elementType == 'order') {
 		$classpath = 'commande/class';
 		$module = 'commande';
 		$subelement = 'commande';
 		$table_element = 'commande';
-	} elseif ($element_type == 'propal') {
+	} elseif ($elementType == 'propal') {
 		$classpath = 'comm/propal/class';
 		$table_element = 'propal';
-	} elseif ($element_type == 'shipping') {
+	} elseif ($elementType == 'shipping') {
 		$classpath = 'expedition/class';
 		$classfile = 'expedition';
 		$classname = 'Expedition';
 		$module = 'expedition';
 		$table_element = 'expedition';
-	} elseif ($element_type == 'supplier_proposal') {
+	} elseif ($elementType == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
 		$module = 'supplier_proposal';
 		$element = 'supplierproposal';
 		$classfile = 'supplier_proposal';
 		$subelement = 'supplierproposal';
-	} elseif ($element_type == 'shipping') {
+	} elseif ($elementType == 'shipping') {
 		$classpath = 'expedition/class';
 		$subelement = 'expedition';
 		$module = 'expedition_bon';
-	} elseif ($element_type == 'delivery') {
+	} elseif ($elementType == 'delivery') {
 		$classpath = 'delivery/class';
 		$subelement = 'delivery';
 		$module = 'expedition';
-	} elseif ($element_type == 'contract') {
+	} elseif ($elementType == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';
 		$subelement = 'contrat';
 		$table_element = 'contract';
-	} elseif ($element_type == 'mailing') {
+	} elseif ($elementType == 'mailing') {
 		$classpath = 'comm/mailing/class';
 		$module = 'mailing';
 		$classfile = 'mailing';
 		$classname = 'Mailing';
 		$subelement = '';
-	} elseif ($element_type == 'member') {
+	} elseif ($elementType == 'member') {
 		$classpath = 'adherents/class';
 		$module = 'adherent';
 		$subelement = 'adherent';
 		$table_element = 'adherent';
-	} elseif ($element_type == 'usergroup') {
+	} elseif ($elementType == 'usergroup') {
 		$classpath = 'user/class';
 		$module = 'user';
-	} elseif ($element_type == 'mo') {
+	} elseif ($elementType == 'mo') {
 		$classpath = 'mrp/class';
 		$classfile = 'mo';
 		$classname = 'Mo';
 		$module = 'mrp';
 		$subelement = '';
 		$table_element = 'mrp_mo';
-	} elseif ($element_type == 'cabinetmed_cons') {
+	} elseif ($elementType == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
 		$module = 'cabinetmed';
 		$subelement = 'cabinetmedcons';
 		$table_element = 'cabinetmedcons';
-	} elseif ($element_type == 'fichinter') {
+	} elseif ($elementType == 'fichinter') {
 		$classpath = 'fichinter/class';
 		$module = 'ficheinter';
 		$subelement = 'fichinter';
 		$table_element = 'fichinter';
-	} elseif ($element_type == 'dolresource' || $element_type == 'resource') {
+	} elseif ($elementType == 'dolresource' || $elementType == 'resource') {
 		$classpath = 'resource/class';
 		$module = 'resource';
 		$subelement = 'dolresource';
 		$table_element = 'resource';
-	} elseif ($element_type == 'propaldet') {
+	} elseif ($elementType == 'propaldet') {
 		$classpath = 'comm/propal/class';
 		$module = 'propal';
 		$subelement = 'propaleligne';
-	} elseif ($element_type == 'opensurvey_sondage') {
+	} elseif ($elementType == 'opensurvey_sondage') {
 		$classpath = 'opensurvey/class';
 		$module = 'opensurvey';
 		$subelement = 'opensurveysondage';
-	} elseif ($element_type == 'order_supplier') {
+	} elseif ($elementType == 'order_supplier') {
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
 		$classfile = 'fournisseur.commande';
@@ -12234,7 +12234,7 @@ function getElementProperties($element_type)
 		$subelement = '';
 		$classname = 'CommandeFournisseur';
 		$table_element = 'commande_fournisseur';
-	} elseif ($element_type == 'invoice_supplier') {
+	} elseif ($elementType == 'invoice_supplier') {
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
 		$classfile = 'fournisseur.facture';
@@ -12242,19 +12242,19 @@ function getElementProperties($element_type)
 		$subelement = '';
 		$classname = 'FactureFournisseur';
 		$table_element = 'facture_fourn';
-	} elseif ($element_type == "service") {
+	} elseif ($elementType == "service") {
 		$classpath = 'product/class';
 		$subelement = 'product';
 		$table_element = 'product';
-	} elseif ($element_type == 'salary') {
+	} elseif ($elementType == 'salary') {
 		$classpath = 'salaries/class';
 		$module = 'salaries';
-	} elseif ($element_type == 'payment_salary') {
+	} elseif ($elementType == 'payment_salary') {
 		$classpath = 'salaries/class';
 		$classfile = 'paymentsalary';
 		$classname = 'PaymentSalary';
 		$module = 'salaries';
-	} elseif ($element_type == 'productlot') {
+	} elseif ($elementType == 'productlot') {
 		$module = 'productbatch';
 		$classpath = 'product/stock/class';
 		$classfile = 'productlot';
@@ -12262,27 +12262,27 @@ function getElementProperties($element_type)
 		$element = 'productlot';
 		$subelement = '';
 		$table_element = 'product_lot';
-	} elseif ($element_type == 'websitepage') {
+	} elseif ($elementType == 'websitepage') {
 		$classpath = 'website/class';
 		$classfile = 'websitepage';
 		$classname = 'Websitepage';
 		$module = 'website';
 		$subelement = 'websitepage';
 		$table_element = 'website_page';
-	} elseif ($element_type == 'fiscalyear') {
+	} elseif ($elementType == 'fiscalyear') {
 		$classpath = 'core/class';
 		$module = 'accounting';
 		$subelement = 'fiscalyear';
-	} elseif ($element_type == 'chargesociales') {
+	} elseif ($elementType == 'chargesociales') {
 		$classpath = 'compta/sociales/class';
 		$module = 'tax';
 		$table_element = 'chargesociales';
-	} elseif ($element_type == 'tva') {
+	} elseif ($elementType == 'tva') {
 		$classpath = 'compta/tva/class';
 		$module = 'tax';
 		$subdir = '/vat';
 		$table_element = 'tva';
-	} elseif ($element_type == 'emailsenderprofile') {
+	} elseif ($elementType == 'emailsenderprofile') {
 		$module = '';
 		$classpath = 'core/class';
 		$classfile = 'emailsenderprofile';
@@ -12322,7 +12322,7 @@ function getElementProperties($element_type)
 	}
 	$dir_output .= $subdir;
 
-	$element_properties = array(
+	$elementProperties = array(
 		'module' => $module,
 		'element' => $element,
 		'table_element' => $table_element,
@@ -12333,8 +12333,35 @@ function getElementProperties($element_type)
 		'dir_output' => $dir_output
 	);
 
-	//var_dump($element_properties);
-	return $element_properties;
+
+	// Add  hook
+	if (!is_object($hookmanager)) {
+		include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+		$hookmanager = new HookManager($db);
+	}
+	$hookmanager->initHooks(array('elementproperties'));
+
+
+	// Hook params
+	$parameters = array(
+		'elementType' => $elementType,
+		'elementProperties' => $elementProperties
+	);
+
+	$reshook = $hookmanager->executeHooks('getElementProperties', $parameters);
+
+	if ($reshook) {
+		$elementProperties = $hookmanager->resArray;
+	} elseif (!empty($hookmanager->resArray) && is_array($hookmanager->resArray)) { // resArray is always an array but for sécurity against misconfigured external modules
+		$elementProperties = array_replace($elementProperties, $hookmanager->resArray);
+	}
+
+	// context of elementproperties doesn't need to exist out of this function so delete it to avoid elementproperties context is equal to all
+	if (($key = array_search('elementproperties', $hookmanager->contextarray)) !== false) {
+		unset($hookmanager->contextarray[$key]);
+	}
+
+	return $elementProperties;
 }
 
 /**

From 7866ee472bb7e825a949ab537a65b4efbe763ecf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 17:07:24 +0100
Subject: [PATCH 0501/1862] QUAL Clean code around dol_eval use

---
 ChangeLog                                     |  1 +
 htdocs/adherents/list.php                     | 10 +--
 htdocs/admin/emailcollector_list.php          |  2 +-
 htdocs/admin/mails_senderprofile_list.php     |  2 +-
 htdocs/admin/mails_templates.php              |  2 +-
 htdocs/admin/menus/edit.php                   |  4 +-
 htdocs/admin/perms.php                        |  2 +-
 .../class/assetdepreciationoptions.class.php  |  2 +-
 htdocs/asset/list.php                         |  2 +-
 htdocs/asset/model/list.php                   |  2 +-
 .../tpl/depreciation_options_edit.tpl.php     |  2 +-
 htdocs/bom/bom_list.php                       |  2 +-
 htdocs/bookcal/availabilities_list.php        |  2 +-
 htdocs/bookcal/calendar_list.php              |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/comm/propal/list.php                   |  2 +-
 .../compta/cashcontrol/cashcontrol_list.php   |  2 +-
 htdocs/compta/facture/list.php                |  2 +-
 htdocs/compta/resultat/result.php             | 20 +----
 htdocs/contact/list.php                       |  2 +-
 htdocs/core/boxes/box_scheduled_jobs.php      |  2 +-
 htdocs/core/class/commonobject.class.php      | 16 ++--
 htdocs/core/class/extrafields.class.php       | 14 +--
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/class/menu.class.php              |  1 -
 htdocs/core/class/menubase.class.php          |  6 +-
 htdocs/core/class/translate.class.php         |  4 -
 htdocs/core/lib/company.lib.php               |  4 +-
 htdocs/core/lib/customreports.lib.php         | 12 +--
 htdocs/core/lib/functions.lib.php             | 88 ++++++++-----------
 .../core/tpl/admin_extrafields_view.tpl.php   |  2 +-
 .../tpl/extrafields_list_array_fields.tpl.php |  4 +-
 .../tpl/extrafields_list_print_fields.tpl.php |  2 +-
 htdocs/core/tpl/extrafields_view.tpl.php      |  6 +-
 ...terface_50_modTicket_TicketEmail.class.php |  4 +-
 .../conferenceorbooth_list.php                |  2 +-
 .../conferenceorboothattendee_list.php        |  2 +-
 htdocs/exports/class/export.class.php         |  2 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/hrm/evaluation_list.php                |  2 +-
 htdocs/hrm/job_list.php                       |  2 +-
 htdocs/hrm/position.php                       |  2 +-
 htdocs/hrm/position_list.php                  |  2 +-
 htdocs/hrm/skill_card.php                     |  2 +-
 htdocs/hrm/skill_list.php                     |  2 +-
 .../knowledgerecord_list.php                  |  2 +-
 htdocs/loan/list.php                          |  2 +-
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/mrp/mo_list.php                        |  4 +-
 htdocs/partnership/partnership_list.php       |  2 +-
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/stock/list.php                 |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 .../stocktransfer/stocktransfer_list.php      |  2 +-
 htdocs/projet/list.php                        |  2 +-
 htdocs/public/ticket/list.php                 |  2 +-
 .../recruitmentcandidature_list.php           |  2 +-
 .../recruitmentjobposition_list.php           |  2 +-
 htdocs/salaries/list.php                      |  2 +-
 htdocs/salaries/payments.php                  |  2 +-
 htdocs/societe/price.php                      |  2 +-
 htdocs/ticket/list.php                        |  2 +-
 htdocs/user/group/perms.php                   |  2 +-
 htdocs/user/perms.php                         |  2 +-
 htdocs/variants/list.php                      |  2 +-
 htdocs/webhook/target_list.php                |  2 +-
 .../class/html.formlistwebportal.class.php    |  2 +-
 .../class/html.formwebportal.class.php        |  4 +-
 htdocs/workstation/workstation_list.php       |  6 +-
 70 files changed, 140 insertions(+), 172 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 278fc2984c0..66fc896615a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ The following changes may create regressions for some external modules, but were
 * All CLI tools (into /scripts) return a positive value to the shell if error (0 remains success) for a better
   cross platform compatibility. On linux the exit(-1) was caught as 255, it may be now exit(1) so will be caught as 1.
 * the parameter $filter of method fetchAll does not accept array of SQL but must be a string of an Universal Search Filter syntax.
+* Use of dol_eval with parameter $returnvalue=0 is deprecated.
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 45b3e121d99..9e193f1052c 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -194,11 +194,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields[$tableprefix.'.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>dol_eval($val['enabled'], 1),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' =>(($visible < 0) ? 0 : 1),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 8d0c4ff1f27..84706102216 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -121,7 +121,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index e57e3794d3f..0f314ba993a 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -110,7 +110,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 9bbeade4cdd..6e651307207 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1176,7 +1176,7 @@ if ($num) {
 					continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
 				}
 				// Test on 'enabled'
-				if (!dol_eval($obj->enabled, 1, 1, '1')) {
+				if (! (int) dol_eval($obj->enabled, 1, 1, '1')) {
 					$i++;
 					continue; // Email template not qualified
 				}
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index f2969e5ed69..ac40bfd21d0 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -505,7 +505,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Enabled').'</td>';
 	print '<td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
 	if (!empty($menu->enabled)) {
-		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn(dol_eval($menu->enabled, 1, 1, '1')).')';
+		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn((int) dol_eval($menu->enabled, 1, 1, '1')).')';
 	}
 	print '</td></tr>';
 
@@ -513,7 +513,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Rights').'</td>';
 	print '<td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
 	if (!empty($menu->perms)) {
-		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn(dol_eval($menu->perms, 1, 1, '1')).')';
+		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn((int) dol_eval($menu->perms, 1, 1, '1')).')';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index b74904f0a9f..774cb173364 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -262,7 +262,7 @@ if ($result) {
 		if ($user->admin) {
 			print '<td class="right">';
 			$htmltext = $langs->trans("ID").': '.$obj->id;
-			$htmltext .= '<br>'.$langs->trans("Permission").': user->hasRight(\''.$obj->module.'\', \''.$obj->perms.'\''.($obj->subperms ? ', \''.$obj->subperms.'\'' : '').')';
+			$htmltext .= '<br>'.$langs->trans("Permission").': user->hasRight(\''.dol_escape_htmltag($obj->module).'\', \''.dol_escape_htmltag($obj->perms).'\''.($obj->subperms ? ', \''.dol_escape_htmltag($obj->subperms).'\'' : '').')';
 			print $form->textwithpicto('', $htmltext);
 			//print '<span class="opacitymedium">'.$obj->id.'</span>';
 			print '</td>';
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index 99497d1b23a..e6aa273060c 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -268,7 +268,7 @@ class AssetDepreciationOptions extends CommonObject
 				if ($field_info['notnull'] > 0 && $field_value == '' && !is_null($field_info['default']) && $field_info['default'] == '(PROV)') {
 					$field_value = '(PROV)';
 				} elseif ((!empty($field_info['required']) || $field_info['notnull'] > 0) && $field_value == '' && !empty($field_info['default'])) {
-					$field_value = dol_eval($field_info['default'], 1);
+					$field_value = $field_info['default'];
 				}
 				if ($field_info['notnull'] > 0 && $field_value == '' && is_null($field_info['default'])) {
 					$error++;
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index c8c105ab5c8..c35fe380279 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -109,7 +109,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index f5c987e15f7..cb61803017c 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -109,7 +109,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
index 8031d3576f1..ea55ab5999a 100644
--- a/htdocs/asset/tpl/depreciation_options_edit.tpl.php
+++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
@@ -136,7 +136,7 @@ if (empty($reshook)) {
 				}
 				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, $check) : $assetdepreciationoptions->$field_key;
 			} elseif ($field_info['type'] == 'price') {
-				$value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name)) : ($assetdepreciationoptions->$field_key ? price2num($assetdepreciationoptions->$field_key) : (!empty($field_info['default']) ? dol_eval($field_info['default'], 1) : 0));
+				$value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name)) : ($assetdepreciationoptions->$field_key ? price2num($assetdepreciationoptions->$field_key) : (!empty($field_info['default']) ? $field_info['default'] : 0));
 			} elseif ($field_key == 'lang') {
 				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : $assetdepreciationoptions->lang;
 			} else {
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index cbf1f8cccf5..b7b6be62f2e 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -111,7 +111,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 83df6105c77..d27b46dd02c 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -122,7 +122,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index a513aab7d31..781cad7732e 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -120,7 +120,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d38984a2b79..d1bde067b1e 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -480,7 +480,7 @@ if ($object->fetch($id) >= 0) {
 				$obj = new $classname($db);
 
 				// Check if qualified
-				$qualified = (is_null($obj->enabled) ? 1 : dol_eval($obj->enabled, 1));
+				$qualified = (is_null($obj->enabled) ? 1 : (int) dol_eval($obj->enabled, 1));
 
 				// Check dependencies
 				foreach ($obj->require_module as $key) {
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 8618b1049fd..88cec014878 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -268,7 +268,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index a6c9cf5a361..c3cd5cd37a1 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -110,7 +110,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1a82e95d19d..7c2f594906a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -282,7 +282,7 @@ foreach ($object->fields as $key => $val) {
 			$arrayfields[$newkey] = array(
 				'label'=>$val['label'],
 				'checked'=>(($visible < 0) ? 0 : 1),
-				'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+				'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 				'position'=>$val['position'],
 				'help' => empty($val['help']) ? '' : $val['help'],
 			);
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 0a38507ccb6..72bb5428b75 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -351,10 +351,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				} else {
 					//var_dump($result);
 					//$r = $AccCat->calculate($result);
-					$r = dol_eval($result, 1, 1, '1');
-					if (is_nan($r)) {
-						$r = 0;
-					}
+					$r = (float) dol_eval($result, 1, 1, '1');
 
 					print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 				}
@@ -378,10 +375,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				$result = str_replace('--', '+', $result);
 
 				//$r = $AccCat->calculate($result);
-				$r = dol_eval($result, 1, 1, '1');
-				if (is_nan($r)) {
-					$r = 0;
-				}
+				$r = (float) dol_eval($result, 1, 1, '1');
 
 				print '<td class="liste_total right borderright"><span class="amount">'.price($r).'</span></td>';
 				if (empty($sommes[$code]['N'])) {
@@ -400,10 +394,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						$result = str_replace('--', '+', $result);
 
 						//$r = $AccCat->calculate($result);
-						$r = dol_eval($result, 1, 1, '1');
-						if (is_nan($r)) {
-							$r = 0;
-						}
+						$r = (float) dol_eval($result, 1, 1, '1');
 
 						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 						if (empty($sommes[$code]['M'][$k])) {
@@ -423,10 +414,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						$result = str_replace('--', '+', $result);
 
 						//$r = $AccCat->calculate($result);
-						$r = dol_eval($result, 1, 1, '1');
-						if (is_nan($r)) {
-							$r = 0;
-						}
+						$r = (float) dol_eval($result, 1, 1, '1');
 
 						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 						if (empty($sommes[$code]['M'][$k])) {
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 6ae0192bfe1..96e58140742 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -227,7 +227,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['p.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 6bcb71d5311..539781c0da9 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -89,7 +89,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
 
-					if (dol_eval($objp->test, 1, 1, '2')) {
+					if ((int) dol_eval($objp->test, 1, 1, '2')) {
 						$nextrun = $this->db->jdate($objp->datenextrun);
 						if (empty($nextrun)) {
 							$nextrun = $this->db->jdate($objp->datestart);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 564f7d84493..c947e4e7c53 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -921,14 +921,14 @@ abstract class CommonObject
 				}
 				$enabled = 1;
 				if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {
-					$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');
+					$enabled = (int) dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');
 				}
 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
-					$enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
+					$enabled = (int) dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
 				}
 				$perms = 1;
 				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {
-					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
+					$perms = (int) dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
 				}
 				if (empty($enabled)) {
 					continue; // 0 = Never visible field
@@ -6180,12 +6180,12 @@ abstract class CommonObject
 
 			$enabled = 1;
 			if (isset($this->fields[$key]['enabled'])) {
-				$enabled = dol_eval($this->fields[$key]['enabled'], 1, 1, '1');
+				$enabled = (int) dol_eval($this->fields[$key]['enabled'], 1, 1, '1');
 			}
 			/*$perms = 1;
 			if (isset($this->fields[$key]['perms']))
 			{
-				$perms = dol_eval($this->fields[$key]['perms'], 1, 1, '1');
+				$perms = (int) dol_eval($this->fields[$key]['perms'], 1, 1, '1');
 			}*/
 			if (empty($enabled)) {
 				continue;
@@ -8596,7 +8596,7 @@ abstract class CommonObject
 					// Test on 'enabled' ('enabled' is different than 'list' = 'visibility')
 					$enabled = 1;
 					if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {
-						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');
+						$enabled = (int) dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');
 					}
 					if (empty($enabled)) {
 						continue;
@@ -8604,12 +8604,12 @@ abstract class CommonObject
 
 					$visibility = 1;
 					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
-						$visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
+						$visibility = (int) dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
 					}
 
 					$perms = 1;
 					if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {
-						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
+						$perms = (int) dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
 					}
 
 					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 7bcdab198e0..a7b6cc9ac22 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -966,9 +966,9 @@ class ExtraFields
 		$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
 		$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
 		$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-		$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '2');
+		$perms = (int) dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '2');
 		$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-		$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '2');
+		$list = (string) dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '2');
 		$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 		$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 		$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
@@ -1649,9 +1649,9 @@ class ExtraFields
 		$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
 		$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
 		$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-		$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '2');
+		$perms = (int) dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '2');
 		$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-		$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '2');
+		$list = (string) dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '2');
 		$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 		$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
@@ -2154,17 +2154,17 @@ class ExtraFields
 
 				$enabled = 1;
 				if (isset($this->attributes[$object->table_element]['enabled'][$key])) {	// 'enabled' is often a condition on module enabled or not
-					$enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1, 1, '2');
+					$enabled = (int) dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1, 1, '2');
 				}
 
 				$visibility = 1;
 				if (isset($this->attributes[$object->table_element]['list'][$key])) {		// 'list' is option for visibility
-					$visibility = intval(dol_eval($this->attributes[$object->table_element]['list'][$key], 1, 1, '2'));
+					$visibility = (int) dol_eval($this->attributes[$object->table_element]['list'][$key], 1, 1, '2');
 				}
 
 				$perms = 1;
 				if (isset($this->attributes[$object->table_element]['perms'][$key])) {
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1, 1, '2');
+					$perms = (int) dol_eval($this->attributes[$object->table_element]['perms'][$key], 1, 1, '2');
 				}
 				if (empty($enabled)
 					|| (
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cc55f91e448..21e33db578e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8235,7 +8235,7 @@ class Form
 		if (!empty($objecttmp->fields)) {    // For object that declare it, it is better to use declared fields (like societe, contact, ...)
 			$tmpfieldstoshow = '';
 			foreach ($objecttmp->fields as $key => $val) {
-				if (!dol_eval($val['enabled'], 1, 1, '1')) {
+				if (! (int) dol_eval($val['enabled'], 1, 1, '1')) {
 					continue;
 				}
 				if (!empty($val['showoncombobox'])) {
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 0b908997d15..6b93331127e 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -119,7 +119,6 @@ class Menu
 	{
 		$nb = 0;
 		foreach ($this->liste as $val) {
-			//if (dol_eval($val['enabled'], 1, 1, '1')) $nb++;
 			if (!empty($val['enabled'])) {
 				$nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
 			}
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index ebda232e331..25dc836be3c 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -434,7 +434,7 @@ class Menubase
 				$this->title = $obj->title;
 				$this->prefix = $obj->prefix;
 				$this->langs = $obj->langs;
-				$this->perms = $obj->perms;
+				$this->perms = str_replace("\"", "'", $obj->perms);
 				$this->enabled = str_replace("\"", "'", $obj->enabled);
 				$this->user = $obj->user;
 				$this->tms = $this->db->jdate($obj->tms);
@@ -665,7 +665,7 @@ class Menubase
 				if (isset($menu['perms'])) {
 					$tmpcond = $menu['perms'];
 					if ($leftmenu == 'all') {
-						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force the part of condition on leftmenu to true
 					}
 					$perms = verifCond($tmpcond);
 					//print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
@@ -676,7 +676,7 @@ class Menubase
 				if (isset($menu['enabled'])) {
 					$tmpcond = $menu['enabled'];
 					if ($leftmenu == 'all') {
-						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force the part of condition on leftmenu to true
 					}
 					$enabled = verifCond($tmpcond);
 					//var_dump($menu['type'].' - '.$menu['titre'].' - '.$menu['enabled'].' => '.$enabled);
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 5cd303acaa0..96daa0479f8 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -727,7 +727,6 @@ class Translate
 
 			return $str;
 		} else { // Translation is not available
-			//if ($key[0] == '$') { return dol_eval($key, 1, 1, '1'); }
 			return $this->getTradFromKey($key);
 		}
 	}
@@ -796,9 +795,6 @@ class Translate
 
 			return $str;
 		} else {
-			/*if ($key[0] == '$') {
-				return dol_eval($key, 1, 1, '1');
-			}*/
 			return $this->getTradFromKey($key);
 		}
 	}
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c5209a3790d..d18aa3c8fd2 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1089,9 +1089,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
 					'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
-					'checked'=>((dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1),
+					'checked'=>(((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1),
 					'position'=>1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key],
-					'enabled' => (abs((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1)) != 3 && dol_eval($extrafields->attributes[$contactstatic->table_element]['perms'][$key], 1, 1, '1'))
+					'enabled' => (abs((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1)) != 3 && (int) dol_eval($extrafields->attributes[$contactstatic->table_element]['perms'][$key], 1, 1, '1'))
 				);
 			}
 		}
diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
index 496b5a605ac..1359fae99a1 100644
--- a/htdocs/core/lib/customreports.lib.php
+++ b/htdocs/core/lib/customreports.lib.php
@@ -65,7 +65,7 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 
 	// Add main fields of object
 	foreach ($object->fields as $key => $val) {
-		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
+		if (!empty($val['isameasure']) && (!isset($val['enabled']) || (int) dol_eval($val['enabled'], 1, 1, '1'))) {
 			$position = (empty($val['position']) ? 0 : intval($val['position']));
 			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
 				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
@@ -100,7 +100,7 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	// Add extrafields to Measures
 	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || (int) dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
 				$position = (!empty($val['position']) ? $val['position'] : 0);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
@@ -206,10 +206,10 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
 				continue;
 			}
-			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
+			if (isset($val['enabled']) && ! (int) dol_eval($val['enabled'], 1, 1, '1')) {
 				continue;
 			}
-			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
+			if (isset($val['visible']) && ! (int) dol_eval($val['visible'], 1, 1, '1')) {
 				continue;
 			}
 			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
@@ -371,10 +371,10 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
 				continue;
 			}
-			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
+			if (isset($val['enabled']) && ! (int) dol_eval($val['enabled'], 1, 1, '1')) {
 				continue;
 			}
-			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
+			if (isset($val['visible']) && ! (int) dol_eval($val['visible'], 1, 1, '1')) {
 				continue;
 			}
 			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c6795f8c777..25cc81e664c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9786,9 +9786,9 @@ function isStringVarMatching($var, $regextext, $matchrule = 1)
  * Verify if condition in string is ok or not
  *
  * @param 	string		$strToEvaluate	String with condition to check
- * @param	string	$onlysimplestring	'0' (deprecated, used for computed property of extrafields)=Accept all chars,
+ * @param	string	$onlysimplestring	'0' (deprecated, do not use it anymore)=Accept all chars,
  * 										'1' (most common use)=Accept only simple string with char 'a-z0-9\s^$_+-.*>&|=!?():"\',/@';',
- * 										'2' (rarely used)=Accept also '[]'
+ * 										'2' (used for example for the compute property of extrafields)=Accept also '[]'
  * @return 	boolean						True or False. Note: It returns also True if $strToEvaluate is ''. False if error
  */
 function verifCond($strToEvaluate, $onlysimplestring = '1')
@@ -9798,7 +9798,7 @@ function verifCond($strToEvaluate, $onlysimplestring = '1')
 	if (isset($strToEvaluate) && $strToEvaluate !== '') {
 		//var_dump($strToEvaluate);
 		//$rep = dol_eval($strToEvaluate, 1, 0, '1'); // to show the error
-		$rep = dol_eval($strToEvaluate, 1, 1, $onlysimplestring); // The dol_eval() must contains all the "global $xxx;" for all variables $xxx found into the string condition
+		$rep = (int) dol_eval($strToEvaluate, 1, 1, $onlysimplestring); // The dol_eval() must contains all the "global $xxx;" for all variables $xxx found into the string condition
 		$rights = $rep && (!is_string($rep) || strpos($rep, 'Bad string syntax to evaluate') === false);
 		//var_dump($rights);
 	}
@@ -9810,15 +9810,15 @@ function verifCond($strToEvaluate, $onlysimplestring = '1')
  * This function is called by verifCond() or trans() and transnoentitiesnoconv().
  *
  * @param 	string	$s					String to evaluate
- * @param	int		$returnvalue		0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
+ * @param	int		$returnvalue		0=No return (deprecated, used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
  * @param   int     $hideerrors     	1=Hide errors
- * @param	string	$onlysimplestring	'0' (deprecated, used for computed property of extrafields)=Accept all chars,
+ * @param	string	$onlysimplestring	'0' (deprecated, do not use it anymore)=Accept all chars,
  * 										'1' (most common use)=Accept only simple string with char 'a-z0-9\s^$_+-.*>&|=!?():"\',/@';',
- * 										'2' (rarely used)=Accept also '[]'
+ * 										'2' (used for example for the compute property of extrafields)=Accept also '[]'
  * @return	mixed						Nothing or return result of eval
  * @see verifCond()
  */
-function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1')
+function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1')
 {
 	// Only this global variables can be read by eval function and returned to caller
 	global $conf;	// Read of const is done with getDolGlobalString() but we need $conf->currency for example
@@ -9837,10 +9837,14 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 
 	try {
 		// Test on dangerous char (used for RCE), we allow only characters to make PHP variable testing
-		if ($onlysimplestring == '1') {
-			// We must accept: '1 && getDolGlobalInt("doesnotexist1") && getDolGlobalString("MAIN_FEATURES_LEVEL")'
-			// We must accept: '$user->hasRight("cabinetmed", "read") && !$object->canvas=="patient@cabinetmed"'
+		if ($onlysimplestring == '1' || $onlysimplestring == '2') {
+			// We must accept with 1: '1 && getDolGlobalInt("doesnotexist1") && getDolGlobalString("MAIN_FEATURES_LEVEL")'
+			// We must accept with 1: '$user->hasRight("cabinetmed", "read") && !$object->canvas=="patient@cabinetmed"'
+			// We must accept with 2: (($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"
 			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@';
+			if ($onlysimplestring == '2') {
+				$specialcharsallowed .= '[]';
+			}
 			if (getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL')) {
 				$specialcharsallowed .= getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL');
 			}
@@ -9866,50 +9870,15 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 			//print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";
 			if (strpos($scheck, '(') !== false) {
 				if ($returnvalue) {
-					return 'Bad string syntax to evaluate (mode 1, found call of a function or method without using the direct name of the function): '.$s;
+					return 'Bad string syntax to evaluate (mode '.$onlysimplestring.', found call of a function or method without using the direct name of the function): '.$s;
 				} else {
-					dol_syslog('Bad string syntax to evaluate (mode 1, found call of a function or method without using the direct name of the function): '.$s);
+					dol_syslog('Bad string syntax to evaluate (mode '.$onlysimplestring.', found call of a function or method without using the direct name of the function): '.$s);
 					return '';
 				}
 			}
 			// TODO
-			// We can exclude $ char that are not: $db, $langs, $leftmenu, $topmenu, $user, $langs, $objectoffield, $object...,
-		} elseif ($onlysimplestring == '2') {
-			// We must accept: (($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"
-			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@[]';
-			if (getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL')) {
-				$specialcharsallowed .= getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL');
-			}
-			if (preg_match('/[^a-z0-9\s'.preg_quote($specialcharsallowed, '/').']/i', $s)) {
-				if ($returnvalue) {
-					return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;
-				} else {
-					dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);
-					return '';
-				}
-			}
-			$savescheck = '';
-			$scheck = $s;
-			while ($scheck && $savescheck != $scheck) {
-				$savescheck = $scheck;
-				$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $scheck);	// accept parenthesis in '...->method(...'
-				$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-				$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-				$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('
-				$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('
-				$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);		// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
-			}
-			//print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";
-			if (strpos($scheck, '(') !== false) {
-				if ($returnvalue) {
-					return 'Bad string syntax to evaluate (mode 2, found call of a function or method without using the direct name of the function): '.$s;
-				} else {
-					dol_syslog('Bad string syntax to evaluate (mode 2, found call of a function or method without using the direct name of the function): '.$s);
-					return '';
-				}
-			}
-			// TODO
-			// We can exclude $ char that are not: $db, $leftmenu, $topmenu, $user, $langs, $object...,
+			// We can exclude $ char that are not:
+			// $db, $langs, $leftmenu, $topmenu, $user, $langs, $objectoffield, $object...,
 		}
 		if (is_array($s) || $s === 'Array') {
 			return 'Bad string syntax to evaluate (value is Array) '.var_export($s, true);
@@ -9949,7 +9918,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
+		//$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 
 		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function
@@ -9979,11 +9948,26 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 		//print $s."<br>\n";
 		if ($returnvalue) {
 			if ($hideerrors) {
-				return @eval('return '.$s.';');
+				ob_start();	// An evaluation has no reason to output data
+				$tmps = @eval('return '.$s.';');
+				$tmpo = ob_get_contents();
+				ob_clean(); // End of interception of data
+				if ($tmpo) {
+					print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
+				}
+				return $tmps;
 			} else {
-				return eval('return '.$s.';');
+				ob_start();	// An evaluation has no reason to output data
+				$tmps = eval('return '.$s.';');
+				$tmpo = ob_get_contents();
+				ob_clean(); // End of interception of data
+				if ($tmpo) {
+					print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
+				}
+				return $tmps;
 			}
 		} else {
+			dol_syslog('Do not use anymore dol_eval with param returnvalue=0', LOG_WARNING);
 			if ($hideerrors) {
 				@eval($s);
 			} else {
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 7c1f4a94a15..04d75f0e844 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -99,7 +99,7 @@ print "</tr>\n";
 
 if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type'])) {
 	foreach ($extrafields->attributes[$elementtype]['type'] as $key => $value) {
-		/*if (! dol_eval($extrafields->attributes[$elementtype]['enabled'][$key], 1, 1, '1')) {
+		/*if (! (int) dol_eval($extrafields->attributes[$elementtype]['enabled'][$key], 1, 1, '1')) {
 			// TODO Uncomment this to exclude extrafields of modules not enabled. Add a link to "Show extrafields disabled"
 			// continue;
 		}*/
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index 46ad5391035..e7f745cedf7 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -24,9 +24,9 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 				$arrayfields[$extrafieldsobjectprefix.$key] = array(
 					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
 					'type'     => $extrafields->attributes[$extrafieldsobjectkey]['type'][$key],
-					'checked'  => ((dol_eval($extrafields->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1') <= 0) ? 0 : 1),
+					'checked'  => (((int) dol_eval($extrafields->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1') <= 0) ? 0 : 1),
 					'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
-					'enabled'  => (abs((int) dol_eval($extrafields->attributes[$extrafieldsobjectkey]['list'][$key], 1)) != 3 && dol_eval($extrafields->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1')),
+					'enabled'  => (abs((int) dol_eval($extrafields->attributes[$extrafieldsobjectkey]['list'][$key], 1)) != 3 && (int) dol_eval($extrafields->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1')),
 					'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
 					'help'     => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
 				);
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 679a420df8c..b44df727362 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -35,7 +35,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 				// If field is a computed field, we make computation to get value
 				if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
 					$objectoffield = $object; //For compatibility with the computed formula
-					$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '2');
+					$value = dol_eval((int) $extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '2');
 					if (is_numeric(price2num($value)) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
 						$obj->$tmpkey = price2num($value);
 					}
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 2867f2ec15e..347e611b8bf 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -74,15 +74,15 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 
 		$enabled = 1;
 		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra])) {
-			$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra], 1, 1, '2');
+			$enabled = (int) dol_eval($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra], 1, 1, '2');
 		}
 		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra])) {
-			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra], 1, 1, '2');
+			$enabled = (int) dol_eval($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra], 1, 1, '2');
 		}
 
 		$perms = 1;
 		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra])) {
-			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra], 1, 1, '2');
+			$perms = (int) dol_eval($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra], 1, 1, '2');
 		}
 		//print $tmpkeyextra.'-'.$enabled.'-'.$perms.'<br>'."\n";
 
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index b04026109f3..273b560fa27 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -399,11 +399,11 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $value) {
 				$enabled = 1;
 				if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key])) {
-					$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
+					$enabled = (int) dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
 				}
 				$perms = 1;
 				if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key])) {
-					$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
+					$perms = (int) dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
 				}
 
 				$qualified = true;
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 41caf186654..a2b370ba6f4 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -122,7 +122,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 94145c852e1..afb8f29d942 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -130,7 +130,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index c49cf2fbf14..c25fd3bff9c 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -764,7 +764,7 @@ class Export
 								// Export of compute field does not work. $obj contains $obj->alias_field and formula may contains $obj->field
 								// Also the formula may contains objects of class that are not loaded.
 								$computestring = $this->array_export_special[$indice][$key];
-								//$tmp = dol_eval($computestring, 1, 0, '1');
+								//$tmp = (string) dol_eval($computestring, 1, 0, '2');
 								//$obj->$alias = $tmp;
 
 								$this->error = "ERROPNOTSUPPORTED. Operation ".$computestring." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index d412fa6d6ee..68f6d8f0af2 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -200,7 +200,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['cf.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 861b25a1507..20b8ee4359c 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -121,7 +121,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 24686b42715..9191162e979 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -120,7 +120,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 69807b143f1..6c227add829 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -127,7 +127,7 @@ foreach ($objectposition->fields as $key => $val) {
 		$arrayfields['t.' . $key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
-			'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index c72b7d2af20..4b9666e4c79 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -121,7 +121,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 7ae07c6a26f..d7b8e3d49ea 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -570,7 +570,7 @@ if ($action != "create" && $action != "edit") {
 			$arrayfields['t.' . $key] = array(
 				'label' => $val['label'],
 				'checked' => (($visible < 0) ? 0 : 1),
-				'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+				'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 				'position' => $val['position'],
 				'help' => isset($val['help']) ? $val['help'] : ''
 			);
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 344e91be8dd..ea155ac684f 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -128,7 +128,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 9e77ee2e30e..f2ee512c004 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -123,7 +123,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 5fad24be651..013c41e3cce 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -84,7 +84,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 06cd5c81f7a..476a429d972 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -176,7 +176,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 535576c789c..c88168ed1b9 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -116,7 +116,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -127,7 +127,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible <= 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 452e03be496..c810e09f554 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -138,7 +138,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 8b57061e08e..d9ff6026f0d 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -115,7 +115,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 2d47c9a7e5e..88248cc0d8a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -279,7 +279,7 @@ $arrayfields = array(
 		$arrayfields['p.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position']
 		);
 	}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index d41180191b7..ca5bcb5fded 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -124,7 +124,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
-			'enabled' => (abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 0b61dffa99d..bd1733bdf81 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -115,7 +115,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 864a9957c7f..d798b7556ac 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -111,7 +111,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index aa1d3218a22..4477b2ad218 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -229,7 +229,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['p.'.$key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
-			'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index f257972f69c..11a1c5fa5c5 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -267,7 +267,7 @@ if ($action == "view_ticketlist") {
 		if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 				if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
-					$enabled = abs(dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1, 1, '2'));
+					$enabled = abs((int) dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1, 1, '2'));
 					$enabled = (($enabled == 0 || $enabled == 3) ? 0 : $enabled);
 					$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => $enabled && $extrafields->attributes[$object->table_element]['perms'][$key]);
 				}
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 53f3ee74511..3284710c7eb 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -119,7 +119,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index b1e24a0fc52..bf62f0beb62 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -108,7 +108,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index aa8e62caf52..80e4dd7baf1 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -130,7 +130,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index a2e98275e2c..db0865ba994 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -142,7 +142,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index e7ba363e045..fdafc97e55b 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -546,7 +546,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 				$arrayfields['t.'.$key] = array(
 					'label'=>$val['label'],
 					'checked'=>(($visible < 0) ? 0 : 1),
-					'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+					'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 					'position'=>$val['position'],
 					'help'=> isset($val['help']) ? $val['help'] : ''
 				);
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index a5ea8eaf13b..1233793cd7d 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -146,7 +146,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
-			'enabled' => (abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 0b4d80bcefb..ea7a4ef554b 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -438,7 +438,7 @@ if ($object->id > 0) {
 			if ($user->admin) {
 				print '<td class="right">';
 				$htmltext = $langs->trans("ID").': '.$obj->id;
-				$htmltext .= '<br>'.$langs->trans("Permission").': user->rights->'.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '');
+				$htmltext .= '<br>'.$langs->trans("Permission").': user->hasRights(\''.$obj->module.'\', \''.$obj->perms.'\''.($obj->subperms ? ', \''.$obj->subperms.'\'' : '').')';
 				print $form->textwithpicto('', $htmltext);
 				//print '<span class="opacitymedium">'.$obj->id.'</span>';
 				print '</td>';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 77ad13f1f75..d6372cfb6a6 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -695,7 +695,7 @@ if ($result) {
 		if ($user->admin) {
 			print '<td class="right">';
 			$htmltext = $langs->trans("ID").': '.$obj->id;
-			$htmltext .= '<br>'.$langs->trans("Permission").': user->rights->'.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '');
+			$htmltext .= '<br>'.$langs->trans("Permission").': user->hasRight(\''.dol_escape_htmltag($obj->module).'\', \''.dol_escape_htmltag($obj->perms).'\''.($obj->subperms ? ', \''.dol_escape_htmltag($obj->subperms).'\'' : '').')';
 			print $form->textwithpicto('', $htmltext);
 			//print '<span class="opacitymedium">'.$obj->id.'</span>';
 			print '</td>';
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 3fd8e4b3b4c..0bee01ba154 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -114,7 +114,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index d1c307ba730..cbcca8fbfe8 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -117,7 +117,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php
index c850c424377..7bdd0bc4311 100644
--- a/htdocs/webportal/class/html.formlistwebportal.class.php
+++ b/htdocs/webportal/class/html.formlistwebportal.class.php
@@ -189,7 +189,7 @@ class FormListWebPortal
 				$arrayfields['t.' . $key] = array(
 					'label' => $val['label'],
 					'checked' => (($visible < 0) ? 0 : 1),
-					'enabled' => (abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+					'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 					'position' => $val['position'],
 					'help' => isset($val['help']) ? $val['help'] : ''
 				);
diff --git a/htdocs/webportal/class/html.formwebportal.class.php b/htdocs/webportal/class/html.formwebportal.class.php
index eb1a26ceb70..ea4debb2348 100644
--- a/htdocs/webportal/class/html.formwebportal.class.php
+++ b/htdocs/webportal/class/html.formwebportal.class.php
@@ -447,7 +447,7 @@ class FormWebPortal extends Form
 		if (!empty($objecttmp->fields)) {    // For object that declare it, it is better to use declared fields (like societe, contact, ...)
 			$tmpfieldstoshow = '';
 			foreach ($objecttmp->fields as $key => $val) {
-				if (!dol_eval($val['enabled'], 1, 1, '1')) {
+				if (! (int) dol_eval($val['enabled'], 1, 1, '1')) {
 					continue;
 				}
 				if (!empty($val['showoncombobox'])) {
@@ -1021,7 +1021,7 @@ class FormWebPortal extends Form
 		if ($computed) {
 			// Make the eval of compute string
 			//var_dump($computed);
-			$value = dol_eval($computed, 1, 0, '');
+			$value = (string) dol_eval($computed, 1, 0, '2');
 		}
 
 		// Format output value differently according to properties of field
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 3ee747367d9..fb749bd6a4c 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -118,7 +118,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -128,7 +128,7 @@ foreach ($object->fields as $key => $val) {
 $arrayfields['wug.fk_usergroup'] = array(
 	'label'=>$langs->trans('UserGroups'),
 	'checked'=>(($visible < 0) ? 0 : 1),
-	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+	'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 	'position'=>1000,
 	'help' => empty($val['help']) ? '' : $val['help'],
 	'csslist' => 'minwidth100'
@@ -138,7 +138,7 @@ $arrayfields['wug.fk_usergroup'] = array(
 $arrayfields['wr.fk_resource'] = array(
 	'label'=>$langs->trans('Resources'),
 	'checked'=>(($visible < 0) ? 0 : 1),
-	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+	'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
 	'position'=>1001,
 	'help' => empty($val['help']) ? '' : $val['help']
 );

From c0ee90aa7d8d5094f01e04cc11b6d0ee3f6115b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 17:13:05 +0100
Subject: [PATCH 0502/1862] Exclude require, include into dol_eval

---
 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 25cc81e664c..8dac5976289 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9918,7 +9918,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
-		//$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
+		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 
 		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function

From 8bc7027ced65668b942b18f07972882cb69e932d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 17:17:24 +0100
Subject: [PATCH 0503/1862] Fix help on status of menu condition

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

diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index ac40bfd21d0..42892fbb8b6 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -505,7 +505,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Enabled').'</td>';
 	print '<td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
 	if (!empty($menu->enabled)) {
-		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn((int) dol_eval($menu->enabled, 1, 1, '1')).')';
+		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn((int) dol_eval($menu->enabled, 1, 1, '1') <= 0 ? 0 : 1).')';
 	}
 	print '</td></tr>';
 
@@ -513,7 +513,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Rights').'</td>';
 	print '<td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
 	if (!empty($menu->perms)) {
-		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn((int) dol_eval($menu->perms, 1, 1, '1')).')';
+		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn((int) dol_eval($menu->perms, 1, 1, '1') <= 0 ? 0 : 1).')';
 	}
 	print '</td></tr>';
 

From 2d9801ffe33c22ea9d6c65a0b5bdd49e487712be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 15:01:25 +0100
Subject: [PATCH 0504/1862] Fix sec more complete list of forbidden function

---
 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 cbf8fee96e0..181825a689e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9297,6 +9297,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
+		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
 		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 
 		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function

From 91b994b89ce6a5263bdedd36dff1c43141f6767a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Mar 2024 17:20:44 +0100
Subject: [PATCH 0505/1862] Prepare 18.0.6

---
 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 cba47566c2b..9e1046d439f 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', '18.0.5'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '18.0.6'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

From 24059b0b8db2dcc64ea7b133f17ff4a5258834af Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 6 Mar 2024 17:24:23 +0100
Subject: [PATCH 0506/1862] get rows security

---
 htdocs/core/db/DoliDB.class.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 3b1184c7f85..4c0bfcbd0f3 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -385,6 +385,7 @@ abstract class DoliDB implements Database
 		if ($res) {
 			$obj = $this->fetch_object($res);
 			if ($obj) {
+				$this->free($res);
 				return $obj;
 			} else {
 				return 0;
@@ -399,12 +400,17 @@ abstract class DoliDB implements Database
 	 * Note : This method executes a given SQL query and retrieves all row of results as an array of objects. It should only be used with SELECT queries
 	 * be careful with this method use it only with some limit of results to avoid performances loss.
 	 *
-	 * @param 	string 		$sql 		The sql query string
-	 * @return 	bool|array				Result
-	 * @deprecated
+	 * @param string $sql The sql query string
+	 * @param bool   $noLimitCheck set it to true to disable sql query check of limit
+	 * @return    bool|array                Result
 	 */
-	public function getRows($sql)
+	public function getRows($sql, $noLimitCheck = false)
 	{
+
+		if (!$noLimitCheck && strpos($sql, 'LIMIT') === false) {
+			return false;
+		}
+
 		$res = $this->query($sql);
 		if ($res) {
 			$results = array();
@@ -413,6 +419,7 @@ abstract class DoliDB implements Database
 					$results[] = $obj;
 				}
 			}
+			$this->free($res);
 			return $results;
 		}
 

From 21ef87777230a746face1119830d9b873b483511 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Mar 2024 11:07:28 +0100
Subject: [PATCH 0507/1862] Remove not used email layout

---
 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 606becf17c2..8c998f0cc50 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1521,7 +1521,7 @@ class FormMail extends Form
 			'basic' => 'basic',
 			'news'  => 'news',
 			'commerce' => 'commerce',
-			'text' => 'text'
+			//'text' => 'text'
 		);
 
 		foreach ($templates as $template => $templateFunction) {

From f00d3ff6ddd9b76b4dfd83076efe044b78c6b816 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Mar 2024 14:57:41 +0100
Subject: [PATCH 0508/1862] Fix route not complete

---
 .../template/class/api_mymodule.class.php              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 1908a2a0b4b..e29e1a08911 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -64,7 +64,7 @@ class MyModuleApi extends DolibarrApi
 	 * @param	int		$id				ID of myobject
 	 * @return  Object					Object with cleaned properties
 	 *
-	 * @url	GET myobjects/{id}
+	 * @url	GET mymodule/myobjects/{id}
 	 *
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 404 Not found
@@ -103,7 +103,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 503 System error
 	 *
-	 * @url	GET /myobjects/
+	 * @url	GET /mymodule/myobjects/
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
 	{
@@ -191,7 +191,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 500 System error
 	 *
-	 * @url	POST myobjects/
+	 * @url	POST mymodule/myobjects/
 	 */
 	public function post($request_data = null)
 	{
@@ -232,7 +232,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 404 Not found
 	 * @throws RestException 500 System error
 	 *
-	 * @url	PUT myobjects/{id}
+	 * @url	PUT mymodule/myobjects/{id}
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -282,7 +282,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 409 Nothing to do
 	 * @throws RestException 500 System error
 	 *
-	 * @url	DELETE myobjects/{id}
+	 * @url	DELETE mymodule/myobjects/{id}
 	 */
 	public function delete($id)
 	{

From f45f1f6cfd787179c8acb590a7954ad452a1d00d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Mar 2024 15:00:08 +0100
Subject: [PATCH 0509/1862] Fix separator block for modulebuilder

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

diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index e29e1a08911..7ff746c21fb 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -54,7 +54,7 @@ class MyModuleApi extends DolibarrApi
 		$this->myobject = new MyObject($this->db);
 	}
 
-	/*begin methods CRUD*/
+	/* BEGIN MODULEBUILDER API MYOBJECT */
 
 	/**
 	 * Get properties of a myobject object
@@ -336,7 +336,9 @@ class MyModuleApi extends DolibarrApi
 		return $myobject;
 	}
 
-	/*end methods CRUD*/
+	/* END MODULEBUILDER API MYOBJECT */
+
+
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**

From 4dcf98b9f7d5e26dd4c4c62bc4a980e389cc61aa Mon Sep 17 00:00:00 2001
From: ATM-NicolasV <92087862+ATM-NicolasV@users.noreply.github.com>
Date: Thu, 7 Mar 2024 15:55:07 +0100
Subject: [PATCH 0510/1862] fix entity in sql from RemoveFromGroup (#28682)

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1543d579839..0ec4d6fdf5a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2377,7 +2377,11 @@ class User extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
-		$sql .= " AND entity = ".((int) $entity);
+		if (empty($entity)) {
+			$sql .= " AND entity IN (0, 1)";	// group may be in entity 0 (so $entity=0) and link with user into entity 1.
+		} else {
+			$sql .= " AND entity = ".((int) $entity);
+		}
 
 		$result = $this->db->query($sql);
 		if ($result) {

From 7bb55aa22528cf2ac35303a957113170ebc58af0 Mon Sep 17 00:00:00 2001
From: atm-adrien <67913809+atm-adrien@users.noreply.github.com>
Date: Thu, 7 Mar 2024 15:56:17 +0100
Subject: [PATCH 0511/1862] FIX : Translation for select  (#28677)

* FIX : Adding thez dependencies list feature for select fields

* FIX : Adding some spaces

* FIX : View

* FIX : Translating
---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 47060b949f4..9ef1f4c94f4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7330,7 +7330,7 @@ abstract class CommonObject
 					$isDependList = 1;
 				}
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-				$out .= '>'.$valb.'</option>';
+				$out .= '>'.$langs->trans($valb).'</option>';
 			}
 			$out .= '</select>';
 		} elseif ($type == 'sellist') {
@@ -7954,7 +7954,7 @@ abstract class CommonObject
 		} elseif ($type == 'select') {
 			$value = isset($param['options'][$value]) ? $param['options'][$value] : '';
 			if (strpos($value, "|") !== false) {
-				$value = explode('|', $value)[0];
+				$value = $langs->trans(explode('|', $value)[0]);
 			}
 		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);

From 18cc09fae69936cf194d83a699b2dbb2563bcacd Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 16:02:14 +0100
Subject: [PATCH 0512/1862] qual: phan for htdocs/core/lib/ajax.lib.php
 (#28672)

29 entries for:

Argument 3 ($entity) is null of type null but \ajax_constantonoff() takes int (no real type) defined at htdocs/core/lib/ajax.lib.php:645
---
 htdocs/core/lib/ajax.lib.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 91f76b66cdd..81fe78a073c 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -628,19 +628,19 @@ function ajax_event($htmlname, $events)
 /**
  * 	On/off button for constant
  *
- * 	@param	string	$code					Name of constant
- * 	@param	array	$input					Array of complementary actions to do if success ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
- * 	@param	int		$entity					Entity. Current entity is used if null.
- *  @param	int		$revertonoff			1=Revert on/off
- *  @param	int		$strict					Use only "disabled" with delConstant and "enabled" with setConstant
- *  @param	int		$forcereload			Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
- *  @param	int		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin.
- *  @param	int		$forcenoajax			1 = Force to use a ahref link instead of ajax code.
- *  @param	int		$setzeroinsteadofdel	1 = Set constantto '0' instead of deleting it
- *  @param	string	$suffix					Suffix to use on the name of the switch_on picto. Example: '', '_red'
- *  @param	string	$mode					Add parameter &mode= to the href link (Used for href link)
- *  @param	string	$morecss				More CSS
- * 	@return	string
+ * 	@param  string      $code                   Name of constant
+ * 	@param  array       $input                  Array of complementary actions to do if success ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
+ * 	@param  int|null    $entity                 Entity. Current entity is used if null.
+ *  @param  int         $revertonoff            1=Revert on/off
+ *  @param  int	        $strict                 Use only "disabled" with delConstant and "enabled" with setConstant
+ *  @param  int         $forcereload            Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
+ *  @param  int         $marginleftonlyshort    1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin.
+ *  @param  int	        $forcenoajax            1 = Force to use a ahref link instead of ajax code.
+ *  @param  int         $setzeroinsteadofdel    1 = Set constantto '0' instead of deleting it
+ *  @param  string      $suffix                 Suffix to use on the name of the switch_on picto. Example: '', '_red'
+ *  @param  string      $mode                   Add parameter &mode= to the href link (Used for href link)
+ *  @param  string      $morecss                More CSS
+ * 	@return string
  */
 function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0, $setzeroinsteadofdel = 0, $suffix = '', $mode = '', $morecss = 'inline-block')
 {

From fcfc70e02a2145caf359b597c46cde6220bd4692 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 16:02:57 +0100
Subject: [PATCH 0513/1862] qual: phpstan for htdocs/loan/class/loan.class.php
 (#28673)

htdocs/loan/class/loan.class.php	113	PHPDoc type int of property Loan::$totalpaid is not covariant with PHPDoc type float of overridden property CommonObject::$totalpaid.
---
 htdocs/loan/class/loan.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 3eb5b1bdc45..20f51e90e78 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -108,7 +108,7 @@ class Loan extends CommonObject
 	public $fk_project;
 
 	/**
-	 * @var int totalpaid
+	 * @var float totalpaid
 	 */
 	public $totalpaid;
 

From 38e69184d1a4943fb787b5502a3ce31adc688e28 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:04:39 +0100
Subject: [PATCH 0514/1862] Fix typing hints (#28676)

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8dac5976289..30f5dc3b5b4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6890,7 +6890,7 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
 		if (($mysoc->country_code == $thirdpartytouse->country_code)
 			|| (in_array($mysoc->country_code, array('FR', 'MC')) && in_array($thirdpartytouse->country_code, array('FR', 'MC')))
 			|| (in_array($mysoc->country_code, array('MQ', 'GP')) && in_array($thirdpartytouse->country_code, array('MQ', 'GP')))
-			) {
+		) {
 			// If country of thirdparty to consider is ours
 			if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
 				$result = $product->get_buyprice($idprodfournprice, 0, 0, 0);
@@ -9756,13 +9756,13 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 }
 
 /**
- *	Check if a variable with name $var start with $text.
+ *	Check if a variable with name $var startx with $text.
  *  Can be used to forge dol_eval() conditions.
  *
- *  @param	$var		string		Variable
- *  @param	$regextext	string		Text that must be a valid regex string
- *  @param	$matchrule	int			1=Test if start with, 0=Test if equal
- *  @return	boolean|string			True or False, text if bad use.
+ *  @param	string	$var		Variable
+ *  @param	string	$regextext	Text that must be a valid regex string
+ *  @param	int		$matchrule	1=Test if start with, 0=Test if equal
+ *  @return	boolean|string		True or False, text if bad usage.
  */
 function isStringVarMatching($var, $regextext, $matchrule = 1)
 {
@@ -13078,6 +13078,8 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 	}
 
 	$histo = array();
+	'@phan-var-force array<int,array{type:string,tododone:string,id:string,datestart:int|string,dateend:int|string,note:string,message:string,percent:string,userid:string,login:string,userfirstname:string,userlastname:string,userphoto:string,msg_from?:string,contact_id?:string,socpeopleassigned?:int[],lastname?:string,firstname?:string,fk_element?:int,elementtype?:string,acode:string,alabel?:string,libelle?:string,apicto?:string}> $histo';
+
 	$numaction = 0;
 	$now = dol_now();
 
@@ -13157,7 +13159,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 		}
 
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-		if ($force_filter_contact === false) {
+		if (!$force_filter_contact) {
 			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {
 				$sql .= " AND a.fk_soc = ".((int) $filterobj->id);
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) {
@@ -13285,6 +13287,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 			while ($i < $imaxinloop) {
 				$obj = $db->fetch_object($resql);
 
+				'@phan-var-force array{apicto:string,contact_id:string,dp:string,dp2:string,firstname:string,label:string,message:string,msg_from:string,ref:string,type:string,user_lastname:string} $obj';
 				if ($obj->type == 'action') {
 					$contactaction = new ActionComm($db);
 					$contactaction->id = $obj->id;

From 2d8223eefb5a3e493a71a358626c64e051068034 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 16:16:49 +0100
Subject: [PATCH 0515/1862] Doc

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 6ad04701a52..e19463934af 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -341,12 +341,13 @@ if (!getDolGlobalString('SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF')) {
 }
 
 print '<strong>$dolibarr_main_stream_to_disable</strong>: ';
+// $arrayofstreamtodisable is defined into filefunc.inc.php
 if (empty($dolibarr_main_stream_to_disable)) {
 	print '<span class="opacitymedium">'.$langs->trans("Undefined").' = '.join(', ', $arrayofstreamtodisable).'</span>';
 } else {
 	print join(', ', $dolibarr_main_stream_to_disable);
 }
-print '<span class="bold"> -> PHP streams allowed = </span>';
+print '<span class="bold"> -> Current PHP streams allowed = </span>';
 $arrayofstreams = stream_get_wrappers();
 if (!empty($arrayofstreams)) {
 	sort($arrayofstreams);

From 5e9dfc80902eeb494fd1399ee3e7a26cc643a0c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 16:38:02 +0100
Subject: [PATCH 0516/1862] Fix phan

---
 htdocs/accountancy/class/bookkeeping.class.php | 2 +-
 htdocs/hrm/class/job.class.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 362728c367b..fe307fe8915 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1231,7 +1231,7 @@ class BookKeeping extends CommonObject
 				} elseif ($key == 't.reconciled_option') {
 					$sqlwhere[] = 't.lettering_code IS NULL';
 				} else {
-					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->escape($this->db->escapeforlike($value))."%'";
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
 		}
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 684bc39b3c3..dbed9cad902 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -365,7 +365,7 @@ class Job extends CommonObject
 	 * @param  string      	$filtermode   	No more used
 	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 

From af9704acdcde8a9050b5fdd0cb4825456ec04f72 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 16:41:39 +0100
Subject: [PATCH 0517/1862] qual: phpdoc for htdocs/core/lib/pdf.lib.php
 (#28671)

---
 htdocs/core/lib/pdf.lib.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4cfac0f4413..7d342e152a3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -429,7 +429,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
  *      @param  Contact|string|null	  $targetcontact	    Target contact object
  * 		@param	int			          $usecontact		    Use contact instead of company
  * 		@param	string  	          $mode				    Address type ('source', 'target', 'targetwithdetails', 'targetwithdetails_xxx': target but include also phone/fax/email/url)
- *      @param  Object                $object               Object we want to build document for
+ *      @param  Object|null           $object               Object we want to build document for
  * 		@return	string|int				    		        String with full address or -1 if KO
  */
 function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $targetcontact = '', $usecontact = 0, $mode = 'source', $object = null)
@@ -718,7 +718,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 /**
  *   	Show header of page for PDF generation
  *
- *   	@param      TCPDF			$pdf     		Object PDF
+ *   	@param      TCPDF		$pdf     		Object PDF
  *      @param      Translate	$outputlangs	Object lang for output
  * 		@param		int			$page_height	Height of page
  *      @return	void
@@ -752,11 +752,11 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 /**
  *	Return array of possible substitutions for PDF content (without external module substitutions).
  *
- *	@param	Translate	$outputlangs	Output language
- *	@param	array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
- *	@param	Object      $object         Object
- *	@param	int         $onlykey       	1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are truncated and html sanitized (to use for help tooltip)
- *  @param   array      $include        Array of family keys we want to include. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
+ *	@param	Translate	    $outputlangs	Output language
+ *	@param	array|null	    $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
+ *	@param	Object|null     $object         Object
+ *	@param	int             $onlykey       	1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are truncated and html sanitized (to use for help tooltip)
+ *  @param  array|null      $include        Array of family keys we want to include. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
  *	@return	array						Array of substitutions
  */
 function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, $onlykey = 0, $include = null)
@@ -2296,11 +2296,11 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 /**
  * Return line percent
  *
- * @param Object $object Object
- * @param int $i Current line number
- * @param Translate $outputlangs Object langs for output
- * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines)
- * @param HookManager $hookmanager Hook manager instance
+ * @param Object                $object             Object
+ * @param int                   $i                  Current line number
+ * @param Translate             $outputlangs        Object langs for output
+ * @param int                   $hidedetails        Hide details (0=no, 1=yes, 2=just special lines)
+ * @param HookManager|null      $hookmanager        Hook manager instance
  * @return string
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)

From 1aa0f8227f2b5d872fbe9005dc95c90fd23a8c84 Mon Sep 17 00:00:00 2001
From: Rikard Bosnjakovic <bos@hack.org>
Date: Thu, 7 Mar 2024 16:43:04 +0100
Subject: [PATCH 0518/1862] Update card.php (#28679)

Fix #25130

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/expedition/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f0e85472b80..4fdefef202b 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2763,7 +2763,7 @@ if ($action == 'create') {
 
 	// Presend form
 	$modelmail = 'shipping_send';
-	$defaulttopic = $langs->trans('SendShippingRef');
+	$defaulttopic = 'SendShippingRef';
 	$diroutput = $conf->expedition->dir_output.'/sending';
 	$trackid = 'shi'.$object->id;
 

From 8870be3c3d211385f7a7061fb5eef4ee5cb3790d Mon Sep 17 00:00:00 2001
From: Rikard Bosnjakovic <bos@hack.org>
Date: Thu, 7 Mar 2024 16:43:04 +0100
Subject: [PATCH 0519/1862] Update card.php (#28679)

Fix #25130

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/expedition/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index fd83a09ab0e..45cbba28344 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2762,7 +2762,7 @@ if ($action == 'create') {
 
 	// Presend form
 	$modelmail = 'shipping_send';
-	$defaulttopic = $langs->trans('SendShippingRef');
+	$defaulttopic = 'SendShippingRef';
 	$diroutput = $conf->expedition->dir_output.'/sending';
 	$trackid = 'shi'.$object->id;
 

From 4fcbdf15ab3acdd163cd854de3c4da330f686723 Mon Sep 17 00:00:00 2001
From: HENRY Florian <florian.henry@open-concept.pro>
Date: Thu, 7 Mar 2024 16:49:41 +0100
Subject: [PATCH 0520/1862] fix: better inner join than comma for hook
 printFieldListFrom after (#28681)

* better inner jion than comme for hook after

* better inner jion than comme for hook after

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/comm/propal/list.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 88cec014878..0a03d0cc1cd 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -77,6 +77,7 @@ $mode 		= GETPOST('mode', 'alpha');
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user 	= GETPOSTINT('search_user');
+if ($search_user==-1) $search_user=0;
 $search_sale 	= GETPOSTINT('search_sale');
 $search_ref 	= GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
@@ -587,7 +588,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 
-$sql .= ', '.MAIN_DB_PREFIX.'propal as p';
+$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'propal as p ON p.fk_soc = s.rowid';
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
 }
@@ -598,8 +599,10 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
 if ($search_user > 0) {
-	$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
-	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as c";
+	$sql .= " ON  c.element_id = p.rowid AND c.fk_socpeople = ".((int) $search_user);
+	$sql .= " INNER JOIN  ".MAIN_DB_PREFIX."c_type_contact as tc";
+	$sql .= " ON c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal'";
 }
 
 // Add table from hooks
@@ -607,8 +610,8 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql .= ' WHERE p.fk_soc = s.rowid';
-$sql .= ' AND p.entity IN ('.getEntity('propal').')';
+$sql .= ' WHERE';
+$sql .= ' p.entity IN ('.getEntity('propal').')';
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
 }
@@ -718,9 +721,6 @@ if ($search_date_delivery_start) {
 if ($search_date_delivery_end) {
 	$sql .= " AND p.date_livraison <= '".$db->idate($search_date_delivery_end)."'";
 }
-if ($search_user > 0) {
-	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".((int) $search_user);
-}
 if ($search_date_signature_start) {
 	$sql .= " AND p.date_signature >= '".$db->idate($search_date_signature_start)."'";
 }
@@ -1147,7 +1147,7 @@ if ($search_date_signature_endyear) {
 	if ($user->hasRight('user', 'user', 'lire')) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('LinkedToSpecificUsers');
-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers((empty($search_user)?-2:0), 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products

From 5659ba8de35a43715d1a53203a444bcb464f4a2b Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 16:50:42 +0100
Subject: [PATCH 0521/1862] qual: phan for accountingaccount.class.php (#28669)

htdocs/accountancy/admin/productaccount.php	196	TypeError PhanTypeMismatchArgumentProbablyReal Argument 2 ($account_number) is null of type null but \AccountingAccount::fetch() takes string (no real type) defined at htdocs/accountancy/class/accountingaccount.class.php:182 (the inferred real argument type has nothing in common with the parameter's phpdoc type)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/accountancy/class/accountingaccount.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 057c307e1f6..500fd4a7543 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -174,7 +174,7 @@ class AccountingAccount extends CommonObject
 	 * Load record in memory
 	 *
 	 * @param 	int       		$rowid 				    	Id
-	 * @param 	string 	       	$account_number 	        Account number
+	 * @param 	string|null    	$account_number 	        Account number
 	 * @param 	int|boolean    	$limittocurrentchart     	1 or true=Load record only if it is into current active chart of account
 	 * @param   string         	$limittoachartaccount    	'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
 	 * @return 	int                                     	Return integer <0 if KO, 0 if not found, Id of record if OK and found

From b9c843c08687c89631eb0d845ef90b5931396a85 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 16:55:12 +0100
Subject: [PATCH 0522/1862] qual: phan for functions.lib.php (#28653)

* qual: phan for functions.lib.php

54 entries for:

TypeError PhanTypeMismatchArgumentProbablyReal Argument 3 ($exclude) is null of type null but \getCommonSubstitutionArray() takes array (no real type) defined at htdocs/core/lib/functions.lib.php:8285

* phpcs
---
 htdocs/core/lib/functions.lib.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30f5dc3b5b4..af156d0442f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8274,12 +8274,13 @@ function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
 /**
  * Return array of possible common substitutions. This includes several families like: 'system', 'mycompany', 'object', 'objectamount', 'date', 'user'
  *
- * @param	Translate	$outputlangs	Output language
- * @param   int         $onlykey        1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are trunc and html sanitized (to use for help tooltip)
- * @param   array       $exclude        Array of family keys we want to exclude. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
- * @param   Object      $object         Object for keys on object
- * @param   array       $include        Array of family keys we want to include. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
- * @return	array						Array of substitutions
+ * @param	Translate       $outputlangs    Output language
+ * @param   int             $onlykey        1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys),
+ *                                          2=Values are trunc and html sanitized (to use for help tooltip)
+ * @param   array|null      $exclude        Array of family keys we want to exclude. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
+ * @param   Object|null     $object         Object for keys on object
+ * @param   array|null      $include        Array of family keys we want to include. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
+ * @return	array                           Array of substitutions
  * @see setSubstitFromObject()
  */
 function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null, $include = null)

From 14ffa142aa7d4e7b1b5d6787008a0472e4bd4456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:57:29 +0100
Subject: [PATCH 0523/1862] fix precommit and clean code (#28651)

* fix precommit

* fix precommit

* fix missing include

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* clean code

* clean code
---
 htdocs/bookcal/lib/bookcal.lib.php            |  7 ++-
 .../lib/bookcal_availabilities.lib.php        | 21 +++----
 htdocs/bookcal/lib/bookcal_calendar.lib.php   | 23 ++++----
 htdocs/comm/card.php                          |  1 +
 htdocs/core/class/html.formsms.class.php      | 22 ++++++-
 .../doc/pdf_aurore.modules.php                |  2 +-
 .../doc/pdf_zenith.modules.php                |  2 +-
 .../emailcollector/lib/emailcollector.lib.php |  5 +-
 ...ventorganization_conferenceorbooth.lib.php | 57 ++++++++++---------
 htdocs/loan/class/paymentloan.class.php       |  7 ++-
 htdocs/mrp/ajax/interface.php                 | 17 ++++++
 htdocs/mrp/lib/mrp.lib.php                    | 11 ++--
 htdocs/mrp/lib/mrp_mo.lib.php                 | 27 ++++-----
 htdocs/mrp/mo_agenda.php                      |  6 +-
 htdocs/mrp/mo_document.php                    |  7 ++-
 htdocs/mrp/mo_movements.php                   |  5 +-
 htdocs/mrp/mo_note.php                        |  5 +-
 htdocs/mrp/mo_production.php                  |  3 +-
 htdocs/partnership/lib/partnership.lib.php    | 31 +++++-----
 htdocs/product/class/product.class.php        | 13 ++++-
 htdocs/recruitment/lib/recruitment.lib.php    | 18 +++---
 ...recruitment_recruitmentcandidature.lib.php | 21 +++----
 ...recruitment_recruitmentjobposition.lib.php | 33 +++++------
 htdocs/societe/class/client.class.php         |  9 ++-
 htdocs/theme/eldy/flags-sprite.inc.php        | 24 +++++++-
 htdocs/theme/eldy/global.inc.php              | 22 +++++++
 htdocs/theme/eldy/main_menu_fa_icons.inc.php  | 30 +++++++++-
 htdocs/webhook/lib/webhook.lib.php            |  7 ++-
 htdocs/webhook/lib/webhook_target.lib.php     |  7 ++-
 htdocs/webportal/lib/webportal.lib.php        |  6 +-
 htdocs/website/lib/websiteaccount.lib.php     |  6 +-
 htdocs/zapier/lib/zapier.lib.php              | 10 ++--
 32 files changed, 302 insertions(+), 163 deletions(-)

diff --git a/htdocs/bookcal/lib/bookcal.lib.php b/htdocs/bookcal/lib/bookcal.lib.php
index 3f809da08d8..049de3c6472 100644
--- a/htdocs/bookcal/lib/bookcal.lib.php
+++ b/htdocs/bookcal/lib/bookcal.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    bookcal/lib/bookcal.lib.php
+ * \file    htdocs/bookcal/lib/bookcal.lib.php
  * \ingroup bookcal
  * \brief   Library files with common functions for BookCal
  */
@@ -35,13 +36,13 @@ function bookcalAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/bookcal/admin/setup.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/bookcal/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
 	/*
-	$head[$h][0] = dol_buildpath("/bookcal/admin/myobject_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT.'/bookcal/admin/myobject_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'myobject_extrafields';
 	$h++;
diff --git a/htdocs/bookcal/lib/bookcal_availabilities.lib.php b/htdocs/bookcal/lib/bookcal_availabilities.lib.php
index 1fb93187f94..674c0ea70bb 100644
--- a/htdocs/bookcal/lib/bookcal_availabilities.lib.php
+++ b/htdocs/bookcal/lib/bookcal_availabilities.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,13 +42,13 @@ function availabilitiesPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/bookcal/availabilities_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if ($showtabofpagecontact) {
-		$head[$h][0] = dol_buildpath("/bookcal/availabilities_contact.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_contact.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans("Contacts");
 		$head[$h][2] = 'contact';
 		$h++;
@@ -62,10 +63,10 @@ function availabilitiesPrepareHead($object)
 			if (!empty($object->note_public)) {
 				$nbNote++;
 			}
-			$head[$h][0] = dol_buildpath('/bookcal/availabilities_note.php', 1).'?id='.$object->id;
+			$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_note.php?id=' . $object->id;
 			$head[$h][1] = $langs->trans('Notes');
 			if ($nbNote > 0) {
-				$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+				$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
 			}
 			$head[$h][2] = 'note';
 			$h++;
@@ -73,22 +74,22 @@ function availabilitiesPrepareHead($object)
 	}
 
 	if ($showtabofpagedocument) {
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-		$upload_dir = $conf->bookcal->dir_output."/availabilities/".dol_sanitizeFileName($object->ref);
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		$upload_dir = $conf->bookcal->dir_output . "/availabilities/" . dol_sanitizeFileName($object->ref);
 		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 		$nbLinks = Link::count($db, $object->element, $object->id);
-		$head[$h][0] = dol_buildpath("/bookcal/availabilities_document.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_document.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Documents');
 		if (($nbFiles + $nbLinks) > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 		}
 		$head[$h][2] = 'document';
 		$h++;
 	}
 
 	if ($showtabofpageagenda) {
-		$head[$h][0] = dol_buildpath("/bookcal/availabilities_agenda.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_agenda.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans("Events");
 		$head[$h][2] = 'agenda';
 		$h++;
diff --git a/htdocs/bookcal/lib/bookcal_calendar.lib.php b/htdocs/bookcal/lib/bookcal_calendar.lib.php
index f586c8845df..d81d0f85d2e 100644
--- a/htdocs/bookcal/lib/bookcal_calendar.lib.php
+++ b/htdocs/bookcal/lib/bookcal_calendar.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,13 +42,13 @@ function calendarPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/bookcal/calendar_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Calendar");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if ($object->status == Calendar::STATUS_VALIDATED) {
-		$head[$h][0] = dol_buildpath("/bookcal/booking_list.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/booking_list.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans("Bookings");
 		$head[$h][2] = 'booking';
 		$h++;
@@ -55,7 +56,7 @@ function calendarPrepareHead($object)
 
 
 	if ($showtabofpagecontact) {
-		$head[$h][0] = dol_buildpath("/bookcal/calendar_contact.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_contact.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans("Contacts");
 		$head[$h][2] = 'contact';
 		$h++;
@@ -70,10 +71,10 @@ function calendarPrepareHead($object)
 			if (!empty($object->note_public)) {
 				$nbNote++;
 			}
-			$head[$h][0] = dol_buildpath('/bookcal/calendar_note.php', 1).'?id='.$object->id;
+			$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_note.php?id=' . $object->id;
 			$head[$h][1] = $langs->trans('Notes');
 			if ($nbNote > 0) {
-				$head[$h][1] .= (!getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+				$head[$h][1] .= (!getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
 			}
 			$head[$h][2] = 'note';
 			$h++;
@@ -81,22 +82,22 @@ function calendarPrepareHead($object)
 	}
 
 	if ($showtabofpagedocument) {
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-		$upload_dir = $conf->bookcal->dir_output."/calendar/".dol_sanitizeFileName($object->ref);
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+		$upload_dir = $conf->bookcal->dir_output . "/calendar/" . dol_sanitizeFileName($object->ref);
 		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 		$nbLinks = Link::count($db, $object->element, $object->id);
-		$head[$h][0] = dol_buildpath("/bookcal/calendar_document.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_document.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Documents');
 		if (($nbFiles + $nbLinks) > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 		}
 		$head[$h][2] = 'document';
 		$h++;
 	}
 
 	if ($showtabofpageagenda) {
-		$head[$h][0] = dol_buildpath("/bookcal/calendar_agenda.php", 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_agenda.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans("Events");
 		$head[$h][2] = 'agenda';
 		$h++;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 0b07926aad8..4a20bf2dc9e 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -36,6 +36,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index f9cecb96867..4aa0bd0ed61 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,6 +41,10 @@ class FormSms
 	public $fromid;
 	public $fromname;
 	public $fromsms;
+
+	/**
+	 * @var string
+	 */
 	public $fromtype;
 	public $replytoname;
 	public $replytomail;
@@ -48,9 +52,25 @@ class FormSms
 	public $tomail;
 
 	public $withsubstit; // Show substitution array
+
+	/**
+	 * @var int
+	 */
 	public $withfrom;
+
+	/**
+	 * @var int
+	 */
 	public $withto;
+
+	/**
+	 * @var int
+	 */
 	public $withtopic;
+
+	/**
+	 * @var int
+	 */
 	public $withbody;
 
 	/**
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 f53f7eba871..be2c6e38937 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -714,7 +714,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *   @param		Object		$object			Object to show
 	 *   @param		int|float	$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	int
+	 *   @return	int|float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index 2c10cdefc1c..f42c862bb9e 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -844,7 +844,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 	 *   @param		SupplierProposal	$object			Object to show
 	 *   @param		int|float			$posy			Y
 	 *   @param		Translate			$outputlangs	Langs object
-	 *   @return	integer
+	 *   @return	int|float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 8bb69da5f3b..3549f20a5a5 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -38,13 +38,12 @@ function emailcollectorPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/admin/emailcollector_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/admin/emailcollector_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("EmailCollector");
 	$head[$h][2] = 'card';
 	$h++;
 
-	/*if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	/*if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index 1f89e43eaba..b0efb0602c5 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    lib/eventorganization_conferenceorbooth.lib.php
+ * \file    htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
  * \ingroup eventorganization
  * \brief   Library files with common functions for ConferenceOrBooth
  */
@@ -37,18 +38,18 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 	$h = 0;
 	$head = array();
 
-	$withProjectUrl='';
-	if ($with_project>0) {
+	$withProjectUrl = '';
+	if ($with_project > 0) {
 		$withProjectUrl = "&withproject=1";
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?id='.$object->id.$withProjectUrl;
+	$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_card.php?id=' . $object->id . $withProjectUrl;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if (getDolGlobalString('MAIN_FEATURES_LEVEL') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-		$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_contact.php?id='.$object->id.$withProjectUrl;
+		$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_contact.php?id=' . $object->id . $withProjectUrl;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
 		$head[$h][2] = 'contact';
 		$h++;
@@ -82,15 +83,15 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 	$h++;
 	*/
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->eventorganization->dir_output."/conferenceorbooth/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+	$upload_dir = $conf->eventorganization->dir_output . "/conferenceorbooth/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/eventorganization/conferenceorbooth_document.php", 1).'?id='.$object->id.$withProjectUrl;
+	$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_document.php?id=' . $object->id . $withProjectUrl;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
@@ -125,22 +126,22 @@ function conferenceorboothProjectPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/eventorganization/conferenceorbooth_list.php", 1).'?projectid='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . 'eventorganization/conferenceorbooth_list.php?projectid=' . $object->id;
 	$head[$h][1] = $langs->trans("ConferenceOrBooth");
 	$head[$h][2] = 'conferenceorbooth';
 	// Enable caching of conf or booth count attendees
 	$nbAttendees = 0;
-	$nbConferenceOrBooth= 0;
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
-	$cachekey = 'count_conferenceorbooth_project_'.$object->id;
+	$nbConferenceOrBooth = 0;
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
+	$cachekey = 'count_conferenceorbooth_project_' . $object->id;
 	$dataretrieved = dol_getcache($cachekey);
 	if (!is_null($dataretrieved)) {
 		$nbAttendees = $dataretrieved;
 	} else {
-		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-		$conforbooth=new ConferenceOrBooth($db);
-		$result = $conforbooth->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $object->id).')');
-		if (!is_array($result) && $result<0) {
+		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorbooth.class.php';
+		$conforbooth = new ConferenceOrBooth($db);
+		$result = $conforbooth->fetchAll('', '', 0, 0, '(t.fk_project:=:' . ((int) $object->id) . ')');
+		if (!is_array($result) && $result < 0) {
 			setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
 		} else {
 			$nbConferenceOrBooth = count($result);
@@ -148,25 +149,25 @@ function conferenceorboothProjectPrepareHead($object)
 		dol_setcache($cachekey, $nbConferenceOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.
 	}
 	if ($nbConferenceOrBooth > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbConferenceOrBooth.'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbConferenceOrBooth . '</span>';
 	}
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/eventorganization/conferenceorboothattendee_list.php", 1).'?fk_project='.$object->id.'&withproject=1';
+	$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorboothattendee_list.php?fk_project=' . $object->id . '&withproject=1';
 	$head[$h][1] = $langs->trans("Attendees");
 	$head[$h][2] = 'attendees';
 	// Enable caching of conf or booth count attendees
 	$nbAttendees = 0;
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
-	$cachekey = 'count_attendees_conferenceorbooth_project_'.$object->id;
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
+	$cachekey = 'count_attendees_conferenceorbooth_project_' . $object->id;
 	$dataretrieved = dol_getcache($cachekey);
 	if (!is_null($dataretrieved)) {
 		$nbAttendees = $dataretrieved;
 	} else {
-		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-		$attendees=new ConferenceOrBoothAttendee($db);
-		$result = $attendees->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $object->id).')');
-		if (!is_array($result) && $result<0) {
+		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
+		$attendees = new ConferenceOrBoothAttendee($db);
+		$result = $attendees->fetchAll('', '', 0, 0, '(t.fk_project:=:' . ((int) $object->id) . ')');
+		if (!is_array($result) && $result < 0) {
 			setEventMessages($attendees->error, $attendees->errors, 'errors');
 		} else {
 			$nbAttendees = count($result);
@@ -174,7 +175,7 @@ function conferenceorboothProjectPrepareHead($object)
 		dol_setcache($cachekey, $nbAttendees, 120);	// If setting cache fails, this is not a problem, so we do not test result.
 	}
 	if ($nbAttendees > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbAttendees.'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbAttendees . '</span>';
 	}
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'conferenceorboothproject@eventorganization');
@@ -200,7 +201,7 @@ function conferenceorboothAttendeePrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/eventorganization/conferenceorboothattendee_card.php?id=".((int) $object->id).($object->fk_actioncomm > 0 ? '&conforboothid='.((int) $object->fk_actioncomm) : '').($object->fk_project > 0 ? '&withproject=1&fk_project='.((int) $object->fk_project) : '');
+	$head[$h][0] = DOL_URL_ROOT . "/eventorganization/conferenceorboothattendee_card.php?id=" . ((int) $object->id) . ($object->fk_actioncomm > 0 ? '&conforboothid=' . ((int) $object->fk_actioncomm) : '') . ($object->fk_project > 0 ? '&withproject=1&fk_project=' . ((int) $object->fk_project) : '');
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index b0064f2a62c..3ec3fda1f0e 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2023 Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,10 @@ class PaymentLoan extends CommonObject
 	 */
 	public $datep = '';
 
-	public $amounts = array(); // Array of amounts
+	/**
+	 * @var array Array of amounts
+	 */
+	public $amounts = array();
 
 	public $amount_capital; // Total amount of payment
 
diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 17000dd0207..afb2a33d7df 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -1,7 +1,24 @@
 <?php
+/* Copyright (C) 2019	Laurent Destailleur (eldy)	<eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/mrp/ajax/interface.php
+ *	\brief      Ajax search component for Mrp.
  */
 
 if (!defined('NOREQUIRESOC')) {
diff --git a/htdocs/mrp/lib/mrp.lib.php b/htdocs/mrp/lib/mrp.lib.php
index c650c4dd02b..20840d40e1b 100644
--- a/htdocs/mrp/lib/mrp.lib.php
+++ b/htdocs/mrp/lib/mrp.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    mrp/lib/mrp.lib.php
+ * \file    htdocs/mrp/lib/mrp.lib.php
  * \ingroup mrp
  * \brief   Library files with common functions for Mrp
  */
@@ -38,21 +39,21 @@ function mrpAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/admin/mrp.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/admin/mrp.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/admin/mrp_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/admin/mrp_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$nbExtrafields = $extrafields->attributes['mrp_mo']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
 	}
 	$head[$h][2] = 'mrp_extrafields';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/admin/mrp_production_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/admin/mrp_production_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
 	$head[$h][2] = 'mrp_production_extrafields';
 	$h++;
diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php
index f78f5da9166..63f39445e91 100644
--- a/htdocs/mrp/lib/mrp_mo.lib.php
+++ b/htdocs/mrp/lib/mrp_mo.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,26 +37,26 @@ function moPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/mrp/mo_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("ManufacturingOrder");
 	$head[$h][2] = 'card';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_production.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/mrp/mo_production.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Production");
 	$arrayproduced = $object->fetchLinesLinked('produced', 0);
 	$nbProduced = 0;
 	foreach ($arrayproduced as $lineproduced) {
 		$nbProduced += $lineproduced['qty'];
 	}
-	$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbProduced.' / '.$object->qty.'</span>';
+	$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbProduced . ' / ' . $object->qty . '</span>';
 	$head[$h][2] = 'production';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/mrp/mo_movements.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/mrp/mo_movements.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("StockMovements");
 	$nbMove = $object->countMovements();
-	$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbMove.'</span>';
+	$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbMove . '</span>';
 	$head[$h][2] = 'stockmovement';
 	$h++;
 
@@ -67,29 +68,29 @@ function moPrepareHead($object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = dol_buildpath('/mrp/mo_note.php', 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/mrp/mo_note.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->mrp->dir_output."/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+	$upload_dir = $conf->mrp->dir_output . "/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/mrp/mo_document.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/mrp/mo_document.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/mrp/mo_agenda.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/mrp/mo_agenda.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 86f8778e799..d4c87b7015e 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/mrp/class/mo.class.php');
-dol_include_once('/mrp/lib/mrp_mo.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
 
 
 // Load translation files required by the page
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index c8f09b37a9b..6afe0f35686 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- *  \file       mo_document.php
+ *  \file       htdocs/mrp/mo_document.php
  *  \ingroup    mrp
  *  \brief      Tab for documents linked to Mo
  */
@@ -30,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-dol_include_once('/mrp/class/mo.class.php');
-dol_include_once('/mrp/lib/mrp_mo.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "companies", "other", "mails"));
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index deb9d39a97a..b5395b9b04b 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Ferran Marcet <fmarcet@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,8 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
-dol_include_once('/mrp/class/mo.class.php');
-dol_include_once('/mrp/lib/mrp_mo.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "stocks", "other"));
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 19b630aaf53..9d24201da2e 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +27,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-dol_include_once('/mrp/class/mo.class.php');
-dol_include_once('/mrp/lib/mrp_mo.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "companies"));
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 11e6ce992ce..c13813c342f 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2019-2020 	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 		Christian Humpel     <christian.humpel@gmail.com>
  * Copyright (C) 2023 		Vincent de Grandpré  <vincent@de-grandpre.quebec>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,7 +97,7 @@ $result = restrictedArea($user, 'mrp', $object->id, 'mrp_mo', '', 'fk_soc', 'row
 $permissionnote = $user->hasRight('mrp', 'write'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->hasRight('mrp', 'write'); // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->hasRight('mrp', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissiontodelete = $user->hasRight('mrp', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 
 $permissiontoproduce = $permissiontoadd;
 $permissiontoupdatecost = $user->hasRight('bom', 'read'); // User who can define cost must have knowledge of pricing
diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php
index ec8f7b80987..f5822e20a16 100644
--- a/htdocs/partnership/lib/partnership.lib.php
+++ b/htdocs/partnership/lib/partnership.lib.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2021 Dorian Laurent <i.merraha@sofimedmaroc.com>
+/* Copyright (C) 2021       Dorian Laurent              <i.merraha@sofimedmaroc.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    partnership/lib/partnership.lib.php
+ * \file    htdocs/partnership/lib/partnership.lib.php
  * \ingroup partnership
  * \brief   Library files with common functions for Partnership
  */
@@ -38,22 +39,22 @@ function partnershipAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/partnership/admin/setup.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/partnership/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
 
-	$head[$h][0] = dol_buildpath("/partnership/admin/partnership_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/partnership/admin/partnership_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$nbExtrafields = $extrafields->attributes['partnership']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
 	}
 	$head[$h][2] = 'partnership_extrafields';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/partnership/admin/website.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/partnership/admin/website.php';
 	$head[$h][1] = $langs->trans("BlankSubscriptionForm");
 	$head[$h][2] = 'website';
 	$h++;
@@ -88,7 +89,7 @@ function partnershipPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/partnership/partnership_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -101,29 +102,29 @@ function partnershipPrepareHead($object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = dol_buildpath('/partnership/partnership_note.php', 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_note.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->partnership->dir_output."/partnership/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+	$upload_dir = $conf->partnership->dir_output . "/partnership/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/partnership/partnership_document.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_document.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/partnership/partnership_agenda.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_agenda.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 722af2e74b2..2d664de7376 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -70,6 +70,11 @@ class Product extends CommonObject
 	 */
 	public $fk_element = 'fk_product';
 
+	/**
+	 * @var Product
+	 */
+	public $oldcopy;
+
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
@@ -290,7 +295,7 @@ class Product extends CommonObject
 	public $duration;
 
 	/**
-	 * Service Workstation
+	 * @var int Service Workstation
 	 */
 	public $fk_default_workstation;
 
@@ -487,6 +492,10 @@ class Product extends CommonObject
 	public $fourn_qty;
 	public $fourn_pu;
 	public $fourn_price_base_type;
+
+	/**
+	 * @var int ID
+	 */
 	public $fourn_socid;
 
 	/**
@@ -529,7 +538,7 @@ class Product extends CommonObject
 	public $sousprods;
 
 	/**
-	 * Path of subproducts. Build from ->sousprods with get_arbo_each_prod()
+	 * @var array Path of subproducts. Build from ->sousprods with get_arbo_each_prod()
 	 */
 	public $res;
 
diff --git a/htdocs/recruitment/lib/recruitment.lib.php b/htdocs/recruitment/lib/recruitment.lib.php
index 911c6abdb03..97690d73ea7 100644
--- a/htdocs/recruitment/lib/recruitment.lib.php
+++ b/htdocs/recruitment/lib/recruitment.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2019   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2022   Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    recruitment/lib/recruitment.lib.php
+ * \file    htdocs/recruitment/lib/recruitment.lib.php
  * \ingroup recruitment
  * \brief   Library files with common functions for Recruitment
  */
@@ -40,35 +40,35 @@ function recruitmentAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/recruitment/admin/setup.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/setup.php';
 	$head[$h][1] = $langs->trans("JobPositions");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/admin/setup_candidatures.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/setup_candidatures.php';
 	$head[$h][1] = $langs->trans("RecruitmentCandidatures");
 	$head[$h][2] = 'settings_candidatures';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/admin/public_interface.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/public_interface.php';
 	$head[$h][1] = $langs->trans("PublicUrl");
 	$head[$h][2] = 'publicurl';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/admin/jobposition_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/jobposition_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtrafieldsJobPosition");
 	$nbExtrafields = $extrafields->attributes['recruitment_recruitmentjobposition']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
 	}
 	$head[$h][2] = 'jobposition_extrafields';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/admin/candidature_extrafields.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/candidature_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtrafieldsApplication");
 	$nbExtrafields = $extrafields->attributes['recruitment_recruitmentcandidature']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
 	}
 	$head[$h][2] = 'candidature_extrafields';
 	$h++;
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php
index c4ad141bca6..d6a0de449dc 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,13 +37,13 @@ function recruitmentCandidaturePrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentcandidature_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("RecruitmentCandidature");
 	$head[$h][2] = 'card';
 	$h++;
 
 	//  if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-	//      $head[$h][0] = dol_buildpath("/recruitment/recruitmentrating_card.php", 1).'?id='.$object->id;
+	//      $head[$h][0] = DOL_URL_ROOT.'/recruitment/recruitmentrating_card.php?id='.$object->id;
 	//      $head[$h][1] = $langs->trans("Rating");
 	//      $head[$h][2] = 'rating';
 	//      $h++;
@@ -56,29 +57,29 @@ function recruitmentCandidaturePrepareHead($object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = dol_buildpath('/recruitment/recruitmentcandidature_note.php', 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentcandidature_note.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->recruitment->dir_output."/recruitmentcandidature/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+	$upload_dir = $conf->recruitment->dir_output . "/recruitmentcandidature/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_document.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentcandidature_document.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_agenda.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentcandidature_agenda.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index a269bc61683..8fafb1c3fdc 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,21 +37,21 @@ function recruitmentjobpositionPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentjobposition_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("PositionToBeFilled");
 	$head[$h][2] = 'card';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_list.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentcandidature_list.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("RecruitmentCandidatures");
-	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature WHERE fk_recruitmentjobposition = ".((int) $object->id);
+	$sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "recruitment_recruitmentcandidature WHERE fk_recruitmentjobposition = " . ((int) $object->id);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		if ($obj) {
 			$nCandidature = $obj->nb;
 			if ($nCandidature > 0) {
-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nCandidature.'</span>';
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nCandidature . '</span>';
 			}
 		}
 	} else {
@@ -67,29 +68,29 @@ function recruitmentjobpositionPrepareHead($object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = dol_buildpath('/recruitment/recruitmentjobposition_note.php', 1).'?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentjobposition_note.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->recruitment->dir_output."/recruitmentjobposition/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+	$upload_dir = $conf->recruitment->dir_output . "/recruitmentjobposition/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_document.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentjobposition_document.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_agenda.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/recruitment/recruitmentjobposition_agenda.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
@@ -126,8 +127,8 @@ function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
 	$out = '';
 
 	// 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
+	$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
 
 	$urltouse = DOL_MAIN_URL_ROOT;
@@ -135,7 +136,7 @@ function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
 		$urltouse = $urlwithroot;
 	}
 
-	$out = $urltouse.'/public/recruitment/view.php?ref='.($mode ? '<span style="color: #666666">' : '').$ref.($mode ? '</span>' : '');
+	$out = $urltouse . '/public/recruitment/view.php?ref=' . ($mode ? '<span style="color: #666666">' : '') . $ref . ($mode ? '</span>' : '');
 	/*if (!empty($conf->global->RECRUITMENT_SECURITY_TOKEN))
 	{
 		if (empty($conf->global->RECRUITMENT_SECURITY_TOKEN)) $out .= '&securekey='.urlencode($conf->global->RECRUITMENT_SECURITY_TOKEN);
@@ -144,7 +145,7 @@ function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
 
 	// For multicompany
 	if (!empty($out) && isModEnabled('multicompany')) {
-		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+		$out .= "&entity=" . $conf->entity; // Check the entity because we may have the same reference in several entities
 	}
 
 	return $out;
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index b1fad2a4be8..9c858eb6da2 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +31,14 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
  */
 class Client extends Societe
 {
-	public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
+	/**
+	 * @var string Used to add a filter in Form::showrefnav method
+	 */
+	public $next_prev_filter = "te.client in (1,2,3)";
 
+	/**
+	 * @var array
+	 */
 	public $cacheprospectstatus = array();
 
 
diff --git a/htdocs/theme/eldy/flags-sprite.inc.php b/htdocs/theme/eldy/flags-sprite.inc.php
index 56300e37e3f..274235f844a 100644
--- a/htdocs/theme/eldy/flags-sprite.inc.php
+++ b/htdocs/theme/eldy/flags-sprite.inc.php
@@ -1,6 +1,28 @@
 <?php
+/*
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/theme/eldy/flag-sprite.inc.php
+ *		\brief      File for CSS style sheet Eldy
+ */
 if (!defined('ISLOADEDBYSTEELSHEET')) {
-	die('Must be call by steelsheet');
+	die('Must be call by stylesheet');
 } ?>
 /* <style type="text/css" > don't remove this line it's an ide hack */
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 7b3cd0697cb..3c87a03153a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1,4 +1,26 @@
 <?php
+/*
+/* Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/theme/eldy/global.inc.php
+ *		\brief      File for CSS style sheet Eldy
+ */
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 }
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 521f6785b7f..04e6d0185cc 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -1,6 +1,30 @@
-<?php if (!defined('ISLOADEDBYSTEELSHEET')) {
-	die('Must be call by steelsheet');
-} ?>
+<?php
+/*
+/* Copyright (C) 2004-2017	Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/theme/eldy/global.inc.php
+ *		\brief      File for CSS style sheet Eldy
+ */
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by stylesheet');
+}
+?>
 /* <style type="text/css" > */
 
 .mainmenu::before{
diff --git a/htdocs/webhook/lib/webhook.lib.php b/htdocs/webhook/lib/webhook.lib.php
index cf63ecd234f..338361785a1 100644
--- a/htdocs/webhook/lib/webhook.lib.php
+++ b/htdocs/webhook/lib/webhook.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    webhook/lib/webhook.lib.php
+ * \file    htdocs/webhook/lib/webhook.lib.php
  * \ingroup webhook
  * \brief   Library files with common functions for Webhook
  */
@@ -32,12 +33,12 @@ function webhookAdminPrepareHead()
 
 	$h = 0;
 	$head = array();
-	$head[$h][0] = dol_buildpath("/admin/webhook.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/admin/webhook.php';
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/webhook/target_list.php?mode=modulesetup", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/webhook/target_list.php?mode=modulesetup';
 	$head[$h][1] = $langs->trans("Targets");
 	$head[$h][2] = 'targets';
 	$h++;
diff --git a/htdocs/webhook/lib/webhook_target.lib.php b/htdocs/webhook/lib/webhook_target.lib.php
index da342da0065..687b16e42f6 100644
--- a/htdocs/webhook/lib/webhook_target.lib.php
+++ b/htdocs/webhook/lib/webhook_target.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2022 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    lib/webhook_target.lib.php
+ * \file    htdocs/webhook/lib/webhook_target.lib.php
  * \ingroup webhook
  * \brief   Library files with common functions for Target
  */
@@ -24,7 +25,7 @@
  * Prepare array of tabs for Target
  *
  * @param	Target	$object		Target
- * @return 	array					Array of tabs
+ * @return 	array				Returns an array of tabs
  */
 function targetPrepareHead($object)
 {
@@ -33,7 +34,7 @@ function targetPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/webhook/target_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/webhook/target_card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
diff --git a/htdocs/webportal/lib/webportal.lib.php b/htdocs/webportal/lib/webportal.lib.php
index ca95ad67bbe..97feb78f06a 100644
--- a/htdocs/webportal/lib/webportal.lib.php
+++ b/htdocs/webportal/lib/webportal.lib.php
@@ -41,17 +41,17 @@ function webportalAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/webportal/admin/setup.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '"/webportal/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/webportal/admin/setup_theme.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/webportal/admin/setup_theme.php';
 	$head[$h][1] = $langs->trans("SkinAndColors");
 	$head[$h][2] = 'themesettings';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/webportal/admin/configcss.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/webportal/admin/configcss.php';
 	$head[$h][1] = $langs->trans("CSSPage");
 	$head[$h][2] = 'css';
 	$h++;
diff --git a/htdocs/website/lib/websiteaccount.lib.php b/htdocs/website/lib/websiteaccount.lib.php
index bf229dd650d..10053cde001 100644
--- a/htdocs/website/lib/websiteaccount.lib.php
+++ b/htdocs/website/lib/websiteaccount.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,13 +35,12 @@ function websiteaccountPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/website/websiteaccount_card.php", 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/website/websiteaccount_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("WebsiteAccount");
 	$head[$h][2] = 'card';
 	$h++;
 
-	/*if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	/*if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
 		if(!empty($object->fields['note_private'])) $nbNote++;
 		if(!empty($object->fields['note_public'])) $nbNote++;
diff --git a/htdocs/zapier/lib/zapier.lib.php b/htdocs/zapier/lib/zapier.lib.php
index 6d13fcb5d12..e04e048949d 100644
--- a/htdocs/zapier/lib/zapier.lib.php
+++ b/htdocs/zapier/lib/zapier.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.fr>
+/* Copyright (C) 2019-2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file    zapier/lib/zapier.lib.php
+ * \file    htdocs/zapier/lib/zapier.lib.php
  * \ingroup zapier
  * \brief   Library files with common functions for ZapierForDolibarr
  */
@@ -24,7 +24,7 @@
 /**
  * Prepare admin pages header
  *
- * @return array		Array with list of tab entries
+ * @return array		Returns an array with list of tab entries
  */
 function zapierAdminPrepareHead()
 {
@@ -33,11 +33,11 @@ function zapierAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/zapier/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
-	$head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
+	$head[$h][0] = DOL_URL_ROOT . '/zapier/admin/about.php';
 	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'about';
 	$h++;

From 27f88b3ad5c719cdec62827575a538b6f05c37e2 Mon Sep 17 00:00:00 2001
From: Sylvain Legrand <sylvain.legrand@infras.fr>
Date: Thu, 7 Mar 2024 16:57:53 +0100
Subject: [PATCH 0524/1862] Fix error using
 MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE (#28662)

With PHP 8.1 an error occurs when editing the first line of a document
---
 htdocs/core/tpl/objectline_edit.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index aacf0be0b0d..3dc3b059e8c 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -359,7 +359,7 @@ $coldisplay++;
 	<td colspan="<?php echo $coldisplay - (!getDolGlobalString('MAIN_VIEW_LINE_NUMBER') ? 0 : 1) ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
 	$prefillDates = false;
-	if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines)) {
+	if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines) && $i > 0) {
 		for ($j = $i - 1; $j >= 0; $j--) {
 			$lastline = $object->lines[$j];
 			if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end))) {

From f1c7b5729feca617be8b4fe442887ecd240a9134 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 7 Mar 2024 17:01:36 +0100
Subject: [PATCH 0525/1862] Fix resource list (#28661)

* Move sql SELECT request to list

* Refactored list. Added mass actions. Added contributor details.

* Added dolresource delete

* Cleaned code
---
 htdocs/core/actions_massactions.inc.php |   3 +
 htdocs/resource/list.php                | 377 +++++++++++++++---------
 2 files changed, 240 insertions(+), 140 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 651b48e40a4..d706b15146a 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1091,6 +1091,9 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			} elseif ($objecttmp->element == 'action') {
 				/** @var ActionComm $objecttmp */
 				$result = $objecttmp->delete();	// TODO Add User $user as first param
+			} elseif ($objecttmp->element == 'dolresource') {
+				/** @var Dolresource $objecttmp */
+				$result = $objecttmp->delete($objecttmp->id, 0);
 			} else {
 				$result = $objecttmp->delete($user);
 			}
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 585d643bd26..0f149263baa 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014  Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.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
@@ -31,37 +32,37 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 $langs->loadLangs(array("resource", "companies", "other"));
 
 // Get parameters
-$id             = GETPOSTINT('id');
-$action         = GETPOST('action', 'alpha');
-$massaction     = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$id				= GETPOSTINT('id');
+$action			= GETPOST('action', 'alpha');
+$massaction		= GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$confirm		= GETPOST('confirm', 'alpha');
+$toselect		= GETPOST('toselect', 'array');
+$contextpage	= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'interventionlist';
 
-$lineid         = GETPOSTINT('lineid');
-$element        = GETPOST('element', 'alpha');
-$element_id     = GETPOSTINT('element_id');
-$resource_id    = GETPOSTINT('resource_id');
+$lineid			= GETPOSTINT('lineid');
+$element		= GETPOST('element', 'alpha');
+$element_id		= GETPOSTINT('element_id');
+$resource_id	= GETPOSTINT('resource_id');
 
-$sortorder      = GETPOST('sortorder', 'aZ09comma');
-$sortfield      = GETPOST('sortfield', 'aZ09comma');
-$optioncss = GETPOST('optioncss', 'alpha');
+$sortorder		= GETPOST('sortorder', 'aZ09comma');
+$sortfield		= GETPOST('sortfield', 'aZ09comma');
+$optioncss		= GETPOST('optioncss', 'alpha');
 
 // Initialize context for list
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'resourcelist';
+$contextpage 	= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'resourcelist';
 
 // Initialize technical objects
 $object = new Dolresource($db);
 $extrafields = new ExtraFields($db);
 
-// fetch optionals attributes and labels
+// Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 if (!is_array($search_array_options)) {
 	$search_array_options = array();
 }
-$search_ref = GETPOST("search_ref", 'alpha');
-$search_type = GETPOST("search_type", 'alpha');
-
-// Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$search_ref 	= GETPOST("search_ref", 'alpha');
+$search_type 	= GETPOST("search_type", 'alpha');
 
 $filter = array();
 
@@ -73,12 +74,11 @@ if (empty($sortorder)) {
 if (empty($sortfield)) {
 	$sortfield = "t.ref";
 }
-if (empty($arch)) {
-	$arch = 0;
-}
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
-$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
+// Load variable for pagination
+$limit	= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+
+$page	= GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -102,21 +102,28 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on 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_ref = "";
 	$search_type = "";
+	$toselect = array();
 	$search_array_options = array();
-	$filter = array();
 }
 
-if (!$user->hasRight('resource', 'read')) {
+$permissiontoread = $user->hasRight('resource', 'read');
+$permissiontoadd = $user->hasRight('resource', 'write');
+$permissiontodelete = $user->hasRight('resource', 'delete');
+if (!$permissiontoread) {
 	accessforbidden();
 }
 
+// Mass actions
+$objectclass = 'Dolresource';
+$objectlabel = 'Resources';
+$uploaddir = $conf->resource->dir_output;
+include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 /*
  * Actions
@@ -136,21 +143,126 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-
 /*
  * View
  */
 
 $form = new Form($db);
+$objectstatic = new Dolresource($db);
 
-//$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
 $help_url = '';
 $title = $langs->trans('Resources');
-llxHeader('', $title, $help_url);
+$morejs = array();
+$morecss = array();
 
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-$sql = '';
+$sql = "SELECT";
+$sql .= " t.rowid,";
+$sql .= " t.entity,";
+$sql .= " t.ref,";
+$sql .= " t.address,";
+$sql .= " t.zip,";
+$sql .= " t.town,";
+$sql .= " t.fk_country,";
+$sql .= " t.fk_state,";
+$sql .= " t.description,";
+$sql .= " t.phone,";
+$sql .= " t.email,";
+$sql .= " t.max_users,";
+$sql .= " t.url,";
+$sql .= " t.fk_code_type_resource,";
+$sql .= " t.tms as date_modification,";
+$sql .= " t.datec as date_creation, ";
+$sql .= " ty.label as type_label ";
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+	}
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
+$sql .= " FROM ".MAIN_DB_PREFIX."resource as t";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= " WHERE t.entity IN (".getEntity('resource').")";
+if ($search_ref) {
+	$sql .= natural_search('t.ref', $search_ref);
+}
+if ($search_type) {
+	$sql .= natural_search('ty.label', $search_type);
+}
+
+// Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), 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);
+}
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+// Direct jump if only one record found
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/resource/card.php', 1).'?id='.$id);
+	exit;
+}
+
+// Output page
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
@@ -159,38 +271,29 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-
 if ($search_ref != '') {
 	$param .= '&search_ref='.urlencode($search_ref);
-	$filter['t.ref'] = $search_ref;
 }
 if ($search_type != '') {
 	$param .= '&search_type='.urlencode($search_type);
-	$filter['ty.label'] = $search_type;
-}
-
-// Including the previous script generate the correct SQL filter for all the extrafields
-// we are playing with the behaviour of the Dolresource::fetchAll() by generating a fake
-// extrafields filter key to make it works
-$filter['ef.resource'] = $sql;
-
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-	$param .= '&contextpage='.urlencode($contextpage);
 }
 
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-
-// Confirmation suppression resource line
-if ($action == 'delete_resource') {
-	print $form->formconfirm($_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id."&lineid=".$lineid, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResourceElement"), "confirm_delete_resource", '', '', 1);
+// List of mass actions available
+$arrayofmassactions = array();
+if (!empty($permissiontodelete)) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));
 
-
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -200,71 +303,58 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
-	$ret = $object->fetchAll('', '', 0, 0, $filter);
-	if ($ret == -1) {
-		dol_print_error($db, $object->error);
-		exit;
-	} else {
-		$nbtotalofrecords = $ret;
-	}
-}
+$newcardbutton = '';
+$url = DOL_URL_ROOT.'/resource/card.php?action=create';
 
-// Load object list
-$ret = $object->fetchAll($sortorder, $sortfield, $limit, $offset, $filter);
-if ($ret == -1) {
-	dol_print_error($db, $object->error);
-	exit;
-} else {
-	$newcardbutton = '';
-	if ($user->hasRight('resource', 'write')) {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
-	}
+$newcardbutton = dolGetButtonTitle($langs->trans('NewResource'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
-}
+print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-$moreforfilter = '';
+$objecttmp = new Dolresource($db);
+$trackid = 'int'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = ($form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'))); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable liste">'."\n";
+
+// Fields title search
 
 print '<tr class="liste_titre_filter">';
-// Action column
-if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-	print '</td>';
-}
 if (!empty($arrayfields['t.ref']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="6">';
+	print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="8">';
 	print '</td>';
 }
 if (!empty($arrayfields['ty.label']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_type" value="'.$search_type.'" size="6">';
+	print '<input type="text" class="flat" name="search_type" value="'.$search_type.'" size="8">';
 	print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 }
-print "</tr>\n";
+print '</tr>'."\n";
+
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
 
 print '<tr class="liste_titre">';
-// Action column
-if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-}
 if (!empty($arrayfields['t.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
 }
@@ -279,77 +369,84 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 print "</tr>\n";
 
+// Loop on record
 
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+	$objectstatic->id = $obj->rowid;
+	$objectstatic->ref = $obj->ref;
+	$objectstatic->type_label = $obj->type_label;
 
-if ($ret) {
-	foreach ($object->lines as $resource) {
-		print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 
-		// Action column
-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="center">';
-			print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
-			print img_edit();
-			print '</a>';
-			print '&nbsp;';
-			print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
-			print img_delete('', 'class="marginleftonly"');
-			print '</a>';
-			print '</td>';
-		}
-
-		if (!empty($arrayfields['t.ref']['checked'])) {
-			print '<td>';
-			print $resource->getNomUrl(5);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		if (!empty($arrayfields['ty.label']['checked'])) {
-			print '<td>';
-			print $resource->type_label;
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Extra fields
-		$obj = (object) $resource->array_options;
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-
-		// Action column
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<td class="center">';
-			print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
-			print img_edit();
-			print '</a>';
-			print '&nbsp;';
-			print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
-			print img_delete('', 'class="marginleftonly"');
-			print '</a>';
-			print '</td>';
-		}
+	if (!empty($arrayfields['t.ref']['checked'])) {
+		print '<td>';
+		print $objectstatic->getNomUrl(5);
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
-
-		print '</tr>';
 	}
-} else {
+
+	if (!empty($arrayfields['ty.label']['checked'])) {
+		print '<td>';
+		print $objectstatic->type_label;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+	// Action column
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
 	$colspan = 1;
 	foreach ($arrayfields as $key => $val) {
 		if (!empty($val['checked'])) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
-print '</table>';
-print "</form>\n";
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+print '</form>'."\n";
 
 // End of page
 llxFooter();

From e6b2756c191cd463240b3054efdaeec96c1dc10f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 17:58:02 +0100
Subject: [PATCH 0526/1862] QUAL The signature for all ->delete() method has
 been modified to match the modulebuilder template (so first param is now
 always $user), except   the delete for thirdparty (still accept the id of
 thirdparty to delete as first parameter). Will probably be modified into
 another version.

---
 ChangeLog                                         |  3 +++
 htdocs/accountancy/admin/fiscalyear_card.php      |  2 +-
 htdocs/adherents/card.php                         |  2 +-
 htdocs/adherents/class/adherent.class.php         |  7 ++-----
 htdocs/adherents/class/api_members.class.php      |  2 +-
 htdocs/comm/action/card.php                       |  2 +-
 htdocs/comm/action/class/actioncomm.class.php     |  6 ++----
 htdocs/compta/facture/card.php                    |  2 +-
 htdocs/compta/paiement/card.php                   |  2 +-
 htdocs/compta/paiement/class/paiement.class.php   |  6 ++----
 htdocs/core/actions_massactions.inc.php           | 10 +---------
 htdocs/core/class/fiscalyear.class.php            |  8 ++++----
 htdocs/datapolicy/class/datapolicycron.class.php  |  6 +-----
 htdocs/expedition/class/expedition.class.php      | 15 ++++++++++-----
 htdocs/fourn/class/fournisseur.commande.class.php |  1 +
 htdocs/fourn/class/paiementfourn.class.php        | 10 ++++++----
 htdocs/fourn/facture/card.php                     |  2 +-
 htdocs/fourn/paiement/card.php                    |  2 +-
 htdocs/hrm/class/establishment.class.php          |  6 ++++--
 htdocs/hrm/establishment/card.php                 |  2 +-
 htdocs/intracommreport/card.php                   |  2 +-
 .../class/intracommreport.class.php               |  3 +--
 htdocs/resource/card.php                          |  2 +-
 htdocs/resource/class/dolresource.class.php       |  7 ++++---
 htdocs/societe/class/societe.class.php            |  2 +-
 htdocs/societe/paymentmodes.php                   |  5 +++--
 htdocs/ticket/class/api_tickets.class.php         |  2 +-
 htdocs/ticket/class/ticket.class.php              |  1 -
 28 files changed, 57 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66fc896615a..1a123336552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@ The following changes may create regressions for some external modules, but were
   cross platform compatibility. On linux the exit(-1) was caught as 255, it may be now exit(1) so will be caught as 1.
 * the parameter $filter of method fetchAll does not accept array of SQL but must be a string of an Universal Search Filter syntax.
 * Use of dol_eval with parameter $returnvalue=0 is deprecated.
+* The signature for all ->delete() method has been modified to match the modulebuilder template (so first paramis now always $user), except
+  the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
+
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index e6408d33ab6..70eb459efda 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -95,7 +95,7 @@ if ($reshook < 0) {
 }
 
 if ($action == 'confirm_delete' && $confirm == "yes") {
-	$result = $object->delete($id);
+	$result = $object->delete($user);
 	if ($result >= 0) {
 		header("Location: fiscalyear.php");
 		exit();
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 151859f52d7..98b92264ceb 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -625,7 +625,7 @@ if (empty($reshook)) {
 	}
 
 	if ($user->hasRight('adherent', 'supprimer') && $action == 'confirm_delete' && $confirm == 'yes') {
-		$result = $object->delete($id, $user);
+		$result = $object->delete($user);
 		if ($result > 0) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'errors');
 			if (!empty($backtopage) && !preg_match('/'.preg_quote($_SERVER["PHP_SELF"], '/').'/', $backtopage)) {
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 85087330092..531c089e1f1 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1061,21 +1061,18 @@ class Adherent extends CommonObject
 	/**
 	 *  Fonction to delete a member and its data
 	 *
-	 *  @param	int		$rowid		Id of member to delete
 	 *	@param	User	$user		User object
 	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return	int					Return integer <0 if KO, 0=nothing to do, >0 if OK
 	 */
-	public function delete($rowid, $user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		$result = 0;
 		$error = 0;
 		$errorflag = 0;
 
 		// Check parameters
-		if (empty($rowid)) {
-			$rowid = $this->id;
-		}
+		$rowid = $this->id;
 
 		$this->db->begin();
 
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index d551f6b5af9..6d03c1470b5 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -406,7 +406,7 @@ class Members extends DolibarrApi
 		}
 
 
-		$res = $member->delete($member->id, DolibarrApiAccess::$user);
+		$res = $member->delete(DolibarrApiAccess::$user);
 		if ($res < 0) {
 			throw new RestException(500, "Can't delete, error occurs");
 		}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 5c3a365d883..08a7c49a443 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1051,7 +1051,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
 
 	if ($user->hasRight('agenda', 'myactions', 'delete')
 		|| $user->hasRight('agenda', 'allactions', 'delete')) {
-		$result = $object->delete();
+		$result = $object->delete($user);
 
 		if ($result >= 0) {
 			header("Location: index.php");
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index d8c8694ede9..a716a92d884 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1022,15 +1022,13 @@ class ActionComm extends CommonObject
 
 	/**
 	 *    Delete event from database
-	 *    @TODO Add User $user as first param
 	 *
+	 *    @param	User	$user			User making the delete
 	 *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
 	 *    @return   int 					Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
-		global $user;
-
 		$error = 0;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ca53310fb71..6b8745332b8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1009,7 +1009,7 @@ if (empty($reshook)) {
 			$paiement = new Paiement($db);
 			$result = $paiement->fetch(GETPOSTINT('paiement_id'));
 			if ($result > 0) {
-				$result = $paiement->delete(); // If fetch ok and found
+				$result = $paiement->delete($user); // If fetch ok and found
 				if ($result >= 0) {
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 					exit;
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 23112324c96..34b08386bca 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -120,7 +120,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('facture', 'paiement')) {
 		$db->begin();
 
-		$result = $object->delete();
+		$result = $object->delete($user);
 		if ($result > 0) {
 			$db->commit();
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 54768afbba2..0594855dce2 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -594,15 +594,13 @@ class Paiement extends CommonObject
 	 * Delete a payment and generated links into account
 	 *  - Si le paiement porte sur un ecriture compte qui est rapprochee, on refuse
 	 *  - Si le paiement porte sur au moins une facture a "payee", on refuse
-	 * @TODO Add first param User $user
 	 *
+	 * @param	User	$user			User making the deletion
 	 * @param	int		$notrigger		No trigger
 	 * @return 	int     				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
-		global $user;
-
 		$error = 0;
 
 		$bank_line_id = $this->bank_line;
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index d706b15146a..1acea501327 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1084,16 +1084,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 			if ($objecttmp->element == 'societe') {
 				/** @var Societe $objecttmp */
+				// TODO Change signature of delete for Societe
 				$result = $objecttmp->delete($objecttmp->id, $user, 1);
-			} elseif ($objecttmp->element == 'member') {
-				/** @var Adherent $objecttmp */
-				$result = $objecttmp->delete($objecttmp->id, $user, 0);
-			} elseif ($objecttmp->element == 'action') {
-				/** @var ActionComm $objecttmp */
-				$result = $objecttmp->delete();	// TODO Add User $user as first param
-			} elseif ($objecttmp->element == 'dolresource') {
-				/** @var Dolresource $objecttmp */
-				$result = $objecttmp->delete($objecttmp->id, 0);
 			} else {
 				$result = $objecttmp->delete($user);
 			}
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 7d617e1ecb3..c1592b01db3 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -254,16 +254,16 @@ class Fiscalyear extends CommonObject
 	/**
 	 *	Delete record
 	 *
-	 *	@param	int		$id		Id of record to delete
+	 *	@param	User	$user	User that delete
 	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($id)
+	public function delete($user)
 	{
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".$this->db->prefix()."accounting_fiscalyear WHERE rowid = ".((int) $id);
+		$sql = "DELETE FROM ".$this->db->prefix()."accounting_fiscalyear";
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$this->db->commit();
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index d83e4534acd..943c2e57956 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -501,11 +501,7 @@ class DataPolicyCron
 						}
 
 						if ($action == 'delete') {									// If object to clean is not used
-							if ($object->element == 'adherent') {
-								$result = $object->delete($obj->rowid, $user);
-							} else {
-								$result = $object->delete($user);
-							}
+							$result = $object->delete($user);
 							if ($result < 0) {
 								$errormsg = $object->error;
 								$error++;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 4704baf9bb3..1079f834024 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1376,13 +1376,18 @@ class Expedition extends CommonObject
 	 * 	Delete shipment.
 	 * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
 	 *
-	 *  @param  int  $notrigger 			Disable triggers
-	 *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
-	 * 	@return	int							>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
+	 *  @param	User	$user					User making the deletion
+	 *  @param  int  	$notrigger 				Disable triggers
+	 *  @param  bool 	$also_update_stock  	true if the stock should be increased back (false by default)
+	 * 	@return	int								>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
-	public function delete($notrigger = 0, $also_update_stock = false)
+	public function delete($user = null, $notrigger = 0, $also_update_stock = false)
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs;
+
+		if (empty($user)) {
+			global $user;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 32b4d27d4c8..b2a5140c9e1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -4158,6 +4158,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	/**
 	 * 	Delete line in database
 	 *
+	 *  @param		User	$user		User making the change
 	 *	@param      int     $notrigger  1=Disable call to triggers
 	 *	@return     int                 Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 132af79c05f..c01feb22892 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -428,13 +428,15 @@ class PaiementFourn extends Paiement
 	 *	Si le paiement porte sur un ecriture compte qui est rapprochee, on refuse
 	 *	Si le paiement porte sur au moins une facture a "payee", on refuse
 	 *	@TODO Add User $user as first param
-	 *
+	 *  @param		User	$user			User making the deletion
 	 *	@param		int		$notrigger		No trigger
-	 *	@return     int     Return integer <0 si ko, >0 si ok
+	 *	@return     int     				Return integer <0 si ko, >0 si ok
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user = null, $notrigger = 0)
 	{
-		global $user;
+		if (empty($user)) {
+			global $user;
+		}
 
 		$bank_line_id = $this->bank_line;
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2210f2c1493..8365a92f7f8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -747,7 +747,7 @@ if (empty($reshook)) {
 			$paiementfourn = new PaiementFourn($db);
 			$result = $paiementfourn->fetch(GETPOST('paiement_id'));
 			if ($result > 0) {
-				$result = $paiementfourn->delete();
+				$result = $paiementfourn->delete($user);
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 					exit;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index d4ad615ee18..0987ec11c6f 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -90,7 +90,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight("fournis
 	$db->begin();
 
 	$object->fetch($id);
-	$result = $object->delete();
+	$result = $object->delete($user);
 	if ($result > 0) {
 		$db->commit();
 		header('Location: '.DOL_URL_ROOT.'/fourn/paiement/list.php');
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 6825247be89..8acbb128987 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -326,16 +326,18 @@ class Establishment extends CommonObject
 	/**
 	 *	Delete record
 	 *
+	 *  @param	User	$user	User making the change
 	 *	@param	int		$id		Id of record to delete
 	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($id)
+	public function delete($user)
 	{
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."establishment WHERE rowid = ".((int) $id);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."establishment WHERE rowid = ".((int) $user->id);
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
 		$result = $this->db->query($sql);
 		if ($result) {
 			$this->db->commit();
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index d9b0900e5bc..c2168814a8d 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -75,7 +75,7 @@ if (empty($permissiontoread)) {
  */
 
 if ($action == 'confirm_delete' && $confirm == "yes") {
-	$result = $object->delete($id);
+	$result = $object->delete($user);
 	if ($result >= 0) {
 		header("Location: ../admin/admin_establishment.php");
 		exit;
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 50a1fdb9a84..4bfd8068589 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -108,7 +108,7 @@ if ($reshook < 0) {
 }
 
 if ($permissiontodelete && $action == 'confirm_delete' && $confirm == 'yes') {
-	$result = $object->delete($id, $user);
+	$result = $object->delete($user);
 	if ($result > 0) {
 		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index aa6007eb227..3cbfd839537 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -134,12 +134,11 @@ class IntracommReport extends CommonObject
 	/**
 	 * Function delete
 	 *
-	 * @param 	int 	$id 		object ID
 	 * @param 	User 	$user 		User
 	 * @param 	int 	$notrigger 	notrigger
 	 * @return 	int
 	 */
-	public function delete($id, $user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		return 1;
 	}
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 39b5dcaf845..6b2063fe5a6 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -195,7 +195,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_delete_resource' && $user->hasRight('resource', 'delete') && $confirm === 'yes') {
 		$res = $object->fetch($id);
 		if ($res > 0) {
-			$result = $object->delete($id);
+			$result = $object->delete($user);
 
 			if ($result >= 0) {
 				setEventMessages($langs->trans('RessourceSuccessfullyDeleted'), null);
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 7463e565d40..2a40c0406c5 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -520,13 +520,14 @@ class Dolresource extends CommonObject
 	/**
 	 * Delete a resource object
 	 *
-	 * @param	int		$rowid			Id of resource line to delete
+	 * @param	User	$user			User making the change
 	 * @param	int		$notrigger		Disable all triggers
 	 * @return	int						if OK: >0 || if KO: <0
 	 */
-	public function delete(int $rowid, int $notrigger = 0)
+	public function delete(User $user, int $notrigger = 0)
 	{
-		global $user, $conf;
+		global $conf;
+
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error = 0;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4c8ffc7e701..e326da3ab45 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2111,7 +2111,7 @@ class Societe extends CommonObject
 	 */
 	public function delete($id, User $fuser = null, $call_trigger = 1)
 	{
-		global $langs, $conf, $user;
+		global $conf, $user;
 
 		if (empty($fuser)) {
 			$fuser = $user;
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 665a76d03da..530dfd986b7 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -806,7 +806,7 @@ if (empty($reshook)) {
 							$sql .= " WHERE sr.stripe_card_ref = '".$db->escape($source)."'";
 							$resql = $db->query($sql);
 						} else {
-							$card->delete();
+							$card->delete($user);
 						}
 					}
 				}
@@ -836,9 +836,10 @@ if (empty($reshook)) {
 							$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib as sr ";
 							$sql .= " SET stripe_card_ref = null";
 							$sql .= " WHERE sr.stripe_card_ref = '".$db->escape($source)."'";
+
 							$resql = $db->query($sql);
 						} else {
-							$card->delete();
+							$card->delete($user);
 						}
 					}
 				}
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 28e87fc428f..d89decb1ac7 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -410,7 +410,7 @@ class Tickets extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!$this->ticket->delete($id)) {
+		if (!$this->ticket->delete($user)) {
 			throw new RestException(500, 'Error when deleting ticket');
 		}
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 74c16a11c16..73d1d86ba48 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1133,7 +1133,6 @@ class Ticket extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();

From c66f7d634511dac21225c22b03e5c90c40ffa6da Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 18:20:18 +0100
Subject: [PATCH 0527/1862] qual: phpstan for
 htdocs/comm/action/class/ical.class.php (#28685)

htdocs/comm/action/class/ical.class.php	146	Property ICal::$file_text (string) does not accept null.
htdocs/comm/action/class/ical.class.php	171	Property ICal::$file_text (string) does not accept array|false.
---
 htdocs/comm/action/class/ical.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 20b34678a5d..258539a8cd8 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -143,7 +143,7 @@ class ICal
 		$this->cal = array(); // new empty array
 
 		$this->event_count = -1;
-		$this->file_text = null;
+		$this->file_text = '';
 
 		// Save file into a cache
 		if ($usecachefile) {
@@ -168,10 +168,10 @@ class ICal
 			}
 		}
 
-		$this->file_text = preg_split("[\n]", $this->file_text);
+		$file_text_array = preg_split("[\n]", $this->file_text);
 
 		// is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
-		if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) {
+		if (!stristr($file_text_array[0], 'BEGIN:VCALENDAR')) {
 			return 'error not VCALENDAR';
 		}
 
@@ -179,7 +179,7 @@ class ICal
 		$tmpkey = '';
 		$tmpvalue = '';
 		$type = '';
-		foreach ($this->file_text as $text) {
+		foreach ($file_text_array as $text) {
 			$text = trim($text); // trim one line
 			if (!empty($text)) {
 				// get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin

From 61e69b352b7bc955fa8ee3a94cb8b795c34d80c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 18:44:55 +0100
Subject: [PATCH 0528/1862] Doc

---
 dev/setup/pre-commit/README.md | 13 +++++++------
 htdocs/langs/en_US/admin.lang  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev/setup/pre-commit/README.md b/dev/setup/pre-commit/README.md
index 1f3740144c2..c5c35e81829 100644
--- a/dev/setup/pre-commit/README.md
+++ b/dev/setup/pre-commit/README.md
@@ -23,16 +23,17 @@ the project: `pre-commit-config.yaml`.
 
 ### Installation in your git project
 
-1. Install `pre-commit` tool.\
+1. Install pre-commit tool.\
    If you do not have python installed, install [python](https://www.python.org) first.\
    If you do not have [`pip`](https://pypi.org/project/pip), install that as well.\\
 
-   Then you can install pre-commit tool: `python -m pip install pre-commit`.
+   Then you can install pre-commit tool: 
+   `python3 -m pip install pre-commit`
 
-2. In your local git clone of the project, run `pre-commit install` to add the hooks.\
-   or copy the file git/hooks/pre-commit manually. (recommended because this file differs
-   from the file installed with pre-commit install as it redirects output to the error
-   channel so your IDE will be able to catch the error.
+2. In your local git clone of the project, run `pre-commit install` to add the hooks 
+   or copy the file *dev/setup/git/hooks/pre-commit* manually into *.git/hooks/pre-commit*
+   (recommended because this file may differ from the file installed with the pre-commit install).
+   The good file redirects output to the error channel so your IDE will be able to catch the error.
 
 
 ### Tips
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b7dd42c84e2..e632b93088a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -655,7 +655,7 @@ 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.
+Module2400Desc=Manage manual and automatic events. Provide a calendar to record events manually. Log also events automatically for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
 Module2430Name=Online appointment scheduling
 Module2430Desc=Provides an online appointment booking system. This allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=DMS / ECM

From 9b59445e39b75dd8771a18254b4f7eecda9baaa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 Mar 2024 18:48:50 +0100
Subject: [PATCH 0529/1862] fix unknown $user (#28687)

* fix unknown $user

* fix @param

* fix @param

* fix @param

* fix @param
---
 htdocs/fourn/class/fournisseur.commande.class.php | 11 +++++------
 htdocs/hrm/class/establishment.class.php          |  1 -
 htdocs/ticket/class/api_tickets.class.php         |  3 ++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b2a5140c9e1..13e43b59165 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2316,6 +2316,8 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function deleteLine($idline, $notrigger = 0)
 	{
+		global $user;
+
 		if ($this->statut == 0) {
 			$line = new CommandeFournisseurLigne($this->db);
 
@@ -2333,12 +2335,11 @@ class CommandeFournisseur extends CommonOrder
 				}
 			}
 
-			if ($line->delete($notrigger) > 0) {
+			if ($line->delete($user, $notrigger) > 0) {
 				$this->update_price(1);
 				return 1;
 			} else {
-				$this->error = $line->error;
-				$this->errors = $line->errors;
+				$this->setErrorsFromObject($line);
 				return -1;
 			}
 		} else {
@@ -4162,10 +4163,8 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 *	@param      int     $notrigger  1=Disable call to triggers
 	 *	@return     int                 Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
-		global $user;
-
 		$error = 0;
 
 		$this->db->begin();
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 8acbb128987..37ab22b84a9 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -327,7 +327,6 @@ class Establishment extends CommonObject
 	 *	Delete record
 	 *
 	 *  @param	User	$user	User making the change
-	 *	@param	int		$id		Id of record to delete
 	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index d89decb1ac7..a9ed23f8d61 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2016   Jean-François Ferry     <hello@librethic.io>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -410,7 +411,7 @@ class Tickets extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!$this->ticket->delete($user)) {
+		if (!$this->ticket->delete(DolibarrApiAccess::$user)) {
 			throw new RestException(500, 'Error when deleting ticket');
 		}
 

From 5f7192f475a49abe09e11db22219247d4f9b5d11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 18:51:20 +0100
Subject: [PATCH 0530/1862] Fix signature of delete method

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

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index f6f14fdf863..97497ced70a 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -359,13 +359,14 @@ class ConferenceOrBooth extends ActionComm
 	/**
 	 * Delete object in database
 	 *
-	 * @param 	int $notrigger  false=launch triggers after, true=disable triggers
-	 * @return 	int             Return integer <0 if KO, >0 if OK
+	 * @param	User	$user		User making the delete
+	 * @param 	int 	$notrigger  false=launch triggers after, true=disable triggers
+	 * @return 	int             	Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		//TODO delete attendees and subscription
-		return parent::delete($notrigger);
+		return parent::delete($user, $notrigger);
 	}
 
 	/**

From f396bf1218148d7c322dc63a8d3dbd5e8e7d3e6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 18:53:21 +0100
Subject: [PATCH 0531/1862] Fix compatibility

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b2a5140c9e1..10d946004fd 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -4162,9 +4162,11 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 *	@param      int     $notrigger  1=Disable call to triggers
 	 *	@return     int                 Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
-		global $user;
+		if (empty($user)) {
+			global $user;
+		}
 
 		$error = 0;
 

From c6333c77829ee2c6b708616a4356e559dc525bd6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 7 Mar 2024 18:57:18 +0100
Subject: [PATCH 0532/1862] Fix: Missing parameter (#28691)

# Fix: Missing parameter

dol_print_error was missing db parameter
---
 htdocs/compta/prelevement/create.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 930c01db9fe..8102984f3b2 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -258,7 +258,7 @@ if ($sourcetype != 'salary') {
 	$pricetowithdraw = $bprev->SommeAPrelever($type, 'salary');
 }
 if ($nb < 0) {
-	dol_print_error($bprev->error);
+	dol_print_error($db, $bprev->error);
 }
 print '<table class="border centpercent tableforfield">';
 
@@ -479,7 +479,7 @@ if ($resql) {
 	}
 	$title = $langs->trans("InvoiceWaitingWithdraw");
 	$picto = 'bill';
-	if ($type =='bank-transfer') {
+	if ($type == 'bank-transfer') {
 		if ($sourcetype != 'salary') {
 			$title = $langs->trans("InvoiceWaitingPaymentByBankTransfer");
 		} else {

From d79b3ba8ec33af9e498fff4cdefa0561a2ca7c19 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 18:57:38 +0100
Subject: [PATCH 0533/1862] qual: phpstan for
 htdocs/expedition/class/expedition.class.php (#28686)

htdocs/expedition/class/expedition.class.php	1245	Property CommonObject::$origin (CommonObject|string) does not accept null.
htdocs/expedition/class/expedition.class.php	1438	Property CommonObject::$origin (CommonObject|string) does not accept null.
---
 htdocs/expedition/class/expedition.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1079f834024..b9b21899b28 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1242,7 +1242,7 @@ class Expedition extends CommonObject
 
 					$mouvS = new MouvementStock($this->db);
 					// we do not log origin because it will be deleted
-					$mouvS->origin = null;
+					$mouvS->origin = '';
 					// get lot/serial
 					$lotArray = null;
 					if (isModEnabled('productbatch')) {
@@ -1440,7 +1440,7 @@ class Expedition extends CommonObject
 
 					$mouvS = new MouvementStock($this->db);
 					// we do not log origin because it will be deleted
-					$mouvS->origin = null;
+					$mouvS->origin = '';
 					// get lot/serial
 					$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
 					if (!is_array($lotArray)) {

From b55804841fda1c9a15d6b01b0a11a23a92ec0c91 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Thu, 7 Mar 2024 19:01:38 +0100
Subject: [PATCH 0534/1862] using note_public since note_private is not working
 (#28675)

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
---
 htdocs/adherents/subscription/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 6dba7fa0d93..ad1f0633c96 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -238,7 +238,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'edit') {
 	// Label
 	print '<tr><td>'.$langs->trans("Label").'</td>';
 	print '<td class="valeur">';
-	print '<input type="text" class="flat" name="note" value="'.$object->note_private.'"></td></tr>';
+	print '<input type="text" class="flat" name="note" value="'.$object->note_public.'"></td></tr>';
 
 	// Bank line
 	if (isModEnabled("bank") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
@@ -334,7 +334,7 @@ if ($rowid && $action != 'edit') {
 	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur"><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_public)).'</td></tr>';
 
 	// Bank line
 	if (isModEnabled("bank") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {

From cbd331256d937c92a384bf6183b277e4f4bb0678 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <github@jonb.dk>
Date: Thu, 7 Mar 2024 19:01:38 +0100
Subject: [PATCH 0535/1862] using note_public since note_private is not working
 (#28675)

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
---
 htdocs/adherents/subscription/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index b2dc0a57a53..3b59dab63a2 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -238,7 +238,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'edit') {
 	// Label
 	print '<tr><td>'.$langs->trans("Label").'</td>';
 	print '<td class="valeur">';
-	print '<input type="text" class="flat" name="note" value="'.$object->note_private.'"></td></tr>';
+	print '<input type="text" class="flat" name="note" value="'.$object->note_public.'"></td></tr>';
 
 	// Bank line
 	if (isModEnabled("banque") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {
@@ -334,7 +334,7 @@ if ($rowid && $action != 'edit') {
 	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur"><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_public)).'</td></tr>';
 
 	// Bank line
 	if (isModEnabled("banque") && (getDolGlobalString('ADHERENT_BANK_USE') || $object->fk_bank)) {

From a63d7e08020d0409a4bf734e9bf41ba1d5e7295b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 19:06:08 +0100
Subject: [PATCH 0536/1862] Fix regression

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

diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 2a40c0406c5..cce2244df42 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -530,6 +530,8 @@ class Dolresource extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
+		$rowid = $this->id;
+
 		$error = 0;
 
 		$this->db->begin();

From 6e2f1d350aa7aed98606afc521183df4ebc50ab7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 19:10:27 +0100
Subject: [PATCH 0537/1862] Fix position of parameter

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 4fdefef202b..8c259b63e2a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -506,7 +506,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('expedition', 'supprimer')) {
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
-		$result = $object->delete(0, $also_update_stock);
+		$result = $object->delete($user, 0, $also_update_stock);
 		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 			exit;

From eb12fe65451e2b8d12c04eb167ce440d8fc4f8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:11:43 +0100
Subject: [PATCH 0538/1862] fix create from order (#28660)

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

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index c5d1ad93933..a8301b48558 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2014-2022  Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2015-2016  Abbes Bahfir            <bafbes@gmail.com>
  * Copyright (C) 2018-2022 	Philippe Grand       	<philippe.grand@atoo-net.com>
- * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Benjamin Grembi         <benjamin@oarces.fr>
  * Copyright (C) 2023-2024	William Mead			<william.mead@manchenumerique.fr>
  *
@@ -338,7 +338,7 @@ if (empty($reshook)) {
 
 								if ($product_type == Product::TYPE_SERVICE || getDolGlobalString('FICHINTER_PRINT_PRODUCTS')) { //only services except if config includes products
 									$duration = 3600; // Default to one hour
-
+									$desc = '';
 									// Predefined products & services
 									if ($lines[$i]->fk_product > 0) {
 										$prod = new Product($db);

From 63b2fff4a7573f9fdcb2a468236be56612bf5575 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:16:48 +0100
Subject: [PATCH 0539/1862] Qual: Ignore false positive for suspicious param
 positions (#28693)

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored

* Qual: Ignore suspicious param positions

# Qual: Ignore suspicious param positions

Add annotations to ignore false positives about suspicious parameter positions.
The cases that require more analysis or may be actual bad parameters positions
are not ignored
---
 htdocs/admin/agenda_extsites.php              |  12 +-
 htdocs/admin/dict.php                         | 171 +++++++++---------
 htdocs/admin/mails_templates.php              |  38 ++--
 htdocs/admin/system/database.php              |   6 +-
 htdocs/admin/system/modules.php               |  71 ++++----
 htdocs/admin/translation.php                  |   1 +
 htdocs/admin/triggers.php                     |   4 +-
 htdocs/comm/action/index.php                  |   8 +
 htdocs/comm/mailing/advtargetemailing.php     |   1 +
 htdocs/compta/facture/card.php                |  37 ++--
 htdocs/compta/facture/prelevement.php         |   1 +
 htdocs/compta/tva/payments.php                |   1 +
 .../class/commonstickergenerator.class.php    |  10 +-
 htdocs/core/class/html.form.class.php         |  35 ++--
 htdocs/core/class/utils.class.php             |  39 ++--
 htdocs/core/get_info.php                      |   1 +
 htdocs/core/lib/company.lib.php               | 135 +++++++-------
 htdocs/core/lib/modulebuilder.lib.php         |  59 +++---
 htdocs/core/lib/website.lib.php               |  12 +-
 .../modules/facture/doc/pdf_crabe.modules.php |  23 +--
 .../facture/doc/pdf_sponge.modules.php        |  31 ++--
 .../modules/import/import_csv.modules.php     |   5 +-
 .../modules/import/import_xlsx.modules.php    |   8 +-
 .../doc/doc_generic_proposal_odt.modules.php  |  17 +-
 htdocs/don/card.php                           |   1 +
 htdocs/don/class/api_donations.class.php      |   1 +
 htdocs/don/class/don.class.php                |   3 +-
 htdocs/exports/export.php                     |  23 +--
 htdocs/exports/index.php                      |   1 +
 htdocs/fourn/facture/card.php                 |  13 +-
 htdocs/imports/import.php                     |   6 +
 htdocs/imports/index.php                      |   1 +
 htdocs/main.inc.php                           |   4 +
 htdocs/margin/agentMargins.php                |   1 +
 htdocs/margin/customerMargins.php             |   1 +
 htdocs/margin/productMargins.php              |   1 +
 htdocs/margin/tabs/thirdpartyMargins.php      |   3 +-
 htdocs/modulebuilder/index.php                |  13 ++
 htdocs/product/agenda.php                     |   3 +-
 htdocs/product/class/product.class.php        | 139 +++++++-------
 htdocs/product/inventory/inventory.php        |   9 +-
 htdocs/product/price.php                      |   8 +-
 htdocs/product/stock/product.php              |   1 +
 htdocs/public/payment/newpayment.php          |   1 +
 .../public/webportal/webportal.main.inc.php   |   1 +
 htdocs/public/website/index.php               |   2 +
 htdocs/salaries/class/salary.class.php        |   1 +
 .../societe/class/api_thirdparties.class.php  |   1 +
 htdocs/societe/class/societe.class.php        |   2 +
 htdocs/societe/list.php                       | 131 +++++++-------
 htdocs/societe/paymentmodes.php               |  24 ++-
 htdocs/takepos/invoice.php                    |  31 ++--
 htdocs/user/agenda_extsites.php               |   4 +-
 htdocs/user/bank.php                          |   5 +-
 htdocs/user/card.php                          |   5 +-
 htdocs/user/notify/card.php                   |   3 +-
 56 files changed, 641 insertions(+), 528 deletions(-)

diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 8ac54b3299e..ce994385f80 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -129,6 +129,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 		}
 
 		//print '-name='.$name.'-color='.$color;
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_NAME'.$i, $name, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
@@ -205,10 +206,10 @@ print "<br>\n";
 
 
 $selectedvalue = getDolGlobalInt('AGENDA_DISABLE_EXT');
-if ($selectedvalue==1) {
-	$selectedvalue=0;
+if ($selectedvalue == 1) {
+	$selectedvalue = 0;
 } else {
-	$selectedvalue=1;
+	$selectedvalue = 1;
 }
 
 print "<table class=\"noborder\" width=\"100%\">";
@@ -224,7 +225,7 @@ print '<tr class="oddeven">';
 print "<td>".$langs->trans("ExtSitesEnableThisTool")."</td>";
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
+	print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled' => array(0 => '.hideifnotset')), null, 1);
 } else {
 	if (!getDolGlobalString('AGENDA_DISABLE_EXT')) {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -269,7 +270,7 @@ while ($i <= $MAXAGENDA) {
 	$default = 'AGENDA_EXT_ACTIVEBYDEFAULT' . $key;
 
 	print '<tr class="oddeven">';
-	// Nb
+	// Nb  @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print '<td width="180" class="nowrap">' . $langs->trans("AgendaExtNb", $key) . "</td>";
 	// Name
 	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME' . $key . '" value="' . (GETPOST('AGENDA_EXT_NAME' . $key) ? GETPOST('AGENDA_EXT_NAME' . $key, 'alpha') : getDolGlobalString($name)) . '" size="28"></td>';
@@ -286,6 +287,7 @@ while ($i <= $MAXAGENDA) {
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('AGENDA_EXT_ACTIVEBYDEFAULT' . $key);
 	} else {
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		if (getDolGlobalString($default)) {
 			print '<a href="' . $_SERVER['PHP_SELF'] . '?action=del_AGENDA_EXT_ACTIVEBYDEFAULT' . $key . '&token='.newToken().'">' . img_picto($langs->trans("Disabled"), 'off') . '</a>';
 		} else {
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0abc9213fb7..0ca6a21bfe2 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -54,7 +54,8 @@ $rowid = GETPOST('rowid', 'alpha');
 $entity = GETPOSTINT('entity');
 $code = GETPOST('code', 'alpha');
 
-$acts = array(); $actl = array();
+$acts = array();
+$actl = array();
 $acts[0] = "activate";
 $acts[1] = "disable";
 $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
@@ -472,7 +473,7 @@ $tabrowid[27] = "id";
 $tabrowid[28] = "";
 $tabrowid[29] = "";
 $tabrowid[30] = "";
-$tabrowid[31]= "";
+$tabrowid[31] = "";
 $tabrowid[32] = "id";
 $tabrowid[33] = "rowid";
 $tabrowid[34] = "rowid";
@@ -539,58 +540,58 @@ $tabhelp = array();
 
 // Table to store complete information (will replace all other table). Key is table name.
 $tabcomplete = array(
-	'c_forme_juridique'=>array(
-		'picto'=>'company',
-		'help'=>array('code'=>$langs->trans("EnterAnyCode"))
+	'c_forme_juridique' => array(
+		'picto' => 'company',
+		'help' => array('code' => $langs->trans("EnterAnyCode"))
 	),
-	'c_departements'=>array(
-		'picto'=>'state',
-		'help'=>array('code'=>$langs->trans("EnterAnyCode"))
+	'c_departements' => array(
+		'picto' => 'state',
+		'help' => array('code' => $langs->trans("EnterAnyCode"))
 	),
-	'c_regions'=>array(
-		'picto'=>'region',
-		'help'=>array('code'=>$langs->trans("EnterAnyCode"))
+	'c_regions' => array(
+		'picto' => 'region',
+		'help' => array('code' => $langs->trans("EnterAnyCode"))
 	),
-	'c_country'=>array('picto'=>'country', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_civility'=>array('picto'=>'contact', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_actioncomm'=>array('picto'=>'action', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'color'=>$langs->trans("ColorFormat"), 'position'=>$langs->trans("PositionIntoComboList"))),
-	'c_chargesociales'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_typent'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))),
-	'c_currencies'=>array('picto'=>'multicurrency', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"))),
-	'c_tva'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"))),
-	'c_type_contact'=>array('picto'=>'contact', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))),
-	'c_payment_term'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'type_cdr'=>$langs->trans("TypeCdr", $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset"), $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset")))),
-	'c_paiement'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_ecotaxe'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_paper_format'=>array('picto'=>'generic', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_prospectlevel'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_type_fees'=>array('picto'=>'trip', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_shipment_mode'=>array('picto'=>'shipment', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"))),
-	'c_effectif'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_input_method'=>array('picto'=>'order', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_input_reason'=>array('picto'=>'order', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))),
-	'c_availability'=>array('picto'=>'shipment', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_revenuestamp'=>array('picto'=>'bill', 'help'=>array('revenuestamp_type'=>$langs->trans('FixedOrPercent'))),
-	'c_type_resource'=>array('picto'=>'resource', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_type_container'=>array('picto'=>'website', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_stcomm'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"))),
-	'c_holiday_types'=>array('picto'=>'holiday', 'help'=>array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"))),
-	'c_lead_status'=>array('picto'=>'project', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"))),
-	'c_format_cards'=>array('picto'=>'generic', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"))),
-	'c_hrm_public_holiday'=>array('picto'=>'holiday', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("CountryIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"))),
-	'c_hrm_department'=>array('picto'=>'hrm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_hrm_function'=>array('picto'=>'hrm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_exp_tax_cat'=>array('picto'=>'expensereport', 'help'=>array()),
-	'c_exp_tax_range'=>array('picto'=>'expensereport', 'help'=>array('range_ik'=>$langs->trans('PrevRangeToThisRange'))),
-	'c_units'=>array('picto'=>'product', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('Measuringtype_durationDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'))),
-	'c_socialnetworks'=>array('picto'=>'share-alt', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'))),
-	'c_prospectcontactlevel'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_stcommcontact'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"))),
-	'c_transport_mode'=>array('picto'=>'incoterm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_product_nature'=>array('picto'=>'product', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_productbatch_qcstatus'=>array('picto'=>'lot', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_asset_disposal_type'=>array('picto'=>'asset', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
-	'c_invoice_subtype'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_country' => array('picto' => 'country', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_civility' => array('picto' => 'contact', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_actioncomm' => array('picto' => 'action', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'color' => $langs->trans("ColorFormat"), 'position' => $langs->trans("PositionIntoComboList"))),
+	'c_chargesociales' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_typent' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))),
+	'c_currencies' => array('picto' => 'multicurrency', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'unicode' => $langs->trans("UnicodeCurrency"))),
+	'c_tva' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'taux' => $langs->trans("SellTaxRate"), 'recuperableonly' => $langs->trans("RecuperableOnly"), 'localtax1_type' => $langs->trans("LocalTaxDesc"), 'localtax2_type' => $langs->trans("LocalTaxDesc"))),
+	'c_type_contact' => array('picto' => 'contact', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))),
+	'c_payment_term' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'type_cdr' => $langs->trans("TypeCdr", $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset"), $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset")))),
+	'c_paiement' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_ecotaxe' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_paper_format' => array('picto' => 'generic', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_prospectlevel' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_type_fees' => array('picto' => 'trip', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_shipment_mode' => array('picto' => 'shipment', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'tracking' => $langs->trans("UrlTrackingDesc"))),
+	'c_effectif' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_input_method' => array('picto' => 'order', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_input_reason' => array('picto' => 'order', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))),
+	'c_availability' => array('picto' => 'shipment', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_revenuestamp' => array('picto' => 'bill', 'help' => array('revenuestamp_type' => $langs->trans('FixedOrPercent'))),
+	'c_type_resource' => array('picto' => 'resource', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_type_container' => array('picto' => 'website', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_stcomm' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'picto' => $langs->trans("PictoHelp"))),
+	'c_holiday_types' => array('picto' => 'holiday', 'help' => array('affect' => $langs->trans("FollowedByACounter"), 'delay' => $langs->trans("MinimumNoticePeriod"), 'newbymonth' => $langs->trans("NbAddedAutomatically"))),
+	'c_lead_status' => array('picto' => 'project', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'percent' => $langs->trans("OpportunityPercent"), 'position' => $langs->trans("PositionIntoComboList"))),
+	'c_format_cards' => array('picto' => 'generic', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'name' => $langs->trans("LabelName"), 'paper_size' => $langs->trans("LabelPaperSize"))),
+	'c_hrm_public_holiday' => array('picto' => 'holiday', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'dayrule' => "Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country' => $langs->trans("CountryIfSpecificToOneCountry"), 'year' => $langs->trans("ZeroMeansEveryYear"))),
+	'c_hrm_department' => array('picto' => 'hrm', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_hrm_function' => array('picto' => 'hrm', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_exp_tax_cat' => array('picto' => 'expensereport', 'help' => array()),
+	'c_exp_tax_range' => array('picto' => 'expensereport', 'help' => array('range_ik' => $langs->trans('PrevRangeToThisRange'))),
+	'c_units' => array('picto' => 'product', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('Measuringtype_durationDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'))),
+	'c_socialnetworks' => array('picto' => 'share-alt', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'))),
+	'c_prospectcontactlevel' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_stcommcontact' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'picto' => $langs->trans("PictoHelp"))),
+	'c_transport_mode' => array('picto' => 'incoterm', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_product_nature' => array('picto' => 'product', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_productbatch_qcstatus' => array('picto' => 'lot', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_asset_disposal_type' => array('picto' => 'asset', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
+	'c_invoice_subtype' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
 );
 
 
@@ -622,7 +623,7 @@ foreach ($tabcomplete as $key => $value) {
 $keytable = '';
 if ($id > 0) {
 	$arrayofkeys = array_keys($tabcomplete);
-	if (array_key_exists($id -1, $arrayofkeys)) {
+	if (array_key_exists($id - 1, $arrayofkeys)) {
 		$keytable = $arrayofkeys[$id - 1];
 	}
 }
@@ -701,23 +702,23 @@ $localtax_typeList = array(
 
 $object = new stdClass();
 $parameters = array(
-	'id'			=>$id,
-	'rowid'			=>$rowid,
-	'code'			=>$code,
-	'confirm'		=>$confirm,
-	'entity'		=>$entity,
-	'taborder'		=>$taborder,
-	'tabname'		=>$tabname,
-	'tablib'		=>$tablib,
-	'tabsql'		=>$tabsql,
-	'tabsqlsort'	=>$tabsqlsort,
-	'tabfield'		=>$tabfield,
-	'tabfieldvalue'	=>$tabfieldvalue,
-	'tabfieldinsert'=>$tabfieldinsert,
-	'tabrowid'		=>$tabrowid,
-	'tabcond'		=>$tabcond,
-	'tabhelp'		=>$tabhelp,
-	'tabcomplete'	=>$tabcomplete
+	'id'			=> $id,
+	'rowid'			=> $rowid,
+	'code'			=> $code,
+	'confirm'		=> $confirm,
+	'entity'		=> $entity,
+	'taborder'		=> $taborder,
+	'tabname'		=> $tabname,
+	'tablib'		=> $tablib,
+	'tabsql'		=> $tabsql,
+	'tabsqlsort'	=> $tabsqlsort,
+	'tabfield'		=> $tabfield,
+	'tabfieldvalue'	=> $tabfieldvalue,
+	'tabfieldinsert' => $tabfieldinsert,
+	'tabrowid'		=> $tabrowid,
+	'tabcond'		=> $tabcond,
+	'tabhelp'		=> $tabhelp,
+	'tabcomplete'	=> $tabcomplete
 );
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -771,11 +772,11 @@ if (empty($reshook)) {
 				&& (
 					!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto', 'deposit_percent'))  // Fields that are not mandatory
 					&& ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10
-					)
-				) {
-					$ok = 0;
-					$fieldnamekey = $value;
-					// We take translate key of field
+				)
+			) {
+				$ok = 0;
+				$fieldnamekey = $value;
+				// We take translate key of field
 				if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
 					$fieldnamekey = 'Label';
 				}
@@ -828,7 +829,7 @@ if (empty($reshook)) {
 					$fieldnamekey = 'UseByDefault';
 				}
 
-					setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 			}
 		}
 		// Other special checks
@@ -955,7 +956,7 @@ if (empty($reshook)) {
 				if ($id == 10 && GETPOSTINT('country') > 0) {
 					$search_country_id = GETPOSTINT('country');
 				}
-				$_POST = array('id'=>$id);
+				$_POST = array('id' => $id);
 			} else {
 				if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -1669,7 +1670,7 @@ if ($id > 0) {
 				}
 
 				$tmpaction = 'create';
-				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 				$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 				$error = $hookmanager->error;
 				$errors = $hookmanager->errors;
@@ -2168,7 +2169,7 @@ if ($id > 0) {
 
 				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 					$tmpaction = 'edit';
-					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 					$error = $hookmanager->error;
 					$errors = $hookmanager->errors;
@@ -2190,7 +2191,7 @@ if ($id > 0) {
 					print '</td>';
 				} else {
 					$tmpaction = 'view';
-					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error;
@@ -2281,7 +2282,7 @@ if ($id > 0) {
 								$key = $langs->trans("PaymentType".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->$value);
 							} elseif ($value == 'type' && $tabname[$id] == 'c_paiement') {
-								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
+								$payment_type_list = array(0 => $langs->trans('PaymentTypeCustomer'), 1 => $langs->trans('PaymentTypeSupplier'), 2 => $langs->trans('PaymentTypeBoth'));
 								$valuetoshow = $payment_type_list[$valuetoshow];
 							} elseif ($value == 'label' && $tabname[$id] == 'c_input_reason') {
 								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
@@ -2378,7 +2379,7 @@ if ($id > 0) {
 							} elseif ($value == 'icon') {
 								$valuetoshow = $obj->{$value}." ".img_picto("", $obj->{$value});
 							} elseif ($value == 'type_duration') {
-								$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
+								$TDurationTypes = array('y' => $langs->trans('Years'), 'm' => $langs->trans('Month'), 'w' => $langs->trans('Weeks'), 'd' => $langs->trans('Days'), 'h' => $langs->trans('Hours'), 'i' => $langs->trans('Minutes'));
 								if (!empty($obj->{$value}) && array_key_exists($obj->{$value}, $TDurationTypes)) {
 									$valuetoshow = $TDurationTypes[$obj->{$value}];
 								}
@@ -2634,6 +2635,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 		} elseif (in_array($value, array('public', 'use_default'))) {
 			// Fields 0/1 with a combo select Yes/No
 			print '<td class="center">';
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value} : ''), 1);
 			print '</td>';
 		} elseif ($value == 'private') {
@@ -2648,7 +2650,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 			print '</td>';
 		} elseif ($value == 'type' && $tabname == 'c_paiement') {
 			print '<td>';
-			$select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
+			$select_list = array(0 => $langs->trans('PaymentTypeCustomer'), 1 => $langs->trans('PaymentTypeSupplier'), 2 => $langs->trans('PaymentTypeBoth'));
 			print $form->selectarray($value, $select_list, (!empty($obj->{$value}) ? $obj->{$value} : '2'));
 			print '</td>';
 		} elseif ($value == 'recuperableonly' || $value == 'type_cdr' || $value == 'deductible' || $value == 'category_type') {
@@ -2658,8 +2660,9 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 				print '<td>';
 			}
 			if ($value == 'type_cdr') {
-				print $form->selectarray($value, array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value} : ''));
+				print $form->selectarray($value, array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value} : ''));
 			} else {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value} : ''), 1);
 			}
 			print '</td>';
@@ -2709,7 +2712,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 		} elseif ($value == 'type_vat') {
 			// VAT type 0: all, 1: sell, 2: purchase
 			print '<td class="center">';
-			print $form->selectarray($value, $type_vatList, (!empty($obj->{$value}) ? $obj->{$value}:''));
+			print $form->selectarray($value, $type_vatList, (!empty($obj->{$value}) ? $obj->{$value} : ''));
 			print '</td>';
 		} elseif ($value == 'localtax1_type' || $value == 'localtax2_type') {
 			// Le type de taxe locale
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 6e651307207..af09ef6d283 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -44,13 +44,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Load translation files required by the page
-$langsArray=array("errors", "admin", "mails", "languages");
+$langsArray = array("errors", "admin", "mails", "languages");
 
 if (isModEnabled('member')) {
-	$langsArray[]='members';
+	$langsArray[] = 'members';
 }
 if (isModEnabled('eventorganization')) {
-	$langsArray[]='eventorganization';
+	$langsArray[] = 'eventorganization';
 }
 
 $langs->loadLangs($langsArray);
@@ -163,16 +163,16 @@ if (!getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) {
 
 $tabhelp = array();
 $tabhelp[25] = array(
-	'label'=>$langs->trans('EnterAnyCode'),
-	'type_template'=>$langs->trans("TemplateForElement"),
-	'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"),
-	'position'=>$langs->trans("PositionIntoComboList"),
-	'topic'=>'<span class="small">'.$helpsubstit.'</span>',
-	'email_from'=>$langs->trans('ForceEmailFrom'),
-	'joinfiles'=>$langs->trans('AttachMainDocByDefault'),
-	'defaultfortype'=>$langs->trans("DefaultForTypeDesc"),
-	'content'=>'<span class="small">'.$helpsubstit.'</span>',
-	'content_lines'=>'<span class="small">'.$helpsubstitforlines.'</span>'
+	'label' => $langs->trans('EnterAnyCode'),
+	'type_template' => $langs->trans("TemplateForElement"),
+	'private' => $langs->trans("TemplateIsVisibleByOwnerOnly"),
+	'position' => $langs->trans("PositionIntoComboList"),
+	'topic' => '<span class="small">'.$helpsubstit.'</span>',
+	'email_from' => $langs->trans('ForceEmailFrom'),
+	'joinfiles' => $langs->trans('AttachMainDocByDefault'),
+	'defaultfortype' => $langs->trans("DefaultForTypeDesc"),
+	'content' => '<span class="small">'.$helpsubstit.'</span>',
+	'content_lines' => '<span class="small">'.$helpsubstitforlines.'</span>'
 );
 
 
@@ -241,7 +241,7 @@ if (isModEnabled('partnership') && $user->hasRight('partnership', 'read')) {
 	$elementList['partnership_send'] = img_picto('', 'partnership', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToPartnership'));
 }
 
-$parameters = array('elementList'=>$elementList);
+$parameters = array('elementList' => $elementList);
 $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
 if ($reshook == 0) {
 	foreach ($hookmanager->resArray as $item => $value) {
@@ -418,7 +418,7 @@ if (empty($reshook)) {
 			$result = $db->query($sql);
 			if ($result) {	// Add is ok
 				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-				$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
+				$_POST = array('id' => $id); // Clean $_POST array, we keep only id
 			} else {
 				if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -1040,7 +1040,7 @@ foreach ($fieldlist as $field => $value) {
 		}
 		$sortfieldtouse = ($sortable ? $fieldlist[$field] : '');
 		if ($sortfieldtouse == 'type_template') {
-			$sortfieldtouse.= 'type_template,lang,position,label';
+			$sortfieldtouse .= 'type_template,lang,position,label';
 		}
 		print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], $sortfieldtouse, ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $css.' ');
 	}
@@ -1065,7 +1065,7 @@ if ($num) {
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
 				$tmpaction = 'edit';
-				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 				$reshook = $hookmanager->executeHooks('editEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 				$error = $hookmanager->error;
 				$errors = $hookmanager->errors;
@@ -1216,7 +1216,7 @@ if ($num) {
 				}
 
 				$tmpaction = 'view';
-				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 				$reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 				$error = $hookmanager->error;
@@ -1461,8 +1461,10 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 			print '<td'.($classtd ? ' class="'.$classtd.'"' : '').'>';
 			if ($value == 'private' && $context != 'preview') {
 				if (empty($user->admin)) {
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					print $form->selectyesno($value, '1', 1);
 				} else {
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1);
 				}
 			} else {
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index cdce65af5b5..1f95458a8b2 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -89,8 +89,8 @@ if (!count($listofvars) && !count($listofstatus)) {
 		$arraytest = array();
 		if (preg_match('/mysql/i', $db->type)) {
 			$arraytest = array(
-				'character_set_database'=>array('var'=>'dolibarr_main_db_character_set', 'valifempty'=>'utf8'),
-				'collation_database'=>array('var'=>'dolibarr_main_db_collation', 'valifempty'=>'utf8_unicode_ci')
+				'character_set_database' => array('var' => 'dolibarr_main_db_character_set', 'valifempty' => 'utf8'),
+				'collation_database' => array('var' => 'dolibarr_main_db_collation', 'valifempty' => 'utf8_unicode_ci')
 			);
 		}
 
@@ -123,9 +123,11 @@ if (!count($listofvars) && !count($listofstatus)) {
 				print $paramval;
 			}
 			if ($show == 1) {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print $form->textwithpicto($paramval, $text);
 			}
 			if ($show == 2) {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print $form->textwithpicto($paramval, $text, 1, 'warning');
 			}
 			print '</td>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 8316969135a..da70b1fbbec 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -58,11 +58,11 @@ $object = new stdClass();
 
 // Definition of fields for lists
 $arrayfields = array(
-	'name'=>array('label'=>$langs->trans("Modules"), 'checked'=>1, 'position'=>10),
-	'version'=>array('label'=>$langs->trans("Version"), 'checked'=>1, 'position'=>20),
-	'id'=>array('label'=>$langs->trans("IdModule"), 'checked'=>1, 'position'=>30),
-	'module_position'=>array('label'=>$langs->trans("Position"), 'checked'=>1, 'position'=>35),
-	'permission'=>array('label'=>$langs->trans("IdPermissions"), 'checked'=>1, 'position'=>40)
+	'name' => array('label' => $langs->trans("Modules"), 'checked' => 1, 'position' => 10),
+	'version' => array('label' => $langs->trans("Version"), 'checked' => 1, 'position' => 20),
+	'id' => array('label' => $langs->trans("IdModule"), 'checked' => 1, 'position' => 30),
+	'module_position' => array('label' => $langs->trans("Position"), 'checked' => 1, 'position' => 35),
+	'permission' => array('label' => $langs->trans("IdPermissions"), 'checked' => 1, 'position' => 40)
 );
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -143,6 +143,7 @@ foreach ($modules as $key => $module) {
 
 	if (!empty($module->picto)) {
 		if (preg_match('/^\//', $module->picto)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$newModule->picto = img_picto($alt, $module->picto, 'width="14px"', 1);
 		} else {
 			$newModule->picto = img_object($alt, $module->picto, 'width="14px"');
@@ -157,7 +158,7 @@ foreach ($modules as $key => $module) {
 			if (empty($rights[0])) {
 				continue;
 			}
-			$arrayofpermissions[$rights[0]] = array('label'=> 'user->hasRight(\''.$module->rights_class.'\', \''.$rights[4].'\''.(empty($rights[5]) ? '' : ', \''.$rights[5].'\'').')');
+			$arrayofpermissions[$rights[0]] = array('label' => 'user->hasRight(\''.$module->rights_class.'\', \''.$rights[4].'\''.(empty($rights[5]) ? '' : ', \''.$rights[5].'\'').')');
 			$permission[] = $rights[0];
 
 			array_push($rights_ids, $rights[0]);
@@ -296,7 +297,7 @@ if ($arrayfields['module_position']['checked']) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -408,13 +409,13 @@ llxFooter();
 $db->close();
 
 
- /**
-  * Compare two modules by their ID for a ascending order
-  *
-  * @param	stdClass 	$a		First module
-  * @param	stdClass 	$b		Second module
-  * @return	int					Compare result (-1, 0, 1)
-  */
+/**
+ * Compare two modules by their ID for a ascending order
+ *
+ * @param	stdClass 	$a		First module
+ * @param	stdClass 	$b		Second module
+ * @return	int					Compare result (-1, 0, 1)
+ */
 function compareIdAsc(stdClass $a, stdClass $b)
 {
 	if ((int) $a->id == (int) $b->id) {
@@ -424,13 +425,13 @@ function compareIdAsc(stdClass $a, stdClass $b)
 	return ((int) $a->id < (int) $b->id) ? -1 : 1;
 }
 
- /**
-  * Compare two modules by their ID for a descending order
-  *
-  * @param	stdClass 	$a		First module
-  * @param	stdClass 	$b		Second module
-  * @return	int					Compare result (-1, 0, 1)
-  */
+/**
+ * Compare two modules by their ID for a descending order
+ *
+ * @param	stdClass 	$a		First module
+ * @param	stdClass 	$b		Second module
+ * @return	int					Compare result (-1, 0, 1)
+ */
 function compareIdDesc(stdClass $a, stdClass $b)
 {
 	if ((int) $a->id == (int) $b->id) {
@@ -440,13 +441,13 @@ function compareIdDesc(stdClass $a, stdClass $b)
 	return ((int) $b->id < (int) $a->id) ? -1 : 1;
 }
 
- /**
-  * Compare two modules by their ID for a ascending order
-  *
-  * @param	stdClass 	$a		First module
-  * @param	stdClass 	$b		Second module
-  * @return	int					Compare result (-1, 0, 1)
-  */
+/**
+ * Compare two modules by their ID for a ascending order
+ *
+ * @param	stdClass 	$a		First module
+ * @param	stdClass 	$b		Second module
+ * @return	int					Compare result (-1, 0, 1)
+ */
 function comparePermissionIdsAsc(stdClass $a, stdClass $b)
 {
 	if (empty($a->permission) && empty($b->permission)) {
@@ -467,13 +468,13 @@ function comparePermissionIdsAsc(stdClass $a, stdClass $b)
 	return $a->permission[0] < $b->permission[0] ? -1 : 1;
 }
 
- /**
-  * Compare two modules by their permissions for a descending order
-  *
-  * @param	stdClass 	$a		First module
-  * @param	stdClass 	$b		Second module
-  * @return	int					Compare result (-1, 0, 1)
-  */
+/**
+ * Compare two modules by their permissions for a descending order
+ *
+ * @param	stdClass 	$a		First module
+ * @param	stdClass 	$b		Second module
+ * @return	int					Compare result (-1, 0, 1)
+ */
 function comparePermissionIdsDesc(stdClass $a, stdClass $b)
 {
 	if (empty($a->permission) && empty($b->permission)) {
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 2c71f7592c4..0dbeab0db6d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -617,6 +617,7 @@ if ($mode == 'searchkey') {
 			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().'&mode='.urlencode($mode).'">'.img_delete().'</a>';
 			print '&nbsp;&nbsp;';
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
 			print $form->textwithpicto('', $htmltext, 1, 'warning');
 		}
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 2fc450af8d0..75d27c1e125 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -58,7 +58,8 @@ print "<br>\n";
 
 $interfaces = new Interfaces($db);
 $triggers = $interfaces->getTriggersList();
-$param = ''; $align = '';
+$param = '';
+$align = '';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder">';
@@ -78,6 +79,7 @@ foreach ($triggers as $trigger) {
 	$text = $trigger['info'];
 	$text .= "<br>\n<strong>".$langs->trans("File")."</strong>:<br>\n".$trigger['relpath'];
 	//$text.="\n".$langs->trans("ExternalModule",$trigger['isocreorexternal']);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print $form->textwithpicto('', $text);
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 45c6579b4a7..7ce401bc3c9 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -276,6 +276,7 @@ if (!getDolGlobalString('AGENDA_DISABLE_EXT')) {
 				'name' => dol_string_nohtmltag(getDolGlobalString($name)),
 				'offsettz' => (int) getDolGlobalInt($offsettz, 0),
 				'color' => dol_string_nohtmltag(getDolGlobalString($color)),
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				'default' => dol_string_nohtmltag(getDolGlobalString($default)),
 				'buggedfile' => dol_string_nohtmltag(getDolGlobalString('buggedfile', ''))
 			);
@@ -301,6 +302,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 				'src' => getDolUserString($source),
 				'name' => dol_string_nohtmltag(getDolUserString($name)),
 				'offsettz' => (int) (empty($user->conf->$offsettz) ? 0 : $user->conf->$offsettz),
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				'color' => dol_string_nohtmltag(getDolUserString($color)),
 				'default' => dol_string_nohtmltag(getDolUserString($default)),
 				'buggedfile' => dol_string_nohtmltag(isset($user->conf->buggedfile) ? $user->conf->buggedfile : '')
@@ -1562,6 +1564,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 					$style .= ' cal_other_month_right';
 				}
 				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "  </td>\n";
 			} elseif ($tmpday <= $max_day_in_month) {
@@ -1583,6 +1586,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 				}
 				//var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);
 				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam, 0, 60, 0, $bookcalcalendars);
 				echo "</td>\n";
 			} else {
@@ -1592,6 +1596,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 					$style .= ' cal_other_month_right';
 				}
 				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "</td>\n";
 			}
@@ -1656,6 +1661,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 		}
 
 		echo '  <td class="'.$style.'" width="14%" valign="top">';
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars);
 		echo "  </td>\n";
 	}
@@ -1746,12 +1752,14 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 
 		echo '</div></div>';
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 1, $bookcalcalendars);
 
 		print '</div>';
 	} else {
 		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars);
 
 		print '</div>';
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index bb296e516ee..e0098643747 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -448,6 +448,7 @@ if ($object->fetch($id) >= 0) {
 	$nbemail = ($object->nbemail ? $object->nbemail : '0');
 	if (getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
 		$text = $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		print $form->textwithpicto($nbemail, $text, 1, 'warning');
 	} else {
 		print $nbemail;
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6b8745332b8..10b20b58b85 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2093,7 +2093,7 @@ if (empty($reshook)) {
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc =(GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 
 		$price_ht = '';
 		$price_ht_devise = '';
@@ -2292,8 +2292,8 @@ if (empty($reshook)) {
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
-				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
-					$product_desc='';
+				if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
+					$product_desc = '';
 				}
 
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
@@ -2347,10 +2347,16 @@ if (empty($reshook)) {
 				$type = $prod->type;
 				$fk_unit = $prod->fk_unit;
 			} else {
-				if (!empty($price_ht)) $pu_ht = price2num($price_ht, 'MU');
-				else $pu_ht = '';
-				if (!empty($price_ttc)) $pu_ttc = price2num($price_ttc, 'MU');
-				else $pu_ttc = '';
+				if (!empty($price_ht)) {
+					$pu_ht = price2num($price_ht, 'MU');
+				} else {
+					$pu_ht = '';
+				}
+				if (!empty($price_ttc)) {
+					$pu_ttc = price2num($price_ttc, 'MU');
+				} else {
+					$pu_ttc = '';
+				}
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
 				if (empty($tva_tx)) {
@@ -2822,7 +2828,7 @@ if (empty($reshook)) {
 			&& !$objectidnext
 			&& $object->is_last_in_cycle()
 			&& $usercanunvalidate
-			) {
+		) {
 			$outingError = 0;
 			$newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
 			if ($newCycle > 1) {
@@ -2836,7 +2842,7 @@ if (empty($reshook)) {
 						if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE
 							&& $next_invoice->situation_counter == $object->situation_counter
 							&& $next_invoice->fk_facture_source == $object->id
-						  ) {
+						) {
 							$linkedCreditNotesList[] = $next_invoice->id;
 						}
 					}
@@ -3942,7 +3948,7 @@ if ($action == 'create') {
 		}
 
 		// Other attributes
-		$parameters = array('objectsrc' => !empty($objectsrc) ? $objectsrc : 0, 'colspan' => ' colspan="2"', 'cols' => '2', 'socid'=>$socid);
+		$parameters = array('objectsrc' => !empty($objectsrc) ? $objectsrc : 0, 'colspan' => ' colspan="2"', 'cols' => '2', 'socid' => $socid);
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		if (empty($reshook)) {
@@ -4276,7 +4282,7 @@ if ($action == 'create') {
 			&& !$objectidnext
 			&& $object->is_last_in_cycle()
 			&& $usercanunvalidate
-			) {
+		) {
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
 		}
 	}
@@ -5444,6 +5450,7 @@ if ($action == 'create') {
 					$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
 				}
 				print '<span class="opacitymedium">';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
 				print '</span>';
 				print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
@@ -5479,7 +5486,7 @@ if ($action == 'create') {
 				print '</td>';
 				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">';
 				//print (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code).' ';
-				print price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).'</td><td>&nbsp;</td></tr>';
+				print price(price2num($object->multicurrency_tx * $resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).'</td><td>&nbsp;</td></tr>';
 			}
 
 			// Retained warranty : usually use on construction industry
@@ -5827,7 +5834,7 @@ if ($action == 'create') {
 				// For credit note
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->status == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercancreate
 					&& (getDolGlobalString('INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') || $sumofpayment == 0) && $object->total_ht < 0
-					) {
+				) {
 					print '<a class="butAction classfortooltip'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReduc2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 				}
 				// For down payment invoice (deposit)
@@ -5890,7 +5897,7 @@ if ($action == 'create') {
 				&& !$objectidnext
 				&& $object->is_last_in_cycle()
 				&& getDolGlobalInt('INVOICE_USE_SITUATION_CREDIT_NOTE')
-				) {
+			) {
 				if ($usercanunvalidate) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;invoiceAvoirWithLines=1&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
 				} else {
@@ -5920,7 +5927,7 @@ if ($action == 'create') {
 				&& $object->situation_counter > 1
 				&& $object->is_last_in_cycle()
 				&& $usercanunvalidate
-				) {
+			) {
 				if (($object->total_ttc - $totalcreditnotes) == 0) {
 					print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
 				} else {
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index e79cc953f3a..7912337feeb 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -613,6 +613,7 @@ if ($object->id > 0) {
 	print '<tr><td>'.$langs->trans($title).'</td><td colspan="3">';
 
 	$bac = new CompanyBankAccount($db);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$bac->fetch(0, $object->thirdparty->id);
 
 	print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index f67add4b840..83f044af16f 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -146,6 +146,7 @@ if ($resql) {
 	setEventMessages($db->lasterror, null, 'errors');
 }
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $num, 'title_accountancy', 0, '', '', $limit);
 
 if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index fa98bed7b41..ba63bba320e 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -190,7 +190,9 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
 			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
 				if ($j <= ($x2 - 1)) {
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
@@ -198,7 +200,9 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
 			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
 				if ($j <= ($y2 - 1)) {
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
@@ -257,8 +261,8 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 	{
 		if ($src != $dest) {
 			$tab = array(
-				'in'=>39.37008,
-				'mm'=>1000
+				'in' => 39.37008,
+				'mm' => 1000
 			);
 			return $value * $tab[$dest] / $tab[$src];
 		}
@@ -278,7 +282,7 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 	{
 		// phpcs:enable
 		// Array for link between height of characters and space between lines
-		$_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
+		$_Table_Hauteur_Chars = array(6 => 2, 7 => 2.5, 8 => 3, 9 => 3.5, 10 => 4, 11 => 6, 12 => 7, 13 => 8, 14 => 9, 15 => 10);
 		if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
 			return $_Table_Hauteur_Chars[$pt];
 		} else {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 21e33db578e..630602e2c75 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -796,12 +796,15 @@ class Form
 		} elseif ($type == 'helpclickable') {
 			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
 		} elseif ($type == 'superadmin') {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$img = img_picto($alt, 'redstar');
 		} elseif ($type == 'admin') {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$img = img_picto($alt, 'star');
 		} elseif ($type == 'warning') {
 			$img = img_warning($alt);
 		} elseif ($type != 'none') {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$img = img_picto($alt, $type); // $type can be an image path
 		}
 
@@ -2222,11 +2225,11 @@ class Form
 
 					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength) . $moreinfo;
 					$outarray2[$userstatic->id] = array(
-						'id'=>$userstatic->id,
-						'label'=>$labeltoshow,
-						'labelhtml'=>$labeltoshowhtml,
-						'color'=>'',
-						'picto'=>''
+						'id' => $userstatic->id,
+						'label' => $labeltoshow,
+						'labelhtml' => $labeltoshowhtml,
+						'color' => '',
+						'picto' => ''
 					);
 
 					$i++;
@@ -3370,7 +3373,7 @@ class Form
 			}
 		}
 
-		$parameters = array('objp'=>$objp);
+		$parameters = array('objp' => $objp);
 		$reshook = $hookmanager->executeHooks('constructProductListOption', $parameters); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
 			$opt .= $hookmanager->resPrint;
@@ -5375,11 +5378,11 @@ class Form
 						}
 						$more .= $this->selectDate($input['value'], $input['name'], $h, $m, 0, '', 1, $addnowlink);
 						$more .= '</div></div>'."\n";
-						$formquestion[] = array('name'=>$input['name'].'day');
-						$formquestion[] = array('name'=>$input['name'].'month');
-						$formquestion[] = array('name'=>$input['name'].'year');
-						$formquestion[] = array('name'=>$input['name'].'hour');
-						$formquestion[] = array('name'=>$input['name'].'min');
+						$formquestion[] = array('name' => $input['name'].'day');
+						$formquestion[] = array('name' => $input['name'].'month');
+						$formquestion[] = array('name' => $input['name'].'year');
+						$formquestion[] = array('name' => $input['name'].'hour');
+						$formquestion[] = array('name' => $input['name'].'min');
 					} elseif ($input['type'] == 'other') { // can be 1 column or 2 depending if label is set or not
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) {
@@ -7202,7 +7205,7 @@ class Form
 		// Add a link to set data
 		if ($conf->use_javascript_ajax && !empty($adddateof)) {
 			if (!is_array($adddateof)) {
-				$arrayofdateof = array(array('adddateof'=>$adddateof, 'labeladddateof'=>$labeladddateof));
+				$arrayofdateof = array(array('adddateof' => $adddateof, 'labeladddateof' => $labeladddateof));
 			} else {
 				$arrayofdateof = $adddateof;
 			}
@@ -8171,7 +8174,9 @@ class Form
 
 				$oldValueForShowOnCombobox = 0;
 				foreach ($objecttmp->fields as $fieldK => $fielV) {
-					if (!$fielV['showoncombobox'] || empty($objecttmp->$fieldK)) continue;
+					if (!$fielV['showoncombobox'] || empty($objecttmp->$fieldK)) {
+						continue;
+					}
 
 					if (!$oldValueForShowOnCombobox) {
 						$selected_input_value = '';
@@ -10723,8 +10728,8 @@ class Form
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				$searchtags = removeGlobalParenthesis($searchtags);
 
-				$ret .= '<span class="marginleftonlyshort valignmiddle tagsearch" data-ufilterid="'.($tmpkey+1).'" data-ufilter="'.dol_escape_htmltag($tmpval).'">';
-				$ret .= '<span class="tagsearchdelete select2-selection__choice__remove" data-ufilterid="'.($tmpkey+1).'">x</span> ';
+				$ret .= '<span class="marginleftonlyshort valignmiddle tagsearch" data-ufilterid="'.($tmpkey + 1).'" data-ufilter="'.dol_escape_htmltag($tmpval).'">';
+				$ret .= '<span class="tagsearchdelete select2-selection__choice__remove" data-ufilterid="'.($tmpkey + 1).'">x</span> ';
 				$ret .= dol_escape_htmltag($searchtags);
 				$ret .= '</span>';
 			}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 3f1b42aa5c2..c8409cbe9ae 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -157,7 +157,7 @@ class Utils
 						}
 					}
 					if (!$alreadyincluded) {
-						$filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
+						$filesarray[] = array('fullname' => $filelog, 'type' => 'file');
 					}
 				}
 			}
@@ -783,7 +783,7 @@ class Utils
 
 		dol_syslog("Utils::executeCLI result=".$result." output=".$output." error=".$error, LOG_DEBUG);
 
-		return array('result'=>$result, 'output'=>$output, 'error'=>$error);
+		return array('result' => $result, 'output' => $output, 'error' => $error);
 	}
 
 	/**
@@ -909,25 +909,26 @@ class Utils
 
 					//var_dump($phpfileval['fullname']);
 					$arrayreplacement = array(
-						'mymodule'=>strtolower($module),
-						'MyModule'=>$module,
-						'MYMODULE'=>strtoupper($module),
-						'My module'=>$module,
-						'my module'=>$module,
-						'Mon module'=>$module,
-						'mon module'=>$module,
-						'htdocs/modulebuilder/template'=>strtolower($module),
-						'__MYCOMPANY_NAME__'=>$mysoc->name,
-						'__KEYWORDS__'=>$module,
-						'__USER_FULLNAME__'=>$user->getFullName($langs),
-						'__USER_EMAIL__'=>$user->email,
-						'__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
-						'---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
-						'__DATA_SPECIFICATION__'=>'Not yet available',
-						'__README__'=>dolMd2Asciidoc($contentreadme),
-						'__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),
+						'mymodule' => strtolower($module),
+						'MyModule' => $module,
+						'MYMODULE' => strtoupper($module),
+						'My module' => $module,
+						'my module' => $module,
+						'Mon module' => $module,
+						'mon module' => $module,
+						'htdocs/modulebuilder/template' => strtolower($module),
+						'__MYCOMPANY_NAME__' => $mysoc->name,
+						'__KEYWORDS__' => $module,
+						'__USER_FULLNAME__' => $user->getFullName($langs),
+						'__USER_EMAIL__' => $user->email,
+						'__YYYY-MM-DD__' => dol_print_date($now, 'dayrfc'),
+						'---Put here your own copyright and developer email---' => dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
+						'__DATA_SPECIFICATION__' => 'Not yet available',
+						'__README__' => dolMd2Asciidoc($contentreadme),
+						'__CHANGELOG__' => dolMd2Asciidoc($contentchangelog),
 					);
 
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					dolReplaceInFile($destfile, $arrayreplacement);
 				}
 
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index e5ab3e0c3cd..28434f7d405 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -142,6 +142,7 @@ if (isModEnabled('modulebuilder')) {
 	//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 	$text .= '<span class="fa fa-bug atoplogin"></span>';
 	$text .= '</a>';
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 }
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d18aa3c8fd2..01afca27f93 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -390,7 +390,7 @@ function societe_prepare_head(Societe $object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -537,7 +537,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs =
 	// Check parameters
 	if (empty($searchkey) && empty($searchlabel)) {
 		if ($withcode === 'all') {
-			return array('id'=>'', 'code'=>'', 'label'=>'');
+			return array('id' => '', 'code' => '', 'label' => '');
 		} else {
 			return '';
 		}
@@ -578,7 +578,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs =
 			} elseif ($withcode == 3) {
 				$result = $obj->rowid;
 			} elseif ($withcode === 'all') {
-				$result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
+				$result = array('id' => $obj->rowid, 'code' => $obj->code, 'label' => $label);
 			} else {
 				$result = $label;
 			}
@@ -651,9 +651,9 @@ function getState($id, $withcode = '', $dbtouse = null, $withregion = 0, $output
 				}
 			} elseif ($withcode === 'all') {
 				if ($withregion == 1) {
-					return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);
+					return array('id' => $obj->id, 'code' => $obj->code, 'label' => $label, 'region_code' => $obj->region_code, 'region' => $obj->region_name);
 				} else {
-					return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);
+					return array('id' => $obj->id, 'code' => $obj->code, 'label' => $label);
 				}
 			} else {
 				if ($withregion == 1) {
@@ -962,7 +962,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 			dol_print_error($db);
 		}
 
-		$parameters = array('sql'=>$sql, 'function'=>'show_projects');
+		$parameters = array('sql' => $sql, 'function' => 'show_projects');
 		$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -1062,35 +1062,35 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$extrafields->fetch_name_optionals_label($contactstatic->table_element);
 
 	$contactstatic->fields = array(
-		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'visible'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1),
-		'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
-		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'index'=>1, 'position'=>20),
-		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible'=>3, 'position'=>35),
-		'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>4, 'index'=>1, 'position'=>40),
-		'birthday' 	=>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 0, 'position'=>45),
-		'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
+		'rowid'     => array('type' => 'integer', 'label' => "TechnicalID", 'enabled' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'visible' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position' => 1),
+		'name'      => array('type' => 'varchar(128)', 'label' => 'Name', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1),
+		'poste'     => array('type' => 'varchar(128)', 'label' => 'PostOrFunction', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 2, 'index' => 1, 'position' => 20),
+		'address'   => array('type' => 'varchar(128)', 'label' => 'Address', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 3, 'index' => 1, 'position' => 30),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible' => 3, 'position' => 35),
+		'role'      => array('type' => 'checkbox', 'label' => 'Role', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 4, 'index' => 1, 'position' => 40),
+		'birthday' 	=> array('type' => 'date', 'label' => 'Birthday', 'enabled' => 1, 'visible' => -1, 'notnull' => 0, 'position' => 45),
+		'statut'    => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => 0, 'index' => 1, 'position' => 50, 'arrayofkeyval' => array(0 => $contactstatic->LibStatut(0, 1), 1 => $contactstatic->LibStatut(1, 1))),
 	);
 
 	// Definition of fields for list
 	$arrayfields = array(
-		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1),
-		't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
-		't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
-		't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
-		't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position'=>35),
-		'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),
-		't.birthday'=>array('label'=>"Birthday", 'checked'=>0, 'position'=>45),
-		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
+		't.rowid' => array('label' => "TechnicalID", 'checked' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'enabled' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position' => 1),
+		't.name' => array('label' => "Name", 'checked' => 1, 'position' => 10),
+		't.poste' => array('label' => "PostOrFunction", 'checked' => 1, 'position' => 20),
+		't.address' => array('label' => (empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked' => 1, 'position' => 30),
+		't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 35),
+		'sc.role' => array('label' => "ContactByDefaultFor", 'checked' => 1, 'position' => 40),
+		't.birthday' => array('label' => "Birthday", 'checked' => 0, 'position' => 45),
+		't.statut' => array('label' => "Status", 'checked' => 1, 'position' => 50, 'class' => 'center'),
 	);
 	// Extra fields
 	if (!empty($extrafields->attributes[$contactstatic->table_element]['label']) && is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
 		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
-					'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
-					'checked'=>(((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1),
-					'position'=>1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key],
+					'label' => $extrafields->attributes[$contactstatic->table_element]['label'][$key],
+					'checked' => (((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1),
+					'position' => 1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key],
 					'enabled' => (abs((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1)) != 3 && (int) dol_eval($extrafields->attributes[$contactstatic->table_element]['perms'][$key], 1, 1, '1'))
 				);
 			}
@@ -1274,7 +1274,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) {
 			print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 			if (in_array($key, array('statut'))) {
-				print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+				print $form->selectarray('search_status', array('-1' => '', '0' => $contactstatic->LibStatut(0, 1), '1' => $contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
 			} elseif (in_array($key, array('role'))) {
 				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles, 'minwidth200 maxwidth300');
 			} elseif (in_array($key, array('birthday'))) {
@@ -1298,7 +1298,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -1345,7 +1345,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$extrafieldsobjectkey = $contactstatic->table_element;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -1406,7 +1406,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 				print '<td class="nowrap center">';
 
 				// Add to agenda
-				if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) {
+				if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
 					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_object($langs->trans("Event"), "action");
 					print '</a> &nbsp; ';
@@ -1484,7 +1484,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 
 			if ($showuserlogin) {
 				print '<td class="tdoverflowmax125">';
-				$tmpuser= new User($db);
+				$tmpuser = new User($db);
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				$resfetch = $tmpuser->fetch(0, '', '', 0, -1, '', $contactstatic->id);
 				if ($resfetch > 0) {
 					print $tmpuser->getNomUrl(1, '', 0, 0, 24, 1);
@@ -1501,7 +1502,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 				print '<td class="nowrap center">';
 
 				// Add to agenda
-				if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) {
+				if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
 					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_object($langs->trans("Event"), "action");
 					print '</a> &nbsp; ';
@@ -1686,7 +1687,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters);    // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
-			$sql.= $hookmanager->resPrint;
+			$sql .= $hookmanager->resPrint;
 		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
@@ -1708,7 +1709,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters);    // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
-			$sql.= $hookmanager->resPrint;
+			$sql .= $hookmanager->resPrint;
 		}
 		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
@@ -1829,7 +1830,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters);    // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
-			$sql.= $hookmanager->resPrint;
+			$sql .= $hookmanager->resPrint;
 		}
 
 		if (is_array($actioncode)) {
@@ -1893,48 +1894,48 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 					}
 
 					$histo[$numaction] = array(
-						'type'=>$obj->type,
-						'tododone'=>$tododone,
-						'id'=>$obj->id,
-						'datestart'=>$db->jdate($obj->dp),
-						'dateend'=>$db->jdate($obj->dp2),
-						'note'=>$obj->label,
-						'percent'=>$obj->percent,
+						'type' => $obj->type,
+						'tododone' => $tododone,
+						'id' => $obj->id,
+						'datestart' => $db->jdate($obj->dp),
+						'dateend' => $db->jdate($obj->dp2),
+						'note' => $obj->label,
+						'percent' => $obj->percent,
 
-						'userid'=>$obj->user_id,
-						'login'=>$obj->user_login,
-						'userfirstname'=>$obj->user_firstname,
-						'userlastname'=>$obj->user_lastname,
-						'userphoto'=>$obj->user_photo,
+						'userid' => $obj->user_id,
+						'login' => $obj->user_login,
+						'userfirstname' => $obj->user_firstname,
+						'userlastname' => $obj->user_lastname,
+						'userphoto' => $obj->user_photo,
 
-						'contact_id'=>$obj->fk_contact,
+						'contact_id' => $obj->fk_contact,
 						'socpeopleassigned' => $contactaction->socpeopleassigned,
 						'lastname' => empty($obj->lastname) ? '' : $obj->lastname,
 						'firstname' => empty($obj->firstname) ? '' : $obj->firstname,
-						'fk_element'=>$obj->fk_element,
-						'elementtype'=>$obj->elementtype,
+						'fk_element' => $obj->fk_element,
+						'elementtype' => $obj->elementtype,
 						// Type of event
-						'acode'=>$obj->acode,
-						'alabel'=>$obj->alabel,
-						'libelle'=>$obj->alabel, // deprecated
-						'apicto'=>$obj->apicto
+						'acode' => $obj->acode,
+						'alabel' => $obj->alabel,
+						'libelle' => $obj->alabel, // deprecated
+						'apicto' => $obj->apicto
 					);
 				} else {
 					$histo[$numaction] = array(
-						'type'=>$obj->type,
-						'tododone'=>'done',
-						'id'=>$obj->id,
-						'datestart'=>$db->jdate($obj->dp),
-						'dateend'=>$db->jdate($obj->dp2),
-						'note'=>$obj->label,
-						'percent'=>$obj->percent,
-						'acode'=>$obj->acode,
+						'type' => $obj->type,
+						'tododone' => 'done',
+						'id' => $obj->id,
+						'datestart' => $db->jdate($obj->dp),
+						'dateend' => $db->jdate($obj->dp2),
+						'note' => $obj->label,
+						'percent' => $obj->percent,
+						'acode' => $obj->acode,
 
-						'userid'=>$obj->user_id,
-						'login'=>$obj->user_login,
-						'userfirstname'=>$obj->user_firstname,
-						'userlastname'=>$obj->user_lastname,
-						'userphoto'=>$obj->user_photo
+						'userid' => $obj->user_id,
+						'login' => $obj->user_login,
+						'userfirstname' => $obj->user_firstname,
+						'userlastname' => $obj->user_lastname,
+						'userphoto' => $obj->user_photo
 					);
 				}
 
@@ -1946,7 +1947,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		}
 	}
 
-	if (isModEnabled('agenda')|| (isModEnabled('mailing') && !empty($objcon->email))) {
+	if (isModEnabled('agenda') || (isModEnabled('mailing') && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 3218ee9212d..19d9c9319a2 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -450,7 +450,7 @@ function dolGetListOfObjectClasses($destdir)
 			$objects[$fileobj['fullname']] = $objectnameloop;
 		}
 	}
-	if (count($objects)>0) {
+	if (count($objects) > 0) {
 		return $objects;
 	}
 
@@ -559,12 +559,12 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 			}
 		}
 	} elseif ($action == -2 && !empty($objectname) && !empty($module)) {
-		$key= null;
+		$key = null;
 		$right = null;
 		$objectOfRights = array();
 		//check if object already declared in rights file
 		foreach ($permissions as $right) {
-			$objectOfRights[]= $right[4];
+			$objectOfRights[] = $right[4];
 		}
 		if (in_array(strtolower($objectname), $objectOfRights)) {
 			$error++;
@@ -591,7 +591,7 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 	if (!$error) {
 		// prepare permissions array
 		$count_perms = count($permissions);
-		for ($i = 0;$i<$count_perms;$i++) {
+		for ($i = 0;$i < $count_perms;$i++) {
 			$permissions[$i][0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', \$r + 1)";
 			$permissions[$i][1] = "\$this->rights[\$r][1] = '".$permissions[$i][1]."'";
 			$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";
@@ -611,7 +611,7 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 
 
 		// parcourir les objects
-		$o=0;
+		$o = 0;
 		foreach ($permissions as &$object) {
 			// récupérer la permission de l'objet
 			$p = 1;
@@ -735,7 +735,7 @@ function writePropsInAsciiDoc($file, $objectname, $destfile)
 	foreach ($attributesUnique as $attUnique) {
 		$table .= "|".$attUnique;
 	}
-	$table .="\n";
+	$table .= "\n";
 	$valuesModif = array();
 	foreach ($keys as $string) {
 		$string = trim($string, "'");
@@ -783,9 +783,9 @@ function writePropsInAsciiDoc($file, $objectname, $destfile)
 	$table .= "|===\n";
 	$table .= "__ end table for object $objectname\n";
 
-	//write in file
+	//write in file @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$writeInFile = dolReplaceInFile($destfile, array('== DATA SPECIFICATIONS' => $table));
-	if ($writeInFile<0) {
+	if ($writeInFile < 0) {
 		return -1;
 	}
 	return 1;
@@ -897,7 +897,7 @@ function writePermsInAsciiDoc($file, $destfile)
 	foreach ($permissions as $key => $element) {
 		$element = str_replace(" '", '', $element);
 		$element = trim($element, "'");
-		$permsN[] = substr($element, strpos($element, "=")+1);
+		$permsN[] = substr($element, strpos($element, "=") + 1);
 	}
 	array_pop($permsN);
 
@@ -926,8 +926,9 @@ function writePermsInAsciiDoc($file, $destfile)
 	}
 	// end table
 	$string .= "\n|===\n";
-	$write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__'=> $string));
-	if ($write<0) {
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+	$write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__' => $string));
+	if ($write < 0) {
 		return -1;
 	}
 	return 1;
@@ -985,7 +986,7 @@ function addObjectsToApiFile($file, $objects, $modulename)
 	//add methods for each object
 	$allContent = getFromFile($file, '/*begin methods CRUD*/', '/*end methods CRUD*/');
 	foreach ($objects as $object) {
-		$contentReplaced =str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
+		$contentReplaced = str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
 		dolReplaceInFile($file, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/'));
 	}
 	dolReplaceInFile($file, array($allContent => '','MyModule' => ucfirst($modulename)));
@@ -1049,7 +1050,7 @@ function removeObjectFromApiFile($file, $objectname, $modulename)
  */
 function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 {
-	$errors =0;
+	$errors = 0;
 	$counter = 0;
 	if (!file_exists($file)) {
 		return -1;
@@ -1062,7 +1063,7 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 		array_push($menus, $menuWantTo);
 	} elseif ($action == 2 && !empty($key) && !empty($menuWantTo)) {
 		// update right from permissions array
-		$urlCounter=0;
+		$urlCounter = 0;
 		// check if the values already exists
 		foreach ($menus as $index => $menu) {
 			if ($index !== $key) {
@@ -1111,20 +1112,20 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 				//var_dump(dol_escape_php($menu['perms'], 1)); exit;
 
 				$str_menu .= $start."\n";
-				$str_menu.= "\t\t\$this->menu[\$r++]=array(\n";
-				$str_menu.= "\t\t\t 'fk_menu' => '".dol_escape_php($menu['fk_menu'], 1)."',\n";
-				$str_menu.= "\t\t\t 'type' => '".dol_escape_php($menu['type'], 1)."',\n";
-				$str_menu.= "\t\t\t 'titre' => '".dol_escape_php($menu['titre'], 1)."',\n";
-				$str_menu.= "\t\t\t 'mainmenu' => '".dol_escape_php($menu['mainmenu'], 1)."',\n";
-				$str_menu.= "\t\t\t 'leftmenu' => '".dol_escape_php($menu['leftmenu'], 1)."',\n";
-				$str_menu.= "\t\t\t 'url' => '".dol_escape_php($menu['url'], 1)."',\n";
-				$str_menu.= "\t\t\t 'langs' => '".dol_escape_php($menu['langs'], 1)."',\n";
-				$str_menu.= "\t\t\t 'position' => ".((int) $menu['position']).",\n";
-				$str_menu.= "\t\t\t 'enabled' => '".dol_escape_php($menu['enabled'], 1)."',\n";
-				$str_menu.= "\t\t\t 'perms' => '".dol_escape_php($menu['perms'], 1)."',\n";
-				$str_menu.= "\t\t\t 'target' => '".dol_escape_php($menu['target'], 1)."',\n";
-				$str_menu.= "\t\t\t 'user' => ".((int) $menu['user']).",\n";
-				$str_menu.= "\t\t);\n";
+				$str_menu .= "\t\t\$this->menu[\$r++]=array(\n";
+				$str_menu .= "\t\t\t 'fk_menu' => '".dol_escape_php($menu['fk_menu'], 1)."',\n";
+				$str_menu .= "\t\t\t 'type' => '".dol_escape_php($menu['type'], 1)."',\n";
+				$str_menu .= "\t\t\t 'titre' => '".dol_escape_php($menu['titre'], 1)."',\n";
+				$str_menu .= "\t\t\t 'mainmenu' => '".dol_escape_php($menu['mainmenu'], 1)."',\n";
+				$str_menu .= "\t\t\t 'leftmenu' => '".dol_escape_php($menu['leftmenu'], 1)."',\n";
+				$str_menu .= "\t\t\t 'url' => '".dol_escape_php($menu['url'], 1)."',\n";
+				$str_menu .= "\t\t\t 'langs' => '".dol_escape_php($menu['langs'], 1)."',\n";
+				$str_menu .= "\t\t\t 'position' => ".((int) $menu['position']).",\n";
+				$str_menu .= "\t\t\t 'enabled' => '".dol_escape_php($menu['enabled'], 1)."',\n";
+				$str_menu .= "\t\t\t 'perms' => '".dol_escape_php($menu['perms'], 1)."',\n";
+				$str_menu .= "\t\t\t 'target' => '".dol_escape_php($menu['target'], 1)."',\n";
+				$str_menu .= "\t\t\t 'user' => ".((int) $menu['user']).",\n";
+				$str_menu .= "\t\t);\n";
 
 				if (is_null($next_val) || $val_actuel['leftmenu'] !== $next_val['leftmenu']) {
 					$str_menu .= $end."\n";
@@ -1266,7 +1267,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
 	$dictionnaires['tabfieldinsert'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabrowid'][] = $primaryKey;
 	$dictionnaires['tabcond'][] = isModEnabled('$modulename');
-	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code'=>$langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');
+	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code' => $langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');
 
 	// Build the dictionary string
 	$writeInfile = updateDictionaryInFile($modulename, $file, $dictionnaires);
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index aaf3b602a36..271667675cd 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -519,6 +519,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 	if ($containeraliasalt) {
 		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 		$tmpwebsitepage = new WebsitePage($db);
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt);
 		if ($result > 0) {
 			$containerref = $tmpwebsitepage->pageurl;
@@ -542,6 +543,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		if (!$containeraliasalt) {	// If containeraliasalt set, we already did the test
 			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 			$tmpwebsitepage = new WebsitePage($db);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
 			unset($tmpwebsitepage);
 		}
@@ -1104,7 +1106,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 
 	$error = 0;
-	$arrayresult = array('code'=>'', 'list'=>array());
+	$arrayresult = array('code' => '', 'list' => array());
 
 	if (!is_object($weblangs)) {
 		$weblangs = $langs;
@@ -1212,22 +1214,22 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 
 		$filecontent = file_get_contents($filehtmlheader);
 		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
-			$arrayresult['list'][] = array('type'=>'website_htmlheadercontent');
+			$arrayresult['list'][] = array('type' => 'website_htmlheadercontent');
 		}
 
 		$filecontent = file_get_contents($filecss);
 		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
-			$arrayresult['list'][] = array('type'=>'website_csscontent');
+			$arrayresult['list'][] = array('type' => 'website_csscontent');
 		}
 
 		$filecontent = file_get_contents($filejs);
 		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
-			$arrayresult['list'][] = array('type'=>'website_jscontent');
+			$arrayresult['list'][] = array('type' => 'website_jscontent');
 		}
 
 		$filerobot = file_get_contents($filerobot);
 		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
-			$arrayresult['list'][] = array('type'=>'website_robotcontent');
+			$arrayresult['list'][] = array('type' => 'website_robotcontent');
 		}
 
 		$searchdone = 1;
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 48d43f760e9..f1e0d0c26ad 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -285,7 +285,7 @@ class pdf_crabe extends ModelePDFFactures
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -775,7 +775,7 @@ class pdf_crabe extends ModelePDFFactures
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -784,10 +784,10 @@ class pdf_crabe extends ModelePDFFactures
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -872,7 +872,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -882,7 +882,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1204,8 +1204,9 @@ class pdf_crabe extends ModelePDFFactures
 				if ($object->mode_reglement_code == "PRE") {
 					require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 					$bac = new CompanyBankAccount($this->db);
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$bac->fetch(0, $object->thirdparty->id);
-					$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
+					$iban = $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
 					$lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
 				}
 				$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
@@ -2139,11 +2140,11 @@ class pdf_crabe extends ModelePDFFactures
 					$contactshipping = $object->fetch_Contact($idaddressshipping[0]);
 					$companystatic = new Societe($this->db);
 					$companystatic->fetch($object->contact->fk_soc);
-					$carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs);
+					$carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs);
 					$carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $companystatic, $object->contact, $usecontact, 'target', $object);
 				} else {
-					$carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
-					$carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);
+					$carac_client_name_shipping = pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
+					$carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);
 				}
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
@@ -2162,7 +2163,7 @@ class pdf_crabe extends ModelePDFFactures
 					$posy = $pdf->getY();
 
 					// Show shipping information
-					$pdf->SetXY($posx+2, $posy);
+					$pdf->SetXY($posx + 2, $posy);
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L');
 					$top_shift += $hautcadre;
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 00c28594717..438123738d4 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -317,7 +317,7 @@ class pdf_sponge extends ModelePDFFactures
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -848,9 +848,9 @@ class pdf_sponge extends ModelePDFFactures
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -900,7 +900,7 @@ class pdf_sponge extends ModelePDFFactures
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
 						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
-							$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
@@ -934,17 +934,17 @@ class pdf_sponge extends ModelePDFFactures
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					$nexY = max($nexY, $posYAfterImage);
 
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -1024,7 +1024,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -1034,7 +1034,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1298,8 +1298,9 @@ class pdf_sponge extends ModelePDFFactures
 				if ($object->mode_reglement_code == "PRE") {
 					require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 					$bac = new CompanyBankAccount($this->db);
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$bac->fetch(0, $object->thirdparty->id);
-					$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
+					$iban = $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
 					$lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
 				}
 
@@ -2390,11 +2391,11 @@ class pdf_sponge extends ModelePDFFactures
 					$contactshipping = $object->fetch_Contact($idaddressshipping[0]);
 					$companystatic = new Societe($this->db);
 					$companystatic->fetch($object->contact->fk_soc);
-					$carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs);
+					$carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs);
 					$carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $companystatic, $object->contact, $usecontact, 'target', $object);
 				} else {
-					$carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
-					$carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);
+					$carac_client_name_shipping = pdfBuildThirdpartyName($object->thirdparty, $outputlangs);
+					$carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object);
 				}
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
@@ -2413,7 +2414,7 @@ class pdf_sponge extends ModelePDFFactures
 					$posy = $pdf->getY();
 
 					// Show shipping information
-					$pdf->SetXY($posx+2, $posy);
+					$pdf->SetXY($posx + 2, $posy);
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L');
 					$shipp_shift += $hautcadre;
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index bb3f6ae561e..2cc8f02d3b8 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -393,6 +393,7 @@ class ImportCsv extends ModeleImports
 
 						// Is it a required field ?
 						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
+							// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
 							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
@@ -405,7 +406,7 @@ class ImportCsv extends ModeleImports
 								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-									) {
+								) {
 									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
 									$isidorref = 'id';
 									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
@@ -854,7 +855,7 @@ class ImportCsv extends ModeleImports
 						$fname = 'rowid';
 						if (strpos($tablename, '_categorie_') !== false) {
 							$is_table_category_link = true;
-							$fname='*';
+							$fname = '*';
 						}
 
 						if (!empty($updatekeys)) {
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 5e9ca592a0c..9750222149a 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -516,6 +516,7 @@ class ImportXlsx extends ModeleImports
 												$newval = $classinstance->id;
 											} elseif (! $error) {
 												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+													// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
@@ -558,6 +559,7 @@ class ImportXlsx extends ModeleImports
 												$newval = $classinstance->id;
 											} else {
 												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+													// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} else {
 													$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
@@ -595,6 +597,7 @@ class ImportXlsx extends ModeleImports
 											$newval = $scaleorid ? $scaleorid : 0;
 										} else {
 											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+												// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 												$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 											} else {
 												$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
@@ -753,6 +756,7 @@ class ImportXlsx extends ModeleImports
 										if (!empty($filter)) {
 											$tableforerror .= ':' . $filter;
 										}
+										// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
@@ -761,6 +765,7 @@ class ImportXlsx extends ModeleImports
 								} elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) {
 									// If test is just a static regex
 									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+									// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
@@ -771,6 +776,7 @@ class ImportXlsx extends ModeleImports
 							// Check HTML injection
 							$inj = testSqlAndScriptInject($newval, 0);
 							if ($inj) {
+								// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 								$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorHtmlInjectionForField', $key, dol_trunc($newval, 100));
 								$this->errors[$error]['type'] = 'HTMLINJECTION';
 								$errorforthistable++;
@@ -892,7 +898,7 @@ class ImportXlsx extends ModeleImports
 						$fname = 'rowid';
 						if (strpos($tablename, '_categorie_') !== false) {
 							$is_table_category_link = true;
-							$fname='*';
+							$fname = '*';
 						}
 
 						if (!empty($updatekeys)) {
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 a12dd5ed70a..09a79dca030 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
@@ -359,7 +359,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$substitutionarray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Line of free text
@@ -412,9 +412,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 				$companybankaccount = new CompanyBankAccount($this->db);
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				$companybankaccount->fetch(0, $object->thirdparty->id);
-				$array_objet['company_default_bank_iban']=$companybankaccount->iban;
-				$array_objet['company_default_bank_bic']=$companybankaccount->bic;
+				$array_objet['company_default_bank_iban'] = $companybankaccount->iban;
+				$array_objet['company_default_bank_bic'] = $companybankaccount->bic;
 
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
@@ -426,7 +427,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook
-				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				foreach ($tmparray as $key => $value) {
@@ -464,7 +465,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
-							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
+							$parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray, 'line' => $line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val) {
 								try {
@@ -496,7 +497,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				}
 
 				// Call the beforeODTSave hook
-				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray);
 				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
@@ -517,14 +518,14 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						return -1;
 					}
 				}
-				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				dolChmod($file);
 
 				$odfHandler = null; // Destroy object
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // Success
 			} else {
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index adaa6686ebf..d925aa68368 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -293,6 +293,7 @@ if (empty($reshook)) {
 	// Action validation
 	if ($action == 'valid_promesse') {
 		$object->fetch($id);
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		if ($object->valid_promesse($id, $user->id) >= 0) {
 			setEventMessages($langs->trans("DonationValidated", $object->ref), null);
 			$action = '';
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 5e13d12bd35..1312e385480 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -317,6 +317,7 @@ class Donations extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$result = $this->don->valid_promesse($id, DolibarrApiAccess::$user->id, $notrigger);
 		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index dbdd5caf745..c3bce69d1db 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -725,6 +725,7 @@ class Don extends CommonObject
 	 */
 	public function setValid($user, $notrigger = 0)
 	{
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		return $this->valid_promesse($this->id, $user->id, $notrigger);
 	}
 
@@ -957,7 +958,7 @@ class Don extends CommonObject
 		$result .= $linkend;
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index a6c3687c9c5..638dbd6b700 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -58,7 +58,7 @@ $entitytoicon = array(
 	'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
-	'virtualproduct'=>'product',
+	'virtualproduct' => 'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
 	'stock'        => 'stock',
@@ -67,11 +67,11 @@ $entitytoicon = array(
 	'stockbatch'   => 'stock',
 	'category'     => 'category',
 	'shipment'     => 'sending',
-	'shipment_line'=> 'sending',
-	'reception'=> 'sending',
-	'reception_line'=> 'sending',
-	'expensereport'=> 'trip',
-	'expensereport_line'=> 'trip',
+	'shipment_line' => 'sending',
+	'reception' => 'sending',
+	'reception_line' => 'sending',
+	'expensereport' => 'trip',
+	'expensereport_line' => 'trip',
 	'holiday'      => 'holiday',
 	'contract_line' => 'contract',
 	'translation'  => 'generic',
@@ -114,16 +114,16 @@ $entitytolang = array(
 	'other'        => 'Other',
 	'trip'         => 'TripsAndExpenses',
 	'shipment'     => 'Shipments',
-	'shipment_line'=> 'ShipmentLine',
+	'shipment_line' => 'ShipmentLine',
 	'project'      => 'Projects',
 	'projecttask'  => 'Tasks',
 	'task_time'    => 'TaskTimeSpent',
 	'action'       => 'Event',
-	'expensereport'=> 'ExpenseReport',
-	'expensereport_line'=> 'ExpenseReportLine',
+	'expensereport' => 'ExpenseReport',
+	'expensereport_line' => 'ExpenseReportLine',
 	'holiday'      => 'TitreRequestCP',
 	'contract'     => 'Contract',
-	'contract_line'=> 'ContractLine',
+	'contract_line' => 'ContractLine',
 	'translation'  => 'Translation',
 	'bom'          => 'BOM',
 	'bomline'      => 'BOMLine',
@@ -1020,7 +1020,7 @@ if ($step == 4 && $datatoexport) {
 		print '<tr class="oddeven">';
 		print '<td><input name="export_name" value=""></td>';
 		print '<td>';
-		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
+		$arrayvisibility = array('private' => $langs->trans("Private"), 'all' => $langs->trans("Everybody"));
 		print $form->selectarray('visibility', $arrayvisibility, 'private');
 		print '</td>';
 		print '<td class="right">';
@@ -1203,6 +1203,7 @@ if ($step == 5 && $datatoexport) {
 		$htmltabloflibs .= '<td>'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' ';
 		$text = $objmodelexport->getDriverDescForKey($key);
 		$label = $listeall[$key];
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$htmltabloflibs .= $form->textwithpicto($label, $text).'</td>';
 		$htmltabloflibs .= '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
 		$htmltabloflibs .= '<td class="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index d7ede2988cc..2cde771c03a 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -83,6 +83,7 @@ foreach ($liste as $key => $val) {
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';
 	$text = $model->getDriverDescForKey($key);
 	$label = $liste[$key];
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print '<td>'.$form->textwithpicto($label, $text).'</td>';
 	print '<td>'.$model->getLibLabelForKey($key).'</td>';
 	print '<td class="nowrap right">'.$model->getLibVersionForKey($key).'</td>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 8365a92f7f8..6c097c907d8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -143,7 +143,7 @@ $error = 0;
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -2403,7 +2403,7 @@ if ($action == 'create') {
 			// Deposit - Down payment
 			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOSTINT('type') == 3 ? ' checked' : '') . '> ';
+				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOSTINT('type') == 3 ? ' checked' : '') . '> ';
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
@@ -2604,7 +2604,7 @@ if ($action == 'create') {
 				if (!getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 					$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 				} else {
-					$tmp='<input type="radio" name="type" id="radio_creditnote" value="2"> ';
+					$tmp = '<input type="radio" name="type" id="radio_creditnote" value="2"> ';
 				}
 				$text = $tmp.$langs->trans("InvoiceAvoir").' ';
 				$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").')</span> ';
@@ -3175,7 +3175,7 @@ if ($action == 'create') {
 		}
 
 		if (!$formconfirm) {
-			$parameters = array('formConfirm' => $formconfirm, 'lineid'=>$lineid);
+			$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;
@@ -3832,6 +3832,7 @@ if ($action == 'create') {
 						$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
 					}
 					print '<span class="opacitymedium">';
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
 					print '</span>';
 					print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).'</td><td>&nbsp;</td></tr>';
@@ -3896,7 +3897,7 @@ if ($action == 'create') {
 					print '<tr><td colspan="'.$nbcols.'" class="right">';
 					print '<span class="opacitymedium">';
 					print $langs->trans('RemainderToPayBackMulticurrency');
-					if ($resteapayeraffiche> 0) {
+					if ($resteapayeraffiche > 0) {
 						print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
 					}
 					print '</span>';
@@ -4081,7 +4082,7 @@ if ($action == 'create') {
 					// For credit note
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $usercancreate
 						&& (getDolGlobalString('SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') || $object->getSommePaiement() == 0)
-						) {
+					) {
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 					}
 					// For deposit invoice
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 43dd1645035..ba8128b7316 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -501,6 +501,7 @@ if ($step == 2 && $datatoimport) {
 		print '<tr class="oddeven">';
 		print '<td width="16">'.img_picto_common($key, $objmodelimport->getPictoForKey($key)).'</td>';
 		$text = $objmodelimport->getDriverDescForKey($key);
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
 		print '<td style="text-align:center">';
 		$filename = $langs->trans("ExampleOfImportFile").'_'.$datatoimport.'.'.$key;
@@ -593,6 +594,7 @@ if ($step == 3 && $datatoimport) {
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td class="nowraponall">';
 	$text = $objmodelimport->getDriverDescForKey($format);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td><td style="text-align:right" class="nowrap">';
 	$filename = $langs->trans("ExampleOfImportFile").'_'.$datatoimport.'.'.$format;
@@ -991,6 +993,7 @@ if ($step == 4 && $datatoimport) {
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
 	$text = $objmodelimport->getDriverDescForKey($format);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
@@ -1087,6 +1090,7 @@ if ($step == 4 && $datatoimport) {
 
 	$lefti = 1;
 	foreach ($fieldssource as $key => $val) {
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		show_elem($fieldssource, $key, $val); // key is field number in source file
 		$listofkeys[$key] = 1;
 		$fieldsplaced[$key] = 1;
@@ -1655,6 +1659,7 @@ if ($step == 5 && $datatoimport) {
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
 	$text = $objmodelimport->getDriverDescForKey($format);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
@@ -2140,6 +2145,7 @@ if ($step == 6 && $datatoimport) {
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
 	$text = $objmodelimport->getDriverDescForKey($format);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index e90f58aa8e1..0914233d233 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -74,6 +74,7 @@ foreach ($list as $key) {
 	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';
 	$text = $model->getDriverDescForKey($key);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print '<td>'.$form->textwithpicto($model->getDriverLabelForKey($key), $text).'</td>';
 	print '<td>'.$model->getLibLabelForKey($key).'</td>';
 	print '<td class="nowrap right">'.$model->getLibVersionForKey($key).'</td>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 44399631181..bc1a1e25816 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2253,6 +2253,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
 			$text .= '</a>';
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
@@ -2284,6 +2285,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-print atoplogin valignmiddle"></span>';
 			$text .= '</a>';
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$toprightmenu .= $form->textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
@@ -2330,6 +2332,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
 				$text .= '<span class="fa fa-long-arrow-alt-up helppresentcircle'.($helppresent ? '' : ' unvisible').'"></span>';
 				$text .= '</a>';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
 
@@ -2342,6 +2345,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$text = '<span class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
 		}
 
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 1113fe8ae4e..5385c924a28 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -233,6 +233,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if (getDolGlobalString('MARGIN_TYPE') == "1") {
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index d377da14927..9561ddf2f28 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -303,6 +303,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if (getDolGlobalString('MARGIN_TYPE') == "1") {
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index be679953190..b66bee3b605 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -253,6 +253,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	//var_dump($conf->global->MARGIN_TYPE);
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 6318eee1520..c2ec6485cf7 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -71,7 +71,7 @@ if (!$user->hasRight('margins', 'liretous')) {
  * Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -199,6 +199,7 @@ if ($socid > 0) {
 	if ($result) {
 		$num = $db->num_rows($result);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
 
 		$i = 0;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a6789e1f909..197f1b5e5dc 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -358,6 +358,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' ' . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
 			}
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
 			//var_dump($result);
 			if ($result < 0) {
@@ -469,7 +470,9 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 		if (count($objects) > 1) {
 			addObjectsToApiFile($destfile, $objects, $modulename);
 		} else {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			dolReplaceInFile($destfile, $arrayreplacement);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			dolReplaceInFile($destfile, array('/*begin methods CRUD*/' => '/*begin methods CRUD*/'."\n\t".'/*CRUD FOR '.strtoupper($objectname).'*/', '/*end methods CRUD*/' => '/*END CRUD FOR '.strtoupper($objectname).'*/'."\n\t".'/*end methods CRUD*/'));
 		}
 
@@ -477,6 +480,7 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 			// Now we update the object file to set $$varnametoupdate to 1
 			$srcfile = $dirins.'/'.strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php';
 			$arrayreplacement = array('/\$'.preg_quote($varnametoupdate, '/').' = 0;/' => '$'.$varnametoupdate.' = 1;');
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 		}
 	} else {
@@ -569,6 +573,7 @@ if ($dirins && $action == 'inithook' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 	} else {
 		$langs->load("errors");
@@ -603,6 +608,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 	} else {
 		$langs->load("errors");
@@ -637,6 +643,7 @@ if ($dirins && $action == 'initwidget' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 	} else {
 		$langs->load("errors");
@@ -671,6 +678,7 @@ if ($dirins && $action == 'initemailing' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 	} else {
 		$langs->load("errors");
@@ -705,6 +713,7 @@ if ($dirins && $action == 'initcss' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 
 		// Update descriptor file to uncomment file
@@ -744,6 +753,7 @@ if ($dirins && $action == 'initjs' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 
 		// Update descriptor file to uncomment file
@@ -788,6 +798,7 @@ if ($dirins && $action == 'initcli' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 	} else {
 		$langs->load("errors");
@@ -828,6 +839,7 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 			'---Put here your own copyright and developer email---' => dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		dolReplaceInFile($destfile, $arrayreplacement);
 
 		// add table of properties
@@ -866,6 +878,7 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 				}
 			}
 			$stringLog = implode("\n", $strreplace);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			dolReplaceInFile($destfile, array('//include::ChangeLog.md[]' => '','__CHANGELOG__' => $stringLog));
 		}
 
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 81d18818a48..5d9fe35343b 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -97,7 +97,7 @@ if ($object->id > 0) {
  *	Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -214,6 +214,7 @@ if ($id > 0 || $ref) {
 			$param .= '&limit='.$limit;
 		}
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		print_barre_liste($langs->trans("ActionsOnProduct"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2d664de7376..9208d0a6b71 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -585,29 +585,29 @@ class Product extends CommonObject
 	 * @var array fields of object product
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>5),
-		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'position'=>15, 'csslist'=>'tdoverflowmax250'),
-		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'isModEnabled("barcode")', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>3),
-		'fk_barcode_type' => array('type'=>'integer', 'label'=>'BarcodeType', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>-1,),
-		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
-		'note'          =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
-		'datec'         =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
-		'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
+		'ref'           => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'comment' => 'Reference of object'),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 5),
+		'label'         => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 2, 'position' => 15, 'csslist' => 'tdoverflowmax250'),
+		'barcode'       => array('type' => 'varchar(255)', 'label' => 'Barcode', 'enabled' => 'isModEnabled("barcode")', 'position' => 20, 'visible' => -1, 'showoncombobox' => 3),
+		'fk_barcode_type' => array('type' => 'integer', 'label' => 'BarcodeType', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => -1,),
+		'note_public'   => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 61),
+		'note'          => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 62),
+		'datec'         => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500),
+		'tms'           => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_author'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'fk_user_author' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 510, 'foreignkey' => 'llx_user.rowid'),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 511),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'localtax1_tx' => array('type'=>'double(6,3)', 'label'=>'Localtax1tx', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1,),
-		'localtax1_type' => array('type'=>'varchar(10)', 'label'=>'Localtax1type', 'enabled'=>'1', 'position'=>155, 'notnull'=>1, 'visible'=>-1,),
-		'localtax2_tx' => array('type'=>'double(6,3)', 'label'=>'Localtax2tx', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>-1,),
-		'localtax2_type' => array('type'=>'varchar(10)', 'label'=>'Localtax2type', 'enabled'=>'1', 'position'=>165, 'notnull'=>1, 'visible'=>-1,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
+		'localtax1_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax1tx', 'enabled' => '1', 'position' => 150, 'notnull' => 0, 'visible' => -1,),
+		'localtax1_type' => array('type' => 'varchar(10)', 'label' => 'Localtax1type', 'enabled' => '1', 'position' => 155, 'notnull' => 1, 'visible' => -1,),
+		'localtax2_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax2tx', 'enabled' => '1', 'position' => 160, 'notnull' => 0, 'visible' => -1,),
+		'localtax2_type' => array('type' => 'varchar(10)', 'label' => 'Localtax2type', 'enabled' => '1', 'position' => 165, 'notnull' => 1, 'visible' => -1,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -1, 'position' => 170),
+		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		'mandatory_period' => array('type'=>'integer', 'label'=>'mandatoryperiod', 'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000),
+		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1,  'notnull' => 1, 'default' => 0, 'index' => 1,  'position' => 1000),
 	);
 
 	/**
@@ -989,7 +989,7 @@ class Product extends CommonObject
 			$result = -2;
 		}
 
-		$arrayofnonnegativevalue = array('weight'=>'Weight', 'width'=>'Width', 'height'=>'Height', 'length'=>'Length', 'surface'=>'Surface', 'volume'=>'Volume');
+		$arrayofnonnegativevalue = array('weight' => 'Weight', 'width' => 'Width', 'height' => 'Height', 'length' => 'Length', 'surface' => 'Surface', 'volume' => 'Volume');
 		foreach ($arrayofnonnegativevalue as $key => $value) {
 			if (property_exists($this, $key) && !empty($this->$key) && ($this->$key < 0)) {
 				$langs->loadLangs(array("main", "other"));
@@ -1219,6 +1219,7 @@ class Product extends CommonObject
 						} else {
 							// we also add lot record if not exist
 							$ObjLot = new Productlot($this->db);
+							// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 							if ($ObjLot->fetch(0, $this->id, $valueforundefinedlot) == 0) {
 								$ObjLot->fk_product = $this->id;
 								$ObjLot->entity = $this->entity;
@@ -1361,8 +1362,8 @@ class Product extends CommonObject
 				if (!$this->hasbatch() && $this->oldcopy->hasbatch()) {
 					// Selection of all product stock movements that contains batchs
 					$sql = 'SELECT pb.qty, pb.fk_entrepot, pb.batch FROM '.MAIN_DB_PREFIX.'product_batch as pb';
-					$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
-					$sql.= ' WHERE ps.fk_product = '.(int) $this->id;
+					$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
+					$sql .= ' WHERE ps.fk_product = '.(int) $this->id;
 
 					$resql = $this->db->query($sql);
 					if ($resql) {
@@ -2023,7 +2024,7 @@ class Product extends CommonObject
 
 		// Call hook if any
 		if (is_object($hookmanager)) {
-			$parameters = array('thirdparty_seller'=>$thirdparty_seller, 'thirdparty_buyer' => $thirdparty_buyer, 'pqp' => $pqp);
+			$parameters = array('thirdparty_seller' => $thirdparty_seller, 'thirdparty_buyer' => $thirdparty_buyer, 'pqp' => $pqp);
 			// Note that $action and $object may have been modified by some hooks
 			$reshook = $hookmanager->executeHooks('getSellPrice', $parameters, $this, $action);
 			if ($reshook > 0) {
@@ -2123,7 +2124,7 @@ class Product extends CommonObject
 			}
 		}
 
-		return array('pu_ht'=>$pu_ht, 'pu_ttc'=>$pu_ttc, 'price_min'=>$price_min, 'price_base_type'=>$price_base_type, 'tva_tx'=>$tva_tx, 'tva_npr'=>$tva_npr);
+		return array('pu_ht' => $pu_ht, 'pu_ttc' => $pu_ttc, 'price_min' => $price_min, 'price_base_type' => $price_base_type, 'tva_tx' => $tva_tx, 'tva_npr' => $tva_npr);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2564,7 +2565,7 @@ class Product extends CommonObject
 		if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
 			if (getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
 				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
-				if ($this->db->num_rows($checkPMPPerEntity)>0) {
+				if ($this->db->num_rows($checkPMPPerEntity) > 0) {
 					$separatedEntityPMP = true;
 				}
 			}
@@ -3574,7 +3575,7 @@ class Product extends CommonObject
 			$sql .= "AND EXISTS (SELECT p.rowid FROM ".$this->db->prefix()."product AS p WHERE p.rowid = ".((int) $this->id)." AND p.fk_product_type IN (0))";
 		}
 		if (!empty($warehouseid)) {
-			$sql.= " AND m.fk_warehouse = ".((int) $warehouseid);
+			$sql .= " AND m.fk_warehouse = ".((int) $warehouseid);
 		}
 		$sql .= " GROUP BY role";
 
@@ -4590,16 +4591,16 @@ class Product extends CommonObject
 
 		// Updated ranks so that none are missing
 		$sqlrank = "SELECT rowid, rang FROM ".$this->db->prefix()."product_association";
-		$sqlrank.= " WHERE fk_product_pere = ".((int) $fk_parent);
-		$sqlrank.= " ORDER BY rang";
+		$sqlrank .= " WHERE fk_product_pere = ".((int) $fk_parent);
+		$sqlrank .= " ORDER BY rang";
 		$resqlrank = $this->db->query($sqlrank);
 		if ($resqlrank) {
 			$cpt = 0;
 			while ($objrank = $this->db->fetch_object($resqlrank)) {
 				$cpt++;
 				$sql = "UPDATE ".$this->db->prefix()."product_association";
-				$sql.= " SET rang = ".((int) $cpt);
-				$sql.= " WHERE rowid = ".((int) $objrank->rowid);
+				$sql .= " SET rang = ".((int) $cpt);
+				$sql .= " WHERE rowid = ".((int) $objrank->rowid);
 				if (! $this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
@@ -4992,20 +4993,20 @@ class Product extends CommonObject
 				}
 
 				$this->res[] = array(
-					'id'=>$id, // Id product
-					'id_parent'=>$id_parent,
-					'ref'=>$tmpproduct->ref, // Ref product
-					'nb'=>$nb, // Nb of units that compose parent product
-					'nb_total'=>$nb * $multiply, // Nb of units for all nb of product
-					'stock'=>$tmpproduct->stock_reel, // Stock
-					'stock_alert'=>$tmpproduct->seuil_stock_alerte, // Stock alert
-					'label'=>$label,
-					'fullpath'=>$compl_path.$label, // Label
-					'type'=>$type, // Nb of units that compose parent product
-					'desiredstock'=>$tmpproduct->desiredstock,
-					'level'=>$level,
-					'incdec'=>$incdec,
-					'entity'=>$tmpproduct->entity
+					'id' => $id, // Id product
+					'id_parent' => $id_parent,
+					'ref' => $tmpproduct->ref, // Ref product
+					'nb' => $nb, // Nb of units that compose parent product
+					'nb_total' => $nb * $multiply, // Nb of units for all nb of product
+					'stock' => $tmpproduct->stock_reel, // Stock
+					'stock_alert' => $tmpproduct->seuil_stock_alerte, // Stock alert
+					'label' => $label,
+					'fullpath' => $compl_path.$label, // Label
+					'type' => $type, // Nb of units that compose parent product
+					'desiredstock' => $tmpproduct->desiredstock,
+					'level' => $level,
+					'incdec' => $incdec,
+					'entity' => $tmpproduct->entity
 				);
 
 				// Recursive call if there child has children of its own
@@ -5188,12 +5189,12 @@ class Product extends CommonObject
 		$sql .= " WHERE p.rowid = pa.fk_product_fils";
 		$sql .= " AND pa.fk_product_pere = ".((int) $id);
 		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
-		$sql.= " ORDER BY pa.rang";
+		$sql .= " ORDER BY pa.rang";
 
 		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents) ? implode(',', $parents) : $parents), LOG_DEBUG);
 
 		if ($level == 1) {
-			$alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediately
+			$alreadyfound = array($id => 1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediately
 		}
 		// Protection against infinite loop
 		if ($level > 30) {
@@ -5212,14 +5213,14 @@ class Product extends CommonObject
 				}
 				$alreadyfound[$rec['rowid']] = 1;
 				$prods[$rec['rowid']] = array(
-					0=>$rec['rowid'],
-					1=>$rec['qty'],
-					2=>$rec['fk_product_type'],
-					3=>$this->db->escape($rec['label']),
-					4=>$rec['incdec'],
-					5=>$rec['ref'],
-					6=>$rec['fk_association'],
-					7=>$rec['rang']
+					0 => $rec['rowid'],
+					1 => $rec['qty'],
+					2 => $rec['fk_product_type'],
+					3 => $this->db->escape($rec['label']),
+					4 => $rec['incdec'],
+					5 => $rec['ref'],
+					6 => $rec['fk_association'],
+					7 => $rec['rang']
 				);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
@@ -5288,34 +5289,34 @@ class Product extends CommonObject
 		if ($this->type == Product::TYPE_PRODUCT) {
 			$datas['picto'] = img_picto('', 'product').' <u class="paddingrightonly">'.$langs->trans("Product").'</u>';
 		} elseif ($this->type == Product::TYPE_SERVICE) {
-			$datas['picto']= img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
+			$datas['picto'] = img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
 		}
 		if (isset($this->status) && isset($this->status_buy)) {
-			$datas['status']= ' '.$this->getLibStatut(5, 0) . ' '.$this->getLibStatut(5, 1);
+			$datas['status'] = ' '.$this->getLibStatut(5, 0) . ' '.$this->getLibStatut(5, 1);
 		}
 
 		if (!empty($this->ref)) {
-			$datas['ref']= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
+			$datas['ref'] = '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
 		}
 		if (!empty($this->label)) {
-			$datas['label']= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
+			$datas['label'] = '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
 		}
 		if (!empty($this->description)) {
-			$datas['description']= '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineOfText($this->description, 5);
+			$datas['description'] = '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineOfText($this->description, 5);
 		}
 		if ($this->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			if (isModEnabled('productbatch')) {
 				$langs->load("productbatch");
-				$datas['batchstatus']= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
+				$datas['batchstatus'] = "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 			}
 		}
 		if (isModEnabled('barcode')) {
-			$datas['barcode']= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
+			$datas['barcode'] = '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
 		}
 
 		if ($this->type == Product::TYPE_PRODUCT) {
 			if ($this->weight) {
-				$datas['weight']= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
+				$datas['weight'] = "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
 			}
 			$labelsize = "";
 			if ($this->length) {
@@ -5328,7 +5329,7 @@ class Product extends CommonObject
 				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Height").'</b>: '.$this->height.' '.measuringUnitString(0, 'size', $this->height_units);
 			}
 			if ($labelsize) {
-				$datas['size']= "<br>".$labelsize;
+				$datas['size'] = "<br>".$labelsize;
 			}
 
 			$labelsurfacevolume = "";
@@ -5346,9 +5347,9 @@ class Product extends CommonObject
 			// Duration
 			$datas['duration'] = '<br><b>'.$langs->trans("Duration").':</b> '.$this->duration_value;
 			if ($this->duration_value > 1) {
-				$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+				$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 			} elseif ($this->duration_value > 0) {
-				$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+				$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 			}
 			$datas['duration'] .= (!empty($this->duration_unit) && isset($dur[$this->duration_unit]) ? "&nbsp;".$langs->trans($dur[$this->duration_unit]) : '');
 		}
@@ -5483,7 +5484,7 @@ class Product extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('productdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result, 'label' => &$label);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result, 'label' => &$label);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -5965,7 +5966,7 @@ class Product extends CommonObject
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
 		}
 
-		$parameters = array('id'=>$this->id, 'includedraftpoforvirtual' => $includedraftpoforvirtual);
+		$parameters = array('id' => $this->id, 'includedraftpoforvirtual' => $includedraftpoforvirtual);
 		// Note that $action and $object may have been modified by some hooks
 		$reshook = $hookmanager->executeHooks('loadvirtualstock', $parameters, $this, $action);
 		if ($reshook > 0) {
@@ -6017,7 +6018,7 @@ class Product extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$result[] = array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
+				$result[] = array('batch' => $batch, 'eatby' => $this->db->jdate($obj->eatby), 'sellby' => $this->db->jdate($obj->sellby), 'qty' => $obj->qty);
 				$i++;
 			}
 			return $result;
@@ -6626,7 +6627,7 @@ class Product extends CommonObject
 		global $langs;
 
 		if (empty($this->duration_value)) {
-			$this->errors[]='ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice';
+			$this->errors[] = 'ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice';
 			return -1;
 		}
 
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index f9aeb2f03ca..793e9cf3c3c 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -261,7 +261,7 @@ if (empty($reshook)) {
 	}
 
 	// Save quantity found during inventory (when we click on Save button on inventory page)
-	if ($action =='updateinventorylines' && $permissiontoadd) {
+	if ($action == 'updateinventorylines' && $permissiontoadd) {
 		$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
@@ -356,7 +356,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';*/
 
 	if (GETPOST('addline', 'alpha')) {
-		$qty= (GETPOST('qtytoadd') != '' ? price2num(GETPOST('qtytoadd', 'MS')) : null);
+		$qty = (GETPOST('qtytoadd') != '' ? price2num(GETPOST('qtytoadd', 'MS')) : null);
 		if ($fk_warehouse <= 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -373,12 +373,12 @@ if (empty($reshook)) {
 			$tmpproduct = new Product($db);
 			$result = $tmpproduct->fetch($fk_product);
 
-			if (empty($error) && $tmpproduct->status_batch>0 && empty($batch)) {
+			if (empty($error) && $tmpproduct->status_batch > 0 && empty($batch)) {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorProductNeedBatchNumber", $tmpproduct->ref), null, 'errors');
 			}
-			if (empty($error) && $tmpproduct->status_batch==2 && !empty($batch) && $qty>1) {
+			if (empty($error) && $tmpproduct->status_batch == 2 && !empty($batch) && $qty > 1) {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("TooManyQtyForSerialNumber", $tmpproduct->ref, $batch), null, 'errors');
@@ -1050,6 +1050,7 @@ if ($resql) {
 		if (isModEnabled('productbatch')) {
 			print '<td id="id_'.$obj->rowid.'_batch" data-batch="'.dol_escape_htmltag($obj->batch).'">';
 			$batch_static = new Productlot($db);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$res = $batch_static->fetch(0, $product_static->id, $obj->batch);
 			if ($res) {
 				print $batch_static->getNomUrl(1);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index ee636b4efcb..5b6acca46ea 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -102,7 +102,7 @@ if ($cancel) {
 	$action = '';
 }
 
-$parameters = array('id'=>$id, 'ref'=>$ref);
+$parameters = array('id' => $id, 'ref' => $ref);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -369,7 +369,7 @@ if (empty($reshook)) {
 					'default_vat_code' => $vatratecode,
 					'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 					'npr' => $npr, // default_vat_code should be used in priority in a future
-					'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
+					'localtaxes_array' => array('0' => $localtax1_type, '1' => $localtax1, '2' => $localtax2_type, '3' => $localtax2)  // default_vat_code should be used in priority in a future
 				);
 
 				//If autogeneration is enabled, then we only set the first level
@@ -452,7 +452,7 @@ if (empty($reshook)) {
 				'default_vat_code' => $vatratecode,
 				'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 				'npr' => $npr, // default_vat_code should be used in priority in a future
-				'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
+				'localtaxes_array' => array('0' => $localtax1_type, '1' => $localtax1, '2' => $localtax2_type, '3' => $localtax2)   // default_vat_code should be used in priority in a future
 			);
 		}
 
@@ -1705,8 +1705,10 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
 			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
 			} else {
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
 			}
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 07ff350b921..6361cea7a8d 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -181,6 +181,7 @@ if ($action == 'addlimitstockwarehouse' && $user->hasRight('produit', 'creer'))
 
 	if ($maj_ok) {
 		$pse = new ProductStockEntrepot($db);
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		if ($pse->fetch(0, $id, GETPOSTINT('fk_entrepot')) > 0) {
 			// Update
 			$pse->seuil_stock_alerte = $seuil_stock_alerte;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 918f256ba5b..e679a3e180f 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1721,6 +1721,7 @@ if ($source == 'donation') {
 	require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 	$don = new Don($db);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$result = $don->fetch($ref);
 	if ($result <= 0) {
 		$mesg = $don->error;
diff --git a/htdocs/public/webportal/webportal.main.inc.php b/htdocs/public/webportal/webportal.main.inc.php
index c56e7d9bfba..c00f1c30935 100644
--- a/htdocs/public/webportal/webportal.main.inc.php
+++ b/htdocs/public/webportal/webportal.main.inc.php
@@ -229,6 +229,7 @@ if (!defined('WEBPORTAL_NOLOGIN') && !empty($context->controllerInstance->access
 					if (!$error) {
 						// get partnership
 						$logged_partnership = new WebPortalPartnership($db);
+						// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 						$result = $logged_partnership->fetch(0, '', $logged_member->id, $websiteaccount->thirdparty->id);
 						if ($result < 0) {
 							$error++;
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index a8acb98d303..d8447088922 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -105,11 +105,13 @@ if (empty($pageid)) {
 	$objectpage = new WebsitePage($db);
 
 	if ($pageref) {
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$result = $objectpage->fetch(0, $object->id, $pageref);
 		if ($result > 0) {
 			$pageid = $objectpage->id;
 		} elseif ($result == 0) {
 			// Page not found from ref=pageurl, we try using alternative alias
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$result = $objectpage->fetch(0, $object->id, null, $pageref);
 			if ($result > 0) {
 				$pageid = $objectpage->id;
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 85b2b312f16..76a8982062e 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -855,6 +855,7 @@ class Salary extends CommonObject
 		if ($this->paye == 0) {
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$bac = new CompanyBankAccount($this->db);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$bac->fetch(0, $mysoc->id);
 
 			$sql = "SELECT count(rowid) as nb";
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index db163d36068..0f88fefbd2c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1220,6 +1220,7 @@ class Thirdparties extends DolibarrApi
 		}
 		$account = new CompanyBankAccount($this->db);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$account->fetch($bankaccount_id, $id, -1, '');
 
 		if ($account->socid != $id) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e326da3ab45..eedaa168c37 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3340,6 +3340,7 @@ class Societe extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
 		$bac = new CompanyBankAccount($this->db);
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$bac->fetch(0, $this->id);
 
 		if ($bac->id > 0) {		// If a bank account has been found for company $this->id
@@ -4977,6 +4978,7 @@ class Societe extends CommonObject
 			if (!isset($this->bank_account)) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 				$bac = new CompanyBankAccount($this->db);
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				$result = $bac->fetch(0, $this->id);
 				if ($result > 0) {
 					$this->bank_account = $bac;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index df441063a51..19e620f7b8a 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -215,23 +215,23 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	's.nom'=>"ThirdPartyName",
-	's.name_alias'=>"AliasNameShort",
-	's.code_client'=>"CustomerCode",
-	's.code_fournisseur'=>"SupplierCode",
-	's.code_compta'=>"CustomerAccountancyCodeShort",
-	's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	's.email'=>"EMail",
-	's.url'=>"URL",
-	's.tva_intra'=>"VATIntra",
-	's.siren'=>"ProfId1",
-	's.siret'=>"ProfId2",
-	's.ape'=>"ProfId3",
-	's.phone'=>"Phone",
-	's.phone_mobile'=>"PhoneMobile",
-	's.fax'=>"Fax",
+	's.nom' => "ThirdPartyName",
+	's.name_alias' => "AliasNameShort",
+	's.code_client' => "CustomerCode",
+	's.code_fournisseur' => "SupplierCode",
+	's.code_compta' => "CustomerAccountancyCodeShort",
+	's.code_compta_fournisseur' => "SupplierAccountancyCodeShort",
+	's.zip' => "Zip",
+	's.town' => "Town",
+	's.email' => "EMail",
+	's.url' => "URL",
+	's.tva_intra' => "VATIntra",
+	's.siren' => "ProfId1",
+	's.siret' => "ProfId2",
+	's.ape' => "ProfId3",
+	's.phone' => "Phone",
+	's.phone_mobile' => "PhoneMobile",
+	's.fax' => "Fax",
 );
 if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') {
 	$fieldstosearchall['s.idprof4'] = 'ProfId4';
@@ -269,49 +269,49 @@ $checkedprofid6 = 0;
 $checkprospectlevel = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $checkstcomm = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $arrayfields = array(
-	's.rowid'=>array('label'=>"TechnicalID", 'position'=>1, 'checked'=>-1, 'enabled'=>1),
-	's.nom'=>array('label'=>"ThirdPartyName", 'position'=>2, 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'position'=>3, 'checked'=>1),
-	's.barcode'=>array('label'=>"Gencod", 'position'=>5, 'checked'=>1, 'enabled'=>(isModEnabled('barcode'))),
-	's.code_client'=>array('label'=>"CustomerCodeShort", 'position'=>10, 'checked'=>$checkedcustomercode),
-	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>(isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
-	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
-	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
-	's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>0),
-	's.zip'=>array('label'=>"Zip", 'position'=>20, 'checked'=>1),
-	's.town'=>array('label'=>"Town", 'position'=>21, 'checked'=>0),
-	'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0),
-	'region.nom'=>array('label'=>"Region", 'position'=>23, 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'position'=>24, 'checked'=>0),
-	's.email'=>array('label'=>"Email", 'position'=>25, 'checked'=>0),
-	's.url'=>array('label'=>"Url", 'position'=>26, 'checked'=>0),
-	's.phone'=>array('label'=>"Phone", 'position'=>27, 'checked'=>1),
-	's.fax'=>array('label'=>"Fax", 'position'=>28, 'checked'=>0),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'position'=>29, 'checked'=>$checkedtypetiers),
-	'staff.code'=>array('label'=>"Workforce", 'position'=>31, 'checked'=>0),
-	's.phone_mobile'=>array('label'=>"PhoneMobile", 'position'=>32, 'checked'=>0),
-	's.siren'=>array('label'=>"ProfId1Short", 'position'=>40, 'checked'=>$checkedprofid1),
-	's.siret'=>array('label'=>"ProfId2Short", 'position'=>41, 'checked'=>$checkedprofid2),
-	's.ape'=>array('label'=>"ProfId3Short", 'position'=>42, 'checked'=>$checkedprofid3),
-	's.idprof4'=>array('label'=>"ProfId4Short", 'position'=>43, 'checked'=>$checkedprofid4),
-	's.idprof5'=>array('label'=>"ProfId5Short", 'position'=>44, 'checked'=>$checkedprofid5),
-	's.idprof6'=>array('label'=>"ProfId6Short", 'position'=>45, 'checked'=>$checkedprofid6),
-	's.tva_intra'=>array('label'=>"VATIntraShort", 'position'=>50, 'checked'=>0),
-	'customerorsupplier'=>array('label'=>'NatureOfThirdParty', 'position'=>61, 'checked'=>1),
-	's.fk_prospectlevel'=>array('label'=>"ProspectLevel", 'position'=>62, 'checked'=>$checkprospectlevel),
-	's.fk_stcomm'=>array('label'=>"StatusProsp", 'position'=>63, 'checked'=>$checkstcomm),
-	's2.nom'=>array('label'=>'ParentCompany', 'position'=>64, 'checked'=>0),
-	's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	's.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
+	's.rowid' => array('label' => "TechnicalID", 'position' => 1, 'checked' => -1, 'enabled' => 1),
+	's.nom' => array('label' => "ThirdPartyName", 'position' => 2, 'checked' => 1),
+	's.name_alias' => array('label' => "AliasNameShort", 'position' => 3, 'checked' => 1),
+	's.barcode' => array('label' => "Gencod", 'position' => 5, 'checked' => 1, 'enabled' => (isModEnabled('barcode'))),
+	's.code_client' => array('label' => "CustomerCodeShort", 'position' => 10, 'checked' => $checkedcustomercode),
+	's.code_fournisseur' => array('label' => "SupplierCodeShort", 'position' => 11, 'checked' => $checkedsuppliercode, 'enabled' => (isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
+	's.code_compta' => array('label' => "CustomerAccountancyCodeShort", 'position' => 13, 'checked' => $checkedcustomeraccountcode),
+	's.code_compta_fournisseur' => array('label' => "SupplierAccountancyCodeShort", 'position' => 14, 'checked' => $checkedsupplieraccountcode, 'enabled' => (isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
+	's.address' => array('label' => "Address", 'position' => 19, 'checked' => 0),
+	's.zip' => array('label' => "Zip", 'position' => 20, 'checked' => 1),
+	's.town' => array('label' => "Town", 'position' => 21, 'checked' => 0),
+	'state.nom' => array('label' => "State", 'position' => 22, 'checked' => 0),
+	'region.nom' => array('label' => "Region", 'position' => 23, 'checked' => 0),
+	'country.code_iso' => array('label' => "Country", 'position' => 24, 'checked' => 0),
+	's.email' => array('label' => "Email", 'position' => 25, 'checked' => 0),
+	's.url' => array('label' => "Url", 'position' => 26, 'checked' => 0),
+	's.phone' => array('label' => "Phone", 'position' => 27, 'checked' => 1),
+	's.fax' => array('label' => "Fax", 'position' => 28, 'checked' => 0),
+	'typent.code' => array('label' => "ThirdPartyType", 'position' => 29, 'checked' => $checkedtypetiers),
+	'staff.code' => array('label' => "Workforce", 'position' => 31, 'checked' => 0),
+	's.phone_mobile' => array('label' => "PhoneMobile", 'position' => 32, 'checked' => 0),
+	's.siren' => array('label' => "ProfId1Short", 'position' => 40, 'checked' => $checkedprofid1),
+	's.siret' => array('label' => "ProfId2Short", 'position' => 41, 'checked' => $checkedprofid2),
+	's.ape' => array('label' => "ProfId3Short", 'position' => 42, 'checked' => $checkedprofid3),
+	's.idprof4' => array('label' => "ProfId4Short", 'position' => 43, 'checked' => $checkedprofid4),
+	's.idprof5' => array('label' => "ProfId5Short", 'position' => 44, 'checked' => $checkedprofid5),
+	's.idprof6' => array('label' => "ProfId6Short", 'position' => 45, 'checked' => $checkedprofid6),
+	's.tva_intra' => array('label' => "VATIntraShort", 'position' => 50, 'checked' => 0),
+	'customerorsupplier' => array('label' => 'NatureOfThirdParty', 'position' => 61, 'checked' => 1),
+	's.fk_prospectlevel' => array('label' => "ProspectLevel", 'position' => 62, 'checked' => $checkprospectlevel),
+	's.fk_stcomm' => array('label' => "StatusProsp", 'position' => 63, 'checked' => $checkstcomm),
+	's2.nom' => array('label' => 'ParentCompany', 'position' => 64, 'checked' => 0),
+	's.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	's.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	's.status' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
+	's.import_key' => array('label' => "ImportId", 'checked' => 0, 'position' => 1100),
 );
 if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
-	$arrayfields['s.price_level'] = array('label'=>"PriceLevel", 'position'=>30, 'checked'=>0);
+	$arrayfields['s.price_level'] = array('label' => "PriceLevel", 'position' => 30, 'checked' => 0);
 }
 
 // Add non object fields to fields for list
-$arrayfields['sales.representative'] = array('label'=>$langs->trans("SalesRepresentatives"), 'checked'=>1, 'position'=>12);
+$arrayfields['sales.representative'] = array('label' => $langs->trans("SalesRepresentatives"), 'checked' => 1, 'position' => 12);
 
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -1087,7 +1087,7 @@ if (GETPOST('delsoc')) {
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	'presend' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
@@ -1139,8 +1139,8 @@ if ($contextpage != 'poslist') {
 		$url .= '&socid='.$socid;
 	}
 	$newcardbutton   = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->hasRight('societe', 'creer'));
 } elseif ($user->hasRight('societe', 'creer')) {
 	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
@@ -1182,6 +1182,7 @@ foreach (array(1, 2, 3, 4, 5, 6) as $key) {
 		if (preg_match('/\((.*)\)/i', $label, $reg)) {
 			$label = $reg[1];
 		}
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$textprofid[$key] = $langs->trans("ProfIdShortDesc", $key, $mysoc->country_code, $label);
 	}
 }
@@ -1238,7 +1239,7 @@ if ($user->hasRight("societe", "client", "voir") || $socid) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters = array('type'=>$type);
+	$parameters = array('type' => $type);
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '</div>';
@@ -1478,7 +1479,7 @@ if (!empty($arrayfields['s2.nom']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Creation date
@@ -1506,7 +1507,7 @@ if (!empty($arrayfields['s.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['s.status']['checked'])) {
 	print '<td class="liste_titre center minwidth75imp parentonrightofpage">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
+	print $form->selectarray('search_status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.import_key']['checked'])) {
@@ -1674,7 +1675,7 @@ if (!empty($arrayfields['s2.nom']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['s.datec']['checked'])) {
@@ -1933,7 +1934,7 @@ while ($i < $imaxinloop) {
 			if (!isset($typenArray) || !is_array($typenArray) || count($typenArray) == 0) {
 				$typenArray = $formcompany->typent_array(1);
 			}
-			$labeltypeofcompany= empty($typenArray[$obj->typent_code]) ? '' : $typenArray[$obj->typent_code];
+			$labeltypeofcompany = empty($typenArray[$obj->typent_code]) ? '' : $typenArray[$obj->typent_code];
 
 			print '<td class="center tdoverflowmax125" title="'.dol_escape_htmltag($labeltypeofcompany).'">';
 			print dol_escape_htmltag($labeltypeofcompany);
@@ -2088,7 +2089,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -2162,7 +2163,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 530dfd986b7..f5ca849233e 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -119,7 +119,7 @@ if ($cancel) {
 }
 
 $morehtmlright = '';
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -518,8 +518,8 @@ if (empty($reshook)) {
 	if ($action == 'builddocrib') {
 		$action = 'builddoc';
 		$moreparams = array(
-			'use_companybankid'=>GETPOST('companybankid'),
-			'force_dir_output'=>$conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
+			'use_companybankid' => GETPOST('companybankid'),
+			'force_dir_output' => $conf->societe->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->id)
 		);
 		$_POST['lang_id'] = GETPOSTINT('lang_idrib'.GETPOSTINT('companybankid'));
 		$_POST['model'] = GETPOSTINT('modelrib'.GETPOSTINT('companybankid'));
@@ -890,7 +890,9 @@ if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('fo
 
 // Load Bank account
 if (!$id) {
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$companybankaccount->fetch(0, $object->id);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
 } else {
 	$companybankaccount->fetch($id);
@@ -1195,7 +1197,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<td>'.$langs->trans('Note').'</td>';
 		print '<td>'.$langs->trans('DateModification').'</td>';
 		// Hook fields
-		$parameters = array('arrayfields'=>array(), 'param'=>'', 'sortfield'=>'', 'sortorder'=>'', 'linetype'=>'stripetitle');
+		$parameters = array('arrayfields' => array(), 'param' => '', 'sortfield' => '', 'sortorder' => '', 'linetype' => 'stripetitle');
 		$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -1302,7 +1304,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
 							print '</td>';
 							// Fields from hook
-							$parameters = array('arrayfields'=>array(), 'obj'=>$obj, 'linetype'=>'stripecard');
+							$parameters = array('arrayfields' => array(), 'obj' => $obj, 'linetype' => 'stripecard');
 							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 							print $hookmanager->resPrint;
 							// Action column
@@ -1453,7 +1455,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '</td>';
 
 				// Fields from hook
-				$parameters = array('arrayfields'=>array(), 'stripesource'=>$src, 'linetype'=>'stripecardremoteonly');
+				$parameters = array('arrayfields' => array(), 'stripesource' => $src, 'linetype' => 'stripecardremoteonly');
 				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 
@@ -1560,7 +1562,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print_liste_field_titre('', '', '', '', '', '', '', '', 'center ');
 		// Fields from hook
-		$parameters = array('arrayfields'=>array(), 'linetype'=>'stripebantitle');
+		$parameters = array('arrayfields' => array(), 'linetype' => 'stripebantitle');
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
@@ -1716,7 +1718,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '</td>';
 
 			// Fields from hook
-			$parameters = array('arrayfields'=>array(), 'stripe_card_ref'=>$rib->stripe_card_ref, 'stripe_account'=>$rib->stripe_account, 'linetype'=>'stripeban');
+			$parameters = array('arrayfields' => array(), 'stripe_card_ref' => $rib->stripe_card_ref, 'stripe_account' => $rib->stripe_account, 'linetype' => 'stripeban');
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
@@ -1850,7 +1852,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '</td>';
 
 			// Fields from hook
-			$parameters = array('arrayfields'=>array(), 'stripe_card_ref'=>$rib->stripe_card_ref, 'stripe_account'=>$rib->stripe_account, 'linetype'=>'stripebanremoteonly');
+			$parameters = array('arrayfields' => array(), 'stripe_card_ref' => $rib->stripe_card_ref, 'stripe_account' => $rib->stripe_account, 'linetype' => 'stripebanremoteonly');
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
@@ -1881,7 +1883,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	}
 
 	//Hook to display your print listing (list of CB card from Stancer Plugin for example)
-	$parameters = array('arrayfields'=>array(), 'param'=>'', 'sortfield'=>'', 'sortorder'=>'', 'linetype'=>'');
+	$parameters = array('arrayfields' => array(), 'param' => '', 'sortfield' => '', 'sortorder' => '', 'linetype' => '');
 	$reshook = $hookmanager->executeHooks('printNewTable', $parameters, $object);
 	print $hookmanager->resPrint;
 
@@ -1903,10 +1905,12 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (getDolGlobalString('BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD')) {
 			$companybankaccounttemp = new CompanyBankAccount($db);
 			$companypaymentmodetemp = new CompanyPaymentMode($db);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$result = $companypaymentmodetemp->fetch(0, null, $object->id, 'ban');
 
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 			$ecmfile = new EcmFiles($db);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$result = $ecmfile->fetch(0, '', '', '', '', $companybankaccounttemp->table_element, $companypaymentmodetemp->id);
 			if ($result > 0) {
 				$companybankaccounttemp->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 6e6e7739411..3172aedb7f9 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -170,8 +170,8 @@ $term = empty($_SESSION["takeposterminal"]) ? 1 : $_SESSION["takeposterminal"];
  * Actions
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -546,7 +546,7 @@ if (empty($reshook)) {
 			$batch = GETPOST('batch', 'alpha');
 
 			if (!empty($batch)) {
-				$action="setbatch";
+				$action = "setbatch";
 			} else {
 				// Set nb of suggested with nb of batch into the warehouse of the terminal
 				$nbofsuggested = 0;
@@ -566,7 +566,7 @@ if (empty($reshook)) {
 				echo "}";
 				echo "</script>";
 
-				if ($nbofsuggested>0) {
+				if ($nbofsuggested > 0) {
 					echo "<center>".$langs->trans("SearchIntoBatch").": <b> $nbofsuggested </b></center><br><table>";
 					foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
 						$batchStock = + $dbatch->qty; // To get a numeric
@@ -628,7 +628,7 @@ if (empty($reshook)) {
 		if (getDolGlobalString('TAKEPOS_GROUP_SAME_PRODUCT')) {
 			foreach ($invoice->lines as $line) {
 				if ($line->product_ref == $prod->ref) {
-					if ($line->special_code==4) {
+					if ($line->special_code == 4) {
 						continue;
 					} // If this line is sended to printer create new line
 					// check if qty in stock
@@ -678,7 +678,7 @@ if (empty($reshook)) {
 
 			// complete line by hook
 			$parameters = array('prod' => $prod, 'line' => $line);
-			$reshook=$hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			}
@@ -733,7 +733,7 @@ if (empty($reshook)) {
 
 	if ($action == "addnote" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$desc = GETPOST('addnote', 'alpha');
-		if ($idline==0) {
+		if ($idline == 0) {
 			$invoice->update_note($desc, '_public');
 		} else {
 			foreach ($invoice->lines as $line) {
@@ -791,6 +791,7 @@ if (empty($reshook)) {
 				// We delete the lines
 				$resdeletelines = 1;
 				foreach ($invoice->lines as $line) {
+					// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 					$tmpres = $invoice->deleteLine($line->id);
 					if ($tmpres < 0) {
 						$resdeletelines = 0;
@@ -928,7 +929,7 @@ if (empty($reshook)) {
 		$invoice->fetch($placeid);
 	}
 
-	if ($action=="setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
+	if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch=".$db->escape($batch).", fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded);
 		$db->query($sql);
@@ -1139,7 +1140,7 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la
 <script type="text/javascript">
 var selectedline=0;
 var selectedtext="";
-<?php if ($action=="valid") {
+<?php if ($action == "valid") {
 	echo "var place=0;";
 }?> // Set to default place after close sale
 var placeid=<?php echo($placeid > 0 ? $placeid : 0); ?>;
@@ -1551,8 +1552,8 @@ if (!$usediv) {
 }
 
 // Complete header by hook
-$parameters=array();
-$reshook=$hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -1713,8 +1714,8 @@ if ($placeid > 0) {
 				$htmlsupplements[$line->fk_parent_line] .= '</td>';
 
 				// complete line by hook
-				$parameters=array('line' => $line);
-				$reshook=$hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('line' => $line);
+				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
@@ -1809,8 +1810,8 @@ if ($placeid > 0) {
 				$htmlforlines .= '</td>';
 
 				// complete line by hook
-				$parameters=array('line' => $line);
-				$reshook=$hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('line' => $line);
+				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 50af80a987a..5c2bbeef699 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -82,7 +82,7 @@ $hookmanager->initHooks(array('usercard', 'useragenda', 'globalcard'));
  * Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -249,7 +249,7 @@ while ($i <= $MAXAGENDA) {
 	$color = 'AGENDA_EXT_COLOR_'.$id.'_'.$key;
 
 	print '<tr class="oddeven">';
-	// Nb
+	// Nb @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb", $key)."</td>";
 	// Name
 	$name_value = (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) : (empty($object->conf->$name) ? '' : $object->conf->$name));
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 80e3d779389..535452175f1 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -74,6 +74,7 @@ if ($id > 0 || !empty($ref)) {
 
 $account = new UserBankAccount($db);
 if (!$bankid) {
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	$account->fetch(0, '', $id);
 } else {
 	$account->fetch($bankid);
@@ -603,7 +604,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	// Latest payments of salaries
 	if (isModEnabled('salaries') &&
 		(($user->hasRight('salaries', 'read') && (in_array($object->id, $childids) || $object->id == $user->id)) || ($user->hasRight('salaries', 'readall')))
-		) {
+	) {
 		$payment_salary = new PaymentSalary($db);
 		$salary = new Salary($db);
 
@@ -725,7 +726,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	// Latest expense report
 	if (isModEnabled('expensereport') &&
 		($user->hasRight('expensereport', 'readall') || ($user->hasRight('expensereport', 'lire') && $object->id == $user->id))
-		) {
+	) {
 		$exp = new ExpenseReport($db);
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_statut as status, e.date_debut, e.total_ttc";
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 387854d8504..94447146dbf 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1021,7 +1021,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// Gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+	$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 	print $form->selectarray('gender', $arraygender, GETPOST('gender'), 1);
 	print '</td></tr>';
 
@@ -2314,7 +2314,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Gender
 			print '<tr><td>'.$langs->trans("Gender").'</td>';
 			print '<td>';
-			$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+			$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 			if ($caneditfield) {
 				print $form->selectarray('gender', $arraygender, GETPOSTISSET('gender') ? GETPOST('gender') : $object->gender, 1);
 			} else {
@@ -2399,6 +2399,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if ($object->socid) {
 					$type = $langs->trans("External");
 				}
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
 				if ($object->ldap_sid) {
 					print ' ('.$langs->trans("DomainUser").')';
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index dce0a64db09..d3588e83ff4 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -273,6 +273,7 @@ if ($result > 0) {
 
 	// List of active notifications
 	//print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $num, 'email', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Line with titles
@@ -311,7 +312,7 @@ if ($result > 0) {
 			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
 			print '</td>';
 			print '<td>';
-			$type = array('email'=>$langs->trans("EMail"));
+			$type = array('email' => $langs->trans("EMail"));
 			print $form->selectarray("typeid", $type);
 			print '</td>';
 			print '<td class="nowraponall">';

From 4b47868cea0bfc55288a4af506afc2bf0bda7300 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 20:17:51 +0100
Subject: [PATCH 0540/1862] qual: phpstan for
 htdocs/accountancy/class/accountingjournal.class.php (#28690)

htdocs/accountancy/class/accountingjournal.class.php	82	PHPDoc type array of property AccountingJournal::$lines is not covariant with PHPDoc type array of overridden property CommonObject::$lines.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/accountancy/class/accountingjournal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index be305e9b5c1..76b6cdba5a8 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -77,7 +77,7 @@ class AccountingJournal extends CommonObject
 	public $active;
 
 	/**
-	 * @var array array of lines
+	 * @var AccountingJournal[] array of lines
 	 */
 	public $lines;
 

From 7f10566d5e4f2ab900457405956d0112f11a251f Mon Sep 17 00:00:00 2001
From: Florian Mortgat <50440633+atm-florianm@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:21:41 +0100
Subject: [PATCH 0541/1862] FIX 17.0: $num doesn't take trigger-modified newref
 into account, leading to inconsistencies if BILL_SUPPLIER_VALIDATE changes
 the invoice's ref (#28684)

this is a follow-up of PR #27008
---
 htdocs/fourn/class/fournisseur.facture.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 75874fbb86a..eebb2b95b51 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1895,7 +1895,7 @@ class FactureFournisseur extends CommonInvoice
 
 			// Set new ref and define current statut
 			if (!$error) {
-				$this->ref = $num;
+				$this->ref = $this->newref;
 				$this->statut = self::STATUS_VALIDATED;
 				//$this->date_validation=$now; this is stored into log table
 			}

From 07b2850c279f51eb5c4d52dbe6382a013ba5c049 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 20:22:51 +0100
Subject: [PATCH 0542/1862] qual: phpstan for
 htdocs/compta/paiement/class/paiement.class.php (#28689)

htdocs/compta/paiement/class/paiement.class.php	115	PHPDoc type array of property Paiement::$multicurrency_tx is not covariant with PHPDoc type array|float of overridden property CommonObject::$multicurrency_tx.

htdocs/compta/paiement/class/paiement.class.php	120	PHPDoc type array of property Paiement::$multicurrency_code is not covariant with PHPDoc type array|string of overridden property CommonObject::$multicurrency_code.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c947e4e7c53..315581d5edc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -477,13 +477,13 @@ abstract class CommonObject
 	public $fk_multicurrency;
 
 	/**
-	 * @var string|array<int,string>    Multicurrency code
+	 * @var string|string[]             Multicurrency code
 	 *                                  Or, just for the Paiement object, an array: invoice ID => currency code for that invoice.
 	 */
 	public $multicurrency_code;
 
 	/**
-	 * @var float|array<int,float>      Multicurrency rate ("tx" = "taux" in French)
+	 * @var float|float[]               Multicurrency rate ("tx" = "taux" in French)
 	 *                                  Or, just for the Paiement object, an array: invoice ID => currency rate for that invoice.
 	 */
 	public $multicurrency_tx;

From e2026a1c146e2599c15f2118669eeaddf4c28c15 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Thu, 7 Mar 2024 20:23:45 +0100
Subject: [PATCH 0543/1862] qual: phan for functions.lib.php (#28654)

6 entries for:

TypeError PhanTypeMismatchArgumentProbablyReal Argument 5 ($objcon) is null of type null but \show_actions_messaging() takes \Contact|string (no real type) defined at htdocs/core/lib/functions.lib.php:13081
---
 htdocs/core/lib/functions.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index af156d0442f..5c57d266301 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13055,7 +13055,7 @@ function getActionCommEcmList($object)
  * 		@param	Translate	       $langs		   Object langs
  * 		@param	DoliDB		       $db			   Object db
  * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket|... to list events linked to an object
- * 		@param	Contact		       $objcon		   Filter on object contact to filter events on a contact
+ * 		@param	Contact|null       $objcon		   Filter on object contact to filter events on a contact
  *      @param  int			       $noprint        Return string but does not output it
  *      @param  string		       $actioncode     Filter on actioncode
  *      @param  string             $donetodo       Filter on event 'done' or 'todo' or ''=nofilter (all).
@@ -13064,7 +13064,7 @@ function getActionCommEcmList($object)
  *      @param  string             $sortorder      Sort order
  *      @return	string|void				           Return html part or void if noprint is 1
  */
-function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC')
+function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null, $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC')
 {
 	global $user, $conf;
 	global $form;

From 901fd65ad931382dc95c83cbbe46dc2ab774f30d Mon Sep 17 00:00:00 2001
From: Rikard Bosnjakovic <bos@hack.org>
Date: Thu, 7 Mar 2024 20:24:37 +0100
Subject: [PATCH 0544/1862] Fix #20209 (#28692)

When using multiple languages Dolibarr sometimes switches languages depending on settings. By not loading the "main" file, the proper date formats will not be used and this leads to inconsistency.
---
 htdocs/core/tpl/card_presend.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index ea44ee232c7..2503285cbc2 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -78,7 +78,7 @@ if ($action == 'presend') {
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
 		// Load traductions files required by page
-		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions', 'sendings'));
+		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'main', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions', 'sendings'));
 		if (!empty($defaulttopiclang)) {
 			$outputlangs->loadLangs(array($defaulttopiclang));
 		}

From 0dd7aad04b55940827eb89954b30bd9cd9f9424b Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Thu, 7 Mar 2024 20:27:51 +0100
Subject: [PATCH 0545/1862] Fix element type size (#28664)

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql    | 4 ++++
 htdocs/install/mysql/tables/llx_c_type_contact.sql  | 2 +-
 htdocs/install/mysql/tables/llx_element_element.sql | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 0728a44f540..4f50ee95936 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -264,3 +264,7 @@ ALTER TABLE llx_societe ADD COLUMN phone_mobile varchar(20) after phone;
 
 ALTER TABLE llx_facture ADD INDEX idx_facture_tms (tms);
 ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_tms (tms);
+
+ALTER TABLE llx_element_element MODIFY COLUMN sourcetype VARCHAR(64) NOT NULL;
+ALTER TABLE llx_element_element MODIFY COLUMN targettype VARCHAR(64) NOT NULL;
+ALTER TABLE llx_c_type_contact MODIFY COLUMN element VARCHAR(64) NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
index e2275e71e5f..65ddb592ce0 100644
--- a/htdocs/install/mysql/tables/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql
@@ -30,7 +30,7 @@
 create table llx_c_type_contact
 (
   rowid      	integer     AUTO_INCREMENT PRIMARY KEY,
-  element       varchar(30) NOT NULL,
+  element       varchar(64) NOT NULL,
   source        varchar(8)  DEFAULT 'external' NOT NULL,
   code          varchar(32) NOT NULL,
   libelle 	    varchar(128)	NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql
index 4c4567d89b2..45798b6537c 100644
--- a/htdocs/install/mysql/tables/llx_element_element.sql
+++ b/htdocs/install/mysql/tables/llx_element_element.sql
@@ -22,10 +22,10 @@
 
 create table llx_element_element
 (
-  rowid           	integer AUTO_INCREMENT PRIMARY KEY,  
+  rowid           	integer AUTO_INCREMENT PRIMARY KEY,
   fk_source			integer NOT NULL,
-  sourcetype		varchar(32) NOT NULL,
+  sourcetype		varchar(64) NOT NULL,
   fk_target			integer NOT NULL,
-  targettype		varchar(32) NOT NULL
+  targettype		varchar(64) NOT NULL
 ) ENGINE=innodb;
 

From 7b5982de5bfce8eb520062ab7496d2ad62015079 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Thu, 7 Mar 2024 20:32:41 +0100
Subject: [PATCH 0546/1862] NEW : Factoring and Fix external module elementType
 limit - Part 02 (#28666)

* Fix element type size

* Factoring getElementType

* Update commonobject.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/core/class/commonobject.class.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 315581d5edc..f2a66a77bf9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3992,11 +3992,8 @@ abstract class CommonObject
 			$origin = 'order_supplier';
 		}
 
-		// Elements of the core modules which have `$module` property but may to which we don't want to prefix module part to the element name for finding the linked object in llx_element_element.
-		// It's because an entry for this element may be exist in llx_element_element before this modification (version <=14.2) and ave named only with their element name in fk_source or fk_target.
-		$coremodule = array('knowledgemanagement', 'partnership', 'workstation', 'ticket', 'recruitment', 'eventorganization', 'asset');
-		// Add module part to target type if object has $module property and isn't in core modules.
-		$targettype = ((!empty($this->module) && ! in_array($this->module, $coremodule)) ? $this->module.'_' : '').$this->element;
+		// Add module part to target type
+		$targettype = $this->getElementType();
 
 		$parameters = array('targettype' => $targettype);
 		// Hook for explicitly set the targettype if it must be differtent than $this->element
@@ -4048,6 +4045,21 @@ abstract class CommonObject
 		}
 	}
 
+	/**
+	 * Return element type string formatted like element_element target_type and source_type
+  	 *
+	 * @return string
+	 */
+	public function getElementType()
+	{
+		// Elements of the core modules having a `$module` property but for which we may not want to prefix the element name with the module name for finding the linked object in llx_element_element.
+		// It's because existing llx_element_element entries inserted prior to this modification (version <=14.2) may already use the element name alone in fk_source or fk_target (without the module name prefix).
+		$coreModule = array('knowledgemanagement', 'partnership', 'workstation', 'ticket', 'recruitment', 'eventorganization', 'asset');
+		// Add module part to target type if object has $module property and isn't in core modules.
+		return ((!empty($this->module) && !in_array($this->module, $coreModule)) ? $this->module.'_' : '').$this->element;
+	}
+
+
 	/**
 	 *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
 	 *		this->linkedObjectsIds array +

From 2636a644612bd181698392e8fd5416451afe23fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:43:45 +0100
Subject: [PATCH 0547/1862] Set import_key in import when update record
 (#28657)

* Set import_key in import when update record

* Update import_xlsx.modules.php
---
 htdocs/core/modules/import/import_csv.modules.php  | 2 +-
 htdocs/core/modules/import/import_xlsx.modules.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 124fe9f7bbc..0a0a1aeb07f 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -963,7 +963,7 @@ class ImportCsv extends ModeleImports
 								foreach ($data as $key => $val) {
 									$set[] = $key." = ".$val;
 								}
-								$sqlstart .= " SET ".implode(', ', $set);
+								$sqlstart .= " SET ".implode(', ', $set).", import_key = '".$this->db->escape($importid)."'";
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 14e4b561eae..8d5157e63a4 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -1006,7 +1006,7 @@ class ImportXlsx extends ModeleImports
 								foreach ($data as $key => $val) {
 									$set[] = $key." = ".$val;
 								}
-								$sqlstart .= " SET " . implode(', ', $set);
+								$sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';

From 10aa278acae9ba7c49e916dde8fcdd01fed8b9a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 21:38:40 +0100
Subject: [PATCH 0548/1862] Fix add a type to allow sanitization of import
 rule='compute'.

---
 .../modules/import/import_csv.modules.php     | 19 ++++++++++++++-----
 .../modules/import/import_xlsx.modules.php    | 19 ++++++++++++++-----
 htdocs/core/modules/modAccounting.class.php   | 12 ++++++------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 0a0a1aeb07f..aa979b5260a 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -738,7 +738,7 @@ class ImportCsv extends ModeleImports
 							// ...
 						}
 
-						// Define $listfields and $listvalues to build SQL request
+						// Define $listfields and $listvalues to build the SQL request
 						if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
 							if (!in_array("socialnetworks", $listfields)) {
 								$listfields[] = "socialnetworks";
@@ -765,7 +765,7 @@ class ImportCsv extends ModeleImports
 							$listfields[] = $fieldname;
 							// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 							if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
-								$listvalues[] = ($newval == '0' ? $newval : "null");
+								$listvalues[] = ($newval == '0' ? (int) $newval : "null");
 							} elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
 								$listvalues[] = "''";
 							} else {
@@ -793,7 +793,7 @@ class ImportCsv extends ModeleImports
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
 							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $tmpkey);
 							$listfields[] = $keyfield;
-							$listvalues[] = $lastinsertid;
+							$listvalues[] = (int) $lastinsertid;
 							//print $tmpkey."-".$tmpval."-".$listfields."-".$listvalues."<br>";exit;
 						} elseif (preg_match('/^const-/', $tmpval)) {
 							$tmp = explode('-', $tmpval, 2);
@@ -806,6 +806,7 @@ class ImportCsv extends ModeleImports
 									$file = (empty($objimport->array_import_convertvalue[0][$fieldname]['classfile']) ? $objimport->array_import_convertvalue[0][$fieldname]['file'] : $objimport->array_import_convertvalue[0][$fieldname]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$fieldname]['class'];
 									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
+									$type = $objimport->array_import_convertvalue[0][$fieldname]['type'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
 										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
@@ -818,8 +819,16 @@ class ImportCsv extends ModeleImports
 										if (count($fieldArr) > 0) {
 											$fieldname = $fieldArr[1];
 										}
+
+										// Set $listfields and $listvalues
 										$listfields[] = $fieldname;
-										$listvalues[] = $res;
+										if ($type == 'int') {
+											$listvalues[] = (int) $res;
+										} elseif ($type == 'double') {
+											$listvalues[] = (float) $res;
+										} else {
+											$listvalues[] = "'".$this->db->escape($res)."'";
+										}
 									} else {
 										$this->errors[$error]['type'] = 'CLASSERROR';
 										$this->errors[$error]['lib'] = implode(
@@ -961,7 +970,7 @@ class ImportCsv extends ModeleImports
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key." = ".$val;
+									$set[] = $key." = ".$val;	// $val was escaped/sanitized previously
 								}
 								$sqlstart .= " SET ".implode(', ', $set).", import_key = '".$this->db->escape($importid)."'";
 
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 8d5157e63a4..e798fc659f0 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -781,7 +781,7 @@ class ImportXlsx extends ModeleImports
 							// ...
 						}
 
-						// Define $listfields and $listvalues to build SQL request
+						// Define $listfields and $listvalues to build the SQL request
 						if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
 							if (!in_array("socialnetworks", $listfields)) {
 								$listfields[] = "socialnetworks";
@@ -807,7 +807,7 @@ class ImportXlsx extends ModeleImports
 
 							// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 							if (empty($newval) && $arrayrecord[($key)]['type'] < 0) {
-								$listvalues[] = ($newval == '0' ? $newval : "null");
+								$listvalues[] = ($newval == '0' ? (int) $newval : "null");
 							} elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0) {
 								$listvalues[] = "''";
 							} else {
@@ -835,7 +835,7 @@ class ImportXlsx extends ModeleImports
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
 							$keyfield = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
 							$listfields[] = $keyfield;
-							$listvalues[] = $lastinsertid;
+							$listvalues[] = (int) $lastinsertid;
 							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
 						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
@@ -848,6 +848,7 @@ class ImportXlsx extends ModeleImports
 									$file = (empty($objimport->array_import_convertvalue[0][$fieldname]['classfile']) ? $objimport->array_import_convertvalue[0][$fieldname]['file'] : $objimport->array_import_convertvalue[0][$fieldname]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$fieldname]['class'];
 									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
+									$type = $objimport->array_import_convertvalue[0][$fieldname]['type'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
 										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
@@ -859,8 +860,16 @@ class ImportXlsx extends ModeleImports
 									if (count($fieldArr) > 0) {
 										$fieldname = $fieldArr[1];
 									}
+
+									// Set $listfields and $listvalues
 									$listfields[] = $fieldname;
-									$listvalues[] = $res;
+									if ($type == 'int') {
+										$listvalues[] = (int) $res;
+									} elseif ($type == 'double') {
+										$listvalues[] = (float) $res;
+									} else {
+										$listvalues[] = "'".$this->db->escape($res)."'";
+									}
 								} else {
 									$this->errors[$error]['type'] = 'CLASSERROR';
 									$this->errors[$error]['lib'] = implode(
@@ -1004,7 +1013,7 @@ class ImportXlsx extends ModeleImports
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key." = ".$val;
+									$set[] = $key." = ".$val;	// $val was escaped/sanitized previously
 								}
 								$sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
 
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 07591de93a7..f8788d09ba4 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -362,14 +362,14 @@ class modAccounting extends DolibarrModules
 			'b.sens'=>'rule-computeDirection'
 		); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
-			'b.piece_num' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanValue', 'element' => 'Accountancy'),
+			'b.piece_num' => array('rule' => 'compute', 'type' => 'int', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanValue', 'element' => 'Accountancy'),
 			'b.numero_compte'=>array('rule'=>'accountingaccount'),
 			'b.subledger_account'=>array('rule'=>'accountingaccount'),
-			'b.debit' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
-			'b.credit' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
-			'b.multicurrency_amount' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
-			'b.montant' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeAmount', 'element' => 'Accountancy'),
-			'b.sens' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeDirection', 'element' => 'Accountancy'),
+			'b.debit' => array('rule' => 'compute', 'type' => 'double', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
+			'b.credit' => array('rule' => 'compute', 'type' => 'double', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
+			'b.multicurrency_amount' => array('rule' => 'compute', 'type' => 'double', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
+			'b.montant' => array('rule' => 'compute', 'type' => 'double', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeAmount', 'element' => 'Accountancy'),
+			'b.sens' => array('rule' => 'compute', 'type' => 'varchar', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeDirection', 'element' => 'Accountancy'),
 		);
 		$this->import_regex_array[$r] = array(
 			//'b.doc_date'=>'^\d{4}\d{2}\d{2}$',

From c2379bfdf542b54dd09b01d65864612c8a29749f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 Mar 2024 21:39:29 +0100
Subject: [PATCH 0549/1862] fix phpstan (#28694)

* fix phpstan

* fix typo

* fix phpstan
---
 htdocs/core/class/commonobject.class.php | 8 ++++----
 htdocs/core/lib/company.lib.php          | 2 +-
 htdocs/core/lib/invoice2.lib.php         | 5 +++--
 htdocs/core/lib/payments.lib.php         | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f2a66a77bf9..271293198d4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017-2019 Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2017      Rui Strecht          <rui.strecht@aliartalentos.com>
- * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2021      Grégory Blémand      <gregory.blemand@atm-consulting.fr>
@@ -3996,7 +3996,7 @@ abstract class CommonObject
 		$targettype = $this->getElementType();
 
 		$parameters = array('targettype' => $targettype);
-		// Hook for explicitly set the targettype if it must be differtent than $this->element
+		// Hook for explicitly set the targettype if it must be different than $this->element
 		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			if (!empty($hookmanager->resArray['targettype'])) {
@@ -4046,8 +4046,8 @@ abstract class CommonObject
 	}
 
 	/**
-	 * Return element type string formatted like element_element target_type and source_type
-  	 *
+	 * Return an element type string formatted like element_element target_type and source_type
+	 *
 	 * @return string
 	 */
 	public function getElementType()
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 01afca27f93..7fca6289c95 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -525,7 +525,7 @@ function societe_admin_prepare_head()
  *    @param	DoliDB		$dbtouse       	Database handler (using in global way may fail because of conflicts with some autoload features)
  *    @param	Translate	$outputlangs	Langs object for output translation
  *    @param	int			$entconv       	0=Return value without entities and not converted to output charset, 1=Ready for html output
- *    @param	int			$searchlabel    Label of country to search (warning: searching on label is not reliable)
+ *    @param	string		$searchlabel    Label of country to search (warning: searching on label is not reliable)
  *    @return	mixed       				Integer with country id or String with country code or translated country name or Array('id','code','label') or 'NotDefined'
  */
 function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs = null, $entconv = 1, $searchlabel = '')
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index c5dae5f8f3d..2ed6bf435f8 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2009-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2009-2013  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  * @param	string		$fileprefix				Prefix to add into filename of generated PDF
  * @return	int									Error code
  */
-function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate = 0, $filesuffix = '', $paymentbankid = '', $thirdpartiesid = '', $fileprefix = 'mergedpdf')
+function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate = 0, $filesuffix = '', $paymentbankid = '', $thirdpartiesid = [], $fileprefix = 'mergedpdf')
 {
 	$sql = "SELECT DISTINCT f.rowid, f.ref";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 13f7289a478..2c496401768 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (C) 2013	    Marcos García	        <marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Abbes Bahfir            <bafbes@gmail.com>
  * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
@@ -235,7 +235,7 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = 0)
  * @param	string		$ref		      Ref of object
  * @param	int|float	$amount		      Amount of money to request for
  * @param	string		$freetag	      Free tag (required and used for $type='free' only)
- * @param   string  	$localorexternal  0=Url for browser, 1=Url for external access
+ * @param   int     	$localorexternal  0=Url for browser, 1=Url for external access
  * @return	string					      Url string
  */
 function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'your_tag', $localorexternal = 1)

From 970545b218387d8f75afca23b41746bc317df713 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 21:49:45 +0100
Subject: [PATCH 0550/1862] Doc

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index fe307fe8915..fe111b7cd56 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1632,7 +1632,7 @@ class BookKeeping extends CommonObject
 	 * Delete bookkeeping by piece number
 	 *
 	 * @param 	int 	$piecenum 	Piecenum to delete
-	 * @param string $mode Mode
+	 * @param 	string 	$mode 		Mode ('' or '_tmp')
 	 * @return 	int 				Result
 	 */
 	public function deleteMvtNum($piecenum, $mode = '')

From ca297a751f18e0012c55b4366f8213fbf4f3848e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 7 Mar 2024 22:08:58 +0100
Subject: [PATCH 0551/1862] Clean internal pahn warnings

---
 dev/tools/apstats.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 164713fa3bf..400cefa5558 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -685,6 +685,9 @@ if (count($output_phan_json) != 0) {
 	foreach ($phan_notices as $notice) {
 		if (!empty($notice['location'])) {
 			$path = $notice['location']['path'];
+			if ($path == 'internal') {
+				continue;
+			}
 			$line_start = $notice['location']['lines']['begin'];
 			$line_end = $notice['location']['lines']['end'];
 			if ($line_start == $line_end) {

From 3035a7bc7fe4f9bbc2ddd24bb344c0c2f61ee98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 7 Mar 2024 22:13:09 +0100
Subject: [PATCH 0552/1862] fix phpstan (#28695)

* fix phpstan

* fix typo

* fix phpstan

* fix phpstan

* fix phpstan
---
 htdocs/core/class/dolreceiptprinter.class.php | 16 +++++++++++++---
 htdocs/langs/en_US/receiptprinter.lang        |  2 ++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 0efd7b5a923..4d8c8b0f785 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015-2021  Frédéric France     <frederic.france@netlogic.fr>
+/* Copyright (C) 2015-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2020       Andreu Bisquerra    <jove@bisquerra.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -133,6 +133,10 @@ class dolReceiptPrinter extends Printer
 	 * @var string[] array of tags
 	 */
 	public $tags;
+
+	/**
+	 * @var \Mike42\Escpos\Printer
+	 */
 	public $printer;
 	public $template;
 
@@ -1033,6 +1037,7 @@ class dolReceiptPrinter extends Printer
 
 				try {
 					$type = $obj['fk_type'];
+					$found = true;
 					switch ($type) {
 						case 1:
 							$this->connector = new DummyPrintConnector();
@@ -1051,10 +1056,15 @@ class dolReceiptPrinter extends Printer
 							$this->connector = new CupsPrintConnector($parameter);
 							break;
 						default:
-							$this->connector = 'CONNECTOR_UNKNOWN';
+							$found = false;;
 							break;
 					}
-					$this->printer = new Printer($this->connector, $this->profile);
+					if ($found) {
+						$this->printer = new Printer($this->connector, $this->profile);
+					} else {
+						$error++;
+						$this->errors[] = 'CONNECTOR_UNKNOWN';
+					}
 				} catch (Exception $e) {
 					$this->errors[] = $e->getMessage();
 					$error++;
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
index 28bf2c4f1d5..3cb8275383c 100644
--- a/htdocs/langs/en_US/receiptprinter.lang
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -12,6 +12,8 @@ ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
 ListPrinters=List of Printers
 FromServerPointOfView=From the web server point of view. This method must be reachable from the web server hosting.
 SetupReceiptTemplate=Template Setup
+PrinterNameEmpty=Printer name is empty
+PrinterParameterEmpty=Printer parameters are empty
 CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Network Printer
 CONNECTOR_FILE_PRINT=Local Printer

From ff03f86a509babf339d7a555129d2a4eacbc5b94 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+BB2A-Anthony@users.noreply.github.com>
Date: Thu, 7 Mar 2024 22:47:29 +0100
Subject: [PATCH 0553/1862] NEW - See the documents of my subordinates 
 (#28318)

* NEW - See the documents of my subordinates

* cop

* Rewriting

* up

* ok

* FIX - Restriction on sale representative

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/commande/list.php                 | 23 +++++++++++++++++++----
 htdocs/core/class/commonobject.class.php |  7 ++++++-
 htdocs/core/lib/security.lib.php         | 16 ++++++++++++++--
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 408b10ae81c..742222ee4e6 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016-2023  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2023  Charlene Benke	        <charlene@patas-monkey.com>
- * Copyright (C) 2021	   	Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2021-2024 	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
@@ -62,6 +62,10 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlist';
 $mode        = GETPOST('mode', 'alpha');
 
+if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
+	$userschilds = $user->getAllChildIds();
+}
+
 // Search Parameters
 $search_datecloture_start = GETPOSTINT('search_datecloture_start');
 if (empty($search_datecloture_start)) {
@@ -223,15 +227,16 @@ $object->fields = dol_sort_array($object->fields, 'position');
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
-	$search_sale = $user->id;
-}
 
 // Security check
 $id = (GETPOST('orderid') ? GETPOSTINT('orderid') : GETPOSTINT('id'));
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$permissiontoreadallthirdparty = $user->hasRight('societe', 'client', 'voir');
+
+
 $result = restrictedArea($user, 'commande', $id, '');
 
 $error = 0;
@@ -879,6 +884,16 @@ $sql .= ' AND c.entity IN ('.getEntity('commande').')';
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
+
+// Restriction on sale representative
+if (!$permissiontoreadallthirdparty) {
+	$sql .= " AND (EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id).")";
+	if (getDolGlobalInt('MAIN_SEE_SUBORDINATES') && $userschilds) {
+		$sql .= " OR EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user IN (".$db->sanitize(implode(',', $userschilds))."))";
+	}
+	$sql .= ")";
+}
+
 if ($search_ref) {
 	$sql .= natural_search('c.ref', $search_ref);
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 271293198d4..cac72ca1e49 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2346,7 +2346,12 @@ abstract class CommonObject
 			$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		}
 		if ($restrictiononfksoc == 1 && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
-			$sql .= " AND sc.fk_user = ".((int) $user->id);
+			$sql .= " AND (sc.fk_user = ".((int) $user->id);
+			if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
+				$userschilds = $user->getAllChildIds();
+				$sql .= " OR sc.fk_user IN (".$this->db->sanitize(implode(',', $userschilds)).")";
+			}
+			$sql .= ')';
 		}
 		if ($restrictiononfksoc == 2 && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
 			$sql .= " AND (sc.fk_user = ".((int) $user->id).' OR te.fk_soc IS NULL)';
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index b4b64f07c48..8b0844da3f8 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -965,7 +965,12 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				$sql .= ", ".MAIN_DB_PREFIX."societe as s)";
 				$sql .= " WHERE sc.fk_soc IN (".$db->sanitize($objectid, 1).")";
-				$sql .= " AND sc.fk_user = ".((int) $user->id);
+				$sql .= " AND (sc.fk_user = ".((int) $user->id);
+				if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
+					$userschilds = $user->getAllChildIds();
+					$sql .= " OR sc.fk_user IN (".$db->sanitize(implode(',', $userschilds)).")";
+				}
+				$sql .= ")";
 				$sql .= " AND sc.fk_soc = s.rowid";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			} elseif (isModEnabled('multicompany')) {
@@ -1070,7 +1075,14 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 					$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 					$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-					$sql .= " AND sc.fk_user = ".((int) $user->id);
+					$sql .= " AND (sc.fk_user = ".((int) $user->id);
+					if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
+						$userschilds = $user->getAllChildIds();
+						foreach ($userschilds as $key => $value) {
+							$sql .= ' OR sc.fk_user = '.((int) $value);
+						}
+					}
+					$sql .= ')';
 				} else {
 					// On ticket, the thirdparty is not mandatory, so we need a special test to accept record with no thirdparties.
 					$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

From 79adb60cf571ffa7ee33aff9320cb33ae5ed2e9a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 7 Mar 2024 23:09:25 +0100
Subject: [PATCH 0554/1862] Qual: Add instanceof tests to help static typing
 analysis (#28696)

# Qual: Add instanceof tests to help static typing analysis

Added instanceof tests to help identify that properties exist.
---
 htdocs/core/lib/functions.lib.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5c57d266301..f13707b4a36 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7630,9 +7630,14 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 		$dom = new DOMDocument(null, 'UTF-8');
 		$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE | LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NONET | LIBXML_NOWARNING | LIBXML_NOXMLDECL);
 
-		if (is_object($dom)) {
+		if ($dom instanceof DOMDocument) {
 			for ($els = $dom->getElementsByTagname('*'), $i = $els->length - 1; $i >= 0; $i--) {
-				for ($attrs = $els->item($i)->attributes, $ii = $attrs->length - 1; $ii >= 0; $ii--) {
+				$el = $els->item($i);
+				if (!$el instanceof DOMElement) {
+					continue;
+				}
+				$attrs = $el->attributes;
+				for ($ii = $attrs->length - 1; $ii >= 0; $ii--) {
 					//var_dump($attrs->item($ii));
 					if (!empty($attrs->item($ii)->name)) {
 						if (! in_array($attrs->item($ii)->name, $allowed_attributes)) {

From 491e85037a9fb2974b021feab63c5776cbefe42b Mon Sep 17 00:00:00 2001
From: Can Arslan <138895927+mc2rcanarslan@users.noreply.github.com>
Date: Thu, 7 Mar 2024 15:09:54 -0700
Subject: [PATCH 0555/1862] FIX: PHP Warning: Undefined variable $mode (#28697)

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

diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 2c7009c8d42..3021fbdc898 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
-
+$mode = GETPOST('mode', 'aZ');
 $socid = GETPOST('socid', 'int');
 
 $search_ref				= GETPOST('search_ref', 'alpha');

From fb16af02b4940661f3e7de3e164663b22eba427a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 11:00:19 +0100
Subject: [PATCH 0556/1862] Clean code. Move member type API in good file.

---
 htdocs/adherents/class/api_members.class.php  | 321 +++++++++++++++-
 .../class/api_memberstypes.class.php          | 343 ------------------
 .../template/class/api_mymodule.class.php     |  15 +-
 3 files changed, 318 insertions(+), 361 deletions(-)
 delete mode 100644 htdocs/adherents/class/api_memberstypes.class.php

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index d551f6b5af9..7603a19b3c2 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -24,6 +24,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
 /**
  * API class for members
@@ -452,18 +453,63 @@ class Members extends DolibarrApi
 		$object = parent::_cleanObjectDatas($object);
 
 		// Remove the subscriptions because they are handled as a subresource.
-		unset($object->subscriptions);
-		unset($object->fk_incoterms);
-		unset($object->label_incoterms);
-		unset($object->location_incoterms);
-		unset($object->fk_delivery_address);
-		unset($object->shipping_method_id);
+		if ($object instanceof Adherent) {
+			unset($object->subscriptions);
+			unset($object->fk_incoterms);
+			unset($object->label_incoterms);
+			unset($object->location_incoterms);
+			unset($object->fk_delivery_address);
+			unset($object->shipping_method_id);
 
-		unset($object->total_ht);
-		unset($object->total_ttc);
-		unset($object->total_tva);
-		unset($object->total_localtax1);
-		unset($object->total_localtax2);
+			unset($object->total_ht);
+			unset($object->total_ttc);
+			unset($object->total_tva);
+			unset($object->total_localtax1);
+			unset($object->total_localtax2);
+		}
+
+		if ($object instanceof AdherentType) {
+			unset($object->array_options);
+			unset($object->linkedObjectsIds);
+			unset($object->context);
+			unset($object->canvas);
+			unset($object->fk_project);
+			unset($object->contact);
+			unset($object->contact_id);
+			unset($object->thirdparty);
+			unset($object->user);
+			unset($object->origin);
+			unset($object->origin_id);
+			unset($object->ref_ext);
+			unset($object->country);
+			unset($object->country_id);
+			unset($object->country_code);
+			unset($object->barcode_type);
+			unset($object->barcode_type_code);
+			unset($object->barcode_type_label);
+			unset($object->barcode_type_coder);
+			unset($object->mode_reglement_id);
+			unset($object->cond_reglement_id);
+			unset($object->cond_reglement);
+			unset($object->fk_delivery_address);
+			unset($object->shipping_method_id);
+			unset($object->model_pdf);
+			unset($object->fk_account);
+			unset($object->note_public);
+			unset($object->note_private);
+			unset($object->fk_incoterms);
+			unset($object->label_incoterms);
+			unset($object->location_incoterms);
+			unset($object->name);
+			unset($object->lastname);
+			unset($object->firstname);
+			unset($object->civility_id);
+			unset($object->total_ht);
+			unset($object->total_tva);
+			unset($object->total_localtax1);
+			unset($object->total_localtax2);
+			unset($object->total_ttc);
+		}
 
 		return $object;
 	}
@@ -565,4 +611,257 @@ class Members extends DolibarrApi
 
 		return $result;
 	}
+
+
+
+
+	/**
+	 * Get properties of a member type object
+	 *
+	 * Return an array with member type information
+	 *
+	 * @param   int     $id				ID of member type
+	 * @return  Object					Object with cleaned properties
+	 *
+	 * @url GET /types/{id}
+	 *
+	 * @throws	RestException	403		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 */
+	public function getType($id)
+	{
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'lire')) {
+			throw new RestException(403);
+		}
+
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($membertype);
+	}
+
+	/**
+	 * List members types
+	 *
+	 * Get a list of members types
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
+	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
+	 * @return array                Array of member type objects
+	 *
+	 * @url GET /types/
+	 *
+	 * @throws	RestException	403		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 * @throws	RestException	503		Error when retrieving Member list
+	 */
+	public function indexType($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
+	{
+		$obj_ret = array();
+
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'lire')) {
+			throw new RestException(403);
+		}
+
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type AS t LEFT JOIN ".MAIN_DB_PREFIX."adherent_type_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
+		$sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
+
+		// Add sql filters
+		if ($sqlfilters) {
+			$errormessage = '';
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			}
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$membertype = new AdherentType($this->db);
+				if ($membertype->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_filterObjectProperties($this->_cleanObjectDatas($membertype), $properties);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
+		}
+
+		return $obj_ret;
+	}
+
+	/**
+	 * Create member type object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of member type
+	 *
+	 * @url POST /types/{id}
+	 *
+	 * @throws	RestException	403		Access denied
+	 * @throws	RestException	500		Error when creating Member Type
+	 */
+	public function postType($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
+			throw new RestException(403);
+		}
+		// Check mandatory fields
+		$result = $this->_validateType($request_data);
+
+		$membertype = new AdherentType($this->db);
+		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
+				$membertype->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
+			$membertype->$field = $value;
+		}
+		if ($membertype->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
+		}
+		return $membertype->id;
+	}
+
+	/**
+	 * Update member type
+	 *
+	 * @param 	int   		$id             ID of member type to update
+	 * @param 	array 		$request_data   Datas
+	 * @return 	Object						Updated object
+	 *
+	 * @url PUT /types/{id}
+	 *
+	 * @throws	RestException	403		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 * @throws	RestException	500		Error when updating Member Type
+	 */
+	public function putType($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
+			throw new RestException(403);
+		}
+
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
+				$membertype->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
+			// Process the status separately because it must be updated using
+			// the validate(), resiliate() and exclude() methods of the class AdherentType.
+			$membertype->$field = $value;
+		}
+
+		// If there is no error, update() returns the number of affected rows
+		// so if the update is a no op, the return value is zero.
+		if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, 'Error when updating member type: '.$membertype->error);
+		}
+	}
+
+	/**
+	 * Delete member type
+	 *
+	 * @param int $id   member type ID
+	 * @return array
+	 *
+	 * @url GET /types/{id}
+	 *
+	 * @throws	RestException	403		Access denied
+	 * @throws	RestException	404		No Member Type found
+	 * @throws	RestException	500		Error when deleting Member Type
+	 */
+	public function deleteType($id)
+	{
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
+			throw new RestException(403);
+		}
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$res = $membertype->delete(DolibarrApiAccess::$user);
+		if ($res < 0) {
+			throw new RestException(500, "Can't delete, error occurs");
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Member type deleted'
+			)
+		);
+	}
+
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validateType($data)
+	{
+		$membertype = array();
+		foreach (MembersTypes::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$membertype[$field] = $data[$field];
+		}
+		return $membertype;
+	}
 }
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
deleted file mode 100644
index c3d0e374746..00000000000
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/* Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-use Luracast\Restler\RestException;
-
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-
-/**
- * API class for members types
- *
- * @access protected
- * @class  DolibarrApiAccess {@requires user,external}
- */
-class MembersTypes extends DolibarrApi
-{
-	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
-	 */
-	public static $FIELDS = array(
-		'label',
-	);
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		global $db, $conf;
-		$this->db = $db;
-	}
-
-	/**
-	 * Get properties of a member type object
-	 *
-	 * Return an array with member type information
-	 *
-	 * @param   int     $id				ID of member type
-	 * @return  Object					Object with cleaned properties
-	 *
-	 * @throws	RestException	403		Access denied
-	 * @throws	RestException	404		No Member Type found
-	 */
-	public function get($id)
-	{
-		if (!DolibarrApiAccess::$user->hasRight('adherent', 'lire')) {
-			throw new RestException(403);
-		}
-
-		$membertype = new AdherentType($this->db);
-		$result = $membertype->fetch($id);
-		if (!$result) {
-			throw new RestException(404, 'member type not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		return $this->_cleanObjectDatas($membertype);
-	}
-
-	/**
-	 * List members types
-	 *
-	 * Get a list of members types
-	 *
-	 * @param string    $sortfield  Sort field
-	 * @param string    $sortorder  Sort order
-	 * @param int       $limit      Limit for list
-	 * @param int       $page       Page number
-	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
-	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
-	 * @return array                Array of member type objects
-	 *
-	 * @throws	RestException	403		Access denied
-	 * @throws	RestException	404		No Member Type found
-	 * @throws	RestException	503		Error when retrieving Member list
-	 */
-	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
-	{
-		global $db, $conf;
-
-		$obj_ret = array();
-
-		if (!DolibarrApiAccess::$user->hasRight('adherent', 'lire')) {
-			throw new RestException(403);
-		}
-
-		$sql = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type AS t LEFT JOIN ".MAIN_DB_PREFIX."adherent_type_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
-		$sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
-
-		// Add sql filters
-		if ($sqlfilters) {
-			$errormessage = '';
-			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
-			if ($errormessage) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
-			}
-		}
-
-		$sql .= $this->db->order($sortfield, $sortorder);
-		if ($limit) {
-			if ($page < 0) {
-				$page = 0;
-			}
-			$offset = $limit * $page;
-
-			$sql .= $this->db->plimit($limit + 1, $offset);
-		}
-
-		$result = $this->db->query($sql);
-		if ($result) {
-			$i = 0;
-			$num = $this->db->num_rows($result);
-			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min) {
-				$obj = $this->db->fetch_object($result);
-				$membertype = new AdherentType($this->db);
-				if ($membertype->fetch($obj->rowid)) {
-					$obj_ret[] = $this->_filterObjectProperties($this->_cleanObjectDatas($membertype), $properties);
-				}
-				$i++;
-			}
-		} else {
-			throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
-		}
-
-		return $obj_ret;
-	}
-
-	/**
-	 * Create member type object
-	 *
-	 * @param array $request_data   Request data
-	 * @return int  ID of member type
-	 *
-	 * @throws	RestException	403		Access denied
-	 * @throws	RestException	500		Error when creating Member Type
-	 */
-	public function post($request_data = null)
-	{
-		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
-			throw new RestException(403);
-		}
-		// Check mandatory fields
-		$result = $this->_validate($request_data);
-
-		$membertype = new AdherentType($this->db);
-		foreach ($request_data as $field => $value) {
-			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
-				$membertype->context['caller'] = $request_data['caller'];
-				continue;
-			}
-
-			$membertype->$field = $value;
-		}
-		if ($membertype->create(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
-		}
-		return $membertype->id;
-	}
-
-	/**
-	 * Update member type
-	 *
-	 * @param 	int   		$id             ID of member type to update
-	 * @param 	array 		$request_data   Datas
-	 * @return 	Object						Updated object
-	 *
-	 * @throws	RestException	403		Access denied
-	 * @throws	RestException	404		No Member Type found
-	 * @throws	RestException	500		Error when updating Member Type
-	 */
-	public function put($id, $request_data = null)
-	{
-		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
-			throw new RestException(403);
-		}
-
-		$membertype = new AdherentType($this->db);
-		$result = $membertype->fetch($id);
-		if (!$result) {
-			throw new RestException(404, 'member type not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		foreach ($request_data as $field => $value) {
-			if ($field == 'id') {
-				continue;
-			}
-			if ($field === 'caller') {
-				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
-				$membertype->context['caller'] = $request_data['caller'];
-				continue;
-			}
-
-			// Process the status separately because it must be updated using
-			// the validate(), resiliate() and exclude() methods of the class AdherentType.
-			$membertype->$field = $value;
-		}
-
-		// If there is no error, update() returns the number of affected rows
-		// so if the update is a no op, the return value is zero.
-		if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
-			return $this->get($id);
-		} else {
-			throw new RestException(500, 'Error when updating member type: '.$membertype->error);
-		}
-	}
-
-	/**
-	 * Delete member type
-	 *
-	 * @param int $id   member type ID
-	 * @return array
-	 *
-	 * @throws	RestException	403		Access denied
-	 * @throws	RestException	404		No Member Type found
-	 * @throws	RestException	500		Error when deleting Member Type
-	 */
-	public function delete($id)
-	{
-		if (!DolibarrApiAccess::$user->hasRight('adherent', 'configurer')) {
-			throw new RestException(403);
-		}
-		$membertype = new AdherentType($this->db);
-		$result = $membertype->fetch($id);
-		if (!$result) {
-			throw new RestException(404, 'member type not found');
-		}
-
-		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$res = $membertype->delete(DolibarrApiAccess::$user);
-		if ($res < 0) {
-			throw new RestException(500, "Can't delete, error occurs");
-		}
-
-		return array(
-			'success' => array(
-				'code' => 200,
-				'message' => 'Member type deleted'
-			)
-		);
-	}
-
-	/**
-	 * Validate fields before creating an object
-	 *
-	 * @param array|null    $data   Data to validate
-	 * @return array
-	 *
-	 * @throws RestException
-	 */
-	private function _validate($data)
-	{
-		$membertype = array();
-		foreach (MembersTypes::$FIELDS as $field) {
-			if (!isset($data[$field])) {
-				throw new RestException(400, "$field field missing");
-			}
-			$membertype[$field] = $data[$field];
-		}
-		return $membertype;
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-	/**
-	 * Clean sensible object datas
-	 *
-	 * @param   Object  $object    Object to clean
-	 * @return    Object    Object with cleaned properties
-	 */
-	protected function _cleanObjectDatas($object)
-	{
-		// phpcs:enable
-		$object = parent::_cleanObjectDatas($object);
-
-		unset($object->array_options);
-		unset($object->linkedObjectsIds);
-		unset($object->context);
-		unset($object->canvas);
-		unset($object->fk_project);
-		unset($object->contact);
-		unset($object->contact_id);
-		unset($object->thirdparty);
-		unset($object->user);
-		unset($object->origin);
-		unset($object->origin_id);
-		unset($object->ref_ext);
-		unset($object->country);
-		unset($object->country_id);
-		unset($object->country_code);
-		unset($object->barcode_type);
-		unset($object->barcode_type_code);
-		unset($object->barcode_type_label);
-		unset($object->barcode_type_coder);
-		unset($object->mode_reglement_id);
-		unset($object->cond_reglement_id);
-		unset($object->cond_reglement);
-		unset($object->fk_delivery_address);
-		unset($object->shipping_method_id);
-		unset($object->model_pdf);
-		unset($object->fk_account);
-		unset($object->note_public);
-		unset($object->note_private);
-		unset($object->fk_incoterms);
-		unset($object->label_incoterms);
-		unset($object->location_incoterms);
-		unset($object->name);
-		unset($object->lastname);
-		unset($object->firstname);
-		unset($object->civility_id);
-		unset($object->total_ht);
-		unset($object->total_tva);
-		unset($object->total_localtax1);
-		unset($object->total_localtax2);
-		unset($object->total_ttc);
-
-		return $object;
-	}
-}
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 7ff746c21fb..d716869cfcc 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -54,6 +54,7 @@ class MyModuleApi extends DolibarrApi
 		$this->myobject = new MyObject($this->db);
 	}
 
+
 	/* BEGIN MODULEBUILDER API MYOBJECT */
 
 	/**
@@ -64,7 +65,7 @@ class MyModuleApi extends DolibarrApi
 	 * @param	int		$id				ID of myobject
 	 * @return  Object					Object with cleaned properties
 	 *
-	 * @url	GET mymodule/myobjects/{id}
+	 * @url	GET myobjects/{id}
 	 *
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 404 Not found
@@ -103,7 +104,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 503 System error
 	 *
-	 * @url	GET /mymodule/myobjects/
+	 * @url	GET /myobjects/
 	 */
 	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
 	{
@@ -191,7 +192,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 403 Not allowed
 	 * @throws RestException 500 System error
 	 *
-	 * @url	POST mymodule/myobjects/
+	 * @url	POST myobjects/
 	 */
 	public function post($request_data = null)
 	{
@@ -200,7 +201,7 @@ class MyModuleApi extends DolibarrApi
 		}
 
 		// Check mandatory fields
-		$result = $this->_validate($request_data);
+		$result = $this->_validateMyObject($request_data);
 
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
@@ -232,7 +233,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 404 Not found
 	 * @throws RestException 500 System error
 	 *
-	 * @url	PUT mymodule/myobjects/{id}
+	 * @url	PUT myobjects/{id}
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -282,7 +283,7 @@ class MyModuleApi extends DolibarrApi
 	 * @throws RestException 409 Nothing to do
 	 * @throws RestException 500 System error
 	 *
-	 * @url	DELETE mymodule/myobjects/{id}
+	 * @url	DELETE myobjects/{id}
 	 */
 	public function delete($id)
 	{
@@ -321,7 +322,7 @@ class MyModuleApi extends DolibarrApi
 	 *
 	 * @throws	RestException
 	 */
-	private function _validate($data)
+	private function _validateMyObject($data)
 	{
 		$myobject = array();
 		foreach ($this->myobject->fields as $field => $propfield) {

From d1c980b0be8987410fa2a3ddc4dd6e9794aa7584 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Fri, 8 Mar 2024 11:57:07 +0100
Subject: [PATCH 0557/1862] Factoring fetchObjectLinked

---
 htdocs/core/class/commonobject.class.php | 98 +++---------------------
 htdocs/core/lib/functions.lib.php        | 23 +++++-
 2 files changed, 29 insertions(+), 92 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cac72ca1e49..73e22b7bce7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4200,98 +4200,20 @@ abstract class CommonObject
 			if (!empty($this->linkedObjectsIds)) {
 				$tmparray = $this->linkedObjectsIds;
 				foreach ($tmparray as $objecttype => $objectids) {       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
-					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
-					$module = $element = $subelement = $objecttype;
-					$regs = array();
-					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
-						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {
-						$module = $element = $regs[1];
-						$subelement = $regs[2];
-					}
+					$element_properties = getElementProperties($objecttype);
+					$element = $element_properties['element'];
+					$classPath = $element_properties['classpath'];
+					$classFile = $element_properties['classfile'];
+					$className = $element_properties['classname'];
+					$module = $element_properties['module'];
 
-					$classpath = $element.'/class';
-					// To work with non standard classpath or module name
-					if ($objecttype == 'facture') {
-						$classpath = 'compta/facture/class';
-					} elseif ($objecttype == 'facturerec') {
-						$classpath = 'compta/facture/class';
-						$module = 'facture';
-					} elseif ($objecttype == 'propal') {
-						$classpath = 'comm/propal/class';
-					} elseif ($objecttype == 'supplier_proposal') {
-						$classpath = 'supplier_proposal/class';
-					} elseif ($objecttype == 'shipping') {
-						$classpath = 'expedition/class';
-						$subelement = 'expedition';
-						$module = 'expedition';
-					} elseif ($objecttype == 'delivery') {
-						$classpath = 'delivery/class';
-						$subelement = 'delivery';
-						$module = 'delivery_note';
-					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
-						$classpath = 'fourn/class';
-						$module = 'fournisseur';
-					} elseif ($objecttype == 'fichinter') {
-						$classpath = 'fichinter/class';
-						$subelement = 'fichinter';
-						$module = 'ficheinter';
-					} elseif ($objecttype == 'subscription') {
-						$classpath = 'adherents/class';
-						$module = 'adherent';
-					} elseif ($objecttype == 'contact') {
-						$module = 'societe';
-					}
-					// Set classfile
-					$classfile = strtolower($subelement);
-					$classname = ucfirst($subelement);
-
-					if ($objecttype == 'order') {
-						$classfile = 'commande';
-						$classname = 'Commande';
-					} elseif ($objecttype == 'invoice_supplier') {
-						$classfile = 'fournisseur.facture';
-						$classname = 'FactureFournisseur';
-					} elseif ($objecttype == 'order_supplier') {
-						$classfile = 'fournisseur.commande';
-						$classname = 'CommandeFournisseur';
-					} elseif ($objecttype == 'supplier_proposal') {
-						$classfile = 'supplier_proposal';
-						$classname = 'SupplierProposal';
-					} elseif ($objecttype == 'facturerec') {
-						$classfile = 'facture-rec';
-						$classname = 'FactureRec';
-					} elseif ($objecttype == 'subscription') {
-						$classfile = 'subscription';
-						$classname = 'Subscription';
-					} elseif ($objecttype == 'project' || $objecttype == 'projet') {
-						$classpath = 'projet/class';
-						$classfile = 'project';
-						$classname = 'Project';
-					} elseif ($objecttype == 'conferenceorboothattendee') {
-						$classpath = 'eventorganization/class';
-						$classfile = 'conferenceorboothattendee';
-						$classname = 'ConferenceOrBoothAttendee';
-						$module = 'eventorganization';
-					} elseif ($objecttype == 'conferenceorbooth') {
-						$classpath = 'eventorganization/class';
-						$classfile = 'conferenceorbooth';
-						$classname = 'ConferenceOrBooth';
-						$module = 'eventorganization';
-					} elseif ($objecttype == 'mo') {
-						$classpath = 'mrp/class';
-						$classfile = 'mo';
-						$classname = 'Mo';
-						$module = 'mrp';
-					}
-
-					// Here $module, $classfile and $classname are set, we can use them.
+					// Here $module, $classFile and $className are set, we can use them.
 					if (isModEnabled($module) && (($element != $this->element) || $alsosametype)) {
 						if ($loadalsoobjects && (is_numeric($loadalsoobjects) || ($loadalsoobjects === $objecttype))) {
-							dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
-							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
-							if (class_exists($classname)) {
+							dol_include_once('/'.$classPath.'/'.$classFile.'.class.php');
+							if (class_exists($className)) {
 								foreach ($objectids as $i => $objectid) {	// $i is rowid into llx_element_element
-									$object = new $classname($this->db);
+									$object = new $className($this->db);
 									$ret = $object->fetch($objectid);
 									if ($ret >= 0) {
 										$this->linkedObjects[$objecttype][$i] = $object;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d2d4a4558f8..ce423636f28 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12140,6 +12140,10 @@ function getElementProperties($elementType)
 		$module = 'facture';
 		$subelement = 'facture';
 		$table_element = 'facture';
+	} elseif ($elementType == 'facturerec') {
+		$classpath = 'compta/facture/class';
+		$module = 'facture';
+		$classname = 'FactureRec';
 	} elseif ($elementType == 'commande' || $elementType == 'order') {
 		$classpath = 'commande/class';
 		$module = 'commande';
@@ -12160,13 +12164,14 @@ function getElementProperties($elementType)
 		$element = 'supplierproposal';
 		$classfile = 'supplier_proposal';
 		$subelement = 'supplierproposal';
-	} elseif ($elementType == 'shipping') {
-		$classpath = 'expedition/class';
-		$subelement = 'expedition';
-		$module = 'expedition_bon';
+		//  } elseif ($elementType == 'shipping') { // TODO atm-john @2024-03-08 : $elementType == 'shipping' already set. And what is expedition_bon module using class shipping ? This line make no sense ...
+		//      $classpath = 'expedition/class';
+		//      $subelement = 'expedition';
+		//      $module = 'expedition_bon';
 	} elseif ($elementType == 'delivery') {
 		$classpath = 'delivery/class';
 		$subelement = 'delivery';
+		// TODO atm-john @2024-03-08 :  Strange definition found on fetchObjectLinked of common object, before factoring, the value was $module = 'delivery_note'; Who's right?
 		$module = 'expedition';
 	} elseif ($elementType == 'contract') {
 		$classpath = 'contrat/class';
@@ -12280,6 +12285,16 @@ function getElementProperties($elementType)
 		$classname = 'EmailSenderProfile';
 		$table_element = 'c_email_senderprofile';
 		$subelement = '';
+	} elseif ($objectType == 'conferenceorboothattendee') {
+		$classpath = 'eventorganization/class';
+		$classfile = 'conferenceorboothattendee';
+		$classname = 'ConferenceOrBoothAttendee';
+		$module = 'eventorganization';
+	} elseif ($objectType == 'conferenceorbooth') {
+		$classpath = 'eventorganization/class';
+		$classfile = 'conferenceorbooth';
+		$classname = 'ConferenceOrBooth';
+		$module = 'eventorganization';
 	}
 
 	if (empty($classfile)) {

From 3583c4aeea317aac23d58cd02d1e1dc4e6d3c1d6 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 8 Mar 2024 12:09:32 +0100
Subject: [PATCH 0558/1862] NEW updated resource list for new fields (#28705)

* Added address, zip & town

* Added state & country

* Added phone, email, max_users & url

* Added link formatting. Cleaned code.

* Updated EN & FR localization

* Added country select list

* Cleaned code
---
 htdocs/langs/en_US/resource.lang |   1 +
 htdocs/langs/fr_FR/resource.lang |   1 +
 htdocs/resource/list.php         | 297 +++++++++++++++++++++++++++++--
 3 files changed, 282 insertions(+), 17 deletions(-)

diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index 252537f0022..8f117e93bc9 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -39,3 +39,4 @@ ErrorResourcesAlreadyInUse=Some resources are in use
 ErrorResourceUseInEvent=%s used in %s event
 
 MaxUsers=Maximum users (places, seats, etc.)
+MaxUsersLabel=Maximum users
diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
index 044f23f33eb..47ab7781953 100644
--- a/htdocs/langs/fr_FR/resource.lang
+++ b/htdocs/langs/fr_FR/resource.lang
@@ -39,3 +39,4 @@ ErrorResourcesAlreadyInUse=Certaines ressources sont utilisées
 ErrorResourceUseInEvent=%s utilisé dans l'événement %s
 
 MaxUsers=Utilisateurs maximum (places, sièges, etc.)
+MaxUsersLabel=Utilisateurs maximum
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 0f149263baa..33f21aa75bb 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -61,8 +61,17 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 if (!is_array($search_array_options)) {
 	$search_array_options = array();
 }
-$search_ref 	= GETPOST("search_ref", 'alpha');
-$search_type 	= GETPOST("search_type", 'alpha');
+$search_ref			= GETPOST("search_ref", 'alpha');
+$search_type		= GETPOST("search_type", 'alpha');
+$search_address		= GETPOST("search_address", 'alpha');
+$search_zip			= GETPOST("search_zip", 'alpha');
+$search_town		= GETPOST("search_town", 'alpha');
+$search_state		= GETPOST("search_state", 'alpha');
+$search_country		= GETPOST("search_country", 'alpha');
+$search_phone		= GETPOST("search_phone", 'alpha');
+$search_email		= GETPOST("search_email", 'alpha');
+$search_max_users	= GETPOST("search_max_users", 'alpha');
+$search_url			= GETPOST("search_url", 'alpha');
 
 $filter = array();
 
@@ -87,14 +96,61 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $arrayfields = array(
-		't.ref' => array(
-				'label' => $langs->trans("Ref"),
-				'checked' => 1
-		),
-		'ty.label' => array(
-				'label' => $langs->trans("ResourceType"),
-				'checked' => 1
-		),
+	't.ref' => array(
+		'label' => $langs->trans("Ref"),
+		'checked' => 1,
+		'position' => 1
+	),
+	'ty.label' => array(
+		'label' => $langs->trans("Type"),
+		'checked' => 1,
+		'position' => 2
+	),
+	't.address' => array(
+		'label' => $langs->trans("Address"),
+		'checked' => 0,
+		'position' => 3
+	),
+	't.zip' => array(
+		'label' => $langs->trans("Zip"),
+		'checked' => 0,
+		'position' => 4
+	),
+	't.town' => array(
+		'label' => $langs->trans("Town"),
+		'checked' => 1,
+		'position' => 5
+	),
+	'st.nom' => array(
+		'label' => $langs->trans("State"),
+		'checked' => 0,
+		'position' => 6
+	),
+	'co.label' => array(
+		'label' => $langs->trans("Country"),
+		'checked' => 1,
+		'position' => 7
+	),
+	't.phone' => array(
+		'label' => $langs->trans("Phone"),
+		'checked' => 0,
+		'position' => 8
+	),
+	't.email' => array(
+		'label' => $langs->trans("Email"),
+		'checked' => 0,
+		'position' => 9
+	),
+	't.max_users' => array(
+		'label' => $langs->trans("MaxUsersLabel"),
+		'checked' => 1,
+		'position' => 10
+	),
+	't.url' => array(
+		'label' => $langs->trans("URL"),
+		'checked' => 0,
+		'position' => 11
+	),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -108,6 +164,15 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 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_ref = "";
 	$search_type = "";
+	$search_address = "";
+	$search_zip = "";
+	$search_town = "";
+	$search_state = "";
+	$search_country = "";
+	$search_phone = "";
+	$search_email = "";
+	$search_max_users = "";
+	$search_url = "";
 	$toselect = array();
 	$search_array_options = array();
 }
@@ -175,7 +240,9 @@ $sql .= " t.url,";
 $sql .= " t.fk_code_type_resource,";
 $sql .= " t.tms as date_modification,";
 $sql .= " t.datec as date_creation, ";
-$sql .= " ty.label as type_label ";
+$sql .= " ty.label as type_label, ";
+$sql .= " st.nom as state_label, ";
+$sql .= " co.label as country_label ";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -191,6 +258,8 @@ $sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= " FROM ".MAIN_DB_PREFIX."resource as t";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as st ON st.rowid=t.fk_state";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid=t.fk_country";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
@@ -207,6 +276,33 @@ if ($search_ref) {
 if ($search_type) {
 	$sql .= natural_search('ty.label', $search_type);
 }
+if ($search_address) {
+	$sql .= natural_search('t.address', $search_address);
+}
+if ($search_zip) {
+	$sql .= natural_search('t.zip', $search_zip);
+}
+if ($search_town) {
+	$sql .= natural_search('t.town', $search_town);
+}
+if ($search_state) {
+	$sql .= natural_search('st.nom', $search_state);
+}
+if ($search_country && $search_country != '-1') {
+	$sql .= " AND t.fk_country IN (".$db->sanitize($search_country).')';
+}
+if ($search_phone) {
+	$sql .= natural_search('t.phone', $search_phone);
+}
+if ($search_email) {
+	$sql .= natural_search('t.email', $search_email);
+}
+if ($search_max_users) {
+	$sql .= natural_search('t.max_users', $search_max_users, 1);
+}
+if ($search_url) {
+	$sql .= natural_search('t.url', $search_url);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -277,6 +373,33 @@ if ($search_ref != '') {
 if ($search_type != '') {
 	$param .= '&search_type='.urlencode($search_type);
 }
+if ($search_address != '') {
+	$param .= '&search_address='.urlencode($search_address);
+}
+if ($search_zip != '') {
+	$param .= '&search_zip='.urlencode($search_zip);
+}
+if ($search_town != '') {
+	$param .= '&search_town='.urlencode($search_town);
+}
+if ($search_state != '') {
+	$param .= '&search_state='.urlencode($search_state);
+}
+if ($search_country != '') {
+	$param .= '&search_country='.urlencode($search_country);
+}
+if ($search_phone != '') {
+	$param .= '&search_phone='.urlencode($search_phone);
+}
+if ($search_email != '') {
+	$param .= '&search_email='.urlencode($search_email);
+}
+if ($search_max_users != '') {
+	$param .= '&search_max_users='.urlencode($search_max_users);
+}
+if ($search_url != '') {
+	$param .= '&search_url='.urlencode($search_url);
+}
 
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -337,6 +460,51 @@ if (!empty($arrayfields['ty.label']['checked'])) {
 	print '<input type="text" class="flat" name="search_type" value="'.$search_type.'" size="8">';
 	print '</td>';
 }
+if (!empty($arrayfields['t.address']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_address" value="'.$search_address.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['t.zip']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_zip" value="'.$search_zip.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['t.town']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_town" value="'.$search_town.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['st.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_state" value="'.$search_state.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['co.label']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+	print '</td>';
+}
+if (!empty($arrayfields['t.phone']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_phone" value="'.$search_phone.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['t.email']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_email" value="'.$search_email.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['t.max_users']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_max_users" value="'.$search_max_users.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['t.url']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_url" value="'.$search_url.'" size="8">';
+	print '</td>';
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -361,6 +529,33 @@ if (!empty($arrayfields['t.ref']['checked'])) {
 if (!empty($arrayfields['ty.label']['checked'])) {
 	print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder);
 }
+if (!empty($arrayfields['t.address']['checked'])) {
+	print_liste_field_titre($arrayfields['t.address']['label'], $_SERVER["PHP_SELF"], "t.address", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.zip']['checked'])) {
+	print_liste_field_titre($arrayfields['t.zip']['label'], $_SERVER["PHP_SELF"], "t.zip", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.town']['checked'])) {
+	print_liste_field_titre($arrayfields['t.town']['label'], $_SERVER["PHP_SELF"], "t.town", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['st.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['st.nom']['label'], $_SERVER["PHP_SELF"], "st.nom", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['co.label']['checked'])) {
+	print_liste_field_titre($arrayfields['co.label']['label'], $_SERVER["PHP_SELF"], "co.label", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.phone']['checked'])) {
+	print_liste_field_titre($arrayfields['t.phone']['label'], $_SERVER["PHP_SELF"], "t.phone", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.email']['checked'])) {
+	print_liste_field_titre($arrayfields['t.email']['label'], $_SERVER["PHP_SELF"], "t.email", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.max_users']['checked'])) {
+	print_liste_field_titre($arrayfields['t.max_users']['label'], $_SERVER["PHP_SELF"], "t.max_users", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.url']['checked'])) {
+	print_liste_field_titre($arrayfields['t.url']['label'], $_SERVER["PHP_SELF"], "t.url", "", $param, "", $sortfield, $sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Action column
@@ -381,22 +576,90 @@ while ($i < $imaxinloop) {
 	$objectstatic->id = $obj->rowid;
 	$objectstatic->ref = $obj->ref;
 	$objectstatic->type_label = $obj->type_label;
+	$objectstatic->address = $obj->address;
+	$objectstatic->zip = $obj->zip;
+	$objectstatic->town = $obj->town;
+	$objectstatic->state = $obj->state_label;
+	$objectstatic->country = $obj->country_label;
+	$objectstatic->phone = $obj->phone;
+	$objectstatic->email = $obj->email;
+	$objectstatic->max_users = $obj->max_users;
+	$objectstatic->url = $obj->url;
 
 	print '<tr class="oddeven">';
 
 	if (!empty($arrayfields['t.ref']['checked'])) {
-		print '<td>';
-		print $objectstatic->getNomUrl(5);
-		print '</td>';
+		print '<td>'.$objectstatic->getNomUrl(5).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 
 	if (!empty($arrayfields['ty.label']['checked'])) {
-		print '<td>';
-		print $objectstatic->type_label;
-		print '</td>';
+		print '<td>'.$objectstatic->type_label.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.address']['checked'])) {
+		print '<td>'.$objectstatic->address.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.zip']['checked'])) {
+		print '<td>'.$objectstatic->zip.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.town']['checked'])) {
+		print '<td>'.$objectstatic->town.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['st.nom']['checked'])) {
+		print '<td>'.$objectstatic->state.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['co.label']['checked'])) {
+		print '<td>'.$objectstatic->country.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.phone']['checked'])) {
+		print '<td>'.dol_print_phone($objectstatic->phone, '', 0, 0, 'AC_TEL', " ", 'phone').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.email']['checked'])) {
+		print '<td>'.dol_print_email($objectstatic->email, 0, 0, 1, 0, 0, 1).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.max_users']['checked'])) {
+		print '<td>'.$objectstatic->max_users.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.url']['checked'])) {
+		print '<td>'.dol_print_url($objectstatic->url, '_blank', 32, 1).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From 231703e5d1e435bb3077e1a63372b32390c7f1a2 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Fri, 8 Mar 2024 12:09:49 +0100
Subject: [PATCH 0559/1862] qual: phpstan for
 htdocs/loan/class/paymentloan.class.php (#28704)

htdocs/loan/class/paymentloan.class.php	155	Property PaymentLoan::$num_payment (string) does not accept int.

htdocs/loan/class/paymentloan.class.php	317	Property PaymentLoan::$num_payment (string) does not accept int.
---
 htdocs/loan/class/paymentloan.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 3ec3fda1f0e..f095f480a04 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -155,7 +155,7 @@ class PaymentLoan extends CommonObject
 			$this->fk_typepayment = (int) $this->fk_typepayment;
 		}
 		if (isset($this->num_payment)) {
-			$this->num_payment = (int) $this->num_payment;
+			$this->num_payment = trim($this->num_payment);
 		}
 		if (isset($this->note_private)) {
 			$this->note_private = trim($this->note_private);
@@ -317,7 +317,7 @@ class PaymentLoan extends CommonObject
 			$this->fk_typepayment = (int) $this->fk_typepayment;
 		}
 		if (isset($this->num_payment)) {
-			$this->num_payment = (int) $this->num_payment;
+			$this->num_payment = trim($this->num_payment);
 		}
 		if (isset($this->note_private)) {
 			$this->note = trim($this->note_private);

From cc5366249af1731ad3c32f4052abfe2e8a0b4ff5 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Fri, 8 Mar 2024 12:10:09 +0100
Subject: [PATCH 0560/1862] qual: phpdoc for htdocs/core/db/mysqli.class.php
 (#28703)

PHPDoc update to reflect what the code does today.

This update however doesn't solve this PHPStan warning:
htdocs/core/db/mysqli.class.php	243	Return type (mysqli|null) of method DoliDBMysqli::connect() should be compatible with return type (resource) of method Database::connect()
---
 htdocs/core/db/mysqli.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index f3c0c3cce62..d07b4261ce5 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -232,12 +232,12 @@ class DoliDBMysqli extends DoliDB
 	/**
 	 * Connect to server
 	 *
-	 * @param   string  $host 	Database server host
-	 * @param   string  $login 	Login
-	 * @param   string  $passwd Password
-	 * @param   string  $name 	Name of database (not used for mysql, used for pgsql)
-	 * @param   integer $port 	Port of database server
-	 * @return  mysqli|null		Database access object
+	 * @param   string          $host           Database server host
+	 * @param   string          $login          Login
+	 * @param   string          $passwd         Password
+	 * @param   string          $name           Name of database (not used for mysql, used for pgsql)
+	 * @param   integer         $port           Port of database server
+	 * @return  mysqli|mysqliDoli|false         Database access object
 	 * @see close()
 	 */
 	public function connect($host, $login, $passwd, $name, $port = 0)

From 6cce456b8c97baab14b6f1e6febb21d04f7e5502 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 12:18:22 +0100
Subject: [PATCH 0561/1862] Qual: Add fixers for price(ARG2), and
 urlencode((string)...) (#28701)

# Qual: Add fixers for price(ARG2), and urlencode((string)...)

Register the fixers used to fix phan messages by adjusting arguments and casts.
---
 dev/tools/phan/config_fixer.php               |   4 +-
 dev/tools/phan/plugins/PriceFormFixer.php     | 138 ++++++++++++++++++
 .../phan/plugins/UrlEncodeStringifyFixer.php  | 106 ++++++++++++++
 3 files changed, 247 insertions(+), 1 deletion(-)
 create mode 100644 dev/tools/phan/plugins/PriceFormFixer.php
 create mode 100644 dev/tools/phan/plugins/UrlEncodeStringifyFixer.php

diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index e13e371b8df..a9daacfc676 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
+//require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
+//require_once __DIR__.'/plugins/PriceFormFixer.php';
+require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
 
 /* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  */
diff --git a/dev/tools/phan/plugins/PriceFormFixer.php b/dev/tools/phan/plugins/PriceFormFixer.php
new file mode 100644
index 00000000000..1d384d2243b
--- /dev/null
+++ b/dev/tools/phan/plugins/PriceFormFixer.php
@@ -0,0 +1,138 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+		$line = $instance->getLine();
+		// print flags\TYPE_NULL;
+		$expected_name = 'price';
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) < 2) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$stringValue = null;
+			foreach ([1] as $argIdx) {
+				$arg = $arguments[$argIdx * 2];  // Pair number to skip "TOKEN" (,)
+
+				if (
+					$arg instanceof ArgumentExpression
+					&& $arg->expression instanceof StringLiteral
+				) {
+					// Get the string value of the StringLiteral
+					$stringValue = $arg->expression->getStringContentsText();
+					print "String is '$stringValue'".PHP_EOL;
+				} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+					$child = $arg->expression->children;
+					if (!$child instanceof Token) {
+						continue;
+					}
+					$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+					print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+					if ($token_str !== 'null') {
+						continue;
+					}
+
+					$stringValue = '';  // Fake empty
+				} else {
+					print "Expression is not string or null ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+					continue;
+				}
+
+				if ($stringValue !== '') {
+					print "Not replacing \$form which is '$stringValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+					continue;
+				}
+
+				// Reached end of switch case without "continue" -> replace
+				$replacement = 0;
+
+				print "Fixture elem on $line - $actual_name(...'$stringValue'...) - $instance".PHP_EOL;
+
+				// Determine replacement
+				$replacement = '0';
+
+				// Get the first argument (delimiter)
+				$argument_to_replace = $arg;
+
+				$arg_start_pos = $argument_to_replace->getStartPosition();
+				$arg_end_pos = $argument_to_replace->getEndPosition();
+
+				// Remove deprecated module name
+				$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+			}
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgumentProbablyReal',
+		$fix
+	);
+});
diff --git a/dev/tools/phan/plugins/UrlEncodeStringifyFixer.php b/dev/tools/phan/plugins/UrlEncodeStringifyFixer.php
new file mode 100644
index 00000000000..52084b1b721
--- /dev/null
+++ b/dev/tools/phan/plugins/UrlEncodeStringifyFixer.php
@@ -0,0 +1,106 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+		$line = $instance->getLine();
+		// print flags\TYPE_NULL;
+		$expected_name = 'urlencode';
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) < 1) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$arg = $arguments[0];
+
+			// Reached end of switch case without "continue" -> replace
+			$replacement = 0;
+
+			print "Fixture elem on $line - $actual_name() - $instance".PHP_EOL;
+
+			// Determine replacement
+			$replacement = '0';
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Remove deprecated module name
+			$edits[] = new FileEdit($arg_start_pos, $arg_start_pos, "(string) (");
+			$edits[] = new FileEdit($arg_end_pos, $arg_end_pos, ")");
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgumentInternal',
+		$fix
+	);
+});

From e74e638b26990d3e517579f6616616afa6f82860 Mon Sep 17 00:00:00 2001
From: Can Arslan <138895927+mc2rcanarslan@users.noreply.github.com>
Date: Fri, 8 Mar 2024 04:28:31 -0700
Subject: [PATCH 0562/1862] FIX: skip adding tab if user doesn't have
 permission (#28698)

verifCond function checks whether user has right and we should skip adding it if user doesn't have right
---
 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 0298ce0d439..846819f2433 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10189,6 +10189,8 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 						$newtab[1] = $label;
 						$newtab[2] = str_replace('+', '', $values[1]);
 						$h++;
+					} else {
+						continue;
 					}
 				} elseif (count($values) == 5) {       // case deprecated
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

From 7fd606b33647c769cf837abdbfc21b2510d349d5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 12:34:25 +0100
Subject: [PATCH 0563/1862]  Qual: Ignore/workaround SuspiciousParamOrder
 detection (#28688)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)

* Qual: Ignore/workaround SuspiciousParamOrder detction

# Qual: Ignore/workaround SuspiciousParamOrder detction

Ignore the false positive SuspiciousParamOrder or workaround (rename vars)
---
 htdocs/accountancy/class/lettering.class.php  |   2 +-
 htdocs/accountancy/customer/lines.php         |   3 +-
 htdocs/accountancy/customer/list.php          |  35 +--
 htdocs/accountancy/expensereport/lines.php    |   5 +-
 htdocs/accountancy/expensereport/list.php     |   3 +-
 htdocs/accountancy/supplier/lines.php         |   3 +-
 htdocs/accountancy/supplier/list.php          |  35 +--
 htdocs/adherents/card.php                     |  15 +-
 htdocs/adherents/list.php                     | 104 ++++-----
 htdocs/adherents/subscription.php             |   3 +-
 htdocs/admin/mails_templates.php              |   1 +
 htdocs/admin/tools/listevents.php             |   9 +-
 htdocs/categories/viewcat.php                 |  14 +-
 htdocs/comm/action/card.php                   |   1 +
 htdocs/comm/action/rapport/index.php          |   3 +-
 htdocs/comm/mailing/cibles.php                |   1 +
 htdocs/commande/list.php                      | 137 ++++++------
 htdocs/commande/list_det.php                  | 107 +++++-----
 htdocs/compta/bank/bankentries_list.php       |  61 +++---
 htdocs/compta/facture/card.php                |   9 +-
 .../compta/facture/invoicetemplate_list.php   |  55 ++---
 htdocs/compta/facture/list.php                | 164 +++++++-------
 htdocs/compta/paiement/cheque/list.php        |  25 +--
 htdocs/compta/paiement/list.php               |  33 +--
 htdocs/compta/prelevement/card.php            |   3 +-
 htdocs/compta/prelevement/fiche-rejet.php     |   1 +
 htdocs/compta/sociales/list.php               |  42 ++--
 htdocs/compta/tva/list.php                    |  31 +--
 htdocs/compta/tva/payments.php                |   2 +-
 htdocs/core/login/functions_ldap.php          |   1 +
 .../core/modules/bank/doc/pdf_ban.modules.php |   1 +
 .../bank/doc/pdf_sepamandate.modules.php      |  13 +-
 .../modules/cheque/doc/pdf_blochet.class.php  |   7 +-
 .../commande/doc/pdf_einstein.modules.php     |  13 +-
 .../commande/doc/pdf_eratosthene.modules.php  |  20 +-
 .../expedition/doc/pdf_espadon.modules.php    |   2 +-
 .../expedition/doc/pdf_merou.modules.php      |  11 +-
 .../expedition/doc/pdf_rouget.modules.php     |  11 +-
 .../doc/pdf_standard.modules.php              |   7 +-
 .../modules/facture/doc/pdf_crabe.modules.php |   3 +
 .../facture/doc/pdf_sponge.modules.php        |   4 +
 .../fichinter/doc/pdf_soleil.modules.php      |   7 +-
 .../modules/hrm/doc/pdf_standard.modules.php  |   9 +-
 .../movement/doc/pdf_standard.modules.php     |  23 +-
 .../modules/mrp/doc/pdf_vinci.modules.php     |   8 +-
 .../product/doc/pdf_standard.modules.php      |   7 +-
 .../project/doc/pdf_baleine.modules.php       |  11 +-
 .../project/doc/pdf_beluga.modules.php        | 201 +++++++++---------
 .../project/doc/pdf_timespent.modules.php     |  11 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  17 +-
 .../modules/propale/doc/pdf_cyan.modules.php  |  22 +-
 .../modules/rapport/pdf_paiement.class.php    |  13 +-
 .../reception/doc/pdf_squille.modules.php     |   9 +-
 .../stock/doc/pdf_standard.modules.php        |  31 +--
 .../stocktransfer/doc/pdf_eagle.modules.php   |   1 +
 .../doc/pdf_eagle_proforma.modules.php        |  18 +-
 .../doc/pdf_canelle.modules.php               |  11 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  22 +-
 .../doc/pdf_muscadet.modules.php              |  15 +-
 .../doc/pdf_standard.modules.php              |  11 +-
 .../doc/pdf_aurore.modules.php                |  13 +-
 .../doc/pdf_zenith.modules.php                |  22 +-
 htdocs/core/tpl/objectline_create.tpl.php     |  94 ++++----
 htdocs/don/list.php                           |  22 +-
 htdocs/don/paiement/list.php                  |  31 +--
 htdocs/expedition/list.php                    |  67 +++---
 htdocs/expensereport/payment/list.php         |  35 +--
 htdocs/fichinter/list.php                     |  57 ++---
 htdocs/fourn/facture/card.php                 |   1 +
 htdocs/fourn/facture/list-rec.php             |  55 ++---
 htdocs/fourn/facture/list.php                 | 125 +++++------
 htdocs/fourn/paiement/list.php                |  31 +--
 htdocs/holiday/view_log.php                   |  19 +-
 htdocs/margin/agentMargins.php                |   2 +-
 htdocs/margin/checkMargins.php                |   1 +
 htdocs/margin/customerMargins.php             |   2 +-
 htdocs/margin/productMargins.php              |   2 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |   2 +-
 htdocs/product/agenda.php                     |   2 +-
 htdocs/product/price.php                      |   6 +-
 htdocs/product/stats/commande.php             |   1 +
 htdocs/product/stats/commande_fournisseur.php |   1 +
 htdocs/product/stats/contrat.php              |   3 +-
 htdocs/product/stats/facture.php              |   5 +-
 htdocs/product/stats/facture_fournisseur.php  |   1 +
 htdocs/product/stats/facturerec.php           |   3 +-
 htdocs/product/stats/mo.php                   |   3 +-
 htdocs/product/stats/propal.php               |   1 +
 htdocs/product/stats/supplier_proposal.php    |   1 +
 .../stock/stats/commande_fournisseur.php      |   3 +-
 htdocs/product/stock/stats/expedition.php     |   3 +-
 htdocs/product/stock/stats/mo.php             |   9 +-
 htdocs/product/stock/stats/reception.php      |   3 +-
 htdocs/public/webportal/tpl/menu.tpl.php      |   5 +-
 htdocs/reception/list.php                     |   1 +
 ...tandard_recruitmentjobposition.modules.php |  14 +-
 htdocs/salaries/list.php                      |  31 +--
 htdocs/societe/notify/card.php                |   6 +-
 htdocs/societe/price.php                      |  14 +-
 htdocs/user/notify/card.php                   |   4 +-
 100 files changed, 1141 insertions(+), 1007 deletions(-)

diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index 07329030e4b..6f669e4833d 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -289,7 +289,7 @@ class Lettering extends BookKeeping
 	{
 		$error = 0;
 
-		// Generate a string with n char A where n is ACCOUNTING_LETTERING_NBLETTERS (So 'AA', 'AAA', ...)
+		// Generate a string with n char A where n is ACCOUNTING_LETTERING_NBLETTERS (So 'AA', 'AAA', ...) @phan-suppress-next-line PhanParamSuspiciousOrder
 		$lettre = str_pad("", getDolGlobalInt('ACCOUNTING_LETTERING_NBLETTERS', 3), "A");
 
 		$sql = "SELECT DISTINCT ab2.lettering_code";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 74753c65977..2aaed4ba014 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -175,7 +175,7 @@ if (GETPOST('sortfield') == 'f.datef, f.ref, fd.rowid') {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("CustomersVentilation").' - '.$langs->trans("Dispatched"), $help_url);
 
@@ -386,6 +386,7 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneCustomer").'</span><br>';
 
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 6ef21c0f21e..22047f60fe5 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -230,7 +230,7 @@ if (GETPOST('sortfield') == 'f.datef, f.ref, l.rowid') {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("CustomersVentilation"), $help_url);
 
@@ -445,8 +445,8 @@ if ($result) {
 	}
 
 	$arrayofmassactions = array(
-		'ventil'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
-		,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
+		'ventil' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
+		,'set_default_account' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	);
@@ -467,10 +467,11 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	if ($massaction == 'set_default_account') {
-		$formquestion[]=array('type' => 'other',
+		$formquestion[] = array('type' => 'other',
 			'name' => 'set_default_account',
 			'label' => $langs->trans("AccountancyCode"),
 			'value' => $formaccounting->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
@@ -599,26 +600,26 @@ if ($result) {
 		$facture_static_det->desc = $objp->description;
 
 		$accountingAccountArray = array(
-			'dom'=>$objp->aarowid,
-			'intra'=>$objp->aarowid_intra,
-			'export'=>$objp->aarowid_export,
-			'thirdparty' =>$objp->aarowid_thirdparty);
+			'dom' => $objp->aarowid,
+			'intra' => $objp->aarowid_intra,
+			'export' => $objp->aarowid_export,
+			'thirdparty' => $objp->aarowid_thirdparty);
 
 		$code_sell_p_notset = '';
 		$code_sell_t_notset = '';
 
 		$suggestedid = 0;
 
-		$return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
-		if (!is_array($return) && $return<0) {
+		$return = $accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
+		if (!is_array($return) && $return < 0) {
 			setEventMessage($accountingAccount->error, 'errors');
 		} else {
-			$suggestedid=$return['suggestedid'];
-			$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
-			$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
-			$code_sell_l=$return['code_l'];
-			$code_sell_p=$return['code_p'];
-			$code_sell_t=$return['code_t'];
+			$suggestedid = $return['suggestedid'];
+			$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
+			$suggestedaccountingaccountbydefaultfor = $return['suggestedaccountingaccountbydefaultfor'];
+			$code_sell_l = $return['code_l'];
+			$code_sell_p = $return['code_p'];
+			$code_sell_t = $return['code_t'];
 		}
 		//var_dump($return);
 
@@ -780,7 +781,7 @@ if ($result) {
 		if (!empty($toselect)) {
 			$ischecked = 0;
 			if (in_array($objp->rowid."_".$i, $toselect)) {
-				$ischecked=1;
+				$ischecked = 1;
 			}
 		}
 
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 2320620fec7..11602a58f1f 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -165,7 +165,7 @@ if (GETPOST('sortfield') == 'erd.date, erd.rowid') {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("ExpenseReportsVentilation").' - '.$langs->trans("Dispatched"), $help_url);
 
@@ -308,6 +308,7 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneExpenseReport").'</span><br>';
 
@@ -438,7 +439,7 @@ if ($result) {
 		$i++;
 	}
 	if ($num_lines == 0) {
-		$colspan=10;
+		$colspan = 10;
 		if (getDolGlobalString('ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE')) {
 			$colspan++;
 		}
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 8f996c42412..73d9dd96cb1 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -221,7 +221,7 @@ if (GETPOST('sortfield') == 'erd.date, erd.rowid') {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("ExpenseReportsVentilation"), $help_url);
 
@@ -376,6 +376,7 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoExpenseReport").'</span></br><br>';
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 496a32b9825..09c7aca7af7 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -180,7 +180,7 @@ if (GETPOST('sortfield') == 'f.datef, f.ref, l.rowid') {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("SuppliersVentilation").' - '.$langs->trans("Dispatched"), $help_url);
 
@@ -394,6 +394,7 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneSupplier").'</span><br>';
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index db087830144..cf495bf632a 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -232,7 +232,7 @@ if (GETPOST('sortfield') == 'f.datef, f.ref, l.rowid') {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("SuppliersVentilation"), $help_url);
 
@@ -452,8 +452,8 @@ if ($result) {
 	}
 
 	$arrayofmassactions = array(
-		'ventil'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
-		,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
+		'ventil' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
+		,'set_default_account' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	);
@@ -474,10 +474,11 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	if ($massaction == 'set_default_account') {
-		$formquestion[]=array('type' => 'other',
+		$formquestion[] = array('type' => 'other',
 				'name' => 'set_default_account',
 				'label' => $langs->trans("AccountancyCode"),
 				'value' => $formaccounting->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
@@ -611,26 +612,26 @@ if ($result) {
 		$facturefourn_static_det->desc = $objp->description;
 
 		$accountingAccountArray = array(
-			'dom'=>$objp->aarowid,
-			'intra'=>$objp->aarowid_intra,
-			'export'=>$objp->aarowid_export,
-			'thirdparty' =>$objp->aarowid_thirdparty);
+			'dom' => $objp->aarowid,
+			'intra' => $objp->aarowid_intra,
+			'export' => $objp->aarowid_export,
+			'thirdparty' => $objp->aarowid_thirdparty);
 
 		$code_buy_p_notset = '';
 		$code_buy_t_notset = '';
 
 		$suggestedid = 0;
 
-		$return=$accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facturefourn_static, $facturefourn_static_det, $accountingAccountArray, 'supplier');
-		if (!is_array($return) && $return<0) {
+		$return = $accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facturefourn_static, $facturefourn_static_det, $accountingAccountArray, 'supplier');
+		if (!is_array($return) && $return < 0) {
 			setEventMessage($accountingAccount->error, 'errors');
 		} else {
-			$suggestedid=$return['suggestedid'];
-			$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
-			$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
-			$code_buy_l=$return['code_l'];
-			$code_buy_p=$return['code_p'];
-			$code_buy_t=$return['code_t'];
+			$suggestedid = $return['suggestedid'];
+			$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
+			$suggestedaccountingaccountbydefaultfor = $return['suggestedaccountingaccountbydefaultfor'];
+			$code_buy_l = $return['code_l'];
+			$code_buy_p = $return['code_p'];
+			$code_buy_t = $return['code_t'];
 		}
 		//var_dump($return);
 
@@ -783,7 +784,7 @@ if ($result) {
 		if (!empty($toselect)) {
 			$ischecked = 0;
 			if (in_array($objp->rowid."_".$i, $toselect)) {
-				$ischecked=1;
+				$ischecked = 1;
 			}
 		}
 
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 98b92264ceb..a75d6358477 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -130,7 +130,7 @@ $linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModE
  * 	Actions
  */
 
-$parameters = array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas, 'confirm'=>$confirm);
+$parameters = array('id' => $id, 'rowid' => $id, 'objcanvas' => $objcanvas, 'confirm' => $confirm);
 $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');
@@ -1044,7 +1044,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Gender
 		print '<tr><td>'.$langs->trans("Gender").'</td>';
 		print '<td>';
-		$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+		$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 		print $form->selectarray('gender', $arraygender, GETPOST('gender', 'alphanohtml'), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
@@ -1275,7 +1275,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Gender
 		print '<tr><td>'.$langs->trans("Gender").'</td>';
 		print '<td>';
-		$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+		$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 		print $form->selectarray('gender', $arraygender, GETPOSTISSET('gender') ? GETPOST('gender', 'alphanohtml') : $object->gender, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
@@ -1480,7 +1480,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			);
 			if (isModEnabled('societe') && $object->socid > 0) {
 				$object->fetch_thirdparty();
-				$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default'=>'external', 'values' => array('external'=>$langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal'=>$langs->trans("Internal")));
+				$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default' => 'external', 'values' => array('external' => $langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal' => $langs->trans("Internal")));
 			}
 			$text = '';
 			if (isModEnabled('societe') && $object->socid <= 0) {
@@ -1563,6 +1563,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$helpcontent .= "<br>";
 			$helpcontent .= '<b>'.$langs->trans("Content").'</b>:<br>';
 			$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$label = $form->textwithpicto($tmp, $helpcontent, 1, 'help');
 
 			// Create form popup
@@ -1571,10 +1572,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (getDolGlobalString('ADHERENT_DEFAULT_SENDINFOBYMAIL') ? true : false));
 			}
 			if (isModEnabled('mailman') && getDolGlobalString('ADHERENT_USE_MAILMAN')) {
-				$formquestion[] = array('type'=>'other', 'label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"), 'value'=>'');
+				$formquestion[] = array('type' => 'other', 'label' => $langs->transnoentitiesnoconv("SynchroMailManEnabled"), 'value' => '');
 			}
 			if (isModEnabled('mailman') && getDolGlobalString('ADHERENT_USE_SPIP')) {
-				$formquestion[] = array('type'=>'other', 'label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"), 'value'=>'');
+				$formquestion[] = array('type' => 'other', 'label' => $langs->transnoentitiesnoconv("SynchroSpipEnabled"), 'value' => '');
 			}
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("ValidateMember"), $langs->trans("ConfirmValidateMember"), "confirm_valid", $formquestion, 'yes', 1, 220);
 		}
@@ -1626,6 +1627,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$helpcontent .= "<br>";
 			$helpcontent .= '<b>'.$langs->trans("Content").'</b>:<br>';
 			$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$label = $form->textwithpicto($tmp, $helpcontent, 1, 'help');
 
 			// Create an array
@@ -1686,6 +1688,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$helpcontent .= "<br>";
 			$helpcontent .= '<b>'.$langs->trans("Content").'</b>:<br>';
 			$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$label = $form->textwithpicto($tmp, $helpcontent, 1, 'help');
 
 			// Create an array
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9e193f1052c..7ce26e570c7 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -132,49 +132,49 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'd.ref'=>'Ref',
-	'd.login'=>'Login',
-	'd.lastname'=>'Lastname',
-	'd.firstname'=>'Firstname',
-	'd.societe'=>"Company",
-	'd.email'=>'EMail',
-	'd.address'=>'Address',
-	'd.zip'=>'Zip',
-	'd.town'=>'Town',
-	'd.phone'=>"Phone",
-	'd.phone_perso'=>"PhonePerso",
-	'd.phone_mobile'=>"PhoneMobile",
-	'd.note_public'=>'NotePublic',
-	'd.note_private'=>'NotePrivate',
+	'd.ref' => 'Ref',
+	'd.login' => 'Login',
+	'd.lastname' => 'Lastname',
+	'd.firstname' => 'Firstname',
+	'd.societe' => "Company",
+	'd.email' => 'EMail',
+	'd.address' => 'Address',
+	'd.zip' => 'Zip',
+	'd.town' => 'Town',
+	'd.phone' => "Phone",
+	'd.phone_perso' => "PhonePerso",
+	'd.phone_mobile' => "PhoneMobile",
+	'd.note_public' => 'NotePublic',
+	'd.note_private' => 'NotePrivate',
 );
 
 $arrayfields = array(
-	'd.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'd.civility'=>array('label'=>"Civility", 'checked'=>0),
-	'd.lastname'=>array('label'=>"Lastname", 'checked'=>1),
-	'd.firstname'=>array('label'=>"Firstname", 'checked'=>1),
-	'd.gender'=>array('label'=>"Gender", 'checked'=>0),
-	'd.company'=>array('label'=>"Company", 'checked'=>1, 'position'=>70),
-	'd.login'=>array('label'=>"Login", 'checked'=>1),
-	'd.morphy'=>array('label'=>"MemberNature", 'checked'=>1),
-	't.libelle'=>array('label'=>"Type", 'checked'=>1, 'position'=>55),
-	'd.address'=>array('label'=>"Address", 'checked'=>0),
-	'd.zip'=>array('label'=>"Zip", 'checked'=>0),
-	'd.town'=>array('label'=>"Town", 'checked'=>0),
-	'd.phone'=>array('label'=>"Phone", 'checked'=>0),
-	'd.phone_perso'=>array('label'=>"PhonePerso", 'checked'=>0),
-	'd.phone_mobile'=>array('label'=>"PhoneMobile", 'checked'=>0),
-	'd.email'=>array('label'=>"Email", 'checked'=>1),
-	'state.nom'=>array('label'=>"State", 'checked'=>0, 'position'=>90),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>95),
+	'd.ref' => array('label' => "Ref", 'checked' => 1),
+	'd.civility' => array('label' => "Civility", 'checked' => 0),
+	'd.lastname' => array('label' => "Lastname", 'checked' => 1),
+	'd.firstname' => array('label' => "Firstname", 'checked' => 1),
+	'd.gender' => array('label' => "Gender", 'checked' => 0),
+	'd.company' => array('label' => "Company", 'checked' => 1, 'position' => 70),
+	'd.login' => array('label' => "Login", 'checked' => 1),
+	'd.morphy' => array('label' => "MemberNature", 'checked' => 1),
+	't.libelle' => array('label' => "Type", 'checked' => 1, 'position' => 55),
+	'd.address' => array('label' => "Address", 'checked' => 0),
+	'd.zip' => array('label' => "Zip", 'checked' => 0),
+	'd.town' => array('label' => "Town", 'checked' => 0),
+	'd.phone' => array('label' => "Phone", 'checked' => 0),
+	'd.phone_perso' => array('label' => "PhonePerso", 'checked' => 0),
+	'd.phone_mobile' => array('label' => "PhoneMobile", 'checked' => 0),
+	'd.email' => array('label' => "Email", 'checked' => 1),
+	'state.nom' => array('label' => "State", 'checked' => 0, 'position' => 90),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0, 'position' => 95),
 	/*'d.note_public'=>array('label'=>"NotePublic", 'checked'=>0),
 	'd.note_private'=>array('label'=>"NotePrivate", 'checked'=>0),*/
-	'd.datefin'=>array('label'=>"EndSubscription"),
-	'd.datec'=>array('label'=>"DateCreation"),
-	'd.birth'=>array('label'=>"Birthday"),
-	'd.tms'=>array('label'=>"DateModificationShort"),
-	'd.statut'=>array('label'=>"Status"),
-	'd.import_key'=>array('label'=>"ImportId"),
+	'd.datefin' => array('label' => "EndSubscription"),
+	'd.datec' => array('label' => "DateCreation"),
+	'd.birth' => array('label' => "Birthday"),
+	'd.tms' => array('label' => "DateModificationShort"),
+	'd.statut' => array('label' => "Status"),
+	'd.import_key' => array('label' => "ImportId"),
 );
 
 // Extra fields
@@ -195,8 +195,8 @@ foreach ($object->fields as $key => $val) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields[$tableprefix.'.'.$key] = array(
 			'label' => $val['label'],
-			'checked' =>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
@@ -221,7 +221,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>isset($socid) ? $socid : null);
+$parameters = array('socid' => isset($socid) ? $socid : null);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -762,8 +762,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 if ($user->hasRight('adherent', 'creer')) {
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
@@ -893,7 +893,7 @@ if (!empty($arrayfields['d.lastname']['checked'])) {
 // Gender
 if (!empty($arrayfields['d.gender']['checked'])) {
 	print '<td class="liste_titre">';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+	$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
@@ -913,7 +913,7 @@ if (!empty($arrayfields['d.login']['checked'])) {
 // Nature
 if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre center">';
-	$arraymorphy = array('mor'=>$langs->trans("Moral"), 'phy'=>$langs->trans("Physical"));
+	$arraymorphy = array('mor' => $langs->trans("Moral"), 'phy' => $langs->trans("Physical"));
 	print $form->selectarray('search_morphy', $arraymorphy, $search_morphy, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	print '</td>';
 }
@@ -925,6 +925,7 @@ if (!empty($arrayfields['t.libelle']['checked'])) {
 if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	$listetype = $membertypestatic->liste_array();
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray("search_type", $listetype, $search_type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
@@ -989,7 +990,7 @@ if (!empty($arrayfields['d.email']['checked'])) {
 if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre center">';
 	//$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
-	$selectarray = array('-1'=>'', 'waitingsubscription'=>$langs->trans("WaitingSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
+	$selectarray = array('-1' => '', 'waitingsubscription' => $langs->trans("WaitingSubscription"), 'uptodate' => $langs->trans("UpToDate"), 'outofdate' => $langs->trans("OutOfDate"));
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
 }
@@ -998,7 +999,7 @@ if (!empty($arrayfields['d.datefin']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -1046,8 +1047,9 @@ if (!empty($arrayfields['d.statut']['checked'])) {
 		Adherent::STATUS_DRAFT => $langs->trans("Draft"),
 		Adherent::STATUS_VALIDATED => $langs->trans("Validated"),
 		Adherent::STATUS_RESILIATED => $langs->trans("MemberStatusResiliatedShort"),
-		Adherent::STATUS_EXCLUDED =>$langs->trans("MemberStatusExcludedShort")
+		Adherent::STATUS_EXCLUDED => $langs->trans("MemberStatusExcludedShort")
 	);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
@@ -1156,7 +1158,7 @@ if (!empty($arrayfields['d.datefin']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'totalarray'=>&$totalarray, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'totalarray' => &$totalarray, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -1465,7 +1467,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -1551,7 +1553,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql' => $sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 9da83c5faf3..512189bef85 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -1097,7 +1097,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 				if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') != 'defaultforfoundationcountry') {
 					print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 				}
-				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product')|| isModEnabled('service'))) {
+				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product') || isModEnabled('service'))) {
 					$prodtmp = new Product($db);
 					$result = $prodtmp->fetch(getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS'));
 					if ($result < 0) {
@@ -1201,6 +1201,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 			$langs->load("errors");
 			$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
 		}
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index af09ef6d283..830a129b74a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -948,6 +948,7 @@ foreach ($fieldlist as $field => $value) {
 		print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
 	} elseif ($value == 'type_template') {
 		print '<td class="liste_titre center">';
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100 maxwidth125', 1, '', 0, 1);
 		print '</td>';
 	} elseif (!in_array($value, array('content', 'content_lines'))) {
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index b56acffee17..b1b1242ebcc 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -123,10 +123,10 @@ if ($date_end !== '') {
 // Add prefix session
 $arrayfields = array(
 	'e.prefix_session' => array(
-		'label'=>'UserAgent',
-		'checked'=>(!getDolGlobalString('AUDIT_ENABLE_PREFIX_SESSION') ? 0 : 1),
-		'enabled'=>(!getDolGlobalString('AUDIT_ENABLE_PREFIX_SESSION') ? 0 : 1),
-		'position'=>110
+		'label' => 'UserAgent',
+		'checked' => (!getDolGlobalString('AUDIT_ENABLE_PREFIX_SESSION') ? 0 : 1),
+		'enabled' => (!getDolGlobalString('AUDIT_ENABLE_PREFIX_SESSION') ? 0 : 1),
+		'position' => 110
 	)
 );
 
@@ -325,6 +325,7 @@ if ($result) {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
 
 	if ($action == 'purge') {
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d95e2c17619..efcd10ddbb9 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -409,7 +409,7 @@ if ($cats < 0) {
 
 	// Define data (format for treeview)
 	$data = array();
-	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+	$data[] = array('rowid' => 0, 'fk_menu' => -1, 'title' => "racine", 'mainmenu' => '', 'leftmenu' => '', 'fk_mainmenu' => '', 'fk_leftmenu' => '');
 	foreach ($fulltree as $key => $val) {
 		$categstatic->id = $val['id'];
 		$categstatic->ref = $val['label'];
@@ -539,6 +539,7 @@ if ($type == Categorie::TYPE_PRODUCT) {
 			$nbtotalofrecords = '';
 			$newcardbutton = dolGetButtonTitle($langs->trans("AddProduct"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&categories[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit);
 
 
@@ -626,6 +627,7 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 			$nbtotalofrecords = '';
 			$newcardbutton = dolGetButtonTitle($langs->trans("AddThirdParty"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/societe/card.php?action=create&client=3&custcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
 
 			print '<table class="noborder centpercent">'."\n";
@@ -690,7 +692,7 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 				print '<table class="noborder centpercent">';
 				print '<tr class="liste_titre"><td>';
 				print $langs->trans("AddSupplierIntoCategory").' &nbsp;';
-				$filter ='(s.fournisseur:=:1)';
+				$filter = '(s.fournisseur:=:1)';
 				print $form->select_company('', 'elemid', $filter);
 				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
 				print '</tr>';
@@ -711,6 +713,7 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 			$nbtotalofrecords = '';
 			$newcardbutton = dolGetButtonTitle($langs->trans("AddSupplier"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/societe/card.php?action=create&fournisseur=1&suppcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
 
 			print '<table class="noborder centpercent">'."\n";
@@ -798,6 +801,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 			$nbtotalofrecords = '';
 			$newcardbutton = dolGetButtonTitle($langs->trans("AddMember"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create&memcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->hasRight('adherent', 'creer'));
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
 
 			print '<table class="noborder centpecent">'."\n";
@@ -884,6 +888,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 			$nbtotalofrecords = '';
 			$newcardbutton = dolGetButtonTitle($langs->trans("AddContact"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create&contcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contact', 0, $newcardbutton, '', $limit);
 
 			$objsoc = new Societe($db);
@@ -977,6 +982,7 @@ if ($type == Categorie::TYPE_ACCOUNT) {
 			$nbtotalofrecords = '';
 			$newcardbutton = '';
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
 			print '<table class="noborder centpecent">'."\n";
@@ -1065,6 +1071,7 @@ if ($type == Categorie::TYPE_PROJECT) {
 			$nbtotalofrecords = '';
 			$newcardbutton = '';
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit);
 
 			print '<table class="noborder centpecent">'."\n";
@@ -1152,6 +1159,7 @@ if ($type == Categorie::TYPE_USER) {
 			$nbtotalofrecords = '';
 			$newcardbutton = '';
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Users"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, '', '', $limit);
 
 			print '<table class="noborder centpecent">'."\n";
@@ -1216,6 +1224,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 			$nbtotalofrecords = '';
 			$newcardbutton = '';
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Warehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, $newcardbutton, '', $limit);
 
 			print '<table class="noborder centpecent">'."\n";
@@ -1302,6 +1311,7 @@ if ($type == Categorie::TYPE_TICKET) {
 			$nbtotalofrecords = '';
 			$newcardbutton = '';
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Ticket"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'ticket', 0, $newcardbutton, '', $limit);
 
 
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 08a7c49a443..05229a9ab58 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -629,6 +629,7 @@ if (empty($reshook) && $action == 'add') {
 			$repeateventlimitdate = dol_mktime(23, 59, 59, GETPOSTISSET("limitmonth") ? GETPOSTINT("limitmonth") : 1, GETPOSTISSET("limitday") ? GETPOSTINT("limitday") : 1, GETPOSTISSET("limityear") && GETPOSTINT("limityear") < 2100 ? GETPOSTINT("limityear") : 2100, $tzforfullday ? $tzforfullday : 'tzuserrel');
 			// Set date of end of event
 			$deltatime = num_between_day($object->datep, $datep);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$datef = dol_time_plus_duree($datef, $deltatime, 'd');
 
 			while ($datep <= $repeateventlimitdate && !$error) {
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 88e030f7431..5bf0b91974b 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -130,6 +130,7 @@ if ($resql) {
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("EventReports"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_agenda', 0, '', '', $limit, 0, 0, 1);
 
 	$moreforfilter = '';
@@ -177,7 +178,7 @@ if ($resql) {
 				print '<td class="tdoverflowmax300">';
 				//print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
 
-				$filearray = array('name'=>basename($file), 'fullname'=>$file, 'type'=>'file');
+				$filearray = array('name' => basename($file), 'fullname' => $file, 'type' => 'file');
 				$out = '';
 
 				// Show file name with link to download
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d1bde067b1e..4096d3ae161 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -677,6 +677,7 @@ if ($object->fetch($id) >= 0) {
 
 		$massactionbutton = '';
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $morehtmlcenter, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 		print '</form>';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 742222ee4e6..ea017fbef3b 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -154,14 +154,14 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'c.ref'=>'Ref',
-	'c.ref_client'=>'RefCustomerOrder',
-	'pd.description'=>'Description',
-	's.nom'=>"ThirdParty",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	'c.note_public'=>'NotePublic',
+	'c.ref' => 'Ref',
+	'c.ref_client' => 'RefCustomerOrder',
+	'pd.description' => 'Description',
+	's.nom' => "ThirdParty",
+	's.name_alias' => "AliasNameShort",
+	's.zip' => "Zip",
+	's.town' => "Town",
+	'c.note_public' => 'NotePublic',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["c.note_private"] = "NotePrivate";
@@ -169,50 +169,50 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5, 'searchall'=>1),
-	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10, 'searchall'=>1),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>20),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>25),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30, 'searchall'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31, 'searchall'=>1),
-	's2.nom'=>array('label'=>'ParentCompany', 'position'=>32, 'checked'=>0),
-	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35, 'searchall'=>1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>-1, 'position'=>40, 'searchall'=>1),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
-	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60, 'csslist'=>'nowraponall'),
-	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65, 'csslist'=>'nowraponall'),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("delivery_note")),
-	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
-	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
-	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
-	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
-	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
-	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
-	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1), 'position'=>90),
-	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1), 'position'=>95),
-	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1), 'position'=>100),
-	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1), 'position'=>105),
-	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1), 'position'=>110),
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>115),
-	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>116),
+	'c.ref' => array('label' => "Ref", 'checked' => 1, 'position' => 5, 'searchall' => 1),
+	'c.ref_client' => array('label' => "RefCustomerOrder", 'checked' => -1, 'position' => 10, 'searchall' => 1),
+	'p.ref' => array('label' => "ProjectRef", 'checked' => -1, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 20),
+	'p.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 25),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 30, 'searchall' => 1),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => -1, 'position' => 31, 'searchall' => 1),
+	's2.nom' => array('label' => 'ParentCompany', 'position' => 32, 'checked' => 0),
+	's.town' => array('label' => "Town", 'checked' => -1, 'position' => 35, 'searchall' => 1),
+	's.zip' => array('label' => "Zip", 'checked' => -1, 'position' => 40, 'searchall' => 1),
+	'state.nom' => array('label' => "StateShort", 'checked' => 0, 'position' => 45),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0, 'position' => 50),
+	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55),
+	'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60, 'csslist' => 'nowraponall'),
+	'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65, 'csslist' => 'nowraponall'),
+	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("delivery_note")),
+	'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67),
+	'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68),
+	'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69),
+	'c.total_ht' => array('label' => "AmountHT", 'checked' => 1, 'position' => 75),
+	'c.total_vat' => array('label' => "AmountVAT", 'checked' => 0, 'position' => 80),
+	'c.total_ttc' => array('label' => "AmountTTC", 'checked' => 0, 'position' => 85),
+	'c.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1), 'position' => 90),
+	'c.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1), 'position' => 95),
+	'c.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1), 'position' => 100),
+	'c.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1), 'position' => 105),
+	'c.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1), 'position' => 110),
+	'u.login' => array('label' => "Author", 'checked' => 1, 'position' => 115),
+	'sale_representative' => array('label' => "SaleRepresentativesOfThirdParty", 'checked' => 0, 'position' => 116),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
-	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
-	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
-	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135, 'searchall'=>1),
-	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>140),
-	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("delivery_note")), 'position'=>990),
-	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
-	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
-	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
+	'c.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 120),
+	'c.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 125),
+	'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130),
+	'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 135, 'searchall' => 1),
+	'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 140),
+	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("delivery_note")), 'position' => 990),
+	'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995),
+	'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999),
+	'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
 );
 
-$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$parameters = array('fieldstosearchall' => $fieldstosearchall);
 $reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook > 0) {
 	$fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall'];
@@ -254,7 +254,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
+$parameters = array('socid' => $socid, 'arrayfields' => &$arrayfields);
 $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');
@@ -332,8 +332,8 @@ if (empty($reshook)) {
 	}
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$triggersendname = 'ORDER_SENTBYMAIL';
-	$year="";
-	$month="";
+	$year = "";
+	$month = "";
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
@@ -348,7 +348,7 @@ if (empty($reshook)) {
 		$TFactThirdNbLines = array();
 
 		$nb_bills_created = 0;
-		$lastid= 0;
+		$lastid = 0;
 		$lastref = '';
 
 		$db->begin();
@@ -1333,8 +1333,8 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-	'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	'generate_doc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'builddoc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 if ($permissiontovalidate) {
 	$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
@@ -1367,8 +1367,8 @@ if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', ($contextpage == 'orderlist' || $contextpage == 'billableorders') && $permissiontoadd);
 
@@ -1739,7 +1739,7 @@ if (!empty($arrayfields['total_mark_rate']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -1809,6 +1809,7 @@ if (!empty($arrayfields['c.fk_statut']['checked'])) {
 		Commande::STATUS_CLOSED => $langs->trans("StatusOrderDelivered"),
 		Commande::STATUS_CANCELED => $langs->trans("StatusOrderCanceledShort")
 	);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
@@ -1974,7 +1975,7 @@ if (!empty($arrayfields['total_mark_rate']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['c.datec']['checked'])) {
@@ -2037,20 +2038,20 @@ if (isModEnabled('margin') && (
 	|| !empty($arrayfields['total_margin_rate']['checked'])
 	|| !empty($arrayfields['total_mark_rate']['checked'])
 )
-	) {
+) {
 	$with_margin_info = true;
 }
 
-	$total_ht = 0;
-	$total_margin = 0;
+$total_ht = 0;
+$total_margin = 0;
 
-	// Loop on record
-	// --------------------------------------------------------------------
-	$i = 0;
-	$savnbfield = $totalarray['nbfield'];
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$imaxinloop = ($limit ? min($num, $limit) : $num);
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -2580,7 +2581,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -2804,7 +2805,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 75237945ea4..3c0f25f74ac 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -162,14 +162,14 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'c.ref'=>'Ref',
-	'c.ref_client'=>'RefCustomerOrder',
-	'cdet.description'=>'Description',
-	's.nom'=>"ThirdParty",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	'c.note_public'=>'NotePublic',
+	'c.ref' => 'Ref',
+	'c.ref_client' => 'RefCustomerOrder',
+	'cdet.description' => 'Description',
+	's.nom' => "ThirdParty",
+	's.name_alias' => "AliasNameShort",
+	's.zip' => "Zip",
+	's.town' => "Town",
+	'c.note_public' => 'NotePublic',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["c.note_private"] = "NotePrivate";
@@ -178,51 +178,51 @@ if (empty($user->socid)) {
 $checkedtypetiers = 0;
 $arrayfields = array(
 	// Détail commande
-	'rowid'=> array('label'=>'TechnicalID', 'checked'=>1, 'position'=>1, 'enabled'=>(getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0)),
-	'pr.ref'=> array('label'=>'ProductRef', 'checked'=>1, 'position'=>1),
-	'pr.desc'=> array('label'=>'ProductDescription', 'checked'=>-1, 'position'=>1),
-	'cdet.qty'=> array('label'=>'QtyOrdered', 'checked'=>1, 'position'=>1),
-	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
-	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>20),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>25),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31),
-	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35),
-	's.zip'=>array('label'=>"Zip", 'checked'=>-1, 'position'=>40),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
-	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
-	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled('delivery_note')),
-	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
-	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
-	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
-	'cdet.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
-	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
-	'cdet.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
-	'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>90),
-	'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>95),
-	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),
-	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),
-	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),
-	'c.fk_warehouse'=>array('label'=>'Warehouse', 'checked'=>0, 'enabled'=>(!isModEnabled('stock') && !getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER') ? 0 : 1), 'position'=>110),
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>115),
-	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>116),
+	'rowid' => array('label' => 'TechnicalID', 'checked' => 1, 'position' => 1, 'enabled' => (getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0)),
+	'pr.ref' => array('label' => 'ProductRef', 'checked' => 1, 'position' => 1),
+	'pr.desc' => array('label' => 'ProductDescription', 'checked' => -1, 'position' => 1),
+	'cdet.qty' => array('label' => 'QtyOrdered', 'checked' => 1, 'position' => 1),
+	'c.ref' => array('label' => "Ref", 'checked' => 1, 'position' => 5),
+	'c.ref_client' => array('label' => "RefCustomerOrder", 'checked' => -1, 'position' => 10),
+	'p.ref' => array('label' => "ProjectRef", 'checked' => -1, 'enabled' => (empty($conf->project->enabled) ? 0 : 1), 'position' => 20),
+	'p.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (empty($conf->project->enabled) ? 0 : 1), 'position' => 25),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 30),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => -1, 'position' => 31),
+	's.town' => array('label' => "Town", 'checked' => -1, 'position' => 35),
+	's.zip' => array('label' => "Zip", 'checked' => -1, 'position' => 40),
+	'state.nom' => array('label' => "StateShort", 'checked' => 0, 'position' => 45),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0, 'position' => 50),
+	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55),
+	'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60),
+	'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65),
+	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled('delivery_note')),
+	'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67),
+	'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68),
+	'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69),
+	'cdet.total_ht' => array('label' => "AmountHT", 'checked' => 1, 'position' => 75),
+	'c.total_vat' => array('label' => "AmountVAT", 'checked' => 0, 'position' => 80),
+	'cdet.total_ttc' => array('label' => "AmountTTC", 'checked' => 0, 'position' => 85),
+	'c.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'enabled' => (empty($conf->multicurrency->enabled) ? 0 : 1), 'position' => 90),
+	'c.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'enabled' => (empty($conf->multicurrency->enabled) ? 0 : 1), 'position' => 95),
+	'c.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'checked' => 0, 'enabled' => (empty($conf->multicurrency->enabled) ? 0 : 1), 'position' => 100),
+	'c.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'checked' => 0, 'enabled' => (empty($conf->multicurrency->enabled) ? 0 : 1), 'position' => 105),
+	'c.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'checked' => 0, 'enabled' => (empty($conf->multicurrency->enabled) ? 0 : 1), 'position' => 110),
+	'c.fk_warehouse' => array('label' => 'Warehouse', 'checked' => 0, 'enabled' => (!isModEnabled('stock') && !getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER') ? 0 : 1), 'position' => 110),
+	'u.login' => array('label' => "Author", 'checked' => 1, 'position' => 115),
+	'sale_representative' => array('label' => "SaleRepresentativesOfThirdParty", 'checked' => 0, 'position' => 116),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
-	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
-	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
-	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position'=>135),
-	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position'=>140),
-	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled('delivery_note')), 'position'=>990),
-	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
-	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
-	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
+	'c.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 120),
+	'c.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 125),
+	'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130),
+	'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position' => 135),
+	'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position' => 140),
+	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled('delivery_note')), 'position' => 990),
+	'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995),
+	'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999),
+	'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
 );
 
 // Extra fields
@@ -255,7 +255,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -1202,7 +1202,7 @@ if ($resql) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
@@ -1271,6 +1271,7 @@ if ($resql) {
 			Commande::STATUS_CLOSED => $langs->trans("StatusOrderDelivered"),
 			Commande::STATUS_CANCELED => $langs->trans("StatusOrderCanceledShort")
 		);
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'maxwidth125', 1);
 		print '</td>';
 	}
@@ -2025,7 +2026,7 @@ if ($resql) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -2244,7 +2245,7 @@ if ($resql) {
 
 	$db->free($resql);
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 8a3c2c1c13e..2a3672b0cd9 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -150,21 +150,21 @@ $extrafields->fetch_name_optionals_label('banktransaction');
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1,'position'=>10),
-	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1,'position'=>20),
-	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1,'position'=>30),
-	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1,'position'=>40),
-	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1,'position'=>50),
-	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1,'position'=>60),
-	'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>70),
-	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>80),
-	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>90),
-	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>100),
-	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>110),
-	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>120),
-	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>130),
-	'b.conciliated'=>array('label'=>$langs->trans("BankLineReconciled"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>140),
-	'b.fk_bordereau'=>array('label'=>$langs->trans("ChequeNumber"), 'checked'=>0, 'position'=>150),
+	'b.rowid' => array('label' => $langs->trans("Ref"), 'checked' => 1,'position' => 10),
+	'b.label' => array('label' => $langs->trans("Description"), 'checked' => 1,'position' => 20),
+	'b.dateo' => array('label' => $langs->trans("DateOperationShort"), 'checked' => 1,'position' => 30),
+	'b.datev' => array('label' => $langs->trans("DateValueShort"), 'checked' => 1,'position' => 40),
+	'type' => array('label' => $langs->trans("Type"), 'checked' => 1,'position' => 50),
+	'b.num_chq' => array('label' => $langs->trans("Numero"), 'checked' => 1,'position' => 60),
+	'bu.label' => array('label' => $langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked' => 1, 'position' => 70),
+	'ba.ref' => array('label' => $langs->trans("BankAccount"), 'checked' => (($id > 0 || !empty($ref)) ? 0 : 1), 'position' => 80),
+	'b.debit' => array('label' => $langs->trans("Debit"), 'checked' => 1, 'position' => 90),
+	'b.credit' => array('label' => $langs->trans("Credit"), 'checked' => 1, 'position' => 100),
+	'balancebefore' => array('label' => $langs->trans("BalanceBefore"), 'checked' => 0, 'position' => 110),
+	'balance' => array('label' => $langs->trans("Balance"), 'checked' => 1, 'position' => 120),
+	'b.num_releve' => array('label' => $langs->trans("AccountStatement"), 'checked' => 1, 'position' => 130),
+	'b.conciliated' => array('label' => $langs->trans("BankLineReconciled"), 'enabled' => $object->rappro, 'checked' => ($action == 'reconcile' ? 1 : 0), 'position' => 140),
+	'b.fk_bordereau' => array('label' => $langs->trans("ChequeNumber"), 'checked' => 0, 'position' => 150),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -417,7 +417,7 @@ $formaccounting = new FormAccounting($db);
 
 $companystatic = new Societe($db);
 $bankaccountstatic = new Account($db);
-$userstatic= new User($db);
+$userstatic = new User($db);
 
 $banktransferstatic = new BonPrelevement($db);
 $societestatic = new Societe($db);
@@ -655,18 +655,18 @@ if ($search_fk_bordereau > 0) {
 	$sql .= " AND b.fk_bordereau = " . ((int) $search_fk_bordereau);
 }
 if ($search_thirdparty_user) {
-	$sql.= " AND (b.rowid IN ";
-	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
-	$sql.= "	  WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
+	$sql .= " AND (b.rowid IN ";
+	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."user AS subUser ON (bu.type = 'user' AND bu.url_id = subUser.rowid)";
+	$sql .= "	  WHERE ". natural_search(array("subUser.firstname", "subUser.lastname"), $search_thirdparty_user, '', 1).")";
 
-	$sql.= " OR b.rowid IN ";
-	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
-	$sql.= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
-	$sql.= "	  WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
-	$sql.= "))";
+	$sql .= " OR b.rowid IN ";
+	$sql .= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."bank AS b2 ON b2.rowid = bu.fk_bank";
+	$sql .= "	 JOIN ".MAIN_DB_PREFIX."societe AS subSoc ON (bu.type = 'company' AND bu.url_id = subSoc.rowid)";
+	$sql .= "	  WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
+	$sql .= "))";
 }
 if ($search_description) {
 	$search_description_to_use = $search_description;
@@ -1017,6 +1017,7 @@ if ($resql) {
 		$picto = '';
 	}
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
 
 	// We can add page now to param
@@ -1263,7 +1264,7 @@ if ($resql) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action edit/delete and select
@@ -1827,8 +1828,8 @@ if ($resql) {
 		}
 
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp);    // Note that $action and $objecttmpect may have been modified by hook
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $objp, 'i' => $i, 'totalarray' => &$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp);    // Note that $action and $objecttmpect may have been modified by hook
 		print $hookmanager->resPrint;
 
 		// Action edit/delete and select
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 10b20b58b85..7127c824434 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3477,6 +3477,7 @@ if ($action == 'create') {
 		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOSTINT('type') ? '' : ' checked').'> ';
 		$tmp  = $tmp.'<label for="radio_standard" >'.$langs->trans("InvoiceStandardAsk").'</label>';
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3, 'standardonsmartphone');
 		print '<table class="nobordernopadding"><tr>';
 		print '<td>';
@@ -3535,6 +3536,7 @@ if ($action == 'create') {
 				print '<table class="nobordernopadding"><tr>';
 				print '<td>';
 				$tmp  = $tmp.'<label for="radio_deposit">'.$langs->trans("InvoiceDeposit").'</label>';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3, 'depositonsmartphone');
 				print $desc;
 				print '</td>';
@@ -3574,6 +3576,7 @@ if ($action == 'create') {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp = '<input id="radio_situation" type="radio" name="type" value="5"'.(GETPOST('type') == 5 ? ' checked' : '').'> ';
 				$tmp  = $tmp.'<label for="radio_situation" >'.$langs->trans("InvoiceFirstSituationAsk").'</label>';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3, 'firstsituationonsmartphone');
 				print $desc;
 				print '</div></div>';
@@ -3937,13 +3940,13 @@ if ($action == 'create') {
 			print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), !empty($objectsrc->label_incoterms) ? $objectsrc->label_incoterms : '', 1).'</label></td>';
 			print '<td colspan="2" class="maxwidthonsmartphone">';
 			$incoterm_id = GETPOST('incoterm_id');
-			$incoterm_location = GETPOST('location_incoterms');
+			$location_incoterms = GETPOST('location_incoterms');
 			if (empty($incoterm_id)) {
 				$incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
-				$incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
+				$location_incoterms = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
 			}
 			print img_picto('', 'incoterm', 'class="pictofixedwidth"');
-			print $form->select_incoterms($incoterm_id, $incoterm_location);
+			print $form->select_incoterms($incoterm_id, $location_incoterms);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index d7191fa1590..4bbea222033 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -137,24 +137,24 @@ if (!$sortfield) {
 }
 
 $arrayfields = array(
-	'f.titre'=>array('label'=>"Ref", 'checked'=>1),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	'f.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
-	'f.total_tva'=>array('label'=>"AmountVAT", 'checked'=>-1),
-	'f.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>1),
-	'f.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
-	'f.fk_cond_reglement'=>array('label'=>"PaymentTerm", 'checked'=>0),
-	'recurring'=>array('label'=>"RecurringInvoice", 'checked'=>1),
-	'f.frequency'=>array('label'=>"Frequency", 'checked'=>1),
-	'f.unit_frequency'=>array('label'=>"FrequencyUnit", 'checked'=>1),
-	'f.nb_gen_done'=>array('label'=>"NbOfGenerationDoneShort", 'checked'=>1),
-	'f.date_last_gen'=>array('label'=>"DateLastGenerationShort", 'checked'=>1),
-	'f.date_when'=>array('label'=>"NextDateToExecutionShort", 'checked'=>1),
-	'f.fk_user_author'=>array('label'=>"UserCreation", 'checked'=>0, 'position'=>500),
-	'f.fk_user_modif'=>array('label'=>"UserModification", 'checked'=>0, 'position'=>505),
-	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>520),
-	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>525),
-	'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+	'f.titre' => array('label' => "Ref", 'checked' => 1),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1),
+	'f.total_ht' => array('label' => "AmountHT", 'checked' => 1),
+	'f.total_tva' => array('label' => "AmountVAT", 'checked' => -1),
+	'f.total_ttc' => array('label' => "AmountTTC", 'checked' => 1),
+	'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 0),
+	'f.fk_cond_reglement' => array('label' => "PaymentTerm", 'checked' => 0),
+	'recurring' => array('label' => "RecurringInvoice", 'checked' => 1),
+	'f.frequency' => array('label' => "Frequency", 'checked' => 1),
+	'f.unit_frequency' => array('label' => "FrequencyUnit", 'checked' => 1),
+	'f.nb_gen_done' => array('label' => "NbOfGenerationDoneShort", 'checked' => 1),
+	'f.date_last_gen' => array('label' => "DateLastGenerationShort", 'checked' => 1),
+	'f.date_when' => array('label' => "NextDateToExecutionShort", 'checked' => 1),
+	'f.fk_user_author' => array('label' => "UserCreation", 'checked' => 0, 'position' => 500),
+	'f.fk_user_modif' => array('label' => "UserModification", 'checked' => 0, 'position' => 505),
+	'f.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 520),
+	'f.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 525),
+	'status' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -530,7 +530,7 @@ $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 
-$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend' => $langs->trans("SendByMail"), 'builddoc' => $langs->trans("PDFMerge")));
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
@@ -681,7 +681,7 @@ if (!empty($arrayfields['f.date_when']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // User creation
@@ -708,10 +708,11 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 if (!empty($arrayfields['status']['checked'])) {
 	print '<td class="liste_titre center minwidth75imp parentonrightofpage">';
 	$liststatus = array(
-		0=>$langs->trans("Draft"),
-		1=>$langs->trans("Active"),
-		-1=>$langs->trans("Disabled"),
+		0 => $langs->trans("Draft"),
+		1 => $langs->trans("Active"),
+		-1 => $langs->trans("Disabled"),
 	);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, -2, 0, 0, '', 0, 0, 0, '', 'width100 onrightofpage');
 	print '</td>';
 }
@@ -946,9 +947,9 @@ while ($i < $imaxinloop) {
 	if (!empty($arrayfields['f.unit_frequency']['checked'])) {
 		print '<td class="center">';
 		if ($objp->frequency > 1) {
-			$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+			$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 		} else {
-			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+			$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 		}
 		print($objp->frequency > 0 ? $dur[$objp->unit_frequency] : '');
 		print '</td>';
@@ -1034,7 +1035,7 @@ while ($i < $imaxinloop) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Status
@@ -1088,7 +1089,7 @@ if ($num == 0) {
 $db->free($resql);
 
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7c2f594906a..6155dfd9c8a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -188,15 +188,15 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'f.ref'=>'Ref',
-	'f.ref_client'=>'RefCustomer',
-	'f.note_public'=>'NotePublic',
-	's.nom'=>"ThirdParty",
-	's.code_client'=>"CustomerCodeShort",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	'pd.description'=>'Description',
+	'f.ref' => 'Ref',
+	'f.ref_client' => 'RefCustomer',
+	'f.note_public' => 'NotePublic',
+	's.nom' => "ThirdParty",
+	's.code_client' => "CustomerCodeShort",
+	's.name_alias' => "AliasNameShort",
+	's.zip' => "Zip",
+	's.town' => "Town",
+	'pd.description' => 'Description',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["f.note_private"] = "NotePrivate";
@@ -204,63 +204,63 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'f.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
-	'f.ref_client'=>array('label'=>"RefCustomer", 'checked'=>-1, 'position'=>10),
-	'f.type'=>array('label'=>"Type", 'checked'=>0, 'position'=>15),
-	'f.datef'=>array('label'=>"DateInvoice", 'checked'=>1, 'position'=>20),
-	'f.date_valid'=>array('label'=>"DateValidation", 'checked'=>0, 'position'=>22),
-	'f.subtype'=>array('label'=>"InvoiceSubtype", 'checked'=>0, 'position'=>17),
-	'f.date_lim_reglement'=>array('label'=>"DateDue", 'checked'=>1, 'position'=>25),
-	'f.date_closing'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>30),
-	'p.ref'=>array('label'=>"ProjectRef", 'langs'=>'projects', 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>40),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>41),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>50),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1, 'position'=>51),
-	's.code_client'=>array('label'=>"CustomerCodeShort", 'checked'=>-1, 'position'=>52),
-	's2.nom'=>array('label'=>'ParentCompany', 'position'=>32, 'checked'=>0),
-	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>55),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>60),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>65),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>70),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>75),
-	'f.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>80),
-	'f.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>1, 'position'=>85),
-	'f.module_source'=>array('label'=>"POSModule", 'langs'=>'cashdesk', 'checked'=>($contextpage == 'poslist' ? 1 : 0), 'enabled'=>"(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'position'=>90),
-	'f.pos_source'=>array('label'=>"POSTerminal", 'langs'=>'cashdesk', 'checked'=>($contextpage == 'poslist' ? 1 : 0), 'enabled'=>"(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'position'=>91),
-	'f.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>95),
-	'f.total_tva'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>100),
-	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>($mysoc->localtax1_assuj == "1"), 'position'=>110),
-	'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>($mysoc->localtax2_assuj == "1"), 'position'=>120),
-	'f.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>130),
-	'dynamount_payed'=>array('label'=>"Received", 'checked'=>0, 'position'=>140),
-	'rtp'=>array('label'=>"Rest", 'checked'=>0, 'position'=>150), // Not enabled by default because slow
-	'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>280),
-	'f.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>285),
-	'f.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>290),
-	'f.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>291),
-	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>292),
-	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>295),
-	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>296), // Not enabled by default because slow
+	'f.ref' => array('label' => "Ref", 'checked' => 1, 'position' => 5),
+	'f.ref_client' => array('label' => "RefCustomer", 'checked' => -1, 'position' => 10),
+	'f.type' => array('label' => "Type", 'checked' => 0, 'position' => 15),
+	'f.datef' => array('label' => "DateInvoice", 'checked' => 1, 'position' => 20),
+	'f.date_valid' => array('label' => "DateValidation", 'checked' => 0, 'position' => 22),
+	'f.subtype' => array('label' => "InvoiceSubtype", 'checked' => 0, 'position' => 17),
+	'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => 1, 'position' => 25),
+	'f.date_closing' => array('label' => "DateClosing", 'checked' => 0, 'position' => 30),
+	'p.ref' => array('label' => "ProjectRef", 'langs' => 'projects', 'checked' => 1, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 40),
+	'p.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 41),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 50),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => 1, 'position' => 51),
+	's.code_client' => array('label' => "CustomerCodeShort", 'checked' => -1, 'position' => 52),
+	's2.nom' => array('label' => 'ParentCompany', 'position' => 32, 'checked' => 0),
+	's.town' => array('label' => "Town", 'checked' => -1, 'position' => 55),
+	's.zip' => array('label' => "Zip", 'checked' => 1, 'position' => 60),
+	'state.nom' => array('label' => "StateShort", 'checked' => 0, 'position' => 65),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0, 'position' => 70),
+	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 75),
+	'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 1, 'position' => 80),
+	'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 1, 'position' => 85),
+	'f.module_source' => array('label' => "POSModule", 'langs' => 'cashdesk', 'checked' => ($contextpage == 'poslist' ? 1 : 0), 'enabled' => "(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'position' => 90),
+	'f.pos_source' => array('label' => "POSTerminal", 'langs' => 'cashdesk', 'checked' => ($contextpage == 'poslist' ? 1 : 0), 'enabled' => "(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'position' => 91),
+	'f.total_ht' => array('label' => "AmountHT", 'checked' => 1, 'position' => 95),
+	'f.total_tva' => array('label' => "AmountVAT", 'checked' => 0, 'position' => 100),
+	'f.total_localtax1' => array('label' => $langs->transcountry("AmountLT1", $mysoc->country_code), 'checked' => 0, 'enabled' => ($mysoc->localtax1_assuj == "1"), 'position' => 110),
+	'f.total_localtax2' => array('label' => $langs->transcountry("AmountLT2", $mysoc->country_code), 'checked' => 0, 'enabled' => ($mysoc->localtax2_assuj == "1"), 'position' => 120),
+	'f.total_ttc' => array('label' => "AmountTTC", 'checked' => 0, 'position' => 130),
+	'dynamount_payed' => array('label' => "Received", 'checked' => 0, 'position' => 140),
+	'rtp' => array('label' => "Rest", 'checked' => 0, 'position' => 150), // Not enabled by default because slow
+	'f.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 280),
+	'f.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 285),
+	'f.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 290),
+	'f.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 291),
+	'f.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 292),
+	'multicurrency_dynamount_payed' => array('label' => 'MulticurrencyAlreadyPaid', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 295),
+	'multicurrency_rtp' => array('label' => 'MulticurrencyRemainderToPay', 'checked' => 0, 'enabled' => (!isModEnabled('multicurrency') ? 0 : 1), 'position' => 296), // Not enabled by default because slow
 	'total_pa' => array('label' => ((getDolGlobalString('MARGIN_TYPE') == '1') ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
-	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'f.tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
-	'u.login'=>array('label'=>"UserAuthor", 'checked'=>1, 'position'=>504),
-	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>506),
+	'f.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'f.tms' => array('type' => 'timestamp', 'label' => 'DateModificationShort', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 502),
+	'u.login' => array('label' => "UserAuthor", 'checked' => 1, 'position' => 504),
+	'sale_representative' => array('label' => "SaleRepresentativesOfThirdParty", 'checked' => 0, 'position' => 506),
 	//'f.fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>506),
 	//'f.fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'notnull'=>-1, 'position'=>508),
 	//'f.fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>510),
 	//'f.fk_user_closing' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
-	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>520, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
-	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>521, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
-	'f.fk_fac_rec_source'=>array('label'=>'GeneratedFromTemplate', 'checked'=>0, 'position'=>530, 'enabled'=>'1'),
-	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+	'f.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 520, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
+	'f.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 521, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
+	'f.fk_fac_rec_source' => array('label' => 'GeneratedFromTemplate', 'checked' => 0, 'position' => 530, 'enabled' => '1'),
+	'f.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
 );
 
 if (getDolGlobalString("INVOICE_USE_SITUATION") && getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
-	$arrayfields['f.retained_warranty'] = array('label'=>$langs->trans("RetainedWarranty"), 'checked'=>0, 'position'=>86);
+	$arrayfields['f.retained_warranty'] = array('label' => $langs->trans("RetainedWarranty"), 'checked' => 0, 'position' => 86);
 }
 // Overwrite $arrayfields from columns into ->fields (transition before removal of $arrayoffields)
 foreach ($object->fields as $key => $val) {
@@ -280,10 +280,10 @@ foreach ($object->fields as $key => $val) {
 		}
 		if ($newkey) {
 			$arrayfields[$newkey] = array(
-				'label'=>$val['label'],
-				'checked'=>(($visible < 0) ? 0 : 1),
-				'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
-				'position'=>$val['position'],
+				'label' => $val['label'],
+				'checked' => (($visible < 0) ? 0 : 1),
+				'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
+				'position' => $val['position'],
 				'help' => empty($val['help']) ? '' : $val['help'],
 			);
 		}
@@ -319,7 +319,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
+$parameters = array('socid' => $socid, 'arrayfields' => &$arrayfields);
 $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');
@@ -438,7 +438,7 @@ if ($action == 'makepayment_confirm' && $user->hasRight('facture', 'paiement'))
 						$remaintopay = price2num($facture->total_ttc - $totalpay);
 
 						// hook to finalize the remaining amount, considering e.g. cash discount agreements
-						$parameters = array('remaintopay'=>$remaintopay);
+						$parameters = array('remaintopay' => $remaintopay);
 						$reshook = $hookmanager->executeHooks('finalizeAmountOfInvoice', $parameters, $facture, $action); // Note that $action and $object may have been modified by some hooks
 						if ($reshook > 0) {
 							if (!empty($remain = $hookmanager->resArray['remaintopay'])) {
@@ -515,7 +515,7 @@ if ($action == 'makepayment_confirm' && $user->hasRight('facture', 'paiement'))
 				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 				// hook to finalize the remaining amount, considering e.g. cash discount agreements
-				$parameters = array('remaintopay'=>$objecttmp->resteapayer);
+				$parameters = array('remaintopay' => $objecttmp->resteapayer);
 				$reshook = $hookmanager->executeHooks('finalizeAmountOfInvoice', $parameters, $objecttmp, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook > 0) {
 					if (!empty($remaintopay = $hookmanager->resArray['remaintopay'])) {
@@ -1194,10 +1194,10 @@ $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters,
 $param .= $hookmanager->resPrint;
 
 $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"),
+	'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"),
 );
 
 if ($user->hasRight('facture', 'paiement')) {
@@ -1227,8 +1227,8 @@ if ($contextpage != 'poslist') {
 		$url .= '&socid='.$socid;
 	}
 	$newcardbutton  = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', $user->hasRight("facture", "creer"));
 }
@@ -1266,7 +1266,7 @@ if ($massaction == 'makepayment') {
 		// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 		array('type' => 'date', 'name' => 'datepaiment', 'label' => $langs->trans("Date"), 'datenow' => 1),
 		array('type' => 'other', 'name' => 'paiementid', 'label' => $langs->trans("PaymentMode"), 'value' => $form->select_types_paiements(GETPOST('search_paymentmode'), 'paiementid', '', 0, 0, 1, 0, 1, '', 1)),
-		array('type' => 'other', 'name' => 'bankid', 'label' => $langs->trans("BankAccount"), 'value'=>$form->select_comptes('', 'bankid', 0, '', 0, '', 0, '', 1)),
+		array('type' => 'other', 'name' => 'bankid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes('', 'bankid', 0, '', 0, '', 0, '', 1)),
 		//array('type' => 'other', 'name' => 'invoicesid', 'label' => '', 'value'=>'<input type="hidden" id="invoicesid" name="invoicesid" value="'.implode('#',GETPOST('toselect','array')).'">'),
 	);
 	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('MakePaymentAndClassifyPayed'), $langs->trans('EnterPaymentReceivedFromCustomer'), 'makepayment_confirm', $formquestion, 1, 0, 200, 500, 1);
@@ -1374,15 +1374,16 @@ if (!empty($arrayfields['f.ref_client']['checked'])) {
 if (!empty($arrayfields['f.type']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone">';
 	$listtype = array(
-		Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
-		Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
-		Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
-		Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
+		Facture::TYPE_STANDARD => $langs->trans("InvoiceStandard"),
+		Facture::TYPE_DEPOSIT => $langs->trans("InvoiceDeposit"),
+		Facture::TYPE_CREDIT_NOTE => $langs->trans("InvoiceAvoir"),
+		Facture::TYPE_REPLACEMENT => $langs->trans("InvoiceReplacement"),
 	);
 	if (getDolGlobalString('INVOICE_USE_SITUATION')) {
 		$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
 	}
 	//$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma");     // A proformat invoice is not an invoice but must be an order.
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	print '</td>';
 }
@@ -1611,7 +1612,7 @@ if (!empty($arrayfields['total_mark_rate']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -1648,7 +1649,8 @@ if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
 // Status
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
-	$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '0,1'=>$langs->trans("BillShortStatusDraft").'+'.$langs->trans("BillShortStatusNotPaid"), '1'=>$langs->trans("BillShortStatusNotPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
+	$liststatus = array('0' => $langs->trans("BillShortStatusDraft"), '0,1' => $langs->trans("BillShortStatusDraft").'+'.$langs->trans("BillShortStatusNotPaid"), '1' => $langs->trans("BillShortStatusNotPaid"), '1,2' => $langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '2' => $langs->trans("BillShortStatusPaid"), '3' => $langs->trans("BillShortStatusCanceled"));
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
@@ -1850,7 +1852,7 @@ if (!empty($arrayfields['total_mark_rate']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => $totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['f.datec']['checked'])) {
@@ -1902,8 +1904,8 @@ if ($num > 0) {
 	$totalarray['val'] = array();
 	$totalarray['val']['f.total_ht'] = 0;
 	$totalarray['val']['f.total_tva'] = 0;
-	$totalarray['val']['f.total_localtax1']=0;
-	$totalarray['val']['f.total_localtax1']=0;
+	$totalarray['val']['f.total_localtax1'] = 0;
+	$totalarray['val']['f.total_localtax1'] = 0;
 	$totalarray['val']['f.total_ttc'] = 0;
 	$totalarray['val']['totalam'] = 0;
 	$totalarray['val']['rtp'] = 0;
@@ -2041,7 +2043,7 @@ if ($num > 0) {
 				}
 			}
 
-			$arraydata = array('alreadypaid' => $paiement, 'thirdparty' => $companystatic->getNomUrl(1, '', 12), 'userauthor'=>$userstatic->getNomUrl(1), 'selected' => in_array($object->id, $arrayofselected));
+			$arraydata = array('alreadypaid' => $paiement, 'thirdparty' => $companystatic->getNomUrl(1, '', 12), 'userauthor' => $userstatic->getNomUrl(1), 'selected' => in_array($object->id, $arrayofselected));
 			print $facturestatic->getKanbanView('', $arraydata);
 			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
@@ -2636,7 +2638,7 @@ if ($num > 0) {
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
@@ -2755,7 +2757,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index c7150a80504..284dbefcc54 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -90,13 +90,13 @@ foreach ($arrayofpaymentmodetomanage as $key => $val) {
 }
 
 $arrayfields = array(
-	'bc.ref'            => array('label'=>"Ref", 'checked'=>1, 'position'=>10),
-	'bc.type'			=> array('label'=>"Type", 'checked'=>1, 'position'=>20),
-	'bc.date_bordereau' => array('label'=>"DateCreation", 'checked'=>1, 'position'=>30),
-	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>40),
-	'bc.nbcheque'		=> array('label'=>"NbOfCheques", 'checked'=>1, 'position'=>50),
-	'bc.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>60),
-	'bc.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>70)
+	'bc.ref'            => array('label' => "Ref", 'checked' => 1, 'position' => 10),
+	'bc.type'			=> array('label' => "Type", 'checked' => 1, 'position' => 20),
+	'bc.date_bordereau' => array('label' => "DateCreation", 'checked' => 1, 'position' => 30),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 40),
+	'bc.nbcheque'		=> array('label' => "NbOfCheques", 'checked' => 1, 'position' => 50),
+	'bc.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 60),
+	'bc.statut'			=> array('label' => "Status", 'checked' => 1, 'position' => 70)
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -108,7 +108,7 @@ $object = new RemiseCheque($db);
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -253,8 +253,8 @@ if ($resql) {
 		$url .= '&socid='.$socid;
 	}
 	$newcardbutton  = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('banque', 'cheque'));
 
@@ -271,6 +271,7 @@ if ($resql) {
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
@@ -346,7 +347,7 @@ if ($resql) {
 	}
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -400,7 +401,7 @@ if ($resql) {
 	}
 
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$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
 	print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index c5c478e4672..b59aff4bfc9 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -92,22 +92,22 @@ $search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') :
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'p.ref'=>"RefPayment",
-	's.nom'=>"ThirdParty",
-	'p.num_paiement'=>"Numero",
-	'p.amount'=>"Amount",
+	'p.ref' => "RefPayment",
+	's.nom' => "ThirdParty",
+	'p.num_paiement' => "Numero",
+	'p.amount' => "Amount",
 );
 
 $arrayfields = array(
-	'p.ref'				=> array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
-	'p.datep'			=> array('label'=>"Date", 'checked'=>1, 'position'=>20),
-	's.nom'				=> array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
-	'c.libelle'			=> array('label'=>"Type", 'checked'=>1, 'position'=>40),
-	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled("bank"))),
-	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("bank"))),
-	'p.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
-	'p.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
-	'p.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>90, 'enabled'=>(getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION'))),
+	'p.ref'				=> array('label' => "RefPayment", 'checked' => 1, 'position' => 10),
+	'p.datep'			=> array('label' => "Date", 'checked' => 1, 'position' => 20),
+	's.nom'				=> array('label' => "ThirdParty", 'checked' => 1, 'position' => 30),
+	'c.libelle'			=> array('label' => "Type", 'checked' => 1, 'position' => 40),
+	'transaction'		=> array('label' => "BankTransactionLine", 'checked' => 1, 'position' => 50, 'enabled' => (isModEnabled("bank"))),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 60, 'enabled' => (isModEnabled("bank"))),
+	'p.num_paiement'	=> array('label' => "Numero", 'checked' => 1, 'position' => 70, 'tooltip' => "ChequeOrTransferNumber"),
+	'p.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 80),
+	'p.statut'			=> array('label' => "Status", 'checked' => 1, 'position' => 90, 'enabled' => (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION'))),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -130,7 +130,7 @@ $result = restrictedArea($user, 'facture', $facid, '');
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -386,6 +386,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
 
 if ($search_all) {
@@ -491,7 +492,7 @@ if (!empty($arrayfields['p.statut']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -559,7 +560,7 @@ if (!empty($arrayfields['p.statut']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index a63f457062f..24e37a37904 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -460,7 +460,7 @@ if ($id > 0 || $ref) {
 	if ($salaryBonPl) {
 		$sql = "SELECT pl.rowid, pl.statut, pl.amount, pl.fk_user,";
 		$sql .= " u.rowid as socid, u.login as name";
-		$sql .=" FROM llx_prelevement_lignes as pl";
+		$sql .= " FROM llx_prelevement_lignes as pl";
 		$sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
 		$sql .= ", ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id);
@@ -527,6 +527,7 @@ if ($id > 0 || $ref) {
 		if (!empty($sortorder)) {
 			print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 		}
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans("Lines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index aafc6f17833..febb51cdc1d 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -240,6 +240,7 @@ $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("Rejects"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
 	print"\n<!-- debut table -->\n";
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 10cc824c9cd..ea5fe2d3ca9 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -97,20 +97,20 @@ if (!$sortorder) {
 $filtre = GETPOSTINT("filtre");
 
 $arrayfields = array(
-	'cs.rowid'		=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
-	'cs.libelle'	=>array('label'=>"Label", 'checked'=>1, 'position'=>20),
-	'cs.fk_type'	=>array('label'=>"Type", 'checked'=>1, 'position'=>30),
-	'cs.date_ech'	=>array('label'=>"Date", 'checked'=>1, 'position'=>40),
-	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>50),
-	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled('project'))),
-	'cs.fk_user'	=>array('label'=>"Employee", 'checked'=>1, 'position'=>70),
-	'cs.fk_mode_reglement'	=>array('checked'=>-1, 'position'=>80, 'label'=>"DefaultPaymentMode"),
-	'cs.amount'		=>array('label'=>"Amount", 'checked'=>1, 'position'=>100),
-	'cs.paye'		=>array('label'=>"Status", 'checked'=>1, 'position'=>110),
+	'cs.rowid'		=> array('label' => "Ref", 'checked' => 1, 'position' => 10),
+	'cs.libelle'	=> array('label' => "Label", 'checked' => 1, 'position' => 20),
+	'cs.fk_type'	=> array('label' => "Type", 'checked' => 1, 'position' => 30),
+	'cs.date_ech'	=> array('label' => "Date", 'checked' => 1, 'position' => 40),
+	'cs.periode'	=> array('label' => "PeriodEndDate", 'checked' => 1, 'position' => 50),
+	'p.ref'			=> array('label' => "ProjectRef", 'checked' => 1, 'position' => 60, 'enabled' => (isModEnabled('project'))),
+	'cs.fk_user'	=> array('label' => "Employee", 'checked' => 1, 'position' => 70),
+	'cs.fk_mode_reglement'	=> array('checked' => -1, 'position' => 80, 'label' => "DefaultPaymentMode"),
+	'cs.amount'		=> array('label' => "Amount", 'checked' => 1, 'position' => 100),
+	'cs.paye'		=> array('label' => "Status", 'checked' => 1, 'position' => 110),
 );
 
 if (isModEnabled("bank")) {
-	$arrayfields['cs.fk_account'] = array('checked'=>-1, 'position'=>90, 'label'=>"DefaultBankAccount");
+	$arrayfields['cs.fk_account'] = array('checked' => -1, 'position' => 90, 'label' => "DefaultBankAccount");
 }
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -134,7 +134,7 @@ $result = restrictedArea($user, 'tax', '', 'chargesociales', 'charges');
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -384,8 +384,8 @@ if ($search_date_limit_endyear) {
 $url = DOL_URL_ROOT.'/compta/sociales/card.php?action=create';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
@@ -411,6 +411,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
@@ -537,13 +538,14 @@ if (!empty($arrayfields['cs.amount']['checked'])) {
 // Filter: Status
 if (!empty($arrayfields['cs.paye']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
-	$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
+	$liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -618,7 +620,7 @@ if (!empty($arrayfields['cs.paye']['checked'])) {
 }
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -634,7 +636,7 @@ $i = 0;
 $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-$totalarray['val'] = array('totalttcfield'=>0);
+$totalarray['val'] = array('totalttcfield' => 0);
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
@@ -659,7 +661,7 @@ while ($i < $imaxinloop) {
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
-		print $chargesociale_static->getKanbanView('', array('project'=> $projectstatic, 'selected' => in_array($chargesociale_static->id, $arrayofselected)));
+		print $chargesociale_static->getKanbanView('', array('project' => $projectstatic, 'selected' => in_array($chargesociale_static->id, $arrayofselected)));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -860,7 +862,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index d67ac1d12f3..573c3d50289 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -82,16 +82,16 @@ if (!$sortorder) {
 }
 
 $arrayfields = array(
-	't.rowid'			=>array('checked'=>1, 'position'=>10, 'label'=>"Ref",),
-	't.label'			=>array('checked'=>1, 'position'=>20, 'label'=>"Label"),
-	't.datev'			=>array('checked'=>1, 'position'=>30, 'label'=>"PeriodEndDate"),
-	't.fk_typepayment'	=>array('checked'=>1, 'position'=>50, 'label'=>"DefaultPaymentMode"),
-	't.amount'			=>array('checked'=>1, 'position'=>90, 'label'=>"Amount"),
-	't.status'			=>array('checked'=>1, 'position'=>90, 'label'=>"Status"),
+	't.rowid'			=> array('checked' => 1, 'position' => 10, 'label' => "Ref",),
+	't.label'			=> array('checked' => 1, 'position' => 20, 'label' => "Label"),
+	't.datev'			=> array('checked' => 1, 'position' => 30, 'label' => "PeriodEndDate"),
+	't.fk_typepayment'	=> array('checked' => 1, 'position' => 50, 'label' => "DefaultPaymentMode"),
+	't.amount'			=> array('checked' => 1, 'position' => 90, 'label' => "Amount"),
+	't.status'			=> array('checked' => 1, 'position' => 90, 'label' => "Status"),
 );
 
 if (isModEnabled("bank")) {
-	$arrayfields['t.fk_account'] = array('checked'=>1, 'position'=>60, 'label'=>"DefaultBankAccount");
+	$arrayfields['t.fk_account'] = array('checked' => 1, 'position' => 60, 'label' => "DefaultBankAccount");
 }
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -115,7 +115,7 @@ $result = restrictedArea($user, 'tax', '', 'tva', 'charges');
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -171,8 +171,8 @@ $help_url = '';
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.paye as status, t.fk_typepayment as type, t.fk_account,';
-$sql.= ' ba.label as blabel, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,';
-$sql.= ' t.num_payment, pst.code as payment_code,';
+$sql .= ' ba.label as blabel, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,';
+$sql .= ' t.num_payment, pst.code as payment_code,';
 $sql .= ' SUM(ptva.amount) as alreadypayed';
 
 $sqlfields = $sql; // $sql fields to remove for count total
@@ -360,8 +360,8 @@ if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewVATPayment'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
@@ -486,6 +486,7 @@ if (!empty($arrayfields['t.amount']['checked'])) {
 if (!empty($arrayfields['t.status']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
@@ -494,7 +495,7 @@ if (!empty($arrayfields['t.status']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -552,7 +553,7 @@ if (!empty($arrayfields['t.status']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -770,7 +771,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 83f044af16f..fbcb057a859 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -146,7 +146,7 @@ if ($resql) {
 	setEventMessages($db->lasterror, null, 'errors');
 }
 
-// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $num, 'title_accountancy', 0, '', '', $limit);
 
 if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index c2d8db146f6..593f050d4c7 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -106,6 +106,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		if (empty($dolibarr_main_auth_ldap_filter)) {
 			$userSearchFilter = "(".$ldapuserattr."=".$usertotest.")";
 		} else {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
 		}
 
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 067e4801d24..7f8ae3c09b5 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -180,6 +180,7 @@ class pdf_ban extends ModeleBankAccountDoc
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 08feae6096d..5cc2c4602db 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -100,11 +100,11 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		// Define column position
 		$this->posxref = $this->marge_gauche;
 
-		$this->update_main_doc_field=1;
+		$this->update_main_doc_field = 1;
 
-		$this->heightforinfotot=50;
+		$this->heightforinfotot = 50;
 
-		$this->xPosSignArea=120;
+		$this->xPosSignArea = 120;
 
 		$this->heightforfreetext = (getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT') > 0 ? getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT') : 5);
 
@@ -175,7 +175,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -206,6 +206,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -443,7 +444,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -453,7 +454,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index 7268933be1b..037eb35b5b7 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -157,7 +157,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters = array('file'=>$file, 'outputlangs'=>$outputlangs);
+		$parameters = array('file' => $file, 'outputlangs' => $outputlangs);
 		global $action;
 		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -190,6 +190,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$pdf->SetCompression(false);
 		}
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 		$nboflines = count($this->lines);
@@ -226,7 +227,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+		$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 		global $action;
 		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) {
@@ -236,7 +237,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		dolChmod($file);
 
-		$this->result = array('fullpath'=>$file);
+		$this->result = array('fullpath' => $file);
 
 		$outputlangs->charset_output = $sav_charset_output;
 		return 1; // No error
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index a810b92a8d3..547b3c07d57 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -240,7 +240,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -552,15 +552,15 @@ class pdf_einstein extends ModelePDFCommandes
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -637,7 +637,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -647,7 +647,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1483,6 +1483,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 82cc9b1a16a..911c2854206 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -280,7 +280,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -699,9 +699,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -761,15 +761,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					// Add line
 					if (getDolGlobalInt('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 
@@ -845,7 +845,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -855,7 +855,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1672,6 +1672,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
@@ -1898,6 +1899,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 885b61da806..95c106013cf 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -1383,7 +1383,7 @@ class pdf_espadon extends ModelePdfExpedition
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
-			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index e2437957220..52878e4de21 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -183,7 +183,7 @@ class pdf_merou extends ModelePdfExpedition
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -227,6 +227,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -315,10 +316,10 @@ class pdf_merou extends ModelePdfExpedition
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -374,7 +375,7 @@ class pdf_merou extends ModelePdfExpedition
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -384,7 +385,7 @@ class pdf_merou extends ModelePdfExpedition
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1;
 			} else {
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 7f1cd448e2e..7e1675e40c9 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -253,7 +253,7 @@ class pdf_rouget extends ModelePdfExpedition
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -298,6 +298,7 @@ class pdf_rouget extends ModelePdfExpedition
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -549,10 +550,10 @@ class pdf_rouget extends ModelePdfExpedition
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY - 1, $this->page_largeur - $this->marge_droite, $nexY - 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -617,7 +618,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -627,7 +628,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index afdc64bf80c..692a1c24301 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -227,7 +227,7 @@ class pdf_standard extends ModeleExpenseReport
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -267,6 +267,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -522,7 +523,7 @@ class pdf_standard extends ModeleExpenseReport
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -532,7 +533,7 @@ class pdf_standard extends ModeleExpenseReport
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index f1e0d0c26ad..f2f05ed7f84 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -367,6 +367,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->setSignature($cert, $certprivate, $this->emetteur->name, '', 2, $info);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -2123,6 +2124,7 @@ class pdf_crabe extends ModelePDFFactures
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox - 2, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -2130,6 +2132,7 @@ class pdf_crabe extends ModelePDFFactures
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, $ltrdirection);
 
 			// Show shipping address
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 438123738d4..59266ff83a3 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -392,6 +392,7 @@ class pdf_sponge extends ModelePDFFactures
 					$pdf->setSignature($cert, $certprivate, $this->emetteur->name, '', 2, $info);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -2374,6 +2375,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox - 2, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -2381,6 +2383,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, $ltrdirection);
 
 			// Show shipping address
@@ -2660,6 +2663,7 @@ class pdf_sponge extends ModelePDFFactures
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 8aa4fb74b4c..8c2b45055fc 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -175,7 +175,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				}
 
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -216,6 +216,7 @@ class pdf_soleil extends ModelePDFFicheinter
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -414,7 +415,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -424,7 +425,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1;
 			} else {
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
index bc1d33b87cc..b2bc3a79b7a 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
@@ -185,7 +185,7 @@ class pdf_standard extends ModelePDFEvaluation
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				// Set nblines with the new command lines content after hook
@@ -227,6 +227,7 @@ class pdf_standard extends ModelePDFEvaluation
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -251,7 +252,7 @@ class pdf_standard extends ModelePDFEvaluation
 
 					$pdf->SetFont('', 'B', $default_font_size);
 					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, '', 12, $tab_top);
-					$tab_top +=4;
+					$tab_top += 4;
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->posxnotes + 1, $tab_top + 1, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
@@ -425,7 +426,7 @@ class pdf_standard extends ModelePDFEvaluation
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -435,7 +436,7 @@ class pdf_standard extends ModelePDFEvaluation
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index cfaffb265a2..8b5fd2e39bd 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -374,7 +374,7 @@ class pdf_standard extends ModelePDFMovement
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -411,6 +411,7 @@ class pdf_standard extends ModelePDFMovement
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
@@ -611,10 +612,10 @@ class pdf_standard extends ModelePDFMovement
 						// Add line
 						if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 							$pdf->setPage($pageposafter);
-							$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+							$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 							//$pdf->SetDrawColor(190,190,200);
 							$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-							$pdf->SetLineStyle(array('dash'=>0));
+							$pdf->SetLineStyle(array('dash' => 0));
 						}
 
 						$nexY += 2; // Add space between lines
@@ -666,9 +667,9 @@ class pdf_standard extends ModelePDFMovement
 					$nexY += 5;
 					$curY = $nexY;
 
-					$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
+					$pdf->SetLineStyle(array('dash' => '0', 'color' => array(220, 26, 26)));
 					$pdf->line($this->marge_gauche, $curY - 1, $this->page_largeur - $this->marge_droite, $curY - 1);
-					$pdf->SetLineStyle(array('dash'=>0));
+					$pdf->SetLineStyle(array('dash' => 0));
 
 					$pdf->SetFont('', 'B', $default_font_size - 1);
 					$pdf->SetTextColor(0, 0, 120);
@@ -750,7 +751,7 @@ class pdf_standard extends ModelePDFMovement
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -760,7 +761,7 @@ class pdf_standard extends ModelePDFMovement
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -821,10 +822,10 @@ class pdf_standard extends ModelePDFMovement
 		// Output Rect
 		//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
 
-		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
+		$pdf->SetLineStyle(array('dash' => '0', 'color' => array(220, 26, 26)));
 		$pdf->SetDrawColor(220, 26, 26);
 		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite, $tab_top);
-		$pdf->SetLineStyle(array('dash'=>0));
+		$pdf->SetLineStyle(array('dash' => 0));
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetTextColor(0, 0, 120);
 
@@ -892,9 +893,9 @@ class pdf_standard extends ModelePDFMovement
 		}
 
 		$pdf->SetDrawColor(220, 26, 26);
-		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
+		$pdf->SetLineStyle(array('dash' => '0', 'color' => array(220, 26, 26)));
 		$pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11);
-		$pdf->SetLineStyle(array('dash'=>0));
+		$pdf->SetLineStyle(array('dash' => 0));
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index c718af28473..cc5bc784df0 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -203,7 +203,7 @@ class pdf_vinci extends ModelePDFMo
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -243,6 +243,7 @@ class pdf_vinci extends ModelePDFMo
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Does we have at least one line with discount $this->atleastonediscount
@@ -627,7 +628,7 @@ class pdf_vinci extends ModelePDFMo
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -637,7 +638,7 @@ class pdf_vinci extends ModelePDFMo
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1466,6 +1467,7 @@ class pdf_vinci extends ModelePDFMo
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index eba1ee529e0..acd48af037d 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -166,7 +166,7 @@ class pdf_standard extends ModelePDFProduct
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -206,6 +206,7 @@ class pdf_standard extends ModelePDFProduct
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
@@ -571,7 +572,7 @@ class pdf_standard extends ModelePDFProduct
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -581,7 +582,7 @@ class pdf_standard extends ModelePDFProduct
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 639252bd960..498143880a3 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -183,7 +183,7 @@ class pdf_baleine extends ModelePDFProjects
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -234,6 +234,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -410,10 +411,10 @@ class pdf_baleine extends ModelePDFProjects
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -476,7 +477,7 @@ class pdf_baleine extends ModelePDFProjects
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -486,7 +487,7 @@ class pdf_baleine extends ModelePDFProjects
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 021e855e417..6102bbaf379 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -214,7 +214,7 @@ class pdf_beluga extends ModelePDFProjects
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -267,6 +267,7 @@ class pdf_beluga extends ModelePDFProjects
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -316,106 +317,106 @@ class pdf_beluga extends ModelePDFProjects
 				$nexY = $tab_top + $heightoftitleline + 1;
 
 				$listofreferent = array(
-					'propal'=>array(
-						'name'=>"Proposals",
-						'title'=>"ListProposalsAssociatedProject",
-						'class'=>'Propal',
-						'table'=>'propal',
-						'datefieldname'=>'datep',
-						'test'=> isModEnabled('propal') && $user->hasRight('propal', 'lire'),
-						'lang'=>'propal'),
-					'order'=>array(
-						'name'=>"CustomersOrders",
-						'title'=>"ListOrdersAssociatedProject",
-						'class'=>'Commande',
-						'table'=>'commande',
-						'datefieldname'=>'date_commande',
-						'test'=> isModEnabled('order') && $user->hasRight('commande', 'lire'),
-						'lang'=>'orders'),
-					'invoice'=>array(
-						'name'=>"CustomersInvoices",
-						'title'=>"ListInvoicesAssociatedProject",
-						'class'=>'Facture',
-						'margin'=>'add',
-						'table'=>'facture',
-						'datefieldname'=>'datef',
-						'test'=> isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
-						'lang'=>'bills'),
-					'invoice_predefined'=>array(
-						'name'=>"PredefinedInvoices",
-						'title'=>"ListPredefinedInvoicesAssociatedProject",
-						'class'=>'FactureRec',
-						'table'=>'facture_rec',
-						'datefieldname'=>'datec',
-						'test'=> isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
-						'lang'=>'bills'),
-					'order_supplier'=>array(
-						'name'=>"SuppliersOrders",
-						'title'=>"ListSupplierOrdersAssociatedProject",
-						'class'=>'CommandeFournisseur',
-						'table'=>'commande_fournisseur',
-						'datefieldname'=>'date_commande',
-						'test'=>(isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')),
-						'lang'=>'orders'),
-					'invoice_supplier'=>array(
-						'name'=>"BillsSuppliers",
-						'title'=>"ListSupplierInvoicesAssociatedProject",
-						'class'=>'FactureFournisseur',
-						'margin'=>'minus',
-						'table'=>'facture_fourn',
-						'datefieldname'=>'datef',
-						'test'=>(isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire')),
-						'lang'=>'bills'),
-					'contract'=>array(
-						'name'=>"Contracts",
-						'title'=>"ListContractAssociatedProject",
-						'class'=>'Contrat',
-						'table'=>'contrat',
-						'datefieldname'=>'date_contrat',
-						'test'=> isModEnabled('contract') && $user->hasRight('contrat', 'lire'),
-						'lang'=>'contract'),
-					'intervention'=>array(
-						'name'=>"Interventions",
-						'title'=>"ListFichinterAssociatedProject",
-						'class'=>'Fichinter',
-						'table'=>'fichinter',
-						'datefieldname'=>'date_valid',
-						'disableamount'=>1,
-						'test'=>isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire'),
-						'lang'=>'interventions'),
-					'trip'=>array(
-						'name'=>"TripsAndExpenses",
-						'title'=>"ListExpenseReportsAssociatedProject",
-						'class'=>'Deplacement',
-						'table'=>'deplacement',
-						'datefieldname'=>'dated',
-						'margin'=>'minus',
-						'disableamount'=>1,
-						'test'=>isModEnabled('deplacement') && $user->hasRight('deplacement', 'lire'),
-						'lang'=>'trip'),
-					'expensereport'=>array(
-						'name'=>"ExpensesReports",
-						'title'=>"ListExpenseReportsAssociatedProject",
-						'class'=>'ExpenseReport',
-						'table'=>'expensereport',
-						'datefieldname'=>'dated',
-						'margin'=>'minus',
-						'disableamount'=>1,
-						'test'=>isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire'),
-						'lang'=>'trip'),
-					'agenda'=>array(
-						'name'=>"Agenda",
-						'title'=>"ListActionsAssociatedProject",
-						'class'=>'ActionComm',
-						'table'=>'actioncomm',
-						'datefieldname'=>'datep',
-						'disableamount'=>1,
-						'test'=> isModEnabled('agenda') && $user->hasRight('agenda', 'allactions', 'read'),
-						'lang'=>'agenda')
+					'propal' => array(
+						'name' => "Proposals",
+						'title' => "ListProposalsAssociatedProject",
+						'class' => 'Propal',
+						'table' => 'propal',
+						'datefieldname' => 'datep',
+						'test' => isModEnabled('propal') && $user->hasRight('propal', 'lire'),
+						'lang' => 'propal'),
+					'order' => array(
+						'name' => "CustomersOrders",
+						'title' => "ListOrdersAssociatedProject",
+						'class' => 'Commande',
+						'table' => 'commande',
+						'datefieldname' => 'date_commande',
+						'test' => isModEnabled('order') && $user->hasRight('commande', 'lire'),
+						'lang' => 'orders'),
+					'invoice' => array(
+						'name' => "CustomersInvoices",
+						'title' => "ListInvoicesAssociatedProject",
+						'class' => 'Facture',
+						'margin' => 'add',
+						'table' => 'facture',
+						'datefieldname' => 'datef',
+						'test' => isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
+						'lang' => 'bills'),
+					'invoice_predefined' => array(
+						'name' => "PredefinedInvoices",
+						'title' => "ListPredefinedInvoicesAssociatedProject",
+						'class' => 'FactureRec',
+						'table' => 'facture_rec',
+						'datefieldname' => 'datec',
+						'test' => isModEnabled('invoice') && $user->hasRight('facture', 'lire'),
+						'lang' => 'bills'),
+					'order_supplier' => array(
+						'name' => "SuppliersOrders",
+						'title' => "ListSupplierOrdersAssociatedProject",
+						'class' => 'CommandeFournisseur',
+						'table' => 'commande_fournisseur',
+						'datefieldname' => 'date_commande',
+						'test' => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')),
+						'lang' => 'orders'),
+					'invoice_supplier' => array(
+						'name' => "BillsSuppliers",
+						'title' => "ListSupplierInvoicesAssociatedProject",
+						'class' => 'FactureFournisseur',
+						'margin' => 'minus',
+						'table' => 'facture_fourn',
+						'datefieldname' => 'datef',
+						'test' => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire')),
+						'lang' => 'bills'),
+					'contract' => array(
+						'name' => "Contracts",
+						'title' => "ListContractAssociatedProject",
+						'class' => 'Contrat',
+						'table' => 'contrat',
+						'datefieldname' => 'date_contrat',
+						'test' => isModEnabled('contract') && $user->hasRight('contrat', 'lire'),
+						'lang' => 'contract'),
+					'intervention' => array(
+						'name' => "Interventions",
+						'title' => "ListFichinterAssociatedProject",
+						'class' => 'Fichinter',
+						'table' => 'fichinter',
+						'datefieldname' => 'date_valid',
+						'disableamount' => 1,
+						'test' => isModEnabled('intervention') && $user->hasRight('ficheinter', 'lire'),
+						'lang' => 'interventions'),
+					'trip' => array(
+						'name' => "TripsAndExpenses",
+						'title' => "ListExpenseReportsAssociatedProject",
+						'class' => 'Deplacement',
+						'table' => 'deplacement',
+						'datefieldname' => 'dated',
+						'margin' => 'minus',
+						'disableamount' => 1,
+						'test' => isModEnabled('deplacement') && $user->hasRight('deplacement', 'lire'),
+						'lang' => 'trip'),
+					'expensereport' => array(
+						'name' => "ExpensesReports",
+						'title' => "ListExpenseReportsAssociatedProject",
+						'class' => 'ExpenseReport',
+						'table' => 'expensereport',
+						'datefieldname' => 'dated',
+						'margin' => 'minus',
+						'disableamount' => 1,
+						'test' => isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire'),
+						'lang' => 'trip'),
+					'agenda' => array(
+						'name' => "Agenda",
+						'title' => "ListActionsAssociatedProject",
+						'class' => 'ActionComm',
+						'table' => 'actioncomm',
+						'datefieldname' => 'datep',
+						'disableamount' => 1,
+						'test' => isModEnabled('agenda') && $user->hasRight('agenda', 'allactions', 'read'),
+						'lang' => 'agenda')
 				);
 
 				$hookmanager->initHooks(array('completeListOfReferent'));
-				$hookmanager->executeHooks('completeListOfReferent', ['listofreferent'=>$listofreferent], $object, $action);
+				$hookmanager->executeHooks('completeListOfReferent', ['listofreferent' => $listofreferent], $object, $action);
 				if (!empty($hookmanager->resArray)) {
 					$listofreferent = array_merge($listofreferent, $hookmanager->resArray);
 				}
@@ -708,7 +709,7 @@ class pdf_beluga extends ModelePDFProjects
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -718,7 +719,7 @@ class pdf_beluga extends ModelePDFProjects
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 855579aa10f..7d3b887dfd8 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -178,7 +178,7 @@ class pdf_timespent extends ModelePDFProjects
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -229,6 +229,7 @@ class pdf_timespent extends ModelePDFProjects
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -408,10 +409,10 @@ class pdf_timespent extends ModelePDFProjects
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -474,7 +475,7 @@ class pdf_timespent extends ModelePDFProjects
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -484,7 +485,7 @@ class pdf_timespent extends ModelePDFProjects
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c061fa61c19..ec04f0001a8 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -294,7 +294,7 @@ class pdf_azur extends ModelePDFPropales
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -335,6 +335,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -664,7 +665,7 @@ class pdf_azur extends ModelePDFPropales
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -673,10 +674,10 @@ class pdf_azur extends ModelePDFPropales
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -827,7 +828,7 @@ class pdf_azur extends ModelePDFPropales
 
 				//Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -837,7 +838,7 @@ class pdf_azur extends ModelePDFPropales
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -911,7 +912,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-			$pdf->SetFont('', '', $default_font_size -$diffsizetitle);
+			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($posxval, $posy);
 			$dlp = dol_print_date($object->delivery_date, $displaydate, false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
@@ -1694,6 +1695,7 @@ class pdf_azur extends ModelePDFPropales
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -1701,6 +1703,7 @@ class pdf_azur extends ModelePDFPropales
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 7814fdebeb7..184d95c45da 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -276,7 +276,7 @@ class pdf_cyan extends ModelePDFPropales
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -317,6 +317,7 @@ class pdf_cyan extends ModelePDFPropales
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -711,9 +712,9 @@ class pdf_cyan extends ModelePDFPropales
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -784,7 +785,7 @@ class pdf_cyan extends ModelePDFPropales
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = max($nexY, $posYAfterImage);
@@ -793,10 +794,10 @@ class pdf_cyan extends ModelePDFPropales
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -940,7 +941,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				//Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -950,7 +951,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1771,6 +1772,7 @@ class pdf_cyan extends ModelePDFPropales
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -1778,6 +1780,7 @@ class pdf_cyan extends ModelePDFPropales
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
@@ -2036,6 +2039,7 @@ class pdf_cyan extends ModelePDFPropales
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 8bb3ad2444d..13dc9da2488 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -175,7 +175,7 @@ class pdf_paiement extends CommonDocGenerator
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters = array('file'=>$file, 'object'=>$this, 'outputlangs'=>$outputlangs);
+		$parameters = array('file' => $file, 'object' => $this, 'outputlangs' => $outputlangs);
 		global $action;
 		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $this, $action); // Note that $action and $this may have been modified by some hooks
 
@@ -337,6 +337,7 @@ class pdf_paiement extends CommonDocGenerator
 			$pdf->SetCompression(false);
 		}
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 		$pdf->SetAutoPageBreak(1, 0);
 
@@ -365,7 +366,7 @@ class pdf_paiement extends CommonDocGenerator
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters = array('file'=>$file, 'object'=>$this, 'outputlangs'=>$outputlangs);
+		$parameters = array('file' => $file, 'object' => $this, 'outputlangs' => $outputlangs);
 		global $action;
 		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) {
@@ -375,7 +376,7 @@ class pdf_paiement extends CommonDocGenerator
 
 		dolChmod($file);
 
-		$this->result = array('fullpath'=>$file);
+		$this->result = array('fullpath' => $file);
 
 		return 1;
 	}
@@ -495,7 +496,7 @@ class pdf_paiement extends CommonDocGenerator
 				if ($yp > $this->tab_height - 15) {
 					$pdf->SetFillColor(255, 255, 255);
 					$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-					$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+					$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash' => 1));
 					$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
 					$pdf->SetFont('', 'B', $default_font_size - 1);
 					$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
@@ -556,7 +557,7 @@ class pdf_paiement extends CommonDocGenerator
 			if ((($this->doc_type == 'client' && getDolGlobalString('PAYMENTS_REPORT_GROUP_BY_MOD')) || ($this->doc_type == 'fourn' && getDolGlobalString('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD'))) && ($mod != $lines[$j + 1][2])) {
 				$pdf->SetFillColor(245, 245, 245);
 				$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-				$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+				$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash' => 1));
 				$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
 				$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 				$pdf->SetFont('', 'I', $default_font_size - 1);
@@ -580,7 +581,7 @@ class pdf_paiement extends CommonDocGenerator
 		$total += $total_page;
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-		$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+		$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash' => 1));
 		$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
 		$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 		$pdf->SetFont('', 'B');
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index e104ceeb61c..e79a5b70d5a 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -233,7 +233,7 @@ class pdf_squille extends ModelePdfReception
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -275,6 +275,7 @@ class pdf_squille extends ModelePdfReception
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -548,10 +549,10 @@ class pdf_squille extends ModelePdfReception
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY - 1, $this->page_largeur - $this->marge_droite, $nexY - 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -610,7 +611,7 @@ class pdf_squille extends ModelePdfReception
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index bd06a5c1bd5..09247f96fd3 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -176,7 +176,7 @@ class pdf_standard extends ModelePDFStock
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -216,6 +216,7 @@ class pdf_standard extends ModelePDFStock
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
@@ -397,10 +398,10 @@ class pdf_standard extends ModelePDFStock
 						// Add line
 						if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 							$pdf->setPage($pageposafter);
-							$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+							$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 							//$pdf->SetDrawColor(190,190,200);
 							$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-							$pdf->SetLineStyle(array('dash'=>0));
+							$pdf->SetLineStyle(array('dash' => 0));
 						}
 
 						$nexY += 2; // Add space between lines
@@ -453,9 +454,9 @@ class pdf_standard extends ModelePDFStock
 					$curY = $nexY;
 
 					if ($nblines > 0) {
-						$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
+						$pdf->SetLineStyle(array('dash' => '0', 'color' => array(200, 200, 200)));
 						$pdf->line($this->marge_gauche, $curY - 1, $this->page_largeur - $this->marge_droite, $curY - 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 
 						$pdf->SetFont('', 'B', $default_font_size - 1);
 						$pdf->SetTextColor(0, 0, 0);
@@ -547,7 +548,7 @@ class pdf_standard extends ModelePDFStock
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -557,7 +558,7 @@ class pdf_standard extends ModelePDFStock
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -617,35 +618,35 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 
 		// Output Rect
-		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
 
-		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
+		$pdf->SetLineStyle(array('dash' => '0', 'color' => array(200, 200, 200)));
 		$pdf->SetDrawColor(200, 200, 200);
 		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite, $tab_top);
-		$pdf->SetLineStyle(array('dash'=>0));
+		$pdf->SetLineStyle(array('dash' => 0));
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetTextColor(0, 0, 0);
 
 
 		if (empty($hidetop)) {
-			$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);	// line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11);	// line takes a position y in 2nd parameter and 4th parameter
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
 		}
 
-		$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
+		$pdf->line($this->posxlabel - 1, $tab_top, $this->posxlabel - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'C');
 		}
 
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'C');
 		}
 
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'C');
@@ -657,7 +658,7 @@ class pdf_standard extends ModelePDFStock
 			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'C');
 		}
 
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'C');
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 725abb6a34b..8f14233e320 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -323,6 +323,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
index 1ffd3b41577..bc1442e56b4 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -255,7 +255,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -292,6 +292,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				/// Does we have at least one line with discount $this->atleastonediscount
@@ -662,9 +663,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -727,10 +728,10 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 
@@ -796,7 +797,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -806,7 +807,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1650,6 +1651,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index bbb3109d2e6..7ff56fc4a2c 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -220,7 +220,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -267,6 +267,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
@@ -503,10 +504,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -578,7 +579,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -588,7 +589,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
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 02583e9fc22..dfe2679983b 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -255,7 +255,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -295,6 +295,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Does we have at least one line with discount $this->atleastonediscount
@@ -638,9 +639,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -711,7 +712,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -720,10 +721,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -796,7 +797,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -806,7 +807,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1424,6 +1425,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -1431,6 +1433,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
@@ -1639,6 +1642,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
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 c8ff2026002..8b735fd88e3 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -266,7 +266,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -307,6 +307,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
@@ -588,7 +589,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -597,10 +598,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -675,7 +676,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -685,7 +686,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1338,6 +1339,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -1345,6 +1347,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 2fcd927b72c..b1b6e28514f 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -223,7 +223,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -263,6 +263,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
@@ -383,10 +384,10 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -456,7 +457,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -466,7 +467,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
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 be2c6e38937..c9a8dc17770 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -258,7 +258,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -297,6 +297,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
@@ -575,7 +576,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -584,10 +585,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -665,7 +666,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				//Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -675,7 +676,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index f42c862bb9e..1c77541020b 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -254,7 +254,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -294,6 +294,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					$pdf->SetCompression(false);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Does we have at least one line with discount $this->atleastonediscount
@@ -637,9 +638,9 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -710,7 +711,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
 					}
-					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -719,10 +720,10 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -795,7 +796,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -805,7 +806,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1413,6 +1414,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
@@ -1420,6 +1422,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
 
@@ -1610,6 +1613,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f2412524f12..8fb61bdb4e0 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -290,7 +290,7 @@ if ($nolinesbefore) {
 				// $senderissupplier=2 is the same as 1 but disables test on minimum qty, disable autofill qty with minimum and autofill unit price
 				if ($senderissupplier != 2) {
 					$ajaxoptions = array(
-						'update' => array('qty'=>'qty', 'remise_percent' => 'discount', 'idprod' => 'idprod'), // html id tags that will be edited with each ajax json response key
+						'update' => array('qty' => 'qty', 'remise_percent' => 'discount', 'idprod' => 'idprod'), // html id tags that will be edited with each ajax json response key
 						'option_disabled' => 'idthatdoesnotexists', // html id to disable once select is done
 						'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for example shown we select a disabled option into combo)
 					);
@@ -344,6 +344,7 @@ if ($nolinesbefore) {
 						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 							// @FIXME Not working yet
 							$tmpbacktopagejsfields = 'addproduct:id,search_id';
+							// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 							print dolButtonToOpenUrlInDialogPopup('addproduct', $langs->transnoentitiesnoconv('AddProduct'), $newbutton, $url, '', '', $tmpbacktopagejsfields);
 						} else {
 							print '<a href="'.DOL_URL_ROOT.'/product/card.php?action=create&type=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.dol_escape_htmltag($langs->trans("NewProduct")).'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
@@ -355,6 +356,7 @@ if ($nolinesbefore) {
 						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 							// @FIXME Not working yet
 							$tmpbacktopagejsfields = 'addproduct:id,search_id';
+							// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 							print dolButtonToOpenUrlInDialogPopup('addproduct', $langs->transnoentitiesnoconv('AddService'), $newbutton, $url, '', '', $tmpbacktopagejsfields);
 						} else {
 							print '<a href="'.DOL_URL_ROOT.'/product/card.php?action=create&type=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.dol_escape_htmltag($langs->trans("NewService")).'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
@@ -382,14 +384,14 @@ if ($nolinesbefore) {
 		}
 
 		if (is_object($hookmanager) && empty($senderissupplier)) {
-			$parameters = array('fk_parent_line'=>GETPOSTINT('fk_parent_line'));
+			$parameters = array('fk_parent_line' => GETPOSTINT('fk_parent_line'));
 			$reshook = $hookmanager->executeHooks('formCreateProductOptions', $parameters, $object, $action);
 			if (!empty($hookmanager->resPrint)) {
 				print $hookmanager->resPrint;
 			}
 		}
 		if (is_object($hookmanager) && !empty($senderissupplier)) {
-			$parameters = array('htmlname'=>'addproduct');
+			$parameters = array('htmlname' => 'addproduct');
 			$reshook = $hookmanager->executeHooks('formCreateProductSupplierOptions', $parameters, $object, $action);
 			if (!empty($hookmanager->resPrint)) {
 				print $hookmanager->resPrint;
@@ -441,7 +443,7 @@ if ($nolinesbefore) {
 		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {	// We must have same test in printObjectLines
 			$coldisplay++; ?>
 	<td class="nobottom linecolrefsupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth100 maxwidth125onsmartphone" value="<?php echo(GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
-			<?php
+					<?php
 		}
 		print '<td class="nobottom linecolvat right">';
 		$coldisplay++;
@@ -475,7 +477,7 @@ if ($nolinesbefore) {
 		<td class="nobottom linecoluttc right">
 			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat right" value="<?php echo(GETPOSTISSET("price_ttc") ? GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
 		</td>
-		<?php
+			<?php
 	}
 	$coldisplay++;
 	?>
@@ -510,21 +512,21 @@ if ($nolinesbefore) {
 			$coldisplay++; ?>
 			<td class="nobottom margininfos linecolmargin right">
 				<!-- For predef product -->
-				<?php if (isModEnabled("product") || isModEnabled("service")) { ?>
+					<?php if (isModEnabled("product") || isModEnabled("service")) { ?>
 					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
-				<?php } ?>
+					<?php } ?>
 				<!-- For free product -->
 				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo(GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
-			<?php
-			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-				echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate opacitymedium hideonsmartphone">%</span></td>';
-				$coldisplay++;
-			}
-			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-				echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate opacitymedium hideonsmartphone">%</span></td>';
-				$coldisplay++;
-			}
+				<?php
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
+					echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate opacitymedium hideonsmartphone">%</span></td>';
+					$coldisplay++;
+				}
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
+					echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate opacitymedium hideonsmartphone">%</span></td>';
+					$coldisplay++;
+				}
 		}
 	}
 	$coldisplay += $colspan;
@@ -536,15 +538,15 @@ if ($nolinesbefore) {
 
 <?php
 if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') {	// We show date field if required
-		print '<tr id="trlinefordates" class="oddeven">'."\n";
+	print '<tr id="trlinefordates" class="oddeven">'."\n";
 	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		print '<td></td>';
 	}
-		print '<td colspan="'.($coldisplay - (!getDolGlobalString('MAIN_VIEW_LINE_NUMBER') ? 0 : 1)).'">';
-		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-		$date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+	print '<td colspan="'.($coldisplay - (!getDolGlobalString('MAIN_VIEW_LINE_NUMBER') ? 0 : 1)).'">';
+	$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+	$date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 
-		$prefillDates = false;
+	$prefillDates = false;
 
 	if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines)) {
 		for ($i = count($object->lines) - 1; $i >= 0; $i--) {
@@ -576,7 +578,7 @@ if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelecto
 		echo ' <span class="small"><a href="#" id="prefill_service_dates">'.$langs->trans('FillWithLastServiceDates').'</a></span>';
 	}
 
-		print '<script>';
+	print '<script>';
 
 	if ($prefillDates) {
 		?>
@@ -612,9 +614,9 @@ if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelecto
 			print 'jQuery("#date_endmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
 		}
 	}
-		print '</script>';
-		print '</td>';
-		print '</tr>'."\n";
+	print '</script>';
+	print '</td>';
+	print '</tr>'."\n";
 }
 
 
@@ -778,7 +780,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			}
 		}
 	});
-		<?php
+			<?php
 	} ?>
 	/* When changing predefined product, we reload list of supplier prices required for margin combo */
 	$("#idprod, #idprodfournprice").change(function()
@@ -890,18 +892,18 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 						console.log("stringforvatrateselection="+stringforvatrateselection+" -> value of option label for this key="+$('#tva_tx option[value="'+stringforvatrateselection+'"]').val());
 						$('#tva_tx option[value="'+stringforvatrateselection+'"]').prop('selected', true);
 
-						<?php
-						if (getDolGlobalInt('PRODUIT_AUTOFILL_DESC') == 1) {
-							if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) { ?>
-						var proddesc = data.desc_trans;
-								<?php
-							} else { ?>
-						var proddesc = data.desc;
-								<?php
-							} ?>
-						console.log("objectline_create.tpl Load description into text area : "+proddesc);
 							<?php
-							if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) { ?>
+							if (getDolGlobalInt('PRODUIT_AUTOFILL_DESC') == 1) {
+								if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) { ?>
+						var proddesc = data.desc_trans;
+									<?php
+								} else { ?>
+						var proddesc = data.desc;
+									<?php
+								} ?>
+						console.log("objectline_create.tpl Load description into text area : "+proddesc);
+								<?php
+								if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) { ?>
 						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 						{
 							var editor = CKEDITOR.instances['dp_desc'];
@@ -909,25 +911,25 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 								editor.setData(proddesc);
 							}
 						}
-								<?php
-							} else { ?>
+									<?php
+								} else { ?>
 						jQuery('#dp_desc').text(proddesc);
+									<?php
+								} ?>
 								<?php
 							} ?>
 							<?php
-						} ?>
-						<?php
-						if (getDolGlobalString('PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES')) { ?>
+							if (getDolGlobalString('PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES')) { ?>
 							jQuery.each(data.array_options, function( key, value ) {
 								jQuery('div[class*="det'+key.replace('options_','_extras_')+'"] > #'+key).val(value);
 							});
-							<?php
-						} ?>
+								<?php
+							} ?>
 					},
 					'json'
 				);
 			}
-			<?php
+				<?php
 		}
 
 		if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
@@ -1036,7 +1038,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			},
 			'json');
 
-			<?php
+					<?php
 		}
 		?>
 
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 6a40d1bbe97..13ffaf15511 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -84,10 +84,10 @@ $hookmanager->initHooks(array('donationlist'));
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'd.rowid'=>'Id',
-	'd.ref'=>'Ref',
-	'd.lastname'=>'Lastname',
-	'd.firstname'=>'Firstname',
+	'd.rowid' => 'Id',
+	'd.ref' => 'Ref',
+	'd.lastname' => 'Lastname',
+	'd.firstname' => 'Firstname',
 );
 
 // Security check
@@ -288,13 +288,14 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 if ($user->hasRight('don', 'creer')) {
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
 }
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_donation', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($search_all) {
@@ -350,11 +351,12 @@ if (isModEnabled('project')) {
 print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
 print '<td class="liste_titre center parentonrightofpage">';
 $liststatus = array(
-	Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
-	Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
-	Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
-	Don::STATUS_CANCELED=>$langs->trans("Canceled")
+	Don::STATUS_DRAFT => $langs->trans("DonationStatusPromiseNotValidated"),
+	Don::STATUS_VALIDATED => $langs->trans("DonationStatusPromiseValidated"),
+	Don::STATUS_PAID => $langs->trans("DonationStatusPaid"),
+	Don::STATUS_CANCELED => $langs->trans("Canceled")
 );
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'search_status maxwidth100 onrightofpage');
 print '</td>';
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 2762f271fa2..4e25ab90823 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -81,21 +81,21 @@ $search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') :
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'pd.rowid'=>"RefPayment",
-	's.nom'=>"ThirdParty",
-	'pd.num_paiement'=>"Numero",
-	'pd.amount'=>"Amount",
+	'pd.rowid' => "RefPayment",
+	's.nom' => "ThirdParty",
+	'pd.num_paiement' => "Numero",
+	'pd.amount' => "Amount",
 );
 
 $arrayfields = array(
-	'pd.rowid'				=> array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
-	'pd.datep'			=> array('label'=>"Date", 'checked'=>1, 'position'=>20),
-	's.nom'				=> array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
-	'c.code'			=> array('label'=>"Type", 'checked'=>1, 'position'=>40),
-	'pd.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
-	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("bank"))),
-	'ba.label'			=> array('label'=>"BankAccount", 'checked'=>1, 'position'=>70, 'enabled'=>(isModEnabled("bank"))),
-	'pd.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
+	'pd.rowid'				=> array('label' => "RefPayment", 'checked' => 1, 'position' => 10),
+	'pd.datep'			=> array('label' => "Date", 'checked' => 1, 'position' => 20),
+	's.nom'				=> array('label' => "ThirdParty", 'checked' => 1, 'position' => 30),
+	'c.code'			=> array('label' => "Type", 'checked' => 1, 'position' => 40),
+	'pd.num_paiement'	=> array('label' => "Numero", 'checked' => 1, 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
+	'transaction'		=> array('label' => "BankTransactionLine", 'checked' => 1, 'position' => 60, 'enabled' => (isModEnabled("bank"))),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 70, 'enabled' => (isModEnabled("bank"))),
+	'pd.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 80),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -116,7 +116,7 @@ $permissiontodelete = $user->hasRight('don', 'delete');
  * Actions
  */
 
-$parameters = array('socid'=>$paiementid);
+$parameters = array('socid' => $paiementid);
 $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');
@@ -316,6 +316,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans("DonationPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
 
 if ($search_all) {
@@ -412,7 +413,7 @@ if (!empty($arrayfields['pd.amount']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -477,7 +478,7 @@ if (!empty($arrayfields['pd.amount']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index c68cef6ebb6..37e1c6a4e17 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -108,11 +108,11 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'e.ref'=>"Ref",
-	's.nom'=>"ThirdParty",
-	'e.note_public'=>'NotePublic',
+	'e.ref' => "Ref",
+	's.nom' => "ThirdParty",
+	'e.note_public' => 'NotePublic',
 	//'e.fk_shipping_method'=>'SendingMethod', // TODO fix this, does not work
-	'e.tracking_number'=>"TrackingNumber",
+	'e.tracking_number' => "TrackingNumber",
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["e.note_private"] = "NotePrivate";
@@ -120,24 +120,24 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>1),
-	'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1, 'position'=>2),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>3),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1, 'position'=>4),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1, 'position'=>5),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>6),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>7),
-	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers, 'position'=>8),
-	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1, 'position'=>9),
-	'e.fk_shipping_method'=>array('label'=>$langs->trans('SendingMethod'), 'checked'=>1, 'position'=>10),
-	'e.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1, 'position'=>11),
-	'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0, 'position'=>12),
-	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'position'=>1010, 'enabled'=>(getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
-	'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'position'=>1020, 'checked'=>1, 'enabled'=>(getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
-	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1100, 'enabled'=>'getDolGlobalString("WORKFLOW_BILL_ON_SHIPMENT") !== "0"')
+	'e.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1, 'position' => 1),
+	'e.ref_customer' => array('label' => $langs->trans("RefCustomer"), 'checked' => 1, 'position' => 2),
+	's.nom' => array('label' => $langs->trans("ThirdParty"), 'checked' => 1, 'position' => 3),
+	's.town' => array('label' => $langs->trans("Town"), 'checked' => 1, 'position' => 4),
+	's.zip' => array('label' => $langs->trans("Zip"), 'checked' => 1, 'position' => 5),
+	'state.nom' => array('label' => $langs->trans("StateShort"), 'checked' => 0, 'position' => 6),
+	'country.code_iso' => array('label' => $langs->trans("Country"), 'checked' => 0, 'position' => 7),
+	'typent.code' => array('label' => $langs->trans("ThirdPartyType"), 'checked' => $checkedtypetiers, 'position' => 8),
+	'e.date_delivery' => array('label' => $langs->trans("DateDeliveryPlanned"), 'checked' => 1, 'position' => 9),
+	'e.fk_shipping_method' => array('label' => $langs->trans('SendingMethod'), 'checked' => 1, 'position' => 10),
+	'e.tracking_number' => array('label' => $langs->trans("TrackingNumber"), 'checked' => 1, 'position' => 11),
+	'e.weight' => array('label' => $langs->trans("Weight"), 'checked' => 0, 'position' => 12),
+	'e.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'e.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),
+	'e.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
+	'l.ref' => array('label' => $langs->trans("DeliveryRef"), 'checked' => 1, 'position' => 1010, 'enabled' => (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
+	'l.date_delivery' => array('label' => $langs->trans("DateReceived"), 'position' => 1020, 'checked' => 1, 'enabled' => (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') ? 1 : 0)),
+	'e.billed' => array('label' => $langs->trans("Billed"), 'checked' => 1, 'position' => 1100, 'enabled' => 'getDolGlobalString("WORKFLOW_BILL_ON_SHIPMENT") !== "0"')
 );
 
 // Extra fields
@@ -168,7 +168,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -215,7 +215,7 @@ if (empty($reshook)) {
 
 	// If massaction is close
 	if ($massaction == 'classifyclose') {
-		$error=0;
+		$error = 0;
 		$selectids = GETPOST('toselect', 'array');
 		foreach ($selectids as $selectid) {
 			//	$object->fetch($selectid);
@@ -600,8 +600,8 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 // if (!empty($socid)) $url .= '&socid='.$socid;
 // $newcardbutton = dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', $url, '', $user->rights->expedition->creer);
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2', '', $user->hasRight('expedition', 'creer'));
 
@@ -617,6 +617,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dolly', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "SendShippingRef";
@@ -799,7 +800,7 @@ if (!empty($arrayfields['l.date_delivery']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -815,7 +816,7 @@ if (!empty($arrayfields['e.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['e.fk_statut']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_status', array('0' => $langs->trans('StatusSendingDraftShort'), '1' => $langs->trans('StatusSendingValidatedShort'), '2' => $langs->trans('StatusSendingProcessedShort')), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Status billed
@@ -903,7 +904,7 @@ if (!empty($arrayfields['l.date_delivery']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, '$totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, '$totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['e.datec']['checked'])) {
@@ -946,7 +947,7 @@ while ($i < $imaxinloop) {
 
 	$shipment->id = $obj->rowid;
 	$shipment->ref = $obj->ref;
-	$shipment->shipping_method_id=$obj->fk_shipping_method;
+	$shipment->shipping_method_id = $obj->fk_shipping_method;
 
 	$companystatic->id = $obj->socid;
 	$companystatic->ref = $obj->name;
@@ -1093,7 +1094,7 @@ while ($i < $imaxinloop) {
 		}
 		if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 			// Get code using getLabelFromKey
-			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+			$code = $langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
 			if ($shipment->shipping_method_id > 0) {
 				print $langs->trans("SendingMethod".strtoupper($code));
@@ -1138,7 +1139,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -1208,7 +1209,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'totalarray' => $totalarray, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'totalarray' => $totalarray, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 1dc7e453e5f..d0c10e49a56 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -95,20 +95,20 @@ $search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') :
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'pndf.rowid'=>"RefPayment",
-	'u.login'=>"User",
-	'pndf.num_payment'=>"Numero",
-	'pndf.amount'=>"Amount",
+	'pndf.rowid' => "RefPayment",
+	'u.login' => "User",
+	'pndf.num_payment' => "Numero",
+	'pndf.amount' => "Amount",
 );
 
 $arrayfields = array(
-	'pndf.rowid'				=>array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
-	'pndf.datep'			=>array('label'=>"Date", 'checked'=>1, 'position'=>20),
-	'u.login'				=>array('label'=>"User", 'checked'=>1, 'position'=>30),
-	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
-	'pndf.num_payment'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
-	'ba.label'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled("bank"))),
-	'pndf.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+	'pndf.rowid'				=> array('label' => "RefPayment", 'checked' => 1, 'position' => 10),
+	'pndf.datep'			=> array('label' => "Date", 'checked' => 1, 'position' => 20),
+	'u.login'				=> array('label' => "User", 'checked' => 1, 'position' => 30),
+	'c.libelle'			=> array('label' => "Type", 'checked' => 1, 'position' => 40),
+	'pndf.num_payment'	=> array('label' => "Numero", 'checked' => 1, 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 60, 'enable' => (isModEnabled("bank"))),
+	'pndf.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -138,7 +138,7 @@ if (!$user->hasRight('expensereport', 'lire')) {
 
 $childids = $user->getAllChildIds(1);
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -203,7 +203,7 @@ if ($search_date_start) {
 	$sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'";
 }
 if ($search_date_end) {
-	$sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
 }
 
 if ($search_user) {
@@ -324,9 +324,10 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans('ExpenseReportPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'expensereport', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($search_all) {
@@ -425,7 +426,7 @@ if (!empty($arrayfields['pndf.amount']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -481,7 +482,7 @@ if (!empty($arrayfields['pndf.amount']['checked'])) {
 }
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d554bcb4927..20ac051bb84 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -113,11 +113,11 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'f.ref'=>'Ref',
-	's.nom'=>"ThirdParty",
-	'f.description'=>'Description',
-	'f.note_public'=>'NotePublic',
-	'fd.description'=>'DescriptionOfLine',
+	'f.ref' => 'Ref',
+	's.nom' => "ThirdParty",
+	'f.description' => 'Description',
+	'f.note_public' => 'NotePublic',
+	'fd.description' => 'DescriptionOfLine',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["f.note_private"] = "NotePrivate";
@@ -128,20 +128,20 @@ if (getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 // Definition of fields for list
 $arrayfields = array(
-	'f.ref'=>array('label'=>'Ref', 'checked'=>1),
-	'f.ref_client'=>array('label'=>'RefCustomer', 'checked'=>1),
-	's.nom'=>array('label'=>'ThirdParty', 'checked'=>1),
-	'pr.ref'=>array('label'=>'Project', 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
-	'c.ref'=>array('label'=>'Contract', 'checked'=>1, 'enabled'=>(empty($conf->contrat->enabled) ? 0 : 1)),
-	'f.description'=>array('label'=>'Description', 'checked'=>1),
-	'f.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>500),
-	'f.tms'=>array('label'=>'DateModificationShort', 'checked'=>0, 'position'=>500),
-	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
-	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
-	'f.fk_statut'=>array('label'=>'Status', 'checked'=>1, 'position'=>1000),
-	'fd.description'=>array('label'=>"DescriptionOfLine", 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
-	'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
-	'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0), //type duration is here because in database, column 'duree' is double
+	'f.ref' => array('label' => 'Ref', 'checked' => 1),
+	'f.ref_client' => array('label' => 'RefCustomer', 'checked' => 1),
+	's.nom' => array('label' => 'ThirdParty', 'checked' => 1),
+	'pr.ref' => array('label' => 'Project', 'checked' => 1, 'enabled' => (!isModEnabled('project') ? 0 : 1)),
+	'c.ref' => array('label' => 'Contract', 'checked' => 1, 'enabled' => (empty($conf->contrat->enabled) ? 0 : 1)),
+	'f.description' => array('label' => 'Description', 'checked' => 1),
+	'f.datec' => array('label' => 'DateCreation', 'checked' => 0, 'position' => 500),
+	'f.tms' => array('label' => 'DateModificationShort', 'checked' => 0, 'position' => 500),
+	'f.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 510, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
+	'f.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 511, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
+	'f.fk_statut' => array('label' => 'Status', 'checked' => 1, 'position' => 1000),
+	'fd.description' => array('label' => "DescriptionOfLine", 'checked' => 1, 'enabled' => !getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
+	'fd.date' => array('label' => 'DateOfLine', 'checked' => 1, 'enabled' => !getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
+	'fd.duree' => array('label' => 'DurationOfLine', 'type' => 'duration', 'checked' => 1, 'enabled' => !getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0), //type duration is here because in database, column 'duree' is double
 );
 '@phan-var-force array{label:string,type?:string,checked:int,position?:int,enabled?:int,langfile?:string,help:string} $arrayfields';
 // Extra fields
@@ -174,7 +174,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -486,8 +486,8 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-	'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	'generate_doc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'builddoc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>$langs->trans("SendByMail"),
 );
 if (!empty($permissiontodelete)) {
@@ -519,8 +519,8 @@ if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('ficheinter', 'creer'));
 
@@ -612,7 +612,7 @@ if (!empty($arrayfields['f.description']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['f.datec']['checked'])) {
@@ -647,6 +647,7 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	if (!getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
 		unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 	}
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
@@ -714,7 +715,7 @@ if (!empty($arrayfields['f.description']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['f.datec']['checked'])) {
@@ -921,7 +922,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -1033,7 +1034,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6c097c907d8..c6b9c6457e5 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2434,6 +2434,7 @@ if ($action == 'create') {
 				</script>';
 
 				$tmp  = $tmp.'<label for="radio_deposit" >'.$langs->trans("InvoiceDeposit").'</label>';
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
 				print '<table class="nobordernopadding"><tr>';
 				print '<td>';
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 578d58a0117..00e7c8c0a67 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -135,24 +135,24 @@ if (!$sortfield) {
 	$sortfield = 'f.titre';
 }
 $arrayfields = array(
-	'f.titre'=>array('label'=>'Ref', 'checked'=>1),
-	's.nom'=>array('label'=>'ThirdParty', 'checked'=>1),
-	'f.total_ht'=>array('label'=>'AmountHT', 'checked'=>1),
-	'f.total_tva'=>array('label'=>'AmountVAT', 'checked'=>1),
-	'f.total_ttc'=>array('label'=>'AmountTTC', 'checked'=>1),
-	'f.fk_mode_reglement'=>array('label'=>'PaymentMode', 'checked'=>0),
-	'f.fk_cond_reglement'=>array('label'=>'PaymentTerm', 'checked'=>0),
-	'recurring'=>array('label'=>'RecurringInvoice', 'checked'=>1),
-	'f.frequency'=>array('label'=>'Frequency', 'checked'=>1),
-	'f.unit_frequency'=>array('label'=>'FrequencyUnit', 'checked'=>1),
-	'f.nb_gen_done'=>array('label'=>'NbOfGenerationDoneShort', 'checked'=>1),
-	'f.date_last_gen'=>array('label'=>'DateLastGenerationShort', 'checked'=>1),
-	'f.date_when'=>array('label'=>'NextDateToExecutionShort', 'checked'=>1),
-	'f.fk_user_author'=>array('label'=>'UserCreation', 'checked'=>0, 'position'=>500),
-	'f.fk_user_modif'=>array('label'=>'UserModification', 'checked'=>0, 'position'=>505),
-	'f.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>520),
-	'f.tms'=>array('label'=>'DateModificationShort', 'checked'=>0, 'position'=>525),
-	'status'=>array('label'=>'Status', 'checked'=>1, 'position'=>1000),
+	'f.titre' => array('label' => 'Ref', 'checked' => 1),
+	's.nom' => array('label' => 'ThirdParty', 'checked' => 1),
+	'f.total_ht' => array('label' => 'AmountHT', 'checked' => 1),
+	'f.total_tva' => array('label' => 'AmountVAT', 'checked' => 1),
+	'f.total_ttc' => array('label' => 'AmountTTC', 'checked' => 1),
+	'f.fk_mode_reglement' => array('label' => 'PaymentMode', 'checked' => 0),
+	'f.fk_cond_reglement' => array('label' => 'PaymentTerm', 'checked' => 0),
+	'recurring' => array('label' => 'RecurringInvoice', 'checked' => 1),
+	'f.frequency' => array('label' => 'Frequency', 'checked' => 1),
+	'f.unit_frequency' => array('label' => 'FrequencyUnit', 'checked' => 1),
+	'f.nb_gen_done' => array('label' => 'NbOfGenerationDoneShort', 'checked' => 1),
+	'f.date_last_gen' => array('label' => 'DateLastGenerationShort', 'checked' => 1),
+	'f.date_when' => array('label' => 'NextDateToExecutionShort', 'checked' => 1),
+	'f.fk_user_author' => array('label' => 'UserCreation', 'checked' => 0, 'position' => 500),
+	'f.fk_user_modif' => array('label' => 'UserModification', 'checked' => 0, 'position' => 505),
+	'f.datec' => array('label' => 'DateCreation', 'checked' => 0, 'position' => 520),
+	'f.tms' => array('label' => 'DateModificationShort', 'checked' => 0, 'position' => 525),
+	'status' => array('label' => 'Status', 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -524,7 +524,7 @@ $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 
-$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend' => $langs->trans("SendByMail"), 'builddoc' => $langs->trans("PDFMerge")));
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
@@ -675,7 +675,7 @@ if (!empty($arrayfields['f.date_when']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // User creation
@@ -702,10 +702,11 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 if (!empty($arrayfields['status']['checked'])) {
 	print '<td class="liste_titre center minwidth75imp parentonrightofpage">';
 	$liststatus = array(
-		0=>$langs->trans("Draft"),
-		1=>$langs->trans("Active"),
-		-1=>$langs->trans("Disabled"),
+		0 => $langs->trans("Draft"),
+		1 => $langs->trans("Active"),
+		-1 => $langs->trans("Disabled"),
 	);
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, -2, 0, 0, '', 0, 0, 0, '', 'width100 onrightofpage');
 	print '</td>';
 }
@@ -942,9 +943,9 @@ while ($i < $imaxinloop) {
 	if (!empty($arrayfields['f.unit_frequency']['checked'])) {
 		print '<td class="center">';
 		if ($objp->frequency > 1) {
-			$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+			$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 		} else {
-			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+			$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 		}
 		print($objp->frequency > 0 ? $dur[$objp->unit_frequency] : '');
 		print '</td>';
@@ -1030,7 +1031,7 @@ while ($i < $imaxinloop) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Status
@@ -1085,7 +1086,7 @@ if ($num == 0) {
 $db->free($resql);
 
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 3aa79940b91..901419f4013 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -156,12 +156,12 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'f.ref'=>'Ref',
-	'f.ref_supplier'=>'RefSupplier',
-	'f.note_public'=>'NotePublic',
-	's.nom'=>"ThirdParty",
-	's.code_fournisseur'=>"SupplierCodeShort",
-	'pd.description'=>'Description',
+	'f.ref' => 'Ref',
+	'f.ref_supplier' => 'RefSupplier',
+	'f.note_public' => 'NotePublic',
+	's.nom' => "ThirdParty",
+	's.code_fournisseur' => "SupplierCodeShort",
+	'pd.description' => 'Description',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["f.note_private"] = "NotePrivate";
@@ -169,42 +169,42 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'f.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'f.ref_supplier'=>array('label'=>"RefSupplier", 'checked'=>1),
-	'f.type'=>array('label'=>"Type", 'checked'=>0),
-	'f.subtype'=>array('label'=>"InvoiceSubtype", 'checked'=>0,),
-	'f.label'=>array('label'=>"Label", 'checked'=>0),
-	'f.datef'=>array('label'=>"DateInvoice", 'checked'=>1),
-	'f.date_lim_reglement'=>array('label'=>"DateDue", 'checked'=>1),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>0),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>41),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>0, 'position'=>42),
-	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>43),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>44),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>46),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>49),
-	'f.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>52),
-	'f.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>1, 'position'=>50),
-	'f.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>105),
-	'f.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>110),
-	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1", 'position'=>95),
-	'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1", 'position'=>100),
-	'f.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>115),
-	'dynamount_payed'=>array('label'=>"Paid", 'checked'=>0, 'position'=>116),
-	'rtp'=>array('label'=>"Rest", 'checked'=>0, 'position'=>117),
-	'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'position'=>205, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'position'=>206, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'position'=>207, 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'position'=>208, 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'position'=>209, 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'position'=>210, 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'position'=>211, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)), // Not enabled by default because slow
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>500),
-	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>501),
-	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>502),
-	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	'f.nb_docs'=>array('label'=>"Documents", 'checked'=>1, 'position'=>510),
+	'f.ref' => array('label' => "Ref", 'checked' => 1),
+	'f.ref_supplier' => array('label' => "RefSupplier", 'checked' => 1),
+	'f.type' => array('label' => "Type", 'checked' => 0),
+	'f.subtype' => array('label' => "InvoiceSubtype", 'checked' => 0,),
+	'f.label' => array('label' => "Label", 'checked' => 0),
+	'f.datef' => array('label' => "DateInvoice", 'checked' => 1),
+	'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => 1),
+	'p.ref' => array('label' => "ProjectRef", 'checked' => 0),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 41),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => 0, 'position' => 42),
+	's.town' => array('label' => "Town", 'checked' => -1, 'position' => 43),
+	's.zip' => array('label' => "Zip", 'checked' => 1, 'position' => 44),
+	'state.nom' => array('label' => "StateShort", 'checked' => 0, 'position' => 45),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0, 'position' => 46),
+	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 49),
+	'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 1, 'position' => 52),
+	'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 1, 'position' => 50),
+	'f.total_ht' => array('label' => "AmountHT", 'checked' => 1, 'position' => 105),
+	'f.total_vat' => array('label' => "AmountVAT", 'checked' => 0, 'position' => 110),
+	'f.total_localtax1' => array('label' => $langs->transcountry("AmountLT1", $mysoc->country_code), 'checked' => 0, 'enabled' => $mysoc->localtax1_assuj == "1", 'position' => 95),
+	'f.total_localtax2' => array('label' => $langs->transcountry("AmountLT2", $mysoc->country_code), 'checked' => 0, 'enabled' => $mysoc->localtax2_assuj == "1", 'position' => 100),
+	'f.total_ttc' => array('label' => "AmountTTC", 'checked' => 0, 'position' => 115),
+	'dynamount_payed' => array('label' => "Paid", 'checked' => 0, 'position' => 116),
+	'rtp' => array('label' => "Rest", 'checked' => 0, 'position' => 117),
+	'f.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'position' => 205, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'position' => 206, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'position' => 207, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'position' => 208, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'position' => 209, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'multicurrency_dynamount_payed' => array('label' => 'MulticurrencyAlreadyPaid', 'position' => 210, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'multicurrency_rtp' => array('label' => 'MulticurrencyRemainderToPay', 'checked' => 0, 'position' => 211, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)), // Not enabled by default because slow
+	'u.login' => array('label' => "Author", 'checked' => 1, 'position' => 500),
+	'f.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 501),
+	'f.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 502),
+	'f.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
+	'f.nb_docs' => array('label' => "Documents", 'checked' => 1, 'position' => 510),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -241,7 +241,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
+$parameters = array('socid' => $socid, 'arrayfields' => &$arrayfields);
 $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');
@@ -332,7 +332,7 @@ if (empty($reshook)) {
 					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 					// hook to finalize the remaining amount, considering e.g. cash discount agreements
-					$parameters = array('remaintopay'=>$objecttmp->resteapayer);
+					$parameters = array('remaintopay' => $objecttmp->resteapayer);
 					$reshook = $hookmanager->executeHooks('finalizeAmountOfInvoice', $parameters, $objecttmp, $action); // Note that $action and $object may have been modified by some hooks
 					if ($reshook > 0) {
 						// print $hookmanager->resPrint;
@@ -947,8 +947,8 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'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"),
 );
@@ -987,8 +987,8 @@ print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")));
 
@@ -1094,10 +1094,10 @@ if (!empty($arrayfields['f.ref_supplier']['checked'])) {
 if (!empty($arrayfields['f.type']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone">';
 	$listtype = array(
-		FactureFournisseur::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
-		FactureFournisseur::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
-		FactureFournisseur::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
-		FactureFournisseur::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
+		FactureFournisseur::TYPE_STANDARD => $langs->trans("InvoiceStandard"),
+		FactureFournisseur::TYPE_REPLACEMENT => $langs->trans("InvoiceReplacement"),
+		FactureFournisseur::TYPE_CREDIT_NOTE => $langs->trans("InvoiceAvoir"),
+		FactureFournisseur::TYPE_DEPOSIT => $langs->trans("InvoiceDeposit"),
 	);
 	/*
 	 if (!empty($conf->global->INVOICE_USE_SITUATION))
@@ -1109,7 +1109,7 @@ if (!empty($arrayfields['f.type']['checked'])) {
 	print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100');
 	print '</td>';
 }
-	// Invoice Subtype
+// Invoice Subtype
 if (!empty($arrayfields['f.subtype']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 	print $form->selectarray('search_subtype', $subtypearray, $search_subtype, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
@@ -1289,7 +1289,7 @@ if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -1305,7 +1305,8 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print '<td class="liste_titre center parentonrightofpage">';
-	$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
+	$liststatus = array('0' => $langs->trans("Draft"), '1' => $langs->trans("Unpaid"), '2' => $langs->trans("Paid"));
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'center search_status width100 onrightofpage', 1);
 	print '</td>';
 }
@@ -1468,7 +1469,7 @@ if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['f.datec']['checked'])) {
@@ -1503,11 +1504,11 @@ $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
 $totalarray['val'] = array();
-$totalarray['val']['f.total_ht']=0;
-$totalarray['val']['f.total_vat']=0;
-$totalarray['val']['f.total_localtax1']=0;
-$totalarray['val']['f.total_localtax1']=0;
-$totalarray['val']['f.total_ttc']=0;
+$totalarray['val']['f.total_ht'] = 0;
+$totalarray['val']['f.total_vat'] = 0;
+$totalarray['val']['f.total_localtax1'] = 0;
+$totalarray['val']['f.total_localtax1'] = 0;
+$totalarray['val']['f.total_ttc'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
@@ -1987,7 +1988,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 28665f0a8c5..466f7beaedd 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -90,20 +90,20 @@ $search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') :
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'p.ref'=>"RefPayment",
-	's.nom'=>"ThirdParty",
-	'p.num_paiement'=>"Numero",
-	'p.amount'=>"Amount",
+	'p.ref' => "RefPayment",
+	's.nom' => "ThirdParty",
+	'p.num_paiement' => "Numero",
+	'p.amount' => "Amount",
 );
 
 $arrayfields = array(
-	'p.ref'				=>array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
-	'p.datep'			=>array('label'=>"Date", 'checked'=>1, 'position'=>20),
-	's.nom'				=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
-	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
-	'p.num_paiement'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
-	'ba.label'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>60, 'enable'=>(isModEnabled("bank"))),
-	'p.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+	'p.ref'				=> array('label' => "RefPayment", 'checked' => 1, 'position' => 10),
+	'p.datep'			=> array('label' => "Date", 'checked' => 1, 'position' => 20),
+	's.nom'				=> array('label' => "ThirdParty", 'checked' => 1, 'position' => 30),
+	'c.libelle'			=> array('label' => "Type", 'checked' => 1, 'position' => 40),
+	'p.num_paiement'	=> array('label' => "Numero", 'checked' => 1, 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 60, 'enable' => (isModEnabled("bank"))),
+	'p.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -139,7 +139,7 @@ if ((!$user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -214,7 +214,7 @@ if ($search_date_start) {
 	$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
 }
 if ($search_date_end) {
-	$sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'";
 }
 
 if ($search_company) {
@@ -351,6 +351,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
 
 if ($search_all) {
@@ -458,7 +459,7 @@ if (!empty($arrayfields['p.amount']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -517,7 +518,7 @@ if (!empty($arrayfields['p.amount']['checked'])) {
 }
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$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
 print $hookmanager->resPrint;
 
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 589d1b0d82e..16157d26be6 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -157,15 +157,15 @@ if (empty($reshook)) {
 
 // Definition of fields for lists
 $arrayfields = array(
-	'cpl.rowid'=>array('label'=>"ID", 'checked'=>1),
-	'cpl.date_action'=>array('label'=>"Date", 'checked'=>1),
-	'cpl.fk_user_action'=>array('label'=>"ActionByCP", 'checked'=>1),
-	'cpl.fk_user_update'=>array('label'=>"UserUpdateCP", 'checked'=>1),
-	'cpl.type_action'=>array('label'=>"Description", 'checked'=>1),
-	'cpl.fk_type'=>array('label'=>"Type", 'checked'=>1),
-	'cpl.prev_solde'=>array('label'=>"PrevSoldeCP", 'checked'=>1),
-	'variation'=>array('label'=>"Variation", 'checked'=>1),
-	'cpl.new_solde'=>array('label'=>"NewSoldeCP", 'checked'=>1),
+	'cpl.rowid' => array('label' => "ID", 'checked' => 1),
+	'cpl.date_action' => array('label' => "Date", 'checked' => 1),
+	'cpl.fk_user_action' => array('label' => "ActionByCP", 'checked' => 1),
+	'cpl.fk_user_update' => array('label' => "UserUpdateCP", 'checked' => 1),
+	'cpl.type_action' => array('label' => "Description", 'checked' => 1),
+	'cpl.fk_type' => array('label' => "Type", 'checked' => 1),
+	'cpl.prev_solde' => array('label' => "PrevSoldeCP", 'checked' => 1),
+	'variation' => array('label' => "Variation", 'checked' => 1),
+	'cpl.new_solde' => array('label' => "NewSoldeCP", 'checked' => 1),
 );
 
 
@@ -286,6 +286,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->rights->holiday->write);
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans('LogCP'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 print '<div class="info">'.$langs->trans('LastUpdateCP').': ';
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 5385c924a28..af35d75201f 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -233,7 +233,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
-	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if (getDolGlobalString('MARGIN_TYPE') == "1") {
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 730f5ea1479..de7822b6198 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -248,6 +248,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
+	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	if (getDolGlobalString('MARGIN_TYPE') == "1") {
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 9561ddf2f28..d30ef558ecf 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -303,7 +303,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
-	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if (getDolGlobalString('MARGIN_TYPE') == "1") {
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index b66bee3b605..fb1604c6d9f 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -253,7 +253,7 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	print '<br>';
-	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	//var_dump($conf->global->MARGIN_TYPE);
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index c2ec6485cf7..83b646baf29 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -199,7 +199,7 @@ if ($socid > 0) {
 	if ($result) {
 		$num = $db->num_rows($result);
 
-		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
 
 		$i = 0;
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 5d9fe35343b..9a11c59abd1 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -214,7 +214,7 @@ if ($id > 0 || $ref) {
 			$param .= '&limit='.$limit;
 		}
 
-		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans("ActionsOnProduct"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 5b6acca46ea..747604f0f70 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1705,10 +1705,10 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
 			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
-				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
 			} else {
-				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
 			}
 
@@ -2140,6 +2140,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 		$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, $backbutton, count($prodcustprice->lines), $nbtotalofrecords, 'title_accountancy.png');
 
 		if (count($prodcustprice->lines) > 0) {
@@ -2259,6 +2260,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 		$option = '&search_soc='.$search_soc.'&id='.$object->id;
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans('PriceByCustomer'), $page, $_SERVER ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, 'title_accountancy.png');
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 0e7f8c297b5..315f39590d3 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -223,6 +223,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index b71ab30826b..d377ae40e0a 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -223,6 +223,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8223a333022..870e7f81fda 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -81,7 +81,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object = $product;
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -191,6 +191,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 			}
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index b0b5ba6ea89..ad3e190e851 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -132,7 +132,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object = $product;
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -297,6 +297,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
@@ -331,7 +332,7 @@ if ($id > 0 || !empty($ref)) {
 				print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "d.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
 				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
 				// Hook fields
-				$parameters = array('param'=>$option, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+				$parameters = array('param' => $option, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 				$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 				print "</tr>\n";
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 7f68d34490d..faf752b71e9 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -205,6 +205,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("SuppliersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index 6ba186fb886..f25c3076b63 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -97,7 +97,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object = $product;
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -223,6 +223,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 998ca70a3db..d6727842ead 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -92,7 +92,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object = $product;
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -201,6 +201,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 			}
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("MOs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index becd2350fdd..7ac396da333 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -207,6 +207,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 704ec0457c4..5e162e08339 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -206,6 +206,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 2d77dc86512..174be7e4486 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$result = $object->fetch($id, $objectid, $batch);
 
-	$parameters = array('id'=>$id);
+	$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');
@@ -283,6 +283,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index 75be59f5d18..cc2a10c0592 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$result = $object->fetch($id, $objectid, $batch);
 
-	$parameters = array('id'=>$id);
+	$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');
@@ -282,6 +282,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("Shipments"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index 174dea1507c..e48d44127c0 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -98,7 +98,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$result = $object->fetch($id, $objectid, $batch);
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -224,6 +224,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 			}
 
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			print_barre_liste($langs->trans("MOs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
@@ -261,7 +262,7 @@ if ($id > 0 || !empty($ref)) {
 
 			$motmp = new Mo($db);
 
-			$total_consumed=$total_produced=0;
+			$total_consumed = $total_produced = 0;
 
 			if ($num > 0) {
 				while ($i < min($num, $limit)) {
@@ -271,8 +272,8 @@ if ($id > 0 || !empty($ref)) {
 					$motmp->ref = $objp->ref;
 					$motmp->status = $objp->status;
 
-					$total_consumed+=$objp->nb_consumed;
-					$total_produced+=$objp->nb_produced;
+					$total_consumed += $objp->nb_consumed;
+					$total_produced += $objp->nb_produced;
 
 					print '<tr class="oddeven">';
 					print '<td>';
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 26e6455ad32..08839af5749 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$result = $object->fetch($id, $objectid, $batch);
 
-	$parameters = array('id'=>$id);
+	$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');
@@ -281,6 +281,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				print_barre_liste($langs->trans("Receptions"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
diff --git a/htdocs/public/webportal/tpl/menu.tpl.php b/htdocs/public/webportal/tpl/menu.tpl.php
index 2275d8e8496..91edea91acb 100644
--- a/htdocs/public/webportal/tpl/menu.tpl.php
+++ b/htdocs/public/webportal/tpl/menu.tpl.php
@@ -112,10 +112,13 @@ $parameters = array(
 );
 
 $reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action);    // Note that $action and $object may have been modified by hook
-if ($reshook < 0) $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	$context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	if (!empty($hookmanager->resArray)) {
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 		$navMenu = array_replace($navMenu, $hookmanager->resArray);
 	}
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 347ed2c756a..f1b8c29eb6c 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -886,6 +886,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dollyrevert', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($massaction == 'createbills') {
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index e9707f39d44..fd5a1a88d06 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -297,7 +297,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			if (file_exists($dir)) {
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Set nblines with the new facture lines content after hook
@@ -358,6 +358,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
 				}
 
+				// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
@@ -627,9 +628,9 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 					$parameters = array(
 						'object' => $object,
 						'i' => $i,
-						'pdf' =>& $pdf,
-						'curY' =>& $curY,
-						'nexY' =>& $nexY,
+						'pdf' => & $pdf,
+						'curY' => & $curY,
+						'nexY' => & $nexY,
 						'outputlangs' => $outputlangs,
 						'hidedetails' => $hidedetails
 					);
@@ -711,7 +712,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -721,7 +722,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -1261,6 +1262,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamOrderInternal
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 80e4dd7baf1..3b1beab890d 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -128,11 +128,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -439,8 +439,8 @@ if (!empty($socid)) {
 }
 
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewSalary'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
@@ -499,20 +499,20 @@ print '<td class="liste_titre"><input type="text" class="flat width100" name="se
 // Date start
 print '<td class="liste_titre center">';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_date_start_from ? $search_date_start_from : -1, 'search_date_start_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print $form->selectDate($search_date_start_from ? $search_date_start_from : -1, 'search_date_start_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_date_start_to ? $search_date_start_to : -1, 'search_date_start_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print $form->selectDate($search_date_start_to ? $search_date_start_to : -1, 'search_date_start_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 
 // Date End
 print '<td class="liste_titre center">';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_date_end_from ? $search_date_end_from : -1, 'search_date_end_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print $form->selectDate($search_date_end_from ? $search_date_end_from : -1, 'search_date_end_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_date_end_to ? $search_date_end_to : -1, 'search_date_end_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print $form->selectDate($search_date_end_to ? $search_date_end_to : -1, 'search_date_end_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 
@@ -539,6 +539,7 @@ print '<td class="liste_titre right"><input name="search_amount" class="flat" ty
 // Status
 print '<td class="liste_titre right parentonrightofpage">';
 $liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
+// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 print '</td>';
 
@@ -546,7 +547,7 @@ print '</td>';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -592,7 +593,7 @@ $totalarray['nbfield']++;
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -784,7 +785,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -829,7 +830,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index d2bad348b37..0e0031e6f9c 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -75,7 +75,7 @@ $hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
  * Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -286,7 +286,7 @@ if ($result > 0) {
 		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidthonsmartphone');
 		print '</td>';
 		print '<td>';
-		$type = array('email'=>$langs->trans("EMail"));
+		$type = array('email' => $langs->trans("EMail"));
 		print $form->selectarray("typeid", $type, '', 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 		print '</td>';
 		print '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans("Add").'"></td>';
@@ -447,7 +447,7 @@ if ($result > 0) {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-	// List of active notifications
+	// List of active notifications  @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	// Line with titles
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index fdafc97e55b..55d0091a80b 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -74,7 +74,7 @@ $error = 0;
  * Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -467,6 +467,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 		$option = '&socid='.GETPOSTINT('socid').'&prodid='.GETPOSTINT('prodid');
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans('PriceByCustomerLog'), $page, $_SERVER ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);
 
 		if (count($prodcustprice->lines) > 0) {
@@ -544,11 +545,11 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			if (!empty($val['visible'])) {
 				$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 				$arrayfields['t.'.$key] = array(
-					'label'=>$val['label'],
-					'checked'=>(($visible < 0) ? 0 : 1),
-					'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
-					'position'=>$val['position'],
-					'help'=> isset($val['help']) ? $val['help'] : ''
+					'label' => $val['label'],
+					'checked' => (($visible < 0) ? 0 : 1),
+					'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
+					'position' => $val['position'],
+					'help' => isset($val['help']) ? $val['help'] : ''
 				);
 			}
 		}
@@ -569,6 +570,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 		print '<!-- view specific price for each product -->'."\n";
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index d3588e83ff4..8112a219016 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -273,7 +273,7 @@ if ($result > 0) {
 
 	// List of active notifications
 	//print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
-	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $num, 'email', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Line with titles
@@ -472,7 +472,7 @@ if ($result > 0) {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	// List of notifications done
+	// List of notifications done  @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'email', 0, '', '', $limit);
 
 	// Line with titles

From bcf6d7a2aa5b255516e46d69c9898d8bb1dde4a8 Mon Sep 17 00:00:00 2001
From: kkhelifa-opendsi <kkhelifa@open-dsi.fr>
Date: Fri, 8 Mar 2024 12:36:31 +0100
Subject: [PATCH 0564/1862] FIX: Fix create shipping with product who have
 negative stocks on warehouse but the negative stock transfert is allowed
 (#26217)

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 318d66635ec..20c6a14b77d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1424,7 +1424,7 @@ if ($action == 'create') {
 							$nbofsuggested = 0;
 
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
-								if ($stock_warehouse->real > 0) {
+								if ($stock_warehouse->real > 0 || !empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
 									$nbofsuggested++;
 								}
 							}
@@ -1437,7 +1437,7 @@ if ($action == 'create') {
 								}
 
 								$tmpwarehouseObject->fetch($warehouse_id);
-								if ($stock_warehouse->real > 0) {
+								if ($stock_warehouse->real > 0 || !empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
 									$stock = + $stock_warehouse->real; // Convert it to number
 									$deliverableQty = min($quantityToBeDelivered, $stock);
 									$deliverableQty = max(0, $deliverableQty);
@@ -1536,7 +1536,7 @@ if ($action == 'create') {
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
-								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+								if (($stock_warehouse->real > 0 || !empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) && (count($stock_warehouse->detail_batch))) {
 									$nbofsuggested+=count($stock_warehouse->detail_batch);
 								}
 							}
@@ -1549,7 +1549,7 @@ if ($action == 'create') {
 								}
 
 								$tmpwarehouseObject->fetch($warehouse_id);
-								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+								if (($stock_warehouse->real > 0 || !empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) && (count($stock_warehouse->detail_batch))) {
 									foreach ($stock_warehouse->detail_batch as $dbatch) {
 										$batchStock = + $dbatch->qty; // To get a numeric
 										if (isset($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
@@ -1634,6 +1634,9 @@ if ($action == 'create') {
 									$disabled = 'disabled="disabled"';
 								}
 								print '<input class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
+								if (empty($disabled) && !empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
+									print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_selected_id . '">';
+								}
 							} else {
 								print $langs->trans("NA");
 							}

From afd49868d57022e69967401802eda8e8f2fea02a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 16:32:44 +0100
Subject: [PATCH 0565/1862] Fix bad route

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

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 5225ccb4e93..000ecc26f2b 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
+
 /**
  * API class for members
  *
@@ -723,7 +724,7 @@ class Members extends DolibarrApi
 	 * @param array $request_data   Request data
 	 * @return int  ID of member type
 	 *
-	 * @url POST /types/{id}
+	 * @url POST /types/
 	 *
 	 * @throws	RestException	403		Access denied
 	 * @throws	RestException	500		Error when creating Member Type

From 6df4a5eded603ef6ff51fae451b70eca7fe0acd4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 16:41:33 +0100
Subject: [PATCH 0566/1862] Use a better name for thirdparties site account

---
 ChangeLog                                     |  2 +-
 htdocs/core/lib/company.lib.php               |  3 --
 .../societe/class/api_thirdparties.class.php  | 46 +++++++++----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a123336552..25688ef0ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,7 +29,7 @@ The following changes may create regressions for some external modules, but were
 * Use of dol_eval with parameter $returnvalue=0 is deprecated.
 * The signature for all ->delete() method has been modified to match the modulebuilder template (so first paramis now always $user), except
   the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
-
+* Route for API /thirdparties/gateways has been renamed into /thirdparties/accounts
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7fca6289c95..7c7fc412669 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -197,9 +197,6 @@ function societe_prepare_head(Societe $object)
 		$title = $langs->trans("PaymentModes");
 
 		if (isModEnabled('stripe')) {
-			//$langs->load("stripe");
-			//$title = $langs->trans("BankAccountsAndGateways");
-
 			$servicestatus = 0;
 			if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 				$servicestatus = 1;
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 0f88fefbd2c..612c9c7852c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1371,7 +1371,7 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Get a specific gateway attached to a thirdparty (by specifying the site key)
+	 * Get a specific account attached to a thirdparty (by specifying the site key)
 	 *
 	 * @param int $id ID of thirdparty
 	 * @param string $site Site key
@@ -1380,7 +1380,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
 	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
 	 *
-	 * @url GET {id}/gateways/
+	 * @url GET {id}/accounts/
 	 */
 	public function getSocieteAccounts($id, $site = null)
 	{
@@ -1404,7 +1404,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		if ($result && $this->db->num_rows($result) == 0) {
-			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
+			throw new RestException(404, 'This thirdparty does not have any account attached or does not exist.');
 		}
 
 		$i = 0;
@@ -1440,7 +1440,7 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Create and attach a new gateway to an existing thirdparty
+	 * Create and attach a new account to an existing thirdparty
 	 *
 	 * Possible fields for request_data (request body) are specified in <code>llx_societe_account</code> table.<br>
 	 * See <a href="https://wiki.dolibarr.org/index.php/Table_llx_societe_account">Table llx_societe_account</a> wiki page for more information<br><br>
@@ -1452,11 +1452,11 @@ class Thirdparties extends DolibarrApi
 	 * @return array|mixed
 	 *
 	 * @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws RestException 409 Conflict: A SocieteAccount entity (gateway) already exists for this company and site.
+	 * @throws RestException 409 Conflict: An Account already exists for this company and site.
 	 * @throws RestException 422 Unprocessable Entity: You must pass the site attribute in your request data !
 	 * @throws RestException 500 Internal Server Error: Error creating SocieteAccount account
 	 *
-	 * @url POST {id}/gateways
+	 * @url POST {id}/accounts
 	 */
 	public function createSocieteAccount($id, $request_data = null)
 	{
@@ -1501,10 +1501,10 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Create and attach a new (or replace an existing) specific site gateway to a thirdparty
+	 * Create and attach a new (or replace an existing) specific site account to a thirdparty
 	 *
 	 * You <strong>MUST</strong> pass all values to keep (otherwise, they will be deleted) !<br>
-	 * If you just need to update specific fields prefer <code>PATCH /thirdparties/{id}/gateways/{site}</code> endpoint.<br><br>
+	 * If you just need to update specific fields prefer <code>PATCH /thirdparties/{id}/accounts/{site}</code> endpoint.<br><br>
 	 * When a <strong>SocieteAccount</strong> entity does not exist for the <code>id</code> and <code>site</code>
 	 * supplied, a new one will be created. In that case <code>fk_soc</code> and <code>site</code> members form
 	 * request body payload will be ignored and <code>id</code> and <code>site</code> query strings parameters
@@ -1520,7 +1520,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 422 Unprocessable Entity: You must pass the site attribute in your request data !
 	 * @throws RestException 500 Internal Server Error: Error updating SocieteAccount entity
 	 *
-	 * @url PUT {id}/gateways/{site}
+	 * @url PUT {id}/accounts/{site}
 	 */
 	public function putSocieteAccount($id, $site, $request_data = null)
 	{
@@ -1564,7 +1564,7 @@ class Thirdparties extends DolibarrApi
 				$result = $this->db->query($sql);
 
 				if ($result && $this->db->num_rows($result) !== 0) {
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
+					throw new RestException(409, "You are trying to update this thirdparty Account for $site to ".$request_data['site']." but another Account already exists with this site key.");
 				}
 			}
 
@@ -1601,7 +1601,7 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Update specified values of a specific gateway attached to a thirdparty
+	 * Update specified values of a specific account attached to a thirdparty
 	 *
 	 * @param int		$id				Id of thirdparty
 	 * @param string	$site			Site key
@@ -1614,7 +1614,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 409 Conflict: Another SocieteAccount entity already exists for this thirdparty with this site key.
 	 * @throws RestException 500 Internal Server Error: Error updating SocieteAccount entity
 	 *
-	 * @url PATCH {id}/gateways/{site}
+	 * @url PATCH {id}/accounts/{site}
 	 */
 	public function patchSocieteAccount($id, $site, $request_data = null)
 	{
@@ -1626,7 +1626,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		if ($result && $this->db->num_rows($result) == 0) {
-			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
+			throw new RestException(404, "This thirdparty does not have $site account attached or does not exist.");
 		} else {
 			// If the user tries to edit the site member, we check first if
 			if (isset($request_data['site']) && $request_data['site'] !== $site) {
@@ -1634,7 +1634,7 @@ class Thirdparties extends DolibarrApi
 				$result = $this->db->query($sql);
 
 				if ($result && $this->db->num_rows($result) !== 0) {
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from ".$site." to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
+					throw new RestException(409, "You are trying to update this thirdparty Account for ".$site." to ".$request_data['site']." but another Account already exists for this thirdparty with this site key.");
 				}
 			}
 
@@ -1663,17 +1663,17 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Delete a specific site gateway attached to a thirdparty (by gateway id)
+	 * Delete a specific site account attached to a thirdparty (by account id)
 	 *
 	 * @param int $id ID of thirdparty
 	 * @param int $site Site key
 	 *
 	 * @return void
-	 * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
+	 * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties accounts
 	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
 	 * @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
 	 *
-	 * @url DELETE {id}/gateways/{site}
+	 * @url DELETE {id}/accounts/{site}
 	 */
 	public function deleteSocieteAccount($id, $site)
 	{
@@ -1692,22 +1692,22 @@ class Thirdparties extends DolibarrApi
 			$account->fetch($obj->rowid);
 
 			if ($account->delete(DolibarrApiAccess::$user) < 0) {
-				throw new RestException(500, "Error while deleting $site gateway attached to this third party");
+				throw new RestException(500, "Error while deleting $site account attached to this third party");
 			}
 		}
 	}
 
 	/**
-	 * Delete all gateways attached to a thirdparty
+	 * Delete all accounts attached to a thirdparty
 	 *
 	 * @param int $id ID of thirdparty
 	 *
 	 * @return void
-	 * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
+	 * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties accounts
 	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
 	 * @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
 	 *
-	 * @url DELETE {id}/gateways
+	 * @url DELETE {id}/accounts
 	 */
 	public function deleteSocieteAccounts($id)
 	{
@@ -1725,7 +1725,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		if ($result && $this->db->num_rows($result) == 0) {
-			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
+			throw new RestException(404, 'This third party does not have any account attached or does not exist.');
 		} else {
 			$i = 0;
 
@@ -1736,7 +1736,7 @@ class Thirdparties extends DolibarrApi
 				$account->fetch($obj->rowid);
 
 				if ($account->delete(DolibarrApiAccess::$user) < 0) {
-					throw new RestException(500, 'Error while deleting gateways attached to this third party');
+					throw new RestException(500, 'Error while deleting account attached to this third party');
 				}
 				$i++;
 			}

From c4cb7c0a987ee21f2e86a03e93494530170cb285 Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Fri, 8 Mar 2024 16:55:53 +0100
Subject: [PATCH 0567/1862] Add cache feature on fetchObjectByElement

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ce423636f28..cdca2411b67 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12377,12 +12377,14 @@ function getElementProperties($elementType)
  * @param	int     	$element_id 	Element id (Use this or element_id but not both)
  * @param	string  	$element_type 	Element type ('module' or 'myobject@mymodule' or 'mymodule_myobject')
  * @param	string     	$element_ref 	Element ref (Use this or element_id but not both)
+ * @param	int			$useCache 	if you want to store object in cache or get it from cache 0 => no use cache , 1 use cache, 2 force reload  cache
+ * @param	int			$maxCacheByType number of object in cache for this element type
  * @return 	int|object 					object || 0 || <0 if error
  * @see getElementProperties()
  */
-function fetchObjectByElement($element_id, $element_type, $element_ref = '')
+function fetchObjectByElement($element_id, $element_type, $element_ref = '', $useCache = 0, $maxCacheByType = 10)
 {
-	global $db;
+	global $db, $globalCacheForGetObjectFromCache;
 
 	$ret = 0;
 
@@ -12401,11 +12403,19 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 	}
 
 	if (is_array($element_prop) && (empty($element_prop['module']) || $ismodenabled)) {
+		if ($useCache === 1
+			&& !empty($globalCacheForGetObjectFromCache[$element_type])
+			&& !empty($globalCacheForGetObjectFromCache[$element_type][$element_id])
+			&& is_object($globalCacheForGetObjectFromCache[$element_type][$element_id])
+		) {
+			return $globalCacheForGetObjectFromCache[$element_type][$element_id];
+		}
+
 		dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
 		if (class_exists($element_prop['classname'])) {
-			$classname = $element_prop['classname'];
-			$objecttmp = new $classname($db);
+			$className = $element_prop['classname'];
+			$objecttmp = new $className($db);
 
 			if ($element_id > 0 || !empty($element_ref)) {
 				$ret = $objecttmp->fetch($element_id, $element_ref);
@@ -12413,6 +12423,20 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 					if (empty($objecttmp->module)) {
 						$objecttmp->module = $element_prop['module'];
 					}
+
+					if ($useCache > 0) {
+						if (!isset($globalCacheForGetObjectFromCache[$element_type])) {
+							$globalCacheForGetObjectFromCache[$element_type] = [];
+						}
+
+						// Manage cache limit
+						if (! empty($globalCacheForGetObjectFromCache[$element_type]) && is_array($globalCacheForGetObjectFromCache[$element_type]) && count($globalCacheForGetObjectFromCache[$element_type]) >= $maxCacheByType) {
+							array_shift($globalCacheForGetObjectFromCache[$element_type]);
+						}
+
+						$globalCacheForGetObjectFromCache[$element_type][$element_id] = $objecttmp;
+					}
+
 					return $objecttmp;
 				}
 			} else {

From 7ab339e97f4034f6696ba0e18f25920b6193c6f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 17:52:34 +0100
Subject: [PATCH 0568/1862] Fix regression

---
 htdocs/comm/propal/class/propal.class.php | 2 --
 htdocs/contact/list.php                   | 2 +-
 htdocs/core/lib/company.lib.php           | 2 +-
 htdocs/product/stock/list.php             | 2 +-
 htdocs/societe/list.php                   | 6 +++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 39c01663d93..868a16ed304 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -409,8 +409,6 @@ class Propal extends CommonObject
 	 */
 	public function __construct($db, $socid = 0, $propalid = 0)
 	{
-		global $conf, $langs;
-
 		$this->db = $db;
 
 		$this->socid = $socid;
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 96e58140742..8501ef26165 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -101,7 +101,7 @@ $search_sale = GETPOSTINT('search_sale');
 $search_categ = GETPOSTINT("search_categ");
 $search_categ_thirdparty = GETPOSTINT("search_categ_thirdparty");
 $search_categ_supplier = GETPOSTINT("search_categ_supplier");
-$search_status = GETPOSTINT("search_status");
+$search_status = GETPOST("search_status", "intcomma");
 $search_type = GETPOST('search_type', 'alpha');
 $search_address = GETPOST('search_address', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7c7fc412669..7caa6533194 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -998,7 +998,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 
-	$search_status = GETPOSTINT("search_status");
+	$search_status = GETPOST("search_status", "intcomma");
 	if ($search_status == '') {
 		$search_status = 1; // always display active customer first
 	}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index ca5bcb5fded..787cc14f779 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -52,7 +52,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("sref", "alpha") ? GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
 $search_label = GETPOST("snom", "alpha") ? GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
-$search_status = GETPOSTINT("search_status");
+$search_status = GETPOST("search_status", "intcomma");
 
 $search_category_list = array();
 if (isModEnabled('category')) {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 19e620f7b8a..099106056b8 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -120,7 +120,7 @@ $search_country = GETPOST("search_country", 'intcomma');
 $search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
 $search_price_level = GETPOSTINT('search_price_level');
 $search_staff = GETPOSTINT("search_staff");
-$search_status = GETPOSTINT("search_status");
+$search_status = GETPOST("search_status", 'intcomma');
 $search_type = GETPOST('search_type', 'alpha');
 $search_level = GETPOST("search_level", "array:alpha");
 $search_stcomm = GETPOST('search_stcomm', "array:int");
@@ -472,8 +472,8 @@ if (empty($reshook)) {
 	}
 }
 
-if ($search_status == '') {
-	$search_status = 1; // always display active thirdparty first
+if ($search_status == '' && empty($search_all)) {
+	$search_status = 1; // display active thirdparty only by default
 }
 
 

From 4ca754205c008003805d4a35154abc25829c21cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 19:37:00 +0100
Subject: [PATCH 0569/1862] Fix serch_all

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 099106056b8..c0baeb41882 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -446,6 +446,8 @@ if (empty($reshook)) {
 		$search_level = '';
 		$search_parent_name = '';
 		$search_import_key = '';
+
+		$search_all = '';
 		$toselect = array();
 		$search_array_options = array();
 	}

From 4f5c400870d0d0ecf39d908dc91c418ac3f8212a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 19:39:33 +0100
Subject: [PATCH 0570/1862] Fix missing search_all

---
 htdocs/modulebuilder/template/myobject_list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 476a429d972..d1bde9d79c5 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -249,6 +249,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
+		$search_all = '';
 		$toselect = array();
 		$search_array_options = array();
 	}

From a9cae438a60586b9a880f4b3964aa0f4c128701e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 19:43:57 +0100
Subject: [PATCH 0571/1862] Fix regression

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

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 28af89a6246..f2668099f9f 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 
-$type = GETPOSTINT("type");
+$type = GETPOST("type", 'intcomma');
 if ($type == '' && !$user->hasRight('produit', 'lire') && $user->hasRight('service', 'lire')) {
 	$type = '1'; // Force global page on service page only
 }

From 65899433fe1cd4e74e187e4ea90af90d030caff7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 8 Mar 2024 19:47:05 +0100
Subject: [PATCH 0572/1862] Qual: remove $_GET use.

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

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index f2668099f9f..9abf9bd5326 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -69,15 +69,15 @@ if ($type == '0') {
 $transAreaType = $langs->trans("ProductsAndServicesArea");
 
 $helpurl = '';
-if (!isset($_GET["type"])) {
+if (!GETPOSTISSET("type")) {
 	$transAreaType = $langs->trans("ProductsAndServicesArea");
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
-if ((isset($_GET["type"]) && $_GET["type"] == 0) || !isModEnabled("service")) {
+if ((GETPOSTISSET("type") && GETPOST("type") == '0') || !isModEnabled("service")) {
 	$transAreaType = $langs->trans("ProductsArea");
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
-if ((isset($_GET["type"]) && $_GET["type"] == 1) || !isModEnabled("product")) {
+if ((GETPOSTISSET("type") && GETPOST("type") == '1') || !isModEnabled("product")) {
 	$transAreaType = $langs->trans("ServicesArea");
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
@@ -310,10 +310,10 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 
 		if ($num > 0) {
 			$transRecordedType = $langs->trans("LastModifiedProductsAndServices", $max);
-			if (isset($_GET["type"]) && $_GET["type"] == 0) {
+			if (GETPOSTISSET("type") && GETPOST("type") == '0') {
 				$transRecordedType = $langs->trans("LastRecordedProducts", $max);
 			}
-			if (isset($_GET["type"]) && $_GET["type"] == 1) {
+			if (GETPOSTISSET("type") && GETPOST("type") == '1') {
 				$transRecordedType = $langs->trans("LastRecordedServices", $max);
 			}
 

From 9a281ed2647544824699a4f3ef03b53c6168b418 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Mar 2024 21:21:27 +0100
Subject: [PATCH 0573/1862] Fix undefined property

---
 htdocs/adherents/class/api_members.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 000ecc26f2b..889f1212547 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -432,7 +432,12 @@ class Members extends DolibarrApi
 	private function _validate($data)
 	{
 		$member = array();
-		foreach (Members::$FIELDS as $field) {
+
+		$mandatoryfields = array(
+			'morphy',
+			'typeid'
+		);
+		foreach ($mandatoryfields as $field) {
 			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
 			}
@@ -857,7 +862,10 @@ class Members extends DolibarrApi
 	private function _validateType($data)
 	{
 		$membertype = array();
-		foreach (MembersTypes::$FIELDS as $field) {
+
+		$mandatoryfields = array('label');
+
+		foreach ($mandatoryfields as $field) {
 			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
 			}

From 826d72d04be5e1e8a4f5f96abeb2352af961c460 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:25:15 +0100
Subject: [PATCH 0574/1862] Qual: Reduce phan baseline (thanks to 'fixes')
 (#28715)

# Qual: Reduce phan baseline (thanks to 'fixes')

The number of phan exceptions has been reduced, the baseline is updated
accordingly.
---
 dev/tools/phan/baseline.txt | 246 ++++--------------------------------
 1 file changed, 26 insertions(+), 220 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index dad508e8cf6..3ccb13ee599 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,231 +9,100 @@
  */
 return [
     // # Issue statistics:
-    // PhanPluginSuspiciousParamPosition : 160+ occurrences
-    // PhanPluginSuspiciousParamOrder : 130+ occurrences
-    // PhanParamSignatureMismatch : 45+ occurrences
-    // PhanPluginDuplicateIfStatements : 40+ occurrences
-    // PhanPluginDuplicateExpressionBinaryOp : 15+ occurrences
+    // PhanPluginSuspiciousParamPosition : 45+ occurrences
+    // PhanPluginDuplicateIfStatements : 30+ occurrences
+    // PhanParamSignatureMismatch : 25+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
-    // PhanUnreferencedUseNormal : 15+ occurrences
-    // PhanParamSuspiciousOrder : 10+ occurrences
-    // PhanPluginSuspiciousParamOrderInternal : 10+ occurrences
+    // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
     // PhanTypeArraySuspiciousNull : 10+ occurrences
-    // PhanTypeInvalidUnaryOperandNumeric : 10+ occurrences
-    // PhanRedefineFunctionInternal : 9 occurrences
-    // PhanPluginUnsafeEval : 7 occurrences
+    // PhanTypeInvalidUnaryOperandNumeric : 8 occurrences
     // PhanPluginDuplicateIfCondition : 6 occurrences
-    // PhanUndeclaredTypeParameter : 6 occurrences
+    // PhanRedefineFunctionInternal : 6 occurrences
+    // PhanPluginUnsafeEval : 5 occurrences
+    // PhanParamSuspiciousOrder : 4 occurrences
     // PhanParamTooMany : 4 occurrences
-    // PhanPluginDuplicateArrayKey : 4 occurrences
-    // PhanPluginInvalidPregRegexReplacement : 4 occurrences
+    // PhanPluginSuspiciousParamOrder : 4 occurrences
     // PhanUndeclaredFunctionInCallable : 4 occurrences
-    // PhanNoopArrayAccess : 2 occurrences
-    // PhanTypeMismatchForeach : 2 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanAccessPropertyStaticAsNonStatic : 1 occurrence
     // PhanNoopArray : 1 occurrence
+    // PhanNoopArrayAccess : 1 occurrence
     // PhanNoopStringLiteral : 1 occurrence
-    // PhanParamTooFew : 1 occurrence
-    // PhanPowerOfZero : 1 occurrence
-    // PhanUnextractableAnnotationSuffix : 1 occurrence
+    // PhanPluginAlwaysReturnFunction : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'htdocs/accountancy/admin/account.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/accountancy/class/bookkeeping.class.php' => ['PhanUndeclaredTypeParameter'],
-        'htdocs/accountancy/class/lettering.class.php' => ['PhanParamSuspiciousOrder'],
-        'htdocs/accountancy/customer/lines.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/accountancy/customer/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/accountancy/expensereport/lines.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/accountancy/expensereport/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/accountancy/journal/purchasesjournal.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/accountancy/journal/sellsjournal.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/accountancy/supplier/lines.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/accountancy/supplier/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/adherents/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
-        'htdocs/adherents/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/adherents/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/adherents/stats/geo.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/adherents/subscription.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/adherents/type.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/admin/agenda_extsites.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/admin/dict.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/admin/emailcollector_card.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/admin/mails_templates.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
         'htdocs/admin/receiptprinter.php' => ['PhanRedefineFunctionInternal'],
-        'htdocs/admin/system/database.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/admin/system/modules.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/admin/tools/listevents.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/admin/translation.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/admin/triggers.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/api/class/api.class.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanUnreferencedUseNormal'],
+        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/bom/bom_list.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
-        'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/collab/index.php' => ['PhanParamTooMany'],
-        'htdocs/comm/action/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/comm/action/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/comm/action/index.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeArraySuspiciousNull', 'PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/comm/action/pertype.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/comm/action/peruser.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/comm/action/rapport/index.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/comm/mailing/advtargetemailing.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/mailing/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/comm/mailing/cibles.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/comm/mailing/cibles.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/mailing/info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/propal/list.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/commande/list.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
-        'htdocs/commande/list_det.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/commande/list.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/compta/accounting-files.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/compta/bank/bankentries_list.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/compta/bank/various_payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/bank/various_payment/info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/compta/cashcontrol/class/cashcontrol.class.php' => ['PhanUndeclaredTypeParameter'],
-        'htdocs/compta/deplacement/class/deplacementstats.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/compta/facture/agenda-rec.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/facture/card.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/facture/class/facture.class.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/compta/facture/invoicetemplate_list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/compta/facture/list.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginSuspiciousParamOrder'],
-        'htdocs/compta/facture/prelevement.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/paiement/cheque/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/compta/paiement/class/paiement.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/compta/paiement/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/compta/prelevement/card.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/compta/facture/list.php' => ['PhanPluginDuplicateIfCondition'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/prelevement/fiche-rejet.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/compta/sociales/class/paymentsocialcontribution.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/sociales/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/sociales/info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/sociales/list.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/compta/sociales/note.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/tva/document.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/tva/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/compta/tva/payments.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/actions_massactions.inc.php' => ['PhanParamTooFew', 'PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/actions_massactions.inc.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/class/commonobject.class.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/class/commonstickergenerator.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/class/dolreceiptprinter.class.php' => ['PhanUnreferencedUseNormal'],
         'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanNoopArray'],
         'htdocs/core/class/rssparser.class.php' => ['PhanPluginDuplicateIfStatements', 'PhanUndeclaredFunctionInCallable'],
-        'htdocs/core/class/translate.class.php' => ['PhanTypeMismatchForeach'],
-        'htdocs/core/class/utils.class.php' => ['PhanPluginSuspiciousParamPosition', 'PhanUnextractableAnnotationSuffix'],
         'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch', 'PhanPluginDuplicateIfStatements'],
         'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/filemanagerdol/connectors/php/connector.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/company.lib.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginDuplicateIfCondition','PhanDeprecatedFunctionInternal'],
+        'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginDuplicateIfCondition'],
         'htdocs/core/lib/ftp.lib.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginDuplicateIfCondition', 'PhanPluginInvalidPregRegexReplacement', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
-        'htdocs/core/lib/functions2.lib.php' => ['PhanParamSuspiciousOrder', 'PhanPluginUnsafeEval'],
-        'htdocs/core/lib/json.lib.php' => ['PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
-        'htdocs/core/lib/modulebuilder.lib.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginDuplicateIfCondition', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
         'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/usergroups.lib.php' => ['PhanNoopArrayAccess'],
-        'htdocs/core/lib/website.lib.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/login/functions_ldap.php' => ['PhanPluginSuspiciousParamOrderInternal'],
         'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
         'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
         'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
-        'htdocs/core/modules/bank/doc/pdf_ban.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanUndeclaredTypeParameter'],
-        'htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/modules/cheque/doc/pdf_blochet.class.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanUndeclaredTypeParameter'],
-        'htdocs/core/modules/expedition/doc/pdf_espadon.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/core/modules/expedition/doc/pdf_merou.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/expedition/doc/pdf_rouget.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/expensereport/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/hrm/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal', 'PhanTypeArraySuspiciousNull'],
-        'htdocs/core/modules/oauth/generic_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/oauth/google_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/oauth/microsoft_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/oauth/stripelive_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/oauth/stripetest_oauthcallback.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/printing/printgcp.modules.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/project/doc/pdf_baleine.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/project/doc/pdf_beluga.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/core/modules/rapport/pdf_paiement.class.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/modules/societe/mod_codecompta_aquarium.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanPluginDuplicateIfCondition'],
-        'htdocs/core/modules/stock/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanUndeclaredTypeParameter'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder', 'PhanPluginDuplicateArrayKey'],
+        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/tpl/objectline_create.tpl.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/debugbar/class/DataCollector/DolPhpCollector.php' => ['PhanPowerOfZero'],
-        'htdocs/debugbar/class/DataCollector/DolQueryCollector.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/debugbar/class/DataCollector/DolibarrCollector.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/don/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/don/class/api_donations.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/don/class/don.class.php' => ['PhanParamTooMany', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/don/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/don/paiement/list.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/ecm/index_auto.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUnreferencedUseNormal'],
-        'htdocs/eventorganization/class/conferenceorbooth.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/expedition/list.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/expensereport/card.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/expensereport/class/expensereportstats.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/expensereport/payment/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/exports/export.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/exports/index.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/fichinter/card-rec.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/fichinter/list.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/fourn/commande/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/fourn/facture/card.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/fourn/facture/list-rec.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/fourn/facture/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/fourn/paiement/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/holiday/view_log.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/imports/import.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/imports/index.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/install/fileconf.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
         'htdocs/loan/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
@@ -242,86 +111,23 @@ return [
         'htdocs/loan/note.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/loan/payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/loan/schedule.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/main.inc.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/margin/agentMargins.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/margin/checkMargins.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/margin/customerMargins.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/margin/productMargins.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/margin/tabs/thirdpartyMargins.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/master.inc.php' => ['PhanRedefineFunctionInternal'],
-        'htdocs/modulebuilder/index.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/mrp/class/mo.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
-        'htdocs/product/agenda.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/product/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/product/class/product.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/product/inventory/inventory.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/product/popuprop.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/product/price.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
         'htdocs/product/stats/card.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/product/stats/commande.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/commande_fournisseur.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/contrat.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/facture.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/facture_fournisseur.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/facturerec.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/mo.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/propal.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stats/supplier_proposal.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/product/stock/movement_list.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/product/stock/product.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stock/stats/expedition.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stock/stats/mo.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/product/stock/stats/reception.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/projet/list.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/projet/tasks/time.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/public/bookcal/index.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/public/payment/newpayment.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/public/webportal/tpl/menu.tpl.php' => ['PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/public/webportal/webportal.main.inc.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/public/website/index.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/reception/list.php' => ['PhanNoopArrayAccess', 'PhanPluginSuspiciousParamOrder'],
-        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamOrderInternal'],
-        'htdocs/salaries/class/salary.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/salaries/list.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/societe/class/societe.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/societe/list.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/societe/notify/card.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/societe/paymentmodes.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/societe/price.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/ticket/class/ticketstats.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/ticket/list.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/user/agenda_extsites.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/user/bank.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/user/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/user/class/user.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/user/list.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/user/notify/card.php' => ['PhanPluginSuspiciousParamOrder', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/variants/class/ProductAttribute.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/webportal/class/html.formwebportal.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/webportal/controllers/default.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/document.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/invoicelist.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/login.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/membercard.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/orderlist.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/partnershipcard.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/webportal/controllers/propallist.controller.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/website/class/website.class.php' => ['PhanPluginSuspiciousParamOrder', 'PhanTypeArraySuspiciousNull'],
-        'htdocs/website/index.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/website/samples/wrapper.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/json.lib.php' => ['PhanCompatibleNegativeStringOffset'],
+        'internal' => ['PhanUndeclaredConstant'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
     // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)

From 9cc3476765c5590ae19938ef9a4b522f519ca237 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:27:09 +0100
Subject: [PATCH 0575/1862] Fix: PHPDoc annotations in unappropriate comment
 (#28713)

* Fix: PHPDoc annotations in unappropriate comment

# Fix: PHPDoc annotations in unappropriate comment

PHPDoc annotations need to be in /** */ or // comments.
Fixed that (change type, move comment, add suppress directive)

* Fix: PHPDoc annotations in unappropriate comment

# Fix: PHPDoc annotations in unappropriate comment

PHPDoc annotations need to be in /** */ or // comments.
Fixed that (change type, move comment, add suppress directive)

* Fix: PHPDoc annotations in unappropriate comment

# Fix: PHPDoc annotations in unappropriate comment

PHPDoc annotations need to be in /** */ or // comments.
Fixed that (change type, move comment, add suppress directive)

* Fix: PHPDoc annotations in unappropriate comment

# Fix: PHPDoc annotations in unappropriate comment

PHPDoc annotations need to be in /** */ or // comments.
Fixed that (change type, move comment, add suppress directive)

* Update dolreceiptprinter.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/api/admin/explorer_withredoc.php       |  4 +--
 .../class/bonprelevement.class.php            | 34 +++++++++----------
 htdocs/core/class/dolreceiptprinter.class.php |  6 ++--
 htdocs/core/class/rssparser.class.php         | 16 ++++-----
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/htdocs/api/admin/explorer_withredoc.php b/htdocs/api/admin/explorer_withredoc.php
index 8c94e7a6f62..fa370d54c9c 100644
--- a/htdocs/api/admin/explorer_withredoc.php
+++ b/htdocs/api/admin/explorer_withredoc.php
@@ -14,14 +14,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- * @deprecated      Old explorer. Not using Swagger. See instead explorer in htdocs/api/index.php.
  */
 
 /**
  * 	\defgroup   api     Module DolibarrApi
  *  \brief      API explorer using the swagger.json file
  *  \file       htdocs/api/admin/explorer_withredoc.php
+ *
+ * @deprecated      Old explorer. Not using Swagger. See instead explorer in htdocs/api/index.php.
  */
 
 require_once '../../main.inc.php';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 9b3b16b60fc..abda85280a0 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -92,7 +92,7 @@ class BonPrelevement extends CommonObject
 	 */
 	public $file;
 
-	/*
+	/**
 	 * @var string filename
 	 */
 	public $filename;
@@ -146,21 +146,21 @@ class BonPrelevement extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
-		'ref' => array('type'=>'varchar(12)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax150', 'showoncombobox'=>'1',),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>25, 'notnull'=>0, 'visible'=>-1,),
-		'amount' => array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1,),
-		'statut' => array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>'1', 'position'=>500, 'notnull'=>0, 'visible'=>-1, 'arrayofkeyval'=>array(0=>'Wait', 1=>'Transfered', 2=>'Credited')),
-		'credite' => array('type'=>'smallint(6)', 'label'=>'Credite', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1,),
-		'note' => array('type'=>'text', 'label'=>'Note', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>-1,),
-		'date_trans' => array('type'=>'datetime', 'label'=>'Datetrans', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
-		'method_trans' => array('type'=>'smallint(6)', 'label'=>'Methodtrans', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1,),
-		'fk_user_trans' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusertrans', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
-		'date_credit' => array('type'=>'datetime', 'label'=>'Datecredit', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-1,),
-		'fk_user_credit' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusercredit', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
-		'type' => array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>'1', 'position'=>75, 'notnull'=>0, 'visible'=>-1,),
-		'fk_bank_account' => array('type'=>'integer', 'label'=>'Fkbankaccount', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx',),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
+		'ref' => array('type' => 'varchar(12)', 'label' => 'Ref', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax150', 'showoncombobox' => '1',),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 25, 'notnull' => 0, 'visible' => -1,),
+		'amount' => array('type' => 'double(24,8)', 'label' => 'Amount', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => -1,),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => '1', 'position' => 500, 'notnull' => 0, 'visible' => -1, 'arrayofkeyval' => array(0 => 'Wait', 1 => 'Transfered', 2 => 'Credited')),
+		'credite' => array('type' => 'smallint(6)', 'label' => 'Credite', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => -1,),
+		'note' => array('type' => 'text', 'label' => 'Note', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => -1,),
+		'date_trans' => array('type' => 'datetime', 'label' => 'Datetrans', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => -1,),
+		'method_trans' => array('type' => 'smallint(6)', 'label' => 'Methodtrans', 'enabled' => '1', 'position' => 55, 'notnull' => 0, 'visible' => -1,),
+		'fk_user_trans' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusertrans', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'date_credit' => array('type' => 'datetime', 'label' => 'Datecredit', 'enabled' => '1', 'position' => 65, 'notnull' => 0, 'visible' => -1,),
+		'fk_user_credit' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusercredit', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'type' => array('type' => 'varchar(16)', 'label' => 'Type', 'enabled' => '1', 'position' => 75, 'notnull' => 0, 'visible' => -1,),
+		'fk_bank_account' => array('type' => 'integer', 'label' => 'Fkbankaccount', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
 	);
 	public $rowid;
 	public $ref;
@@ -1565,7 +1565,7 @@ class BonPrelevement extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('banktransferdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 4d8c8b0f785..bc5d8fc9d4e 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -129,7 +129,7 @@ class dolReceiptPrinter extends Printer
 	 */
 	public $db;
 
-	/*
+	/**
 	 * @var string[] array of tags
 	 */
 	public $tags;
@@ -800,7 +800,7 @@ class dolReceiptPrinter extends Printer
 						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_CURR_DATE':
-						if (strlen($vals[$tplline]['value'])<2) {
+						if (strlen($vals[$tplline]['value']) < 2) {
 							$this->printer->text(date('d/m/Y H:i:s')."\n");
 						} else {
 							$this->printer->text(date($vals[$tplline]['value'])."\n");
@@ -1056,7 +1056,7 @@ class dolReceiptPrinter extends Printer
 							$this->connector = new CupsPrintConnector($parameter);
 							break;
 						default:
-							$found = false;;
+							$found = false;
 							break;
 					}
 					if ($found) {
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index d8ae597f9d3..c16cc2d3007 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -503,13 +503,13 @@ class RssParser
 
 					// Add record to result array
 					$this->_rssarray[$i] = array(
-						'link'=>$itemLink,
-						'title'=>$itemTitle,
-						'description'=>$itemDescription,
-						'pubDate'=>$itemPubDate,
-						'category'=>$itemCategory,
-						'id'=>$itemId,
-						'author'=>$itemAuthor
+						'link' => $itemLink,
+						'title' => $itemTitle,
+						'description' => $itemDescription,
+						'pubDate' => $itemPubDate,
+						'category' => $itemCategory,
+						'id' => $itemId,
+						'author' => $itemAuthor
 					);
 					//var_dump($this->_rssarray);
 
@@ -812,7 +812,7 @@ class RssParser
 	}
 }
 
-
+// @phan-suppress PhanPluginPHPDocInWrongComment
 /*
  * A method for the xml_set_external_entity_ref_handler()
  *

From d846044e386fa87732181e5191dc1db8474dcdcc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:30:04 +0100
Subject: [PATCH 0576/1862] Fix: $form argument to price() must be int (#28699)

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0

* Fix: $form argument to price() must be int

# Fix: $form argument to price() must be int

Changed '' for $form into 0
---
 htdocs/comm/propal/card.php                   | 30 +++++++-------
 htdocs/comm/propal/list.php                   |  4 +-
 htdocs/commande/card.php                      | 40 +++++++++----------
 htdocs/commande/list.php                      |  4 +-
 htdocs/commande/list_det.php                  |  4 +-
 htdocs/compta/bank/releve.php                 |  4 +-
 htdocs/compta/facture/card-rec.php            | 14 +++----
 htdocs/compta/facture/card.php                | 26 ++++++------
 htdocs/compta/facture/list.php                |  4 +-
 htdocs/compta/facture/prelevement.php         |  6 +--
 htdocs/compta/paiement/card.php               |  6 +--
 htdocs/compta/paymentbybanktransfer/index.php |  4 +-
 htdocs/compta/prelevement/index.php           |  2 +-
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/class/html.formmargin.class.php   | 12 +++---
 htdocs/don/card.php                           |  4 +-
 .../conferenceorbooth_card.php                |  2 +-
 .../conferenceorbooth_contact.php             |  2 +-
 .../conferenceorbooth_document.php            |  2 +-
 .../conferenceorbooth_list.php                |  2 +-
 .../conferenceorboothattendee_card.php        |  2 +-
 .../conferenceorboothattendee_list.php        |  2 +-
 htdocs/expedition/shipment.php                |  8 ++--
 htdocs/fourn/commande/card.php                | 20 +++++-----
 htdocs/fourn/facture/card-rec.php             |  6 +--
 htdocs/fourn/facture/card.php                 | 12 +++---
 htdocs/fourn/paiement/card.php                |  2 +-
 htdocs/fourn/paiement/document.php            |  2 +-
 htdocs/product/composition/card.php           |  8 ++--
 htdocs/projet/comment.php                     |  2 +-
 htdocs/projet/element.php                     |  6 +--
 htdocs/projet/ganttview.php                   |  2 +-
 htdocs/projet/tasks.php                       |  2 +-
 htdocs/projet/tasks/comment.php               |  2 +-
 htdocs/projet/tasks/contact.php               |  2 +-
 htdocs/projet/tasks/document.php              |  2 +-
 htdocs/projet/tasks/note.php                  |  2 +-
 htdocs/projet/tasks/task.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  2 +-
 htdocs/societe/card.php                       | 23 ++++++-----
 htdocs/supplier_proposal/card.php             | 20 +++++-----
 htdocs/user/bank.php                          |  6 +--
 htdocs/user/card.php                          | 10 ++---
 43 files changed, 160 insertions(+), 159 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7a3b3c13cba..6d6ac13c58d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -834,7 +834,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'import_lines_from_object'
 		&& $user->hasRight('propal', 'creer')
 		&& $object->statut == Propal::STATUS_DRAFT
-		) {
+	) {
 		// add lines from objectlinked
 		$fromElement = GETPOST('fromelement');
 		$fromElementid = GETPOST('fromelementid');
@@ -964,7 +964,7 @@ if (empty($reshook)) {
 		// Define margin
 		$margin_rate = (GETPOST('marginforalllines') ? GETPOST('marginforalllines') : 0);
 		foreach ($object->lines as &$line) {
-			$subprice = price2num($line->pa_ht * (1 + $margin_rate/100), 'MU');
+			$subprice = price2num($line->pa_ht * (1 + $margin_rate / 100), 'MU');
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
 			if ($prod->price_min > $subprice) {
@@ -1083,7 +1083,7 @@ if (empty($reshook)) {
 			$pu_ttc_devise = 0;
 			$price_min = 0;
 			$price_min_ttc = 0;
-			$tva_npr=0;
+			$tva_npr = 0;
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			$db->begin();
@@ -1245,8 +1245,8 @@ if (empty($reshook)) {
 				}
 
 				//If text set in desc is the same as product description (as now it's preloaded) we add it only one time
-				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
-					$product_desc='';
+				if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
+					$product_desc = '';
 				}
 
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
@@ -2884,35 +2884,35 @@ if ($action == 'create') {
 
 		print '<tr>';
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
 			if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 				print '<tr>';
 				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
 				}
 				print '</tr>';
 			}
@@ -2920,9 +2920,9 @@ if ($action == 'create') {
 
 		print '<tr>';
 		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 0a03d0cc1cd..2bc33b37f3f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -2256,14 +2256,14 @@ if ($search_date_signature_endyear) {
 			}
 			// Total margin rate
 			if (!empty($arrayfields['total_margin_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			// Total mark rate
 			if (!empty($arrayfields['total_mark_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 92621cdfcac..9722ca53344 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -933,8 +933,8 @@ if (empty($reshook)) {
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
-				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
-					$product_desc='';
+				if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
+					$product_desc = '';
 				}
 
 				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
@@ -1523,7 +1523,7 @@ if (empty($reshook)) {
 	if ($action == 'import_lines_from_object'
 		&& $usercancreate
 		&& $object->statut == Commande::STATUS_DRAFT
-	  ) {
+	) {
 		$fromElement = GETPOST('fromelement');
 		$fromElementid = GETPOST('fromelementid');
 		$importLines = GETPOST('line_checkbox');
@@ -2782,19 +2782,19 @@ if ($action == 'create' && $usercancreate) {
 
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				// Multicurrency Amount HT
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				// Multicurrency Amount VAT
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
@@ -2802,9 +2802,9 @@ if ($action == 'create' && $usercancreate) {
 			if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 				print '<tr>';
 				print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-					print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 				}
 				print '</tr>';
 
@@ -2812,9 +2812,9 @@ if ($action == 'create' && $usercancreate) {
 				if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 					print '<tr>';
 					print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 					if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-						print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+						print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 					}
 					print '</tr>';
 				}
@@ -2963,7 +2963,7 @@ if ($action == 'create' && $usercancreate) {
 				$arrayforbutaction = array();
 
 				// Create a purchase order
-				$arrayforbutaction[] = array('lang'=>'orders', 'enabled'=>(isModEnabled("supplier_order") && $object->statut > Commande::STATUS_DRAFT && $object->getNbOfServicesLines() > 0), 'perm'=>$usercancreatepurchaseorder, 'label'=>'AddPurchaseOrder', 'url'=>'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id);
+				$arrayforbutaction[] = array('lang' => 'orders', 'enabled' => (isModEnabled("supplier_order") && $object->statut > Commande::STATUS_DRAFT && $object->getNbOfServicesLines() > 0), 'perm' => $usercancreatepurchaseorder, 'label' => 'AddPurchaseOrder', 'url' => '/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id);
 				/*if (isModEnabled("supplier_order") && $object->statut > Commande::STATUS_DRAFT && $object->getNbOfServicesLines() > 0) {
 					if ($usercancreatepurchaseorder) {
 						print dolGetButtonAction('', $langs->trans('AddPurchaseOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id, '');
@@ -2971,7 +2971,7 @@ if ($action == 'create' && $usercancreate) {
 				}*/
 
 				// Create intervention
-				$arrayforbutaction[] = array('lang'=>'interventions', 'enabled'=>(isModEnabled("intervention") && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0), 'perm'=>$user->hasRight('ficheinter', 'creer'), 'label'=>'AddIntervention', 'url'=>'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
+				$arrayforbutaction[] = array('lang' => 'interventions', 'enabled' => (isModEnabled("intervention") && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0), 'perm' => $user->hasRight('ficheinter', 'creer'), 'label' => 'AddIntervention', 'url' => '/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
 				/*if (isModEnabled('ficheinter')) {
 					$langs->load("interventions");
 
@@ -2985,7 +2985,7 @@ if ($action == 'create' && $usercancreate) {
 				}*/
 
 				// Create contract
-				$arrayforbutaction[] = array('lang'=>'contracts', 'enabled'=>(isModEnabled("contract") && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)), 'perm'=>$user->hasRight('contrat', 'creer'), 'label'=>'AddContract', 'url'=>'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
+				$arrayforbutaction[] = array('lang' => 'contracts', 'enabled' => (isModEnabled("contract") && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)), 'perm' => $user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url' => '/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
 				/*if (isModEnabled('contrat') && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
 					$langs->load("contracts");
 
@@ -3002,7 +3002,7 @@ if ($action == 'create' && $usercancreate) {
 				// Create shipment
 				if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 					if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'creer')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer'))) {
-						$arrayforbutaction[] = array('lang'=>'sendings', 'enabled'=>(isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm'=>$user->hasRight('expedition', 'creer'), 'label'=>'CreateShipment', 'url'=>'/expedition/shipment.php?id='.$object->id);
+						$arrayforbutaction[] = array('lang' => 'sendings', 'enabled' => (isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm' => $user->hasRight('expedition', 'creer'), 'label' => 'CreateShipment', 'url' => '/expedition/shipment.php?id='.$object->id);
 						/*
 						if ($user->hasRight('expedition', 'creer')) {
 						print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
@@ -3017,11 +3017,11 @@ if ($action == 'create' && $usercancreate) {
 
 				// Create bill
 				$arrayforbutaction[] = array(
-					'lang'=>'bills',
-					'enabled'=>(isModEnabled('invoice') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
-					'perm'=>($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
-					'label'=>'CreateBill',
-					'url'=>'/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.urlencode($object->element).'&amp;originid='.$object->id.'&amp;socid='.$object->socid
+					'lang' => 'bills',
+					'enabled' => (isModEnabled('invoice') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
+					'perm' => ($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
+					'label' => 'CreateBill',
+					'url' => '/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.urlencode($object->element).'&amp;originid='.$object->id.'&amp;socid='.$object->socid
 				);
 				/*
 				 if (isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ea017fbef3b..b84de3413f5 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -2554,7 +2554,7 @@ while ($i < $imaxinloop) {
 
 		// Total margin rate
 		if (!empty($arrayfields['total_margin_rate']['checked'])) {
-			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -2562,7 +2562,7 @@ while ($i < $imaxinloop) {
 
 		// Total mark rate
 		if (!empty($arrayfields['total_mark_rate']['checked'])) {
-			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 3c0f25f74ac..0eec5b4bb58 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1997,14 +1997,14 @@ if ($resql) {
 		}
 		// Total margin rate
 		if (!empty($arrayfields['total_margin_rate']['checked'])) {
-			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
 		// Total mark rate
 		if (!empty($arrayfields['total_mark_rate']['checked'])) {
-			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 97e855217a6..56eb4e93a6c 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -387,7 +387,7 @@ if (empty($numref)) {
 					$balancestart[$objp->numr] = $obj->amount;
 					$db->free($resql);
 				}
-				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
+				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], 0, $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
 
 				// Calculate end amount
 				$sql = "SELECT sum(b.amount) as amount";
@@ -400,7 +400,7 @@ if (empty($numref)) {
 					$content[$objp->numr] = $obj->amount;
 					$db->free($resql);
 				}
-				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
+				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), 0, $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
 
 				print '<td class="center">';
 				if ($user->hasRight('banque', 'consolidate') && $action != 'editbankreceipt') {
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index ab544c4ff70..954b0eb3077 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1129,7 +1129,7 @@ if ($action == 'create') {
 		// Frequency + unit
 		print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
 		print "<input type='text' name='frequency' value='".GETPOSTINT('frequency')."' size='4' />&nbsp;";
-		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
+		print $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
 		// Date next run
@@ -1145,14 +1145,14 @@ if ($action == 'create') {
 
 		// Auto validate the invoice
 		print "<tr><td>".$langs->trans("StatusOfAutoGeneratedInvoices")."</td><td>";
-		$select = array('0'=>$langs->trans('BillStatusDraft'), '1'=>$langs->trans('BillStatusValidated'));
+		$select = array('0' => $langs->trans('BillStatusDraft'), '1' => $langs->trans('BillStatusValidated'));
 		print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
 		print "</td></tr>";
 
 		// Auto generate document
 		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 			print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
-			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
+			$select = array('0' => $langs->trans('DoNotGenerateDoc'), '1' => $langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
 		} else {
@@ -1308,11 +1308,11 @@ if ($action == 'create') {
 
 		// Amount (excl. tax)
 		print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-		print '<td>'.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+		print '<td>'.price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
 		// Amount tax
-		print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+		print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
 		// Amount Local Taxes
@@ -1325,7 +1325,7 @@ if ($action == 'create') {
 			print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 
-		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
 
@@ -1543,7 +1543,7 @@ if ($action == 'create') {
 			print '<table class="nobordernopadding">';
 			print '<tr><td>';
 			print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;";
-			print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
+			print $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 7127c824434..9d277f17bc3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1625,7 +1625,7 @@ if (empty($reshook)) {
 								$descline = '(DEPOSIT)';
 								//$descline.= ' - '.$langs->trans($arraylist[$typeamount]);
 								if ($typeamount == 'amount') {
-									$descline .= ' ('.price($valuedeposit, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).')';
+									$descline .= ' ('.price($valuedeposit, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).')';
 								} elseif ($typeamount == 'variable') {
 									$descline .= ' ('.$valuedeposit.'%)';
 								}
@@ -3356,12 +3356,12 @@ if ($action == 'create') {
 			$arrayoutstandingbills = $soc->getOutstandingBills();
 			$outstandingBills = $arrayoutstandingbills['opened'];
 			print ' - <span class="opacitymedium">'.$langs->trans('CurrentOutstandingBill').':</span> ';
-			print '<span class="amount">'.price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency).'</span>';
+			print '<span class="amount">'.price($outstandingBills, 0, $langs, 0, 0, -1, $conf->currency).'</span>';
 			if ($soc->outstanding_limit != '') {
 				if ($outstandingBills > $soc->outstanding_limit) {
 					print img_warning($langs->trans("OutstandingBillReached"));
 				}
-				print ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+				print ' / '.price($soc->outstanding_limit, 0, $langs, 0, 0, -1, $conf->currency);
 			}
 			print '</td>';
 			print '</tr>'."\n";
@@ -4987,20 +4987,20 @@ if ($action == 'create') {
 		print '<tr>';
 		// Amount HT
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($sign * $object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
-			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
 		// Amount VAT
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($sign * $object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount VAT
-			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
@@ -5008,18 +5008,18 @@ if ($action == 'create') {
 		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
 			if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {
 				print '<tr>';
 				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-					print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 				}
 				print '</tr>';
 			}
@@ -5082,10 +5082,10 @@ if ($action == 'create') {
 		print '<tr>';
 		// Amount TTC
 		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($sign * $object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount TTC
-			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6155dfd9c8a..e897ebd198b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -2614,14 +2614,14 @@ if ($num > 0) {
 			}
 			// Total margin rate
 			if (!empty($arrayfields['total_margin_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			// Total mark rate
 			if (!empty($arrayfields['total_mark_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 7912337feeb..33ec278f646 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -640,17 +640,17 @@ if ($object->id > 0) {
 	if (isModEnabled('multicurrency') && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_ht, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount VAT
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_tva, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount TTC
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_ttc, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 	}
 
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 34b08386bca..535d07b84dd 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -97,7 +97,7 @@ $error = 0;
 /*
  * Actions
  */
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -314,7 +314,7 @@ print $object->num_payment ? ' - '.$object->num_payment : '';
 print '</td></tr>';
 
 // Amount
-print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, '', $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 
 $disable_delete = 0;
 // Bank account
@@ -563,7 +563,7 @@ if ($resql) {
 			// Status
 			print '<td class="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
 
-			$parameters = array('fk_paiement'=> (int) $object->id);
+			$parameters = array('fk_paiement' => (int) $object->id);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
 			print "</tr>\n";
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 8848d70c325..9b42490727d 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -113,7 +113,7 @@ if (isModEnabled('salaries')) {
 
 print '<tr class="oddeven"><td>'.$langs->trans("Total").'</td>';
 print '<td class="right"><span class="amount nowraponall">';
-print price($totaltoshow, '', '', 1, -1, -1, 'auto');
+print price($totaltoshow, 0, '', 1, -1, -1, 'auto');
 print '</span></td></tr></table></div><br>';
 
 
@@ -226,7 +226,7 @@ if (isModEnabled('salaries')) {
 		print '<th colspan="5">'.$langs->trans("SalaryInvoiceWaitingWithdraw").' <span class="opacitymedium">('.$numRow.')</span></th></tr>';
 
 		if ($numRow) {
-			while ($j < $numRow && $j<10) {
+			while ($j < $numRow && $j < 10) {
 				$objSalary = $db->fetch_object($resql2);
 
 				$user->fetch($objSalary->fk_user);
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index b8c75847372..e123c7692f6 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -93,7 +93,7 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
 print '<td class="right"><span class="amount">';
-print price($bprev->SommeAPrelever('direct-debit'), '', '', 1, -1, -1, 'auto');
+print price($bprev->SommeAPrelever('direct-debit'), 0, '', 1, -1, -1, 'auto');
 print '</span></td></tr></table></div><br>';
 
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 630602e2c75..4a43106e8dc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -349,7 +349,7 @@ class Form
 				} elseif (preg_match('/^url/', $typeofdata)) {
 					$ret .= dol_print_url($value, '_blank', 32, 1);
 				} elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
-					$ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+					$ret .= ($value != '' ? price($value, 0, $langs, 0, -1, -1, $conf->currency) : '');
 				} elseif (preg_match('/^checkbox/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata);
 					$ret .= '<input type="checkbox" disabled id="' . $htmlname . '" name="' . $htmlname . '" value="' . $value . '"' . ($value ? ' checked' : '') . ($tmp[1] ? $tmp[1] : '') . '/>';
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 1d3e3330032..c99648c9993 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -272,10 +272,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pa_products']) . '</td>';
 				print '<td class="right">' . price($marginInfo['margin_on_products']) . '</td>';
 				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
 			}
@@ -287,10 +287,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pa_services']) . '</td>';
 				print '<td class="right">' . price($marginInfo['margin_on_services']) . '</td>';
 				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
 			}
@@ -302,10 +302,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pa_total']) . '</td>';
 				print '<td class="right">' . price($marginInfo['total_margin']) . '</td>';
 				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
 			}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index d925aa68368..06546f208d1 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -453,12 +453,12 @@ if ($action == 'create') {
 			$arrayoutstandingbills = $soc->getOutstandingBills();
 			$outstandingBills = $arrayoutstandingbills['opened'];
 			print ' ('.$langs->trans('CurrentOutstandingBill').': ';
-			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
+			print price($outstandingBills, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($soc->outstanding_limit != '') {
 				if ($outstandingBills > $soc->outstanding_limit) {
 					print img_warning($langs->trans("OutstandingBillReached"));
 				}
-				print ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+				print ' / '.price($soc->outstanding_limit, 0, $langs, 0, 0, -1, $conf->currency);
 			}
 			print ')';
 			print '</td>';
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 06fb0af4299..77ee9b6abd5 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -273,7 +273,7 @@ if (!empty($withproject)) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($projectstatic->budget_amount, '')) {
-		print '<span class="amount">'.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+		print '<span class="amount">'.price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index bb19456cd2c..201dc52710b 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -261,7 +261,7 @@ if (!empty($withproject)) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($projectstatic->budget_amount, '')) {
-		print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 16ab981af3b..788128a6906 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -234,7 +234,7 @@ if (!empty($withproject)) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($projectstatic->budget_amount, '')) {
-		print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index a2b370ba6f4..9ee0be54b58 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -389,7 +389,7 @@ if ($projectid > 0) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($project->budget_amount, '')) {
-		print '<span class="amount">'.price($project->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+		print '<span class="amount">'.price($project->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index a83218f0a12..b57b5180bf5 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -309,7 +309,7 @@ if (!empty($withproject)) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($projectstatic->budget_amount, '')) {
-		print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index afb8f29d942..cbaf93a8f45 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -488,7 +488,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (strcmp($projectstatic->budget_amount, '')) {
-			print '<span class="amount">'.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+			print '<span class="amount">'.price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 7a3347098ab..fe20c6ed008 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -547,17 +547,17 @@ if ($id > 0 || !empty($ref)) {
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
 			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_ht, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 
 			// Multicurrency Amount VAT
 			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-			print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_tva, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 
 			// Multicurrency Amount TTC
 			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-			print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_ttc, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 		}
 
@@ -772,7 +772,7 @@ if ($id > 0 || !empty($ref)) {
 
 					// Qty remains to ship
 					print '<td class="center">';
-					if ($type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')|| getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
+					if ($type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0171b5d597d..85de2e7fb6f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2340,20 +2340,20 @@ if ($action == 'create') {
 		print '<tr>';
 		// Amount HT
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
 		// Amount VAT
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount VAT
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
@@ -2361,18 +2361,18 @@ if ($action == 'create') {
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
 			if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 				print '<tr>';
 				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 				}
 				print '</tr>';
 			}
@@ -2386,10 +2386,10 @@ if ($action == 'create') {
 		print '<tr>';
 		// Amount TTC
 		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . $alert . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . $alert . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount TTC
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index d4581c706b3..c3d748e81d1 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -1205,10 +1205,10 @@ if ($action == 'create') {
 		print '</tr>';
 
 		print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
-		print '<td>' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td>' . price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 		print '</tr>';
 
-		print '<tr><td>' . $langs->trans("AmountVAT") . '</td><td>' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<tr><td>' . $langs->trans("AmountVAT") . '</td><td>' . price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 		print '</tr>';
 
 		// Amount Local Taxes
@@ -1221,7 +1221,7 @@ if ($action == 'create') {
 			print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency) . '</td></tr>';
 		}
 
-		print '<tr><td>' . $langs->trans("AmountTTC") . '</td><td colspan="3">' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<tr><td>' . $langs->trans("AmountTTC") . '</td><td colspan="3">' . price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
 		print '</tr>';
 
 		// Payment term
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c6b9c6457e5..8244ed6e8af 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1224,7 +1224,7 @@ if (empty($reshook)) {
 								$descline = '(DEPOSIT)';
 								//$descline.= ' - '.$langs->trans($arraylist[$typeamount]);
 								if ($typeamount == 'amount') {
-									$descline .= ' ('.price($valuedeposit, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).')';
+									$descline .= ' ('.price($valuedeposit, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).')';
 								} elseif ($typeamount == 'variable') {
 									$descline .= ' ('.$valuedeposit.'%)';
 								}
@@ -3535,9 +3535,9 @@ if ($action == 'create') {
 
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
@@ -3568,7 +3568,7 @@ if ($action == 'create') {
 			print price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
 			print '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
@@ -3587,9 +3587,9 @@ if ($action == 'create') {
 
 			print '<tr>';
 			print '<td>' . $langs->trans('AmountTTC') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 0987ec11c6f..966cde2511b 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -221,7 +221,7 @@ if ($result > 0) {
 
 	// Amount
 	print '<tr><td>'.$langs->trans('Amount').'</td>';
-	print '<td><span class="amount">'.price($object->amount, '', $langs, 0, 0, -1, $conf->currency).'</span></td></tr>';
+	print '<td><span class="amount">'.price($object->amount, 0, $langs, 0, 0, -1, $conf->currency).'</span></td></tr>';
 
 	// Status of validation of payment
 	if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index b407c489822..db152d3eb47 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -126,7 +126,7 @@ if ($object->id > 0) {
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
 	// Amount
-	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
+	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 
 	$allow_delete = 1;
 	// Bank account
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 54310e0d759..0292732aefc 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -446,7 +446,7 @@ if ($id > 0 || !empty($ref)) {
 					$total +=  $totalline;
 
 					print '<td class="right nowraponall">';
-					print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').'<span class="amount">'.price($unitline, '', '', 0, 0, -1, $conf->currency)).'</span>';
+					print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').'<span class="amount">'.price($unitline, 0, '', 0, 0, -1, $conf->currency)).'</span>';
 					print '</td>';
 
 					// Best selling price
@@ -460,7 +460,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<td class="right" colspan="2">';
 					print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : ''));
 					if (is_numeric($pricesell)) {
-						print '<span class="amount">'.price($pricesell, '', '', 0, 0, -1, $conf->currency).'</span>';
+						print '<span class="amount">'.price($pricesell, 0, '', 0, 0, -1, $conf->currency).'</span>';
 					} else {
 						print '<span class="opacitymedium">'.$langs->trans($pricesell).'</span>';
 					}
@@ -567,7 +567,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($atleastonenotdefined) {
 				print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
 			}
-			print($atleastonenotdefined ? '' : price($total, '', '', 0, 0, -1, $conf->currency));
+			print($atleastonenotdefined ? '' : price($total, 0, '', 0, 0, -1, $conf->currency));
 			print '</td>';
 
 			// Minimum selling price
@@ -579,7 +579,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($atleastonenotdefined) {
 				print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
 			}
-			print($atleastonenotdefined ? '' : price($totalsell, '', '', 0, 0, -1, $conf->currency));
+			print($atleastonenotdefined ? '' : price($totalsell, 0, '', 0, 0, -1, $conf->currency));
 			print '</td>';
 
 			// Stock
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 48803930572..299b15c12fa 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -143,7 +143,7 @@ print '</td></tr>';
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
-	print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 }
 print '</td></tr>';
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index dd053b04549..310ecd4704e 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -306,14 +306,14 @@ if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	// Opportunity percent
 	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
 	if (!is_null($object->opp_percent) && strcmp($object->opp_percent, '')) {
-		print price($object->opp_percent, '', $langs, 1, 0).' %';
+		print price($object->opp_percent, 0, $langs, 1, 0).' %';
 	}
 	print '</td></tr>';
 
 	// Opportunity Amount
 	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 	if (!is_null($object->opp_amount) && strcmp($object->opp_amount, '')) {
-		print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+		print '<span class="amount">'.price($object->opp_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 		if (strcmp($object->opp_percent, '')) {
 			print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
 		}
@@ -324,7 +324,7 @@ if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
-	print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+	print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 }
 print '</td></tr>';
 
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 63bbbc3ff6e..6b0e853937f 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -188,7 +188,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
-		print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 4ae290dcf7a..c5b496273f9 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -638,7 +638,7 @@ if ($id > 0 || !empty($ref)) {
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
-		print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+		print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 8363c284ba2..4656f02dbed 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -224,7 +224,7 @@ if ($id > 0 || !empty($ref)) {
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 			if (strcmp($projectstatic->budget_amount, '')) {
-				print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+				print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 			}
 			print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 3ae0f6d39e5..f8cc28e05a2 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -260,7 +260,7 @@ if ($id > 0 || !empty($ref)) {
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 			if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
-				print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+				print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 			}
 			print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 207f331d327..7507cafa4b3 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -217,7 +217,7 @@ if ($object->id > 0) {
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
-			print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 		}
 		print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 5ef996d2ae5..dfd36d12df7 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -207,7 +207,7 @@ if ($object->id > 0) {
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
-			print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 		}
 		print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index d9face5c16a..39a8f5dd7db 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -332,7 +332,7 @@ if ($id > 0 || !empty($ref)) {
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
-			print '<span class="amount">'.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+			print '<span class="amount">'.price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index d4a18ca5fcc..5f079bb44e9 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1009,7 +1009,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Budget
 			print '<tr><td>' . $langs->trans("Budget") . '</td><td>';
 			if (!is_null($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
-				print '<span class="amount">' . price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency) . '</span>';
+				print '<span class="amount">' . price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency) . '</span>';
 			}
 			print '</td></tr>';
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index aa8e03f9d5e..134d68a3eab 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -93,7 +93,8 @@ if (isModEnabled('accounting')) {
 	$langs->load("products");
 }
 
-$error = 0; $errors = array();
+$error = 0;
+$errors = array();
 
 
 // Get parameters
@@ -171,7 +172,7 @@ $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'ro
  * Actions
  */
 
-$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$parameters = array('id' => $socid, 'objcanvas' => $objcanvas);
 $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');
@@ -292,12 +293,12 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT('contact_no_email')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT('contact_no_email') == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (isModEnabled('mailing') && GETPOSTINT("private") == 1 && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT('contact_no_email')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && GETPOSTINT("private") == 1 && getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 && GETPOSTINT('contact_no_email') == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
@@ -1413,7 +1414,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 			// Status
 			print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-			print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+			print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
 			print '</td></tr>';
 
 			// Barcode
@@ -1728,7 +1729,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Other attributes
-			$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+			$parameters = array('socid' => $socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 			// Parent company
@@ -2167,7 +2168,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Status
 				print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-				print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+				print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
 				print '</td></tr>';
 
 				// Address
@@ -2487,7 +2488,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Other attributes
-				$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+				$parameters = array('socid' => $socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 				// Parent company
@@ -2945,9 +2946,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<tr><td>'.$langs->trans('Capital').'</td><td>';
 			if ($object->capital) {
 				if (isModEnabled("multicurrency") && !empty($object->multicurrency_code)) {
-					print price($object->capital, '', $langs, 0, -1, -1, $object->multicurrency_code);
+					print price($object->capital, 0, $langs, 0, -1, -1, $object->multicurrency_code);
 				} else {
-					print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+					print price($object->capital, 0, $langs, 0, -1, -1, $conf->currency);
 				}
 			} else {
 				print '&nbsp;';
@@ -3048,7 +3049,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Other attributes
-			$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+			$parameters = array('socid' => $socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Parent company
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e8fc5bf25d1..f072cf540c4 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1825,20 +1825,20 @@ if ($action == 'create') {
 		print '<tr>';
 		// Amount HT
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
 		// Amount VAT
 		print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount VAT
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
@@ -1846,18 +1846,18 @@ if ($action == 'create') {
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 			print '<tr>';
 			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
 			if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 				print '<tr>';
 				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 				}
 				print '</tr>';
 			}
@@ -1866,10 +1866,10 @@ if ($action == 'create') {
 		print '<tr>';
 		// Amount TTC
 		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
+		print '<td class="nowrap amountcard right">' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount TTC
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 535452175f1..20fa770194a 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -441,7 +441,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		// Salary
 		print '<tr><td>'.$langs->trans("Salary").'</td>';
 		print '<td>';
-		print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
+		print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, 0, $langs, 1, -1, -1, $conf->currency) : '').'</span>';
 		print '</td>';
 		print "</tr>\n";
 
@@ -451,7 +451,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
 		print '</td>';
 		print '<td>';
-		print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+		print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : '');
 		print '</td>';
 		print "</tr>\n";
 
@@ -461,7 +461,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
 		print '</td>';
 		print '<td>';
-		print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+		print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : '');
 		print '</td>';
 		print "</tr>\n";
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 94447146dbf..984bed16d5c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1657,7 +1657,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				// Salary
 				print '<tr><td>'.$langs->trans("Salary").'</td>';
 				print '<td>';
-				print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
+				print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, 0, $langs, 1, -1, -1, $conf->currency) : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 
@@ -1667,7 +1667,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
 				print '</td>';
 				print '<td>';
-				print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+				print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : '');
 				print '</td>';
 				print "</tr>\n";
 
@@ -1677,7 +1677,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
 				print '</td>';
 				print '<td>';
-				print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+				print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : '');
 				print '</td>';
 				print "</tr>\n";
 			}
@@ -2861,7 +2861,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if ($caneditfield) {
 					print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm') ? GETPOST('thm') : $object->thm).'">';
 				} else {
-					print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+					print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : '');
 				}
 				print '</td>';
 				print "</tr>\n";
@@ -2875,7 +2875,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if ($caneditfield) {
 					print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm') ? GETPOST('tjm') : $object->tjm).'">';
 				} else {
-					print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+					print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : '');
 				}
 				print '</td>';
 				print "</tr>\n";

From f309d1634cd4ff4765a8db6bbbfe0182b4f5ace8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:30:46 +0100
Subject: [PATCH 0577/1862] Qual: Better hint for index value for phan (#28712)

# Qual: Better hint for index value for phan.

($i - 1) must be >= 0, so update test from $i>0 to $i>=1 .
This helps static analysis.
---
 htdocs/core/lib/json.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index b5a53c7f888..15f54b75f97 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -267,7 +267,7 @@ function dol_json_decode($json, $assoc = false)
 		} else {
 			$out .= $json[$i];
 		}
-		if ($i > 0 && $json[$i] == '"' && $json[($i - 1)] != "\\") {
+		if ($i >= 1 && $json[$i] == '"' && $json[$i - 1] != "\\") {
 			$comment = !$comment;
 		}
 	}

From 3d0a85608b0cc884d8b593b9c79544c6e21cfc33 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:34:18 +0100
Subject: [PATCH 0578/1862] Qual: Fix and enable alias deprecation detection
 (#28716)

* Qual: Ignore some false positives for deprecated functions

# Qual: Ignore some false positives for deprecated functions

The Phan Deprecation Plugin for internal functions has mixed up some
mail functions and lists them as deprecated, this ignores that

* Qual: Enable detection and fixing of internal deprecations

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Replace 'join' with 'implode'

* Qual: Update codespell lines ignore list after format

# Qual: Update codespell lines ignore list after forma

Done using latest library, so also adds some exceptions that are needed
in the future;

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .../codespell/codespell-lines-ignore.txt      |  16 ++-
 dev/tools/phan/config.php                     |   2 +-
 dev/tools/phan/config_fixer.php               |   6 +-
 htdocs/asset/class/asset.class.php            |  64 +++++-----
 htdocs/asset/class/assetmodel.class.php       |  30 ++---
 htdocs/bom/class/bom.class.php                |  92 +++++++--------
 htdocs/bookcal/class/availabilities.class.php |  44 +++----
 htdocs/bookcal/class/calendar.class.php       |  36 +++---
 htdocs/categories/class/categorie.class.php   |  16 +--
 htdocs/core/class/commonobject.class.php      |   2 +-
 htdocs/core/class/defaultvalues.class.php     |  16 +--
 htdocs/core/class/timespent.class.php         |  42 +++----
 htdocs/core/lib/functions.lib.php             |   1 +
 .../class/conferenceorbooth.class.php         |  36 +++---
 .../class/conferenceorboothattendee.class.php |   2 +-
 .../fournisseur.commande.dispatch.class.php   |   4 +-
 htdocs/hrm/class/evaluation.class.php         |  44 +++----
 htdocs/hrm/class/evaluationdet.class.php      |  26 ++---
 htdocs/hrm/class/job.class.php                |  26 ++---
 htdocs/hrm/class/position.class.php           |  32 ++---
 htdocs/hrm/class/skill.class.php              |  41 ++++---
 htdocs/hrm/class/skilldet.class.php           |  18 +--
 htdocs/hrm/class/skillrank.class.php          |  24 ++--
 htdocs/mrp/class/mo.class.php                 | 110 +++++++++---------
 .../class/opensurveysondage.class.php         |  40 +++----
 .../class/partnership_type.class.php          |  16 +--
 .../class/stocktransfer.class.php             |  58 ++++-----
 .../class/stocktransferline.class.php         |  26 ++---
 .../class/recruitmentcandidature.class.php    |  52 ++++-----
 .../class/recruitmentjobposition.class.php    |  52 ++++-----
 htdocs/ticket/class/cticketcategory.class.php |  28 ++---
 htdocs/user/class/user.class.php              |  24 ++--
 htdocs/webhook/class/target.class.php         |  34 +++---
 htdocs/website/class/websitepage.class.php    |  48 ++++----
 .../workstation/class/workstation.class.php   |  42 +++----
 htdocs/zapier/class/hook.class.php            |   2 +-
 36 files changed, 585 insertions(+), 567 deletions(-)

diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 5ddee3b9244..94c67e08f75 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -56,7 +56,7 @@
 				$this->datea = $this->db->jdate($obj->datea);
 				$this->datee        = $this->db->jdate($obj->datee);
 				$this->periode = $this->db->jdate($obj->period);
-				$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
+				$tmp = array('id_users' => $obj->id_users, 'nom' => $obj->name, 'reponses' => $obj->reponses);
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
 				//si les reponses ne concerne pas la colonne effacée, on concatenate
 				GETPOST("mouvement", 'alpha'),
@@ -73,6 +73,8 @@
 			$datee = dol_get_last_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 12);
 			$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 			$ensemblereponses = $obj->reponses;
+			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit);		// the name of the field
+			$newcrit = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '', $tmpcrit);
 			$object->datee = $datee;
 			$object->periode = $dateperiod;
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Payement").'</span> : <span class="info-box-label">'.$this->type_payment.'</span>';
@@ -97,16 +99,19 @@
 			$taskstatic->datee = $db->jdate($obj->date_end);
 			$this->category->childs = array();
 			$this->datea = dol_now();
+			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit);	// the condition after the name of the field
 			'datee' => $date_end,
 			// mise a jour des reponses utilisateurs dans la base
 			if (!empty($arrayfields['t.datee']['checked'])) {
 			if ($user->hasRight('stock', 'mouvement', 'lire')) {
 			if (empty($reyear) || empty($remonth) || empty($reday)) {
 			jQuery("#mouvement").change(function() {
+			preg_match('/:([!<>=\s]+|in|notin|like|notlike):/', $tmpcrit, $reg);
 			print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
 			print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
+			print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 			print dol_print_date($object->periode, "day");
 		$TWeek[$week_number] = $week_number;
 		$action = 'transfert';
@@ -174,6 +179,8 @@
 		if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
 		print $object->datee ? dol_print_date($object->datee, 'daytext') : '&nbsp;';
+		print '<input type="hidden" name="action" value="addin">';
+		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 		print '<tr><td>'.$langs->trans("Datee").'</td>';
 		print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", '', $param, '', $sortfield, $sortorder, 'center ');
 	 *  @param		string		$datee		End date (ex 23:59:59)
@@ -189,6 +196,8 @@
 	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"), 'tzuserrel');
 	$ensemblereponses = $obj->reponses;
 	$head[$h][1] = $langs->trans('Referers');
+	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $tmpval);
+	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $val);
 	$morewherefilterarray[] = " t.datee <= '".$db->idate($search_date_end_end)."'";
 	$morewherefilterarray[] = " t.datee >= '".$db->idate($search_date_end_start)."'";
 	$opensurveysondage->mail_admin = $_SESSION['adresse'];
@@ -221,7 +230,8 @@
 	$sql2 .= " s.logo, s.email, s.entity, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";
 	$title = $langs->trans('Batch')." ".$shortlabel." - ".$langs->trans('Referers');
 	$totalforvisibletasks = projectLinesPerMonth($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $isavailable, 0, $TWeek);
-	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>50),
+	$value = preg_replace('/([a-z\.]+)\s*([!<>=]+|in|notin|like|notlike)\s*/', '\1:\2:', $value); // Clean string 'x < 10' into 'x:<:10' so we can then explode on space to get all AND tests to do
+	'cs.periode'	=> array('label' => "PeriodEndDate", 'checked' => 1, 'position' => 50),
 	't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>101),
 	't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>5),
 	// Ligne de la periode d'analyse du rapport
@@ -233,6 +243,7 @@
 	foreach ($TWeek as $week_number) {
 	if (!empty($arrayfields['t.datee']['checked'])) {
 	if ($action == "transfert") {
+	if ($object->id > 0 && $action == 'addin') {
 	if (GETPOST('reday')) {
 	if (GETPOSTINT("reyear") && GETPOSTINT("remonth") && GETPOSTINT("reday")) {
 	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
@@ -240,6 +251,7 @@
 	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
 	print '<td class="left" width="25%">'.$langs->trans("Referers").'</td>';
 	print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
+	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 	print '<tr><td>'.$langs->trans("Period")."</td><td>".dol_print_date($charge->periode, 'day')."</td></tr>\n";
 	print ajax_combobox("mouvement");
 	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname,cs.periode", "", $param, 'class="left"', $sortfield, $sortorder);
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 682a8b42b26..085d4daba12 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -277,7 +277,7 @@ return [
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
 		// checks if a function, closure or method unconditionally returns.
 		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
-		//'DeprecateAliasPlugin',
+		'DeprecateAliasPlugin',
 		//'EmptyMethodAndFunctionPlugin',
 		'InvalidVariableIssetPlugin',
 		//'MoreSpecificElementTypePlugin',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index a9daacfc676..11daf743c09 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -1,8 +1,10 @@
 <?php
 
+// Uncomment require_once to enable corresponding fixer
+
 //require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
 //require_once __DIR__.'/plugins/PriceFormFixer.php';
-require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
+//require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
 
 /* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  */
@@ -118,7 +120,7 @@ return [
 	],
 	'plugins' => [
 		__DIR__.'/plugins/ParamMatchRegexPlugin.php',
-		//'DeprecateAliasPlugin',
+		'DeprecateAliasPlugin',
 		// __DIR__.'/plugins/NoVarDumpPlugin.php',
 		//__DIR__.'/plugins/GetPostFixerPlugin.php',
 		//'PHPDocToRealTypesPlugin',
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 7eeae3336c0..9c034a3340b 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -95,36 +95,36 @@ class Asset extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
-		'fk_asset_model' => array('type'=>'integer:AssetModel:asset/class/assetmodel.class.php:1:((status:=:1) and (entity:IN:__SHARED_ENTITIES__))', 'label'=>'AssetModel', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'validate'=>'1',),
-		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'validate'=>'1',),
-		'acquisition_type' => array('type'=>'smallint', 'label'=>'AssetAcquisitionType', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetAcquisitionTypeNew', '1'=>'AssetAcquisitionTypeOccasion'), 'validate'=>'1',),
-		'asset_type' => array('type'=>'smallint', 'label'=>'AssetType', 'enabled'=>'1', 'position'=>70, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetTypeIntangible', '1'=>'AssetTypeTangible', '2'=>'AssetTypeInProgress', '3'=>'AssetTypeFinancial'), 'validate'=>'1',),
-		'not_depreciated' => array('type'=>'boolean', 'label'=>'AssetNotDepreciated', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'default'=>'0', 'visible'=>1, 'validate'=>'1',),
-		'date_acquisition' => array('type'=>'date', 'label'=>'AssetDateAcquisition', 'enabled'=>'1', 'position'=>90, 'notnull'=>1, 'visible'=>1,),
-		'date_start' => array('type'=>'date', 'label'=>'AssetDateStart', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>-1,),
-		'acquisition_value_ht' => array('type'=>'price', 'label'=>'AssetAcquisitionValueHT', 'enabled'=>'1', 'position'=>110, 'notnull'=>1, 'visible'=>1, 'isameasure'=>'1', 'validate'=>'1',),
-		'recovered_vat' => array('type'=>'price', 'label'=>'AssetRecoveredVAT', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'isameasure'=>'1', 'validate'=>'1',),
-		'reversal_date' => array('type'=>'date', 'label'=>'AssetReversalDate', 'enabled'=>'1', 'position'=>130, 'notnull'=>0, 'visible'=>1,),
-		'reversal_amount_ht' => array('type'=>'price', 'label'=>'AssetReversalAmountHT', 'enabled'=>'1', 'position'=>140, 'notnull'=>0, 'visible'=>1, 'isameasure'=>'1', 'validate'=>'1',),
-		'disposal_date' => array('type'=>'date', 'label'=>'AssetDisposalDate', 'enabled'=>'1', 'position'=>200, 'notnull'=>0, 'visible'=>-2,),
-		'disposal_amount_ht' => array('type'=>'price', 'label'=>'AssetDisposalAmount', 'enabled'=>'1', 'position'=>210, 'notnull'=>0, 'visible'=>-2, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
-		'fk_disposal_type' => array('type'=>'sellist:c_asset_disposal_type:label:rowid::active=1', 'label'=>'AssetDisposalType', 'enabled'=>'1', 'position'=>220, 'notnull'=>0, 'visible'=>-2, 'index'=>1, 'validate'=>'1',),
-		'disposal_depreciated' => array('type'=>'boolean', 'label'=>'AssetDisposalDepreciated', 'enabled'=>'1', 'position'=>230, 'notnull'=>0, 'default'=>'0', 'visible'=>-2, 'validate'=>'1',),
-		'disposal_subject_to_vat' => array('type'=>'boolean', 'label'=>'AssetDisposalSubjectToVat', 'enabled'=>'1', 'position'=>240, 'notnull'=>0, 'default'=>'0', 'visible'=>-2, 'validate'=>'1',),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>301, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'default'=>'0', 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'), 'validate'=>'1',),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'noteditable' => '0', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "Reference of object"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2', 'validate' => '1',),
+		'fk_asset_model' => array('type' => 'integer:AssetModel:asset/class/assetmodel.class.php:1:((status:=:1) and (entity:IN:__SHARED_ENTITIES__))', 'label' => 'AssetModel', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => '1',),
+		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0, 'default' => '1', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'validate' => '1',),
+		'acquisition_type' => array('type' => 'smallint', 'label' => 'AssetAcquisitionType', 'enabled' => '1', 'position' => 60, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetAcquisitionTypeNew', '1' => 'AssetAcquisitionTypeOccasion'), 'validate' => '1',),
+		'asset_type' => array('type' => 'smallint', 'label' => 'AssetType', 'enabled' => '1', 'position' => 70, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetTypeIntangible', '1' => 'AssetTypeTangible', '2' => 'AssetTypeInProgress', '3' => 'AssetTypeFinancial'), 'validate' => '1',),
+		'not_depreciated' => array('type' => 'boolean', 'label' => 'AssetNotDepreciated', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'default' => '0', 'visible' => 1, 'validate' => '1',),
+		'date_acquisition' => array('type' => 'date', 'label' => 'AssetDateAcquisition', 'enabled' => '1', 'position' => 90, 'notnull' => 1, 'visible' => 1,),
+		'date_start' => array('type' => 'date', 'label' => 'AssetDateStart', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => -1,),
+		'acquisition_value_ht' => array('type' => 'price', 'label' => 'AssetAcquisitionValueHT', 'enabled' => '1', 'position' => 110, 'notnull' => 1, 'visible' => 1, 'isameasure' => '1', 'validate' => '1',),
+		'recovered_vat' => array('type' => 'price', 'label' => 'AssetRecoveredVAT', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => 1, 'isameasure' => '1', 'validate' => '1',),
+		'reversal_date' => array('type' => 'date', 'label' => 'AssetReversalDate', 'enabled' => '1', 'position' => 130, 'notnull' => 0, 'visible' => 1,),
+		'reversal_amount_ht' => array('type' => 'price', 'label' => 'AssetReversalAmountHT', 'enabled' => '1', 'position' => 140, 'notnull' => 0, 'visible' => 1, 'isameasure' => '1', 'validate' => '1',),
+		'disposal_date' => array('type' => 'date', 'label' => 'AssetDisposalDate', 'enabled' => '1', 'position' => 200, 'notnull' => 0, 'visible' => -2,),
+		'disposal_amount_ht' => array('type' => 'price', 'label' => 'AssetDisposalAmount', 'enabled' => '1', 'position' => 210, 'notnull' => 0, 'visible' => -2, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
+		'fk_disposal_type' => array('type' => 'sellist:c_asset_disposal_type:label:rowid::active=1', 'label' => 'AssetDisposalType', 'enabled' => '1', 'position' => 220, 'notnull' => 0, 'visible' => -2, 'index' => 1, 'validate' => '1',),
+		'disposal_depreciated' => array('type' => 'boolean', 'label' => 'AssetDisposalDepreciated', 'enabled' => '1', 'position' => 230, 'notnull' => 0, 'default' => '0', 'visible' => -2, 'validate' => '1',),
+		'disposal_subject_to_vat' => array('type' => 'boolean', 'label' => 'AssetDisposalSubjectToVat', 'enabled' => '1', 'position' => 240, 'notnull' => 0, 'default' => '0', 'visible' => -2, 'validate' => '1',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 300, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 301, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'default' => '0', 'visible' => 2, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Canceled'), 'validate' => '1',),
 	);
 	public $rowid;
 	public $ref;
@@ -418,7 +418,7 @@ class Asset extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
 			return -1;
 		}
@@ -1403,7 +1403,7 @@ class Asset extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 8bbfda125e7..811f50252d7 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -101,19 +101,19 @@ class AssetModel extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1'),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
-		'asset_type' => array('type'=>'smallint', 'label'=>'AssetType', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetTypeIntangible', '1'=>'AssetTypeTangible', '2'=>'AssetTypeInProgress', '3'=>'AssetTypeFinancial'), 'validate'=>'1',),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>301, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'default'=>'1', 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Enabled', '9'=>'Disabled'), 'validate'=>'1',),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2', 'validate' => '1',),
+		'asset_type' => array('type' => 'smallint', 'label' => 'AssetType', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetTypeIntangible', '1' => 'AssetTypeTangible', '2' => 'AssetTypeInProgress', '3' => 'AssetTypeFinancial'), 'validate' => '1',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 300, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 301, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'default' => '1', 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Enabled', '9' => 'Disabled'), 'validate' => '1',),
 	);
 	public $rowid;
 	public $ref;
@@ -368,7 +368,7 @@ class AssetModel extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -663,7 +663,7 @@ class AssetModel extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('assetmodeldao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => $result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 566298ea8df..a2199a42f97 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -113,29 +113,29 @@ class BOM extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1', 'csslist'=>'nowraponall'),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1, 'css'=>'minwidth300 maxwidth400', 'csslist'=>'tdoverflowmax200'),
-		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth175', 'csslist'=>'minwidth175 center'),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'default' => 1, 'index' => 1, 'position' => 5),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'noteditable' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of BOM", 'showoncombobox' => '1', 'csslist' => 'nowraponall'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'notnull' => 1, 'searchall' => 1, 'showoncombobox' => '2', 'autofocusoncreate' => 1, 'css' => 'minwidth300 maxwidth400', 'csslist' => 'tdoverflowmax200'),
+		'bomtype' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'position' => 33, 'notnull' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'Manufacturing', 1 => 'Disassemble'), 'css' => 'minwidth175', 'csslist' => 'minwidth175 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:((finished:is:null) or (finished:!=:0))', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
-		'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth50imp right'),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:1:((finished:is:null) or (finished:!=:0))', 'label' => 'Product', 'picto' => 'product', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'help' => 'ProductBOMHelp', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 60, 'notnull' => -1,),
+		'qty' => array('type' => 'real', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'default' => 1, 'position' => 55, 'notnull' => 1, 'isameasure' => '1', 'css' => 'maxwidth50imp right'),
 		//'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLossForProductProduced'),
-		'duration' => array('type'=>'duration', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>-1, 'position'=>102, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-2, 'position'=>161, 'notnull'=>-1,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-2, 'position'=>162, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>300, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
-		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502, 'notnull'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1, 'csslist'=>'tdoverflowmax100'),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'position'=>512, 'notnull'=>0, 'csslist'=>'tdoverflowmax100'),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Enabled', 9=>'Disabled')),
+		'duration' => array('type' => 'duration', 'label' => 'EstimatedDuration', 'enabled' => 1, 'visible' => -1, 'position' => 101, 'notnull' => -1, 'css' => 'maxwidth50imp', 'help' => 'EstimatedDurationDesc'),
+		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label' => 'WarehouseForProduction', 'picto' => 'stock', 'enabled' => 1, 'visible' => -1, 'position' => 102, 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => -2, 'position' => 161, 'notnull' => -1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => -2, 'position' => 162, 'notnull' => -1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 300, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'position' => 501, 'notnull' => 1,),
+		'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -2, 'position' => 502, 'notnull' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserCreation', 'picto' => 'user', 'enabled' => 1, 'visible' => -2, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => 1, 'visible' => -2, 'position' => 511, 'notnull' => -1, 'csslist' => 'tdoverflowmax100'),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'picto' => 'user', 'enabled' => 1, 'visible' => -2, 'position' => 512, 'notnull' => 0, 'csslist' => 'tdoverflowmax100'),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'notnull' => 1, 'default' => 0, 'index' => 1, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Enabled', 9 => 'Disabled')),
 	);
 
 	/**
@@ -514,7 +514,7 @@ class BOM extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -1182,7 +1182,7 @@ class BOM extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('bomdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1414,7 +1414,7 @@ class BOM extends CommonObject
 		$this->unit_cost = 0;
 		$this->total_cost = 0;
 
-		$parameters=array();
+		$parameters = array();
 		$reshook = $hookmanager->executeHooks('calculateCostsBom', $parameters, $this); // Note that $action and $object may have been modified by hook
 
 		if ($reshook > 0) {
@@ -1541,13 +1541,13 @@ class BOM extends CommonObject
 			foreach ($this->lines as $line) {
 				if (!empty($line->childBom)) {
 					foreach ($line->childBom as $childBom) {
-						$childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
+						$childBom->getNetNeeds($TNetNeeds, $line->qty * $qty);
 					}
 				} else {
 					if (empty($TNetNeeds[$line->fk_product])) {
 						$TNetNeeds[$line->fk_product] = 0;
 					}
-					$TNetNeeds[$line->fk_product] += $line->qty*$qty;
+					$TNetNeeds[$line->fk_product] += $line->qty * $qty;
 				}
 			}
 		}
@@ -1569,9 +1569,9 @@ class BOM extends CommonObject
 					foreach ($line->childBom as $childBom) {
 						$TNetNeeds[$childBom->id]['bom'] = $childBom;
 						$TNetNeeds[$childBom->id]['parentid'] = $this->id;
-						$TNetNeeds[$childBom->id]['qty'] = $line->qty*$qty;
+						$TNetNeeds[$childBom->id]['qty'] = $line->qty * $qty;
 						$TNetNeeds[$childBom->id]['level'] = $level;
-						$childBom->getNetNeedsTree($TNetNeeds, $line->qty*$qty, $level+1);
+						$childBom->getNetNeedsTree($TNetNeeds, $line->qty * $qty, $level + 1);
 					}
 				} else {
 					$TNetNeeds[$this->id]['product'][$line->fk_product]['qty'] += $line->qty * $qty;
@@ -1598,7 +1598,7 @@ class BOM extends CommonObject
 		}
 
 		if (empty($bom_id)) {
-			$bom_id=$this->id;
+			$bom_id = $this->id;
 		}
 
 		$sql = 'SELECT l.fk_bom, b.label
@@ -1610,7 +1610,7 @@ class BOM extends CommonObject
 		if (!empty($resql)) {
 			while ($res = $this->db->fetch_object($resql)) {
 				$TParentBom[$res->fk_bom] = $res->fk_bom;
-				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level+1);
+				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level + 1);
 			}
 		}
 	}
@@ -1717,19 +1717,19 @@ class BOMLine extends CommonObjectLine
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'LineID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'fk_bom' => array('type'=>'integer:BillOfMaterials:societe/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1,),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'fk_bom_child' => array('type'=>'integer:BOM:bom/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'notnull'=>-1,),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
-		'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
-		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
-		'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
-		'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
-		'fk_unit' => array('type'=>'integer', 'label'=>'Unit', 'enabled'=>1, 'visible'=>1, 'position'=>120, 'notnull'=>-1,),
-		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-		'fk_default_workstation' =>array('type'=>'integer', 'label'=>'DefaultWorkstation', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'position'=>1050)
+		'rowid' => array('type' => 'integer', 'label' => 'LineID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
+		'fk_bom' => array('type' => 'integer:BillOfMaterials:societe/class/bom.class.php', 'label' => 'BillOfMaterials', 'enabled' => 1, 'visible' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1,),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => 1, 'visible' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1,),
+		'fk_bom_child' => array('type' => 'integer:BOM:bom/class/bom.class.php', 'label' => 'BillOfMaterials', 'enabled' => 1, 'visible' => -1, 'position' => 40, 'notnull' => -1,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 60, 'notnull' => -1,),
+		'qty' => array('type' => 'double(24,8)', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'position' => 100, 'notnull' => 1, 'isameasure' => '1',),
+		'qty_frozen' => array('type' => 'smallint', 'label' => 'QuantityFrozen', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 105, 'css' => 'maxwidth50imp', 'help' => 'QuantityConsumedInvariable'),
+		'disable_stock_change' => array('type' => 'smallint', 'label' => 'DisableStockChange', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 108, 'css' => 'maxwidth50imp', 'help' => 'DisableStockChangeHelp'),
+		'efficiency' => array('type' => 'double(24,8)', 'label' => 'ManufacturingEfficiency', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'position' => 110, 'notnull' => 1, 'css' => 'maxwidth50imp', 'help' => 'ValueOfEfficiencyConsumedMeans'),
+		'fk_unit' => array('type' => 'integer', 'label' => 'Unit', 'enabled' => 1, 'visible' => 1, 'position' => 120, 'notnull' => -1,),
+		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => 0, 'position' => 200, 'notnull' => 1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
+		'fk_default_workstation' => array('type' => 'integer', 'label' => 'DefaultWorkstation', 'enabled' => 1, 'visible' => 1, 'notnull' => 0, 'position' => 1050)
 	);
 
 	/**
@@ -1914,7 +1914,7 @@ class BOMLine extends CommonObjectLine
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -1932,7 +1932,7 @@ class BOMLine extends CommonObjectLine
 			while ($obj = $this->db->fetch_object($resql)) {
 				$record = new self($this->db);
 				$record->setVarsFromFetchObj($obj);
-								$record->fetch_optionals();
+				$record->fetch_optionals();
 
 				$records[$record->id] = $record;
 			}
@@ -2041,7 +2041,7 @@ class BOMLine extends CommonObjectLine
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('bomlinedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index f24d258e987..e3320b531c7 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -113,26 +113,26 @@ class Availabilities extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax150', 'cssview'=>'wordbreak', 'help'=>"BookcalLabelAvailabilityHelp", 'showoncombobox'=>'2', 'validate'=>'1',),
-		'fk_bookcal_calendar' => array('type'=>'integer:Calendar:bookcal/class/calendar.class.php:1', 'label'=>'Calendar', 'enabled'=>'1', 'position'=>25, 'notnull'=>1, 'visible'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax100'),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'picto'=>'user', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'start' => array('type'=>'date', 'label'=>'Start Date', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'searchall'=>1,),
-		'end' => array('type'=>'date', 'label'=>'End Date', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'searchall'=>1,),
-		'duration' => array('type'=>'integer', 'label'=>'DurationOfRange', 'enabled'=>'1', 'position'=>47, 'notnull'=>1, 'visible'=>1, 'default'=>'30', 'css'=>'width50 right'),
-		'startHour' => array('type'=>'integer', 'label'=>'Start Hour', 'enabled'=>'1', 'position'=>46, 'notnull'=>1, 'visible'=>1,),
-		'endHour' => array('type'=>'integer', 'label'=>'End Hour', 'enabled'=>'1', 'position'=>46.5, 'notnull'=>1, 'visible'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Closed'), 'default'=>1, 'validate'=>'1'),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 20, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'cssview' => 'wordbreak', 'help' => "BookcalLabelAvailabilityHelp", 'showoncombobox' => '2', 'validate' => '1',),
+		'fk_bookcal_calendar' => array('type' => 'integer:Calendar:bookcal/class/calendar.class.php:1', 'label' => 'Calendar', 'enabled' => '1', 'position' => 25, 'notnull' => 1, 'visible' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax100'),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => '1',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'start' => array('type' => 'date', 'label' => 'Start Date', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'searchall' => 1,),
+		'end' => array('type' => 'date', 'label' => 'End Date', 'enabled' => '1', 'position' => 45, 'notnull' => 1, 'visible' => 1, 'searchall' => 1,),
+		'duration' => array('type' => 'integer', 'label' => 'DurationOfRange', 'enabled' => '1', 'position' => 47, 'notnull' => 1, 'visible' => 1, 'default' => '30', 'css' => 'width50 right'),
+		'startHour' => array('type' => 'integer', 'label' => 'Start Hour', 'enabled' => '1', 'position' => 46, 'notnull' => 1, 'visible' => 1,),
+		'endHour' => array('type' => 'integer', 'label' => 'End Hour', 'enabled' => '1', 'position' => 46.5, 'notnull' => 1, 'visible' => 1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Closed'), 'default' => 1, 'validate' => '1'),
 	);
 	public $rowid;
 	public $label;
@@ -412,7 +412,7 @@ class Availabilities extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -772,7 +772,7 @@ class Availabilities extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('availabilitiesdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 8d05d2739ea..cad6ca0eeb2 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -113,23 +113,23 @@ class Calendar extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'right', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object", 'css'=>'width100'),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'alwayseditable'=>'1', 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',),
-		'visibility' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Owner', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'picto'=>'user', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
-		'type' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>'1', 'position'=>42, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'Customer', '1'=>'Supplier', '3'=>'Other'),),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150', 'help'=>"ThirdPartyBookCalHelp", 'validate'=>'1',),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'isModEnabled("project")', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150', 'validate'=>'1',),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'picto'=>'user', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax150',),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'default'=>0, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Closed'), 'validate'=>'1',),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'right', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "Reference of object", 'css' => 'width100'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'alwayseditable' => '1', 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1',),
+		'visibility' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Owner', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'picto' => 'user', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => '1', 'position' => 42, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'Customer', '1' => 'Supplier', '3' => 'Other'),),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 'isModEnabled("societe")', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150', 'help' => "ThirdPartyBookCalHelp", 'validate' => '1',),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'picto' => 'project', 'enabled' => 'isModEnabled("project")', 'position' => 52, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150', 'validate' => '1',),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => '1',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax150',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax150',),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'default' => 0, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Closed'), 'validate' => '1',),
 	);
 	public $rowid;
 	public $ref;
@@ -370,7 +370,7 @@ class Calendar extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 9cd365428f5..62bbc69953d 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -130,7 +130,7 @@ class Categorie extends CommonObject
 	public $MAP_CAT_TABLE = array(
 		'customer' => 'societe',
 		'supplier' => 'fournisseur',
-		'bank_account'=> 'account',
+		'bank_account' => 'account',
 	);
 
 	/**
@@ -148,7 +148,7 @@ class Categorie extends CommonObject
 		'account'  => 'Account', // old for bank account
 		'bank_account'  => 'Account',
 		'project'  => 'Project',
-		'warehouse'=> 'Entrepot',
+		'warehouse' => 'Entrepot',
 		'actioncomm' => 'ActionComm',
 		'website_page' => 'WebsitePage',
 		'ticket' => 'Ticket',
@@ -170,7 +170,7 @@ class Categorie extends CommonObject
 		'account' => 'AccountsCategoriesArea', // old for bank account
 		'bank_account' => 'AccountsCategoriesArea',
 		'project' => 'ProjectsCategoriesArea',
-		'warehouse'=> 'StocksCategoriesArea',
+		'warehouse' => 'StocksCategoriesArea',
 		'actioncomm' => 'ActioncommCategoriesArea',
 		'website_page' => 'WebsitePageCategoriesArea'
 	);
@@ -186,7 +186,7 @@ class Categorie extends CommonObject
 		'contact'  => 'socpeople',
 		'account'  => 'bank_account', // old for bank account
 		'project'  => 'projet',
-		'warehouse'=> 'entrepot',
+		'warehouse' => 'entrepot',
 		'knowledgemanagement' => 'knowledgemanagement_knowledgerecord'
 	);
 
@@ -779,7 +779,7 @@ class Categorie extends CommonObject
 			}
 
 			// Call trigger
-			$this->context = array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
+			$this->context = array('linkto' => $obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_LINK', $user);
 			if ($result < 0) {
 				$error++;
@@ -839,7 +839,7 @@ class Categorie extends CommonObject
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			// Call trigger
-			$this->context = array('unlinkoff'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
+			$this->context = array('unlinkoff' => $obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_UNLINK', $user);
 			if ($result < 0) {
 				$error++;
@@ -904,7 +904,7 @@ class Categorie extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -1788,7 +1788,7 @@ class Categorie extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cac72ca1e49..ff537ee7891 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10311,7 +10311,7 @@ abstract class CommonObject
 			$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 			if ($errormessage) {
 				$this->errors[] = $errormessage;
-				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 				return -1;
 			}
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index db0d57f63ec..cdb14b5bd5a 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -89,13 +89,13 @@ class DefaultValues extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'type' =>array('type'=>'varchar(10)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-		'user_id' =>array('type'=>'integer', 'label'=>'Userid', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'page' =>array('type'=>'varchar(255)', 'label'=>'RelativeURL', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'param' =>array('type'=>'varchar(255)', 'label'=>'Field', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'value' =>array('type'=>'varchar(128)', 'label'=>'Value', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'type' => array('type' => 'varchar(10)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'position' => 20),
+		'user_id' => array('type' => 'integer', 'label' => 'Userid', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'page' => array('type' => 'varchar(255)', 'label' => 'RelativeURL', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'param' => array('type' => 'varchar(255)', 'label' => 'Field', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'value' => array('type' => 'varchar(128)', 'label' => 'Value', 'enabled' => 1, 'visible' => -1, 'position' => 40),
 	);
 
 	/**
@@ -293,7 +293,7 @@ class DefaultValues extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 23544f73edd..a4327d55ae9 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -113,25 +113,25 @@ class TimeSpent extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>17, 'notnull'=>0, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'import_key', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1,),
-		'fk_element' => array('type'=>'integer', 'label'=>'fk_element', 'enabled'=>'1', 'position'=>2, 'notnull'=>1, 'visible'=>-1,),
-		'elementtype' => array('type'=>'varchar(32)', 'label'=>'elementtype', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>-1,),
-		'element_date' => array('type'=>'date', 'label'=>'element_date', 'enabled'=>'1', 'position'=>4, 'notnull'=>0, 'visible'=>-1,),
-		'element_datehour' => array('type'=>'datetime', 'label'=>'element_datehour', 'enabled'=>'1', 'position'=>5, 'notnull'=>0, 'visible'=>-1,),
-		'element_date_withhour' => array('type'=>'integer', 'label'=>'element_date_withhour', 'enabled'=>'1', 'position'=>6, 'notnull'=>0, 'visible'=>-1,),
-		'element_duration' => array('type'=>'double', 'label'=>'element_duration', 'enabled'=>'1', 'position'=>7, 'notnull'=>0, 'visible'=>-1,),
-		'fk_product' => array('type'=>'integer', 'label'=>'fk_product', 'enabled'=>'1', 'position'=>8, 'notnull'=>0, 'visible'=>-1,),
-		'fk_user' => array('type'=>'integer', 'label'=>'fk_user', 'enabled'=>'1', 'position'=>9, 'notnull'=>0, 'visible'=>-1,),
-		'thm' => array('type'=>'double(24,8)', 'label'=>'thm', 'enabled'=>'1', 'position'=>10, 'notnull'=>0, 'visible'=>-1,),
-		'invoice_id' => array('type'=>'integer', 'label'=>'invoice_id', 'enabled'=>'1', 'position'=>11, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
-		'invoice_line_id' => array('type'=>'integer', 'label'=>'invoice_line_id', 'enabled'=>'1', 'position'=>12, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
-		'intervention_id' => array('type'=>'integer', 'label'=>'intervention_id', 'enabled'=>'1', 'position'=>13, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
-		'intervention_line_id' => array('type'=>'integer', 'label'=>'intervention_line_id', 'enabled'=>'1', 'position'=>14, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
-		'datec' => array('type'=>'datetime', 'label'=>'datec', 'enabled'=>'1', 'position'=>16, 'notnull'=>0, 'visible'=>-1,),
-		'note' => array('type'=>'text', 'label'=>'note', 'enabled'=>'1', 'position'=>18, 'notnull'=>0, 'visible'=>-1,),
+	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"),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 17, 'notnull' => 0, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'import_key', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1,),
+		'fk_element' => array('type' => 'integer', 'label' => 'fk_element', 'enabled' => '1', 'position' => 2, 'notnull' => 1, 'visible' => -1,),
+		'elementtype' => array('type' => 'varchar(32)', 'label' => 'elementtype', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => -1,),
+		'element_date' => array('type' => 'date', 'label' => 'element_date', 'enabled' => '1', 'position' => 4, 'notnull' => 0, 'visible' => -1,),
+		'element_datehour' => array('type' => 'datetime', 'label' => 'element_datehour', 'enabled' => '1', 'position' => 5, 'notnull' => 0, 'visible' => -1,),
+		'element_date_withhour' => array('type' => 'integer', 'label' => 'element_date_withhour', 'enabled' => '1', 'position' => 6, 'notnull' => 0, 'visible' => -1,),
+		'element_duration' => array('type' => 'double', 'label' => 'element_duration', 'enabled' => '1', 'position' => 7, 'notnull' => 0, 'visible' => -1,),
+		'fk_product' => array('type' => 'integer', 'label' => 'fk_product', 'enabled' => '1', 'position' => 8, 'notnull' => 0, 'visible' => -1,),
+		'fk_user' => array('type' => 'integer', 'label' => 'fk_user', 'enabled' => '1', 'position' => 9, 'notnull' => 0, 'visible' => -1,),
+		'thm' => array('type' => 'double(24,8)', 'label' => 'thm', 'enabled' => '1', 'position' => 10, 'notnull' => 0, 'visible' => -1,),
+		'invoice_id' => array('type' => 'integer', 'label' => 'invoice_id', 'enabled' => '1', 'position' => 11, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'invoice_line_id' => array('type' => 'integer', 'label' => 'invoice_line_id', 'enabled' => '1', 'position' => 12, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'intervention_id' => array('type' => 'integer', 'label' => 'intervention_id', 'enabled' => '1', 'position' => 13, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'intervention_line_id' => array('type' => 'integer', 'label' => 'intervention_line_id', 'enabled' => '1', 'position' => 14, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'datec' => array('type' => 'datetime', 'label' => 'datec', 'enabled' => '1', 'position' => 16, 'notnull' => 0, 'visible' => -1,),
+		'note' => array('type' => 'text', 'label' => 'note', 'enabled' => '1', 'position' => 18, 'notnull' => 0, 'visible' => -1,),
 	);
 	public $rowid;
 	public $import_key;
@@ -352,7 +352,7 @@ class TimeSpent extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -772,7 +772,7 @@ class TimeSpent extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array($this->element.'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f13707b4a36..ffbe1b1afcf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4272,6 +4272,7 @@ function isValidEmail($address, $acceptsupervisorkey = 0, $acceptuserkey = 0)
  *	@param	    string		$domain	    			Domain name (Ex: "yahoo.com", "yhaoo.com", "dolibarr.fr")
  *	@return     int     							-1 if error (function not available), 0=Not valid, 1=Valid
  *  @see isValidEmail()
+ *  @suppress PhanDeprecatedFunctionInternal Error in Phan plugins incorrectly tags some functions here
  */
 function isValidMXRecord($domain)
 {
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 97497ced70a..0ff0e06936f 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -114,22 +114,22 @@ class ConferenceOrBooth extends ActionComm
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax150', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:(t.usage_organize_event:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax100', 'css'=>'maxwidth500'),
-		'note' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3),
-		'fk_action' => array('type'=>"sellist:c_actioncomm:libelle:id::(module:LIKE:'%@eventorganization')", 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100', 'csslist'=>'tdoverflowmax100'),
-		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
-		'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'fk_user_author' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
-		'fk_user_mod' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax100'),
-		'num_vote' => array('type'=>'smallint', 'label'=>'NbVotes', 'enabled'=>'1', 'position'=>800, 'notnull'=>-1, 'visible'=>5, 'default'=>'0', 'index'=>0),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'EvntOrgDraft', '1'=>'EvntOrgSuggested', '2'=> 'EvntOrgConfirmed', '3' =>'EvntOrgNotQualified', '4' =>'EvntOrgDone', '9'=>'EvntOrgCancelled'),),
+		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'integer', 'label' => 'Ref', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'help' => "OrganizationEvenLabelName", 'showoncombobox' => '1', 'autofocusoncreate' => 1),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(t.usage_organize_event:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'position' => 52, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '$conf->societe->enabled', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'help' => "OrganizationEventLinkToThirdParty", 'picto' => 'company', 'csslist' => 'tdoverflowmax100', 'css' => 'maxwidth500'),
+		'note' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3),
+		'fk_action' => array('type' => "sellist:c_actioncomm:libelle:id::(module:LIKE:'%@eventorganization')", 'label' => 'Format', 'enabled' => '1', 'position' => 60, 'notnull' => 1, 'visible' => 1, 'css' => 'width100', 'csslist' => 'tdoverflowmax100'),
+		'datep' => array('type' => 'datetime', 'label' => 'DateStart', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '2',),
+		'datep2' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '3',),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
+		'num_vote' => array('type' => 'smallint', 'label' => 'NbVotes', 'enabled' => '1', 'position' => 800, 'notnull' => -1, 'visible' => 5, 'default' => '0', 'index' => 0),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'EvntOrgDraft', '1' => 'EvntOrgSuggested', '2' => 'EvntOrgConfirmed', '3' => 'EvntOrgNotQualified', '4' => 'EvntOrgDone', '9' => 'EvntOrgCancelled'),),
 	);
 	public $rowid;
 	public $id;
@@ -306,7 +306,7 @@ class ConferenceOrBooth extends ActionComm
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -603,7 +603,7 @@ class ConferenceOrBooth extends ActionComm
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('conferenceorboothdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index ea292e437d2..29f7fb8eafa 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -431,7 +431,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 5998b330c14..ce869f06617 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -236,7 +236,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 
 			if (!$notrigger) {
 				// Call triggers
-				$result=$this->call_trigger('LINERECEPTION_CREATE', $user);
+				$result = $this->call_trigger('LINERECEPTION_CREATE', $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -703,7 +703,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 30dfb7863f2..fe3dc78df7f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -105,22 +105,22 @@ class Evaluation extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php:0', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php:0', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'default'=>0, 'visible'=>5, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '6' => 'Closed'),),
-		'date_eval' => array('type'=>'date', 'label'=>'DateEval', 'enabled'=>'1', 'position'=>502, 'notnull'=>1, 'visible'=>1,),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php:0', 'label'=>'Employee', 'enabled'=>'1', 'position'=>504, 'notnull'=>1, 'visible'=>1, 'picto'=>'user', 'css'=>'maxwidth300 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'JobProfile', 'enabled'=>'1', 'position'=>505, 'notnull'=>1, 'visible'=>1, 'picto'=>'jobprofile', 'css'=>'maxwidth300 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2',),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'default' => 0, 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '6' => 'Closed'),),
+		'date_eval' => array('type' => 'date', 'label' => 'DateEval', 'enabled' => '1', 'position' => 502, 'notnull' => 1, 'visible' => 1,),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => '1', 'position' => 504, 'notnull' => 1, 'visible' => 1, 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => '1', 'position' => 505, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 	);
 	public $rowid;
 	public $ref;
@@ -194,7 +194,7 @@ class Evaluation extends CommonObject
 		}
 
 		if (!$user->hasRight('hrm', 'evaluation', 'readall')) {
-			$this->fields['fk_user']['type'].= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
+			$this->fields['fk_user']['type'] .= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
 		}
 
 		$this->date_eval = dol_now();
@@ -415,7 +415,7 @@ class Evaluation extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -630,9 +630,9 @@ class Evaluation extends CommonObject
 	public function getLastEvaluationForUser($fk_user)
 	{
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."hrm_evaluation ";
-		$sql.=	"WHERE fk_user=".((int) $fk_user)." ";
-		$sql.=	"ORDER BY date_eval DESC ";
-		$sql.=	"LIMIT 1 ";
+		$sql .=	"WHERE fk_user=".((int) $fk_user)." ";
+		$sql .=	"ORDER BY date_eval DESC ";
+		$sql .=	"LIMIT 1 ";
 
 		$res = $this->db->query($sql);
 		if (!$res) {
@@ -807,7 +807,7 @@ class Evaluation extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('evaluationdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 5d0794abd5e..5a2d230bf59 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -104,17 +104,17 @@ class EvaluationLine extends CommonObjectLine
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
-		'fk_evaluation' => array('type'=>'integer:Evaluation:hrm/class/evaluation.class.php:1', 'label'=>'Evaluation', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
-		'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1,),
-		'required_rank' => array('type'=>'integer', 'label'=>'requiredRank', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+	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"),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'fk_skill' => array('type' => 'integer:Skill:hrm/class/skill.class.php:1', 'label' => 'Skill', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => 1, 'index' => 1,),
+		'fk_evaluation' => array('type' => 'integer:Evaluation:hrm/class/evaluation.class.php:1', 'label' => 'Evaluation', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => 1, 'index' => 1,),
+		'rankorder' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => '1', 'position' => 4, 'notnull' => 1, 'visible' => 1,),
+		'required_rank' => array('type' => 'integer', 'label' => 'requiredRank', 'enabled' => '1', 'position' => 5, 'notnull' => 1, 'visible' => 1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
 	);
 	public $rowid;
 	public $date_creation;
@@ -383,7 +383,7 @@ class EvaluationLine extends CommonObjectLine
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -777,7 +777,7 @@ class EvaluationLine extends CommonObjectLine
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('evaluationlinedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index dbed9cad902..08ef1dc33de 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -103,17 +103,17 @@ class Job extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'label' => array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Label of object"),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
-		'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,),
-		'deplacement' => array('type'=>'select', 'required'=> 1,'label'=> 'NeedBusinessTravels', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+	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"),
+		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Label of object"),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => 1,),
+		'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,),
+		'deplacement' => array('type' => 'select', 'required' => 1,'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => 0),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 	);
 	public $rowid;
 	public $ref;
@@ -385,7 +385,7 @@ class Job extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -811,7 +811,7 @@ class Job extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('jobdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 5ed5f467ad3..a65fc43e564 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -103,22 +103,22 @@ class Position extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
 		//'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'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'=>'isModEnabled("contract")', 'position'=>50, 'notnull'=>0, 'visible'=>0,),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'picto'=>'user', 'css'=>'maxwidth300 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'JobProfile', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1, 'picto'=>'jobprofile', 'css'=>'maxwidth300 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'date_start' => array('type'=>'date', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>101, 'notnull'=>1, 'visible'=>1,),
-		'date_end' => array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>1,),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>3,),
-		'abort_comment' => array('type'=>'varchar(255)', 'label'=>'AbandonmentComment', 'enabled'=>'getDolGlobalInt("HRM_JOB_POSITON_ENDING_COMMENT")', 'position'=>502, 'notnull'=>0, 'visible'=>1,),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>151, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>152, 'notnull'=>0, 'visible'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'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' => 'isModEnabled("contract")', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label' => 'Employee', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => 0, 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => '1', 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => '1', 'position' => 101, 'notnull' => 1, 'visible' => 1,),
+		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 1,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => 3,),
+		'abort_comment' => array('type' => 'varchar(255)', 'label' => 'AbandonmentComment', 'enabled' => 'getDolGlobalInt("HRM_JOB_POSITON_ENDING_COMMENT")', 'position' => 502, 'notnull' => 0, 'visible' => 1,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 151, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 152, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 	);
 	public $rowid;
 	public $ref;
@@ -394,7 +394,7 @@ class Position extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index f3cdd4a1178..a7e799e7c47 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -109,20 +109,20 @@ class Skill extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php:0', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php:0', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'required_level' => array('type'=>'integer', 'label'=>'requiredLevel', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0,),
-		'date_validite' => array('type'=>'integer', 'label'=>'date_validite', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>0,),
-		'temps_theorique' => array('type'=>'double(24,8)', 'label'=>'temps_theorique', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>0,),
-		'skill_type' => array('type'=>'integer', 'label'=>'SkillType', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'css'=>'minwidth200', 'arrayofkeyval'=>array('0'=>'TypeKnowHow', '1'=>'TypeHowToBe', '9'=>'TypeKnowledge'), 'default'=>0),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
+	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"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2',),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'required_level' => array('type' => 'integer', 'label' => 'requiredLevel', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0,),
+		'date_validite' => array('type' => 'integer', 'label' => 'date_validite', 'enabled' => '1', 'position' => 52, 'notnull' => 1, 'visible' => 0,),
+		'temps_theorique' => array('type' => 'double(24,8)', 'label' => 'temps_theorique', 'enabled' => '1', 'position' => 54, 'notnull' => 1, 'visible' => 0,),
+		'skill_type' => array('type' => 'integer', 'label' => 'SkillType', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'css' => 'minwidth200', 'arrayofkeyval' => array('0' => 'TypeKnowHow', '1' => 'TypeHowToBe', '9' => 'TypeKnowledge'), 'default' => 0),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 0,),
 	);
 	public $rowid;
 	public $label;
@@ -453,7 +453,7 @@ class Skill extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -852,7 +852,7 @@ class Skill extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('skilldao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1110,9 +1110,12 @@ class Skill extends CommonObject
 		global $langs;
 		$result = '';
 		switch ($code) {
-			case 0: $result = $langs->trans("TypeKnowHow"); break; //"Savoir Faire"
-			case 1: $result = $langs->trans("TypeHowToBe"); break; // "Savoir être"
-			case 9: $result = $langs->trans("TypeKnowledge"); break; //"Savoir"
+			case 0: $result = $langs->trans("TypeKnowHow");
+				break; //"Savoir Faire"
+			case 1: $result = $langs->trans("TypeHowToBe");
+				break; // "Savoir être"
+			case 9: $result = $langs->trans("TypeKnowledge");
+				break; //"Savoir"
 		}
 		return $result;
 	}
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index ea61efb2f9a..905ce049df9 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -103,13 +103,13 @@ class Skilldet extends CommonObjectLine
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', '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', 'label'=>'fk_skill', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>0,),
-		'rankorder' => array('type'=>'integer', 'label'=>'rank', 'enabled'=>'1', 'position'=>10, 'notnull'=>0, 'visible'=>2,),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>0,),
+	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', 'label' => 'fk_skill', 'enabled' => '1', 'position' => 5, 'notnull' => 1, 'visible' => 0,),
+		'rankorder' => array('type' => 'integer', 'label' => 'rank', 'enabled' => '1', 'position' => 10, 'notnull' => 0, 'visible' => 2,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 1,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => 0,),
 	);
 	public $rowid;
 	public $fk_skill;
@@ -376,7 +376,7 @@ class Skilldet extends CommonObjectLine
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -765,7 +765,7 @@ class Skilldet extends CommonObjectLine
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('skilldetdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 90c64b8fb42..4f820c3a62f 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -105,16 +105,16 @@ class SkillRank extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'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,),
-		'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,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'objecttype' => array('type'=>'varchar(128)', 'label'=>'objecttype', 'enabled'=>'1', 'position'=>6, 'notnull'=>1, 'visible'=>0,),
+	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,),
+		'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,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'objecttype' => array('type' => 'varchar(128)', 'label' => 'objecttype', 'enabled' => '1', 'position' => 6, 'notnull' => 1, 'visible' => 0,),
 	);
 	public $rowid;
 	public $fk_skill;
@@ -425,7 +425,7 @@ class SkillRank extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -814,7 +814,7 @@ class SkillRank extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('skillrankdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 1d84352bdc8..29ada1293c7 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -96,30 +96,30 @@ class Mo extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
-		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:(t.status:=:1)', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>'$conf->bom->enabled', 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'bom'),
-		'mrptype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>34, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>'isModEnabled("product")', 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
-		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2', 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200', 'alwayseditable'=>1),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>'isModEnabled("stock")', 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax200'),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
-		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1, 'csslist'=>'tdoverflowmax100'),
-		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap', 'alwayseditable'=>1, 'csslist'=>'nowraponall'),
-		'date_end_planned' => array('type'=>'datetime', 'label'=>'DateEndPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>56, 'notnull'=>-1, 'index'=>1, 'alwayseditable'=>1, 'csslist'=>'nowraponall'),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '9'=>'Canceled')),
-		'fk_parent_line' => array('type'=>'integer:MoLine:mrp/class/mo.class.php', 'label'=>'ParentMo', 'enabled'=>1, 'visible'=>0, 'position'=>1020, 'default'=>0, 'notnull'=>0, 'index'=>1,'showoncombobox'=>0),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => '1', 'noteditable' => 1),
+		'fk_bom' => array('type' => 'integer:Bom:bom/class/bom.class.php:0:(t.status:=:1)', 'filter' => 'active=1', 'label' => 'BOM', 'enabled' => '$conf->bom->enabled', 'visible' => 1, 'position' => 33, 'notnull' => -1, 'index' => 1, 'comment' => "Original BOM", 'css' => 'minwidth100 maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'bom'),
+		'mrptype' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'position' => 34, 'notnull' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'Manufacturing', 1 => 'Disassemble'), 'css' => 'minwidth150', 'csslist' => 'minwidth150 center'),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:0', 'label' => 'Product', 'enabled' => 'isModEnabled("product")', 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'comment' => "Product to produce", 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax100', 'picto' => 'product'),
+		'qty' => array('type' => 'real', 'label' => 'QtyToProduce', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'notnull' => 1, 'comment' => "Qty to produce", 'css' => 'width75', 'default' => 1, 'isameasure' => 1),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 42, 'notnull' => -1, 'searchall' => 1, 'showoncombobox' => '2', 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax200', 'alwayseditable' => 1),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'position' => 50, 'notnull' => -1, 'index' => 1, 'css' => 'maxwidth400', 'csslist' => 'tdoverflowmax150'),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'picto' => 'project', 'enabled' => '$conf->project->enabled', 'visible' => -1, 'position' => 51, 'notnull' => -1, 'index' => 1, 'css' => 'minwidth200 maxwidth400', 'csslist' => 'tdoverflowmax100'),
+		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label' => 'WarehouseForProduction', 'picto' => 'stock', 'enabled' => 'isModEnabled("stock")', 'visible' => 1, 'position' => 52, 'css' => 'maxwidth400', 'csslist' => 'tdoverflowmax200'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 61, 'notnull' => -1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 62, 'notnull' => -1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'position' => 501, 'notnull' => 1,),
+		'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -2, 'position' => 502,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'position' => 511, 'notnull' => -1, 'csslist' => 'tdoverflowmax100'),
+		'date_start_planned' => array('type' => 'datetime', 'label' => 'DateStartPlannedMo', 'enabled' => 1, 'visible' => 1, 'position' => 55, 'notnull' => -1, 'index' => 1, 'help' => 'KeepEmptyForAsap', 'alwayseditable' => 1, 'csslist' => 'nowraponall'),
+		'date_end_planned' => array('type' => 'datetime', 'label' => 'DateEndPlannedMo', 'enabled' => 1, 'visible' => 1, 'position' => 56, 'notnull' => -1, 'index' => 1, 'alwayseditable' => 1, 'csslist' => 'nowraponall'),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'default' => 0, 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'InProgress', '3' => 'StatusMOProduced', '9' => 'Canceled')),
+		'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => 0, 'notnull' => 0, 'index' => 1,'showoncombobox' => 0),
 	);
 	public $rowid;
 	public $entity;
@@ -578,8 +578,8 @@ class Mo extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
 					$resarray[] = array(
-						'rowid'=> $obj->rowid,
-						'date'=> $this->db->jdate($obj->date_creation),
+						'rowid' => $obj->rowid,
+						'date' => $this->db->jdate($obj->date_creation),
 						'qty' => $obj->qty,
 						'role' => $obj->role,
 						'fk_product' => $obj->fk_product,
@@ -1487,7 +1487,7 @@ class Mo extends CommonObject
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		$hookmanager->initHooks(array('modao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1752,7 +1752,7 @@ class Mo extends CommonObject
 			foreach ($this->lines as $line) {
 				$reshook = 0;
 				if (is_object($hookmanager)) {
-					$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);
+					$parameters = array('line' => $line, 'i' => $i, 'restrictlist' => $restrictlist, 'selectedLines' => $selectedLines);
 					if (!empty($line->fk_parent_line)) {
 						$parameters['fk_parent_line'] = $line->fk_parent_line;
 					}
@@ -1843,9 +1843,9 @@ class Mo extends CommonObject
 		$error = 0;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_mo as mo_child";
-		$sql.= " WHERE fk_parent_line IN ";
-		$sql.= " (SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production as line_parent";
-		$sql.= " WHERE fk_mo=".((int) $this->id).")";
+		$sql .= " WHERE fk_parent_line IN ";
+		$sql .= " (SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production as line_parent";
+		$sql .= " WHERE fk_mo=".((int) $this->id).")";
 
 		$resql = $this->db->query($sql);
 
@@ -1929,8 +1929,8 @@ class Mo extends CommonObject
 		$error = 0;
 
 		$sql = "SELECT lineparent.fk_mo as id_moparent FROM ".MAIN_DB_PREFIX."mrp_mo as mo";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON mo.fk_parent_line = lineparent.rowid";
-		$sql.= " WHERE mo.rowid = ".((int) $this->id);
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON mo.fk_parent_line = lineparent.rowid";
+		$sql .= " WHERE mo.rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 
@@ -2024,27 +2024,27 @@ class MoLine extends CommonObjectLine
 	public $isextrafieldmanaged = 1;
 
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'fk_mo' =>array('type'=>'integer', 'label'=>'Mo', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'origin_id' =>array('type'=>'integer', 'label'=>'Origin', 'enabled'=>1, 'visible'=>-1, 'notnull'=>0, 'position'=>17),
-		'origin_type' =>array('type'=>'varchar(10)', 'label'=>'Origin type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>0, 'position'=>18),
-		'position' =>array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'fk_product' =>array('type'=>'integer', 'label'=>'Product', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'fk_warehouse' =>array('type'=>'integer', 'label'=>'Warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'qty' =>array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
-		'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
-		'batch' =>array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'role' =>array('type'=>'varchar(10)', 'label'=>'Role', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-		'fk_mrp_production' =>array('type'=>'integer', 'label'=>'Fk mrp production', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-		'fk_stock_movement' =>array('type'=>'integer', 'label'=>'StockMovement', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>160),
-		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>165),
-		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>170),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'fk_default_workstation' =>array('type'=>'integer', 'label'=>'DefaultWorkstation', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'position'=>185),
-		'fk_unit' =>array('type'=>'int', 'label'=>'Unit', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'position'=>186)
+		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'fk_mo' => array('type' => 'integer', 'label' => 'Mo', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
+		'origin_id' => array('type' => 'integer', 'label' => 'Origin', 'enabled' => 1, 'visible' => -1, 'notnull' => 0, 'position' => 17),
+		'origin_type' => array('type' => 'varchar(10)', 'label' => 'Origin type', 'enabled' => 1, 'visible' => -1, 'notnull' => 0, 'position' => 18),
+		'position' => array('type' => 'integer', 'label' => 'Position', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 20),
+		'fk_product' => array('type' => 'integer', 'label' => 'Product', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'fk_warehouse' => array('type' => 'integer', 'label' => 'Warehouse', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
+		'qty_frozen' => array('type' => 'smallint', 'label' => 'QuantityFrozen', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 105, 'css' => 'maxwidth50imp', 'help' => 'QuantityConsumedInvariable'),
+		'disable_stock_change' => array('type' => 'smallint', 'label' => 'DisableStockChange', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 108, 'css' => 'maxwidth50imp', 'help' => 'DisableStockChangeHelp'),
+		'batch' => array('type' => 'varchar(30)', 'label' => 'Batch', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'role' => array('type' => 'varchar(10)', 'label' => 'Role', 'enabled' => 1, 'visible' => -1, 'position' => 145),
+		'fk_mrp_production' => array('type' => 'integer', 'label' => 'Fk mrp production', 'enabled' => 1, 'visible' => -1, 'position' => 150),
+		'fk_stock_movement' => array('type' => 'integer', 'label' => 'StockMovement', 'enabled' => 1, 'visible' => -1, 'position' => 155),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 160),
+		'tms' => array('type' => 'timestamp', 'label' => 'Tms', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 165),
+		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserCreation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 170),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModification', 'enabled' => 1, 'visible' => -1, 'position' => 175),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -1, 'position' => 180),
+		'fk_default_workstation' => array('type' => 'integer', 'label' => 'DefaultWorkstation', 'enabled' => 1, 'visible' => 1, 'notnull' => 0, 'position' => 185),
+		'fk_unit' => array('type' => 'int', 'label' => 'Unit', 'enabled' => 1, 'visible' => 1, 'notnull' => 0, 'position' => 186)
 	);
 
 	public $rowid;
@@ -2193,7 +2193,7 @@ class MoLine extends CommonObjectLine
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 1fe88d65be8..8d0d577cce7 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -102,23 +102,23 @@ class Opensurveysondage extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'id_sondage' => array('type'=>'varchar(16)', 'label'=>'Idsondage', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>-1,),
-		'commentaires' => array('type'=>'mediumtext', 'label'=>'Comments', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1,),
-		'mail_admin' => array('type'=>'varchar(128)', 'label'=>'Mailadmin', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>-1,),
-		'nom_admin' => array('type'=>'varchar(64)', 'label'=>'Nomadmin', 'enabled'=>'1', 'position'=>25, 'notnull'=>0, 'visible'=>-1,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>-2, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
-		'titre' => array('type'=>'mediumtext', 'label'=>'Title', 'enabled'=>'1', 'position'=>35, 'notnull'=>1, 'visible'=>-1,),
-		'date_fin' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>500, 'notnull'=>0, 'visible'=>-1,),
-		'format' => array('type'=>'varchar(2)', 'label'=>'Format', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>-1,),
-		'mailsonde' => array('type'=>'integer', 'label'=>'Mailsonde', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>-1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>-1,),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>65, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
-		'allow_comments' => array('type'=>'integer', 'label'=>'Allowcomments', 'enabled'=>'1', 'position'=>70, 'notnull'=>1, 'visible'=>-1,),
-		'allow_spy' => array('type'=>'integer', 'label'=>'Allowspy', 'enabled'=>'1', 'position'=>75, 'notnull'=>1, 'visible'=>-1,),
-		'sujet' => array('type'=>'mediumtext', 'label'=>'Sujet', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,),
-		'id_sondage_admin' => array('type'=>'char(24)', 'label'=>'Idsondageadmin', 'enabled'=>'1', 'position'=>85, 'notnull'=>0, 'visible'=>-1,),
+	public $fields = array(
+		'id_sondage' => array('type' => 'varchar(16)', 'label' => 'Idsondage', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => -1,),
+		'commentaires' => array('type' => 'mediumtext', 'label' => 'Comments', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1,),
+		'mail_admin' => array('type' => 'varchar(128)', 'label' => 'Mailadmin', 'enabled' => '1', 'position' => 20, 'notnull' => 0, 'visible' => -1,),
+		'nom_admin' => array('type' => 'varchar(64)', 'label' => 'Nomadmin', 'enabled' => '1', 'position' => 25, 'notnull' => 0, 'visible' => -1,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'titre' => array('type' => 'mediumtext', 'label' => 'Title', 'enabled' => '1', 'position' => 35, 'notnull' => 1, 'visible' => -1,),
+		'date_fin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => -1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 500, 'notnull' => 0, 'visible' => -1,),
+		'format' => array('type' => 'varchar(2)', 'label' => 'Format', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => -1,),
+		'mailsonde' => array('type' => 'integer', 'label' => 'Mailsonde', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => -1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 60, 'notnull' => 1, 'visible' => -1,),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 65, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
+		'allow_comments' => array('type' => 'integer', 'label' => 'Allowcomments', 'enabled' => '1', 'position' => 70, 'notnull' => 1, 'visible' => -1,),
+		'allow_spy' => array('type' => 'integer', 'label' => 'Allowspy', 'enabled' => '1', 'position' => 75, 'notnull' => 1, 'visible' => -1,),
+		'sujet' => array('type' => 'mediumtext', 'label' => 'Sujet', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1,),
+		'id_sondage_admin' => array('type' => 'char(24)', 'label' => 'Idsondageadmin', 'enabled' => '1', 'position' => 85, 'notnull' => 0, 'visible' => -1,),
 	);
 
 	/**
@@ -566,7 +566,7 @@ class Opensurveysondage extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -599,7 +599,7 @@ class Opensurveysondage extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
+				$tmp = array('id_users' => $obj->id_users, 'nom' => $obj->name, 'reponses' => $obj->reponses);
 
 				$this->lines[] = $tmp;
 				$i++;
@@ -832,7 +832,7 @@ class Opensurveysondage extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 3ef52447968..335009e0e29 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -69,12 +69,12 @@ class PartnershipType extends CommonObject
 	public $active;
 
 
-	public $fields=array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'label' =>array('type'=>'varchar(64)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25, 'showoncombobox'=>1),
-		'active' =>array('type'=>'integer', 'label'=>'Active', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'code' => array('type' => 'varchar(32)', 'label' => 'Code', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 20),
+		'label' => array('type' => 'varchar(64)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25, 'showoncombobox' => 1),
+		'active' => array('type' => 'integer', 'label' => 'Active', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),
 	);
 
 
@@ -182,7 +182,7 @@ class PartnershipType extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -348,7 +348,7 @@ class PartnershipType extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('myobjectdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 4d1111f1d84..7ba9d0105dc 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -125,32 +125,32 @@ class StockTransfer extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid'                    => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
-		'entity'                   => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>1, 'default'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
-		'ref'                      => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'label'                    => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'css'=>'minwidth100', 'csslist'=>'tdoverflowmax125', 'autofocusoncreate'=>1),
-		'description'              => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>3,),
-		'fk_project'               => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>32, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax125'),
-		'fk_soc'                   => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirdparty"*/, 'picto'=>'company', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax125'),
-		'fk_warehouse_source'      => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferSource', 'picto'=>'stock', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>51, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferDestination', 'picto'=>'stock', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'note_public'              => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-		'note_private'             => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'date_creation'            => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'date_prevue_depart'       => array('type'=>'date', 'label'=>'DatePrevueDepart', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>1,),
-		'date_reelle_depart'       => array('type'=>'date', 'label'=>'DateReelleDepart', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>5,),
-		'date_prevue_arrivee'      => array('type'=>'date', 'label'=>'DatePrevueArrivee', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>1,),
-		'date_reelle_arrivee'      => array('type'=>'date', 'label'=>'DateReelleArrivee', 'enabled'=>'1', 'position'=>103, 'notnull'=>0, 'visible'=>5,),
-		'lead_time_for_warning'    => array('type'=>'integer', 'label'=>'LeadTimeForWarning', 'enabled'=>'1', 'position'=>200, 'default'=>0, 'notnull'=>0, 'visible'=>1),
-		'tms'                      => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat'            => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif'            => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ChangedBy', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'import_key'               => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf'                => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'fk_incoterms'             => array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-2, 'position'=>220),
-		'location_incoterms'       => array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-2, 'position'=>225),
-		'status'                   => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'StockStransferDecremented', '3'=>'StockStransferIncremented'),),
+	public $fields = array(
+		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'entity'                   => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 1, 'default' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'ref'                      => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
+		'label'                    => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'css' => 'minwidth100', 'csslist' => 'tdoverflowmax125', 'autofocusoncreate' => 1),
+		'description'              => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 3,),
+		'fk_project'               => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'position' => 32, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
+		'fk_soc'                   => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1/*, 'help'=>"LinkToThirdparty"*/, 'picto' => 'company', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
+		'fk_warehouse_source'      => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferSource', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => '1', 'position' => 51, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferDestination', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'note_public'              => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private'             => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation'            => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'date_prevue_depart'       => array('type' => 'date', 'label' => 'DatePrevueDepart', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => 1,),
+		'date_reelle_depart'       => array('type' => 'date', 'label' => 'DateReelleDepart', 'enabled' => '1', 'position' => 101, 'notnull' => 0, 'visible' => 5,),
+		'date_prevue_arrivee'      => array('type' => 'date', 'label' => 'DatePrevueArrivee', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 1,),
+		'date_reelle_arrivee'      => array('type' => 'date', 'label' => 'DateReelleArrivee', 'enabled' => '1', 'position' => 103, 'notnull' => 0, 'visible' => 5,),
+		'lead_time_for_warning'    => array('type' => 'integer', 'label' => 'LeadTimeForWarning', 'enabled' => '1', 'position' => 200, 'default' => 0, 'notnull' => 0, 'visible' => 1),
+		'tms'                      => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat'            => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif'            => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'ChangedBy', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key'               => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf'                => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'fk_incoterms'             => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => '$conf->incoterm->enabled', 'visible' => -2, 'position' => 220),
+		'location_incoterms'       => array('type' => 'varchar(255)', 'label' => 'IncotermLabel', 'enabled' => '$conf->incoterm->enabled', 'visible' => -2, 'position' => 225),
+		'status'                   => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'StockStransferDecremented', '3' => 'StockStransferIncremented'),),
 	);
 	public $rowid;
 	public $ref;
@@ -397,7 +397,7 @@ class StockTransfer extends CommonObject
 		}
 		if (!empty($this->lines)) {
 			foreach ($this->lines as $l) {
-				$total_pmp+= ($l->pmp * $l->qty);
+				$total_pmp += ($l->pmp * $l->qty);
 			}
 		}
 
@@ -436,7 +436,7 @@ class StockTransfer extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -830,7 +830,7 @@ class StockTransfer extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('stocktransferdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => $result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index dbd2db3bce4..8eb2c92c8cb 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -95,17 +95,17 @@ class StockTransferLine extends CommonObjectLine
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
-		'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Help text for amount",),
-		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
-		'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
-		'fk_warehouse_source' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
-		'fk_stocktransfer' => array('type'=>'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label'=>'StockTransfer', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0,),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
-		'batch' => array('type'=>'varchar(128)', 'label'=>'Batch', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>1,),
-		'pmp' => array('type'=>'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label'=>'PMP', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
-		'rang' => array('type'=>'integer', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>0, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'amount' => array('type' => 'price', 'label' => 'Amount', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => '1', 'help' => "Help text for amount",),
+		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
+		'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'fk_warehouse_source' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'fk_stocktransfer' => array('type' => 'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label' => 'StockTransfer', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0,),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'batch' => array('type' => 'varchar(128)', 'label' => 'Batch', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => 1,),
+		'pmp' => array('type' => 'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label' => 'PMP', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1,),
+		'rang' => array('type' => 'integer', 'label' => 'Qty', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => 0, 'default' => '0', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
 	);
 	public $rowid;
 	public $amount;
@@ -328,7 +328,7 @@ class StockTransferLine extends CommonObjectLine
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -817,7 +817,7 @@ class StockTransferLine extends CommonObjectLine
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('stocktransferlinedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => $result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 22be8d3b914..bf874a1fa1f 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -109,31 +109,31 @@ class RecruitmentCandidature extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of candidature", 'csslist'=>'nowraponall'),
-		'fk_recruitmentjobposition' => array('type'=>'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php:0:(t.status:=:1)', 'label'=>'Job', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'picto'=>'recruitmentjobposition', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'minwidth100 nowraponall'),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax100'),
-		'lastname' => array('type'=>'varchar(128)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1, 'csslist'=>'tdoverflowmax150'),
-		'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1, 'csslist'=>'tdoverflowmax150'),
-		'email' => array('type'=>'email', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'picto'=>'email', 'csslist'=>'tdoverflowmax150'),
-		'phone' => array('type'=>'phone', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'picto'=>'phone', 'csslist'=>'tdoverflowmax150'),
-		'date_birth' => array('type'=>'date', 'label'=>'DateOfBirth', 'enabled'=>'1', 'position'=>70, 'visible'=>-1,),
-		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
-		'email_date' => array('type'=>'datetime', 'label'=>'EmailDate', 'visible'=>-2, 'enabled'=>1, 'position'=>541),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of candidature", 'csslist' => 'nowraponall'),
+		'fk_recruitmentjobposition' => array('type' => 'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php:0:(t.status:=:1)', 'label' => 'Job', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'picto' => 'recruitmentjobposition', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'minwidth100 nowraponall'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
+		'lastname' => array('type' => 'varchar(128)', 'label' => 'Lastname', 'enabled' => '1', 'position' => 20, 'notnull' => 0, 'visible' => 1, 'csslist' => 'tdoverflowmax150'),
+		'firstname' => array('type' => 'varchar(128)', 'label' => 'Firstname', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => 1, 'csslist' => 'tdoverflowmax150'),
+		'email' => array('type' => 'email', 'label' => 'EMail', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'picto' => 'email', 'csslist' => 'tdoverflowmax150'),
+		'phone' => array('type' => 'phone', 'label' => 'Phone', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 1, 'picto' => 'phone', 'csslist' => 'tdoverflowmax150'),
+		'date_birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => '1', 'position' => 70, 'visible' => -1,),
+		'email_msgid' => array('type' => 'varchar(255)', 'label' => 'EmailMsgID', 'visible' => -2, 'enabled' => 1, 'position' => 540, 'notnull' => -1, 'help' => 'EmailMsgIDDesc'),
+		'email_date' => array('type' => 'datetime', 'label' => 'EmailDate', 'visible' => -2, 'enabled' => 1, 'position' => 541),
 		//'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1),
-		'remuneration_requested' => array('type'=>'integer', 'label'=>'RequestedRemuneration', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,),
-		'remuneration_proposed' => array('type'=>'integer', 'label'=>'ProposedRemuneration', 'enabled'=>'1', 'position'=>81, 'notnull'=>0, 'visible'=>-1,),
-		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>3, 'cssview'=>'wordbreak'),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-4, 'csslist'=>'nowraponall'),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'LinkedToDolibarrUser', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax100'),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>2, 'index'=>1, 'default'=>0, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Received', '3'=>'ContractProposed', '5'=>'ContractSigned', '8'=>'Refused', '9'=>'Canceled')),
+		'remuneration_requested' => array('type' => 'integer', 'label' => 'RequestedRemuneration', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1,),
+		'remuneration_proposed' => array('type' => 'integer', 'label' => 'ProposedRemuneration', 'enabled' => '1', 'position' => 81, 'notnull' => 0, 'visible' => -1,),
+		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 300, 'notnull' => 0, 'visible' => 3, 'cssview' => 'wordbreak'),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -4, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'LinkedToDolibarrUser', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax100'),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'default' => 0, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Received', '3' => 'ContractProposed', '5' => 'ContractSigned', '8' => 'Refused', '9' => 'Canceled')),
 	);
 	public $rowid;
 	public $entity;
@@ -385,7 +385,7 @@ class RecruitmentCandidature extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -792,7 +792,7 @@ class RecruitmentCandidature extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('recruitmentcandidaturedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index c5acff1ab8a..a288bc65f97 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -115,30 +115,30 @@ class RecruitmentJobPosition extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object", 'css'=>'nowraponall'),
-		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
-		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
-		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
-		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
-		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
-		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'WorkPlace', 'enabled'=>'isModEnabled("societe")', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
-		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
-		'remuneration_suggested' => array('type'=>'varchar(255)', 'label'=>'Remuneration', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>1,),
-		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-4,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>900, 'notnull'=>0, 'visible'=>0,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '3'=>'Recruited', '9'=>'Canceled'),),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'css' => 'nowraponall'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'JobLabel', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth500', 'csslist' => 'tdoverflowmax300', 'showoncombobox' => '2', 'autofocusoncreate' => 1),
+		'qty' => array('type' => 'integer', 'label' => 'NbOfEmployeesExpected', 'enabled' => '1', 'position' => 45, 'notnull' => 1, 'visible' => 1, 'default' => '1', 'isameasure' => '1', 'css' => 'maxwidth75imp'),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'position' => 52, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'css' => 'maxwidth500', 'picto' => 'project'),
+		'fk_user_recruiter' => array('type' => 'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label' => 'ResponsibleOfRecruitement', 'enabled' => '1', 'position' => 54, 'notnull' => 1, 'visible' => 1, 'foreignkey' => 'user.rowid', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'user'),
+		'email_recruiter' => array('type' => 'varchar(255)', 'label' => 'EmailRecruiter', 'enabled' => '1', 'position' => 54, 'notnull' => 0, 'visible' => -1, 'help' => 'ToUseAGenericEmail', 'picto' => 'email'),
+		'fk_user_supervisor' => array('type' => 'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label' => 'FutureManager', 'enabled' => '1', 'position' => 55, 'notnull' => 0, 'visible' => -1, 'foreignkey' => 'user.rowid', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'user'),
+		'fk_establishment' => array('type' => 'integer:Establishment:hrm/class/establishment.class.php', 'label' => 'Establishment', 'enabled' => '$conf->hrm->enabled', 'position' => 56, 'notnull' => 0, 'visible' => -1, 'foreignkey' => 'establishment.rowid',),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'WorkPlace', 'enabled' => 'isModEnabled("societe")', 'position' => 57, 'notnull' => -1, 'visible' => -1, 'css' => 'maxwidth500', 'index' => 1, 'help' => "IfJobIsLocatedAtAPartner", 'picto' => 'company'),
+		'date_planned' => array('type' => 'date', 'label' => 'DateExpected', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 1,),
+		'remuneration_suggested' => array('type' => 'varchar(255)', 'label' => 'Remuneration', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 1,),
+		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 65, 'notnull' => 0, 'visible' => 3,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 101, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -4,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 900, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '3' => 'Recruited', '9' => 'Canceled'),),
 	);
 	public $rowid;
 
@@ -400,7 +400,7 @@ class RecruitmentJobPosition extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -869,7 +869,7 @@ class RecruitmentJobPosition extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('recruitmentjobpositiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index f852ca9b717..1bc4f15c5bf 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -99,18 +99,18 @@ class CTicketCategory extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1),
-		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'pos' =>array('type'=>'integer', 'label'=>'Pos', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30, 'showoncombobox'=>1),
-		'active' =>array('type'=>'integer', 'label'=>'Active', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'use_default' =>array('type'=>'integer', 'label'=>'Usedefault', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'description' =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'fk_parent' =>array('type'=>'integer', 'label'=>'Fkparent', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50),
-		'force_severity' =>array('type'=>'varchar(32)', 'label'=>'Forceseverity', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'public' =>array('type'=>'integer', 'label'=>'Public', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'position' => 15, 'index' => 1),
+		'code' => array('type' => 'varchar(32)', 'label' => 'Code', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 20),
+		'pos' => array('type' => 'integer', 'label' => 'Pos', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30, 'showoncombobox' => 1),
+		'active' => array('type' => 'integer', 'label' => 'Active', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'use_default' => array('type' => 'integer', 'label' => 'Usedefault', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'description' => array('type' => 'varchar(255)', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'fk_parent' => array('type' => 'integer', 'label' => 'Fkparent', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 50),
+		'force_severity' => array('type' => 'varchar(32)', 'label' => 'Forceseverity', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'public' => array('type' => 'integer', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'position' => 60),
 	);
 
 	/**
@@ -389,7 +389,7 @@ class CTicketCategory extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -542,7 +542,7 @@ class CTicketCategory extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('cticketcategorydao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 316f21b482e..fd6b5d6dc3a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -382,11 +382,11 @@ class User extends CommonObject
 	public $egroupware_id;
 
 	public $fields = array(
-		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Lastname', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1),
-		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
-		'ref_employee'=>array('type'=>'varchar(50)', 'label'=>'RefEmployee', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30, 'searchall'=>1),
-		'national_registration_number'=>array('type'=>'varchar(50)', 'label'=>'NationalRegistrationNumber', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40, 'searchall'=>1)
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
+		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 20, 'searchall' => 1),
+		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1),
+		'ref_employee' => array('type' => 'varchar(50)', 'label' => 'RefEmployee', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 30, 'searchall' => 1),
+		'national_registration_number' => array('type' => 'varchar(50)', 'label' => 'NationalRegistrationNumber', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 40, 'searchall' => 1)
 	);
 
 
@@ -1016,7 +1016,7 @@ class User extends CommonObject
 
 		if (!$error && !$notrigger) {
 			$langs->load("other");
-			$this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
+			$this->context = array('audit' => $langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
 
 			// Call trigger
 			$result = $this->call_trigger('USER_MODIFY', $user);
@@ -1139,7 +1139,7 @@ class User extends CommonObject
 
 		if (!$error && !$notrigger) {
 			$langs->load("other");
-			$this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
+			$this->context = array('audit' => $langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
 
 			// Call trigger
 			$result = $this->call_trigger('USER_MODIFY', $user);
@@ -2703,7 +2703,7 @@ class User extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!$error && !$notrigger) {
-				$this->context = array('audit'=>$langs->trans("UserSetInGroup"), 'newgroupid'=>$group);
+				$this->context = array('audit' => $langs->trans("UserSetInGroup"), 'newgroupid' => $group);
 
 				// Call trigger
 				$result = $this->call_trigger('USER_MODIFY', $user);
@@ -2758,7 +2758,7 @@ class User extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!$error && !$notrigger) {
-				$this->context = array('audit'=>$langs->trans("UserRemovedFromGroup"), 'oldgroupid'=>$group);
+				$this->context = array('audit' => $langs->trans("UserRemovedFromGroup"), 'oldgroupid' => $group);
 
 				// Call trigger
 				$result = $this->call_trigger('USER_MODIFY', $user);
@@ -3056,7 +3056,7 @@ class User extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('userdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -3289,7 +3289,7 @@ class User extends CommonObject
 			'LDAP_FIELD_NAME'		=> 'lastname',
 			'LDAP_FIELD_FIRSTNAME'	=> 'firstname',
 			'LDAP_FIELD_LOGIN'		=> 'login',
-			'LDAP_FIELD_LOGIN_SAMBA'=> 'login',
+			'LDAP_FIELD_LOGIN_SAMBA' => 'login',
 			'LDAP_FIELD_PHONE'		=> 'office_phone',
 			'LDAP_FIELD_MOBILE'		=> 'user_mobile',
 			'LDAP_FIELD_FAX'		=> 'office_fax',
@@ -4072,7 +4072,7 @@ class User extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 0b8446e329f..484991e1dc7 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -102,21 +102,21 @@ class Target extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',),
-		'url' => array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
-		'trigger_codes' => array('type'=>'text', 'label'=>'TriggerCodes', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'help'=>"TriggerCodeInfo",),
-		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'default'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'), 'validate'=>'1',),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'index' => 1, 'searchall' => 1, 'validate' => '1', 'comment' => "Reference of object"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1',),
+		'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'trigger_codes' => array('type' => 'text', 'label' => 'TriggerCodes', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => 1, 'help' => "TriggerCodeInfo",),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => '1',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'default' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'), 'validate' => '1',),
 	);
 	public $rowid;
 	public $ref;
@@ -388,7 +388,7 @@ class Target extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -748,7 +748,7 @@ class Target extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('targetdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 0b78a35107b..fd684229dd1 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -165,32 +165,32 @@ class WebsitePage extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'pageurl'        =>array('type'=>'varchar(16)', 'label'=>'WEBSITE_PAGENAME', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Ref/alias of page'),
-		'aliasalt'       =>array('type'=>'varchar(255)', 'label'=>'AliasAlt', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>11, 'searchall'=>0, 'comment'=>'Alias alternative of page'),
-		'type_container' =>array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>12, 'comment'=>'Type of container'),
-		'title'          =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'help'=>'UseTextBetween5And70Chars'),
-		'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
-		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
-		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
-		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
+		'rowid'          => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
+		'pageurl'        => array('type' => 'varchar(16)', 'label' => 'WEBSITE_PAGENAME', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'comment' => 'Ref/alias of page'),
+		'aliasalt'       => array('type' => 'varchar(255)', 'label' => 'AliasAlt', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'index' => 0, 'position' => 11, 'searchall' => 0, 'comment' => 'Alias alternative of page'),
+		'type_container' => array('type' => 'varchar(16)', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'index' => 0, 'position' => 12, 'comment' => 'Type of container'),
+		'title'          => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'searchall' => 1, 'help' => 'UseTextBetween5And70Chars'),
+		'description'    => array('type' => 'varchar(255)', 'label' => 'Description', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'searchall' => 1),
+		'image'          => array('type' => 'varchar(255)', 'label' => 'Image', 'enabled' => 1, 'visible' => 1, 'position' => 32, 'searchall' => 0, 'help' => 'Relative path of media. Used if Type is "blogpost"'),
+		'keywords'       => array('type' => 'varchar(255)', 'label' => 'Keywords', 'enabled' => 1, 'visible' => 1, 'position' => 45, 'searchall' => 0),
+		'lang'           => array('type' => 'varchar(6)', 'label' => 'Lang', 'enabled' => 1, 'notnull' => -1, 'visible' => 1, 'position' => 45, 'searchall' => 0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
-		'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
-		'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
-		'allowed_in_frames'   =>array('type'=>'integer', 'label'=>'AllowedInFrames', 'enabled'=>1, 'visible'=>-1, 'position'=>48, 'searchall'=>0, 'default'=>0),
-		'htmlheader'     =>array('type'=>'html', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
-		'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
-		'grabbed_from'   =>array('type'=>'varchar(255)', 'label'=>'GrabbedFrom', 'enabled'=>1, 'visible'=>1, 'index'=>1, 'position'=>400, 'comment'=>'URL page content was grabbed from'),
-		'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-		'tms'            =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
+		'fk_website'     => array('type' => 'integer', 'label' => 'WebsiteId', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 40, 'searchall' => 0, 'foreignkey' => 'websitepage.rowid'),
+		'fk_page'        => array('type' => 'integer', 'label' => 'ParentPageId', 'enabled' => 1, 'visible' => 1, 'notnull' => -1, 'position' => 45, 'searchall' => 0, 'foreignkey' => 'website.rowid'),
+		'allowed_in_frames'   => array('type' => 'integer', 'label' => 'AllowedInFrames', 'enabled' => 1, 'visible' => -1, 'position' => 48, 'searchall' => 0, 'default' => 0),
+		'htmlheader'     => array('type' => 'html', 'label' => 'HtmlHeader', 'enabled' => 1, 'visible' => 0, 'position' => 50, 'searchall' => 0),
+		'content'        => array('type' => 'mediumtext', 'label' => 'Content', 'enabled' => 1, 'visible' => 0, 'position' => 51, 'searchall' => 0),
+		'grabbed_from'   => array('type' => 'varchar(255)', 'label' => 'GrabbedFrom', 'enabled' => 1, 'visible' => 1, 'index' => 1, 'position' => 400, 'comment' => 'URL page content was grabbed from'),
+		'date_creation'  => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500),
+		'tms'            => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateValidation',     'enabled'=>1, 'visible'=>-1, 'position'=>502),
-		'fk_user_creat'  =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>true, 'position'=>510),
-		'author_alias'   =>array('type'=>'varchar(64)', 'label'=>'AuthorAlias', 'enabled'=>1, 'visible'=>-1, 'index'=>0, 'position'=>511, 'comment'=>'Author alias'),
-		'fk_user_modif'  =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
+		'fk_user_creat'  => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -1, 'notnull' => true, 'position' => 510),
+		'author_alias'   => array('type' => 'varchar(64)', 'label' => 'AuthorAlias', 'enabled' => 1, 'visible' => -1, 'index' => 0, 'position' => 511, 'comment' => 'Author alias'),
+		'fk_user_modif'  => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -1, 'position' => 512),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key'     =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'index'=>1, 'position'=>1000, 'notnull'=>-1),
-		'object_type' => array('type' => 'varchar(255)', 'label' => 'ObjectType', 'enabled'=>1, 'visible'=>0, 'position'=>46, 'searchall'=>0, 'help'=>''),
-		'fk_object' => array('type' => 'varchar(255)', 'label' => 'ObjectId', 'enabled'=>1, 'visible'=>0, 'position'=>47, 'searchall'=>0, 'help'=>'')
+		'import_key'     => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -1, 'index' => 1, 'position' => 1000, 'notnull' => -1),
+		'object_type' => array('type' => 'varchar(255)', 'label' => 'ObjectType', 'enabled' => 1, 'visible' => 0, 'position' => 46, 'searchall' => 0, 'help' => ''),
+		'fk_object' => array('type' => 'varchar(255)', 'label' => 'ObjectId', 'enabled' => 1, 'visible' => 0, 'position' => 47, 'searchall' => 0, 'help' => '')
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -441,7 +441,7 @@ class WebsitePage extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 82f2e02468e..ad650d6c7b0 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -97,23 +97,23 @@ class Workstation extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object", 'csslist'=>'nowraponall'),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'showoncombobox'=>'2',),
-		'type' => array('type'=>'varchar(8)', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,),
-		'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'),
-		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'),
-		'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'),),
+	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"),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'noteditable' => '0', 'default' => '', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'csslist' => 'nowraponall'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax125', 'showoncombobox' => '2',),
+		'type' => array('type' => 'varchar(8)', 'label' => 'Type', 'enabled' => '1', 'position' => 32, 'default' => 1, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('HUMAN' => 'Human', 'MACHINE' => 'Machine', 'BOTH' => 'HumanMachine'),),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 512, 'notnull' => -1, 'visible' => -2,),
+		'nb_operators_required' => array('type' => 'integer', 'label' => 'NbOperatorsRequired', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'thm_operator_estimated' => array('type' => 'double', 'help' => 'THMOperatorEstimatedHelp','label' => 'THMOperatorEstimated', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'thm_machine_estimated' => array('type' => 'double', 'help' => 'THMMachineEstimatedHelp', 'label' => 'THMMachineEstimated', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'default' => 1, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'),),
 	);
 
 	/**
@@ -435,7 +435,7 @@ class Workstation extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -484,7 +484,7 @@ class Workstation extends CommonObject
 		// Usergroups
 		$groups = GETPOST('groups', 'array:int');
 		WorkstationUserGroup::deleteAllGroupsOfWorkstation($this->id);
-		$this->usergroups=array();
+		$this->usergroups = array();
 
 		foreach ($groups as $id_group) {
 			$ws_usergroup = new WorkstationUserGroup($this->db);
@@ -497,7 +497,7 @@ class Workstation extends CommonObject
 		// Resources
 		$resources = GETPOST('resources', 'array:int');
 		WorkstationResource::deleteAllResourcesOfWorkstation($this->id);
-		$this->resources=array();
+		$this->resources = array();
 		if (!empty($resources)) {
 			foreach ($resources as $id_resource) {
 				$ws_resource = new WorkstationResource($this->db);
@@ -714,7 +714,7 @@ class Workstation extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('workstationdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 98c8c06af93..b5a25699205 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -416,7 +416,7 @@ class Hook extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 

From 7bf8f489f661deb3ffaef7fcfc4cf4eb037725f9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:35:32 +0100
Subject: [PATCH 0579/1862] Fix: $addInputLabel is at position 8 (#28711)

# Fix: $addInputLabel is at position 8

PhanPluginSuspiciousParamPosition: The position of the argument was incorrect
---
 .../class/html.formwebportal.class.php        | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/htdocs/webportal/class/html.formwebportal.class.php b/htdocs/webportal/class/html.formwebportal.class.php
index ea4debb2348..6634426f2df 100644
--- a/htdocs/webportal/class/html.formwebportal.class.php
+++ b/htdocs/webportal/class/html.formwebportal.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
  * Copyright (C) 2023-2024	Patrice Andreani		<pandreani@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -707,44 +708,44 @@ class FormWebPortal extends Form
 				$out = $this->inputType('number', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'text' :
-			case 'html' :
+			case 'text':
+			case 'html':
 				$moreparam .= ($size > 0 ? ' maxlength="' . $size . '"' : '');
 				$out = $this->inputType('text', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'email' :
+			case 'email':
 				$out = $this->inputType('email', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'tel' :
+			case 'tel':
 				$out = $this->inputType('tel', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'url' :
+			case 'url':
 				$out = $this->inputType('url', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'price' :
+			case 'price':
 				if (!empty($value)) {
 					$value = price($value); // $value in memory is a php numeric, we format it into user number format.
 				}
 				$addInputLabel = ' ' . $langs->getCurrencySymbol($conf->currency);
-				$out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam, $addInputLabel);
+				$out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam, '', $addInputLabel);
 				break;
 
-			case 'double' :
+			case 'double':
 				if (!empty($value)) {
 					$value = price($value); // $value in memory is a php numeric, we format it into user number format.
 				}
 				$out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'password' :
+			case 'password':
 				$out = $this->inputType('password', $htmlName, $value, $htmlId, $morecss, $moreparam);
 				break;
 
-			case 'radio' :
+			case 'radio':
 				foreach ($param['options'] as $keyopt => $valopt) {
 					$htmlId = $htmlName . '_' . $keyopt;
 					$htmlMoreParam = $moreparam . ($value == $keyopt ? ' checked' : '');
@@ -752,7 +753,7 @@ class FormWebPortal extends Form
 				}
 				break;
 
-			case 'select' :
+			case 'select':
 				$out = '<select class="' . $morecss . '" name="' . $htmlName . '" id="' . $htmlId . '"' . ($moreparam ? ' ' . $moreparam : '') . ' >';
 				if ($default == '' || $notNull != 1) {
 					$out .= '<option value="0">&nbsp;</option>';
@@ -771,7 +772,7 @@ class FormWebPortal extends Form
 				}
 				$out .= '</select>';
 				break;
-			case 'sellist' :
+			case 'sellist':
 				$out = '<select class="' . $morecss . '" name="' . $htmlName . '" id="' . $htmlId . '"' . ($moreparam ? ' ' . $moreparam : '') . '>';
 
 				$param_list = array_keys($param['options']);
@@ -923,7 +924,7 @@ class FormWebPortal extends Form
 				$out .= '</select>';
 				break;
 
-			case 'link' :
+			case 'link':
 				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'
 				$showempty = (($required && $default != '') ? 0 : 1);
 
@@ -931,7 +932,7 @@ class FormWebPortal extends Form
 
 				break;
 
-			default :
+			default:
 				if (!empty($hidden)) {
 					$out = $this->inputType('hidden', $htmlName, $value, $htmlId);
 				}

From d93fd1839c3fda968475d8ac1d239dcffca1c777 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:40:18 +0100
Subject: [PATCH 0580/1862] Fix typing for showOutputFieldForObject (#28709)

# Fix typing for showOutputFieldForObject

Type hint that $value can also be a list of strings.
Also updated the "else-if" sequence so that a static tool checker can
still appropriately detect when $value is a string and when it is
a list of strings so that it provides correct feedback.
Added an error message to the syslog in case we got an array but not
"array" as the value for "$type"
---
 .../class/html.formwebportal.class.php        | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/htdocs/webportal/class/html.formwebportal.class.php b/htdocs/webportal/class/html.formwebportal.class.php
index 6634426f2df..6b6c73e9944 100644
--- a/htdocs/webportal/class/html.formwebportal.class.php
+++ b/htdocs/webportal/class/html.formwebportal.class.php
@@ -948,7 +948,7 @@ class FormWebPortal extends Form
 	 * @param CommonObject $object Common object
 	 * @param array $val Array of properties of field to show
 	 * @param string $key Key of attribute
-	 * @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param string|string[] $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
 	 * @param string $moreparam To add more parameters on html input tag
 	 * @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names)
@@ -1026,6 +1026,9 @@ class FormWebPortal extends Form
 		}
 
 		// Format output value differently according to properties of field
+		//
+		// First the cases that do not use $value from the arguments:
+		//
 		if (in_array($key, array('rowid', 'ref'))) {
 			if (property_exists($object, 'ref')) {
 				$value = $object->ref;
@@ -1036,6 +1039,20 @@ class FormWebPortal extends Form
 			}
 		} elseif ($key == 'status' && method_exists($object, 'getLibStatut')) {
 			$value = $object->getLibStatut(3);
+			//
+			// Then the cases where $value is an array
+			//
+		} elseif (is_array($value)) {
+			// Handle array early to get type identification solve for static
+			// analysis
+			if ($type == 'array') {
+				$value = implode('<br>', $value);
+			} else {
+				dol_syslog(__METHOD__ . 'ERROR unexpected type=$type for array value='.((string) json_encode($value)), LOG_ERR);
+			}
+			//
+			// Then the cases where $value is not an array (hence string)
+			//
 		} elseif ($type == 'date') {
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'day');    // We suppose dates without time are always gmt (storage of course + output)
@@ -1305,8 +1322,6 @@ class FormWebPortal extends Form
 			}
 		} elseif ($type == 'password') {
 			$value = preg_replace('/./i', '*', $value);
-		} elseif ($type == 'array') {
-			$value = implode('<br>', $value);
 		} else {    // text|html|varchar
 			$value = dol_htmlentitiesbr($value);
 		}

From 6f38f4030a466d182395011459e87f3e178d77e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Mar 2024 21:55:26 +0100
Subject: [PATCH 0581/1862] Trans

---
 htdocs/langs/en_US/resource.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index 8f117e93bc9..391ba469932 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -9,6 +9,7 @@ ActionsOnResource=Events about this resource
 ResourcePageIndex=Resources list
 ResourceSingular=Resource
 ResourceCard=Resource card
+NewResource=New resource
 AddResource=Create a resource
 ResourceFormLabel_ref=Resource name
 ResourceType=Resource type

From 5371db3c0b9de09bb4cd14d8c6c095b4f545c6ee Mon Sep 17 00:00:00 2001
From: JeromeBARBOTIN <162124543+JeromeBARBOTIN@users.noreply.github.com>
Date: Fri, 8 Mar 2024 22:50:15 +0100
Subject: [PATCH 0582/1862] FIX: Verification of variables (#28623)

* Verifcation of variables

Modification of the variable setting before its use.

* To check if the property exists

* Modification as per @frederic34 suggestion

* Update propal.class.php

* Application of coding rules

Modification of the called function.

* Verification of variables

* Verification of variable

* Typo error

* Update actions_sendmails.inc.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/comm/propal/class/propal.class.php | 4 ++--
 htdocs/compta/facture/card.php            | 4 ++--
 htdocs/core/actions_sendmails.inc.php     | 4 ++--
 htdocs/societe/card.php                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 868a16ed304..5097273a833 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2704,7 +2704,7 @@ class Propal extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Status self::STATUS_REFUSED by default
-			$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED') ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
+			$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED', $this->model_pdf);
 			$trigger_name = 'PROPAL_CLOSE_REFUSED';		// used later in call_trigger()
 
 			if ($status == self::STATUS_SIGNED) {	// Status self::STATUS_SIGNED
@@ -2814,7 +2814,7 @@ class Propal extends CommonObject
 		}
 
 		if (!$error) {
-			$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
+			$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED', $this->model_pdf);
 
 			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 9d277f17bc3..82af075289f 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1820,7 +1820,7 @@ if (empty($reshook)) {
 											$date_end,
 											0,
 											$lines[$i]->info_bits,
-											$lines[$i]->fk_remise_except,
+											isset($lines[$i]->fk_remise_except) ? $lines[$i]->fk_remise_except : null,
 											'HT',
 											0,
 											$product_type,
@@ -1829,7 +1829,7 @@ if (empty($reshook)) {
 											$object->origin,
 											$lines[$i]->rowid,
 											$fk_parent_line,
-											$lines[$i]->fk_fournprice,
+											isset($lines[$i]->fk_fournprice) ? $lines[$i]->fk_fournprice : null,
 											$lines[$i]->pa_ht,
 											$label,
 											$array_options,
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index af109bd436e..2a5dc287f2b 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -434,10 +434,10 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 					setEventMessages($mesg, null, 'mesgs');
 
 					$moreparam = '';
-					if (isset($paramname2) || isset($paramval2)) {
+					if (isset($paramval2)) {
 						$moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
 					}
-					header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
+					header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ?? 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 					exit;
 				} else {
 					$langs->load("other");
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 134d68a3eab..5b29d73fefb 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -753,7 +753,7 @@ if (empty($reshook)) {
 
 
 				// Update linked member
-				if (!$error && $object->fk_soc > 0) {
+				if (!$error && isset($object->fk_soc) && $object->fk_soc > 0) {
 					$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 					$sql .= " SET fk_soc = NULL WHERE fk_soc = ".((int) $socid);
 					if (!$object->db->query($sql)) {

From c44f1025182acbefcf26a2f50fca6a30d437e3eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Mar 2024 22:58:15 +0100
Subject: [PATCH 0583/1862] Try to remove phan error

---
 dev/tools/phan/config_fixer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 11daf743c09..056a5c26805 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -176,6 +176,8 @@ return [
 	// Add any issue types (such as 'PhanUndeclaredMethod')
 	// here to inhibit them from being reported
 	'suppress_issue_types' => [
+		'PhanCompatibleNegativeStringOffset',	// return false positive
+
 		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
 		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
 		'PhanPluginShortArray',			// Dolibarr uses array()

From bb6cf2c6ed2875a3695f7cfd2f15a2e8cf547cb3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Mar 2024 23:00:55 +0100
Subject: [PATCH 0584/1862] Fix warning

---
 dev/tools/phan/config.php          | 1 +
 dev/tools/phan/config_extended.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 085d4daba12..178a021e00c 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -331,6 +331,7 @@ return [
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
 		'PhanDeprecatedFunction',
+		'PhanCompatibleNegativeStringOffset',
 		// Dolibarr has quite a few strange noop assignments like $abc=$abc;
 		'PhanPluginDuplicateExpressionAssignment',
 		// Nulls are likely mostly false positives
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index a186b90bd25..65dcc8f7389 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -326,6 +326,8 @@ return [
 	// Add any issue types (such as 'PhanUndeclaredMethod')
 	// here to inhibit them from being reported
 	'suppress_issue_types' => [
+		'PhanCompatibleNegativeStringOffset',	// return false positive
+
 		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
 		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
 		'PhanPluginShortArray',			// Dolibarr uses array()
@@ -335,6 +337,7 @@ return [
 		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
 		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
 		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+
 		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
 		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
 		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences

From d13d6617543864e72de10acacf5ca8e8ae1ccf78 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:02:45 +0100
Subject: [PATCH 0585/1862] Fix: PhanPossiblyUnsetPropertyOfThis - variable is
 unset (#28714)

# Fix: PhanPossiblyUnsetPropertyOfThis - variable is unset

Because the variable is unset to force recomputation, the Phan message
is valid and the if condition is always true.

Hence, the if condition was commented.

Also added an initialisation to an empty array before assigning array fields.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/loan/class/loan.class.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 20f51e90e78..466dde2cef3 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -501,21 +501,23 @@ class Loan extends CommonObject
 		$langs->loadLangs(array("customers", "bills"));
 
 		unset($this->labelStatus); // Force to reset the array of status label, because label can change depending on parameters
-		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
-			global $langs;
-			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
-			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
-			$this->labelStatus[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
-			if ($status == 0 && $alreadypaid > 0) {
-				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
-			}
-			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
-			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
-			$this->labelStatusShort[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
-			if ($status == 0 && $alreadypaid > 0) {
-				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
-			}
+		// Always true because of 'unset':
+		// if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+		global $langs;
+		$this->labelStatus = array();
+		$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
+		$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
+		$this->labelStatus[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
+		if ($status == 0 && $alreadypaid > 0) {
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 		}
+		$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
+		$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
+		$this->labelStatusShort[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
+		if ($status == 0 && $alreadypaid > 0) {
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+		}
+		// }  // End of empty(labelStatus,labelStatusShort)
 
 		$statusType = 'status1';
 		if (($status == 0 && $alreadypaid > 0) || $status == self::STATUS_STARTED) {
@@ -594,7 +596,7 @@ class Loan extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 3b5779589503432391ecf93e72d9c21c6b9e7c60 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:04:15 +0100
Subject: [PATCH 0586/1862] Qual: Update selectDate '' arguments h, m and empty
 to match PHPdoc (set to 0) (#28718)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* Qual: Update selectDate '' arguments h, m and empty to match PHPdoc (set to 0)

* New: Fixer for selectDate '' arguments h, m and empty

* Qual: Update codespell exceptions
---
 .../codespell/codespell-lines-ignore.txt      |   1 +
 dev/tools/phan/config_fixer.php               |   1 +
 dev/tools/phan/plugins/SelectDateFixer.php    | 175 ++++++++++++++++++
 htdocs/accountancy/bookkeeping/card.php       |   4 +-
 htdocs/adherents/card.php                     |   4 +-
 htdocs/adherents/subscription.php             |   4 +-
 htdocs/admin/expensereport_rules.php          |   8 +-
 htdocs/comm/propal/card.php                   |  10 +-
 htdocs/commande/card.php                      |   6 +-
 htdocs/commande/list.php                      |   2 +-
 htdocs/compta/bank/line.php                   |   4 +-
 htdocs/compta/bank/transfer.php               |   2 +-
 htdocs/compta/bank/various_payment/card.php   |  10 +-
 htdocs/compta/deplacement/card.php            |   4 +-
 htdocs/compta/facture/card-rec.php            |   2 +-
 htdocs/compta/facture/card.php                |   4 +-
 htdocs/compta/localtax/card.php               |   4 +-
 htdocs/compta/paiement.php                    |   4 +-
 htdocs/compta/paiement/cheque/card.php        |   2 +-
 htdocs/compta/paiement_charge.php             |   2 +-
 htdocs/compta/paiement_vat.php                |   2 +-
 htdocs/compta/prelevement/card.php            |   6 +-
 htdocs/compta/prelevement/line.php            |   2 +-
 htdocs/compta/tva/card.php                    |   6 +-
 htdocs/contrat/card.php                       |  14 +-
 htdocs/cron/card.php                          |   8 +-
 htdocs/delivery/card.php                      |   2 +-
 htdocs/don/card.php                           |   4 +-
 htdocs/expedition/card.php                    |  36 ++--
 htdocs/expedition/dispatch.php                |  18 +-
 htdocs/expedition/shipment.php                |   2 +-
 htdocs/expensereport/payment/payment.php      |   2 +-
 htdocs/fichinter/card-rec.php                 |  28 +--
 htdocs/fourn/commande/card.php                |   8 +-
 htdocs/fourn/commande/dispatch.php            |   6 +-
 htdocs/fourn/commande/list.php                |  60 +++---
 htdocs/fourn/facture/card-rec.php             |   2 +-
 htdocs/fourn/facture/card.php                 |   4 +-
 htdocs/fourn/facture/paiement.php             |  10 +-
 htdocs/loan/card.php                          |   4 +-
 htdocs/loan/payment/payment.php               |   2 +-
 htdocs/margin/agentMargins.php                |   4 +-
 htdocs/margin/checkMargins.php                |   4 +-
 htdocs/margin/customerMargins.php             |   4 +-
 htdocs/margin/productMargins.php              |   4 +-
 htdocs/opensurvey/wizard/create_survey.php    |   2 +-
 htdocs/product/stock/product.php              |   6 +-
 .../product/stock/tpl/stockcorrection.tpl.php |   6 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |   4 +-
 htdocs/projet/tasks/time.php                  |   2 +-
 htdocs/reception/card.php                     |  28 +--
 htdocs/reception/dispatch.php                 |  16 +-
 htdocs/reception/list.php                     |   2 +-
 htdocs/salaries/card.php                      |   8 +-
 htdocs/supplier_proposal/card.php             |   8 +-
 55 files changed, 377 insertions(+), 200 deletions(-)
 create mode 100644 dev/tools/phan/plugins/SelectDateFixer.php

diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 94c67e08f75..2c0fb95a96f 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -178,6 +178,7 @@
 		if (empty($this->datea)) {
 		if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
+		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', 0, 0, 0, '', 1, 0);
 		print $object->datee ? dol_print_date($object->datee, 'daytext') : '&nbsp;';
 		print '<input type="hidden" name="action" value="addin">';
 		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 056a5c26805..18e50834844 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -5,6 +5,7 @@
 //require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
 //require_once __DIR__.'/plugins/PriceFormFixer.php';
 //require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
+require_once __DIR__.'/plugins/SelectDateFixer.php';
 
 /* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  */
diff --git a/dev/tools/phan/plugins/SelectDateFixer.php b/dev/tools/phan/plugins/SelectDateFixer.php
new file mode 100644
index 00000000000..c475d7b2b81
--- /dev/null
+++ b/dev/tools/phan/plugins/SelectDateFixer.php
@@ -0,0 +1,175 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$details = (string) $instance->getTemplateParameters()[4];
+		$functionlike = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\Form::selectDate()";
+		$expected_name = "selectDate";
+		if ($functionlike !== $expected_functionlike) {
+			print "$functionlike != '$expected_functionlike'".PHP_EOL;
+			return null;
+		}
+
+		// Check if we fix any of this
+		if (
+			($argument_name === 'h' && $argument_code === "''")
+			|| ($argument_name === 'm' && $argument_code === "''")
+			|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = '0';
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = "";
+		} else {
+			print "ARG$argument_index:$argument_name CODE:$argument_code".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				// print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				// print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$stringValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				&& $arg->expression instanceof StringLiteral
+			) {
+				// Get the string value of the StringLiteral
+				$stringValue = $arg->expression->getStringContentsText();
+				print "String is '$stringValue'".PHP_EOL;
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$stringValue = '';  // Fake empty
+			} else {
+				print "Expression is not string or null ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($stringValue !== $expectedStringValue) {
+				print "Not replacing $argument_name which is '$stringValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$stringValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgumentProbablyReal',
+		$fix
+	);
+});
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 444cb44d104..66838b8c2e2 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -374,7 +374,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Docdate").'</td>';
 	print '<td>';
-	print $form->selectDate('', 'doc_date', '', '', '', "create_mvt", 1, 1);
+	print $form->selectDate('', 'doc_date', 0, 0, 0, "create_mvt", 1, 1);
 	print '</td>';
 	print '</tr>';
 
@@ -459,7 +459,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', '', '', '', "setdate");
+			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', 0, 0, 0, "setdate");
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index a75d6358477..aaee4c47aa4 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1118,7 +1118,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Birth Date
 		print "<tr><td>".$langs->trans("DateOfBirth")."</td><td>\n";
-		print img_picto('', 'object_calendar', 'class="pictofixedwidth"').$form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
+		print img_picto('', 'object_calendar', 'class="pictofixedwidth"').$form->selectDate(($object->birth ? $object->birth : -1), 'birth', 0, 0, 1, 'formsoc');
 		print "</td></tr>\n";
 
 		// Public profil
@@ -1365,7 +1365,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Birth Date
 		print "<tr><td>".$langs->trans("DateOfBirth")."</td><td>\n";
-		print img_picto('', 'object_calendar', 'class="pictofixedwidth"').$form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
+		print img_picto('', 'object_calendar', 'class="pictofixedwidth"').$form->selectDate(($object->birth ? $object->birth : -1), 'birth', 0, 0, 1, 'formsoc');
 		print "</td></tr>\n";
 
 		// Default language
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 512189bef85..3ace1b42d58 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -996,7 +996,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 			$datefrom = dol_get_first_day(dol_print_date($datefrom, "%Y"));
 		}
 	}
-	print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
+	print $form->selectDate($datefrom, '', 0, 0, 0, "subscription", 1, 1);
 	print "</td></tr>";
 
 	// Date end subscription
@@ -1013,7 +1013,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 		}
 	}
 	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
-	print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
+	print $form->selectDate($dateto, 'end', 0, 0, 0, "subscription", 1, 0);
 	print "</td></tr>";
 
 	if ($adht->subscription) {
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index b3f22626264..abadd050991 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -222,8 +222,8 @@ if ($action != 'edit') {
 
 	echo '<td class="linecoltype">' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . '</td>';
 	echo '<td class="linecoltyperule">' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . '</td>';
-	echo '<td class="linecoldatestart">' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0) . '</td>';
-	echo '<td class="linecoldateend">' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0) . '</td>';
+	echo '<td class="linecoldatestart">' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', 0, 0, 0, '', 1, 0) . '</td>';
+	echo '<td class="linecoldateend">' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', 0, 0, 0, '', 1, 0) . '</td>';
 	echo '<td class="linecolamount"><input type="text" value="" class="maxwidth100" name="amount" class="amount right" /></td>';
 	echo '<td class="linecolrestrictive">' . $form->selectyesno('restrictive', 0, 1) . '</td>';
 	echo '<td class="right linecolbutton"><input type="submit" class="button button-add" value="' . $langs->trans('Add') . '" /></td>';
@@ -308,7 +308,7 @@ foreach ($rules as $rule) {
 
 	echo '<td class="linecoldatestart">';
 	if ($action == 'edit' && $object->id == $rule->id) {
-		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
+		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', 0, 0, 0, '', 1, 0);
 	} else {
 		echo dol_print_date($rule->dates, 'day');
 	}
@@ -317,7 +317,7 @@ foreach ($rules as $rule) {
 
 	echo '<td class="linecoldateend">';
 	if ($action == 'edit' && $object->id == $rule->id) {
-		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
+		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', 0, 0, 0, '', 1, 0);
 	} else {
 		echo dol_print_date($rule->datee, 'day');
 	}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 6d6ac13c58d..cb2001fc399 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1971,7 +1971,7 @@ if ($action == 'create') {
 		// Date
 		print '<tr class="field_addprop"><td class="titlefieldcreate fieldrequired">'.$langs->trans('DatePropal').'</td><td class="valuefieldcreate">';
 		print img_picto('', 'action', 'class="pictofixedwidth"');
-		print $form->selectDate('', '', '', '', '', "addprop", 1, 1);
+		print $form->selectDate('', '', 0, 0, 0, "addprop", 1, 1);
 		print '</td></tr>';
 
 		// Validaty duration
@@ -2042,9 +2042,9 @@ if ($action == 'create') {
 			$syear = date("Y", $tmpdte);
 			$smonth = date("m", $tmpdte);
 			$sday = date("d", $tmpdte);
-			print $form->selectDate($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop");
+			print $form->selectDate($syear."-".$smonth."-".$sday, 'date_livraison', 0, 0, 0, "addprop");
 		} else {
-			print $form->selectDate(-1, 'date_livraison', '', '', '', "addprop", 1, 1);
+			print $form->selectDate(-1, 'date_livraison', 0, 0, 0, "addprop", 1, 1);
 		}
 		print '</td></tr>';
 
@@ -2582,7 +2582,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-			print $form->selectDate($object->date, 're', '', '', 0, "editdate");
+			print $form->selectDate($object->date, 're', 0, 0, 0, "editdate");
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
@@ -2610,7 +2610,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setecheance">';
 			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-			print $form->selectDate($object->fin_validite, 'ech', '', '', '', "editecheance");
+			print $form->selectDate($object->fin_validite, 'ech', 0, 0, 0, "editecheance");
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 9722ca53344..11b3f049599 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1915,7 +1915,7 @@ if ($action == 'create' && $usercancreate) {
 		// Date
 		print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 		print img_picto('', 'action', 'class="pictofixedwidth"');
-		print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
+		print $form->selectDate('', 're', 0, 0, 0, "crea_commande", 1, 1); // Always autofill date with current date
 		print '</td></tr>';
 
 		// Date delivery planned
@@ -2546,7 +2546,7 @@ if ($action == 'create' && $usercancreate) {
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate">';
 				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-				print $form->selectDate($object->date, 'order_', '', '', '', "setdate");
+				print $form->selectDate($object->date, 'order_', 0, 0, 0, "setdate");
 				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
@@ -2568,7 +2568,7 @@ if ($action == 'create' && $usercancreate) {
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate_livraison">';
 				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-				print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+				print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
 				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b84de3413f5..54ba84705cb 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1413,7 +1413,7 @@ if ($massaction == 'createbills') {
 	print $langs->trans('DateInvoice');
 	print '</td>';
 	print '<td>';
-	print $form->selectDate('', '', '', '', '', '', 1, 1);
+	print $form->selectDate('', '', 0, 0, 0, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 	print '<tr>';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 5b27d9ccd39..c0cbdb0447e 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -546,7 +546,7 @@ if ($result) {
 		print '<tr><td>'.$langs->trans("DateOperation").'</td>';
 		if ($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consolidate')) {
 			print '<td>';
-			print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
+			print $form->selectDate($db->jdate($objp->do), 'dateo', 0, 0, 0, 'update', 1, 0, $objp->rappro);
 			if (!$objp->rappro) {
 				print ' &nbsp; ';
 				print '<a class="ajaxforbankoperationchange" href="'.$_SERVER['PHP_SELF'].'?action=doprev&id='.$objp->fk_account.'&rowid='.$objp->rowid.'&token='.newToken().'">';
@@ -566,7 +566,7 @@ if ($result) {
 		print "<tr><td>".$langs->trans("DateValue")."</td>";
 		if ($user->hasRight('banque', 'modifier') || $user->hasRight('banque', 'consolidate')) {
 			print '<td>';
-			print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
+			print $form->selectDate($db->jdate($objp->dv), 'datev', 0, 0, 0, 'update', 1, 0, $objp->rappro);
 			if (!$objp->rappro) {
 				print ' &nbsp; ';
 				print '<a class="ajaxforbankoperationchange" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&id='.$objp->fk_account.'&rowid='.$objp->rowid.'&token='.newToken().'">';
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 71c620c0a5d..1ecfab6693c 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -335,7 +335,7 @@ for ($i = 1 ; $i < $MAXLINES; $i++) {
 
 	// Date
 	print '<td class="nowraponall">';
-	print $form->selectDate((!empty($dateo[$i]) ? $dateo[$i] : ''), $i.'_', '', '', '', 'add');
+	print $form->selectDate((!empty($dateo[$i]) ? $dateo[$i] : ''), $i.'_', 0, 0, 0, 'add');
 	print "</td>\n";
 
 	// Description
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index b35350f2ee4..505b5b64ccc 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -415,13 +415,13 @@ if ($action == 'create') {
 	// Date payment
 	print '<tr><td class="titlefieldcreate">';
 	print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).'</td><td>';
-	print $form->selectDate((empty($datep) ? -1 : $datep), "datep", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datep) ? -1 : $datep), "datep", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date value for bank
 	print '<tr><td>';
 	print $form->editfieldkey('DateValue', 'datev', '', $object, 0).'</td><td>';
-	print $form->selectDate((empty($datev) ? -1 : $datev), "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datev) ? -1 : $datev), "datev", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Label
@@ -561,9 +561,9 @@ if ($id) {
 
 		$formquestion = array(
 			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
-			array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1),
+			array('type' => 'date', 'tdclass' => 'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1),
 			array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1),
-			array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'clone_accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($object->fk_account, "accountid", 0, '', 1, '', 0, 'minwidth200', 1)),
+			array('type' => 'other', 'tdclass' => 'fieldrequired', 'name' => 'clone_accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($object->fk_account, "accountid", 0, '', 1, '', 0, 'minwidth200', 1)),
 			array('type' => 'text', 'name' => 'clone_amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount)),
 			array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens").' '.$set_value_help, 'values' => $sensarray, 'default' => $object->sens),
 		);
@@ -712,7 +712,7 @@ if ($id) {
 	}
 
 	// Other attributes
-	$parameters = array('socid'=>$object->id);
+	$parameters = array('socid' => $object->id);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 785bc96edc5..bcc66ade965 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -221,7 +221,7 @@ if ($action == 'create') {
 
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
+	print $form->selectDate($datec ? $datec : -1, '', 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Km
@@ -451,7 +451,7 @@ if ($action == 'create') {
 			print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
 			// Other attributes
-			$parameters = array('socid'=>$object->id);
+			$parameters = array('socid' => $object->id);
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			print "</table><br>";
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 954b0eb3077..59318f1a753 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1135,7 +1135,7 @@ if ($action == 'create') {
 		// Date next run
 		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
 		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
-		print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
+		print $form->selectDate($date_next_execution, '', 1, 1, 0, "add", 1, 1);
 		print "</td></tr>";
 
 		// Number max of generation
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 82af075289f..a0748e540ed 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3843,14 +3843,14 @@ if ($action == 'create') {
 		// Date invoice
 		print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td colspan="2">';
 		print img_picto('', 'action', 'class="pictofixedwidth"');
-		print $form->selectDate($newdateinvoice ? $newdateinvoice : $dateinvoice, '', '', '', '', "add", 1, 1);
+		print $form->selectDate($newdateinvoice ? $newdateinvoice : $dateinvoice, '', 0, 0, 0, "add", 1, 1);
 		print '</td></tr>';
 
 		// Date point of tax
 		if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 			print '<tr><td class="fieldrequired">'.$langs->trans('DatePointOfTax').'</td><td colspan="2">';
 			print img_picto('', 'action', 'class="pictofixedwidth"');
-			print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', '', '', '', "add", 1, 1);
+			print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', 0, 0, 0, "add", 1, 1);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index a7a7c5f5898..2797c3203c9 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -164,12 +164,12 @@ if ($action == 'create') {
 	// Date of payment
 	print "<tr>";
 	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print $form->selectDate($datep, "datep", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// End date of period
 	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-	print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate($datev, "datev", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Label
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 63938b6742c..f7a2026903d 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -90,7 +90,7 @@ $result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $field
  * Actions
  */
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -490,7 +490,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
 		$datepayment = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 		$datepayment = ($datepayment == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datepayment);
-		print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
+		print $form->selectDate($datepayment, '', 0, 0, 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
 		print '</td></tr>';
 
 		// Payment mode
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 097006e12e2..29cd19534e9 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -628,7 +628,7 @@ if ($action == 'new') {
 		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate">';
-		print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
+		print $form->selectDate($object->date_bordereau, 'datecreate_', 0, 0, 0, "setdate");
 		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 44a6cb3fe71..0094a541cf6 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -204,7 +204,7 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOSTISSET("remonth") ? $datepaye : -1) : '';
-	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
+	print $form->selectDate($datepayment, '', 0, 0, 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
 	print "</td>";
 	print '</tr>';
 
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 20b574adac4..3b98f540a22 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -203,7 +203,7 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOSTINT("remonth") ? $datepaye : -1) : 0;
-	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	print $form->selectDate($datepayment, '', 0, 0, 0, "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 24e37a37904..691f6d903bf 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -236,7 +236,7 @@ if ($id > 0 || $ref) {
 			print '<form name="setdate_trans" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_trans">';
-			print $form->selectDate($object->date_trans ? $object->date_trans : -1, 'date_trans', 0, '', "setdate_trans");
+			print $form->selectDate($object->date_trans ? $object->date_trans : -1, 'date_trans', 0, 0, "setdate_trans");
 			print '<input type="submit" class="button button-edit smallpaddingimp valign middle" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
@@ -383,7 +383,7 @@ if ($id > 0 || $ref) {
 		print '<tr class="liste_titre">';
 		print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
 		print '<tr class="oddeven"><td>'.$langs->trans("TransData").'</td><td>';
-		print $form->selectDate('', '', '', '', '', "userfile", 1, 1);
+		print $form->selectDate('', '', 0, 0, 0, "userfile", 1, 1);
 		print '</td></tr>';
 		print '<tr class="oddeven"><td>'.$langs->trans("TransMetod").'</td><td>';
 		print $form->selectarray("methode", $object->methodes_trans);
@@ -403,7 +403,7 @@ if ($id > 0 || $ref) {
 		print '<tr class="liste_titre">';
 		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
 		print '<tr class="oddeven"><td>'.$langs->trans('CreditDate').'</td><td>';
-		print $form->selectDate(-1, '', '', '', '', "infocredit", 1, 1);
+		print $form->selectDate(-1, '', 0, 0, 0, "infocredit", 1, 1);
 		print '</td></tr>';
 		print '</table>';
 		print '<br><div class="center"><span class="opacitymedium">'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice").'</span></div>';
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index de713bb137b..85e92020011 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -233,7 +233,7 @@ if ($id) {
 		//Date
 		print '<tr><td class="fieldrequired valid">'.$langs->trans("RefusedData").'</td>';
 		print '<td class="valid">';
-		print $form->selectDate('', '', '', '', '', "confirm_rejet");
+		print $form->selectDate('', '', 0, 0, 0, "confirm_rejet");
 		print '</td></tr>';
 
 		//Reason
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 47669898244..d3f0886eae9 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -223,7 +223,7 @@ if (empty($reshook)) {
 				$paiement = new PaymentVAT($db);
 				$paiement->chid         = $object->id;
 				$paiement->datepaye     = $datep;
-				$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
+				$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", 'restricthtml');
@@ -460,7 +460,7 @@ if ($action == 'create') {
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input class="minwidth300" name="label" id="label" value="'.(GETPOSTISSET("label") ? GETPOST("label", '', 2) : $label).'" autofocus></td></tr>';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-	print $form->selectDate((GETPOSTINT("datevmonth") ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate((GETPOSTINT("datevmonth") ? $datev : -1), "datev", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Amount
@@ -474,7 +474,7 @@ if ($action == 'create') {
 
 	print '<tr class="hide_if_no_auto_create_payment">';
 	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print $form->selectDate($datep, "datep", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Type payment
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 613403d2f44..98c46cc9f47 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -380,7 +380,7 @@ if (empty($reshook)) {
 									$lines[$i]->pa_ht,
 									$array_options,
 									$lines[$i]->fk_unit,
-									$num+1
+									$num + 1
 								);
 
 								if ($result < 0) {
@@ -1245,7 +1245,7 @@ if ($action == 'create') {
 
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
 	print img_picto('', 'action', 'class="pictofixedwidth"');
-	print $form->selectDate($datecontrat, '', 0, 0, '', "contrat");
+	print $form->selectDate($datecontrat, '', 0, 0, 0, "contrat");
 	print "</td></tr>";
 
 	// Project
@@ -1352,7 +1352,7 @@ if ($action == 'create') {
 			$formquestion = array(
 				array('type' => 'date', 'name' => 'd_start', 'label' => $langs->trans("DateServiceActivate"), 'value' => dol_now()),
 				array('type' => 'date', 'name' => 'd_end', 'label' => $langs->trans("DateEndPlanned"), /*'value' => $form->selectDate('', "end", $usehm, $usehm, '', "active", 1, 0),*/ '', ''),
-				array('type' => 'text', 'name' => 'comment', 'label' => $langs->trans("Comment"), 'value' => '', '', '', 'class' => 'minwidth300', 'moreattr'=>'autofocus')
+				array('type' => 'text', 'name' => 'comment', 'label' => $langs->trans("Comment"), 'value' => '', '', '', 'class' => 'minwidth300', 'moreattr' => 'autofocus')
 			);
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", $formquestion, 'yes', 1, 280);
 		} elseif ($action == 'clone') {
@@ -1730,7 +1730,7 @@ if ($action == 'create') {
 						$line = new ContratLigne($db);
 						$line->id = $objp->rowid;
 						$line->fetch_optionals();
-						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven', 'style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
+						print $line->showOptionals($extrafields, 'view', array('class' => 'oddeven', 'style' => $moreparam, 'colspan' => $colspan), '', '', 1);
 					}
 				} else {
 					// Line in mode update
@@ -1834,7 +1834,7 @@ if ($action == 'create') {
 						$line = new ContratLigne($db);
 						$line->id = $objp->rowid;
 						$line->fetch_optionals();
-						print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', 1);
+						print $line->showOptionals($extrafields, 'edit', array('style' => 'class="oddeven"', 'colspan' => $colspan), '', '', 1);
 					}
 				}
 
@@ -1992,10 +1992,10 @@ if ($action == 'create') {
 
 				print '<tr class="oddeven">';
 				print '<td class="nohover">'.$langs->trans("DateServiceActivate").'</td><td class="nohover">';
-				print $form->selectDate($dateactstart, 'start', $usehm, $usehm, '', "active", 1, 0);
+				print $form->selectDate($dateactstart, 'start', $usehm, $usehm, 0, "active", 1, 0);
 				print '</td>';
 				print '<td class="nohover">'.$langs->trans("DateEndPlanned").'</td><td class="nohover">';
-				print $form->selectDate($dateactend, "end", $usehm, $usehm, '', "active", 1, 0);
+				print $form->selectDate($dateactend, "end", $usehm, $usehm, 0, "active", 1, 0);
 				print '</td>';
 				print '<td class="center nohover">';
 				print '</td>';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 68dbac1b3e7..032dca46d45 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -492,7 +492,7 @@ if (($action == "create") || ($action == "edit")) {
 	print "<tr><td>";
 	print $langs->trans('CronDtStart')."</td><td>";
 	if (!empty($object->datestart)) {
-		print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
+		print $form->selectDate($object->datestart, 'datestart', 1, 1, 0, "cronform");
 	} else {
 		print $form->selectDate(-1, 'datestart', 1, 1, 1, "cronform");
 	}
@@ -504,7 +504,7 @@ if (($action == "create") || ($action == "edit")) {
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if (!empty($object->dateend)) {
-		print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
+		print $form->selectDate($object->dateend, 'dateend', 1, 1, 0, "cronform");
 	} else {
 		print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
 	}
@@ -542,9 +542,9 @@ if (($action == "create") || ($action == "edit")) {
 	//print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
 	if (!empty($object->datenextrun)) {
-		print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
+		print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, 0, "cronform");
 	} else {
-		print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform", 1, 1);
+		print $form->selectDate(-1, 'datenextrun', 1, 1, 0, "cronform", 1, 1);
 	}
 	print "</td>";
 	print "<td>";
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 7dccbfbdd44..7ee3fd7ea4b 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -430,7 +430,7 @@ if ($action == 'create') {
 				print '<form name="setdate_delivery" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate_delivery">';
-				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_delivery", 1, 1);
+				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_delivery", 1, 1);
 				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 06546f208d1..2e28a7c2655 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -490,7 +490,7 @@ if ($action == 'create') {
 
 	// Date
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($donation_date ? $donation_date : -1, '', '', '', '', "add", 1, 1);
+	print $form->selectDate($donation_date ? $donation_date : -1, '', 0, 0, 0, "add", 1, 1);
 	print '</td>';
 
 	// Amount
@@ -623,7 +623,7 @@ if (!empty($id) && $action == 'edit') {
 
 	// Date
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($object->date, '', '', '', '', "update");
+	print $form->selectDate($object->date, '', 0, 0, 0, "update");
 	print '</td>';
 
 	// Amount
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8c259b63e2a..e42131e8cb4 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -274,7 +274,7 @@ if (empty($reshook)) {
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			$is_batch_or_serial=0;
+			$is_batch_or_serial = 0;
 			if (!empty($objectsrc->lines[$i]->fk_product)) {
 				$resultFetch = $product->fetch($objectsrc->lines[$i]->fk_product, '', '', '', 1, 1, 1);
 				if ($resultFetch < 0) {
@@ -300,9 +300,9 @@ if (empty($reshook)) {
 						//var_dump($sub_qty[$j]['id_batch']);
 
 						//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
-						if ($is_batch_or_serial==2 && $sub_qty[$j]['q']>1) {
+						if ($is_batch_or_serial == 2 && $sub_qty[$j]['q'] > 1) {
 							setEventMessages($langs->trans("TooManyQtyForSerialNumber", $product->ref, ''), null, 'errors');
-							$totalqty=0;
+							$totalqty = 0;
 							break 2;
 						}
 						$j++;
@@ -351,7 +351,7 @@ if (empty($reshook)) {
 
 			// check qty shipped not greater than ordered
 			if (getDolGlobalInt("MAIN_DONT_SHIP_MORE_THAN_ORDERED") && $subtotalqty > $objectsrc->lines[$i]->qty) {
-				setEventMessages($langs->trans("ErrorTooMuchShipped", $i+1), null, 'errors');
+				setEventMessages($langs->trans("ErrorTooMuchShipped", $i + 1), null, 'errors');
 				$error++;
 				continue;
 			}
@@ -679,7 +679,7 @@ if (empty($reshook)) {
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								} else {
-									$update_done=true;
+									$update_done = true;
 								}
 							} else {
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
@@ -723,7 +723,7 @@ if (empty($reshook)) {
 										setEventMessages($line->error, $line->errors, 'errors');
 										$error++;
 									} else {
-										$update_done=true;
+										$update_done = true;
 									}
 								} else {
 									setEventMessages($line->error, $line->errors, 'errors');
@@ -742,7 +742,7 @@ if (empty($reshook)) {
 									setEventMessages($object->error, $object->errors, 'errors');
 									$error++;
 								} else {
-									$update_done=true;
+									$update_done = true;
 								}
 							}
 						} else {
@@ -794,7 +794,7 @@ if (empty($reshook)) {
 											setEventMessages($line->error, $line->errors, 'errors');
 											$error++;
 										} else {
-											$update_done=true;
+											$update_done = true;
 										}
 									}
 									unset($_POST[$stockLocation]);
@@ -810,7 +810,7 @@ if (empty($reshook)) {
 								setEventMessages($line->error, $line->errors, 'errors');
 								$error++;
 							} else {
-								$update_done=true;
+								$update_done = true;
 							}
 							unset($_POST[$qty]);
 						}
@@ -824,7 +824,7 @@ if (empty($reshook)) {
 							setEventMessages($line->error, $line->errors, 'errors');
 							$error++;
 						} else {
-							$update_done=true;
+							$update_done = true;
 						}
 						unset($_POST[$qty]);
 					}
@@ -1604,7 +1604,7 @@ if ($action == 'create') {
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-									$nbofsuggested+=count($stock_warehouse->detail_batch);
+									$nbofsuggested += count($stock_warehouse->detail_batch);
 								}
 							}
 
@@ -1749,7 +1749,7 @@ if ($action == 'create') {
 
 						$expLine->array_options = array_merge($expLine->array_options, $srcLine->array_options);
 
-						print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
+						print $expLine->showOptionals($extrafields, 'edit', array('style' => 'class="drag drop oddeven"', 'colspan' => $colspan), $indiceAsked, '', 1);
 					}
 				}
 
@@ -1957,7 +1957,7 @@ if ($action == 'create') {
 		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
-		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
 		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
@@ -2266,9 +2266,9 @@ if ($action == 'create') {
 				if ($obj) {
 					// $obj->rowid is rowid in $origin."det" table
 					$alreadysent[$obj->rowid][$obj->shipmentline_id] = array(
-						'shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped,
-						'product_tosell'=>$obj->product_tosell, 'product_tobuy'=>$obj->product_tobuy, 'product_tobatch'=>$obj->product_tobatch,
-						'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
+						'shipment_ref' => $obj->shipment_ref, 'shipment_id' => $obj->shipment_id, 'warehouse' => $obj->fk_entrepot, 'qty_shipped' => $obj->qty_shipped,
+						'product_tosell' => $obj->product_tosell, 'product_tobuy' => $obj->product_tobuy, 'product_tobatch' => $obj->product_tobatch,
+						'date_valid' => $db->jdate($obj->date_valid), 'date_delivery' => $db->jdate($obj->date_delivery));
 				}
 				$i++;
 			}
@@ -2608,9 +2608,9 @@ if ($action == 'create') {
 
 				// TODO Show all in same line by setting $display_type = 'line'
 				if ($action == 'editline' && $line->id == $line_id) {
-					print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+					print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan' => $colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
 				} else {
-					print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+					print $lines[$i]->showOptionals($extrafields, 'view', array('colspan' => $colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
 				}
 			}
 		}
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 8334b30bdef..913f069ff61 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -51,7 +51,7 @@ if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
-	// Security check
+// Security check
 $id = GETPOSTINT("id");
 $ref = GETPOST('ref');
 $lineid = GETPOSTINT('lineid');
@@ -510,7 +510,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
-		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
 		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
@@ -677,7 +677,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 			$nbfreeproduct = 0; // Nb of lins of free products/services
 			$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
-									// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
+			// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
 
 			$conf->cache['product'] = array();
 
@@ -838,13 +838,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 										print '<td class="nowraponall">';
 										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
-										print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
+										print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 										print '</td>';
 									}
 									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 										print '<td class="nowraponall">';
 										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
-										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
+										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 										print '</td>';
 									}
 									print '<td colspan="2">&nbsp;</td>'; // Supplier ref + Qty ordered + qty already dispatched
@@ -895,10 +895,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 								print '<td>';
 								if (isModEnabled('productbatch') && $objp->tobatch > 0) {
 									$type = 'batch';
-									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j+1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
+									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 								} else {
 									$type = 'dispatch';
-									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j+1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
+									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 								}
 
 								print '</td>';
@@ -983,13 +983,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="nowraponall">';
 									$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
-									print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
+									print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 									print '</td>';
 								}
 								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="nowraponall">';
 									$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
-									print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
+									print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 									print '</td>';
 								}
 								print '<td colspan="2">&nbsp;</td>'; // Supplier ref + Qty ordered + qty already dispatched
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index fe20c6ed008..7809b47105b 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -368,7 +368,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
-			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 0df2d3583a1..e1de1f7015b 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -238,7 +238,7 @@ if ($action == 'create' || empty($action)) {
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepayment = ($datepaid == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datepaid);
-	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1);
+	print $form->selectDate($datepayment, '', 0, 0, 0, "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index bd1670c51e8..8e7aad352be 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -97,17 +97,17 @@ $extrafields = new ExtraFields($db);
 
 
 $arrayfields = array(
-	'f.titre'=>array('label'=>"Ref", 'checked'=>1),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	'f.fk_contrat'=>array('label'=>"Contract", 'checked'=>1),
-	'f.duree'=>array('label'=>"Duration", 'checked'=>1),
-	'f.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>1),
-	'f.frequency'=>array('label'=>"RecurringInvoiceTemplate", 'checked'=>1),
-	'f.nb_gen_done'=>array('label'=>"NbOfGenerationDoneShort", 'checked'=>1),
-	'f.date_last_gen'=>array('label'=>"DateLastGeneration", 'checked'=>1),
-	'f.date_when'=>array('label'=>"NextDateToExecution", 'checked'=>1),
-	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'f.titre' => array('label' => "Ref", 'checked' => 1),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1),
+	'f.fk_contrat' => array('label' => "Contract", 'checked' => 1),
+	'f.duree' => array('label' => "Duration", 'checked' => 1),
+	'f.total_ttc' => array('label' => "AmountTTC", 'checked' => 1),
+	'f.frequency' => array('label' => "RecurringInvoiceTemplate", 'checked' => 1),
+	'f.nb_gen_done' => array('label' => "NbOfGenerationDoneShort", 'checked' => 1),
+	'f.date_last_gen' => array('label' => "DateLastGeneration", 'checked' => 1),
+	'f.date_when' => array('label' => "NextDateToExecution", 'checked' => 1),
+	'f.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'f.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
 );
 
 
@@ -378,7 +378,7 @@ if ($action == 'create') {
 		print $form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'));
 		print "</td><td>";
 		print '<input type="text" name="frequency" value="'.GETPOSTINT('frequency').'" size="4">&nbsp;';
-		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
+		print $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
 		// First date of execution for cron
@@ -386,7 +386,7 @@ if ($action == 'create') {
 		if (empty($date_next_execution)) {
 			$date_next_execution = (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
 		}
-		print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
+		print $form->selectDate($date_next_execution, '', 1, 1, 0, "add", 1, 1);
 		print "</td></tr>";
 
 		// Number max of generation
@@ -625,7 +625,7 @@ if ($action == 'create') {
 				print '<table class="nobordernopadding">';
 				print '<tr><td>';
 				print '<input type="text" name="frequency" value="'.$object->frequency.'" size="5">&nbsp;';
-				print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
+				print $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
 				print '</td>';
 				print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 85de2e7fb6f..e3729dc7423 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1769,7 +1769,7 @@ if ($action == 'create') {
 			$usehourmin = 1;
 		}
 		print img_picto('', 'action', 'class="pictofixedwidth"');
-		print $form->selectDate($datelivraison ? $datelivraison : -1, 'liv_', $usehourmin, $usehourmin, '', "set");
+		print $form->selectDate($datelivraison ? $datelivraison : -1, 'liv_', $usehourmin, $usehourmin, 0, "set");
 		print '</td></tr>';
 
 		// Bank Account
@@ -2289,7 +2289,7 @@ if ($action == 'create') {
 			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 				$usehourmin = 1;
 			}
-			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
+			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, 0, "setdate_livraison");
 			print '<input type="submit" class="button button-edit smallpaddingimp valign middle" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
@@ -2695,7 +2695,7 @@ if ($action == 'create') {
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
 			print '<tr><td class="fieldrequired">'.$langs->trans("OrderDate").'</td><td>';
 			$date_com = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
-			print $form->selectDate($date_com ?: '', '', 0, 0, '', "commande", 1, 1);
+			print $form->selectDate($date_com ?: '', '', 0, 0, 0, "commande", 1, 1);
 			print '</td></tr>';
 
 			// Force mandatory order method
@@ -2756,7 +2756,7 @@ if ($action == 'create') {
 					//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
 					print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
 					$datepreselected = dol_now();
-					print $form->selectDate($datepreselected, '', 1, 1, '', "commande", 1, 1);
+					print $form->selectDate($datepreselected, '', 1, 1, 0, "commande", 1, 1);
 					print "</td></tr>\n";
 
 					print '<tr><td class="fieldrequired">'.$langs->trans("Delivery")."</td><td>\n";
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 61193e3e707..6b4574ed2a9 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -794,7 +794,7 @@ if ($id > 0 || !empty($ref)) {
 
 			$nbfreeproduct = 0; // Nb of lins of free products/services
 			$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
-									// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
+			// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
 
 			$conf->cache['product'] = array();
 
@@ -937,13 +937,13 @@ if ($id > 0 || !empty($ref)) {
 							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 								print '<td class="nowraponall">';
 								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
-								print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
+								print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 								print '</td>';
 							}
 							if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 								print '<td class="nowraponall">';
 								$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
-								print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
+								print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 								print '</td>';
 							}
 							print '<td colspan="3">&nbsp;</td>'; // Supplier ref + Qty ordered + qty already dispatched
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 68f6d8f0af2..c4d93209600 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -181,28 +181,28 @@ $checkedtypetiers = 0;
 
 // Definition of array of fields for columns
 $arrayfields = array(
-	'u.login'=>array('label'=>"AuthorRequest", 'enabled'=>1, 'position'=>41),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'position'=>51, 'checked'=>0),
-	's.town'=>array('label'=>"Town", 'enabled'=>1, 'position'=>55, 'checked'=>1),
-	's.zip'=>array('label'=>"Zip", 'enabled'=>1, 'position'=>56, 'checked'=>1),
-	'state.nom'=>array('label'=>"StateShort", 'enabled'=>1, 'position'=>57),
-	'country.code_iso'=>array('label'=>"Country", 'enabled'=>1, 'position'=>58),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'enabled'=>$checkedtypetiers, 'position'=>59),
-	'cf.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>($mysoc->localtax1_assuj == "1"), 'position'=>140),
-	'cf.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>($mysoc->localtax2_assuj == "1"), 'position'=>145),
-	'cf.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>750),
-	'cf.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>760),
+	'u.login' => array('label' => "AuthorRequest", 'enabled' => 1, 'position' => 41),
+	's.name_alias' => array('label' => "AliasNameShort", 'position' => 51, 'checked' => 0),
+	's.town' => array('label' => "Town", 'enabled' => 1, 'position' => 55, 'checked' => 1),
+	's.zip' => array('label' => "Zip", 'enabled' => 1, 'position' => 56, 'checked' => 1),
+	'state.nom' => array('label' => "StateShort", 'enabled' => 1, 'position' => 57),
+	'country.code_iso' => array('label' => "Country", 'enabled' => 1, 'position' => 58),
+	'typent.code' => array('label' => "ThirdPartyType", 'enabled' => $checkedtypetiers, 'position' => 59),
+	'cf.total_localtax1' => array('label' => $langs->transcountry("AmountLT1", $mysoc->country_code), 'checked' => 0, 'enabled' => ($mysoc->localtax1_assuj == "1"), 'position' => 140),
+	'cf.total_localtax2' => array('label' => $langs->transcountry("AmountLT2", $mysoc->country_code), 'checked' => 0, 'enabled' => ($mysoc->localtax2_assuj == "1"), 'position' => 145),
+	'cf.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 750),
+	'cf.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 760),
 );
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['cf.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -244,7 +244,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
+$parameters = array('socid' => $socid, 'arrayfields' => &$arrayfields);
 $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');
@@ -380,7 +380,7 @@ if (empty($reshook)) {
 
 		$db->begin();
 
-		$default_ref_supplier=dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		$default_ref_supplier = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
 		foreach ($orders as $id_order) {
 			$cmd = new CommandeFournisseur($db);
@@ -405,7 +405,7 @@ if (empty($reshook)) {
 				$objecttmp->fk_project = $cmd->fk_project;
 				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
 				$objecttmp->ref_supplier = !empty($cmd->ref_supplier) ? $cmd->ref_supplier : $default_ref_supplier;
-				$default_ref_supplier+=1;
+				$default_ref_supplier += 1;
 
 				$datefacture = dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 				if (empty($datefacture)) {
@@ -1181,9 +1181,9 @@ if ($resql) {
 
 	// List of mass actions available
 	$arrayofmassactions = array(
-		'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"),
+		'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"),
 	);
 
 	if ($permissiontovalidate) {
@@ -1211,8 +1211,8 @@ if ($resql) {
 		$url .= '&backtopage='.urlencode(DOL_URL_ROOT.'/fourn/commande/list.php?socid='.((int) $socid));
 	}
 	$newcardbutton = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
@@ -1252,7 +1252,7 @@ if ($resql) {
 		print $langs->trans('DateInvoice');
 		print '</td>';
 		print '<td>';
-		print $form->selectDate('', '', '', '', '', '', 1, 1);
+		print $form->selectDate('', '', 0, 0, 0, '', 1, 1);
 		print '</td>';
 		print '</tr>';
 		print '<tr>';
@@ -1479,7 +1479,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
@@ -1646,7 +1646,7 @@ if ($resql) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['cf.date_creation']['checked'])) {
@@ -1738,7 +1738,7 @@ if ($resql) {
 			$thirdpartytmp->client = $obj->client;
 			$thirdpartytmp->fournisseur = $obj->fournisseur;
 			// Output Kanban
-			print $objectstatic->getKanbanView('', array('thirdparty'=>$thirdpartytmp->getNomUrl('supplier', 0, 0, -1), 'selected' => in_array($objectstatic->id, $arrayofselected)));
+			print $objectstatic->getKanbanView('', array('thirdparty' => $thirdpartytmp->getNomUrl('supplier', 0, 0, -1), 'selected' => in_array($objectstatic->id, $arrayofselected)));
 			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
@@ -1988,7 +1988,7 @@ if ($resql) {
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
@@ -2102,7 +2102,7 @@ if ($resql) {
 
 	$db->free($resql);
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index c3d748e81d1..d8f899d7bb1 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -1044,7 +1044,7 @@ if ($action == 'create') {
 		// Date next run
 		print "<tr><td>" . $langs->trans('NextDateToExecution') . "</td><td>";
 		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
-		print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
+		print $form->selectDate($date_next_execution, '', 1, 1, 0, "add", 1, 1);
 		print "</td></tr>";
 
 		// Number max of generation
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 8244ed6e8af..1e13db22978 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2645,7 +2645,7 @@ if ($action == 'create') {
 		// Date invoice
 		print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td>';
 		print img_picto('', 'action', 'class="pictofixedwidth"');
-		print $form->selectDate($dateinvoice, '', '', '', '', "add", 1, 1);
+		print $form->selectDate($dateinvoice, '', 0, 0, 0, "add", 1, 1);
 		print '</td></tr>';
 
 		// Payment term
@@ -2658,7 +2658,7 @@ if ($action == 'create') {
 		// Due date
 		print '<tr><td>'.$langs->trans('DateMaxPayment').'</td><td>';
 		print img_picto('', 'action', 'class="pictofixedwidth"');
-		print $form->selectDate($datedue, 'ech', '', '', '', "add", 1, 1);
+		print $form->selectDate($datedue, 'ech', 0, 0, 0, "add", 1, 1);
 		print '</td></tr>';
 
 		// Payment mode
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 4f1c81602a1..e495c2e3f9e 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -140,7 +140,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_array_options = array();
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -513,9 +513,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 			// $object is default vendor invoice
-			$adddateof = array(array('adddateof'=>$object->date));
-			$adddateof[] = array('adddateof'=>$object->date_echeance, 'labeladddateof'=>$langs->transnoentities('DateDue'));
-			print $form->selectDate($dateinvoice, '', '', '', 0, "addpaiement", 1, 1, 0, '', '', $adddateof);
+			$adddateof = array(array('adddateof' => $object->date));
+			$adddateof[] = array('adddateof' => $object->date_echeance, 'labeladddateof' => $langs->transnoentities('DateDue'));
+			print $form->selectDate($dateinvoice, '', 0, 0, 0, "addpaiement", 1, 1, 0, '', '', $adddateof);
 			print '</td></tr>';
 			print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
 			$form->select_types_paiements(!GETPOST('paiementid') ? $obj->fk_mode_reglement : GETPOST('paiementid'), 'paiementid');
@@ -536,7 +536,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			print dol_get_fiche_end();
 
 
-			$parameters = array('facid'=>$facid, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+			$parameters = array('facid' => $facid, 'ref' => $ref, 'objcanvas' => $objcanvas);
 			$reshook = $hookmanager->executeHooks('paymentsupplierinvoices', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			$error = $hookmanager->error;
 			$errors = $hookmanager->errors;
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index fc41bac9d6b..17fd78aa8c1 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -306,13 +306,13 @@ if ($action == 'create') {
 	// Date Start
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
-	print $form->selectDate(!empty($datestart) ? $datestart : -1, 'start', '', '', '', 'add', 1, 1);
+	print $form->selectDate(!empty($datestart) ? $datestart : -1, 'start', 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date End
 	print "<tr>";
 	print '<td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
-	print $form->selectDate(!empty($dateend) ? $dateend : -1, 'end', '', '', '', 'add', 1, 1);
+	print $form->selectDate(!empty($dateend) ? $dateend : -1, 'end', 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Number of terms
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 27b01120195..ece271b9135 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -289,7 +289,7 @@ if ($action == 'create') {
 	} else {
 		$datepayment = $datepaid;
 	}
-	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	print $form->selectDate($datepayment, '', 0, 0, 0, "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
 
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index af35d75201f..3c2fa4bca90 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -129,11 +129,11 @@ print '</td></tr>';
 // Start date
 print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($startdate, 'startdate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($enddate, 'enddate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Refresh')).'" />';
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index de7822b6198..5cdee16619b 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -190,11 +190,11 @@ print '<table class="border centpercent">';
 
 print '<tr><td class="titlefield">'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($startdate, 'startdate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($enddate, 'enddate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Refresh')).'" name="button_search" />';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index d30ef558ecf..b81567d7b09 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -170,11 +170,11 @@ print '</tr>';
 // Start date
 print '<td>'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($startdate, 'startdate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($enddate, 'enddate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Refresh')).'" />';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index fb1604c6d9f..e6837605980 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -134,11 +134,11 @@ print '</tr>';
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($startdate, 'startdate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($startdate, 'startdate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td>'.$langs->trans('DateEnd').' ('.$langs->trans("DateValidation").')</td>';
 print '<td>';
-print $form->selectDate($enddate, 'enddate', '', '', 1, "sel", 1, 1);
+print $form->selectDate($enddate, 'enddate', 0, 0, 1, "sel", 1, 1);
 print '</td>';
 print '<td style="text-align: center;">';
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Refresh')).'" />';
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 61f5a1ef7d5..084d768ce05 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -151,7 +151,7 @@ print '</tr>'."\n";
 
 print '<tr><td class="fieldrequired">'.$langs->trans("ExpireDate").'</td><td>';
 
-print $form->selectDate($champdatefin ? $champdatefin : -1, 'champdatefin', '', '', '', "add", 1, 0);
+print $form->selectDate($champdatefin ? $champdatefin : -1, 'champdatefin', 0, 0, 0, "add", 1, 0);
 
 print '</tr>'."\n";
 print '</table>'."\n";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6361cea7a8d..456460e2b21 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -144,7 +144,7 @@ if ($cancel) {
 	$action = '';
 }
 
-$parameters = array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$parameters = array('id' => $id, 'ref' => $ref, 'objcanvas' => $objcanvas);
 $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');
@@ -1147,12 +1147,12 @@ if (!$variants || getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PA
 						print '<td class="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
 						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							print '<td class="center" width="10%">';
-							print $form->selectDate($pdluo->sellby, 'sellby', '', '', 1, '', 1, 0);
+							print $form->selectDate($pdluo->sellby, 'sellby', 0, 0, 1, '', 1, 0);
 							print '</td>';
 						}
 						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							print '<td class="center" width="10%">';
-							print $form->selectDate($pdluo->eatby, 'eatby', '', '', 1, '', 1, 0);
+							print $form->selectDate($pdluo->eatby, 'eatby', 0, 0, 1, '', 1, 0);
 							print '</td>';
 						}
 						print '<td class="right" colspan="3">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index b393de2bc48..87f6acee486 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -105,7 +105,7 @@ print '<script type="text/javascript">
 			});';
 
 if ($disableSellBy == 0 || $disableEatBy == 0) {
-		print '
+	print '
 			var disableSellBy = '.dol_escape_js($disableSellBy).';
 			var disableEatBy = '.dol_escape_js($disableSellBy).';
 			jQuery("#batch_number").change(function(event) {
@@ -206,14 +206,14 @@ if (isModEnabled('productbatch') &&
 		print '<td'.($sellByCss ? ' class="'.$sellByCss.'"' : '').'>'.$langs->trans("SellByDate").'</td><td>';
 		$sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
 		// If form was opened for a specific pdluoid, field is disabled
-		print $form->selectDate(($pdluo->id > 0 ? $pdluo->sellby : $sellbyselected), 'sellby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
+		print $form->selectDate(($pdluo->id > 0 ? $pdluo->sellby : $sellbyselected), 'sellby', 0, 0, 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
 		print '</td>';
 	}
 	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<td'.($eatByCss ? ' class="'.$eatByCss.'"' : '').'>'.$langs->trans("EatByDate").'</td><td>';
 		$eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
 		// If form was opened for a specific pdluoid, field is disabled
-		print $form->selectDate(($pdluo->id > 0 ? $pdluo->eatby : $eatbyselected), 'eatby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
+		print $form->selectDate(($pdluo->id > 0 ? $pdluo->eatby : $eatbyselected), 'eatby', 0, 0, 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
 		print '</td>';
 	}
 	print '</tr>';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index b5bf80f8947..b24230fdf38 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -112,12 +112,12 @@ if (isModEnabled('productbatch') &&
 	print '<tr>';
 	if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 		print '<td>'.$langs->trans("SellByDate").'</td><td>';
-		print $form->selectDate((!empty($d_sellby) ? $d_sellby : $pdluo->sellby), 'sellby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
+		print $form->selectDate((!empty($d_sellby) ? $d_sellby : $pdluo->sellby), 'sellby', 0, 0, 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
 		print '</td>';
 	}
 	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<td>'.$langs->trans("EatByDate").'</td><td>';
-		print $form->selectDate((!empty($d_eatby) ? $d_eatby : $pdluo->eatby), 'eatby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
+		print $form->selectDate((!empty($d_eatby) ? $d_eatby : $pdluo->eatby), 'eatby', 0, 0, 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
 		print '</td>';
 	}
 	print '</tr>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 5f079bb44e9..32e47dcfb83 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1418,7 +1418,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print $langs->trans('DateInvoice');
 				print '</td>';
 				print '<td>';
-				print $form->selectDate('', '', '', '', '', '', 1, 1);
+				print $form->selectDate('', '', 0, 0, 0, '', 1, 1);
 				print '</td>';
 				print '</tr>';
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 1c633da8e30..c4a27f64b5a 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -919,7 +919,7 @@ if ($action == 'create') {
 			print "</td></tr>\n";
 
 			// Other attributes
-			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
+			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid' => $socid);
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $objectsrc may have been modified by hook
 			print $hookmanager->resPrint;
 
@@ -985,7 +985,7 @@ if ($action == 'create') {
 					$ent = "entrepot_" . $paramSuffix;
 					$pu = "pu_" . $paramSuffix; // This is unit price including discount
 					$fk_commandefourndet = "fk_commandefourndet_" . $paramSuffix;
-					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet));
+					$dispatchLines[$numAsked] = array('paramSuffix' => $paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet));
 				}
 
 				// with batch module enabled and product with lot/serial
@@ -1006,7 +1006,7 @@ if ($action == 'create') {
 					$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo_'.$paramSuffix.'month'), GETPOSTINT('dluo_'.$paramSuffix.'day'), GETPOSTINT('dluo_'.$paramSuffix.'year'));
 					$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc_'.$paramSuffix.'month'), GETPOSTINT('dlc_'.$paramSuffix.'day'), GETPOSTINT('dlc_'.$paramSuffix.'year'));
 					$fk_commandefourndet = 'fk_commandefourndet_'.$paramSuffix;
-					$dispatchLines[$numAsked] = array('paramSuffix'=>$paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOSTINT($lot));
+					$dispatchLines[$numAsked] = array('paramSuffix' => $paramSuffix, 'prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet), 'DLC' => $dDLC, 'DLUO' => $dDLUO, 'lot' => GETPOSTINT($lot));
 				}
 
 				// If create form is coming from same page, it means that post was sent but an error occurred
@@ -1028,7 +1028,7 @@ if ($action == 'create') {
 					$dDLUO = dol_mktime(12, 0, 0, GETPOSTINT('dluo'.$paramSuffix.'month'), GETPOSTINT('dluo'.$paramSuffix.'day'), GETPOSTINT('dluo'.$paramSuffix.'year'));
 					$dDLC = dol_mktime(12, 0, 0, GETPOSTINT('dlc'.$paramSuffix.'month'), GETPOSTINT('dlc'.$paramSuffix.'day'), GETPOSTINT('dlc'.$paramSuffix.'year'));
 					$fk_commandefourndet = 'fk_commandefournisseurdet'.$paramSuffix;
-					$dispatchLines[$numAsked] = array('prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' =>GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' =>GETPOST($comment), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOSTINT($lot));
+					$dispatchLines[$numAsked] = array('prod' => GETPOSTINT($prod), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOSTINT($ent), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST($comment), 'fk_commandefourndet' => GETPOSTINT($fk_commandefourndet), 'DLC' => $dDLC, 'DLUO' => $dDLUO, 'lot' => GETPOSTINT($lot));
 				}
 			}
 
@@ -1100,7 +1100,7 @@ if ($action == 'create') {
 			// $objectsrc->lines contains the line of the purchase order
 			// $dispatchLines is list of lines with dispatching detail (with product, qty and warehouse). One purchase order line may have n of this dispatch lines.
 
-			$arrayofpurchaselinealreadyoutput= array();
+			$arrayofpurchaselinealreadyoutput = array();
 
 			// $_POST contains fk_commandefourndet_X_Y    where Y is num of product line and X is number of split lines
 			$indiceAsked = 1;
@@ -1271,12 +1271,12 @@ if ($action == 'create') {
 							print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
 							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 								print '<td class="nowraponall">';
-								print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, "");
+								print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, 0, 0, 1, "");
 								print '</td>';
 							}
 							if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 								print '<td class="nowraponall">';
-								print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
+								print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, 0, 0, 1, "");
 								print '</td>';
 							}
 						} else {
@@ -1313,7 +1313,7 @@ if ($action == 'create') {
 					}
 					$recLine->array_options = array_merge($recLine->array_options, $srcLine->array_options);
 
-					print $recLine->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
+					print $recLine->showOptionals($extrafields, 'edit', array('style' => 'class="oddeven"', 'colspan' => $colspan), $indiceAsked, '', 1);
 				}
 
 				$indiceAsked++;
@@ -1524,7 +1524,7 @@ if ($action == 'create') {
 		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
-		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
+		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
 		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
@@ -1840,7 +1840,7 @@ if ($action == 'create') {
 				$obj = $db->fetch_object($resql);
 				if ($obj) {
 					// $obj->rowid is rowid in $origin."det" table
-					$alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+					$alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref' => $obj->reception_ref, 'reception_id' => $obj->reception_id, 'warehouse' => $obj->fk_entrepot, 'qty' => $obj->qty, 'date_valid' => $obj->date_valid, 'date_delivery' => $obj->date_delivery);
 				}
 				$i++;
 			}
@@ -1976,11 +1976,11 @@ if ($action == 'create') {
 						print '<td class="nowraponall left"><input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"><br>';
 						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							print $langs->trans('SellByDate').' : ';
-							print $form->selectDate($lines[$i]->sellby, 'dlc'.$line_id, '', '', 1, "").'</br>';
+							print $form->selectDate($lines[$i]->sellby, 'dlc'.$line_id, 0, 0, 1, "").'</br>';
 						}
 						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							print $langs->trans('EatByDate').' : ';
-							print $form->selectDate($lines[$i]->eatby, 'dluo'.$line_id, '', '', 1, "");
+							print $form->selectDate($lines[$i]->eatby, 'dluo'.$line_id, 0, 0, 1, "");
 						}
 						print '</td>';
 					}
@@ -2107,9 +2107,9 @@ if ($action == 'create') {
 			$line->fetch_optionals();
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id) {
-				print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), '');
+				print $line->showOptionals($extrafields, 'edit', array('colspan' => $colspan), '');
 			} else {
-				print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), '');
+				print $line->showOptionals($extrafields, 'view', array('colspan' => $colspan), '');
 			}
 		}
 	}
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index ab5e4dc9972..69055aa130c 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -49,7 +49,7 @@ if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
-	// Security check
+// Security check
 $id = GETPOSTINT("id");
 $ref = GETPOST('ref');
 $lineid = GETPOSTINT('lineid');
@@ -586,7 +586,7 @@ if ($id > 0 || !empty($ref)) {
 
 			$nbfreeproduct = 0; // Nb of lins of free products/services
 			$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
-									// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
+			// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
 
 			$conf->cache['product'] = array();
 
@@ -747,13 +747,13 @@ if ($id > 0 || !empty($ref)) {
 									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 										print '<td class="nowraponall">';
 										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
-										print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
+										print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 										print '</td>';
 									}
 									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 										print '<td class="nowraponall">';
 										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
-										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
+										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 										print '</td>';
 									}
 									print '<td colspan="3">&nbsp;</td>'; // Supplier ref + Qty ordered + qty already dispatched
@@ -808,10 +808,10 @@ if ($id > 0 || !empty($ref)) {
 								print '<td>';
 								if (isModEnabled('productbatch') && $objp->tobatch > 0) {
 									$type = 'batch';
-									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j+1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
+									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 								} else {
 									$type = 'dispatch';
-									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j+1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
+									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 								}
 
 								print '</td>';
@@ -920,13 +920,13 @@ if ($id > 0 || !empty($ref)) {
 								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="nowraponall">';
 									$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
-									print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
+									print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 									print '</td>';
 								}
 								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="nowraponall">';
 									$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
-									print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
+									print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 									print '</td>';
 								}
 								print '<td colspan="3">&nbsp;</td>'; // Supplier ref + Qty ordered + qty already dispatched
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index f1b8c29eb6c..caadc0e2af0 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -899,7 +899,7 @@ if ($massaction == 'createbills') {
 	print $langs->trans('DateInvoice');
 	print '</td>';
 	print '<td>';
-	print $form->selectDate('', '', '', '', '', '', 1, 1);
+	print $form->selectDate('', '', 0, 0, 0, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 	print '<tr>';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index a44e82e6eb9..36d30fc46a2 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -302,7 +302,7 @@ if ($action == 'add' && empty($cancel)) {
 			$paiement->chid         = $object->id;	// deprecated
 			$paiement->datep        = $datep;
 			$paiement->datev		= $datev;
-			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
+			$paiement->amounts      = array($object->id => $amount); // Tableau de montant
 			$paiement->fk_typepayment = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
 			$paiement->note_private = GETPOST("note", 'restricthtml');
@@ -580,13 +580,13 @@ if ($action == 'create' && $permissiontoadd) {
 	// Date start period
 	print '<tr><td>';
 	print $form->editfieldkey('DateStartPeriod', 'datesp', '', $object, 0, 'string', '', 1).'</td><td>';
-	print $form->selectDate($datesp, "datesp", '', '', '', 'add');
+	print $form->selectDate($datesp, "datesp", 0, 0, 0, 'add');
 	print '</td></tr>';
 
 	// Date end period
 	print '<tr><td>';
 	print $form->editfieldkey('DateEndPeriod', 'dateep', '', $object, 0, 'string', '', 1).'</td><td>';
-	print $form->selectDate($dateep, "dateep", '', '', '', 'add');
+	print $form->selectDate($dateep, "dateep", 0, 0, 0, 'add');
 	print '</td></tr>';
 
 	// Amount
@@ -646,7 +646,7 @@ if ($action == 'create' && $permissiontoadd) {
 	// Date value for bank
 	print '<tr class="hide_if_no_auto_create_payment"><td>';
 	print $form->editfieldkey('DateValue', 'datev', '', $object, 0).'</td><td>';
-	print $form->selectDate((empty($datev) ? -1 : $datev), "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datev) ? -1 : $datev), "datev", 0, 0, 0, 'add', 1, 1);
 	print '</td></tr>';
 
 	// Number
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index f072cf540c4..78551cdb6e4 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -704,7 +704,7 @@ if (empty($reshook)) {
 
 					//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
 					if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
-						$product_desc='';
+						$product_desc = '';
 					}
 
 					if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
@@ -1345,9 +1345,9 @@ if ($action == 'create') {
 			$syear = date("Y", $tmpdte);
 			$smonth = date("m", $tmpdte);
 			$sday = date("d", $tmpdte);
-			print $form->selectDate($syear."-".$smonth."-".$sday, 'liv_', '', '', '', "addask");
+			print $form->selectDate($syear."-".$smonth."-".$sday, 'liv_', 0, 0, 0, "addask");
 		} else {
-			print $form->selectDate($datedelivery ? $datedelivery : -1, 'liv_', '', '', '', "addask", 1, 1);
+			print $form->selectDate($datedelivery ? $datedelivery : -1, 'liv_', 0, 0, 0, "addask", 1, 1);
 		}
 		print '</td></tr>';
 
@@ -1702,7 +1702,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-			print $form->selectDate($object->delivery_date, 'liv_', '', '', '', "editdate_livraison");
+			print $form->selectDate($object->delivery_date, 'liv_', 0, 0, 0, "editdate_livraison");
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {

From 23723289c288410a54d594b9efc1938549475e08 Mon Sep 17 00:00:00 2001
From: Charles <carmelchas@gmail.com>
Date: Fri, 8 Mar 2024 18:05:58 -0600
Subject: [PATCH 0587/1862] Update ticket.class.php update function (#28722)

Default value for status to zero(0) instead of "null"
---
 htdocs/ticket/class/ticket.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 601806e023b..e1b496b6929 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -992,7 +992,7 @@ class Ticket extends CommonObject
 		$sql .= " fk_user_assign=".(isset($this->fk_user_assign) ? $this->fk_user_assign : "null").",";
 		$sql .= " subject=".(isset($this->subject) ? "'".$this->db->escape($this->subject)."'" : "null").",";
 		$sql .= " message=".(isset($this->message) ? "'".$this->db->escape($this->message)."'" : "null").",";
-		$sql .= " fk_statut=".(isset($this->fk_statut) ? $this->fk_statut : "null").",";
+		$sql .= " fk_statut=".(isset($this->fk_statut) ? $this->fk_statut : "0").",";
 		$sql .= " resolution=".(isset($this->resolution) ? $this->resolution : "null").",";
 		$sql .= " progress=".(isset($this->progress) ? "'".$this->db->escape($this->progress)."'" : "null").",";
 		$sql .= " timing=".(isset($this->timing) ? "'".$this->db->escape($this->timing)."'" : "null").",";

From 4de7c6701022588bd4624d7b9b24ca9dcfa46239 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:06:37 +0100
Subject: [PATCH 0588/1862] Qual: PhanCompatibleNegativeStringOffset must be
 suppressed (#28720)

# Qual: PhanCompatibleNegativeStringOffset must be suppressed

Apparently the PhanCompatibleNegativeStringOffset notice can not be avoided
through the '>=1' condition hint, so suppress it explicitly
---
 htdocs/core/lib/json.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 15f54b75f97..12b0ab69220 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -267,6 +267,7 @@ function dol_json_decode($json, $assoc = false)
 		} else {
 			$out .= $json[$i];
 		}
+		// @phan-suppress-next-line PhanCompatibleNegativeStringOffset
 		if ($i >= 1 && $json[$i] == '"' && $json[$i - 1] != "\\") {
 			$comment = !$comment;
 		}

From 1a7bfbc15ad099cfaaa4016103097d3469d175d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 9 Mar 2024 01:11:52 +0100
Subject: [PATCH 0589/1862] Clean code

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4a43106e8dc..a251da01cc5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -111,7 +111,7 @@ class Form
 	 */
 	public function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id', $help = '')
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$ret = '';
 
@@ -490,8 +490,6 @@ class Form
 	 */
 	protected function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null)
 	{
-		global $conf;
-
 		$out = '';
 
 		// Check parameters

From 6d857757e9a7cdfbd2ddb4e5cc2c8654ae8a71d9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:12:03 +0100
Subject: [PATCH 0590/1862] Qual: Improve typing hint for (ext)Object, and
 allow null (#28719)

* Qual: Improve typing hint for (ext)Object, and allow null

# Qual: Improve typing hint for object, and allow null

As the key "->element" is expected, the object type should be derived from CommonObject.
Also extObject can be nullable

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()

* Fix: Use null instead of 0 for extObject in call to Form::editfieldval()
---
 htdocs/compta/bank/various_payment/card.php   |  2 +-
 htdocs/core/class/html.form.class.php         |  8 ++--
 .../conferenceorbooth_card.php                | 18 ++++----
 .../conferenceorbooth_contact.php             | 14 +++---
 .../conferenceorbooth_document.php            | 12 ++---
 .../conferenceorbooth_list.php                | 46 +++++++++----------
 .../conferenceorboothattendee_card.php        |  8 ++--
 .../conferenceorboothattendee_list.php        | 44 +++++++++---------
 8 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 505b5b64ccc..ae720d63423 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -680,7 +680,7 @@ if ($id) {
 		if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
 			print $formaccounting->formAccountingAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->subledger_account, 'subledger_account', 1, 1, '', 1);
 		} else {
-			print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $permissiontoadd), 'string', '', 0, null, '', 1, 'lengthAccounta');
+			print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $permissiontoadd), 'string', '', null, null, '', 1, 'lengthAccounta');
 		}
 	} else {
 		print length_accounta($object->subledger_account);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4a43106e8dc..c2a16b9eb12 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -199,13 +199,13 @@ class Form
 	 * @param string 	$text 			Text of label (not used in this function)
 	 * @param string 	$htmlname 		Name of select field
 	 * @param string 	$value 			Value to show/edit
-	 * @param object 	$object 		Object (that we want to show)
+	 * @param CommonObject 	$object 		Object (that we want to show)
 	 * @param boolean 	$perm 			Permission to allow button to edit parameter
 	 * @param string 	$typeofdata 	Type of data ('string' by default, 'checkbox', 'email', 'phone', 'amount:99', 'numeric:99',
 	 *                                  'text' or 'textarea:rows:cols%', 'safehtmlstring', 'restricthtml',
 	 *                                  'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
 	 * @param string 	$editvalue 		When in edit mode, use this value as $value instead of value (for example, you can provide here a formatted price instead of numeric value, or a select combo). Use '' to use same than $value
-	 * @param object 	$extObject 		External object ???
+	 * @param ?CommonObject	$extObject 	External object ???
 	 * @param mixed 	$custommsg 		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @param string 	$moreparam 		More param to add on the form on action href URL parameter
 	 * @param int 		$notabletag 	Do no output table tags
@@ -478,13 +478,13 @@ class Form
 	/**
 	 * Output edit in place form
 	 *
-	 * @param 	object 	$object 	Object
+	 * @param 	CommonObject	$object 	Object
 	 * @param 	string 	$value 		Value to show/edit
 	 * @param 	string 	$htmlname 	DIV ID (field name)
 	 * @param 	int 	$condition 	Condition to edit
 	 * @param 	string 	$inputType 	Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')
 	 * @param 	string 	$editvalue 	When in edit mode, use this value as $value instead of value
-	 * @param 	object 	$extObject 	External object
+	 * @param 	?CommonObject	$extObject 	External object
 	 * @param 	mixed 	$custommsg 	String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @return  string              HTML edit in place
 	 */
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 77ee9b6abd5..370d5c5df65 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -97,7 +97,7 @@ $upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ?
 if ($user->socid > 0) {
 	accessforbidden();
 }
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'id', $isdraft);
 
 if (!$permissiontoread) {
@@ -186,7 +186,7 @@ if (!empty($projectstatic->socid)) {
 	$projectstatic->fetch_thirdparty();
 }
 
-$withProjectUrl='';
+$withProjectUrl = '';
 $object->project = clone $projectstatic;
 
 if (!empty($withproject)) {
@@ -339,7 +339,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td class="valuefield">';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="valuefield">';
@@ -347,25 +347,25 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td class="valuefield">';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="valuefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="valuefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $project, $permissiontoadd, 'integer:3', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $project->max_attendees, $project, $permissiontoadd, 'integer:3', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $project->max_attendees, $project, $permissiontoadd, 'integer:3', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield valignmiddle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
@@ -571,7 +571,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-	$keyforbreak='num_vote';
+	$keyforbreak = 'num_vote';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
@@ -643,7 +643,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$object->fetchObjectLinked();
 
-		if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
+		if (is_array($object->linkedObjects) && count($object->linkedObjects) > 0 && array_key_exists("facture", $object->linkedObjects)) {
 			foreach ($object->linkedObjects["facture"] as $fac) {
 				if (empty($fac->paye)) {
 					$key = 'paymentlink_'.$fac->id;
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 201dc52710b..b2ae4685c89 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -74,7 +74,7 @@ if ($user->socid > 0) {
 	accessforbidden();
 }
 
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 $permissiontoread = $user->hasRight('eventorganization', 'read');
@@ -88,7 +88,7 @@ $upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ?
 if ($user->socid > 0) {
 	accessforbidden();
 }
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 if (!$permissiontoread) {
@@ -166,7 +166,7 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($pro
 if (!empty($projectstatic->socid)) {
 	$projectstatic->fetch_thirdparty();
 }
-$withProjectUrl='';
+$withProjectUrl = '';
 $object->project = clone $projectstatic;
 
 if (!empty($withproject)) {
@@ -298,7 +298,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
@@ -306,19 +306,19 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 788128a6906..da8471988d9 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -102,7 +102,7 @@ $upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ?
 if ($user->socid > 0) {
 	accessforbidden();
 }
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'id', $isdraft);
 
 if (!$permissiontoread) {
@@ -141,7 +141,7 @@ if (!empty($projectstatic->socid)) {
 	$projectstatic->fetch_thirdparty();
 }
 
-$withProjectUrl='';
+$withProjectUrl = '';
 $object->project = clone $projectstatic;
 
 if (!empty($withproject)) {
@@ -271,7 +271,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
@@ -279,19 +279,19 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 9ee0be54b58..46e1f251aac 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -120,11 +120,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -159,15 +159,15 @@ if (!$permissiontoread) {
 
 if (preg_match('/^set/', $action) && ($projectid > 0 || $projectref) && $user->hasRight('eventorganization', 'write')) {
 	//If "set" fields keys is in projects fields
-	$project_attr=preg_replace('/^set/', '', $action);
+	$project_attr = preg_replace('/^set/', '', $action);
 	if (array_key_exists($project_attr, $project->fields)) {
 		$result = $project->fetch($projectid, $projectref);
 		if ($result < 0) {
 			setEventMessages(null, $project->errors, 'errors');
 		} else {
 			$projectid = $project->id;
-			$project->{$project_attr}=GETPOST($project_attr);
-			$result=$project->update($user);
+			$project->{$project_attr} = GETPOST($project_attr);
+			$result = $project->update($user);
 			if ($result < 0) {
 				setEventMessages(null, $project->errors, 'errors');
 			}
@@ -245,7 +245,7 @@ if (empty($reshook)) {
 				}
 			} else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-				$error ++;
+				$error++;
 				break;
 			}
 		}
@@ -408,10 +408,10 @@ if ($projectid > 0) {
 	// Date start - end of event
 	print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Event").')</td><td>';
 	$start = dol_print_date($project->date_start_event, 'day', 'tzuserrel');
-	print ($start ? '<span title="'.dol_print_date($project->date_start_event, 'dayhour', 'tzuserrel').'">'.$start.'</span>' : '?');
+	print($start ? '<span title="'.dol_print_date($project->date_start_event, 'dayhour', 'tzuserrel').'">'.$start.'</span>' : '?');
 	$end = dol_print_date($project->date_end_event, 'day', 'tzuserrel');
 	print ' - ';
-	print ($end ? '<span title="'.dol_print_date($project->date_end_event, 'dayhour', 'tzuserrel').'">'.$end.'</span>' : '?');
+	print($end ? '<span title="'.dol_print_date($project->date_end_event, 'dayhour', 'tzuserrel').'">'.$end.'</span>' : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -454,7 +454,7 @@ if ($projectid > 0) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', ($project->accept_conference_suggestions ? 1 : 0), $project, $permissiontoadd, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td class="valuefield">';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', ($project->accept_conference_suggestions ? 1 : 0), $project, $permissiontoadd, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', ($project->accept_conference_suggestions ? 1 : 0), $project, $permissiontoadd, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield">';
@@ -462,25 +462,25 @@ if ($projectid > 0) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', ($project->accept_booth_suggestions ? 1 : 0), $project, $permissiontoadd, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td class="valuefield">';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', ($project->accept_booth_suggestions ? 1 : 0), $project, $permissiontoadd, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', ($project->accept_booth_suggestions ? 1 : 0), $project, $permissiontoadd, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $project->price_booth, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $project->price_booth, $project, $permissiontoadd, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $project->price_registration, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $project->price_registration, $project, $permissiontoadd, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $project, $permissiontoadd, 'integer:3', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $project->max_attendees, $project, $permissiontoadd, 'integer:3', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $project->max_attendees, $project, $permissiontoadd, 'integer:3', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	// Link to ICS for the event
@@ -733,7 +733,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").' ('.$langs->trans("ToSpeakers").')',
+	'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 (!empty($permissiontodelete)) {
@@ -763,8 +763,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id) ? '?projectid='.$project->id : ''), '', $permissiontoadd);
 
@@ -884,7 +884,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -927,7 +927,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -1056,7 +1056,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -1098,7 +1098,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index b57b5180bf5..4e6074703a6 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -343,7 +343,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
@@ -351,19 +351,19 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index cbaf93a8f45..6e752262eff 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -63,7 +63,7 @@ $withproject = GETPOSTINT('withproject');
 $fk_project = GETPOSTINT('fk_project') ? GETPOSTINT('fk_project') : GETPOSTINT('projectid');
 $projectid = $fk_project;
 
-$withProjectUrl='';
+$withProjectUrl = '';
 
 // Load variable for pagination
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -128,11 +128,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -169,14 +169,14 @@ if (!$permissiontoread) {
 if (preg_match('/^set/', $action) && $projectid > 0 && $user->hasRight('eventorganization', 'write')) {
 	$project = new Project($db);
 	//If "set" fields keys is in projects fields
-	$project_attr=preg_replace('/^set/', '', $action);
+	$project_attr = preg_replace('/^set/', '', $action);
 	if (array_key_exists($project_attr, $project->fields)) {
 		$result = $project->fetch($projectid);
 		if ($result < 0) {
 			setEventMessages(null, $project->errors, 'errors');
 		} else {
-			$project->{$project_attr}=GETPOST($project_attr);
-			$result=$project->update($user);
+			$project->{$project_attr} = GETPOST($project_attr);
+			$result = $project->update($user);
 			if ($result < 0) {
 				setEventMessages(null, $project->errors, 'errors');
 			}
@@ -402,7 +402,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$projectstatic->fetch_thirdparty();
 	}
 
-	$withProjectUrl='';
+	$withProjectUrl = '';
 	$object->project = clone $projectstatic;
 
 	if (!empty($withproject)) {
@@ -554,7 +554,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 		print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 		print '</td><td>';
-		print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+		print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td>';
@@ -562,25 +562,25 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 		print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 		print '</td><td>';
-		print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
+		print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td>';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 		print '</td><td>';
-		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td>';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 		print '</td><td>';
-		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td class="titlefield">';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $projectstatic, $permissiontoadd, 'integer:3', '&withproject=1', 0, 0, 'projectid');
 		print '</td><td class="valuefield">';
-		print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', 0, 0, '&withproject=1', 0, '', 'projectid');
+		print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', null, 0, '&withproject=1', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
@@ -725,7 +725,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' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -751,7 +751,7 @@ print '<input type="hidden" name="fk_project" value="'.$fk_project.'">';
 print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$params = array('morecss'=>'reposition');
+$params = array('morecss' => 'reposition');
 
 $urlnew = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?action=create'.(!empty($confOrBooth->id) ? '&conforboothid='.$confOrBooth->id : '').(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : '').$withProjectUrl.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.(empty($confOrBooth->id) ? '' : '&conforboothid='.$confOrBooth->id).$withProjectUrl);
 
@@ -859,7 +859,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -902,7 +902,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -1007,7 +1007,7 @@ while ($i < $imaxinloop) {
 				} elseif ($key == 'ref') {
 					$optionLink = (!empty($withproject) ? 'conforboothidproject' : 'conforboothid');
 					if (empty($confOrBooth->id)) {
-						$optionLink='projectid';
+						$optionLink = 'projectid';
 					}
 					print $object->getNomUrl(1, $optionLink);
 				} else {
@@ -1034,7 +1034,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -1076,7 +1076,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 746ca01423553ab9341ccfe38e6df0b7c32e6849 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:27:01 +0100
Subject: [PATCH 0591/1862] Fix: Correctly close active output buffer. (#28723)

# Fix: Correctly close active output buffer.

Use ob_get_clean(), not ob_get_contents() and ob_clean().

Tests were failing with:
FunctionsLibTest::testVerifCond with data set "Test that verifConf("0") returns false" ('0', false)
Test code or tested code did not (only) close its own output buffers

OK, but incomplete, skipped, or risky tests\!

Also refactored a test case to use a data provider which helped identify that it was related
to dol_eval.
---
 htdocs/core/lib/functions.lib.php |  6 ++--
 test/phpunit/FunctionsLibTest.php | 52 ++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ffbe1b1afcf..1ec0132756d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9957,8 +9957,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 			if ($hideerrors) {
 				ob_start();	// An evaluation has no reason to output data
 				$tmps = @eval('return '.$s.';');
-				$tmpo = ob_get_contents();
-				ob_clean(); // End of interception of data
+				$tmpo = ob_get_clean();
 				if ($tmpo) {
 					print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
 				}
@@ -9966,8 +9965,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 			} else {
 				ob_start();	// An evaluation has no reason to output data
 				$tmps = eval('return '.$s.';');
-				$tmpo = ob_get_contents();
-				ob_clean(); // End of interception of data
+				$tmpo = ob_get_clean();
 				if ($tmpo) {
 					print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
 				}
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index f621e6dfe27..bd0f56b57cf 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1227,33 +1227,43 @@ class FunctionsLibTest extends CommonClassTest
 		$this->assertEquals(getServerTimeZoneInt('now') * 3600, ($nowtzserver - $now));
 	}
 
+
+
+	/**
+	 * Data provider for testVerifCond
+	 *
+	 * @return array<string,array{0:string,1:bool}>
+	 */
+	public function verifCondDataProvider(): array
+	{
+		return [
+			'Test a true comparison' => ['1==1', true,],
+			'Test a false comparison' => ['1==2', false,],
+			'Test that the conf property of a module reports true when enabled' => ['isModEnabled("facture")', true,],
+			'Test that the conf property of a module reports false when disabled' => ['isModEnabled("moduledummy")', false,],
+			'Test that verifConf(0) returns false' => [0, false,],
+			'Test that verifConf("0") returns false' => ["0", false,],
+			'Test that verifConf("") returns false (special case)' => ['', true,],
+		];
+	}
+
 	/**
 	 * testVerifCond
 	 *
+	 * @dataProvider verifCondDataProvider
+	 *
+	 * @param string $cond     Condition to test using verifCond
+	 * @param string $expected Expected outcome of verifCond
+	 *
 	 * @return	void
 	 */
-	public function testVerifCond()
+	public function testVerifCond($cond, $expected)
 	{
-		$verifcond = verifCond('1==1');
-		$this->assertTrue($verifcond, 'Test a true comparison');
-
-		$verifcond = verifCond('1==2');
-		$this->assertFalse($verifcond, 'Test a false comparison');
-
-		$verifcond = verifCond('isModEnabled("facture")');
-		$this->assertTrue($verifcond, 'Test that the conf property of a module reports true when enabled');
-
-		$verifcond = verifCond('isModEnabled("moduledummy")');
-		$this->assertFalse($verifcond, 'Test that the conf property of a module reports false when disabled');
-
-		$verifcond = verifCond(0);
-		$this->assertFalse($verifcond, 'Test that verifConf(0) return False');
-
-		$verifcond = verifCond("0");
-		$this->assertFalse($verifcond, 'Test that verifConf("0") return False');
-
-		$verifcond = verifCond('');
-		$this->assertTrue($verifcond, 'Test that verifConf("") return False (special case)');
+		if ($expected) {
+			$this->assertTrue(verifCond($cond));
+		} else {
+			$this->assertFalse(verifCond($cond));
+		}
 	}
 
 	/**

From a8444e72cd0c36cff2f1538f1d72ba4ec05e3888 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 9 Mar 2024 01:45:31 +0100
Subject: [PATCH 0592/1862] Use user->hasRight

---
 htdocs/core/modules/modAgenda.class.php         | 2 +-
 htdocs/core/modules/modAi.class.php             | 4 ++--
 htdocs/core/modules/modApi.class.php            | 8 ++++----
 htdocs/core/modules/modBlockedLog.class.php     | 4 ++--
 htdocs/core/modules/modCollab.class.php         | 2 +-
 htdocs/core/modules/modCron.class.php           | 2 +-
 htdocs/core/modules/modEmailCollector.class.php | 2 +-
 htdocs/core/modules/modGravatar.class.php       | 6 +++---
 htdocs/core/modules/modPaybox.class.php         | 6 +++---
 htdocs/core/modules/modPaypal.class.php         | 8 ++++----
 htdocs/core/modules/modProduct.class.php        | 2 +-
 htdocs/core/modules/modService.class.php        | 2 +-
 htdocs/core/modules/modStripe.class.php         | 2 +-
 htdocs/core/modules/modWebsite.class.php        | 2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 82c372f8249..895e7e2329e 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -200,7 +200,7 @@ class modAgenda extends DolibarrModules
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
 		//							'enabled'=>'1',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRights('mymodule', 'level1', 'level2') if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php
index 44d06ce83a4..21249db69e9 100644
--- a/htdocs/core/modules/modAi.class.php
+++ b/htdocs/core/modules/modAi.class.php
@@ -167,8 +167,8 @@ class modAi extends DolibarrModules
 		// Array to add new pages in new tabs
 		$this->tabs = array();
 		// Example:
-		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@ai:$user->rights->ai->read:/ai/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@ai:$user->rights->othermodule->read:/ai/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@ai:$user->hasRight('ai','read'):/ai/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@ai:$user->hasRight('othermodule','read'):/ai/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
 		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
 		//
 		// Where objecttype can be
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 27af84dca96..25484796210 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -95,8 +95,8 @@ class modApi extends DolibarrModules
 		$this->const = array();
 
 		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->api->read:/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->hasRight('api','read'):/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->hasRight('othermodule','read'):/api/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
 		//                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
@@ -144,8 +144,8 @@ class modApi extends DolibarrModules
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Generate/modify users API key';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'apikey';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		$this->rights[$r][5] = 'generate';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'apikey';				// In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
+		$this->rights[$r][5] = 'generate';				// In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
 		$r++;
 
 
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index eb91bf4ef47..dd7fe7b3884 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -133,8 +133,8 @@ class modBlockedLog extends DolibarrModules
 			'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
 			'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>200,
-			'enabled'=>'$conf->blockedlog->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("blockedlog")', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->hasRight("blockedlog", "read")', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 			'target'=>'',
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
 		);
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index be1edcb8c62..abf1949a174 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -118,7 +118,7 @@ class modCollab extends DolibarrModules
 			'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>100,
 			'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 			'target'=>'',
 			'user'=>2				                // 0=Menu for internal users, 1=external users, 2=both
 		);
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 29daa7d61bf..366b8a6ab31 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -142,7 +142,7 @@ class modCron extends DolibarrModules
 								'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>500,
 								'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 1912c92827b..3604cdaf2ce 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -175,7 +175,7 @@ class modEmailCollector extends DolibarrModules
 			'langs'=>'admin', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>400,
 			'enabled'=>'isModEnabled("emailcollector") && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->admin', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'perms'=>'$user->admin', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 			'target'=>'',
 			'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index 25c5e7ac2d3..4e38b93c4fc 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -129,7 +129,7 @@ class modGravatar extends DolibarrModules
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
 		//							'enabled'=>'1',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
@@ -143,7 +143,7 @@ class modGravatar extends DolibarrModules
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
 		//							'enabled'=>'1',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
@@ -157,7 +157,7 @@ class modGravatar extends DolibarrModules
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
 		//							'enabled'=>'1',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 510ae24b0ff..eeb3dc00e6c 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -125,7 +125,7 @@ class modPaybox extends DolibarrModules
 		//							'url'=>'/mymodule/pagetop.php',
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
@@ -138,7 +138,7 @@ class modPaybox extends DolibarrModules
 		//							'url'=>'/mymodule/pagelevel1.php',
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
@@ -151,7 +151,7 @@ class modPaybox extends DolibarrModules
 		//							'url'=>'/mymodule/pagelevel2.php',
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 4863e9c53bd..8d2a98c67e7 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -117,7 +117,7 @@ class modPaypal extends DolibarrModules
 			'langs'=>'paypal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>501,
 			'enabled'=>'$conf->paypal->enabled && isModEnabled("banque") && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->banque->consolidate',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'perms'=>'$user->rights->banque->consolidate',	// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 			'target'=>'',
 			'user'=>2
 		);				                // 0=Menu for internal users, 1=external users, 2=both
@@ -132,7 +132,7 @@ class modPaypal extends DolibarrModules
 		//							'url'=>'/mymodule/pagetop.php',
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
@@ -145,7 +145,7 @@ class modPaypal extends DolibarrModules
 		//							'url'=>'/mymodule/pagelevel1.php',
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
@@ -158,7 +158,7 @@ class modPaypal extends DolibarrModules
 		//							'url'=>'/mymodule/pagelevel2.php',
 		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		//							'position'=>100,
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		//							'perms'=>'1',			// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 35a75ca1345..28b5f19174c 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -169,7 +169,7 @@ class modProduct extends DolibarrModules
 								'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>300,
 								'enabled'=>'isModEnabled("product") && preg_match(\'/^(admintools|all)/\',$leftmenu)',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'perms'=>'1',			                // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>0);				                // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index f40d72e8038..fb07f91ee1c 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -135,7 +135,7 @@ class modService extends DolibarrModules
 		 'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 		 'position'=>300,
 		 'enabled'=>'isModEnabled("product") && preg_match(\'/^(admintools|all)/\',$leftmenu)',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		 'perms'=>'1',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+		 'perms'=>'1',			                // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 		 'target'=>'',
 		 'user'=>0);				                // 0=Menu for internal users, 1=external users, 2=both
 		 $r++;
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index b990e037295..2e0d639c856 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -102,7 +102,7 @@ class modStripe extends DolibarrModules
 			'langs'=>'stripe',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>500,
 			'enabled'=>'$conf->stripe->enabled && isModEnabled("banque") && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->banque->modifier',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'perms'=>'$user->rights->banque->modifier',	// Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 			'target'=>'',
 			'user'=>2
 		);				                // 0=Menu for internal users, 1=external users, 2=both
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index d7afc7921b7..fe01b0e7814 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -123,7 +123,7 @@ class modWebsite extends DolibarrModules
 								'langs'=>'website', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>100,
 								'enabled'=>'$conf->website->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'$user->rights->website->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'perms'=>'$user->rights->website->read', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;

From 2cb4d40e5e41c7b99686129823535dc2c8927ed1 Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Sat, 9 Mar 2024 01:49:07 +0100
Subject: [PATCH 0593/1862] qual: phan for functions.lib.php (#28655)

* Update card.php

* Update functions.lib.php

* Update card.php

* Update releve.php

* Update card-rec.php

* Update card.php

* Update prelevement.php

* Update card.php

* Update index.php

* Update index.php

* Update html.form.class.php

* Update card.php

* Update conferenceorbooth_card.php

* Update conferenceorbooth_contact.php

* Update conferenceorbooth_document.php

* Update conferenceorbooth_list.php

* Update conferenceorboothattendee_card.php

* Update conferenceorboothattendee_list.php

* Update shipment.php

* Update card.php

* Update card-rec.php

* Update card.php

* Update card.php

* Update document.php

* Update card.php

* Update comment.php

* Update element.php

* Update ganttview.php

* Update tasks.php

* Update comment.php

* Update contact.php

* Update document.php

* Update note.php

* Update task.php

* Update time.php

* Update card.php

* Update card.php

* Update bank.php

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 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 1ec0132756d..77363408e36 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6228,7 +6228,7 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0,
  *		Function used into PDF and HTML pages
  *
  *		@param	float				$amount			Amount to format
- *		@param	integer				$form			Type of format, HTML or not (not by default)
+ *		@param	int<0,1>			$form			Type of formatting: 1=HTML, 0=no formatting (no by default)
  *		@param	Translate|string	$outlangs		Object langs for output. '' use default lang. 'none' use international separators.
  *		@param	int					$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accuracy) before being inserted into database or after a computation, so this parameter should be useless.
  *		@param	int					$rounding		MINIMUM number of decimal to show: 0=no change, -1=we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)

From c534beecb81deb3280896fbe927aee0520d5f2d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 9 Mar 2024 02:10:55 +0100
Subject: [PATCH 0594/1862] FIX Can delete a draft invoice if we have write
 permission.

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a0748e540ed..66e452af868 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -139,7 +139,7 @@ $hookmanager->initHooks(array('invoicecard', 'globalcard'));
 $usercanread = $user->hasRight("facture", "lire");
 $usercancreate = $user->hasRight("facture", "creer");
 $usercanissuepayment = $user->hasRight("facture", "paiement");
-$usercandelete = $user->hasRight("facture", "supprimer");
+$usercandelete = $user->hasRight("facture", "supprimer") || ($usercancreate && isset($object->status) && $object->status == $object::STATUS_DRAFT);
 $usercancreatecontract = $user->hasRight("contrat", "creer");
 
 // Advanced Permissions

From 53bed0f71d069896b4b097de37ac3f2269984d7e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 02:31:30 +0100
Subject: [PATCH 0595/1862] Fix: cachecontact to cachecontacts (#28724)

# Fix: cachecontact to cachecontacts

Detected as uninitialized array - determined that the variable name must be with s.
---
 htdocs/comm/action/index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 7ce401bc3c9..f0843f3c990 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -2069,12 +2069,13 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						//print img_picto($langs->trans("Birthday"), 'birthday-cake').' ';
 
 						$tmpid = $event->id;
+
 						if (empty($cachecontacts[$tmpid])) {
 							$newcontact = new Contact($db);
 							$newcontact->fetch($tmpid);
-							$cachecontact[$tmpid] = $newcontact;
+							$cachecontacts[$tmpid] = $newcontact;
 						}
-						print $cachecontact[$tmpid]->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline-block');
+						print $cachecontacts[$tmpid]->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline-block');
 
 						//$event->picto = 'birthday-cake';
 						//print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'birthday', 'contact');

From d116934301acb083c07e02539aa0ea3282993a20 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 02:43:57 +0100
Subject: [PATCH 0596/1862] Fix: Initialise array variables before assigning
 fields (#28725)

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields

* Fix: Initialise array variables before assigning fields
---
 htdocs/accountancy/admin/categories_list.php  | 12 ++++---
 htdocs/accountancy/admin/journals_list.php    | 12 ++++---
 htdocs/accountancy/admin/productaccount.php   |  9 +++---
 .../accountancy/class/bookkeeping.class.php   |  1 +
 htdocs/accountancy/customer/list.php          |  1 +
 htdocs/accountancy/supplier/list.php          |  1 +
 htdocs/adherents/admin/member.php             |  6 ++--
 htdocs/adherents/admin/website.php            |  1 +
 htdocs/adherents/card.php                     |  1 +
 htdocs/adherents/stats/index.php              |  7 ++--
 htdocs/admin/bank.php                         |  2 ++
 htdocs/admin/bom.php                          |  1 +
 htdocs/admin/commande.php                     |  1 +
 htdocs/admin/contract.php                     |  3 +-
 htdocs/admin/delivery.php                     |  1 +
 htdocs/admin/expedition.php                   |  1 +
 htdocs/admin/expensereport.php                |  3 +-
 htdocs/admin/facture.php                      |  9 +++---
 htdocs/admin/fichinter.php                    |  1 +
 htdocs/admin/holiday.php                      |  1 +
 htdocs/admin/hrm.php                          | 15 +++++----
 htdocs/admin/knowledgemanagement.php          | 21 ++++++------
 htdocs/admin/menus.php                        |  1 +
 htdocs/admin/menus/index.php                  | 27 ++++++++--------
 htdocs/admin/mrp.php                          |  1 +
 htdocs/admin/oauthlogintokens.php             |  3 +-
 htdocs/admin/propal.php                       |  1 +
 htdocs/admin/reception_setup.php              |  1 +
 htdocs/admin/security.php                     |  1 +
 htdocs/admin/stock.php                        |  1 +
 htdocs/admin/stocktransfer.php                |  7 ++--
 htdocs/admin/supplier_proposal.php            |  1 +
 htdocs/admin/ticket.php                       |  1 +
 htdocs/admin/user.php                         |  1 +
 htdocs/admin/usergroup.php                    |  1 +
 htdocs/admin/webhook.php                      | 22 +++++++------
 htdocs/admin/workstation.php                  |  3 +-
 htdocs/asset/admin/setup.php                  | 25 ++++++++-------
 htdocs/barcode/printsheet.php                 | 17 +++++-----
 htdocs/bookcal/availabilities_list.php        | 32 ++++++++++++-------
 htdocs/bookcal/calendar_list.php              | 28 ++++++++++------
 htdocs/commande/list_det.php                  |  1 +
 htdocs/compta/bank/annuel.php                 |  4 +++
 htdocs/compta/bank/graph.php                  |  1 +
 htdocs/compta/bank/info.php                   |  1 +
 htdocs/compta/deplacement/index.php           |  3 ++
 htdocs/compta/facture/card.php                |  3 ++
 htdocs/compta/localtax/card.php               |  1 +
 htdocs/compta/paiement/cheque/card.php        |  1 +
 htdocs/compta/payment_sc/card.php             |  1 +
 htdocs/compta/payment_vat/card.php            |  1 +
 htdocs/compta/prelevement/orders_list.php     |  5 +--
 htdocs/compta/sociales/list.php               |  4 +++
 htdocs/compta/stats/cabyprodserv.php          |  9 ++++--
 htdocs/compta/stats/cabyuser.php              |  7 ++--
 htdocs/compta/stats/casoc.php                 | 10 ++++--
 .../stats/supplier_turnover_by_prodserv.php   |  3 ++
 .../stats/supplier_turnover_by_thirdparty.php |  3 ++
 58 files changed, 221 insertions(+), 121 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 5f6959cccd8..032b3ac6e3e 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -47,8 +47,10 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
+$acts = array();
 $acts[0] = "activate";
 $acts[1] = "disable";
+$actl = array();
 $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
@@ -117,7 +119,7 @@ $tabcond[32] = isModEnabled('accounting');
 
 // List of help for fields
 $tabhelp = array();
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'category_type'=>$langs->trans("SetToYesIfGroupIsComputationOfOtherGroups"), 'formula'=>$langs->trans("EnterCalculationRuleIfPreviousFieldIsYes"));
+$tabhelp[32] = array('code' => $langs->trans("EnterAnyCode"), 'category_type' => $langs->trans("SetToYesIfGroupIsComputationOfOtherGroups"), 'formula' => $langs->trans("EnterCalculationRuleIfPreviousFieldIsYes"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -247,7 +249,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$result = $db->query($sql);
 		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+			$_POST = array('id' => $id); // Clean $_POST array, we keep only
 		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -582,7 +584,7 @@ if ($tabname[$id]) {
 	}
 
 	$tmpaction = 'create';
-	$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+	$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 	$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 	$error = $hookmanager->error;
 	$errors = $hookmanager->errors;
@@ -786,7 +788,7 @@ if ($resql) {
 			print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 			if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 				$tmpaction = 'edit';
-				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 				$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 				$error = $hookmanager->error;
 				$errors = $hookmanager->errors;
@@ -833,7 +835,7 @@ if ($resql) {
 				$canbemodified = $iserasable;
 
 				$tmpaction = 'view';
-				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 				$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 				$error = $hookmanager->error;
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 3c4365844e8..1b12d17df07 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -50,8 +50,10 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
+$acts = array();
 $acts[0] = "activate";
 $acts[1] = "disable";
+$actl = array();
 $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"');
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
@@ -128,7 +130,7 @@ $tabcond[35] = isModEnabled('accounting');
 
 // List of help for fields
 $tabhelp = array();
-$tabhelp[35] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[35] = array('code' => $langs->trans("EnterAnyCode"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -228,7 +230,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$result = $db->query($sql);
 		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
+			$_POST = array('id' => $id); // Clean $_POST array, we keep only id
 		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -451,7 +453,7 @@ if ($id) {
 		}
 
 		$tmpaction = 'create';
-		$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+		$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 		$error = $hookmanager->error;
 		$errors = $hookmanager->errors;
@@ -561,7 +563,7 @@ if ($id) {
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 					$tmpaction = 'edit';
-					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 					$error = $hookmanager->error;
 					$errors = $hookmanager->errors;
@@ -580,7 +582,7 @@ if ($id) {
 					print '</td>';
 				} else {
 					$tmpaction = 'view';
-					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index e93164b01be..fa0db20a05f 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -503,8 +503,8 @@ if ($resql) {
 
 	if ($massaction !== 'set_default_account') {
 		$arrayofmassactions = array(
-			'changeaccount'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Save")
-			,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
+			'changeaccount' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Save")
+			,'set_default_account' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
 		);
 		$massactionbutton = $form->selectMassAction('', $arrayofmassactions, 1);
 	}
@@ -516,7 +516,8 @@ if ($resql) {
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 	if ($massaction == 'set_default_account') {
-		$formquestion[]=array('type' => 'other',
+		$formquestion = array();
+		$formquestion[] = array('type' => 'other',
 			'name' => 'set_default_account',
 			'label' => $langs->trans("AccountancyCode"),
 			'value' => $form->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
@@ -589,7 +590,7 @@ if ($resql) {
 	// Current account
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="6" name="search_current_account" id="search_current_account" value="'.dol_escape_htmltag($search_current_account).'">';
-	$listofvals = array('withoutvalidaccount'=>$langs->trans("WithoutValidAccount"), 'withvalidaccount'=>$langs->trans("WithValidAccount"));
+	$listofvals = array('withoutvalidaccount' => $langs->trans("WithoutValidAccount"), 'withvalidaccount' => $langs->trans("WithValidAccount"));
 	print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1);
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index fe111b7cd56..d40ddeda75a 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2595,6 +2595,7 @@ class BookKeeping extends CommonObject
 		if (getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT')) {
 			$accounting_groups_used_for_income_statement = array_filter(array_map('trim', explode(',', getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT'))), 'strlen');
 
+			$pcg_type_filter = array();
 			foreach ($accounting_groups_used_for_income_statement as $item) {
 				$pcg_type_filter[] = "'" . $this->db->escape($item) . "'";
 			}
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 22047f60fe5..e7487c70e0f 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -471,6 +471,7 @@ if ($result) {
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	if ($massaction == 'set_default_account') {
+		$formquestion = array();
 		$formquestion[] = array('type' => 'other',
 			'name' => 'set_default_account',
 			'label' => $langs->trans("AccountancyCode"),
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index cf495bf632a..db16688ff31 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -478,6 +478,7 @@ if ($result) {
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
 	if ($massaction == 'set_default_account') {
+		$formquestion = array();
 		$formquestion[] = array('type' => 'other',
 				'name' => 'set_default_account',
 				'label' => $langs->trans("AccountancyCode"),
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 6a5139cf16b..d93ba0b2138 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -339,6 +339,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 // Start date of new membership
+$startpoint = array();
 $startpoint[0] = $langs->trans("SubscriptionPayment");
 $startpoint["m"] = $langs->trans("Month");
 $startpoint["Y"] = $langs->trans("Year");
@@ -393,7 +394,7 @@ print "</td></tr>\n";
 
 // Insert subscription into bank account
 print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
-$arraychoices = array('0'=>$langs->trans("None"));
+$arraychoices = array('0' => $langs->trans("None"));
 if (isModEnabled("bank")) {
 	$arraychoices['bankdirect'] = $langs->trans("MoreActionBankDirect");
 }
@@ -416,7 +417,7 @@ if (isModEnabled('invoice')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (isModEnabled("bank")) {
 		print '<td>';
-		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS', '0'), 0);
+		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0' => $langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry' => $langs->trans("Default")), getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS', '0'), 0);
 		print '</td>';
 	} else {
 		print '<td class="right">';
@@ -494,6 +495,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index f922f1abb7f..7cd4f79b8c5 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -220,6 +220,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 	print "</td></tr>\n";
 
 	// Force nature of member (mor/phy)
+	$morphys = array();
 	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
 	print '<tr class="oddeven drag" id="trforcenature"><td>';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index aaee4c47aa4..b9370bf20c8 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1019,6 +1019,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</td>\n";
 
 		// Morphy
+		$morphys = array();
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Moral");
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberNature")."</td><td>\n";
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index b6c2ea3a676..0672b5f90c0 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -33,10 +33,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOSTINT('userid'); if ($userid < 0) {
+$userid = GETPOSTINT('userid');
+if ($userid < 0) {
 	$userid = 0;
 }
-$socid = GETPOSTINT('socid'); if ($socid < 0) {
+$socid = GETPOSTINT('socid');
+if ($socid < 0) {
 	$socid = 0;
 }
 
@@ -91,6 +93,7 @@ $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 7e29be5e759..f8ca472744f 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -220,6 +220,7 @@ print '<td>'.$langs->trans("Example").'</td>';
 print '<td class="center">'.$langs->trans("Status").'</td>';
 print "</tr>\n";
 
+$bankorder = array();
 $bankorder[0][0] = $langs->trans("BankOrderGlobal");
 $bankorder[0][1] = $langs->trans("BankOrderGlobalDesc");
 $bankorder[0][2] = 'BankCode DeskCode BankAccountNumber BankAccountNumberKey';
@@ -309,6 +310,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 9435f55868d..319e5b71789 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -331,6 +331,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 9a4ba84d3c7..62d11335384 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -414,6 +414,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 29effeb5c80..e30a2b8d0c5 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -55,7 +55,7 @@ if (!getDolGlobalString('CONTRACT_ADDON')) {
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-$error=0;
+$error = 0;
 
 if ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconstcontract', 'aZ09');
@@ -363,6 +363,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 89c653c5b39..0e6339c36f8 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -373,6 +373,7 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 0ddc49e5c85..d054f3bfa5e 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -321,6 +321,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 16f4e1acc36..64cba2b7c6f 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -161,7 +161,7 @@ if ($action == 'updateMask') {
 	$amounts = GETPOSTINT('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY');
 	$res5 = dolibarr_set_const($db, 'EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', intval($amounts), 'chaine', 0, '', $conf->entity);
 
-	if (!($res1 > 0) || !($res2 > 0) || !($res3 >= 0) || !($res4 >0) || !($res5 >0)) {
+	if (!($res1 > 0) || !($res2 > 0) || !($res3 >= 0) || !($res4 > 0) || !($res5 > 0)) {
 		$error++;
 	}
 
@@ -337,6 +337,7 @@ foreach ($dirmodels as $reldir) {
 	if (is_dir($dir)) {
 		$handle = opendir($dir);
 		if (is_resource($handle)) {
+			$filelist = array();
 			while (($file = readdir($handle)) !== false) {
 				$filelist[] = $file;
 			}
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 8beab5a7ef5..3721646d950 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -507,6 +507,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
@@ -626,10 +627,10 @@ if (getDolGlobalString('INVOICE_USE_DEFAULT_DOCUMENT')) { // Hidden conf
 	print "</tr>\n";
 
 	$listtype = array(
-		Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
-		Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
-		Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
-		Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
+		Facture::TYPE_STANDARD => $langs->trans("InvoiceStandard"),
+		Facture::TYPE_REPLACEMENT => $langs->trans("InvoiceReplacement"),
+		Facture::TYPE_CREDIT_NOTE => $langs->trans("InvoiceAvoir"),
+		Facture::TYPE_DEPOSIT => $langs->trans("InvoiceDeposit"),
 	);
 	if (getDolGlobalInt('INVOICE_USE_SITUATION')) {
 		$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 0ce25e70225..aba9db7f9fd 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -413,6 +413,7 @@ foreach ($dirmodels as $reldir) {
 	if (is_dir($dir)) {
 		$handle = opendir($dir);
 		if (is_resource($handle)) {
+			$filelist = array();
 			while (($file = readdir($handle)) !== false) {
 				$filelist[] = $file;
 			}
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 21280dd8008..34153e22866 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -327,6 +327,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 			if (is_dir($dir)) {
 				$handle = opendir($dir);
 				if (is_resource($handle)) {
+					$filelist = array();
 					while (($file = readdir($handle)) !== false) {
 						$filelist[] = $file;
 					}
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index e0c92c8f663..eef0a7a34a8 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -56,8 +56,8 @@ $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'evaluation';
 
 $arrayofparameters = array(
-	'HRM_MAXRANK'=>array('type'=>'integer','enabled'=>1),
-	'HRM_DEFAULT_SKILL_DESCRIPTION'=>array('type'=>'varchar','enabled'=>1),
+	'HRM_MAXRANK' => array('type' => 'integer','enabled' => 1),
+	'HRM_DEFAULT_SKILL_DESCRIPTION' => array('type' => 'varchar','enabled' => 1),
 );
 
 $error = 0;
@@ -212,7 +212,7 @@ print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "hrm"
 
 $moduledir = 'hrm';
 $myTmpObjects = array();
-$myTmpObjects['evaluation'] = array('label'=>'Evaluation', 'includerefgeneration'=>1, 'includedocgeneration'=>0);
+$myTmpObjects['evaluation'] = array('label' => 'Evaluation', 'includerefgeneration' => 1, 'includedocgeneration' => 0);
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectKey != $type) {
@@ -374,6 +374,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				if (is_dir($dir)) {
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
+						$filelist = array();
 						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
@@ -487,7 +488,7 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
-		if ($val['enabled']==1) {
+		if ($val['enabled'] == 1) {
 			$setupnotempty++;
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -572,7 +573,7 @@ if ($action == 'edit') {
 		print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
-			if ($val['enabled']==1) {
+			if ($val['enabled'] == 1) {
 				$setupnotempty++;
 				print '<tr class="oddeven"><td>';
 				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -581,7 +582,7 @@ if ($action == 'edit') {
 
 				if ($val['type'] == 'textarea') {
 					print dol_nl2br(getDolGlobalString($constname));
-				} elseif ($val['type']== 'html') {
+				} elseif ($val['type'] == 'html') {
 					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
@@ -592,7 +593,7 @@ if ($action == 'edit') {
 					$tmp = explode(':', $val['type']);
 
 					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
-					if ($template<0) {
+					if ($template < 0) {
 						setEventMessages(null, $formmail->errors, 'errors');
 					}
 					print $langs->trans($template->label);
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index c50951f1e3f..b8445a0fb9a 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -45,7 +45,7 @@ $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'knowledgemanagement';
 
 $arrayofparameters = array(
-	'KNOWLEDGEMANAGEMENT_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>0),
+	'KNOWLEDGEMANAGEMENT_MYPARAM1' => array('type' => 'string', 'css' => 'minwidth500' ,'enabled' => 0),
 	//'KNOWLEDGEMANAGEMENT_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
 	//'KNOWLEDGEMANAGEMENT_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
 	//'KNOWLEDGEMANAGEMENT_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
@@ -202,7 +202,7 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
-		if ($val['enabled']==1) {
+		if ($val['enabled'] == 1) {
 			$setupnotempty++;
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -269,7 +269,7 @@ if ($action == 'edit') {
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
-			if ($val['enabled']==1) {
+			if ($val['enabled'] == 1) {
 				$setupnotempty++;
 				print '<tr class="oddeven"><td>';
 				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -278,7 +278,7 @@ if ($action == 'edit') {
 
 				if ($val['type'] == 'textarea') {
 					print dol_nl2br(getDolGlobalString($constname));
-				} elseif ($val['type']== 'html') {
+				} elseif ($val['type'] == 'html') {
 					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
@@ -289,7 +289,7 @@ if ($action == 'edit') {
 					$tmp = explode(':', $val['type']);
 
 					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
-					if ($template<0) {
+					if ($template < 0) {
 						setEventMessages(null, $formmail->errors, 'errors');
 					}
 					print $langs->trans($template->label);
@@ -306,13 +306,13 @@ if ($action == 'edit') {
 					}
 					print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					if (getDolGlobalString($constname)==2) {
+					if (getDolGlobalString($constname) == 2) {
 						print $langs->trans("Prospect");
-					} elseif (getDolGlobalString($constname)==3) {
+					} elseif (getDolGlobalString($constname) == 3) {
 						print $langs->trans("ProspectCustomer");
-					} elseif (getDolGlobalInt($constname)==1) {
+					} elseif (getDolGlobalInt($constname) == 1) {
 						print $langs->trans("Customer");
-					} elseif (getDolGlobalInt($constname)==0) {
+					} elseif (getDolGlobalInt($constname) == 0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} else {
@@ -335,7 +335,7 @@ if ($action == 'edit') {
 
 $moduledir = 'knowledgemanagement';
 $myTmpObjects = array();
-$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+$myTmpObjects['MyObject'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -497,6 +497,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				if (is_dir($dir)) {
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
+						$filelist = array();
 						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index f0a84949504..473227f6889 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -131,6 +131,7 @@ print load_fiche_titre($langs->trans("Menus"), '', 'title_setup');
 
 $h = 0;
 
+$head = array();
 $head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
 $head[$h][1] = $langs->trans("MenuHandlers");
 $head[$h][2] = 'handler';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index c6099a88c6c..8e7238131bb 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -274,7 +274,8 @@ i.e.: data[]= array (index, parent index, string )
 
 // First the root item of the tree must be declared:
 
-$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+$data = array();
+$data[] = array('rowid' => 0, 'fk_menu' => -1, 'title' => "racine", 'mainmenu' => '', 'leftmenu' => '', 'fk_mainmenu' => '', 'fk_leftmenu' => '');
 
 // Then all child items must be declared
 
@@ -314,17 +315,17 @@ if ($res) {
 		$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 
 		$data[] = array(
-			'rowid'=>$menu['rowid'],
-			'module'=>$menu['module'],
-			'fk_menu'=>$menu['fk_menu'],
-			'title'=>$titre,
-			'mainmenu'=>$menu['mainmenu'],
-			'leftmenu'=>$menu['leftmenu'],
-			'fk_mainmenu'=>$menu['fk_mainmenu'],
-			'fk_leftmenu'=>$menu['fk_leftmenu'],
-			'position'=>$menu['position'],
-			'entry'=>$entry,
-			'buttons'=>$buttons
+			'rowid' => $menu['rowid'],
+			'module' => $menu['module'],
+			'fk_menu' => $menu['fk_menu'],
+			'title' => $titre,
+			'mainmenu' => $menu['mainmenu'],
+			'leftmenu' => $menu['leftmenu'],
+			'fk_mainmenu' => $menu['fk_mainmenu'],
+			'fk_leftmenu' => $menu['fk_leftmenu'],
+			'position' => $menu['position'],
+			'entry' => $entry,
+			'buttons' => $buttons
 		);
 		$i++;
 	}
@@ -378,7 +379,7 @@ if (count($remainingdata)) {
 	print '<tr>';
 	print '<td colspan="2">';
 	foreach ($remainingdata as $datar) {
-		$father = array('rowid'=>$datar['rowid'], 'title'=>"???", 'mainmenu'=>$datar['fk_mainmenu'], 'leftmenu'=>$datar['fk_leftmenu'], 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+		$father = array('rowid' => $datar['rowid'], 'title' => "???", 'mainmenu' => $datar['fk_mainmenu'], 'leftmenu' => $datar['fk_leftmenu'], 'fk_mainmenu' => '', 'fk_leftmenu' => '');
 		//print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";
 		tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);
 	}
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 382106a9b94..5c2de506880 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -327,6 +327,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 98f7b8d2a9e..9ba965e6bfc 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -143,6 +143,7 @@ if ($mode == 'setup' && $user->admin) {
 	print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
 
 	// Define $listinsetup
+	$listinsetup = array();
 	foreach ($conf->global as $key => $val) {
 		if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) {
 			$provider = preg_replace('/_ID$/', '', $key);
@@ -156,7 +157,7 @@ if ($mode == 'setup' && $user->admin) {
 		}
 	}
 
-	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+	$oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
 
 	// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
 	foreach ($listinsetup as $key) {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 2eb1ed3c820..6913857a69f 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -390,6 +390,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 2f921128690..3b5ee37b77c 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -331,6 +331,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 4c6a5610067..ab111f7c67f 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -198,6 +198,7 @@ $dir = "../core/modules/security/generate";
 clearstatcache();
 $handle = opendir($dir);
 $i = 1;
+$arrayhandler = array();
 if (is_resource($handle)) {
 	while (($file = readdir($handle)) !== false) {
 		if (preg_match('/(modGeneratePass[a-z]+)\.class\.php$/i', $file, $reg)) {
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index b611e00c2ca..4c8c5fc51ae 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -571,6 +571,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index 314b24d9fb0..b7e027db2b2 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -50,8 +50,8 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 
 $arrayofparameters = array(
-	'STOCKTRANSFER_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
-	'STOCKTRANSFER_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+	'STOCKTRANSFER_MYPARAM1' => array('css' => 'minwidth200', 'enabled' => 1),
+	'STOCKTRANSFER_MYPARAM2' => array('css' => 'minwidth500', 'enabled' => 1)
 );
 
 $error = 0;
@@ -233,7 +233,7 @@ print '<span class="opacitymedium">'.$langs->trans("StockTransferSetupPage").'</
 
 $moduledir = 'stocktransfer';
 $myTmpObjects = array();
-$myTmpObjects[$moduledir]=array('includerefgeneration'=>1, 'includedocgeneration'=>1, 'class'=>'StockTransfer');
+$myTmpObjects[$moduledir] = array('includerefgeneration' => 1, 'includedocgeneration' => 1, 'class' => 'StockTransfer');
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectKey == 'MyObject') {
@@ -396,6 +396,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				if (is_dir($dir)) {
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
+						$filelist = array();
 						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 82a55ca18d6..09728fbe93e 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -379,6 +379,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 19405ddbf4b..60cc1ce67b5 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -408,6 +408,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 2053df210be..6cd21cd1567 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -231,6 +231,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 19d6a23afd2..598b8a687e8 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -154,6 +154,7 @@ foreach ($dirmodels as $reldir) {
 		if (is_dir($dir)) {
 			$handle = opendir($dir);
 			if (is_resource($handle)) {
+				$filelist = array();
 				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 4301353540f..7755856f8a0 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -210,7 +210,7 @@ if ($action == 'edit') {
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
-			if ($val['enabled']==1) {
+			if ($val['enabled'] == 1) {
 				$setupnotempty++;
 				print '<tr class="oddeven"><td>';
 				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -221,7 +221,7 @@ if ($action == 'edit') {
 					print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
 					print getDolGlobalString($constname);
 					print "</textarea>\n";
-				} elseif ($val['type']== 'html') {
+				} elseif ($val['type'] == 'html') {
 					require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 					$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 					$doleditor->Create();
@@ -300,7 +300,7 @@ if ($action == 'edit') {
 			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 			foreach ($arrayofparameters as $constname => $val) {
-				if ($val['enabled']==1) {
+				if ($val['enabled'] == 1) {
 					$setupnotempty++;
 					print '<tr class="oddeven"><td>';
 					$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -309,7 +309,7 @@ if ($action == 'edit') {
 
 					if ($val['type'] == 'textarea') {
 						print dol_nl2br(getDolGlobalString($constname));
-					} elseif ($val['type']== 'html') {
+					} elseif ($val['type'] == 'html') {
 						print getDolGlobalString($constname);
 					} elseif ($val['type'] == 'yesno') {
 						print ajax_constantonoff($constname);
@@ -320,7 +320,7 @@ if ($action == 'edit') {
 						$tmp = explode(':', $val['type']);
 
 						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
-						if ($template<0) {
+						if ($template < 0) {
 							setEventMessages(null, $formmail->errors, 'errors');
 						}
 						print $langs->trans($template->label);
@@ -338,13 +338,13 @@ if ($action == 'edit') {
 							print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 						}
 					} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-						if (getDolGlobalInt($constname)==2) {
+						if (getDolGlobalInt($constname) == 2) {
 							print $langs->trans("Prospect");
-						} elseif (getDolGlobalInt($constname)==3) {
+						} elseif (getDolGlobalInt($constname) == 3) {
 							print $langs->trans("ProspectCustomer");
-						} elseif (getDolGlobalInt($constname)==1) {
+						} elseif (getDolGlobalInt($constname) == 1) {
 							print $langs->trans("Customer");
-						} elseif (getDolGlobalInt($constname)==0) {
+						} elseif (getDolGlobalInt($constname) == 0) {
 							print $langs->trans("NorProspectNorCustomer");
 						}
 					} elseif ($val['type'] == 'product') {
@@ -377,7 +377,8 @@ if ($action == 'edit') {
 
 
 $moduledir = 'webhook';
-$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+$myTmpObjects = array();
+$myTmpObjects['MyObject'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -539,6 +540,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				if (is_dir($dir)) {
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
+						$filelist = array();
 						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index de2e7de2e74..67c2bb9869a 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -222,7 +222,7 @@ if ($action == 'edit') {
 
 $moduledir = 'workstation';
 $myTmpObjects = array();
-$myTmpObjects['workstation'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
+$myTmpObjects['workstation'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -385,6 +385,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				if (is_dir($dir)) {
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
+						$filelist = array();
 						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 135a487952d..72e6cac37ea 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -47,8 +47,8 @@ $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'asset';
 
 $arrayofparameters = array(
-	'ASSET_ACCOUNTANCY_CATEGORY'=>array('type'=>'accountancy_category', 'enabled'=>1),
-	'ASSET_DEPRECIATION_DURATION_PER_YEAR'=>array('type'=>'string', 'css'=>'minwidth200', 'enabled'=>1),
+	'ASSET_ACCOUNTANCY_CATEGORY' => array('type' => 'accountancy_category', 'enabled' => 1),
+	'ASSET_DEPRECIATION_DURATION_PER_YEAR' => array('type' => 'string', 'css' => 'minwidth200', 'enabled' => 1),
 	//'ASSET_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
 	//'ASSET_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
 	//'ASSET_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
@@ -197,7 +197,7 @@ echo '<span class="opacitymedium">'.$langs->trans("AssetSetupPage").'</span>';
 
 $moduledir = 'asset';
 $myTmpObjects = array();
-$myTmpObjects['Asset'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
+$myTmpObjects['Asset'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -359,6 +359,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				if (is_dir($dir)) {
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
+						$filelist = array();
 						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
@@ -466,7 +467,7 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
-		if ($val['enabled']==1) {
+		if ($val['enabled'] == 1) {
 			$setupnotempty++;
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -477,7 +478,7 @@ if ($action == 'edit') {
 				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
 				print getDolGlobalString($constname);
 				print "</textarea>\n";
-			} elseif ($val['type']== 'html') {
+			} elseif ($val['type'] == 'html') {
 				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 				$doleditor->Create();
@@ -581,7 +582,7 @@ if ($action == 'edit') {
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
-			if ($val['enabled']==1) {
+			if ($val['enabled'] == 1) {
 				$setupnotempty++;
 				print '<tr class="oddeven"><td>';
 				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -590,7 +591,7 @@ if ($action == 'edit') {
 
 				if ($val['type'] == 'textarea') {
 					print dol_nl2br(getDolGlobalString($constname));
-				} elseif ($val['type']== 'html') {
+				} elseif ($val['type'] == 'html') {
 					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
@@ -601,7 +602,7 @@ if ($action == 'edit') {
 					$tmp = explode(':', $val['type']);
 
 					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
-					if ($template<0) {
+					if ($template < 0) {
 						setEventMessages(null, $formmail->errors, 'errors');
 					}
 					print $langs->trans($template->label);
@@ -619,13 +620,13 @@ if ($action == 'edit') {
 						print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 					}
 				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					if (getDolGlobalInt($constname)==2) {
+					if (getDolGlobalInt($constname) == 2) {
 						print $langs->trans("Prospect");
-					} elseif (getDolGlobalInt($constname)==3) {
+					} elseif (getDolGlobalInt($constname) == 3) {
 						print $langs->trans("ProspectCustomer");
-					} elseif (getDolGlobalInt($constname)==1) {
+					} elseif (getDolGlobalInt($constname) == 1) {
 						print $langs->trans("Customer");
-					} elseif (getDolGlobalInt($constname)==0) {
+					} elseif (getDolGlobalInt($constname) == 0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} elseif ($val['type'] == 'product') {
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 9f39d925bb6..9dbc437758c 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -222,6 +222,7 @@ if (empty($reshook)) {
 			);
 			complete_substitutions_array($substitutionarray, $langs);
 
+			$arrayofrecords = array();
 			// For labels
 			if ($mode == 'label') {
 				$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% possible when using TCPDF generator
@@ -236,14 +237,14 @@ if (empty($reshook)) {
 				if ($numberofsticker <= $MAXSTICKERS) {
 					for ($i = 0; $i < $numberofsticker; $i++) {
 						$arrayofrecords[] = array(
-							'textleft'=>$textleft,
-							'textheader'=>$textheader,
-							'textfooter'=>$textfooter,
-							'textright'=>$textright,
-							'code'=>$code,
-							'encoding'=>$encoding,
-							'is2d'=>$is2d,
-							'photo'=>!empty($barcodeimage) ? $barcodeimage : ''	// Photo must be a file that exists with format supported by TCPDF
+							'textleft' => $textleft,
+							'textheader' => $textheader,
+							'textfooter' => $textfooter,
+							'textright' => $textright,
+							'code' => $code,
+							'encoding' => $encoding,
+							'is2d' => $is2d,
+							'photo' => !empty($barcodeimage) ? $barcodeimage : ''	// Photo must be a file that exists with format supported by TCPDF
 						);
 					}
 				} else {
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index d27b46dd02c..16efbe2d5df 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -113,6 +113,16 @@ foreach ($object->fields as $key => $val) {
 // 	$fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']);
 // }
 
+
+// $fieldstosearchall is supposedly defined further below, ensure that it is.
+if (!isset($fieldstosearchall) || !is_array($fieldstosearchall)) {
+	$fieldstosearchall = array();
+}
+'
+ @phan-var-force array<string,string> $fieldstosearchall
+';
+
+
 // Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
@@ -120,11 +130,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -460,8 +470,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/bookcal/availabilities_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -563,7 +573,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
@@ -609,7 +619,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
@@ -741,7 +751,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		/*if (!empty($arrayfields['anotherfield']['checked'])) {
@@ -786,7 +796,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index 781cad7732e..7a735b81c86 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -111,6 +111,14 @@ foreach ($object->fields as $key => $val) {
 // 	$fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']);
 // }
 
+// $fieldstosearchall is supposedly defined further below, ensure that it is.
+if (!isset($fieldstosearchall) || !is_array($fieldstosearchall)) {
+	$fieldstosearchall = array();
+}
+'
+ @phan-var-force array<string,string> $fieldstosearchall
+';
+
 // Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
@@ -118,11 +126,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -444,8 +452,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/bookcal/calendar_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -546,7 +554,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
@@ -592,7 +600,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
@@ -724,7 +732,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		/*if (!empty($arrayfields['anotherfield']['checked'])) {
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 0eec5b4bb58..0451f7d48fe 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1485,6 +1485,7 @@ if ($resql) {
 
 	$totalarray = array();
 	$totalarray['nbfield'] = 0;
+	$subtotalarray = array();
 	$subtotalarray['nbfield'] = 0;
 	$totalarray['val']['cdet.total_tva'] = 0;
 	$totalarray['val']['cdet.total_ttc'] = 0;
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index ba40644c70c..5978fcc75b8 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -103,6 +103,8 @@ if (!empty($id)) {
 $sql .= " GROUP BY dm";
 
 $resql = $db->query($sql);
+$encaiss = array();
+$decaiss = array();
 if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
@@ -301,6 +303,7 @@ if ($result < 0) {
 
 	// CRED PART
 	// Chargement du tableau des années
+	$tblyear = array();
 	$tblyear[0] = array();
 	$tblyear[1] = array();
 	$tblyear[2] = array();
@@ -339,6 +342,7 @@ if ($result < 0) {
 	$data_year_0 = array();
 	$data_year_1 = array();
 	$data_year_2 = array();
+	$datamin = array();
 
 	for ($i = 0; $i < 12; $i++) {
 		$data_year_0[$i] = isset($tblyear[0][substr("0".($i + 1), -2)]) ? $tblyear[0][substr("0".($i + 1), -2)] : 0;
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index dd0b5d1cfe6..6ef7b315179 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -195,6 +195,7 @@ if ($result < 0) {
 		$xmonth = substr($textdate, 4, 2);
 
 		$i = 0;
+		$dataall = array();
 		while ($xmonth == $month) {
 			$subtotal = $subtotal + (isset($amounts[$textdate]) ? $amounts[$textdate] : 0);
 			if ($day > time()) {
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 36e525add58..551934ba258 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -66,6 +66,7 @@ $object->info($id);
 
 $h = 0;
 
+$head = array();
 $head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
 $head[$h][1] = $langs->trans("BankTransaction");
 $h++;
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 588ca81e0e8..4adeb8913d6 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -83,6 +83,8 @@ $sql .= " GROUP BY d.type";
 $sql .= " ORDER BY d.type";
 
 $result = $db->query($sql);
+$somme = array();
+$nb = array();
 if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
@@ -113,6 +115,7 @@ print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
 print "</tr>\n";
 
 $listoftype = $tripandexpense_static->listOfTypes();
+$dataseries = array();
 foreach ($listoftype as $code => $label) {
 	$dataseries[] = array($label, (isset($nb[$code]) ? (int) $nb[$code] : 0));
 }
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 66e452af868..66afe9fcb73 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2447,6 +2447,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
+				'@phan-var-force array<string,mixed> $lines';
 				// Add batchinfo if the detail_batch array is defined
 				if (isModEnabled('productbatch') && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && getDolGlobalString('INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS')) {
 					$langs->load('productbatch');
@@ -4452,6 +4453,7 @@ if ($action == 'create') {
 		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("Other"), $close[$i]['label'], 1);
 		$i++;
 		// arrayreasons[code]=reason
+		$arrayreasons = [];
 		foreach ($close as $key => $val) {
 			$arrayreasons[$close[$key]['code']] = $close[$key]['reason'];
 		}
@@ -4484,6 +4486,7 @@ if ($action == 'create') {
 			$close[1]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $object->ref), $close[1]['label'], 1);
 			$close[2]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"), $close[2]['label'], 1);
 			// arrayreasons
+			$arrayreasons = [];
 			$arrayreasons[$close[1]['code']] = $close[1]['reason'];
 			$arrayreasons[$close[2]['code']] = $close[2]['reason'];
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 2797c3203c9..e302bcc2ee1 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -215,6 +215,7 @@ if ($action == 'create') {
 // View mode
 if ($id) {
 	$h = 0;
+	$head = array();
 	$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Card');
 	$head[$h][2] = 'card';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 29cd19534e9..9af72aa1a1f 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -333,6 +333,7 @@ if ($action == 'new') {
 	}
 
 	$h = 0;
+	$head = array();
 	$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
 	$head[$h][1] = $langs->trans("CheckReceipt");
 	$hselected = $h;
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 55df11fe81b..9288421622e 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -100,6 +100,7 @@ $form = new Form($db);
 
 $h = 0;
 
+$head = array();
 $head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$id;
 $head[$h][1] = $langs->trans("PaymentSocialContribution");
 $hselected = $h;
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index b49e93ebed3..4d9d34abc75 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -129,6 +129,7 @@ $form = new Form($db);
 
 $h = 0;
 
+$head = array();
 $head[$h][0] = DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$id;
 $head[$h][1] = $langs->trans("VATPayment");
 $hselected = $h;
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 6bf465d1ea1..23eee162758 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -103,6 +103,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 // Delete draft
 if (($massaction == "delete" || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete) {
+	$TMsg = array();
 	$db->begin();
 	$objecttmp = new BonPrelevement($db);
 	foreach ($toselect as $toselectid) {
@@ -279,8 +280,8 @@ if ($type != '') {
 }
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 if ($usercancreate) {
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type='.urlencode($type));
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index ea5fe2d3ca9..0f2b503da99 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -638,6 +638,10 @@ $totalarray = array();
 $totalarray['nbfield'] = 0;
 $totalarray['val'] = array('totalttcfield' => 0);
 $imaxinloop = ($limit ? min($num, $limit) : $num);
+if (!isset($TLoadedUsers) || !is_array($TLoadedUsers)) {
+	// Ensure array is initialised
+	$TLoadedUsers = array();
+}
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 6a52f9ee62a..0d364c64625 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -209,7 +209,7 @@ $allparams = array_merge($commonparams, $headerparams, $tableparams);
 $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
-$paramslink="";
+$paramslink = "";
 foreach ($allparams as $key => $value) {
 	$paramslink .= '&'.$key.'='.$value;
 }
@@ -232,8 +232,8 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") {
 	$modecompta = "RECETTES-DEPENSES";
 }
 
-$exportlink="";
-$namelink="";
+$exportlink = "";
+$namelink = "";
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -360,6 +360,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 	dol_syslog("cabyprodserv", LOG_DEBUG);
 	$result = $db->query($sql);
+	$amount_ht = array();
+	$amount = array();
+	$qty = array();
 	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index eb69cefa804..38619a7eacf 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -166,7 +166,7 @@ $allparams = array_merge($commonparams, $headerparams, $tableparams);
 $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
-$paramslink="";
+$paramslink = "";
 foreach ($allparams as $key => $value) {
 	$paramslink .= '&'.$key.'='.$value;
 }
@@ -187,8 +187,8 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") {
 	$modecompta = "RECETTES-DEPENSES";
 }
 
-$exportlink="";
-$namelink="";
+$exportlink = "";
+$namelink = "";
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -288,6 +288,7 @@ $sql .= " GROUP BY u.rowid, u.lastname, u.firstname";
 $sql .= " ORDER BY u.rowid";
 
 $amount = array();
+$amount_ht = array();
 
 dol_syslog("cabyuser", LOG_DEBUG);
 $result = $db->query($sql);
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 6c1b1c3558a..b7d157302c1 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -197,7 +197,7 @@ $allparams = array_merge($commonparams, $headerparams, $tableparams);
 $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
-$paramslink="";
+$paramslink = "";
 foreach ($allparams as $key => $value) {
 	$paramslink .= '&'.$key.'='.$value;
 }
@@ -221,8 +221,8 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") {
 	$modecompta = "RECETTES-DEPENSES";
 }
 
-$exportlink="";
-$namelink="";
+$exportlink = "";
+$namelink = "";
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -354,6 +354,10 @@ $sql .= " ORDER BY s.rowid";
 //echo $sql;
 
 $amount = array();
+$amount_ht = array();
+$address_zip = array();
+$address_town = array();
+$address_pays = array();
 
 dol_syslog("casoc", LOG_DEBUG);
 $result = $db->query($sql);
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index e9568c4aa73..67c38c55d4b 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -263,6 +263,9 @@ if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 
 
 $name = array();
+$amount = array();
+$amount_ht = array();
+$qty = array();
 
 // SQL request
 $catotal = 0;
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 205f9000031..ef2f7fe3177 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -245,6 +245,9 @@ $catotal_ht = 0;
 $name = array();
 $amount = array();
 $amount_ht = array();
+$address_zip = array();
+$address_town = array();
+$address_pays = array();
 if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,";
 	$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";

From 38618b405c16eecbe848abfc30decdaac2b42f3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 9 Mar 2024 02:52:09 +0100
Subject: [PATCH 0597/1862] Clean code

---
 htdocs/mrp/class/mo.class.php | 45 ++++++-----------------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 29ada1293c7..4b91802fd5a 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -257,7 +257,7 @@ class Mo extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$this->db = $db;
 
@@ -484,8 +484,6 @@ class Mo extends CommonObject
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -1040,7 +1038,7 @@ class Mo extends CommonObject
 	 */
 	public function validate($user, $notrigger = 0)
 	{
-		global $conf, $langs;
+		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1372,7 +1370,7 @@ class Mo extends CommonObject
 	 */
 	public function getTooltipContentArray($params)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$langs->loadLangs(['mrp', 'products']);
 		$nofetch = isset($params['nofetch']) ? true : false;
@@ -1640,7 +1638,7 @@ class Mo extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$langs->load("mrp");
 
@@ -1664,36 +1662,6 @@ class Mo extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 	}
 
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-
 	/**
 	 * 	Return HTML table table of source object lines
 	 *  TODO Move this and previous function into output html class file (htmlline.class.php).
@@ -1706,7 +1674,7 @@ class Mo extends CommonObject
 	 */
 	public function printOriginLinesList($restrictlist = '', $selectedLines = array())
 	{
-		global $langs, $hookmanager, $conf, $form, $action;
+		global $langs, $hookmanager, $form, $action;
 
 		$langs->load('stocks');
 		$text_stock_options = $langs->trans("RealStockDesc").'<br>';
@@ -1998,6 +1966,7 @@ class Mo extends CommonObject
 	}
 }
 
+
 /**
  * Class MoLine. You can also remove this and generate a CRUD class for lines objects.
  */
@@ -2081,7 +2050,7 @@ class MoLine extends CommonObjectLine
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$this->db = $db;
 

From 302ea702e68fc7c5f7196f1ef5261f81c70a4e8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 9 Mar 2024 02:55:25 +0100
Subject: [PATCH 0598/1862] Add v19 in stats

---
 dev/tools/github_commits_byversion.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tools/github_commits_byversion.sh b/dev/tools/github_commits_byversion.sh
index bd3405376cf..eafca6b2e01 100755
--- a/dev/tools/github_commits_byversion.sh
+++ b/dev/tools/github_commits_byversion.sh
@@ -4,7 +4,7 @@
 #
 # shellcheck disable=1113,2002,2006,2086,2164,2219
 
-Releases=("3.9" "4.0" "5.0" "6.0" "7.0" "8.0" "9.0" "10.0" "11.0" "12.0" "13.0" "14.0" "15.0" "16.0" "17.0" "18.0" "develop")
+Releases=("3.9" "4.0" "5.0" "6.0" "7.0" "8.0" "9.0" "10.0" "11.0" "12.0" "13.0" "14.0" "15.0" "16.0" "17.0" "18.0" "19.0" "develop")
 let "counter = 0"
 
 echo "Copy script into /tmp/github_commits_byversion.sh"
@@ -49,4 +49,3 @@ do
 	echo
 	let "counter +=1"
 done
-

From e00a9816f81fb4b7c37e51a34e9f5379cb81e577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 9 Mar 2024 14:48:06 +0100
Subject: [PATCH 0599/1862] fix phpstan (#28727)

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
---
 htdocs/core/class/html.formcategory.class.php      |  3 ++-
 htdocs/core/lib/price.lib.php                      | 14 +++++---------
 htdocs/core/lib/website.lib.php                    | 13 +++----------
 .../barcode/mod_barcode_product_standard.php       |  4 ++--
 .../barcode/mod_barcode_thirdparty_standard.php    |  4 ++--
 htdocs/loan/class/loanschedule.class.php           |  8 ++++----
 htdocs/projet/class/task.class.php                 |  4 ++--
 htdocs/public/webportal/css/global.css             |  4 ++--
 .../class/html.formlistwebportal.class.php         |  5 +++--
 9 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 34a1961bc84..193967845ab 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2020		Tobias Sekan	<tobias.sekan@startmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,7 +82,7 @@ class FormCategory extends Form
 			$filter .= $langs->trans('UseOrOperatorShort');
 			$filter .= '</label>';
 
-			$filter .= '<script>'."\n";;
+			$filter .= '<script>'."\n";
 			$filter .= "var nbSelected = jQuery('#".$htmlName."').val().length;";
 			$filter .= "console.log('Nb of element now = '+nbSelected);\n";
 			$filter .= "if (nbSelected > 1) { jQuery('.".$htmlName2."').show(); } else { jQuery('.".$htmlName2."').hide(); }\n";
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 12b22ed33a4..0d448eb4142 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +47,7 @@
  *		@param	string	$price_base_type 			'HT'=Unit price parameter $pu is HT, 'TTC'=Unit price parameter $pu is TTC (HT+VAT but not Localtax. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
  *		@param	int		$info_bits					Miscellaneous information on line
  *		@param	int		$type						0/1=Product/service
- *		@param  Societe	$seller						Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
+ *		@param  Societe|string $seller				Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
  *		@param  array	$localtaxes_array			Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
  *		@param  integer	$progress                   Situation invoices progress (value from 0 to 100, 100 by default)
  *		@param  double	$multicurrency_tx           Currency rate (1 by default)
@@ -83,7 +84,7 @@
  * 						25=multicurrency_total_tax1 for total_ht
  *                      26=multicurrency_total_tax2 for total_ht
  */
-function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array = '', $progress = 100, $multicurrency_tx = 1, $pu_devise = 0, $multicurrency_code = '')
+function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array = [], $progress = 100, $multicurrency_tx = 1, $pu_devise = 0, $multicurrency_code = '')
 {
 	global $conf, $mysoc, $db;
 
@@ -114,7 +115,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		dol_syslog("Price.lib::calcul_price_total Warning: function was called with a bad value for vat rate (should be often < 100, always < 1000). There is surely a bug.", LOG_ERR);
 	}
 	// Too verbose. Enable for debug only
-	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
+	// dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
 
 	$countryid = $seller->country_id;
 
@@ -439,12 +440,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[25] = $result[9];
 		$result[26] = $result[10];
 	}
-
-	//var_dump($result);
-	// initialize result array
-	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
-
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(!getDolGlobalString('MAIN_ROUNDING_RULE_TOT') ? '' : $conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.getDolGlobalString('MAIN_ROUNDING_RULE_TOT').' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
 	return $result;
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 271667675cd..d90df0b530e 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1101,7 +1102,7 @@ function getImagePublicURLOfObject($object, $no = 1, $extName = '')
  * @param	int			$status				0 or 1, or -1 for both
  * @return  array							Array with results of search
  */
-function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = 'null', $status = 1)
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = [], $status = 1)
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 
@@ -1261,7 +1262,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
  * @param 	string		$urltograb		URL to grab (example: http://www.nltechno.com/ or http://www.nltechno.com/dir1/ or http://www.nltechno.com/dir1/mapage1)
  * @param 	string		$tmp			Content to parse
  * @param 	string		$action			Var $action
- * @param	string		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
+ * @param	int 		$modifylinks	0=Do not modify content, 1=Replace links with a link to viewimage
  * @param	int			$grabimages		0=Do not grab images, 1=Grab images
  * @param	string		$grabimagesinto	'root' or 'subpage'
  * @return	void
@@ -1316,10 +1317,6 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
 		$filename = preg_replace('/\/[^\/]+\/\.\./', '', $filename);
 
-		//var_dump($filetosave);
-		//var_dump($filename);
-		//exit;
-
 		if (empty($alreadygrabbed[$urltograbbis])) {
 			if ($grabimages) {
 				$tmpgeturl = getURLContent($urltograbbis, 'GET', '', 1, array(), array('http', 'https'), 0);
@@ -1385,10 +1382,6 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		$filetosave = preg_replace('/\/[^\/]+\/\.\./', '', $filetosave);
 		$filename = preg_replace('/\/[^\/]+\/\.\./', '', $filename);
 
-		//var_dump($filetosave);
-		//var_dump($filename);
-		//exit;
-
 		if (empty($alreadygrabbed[$urltograbbis])) {
 			if ($grabimages) {
 				$tmpgeturl = getURLContent($urltograbbis, 'GET', '', 1, array(), array('http', 'https'), 0);
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index ceaf9cc1169..c2df3f7c3a0 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -131,14 +131,14 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
 	 *  @return string
 	 */
-	public function literalBarcodeType($db, $type = '')
+	public function literalBarcodeType($db, $type = 0)
 	{
 		global $conf;
 		$out = '';
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-		$sql .= " WHERE rowid = '".$db->escape($type)."'";
+		$sql .= " WHERE rowid = ".(int) $type;
 		$sql .= " AND entity = ".((int) $conf->entity);
 		$result = $db->query($sql);
 		if ($result) {
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index 10e33d763f1..118e87cbc3a 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -143,14 +143,14 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	 *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
 	 *  @return string
 	 */
-	public function literalBarcodeType($db, $type = '')
+	public function literalBarcodeType($db, $type = 0)
 	{
 		global $conf;
 		$out = '';
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-		$sql .= " WHERE rowid = '".$db->escape($type)."'";
+		$sql .= " WHERE rowid = ". (int) $type;
 		$sql .= " AND entity = ".((int) $conf->entity);
 		$result = $db->query($sql);
 		if ($result) {
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index da102386706..e6caeeb9de2 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -289,11 +289,11 @@ class LoanSchedule extends CommonObject
 	/**
 	 *  Update database
 	 *
-	 *  @param	User	$user        	User that modify
-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			Return integer <0 if KO, >0 if OK
+	 *  @param	User|null	$user        	User that modify
+	 *  @param  int			$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int         				Return integer <0 if KO, >0 if OK
 	 */
-	public function update($user = 0, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index df339ae9004..a8217136ff6 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1190,7 +1190,7 @@ class Task extends CommonObjectLine
 	 *
 	 * @param	User|null	$userp			      Return roles on project for this internal user. If set, usert and taskid must not be defined.
 	 * @param	User|null	$usert			      Return roles on task for this internal user. If set userp must NOT be defined. -1 means no filter.
-	 * @param 	int			$projectid		      Project id list separated with , to filter on project
+	 * @param 	string		$projectid		      Project id list separated with , to filter on project
 	 * @param 	int			$taskid			      Task id to filter on a task
 	 * @param	integer		$filteronprojstatus	  Filter on project status if userp is set. Not used if userp not defined.
 	 * @return 	array|int					      Array (projectid => 'list of roles for project' or taskid => 'list of roles for task')
@@ -1595,7 +1595,7 @@ class Task extends CommonObjectLine
 	/**
 	 *  Calculate quantity and value of time consumed using the thm (hourly amount value of work for user entering time)
 	 *
-	 *	@param		User		$fuser		Filter on a dedicated user
+	 *	@param		User|string	$fuser		Filter on a dedicated user
 	 *  @param		string		$dates		Start date (ex 00:00:00)
 	 *  @param		string		$datee		End date (ex 23:59:59)
 	 *  @return 	array	        		Array of info for task array('amount','nbseconds','nblinesnull')
diff --git a/htdocs/public/webportal/css/global.css b/htdocs/public/webportal/css/global.css
index dfecfe391b4..3053047f4e6 100644
--- a/htdocs/public/webportal/css/global.css
+++ b/htdocs/public/webportal/css/global.css
@@ -47,7 +47,7 @@ body > nav {
 .spacer{
   --spacer-margin: calc(var(--font-size) * 2);
   margin-top: var(--spacer-margin);
-  margin-bottom: var(--spacer-margin);;
+  margin-bottom: var(--spacer-margin);
 }
 
 html{
@@ -142,4 +142,4 @@ Home Styles
  */
 .home-links-card{
 
-}
\ No newline at end of file
+}
diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php
index 7bdd0bc4311..4b4fd15bfb0 100644
--- a/htdocs/webportal/class/html.formlistwebportal.class.php
+++ b/htdocs/webportal/class/html.formlistwebportal.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
  * Copyright (C) 2023-2024	Patrice Andreani		<pandreani@easya.solutions>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -539,14 +540,14 @@ class FormListWebPortal
 		// Remain to pay
 		if (!empty($arrayfields['remain_to_pay']['checked'])) {
 			$html .= '<th scope="col">';
-			$html .= $langs->trans($arrayfields['remain_to_pay']['label']);;
+			$html .= $langs->trans($arrayfields['remain_to_pay']['label']);
 			$html .= '</th>';
 			$totalarray['nbfield']++;
 		}
 		// Download link
 		if (!empty($arrayfields['download_link']['checked'])) {
 			$html .= '<th scope="col">';
-			$html .= $langs->trans($arrayfields['download_link']['label']);;
+			$html .= $langs->trans($arrayfields['download_link']['label']);
 			$html .= '</th>';
 			$totalarray['nbfield']++;
 		}

From 6ac626c75b4e27ed404921f5f548aea32a2028fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Mar 2024 15:03:40 +0100
Subject: [PATCH 0600/1862] Add test on perm and force cast

---
 htdocs/product/class/product.class.php | 11 +++++----
 htdocs/product/fournisseurs.php        | 32 +++++++++++++-------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9208d0a6b71..5d3f74fe800 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4683,6 +4683,7 @@ class Product extends CommonObject
 		$quantity = price2num($quantity, 'MS');
 
 		if ($ref_fourn) {
+			// Check if ref is not already used
 			$sql = "SELECT rowid, fk_product";
 			$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price";
 			$sql .= " WHERE fk_soc = ".((int) $id_fourn);
@@ -4731,12 +4732,12 @@ class Product extends CommonObject
 				$sql .= ", tva_tx";
 				$sql .= ") VALUES (";
 				$sql .= "'".$this->db->idate($now)."'";
-				$sql .= ", ".$conf->entity;
-				$sql .= ", ".$this->id;
-				$sql .= ", ".$id_fourn;
+				$sql .= ", ".((int) $conf->entity);
+				$sql .= ", ".((int) $this->id);
+				$sql .= ", ".((int) $id_fourn);
 				$sql .= ", '".$this->db->escape($ref_fourn)."'";
-				$sql .= ", ".$quantity;
-				$sql .= ", ".$user->id;
+				$sql .= ", ".((float) $quantity);
+				$sql .= ", ".((int) $user->id);
 				$sql .= ", 0";
 				$sql .= ")";
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5476a6f5b7f..f9fcdab2709 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -138,7 +138,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($action == 'setcost_price') {
+	if ($action == 'setcost_price' && $usercancreate) {
 		if ($id) {
 			$result = $object->fetch($id);
 			//Need dol_clone methode 1 (same object class) because update product use hasbatch method on oldcopy
@@ -154,7 +154,7 @@ if (empty($reshook)) {
 			}
 		}
 	}
-	if ($action == 'setpmp') {
+	if ($action == 'setpmp' && $usercancreate) {
 		if ($id) {
 			$result = $object->fetch($id);
 			$object->pmp = $pmp;
@@ -171,7 +171,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'confirm_remove_pf') {
+	if ($action == 'confirm_remove_pf' && $usercancreate) {
 		if ($rowid) {	// id of product supplier price to remove
 			$action = '';
 			$result = $object->remove_product_fournisseur_price($rowid);
@@ -185,7 +185,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'save_price') {
+	if ($action == 'save_price' && $usercancreate) {
 		$id_fourn = GETPOST("id_fourn");
 		if (empty($id_fourn)) {
 			$id_fourn = GETPOST("search_id_fourn");
@@ -471,7 +471,7 @@ if ($id > 0 || $ref) {
 
 
 			// Form to add or update a price
-			if (($action == 'create_price' || $action == 'update_price') && $usercancreate) {
+			if (($action == 'create_price' || $action == 'edit_price') && $usercancreate) {
 				$langs->load("suppliers");
 
 				print "<!-- form to add a supplier price -->\n";
@@ -722,8 +722,8 @@ if ($id > 0 || $ref) {
 					$currencies = json_encode($currencies);
 					print "<!-- javascript to autocalculate the minimum price -->
 					<script type='text/javascript'>
-						function update_price_from_multicurrency() {
-							console.log('update_price_from_multicurrency');
+						function edit_price_from_multicurrency() {
+							console.log('edit_price_from_multicurrency');
 							var multicurrency_price = price2numjs($('input[name=\"multicurrency_price\"]').val());
 							var multicurrency_tx = price2numjs($('input[name=\"multicurrency_tx\"]').val());
 							if (multicurrency_tx != 0) {
@@ -738,16 +738,16 @@ if ($id > 0 || $ref) {
 						jQuery(document).ready(function () {
 							$('input[name=\"disabled_price\"]').prop('disabled', true);
 							$('select[name=\"disabled_price_base_type\"]').prop('disabled', true);
-							update_price_from_multicurrency();
+							edit_price_from_multicurrency();
 
 							$('input[name=\"multicurrency_price\"], input[name=\"multicurrency_tx\"]').keyup(function () {
-								update_price_from_multicurrency();
+								edit_price_from_multicurrency();
 							});
 							$('input[name=\"multicurrency_price\"], input[name=\"multicurrency_tx\"]').change(function () {
-								update_price_from_multicurrency();
+								edit_price_from_multicurrency();
 							});
 							$('input[name=\"multicurrency_price\"], input[name=\"multicurrency_tx\"]').on('paste', function () {
-								update_price_from_multicurrency();
+								edit_price_from_multicurrency();
 							});
 
 							$('select[name=\"multicurrency_price_base_type\"]').change(function () {
@@ -759,7 +759,7 @@ if ($id > 0 || $ref) {
 							$('select[name=\"multicurrency_code\"]').change(function () {
 								console.log(\"We change the currency\");
 								$('input[name=\"multicurrency_tx\"]').val(currencies_array[$(this).val()]);
-								update_price_from_multicurrency();
+								edit_price_from_multicurrency();
 							});
 						});
 					</script>";
@@ -835,7 +835,7 @@ if ($id > 0 || $ref) {
 				if (!empty($extralabels)) {
 					if (empty($rowid)) {
 						foreach ($extralabels as $key => $value) {
-							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "edit_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
 								if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
 									$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
 								}
@@ -861,7 +861,7 @@ if ($id > 0 || $ref) {
 						if ($resql) {
 							$obj = $db->fetch_object($resql);
 							foreach ($extralabels as $key => $value) {
-								if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "edit_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
 									if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
 										$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
 									}
@@ -906,7 +906,7 @@ if ($id > 0 || $ref) {
 
 			print '<div class="tabsAction">'."\n";
 
-			if ($action != 'create_price' && $action != 'update_price') {
+			if ($action != 'create_price' && $action != 'edit_price') {
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if (empty($reshook)) {
@@ -1291,7 +1291,7 @@ if ($id > 0 || $ref) {
 						print '<td class="center nowraponall">';
 
 						if ($usercancreate) {
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.((int) $object->id).'&socid='.((int) $productfourn->fourn_id).'&action=update_price&token='.newToken().'&rowid='.((int) $productfourn->product_fourn_price_id).'">'.img_edit()."</a>";
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.((int) $object->id).'&socid='.((int) $productfourn->fourn_id).'&action=edit_price&token='.newToken().'&rowid='.((int) $productfourn->product_fourn_price_id).'">'.img_edit()."</a>";
 							print ' &nbsp; ';
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.((int) $object->id).'&socid='.((int) $productfourn->fourn_id).'&action=ask_remove_pf&token='.newToken().'&rowid='.((int) $productfourn->product_fourn_price_id).'">'.img_picto($langs->trans("Remove"), 'delete').'</a>';
 						}

From b601dabf6604e16561bcf102d18f32c4927dbf85 Mon Sep 17 00:00:00 2001
From: le-reparateur <162715304+le-reparateur@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:14:23 +0100
Subject: [PATCH 0601/1862] Update fournisseur.product.class.php (#28729)

* Update fournisseur.product.class.php

#28710

* Update fournisseur.product.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/fourn/class/fournisseur.product.class.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index fd9e0245ad8..cd512972033 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -327,10 +327,10 @@ class ProductFournisseur extends Product
 			$fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $multicurrency_code);
 		}
 
-		$buyprice = price2num($buyprice, 'MU');
-		$charges = price2num($charges, 'MU');
-		$qty = price2num($qty, 'MS');
-		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
+		$buyprice = (float) price2num($buyprice, 'MU');
+		$charges = (float) price2num($charges, 'MU');
+		$qty = (float) price2num($qty, 'MS');
+		$unitBuyPrice = (float) price2num($buyprice / $qty, 'MU');
 
 		// We can have a puchase ref that need to buy 100 min for a given price and with a packaging of 50.
 		//$packaging = price2num(((empty($this->packaging) || $this->packaging < $qty) ? $qty : $this->packaging), 'MS');
@@ -359,10 +359,6 @@ class ProductFournisseur extends Product
 			$localtax2 = 0; // If = '' then = 0
 		}
 
-		// Check parameters
-		if ($buyprice != '' && !is_numeric($buyprice)) {
-		}
-
 		$this->db->begin();
 
 		if ($this->product_fourn_price_id > 0) {
@@ -391,6 +387,7 @@ class ProductFournisseur extends Product
 			}
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 			$sql .= " SET fk_user = ".((int) $user->id)." ,";
+			$sql .= " datec = '".$this->db->idate($now)."' ,";	// Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log.
 			$sql .= " ref_fourn = '".$this->db->escape($ref_fourn)."',";
 			$sql .= " desc_fourn = '".$this->db->escape($desc_fourn)."',";
 			$sql .= " price = ".((float) $buyprice).",";

From 0b19aa415c150f96d45ac90cc74970c8d48740ad Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 16:32:02 +0100
Subject: [PATCH 0602/1862] Fix: Initialise array before assigning values
 (#28728)

* Qual: Enable PhanUndeclaredVariableDim

# Qual: Enable PhanUndeclaredVariableDim

The notifications are fixed in the code so the detection no longer
needs to be suppressed in the default flow

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Fix: initialise array before adding fields

* Qual: Add type hint to array to avoid phan notification

* Qual: Add type hint to array to avoid phan notification

* Qual: Enable PhanParamSpecial1 (all resolved)

* Qual: Ignore false PhanTypeArraySuspiciousNullable

* Qual: Improve typing to fix PhanTypeArraySuspicious

* Qual: Fix PhanTypeArraySuspicious by replacing null assignment with empty array

* Qual: Fix PhanTypeArraySuspicious by testing as instancof DebugBar

* Qual: Fix PhanTypeComparisonToArray with enhanced typing

* Qual: Fix PhanTypeComparisonToArray with enhanced typing

* Qual: Enable phan messages that no longer appear

* Qual: Exclude phan stubs from codesniffer ruleset
---
 dev/setup/codesniffer/ruleset.xml             |   1 +
 dev/tools/phan/config.php                     |  14 +-
 htdocs/comm/action/class/actioncomm.class.php |  54 +++----
 htdocs/compta/bank/graph.php                  |   2 +-
 htdocs/contact/consumption.php                |   7 +-
 htdocs/contact/list.php                       |  55 +++----
 htdocs/contrat/list.php                       |  61 ++++----
 htdocs/contrat/services_list.php              |  57 +++----
 htdocs/core/ajax/ajaxdirpreview.php           |  23 +--
 htdocs/core/ajax/locationincoterms.php        |   1 +
 htdocs/core/ajax/selectsearchbox.php          |  79 +++++-----
 htdocs/core/ajax/ziptown.php                  |   1 +
 htdocs/core/boxes/box_members_by_tags.php     |   5 +-
 htdocs/core/boxes/box_members_by_type.php     |   5 +-
 htdocs/core/class/html.formadmin.class.php    |  52 +++----
 htdocs/core/class/openid.class.php            |   3 +-
 htdocs/core/class/smtps.class.php             |   3 +-
 htdocs/core/db/pgsql.class.php                |   6 +-
 htdocs/core/db/sqlite3.class.php              |   6 +-
 htdocs/core/lib/functions.lib.php             |   2 +-
 htdocs/core/lib/functions_ch.lib.php          |   3 +-
 htdocs/core/lib/ldap.lib.php                  |   2 +
 .../commande/doc/pdf_eratosthene.modules.php  |   2 +
 .../delivery/doc/pdf_storm.modules.php        |  11 +-
 .../modules/dons/html_cerfafr.modules.php     |   5 +-
 .../facture/doc/pdf_sponge.modules.php        |   1 +
 .../modules/import/import_csv.modules.php     |   1 +
 .../modules/import/import_xlsx.modules.php    |   2 +
 .../modules/member/doc/pdf_standard.class.php |  15 +-
 .../product/doc/pdf_standard.modules.php      |   1 +
 .../modules/propale/doc/pdf_azur.modules.php  |   1 +
 .../modules/propale/doc/pdf_cyan.modules.php  |   1 +
 .../doc/pdf_eagle_proforma.modules.php        |   1 +
 htdocs/core/tpl/card_presend.tpl.php          |   9 +-
 .../tpl/extrafields_list_array_fields.tpl.php |   5 +
 htdocs/core/tpl/filemanager.tpl.php           |  15 +-
 htdocs/core/tpl/list_print_subtotal.tpl.php   |   2 +
 htdocs/core/tpl/list_print_total.tpl.php      |   8 +-
 htdocs/don/index.php                          |   8 +-
 .../conferenceorbooth_list.php                |   1 +
 htdocs/expensereport/index.php                |   1 +
 htdocs/fichinter/index.php                    |   3 +-
 htdocs/fichinter/list.php                     |   1 +
 htdocs/fourn/commande/index.php               |   1 +
 htdocs/fourn/facture/card.php                 |   1 +
 htdocs/fourn/facture/paiement.php             |   1 +
 htdocs/holiday/card_group.php                 |  14 +-
 htdocs/holiday/class/holiday.class.php        |  13 +-
 htdocs/holiday/define_holiday.php             |  10 +-
 htdocs/holiday/view_log.php                   |   1 +
 htdocs/hrm/skill_tab.php                      |  23 +--
 htdocs/install/step5.php                      |   5 +
 htdocs/opensurvey/list.php                    |  25 ++--
 htdocs/product/admin/product.php              |  17 ++-
 htdocs/product/admin/product_lot.php          |   1 +
 htdocs/product/class/product.class.php        |   3 +-
 htdocs/product/index.php                      |   6 +-
 .../inventory/class/inventory.class.php       |  63 ++++----
 htdocs/product/list.php                       | 141 +++++++++---------
 htdocs/product/stock/movement_card.php        |  38 ++---
 htdocs/product/stock/movement_list.php        |   4 +
 .../class/stocktransferline.class.php         |   1 +
 htdocs/projet/admin/project.php               |  23 +--
 htdocs/projet/class/project.class.php         | 101 ++++++-------
 htdocs/public/members/new.php                 |  13 +-
 htdocs/recruitment/admin/setup.php            |   8 +-
 .../recruitment/admin/setup_candidatures.php  |   3 +-
 htdocs/salaries/ajax/ajaxsalaries.php         |   5 +-
 htdocs/societe/admin/societe.php              |  19 ++-
 htdocs/societe/ajax/ajaxcompanies.php         |   5 +-
 htdocs/societe/checkvat/checkVatGr.php        |   1 +
 htdocs/societe/consumption.php                |   3 +-
 htdocs/societe/paymentmodes.php               |   3 +
 htdocs/user/card.php                          |   1 +
 htdocs/webportal/admin/setup.php              |   3 +-
 .../class/html.formlistwebportal.class.php    |   6 +-
 htdocs/webservices/server_contact.php         | 119 +++++++--------
 htdocs/workstation/workstation_list.php       |  46 +++---
 78 files changed, 693 insertions(+), 570 deletions(-)

diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index ce59db18665..50b107f5fcc 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -9,6 +9,7 @@
 	<!-- info: 'relative' paths are relative to the examined file, so not ok. -->
 	<exclude-pattern>/build/(html|aps)/</exclude-pattern>
 	<exclude-pattern>/dev/tools/test/namespacemig/</exclude-pattern>
+	<exclude-pattern>/dev/tools/phan/stubs/</exclude-pattern>
 	<!-- <exclude-pattern>dev/initdata/dbf/includes</exclude-pattern> -->
 	<exclude-pattern>/documents/</exclude-pattern>
 	<exclude-pattern>/htdocs/core/class/lessc\.class\.php</exclude-pattern>
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 178a021e00c..2defcc784e7 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -331,7 +331,7 @@ return [
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
 		'PhanDeprecatedFunction',
-		'PhanCompatibleNegativeStringOffset',
+		//'PhanCompatibleNegativeStringOffset',
 		// Dolibarr has quite a few strange noop assignments like $abc=$abc;
 		'PhanPluginDuplicateExpressionAssignment',
 		// Nulls are likely mostly false positives
@@ -379,7 +379,7 @@ return [
 		'PhanPluginUnknownClosureParamType',
 		'PhanPluginUnknownClosureReturnType',
 		// 'PhanPluginNoCommentOnProtectedMethod',
-		'PhanTypeArraySuspicious',
+		// 'PhanTypeArraySuspicious',
 		'PhanTypeMismatchPropertyProbablyReal',
 		// 'PhanPluginNoCommentOnPrivateMethod',
 		'PhanPluginUnknownArrayFunctionReturnType',
@@ -401,7 +401,7 @@ return [
 		'PhanTypeMismatchDeclaredParamNullable',
 		'PhanTypeInvalidRightOperandOfAdd',
 		// 'PhanPluginDescriptionlessCommentOnPrivateProperty',
-		'PhanUndeclaredVariableDim',  // Array initialisation on undeclared var: $abc['x']='ab'
+		// 'PhanUndeclaredVariableDim',  // Array initialisation on undeclared var: $abc['x']='ab'
 		'PhanTypeInvalidPropertyName',
 		'PhanPluginDuplicateCatchStatementBody',
 		'PhanPluginUndeclaredVariableIsset',
@@ -439,11 +439,11 @@ return [
 		'PhanPluginBothLiteralsBinaryOp',
 		// 'PhanTypeMismatchDeclaredParam',
 		// 'PhanCommentDuplicateMagicMethod',
-		'PhanParamSpecial1',
+		// 'PhanParamSpecial1',
 		'PhanPluginInlineHTMLLeading',
 		'PhanPluginUseReturnValueInternalKnown',
-		'PhanRedefinedInheritedInterface',
-		'PhanTypeComparisonToArray',
+		//'PhanRedefinedInheritedInterface',
+		//'PhanTypeComparisonToArray',
 		'PhanTypeConversionFromArray',
 		// 'PhanTypeInvalidLeftOperandOfIntegerOp',
 		'PhanTypeMismatchArgumentInternalProbablyReal',
@@ -458,7 +458,7 @@ return [
 		// 'PhanTypeInvalidThrowsIsInterface',
 		'PhanPluginRedundantAssignmentInLoop',
 		// 'PhanInvalidCommentForDeclarationType',
-		'PhanParamSignatureMismatchInternal',
+		//'PhanParamSignatureMismatchInternal',
 		// 'PhanPluginEmptyStatementForeachLoop',
 		// 'PhanCompatibleDimAlternativeSyntax',
 		'PhanInvalidFQSENInClasslike',
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index a716a92d884..a73b24e9d28 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -230,7 +230,7 @@ class ActionComm extends CommonObject
 	public $priority;
 
 	/**
-	 * @var int[] 	Array of user ids
+	 * @var array<int,array{id:int,transparency:int}> 	Array of users
 	 */
 	public $userassigned = array();
 
@@ -488,7 +488,7 @@ class ActionComm extends CommonObject
 		if (!is_array($this->userassigned) && !empty($this->userassigned)) {	// For backward compatibility when userassigned was an int instead of an array
 			$tmpid = (int) $this->userassigned;
 			$this->userassigned = array();
-			$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
+			$this->userassigned[$tmpid] = array('id' => $tmpid, 'transparency' => $this->transparency);
 		}
 
 		$userownerid = $this->userownerid;
@@ -496,7 +496,7 @@ class ActionComm extends CommonObject
 
 		// Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
 		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned)) {
-			$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
+			$this->userassigned = array($userownerid => array('id' => $userownerid, 'transparency' => $this->transparency));
 		}
 
 		if (!$this->type_id || !$this->type_code) {
@@ -630,7 +630,7 @@ class ActionComm extends CommonObject
 				foreach ($this->userassigned as $key => $val) {
 					// Common value with new behavior is to have $val = array('id'=>iduser, 'transparency'=>0|1) and $this->userassigned is an array of iduser => $val.
 					if (!is_array($val)) {	// For backward compatibility when $val='id'.
-						$val = array('id'=>$val);
+						$val = array('id' => $val);
 					}
 
 					if ($val['id'] > 0) {
@@ -749,7 +749,7 @@ class ActionComm extends CommonObject
 		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$objFrom);
+				$parameters = array('objFrom' => $objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -904,14 +904,14 @@ class ActionComm extends CommonObject
 				$this->status = $obj->status;
 
 				//email information
-				$this->email_msgid=$obj->email_msgid;
-				$this->email_from=$obj->email_from;
-				$this->email_sender=$obj->email_sender;
-				$this->email_to=$obj->email_to;
-				$this->email_tocc=$obj->email_tocc;
-				$this->email_tobcc=$obj->email_tobcc;
-				$this->email_subject=$obj->email_subject;
-				$this->errors_to=$obj->errors_to;
+				$this->email_msgid = $obj->email_msgid;
+				$this->email_from = $obj->email_from;
+				$this->email_sender = $obj->email_sender;
+				$this->email_to = $obj->email_to;
+				$this->email_tocc = $obj->email_tocc;
+				$this->email_tobcc = $obj->email_tobcc;
+				$this->email_subject = $obj->email_subject;
+				$this->errors_to = $obj->errors_to;
 
 				$this->fetch_optionals();
 
@@ -947,20 +947,20 @@ class ActionComm extends CommonObject
 		if ($resql) {
 			// If owner is known, we must but id first into list
 			if ($this->userownerid > 0) {
-				$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid); // Set first so will be first into list.
+				$this->userassigned[$this->userownerid] = array('id' => $this->userownerid); // Set first so will be first into list.
 			}
 
 			while ($obj = $this->db->fetch_object($resql)) {
 				if ($obj->fk_element > 0) {
 					switch ($obj->element_type) {
 						case 'user':
-							$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
+							$this->userassigned[$obj->fk_element] = array('id' => $obj->fk_element, 'mandatory' => $obj->mandatory, 'answer_status' => $obj->answer_status, 'transparency' => $obj->transparency);
 							if (empty($this->userownerid)) {
 								$this->userownerid = $obj->fk_element; // If not defined (should not happened, we fix this)
 							}
 							break;
 						case 'socpeople':
-							$this->socpeopleassigned[$obj->fk_element] = array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
+							$this->socpeopleassigned[$obj->fk_element] = array('id' => $obj->fk_element, 'mandatory' => $obj->mandatory, 'answer_status' => $obj->answer_status, 'transparency' => $obj->transparency);
 							break;
 					}
 				}
@@ -994,15 +994,15 @@ class ActionComm extends CommonObject
 			// If owner is known, we must but id first into list
 			if ($this->userownerid > 0) {
 				// Set first so will be first into list.
-				$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid);
+				$this->userassigned[$this->userownerid] = array('id' => $this->userownerid);
 			}
 
 			while ($obj = $this->db->fetch_object($resql2)) {
 				if ($obj->fk_element > 0) {
-					$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element,
-																  'mandatory'=>$obj->mandatory,
-																  'answer_status'=>$obj->answer_status,
-																  'transparency'=>$obj->transparency);
+					$this->userassigned[$obj->fk_element] = array('id' => $obj->fk_element,
+																  'mandatory' => $obj->mandatory,
+																  'answer_status' => $obj->answer_status,
+																  'transparency' => $obj->transparency);
 				}
 
 				if ($override === true) {
@@ -1245,7 +1245,7 @@ class ActionComm extends CommonObject
 				$already_inserted = array();
 				foreach ($this->userassigned as $key => $val) {
 					if (!is_array($val)) {	// For backward compatibility when val=id
-						$val = array('id'=>$val);
+						$val = array('id' => $val);
 					}
 					if (!empty($already_inserted[$val['id']])) {
 						continue;
@@ -1273,7 +1273,7 @@ class ActionComm extends CommonObject
 					$already_inserted = array();
 					foreach (array_keys($this->socpeopleassigned) as $key => $val) {
 						if (!is_array($val)) {	// For backward compatibility when val=id
-							$val = array('id'=>$val);
+							$val = array('id' => $val);
 						}
 						if (!empty($already_inserted[$val['id']])) {
 							continue;
@@ -1351,7 +1351,7 @@ class ActionComm extends CommonObject
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
 		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
-			$sql.= $hookmanager->resPrint;
+			$sql .= $hookmanager->resPrint;
 		}
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if (!empty($socid)) {
@@ -1375,7 +1375,7 @@ class ActionComm extends CommonObject
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
 		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
-			$sql.= $hookmanager->resPrint;
+			$sql .= $hookmanager->resPrint;
 		}
 		if ($sortorder && $sortfield) {
 			$sql .= $this->db->order($sortfield, $sortorder);
@@ -1847,7 +1847,7 @@ class ActionComm extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('actiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -2442,7 +2442,7 @@ class ActionComm extends CommonObject
 		$this->note_private = "This is a 'private' note.";
 
 		$this->userownerid = $user->id;
-		$this->userassigned[$user->id] = array('id'=>$user->id, 'transparency'=> 1);
+		$this->userassigned[$user->id] = array('id' => $user->id, 'transparency' => 1);
 		return 1;
 	}
 
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 6ef7b315179..8d2b44c40af 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -266,7 +266,7 @@ if ($result < 0) {
 		$px1 = null;
 		$graph_datas = null;
 		$datas = null;
-		$datamin = null;
+		$datamin = array();
 		$dataall = null;
 		$labels = null;
 		$amounts = null;
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index fb761a5b541..67714ae131e 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -96,7 +96,7 @@ $result = restrictedArea($user, 'contact', $object->id, 'socpeople&societe');
  * Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -153,6 +153,9 @@ print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
 print $object->getCivilityLabel();
 print '</td></tr>';
 
+$thirdTypeArray = array();
+$elementTypeArray = array();
+
 if (!empty($object->thirdparty->client)) {
 	$thirdTypeArray['customer'] = $langs->trans("customer");
 	if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
@@ -370,7 +373,7 @@ if (!empty($socid)) {
 $param .= "&type_element=".urlencode($type_element);
 
 $total_qty = 0;
-$num=0;
+$num = 0;
 if ($sql_select) {
 	$resql = $db->query($sql);
 	if (!$resql) {
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 8501ef26165..6fefaccd5cc 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -89,6 +89,9 @@ if (isModEnabled('mailing')) {
 } else {
 	$search_no_email = -1;
 }
+
+$search_ = array();
+
 if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
@@ -210,7 +213,7 @@ if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 	$fieldstosearchall['s.name_alias'] = "AliasNames";
 }
 
-$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$parameters = array('fieldstosearchall' => $fieldstosearchall);
 $reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook > 0) {
 	$fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall'];
@@ -225,27 +228,27 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['p.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
 
 // Add none object fields to fields for list
-$arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>66, 'checked'=>0);
+$arrayfields['country.code_iso'] = array('label' => "Country", 'position' => 66, 'checked' => 0);
 if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
-	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>113, 'checked'=> 1);
-	$arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'position'=>114, 'checked'=> 1);
+	$arrayfields['s.nom'] = array('label' => "ThirdParty", 'position' => 113, 'checked' => 1);
+	$arrayfields['s.name_alias'] = array('label' => "AliasNameShort", 'position' => 114, 'checked' => 1);
 }
 
 $arrayfields['unsubscribed'] = array(
-		'label'=>'No_Email',
-		'checked'=>0,
-		'enabled'=>(isModEnabled('mailing')),
-		'position'=>111);
+		'label' => 'No_Email',
+		'checked' => 0,
+		'enabled' => (isModEnabled('mailing')),
+		'position' => 111);
 
 if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
@@ -570,10 +573,10 @@ if (!empty($searchCategoryContactList)) {
 	}
 }
 
- // Search Customer Categories
+// Search Customer Categories
 $searchCategoryCustomerList = $search_categ_thirdparty ? array($search_categ_thirdparty) : array();
 $searchCategoryCustomerOperator = 0;
- // Search for tag/category ($searchCategoryCustomerList is an array of ID)
+// Search for tag/category ($searchCategoryCustomerList is an array of ID)
 if (!empty($searchCategoryCustomerList)) {
 	$searchCategoryCustomerSqlList = array();
 	$listofcategoryid = '';
@@ -605,7 +608,7 @@ if (!empty($searchCategoryCustomerList)) {
 // Search Supplier Categories
 $searchCategorySupplierList = $search_categ_supplier ? array($search_categ_supplier) : array();
 $searchCategorySupplierOperator = 0;
- // Search for tag/category ($searchCategorySupplierList is an array of ID)
+// Search for tag/category ($searchCategorySupplierList is an array of ID)
 if (!empty($searchCategorySupplierList)) {
 	$searchCategorySupplierSqlList = array();
 	$listofcategoryid = '';
@@ -959,8 +962,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 if ($contextpage != 'poslist') {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $permissiontoadd);
@@ -1040,7 +1043,7 @@ $moreforfilter .= '</div>';
 
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 print $moreforfilter;
-$parameters = array('type'=>$type);
+$parameters = array('type' => $type);
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 print '</div>';
@@ -1149,7 +1152,7 @@ if (!empty($arrayfields['p.email']['checked'])) {
 }
 if (!empty($arrayfields['unsubscribed']['checked'])) {
 	print '<td class="liste_titre center">';
-	print $form->selectarray('search_no_email', array('-1'=>'', '0'=>$langs->trans('No'), '1'=>$langs->trans('Yes')), $search_no_email);
+	print $form->selectarray('search_no_email', array('-1' => '', '0' => $langs->trans('No'), '1' => $langs->trans('Yes')), $search_no_email);
 	print '</td>';
 }
 if (isModEnabled('socialnetworks')) {
@@ -1176,7 +1179,7 @@ if (!empty($arrayfields['s.name_alias']['checked'])) {
 }
 if (!empty($arrayfields['p.priv']['checked'])) {
 	print '<td class="liste_titre center">';
-	$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
+	$selectarray = array('0' => $langs->trans("ContactPublic"), '1' => $langs->trans("ContactPrivate"));
 	print $form->selectarray('search_priv', $selectarray, $search_priv, 1);
 	print '</td>';
 }
@@ -1211,7 +1214,7 @@ if (!empty($arrayfields['p.birthday']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -1227,7 +1230,7 @@ if (!empty($arrayfields['p.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['p.statut']['checked'])) {
 	print '<td class="liste_titre center parentonrightofpage">';
-	print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_status', array('-1' => '', '0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 if (!empty($arrayfields['p.import_key']['checked'])) {
@@ -1351,7 +1354,7 @@ if (!empty($arrayfields['p.birthday']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1708,7 +1711,7 @@ while ($i < $imaxinloop) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -1786,7 +1789,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 455d801cb3e..20345dd7d50 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -162,7 +162,7 @@ $fieldstosearchall["s.nom"] = "ThirdParty";
 if (empty($user->socid)) {
 	$fieldstosearchall["c.note_private"] = "NotePrivate";
 }
-$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$parameters = array('fieldstosearchall' => $fieldstosearchall);
 $reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook > 0) {
 	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
@@ -173,21 +173,21 @@ if ($reshook > 0) {
 }
 
 $arrayfields = array(
-	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>10),
-	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1, 'position'=>12),
-	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'position'=>14),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>30),
-	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0, 'position'=>30),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0, 'position'=>31),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1, 'position'=>32),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>33),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>34),
-	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>-1, 'position'=>80),
-	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1, 'position'=>45),
-	'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'lower_planned_end_date'=>array('label'=>$langs->trans("LowerDateEndPlannedShort"), 'checked'=>1, 'position'=>900, 'help'=>$langs->trans("LowerDateEndPlannedShort")),
-	'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'c.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1, 'position' => 10),
+	'c.ref_customer' => array('label' => $langs->trans("RefCustomer"), 'checked' => 1, 'position' => 12),
+	'c.ref_supplier' => array('label' => $langs->trans("RefSupplier"), 'checked' => 1, 'position' => 14),
+	's.nom' => array('label' => $langs->trans("ThirdParty"), 'checked' => 1, 'position' => 30),
+	's.email' => array('label' => $langs->trans("ThirdPartyEmail"), 'checked' => 0, 'position' => 30),
+	's.town' => array('label' => $langs->trans("Town"), 'checked' => 0, 'position' => 31),
+	's.zip' => array('label' => $langs->trans("Zip"), 'checked' => 1, 'position' => 32),
+	'state.nom' => array('label' => $langs->trans("StateShort"), 'checked' => 0, 'position' => 33),
+	'country.code_iso' => array('label' => $langs->trans("Country"), 'checked' => 0, 'position' => 34),
+	'sale_representative' => array('label' => $langs->trans("SaleRepresentativesOfThirdParty"), 'checked' => -1, 'position' => 80),
+	'c.date_contrat' => array('label' => $langs->trans("DateContract"), 'checked' => 1, 'position' => 45),
+	'c.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'c.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),
+	'lower_planned_end_date' => array('label' => $langs->trans("LowerDateEndPlannedShort"), 'checked' => 1, 'position' => 900, 'help' => $langs->trans("LowerDateEndPlannedShort")),
+	'status' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -219,7 +219,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -498,11 +498,11 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	}
 }
 // Add where from hooks
-$parameters = array('search_dfyear' => $search_dfyear, 'search_op2df'=>$search_op2df);
+$parameters = array('search_dfyear' => $search_dfyear, 'search_op2df' => $search_op2df);
 $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 // Add HAVING from hooks
-$parameters = array('search_dfyear' => $search_dfyear, 'search_op2df'=>$search_op2df);
+$parameters = array('search_dfyear' => $search_dfyear, 'search_op2df' => $search_op2df);
 $reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	if ($search_dfyear > 0 && $search_op2df) {
@@ -726,9 +726,9 @@ 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"),
-	'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	'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"),
 );
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -743,8 +743,8 @@ if (!empty($socid)) {
 	$url .= '&socid='.((int) $socid);
 }
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('contrat', 'creer'));
 
@@ -921,7 +921,7 @@ if (!empty($arrayfields['c.date_contrat']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Creation date
@@ -949,7 +949,7 @@ if (!empty($arrayfields['c.tms']['checked'])) {
 // First end date
 if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
 	print '<td class="liste_titre nowraponall center">';
-	$arrayofoperators = array('0'=>'', '='=>'=', '<='=>'<=', '>='=>'>=');
+	$arrayofoperators = array('0' => '', '=' => '=', '<=' => '<=', '>=' => '>=');
 	print $form->selectarray('search_op2df', $arrayofoperators, $search_op2df, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth50imp');
 	print '</br>';
 	print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0);
@@ -1032,7 +1032,7 @@ if (!empty($arrayfields['c.date_contrat']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['c.datec']['checked'])) {
@@ -1101,7 +1101,7 @@ while ($i < $imaxinloop) {
 	if ($obj->country_id > 0) {
 		if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
 			$tmparray = getCountry($obj->country_id, 'all');
-			$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
+			$cacheCountryIDCode[$obj->country_id] = array('code' => empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
 		}
 		$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
 		$socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
@@ -1113,6 +1113,7 @@ while ($i < $imaxinloop) {
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
+		$arraydata = array();
 		$arraydata['thirdparty'] = $socstatic;
 		$arraydata['selected'] = in_array($obj->rowid, $arrayofselected);
 		$contracttmp->date_contrat = $obj->date_contrat;
@@ -1282,7 +1283,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -1359,7 +1360,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 928482bc1be..a2542669485 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -118,21 +118,21 @@ $staticcontratligne = new ContratLigne($db);
 $companystatic = new Societe($db);
 
 $arrayfields = array(
-	'c.ref'=>array('label'=>"Contract", 'checked'=>1, 'position'=>80),
-	'p.description'=>array('label'=>"Service", 'checked'=>1, 'position'=>80),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>90),
-	'cd.tva_tx'=>array('label'=>"VATRate", 'checked'=>-1, 'position'=>100),
-	'cd.subprice'=>array('label'=>"PriceUHT", 'checked'=>-1, 'position'=>105),
-	'cd.qty'=>array('label'=>"Qty", 'checked'=>1, 'position'=>108),
-	'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109, 'isameasure'=>1),
-	'cd.total_tva'=>array('label'=>"TotalVAT", 'checked'=>-1, 'position'=>110),
-	'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>1, 'position'=>150),
-	'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>1, 'position'=>160),
-	'cd.date_fin_validite'=>array('label'=>"DateEndPlannedShort", 'checked'=>1, 'position'=>170),
-	'cd.date_cloture'=>array('label'=>"DateEndRealShort", 'checked'=>1, 'position'=>180),
+	'c.ref' => array('label' => "Contract", 'checked' => 1, 'position' => 80),
+	'p.description' => array('label' => "Service", 'checked' => 1, 'position' => 80),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 90),
+	'cd.tva_tx' => array('label' => "VATRate", 'checked' => -1, 'position' => 100),
+	'cd.subprice' => array('label' => "PriceUHT", 'checked' => -1, 'position' => 105),
+	'cd.qty' => array('label' => "Qty", 'checked' => 1, 'position' => 108),
+	'cd.total_ht' => array('label' => "TotalHT", 'checked' => -1, 'position' => 109, 'isameasure' => 1),
+	'cd.total_tva' => array('label' => "TotalVAT", 'checked' => -1, 'position' => 110),
+	'cd.date_ouverture_prevue' => array('label' => "DateStartPlannedShort", 'checked' => 1, 'position' => 150),
+	'cd.date_ouverture' => array('label' => "DateStartRealShort", 'checked' => 1, 'position' => 160),
+	'cd.date_fin_validite' => array('label' => "DateEndPlannedShort", 'checked' => 1, 'position' => 170),
+	'cd.date_cloture' => array('label' => "DateEndRealShort", 'checked' => 1, 'position' => 180),
 	//'cd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'cd.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
+	'cd.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	'status' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -159,7 +159,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -518,6 +518,7 @@ $newcardbutton = '';
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, '', '', $limit);
 
 if (!empty($sall)) {
+	$fieldstosearchall = array();
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
@@ -619,7 +620,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 
 if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
 	print '<td class="liste_titre center">';
-	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	$arrayofoperators = array('<' => '<', '>' => '>');
 	print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
@@ -628,7 +629,7 @@ if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
 }
 if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
 	print '<td class="liste_titre center">';
-	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	$arrayofoperators = array('<' => '<', '>' => '>');
 	print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
@@ -637,7 +638,7 @@ if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
 }
 if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
 	print '<td class="liste_titre center">';
-	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	$arrayofoperators = array('<' => '<', '>' => '>');
 	print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
@@ -646,7 +647,7 @@ if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
 }
 if (!empty($arrayfields['cd.date_cloture']['checked'])) {
 	print '<td class="liste_titre center">';
-	$arrayofoperators = array('<'=>'<', '>'=>'>');
+	$arrayofoperators = array('<' => '<', '>' => '>');
 	print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_date_cloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
@@ -657,7 +658,7 @@ if (!empty($arrayfields['cd.date_cloture']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['cd.datec']['checked'])) {
@@ -674,11 +675,11 @@ if (!empty($arrayfields['status']['checked'])) {
 	// Status
 	print '<td class="liste_titre right parentonrightofpage">';
 	$arrayofstatus = array(
-		'0'=>$langs->trans("ServiceStatusInitial"),
-		'4'=>$langs->trans("ServiceStatusRunning"),
-		'4&filter=notexpired'=>$langs->trans("ServiceStatusNotLate"),
-		'4&filter=expired'=>$langs->trans("ServiceStatusLate"),
-		'5'=>$langs->trans("ServiceStatusClosed")
+		'0' => $langs->trans("ServiceStatusInitial"),
+		'4' => $langs->trans("ServiceStatusRunning"),
+		'4&filter=notexpired' => $langs->trans("ServiceStatusNotLate"),
+		'4&filter=expired' => $langs->trans("ServiceStatusLate"),
+		'5' => $langs->trans("ServiceStatusClosed")
 	);
 	$search_status_new = GETPOST('search_status', 'alpha');
 	if ($filter == 'expired' && !preg_match('/expired/', $search_status_new)) {
@@ -746,7 +747,7 @@ if (!empty($arrayfields['cd.date_cloture']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['cd.datec']['checked'])) {
@@ -774,7 +775,7 @@ $productstatic = new Product($db);
 
 $i = 0;
 $savnbfield = $totalarray['nbfield'];
-$totalarray = array('nbfield'=>0, 'cd.qty'=>0, 'cd.total_ht'=>0, 'cd.total_tva'=>0);
+$totalarray = array('nbfield' => 0, 'cd.qty' => 0, 'cd.total_ht' => 0, 'cd.total_tva' => 0);
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
@@ -961,7 +962,7 @@ while ($i < $imaxinloop) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 0f869a97ac0..48ee32f5de2 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -220,7 +220,7 @@ if ($type == 'directory') {
 		'mrp-mo'
 	);
 
-	$parameters = array('modulepart'=>$module);
+	$parameters = array('modulepart' => $module);
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
 	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
 		$automodules[] = $hookmanager->resArray['module'];
@@ -274,7 +274,7 @@ if ($type == 'directory') {
 	} elseif ($module == 'mrp-mo') {
 		$upload_dir = $conf->mrp->dir_output;
 	} else {
-		$parameters = array('modulepart'=>$module);
+		$parameters = array('modulepart' => $module);
 		$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
 		if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
 			$upload_dir = $hookmanager->resArray['directory'];
@@ -422,20 +422,21 @@ if ($useajax || $action == 'deletefile') {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$form = new Form($db);
-	$formquestion['urlfile'] = array('type'=>'hidden', 'value'=>$urlfile, 'name'=>'urlfile'); // We must always put field, even if empty because it is filled by javascript later
-	$formquestion['section'] = array('type'=>'hidden', 'value'=>$section, 'name'=>'section'); // We must always put field, even if empty because it is filled by javascript later
-	$formquestion['section_id'] = array('type'=>'hidden', 'value'=>$section_id, 'name'=>'section_id'); // We must always put field, even if empty because it is filled by javascript later
-	$formquestion['section_dir'] = array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir'); // We must always put field, even if empty because it is filled by javascript later
-	$formquestion['sortfield'] = array('type'=>'hidden', 'value'=>$sortfield, 'name'=>'sortfield'); // We must always put field, even if empty because it is filled by javascript later
-	$formquestion['sortorder'] = array('type'=>'hidden', 'value'=>$sortorder, 'name'=>'sortorder'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion = array();
+	$formquestion['urlfile'] = array('type' => 'hidden', 'value' => $urlfile, 'name' => 'urlfile'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['section'] = array('type' => 'hidden', 'value' => $section, 'name' => 'section'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['section_id'] = array('type' => 'hidden', 'value' => $section_id, 'name' => 'section_id'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['section_dir'] = array('type' => 'hidden', 'value' => $section_dir, 'name' => 'section_dir'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['sortfield'] = array('type' => 'hidden', 'value' => $sortfield, 'name' => 'sortfield'); // We must always put field, even if empty because it is filled by javascript later
+	$formquestion['sortorder'] = array('type' => 'hidden', 'value' => $sortorder, 'name' => 'sortorder'); // We must always put field, even if empty because it is filled by javascript later
 	if (!empty($action) && $action == 'file_manager') {
-		$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
+		$formquestion['file_manager'] = array('type' => 'hidden', 'value' => 1, 'name' => 'file_manager');
 	}
 	if (!empty($websitekey)) {
-		$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
+		$formquestion['website'] = array('type' => 'hidden', 'value' => $websitekey, 'name' => 'website');
 	}
 	if (!empty($pageid) && $pageid > 0) {
-		$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
+		$formquestion['pageid'] = array('type' => 'hidden', 'value' => $pageid, 'name' => 'pageid');
 	}
 
 	print $form->formconfirm($url, $langs->trans("DeleteFile"), $langs->trans("ConfirmDeleteFile"), 'confirm_deletefile', $formquestion, "no", ($useajax ? 'deletefile' : 0));
diff --git a/htdocs/core/ajax/locationincoterms.php b/htdocs/core/ajax/locationincoterms.php
index df330e00741..5d541238466 100644
--- a/htdocs/core/ajax/locationincoterms.php
+++ b/htdocs/core/ajax/locationincoterms.php
@@ -96,6 +96,7 @@ if (GETPOST('location_incoterms')) {
 	$resql = $db->query($sql);
 	//var_dump($db);
 	if ($resql) {
+		$row_array = array();
 		while ($row = $db->fetch_array($resql)) {
 			$row_array['label'] = $row['location_incoterms'].($row['label'] ? ' - '.$row['label'] : '');
 			if ($location_incoterms) {
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index f91e87c8d36..00a86ccd9a9 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -50,7 +50,8 @@ if (!isset($usedbyinclude) || empty($usedbyinclude)) {
 
 	if ($res == 'ERROR_NOT_LOGGED') {
 		$langs->load("other");
-		$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+		$arrayresult = array();
+		$arrayresult['jumptologin'] = array('img' => 'object_generic', 'label' => $langs->trans("JumpToLogin"), 'text' => '<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url' => DOL_URL_ROOT.'/index.php');
 		print json_encode($arrayresult);
 		if (is_object($db)) {
 			$db->close();
@@ -70,114 +71,114 @@ $arrayresult = array();
 // Define $searchform
 
 if (isModEnabled('member') && !getDolGlobalString('MAIN_SEARCHFORM_ADHERENT_DISABLED') && $user->hasRight('adherent', 'lire')) {
-	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_member', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_member', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintomember'] = array('position' => 8, 'shortcut' => 'M', 'img' => 'object_member', 'label' => $langs->trans("SearchIntoMembers", $search_boxvalue), 'text' => img_picto('', 'object_member', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url' => DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 if (((isModEnabled('societe') && (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS'))) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice') || isModEnabled('supplier_proposal')) && !getDolGlobalString('MAIN_SEARCHFORM_SOCIETE_DISABLED') && $user->hasRight('societe', 'lire')) {
-	$arrayresult['searchintothirdparty'] = array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('', 'object_company', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintothirdparty'] = array('position' => 10, 'shortcut' => 'T', 'img' => 'object_company', 'label' => $langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text' => img_picto('', 'object_company', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url' => DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 if (isModEnabled('societe') && !getDolGlobalString('MAIN_SEARCHFORM_CONTACT_DISABLED') && $user->hasRight('societe', 'lire')) {
-	$arrayresult['searchintocontact'] = array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('', 'object_contact', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintocontact'] = array('position' => 15, 'shortcut' => 'A', 'img' => 'object_contact', 'label' => $langs->trans("SearchIntoContacts", $search_boxvalue), 'text' => img_picto('', 'object_contact', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url' => DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 if (((isModEnabled('product') && $user->hasRight('product', 'read')) || (isModEnabled('service') && $user->hasRight('service', 'read'))) && !getDolGlobalString('MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED')) {
-	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoproduct'] = array('position' => 30, 'shortcut' => 'P', 'img' => 'object_product', 'label' => $langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text' => img_picto('', 'object_product', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url' => DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 	// search on lot/serial numbers
 	if (isModEnabled('productbatch')) {
-		$arrayresult['searchintobatch'] = array('position'=>32, 'shortcut'=>'B', 'img'=>'object_lot', 'label'=>$langs->trans("SearchIntoBatch", $search_boxvalue), 'text'=>img_picto('', 'object_lot', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoBatch", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/stock/productlot_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+		$arrayresult['searchintobatch'] = array('position' => 32, 'shortcut' => 'B', 'img' => 'object_lot', 'label' => $langs->trans("SearchIntoBatch", $search_boxvalue), 'text' => img_picto('', 'object_lot', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoBatch", $search_boxvalue), 'url' => DOL_URL_ROOT.'/product/stock/productlot_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 	}
 }
 
 if (isModEnabled('mrp') && $user->hasRight('mrp', 'read') && !getDolGlobalString('MAIN_SEARCHFORM_MRP_DISABLED')) {
-	$arrayresult['searchintomo'] = array('position'=>35, 'shortcut'=>'', 'img'=>'object_mrp', 'label'=>$langs->trans("SearchIntoMO", $search_boxvalue), 'text'=>img_picto('', 'object_mrp', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMO", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/mrp/mo_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintomo'] = array('position' => 35, 'shortcut' => '', 'img' => 'object_mrp', 'label' => $langs->trans("SearchIntoMO", $search_boxvalue), 'text' => img_picto('', 'object_mrp', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMO", $search_boxvalue), 'url' => DOL_URL_ROOT.'/mrp/mo_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('project') && !getDolGlobalString('MAIN_SEARCHFORM_PROJECT_DISABLED') && $user->hasRight('projet', 'lire')) {
-	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_project', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_project', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoprojects'] = array('position' => 40, 'shortcut' => 'Q', 'img' => 'object_project', 'label' => $langs->trans("SearchIntoProjects", $search_boxvalue), 'text' => img_picto('', 'object_project', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url' => DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('project') && !getDolGlobalString('MAIN_SEARCHFORM_TASK_DISABLED') && $user->hasRight('projet', 'lire')) {
-	$arrayresult['searchintotasks'] = array('position'=>45, 'img'=>'object_projecttask', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('', 'object_projecttask', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintotasks'] = array('position' => 45, 'img' => 'object_projecttask', 'label' => $langs->trans("SearchIntoTasks", $search_boxvalue), 'text' => img_picto('', 'object_projecttask', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url' => DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 if (isModEnabled('propal') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED') && $user->hasRight('propal', 'lire')) {
-	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintopropal'] = array('position' => 60, 'img' => 'object_propal', 'label' => $langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text' => img_picto('', 'object_propal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url' => DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('order') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED') && $user->hasRight('commande', 'lire')) {
-	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoorder'] = array('position' => 70, 'img' => 'object_order', 'label' => $langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text' => img_picto('', 'object_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url' => DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) {
-	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_shipment', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_shipment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoshipment'] = array('position' => 80, 'img' => 'object_shipment', 'label' => $langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text' => img_picto('', 'object_shipment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url' => DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('invoice') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
-	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoinvoice'] = array('position' => 90, 'img' => 'object_bill', 'label' => $langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text' => img_picto('', 'object_bill', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url' => DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED') && $user->hasRight('supplier_proposal', 'lire')) {
-	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_supplier_proposal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintosupplierpropal'] = array('position' => 100, 'img' => 'object_supplier_proposal', 'label' => $langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text' => img_picto('', 'object_supplier_proposal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url' => DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') &&  $user->hasRight('supplier_order', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED')) {
-	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_supplier_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintosupplierorder'] = array('position' => 110, 'img' => 'object_supplier_order', 'label' => $langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text' => img_picto('', 'object_supplier_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url' => DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED')) {
-	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_supplier_invoice', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintosupplierinvoice'] = array('position' => 120, 'img' => 'object_supplier_invoice', 'label' => $langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text' => img_picto('', 'object_supplier_invoice', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url' => DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // Customer payments
 if (isModEnabled('invoice') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
 	$arrayresult['searchintocustomerpayments'] = array(
-		'position'=>170,
-		'img'=>'object_payment',
-		'label'=>$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
-		'text'=>img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
-		'url'=>DOL_URL_ROOT.'/compta/paiement/list.php?leftmenu=customers_bills_payment'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+		'position' => 170,
+		'img' => 'object_payment',
+		'label' => $langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'text' => img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'url' => DOL_URL_ROOT.'/compta/paiement/list.php?leftmenu=customers_bills_payment'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // Vendor payments
 if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED')) {
 	$arrayresult['searchintovendorpayments'] = array(
-		'position'=>175,
-		'img'=>'object_payment',
-		'label'=>$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
-		'text'=>img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
-		'url'=>DOL_URL_ROOT.'/fourn/paiement/list.php?leftmenu=suppliers_bills_payment'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+		'position' => 175,
+		'img' => 'object_payment',
+		'label' => $langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'text' => img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'url' => DOL_URL_ROOT.'/fourn/paiement/list.php?leftmenu=suppliers_bills_payment'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // Miscellaneous payments
 if (isModEnabled('bank') && !getDolGlobalString('MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED') && $user->hasRight('banque', 'lire')) {
 	$arrayresult['searchintomiscpayments'] = array(
-		'position'=>180,
-		'img'=>'object_payment',
-		'label'=>$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
-		'text'=>img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
-		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+		'position' => 180,
+		'img' => 'object_payment',
+		'label' => $langs->trans("SearchIntoMiscPayments", $search_boxvalue),
+		'text' => img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
+		'url' => DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
 if (isModEnabled('contract') && !getDolGlobalString('MAIN_SEARCHFORM_CONTRACT_DISABLED') && $user->hasRight('contrat', 'lire')) {
-	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintocontract'] = array('position' => 130, 'img' => 'object_contract', 'label' => $langs->trans("SearchIntoContracts", $search_boxvalue), 'text' => img_picto('', 'object_contract', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url' => DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('intervention') && !getDolGlobalString('MAIN_SEARCHFORM_FICHINTER_DISABLED') && $user->hasRight('ficheinter', 'lire')) {
-	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintointervention'] = array('position' => 140, 'img' => 'object_intervention', 'label' => $langs->trans("SearchIntoInterventions", $search_boxvalue), 'text' => img_picto('', 'object_intervention', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url' => DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('knowledgemanagement') && !getDolGlobalString('MAIN_SEARCHFORM_KNOWLEDGEMANAGEMENT_DISABLED') && $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
-	$arrayresult['searchintoknowledgemanagement'] = array('position'=>145, 'img'=>'object_knowledgemanagement', 'label'=>$langs->trans("SearchIntoKM", $search_boxvalue), 'text'=>img_picto('', 'object_knowledgemanagement', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoKM", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_list.php?mainmenu=ticket'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoknowledgemanagement'] = array('position' => 145, 'img' => 'object_knowledgemanagement', 'label' => $langs->trans("SearchIntoKM", $search_boxvalue), 'text' => img_picto('', 'object_knowledgemanagement', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoKM", $search_boxvalue), 'url' => DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_list.php?mainmenu=ticket'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('ticket') && !getDolGlobalString('MAIN_SEARCHFORM_TICKET_DISABLED') && $user->hasRight('ticket', 'read')) {
-	$arrayresult['searchintotickets'] = array('position'=>146, 'img'=>'object_ticket', 'label'=>$langs->trans("SearchIntoTickets", $search_boxvalue), 'text'=>img_picto('', 'object_ticket', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoTickets", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/ticket/list.php?mainmenu=ticket'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintotickets'] = array('position' => 146, 'img' => 'object_ticket', 'label' => $langs->trans("SearchIntoTickets", $search_boxvalue), 'text' => img_picto('', 'object_ticket', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoTickets", $search_boxvalue), 'url' => DOL_URL_ROOT.'/ticket/list.php?mainmenu=ticket'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // HR
 if (isModEnabled('user') && !getDolGlobalString('MAIN_SEARCHFORM_USER_DISABLED') && $user->hasRight('user', 'user', 'lire')) {
-	$arrayresult['searchintouser'] = array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('', 'object_user', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintouser'] = array('position' => 200, 'shortcut' => 'U', 'img' => 'object_user', 'label' => $langs->trans("SearchIntoUsers", $search_boxvalue), 'text' => img_picto('', 'object_user', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url' => DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED') && $user->hasRight('expensereport', 'lire')) {
-	$arrayresult['searchintoexpensereport'] = array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('', 'object_trip', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoexpensereport'] = array('position' => 210, 'img' => 'object_trip', 'label' => $langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text' => img_picto('', 'object_trip', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('holiday') && !getDolGlobalString('MAIN_SEARCHFORM_HOLIDAY_DISABLED') && $user->hasRight('holiday', 'read')) {
-	$arrayresult['searchintoleaves'] = array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('', 'object_holiday', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
+	$arrayresult['searchintoleaves'] = array('position' => 220, 'img' => 'object_holiday', 'label' => $langs->trans("SearchIntoLeaves", $search_boxvalue), 'text' => img_picto('', 'object_holiday', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // Execute hook addSearchEntry
-$parameters = array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
+$parameters = array('search_boxvalue' => $search_boxvalue, 'arrayresult' => $arrayresult);
 $reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
 if (empty($reshook)) {
 	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 999ba16e49e..21ccd582933 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -111,6 +111,7 @@ if (GETPOST('zipcode') || GETPOST('town')) {
 	//var_dump($db);
 	if ($resql) {
 		while ($row = $db->fetch_array($resql)) {
+			$row_array = [];
 			$country = $row['country_id'] ? ($langs->transnoentitiesnoconv('Country'.$row['country_code']) != 'Country'.$row['country_code'] ? $langs->transnoentitiesnoconv('Country'.$row['country_code']) : $row['country_label']) : '';
 			$county = $row['state_id'] ? ($langs->transnoentitiesnoconv($row['state_code']) != $row['state_code'] ? $langs->transnoentitiesnoconv($row['state_code']) : ($row['state_label'] != '-' ? $row['state_label'] : '')) : '';
 
diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
index 429b8fba2d7..99c71e59063 100644
--- a/htdocs/core/boxes/box_members_by_tags.php
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -89,7 +89,7 @@ class box_members_by_tags extends ModeleBoxes
 			$stats = new AdherentStats($this->db, $user->socid, $user->id);
 
 			// Show array
-			$sumMembers= $stats->countMembersByTagAndStatus($numberyears);
+			$sumMembers = $stats->countMembersByTagAndStatus($numberyears);
 			if ($sumMembers) {
 				$line = 0;
 				$this->info_box_contents[$line][] = array(
@@ -138,11 +138,12 @@ class box_members_by_tags extends ModeleBoxes
 					'text' => $langs->trans("Total")
 				);
 				$line++;
+				$AdherentTag = array();
 				foreach ($sumMembers as $key => $data) {
 					$adhtag = new Categorie($this->db);
 					$adhtag->id = $key;
 
-					if ($key=='total') {
+					if ($key == 'total') {
 						break;
 					}
 					$adhtag->label = $data['label'];
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index f5412dec5ea..05f886e2858 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -82,7 +82,7 @@ class box_members_by_type extends ModeleBoxes
 		$year = date('Y');
 		$numberyears = getDolGlobalInt("MAIN_NB_OF_YEAR_IN_MEMBERSHIP_WIDGET_GRAPH");
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByType").($numberyears ? ' ('.($year-$numberyears).' - '.$year.')' : ''));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByType").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : ''));
 
 		if ($user->hasRight('adherent', 'lire')) {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
@@ -138,11 +138,12 @@ class box_members_by_type extends ModeleBoxes
 					'text' => $langs->trans("Total")
 				);
 				$line++;
+				$AdherentType = array();
 				foreach ($sumMembers as $key => $data) {
 					$adhtype = new AdherentType($this->db);
 					$adhtype->id = $key;
 
-					if ($key=='total') {
+					if ($key == 'total') {
 						break;
 					}
 					$adhtype->label = $data['label'];
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 7b1eb01c1a2..08902344ce0 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -380,31 +380,31 @@ class FormAdmin
 		print '<option value="-1">&nbsp;</option>';
 
 		$arraytz = array(
-			"Pacific/Midway"=>"GMT-11:00",
-			"Pacific/Fakaofo"=>"GMT-10:00",
-			"America/Anchorage"=>"GMT-09:00",
-			"America/Los_Angeles"=>"GMT-08:00",
-			"America/Dawson_Creek"=>"GMT-07:00",
-			"America/Chicago"=>"GMT-06:00",
-			"America/Bogota"=>"GMT-05:00",
-			"America/Anguilla"=>"GMT-04:00",
-			"America/Araguaina"=>"GMT-03:00",
-			"America/Noronha"=>"GMT-02:00",
-			"Atlantic/Azores"=>"GMT-01:00",
-			"Africa/Abidjan"=>"GMT+00:00",
-			"Europe/Paris"=>"GMT+01:00",
-			"Europe/Helsinki"=>"GMT+02:00",
-			"Europe/Moscow"=>"GMT+03:00",
-			"Asia/Dubai"=>"GMT+04:00",
-			"Asia/Karachi"=>"GMT+05:00",
-			"Indian/Chagos"=>"GMT+06:00",
-			"Asia/Jakarta"=>"GMT+07:00",
-			"Asia/Hong_Kong"=>"GMT+08:00",
-			"Asia/Tokyo"=>"GMT+09:00",
-			"Australia/Sydney"=>"GMT+10:00",
-			"Pacific/Noumea"=>"GMT+11:00",
-			"Pacific/Auckland"=>"GMT+12:00",
-			"Pacific/Enderbury"=>"GMT+13:00"
+			"Pacific/Midway" => "GMT-11:00",
+			"Pacific/Fakaofo" => "GMT-10:00",
+			"America/Anchorage" => "GMT-09:00",
+			"America/Los_Angeles" => "GMT-08:00",
+			"America/Dawson_Creek" => "GMT-07:00",
+			"America/Chicago" => "GMT-06:00",
+			"America/Bogota" => "GMT-05:00",
+			"America/Anguilla" => "GMT-04:00",
+			"America/Araguaina" => "GMT-03:00",
+			"America/Noronha" => "GMT-02:00",
+			"Atlantic/Azores" => "GMT-01:00",
+			"Africa/Abidjan" => "GMT+00:00",
+			"Europe/Paris" => "GMT+01:00",
+			"Europe/Helsinki" => "GMT+02:00",
+			"Europe/Moscow" => "GMT+03:00",
+			"Asia/Dubai" => "GMT+04:00",
+			"Asia/Karachi" => "GMT+05:00",
+			"Indian/Chagos" => "GMT+06:00",
+			"Asia/Jakarta" => "GMT+07:00",
+			"Asia/Hong_Kong" => "GMT+08:00",
+			"Asia/Tokyo" => "GMT+09:00",
+			"Australia/Sydney" => "GMT+10:00",
+			"Pacific/Noumea" => "GMT+11:00",
+			"Pacific/Auckland" => "GMT+12:00",
+			"Pacific/Enderbury" => "GMT+13:00"
 		);
 		foreach ($arraytz as $lib => $gmt) {
 			print '<option value="'.$lib.'"';
@@ -443,6 +443,8 @@ class FormAdmin
 			$sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
 		}
 
+		$paperformat = array();
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 9e2c81b87be..142fb711ecb 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -184,7 +184,7 @@ class SimpleOpenID
 	{
 		// phpcs:enable
 		$e = $this->error;
-		return array('code'=>$e[0], 'description'=>$e[1]);
+		return array('code' => $e[0], 'description' => $e[1]);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -198,6 +198,7 @@ class SimpleOpenID
 	public function ErrorStore($code, $desc = null)
 	{
 		// phpcs:enable
+		$errs = array();
 		$errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
 		if ($desc == null) {
 			$desc = $errs[$code];
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 71e8d1b1c88..138417df261 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1214,11 +1214,12 @@ class SMTPs
 	 * - $_aryEmail[user] = "userName"
 	 *
 	 *	@param		string		$_strAddr		Email address
-	 * 	@return 	array	 					An array of the various parts of an email address
+	 * 	@return 	array{org:string,real?:string,addr:string,user:string,host:string}	An array of the various parts of an email address
 	 */
 	private function _strip_email($_strAddr)
 	{
 		// phpcs:enable
+		$_aryEmail = array();
 		// Keep the original
 		$_aryEmail['org'] = $_strAddr;
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 35ce3ff072b..a76fbfb6857 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -794,7 +794,7 @@ class DoliDBPgsql extends DoliDB
 			'42P07' => 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS',
 			'42703' => 'DB_ERROR_NOSUCHFIELD',
 			1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-			42701=> 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+			42701 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
 			'42710' => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
 			'23505' => 'DB_ERROR_RECORD_ALREADY_EXISTS',
 			'42704' => 'DB_ERROR_NO_INDEX_TO_DROP', // May also be Type xxx does not exists
@@ -1069,6 +1069,10 @@ class DoliDBPgsql extends DoliDB
 		// phpcs:enable
 		// FIXME: $fulltext_keys parameter is unused
 
+		$sqlfields = array();
+		$sqlk = array();
+		$sqluq = array();
+
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 0faa455d23c..d7ca7239bd0 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -259,7 +259,7 @@ class DoliDBSqlite3 extends DoliDB
 				}
 
 				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
-					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+				//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
 				//}
 			}
 
@@ -971,6 +971,10 @@ class DoliDBSqlite3 extends DoliDB
 		// phpcs:enable
 		// FIXME: $fulltext_keys parameter is unused
 
+		$sqlfields = array();
+		$sqlk = array();
+		$sqluq = array();
+
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 77363408e36..11e3c1934f3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10654,7 +10654,7 @@ function printCommonFooter($zone = 'private')
 		}
 
 		// Add DebugBar data
-		if ($user->hasRight('debugbar', 'read') && is_object($debugbar)) {
+		if ($user->hasRight('debugbar', 'read') && $debugbar instanceof DebugBar\DebugBar) {
 			$debugbar['time']->stopMeasure('pageaftermaster');
 			print '<!-- Output debugbar data -->'."\n";
 			$renderer = $debugbar->getRenderer();
diff --git a/htdocs/core/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php
index d8db03ae52f..50b373e17d7 100644
--- a/htdocs/core/lib/functions_ch.lib.php
+++ b/htdocs/core/lib/functions_ch.lib.php
@@ -24,7 +24,7 @@
 
 
 /**
- * Return if a BVRB number is valid or not (For switzerland)
+ * Return if a BVRB number is valid or not (For Switzerland)
  *
  * @param	string	$bvrb		BVRB number
  * @return 	boolean				True if OK, false if KO
@@ -32,6 +32,7 @@
 function dol_ch_controle_bvrb($bvrb)
 {
 	// Init array for control
+	$tableau = array();
 	$tableau[0][0] = 0;
 	$tableau[0][1] = 9;
 	$tableau[0][2] = 4;
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index ccf1d9dabe8..5e8a982ddbe 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -141,6 +141,8 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 		return -1;
 	}
 
+	$lastkey = array();
+
 	foreach ($result as $key => $val) {
 		if ("$key" == "objectclass") {
 			continue;
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 911c2854206..23288003852 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -206,6 +206,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 					continue;
 				}
 
+				$pdir = array();
+
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
 				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 968f7d47949..1332f698bfc 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -165,7 +165,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -184,6 +184,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 						}
 
 						$objphoto->fetch($object->lines[$i]->fk_product);
+						$pdir = array();
 
 						if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 							$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
@@ -493,10 +494,10 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -568,7 +569,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -578,7 +579,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index e56b7580ced..56e24e9a776 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -242,7 +242,7 @@ class html_cerfafr extends ModeleDon
 				fclose($handle);
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1;
 			} else {
@@ -294,6 +294,9 @@ class html_cerfafr extends ModeleDon
 		$chif = array('', 'un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept', 'huit', 'neuf', 'dix', 'onze', 'douze', 'treize', 'quatorze', 'quinze', 'seize', 'dix sept', 'dix huit', 'dix neuf');
 		$secon_c = '';
 		$trio_c = '';
+		$prim = array();
+		$secon = array();
+		$trio = array();
 		for ($i = 1; $i <= 3; $i++) {
 			$prim[$i] = '';
 			$secon[$i] = '';
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 59266ff83a3..a95a53f4084 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -244,6 +244,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
+				$pdir = array();
 				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 2cc8f02d3b8..a7b2b029bb3 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -974,6 +974,7 @@ class ImportCsv extends ModeleImports
 								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								if ($is_table_category_link) {
+									'@phan-var-force string[] $where';
 									$sqlend = " WHERE " . implode(' AND ', $where);
 								}
 
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 9750222149a..e70e641ced2 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -910,6 +910,7 @@ class ImportXlsx extends ModeleImports
 								$data = array_combine($listfields, $listvalues);
 
 								$where = array();	// filters to forge SQL request
+								'@phan-var string[] $where';
 								$filters = array();	// filters to forge output error message
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
@@ -1020,6 +1021,7 @@ class ImportXlsx extends ModeleImports
 								$sqlend = " WHERE " . $keyfield . " = ".((int) $lastinsertid);
 
 								if ($is_table_category_link) {
+									'@phan-var-force string[] $where';
 									$sqlend = " WHERE " . implode(' AND ', $where);
 								}
 
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 15e58685878..8585f4ee1b4 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -324,14 +324,15 @@ class pdf_standard extends CommonStickerGenerator
 				$nb = 1; // Protection to avoid empty page
 			}
 
+			$arrayofmembers = array();
 			for ($j = 0; $j < $nb; $j++) {
 				$arrayofmembers[] = array(
-					'textleft'=>$textleft,
-					'textheader'=>$textheader,
-					'textfooter'=>$textfooter,
-					'textright'=>$textright,
-					'id'=>(isset($object->id) ? $object->id : ""),
-					'photo'=>(isset($object->photo) ? $object->photo : "")
+					'textleft' => $textleft,
+					'textheader' => $textheader,
+					'textfooter' => $textfooter,
+					'textright' => $textright,
+					'id' => (isset($object->id) ? $object->id : ""),
+					'photo' => (isset($object->photo) ? $object->photo : "")
 				);
 			}
 
@@ -456,7 +457,7 @@ class pdf_standard extends CommonStickerGenerator
 
 		dolChmod($file);
 
-		$this->result = array('fullpath'=>$file);
+		$this->result = array('fullpath' => $file);
 
 		// Output to http stream
 		if (empty($nooutput)) {
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index acd48af037d..0173754268a 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -233,6 +233,7 @@ class pdf_standard extends ModelePDFProduct
 				$nexY = $pdf->GetY();
 
 				// Show photo
+				$pdir = array();
 				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 					$pdir[0] = get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref).'/';
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index ec04f0001a8..1bdaa836188 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -220,6 +220,7 @@ class pdf_azur extends ModelePDFPropales
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
+				$pdir = array();
 				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 184d95c45da..47f76988e44 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -202,6 +202,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
+				$pdir = array();
 				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
index bc1442e56b4..4f12b778d63 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -187,6 +187,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
+				$pdir = array();
 				if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 2503285cbc2..aac09eb8462 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -35,6 +35,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
+$fileparams = array();
 
 if ($action == 'presend') {
 	$langs->load("mails");
@@ -273,10 +274,10 @@ if ($action == 'presend') {
 
 	$substitutionarray['__CHECK_READ__'] = "";
 	if (is_object($object) && is_object($object->thirdparty)) {
-		$checkRead= '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php';
-		$checkRead.='?tag='.(!empty($object->thirdparty->tag) ? urlencode($object->thirdparty->tag) : "");
-		$checkRead.='&securitykey='.(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') ? urlencode(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')) : "");
-		$checkRead.='" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+		$checkRead = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php';
+		$checkRead .= '?tag='.(!empty($object->thirdparty->tag) ? urlencode($object->thirdparty->tag) : "");
+		$checkRead .= '&securitykey='.(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') ? urlencode(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')) : "");
+		$checkRead .= '" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 		$substitutionarray['__CHECK_READ__'] = $checkRead;
 	}
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index e7f745cedf7..3f3f73a9760 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -3,6 +3,11 @@
 // This tpl file is included into the init part of pages, so before action.
 // So no output must be done.
 
+// TODO: Note, supposing $arrayfields is already set
+'
+ @phan-var-force array $arrayfields;
+';
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index d4ca2e6ac21..ab549cbbb9a 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -195,15 +195,16 @@ if ($action == 'delete_section') {
 if ($action == 'confirmconvertimgwebp') {
 	$langs->load("ecm");
 
-	$section_dir=GETPOST('section_dir', 'alpha');
-	$section=GETPOST('section', 'alpha');
-	$file=GETPOST('filetoregenerate', 'alpha');
+	$section_dir = GETPOST('section_dir', 'alpha');
+	$section = GETPOST('section', 'alpha');
+	$file = GETPOST('filetoregenerate', 'alpha');
 	$form = new Form($db);
-	$formquestion['section_dir']=array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir');
-	$formquestion['section']=array('type'=>'hidden', 'value'=>$section, 'name'=>'section');
-	$formquestion['filetoregenerate']=array('type'=>'hidden', 'value'=>$file, 'name'=>'filetoregenerate');
+	$formquestion = array();
+	$formquestion['section_dir'] = array('type' => 'hidden', 'value' => $section_dir, 'name' => 'section_dir');
+	$formquestion['section'] = array('type' => 'hidden', 'value' => $section, 'name' => 'section');
+	$formquestion['filetoregenerate'] = array('type' => 'hidden', 'value' => $file, 'name' => 'filetoregenerate');
 	if ($module == 'medias') {
-		$formquestion['website']=array('type'=>'hidden', 'value'=>$website->ref, 'name'=>'website');
+		$formquestion['website'] = array('type' => 'hidden', 'value' => $website->ref, 'name' => 'website');
 	}
 	$param = '';
 	if (!empty($sortfield)) {
diff --git a/htdocs/core/tpl/list_print_subtotal.tpl.php b/htdocs/core/tpl/list_print_subtotal.tpl.php
index 1d2d606dc8c..5f04d570ce4 100644
--- a/htdocs/core/tpl/list_print_subtotal.tpl.php
+++ b/htdocs/core/tpl/list_print_subtotal.tpl.php
@@ -1,5 +1,7 @@
 <?php
 
+'@phan-var-force array{nbfield:int,pos?:array<int,int>,val?:array<int,float>} $totalarray';
+
 // Move fields of totalizable into the common array pos and val
 if (!empty($subtotalarray['totalizable']) && is_array($subtotalarray['totalizable'])) {
 	foreach ($subtotalarray['totalizable'] as $keytotalizable => $valtotalizable) {
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index e8fb9978be6..2d57d1397d8 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -1,5 +1,7 @@
 <?php
 
+'@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray';
+
 // Move fields of totalizable into the common array pos and val
 if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) {
 	foreach ($totalarray['totalizable'] as $keytotalizable => $valtotalizable) {
@@ -56,7 +58,7 @@ if (isset($totalarray['pos'])) {
 			} else {
 				//dol_print_error($db); // as we're not sure it's ok for ALL lists, we don't print sq errors, they'll be in logs
 			}
-			if (is_array($sumsarray) && count($sumsarray) >0) {
+			if (is_array($sumsarray) && count($sumsarray) > 0) {
 				print '<tr class="liste_grandtotal">';
 				$i = 0;
 				while ($i < $totalarray['nbfield']) {
@@ -100,12 +102,12 @@ function printTotalValCell($type, $val)
 	switch ($type) {
 		case 'duration':
 			print '<td class="right">';
-			print (!empty($val) ? convertSecondToTime($val, 'allhourmin') : 0);
+			print(!empty($val) ? convertSecondToTime($val, 'allhourmin') : 0);
 			print '</td>';
 			break;
 		case 'string':	// This type is no more used. type is now varchar(x)
 			print '<td class="left">';
-			print (!empty($val) ? $val : '');
+			print(!empty($val) ? $val : '');
 			print '</td>';
 			break;
 		case 'stock':
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 185c1cea0b8..3e0034fde38 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -90,9 +90,13 @@ print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
+if (!isset($listofsearchfields) || !is_array($listofsearchfields)) {
+	// Ensure $listofsearchfields is an array
+	$listofsearchfields = array();
+}
 if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // TODO Add a search into global search combo so we can remove this
 	if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
-		$listofsearchfields['search_donation'] = array('text'=>'Donation');
+		$listofsearchfields['search_donation'] = array('text' => 'Donation');
 	}
 
 	if (count($listofsearchfields)) {
@@ -230,7 +234,7 @@ if ($resql) {
 
 			print '<td class="nobordernopadding">';
 			print $obj->societe;
-			print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
+			print($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
 			print dolGetFirstLastname($obj->firstname, $obj->lastname);
 			print '</td>';
 
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 46e1f251aac..b340622595f 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -781,6 +781,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($massaction == 'presetstatus') {
 	$formquestion = array();
+	$statuslist = array();
 	$statuslist[$objecttmp::STATUS_DRAFT] = $objecttmp->LibStatutEvent($objecttmp::STATUS_DRAFT);
 	$statuslist[$objecttmp::STATUS_SUGGESTED] = $objecttmp->LibStatutEvent($objecttmp::STATUS_SUGGESTED);
 	$statuslist[$objecttmp::STATUS_CONFIRMED] = $objecttmp->LibStatutEvent($objecttmp::STATUS_CONFIRMED);
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index d1ed103e721..016fbfee019 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -129,6 +129,7 @@ print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
 print "</tr>\n";
 
 $listoftype = $tripandexpense_static->listOfTypes();
+$dataseries = array();
 foreach ($listoftype as $code => $label) {
 	$dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
 }
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 335d5608727..cfb5ab3577d 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -94,10 +94,11 @@ if ($resql) {
 	$total = 0;
 	$totalinprocess = 0;
 	$dataseries = array();
+	$colorseries = array();
 	$vals = array();
 	$bool = false;
 	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-	if ($num>0) {
+	if ($num > 0) {
 		while ($row = $db->fetch_row($resql)) {
 			if (!isset($vals[$row[1]])) {
 				$vals[$row[1]] = 0;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 20ac051bb84..89d86259763 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -807,6 +807,7 @@ while ($i < $imaxinloop) {
 		}
 
 		$objectstatic->duration = $obj->duree;
+		$arraydata = array();
 		$arraydata['thirdparty'] = $companystatic;
 		print $objectstatic->getKanbanView('', $arraydata);
 		if ($i == ($imaxinloop - 1)) {
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 30a5e5a7045..0c96ebe718e 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -92,6 +92,7 @@ if ($resql) {
 
 	$total = 0;
 	$dataseries = array();
+	$colorseries = array();
 	$vals = array();
 	//	0=Draft -> 1=Validated -> 2=Approved -> 3=Process running -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
 	//	-> 7=Canceled/Never received -> (reopen) 3=Process running
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 1e13db22978..b1f42a5cbd5 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3084,6 +3084,7 @@ if ($action == 'create') {
 			$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("Other"), $close[$i]['label'], 1);
 			$i++;
 			// arrayreasons[code]=reason
+			$arrayreasons = array();
 			foreach ($close as $key => $val) {
 				$arrayreasons[$close[$key]['code']] = $close[$key]['reason'];
 			}
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index e495c2e3f9e..7c9b3b8b3b7 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -155,6 +155,7 @@ if (empty($reshook)) {
 		$totalpayment = 0;
 		$atleastonepaymentnotnull = 0;
 		$multicurrency_totalpayment = 0;
+		$formquestion = array();
 
 		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
 		$tmpinvoice = new FactureFournisseur($db);
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 8839f4122c2..129353718b9 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -367,7 +367,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $object = new Holiday($db);
 
-$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+$listhalfday = array('morning' => $langs->trans("Morning"), "afternoon" => $langs->trans("Afternoon"));
 
 $title = $langs->trans('Leave');
 $help_url = 'EN:Module_Holiday';
@@ -498,7 +498,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		print '<td>';
 		print img_picto($langs->trans("groups"), 'group', 'class="pictofixedwidth"');
 
-		$sql =' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup WHERE entity IN ('.getEntity('usergroup').')';
+		$sql = ' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup WHERE entity IN ('.getEntity('usergroup').')';
 		$resql = $db->query($sql);
 		$Tgroup = array();
 		while ($obj = $db->fetch_object($resql)) {
@@ -520,6 +520,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		$sql .= ' WHERE 1=1';
 		$sql .= !empty($morefilter) ? $morefilter : '';
 
+		$userlist = array();
+
 		$resql = $db->query($sql);
 		if ($resql) {
 			while ($obj = $db->fetch_object($resql)) {
@@ -703,7 +705,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 					$objStd->error++;
 					$objStd->msg = $langs->trans('ErrorMailRecipientIsEmpty');
 					$objStd->status = 'error';
-					$objStd->style="warnings";
+					$objStd->style = "warnings";
 					return $objStd;
 				}
 
@@ -784,7 +786,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 				if (!$result) {
 					$objStd->error++;
 					$objStd->msg = $langs->trans('ErrorMailNotSend');
-					$objStd->style="warnings";
+					$objStd->style = "warnings";
 					$objStd->status = 'error';
 				} else {
 					$objStd->msg = $langs->trans('MailSent');
@@ -795,7 +797,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 				$objStd->error++;
 				$objStd->msg = $langs->trans('ErrorVerif');
 				$objStd->status = 'error';
-				$objStd->style="errors";
+				$objStd->style = "errors";
 				return $objStd;
 			}
 		}
@@ -803,7 +805,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 		$objStd->error++;
 		$objStd->msg = $langs->trans('ErrorloadUserOnSendingMail');
 		$objStd->status = 'error';
-		$objStd->style="warnings";
+		$objStd->style = "warnings";
 		return $objStd;
 	}
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index b778a22466d..85c6925c306 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1280,7 +1280,7 @@ class Holiday extends CommonObject
 					$obj = $this->db->fetch_object($resql);
 
 					// Note: $obj->halfday is  0:Full days, 2:Start afternoon end morning, -1:Start afternoon, 1:End morning
-					$arrayofrecord[$obj->rowid] = array('date_start'=>$this->db->jdate($obj->date_start), 'date_end'=>$this->db->jdate($obj->date_end), 'halfday'=>$obj->halfday, 'status'=>$obj->status);
+					$arrayofrecord[$obj->rowid] = array('date_start' => $this->db->jdate($obj->date_start), 'date_end' => $this->db->jdate($obj->date_end), 'halfday' => $obj->halfday, 'status' => $obj->status);
 					$i++;
 				}
 
@@ -1312,7 +1312,7 @@ class Holiday extends CommonObject
 			dol_print_error($this->db);
 		}
 
-		$result = array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
+		$result = array('morning' => $isavailablemorning, 'afternoon' => $isavailableafternoon);
 		if (!$isavailablemorning) {
 			$result['morning_reason'] = 'leave_request';
 		}
@@ -1438,7 +1438,7 @@ class Holiday extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1493,7 +1493,7 @@ class Holiday extends CommonObject
 		$statusType = 'status6';
 		if (!empty($startdate) && $startdate >= dol_now()) {		// If not yet passed, we use a green "in live" color
 			$statusType = 'status4';
-			$params = array('tooltip'=>$this->labelStatus[$status].' - '.$langs->trans("Forthcoming"));
+			$params = array('tooltip' => $this->labelStatus[$status].' - '.$langs->trans("Forthcoming"));
 		}
 		if ($status == self::STATUS_DRAFT) {
 			$statusType = 'status0';
@@ -1543,7 +1543,7 @@ class Holiday extends CommonObject
 
 		$out .= '</select>'."\n";
 
-		$showempty= 0;
+		$showempty = 0;
 		$out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);
 
 		return $out;
@@ -2270,8 +2270,9 @@ class Holiday extends CommonObject
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			if ($num) {
+				$types = array();
 				while ($obj = $this->db->fetch_object($result)) {
-					$types[$obj->rowid] = array('id'=> $obj->rowid, 'rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newbymonth'=>$obj->newbymonth);
+					$types[$obj->rowid] = array('id' => $obj->rowid, 'rowid' => $obj->rowid, 'code' => $obj->code, 'label' => $obj->label, 'affect' => $obj->affect, 'delay' => $obj->delay, 'newbymonth' => $obj->newbymonth);
 				}
 
 				return $types;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index b2ed2279bbc..9bcd2ea51c4 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -87,10 +87,10 @@ if (!$user->hasRight('holiday', 'read')) {
 }
 
 $arrayfields = array(
-	'cp.rowid'=>array('label'=>$langs->trans("Employee"), 'checked'=>1, 'position'=>20),
-	'cp.fk_user'=>array('label'=>$langs->trans("Supervisor"), 'checked'=>1, 'position'=>30),
-	'cp.nbHoliday'=>array('label'=>$langs->trans("MenuConfCP"), 'checked'=>1, 'position'=>40),
-	'cp.note_public'=>array('label'=>$langs->trans("Note"), 'checked'=>1, 'position'=>50),
+	'cp.rowid' => array('label' => $langs->trans("Employee"), 'checked' => 1, 'position' => 20),
+	'cp.fk_user' => array('label' => $langs->trans("Supervisor"), 'checked' => 1, 'position' => 30),
+	'cp.nbHoliday' => array('label' => $langs->trans("MenuConfCP"), 'checked' => 1, 'position' => 40),
+	'cp.note_public' => array('label' => $langs->trans("Note"), 'checked' => 1, 'position' => 50),
 );
 
 
@@ -260,7 +260,7 @@ if ($massaction == 'preincreaseholiday') {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$staticholiday = new Holiday($db);
 	$arraytypeholidays = $staticholiday->getTypes(1, 1);
-	$formquestion[] = array();
+	$formquestion = array();
 	$labeltypes = array();
 	foreach ($typeleaves as $key => $val) {
 		$labeltypes[$val['id']] = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 16157d26be6..8aafba502ad 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -370,6 +370,7 @@ if (!empty($arrayfields['cpl.type_action']['checked'])) {
 
 // Filter: Type
 if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+	$arraytypeleaves = array();
 	foreach ($alltypeleaves as $key => $val) {
 		$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
 		$arraytypeleaves[$val['rowid']] = $labeltoshow;
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index d35ca37f313..c7a0e1bd988 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -141,7 +141,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 		if (!$error) {
-			foreach ($TSkillsToAdd as $k=>$v) {
+			foreach ($TSkillsToAdd as $k => $v) {
 				$skillAdded = new SkillRank($db);
 				$skillAdded->fk_skill = $v;
 				$skillAdded->fk_object = $id;
@@ -247,7 +247,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$linkback = '<a href="' . dol_buildpath('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 		$morehtmlref = '<div class="refid">';
-		$morehtmlref.= $object->label;
+		$morehtmlref .= $object->label;
 		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
@@ -269,9 +269,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$TAllSkills = $static_skill->fetchAll();
 
 	// Array format for multiselectarray function
-	$TAllSkillsFormatted=array();
+	$TAllSkillsFormatted = array();
 	if (!empty($TAllSkills)) {
-		foreach ($TAllSkills as $k=>$v) {
+		foreach ($TAllSkills as $k => $v) {
 			$TAllSkillsFormatted[$k] = $v->label;
 		}
 	}
@@ -279,12 +279,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// table of skillRank linked to current object
 	//$TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0);
 	$sql_skill = "SELECT sr.fk_object, sr.rowid, s.label,s.skill_type, sr.rankorder, sr.fk_skill";
-	$sql_skill .=" FROM ".MAIN_DB_PREFIX."hrm_skillrank AS sr";
-	$sql_skill .=" JOIN ".MAIN_DB_PREFIX."hrm_skill AS s ON sr.fk_skill = s.rowid";
+	$sql_skill .= " FROM ".MAIN_DB_PREFIX."hrm_skillrank AS sr";
+	$sql_skill .= " JOIN ".MAIN_DB_PREFIX."hrm_skill AS s ON sr.fk_skill = s.rowid";
 	$sql_skill .= " AND sr.fk_object = ".((int) $id);
 	$result = $db->query($sql_skill);
 	$numSkills = $db->num_rows($result);
-	for ($i=0; $i < $numSkills; $i++) {
+	$TSkillsJob = array();
+	for ($i = 0; $i < $numSkills; $i++) {
 		$objSkillRank = $db->fetch_object($result);
 		$TSkillsJob[] = $objSkillRank;
 	}
@@ -307,7 +308,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
 		//unset($object->fields['fk_project']);				// Hide field already shown in banner
 		//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-		$object->fields['label']['visible']=0; // Already in banner
+		$object->fields['label']['visible'] = 0; // Already in banner
 		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
 
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
@@ -334,9 +335,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 		print '</tr>'."\n";
 
-		$object->fields['label']['visible']=0; // Already in banner
-		$object->fields['firstname']['visible']=0; // Already in banner
-		$object->fields['lastname']['visible']=0; // Already in banner
+		$object->fields['label']['visible'] = 0; // Already in banner
+		$object->fields['firstname']['visible'] = 0; // Already in banner
+		$object->fields['lastname']['visible'] = 0; // Already in banner
 		//include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
 
 		// Ref employee
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index a757ceb7c8d..e6da24464a6 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -136,6 +136,11 @@ if (empty($versionfrom) && empty($versionto) && !is_writable($conffile)) {
 	exit;
 }
 
+// Ensure $modulesdir is set and array
+if (!isset($modulesdir) || !is_array($modulesdir)) {
+	$modulesdir = array();
+}
+
 if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 	$error = 0;
 
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index e993190c45c..e1cb682ea33 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -88,7 +88,7 @@ $arrayfields = array();
 foreach ($arrayfields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+		$arrayfields['t.'.$key] = array('label' => $val['label'], 'checked' => (($val['visible'] < 0) ? 0 : 1), 'enabled' => $val['enabled'], 'position' => $val['position']);
 	}
 }
 // Extra fields
@@ -96,10 +96,10 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
+				'label' => $extrafields->attributes[$object->table_element]['label'][$key],
+				'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
+				'position' => $extrafields->attributes[$object->table_element]['pos'][$key],
+				'enabled' => (abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
 			);
 		}
 	}
@@ -293,7 +293,12 @@ $objecttmp = new Opensurveysondage($db);
 $trackid = 'surv'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+
 if ($sall) {
+	// Ensure $fieldstosearchall is set and array
+	if (!isset($fieldstosearchall) || !is_array($fieldstosearchall)) {
+		$fieldstosearchall = array();
+	}
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
@@ -344,13 +349,13 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
-$arraystatus = array('-1'=>'&nbsp;', '0'=>$langs->trans("Draft"), '1'=>$langs->trans("Opened"), '2'=>$langs->trans("Closed"));
+$arraystatus = array('-1' => '&nbsp;', '0' => $langs->trans("Draft"), '1' => $langs->trans("Opened"), '2' => $langs->trans("Closed"));
 print '<td class="liste_titre" align="center">'.$form->selectarray('search_status', $arraystatus, $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onroghtofpage').'</td>';
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -381,7 +386,7 @@ print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.status", $param, "",
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -503,7 +508,7 @@ 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, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -544,7 +549,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 9d64eb4c525..8704a530387 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -55,9 +55,9 @@ $type = 'product';
 
 // Pricing Rules
 $select_pricing_rules = array(
-	'PRODUCT_PRICE_UNIQ'=>$langs->trans('PriceCatalogue'), // Unique price
-	'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level
-	'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'), // Different price for each customer
+	'PRODUCT_PRICE_UNIQ' => $langs->trans('PriceCatalogue'), // Unique price
+	'PRODUIT_MULTIPRICES' => $langs->trans('MultiPricesAbility'), // Several prices according to a customer level
+	'PRODUIT_CUSTOMER_PRICES' => $langs->trans('PriceByCustomer'), // Different price for each customer
 );
 $keyforparam = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
 if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || !empty($conf->global->$keyforparam)) {
@@ -407,6 +407,7 @@ print "</tr>\n";
 
 clearstatcache();
 
+$filelist = array();
 foreach ($dirmodels as $reldir) {
 	foreach (array('', '/doc') as $valdir) {
 		$dir = dol_buildpath($reldir."core/modules/product".$valdir);
@@ -650,10 +651,10 @@ if (empty($conf->use_javascript_ajax)) {
 } else {
 	print '<td class="right">';
 	$arrval = array(
-		'0'=>$langs->trans("No"),
-		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+		'0' => $langs->trans("No"),
+		'1' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+		'2' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+		'3' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_usesearchtoselectproduct", $arrval, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
 	print '</td>';
@@ -674,7 +675,7 @@ print '<td class="right">';
 print '<!-- PRODUIT_AUTOFILL_DESC -->';
 print $form->selectarray(
 	"activate_FillProductDescAuto",
-	array(0=>'DoNotAutofillButAutoConcat', 1=>'AutoFillFormFieldBeforeSubmit', 2=>'DoNotUseDescriptionOfProdut'),
+	array(0 => 'DoNotAutofillButAutoConcat', 1 => 'AutoFillFormFieldBeforeSubmit', 2 => 'DoNotUseDescriptionOfProdut'),
 	!getDolGlobalString('PRODUIT_AUTOFILL_DESC') ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,
 	0,
 	0,
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 5ea00762dc7..edc9ad53fd2 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -420,6 +420,7 @@ print "</tr>\n";
 
 clearstatcache();
 
+$filelist = array();
 foreach ($dirmodels as $reldir) {
 	foreach (array('', '/doc') as $valdir) {
 		$dir = dol_buildpath($reldir . "core/modules/product_batch" . $valdir);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5d3f74fe800..af6f3927ac4 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5687,7 +5687,7 @@ class Product extends CommonObject
 				}
 				$nbpiece = abs($nbpiece);
 			}
-
+			$op = array();
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
@@ -5751,6 +5751,7 @@ class Product extends CommonObject
 				$nbpiece = abs($nbpiece);
 			}
 
+			$op = array();
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 9abf9bd5326..4c95be804b3 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -92,9 +92,13 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This may be useless due to the global search combo
+	if (!isset($listofsearchfields) || !is_array($listofsearchfields)) {
+		// Ensure $listofsearchfields is set and array
+		$listofsearchfields = array();
+	}
 	// Search contract
 	if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
-		$listofsearchfields['search_product'] = array('text'=>'ProductOrService');
+		$listofsearchfields['search_product'] = array('text' => 'ProductOrService');
 	}
 
 	if (count($listofsearchfields)) {
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index d20e7336110..cb3da2f695a 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -98,22 +98,22 @@ class Inventory extends CommonObject
 	 * @var array  Array with all fields and their property
 	 */
 	public $fields = array(
-		'rowid'              => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'ref'                => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object', 'css'=>'maxwidth150'),
-		'entity'             => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'title'              => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax150', 'alwayseditable'=>1),
-		'fk_warehouse'       => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
-		'fk_product'         => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
-		'categories_product' => array('type'=>'chkbxlst:categorie:label:rowid::type=0:0:', 'label'=>'OrProductsWithCategories', 'visible'=>3, 'enabled'=>1, 'position'=>33, 'help'=>'', 'picto'=>'category', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx'),
-		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'),	// This date is not used so disabled by default.
-		'date_creation'      => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500, 'csslist'=>'nowraponall'),
-		'tms'                => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501, 'csslist'=>'nowraponall'),
-		'date_validation'    => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502, 'csslist'=>'nowraponall'),
-		'fk_user_creat'      => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
-		'fk_user_modif'      => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511, 'csslist'=>'tdoverflowmax150'),
-		'fk_user_valid'      => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>512, 'csslist'=>'tdoverflowmax150'),
-		'import_key'         => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
-		'status'             => array('type'=>'integer', 'label'=>'Status', 'visible'=>4, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed', 9=>'Canceled'))
+		'rowid'              => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
+		'ref'                => array('type' => 'varchar(64)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => 'Reference of object', 'css' => 'maxwidth150'),
+		'entity'             => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1,),
+		'title'              => array('type' => 'varchar(255)', 'label' => 'Label', 'visible' => 1, 'enabled' => 1, 'position' => 25, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'alwayseditable' => 1),
+		'fk_warehouse'       => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'InventoryForASpecificWarehouse', 'picto' => 'stock', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'),
+		'fk_product'         => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'InventoryForASpecificProduct', 'picto' => 'product', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'),
+		'categories_product' => array('type' => 'chkbxlst:categorie:label:rowid::type=0:0:', 'label' => 'OrProductsWithCategories', 'visible' => 3, 'enabled' => 1, 'position' => 33, 'help' => '', 'picto' => 'category', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx'),
+		'date_inventory'     => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'),	// This date is not used so disabled by default.
+		'date_creation'      => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500, 'csslist' => 'nowraponall'),
+		'tms'                => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501, 'csslist' => 'nowraponall'),
+		'date_validation'    => array('type' => 'datetime', 'label' => 'DateValidation', 'visible' => -2, 'enabled' => 1, 'position' => 502, 'csslist' => 'nowraponall'),
+		'fk_user_creat'      => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 510, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax150'),
+		'fk_user_modif'      => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 511, 'csslist' => 'tdoverflowmax150'),
+		'fk_user_valid'      => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'visible' => -2, 'enabled' => 1, 'position' => 512, 'csslist' => 'tdoverflowmax150'),
+		'import_key'         => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
+		'status'             => array('type' => 'integer', 'label' => 'Status', 'visible' => 4, 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => 0, 'index' => 1, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', 2 => 'Closed', 9 => 'Canceled'))
 	);
 
 	/**
@@ -645,6 +645,7 @@ class Inventory extends CommonObject
 		global $langs;
 
 		$labelStatus = array();
+		$labelStatusShort = array();
 		$labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 		$labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated').' ('.$langs->transnoentitiesnoconv('InventoryStartedShort').')';
 		$labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
@@ -760,10 +761,10 @@ class Inventory extends CommonObject
 	public function getChildWarehouse($id, &$TChildWarehouse)
 	{
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'entrepot';
-		$sql.= ' WHERE fk_parent='.(int) $id;
-		$sql.= ' ORDER BY rowid';
+		$sql .= ' WHERE fk_parent='.(int) $id;
+		$sql .= ' ORDER BY rowid';
 		$resql = $this->db->query($sql);
-		if ($resql && $this->db->num_rows($resql)>0) {
+		if ($resql && $this->db->num_rows($resql) > 0) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				$TChildWarehouse[] = $obj->rowid;
 				$this->getChildWarehouse($obj->rowid, $TChildWarehouse);
@@ -827,18 +828,18 @@ class InventoryLine extends CommonObjectLine
 	 * @var array  Array with all fields and their property
 	 */
 	public $fields = array(
-		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'fk_inventory'  => array('type'=>'integer:Inventory:product/inventory/class/inventory.class.php', 'label'=>'Inventory', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'LinkToInventory'),
-		'fk_warehouse'  => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'LinkToThirdparty'),
-		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'LinkToProduct'),
-		'batch'         => array('type'=>'string', 'label'=>'Batch', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'LinkToProduct'),
-		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
-		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
-		'qty_stock'     => array('type'=>'double', 'label'=>'QtyFound', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'Qty we found/want (to define during draft edition)'),
-		'qty_view'      => array('type'=>'double', 'label'=>'QtyBefore', 'visible'=>1, 'enabled'=>1, 'position'=>33, 'index'=>1, 'help'=>'Qty before (filled once movements are validated)'),
-		'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty added or removed (filled once movements are validated)'),
-		'pmp_real'      => array('type'=>'double', 'label'=>'PMPReal', 'visible'=>1, 'enabled'=>1, 'position'=>35),
-		'pmp_expected'  => array('type'=>'double', 'label'=>'PMPExpected', 'visible'=>1, 'enabled'=>1, 'position'=>36),
+		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
+		'fk_inventory'  => array('type' => 'integer:Inventory:product/inventory/class/inventory.class.php', 'label' => 'Inventory', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'LinkToInventory'),
+		'fk_warehouse'  => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'LinkToThirdparty'),
+		'fk_product'    => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'LinkToProduct'),
+		'batch'         => array('type' => 'string', 'label' => 'Batch', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'LinkToProduct'),
+		'datec'         => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500),
+		'tms'           => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501),
+		'qty_stock'     => array('type' => 'double', 'label' => 'QtyFound', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'Qty we found/want (to define during draft edition)'),
+		'qty_view'      => array('type' => 'double', 'label' => 'QtyBefore', 'visible' => 1, 'enabled' => 1, 'position' => 33, 'index' => 1, 'help' => 'Qty before (filled once movements are validated)'),
+		'qty_regulated' => array('type' => 'double', 'label' => 'QtyDelta', 'visible' => 1, 'enabled' => 1, 'position' => 34, 'index' => 1, 'help' => 'Qty added or removed (filled once movements are validated)'),
+		'pmp_real'      => array('type' => 'double', 'label' => 'PMPReal', 'visible' => 1, 'enabled' => 1, 'position' => 35),
+		'pmp_expected'  => array('type' => 'double', 'label' => 'PMPExpected', 'visible' => 1, 'enabled' => 1, 'position' => 36),
 	);
 
 	/**
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 88248cc0d8a..92f95dad523 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -188,11 +188,11 @@ if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'p.ref'=>"Ref",
-	'p.label'=>"ProductLabel",
-	'p.description'=>"Description",
-	"p.note"=>"Note",
-	'pfp.ref_fourn'=>'RefSupplier'
+	'p.ref' => "Ref",
+	'p.label' => "ProductLabel",
+	'p.description' => "Description",
+	"p.note" => "Note",
+	'pfp.ref_fourn' => 'RefSupplier'
 );
 // multilang
 if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -220,57 +220,58 @@ $isInEEC = isInEEC($mysoc);
 
 $alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
 
+$arraypricelevel = array();
 // Definition of array of fields for columns
 $arrayfields = array(
-	'p.rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-	'p.ref'=>array('label'=>'ProductRef', 'checked'=>1, 'position'=>10),
+	'p.rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
+	'p.ref' => array('label' => 'ProductRef', 'checked' => 1, 'position' => 10),
 	//'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(isModEnabled('barcode'))),
-	'thumbnail'=>array('label'=>'Photo', 'checked'=>0, 'position'=>10),
-	'p.description'=>array('label'=>'Description', 'checked'=>0, 'position'=>10),
-	'p.label'=>array('label'=>"Label", 'checked'=>1, 'position'=>10),
-	'p.fk_product_type'=>array('label'=>"Type", 'checked'=>0, 'enabled'=>(isModEnabled("product") && isModEnabled("service")), 'position'=>11),
-	'p.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(isModEnabled('barcode')), 'position'=>12),
-	'p.duration'=>array('label'=>"Duration", 'checked'=>($contextpage != 'productlist'), 'enabled'=>(isModEnabled("service") && (string) $type == '1'), 'position'=>13),
-	'pac.fk_product_parent' => array('label'=>"ParentProductOfVariant", 'checked'=>-1, 'enabled'=>(isModEnabled('variants')), 'position'=>14),
-	'p.finished'=>array('label'=>"Nature", 'checked'=>0, 'enabled'=>(isModEnabled("product") && $type != '1'), 'position'=>19),
-	'p.weight'=>array('label'=>'Weight', 'checked'=>0, 'enabled'=>(isModEnabled("product") && $type != '1'), 'position'=>20),
-	'p.weight_units'=>array('label'=>'WeightUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && $type != '1'), 'position'=>21),
-	'p.length'=>array('label'=>'Length', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>22),
-	'p.length_units'=>array('label'=>'LengthUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>23),
-	'p.width'=>array('label'=>'Width', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>24),
-	'p.width_units'=>array('label'=>'WidthUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>25),
-	'p.height'=>array('label'=>'Height', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>26),
-	'p.height_units'=>array('label'=>'HeightUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>27),
-	'p.surface'=>array('label'=>'Surface', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SURFACE') && $type != '1'), 'position'=>28),
-	'p.surface_units'=>array('label'=>'SurfaceUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SURFACE') && $type != '1'), 'position'=>29),
-	'p.volume'=>array('label'=>'Volume', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_VOLUME') && $type != '1'), 'position'=>30),
-	'p.volume_units'=>array('label'=>'VolumeUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_VOLUME') && $type != '1'), 'position'=>31),
-	'cu.label'=>array('label'=>"DefaultUnitToShow", 'checked'=>0, 'enabled'=>(isModEnabled("product") && getDolGlobalString('PRODUCT_USE_UNITS')), 'position'=>32),
-	'p.fk_default_workstation'=>array('label'=>'DefaultWorkstation', 'checked'=>0, 'enabled'=>isModEnabled('workstation') && $type == 1, 'position'=>33),
-	'p.sellprice'=>array('label'=>"SellingPrice", 'checked'=>1, 'enabled'=>!getDolGlobalString('PRODUIT_MULTIPRICES'), 'position'=>40),
-	'p.tva_tx'=>array('label'=>"VATRate", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUIT_MULTIPRICES'), 'position'=>41),
-	'p.minbuyprice'=>array('label'=>"BuyingPriceMinShort", 'checked'=>1, 'enabled'=>($user->hasRight('fournisseur', 'lire')), 'position'=>42),
-	'p.numbuyprice'=>array('label'=>"BuyingPriceNumShort", 'checked'=>0, 'enabled'=>($user->hasRight('fournisseur', 'lire')), 'position'=>43),
-	'p.pmp'=>array('label'=>"PMPValueShort", 'checked'=>0, 'enabled'=>($user->hasRight('fournisseur', 'lire')), 'position'=>44),
-	'p.cost_price'=>array('label'=>"CostPrice", 'checked'=>0, 'enabled'=>($user->hasRight('fournisseur', 'lire')), 'position'=>45),
-	'p.seuil_stock_alerte'=>array('label'=>"StockLimit", 'checked'=>0, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position'=>50),
-	'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position'=>51),
-	'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position'=>52),
-	'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && $virtualdiffersfromphysical), 'position'=>53),
-	'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(isModEnabled('productbatch')), 'position'=>60),
-	'p.fk_country'=>array('label'=>"Country", 'checked'=>0, 'position'=>100),
-	'p.fk_state'=>array('label'=>"State", 'checked'=>0, 'position'=>101),
-	$alias_product_perentity . '.accountancy_code_sell'=>array('label'=>"ProductAccountancySellCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>400),
-	$alias_product_perentity . '.accountancy_code_sell_intra'=>array('label'=>"ProductAccountancySellIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>401),
-	$alias_product_perentity . '.accountancy_code_sell_export'=>array('label'=>"ProductAccountancySellExportCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>402),
-	$alias_product_perentity . '.accountancy_code_buy'=>array('label'=>"ProductAccountancyBuyCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>403),
-	$alias_product_perentity . '.accountancy_code_buy_intra'=>array('label'=>"ProductAccountancyBuyIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>404),
-	$alias_product_perentity . '.accountancy_code_buy_export'=>array('label'=>"ProductAccountancyBuyExportCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>405),
-	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'p.tosell'=>array('label'=>$langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Sell").')', 'checked'=>1, 'position'=>1000),
-	'p.tobuy'=>array('label'=>$langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Buy").')', 'checked'=>1, 'position'=>1000),
-	'p.import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'checked'=>-1, 'position'=>1100),
+	'thumbnail' => array('label' => 'Photo', 'checked' => 0, 'position' => 10),
+	'p.description' => array('label' => 'Description', 'checked' => 0, 'position' => 10),
+	'p.label' => array('label' => "Label", 'checked' => 1, 'position' => 10),
+	'p.fk_product_type' => array('label' => "Type", 'checked' => 0, 'enabled' => (isModEnabled("product") && isModEnabled("service")), 'position' => 11),
+	'p.barcode' => array('label' => "Gencod", 'checked' => 1, 'enabled' => (isModEnabled('barcode')), 'position' => 12),
+	'p.duration' => array('label' => "Duration", 'checked' => ($contextpage != 'productlist'), 'enabled' => (isModEnabled("service") && (string) $type == '1'), 'position' => 13),
+	'pac.fk_product_parent' => array('label' => "ParentProductOfVariant", 'checked' => -1, 'enabled' => (isModEnabled('variants')), 'position' => 14),
+	'p.finished' => array('label' => "Nature", 'checked' => 0, 'enabled' => (isModEnabled("product") && $type != '1'), 'position' => 19),
+	'p.weight' => array('label' => 'Weight', 'checked' => 0, 'enabled' => (isModEnabled("product") && $type != '1'), 'position' => 20),
+	'p.weight_units' => array('label' => 'WeightUnits', 'checked' => 0, 'enabled' => (isModEnabled("product") && $type != '1'), 'position' => 21),
+	'p.length' => array('label' => 'Length', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position' => 22),
+	'p.length_units' => array('label' => 'LengthUnits', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position' => 23),
+	'p.width' => array('label' => 'Width', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position' => 24),
+	'p.width_units' => array('label' => 'WidthUnits', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position' => 25),
+	'p.height' => array('label' => 'Height', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position' => 26),
+	'p.height_units' => array('label' => 'HeightUnits', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position' => 27),
+	'p.surface' => array('label' => 'Surface', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SURFACE') && $type != '1'), 'position' => 28),
+	'p.surface_units' => array('label' => 'SurfaceUnits', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SURFACE') && $type != '1'), 'position' => 29),
+	'p.volume' => array('label' => 'Volume', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_VOLUME') && $type != '1'), 'position' => 30),
+	'p.volume_units' => array('label' => 'VolumeUnits', 'checked' => 0, 'enabled' => (isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_VOLUME') && $type != '1'), 'position' => 31),
+	'cu.label' => array('label' => "DefaultUnitToShow", 'checked' => 0, 'enabled' => (isModEnabled("product") && getDolGlobalString('PRODUCT_USE_UNITS')), 'position' => 32),
+	'p.fk_default_workstation' => array('label' => 'DefaultWorkstation', 'checked' => 0, 'enabled' => isModEnabled('workstation') && $type == 1, 'position' => 33),
+	'p.sellprice' => array('label' => "SellingPrice", 'checked' => 1, 'enabled' => !getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => 40),
+	'p.tva_tx' => array('label' => "VATRate", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => 41),
+	'p.minbuyprice' => array('label' => "BuyingPriceMinShort", 'checked' => 1, 'enabled' => ($user->hasRight('fournisseur', 'lire')), 'position' => 42),
+	'p.numbuyprice' => array('label' => "BuyingPriceNumShort", 'checked' => 0, 'enabled' => ($user->hasRight('fournisseur', 'lire')), 'position' => 43),
+	'p.pmp' => array('label' => "PMPValueShort", 'checked' => 0, 'enabled' => ($user->hasRight('fournisseur', 'lire')), 'position' => 44),
+	'p.cost_price' => array('label' => "CostPrice", 'checked' => 0, 'enabled' => ($user->hasRight('fournisseur', 'lire')), 'position' => 45),
+	'p.seuil_stock_alerte' => array('label' => "StockLimit", 'checked' => 0, 'enabled' => (isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position' => 50),
+	'p.desiredstock' => array('label' => "DesiredStock", 'checked' => 1, 'enabled' => (isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position' => 51),
+	'p.stock' => array('label' => "PhysicalStock", 'checked' => 1, 'enabled' => (isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position' => 52),
+	'stock_virtual' => array('label' => "VirtualStock", 'checked' => 1, 'enabled' => (isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && $virtualdiffersfromphysical), 'position' => 53),
+	'p.tobatch' => array('label' => "ManageLotSerial", 'checked' => 0, 'enabled' => (isModEnabled('productbatch')), 'position' => 60),
+	'p.fk_country' => array('label' => "Country", 'checked' => 0, 'position' => 100),
+	'p.fk_state' => array('label' => "State", 'checked' => 0, 'position' => 101),
+	$alias_product_perentity . '.accountancy_code_sell' => array('label' => "ProductAccountancySellCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 400),
+	$alias_product_perentity . '.accountancy_code_sell_intra' => array('label' => "ProductAccountancySellIntraCode", 'checked' => 0, 'enabled' => $isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 401),
+	$alias_product_perentity . '.accountancy_code_sell_export' => array('label' => "ProductAccountancySellExportCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 402),
+	$alias_product_perentity . '.accountancy_code_buy' => array('label' => "ProductAccountancyBuyCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 403),
+	$alias_product_perentity . '.accountancy_code_buy_intra' => array('label' => "ProductAccountancyBuyIntraCode", 'checked' => 0, 'enabled' => $isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 404),
+	$alias_product_perentity . '.accountancy_code_buy_export' => array('label' => "ProductAccountancyBuyExportCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 405),
+	'p.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'p.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	'p.tosell' => array('label' => $langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Sell").')', 'checked' => 1, 'position' => 1000),
+	'p.tobuy' => array('label' => $langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Buy").')', 'checked' => 1, 'position' => 1000),
+	'p.import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'checked' => -1, 'position' => 1100),
 );
 /*foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
@@ -295,7 +296,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		} else {
 			$labelp = $langs->transnoentitiesnoconv("SellingPrice")." ".$i;
 		}
-		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>($i == 1 ? 1 : 0), 'enabled'=>getDolGlobalString('PRODUIT_MULTIPRICES'), 'position'=>(float) ('40.'.sprintf('%03s', $i)));
+		$arrayfields['p.sellprice'.$i] = array('label' => $labelp, 'checked' => ($i == 1 ? 1 : 0), 'enabled' => getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => (float) ('40.'.sprintf('%03s', $i)));
 		$arraypricelevel[$i] = array($i);
 	}
 }
@@ -828,8 +829,8 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-	'edit_extrafields'=>img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("ModifyValueExtrafields"),
+	'generate_doc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'edit_extrafields' => img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("ModifyValueExtrafields"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
@@ -850,8 +851,8 @@ if ($user->hasRight($rightskey, 'supprimer')) {
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 
 if ($type === "") {
 	$perm = ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'));
@@ -860,8 +861,8 @@ if ($type === "") {
 } elseif ($type == Product::TYPE_PRODUCT) {
 	$perm = $user->hasRight('produit', 'creer');
 }
-	$oldtype = $type;
-	$params = array();
+$oldtype = $type;
+$params = array();
 if ($type === "") {
 	$params['forcenohideoftext'] = 1;
 }
@@ -998,7 +999,7 @@ if (!empty($arrayfields['p.label']['checked'])) {
 // Type
 if (!empty($arrayfields['p.fk_product_type']['checked'])) {
 	print '<td class="liste_titre center">';
-	$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+	$array = array('-1' => '&nbsp;', '0' => $langs->trans('Product'), '1' => $langs->trans('Service'));
 	print $form->selectarray('search_type', $array, $search_type);
 	print '</td>';
 }
@@ -1217,7 +1218,7 @@ if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -1236,12 +1237,12 @@ if (!empty($arrayfields['p.import_key']['checked'])) {
 }
 if (!empty($arrayfields['p.tosell']['checked'])) {
 	print '<td class="liste_titre center parentonrightofpage">';
-	print $form->selectarray('search_tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'), '1'=>$langs->trans('ProductStatusOnSellShort')), $search_tosell, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_tosell', array('0' => $langs->trans('ProductStatusNotOnSellShort'), '1' => $langs->trans('ProductStatusOnSellShort')), $search_tosell, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 if (!empty($arrayfields['p.tobuy']['checked'])) {
 	print '<td class="liste_titre center parentonrightofpage">';
-	print $form->selectarray('search_tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'), '1'=>$langs->trans('ProductStatusOnBuyShort')), $search_tobuy, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_tobuy', array('0' => $langs->trans('ProductStatusNotOnBuyShort'), '1' => $langs->trans('ProductStatusOnBuyShort')), $search_tobuy, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column
@@ -1454,7 +1455,7 @@ if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1716,9 +1717,9 @@ while ($i < $imaxinloop) {
 				$duration_unit = substr($obj->duration, -1);
 
 				if ((float) $duration_value > 1) {
-					$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+					$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 				} elseif ((float) $duration_value > 0) {
-					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+					$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 				}
 				print $duration_value;
 				print((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
@@ -1738,7 +1739,7 @@ while ($i < $imaxinloop) {
 				if (!empty($conf->cache['product'][$obj->fk_product_parent])) {
 					$product_parent_static = $conf->cache['product'][$obj->fk_product_parent];
 				} else {
-					$product_parent_static= new Product($db);
+					$product_parent_static = new Product($db);
 					$product_parent_static->fetch($obj->fk_product_parent);
 					$conf->cache['product'][$obj->fk_product_parent] = $product_parent_static;
 				}
@@ -1925,7 +1926,7 @@ while ($i < $imaxinloop) {
 		// Multiprices
 		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			if (! isset($productpricescache)) {
-				$productpricescache=array();
+				$productpricescache = array();
 			}
 			if (! isset($productpricescache[$obj->rowid])) {
 				$productpricescache[$obj->rowid] = array();
@@ -2173,7 +2174,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 5eb441f835e..6c8671175ec 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -103,21 +103,21 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $arrayfields = array(
-	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
-	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
-	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(isModEnabled('productbatch'))),
-	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
-	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
-	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
-	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
-	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
-	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
-	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
-	'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
-	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
-	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'checked'=>0),
+	'm.rowid' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	'm.datem' => array('label' => $langs->trans("Date"), 'checked' => 1),
+	'p.ref' => array('label' => $langs->trans("ProductRef"), 'checked' => 1, 'css' => 'maxwidth100'),
+	'p.label' => array('label' => $langs->trans("ProductLabel"), 'checked' => 1),
+	'm.batch' => array('label' => $langs->trans("BatchNumberShort"), 'checked' => 1, 'enabled' => (isModEnabled('productbatch'))),
+	'pl.eatby' => array('label' => $langs->trans("EatByDate"), 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
+	'pl.sellby' => array('label' => $langs->trans("SellByDate"), 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
+	'e.ref' => array('label' => $langs->trans("Warehouse"), 'checked' => 1, 'enabled' => (!($id > 0))), // If we are on specific warehouse, we hide it
+	'm.fk_user_author' => array('label' => $langs->trans("Author"), 'checked' => 0),
+	'm.inventorycode' => array('label' => $langs->trans("InventoryCodeShort"), 'checked' => 1),
+	'm.label' => array('label' => $langs->trans("MovementLabel"), 'checked' => 1),
+	'm.type_mouvement' => array('label' => $langs->trans("TypeMovement"), 'checked' => 1),
+	'origin' => array('label' => $langs->trans("Origin"), 'checked' => 1),
+	'm.value' => array('label' => $langs->trans("Qty"), 'checked' => 1),
+	'm.price' => array('label' => $langs->trans("UnitPurchaseValue"), 'checked' => 0),
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
@@ -754,6 +754,10 @@ if ($resql) {
 	}
 
 	if ($sall) {
+		if (!isset($fieldstosearchall) || !is_array($fieldstosearchall)) {
+			// Ensure $fieldstosearchall is array
+			$fieldstosearchall = array();
+		}
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
 		}
@@ -891,7 +895,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
@@ -963,7 +967,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['m.datec']['checked'])) {
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 969b058cf81..95e7b87a203 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1117,6 +1117,10 @@ if ($massaction == 'prereverse') {
 
 if ($search_all) {
 	$setupstring = '';
+	if (!isset($fieldstosearchall) || !is_array($fieldstosearchall)) {
+		// Ensure $fieldstosearchall is array
+		$fieldstosearchall = array();
+	}
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 8eb2c92c8cb..f726293c5e4 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -427,6 +427,7 @@ class StockTransferLine extends CommonObjectLine
 		$p = new Product($this->db);
 		$p->fetch($this->fk_product);
 
+		$op = array();
 		$op[0] = "+".trim($this->qty);
 		$op[1] = "-".trim($this->qty);
 		$movementstock = new MouvementStock($this->db);
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index a3fa658764d..625b0bd76f7 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -533,6 +533,7 @@ print "</tr>\n";
 
 clearstatcache();
 
+$filelist = array();
 foreach ($dirmodels as $reldir) {
 	foreach (array('', '/doc') as $valdir) {
 		$dir = dol_buildpath($reldir."core/modules/project/".$valdir);
@@ -801,10 +802,10 @@ if (!$conf->use_javascript_ajax) {
 	print "</td>";
 } else {
 	print '<td width="60" class="right">';
-	$arrval = array('0'=>$langs->trans("No"),
-		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+	$arrval = array('0' => $langs->trans("No"),
+		'1' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+		'2' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+		'3' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, getDolGlobalString("PROJECT_USE_SEARCH_TO_SELECT"));
 	print '</td><td class="right">';
@@ -825,13 +826,13 @@ print '</tr>';
 
 $key = 'PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE';
 echo '<tr class="oddeven">',
-		'<td class="left">',
-			$form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
-		'</td>',
-		'<td class="right" colspan="2">',
-			ajax_constantonoff($key),
-		'</td>',
-	'</tr>';
+'<td class="left">',
+$form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
+'</td>',
+'<td class="right" colspan="2">',
+ajax_constantonoff($key),
+'</td>',
+'</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("TimesheetPreventAfterFollowingMonths").'</td>';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 4f6e2b36480..eb5675e23be 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -295,46 +295,46 @@ class Project extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'fk_project' =>array('type'=>'integer', 'label'=>'Parent', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'position'=>12),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>15, 'searchall'=>1),
-		'title' =>array('type'=>'varchar(255)', 'label'=>'ProjectLabel', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>17, 'showoncombobox'=>2, 'searchall'=>1),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>19),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'Thirdparty', 'enabled'=>1, 'visible'=>0, 'position'=>20),
-		'dateo' =>array('type'=>'date', 'label'=>'DateStart', 'enabled'=>1, 'visible'=>1, 'position'=>30),
-		'datee' =>array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>1, 'position'=>35),
-		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>55, 'searchall'=>1),
-		'public' =>array('type'=>'integer', 'label'=>'Visibility', 'enabled'=>1, 'visible'=>1, 'position'=>65),
-		'fk_opp_status' =>array('type'=>'integer', 'label'=>'OpportunityStatusShort', 'enabled'=>'getDolGlobalString("PROJECT_USE_OPPORTUNITIES")', 'visible'=>1, 'position'=>75),
-		'opp_percent' =>array('type'=>'double(5,2)', 'label'=>'OpportunityProbabilityShort', 'enabled'=>'getDolGlobalString("PROJECT_USE_OPPORTUNITIES")', 'visible'=>1, 'position'=>80),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>85, 'searchall'=>1),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>90, 'searchall'=>1),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPdf', 'enabled'=>1, 'visible'=>0, 'position'=>95),
-		'date_close' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'fk_user_close' =>array('type'=>'integer', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>0, 'position'=>110),
-		'opp_amount' =>array('type'=>'double(24,8)', 'label'=>'OpportunityAmountShort', 'enabled'=>1, 'visible'=>'getDolGlobalString("PROJECT_USE_OPPORTUNITIES")', 'position'=>115),
-		'budget_amount' =>array('type'=>'double(24,8)', 'label'=>'Budget', 'enabled'=>1, 'visible'=>-1, 'position'=>119),
-		'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'usage_task' =>array('type'=>'integer', 'label'=>'UsageTasks', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'usage_bill_time' =>array('type'=>'integer', 'label'=>'UsageBillTimeShort', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'usage_organize_event' =>array('type'=>'integer', 'label'=>'UsageOrganizeEvent', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
+		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'fk_project' => array('type' => 'integer', 'label' => 'Parent', 'enabled' => 1, 'visible' => 1, 'notnull' => 0, 'position' => 12),
+		'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 15, 'searchall' => 1),
+		'title' => array('type' => 'varchar(255)', 'label' => 'ProjectLabel', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 17, 'showoncombobox' => 2, 'searchall' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 19),
+		'fk_soc' => array('type' => 'integer', 'label' => 'Thirdparty', 'enabled' => 1, 'visible' => 0, 'position' => 20),
+		'dateo' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'visible' => 1, 'position' => 30),
+		'datee' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => 1, 'position' => 35),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 3, 'position' => 55, 'searchall' => 1),
+		'public' => array('type' => 'integer', 'label' => 'Visibility', 'enabled' => 1, 'visible' => 1, 'position' => 65),
+		'fk_opp_status' => array('type' => 'integer', 'label' => 'OpportunityStatusShort', 'enabled' => 'getDolGlobalString("PROJECT_USE_OPPORTUNITIES")', 'visible' => 1, 'position' => 75),
+		'opp_percent' => array('type' => 'double(5,2)', 'label' => 'OpportunityProbabilityShort', 'enabled' => 'getDolGlobalString("PROJECT_USE_OPPORTUNITIES")', 'visible' => 1, 'position' => 80),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 85, 'searchall' => 1),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 90, 'searchall' => 1),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'ModelPdf', 'enabled' => 1, 'visible' => 0, 'position' => 95),
+		'date_close' => array('type' => 'datetime', 'label' => 'DateClosing', 'enabled' => 1, 'visible' => 0, 'position' => 105),
+		'fk_user_close' => array('type' => 'integer', 'label' => 'UserClosing', 'enabled' => 1, 'visible' => 0, 'position' => 110),
+		'opp_amount' => array('type' => 'double(24,8)', 'label' => 'OpportunityAmountShort', 'enabled' => 1, 'visible' => 'getDolGlobalString("PROJECT_USE_OPPORTUNITIES")', 'position' => 115),
+		'budget_amount' => array('type' => 'double(24,8)', 'label' => 'Budget', 'enabled' => 1, 'visible' => -1, 'position' => 119),
+		'usage_opportunity' => array('type' => 'integer', 'label' => 'UsageOpportunity', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'usage_task' => array('type' => 'integer', 'label' => 'UsageTasks', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'usage_bill_time' => array('type' => 'integer', 'label' => 'UsageBillTimeShort', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'usage_organize_event' => array('type' => 'integer', 'label' => 'UsageOrganizeEvent', 'enabled' => 1, 'visible' => -1, 'position' => 145),
 		// Properties for event organization
-		'date_start_event' =>array('type'=>'date', 'label'=>'DateStartEvent', 'enabled'=>"isModEnabled('eventorganization')", 'visible'=>1, 'position'=>200),
-		'date_end_event' =>array('type'=>'date', 'label'=>'DateEndEvent', 'enabled'=>"isModEnabled('eventorganization')", 'visible'=>1, 'position'=>201),
-		'location' =>array('type'=>'text', 'label'=>'Location', 'enabled'=>1, 'visible'=>3, 'position'=>55, 'searchall'=>202),
-		'accept_conference_suggestions' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestConf', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'accept_booth_suggestions' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>211),
-		'price_registration' =>array('type'=>'double(24,8)', 'label'=>'PriceOfRegistration', 'enabled'=>1, 'visible'=>-1, 'position'=>212),
-		'price_booth' =>array('type'=>'double(24,8)', 'label'=>'PriceOfBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'max_attendees' =>array('type'=>'integer', 'label'=>'MaxNbOfAttendees', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
+		'date_start_event' => array('type' => 'date', 'label' => 'DateStartEvent', 'enabled' => "isModEnabled('eventorganization')", 'visible' => 1, 'position' => 200),
+		'date_end_event' => array('type' => 'date', 'label' => 'DateEndEvent', 'enabled' => "isModEnabled('eventorganization')", 'visible' => 1, 'position' => 201),
+		'location' => array('type' => 'text', 'label' => 'Location', 'enabled' => 1, 'visible' => 3, 'position' => 55, 'searchall' => 202),
+		'accept_conference_suggestions' => array('type' => 'integer', 'label' => 'AllowUnknownPeopleSuggestConf', 'enabled' => 1, 'visible' => -1, 'position' => 210),
+		'accept_booth_suggestions' => array('type' => 'integer', 'label' => 'AllowUnknownPeopleSuggestBooth', 'enabled' => 1, 'visible' => -1, 'position' => 211),
+		'price_registration' => array('type' => 'double(24,8)', 'label' => 'PriceOfRegistration', 'enabled' => 1, 'visible' => -1, 'position' => 212),
+		'price_booth' => array('type' => 'double(24,8)', 'label' => 'PriceOfBooth', 'enabled' => 1, 'visible' => -1, 'position' => 215),
+		'max_attendees' => array('type' => 'integer', 'label' => 'MaxNbOfAttendees', 'enabled' => 1, 'visible' => -1, 'position' => 215),
 		// Generic
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>-2, 'position'=>400),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>405),
-		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>410),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>0, 'position'=>415),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>420),
-		'email_msgid'=>array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'enabled'=>1, 'visible'=>-1, 'position'=>450, 'help'=>'EmailMsgIDWhenSourceisEmail', 'csslist'=>'tdoverflowmax125'),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreationShort', 'enabled' => 1, 'visible' => -2, 'position' => 400),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModificationShort', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 405),
+		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserCreation', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 410),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModification', 'enabled' => 1, 'visible' => 0, 'position' => 415),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -1, 'position' => 420),
+		'email_msgid' => array('type' => 'varchar(255)', 'label' => 'EmailMsgID', 'enabled' => 1, 'visible' => -1, 'position' => 450, 'help' => 'EmailMsgIDWhenSourceisEmail', 'csslist' => 'tdoverflowmax125'),
+		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 500),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -876,7 +876,7 @@ class Project extends CommonObject
 		}
 
 		$parameters = array(
-			'sql'=>$sql,
+			'sql' => $sql,
 			'type' => $type,
 			'tablename' => $tablename,
 			'datefieldname'  => $datefieldname,
@@ -950,14 +950,14 @@ class Project extends CommonObject
 
 		// Set fk_projet into elements to null
 		$listoftables = array(
-			'propal'=>'fk_projet', 'commande'=>'fk_projet', 'facture'=>'fk_projet',
-			'supplier_proposal'=>'fk_projet', 'commande_fournisseur'=>'fk_projet', 'facture_fourn'=>'fk_projet',
-			'expensereport_det'=>'fk_projet', 'contrat'=>'fk_projet',
-			'fichinter'=>'fk_projet',
-			'don'=>array('field'=>'fk_projet', 'module'=>'don'),
-			'actioncomm'=>'fk_project',
-			'mrp_mo'=>'fk_project',
-			'entrepot'=>'fk_project'
+			'propal' => 'fk_projet', 'commande' => 'fk_projet', 'facture' => 'fk_projet',
+			'supplier_proposal' => 'fk_projet', 'commande_fournisseur' => 'fk_projet', 'facture_fourn' => 'fk_projet',
+			'expensereport_det' => 'fk_projet', 'contrat' => 'fk_projet',
+			'fichinter' => 'fk_projet',
+			'don' => array('field' => 'fk_projet', 'module' => 'don'),
+			'actioncomm' => 'fk_project',
+			'mrp_mo' => 'fk_project',
+			'entrepot' => 'fk_project'
 		);
 		foreach ($listoftables as $key => $value) {
 			if (is_array($value)) {
@@ -1461,7 +1461,7 @@ class Project extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('projectdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1804,7 +1804,7 @@ class Project extends CommonObject
 
 				foreach (array('internal', 'external') as $source) {
 					$tab = $origin_project->liste_contact(-1, $source);
-					if (is_array($tab) && count($tab)>0) {
+					if (is_array($tab) && count($tab) > 0) {
 						foreach ($tab as $contacttoadd) {
 							$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
 							if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -2490,7 +2490,7 @@ class Project extends CommonObject
 			$return .= '<br><div class="info-box-ref tdoverflowmax150 inline-block valignmiddle">'.$this->thirdparty->getNomUrl(1);
 			$return .= '</div><div class="inline-block valignmiddle">';
 			$return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone');
-			$return .='</div>';
+			$return .= '</div>';
 		}
 		if (!empty($arraydata['assignedusers'])) {
 			$return .= '<br>';
@@ -2564,6 +2564,7 @@ class Project extends CommonObject
 
 		$now = dol_now();
 		$nowDate = dol_getdate($now, true);
+		$errorsMsg = array();
 
 		$firstDayOfWeekTS = dol_get_first_day_week($nowDate['mday'], $nowDate['mon'], $nowDate['year']);
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 9d2c29f6068..cbf976a9377 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -598,6 +598,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 	}
 
 	// Moral/Physic attribute
+	$morphys = array();
 	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
 	if (!getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY')) {
@@ -641,7 +642,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 	// Gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+	$arraygender = array('man' => $langs->trans("Genderman"), 'woman' => $langs->trans("Genderwoman"), 'other' => $langs->trans("Genderother"));
 	print $form->selectarray('gender', $arraygender, GETPOST('gender', 'alphanohtml'), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td></tr>';
 
@@ -703,7 +704,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 	}
 
 	// Other attributes
-	$parameters['tpl_context']='public';	// define template context to public
+	$parameters['tpl_context'] = 'public';	// define template context to public
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	// Comments
@@ -715,7 +716,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 	// Add specific fields used by Dolibarr foundation for example
 	// TODO Move this into generic feature.
 	if (getDolGlobalString('MEMBER_NEWFORM_DOLIBARRTURNOVER')) {
-		$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
+		$arraybudget = array('50' => '<= 100 000', '100' => '<= 200 000', '200' => '<= 500 000', '300' => '<= 1 500 000', '600' => '<= 3 000 000', '1000' => '<= 5 000 000', '2000' => '5 000 000+');
 		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span class="star">*</span></td><td>';
 		print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
 		print ' € or $';
@@ -778,7 +779,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 
 		// Clean the amount
 		$amount = price2num($amount);
-		$showedamount = $amount>0 ? $amount : 0;
+		$showedamount = $amount > 0 ? $amount : 0;
 		// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
 		print '<tr><td>'.$langs->trans("Subscription");
 		if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) {
@@ -896,7 +897,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 				if ($displayedamount > 0 || !$caneditamount) {
 					print price($displayedamount, 1, $langs, 1, 0, -1, $conf->currency);
 				}
-				if ($caneditamount && $displayedamount>0) {
+				if ($caneditamount && $displayedamount > 0) {
 					print $form->textwithpicto('', $langs->transnoentities("CanEditAmountShortForValues"), 1, 'help', '', 0, 3);
 				} elseif ($caneditamount) {
 					print $langs->transnoentities("CanEditAmountShort");
@@ -917,7 +918,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR
 			if (empty($hidevoteallowed)) {
 				print '<td class="center">'.yn($objp->vote).'</td>';
 			}
-			$membercount = $objp->membercount>0 ? $objp->membercount : "–";
+			$membercount = $objp->membercount > 0 ? $objp->membercount : "–";
 			if ($publiccounters) {
 				print '<td class="center">'.$membercount.'</td>';
 			}
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 02c9ceeb336..daf74ba39d7 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -28,7 +28,10 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
 }
 // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME'];
+$tmp2 = realpath(__FILE__);
+$i = strlen($tmp) - 1;
+$j = strlen($tmp2) - 1;
 while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
 	$i--;
 	$j--;
@@ -264,7 +267,7 @@ if ($action == 'edit') {
 
 $moduledir = 'recruitment';
 $myTmpObjects = array();
-$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration' => 1, 'includedocgeneration' => 1);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -414,6 +417,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</tr>\n";
 
 		clearstatcache();
+		$filelist = array();
 
 		foreach ($dirmodels as $reldir) {
 			foreach (array('', '/doc') as $valdir) {
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index c8ca0c09a42..37c641c8b29 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -235,7 +235,7 @@ if ($action == 'edit') {
 
 $moduledir = 'recruitment';
 $myTmpObjects = array();
-$myTmpObjects['RecruitmentCandidature'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
+$myTmpObjects['RecruitmentCandidature'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -386,6 +386,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</tr>\n";
 
 		clearstatcache();
+		$filelist = array();
 
 		foreach ($dirmodels as $reldir) {
 			foreach (array('', '/doc') as $valdir) {
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
index aec5e304e14..50f32055837 100644
--- a/htdocs/salaries/ajax/ajaxsalaries.php
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -65,6 +65,7 @@ if (!empty(GETPOSTINT('fk_user'))) {
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$label = "Salary amount";
+		$row_array = array();
 		$row_array['label'] = $label;
 		$row_array['value'] = price2num($obj->amount, 'MT');
 		$row_array['key'] = "Amount";
@@ -72,8 +73,8 @@ if (!empty(GETPOSTINT('fk_user'))) {
 		array_push($return_arr, $row_array);
 		echo json_encode($return_arr);
 	} else {
-		echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+		echo json_encode(array('nom' => 'Error', 'label' => 'Error', 'key' => 'Error', 'value' => 'Error'));
 	}
 } else {
-	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+	echo json_encode(array('nom' => 'ErrorBadParameter', 'label' => 'ErrorBadParameter', 'key' => 'ErrorBadParameter', 'value' => 'ErrorBadParameter'));
 }
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 1000eaf142a..acfd93d1740 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -663,6 +663,7 @@ print '<td class="center">'.$langs->trans("MustBeMandatory").'</td>';
 print '<td class="center">'.$langs->trans("MustBeInvoiceMandatory").'</td>';
 print "</tr>\n";
 
+$profid = array('IDPROF1' => array(), 'IDPROF2' => array(), 'IDPROF3' => array(), 'IDPROF4' => array(), 'IDPROF5' => array(),'IDPROF6' => array(), 'EMAIL' => array());
 $profid['IDPROF1'][0] = $langs->trans("ProfId1");
 $profid['IDPROF1'][1] = $langs->transcountry('ProfId1', $mysoc->country_code);
 $profid['IDPROF2'][0] = $langs->trans("ProfId2");
@@ -678,8 +679,10 @@ $profid['IDPROF6'][1] = $langs->transcountry('ProfId6', $mysoc->country_code);
 $profid['EMAIL'][0] = $langs->trans("EMail");
 $profid['EMAIL'][1] = $langs->trans('Email');
 if (isModEnabled('accounting')) {
+	$profid['ACCOUNTANCY_CODE_CUSTOMER'] = array();
 	$profid['ACCOUNTANCY_CODE_CUSTOMER'][0] = $langs->trans("CustomerAccountancyCodeShort");
 	$profid['ACCOUNTANCY_CODE_CUSTOMER'][1] = $langs->trans('CustomerAccountancyCodeShort');
+	$profid['ACCOUNTANCY_CODE_SUPPLIER'] = array();
 	$profid['ACCOUNTANCY_CODE_SUPPLIER'][0] = $langs->trans("SupplierAccountancyCodeShort");
 	$profid['ACCOUNTANCY_CODE_SUPPLIER'][1] = $langs->trans('SupplierAccountancyCodeShort');
 }
@@ -783,10 +786,10 @@ if (!$conf->use_javascript_ajax) {
 	print "</td>";
 } else {
 	print '<td width="60" class="right">';
-	$arrval = array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+	$arrval = array('0' => $langs->trans("No"),
+	'1' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+	'2' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+	'3' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT'), 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td><td class="right">';
@@ -804,10 +807,10 @@ if (!$conf->use_javascript_ajax) {
 	print "</td>";
 } else {
 	print '<td width="60" class="right">';
-	$arrval = array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+	$arrval = array('0' => $langs->trans("No"),
+	'1' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+	'2' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+	'3' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, getDolGlobalString('CONTACT_USE_SEARCH_TO_SELECT'), 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td><td class="right">';
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index b80c581b85b..f7bb0ce0c60 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -83,7 +83,7 @@ if (!$socid) {
 
 // Generate list of companies
 if (! $socid) {
-	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+	echo json_encode(array('nom' => 'ErrorBadParameter', 'label' => 'ErrorBadParameter', 'key' => 'ErrorBadParameter', 'value' => 'ErrorBadParameter'));
 	exit;
 }
 
@@ -147,6 +147,7 @@ if ($resql) {
 		if ($socid) {
 			$label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
 		}
+		$row_array = array();
 		$row_array['label'] = $label;
 
 		$row_array['value'] = $row['nom'];
@@ -175,5 +176,5 @@ if ($resql) {
 
 	echo json_encode($return_arr);
 } else {
-	echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+	echo json_encode(array('nom' => 'Error', 'label' => 'Error', 'key' => 'Error', 'value' => 'Error'));
 }
diff --git a/htdocs/societe/checkvat/checkVatGr.php b/htdocs/societe/checkvat/checkVatGr.php
index ac94cb9dadc..15c8e65a590 100644
--- a/htdocs/societe/checkvat/checkVatGr.php
+++ b/htdocs/societe/checkvat/checkVatGr.php
@@ -76,6 +76,7 @@ function checkVATGR($username, $password, $AFMcalledby, $AFMcalledfor)
 	$authHeader->UsernameToken = new stdClass();
 	$authHeader->UsernameToken->Username = "$username";
 	$authHeader->UsernameToken->Password = "$password";
+	$Headers = array();
 	$Headers[] = new SoapHeader('https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd', 'Security', $authHeader, true);
 	$client->__setSoapHeaders($Headers);
 	$result = $client->rgWsPublicAfmMethod(
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 8a828fb6c39..506810c806d 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -99,7 +99,7 @@ $hookmanager->initHooks(array('consumptionthirdparty', 'globalcard'));
  * Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -168,6 +168,7 @@ if ($object->client) {
 
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
+	$thirdTypeArray = array();
 	$thirdTypeArray['customer'] = $langs->trans("customer");
 	if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index f5ca849233e..3029aa323a7 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -718,6 +718,7 @@ if (empty($reshook)) {
 			} else {
 				try {
 					$stripesup = \Stripe\Account::retrieve($newsup);
+					$tokenstring = array();
 					$tokenstring['stripe_user_id'] = $stripesup->id;
 					$tokenstring['type'] = $stripesup->type;
 					$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
@@ -971,6 +972,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		$obj = $db->fetch_object($resql);
 		$nbFactsClient = $obj->nb;
+		$thirdTypeArray = array();
+		$elementTypeArray = array();
 		$thirdTypeArray['customer'] = $langs->trans("customer");
 		if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 984bed16d5c..9c074307e31 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -742,6 +742,7 @@ if (empty($reshook)) {
 					$ldap_mobile = $attribute[getDolGlobalString('LDAP_FIELD_MOBILE')];
 					$ldap_mail = $attribute[getDolGlobalString('LDAP_FIELD_MAIL')];
 					$ldap_sid = $attribute[getDolGlobalString('LDAP_FIELD_SID')];
+					$ldap_social = array();
 
 					if (isModEnabled('socialnetworks')) {
 						$arrayofsocialnetworks = array('skype', 'twitter', 'facebook', 'linkedin');
diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 78e183d2a95..48a3f73e2a4 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -439,6 +439,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</tr>\n";
 
 		clearstatcache();
+		$filelist = array();
 
 		foreach ($dirmodels as $reldir) {
 			foreach (array('', '/doc') as $valdir) {
@@ -473,7 +474,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php
index 4b4fd15bfb0..524c4e99548 100644
--- a/htdocs/webportal/class/html.formlistwebportal.class.php
+++ b/htdocs/webportal/class/html.formlistwebportal.class.php
@@ -581,12 +581,12 @@ class FormListWebPortal
 			if ($elementEn == 'invoice') {
 				// store company
 				$idCompany = (int) $obj->fk_soc;
-				if (!isset($companyStaticList[$obj->fk_soc])) {
+				if (!isset($this->companyStaticList[$obj->fk_soc])) {
 					$companyStatic = new Societe($this->db);
 					$companyStatic->fetch($idCompany);
-					$companyStaticList[$idCompany] = $companyStatic;
+					$this->companyStaticList[$idCompany] = $companyStatic;
 				}
-				$companyStatic = $companyStaticList[$obj->fk_soc];
+				$companyStatic = $this->companyStaticList[$obj->fk_soc];
 
 				// paid sum
 				$payment = $object->getSommePaiement();
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 0bf215eb94e..388fe0392c2 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -78,11 +78,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'password' => array('name'=>'password', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+		'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'password' => array('name' => 'password', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
 	)
 );
 
@@ -94,44 +94,44 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+		'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+		'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 	)
 );
 
 $contact_fields = array(
-	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-	'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
-	'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
-	'address' => array('name'=>'address', 'type'=>'xsd:string'),
-	'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
-	'town' => array('name'=>'town', 'type'=>'xsd:string'),
-	'state_id' => array('name'=>'state_id', 'type'=>'xsd:string'),
-	'state_code' => array('name'=>'state_code', 'type'=>'xsd:string'),
-	'state' => array('name'=>'state', 'type'=>'xsd:string'),
-	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-	'country' => array('name'=>'country', 'type'=>'xsd:string'),
-	'socid' => array('name'=>'socid', 'type'=>'xsd:string'),
-	'status' => array('name'=>'status', 'type'=>'xsd:string'),
-	'phone_pro' => array('name'=>'phone_pro', 'type'=>'xsd:string'),
-	'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
-	'phone_perso' => array('name'=>'phone_perso', 'type'=>'xsd:string'),
-	'phone_mobile' => array('name'=>'phone_mobile', 'type'=>'xsd:string'),
-	'code' => array('name'=>'code', 'type'=>'xsd:string'),
-	'email' => array('name'=>'email', 'type'=>'xsd:string'),
-	'birthday' => array('name'=>'birthday', 'type'=>'xsd:string'),
-	'default_lang' => array('name'=>'default_lang', 'type'=>'xsd:string'),
-	'note' => array('name'=>'note', 'type'=>'xsd:string'),
-	'ref_facturation' => array('name'=>'ref_facturation', 'type'=>'xsd:string'),
-	'ref_contrat' => array('name'=>'ref_contrat', 'type'=>'xsd:string'),
-	'ref_commande' => array('name'=>'ref_commande', 'type'=>'xsd:string'),
-	'ref_propal' => array('name'=>'ref_propal', 'type'=>'xsd:string'),
-	'user_id' => array('name'=>'user_id', 'type'=>'xsd:string'),
-	'user_login' => array('name'=>'user_login', 'type'=>'xsd:string'),
-	'civility_id' => array('name'=>'civility_id', 'type'=>'xsd:string'),
-	'poste' => array('name'=>'poste', 'type'=>'xsd:string')
+	'id' => array('name' => 'id', 'type' => 'xsd:string'),
+	'ref_ext' => array('name' => 'ref_ext', 'type' => 'xsd:string'),
+	'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
+	'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+	'address' => array('name' => 'address', 'type' => 'xsd:string'),
+	'zip' => array('name' => 'zip', 'type' => 'xsd:string'),
+	'town' => array('name' => 'town', 'type' => 'xsd:string'),
+	'state_id' => array('name' => 'state_id', 'type' => 'xsd:string'),
+	'state_code' => array('name' => 'state_code', 'type' => 'xsd:string'),
+	'state' => array('name' => 'state', 'type' => 'xsd:string'),
+	'country_id' => array('name' => 'country_id', 'type' => 'xsd:string'),
+	'country_code' => array('name' => 'country_code', 'type' => 'xsd:string'),
+	'country' => array('name' => 'country', 'type' => 'xsd:string'),
+	'socid' => array('name' => 'socid', 'type' => 'xsd:string'),
+	'status' => array('name' => 'status', 'type' => 'xsd:string'),
+	'phone_pro' => array('name' => 'phone_pro', 'type' => 'xsd:string'),
+	'fax' => array('name' => 'fax', 'type' => 'xsd:string'),
+	'phone_perso' => array('name' => 'phone_perso', 'type' => 'xsd:string'),
+	'phone_mobile' => array('name' => 'phone_mobile', 'type' => 'xsd:string'),
+	'code' => array('name' => 'code', 'type' => 'xsd:string'),
+	'email' => array('name' => 'email', 'type' => 'xsd:string'),
+	'birthday' => array('name' => 'birthday', 'type' => 'xsd:string'),
+	'default_lang' => array('name' => 'default_lang', 'type' => 'xsd:string'),
+	'note' => array('name' => 'note', 'type' => 'xsd:string'),
+	'ref_facturation' => array('name' => 'ref_facturation', 'type' => 'xsd:string'),
+	'ref_contrat' => array('name' => 'ref_contrat', 'type' => 'xsd:string'),
+	'ref_commande' => array('name' => 'ref_commande', 'type' => 'xsd:string'),
+	'ref_propal' => array('name' => 'ref_propal', 'type' => 'xsd:string'),
+	'user_id' => array('name' => 'user_id', 'type' => 'xsd:string'),
+	'user_login' => array('name' => 'user_login', 'type' => 'xsd:string'),
+	'civility_id' => array('name' => 'civility_id', 'type' => 'xsd:string'),
+	'poste' => array('name' => 'poste', 'type' => 'xsd:string')
 	//...
 );
 
@@ -155,7 +155,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 			$type = 'xsd:string';
 		}
 
-		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		$extrafield_array['options_'.$key] = array('name' => 'options_'.$key, 'type' => $type);
 	}
 }
 if (is_array($extrafield_array)) {
@@ -203,9 +203,9 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getContact',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'contact'=>'tns:contact'),
+	array('result' => 'tns:result', 'contact' => 'tns:contact'),
 	$ns,
 	$ns.'#getContact',
 	$styledoc,
@@ -217,9 +217,9 @@ $server->register(
 $server->register(
 	'createContact',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'contact'=>'tns:contact'),
+	array('authentication' => 'tns:authentication', 'contact' => 'tns:contact'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#createContact',
 	$styledoc,
@@ -230,9 +230,9 @@ $server->register(
 $server->register(
 	'getContactsForThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'idthirdparty' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'contacts'=>'tns:ContactsArray2'),
+	array('result' => 'tns:result', 'contacts' => 'tns:ContactsArray2'),
 	$ns,
 	$ns.'#getContactsForThirdParty',
 	$styledoc,
@@ -244,9 +244,9 @@ $server->register(
 $server->register(
 	'updateContact',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'contact'=>'tns:contact'),
+	array('authentication' => 'tns:authentication', 'contact' => 'tns:contact'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#updateContact',
 	$styledoc,
@@ -349,8 +349,8 @@ function getContact($authentication, $id, $ref_ext)
 
 				// Create
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'contact'=>$contact_result_fields
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'contact' => $contact_result_fields
 				);
 			} else {
 				$error++;
@@ -365,7 +365,7 @@ function getContact($authentication, $id, $ref_ext)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -465,7 +465,7 @@ function createContact($authentication, $contact)
 
 		if (!$error) {
 			$db->commit();
-			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+			$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''), 'id' => $newobject->id, 'ref' => $newobject->ref);
 		} else {
 			$db->rollback();
 			$error++;
@@ -475,7 +475,7 @@ function createContact($authentication, $contact)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -533,6 +533,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 
 		$resql = $db->query($sql);
 		if ($resql) {
+			$linescontact = array();
 			$num = $db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
@@ -590,8 +591,8 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 			}
 
 			$objectresp = array(
-			'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			'contacts'=>$linescontact
+				'result' => array('result_code' => 'OK', 'result_label' => ''),
+				'contacts' => $linescontact
 
 			);
 		} else {
@@ -602,7 +603,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -709,8 +710,8 @@ function updateContact($authentication, $contact)
 		if ((!$error) && ($objectfound)) {
 			$db->commit();
 			$objectresp = array(
-			'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			'id'=>$object->id
+			'result' => array('result_code' => 'OK', 'result_label' => ''),
+			'id' => $object->id
 			);
 		} elseif ($objectfound) {
 			$db->rollback();
@@ -725,7 +726,7 @@ function updateContact($authentication, $contact)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index fb749bd6a4c..2d1e9d9fefc 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -116,20 +116,20 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
 
 $arrayfields['wug.fk_usergroup'] = array(
-	'label'=>$langs->trans('UserGroups'),
-	'checked'=>(($visible < 0) ? 0 : 1),
-	'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-	'position'=>1000,
+	'label' => $langs->trans('UserGroups'),
+	'checked' => (($visible < 0) ? 0 : 1),
+	'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+	'position' => 1000,
 	'help' => empty($val['help']) ? '' : $val['help'],
 	'csslist' => 'minwidth100'
 );
@@ -189,7 +189,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
-		$groups = $resources=array();
+		$groups = $resources = array();
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -229,6 +229,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
@@ -245,10 +246,10 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 }
 if (!empty($groups)) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_usergroup wug ON (wug.fk_workstation = t.rowid)';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_usergroup wug ON (wug.fk_workstation = t.rowid)';
 }
 if (!empty($resources)) {
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_resource wr ON (wr.fk_workstation = t.rowid)';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_resource wr ON (wr.fk_workstation = t.rowid)';
 }
 // Add table from hooks
 $parameters = array();
@@ -296,12 +297,12 @@ if ($search_all) {
 
 // usergroups
 if (!empty($groups)) {
-	$sql.= ' AND wug.fk_usergroup IN('.$db->sanitize(implode(',', $groups)).')';
+	$sql .= ' AND wug.fk_usergroup IN('.$db->sanitize(implode(',', $groups)).')';
 }
 
 // resources
 if (!empty($resources)) {
-	$sql.= ' AND wr.fk_resource IN('.$db->sanitize(implode(',', $resources)).')';
+	$sql .= ' AND wr.fk_resource IN('.$db->sanitize(implode(',', $resources)).')';
 }
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -310,13 +311,14 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql.= " GROUP BY ";
+$sql .= " GROUP BY ";
 foreach ($object->fields as $key => $val) {
 	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
 }
@@ -444,8 +446,8 @@ print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/workstation/workstation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -563,7 +565,7 @@ if (!empty($arrayfields['wr.fk_resource']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -617,7 +619,7 @@ if (!empty($arrayfields['wr.fk_resource']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -660,7 +662,7 @@ while ($i < $imaxinloop) {
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr class="trkanban"><td colspan="'.($savnbfield+1).'">';
+			print '<tr class="trkanban"><td colspan="'.($savnbfield + 1).'">';
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
@@ -787,7 +789,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -829,7 +831,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 195e1aca449273a7657fe6dd9e0e92f6179fe2d2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:29 +0100
Subject: [PATCH 0603/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 8523baecacc..dbe02a3ff02 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -129,7 +129,7 @@ $tabrowid[31] = "";
 
 // List of help for fields
 $tabhelp = array();
-$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
+$tabhelp[31] = array('pcg_version' => $langs->trans("EnterAnyCode"));
 
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
@@ -241,7 +241,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$result = $db->query($sql);
 		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+			$_POST = array('id' => $id); // Clean $_POST array, we keep only
 		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -353,7 +353,7 @@ print load_fiche_titre($titre, $linkback, 'title_accountancy');
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.urlencode($page).'&' : '').'sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder).'&rowid='.urlencode($rowid).'&code='.urlencode($code).'&id='.urlencode($id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.urlencode((string) ($page)).'&' : '').'sortfield='.urlencode((string) ($sortfield)).'&sortorder='.urlencode((string) ($sortorder)).'&rowid='.urlencode((string) ($rowid)).'&code='.urlencode((string) ($code)).'&id='.urlencode((string) ($id)), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -458,7 +458,7 @@ if ($id) {
 		}
 
 		$tmpaction = 'create';
-		$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+		$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 		$error = $hookmanager->error;
 		$errors = $hookmanager->errors;
@@ -486,9 +486,9 @@ if ($id) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-		$param = '&id='.urlencode($id);
+		$param = '&id='.urlencode((string) ($id));
 		if ($search_country_id > 0) {
-			$param .= '&search_country_id='.urlencode($search_country_id);
+			$param .= '&search_country_id='.urlencode((string) ($search_country_id));
 		}
 		$paramwithsearch = $param;
 		if ($sortorder) {
@@ -556,7 +556,7 @@ if ($id) {
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 
 					$tmpaction = 'edit';
-					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 					$error = $hookmanager->error;
 					$errors = $hookmanager->errors;
@@ -571,7 +571,7 @@ if ($id) {
 					print '</td>';
 				} else {
 					$tmpaction = 'view';
-					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error;
@@ -718,7 +718,7 @@ function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context
 				print '<td>';
 			}
 			if ($fieldlist[$field] == 'type_cdr') {
-				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
+				print $form->selectarray($fieldlist[$field], array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
 			} else {
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''), 1);
 			}

From fc9e9f1c54c6edf0d9e225ed2bdca02492a68397 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:32 +0100
Subject: [PATCH 0604/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 032b3ac6e3e..18d793fc43e 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -461,7 +461,7 @@ $fieldlist = explode(',', $tabfield[$id]);
 
 $param = '&id='.$id;
 if ($search_country_id > 0) {
-	$param .= '&search_country_id='.urlencode($search_country_id);
+	$param .= '&search_country_id='.urlencode((string) ($search_country_id));
 }
 $paramwithsearch = $param;
 if ($sortorder) {
@@ -474,7 +474,7 @@ if (GETPOST('from', 'alpha')) {
 	$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
 }
 if ($listlimit) {
-	$paramwithsearch .= '&listlimit='.urlencode(GETPOSTINT('listlimit'));
+	$paramwithsearch .= '&listlimit='.urlencode((string) (GETPOSTINT('listlimit')));
 }
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';

From 1222809671eed03387088fa3672610d2022cb357 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:34 +0100
Subject: [PATCH 0605/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 1b12d17df07..d710839a391 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -481,7 +481,7 @@ if ($id) {
 
 		$param = '&id='.((int) $id);
 		if ($search_country_id > 0) {
-			$param .= '&search_country_id='.urlencode($search_country_id);
+			$param .= '&search_country_id='.urlencode((string) ($search_country_id));
 		}
 		$paramwithsearch = $param;
 		if ($sortorder) {

From 431c85816c20a5f7e1def92cc102b77a2d1bd991 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:36 +0100
Subject: [PATCH 0606/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index fa0db20a05f..74dd948998b 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -422,7 +422,7 @@ if ($resql) {
 		$param .= '&limit='.((int) $limit);
 	}
 	if ($searchCategoryProductOperator == 1) {
-		$param .= "&search_category_product_operator=".urlencode($searchCategoryProductOperator);
+		$param .= "&search_category_product_operator=".urlencode((string) ($searchCategoryProductOperator));
 	}
 	foreach ($searchCategoryProductList as $searchCategoryProduct) {
 		$param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);

From 4df2f2e39dd8b2daf55aeaba26bc409f8aa9b156 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:38 +0100
Subject: [PATCH 0607/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 66838b8c2e2..e2f1e86008d 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -447,7 +447,7 @@ if ($action == 'create') {
 		print $langs->trans('Docdate');
 		print '</td>';
 		if ($action != 'editdate') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode((string) ($object->piece_num)).'&mode='.urlencode((string) ($mode)).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
@@ -474,7 +474,7 @@ if ($action == 'create') {
 		print $langs->trans('Codejournal');
 		print '</td>';
 		if ($action != 'editjournal') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode((string) ($object->piece_num)).'&mode='.urlencode((string) ($mode)).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -501,7 +501,7 @@ if ($action == 'create') {
 		print $langs->trans('Piece');
 		print '</td>';
 		if ($action != 'editdocref') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode((string) ($object->piece_num)).'&mode='.urlencode((string) ($mode)).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';

From c6de5680bf4195af5f005689cadeccfdd53ef6ff Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:40 +0100
Subject: [PATCH 0608/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/bookkeeping/export.php | 54 +++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 6f3c34b279e..acd0fceb211 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -189,21 +189,21 @@ if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GE
 
 
 $arrayfields = array(
-	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
-	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
-	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
-	't.numero_compte'=>array('label'=>$langs->trans("AccountAccountingShort"), 'checked'=>1),
-	't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	't.debit'=>array('label'=>$langs->trans("AccountingDebit"), 'checked'=>1),
-	't.credit'=>array('label'=>$langs->trans("AccountingCredit"), 'checked'=>1),
-	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
-	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
-	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
-	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
-	't.date_validated'=>array('label'=>$langs->trans("DateValidationAndLock"), 'checked'=>1, 'enabled'=>!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
-	't.import_key'=>array('label'=>$langs->trans("ImportId"), 'checked'=>0, 'position'=>1100),
+	't.piece_num' => array('label' => $langs->trans("TransactionNumShort"), 'checked' => 1),
+	't.code_journal' => array('label' => $langs->trans("Codejournal"), 'checked' => 1),
+	't.doc_date' => array('label' => $langs->trans("Docdate"), 'checked' => 1),
+	't.doc_ref' => array('label' => $langs->trans("Piece"), 'checked' => 1),
+	't.numero_compte' => array('label' => $langs->trans("AccountAccountingShort"), 'checked' => 1),
+	't.subledger_account' => array('label' => $langs->trans("SubledgerAccount"), 'checked' => 1),
+	't.label_operation' => array('label' => $langs->trans("Label"), 'checked' => 1),
+	't.debit' => array('label' => $langs->trans("AccountingDebit"), 'checked' => 1),
+	't.credit' => array('label' => $langs->trans("AccountingCredit"), 'checked' => 1),
+	't.lettering_code' => array('label' => $langs->trans("LetteringCode"), 'checked' => 1),
+	't.date_creation' => array('label' => $langs->trans("DateCreation"), 'checked' => 0),
+	't.tms' => array('label' => $langs->trans("DateModification"), 'checked' => 0),
+	't.date_export' => array('label' => $langs->trans("DateExport"), 'checked' => 1),
+	't.date_validated' => array('label' => $langs->trans("DateValidationAndLock"), 'checked' => 1, 'enabled' => !getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
+	't.import_key' => array('label' => $langs->trans("ImportId"), 'checked' => 0, 'position' => 1100),
 );
 
 if (!getDolGlobalString('ACCOUNTING_ENABLE_LETTERING')) {
@@ -244,7 +244,7 @@ if (!GETPOST('confirmmassaction', 'alpha')) {
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -353,7 +353,7 @@ if (empty($reshook)) {
 			}
 		}
 		$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
-		$param .= '&search_account_category='.urlencode($search_account_category);
+		$param .= '&search_account_category='.urlencode((string) ($search_account_category));
 	}
 	if (!empty($search_accountancy_code)) {
 		$filter['t.numero_compte'] = $search_accountancy_code;
@@ -395,7 +395,7 @@ if (empty($reshook)) {
 	}
 	if (!empty($search_mvt_num)) {
 		$filter['t.piece_num'] = $search_mvt_num;
-		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+		$param .= '&search_mvt_num='.urlencode((string) ($search_mvt_num));
 	}
 	if (!empty($search_date_creation_start)) {
 		$filter['t.date_creation>='] = $search_date_creation_start;
@@ -758,7 +758,7 @@ $arrayofselected = is_array($toselect) ? $toselect : array();
 
 // Output page
 // --------------------------------------------------------------------
-$help_url ='EN:Module_Double_Entry_Accounting#Exports|FR:Module_Comptabilit&eacute;_en_Partie_Double#Exports';
+$help_url = 'EN:Module_Double_Entry_Accounting#Exports|FR:Module_Comptabilit&eacute;_en_Partie_Double#Exports';
 
 llxHeader('', $title_page, $help_url);
 
@@ -776,7 +776,7 @@ if ($action == 'export_file') {
 		'morecss' => 'minwidth200 maxwidth200'
 	);
 
-	$form_question['separator0'] = array('name'=>'separator0', 'type'=>'separator');
+	$form_question['separator0'] = array('name' => 'separator0', 'type' => 'separator');
 
 	if (getDolGlobalInt("ACCOUNTING_ENABLE_LETTERING")) {
 		// If 1, we check by default.
@@ -788,7 +788,7 @@ if ($action == 'export_file') {
 			'value' => $checked,
 		);
 
-		$form_question['separator1'] = array('name'=>'separator1', 'type'=>'separator');
+		$form_question['separator1'] = array('name' => 'separator1', 'type' => 'separator');
 	}
 
 	// If 1 or not set, we check by default.
@@ -800,7 +800,7 @@ if ($action == 'export_file') {
 		'value' => (getDolGlobalString('ACCOUNTING_DEFAULT_NOT_NOTIFIED_EXPORT_DATE') ? 'false' : 'true'),
 	);
 
-	$form_question['separator2'] = array('name'=>'separator2', 'type'=>'separator');
+	$form_question['separator2'] = array('name' => 'separator2', 'type' => 'separator');
 
 	if (!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
 		// If 0 or not set, we NOT check by default.
@@ -812,7 +812,7 @@ if ($action == 'export_file') {
 			'value' => $checked,
 		);
 
-		$form_question['separator3'] = array('name'=>'separator3', 'type'=>'separator');
+		$form_question['separator3'] = array('name' => 'separator3', 'type' => 'separator');
 	}
 
 	// add documents in an archive for accountancy export (Quadratus)
@@ -1016,7 +1016,7 @@ if (!empty($arrayfields['t.lettering_code']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -1113,7 +1113,7 @@ if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$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
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.date_creation']['checked'])) {
@@ -1363,7 +1363,7 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -1442,7 +1442,7 @@ if ($num == 0) {
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 1cc4a8de0f14e0cc23a2bc5cddaaeffe48f2d822 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:43 +0100
Subject: [PATCH 0609/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/bookkeeping/list.php | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 06921fc9d38..cd17fd8d40e 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -184,21 +184,21 @@ if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('beg
 
 
 $arrayfields = array(
-	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
-	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
-	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
-	't.numero_compte'=>array('label'=>$langs->trans("AccountAccountingShort"), 'checked'=>1),
-	't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	't.debit'=>array('label'=>$langs->trans("AccountingDebit"), 'checked'=>1),
-	't.credit'=>array('label'=>$langs->trans("AccountingCredit"), 'checked'=>1),
-	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
-	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
-	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
-	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>0),
-	't.date_validated'=>array('label'=>$langs->trans("DateValidationAndLock"), 'checked'=>0, 'enabled'=>!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
-	't.import_key'=>array('label'=>$langs->trans("ImportId"), 'checked'=>0, 'position'=>1100),
+	't.piece_num' => array('label' => $langs->trans("TransactionNumShort"), 'checked' => 1),
+	't.code_journal' => array('label' => $langs->trans("Codejournal"), 'checked' => 1),
+	't.doc_date' => array('label' => $langs->trans("Docdate"), 'checked' => 1),
+	't.doc_ref' => array('label' => $langs->trans("Piece"), 'checked' => 1),
+	't.numero_compte' => array('label' => $langs->trans("AccountAccountingShort"), 'checked' => 1),
+	't.subledger_account' => array('label' => $langs->trans("SubledgerAccount"), 'checked' => 1),
+	't.label_operation' => array('label' => $langs->trans("Label"), 'checked' => 1),
+	't.debit' => array('label' => $langs->trans("AccountingDebit"), 'checked' => 1),
+	't.credit' => array('label' => $langs->trans("AccountingCredit"), 'checked' => 1),
+	't.lettering_code' => array('label' => $langs->trans("LetteringCode"), 'checked' => 1),
+	't.date_creation' => array('label' => $langs->trans("DateCreation"), 'checked' => 0),
+	't.tms' => array('label' => $langs->trans("DateModification"), 'checked' => 0),
+	't.date_export' => array('label' => $langs->trans("DateExport"), 'checked' => 0),
+	't.date_validated' => array('label' => $langs->trans("DateValidationAndLock"), 'checked' => 0, 'enabled' => !getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
+	't.import_key' => array('label' => $langs->trans("ImportId"), 'checked' => 0, 'position' => 1100),
 );
 
 if (!getDolGlobalString('ACCOUNTING_ENABLE_LETTERING')) {
@@ -232,7 +232,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'preunletteringauto
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -341,7 +341,7 @@ if (empty($reshook)) {
 			}
 		}
 		$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
-		$param .= '&search_account_category='.urlencode($search_account_category);
+		$param .= '&search_account_category='.urlencode((string) ($search_account_category));
 	}
 	if (!empty($search_accountancy_code)) {
 		$filter['t.numero_compte'] = $search_accountancy_code;
@@ -383,7 +383,7 @@ if (empty($reshook)) {
 	}
 	if (!empty($search_mvt_num)) {
 		$filter['t.piece_num'] = $search_mvt_num;
-		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+		$param .= '&search_mvt_num='.urlencode((string) ($search_mvt_num));
 	}
 	if (!empty($search_date_creation_start)) {
 		$filter['t.date_creation>='] = $search_date_creation_start;
@@ -916,7 +916,7 @@ if (!empty($arrayfields['t.lettering_code']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -1013,7 +1013,7 @@ if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$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
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.date_creation']['checked'])) {
@@ -1263,7 +1263,7 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -1342,7 +1342,7 @@ if ($num == 0) {
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From f519faa2610a0ef7549edeec15e33a43e04099d0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:45 +0100
Subject: [PATCH 0610/1862] Fix: Ensure string type for urlencode()

---
 .../accountancy/bookkeeping/listbyaccount.php | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 4a39d78e5ef..40b7599040c 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -159,18 +159,18 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 
 $arrayfields = array(
 	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
-	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
-	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
-	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	't.lettering_code'=>array('label'=>$langs->trans("Lettering"), 'checked'=>1),
-	't.debit'=>array('label'=>$langs->trans("AccountingDebit"), 'checked'=>1),
-	't.credit'=>array('label'=>$langs->trans("AccountingCredit"), 'checked'=>1),
-	't.balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1),
-	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>-1),
-	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>-1, 'enabled'=>!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
-	't.import_key'=>array('label'=>$langs->trans("ImportId"), 'checked'=>-1, 'position'=>1100),
+	't.piece_num' => array('label' => $langs->trans("TransactionNumShort"), 'checked' => 1),
+	't.code_journal' => array('label' => $langs->trans("Codejournal"), 'checked' => 1),
+	't.doc_date' => array('label' => $langs->trans("Docdate"), 'checked' => 1),
+	't.doc_ref' => array('label' => $langs->trans("Piece"), 'checked' => 1),
+	't.label_operation' => array('label' => $langs->trans("Label"), 'checked' => 1),
+	't.lettering_code' => array('label' => $langs->trans("Lettering"), 'checked' => 1),
+	't.debit' => array('label' => $langs->trans("AccountingDebit"), 'checked' => 1),
+	't.credit' => array('label' => $langs->trans("AccountingCredit"), 'checked' => 1),
+	't.balance' => array('label' => $langs->trans("Balance"), 'checked' => 1),
+	't.date_export' => array('label' => $langs->trans("DateExport"), 'checked' => -1),
+	't.date_validated' => array('label' => $langs->trans("DateValidation"), 'checked' => -1, 'enabled' => !getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
+	't.import_key' => array('label' => $langs->trans("ImportId"), 'checked' => -1, 'position' => 1100),
 );
 
 if (!getDolGlobalString('ACCOUNTING_ENABLE_LETTERING')) {
@@ -217,7 +217,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'preunletteringauto
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -296,7 +296,7 @@ if (empty($reshook)) {
 			}
 		}
 		$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
-		$param .= '&search_account_category='.urlencode($search_account_category);
+		$param .= '&search_account_category='.urlencode((string) ($search_account_category));
 	}
 	if (!empty($search_accountancy_code_start)) {
 		if ($type == 'sub') {
@@ -320,7 +320,7 @@ if (empty($reshook)) {
 	}
 	if (!empty($search_mvt_num)) {
 		$filter['t.piece_num'] = $search_mvt_num;
-		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+		$param .= '&search_mvt_num='.urlencode((string) ($search_mvt_num));
 	}
 	if (!empty($search_doc_ref)) {
 		$filter['t.doc_ref'] = $search_doc_ref;
@@ -897,7 +897,7 @@ if (!empty($arrayfields['t.import_key']['checked'])) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -951,7 +951,7 @@ if (!empty($arrayfields['t.import_key']['checked'])) {
 	print_liste_field_titre($arrayfields['t.import_key']['label'], $_SERVER["PHP_SELF"], "t.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$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
 print $hookmanager->resPrint;
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1071,7 +1071,7 @@ while ($i < min($num, $limit)) {
 
 		// Show the break account
 		print '<tr class="trforbreak">';
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : count($arrayfields)+1).'" class="tdforbreak">';
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : count($arrayfields) + 1).'" class="tdforbreak">';
 		if ($type == 'sub') {
 			if ($line->subledger_account != "" && $line->subledger_account != '-1') {
 				print empty($line->subledger_label) ? '<span class="error">'.$langs->trans("Unknown").'</span>' : $line->subledger_label;
@@ -1227,7 +1227,7 @@ while ($i < min($num, $limit)) {
 		if (strlen(length_accounta($line->subledger_account)) == 0) {
 			print '<td class="small tdoverflowmax350 classfortooltip" title="'.dol_escape_htmltag($line->label_operation).'">'.dol_escape_htmltag($line->label_operation).'</td>';
 		} else {
-			print '<td class="small tdoverflowmax350 classfortooltip" title="'.dol_escape_htmltag($line->label_operation.($line->label_operation?'<br>':'').'<span style="font-size:0.8em">('.length_accounta($line->subledger_account).')').'">'.dol_escape_htmltag($line->label_operation).($line->label_operation?'<br>':'').'<span style="font-size:0.8em">('.dol_escape_htmltag(length_accounta($line->subledger_account)).')</span></td>';
+			print '<td class="small tdoverflowmax350 classfortooltip" title="'.dol_escape_htmltag($line->label_operation.($line->label_operation ? '<br>' : '').'<span style="font-size:0.8em">('.length_accounta($line->subledger_account).')').'">'.dol_escape_htmltag($line->label_operation).($line->label_operation ? '<br>' : '').'<span style="font-size:0.8em">('.dol_escape_htmltag(length_accounta($line->subledger_account)).')</span></td>';
 		}
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1302,7 +1302,7 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$line);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $line);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -1387,7 +1387,7 @@ if ($num == 0) {
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 8a863da25665d665d252c4889505544720675ba5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:47 +0100
Subject: [PATCH 0611/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 500fd4a7543..1f954f6a9ad 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -501,7 +501,7 @@ class AccountingAccount extends CommonObject
 			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . urlencode($this->account_number) . '&search_accountancy_code_end=' . urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
-			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . urlencode($this->id);
+			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . urlencode((string) ($this->id));
 			$labelurl = $langs->trans("ShowAccountingAccount");
 		}
 
@@ -570,7 +570,7 @@ class AccountingAccount extends CommonObject
 		}
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -745,7 +745,7 @@ class AccountingAccount extends CommonObject
 		$hookmanager->initHooks(array('accountancyBindingCalculation'));
 
 		// Execute hook accountancyBindingCalculation
-		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount'=>$accountingAccount, $type);
+		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount' => $accountingAccount, $type);
 		$reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
 
 		if (empty($reshook)) {

From e47403cb3b3daf5cb498f2143b04496d1f119577 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:49 +0100
Subject: [PATCH 0612/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/customer/lines.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 2aaed4ba014..a47a54ae40c 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -351,22 +351,22 @@ if ($result) {
 		$param .= "&search_vat=".urlencode($search_vat);
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_country) {
 		$param .= "&search_country=".urlencode($search_country);

From a2936016cb2c09d4542843d65658f4d634a47926 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:51 +0100
Subject: [PATCH 0613/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/customer/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index e7487c70e0f..84128d37f94 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -399,25 +399,25 @@ if ($result) {
 		$param .= '&search_societe='.urlencode($search_societe);
 	}
 	if ($search_lineid) {
-		$param .= '&search_lineid='.urlencode($search_lineid);
+		$param .= '&search_lineid='.urlencode((string) ($search_lineid));
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_invoice) {
 		$param .= '&search_invoice='.urlencode($search_invoice);

From 8e643dfb68592df93b5b7ae237447071fefe13cb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:54 +0100
Subject: [PATCH 0614/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/expensereport/lines.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 11602a58f1f..60f08f4992d 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -279,22 +279,22 @@ if ($result) {
 		$param .= "&search_vat=".urlencode($search_vat);
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";

From e601eb1d9461715cbfaf8f8101a85740cbe1804d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:56 +0100
Subject: [PATCH 0615/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/expensereport/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 73d9dd96cb1..9bb346e153a 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -327,22 +327,22 @@ if ($result) {
 		$param .= '&search_lineid='.urlencode($search_lineid);
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_expensereport) {
 		$param .= '&search_expensereport='.urlencode($search_expensereport);

From b99710144126f82bbbb4e6f086e572ffd9224510 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:47:58 +0100
Subject: [PATCH 0616/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/supplier/lines.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 09c7aca7af7..16d1d3d0202 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -359,22 +359,22 @@ if ($result) {
 		$param .= "&search_vat=".urlencode($search_vat);
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_country) {
 		$param .= "&search_country=".urlencode($search_country);

From 127af1cf60ba3616735cf9dafa771b231491a72a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:00 +0100
Subject: [PATCH 0617/1862] Fix: Ensure string type for urlencode()

---
 htdocs/accountancy/supplier/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index db16688ff31..b086cdd1914 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -403,25 +403,25 @@ if ($result) {
 		$param .= '&search_societe='.urlencode($search_societe);
 	}
 	if ($search_lineid) {
-		$param .= '&search_lineid='.urlencode($search_lineid);
+		$param .= '&search_lineid='.urlencode((string) ($search_lineid));
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_invoice) {
 		$param .= '&search_invoice='.urlencode($search_invoice);

From da0b05c15e7d862811760e794e2ba2fc03f54b1c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:03 +0100
Subject: [PATCH 0618/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7ce26e570c7..e8d85f21c76 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -670,7 +670,7 @@ if ($search_email) {
 	$param .= "&search_email=".urlencode($search_email);
 }
 if ($search_categ > 0 || $search_categ == -2) {
-	$param .= "&search_categ=".urlencode($search_categ);
+	$param .= "&search_categ=".urlencode((string) ($search_categ));
 }
 if ($search_company) {
 	$param .= "&search_company=".urlencode($search_company);

From 51373075de205263467a1eaa45d5557fd74e37e7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:07 +0100
Subject: [PATCH 0619/1862] Fix: Ensure string type for urlencode()

---
 htdocs/adherents/subscription/list.php | 44 +++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index efd6c1b1c47..3a99f379502 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -89,20 +89,20 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 $fieldstosearchall = array(
 );
 $arrayfields = array(
-	'd.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'd.fk_type'=>array('label'=>"Type", 'checked'=>1),
-	'd.lastname'=>array('label'=>"Lastname", 'checked'=>1),
-	'd.firstname'=>array('label'=>"Firstname", 'checked'=>1),
-	'd.login'=>array('label'=>"Login", 'checked'=>1),
-	't.libelle'=>array('label'=>"Label", 'checked'=>1),
-	'd.bank'=>array('label'=>"BankAccount", 'checked'=>1, 'enabled'=>(isModEnabled('bank'))),
+	'd.ref' => array('label' => "Ref", 'checked' => 1),
+	'd.fk_type' => array('label' => "Type", 'checked' => 1),
+	'd.lastname' => array('label' => "Lastname", 'checked' => 1),
+	'd.firstname' => array('label' => "Firstname", 'checked' => 1),
+	'd.login' => array('label' => "Login", 'checked' => 1),
+	't.libelle' => array('label' => "Label", 'checked' => 1),
+	'd.bank' => array('label' => "BankAccount", 'checked' => 1, 'enabled' => (isModEnabled('bank'))),
 	/*'d.note_public'=>array('label'=>"NotePublic", 'checked'=>0),
 	 'd.note_private'=>array('label'=>"NotePrivate", 'checked'=>0),*/
-	'c.dateadh'=>array('label'=>"DateSubscription", 'checked'=>1, 'position'=>100),
-	'c.datef'=>array('label'=>"EndSubscription", 'checked'=>1, 'position'=>101),
-	'd.amount'=>array('label'=>"Amount", 'checked'=>1, 'position'=>102),
-	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'c.dateadh' => array('label' => "DateSubscription", 'checked' => 1, 'position' => 100),
+	'c.datef' => array('label' => "EndSubscription", 'checked' => 1, 'position' => 101),
+	'd.amount' => array('label' => "Amount", 'checked' => 1, 'position' => 102),
+	'c.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'c.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
 //	'd.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 
@@ -124,7 +124,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>isset($socid) ? $socid : null);
+$parameters = array('socid' => isset($socid) ? $socid : null);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -298,7 +298,7 @@ $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
 if (!empty($mode)) {
-	$param .='&mode='.urlencode($mode);
+	$param .= '&mode='.urlencode($mode);
 }
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
@@ -322,7 +322,7 @@ if ($search_login) {
 	$param .= "&search_login=".urlencode($search_login);
 }
 if ($search_account) {
-	$param .= "&search_account=".urlencode($search_account);
+	$param .= "&search_account=".urlencode((string) ($search_account));
 }
 if ($search_amount) {
 	$param .= "&search_amount=".urlencode($search_amount);
@@ -366,8 +366,8 @@ print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 if ($user->hasRight('adherent', 'cotisation', 'creer')) {
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
@@ -492,7 +492,7 @@ if (!empty($arrayfields['d.amount']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -571,7 +571,7 @@ if (!empty($arrayfields['d.amount']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['c.datec']['checked'])) {
@@ -647,7 +647,7 @@ while ($i < $imaxinloop) {
 			$accountstatic->fetch($obj->fk_account);
 		}
 		// Output Kanban
-		print $subscription->getKanbanView('', array('selected' => in_array($object->id, $arrayofselected), 'adherent_type' => $adht, 'member' => $adherent, 'bank'=>($obj->fk_account > 0 ? $accountstatic : null)));
+		print $subscription->getKanbanView('', array('selected' => in_array($object->id, $arrayofselected), 'adherent_type' => $adht, 'member' => $adherent, 'bank' => ($obj->fk_account > 0 ? $accountstatic : null)));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -770,7 +770,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
@@ -829,7 +829,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql' => $sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 136646c96d82a427cb758facbc194dc1c8a265e4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:10 +0100
Subject: [PATCH 0620/1862] Fix: Ensure string type for urlencode()

---
 htdocs/adherents/type.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 738ee68c23b..54742217778 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -190,7 +190,7 @@ if ($action == 'update' && $user->hasRight('adherent', 'configurer')) {
 
 	$object->oldcopy = dol_clone($object, 2);
 
-	$object->label= trim($label);
+	$object->label = trim($label);
 	$object->morphy	= trim($morphy);
 	$object->status	= (int) $status;
 	$object->subscription = (int) $subscription;
@@ -277,8 +277,8 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 
 		$newcardbutton = '';
 
-		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 
 		if ($user->hasRight('adherent', 'configurer')) {
 			$newcardbutton .= dolGetButtonTitleSeparator();
@@ -379,9 +379,9 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 				if ($objp->duration) {
 					$duration_value = intval($objp->duration);
 					if ($duration_value > 1) {
-						$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+						$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 					} else {
-						$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+						$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 					}
 					$unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration);
 					print max(1, $duration_value).' '.$dur[$unit];
@@ -441,7 +441,7 @@ if ($action == 'create') {
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-	print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+	print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 	print '</td></tr>';
 
 	// Morphy
@@ -548,9 +548,9 @@ if ($rowid > 0) {
 
 		print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
 		if ($object->duration_value > 1) {
-			$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+			$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 		} elseif ($object->duration_value > 0) {
-			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+			$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 		}
 		print(!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 		print '</td></tr>';
@@ -592,7 +592,7 @@ if ($rowid > 0) {
 			$morphy = '';
 		}
 
-		if ($user->hasRight('adherent', 'configurer')&& !empty($object->status)) {
+		if ($user->hasRight('adherent', 'configurer') && !empty($object->status)) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&token='.newToken().'&typeid='.$object->id.($morphy ? '&morphy='.urlencode($morphy) : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
@@ -712,7 +712,7 @@ if ($rowid > 0) {
 				$titre .= " (".$membertype->label.")";
 			}
 
-			$param = "&rowid=".urlencode($object->id);
+			$param = "&rowid=".urlencode((string) ($object->id));
 			if (!empty($mode)) {
 				$param .= '&mode='.urlencode($mode);
 			}
@@ -956,7 +956,7 @@ if ($rowid > 0) {
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth300" name="label" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
-		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+		print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 		print '</td></tr>';
 
 		// Morphy

From 3b439c81a135b4b69fa7d8412b4bb2815b4ceed7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:14 +0100
Subject: [PATCH 0621/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0ca6a21bfe2..011a66e4a1d 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1227,9 +1227,9 @@ if ($id == 7 && GETPOST('from') == 'accountancy') {
 	$titlepicto = 'accountancy';
 }
 
-$param = '&id='.urlencode($id);
+$param = '&id='.urlencode((string) ($id));
 if ($search_country_id || GETPOSTISSET('page') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) {
-	$param .= '&search_country_id='.urlencode($search_country_id ? $search_country_id : -1);
+	$param .= '&search_country_id='.urlencode((string) ($search_country_id ? $search_country_id : -1));
 }
 if ($search_code != '') {
 	$param .= '&search_code='.urlencode($search_code);

From 084c2106f65b0877d39aedb6df20d5e14de986ac Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:17 +0100
Subject: [PATCH 0622/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 2fee52df32b..ac2e3c2ea46 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -68,7 +68,7 @@ class Dolistore
 
 		$langtmp    = explode('_', $langs->defaultlang);
 		$lang       = $langtmp[0];
-		$lang_array = array('en'=>1, 'fr'=>2, 'es'=>3, 'it'=>4, 'de'=>5); // Into table ps_lang of Prestashop - 1
+		$lang_array = array('en' => 1, 'fr' => 2, 'es' => 3, 'it' => 4, 'de' => 5); // Into table ps_lang of Prestashop - 1
 		if (!in_array($lang, array_keys($lang_array))) {
 			$lang = 'en';
 		}
@@ -270,7 +270,7 @@ class Dolistore
 
 			// add image or default ?
 			if ($product->id_default_image != '') {
-				$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.urlencode(((int) $product->id)).'&id_image='.urlencode(((int) $product->id_default_image));
+				$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.urlencode((string) (((int) $product->id))).'&id_image='.urlencode((string) (((int) $product->id_default_image)));
 				$images = '<a href="'.$image_url.'" class="documentpreview" target="_blank" rel="noopener noreferrer" mime="image/png" title="'.dol_escape_htmltag($product->name->language[$this->lang - 1].', '.$langs->trans('Version').' '.$product->module_version).'">';
 				$images .= '<img src="'.$image_url.'&quality=home_default" style="max-height:250px;max-width: 210px;" alt="" /></a>';
 			} else {

From 2fb1242d14eb5caec1d2c68186918ede7a767abc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:20 +0100
Subject: [PATCH 0623/1862] Fix: Ensure string type for urlencode()

---
 htdocs/admin/mails_senderprofile_list.php | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 0f314ba993a..bcf786ec1b0 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -108,11 +108,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -121,10 +121,10 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) && is_arra
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
+				'label' => $extrafields->attributes[$object->table_element]['label'][$key],
+				'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
+				'position' => $extrafields->attributes[$object->table_element]['pos'][$key],
+				'enabled' => (abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
 			);
 		}
 	}
@@ -591,7 +591,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -635,7 +635,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -706,7 +706,7 @@ while ($i < $imaxinloop) {
 				$url .= '&limit='.((int) $limit);
 			}
 			if ($page) {
-				$url .= '&page='.urlencode($page);
+				$url .= '&page='.urlencode((string) ($page));
 			}
 			if ($sortfield) {
 				$url .= '&sortfield='.urlencode($sortfield);
@@ -783,7 +783,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -796,7 +796,7 @@ while ($i < $imaxinloop) {
 				$url .= '&limit='.((int) $limit);
 			}
 			if ($page) {
-				$url .= '&page='.urlencode($page);
+				$url .= '&page='.urlencode((string) ($page));
 			}
 			if ($sortfield) {
 				$url .= '&sortfield='.urlencode($sortfield);
@@ -845,7 +845,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 735d91fd1f27319fe93a1c6355f290f72f4e575e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:24 +0100
Subject: [PATCH 0624/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index b1b1242ebcc..902239fca39 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -278,7 +278,7 @@ if ($result) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_rowid) {
-		$param .= '&search_rowid='.urlencode($search_rowid);
+		$param .= '&search_rowid='.urlencode((string) ($search_rowid));
 	}
 	if ($search_code) {
 		$param .= '&search_code='.urlencode($search_code);

From 12fe3dd647ef18877406a7002681b49028fcfa9a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:26 +0100
Subject: [PATCH 0625/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index f25da35dd6a..56e33e2e317 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -99,7 +99,7 @@ if (!isModEnabled('asset')) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -167,14 +167,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin=' . urlencode($object->element . '@' . $object->module) . '&originid=' . urlencode($object->id);
+	$out = '&origin=' . urlencode((string) ($object->element . '@' . $object->module)) . '&originid=' . urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
 	$out .= '&backtopage=' . urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid=' . urlencode($objthirdparty->id);
+			$out .= '&socid=' . urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 66b7f3b0e3962ea460cd24a6fff29df16645d004 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:30 +0100
Subject: [PATCH 0626/1862] Fix: Ensure string type for urlencode()

---
 htdocs/asset/model/agenda.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index ff190403410..1eb0a2e850a 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -173,14 +173,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin=' . urlencode($object->element . '@' . $object->module) . '&originid=' . urlencode($object->id);
+	$out = '&origin=' . urlencode((string) ($object->element . '@' . $object->module)) . '&originid=' . urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
 	$out .= '&backtopage=' . urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid=' . urlencode($objthirdparty->id);
+			$out .= '&socid=' . urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From b33f92324e18b55348a0f46b558d25b31e0a5733 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:32 +0100
Subject: [PATCH 0627/1862] Fix: Ensure string type for urlencode()

---
 htdocs/blockedlog/admin/blockedlog_list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 305c34413e5..bb385e34984 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -298,7 +298,7 @@ if (GETPOST('withtab', 'alpha')) {
 } else {
 	$title = $langs->trans("BrowseBlockedLog");
 }
-$help_url="EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Inaltérable";
+$help_url = "EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Inaltérable";
 
 llxHeader('', $title, $help_url);
 
@@ -353,16 +353,16 @@ if ($search_startday > 0) {
 	$param .= '&search_startday='.urlencode($search_startday);
 }
 if ($search_endyear > 0) {
-	$param .= '&search_endyear='.urlencode($search_endyear);
+	$param .= '&search_endyear='.urlencode((string) ($search_endyear));
 }
 if ($search_endmonth > 0) {
-	$param .= '&search_endmonth='.urlencode($search_endmonth);
+	$param .= '&search_endmonth='.urlencode((string) ($search_endmonth));
 }
 if ($search_endday > 0) {
-	$param .= '&search_endday='.urlencode($search_endday);
+	$param .= '&search_endday='.urlencode((string) ($search_endday));
 }
 if ($search_showonlyerrors > 0) {
-	$param .= '&search_showonlyerrors='.urlencode($search_showonlyerrors);
+	$param .= '&search_showonlyerrors='.urlencode((string) ($search_showonlyerrors));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);

From 5fd975e60c7bc31afe2165f796d51ed5c2a5c133 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:35 +0100
Subject: [PATCH 0628/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index ac313e7b699..5c29e0c45cc 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -113,7 +113,7 @@ if (!$permissiontoread) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -218,14 +218,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 8f30e5eac18deaee58339eebfaed2a75f961281e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:37 +0100
Subject: [PATCH 0629/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index 391c65e81ed..7ef31ec2c3e 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -113,7 +113,7 @@ if (!$permissiontoread) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -217,14 +217,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 54dfc59094b81e445ef42c8905d218c92ef04e56 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:39 +0100
Subject: [PATCH 0630/1862] Fix: Ensure string type for urlencode()

---
 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 05229a9ab58..f23a3d4438b 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1800,7 +1800,7 @@ if ($id > 0) {
 
 	// Confirmation suppression action
 	if ($action == 'delete') {
-		print $form->formconfirm("card.php?id=".urlencode($id), $langs->trans("DeleteAction"), $langs->trans("ConfirmDeleteAction"), "confirm_delete", '', '', 1);
+		print $form->formconfirm("card.php?id=".urlencode((string) ($id)), $langs->trans("DeleteAction"), $langs->trans("ConfirmDeleteAction"), "confirm_delete", '', '', 1);
 	}
 
 	if ($action == 'edit') {

From 9ca373b6996ac90eb89e763df7c1eb22ad678a85 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:41 +0100
Subject: [PATCH 0631/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f0843f3c990..68e6b4d7169 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -393,7 +393,7 @@ if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	}
 }
 if ($resourceid > 0) {
-	$param .= "&search_resourceid=".urlencode($resourceid);
+	$param .= "&search_resourceid=".urlencode((string) ($resourceid));
 }
 if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
@@ -405,26 +405,26 @@ if ($filtert) {
 	$param .= "&search_filtert=".urlencode($filtert);
 }
 if ($usergroup > 0) {
-	$param .= "&search_usergroup=".urlencode($usergroup);
+	$param .= "&search_usergroup=".urlencode((string) ($usergroup));
 }
 if ($socid > 0) {
-	$param .= "&search_socid=".urlencode($socid);
+	$param .= "&search_socid=".urlencode((string) ($socid));
 }
 if ($showbirthday) {
 	$param .= "&search_showbirthday=1";
 }
 if ($pid) {
-	$param .= "&search_projectid=".urlencode($pid);
+	$param .= "&search_projectid=".urlencode((string) ($pid));
 }
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
 }
-$param .= "&maxprint=".urlencode($maxprint);
+$param .= "&maxprint=".urlencode((string) ($maxprint));
 if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month') {
 	$param .= '&mode='.urlencode($mode);
 }
 if ($search_categ_cus != 0) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 
 // Show navigation bar

From f9a2ddf8c437b8833daacfbae713c0702f03740d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:44 +0100
Subject: [PATCH 0632/1862] Fix: Ensure string type for urlencode()

---
 htdocs/comm/action/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 03efd125979..eff2e4b3708 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -316,7 +316,7 @@ if ($actioncode != '') {
 	}
 }
 if ($resourceid > 0) {
-	$param .= "&search_resourceid=".urlencode($resourceid);
+	$param .= "&search_resourceid=".urlencode((string) ($resourceid));
 }
 if ($search_status != '') {
 	$param .= "&search_status=".urlencode($search_status);
@@ -328,16 +328,16 @@ if ($filtert) {
 	$param .= "&search_filtert=".urlencode($filtert);
 }
 if ($usergroup > 0) {
-	$param .= "&search_usergroup=".urlencode($usergroup);
+	$param .= "&search_usergroup=".urlencode((string) ($usergroup));
 }
 if ($socid > 0) {
-	$param .= "&search_socid=".urlencode($socid);
+	$param .= "&search_socid=".urlencode((string) ($socid));
 }
 if ($showbirthday) {
 	$param .= "&search_showbirthday=1";
 }
 if ($pid) {
-	$param .= "&search_projectid=".urlencode($pid);
+	$param .= "&search_projectid=".urlencode((string) ($pid));
 }
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
@@ -391,7 +391,7 @@ if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
 if ($search_categ_cus != 0) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 
 // Add $param from extra fields

From 9ed7f90fcafa6296b448c9e809b098e4e8304c21 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:46 +0100
Subject: [PATCH 0633/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index f93373fc0f7..59c403323b5 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -286,7 +286,7 @@ if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	}
 }
 if ($resourceid > 0) {
-	$param .= "&search_resourceid=".urlencode($resourceid);
+	$param .= "&search_resourceid=".urlencode((string) ($resourceid));
 }
 if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
@@ -298,16 +298,16 @@ if ($filtert) {
 	$param .= "&search_filtert=".urlencode($filtert);
 }
 if ($usergroup > 0) {
-	$param .= "&search_usergroup=".urlencode($usergroup);
+	$param .= "&search_usergroup=".urlencode((string) ($usergroup));
 }
 if ($socid > 0) {
-	$param .= "&search_socid=".urlencode($socid);
+	$param .= "&search_socid=".urlencode((string) ($socid));
 }
 if ($showbirthday) {
 	$param .= "&search_showbirthday=1";
 }
 if ($pid) {
-	$param .= "&search_projectid=".urlencode($pid);
+	$param .= "&search_projectid=".urlencode((string) ($pid));
 }
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
@@ -322,12 +322,12 @@ if ($end_h != '') {
 	$param .= '&end_h='.urlencode($end_h);
 }
 if ($begin_d != '') {
-	$param .= '&begin_d='.urlencode($begin_d);
+	$param .= '&begin_d='.urlencode((string) ($begin_d));
 }
 if ($end_d != '') {
-	$param .= '&end_d='.urlencode($end_d);
+	$param .= '&end_d='.urlencode((string) ($end_d));
 }
-$param .= "&maxprint=".urlencode($maxprint);
+$param .= "&maxprint=".urlencode((string) ($maxprint));
 
 $paramnoactionodate = $param;
 
@@ -374,7 +374,7 @@ $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 
 // Must be after the nav definition
-$param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
+$param .= '&year='.urlencode((string) ($year)).'&month='.urlencode((string) ($month)).($day ? '&day='.urlencode((string) ($day)) : '');
 //print 'x'.$param;
 
 

From 54f05cc69ec92db8b49b9b423d43c04cf1520a04 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:48 +0100
Subject: [PATCH 0634/1862] Fix: Ensure string type for urlencode()

---
 htdocs/comm/action/peruser.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 70b325ed45f..b847d042c0c 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -282,7 +282,7 @@ if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	}
 }
 if ($resourceid > 0) {
-	$param .= "&search_resourceid=".urlencode($resourceid);
+	$param .= "&search_resourceid=".urlencode((string) ($resourceid));
 }
 
 if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
@@ -295,16 +295,16 @@ if ($filtert) {
 	$param .= "&search_filtert=".urlencode($filtert);
 }
 if ($usergroup > 0) {
-	$param .= "&search_usergroup=".urlencode($usergroup);
+	$param .= "&search_usergroup=".urlencode((string) ($usergroup));
 }
 if ($socid > 0) {
-	$param .= "&search_socid=".urlencode($socid);
+	$param .= "&search_socid=".urlencode((string) ($socid));
 }
 if ($showbirthday) {
 	$param .= "&search_showbirthday=1";
 }
 if ($pid) {
-	$param .= "&search_projectid=".urlencode($pid);
+	$param .= "&search_projectid=".urlencode((string) ($pid));
 }
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
@@ -325,9 +325,9 @@ if ($end_d != '') {
 	$param .= '&end_d='.urlencode($end_d);
 }
 if ($search_categ_cus != 0) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
-$param .= "&maxprint=".urlencode($maxprint);
+$param .= "&maxprint=".urlencode((string) ($maxprint));
 
 $paramnoactionodate = $param;
 
@@ -377,7 +377,7 @@ $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 
 // Must be after the nav definition
-$param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
+$param .= '&year='.urlencode((string) ($year)).'&month='.urlencode((string) ($month)).($day ? '&day='.urlencode((string) ($day)) : '');
 //print 'x'.$param;
 
 

From 014fb8d967566956f52fec3ba63ecf469772dd22 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:51 +0100
Subject: [PATCH 0635/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 4096d3ae161..95ffc1f0c38 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -752,7 +752,7 @@ if ($object->fetch($id) >= 0) {
 		print '</tr>';
 
 		if ($page) {
-			$param .= "&page=".urlencode($page);
+			$param .= "&page=".urlencode((string) ($page));
 		}
 
 		print '<tr class="liste_titre">';

From 448e4ae322c96f7b92aade033eb1902a8c28d88c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:56 +0100
Subject: [PATCH 0636/1862] Fix: Ensure string type for urlencode()

---
 htdocs/comm/propal/agenda.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index a61ed2e0270..1fe3cf6d5dd 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -96,7 +96,7 @@ restrictedArea($user, 'propal', $object->id, '', '', 'fk_soc', 'rowid', $isdraft
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -191,14 +191,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 92ae7239cb0b70fa2fca828d0e4f6b9eefb190df Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:48:59 +0100
Subject: [PATCH 0637/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index cb2001fc399..d3c435bf195 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1963,7 +1963,7 @@ if ($action == 'create') {
 
 			$thirdparty = $soc;
 			$discount_type = 0;
-			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode(GETPOST('origin')).'&originid='.urlencode(GETPOSTINT('originid'));
+			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode((string) (GETPOST('origin'))).'&originid='.urlencode((string) (GETPOSTINT('originid')));
 			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 			print '</td></tr>';
 		}

From 202cf1eb250c8a545a22954ff3b274e40d512140 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:02 +0100
Subject: [PATCH 0638/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index 9ffb69fbb9c..af2a5da5594 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -96,7 +96,7 @@ restrictedArea($user, 'commande', $object->id, '', '', 'fk_soc', 'rowid', $isdra
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -191,14 +191,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 5e23333913b67f1c0d7e92f4df557a6519ba2df1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:05 +0100
Subject: [PATCH 0639/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 11b3f049599..2bcfe9482e4 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1906,7 +1906,7 @@ if ($action == 'create' && $usercancreate) {
 
 			$thirdparty = $soc;
 			$discount_type = 0;
-			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode(GETPOST('origin')).'&originid='.urlencode(GETPOSTINT('originid'));
+			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode((string) (GETPOST('origin'))).'&originid='.urlencode((string) (GETPOSTINT('originid')));
 			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
 			print '</td></tr>';

From d523528bc069d6c1e65b83dcf4e5b1a6e85249a4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:08 +0100
Subject: [PATCH 0640/1862] Fix: Ensure string type for urlencode()

---
 htdocs/commande/list.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 54ba84705cb..003fdda6d09 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -592,7 +592,7 @@ if (empty($reshook)) {
 
 			if ($nb_bills_created == 1) {
 				$texttoshow = $langs->trans('BillXCreated', '{s1}');
-				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode((string) ($lastid)).'">'.$lastref.'</a>', $texttoshow);
 				setEventMessages($texttoshow, null, 'mesgs');
 			} else {
 				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
@@ -616,10 +616,10 @@ if (empty($reshook)) {
 				$param .= '&search_all='.urlencode($search_all);
 			}
 			if ($show_files) {
-				$param .= '&show_files='.urlencode($show_files);
+				$param .= '&show_files='.urlencode((string) ($show_files));
 			}
 			if ($socid > 0) {
-				$param .= '&socid='.urlencode($socid);
+				$param .= '&socid='.urlencode((string) ($socid));
 			}
 			if ($search_status != '') {
 				$param .= '&search_status='.urlencode($search_status);
@@ -652,7 +652,7 @@ if (empty($reshook)) {
 				$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 			}
 			if ($search_user > 0) {
-				$param .= '&search_user='.urlencode($search_user);
+				$param .= '&search_user='.urlencode((string) ($search_user));
 			}
 			if ($search_sale > 0) {
 				$param .= '&search_sale='.urlencode($search_sale);
@@ -1242,7 +1242,7 @@ if ($search_ref_customer) {
 	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 }
 if ($search_user > 0) {
-	$param .= '&search_user='.urlencode($search_user);
+	$param .= '&search_user='.urlencode((string) ($search_user));
 }
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
@@ -1257,7 +1257,7 @@ if ($search_total_ttc != '') {
 	$param .= '&search_total_ttc='.urlencode($search_total_ttc);
 }
 if ($search_warehouse != '') {
-	$param .= '&search_warehouse='.urlencode($search_warehouse);
+	$param .= '&search_warehouse='.urlencode((string) ($search_warehouse));
 }
 if ($search_login) {
 	$param .= '&search_login='.urlencode($search_login);
@@ -1290,19 +1290,19 @@ if ($search_state != '') {
 	$param .= '&search_state='.urlencode($search_state);
 }
 if ($search_country != '') {
-	$param .= '&search_country='.urlencode($search_country);
+	$param .= '&search_country='.urlencode((string) ($search_country));
 }
 if ($search_type_thirdparty && $search_type_thirdparty != '-1') {
-	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 }
 if ($search_product_category != '') {
-	$param .= '&search_product_category='.urlencode($search_product_category);
+	$param .= '&search_product_category='.urlencode((string) ($search_product_category));
 }
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
@@ -1311,16 +1311,16 @@ if ($search_billed != '') {
 	$param .= '&search_billed='.urlencode($search_billed);
 }
 if ($search_fk_cond_reglement > 0) {
-	$param .= '&search_fk_cond_reglement='.urlencode($search_fk_cond_reglement);
+	$param .= '&search_fk_cond_reglement='.urlencode((string) ($search_fk_cond_reglement));
 }
 if ($search_fk_shipping_method > 0) {
-	$param .= '&search_fk_shipping_method='.urlencode($search_fk_shipping_method);
+	$param .= '&search_fk_shipping_method='.urlencode((string) ($search_fk_shipping_method));
 }
 if ($search_fk_mode_reglement > 0) {
-	$param .= '&search_fk_mode_reglement='.urlencode($search_fk_mode_reglement);
+	$param .= '&search_fk_mode_reglement='.urlencode((string) ($search_fk_mode_reglement));
 }
 if ($search_fk_input_reason > 0) {
-	$param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason);
+	$param .= '&search_fk_input_reason='.urlencode((string) ($search_fk_input_reason));
 }
 
 // Add $param from extra fields

From 028f9599a656ebd7978ef2d2f9a24adb28efd17c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:11 +0100
Subject: [PATCH 0641/1862] Fix: Ensure string type for urlencode()

---
 htdocs/commande/list_det.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 0451f7d48fe..01aceb429d8 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -716,7 +716,7 @@ if ($resql) {
 		$param .= '&sall='.urlencode($sall);
 	}
 	if ($socid > 0) {
-		$param .= '&socid='.urlencode($socid);
+		$param .= '&socid='.urlencode((string) ($socid));
 	}
 	if ($search_id) {
 		$param .= '&search_id='.urlencode($search_id);
@@ -762,7 +762,7 @@ if ($resql) {
 		$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 	}
 	if ($search_user > 0) {
-		$param .= '&search_user='.urlencode($search_user);
+		$param .= '&search_user='.urlencode((string) ($search_user));
 	}
 	if ($search_sale > 0) {
 		$param .= '&search_sale='.urlencode($search_sale);
@@ -777,7 +777,7 @@ if ($resql) {
 		$param .= '&search_total_ttc='.urlencode($search_total_ttc);
 	}
 	if ($search_warehouse != '') {
-		$param .= '&search_warehouse='.urlencode($search_warehouse);
+		$param .= '&search_warehouse='.urlencode((string) ($search_warehouse));
 	}
 	if ($search_login) {
 		$param .= '&search_login='.urlencode($search_login);
@@ -810,10 +810,10 @@ if ($resql) {
 		$param .= '&search_state='.urlencode($search_state);
 	}
 	if ($search_country != '') {
-		$param .= '&search_country='.urlencode($search_country);
+		$param .= '&search_country='.urlencode((string) ($search_country));
 	}
 	if ($search_type_thirdparty && $search_type_thirdparty != '-1') {
-		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+		$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 	}
 	if (!empty($search_product_category_array)) {
 		foreach ($search_product_category_array as $tmpval) {
@@ -821,10 +821,10 @@ if ($resql) {
 		}
 	}
 	if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+		$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 	}
 	if ($show_files) {
-		$param .= '&show_files='.urlencode($show_files);
+		$param .= '&show_files='.urlencode((string) ($show_files));
 	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
@@ -833,16 +833,16 @@ if ($resql) {
 		$param .= '&search_billed='.urlencode($search_billed);
 	}
 	if ($search_fk_cond_reglement > 0) {
-		$param .= '&search_fk_cond_reglement='.urlencode($search_fk_cond_reglement);
+		$param .= '&search_fk_cond_reglement='.urlencode((string) ($search_fk_cond_reglement));
 	}
 	if ($search_fk_shipping_method > 0) {
-		$param .= '&search_fk_shipping_method='.urlencode($search_fk_shipping_method);
+		$param .= '&search_fk_shipping_method='.urlencode((string) ($search_fk_shipping_method));
 	}
 	if ($search_fk_mode_reglement > 0) {
-		$param .= '&search_fk_mode_reglement='.urlencode($search_fk_mode_reglement);
+		$param .= '&search_fk_mode_reglement='.urlencode((string) ($search_fk_mode_reglement));
 	}
 	if ($search_fk_input_reason > 0) {
-		$param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason);
+		$param .= '&search_fk_input_reason='.urlencode((string) ($search_fk_input_reason));
 	}
 	if (!empty($productobuy)) {
 		$param .= '&productobuy='.urlencode($productobuy);

From 08eb3a8e1f2fdfb2fda72d041f1d58feb7a8dce7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:14 +0100
Subject: [PATCH 0642/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 26613a6bb49..9585ac55973 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -130,7 +130,7 @@ if (!empty($numref)) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($numref);
 }
-$backtopage = $_SERVER['PHP_SELF']."?account=".urlencode($id)."&num=".urlencode($numref);
+$backtopage = $_SERVER['PHP_SELF']."?account=".urlencode((string) ($id))."&num=".urlencode((string) ($numref));
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 

From 263f6a1d15cc63aefd3a244dfb4dcc0cfd376ce4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:17 +0100
Subject: [PATCH 0643/1862] Fix: Ensure string type for urlencode()

---
 htdocs/compta/bank/bankentries_list.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 2a3672b0cd9..82184b9ecb7 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -288,16 +288,16 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 	if (!$error) {
 		$param = 'action=reconcile&contextpage=banktransactionlist&id='.((int) $object->id).'&search_account='.((int) $object->id);
 		if ($page) {
-			$param .= '&page='.urlencode($page);
+			$param .= '&page='.urlencode((string) ($page));
 		}
 		if ($offset) {
-			$param .= '&offset='.urlencode($offset);
+			$param .= '&offset='.urlencode((string) ($offset));
 		}
 		if ($limit) {
 			$param .= '&limit='.((int) $limit);
 		}
 		if ($search_conciliated != '' && $search_conciliated != '-1') {
-			$param .= '&search_conciliated='.urlencode($search_conciliated);
+			$param .= '&search_conciliated='.urlencode((string) ($search_conciliated));
 		}
 		if ($search_thirdparty_user) {
 			$param .= '&search_thirdparty='.urlencode($search_thirdparty_user);
@@ -449,7 +449,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if ($id > 0) {
-	$param .= '&id='.urlencode($id);
+	$param .= '&id='.urlencode((string) ($id));
 }
 if (!empty($ref)) {
 	$param .= '&ref='.urlencode($ref);
@@ -473,19 +473,19 @@ if (!empty($search_credit)) {
 	$param .= '&search_credit='.urlencode($search_credit);
 }
 if ($search_account > 0) {
-	$param .= '&search_account='.urlencode($search_account);
+	$param .= '&search_account='.urlencode((string) ($search_account));
 }
 if (!empty($search_num_releve)) {
 	$param .= '&search_num_releve='.urlencode($search_num_releve);
 }
 if ($search_conciliated != '' && $search_conciliated != '-1') {
-	$param .= '&search_conciliated='.urlencode($search_conciliated);
+	$param .= '&search_conciliated='.urlencode((string) ($search_conciliated));
 }
 if ($search_fk_bordereau > 0) {
-	$param .= '$&search_fk_bordereau='.urlencode($search_fk_bordereau);
+	$param .= '$&search_fk_bordereau='.urlencode((string) ($search_fk_bordereau));
 }
 if ($search_bid > 0) {
-	$param .= '&search_bid='.urlencode($search_bid);
+	$param .= '&search_bid='.urlencode((string) ($search_bid));
 }
 if (dol_strlen($search_dt_start) > 0) {
 	$param .= '&search_start_dtmonth='.GETPOSTINT('search_start_dtmonth').'&search_start_dtday='.GETPOSTINT('search_start_dtday').'&search_start_dtyear='.GETPOSTINT('search_start_dtyear');
@@ -503,7 +503,7 @@ if ($search_req_nb) {
 	$param .= '&req_nb='.urlencode($search_req_nb);
 }
 if (GETPOSTINT("search_thirdparty")) {
-	$param .= '&thirdparty='.urlencode(GETPOSTINT("search_thirdparty"));
+	$param .= '&thirdparty='.urlencode((string) (GETPOSTINT("search_thirdparty")));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
@@ -1022,7 +1022,7 @@ if ($resql) {
 
 	// We can add page now to param
 	if ($page != '') {
-		$param .= '&page='.urlencode($page);
+		$param .= '&page='.urlencode((string) ($page));
 	}
 
 	$moreforfilter = '';

From 80c239b010c889f77bcfe01f975df57a4b952df3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:19 +0100
Subject: [PATCH 0644/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index c0cbdb0447e..6ed9e7d37a9 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -352,7 +352,7 @@ if ($result) {
 
 		// Confirmations
 		if ($action == 'delete_categ') {
-			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".urlencode($rowid)."&cat1=".urlencode(GETPOSTINT("fk_categ"))."&orig_account=".urlencode($orig_account), $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".urlencode((string) ($rowid))."&cat1=".urlencode((string) (GETPOSTINT("fk_categ")))."&orig_account=".urlencode((string) ($orig_account)), $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
 		}
 
 		print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';

From 6ebe9fed3c9c11319f9262574196bed66a52e18d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:21 +0100
Subject: [PATCH 0645/1862] Fix: Ensure string type for urlencode()

---
 htdocs/compta/bank/list.php | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index ef9206a74ed..480c36cd07e 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -60,7 +60,7 @@ $search_number = GETPOST('search_number', 'alpha');
 $search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') : 'opened'; // 'all' or '' means 'opened'
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$search_category_list ="";
+$search_category_list = "";
 if (isModEnabled('category')) {
 	$search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array");
 }
@@ -101,24 +101,24 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'b.ref'=>'Ref',
-	'b.label'=>'Label',
+	'b.ref' => 'Ref',
+	'b.label' => 'Label',
 );
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'b.ref'=>array('label'=>$langs->trans("BankAccounts"), 'checked'=>1, 'position'=>10),
-	'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1, 'position'=>12),
-	'accountype'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>14),
-	'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1, 'position'=>16),
-	'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(isModEnabled('accounting')), 'position'=>18),
-	'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(isModEnabled('accounting')), 'position'=>20),
-	'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1, 'position'=>50),
-	'b.currency_code'=>array('label'=>$langs->trans("Currency"), 'checked'=>0, 'position'=>22),
-	'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'b.clos'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
+	'b.ref' => array('label' => $langs->trans("BankAccounts"), 'checked' => 1, 'position' => 10),
+	'b.label' => array('label' => $langs->trans("Label"), 'checked' => 1, 'position' => 12),
+	'accountype' => array('label' => $langs->trans("Type"), 'checked' => 1, 'position' => 14),
+	'b.number' => array('label' => $langs->trans("AccountIdShort"), 'checked' => 1, 'position' => 16),
+	'b.account_number' => array('label' => $langs->trans("AccountAccounting"), 'checked' => (isModEnabled('accounting')), 'position' => 18),
+	'b.fk_accountancy_journal' => array('label' => $langs->trans("AccountancyJournal"), 'checked' => (isModEnabled('accounting')), 'position' => 20),
+	'toreconcile' => array('label' => $langs->trans("TransactionsToConciliate"), 'checked' => 1, 'position' => 50),
+	'b.currency_code' => array('label' => $langs->trans("Currency"), 'checked' => 0, 'position' => 22),
+	'b.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'b.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),
+	'b.clos' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
+	'balance' => array('label' => $langs->trans("Balance"), 'checked' => 1, 'position' => 1010),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -150,7 +150,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -336,7 +336,7 @@ if ($search_status != '') {
 	$param .= '&search_status='.urlencode($search_status);
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -378,8 +378,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->hasRight('banque', 'configurer'));
 
@@ -486,7 +486,7 @@ if (!empty($arrayfields['b.currency_code']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -503,8 +503,8 @@ if (!empty($arrayfields['b.tms']['checked'])) {
 if (!empty($arrayfields['b.clos']['checked'])) {
 	print '<td class="liste_titre center parentonrightofpage">';
 	$array = array(
-		'opened'=>$langs->trans("Opened"),
-		'closed'=>$langs->trans("Closed")
+		'opened' => $langs->trans("Opened"),
+		'closed' => $langs->trans("Closed")
 	);
 	print $form->selectarray("search_status", $array, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status minwidth75 maxwidth125 onrightofpage', 1);
 	print '</td>';
@@ -568,7 +568,7 @@ if (!empty($arrayfields['toreconcile']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['b.datec']['checked'])) {
@@ -601,7 +601,7 @@ $i = 0;
 $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-$totalarray['val'] = array('balance'=>0);
+$totalarray['val'] = array('balance' => 0);
 $total = array();
 $found = 0;
 $lastcurrencycode = '';
@@ -799,7 +799,7 @@ foreach ($accounts as $key => $type) {
 		}
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp, $action); // Note that $action and $objecttmpect may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation

From a7895ec1a6cf24a76e2bdb2cad54d0c7225cb55f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:23 +0100
Subject: [PATCH 0646/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 56eb4e93a6c..34c61ad8b31 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -250,7 +250,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.$limit;
 }
 if ($id > 0) {
-	$param .= '&id='.urlencode($id);
+	$param .= '&id='.urlencode((string) ($id));
 }
 
 if (empty($numref)) {

From bb144ed2781a12250700cf2a9a63e4f70cb8e3ed Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:25 +0100
Subject: [PATCH 0647/1862] Fix: Ensure string type for urlencode()

---
 htdocs/compta/bank/various_payment/list.php | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 33f9f0154cd..8a2aa9178f7 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -148,27 +148,27 @@ $search_all = GETPOSTISSET("search_all") ? trim(GETPOST("search_all", 'alpha'))
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'v.rowid'=>"Ref",
-	'v.label'=>"Label",
-	'v.datep'=>"DatePayment",
-	'v.datev'=>"DateValue",
-	'v.amount'=>$langs->trans("Debit").", ".$langs->trans("Credit"),
+	'v.rowid' => "Ref",
+	'v.label' => "Label",
+	'v.datep' => "DatePayment",
+	'v.datev' => "DateValue",
+	'v.amount' => $langs->trans("Debit").", ".$langs->trans("Credit"),
 );
 
 // Definition of fields for lists
 $arrayfields = array(
-	'ref'			=>array('label'=>"Ref", 'checked'=>1, 'position'=>100),
-	'label'			=>array('label'=>"Label", 'checked'=>1, 'position'=>110),
-	'datep'			=>array('label'=>"DatePayment", 'checked'=>1, 'position'=>120),
-	'datev'			=>array('label'=>"DateValue", 'checked'=>-1, 'position'=>130),
-	'type'			=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>140),
-	'project'		=>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>isModEnabled('project')),
-	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>isModEnabled("bank")),
-	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>isModEnabled("bank")),
-	'account'		=>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>isModEnabled('accounting')),
-	'subledger'		=>array('label'=>"SubledgerAccount", 'checked'=>1, 'position'=>410, "enabled"=>isModEnabled('accounting')),
-	'debit'			=>array('label'=>"Debit", 'checked'=>1, 'position'=>500),
-	'credit'		=>array('label'=>"Credit", 'checked'=>1, 'position'=>510),
+	'ref'			=> array('label' => "Ref", 'checked' => 1, 'position' => 100),
+	'label'			=> array('label' => "Label", 'checked' => 1, 'position' => 110),
+	'datep'			=> array('label' => "DatePayment", 'checked' => 1, 'position' => 120),
+	'datev'			=> array('label' => "DateValue", 'checked' => -1, 'position' => 130),
+	'type'			=> array('label' => "PaymentMode", 'checked' => 1, 'position' => 140),
+	'project'		=> array('label' => "Project", 'checked' => 1, 'position' => 200, "enabled" => isModEnabled('project')),
+	'bank'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 300, "enabled" => isModEnabled("bank")),
+	'entry'			=> array('label' => "BankTransactionLine", 'checked' => 1, 'position' => 310, "enabled" => isModEnabled("bank")),
+	'account'		=> array('label' => "AccountAccountingShort", 'checked' => 1, 'position' => 400, "enabled" => isModEnabled('accounting')),
+	'subledger'		=> array('label' => "SubledgerAccount", 'checked' => 1, 'position' => 410, "enabled" => isModEnabled('accounting')),
+	'debit'			=> array('label' => "Debit", 'checked' => 1, 'position' => 500),
+	'credit'		=> array('label' => "Credit", 'checked' => 1, 'position' => 510),
 );
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -401,7 +401,7 @@ if ($search_datev_end) {
 	$param .= '&search_datev_end='.urlencode($search_datev_end);
 }
 if ($search_type_id > 0) {
-	$param .= '&search_type_id='.urlencode($search_type_id);
+	$param .= '&search_type_id='.urlencode((string) ($search_type_id));
 }
 if ($search_amount_deb) {
 	$param .= '&search_amount_deb='.urlencode($search_amount_deb);
@@ -410,7 +410,7 @@ if ($search_amount_cred) {
 	$param .= '&search_amount_cred='.urlencode($search_amount_cred);
 }
 if ($search_bank_account > 0) {
-	$param .= '&search_account='.urlencode($search_bank_account);
+	$param .= '&search_account='.urlencode((string) ($search_bank_account));
 }
 if ($search_accountancy_account > 0) {
 	$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
@@ -421,7 +421,7 @@ if ($search_accountancy_subledger > 0) {
 
 $url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
 if (!empty($socid)) {
-	$url .= '&socid='.urlencode($socid);
+	$url .= '&socid='.urlencode((string) ($socid));
 }
 
 // List of mass actions available
@@ -443,8 +443,8 @@ print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('banque', 'modifier'));
 
@@ -462,7 +462,7 @@ if ($search_all) {
 
 $arrayofmassactions = array();
 
-$moreforfilter= '';
+$moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
@@ -662,7 +662,7 @@ if ($arrayfields['credit']['checked']) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -904,7 +904,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From bb3e90183cda9b48d82defd87f1f04afff684c71 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:28 +0100
Subject: [PATCH 0648/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index bcc66ade965..04c50f82ffe 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -367,7 +367,7 @@ if ($action == 'create') {
 			 * Confirm delete trip
 			 */
 			if ($action == 'delete') {
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".urlencode($id), $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".urlencode((string) ($id)), $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
 			}
 
 			$soc = new Societe($db);

From a361855b248f87859b432e9b2e4146f83177e128 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:31 +0100
Subject: [PATCH 0649/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index 6f1ed587758..542dfd8f6c1 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -96,7 +96,7 @@ restrictedArea($user, 'facture', $object->id, 'facture_rec', '', 'fk_soc', 'rowi
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -196,14 +196,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('paymentbagendaybanktransfer', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 10b3b617a725346e8fb875f0362656bddbcc5d98 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:37 +0100
Subject: [PATCH 0650/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php
index ab0edfbf10a..2880e158273 100644
--- a/htdocs/compta/facture/agenda.php
+++ b/htdocs/compta/facture/agenda.php
@@ -96,7 +96,7 @@ restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', 'rowid', $isdraf
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -191,14 +191,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('paymentbagendaybanktransfer', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 76c336ee7b3ce04afb7a7e51b48b2f731fa0961f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:41 +0100
Subject: [PATCH 0651/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 66afe9fcb73..a9d280ebc1b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3832,7 +3832,7 @@ if ($action == 'create') {
 
 			$thirdparty = $soc;
 			$discount_type = 0;
-			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode(GETPOST('origin')).'&originid='.urlencode(GETPOSTINT('originid'));
+			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode((string) (GETPOST('origin'))).'&originid='.urlencode((string) (GETPOSTINT('originid')));
 			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
 			print '</td></tr>';

From 1d7c551a8560483b80b6788b1957890b1f4f78ce Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:45 +0100
Subject: [PATCH 0652/1862] Fix: Ensure string type for urlencode()

---
 .../compta/facture/invoicetemplate_list.php   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 4bbea222033..13a119e35b5 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -438,43 +438,43 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if ($socid > 0) {
-	$param .= '&socid='.urlencode($socid);
+	$param .= '&socid='.urlencode((string) ($socid));
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_date_when_startday) {
-	$param .= '&search_date_when_startday='.urlencode($search_date_when_startday);
+	$param .= '&search_date_when_startday='.urlencode((string) ($search_date_when_startday));
 }
 if ($search_date_when_startmonth) {
-	$param .= '&search_date_when_startmonth='.urlencode($search_date_when_startmonth);
+	$param .= '&search_date_when_startmonth='.urlencode((string) ($search_date_when_startmonth));
 }
 if ($search_date_when_startyear) {
-	$param .= '&search_date_when_startyear='.urlencode($search_date_when_startyear);
+	$param .= '&search_date_when_startyear='.urlencode((string) ($search_date_when_startyear));
 }
 if ($search_date_when_endday) {
-	$param .= '&search_date_when_endday='.urlencode($search_date_when_endday);
+	$param .= '&search_date_when_endday='.urlencode((string) ($search_date_when_endday));
 }
 if ($search_date_when_endmonth) {
-	$param .= '&search_date_when_endmonth='.urlencode($search_date_when_endmonth);
+	$param .= '&search_date_when_endmonth='.urlencode((string) ($search_date_when_endmonth));
 }
 if ($search_date_when_endyear) {
-	$param .= '&search_date_when_endyear='.urlencode($search_date_when_endyear);
+	$param .= '&search_date_when_endyear='.urlencode((string) ($search_date_when_endyear));
 }
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);

From 1b5046661fe4d127117df118330901965e09a8da Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:49 +0100
Subject: [PATCH 0653/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index e897ebd198b..cfa495f3922 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1004,7 +1004,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 
 llxHeader('', $title, $help_url);
 
-$param = '&socid='.urlencode($socid);
+$param = '&socid='.urlencode((string) ($socid));
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
 }
@@ -1018,58 +1018,58 @@ if ($search_all) {
 	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_date_valid_startday) {
-	$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+	$param .= '&search_date_valid_startday='.urlencode((string) ($search_date_valid_startday));
 }
 if ($search_date_valid_startmonth) {
-	$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+	$param .= '&search_date_valid_startmonth='.urlencode((string) ($search_date_valid_startmonth));
 }
 if ($search_date_valid_startyear) {
-	$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+	$param .= '&search_date_valid_startyear='.urlencode((string) ($search_date_valid_startyear));
 }
 if ($search_date_valid_endday) {
-	$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+	$param .= '&search_date_valid_endday='.urlencode((string) ($search_date_valid_endday));
 }
 if ($search_date_valid_endmonth) {
-	$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+	$param .= '&search_date_valid_endmonth='.urlencode((string) ($search_date_valid_endmonth));
 }
 if ($search_date_valid_endyear) {
-	$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+	$param .= '&search_date_valid_endyear='.urlencode((string) ($search_date_valid_endyear));
 }
 if ($search_datelimit_startday) {
-	$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
+	$param .= '&search_datelimit_startday='.urlencode((string) ($search_datelimit_startday));
 }
 if ($search_datelimit_startmonth) {
-	$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+	$param .= '&search_datelimit_startmonth='.urlencode((string) ($search_datelimit_startmonth));
 }
 if ($search_datelimit_startyear) {
-	$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+	$param .= '&search_datelimit_startyear='.urlencode((string) ($search_datelimit_startyear));
 }
 if ($search_datelimit_endday) {
-	$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+	$param .= '&search_datelimit_endday='.urlencode((string) ($search_datelimit_endday));
 }
 if ($search_datelimit_endmonth) {
-	$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+	$param .= '&search_datelimit_endmonth='.urlencode((string) ($search_datelimit_endmonth));
 }
 if ($search_datelimit_endyear) {
-	$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
+	$param .= '&search_datelimit_endyear='.urlencode((string) ($search_datelimit_endyear));
 }
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
@@ -1117,13 +1117,13 @@ if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
 if ($search_user > 0) {
-	$param .= '&search_user='.urlencode($search_user);
+	$param .= '&search_user='.urlencode((string) ($search_user));
 }
 if ($search_login) {
 	$param .= '&search_login='.urlencode($search_login);
 }
 if ($search_product_category > 0) {
-	$param .= '&search_product_category='.urlencode($search_product_category);
+	$param .= '&search_product_category='.urlencode((string) ($search_product_category));
 }
 if ($search_montant_ht != '') {
 	$param .= '&search_montant_ht='.urlencode($search_montant_ht);
@@ -1159,10 +1159,10 @@ if ($search_status != '') {
 	$param .= '&search_status='.urlencode($search_status);
 }
 if ($search_paymentmode > 0) {
-	$param .= '&search_paymentmode='.urlencode($search_paymentmode);
+	$param .= '&search_paymentmode='.urlencode((string) ($search_paymentmode));
 }
 if ($search_paymentterms > 0) {
-	$param .= '&search_paymentterms='.urlencode($search_paymentterms);
+	$param .= '&search_paymentterms='.urlencode((string) ($search_paymentterms));
 }
 if ($search_module_source) {
 	$param .= '&search_module_source='.urlencode($search_module_source);
@@ -1171,7 +1171,7 @@ if ($search_pos_source) {
 	$param .= '&search_pos_source='.urlencode($search_pos_source);
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 if ($search_late) {
 	$param .= "&search_late=".urlencode($search_late);
@@ -1180,7 +1180,7 @@ if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
 if ($search_categ_cus > 0) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 if (!empty($search_fac_rec_source_title)) {
 	$param .= '&search_fac_rec_source_title='.urlencode($search_fac_rec_source_title);

From e1e3185c70de7f71fe650d0c0d863cd374d1ff74 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:53 +0100
Subject: [PATCH 0654/1862] Fix: Ensure string type for urlencode()

---
 htdocs/compta/paiement/cheque/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 284dbefcc54..7243c91f3c3 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -221,22 +221,22 @@ if ($resql) {
 		$param .= '&contextpage='.$contextpage;
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.$limit;
@@ -245,7 +245,7 @@ if ($resql) {
 		$param .= '&search_amount='.urlencode($search_amount);
 	}
 	if ($search_account > 0) {
-		$param .= '&search_account='.urlencode($search_account);
+		$param .= '&search_account='.urlencode((string) ($search_account));
 	}
 
 	$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new';

From 1c8e034c35b270ede2d4c288e0750bb6e6b9089f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:55 +0100
Subject: [PATCH 0655/1862] Fix: Ensure string type for urlencode()

---
 htdocs/compta/paiement/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index b59aff4bfc9..12c2ec797d8 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -339,22 +339,22 @@ if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_company) {
 	$param .= '&search_company='.urlencode($search_company);
@@ -366,7 +366,7 @@ if ($search_paymenttype) {
 	$param .= '&search_paymenttype='.urlencode($search_paymenttype);
 }
 if ($search_account) {
-	$param .= '&search_account='.urlencode($search_account);
+	$param .= '&search_account='.urlencode((string) ($search_account));
 }
 if ($search_payment_num) {
 	$param .= '&search_payment_num='.urlencode($search_payment_num);

From 106ff976b5d21c119072c46c9d10115cf565b1ab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:49:58 +0100
Subject: [PATCH 0656/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 691f6d903bf..c9f2401513b 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -506,7 +506,7 @@ if ($id > 0 || $ref) {
 		$num = $db->num_rows($result);
 		$i = 0;
 
-		$urladd = "&id=".urlencode($id);
+		$urladd = "&id=".urlencode((string) ($id));
 		if ($limit > 0 && $limit != $conf->liste_limit) {
 			$urladd .= '&limit='.((int) $limit);
 		}

From 475aa5497d9163c8b9c7bb82481720b70a2e2b64 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:00 +0100
Subject: [PATCH 0657/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 8102984f3b2..00934b0f0e6 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -185,7 +185,7 @@ if (empty($reshook)) {
 					setEventMessages($texttoshow, null);
 				}
 
-				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/card.php?id='.urlencode($bprev->id).'&type='.urlencode($type));
+				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/card.php?id='.urlencode((string) ($bprev->id)).'&type='.urlencode((string) ($type)));
 				exit;
 			}
 		}
@@ -462,7 +462,7 @@ if ($resql) {
 		$param .= '&limit='.((int) $limit);
 	}
 	if ($socid) {
-		$param .= '&socid='.urlencode($socid);
+		$param .= '&socid='.urlencode((string) ($socid));
 	}
 	if ($option) {
 		$param .= "&option=".urlencode($option);

From e2f6d646d3a7e29373c0c0b58f379b63704ca328 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:02 +0100
Subject: [PATCH 0658/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 09015486e30..1fe40efa05e 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -275,9 +275,9 @@ if ($resql) {
 	$i = 0;
 
 	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param.='&limit='.((int) $limit);
+		$param .= '&limit='.((int) $limit);
 	}
-	$param = "&id=".urlencode($id);
+	$param = "&id=".urlencode((string) ($id));
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -342,7 +342,7 @@ if ($resql) {
 		print '<tr class="oddeven">';
 
 		print '<td class="nowraponall">';
-		print ($salaryBonPl ? $salarytmp->getNomUrl(1) : $invoicetmp->getNomUrl(1));
+		print($salaryBonPl ? $salarytmp->getNomUrl(1) : $invoicetmp->getNomUrl(1));
 		print "</td>\n";
 
 		if ($object->type == 'bank-transfer' && !$salaryBonPl) {

From 86c1bb8fe57ce45fbf19e169bff9d2fa2aaae3c7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:04 +0100
Subject: [PATCH 0659/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 85e92020011..96d9a2d6b2c 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -111,7 +111,7 @@ if ($action == 'confirm_rejet' && $permissiontoadd) {
 				$result = $rej->create($user, $id, GETPOSTINT('motif'), $daterej, $lipre->bon_rowid, GETPOSTINT('facturer'));
 
 				if ($result > 0) {
-					header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
+					header("Location: line.php?id=".urlencode((string) ($id)).'&type='.urlencode((string) ($type)));
 					exit;
 				}
 			}
@@ -119,7 +119,7 @@ if ($action == 'confirm_rejet' && $permissiontoadd) {
 			$action = "rejet";
 		}
 	} else {
-		header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
+		header("Location: line.php?id=".urlencode((string) ($id)).'&type='.urlencode((string) ($type)));
 		exit;
 	}
 }
@@ -343,7 +343,7 @@ if ($id) {
 		$num = $db->num_rows($result);
 		$i = 0;
 
-		$urladd = "&id=".urlencode($id);
+		$urladd = "&id=".urlencode((string) ($id));
 		$title = $langs->trans("Bills");
 		if ($type == 'bank-transfer') {
 			$title = $langs->trans("SupplierInvoices");

From a696868f5c5965b07f22f884575b08fa46d8602d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:06 +0100
Subject: [PATCH 0660/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 23eee162758..b6dd673f37f 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -235,7 +235,7 @@ llxHeader('', $title, $help_url);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 $param = '';
-$param .= "&statut=".urlencode($statut);
+$param .= "&statut=".urlencode((string) ($statut));
 if ($type == 'bank-transfer') {
 	$param .= '&type=bank-transfer';
 }

From b43ec4056cb156b6e42a87aa687658819c6c3640 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:09 +0100
Subject: [PATCH 0661/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 0f2b503da99..5f07abd308a 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -328,7 +328,7 @@ if ($search_amount) {
 	$param .= '&search_amount='.urlencode($search_amount);
 }
 if ($search_typeid) {
-	$param .= '&search_typeid='.urlencode($search_typeid);
+	$param .= '&search_typeid='.urlencode((string) ($search_typeid));
 }
 if ($search_users) {
 	foreach ($search_users as $id_user) {
@@ -336,7 +336,7 @@ if ($search_users) {
 	}
 }
 if ($search_type) {
-	$param .= '&search_type='.urlencode($search_type);
+	$param .= '&search_type='.urlencode((string) ($search_type));
 }
 if ($search_account) {
 	$param .= '&search_account='.$search_account;
@@ -345,40 +345,40 @@ if ($search_status != '' && $search_status != '-1') {
 	$param .= '&search_status='.urlencode($search_status);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_date_limit_startday) {
-	$param .= '&search_date_limit_startday='.urlencode($search_date_limit_startday);
+	$param .= '&search_date_limit_startday='.urlencode((string) ($search_date_limit_startday));
 }
 if ($search_date_limit_startmonth) {
-	$param .= '&search_date_limit_startmonth='.urlencode($search_date_limit_startmonth);
+	$param .= '&search_date_limit_startmonth='.urlencode((string) ($search_date_limit_startmonth));
 }
 if ($search_date_limit_startyear) {
-	$param .= '&search_date_limit_startyear='.urlencode($search_date_limit_startyear);
+	$param .= '&search_date_limit_startyear='.urlencode((string) ($search_date_limit_startyear));
 }
 if ($search_date_limit_endday) {
-	$param .= '&search_date_limit_endday='.urlencode($search_date_limit_endday);
+	$param .= '&search_date_limit_endday='.urlencode((string) ($search_date_limit_endday));
 }
 if ($search_date_limit_endmonth) {
-	$param .= '&search_date_limit_endmonth='.urlencode($search_date_limit_endmonth);
+	$param .= '&search_date_limit_endmonth='.urlencode((string) ($search_date_limit_endmonth));
 }
 if ($search_date_limit_endyear) {
-	$param .= '&search_date_limit_endyear='.urlencode($search_date_limit_endyear);
+	$param .= '&search_date_limit_endyear='.urlencode((string) ($search_date_limit_endyear));
 }
 
 $url = DOL_URL_ROOT.'/compta/sociales/card.php?action=create';

From 3885d1ebfe8ae69b4d8fae53dde2c822b5b36ce3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:11 +0100
Subject: [PATCH 0662/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 22bde6bf509..b97882242e3 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -123,10 +123,10 @@ if ($sortorder) {
 	$param .= '&sortorder='.urlencode($sortorder);
 }
 if ($year) {
-	$param .= '&year='.urlencode($year);
+	$param .= '&year='.urlencode((string) ($year));
 }
 if ($search_sc_type) {
-	$param .= '&search_sc_type='.urlencode($search_sc_type);
+	$param .= '&search_sc_type='.urlencode((string) ($search_sc_type));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);

From 6ea6b52cf9ea15528f5e7d3f94f68b4becd45e45 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:13 +0100
Subject: [PATCH 0663/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 67714ae131e..66067b00e6e 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -368,7 +368,7 @@ $param .= "&month=".urlencode($month);
 $param .= "&year=".urlencode($year);
 $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
 if (!empty($socid)) {
-	$param .= "&socid=".urlencode($socid);
+	$param .= "&socid=".urlencode((string) ($socid));
 }
 $param .= "&type_element=".urlencode($type_element);
 
@@ -382,7 +382,7 @@ if ($sql_select) {
 
 	$num = $db->num_rows($resql);
 
-	$param = (!empty($socid) ? "&socid=".urlencode($socid) : "")."&type_element=".urlencode($type_element)."&id=".urlencode($id);
+	$param = (!empty($socid) ? "&socid=".urlencode((string) ($socid)) : "")."&type_element=".urlencode((string) ($type_element))."&id=".urlencode((string) ($id));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -396,10 +396,10 @@ if ($sql_select) {
 		$param .= "&sref=".urlencode($sref);
 	}
 	if ($month) {
-		$param .= "&month=".urlencode($month);
+		$param .= "&month=".urlencode((string) ($month));
 	}
 	if ($year) {
-		$param .= "&year=".urlencode($year);
+		$param .= "&year=".urlencode((string) ($year));
 	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);

From c877b3ddb30687d5c2c267b35b184b1b483377cb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:16 +0100
Subject: [PATCH 0664/1862] Fix: Ensure string type for urlencode()

---
 htdocs/contact/list.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 6fefaccd5cc..d391b2e8d4b 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -832,25 +832,25 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
-$param .= '&begin='.urlencode($begin).'&userid='.urlencode($userid).'&contactname='.urlencode($search_all);
+$param .= '&begin='.urlencode((string) ($begin)).'&userid='.urlencode((string) ($userid)).'&contactname='.urlencode((string) ($search_all));
 $param .= '&type='.urlencode($type).'&view='.urlencode($view);
 if (!empty($search_sale) && $search_sale != '-1') {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
 if (!empty($search_categ) && $search_categ != '-1') {
-	$param .= '&search_categ='.urlencode($search_categ);
+	$param .= '&search_categ='.urlencode((string) ($search_categ));
 }
 if (!empty($search_categ_thirdparty) && $search_categ_thirdparty != '-1') {
-	$param .= '&search_categ_thirdparty='.urlencode($search_categ_thirdparty);
+	$param .= '&search_categ_thirdparty='.urlencode((string) ($search_categ_thirdparty));
 }
 if (!empty($search_categ_supplier) && $search_categ_supplier != '-1') {
-	$param .= '&search_categ_supplier='.urlencode($search_categ_supplier);
+	$param .= '&search_categ_supplier='.urlencode((string) ($search_categ_supplier));
 }
 if ($search_all != '') {
 	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_id > 0) {
-	$param .= "&search_id=".urlencode($search_id);
+	$param .= "&search_id=".urlencode((string) ($search_id));
 }
 if ($search_lastname != '') {
 	$param .= '&search_lastname='.urlencode($search_lastname);
@@ -895,16 +895,16 @@ if ($search_email != '') {
 	$param .= '&search_email='.urlencode($search_email);
 }
 if ($search_no_email != '') {
-	$param .= '&search_no_email='.urlencode($search_no_email);
+	$param .= '&search_no_email='.urlencode((string) ($search_no_email));
 }
 if ($search_status != '') {
-	$param .= '&search_status='.urlencode($search_status);
+	$param .= '&search_status='.urlencode((string) ($search_status));
 }
 if ($search_priv == '0' || $search_priv == '1') {
 	$param .= "&search_priv=".urlencode($search_priv);
 }
 if ($search_stcomm != '') {
-	$param .= '&search_stcomm='.urlencode($search_stcomm);
+	$param .= '&search_stcomm='.urlencode((string) ($search_stcomm));
 }
 if (is_array($search_level) && count($search_level)) {
 	foreach ($search_level as $slevel) {
@@ -1688,7 +1688,7 @@ while ($i < $imaxinloop) {
 					$titlealt = $val['label'];
 				}
 				if ($obj->stcomm_id != $val['id']) {
-					print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommcontactid='.$obj->rowid.'&stcomm='.urlencode($val['code']).'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+					print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommcontactid='.$obj->rowid.'&stcomm='.urlencode((string) ($val['code'])).'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode((string) ($page)) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 				}
 			}
 			print '</div></div></td>';

From e2e55622f013226985a3676cb2518e28eefd054d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:19 +0100
Subject: [PATCH 0665/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 20345dd7d50..96c67a25af8 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -626,94 +626,94 @@ if ($search_op2df != '') {
 	$param .= '&search_op2df='.urlencode($search_op2df);
 }
 if ($search_date_creation_startmonth) {
-	$param .= '&search_date_creation_startmonth='.urlencode($search_date_creation_startmonth);
+	$param .= '&search_date_creation_startmonth='.urlencode((string) ($search_date_creation_startmonth));
 }
 if ($search_date_creation_startyear) {
-	$param .= '&search_date_creation_startyear='.urlencode($search_date_creation_startyear);
+	$param .= '&search_date_creation_startyear='.urlencode((string) ($search_date_creation_startyear));
 }
 if ($search_date_creation_startday) {
-	$param .= '&search_date_creation_startday='.urlencode($search_date_creation_startday);
+	$param .= '&search_date_creation_startday='.urlencode((string) ($search_date_creation_startday));
 }
 if ($search_date_creation_start) {
 	$param .= '&search_date_creation_start='.urlencode($search_date_creation_start);
 }
 if ($search_date_creation_endmonth) {
-	$param .= '&search_date_creation_endmonth='.urlencode($search_date_creation_endmonth);
+	$param .= '&search_date_creation_endmonth='.urlencode((string) ($search_date_creation_endmonth));
 }
 if ($search_date_creation_endyear) {
-	$param .= '&search_date_creation_endyear='.urlencode($search_date_creation_endyear);
+	$param .= '&search_date_creation_endyear='.urlencode((string) ($search_date_creation_endyear));
 }
 if ($search_date_creation_endday) {
-	$param .= '&search_date_creation_endday='.urlencode($search_date_creation_endday);
+	$param .= '&search_date_creation_endday='.urlencode((string) ($search_date_creation_endday));
 }
 if ($search_date_creation_end) {
 	$param .= '&search_date_creation_end='.urlencode($search_date_creation_end);
 }
 if ($search_date_modif_startmonth) {
-	$param .= '&search_date_modif_startmonth='.urlencode($search_date_modif_startmonth);
+	$param .= '&search_date_modif_startmonth='.urlencode((string) ($search_date_modif_startmonth));
 }
 if ($search_date_modif_startyear) {
-	$param .= '&search_date_modif_startyear='.urlencode($search_date_modif_startyear);
+	$param .= '&search_date_modif_startyear='.urlencode((string) ($search_date_modif_startyear));
 }
 if ($search_date_modif_startday) {
-	$param .= '&search_date_modif_startday='.urlencode($search_date_modif_startday);
+	$param .= '&search_date_modif_startday='.urlencode((string) ($search_date_modif_startday));
 }
 if ($search_date_modif_start) {
 	$param .= '&search_date_modif_start='.urlencode($search_date_modif_start);
 }
 if ($search_date_modif_endmonth) {
-	$param .= '&search_date_modif_endmonth='.urlencode($search_date_modif_endmonth);
+	$param .= '&search_date_modif_endmonth='.urlencode((string) ($search_date_modif_endmonth));
 }
 if ($search_date_modif_endyear) {
-	$param .= '&search_date_modif_endyear='.urlencode($search_date_modif_endyear);
+	$param .= '&search_date_modif_endyear='.urlencode((string) ($search_date_modif_endyear));
 }
 if ($search_date_modif_endday) {
-	$param .= '&search_date_modif_endday='.urlencode($search_date_modif_endday);
+	$param .= '&search_date_modif_endday='.urlencode((string) ($search_date_modif_endday));
 }
 if ($search_date_modif_end) {
 	$param .= '&search_date_modif_end=' . urlencode($search_date_modif_end);
 }
 if ($search_date_startday > 0) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth > 0) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear > 0) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday > 0) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth > 0) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear > 0) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_dfyear > 0) {
-	$param .= '&search_dfyear='.urlencode($search_dfyear);
+	$param .= '&search_dfyear='.urlencode((string) ($search_dfyear));
 }
 if ($search_dfmonth > 0) {
-	$param .= '&search_dfmonth='.urlencode($search_dfmonth);
+	$param .= '&search_dfmonth='.urlencode((string) ($search_dfmonth));
 }
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
 if ($search_user > 0) {
-	$param .= '&search_user='.urlencode($search_user);
+	$param .= '&search_user='.urlencode((string) ($search_user));
 }
 if ($search_type_thirdparty > 0) {
-	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 }
 if ($search_country != '') {
 	$param .= "&search_country=".urlencode($search_country);
 }
 if ($search_product_category > 0) {
-	$param .= '&search_product_category='.urlencode($search_product_category);
+	$param .= '&search_product_category='.urlencode((string) ($search_product_category));
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);

From 895c7714b620051ce3f32fbcafdbb56b1cc59ebc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:22 +0100
Subject: [PATCH 0666/1862] Fix: Ensure string type for urlencode()

---
 htdocs/contrat/messaging.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php
index f7e1b285291..8f3e5fac95e 100644
--- a/htdocs/contrat/messaging.php
+++ b/htdocs/contrat/messaging.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'contrat', 'companies'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'contratagenda';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contratagenda';
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -45,7 +45,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
@@ -56,7 +56,7 @@ $confirm	= GETPOST('confirm', 'alpha');
 $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
-$limit = GETPOSTINT('limit') ?GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -101,7 +101,7 @@ if (!$user->hasRight('contrat', 'lire')) {
 /*
  *	Actions
  */
-$parameters = array('id'=>$id);
+$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');
@@ -241,7 +241,7 @@ if (isModEnabled('agenda')) {
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 	print '<br>';
 
-	$param = '&id='.urlencode($id);
+	$param = '&id='.urlencode((string) ($id));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -254,9 +254,9 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	$cachekey = 'count_events_thirdparty_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
-		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	}
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);

From e21c3df6612b7ea0647d0d4fdf59e46d6584bb88 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:25 +0100
Subject: [PATCH 0667/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 48ee32f5de2..3fbd13840c2 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -321,7 +321,7 @@ if ($type == 'directory') {
 					$param .= '&website='.urlencode(GETPOST('website', 'alpha'));
 				}
 				if (!preg_match('/pageid=/', $param)) {
-					$param .= '&pageid='.urlencode(GETPOSTINT('pageid'));
+					$param .= '&pageid='.urlencode((string) (GETPOSTINT('pageid')));
 				}
 				//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 			}

From 83d8f9cdd7b2f59f7b137bab33b570fa2e74d1a9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:27 +0100
Subject: [PATCH 0668/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index 290a75738e0..686bc3566d0 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -197,7 +197,7 @@ class FileUpload
 	 */
 	protected function setFileDeleteUrl($file)
 	{
-		$file->delete_url = $this->options['script_url'].'?file='.urlencode($file->name).'&fk_element='.urlencode($this->fk_element).'&element='.urlencode($this->element);
+		$file->delete_url = $this->options['script_url'].'?file='.urlencode((string) ($file->name)).'&fk_element='.urlencode((string) ($this->fk_element)).'&element='.urlencode((string) ($this->element));
 		$file->delete_type = $this->options['delete_type'];
 		if ($file->delete_type !== 'DELETE') {
 			$file->delete_url .= '&_method=DELETE';

From 8195fa49d988cb54c6976bc21459465d770bbc27 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:30 +0100
Subject: [PATCH 0669/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fb7f4a0ea4d..1fe85f48a4f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1342,7 +1342,7 @@ class Form
 			}
 
 			// mode 1
-			$urloption = 'htmlname=' . urlencode(str_replace('.', '_', $htmlname)) . '&outjson=1&filter=' . urlencode($filter) . (empty($excludeids) ? '' : '&excludeids=' . implode(',', $excludeids)) . ($showtype ? '&showtype=' . urlencode($showtype) : '') . ($showcode ? '&showcode=' . urlencode($showcode) : '');
+			$urloption = 'htmlname=' . urlencode((string) (str_replace('.', '_', $htmlname))) . '&outjson=1&filter=' . urlencode((string) ($filter)) . (empty($excludeids) ? '' : '&excludeids=' . implode(',', $excludeids)) . ($showtype ? '&showtype=' . urlencode((string) ($showtype)) : '') . ($showcode ? '&showcode=' . urlencode((string) ($showcode)) : '');
 
 			$out .= '<!-- force css to be higher than dialog popup --><style type="text/css">.ui-autocomplete { z-index: 1010; }</style>';
 			if (empty($hidelabel)) {

From c7b1a924c2a033fa1e25a75beda5028c234d5cd5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:32 +0100
Subject: [PATCH 0670/1862] Fix: Ensure string type for urlencode()

---
 htdocs/core/lib/company.lib.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7caa6533194..a4cd09de402 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -229,7 +229,7 @@ function societe_prepare_head(Societe $object)
 
 		//if (isModEnabled('stripe') && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
 
-		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.urlencode($object->id);
+		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.urlencode((string) ($object->id));
 		$head[$h][1] = $title;
 		if ($foundonexternalonlinesystem) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
@@ -249,7 +249,7 @@ function societe_prepare_head(Societe $object)
 			$site_filter_list[] = 'dolibarr_portal';
 		}
 
-		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode($object->id);
+		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
@@ -333,7 +333,7 @@ function societe_prepare_head(Societe $object)
 				dol_setcache($cachekey, $nbNotif, 120);		// If setting cache fails, this is not a problem, so we do not test result.
 			}
 
-			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.urlencode($object->id);
+			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.urlencode((string) ($object->id));
 			$head[$h][1] = $langs->trans("Notifications");
 			if ($nbNotif > 0) {
 				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNotif.'</span>';
@@ -350,7 +350,7 @@ function societe_prepare_head(Societe $object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.urlencode($object->id);
+		$head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -1155,12 +1155,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print "\n".'<table class="tagtable liste">'."\n";
 
-	$param = "socid=".urlencode($object->id);
+	$param = "socid=".urlencode((string) ($object->id));
 	if ($search_rowid != '') {
-		$param .= '&search_rowid='.urlencode($search_rowid);
+		$param .= '&search_rowid='.urlencode((string) ($search_rowid));
 	}
 	if ($search_status != '') {
-		$param .= '&search_status='.urlencode($search_status);
+		$param .= '&search_status='.urlencode((string) ($search_status));
 	}
 	if (count($search_roles) > 0) {
 		$param .= implode('&search_roles[]=', $search_roles);

From d023b43da96841bd2947a92cbad3824cde5a3646 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:35 +0100
Subject: [PATCH 0671/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 9e6a39c63f9..14a80f1c751 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -47,7 +47,7 @@ function facture_prepare_head($object)
 
 	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?id='.urlencode($object->id);
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?id='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
@@ -73,7 +73,7 @@ function facture_prepare_head($object)
 		}
 		$langs->load("banks");
 
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?id='.urlencode($object->id);
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?id='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans('StandingOrders');
 		if ($nbStandingOrders > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
@@ -120,7 +120,7 @@ function facture_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -262,7 +262,7 @@ function invoice_rec_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda-rec.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -346,7 +346,7 @@ function getNumberInvoicesPieChart($mode)
 
 	if (($mode == 'customers' && isModEnabled('invoice') && $user->hasRight('facture', 'lire'))
 		|| ($mode == 'suppliers' && (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('fournisseur', 'facture', 'lire'))
-		) {
+	) {
 		global $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus8, $badgeStatus11;
 		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
@@ -402,7 +402,7 @@ function getNumberInvoicesPieChart($mode)
 									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)
 									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));
 				*/
-				$dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
+				$dataseries[$i] = array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
 				$i++;
 			}
 			if (!empty($dataseries[0])) {

From d994f5f7c5157bc4050789847f777a78383e2c18 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:37 +0100
Subject: [PATCH 0672/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 2e28a7c2655..ac8c85fe697 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -164,7 +164,7 @@ if (empty($reshook)) {
 	// Action update object
 	if ($action == 'update') {
 		if (!empty($cancel)) {
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode((string) ($id)));
 			exit;
 		}
 

From 040fc33b02f888b7c0eb5d4f24c89c8bdddc429c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:41 +0100
Subject: [PATCH 0673/1862] Fix: Ensure string type for urlencode()

---
 htdocs/don/paiement/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 4e25ab90823..b314131ca5b 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -269,22 +269,22 @@ if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_company) {
 	$param .= '&search_company='.urlencode($search_company);
@@ -296,7 +296,7 @@ if ($search_paymenttype) {
 	$param .= '&search_paymenttype='.urlencode($search_paymenttype);
 }
 if ($search_account) {
-	$param .= '&search_account='.urlencode($search_account);
+	$param .= '&search_account='.urlencode((string) ($search_account));
 }
 if ($search_payment_num) {
 	$param .= '&search_payment_num='.urlencode($search_payment_num);

From b37c850a4b1659920a592bff67d72cd08f36e58e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:44 +0100
Subject: [PATCH 0674/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 8c888b6792a..cc98e0173b4 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -110,7 +110,7 @@ $hookmanager->initHooks(array('ecmmediascard', 'globalcard'));
  */
 
 $savbacktopage = $backtopage;
-$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.urlencode($websitekey).'&pageid='.urlencode($pageid).(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
+$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.urlencode((string) ($websitekey)).'&pageid='.urlencode((string) ($pageid)).(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode((string) (GETPOST('section_dir', 'alpha'))) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
 if ($sortfield) {
 	$backtopage .= '&sortfield='.urlencode($sortfield);
 }
@@ -232,11 +232,11 @@ if ($action == 'refreshmanual') {
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
 				if ($id > 0) {
-					$newdirsql = array('id'=>$id,
-									 'id_mere'=>$ecmdirtmp->fk_parent,
-									 'label'=>$ecmdirtmp->label,
-									 'description'=>$ecmdirtmp->description,
-									 'fullrelativename'=>$relativepathmissing);
+					$newdirsql = array('id' => $id,
+									 'id_mere' => $ecmdirtmp->fk_parent,
+									 'label' => $ecmdirtmp->label,
+									 'description' => $ecmdirtmp->description,
+									 'fullrelativename' => $relativepathmissing);
 					$sqltree[] = $newdirsql; // We complete fulltree for following loops
 					//var_dump($sqltree);
 					$adirwascreated = 1;

From 4d8c3fc588b57f349231e33759d0c10183eb55ef Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:47 +0100
Subject: [PATCH 0675/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 0ff0e06936f..e71e7b2688b 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -258,7 +258,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
 
-		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.urlencode($id).'&type=conf';
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.urlencode((string) ($id)).'&type=conf';
 
 		$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);

From 049ff47d30ad8529400190cfd034fe5d55f40613 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:49 +0100
Subject: [PATCH 0676/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 6e752262eff..93ae78eeeb2 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -709,7 +709,7 @@ if ($confOrBooth->id > 0) {
 	$param .= '&conforboothid='.urlencode($confOrBooth->id);
 }
 if ($projectstatic->id > 0) {
-	$param .= '&fk_project='.urlencode($projectstatic->id);
+	$param .= '&fk_project='.urlencode((string) ($projectstatic->id));
 }
 $param .= $withProjectUrl;
 

From 1e5ae42b26b08a7f9855061f849d385eec400ee6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:52 +0100
Subject: [PATCH 0677/1862] Fix: Ensure string type for urlencode()

---
 htdocs/expedition/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 37e1c6a4e17..86309c6da9f 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -528,10 +528,10 @@ if ($search_ref_customer) {
 	$param .= "&search_ref_customer=".urlencode($search_ref_customer);
 }
 if ($search_user > 0) {
-	$param .= '&search_user='.urlencode($search_user);
+	$param .= '&search_user='.urlencode((string) ($search_user));
 }
 if ($search_sale > 0) {
-	$param .= '&search_sale='.urlencode($search_sale);
+	$param .= '&search_sale='.urlencode((string) ($search_sale));
 }
 if ($search_company) {
 	$param .= "&search_company=".urlencode($search_company);
@@ -551,7 +551,7 @@ if ($search_zip) {
 	$param .= '&search_zip='.urlencode($search_zip);
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 }
 if ($search_datedelivery_start) {
 	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
@@ -566,10 +566,10 @@ if ($search_datereceipt_end) {
 	$param .= '&search_datereceipt_endday='.urlencode(dol_print_date($search_datereceipt_end, '%d')).'&search_datereceipt_endmonth='.urlencode(dol_print_date($search_datereceipt_end, '%m')).'&search_datereceipt_endyear='.urlencode(dol_print_date($search_datereceipt_end, '%Y'));
 }
 if ($search_product_category != '') {
-	$param .= '&search_product_category='.urlencode($search_product_category);
+	$param .= '&search_product_category='.urlencode((string) ($search_product_category));
 }
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 if ($search_status != '') {
 	$param .= '&search_status='.urlencode($search_status);

From 823c67585016e6a00c34acd4cdc10031d910cfa6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:50:55 +0100
Subject: [PATCH 0678/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 7809b47105b..1b4f33382a2 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -260,7 +260,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Confirm validation
 		if ($action == 'cloture') {
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".urlencode($id), $langs->trans("CloseShipment"), $langs->trans("ConfirmCloseShipment"), "confirm_cloture");
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".urlencode((string) ($id)), $langs->trans("CloseShipment"), $langs->trans("ConfirmCloseShipment"), "confirm_cloture");
 		}
 
 		// Call Hook formConfirm
@@ -794,7 +794,7 @@ if ($id > 0 || !empty($ref)) {
 							print ' '.img_warning($langs->trans("StockTooLow"));
 							if (getDolGlobalString('STOCK_CORRECT_STOCK_IN_SHIPMENT')) {
 								$nbPiece = $toBeShipped[$objp->fk_product] - $product->stock_reel;
-								print ' &nbsp; '.$langs->trans("GoTo").' <a href="'.DOL_URL_ROOT.'/product/stock/product.php?id='.((int) $product->id).'&action=correction&nbpiece='.urlencode($nbPiece).'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.((int) $object->id)).'">'.$langs->trans("CorrectStock").'</a>';
+								print ' &nbsp; '.$langs->trans("GoTo").' <a href="'.DOL_URL_ROOT.'/product/stock/product.php?id='.((int) $product->id).'&action=correction&nbpiece='.urlencode((string) ($nbPiece)).'&backtopage='.urlencode((string) ($_SERVER["PHP_SELF"].'?id='.((int) $object->id))).'">'.$langs->trans("CorrectStock").'</a>';
 							}
 						}
 						print '</td>';

From 888ac3edeeb22d60397ec245f66cbef05ae89410 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:00 +0100
Subject: [PATCH 0679/1862] Fix: Ensure string type for urlencode()

---
 htdocs/expensereport/list.php | 78 +++++++++++++++++------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 06fb2d4e9ac..6cc403e87d5 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -149,29 +149,29 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'd.ref'=>'Ref',
-	'd.note_public'=>"NotePublic",
-	'u.lastname'=>'EmployeeLastname',
-	'u.firstname'=>"EmployeeFirstname",
-	'u.login'=>"Login",
+	'd.ref' => 'Ref',
+	'd.note_public' => "NotePublic",
+	'u.lastname' => 'EmployeeLastname',
+	'u.firstname' => "EmployeeFirstname",
+	'u.login' => "Login",
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["d.note_private"] = "NotePrivate";
 }
 
 $arrayfields = array(
-	'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'user'=>array('label'=>$langs->trans("User"), 'checked'=>1),
-	'd.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1),
-	'd.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
-	'd.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
-	'd.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1),
-	'd.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-	'd.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
-	'd.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
-	'd.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'd.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	'user' => array('label' => $langs->trans("User"), 'checked' => 1),
+	'd.date_debut' => array('label' => $langs->trans("DateStart"), 'checked' => 1),
+	'd.date_fin' => array('label' => $langs->trans("DateEnd"), 'checked' => 1),
+	'd.date_valid' => array('label' => $langs->trans("DateValidation"), 'checked' => 1),
+	'd.date_approve' => array('label' => $langs->trans("DateApprove"), 'checked' => 1),
+	'd.total_ht' => array('label' => $langs->trans("AmountHT"), 'checked' => 1),
+	'd.total_vat' => array('label' => $langs->trans("AmountVAT"), 'checked' => 1),
+	'd.total_ttc' => array('label' => $langs->trans("AmountTTC"), 'checked' => 1),
+	'd.date_create' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'd.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),
+	'd.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -193,7 +193,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -397,41 +397,41 @@ if ($resql) {
 	}
 	// Start date
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_startendday) {
-		$param .= '&search_date_startendday='.urlencode($search_date_startendday);
+		$param .= '&search_date_startendday='.urlencode((string) ($search_date_startendday));
 	}
 	if ($search_date_startendmonth) {
-		$param .= '&search_date_startendmonth='.urlencode($search_date_startendmonth);
+		$param .= '&search_date_startendmonth='.urlencode((string) ($search_date_startendmonth));
 	}
 	if ($search_date_startendyear) {
-		$param .= '&search_date_startendyear='.urlencode($search_date_startendyear);
+		$param .= '&search_date_startendyear='.urlencode((string) ($search_date_startendyear));
 	}
 	// End date
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_date_endendday) {
-		$param .= '&search_date_endendday='.urlencode($search_date_endendday);
+		$param .= '&search_date_endendday='.urlencode((string) ($search_date_endendday));
 	}
 	if ($search_date_endendmonth) {
-		$param .= '&search_date_endendmonth='.urlencode($search_date_endendmonth);
+		$param .= '&search_date_endendmonth='.urlencode((string) ($search_date_endendmonth));
 	}
 	if ($search_date_endendyear) {
-		$param .= '&search_date_endendyear='.urlencode($search_date_endendyear);
+		$param .= '&search_date_endendyear='.urlencode((string) ($search_date_endendyear));
 	}
 	if ($search_user) {
 		$param .= "&search_user=".urlencode($search_user);
@@ -453,9 +453,9 @@ if ($resql) {
 
 	// List of mass actions available
 	$arrayofmassactions = array(
-		'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"),
+		'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"),
 	);
 	if ($user->hasRight('expensereport', 'supprimer')) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -519,8 +519,8 @@ if ($resql) {
 			$url .= '&socid='.$socid;
 		}
 		$newcardbutton = '';
-		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 		$newcardbutton .= dolGetButtonTitleSeparator();
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('expensereport', 'creer'));
 
@@ -638,7 +638,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
@@ -714,7 +714,7 @@ if ($resql) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['d.date_create']['checked'])) {
@@ -921,7 +921,7 @@ if ($resql) {
 				// Extra fields
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 				// Fields from hook
-				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+				$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 
@@ -990,7 +990,7 @@ if ($resql) {
 
 	$db->free($resql);
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 

From 310550f67621af85d5ace9067b8fe73b20de2b68 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:04 +0100
Subject: [PATCH 0680/1862] Fix: Ensure string type for urlencode()

---
 htdocs/expensereport/payment/list.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index d0c10e49a56..88cd5ecb2d0 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -274,22 +274,22 @@ if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_user) {
 	$param .= '&search_user='.urlencode($search_user);
@@ -305,7 +305,7 @@ if ($search_amount) {
 }
 
 if ($search_bank_account) {
-	$param .= '&search_bank_account='.urlencode($search_bank_account);
+	$param .= '&search_bank_account='.urlencode((string) ($search_bank_account));
 }
 
 // Add $param from extra fields

From d234c97992224c8a076c256c1b65f063b5bca3df Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:09 +0100
Subject: [PATCH 0681/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
index ec91ebd4ae9..e348b888d55 100644
--- a/htdocs/fichinter/agenda.php
+++ b/htdocs/fichinter/agenda.php
@@ -95,7 +95,7 @@ restrictedArea($user, 'ficheinter', $object->id, 'fichinter', '', 'fk_soc', 'row
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -189,14 +189,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.(property_exists($object, 'module') ? '@'.$object->module : ''))).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From f98eba183328a5809accb3740b1632c5e0ac31ff Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:12 +0100
Subject: [PATCH 0682/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 89d86259763..20878a34e16 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -436,7 +436,7 @@ if ($search_all) {
 	$param .= "&search_all=".urlencode($search_all);
 }
 if ($socid) {
-	$param .= "&socid=".urlencode($socid);
+	$param .= "&socid=".urlencode((string) ($socid));
 }
 if ($search_ref) {
 	$param .= "&search_ref=".urlencode($search_ref);
@@ -454,25 +454,25 @@ if ($search_status != '' && $search_status > -1) {
 	$param .= "&search_status=".urlencode($search_status);
 }
 if ($search_date_startday > 0) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth > 0) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear > 0) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday > 0) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth > 0) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear > 0) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);

From 3a6e3404e2e1e20a94622ae1883bf428d765e400 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:16 +0100
Subject: [PATCH 0683/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index e3729dc7423..0f716bcecc1 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1423,7 +1423,7 @@ if (empty($reshook)) {
 				$_GET['socid'] = $_POST['socid'];
 			} else {
 				$db->commit();
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode((string) ($id)));
 				exit;
 			}
 		}

From 97a20b8aa92dd3517443fbf3e30275bc087e9698 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:19 +0100
Subject: [PATCH 0684/1862] Fix: Ensure string type for urlencode()

---
 htdocs/fourn/commande/list.php | 112 ++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c4d93209600..1bab50ecddd 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -586,7 +586,7 @@ if (empty($reshook)) {
 
 			if ($nb_bills_created == 1) {
 				$texttoshow = $langs->trans('BillXCreated', '{s1}');
-				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?id='.urlencode((string) ($lastid)).'">'.$lastref.'</a>', $texttoshow);
 				setEventMessages($texttoshow, null, 'mesgs');
 			} else {
 				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
@@ -607,82 +607,82 @@ if (empty($reshook)) {
 				$param .= '&sall='.urlencode($sall);
 			}
 			if ($socid > 0) {
-				$param .= '&socid='.urlencode($socid);
+				$param .= '&socid='.urlencode((string) ($socid));
 			}
 			if ($search_status != '') {
 				$param .= '&search_status='.urlencode($search_status);
 			}
 			if ($search_date_order_startday) {
-				$param .= '&search_date_order_startday='.urlencode($search_date_order_startday);
+				$param .= '&search_date_order_startday='.urlencode((string) ($search_date_order_startday));
 			}
 			if ($search_date_order_startmonth) {
-				$param .= '&search_date_order_startmonth='.urlencode($search_date_order_startmonth);
+				$param .= '&search_date_order_startmonth='.urlencode((string) ($search_date_order_startmonth));
 			}
 			if ($search_date_order_startyear) {
-				$param .= '&search_date_order_startyear='.urlencode($search_date_order_startyear);
+				$param .= '&search_date_order_startyear='.urlencode((string) ($search_date_order_startyear));
 			}
 			if ($search_date_order_endday) {
-				$param .= '&search_date_order_endday='.urlencode($search_date_order_endday);
+				$param .= '&search_date_order_endday='.urlencode((string) ($search_date_order_endday));
 			}
 			if ($search_date_order_endmonth) {
-				$param .= '&search_date_order_endmonth='.urlencode($search_date_order_endmonth);
+				$param .= '&search_date_order_endmonth='.urlencode((string) ($search_date_order_endmonth));
 			}
 			if ($search_date_order_endyear) {
-				$param .= '&search_date_order_endyear='.urlencode($search_date_order_endyear);
+				$param .= '&search_date_order_endyear='.urlencode((string) ($search_date_order_endyear));
 			}
 			if ($search_date_delivery_startday) {
-				$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
+				$param .= '&search_date_delivery_startday='.urlencode((string) ($search_date_delivery_startday));
 			}
 			if ($search_date_delivery_startmonth) {
-				$param .= '&search_date_delivery_startmonth='.urlencode($search_date_delivery_startmonth);
+				$param .= '&search_date_delivery_startmonth='.urlencode((string) ($search_date_delivery_startmonth));
 			}
 			if ($search_date_delivery_startyear) {
-				$param .= '&search_date_delivery_startyear='.urlencode($search_date_delivery_startyear);
+				$param .= '&search_date_delivery_startyear='.urlencode((string) ($search_date_delivery_startyear));
 			}
 			if ($search_date_delivery_endday) {
-				$param .= '&search_date_delivery_endday='.urlencode($search_date_delivery_endday);
+				$param .= '&search_date_delivery_endday='.urlencode((string) ($search_date_delivery_endday));
 			}
 			if ($search_date_delivery_endmonth) {
-				$param .= '&search_date_delivery_endmonth='.urlencode($search_date_delivery_endmonth);
+				$param .= '&search_date_delivery_endmonth='.urlencode((string) ($search_date_delivery_endmonth));
 			}
 			if ($search_date_delivery_endyear) {
-				$param .= '&search_date_delivery_endyear='.urlencode($search_date_delivery_endyear);
+				$param .= '&search_date_delivery_endyear='.urlencode((string) ($search_date_delivery_endyear));
 			}
 			if ($search_date_valid_startday) {
-				$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+				$param .= '&search_date_valid_startday='.urlencode((string) ($search_date_valid_startday));
 			}
 			if ($search_date_valid_startmonth) {
-				$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+				$param .= '&search_date_valid_startmonth='.urlencode((string) ($search_date_valid_startmonth));
 			}
 			if ($search_date_valid_startyear) {
-				$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+				$param .= '&search_date_valid_startyear='.urlencode((string) ($search_date_valid_startyear));
 			}
 			if ($search_date_valid_endday) {
-				$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+				$param .= '&search_date_valid_endday='.urlencode((string) ($search_date_valid_endday));
 			}
 			if ($search_date_valid_endmonth) {
-				$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+				$param .= '&search_date_valid_endmonth='.urlencode((string) ($search_date_valid_endmonth));
 			}
 			if ($search_date_valid_endyear) {
-				$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+				$param .= '&search_date_valid_endyear='.urlencode((string) ($search_date_valid_endyear));
 			}
 			if ($search_date_approve_startday) {
-				$param .= '&search_date_approve_startday='.urlencode($search_date_approve_startday);
+				$param .= '&search_date_approve_startday='.urlencode((string) ($search_date_approve_startday));
 			}
 			if ($search_date_approve_startmonth) {
-				$param .= '&search_date_approve_startmonth='.urlencode($search_date_approve_startmonth);
+				$param .= '&search_date_approve_startmonth='.urlencode((string) ($search_date_approve_startmonth));
 			}
 			if ($search_date_approve_startyear) {
-				$param .= '&search_date_approve_startyear='.urlencode($search_date_approve_startyear);
+				$param .= '&search_date_approve_startyear='.urlencode((string) ($search_date_approve_startyear));
 			}
 			if ($search_date_approve_endday) {
-				$param .= '&search_date_approve_endday='.urlencode($search_date_approve_endday);
+				$param .= '&search_date_approve_endday='.urlencode((string) ($search_date_approve_endday));
 			}
 			if ($search_date_approve_endmonth) {
-				$param .= '&search_date_approve_endmonth='.urlencode($search_date_approve_endmonth);
+				$param .= '&search_date_approve_endmonth='.urlencode((string) ($search_date_approve_endmonth));
 			}
 			if ($search_date_approve_endyear) {
-				$param .= '&search_date_approve_endyear='.urlencode($search_date_approve_endyear);
+				$param .= '&search_date_approve_endyear='.urlencode((string) ($search_date_approve_endyear));
 			}
 			if ($search_ref) {
 				$param .= '&search_ref='.urlencode($search_ref);
@@ -695,7 +695,7 @@ if (empty($reshook)) {
 			}
 			//if ($search_ref_customer)	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 			if ($search_user > 0) {
-				$param .= '&search_user='.urlencode($search_user);
+				$param .= '&search_user='.urlencode((string) ($search_user));
 			}
 			if ($search_sale > 0) {
 				$param .= '&search_sale='.urlencode($search_sale);
@@ -713,7 +713,7 @@ if (empty($reshook)) {
 				$param .= "&search_project_ref=".urlencode($search_project_ref);
 			}
 			if ($show_files) {
-				$param .= '&show_files='.urlencode($show_files);
+				$param .= '&show_files='.urlencode((string) ($show_files));
 			}
 			if ($optioncss != '') {
 				$param .= '&optioncss='.urlencode($optioncss);
@@ -1034,82 +1034,82 @@ if ($resql) {
 		$param .= '&sall='.urlencode($sall);
 	}
 	if ($socid > 0) {
-		$param .= '&socid='.urlencode($socid);
+		$param .= '&socid='.urlencode((string) ($socid));
 	}
 	if ($sall) {
 		$param .= "&search_all=".urlencode($sall);
 	}
 	if ($search_date_order_startday) {
-		$param .= '&search_date_order_startday='.urlencode($search_date_order_startday);
+		$param .= '&search_date_order_startday='.urlencode((string) ($search_date_order_startday));
 	}
 	if ($search_date_order_startmonth) {
-		$param .= '&search_date_order_startmonth='.urlencode($search_date_order_startmonth);
+		$param .= '&search_date_order_startmonth='.urlencode((string) ($search_date_order_startmonth));
 	}
 	if ($search_date_order_startyear) {
-		$param .= '&search_date_order_startyear='.urlencode($search_date_order_startyear);
+		$param .= '&search_date_order_startyear='.urlencode((string) ($search_date_order_startyear));
 	}
 	if ($search_date_order_endday) {
-		$param .= '&search_date_order_endday='.urlencode($search_date_order_endday);
+		$param .= '&search_date_order_endday='.urlencode((string) ($search_date_order_endday));
 	}
 	if ($search_date_order_endmonth) {
-		$param .= '&search_date_order_endmonth='.urlencode($search_date_order_endmonth);
+		$param .= '&search_date_order_endmonth='.urlencode((string) ($search_date_order_endmonth));
 	}
 	if ($search_date_order_endyear) {
-		$param .= '&search_date_order_endyear='.urlencode($search_date_order_endyear);
+		$param .= '&search_date_order_endyear='.urlencode((string) ($search_date_order_endyear));
 	}
 	if ($search_date_delivery_startday) {
-		$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
+		$param .= '&search_date_delivery_startday='.urlencode((string) ($search_date_delivery_startday));
 	}
 	if ($search_date_delivery_startmonth) {
-		$param .= '&search_date_delivery_startmonth='.urlencode($search_date_delivery_startmonth);
+		$param .= '&search_date_delivery_startmonth='.urlencode((string) ($search_date_delivery_startmonth));
 	}
 	if ($search_date_delivery_startyear) {
-		$param .= '&search_date_delivery_startyear='.urlencode($search_date_delivery_startyear);
+		$param .= '&search_date_delivery_startyear='.urlencode((string) ($search_date_delivery_startyear));
 	}
 	if ($search_date_delivery_endday) {
-		$param .= '&search_date_delivery_endday='.urlencode($search_date_delivery_endday);
+		$param .= '&search_date_delivery_endday='.urlencode((string) ($search_date_delivery_endday));
 	}
 	if ($search_date_delivery_endmonth) {
-		$param .= '&search_date_delivery_endmonth='.urlencode($search_date_delivery_endmonth);
+		$param .= '&search_date_delivery_endmonth='.urlencode((string) ($search_date_delivery_endmonth));
 	}
 	if ($search_date_delivery_endyear) {
-		$param .= '&search_date_delivery_endyear='.urlencode($search_date_delivery_endyear);
+		$param .= '&search_date_delivery_endyear='.urlencode((string) ($search_date_delivery_endyear));
 	}
 	if ($search_date_valid_startday) {
-		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+		$param .= '&search_date_valid_startday='.urlencode((string) ($search_date_valid_startday));
 	}
 	if ($search_date_valid_startmonth) {
-		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+		$param .= '&search_date_valid_startmonth='.urlencode((string) ($search_date_valid_startmonth));
 	}
 	if ($search_date_valid_startyear) {
-		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+		$param .= '&search_date_valid_startyear='.urlencode((string) ($search_date_valid_startyear));
 	}
 	if ($search_date_valid_endday) {
-		$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+		$param .= '&search_date_valid_endday='.urlencode((string) ($search_date_valid_endday));
 	}
 	if ($search_date_valid_endmonth) {
-		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+		$param .= '&search_date_valid_endmonth='.urlencode((string) ($search_date_valid_endmonth));
 	}
 	if ($search_date_valid_endyear) {
-		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+		$param .= '&search_date_valid_endyear='.urlencode((string) ($search_date_valid_endyear));
 	}
 	if ($search_date_approve_startday) {
-		$param .= '&search_date_approve_startday='.urlencode($search_date_approve_startday);
+		$param .= '&search_date_approve_startday='.urlencode((string) ($search_date_approve_startday));
 	}
 	if ($search_date_approve_startmonth) {
-		$param .= '&search_date_approve_startmonth='.urlencode($search_date_approve_startmonth);
+		$param .= '&search_date_approve_startmonth='.urlencode((string) ($search_date_approve_startmonth));
 	}
 	if ($search_date_approve_startyear) {
-		$param .= '&search_date_approve_startyear='.urlencode($search_date_approve_startyear);
+		$param .= '&search_date_approve_startyear='.urlencode((string) ($search_date_approve_startyear));
 	}
 	if ($search_date_approve_endday) {
-		$param .= '&search_date_approve_endday='.urlencode($search_date_approve_endday);
+		$param .= '&search_date_approve_endday='.urlencode((string) ($search_date_approve_endday));
 	}
 	if ($search_date_approve_endmonth) {
-		$param .= '&search_date_approve_endmonth='.urlencode($search_date_approve_endmonth);
+		$param .= '&search_date_approve_endmonth='.urlencode((string) ($search_date_approve_endmonth));
 	}
 	if ($search_date_approve_endyear) {
-		$param .= '&search_date_approve_endyear='.urlencode($search_date_approve_endyear);
+		$param .= '&search_date_approve_endyear='.urlencode((string) ($search_date_approve_endyear));
 	}
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
@@ -1121,7 +1121,7 @@ if ($resql) {
 		$param .= '&search_company_alias='.urlencode($search_company_alias);
 	}
 	if ($search_user > 0) {
-		$param .= '&search_user='.urlencode($search_user);
+		$param .= '&search_user='.urlencode((string) ($search_user));
 	}
 	if ($search_request_author) {
 		$param .= '&search_request_author='.urlencode($search_request_author);
@@ -1163,13 +1163,13 @@ if ($resql) {
 		$param .= "&search_billed=".urlencode($search_billed);
 	}
 	if ($show_files) {
-		$param .= '&show_files='.urlencode($show_files);
+		$param .= '&show_files='.urlencode((string) ($show_files));
 	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+		$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 	}
 
 	// Add $param from extra fields

From 24b0a17c30ffc528fe90fc0c5ee72c530cd189dc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:23 +0100
Subject: [PATCH 0685/1862] Fix: Ensure string type for urlencode()

---
 htdocs/fourn/facture/list-rec.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 00e7c8c0a67..62531e8a569 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -432,43 +432,43 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if ($socid > 0) {
-	$param .= '&socid='.urlencode($socid);
+	$param .= '&socid='.urlencode((string) ($socid));
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_date_when_startday) {
-	$param .= '&search_date_when_startday='.urlencode($search_date_when_startday);
+	$param .= '&search_date_when_startday='.urlencode((string) ($search_date_when_startday));
 }
 if ($search_date_when_startmonth) {
-	$param .= '&search_date_when_startmonth='.urlencode($search_date_when_startmonth);
+	$param .= '&search_date_when_startmonth='.urlencode((string) ($search_date_when_startmonth));
 }
 if ($search_date_when_startyear) {
-	$param .= '&search_date_when_startyear='.urlencode($search_date_when_startyear);
+	$param .= '&search_date_when_startyear='.urlencode((string) ($search_date_when_startyear));
 }
 if ($search_date_when_endday) {
-	$param .= '&search_date_when_endday='.urlencode($search_date_when_endday);
+	$param .= '&search_date_when_endday='.urlencode((string) ($search_date_when_endday));
 }
 if ($search_date_when_endmonth) {
-	$param .= '&search_date_when_endmonth='.urlencode($search_date_when_endmonth);
+	$param .= '&search_date_when_endmonth='.urlencode((string) ($search_date_when_endmonth));
 }
 if ($search_date_when_endyear) {
-	$param .= '&search_date_when_endyear='.urlencode($search_date_when_endyear);
+	$param .= '&search_date_when_endyear='.urlencode((string) ($search_date_when_endyear));
 }
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);

From beb0cfe5b429efa42d989b171f3292ee49a490ca Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:26 +0100
Subject: [PATCH 0686/1862] Fix: Ensure string type for urlencode()

---
 htdocs/fourn/facture/list.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 901419f4013..642b4612358 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -839,22 +839,22 @@ if ($search_date_end) {
 	$param .= buildParamDate('search_date_end', null, '', 'tzserver');
 }
 if ($search_datelimit_startday) {
-	$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
+	$param .= '&search_datelimit_startday='.urlencode((string) ($search_datelimit_startday));
 }
 if ($search_datelimit_startmonth) {
-	$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+	$param .= '&search_datelimit_startmonth='.urlencode((string) ($search_datelimit_startmonth));
 }
 if ($search_datelimit_startyear) {
-	$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+	$param .= '&search_datelimit_startyear='.urlencode((string) ($search_datelimit_startyear));
 }
 if ($search_datelimit_endday) {
-	$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+	$param .= '&search_datelimit_endday='.urlencode((string) ($search_datelimit_endday));
 }
 if ($search_datelimit_endmonth) {
-	$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+	$param .= '&search_datelimit_endmonth='.urlencode((string) ($search_datelimit_endmonth));
 }
 if ($search_datelimit_endyear) {
-	$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
+	$param .= '&search_datelimit_endyear='.urlencode((string) ($search_datelimit_endyear));
 }
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
@@ -920,13 +920,13 @@ if ($search_status >= 0) {
 	$param .= "&search_status=".urlencode($search_status);
 }
 if ($search_paymentmode) {
-	$param .= '&search_paymentmode='.urlencode($search_paymentmode);
+	$param .= '&search_paymentmode='.urlencode((string) ($search_paymentmode));
 }
 if ($search_paymentcond) {
-	$param .= '&search_paymentcond='.urlencode($search_paymentcond);
+	$param .= '&search_paymentcond='.urlencode((string) ($search_paymentcond));
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 if ($option) {
 	$param .= "&search_option=".urlencode($option);
@@ -935,7 +935,7 @@ if ($search_categ_sup > 0) {
 	$param .= '&search_categ_sup='.urlencode($search_categ_sup);
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 }
 
 // Add $param from extra fields
@@ -967,7 +967,7 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $url = DOL_URL_ROOT.'/fourn/facture/card.php?action=create';
 if (!empty($socid)) {
-	$url .= '&socid='.urlencode($socid);
+	$url .= '&socid='.urlencode((string) ($socid));
 }
 
 $i = 0;

From 81e8da34efe2409167b2af22b102bcf62cbc6d10 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:29 +0100
Subject: [PATCH 0687/1862] Fix: Ensure string type for urlencode()

---
 htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index f1bccfcad6d..6ebb4f03f4f 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -36,7 +36,8 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $langs->load("bills");
 
-$total = 0; $ilink = 0;
+$total = 0;
+$ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
@@ -69,7 +70,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		} else {
 			echo $objectlink->getLibStatut(3);
 		} ?></td>
-		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.urlencode($object->id).'&action=dellink&token='.newToken().'&dellinkid='.urlencode($key); ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.urlencode((string) ($object->id)).'&action=dellink&token='.newToken().'&dellinkid='.urlencode((string) ($key)); ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }

From 6a2a50d10b398fa24c85623fa139439071647e6d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:32 +0100
Subject: [PATCH 0688/1862] Fix: Ensure string type for urlencode()

---
 htdocs/fourn/paiement/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 466f7beaedd..8445377e946 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -307,22 +307,22 @@ if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_company) {
 	$param .= '&search_company='.urlencode($search_company);

From b18d226c28b53410cd02b12a50688cb4f329e458 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:34 +0100
Subject: [PATCH 0689/1862] Fix: Ensure string type for urlencode()

---
 htdocs/holiday/list.php | 58 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 58a073fcad3..42c2d0808f6 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -111,26 +111,26 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'cp.ref'=>'Ref',
-	'cp.description'=>'Description',
-	'uu.lastname'=>'EmployeeLastname',
-	'uu.firstname'=>'EmployeeFirstname',
-	'uu.login'=>'Login'
+	'cp.ref' => 'Ref',
+	'cp.description' => 'Description',
+	'uu.lastname' => 'EmployeeLastname',
+	'uu.firstname' => 'EmployeeFirstname',
+	'uu.login' => 'Login'
 );
 
 $arrayfields = array(
-	'cp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'cp.fk_user'=>array('label'=>$langs->trans("Employee"), 'checked'=>1, 'position'=>20),
-	'cp.fk_validator'=>array('label'=>$langs->trans("ValidatorCP"), 'checked'=>1, 'position'=>30),
-	'cp.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1, 'position'=>35),
-	'duration'=>array('label'=>$langs->trans("NbUseDaysCPShort"), 'checked'=>1, 'position'=>38),
-	'cp.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>40),
-	'cp.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>42),
-	'cp.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1, 'position'=>60),
-	'cp.date_approval'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1, 'position'=>70),
-	'cp.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'cp.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>501),
-	'cp.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'cp.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	'cp.fk_user' => array('label' => $langs->trans("Employee"), 'checked' => 1, 'position' => 20),
+	'cp.fk_validator' => array('label' => $langs->trans("ValidatorCP"), 'checked' => 1, 'position' => 30),
+	'cp.fk_type' => array('label' => $langs->trans("Type"), 'checked' => 1, 'position' => 35),
+	'duration' => array('label' => $langs->trans("NbUseDaysCPShort"), 'checked' => 1, 'position' => 38),
+	'cp.date_debut' => array('label' => $langs->trans("DateStart"), 'checked' => 1, 'position' => 40),
+	'cp.date_fin' => array('label' => $langs->trans("DateEnd"), 'checked' => 1, 'position' => 42),
+	'cp.date_valid' => array('label' => $langs->trans("DateValidation"), 'checked' => 1, 'position' => 60),
+	'cp.date_approval' => array('label' => $langs->trans("DateApprove"), 'checked' => 1, 'position' => 70),
+	'cp.date_create' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'cp.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 501),
+	'cp.statut' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -183,7 +183,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -451,10 +451,10 @@ if ($search_employee > 0) {
 	$param .= '&search_employee='.urlencode($search_employee);
 }
 if ($search_valideur > 0) {
-	$param .= '&search_valideur='.urlencode($search_valideur);
+	$param .= '&search_valideur='.urlencode((string) ($search_valideur));
 }
 if ($search_type > 0) {
-	$param .= '&search_type='.urlencode($search_type);
+	$param .= '&search_type='.urlencode((string) ($search_type));
 }
 if ($search_status > 0) {
 	$param .= '&search_status='.urlencode($search_status);
@@ -538,8 +538,8 @@ if ($id > 0) {		// For user tab
 
 
 	$newcardbutton = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->hasRight('holiday', 'write'));
 
@@ -575,7 +575,7 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters = array('type'=>$type);
+	$parameters = array('type' => $type);
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '</div>';
@@ -701,7 +701,7 @@ if (!empty($arrayfields['cp.date_approval']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -787,7 +787,7 @@ if (!empty($arrayfields['cp.date_approval']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['cp.date_create']['checked'])) {
@@ -809,7 +809,7 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 print '</tr>'."\n";
 
-$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+$listhalfday = array('morning' => $langs->trans("Morning"), "afternoon" => $langs->trans("Afternoon"));
 
 
 // Loop on record
@@ -895,7 +895,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 					$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
 				}
 
-				$arraydata = array('user'=>$userstatic, 'labeltype'=>$labeltypeleavetoshow, 'selected'=>$selected, 'nbopenedday'=>$nbopenedday);
+				$arraydata = array('user' => $userstatic, 'labeltype' => $labeltypeleavetoshow, 'selected' => $selected, 'nbopenedday' => $nbopenedday);
 			}
 			print $holidaystatic->getKanbanView('', $arraydata);
 			if ($i == ($imaxinloop - 1)) {
@@ -1004,7 +1004,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
@@ -1086,7 +1086,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From a39cf7318665e5d9958bad19dfb298700ee17536 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:37 +0100
Subject: [PATCH 0690/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index f38ee1a7069..6f10f9c9ce9 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -119,16 +119,16 @@ if (empty($reshook)) {
 }
 
 $arrayfields = array(
-	'cp.ref'=>array('label' => 'Ref', 'checked'=>1, 'position'=>5),
-	'cp.fk_type'=>array('label' => 'Type', 'checked'=>1, 'position'=>10),
-	'cp.fk_user'=>array('label' => 'Employee', 'checked'=>1, 'position'=>20),
-	'cp.date_debut'=>array('label' => 'DateDebCP', 'checked'=>-1, 'position'=>30),
-	'cp.date_fin'=>array('label' => 'DateFinCP', 'checked'=>-1, 'position'=>32),
-	'used_days'=>array('label' => 'NbUseDaysCPShort', 'checked'=>-1, 'position'=>34),
-	'date_start_month'=>array('label' => 'DateStartInMonth', 'checked'=>1, 'position'=>50),
-	'date_end_month'=>array('label' => 'DateEndInMonth', 'checked'=>1, 'position'=>52),
-	'used_days_month'=>array('label' => 'NbUseDaysCPShortInMonth', 'checked'=>1, 'position'=>54),
-	'cp.description'=>array('label' => 'DescCP', 'checked'=>-1, 'position'=>800),
+	'cp.ref' => array('label' => 'Ref', 'checked' => 1, 'position' => 5),
+	'cp.fk_type' => array('label' => 'Type', 'checked' => 1, 'position' => 10),
+	'cp.fk_user' => array('label' => 'Employee', 'checked' => 1, 'position' => 20),
+	'cp.date_debut' => array('label' => 'DateDebCP', 'checked' => -1, 'position' => 30),
+	'cp.date_fin' => array('label' => 'DateFinCP', 'checked' => -1, 'position' => 32),
+	'used_days' => array('label' => 'NbUseDaysCPShort', 'checked' => -1, 'position' => 34),
+	'date_start_month' => array('label' => 'DateStartInMonth', 'checked' => 1, 'position' => 50),
+	'date_end_month' => array('label' => 'DateEndInMonth', 'checked' => 1, 'position' => 52),
+	'used_days_month' => array('label' => 'NbUseDaysCPShortInMonth', 'checked' => 1, 'position' => 54),
+	'cp.description' => array('label' => 'DescCP', 'checked' => -1, 'position' => 800),
 );
 
 
@@ -140,7 +140,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $holidaystatic = new Holiday($db);
 
-$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+$listhalfday = array('morning' => $langs->trans("Morning"), "afternoon" => $langs->trans("Afternoon"));
 
 $title = $langs->trans('CPTitreMenu');
 
@@ -194,7 +194,7 @@ if (!empty($search_ref)) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
 if (!empty($search_employee)) {
-	$param .= '&search_employee='.urlencode($search_employee);
+	$param .= '&search_employee='.urlencode((string) ($search_employee));
 }
 if (!empty($search_type)) {
 	$param .= '&search_type='.urlencode($search_type);

From 68661a67e22e4edcecbda6c0df7e8fa73984f82d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:40 +0100
Subject: [PATCH 0691/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 8aafba502ad..0820c283618 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -249,22 +249,22 @@ if (!empty($search_id)) {
 	$param .= '&search_status='.urlencode($search_status);
 }
 if (!empty($search_month) && $search_month > 0) {
-	$param .= '&search_month='.urlencode($search_month);
+	$param .= '&search_month='.urlencode((string) ($search_month));
 }
 if (!empty($search_year) && $search_year > 0) {
-	$param .= '&search_year='.urlencode($search_year);
+	$param .= '&search_year='.urlencode((string) ($search_year));
 }
 if (!empty($search_validator) && $search_validator > 0) {
-	$param .= '&search_validator='.urlencode($search_validator);
+	$param .= '&search_validator='.urlencode((string) ($search_validator));
 }
 if (!empty($search_employee) && $search_employee > 0) {
-	$param .= '&search_employee='.urlencode($search_employee);
+	$param .= '&search_employee='.urlencode((string) ($search_employee));
 }
 if (!empty($search_description)) {
 	$param .= '&search_description='.urlencode($search_description);
 }
 if (!empty($search_type) && $search_type > 0) {
-	$param .= '&search_type='.urlencode($search_type);
+	$param .= '&search_type='.urlencode((string) ($search_type));
 }
 if (!empty($search_prev_solde)) {
 	$param .= '&search_prev_solde='.urlencode($search_prev_solde);

From 2d8649dfc35815bc2ebdcfd972c4490ea1b393f6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:43 +0100
Subject: [PATCH 0692/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index a65c659e867..4507ba5764f 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -110,7 +110,7 @@ if (!$permissiontoread) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -186,14 +186,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 7155358f123c745bf1d81861b47f61bcde45c0fa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:46 +0100
Subject: [PATCH 0693/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index 074f5e008f1..6fffa6934e4 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -108,7 +108,7 @@ if (!$permissiontoread) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -155,7 +155,7 @@ if ($object->id > 0) {
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 
@@ -178,14 +178,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 1a27b8081a5d1864dd67e03b46b67e1508228f28 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:49 +0100
Subject: [PATCH 0694/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index ae37771e4c2..49f269d8efa 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -111,7 +111,7 @@ if (!$permissiontoread) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -186,14 +186,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';
@@ -231,7 +231,7 @@ if ($object->id > 0) {
 		$filters['search_agenda_label'] = $search_agenda_label;
 		$filters['search_rowid'] = $search_rowid;
 
-		$object->fields['label']=array(); // Useful to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
+		$object->fields['label'] = array(); // Useful to get only agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
 
 		// TODO Replace this with same code than into list.php
 		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);

From 1691c2eff4374e6c0d1da1cf38bd29db27793803 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:52 +0100
Subject: [PATCH 0695/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index 92fa94e9c4d..a469ded4cf9 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -110,7 +110,7 @@ if (!$permissiontoread) {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -157,7 +157,7 @@ if ($object->id > 0) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 
@@ -180,14 +180,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From ae726f2bc7f1b250f2c8371960fdf6a42e508d21 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:55 +0100
Subject: [PATCH 0696/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 4bfd8068589..7adc9ea0eb7 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -247,7 +247,7 @@ if ($id > 0 && $action != 'edit') {
 			);
 		}
 		print $form->formconfirm(
-			"card.php?rowid=".urlencode($id),
+			"card.php?rowid=".urlencode((string) ($id)),
 			$langs->trans("DeleteReport"),
 			$langs->trans("ConfirmDeleteReport"),
 			"confirm_delete",

From 0b0c858af7a03111c1f1b95a603e7079c78a32ef Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:51:58 +0100
Subject: [PATCH 0697/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 77c814d60c9..4ed3b95b63b 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -98,7 +98,7 @@ $permissiontoadd = $user->hasRight('knowledgemanagement', 'knowledgerecord', 'wr
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -203,14 +203,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From b6b4d6ccf27c30bc44ae9a67ac0ee9fe4ddb7c37 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:01 +0100
Subject: [PATCH 0698/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index ec20266337e..2afeb25b322 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -67,7 +67,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('loan',
 	$result = $payment->delete($user);
 	if ($result > 0) {
 		$db->commit();
-		header("Location: ".DOL_URL_ROOT."/loan/card.php?id=".urlencode($fk_loan));
+		header("Location: ".DOL_URL_ROOT."/loan/card.php?id=".urlencode((string) ($fk_loan)));
 		exit;
 	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');

From 364fcd313be46de1d6fd3dac9ceee9482e7a46e6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:03 +0100
Subject: [PATCH 0699/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 3c2fa4bca90..bd47dd65d95 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -208,22 +208,22 @@ if (!empty($agentid)) {
 	$param .= "&amp;agentid=".urlencode($agentid);
 }
 if (!empty($startdateday)) {
-	$param .= "&amp;startdateday=".urlencode($startdateday);
+	$param .= "&amp;startdateday=".urlencode((string) ($startdateday));
 }
 if (!empty($startdatemonth)) {
-	$param .= "&amp;startdatemonth=".urlencode($startdatemonth);
+	$param .= "&amp;startdatemonth=".urlencode((string) ($startdatemonth));
 }
 if (!empty($startdateyear)) {
-	$param .= "&amp;startdateyear=".urlencode($startdateyear);
+	$param .= "&amp;startdateyear=".urlencode((string) ($startdateyear));
 }
 if (!empty($enddateday)) {
-	$param .= "&amp;enddateday=".urlencode($enddateday);
+	$param .= "&amp;enddateday=".urlencode((string) ($enddateday));
 }
 if (!empty($enddatemonth)) {
-	$param .= "&amp;enddatemonth=".urlencode($enddatemonth);
+	$param .= "&amp;enddatemonth=".urlencode((string) ($enddatemonth));
 }
 if (!empty($enddateyear)) {
-	$param .= "&amp;enddateyear=".urlencode($enddateyear);
+	$param .= "&amp;enddateyear=".urlencode((string) ($enddateyear));
 }
 
 

From 1066ee61ca6bbe8ec8a5a78a07f3fd086c9ba234 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:06 +0100
Subject: [PATCH 0700/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 197f1b5e5dc..6d1a5a85d06 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2918,7 +2918,7 @@ if ($dirins && $action == "update_menu" && GETPOSTINT('menukey') && GETPOST('tab
 				if ($result < 0) {
 					setEventMessages($langs->trans('ErrorMenuExistValue'), null, 'errors');
 					//var_dump($_SESSION);exit;
-					header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key + 1));
+					header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode((string) ($key + 1)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.($key + 1));
 					exit;
 				}
 
@@ -4703,7 +4703,7 @@ if ($module == 'initmodule') {
 
 			if ($action == 'deletedict') {
 				$formconfirm = $form->formconfirm(
-					$_SERVER["PHP_SELF"].'?dictionnarykey='.urlencode(GETPOSTINT('dictionnarykey')).'&tab='.urlencode($tab).'&module='.urlencode($module),
+					$_SERVER["PHP_SELF"].'?dictionnarykey='.urlencode((string) (GETPOSTINT('dictionnarykey'))).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)),
 					$langs->trans('Delete'),
 					$langs->trans('Confirm Delete Dictionnary', GETPOST('dictionnarykey', 'alpha')),
 					'confirm_deletedictionary',
@@ -4915,8 +4915,8 @@ if ($module == 'initmodule') {
 								print '</td>';
 
 								print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
-								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editdict&token='.newToken().'&dictionnarykey='.urlencode($i + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_edit().'</a>';
-								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletedict&token='.newToken().'&dictionnarykey='.urlencode($i + 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'">'.img_delete().'</a>';
+								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editdict&token='.newToken().'&dictionnarykey='.urlencode((string) ($i + 1)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'">'.img_edit().'</a>';
+								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletedict&token='.newToken().'&dictionnarykey='.urlencode((string) ($i + 1)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'">'.img_delete().'</a>';
 								print '</td>';
 
 								print '</tr>';
@@ -5071,7 +5071,7 @@ if ($module == 'initmodule') {
 
 			if ($action == 'deletemenu') {
 				$formconfirms = $form->formconfirm(
-					$_SERVER["PHP_SELF"].'?menukey='.urlencode(GETPOSTINT('menukey')).'&tab='.urlencode($tab).'&module='.urlencode($module),
+					$_SERVER["PHP_SELF"].'?menukey='.urlencode((string) (GETPOSTINT('menukey'))).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)),
 					$langs->trans('Delete'),
 					($menus[GETPOST('menukey')]['fk_menu'] === 'fk_mainmenu='.strtolower($module) ? $langs->trans('Warning: you will delete all menus linked to this one.', GETPOSTINT('menukey')) : $langs->trans('Confirm Delete Menu', GETPOSTINT('menukey'))),
 					'confirm_deletemenu',
@@ -5387,8 +5387,8 @@ if ($module == 'initmodule') {
 							print '</td>';
 							print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
 							if ($menu['titre'] != 'Module'.$module.'Name') {
-								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($i).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
-								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i - 1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode((string) ($i)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.urlencode((string) ($tabobj)).'">'.img_edit().'</a>';
+								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode((string) ($i - 1)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.urlencode((string) ($tabobj)).'">'.img_delete().'</a>';
 							}
 							print '</td>';
 						}
@@ -5503,7 +5503,7 @@ if ($module == 'initmodule') {
 
 			if ($action == 'deleteright') {
 				$formconfirm = $form->formconfirm(
-					$_SERVER["PHP_SELF"].'?permskey='.urlencode(GETPOSTINT('permskey')).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj),
+					$_SERVER["PHP_SELF"].'?permskey='.urlencode((string) (GETPOSTINT('permskey'))).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.urlencode((string) ($tabobj)),
 					$langs->trans('Delete'),
 					$langs->trans('Confirm Delete Right', GETPOST('permskey', 'alpha')),
 					'confirm_deleteright',
@@ -5657,7 +5657,7 @@ if ($module == 'initmodule') {
 
 							print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
 							print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=edit_right&token='.newToken().'&permskey='.urlencode($perm[0]).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
-							print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deleteright&token='.newToken().'&permskey='.urlencode($i).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+							print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deleteright&token='.newToken().'&permskey='.urlencode((string) ($i)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.urlencode((string) ($tabobj)).'">'.img_delete().'</a>';
 
 							print '</td>';
 

From 35d087c0a179d1cc2219c23617c02b8033ce2668 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:09 +0100
Subject: [PATCH 0701/1862] Fix: Ensure string type for urlencode()

---
 htdocs/mrp/mo_movements.php | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index b5395b9b04b..bab5f6aa68f 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -119,22 +119,22 @@ $objectlist = new MouvementStock($db);
 
 // Definition of fields for list
 $arrayfields = array(
-	'm.rowid'=>array('label'=>"Ref", 'checked'=>1, 'position'=>1),
-	'm.datem'=>array('label'=>"Date", 'checked'=>1, 'position'=>2),
-	'p.ref'=>array('label'=>"ProductRef", 'checked'=>1, 'css'=>'maxwidth100', 'position'=>3),
-	'p.label'=>array('label'=>"ProductLabel", 'checked'=>0, 'position'=>5),
-	'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(isModEnabled('productbatch'))),
-	'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(isModEnabled('productbatch'))),
-	'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
-	'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
-	'm.fk_user_author'=>array('label'=>"Author", 'checked'=>0, 'position'=>120),
-	'm.inventorycode'=>array('label'=>"InventoryCodeShort", 'checked'=>1, 'position'=>130),
-	'm.label'=>array('label'=>"MovementLabel", 'checked'=>1, 'position'=>140),
-	'm.type_mouvement'=>array('label'=>"TypeMovement", 'checked'=>0, 'position'=>150),
-	'origin'=>array('label'=>"Origin", 'checked'=>1, 'position'=>155),
-	'm.fk_projet'=>array('label'=>'Project', 'checked'=>0, 'position'=>180),
-	'm.value'=>array('label'=>"Qty", 'checked'=>1, 'position'=>200),
-	'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210)
+	'm.rowid' => array('label' => "Ref", 'checked' => 1, 'position' => 1),
+	'm.datem' => array('label' => "Date", 'checked' => 1, 'position' => 2),
+	'p.ref' => array('label' => "ProductRef", 'checked' => 1, 'css' => 'maxwidth100', 'position' => 3),
+	'p.label' => array('label' => "ProductLabel", 'checked' => 0, 'position' => 5),
+	'm.batch' => array('label' => "BatchNumberShort", 'checked' => 1, 'position' => 8, 'enabled' => (isModEnabled('productbatch'))),
+	'pl.eatby' => array('label' => "EatByDate", 'checked' => 0, 'position' => 9, 'enabled' => (isModEnabled('productbatch'))),
+	'pl.sellby' => array('label' => "SellByDate", 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
+	'e.ref' => array('label' => "Warehouse", 'checked' => 1, 'position' => 100, 'enabled' => (!($id > 0))), // If we are on specific warehouse, we hide it
+	'm.fk_user_author' => array('label' => "Author", 'checked' => 0, 'position' => 120),
+	'm.inventorycode' => array('label' => "InventoryCodeShort", 'checked' => 1, 'position' => 130),
+	'm.label' => array('label' => "MovementLabel", 'checked' => 1, 'position' => 140),
+	'm.type_mouvement' => array('label' => "TypeMovement", 'checked' => 0, 'position' => 150),
+	'origin' => array('label' => "Origin", 'checked' => 1, 'position' => 155),
+	'm.fk_projet' => array('label' => 'Project', 'checked' => 0, 'position' => 180),
+	'm.value' => array('label' => "Qty", 'checked' => 1, 'position' => 200),
+	'm.price' => array('label' => "UnitPurchaseValue", 'checked' => 0, 'position' => 210)
 	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
 );
@@ -521,7 +521,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$param .= '&limit='.((int) $limit);
 	}
 	if ($id > 0) {
-		$param .= '&id='.urlencode($id);
+		$param .= '&id='.urlencode((string) ($id));
 	}
 	if ($search_movement) {
 		$param .= '&search_movement='.urlencode($search_movement);
@@ -728,7 +728,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
@@ -1010,7 +1010,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (!empty($arrayfields['m.value']['checked'])) {
 			// Qty
 			print '<td class="right">';
-			if ($objp->qty >0) {
+			if ($objp->qty > 0) {
 				print '<span class="stockmovemententry">+'.$objp->qty.'</span>';
 			} else {
 				print '<span class="stockmovementexit">'.$objp->qty.'<span>';

From 8b8f1c9410796cf2f683cd670c0ab8367aae9952 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:12 +0100
Subject: [PATCH 0702/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 0f0fd217047..851809edb21 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -112,7 +112,7 @@ if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -217,14 +217,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From d5168010263b46d5698d3d38f094eecfe8ae017c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:15 +0100
Subject: [PATCH 0703/1862] Fix: Ensure string type for urlencode()

---
 htdocs/partnership/partnership_list.php | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index c810e09f554..327b8e7988e 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -136,11 +136,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -598,10 +598,10 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if ($socid) {
-	$param .= '&socid='.urlencode($socid);
+	$param .= '&socid='.urlencode((string) ($socid));
 }
 if ($memberid) {
-	$param .= '&rowid='.urlencode($memberid);
+	$param .= '&rowid='.urlencode((string) ($memberid));
 }
 foreach ($search as $key => $val) {
 	if (is_array($search[$key])) {
@@ -634,11 +634,11 @@ $param .= $hookmanager->resPrint;
 // List of mass actions available
 $arrayofmassactions = array(
 	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
-	'approve'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ValidateAndApprove"),
-	'cancel'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
+	'approve' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ValidateAndApprove"),
+	'cancel' => img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
 	//'generate_doc'=>img_picto('', 'pdf').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>img_picto('', 'pdf').$langs->trans("PDFMerge"),
-	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendMail"),
+	'presend' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendMail"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -669,8 +669,8 @@ if ($socid) {
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/partnership/partnership_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -710,7 +710,7 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters = array('type'=>$type);
+	$parameters = array('type' => $type);
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '</div>';
@@ -777,7 +777,7 @@ foreach ($object->fields as $key => $val) {
 // End of subscription date
 if ($managedfor == 'member') {
 	print '<td class="liste_titre center">';
-	$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
+	$selectarray = array('-1' => '', 'withoutsubscription' => $langs->trans("WithoutSubscription"), 'uptodate' => $langs->trans("UpToDate"), 'outofdate' => $langs->trans("OutOfDate"));
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
 }
@@ -785,7 +785,7 @@ if ($managedfor == 'member') {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -833,7 +833,7 @@ if ($managedfor == 'member') {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -897,7 +897,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('thirdparty'=>$object->thirdparty, 'selected' => $selected));
+		print $object->getKanbanView('', array('thirdparty' => $object->thirdparty, 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -999,7 +999,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$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
@@ -1047,7 +1047,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 4d83ffd7db59fd4aac88a44e547a0fb4eec50d51 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:18 +0100
Subject: [PATCH 0704/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index cd9bda1e9f3..41be7d6a956 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -233,16 +233,16 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 		$paymentType = 'Sale';
 	}
 
-	$nvpstr = $nvpstr."&AMT=".urlencode($paymentAmount); // Total for all elements
+	$nvpstr = $nvpstr."&AMT=".urlencode((string) ($paymentAmount)); // Total for all elements
 
 	$nvpstr = $nvpstr."&".$paypalprefix."INVNUM=".urlencode($tag);
-	$nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-	$nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+	$nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode((string) ($paymentAmount)); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+	$nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode((string) ($paymentAmount)); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
 	$nvpstr = $nvpstr."&".$paypalprefix."PAYMENTACTION=".urlencode($paymentType); // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
 	$nvpstr = $nvpstr."&".$paypalprefix."CURRENCYCODE=".urlencode($currencyCodeType); // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
 
 	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
-	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode((string) ($paymentAmount));
 	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
 	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
 

From 2f4108e7384cb6787751d204acd785460cce6430 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:21 +0100
Subject: [PATCH 0705/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d9a95678e81..b848078cc20 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -90,7 +90,9 @@ if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 }
 
-$mesg = ''; $error = 0; $errors = array();
+$mesg = '';
+$error = 0;
+$errors = array();
 
 $refalreadyexists = 0;
 
@@ -216,7 +218,7 @@ if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode',
 	$createbarcode = 0;
 }
 
-$parameters = array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$parameters = array('id' => $id, 'ref' => $ref, 'objcanvas' => $objcanvas);
 $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');
@@ -1182,7 +1184,7 @@ if (empty($reshook)) {
 				);
 
 				if ($result > 0) {
-					header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".urlencode($commande->id));
+					header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".urlencode((string) ($commande->id)));
 					exit;
 				}
 			} elseif (GETPOST('factureid') > 0) {
@@ -1480,7 +1482,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					if (empty($fk_barcode_type) && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE')) {
 						$fk_barcode_type = getDolGlobalInt("PRODUIT_DEFAULT_BARCODE_TYPE");
 					} else {
-						$fk_barcode_type=0;
+						$fk_barcode_type = 0;
 					}
 				}
 				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
@@ -1666,7 +1668,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Other attributes
-			$parameters = array('colspan' => ' colspan="2"', 'cols'=>2);
+			$parameters = array('colspan' => ' colspan="2"', 'cols' => 2);
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			if (empty($reshook)) {
@@ -2695,9 +2697,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td>';
 					print $object->duration_value;
 					if ($object->duration_value > 1) {
-						$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+						$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
 					} elseif ($object->duration_value > 0) {
-						$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+						$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
 					}
 					print(!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? "&nbsp;".$langs->trans($dur[$object->duration_unit])."&nbsp;" : '');
 
@@ -2882,7 +2884,7 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 	// Define confirmation messages
 	$formquestionclone = array(
 		'text' => $langs->trans("ConfirmClone"),
-		array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'morecss'=>'width150'),
+		array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'morecss' => 'width150'),
 		array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
 		array('type' => 'checkbox', 'name' => 'clone_categories', 'label' => $langs->trans("CloneCategoriesProduct"), 'value' => 1),
 	);

From 4d53e828d2916f48fd7d8d7cc92d1ce5bf9f690b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:23 +0100
Subject: [PATCH 0706/1862] Fix: Ensure string type for urlencode()

---
 htdocs/product/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 92f95dad523..1fe8ae87fa5 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -748,7 +748,7 @@ if ($sall) {
 	$param .= "&sall=".urlencode($sall);
 }
 if ($searchCategoryProductOperator == 1) {
-	$param .= "&search_category_product_operator=".urlencode($searchCategoryProductOperator);
+	$param .= "&search_category_product_operator=".urlencode((string) ($searchCategoryProductOperator));
 }
 foreach ($searchCategoryProductList as $searchCategoryProduct) {
 	$param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
@@ -778,22 +778,22 @@ if ($search_tobatch) {
 	$param .= "&search_tobatch=".urlencode($search_tobatch);
 }
 if ($search_country != '') {
-	$param .= "&search_country=".urlencode($search_country);
+	$param .= "&search_country=".urlencode((string) ($search_country));
 }
 if ($search_state != '') {
-	$param .= "&search_state=".urlencode($search_state);
+	$param .= "&search_state=".urlencode((string) ($search_state));
 }
 if ($search_vatrate) {
 	$param .= "&search_vatrate=".urlencode($search_vatrate);
 }
 if ($fourn_id > 0) {
-	$param .= "&fourn_id=".urlencode($fourn_id);
+	$param .= "&fourn_id=".urlencode((string) ($fourn_id));
 }
 if ($show_childproducts) {
 	$param .= ($show_childproducts ? "&search_show_childproducts=".urlencode($show_childproducts) : "");
 }
 if ($type != '') {
-	$param .= '&type='.urlencode($type);
+	$param .= '&type='.urlencode((string) ($type));
 }
 if ($search_type != '') {
 	$param .= '&search_type='.urlencode($search_type);

From ccc8b19e071fc13a25fb7b5473f0a68aa89a71aa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:27 +0100
Subject: [PATCH 0707/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a7ca019a763..32d15a43939 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -360,10 +360,10 @@ if ($resql) {
 		$param .= "&tobuy=".urlencode($tobuy);
 	}
 	if ($type != '') {
-		$param .= "&type=".urlencode($type);
+		$param .= "&type=".urlencode((string) ($type));
 	}
 	if ($fourn_id) {
-		$param .= "&fourn_id=".urlencode($fourn_id);
+		$param .= "&fourn_id=".urlencode((string) ($fourn_id));
 	}
 	if ($snom) {
 		$param .= "&snom=".urlencode($snom);
@@ -375,13 +375,13 @@ if ($resql) {
 		$param .= "&search_sale=".urlencode($search_sale);
 	}
 	if ($search_categ > 0) {
-		$param .= "&search_categ=".urlencode($search_categ);
+		$param .= "&search_categ=".urlencode((string) ($search_categ));
 	}
 	if ($search_toolowstock) {
 		$param .= "&search_toolowstock=".urlencode($search_toolowstock);
 	}
 	if ($sbarcode) {
-		$param .= "&sbarcode=".urlencode($sbarcode);
+		$param .= "&sbarcode=".urlencode((string) ($sbarcode));
 	}
 	if ($search_stock_physique) {
 		$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
@@ -519,7 +519,7 @@ if ($resql) {
 	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", '', $param, "", $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", '', $param, "", $sortfield, $sortorder, 'right ');
 	// Hook fields
-	$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -617,7 +617,7 @@ if ($resql) {
 		print '<td class="right nowrap">'.$product->LibStatut($objp->statut, 5, 0).'</td>';
 		print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
 		// Fields from hook
-		$parameters = array('obj'=>$objp);
+		$parameters = array('obj' => $objp);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column

From 318faa061b82829566f0ca19e409c9b7023d8a47 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:30 +0100
Subject: [PATCH 0708/1862] Fix: Ensure string type for urlencode()

---
 htdocs/product/reassortlot.php | 44 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index d78e47d5dfe..07873e790ad 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -139,15 +139,15 @@ $result = restrictedArea($user, 'produit|service', 0, 'product&product');
 
 // Definition of array of fields for columns
 $arrayfields = array(
-	array('type'=>'varchar', 'label'=>'Ref', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'varchar', 'label'=>'Label', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'int', 'label'=>'Warehouse', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'varchar', 'label'=>'Lot', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'varchar', 'label'=>'DLC', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'varchar', 'label'=>'DLUO', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'int', 'label'=>'Stock', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'int', 'label'=>'StatusSell', 'checked'=>1, 'enabled'=>1, 'position'=>1),
-	array('type'=>'int', 'label'=>'StatusBuy', 'checked'=>1, 'enabled'=>1, 'position'=>1),
+	array('type' => 'varchar', 'label' => 'Ref', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'varchar', 'label' => 'Label', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'int', 'label' => 'Warehouse', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'varchar', 'label' => 'Lot', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'varchar', 'label' => 'DLC', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'varchar', 'label' => 'DLUO', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'int', 'label' => 'Stock', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'int', 'label' => 'StatusSell', 'checked' => 1, 'enabled' => 1, 'position' => 1),
+	array('type' => 'int', 'label' => 'StatusBuy', 'checked' => 1, 'enabled' => 1, 'position' => 1),
 );
 
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
@@ -214,11 +214,11 @@ if (empty($reshook)) {
 	}
 
 	// Mass actions
-		/*$objectclass = 'MyObject';
-		$objectlabel = 'MyObject';
-		$uploaddir = $conf->mymodule->dir_output;
-		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-		*/
+	/*$objectclass = 'MyObject';
+	$objectlabel = 'MyObject';
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	*/
 }
 
 
@@ -489,10 +489,10 @@ if ($tobuy) {
 	$param .= "&tobuy=".urlencode($tobuy);
 }
 if ($type != '') {
-	$param .= "&type=".urlencode($type);
+	$param .= "&type=".urlencode((string) ($type));
 }
 if ($fourn_id) {
-	$param .= "&fourn_id=".urlencode($fourn_id);
+	$param .= "&fourn_id=".urlencode((string) ($fourn_id));
 }
 if ($snom) {
 	$param .= "&snom=".urlencode($snom);
@@ -504,7 +504,7 @@ if ($search_batch) {
 	$param .= "&search_batch=".urlencode($search_batch);
 }
 if ($sbarcode) {
-	$param .= "&sbarcode=".urlencode($sbarcode);
+	$param .= "&sbarcode=".urlencode((string) ($sbarcode));
 }
 if ($search_warehouse) {
 	$param .= "&search_warehouse=".urlencode($search_warehouse);
@@ -519,10 +519,10 @@ if ($search_sale) {
 	$param .= "&search_sale=".urlencode($search_sale);
 }
 if (!empty($search_categ) && $search_categ != '-1') {
-	$param .= "&search_categ=".urlencode($search_categ);
+	$param .= "&search_categ=".urlencode((string) ($search_categ));
 }
 if (!empty($search_warehouse_categ) && $search_warehouse_categ != '-1') {
-	$param .= "&search_warehouse_categ=".urlencode($search_warehouse_categ);
+	$param .= "&search_warehouse_categ=".urlencode((string) ($search_warehouse_categ));
 }
 if ($search_stock_physique) {
 	$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
@@ -574,7 +574,7 @@ if (isModEnabled('category')) {
 	$moreforfilter .= '</div>';
 }
 
-$moreforfilter.='<label for="search_subjecttolotserial">'.$langs->trans("SubjectToLotSerialOnly").' </label><input type="checkbox" id="search_subjecttolotserial" name="search_subjecttolotserial" value="1"'.($search_subjecttolotserial ? ' checked' : '').'>';
+$moreforfilter .= '<label for="search_subjecttolotserial">'.$langs->trans("SubjectToLotSerialOnly").' </label><input type="checkbox" id="search_subjecttolotserial" name="search_subjecttolotserial" value="1"'.($search_subjecttolotserial ? ' checked' : '').'>';
 
 
 if (!empty($moreforfilter)) {
@@ -686,7 +686,7 @@ print_liste_field_titre('');
 print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
 // Hook fields
-$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -875,7 +875,7 @@ while ($i < $imaxinloop) {
 	}
 
 	// Fields values from hook
-	$parameters = array('obj'=>$objp);
+	$parameters = array('obj' => $objp);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 

From 25b0da26e04d4579beaf2560378098132a08d6b3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:33 +0100
Subject: [PATCH 0709/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index b0257248690..73714afa21c 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -82,7 +82,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object = $product;
 
-	$parameters = array('id'=>$id);
+	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -130,7 +130,7 @@ 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();
+		$product_cache = array();
 		$bom_data_result = array();
 
 		//Qauntity  to produce
@@ -283,7 +283,7 @@ if ($id > 0 || !empty($ref)) {
 		print_barre_liste($langs->trans("BOMs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', count($bom_data_result), count($bom_data_result), '', 0, '', '', $limit, 0, 0, 1);
 
 		if (!empty($page)) {
-			$option .= '&page='.urlencode($page);
+			$option .= '&page='.urlencode((string) ($page));
 		}
 
 		print '<div class="div-table-responsive">';

From dbda44cf2088a5b8744940c64dc243ef33a4e430 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:35 +0100
Subject: [PATCH 0710/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 315f39590d3..8c9dbd7830b 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -204,10 +204,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				if ($search_status != '') {
@@ -227,7 +227,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From d992b55cd6e21afb1373ce17e30b529549141537 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:38 +0100
Subject: [PATCH 0711/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index d377ae40e0a..e91555cea67 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -204,10 +204,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				if ($search_status != '') {
@@ -227,7 +227,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From b5bebdf657e58c2ff0895a64a756f1fcc4d8fa38 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:40 +0100
Subject: [PATCH 0712/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 870e7f81fda..6712ac33185 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -179,7 +179,7 @@ if ($id > 0 || !empty($ref)) {
 				$option .= '&search_month='.urlencode($search_month);
 			}
 			if (!empty($search_year)) {
-				$option .= '&search_year='.urlencode($search_year);
+				$option .= '&search_year='.urlencode((string) ($search_year));
 			}
 
 			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
@@ -195,7 +195,7 @@ if ($id > 0 || !empty($ref)) {
 			print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
-				$option .= '&page='.urlencode($page);
+				$option .= '&page='.urlencode((string) ($page));
 			}
 
 			$i = 0;

From 11b2de835243062e341f9a552f38864bfb534bac Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:42 +0100
Subject: [PATCH 0713/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index ad3e190e851..c44e95eae64 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -278,7 +278,7 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&search_month='.urlencode($search_month);
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				// Add $param from extra fields
@@ -301,7 +301,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 965ec8f0769df58fcd18bd6ab755a9149e9ea7d9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:44 +0100
Subject: [PATCH 0714/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index faf752b71e9..2ee2e18b793 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -190,10 +190,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
@@ -209,7 +209,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("SuppliersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From a86806298a4138d04237efd341d12f983fc0106c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:46 +0100
Subject: [PATCH 0715/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index f25c3076b63..83d66963e51 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -208,10 +208,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
@@ -227,7 +227,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 2d9a426c4244fb801f4117d24062a2eb5ef6197c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:48 +0100
Subject: [PATCH 0716/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index d6727842ead..d98a73fbc79 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -186,10 +186,10 @@ if ($id > 0 || !empty($ref)) {
 				$option .= '&limit='.((int) $limit);
 			}
 			if (!empty($search_month)) {
-				$option .= '&search_month='.urlencode($search_month);
+				$option .= '&search_month='.urlencode((string) ($search_month));
 			}
 			if (!empty($search_year)) {
-				$option .= '&search_year='.urlencode($search_year);
+				$option .= '&search_year='.urlencode((string) ($search_year));
 			}
 
 			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
@@ -205,7 +205,7 @@ if ($id > 0 || !empty($ref)) {
 			print_barre_liste($langs->trans("MOs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
-				$option .= '&page='.urlencode($page);
+				$option .= '&page='.urlencode((string) ($page));
 			}
 
 			print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 6d728265ffb69b6e2ccb6fe504c859961adf60c0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:50 +0100
Subject: [PATCH 0717/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 7ac396da333..9e6084f78c5 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -192,10 +192,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
@@ -211,7 +211,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 31391e950abad0063707c4f63b9f53cab035340d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:52 +0100
Subject: [PATCH 0718/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 5e162e08339..5c755024acd 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -191,10 +191,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
@@ -210,7 +210,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 322f85ee64b96f990c4ef3febe6c35ff91c8d3a7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:54 +0100
Subject: [PATCH 0719/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 1a4aedaefa6..c812e507035 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -103,7 +103,7 @@ $usercandelete = (($user->hasRight('stock', 'supprimer')));
 
 $error = 0;
 
-$parameters = array('id'=>$id, 'ref'=>$ref);
+$parameters = array('id' => $id, 'ref' => $ref);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -168,7 +168,7 @@ if (empty($reshook)) {
 						header("Location: ".$backtopage);
 						exit;
 					} else {
-						header("Location: card.php?id=".urlencode($id));
+						header("Location: card.php?id=".urlencode((string) ($id)));
 						exit;
 					}
 				} else {
@@ -417,7 +417,7 @@ if ($action == 'create') {
 			// Confirm delete warehouse
 			if ($action == 'delete') {
 				$formquestion = array(
-					array('type' => 'other', 'name' => 'info', 'label' => img_warning('').$langs->trans("WarningThisWIllAlsoDeleteStock"), 'morecss'=>'warning')
+					array('type' => 'other', 'name' => 'info', 'label' => img_warning('').$langs->trans("WarningThisWIllAlsoDeleteStock"), 'morecss' => 'warning')
 				);
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteAWarehouse"), $langs->trans("ConfirmDeleteWarehouse", $object->label), "confirm_delete", $formquestion, 0, 2);
 			}
@@ -659,7 +659,7 @@ if ($action == 'create') {
 				$totalarray['nbfield']++;
 			}
 			// Hook fields
-			$parameters = array('sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray' => &$totalarray);
+			$parameters = array('sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			print "</tr>\n";
@@ -744,7 +744,7 @@ if ($action == 'create') {
 					//print '<td>'.dol_print_date($objp->datem).'</td>';
 					print '<tr class="oddeven">';
 
-					$parameters = array('obj'=>$objp, 'totalarray' => &$totalarray);
+					$parameters = array('obj' => $objp, 'totalarray' => &$totalarray);
 					$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 					print $hookmanager->resPrint;
 

From 2ceaaeb2e8ecf5c77e9253e6a6f129d9f902f654 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:52:57 +0100
Subject: [PATCH 0720/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 6c8671175ec..d1ae82983e4 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -689,7 +689,7 @@ if ($resql) {
 		$param .= '&limit='.((int) $limit);
 	}
 	if ($id > 0) {
-		$param .= '&id='.urlencode($id);
+		$param .= '&id='.urlencode((string) ($id));
 	}
 	if ($search_movement) {
 		$param .= '&search_movement='.urlencode($search_movement);
@@ -716,7 +716,7 @@ if ($resql) {
 		$param .= '&search_user='.urlencode($search_user);
 	}
 	if ($idproduct > 0) {
-		$param .= '&idproduct='.urlencode($idproduct);
+		$param .= '&idproduct='.urlencode((string) ($idproduct));
 	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

From 7b74e52d3a7be2e50141799763856871c6591daa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:00 +0100
Subject: [PATCH 0721/1862] Fix: Ensure string type for urlencode()

---
 htdocs/product/stock/movement_list.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 95e7b87a203..fbc888a2793 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1003,28 +1003,28 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if ($id > 0) {
-	$param .= '&id='.urlencode($id);
+	$param .= '&id='.urlencode((string) ($id));
 }
 if ($show_files) {
-	$param .= '&show_files='.urlencode($show_files);
+	$param .= '&show_files='.urlencode((string) ($show_files));
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_movement) {
 	$param .= '&search_movement='.urlencode($search_movement);
@@ -1051,10 +1051,10 @@ if ($search_user) {
 	$param .= '&search_user='.urlencode($search_user);
 }
 if ($idproduct > 0) {
-	$param .= '&idproduct='.urlencode($idproduct);
+	$param .= '&idproduct='.urlencode((string) ($idproduct));
 }
 if ($search_fk_project != '' && $search_fk_project != '-1') {
-	$param .= '&search_fk_project='.urlencode($search_fk_project);
+	$param .= '&search_fk_project='.urlencode((string) ($search_fk_project));
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

From 3749abb41977bb49029a5b5a8be3d89728811c90 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:03 +0100
Subject: [PATCH 0722/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index ee51a45c4d5..febc2adf39e 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -650,23 +650,23 @@ if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('
 	$filters .= '&draftorder='.urlencode($draftorder);
 	$filters .= '&mode='.urlencode($mode);
 	if ($fk_supplier > 0) {
-		$filters .= '&fk_supplier='.urlencode($fk_supplier);
+		$filters .= '&fk_supplier='.urlencode((string) ($fk_supplier));
 	}
 	if ($fk_entrepot > 0) {
-		$filters .= '&fk_entrepot='.urlencode($fk_entrepot);
+		$filters .= '&fk_entrepot='.urlencode((string) ($fk_entrepot));
 	}
 } else {
 	$filters = '&search_ref='.urlencode($search_ref).'&search_label='.urlencode($search_label);
-	$filters .= '&fourn_id='.urlencode($fourn_id);
-	$filters .= (isset($type) ? '&type='.urlencode($type) : '');
+	$filters .= '&fourn_id='.urlencode((string) ($fourn_id));
+	$filters .= (isset($type) ? '&type='.urlencode((string) ($type)) : '');
 	$filters .= '&='.urlencode($salert);
 	$filters .= '&draftorder='.urlencode($draftorder);
 	$filters .= '&mode='.urlencode($mode);
 	if ($fk_supplier > 0) {
-		$filters .= '&fk_supplier='.urlencode($fk_supplier);
+		$filters .= '&fk_supplier='.urlencode((string) ($fk_supplier));
 	}
 	if ($fk_entrepot > 0) {
-		$filters .= '&fk_entrepot='.urlencode($fk_entrepot);
+		$filters .= '&fk_entrepot='.urlencode((string) ($fk_entrepot));
 	}
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
@@ -679,12 +679,12 @@ if (!empty($salert)) {
 	$filters .= '&salert='.urlencode($salert);
 }
 
-$param = (isset($type) ? '&type='.urlencode($type) : '');
-$param .= '&fourn_id='.urlencode($fourn_id).'&search_label='.urlencode($search_label).'&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty).'&salert='.urlencode($salert).'&draftorder='.urlencode($draftorder);
+$param = (isset($type) ? '&type='.urlencode((string) ($type)) : '');
+$param .= '&fourn_id='.urlencode((string) ($fourn_id)).'&search_label='.urlencode((string) ($search_label)).'&includeproductswithoutdesiredqty='.urlencode((string) ($includeproductswithoutdesiredqty)).'&salert='.urlencode((string) ($salert)).'&draftorder='.urlencode((string) ($draftorder));
 $param .= '&search_ref='.urlencode($search_ref);
 $param .= '&mode='.urlencode($mode);
-$param .= '&fk_supplier='.urlencode($fk_supplier);
-$param .= '&fk_entrepot='.urlencode($fk_entrepot);
+$param .= '&fk_supplier='.urlencode((string) ($fk_supplier));
+$param .= '&fk_entrepot='.urlencode((string) ($fk_entrepot));
 if (!empty($includeproductswithoutdesiredqty)) {
 	$param .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty);
 }
@@ -768,7 +768,7 @@ if (getDolGlobalString('STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER')) {
 print '</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 // Fields from hook
-$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -797,7 +797,7 @@ print_liste_field_titre('StockToBuy', $_SERVER["PHP_SELF"], '', $param, '', '',
 print_liste_field_titre('SupplierRef', $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ');
 
 // Hook fields
-$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -959,7 +959,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		print '</td>';
 
 		// Fields from hook
-		$parameters = array('objp'=>$objp, 'i'=>$i, 'tobuy'=>$tobuy);
+		$parameters = array('objp' => $objp, 'i' => $i, 'tobuy' => $tobuy);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -983,7 +983,7 @@ if ($num == 0) {
 	print '</td></tr>';
 }
 
-$parameters = array('sql'=>$sql);
+$parameters = array('sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 6a92582727e971c2ce8dd568e375e19d37b73ebb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:06 +0100
Subject: [PATCH 0723/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 86573d63deb..724eeed763c 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -202,13 +202,13 @@ if ($resql) {
 		$param .= '&search_ttc='.urlencode($sttc);
 	}
 	if ($search_dateyear) {
-		$param .= '&search_dateyear='.urlencode($search_dateyear);
+		$param .= '&search_dateyear='.urlencode((string) ($search_dateyear));
 	}
 	if ($search_datemonth) {
-		$param .= '&search_datemonth='.urlencode($search_datemonth);
+		$param .= '&search_datemonth='.urlencode((string) ($search_datemonth));
 	}
 	if ($search_dateday) {
-		$param .= '&search_dateday='.urlencode($search_dateday);
+		$param .= '&search_dateday='.urlencode((string) ($search_dateday));
 	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);

From 564f91fc97f88518257ab4f7b9dff64f3fb2a97e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:09 +0100
Subject: [PATCH 0724/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 174be7e4486..7f362de5f01 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -268,10 +268,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$object->id.'" name="search_form">'."\n";
@@ -287,7 +287,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From c971d6d02f5513be2d065d2ef2ccf151fc0d2b1b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:11 +0100
Subject: [PATCH 0725/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index cc2a10c0592..b3c30f5ce68 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -267,10 +267,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$object->id.'" name="search_form">'."\n";
@@ -286,7 +286,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("Shipments"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From b0480f82fb66a39ae029bb9f681ca165fa320d58 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:13 +0100
Subject: [PATCH 0726/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index e48d44127c0..96699d17d92 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -209,10 +209,10 @@ if ($id > 0 || !empty($ref)) {
 				$option .= '&limit='.((int) $limit);
 			}
 			if (!empty($search_month)) {
-				$option .= '&search_month='.urlencode($search_month);
+				$option .= '&search_month='.urlencode((string) ($search_month));
 			}
 			if (!empty($search_year)) {
-				$option .= '&search_year='.urlencode($search_year);
+				$option .= '&search_year='.urlencode((string) ($search_year));
 			}
 
 			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" name="search_form">'."\n";
@@ -228,7 +228,7 @@ if ($id > 0 || !empty($ref)) {
 			print_barre_liste($langs->trans("MOs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
-				$option .= '&page='.urlencode($page);
+				$option .= '&page='.urlencode((string) ($page));
 			}
 
 			print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 6cb026ef8ca71ef7dbbc441a0ac5a0cea488a562 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:15 +0100
Subject: [PATCH 0727/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 08839af5749..ced528e301d 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -266,10 +266,10 @@ if ($id > 0 || !empty($ref)) {
 					$option .= '&limit='.((int) $limit);
 				}
 				if (!empty($search_month)) {
-					$option .= '&search_month='.urlencode($search_month);
+					$option .= '&search_month='.urlencode((string) ($search_month));
 				}
 				if (!empty($search_year)) {
-					$option .= '&search_year='.urlencode($search_year);
+					$option .= '&search_year='.urlencode((string) ($search_year));
 				}
 
 				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$object->id.'" name="search_form">'."\n";
@@ -285,7 +285,7 @@ if ($id > 0 || !empty($ref)) {
 				print_barre_liste($langs->trans("Receptions"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 				if (!empty($page)) {
-					$option .= '&page='.urlencode($page);
+					$option .= '&page='.urlencode((string) ($page));
 				}
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';

From f1faf390f5466b7499c1645ebed0bc51b9e6a8ca Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:17 +0100
Subject: [PATCH 0728/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 7e1e2d82ccf..82f46fa4b4a 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -326,9 +326,9 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 
 			$param = '';
 			$param .= ($mode ? '&mode='.urlencode($mode) : '');
-			$param .= ($projectid ? 'id='.urlencode($projectid) : '');
+			$param .= ($projectid ? 'id='.urlencode((string) ($projectid)) : '');
 			$param .= ($search_usertoprocessid ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '');
-			$param .= ($day ? '&day='.urlencode($day) : '').($month ? '&month='.urlencode($month) : '').($year ? '&year='.urlencode($year) : '');
+			$param .= ($day ? '&day='.urlencode((string) ($day)) : '').($month ? '&month='.urlencode((string) ($month)) : '').($year ? '&year='.urlencode((string) ($year)) : '');
 			$param .= ($search_project_ref ? '&search_project_ref='.urlencode($search_project_ref) : '');
 			$param .= ($search_usertoprocessid > 0 ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '');
 			$param .= ($search_thirdparty ? '&search_thirdparty='.urlencode($search_thirdparty) : '');

From ebebb70720415acb59247816adabb8c34bceedde Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:20 +0100
Subject: [PATCH 0729/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 97d38e4eb96..b1776078f36 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -330,9 +330,9 @@ if ($action == 'addtime' && $user->hasRight('projet', 'lire') && GETPOST('formfi
 
 			$param = '';
 			$param .= ($mode ? '&mode='.urlencode($mode) : '');
-			$param .= ($projectid ? 'id='.urlencode($projectid) : '');
+			$param .= ($projectid ? 'id='.urlencode((string) ($projectid)) : '');
 			$param .= ($search_usertoprocessid ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '');
-			$param .= ($day ? '&day='.urlencode($day) : '').($month ? '&month='.urlencode($month) : '').($year ? '&year='.urlencode($year) : '');
+			$param .= ($day ? '&day='.urlencode((string) ($day)) : '').($month ? '&month='.urlencode((string) ($month)) : '').($year ? '&year='.urlencode((string) ($year)) : '');
 			$param .= ($search_project_ref ? '&search_project_ref='.urlencode($search_project_ref) : '');
 			$param .= ($search_usertoprocessid > 0 ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '');
 			$param .= ($search_thirdparty ? '&search_thirdparty='.urlencode($search_thirdparty) : '');

From dfd47dfe2c9899c0ed24e2001dbd11cae154e4d6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:22 +0100
Subject: [PATCH 0730/1862] Fix: Ensure string type for urlencode()

---
 htdocs/projet/list.php | 66 +++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4477b2ad218..4e0f40d0127 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -809,121 +809,121 @@ if ($search_all != '') {
 	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_sday) {
-	$param .= '&search_sday='.urlencode($search_sday);
+	$param .= '&search_sday='.urlencode((string) ($search_sday));
 }
 if ($search_smonth) {
-	$param .= '&search_smonth='.urlencode($search_smonth);
+	$param .= '&search_smonth='.urlencode((string) ($search_smonth));
 }
 if ($search_syear) {
-	$param .= '&search_syear='.urlencode($search_syear);
+	$param .= '&search_syear='.urlencode((string) ($search_syear));
 }
 if ($search_eday) {
-	$param .= '&search_eday='.urlencode($search_eday);
+	$param .= '&search_eday='.urlencode((string) ($search_eday));
 }
 if ($search_emonth) {
-	$param .= '&search_emonth='.urlencode($search_emonth);
+	$param .= '&search_emonth='.urlencode((string) ($search_emonth));
 }
 if ($search_eyear) {
-	$param .= '&search_eyear='.urlencode($search_eyear);
+	$param .= '&search_eyear='.urlencode((string) ($search_eyear));
 }
 if ($search_date_start_startmonth) {
-	$param .= '&search_date_start_startmonth='.urlencode($search_date_start_startmonth);
+	$param .= '&search_date_start_startmonth='.urlencode((string) ($search_date_start_startmonth));
 }
 if ($search_date_start_startyear) {
-	$param .= '&search_date_start_startyear='.urlencode($search_date_start_startyear);
+	$param .= '&search_date_start_startyear='.urlencode((string) ($search_date_start_startyear));
 }
 if ($search_date_start_startday) {
-	$param .= '&search_date_start_startday='.urlencode($search_date_start_startday);
+	$param .= '&search_date_start_startday='.urlencode((string) ($search_date_start_startday));
 }
 if ($search_date_start_start) {
 	$param .= '&search_date_start_start='.urlencode($search_date_start_start);
 }
 if ($search_date_start_endmonth) {
-	$param .= '&search_date_start_endmonth='.urlencode($search_date_start_endmonth);
+	$param .= '&search_date_start_endmonth='.urlencode((string) ($search_date_start_endmonth));
 }
 if ($search_date_start_endyear) {
-	$param .= '&search_date_start_endyear='.urlencode($search_date_start_endyear);
+	$param .= '&search_date_start_endyear='.urlencode((string) ($search_date_start_endyear));
 }
 if ($search_date_start_endday) {
-	$param .= '&search_date_start_endday='.urlencode($search_date_start_endday);
+	$param .= '&search_date_start_endday='.urlencode((string) ($search_date_start_endday));
 }
 if ($search_date_start_end) {
 	$param .= '&search_date_start_end='.urlencode($search_date_start_end);
 }
 if ($search_date_end_startmonth) {
-	$param .= '&search_date_end_startmonth='.urlencode($search_date_end_startmonth);
+	$param .= '&search_date_end_startmonth='.urlencode((string) ($search_date_end_startmonth));
 }
 if ($search_date_end_startyear) {
-	$param .= '&search_date_end_startyear='.urlencode($search_date_end_startyear);
+	$param .= '&search_date_end_startyear='.urlencode((string) ($search_date_end_startyear));
 }
 if ($search_date_end_startday) {
-	$param .= '&search_date_end_startday='.urlencode($search_date_end_startday);
+	$param .= '&search_date_end_startday='.urlencode((string) ($search_date_end_startday));
 }
 if ($search_date_end_start) {
 	$param .= '&search_date_end_start='.urlencode($search_date_end_start);
 }
 if ($search_date_end_endmonth) {
-	$param .= '&search_date_end_endmonth='.urlencode($search_date_end_endmonth);
+	$param .= '&search_date_end_endmonth='.urlencode((string) ($search_date_end_endmonth));
 }
 if ($search_date_end_endyear) {
-	$param .= '&search_date_end_endyear='.urlencode($search_date_end_endyear);
+	$param .= '&search_date_end_endyear='.urlencode((string) ($search_date_end_endyear));
 }
 if ($search_date_end_endday) {
-	$param .= '&search_date_end_endday='.urlencode($search_date_end_endday);
+	$param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday));
 }
 if ($search_date_end_end) {
 	$param .= '&search_date_end_end=' . urlencode($search_date_end_end);
 }
 if ($search_date_creation_startmonth) {
-	$param .= '&search_date_creation_startmonth='.urlencode($search_date_creation_startmonth);
+	$param .= '&search_date_creation_startmonth='.urlencode((string) ($search_date_creation_startmonth));
 }
 if ($search_date_creation_startyear) {
-	$param .= '&search_date_creation_startyear='.urlencode($search_date_creation_startyear);
+	$param .= '&search_date_creation_startyear='.urlencode((string) ($search_date_creation_startyear));
 }
 if ($search_date_creation_startday) {
-	$param .= '&search_date_creation_startday='.urlencode($search_date_creation_startday);
+	$param .= '&search_date_creation_startday='.urlencode((string) ($search_date_creation_startday));
 }
 if ($search_date_creation_start) {
 	$param .= '&search_date_creation_start='.urlencode($search_date_creation_start);
 }
 if ($search_date_creation_endmonth) {
-	$param .= '&search_date_creation_endmonth='.urlencode($search_date_creation_endmonth);
+	$param .= '&search_date_creation_endmonth='.urlencode((string) ($search_date_creation_endmonth));
 }
 if ($search_date_creation_endyear) {
-	$param .= '&search_date_creation_endyear='.urlencode($search_date_creation_endyear);
+	$param .= '&search_date_creation_endyear='.urlencode((string) ($search_date_creation_endyear));
 }
 if ($search_date_creation_endday) {
-	$param .= '&search_date_creation_endday='.urlencode($search_date_creation_endday);
+	$param .= '&search_date_creation_endday='.urlencode((string) ($search_date_creation_endday));
 }
 if ($search_date_creation_end) {
 	$param .= '&search_date_creation_end='.urlencode($search_date_creation_end);
 }
 if ($search_date_modif_startmonth) {
-	$param .= '&search_date_modif_startmonth='.urlencode($search_date_modif_startmonth);
+	$param .= '&search_date_modif_startmonth='.urlencode((string) ($search_date_modif_startmonth));
 }
 if ($search_date_modif_startyear) {
-	$param .= '&search_date_modif_startyear='.urlencode($search_date_modif_startyear);
+	$param .= '&search_date_modif_startyear='.urlencode((string) ($search_date_modif_startyear));
 }
 if ($search_date_modif_startday) {
-	$param .= '&search_date_modif_startday='.urlencode($search_date_modif_startday);
+	$param .= '&search_date_modif_startday='.urlencode((string) ($search_date_modif_startday));
 }
 if ($search_date_modif_start) {
 	$param .= '&search_date_modif_start='.urlencode($search_date_modif_start);
 }
 if ($search_date_modif_endmonth) {
-	$param .= '&search_date_modif_endmonth='.urlencode($search_date_modif_endmonth);
+	$param .= '&search_date_modif_endmonth='.urlencode((string) ($search_date_modif_endmonth));
 }
 if ($search_date_modif_endyear) {
-	$param .= '&search_date_modif_endyear='.urlencode($search_date_modif_endyear);
+	$param .= '&search_date_modif_endyear='.urlencode((string) ($search_date_modif_endyear));
 }
 if ($search_date_modif_endday) {
-	$param .= '&search_date_modif_endday='.urlencode($search_date_modif_endday);
+	$param .= '&search_date_modif_endday='.urlencode((string) ($search_date_modif_endday));
 }
 if ($search_date_modif_end) {
 	$param .= '&search_date_modif_end=' . urlencode($search_date_modif_end);
 }
 if ($socid) {
-	$param .= '&socid='.urlencode($socid);
+	$param .= '&socid='.urlencode((string) ($socid));
 }
 if (!empty($search_category_array)) {
 	foreach ($search_category_array as $tmpval) {
@@ -958,10 +958,10 @@ if ($search_project_user > 0) {
 	$param .= '&search_project_user='.urlencode($search_project_user);
 }
 if ($search_project_contact > 0) {
-	$param .= '&search_project_contact='.urlencode($search_project_contact);
+	$param .= '&search_project_contact='.urlencode((string) ($search_project_contact));
 }
 if ($search_sale > 0) {
-	$param .= '&search_sale='.urlencode($search_sale);
+	$param .= '&search_sale='.urlencode((string) ($search_sale));
 }
 if ($search_opp_amount != '') {
 	$param .= '&search_opp_amount='.urlencode($search_opp_amount);

From a4c03e51789d9b9d7f089f9dcb35340b72bcec45 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:24 +0100
Subject: [PATCH 0731/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index c5b496273f9..23aac791656 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -36,9 +36,9 @@ if (isModEnabled('category')) {
 }
 
 // Load translation files required by the page
-$langsLoad=array('projects', 'users', 'companies');
+$langsLoad = array('projects', 'users', 'companies');
 if (isModEnabled('eventorganization')) {
-	$langsLoad[]='eventorganization';
+	$langsLoad[] = 'eventorganization';
 }
 
 $langs->loadLangs($langsLoad);
@@ -152,22 +152,22 @@ $planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60;
 
 // Definition of fields for list
 $arrayfields = array(
-	't.ref'=>array('label'=>"RefTask", 'checked'=>1, 'position'=>1),
-	't.label'=>array('label'=>"LabelTask", 'checked'=>1, 'position'=>2),
-	't.description'=>array('label'=>"Description", 'checked'=>0, 'position'=>3),
-	't.dateo'=>array('label'=>"DateStart", 'checked'=>1, 'position'=>4),
-	't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>5),
-	't.planned_workload'=>array('label'=>"PlannedWorkload", 'checked'=>1, 'position'=>6),
-	't.duration_effective'=>array('label'=>"TimeSpent", 'checked'=>1, 'position'=>7),
-	't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>8),
-	't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>9),
-	't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>10),
-	't.budget_amount'=>array('label'=>"Budget", 'checked'=>0, 'position'=>11),
-	'c.assigned'=>array('label'=>"TaskRessourceLinks", 'checked'=>1, 'position'=>12),
+	't.ref' => array('label' => "RefTask", 'checked' => 1, 'position' => 1),
+	't.label' => array('label' => "LabelTask", 'checked' => 1, 'position' => 2),
+	't.description' => array('label' => "Description", 'checked' => 0, 'position' => 3),
+	't.dateo' => array('label' => "DateStart", 'checked' => 1, 'position' => 4),
+	't.datee' => array('label' => "Deadline", 'checked' => 1, 'position' => 5),
+	't.planned_workload' => array('label' => "PlannedWorkload", 'checked' => 1, 'position' => 6),
+	't.duration_effective' => array('label' => "TimeSpent", 'checked' => 1, 'position' => 7),
+	't.progress_calculated' => array('label' => "ProgressCalculated", 'checked' => 1, 'position' => 8),
+	't.progress' => array('label' => "ProgressDeclared", 'checked' => 1, 'position' => 9),
+	't.progress_summary' => array('label' => "TaskProgressSummary", 'checked' => 1, 'position' => 10),
+	't.budget_amount' => array('label' => "Budget", 'checked' => 0, 'position' => 11),
+	'c.assigned' => array('label' => "TaskRessourceLinks", 'checked' => 1, 'position' => 12),
 );
 if ($object->usage_bill_time) {
-	$arrayfields['t.tobill'] = array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>11);
-	$arrayfields['t.billed'] = array('label'=>$langs->trans("TimeBilled"), 'checked'=>0, 'position'=>12);
+	$arrayfields['t.tobill'] = array('label' => $langs->trans("TimeToBill"), 'checked' => 0, 'position' => 11);
+	$arrayfields['t.billed'] = array('label' => $langs->trans("TimeBilled"), 'checked' => 0, 'position' => 12);
 }
 
 // Extra fields
@@ -192,7 +192,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('id'=>$id);
+$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');
@@ -297,7 +297,7 @@ if (!empty($search_progresscalc)) {
 	//natural_search('round(100 * $line->duration_effective / $line->planned_workload,2)', $filterprogresscalc, 1, 1).' {return 1;} else {return 0;}';
 }
 if ($search_task_budget_amount) {
-	$morewherefilterarray[]= natural_search('t.budget_amount', $search_task_budget_amount, 1, 1);
+	$morewherefilterarray[] = natural_search('t.budget_amount', $search_task_budget_amount, 1, 1);
 }
 //var_dump($morewherefilterarray);
 
@@ -449,7 +449,7 @@ if ($id > 0 || !empty($ref)) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
 	if ($search_user_id) {
-		$param .= '&search_user_id='.urlencode($search_user_id);
+		$param .= '&search_user_id='.urlencode((string) ($search_user_id));
 	}
 	if ($search_taskref) {
 		$param .= '&search_taskref='.urlencode($search_taskref);
@@ -479,49 +479,49 @@ if ($id > 0 || !empty($ref)) {
 		$param .= '&search_dtendyear='.urlencode($search_dtendyear);
 	}
 	if ($search_date_start_startmonth) {
-		$param .= '&search_date_start_startmonth='.urlencode($search_date_start_startmonth);
+		$param .= '&search_date_start_startmonth='.urlencode((string) ($search_date_start_startmonth));
 	}
 	if ($search_date_start_startyear) {
-		$param .= '&search_date_start_startyear='.urlencode($search_date_start_startyear);
+		$param .= '&search_date_start_startyear='.urlencode((string) ($search_date_start_startyear));
 	}
 	if ($search_date_start_startday) {
-		$param .= '&search_date_start_startday='.urlencode($search_date_start_startday);
+		$param .= '&search_date_start_startday='.urlencode((string) ($search_date_start_startday));
 	}
 	if ($search_date_start_start) {
 		$param .= '&search_date_start_start='.urlencode($search_date_start_start);
 	}
 	if ($search_date_start_endmonth) {
-		$param .= '&search_date_start_endmonth='.urlencode($search_date_start_endmonth);
+		$param .= '&search_date_start_endmonth='.urlencode((string) ($search_date_start_endmonth));
 	}
 	if ($search_date_start_endyear) {
-		$param .= '&search_date_start_endyear='.urlencode($search_date_start_endyear);
+		$param .= '&search_date_start_endyear='.urlencode((string) ($search_date_start_endyear));
 	}
 	if ($search_date_start_endday) {
-		$param .= '&search_date_start_endday='.urlencode($search_date_start_endday);
+		$param .= '&search_date_start_endday='.urlencode((string) ($search_date_start_endday));
 	}
 	if ($search_date_start_end) {
 		$param .= '&search_date_start_end='.urlencode($search_date_start_end);
 	}
 	if ($search_date_end_startmonth) {
-		$param .= '&search_date_end_startmonth='.urlencode($search_date_end_startmonth);
+		$param .= '&search_date_end_startmonth='.urlencode((string) ($search_date_end_startmonth));
 	}
 	if ($search_date_end_startyear) {
-		$param .= '&search_date_end_startyear='.urlencode($search_date_end_startyear);
+		$param .= '&search_date_end_startyear='.urlencode((string) ($search_date_end_startyear));
 	}
 	if ($search_date_end_startday) {
-		$param .= '&search_date_end_startday='.urlencode($search_date_end_startday);
+		$param .= '&search_date_end_startday='.urlencode((string) ($search_date_end_startday));
 	}
 	if ($search_date_end_start) {
 		$param .= '&search_date_end_start='.urlencode($search_date_end_start);
 	}
 	if ($search_date_end_endmonth) {
-		$param .= '&search_date_end_endmonth='.urlencode($search_date_end_endmonth);
+		$param .= '&search_date_end_endmonth='.urlencode((string) ($search_date_end_endmonth));
 	}
 	if ($search_date_end_endyear) {
-		$param .= '&search_date_end_endyear='.urlencode($search_date_end_endyear);
+		$param .= '&search_date_end_endyear='.urlencode((string) ($search_date_end_endyear));
 	}
 	if ($search_date_end_endday) {
-		$param .= '&search_date_end_endday='.urlencode($search_date_end_endday);
+		$param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday));
 	}
 	if ($search_date_end_end) {
 		$param .= '&search_date_end_end=' . urlencode($search_date_end_end);
@@ -875,8 +875,8 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	$title = $langs->trans("ListOfTasks");
-	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition btnTitleSelected'));
-	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
+	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss' => 'reposition btnTitleSelected'));
+	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss' => 'reposition marginleftonly'));
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
 	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask', '', '', '', $massactionbutton);
@@ -918,7 +918,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 
 	// Show the massaction checkboxes only when this page is not opend from the Extended POS
 	if ($massactionbutton && $contextpage != 'poslist') {
-		$selectedfields.= $form->showCheckAddButtons('checkforselect', 1);
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 	}
 
 	print '<div class="div-table-responsive">';
@@ -1115,7 +1115,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	$disablesortlink = 1;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '<td></td>';

From 6cfd5774657c62c13a34c44d0ab81a5cd0c18241 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:27 +0100
Subject: [PATCH 0732/1862] Fix: Ensure string type for urlencode()

---
 htdocs/projet/tasks/list.php | 88 ++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 714371b8d44..a7a5c47d757 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -144,37 +144,37 @@ if (!$sortorder) {
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	't.ref'=>"Ref",
-	't.label'=>"Label",
-	't.description'=>"Description",
-	't.note_public'=>"NotePublic",
+	't.ref' => "Ref",
+	't.label' => "Label",
+	't.description' => "Description",
+	't.note_public' => "NotePublic",
 );
 if (empty($user->socid)) {
 	$fieldstosearchall['t.note_private'] = "NotePrivate";
 }
 
 $arrayfields = array(
-	't.fk_task_parent'=>array('label'=>"RefTaskParent", 'checked'=>0, 'position'=>70),
-	't.ref'=>array('label'=>"RefTask", 'checked'=>1, 'position'=>80),
-	't.label'=>array('label'=>"LabelTask", 'checked'=>1, 'position'=>80),
-	't.description'=>array('label'=>"Description", 'checked'=>0, 'position'=>80),
-	't.dateo'=>array('label'=>"DateStart", 'checked'=>1, 'position'=>100),
-	't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>101),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>151),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'position'=>152),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'csslist'=>'tdoverflowmax125', 'position'=>200),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>0, 'csslist'=>'tdoverflowmax125', 'position'=>201),
-	'p.fk_statut'=>array('label'=>"ProjectStatus", 'checked'=>1, 'position'=>205),
-	't.planned_workload'=>array('label'=>"PlannedWorkload", 'checked'=>1, 'position'=>302),
-	't.duration_effective'=>array('label'=>"TimeSpent", 'checked'=>1, 'position'=>303),
-	't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>304),
-	't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>305),
-	't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>306),
-	't.budget_amount'=>array('label'=>"Budget", 'checked'=>0, 'position'=>307),
-	't.tobill'=>array('label'=>"TimeToBill", 'checked'=>0, 'position'=>310),
-	't.billed'=>array('label'=>"TimeBilled", 'checked'=>0, 'position'=>311),
-	't.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>501),
+	't.fk_task_parent' => array('label' => "RefTaskParent", 'checked' => 0, 'position' => 70),
+	't.ref' => array('label' => "RefTask", 'checked' => 1, 'position' => 80),
+	't.label' => array('label' => "LabelTask", 'checked' => 1, 'position' => 80),
+	't.description' => array('label' => "Description", 'checked' => 0, 'position' => 80),
+	't.dateo' => array('label' => "DateStart", 'checked' => 1, 'position' => 100),
+	't.datee' => array('label' => "Deadline", 'checked' => 1, 'position' => 101),
+	'p.ref' => array('label' => "ProjectRef", 'checked' => 1, 'position' => 151),
+	'p.title' => array('label' => "ProjectLabel", 'checked' => 0, 'position' => 152),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'csslist' => 'tdoverflowmax125', 'position' => 200),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => 0, 'csslist' => 'tdoverflowmax125', 'position' => 201),
+	'p.fk_statut' => array('label' => "ProjectStatus", 'checked' => 1, 'position' => 205),
+	't.planned_workload' => array('label' => "PlannedWorkload", 'checked' => 1, 'position' => 302),
+	't.duration_effective' => array('label' => "TimeSpent", 'checked' => 1, 'position' => 303),
+	't.progress_calculated' => array('label' => "ProgressCalculated", 'checked' => 1, 'position' => 304),
+	't.progress' => array('label' => "ProgressDeclared", 'checked' => 1, 'position' => 305),
+	't.progress_summary' => array('label' => "TaskProgressSummary", 'checked' => 1, 'position' => 306),
+	't.budget_amount' => array('label' => "Budget", 'checked' => 0, 'position' => 307),
+	't.tobill' => array('label' => "TimeToBill", 'checked' => 0, 'position' => 310),
+	't.billed' => array('label' => "TimeBilled", 'checked' => 0, 'position' => 311),
+	't.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	't.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 501),
 	//'t.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
@@ -204,7 +204,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -611,40 +611,40 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_datelimit_startday) {
-	$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
+	$param .= '&search_datelimit_startday='.urlencode((string) ($search_datelimit_startday));
 }
 if ($search_datelimit_startmonth) {
-	$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+	$param .= '&search_datelimit_startmonth='.urlencode((string) ($search_datelimit_startmonth));
 }
 if ($search_datelimit_startyear) {
-	$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+	$param .= '&search_datelimit_startyear='.urlencode((string) ($search_datelimit_startyear));
 }
 if ($search_datelimit_endday) {
-	$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+	$param .= '&search_datelimit_endday='.urlencode((string) ($search_datelimit_endday));
 }
 if ($search_datelimit_endmonth) {
-	$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+	$param .= '&search_datelimit_endmonth='.urlencode((string) ($search_datelimit_endmonth));
 }
 if ($search_datelimit_endyear) {
-	$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
+	$param .= '&search_datelimit_endyear='.urlencode((string) ($search_datelimit_endyear));
 }
 if ($search_task_budget_amount) {
 	$param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
@@ -689,7 +689,7 @@ if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($sea
 	$param .= '&search_opp_status='.urlencode($search_opp_status);
 }
 if ($search_project_user != '') {
-	$param .= '&search_project_user='.urlencode($search_project_user);
+	$param .= '&search_project_user='.urlencode((string) ($search_project_user));
 }
 if ($search_task_user > 0) {
 	$param .= '&search_task_user='.urlencode($search_task_user);
@@ -741,8 +741,8 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $permissiontocreate);
 
@@ -960,7 +960,7 @@ if (!empty($arrayfields['t.billed']['checked'])) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
@@ -1521,7 +1521,7 @@ while ($i < $imaxinloop) {
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
@@ -1622,7 +1622,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql' => $sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 6dbabaa5143e95cadba8b4397a69bd14aec7af33 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:30 +0100
Subject: [PATCH 0733/1862] Fix: Ensure string type for urlencode()

---
 htdocs/projet/tasks/time.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 32e47dcfb83..c48a6f296cc 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1297,10 +1297,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			$param .= '&limit='.((int) $limit);
 		}
 		if ($search_month > 0) {
-			$param .= '&search_month=' . urlencode($search_month);
+			$param .= '&search_month=' . urlencode((string) ($search_month));
 		}
 		if ($search_year > 0) {
-			$param .= '&search_year=' . urlencode($search_year);
+			$param .= '&search_year=' . urlencode((string) ($search_year));
 		}
 		if (!empty($search_user)) { 	// We keep param if -1 because default value is forced to user id if not set
 			$param .= '&search_user='.urlencode($search_user);
@@ -1327,40 +1327,40 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			$param .= '&search_note=' . urlencode($search_note);
 		}
 		if ($search_duration != '') {
-			$param .= '&amp;search_field2=' . urlencode($search_duration);
+			$param .= '&amp;search_field2=' . urlencode((string) ($search_duration));
 		}
 		if ($optioncss != '') {
 			$param .= '&optioncss=' . urlencode($optioncss);
 		}
 		if ($search_date_startday) {
-			$param .= '&search_date_startday=' . urlencode($search_date_startday);
+			$param .= '&search_date_startday=' . urlencode((string) ($search_date_startday));
 		}
 		if ($search_date_startmonth) {
-			$param .= '&search_date_startmonth=' . urlencode($search_date_startmonth);
+			$param .= '&search_date_startmonth=' . urlencode((string) ($search_date_startmonth));
 		}
 		if ($search_date_startyear) {
-			$param .= '&search_date_startyear=' . urlencode($search_date_startyear);
+			$param .= '&search_date_startyear=' . urlencode((string) ($search_date_startyear));
 		}
 		if ($search_date_endday) {
-			$param .= '&search_date_endday=' . urlencode($search_date_endday);
+			$param .= '&search_date_endday=' . urlencode((string) ($search_date_endday));
 		}
 		if ($search_date_endmonth) {
-			$param .= '&search_date_endmonth=' . urlencode($search_date_endmonth);
+			$param .= '&search_date_endmonth=' . urlencode((string) ($search_date_endmonth));
 		}
 		if ($search_date_endyear) {
-			$param .= '&search_date_endyear=' . urlencode($search_date_endyear);
+			$param .= '&search_date_endyear=' . urlencode((string) ($search_date_endyear));
 		}
 		if ($search_timespent_starthour) {
-			$param .= '&search_timespent_duration_starthour=' . urlencode($search_timespent_starthour);
+			$param .= '&search_timespent_duration_starthour=' . urlencode((string) ($search_timespent_starthour));
 		}
 		if ($search_timespent_startmin) {
-			$param .= '&search_timespent_duration_startmin=' . urlencode($search_timespent_startmin);
+			$param .= '&search_timespent_duration_startmin=' . urlencode((string) ($search_timespent_startmin));
 		}
 		if ($search_timespent_endhour) {
-			$param .= '&search_timespent_duration_endhour=' . urlencode($search_timespent_endhour);
+			$param .= '&search_timespent_duration_endhour=' . urlencode((string) ($search_timespent_endhour));
 		}
 		if ($search_timespent_endmin) {
-			$param .= '&search_timespent_duration_endmin=' . urlencode($search_timespent_endmin);
+			$param .= '&search_timespent_duration_endmin=' . urlencode((string) ($search_timespent_endmin));
 		}
 
 		/*
@@ -1368,13 +1368,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 		 */
 		if ($id) {
-			$param .= '&id=' . urlencode($id);
+			$param .= '&id=' . urlencode((string) ($id));
 		}
 		if ($projectid) {
-			$param .= '&projectid=' . urlencode($projectid);
+			$param .= '&projectid=' . urlencode((string) ($projectid));
 		}
 		if ($withproject) {
-			$param .= '&withproject=' . urlencode($withproject);
+			$param .= '&withproject=' . urlencode((string) ($withproject));
 		}
 		// Add $param from hooks
 		$parameters = array();

From f12e03cdc13da52a9ec1a918a4cdb348d91ba4c6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:33 +0100
Subject: [PATCH 0734/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index edccbf8006a..7de72eac061 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -235,7 +235,7 @@ if ($reshook < 0) {
 }
 
 // Action called when page is submitted
-if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status==2  || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
+if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status == 2  || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
 	$error = 0;
 
 	$urlback = '';
@@ -600,7 +600,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 				// Now we redirect to the payment page
 				$sourcetouse = 'organizedeventregistration';
 				$reftouse = $facture->id;
-				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.urlencode($sourcetouse).'&ref='.urlencode($reftouse);
+				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.urlencode((string) ($sourcetouse)).'&ref='.urlencode((string) ($reftouse));
 				if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
 					if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 						$redirection .= '&securekey='.dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical

From cc606e9e85b4f13a785e0674f6ee74d855b6d7db Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:35 +0100
Subject: [PATCH 0735/1862] Fix: Ensure string type for urlencode()

---
 htdocs/public/onlinesign/newonlinesign.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index f5be599fcc4..9f09c6a3f4d 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -112,8 +112,8 @@ if (!empty($SECUREKEY)) {
 	$urlko .= 'securekey='.urlencode($SECUREKEY).'&';
 }
 if (!empty($entity)) {
-	$urlok .= 'entity='.urlencode($entity).'&';
-	$urlko .= 'entity='.urlencode($entity).'&';
+	$urlok .= 'entity='.urlencode((string) ($entity)).'&';
+	$urlko .= 'entity='.urlencode((string) ($entity)).'&';
 }
 $urlok = preg_replace('/&$/', '', $urlok); // Remove last &
 $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
@@ -146,19 +146,19 @@ if (!dol_verifyHash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? $e
 if ($source == 'proposal') {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$object = new Propal($db);
-	$result= $object->fetch(0, $ref, '', $entity);
+	$result = $object->fetch(0, $ref, '', $entity);
 } elseif ($source == 'contract') {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$object = new Contrat($db);
-	$result= $object->fetch(0, $ref);
+	$result = $object->fetch(0, $ref);
 } elseif ($source == 'fichinter') {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 	$object = new Fichinter($db);
-	$result= $object->fetch(0, $ref);
+	$result = $object->fetch(0, $ref);
 } elseif ($source == 'societe_rib') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 	$object = new CompanyBankAccount($db);
-	$result= $object->fetch($ref);
+	$result = $object->fetch($ref);
 } else {
 	httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source. Value not supported.", 400, 1);
 }
@@ -571,11 +571,11 @@ if ($source == 'proposal') {
 
 		$object->setDocModel($user, $defaulttemplate);
 		$moreparams = array(
-			'use_companybankid'=>$object->id,
-			'force_dir_output'=>$diroutput
+			'use_companybankid' => $object->id,
+			'force_dir_output' => $diroutput
 		);
 		$result = $object->thirdparty->generateDocument($defaulttemplate, $langs, 0, 0, 0, $moreparams);
-		$object->last_main_doc=$object->thirdparty->last_main_doc;
+		$object->last_main_doc = $object->thirdparty->last_main_doc;
 	}
 	$directdownloadlink = $object->getLastMainDocLink('company');
 	if ($directdownloadlink) {

From 5ab36a5aa9bf077b9f216f6f5e3f9e66bb5c3d51 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:38 +0100
Subject: [PATCH 0736/1862] Fix: Ensure string type for urlencode()

---
 htdocs/public/payment/newpayment.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index e679a3e180f..efa31e998c2 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -238,8 +238,8 @@ if (!empty($SECUREKEY)) {
 	$urlko .= 'securekey='.urlencode($SECUREKEY).'&';
 }
 if (!empty($entity)) {
-	$urlok .= 'e='.urlencode($entity).'&';
-	$urlko .= 'e='.urlencode($entity).'&';
+	$urlok .= 'e='.urlencode((string) ($entity)).'&';
+	$urlko .= 'e='.urlencode((string) ($entity)).'&';
 }
 if (!empty($getpostlang)) {
 	$urlok .= 'lang='.urlencode($getpostlang).'&';
@@ -519,7 +519,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 				'dol_entity'  => $conf->entity,
 				'dol_company' => $mysoc->name, // Useful when using multicompany
 				'dol_tax_num' => $vatnumber,
-				'ipaddress'=> getUserRemoteIP()
+				'ipaddress' => getUserRemoteIP()
 			);
 
 			if (!empty($thirdparty_id)) {
@@ -1421,9 +1421,9 @@ if ($source == 'contractline') {
 
 			// TODO Put this in a global method
 			if ($contractline->product->duration_value > 1) {
-				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
+				$dur = array("h" => $langs->trans("Hours"), "d" => $langs->trans("DurationDays"), "w" => $langs->trans("DurationWeeks"), "m" => $langs->trans("DurationMonths"), "y" => $langs->trans("DurationYears"));
 			} else {
-				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
+				$dur = array("h" => $langs->trans("Hour"), "d" => $langs->trans("DurationDay"), "w" => $langs->trans("DurationWeek"), "m" => $langs->trans("DurationMonth"), "y" => $langs->trans("DurationYear"));
 			}
 			$duration = $contractline->product->duration_value.' '.$dur[$contractline->product->duration_unit];
 		}
@@ -1496,7 +1496,7 @@ if ($source == 'contractline') {
 if ($source == 'member' || $source == 'membersubscription') {
 	$newsource = 'member';
 
-	$tag="";
+	$tag = "";
 	$found = true;
 	$langs->load("members");
 
@@ -2362,7 +2362,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we chose/clicked on the payme
 				}
 
 				$ipaddress = getUserRemoteIP();
-				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+				$metadata = array('dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress);
 				if (is_object($object)) {
 					$metadata['dol_type'] = $object->element;
 					$metadata['dol_id'] = $object->id;
@@ -2372,7 +2372,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we chose/clicked on the payme
 
 				try {
 					$arrayforpaymentintent = array(
-						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+						'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
 						"metadata" => $metadata
 					);
 					if ($TAG) {

From 31221fe77ac8a0be1c7e8bac02d849022f2d3dba Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:40 +0100
Subject: [PATCH 0737/1862] Fix: Ensure string type for urlencode()

---
 htdocs/public/ticket/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 11a1c5fa5c5..3267d9aef67 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -293,14 +293,14 @@ if ($action == "view_ticketlist") {
 			// -1 value = all so no filter
 			if ($search_fk_user_assign > 0) {
 				$filter['t.fk_user_assign'] = $search_fk_user_assign;
-				$param .= '&search_fk_user_assign='.urlencode($search_fk_user_assign);
+				$param .= '&search_fk_user_assign='.urlencode((string) ($search_fk_user_assign));
 			}
 		}
 		if (!empty($search_fk_user_create)) {
 			// -1 value = all so no filter
 			if ($search_fk_user_create > 0) {
 				$filter['t.fk_user_create'] = $search_fk_user_create;
-				$param .= '&search_fk_user_create='.urlencode($search_fk_user_create);
+				$param .= '&search_fk_user_create='.urlencode((string) ($search_fk_user_create));
 			}
 		}
 		if ((isset($search_fk_status) && $search_fk_status != '') && $search_fk_status != '-1' && $search_fk_status != 'non_closed') {
@@ -432,8 +432,8 @@ if ($action == "view_ticketlist") {
 				$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
+				$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 '<div class="div-table-responsive">';
@@ -501,7 +501,7 @@ if ($action == "view_ticketlist") {
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 				// Fields from hook
-				$parameters = array('arrayfields'=>$arrayfields);
+				$parameters = array('arrayfields' => $arrayfields);
 				$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 
@@ -563,7 +563,7 @@ if ($action == "view_ticketlist") {
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 				// Hook fields
-				$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+				$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 				$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 

From 1f25fabc3457542be34f48c6913f1bbdc2a56641 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:43 +0100
Subject: [PATCH 0738/1862] Fix: Ensure string type for urlencode()

---
 htdocs/reception/list.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index caadc0e2af0..f6242c6ee14 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -560,7 +560,7 @@ if (empty($reshook)) {
 
 			if ($nb_bills_created == 1) {
 				$texttoshow = $langs->trans('BillXCreated', '{s1}');
-				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?id='.urlencode((string) ($lastid)).'">'.$lastref.'</a>', $texttoshow);
 				setEventMessages($texttoshow, null, 'mesgs');
 			} else {
 				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
@@ -765,7 +765,7 @@ if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
 if ($search_billed != '' && $search_billed >= 0) {
-	$param .= "&search_billed=".urlencode($search_billed);
+	$param .= "&search_billed=".urlencode((string) ($search_billed));
 }
 if ($search_town) {
 	$param .= "&search_town=".urlencode($search_town);
@@ -780,46 +780,46 @@ if ($search_status != '') {
 	$param .= "&search_status=".urlencode($search_status);
 }
 if ($search_country) {
-	$param .= "&search_country=".urlencode($search_country);
+	$param .= "&search_country=".urlencode((string) ($search_country));
 }
 if ($search_type_thirdparty) {
-	$param .= "&search_type_thirdparty=".urlencode($search_type_thirdparty);
+	$param .= "&search_type_thirdparty=".urlencode((string) ($search_type_thirdparty));
 }
 if ($search_date_delivery_startday) {
-	$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
+	$param .= '&search_date_delivery_startday='.urlencode((string) ($search_date_delivery_startday));
 }
 if ($search_date_delivery_startmonth) {
-	$param .= '&search_date_delivery_startmonth='.urlencode($search_date_delivery_startmonth);
+	$param .= '&search_date_delivery_startmonth='.urlencode((string) ($search_date_delivery_startmonth));
 }
 if ($search_date_delivery_startyear) {
-	$param .= '&search_date_delivery_startyear='.urlencode($search_date_delivery_startyear);
+	$param .= '&search_date_delivery_startyear='.urlencode((string) ($search_date_delivery_startyear));
 }
 if ($search_date_delivery_endday) {
-	$param .= '&search_date_delivery_endday='.urlencode($search_date_delivery_endday);
+	$param .= '&search_date_delivery_endday='.urlencode((string) ($search_date_delivery_endday));
 }
 if ($search_date_delivery_endmonth) {
-	$param .= '&search_date_delivery_endmonth='.urlencode($search_date_delivery_endmonth);
+	$param .= '&search_date_delivery_endmonth='.urlencode((string) ($search_date_delivery_endmonth));
 }
 if ($search_date_delivery_endyear) {
-	$param .= '&search_date_delivery_endyear='.urlencode($search_date_delivery_endyear);
+	$param .= '&search_date_delivery_endyear='.urlencode((string) ($search_date_delivery_endyear));
 }
 if ($search_date_create_startday) {
-	$param .= '&search_date_create_startday='.urlencode($search_date_create_startday);
+	$param .= '&search_date_create_startday='.urlencode((string) ($search_date_create_startday));
 }
 if ($search_date_create_startmonth) {
-	$param .= '&search_date_create_startmonth='.urlencode($search_date_create_startmonth);
+	$param .= '&search_date_create_startmonth='.urlencode((string) ($search_date_create_startmonth));
 }
 if ($search_date_create_startyear) {
-	$param .= '&search_date_create_startyear='.urlencode($search_date_create_startyear);
+	$param .= '&search_date_create_startyear='.urlencode((string) ($search_date_create_startyear));
 }
 if ($search_date_create_endday) {
-	$param .= '&search_date_create_endday='.urlencode($search_date_create_endday);
+	$param .= '&search_date_create_endday='.urlencode((string) ($search_date_create_endday));
 }
 if ($search_date_create_endmonth) {
-	$param .= '&search_date_create_endmonth='.urlencode($search_date_create_endmonth);
+	$param .= '&search_date_create_endmonth='.urlencode((string) ($search_date_create_endmonth));
 }
 if ($search_date_create_endyear) {
-	$param .= '&search_date_create_endyear='.urlencode($search_date_create_endyear);
+	$param .= '&search_date_create_endyear='.urlencode((string) ($search_date_create_endyear));
 }
 if ($search_ref_supplier) {
 	$param .= "&search_ref_supplier=".urlencode($search_ref_supplier);

From 6644897b6041541c82d6521caa2f69ee11a41be7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:46 +0100
Subject: [PATCH 0739/1862] Fix: Ensure string type for urlencode()

---
 .../recruitmentcandidature_list.php           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 3284710c7eb..56c05ffdb56 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -117,11 +117,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -499,7 +499,7 @@ $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
 if (!empty($id)) {
-	$param .= '&id='.urlencode($id);
+	$param .= '&id='.urlencode((string) ($id));
 }
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
@@ -533,7 +533,7 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	'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"),
@@ -562,8 +562,8 @@ print '<input type="hidden" name="id" value="'.$id.'">';
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?action=create&fk_recruitmentjobposition='.$id, '', $permissiontoadd);
 
@@ -662,7 +662,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -704,7 +704,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -761,7 +761,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('jobpositionlink'=>$recruitment->getNomUrl(1), 'selected' => $selected));
+		print $object->getKanbanView('', array('jobpositionlink' => $recruitment->getNomUrl(1), 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -838,7 +838,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -880,7 +880,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From c7d1e2616d8b7ce0e9d3056347e3b1139b7eab61 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:50 +0100
Subject: [PATCH 0740/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 36d30fc46a2..0159b9b93a9 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -330,7 +330,7 @@ if ($action == 'add' && empty($cancel)) {
 
 			if (GETPOST('saveandnew', 'alpha')) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOSTINT('paymenttype')) . '&datepday=' . GETPOSTINT("datepday") . '&datepmonth=' . GETPOSTINT("datepmonth") . '&datepyear=' . GETPOSTINT("datepyear"));
+				header("Location: card.php?action=create&fk_project=" . urlencode((string) ($projectid)) . "&accountid=" . urlencode((string) ($accountid)) . '&paymenttype=' . urlencode((string) (GETPOSTINT('paymenttype'))) . '&datepday=' . GETPOSTINT("datepday") . '&datepmonth=' . GETPOSTINT("datepmonth") . '&datepyear=' . GETPOSTINT("datepyear"));
 				exit;
 			} else {
 				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);

From ad99c7e2a8174833ac3b4334d8bb6df43bcdf8ab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:53 +0100
Subject: [PATCH 0741/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 3b1beab890d..7af81d47d6e 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -380,7 +380,7 @@ if ($search_label) {
 	$param .= '&search_label='.urlencode($search_label);
 }
 if ($search_account) {
-	$param .= '&search_account='.urlencode($search_account);
+	$param .= '&search_account='.urlencode((string) ($search_account));
 }
 if ($search_status != '' && $search_status != '-1') {
 	$param .= '&search_status='.urlencode($search_status);

From a6827b7c910bef3b3875135009be284ef5d3290f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:56 +0100
Subject: [PATCH 0742/1862] Fix: Ensure string type for urlencode()

---
 htdocs/salaries/payments.php | 44 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index db0865ba994..fc659db2e1b 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -140,11 +140,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -362,25 +362,25 @@ if ($search_label) {
 	$param .= '&search_label='.urlencode($search_label);
 }
 if ($search_fk_bank) {
-	$param .= '&search_fk_bank='.urlencode($search_fk_bank);
+	$param .= '&search_fk_bank='.urlencode((string) ($search_fk_bank));
 }
 if ($search_chq_number) {
-	$param .= '&search_chq_number='.urlencode($search_chq_number);
+	$param .= '&search_chq_number='.urlencode((string) ($search_chq_number));
 }
 if ($search_account) {
-	$param .= '&search_account='.urlencode($search_account);
+	$param .= '&search_account='.urlencode((string) ($search_account));
 }
 if ($search_date_start) {
-	$param .= '&search_date_startday='.urlencode(GETPOSTINT('search_date_startday')).'&search_date_startmonth='.urlencode(GETPOSTINT('search_date_startmonth')).'&search_date_startyear='.urlencode(GETPOSTINT('search_date_startyear'));
+	$param .= '&search_date_startday='.urlencode((string) (GETPOSTINT('search_date_startday'))).'&search_date_startmonth='.urlencode((string) (GETPOSTINT('search_date_startmonth'))).'&search_date_startyear='.urlencode((string) (GETPOSTINT('search_date_startyear')));
 }
 if ($search_dateep_start) {
-	$param .= '&search_dateep_startday='.urlencode(GETPOSTINT('search_dateep_startday')).'&search_dateep_startmonth='.urlencode(GETPOSTINT('search_dateep_startmonth')).'&search_dateep_startyear='.urlencode(GETPOSTINT('search_dateep_startyear'));
+	$param .= '&search_dateep_startday='.urlencode((string) (GETPOSTINT('search_dateep_startday'))).'&search_dateep_startmonth='.urlencode((string) (GETPOSTINT('search_dateep_startmonth'))).'&search_dateep_startyear='.urlencode((string) (GETPOSTINT('search_dateep_startyear')));
 }
 if ($search_date_end) {
-	$param .= '&search_date_endday='.urlencode(GETPOSTINT('search_date_endday')).'&search_date_endmonth='.urlencode(GETPOSTINT('search_date_endmonth')).'&search_date_endyear='.urlencode(GETPOSTINT('search_date_endyear'));
+	$param .= '&search_date_endday='.urlencode((string) (GETPOSTINT('search_date_endday'))).'&search_date_endmonth='.urlencode((string) (GETPOSTINT('search_date_endmonth'))).'&search_date_endyear='.urlencode((string) (GETPOSTINT('search_date_endyear')));
 }
 if ($search_dateep_end) {
-	$param .= '&search_dateep_endday='.urlencode(GETPOSTINT('search_dateep_endday')).'&search_dateep_endmonth='.urlencode(GETPOSTINT('search_dateep_endmonth')).'&search_dateep_endyear='.urlencode(GETPOSTINT('search_dateep_endyear'));
+	$param .= '&search_dateep_endday='.urlencode((string) (GETPOSTINT('search_dateep_endday'))).'&search_dateep_endmonth='.urlencode((string) (GETPOSTINT('search_dateep_endmonth'))).'&search_dateep_endyear='.urlencode((string) (GETPOSTINT('search_dateep_endyear')));
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -414,8 +414,8 @@ if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
 $newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('salaries', 'write'));
 
@@ -454,19 +454,19 @@ print '<td class="liste_titre"><input type="text" class="flat width150" name="se
 // Date end period
 print '<td class="liste_titre center">';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_dateep_start ? $search_dateep_start : -1, 'search_dateep_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print $form->selectDate($search_dateep_start ? $search_dateep_start : -1, 'search_dateep_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_dateep_end ? $search_dateep_end : -1, 'search_dateep_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print $form->selectDate($search_dateep_end ? $search_dateep_end : -1, 'search_dateep_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 // Date payment
 print '<td class="liste_titre center">';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
 print '<div class="nowrapfordate">';
- print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 // Date value
@@ -501,7 +501,7 @@ print '<td class="liste_titre right"><input name="search_amount" class="flat" ty
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -551,7 +551,7 @@ $totalarray['nbfield']++;
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -763,7 +763,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$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;
 
@@ -807,7 +807,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 837749d47164d12f7975daeb8612765d9632d566 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:53:58 +0100
Subject: [PATCH 0743/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index cffa65d43f1..be5ed78293e 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -94,7 +94,7 @@ $result = restrictedArea($user, 'societe', $socid, '&societe');
  *	Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -194,7 +194,7 @@ if (isModEnabled('agenda')) {
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 	print '<br>';
 
-	$param = '&socid='.urlencode($socid);
+	$param = '&socid='.urlencode((string) ($socid));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}

From 7293151d829f7aa99f57f5dccf7598467ede9156 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:01 +0100
Subject: [PATCH 0744/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 506810c806d..5877e3c9d11 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -412,7 +412,7 @@ if ($sql_select) {
 
 	$num = $db->num_rows($resql);
 
-	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
+	$param = "&socid=".urlencode((string) ($socid))."&type_element=".urlencode((string) ($type_element));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -426,10 +426,10 @@ if ($sql_select) {
 		$param .= "&sref=".urlencode($sref);
 	}
 	if ($month) {
-		$param .= "&month=".urlencode($month);
+		$param .= "&month=".urlencode((string) ($month));
 	}
 	if ($year) {
-		$param .= "&year=".urlencode($year);
+		$param .= "&year=".urlencode((string) ($year));
 	}
 	if ($optioncss) {
 		$param .= '&optioncss='.urlencode($optioncss);

From 5f025a87e1acdd9f3e0af88966477d4cee01a561 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:04 +0100
Subject: [PATCH 0745/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index c0baeb41882..1d780599f2d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -897,16 +897,16 @@ if ($search_all != '') {
 	$param = "&search_all=".urlencode($search_all);
 }
 if ($search_categ_cus > 0) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 if ($search_categ_sup > 0) {
-	$param .= '&search_categ_sup='.urlencode($search_categ_sup);
+	$param .= '&search_categ_sup='.urlencode((string) ($search_categ_sup));
 }
 if ($searchCategoryCustomerOperator == 1) {
-	$param .= "&search_category_customer_operator=".urlencode($searchCategoryCustomerOperator);
+	$param .= "&search_category_customer_operator=".urlencode((string) ($searchCategoryCustomerOperator));
 }
 if ($searchCategorySupplierOperator == 1) {
-	$param .= "&search_category_supplier_operator=".urlencode($searchCategorySupplierOperator);
+	$param .= "&search_category_supplier_operator=".urlencode((string) ($searchCategorySupplierOperator));
 }
 foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
 	$param .= "&search_category_customer_list[]=".urlencode($searchCategoryCustomer);
@@ -915,7 +915,7 @@ foreach ($searchCategorySupplierList as $searchCategorySupplier) {
 	$param .= "&search_category_supplier_list[]=".urlencode($searchCategorySupplier);
 }
 if ($search_sale > 0) {
-	$param .= '&search_sale='.urlencode($search_sale);
+	$param .= '&search_sale='.urlencode((string) ($search_sale));
 }
 if ($search_id > 0) {
 	$param .= "&search_id=".urlencode($search_id);
@@ -999,13 +999,13 @@ if ($search_price_level != '') {
 	$param .= '&search_price_level='.urlencode($search_price_level);
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 }
 if ($search_type != '') {
 	$param .= '&search_type='.urlencode($search_type);
 }
 if ($search_status != '') {
-	$param .= '&search_status='.urlencode($search_status);
+	$param .= '&search_status='.urlencode((string) ($search_status));
 }
 if (is_array($search_level) && count($search_level)) {
 	foreach ($search_level as $slevel) {
@@ -1027,49 +1027,49 @@ if ($type != '') {
 	$param .= '&type='.urlencode($type);
 }
 if ($search_date_creation_startmonth) {
-	$param .= '&search_date_creation_startmonth='.urlencode($search_date_creation_startmonth);
+	$param .= '&search_date_creation_startmonth='.urlencode((string) ($search_date_creation_startmonth));
 }
 if ($search_date_creation_startyear) {
-	$param .= '&search_date_creation_startyear='.urlencode($search_date_creation_startyear);
+	$param .= '&search_date_creation_startyear='.urlencode((string) ($search_date_creation_startyear));
 }
 if ($search_date_creation_startday) {
-	$param .= '&search_date_creation_startday='.urlencode($search_date_creation_startday);
+	$param .= '&search_date_creation_startday='.urlencode((string) ($search_date_creation_startday));
 }
 if ($search_date_creation_start) {
 	$param .= '&search_date_creation_start='.urlencode($search_date_creation_start);
 }
 if ($search_date_creation_endmonth) {
-	$param .= '&search_date_creation_endmonth='.urlencode($search_date_creation_endmonth);
+	$param .= '&search_date_creation_endmonth='.urlencode((string) ($search_date_creation_endmonth));
 }
 if ($search_date_creation_endyear) {
-	$param .= '&search_date_creation_endyear='.urlencode($search_date_creation_endyear);
+	$param .= '&search_date_creation_endyear='.urlencode((string) ($search_date_creation_endyear));
 }
 if ($search_date_creation_endday) {
-	$param .= '&search_date_creation_endday='.urlencode($search_date_creation_endday);
+	$param .= '&search_date_creation_endday='.urlencode((string) ($search_date_creation_endday));
 }
 if ($search_date_creation_end) {
 	$param .= '&search_date_creation_end='.urlencode($search_date_creation_end);
 }
 if ($search_date_modif_startmonth) {
-	$param .= '&search_date_modif_startmonth='.urlencode($search_date_modif_startmonth);
+	$param .= '&search_date_modif_startmonth='.urlencode((string) ($search_date_modif_startmonth));
 }
 if ($search_date_modif_startyear) {
-	$param .= '&search_date_modif_startyear='.urlencode($search_date_modif_startyear);
+	$param .= '&search_date_modif_startyear='.urlencode((string) ($search_date_modif_startyear));
 }
 if ($search_date_modif_startday) {
-	$param .= '&search_date_modif_startday='.urlencode($search_date_modif_startday);
+	$param .= '&search_date_modif_startday='.urlencode((string) ($search_date_modif_startday));
 }
 if ($search_date_modif_start) {
 	$param .= '&search_date_modif_start='.urlencode($search_date_modif_start);
 }
 if ($search_date_modif_endmonth) {
-	$param .= '&search_date_modif_endmonth='.urlencode($search_date_modif_endmonth);
+	$param .= '&search_date_modif_endmonth='.urlencode((string) ($search_date_modif_endmonth));
 }
 if ($search_date_modif_endyear) {
-	$param .= '&search_date_modif_endyear='.urlencode($search_date_modif_endyear);
+	$param .= '&search_date_modif_endyear='.urlencode((string) ($search_date_modif_endyear));
 }
 if ($search_date_modif_endday) {
-	$param .= '&search_date_modif_endday='.urlencode($search_date_modif_endday);
+	$param .= '&search_date_modif_endday='.urlencode((string) ($search_date_modif_endday));
 }
 if ($search_date_modif_end) {
 	$param .= '&search_date_modif_end=' . urlencode($search_date_modif_end);

From 68ab7bac14b3d607cf21fdaf4717c101e18b99da Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:07 +0100
Subject: [PATCH 0746/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index 01791b4a188..b1275bfcdfe 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -94,7 +94,7 @@ $result = restrictedArea($user, 'societe', $socid, '&societe');
  *	Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -192,7 +192,7 @@ if (isModEnabled('agenda')) {
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 	print '<br>';
 
-	$param = '&socid='.urlencode($socid);
+	$param = '&socid='.urlencode((string) ($socid));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}

From 6f7e11126b6e17d3976456f0ddf89a7d3d95c1b6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:10 +0100
Subject: [PATCH 0747/1862] Fix: Ensure string type for urlencode()

---
 htdocs/societe/website.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 1557332ec18..29484d9773d 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -108,7 +108,7 @@ $arrayfields = array();
 foreach ($objectwebsiteaccount->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled']);
+		$arrayfields['t.'.$key] = array('label' => $val['label'], 'checked' => (($val['visible'] < 0) ? 0 : 1), 'enabled' => $val['enabled']);
 	}
 }
 
@@ -134,7 +134,7 @@ $result = restrictedArea($user, 'societe', $object->id, '&societe');
  *	Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -192,7 +192,7 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($id > 0) {
-	$param .= '&id='.urlencode($id);
+	$param .= '&id='.urlencode((string) ($id));
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
@@ -454,7 +454,7 @@ foreach ($objectwebsiteaccount->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -499,7 +499,7 @@ foreach ($objectwebsiteaccount->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -600,7 +600,7 @@ 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, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -641,7 +641,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 14843e808aac414541759cb7fd3047497340f6ac Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:13 +0100
Subject: [PATCH 0748/1862] Fix: Ensure string type for urlencode()

---
 htdocs/supplier_proposal/list.php | 102 +++++++++++++++---------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index b2934afcb1a..c34a60b581b 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -158,10 +158,10 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'sp.ref'=>'Ref',
-	's.nom'=>'Supplier',
-	'pd.description'=>'Description',
-	'sp.note_public'=>'NotePublic',
+	'sp.ref' => 'Ref',
+	's.nom' => 'Supplier',
+	'pd.description' => 'Description',
+	'sp.note_public' => 'NotePublic',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["p.note_private"] = "NotePrivate";
@@ -169,28 +169,28 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'sp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("Supplier"), 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>0),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'sp.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
-	'sp.date_livraison'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
-	'sp.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-	'sp.total_tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-	'sp.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
-	'sp.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'sp.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'sp.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'sp.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'sp.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'u.login'=>array('label'=>$langs->trans("Author"), 'checked'=>1, 'position'=>10),
-	'sp.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'sp.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'sp.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'sp.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	's.nom' => array('label' => $langs->trans("Supplier"), 'checked' => 1),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => 0),
+	's.town' => array('label' => $langs->trans("Town"), 'checked' => 1),
+	's.zip' => array('label' => $langs->trans("Zip"), 'checked' => 1),
+	'state.nom' => array('label' => $langs->trans("StateShort"), 'checked' => 0),
+	'country.code_iso' => array('label' => $langs->trans("Country"), 'checked' => 0),
+	'typent.code' => array('label' => $langs->trans("ThirdPartyType"), 'checked' => $checkedtypetiers),
+	'sp.date_valid' => array('label' => $langs->trans("DateValidation"), 'checked' => 1),
+	'sp.date_livraison' => array('label' => $langs->trans("DateEnd"), 'checked' => 1),
+	'sp.total_ht' => array('label' => $langs->trans("AmountHT"), 'checked' => 1),
+	'sp.total_tva' => array('label' => $langs->trans("AmountVAT"), 'checked' => 0),
+	'sp.total_ttc' => array('label' => $langs->trans("AmountTTC"), 'checked' => 0),
+	'sp.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'sp.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'sp.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'sp.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'sp.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'u.login' => array('label' => $langs->trans("Author"), 'checked' => 1, 'position' => 10),
+	'sp.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+	'sp.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),
+	'sp.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -220,7 +220,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -533,40 +533,40 @@ if ($resql) {
 		$param .= '&sall='.urlencode($sall);
 	}
 	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
+		$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 	}
 	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+		$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 	}
 	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+		$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 	}
 	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
+		$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 	}
 	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+		$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 	}
 	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+		$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 	}
 	if ($search_date_valid_startday) {
-		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+		$param .= '&search_date_valid_startday='.urlencode((string) ($search_date_valid_startday));
 	}
 	if ($search_date_valid_startmonth) {
-		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+		$param .= '&search_date_valid_startmonth='.urlencode((string) ($search_date_valid_startmonth));
 	}
 	if ($search_date_valid_startyear) {
-		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+		$param .= '&search_date_valid_startyear='.urlencode((string) ($search_date_valid_startyear));
 	}
 	if ($search_date_valid_endday) {
-		$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+		$param .= '&search_date_valid_endday='.urlencode((string) ($search_date_valid_endday));
 	}
 	if ($search_date_valid_endmonth) {
-		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+		$param .= '&search_date_valid_endmonth='.urlencode((string) ($search_date_valid_endmonth));
 	}
 	if ($search_date_valid_endyear) {
-		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+		$param .= '&search_date_valid_endyear='.urlencode((string) ($search_date_valid_endyear));
 	}
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
@@ -578,7 +578,7 @@ if ($resql) {
 		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
 	}
 	if ($search_user > 0) {
-		$param .= '&search_user='.urlencode($search_user);
+		$param .= '&search_user='.urlencode((string) ($search_user));
 	}
 	if ($search_sale > 0) {
 		$param .= '&search_sale='.urlencode($search_sale);
@@ -611,7 +611,7 @@ if ($resql) {
 		$param .= '&search_zip='.urlencode($search_zip);
 	}
 	if ($socid > 0) {
-		$param .= '&socid='.urlencode($socid);
+		$param .= '&socid='.urlencode((string) ($socid));
 	}
 	if ($search_status != '') {
 		$param .= '&search_status='.urlencode($search_status);
@@ -620,15 +620,15 @@ if ($resql) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+		$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 	}
 	// Add $param from extra fields
 	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"),
-		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+		'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"),
 	);
 	if ($user->hasRight('supplier_proposal', 'supprimer')) {
@@ -644,8 +644,8 @@ if ($resql) {
 		$url .= '&socid='.$socid;
 	}
 	$newcardbutton = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('supplier_proposal', 'creer'));
 
@@ -854,7 +854,7 @@ if ($resql) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
+	$parameters = array('arrayfields' => $arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
@@ -971,7 +971,7 @@ if ($resql) {
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['sp.datec']['checked'])) {
@@ -1031,7 +1031,7 @@ if ($resql) {
 			// TODO Use a cache on user
 			$userstatic->fetch($obj->fk_user_author);
 			$objectstatic->delivery_date = $obj->dp;
-			print $objectstatic->getKanbanView('', array('thirdparty'=>$companystatic, 'userauthor'=>$userstatic, 'selected' => in_array($obj->id, $arrayofselected)));
+			print $objectstatic->getKanbanView('', array('thirdparty' => $companystatic, 'userauthor' => $userstatic, 'selected' => in_array($obj->id, $arrayofselected)));
 			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
@@ -1269,7 +1269,7 @@ if ($resql) {
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
@@ -1338,7 +1338,7 @@ if ($resql) {
 
 	$db->free($resql);
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 

From a00e69f96fe31c8fea232f830458ef70d525e4c3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:16 +0100
Subject: [PATCH 0749/1862] Fix: Ensure string type for urlencode()

---
 htdocs/takepos/floors.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 6bb4f8ae4c2..20558a484e4 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -157,7 +157,7 @@ function updateplace(idplace, left, top) {
 		url: "<?php echo DOL_URL_ROOT.'/takepos/floors.php'; ?>",
 		data: { action: "update", left: left, top: top, place: idplace, token: '<?php echo currentToken(); ?>' }
 	}).done(function( msg ) {
-		window.location.href='floors.php?mode=edit&floor=<?php echo urlencode($floor); ?>';
+		window.location.href='floors.php?mode=edit&floor=<?php echo urlencode((string) ($floor)); ?>';
 	});
 }
 
@@ -169,7 +169,7 @@ function updatename(rowid) {
 		url: "<?php echo DOL_URL_ROOT.'/takepos/floors.php'; ?>",
 		data: { action: "updatename", place: rowid, newname: after, token: '<?php echo currentToken(); ?>' }
 	}).done(function( msg ) {
-		window.location.href='floors.php?mode=edit&floor=<?php echo urlencode($floor); ?>';
+		window.location.href='floors.php?mode=edit&floor=<?php echo urlencode((string) ($floor)); ?>';
 	});
 }
 
@@ -232,7 +232,8 @@ $( document ).ready(function() {
 																											 } ?>';">
 	<?php } ?>
 	<span class="valignmiddle"><?php echo $langs->trans("Floor")." ".$floor; ?></span>
-	<img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';">
+	<img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++;
+	echo $floor; ?>';">
 	</h1>
 	</center>
 </div>

From 8bd13a17dba3c479b86b43512cd9681083486f31 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:18 +0100
Subject: [PATCH 0750/1862] Fix: Ensure string type for urlencode()

---
 htdocs/takepos/pay.php | 50 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index ec19ad6c74d..27fa2d103e3 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -69,7 +69,7 @@ $title = '';
 $disablejs = 0;
 $disablehead = 0;
 
-$head='<link rel="stylesheet" href="css/pos.css.php">';
+$head = '<link rel="stylesheet" href="css/pos.css.php">';
 if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
 	$head .= '<link rel="stylesheet" href="css/colorful.css">';
 }
@@ -122,7 +122,7 @@ function unexpectedDisconnect() {
 
 function fetchConnectionToken() {
 		<?php
-		$urlconnexiontoken = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=getConnexionToken&token='.newToken().'&servicestatus='.urlencode($servicestatus);
+		$urlconnexiontoken = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=getConnexionToken&token='.newToken().'&servicestatus='.urlencode((string) ($servicestatus));
 		if (getDolGlobalString('STRIPE_LOCATION')) {
 			$urlconnexiontoken .= '&location='.urlencode(getDolGlobalString('STRIPE_LOCATION'));
 		}
@@ -218,8 +218,8 @@ if ($usestripeterminals && $invoice->type != $invoice::TYPE_CREDIT_NOTE) {
 </script>
 <?php
 
-// Define list of possible payments
-$arrayOfValidPaymentModes = array();
+	// Define list of possible payments
+	$arrayOfValidPaymentModes = array();
 $arrayOfValidBankAccount = array();
 
 $sql = "SELECT code, libelle as label FROM ".MAIN_DB_PREFIX."c_paiement";
@@ -386,7 +386,7 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 	function capturePaymentIntent(paymentIntentId) {
 	const bodyContent = JSON.stringify({"id": paymentIntentId})
   <?php
-	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=capturePaymentIntent&token='.newToken().'&servicestatus='.urlencode($servicestatus);
+	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=capturePaymentIntent&token='.newToken().'&servicestatus='.urlencode((string) ($servicestatus));
 	if (!empty($stripeacc)) {
 		$urlpaymentintent .= '&stripeacc='.urlencode($stripeacc);
 	}
@@ -508,11 +508,11 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 
 <?php
 if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
-		echo "var line1='".$langs->trans('TotalTTC')."'.substring(0,20);";
-		echo "line1=line1.padEnd(20);";
-		echo "var line2='".price($invoice->total_ttc, 1, '', 1, -1, -1)."'.substring(0,20);";
-		echo "line2=line2.padEnd(20);";
-		echo "$.ajax({
+	echo "var line1='".$langs->trans('TotalTTC')."'.substring(0,20);";
+	echo "line1=line1.padEnd(20);";
+	echo "var line2='".price($invoice->total_ttc, 1, '', 1, -1, -1)."'.substring(0,20);";
+	echo "line2=line2.padEnd(20);";
+	echo "$.ajax({
 		type: 'GET',
 		data: { text: line1+line2 },
 		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
@@ -553,7 +553,7 @@ if (isModEnabled('multicurrency') && $_SESSION["takeposcustomercurrency"] != ""
 	<?php } ?>
 	<div class="paymentbordline paymentbordlinereceived center">
 		<span class="takepospay colorwhite"><?php echo $langs->trans("Received"); ?>: <span class="change1 colorred"><?php
-			echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code);
+		echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code);
 		if ($showothercurrency) {
 			print ' &nbsp; <span id="linecolht-span-total opacitymedium" style="font-size:0.9em; font-style:italic;">(' . price(0 * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
 		}
@@ -561,7 +561,7 @@ if (isModEnabled('multicurrency') && $_SESSION["takeposcustomercurrency"] != ""
 	</div>
 	<div class="paymentbordline paymentbordlinechange center">
 		<span class="takepospay colorwhite"><?php echo $langs->trans("Change"); ?>: <span class="change2 colorwhite"><?php
-			echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code);
+		echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code);
 		if ($showothercurrency) {
 			print ' &nbsp; <span id="linecolht-span-total opacitymedium" style="font-size:0.9em; font-style:italic;">(' . price(0 * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
 		}
@@ -583,18 +583,18 @@ if (isModEnabled('multicurrency') && $_SESSION["takeposcustomercurrency"] != ""
 <div style="position:absolute; left:5%; height:52%; width:90%;">
 <?php
 $action_buttons = array(
-	array(
-		"function" =>"reset()",
-		"span" => "style='font-size: 150%;'",
-		"text" => "C",
-		"class" => "poscolorblue"
-	),
-	array(
-		"function" => "parent.$.colorbox.close();",
-		"span" => "id='printtext' style='font-weight: bold; font-size: 18pt;'",
-		"text" => "X",
-		"class" => "poscolordelete"
-	),
+array(
+	"function" => "reset()",
+	"span" => "style='font-size: 150%;'",
+	"text" => "C",
+	"class" => "poscolorblue"
+),
+array(
+	"function" => "parent.$.colorbox.close();",
+	"span" => "id='printtext' style='font-weight: bold; font-size: 18pt;'",
+	"text" => "X",
+	"class" => "poscolordelete"
+),
 );
 $numpad = getDolGlobalString('TAKEPOS_NUMPAD');
 if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && getDolGlobalString('STRIPE_CARD_PRESENT')) {
@@ -748,7 +748,7 @@ if (getDolGlobalString('TAKEPOS_DELAYED_PAYMENT')) {
 
 <?php
 // Add code from hooks
-$parameters=array();
+$parameters = array();
 $hookmanager->executeHooks('completePayment', $parameters, $invoice);
 print $hookmanager->resPrint;
 ?>

From a7c5b01ec3ecae2fc89cfa7fd88f5a9eb45555df Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:21 +0100
Subject: [PATCH 0751/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 1233793cd7d..4ccef134ea0 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -668,16 +668,16 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
 $param .= $hookmanager->resPrint;
 if ($socid > 0) {
-	$param .= '&socid='.urlencode($socid);
+	$param .= '&socid='.urlencode((string) ($socid));
 }
 if ($search_societe) {
 	$param .= '&search_societe='.urlencode($search_societe);
 }
 if ($projectid > 0) {
-	$param .= '&projectid='.urlencode($projectid);
+	$param .= '&projectid='.urlencode((string) ($projectid));
 }
 if ($contractid > 0) {
-	$param .= '&contractid='.urlencode($contractid);
+	$param .= '&contractid='.urlencode((string) ($contractid));
 }
 if ($search_date_start) {
 	$tmparray = dol_getdate($search_date_start);

From 7fd69459dfc33e36202ef30dc6dfcea0063f51a3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:24 +0100
Subject: [PATCH 0752/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index a9887cc577c..7c692bb9ba4 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -89,7 +89,7 @@ if (($object->id != $user->id) && !$user->hasRight('user', 'user', 'lire')) {
 	accessforbidden();
 }
 
-$parameters = array('id'=>$userId);
+$parameters = array('id' => $userId);
 $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');
@@ -185,7 +185,7 @@ if (isModEnabled('agenda')) {
 
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allaactions', 'read'))) {
 	print '<br>';
-	$param = '&id='.urlencode($id);
+	$param = '&id='.urlencode((string) ($id));
 
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.((int) $limit);

From 41a82fe7da8f87990904374f75bcbb45c034f31d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:27 +0100
Subject: [PATCH 0753/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index c7793975b0f..e55dc5ea1bc 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -606,7 +606,7 @@ if ($optioncss != '') {
 	$param .= '&amp;optioncss='.urlencode($optioncss);
 }
 if ($search_categ > 0) {
-	$param .= '&amp;search_categ='.urlencode($search_categ);
+	$param .= '&amp;search_categ='.urlencode((string) ($search_categ));
 }
 if ($search_warehouse > 0) {
 	$param .= '&amp;search_warehouse='.urlencode($search_warehouse);
@@ -650,7 +650,7 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $url = DOL_URL_ROOT.'/user/card.php?action=create'.($contextpage == 'employeelist' ? '&search_employee=1' : '').'&leftmenu=';
 if (!empty($socid)) {
-	$url .= '&socid='.urlencode($socid);
+	$url .= '&socid='.urlencode((string) ($socid));
 }
 
 $newcardbutton = '';

From 08424f1347cd866f86043f0b2369d21981d8a0e0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:29 +0100
Subject: [PATCH 0754/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php
index d9db450b985..f28ee2aa0cc 100644
--- a/htdocs/user/messaging.php
+++ b/htdocs/user/messaging.php
@@ -99,7 +99,7 @@ $result = restrictedArea($user, 'user', $userId, '&user');
  *	Actions
  */
 
-$parameters = array('id'=>$socid);
+$parameters = array('id' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -196,7 +196,7 @@ if (isModEnabled('agenda')) {
 
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allaactions', 'read'))) {
 	print '<br>';
-	$param = '&userid='.urlencode($userid);
+	$param = '&userid='.urlencode((string) ($userid));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}

From be80a14b472b0542f2aa27081c11eb02db6afa79 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:32 +0100
Subject: [PATCH 0755/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 8112a219016..240723c47c8 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -228,11 +228,11 @@ if ($result > 0) {
 	// Add notification form
 	//  print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.urlencode($id).'" method="POST">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.urlencode((string) ($id)).'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	$param = "&id=".urlencode($id);
+	$param = "&id=".urlencode((string) ($id));
 
 	// Line with titles
 	/*  print '<table width="100%" class="noborder">';

From ed507b7df2d5974334b559ffb27be22a21487919 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:34 +0100
Subject: [PATCH 0756/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index e34cf104d40..905e915dfbb 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -117,7 +117,7 @@ if ($action == 'create' && GETPOST('selectvariant', 'alpha')) {	// We click on s
 	$action = 'add';
 	$attribute_id = GETPOSTINT('attribute');
 	$attribute_value_id = GETPOSTINT('value');
-	if ($attribute_id> 0 && $attribute_value_id > 0) {
+	if ($attribute_id > 0 && $attribute_value_id > 0) {
 		$feature = $attribute_id . '-' . $attribute_value_id;
 		$selectedvariant[$feature] = $feature;
 		$_SESSION['addvariant_'.$object->id] = $selectedvariant;
@@ -792,11 +792,11 @@ if (!empty($id) || !empty($ref)) {
 				$prodstatic->fetch($prodcomb->fk_product_child);
 
 				print $form->formconfirm(
-					"combinations.php?id=".urlencode($id)."&valueid=".urlencode($valueid),
+					"combinations.php?id=".urlencode((string) ($id))."&valueid=".urlencode((string) ($valueid)),
 					$langs->trans('Delete'),
 					$langs->trans('ProductCombinationDeleteDialog', $prodstatic->ref),
 					"confirm_deletecombination",
-					array(array('label'=> $langs->trans('DeleteLinkedProduct'), 'type'=> 'checkbox', 'name' => 'delete_product', 'value' => false)),
+					array(array('label' => $langs->trans('DeleteLinkedProduct'), 'type' => 'checkbox', 'name' => 'delete_product', 'value' => false)),
 					0,
 					1
 				);

From 7d84a5ecf31bbba1c632b47c96a874557e6fd858 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:54:37 +0100
Subject: [PATCH 0757/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index cf25d186ae8..4e6853596bc 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -100,7 +100,7 @@ restrictedArea($user, $object->element, $object->id, $object->table_element, 'wo
  *  Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -206,14 +206,14 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode((string) ($object->element.'@'.$object->module)).'&originid='.urlencode((string) ($object->id));
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
 		if (get_class($objthirdparty) == 'Societe') {
-			$out .= '&socid='.urlencode($objthirdparty->id);
+			$out .= '&socid='.urlencode((string) ($objthirdparty->id));
 		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
 		//$out.=$langs->trans("AddAnAction").' ';

From 1ce098d211d5f1ca9fdabf0c496c4be027ea587e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 02:55:38 +0100
Subject: [PATCH 0758/1862] Fix: Ensure string type for urlencode()

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 003fdda6d09..b8009477a39 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -655,7 +655,7 @@ if (empty($reshook)) {
 				$param .= '&search_user='.urlencode((string) ($search_user));
 			}
 			if ($search_sale > 0) {
-				$param .= '&search_sale='.urlencode($search_sale);
+				$param .= '&search_sale='.urlencode((string) ($search_sale));
 			}
 			if ($search_total_ht != '') {
 				$param .= '&search_total_ht='.urlencode($search_total_ht);
@@ -1245,7 +1245,7 @@ if ($search_user > 0) {
 	$param .= '&search_user='.urlencode((string) ($search_user));
 }
 if ($search_sale > 0) {
-	$param .= '&search_sale='.urlencode($search_sale);
+	$param .= '&search_sale='.urlencode((string) ($search_sale));
 }
 if ($search_total_ht != '') {
 	$param .= '&search_total_ht='.urlencode($search_total_ht);

From 4fa993fe8a2355fcf4a53790e38cf883af5cc704 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 23:22:15 +0100
Subject: [PATCH 0759/1862] Fix: Ensure string type for urlencode()

---
 htdocs/comm/propal/list.php | 2812 ++++++++++++++++++-----------------
 1 file changed, 1407 insertions(+), 1405 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 2bc33b37f3f..5e8b4f60de1 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -77,7 +77,9 @@ $mode 		= GETPOST('mode', 'alpha');
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user 	= GETPOSTINT('search_user');
-if ($search_user==-1) $search_user=0;
+if ($search_user == -1) {
+	$search_user = 0;
+}
 $search_sale 	= GETPOSTINT('search_sale');
 $search_ref 	= GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
@@ -190,14 +192,14 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'p.ref'=>'Ref',
-	'p.ref_client'=>'RefCustomer',
-	'pd.description'=>'Description',
-	's.nom'=>"ThirdParty",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	'p.note_public'=>'NotePublic',
+	'p.ref' => 'Ref',
+	'p.ref_client' => 'RefCustomer',
+	'pd.description' => 'Description',
+	's.nom' => "ThirdParty",
+	's.name_alias' => "AliasNameShort",
+	's.zip' => "Zip",
+	's.town' => "Town",
+	'p.note_public' => 'NotePublic',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["p.note_private"] = "NotePrivate";
@@ -206,50 +208,50 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>-1),
-	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(isModEnabled('project') ? 1 : 0)),
-	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(isModEnabled('project') ? 1 : 0)),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
-	's.town'=>array('label'=>"Town", 'checked'=>-1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>-1),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	'p.date'=>array('label'=>"DatePropal", 'checked'=>1),
-	'p.fin_validite'=>array('label'=>"DateEnd", 'checked'=>1),
-	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
-	'p.date_signature'=>array('label'=>"DateSigning", 'checked'=>0),
-	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
-	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>isModEnabled("delivery_note")),
-	'p.fk_input_reason'=>array('label'=>"Origin", 'checked'=>0, 'enabled'=>1),
-	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0),
-	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
-	'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
-	'p.total_tva'=>array('label'=>"AmountVAT", 'checked'=>0),
-	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
-	'p.total_ht_invoiced'=>array('label'=>"AmountInvoicedHT", 'checked'=>0, 'enabled'=>getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'p.total_invoiced'=>array('label'=>"AmountInvoicedTTC", 'checked'=>0, 'enabled'=>getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'p.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_tva'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
-	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
+	'p.ref' => array('label' => "Ref", 'checked' => 1),
+	'p.ref_client' => array('label' => "RefCustomer", 'checked' => -1),
+	'pr.ref' => array('label' => "ProjectRef", 'checked' => 1, 'enabled' => (isModEnabled('project') ? 1 : 0)),
+	'pr.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (isModEnabled('project') ? 1 : 0)),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => -1),
+	's.town' => array('label' => "Town", 'checked' => -1),
+	's.zip' => array('label' => "Zip", 'checked' => -1),
+	'state.nom' => array('label' => "StateShort", 'checked' => 0),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0),
+	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers),
+	'p.date' => array('label' => "DatePropal", 'checked' => 1),
+	'p.fin_validite' => array('label' => "DateEnd", 'checked' => 1),
+	'p.date_livraison' => array('label' => "DeliveryDate", 'checked' => 0),
+	'p.date_signature' => array('label' => "DateSigning", 'checked' => 0),
+	'ava.rowid' => array('label' => "AvailabilityPeriod", 'checked' => 0),
+	'p.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => 0, 'enabled' => isModEnabled("delivery_note")),
+	'p.fk_input_reason' => array('label' => "Origin", 'checked' => 0, 'enabled' => 1),
+	'p.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 0),
+	'p.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 0),
+	'p.total_ht' => array('label' => "AmountHT", 'checked' => 1),
+	'p.total_tva' => array('label' => "AmountVAT", 'checked' => 0),
+	'p.total_ttc' => array('label' => "AmountTTC", 'checked' => 0),
+	'p.total_ht_invoiced' => array('label' => "AmountInvoicedHT", 'checked' => 0, 'enabled' => getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.total_invoiced' => array('label' => "AmountInvoicedTTC", 'checked' => 0, 'enabled' => getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_tva' => array('label' => 'MulticurrencyAmountVAT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_ht_invoiced' => array('label' => 'MulticurrencyAmountInvoicedHT', 'checked' => 0, 'enabled' => isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.multicurrency_total_invoiced' => array('label' => 'MulticurrencyAmountInvoicedTTC', 'checked' => 0, 'enabled' => isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'u.login' => array('label' => "Author", 'checked' => 1, 'position' => 10),
+	'sale_representative' => array('label' => "SaleRepresentativesOfThirdParty", 'checked' => -1),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
-	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
-	'p.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
-	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
-	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+	'p.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'p.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	'p.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 500),
+	'p.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 510, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
+	'p.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 511, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
+	'p.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
 );
 
 // List of fields to search into when doing a "search in all"
@@ -310,7 +312,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
+$parameters = array('socid' => $socid, 'arrayfields' => &$arrayfields);
 $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');
@@ -843,8 +845,8 @@ if (!$resql) {
 	exit;
 }
 
-	$objectstatic = new Propal($db);
-	$userstatic = new User($db);
+$objectstatic = new Propal($db);
+$userstatic = new User($db);
 
 if ($socid > 0) {
 	$soc = new Societe($db);
@@ -857,9 +859,9 @@ if ($socid > 0) {
 	$title = $langs->trans('Proposals');
 }
 
-	$num = $db->num_rows($resql);
+$num = $db->num_rows($resql);
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
@@ -870,10 +872,10 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 	exit;
 }
 
-	$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-	llxHeader('', $title, $help_url);
+$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+llxHeader('', $title, $help_url);
 
-	$param = '&search_status='.urlencode($search_status);
+$param = '&search_status='.urlencode($search_status);
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
 }
@@ -887,58 +889,58 @@ if ($search_all) {
 	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_date_startday) {
-	$param .= '&search_date_startday='.urlencode($search_date_startday);
+	$param .= '&search_date_startday='.urlencode((string) ($search_date_startday));
 }
 if ($search_date_startmonth) {
-	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	$param .= '&search_date_startmonth='.urlencode((string) ($search_date_startmonth));
 }
 if ($search_date_startyear) {
-	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	$param .= '&search_date_startyear='.urlencode((string) ($search_date_startyear));
 }
 if ($search_date_endday) {
-	$param .= '&search_date_endday='.urlencode($search_date_endday);
+	$param .= '&search_date_endday='.urlencode((string) ($search_date_endday));
 }
 if ($search_date_endmonth) {
-	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	$param .= '&search_date_endmonth='.urlencode((string) ($search_date_endmonth));
 }
 if ($search_date_endyear) {
-	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	$param .= '&search_date_endyear='.urlencode((string) ($search_date_endyear));
 }
 if ($search_date_end_startday) {
-	$param .= '&search_date_end_startday='.urlencode($search_date_end_startday);
+	$param .= '&search_date_end_startday='.urlencode((string) ($search_date_end_startday));
 }
 if ($search_date_end_startmonth) {
-	$param .= '&search_date_end_startmonth='.urlencode($search_date_end_startmonth);
+	$param .= '&search_date_end_startmonth='.urlencode((string) ($search_date_end_startmonth));
 }
 if ($search_date_end_startyear) {
-	$param .= '&search_date_end_startyear='.urlencode($search_date_end_startyear);
+	$param .= '&search_date_end_startyear='.urlencode((string) ($search_date_end_startyear));
 }
 if ($search_date_end_endday) {
-	$param .= '&search_date_end_endday='.urlencode($search_date_end_endday);
+	$param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday));
 }
 if ($search_date_end_endmonth) {
-	$param .= '&search_date_end_endmonth='.urlencode($search_date_end_endmonth);
+	$param .= '&search_date_end_endmonth='.urlencode((string) ($search_date_end_endmonth));
 }
 if ($search_date_end_endyear) {
-	$param .= '&search_date_end_endyear='.urlencode($search_date_end_endyear);
+	$param .= '&search_date_end_endyear='.urlencode((string) ($search_date_end_endyear));
 }
 if ($search_date_delivery_startday) {
-	$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
+	$param .= '&search_date_delivery_startday='.urlencode((string) ($search_date_delivery_startday));
 }
 if ($search_date_delivery_startmonth) {
-	$param .= '&search_date_delivery_startmonth='.urlencode($search_date_delivery_startmonth);
+	$param .= '&search_date_delivery_startmonth='.urlencode((string) ($search_date_delivery_startmonth));
 }
 if ($search_date_delivery_startyear) {
-	$param .= '&search_date_delivery_startyear='.urlencode($search_date_delivery_startyear);
+	$param .= '&search_date_delivery_startyear='.urlencode((string) ($search_date_delivery_startyear));
 }
 if ($search_date_delivery_endday) {
-	$param .= '&search_date_delivery_endday='.urlencode($search_date_delivery_endday);
+	$param .= '&search_date_delivery_endday='.urlencode((string) ($search_date_delivery_endday));
 }
 if ($search_date_delivery_endmonth) {
-	$param .= '&search_date_delivery_endmonth='.urlencode($search_date_delivery_endmonth);
+	$param .= '&search_date_delivery_endmonth='.urlencode((string) ($search_date_delivery_endmonth));
 }
 if ($search_date_delivery_endyear) {
-	$param .= '&search_date_delivery_endyear='.urlencode($search_date_delivery_endyear);
+	$param .= '&search_date_delivery_endyear='.urlencode((string) ($search_date_delivery_endyear));
 }
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
@@ -956,7 +958,7 @@ if ($search_societe_alias) {
 	$param .= '&search_societe_alias='.urlencode($search_societe_alias);
 }
 if ($search_user > 0) {
-	$param .= '&search_user='.urlencode($search_user);
+	$param .= '&search_user='.urlencode((string) ($search_user));
 }
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
@@ -989,31 +991,31 @@ if ($search_zip) {
 	$param .= '&search_zip='.urlencode($search_zip);
 }
 if ($socid > 0) {
-	$param .= '&socid='.urlencode($socid);
+	$param .= '&socid='.urlencode((string) ($socid));
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
 if ($search_categ_cus > 0) {
-	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	$param .= '&search_categ_cus='.urlencode((string) ($search_categ_cus));
 }
 if ($search_product_category != '') {
-	$param .= '&search_product_category='.urlencode($search_product_category);
+	$param .= '&search_product_category='.urlencode((string) ($search_product_category));
 }
 if ($search_fk_cond_reglement > 0) {
-	$param .= '&search_fk_cond_reglement='.urlencode($search_fk_cond_reglement);
+	$param .= '&search_fk_cond_reglement='.urlencode((string) ($search_fk_cond_reglement));
 }
 if ($search_fk_shipping_method > 0) {
-	$param .= '&search_fk_shipping_method='.urlencode($search_fk_shipping_method);
+	$param .= '&search_fk_shipping_method='.urlencode((string) ($search_fk_shipping_method));
 }
 if ($search_fk_input_reason > 0) {
-	$param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason);
+	$param .= '&search_fk_input_reason='.urlencode((string) ($search_fk_input_reason));
 }
 if ($search_fk_mode_reglement > 0) {
-	$param .= '&search_fk_mode_reglement='.urlencode($search_fk_mode_reglement);
+	$param .= '&search_fk_mode_reglement='.urlencode((string) ($search_fk_mode_reglement));
 }
 if ($search_type_thirdparty > 0) {
-	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
 }
 if ($search_town) {
 	$param .= '&search_town='.urlencode($search_town);
@@ -1028,1383 +1030,1383 @@ if ($search_town) {
 	$param .= '&search_town='.urlencode($search_town);
 }
 if ($search_country) {
-	$param .= '&search_country='.urlencode($search_country);
+	$param .= '&search_country='.urlencode((string) ($search_country));
 }
 if ($search_date_signature_startday) {
-	$param .= '&search_date_signature_startday='.urlencode($search_date_signature_startday);
+	$param .= '&search_date_signature_startday='.urlencode((string) ($search_date_signature_startday));
 }
 if ($search_date_signature_startmonth) {
-	$param .= '&search_date_signature_startmonth='.urlencode($search_date_signature_startmonth);
+	$param .= '&search_date_signature_startmonth='.urlencode((string) ($search_date_signature_startmonth));
 }
 if ($search_date_signature_startyear) {
-	$param .= '&search_date_signature_startyear='.urlencode($search_date_signature_startyear);
+	$param .= '&search_date_signature_startyear='.urlencode((string) ($search_date_signature_startyear));
 }
 if ($search_date_signature_endday) {
-	$param .= '&search_date_signature_endday='.urlencode($search_date_signature_endday);
+	$param .= '&search_date_signature_endday='.urlencode((string) ($search_date_signature_endday));
 }
 if ($search_date_signature_endmonth) {
-	$param .= '&search_date_signature_endmonth='.urlencode($search_date_signature_endmonth);
+	$param .= '&search_date_signature_endmonth='.urlencode((string) ($search_date_signature_endmonth));
 }
 if ($search_date_signature_endyear) {
-	$param .= '&search_date_signature_endyear='.urlencode($search_date_signature_endyear);
+	$param .= '&search_date_signature_endyear='.urlencode((string) ($search_date_signature_endyear));
 }
 
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-	// Add $param from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	$param .= $hookmanager->resPrint;
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
-	// List of mass actions available
-	$arrayofmassactions = array(
-		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	);
-	if ($permissiontosendbymail) {
-		$arrayofmassactions['presend']=img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+// List of mass actions available
+$arrayofmassactions = array(
+	'generate_doc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'builddoc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+);
+if ($permissiontosendbymail) {
+	$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+}
+if ($permissiontovalidate) {
+	$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
+}
+if ($permissiontoclose) {
+	$arrayofmassactions['presign'] = img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("Sign");
+	$arrayofmassactions['nopresign'] = img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("NoSign");
+	$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
+}
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
+
+if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('propal', 'creer'));
+
+// Fields title search
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+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="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode"value="'.$mode.'">';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$topicmail = "SendPropalRef";
+$modelmail = "propal_send";
+$objecttmp = new Propal($db);
+$trackid = 'pro'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($massaction == 'prevalidate') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+}
+
+if ($massaction == 'presign') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
+}
+
+if ($massaction == 'nopresign') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
+}
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
 	}
-	if ($permissiontovalidate) {
-		$arrayofmassactions['prevalidate']=img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
-	}
-	if ($permissiontoclose) {
-		$arrayofmassactions['presign']=img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("Sign");
-		$arrayofmassactions['nopresign']=img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("NoSign");
-		$arrayofmassactions['setbilled'] =img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
-	}
-	if ($permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
+}
+
+$i = 0;
+
+$moreforfilter = '';
+
+// If the user can view prospects other than his'
+if ($user->hasRight('user', 'user', 'lire')) {
+	$langs->load("commercial");
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx', 1);
+	$moreforfilter .= '</div>';
+}
+// If the user can view prospects other than his'
+if ($user->hasRight('user', 'user', 'lire')) {
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('LinkedToSpecificUsers');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers((empty($search_user) ? -2 : 0), 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
+	$moreforfilter .= '</div>';
+}
+// If the user can view products
+if (isModEnabled('category') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
+	$searchCategoryProductOperator = -1;
+	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$tmptitle = $langs->trans('IncludingProductWithTag');
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, array($search_product_category), 'maxwidth300', $searchCategoryProductOperator, 0, 0, $tmptitle);
+}
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'));
+	$moreforfilter .= '</div>';
+}
+if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+	$formproduct = new FormProduct($db);
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('Warehouse');
+	$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', $tmptitle, 0, 0, $tmptitle);
+	$moreforfilter .= '</div>';
+}
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+print '<tr class="liste_titre_filter">';
+
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
+
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.ref_client']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['pr.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['pr.title']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.town']['checked'])) {
+	print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
+}
+if (!empty($arrayfields['s.zip']['checked'])) {
+	print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+}
+// State
+if (!empty($arrayfields['state.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+	print '</td>';
+}
+// Country
+if (!empty($arrayfields['country.code_iso']['checked'])) {
+	print '<td class="liste_titre" align="center">';
+	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+	print '</td>';
+}
+// Company type
+if (!empty($arrayfields['typent.code']['checked'])) {
+	print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+	print ajax_combobox('search_type_thirdparty');
+	print '</td>';
+}
+// Date
+if (!empty($arrayfields['p.date']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
+	print '</td>';
+}
+// Date end
+if (!empty($arrayfields['p.fin_validite']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
+	print '</td>';
+}
+// Date delivery
+if (!empty($arrayfields['p.date_livraison']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '</td>';
+}
+// Date Signature
+if (!empty($arrayfields['p.date_signature']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_signature_start ? $search_date_signature_start : -1, 'search_date_signature_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_signature_end ? $search_date_signature_end : -1, 'search_date_signature_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '</td>';
+}
+// Availability
+if (!empty($arrayfields['ava.rowid']['checked'])) {
+	print '<td class="liste_titre maxwidth100onsmartphone center">';
+	$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
+	print ajax_combobox('search_availability');
+	print '</td>';
+}
+// Shipping Method
+if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+	print '</td>';
+}
+// Source - Input reason
+if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, 'maxwidth125', 1);
+	print '</td>';
+}
+// Payment term
+if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->getSelectConditionsPaiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
+	print '</td>';
+}
+// Payment mode
+if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_ht']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_tva']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_ttc']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+	// Currency
+	print '<td class="liste_titre">';
+	print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+	// Currency rate
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['u.login']['checked'])) {
+	// Author
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['sale_representative']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['total_pa']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['total_margin']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['total_margin_rate']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['total_mark_rate']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields' => $arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Date creation
+if (!empty($arrayfields['p.datec']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Date modification
+if (!empty($arrayfields['p.tms']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Date cloture
+if (!empty($arrayfields['p.date_cloture']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.note_public']['checked'])) {
+	// Note public
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.note_private']['checked'])) {
+	// Note private
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Status
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
+	print '<td class="liste_titre center parentonrightofpage">';
+	$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_status', 'search_status width100 onrightofpage');
+	print '</td>';
+}
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
+print "</tr>\n";
+
+$totalarray = array(
+	'nbfield' => 0,
+	'val' => array(
+		'p.total_ht' => 0,
+		'p.total_tva' => 0,
+		'p.total_ttc' => 0,
+	),
+);
+
+// Fields title
+print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.ref_client']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref_client']['label'], $_SERVER["PHP_SELF"], 'p.ref_client', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['pr.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['pr.title']['checked'])) {
+	print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.town']['checked'])) {
+	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.zip']['checked'])) {
+	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['state.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['country.code_iso']['checked'])) {
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['typent.code']['checked'])) {
+	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fin_validite']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date_livraison']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date_signature']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['ava.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "p.fk_input_reason", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_ht']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_tva']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_ttc']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['u.login']['checked'])) {
+	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['sale_representative']['checked'])) {
+	print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_pa']['checked'])) {
+	print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_margin']['checked'])) {
+	print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_margin_rate']['checked'])) {
+	print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_mark_rate']['checked'])) {
+	print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array(
+	'arrayfields' => $arrayfields,
+	'param' => $param,
+	'sortfield' => $sortfield,
+	'sortorder' => $sortorder,
+	'totalarray' => &$totalarray,
+);
+
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
+print $hookmanager->resPrint;
+if (!empty($arrayfields['p.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date_cloture']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.note_public']['checked'])) {
+	print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.note_private']['checked'])) {
+	print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
+}
+print '</tr>'."\n";
+
+// Loop on record
+// --------------------------------------------------------------------
+$typenArray = null;
+$now = dol_now();
+
+$with_margin_info = false;
+if (isModEnabled('margin') && (
+	!empty($arrayfields['total_pa']['checked'])
+	|| !empty($arrayfields['total_margin']['checked'])
+	|| !empty($arrayfields['total_margin_rate']['checked'])
+	|| !empty($arrayfields['total_mark_rate']['checked'])
+)
+) {
+	$with_margin_info = true;
+}
+$total_ht = 0;
+$total_margin = 0;
+
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
 	}
 
-	if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
-		$arrayofmassactions = array();
-	}
-	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	$objectstatic->id = $obj->rowid;
+	$objectstatic->ref = $obj->ref;
+	$objectstatic->ref_client = $obj->ref_client;
+	$objectstatic->note_public = $obj->note_public;
+	$objectstatic->note_private = $obj->note_private;
+	$objectstatic->statut = $obj->status;
+	$objectstatic->status = $obj->status;
 
-	$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';
-	if (!empty($socid)) {
-		$url .= '&socid='.$socid;
-	}
-	$newcardbutton = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitleSeparator();
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('propal', 'creer'));
+	$companystatic->id = $obj->socid;
+	$companystatic->name = $obj->name;
+	$companystatic->name_alias = $obj->alias;
+	$companystatic->client = $obj->client;
+	$companystatic->fournisseur = $obj->fournisseur;
+	$companystatic->code_client = $obj->code_client;
+	$companystatic->email = $obj->email;
+	$companystatic->phone = $obj->phone;
+	$companystatic->address = $obj->address;
+	$companystatic->zip = $obj->zip;
+	$companystatic->town = $obj->town;
+	$companystatic->country_code = $obj->country_code;
 
-	// Fields title search
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	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="contextpage" value="'.$contextpage.'">';
-	print '<input type="hidden" name="mode"value="'.$mode.'">';
+	$projectstatic->id = $obj->project_id;
+	$projectstatic->ref = $obj->project_ref;
+	$projectstatic->title = $obj->project_label;
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	$totalInvoicedHT = 0;
+	$totalInvoicedTTC = 0;
+	$multicurrency_totalInvoicedHT = 0;
+	$multicurrency_totalInvoicedTTC = 0;
 
-	$topicmail = "SendPropalRef";
-	$modelmail = "propal_send";
-	$objecttmp = new Propal($db);
-	$trackid = 'pro'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+	$TInvoiceData = $objectstatic->InvoiceArrayList($obj->rowid);
 
-	if ($massaction == 'prevalidate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
-	}
+	if (!empty($TInvoiceData)) {
+		foreach ($TInvoiceData as $invoiceData) {
+			$invoice = new Facture($db);
+			$invoice->fetch($invoiceData->facid);
 
-	if ($massaction == 'presign') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
-	}
+			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $invoice->type == Facture::TYPE_DEPOSIT) {
+				continue;
+			}
 
-	if ($massaction == 'nopresign') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
-	}
-
-	if ($search_all) {
-		foreach ($fieldstosearchall as $key => $val) {
-			$fieldstosearchall[$key] = $langs->trans($val);
+			$totalInvoicedHT += $invoice->total_ht;
+			$totalInvoicedTTC += $invoice->total_ttc;
+			$multicurrency_totalInvoicedHT += $invoice->multicurrency_total_ht;
+			$multicurrency_totalInvoicedTTC += $invoice->multicurrency_total_ttc;
 		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 	}
 
-	$i = 0;
+	$marginInfo = array();
+	if ($with_margin_info === true) {
+		$objectstatic->fetch_lines();
+		$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
+		$total_ht += $obj->total_ht;
+		$total_margin += $marginInfo['total_margin'];
+	}
 
-	$moreforfilter = '';
-
-	// If the user can view prospects other than his'
-	if ($user->hasRight('user', 'user', 'lire')) {
-		$langs->load("commercial");
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx', 1);
-		$moreforfilter .= '</div>';
-	}
-	// If the user can view prospects other than his'
-	if ($user->hasRight('user', 'user', 'lire')) {
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('LinkedToSpecificUsers');
-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers((empty($search_user)?-2:0), 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
-		$moreforfilter .= '</div>';
-	}
-	// If the user can view products
-	if (isModEnabled('category') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
-		$searchCategoryProductOperator = -1;
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$tmptitle = $langs->trans('IncludingProductWithTag');
-		$formcategory = new FormCategory($db);
-		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, array($search_product_category), 'maxwidth300', $searchCategoryProductOperator, 0, 0, $tmptitle);
-	}
-	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'));
-		$moreforfilter .= '</div>';
-	}
-	if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
-		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-		$formproduct = new FormProduct($db);
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('Warehouse');
-		$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', $tmptitle, 0, 0, $tmptitle);
-		$moreforfilter .= '</div>';
-	}
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$moreforfilter .= $hookmanager->resPrint;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
+		}
+		// Output Kanban
+		$userstatic->fetch($obj->fk_user_author);
+		$arrayofparams = array('selected' => in_array($object->id, $arrayofselected), 'authorlink' => $userstatic->getNomUrl(-2), 'projectlink' => $projectstatic->getNomUrl(2));
+		print $objectstatic->getKanbanView('', $arrayofparams);
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
 	} else {
-		$moreforfilter = $hookmanager->resPrint;
-	}
+		print '<tr class="oddeven">';
 
-	if (!empty($moreforfilter)) {
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		print '</div>';
-	}
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap" align="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
-	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowraponall">';
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			// Picto + Ref
+			print '<td class="nobordernopadding nowraponall">';
+			print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
+			print '</td>';
+			// Warning
+			$warnornote = '';
+			if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+				$warnornote .= img_warning($langs->trans("Late"));
+			}
+			if ($warnornote) {
+				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+				print $warnornote;
+				print '</td>';
+			}
+			// Other picto tool
+			print '<td width="16" class="nobordernopadding right">';
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+			print '</td></tr></table>';
 
-	print '<tr class="liste_titre_filter">';
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre" align="middle">';
-		$searchpicto = $form->showFilterButtons('left');
-		print $searchpicto;
-		print '</td>';
-	}
+		if (!empty($arrayfields['p.ref_client']['checked'])) {
+			// Customer ref
+			print '<td class="nowrap tdoverflowmax200">';
+			print dol_escape_htmltag($obj->ref_client);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.ref_client']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['pr.title']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.name_alias']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
-	}
-	if (!empty($arrayfields['s.zip']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
-	}
-	// State
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-		print '</td>';
-	}
-	// Country
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print '<td class="liste_titre" align="center">';
-		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
-		print '</td>';
-	}
-	// Company type
-	if (!empty($arrayfields['typent.code']['checked'])) {
-		print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
-		print ajax_combobox('search_type_thirdparty');
-		print '</td>';
-	}
-	// Date
-	if (!empty($arrayfields['p.date']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-		print '</div>';
-		print '</td>';
-	}
-	// Date end
-	if (!empty($arrayfields['p.fin_validite']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-		print '</div>';
-		print '</td>';
-	}
-	// Date delivery
-	if (!empty($arrayfields['p.date_livraison']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '</td>';
-	}
-	// Date Signature
-	if (!empty($arrayfields['p.date_signature']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_signature_start ? $search_date_signature_start : -1, 'search_date_signature_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_signature_end ? $search_date_signature_end : -1, 'search_date_signature_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '</td>';
-	}
-	// Availability
-	if (!empty($arrayfields['ava.rowid']['checked'])) {
-		print '<td class="liste_titre maxwidth100onsmartphone center">';
-		$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
-		print ajax_combobox('search_availability');
-		print '</td>';
-	}
-	// Shipping Method
-	if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-		print '<td class="liste_titre">';
-		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
-		print '</td>';
-	}
-	// Source - Input reason
-	if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-		print '<td class="liste_titre">';
-		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, 'maxwidth125', 1);
-		print '</td>';
-	}
-	// Payment term
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-		print '<td class="liste_titre">';
-		print $form->getSelectConditionsPaiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
-		print '</td>';
-	}
-	// Payment mode
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-		print '<td class="liste_titre">';
-		print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_ht']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_tva']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_ttc']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+		if (!empty($arrayfields['pr.ref']['checked'])) {
+			// Project ref
+			print '<td class="nowraponall">';
+			if ($obj->project_id > 0) {
+				print $projectstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		if (!empty($arrayfields['pr.title']['checked'])) {
+			// Project label
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
+				print dol_escape_htmltag($projectstatic->title);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Thirdparty
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Alias
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $obj->alias;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Town
+		if (!empty($arrayfields['s.town']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
+			print dol_escape_htmltag($obj->town);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['s.zip']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print $tmparray['label'];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type ent
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			if (!is_array($typenArray) || empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
+
+			print '<td class="center">';
+			if (!empty($obj->typent_code)) {
+				print $typenArray[$obj->typent_code];
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date proposal
+		if (!empty($arrayfields['p.date']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->dp), 'day');
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date end validity
+		if (!empty($arrayfields['p.fin_validite']['checked'])) {
+			if ($obj->dfv) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date delivery
+		if (!empty($arrayfields['p.date_livraison']['checked'])) {
+			if ($obj->ddelivery) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date Signature
+		if (!empty($arrayfields['p.date_signature']['checked'])) {
+			if ($obj->dsignature) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Availability
+		if (!empty($arrayfields['ava.rowid']['checked'])) {
+			print '<td class="center">';
+			$form->form_availability('', $obj->availability, 'none', 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Shipping Method
+		if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Source - input reason
+		if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+			$labelInputReason = '';
+			if ($obj->fk_input_reason > 0) {
+				$labelInputReason = $form->cache_demand_reason[$obj->fk_input_reason]['label'];
+			}
+			print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($labelInputReason).'">';
+			print dol_escape_htmltag($labelInputReason);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment terms
+		if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment mode
+		if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['p.total_ht']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+			}
+			if (empty($totalarray['val']['p.total_ht'])) {
+				$totalarray['val']['p.total_ht'] = $obj->total_ht;
+			} else {
+				$totalarray['val']['p.total_ht'] += $obj->total_ht;
+			}
+		}
+		// Amount VAT
+		if (!empty($arrayfields['p.total_tva']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
+			}
+			if (empty($totalarray['val']['p.total_tva'])) {
+				$totalarray['val']['p.total_tva'] = $obj->total_tva;
+			} else {
+				$totalarray['val']['p.total_tva'] += $obj->total_tva;
+			}
+		}
+		// Amount TTC
+		if (!empty($arrayfields['p.total_ttc']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
+			}
+			if (empty($totalarray['val']['p.total_ttc'])) {
+				$totalarray['val']['p.total_ttc'] = $obj->total_ttc;
+			} else {
+				$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
+			}
+		}
+		// Amount invoiced HT
+		if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedHT)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+			}
+			if (empty($totalarray['val']['p.total_ht_invoiced'])) {
+				$totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
+			} else {
+				$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
+			}
+		}
+		// Amount invoiced TTC
+		if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedTTC)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+			}
+			if (empty($totalarray['val']['p.total_invoiced'])) {
+				$totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
+			} else {
+				$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
+			}
+		}
 		// Currency
-		print '<td class="liste_titre">';
-		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Currency rate
-		print '<td class="liste_titre">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+			print '<td class="nowrap">';
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount VAT
+		if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount TTC
+		if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedHT)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['u.login']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedTTC)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		$userstatic->id = $obj->fk_user_author;
+		$userstatic->login = $obj->login;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->email = $obj->user_email;
+		$userstatic->statut = $obj->user_statut;
+		$userstatic->entity = $obj->user_entity;
+		$userstatic->photo = $obj->photo;
+		$userstatic->office_phone = $obj->office_phone;
+		$userstatic->office_fax = $obj->office_fax;
+		$userstatic->user_mobile = $obj->user_mobile;
+		$userstatic->job = $obj->job;
+		$userstatic->gender = $obj->gender;
+
 		// Author
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['sale_representative']['checked'])) {
-		print '<td class="liste_titre"></td>';
-	}
-	if (!empty($arrayfields['total_pa']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['total_margin']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['total_margin_rate']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['total_mark_rate']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['p.datec']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Date modification
-	if (!empty($arrayfields['p.tms']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Date cloture
-	if (!empty($arrayfields['p.date_cloture']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.note_public']['checked'])) {
-		// Note public
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.note_private']['checked'])) {
-		// Note private
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Status
-	if (!empty($arrayfields['p.fk_statut']['checked'])) {
-		print '<td class="liste_titre center parentonrightofpage">';
-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_status', 'search_status width100 onrightofpage');
-		print '</td>';
-	}
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre" align="middle">';
-		$searchpicto = $form->showFilterButtons();
-		print $searchpicto;
-		print '</td>';
-	}
-	print "</tr>\n";
-
-	$totalarray = array(
-		'nbfield' => 0,
-		'val' => array(
-			'p.total_ht' => 0,
-			'p.total_tva' => 0,
-			'p.total_ttc' => 0,
-		),
-	);
-
-	// Fields title
-	print '<tr class="liste_titre">';
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.ref_client']['checked'])) {
-		print_liste_field_titre($arrayfields['p.ref_client']['label'], $_SERVER["PHP_SELF"], 'p.ref_client', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['pr.title']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.name_alias']['checked'])) {
-		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.town']['checked'])) {
-		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.zip']['checked'])) {
-		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['typent.code']['checked'])) {
-		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fin_validite']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date_livraison']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date_signature']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['ava.rowid']['checked'])) {
-		print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "p.fk_input_reason", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_tva']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['u.login']['checked'])) {
-		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['sale_representative']['checked'])) {
-		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_pa']['checked'])) {
-		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_margin']['checked'])) {
-		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_margin_rate']['checked'])) {
-		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_mark_rate']['checked'])) {
-		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-	// Hook fields
-	$parameters = array(
-		'arrayfields' => $arrayfields,
-		'param' => $param,
-		'sortfield' => $sortfield,
-		'sortorder' => $sortorder,
-		'totalarray' => &$totalarray,
-	);
-
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-
-	print $hookmanager->resPrint;
-	if (!empty($arrayfields['p.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date_cloture']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.note_public']['checked'])) {
-		print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.note_private']['checked'])) {
-		print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
-		$totalarray['nbfield']++;
-	}
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
-		$totalarray['nbfield']++;
-	}
-	print '</tr>'."\n";
-
-	// Loop on record
-	// --------------------------------------------------------------------
-	$typenArray = null;
-	$now = dol_now();
-
-	$with_margin_info = false;
-	if (isModEnabled('margin') && (
-		!empty($arrayfields['total_pa']['checked'])
-		|| !empty($arrayfields['total_margin']['checked'])
-		|| !empty($arrayfields['total_margin_rate']['checked'])
-		|| !empty($arrayfields['total_mark_rate']['checked'])
-	)
-	) {
-		$with_margin_info = true;
-	}
-	$total_ht = 0;
-	$total_margin = 0;
-
-	$i = 0;
-	$savnbfield = $totalarray['nbfield'];
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$imaxinloop = ($limit ? min($num, $limit) : $num);
-	while ($i < $imaxinloop) {
-		$obj = $db->fetch_object($resql);
-		if (empty($obj)) {
-			break; // Should not happen
-		}
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-		$objectstatic->ref_client = $obj->ref_client;
-		$objectstatic->note_public = $obj->note_public;
-		$objectstatic->note_private = $obj->note_private;
-		$objectstatic->statut = $obj->status;
-		$objectstatic->status = $obj->status;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->name;
-		$companystatic->name_alias = $obj->alias;
-		$companystatic->client = $obj->client;
-		$companystatic->fournisseur = $obj->fournisseur;
-		$companystatic->code_client = $obj->code_client;
-		$companystatic->email = $obj->email;
-		$companystatic->phone = $obj->phone;
-		$companystatic->address = $obj->address;
-		$companystatic->zip = $obj->zip;
-		$companystatic->town = $obj->town;
-		$companystatic->country_code = $obj->country_code;
-
-		$projectstatic->id = $obj->project_id;
-		$projectstatic->ref = $obj->project_ref;
-		$projectstatic->title = $obj->project_label;
-
-		$totalInvoicedHT = 0;
-		$totalInvoicedTTC = 0;
-		$multicurrency_totalInvoicedHT = 0;
-		$multicurrency_totalInvoicedTTC = 0;
-
-		$TInvoiceData = $objectstatic->InvoiceArrayList($obj->rowid);
-
-		if (!empty($TInvoiceData)) {
-			foreach ($TInvoiceData as $invoiceData) {
-				$invoice = new Facture($db);
-				$invoice->fetch($invoiceData->facid);
-
-				if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $invoice->type == Facture::TYPE_DEPOSIT) {
-					continue;
-				}
-
-				$totalInvoicedHT += $invoice->total_ht;
-				$totalInvoicedTTC += $invoice->total_ttc;
-				$multicurrency_totalInvoicedHT += $invoice->multicurrency_total_ht;
-				$multicurrency_totalInvoicedTTC += $invoice->multicurrency_total_ttc;
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1);
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
 
-		$marginInfo = array();
-		if ($with_margin_info === true) {
-			$objectstatic->fetch_lines();
-			$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
-			$total_ht += $obj->total_ht;
-			$total_margin += $marginInfo['total_margin'];
-		}
-
-		if ($mode == 'kanban') {
-			if ($i == 0) {
-				print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
-				print '<div class="box-flex-container kanban">';
-			}
-			// Output Kanban
-			$userstatic->fetch($obj->fk_user_author);
-			$arrayofparams = array('selected' => in_array($object->id, $arrayofselected), 'authorlink' => $userstatic->getNomUrl(-2), 'projectlink' => $projectstatic->getNomUrl(2));
-			print $objectstatic->getKanbanView('', $arrayofparams);
-			if ($i == ($imaxinloop - 1)) {
-				print '</div>';
-				print '</td></tr>';
-			}
-		} else {
-			print '<tr class="oddeven">';
-
-			// Action column
-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap" align="center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (!empty($arrayfields['sale_representative']['checked'])) {
+			// Sales representatives
+			print '<td class="tdoverflowmax125">';
+			if ($obj->socid > 0) {
+				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+				if ($listsalesrepresentatives < 0) {
+					dol_print_error($db);
 				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['p.ref']['checked'])) {
-				print '<td class="nowraponall">';
-
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				// Picto + Ref
-				print '<td class="nobordernopadding nowraponall">';
-				print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
-				print '</td>';
-				// Warning
-				$warnornote = '';
-				if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
-					$warnornote .= img_warning($langs->trans("Late"));
-				}
-				if ($warnornote) {
-					print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-					print $warnornote;
-					print '</td>';
-				}
-				// Other picto tool
-				print '<td width="16" class="nobordernopadding right">';
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-				print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-				print '</td></tr></table>';
-
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['p.ref_client']['checked'])) {
-				// Customer ref
-				print '<td class="nowrap tdoverflowmax200">';
-				print dol_escape_htmltag($obj->ref_client);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['pr.ref']['checked'])) {
-				// Project ref
-				print '<td class="nowraponall">';
-				if ($obj->project_id > 0) {
-					print $projectstatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['pr.title']['checked'])) {
-				// Project label
-				print '<td class="nowrap">';
-				if ($obj->project_id > 0) {
-					print dol_escape_htmltag($projectstatic->title);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Thirdparty
-			if (!empty($arrayfields['s.nom']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Alias
-			if (!empty($arrayfields['s.name_alias']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				print $obj->alias;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Town
-			if (!empty($arrayfields['s.town']['checked'])) {
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
-				print dol_escape_htmltag($obj->town);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Zip
-			if (!empty($arrayfields['s.zip']['checked'])) {
-				print '<td class="nocellnopadd">';
-				print $obj->zip;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// State
-			if (!empty($arrayfields['state.nom']['checked'])) {
-				print "<td>".$obj->state_name."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Country
-			if (!empty($arrayfields['country.code_iso']['checked'])) {
-				print '<td class="center">';
-				$tmparray = getCountry($obj->fk_pays, 'all');
-				print $tmparray['label'];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Type ent
-			if (!empty($arrayfields['typent.code']['checked'])) {
-				if (!is_array($typenArray) || empty($typenArray)) {
-					$typenArray = $formcompany->typent_array(1);
-				}
-
-				print '<td class="center">';
-				if (!empty($obj->typent_code)) {
-					print $typenArray[$obj->typent_code];
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date proposal
-			if (!empty($arrayfields['p.date']['checked'])) {
-				print '<td class="center">';
-				print dol_print_date($db->jdate($obj->dp), 'day');
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date end validity
-			if (!empty($arrayfields['p.fin_validite']['checked'])) {
-				if ($obj->dfv) {
-					print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
-					print '</td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date delivery
-			if (!empty($arrayfields['p.date_livraison']['checked'])) {
-				if ($obj->ddelivery) {
-					print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
-					print '</td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date Signature
-			if (!empty($arrayfields['p.date_signature']['checked'])) {
-				if ($obj->dsignature) {
-					print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
-					print '</td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Availability
-			if (!empty($arrayfields['ava.rowid']['checked'])) {
-				print '<td class="center">';
-				$form->form_availability('', $obj->availability, 'none', 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Shipping Method
-			if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-				print '<td>';
-				$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Source - input reason
-			if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-				$labelInputReason = '';
-				if ($obj->fk_input_reason > 0) {
-					$labelInputReason = $form->cache_demand_reason[$obj->fk_input_reason]['label'];
-				}
-				print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($labelInputReason).'">';
-				print dol_escape_htmltag($labelInputReason);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Payment terms
-			if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-				print '<td>';
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Payment mode
-			if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-				print '<td>';
-				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['p.total_ht']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
-				}
-				if (empty($totalarray['val']['p.total_ht'])) {
-					$totalarray['val']['p.total_ht'] = $obj->total_ht;
-				} else {
-					$totalarray['val']['p.total_ht'] += $obj->total_ht;
-				}
-			}
-			// Amount VAT
-			if (!empty($arrayfields['p.total_tva']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
-				}
-				if (empty($totalarray['val']['p.total_tva'])) {
-					$totalarray['val']['p.total_tva'] = $obj->total_tva;
-				} else {
-					$totalarray['val']['p.total_tva'] += $obj->total_tva;
-				}
-			}
-			// Amount TTC
-			if (!empty($arrayfields['p.total_ttc']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
-				}
-				if (empty($totalarray['val']['p.total_ttc'])) {
-					$totalarray['val']['p.total_ttc'] = $obj->total_ttc;
-				} else {
-					$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
-				}
-			}
-			// Amount invoiced HT
-			if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedHT)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
-				}
-				if (empty($totalarray['val']['p.total_ht_invoiced'])) {
-					$totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
-				} else {
-					$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
-				}
-			}
-			// Amount invoiced TTC
-			if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedTTC)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
-				}
-				if (empty($totalarray['val']['p.total_invoiced'])) {
-					$totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
-				} else {
-					$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
-				}
-			}
-			// Currency
-			if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
-				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Currency rate
-			if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
-				print '<td class="nowrap">';
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount VAT
-			if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount TTC
-			if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount invoiced
-			if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedHT)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount invoiced
-			if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedTTC)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			$userstatic->id = $obj->fk_user_author;
-			$userstatic->login = $obj->login;
-			$userstatic->lastname = $obj->lastname;
-			$userstatic->firstname = $obj->firstname;
-			$userstatic->email = $obj->user_email;
-			$userstatic->statut = $obj->user_statut;
-			$userstatic->entity = $obj->user_entity;
-			$userstatic->photo = $obj->photo;
-			$userstatic->office_phone = $obj->office_phone;
-			$userstatic->office_fax = $obj->office_fax;
-			$userstatic->user_mobile = $obj->user_mobile;
-			$userstatic->job = $obj->job;
-			$userstatic->gender = $obj->gender;
-
-			// Author
-			if (!empty($arrayfields['u.login']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				if ($userstatic->id) {
-					print $userstatic->getNomUrl(-1);
-				}
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['sale_representative']['checked'])) {
-				// Sales representatives
-				print '<td class="tdoverflowmax125">';
-				if ($obj->socid > 0) {
-					$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
-					if ($listsalesrepresentatives < 0) {
-						dol_print_error($db);
-					}
-					$nbofsalesrepresentative = count($listsalesrepresentatives);
-					if ($nbofsalesrepresentative > 6) {
-						// We print only number
-						print $nbofsalesrepresentative;
-					} elseif ($nbofsalesrepresentative > 0) {
-						$userstatic = new User($db);
-						$j = 0;
-						foreach ($listsalesrepresentatives as $val) {
-							$userstatic->id = $val['id'];
-							$userstatic->lastname = $val['lastname'];
-							$userstatic->firstname = $val['firstname'];
-							$userstatic->email = $val['email'];
-							$userstatic->statut = $val['statut'];
-							$userstatic->entity = $val['entity'];
-							$userstatic->photo = $val['photo'];
-							$userstatic->login = $val['login'];
-							$userstatic->office_phone = $val['office_phone'];
-							$userstatic->office_fax = $val['office_fax'];
-							$userstatic->user_mobile = $val['user_mobile'];
-							$userstatic->job = $val['job'];
-							$userstatic->gender = $val['gender'];
-							//print '<div class="float">':
-							print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
-							$j++;
-							if ($j < $nbofsalesrepresentative) {
-								print ' ';
-							}
-							//print '</div>';
+				$nbofsalesrepresentative = count($listsalesrepresentatives);
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
+					print $nbofsalesrepresentative;
+				} elseif ($nbofsalesrepresentative > 0) {
+					$userstatic = new User($db);
+					$j = 0;
+					foreach ($listsalesrepresentatives as $val) {
+						$userstatic->id = $val['id'];
+						$userstatic->lastname = $val['lastname'];
+						$userstatic->firstname = $val['firstname'];
+						$userstatic->email = $val['email'];
+						$userstatic->statut = $val['statut'];
+						$userstatic->entity = $val['entity'];
+						$userstatic->photo = $val['photo'];
+						$userstatic->login = $val['login'];
+						$userstatic->office_phone = $val['office_phone'];
+						$userstatic->office_fax = $val['office_fax'];
+						$userstatic->user_mobile = $val['user_mobile'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
+						//print '<div class="float">':
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+						$j++;
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
 						}
+						//print '</div>';
 					}
-					//else print $langs->trans("NoSalesRepresentativeAffected");
+				}
+				//else print $langs->trans("NoSalesRepresentativeAffected");
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Total buying or cost price
+		if (!empty($arrayfields['total_pa']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total margin
+		if (!empty($arrayfields['total_margin']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+			}
+			$totalarray['val']['total_margin'] = $total_margin;
+		}
+		// Total margin rate
+		if (!empty($arrayfields['total_margin_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total mark rate
+		if (!empty($arrayfields['total_mark_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+			}
+			if ($i >= $imaxinloop - 1) {
+				if (!empty($total_ht)) {
+					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
 				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
+					$totalarray['val']['total_mark_rate'] = '';
 				}
 			}
-
-			// Total buying or cost price
-			if (!empty($arrayfields['total_pa']['checked'])) {
-				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Total margin
-			if (!empty($arrayfields['total_margin']['checked'])) {
-				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
-				}
-				$totalarray['val']['total_margin'] = $total_margin;
-			}
-			// Total margin rate
-			if (!empty($arrayfields['total_margin_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Total mark rate
-			if (!empty($arrayfields['total_mark_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
-				}
-				if ($i >= $imaxinloop - 1) {
-					if (!empty($total_ht)) {
-						$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
-					} else {
-						$totalarray['val']['total_mark_rate'] = '';
-					}
-				}
-			}
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-			// Date creation
-			if (!empty($arrayfields['p.datec']['checked'])) {
-				print '<td align="center" class="nowrap">';
-				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date modification
-			if (!empty($arrayfields['p.tms']['checked'])) {
-				print '<td align="center" class="nowrap">';
-				print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date cloture
-			if (!empty($arrayfields['p.date_cloture']['checked'])) {
-				print '<td align="center" class="nowrap">';
-				print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Note public
-			if (!empty($arrayfields['p.note_public']['checked'])) {
-				print '<td class="center">';
-				print dol_string_nohtmltag($obj->note_public);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Note private
-			if (!empty($arrayfields['p.note_private']['checked'])) {
-				print '<td class="center">';
-				print dol_string_nohtmltag($obj->note_private);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Status
-			if (!empty($arrayfields['p.fk_statut']['checked'])) {
-				print '<td class="nowrap center">'.$objectstatic->getLibStatut(5).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Action column
-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap" align="center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-
-			print '</tr>'."\n";
 		}
 
-		$i++;
-	}
-
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-	// If no record found
-	if ($num == 0) {
-		$colspan = 1;
-		foreach ($arrayfields as $key => $val) {
-			if (!empty($val['checked'])) {
-				$colspan++;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['p.datec']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
-		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
-	}
-
-	$db->free($resql);
-
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	print '</table>'."\n";
-	print '</div>'."\n";
-
-	print '</form>'."\n";
-
-	if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
-		$hidegeneratedfilelistifempty = 1;
-		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
-			$hidegeneratedfilelistifempty = 0;
+		// Date modification
+		if (!empty($arrayfields['p.tms']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date cloture
+		if (!empty($arrayfields['p.date_cloture']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Note public
+		if (!empty($arrayfields['p.note_public']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_public);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Note private
+		if (!empty($arrayfields['p.note_private']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_private);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['p.fk_statut']['checked'])) {
+			print '<td class="nowrap center">'.$objectstatic->getLibStatut(5).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap" align="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		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_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+		print '</tr>'."\n";
 	}
 
-	// End of page
-	llxFooter();
-	$db->close();
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
+$db->free($resql);
+
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', array_keys($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_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();

From 1c2f6533c2eddd37199cdc98d47e3dc3fee02d82 Mon Sep 17 00:00:00 2001
From: AWeerWolf <a.weer.wolf@gmail.com>
Date: Sat, 9 Mar 2024 18:43:41 +0100
Subject: [PATCH 0760/1862] Adding Hooks in bookkeeping card

---
 htdocs/accountancy/bookkeeping/card.php | 1163 ++++++++++++-----------
 1 file changed, 589 insertions(+), 574 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 66838b8c2e2..075b30174b3 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -94,34 +94,90 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 /*
  * Actions
  */
-
-if ($cancel) {
-	header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
-	exit;
-}
-
-if ($action == "confirm_update") {
-	$error = 0;
-
-	if (((float) $debit != 0.0) && ((float) $credit != 0.0)) {
-		$error++;
-		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-		$action = 'update';
-	}
-	if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
-		$error++;
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
-		$action = 'update';
+$parameters = array(); //***HOOK 
+$reshook_onBeforeActions = $hookmanager->executeHooks('onBeforeActions', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+if ($reshook_onBeforeActions < 0) { //***HOOK 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); //***HOOK 
+} //***HOOK 
+if (empty($reshook_onBeforeActions)) { //***HOOK 
+	if ($cancel) {
+		header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
+		exit;
 	}
+		
+	if ($action == "confirm_update") {
+		$error = 0;
 
-	if (!$error) {
-		$object = new BookKeeping($db);
-
-		$result = $object->fetch($id, null, $mode);
-		if ($result < 0) {
+		if (((float) $debit != 0.0) && ((float) $credit != 0.0)) {
 			$error++;
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
+			setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
+			$action = 'update';
+		}
+		if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
+			$error++;
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
+			$action = 'update';
+		}
+
+		if (!$error) {
+			$object = new BookKeeping($db);
+
+			$result = $object->fetch($id, null, $mode);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				$object->numero_compte = $accountingaccount_number;
+				$object->subledger_account = $subledger_account;
+				$object->subledger_label = $subledger_label;
+				$object->label_compte = $accountingaccount_label;
+				$object->label_operation = $label_operation;
+				$object->debit = $debit;
+				$object->credit = $credit;
+
+				if ((float) $debit != 0.0) {
+					$object->montant = $debit; // deprecated
+					$object->amount = $debit;
+					$object->sens = 'D';
+				}
+				if ((float) $credit != 0.0) {
+					$object->montant = $credit; // deprecated
+					$object->amount = $credit;
+					$object->sens = 'C';
+				}
+
+				$result = $object->update($user, false, $mode);
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					if ($mode != '_tmp') {
+						setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+					}
+
+					$debit = 0;
+					$credit = 0;
+
+					$action = '';
+				}
+			}
+		}
+	} elseif ($action == "add") {
+		$error = 0;
+
+		if (((float) $debit != 0.0) && ((float) $credit != 0.0)) {
+			$error++;
+			setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
+			$action = '';
+		}
+		if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
+			$error++;
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
+			$action = '';
+		}
+
+		if (!$error) {
+			$object = new BookKeeping($db);
+
 			$object->numero_compte = $accountingaccount_number;
 			$object->subledger_account = $subledger_account;
 			$object->subledger_label = $subledger_label;
@@ -129,19 +185,28 @@ if ($action == "confirm_update") {
 			$object->label_operation = $label_operation;
 			$object->debit = $debit;
 			$object->credit = $credit;
+			$object->doc_date = (string) GETPOST('doc_date', 'alpha');
+			$object->doc_type = (string) GETPOST('doc_type', 'alpha');
+			$object->piece_num = $piece_num;
+			$object->doc_ref = (string) GETPOST('doc_ref', 'alpha');
+			$object->code_journal = $journal_code;
+			$object->journal_label = $journal_label;
+			$object->fk_doc = GETPOSTINT('fk_doc');
+			$object->fk_docdet = GETPOSTINT('fk_docdet');
 
 			if ((float) $debit != 0.0) {
 				$object->montant = $debit; // deprecated
 				$object->amount = $debit;
 				$object->sens = 'D';
 			}
+
 			if ((float) $credit != 0.0) {
 				$object->montant = $credit; // deprecated
 				$object->amount = $credit;
 				$object->sens = 'C';
 			}
 
-			$result = $object->update($user, false, $mode);
+			$result = $object->createStd($user, false, $mode);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
@@ -155,113 +220,70 @@ if ($action == "confirm_update") {
 				$action = '';
 			}
 		}
-	}
-} elseif ($action == "add") {
-	$error = 0;
-
-	if (((float) $debit != 0.0) && ((float) $credit != 0.0)) {
-		$error++;
-		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-		$action = '';
-	}
-	if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
-		$error++;
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
-		$action = '';
-	}
-
-	if (!$error) {
+	} elseif ($action == "confirm_delete") {
 		$object = new BookKeeping($db);
 
-		$object->numero_compte = $accountingaccount_number;
-		$object->subledger_account = $subledger_account;
-		$object->subledger_label = $subledger_label;
-		$object->label_compte = $accountingaccount_label;
-		$object->label_operation = $label_operation;
-		$object->debit = $debit;
-		$object->credit = $credit;
-		$object->doc_date = (string) GETPOST('doc_date', 'alpha');
-		$object->doc_type = (string) GETPOST('doc_type', 'alpha');
-		$object->piece_num = $piece_num;
-		$object->doc_ref = (string) GETPOST('doc_ref', 'alpha');
-		$object->code_journal = $journal_code;
-		$object->journal_label = $journal_label;
-		$object->fk_doc = GETPOSTINT('fk_doc');
-		$object->fk_docdet = GETPOSTINT('fk_docdet');
+		$result = $object->fetch($id, null, $mode);
+		$piece_num = $object->piece_num;
 
-		if ((float) $debit != 0.0) {
-			$object->montant = $debit; // deprecated
-			$object->amount = $debit;
-			$object->sens = 'D';
-		}
-
-		if ((float) $credit != 0.0) {
-			$object->montant = $credit; // deprecated
-			$object->amount = $credit;
-			$object->sens = 'C';
-		}
-
-		$result = $object->createStd($user, false, $mode);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			if ($mode != '_tmp') {
-				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			$result = $object->delete($user, false, $mode);
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
+		}
+		$action = '';
+	} elseif ($action == "confirm_create") {
+		$error = 0;
 
-			$debit = 0;
-			$credit = 0;
+		$object = new BookKeeping($db);
 
-			$action = '';
+		if (!$journal_code || $journal_code == '-1') {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
+			$action = 'create';
+			$error++;
+		}
+		if (!GETPOST('doc_ref', 'alpha')) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Piece")), null, 'errors');
+			$action = 'create';
+			$error++;
+		}
+
+		if (!$error) {
+			$object->label_compte = '';
+			$object->debit = 0;
+			$object->credit = 0;
+			$object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
+			$object->doc_type = GETPOST('doc_type', 'alpha');
+			$object->piece_num = GETPOSTINT('next_num_mvt');
+			$object->doc_ref = GETPOST('doc_ref', 'alpha');
+			$object->code_journal = $journal_code;
+			$object->journal_label = $journal_label;
+			$object->fk_doc = 0;
+			$object->fk_docdet = 0;
+			$object->montant = 0; // deprecated
+			$object->amount = 0;
+
+			$result = $object->createStd($user, 0, $mode);
+			$reshook = $hookmanager->executeHooks('onConfirmCreate_onAfterCreateEmptyLine', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				if ($mode != '_tmp') {
+					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+				}
+				$action = '';
+				$id = $object->id;
+				$piece_num = $object->piece_num;
+			}
 		}
 	}
-} elseif ($action == "confirm_delete") {
-	$object = new BookKeeping($db);
 
-	$result = $object->fetch($id, null, $mode);
-	$piece_num = $object->piece_num;
-
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	} else {
-		$result = $object->delete($user, false, $mode);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-	$action = '';
-} elseif ($action == "confirm_create") {
-	$error = 0;
-
-	$object = new BookKeeping($db);
-
-	if (!$journal_code || $journal_code == '-1') {
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
-		$action = 'create';
-		$error++;
-	}
-	if (!GETPOST('doc_ref', 'alpha')) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Piece")), null, 'errors');
-		$action = 'create';
-		$error++;
-	}
-
-	if (!$error) {
-		$object->label_compte = '';
-		$object->debit = 0;
-		$object->credit = 0;
-		$object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
-		$object->doc_type = GETPOST('doc_type', 'alpha');
-		$object->piece_num = GETPOSTINT('next_num_mvt');
-		$object->doc_ref = GETPOST('doc_ref', 'alpha');
-		$object->code_journal = $journal_code;
-		$object->journal_label = $journal_label;
-		$object->fk_doc = 0;
-		$object->fk_docdet = 0;
-		$object->montant = 0; // deprecated
-		$object->amount = 0;
-
-		$result = $object->createStd($user, 0, $mode);
+	if ($action == 'setdate') {
+		$datedoc = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
+		$result = $object->updateByMvt($piece_num, 'doc_date', $db->idate($datedoc), $mode);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
@@ -269,440 +291,405 @@ if ($action == "confirm_update") {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
 			$action = '';
-			$id = $object->id;
-			$piece_num = $object->piece_num;
 		}
 	}
-}
 
-if ($action == 'setdate') {
-	$datedoc = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
-	$result = $object->updateByMvt($piece_num, 'doc_date', $db->idate($datedoc), $mode);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	} else {
-		if ($mode != '_tmp') {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	if ($action == 'setjournal') {
+		$result = $object->updateByMvt($piece_num, 'code_journal', $journal_code, $mode);
+		$result = $object->updateByMvt($piece_num, 'journal_label', $journal_label, $mode);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			if ($mode != '_tmp') {
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			}
+			$action = '';
 		}
-		$action = '';
 	}
-}
 
-if ($action == 'setjournal') {
-	$result = $object->updateByMvt($piece_num, 'code_journal', $journal_code, $mode);
-	$result = $object->updateByMvt($piece_num, 'journal_label', $journal_label, $mode);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	} else {
-		if ($mode != '_tmp') {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	if ($action == 'setdocref') {
+		$refdoc = GETPOST('doc_ref', 'alpha');
+		$result = $object->updateByMvt($piece_num, 'doc_ref', $refdoc, $mode);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			if ($mode != '_tmp') {
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			}
+			$action = '';
 		}
-		$action = '';
 	}
-}
 
-if ($action == 'setdocref') {
-	$refdoc = GETPOST('doc_ref', 'alpha');
-	$result = $object->updateByMvt($piece_num, 'doc_ref', $refdoc, $mode);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	} else {
-		if ($mode != '_tmp') {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	// Validate transaction
+	if ($action == 'valid') {
+		$result = $object->transformTransaction(0, $piece_num);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			header("Location: list.php?sortfield=t.piece_num&sortorder=asc");
+			exit;
 		}
-		$action = '';
 	}
-}
-
-// Validate transaction
-if ($action == 'valid') {
-	$result = $object->transformTransaction(0, $piece_num);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	} else {
-		header("Location: list.php?sortfield=t.piece_num&sortorder=asc");
-		exit;
-	}
-}
+} //***HOOK
+$reshook_onAfterActions = $hookmanager->executeHooks('onAfterActions', $parameters, $object, $action); ///***HOOK Note that $action and $object may have been modified by some hooks
 
 
 /*
  * View
  */
+$reshook_onBeforeView = $hookmanager->executeHooks('onBeforeView', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+if ($reshook_onBeforeView < 0) { //***HOOK 
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); //***HOOK Error
+} //***HOOK 
+if (empty($reshook_onBeforeView)) { //***HOOK Return 0 so execute the standard prog.
+	$form = new Form($db);
+	$formaccounting = new FormAccounting($db);
 
-$form = new Form($db);
-$formaccounting = new FormAccounting($db);
+	$title = $langs->trans("CreateMvts");
+	$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double';
+	llxHeader('', $title, $help_url);
 
-$title = $langs->trans("CreateMvts");
-$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double';
-llxHeader('', $title, $help_url);
-
-// Confirmation to delete the command
-if ($action == 'delete') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
-	print $formconfirm;
-}
-
-if ($action == 'create') {
-	print load_fiche_titre($title);
-
-	$object = new BookKeeping($db);
-	$next_num_mvt = $object->getNextNumMvt('_tmp');
-
-	if (empty($next_num_mvt)) {
-		dol_print_error(null, 'Failed to get next piece number');
+	// Confirmation to delete the command
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
+		print $formconfirm;
 	}
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" name="create_mvt" method="POST">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="confirm_create">'."\n";
-	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
-	print '<input type="hidden" name="mode" value="_tmp">'."\n";
+	if ($action == 'create') {
+		print load_fiche_titre($title);
 
-	print dol_get_fiche_head();
+		$object = new BookKeeping($db);
+		$next_num_mvt = $object->getNextNumMvt('_tmp');
 
-	print '<table class="border centpercent">';
-
-	/*print '<tr>';
-	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
-	print '<td>' . $next_num_mvt . '</td>';
-	print '</tr>';*/
-
-	print '<tr>';
-	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Docdate").'</td>';
-	print '<td>';
-	print $form->selectDate('', 'doc_date', 0, 0, 0, "create_mvt", 1, 1);
-	print '</td>';
-	print '</tr>';
-
-	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans("Codejournal").'</td>';
-	print '<td>'.$formaccounting->select_journal($journal_code, 'code_journal', 0, 0, 1, 1).'</td>';
-	print '</tr>';
-
-	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans("Piece").'</td>';
-	print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.GETPOST('doc_ref', 'alpha').'"></td>';
-	print '</tr>';
-
-	/*
-	print '<tr>';
-	print '<td>' . $langs->trans("Doctype") . '</td>';
-	print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
-	print '</tr>';
-	*/
-
-	print '</table>';
-
-	print dol_get_fiche_end();
-
-	print $form->buttonsSaveCancel("Create");
-
-	print '</form>';
-} else {
-	$object = new BookKeeping($db);
-	$result = $object->fetchPerMvt($piece_num, $mode);
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	if (!empty($object->piece_num)) {
-		$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
-
-		if ($mode == '_tmp') {
-			print load_fiche_titre($langs->trans("CreateMvts"), $backlink);
-		} else {
-			print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
+		if (empty($next_num_mvt)) {
+			dol_print_error(null, 'Failed to get next piece number');
 		}
 
-		$head = array();
-		$h = 0;
-		$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode ? '&mode='.$mode : '');
-		$head[$h][1] = $langs->trans("Transaction");
-		$head[$h][2] = 'transaction';
-		$h++;
+		print '<form action="'.$_SERVER["PHP_SELF"].'" name="create_mvt" method="POST">';
+		if ($optioncss != '') {
+			print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		}
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="confirm_create">'."\n";
+		print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
+		print '<input type="hidden" name="mode" value="_tmp">'."\n";
 
-		print dol_get_fiche_head($head, 'transaction', '', -1);
+		print dol_get_fiche_head();
 
-		//dol_banner_tab($object, '', $backlink);
+		print '<table class="border centpercent">';
 
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
+		/*print '<tr>';
+		print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
+		print '<td>' . $next_num_mvt . '</td>';
+		print '</tr>';*/
 
-		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
-
-		// Account movement
 		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans("NumMvts").'</td>';
-		print '<td>'.($mode == '_tmp' ? '<span class="opacitymedium" title="Id tmp '.$object->piece_num.'">'.$langs->trans("Draft").'</span>' : $object->piece_num).'</td>';
-		print '</tr>';
-
-		// Date
-		print '<tr><td>';
-		print '<table class="nobordernopadding centpercent"><tr><td>';
-		print $langs->trans('Docdate');
-		print '</td>';
-		if ($action != 'editdate') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdate') {
-			print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setdate">';
-			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', 0, 0, 0, "setdate");
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
-		}
+		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Docdate").'</td>';
+		print '<td>';
+		print $form->selectDate('', 'doc_date', 0, 0, 0, "create_mvt", 1, 1);
 		print '</td>';
 		print '</tr>';
 
-		// Journal
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Codejournal');
-		print '</td>';
-		if ($action != 'editjournal') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editjournal') {
-			print '<form name="setjournal" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setjournal">';
-			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->code_journal;
-		}
-		print '</td>';
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("Codejournal").'</td>';
+		print '<td>'.$formaccounting->select_journal($journal_code, 'code_journal', 0, 0, 1, 1).'</td>';
 		print '</tr>';
 
-		// Ref document
-		print '<tr><td>';
-		print '<table class="nobordernopadding centpercent"><tr><td>';
-		print $langs->trans('Piece');
-		print '</td>';
-		if ($action != 'editdocref') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editdocref') {
-			print '<form name="setdocref" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="setdocref">';
-			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		} else {
-			print $object->doc_ref;
-		}
-		print '</td>';
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("Piece").'</td>';
+		print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.GETPOST('doc_ref', 'alpha').'"></td>';
 		print '</tr>';
 
+		/*
+		print '<tr>';
+		print '<td>' . $langs->trans("Doctype") . '</td>';
+		print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
+		print '</tr>';
+		*/
+		$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+		
 		print '</table>';
 
-		print '</div>';
-
-		print '<div class="fichehalfright">';
-
-		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield centpercent">';
-
-		// Doc type
-		if (!empty($object->doc_type)) {
-			print '<tr>';
-			print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
-			print '<td>'.$object->doc_type.'</td>';
-			print '</tr>';
-		}
-
-		// Date document creation
-		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans("DateCreation").'</td>';
-		print '<td>';
-		print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
-		print '</td>';
-		print '</tr>';
-
-		// Don't show in tmp mode, inevitably empty
-		if ($mode != "_tmp") {
-			// Date document export
-			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>';
-			print '<td>';
-			print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
-			print '</td>';
-			print '</tr>';
-
-			// Date document validation
-			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>';
-			print '<td>';
-			print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
-			print '</td>';
-			print '</tr>';
-		}
-
-		// Validate
-		/*
-		print '<tr>';
-		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
-		print '<td>';
-			if (empty($object->validated)) {
-				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=enable&token='.newToken().'">';
-				print img_picto($langs->trans("Disabled"), 'switch_off');
-				print '</a>';
-			} else {
-				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=disable&token='.newToken().'">';
-				print img_picto($langs->trans("Activated"), 'switch_on');
-				print '</a>';
-			}
-			print '</td>';
-		print '</tr>';
-		*/
-
-		// check data
-		/*
-		print '<tr>';
-		print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
-		if ($object->doc_type == 'customer_invoice')
-		{
-		 $sqlmid = 'SELECT rowid as ref';
-			$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
-			$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
-			dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$invoicestatic = new Facture($db);
-				$invoicestatic->fetch($objmid->ref);
-				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
-		}
-		print '<td>' . $ref .'</td>';
-		print '</tr>';
-		*/
-		print "</table>\n";
-
-		print '</div>';
-
 		print dol_get_fiche_end();
 
-		print '<div class="clearboth"></div>';
-
-		print '<br>';
-
-		$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
+		print $form->buttonsSaveCancel("Create");
 
+		print '</form>';
+	} else {
+		$object = new BookKeeping($db);
+		$result = $object->fetchPerMvt($piece_num, $mode);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			// List of movements
-			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
+		}
 
-			print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			if ($optioncss != '') {
-				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		if (!empty($object->piece_num)) {
+			$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
+
+			if ($mode == '_tmp') {
+				print load_fiche_titre($langs->trans("CreateMvts"), $backlink);
+			} else {
+				print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
 			}
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="doc_date" value="'.$object->doc_date.'">'."\n";
-			print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'">'."\n";
-			print '<input type="hidden" name="doc_ref" value="'.$object->doc_ref.'">'."\n";
-			print '<input type="hidden" name="code_journal" value="'.$object->code_journal.'">'."\n";
-			print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
-			print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
-			print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
 
-			if (count($object->linesmvt) > 0) {
-				print '<div class="div-table-responsive-no-min">';
-				print '<table class="noborder centpercent">';
+			$head = array();
+			$h = 0;
+			$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode ? '&mode='.$mode : '');
+			$head[$h][1] = $langs->trans("Transaction");
+			$head[$h][2] = 'transaction';
+			$h++;
 
-				$total_debit = 0;
-				$total_credit = 0;
+			print dol_get_fiche_head($head, 'transaction', '', -1);
 
-				print '<tr class="liste_titre">';
+			//dol_banner_tab($object, '', $backlink);
 
-				print_liste_field_titre("AccountAccountingShort");
-				print_liste_field_titre("SubledgerAccount");
-				print_liste_field_titre("LabelOperation");
-				print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"');
-				print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"');
-				if (empty($object->date_validation)) {
-					print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield" width="100%">';
+
+			// Account movement
+			print '<tr>';
+			print '<td class="titlefield">'.$langs->trans("NumMvts").'</td>';
+			print '<td>'.($mode == '_tmp' ? '<span class="opacitymedium" title="Id tmp '.$object->piece_num.'">'.$langs->trans("Draft").'</span>' : $object->piece_num).'</td>';
+			print '</tr>';
+
+			// Date
+			print '<tr><td>';
+			print '<table class="nobordernopadding centpercent"><tr><td>';
+			print $langs->trans('Docdate');
+			print '</td>';
+			if ($action != 'editdate') {
+				print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+			}
+			print '</tr></table>';
+			print '</td><td colspan="3">';
+			if ($action == 'editdate') {
+				print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+				if ($optioncss != '') {
+					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+				}
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="setdate">';
+				print '<input type="hidden" name="mode" value="'.$mode.'">';
+				print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', 0, 0, 0, "setdate");
+				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+				print '</form>';
+			} else {
+				print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
+			}
+			print '</td>';
+			print '</tr>';
+
+			// Journal
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('Codejournal');
+			print '</td>';
+			if ($action != 'editjournal') {
+				print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			}
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editjournal') {
+				print '<form name="setjournal" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+				if ($optioncss != '') {
+					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+				}
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="setjournal">';
+				print '<input type="hidden" name="mode" value="'.$mode.'">';
+				print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
+				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+				print '</form>';
+			} else {
+				print $object->code_journal;
+			}
+			print '</td>';
+			print '</tr>';
+
+			// Ref document
+			print '<tr><td>';
+			print '<table class="nobordernopadding centpercent"><tr><td>';
+			print $langs->trans('Piece');
+			print '</td>';
+			if ($action != 'editdocref') {
+				print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			}
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editdocref') {
+				print '<form name="setdocref" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+				if ($optioncss != '') {
+					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+				}
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="setdocref">';
+				print '<input type="hidden" name="mode" value="'.$mode.'">';
+				print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
+				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+				print '</form>';
+			} else {
+				print $object->doc_ref;
+			}
+			print '</td>';
+			print '</tr>';
+
+			print '</table>';
+
+			print '</div>';
+
+			print '<div class="fichehalfright">';
+
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield centpercent">';
+
+			// Doc type
+			if (!empty($object->doc_type)) {
+				print '<tr>';
+				print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
+				print '<td>'.$object->doc_type.'</td>';
+				print '</tr>';
+			}
+
+			// Date document creation
+			print '<tr>';
+			print '<td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+			print '<td>';
+			print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
+			print '</td>';
+			print '</tr>';
+
+			// Don't show in tmp mode, inevitably empty
+			if ($mode != "_tmp") {
+				// Date document export
+				print '<tr>';
+				print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>';
+				print '<td>';
+				print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
+				print '</td>';
+				print '</tr>';
+
+				// Date document validation
+				print '<tr>';
+				print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>';
+				print '<td>';
+				print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
+				print '</td>';
+				print '</tr>';
+			}
+
+			// Validate
+			/*
+			print '<tr>';
+			print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
+			print '<td>';
+				if (empty($object->validated)) {
+					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=enable&token='.newToken().'">';
+					print img_picto($langs->trans("Disabled"), 'switch_off');
+					print '</a>';
 				} else {
-					print_liste_field_titre("");
+					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=disable&token='.newToken().'">';
+					print img_picto($langs->trans("Activated"), 'switch_on');
+					print '</a>';
 				}
+				print '</td>';
+			print '</tr>';
+			*/
 
-				print "</tr>\n";
+			// check data
+			/*
+			print '<tr>';
+			print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
+			if ($object->doc_type == 'customer_invoice')
+			{
+			$sqlmid = 'SELECT rowid as ref';
+				$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
+				$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
+				dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$invoicestatic = new Facture($db);
+					$invoicestatic->fetch($objmid->ref);
+					$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+				}
+				else dol_print_error($db);
+			}
+			print '<td>' . $ref .'</td>';
+			print '</tr>';
+			*/
+			print "</table>\n";
 
-				// Add an empty line if there is not yet
-				if (!empty($object->linesmvt[0])) {
-					$tmpline = $object->linesmvt[0];
-					if (!empty($tmpline->numero_compte)) {
-						$line = new BookKeepingLine($db);
-						$object->linesmvt[] = $line;
+			print '</div>';
+
+			print dol_get_fiche_end();
+
+			print '<div class="clearboth"></div>';
+
+			print '<br>';
+
+			$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
+
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				// List of movements
+				print load_fiche_titre($langs->trans("ListeMvts"), '', '');
+
+				print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+				if ($optioncss != '') {
+					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+				}
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="doc_date" value="'.$object->doc_date.'">'."\n";
+				print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'">'."\n";
+				print '<input type="hidden" name="doc_ref" value="'.$object->doc_ref.'">'."\n";
+				print '<input type="hidden" name="code_journal" value="'.$object->code_journal.'">'."\n";
+				print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
+				print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
+				print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
+
+				if (count($object->linesmvt) > 0) {
+					print '<div class="div-table-responsive-no-min">';
+					print '<table class="noborder centpercent">';
+
+					$total_debit = 0;
+					$total_credit = 0;
+
+					print '<tr class="liste_titre">';
+
+					print_liste_field_titre("AccountAccountingShort");
+					print_liste_field_titre("SubledgerAccount");
+					print_liste_field_titre("LabelOperation");
+					print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"');
+					print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"');
+					if (empty($object->date_validation)) {
+						print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
+					} else {
+						print_liste_field_titre("");
 					}
-				}
 
-				foreach ($object->linesmvt as $line) {
-					print '<tr class="oddeven" data-lineid="'.((int) $line->id).'">';
-					$total_debit += $line->debit;
-					$total_credit += $line->credit;
+					print "</tr>\n";
 
-					if ($action == 'update' && $line->id == $id) {
-						print '<!-- td columns in edit mode -->';
-						print '<td>';
-						print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
-						print '</td>';
-						print '<td>';
-						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
-						// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
-						// Also, it is not possible to use a value that is not in the list.
-						// Also, the label is not automatically filled when a value is selected.
-						if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
-							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
-						} else {
-							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
+					// Add an empty line if there is not yet
+					if (!empty($object->linesmvt[0])) {
+						$tmpline = $object->linesmvt[0];
+						if (!empty($tmpline->numero_compte)) {
+							$line = new BookKeepingLine($db);
+							$object->linesmvt[] = $line;
 						}
-						// Add also input for subledger label
-						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
-						print '</td>';
-						print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
-						print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
-						print '<td class="right"><input type="text" size="6" class="right" name="credit" value="'.(GETPOSTISSET("credit") ? GETPOST("credit", "alpha") : price($line->credit)).'"></td>';
-						print '<td>';
-						print '<input type="hidden" name="id" value="'.$line->id.'">'."\n";
-						print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
-						print '</td>';
-					} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
-						if ($action == "" || $action == 'add') {
-							print '<!-- td columns in add mode -->';
+					}
+
+					foreach ($object->linesmvt as $line) {
+						print '<tr class="oddeven" data-lineid="'.((int) $line->id).'">';
+						$total_debit += $line->debit;
+						$total_credit += $line->credit;
+
+						if ($action == 'update' && $line->id == $id) {
+							print '<!-- td columns in edit mode -->';
 							print '<td>';
-							print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
+							print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
 							print '</td>';
 							print '<td>';
 							// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
@@ -710,99 +697,127 @@ if ($action == 'create') {
 							// Also, it is not possible to use a value that is not in the list.
 							// Also, the label is not automatically filled when a value is selected.
 							if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
-								print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+								print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
 							} else {
-								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
+								print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 							}
-							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
+							// Add also input for subledger label
+							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
 							print '</td>';
-							print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
-							print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
-							print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
-							print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>';
-						}
-					} else {
-						print '<!-- td columns in display mode -->';
-						$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
-						print '<td>';
-						if ($resultfetch > 0) {
-							print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
+							print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
+							print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
+							print '<td class="right"><input type="text" size="6" class="right" name="credit" value="'.(GETPOSTISSET("credit") ? GETPOST("credit", "alpha") : price($line->credit)).'"></td>';
+							print '<td>';
+							print '<input type="hidden" name="id" value="'.$line->id.'">'."\n";
+							print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
+							print '</td>';
+						} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
+							if ($action == "" || $action == 'add') {
+								print '<!-- td columns in add mode -->';
+								print '<td>';
+								print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
+								print '</td>';
+								print '<td>';
+								// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+								// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+								// Also, it is not possible to use a value that is not in the list.
+								// Also, the label is not automatically filled when a value is selected.
+								if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
+									print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+								} else {
+									print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
+								}
+								print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
+								print '</td>';
+								print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
+								print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
+								print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
+								print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>';
+							}
 						} else {
-							print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
-						}
-						print '</td>';
-						print '<td>'.length_accounta($line->subledger_account);
-						if ($line->subledger_label) {
-							print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
-						}
-						print '</td>';
-						print '<td>'.$line->label_operation.'</td>';
-						print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
-						print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
+							print '<!-- td columns in display mode -->';
+							$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
+							print '<td>';
+							if ($resultfetch > 0) {
+								print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
+							} else {
+								print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
+							}
+							print '</td>';
+							print '<td>'.length_accounta($line->subledger_account);
+							if ($line->subledger_label) {
+								print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
+							}
+							print '</td>';
+							print '<td>'.$line->label_operation.'</td>';
+							print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
+							print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
 
-						print '<td class="center nowraponall">';
-						if (empty($line->date_export) && empty($line->date_validation)) {
-							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
-							print img_edit('', 0, 'class="marginrightonly"');
-							print '</a> &nbsp;';
-						} else {
-							print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
-							print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
-							print '</a> &nbsp;';
-						}
-
-						if (empty($line->date_validation)) {
-							$actiontodelete = 'delete';
-							if ($mode == '_tmp' || $action != 'delmouv') {
-								$actiontodelete = 'confirm_delete';
+							print '<td class="center nowraponall">';
+							if (empty($line->date_export) && empty($line->date_validation)) {
+								print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+								print img_edit('', 0, 'class="marginrightonly"');
+								print '</a> &nbsp;';
+							} else {
+								print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+								print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
+								print '</a> &nbsp;';
 							}
 
-							print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
-							print img_delete();
-							print '</a>';
+							if (empty($line->date_validation)) {
+								$actiontodelete = 'delete';
+								if ($mode == '_tmp' || $action != 'delmouv') {
+									$actiontodelete = 'confirm_delete';
+								}
+
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+								print img_delete();
+								print '</a>';
+							} else {
+								print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+								print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
+								print '</a>';
+							}
+
+							print '</td>';
+						}
+						print "</tr>\n";
+					}
+
+					$total_debit = price2num($total_debit, 'MT');
+					$total_credit = price2num($total_credit, 'MT');
+
+					if ($total_debit != $total_credit) {
+						setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
+					}
+
+					print '</table>';
+					print '</div>';
+
+					if ($mode == '_tmp' && $action == '') {
+						print '<br>';
+						print '<div class="center">';
+						if ($total_debit == $total_credit) {
+							print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
 						} else {
-							print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
-							print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
-							print '</a>';
+							print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 						}
 
-						print '</td>';
+						print ' &nbsp; ';
+						print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+
+						print "</div>";
 					}
-					print "</tr>\n";
 				}
 
-				$total_debit = price2num($total_debit, 'MT');
-				$total_credit = price2num($total_credit, 'MT');
-
-				if ($total_debit != $total_credit) {
-					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
-				}
-
-				print '</table>';
-				print '</div>';
-
-				if ($mode == '_tmp' && $action == '') {
-					print '<br>';
-					print '<div class="center">';
-					if ($total_debit == $total_credit) {
-						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
-					} else {
-						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
-					}
-
-					print ' &nbsp; ';
-					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
-
-					print "</div>";
-				}
+				print '</form>';
 			}
-
-			print '</form>';
+		} else {
+			print load_fiche_titre($langs->trans("NoRecords"));
 		}
-	} else {
-		print load_fiche_titre($langs->trans("NoRecords"));
 	}
-}
+} //***HOOK
+$reshook_onAfterView = $hookmanager->executeHooks('onAfterView', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
 
 print dol_get_fiche_end();
 

From 0c91e3fe068af441c38b38796a6914f35eff19b1 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Sat, 9 Mar 2024 22:01:30 +0100
Subject: [PATCH 0761/1862] attempt at fixing #28645

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

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 2f5f532e746..5dcb390ace3 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -187,6 +187,7 @@ class BankAccounts extends DolibarrApi
 	 * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
 	 * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
 	 * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
+	 * @param string $cheque_number         Cheque numero {@from body}
 	 *
 	 * @url POST    /transfer
 	 *
@@ -199,7 +200,7 @@ class BankAccounts extends DolibarrApi
 	 * @throws RestException 422 Unprocessable Entity: Refer to detailed exception message for the cause
 	 * @throws RestException 500 Internal Server Error: Error(s) returned by the RDBMS
 	 */
-	public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
+	public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0, $cheque_number = "" )
 	{
 		if (!DolibarrApiAccess::$user->hasRight('banque', 'configurer')) {
 			throw new RestException(403);
@@ -257,21 +258,21 @@ class BankAccounts extends DolibarrApi
 
 		// Clean data
 		$description = sanitizeVal($description, 'alphanohtml');
-
+		$cheque_number = sanitizeVal($cheque_number);
 
 		/**
 		 * Creating bank line records
 		 */
 
 		if (!$error) {
-			$bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user);
+			$bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user, $cheque_number);
 		}
 		if (!($bank_line_id_from > 0)) {
 			$error++;
 		}
 
 		if (!$error) {
-			$bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
+			$bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user, $cheque_number);
 		}
 		if (!($bank_line_id_to > 0)) {
 			$error++;

From 95d644615c71c4cf8a34712274fb6fa2756919c2 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Sat, 9 Mar 2024 22:14:02 +0100
Subject: [PATCH 0762/1862] remove trailing whitespace

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

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 5dcb390ace3..47eb9bf84a6 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -200,7 +200,7 @@ class BankAccounts extends DolibarrApi
 	 * @throws RestException 422 Unprocessable Entity: Refer to detailed exception message for the cause
 	 * @throws RestException 500 Internal Server Error: Error(s) returned by the RDBMS
 	 */
-	public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0, $cheque_number = "" )
+	public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0, $cheque_number = "")
 	{
 		if (!DolibarrApiAccess::$user->hasRight('banque', 'configurer')) {
 			throw new RestException(403);

From 668d2fa6e88b0cfdcd9e71efeb54b41f197cdf7f Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Sat, 9 Mar 2024 22:43:53 +0100
Subject: [PATCH 0763/1862] making param string cheque_number line up and
 conform better with previous code

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

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 47eb9bf84a6..c2f57b76056 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -187,7 +187,7 @@ class BankAccounts extends DolibarrApi
 	 * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
 	 * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
 	 * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
-	 * @param string $cheque_number         Cheque numero {@from body}
+	 * @param string  $cheque_number        Cheque numero                                                           {@from body}{@required false}
 	 *
 	 * @url POST    /transfer
 	 *

From f1715a5209a5ddb4d8fa3e17093542d985027b3b Mon Sep 17 00:00:00 2001
From: AWeerWolf <a.weer.wolf@gmail.com>
Date: Sat, 9 Mar 2024 22:44:39 +0100
Subject: [PATCH 0764/1862] Suppressing White soace at end of lines

---
 htdocs/accountancy/bookkeeping/card.php | 34 ++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 075b30174b3..ffd10c4ccff 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -94,12 +94,12 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 /*
  * Actions
  */
-$parameters = array(); //***HOOK 
-$reshook_onBeforeActions = $hookmanager->executeHooks('onBeforeActions', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
-if ($reshook_onBeforeActions < 0) { //***HOOK 
-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); //***HOOK 
-} //***HOOK 
-if (empty($reshook_onBeforeActions)) { //***HOOK 
+$parameters = array();
+$reshook_onBeforeActions = $hookmanager->executeHooks('onBeforeActions', $parameters, $object, $action);
+if ($reshook_onBeforeActions < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook_onBeforeActions)) {
 	if ($cancel) {
 		header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
 		exit;
@@ -267,7 +267,7 @@ if (empty($reshook_onBeforeActions)) { //***HOOK
 			$object->amount = 0;
 
 			$result = $object->createStd($user, 0, $mode);
-			$reshook = $hookmanager->executeHooks('onConfirmCreate_onAfterCreateEmptyLine', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('onConfirmCreate_onAfterCreateEmptyLine', $parameters, $object, $action);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
@@ -330,18 +330,18 @@ if (empty($reshook_onBeforeActions)) { //***HOOK
 			exit;
 		}
 	}
-} //***HOOK
-$reshook_onAfterActions = $hookmanager->executeHooks('onAfterActions', $parameters, $object, $action); ///***HOOK Note that $action and $object may have been modified by some hooks
+}
+$reshook_onAfterActions = $hookmanager->executeHooks('onAfterActions', $parameters, $object, $action);
 
 
 /*
  * View
  */
-$reshook_onBeforeView = $hookmanager->executeHooks('onBeforeView', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
-if ($reshook_onBeforeView < 0) { //***HOOK 
-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); //***HOOK Error
-} //***HOOK 
-if (empty($reshook_onBeforeView)) { //***HOOK Return 0 so execute the standard prog.
+$reshook_onBeforeView = $hookmanager->executeHooks('onBeforeView', $parameters, $object, $action);
+if ($reshook_onBeforeView < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook_onBeforeView)) {
 	$form = new Form($db);
 	$formaccounting = new FormAccounting($db);
 
@@ -406,7 +406,7 @@ if (empty($reshook_onBeforeView)) { //***HOOK Return 0 so execute the standard p
 		print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
 		print '</tr>';
 		*/
-		$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+		$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action);
 		
 		print '</table>';
 
@@ -816,8 +816,8 @@ if (empty($reshook_onBeforeView)) { //***HOOK Return 0 so execute the standard p
 			print load_fiche_titre($langs->trans("NoRecords"));
 		}
 	}
-} //***HOOK
-$reshook_onAfterView = $hookmanager->executeHooks('onAfterView', $parameters, $object, $action); //***HOOK  Note that $action and $object may have been modified by some hooks
+}
+$reshook_onAfterView = $hookmanager->executeHooks('onAfterView', $parameters, $object, $action);
 
 print dol_get_fiche_end();
 

From 8906d734dbc3154e77d1f0f9dcc87e03ddd43abb Mon Sep 17 00:00:00 2001
From: AWeerWolf <a.weer.wolf@gmail.com>
Date: Sat, 9 Mar 2024 22:49:06 +0100
Subject: [PATCH 0765/1862] Still some White Spaces

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ffd10c4ccff..30702e44717 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -104,7 +104,7 @@ if (empty($reshook_onBeforeActions)) {
 		header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
 		exit;
 	}
-		
+
 	if ($action == "confirm_update") {
 		$error = 0;
 

From 96eb651f954b1fef6db581ca35c1d12ab8a98545 Mon Sep 17 00:00:00 2001
From: AWeerWolf <a.weer.wolf@gmail.com>
Date: Sat, 9 Mar 2024 22:53:16 +0100
Subject: [PATCH 0766/1862] White spaces is hell

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 30702e44717..8449bc8028b 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -407,7 +407,7 @@ if (empty($reshook_onBeforeView)) {
 		print '</tr>';
 		*/
 		$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action);
-		
+
 		print '</table>';
 
 		print dol_get_fiche_end();

From e6a6ec737ed8b07b81ed963b90667ed40d20087a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Mar 2024 23:20:43 +0100
Subject: [PATCH 0767/1862] Clean code to edit a menu entry

---
 htdocs/admin/menus/edit.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 42892fbb8b6..74925b34aca 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -100,7 +100,7 @@ if ($action == 'add') {
 		$error++;
 	}
 	if (!$error && !GETPOST('type')) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Position")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
@@ -274,7 +274,8 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewMenu"), '', 'title_setup');
 
-	print '<form action="'.DOL_URL_ROOT.'/admin/menus/edit.php?action=add&token='.newToken().'&menuId='.GETPOSTINT('menuId').'" method="post" name="formmenucreate">';
+	print '<form action="'.DOL_URL_ROOT.'/admin/menus/edit.php?menuId='.GETPOSTINT('menuId').'" method="POST" name="formmenucreate">';
+	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	print dol_get_fiche_head();
@@ -346,7 +347,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// MenuId Parent
-	print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent').'</td>';
+	print '<tr><td>'.$langs->trans('MenuIdParent').'</td>';
 	if ($parent_rowid) {
 		print '<td>'.$parent_rowid.'<input type="hidden" name="menuIdParent" value="'.$parent_rowid.'"></td>';
 	} else {
@@ -361,7 +362,7 @@ if ($action == 'create') {
 	print '<td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
 
 	// Picto
-	print '<tr><td class="fieldrequired">'.$langs->trans('Image').'</td>';
+	print '<tr><td>'.$langs->trans('Image').'</td>';
 	print '<td><input type="text" class="minwidth300" name="picto" value="'.dol_escape_htmltag(GETPOST("picto", 'alphanohtml')).'"></td><td>'.$langs->trans('Example').': fa-global</td></tr>';
 
 	// URL

From 7e31aedf94d3b71ca7b76635a99a49f98945416c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Mar 2024 23:46:38 +0100
Subject: [PATCH 0768/1862] FIX Picto in top menu

---
 htdocs/core/menus/standard/auguria.lib.php | 2 ++
 htdocs/core/menus/standard/eldy.lib.php    | 2 ++
 htdocs/core/menus/standard/empty.php       | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 2b0fa54f453..9648194fccf 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -240,6 +240,8 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 
 		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
 			print $menuval['prefix'];
+		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
+			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
 		} else {
 			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
 		}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c8561fd1f11..10da59b56d7 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -654,6 +654,8 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 		print '<div class="'.$id.' '.$idsel.' topmenuimage">';
 		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
 			print $menuval['prefix'];
+		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
+			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
 		} else {
 			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
 		}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 9f74d1aad15..4b189b165cc 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -521,7 +521,13 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 	if ($showmode == 1) {
 		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 		print '<div class="'.$id.' '.$idsel.' topmenuimage">';
-		print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
+		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
+			print $menuval['prefix'];
+		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
+			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
+		} else {
+			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
+		}
 		print '</div>';
 		print '</a>';
 		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

From cecd3bc1b61d7c065faae45cbe88dbfb8cd861ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Mar 2024 23:46:38 +0100
Subject: [PATCH 0769/1862] FIX Picto in top menu

---
 htdocs/core/menus/standard/auguria.lib.php | 2 ++
 htdocs/core/menus/standard/eldy.lib.php    | 2 ++
 htdocs/core/menus/standard/empty.php       | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 60480d6c9cb..dbed17b95d5 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -242,6 +242,8 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 
 		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
 			print $menuval['prefix'];
+		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
+			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
 		} else {
 			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
 		}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1cf504a30fd..141e0e02c65 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -656,6 +656,8 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 		print '<div class="'.$id.' '.$idsel.' topmenuimage">';
 		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
 			print $menuval['prefix'];
+		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
+			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
 		} else {
 			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
 		}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 542cb1a493a..01282aff09f 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -523,7 +523,13 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 	if ($showmode == 1) {
 		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 		print '<div class="'.$id.' '.$idsel.' topmenuimage">';
-		print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
+		if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
+			print $menuval['prefix'];
+		} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
+			print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
+		} else {
+			print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
+		}
 		print '</div>';
 		print '</a>';
 		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {

From 8ef22dc461487bd9942cf8d2613f53056eb2f6eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 00:47:00 +0100
Subject: [PATCH 0770/1862] Fix css

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

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 7bebdcb2af7..8dd22d694ca 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -228,6 +228,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
+	// Title
 	print '<tr><td class="titlefield">';
 	if ($action == 'edit') {
 		print '<span class="fieldrequired">';
@@ -247,6 +248,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	}
 	print '</td></tr>';
 
+	// URL
 	print '<tr><td>';
 	if ($action == 'edit') {
 		print '<span class="fieldrequired">';
@@ -255,7 +257,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	if ($action == 'edit') {
 		print '</span>';
 	}
-	print '</td><td>';
+	print '</td><td class="tdoverflowmax500">';
 	if ($action == 'edit') {
 		print '<input class="flat minwidth500 quatrevingtpercent" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 	} else {

From 279de64851b1b3710d1d41f85760b4f18d5d1517 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 01:21:50 +0100
Subject: [PATCH 0771/1862] Fix regression

---
 htdocs/accountancy/bookkeeping/balance.php    |  1 +
 .../accountancy/class/bookkeeping.class.php   | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index a3edb6e68e0..58807c5bcd2 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -238,6 +238,7 @@ if ($action == 'export_csv') {
 	exit;
 }
 
+
 /*
  * View
  */
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index d40ddeda75a..0e24f92dced 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1206,16 +1206,29 @@ class BookKeeping extends CommonObject
 		$sql .= " SUM(t.debit) as debit,";
 		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.doc_date') {
 					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
-				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=' || $key == 't.doc_date>' || $key == 't.doc_date<') {
-					$sqlwhere[] = $this->db->sanitize($key)."'".$this->db->idate($value)."'";
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $this->db->sanitize($key)."'".$this->db->escape($value)."'";
+				} elseif ($key == 't.doc_date>=') {
+					$sqlwhere[] = "t.doc_date >= '".$this->db->idate($value)."'";
+				} elseif ($key == 't.doc_date<=') {
+					$sqlwhere[] = "t.doc_date <= '".$this->db->idate($value)."'";
+				} elseif ($key == 't.doc_date>') {
+					$sqlwhere[] = "t.doc_date > '".$this->db->idate($value)."'";
+				} elseif ($key == 't.doc_date<') {
+					$sqlwhere[] = "t.doc_date < '".$this->db->idate($value)."'";
+				} elseif ($key == 't.numero_compte>=') {
+					$sqlwhere[] = "t.numero_compte >= '".$this->db->escape($value)."'";
+				} elseif ($key == 't.numero_compte<=') {
+					$sqlwhere[] = "t.numero_compte <= '".$this->db->escape($value)."'";
+				} elseif ($key == 't.subledger_account>=') {
+					$sqlwhere[] = "t.subledger_account >= '".$this->db->escape($value)."'";
+				} elseif ($key == 't.subledger_account<=') {
+					$sqlwhere[] = "t.subledger_account <= '".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
 					$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
@@ -1236,6 +1249,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
+
 		if (count($sqlwhere) > 0) {
 			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
 		}
@@ -1258,7 +1272,7 @@ class BookKeeping extends CommonObject
 		if (!empty($limit)) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
-
+		print $sql;
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);

From 96ef01c5c702a694ce5e0f7af3dbf1612b018153 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 01:37:27 +0100
Subject: [PATCH 0772/1862] Fix print $sql

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0e24f92dced..efc5d68d6f7 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1272,8 +1272,10 @@ class BookKeeping extends CommonObject
 		if (!empty($limit)) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
-		print $sql;
+
+		//print $sql;
 		$resql = $this->db->query($sql);
+
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 

From 895aa5ee85ce9c48f62b8ab529ca3e35f41b7d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 10 Mar 2024 01:44:08 +0100
Subject: [PATCH 0773/1862] fix phpstan (#28735)

* fix phpstan

* fix phpstan

* fix phpstan
---
 htdocs/delivery/class/delivery.class.php      |  4 +--
 htdocs/expedition/class/expedition.class.php  |  8 ++---
 .../class/fournisseur.commande.class.php      |  6 ++--
 .../class/multicurrency.class.php             | 11 +++----
 htdocs/product/class/product.class.php        | 30 +++++++++----------
 .../stock/class/mouvementstock.class.php      |  6 ++--
 6 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 6e634bfb669..b4d139a0120 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -280,7 +280,7 @@ class Delivery extends CommonObject
 	 *  @param	array	$array_options			Array options
 	 *	@return	int								Return integer <0 if KO, >0 if OK
 	 */
-	public function create_line($origin_id, $qty, $fk_product, $description, $array_options = null)
+	public function create_line($origin_id, $qty, $fk_product, $description, $array_options = [])
 	{
 		// phpcs:enable
 		$error = 0;
@@ -636,7 +636,7 @@ class Delivery extends CommonObject
 	 *  @param	array	$array_options			Array options
 	 *	@return	void
 	 */
-	public function addline($origin_id, $qty, $array_options = null)
+	public function addline($origin_id, $qty, $array_options = [])
 	{
 		global $conf;
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b9b21899b28..1e880c2c91a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -497,7 +497,7 @@ class Expedition extends CommonObject
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							Return integer <0 if KO, line_id if OK
 	 */
-	public function create_line($entrepot_id, $origin_line_id, $qty, $rang = 0, $array_options = null)
+	public function create_line($entrepot_id, $origin_line_id, $qty, $rang = 0, $array_options = [])
 	{
 		//phpcs:enable
 		global $user;
@@ -525,7 +525,7 @@ class Expedition extends CommonObject
 	 * @param	array		$array_options		extrafields array
 	 * @return	int								Return integer <0 if KO, >0 if OK
 	 */
-	public function create_line_batch($line_ext, $array_options = 0)
+	public function create_line_batch($line_ext, $array_options = [])
 	{
 		// phpcs:enable
 		$error = 0;
@@ -898,7 +898,7 @@ class Expedition extends CommonObject
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
-	public function addline($entrepot_id, $id, $qty, $array_options = 0)
+	public function addline($entrepot_id, $id, $qty, $array_options = [])
 	{
 		global $conf, $langs;
 
@@ -981,7 +981,7 @@ class Expedition extends CommonObject
 	 * @param	array		$array_options		extrafields array
 	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
-	public function addline_batch($dbatch, $array_options = 0)
+	public function addline_batch($dbatch, $array_options = [])
 	{
 		// phpcs:enable
 		global $conf, $langs;
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7eff5f099d2..7337429110e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2210,8 +2210,8 @@ class CommandeFournisseur extends CommonOrder
 	 * @param 	int			$entrepot				Id of warehouse to add product
 	 * @param 	double		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
 	 * @param	string		$comment				Comment for stock movement
-	 * @param	integer		$eatby					eat-by date
-	 * @param	integer		$sellby					sell-by date
+	 * @param	int|string	$eatby					eat-by date
+	 * @param	int|string	$sellby					sell-by date
 	 * @param	string		$batch					Lot number
 	 * @param	int			$fk_commandefourndet	Id of supplier order line
 	 * @param	int			$notrigger          	1 = notrigger
@@ -2894,7 +2894,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param		string		$ref_supplier		Supplier ref
 	 *	@return    	int         	    			Return integer < 0 if error, > 0 if ok
 	 */
-	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = [], $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
 	{
 		global $mysoc, $conf, $langs;
 		dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index ebce97e6ff6..57a6c1ee69a 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -519,12 +520,12 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Get id and rate of currency from code
 	 *
-	 * @param DoliDB	$dbs	        Object db
-	 * @param string	$code	        Code value search
-	 * @param integer	$date_document	Date from document (propal, order, invoice, ...)
+	 * @param DoliDB			$dbs	        Object db
+	 * @param string			$code	        Code value search
+	 * @param integer|string	$date_document	Date from document (propal, order, invoice, ...)
 	 *
-	 * @return 	array	[0] => id currency
-	 *						[1] => rate
+	 * @return 	array			[0] => id currency
+	 *							[1] => rate
 	 */
 	public static function getIdAndTxFromCode($dbs, $code, $date_document = '')
 	{
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index af6f3927ac4..3b31d2064e3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5719,21 +5719,21 @@ class Product extends CommonObject
 	/**
 	 *  Adjust stock in a warehouse for product with batch number
 	 *
-	 * @param  User     $user           user asking change
-	 * @param  int      $id_entrepot    id of warehouse
-	 * @param  double   $nbpiece        nb of units (should be always positive, use $movement to decide if we add or remove)
-	 * @param  int      $movement       0 = add, 1 = remove
-	 * @param  string   $label          Label of stock movement
-	 * @param  double   $price          Price to use for stock eval
-	 * @param  integer  $dlc            eat-by date
-	 * @param  integer  $dluo           sell-by date
-	 * @param  string   $lot            Lot number
-	 * @param  string   $inventorycode  Inventory code
-	 * @param  string   $origin_element Origin element type
-	 * @param  int      $origin_id      Origin id of element
-	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
-	 * @param  Extrafields $extrafields	Array of extrafields
-	 * @param  boolean  $force_update_batch   Force update batch
+	 * @param  User         $user           user asking change
+	 * @param  int          $id_entrepot    id of warehouse
+	 * @param  double       $nbpiece        nb of units (should be always positive, use $movement to decide if we add or remove)
+	 * @param  int          $movement       0 = add, 1 = remove
+	 * @param  string       $label          Label of stock movement
+	 * @param  double       $price          Price to use for stock eval
+	 * @param  int|string   $dlc            eat-by date
+	 * @param  int|string   $dluo           sell-by date
+	 * @param  string       $lot            Lot number
+	 * @param  string       $inventorycode  Inventory code
+	 * @param  string       $origin_element Origin element type
+	 * @param  int          $origin_id      Origin id of element
+	 * @param  int	        $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
+	 * @param  Extrafields  $extrafields	Array of extrafields
+	 * @param  boolean      $force_update_batch   Force update batch
 	 * @return int                      Return integer <0 if KO, >0 if OK
 	 */
 	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 80751ebbec7..74396b9ecc5 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -813,9 +813,9 @@ class MouvementStock extends CommonObject
 	 * 	@param		int				$qty			    	Quantity
 	 * 	@param		int				$price			    	Price
 	 * 	@param		string			$label			    	Label of stock movement
-	 * 	@param		integer|string	$datem			    	Force date of movement
-	 *	@param		integer			$eatby			    	eat-by date
-	 *	@param		integer			$sellby			    	sell-by date
+	 * 	@param		int|string		$datem			    	Force date of movement
+	 *	@param		int|string		$eatby			    	eat-by date
+	 *	@param		int|string		$sellby			    	sell-by date
 	 *	@param		string			$batch			    	batch number
 	 * 	@param		int				$id_product_batch		Id product_batch
 	 *  @param      string  		$inventorycode      	Inventory code

From c95bab281848eef8dbdf9260f29f1185798257fc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 01:46:10 +0100
Subject: [PATCH 0774/1862] Qual: Add check on addExtraField type argument
 (#28738)

* Qual: Add check on addExtraField type argument

# Qual: Add check on addExtraField type argument

Added a check on the type argument for addExtraField

* Qual: Update phan ignore with more specific name
---
 dev/tools/phan/config.php         | 34 ++++++++++++++++++++++++++++++-
 htdocs/core/lib/functions.lib.php |  2 +-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 2defcc784e7..14a8c313670 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -183,9 +183,40 @@ $VALID_MODULE_MAPPING = array(
 	'zapier' => 'Zapier',
 );
 
+// From ExtraFields class
+$EXTRAFIELDS_TYPE2LABEL = array(
+		'varchar' => 'String1Line',
+		'text' => 'TextLongNLines',
+		'html' => 'HtmlText',
+		'int' => 'Int',
+		'double' => 'Float',
+		'date' => 'Date',
+		'datetime' => 'DateAndTime',
+		//'datetimegmt'=>'DateAndTimeUTC',
+		'boolean' => 'Boolean', // Remove as test
+		'price' => 'ExtrafieldPrice',
+		'pricecy' => 'ExtrafieldPriceWithCurrency',
+		'phone' => 'ExtrafieldPhone',
+		'mail' => 'ExtrafieldMail',
+		'url' => 'ExtrafieldUrl',
+		'ip' => 'ExtrafieldIP',
+		'icon' => 'Icon',
+		'password' => 'ExtrafieldPassword',
+		'select' => 'ExtrafieldSelect',
+		'sellist' => 'ExtrafieldSelectList',
+		'radio' => 'ExtrafieldRadio',
+		'checkbox' => 'ExtrafieldCheckBox',
+		'chkbxlst' => 'ExtrafieldCheckBoxFromList',
+		'link' => 'ExtrafieldLink',
+		'separate' => 'ExtrafieldSeparator',
+	);
+
+
 $moduleNameRegex = '/^(?:'.implode('|', array_merge(array_keys($DEPRECATED_MODULE_MAPPING), array_keys($VALID_MODULE_MAPPING), array('\$modulename'))).')$/';
 $deprecatedModuleNameRegex = '/^(?!(?:'.implode('|', array_keys($DEPRECATED_MODULE_MAPPING)).')$).*/';
 
+$extraFieldTypeRegex = '/^(?:'.implode('|', array_keys($EXTRAFIELDS_TYPE2LABEL)).')$/';
+
 /**
  * This configuration will be read and overlaid on top of the
  * default configuration. Command line arguments will be applied
@@ -270,7 +301,8 @@ return [
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
 		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
-		'/^sanitizeVal$/' => [1, $sanitizeRegex],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex,"UnknownSanitizeType"],
+		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex,"UnknownExtrafieldTypeBack"],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 11e3c1934f3..6c8152bd228 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -951,7 +951,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			$out = preg_replace('/([<>])([-+]?\d)/', '\1 \2', $out);
 		}
 
-		// @phan-suppress-next-line ParamMatchRegexError
+		// @phan-suppress-next-line UnknownSanitizeType
 		$out = sanitizeVal($out, $check, $filter, $options);
 	}
 

From 28df0ba1ab55f568acdf5b313b45e2450db1a321 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 01:49:56 +0100
Subject: [PATCH 0775/1862] Fix doc

---
 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 11e3c1934f3..9534f130cc8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2789,7 +2789,7 @@ function fieldLabel($langkey, $fieldkey, $fieldrequired = 0)
 /**
  * Return string to add class property on html element with pair/impair.
  *
- * @param	string	$var			0 or 1
+ * @param	boolean	$var			false or true
  * @param	string	$moreclass		More class to add
  * @return	string					String to add class onto HTML element
  */

From 37afba949eb573e6f5c57bae22308d4e1b15c212 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 01:53:04 +0100
Subject: [PATCH 0776/1862] Fix most PhanTypeMismatchDimAssignment notices
 (#28739)

* Qual: Add typing to fix PhanTypeMismatchDimAssignment notice

* Fix: Initialise array for code in somme

* Qual: Update type hint for  argument in _Set_Format

* Qual: Update type hint for childtables

* Qual: Add typing to attributes

* Qual: Add typing for _msgContent

* Qual: Suppress PhanTypeMismatchDimAssignment

* Qual: Add typing for liste

* Qual: Add typing to fields

* Qual: Add typing hint for $objMod

* Qual: Modify assignment of array with bool keys for phan typing

Demonstration:
```
php -r '$a=[true=>"yes",false=>"no"];var_dump($a);'
# Result demonstrates bool keys are converted to int.
Command line code:1:
array(2) {
  [1] =>
  string(3) "yes"
  [0] =>
  string(2) "no"
}
```

* Qual: Add typing hint to indicate value is not null

* Force non-null type on $paramname

* Qual: Add typing hint to getCats()

* Update inc.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 .../class/accountancycategory.class.php       |  2 +-
 .../accountancy/class/bookkeeping.class.php   |  2 +-
 htdocs/admin/modules.php                      | 42 ++++-----
 htdocs/compta/resultat/result.php             | 10 ++-
 htdocs/core/class/commonobject.class.php      |  5 +-
 .../class/commonstickergenerator.class.php    |  2 +-
 htdocs/core/class/extrafields.class.php       | 90 +++++++++----------
 htdocs/core/class/menu.class.php              |  9 +-
 htdocs/core/class/smtps.class.php             |  2 +-
 htdocs/core/lib/customreports.lib.php         |  1 +
 htdocs/core/lib/functions.lib.php             |  3 +-
 htdocs/core/modules/DolibarrModules.class.php | 10 +--
 htdocs/projet/class/project.class.php         |  1 +
 htdocs/support/inc.php                        |  3 -
 14 files changed, 98 insertions(+), 84 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 5cd2e95de28..84c8b774960 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -773,7 +773,7 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @param	int			$categorytype		-1=All, 0=Only non computed groups, 1=Only computed groups
 	 * @param	int			$active				1= active, 0=not active
-	 * @return	array|int						Array of groups or -1 if error
+	 * @return	array<array{code:string,label:string,formula:string,position:string,category_type:string,sens:string,bc:string}>|int	Array of groups or -1 if error
 	 * @see getCatsCpts(), getCptsCat()
 	 */
 	public function getCats($categorytype = -1, $active = 1)
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index efc5d68d6f7..909bfded02a 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2464,7 +2464,7 @@ class BookKeeping extends CommonObject
 	 * Get list of fiscal period
 	 *
 	 * @param 	string	$filter		Filter
-	 * @return 	array|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
+	 * @return 	array<array{id:int,data_start:string,date_end:string,label:string}>|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
 	 */
 	public function getFiscalPeriods($filter = '')
 	{
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index d24c833cb85..5ce0f2042d7 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 // if we set another view list mode, we keep it (till we change one more time)
 if (GETPOSTISSET('mode')) {
 	$mode = GETPOST('mode', 'alpha');
-	if ($mode =='common' || $mode =='commonkanban') {
+	if ($mode == 'common' || $mode == 'commonkanban') {
 		dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity);
 	}
 } else {
@@ -78,18 +78,18 @@ if (!$user->admin) {
 }
 
 $familyinfo = array(
-	'hr'=>array('position'=>'001', 'label'=>$langs->trans("ModuleFamilyHr")),
-	'crm'=>array('position'=>'006', 'label'=>$langs->trans("ModuleFamilyCrm")),
-	'srm'=>array('position'=>'007', 'label'=>$langs->trans("ModuleFamilySrm")),
-	'financial'=>array('position'=>'009', 'label'=>$langs->trans("ModuleFamilyFinancial")),
-	'products'=>array('position'=>'012', 'label'=>$langs->trans("ModuleFamilyProducts")),
-	'projects'=>array('position'=>'015', 'label'=>$langs->trans("ModuleFamilyProjects")),
-	'ecm'=>array('position'=>'018', 'label'=>$langs->trans("ModuleFamilyECM")),
-	'technic'=>array('position'=>'021', 'label'=>$langs->trans("ModuleFamilyTechnic")),
-	'portal'=>array('position'=>'040', 'label'=>$langs->trans("ModuleFamilyPortal")),
-	'interface'=>array('position'=>'050', 'label'=>$langs->trans("ModuleFamilyInterface")),
-	'base'=>array('position'=>'060', 'label'=>$langs->trans("ModuleFamilyBase")),
-	'other'=>array('position'=>'100', 'label'=>$langs->trans("ModuleFamilyOther")),
+	'hr' => array('position' => '001', 'label' => $langs->trans("ModuleFamilyHr")),
+	'crm' => array('position' => '006', 'label' => $langs->trans("ModuleFamilyCrm")),
+	'srm' => array('position' => '007', 'label' => $langs->trans("ModuleFamilySrm")),
+	'financial' => array('position' => '009', 'label' => $langs->trans("ModuleFamilyFinancial")),
+	'products' => array('position' => '012', 'label' => $langs->trans("ModuleFamilyProducts")),
+	'projects' => array('position' => '015', 'label' => $langs->trans("ModuleFamilyProjects")),
+	'ecm' => array('position' => '018', 'label' => $langs->trans("ModuleFamilyECM")),
+	'technic' => array('position' => '021', 'label' => $langs->trans("ModuleFamilyTechnic")),
+	'portal' => array('position' => '040', 'label' => $langs->trans("ModuleFamilyPortal")),
+	'interface' => array('position' => '050', 'label' => $langs->trans("ModuleFamilyInterface")),
+	'base' => array('position' => '060', 'label' => $langs->trans("ModuleFamilyBase")),
+	'other' => array('position' => '100', 'label' => $langs->trans("ModuleFamilyOther")),
 );
 
 $param = '';
@@ -360,7 +360,7 @@ llxHeader('', $langs->trans("Setup"), $help_url, '', '', '', $morejs, $morecss,
 // Search modules dirs
 $modulesdir = dolGetModulesDirs();
 
-$arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("NativeModules"), 'external'=>$langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
+$arrayofnatures = array('core' => $langs->transnoentitiesnoconv("NativeModules"), 'external' => $langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
 $arrayofwarnings = array(); // Array of warning each module want to show when activated
 $arrayofwarningsext = array(); // Array of warning each module want to show when we activate an external module
 $filename = array();
@@ -395,6 +395,7 @@ foreach ($modulesdir as $dir) {
 						$res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
 						if (class_exists($modName)) {
 							$objMod = new $modName($db);
+							'@phan-var-force DolibarrModules $objMod';
 							$modNameLoaded[$modName] = $dir;
 							if (!$objMod->numero > 0 && $modName != 'modUser') {
 								dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
@@ -443,6 +444,7 @@ foreach ($modulesdir as $dir) {
 								} else {
 									$familykey = $objMod->family;
 								}
+								'@phan-var-force string $familykey';  // if not, phan considers $familykey may be null
 
 								$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
 								if ($objMod->isCoreOrExternalModule() == 'external' && $moduleposition < 100000) {
@@ -603,10 +605,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	$moreforfilter = '<div class="valignmiddle">';
 
 	$moreforfilter .= '<div class="floatright right pagination paddingtop --module-list"><ul><li>';
-	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdate').'<br>'.$langs->trans('CheckForModuleUpdateHelp'), 'fa fa-sync', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));
+	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdate').'<br>'.$langs->trans('CheckForModuleUpdateHelp'), 'fa fa-sync', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss' => 'reposition'));
 	$moreforfilter .= dolGetButtonTitleSeparator();
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss'=>'reposition'));
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', ($mode == 'commonkanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss' => 'reposition'));
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', ($mode == 'commonkanban' ? 2 : 1), array('morecss' => 'reposition'));
 	$moreforfilter .= '</li></ul></div>';
 
 	$moreforfilter .= '<div class="divfilteralone colorbacktimesheet float valignmiddle">';
@@ -618,7 +620,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	$moreforfilter .= '</div>';
 
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
-		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
+		$array_version = array('stable' => $langs->transnoentitiesnoconv("Stable"));
 		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 0) {
 			$array_version['deprecated'] = $langs->trans("Deprecated");
 		}
@@ -632,7 +634,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		$moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->transnoentitiesnoconv('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 		$moreforfilter .= '</div>';
 	}
-	$array_status = array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled"));
+	$array_status = array('active' => $langs->transnoentitiesnoconv("Enabled"), 'disabled' => $langs->transnoentitiesnoconv("Disabled"));
 	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= $form->selectarray('search_status', $array_status, $search_status, $langs->transnoentitiesnoconv('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 	$moreforfilter .= '</div>';
@@ -717,7 +719,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 				|| ($moduledesc && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesc))
 				|| ($moduledesclong && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesclong))
 				|| ($moduleauthor && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduleauthor))
-				) {
+			) {
 				$qualified = 1;
 			}
 			if (!$qualified) {
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 72bb5428b75..21fa04cc931 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -231,7 +231,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-	$arraylist = array('no'=>$langs->trans("None"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
+	$arraylist = array('no' => $langs->trans("None"), 'yes' => $langs->trans("AccountWithNonZeroValues"), 'all' => $langs->trans("All"));
 	$period .= ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("DetailBy").'</span> '.$form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0);
 	$periodlink = $textprevyear.$textnextyear;
 	$exportlink = '';
@@ -240,7 +240,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$builddate = dol_now();
 }
 
-report_header($name, '', $period, $periodlink ?? '', $description, $builddate, $exportlink ?? '', array('modecompta'=>$modecompta, 'action' => ''), $calcmode);
+report_header($name, '', $period, $periodlink ?? '', $description, $builddate, $exportlink ?? '', array('modecompta' => $modecompta, 'action' => ''), $calcmode);
 
 
 if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
@@ -356,6 +356,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 					print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 				}
 
+				if (!isset($sommes[$code])) {
+					$sommes[$code] = array();
+				}
 				// Year N
 				$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
 				if (empty($sommes[$code]['NP'])) {
@@ -438,6 +441,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 				foreach ($months as $k => $v) {
 					$totCat['M'][$k] = 0;
 				}
+				if (!isset($sommes[$code])) {
+					$sommes[$code] = array();
+				}
 
 				// Set $cpts with array of accounts in the category/group
 				$cpts = $AccCat->getCptsCat($cat['rowid']);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ff537ee7891..b4cf054717a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -138,8 +138,9 @@ abstract class CommonObject
 	 */
 	public $array_options = array();
 
+
 	/**
-	 * @var array  		Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
@@ -775,7 +776,7 @@ abstract class CommonObject
 	public $extraparams = array();
 
 	/**
-	 * @var array		List of child tables. To test if we can delete object.
+	 * @var array<string,string[]|array{parent:string,parentkey:string}>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array();
 
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index ba63bba320e..9e32529e9b1 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -296,7 +296,7 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 	 * protected Set format
 	 *
 	 * @param    TCPDF     $pdf     PDF reference
-	 * @param    string    $format  Format
+	 * @param    array{metric:string,name:string,code:string,marginLeft:float,marginTip:float,SpaceX:float,SpaceY:float,NX:int,NY:int,width:float,height:float,font-size:float}	$format  Format
 	 * @return   void
 	 */
 	protected function _Set_Format(&$pdf, $format)
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index a7b6cc9ac22..deb021bb0bc 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -44,12 +44,12 @@ class ExtraFields
 	public $db;
 
 	/**
-	 * @var array New array to store extrafields definition
+	 * @var array<string,array{label:array<string,string>,type:array<string,string>,size:array<string,string>,default:array<string,string>,computed:array<string,string>,unique:array<string,int>,required:array<string,int>,param:array<string,mixed>,perms:array<string,mixed[]>,list:array<string,mixed[]>,totalizable:array<string,int>,help:array<string,string>,printable:array<string,int>,enabled:array<string,int>,langfile:array<string,string>,css:array<string,string>,csslist:array<string,string>,hidden:array<string,int>,mandatoryfieldsofotherentities:array<string,string>,isameasure?:array<string,string>}> New array to store extrafields definition
 	 */
 	public $attributes;
 
 	/**
-	 * @var array	Array with boolean of status of groups
+	 * @var array<string,bool>	Array with boolean of status of groups
 	 */
 	public $expand_display;
 
@@ -69,25 +69,25 @@ class ExtraFields
 	public $errno;
 
 	/**
-	 * @var array 	Array of type to label
+	 * @var array<string,string> 	Array of type to label
 	 */
 	public static $type2label = array(
-		'varchar'=>'String1Line',
-		'text'=>'TextLongNLines',
-		'html'=>'HtmlText',
-		'int'=>'Int',
-		'double'=>'Float',
-		'date'=>'Date',
-		'datetime'=>'DateAndTime',
+		'varchar' => 'String1Line',
+		'text' => 'TextLongNLines',
+		'html' => 'HtmlText',
+		'int' => 'Int',
+		'double' => 'Float',
+		'date' => 'Date',
+		'datetime' => 'DateAndTime',
 		//'datetimegmt'=>'DateAndTimeUTC',
-		'boolean'=>'Boolean',
-		'price'=>'ExtrafieldPrice',
-		'pricecy'=>'ExtrafieldPriceWithCurrency',
-		'phone'=>'ExtrafieldPhone',
-		'mail'=>'ExtrafieldMail',
-		'url'=>'ExtrafieldUrl',
-		'ip'=>'ExtrafieldIP',
-		'icon'=>'Icon',
+		'boolean' => 'Boolean',
+		'price' => 'ExtrafieldPrice',
+		'pricecy' => 'ExtrafieldPriceWithCurrency',
+		'phone' => 'ExtrafieldPhone',
+		'mail' => 'ExtrafieldMail',
+		'url' => 'ExtrafieldUrl',
+		'ip' => 'ExtrafieldIP',
+		'icon' => 'Icon',
 		'password' => 'ExtrafieldPassword',
 		'select' => 'ExtrafieldSelect',
 		'sellist' => 'ExtrafieldSelectList',
@@ -253,9 +253,9 @@ class ExtraFields
 				}
 			}
 			$field_desc = array(
-				'type'=>$typedb,
-				'value'=>$lengthdb,
-				'null'=>($required ? 'NOT NULL' : 'NULL'),
+				'type' => $typedb,
+				'value' => $lengthdb,
+				'null' => ($required ? 'NOT NULL' : 'NULL'),
 				'default' => $default_value
 			);
 
@@ -602,11 +602,11 @@ class ExtraFields
 				$typedb = $type;
 				$lengthdb = $length;
 			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
+			$field_desc = array('type' => $typedb, 'value' => $lengthdb, 'null' => ($required ? 'NOT NULL' : 'NULL'), 'default' => $default);
 
 			if (is_object($hookmanager)) {
 				$hookmanager->initHooks(array('extrafieldsdao'));
-				$parameters = array('field_desc'=>&$field_desc, 'table'=>$table, 'attr_name'=>$attrname, 'label'=>$label, 'type'=>$type, 'length'=>$length, 'unique'=>$unique, 'required'=>$required, 'pos'=>$pos, 'param'=>$param, 'alwayseditable'=>$alwayseditable, 'perms'=>$perms, 'list'=>$list, 'help'=>$help, 'default'=>$default, 'computed'=>$computed, 'entity'=>$entity, 'langfile'=>$langfile, 'enabled'=>$enabled, 'totalizable'=>$totalizable, 'printable'=>$printable);
+				$parameters = array('field_desc' => &$field_desc, 'table' => $table, 'attr_name' => $attrname, 'label' => $label, 'type' => $type, 'length' => $length, 'unique' => $unique, 'required' => $required, 'pos' => $pos, 'param' => $param, 'alwayseditable' => $alwayseditable, 'perms' => $perms, 'list' => $list, 'help' => $help, 'default' => $default, 'computed' => $computed, 'entity' => $entity, 'langfile' => $langfile, 'enabled' => $enabled, 'totalizable' => $totalizable, 'printable' => $printable);
 				$reshook = $hookmanager->executeHooks('updateExtrafields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				if ($reshook < 0) {
@@ -1078,24 +1078,24 @@ class ExtraFields
 			$out ='<link rel="stylesheet" href="'.dol_buildpath('/myfield/css/fontawesome-iconpicker.min.css', 1).'">';
 			$out.='<script src="'.dol_buildpath('/myfield/js/fontawesome-iconpicker.min.js', 1).'"></script>';
 			*/
-			$out.= '<input type="text" class="form-control icp icp-auto iconpicker-element iconpicker-input flat '.$morecss.' maxwidthonsmartphone"';
-			$out.= ' name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
+			$out .= '<input type="text" class="form-control icp icp-auto iconpicker-element iconpicker-input flat '.$morecss.' maxwidthonsmartphone"';
+			$out .= ' name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			if (getDolGlobalInt('MAIN_ADD_ICONPICKER_JS')) {
-				$out.='<script>';
-				$options="{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {";
-				$options.="iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',";
-				$options.="iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',";
+				$out .= '<script>';
+				$options = "{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {";
+				$options .= "iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',";
+				$options .= "iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',";
 				// $options.="buttons: '<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-cancel btn btn-default btn-sm\">".$langs->trans("Cancel")."</button>";
 				// $options.="<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-accept btn btn-primary btn-sm\">".$langs->trans("Save")."</button>',";
-				$options.="footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',";
-				$options.="search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',";
-				$options.="popover: '<div class=\"iconpicker-popover popover\">";
-				$options.="   <div class=\"arrow\" ></div>";
-				$options.="   <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>";
-				$options.="   <div class=\"popover-content \" ></div>";
-				$options.="</div>'}}";
-				$out.="$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");";
-				$out.='</script>';
+				$options .= "footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',";
+				$options .= "search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',";
+				$options .= "popover: '<div class=\"iconpicker-popover popover\">";
+				$options .= "   <div class=\"arrow\" ></div>";
+				$options .= "   <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>";
+				$options .= "   <div class=\"popover-content \" ></div>";
+				$options .= "</div>'}}";
+				$out .= "$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");";
+				$out .= '</script>';
 			}
 		} elseif ($type == 'text') {
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
@@ -1598,7 +1598,7 @@ class ExtraFields
 			$element = $extrafieldsobjectkey;		// $extrafieldsobjectkey comes from $object->table_element but we need $object->element
 			if ($element == 'socpeople') {
 				$element = 'contact';
-			} elseif ( $element == 'projet' ) {
+			} elseif ($element == 'projet') {
 				$element = 'project';
 			}
 
@@ -2029,13 +2029,13 @@ class ExtraFields
 	{
 		global $conf, $langs;
 
-		$tagtype='tr';
-		$tagtype_dyn='td';
+		$tagtype = 'tr';
+		$tagtype_dyn = 'td';
 
-		if ($display_type=='line') {
-			$tagtype='div';
-			$tagtype_dyn='span';
-			$colspan=0;
+		if ($display_type == 'line') {
+			$tagtype = 'div';
+			$tagtype_dyn = 'span';
+			$colspan = 0;
 		}
 
 		$extrafield_param = $this->attributes[$object->table_element]['param'][$key];
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 6b93331127e..f87766fff94 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -28,6 +28,11 @@
  */
 class Menu
 {
+	/**
+	 * List of menu items
+	 *
+	 * @var array<array{url:string,titre:string,level:string,enabled:int<0,2>,target:string,mainmenu:string,leftmenu:string,position:int,id:string,idsel:string,classname:string,prefix:string}>
+	 */
 	public $liste;
 
 	/**
@@ -67,7 +72,7 @@ class Menu
 	 */
 	public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
 	{
-		$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+		$this->liste[] = array('url' => $url, 'titre' => $titre, 'level' => $level, 'enabled' => $enabled, 'target' => $target, 'mainmenu' => $mainmenu, 'leftmenu' => $leftmenu, 'position' => $position, 'id' => $id, 'idsel' => $idsel, 'classname' => $classname, 'prefix' => $prefix);
 	}
 
 	/**
@@ -91,7 +96,7 @@ class Menu
 	public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
 	{
 		$array_start = array_slice($this->liste, 0, ($idafter + 1));
-		$array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+		$array_new   = array(0 => array('url' => $url, 'titre' => $titre, 'level' => $level, 'enabled' => $enabled, 'target' => $target, 'mainmenu' => $mainmenu, 'leftmenu' => $leftmenu, 'position' => $position, 'id' => $id, 'idsel' => $idsel, 'classname' => $classname, 'prefix' => $prefix));
 		$array_end   = array_slice($this->liste, ($idafter + 1));
 		$this->liste = array_merge($array_start, $array_new, $array_end);
 	}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 138417df261..150414b3c4d 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -100,7 +100,7 @@ class SMTPs
 	/**
 	 * Message Content
 	 *
-	 * @var	array	$_msgContent	Array of messages
+	 * @var array{html?:array{mimeType:string,data:string,dataText:string,md5?:string},plain?:array{mimeType:string,data:string,dataText:string,md5?:string},image:array<string,array{imageName:string,cid:string,md5?:string,data:string}>,attachment:array<string,array{filename:string,cid?:string,md5?:string,data:string}>}	$msgContent	Array of messages
 	 */
 	private $_msgContent = array();
 
diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
index 1359fae99a1..b4011bf0c0e 100644
--- a/htdocs/core/lib/customreports.lib.php
+++ b/htdocs/core/lib/customreports.lib.php
@@ -101,6 +101,7 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || (int) dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
+				// @phan-suppress-next-line PhanTypeMismatchDimAssignment
 				$position = (!empty($val['position']) ? $val['position'] : 0);
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6c8152bd228..e9c2a555d63 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -682,7 +682,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 {
 	global $mysoc, $user, $conf;
 
-	if (empty($paramname)) {
+	if (empty($paramname)) {   // Explicit test for null for phan.
 		return 'BadFirstParameterForGETPOST';
 	}
 	if (empty($check)) {
@@ -874,6 +874,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value, when using variable parameters __XXX__ in the GET URL)
 	// Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOMPANY_COUNTRY_ID__, __USER_ID__, ...
 	// We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
+	'@phan-var-force string $paramname';
 	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {
 		$reg = array();
 		$maxloop = 20;
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index d98127a6e59..9b273e4f1b4 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -69,7 +69,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $family;
 
 	/**
-	 * @var array Custom family information
+	 * @var array<string,array{position:string,label:string}> Custom family information
 	 * @see $family
 	 *
 	 * e.g.:
@@ -140,7 +140,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $menu = array();
 
 	/**
-	 * @var array Module parts
+	 * @var array{triggers:int,login:int,substitutions:int,menus:int,theme:int,tpl:int,barcode:int,models:int,css:string,js:string,hooks:string[]} Module parts
 	 *  array(
 	 *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
 	 *      'triggers' => 0,
@@ -691,7 +691,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-		$content='';
+		$content = '';
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
@@ -801,7 +801,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			if ((float) DOL_VERSION >= 6.0) {
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
 
-				$content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
+				$content = dolMd2Html($content, 'parsedown', array('doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1)));
 			} else {
 				$content = nl2br($content);
 			}
@@ -2493,7 +2493,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
-				$versionTitle.= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
+				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
 			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index eb5675e23be..763382fd70c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2184,6 +2184,7 @@ class Project extends CommonObject
 					$date = explode('-', $obj->element_date);
 					$week_number = getWeekNumber($date[2], $date[1], $date[0]);
 				}
+				'@phan-var-force int $week_number';  // Needed because phan considers it might be null
 				if (empty($weekalreadyfound[$week_number])) {
 					$this->monthWorkLoad[$week_number] = $obj->element_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = $obj->element_duration;
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 6dd506f02a7..750db8b0484 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -174,9 +174,6 @@ if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang('auto');
 }
 
-$bc[false] = ' class="bg1"';
-$bc[true] = ' class="bg2"';
-
 
 /**
  *	Load conf file (file must exists)

From d524e9713738c5d7a118ac79ea8b9257edcecedd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 01:54:34 +0100
Subject: [PATCH 0777/1862] Qual: Fix & enable
 PhanPluginRedundantAssignmentInLoop (#28733)

# Qual: Fix & enable PhanPluginRedundantAssignmentInLoop

Fixes the occurences that generated this notice & enable the report
for PhanPluginRedundantAssignmentInLoop
---
 dev/tools/phan/config.php      | 2 +-
 htdocs/comm/action/pertype.php | 4 ++--
 htdocs/comm/action/peruser.php | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 14a8c313670..57d96e657b0 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -488,7 +488,7 @@ return [
 		'PhanPluginPHPDocInWrongComment',
 		'PhanRedefineClassInternal',
 		// 'PhanTypeInvalidThrowsIsInterface',
-		'PhanPluginRedundantAssignmentInLoop',
+		// 'PhanPluginRedundantAssignmentInLoop',
 		// 'PhanInvalidCommentForDeclarationType',
 		//'PhanParamSignatureMismatchInternal',
 		// 'PhanPluginEmptyStatementForeachLoop',
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index f93373fc0f7..9bbdd243f12 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -1211,7 +1211,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			if (count($cases1[$h]) > 1) {
 				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
-			$string1 = '&nbsp;';
+
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style1 = 'peruser_notbusy';
 			} else {
@@ -1228,7 +1228,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			if (count($cases2[$h]) > 1) {
 				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
-			$string2 = '&nbsp;';
+
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style2 = 'peruser_notbusy';
 			} else {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 70b325ed45f..76025723dde 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1503,7 +1503,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			if (count($cases1[$h]) > 1) {
 				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
-			$string1 = '&nbsp;';
+
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style1 = 'peruser_notbusy';
 			} else {
@@ -1520,7 +1520,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			if (count($cases2[$h]) > 1) {
 				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
-			$string2 = '&nbsp;';
+
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style2 = 'peruser_notbusy';
 			} else {
@@ -1537,7 +1537,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			if (count($cases3[$h]) > 1) {
 				$title3 .= count($cases3[$h]).' '.(count($cases3[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
-			$string3 = '&nbsp;';
+
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style3 = 'peruser_notbusy';
 			} else {
@@ -1554,7 +1554,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			if (count($cases4[$h]) > 1) {
 				$title4 .= count($cases4[$h]).' '.(count($cases4[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
-			$string4 = '&nbsp;';
+
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style4 = 'peruser_notbusy';
 			} else {

From 6d9e7b8144697fc0d272b289f526a7bac2096216 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 01:55:56 +0100
Subject: [PATCH 0778/1862] Qual: Fix
 PhanTypeMismatchArgumentInternalProbablyReal (#28732)

* Fix: False positive for PhanTypeMismatchArgumentInternalProbablyReal

* Qual: phan: suppress false positive on ssl_set

* Qual: Enable PhanTypeMismatchArgumentInternalProbablyReal

# Qual: Enable PhanTypeMismatchArgumentInternalProbablyReal

PhanTypeMismatchArgumentInternalProbablyReal are fixed and reporting can
be enabled.

* Qual: Fix PhanTypeMismatchArgumentInternalProbablyReal by improving typing

* Qual: Rewrite/optimize to fix PhanTypeMismatchArgumentInternalProbablyReal

# Qual: Rewrite/optimize to fix PhanTypeMismatchArgumentInternalProbablyReal

False positive detecting that  is not an int, rewriting to check
impact
---
 dev/tools/phan/config.php                     |  14 +-
 .../core/class/commondocgenerator.class.php   | 381 +++++++++---------
 htdocs/core/class/commonobject.class.php      |   6 +-
 htdocs/core/class/rssparser.class.php         |   1 +
 htdocs/core/db/mysqli.class.php               |   1 +
 5 files changed, 208 insertions(+), 195 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 57d96e657b0..ee9cde2603f 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -474,11 +474,11 @@ return [
 		// 'PhanParamSpecial1',
 		'PhanPluginInlineHTMLLeading',
 		'PhanPluginUseReturnValueInternalKnown',
-		//'PhanRedefinedInheritedInterface',
-		//'PhanTypeComparisonToArray',
+		// 'PhanRedefinedInheritedInterface',
+		// 'PhanTypeComparisonToArray',
 		'PhanTypeConversionFromArray',
 		// 'PhanTypeInvalidLeftOperandOfIntegerOp',
-		'PhanTypeMismatchArgumentInternalProbablyReal',
+		// 'PhanTypeMismatchArgumentInternalProbablyReal',
 		'PhanTypeMismatchBitwiseBinaryOperands',
 		'PhanTypeMismatchDimEmpty',
 		'PhanTypeSuspiciousEcho',
@@ -548,9 +548,9 @@ return [
 		'PhanTypeMismatchReturnProbablyReal',
 		'PhanPossiblyUndeclaredVariable',
 		'PhanTypeMismatchArgument',
-		//'PhanPluginUnreachableCode',
-		//'PhanTypeMismatchArgumentInternal',
-		//'PhanPluginAlwaysReturnMethod',
+		// 'PhanPluginUnreachableCode',
+		// 'PhanTypeMismatchArgumentInternal',
+		// 'PhanPluginAlwaysReturnMethod',
 		'PhanUndeclaredClassMethod',
 		'PhanUndeclaredMethod',
 		'PhanTypeMismatchArgumentProbablyReal',
@@ -566,7 +566,7 @@ return [
 		// 'PhanUndeclaredClassAttribute',
 		'PhanNonClassMethodCall',
 		// 'PhanPluginNoAssert',
-		'PhanTypeMismatchReturnSuperType',
+		// 'PhanTypeMismatchReturnSuperType',
 		'PhanTypeMismatchArgumentSuperType',
 		'PhanPluginDuplicateConditionalTernaryDuplication',
 	],
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 75b45b1850a..b80ce304f94 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -111,7 +111,18 @@ abstract class CommonDocGenerator
 
 	public $tva;
 	public $tva_array;
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax1;
+
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax2;
 
 	/**
@@ -196,28 +207,28 @@ abstract class CommonDocGenerator
 		$logotouse = $conf->user->dir_output . '/' . get_exdir(0, 0, 0, 0, $user, 'user') . 'photos/' . getImageFileNameForSize($user->photo, '_small');
 
 		$array_user = array(
-			'myuser_lastname'=>$user->lastname,
-			'myuser_firstname'=>$user->firstname,
-			'myuser_fullname'=>$user->getFullName($outputlangs, 1),
-			'myuser_login'=>$user->login,
-			'myuser_phone'=>$user->office_phone,
-			'myuser_address'=>$user->address,
-			'myuser_zip'=>$user->zip,
-			'myuser_town'=>$user->town,
-			'myuser_country'=>$user->country,
-			'myuser_country_code'=>$user->country_code,
-			'myuser_state'=>$user->state,
-			'myuser_state_code'=>$user->state_code,
-			'myuser_fax'=>$user->office_fax,
-			'myuser_mobile'=>$user->user_mobile,
-			'myuser_email'=>$user->email,
-			'myuser_logo'=>$logotouse,
-			'myuser_job'=>$user->job,
-			'myuser_web'=>'',	// url not exist in $user object
-			'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),
-			'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),
-			'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
-			'myuser_gender'=>$user->gender,
+			'myuser_lastname' => $user->lastname,
+			'myuser_firstname' => $user->firstname,
+			'myuser_fullname' => $user->getFullName($outputlangs, 1),
+			'myuser_login' => $user->login,
+			'myuser_phone' => $user->office_phone,
+			'myuser_address' => $user->address,
+			'myuser_zip' => $user->zip,
+			'myuser_town' => $user->town,
+			'myuser_country' => $user->country,
+			'myuser_country_code' => $user->country_code,
+			'myuser_state' => $user->state,
+			'myuser_state_code' => $user->state_code,
+			'myuser_fax' => $user->office_fax,
+			'myuser_mobile' => $user->user_mobile,
+			'myuser_email' => $user->email,
+			'myuser_logo' => $logotouse,
+			'myuser_job' => $user->job,
+			'myuser_web' => '',	// url not exist in $user object
+			'myuser_birth' => dol_print_date($user->birth, 'day', 'gmt'),
+			'myuser_dateemployment' => dol_print_date($user->dateemployment, 'day', 'tzuser'),
+			'myuser_dateemploymentend' => dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
+			'myuser_gender' => $user->gender,
 		);
 		// Retrieve extrafields
 		if (is_array($user->array_options) && count($user->array_options)) {
@@ -299,32 +310,32 @@ abstract class CommonDocGenerator
 		$logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 
 		return array(
-			'mycompany_logo'=>$logotouse,
-			'mycompany_name'=>$mysoc->name,
-			'mycompany_email'=>$mysoc->email,
-			'mycompany_phone'=>$mysoc->phone,
-			'mycompany_fax'=>$mysoc->fax,
-			'mycompany_address'=>$mysoc->address,
-			'mycompany_zip'=>$mysoc->zip,
-			'mycompany_town'=>$mysoc->town,
-			'mycompany_country'=>$mysoc->country,
-			'mycompany_country_code'=>$mysoc->country_code,
-			'mycompany_state'=>$mysoc->state,
-			'mycompany_state_code'=>$mysoc->state_code,
-			'mycompany_web'=>$mysoc->url,
-			'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
-			'mycompany_managers'=>$mysoc->managers,
-			'mycompany_capital'=>$mysoc->capital,
-			'mycompany_barcode'=>$mysoc->barcode,
-			'mycompany_idprof1'=>$mysoc->idprof1,
-			'mycompany_idprof2'=>$mysoc->idprof2,
-			'mycompany_idprof3'=>$mysoc->idprof3,
-			'mycompany_idprof4'=>$mysoc->idprof4,
-			'mycompany_idprof5'=>$mysoc->idprof5,
-			'mycompany_idprof6'=>$mysoc->idprof6,
-			'mycompany_vatnumber'=>$mysoc->tva_intra,
-			'mycompany_socialobject'=>$mysoc->socialobject,
-			'mycompany_note_private'=>$mysoc->note_private,
+			'mycompany_logo' => $logotouse,
+			'mycompany_name' => $mysoc->name,
+			'mycompany_email' => $mysoc->email,
+			'mycompany_phone' => $mysoc->phone,
+			'mycompany_fax' => $mysoc->fax,
+			'mycompany_address' => $mysoc->address,
+			'mycompany_zip' => $mysoc->zip,
+			'mycompany_town' => $mysoc->town,
+			'mycompany_country' => $mysoc->country,
+			'mycompany_country_code' => $mysoc->country_code,
+			'mycompany_state' => $mysoc->state,
+			'mycompany_state_code' => $mysoc->state_code,
+			'mycompany_web' => $mysoc->url,
+			'mycompany_juridicalstatus' => $mysoc->forme_juridique,
+			'mycompany_managers' => $mysoc->managers,
+			'mycompany_capital' => $mysoc->capital,
+			'mycompany_barcode' => $mysoc->barcode,
+			'mycompany_idprof1' => $mysoc->idprof1,
+			'mycompany_idprof2' => $mysoc->idprof2,
+			'mycompany_idprof3' => $mysoc->idprof3,
+			'mycompany_idprof4' => $mysoc->idprof4,
+			'mycompany_idprof5' => $mysoc->idprof5,
+			'mycompany_idprof6' => $mysoc->idprof6,
+			'mycompany_vatnumber' => $mysoc->tva_intra,
+			'mycompany_socialobject' => $mysoc->socialobject,
+			'mycompany_note_private' => $mysoc->note_private,
 			//'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
 		);
 	}
@@ -353,38 +364,38 @@ abstract class CommonDocGenerator
 		}
 
 		$array_thirdparty = array(
-			'company_name'=>$object->name,
+			'company_name' => $object->name,
 			'company_name_alias' => $object->name_alias,
-			'company_email'=>$object->email,
-			'company_phone'=>$object->phone,
-			'company_fax'=>$object->fax,
-			'company_address'=>$object->address,
-			'company_zip'=>$object->zip,
-			'company_town'=>$object->town,
-			'company_country'=>$object->country,
-			'company_country_code'=>$object->country_code,
-			'company_state'=>$object->state,
-			'company_state_code'=>$object->state_code,
-			'company_web'=>$object->url,
-			'company_barcode'=>$object->barcode,
-			'company_vatnumber'=>$object->tva_intra,
-			'company_customercode'=>$object->code_client,
-			'company_suppliercode'=>$object->code_fournisseur,
-			'company_customeraccountancycode'=>$object->code_compta,
-			'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
-			'company_juridicalstatus'=>$object->forme_juridique,
-			'company_outstanding_limit'=>$object->outstanding_limit,
-			'company_capital'=>$object->capital,
-			'company_idprof1'=>$object->idprof1,
-			'company_idprof2'=>$object->idprof2,
-			'company_idprof3'=>$object->idprof3,
-			'company_idprof4'=>$object->idprof4,
-			'company_idprof5'=>$object->idprof5,
-			'company_idprof6'=>$object->idprof6,
-			'company_note_public'=>$object->note_public,
-			'company_note_private'=>$object->note_private,
-			'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
-			'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
+			'company_email' => $object->email,
+			'company_phone' => $object->phone,
+			'company_fax' => $object->fax,
+			'company_address' => $object->address,
+			'company_zip' => $object->zip,
+			'company_town' => $object->town,
+			'company_country' => $object->country,
+			'company_country_code' => $object->country_code,
+			'company_state' => $object->state,
+			'company_state_code' => $object->state_code,
+			'company_web' => $object->url,
+			'company_barcode' => $object->barcode,
+			'company_vatnumber' => $object->tva_intra,
+			'company_customercode' => $object->code_client,
+			'company_suppliercode' => $object->code_fournisseur,
+			'company_customeraccountancycode' => $object->code_compta,
+			'company_supplieraccountancycode' => $object->code_compta_fournisseur,
+			'company_juridicalstatus' => $object->forme_juridique,
+			'company_outstanding_limit' => $object->outstanding_limit,
+			'company_capital' => $object->capital,
+			'company_idprof1' => $object->idprof1,
+			'company_idprof2' => $object->idprof2,
+			'company_idprof3' => $object->idprof3,
+			'company_idprof4' => $object->idprof4,
+			'company_idprof5' => $object->idprof5,
+			'company_idprof6' => $object->idprof6,
+			'company_note_public' => $object->note_public,
+			'company_note_private' => $object->note_private,
+			'company_default_bank_iban' => (is_object($object->bank_account) ? $object->bank_account->iban : ''),
+			'company_default_bank_bic' => (is_object($object->bank_account) ? $object->bank_account->bic : '')
 		);
 
 		// Retrieve extrafields
@@ -471,15 +482,15 @@ abstract class CommonDocGenerator
 		$now = dol_now('gmt'); // gmt
 		$array_other = array(
 			// Date in default language
-			'current_date'=>dol_print_date($now, 'day', 'tzuser'),
-			'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
-			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
-			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
+			'current_date' => dol_print_date($now, 'day', 'tzuser'),
+			'current_datehour' => dol_print_date($now, 'dayhour', 'tzuser'),
+			'current_server_date' => dol_print_date($now, 'day', 'tzserver'),
+			'current_server_datehour' => dol_print_date($now, 'dayhour', 'tzserver'),
 			// Date in requested output language
-			'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
-			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
-			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
-			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
+			'current_date_locale' => dol_print_date($now, 'day', 'tzuser', $outputlangs),
+			'current_datehour_locale' => dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
+			'current_server_date_locale' => dol_print_date($now, 'day', 'tzserver', $outputlangs),
+			'current_server_datehour_locale' => dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
 		);
 
 
@@ -534,45 +545,45 @@ abstract class CommonDocGenerator
 			$object->date_commande = $object->date;
 		}
 		$resarray = array(
-			$array_key.'_id'=>$object->id,
+			$array_key.'_id' => $object->id,
 			$array_key.'_ref' => (property_exists($object, 'ref') ? $object->ref : ''),
 			$array_key.'_label' => (property_exists($object, 'label') ? $object->label : ''),
 			$array_key.'_ref_ext' => (property_exists($object, 'ref_ext') ? $object->ref_ext : ''),
-			$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
-			$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
-			$array_key.'_source_invoice_ref'=>((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),
+			$array_key.'_ref_customer' => (!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+			$array_key.'_ref_supplier' => (!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
+			$array_key.'_source_invoice_ref' => ((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),
 			// Dates
-			$array_key.'_hour'=>dol_print_date($date, 'hour'),
-			$array_key.'_date'=>dol_print_date($date, 'day'),
-			$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
-			$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day') : ''),
-			$array_key.'_date_limit_rfc'=>(!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'dayrfc') : ''),
-			$array_key.'_date_end'=>(!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''),
-			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
-			$array_key.'_date_modification'=>(!empty($object->date_modification) ? dol_print_date($object->date_modification, 'day') : ''),
-			$array_key.'_date_validation'=>(!empty($object->date_validation) ? dol_print_date($object->date_validation, 'dayhour') : ''),
-			$array_key.'_date_approve'=>(!empty($object->date_approve) ? dol_print_date($object->date_approve, 'day') : ''),
-			$array_key.'_date_delivery_planed'=>(!empty($object->delivery_date) ? dol_print_date($object->delivery_date, 'day') : ''),
-			$array_key.'_date_close'=>(!empty($object->date_cloture) ? dol_print_date($object->date_cloture, 'dayhour') : ''),
+			$array_key.'_hour' => dol_print_date($date, 'hour'),
+			$array_key.'_date' => dol_print_date($date, 'day'),
+			$array_key.'_date_rfc' => dol_print_date($date, 'dayrfc'),
+			$array_key.'_date_limit' => (!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day') : ''),
+			$array_key.'_date_limit_rfc' => (!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'dayrfc') : ''),
+			$array_key.'_date_end' => (!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''),
+			$array_key.'_date_creation' => dol_print_date($object->date_creation, 'day'),
+			$array_key.'_date_modification' => (!empty($object->date_modification) ? dol_print_date($object->date_modification, 'day') : ''),
+			$array_key.'_date_validation' => (!empty($object->date_validation) ? dol_print_date($object->date_validation, 'dayhour') : ''),
+			$array_key.'_date_approve' => (!empty($object->date_approve) ? dol_print_date($object->date_approve, 'day') : ''),
+			$array_key.'_date_delivery_planed' => (!empty($object->delivery_date) ? dol_print_date($object->delivery_date, 'day') : ''),
+			$array_key.'_date_close' => (!empty($object->date_cloture) ? dol_print_date($object->date_cloture, 'dayhour') : ''),
 
-			$array_key.'_payment_mode_code'=>$object->mode_reglement_code,
-			$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),
-			$array_key.'_payment_term_code'=>$object->cond_reglement_code,
-			$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
+			$array_key.'_payment_mode_code' => $object->mode_reglement_code,
+			$array_key.'_payment_mode' => ($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),
+			$array_key.'_payment_term_code' => $object->cond_reglement_code,
+			$array_key.'_payment_term' => ($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
 			$array_key.'_incoterms' => (method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
 
-			$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
-			$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
-			$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
-			$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
-			$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
+			$array_key.'_total_ht_locale' => price($object->total_ht, 0, $outputlangs),
+			$array_key.'_total_vat_locale' => (!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
+			$array_key.'_total_localtax1_locale' => price($object->total_localtax1, 0, $outputlangs),
+			$array_key.'_total_localtax2_locale' => price($object->total_localtax2, 0, $outputlangs),
+			$array_key.'_total_ttc_locale' => price($object->total_ttc, 0, $outputlangs),
 
-			$array_key.'_total_ht'=>price2num($object->total_ht),
-			$array_key.'_total_vat'=>(!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),
-			$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
-			$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
-			$array_key.'_total_ttc'=>price2num($object->total_ttc),
+			$array_key.'_total_ht' => price2num($object->total_ht),
+			$array_key.'_total_vat' => (!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),
+			$array_key.'_total_localtax1' => price2num($object->total_localtax1),
+			$array_key.'_total_localtax2' => price2num($object->total_localtax2),
+			$array_key.'_total_ttc' => price2num($object->total_ttc),
 
 			$array_key.'_multicurrency_code' => $object->multicurrency_code,
 			$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
@@ -583,24 +594,24 @@ abstract class CommonDocGenerator
 			$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
 			$array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),
 
-			$array_key.'_note_private'=>$object->note_private,
-			$array_key.'_note_public'=>$object->note_public,
-			$array_key.'_note'=>$object->note_public, // For backward compatibility
+			$array_key.'_note_private' => $object->note_private,
+			$array_key.'_note_public' => $object->note_public,
+			$array_key.'_note' => $object->note_public, // For backward compatibility
 
 			// Payments
-			$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
-			$array_key.'_already_payed'=>price2num($sumpayed),
-			$array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
-			$array_key.'_already_deposit'=>price2num($sumdeposit),
-			$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
-			$array_key.'_already_creditnote'=>price2num($sumcreditnote),
+			$array_key.'_already_payed_locale' => price($sumpayed, 0, $outputlangs),
+			$array_key.'_already_payed' => price2num($sumpayed),
+			$array_key.'_already_deposit_locale' => price($sumdeposit, 0, $outputlangs),
+			$array_key.'_already_deposit' => price2num($sumdeposit),
+			$array_key.'_already_creditnote_locale' => price($sumcreditnote, 0, $outputlangs),
+			$array_key.'_already_creditnote' => price2num($sumcreditnote),
 
-			$array_key.'_already_payed_all_locale'=>price(price2num($already_payed_all, 'MT'), 0, $outputlangs),
-			$array_key.'_already_payed_all'=> price2num($already_payed_all, 'MT'),
+			$array_key.'_already_payed_all_locale' => price(price2num($already_payed_all, 'MT'), 0, $outputlangs),
+			$array_key.'_already_payed_all' => price2num($already_payed_all, 'MT'),
 
 			// Remain to pay with all known information (except open direct debit requests)
-			$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $already_payed_all, 'MT'), 0, $outputlangs),
-			$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $already_payed_all, 'MT')
+			$array_key.'_remain_to_pay_locale' => price(price2num($object->total_ttc - $already_payed_all, 'MT'), 0, $outputlangs),
+			$array_key.'_remain_to_pay' => price2num($object->total_ttc - $already_payed_all, 'MT')
 		);
 
 		if (in_array($object->element, array('facture', 'invoice', 'supplier_invoice', 'facture_fournisseur'))) {
@@ -616,10 +627,10 @@ abstract class CommonDocGenerator
 			$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);
 			$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);
 			$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);
-			$resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);
-			$resarray[$array_key.'_bank_address'] =(empty($bank_account) ? '' : $bank_account->address);
-			$resarray[$array_key.'_bank_state'] =(empty($bank_account) ? '' : $bank_account->state);
-			$resarray[$array_key.'_bank_country'] =(empty($bank_account) ? '' : $bank_account->country);
+			$resarray[$array_key.'_bank_proprio'] = (empty($bank_account) ? '' : $bank_account->proprio);
+			$resarray[$array_key.'_bank_address'] = (empty($bank_account) ? '' : $bank_account->address);
+			$resarray[$array_key.'_bank_state'] = (empty($bank_account) ? '' : $bank_account->state);
+			$resarray[$array_key.'_bank_country'] = (empty($bank_account) ? '' : $bank_account->country);
 		}
 
 		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
@@ -642,7 +653,7 @@ abstract class CommonDocGenerator
 			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
 			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
 		} else { // empty replacement
-			$resarray[$array_key.'_project_ref'] ='';
+			$resarray[$array_key.'_project_ref'] = '';
 			$resarray[$array_key.'_project_title'] = '';
 			$resarray[$array_key.'_project_description'] = '';
 			$resarray[$array_key.'_project_date_start'] = '';
@@ -714,38 +725,38 @@ abstract class CommonDocGenerator
 		// phpcs:enable
 		$resarray = array(
 			'line_pos' => $linenumber,
-			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
+			'line_fulldesc' => doc_getlinedesc($line, $outputlangs),
 
-			'line_product_ref'=>(empty($line->product_ref) ? '' : $line->product_ref),
-			'line_product_ref_fourn'=>(empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines
-			'line_product_label'=>(empty($line->product_label) ? '' : $line->product_label),
-			'line_product_type'=>(empty($line->product_type) ? '' : $line->product_type),
-			'line_product_barcode'=>(empty($line->product_barcode) ? '' : $line->product_barcode),
-			'line_product_desc'=>(empty($line->product_desc) ? '' : $line->product_desc),
+			'line_product_ref' => (empty($line->product_ref) ? '' : $line->product_ref),
+			'line_product_ref_fourn' => (empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines
+			'line_product_label' => (empty($line->product_label) ? '' : $line->product_label),
+			'line_product_type' => (empty($line->product_type) ? '' : $line->product_type),
+			'line_product_barcode' => (empty($line->product_barcode) ? '' : $line->product_barcode),
+			'line_product_desc' => (empty($line->product_desc) ? '' : $line->product_desc),
 
-			'line_desc'=>$line->desc,
-			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-			'line_localtax1_rate'=>vatrate($line->localtax1_tx),
-			'line_localtax2_rate'=>vatrate($line->localtax1_tx),
-			'line_up'=>price2num($line->subprice),
-			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
-			'line_total_up'=>price2num($line->subprice * $line->qty),
-			'line_total_up_locale'=>price($line->subprice * $line->qty, 0, $outputlangs),
-			'line_qty'=>$line->qty,
-			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
-			'line_price_ht'=>price2num($line->total_ht),
-			'line_price_ttc'=>price2num($line->total_ttc),
-			'line_price_vat'=>price2num($line->total_tva),
-			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
-			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
-			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
+			'line_desc' => $line->desc,
+			'line_vatrate' => vatrate($line->tva_tx, true, $line->info_bits),
+			'line_localtax1_rate' => vatrate($line->localtax1_tx),
+			'line_localtax2_rate' => vatrate($line->localtax1_tx),
+			'line_up' => price2num($line->subprice),
+			'line_up_locale' => price($line->subprice, 0, $outputlangs),
+			'line_total_up' => price2num($line->subprice * $line->qty),
+			'line_total_up_locale' => price($line->subprice * $line->qty, 0, $outputlangs),
+			'line_qty' => $line->qty,
+			'line_discount_percent' => ($line->remise_percent ? $line->remise_percent.'%' : ''),
+			'line_price_ht' => price2num($line->total_ht),
+			'line_price_ttc' => price2num($line->total_ttc),
+			'line_price_vat' => price2num($line->total_tva),
+			'line_price_ht_locale' => price($line->total_ht, 0, $outputlangs),
+			'line_price_ttc_locale' => price($line->total_ttc, 0, $outputlangs),
+			'line_price_vat_locale' => price($line->total_tva, 0, $outputlangs),
 			// Dates
-			'line_date_start'=>dol_print_date($line->date_start, 'day'),
-			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
-			'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
-			'line_date_end'=>dol_print_date($line->date_end, 'day'),
-			'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
-			'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
+			'line_date_start' => dol_print_date($line->date_start, 'day'),
+			'line_date_start_locale' => dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
+			'line_date_start_rfc' => dol_print_date($line->date_start, 'dayrfc'),
+			'line_date_end' => dol_print_date($line->date_end, 'day'),
+			'line_date_end_locale' => dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
+			'line_date_end_rfc' => dol_print_date($line->date_end, 'dayrfc'),
 
 			'line_multicurrency_code' => price2num($line->multicurrency_code),
 			'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
@@ -844,27 +855,27 @@ abstract class CommonDocGenerator
 		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
 		$array_shipment = array(
-			$array_key.'_id'=>$object->id,
-			$array_key.'_ref'=>$object->ref,
-			$array_key.'_ref_ext'=>$object->ref_ext,
-			$array_key.'_ref_customer'=>$object->ref_customer,
-			$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
-			$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
-			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
-			$array_key.'_total_ht'=>price($object->total_ht),
-			$array_key.'_total_vat'=>price($object->total_tva),
-			$array_key.'_total_ttc'=>price($object->total_ttc),
+			$array_key.'_id' => $object->id,
+			$array_key.'_ref' => $object->ref,
+			$array_key.'_ref_ext' => $object->ref_ext,
+			$array_key.'_ref_customer' => $object->ref_customer,
+			$array_key.'_date_delivery' => dol_print_date($object->date_delivery, 'day'),
+			$array_key.'_hour_delivery' => dol_print_date($object->date_delivery, 'hour'),
+			$array_key.'_date_creation' => dol_print_date($object->date_creation, 'day'),
+			$array_key.'_total_ht' => price($object->total_ht),
+			$array_key.'_total_vat' => price($object->total_tva),
+			$array_key.'_total_ttc' => price($object->total_ttc),
 			$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-			$array_key.'_note_private'=>$object->note_private,
-			$array_key.'_note'=>$object->note_public,
-			$array_key.'_tracking_number'=>$object->tracking_number,
-			$array_key.'_tracking_url'=>$object->tracking_url,
-			$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-			$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
-			$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
-			$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
-			$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
-			$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
+			$array_key.'_note_private' => $object->note_private,
+			$array_key.'_note' => $object->note_public,
+			$array_key.'_tracking_number' => $object->tracking_number,
+			$array_key.'_tracking_url' => $object->tracking_url,
+			$array_key.'_shipping_method' => $object->listmeths[0]['libelle'],
+			$array_key.'_weight' => $object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
+			$array_key.'_width' => $object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
+			$array_key.'_height' => $object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
+			$array_key.'_depth' => $object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
+			$array_key.'_size' => $calculatedVolume.' '.measuringUnitString(0, 'volume'),
 		);
 
 		// Add vat by rates
@@ -1367,7 +1378,7 @@ abstract class CommonDocGenerator
 			'object' => $object,
 			'extrafields' => $extrafields,
 			'extrafieldKey' => $extrafieldKey,
-			'extrafieldOutputContent' =>& $extrafieldOutputContent
+			'extrafieldOutputContent' => & $extrafieldOutputContent
 		);
 		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b4cf054717a..a140bf1e4b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8621,7 +8621,7 @@ abstract class CommonObject
 					}
 
 					$visibility = 1;
-					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
+					if (isset($extrafields->attributes[$this->table_element]['list'][$key])) {
 						$visibility = (int) dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
 					}
 
@@ -8630,9 +8630,9 @@ abstract class CommonObject
 						$perms = (int) dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
 					}
 
-					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
+					if (($mode == 'create') && !in_array(abs($visibility), array(1, 3))) {
 						continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-					} elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) {
+					} elseif (($mode == 'edit') && !in_array(abs($visibility), array(1, 3, 4))) {
 						continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
 					} elseif ($mode == 'view' && empty($visibility)) {
 						continue;
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index c16cc2d3007..cf824fea339 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -272,6 +272,7 @@ class RssParser
 				}
 
 				try {
+					// @phan-suppress-next-line PhanTypeMismatchArgumentInternalProbablyReal
 					$xmlparser = xml_parser_create(null);
 
 					xml_parser_set_option($xmlparser, XML_OPTION_CASE_FOLDING, 0);
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index d07b4261ce5..a8bad027e59 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -1297,6 +1297,7 @@ class mysqliDoli extends mysqli
 		if (strpos($host, 'ssl://') === 0) {
 			$host = substr($host, 6);
 			parent::options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, false);
+			// Suppress false positive @phan-suppress-next-line PhanTypeMismatchArgumentInternalProbablyReal
 			parent::ssl_set(null, null, "", null, null);
 			$flags = MYSQLI_CLIENT_SSL;
 		}

From ce30ccb004085c1709b8091cc502196afb23966d Mon Sep 17 00:00:00 2001
From: Charles <carmelchas@gmail.com>
Date: Sat, 9 Mar 2024 18:56:36 -0600
Subject: [PATCH 0779/1862] Update ticket.class.php #28721  - Default for
 Ticket fk_statut in "update" function (#28731)

Correcting the default value for Ticket fk_statut to zero(0) instead of null based on the prescription from the create function.
---
 htdocs/ticket/class/ticket.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 73d1d86ba48..4edfc31a598 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1071,7 +1071,7 @@ class Ticket extends CommonObject
 		$sql .= " fk_user_assign=".(isset($this->fk_user_assign) ? $this->fk_user_assign : "null").",";
 		$sql .= " subject=".(isset($this->subject) ? "'".$this->db->escape($this->subject)."'" : "null").",";
 		$sql .= " message=".(isset($this->message) ? "'".$this->db->escape($this->message)."'" : "null").",";
-		$sql .= " fk_statut=".(isset($this->fk_statut) ? $this->fk_statut : "null").",";
+		$sql .= " fk_statut=".(isset($this->fk_statut) ? $this->fk_statut : "0").",";
 		$sql .= " resolution=".(isset($this->resolution) ? $this->resolution : "null").",";
 		$sql .= " progress=".(isset($this->progress) ? "'".$this->db->escape($this->progress)."'" : "null").",";
 		$sql .= " timing=".(isset($this->timing) ? "'".$this->db->escape($this->timing)."'" : "null").",";

From e5dc0f97d0fae4230c1d735c85a93ecf48a93b7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 01:59:42 +0100
Subject: [PATCH 0780/1862] Fix cast

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4edfc31a598..4980565b264 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1062,17 +1062,17 @@ class Ticket extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ticket SET";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "").",";
 		$sql .= " track_id=".(isset($this->track_id) ? "'".$this->db->escape($this->track_id)."'" : "null").",";
-		$sql .= " fk_soc=".(isset($this->fk_soc) ? "'".$this->db->escape($this->fk_soc)."'" : "null").",";
-		$sql .= " fk_project=".(isset($this->fk_project) ? "'".$this->db->escape($this->fk_project)."'" : "null").",";
-		$sql .= " fk_contract=".(isset($this->fk_contract) ? "'".$this->db->escape($this->fk_contract)."'" : "null").",";
+		$sql .= " fk_soc=".(isset($this->fk_soc) ? (int) $this->fk_soc : "null").",";
+		$sql .= " fk_project=".(isset($this->fk_project) ? (int) $this->fk_project : "null").",";
+		$sql .= " fk_contract=".(isset($this->fk_contract) ? (int) $this->fk_contract : "null").",";
 		$sql .= " origin_email=".(isset($this->origin_email) ? "'".$this->db->escape($this->origin_email)."'" : "null").",";
-		$sql .= " origin_email=".(isset($this->origin_replyto) ? "'".$this->db->escape($this->origin_replyto)."'" : "null").",";
-		$sql .= " fk_user_create=".(isset($this->fk_user_create) ? $this->fk_user_create : "null").",";
-		$sql .= " fk_user_assign=".(isset($this->fk_user_assign) ? $this->fk_user_assign : "null").",";
+		$sql .= " origin_replyto=".(isset($this->origin_replyto) ? "'".$this->db->escape($this->origin_replyto)."'" : "null").",";
+		$sql .= " fk_user_create=".(isset($this->fk_user_create) ? (int) $this->fk_user_create : "null").",";
+		$sql .= " fk_user_assign=".(isset($this->fk_user_assign) ? (int) $this->fk_user_assign : "null").",";
 		$sql .= " subject=".(isset($this->subject) ? "'".$this->db->escape($this->subject)."'" : "null").",";
 		$sql .= " message=".(isset($this->message) ? "'".$this->db->escape($this->message)."'" : "null").",";
-		$sql .= " fk_statut=".(isset($this->fk_statut) ? $this->fk_statut : "0").",";
-		$sql .= " resolution=".(isset($this->resolution) ? $this->resolution : "null").",";
+		$sql .= " fk_statut=".(isset($this->fk_statut) ? (int) $this->fk_statut : "0").",";
+		$sql .= " resolution=".(isset($this->resolution) ? (int) $this->resolution : "null").",";
 		$sql .= " progress=".(isset($this->progress) ? "'".$this->db->escape($this->progress)."'" : "null").",";
 		$sql .= " timing=".(isset($this->timing) ? "'".$this->db->escape($this->timing)."'" : "null").",";
 		$sql .= " type_code=".(isset($this->type_code) ? "'".$this->db->escape($this->type_code)."'" : "null").",";

From 4c442de1a2c6cc8b8dfc7d6227734dd14af35f21 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 02:00:41 +0100
Subject: [PATCH 0781/1862] Qual: Add phan stub files to phpstan configuration
 (#28730)

* Qual: Add phan stub files to phpstan configuration

* Provide log as artifact (for debug), improve CACHE_KEY
---
 .github/workflows/phpstan.yml | 14 ++++++++++----
 phpstan.neon                  |  7 +++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 156da172ac7..967d16ab04e 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -9,9 +9,8 @@ concurrency:
     cancel-in-progress: true
 
 env:
-  CACHE_KEY_PART: >
-    ${{ ( github.event_name == 'pull_request' ) && github.base_ref
-     }}${{ ( github.event_name == 'pull_request' ) && '-' }}${{ github.head_ref }}
+  CACHE_KEY_PART: ${{ github.event_name == 'pull_request' && format('{0}-{1}', 
+github.base_ref, github.head_ref) || github.ref_name }}
   GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -58,7 +57,7 @@ jobs:
       # Run PHPStan
       - name: Run PHPStan
         id: phpstan
-        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -a build/phpstan/bootstrap_action.php -c phpstan.neon | cs2pr --graceful-warnings
+        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -a build/phpstan/bootstrap_action.php -c phpstan.neon | tee _stan.xml | cs2pr --graceful-warnings
         # continue-on-error: true
 
       # Save cache
@@ -68,3 +67,10 @@ jobs:
         with:
           path: ./.github/tmp
           key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{ github.run_id }}
+      - name: Provide phpstan log as artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: phpstan-srcrt
+          path: ${{ github.workspace }}/_stan.xml
+          retention-days: 2
diff --git a/phpstan.neon b/phpstan.neon
index a4ddc377751..8951e8ddaa2 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -13,6 +13,13 @@ parameters:
 	paths:
 		- htdocs
 		- scripts
+	stubFiles:
+		# - dev/tools/phan/stubs/GeoIP2.php
+		# - dev/tools/phan/stubs/geoip_inc.php
+		- dev/tools/phan/stubs/module_numberwords.php
+		- dev/tools/phan/stubs/restler.php
+		- dev/tools/phan/stubs/stripe.php
+		- dev/tools/phan/stubs/swiss-qr-bill.php
 	excludePaths:
 		analyseAndScan:
 		- htdocs/custom/*

From c6fa4e49453e9e90a7f0411c93701ba231b900cd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 20:44:47 +0100
Subject: [PATCH 0782/1862] Qual: Enable reporting
 PhanTypeMismatchDimAssignment

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index ee9cde2603f..f2fe12ea94c 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -448,7 +448,7 @@ return [
 		'PhanRedefineClass',
 		'PhanRedefineFunction',
 		'PhanTypeInvalidLeftOperandOfBitwiseOp',
-		'PhanTypeMismatchDimAssignment',
+		// 'PhanTypeMismatchDimAssignment',
 		// 'PhanPluginDescriptionlessCommentOnProtectedMethod',
 		'PhanPluginPrintfIncompatibleArgumentTypeWeak',
 		'PhanUndeclaredVariableAssignOp',

From 5f30dffa595a61f58ef1cd2cd48d0d85c327d46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 10 Mar 2024 08:54:51 +0100
Subject: [PATCH 0783/1862] test

---
 phpstan.neon | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index e51200a24d1..5271aeffa07 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -16,10 +16,10 @@ parameters:
 	stubFiles:
 		# - dev/tools/phan/stubs/GeoIP2.php
 		# - dev/tools/phan/stubs/geoip_inc.php
-		- dev/tools/phan/stubs/module_numberwords.php
-		- dev/tools/phan/stubs/restler.php
-		- dev/tools/phan/stubs/stripe.php
-		- dev/tools/phan/stubs/swiss-qr-bill.php
+		#- dev/tools/phan/stubs/module_numberwords.php
+		#- dev/tools/phan/stubs/restler.php
+		#- dev/tools/phan/stubs/stripe.php
+		#- dev/tools/phan/stubs/swiss-qr-bill.php
 	excludePaths:
 		analyseAndScan:
 		- htdocs/custom/*

From 8cbd159d503528b59b8fe4906866826104c0ca16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 10 Mar 2024 08:58:09 +0100
Subject: [PATCH 0784/1862] test

---
 .github/workflows/phpstan.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 967d16ab04e..84e84499807 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -9,8 +9,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-  CACHE_KEY_PART: ${{ github.event_name == 'pull_request' && format('{0}-{1}', 
-github.base_ref, github.head_ref) || github.ref_name }}
+  CACHE_KEY_PART: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.base_ref, github.head_ref) || github.ref_name }}
   GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -57,7 +56,7 @@ jobs:
       # Run PHPStan
       - name: Run PHPStan
         id: phpstan
-        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -a build/phpstan/bootstrap_action.php -c phpstan.neon | tee _stan.xml | cs2pr --graceful-warnings
+        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 6G -a build/phpstan/bootstrap_action.php -c phpstan.neon | tee _stan.xml | cs2pr --graceful-warnings
         # continue-on-error: true
 
       # Save cache

From 101d56a2c1ae4c919a20381d2a796e9a5acfcb32 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 15:17:58 +0100
Subject: [PATCH 0785/1862] Fix: Ob buffer cleanup on exception

# Fix: Ob buffer cleanup on exception

The OB buffer capture was incorrectly cleaned up on exception.
This fixes that.

Also modified the SecurityTest to enable running it standalone
---
 htdocs/core/lib/functions.lib.php      | 10 ++++++++++
 test/phpunit/CommonClassTest.class.php |  5 +++++
 test/phpunit/SecurityTest.php          |  7 ++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c43dd851c78..57f785261ea 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9839,6 +9839,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 	global $object;
 	global $obj; // To get $obj used into list when dol_eval() is used for computed fields and $obj is not yet $object
 
+	$isObBufferActive = false;  // When true, the ObBuffer must be cleaned in the exception handler
 	if (!in_array($onlysimplestring, array('0', '1', '2'))) {
 		return "Bad call of dol_eval. Parameter onlysimplestring must be '0' (deprecated), '1' or '2'";
 	}
@@ -9957,16 +9958,20 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 		if ($returnvalue) {
 			if ($hideerrors) {
 				ob_start();	// An evaluation has no reason to output data
+				$isObBufferActive = true;
 				$tmps = @eval('return '.$s.';');
 				$tmpo = ob_get_clean();
+				$isObBufferActive = false;
 				if ($tmpo) {
 					print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
 				}
 				return $tmps;
 			} else {
 				ob_start();	// An evaluation has no reason to output data
+				$isObBufferActive = true;
 				$tmps = eval('return '.$s.';');
 				$tmpo = ob_get_clean();
+				$isObBufferActive = false;
 				if ($tmpo) {
 					print 'Bad string syntax to evaluate. Some data were output when it should not when evaluating: '.$s;
 				}
@@ -9981,6 +9986,11 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 			}
 		}
 	} catch (Error $e) {
+		if ($isObBufferActive) {
+			// Clean up buffer which was left behind due to exception.
+			$tmpo = ob_get_clean();
+			$isObBufferActive = false;
+		}
 		$error = 'dol_eval try/catch error : ';
 		$error .= $e->getMessage();
 		dol_syslog($error, LOG_WARNING);
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 2be3f58362f..a7c793ed9bf 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -26,11 +26,16 @@
  *      \remarks    Class that extends all PHPunit tests. To share similare code between each test.
  */
 
+// Workaround for false security issue with main.inc.php in tests:
+$_SERVER['PHP_SELF'] = "phpunit";
+
 global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
+
+
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 8a154897acb..42455c49cef 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -53,10 +53,11 @@ if (! defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
-require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
+// Implements workaround for PHP_SELF & includes common files:
+require_once dirname(__FILE__).'/CommonClassTest.class.php';
+
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
-require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
@@ -988,7 +989,7 @@ class SecurityTest extends CommonClassTest
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
-		$result=dol_eval('1==1', 1, 0);
+		$result = dol_eval('1==1', 1, 0);
 		print "result1 = ".$result."\n";
 		$this->assertTrue($result);
 

From 5a5fa9293fb2cfdf9e957860134b55d9c721b48d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 15:42:38 +0100
Subject: [PATCH 0786/1862] FIX: upload odt files should not start/end with
 space

---
 htdocs/admin/facture.php      |  2 ++
 htdocs/core/lib/files.lib.php | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 3721646d950..75b5d0daa47 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -50,6 +50,8 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
+$error = 0;
+
 
 /*
  * Actions
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 9d7b2222040..245b5943b5d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1840,6 +1840,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 		//      var_dump($result);exit;
 		if ($result >= 0) {
 			$TFile = $_FILES[$varfiles];
+			// Convert value of $TFile
 			if (!is_array($TFile['name'])) {
 				foreach ($TFile as $key => &$val) {
 					$val = array($val);
@@ -1854,13 +1855,13 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				}
 
 				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull = $upload_dir."/".$TFile['name'][$i];
-				$destfile = $TFile['name'][$i];
+				$destfile = trim($TFile['name'][$i]);
+				$destfull = $upload_dir."/".$destfile;
 				$destfilewithoutext = preg_replace('/\.[^\.]+$/', '', $destfile);
 
 				if ($savingdocmask && strpos($savingdocmask, $destfilewithoutext) !== 0) {
-					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
-					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
+					$destfile = trim(preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask));
+					$destfull = $upload_dir."/".$destfile;
 				}
 
 				$filenameto = basename($destfile);
@@ -1869,7 +1870,6 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
 					break;
 				}
-
 				// dol_sanitizeFileName the file name and lowercase extension
 				$info = pathinfo($destfull);
 				$destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].($info['extension'] != '' ? ('.'.strtolower($info['extension'])) : ''));

From ec1b8284c91fbb689c59dddfce5afefc08454b31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 15:52:29 +0100
Subject: [PATCH 0787/1862] Rename files to use an english name

---
 htdocs/admin/{facture.php => invoice.php}            |  2 +-
 .../{facture_situation.php => invoice_situation.php} |  2 +-
 ..._extrafields.php => invoice_cust_extrafields.php} |  2 +-
 ...rafields.php => invoice_rec_cust_extrafields.php} |  2 +-
 ...trafields.php => invoicedet_cust_extrafields.php} |  2 +-
 ...ields.php => invoicedet_rec_cust_extrafields.php} |  2 +-
 htdocs/core/lib/invoice.lib.php                      | 12 ++++++------
 htdocs/core/modules/modFacture.class.php             |  2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename htdocs/admin/{facture.php => invoice.php} (99%)
 rename htdocs/admin/{facture_situation.php => invoice_situation.php} (99%)
 rename htdocs/compta/facture/admin/{facture_cust_extrafields.php => invoice_cust_extrafields.php} (97%)
 rename htdocs/compta/facture/admin/{facture_rec_cust_extrafields.php => invoice_rec_cust_extrafields.php} (97%)
 rename htdocs/compta/facture/admin/{facturedet_cust_extrafields.php => invoicedet_cust_extrafields.php} (97%)
 rename htdocs/compta/facture/admin/{facturedet_rec_cust_extrafields.php => invoicedet_rec_cust_extrafields.php} (97%)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/invoice.php
similarity index 99%
rename from htdocs/admin/facture.php
rename to htdocs/admin/invoice.php
index 75b5d0daa47..fe290ea6f80 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/invoice.php
@@ -23,7 +23,7 @@
  */
 
 /**
- *      \file       htdocs/admin/facture.php
+ *      \file       htdocs/admin/invoice.php
  *		\ingroup    facture
  *		\brief      Page to setup invoice module
  */
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/invoice_situation.php
similarity index 99%
rename from htdocs/admin/facture_situation.php
rename to htdocs/admin/invoice_situation.php
index b514ef81721..d1a557f183d 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/invoice_situation.php
@@ -22,7 +22,7 @@
  */
 
 /**
- *      \file       htdocs/admin/facture.php
+ *      \file       htdocs/admin/invoice_situation.php
  *		\ingroup    facture
  *		\brief      Page to setup invoice module
  */
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/invoice_cust_extrafields.php
similarity index 97%
rename from htdocs/compta/facture/admin/facture_cust_extrafields.php
rename to htdocs/compta/facture/admin/invoice_cust_extrafields.php
index 67f3becb6b5..6b8581c9399 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/invoice_cust_extrafields.php
@@ -20,7 +20,7 @@
 */
 
 /**
-* \file htdocs/compta/facture/admin/facture_cust_extrafields.php
+* \file htdocs/compta/facture/admin/invoice_cust_extrafields.php
 * \ingroup invoice
 * \brief Page to setup extra fields of customer invoice
 */
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/invoice_rec_cust_extrafields.php
similarity index 97%
rename from htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
rename to htdocs/compta/facture/admin/invoice_rec_cust_extrafields.php
index fb5282352fc..00fb625271c 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/invoice_rec_cust_extrafields.php
@@ -21,7 +21,7 @@
 */
 
 /**
-* \file htdocs/compta/facture/admin/facture_cust_extrafields.php
+* \file htdocs/compta/facture/admin/invoice_cust_extrafields.php
 * \ingroup invoice
 * \brief Page to setup extra fields of customer invoice
 */
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/invoicedet_cust_extrafields.php
similarity index 97%
rename from htdocs/compta/facture/admin/facturedet_cust_extrafields.php
rename to htdocs/compta/facture/admin/invoicedet_cust_extrafields.php
index 5bd66c4f0f7..61eabbac825 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/invoicedet_cust_extrafields.php
@@ -21,7 +21,7 @@
 */
 
 /**
-* \file htdocs/compta/facture/admin/facture_cust_extrafields.php
+* \file htdocs/compta/facture/admin/invoice_cust_extrafields.php
 * \ingroup invoice
 * \brief Page to setup extra fields of customer invoice
 */
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/invoicedet_rec_cust_extrafields.php
similarity index 97%
rename from htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
rename to htdocs/compta/facture/admin/invoicedet_rec_cust_extrafields.php
index 01c6abc310a..ed9a8d5d280 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/invoicedet_rec_cust_extrafields.php
@@ -21,7 +21,7 @@
 */
 
 /**
-* \file htdocs/compta/facture/admin/facture_cust_extrafields.php
+* \file htdocs/compta/facture/admin/invoice_cust_extrafields.php
 * \ingroup invoice
 * \brief Page to setup extra fields of customer invoice
 */
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 9e6a39c63f9..faf5068d403 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -177,7 +177,7 @@ function invoice_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/facture.php';
+	$head[$h][0] = DOL_URL_ROOT.'/admin/invoice.php';
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'general';
 	$h++;
@@ -193,7 +193,7 @@ function invoice_admin_prepare_head()
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'invoice_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_cust_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/invoice_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoices");
 	$nbExtrafields = $extrafields->attributes['facture']['count'];
 	if ($nbExtrafields > 0) {
@@ -202,7 +202,7 @@ function invoice_admin_prepare_head()
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_cust_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/invoicedet_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
 	$nbExtrafields = $extrafields->attributes['facturedet']['count'];
 	if ($nbExtrafields > 0) {
@@ -211,7 +211,7 @@ function invoice_admin_prepare_head()
 	$head[$h][2] = 'attributeslines';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_rec_cust_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/invoice_rec_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoicesRec");
 	$nbExtrafields = $extrafields->attributes['facture_rec']['count'];
 	if ($nbExtrafields > 0) {
@@ -220,7 +220,7 @@ function invoice_admin_prepare_head()
 	$head[$h][2] = 'attributesrec';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_rec_cust_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/invoicedet_rec_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLinesRec");
 	$nbExtrafields = $extrafields->attributes['facturedet_rec']['count'];
 	if ($nbExtrafields > 0) {
@@ -230,7 +230,7 @@ function invoice_admin_prepare_head()
 	$h++;
 
 	if (getDolGlobalInt('INVOICE_USE_SITUATION') > 0) {	// Warning, implementation with value 1 is seriously bugged and a new one not compatible is expected to become stable
-		$head[$h][0] = DOL_URL_ROOT.'/admin/facture_situation.php';
+		$head[$h][0] = DOL_URL_ROOT.'/admin/invoice_situation.php';
 		$head[$h][1] = $langs->trans("InvoiceSituation");
 		$head[$h][2] = 'situation';
 		$h++;
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 4d90ba8252b..7cd9dacaefa 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -73,7 +73,7 @@ class modFacture extends DolibarrModules
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
 
 		// Config pages
-		$this->config_page_url = array("facture.php");
+		$this->config_page_url = array("invoice.php");
 
 		// Constants
 		$this->const = array();

From 453eb9c242c3f75d96e1cadc0cfa4f70345f3317 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 15:42:38 +0100
Subject: [PATCH 0788/1862] FIX: upload odt files should not start/end with
 space

---
 htdocs/admin/facture.php      |  2 ++
 htdocs/core/lib/files.lib.php | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 3384a0d31d6..19f1182e608 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -50,6 +50,8 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
+$error = 0;
+
 
 /*
  * Actions
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7152e2778bb..b170c4fc177 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1777,6 +1777,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 		//      var_dump($result);exit;
 		if ($result >= 0) {
 			$TFile = $_FILES[$varfiles];
+			// Convert value of $TFile
 			if (!is_array($TFile['name'])) {
 				foreach ($TFile as $key => &$val) {
 					$val = array($val);
@@ -1791,13 +1792,13 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				}
 
 				// Define $destfull (path to file including filename) and $destfile (only filename)
-				$destfull = $upload_dir."/".$TFile['name'][$i];
-				$destfile = $TFile['name'][$i];
+				$destfile = trim($TFile['name'][$i]);
+				$destfull = $upload_dir."/".$destfile;
 				$destfilewithoutext = preg_replace('/\.[^\.]+$/', '', $destfile);
 
 				if ($savingdocmask && strpos($savingdocmask, $destfilewithoutext) !== 0) {
-					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
-					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
+					$destfile = trim(preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask));
+					$destfull = $upload_dir."/".$destfile;
 				}
 
 				$filenameto = basename($destfile);
@@ -1806,7 +1807,6 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
 					break;
 				}
-
 				// dol_sanitizeFileName the file name and lowercase extension
 				$info = pathinfo($destfull);
 				$destfull = $info['dirname'].'/'.dol_sanitizeFileName($info['filename'].($info['extension'] != '' ? ('.'.strtolower($info['extension'])) : ''));

From c23794a23cbf2c6d5aaba1b05cda38c89f6bd29d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 22 Jan 2024 02:57:10 +0100
Subject: [PATCH 0789/1862] NEW: Script for fast identification of
 missing/unused/duplicate translations

# NEW: Script for fast identification of missing/unused/duplicate translations

Fast analysis of files to identify missing, unused and duplicate translations.
Fast = less than 3 seconds when there are no exceptions (on my development machine).
---
 .pre-commit-config.yaml                       |   11 +-
 .../duplicate_translation_keys.lst            |  265 ++
 dev/translation/dynamic_translation_keys.lst  | 3687 +++++++++++++++++
 dev/translation/ignore_translation_keys.lst   | 1183 ++++++
 .../sanity_check_trans_missing_unused.sh      |  212 +
 pyproject.toml                                |    2 +-
 6 files changed, 5358 insertions(+), 2 deletions(-)
 create mode 100644 dev/translation/duplicate_translation_keys.lst
 create mode 100644 dev/translation/dynamic_translation_keys.lst
 create mode 100644 dev/translation/ignore_translation_keys.lst
 create mode 100755 dev/translation/sanity_check_trans_missing_unused.sh

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 45f51d5c5db..814f144508c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,7 +62,9 @@ repos:
     rev: v6.2.1
     hooks:
       - id: beautysh
-        exclude: (?x)^(dev/setup/git/hooks/pre-commit)$
+        exclude: |
+          (?x)^(dev/setup/git/hooks/pre-commit
+               )$
         args: [--tab]
 
   # Run local script
@@ -77,6 +79,13 @@ repos:
   #   ```
   - repo: local
     hooks:
+      - name: Find missing/unused/duplicate language keys
+        id: check-translations
+        files: (?x)^(htdocs/langs/en_US/.*\.lang)
+        language: script
+        entry: ./dev/translation/sanity_check_trans_missing_unused.sh
+        pass_filenames: false
+        args: [list]
       - id: local-precommit-script
         name: Run local script before commit if it exists
         language: system
diff --git a/dev/translation/duplicate_translation_keys.lst b/dev/translation/duplicate_translation_keys.lst
new file mode 100644
index 00000000000..4e2c4f3b7a8
--- /dev/null
+++ b/dev/translation/duplicate_translation_keys.lst
@@ -0,0 +1,265 @@
+# File with duplicate translation keys that are ignored for
+# reporting duplicates.
+# FYI: Headers generated on https://manytools.org/hacker-tools/ascii-banner/ - DOS Rebel or ANSI Shadow
+#      Can also use 'figlet' tool (installable with `apt-get install figlet`)
+#
+#  ██████████
+# ░░███░░░░░█
+#  ░███  █ ░  █████ █████ ████████   ██████  ████████    █████   ██████   █████
+#  ░██████   ░░███ ░░███ ░░███░░███ ███░░███░░███░░███  ███░░   ███░░███ ███░░
+#  ░███░░█    ░░░█████░   ░███ ░███░███████  ░███ ░███ ░░█████ ░███████ ░░█████
+#  ░███ ░   █  ███░░░███  ░███ ░███░███░░░   ░███ ░███  ░░░░███░███░░░   ░░░░███
+#  ██████████ █████ █████ ░███████ ░░██████  ████ █████ ██████ ░░██████  ██████
+# ░░░░░░░░░░ ░░░░░ ░░░░░  ░███░░░   ░░░░░░  ░░░░ ░░░░░ ░░░░░░   ░░░░░░  ░░░░░░
+#                         ░███
+#                         █████
+#                        ░░░░░
+# Expenses and trips overlap quite a bit, which is by design
+#
+AUTHOR
+AUTHORPAIEMENT
+AddTrip
+AllExpenseReport
+AllExpenseReports
+AnyOtherInThisListCanValidate
+AttachTheNewLineToTheDocument
+AucuneLigne
+BrouillonnerTrip
+CANCEL_USER
+CarCategory
+ClassifyRefunded
+CompanyVisited
+ConfirmBrouillonnerTrip
+ConfirmCancelTrip
+ConfirmCloneExpenseReport
+ConfirmDeleteTrip
+ConfirmPaidTrip
+ConfirmRefuseTrip
+ConfirmSaveTrip
+ConfirmValideTrip
+DATE_CANCEL
+DATE_PAIEMENT
+DATE_REFUS
+DATE_SAVE
+DefaultCategoryCar
+DefaultRangeNumber
+DeleteTrip
+EX_BRE
+EX_CAM
+EX_CAM_VP
+EX_CAR
+EX_CUR
+EX_DOC
+EX_EMM
+EX_FUE
+EX_FUE_VP
+EX_GUM
+EX_HOT
+EX_IND
+EX_KME
+EX_OTR
+EX_PAR
+EX_PAR_VP
+EX_POS
+EX_SUM
+EX_SUO
+EX_TAX
+EX_TOL
+EX_TOL_VP
+ErrorBadValueForParameter
+ErrorDoubleDeclaration
+ErrorRecordNotFound
+Error_EXPENSEREPORT_ADDON_NotDefined
+ExpenseRangeOffset
+ExpenseReportApplyTo
+ExpenseReportApproved
+ExpenseReportApprovedMessage
+ExpenseReportCanceled
+ExpenseReportCanceledMessage
+ExpenseReportConstraintViolationError
+ExpenseReportConstraintViolationWarning
+ExpenseReportDateEnd
+ExpenseReportDateStart
+ExpenseReportDomain
+ExpenseReportIkDesc
+ExpenseReportLimitAmount
+ExpenseReportLimitOn
+ExpenseReportLine
+ExpenseReportPaid
+ExpenseReportPaidMessage
+ExpenseReportPayment
+ExpenseReportRef
+ExpenseReportRefused
+ExpenseReportRefusedMessage
+ExpenseReportRestrictive
+ExpenseReportRuleErrorOnSave
+ExpenseReportRuleSave
+ExpenseReportRulesDesc
+ExpenseReportWaitingForApproval
+ExpenseReportWaitingForApprovalMessage
+ExpenseReportWaitingForReApproval
+ExpenseReportWaitingForReApprovalMessage
+ExpenseReportsIk
+ExpenseReportsRules
+ExpenseReportsToApprove
+ExpenseReportsToPay
+ExpensesArea
+FeesKilometersOrAmout
+LastExpenseReports
+ListOfFees
+ListOfTrips
+ListToApprove
+ListTripsAndExpenses
+MOTIF_CANCEL
+MOTIF_REFUS
+ModePaiement
+NOT_AUTHOR
+NewTrip
+NoTripsToExportCSV
+OnExpense
+PDFStandardExpenseReports
+PaidTrip
+REFUSEUR
+RangeIk
+RangeNum
+SaveTrip
+ShowExpenseReport
+ShowTrip
+TF_BUS
+TF_CAR
+TF_ESSENCE
+TF_HOTEL
+TF_LUNCH
+TF_METRO
+TF_OTHER
+TF_PEAGE
+TF_TAXI
+TF_TRAIN
+TF_TRIP
+TripCard
+TripId
+TripNDF
+TripSociete
+Trips
+TripsAndExpenses
+TripsAndExpensesStatistics
+TypeFees
+UploadANewFileNow
+VALIDATOR
+VALIDOR
+ValidateAndSubmit
+ValidatedWaitingApproval
+ValideTrip
+byEX_DAY
+byEX_EXP
+byEX_MON
+byEX_YEA
+expenseReportCatDisabled
+expenseReportCoef
+expenseReportCoefUndefined
+expenseReportOffset
+expenseReportPrintExample
+expenseReportRangeDisabled
+expenseReportRangeFromTo
+expenseReportRangeMoreThan
+expenseReportTotalForFive
+nolimitbyEX_DAY
+nolimitbyEX_EXP
+nolimitbyEX_MON
+nolimitbyEX_YEA
+#
+#   █████████   █████               ███
+#  ███░░░░░███ ░░███               ░░░
+# ░███    ░░░  ███████   ████████  ████  ████████   ██████
+# ░░█████████ ░░░███░   ░░███░░███░░███ ░░███░░███ ███░░███
+#  ░░░░░░░░███  ░███     ░███ ░░░  ░███  ░███ ░███░███████
+#  ███    ░███  ░███ ███ ░███      ░███  ░███ ░███░███░░░
+# ░░█████████   ░░█████  █████     █████ ░███████ ░░██████
+#  ░░░░░░░░░     ░░░░░  ░░░░░     ░░░░░  ░███░░░   ░░░░░░
+#                                        ░███
+#                                        █████
+#                                       ░░░░░
+# Stripe is similar to Paybox and has some keys in common
+#
+AccountParameter
+CSSUrlForPaymentForm
+Continue
+Creditor
+FollowingUrlAreAvailableToMakePayments
+InformationToFindParameters
+PaymentCode
+PaymentForm
+ThisIsInformationOnPayment
+ThisScreenAllowsYouToPay
+ToComplete
+UsageParameter
+WelcomeOnPaymentPage
+YourEMail
+
+
+
+#############################################################
+#############################################################
+AccountancyCode
+AffectedTo
+AvailableFormats
+BIC
+BankTransferAmount
+Buy
+ByDefaultInList
+ByYear
+CashDesk
+ChooseFileToImport
+ConfirmCloneAsk
+ContractSigned
+ContractStatusClosed
+CreateUser
+CreatedBy
+Customer
+CustomerInvoicePayment
+DatabaseName
+DatabaseServer
+DeleteFromCat
+DeleteType
+DriverType
+ExportableDatas
+ExportsArea
+History
+IBAN
+IdModule
+InterventionSentByEMail
+InvoiceRef
+InvoiceSubtype
+LanguageFile
+LineId
+ListOfStockMovements
+Location
+MinimumAmount
+Movements
+NewSubscription
+NewUser
+NoSupplierOrder
+NoticePeriod
+OrderWaiting
+PriceFormatInCurrentLanguage
+Prospect
+Prospect
+ReOpen
+ReceptionClassifyClosedInDolibarr
+Rejects
+Salaries
+Sell
+Server
+ShowCompany
+ShowTask
+ShowTypeCard
+StatusInterInvoiced
+StatusToPay
+Stock
+Stocks
+SubscriptionPayment
+Suppliers
+Type
+Unit
+Upgrade
+WithdrawalReceipt
diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst
new file mode 100644
index 00000000000..5e1df8fb25f
--- /dev/null
+++ b/dev/translation/dynamic_translation_keys.lst
@@ -0,0 +1,3687 @@
+# Dynamic Translations - Could be ($key) in code.
+# Purpose: do not list these keys as unused.
+#
+# Note: organise the keys in alphabetical order,
+#       keeping the module section in alphabetical
+#       order as well, except for "Others" which
+#       is kept last.
+
+# Ai
+AiDescription
+AiDescriptionLong
+AiSetup
+AI_API_CHATGPT_ENDPOINT
+AI_API_CHATGPT_KEY
+AI_KEY_API_CHATGPT
+
+# datapolicy
+DATAPOLICY_ADHERENT
+DATAPOLICY_CONTACT_CLIENT
+DATAPOLICY_CONTACT_FOURNISSEUR
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT
+DATAPOLICY_CONTACT_PROSPECT
+DATAPOLICY_CONTACT_PROSPECT_CLIENT
+DATAPOLICY_TIERS_CLIENT
+DATAPOLICY_TIERS_FOURNISSEUR
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT
+DATAPOLICY_TIERS_PROSPECT
+DATAPOLICY_TIERS_PROSPECT_CLIENT
+
+# fournisseur
+CodePaymentTerm
+IdPaymentTerm
+LabelPaymentTerm
+
+# ticket
+TicketAnswered
+
+# website_template
+Message
+Map
+Reservation
+
+# Others
+ACCOUNTING_ACCOUNT_CUSTOMER
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY
+ACCOUNTING_ACCOUNT_SUPPLIER
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc
+ACCOUNTING_ACCOUNT_SUSPENSE
+ACCOUNTING_ACCOUNT_TRANSFER_CASH
+ACCOUNTING_BANK_JOURNAL
+ACCOUNTING_DATE_START_BINDING
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER
+ACCOUNTING_EXPENSEREPORT_JOURNAL
+ACCOUNTING_EXPORT_AMOUNT
+ACCOUNTING_EXPORT_DATE
+ACCOUNTING_EXPORT_DEVISE
+ACCOUNTING_EXPORT_ENDLINE
+ACCOUNTING_EXPORT_FORMAT
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT
+ACCOUNTING_EXPORT_LABEL
+ACCOUNTING_EXPORT_PIECE
+ACCOUNTING_EXPORT_PREFIX_SPEC
+ACCOUNTING_EXPORT_SEPARATORCSV
+ACCOUNTING_HAS_NEW_JOURNAL
+ACCOUNTING_INVENTORY_JOURNAL
+ACCOUNTING_LENGTH_AACCOUNT
+ACCOUNTING_LENGTH_DESCRIPTION
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT
+ACCOUNTING_LENGTH_GACCOUNT
+ACCOUNTING_LIMIT_LIST_VENTILATION
+ACCOUNTING_LIST_SORT_VENTILATION_DONE
+ACCOUNTING_LIST_SORT_VENTILATION_TODO
+ACCOUNTING_MISCELLANEOUS_JOURNAL
+ACCOUNTING_PRODUCT_BUY_ACCOUNT
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT
+ACCOUNTING_PURCHASE_JOURNAL
+ACCOUNTING_RESULT_LOSS
+ACCOUNTING_RESULT_PROFIT
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT
+ACCOUNTING_SELL_JOURNAL
+ACCOUNTING_SERVICE_BUY_ACCOUNT
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT
+ACCOUNTING_SERVICE_SOLD_ACCOUNT
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT
+ACCOUNTING_SOCIAL_JOURNAL
+ACCOUNTING_VAT_BUY_ACCOUNT
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT
+ACCOUNTING_VAT_PAY_ACCOUNT
+ACCOUNTING_VAT_SOLD_ACCOUNT
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT
+AGENDA_EVENT_CURRENT_COLOR
+AGENDA_EVENT_FUTURE_COLOR
+AGENDA_EVENT_PAST_COLOR
+AGENDA_SHOW_LINKED_OBJECT
+APPROVEDInDolibarr
+ASSET_ACCOUNTANCY_CATEGORY
+AbandonmentComment
+AccountAccountingSuggest
+AccountCard
+AccountLabel
+AccountRef
+AccountancyAreaDescDonation
+AccountancyAreaDescLoan
+AccountancyAreaDescSal
+AccountancyAreaDescSubscription
+AccountancyCodeAsset
+AccountancyCodeDepreciationAsset
+AccountancyCodeDepreciationExpense
+AccountancyErrorMismatchLetterCode
+AccountancyHome
+AccountancyTreasuryArea
+AccountingCategoriesDesc
+AccountingJournal
+AccountingPeriodCard
+AccountsArea
+AccountsCategoriesShort
+AchatTelechargement
+ActionAC_CLO
+ActionAC_COM
+ActionAC_EMAIL
+ActionAC_EMAILING
+ActionAC_EMAIL_IN
+ActionAC_EVENTORGANIZATION
+ActionAC_FAC
+ActionAC_FAX
+ActionAC_INT
+ActionAC_OTH
+ActionAC_OTH_AUTO
+ActionAC_OTH_AUTOShort
+ActionAC_PROP
+ActionAC_RDV
+ActionAC_REL
+ActionAC_SHIP
+ActionAC_SUP_INV
+ActionAC_SUP_ORD
+ActionAC_TEL
+ActionByCP
+ActionRunningNotStarted
+ActionsOnReception
+ActionsOnShipping
+ActionsOnSupplierProposal
+ActionsOwnedByShort
+ActivateOn
+ActivateService
+ActiveOn
+AddAddress
+AddAll
+AddCompteFromBK
+AddDiscount
+AddElement
+AddEventToUserOkCP
+AddFiles
+AddInventoryProduct
+AddLink
+AddLoan
+AddRelativeDiscount
+AddResource
+AddSalary
+AddSalaryPayment
+AddSocialContribution
+AddSupplierOrder
+AddThisArticle
+AddVariousPayment
+AddressesForCompany
+AdminLoginAlreadyExists
+Agendas
+AllAgreementSend
+AllExportedMovementsWereRecordedAsExported
+AllProductServicePrices
+AllProducts
+AllRIB
+AllReceptions
+AllSms
+AllWidgetsWereEnabled
+AllowCommentOnProject
+AllowCommentOnTask
+AllowUnknownPeopleSuggestBooth
+AllowUnknownPeopleSuggestConf
+AlreadyRead
+Always
+AmountByMonth
+AmountIn
+AmountInvoiced
+AmountInvoicedHT
+AmountInvoicedTTC
+AmountLT1
+AmountLT1ES
+AmountLT2
+AmountLT2ES
+AmountOfRegistrationPaid
+AmountPaymentDistributedOnInvoice
+AmountRequested
+AmountSalary
+AmountToTransfer
+AnalyticCode
+AnnualByCompanies
+AnnualByCompaniesDueDebtMode
+AnnualByCompaniesInputOutputMode
+AnnualSummaryDueDebtMode
+AnnualSummaryInputOutputMode
+AnotherContainer
+AnswerCandidature
+Answered
+ApplicantIpAddress
+ApplicantOrVisitor
+ApplyMassCategories
+ApplyPMP
+AppointmentDuration
+ApproveSms
+ApprovedBy2
+Article
+AskPrice
+AssetAccountancyCodeAcceleratedDepreciation
+AssetAccountancyCodeAsset
+AssetAccountancyCodeDepreciationAcceleratedDepreciation
+AssetAccountancyCodeDepreciationAsset
+AssetAccountancyCodeDepreciationEconomic
+AssetAccountancyCodeDepreciationExpense
+AssetAccountancyCodeEndowmentAcceleratedDepreciation
+AssetAccountancyCodeProceedsFromSales
+AssetAccountancyCodeProvisionAcceleratedDepreciation
+AssetAccountancyCodeReceivableOnAssignment
+AssetAccountancyCodeValueAssetSold
+AssetAccountancyCodeVatCollected
+AssetAccountancyCodeVatDeductible
+AssetAcquisitionType
+AssetAcquisitionTypeNew
+AssetAcquisitionTypeOccasion
+AssetAcquisitionValueHT
+AssetDateAcquisition
+AssetDateStart
+AssetDepreciationOptionAcceleratedDepreciation
+AssetDepreciationOptionAmountBaseDeductibleHT
+AssetDepreciationOptionAmountBaseDepreciationHT
+AssetDepreciationOptionDegressiveRate
+AssetDepreciationOptionDepreciationType
+AssetDepreciationOptionDepreciationTypeDegressive
+AssetDepreciationOptionDepreciationTypeExceptional
+AssetDepreciationOptionDepreciationTypeLinear
+AssetDepreciationOptionDuration
+AssetDepreciationOptionDurationType
+AssetDepreciationOptionDurationTypeAnnual
+AssetDepreciationOptionDurationTypeDaily
+AssetDepreciationOptionDurationTypeMonthly
+AssetDepreciationOptionEconomic
+AssetDepreciationOptionRate
+AssetDepreciationOptionTotalAmountLastDepreciationHT
+AssetNotDepreciated
+AssetNumber
+AssetRecorded
+AssetRecoveredVAT
+AssetReversalAmountHT
+AssetReversalDate
+AssetType
+AssetTypeFinancial
+AssetTypeInProgress
+AssetTypeIntangible
+AssetTypeTangible
+AssetsLines
+AssetsType
+AssetsTypeId
+AssetsTypeLabel
+AssetsTypes
+AssignDedicatedAccountingAccount
+AssignTask
+Assigned
+AssociatedProductsNumber
+AttachJoinedDocumentsToObject
+AucuneLigne
+AutoFillFormFieldBeforeSubmit
+AutomaticClosing
+Automation
+AvailabilityTypeAV_1M
+AvailabilityTypeAV_1W
+AvailabilityTypeAV_2W
+AvailabilityTypeAV_3W
+AvailabilityTypeAV_NOW
+BICNumber
+BILL_DELETEInDolibarr
+BILL_SUPPLIER_DELETEInDolibarr
+BOMLine
+BOM_CLOSEInDolibarr
+BOM_DELETEInDolibarr
+BOM_REOPENInDolibarr
+BOM_UNVALIDATEInDolibarr
+BOM_VALIDATEInDolibarr
+BOOKCAL_PUBLIC_INTERFACE_TOPIC
+BackOffice
+BackToChartofaccounts
+BackToHelpCenter
+BackToHomePage
+Balancing
+BankAccountNumberKey
+BankCode
+BankColorizeMovementName1
+BankColorizeMovementName2
+BankDetails
+BankLineNotReconciled
+BankToPay
+BankTransactionForCategory
+BankTransferPayment
+BankTransferRequestsDone
+BankTransfers
+Banner
+BarcodeDescC128
+BarcodeDescC39
+BarcodeDescDATAMATRIX
+BarcodeDescEAN13
+BarcodeDescEAN8
+BarcodeDescISBN
+BarcodeDescQRCODE
+BarcodeDescUPC
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry
+BillAddress
+BillOfMaterialsLines
+BillShortStatusClosedPaidPartially
+BillShortStatusClosedUnpaid
+BillShortStatusConverted
+BillShortStatusNotRefunded
+BillShortStatusPaidBackOrConverted
+BillShortStatusStarted
+BillStatus
+BillStatusNotRefunded
+BillsAndSalaries
+BillsCustomer
+BillsCustomersUnpaidForCompany
+BillsLate
+BillsSuppliersUnpaidForCompany
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation
+BlockedLogAreRequiredByYourCountryLegislation
+BlockedLogBillDownload
+BlockedLogBillPreview
+BlockedlogInfoDialog
+BlogPost
+BodyNotIn
+BomAndBomLines
+BookCalAbout
+BookCalAboutPage
+BookcalLabelAvailabilityHelp
+BookeppingLineAlreayExists
+Booking
+BookmarksMenuShortCut
+Boolean
+Bottom
+BoxCurrentAccounts
+BoxCustomersOutstandingBillReached
+BoxDolibarrStateBoard
+BoxFicheInter
+BoxGlobalActivity
+BoxGoodCustomers
+BoxLastActions
+BoxLastContacts
+BoxLastContracts
+BoxLastCustomerBills
+BoxLastCustomerOrders
+BoxLastCustomerShipments
+BoxLastCustomers
+BoxLastKnowledgerecordModifiedContent
+BoxLastManualEntries
+BoxLastMembers
+BoxLastMembersSubscriptions
+BoxLastModifiedMembers
+BoxLastProducts
+BoxLastProposals
+BoxLastProspects
+BoxLastRssInfos
+BoxLastSupplierBills
+BoxLastSuppliers
+BoxLatestSupplierOrders
+BoxLatestSupplierOrdersAwaitingReception
+BoxOldestActions
+BoxOldestExpiredServices
+BoxOldestUnpaidCustomerBills
+BoxOldestUnpaidSupplierBills
+BoxProductsAlertStock
+BoxSuspenseAccount
+BoxTicketLastXDayswidget
+BoxTitleLastActionsToDo
+BoxTitleLastCustomersOrProspects
+BoxTitleLastModifiedCustomerBills
+BoxTitleLastModifiedCustomerOrders
+BoxTitleLastModifiedPropals
+BoxTitleLastModifiedSupplierBills
+BoxTitleLatestModifiedSupplierOrders
+BoxesActivated
+BoxesAvailable
+BrowserMethodDescription
+BugTracker
+Build
+BulkActions
+BuyingPriceNumShort
+ByAccounts
+ByCountry
+ByDate
+ByDay
+ByDefaultInList
+ByExpenseIncome
+ByMonth
+BySalesRepresentative
+ByTown
+CANCELInDolibarr
+COMPANY_DELETEInDolibarr
+CONTACT_DELETEInDolibarr
+CONTRACT_DELETEInDolibarr
+CREATEInDolibarr
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT
+CRUDCreateWrite
+CRUDRead
+CalcModeEngagement
+CalcModeLT1
+CalcModeLT1Debt
+CalcModeLT1Rec
+CalcModeLT2
+CalcModeLT2Rec
+CalcModeVATDebt
+CalcModeVATEngagement
+CancelPartnershipForExpiredMembers
+CancelUpdate
+CancelUpload
+CanceledById
+CanceledByLogin
+CannotRemoveDirectoryContainsFiles
+CannotRemoveDirectoryContainsFilesOrDirs
+CantSuggest
+CardBill
+CardContent
+CardProduct0
+CardProduct1
+Cards
+CashAccounts
+CashDeskBankCB
+CashDeskBankCash
+CashDeskBankCheque
+CashDeskMenu
+CashDeskOn
+CashDeskProducts
+CashDeskStock
+CashDeskThirdParty
+CashDeskWarehouse
+CashDeskYouDidNotDisableStockDecease
+CashFence
+CatContactList
+CatContactsLinks
+CatCusLinks
+CatCusList
+CatList
+CatListAll
+CatMemberList
+CatMembersLinks
+CatProdLinks
+CatProdList
+CatProjectsLinks
+CatProjectsList
+CatSupLinks
+CatSupList
+CatUsersLinks
+CatUsersList
+CategId
+CategTypeNotFound
+CategoryDeleted
+ChartofaccountsId
+CheckBank
+ChequeBordereau
+ChequesReceipts
+Choose
+ChooseCategory
+ChooseProduct/Service
+ChooseYourDemoProfilMore
+CivilityCode
+CivilityDR
+CivilityMLE
+CivilityMME
+CivilityMMEShort
+CivilityMR
+CivilityMRShort
+CivilityMTRE
+ClassCreditedConfirm
+ClassNotFoundIntoPathWarning
+Classify
+ClassifyBill
+ClassifyClosed
+ClassifyUnbilled
+CleanFixHistory
+CleanHistory
+CleanUnfinishedCronjob
+CleanUnfinishedCronjobShort
+ClickToRefresh
+CloneCombinationsProduct
+CloseBill
+CloseEtablishment
+CloseFiscalYear
+CloseProcessedOrdersAutomatically
+CloseService
+Closed2
+ClosedById
+ClosedByLogin
+Closing
+CodeLastResult
+CodePaymentMode
+Codemulticurrency
+CollapseBOMHelp
+ColumnNewPMP
+Commercial
+CommercialProposal
+CommercialProposalsShort
+CompanyHasCreditNote
+CompanyHasDownPaymentOrCommercialDiscount
+CompanyHasNoCategory
+CompanyIsInCustomersCategories
+CompanyIsInSuppliersCategories
+CompatibleAfterUpdate
+CompatibleUpTo
+Completed
+CompressSyslogs
+Conciliated
+Conciliation
+ConfAttendeeSubscriptionConfirmation
+ConferenceAttendeeFee
+ConferenceOrBoothInformation
+ConfirmActivateService
+ConfirmClassifyPaidPartiallyReasonAvoir
+ConfirmClassifyPaidPartiallyReasonAvoirDesc
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc
+ConfirmClassifyPaidPartiallyReasonDiscountVat
+ConfirmClassifyPaidPartiallyReasonOther
+ConfirmClassifyPaidPartiallyReasonOtherDesc
+ConfirmClassifyPaidPartiallyReasonProductReturned
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc
+ConfirmClonePage
+ConfirmCloseService
+ConfirmDeleteAsset
+ConfirmDeleteAssetType
+ConfirmDeleteCptCategory
+ConfirmDeleteMvtPartial
+ConfirmFlushInventory
+ConfirmMassCloneQuestion
+ConfirmMassCloneToOneProject
+ConfirmPasswordReset
+ConfirmSendCardByMail
+ConfirmValidSms
+ConsumptionEfficiency
+ContactCreatedByEmailCollector
+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
+ContactHasNoCategory
+ContactId
+ContactIsInCategories
+ContentsNotVisibleByAllShort
+ContentsVisibleByAllShort
+Continue
+ContractEndDate
+ContractLines
+ContractStartDate
+ContractsAndLine
+Copy
+CorporateHomePage
+CountLastUrlCheckError
+CountryCode
+CreateAccount
+CreateBanque
+CreateBookmark
+CreateCalcSchedule
+CreateCandidature
+CreateDraft
+CreateDraftIntervention
+CreateGuichet
+CreateLeadAndThirdParty
+CreateMailing
+CreateSms
+CreateTicketAndThirdParty
+CreatedById
+CreatedByLogin
+CreditTransferFile
+CronAdd
+CronId
+CurentlyUsingPhysicalStock
+CurentlyUsingVirtualStock
+CurrencyAUD
+CurrencyCAD
+CurrencyCHF
+CurrencyCentEUR
+CurrencyCentINR
+CurrencyCentSingEUR
+CurrencyCentSingINR
+CurrencyCode
+CurrencyCodeId
+CurrencyEUR
+CurrencyFRF
+CurrencyGBP
+CurrencyINR
+CurrencyMAD
+CurrencyMGA
+CurrencyMUR
+CurrencyNOK
+CurrencyPrice
+CurrencySingAUD
+CurrencySingCAD
+CurrencySingCHF
+CurrencySingEUR
+CurrencySingFRF
+CurrencySingGBP
+CurrencySingINR
+CurrencySingMAD
+CurrencySingMGA
+CurrencySingMUR
+CurrencySingNOK
+CurrencySingTND
+CurrencySingUAH
+CurrencySingUSD
+CurrencySingXAF
+CurrencySingXOF
+CurrencySingXPF
+CurrencyTND
+CurrencyThousandthSingTND
+CurrencyUAH
+CurrencyUSD
+CurrencyUnitPrice
+CurrencyXAF
+CurrencyXOF
+CurrencyXPF
+Currencyeuros
+CurrentAccounts
+CurrentDedicatedAccountingAccount
+CurrentPA
+CurrentProductPrice
+CurrentSalary
+CurrentStock
+CurrentTranslationString
+CurrentValue
+CustomReceipt
+CustomerCard
+CustomerCodeShort
+CustomerIBAN
+CustomerInvoicePayment
+CustomerInvoicePaymentBack
+CustomersInvoicesAndInvoiceLines
+CustomersInvoicesAndPayments
+CustomersOrdersAndOrdersLines
+Cut
+DATAPOLICYJob
+DATAPOLICYReturn
+DATAPOLICY_ADHERENT
+DATAPOLICY_BLOCKCHECKBOX
+DATAPOLICY_CONTACT_CLIENT
+DATAPOLICY_CONTACT_FOURNISSEUR
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT
+DATAPOLICY_CONTACT_PROSPECT
+DATAPOLICY_CONTACT_PROSPECT_CLIENT
+DATAPOLICY_PORTABILITE
+DATAPOLICY_TIERS_CLIENT
+DATAPOLICY_TIERS_FOURNISSEUR
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT
+DATAPOLICY_TIERS_PROSPECT
+DATAPOLICY_TIERS_PROSPECT_CLIENT
+DAV_ALLOW_ECM_DIR
+DAV_ALLOW_ECM_DIRTooltip
+DAV_ALLOW_PRIVATE_DIR
+DAV_ALLOW_PRIVATE_DIRTooltip
+DAV_ALLOW_PUBLIC_DIR
+DAV_ALLOW_PUBLIC_DIRTooltip
+DELETEInDolibarr
+DOL_ACTIVATE_BUZZER
+DOL_ALIGN_CENTER
+DOL_ALIGN_LEFT
+DOL_ALIGN_RIGHT
+DOL_BEEP
+DOL_BEEP_ALTERNATIVE
+DOL_BOLD
+DOL_BOLD_DISABLED
+DOL_CUT_PAPER_FULL
+DOL_CUT_PAPER_PARTIAL
+DOL_DEFAULT_HEIGHT_WIDTH
+DOL_DOUBLE_HEIGHT
+DOL_DOUBLE_WIDTH
+DOL_LINE_FEED
+DOL_LINE_FEED_REVERSE
+DOL_PRINT_BARCODE
+DOL_PRINT_BARCODE_CUSTOMER_ID
+DOL_PRINT_CURR_DATE
+DOL_PRINT_LOGO
+DOL_PRINT_LOGO_OLD
+DOL_PRINT_OBJECT_LINES
+DOL_PRINT_QRCODE
+DOL_PRINT_TEXT
+DOL_UNDERLINE
+DOL_UNDERLINE_DISABLED
+DOL_USE_FONT_A
+DOL_USE_FONT_B
+DOL_USE_FONT_C
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE
+DOL_VALUE_CUSTOMER_FIRSTNAME
+DOL_VALUE_CUSTOMER_LASTNAME
+DOL_VALUE_CUSTOMER_MAIL
+DOL_VALUE_CUSTOMER_MOBILE
+DOL_VALUE_CUSTOMER_PHONE
+DOL_VALUE_CUSTOMER_POINTS
+DOL_VALUE_CUSTOMER_SKYPE
+DOL_VALUE_CUSTOMER_TAX_NUMBER
+DOL_VALUE_DAY
+DOL_VALUE_DAY_LETTERS
+DOL_VALUE_MONTH
+DOL_VALUE_MONTH_LETTERS
+DOL_VALUE_MYSOC_NAME
+DOL_VALUE_OBJECT_POINTS
+DONATION_ACCOUNTINGACCOUNT
+DataCodeIDSourceIsInsertedInto
+DataComeFromNoWhere
+DataIDSourceIsInsertedInto
+DataIsInsertedInto
+DataUsedToSuggestAccount
+DateActionBegin
+DateAndHour
+DateAndTime
+DateEmploymentEnd
+DateEmploymentStart
+DateEndEvent
+DateEndInMonth
+DateEndPlannedMo
+DateFormatYYYYMM
+DateFormatYYYYMMDD
+DateFormatYYYYMMDDHHMM
+DateInvoiceWithTime
+DateLastCollectResult
+DateLastGenerationShort
+DateLastLogin
+DateLastcollectResultOk
+DateLimit
+DateMovement
+DateMustBeAfterThan
+DateMustBeBeforeThan
+DateOfLine
+DatePartnershipEnd
+DatePartnershipStart
+DatePreviousLogin
+DateSending
+DateStartEvent
+DateStartInMonth
+DateStartPlannedMo
+DebugBarDesc
+Deductible
+DefaultCategoryCar
+DefaultPaymentConditionsRetainedWarranty
+DefaultPrice
+DefaultPrinter
+DefaultPuttingDescUpToDate
+DefaultPuttingPricesUpToDate
+DefaultRIB
+DefaultRangeNumber
+Defaultfortype
+DefineEventUserCP
+Delays_MAIN_DELAY_ACTIONS_TODO
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED
+Delays_MAIN_DELAY_EXPENSEREPORTS
+Delays_MAIN_DELAY_HOLIDAYS
+Delays_MAIN_DELAY_MEMBERS
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE
+Delays_MAIN_DELAY_PROPALS_TO_BILL
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE
+Delays_MAIN_DELAY_RUNNING_SERVICES
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS
+Delays_MAIN_DELAY_TASKS_TODO
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE
+DeleteASms
+DeleteAnAssetType
+DeleteArticle
+DeleteCptCategory
+DeleteSms
+DemandReasonTypeSRC_CAMP_EMAIL
+DemandReasonTypeSRC_CAMP_FAX
+DemandReasonTypeSRC_CAMP_MAIL
+DemandReasonTypeSRC_CAMP_PHO
+DemandReasonTypeSRC_COMM
+DemandReasonTypeSRC_EMPLOYEE
+DemandReasonTypeSRC_INTE
+DemandReasonTypeSRC_PARTNER
+DemandReasonTypeSRC_SHOP
+DemandReasonTypeSRC_SPONSORING
+DemandReasonTypeSRC_SRC_CUSTOMER
+DemandReasonTypeSRC_WOM
+DemoCompanyAll
+DemoCompanyManufacturing
+DemoCompanyProductAndStocks
+DemoCompanyServiceOnly
+DemoCompanyShopWithCashDesk
+DemoFundation
+DemoFundation2
+Denied
+DepositGenerated
+DepositId
+Deposits
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT
+DescADHERENT_CC_MAIL_FROM
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION
+DescADHERENT_MAILMAN_ADMIN_PASSWORD
+DescADHERENT_MAILMAN_LISTS
+DescADHERENT_MAILMAN_UNSUB_URL
+DescADHERENT_MAILMAN_URL
+DescADHERENT_MAIL_FROM
+DescADHERENT_SPIP_DB
+DescADHERENT_SPIP_PASS
+DescADHERENT_SPIP_SERVEUR
+DescADHERENT_SPIP_USER
+DescThirdPartyReport
+DescWareHouse
+DescriptionLong
+DescriptionOfLine
+DeskCode
+DetailByAccount
+DictionaryAccountancyJournal
+DictionaryAccountancysystem
+DictionaryActions
+DictionaryAssetDisposalType
+DictionaryAvailability
+DictionaryBatchStatus
+DictionaryCanton
+DictionaryCivility
+DictionaryCompanyJuridicalType
+DictionaryCompanyType
+DictionaryCountry
+DictionaryCurrency
+DictionaryDepartment
+DictionaryEMailTemplates
+DictionaryEcotaxe
+DictionaryExpenseTaxCat
+DictionaryExpenseTaxRange
+DictionaryFees
+DictionaryFormatCards
+DictionaryFunction
+DictionaryHolidayTypes
+DictionaryInvoiceSubtype
+DictionaryMeasuringUnits
+DictionaryOpportunityStatus
+DictionaryOrderMethods
+DictionaryPaymentConditions
+DictionaryPaymentModes
+DictionaryProductNature
+DictionaryProspectContactLevel
+DictionaryProspectContactStatus
+DictionaryProspectLevel
+DictionaryProspectStatus
+DictionaryPublicHolidays
+DictionaryRegion
+DictionaryResourceType
+DictionarySendingMethods
+DictionarySocialContributions
+DictionarySocialNetworks
+DictionarySource
+DictionaryStaff
+DictionaryTransportMode
+DictionaryTypeContact
+DictionaryTypeOfContainer
+DictionaryUnits
+Difference
+DirectPrint
+Disassemble
+Dispatch
+DispatchVerb
+DoCreditTransferBeforePayments3
+DoNotAutofillButAutoConcat
+DoNotRemovePreviousCombinations
+DoNotShowMyTasksOnly
+DoNotUseDescriptionOfProdut
+DoNotUseInProduction
+DoTest
+Docref
+DocumentModelStandard
+Documents2
+DolibarrReceiptPrinter
+DontForgetCreateTokenOauthMod
+DraftInvoiceDeleted
+DraftPropals
+DraftSuppliersOrders
+Drafts
+DurationEffective
+DurationOfLine
+DurationOfRange
+Dynamiccontent
+EMailHostPort
+EMailRecipient
+EMailTextProposalClosedRefusedWeb
+EMailTextProposalClosedSignedWeb
+ENABLEDISABLEInDolibarr
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF
+EVENTORGANIZATION_FILTERATTENDEES_CAT
+EVENTORGANIZATION_FILTERATTENDEES_TYPE
+EVENTORGANIZATION_SECUREKEY
+EVENTORGANIZATION_TASK_LABEL
+EVENTORGANIZATION_TASK_LABELTooltip
+EVENTORGANIZATION_TASK_LABELTooltip2
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER
+EXPENSE_REPORT_APPROVEInDolibarr
+EXPENSE_REPORT_CREATEInDolibarr
+EXPENSE_REPORT_DELETEInDolibarr
+EXPENSE_REPORT_REFUSEDInDolibarr
+EXPENSE_REPORT_VALIDATEInDolibarr
+EX_BRE
+EX_CAM
+EX_CAM_VP
+EX_CAR
+EX_CUR
+EX_DOC
+EX_EMM
+EX_FUE
+EX_FUE_VP
+EX_GUM
+EX_HOT
+EX_IND
+EX_KME
+EX_OTR
+EX_PAR
+EX_PAR_VP
+EX_POS
+EX_SUM
+EX_SUO
+EX_TAX
+EX_TOL
+EX_TOL_VP
+EarlyClosingComment
+EarlyClosingReason
+EditMailing
+EditMedias
+EditMenu
+EditPassword
+EditProductCombinations
+EditSms
+EmailCollectorDescription
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc
+EmailCollectorTargetDir
+EmailRecruiter
+EmployeeFirstname
+EmployeeLastname
+EmployeeSkillsUpdated
+EmployeesInThisPosition
+EmptyPage
+EnableFeatureFor
+EnabledAndDisabled
+EndPointFor
+EndSubscription
+ErrNoSkillSelected
+ErrUnzipFails
+ErrorAVirtualProductCantBeUsedIntoABomOrMo
+ErrorAccountingJournalIsAlreadyUse
+ErrorActionCommPropertyUserowneridNotDefined
+ErrorAddEventToUserCP
+ErrorBadBarCodeSyntax
+ErrorBadCustomerCodeSyntax
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor
+ErrorBadMaskBadRazMonth
+ErrorBadMaskFailedToLocatePosOfSequence
+ErrorBadSupplierCodeSyntax
+ErrorBadThirdPartyName
+ErrorBadValueForParamNotAString
+ErrorBankReceiptAlreadyExists
+ErrorBarCodeAlreadyUsed
+ErrorBarCodeRequired
+ErrorBillNotFound
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder
+ErrorCannotAddThisParentWarehouse
+ErrorCantDeletePaymentReconciliated
+ErrorCantDeletePaymentSharedWithPayedInvoice
+ErrorCantSaveADoneUserWithZeroPercentage
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove
+ErrorCantUseRazIfNoYearInMask
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask
+ErrorCounterMustHaveMoreThan3Digits
+ErrorCreateBankAccount
+ErrorCreatingProductAttributeValue
+ErrorCustomerCodeAlreadyUsed
+ErrorCustomerCodeRequired
+ErrorDeleteLineNotAllowedByObjectStatus
+ErrorDeleteNotPossibleLineIsConsolidated
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible
+ErrorDeletingGeneratedProducts
+ErrorDescRequiredForFreeProductLines
+ErrorDirNotWritable
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice
+ErrorEqualModule
+ErrorFailedToLoadRSSFile
+ErrorFeatureNeedJavascript
+ErrorFicheinterCompanyDoesNotExist
+ErrorFieldMustHaveXChar
+ErrorFileAlreadyExists
+ErrorInvalidSubtype
+ErrorInvoiceLoadThirdParty
+ErrorInvoiceLoadThirdPartyKey
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother
+ErrorLanguageOfTranslatedPageIsSameThanThisPage
+ErrorLoginDisabled
+ErrorLoginDoesNotExists
+ErrorLoginHasNoEmail
+ErrorMandatoryParametersNotProvided
+ErrorMaxNumberReachForThisMask
+ErrorNewRefIsAlreadyUsed
+ErrorNoImagickReadimage
+ErrorNoTmpDir
+ErrorPROJECTLEADERRoleMissingRestoreIt
+ErrorPartialFile
+ErrorPaymentConditionsNotEligibleToDepositCreation
+ErrorPrefixRequired
+ErrorPriceCantBeLowerThanMinPrice
+ErrorPriceExpression1
+ErrorPriceExpression10
+ErrorPriceExpression11
+ErrorPriceExpression14
+ErrorPriceExpression17
+ErrorPriceExpression19
+ErrorPriceExpression2
+ErrorPriceExpression20
+ErrorPriceExpression21
+ErrorPriceExpression22
+ErrorPriceExpression23
+ErrorPriceExpression24
+ErrorPriceExpression3
+ErrorPriceExpression4
+ErrorPriceExpression5
+ErrorPriceExpression6
+ErrorPriceExpression8
+ErrorPriceExpression9
+ErrorPropalNotFound
+ErrorRecordAlreadyInAccountingDeletionNotPossible
+ErrorRecordIsUsedCantDelete
+ErrorReplaceStringEmpty
+ErrorSmsRecipientIsEmpty
+ErrorSubjectIsRequired
+ErrorSupplierCodeAlreadyUsed
+ErrorSupplierCodeRequired
+ErrorThereIsSomeDeliveries
+ErrorThirdpartiesMerge
+ErrorThirpdartyOrMemberidIsMandatory
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved
+ErrorThisPaymentModeIsNotSepa
+ErrorTicketRefRequired
+ErrorTitleAlreadyExists
+ErrorUpdateRate
+ErrorUploadBlockedByAddon
+ErrorUploadFileDragDrop
+ErrorUploadFileDragDropPermissionDenied
+ErrorVATIntraNotConfigured
+ErrorWebServerUserHasNotPermission
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined
+Error_EXPENSEREPORT_ADDON_NotDefined
+Error_OrderNotChecked
+Errors
+EscompteOffered
+EstimatedDuration
+EstimatedDurationDesc
+EstimatedStockValue
+EstimatedStockValueSell
+EvenUnsubscribeDesc
+EventOrganizationConferenceOrBoothMenuLeft
+EventOrganizationDescription
+EventOrganizationEmailAskBooth
+EventOrganizationEmailAskConf
+EventOrganizationEmailBoothPayment
+EventOrganizationEmailRegistrationPayment
+EventOrganizationMassEmailAttendees
+EventOrganizationMassEmailSpeakers
+EventOrganizationMenuLeft
+EventOrganizationSetup
+EventType
+EventUserModified
+EvntOrgCancelled
+EvntOrgConfirmed
+EvntOrgDone
+EvntOrgDraft
+EvntOrgDuration
+EvntOrgNotQualified
+EvntOrgRegistrationBoothHelpMessage
+EvntOrgRegistrationBoothWelcomeMessage
+EvntOrgRegistrationConfHelpMessage
+EvntOrgRegistrationConfWelcomeMessage
+EvntOrgSuggested
+Excel95FormatDesc
+ExcessPaidMulticurrency
+ExcessReceivedMulticurrency
+ExitEditMode
+ExpAuto10CV
+ExpAuto10PCV
+ExpAuto11CV
+ExpAuto11PCV
+ExpAuto12CV
+ExpAuto12PCV
+ExpAuto13PCV
+ExpAuto3CV
+ExpAuto3PCV
+ExpAuto4CV
+ExpAuto4PCV
+ExpAuto5CV
+ExpAuto5PCV
+ExpAuto6CV
+ExpAuto6PCV
+ExpAuto7CV
+ExpAuto7PCV
+ExpAuto8CV
+ExpAuto8PCV
+ExpAuto9CV
+ExpAuto9PCV
+ExpAutoCat
+ExpCyclo
+ExpCycloCat
+ExpMoto12CV
+ExpMoto345CV
+ExpMoto5PCV
+ExpMotoCat
+ExpenseRangeOffset
+ExpenseReportJournal
+ExpenseReportLine
+ExpenseReportRuleErrorOnSave
+ExpenseReportsJournal
+ExpenseReportsRulesSetup
+ExportCardToFormat
+ExportDataset_banque_1
+ExportDataset_banque_2
+ExportDataset_company_1
+ExportDataset_company_2
+ExportDataset_event1
+ExportDataset_fournisseur_1
+ExportDataset_fournisseur_2
+ExportDataset_fournisseur_3
+ExportDataset_invoice_1
+ExportDataset_invoice_2
+ExportDataset_member_1
+ExportDataset_produit_1
+ExportDataset_service_1
+ExportDataset_tax_1
+ExportDataset_ticket_1
+ExportDataset_user_1
+ExportNotSupported
+ExportSetup
+Exports
+ExternalRef
+ExternalURLMustStartWithHttp
+ExternalWarehouse
+ExtraInfos
+ExtrafieldCheckBox
+ExtrafieldCheckBoxFromList
+ExtrafieldIP
+ExtrafieldLink
+ExtrafieldMail
+ExtrafieldParamHelpcheckbox
+ExtrafieldParamHelpradio
+ExtrafieldPassword
+ExtrafieldPhone
+ExtrafieldPrice
+ExtrafieldPriceWithCurrency
+ExtrafieldRadio
+ExtrafieldSelect
+ExtrafieldSelectList
+ExtrafieldSeparator
+ExtrafieldUrl
+FCKeditorForCompany
+FCKeditorForMail
+FCKeditorForMailing
+FCKeditorForNotePrivate
+FCKeditorForNotePublic
+FCKeditorForProductDetails
+FCKeditorForTicket
+FCKeditorForUserSignature
+FECFormatCredit
+FECFormatDebit
+FECFormatEntryDate
+FECFormatEntryNum
+FECFormatGeneralAccountLabel
+FECFormatGeneralAccountNumber
+FECFormatJournalCode
+FECFormatJournalLabel
+FECFormatLabelOperation
+FECFormatMulticurrencyAmount
+FECFormatMulticurrencyCode
+FECFormatPieceDate
+FECFormatPieceRef
+FECFormatReconcilableCode
+FECFormatReconcilableDate
+FECFormatSubledgerAccountLabel
+FECFormatSubledgerAccountNumber
+FECFormatValidateDate
+FailedToAddCodeIntoDescriptor
+Feature
+FeatureIsSupportedInInOutModeOnly
+Features
+FichinterNoContractLinked
+FieldNeedSource
+FieldTarget
+FieldTitle
+FileFormat
+FileIsTooBig
+FileUploaded
+FileWithDataToImport
+Filehtpasswd
+FilesUpdated
+FillAndSaveAccountIdAndSecret
+FilterRefOrLabelOrBC
+FinanceJournal
+FindYourSEPAMandate
+Fingerprints
+Float
+FlushInventory
+FormCreateRate
+FormUpdateRate
+FormatedExportDesc2
+FormatedExportDesc3
+FormatedImportDesc2
+FreeModule
+FrequencyPer_d
+FrequencyPer_m
+FrequencyPer_y
+FrequencyUnit
+FrontOffice
+FullPhoneNumber
+FunctionTest
+FutureManager
+FutureTransaction
+GanttView
+Gb
+GeneralOptions
+GigaBytes
+GlobalVariableUpdaterHelp0
+GlobalVariableUpdaterHelp1
+GlobalVariableUpdaterHelpFormat0
+GlobalVariableUpdaterHelpFormat1
+GlobalVariableUpdaterType0
+GlobalVariableUpdaterType1
+Go
+GoToHelpPage
+GoToListOfTimeConsumed
+GoToWikiHelpPage
+GoodBye
+GoogleAuthConfigured
+GoogleAuthNotConfigured
+GroupCard
+GroupDeleted
+HOLIDAY_APPROVEInDolibarr
+HOLIDAY_CREATEInDolibarr
+HOLIDAY_DELETEInDolibarr
+HOLIDAY_MODIFYInDolibarr
+HOLIDAY_VALIDATEInDolibarr
+HR
+HRM_DEFAULT_SKILL_DESCRIPTION
+HRM_EMAIL_EXTERNAL_SERVICE
+HRM_MAXRANK
+HTPasswordExport
+HalfDay
+HasAbsoluteDiscountFromSupplier
+HasCreditNoteFromSupplier
+HasDownPaymentOrCommercialDiscountFromSupplier
+HasNoAbsoluteDiscountFromSupplier
+HasNoRelativeDiscountFromSupplier
+HasRelativeDiscountFromSupplier
+HeightUnits
+HelpWarehouseStockTransferDestination
+HelpWarehouseStockTransferSource
+HideChildProducts
+HideOpeningBalance
+HolidayBalanceMonthlyUpdate
+HostCharset
+HtmlText
+Human
+HumanMachine
+IBANNumber
+IDCountry
+INCVATONLY
+INTRACOMMREPORT_NUM_AGREMENT
+INTRACOMMREPORT_NUM_DECLARATION
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT
+IPCreation
+IPLastLogin
+IPModification
+IPOfApplicant
+IPPreviousLogin
+IdAgenda
+IdCompany
+IdContact
+IdPaymentMode
+IdProduct
+IdProposal
+IdRecord
+IdResource
+IdSocialContribution
+IdTaskTime
+IdThirdParty
+IdTransaction
+IdWarehouse
+Identification
+IfJobIsLocatedAtAPartner
+IfModuleEnabled
+IfZeroItIsNotAVirtualProduct
+IfZeroItIsNotUsedByVirtualProduct
+ImapEncryption
+ImapEncryptionHelp
+ImportAccountingEntries
+ImportAccountingEntriesFECFormat
+ImportDatasetProjects
+ImportDatasetTasks
+ImportDataset_company_1
+ImportDataset_company_2
+ImportDataset_company_3
+ImportDataset_company_4
+ImportDataset_member_1
+ImportDataset_produit_1
+ImportDataset_resource_1
+ImportDataset_service_1
+ImportDataset_tax_contrib
+ImportDataset_tax_vat
+ImportDataset_user_1
+ImportSetup
+InWorkingOrder
+IncludeClosedAccount
+IncludeDocsAlreadyExported
+IncludePath
+IndependantSubProductStock
+InfosWorkflowCP
+InitAccountancy
+InputDetail
+Int
+InterDateCreation
+InterDuration
+InterId
+InterLine
+InterLineDate
+InterLineDesc
+InterLineDuration
+InterLineId
+InterNote
+InterStatus
+InternalWarehouse
+InterventionCardsAndInterventionLines
+IntoAccount
+IntracommReportAbout
+IntracommReportDownload
+IntracommReportNumber
+IntracommReportPeriod
+IntracommReportTypeDeclaration
+IntracommunityVATNumber
+InventoryDate
+InventoryFlushed
+InventoryForASpecificProduct
+InventoryForASpecificWarehouse
+InvoiceAutoValidate
+InvoiceDateCreation
+InvoiceDeleted
+InvoiceDepositAsk
+InvoiceDiscount
+InvoiceID
+InvoiceLabel
+InvoiceLine
+InvoiceLinesToDispatch
+InvoiceNotChecked
+InvoiceNote
+InvoicePaidCompletely
+InvoicePaidCompletelyHelp
+InvoiceProFormaAsk
+InvoiceProFormaDesc
+InvoiceReplacementShort
+InvoiceSituationLast
+InvoiceStandardShort
+InvoiceStatus
+InvoiceValidatedInDolibarrFromPos
+IsAnAnswer
+IsNotADraft
+IsNotAnAnswer
+ItemsCount
+JSOnPaimentBill
+JobCard
+JobLabel
+JournalFinancial
+JournalLabel
+JuridicalStatus200
+KeepDefaultValuesDeb
+KeepDefaultValuesMamp
+KeepDefaultValuesProxmox
+KeepDefaultValuesWamp
+KeepEmptyForAsap
+KnowledgeManagementAbout
+KnowledgeManagementAboutPage
+KnowledgeManagementSetup
+KnowledgemanagementsCategoriesArea
+LDAPFieldSkype
+LDAPFieldSkypeExample
+LEAVE_OTHER
+LEAVE_PAID
+LEAVE_PAID_FR
+LEAVE_SICK
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE
+LOAN_ACCOUNTING_ACCOUNT_INTEREST
+LT1
+LT1Customer
+LT1CustomerES
+LT1CustomerIN
+LT1ES
+LT1GC
+LT1IN
+LT1Paid
+LT1PaidES
+LT1PaidIN
+LT1Payment
+LT1PaymentES
+LT1Payments
+LT1PaymentsES
+LT1ReportByCustomers
+LT1ReportByCustomersES
+LT1ReportByMonth
+LT1ReportByQuarters
+LT1ReportByQuartersES
+LT1Summary
+LT1SummaryES
+LT1SummaryIN
+LT1Supplier
+LT1SupplierES
+LT1SupplierIN
+LT1Type
+LT2
+LT2Customer
+LT2CustomerES
+LT2CustomerIN
+LT2ES
+LT2IN
+LT2Paid
+LT2PaidES
+LT2PaidIN
+LT2Payment
+LT2PaymentES
+LT2Payments
+LT2PaymentsES
+LT2ReportByCustomers
+LT2ReportByCustomersES
+LT2ReportByMonth
+LT2ReportByQuarters
+LT2ReportByQuartersES
+LT2Summary
+LT2SummaryES
+LT2SummaryIN
+LT2Supplier
+LT2SupplierES
+LT2SupplierIN
+LT2Type
+LabelContrib
+LabelPaymentMode
+LabelRIB
+Language_en_US_es_MX_etc
+LastBills
+LastCheckBacklink
+LastMembersModified
+LastOrders
+LastPA
+LastPasswordChangeDate
+LastResult
+LatestProjects
+LatestSupplierTemplateInvoices
+LatestTemplateInvoices
+LawApplicationPart1
+LawApplicationPart2
+LawApplicationPart3
+LawApplicationPart4
+Lead
+LeadOrProject
+LeadTimeForWarning
+LeaveId
+LeaveRequestCreationBlockedBecauseBalanceIsNegative
+LengthUnitcm
+LengthUnitdm
+LengthUnitm
+LengthUnitmm
+LengthUnits
+Library
+License
+LieuWareHouse
+Limit
+LimitedLiabilityCompanyCapital
+Limits
+LineAlreadyDispatched
+LineBuyPriceHT
+LineDescription
+LineDiscount
+LineID
+LineLabel
+LineQty
+LineTotalHT
+LineTotalTTC
+LineTotalVAT
+LineUnitPrice
+LineVATRate
+LinkToAContract
+LinkToContract
+LinkToExpedition
+LinkToGoldMember
+LinkToIntervention
+LinkToInvoice
+LinkToMo
+LinkToOrder
+LinkToParentMenu
+LinkToProposal
+LinkToSupplierInvoice
+LinkToSupplierOrder
+LinkToSupplierProposal
+LinkToTemplateInvoice
+LinkToTicket
+LinkedFichinter
+LinkedOrder
+ListActionsAssociatedProject
+ListBankTransactions
+ListContractAssociatedProject
+ListCurrencyRate
+ListDonationsAssociatedProject
+ListExpenseReportsAssociatedProject
+ListFichinterAssociatedProject
+ListInventory
+ListInvoicesAssociatedProject
+ListKnowledgeRecord
+ListLoanAssociatedProject
+ListMOAssociatedProject
+ListMouvementStockProject
+ListOfAvailableAPIs
+ListOfCandidatures
+ListOfContracts
+ListOfCustomers
+ListOfEMailings
+ListOfEmployees
+ListOfEvents
+ListOfFees
+ListOfInterventions
+ListOfInventories
+ListOfNotificationsPerUser
+ListOfNotificationsPerUserOrContact
+ListOfOrders
+ListOfPartnerships
+ListOfPositionsToBeFilled
+ListOfPreviousSituationInvoices
+ListOfProductsWithoutAccountingAccount
+ListOfProposals
+ListOfProspects
+ListOfSms
+ListOfSubscriptions
+ListOfSupplierOrders
+ListOfSuppliers
+ListOfThirdParties
+ListOfTrips
+ListOfWarehouses
+ListOrdersAssociatedProject
+ListPredefinedInvoicesAssociatedProject
+ListProposalsAssociatedProject
+ListSalariesAssociatedProject
+ListShippingAssociatedProject
+ListSocialContributionAssociatedProject
+ListSupplierInvoicesAssociatedProject
+ListSupplierOrdersAssociatedProject
+ListSupplierProposalsAssociatedProject
+ListToApprove
+ListVariousPaymentsAssociatedProject
+ListWarehouseAssociatedProject
+LoadContactFromEmailOrCreate
+LocalID
+LocalTax1IsNotUsed
+LocalTax1IsNotUsedDesc
+LocalTax1IsNotUsedDescES
+LocalTax1IsNotUsedES
+LocalTax1IsNotUsedExample
+LocalTax1IsNotUsedExampleES
+LocalTax1IsUsed
+LocalTax1IsUsedDesc
+LocalTax1IsUsedDescES
+LocalTax1IsUsedExample
+LocalTax1IsUsedExampleES
+LocalTax1ManagementES
+LocalTax2IsNotUsed
+LocalTax2IsNotUsedDesc
+LocalTax2IsNotUsedDescES
+LocalTax2IsNotUsedES
+LocalTax2IsNotUsedExample
+LocalTax2IsNotUsedExampleES
+LocalTax2IsUsed
+LocalTax2IsUsedDesc
+LocalTax2IsUsedDescES
+LocalTax2IsUsedExample
+LocalTax2IsUsedExampleES
+LocalTax2ManagementES
+LoginEmail
+LoginOrEmail
+LogoDesc
+LogoSquarredDesc
+LogsLinesNumber
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH
+MOAndLines
+MOChild
+MODIFYInDolibarr
+MRPDescription
+MRP_MO_CANCELInDolibarr
+MRP_MO_DELETEInDolibarr
+MRP_MO_PRODUCEDInDolibarr
+MRP_MO_UNVALIDATEInDolibarr
+MRP_MO_VALIDATEInDolibarr
+Machine
+MailboxTargetDirectory
+MailingModuleDescContactsByCategory
+MailingModuleDescContactsByCompanyCategory
+MailingModuleDescContactsByFunction
+MailingModuleDescContactsWithThirdpartyFilter
+MailingModuleDescDolibarrUsers
+MailingModuleDescEmailsFromFile
+MailingModuleDescEmailsFromUser
+MailingModuleDescThirdPartiesByCategories
+MailingStatusDraft
+MailingStatusReadAndUnsubscribe
+MailingStatusSentCompletely
+MailingStatusSentPartialy
+MailingStatusValidated
+MainAccountForSubscriptionPaymentNotDefined
+MainAccountForVatPaymentNotDefined
+MainDefaultWarehouseUser
+MainDefaultWarehouseUserDesc
+MakeLocalDatabaseDump
+MakeLocalDatabaseDumpShort
+MakeSendLocalDatabaseDump
+ManagePartnership
+ManualTokenGeneration
+Manufactured
+Manufacturing
+MarkAsRead
+MaxEmailCollectPerCollect
+Mb
+MeasuringUnitTypeDesc
+MegaBytes
+MemberFirstname
+MemberHasNoCategory
+MemberIsInCategories
+MemberLastname
+MemberRef
+MemberStatusActive
+MemberTypeId
+MemberTypeLabel
+MembersAndSubscriptions
+MembersCategoryShort
+MembersHome
+MentionCategoryOfOperations0
+MentionCategoryOfOperations1
+MentionCategoryOfOperations2
+MenuAWStats
+MenuAccountancyValidationMovements
+MenuAddedSuccessfuly
+MenuAgendaGoogle
+MenuBookcalIndex
+MenuCheques
+MenuChequesReceipts
+MenuDirectPrinting
+MenuDoneActions
+MenuDoneMyActions
+MenuECM
+MenuKnowledgeRecord
+MenuKnowledgeRecordShort
+MenuLoanAccounts
+MenuMembers
+MenuResourceIndex
+MenuSpecialExpenses
+MenuTaxAndDividends
+MenuTicketMyAssign
+MenuTicketMyAssignNonClosed
+MenuToDoActions
+MenuToDoMyActions
+MergingPDFTool
+MessageSuccessfullyAdded
+MinPriceHT
+MinPriceTTC
+MoChildsDeleted
+ModeRCUR
+ModelModulesProduct
+Modelcsv_normal
+ModifiedById
+ModifiedByLogin
+ModifyMarginRates
+Module0Desc
+Module0Name
+Module10000Desc
+Module10000Name
+Module100Name
+Module105Desc
+Module105Name
+Module10Name
+Module1120Desc
+Module1120Name
+Module1200Desc
+Module1200Name
+Module1520Desc
+Module1520Name
+Module1780Desc
+Module1780Name
+Module1Desc
+Module1Name
+Module20000Desc
+Module20000Name
+Module2000Desc
+Module2000Name
+Module200Desc
+Module200Name
+Module20Desc
+Module20Name
+Module210Desc
+Module210Name
+Module2200Desc
+Module2200Name
+Module22Desc
+Module22Name
+Module2300Desc
+Module23Desc
+Module23Name
+Module2400Desc
+Module240Desc
+Module240Name
+Module2430Desc
+Module2430Name
+Module2500Desc
+Module2500Name
+Module250Desc
+Module250Name
+Module25Desc
+Module2600Desc
+Module2600Name
+Module2610Desc
+Module2610Name
+Module2660Desc
+Module2660Name
+Module2700Desc
+Module2700Name
+Module27130Desc
+Module27130Name
+Module2800Desc
+Module2900Desc
+Module2900Name
+Module2Desc
+Module2Name
+Module30Desc
+Module310Desc
+Module3200Desc
+Module3200Name
+Module320Desc
+Module320Name
+Module3300Desc
+Module3300Name
+Module330Desc
+Module330Name
+Module3400Desc
+Module3400Name
+Module39000Desc
+Module39000Name
+Module40000Desc
+Module40000Name
+Module4000Desc
+Module4000Name
+Module400Desc
+Module400Name
+Module40Desc
+Module4100Desc
+Module4100Name
+Module410Desc
+Module410Name
+Module42Desc
+Module42Name
+Module43Desc
+Module43Name
+Module49Desc
+Module49Name
+Module50000Desc
+Module50000Name
+Module5000Desc
+Module5000Name
+Module500Desc
+Module500Name
+Module50100Desc
+Module50100Name
+Module50150Desc
+Module50150Name
+Module50200Desc
+Module50200Name
+Module50300Desc
+Module50300Name
+Module50400Desc
+Module50400Name
+Module50Desc
+Module50Name
+Module510Desc
+Module510Name
+Module51Desc
+Module51Name
+Module520Desc
+Module520Name
+Module52Desc
+Module52Name
+Module53Desc
+Module53Name
+Module54000Desc
+Module54000Name
+Module54Desc
+Module54Name
+Module55000Desc
+Module55000Name
+Module55Desc
+Module55Name
+Module56000Desc
+Module56Desc
+Module56Name
+Module57Desc
+Module57Name
+Module58Desc
+Module59000Desc
+Module59000Name
+Module60000Desc
+Module60000Name
+Module6000Desc
+Module6000Name
+Module600Desc
+Module600Long
+Module60Desc
+Module60Name
+Module610Desc
+Module62000Desc
+Module62000Name
+Module63000Desc
+Module63000Name
+Module64000Desc
+Module650Desc
+Module650Name
+Module66000Desc
+Module66000Name
+Module660Desc
+Module660Name
+Module68000Desc
+Module68000Name
+Module700Desc
+Module700Name
+Module70Desc
+Module70Name
+Module75Desc
+Module75Name
+Module770Desc
+Module770Name
+Module80Desc
+Module85Desc
+Module94160Name
+ModuleAssetsDesc
+ModuleAssetsName
+ModuleBookCalDesc
+ModuleBookCalName
+ModuleBuilderDescbuildpackage
+ModuleBuilderDescdescription
+ModuleBuilderDeschooks
+ModuleBuilderDescmenus
+ModuleBuilderDescobjects
+ModuleBuilderDescpermissions
+ModuleBuilderDescspecifications
+ModuleBuilderDesctriggers
+ModuleBuilderDescwidgets
+ModuleBuilderNotAllowed
+ModuleCompanyCodeCustomerAquarium
+ModuleCompanyCodeCustomerDigitaria
+ModuleCompanyCodeDigitaria
+ModuleCompanyCodePanicum
+ModuleCompanyCodeSupplierAquarium
+ModuleCompanyCodeSupplierDigitaria
+ModuleEventOrganizationName
+ModuleFamilyExperimental
+ModuleInitialized
+ModuleKnowledgeManagementDesc
+ModulePartnershipName
+ModuleReceiptPrinterMustBeEnabled
+ModuleRecruitmentDesc
+ModuleRecruitmentName
+ModuleWebhookDesc
+ModuleWebhookName
+ModuleZapierForDolibarrDesc
+ModuleZapierForDolibarrName
+MonthOfDay
+MotifCP
+MovementId
+Mrp
+MultiCompanySetup
+MultiCurrency
+MultiCurrencySetup
+MulticurrencyCurrency
+MulticurrencySubPrice
+MulticurrencyUsed
+MutltiCurrencyAutoUpdateCurrencies
+MyContainerTitle
+MyProjects
+MySqlExportParameters
+MyTimeSpent
+MyWebsitePages
+NOT_AUTHOR
+NameOrCompany
+NameSlashCompany
+NbCheque
+NbOfGenerationDoneShort
+NbOfInvoiceToWithdrawWithInfo
+NbOfLines
+NbOfObjects
+NbOfPayments
+NbOfQtyInOrders
+NbOfQtyInProposals
+NbOfSms
+NbOfUniqueSms
+NbOfUsers
+NbOfVoters
+NbOperatorsRequired
+NbUseDaysCPShortInMonth
+NbVotes
+NeedBusinessTravels
+NeedMoreInformation
+NeedMoreInformationShort
+NetToBePaid
+NewAccountingJournal
+NewAsset
+NewAvailabilities
+NewCalendar
+NewCheckReceipt
+NewGroupCreated
+NewPayboxPaymentFailed
+NewPayboxPaymentReceived
+NewPayment
+NewProductAttribute
+NewProductAttributeValue
+NewProductCombinations
+NewSell
+NewSms
+NewSoldeCP
+NewStripePaymentFailed
+NewStripePaymentReceived
+NewSupplier
+NewUserPassword
+NextDateToExecutionShort
+NextDateToIntervention
+NoAccount
+NoArticle
+NoArticlesFoundForTheCategory
+NoCLIFile
+NoContactDefined
+NoContactDefinedForThirdParty
+NoDefaultPrinterDefined
+NoDraftBills
+NoError
+NoIntervention
+NoLimit
+NoLogForThisTicket
+NoModueToManageStockIncrease
+NoOtherDraftBills
+NoProductFound
+NoProposal
+NoRSH
+NoRSHHelp
+NoRecordedUsers
+NoResults
+NoTicketsFound
+NoTrigger
+NoTripsToExportCSV
+NoVAT
+NoneOrSeveral
+NotActiveModCP
+NotAllExportedMovementsCouldBeRecordedAsExported
+NotCompatible
+NotImportedFields
+NotMatch
+NotRead
+NotUsedFields
+NotUsedForThisCustomer
+NotUsedForThisVendor
+NoteSomeFeaturesAreDisabled
+NothingProcessed
+Notify_ACTION_CREATE
+Notify_BILL_CANCEL
+Notify_BILL_PAYED
+Notify_BILL_SENTBYMAIL
+Notify_BILL_SUPPLIER_CANCELED
+Notify_BILL_SUPPLIER_PAYED
+Notify_BILL_SUPPLIER_SENTBYMAIL
+Notify_BILL_SUPPLIER_VALIDATE
+Notify_BILL_UNVALIDATE
+Notify_BILL_VALIDATE
+Notify_COMPANY_CREATE
+Notify_COMPANY_SENTBYMAIL
+Notify_CONTRACT_VALIDATE
+Notify_EXPENSE_REPORT_APPROVE
+Notify_EXPENSE_REPORT_VALIDATE
+Notify_FICHINTER_ADD_CONTACT
+Notify_FICHINTER_CLOSE
+Notify_FICHINTER_SENTBYMAIL
+Notify_FICHINTER_VALIDATE
+Notify_HOLIDAY_APPROVE
+Notify_HOLIDAY_VALIDATE
+Notify_MEMBER_DELETE
+Notify_MEMBER_MODIFY
+Notify_MEMBER_RESILIATE
+Notify_MEMBER_SUBSCRIPTION
+Notify_MEMBER_VALIDATE
+Notify_ORDER_CLOSE
+Notify_ORDER_SENTBYMAIL
+Notify_ORDER_SUPPLIER_APPROVE
+Notify_ORDER_SUPPLIER_REFUSE
+Notify_ORDER_SUPPLIER_SENTBYMAIL
+Notify_ORDER_SUPPLIER_SUBMIT
+Notify_ORDER_SUPPLIER_VALIDATE
+Notify_ORDER_VALIDATE
+Notify_PROJECT_CREATE
+Notify_PROPAL_CLOSE_REFUSED
+Notify_PROPAL_CLOSE_SIGNED
+Notify_PROPAL_SENTBYMAIL
+Notify_PROPAL_VALIDATE
+Notify_SHIPPING_SENTBYMAIL
+Notify_SHIPPING_VALIDATE
+Notify_TASK_CREATE
+Notify_TASK_DELETE
+Notify_TASK_MODIFY
+Notify_TICKET_SENTBYMAIL
+Notify_WITHDRAW_CREDIT
+Notify_WITHDRAW_EMIT
+Notify_WITHDRAW_TRANSMIT
+NumberOf
+NumberOfUnits
+NumberOfUnitsMos
+NumeroNationalEmetter
+OAUTH_GITHUB_ID
+OAUTH_GITHUB_NAME
+OAUTH_GITHUB_SECRET
+OAUTH_GOOGLE_ID
+OAUTH_GOOGLE_NAME
+OAUTH_GOOGLE_SECRET
+OAUTH_STRIPE_LIVE_ID
+OAUTH_STRIPE_LIVE_NAME
+OAUTH_STRIPE_TEST_ID
+OAUTH_STRIPE_TEST_NAME
+ONLINE_PAYMENT_CSS_URL
+ONLINE_PAYMENT_WAREHOUSE
+ORDER_SUPPLIER_DELETEInDolibarr
+Of
+OnHold
+OneLinePerPeriod
+OneLinePerTask
+OneLinePerTimeSpentLine
+OneLinePerUser
+OnlineHelp
+OnlyActiveElementsAreExposed
+OnlyNonValid
+OnlyOpenedAccount
+OnlyProdsInStock
+OpenAnyMovement
+OpenEtablishment
+OpenFiscalYear
+OpenInternal
+OpenVerb
+OpenedProjectsByThirdparties
+OpeningBalance
+OppStatusLOST
+OppStatusNEGO
+OppStatusPENDING
+OppStatusPROPO
+OppStatusPROSP
+OppStatusQUAL
+OppStatusWON
+OpportunitiesStatusForProjects
+OptionModeProductBuyExportDesc
+OptionModeProductBuyIntraDesc
+OptionVatInfoModuleComptabilite
+OrProductsWithCategories
+OrderByDateAsc
+OrderByDateDesc
+OrderByEMail
+OrderByFax
+OrderByMail
+OrderByPhone
+OrderByWWW
+OrderCreation
+OrderDateShort
+OrderDeleted
+OrderId
+OrderLine
+OrderShowDetail
+OrdersInProcess
+OrdersOpened
+OrganizationEvenLabelName
+OrganizationEventBoothRequestWasReceived
+OrganizationEventBulkMailToAttendees
+OrganizationEventBulkMailToSpeakers
+OrganizationEventConfRequestWasReceived
+OrganizationEventLinkToThirdParty
+OriginEmail
+OtherCountriesCustomersReport
+OtherReceptionsForSameOrder
+OutOfEurope
+OutOfOrder
+OutOfProject
+PAIDInDolibarr
+PASSWORDInDolibarr
+PAYBOX_PAYONLINE_SENDEMAIL
+PAYPAL_API_SANDBOX
+PDFCrevetteDescription
+PDFCrevetteSituationInvoiceLine
+PDFCrevetteSituationInvoiceLineDecompte
+PDFCrevetteSituationInvoiceTitle
+PDFCrevetteSituationNumber
+PDFEdisonDescription
+PDF_USE_1A
+PL_HIGH
+PL_LOW
+PL_MEDIUM
+PL_NONE
+PL_UNKNOWN
+POSModule
+POSTerminal
+PRINTGCP_AUTHLINK
+PRINTGCP_INFO
+PRINTGCP_TOKEN_ACCESS
+PRINTIPP_HOST
+PRINTIPP_PASSWORD
+PRINTIPP_PORT
+PRINTIPP_USER
+PRODUCT_CREATEInDolibarr
+PRODUCT_DELETEInDolibarr
+PRODUCT_MODIFYInDolibarr
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help
+PROJECT_CREATEInDolibarr
+PROJECT_DELETEInDolibarr
+PROJECT_MODIFYInDolibarr
+PROPOSAL_PDF_HIDE_PAYMENTMODE
+PROPOSAL_PDF_HIDE_PAYMENTTERM
+PageContent
+Param
+ParentCategoryID
+ParentCategoryLabel
+ParentLine
+ParentPageId
+ParentProductOfVariant
+ParentProductsNumber
+PartnershipAbout
+PartnershipAboutPage
+PartnershipAccepted
+PartnershipAlreadyExist
+PartnershipCanceled
+PartnershipCheckBacklink
+PartnershipDedicatedToThisThirdParty
+PartnershipDescription
+PartnershipDescriptionLong
+PartnershipDraft
+PartnershipManagedFor
+PartnershipRefused
+PassEncoding
+PassedInOpenStatus
+PassedInShippedStatus
+PasswordChangeRequest
+PasswordChangeRequestSent
+Paste
+PaymentBack
+PaymentByChequeOrderedToShort
+PaymentCondition10D
+PaymentCondition10DENDMONTH
+PaymentCondition14D
+PaymentCondition14DENDMONTH
+PaymentCondition30D
+PaymentCondition30DENDMONTH
+PaymentCondition60D
+PaymentCondition60DENDMONTH
+PaymentConditionDEP30PCTDEL
+PaymentConditionPT_5050
+PaymentConditionPT_DELIVERY
+PaymentConditionPT_ORDER
+PaymentConditionRECEP
+PaymentConditionShort10D
+PaymentConditionShort10DENDMONTH
+PaymentConditionShort14D
+PaymentConditionShort14DENDMONTH
+PaymentConditionShort30D
+PaymentConditionShort30DENDMONTH
+PaymentConditionShort60D
+PaymentConditionShort60DENDMONTH
+PaymentConditionShortDEP30PCTDEL
+PaymentConditionShortPT_5050
+PaymentConditionShortPT_DELIVERY
+PaymentConditionShortPT_ORDER
+PaymentConditionShortRECEP
+PaymentConferenceAttendee
+PaymentId
+PaymentModeShort
+PaymentNote
+PaymentNumber
+PaymentRef
+PaymentRule
+PaymentSupplierInvoice
+PaymentTermsCustomer
+PaymentTermsSupplier
+PaymentTypeDC
+PaymentTypeFAC
+PaymentTypeLIQ
+PaymentTypePP
+PaymentTypePRE
+PaymentTypeShortCB
+PaymentTypeShortCHQ
+PaymentTypeShortFAC
+PaymentTypeShortPRE
+PaymentTypeShortTIP
+PaymentTypeShortTRA
+PaymentTypeShortVAD
+PaymentTypeShortVIR
+PaymentTypeTIP
+PaymentTypeTRA
+PaymentTypeVAD
+PaymentTypeVIR
+PaypalImportPayment
+PaypalOrCBDoPayment
+PermanentLeftSearchForm
+Permission10001
+Permission10002
+Permission10003
+Permission10005
+Permission1001
+Permission1002
+Permission1003
+Permission1004
+Permission1005
+Permission101
+Permission1011
+Permission1012
+Permission1014
+Permission1015
+Permission1016
+Permission102
+Permission104
+Permission105
+Permission106
+Permission109
+Permission11
+Permission1101
+Permission1102
+Permission1104
+Permission1109
+Permission111
+Permission112
+Permission1121
+Permission1122
+Permission1123
+Permission1124
+Permission1125
+Permission1126
+Permission113
+Permission114
+Permission115
+Permission116
+Permission117
+Permission1181
+Permission1182
+Permission1183
+Permission1184
+Permission1185
+Permission1186
+Permission1187
+Permission1188
+Permission1189
+Permission1191
+Permission12
+Permission1201
+Permission1202
+Permission121
+Permission122
+Permission1231
+Permission1232
+Permission1233
+Permission1234
+Permission1235
+Permission1236
+Permission1237
+Permission125
+Permission1251
+Permission126
+Permission13
+Permission130
+Permission1321
+Permission1322
+Permission14
+Permission141
+Permission142
+Permission1421
+Permission144
+Permission145
+Permission146
+Permission147
+Permission15
+Permission151
+Permission152
+Permission1521
+Permission1522
+Permission153
+Permission154
+Permission16
+Permission161
+Permission162
+Permission163
+Permission164
+Permission165
+Permission167
+Permission171
+Permission172
+Permission173
+Permission174
+Permission178
+Permission180
+Permission181
+Permission182
+Permission183
+Permission184
+Permission185
+Permission186
+Permission187
+Permission188
+Permission19
+Permission192
+Permission193
+Permission194
+Permission20001
+Permission20002
+Permission20003
+Permission20004
+Permission20005
+Permission20006
+Permission20007
+Permission202
+Permission203
+Permission204
+Permission205
+Permission206
+Permission21
+Permission211
+Permission212
+Permission213
+Permission214
+Permission215
+Permission22
+Permission221
+Permission222
+Permission223
+Permission229
+Permission23001
+Permission23002
+Permission23003
+Permission23004
+Permission23101
+Permission23102
+Permission23103
+Permission23104
+Permission237
+Permission238
+Permission239
+Permission24
+Permission2401
+Permission2402
+Permission2403
+Permission241
+Permission2411
+Permission2412
+Permission2413
+Permission2414
+Permission242
+Permission243
+Permission244
+Permission25
+Permission2501
+Permission2502
+Permission2503
+Permission251
+Permission2515
+Permission252
+Permission253
+Permission254
+Permission255
+Permission256
+Permission26
+Permission2610
+Permission262
+Permission263
+Permission27
+Permission271
+Permission272
+Permission273
+Permission28
+Permission2801
+Permission2802
+Permission281
+Permission282
+Permission283
+Permission286
+Permission291
+Permission292
+Permission293
+Permission301
+Permission304
+Permission305
+Permission31
+Permission311
+Permission312
+Permission32
+Permission3200
+Permission33
+Permission3301
+Permission331
+Permission332
+Permission333
+Permission34
+Permission341
+Permission342
+Permission343
+Permission344
+Permission351
+Permission352
+Permission353
+Permission354
+Permission358
+Permission36
+Permission38
+Permission39
+Permission40001
+Permission40002
+Permission40003
+Permission4001
+Permission4002
+Permission4003
+Permission401
+Permission402
+Permission4021
+Permission4022
+Permission4023
+Permission4025
+Permission4028
+Permission403
+Permission4031
+Permission4032
+Permission4033
+Permission404
+Permission41
+Permission42
+Permission430
+Permission44
+Permission45
+Permission50101
+Permission50151
+Permission50152
+Permission50153
+Permission50201
+Permission50202
+Permission50330
+Permission50331
+Permission50332
+Permission50401
+Permission50411
+Permission50412
+Permission50414
+Permission50415
+Permission50418
+Permission50420
+Permission50430
+Permission50440
+Permission51001
+Permission51002
+Permission51003
+Permission51005
+Permission511
+Permission512
+Permission514
+Permission517
+Permission519
+Permission520
+Permission522
+Permission524
+Permission525
+Permission527
+Permission531
+Permission532
+Permission533
+Permission534
+Permission536
+Permission538
+Permission54001
+Permission55001
+Permission55002
+Permission56001
+Permission56002
+Permission56003
+Permission56004
+Permission56005
+Permission56006
+Permission561
+Permission562
+Permission563
+Permission564
+Permission59001
+Permission59002
+Permission59003
+Permission601
+Permission602
+Permission609
+Permission61
+Permission611
+Permission612
+Permission613
+Permission62
+Permission63001
+Permission63002
+Permission63003
+Permission63004
+Permission64
+Permission64001
+Permission650
+Permission651
+Permission652
+Permission660
+Permission661
+Permission662
+Permission67
+Permission67000
+Permission68
+Permission68001
+Permission68002
+Permission68004
+Permission69
+Permission70
+Permission701
+Permission702
+Permission703
+Permission71
+Permission72
+Permission74
+Permission75
+Permission76
+Permission771
+Permission772
+Permission773
+Permission775
+Permission776
+Permission777
+Permission778
+Permission779
+Permission78
+Permission79
+Permission81
+Permission82
+Permission84
+Permission85
+Permission86
+Permission87
+Permission88
+Permission89
+Permission91
+Permission92
+Permission93
+Permission94
+Permission941601
+Permission941602
+Permission941603
+Permission941604
+Permission941605
+Permission941606
+Permission95
+PermissionAdvanced251
+PermissionAdvanced253
+PhoneNumber
+PhpWebLink
+PointOfSale
+PointOfSaleShort
+PopuCom
+PopuProp
+PossibleLanguages
+PostgreSqlExportParameters
+PredefinedGroups
+PredefinedInvoices
+PredefinedMailContentContract
+PrepareSms
+PrettyLittleSentence
+PrevSoldeCP
+PreviewSms
+PriceFormatInCurrentLanguage
+PriceLevelLabels
+PriceQtyMinHT
+PriceQtyMinHTCurrency
+PriceU
+PrintGCPDesc
+PrintIPPDesc
+PrintMethod
+PrintTestDescprintgcp
+PrintTestDescprintipp
+PrintingDriverDescprintgcp
+PrintingDriverDescprintipp
+ProductBOMHelp
+ProductBarcodeDoesNotExist
+ProductBatchDoesNotExist
+ProductCombination
+ProductCombinationGenerator
+ProductCombinationGeneratorWarning
+ProductDescriptionTranslated
+ProductDoesNotExist
+ProductFound
+ProductHasNoCategory
+ProductId
+ProductIsInCategories
+ProductLabelTranslated
+ProductNoteTranslated
+ProductQtyInReceptionAlreadySent
+ProductQtyInSuppliersReceptionAlreadyRecevied
+ProductService
+ProductSheet
+ProductStockWarehouse
+ProductVolume
+ProductWeight
+ProductsMultiPrice
+ProductsOnPurchaseOnly
+ProductsOnSaleOnly
+ProductsOnSellAndOnBuy
+ProductsOrServiceMultiPrice
+ProductsOrServicesTranslations
+ProductsPipeServices
+ProductsPricePerCustomer
+ProfId10
+ProfId10FR
+ProfId10Short
+ProfId10ShortFR
+ProfId1ShortCM
+ProfId1ShortFR
+ProfId2ShortCM
+ProfId2ShortFR
+ProfId3ShortCM
+ProfId3ShortFR
+ProfId4ShortCM
+ProfId4ShortFR
+ProfId5ShortCM
+ProfId5ShortFR
+ProfId6ShortCM
+ProfId6ShortFR
+ProfId7Short
+ProfId7ShortFR
+ProfId8Short
+ProfId8ShortFR
+ProfId9Short
+ProfId9ShortFR
+ProformaBill
+ProjectCreatedByEmailCollector
+ProjectHasNoCategory
+ProjectId
+ProjectOpenedProjectByOppStatus
+ProjectRef
+ProjectStatus
+ProjectsAndTasksLines
+ProjectsCategoriesShort
+Properties
+Property
+ProposalCard
+ProposalDeleted
+ProposalLine
+ProposalLines
+ProposalShort
+ProposalsAndProposalsLines
+ProposedRemuneration
+ProspectStatus
+ProtectAndEncryptPdfFiles
+ProtectAndEncryptPdfFilesDesc
+PublicMemberCard
+PublicMemberList
+PurchaseOrderLines
+PurchasedAmount
+PurgeDeleteTemporaryFiles
+ReConciliedBy
+Read
+RealURL
+RealValue
+ReasonDecline
+ReasonDeclineOrCancel
+ReceiptPrinter
+ReceiptPrinterMethodDescription
+ReceiptPrinterProfileDesc
+ReceiptPrinterTemplateDesc
+ReceivedPayments
+ReceptionDescription
+ReceptionLine
+ReceptionsAndReceivingForSameOrder
+RecordEvent
+RecordMovement
+RecordedQty
+RecruitmentAbout
+RecruitmentAboutPage
+RecurringInvoice
+RecurringInvoiceSource
+RecurringInvoices
+RecurringInvoicesJob
+RecurringSupplierInvoices
+RecurringSupplierInvoicesJob
+Redo
+Reductions
+ReductionsShort
+RefBill
+RefOrderSupplier
+RefOrderSupplierShort
+RefSalary
+RefSupplierShort
+RefTaskParent
+RegenerateMissingFiles
+RegionStateOrigin
+RegistrationAndPaymentWereAlreadyRecorder
+RegistrationDate
+RegulateStock
+RegulatedOn
+RegulatedQty
+RelatedBill
+RelatedBills
+RelatedCommercialProposals
+RelatedCustomerInvoices
+RelatedObjects
+RelatedRecurringCustomerInvoices
+RelatedSupplierInvoices
+RelatedTickets
+RelativeDiscount
+RemainderToTakeMulticurrency
+RemoteControlSupport
+RemoveAll
+RepeatEvent
+Repeatable
+RepeatableSupplierInvoicesList
+Repeatables
+Replenishments
+ReportByCustomers
+ReportThirdParty
+RequestedRemuneration
+RequireAtLeastXDigits
+RequireAtLeastXString
+RequireXDigitsMax
+RequiredField
+ResetSms
+ResourceNotAssignedToTheTask
+ResourcePageIndex
+ResourceTypeCode
+ResponsibleOfRecruitement
+Rest
+RestOfEurope
+RestartSelling
+RuleForWarehouse
+RulesCATotalSaleJournal
+RulesPurchaseTurnoverTotalPurchaseJournal
+Run
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc
+SEPAMandate
+SERVICE_BOOTH_LOCATION
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION
+SMSSentTo
+STRIPE_CGI_URL_V2
+STRIPE_PAYONLINE_SENDEMAIL
+SalariesAndPayments
+SalariesPaymentsOf
+SalaryInvoice
+SaleLocal
+SaleOrderLines
+SaleRepresentativeFirstname
+SaleRepresentativeLastname
+SaleRepresentativeLogin
+SalesRepresentativeMargins
+SameCountryCustomersWithVAT
+SaveAndNew
+SaveAs
+SaveQtyFirst
+SavingAccounts
+SearchACustomerInvoice
+SearchASupplierInvoice
+SearchOf
+SearchProduct
+SearchRequest
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry
+SeeInMarkerPlace
+SeeOfficalSupport
+SeeSubstitutionVars
+SeeTicket
+SeeVATReportInDueDebtMode
+SeeVATReportInInputOutputMode
+Select2MoreCharactersMore
+SelectCategory
+SelectFournisseur
+SelectImportFields
+SelectTaskToAssign
+Selectformat
+SellFinished
+SellingMinPriceTTC
+SellingPriceHT
+SellingPriceTTC
+SendAgreement
+SendAgreementText
+SendAskByMail
+SendAskRef
+SendBillByMail
+SendBillRef
+SendContractRef
+SendEmailsReminders
+SendEmailsRemindersOnInvoiceDueDate
+SendInterventionByMail
+SendInterventionRef
+SendNewPasswordLink
+SendOrderByMail
+SendOrderRef
+SendPaymentReceipt
+SendProjectRef
+SendPropalByMail
+SendPropalRef
+SendReceptionByEMail
+SendReceptionRef
+SendRemindByMail
+SendReminderBillByMail
+SendReminderBillRef
+SendReminderForExpiredSubscription
+SendReminderForExpiredSubscriptionTitle
+SendRequestCP
+SendRequestCollectiveCP
+SendShippingByEMail
+SendTo
+Sending
+SendingEmailOnAutoSubscription
+SendingEmailOnCancelation
+SendingEmailOnMemberValidation
+SendingEmailOnNewSubscription
+SendingEmailOnPartnershipAccepted
+SendingEmailOnPartnershipCanceled
+SendingEmailOnPartnershipRefused
+SendingEmailOnPartnershipWillSoonBeCanceled
+SendingReminderActionComm
+SendingReminderForExpiredSubscription
+SendingsAbility
+SentBy
+SentToSuppliers
+SentXXXmessages
+SerialNumberAlreadyInUse
+ServiceSheet
+ServicesOnPurchaseOnly
+ServicesOnSaleOnly
+ServicesOnSellAndOnBuy
+SetLinkToAnotherThirdParty
+SetRef
+SetToDisabled
+SetToEnabled
+SetWebsiteOnlineBefore
+SetupDescription3
+SetupDescription4
+SetupPayBoxToHavePaymentCreatedAutomatically
+SetupShort
+SetupStripeToHavePaymentCreatedAutomatically
+ShipProduct
+ShipmentBackToDraftInDolibarr
+ShipmentClassifyClosedInDolibarr
+ShipmentValidatedInDolibarr
+ShippableOrderIconInList
+ShoppingCart
+Shortname
+ShowAllFingerPrintsErrorsMightBeTooLong
+ShowAllFingerPrintsMightBeTooLong
+ShowCustomer
+ShowCustomerPreview
+ShowDiscount
+ShowFiscalYear
+ShowListTicketWithTrackId
+ShowLoanPayment
+ShowMyTasksOnly
+ShowOpeningBalance
+ShowProjectLabel
+ShowProspect
+ShowReception
+ShowResource
+ShowSalaryPayment
+ShowSms
+ShowStock
+ShowSubscription
+ShowSupplierPreview
+ShowTempMassFilesArea
+ShowTypeCard
+ShowUnpaidAll
+ShowUnpaidLateOnly
+ShowWithdraw
+SignSociete_rib
+SignatureSociete_ribRef
+SituationAmount
+SituationDeduction
+SituationTotalRayToRest
+SizeUnitdm
+SizeUnitfoot
+SizeUnitm
+SizeUnits
+SkillList
+Skin
+Skype
+SmsCard
+SmsMessage
+SmsNoPossibleRecipientFound
+SmsRecipient
+SmsRecipients
+SmsResult
+SmsStatusApproved
+SmsStatusDraft
+SmsStatusError
+SmsStatusNotSent
+SmsStatusSent
+SmsStatusSentCompletely
+SmsStatusSentPartialy
+SmsStatusValidated
+SmsTargets
+SmsTestMessage
+SmsTitle
+SmsTopic
+SocialNetworkSetup
+SocialNetworksFacebookURL
+SocialNetworksGithubURL
+SocialNetworksInstagramURL
+SocialNetworksLinkedinURL
+SocialNetworksTwitterURL
+SocialNetworksYoutubeURL
+Societe_ribSigned
+SoldAmount
+SolvedClosed
+SourceInvoiceId
+SourceRequired
+Speaker
+SpecialCharActivation
+SpecialCode
+StandingOrderPayment
+StandingOrderToProcess
+StandingOrdersPayment
+StartUpload
+StateCode
+StateId
+StateOrigin
+StatusAtInstall
+StatusDebitCredit
+StatusOrderApproved
+StatusOrderApprovedShort
+StatusOrderOnProcessShort
+StatusOrderOnProcessWithValidation
+StatusOrderProcessedShort
+StatusOrderReceivedAllShort
+StatusOrderReceivedPartially
+StatusOrderReceivedPartiallyShort
+StatusOrderRefused
+StatusOrderRefusedShort
+StatusReceptionCanceled
+StatusReceptionDraft
+StatusReceptionProcessed
+StatusReceptionValidated
+StatusReceptionValidatedReceived
+StatusReceptionValidatedToReceive
+StatusSendingCanceled
+StatusSendingCanceledShort
+StatusSendingDraft
+StatusSendingProcessed
+StatusSendingValidated
+StatusSupplierOrderApproved
+StatusSupplierOrderCanceledShort
+StatusSupplierOrderDelivered
+StatusSupplierOrderDeliveredShort
+StatusSupplierOrderDraft
+StatusSupplierOrderOnProcess
+StatusSupplierOrderOnProcessWithValidation
+StatusSupplierOrderProcessed
+StatusSupplierOrderProcessedShort
+StatusSupplierOrderReceivedAllShort
+StatusSupplierOrderReceivedPartially
+StatusSupplierOrderRefusedShort
+StatusSupplierOrderSent
+StatusSupplierOrderSentShort
+StatusSupplierOrderToBill
+StatusSupplierOrderToBillShort
+StatusSupplierOrderToProcessShort
+StatusSupplierOrderValidatedShort
+Statut
+StatutCP
+StockDecreaseForPointOfSaleDisabledbyBatch
+StockDetailPerBatch
+StockLimitShort
+StockStransferDecrementedCancel
+StockStransferIncrementedShort
+StockStransferIncrementedShortCancel
+StockToBuy
+StockTransferSetup
+StocksWithBatch
+String
+String1Line
+StripeAccount
+StripeGateways
+StripeID
+StripeImportPayment
+StripeOrCBDoPayment
+StripePaymentModes
+SubCatOf
+SubProduct
+SubjectNotIn
+SubmitTranslation
+SubmitTranslationENUS
+SubscriptionId
+SubscriptionRecorded
+SubscriptionReminderEmail
+SuggestedForTicketsInGroup
+SummarySystem
+SupervisorNotFound
+SupplierCard
+SupplierCodeShort
+SupplierIBAN
+SupplierInvoiceGeneratedFromTemplate
+SupplierInvoiceLines
+SupplierInvoicePayment
+SupplierProposalCard
+SupplierProposalDate
+SupplierProposalRefFourn
+SupplierProposalShort
+SupplierProposalsDraft
+SupplierReputation
+SuppliersCategoryShort
+SuppliersPrices
+SuppliersPricesOfProductsOrServices
+SurfaceUnitcm2
+SurfaceUnitdm2
+SurfaceUnitfoot2
+SurfaceUnitinch2
+SurfaceUnitm2
+SurfaceUnitmm2
+SurfaceUnits
+System
+SystemInfo
+SystemInfoDesc
+SystemTools
+SystemToolsArea
+TE_ADMIN
+TE_GROUP
+TE_MEDIUM
+TE_OTHER
+TE_PRIVATE
+TE_RETAIL
+TE_SMALL
+TE_STARTUP
+TE_UNKNOWN
+TE_WHOLE
+TF_BUS
+TF_CAR
+TF_ESSENCE
+TF_HOTEL
+TF_LUNCH
+TF_METRO
+TF_OTHER
+TF_PEAGE
+TF_TAXI
+TF_TRAIN
+TF_TRIP
+THMEstimatedHelp
+THMMachineEstimated
+THMMachineEstimatedHelp
+THMOperatorEstimated
+THMOperatorEstimatedHelp
+TICKET_CLOSEInDolibarr
+TICKET_CREATEInDolibarr
+TICKET_DELETEInDolibarr
+TICKET_MODIFYInDolibarr
+TMenuAgenda
+TMenuMRP
+TMenuProducts
+TMenuServices
+TMenuTools
+TOKEN_DELETE
+TabLetteringCustomer
+TabLetteringSupplier
+TagCheckMail
+TagMailtoEmail
+TagSignature
+TagUnsubscribe
+TakeposConnectorMethodDescription
+TakeposConnectorNecesary
+TakeposNeedsPayment
+TaskAssignedToEnterTime
+TaskDateEnd
+TaskDateStart
+TaskDescription
+TaskId
+TaskProgressSummary
+TaskTimeDate
+TaskTimeNote
+TaskTimeSpent
+TaskTimeUser
+TasksHistoryForThisContact
+Tb
+TeleFax
+TeraBytes
+Terminate
+TerreNumRefModelError
+TestConnection
+TestLoginToAPI
+TestSms
+TextLong
+TextLongNLines
+TheoricalQty
+TheoricalValue
+ThirdPartyAccount
+ThirdPartyBankCode
+ThirdPartyBookCalHelp
+ThirdPartyCreatedByEmailCollector
+ThirdPartyCustomersStats
+ThirdPartyProspectsStats
+ThirdpartiesHome
+ThisIsContentOfSubscriptionReminderEmail
+ThisIsContentOfYourCard
+ThisIsContentOfYourMembershipRequestWasReceived
+ThisIsContentOfYourMembershipWasValidated
+ThisIsContentOfYourSubscriptionWasRecorded
+ThisIsInformationOnDocumentToSignSociete_rib
+ThisScreenAllowsYouToSignDocFromSociete_rib
+TicketAssignedCustomerBody
+TicketAssignedCustomerEmail
+TicketCategoryShortOTHER
+TicketChangeCategory
+TicketChangeSeverity
+TicketChangeType
+TicketCloseEmailBodyAdmin
+TicketCloseEmailBodyCustomer
+TicketCloseEmailBodyInfosTrackUrlCustomer
+TicketCloseEmailSubjectAdmin
+TicketCloseEmailSubjectCustomer
+TicketCreatedByEmailCollector
+TicketDictCategory
+TicketDictResolution
+TicketDictSeverity
+TicketDictType
+TicketInitialMessageModified
+TicketLogAssignedTo
+TicketLogClosedBy
+TicketLogPropertyChanged
+TicketLogReopen
+TicketLogStatusChanged
+TicketMailExchanges
+TicketMessageMailIntroAutoNewPublicMessage
+TicketNewEmailBodyCustomer
+TicketNewEmailSubjectCustomer
+TicketNotNotifyTiersAtCreate
+TicketNotificationEmailSubject
+TicketNotificationLogMessage
+TicketNotificationNumberEmailSent
+TicketParamMail
+TicketParamModule
+TicketParamPublicInterface
+TicketParams
+TicketPleaseSelectAContract
+TicketSetupPage
+TicketSeverityShortBLOCKING
+TicketSeverityShortHIGH
+TicketSeverityShortLOW
+TicketSeverityShortNORMAL
+TicketTimeToRead
+TicketTypeShortCOM
+TicketTypeShortHELP
+TicketTypeShortISSUE
+TicketTypeShortOTHER
+TicketTypeShortPROBLEM
+TicketTypeShortPROJET
+TicketTypeShortREQUEST
+TicketViewAllTickets
+TicketViewNonClosedOnly
+TicketsActivatePublicInterfaceHelp
+TicketsCategoriesArea
+TicketsDisableEmail
+TicketsHome
+TicketsLimitViewAssignedOnly
+TicketsLimitViewAssignedOnlyHelp
+TicketsLogEnableEmail
+TicketsLogEnableEmailHelp
+TimeSpentBy
+TimeSpentForIntervention
+TimeSpentInvoiced
+TimeType
+TitleNumberOfActivatedModules
+ToBillSeveralOrderSelectCustomer
+ToBuildBackupFileClickHere
+ToConciliate
+ToDate
+ToDispatch
+ToLocation
+ToProcess
+ToStart
+ToTest
+ToUseAGenericEmail
+TokenMustHaveBeenCreated
+Tomorrow
+TooMuchCombinationsWarning
+ToolkitForDevelopers
+TotalHTforthispage
+TotalLT1ES
+TotalLT1IN
+TotalLT2ES
+TotalLT2IN
+TotalNumberOfActivatedModules
+TotalSituationInvoice
+TotalTTCToYourCredit
+TotalTicket
+TotalVATIN
+TrackableSecurityEvents
+TransKey
+TranslatedDescription
+TranslatedLabel
+TranslatedNote
+TranslationSetup
+TranslationUncomplete
+TriggerCodeInfo
+TriggerCodes
+TripId
+TurnoverCollectedbyVatrate
+TypeContact_commande_external_BILLING
+TypeContact_commande_external_CUSTOMER
+TypeContact_commande_external_SHIPPING
+TypeContact_commande_internal_SALESREPFOLL
+TypeContact_commande_internal_SHIPPING
+TypeContact_contrat_external_BILLING
+TypeContact_contrat_external_CUSTOMER
+TypeContact_contrat_external_SALESREPSIGN
+TypeContact_facture_external_BILLING
+TypeContact_facture_external_SERVICE
+TypeContact_facture_external_SHIPPING
+TypeContact_facture_internal_SALESREPFOLL
+TypeContact_fichinter_external_CUSTOMER
+TypeContact_invoice_supplier_external_BILLING
+TypeContact_invoice_supplier_external_SERVICE
+TypeContact_invoice_supplier_external_SHIPPING
+TypeContact_invoice_supplier_internal_SALESREPFOLL
+TypeContact_order_supplier_external_BILLING
+TypeContact_order_supplier_external_CUSTOMER
+TypeContact_order_supplier_external_SHIPPING
+TypeContact_order_supplier_internal_SALESREPFOLL
+TypeContact_order_supplier_internal_SHIPPING
+TypeContact_project_external_PROJECTCONTRIBUTOR
+TypeContact_project_external_PROJECTLEADER
+TypeContact_project_internal_PROJECTCONTRIBUTOR
+TypeContact_project_internal_PROJECTLEADER
+TypeContact_project_task_external_TASKCONTRIBUTOR
+TypeContact_project_task_external_TASKEXECUTIVE
+TypeContact_project_task_internal_TASKCONTRIBUTOR
+TypeContact_project_task_internal_TASKEXECUTIVE
+TypeContact_propal_external_BILLING
+TypeContact_propal_external_CUSTOMER
+TypeContact_propal_external_SHIPPING
+TypeContact_propal_internal_SALESREPFOLL
+TypeContact_stocktransfer_internal_STDEST
+TypeContact_stocktransfer_internal_STFROM
+TypeContact_stocktransfer_internal_STRESP
+TypeContact_supplier_proposal_external_BILLING
+TypeContact_supplier_proposal_external_SERVICE
+TypeContact_supplier_proposal_external_SHIPPING
+TypeContact_ticket_external_CONTRIBUTOR
+TypeContact_ticket_external_SUPPORTCLI
+TypeContact_ticket_internal_CONTRIBUTOR
+TypeContact_ticket_internal_SUPPORTTEC
+TypeContrib
+TypeOfLeaveCode
+TypeOfLeaveId
+TypeOfLeaveLabel
+TypeOfLineServiceOrProduct
+Unanswered
+Uncheck
+Under
+Undo
+UnitCharges
+UnitPriceTTC
+UnknownAccountForThirdpartyBlocking
+Unlettering
+Unread
+UpdateByScaningLot
+UpdateByScaningProductBarcode
+UpdateConfCPOK
+UpdateRate
+UploadFileDragDropSuccess
+UrlToCheck
+UsBillingContactAsIncoiveRecipientIfExist
+UsageBillTimeShort
+UsageOpportunity
+UsageOrganizeEvent
+UsageTasks
+UseCredit
+UseCustomerContactAsPropalRecipientIfExist
+UseDebugBar
+UseDiscount
+UseDocFolder
+UseFormatFileEmailToTarget
+UseFormatInputEmailToTarget
+UsePercentageVariations
+UsePreviewTabs
+UseTextBetween5And70Chars
+UsedByInvoice
+UserAccountancyCode
+UserApproval
+UserApproval2
+UserAuthor
+UserCP
+UserCard
+UserClosing
+UserClosingService
+UserClosingShort
+UserCreationShort
+UserDeleted
+UserEnabled
+UserEnabledDisabled
+UserForApprovalFirstname
+UserForApprovalID
+UserForApprovalLastname
+UserForApprovalLogin
+UserHideExternal
+UserHideNonEmployee
+UserID
+UserLogged
+UserLoginFailed
+UserLogoff
+UserMargins
+UserModification
+UserModificationShort
+UserNeedPermissionToEditStockToUsePos
+UserPersonalEmail
+UserPersonalMobile
+UserRank
+UserRights
+UserSetup
+UserStartingService
+UserUpdateCP
+UserValidation
+UserValidationShort
+UsersHome
+VALIDATEInDolibarr
+VATBalance
+VATDue
+VATIN
+VATINs
+VATNPR
+VATReportBuildWithOptionDefinedInModule
+VATReportByCustomers
+VATReportByCustomersInInputOutputMode
+VATReportByPeriods
+VATReportByQuartersInInputOutputMode
+VATs
+ValidFrom
+ValidSms
+ValidUntil
+ValidateAndClose
+ValidateInvoice
+ValidateOrderFirstBeforeReception
+ValidateReply
+ValidatedById
+ValidatedByLogin
+ValidatedProjects
+ValidatedWaitingApproval
+ValueOfMeansLossForProductProduced
+VarAmount
+VariantLabelExample
+VariantRefExample
+VariousPaymentId
+VariousPaymentLabel
+Vendor
+VendorEmail
+VendorFirstname
+VendorLastname
+ViewAccountList
+ViewSiteInNewTab
+ViewSubAccountList
+ViewWebsiteInProduction
+VirementOrder
+VirtualStockAtDateDesc
+VisibleEverywhere
+VisibleNowhere
+VolumeUnitcm3
+VolumeUnitdm3
+VolumeUnitfoot3
+VolumeUnitgallon
+VolumeUnitinch3
+VolumeUnitlitre
+VolumeUnitm3
+VolumeUnitmm3
+VolumeUnitounce
+VolumeUnits
+VueBySubAccountAccounting
+WEBSITE_CSS_URL
+WEBSITE_PAGEURL
+Waiting
+WarehouseId
+WarehouseRef
+WarehouseUsage
+WarehousesAndProducts
+WarehousesAndProductsBatchDetail
+WarningBillExist
+WarningCloseAlways
+WarningFailedToAddFileIntoDatabaseIndex
+WarningInstallationMayBecomeNotCompliantWithLaw
+WarningNoSmsAdded
+WarningNoteModuleInvoiceForFrenchLaw
+WarningNoteModulePOSForFrenchLaw
+Warnings
+WatermarkOnDraftSupplierProposal
+WebhookSetup
+Webpage
+WebsiteId
+WebsiteTypeLabel
+WeightUnitg
+WeightUnitkg
+WeightUnitmg
+WeightUnitounce
+WeightUnitpound
+WeightUnits
+WeightUnitton
+WelcomeOnOnlineSignaturePageSociete_rib
+WidthUnits
+WithBankUsingBANBIC
+WithBankUsingRIB
+WithDolTrackingID
+WithDolTrackingIDInMsgId
+WithdrawRequestAmount
+WithdrawRequestErrorNilAmount
+WithdrawalCantBeCreditedTwice
+WithdrawalFile
+WithdrawalPayment
+WithoutDolTrackingID
+WithoutDolTrackingIDInMsgId
+WorkPlace
+Workflow
+WorkstationArea
+WorkstationCreate
+WorkstationList
+WorkstationSetup
+WorkstationType
+WorkstationsDescription
+YearInvoice
+Yesterday
+YouAreNotContactOfProject
+YouCanEditHtmlSourceckeditor
+YouCanEditPHPTZ
+YouCanLinkArticleToATicketCategory
+YouCantShipThis
+YouMayFindYourInvoiceInThisEmail
+YouTryInstallDisabledByDirLock
+YouUseLastStableVersion
+YouWillBeRedirectedOnPayBox
+YouWillBeRedirectedOnStripe
+YourCandidature
+YourCandidatureAnswerMessage
+YourEMail
+YourMembershipRequestWasReceived
+YourMembershipWasCanceled
+YourMembershipWasValidated
+YourOrganizationEventBoothRequestWasReceived
+YourOrganizationEventConfRequestWasReceived
+YourPartnershipAcceptedContent
+YourPartnershipAcceptedTopic
+YourPartnershipCanceledContent
+YourPartnershipCanceledTopic
+YourPartnershipRefusedContent
+YourPartnershipRefusedTopic
+YourPartnershipWillSoonBeCanceledContent
+YourPartnershipWillSoonBeCanceledTopic
+YourPasswordHasBeenReset
+YourSEPAMandate
+YourSubscriptionWasRecorded
+ZapierAbout
+ZapierDescription
+ZapierForDolibarrSetup
+accessType
+activityindex
+addEventToUserCP
+byEX_DAY
+byEX_EXP
+byEX_MON
+byEX_YEA
+categories
+commercialindex
+contractindex
+datapolicySetup
+davDescription
+day
+deplacement
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE
+descWORKFLOW_TICKET_CLOSE_INTERVENTION
+descWORKFLOW_TICKET_CREATE_INTERVENTION
+descWORKFLOW_TICKET_LINK_CONTRACT
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS
+donationindex
+errorRateDelete
+expensereportindex
+g
+gram
+hour
+hrmindex
+interventionindex
+inventoryChangePMPPermission
+inventoryConfirmCreate
+inventoryCreate
+inventoryCreateDelete
+inventoryCreatePermission
+inventoryDeleteLine
+inventoryDeletePermission
+inventoryDraft
+inventoryEdit
+inventoryErrorQtyAdd
+inventoryListEmpty
+inventoryListTitle
+inventoryMvtStock
+inventoryOfWarehouse
+inventoryOnDate
+inventoryReadPermission
+inventorySelectWarehouse
+inventorySetup
+inventoryTitle
+inventoryValidate
+inventoryValidatePermission
+inventoryWarningProductAlreadyExists
+inventoryWritePermission
+invoiceindex
+kg
+kilogram
+l
+liter
+lm
+logBILL_DELETE
+logBILL_PAYED
+logBILL_SENTBYMAIL
+logBILL_UNPAYED
+logBILL_VALIDATE
+logCASHCONTROL_VALIDATE
+logDOC_DOWNLOAD
+logDOC_PREVIEW
+logDONATION_PAYMENT_CREATE
+logDONATION_PAYMENT_DELETE
+logDON_DELETE
+logDON_MODIFY
+logDON_VALIDATE
+logMEMBER_SUBSCRIPTION_CREATE
+logMEMBER_SUBSCRIPTION_DELETE
+logMEMBER_SUBSCRIPTION_MODIFY
+logMODULE_RESET
+logMODULE_SET
+logPAYMENT_ADD_TO_BANK
+logPAYMENT_CUSTOMER_CREATE
+logPAYMENT_CUSTOMER_DELETE
+logPAYMENT_VARIOUS_CREATE
+logPAYMENT_VARIOUS_DELETE
+logPAYMENT_VARIOUS_MODIFY
+loginPassword
+m
+m2
+m3
+mailingindex
+margin
+meter
+modify
+mrpindex
+newLT1Payment
+newLT1PaymentES
+newLT2Payment
+newLT2PaymentES
+nolimitbyEX_DAY
+nolimitbyEX_EXP
+nolimitbyEX_MON
+nolimitbyEX_YEA
+notiftofixedemail
+notiftouser
+notiftouserandtofixedemail
+oauthService
+oauthToken
+opensurveyindex
+ordersindex
+orderssuppliersindex
+p
+printPlannedWarehouse
+productindex
+projectsindex
+proposalindex
+rate
+receptionindex
+recruitment
+s
+se
+second
+sendingindex
+set
+specialexpensesindex
+stockindex
+supplier_proposalDESC
+suppliersproposalsindex
+with
+
+# Seem to be global settings
+AI_CONFIGURATIONS_PROMPT
+WEBPORTAL_BANNER_BACKGROUND
+WEBPORTAL_BANNER_BACKGROUND_IS_DARK
+WEBPORTAL_INVOICE_LIST_ACCESS
+WEBPORTAL_LOGIN_BACKGROUND
+WEBPORTAL_LOGIN_LOGO_URL
+WEBPORTAL_MEMBER_CARD_ACCESS
+WEBPORTAL_MENU_LOGO_URL
+WEBPORTAL_ORDER_LIST_ACCESS
+WEBPORTAL_PARTNERSHIP_CARD_ACCESS
+WEBPORTAL_PRIMARY_COLOR
+WEBPORTAL_PROPAL_LIST_ACCESS
+WEBPORTAL_TITLE
+WEBPORTAL_USER_LOGGED
+
+
+#
+# The following exceptions are added to have Continuous Integrations pass.
+# They may not be valid exceptions - this list needs to be cleaned
+#
+ANONYMISER_AT
+AiCustomPrompt
+DATAPOLICYSUBSITUTION
+DATAPOLICY_PORTABILITE_CONFIRMATION
+DATAPOLICY_PORTABILITE_TITLE
+DisplayGrandTotalInList
+EditWithEditor
+ElementId
+ElementType
+ErrorABatchShouldNotContainsSpaces
+ImageGeneration
+ModelTemplate
+ModuleWebPortalDesc
+ModuleWebPortalName
+Reports
+SendEmailsRemindersOnSupplierInvoiceDueDate
+TXTLINKDATAPOLICYACCEPT
+TXTLINKDATAPOLICYREFUSE
+Transparency
+WEBPORTAL_MENU_LOGO_URLTooltip
+WEBPORTAL_SECONDARY_COLOR
+WebPortalDescription
+WebPortalInvoiceListNothing
+WebPortalOrderListNothing
+WebPortalPropalListNothing
+WebPortalSetup
+WebPortalSetupPage
+XSubsriptionErrors
+YouCanChooseAModelForYouMailContent
+YouCanMakeSomeInstructionForEmail
+helpWithAi
diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
new file mode 100644
index 00000000000..173355fe70a
--- /dev/null
+++ b/dev/translation/ignore_translation_keys.lst
@@ -0,0 +1,1183 @@
+# File with translation keys that are ignored for
+# reporting issues (where used).
+# Two parts (ignored by the tools):
+#   - First part:
+#      Keys that are in the translation files, and commented
+#      in the code - so potentially useful in the future.
+#   - Second part:
+#      Keys that are used in the code and missing in translation
+#      files.  These should be fixed but are ignored for now
+#      so that continuous integration does not complain about it
+#      in order to detect newly introduced issues with the keys.
+#
+# ██████╗  █████╗ ██████╗ ████████╗ ██╗
+# ██╔══██╗██╔══██╗██╔══██╗╚══██╔══╝███║
+# ██████╔╝███████║██████╔╝   ██║   ╚██║
+# ██╔═══╝ ██╔══██║██╔══██╗   ██║    ██║
+# ██║     ██║  ██║██║  ██║   ██║    ██║
+# ╚═╝     ╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝    ╚═╝
+#      Keys that are in the translation files, and commented
+#      in the code - so potentially useful in the future.
+ActivateModule
+AddDispatchBatchLine
+AddNewNotification
+AssignUser
+BankAccountsAndGateways
+Binding
+ChartGenerated
+CloneMainAttributes
+CloseRefusedBecauseOneServiceActive
+CollapseBatchDetailHelp
+CustomersOrdersRunning
+DelayToRequestCP
+DescFinanceJournal
+DetailLevel
+DiscountNone
+ErrorFieldAccountNotDefinedForInvoiceLine
+EveryDay
+FieldsTitle
+FileIntegrityIsOkButFilesWereAdded
+FirstUseDate
+FollowingLinksArePublic
+HidePassword
+IPP_Device
+InstallChoiceRecommanded
+IsInPackage
+MailNoChangePossible
+ModuleBuilderDesc2
+ModulesMarketPlaceDesc
+MoveField
+MyContacts
+NbOfActiveNotifications
+NbOfTargetedContacts
+PreviewMailing
+Processing
+PropalStatusClosedShort
+PublicAttendeeSubscriptionPage
+ResetBarcodeForAllRecords
+ResourcesLinkedToElement
+SetupDescription5
+ShowSending
+SomethingMakeInstallFromWebNotPossible2
+StatusMotif0
+StatusOrderProcessed
+SuppliersOrdersRunning
+TasksOnOpenedProject
+ThirdPartyCustomersWithIdProf12
+TicketPublicInfoCreateTicket
+TitreRequestCP
+UseAsciiDocFormat
+ViewPageInNewTab
+YourTicketSuccessfullySaved
+#
+# ██████╗  █████╗ ██████╗ ████████╗██████╗
+# ██╔══██╗██╔══██╗██╔══██╗╚══██╔══╝╚════██╗
+# ██████╔╝███████║██████╔╝   ██║    █████╔╝
+# ██╔═══╝ ██╔══██║██╔══██╗   ██║   ██╔═══╝
+# ██║     ██║  ██║██║  ██║   ██║   ███████╗
+# ╚═╝     ╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝   ╚══════╝
+#      Keys that are used in the code and missing in translation
+#      files.  These should be fixed but are ignored for now
+#      so that continuous integration does not complain about it
+#      in order to detect newly introduced issues with the keys.
+#
+........
+AADE_WEBSERVICE_KEY
+AADE_WEBSERVICE_USER
+APCCacheInstalledButDisabled
+APCInstalled
+API
+Accept
+AccountancyErrorMismatchLetteringCode
+AccountingAccount
+AccountingCode
+AccountingJournalType
+ActionAC_
+ActionAC_ALL_
+AddSite
+AddSupplier
+AddTicketIntoCategory
+Adherent
+AdherentNotLinkedToThirdParty
+AdvTgtUse
+Agents
+AllEntities
+AllFilesDidAlreadyExist
+AlreadyInV7
+AmountOfOrders
+AmountOfOrdersHT
+AmountOfProposals
+AmountOfProposalsHT
+AmountOfReceptions
+AmountOfReceptionsByMonthHT
+AmountOfShipments
+AmountOfShipmentsByMonthHT
+AmountOfTickets
+AmountOfTicketsByMonthHT
+AmountOfinterventions
+AmountOfinterventionsByMonthHT
+AnObjectWithThisClassNameAlreadyExists
+Anciennete
+AnnualByAccountDueDebtMode
+AnnualByAccountInputOutputMode
+Anonymous
+AnotherField
+Applications
+Articles
+AssetErrorFetchMaxDepreciationDateForMode
+AssetInAccountNotDefined
+AuthorityDidntReconizeFingerprintConformity
+AuthorityReconizeFingerprintConformity
+Auto
+AutoGenerateDoc
+AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation
+Automatic
+AvailabilityType
+BAN
+BI
+BOMs
+Back
+Bad value for email, email lwas not verified by Google
+Bad value for returned userinfo[aud]
+Bad value for returned userinfo[exp]. Token expired.
+Bad value for returned userinfo[iss]
+BadNumberOfLinesMustHaveAtLeastOneLinePlusTitle
+BadParameterWhenCallingCreateOfBlockedLog
+BadPaymentMethod
+BadStatusOfObject
+BadValueForParameterClientOrSupplier
+BankColorizeMovementName
+Banque
+Barcode
+BarcodeDesc
+BarcodeStickersMask
+BatchInformationNotfound
+BillOfMaterialsLine
+BlockLogNeedAmountsValue
+BlockLogNeedElement
+BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote
+BlockedLogAuthorityUrl
+BlockedLogSetup
+BookCalArea
+BookCalSystem
+Bookings
+BoxTitleLast
+BoxTitleLatest
+BoxTitleLatestModifiedMyObjects
+ByDefault
+Bzip2
+CLI
+CSS
+Cache
+CalcModeLT
+CalculatedFromProductsToConsume
+CancelReception
+Candidatures
+CantBeNullOrPositive
+CantConvertToReducAnInvoiceOfThisType
+CardFichinter
+CardProduct
+CashDeskBankAccountForStripeTerminal
+Channel
+Charset
+Cheque
+ChequeBankUpdateSucceeded
+ChequeMakeUpdateSucceeded
+Child of
+ClassNotFound
+Clear
+ClickToDial
+Clients
+Clone
+CloneAffectation
+CloneChanges
+CloneFile
+CloneProgression
+CloneTimes
+Close Done
+Close2
+CloseShipment
+CodeTooltipHelp
+Column
+Combination
+CompanyPaymentMode
+ComptaFiles
+ConferenceOrBoothAttendeeExtraFields
+Confirm Delete Dictionnary
+Confirm Delete Menu
+Confirm Delete Right
+ConfirmActionAvailabilities
+ConfirmActionMyObject
+ConfirmActionTarget
+ConfirmCloneMyObject
+ConfirmCloneTask
+ConfirmCloseShipment
+ConfirmCreateAdherent
+ConfirmDeleteAdherent
+ConfirmDeleteIndividual
+ConfirmDeleteReport
+ConfirmDeleteWebsiteAccount
+ConfirmReoponAsk
+ConnectingToStripeTerminal
+Constant
+ContactAddress
+ContactDefault_
+ContactSuperAdminForChange
+ContactUs
+Container
+Contrats
+Control
+Convert
+Core
+Count
+CreateFichInter
+CreateRemoteOrder
+CreateRepeatableIntervention
+Created
+CronCannotLoadLib
+Crypted
+Current
+CustomX
+CustomY
+DATAPOLICYReturn
+DateInvalid
+DatePaymentForDepositReceived
+Datee
+Dateo
+Dates
+Datet
+DecimalSeparator
+Declared
+Decline
+DefaultCashPOSLabel
+Delays_
+DeleteAdherent
+DeleteAnIndividual
+DeleteAsset
+DeleteAssetModel
+DeleteAvailabilities
+DeleteCalendar
+DeleteConferenceOrBooth
+DeleteEvaluation
+DeleteInventory
+DeleteJob
+DeleteKnowledgeRecord
+DeleteLoan
+DeleteMyObject
+DeleteOldFiles
+DeletePosition
+DeleteReception
+DeleteRecruitmentCandidature
+DeleteRecruitmentJobPosition
+DeleteReport
+DeleteTarget
+DeleteWebsiteAccount
+DemandReasonType
+Demo
+Desc
+Detail
+Details
+Development
+Dictionaries
+DictionaryEmpty
+DictionaryNameUpdated
+Directory
+DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND
+Document
+Documentation
+Dolibarr
+Dolibarr constant MAIN_SERVER_TZ
+DolibarrPassword
+Down
+DraftMyObjects
+DragDrop
+DuplicateRecord
+DynamicPrice
+ECMAreaDesc2
+ECMDocsByProducts
+ECMSectionAutoDesc
+ECMSectionManualDesc
+EMail
+EMails
+EcmFiles
+EditAdherent
+EditAdherentAddress
+EditRelativeDiscounts
+EmailcollectorAction
+EmailcollectorFilter
+EmailingTargetSelector
+Empty
+End
+EnterAnIP
+EnterNameOfDictionnaryToDeleteDesc
+EntityNameNotDefined
+Entries
+ErrSCAAuthentication
+Error sql
+ErrorADiscountThatHasBeenRemovedIsIncluded
+ErrorAccountancyCodeOnBankAccountNotDefined
+ErrorAccountancyCodeOnThirdPartyNotDefined
+ErrorBackToDraft
+ErrorBadEmail
+ErrorBadInvoice
+ErrorBadParameterCat
+ErrorBadParameterQty
+ErrorBadPhone
+ErrorBadSocialNetworkValue
+ErrorBadStatus
+ErrorBadValue
+ErrorBadValueForBatch
+ErrorBadValueForDate
+ErrorCanNotDeleteDir
+ErrorCantSplitAUsedDiscount
+ErrorChartOfAccountSystemNotSelected
+ErrorCheckVersionIsDefined
+ErrorCreateUserSkill
+ErrorDB
+ErrorDateEndLowerThanDateStart
+ErrorDoNotProvideAccountsIfNullAmount
+ErrorDuplicateEmalingSelector
+ErrorDuplicateWidget
+ErrorEmailInvalid
+ErrorEmptyNameDic
+ErrorFailToCreateZip
+ErrorFailToOpenFile
+ErrorFaildToOpenFile
+ErrorFailedToAddUserAsContact
+ErrorFailedToConnect
+ErrorFailedToCopyProposal
+ErrorFailedToDeleteFile
+ErrorFailedToFindSomeFiles
+ErrorFailedToGetListOfNotificationsToSend
+ErrorFailedToLoadBankAccount
+ErrorFailedToLoadDiscount
+ErrorFailedToSetNewPassword
+ErrorFaviconMustBeASquaredImage
+ErrorFileNameInvalid
+ErrorImportOfChartLimitedToCurrentChart
+ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT
+ErrorMailFromRequired
+ErrorNegativeValueNotAllowed
+ErrorNoAccountingModuleEnabled
+ErrorNoPhoneDefinedForThisUser
+ErrorNoUrl
+ErrorNoValueForLinkType
+ErrorNoValueForSelectListType
+ErrorNumberingModuleNotSetup
+ErrorObjectMustHaveStatusClosedToBeReOpened
+ErrorObjectMustHaveStatusValidToBeCanceled
+ErrorObjectNoSupportedByFunction
+ErrorOccurredReviseAndRetry
+ErrorOnlyOrderNotDraftCanBeSentInMassAction
+ErrorOnlyProposalNotDraftCanBeSentInMassAction
+ErrorParamMustBeAnUrl
+ErrorPriceExpression
+ErrorProductIdIsMandatory
+ErrorSetupOfCountryMustBeDone
+ErrorSomeFilesCouldNotBeDeleted
+ErrorStripeAccountNotDefined
+ErrorTechnicalError
+ErrorThirdPartyIdIsMandatory
+ErrorTicketIsNotValid
+ErrorTitreAlreadyExists
+ErrorUpdatingUsersCP
+ErrorUserFetch
+ErrorValueMustBeInteger
+ErrorValueTooHigh
+ErrorVerif
+ErrorWarehouseRequiredIntoReceptionLine
+ErrorWebServicesFieldsRequired
+Error_BOM_ADDON_NotDefined
+Error_COMPANY_ADDON_PDF_NotDefined
+Error_FICHEINTER_ADDON_NotDefined
+Error_HOLIDAY_ADDON_NotDefined
+Error_MRP_MO_ADDON_NotDefined
+Error_RECEPTION_ADDON_NUMBER_NotDefined
+ErrorloadUserOnSendingMail
+EstimatedWeight
+Evaluation
+Evaluationdet
+Evaluations
+EventFee
+EventIntoASerie
+EventOrganizationArea
+EventParticipant
+ExampleOnlyForATBEDEITNLESCustomers
+ExampleOnlyForBECustomers
+ExampleOnlyForDECustomers
+ExampleOnlyForKlarnaCustomers
+ExampleOnlyForNLCustomers
+Expedition
+Experimental
+Expired
+Extension
+ExtraLanguageHasWrongValue
+Extrafieldcomputed
+FRST
+FTP
+Failed
+FailedToCloseProject
+FailedToDefinGraph
+FailedToExecutCommandJob
+FailedToGetCostPrice
+FailedToOpenFile
+FailedToReadFile
+FailedToSetPaid
+FailedToSetToCancel
+FailedToUncompressFile
+FailedToUpdatePrice
+FailedtoSetToApprove
+FailedtoSetToDeny
+FeatureNotAvailableWithThisDatabaseDriver
+FieldNotFoundInObject
+FieldsEdit
+FieldsInsert
+FieldsLinked
+FieldsView
+File encoding
+FileDidAlreadyExist
+FileIsNotCorrect
+Filename
+FilteredFrom
+FiscalYear
+Flashy
+ForceEmailFrom
+ForcedByGlobalSetup
+Form for public lead registration has not been enabled
+Free
+FreeLegalTextOnReceptions
+FrequencyPer_
+FromPublicEmail
+Function_getNextValue_InModuleNotWorking
+Gantt
+GeneratePDF
+GeoIPLibVersion
+Get
+GetCompanyParentsError
+GlobalGroup
+GlobalVariableUpdaterHelp
+GlobalVariableUpdaterHelpFormat
+GlobalVariableUpdaterType
+GoOnTokenProviderToDeleteToken
+GoSourceInvoice
+Gzip
+H
+HTTPBasicPassword
+HelpAbandonProductReturned
+HideVersionLink
+HolidayStarted
+Hook
+Hooks
+IBANNotDefined
+ID
+IPP_COLOR_
+IconFieldSelector
+Id
+Image
+ImpossibleToRetrieveUser
+ImpossibleUpdateCat
+Inactive
+Inf
+IntracommReport
+IntracommReportDeleted
+Introduction
+JS
+Job
+JobPositionApplications
+JournalNum
+KO
+Key
+Keywords
+LDAP
+LDAP setup for groups not defined inside Dolibarr
+LDAP setup for members not defined inside Dolibarr
+LDAP setup for members types not defined inside Dolibarr
+LDAP setup for users not defined inside Dolibarr
+LT
+LabelName
+LabelPaperSize
+Language_
+Languages
+LdapUacf_
+Level
+Lifetime
+LinkedElementsInvalidDeleted
+LinkedToAConcialitedTransaction
+ListOfAttendeesPerConference
+ListOfBookmark
+ListTicketsLinkToContract
+Load
+LocalTaxReport
+Locale
+Lot
+MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING
+MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET
+MEDIA_IPP_
+MO
+MRP
+MYDATA_AADE_KEY
+MYDATA_AADE_USER
+Mailman
+MainAccountForRevenueStampSaleNotDefined
+Manual
+Map
+Max
+MaxRunReached
+Maximum
+Measuringtype_durationDesc
+MemberAllowchangeOfType
+MemberTypeCard
+MembersListOfTiers
+MenuAddedSuccesfuly
+Message
+MigrationBankTransfertsToUpdate
+MigrationContractsEmptyCreationDatesUpdateSuccess
+Millisecond
+Minimum
+Mo
+Mode
+Modifier
+Module/Application
+ModuleCompanyCode
+ModuleCompanyCodeCustomer
+ModuleCompanyCodeSupplier
+ModuleNotEnabled
+ModuleTriggeringThisWarning
+Modulebuilder
+ModulebuilderSetup
+MonthShort
+MonthVeryShort
+Morphy
+Movement
+MultiCompanyMode
+Multicompanies
+MulticurrencyPaidBack
+MulticurrencyRemainderToPayBack
+MustBeAdminToDeleteOtherAdmin
+MyFilter
+MyModule
+MyModuleArea
+MyModuleBoxDescription
+MyModuleMassAction
+MyModuleSetup
+MyModuleSetupPage
+MyModuleTab
+MyObject
+MyObjects
+NA
+NPR
+NPR counterpart
+Name of the new third party. In the meantime we check if it already exists...
+Nb
+NbOfDonations
+NbOfIntervention
+NbOfOrder
+NbOfSendingsByMonth
+NbOfTicket
+NeedRefresh
+NetMeasure
+Network
+NewAdherent
+NewAdherentAddress
+NewDeposit
+NewEMailTemplate
+NewLead
+NewPartnershipForm
+NewProperty
+NoActiveEstablishmentDefined
+NoAddMember
+NoAuthorityURLDefined
+NoBankAccountFound
+NoCurrencyRateSelected
+NoEntriesToShow
+NoEstablishmentFound
+NoMail
+NoModuleFound
+NoOperations
+NoPasswordGenerationRuleConfigured
+NoReader
+NoRecordedUnpaidInvoices
+NoRecordfound
+NoRecords
+NoRecordsToDisplay
+NoSenderEmailDefined
+NoShippingMethodDefined
+NoStripe
+NoSurvey
+NoTitle
+NoType
+NoTypeOfPagePleaseEditDictionary
+NoURL
+No_record_on_multicurrency_rate
+NobodyHasPermissionToValidateExpenseReport
+NotARecurringInterventionalTemplate
+NotAllExportedMovementsCouldBeRecordedAsExportedOrValidated
+NotEnoughForAllOrders
+NotFound
+NotUsed
+NotUserRightToView
+Note: The function password_hash does not exist on your PHP
+Note: The function password_hash exists on your PHP
+Notification
+Notify_
+Num
+NumberOfCopy
+NumberOfDonationsByMonth
+NumberOfOrders
+NumberOfProposals
+Numeric
+OK
+Object
+Objects
+Offline
+Ok
+Omit sub-projects
+Online
+OnlineSignature
+OnlyAdminUsersCanDisableAdminUsers
+OnlyTerminal1IsAvailableForCashDeskModule
+OpenSurvey
+Operation
+Operations
+OppStatus
+OrderSource
+PARTNERSHIP_NEWFORM_PAYONLINE
+PAYBOX_CGI_URL_V1
+PAYBOX_IBS_DEVISE
+PAYPAL_API_EXPRESS
+PDFStandardHrmEvaluation
+PHP
+PHP_OS
+POS
+PaperFormat
+Parent
+PasswordEncryption
+PasswordLength
+Path
+PayBox
+PayLoan
+PayPal
+Payement
+PaymentBeingProcessed
+PaymentCondition
+PaymentConditionShort
+PaymentDonation
+PaymentHigherThanReminderToPaySupplier
+PaymentSalary
+PaymentSendToStripeTerminal
+PaymentType
+PaymentTypeShort
+PaymentValidated
+Paypal
+Pending
+PendingCreditTransferToComplete
+PendingCreditTransferToCompleteShort
+PendingDirectDebitToComplete
+PendingDirectDebitToCompleteShort
+PermissionAdvanced
+Picto
+PlanStripe
+Poll
+Posts
+PredefinedInterventional
+PrevRangeToThisRange
+PreviousFingerprint
+Print
+PrintDriver
+PrintModule
+PrintUserConfDesc
+PrinterId
+PrinterIdEmpty
+PrinterLocation
+PrinterNameEmpty
+PrinterParameterEmpty
+Printers
+Printing
+ProductCodeDesc
+ProductFournisseurPrice
+ProductLot
+ProductNotDefined
+ProductReturned
+Production
+ProfId
+Profile
+Programs
+Progression
+ProjectNbProject
+ProjectNbTask
+Property %s not found in the class. The class was probably not generated by modulebuilder.
+Proposer
+Provider
+Proxy
+Pwd
+QR
+Question
+RECUR
+RSS
+RateIndirect
+Re-Open
+Rechercher
+ReconciledBy
+RecordNotFound
+RecruitmentJobPosition
+Recurrence
+RefAlreadyExists
+Referer
+Refuse
+RegistrationAndPaymentWereAlreadyRecorded
+Reinit
+Rejection
+RemoteOrderRef
+RemotePriceMismatch
+RemoteUserBadCredentials
+RemoteUserMissingAssociatedSoc
+RemoteUserNotPermission
+RemoveDuplicates
+Repair
+Replace
+Replaced
+Reply
+Request
+RequireValidPhone
+RequireValue
+RequiredIfProduct
+RequiredIfService
+Resource
+ResourceTypeShort
+ResponseNonOK
+Results
+Retry
+Reverse
+RobotEmail
+Roles
+Rowid
+RulesPurchaseTurnoverCollectedOfExpenseAccounts
+SID
+SOAPError
+SPIP
+SQL
+SQLSort
+STATE_
+STATE_IPP_
+STRIPE_APPLICATION_FEE_PLATFORM
+STRIPE_BANCONTACT
+STRIPE_GIROPAY
+STRIPE_IDEAL
+STRIPE_KLARNA
+STRIPE_SOFORT
+ST_
+SaveFailed
+Saved
+Script
+SeeWikiPage
+ServiceCodeDesc
+Session
+SetContract
+SetModel
+SetReceptionMethod
+SetRefExt
+SetRefusedAndClose
+SetSendingMethod
+SetTransDate
+SetVATReverseCharge
+SetWarehouse
+Setting
+SetupNotComplete
+SetupNotError
+SeveralEvents
+ShipmentIncrementStockOnDelete
+Shipping
+ShowAsset
+ShowAssetModel
+ShowAvailabilities
+ShowBill
+ShowBillOfMaterials
+ShowBillOfMaterialsLine
+ShowCalendar
+ShowCompanyPaymentMode
+ShowConferenceOrBooth
+ShowConferenceOrBoothAttendee
+ShowCronJob
+ShowEmailCollector
+ShowEmailcollectorAction
+ShowEmailcollectorFilter
+ShowEvaluation
+ShowEvaluationdet
+ShowFichinter
+ShowInterventionModel
+ShowInventory
+ShowJob
+ShowKnowledgeRecord
+ShowMo
+ShowMyObject
+ShowPartnership
+ShowPayment
+ShowPosition
+ShowProductAttribute
+ShowProductFournisseurPrice
+ShowProductOrService
+ShowProposal
+ShowRecruitmentCandidature
+ShowRecruitmentJobPosition
+ShowSearchFields
+ShowSkill
+ShowSkillRank
+ShowSkilldet
+ShowStockTransfer
+ShowStockTransferLine
+ShowTarget
+ShowTimeSpent
+ShowWorkstation
+Showing
+SignatureKO
+SignatureOK
+Siren
+Situation
+SizeUnit
+SkillCreated
+SkillRank
+SmsTestSubstitutionReplacedByGenericValues
+SomeShipmentExists
+SourceType
+Split
+SplitAllQuantity
+Standard
+StatsOnDonationsOnlyValidated
+StatusProspect
+Stock Total
+Stock total
+StockTransferLine
+Stripe
+StripeAutoSubscription
+StripeBalance
+StripeConnect
+StripeConnectPay
+StripeCustomer
+Sub-projects
+SubscriptionStripe
+Success
+Sumup
+SumupAffiliate
+SumupAppId
+Supervisor
+SupplierDepositsAreNotIncluded
+SupplierMissingRef
+Synchronize
+Syslog
+TLS/STARTTLS
+TLSv1
+TLSv1.2
+TYPE_
+Tabs
+Tag
+TakePOS
+TargetType
+Targets
+TasksToDo
+Taxes
+Template
+TemplateIdEmpty
+TemplateNameEmpty
+Templates
+TestPrinterTemplate
+TestTemplateToPrinter
+Theme
+Thirdparty
+ThirdpartyHasNoDefaultBanAccount
+ThisIsInformationOnDocumentToSign
+ThisScreenAllowsYouToSignDocFrom
+TicketCategoryShort
+TicketMessageMailNewText
+TicketSeverityShort
+TicketTypeShort
+TimeOnly
+Timezone
+ToGetBack
+ToPay
+ToReopon
+Token
+Tooltip
+TooltipEditAndRevertStockMovement
+TotalEntries
+Transaction
+TranslationOfKey
+Triggers
+Trip
+TripForPaid
+TripForValid
+TripPaid
+TurnoverReport
+TypeContact_
+TypeToFilter
+UTF8
+Unix
+UnknownError
+Unlink
+Up
+UpdateContact
+UpdateGroup
+UpdateMemberType
+UpdateUser
+UpgradeHasBeenUnlocked
+Url
+Use of API for currency update is disabled by option MULTICURRENCY_DISABLE_SYNC_CURRENCYLAYER
+UserRemovedFromGroup
+UserSetInGroup
+VCard
+Vacant
+ValidateAndSign
+ValidationDateNotDefinedEvenIfReceptionValidated
+ValueFromBom
+Variable
+Variant
+Vote
+WTOf
+WaitAccountNotDefined
+Warning: you will delete all menus linked to this one.
+WarningFieldsMustContains
+WarningPostActionErrorAfterPayment
+WarningUserDifferentContactSocid
+WebDAV
+WebServiceKey
+WebServiceURL
+Website
+WebsiteMustBeSameThanClonedPageIfTranslation
+Weighted
+WelcomeOnOnlineSignaturePage
+WidgetDisabledAsModuleDisabled
+Widgets
+Windows
+WorkingBoard
+Workload
+WrongAmount
+XDebug
+XXX
+XmlCorrupted
+Y
+ZeroMeansEveryYear
+Zstd
+_blank
+accountancy_error_modelnotfound
+bytes
+card
+card3DS
+checkMargins
+copy_of_
+csv
+customer
+desc
+diff_after_tomorrow
+diff_before_yesterday
+diff_now
+diff_tomorrow
+diff_yesterday
+errorUpdateSkilldet
+errors
+iDEAL
+log
+minimum
+multicurrency_code_already_added
+noExtrafields
+period_end_date
+period_interval
+period_recurrences
+period_start_date
+point
+productlot
+refunded
+save
+seconds
+sepadebit
+showInputBorder
+skill
+supplier
+test01
+test02
+test03
+test04
+test05
+test06
+title1
+title2
+title3
+txt
+unit
+words
+xcache.cacher
+xcache.coverager
+xcache.optimizer
+xcache.stat
+xxx
+
+
+# Confirmed, will be used in the future
+# (When used, remove from this list)
+
+AudioText
+MenuResourceAdd
+SendShippingRef
+TextGeneration
+VideoGeneration
+
+#####################################################################
+#####################################################################
+## The following list is added only to make Continuous Integration
+## pass - this list needs to be cleaned up
+#####################################################################
+#####################################################################
+$minimum
+AI_KEY_API_
+AddService
+AnHelpMessage
+Analytic
+AnalyticLabel
+BOOKCAL_MYPARAM10
+BOOKCAL_MYPARAM8
+BOOKCAL_MYPARAM9
+BankId
+Bcc
+Birthdate
+Candidature
+ClientCollation
+Collation
+Config
+Confirmed
+Creation
+CronLib
+CronModuleNotEnabledInThisEntity
+DateInitialBalance
+Dimension
+Don
+ECM
+EmptyMessageNotAllowedError
+ErrorBarcodeNotFoundForProductWarehouse
+ErrorCodeScannedIsBothProductAndSerial
+ErrorInputRequired
+ErrorLDAPFunctionsAreDisabledOnThisPHP
+ErrorUpdating
+Exceptions
+Extra
+Facture
+FailedToConnectToSFTPAfterSSHAuthentication
+FailedToLogin
+First
+France
+Germany
+Greece
+GroupCreate
+GroupUpdate
+INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION
+INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION
+INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID
+INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT
+INVOICE_USE_RETAINED_WARRANTY
+INVOICE_USE_SITUATION
+INVOICE_USE_SITUATION_CREDIT_NOTE
+ImpossibleToContactAuthority
+InputValueIsNotAnNumber
+InterDate
+Inventory Code
+InvoiceReplace
+Italy
+ItemID
+JobApplications
+JobPosition
+Journal
+Label Movement
+Labels
+Last
+LedgerAccount
+LocalTax1IsNotUsedExample
+LocalTax1IsUsedExample
+LocalTax2IsNotUsedExample
+LocalTax2IsUsedExample
+Logs
+Lot/Série
+MAIN_IMAP_USE_PHPIMAPDesc
+MYMODULE_CATEGORY_ID_XXX
+MYMODULE_MYPARAM1
+MYMODULE_MYPARAM10
+MYMODULE_MYPARAM2
+MYMODULE_MYPARAM3
+MYMODULE_MYPARAM4
+MYMODULE_MYPARAM5
+MYMODULE_MYPARAM6
+MYMODULE_MYPARAM7
+MYMODULE_MYPARAM8
+MYMODULE_MYPARAM9
+ManufacturingOrders
+MemberCreate
+MemberTypeCreate
+MemberTypeUpdate
+Messages
+MoDate
+MultiCompany
+MyWidget
+NO_PARAM_JUST_TEXT
+NewSection
+NoPreviousBillForCustomer
+Normal
+NotSelected
+Null
+Obsolete
+Off
+On
+Open
+PDF 1.7
+PDF/A-1b
+PDF/A-3b
+PartnershipSentByEMail
+PdfTitle
+Privileges
+ProcessingError
+PurchaseOrder
+PurchaseOrders
+ReceptionSentByEMail
+ReceptionValidated
+Recruited
+Ref. Product
+RefNewContract
+Societe
+Spain
+Stable
+Suggested
+TaskModifieddInDolibarr
+TicketMessageMailSignatureText
+TicketSetupPage
+Tiers
+Timeline
+TotalDiscount
+TotalHTBeforeDiscount
+Transfer
+TryAnotherConnectionMode
+UndefinedKey
+UnknownType
+UpdateMember
+UserCreate
+UserDiscarded
+UserUpdate
+Variables
+Vat
+VirtualHost
+WEBPORTAL_ROOT_URL
+WEBPORTAL_USER_LOGGED2
+XSubsriptionError
+centimes
+email
+id
+leftmenu
+message
+multicurrency_buyPriceInCurrency
+multicurrency_modifyRateApplication
+ref
+sendEmailsReminder
+smsing
+societe
+target
+titre
+type
+url
+Civility
+IntracommReportList
+PrintTestDesc
+PrintingDriverDesc
diff --git a/dev/translation/sanity_check_trans_missing_unused.sh b/dev/translation/sanity_check_trans_missing_unused.sh
new file mode 100755
index 00000000000..459f59117a5
--- /dev/null
+++ b/dev/translation/sanity_check_trans_missing_unused.sh
@@ -0,0 +1,212 @@
+#!/bin/bash
+#
+# Find unused translations pretty fast...
+#
+# Principle:
+#
+# 1.Generate two files:
+#   - one for available translations keys,
+#   - one for expected keys.
+# 2. Make the difference between the files.
+#
+# Find expected translation keys:
+#   1. Find all occurrences that look like `->trans("` or `->trans('`
+#      with fast grep.
+#   2. Split result to have only one '->trans(' on each line
+#   3. Filter the text between the single or double quotes.
+#
+# Find available translation keys:
+#   1. Get all strings before '=' token in the language files
+#
+# Notes:
+#   - Some side effects from translations on variables.
+#   - Some other minors side effects to be examined (#, %).
+#
+# Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+
+LANG_DIR=htdocs/langs/en_US/
+MYDIR=$(dirname "$(realpath "$0")")
+TMP=${TMP:=/tmp}  # Most of the time defined on the system.
+EXPECTED_FILE=${TMP}/expected_translations
+AVAILABLE_FILE_NODEDUP=${TMP}/available_translations_no_dedup
+AVAILABLE_FILE=${TMP}/available_translations
+DUPLICATE_KEYS_FILE=${TMP}/duplicate_keys
+DYNAMIC_KEYS_FILE=${TMP}/dynamic_keys
+MISSING_AND_UNUSED_FILE=${TMP}/missing_and_unused
+MISSING_FILE=${TMP}/missing
+UNUSED_FILE=${TMP}/unused
+EXPECTED_REGEX='(Country..|Language_.._..|MonthVeryShort\d\d|PaperFormat.*|ProfId\d(..)?|unit.*)'
+DYNAMIC_KEYS_SRC_FILE=${MYDIR}/dynamic_translation_keys.lst
+EXCLUDE_KEYS_SRC_FILE=${MYDIR}/ignore_translation_keys.lst
+DUPLICATE_KEYS_SRC_FILE=${MYDIR}/duplicate_translation_keys.lst
+
+# Grep options that are reused (normal grep)
+GREP_OPTS=""
+GREP_OPTS="${GREP_OPTS} --exclude=htdocs/theme/common/fontawe*/"
+GREP_OPTS="${GREP_OPTS} --exclude-dir=.cache --exclude-dir=.git"
+GREP_OPTS="${GREP_OPTS} --exclude=*.phar --exclude=*.webp --exclude=*.z"
+GREP_OPTS="${GREP_OPTS} --exclude=*.sw? --exclude=*.json"
+
+# Note: using 'git grep' to restrict to version controlled files
+#       and more flexible globbing.
+
+# TODO/to ignore:
+#        transnoentities(), transnoentitiesnoconv(),
+#        formSetup->newItem()
+
+exit_code=0
+
+# Find all translations keys available in the language files (for the language)
+grep --no-filename -r -oP -- '^([^#=]+?)(?=\s*=.*)' "${LANG_DIR}" \
+	| grep -x -v -F -f "${EXCLUDE_KEYS_SRC_FILE}" \
+	| sort > "${AVAILABLE_FILE_NODEDUP}"
+sort -u \
+	< "${AVAILABLE_FILE_NODEDUP}" \
+	> "${AVAILABLE_FILE}"
+
+
+# Combine strings found in sources with pre-determined dynamic string values.
+
+## Build some regex strings to match translations
+#
+EXTRACT_STR=""
+JOIN_STR=""
+for t in '->trans' '->transnoentities' '->transnoentitiesnoconv' 'formSetup->newItem' ; do
+	MATCH_STR="$MATCH_STR$JOIN_STR$t"
+	EXTRACT_STR="$EXTRACT_STR$JOIN_STR(?<=${t}\\([\"'])([^\"']+)(?=[\"']\$)"
+	JOIN_STR="|"
+done
+
+{
+	# Find static strings that are translated in the sources (comments stripped)
+	# shellcheck disable=2086
+	# With std grep: `grep --no-filename -r ${GREP_OPTS} -- '->trans(' . `
+	# Using git grep avoiding to look into unversioned files
+	# transnoentitiesnoconv
+	git grep -h -r -P -- "${MATCH_STR}\\(" ':*.php' ':*.html' \
+		| sed 's@\(^#\|[^:]//\|/\*\|^\s*\*\).*@@' \
+	| sed 's@)\|\(['"'"'"]\)\(,\)@\1\n@g' \
+		| grep -aPo "$EXTRACT_STR(?=.$)"
+
+	# "Append" the list of strings that are used in dynamic expressions.
+	# (Fixed list: needs to be updated if the dynamic strings evolve.)
+	cat "${DYNAMIC_KEYS_SRC_FILE}"
+} \
+	| grep -x -v -F -f "${EXCLUDE_KEYS_SRC_FILE}" \
+	| sort -u \
+	| grep -v -P '^(#|$)' \
+	> "${EXPECTED_FILE}"
+
+
+# shellcheck disable=2050
+if [ 0 = 1 ] ; then
+	# Find dynamic keys for call to trans.
+	# shellcheck disable=2086
+	grep --no-filename ${GREP_OPTS} -r -- '->trans(' . \
+		| tr ')' '\n' \
+		| grep -- '->trans(' \
+		| grep -v -P '(?<=->trans\(["'"'"'])([^"'"'"']*)(?=["'"'"'])' \
+		| grep -Po '(?<=->trans\()(.*)' \
+		| sort -u \
+		> "${DYNAMIC_KEYS_FILE}"
+fi
+
+
+# Produce reports on STDOUT.
+# Some output is already compatible with message extraction for github annotation (logToCs.py)
+# # Produce reports on STDOUT.
+# Some output is already compatible with message extraction for github annotation (logToCs.py)
+#
+diff "${AVAILABLE_FILE}" "${EXPECTED_FILE}" \
+	| grep -E "^[<>]" \
+	| grep -v -P "^< ${EXPECTED_REGEX}$" \
+	| sort \
+	> "${MISSING_AND_UNUSED_FILE}"
+
+if [ -s "${MISSING_AND_UNUSED_FILE}" ] ; then
+	echo "##[group]List Apparently Unused Translations (<) and Missing Translations (>)"
+	echo
+	echo "## :warning: Unused Translations may match ->trans(\$key.'SomeString')."
+	echo "##   You can add such dynamic keys to $(basename "$DYNAMIC_KEYS_SRC_FILE")"
+	echo "##   so that they are ignored for this report."
+	echo "## :warning: Unused Translations may be commented in the code"
+	echo "##   You can add such 'disabled' keys to $(basename "$EXCLUDE_KEYS_SRC_FILE")"
+	echo "##   so that they are ignored for this report."
+	echo
+	cat "${MISSING_AND_UNUSED_FILE}"
+	echo "##[endgroup]"
+	echo
+fi
+
+sed -n 's@< \(.*\)@^\1\\s*=@p' \
+	< "${MISSING_AND_UNUSED_FILE}" \
+	> "${UNUSED_FILE}.grep"
+
+# Too many results, git grep is slow
+#sed -n 's@> \(.*\)@trans.["'"'"']\1["'"'"'].@p' \
+#	< "${MISSING_AND_UNUSED_FILE}" \
+#	> "${MISSING_FILE}.grep"
+#
+
+# Prepare file with exact matches for use with `git grep`, supposing " quotes
+#
+REPL_STR=""
+for t in trans transnoentities transnoentitiesnoconv ; do
+   REPL_STR="${REPL_STR}\n->${t}(\"\\1\","
+   REPL_STR="${REPL_STR}\n->${t}('\\1',"
+   REPL_STR="${REPL_STR}\n->${t}(\"\\1\")"
+   REPL_STR="${REPL_STR}\n->${t}('\\1')"
+done
+
+sed -n 's@> \(.*\)'"@${REPL_STR}@p" \
+	< "${MISSING_AND_UNUSED_FILE}" \
+	| grep -v -E '^$' \
+	> "${MISSING_FILE}.grep"
+
+
+
+if [ -s "${UNUSED_FILE}.grep" ] ; then
+	exit_code=1
+
+	# Report unused translation in recognizable format
+	git grep -n --column -r -f "${UNUSED_FILE}.grep" -- "${LANG_DIR}"'/*.lang' \
+		| sort -t: -k 4 \
+		| sed 's@^\([^:]*:[^:]*:[^:]*:\)\s*@\1 Not used, translated; @'
+fi
+
+if [ -s "${MISSING_FILE}.grep" ] ; then
+	exit_code=1
+
+	# Report missing translation in recognizable format
+	git grep -n --column -r -F -f "${MISSING_FILE}.grep" -- ':*.php' ':*.html' \
+		| sort -t: -k 4 \
+		| sed 's@^\([^:]*:[^:]*:[^:]*:\)\s*@\1 Missing translation; @'
+fi
+
+
+diff "${AVAILABLE_FILE_NODEDUP}" "${AVAILABLE_FILE}" \
+	| grep -Po '(?<=^\< )(.*)$' \
+	| grep -x -v -F -f "${DUPLICATE_KEYS_SRC_FILE}" \
+	| sed 's/.*/^\0=/' \
+	> "${DUPLICATE_KEYS_FILE}"
+
+if [ -s "${DUPLICATE_KEYS_FILE}" ] ; then
+	exit_code=1
+	echo
+	echo "##[group]List Duplicate Keys"
+	echo "## :warning:"
+	echo "##   Duplicate keys may be expected across language files."
+	echo "##   You may want to avoid them or they could be a copy/paste mistake."
+	echo "##   You can add add valid duplicates to $(basename "$DUPLICATE_KEYS_SRC_FILE")"
+	echo "##   so that they are ignored for this report."
+	cat "${DUPLICATE_KEYS_FILE}"
+	echo "##[endgroup]"
+	echo
+
+	git grep -n -r -f "${DUPLICATE_KEYS_FILE}" -- "${LANG_DIR}"'/*.lang' \
+		| sort -t: -k 3 \
+		| sed 's@^\([^:]*:[^:]*:\)\s*@\1 Is/Has duplicate @'
+fi
+
+
+exit $exit_code
diff --git a/pyproject.toml b/pyproject.toml
index 23f76292a93..39d126bd778 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # `codespell` can be run as a standalone program from the CLI
 # with the appropriate default options.
 
-skip = "*/.*/*,*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents"
+skip = "*/.*/*,*/langs/*,*/build/exe/*,**.log,*.pdf,*dev/resources/*,*.phar,*.z,*.gz,*.sql,*.svg,*htdocs/includes/*,*/textiso.txt,*.js,*README-*,*build/rpm/*spec,*build/pad/*ml,*htdocs/includes/phpoffice/*,*htdocs/includes/tecnickcom/*,*dev/initdemo/removeconfdemo.sh,*dev/tools/codespell/*,*dev/trans*/ignore_translation_keys.lst,*pyproject.toml,*build/exe/*,*fontawe*,*htdocs/theme/*/flags-sprite.inc.php,*dev/setup/codetemplates/codetemplates.xml,*/php.ini,*/html_cerfafr.*,*/lessc.class.php,*.asciidoc,*.xml,*opensurvey/css/style.css,*dev/tools/phan/stubs/*,*/documents"
 
 check-hidden = true
 quiet-level=2

From 4140f59335d92b09289d91a932073c383633cefb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 17:58:32 +0100
Subject: [PATCH 0790/1862] Fix default value

---
 htdocs/contrat/list.php               | 4 ++--
 htdocs/core/class/html.form.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 20345dd7d50..a8704ff8da3 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -67,7 +67,7 @@ $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
 $search_all = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search_status = GETPOST('search_status', 'alpha');
 $socid = GETPOSTINT('socid');
-$search_user = GETPOSTINT('search_user');
+$search_user = GETPOST('search_user', 'intcomma');
 $search_sale = GETPOSTINT('search_sale');
 $search_product_category = GETPOSTINT('search_product_category');
 $search_dfmonth = GETPOSTINT('search_dfmonth');
@@ -128,7 +128,7 @@ if (!$sortorder) {
 
 // Security check
 $id = GETPOSTINT('id');
-if ($user->socid) {
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'contrat', $id);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fb7f4a0ea4d..cb92142e820 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1990,7 +1990,7 @@ class Form
 	/**
 	 *    Return select list of users
 	 *
-	 * @param string 		$selected 		User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)
+	 * @param string|int	$selected 		User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1 or '', keep unselected (if empty is allowed)
 	 * @param string 		$htmlname 		Field name in form
 	 * @param int|string 	$show_empty 	0=list with no empty value, 1=add also an empty value into list
 	 * @param array|null	$exclude 		Array list of users id to exclude

From c03b5dc2ec46573428d1ba5d0ca8fe1359195306 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 18:50:02 +0100
Subject: [PATCH 0791/1862] Fix for phan output

---
 dev/tools/apstats.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 400cefa5558..cbfe0cf5745 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -801,7 +801,7 @@ if ($nblines != 0) {
 
 // Technical debt Phan
 
-if ($phan_nblines != 0) {
+if ($dir_phan != 'disabled') {
 	$datatable_script .= '
  if (typeof(DataTable)==="function") {jQuery(".sourcephan").toggle(true);}
  let phantable = new DataTable("#technicaldebtphan table", {

From c853a4687f01b9bd8e0cec8f30c9872d5f4eed23 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 19:41:31 +0100
Subject: [PATCH 0792/1862] Can delete last and criteria into the generic
 component.

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cb92142e820..4fe3995cd65 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -10706,7 +10706,7 @@ class Form
 		$ret .= '<div class="divadvancedsearchfieldcompinput inline-block minwidth500 maxwidth300onsmartphone">';
 
 		// Show select fields as tags.
-		$ret .= '<div name="divsearch_component_params" class="noborderbottom search_component_params inline-block valignmiddle">';
+		$ret .= '<div id="divsearch_component_params" name="divsearch_component_params" class="noborderbottom search_component_params inline-block valignmiddle">';
 
 		if ($search_component_params_hidden) {
 			// Split the criteria on each AND
@@ -10804,6 +10804,27 @@ class Form
 			// We repost the form
 			$(this).closest(\'form\').submit();
 		});
+
+		jQuery("#search_component_params_input").keydown(function(e) {
+			console.log("We press a key on the filter field that is "+jQuery("#search_component_params_input").val());
+			console.log(e.which);
+			if (jQuery("#search_component_params_input").val() == "" && e.which == 8) {
+				/* We click on back when the input field is already empty */
+			   	event.preventDefault();
+				jQuery("#divsearch_component_params .tagsearch").last().remove();
+				/* Regenerate content of search_component_params_hidden from remaining .tagsearch */
+				var s = "";
+				jQuery("#divsearch_component_params .tagsearch").each(function( index ) {
+					if (s != "") {
+						s = s + " AND ";
+					}
+					s = s + $(this).attr("data-ufilter");
+				});
+				console.log("New value for search_component_params_hidden = "+s);
+				jQuery("#search_component_params_hidden").val(s);
+			}
+		});
+
 		</script>
 		';
 

From 0fb4a4456351e49060c89e95f0febb56b8c11590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Mar 2024 22:13:37 +0100
Subject: [PATCH 0793/1862] Fix nb of lines

---
 dev/tools/apstats.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index cbfe0cf5745..eb737b9690e 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -650,7 +650,8 @@ $html .= '</div>';
 
 $html .= '</section>'."\n";
 
-$tmp = '';
+
+$tmpstan = '';
 $nblines = 0;
 if (!empty($output_arrtd)) {
 	foreach ($output_arrtd as $line) {
@@ -659,16 +660,16 @@ if (!empty($output_arrtd)) {
 		preg_match('/^::error file=(.*),line=(\d+),col=(\d+)::(.*)$/', $line, $reg);
 		if (!empty($reg[1])) {
 			if ($nblines < 20) {
-				$tmp .= '<tr class="nohidden">';
+				$tmpstan .= '<tr class="nohidden">';
 			} else {
-				$tmp .= '<tr class="hidden sourcephpstan">';
+				$tmpstan .= '<tr class="hidden sourcephpstan">';
 			}
-			$tmp .= '<td>'.dolPrintLabel($reg[1]).'</td>';
-			$tmp .= '<td class="">';
-			$tmp .= '<a href="'.($urlgit.$reg[1].'#L'.$reg[2]).'" target="_blank">'.dolPrintLabel($reg[2]).'</a>';
-			$tmp .= '</td>';
-			$tmp .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($reg[4]).'">'.dolPrintLabel($reg[4]).'</td>';
-			$tmp .= '</tr>'."\n";
+			$tmpstan .= '<td>'.dolPrintLabel($reg[1]).'</td>';
+			$tmpstan .= '<td class="">';
+			$tmpstan .= '<a href="'.($urlgit.$reg[1].'#L'.$reg[2]).'" target="_blank">'.dolPrintLabel($reg[2]).'</a>';
+			$tmpstan .= '</td>';
+			$tmpstan .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($reg[4]).'">'.dolPrintLabel($reg[4]).'</td>';
+			$tmpstan .= '</tr>'."\n";
 
 			$nblines++;
 		}
@@ -773,7 +774,8 @@ $html .= '</section>';
 
 
 // Technical debt PHPstan
-if ($nblines != 0) {
+
+if ($dirphpstan != 'disabled') {
 	$datatable_script .= '
  if (typeof(DataTable)==="function") {jQuery(".sourcephpstan").toggle(true);}
  let phpstantable = new DataTable("#technicaldebt table", {
@@ -789,7 +791,7 @@ if ($nblines != 0) {
 	$html .= '<div class="div-table-responsive">'."\n";
 	$html .= '<table class="list_technical_debt centpercent">'."\n";
 	$html .= '<thead><tr class="trgroup"><td>File</td><td>Line</td><td>Type</td></tr></thead><tbody>'."\n";
-	$html .= $tmp;
+	$html .= $tmpstan;
 	$html .= '<tbody></table>';
 	// Disabled, no more required as list is managed with datatable
 	//$html .= '<div><span class="seedetail" data-source="phpstan" id="sourcephpstan">Show all...</span></div>';

From 1431582b82c91c480662a6a7abebd4733006621d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 10:10:17 +0100
Subject: [PATCH 0794/1862] Fix cursor

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

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 3c70bdc74aa..749674956c0 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -203,7 +203,7 @@ print '<tr>';
 print '<td class="tdtop nopaddingleftimp">';
 
 print '<div class="centpercent center margintoponly marginbottomonly">';
-print img_picto('', 'setup', 'class="pictofixedwidth"').'<a class="classlink" id="lnk">'.$langs->trans("ShowAdvancedOptions").'...</a>';
+print img_picto('', 'setup', 'class="pictofixedwidth"').'<a class="classlink cursorpointer" id="lnk">'.$langs->trans("ShowAdvancedOptions").'...</a>';
 print '</div>';
 
 print '<script type="text/javascript">

From 517bffc2118d06c549eea83369e367272560d0af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 10:16:32 +0100
Subject: [PATCH 0795/1862] Escape

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

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index fb65a08dd92..b44581098bc 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -191,7 +191,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
 	print '</div>';
 } else {
-	print 'No method available with database '.$label;
+	print 'No method available with database '.dol_escape_htmltag($label);
 }
 print '</fieldset>';
 print '</div>';

From c7d0ee18beb8c0d85627d517645d2c249e78e39a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 10:19:50 +0100
Subject: [PATCH 0796/1862] Fix escape

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

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 749674956c0..3c70bdc74aa 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -203,7 +203,7 @@ print '<tr>';
 print '<td class="tdtop nopaddingleftimp">';
 
 print '<div class="centpercent center margintoponly marginbottomonly">';
-print img_picto('', 'setup', 'class="pictofixedwidth"').'<a class="classlink cursorpointer" id="lnk">'.$langs->trans("ShowAdvancedOptions").'...</a>';
+print img_picto('', 'setup', 'class="pictofixedwidth"').'<a class="classlink" id="lnk">'.$langs->trans("ShowAdvancedOptions").'...</a>';
 print '</div>';
 
 print '<script type="text/javascript">

From 8d7911f4844ed0b52b3246546ed9a7d2ef92d74d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 10:32:15 +0100
Subject: [PATCH 0797/1862] Fix compatibility with USF.

---
 .../class/accountingjournal.class.php         | 56 ++++++++++++-------
 htdocs/website/class/website.class.php        | 42 +++++++++-----
 htdocs/website/class/websitepage.class.php    |  1 +
 3 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 76b6cdba5a8..a0fa2147dae 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -161,33 +161,47 @@ class AccountingJournal extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string 	$sortorder 	Sort Order
-	 * @param string 	$sortfield 	Sort field
-	 * @param int 		$limit 		limit
-	 * @param int 		$offset 	offset limit
-	 * @param array 	$filter 	filter array
-	 * @param string 	$filtermode filter mode (AND or OR)
-	 * @return int 					Return integer <0 if KO, >0 if OK
+	 * @param string 		$sortorder 	Sort Order
+	 * @param string 		$sortfield 	Sort field
+	 * @param int 			$limit 		limit
+	 * @param int 			$offset 	offset limit
+	 * @param string|array 	$filter 	filter array
+	 * @param string 		$filtermode filter mode (AND or OR)
+	 * @return int 						Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		$sql = "SELECT rowid, code, label, nature, active";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.code' || $key == 't.label' || $key == 't.nature') {
-					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
-				} elseif ($key == 't.rowid' || $key == 't.active') {
-					$sqlwhere[] = $key.'='.((int) $value);
-				}
-			}
-		}
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
+
+		// Manage filter
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.code' || $key == 't.label' || $key == 't.nature') {
+						$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
+					} elseif ($key == 't.rowid' || $key == 't.active') {
+						$sqlwhere[] = $key.'='.((int) $value);
+					}
+				}
+			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
+			}
+
+			$filter = '';
+		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index a4b80193d02..3a7bbe4cb95 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -403,15 +403,15 @@ class Website extends CommonObject
 	/**
 	 * Load all object in memory ($this->records) from the database
 	 *
-	 * @param 	string 		$sortorder 		Sort Order
-	 * @param 	string 		$sortfield 		Sort field
-	 * @param 	int    		$limit     		offset limit
-	 * @param 	int    		$offset    		offset limit
-	 * @param 	array  		$filter    		filter array
-	 * @param 	string 		$filtermode 	filter mode (AND or OR)
-	 * @return 	array|int                 	int <0 if KO, array of pages if OK
+	 * @param 	string 			$sortorder 		Sort Order
+	 * @param 	string 			$sortfield 		Sort field
+	 * @param 	int    			$limit     		limit
+	 * @param 	int    			$offset    		offset limit
+	 * @param 	string|array	$filter    		filter array
+	 * @param 	string 			$filtermode 	filter mode (AND or OR)
+	 * @return 	array|int       	          	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -433,15 +433,29 @@ class Website extends CommonObject
 		$sql .= " t.tms as date_modification";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		$sql .= " WHERE t.entity IN (".getEntity('website').")";
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index fd684229dd1..7a0a42a0f9f 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -515,6 +515,7 @@ class WebsitePage extends CommonObject
 		$sql = 'SELECT COUNT(t.rowid) as nb';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.((int) $websiteid);
+
 		// Manage filter (same than into fetchAll)
 		$sqlwhere = array();
 		if (count($filter) > 0) {

From 8df2ddc494658175eaab25fc432301781b4cd6f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 10:48:46 +0100
Subject: [PATCH 0798/1862] Fix sanitize sql

---
 .../accountancy/class/bookkeeping.class.php   | 278 +++++++++++-------
 1 file changed, 171 insertions(+), 107 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 909bfded02a..9975a15d59a 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -908,22 +908,38 @@ class BookKeeping extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key.'=\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
+				if ($key == 't.doc_date>=') {
+					$sqlwhere[] = "t.doc_date >= '".$this->db->idate($value)."'";
+				} elseif ($key == 't.doc_date<=') {
+					$sqlwhere[] = "t.doc_date <= '".$this->db->idate($value)."'";
+				} elseif ($key == 't.doc_date>') {
+					$sqlwhere[] = "t.doc_date > '".$this->db->idate($value)."'";
+				} elseif ($key == 't.doc_date<') {
+					$sqlwhere[] = "t.doc_date < '".$this->db->idate($value)."'";
+				} elseif ($key == 't.numero_compte>=') {
+					$sqlwhere[] = "t.numero_compte >= '".$this->db->escape($value)."'";
+				} elseif ($key == 't.numero_compte<=') {
+					$sqlwhere[] = "t.numero_compte <= '".$this->db->escape($value)."'";
+				} elseif ($key == 't.subledger_account>=') {
+					$sqlwhere[] = "t.subledger_account >= '".$this->db->escape($value)."'";
+				} elseif ($key == 't.subledger_account<=') {
+					$sqlwhere[] = "t.subledger_account <= '".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($this->db->escapeforlike($value)).'%\'';
-				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $this->db->sanitize($key).' LIKE \''.$this->db->escape($this->db->escapeforlike($value)).'%\'';
+				} elseif ($key == 't.date_creation>=') {
+					$sqlwhere[] = 't.date_creation >= \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_creation<=') {
+					$sqlwhere[] = 't.date_creation <= \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export>=') {
+					$sqlwhere[] = 't.date_export >= \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export<=') {
+					$sqlwhere[] = 't.date_export <= \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_validated>=') {
+					$sqlwhere[] = 't;date_validate >= \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_validated>=') {
+					$sqlwhere[] = 't;date_validate <= \''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} elseif ($key == 't.reconciled_option') {
@@ -1031,14 +1047,14 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param string 		$sortorder                      Sort Order
 	 * @param string 		$sortfield                      Sort field
-	 * @param int 			$limit                          Offset limit
+	 * @param int 			$limit                          Limit
 	 * @param int 			$offset                         Offset limit
-	 * @param array 		$filter                         Filter array
+	 * @param string|array 	$filter                         Filter array
 	 * @param string 		$filtermode                     Filter mode (AND or OR)
 	 * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
 	 * @return int                                          Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND', $showAlreadyExportMovements = 1)
 	{
 		global $conf;
 
@@ -1074,48 +1090,84 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_export,";
 		$sql .= " t.date_validated as date_validation";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key.'=\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
-				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key.'='.((int) $value);
-				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
-				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.credit' || $key == 't.debit') {
-					$sqlwhere[] = natural_search($key, $value, 1, 1);
-				} elseif ($key == 't.code_journal' && !empty($value)) {
-					if (is_array($value)) {
-						$sqlwhere[] = natural_search("t.code_journal", implode(',', $value), 3, 1);
-					} else {
-						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
-					}
-				} else {
-					$sqlwhere[] = natural_search($key, $value, 0, 1);
-				}
-			}
-		}
+
 		$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if ($showAlreadyExportMovements == 0) {
 			$sql .= " AND t.date_export IS NULL";
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
+
+		// Manage filter
+		if (is_array($filter)) {	// deprecated, use $filter = USF syntax
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.doc_date') {
+						$sqlwhere[] = $this->db->sanitize($key).' = \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.doc_date>=') {
+						$sqlwhere[] = "t.doc_date >= '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date<=') {
+						$sqlwhere[] = "t.doc_date <= '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date>') {
+						$sqlwhere[] = "t.doc_date > '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date<') {
+						$sqlwhere[] = "t.doc_date < '".$this->db->idate($value)."'";
+					} elseif ($key == 't.numero_compte>=') {
+						$sqlwhere[] = "t.numero_compte >= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.numero_compte<=') {
+						$sqlwhere[] = "t.numero_compte <= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.subledger_account>=') {
+						$sqlwhere[] = "t.subledger_account >= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.subledger_account<=') {
+						$sqlwhere[] = "t.subledger_account <= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
+						$sqlwhere[] = $this->db->sanitize($key).' = '.((int) $value);
+					} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
+						$sqlwhere[] = $this->db->sanitize($key).' LIKE \''.$this->db->escape($value).'%\'';
+					} elseif ($key == 't.date_creation>=') {
+						$sqlwhere[] = 't.date_creation >= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.date_creation<=') {
+						$sqlwhere[] = 't.date_creation <= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.tms>=') {
+						$sqlwhere[] = 't.tms >= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.tms<=') {
+						$sqlwhere[] = 't.tms <= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.date_export>=') {
+						$sqlwhere[] = 't.date_export >= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.date_export<=') {
+						$sqlwhere[] = 't.date_export <= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.date_validated>=') {
+						$sqlwhere[] = 't.date_validated >= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.date_validated<=') {
+						$sqlwhere[] = 't.date_validated <= \''.$this->db->idate($value).'\'';
+					} elseif ($key == 't.credit' || $key == 't.debit') {
+						$sqlwhere[] = natural_search($key, $value, 1, 1);
+					} elseif ($key == 't.code_journal' && !empty($value)) {
+						if (is_array($value)) {
+							$sqlwhere[] = natural_search("t.code_journal", implode(',', $value), 3, 1);
+						} else {
+							$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
+						}
+					} else {
+						$sqlwhere[] = natural_search($key, $value, 0, 1);
+					}
+				}
+			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND '.implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
+			}
+
+			$filter = '';
 		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
+		}
+
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
@@ -1180,16 +1232,16 @@ class BookKeeping extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param 	string 	$sortorder 		Sort Order
-	 * @param 	string 	$sortfield 		Sort field
-	 * @param 	int 	$limit 			offset limit
-	 * @param 	int 	$offset 		offset limit
-	 * @param 	array 	$filter 		filter array
-	 * @param 	string 	$filtermode 	filter mode (AND or OR)
-	 * @param 	int 	$option 		option (0: aggregate by general account or 1: aggreegate by subaccount)
-	 * @return 	int 					Return integer <0 if KO, >0 if OK
+	 * @param 	string 			$sortorder 		Sort Order
+	 * @param 	string 			$sortfield 		Sort field
+	 * @param 	int 			$limit 			Limit
+	 * @param 	int 			$offset 		Offset limit
+	 * @param 	string|array 	$filter 		Filter
+	 * @param 	string 			$filtermode 	Filter mode (AND or OR)
+	 * @param 	int 			$option 		option (0: aggregate by general account or 1: aggreegate by subaccount)
+	 * @return 	int 							Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0)
+	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND', $option = 0)
 	{
 		global $conf;
 
@@ -1206,52 +1258,64 @@ class BookKeeping extends CommonObject
 		$sql .= " SUM(t.debit) as debit,";
 		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.doc_date') {
-					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
-				} elseif ($key == 't.doc_date>=') {
-					$sqlwhere[] = "t.doc_date >= '".$this->db->idate($value)."'";
-				} elseif ($key == 't.doc_date<=') {
-					$sqlwhere[] = "t.doc_date <= '".$this->db->idate($value)."'";
-				} elseif ($key == 't.doc_date>') {
-					$sqlwhere[] = "t.doc_date > '".$this->db->idate($value)."'";
-				} elseif ($key == 't.doc_date<') {
-					$sqlwhere[] = "t.doc_date < '".$this->db->idate($value)."'";
-				} elseif ($key == 't.numero_compte>=') {
-					$sqlwhere[] = "t.numero_compte >= '".$this->db->escape($value)."'";
-				} elseif ($key == 't.numero_compte<=') {
-					$sqlwhere[] = "t.numero_compte <= '".$this->db->escape($value)."'";
-				} elseif ($key == 't.subledger_account>=') {
-					$sqlwhere[] = "t.subledger_account >= '".$this->db->escape($value)."'";
-				} elseif ($key == 't.subledger_account<=') {
-					$sqlwhere[] = "t.subledger_account <= '".$this->db->escape($value)."'";
-				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
-				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $this->db->sanitize($key)." LIKE '".$this->db->escape($value)."%'";
-				} elseif ($key == 't.subledger_label') {
-					$sqlwhere[] = $this->db->sanitize($key)." LIKE '".$this->db->escape($value)."%'";
-				} elseif ($key == 't.code_journal' && !empty($value)) {
-					if (is_array($value)) {
-						$sqlwhere[] = natural_search("t.code_journal", implode(',', $value), 3, 1);
-					} else {
-						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
-					}
-				} elseif ($key == 't.reconciled_option') {
-					$sqlwhere[] = 't.lettering_code IS NULL';
-				} else {
-					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
-				}
-			}
-		}
 		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
+		// Manage filter
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.doc_date') {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date>=') {
+						$sqlwhere[] = "t.doc_date >= '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date<=') {
+						$sqlwhere[] = "t.doc_date <= '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date>') {
+						$sqlwhere[] = "t.doc_date > '".$this->db->idate($value)."'";
+					} elseif ($key == 't.doc_date<') {
+						$sqlwhere[] = "t.doc_date < '".$this->db->idate($value)."'";
+					} elseif ($key == 't.numero_compte>=') {
+						$sqlwhere[] = "t.numero_compte >= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.numero_compte<=') {
+						$sqlwhere[] = "t.numero_compte <= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.subledger_account>=') {
+						$sqlwhere[] = "t.subledger_account >= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.subledger_account<=') {
+						$sqlwhere[] = "t.subledger_account <= '".$this->db->escape($value)."'";
+					} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '".$this->db->escape($value)."%'";
+					} elseif ($key == 't.subledger_label') {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '".$this->db->escape($value)."%'";
+					} elseif ($key == 't.code_journal' && !empty($value)) {
+						if (is_array($value)) {
+							$sqlwhere[] = natural_search("t.code_journal", implode(',', $value), 3, 1);
+						} else {
+							$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
+						}
+					} elseif ($key == 't.reconciled_option') {
+						$sqlwhere[] = 't.lettering_code IS NULL';
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
+				}
+			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " AND ".implode(" ".$this->db->sanitize($filtermode)." ", $sqlwhere);
+			}
+
+			$filter = '';
+		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($option)) {

From 0887664888d1eede9328763ed06edcee914fffbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 11:23:34 +0100
Subject: [PATCH 0799/1862] NEW: All fetchAll() method now support the USF
 syntax.

---
 htdocs/bom/class/bom.class.php                | 19 +++---
 htdocs/core/class/cgenericdic.class.php       | 46 +++++++++------
 htdocs/core/class/cproductnature.class.php    | 47 ++++++++++-----
 htdocs/core/class/ctyperesource.class.php     | 51 +++++++++++-----
 htdocs/core/class/cunits.class.php            | 56 +++++++++++-------
 htdocs/core/class/link.class.php              |  2 +-
 htdocs/cron/class/cronjob.class.php           | 25 ++++++--
 htdocs/ecm/class/ecmfiles.class.php           | 51 ++++++++++------
 .../class/knowledgerecord.class.php           | 58 +++++++++++--------
 htdocs/mrp/class/mo.class.php                 | 52 +++++++++++------
 .../class/productstockentrepot.class.php      | 41 ++++++++-----
 htdocs/resource/class/dolresource.class.php   | 29 +++++++---
 htdocs/ticket/class/ticket.class.php          | 31 ++++++----
 13 files changed, 328 insertions(+), 180 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index a2199a42f97..451926a030c 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -485,18 +485,16 @@ class BOM extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      		$sortorder    Sort Order
+	 * @param  string      		$sortfield    Sort field
+	 * @param  int         		$limit        Limit
+	 * @param  int         		$offset       Offset
+	 * @param  string   		$filter       Filter USF
+	 * @param  string      		$filtermode   Filter mode (AND or OR)
+	 * @return array|int        			  int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -510,6 +508,7 @@ class BOM extends CommonObject
 			$sql .= ' WHERE 1 = 1';
 		}
 
+		// Manage filter
 		$errormessage = '';
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index 9c617d9c78d..b6e9e2e9674 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -220,16 +220,15 @@ class CGenericDic extends CommonDict
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param string 		$sortorder 		Sort Order
+	 * @param string 		$sortfield 		Sort field
+	 * @param int    		$limit     		Limit
+	 * @param int    		$offset    		offset limit
+	 * @param string|array  $filter    		filter USF
+	 * @param string 		$filtermode 	filter mode (AND or OR)
+	 * @return int 							Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -243,23 +242,36 @@ class CGenericDic extends CommonDict
 		}
 
 		$sql = "SELECT";
-		$sql .= " t.".$fieldrowid.",";
+		$sql .= " t.".$this->db->sanitize($fieldrowid).",";
 		$sql .= " t.code,";
-		$sql .= " t.".$fieldlabel." as label,";
+		$sql .= " t.".$this->db->sanitize($fieldlabel)." as label,";
 		$sql .= " t.active";
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
+				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " WHERE ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
 		}
 
-		if (count($sqlwhere) > 0) {
-			$sql .= " WHERE ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
+
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index b395bf8983f..b643ff8c931 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -153,13 +153,13 @@ class CProductNature extends CommonDict
 	 *
 	 * @param  string      $sortorder    Sort Order
 	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
+	 * @param  int         $limit        Limit
 	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filter       Filter USF
 	 * @param  string      $filtermode   Filter mode (AND or OR)
 	 * @return array|int                 int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -169,23 +169,38 @@ class CProductNature extends CommonDict
 		$sql .= " t.label,";
 		$sql .= " t.active";
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		$sql .= " WHERE 1 = 1";
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif ($key == 't.label') {
-					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif (strpos($key, 'date') !== false) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} elseif ($key == 't.label') {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " AND ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 5d839fb0f26..b6c100a7bab 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -194,16 +194,15 @@ class Ctyperesource extends CommonDict
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int Return integer <0 if KO, >0 if OK
+	 * @param string 		$sortorder 		Sort Order
+	 * @param string 		$sortfield 		Sort field
+	 * @param int    		$limit     		Limit
+	 * @param int    		$offset    		Offset limit
+	 * @param string|array  $filter    		filter array
+	 * @param string 		$filtermode 	filter mode (AND or OR)
+	 * @return int 							Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -213,18 +212,40 @@ class Ctyperesource extends CommonDict
 		$sql .= " t.label,";
 		$sql .= " t.active";
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		$sql .= " WHERE 1 = 1";
 
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif (strpos($key, 'date') !== false) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} elseif ($key == 't.label') {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
+					}
+				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " AND ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
 		}
 
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
+
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 7db6859f82b..6339175c5d5 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -207,15 +207,15 @@ class CUnits extends CommonDict
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      	$sortorder    	Sort Order
+	 * @param  string      	$sortfield    	Sort field
+	 * @param  int         	$limit        	Limit
+	 * @param  int         	$offset       	Offset
+	 * @param  string|array $filter       	Filter USF
+	 * @param  string      	$filtermode   	Filter mode (AND or OR)
+	 * @return array|int                 	int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -229,24 +229,38 @@ class CUnits extends CommonDict
 		$sql .= " t.scale,";
 		$sql .= " t.active";
 		$sql .= " FROM ".$this->db->prefix()."c_units as t";
+		$sql .= " WHERE 1 = 1";
 
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
-					$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
-				} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
-					$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
-				} else {
-					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif (strpos($key, 'date') !== false) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->escape($value)."'";
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index b8a54ec53c7..34f05db4c11 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -237,7 +237,7 @@ class Link extends CommonObject
 		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".$this->db->prefix()."links";
 		$sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".((int) $objectid);
 		if ($conf->entity != 0) {
-			$sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND entity = ".((int) $conf->entity);
 		}
 		if ($sortfield) {
 			if (empty($sortorder)) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index b9fef39837f..419d0f65f7e 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -573,14 +573,27 @@ class Cronjob extends CommonObject
 		}
 
 		// Manage filter
-		if (is_array($filter) && count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
-				} else {
-					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid') {
+						$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
+					} else {
+						$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+
+			$filter = '';
+		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 0f622d01370..e5b8e4ebadf 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -530,15 +530,15 @@ class EcmFiles extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param 	string $sortorder 	Sort Order
-	 * @param 	string $sortfield 	Sort field
-	 * @param 	int    $limit     	limit
-	 * @param 	int    $offset    	offset limit
-	 * @param 	array  $filter    	filter array
-	 * @param 	string $filtermode 	filter mode (AND or OR)
-	 * @return 	int 				Return integer <0 if KO, >0 if OK
+	 * @param 	string 			$sortorder 		Sort Order
+	 * @param 	string 			$sortfield 		Sort field
+	 * @param 	int    			$limit     		Limit
+	 * @param 	int    			$offset    		Offset limit
+	 * @param 	string|array  	$filter    		filter array
+	 * @param 	string 			$filtermode 	filter mode (AND or OR)
+	 * @return 	int 							Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -564,27 +564,40 @@ class EcmFiles extends CommonObject
 		$sql .= " t.src_object_type,";
 		$sql .= " t.src_object_id";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE 1 = 1';
 
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.src_object_id') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.src_object_id') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
+		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
-		$sql .= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
 		 if (isModEnabled('multicompany')) {
 		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		 }*/
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
-		}
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 5e6ed1b5ebb..7aecbd5a79c 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -369,18 +369,16 @@ class KnowledgeRecord extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      		$sortorder    	Sort Order
+	 * @param  string      		$sortfield    	Sort field
+	 * @param  int        		$limit        	Limit
+	 * @param  int         		$offset       	Offset
+	 * @param  string|array     $filter       	Filter USF.
+	 * @param  string      		$filtermode   	Filter mode (AND or OR)
+	 * @return array|int                 		int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -393,23 +391,37 @@ class KnowledgeRecord extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} elseif (strpos($value, '%') === false) {
+						$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 4b91802fd5a..a194503ec74 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -474,15 +474,15 @@ class Mo extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      		$sortorder    	Sort Order
+	 * @param  string      		$sortfield    	Sort field
+	 * @param  int         		$limit        	Limit
+	 * @param  int         		$offset       	Offset
+	 * @param  string|array     $filter       	Filter USF.
+	 * @param  string      		$filtermode   	Filter mode (AND or OR)
+	 * @return array|int                 		int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -496,21 +496,35 @@ class Mo extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif (strpos($key, 'date') !== false) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index a8937fced52..d77531060cb 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -232,15 +232,15 @@ class ProductStockEntrepot extends CommonObject
 	 *
 	 * @param int	 $fk_product 	Product from which we want to get limit and desired stock by warehouse
 	 * @param int	 $fk_entrepot 	Warehouse in which we want to get products limit and desired stock
-	 * @param string $sortorder  	Sort Order
-	 * @param string $sortfield  	Sort field
-	 * @param int    $limit      	limit
-	 * @param int    $offset     	offset limit
-	 * @param array  $filter     	filter array
-	 * @param string $filtermode 	filter mode (AND or OR)
-	 * @return int|array 			Return integer <0 if KO, array if OK
+	 * @param string 		$sortorder  	Sort Order
+	 * @param string 		$sortfield  	Sort field
+	 * @param int    		$limit      	Limit
+	 * @param int    		$offset     	Offset limit
+	 * @param string|array  $filter     	Filter USF.
+	 * @param string 		$filtermode 	Filter mode (AND or OR)
+	 * @return int|array 					Return integer <0 if KO, array if OK
 	 */
-	public function fetchAll($fk_product = 0, $fk_entrepot = 0, $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($fk_product = 0, $fk_entrepot = 0, $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -256,14 +256,27 @@ class ProductStockEntrepot extends CommonObject
 		$sql .= " WHERE 1=1";
 
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= " AND ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= " AND ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($fk_product) && $fk_product > 0) {
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index cce2244df42..76a4334d71c 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -599,14 +599,14 @@ class Dolresource extends CommonObject
 	/**
 	 * Load resource objects into $this->lines
 	 *
-	 * @param	string		$sortorder		sort order
-	 * @param	string		$sortfield		sort field
-	 * @param	int			$limit			limit page
-	 * @param	int			$offset			page
-	 * @param	array		$filter			filter output
-	 * @return	int							if KO: <0 || if OK number of lines loaded
+	 * @param	string			$sortorder		Sort order
+	 * @param	string			$sortfield		Sort field
+	 * @param	int				$limit			Limit page
+	 * @param	int				$offset			Offset page
+	 * @param	string|array	$filter			Filter USF.
+	 * @return	int								If KO: <0 || if OK number of lines loaded
 	 */
-	public function fetchAll(string $sortorder, string $sortfield, int $limit, int $offset, array $filter = [])
+	public function fetchAll(string $sortorder, string $sortfield, int $limit, int $offset, $filter = '')
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
@@ -641,16 +641,27 @@ class Dolresource extends CommonObject
 		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
 
 		// Manage filter
-		if (!empty($filter)) {
+		if (is_array($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {
 					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->idate($value)."'";
 				} elseif (strpos($key, 'ef.') !== false) {
-					$sql .= ((float) $value);
+					$sql .= " AND ".$this->db->sanitize($key)." = ".((float) $value);
 				} else {
 					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
+
+			$filter = '';
+		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4980565b264..679d4489ad9 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -782,16 +782,16 @@ class Ticket extends CommonObject
 	/**
 	 * Load all objects in memory from database
 	 *
-	 * @param  User   $user      	User for action
-	 * @param  string $sortorder 	Sort order
-	 * @param  string $sortfield 	Sort field
-	 * @param  int    $limit     	page number
-	 * @param  int    $offset    	Offset for query
-	 * @param  int    $arch      	archive or not (not used)
-	 * @param  array  $filter    	Filter for query
-	 * @return int 					Return integer <0 if KO, >0 if OK
+	 * @param  User   		$user      	User for action
+	 * @param  string 		$sortorder 	Sort order
+	 * @param  string 		$sortfield 	Sort field
+	 * @param  int    		$limit     	Limit
+	 * @param  int    		$offset    	Offset page
+	 * @param  int    		$arch      	Archive or not (not used)
+	 * @param  string|array $filter    	Filter for query
+	 * @return int 						Return integer <0 if KO, >0 if OK
 	 */
-	public function fetchAll($user, $sortorder = 'ASC', $sortfield = 't.datec', $limit = 0, $offset = 0, $arch = 0, $filter = [])
+	public function fetchAll($user, $sortorder = 'ASC', $sortfield = 't.datec', $limit = 0, $offset = 0, $arch = 0, $filter = '')
 	{
 		global $langs, $extrafields;
 
@@ -845,7 +845,7 @@ class Ticket extends CommonObject
 		$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 
 		// Manage filter
-		if (!empty($filter)) {
+		if (is_array($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
 					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
@@ -863,6 +863,17 @@ class Ticket extends CommonObject
 					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 				}
 			}
+
+			$filter = '';
+		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		// Case of external user

From 09802f76c18f0119cb66b3b742bb6c66633e385b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 11:27:26 +0100
Subject: [PATCH 0800/1862] NEW: All fetchAll() method now support the USF
 syntax.

---
 .../partnership/class/partnership.class.php   | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 1b47c556e7f..e88acef0c56 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -424,15 +424,15 @@ class Partnership extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      		$sortorder    	Sort Order
+	 * @param  string      		$sortfield    	Sort field
+	 * @param  int         		$limit        	Limit
+	 * @param  int         		$offset       	Offset page
+	 * @param  string|array     $filter       	Filter USF.
+	 * @param  string      		$filtermode   	Filter mode (AND or OR)
+	 * @return array|int                 		int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -446,23 +446,37 @@ class Partnership extends CommonObject
 		} else {
 			$sql .= ' WHERE 1 = 1';
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid') {
+						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
+					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+					} elseif (strpos($value, '%') === false) {
+						$sqlwhere[] = $this->db->sanitize($key)." IN (".$this->db->sanitize($this->db->escape($value)).")";
+					} else {
+						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {

From ef45783d64c9e43b2007cd7d958a5d1c1a633a6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 11:33:58 +0100
Subject: [PATCH 0801/1862] NEW: All fetchAll() method now support the USF
 syntax.

---
 htdocs/cron/class/cronjob.class.php           | 18 +++---
 .../class/productcustomerprice.class.php      | 52 +++++++++++------
 .../class/productfournisseurprice.class.php   | 58 +++++++++++--------
 3 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 419d0f65f7e..a45613b26aa 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -513,16 +513,16 @@ class Cronjob extends CommonObject
 	/**
 	 * Load list of cron jobs in a memory array from the database
 	 *
-	 * @param	string		$sortorder		sort order
-	 * @param	string		$sortfield		sort field
-	 * @param	int			$limit			limit page
-	 * @param	int			$offset			page
-	 * @param	int			$status			display active or not
-	 * @param	array		$filter			filter output
-	 * @param	int			$processing		Processing or not
-	 * @return	int							if KO: <0 || if OK: >0
+	 * @param	string			$sortorder		Sort order
+	 * @param	string			$sortfield		Sort field
+	 * @param	int				$limit			Limit page
+	 * @param	int				$offset			Offset ppage
+	 * @param	int				$status			Display active or not
+	 * @param	string|array	$filter			Filter USF.
+	 * @param	int				$processing		Processing or not
+	 * @return	int								if KO: <0 || if OK: >0
 	 */
-	public function fetchAll(string $sortorder = 'DESC', string $sortfield = 't.rowid', int $limit = 0, int $offset = 0, int $status = 1, array $filter = [], int $processing = -1)
+	public function fetchAll(string $sortorder = 'DESC', string $sortfield = 't.rowid', int $limit = 0, int $offset = 0, int $status = 1, $filter = '', int $processing = -1)
 	{
 		$this->lines = array();
 
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 39dda63688f..372dc877131 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -368,15 +368,15 @@ class ProductCustomerPrice extends CommonObject
 	/**
 	 * Load all customer prices in memory from database
 	 *
-	 * @param 	string 	$sortorder 	order
-	 * @param 	string 	$sortfield 	field
-	 * @param 	int 	$limit 		page
-	 * @param 	int 	$offset 	offset
-	 * @param 	array 	$filter 	Filter for select
-	 * @return 	int 				Return integer <0 if KO, >0 if OK
+	 * @param 	string 			$sortorder 	Sort order
+	 * @param 	string 			$sortfield 	Sort field
+	 * @param 	int 			$limit 		Limit page
+	 * @param 	int 			$offset 	offset
+	 * @param 	string|array 	$filter 	Filter USF.
+	 * @return 	int 						Return integer <0 if KO, >0 if OK
 	 * @since dolibarr v17
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array())
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '')
 	{
 		if (empty($sortfield)) {
 			$sortfield = "t.rowid";
@@ -418,21 +418,35 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= " AND t.entity IN (".getEntity('productprice').")";
 
 		// Manage filter
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if (strpos($key, 'date')) {				// To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
-				} elseif ($key == 'soc.nom') {
-					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
-				} elseif ($key == 'prod.ref' || $key == 'prod.label') {
-					$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
-				} elseif ($key == 't.price' || $key == 't.price_ttc') {
-					$sql .= " AND ".$this->db->sanitize($key)." = ".((float) price2num($value));
-				} else {
-					$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
+		if (is_array($filter)) {
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if (strpos($key, 'date')) {				// To allow $filter['YEAR(s.dated)']=>$year
+						$sql .= " AND ".$this->db->sanitize($key)." = '".$this->db->escape($value)."'";
+					} elseif ($key == 'soc.nom') {
+						$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					} elseif ($key == 'prod.ref' || $key == 'prod.label') {
+						$sql .= " AND ".$this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					} elseif ($key == 't.price' || $key == 't.price_ttc') {
+						$sql .= " AND ".$this->db->sanitize($key)." = ".((float) price2num($value));
+					} else {
+						$sql .= " AND ".$this->db->sanitize($key)." = ".((int) $value);
+					}
 				}
 			}
+
+			$filter = '';
 		}
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
+		}
+
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if (!empty($limit)) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index b0a30b3d41a..7f3f5318dfa 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -318,18 +318,16 @@ class ProductFournisseurPrice extends CommonObject
 	/**
 	 * Load list of objects in memory from the database.
 	 *
-	 * @param  string      $sortorder    Sort Order
-	 * @param  string      $sortfield    Sort field
-	 * @param  int         $limit        limit
-	 * @param  int         $offset       Offset
-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-	 * @param  string      $filtermode   Filter mode (AND or OR)
-	 * @return array|int                 int <0 if KO, array of pages if OK
+	 * @param  string      		$sortorder    	Sort Order
+	 * @param  string      		$sortfield    	Sort field
+	 * @param  int         		$limit        	Limit
+	 * @param  int         		$offset       	Offset
+	 * @param  string|array     $filter       	Filter USF.
+	 * @param  string      		$filtermode   	Filter mode (AND or OR)
+	 * @return array|int                 		int <0 if KO, array of pages if OK
 	 */
-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$records = array();
@@ -342,23 +340,37 @@ class ProductFournisseurPrice extends CommonObject
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
+
 		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid') {
-					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
-				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
-				} else {
-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+		if (is_array($filter)) {
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($key == 't.rowid') {
+						$sqlwhere[] = $key." = ".((int) $value);
+					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+						$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+					} elseif (strpos($value, '%') === false) {
+						$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+					} else {
+						$sqlwhere[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
+					}
 				}
 			}
+			if (count($sqlwhere) > 0) {
+				$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+			}
+
+			$filter = '';
 		}
-		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
+
+		// Manage filter
+		$errormessage = '';
+		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+		if ($errormessage) {
+			$this->errors[] = $errormessage;
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return -1;
 		}
 
 		if (!empty($sortfield)) {

From a327d39062e4dda29ab45d259721e947833b6536 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 11:39:51 +0100
Subject: [PATCH 0802/1862] Fix warning

---
 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 c43dd851c78..d9e3b32fc69 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4369,7 +4369,7 @@ function dol_substr($string, $start, $length = null, $stringencoding = '', $trun
 	global $langs;
 
 	if (empty($stringencoding)) {
-		$stringencoding = $langs->charset_output;
+		$stringencoding = (empty($langs) ? 'UTF-8' : $langs->charset_output);
 	}
 
 	$ret = '';

From 002a4596dff59c91a9a248da3c383c62336c2ea7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:00:39 +0100
Subject: [PATCH 0803/1862] Fix warning

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

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 5c37dacedbe..ab0186f9e2f 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -587,7 +587,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
 				}
-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && is_object($object->thirdparty)) {
 					$newlang = $object->thirdparty->default_lang;
 				}
 				if (!empty($newlang)) {

From 898aebdbf8a1a3fb861d3495a5190c2102cffda3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:06:57 +0100
Subject: [PATCH 0804/1862] Fix missing tooltip

---
 htdocs/compta/facture/card.php            | 29 ++++++++++++-----------
 htdocs/core/class/commoninvoice.class.php |  1 -
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 66afe9fcb73..89a8fe99d84 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5954,23 +5954,24 @@ if ($action == 'create') {
 
 			// Delete
 			$isErasable = $object->is_erasable();
+			$htmltooltip = '';
+			if ($isErasable == -4) {
+				$htmltooltip = $langs->trans('DisabledBecausePayments');
+			} elseif ($isErasable == -3) {
+				$htmltooltip = $langs->trans('DisabledBecauseNotLastSituationInvoice');
+			} elseif ($isErasable == -2) {
+				$htmltooltip = $langs->trans('DisabledBecauseNotLastInvoice');
+			} elseif ($isErasable == -1) {
+				$htmltooltip = $langs->trans('DisabledBecauseDispatchedInBookkeeping');
+			} elseif ($isErasable <= 0) {	// Any other cases
+				$htmltooltip = $langs->trans('DisabledBecauseNotErasable');
+			} elseif ($objectidnext) {
+				$htmltooltip = $langs->trans('DisabledBecauseReplacedInvoice');
+			}
 			if ($usercandelete || ($usercancreate && $isErasable == 1)) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
 				$enableDelete = false;
 				$deleteHref = '#';
-				$htmltooltip = '';
-				if ($isErasable == -4) {
-					$htmltooltip = $langs->trans('DisabledBecausePayments');
-				} elseif ($isErasable == -3) {
-					$htmltooltip = $langs->trans('DisabledBecauseNotLastSituationInvoice');
-				} elseif ($isErasable == -2) {
-					$htmltooltip = $langs->trans('DisabledBecauseNotLastInvoice');
-				} elseif ($isErasable == -1) {
-					$htmltooltip = $langs->trans('DisabledBecauseDispatchedInBookkeeping');
-				} elseif ($isErasable <= 0) {	// Any other cases
-					$htmltooltip = $langs->trans('DisabledBecauseNotErasable');
-				} elseif ($objectidnext) {
-					$htmltooltip = $langs->trans('DisabledBecauseReplacedInvoice');
-				} else {
+				if ($isErasable > 0 && ! $objectidnext) {
 					$deleteHref = $_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=delete&token='.newToken();
 					$enableDelete = true;
 				}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 708e198ac98..a32425ceef4 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -551,7 +551,6 @@ abstract class CommonInvoice extends CommonObject
 	public function is_erasable()
 	{
 		// phpcs:enable
-		global $conf;
 
 		// We check if invoice is a temporary number (PROVxxxx)
 		$tmppart = substr($this->ref, 1, 4);

From e94b9f48c86a6300c64f65aff566e48377a2300b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:18:57 +0100
Subject: [PATCH 0805/1862] Fix warning

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

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index e679a3e180f..d4d8f9135d7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1258,7 +1258,7 @@ if ($source == 'invoice') {
 	// Tag
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow2"><b style="word-break: break-all;">'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="tag" value="'.(empty($tag) ? '' : $tag).'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
 

From b3ee7c385343ebb7b206a22becba92c29c205adc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:22:06 +0100
Subject: [PATCH 0806/1862] Fix warning

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4fe3995cd65..14d8680faec 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5374,7 +5374,7 @@ class Form
 							$h = isset($input['hours']) ? $input['hours'] : 1;
 							$m = isset($input['minutes']) ? $input['minutes'] : 1;
 						}
-						$more .= $this->selectDate($input['value'], $input['name'], $h, $m, 0, '', 1, $addnowlink);
+						$more .= $this->selectDate(isset($input['value']) ? $input['value'] : -1, $input['name'], $h, $m, 0, '', 1, $addnowlink);
 						$more .= '</div></div>'."\n";
 						$formquestion[] = array('name' => $input['name'].'day');
 						$formquestion[] = array('name' => $input['name'].'month');

From b3c275bcf9781351867809dd4e6941ee15cf3350 Mon Sep 17 00:00:00 2001
From: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:26:47 +0100
Subject: [PATCH 0807/1862] Fix #28752 fix fatal error  in societe card
 (#28755)

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
---
 htdocs/societe/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5b29d73fefb..896f0431ce1 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1748,7 +1748,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<td colspan="3" class="maxwidthonsmartphone">';
 			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', '0', 0, 0, 'AND u.statut = 1', 0, '', '', 0, 2);
 			// Note: If user has no right to "see all thirdparties", we force selection of sale representative to him, so after creation he can see the record.
-			$selected = (count(GETPOSTINT('commercial')) > 0 ? GETPOSTINT('commercial') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
+			$selected = (GETPOSTINT('commercial') > 0 ? GETPOSTINT('commercial') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
 			print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $selected, null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print '</td></tr>';
 

From 509754fe6b85a9ca6da78b916118a7b3151e3c43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:29:13 +0100
Subject: [PATCH 0808/1862] Better fix for #28755 #28752

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5b29d73fefb..7b85ba94863 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1748,7 +1748,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<td colspan="3" class="maxwidthonsmartphone">';
 			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', '0', 0, 0, 'AND u.statut = 1', 0, '', '', 0, 2);
 			// Note: If user has no right to "see all thirdparties", we force selection of sale representative to him, so after creation he can see the record.
-			$selected = (count(GETPOSTINT('commercial')) > 0 ? GETPOSTINT('commercial') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
+			$selected = (GETPOSTISARRAY('commercial') ? GETPOST('commercial', 'array:int') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
 			print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $selected, null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print '</td></tr>';
 

From f32bf4b3a7ca1355b84a8a943afe43c92b199851 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:38:21 +0100
Subject: [PATCH 0809/1862] Fix join -> implode

---
 htdocs/accountancy/class/accountingjournal.class.php       | 2 +-
 htdocs/accountancy/class/bookkeeping.class.php             | 4 ++--
 htdocs/compta/sociales/class/cchargesociales.class.php     | 2 +-
 htdocs/core/class/cgenericdic.class.php                    | 2 +-
 htdocs/core/class/cproductnature.class.php                 | 2 +-
 htdocs/core/class/ctyperesource.class.php                  | 2 +-
 htdocs/core/class/cunits.class.php                         | 2 +-
 htdocs/cron/class/cronjob.class.php                        | 2 +-
 htdocs/ecm/class/ecmfiles.class.php                        | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php | 2 +-
 htdocs/modulebuilder/template/class/myobject.class.php     | 4 ++--
 htdocs/mrp/class/mo.class.php                              | 2 +-
 htdocs/partnership/class/partnership.class.php             | 2 +-
 htdocs/product/class/productcustomerprice.class.php        | 2 +-
 htdocs/product/class/productfournisseurprice.class.php     | 2 +-
 htdocs/product/stock/class/productstockentrepot.class.php  | 2 +-
 htdocs/resource/class/dolresource.class.php                | 2 +-
 htdocs/ticket/class/ticket.class.php                       | 2 +-
 htdocs/website/class/website.class.php                     | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index a0fa2147dae..df8cf265d83 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -200,7 +200,7 @@ class AccountingJournal extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 9975a15d59a..1f526e323e0 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1164,7 +1164,7 @@ class BookKeeping extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -1314,7 +1314,7 @@ class BookKeeping extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index 5141708f815..b532bf42095 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -389,7 +389,7 @@ class Cchargesociales
 		if ($result < 0) {
 			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		unset($this->context['createfromclone']);
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index b6e9e2e9674..80cd29208db 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -268,7 +268,7 @@ class CGenericDic extends CommonDict
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index b643ff8c931..8cdf2c3999e 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -199,7 +199,7 @@ class CProductNature extends CommonDict
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index b6c100a7bab..f1f0558a444 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -242,7 +242,7 @@ class Ctyperesource extends CommonDict
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 6339175c5d5..e8e8c36cc39 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -259,7 +259,7 @@ class CUnits extends CommonDict
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index a45613b26aa..b3b8177be87 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -592,7 +592,7 @@ class Cronjob extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index e5b8e4ebadf..de254170431 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -590,7 +590,7 @@ class EcmFiles extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 7aecbd5a79c..530395f5bf6 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -420,7 +420,7 @@ class KnowledgeRecord extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 13e7e3d46d0..906cdc3d0e2 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -468,7 +468,7 @@ class MyObject extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
@@ -502,7 +502,7 @@ class MyObject extends CommonObject
 			return $records;
 		} else {
 			$this->errors[] = 'Error '.$this->db->lasterror();
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
 			return -1;
 		}
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index a194503ec74..6af9a6941d9 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -523,7 +523,7 @@ class Mo extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index e88acef0c56..525214a4398 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -475,7 +475,7 @@ class Partnership extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 372dc877131..224de17eb28 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -443,7 +443,7 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 7f3f5318dfa..dae70705c88 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -369,7 +369,7 @@ class ProductFournisseurPrice extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index d77531060cb..87b8ba077d1 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -275,7 +275,7 @@ class ProductStockEntrepot extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 76a4334d71c..2e15cc1ad18 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -660,7 +660,7 @@ class Dolresource extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 679d4489ad9..c4435e13cae 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -872,7 +872,7 @@ class Ticket extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 3a7bbe4cb95..47d572654be 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -454,7 +454,7 @@ class Website extends CommonObject
 		$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
 		if ($errormessage) {
 			$this->errors[] = $errormessage;
-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			return -1;
 		}
 

From 48073b85cb1172c8a731b44e0ba26709e4e5d94e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:39:07 +0100
Subject: [PATCH 0810/1862] Fix: 'count' on scalar zip->numFiles (#28756)

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 245b5943b5d..d07f1960e15 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2307,7 +2307,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 				// Zip archive will be created only after closing object
 				$zip->close();
 
-				dol_syslog("dol_compress_file success - ".count($zip->numFiles)." files");
+				dol_syslog("dol_compress_file success - ".$zip->numFiles." files");
 				return 1;
 			}
 

From c224f9388e12bff95d749df44a55108f39d8398c Mon Sep 17 00:00:00 2001
From: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:39:23 +0100
Subject: [PATCH 0811/1862] Fix display in adherents type (#28754)

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
---
 htdocs/adherents/type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 738ee68c23b..e8bf0d5f45d 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -918,7 +918,7 @@ if ($rowid > 0) {
 			}
 
 			if ($i == 0) {
-				print '<tr><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+				print '<tr><td colspan="9"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 			}
 
 			print "</table>\n";

From 68441677f7c7034aeebaf172aeab67fa57c8de44 Mon Sep 17 00:00:00 2001
From: Maximilien Valenzano <42194229+Slordef@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:41:30 +0100
Subject: [PATCH 0812/1862] fix: update currency when selected supplier
 (#28760)

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 544ded32a6f..022fddd125e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2716,7 +2716,11 @@ if ($action == 'create') {
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td class="maxwidthonsmartphone">';
 			print img_picto('', 'currency', 'class="pictofixedwidth"');
-			print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $currency_code), 'multicurrency_code');
+			$used_currency_code = $currency_code;
+			if (!GETPOST('changecompany')) {
+				$used_currency_code = GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $currency_code;
+			}
+			print $form->selectMultiCurrency($used_currency_code, 'multicurrency_code');
 			print '</td></tr>';
 		}
 

From 1f4e7aedde9047a3133d1095ef46e21a7c3bdd47 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:47:53 +0100
Subject: [PATCH 0813/1862] Avoid to denaturate value when not required.

---
 test/phpunit/AllTests.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 9848ac2185e..633b0b61216 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -27,8 +27,10 @@
 print "PHP Version: ".phpversion()."\n";
 print "Memory limit: ". ini_get('memory_limit')."\n";
 
-// Workaround for false security issue with main.inc.php in tests:
-$_SERVER['PHP_SELF'] = "phpunit";
+// Workaround for false security issue with main.inc.php on Windows in tests:
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+	$_SERVER['PHP_SELF'] = "phpunit";
+}
 
 global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver

From 29216f3d4e7293fcf4f02a821b4e80248ca52131 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:49:15 +0100
Subject: [PATCH 0814/1862] Update CommonClassTest.class.php

---
 test/phpunit/CommonClassTest.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index a7c793ed9bf..701dccc6e63 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -26,8 +26,10 @@
  *      \remarks    Class that extends all PHPunit tests. To share similare code between each test.
  */
 
-// Workaround for false security issue with main.inc.php in tests:
-$_SERVER['PHP_SELF'] = "phpunit";
+// Workaround for false security issue with main.inc.php on Windows in tests:
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+	$_SERVER['PHP_SELF'] = "phpunit";
+}
 
 global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver

From 41a57c05c53a93e68b82d480724dc559359ae829 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:51:27 +0100
Subject: [PATCH 0815/1862] Update SecurityTest.php

---
 test/phpunit/SecurityTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 42455c49cef..81b21909e5f 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -53,9 +53,7 @@ if (! defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
-// Implements workaround for PHP_SELF & includes common files:
-require_once dirname(__FILE__).'/CommonClassTest.class.php';
-
+require_once dirname(__FILE__).'/../../htdocs/main.inc.php';	// We force include of main.inc.php instead of master.inc.php even if we are in CLI mode because it contains a lot of security components we want to test.
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 

From 1aa16476068b7234d96ce0d228b23b4a4ae941ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 12:53:03 +0100
Subject: [PATCH 0816/1862] Update SecurityTest.php

---
 test/phpunit/SecurityTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 81b21909e5f..5ff98738cd2 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -56,6 +56,7 @@ if (! defined("NOSESSION")) {
 require_once dirname(__FILE__).'/../../htdocs/main.inc.php';	// We force include of main.inc.php instead of master.inc.php even if we are in CLI mode because it contains a lot of security components we want to test.
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
+require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";

From e25fb6f39b06ef1943a72257a2ae5cd9587b4b40 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Mon, 11 Mar 2024 12:54:32 +0100
Subject: [PATCH 0817/1862] update code, better compliance with php8 (#28746)

* update code, better compliance with php8

* update code, better compliance with php8
---
 .../modules/commande/doc/pdf_einstein.modules.php     | 10 +++++-----
 .../modules/commande/doc/pdf_eratosthene.modules.php  | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 547b3c07d57..22fb04d708e 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -84,7 +84,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -196,9 +196,9 @@ class pdf_einstein extends ModelePDFCommandes
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && $outputlangs->defaultlang != getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE')) {
 			$outputlangsbis = new Translate('', $conf);
-			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->setDefaultLang(getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE'));
 			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 		}
 
@@ -217,7 +217,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Possibility to use suffix for proforma
 				$suffix = '';
 				if (getDolGlobalString('PROFORMA_PDF_WITH_SUFFIX')) {
-					$suffix = (GETPOST('model') == 'proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : '';
+					$suffix = (GETPOST('model') == 'proforma') ? getDolGlobalString('PROFORMA_PDF_WITH_SUFFIX') : '';
 					$suffix = dol_sanitizeFileName($suffix);
 				}
 
@@ -253,7 +253,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 23288003852..ca7209733f5 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -89,7 +89,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -295,8 +295,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-				$heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
+					$heightforfooter += 6;
+				}
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
@@ -343,7 +346,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->useTemplate($tplidx);
 				}
 				$pagenb++;
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, (is_object($outputlangsbis) ? $outputlangsbis : null));
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);

From 9c00a465c949d35a8d90b19c0f8575984d82686f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:55:44 +0100
Subject: [PATCH 0818/1862] Qual: phan: Add more global definitions (#28745)

* Qual: phan: Add more global definitions

# Qual: phan: Add more global definitions

Add some more typing information for globals

* Qual: phan: ignore local conf file which may contain exceptions

* Qual: phan: add a few more global typings
---
 dev/tools/phan/config.php          | 47 +++++++++++++++++++++++++++++-
 dev/tools/phan/config_extended.php | 25 ++++++++++++++--
 dev/tools/phan/config_fixer.php    |  1 +
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index ee9cde2603f..0bb240128f8 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -228,14 +228,58 @@ return [
 	'simplify_ast' => true,
 	'analyzed_file_extensions' => ['php','inc'],
 	'globals_type_map' => [
+		'action' => 'string',
+		'actioncode' => 'string',
+		'badgeStatus0' => 'string',
+		'badgeStatus1' => 'string',
+		'badgeStatus11' => 'string',
+		'badgeStatus3' => 'string',
+		'badgeStatus4' => 'string',
+		'badgeStatus6' => 'string',
+		'badgeStatus8' => 'string',
+		'badgeStatus9' => 'string',
+		'classname' => 'string',
 		'conf' => '\Conf',
+		'conffile' => 'string',
+		'conffiletoshow' => 'string',
+		'conffiletoshowshort' => 'string',
+		'dateSelector' => 'int<0,1>',
 		'db' => '\DoliDB',
+		'disableedit' => 'int<0,1>',
+		'disablemove' => 'int<0,1>',
+		'disableremove' => 'int<0,1>',
+		'dolibarr_main_authentication' => 'string',
+		'dolibarr_main_data_root' => 'string',
+		'dolibarr_main_data_root' => 'string',
+		'dolibarr_main_db_encrypted_pass' => 'string',
+		'dolibarr_main_db_host' => 'string',
+		'dolibarr_main_db_pass' => 'string',
+		'dolibarr_main_demo' => 'string',
+		'dolibarr_main_document_root' => 'string',
+		'dolibarr_main_url_root' => 'string',
+		'errormsg' => 'string',
 		'extrafields' => '\ExtraFields',
+		'filter' => 'string',
+		'filtert' => 'int',
+		'forceall' => 'int<0,1>',
+		'form' => '\Form',
 		'hookmanager' => '\HookManager',
+		'inputalsopricewithtax' => 'int<0,1>',
 		'langs' => '\Translate',
+		'leftmenu' => 'string',
+		'mainmenu' => 'string',
+		'menumanager' => 'string',
 		'mysoc' => '\Societe',
 		'nblines' => '\int',
+		'obj' => '\CommonObject',     // Deprecated
+		'object_rights' => 'int|stdClass',
+		'objectoffield' => '\CommonObject',
+		'senderissupplier' => 'int<0,1,2>',
 		'user' => '\User',
+		'website' => '\WebSite',
+		'websitepage' => '\WebSitePage',
+		'websitepagefile' => 'string',
+		// 'object' => '\CommonObject',  // Deprecated, not enabled because conflicts with $object assignments
 	],
 
 	// Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`, `null`.
@@ -284,6 +328,7 @@ return [
 		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
 		// Included as stub (did not seem properly analysed by phan without it)
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
 		// .'|htdocs/[^h].*/.*'  // For testing @phpstan-ignore-line
 		.')@',  // @phpstan-ignore-line
 
@@ -297,7 +342,7 @@ return [
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
 	'ParamMatchRegexPlugin' => [
-		'/^GETPOST$/' => [1, $sanitizeRegex],
+		'/^GETPOST$/' => [1, $sanitizeRegex, 'GetPostUnknownSanitizeType'],
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
 		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 65dcc8f7389..7db2b587708 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -206,6 +206,26 @@ return [
 		'mysoc' => '\Societe',
 		'nblines' => '\int',
 		'user' => '\User',
+		'dolibarr_main_data_root' => 'string',
+		'dolibarr_main_authentication' => 'string',
+		'dolibarr_main_demo' => 'string',
+		'menumanager' => 'string',
+		'errormsg' => 'string',
+		'form' => '\Form',
+		'object_rights' => 'int|stdClass',
+		'disableedit' => 'int<0,1>',
+		'disablemove' => 'int<0,1>',
+		'disableremove' => 'int<0,1>',
+		// Found in dol_eval
+		'website' => '\WebSite',
+		'websitepage' => '\WebSitePage',
+		'websitepagefile' => 'string',
+		'action' => 'string',
+		'mainmenu' => 'string',
+		'leftmenu' => 'string',
+		'objectoffield' => '\CommonObject',
+		// 'object' => '\CommonObject',  // Deprecated, not enabled because conflicts with $object assignments
+		'obj' => '\CommonObject',     // Deprecated
 	],
 
 	// Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`, `null`.
@@ -254,6 +274,7 @@ return [
 		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
 		// Included as stub (did not seem properly analysed by phan without it)
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
 		.')@',  // @phpstan-ignore-line
 
 	// A list of plugin files to execute.
@@ -266,11 +287,11 @@ return [
 	// Alternately, you can pass in the full path to a PHP file
 	// with the plugin's implementation (e.g. 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php')
 	'ParamMatchRegexPlugin' => [
-		'/^GETPOST$/' => [1, $sanitizeRegex],
+		'/^GETPOST$/' => [1, $sanitizeRegex, 'GetPostUnknownSanitizeType'],
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
 		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
-		'/^sanitizeVal$/' => [1, $sanitizeRegex],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex,"UnknownSanitizeType"],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 18e50834844..a588483e3bf 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -103,6 +103,7 @@ return [
 		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
 		// Included as stub (did not seem properly analysed by phan without it)
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
+		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
 		//.'|htdocs/[^c][^o][^r][^e][^/].*'  // For testing @phpstan-ignore-line
 		//.'|htdocs/[^h].*' // For testing on restricted set @phpstan-ignore-line
 		.')@',  // @phpstan-ignore-line

From 8602ca98851b201dd206097d1dc53ab842aab807 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:55:55 +0100
Subject: [PATCH 0819/1862] Fix: implode->join and duplicated if condition
 (#28761)

* Fix: join->implode

# Fix: join->implode

Update new cases of join

* Fix: Duplicate if condition in if/else sequence

# Fix: Duplicate if condition in if/else sequence

Fixed repeated if condition and action
---
 .../class/accountingjournal.class.php         | 15 ++--
 .../accountancy/class/bookkeeping.class.php   |  2 -
 htdocs/core/class/cgenericdic.class.php       |  1 +
 htdocs/core/class/cproductnature.class.php    |  1 +
 htdocs/core/class/ctyperesource.class.php     |  1 +
 htdocs/core/class/cunits.class.php            |  1 +
 htdocs/cron/class/cronjob.class.php           |  1 +
 htdocs/ecm/class/ecmfiles.class.php           | 31 ++++----
 .../class/knowledgerecord.class.php           | 37 ++++-----
 htdocs/mrp/class/mo.class.php                 |  1 +
 .../partnership/class/partnership.class.php   | 53 ++++++-------
 .../class/productcustomerprice.class.php      | 11 +--
 .../class/productfournisseurprice.class.php   | 75 ++++++++++---------
 .../class/productstockentrepot.class.php      | 23 +++---
 htdocs/resource/class/dolresource.class.php   | 13 ++--
 htdocs/ticket/class/ticket.class.php          | 75 ++++++++++---------
 16 files changed, 177 insertions(+), 164 deletions(-)

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index df8cf265d83..90de07f928e 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017-2022  OpenDSI     <support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -314,7 +315,7 @@ class AccountingJournal extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('accountingjournaldao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -420,12 +421,12 @@ class AccountingJournal extends CommonObject
 				case 1: // Various Journal
 					$data = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping);
 					break;
-				//              case 2: // Sells Journal
-				//              case 3: // Purchases Journal
-				//              case 4: // Bank Journal
-				//              case 5: // Expense reports Journal
-				//              case 8: // Inventory Journal
-				//              case 9: // hasnew Journal
+					//              case 2: // Sells Journal
+					//              case 3: // Purchases Journal
+					//              case 4: // Bank Journal
+					//              case 5: // Expense reports Journal
+					//              case 8: // Inventory Journal
+					//              case 9: // hasnew Journal
 			}
 		}
 
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 1f526e323e0..b7e861e42f3 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -938,8 +938,6 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = 't.date_export <= \''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.date_validated>=') {
 					$sqlwhere[] = 't;date_validate >= \''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.date_validated>=') {
-					$sqlwhere[] = 't;date_validate <= \''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} elseif ($key == 't.reconciled_option') {
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index 80cd29208db..c39f8cbbf23 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index 8cdf2c3999e..749b07b4029 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Florian HENRY <florian.henry@scopen.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index f1f0558a444..076b7198353 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index e8e8c36cc39..8d66112174e 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index b3b8177be87..621de20afa6 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2023-2024	William Mead		<william.mead@manchenumerique.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index de254170431..3aceab4db49 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018       Francis Appels      <francis.appels@yahoo.com>
  * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -156,26 +157,26 @@ class EcmFiles extends CommonObject
 	public $section_id;
 
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>-1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"contains hash from filename+filepath"),
-		'label' => array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment'=>"contains hash of file content"),
-		'share' => array('type'=>'varchar(128)', 'label'=>'Share', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment' => "contains hash for file sharing"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => -1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "contains hash from filename+filepath"),
+		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1', 'comment' => "contains hash of file content"),
+		'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1', 'comment' => "contains hash for file sharing"),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1),
-		'filepath' => array('type'=>'varchar(255)', 'label'=>'FilePath', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=> "relative to dolibarr document dir. Example module/def"),
-		'filename' => array('type'=>'varchar(255)', 'label'=>'FileName', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"file name only without any directory"),
-		'src_object_type' => array('type'=>'varchar(64)', 'label'=>'SourceType', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>0, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=> "Source object type ('proposal', 'invoice', ...)"),
+		'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "relative to dolibarr document dir. Example module/def"),
+		'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "file name only without any directory"),
+		'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "Source object type ('proposal', 'invoice', ...)"),
 		'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"),
-		'fullpath_orig' => array('type'=>'varchar(750)', 'label'=>'FullPathOrig', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>0, 'searchall'=>0, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"full path of original filename, when file is uploaded from a local computer"),
+		'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "full path of original filename, when file is uploaded from a local computer"),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110),
-		'keywords' => array('type'=>'varchar(750)', 'label'=>'Keywords', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"list of keywords, separated with comma. Must be limited to most important keywords."),
-		'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment'=>"is this file a file to use for a cover"),
+		'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "list of keywords, separated with comma. Must be limited to most important keywords."),
+		'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment' => "is this file a file to use for a cover"),
 		'position' => array('type' => 'integer', 'label' => 'Position', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"),
-		'gen_or_uploaded' => array('type'=>'varchar(12)', 'label'=>'GenOrUpload', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1','comment'=>"'generated' or 'uploaded'"),
-		'extraparams' => array('type'=>'varchar(255)', 'label'=>'ExtraParams', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1', 'comment' => "for stocking other parameters with json format"),
+		'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => '1', 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "'generated' or 'uploaded'"),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => '1', 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1', 'comment' => "for stocking other parameters with json format"),
 		'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175),
-		'fk_user_c' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_m' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'fk_user_c' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_m' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 		'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
 		'note_private' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
 		'acl' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160, 'comment' => "for future permission 'per file'"),
@@ -929,7 +930,7 @@ class EcmFiles extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 530395f5bf6..558922a7af8 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -100,24 +101,24 @@ class KnowledgeRecord extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", "csslist"=>"nowraponall", "showoncombobox"=>1),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>20, 'index'=>1),
-		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'csslist'=>'tdoverflowmax300', 'copytoclipboard'=>1, 'tdcss'=>'titlefieldcreate nowraponall'),
-		'lang' => array('type'=>'varchar(6)', 'label'=>'Language', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'tdcss'=>'titlefieldcreate nowraponall', "csslist"=>"tdoverflowmax100"),
-		'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,),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>'1', 'position'=>512, 'notnull'=>0, 'visible'=>-2,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'visible' => 5, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", "csslist" => "nowraponall", "showoncombobox" => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'question' => array('type' => 'text', 'label' => 'Question', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax300', 'copytoclipboard' => 1, 'tdcss' => 'titlefieldcreate nowraponall'),
+		'lang' => array('type' => 'varchar(6)', 'label' => 'Language', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'tdcss' => 'titlefieldcreate nowraponall', "csslist" => "tdoverflowmax100"),
+		'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,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserCreation', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => '1', 'position' => 512, 'notnull' => 0, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
 		//'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:(t.active:=:1):pos', 'label'=>'SuggestedForTicketsInGroup', 'enabled'=>'isModEnabled("ticket")', 'position'=>520, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory', 'csslist'=>'minwidth200 tdoverflowmax250'),
-		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>3, 'searchall'=>1, 'csslist'=>'tdoverflowmax300', 'copytoclipboard'=>1, 'tdcss'=>'titlefieldcreate nowraponall'),
-		'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'),),
+		'fk_c_ticket_category' => array('type' => 'integer:CTicketCategory:ticket/class/cticketcategory.class.php:0:(t.active:=:1):pos', 'label' => 'SuggestedForTicketsInGroup', 'enabled' => 'isModEnabled("ticket")', 'position' => 520, 'notnull' => 0, 'visible' => -1, 'help' => 'YouCanLinkArticleToATicketCategory', 'csslist' => 'minwidth200 tdoverflowmax250'),
+		'answer' => array('type' => 'html', 'label' => 'Solution', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 3, 'searchall' => 1, 'csslist' => 'tdoverflowmax300', 'copytoclipboard' => 1, 'tdcss' => 'titlefieldcreate nowraponall'),
+		'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;
@@ -879,7 +880,7 @@ class KnowledgeRecord extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('knowledgerecorddao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 6af9a6941d9..9c1ade49f15 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020  Lenin Rivas		   <lenin@leninrivas.com>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 525214a4398..606acb2ecd7 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021 NextGestion         <contact@nextgestion.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -105,29 +106,29 @@ class Partnership extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object", 'csslist'=>'tdoverflowmax150'),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'isModEnabled("multicompany")', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
-		'fk_type' => array('type'=>'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label'=>'Type', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflowmax125'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax125',),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax125'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax125'),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
-		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
-		'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
-		'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>0, 'visible'=>1,),
-		'url_to_check' => array('type'=>'url', 'label'=>'UrlToCheck', 'enabled'=>'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position'=>70, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax150'),
-		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position'=>71, 'notnull'=>0, 'visible'=>-4, 'default'=>'0',),
-		'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position'=>72, 'notnull'=>0, 'visible'=>-4, 'csslist'=>'nowraponall'),
-		'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>73, 'notnull'=>0, 'visible'=>-2,),
-		'ip' => array('type'=>'ip', 'label'=>'IPOfApplicant', 'enabled'=>'1', 'position'=>74, 'notnull'=>0, 'visible'=>-2,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>2, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'Approved', '3'=>'Refused', '9'=>'Terminated'),),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 'isModEnabled("multicompany")', 'position' => 15, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
+		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label' => 'Type', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'csslist' => 'tdoverflowmax125'),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax125',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax125'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax125'),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'date_partnership_start' => array('type' => 'date', 'label' => 'DatePartnershipStart', 'enabled' => '1', 'position' => 52, 'notnull' => 1, 'visible' => 1,),
+		'date_partnership_end' => array('type' => 'date', 'label' => 'DatePartnershipEnd', 'enabled' => '1', 'position' => 53, 'notnull' => 0, 'visible' => 1,),
+		'url_to_check' => array('type' => 'url', 'label' => 'UrlToCheck', 'enabled' => 'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position' => 70, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax150'),
+		'count_last_url_check_error' => array('type' => 'integer', 'label' => 'CountLastUrlCheckError', 'enabled' => 'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position' => 71, 'notnull' => 0, 'visible' => -4, 'default' => '0',),
+		'last_check_backlink' => array('type' => 'datetime', 'label' => 'LastCheckBacklink', 'enabled' => 'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position' => 72, 'notnull' => 0, 'visible' => -4, 'csslist' => 'nowraponall'),
+		'reason_decline_or_cancel' => array('type' => 'text', 'label' => 'ReasonDeclineOrCancel', 'enabled' => '1', 'position' => 73, 'notnull' => 0, 'visible' => -2,),
+		'ip' => array('type' => 'ip', 'label' => 'IPOfApplicant', 'enabled' => '1', 'position' => 74, 'notnull' => 0, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'visible' => 2, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'Approved', '3' => 'Refused', '9' => 'Terminated'),),
 	);
 	public $rowid;
 	public $ref;
@@ -166,9 +167,9 @@ class Partnership extends CommonObject
 		$this->db = $db;
 
 		if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
-			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member', 'csslist'=>'tdoverflowmax150');
+			$this->fields['fk_member'] = array('type' => 'integer:Adherent:adherents/class/adherent.class.php:1', 'label' => 'Member', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'picto' => 'member', 'csslist' => 'tdoverflowmax150');
 		} else {
-			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150');
+			$this->fields['fk_soc'] = array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'picto' => 'company', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150');
 		}
 
 		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
@@ -1062,7 +1063,7 @@ class Partnership extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('partnershipdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 224de17eb28..03b55d72fcb 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Florian Henry   <florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -33,17 +34,17 @@ class ProductCustomerPrice extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>'$conf->product->enabled', 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
-		'ref_customer' => array('type'=>'varchar(128)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1,),
-		'datec' => array('type'=>'datetime', 'label'=>'AppliedPricesFrom', 'enabled'=>1, 'visible'=>1, 'position'=>500, 'notnull'=>1,),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => '1', 'noteditable' => 1),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:0', 'label' => 'Product', 'enabled' => '$conf->product->enabled', 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'comment' => "Product to produce", 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax100', 'picto' => 'product'),
+		'ref_customer' => array('type' => 'varchar(128)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1,),
+		'datec' => array('type' => 'datetime', 'label' => 'AppliedPricesFrom', 'enabled' => 1, 'visible' => 1, 'position' => 500, 'notnull' => 1,),
 		'price_base_type' => array('type' => 'varchar(255)', 'label' => 'PriceBase', 'enabled' => 1, 'visible' => 1, 'position' => 11, 'notnull' => -1, 'comment' => 'Price Base Type'),
 		'tva_tx' => array('type' => 'decimal(20,6)', 'label' => 'VAT', 'enabled' => 1, 'visible' => 1, 'position' => 12, 'notnull' => -1, 'comment' => 'TVA Tax Rate'),
 		'price' => array('type' => 'decimal(20,6)', 'label' => 'HT', 'enabled' => 1, 'visible' => 1, 'position' => 8, 'notnull' => -1, 'comment' => 'Price HT'),
 		'price_ttc' => array('type' => 'decimal(20,6)', 'label' => 'TTC', 'enabled' => 1, 'visible' => 1, 'position' => 8, 'notnull' => -1, 'comment' => 'Price TTC'),
 		'price_min' => array('type' => 'decimal(20,6)', 'label' => 'MinPriceHT', 'enabled' => 1, 'visible' => 1, 'position' => 9, 'notnull' => -1, 'comment' => 'Minimum Price'),
 		'price_min_ttc' => array('type' => 'decimal(20,6)', 'label' => 'MinPriceTTC', 'enabled' => 1, 'visible' => 1, 'position' => 10, 'notnull' => -1, 'comment' => 'Minimum Price TTC'),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>1, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => 1, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
 	);
 
 	/**
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index dae70705c88..f34ce5f9b64 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021 Alexis LAURIER <contact@alexislaurier.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -93,42 +94,42 @@ class ProductFournisseurPrice extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>-1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>25, 'notnull'=>1, 'visible'=>-1,),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1', 'label'=>'Fkproduct', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1,),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>35, 'notnull'=>0, 'visible'=>-1,),
-		'ref_fourn' => array('type'=>'varchar(255)', 'label'=>'Reffourn', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1,),
-		'desc_fourn' => array('type'=>'text', 'label'=>'Descfourn', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>-1,),
-		'fk_availability' => array('type'=>'integer', 'label'=>'Fkavailability', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
-		'price' => array('type'=>'double(24,8)', 'label'=>'Price', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1,),
-		'quantity' => array('type'=>'double', 'label'=>'Quantity', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>-1,),
-		'remise_percent' => array('type'=>'double', 'label'=>'Remisepercent', 'enabled'=>'1', 'position'=>65, 'notnull'=>1, 'visible'=>-1,),
-		'remise' => array('type'=>'double', 'label'=>'Remise', 'enabled'=>'1', 'position'=>70, 'notnull'=>1, 'visible'=>-1,),
-		'unitprice' => array('type'=>'double(24,8)', 'label'=>'Unitprice', 'enabled'=>'1', 'position'=>75, 'notnull'=>0, 'visible'=>-1,),
-		'charges' => array('type'=>'double(24,8)', 'label'=>'Charges', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,),
-		'default_vat_code' => array('type'=>'varchar(10)', 'label'=>'Defaultvatcode', 'enabled'=>'1', 'position'=>85, 'notnull'=>0, 'visible'=>-1,),
-		'tva_tx' => array('type'=>'double(6,3)', 'label'=>'Tvatx', 'enabled'=>'1', 'position'=>90, 'notnull'=>1, 'visible'=>-1,),
-		'info_bits' => array('type'=>'integer', 'label'=>'Infobits', 'enabled'=>'1', 'position'=>95, 'notnull'=>1, 'visible'=>-1,),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkuser', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>-1,),
-		'fk_supplier_price_expression' => array('type'=>'integer', 'label'=>'Fksupplierpriceexpression', 'enabled'=>'1', 'position'=>105, 'notnull'=>0, 'visible'=>-1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>900, 'notnull'=>0, 'visible'=>-2,),
-		'delivery_time_days' => array('type'=>'integer', 'label'=>'Deliverytimedays', 'enabled'=>'1', 'position'=>115, 'notnull'=>0, 'visible'=>-1,),
-		'supplier_reputation' => array('type'=>'varchar(10)', 'label'=>'Supplierreputation', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>-1,),
-		'fk_multicurrency' => array('type'=>'integer', 'label'=>'Fkmulticurrency', 'enabled'=>'1', 'position'=>125, 'notnull'=>0, 'visible'=>-1,),
-		'multicurrency_code' => array('type'=>'varchar(255)', 'label'=>'Multicurrencycode', 'enabled'=>'1', 'position'=>130, 'notnull'=>0, 'visible'=>-1,),
-		'multicurrency_tx' => array('type'=>'double(24,8)', 'label'=>'Multicurrencytx', 'enabled'=>'1', 'position'=>135, 'notnull'=>0, 'visible'=>-1,),
-		'multicurrency_price' => array('type'=>'double(24,8)', 'label'=>'Multicurrencyprice', 'enabled'=>'1', 'position'=>140, 'notnull'=>0, 'visible'=>-1,),
-		'multicurrency_unitprice' => array('type'=>'double(24,8)', 'label'=>'Multicurrencyunitprice', 'enabled'=>'1', 'position'=>145, 'notnull'=>0, 'visible'=>-1,),
-		'localtax1_tx' => array('type'=>'double(6,3)', 'label'=>'Localtax1tx', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1,),
-		'localtax1_type' => array('type'=>'varchar(10)', 'label'=>'Localtax1type', 'enabled'=>'1', 'position'=>155, 'notnull'=>1, 'visible'=>-1,),
-		'localtax2_tx' => array('type'=>'double(6,3)', 'label'=>'Localtax2tx', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>-1,),
-		'localtax2_type' => array('type'=>'varchar(10)', 'label'=>'Localtax2type', 'enabled'=>'1', 'position'=>165, 'notnull'=>1, 'visible'=>-1,),
-		'barcode' => array('type'=>'varchar(180)', 'label'=>'Barcode', 'enabled'=>'1', 'position'=>170, 'notnull'=>0, 'visible'=>-1,),
-		'fk_barcode_type' => array('type'=>'integer', 'label'=>'Fkbarcodetype', 'enabled'=>'1', 'position'=>175, 'notnull'=>0, 'visible'=>-1,),
-		'packaging' => array('type'=>'varchar(64)', 'label'=>'Packaging', 'enabled'=>'1', 'position'=>180, 'notnull'=>0, 'visible'=>-1,),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 15, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 20, 'notnull' => 0, 'visible' => -1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 25, 'notnull' => 1, 'visible' => -1,),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:1', 'label' => 'Fkproduct', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => -1,),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => '1', 'position' => 35, 'notnull' => 0, 'visible' => -1,),
+		'ref_fourn' => array('type' => 'varchar(255)', 'label' => 'Reffourn', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => -1,),
+		'desc_fourn' => array('type' => 'text', 'label' => 'Descfourn', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => -1,),
+		'fk_availability' => array('type' => 'integer', 'label' => 'Fkavailability', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => -1,),
+		'price' => array('type' => 'double(24,8)', 'label' => 'Price', 'enabled' => '1', 'position' => 55, 'notnull' => 0, 'visible' => -1,),
+		'quantity' => array('type' => 'double', 'label' => 'Quantity', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => -1,),
+		'remise_percent' => array('type' => 'double', 'label' => 'Remisepercent', 'enabled' => '1', 'position' => 65, 'notnull' => 1, 'visible' => -1,),
+		'remise' => array('type' => 'double', 'label' => 'Remise', 'enabled' => '1', 'position' => 70, 'notnull' => 1, 'visible' => -1,),
+		'unitprice' => array('type' => 'double(24,8)', 'label' => 'Unitprice', 'enabled' => '1', 'position' => 75, 'notnull' => 0, 'visible' => -1,),
+		'charges' => array('type' => 'double(24,8)', 'label' => 'Charges', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1,),
+		'default_vat_code' => array('type' => 'varchar(10)', 'label' => 'Defaultvatcode', 'enabled' => '1', 'position' => 85, 'notnull' => 0, 'visible' => -1,),
+		'tva_tx' => array('type' => 'double(6,3)', 'label' => 'Tvatx', 'enabled' => '1', 'position' => 90, 'notnull' => 1, 'visible' => -1,),
+		'info_bits' => array('type' => 'integer', 'label' => 'Infobits', 'enabled' => '1', 'position' => 95, 'notnull' => 1, 'visible' => -1,),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkuser', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => -1,),
+		'fk_supplier_price_expression' => array('type' => 'integer', 'label' => 'Fksupplierpriceexpression', 'enabled' => '1', 'position' => 105, 'notnull' => 0, 'visible' => -1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 900, 'notnull' => 0, 'visible' => -2,),
+		'delivery_time_days' => array('type' => 'integer', 'label' => 'Deliverytimedays', 'enabled' => '1', 'position' => 115, 'notnull' => 0, 'visible' => -1,),
+		'supplier_reputation' => array('type' => 'varchar(10)', 'label' => 'Supplierreputation', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => -1,),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fkmulticurrency', 'enabled' => '1', 'position' => 125, 'notnull' => 0, 'visible' => -1,),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Multicurrencycode', 'enabled' => '1', 'position' => 130, 'notnull' => 0, 'visible' => -1,),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'Multicurrencytx', 'enabled' => '1', 'position' => 135, 'notnull' => 0, 'visible' => -1,),
+		'multicurrency_price' => array('type' => 'double(24,8)', 'label' => 'Multicurrencyprice', 'enabled' => '1', 'position' => 140, 'notnull' => 0, 'visible' => -1,),
+		'multicurrency_unitprice' => array('type' => 'double(24,8)', 'label' => 'Multicurrencyunitprice', 'enabled' => '1', 'position' => 145, 'notnull' => 0, 'visible' => -1,),
+		'localtax1_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax1tx', 'enabled' => '1', 'position' => 150, 'notnull' => 0, 'visible' => -1,),
+		'localtax1_type' => array('type' => 'varchar(10)', 'label' => 'Localtax1type', 'enabled' => '1', 'position' => 155, 'notnull' => 1, 'visible' => -1,),
+		'localtax2_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax2tx', 'enabled' => '1', 'position' => 160, 'notnull' => 0, 'visible' => -1,),
+		'localtax2_type' => array('type' => 'varchar(10)', 'label' => 'Localtax2type', 'enabled' => '1', 'position' => 165, 'notnull' => 1, 'visible' => -1,),
+		'barcode' => array('type' => 'varchar(180)', 'label' => 'Barcode', 'enabled' => '1', 'position' => 170, 'notnull' => 0, 'visible' => -1,),
+		'fk_barcode_type' => array('type' => 'integer', 'label' => 'Fkbarcodetype', 'enabled' => '1', 'position' => 175, 'notnull' => 0, 'visible' => -1,),
+		'packaging' => array('type' => 'varchar(64)', 'label' => 'Packaging', 'enabled' => '1', 'position' => 180, 'notnull' => 0, 'visible' => -1,),
 	);
 	public $rowid;
 	public $entity;
@@ -701,7 +702,7 @@ class ProductFournisseurPrice extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('productfournisseurpricedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 87b8ba077d1..c1335b48b0b 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -137,13 +138,13 @@ class ProductStockEntrepot extends CommonObject
 			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			//if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action to call a trigger.
 
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
+			//// Call triggers
+			//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+			//if ($result < 0) $error++;
+			//// End call triggers
 			//}
 		}
 
@@ -299,11 +300,11 @@ class ProductStockEntrepot extends CommonObject
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				$lines[$obj->rowid] = array(
-										'id'=>$obj->rowid
-										,'fk_product'=>$obj->fk_product
-										,'fk_entrepot'=>$obj->fk_entrepot
-										,'seuil_stock_alerte'=>$obj->seuil_stock_alerte
-										,'desiredstock'=>$obj->desiredstock
+										'id' => $obj->rowid
+										,'fk_product' => $obj->fk_product
+										,'fk_entrepot' => $obj->fk_entrepot
+										,'seuil_stock_alerte' => $obj->seuil_stock_alerte
+										,'desiredstock' => $obj->desiredstock
 									);
 			}
 			$this->db->free($resql);
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 2e15cc1ad18..a1ab7ab07f7 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2015		Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2023-2024		William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -225,14 +226,14 @@ class Dolresource extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$result = $this->insertExtraFields();
 			if ($result < 0) {
-				$error=-1;
+				$error = -1;
 			}
 		}
 
 		if (!$error && !$no_trigger) {
 			$result = $this->call_trigger('RESOURCE_CREATE', $user);
 			if ($result < 0) {
-				$error=-1;
+				$error = -1;
 			}
 		}
 
@@ -820,9 +821,9 @@ class Dolresource extends CommonObject
 				$resources[$i] = array(
 					'rowid' => $obj->rowid,
 					'resource_id' => $obj->resource_id,
-					'resource_type'=>$obj->resource_type,
-					'busy'=>$obj->busy,
-					'mandatory'=>$obj->mandatory
+					'resource_type' => $obj->resource_type,
+					'busy' => $obj->busy,
+					'mandatory' => $obj->mandatory
 				);
 				$i++;
 			}
@@ -984,7 +985,7 @@ class Dolresource extends CommonObject
 		$result .= $linkend;
 
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index c4435e13cae..0769e98d05e 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2023      Charlene Benke 	   <charlene@patas-monkey.com>
  * Copyright (C) 2023	   Benjamin Falière	   <benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -319,37 +320,37 @@ class Ticket extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'', 'showoncombobox'=>1),
-		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
-		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'csslist'=>'tdoverflowmax100 maxwidth150onsmartphone'),
-		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'csslist'=>'tdoverflowmax150'),
-		'origin_replyto' => array('type'=>'mail', 'label'=>'EmailReplyto', 'visible'=>-2, 'enabled'=>1, 'position'=>17, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Email to reply to", 'csslist'=>'tdoverflowmax150'),
-		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth200 tdoverflowmax200', 'autofocusoncreate'=>1),
-		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'csslist'=>'maxwidth125 tdoverflowmax50'),
-		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketCategory', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100 tdoverflowmax200'),
-		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
-		'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-1, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
-		'fk_contract' => array('type'=>'integer:Contrat:contrat/class/contrat.class.php', 'label'=>'Contract', 'visible'=>-1, 'enabled'=>'$conf->contract->enabled', 'position'=>53, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToContract"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id"),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 5, 'notnull' => 1, 'index' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'css' => '', 'showoncombobox' => 1),
+		'track_id' => array('type' => 'varchar(255)', 'label' => 'TicketTrackId', 'visible' => -2, 'enabled' => 1, 'position' => 11, 'notnull' => -1, 'searchall' => 1, 'help' => "Help text"),
+		'fk_user_create' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Author', 'visible' => 1, 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'csslist' => 'tdoverflowmax100 maxwidth150onsmartphone'),
+		'origin_email' => array('type' => 'mail', 'label' => 'OriginEmail', 'visible' => -2, 'enabled' => 1, 'position' => 16, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
+		'origin_replyto' => array('type' => 'mail', 'label' => 'EmailReplyto', 'visible' => -2, 'enabled' => 1, 'position' => 17, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Email to reply to", 'csslist' => 'tdoverflowmax150'),
+		'subject' => array('type' => 'varchar(255)', 'label' => 'Subject', 'visible' => 1, 'enabled' => 1, 'position' => 18, 'notnull' => -1, 'searchall' => 1, 'help' => "", 'css' => 'maxwidth200 tdoverflowmax200', 'autofocusoncreate' => 1),
+		'type_code' => array('type' => 'varchar(32)', 'label' => 'Type', 'visible' => 1, 'enabled' => 1, 'position' => 20, 'notnull' => -1, 'help' => "", 'csslist' => 'maxwidth125 tdoverflowmax50'),
+		'category_code' => array('type' => 'varchar(32)', 'label' => 'TicketCategory', 'visible' => -1, 'enabled' => 1, 'position' => 21, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100 tdoverflowmax200'),
+		'severity_code' => array('type' => 'varchar(32)', 'label' => 'Severity', 'visible' => 1, 'enabled' => 1, 'position' => 22, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100'),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'visible' => 1, 'enabled' => 'isModEnabled("societe")', 'position' => 50, 'notnull' => -1, 'index' => 1, 'searchall' => 1, 'help' => "OrganizationEventLinkToThirdParty", 'css' => 'tdoverflowmax150 maxwidth150onsmartphone'),
+		'notify_tiers_at_create' => array('type' => 'integer', 'label' => 'NotifyThirdparty', 'visible' => -1, 'enabled' => 0, 'position' => 51, 'notnull' => 1, 'index' => 1),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php', 'label' => 'Project', 'visible' => -1, 'enabled' => '$conf->project->enabled', 'position' => 52, 'notnull' => -1, 'index' => 1, 'help' => "LinkToProject"),
+		'fk_contract' => array('type' => 'integer:Contrat:contrat/class/contrat.class.php', 'label' => 'Contract', 'visible' => -1, 'enabled' => '$conf->contract->enabled', 'position' => 53, 'notnull' => -1, 'index' => 1, 'help' => "LinkToContract"),
 		//'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),	// what is this ?
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1, 'csslist'=>'nowraponall'),
-		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>-1, 'enabled'=>1, 'position'=>501, 'notnull'=>1, 'csslist'=>'nowraponall'),
-		'date_last_msg_sent' => array('type'=>'datetime', 'label'=>'TicketLastMessageDate', 'visible'=>0, 'enabled'=>1, 'position'=>502, 'notnull'=>-1),
-		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1, 'csslist'=>'tdoverflowmax100 maxwidth150onsmartphone'),
-		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
-		'message' => array('type'=>'html', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
-		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc', 'csslist'=>'tdoverflowmax100'),
-		'email_date' => array('type'=>'datetime', 'label'=>'EmailDate', 'visible'=>-2, 'enabled'=>1, 'position'=>541),
-		'progress' => array('type'=>'integer', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>2, 'csslist'=>'width50'),
-		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>'getDolGlobalString("TICKET_ENABLE_RESOLUTION")', 'position'=>550, 'notnull'=>1),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>560),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>570),
-		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 2 => 'Assigned', 3 => 'InProgress', 5 => 'NeedMoreInformation', 7 => 'OnHold', 8 => 'SolvedClosed', 9 => 'Deleted')),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => 1, 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'csslist' => 'nowraponall'),
+		'date_read' => array('type' => 'datetime', 'label' => 'TicketReadOn', 'visible' => -1, 'enabled' => 1, 'position' => 501, 'notnull' => 1, 'csslist' => 'nowraponall'),
+		'date_last_msg_sent' => array('type' => 'datetime', 'label' => 'TicketLastMessageDate', 'visible' => 0, 'enabled' => 1, 'position' => 502, 'notnull' => -1),
+		'fk_user_assign' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'AssignedTo', 'visible' => 1, 'enabled' => 1, 'position' => 505, 'notnull' => 1, 'csslist' => 'tdoverflowmax100 maxwidth150onsmartphone'),
+		'date_close' => array('type' => 'datetime', 'label' => 'TicketCloseOn', 'visible' => -1, 'enabled' => 1, 'position' => 510, 'notnull' => 1),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'visible' => -1, 'enabled' => 1, 'position' => 520, 'notnull' => 1),
+		'message' => array('type' => 'html', 'label' => 'Message', 'visible' => -2, 'enabled' => 1, 'position' => 540, 'notnull' => -1,),
+		'email_msgid' => array('type' => 'varchar(255)', 'label' => 'EmailMsgID', 'visible' => -2, 'enabled' => 1, 'position' => 540, 'notnull' => -1, 'help' => 'EmailMsgIDDesc', 'csslist' => 'tdoverflowmax100'),
+		'email_date' => array('type' => 'datetime', 'label' => 'EmailDate', 'visible' => -2, 'enabled' => 1, 'position' => 541),
+		'progress' => array('type' => 'integer', 'label' => 'Progression', 'visible' => -1, 'enabled' => 1, 'position' => 540, 'notnull' => -1, 'css' => 'right', 'help' => "", 'isameasure' => 2, 'csslist' => 'width50'),
+		'resolution' => array('type' => 'integer', 'label' => 'Resolution', 'visible' => -1, 'enabled' => 'getDolGlobalString("TICKET_ENABLE_RESOLUTION")', 'position' => 550, 'notnull' => 1),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'PDFTemplate', 'enabled' => 1, 'visible' => 0, 'position' => 560),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 570),
+		'fk_statut' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 600, 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array(0 => 'Unread', 1 => 'Read', 2 => 'Assigned', 3 => 'InProgress', 5 => 'NeedMoreInformation', 7 => 'OnHold', 8 => 'SolvedClosed', 9 => 'Deleted')),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 900),
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -825,7 +826,7 @@ class Ticket extends CommonObject
 		$sql .= " t.tms,";
 		$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
 		// Add fields for extrafields
-		if ($extrafields->attributes[$this->table_element]['count']> 0) {
+		if ($extrafields->attributes[$this->table_element]['count'] > 0) {
 			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
 				$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? ",ef.".$key." as options_".$key : '');
 			}
@@ -837,7 +838,7 @@ class Ticket extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid = t.fk_user_create";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid = t.fk_user_assign";
-		if ($extrafields->attributes[$this->table_element]['count']> 0) {
+		if ($extrafields->attributes[$this->table_element]['count'] > 0) {
 			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label'])) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)";
 			}
@@ -954,7 +955,7 @@ class Ticket extends CommonObject
 					$line->date_close = $this->db->jdate($obj->date_close);
 
 					// Extra fields
-					if ($extrafields->attributes[$this->table_element]['count']> 0) {
+					if ($extrafields->attributes[$this->table_element]['count'] > 0) {
 						if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label'])) {
 							foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
 								$tmpkey = 'options_'.$key;
@@ -1481,7 +1482,7 @@ class Ticket extends CommonObject
 		global $langs, $hookmanager;
 
 		$labelStatus = (isset($status) && !empty($this->labelStatus[$status])) ? $this->labelStatus[$status] : '';
-		$labelStatusShort = (isset($status) && !empty($this->labelStatusShort[$status]))? $this->labelStatusShort[$status] : '';
+		$labelStatusShort = (isset($status) && !empty($this->labelStatusShort[$status])) ? $this->labelStatusShort[$status] : '';
 
 		switch ($status) {
 			case self::STATUS_NOT_READ:						// Not read
@@ -2370,7 +2371,7 @@ class Ticket extends CommonObject
 							'libelle' => $labelType,		// deprecated, replaced with labeltype
 							'labeltype' => $labelType,
 							'status' => $obj->statuslink,
-							'statuscontact'=>$obj->statuscontact,
+							'statuscontact' => $obj->statuscontact,
 							'fk_c_type_contact' => $obj->fk_c_type_contact,
 							'phone' => $obj->phone,
 							'phone_mobile' => $obj->phone_mobile);
@@ -2514,7 +2515,7 @@ class Ticket extends CommonObject
 				$destfile = $destdir.'/'.$pathinfo['filename'].' - '.dol_print_date($now, 'dayhourlog').'.'.$pathinfo['extension'];
 			}
 
-			$moreinfo = array('description'=>'File saved by copyFilesForTicket', 'src_object_type' => $this->element, 'src_object_id' => $this->id);
+			$moreinfo = array('description' => 'File saved by copyFilesForTicket', 'src_object_type' => $this->element, 'src_object_id' => $this->id);
 			$res = dol_move($filepath[$i], $destfile, 0, 1, 0, 1, $moreinfo);
 			if (!$res) {
 				// Move has failed
@@ -2540,7 +2541,7 @@ class Ticket extends CommonObject
 			$listofnames[$i] = basename($destfile);
 		}
 
-		return array('listofpaths'=>$listofpaths, 'listofnames'=>$listofnames, 'listofmimes'=>$mimetype);
+		return array('listofpaths' => $listofpaths, 'listofnames' => $listofnames, 'listofmimes' => $mimetype);
 	}
 
 	/**

From aee0509473977eba71b255f719c047e19b3ad9be Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:56:55 +0100
Subject: [PATCH 0820/1862] Qual: Force typing on variable fixing several phan
 notices (#28740)

* Qual: Force typing on variable fixing several phan notices

# Qual: Force typing on variable fixing several phan notices

Forcing DolibarrModules on $objMod after assignment to fix typing checks

* Qual: Fix typing on import_label/export_label
---
 htdocs/admin/modulehelp.php                   | 8 ++++++--
 htdocs/core/modules/DolibarrModules.class.php | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index dd91a52a04d..68db7450055 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -77,7 +77,7 @@ print '<!-- Force style container -->'."\n".'<style>
 }
 </style>';
 
-$arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
+$arrayofnatures = array('core' => $langs->transnoentitiesnoconv("Core"), 'external' => $langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs();
@@ -116,6 +116,7 @@ foreach ($modulesdir as $dir) {
 						if (class_exists($modName)) {
 							try {
 								$objMod = new $modName($db);
+								'@phan-var-force DolibarrModules $objMod';
 								$modNameLoaded[$modName] = $dir;
 
 								if (!$objMod->numero > 0 && $modName != 'modUser') {
@@ -235,7 +236,10 @@ foreach ($orders as $tmpkey => $tmpvalue) {
 }
 $value = $orders[$key];
 $tab = explode('_', $value);
-$familyposition = $tab[0]; $familykey = $tab[1]; $module_position = $tab[2]; $numero = $tab[3];
+$familyposition = $tab[0];
+$familykey = $tab[1];
+$module_position = $tab[2];
+$numero = $tab[3];
 
 
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 9b273e4f1b4..3a73f89ffd9 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -247,7 +247,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $export_code;
 
 	/**
-	 * @var string Module export label
+	 * @var string[] Module export label
 	 */
 	public $export_label;
 
@@ -279,7 +279,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $import_code;
 
 	/**
-	 * @var string Module import label
+	 * @var string[] Module import label
 	 */
 	public $import_label;
 

From dbfb1180ee5a2a7b7b58b6bb2b3c4e50503e2627 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:58:51 +0100
Subject: [PATCH 0821/1862] Qual: Fix PhanPluginDuplicateIfStatements & remove
 exceptions (#28749)

# Qual: Fix PhanPluginDuplicateIfStatements & remove exceptions

Fix occurences of PhanPluginDuplicateIfStatements which are if statements where the
consecutive branches execute the same code, making it useles to test the condition
---
 dev/tools/phan/baseline.txt                   |   33 +-
 htdocs/adherents/card.php                     |   19 +-
 htdocs/bom/bom_list.php                       |   43 +-
 htdocs/comm/action/card.php                   |   22 +-
 htdocs/comm/action/pertype.php                |   17 +-
 htdocs/comm/action/peruser.php                |   17 +-
 htdocs/comm/mailing/card.php                  |   20 +-
 htdocs/comm/propal/list.php                   | 2751 ++++++++---------
 htdocs/commande/list.php                      |    7 +-
 htdocs/core/actions_massactions.inc.php       |   81 +-
 htdocs/core/class/commonobject.class.php      |   14 +-
 htdocs/core/class/html.form.class.php         |   19 +-
 htdocs/core/class/rssparser.class.php         |   24 +-
 htdocs/core/db/mysqli.class.php               |    8 +-
 htdocs/core/lib/ftp.lib.php                   |   10 +-
 htdocs/core/menus/standard/auguria_menu.php   |    7 +-
 htdocs/core/menus/standard/eldy_menu.php      |    7 +-
 htdocs/core/menus/standard/empty.php          |    9 +-
 .../societe/mod_codecompta_aquarium.php       |    8 +-
 htdocs/ecm/index_auto.php                     |   67 +-
 htdocs/expensereport/card.php                 |    7 +-
 htdocs/product/popuprop.php                   |    5 +-
 htdocs/product/stats/card.php                 |   23 +-
 23 files changed, 1535 insertions(+), 1683 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 3ccb13ee599..1fd31534dad 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -10,7 +10,6 @@
 return [
     // # Issue statistics:
     // PhanPluginSuspiciousParamPosition : 45+ occurrences
-    // PhanPluginDuplicateIfStatements : 30+ occurrences
     // PhanParamSignatureMismatch : 25+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
@@ -32,26 +31,19 @@ return [
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'htdocs/adherents/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/adherents/stats/geo.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/adherents/type.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/admin/receiptprinter.php' => ['PhanRedefineFunctionInternal'],
         'htdocs/admin/translation.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/bom/bom_list.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
         'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/collab/index.php' => ['PhanParamTooMany'],
-        'htdocs/comm/action/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/comm/action/index.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeArraySuspiciousNull', 'PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/comm/action/pertype.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/comm/action/peruser.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/comm/mailing/card.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/mailing/cibles.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/mailing/info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/comm/propal/list.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/commande/list.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/compta/accounting-files.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/bank/various_payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginSuspiciousParamPosition'],
@@ -68,38 +60,34 @@ return [
         'htdocs/compta/sociales/note.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/tva/document.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/actions_massactions.inc.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamOrder'],
+        'htdocs/core/actions_massactions.inc.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/core/class/commonobject.class.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/commonobject.class.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
-        'htdocs/core/class/html.form.class.php' => ['PhanPluginDuplicateIfStatements', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanNoopArray'],
-        'htdocs/core/class/rssparser.class.php' => ['PhanPluginDuplicateIfStatements', 'PhanUndeclaredFunctionInCallable'],
-        'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch', 'PhanPluginDuplicateIfStatements'],
+        'htdocs/core/class/rssparser.class.php' => ['PhanUndeclaredFunctionInCallable'],
+        'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/filemanagerdol/connectors/php/connector.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginDuplicateIfCondition'],
-        'htdocs/core/lib/ftp.lib.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginDuplicateIfCondition', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
         'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/usergroups.lib.php' => ['PhanNoopArrayAccess'],
-        'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
-        'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
-        'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder', 'PhanPluginDuplicateIfStatements'],
+        'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder'],
+        'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder'],
+        'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/core/modules/societe/mod_codecompta_aquarium.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanPluginDuplicateIfCondition'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
-        'htdocs/ecm/index_auto.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/expensereport/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
@@ -114,8 +102,6 @@ return [
         'htdocs/mrp/class/mo.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
         'htdocs/product/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/product/popuprop.php' => ['PhanPluginDuplicateIfStatements'],
-        'htdocs/product/stats/card.php' => ['PhanPluginDuplicateIfStatements'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/public/bookcal/index.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
@@ -126,7 +112,6 @@ return [
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/user/class/user.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/webportal/class/html.formwebportal.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'internal' => ['PhanUndeclaredConstant'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index b9370bf20c8..e8575c36337 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -699,11 +700,7 @@ if (empty($reshook)) {
 			}
 		} else {
 			$error++;
-			if ($object->error) {
-				setEventMessages($object->error, $object->errors, 'errors');
-			} else {
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		if (!$error) {
@@ -771,11 +768,7 @@ if (empty($reshook)) {
 			} else {
 				$error++;
 
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			}
 		}
@@ -842,11 +835,7 @@ if (empty($reshook)) {
 			} else {
 				$error++;
 
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			}
 		}
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index b7b6be62f2e..a3d335c11da 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,11 +110,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -218,11 +219,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				if ($nbok > 1) {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				} else {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				}
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -266,11 +263,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				if ($nbok > 1) {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				} else {
-					setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-				}
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -343,7 +336,7 @@ foreach ($search as $key => $val) {
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
 					$sql .= " AND t.".$db->sanitize($columnName)." >= '".$db->idate($search[$key])."'";
@@ -474,8 +467,8 @@ $param .= $hookmanager->resPrint;
 // List of mass actions available
 $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-	'enable'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Enable"),
-	'disable'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Disable"),
+	'enable' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Enable"),
+	'disable' => img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Disable"),
 );
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -500,8 +493,8 @@ print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bom/bom_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->hasRight('bom', 'write'));
 
@@ -607,7 +600,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -650,7 +643,7 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -711,7 +704,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('prod'=>$prod, 'selected' => $selected));
+		print $object->getKanbanView('', array('prod' => $prod, 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -787,7 +780,7 @@ while ($i < $imaxinloop) {
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
@@ -830,7 +823,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 05229a9ab58..95a0b4e8b5c 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1411,11 +1411,7 @@ if ($action == 'create') {
 		print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
 	}
 	print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
-	if (GETPOST("afaire") == 1) {
-		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
-	} else {
-		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
-	}
+	print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
 	print '</td></tr>';
 
 	print '<tr><td class="">&nbsp;</td><td></td></tr>';
@@ -1949,21 +1945,9 @@ if ($id > 0) {
 		*/
 		print '</td><td td colspan="3">';
 		$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
-		if (GETPOST("afaire") == 1) {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
-		} elseif (GETPOST("afaire") == 2) {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
-		} else {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
-		}
+		print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
 		print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
-		if (GETPOST("afaire") == 1) {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
-		} elseif (GETPOST("afaire") == 2) {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
-		} else {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
-		}
+		print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
 		print '</td></tr>';
 
 		print '<tr><td class="">&nbsp;</td><td></td></tr>';
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 9bbdd243f12..239f8d74600 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -695,20 +695,11 @@ if ($resql) {
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
 		// They are date start and end of action but modified to not be outside calendar view.
-		if ($event->percentage <= 0) {
-			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) {
-				$event->date_end_in_calendar = $datep2;
-			} else {
-				$event->date_end_in_calendar = $datep;
-			}
+		$event->date_start_in_calendar = $datep;
+		if ($datep2 != '' && $datep2 >= $datep) {
+			$event->date_end_in_calendar = $datep2;
 		} else {
-			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) {
-				$event->date_end_in_calendar = $datep2;
-			} else {
-				$event->date_end_in_calendar = $datep;
-			}
+			$event->date_end_in_calendar = $datep;
 		}
 
 		// Check values
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 76025723dde..a9d3ba71561 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -714,20 +714,11 @@ if ($resql) {
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
 		// They are date start and end of action but modified to not be outside calendar view.
-		if ($event->percentage <= 0) {
-			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) {
-				$event->date_end_in_calendar = $datep2;
-			} else {
-				$event->date_end_in_calendar = $datep;
-			}
+		$event->date_start_in_calendar = $datep;
+		if ($datep2 != '' && $datep2 >= $datep) {
+			$event->date_end_in_calendar = $datep2;
 		} else {
-			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) {
-				$event->date_end_in_calendar = $datep2;
-			} else {
-				$event->date_end_in_calendar = $datep;
-			}
+			$event->date_end_in_calendar = $datep;
 		}
 
 		//print '<br>'.$i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' '.dol_print_date($firstdaytoshow, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').' '.dol_print_date($lastdaytoshow, 'dayhour').'<br>'."\n";
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b8cb4c1f8d3..0618b4c94dc 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2016	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2021		Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -70,7 +71,7 @@ $signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT
 
 $targetobject = null; // Not defined with mass emailing
 
-$parameters = array('mode'=>'emailing');
+$parameters = array('mode' => 'emailing');
 $substitutionarray = FormMail::getAvailableSubstitKey('emailing', $targetobject);
 
 $object->substitutionarrayfortest = $substitutionarray;
@@ -237,7 +238,7 @@ if (empty($reshook)) {
 
 						$signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $user->signature : '');
 
-						$parameters = array('mode'=>'emailing');
+						$parameters = array('mode' => 'emailing');
 						$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
@@ -437,19 +438,14 @@ if (empty($reshook)) {
 				// Loop finished, set global statut of mail
 				if ($nbko > 0) {
 					$statut = 2; // Status 'sent partially' (because at least one error)
-					if ($nbok > 0) {
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-					} else {
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-					}
+					setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 				} else {
 					if ($nbok >= $num) {
 						$statut = 3; // Send to everybody
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					} else {
 						$statut = 2; // Status 'sent partially' (because not send to everybody)
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
+					setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 				}
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".((int) $statut)." WHERE rowid = ".((int) $object->id);
@@ -488,7 +484,7 @@ if (empty($reshook)) {
 
 			$signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $user->signature : '');
 
-			$parameters = array('mode'=>'emailing');
+			$parameters = array('mode' => 'emailing');
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
 
 			// other are set at begin of page
@@ -883,7 +879,7 @@ if ($action == 'create') {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
 		}
 
-		if ($action != 'edit' && $action != 'edittxt' &&$action != 'edithtml') {
+		if ($action != 'edit' && $action != 'edittxt' && $action != 'edithtml') {
 			print dol_get_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
 
 			/*
@@ -1190,7 +1186,7 @@ if ($action == 'create') {
 				$formmail = new FormMail($db);
 				$formmail->fromname = $object->email_from;
 				$formmail->frommail = $object->email_from;
-				$formmail->withsubstit =0;
+				$formmail->withsubstit = 0;
 				$formmail->withfrom = 0;
 				$formmail->withto = $user->email ? $user->email : 1;
 				$formmail->withtocc = 0;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 2bc33b37f3f..e5cb5d58393 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2021	   Anthony Berton			<anthony.berton@bb2a.fr>
  * Copyright (C) 2021      Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2022      Josep Lluís Amador		<joseplluis@lliuretic.cat>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -77,7 +78,9 @@ $mode 		= GETPOST('mode', 'alpha');
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user 	= GETPOSTINT('search_user');
-if ($search_user==-1) $search_user=0;
+if ($search_user == -1) {
+	$search_user = 0;
+}
 $search_sale 	= GETPOSTINT('search_sale');
 $search_ref 	= GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
@@ -190,14 +193,14 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'p.ref'=>'Ref',
-	'p.ref_client'=>'RefCustomer',
-	'pd.description'=>'Description',
-	's.nom'=>"ThirdParty",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	'p.note_public'=>'NotePublic',
+	'p.ref' => 'Ref',
+	'p.ref_client' => 'RefCustomer',
+	'pd.description' => 'Description',
+	's.nom' => "ThirdParty",
+	's.name_alias' => "AliasNameShort",
+	's.zip' => "Zip",
+	's.town' => "Town",
+	'p.note_public' => 'NotePublic',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["p.note_private"] = "NotePrivate";
@@ -206,50 +209,50 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>-1),
-	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(isModEnabled('project') ? 1 : 0)),
-	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(isModEnabled('project') ? 1 : 0)),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
-	's.town'=>array('label'=>"Town", 'checked'=>-1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>-1),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	'p.date'=>array('label'=>"DatePropal", 'checked'=>1),
-	'p.fin_validite'=>array('label'=>"DateEnd", 'checked'=>1),
-	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
-	'p.date_signature'=>array('label'=>"DateSigning", 'checked'=>0),
-	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
-	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>isModEnabled("delivery_note")),
-	'p.fk_input_reason'=>array('label'=>"Origin", 'checked'=>0, 'enabled'=>1),
-	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0),
-	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
-	'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
-	'p.total_tva'=>array('label'=>"AmountVAT", 'checked'=>0),
-	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
-	'p.total_ht_invoiced'=>array('label'=>"AmountInvoicedHT", 'checked'=>0, 'enabled'=>getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'p.total_invoiced'=>array('label'=>"AmountInvoicedTTC", 'checked'=>0, 'enabled'=>getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'p.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_tva'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
-	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
-	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
+	'p.ref' => array('label' => "Ref", 'checked' => 1),
+	'p.ref_client' => array('label' => "RefCustomer", 'checked' => -1),
+	'pr.ref' => array('label' => "ProjectRef", 'checked' => 1, 'enabled' => (isModEnabled('project') ? 1 : 0)),
+	'pr.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (isModEnabled('project') ? 1 : 0)),
+	's.nom' => array('label' => "ThirdParty", 'checked' => 1),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => -1),
+	's.town' => array('label' => "Town", 'checked' => -1),
+	's.zip' => array('label' => "Zip", 'checked' => -1),
+	'state.nom' => array('label' => "StateShort", 'checked' => 0),
+	'country.code_iso' => array('label' => "Country", 'checked' => 0),
+	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers),
+	'p.date' => array('label' => "DatePropal", 'checked' => 1),
+	'p.fin_validite' => array('label' => "DateEnd", 'checked' => 1),
+	'p.date_livraison' => array('label' => "DeliveryDate", 'checked' => 0),
+	'p.date_signature' => array('label' => "DateSigning", 'checked' => 0),
+	'ava.rowid' => array('label' => "AvailabilityPeriod", 'checked' => 0),
+	'p.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => 0, 'enabled' => isModEnabled("delivery_note")),
+	'p.fk_input_reason' => array('label' => "Origin", 'checked' => 0, 'enabled' => 1),
+	'p.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 0),
+	'p.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 0),
+	'p.total_ht' => array('label' => "AmountHT", 'checked' => 1),
+	'p.total_tva' => array('label' => "AmountVAT", 'checked' => 0),
+	'p.total_ttc' => array('label' => "AmountTTC", 'checked' => 0),
+	'p.total_ht_invoiced' => array('label' => "AmountInvoicedHT", 'checked' => 0, 'enabled' => getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.total_invoiced' => array('label' => "AmountInvoicedTTC", 'checked' => 0, 'enabled' => getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_tva' => array('label' => 'MulticurrencyAmountVAT', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'p.multicurrency_total_ht_invoiced' => array('label' => 'MulticurrencyAmountInvoicedHT', 'checked' => 0, 'enabled' => isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.multicurrency_total_invoiced' => array('label' => 'MulticurrencyAmountInvoicedTTC', 'checked' => 0, 'enabled' => isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'u.login' => array('label' => "Author", 'checked' => 1, 'position' => 10),
+	'sale_representative' => array('label' => "SaleRepresentativesOfThirdParty", 'checked' => -1),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
-	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
-	'p.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
-	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
-	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+	'p.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
+	'p.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	'p.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 500),
+	'p.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 510, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
+	'p.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 511, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
+	'p.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
 );
 
 // List of fields to search into when doing a "search in all"
@@ -310,7 +313,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
+$parameters = array('socid' => $socid, 'arrayfields' => &$arrayfields);
 $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');
@@ -518,11 +521,7 @@ if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
 	}
 
 	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		}
+		setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -843,8 +842,8 @@ if (!$resql) {
 	exit;
 }
 
-	$objectstatic = new Propal($db);
-	$userstatic = new User($db);
+$objectstatic = new Propal($db);
+$userstatic = new User($db);
 
 if ($socid > 0) {
 	$soc = new Societe($db);
@@ -857,9 +856,9 @@ if ($socid > 0) {
 	$title = $langs->trans('Proposals');
 }
 
-	$num = $db->num_rows($resql);
+$num = $db->num_rows($resql);
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
@@ -870,10 +869,10 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 	exit;
 }
 
-	$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-	llxHeader('', $title, $help_url);
+$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+llxHeader('', $title, $help_url);
 
-	$param = '&search_status='.urlencode($search_status);
+$param = '&search_status='.urlencode($search_status);
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
 }
@@ -1049,1362 +1048,1362 @@ if ($search_date_signature_endyear) {
 	$param .= '&search_date_signature_endyear='.urlencode($search_date_signature_endyear);
 }
 
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-	// Add $param from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	$param .= $hookmanager->resPrint;
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
-	// List of mass actions available
-	$arrayofmassactions = array(
-		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	);
-	if ($permissiontosendbymail) {
-		$arrayofmassactions['presend']=img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+// List of mass actions available
+$arrayofmassactions = array(
+	'generate_doc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'builddoc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+);
+if ($permissiontosendbymail) {
+	$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+}
+if ($permissiontovalidate) {
+	$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
+}
+if ($permissiontoclose) {
+	$arrayofmassactions['presign'] = img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("Sign");
+	$arrayofmassactions['nopresign'] = img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("NoSign");
+	$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
+}
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
+
+if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss' => 'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('propal', 'creer'));
+
+// Fields title search
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+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="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode"value="'.$mode.'">';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$topicmail = "SendPropalRef";
+$modelmail = "propal_send";
+$objecttmp = new Propal($db);
+$trackid = 'pro'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($massaction == 'prevalidate') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+}
+
+if ($massaction == 'presign') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
+}
+
+if ($massaction == 'nopresign') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
+}
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
 	}
-	if ($permissiontovalidate) {
-		$arrayofmassactions['prevalidate']=img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
-	}
-	if ($permissiontoclose) {
-		$arrayofmassactions['presign']=img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("Sign");
-		$arrayofmassactions['nopresign']=img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("NoSign");
-		$arrayofmassactions['setbilled'] =img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
-	}
-	if ($permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
+}
+
+$i = 0;
+
+$moreforfilter = '';
+
+// If the user can view prospects other than his'
+if ($user->hasRight('user', 'user', 'lire')) {
+	$langs->load("commercial");
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx', 1);
+	$moreforfilter .= '</div>';
+}
+// If the user can view prospects other than his'
+if ($user->hasRight('user', 'user', 'lire')) {
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('LinkedToSpecificUsers');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers((empty($search_user) ? -2 : 0), 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
+	$moreforfilter .= '</div>';
+}
+// If the user can view products
+if (isModEnabled('category') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
+	$searchCategoryProductOperator = -1;
+	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$tmptitle = $langs->trans('IncludingProductWithTag');
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, array($search_product_category), 'maxwidth300', $searchCategoryProductOperator, 0, 0, $tmptitle);
+}
+if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'));
+	$moreforfilter .= '</div>';
+}
+if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+	$formproduct = new FormProduct($db);
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->trans('Warehouse');
+	$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', $tmptitle, 0, 0, $tmptitle);
+	$moreforfilter .= '</div>';
+}
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+print '<tr class="liste_titre_filter">';
+
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
+
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.ref_client']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['pr.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['pr.title']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.town']['checked'])) {
+	print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
+}
+if (!empty($arrayfields['s.zip']['checked'])) {
+	print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+}
+// State
+if (!empty($arrayfields['state.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+	print '</td>';
+}
+// Country
+if (!empty($arrayfields['country.code_iso']['checked'])) {
+	print '<td class="liste_titre" align="center">';
+	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+	print '</td>';
+}
+// Company type
+if (!empty($arrayfields['typent.code']['checked'])) {
+	print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+	print ajax_combobox('search_type_thirdparty');
+	print '</td>';
+}
+// Date
+if (!empty($arrayfields['p.date']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
+	print '</td>';
+}
+// Date end
+if (!empty($arrayfields['p.fin_validite']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
+	print '</td>';
+}
+// Date delivery
+if (!empty($arrayfields['p.date_livraison']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '</td>';
+}
+// Date Signature
+if (!empty($arrayfields['p.date_signature']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_signature_start ? $search_date_signature_start : -1, 'search_date_signature_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_signature_end ? $search_date_signature_end : -1, 'search_date_signature_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '</td>';
+}
+// Availability
+if (!empty($arrayfields['ava.rowid']['checked'])) {
+	print '<td class="liste_titre maxwidth100onsmartphone center">';
+	$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
+	print ajax_combobox('search_availability');
+	print '</td>';
+}
+// Shipping Method
+if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+	print '</td>';
+}
+// Source - Input reason
+if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, 'maxwidth125', 1);
+	print '</td>';
+}
+// Payment term
+if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->getSelectConditionsPaiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
+	print '</td>';
+}
+// Payment mode
+if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_ht']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_tva']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_ttc']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+	// Currency
+	print '<td class="liste_titre">';
+	print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+	// Currency rate
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+	// Amount
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+	// Amount invoiced
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['u.login']['checked'])) {
+	// Author
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['sale_representative']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['total_pa']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['total_margin']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['total_margin_rate']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+if (!empty($arrayfields['total_mark_rate']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields' => $arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Date creation
+if (!empty($arrayfields['p.datec']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Date modification
+if (!empty($arrayfields['p.tms']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Date cloture
+if (!empty($arrayfields['p.date_cloture']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.note_public']['checked'])) {
+	// Note public
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.note_private']['checked'])) {
+	// Note private
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Status
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
+	print '<td class="liste_titre center parentonrightofpage">';
+	$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_status', 'search_status width100 onrightofpage');
+	print '</td>';
+}
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
+print "</tr>\n";
+
+$totalarray = array(
+	'nbfield' => 0,
+	'val' => array(
+		'p.total_ht' => 0,
+		'p.total_tva' => 0,
+		'p.total_ttc' => 0,
+	),
+);
+
+// Fields title
+print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.ref_client']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref_client']['label'], $_SERVER["PHP_SELF"], 'p.ref_client', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['pr.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['pr.title']['checked'])) {
+	print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.town']['checked'])) {
+	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.zip']['checked'])) {
+	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['state.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['country.code_iso']['checked'])) {
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['typent.code']['checked'])) {
+	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fin_validite']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date_livraison']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date_signature']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, 'class="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['ava.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "p.fk_input_reason", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_ht']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_tva']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_ttc']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+	print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['u.login']['checked'])) {
+	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['sale_representative']['checked'])) {
+	print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_pa']['checked'])) {
+	print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_margin']['checked'])) {
+	print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_margin_rate']['checked'])) {
+	print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['total_mark_rate']['checked'])) {
+	print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array(
+	'arrayfields' => $arrayfields,
+	'param' => $param,
+	'sortfield' => $sortfield,
+	'sortorder' => $sortorder,
+	'totalarray' => &$totalarray,
+);
+
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
+print $hookmanager->resPrint;
+if (!empty($arrayfields['p.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.date_cloture']['checked'])) {
+	print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.note_public']['checked'])) {
+	print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.note_private']['checked'])) {
+	print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
+}
+print '</tr>'."\n";
+
+// Loop on record
+// --------------------------------------------------------------------
+$typenArray = null;
+$now = dol_now();
+
+$with_margin_info = false;
+if (isModEnabled('margin') && (
+	!empty($arrayfields['total_pa']['checked'])
+	|| !empty($arrayfields['total_margin']['checked'])
+	|| !empty($arrayfields['total_margin_rate']['checked'])
+	|| !empty($arrayfields['total_mark_rate']['checked'])
+)
+) {
+	$with_margin_info = true;
+}
+$total_ht = 0;
+$total_margin = 0;
+
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
 	}
 
-	if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
-		$arrayofmassactions = array();
-	}
-	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	$objectstatic->id = $obj->rowid;
+	$objectstatic->ref = $obj->ref;
+	$objectstatic->ref_client = $obj->ref_client;
+	$objectstatic->note_public = $obj->note_public;
+	$objectstatic->note_private = $obj->note_private;
+	$objectstatic->statut = $obj->status;
+	$objectstatic->status = $obj->status;
 
-	$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';
-	if (!empty($socid)) {
-		$url .= '&socid='.$socid;
-	}
-	$newcardbutton = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitleSeparator();
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('propal', 'creer'));
+	$companystatic->id = $obj->socid;
+	$companystatic->name = $obj->name;
+	$companystatic->name_alias = $obj->alias;
+	$companystatic->client = $obj->client;
+	$companystatic->fournisseur = $obj->fournisseur;
+	$companystatic->code_client = $obj->code_client;
+	$companystatic->email = $obj->email;
+	$companystatic->phone = $obj->phone;
+	$companystatic->address = $obj->address;
+	$companystatic->zip = $obj->zip;
+	$companystatic->town = $obj->town;
+	$companystatic->country_code = $obj->country_code;
 
-	// Fields title search
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	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="contextpage" value="'.$contextpage.'">';
-	print '<input type="hidden" name="mode"value="'.$mode.'">';
+	$projectstatic->id = $obj->project_id;
+	$projectstatic->ref = $obj->project_ref;
+	$projectstatic->title = $obj->project_label;
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	$totalInvoicedHT = 0;
+	$totalInvoicedTTC = 0;
+	$multicurrency_totalInvoicedHT = 0;
+	$multicurrency_totalInvoicedTTC = 0;
 
-	$topicmail = "SendPropalRef";
-	$modelmail = "propal_send";
-	$objecttmp = new Propal($db);
-	$trackid = 'pro'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+	$TInvoiceData = $objectstatic->InvoiceArrayList($obj->rowid);
 
-	if ($massaction == 'prevalidate') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
-	}
+	if (!empty($TInvoiceData)) {
+		foreach ($TInvoiceData as $invoiceData) {
+			$invoice = new Facture($db);
+			$invoice->fetch($invoiceData->facid);
 
-	if ($massaction == 'presign') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
-	}
+			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $invoice->type == Facture::TYPE_DEPOSIT) {
+				continue;
+			}
 
-	if ($massaction == 'nopresign') {
-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
-	}
-
-	if ($search_all) {
-		foreach ($fieldstosearchall as $key => $val) {
-			$fieldstosearchall[$key] = $langs->trans($val);
+			$totalInvoicedHT += $invoice->total_ht;
+			$totalInvoicedTTC += $invoice->total_ttc;
+			$multicurrency_totalInvoicedHT += $invoice->multicurrency_total_ht;
+			$multicurrency_totalInvoicedTTC += $invoice->multicurrency_total_ttc;
 		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 	}
 
-	$i = 0;
+	$marginInfo = array();
+	if ($with_margin_info === true) {
+		$objectstatic->fetch_lines();
+		$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
+		$total_ht += $obj->total_ht;
+		$total_margin += $marginInfo['total_margin'];
+	}
 
-	$moreforfilter = '';
-
-	// If the user can view prospects other than his'
-	if ($user->hasRight('user', 'user', 'lire')) {
-		$langs->load("commercial");
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx', 1);
-		$moreforfilter .= '</div>';
-	}
-	// If the user can view prospects other than his'
-	if ($user->hasRight('user', 'user', 'lire')) {
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('LinkedToSpecificUsers');
-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers((empty($search_user)?-2:0), 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
-		$moreforfilter .= '</div>';
-	}
-	// If the user can view products
-	if (isModEnabled('category') && $user->hasRight('categorie', 'read') && ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'))) {
-		$searchCategoryProductOperator = -1;
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$tmptitle = $langs->trans('IncludingProductWithTag');
-		$formcategory = new FormCategory($db);
-		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, array($search_product_category), 'maxwidth300', $searchCategoryProductOperator, 0, 0, $tmptitle);
-	}
-	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'));
-		$moreforfilter .= '</div>';
-	}
-	if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
-		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-		$formproduct = new FormProduct($db);
-		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle = $langs->trans('Warehouse');
-		$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', $tmptitle, 0, 0, $tmptitle);
-		$moreforfilter .= '</div>';
-	}
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$moreforfilter .= $hookmanager->resPrint;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
+		}
+		// Output Kanban
+		$userstatic->fetch($obj->fk_user_author);
+		$arrayofparams = array('selected' => in_array($object->id, $arrayofselected), 'authorlink' => $userstatic->getNomUrl(-2), 'projectlink' => $projectstatic->getNomUrl(2));
+		print $objectstatic->getKanbanView('', $arrayofparams);
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
 	} else {
-		$moreforfilter = $hookmanager->resPrint;
-	}
+		print '<tr class="oddeven">';
 
-	if (!empty($moreforfilter)) {
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		print '</div>';
-	}
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap" align="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
-	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowraponall">';
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			// Picto + Ref
+			print '<td class="nobordernopadding nowraponall">';
+			print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
+			print '</td>';
+			// Warning
+			$warnornote = '';
+			if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+				$warnornote .= img_warning($langs->trans("Late"));
+			}
+			if ($warnornote) {
+				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+				print $warnornote;
+				print '</td>';
+			}
+			// Other picto tool
+			print '<td width="16" class="nobordernopadding right">';
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+			print '</td></tr></table>';
 
-	print '<tr class="liste_titre_filter">';
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre" align="middle">';
-		$searchpicto = $form->showFilterButtons('left');
-		print $searchpicto;
-		print '</td>';
-	}
+		if (!empty($arrayfields['p.ref_client']['checked'])) {
+			// Customer ref
+			print '<td class="nowrap tdoverflowmax200">';
+			print dol_escape_htmltag($obj->ref_client);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.ref_client']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['pr.title']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.name_alias']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
-	}
-	if (!empty($arrayfields['s.zip']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
-	}
-	// State
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-		print '</td>';
-	}
-	// Country
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print '<td class="liste_titre" align="center">';
-		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
-		print '</td>';
-	}
-	// Company type
-	if (!empty($arrayfields['typent.code']['checked'])) {
-		print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
-		print ajax_combobox('search_type_thirdparty');
-		print '</td>';
-	}
-	// Date
-	if (!empty($arrayfields['p.date']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-		print '</div>';
-		print '</td>';
-	}
-	// Date end
-	if (!empty($arrayfields['p.fin_validite']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-		print '</div>';
-		print '</td>';
-	}
-	// Date delivery
-	if (!empty($arrayfields['p.date_livraison']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '</td>';
-	}
-	// Date Signature
-	if (!empty($arrayfields['p.date_signature']['checked'])) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_signature_start ? $search_date_signature_start : -1, 'search_date_signature_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrapfordate">';
-		print $form->selectDate($search_date_signature_end ? $search_date_signature_end : -1, 'search_date_signature_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '</td>';
-	}
-	// Availability
-	if (!empty($arrayfields['ava.rowid']['checked'])) {
-		print '<td class="liste_titre maxwidth100onsmartphone center">';
-		$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
-		print ajax_combobox('search_availability');
-		print '</td>';
-	}
-	// Shipping Method
-	if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-		print '<td class="liste_titre">';
-		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
-		print '</td>';
-	}
-	// Source - Input reason
-	if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-		print '<td class="liste_titre">';
-		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, 'maxwidth125', 1);
-		print '</td>';
-	}
-	// Payment term
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-		print '<td class="liste_titre">';
-		print $form->getSelectConditionsPaiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
-		print '</td>';
-	}
-	// Payment mode
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-		print '<td class="liste_titre">';
-		print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_ht']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_tva']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_ttc']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+		if (!empty($arrayfields['pr.ref']['checked'])) {
+			// Project ref
+			print '<td class="nowraponall">';
+			if ($obj->project_id > 0) {
+				print $projectstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		if (!empty($arrayfields['pr.title']['checked'])) {
+			// Project label
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
+				print dol_escape_htmltag($projectstatic->title);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Thirdparty
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Alias
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $obj->alias;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Town
+		if (!empty($arrayfields['s.town']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
+			print dol_escape_htmltag($obj->town);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['s.zip']['checked'])) {
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print $tmparray['label'];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type ent
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			if (!is_array($typenArray) || empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
+
+			print '<td class="center">';
+			if (!empty($obj->typent_code)) {
+				print $typenArray[$obj->typent_code];
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date proposal
+		if (!empty($arrayfields['p.date']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->dp), 'day');
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date end validity
+		if (!empty($arrayfields['p.fin_validite']['checked'])) {
+			if ($obj->dfv) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date delivery
+		if (!empty($arrayfields['p.date_livraison']['checked'])) {
+			if ($obj->ddelivery) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date Signature
+		if (!empty($arrayfields['p.date_signature']['checked'])) {
+			if ($obj->dsignature) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Availability
+		if (!empty($arrayfields['ava.rowid']['checked'])) {
+			print '<td class="center">';
+			$form->form_availability('', $obj->availability, 'none', 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Shipping Method
+		if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Source - input reason
+		if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+			$labelInputReason = '';
+			if ($obj->fk_input_reason > 0) {
+				$labelInputReason = $form->cache_demand_reason[$obj->fk_input_reason]['label'];
+			}
+			print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($labelInputReason).'">';
+			print dol_escape_htmltag($labelInputReason);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment terms
+		if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment mode
+		if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['p.total_ht']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+			}
+			if (empty($totalarray['val']['p.total_ht'])) {
+				$totalarray['val']['p.total_ht'] = $obj->total_ht;
+			} else {
+				$totalarray['val']['p.total_ht'] += $obj->total_ht;
+			}
+		}
+		// Amount VAT
+		if (!empty($arrayfields['p.total_tva']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
+			}
+			if (empty($totalarray['val']['p.total_tva'])) {
+				$totalarray['val']['p.total_tva'] = $obj->total_tva;
+			} else {
+				$totalarray['val']['p.total_tva'] += $obj->total_tva;
+			}
+		}
+		// Amount TTC
+		if (!empty($arrayfields['p.total_ttc']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
+			}
+			if (empty($totalarray['val']['p.total_ttc'])) {
+				$totalarray['val']['p.total_ttc'] = $obj->total_ttc;
+			} else {
+				$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
+			}
+		}
+		// Amount invoiced HT
+		if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedHT)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+			}
+			if (empty($totalarray['val']['p.total_ht_invoiced'])) {
+				$totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
+			} else {
+				$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
+			}
+		}
+		// Amount invoiced TTC
+		if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedTTC)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+			}
+			if (empty($totalarray['val']['p.total_invoiced'])) {
+				$totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
+			} else {
+				$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
+			}
+		}
 		// Currency
-		print '<td class="liste_titre">';
-		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Currency rate
-		print '<td class="liste_titre">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-		// Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+			print '<td class="nowrap">';
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount VAT
+		if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount TTC
+		if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedHT)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Amount invoiced
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['u.login']['checked'])) {
+		if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+			print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedTTC)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		$userstatic->id = $obj->fk_user_author;
+		$userstatic->login = $obj->login;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->email = $obj->user_email;
+		$userstatic->statut = $obj->user_statut;
+		$userstatic->entity = $obj->user_entity;
+		$userstatic->photo = $obj->photo;
+		$userstatic->office_phone = $obj->office_phone;
+		$userstatic->office_fax = $obj->office_fax;
+		$userstatic->user_mobile = $obj->user_mobile;
+		$userstatic->job = $obj->job;
+		$userstatic->gender = $obj->gender;
+
 		// Author
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['sale_representative']['checked'])) {
-		print '<td class="liste_titre"></td>';
-	}
-	if (!empty($arrayfields['total_pa']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['total_margin']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['total_margin_rate']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['total_mark_rate']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['p.datec']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Date modification
-	if (!empty($arrayfields['p.tms']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Date cloture
-	if (!empty($arrayfields['p.date_cloture']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.note_public']['checked'])) {
-		// Note public
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['p.note_private']['checked'])) {
-		// Note private
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Status
-	if (!empty($arrayfields['p.fk_statut']['checked'])) {
-		print '<td class="liste_titre center parentonrightofpage">';
-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_status', 'search_status width100 onrightofpage');
-		print '</td>';
-	}
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre" align="middle">';
-		$searchpicto = $form->showFilterButtons();
-		print $searchpicto;
-		print '</td>';
-	}
-	print "</tr>\n";
-
-	$totalarray = array(
-		'nbfield' => 0,
-		'val' => array(
-			'p.total_ht' => 0,
-			'p.total_tva' => 0,
-			'p.total_ttc' => 0,
-		),
-	);
-
-	// Fields title
-	print '<tr class="liste_titre">';
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.ref_client']['checked'])) {
-		print_liste_field_titre($arrayfields['p.ref_client']['label'], $_SERVER["PHP_SELF"], 'p.ref_client', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['pr.title']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.name_alias']['checked'])) {
-		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.town']['checked'])) {
-		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['s.zip']['checked'])) {
-		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['typent.code']['checked'])) {
-		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fin_validite']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date_livraison']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date_signature']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, 'class="center"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['ava.rowid']['checked'])) {
-		print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_input_reason']['label'], $_SERVER["PHP_SELF"], "p.fk_input_reason", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_tva']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['u.login']['checked'])) {
-		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['sale_representative']['checked'])) {
-		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_pa']['checked'])) {
-		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_margin']['checked'])) {
-		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_margin_rate']['checked'])) {
-		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['total_mark_rate']['checked'])) {
-		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		$totalarray['nbfield']++;
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-	// Hook fields
-	$parameters = array(
-		'arrayfields' => $arrayfields,
-		'param' => $param,
-		'sortfield' => $sortfield,
-		'sortorder' => $sortorder,
-		'totalarray' => &$totalarray,
-	);
-
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-
-	print $hookmanager->resPrint;
-	if (!empty($arrayfields['p.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.date_cloture']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.note_public']['checked'])) {
-		print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.note_private']['checked'])) {
-		print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['p.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
-		$totalarray['nbfield']++;
-	}
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
-		$totalarray['nbfield']++;
-	}
-	print '</tr>'."\n";
-
-	// Loop on record
-	// --------------------------------------------------------------------
-	$typenArray = null;
-	$now = dol_now();
-
-	$with_margin_info = false;
-	if (isModEnabled('margin') && (
-		!empty($arrayfields['total_pa']['checked'])
-		|| !empty($arrayfields['total_margin']['checked'])
-		|| !empty($arrayfields['total_margin_rate']['checked'])
-		|| !empty($arrayfields['total_mark_rate']['checked'])
-	)
-	) {
-		$with_margin_info = true;
-	}
-	$total_ht = 0;
-	$total_margin = 0;
-
-	$i = 0;
-	$savnbfield = $totalarray['nbfield'];
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$imaxinloop = ($limit ? min($num, $limit) : $num);
-	while ($i < $imaxinloop) {
-		$obj = $db->fetch_object($resql);
-		if (empty($obj)) {
-			break; // Should not happen
-		}
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-		$objectstatic->ref_client = $obj->ref_client;
-		$objectstatic->note_public = $obj->note_public;
-		$objectstatic->note_private = $obj->note_private;
-		$objectstatic->statut = $obj->status;
-		$objectstatic->status = $obj->status;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->name;
-		$companystatic->name_alias = $obj->alias;
-		$companystatic->client = $obj->client;
-		$companystatic->fournisseur = $obj->fournisseur;
-		$companystatic->code_client = $obj->code_client;
-		$companystatic->email = $obj->email;
-		$companystatic->phone = $obj->phone;
-		$companystatic->address = $obj->address;
-		$companystatic->zip = $obj->zip;
-		$companystatic->town = $obj->town;
-		$companystatic->country_code = $obj->country_code;
-
-		$projectstatic->id = $obj->project_id;
-		$projectstatic->ref = $obj->project_ref;
-		$projectstatic->title = $obj->project_label;
-
-		$totalInvoicedHT = 0;
-		$totalInvoicedTTC = 0;
-		$multicurrency_totalInvoicedHT = 0;
-		$multicurrency_totalInvoicedTTC = 0;
-
-		$TInvoiceData = $objectstatic->InvoiceArrayList($obj->rowid);
-
-		if (!empty($TInvoiceData)) {
-			foreach ($TInvoiceData as $invoiceData) {
-				$invoice = new Facture($db);
-				$invoice->fetch($invoiceData->facid);
-
-				if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $invoice->type == Facture::TYPE_DEPOSIT) {
-					continue;
-				}
-
-				$totalInvoicedHT += $invoice->total_ht;
-				$totalInvoicedTTC += $invoice->total_ttc;
-				$multicurrency_totalInvoicedHT += $invoice->multicurrency_total_ht;
-				$multicurrency_totalInvoicedTTC += $invoice->multicurrency_total_ttc;
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1);
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
 
-		$marginInfo = array();
-		if ($with_margin_info === true) {
-			$objectstatic->fetch_lines();
-			$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
-			$total_ht += $obj->total_ht;
-			$total_margin += $marginInfo['total_margin'];
-		}
-
-		if ($mode == 'kanban') {
-			if ($i == 0) {
-				print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
-				print '<div class="box-flex-container kanban">';
-			}
-			// Output Kanban
-			$userstatic->fetch($obj->fk_user_author);
-			$arrayofparams = array('selected' => in_array($object->id, $arrayofselected), 'authorlink' => $userstatic->getNomUrl(-2), 'projectlink' => $projectstatic->getNomUrl(2));
-			print $objectstatic->getKanbanView('', $arrayofparams);
-			if ($i == ($imaxinloop - 1)) {
-				print '</div>';
-				print '</td></tr>';
-			}
-		} else {
-			print '<tr class="oddeven">';
-
-			// Action column
-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap" align="center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		if (!empty($arrayfields['sale_representative']['checked'])) {
+			// Sales representatives
+			print '<td class="tdoverflowmax125">';
+			if ($obj->socid > 0) {
+				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+				if ($listsalesrepresentatives < 0) {
+					dol_print_error($db);
 				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['p.ref']['checked'])) {
-				print '<td class="nowraponall">';
-
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				// Picto + Ref
-				print '<td class="nobordernopadding nowraponall">';
-				print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
-				print '</td>';
-				// Warning
-				$warnornote = '';
-				if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
-					$warnornote .= img_warning($langs->trans("Late"));
-				}
-				if ($warnornote) {
-					print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-					print $warnornote;
-					print '</td>';
-				}
-				// Other picto tool
-				print '<td width="16" class="nobordernopadding right">';
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref);
-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-				print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-				print '</td></tr></table>';
-
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['p.ref_client']['checked'])) {
-				// Customer ref
-				print '<td class="nowrap tdoverflowmax200">';
-				print dol_escape_htmltag($obj->ref_client);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['pr.ref']['checked'])) {
-				// Project ref
-				print '<td class="nowraponall">';
-				if ($obj->project_id > 0) {
-					print $projectstatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['pr.title']['checked'])) {
-				// Project label
-				print '<td class="nowrap">';
-				if ($obj->project_id > 0) {
-					print dol_escape_htmltag($projectstatic->title);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Thirdparty
-			if (!empty($arrayfields['s.nom']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Alias
-			if (!empty($arrayfields['s.name_alias']['checked'])) {
-				print '<td class="tdoverflowmax200">';
-				print $obj->alias;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Town
-			if (!empty($arrayfields['s.town']['checked'])) {
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
-				print dol_escape_htmltag($obj->town);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Zip
-			if (!empty($arrayfields['s.zip']['checked'])) {
-				print '<td class="nocellnopadd">';
-				print $obj->zip;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// State
-			if (!empty($arrayfields['state.nom']['checked'])) {
-				print "<td>".$obj->state_name."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Country
-			if (!empty($arrayfields['country.code_iso']['checked'])) {
-				print '<td class="center">';
-				$tmparray = getCountry($obj->fk_pays, 'all');
-				print $tmparray['label'];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Type ent
-			if (!empty($arrayfields['typent.code']['checked'])) {
-				if (!is_array($typenArray) || empty($typenArray)) {
-					$typenArray = $formcompany->typent_array(1);
-				}
-
-				print '<td class="center">';
-				if (!empty($obj->typent_code)) {
-					print $typenArray[$obj->typent_code];
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date proposal
-			if (!empty($arrayfields['p.date']['checked'])) {
-				print '<td class="center">';
-				print dol_print_date($db->jdate($obj->dp), 'day');
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date end validity
-			if (!empty($arrayfields['p.fin_validite']['checked'])) {
-				if ($obj->dfv) {
-					print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
-					print '</td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date delivery
-			if (!empty($arrayfields['p.date_livraison']['checked'])) {
-				if ($obj->ddelivery) {
-					print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
-					print '</td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date Signature
-			if (!empty($arrayfields['p.date_signature']['checked'])) {
-				if ($obj->dsignature) {
-					print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
-					print '</td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Availability
-			if (!empty($arrayfields['ava.rowid']['checked'])) {
-				print '<td class="center">';
-				$form->form_availability('', $obj->availability, 'none', 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Shipping Method
-			if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
-				print '<td>';
-				$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Source - input reason
-			if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
-				$labelInputReason = '';
-				if ($obj->fk_input_reason > 0) {
-					$labelInputReason = $form->cache_demand_reason[$obj->fk_input_reason]['label'];
-				}
-				print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($labelInputReason).'">';
-				print dol_escape_htmltag($labelInputReason);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Payment terms
-			if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
-				print '<td>';
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Payment mode
-			if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
-				print '<td>';
-				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['p.total_ht']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
-				}
-				if (empty($totalarray['val']['p.total_ht'])) {
-					$totalarray['val']['p.total_ht'] = $obj->total_ht;
-				} else {
-					$totalarray['val']['p.total_ht'] += $obj->total_ht;
-				}
-			}
-			// Amount VAT
-			if (!empty($arrayfields['p.total_tva']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
-				}
-				if (empty($totalarray['val']['p.total_tva'])) {
-					$totalarray['val']['p.total_tva'] = $obj->total_tva;
-				} else {
-					$totalarray['val']['p.total_tva'] += $obj->total_tva;
-				}
-			}
-			// Amount TTC
-			if (!empty($arrayfields['p.total_ttc']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
-				}
-				if (empty($totalarray['val']['p.total_ttc'])) {
-					$totalarray['val']['p.total_ttc'] = $obj->total_ttc;
-				} else {
-					$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
-				}
-			}
-			// Amount invoiced HT
-			if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedHT)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
-				}
-				if (empty($totalarray['val']['p.total_ht_invoiced'])) {
-					$totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
-				} else {
-					$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
-				}
-			}
-			// Amount invoiced TTC
-			if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($totalInvoicedTTC)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
-				}
-				if (empty($totalarray['val']['p.total_invoiced'])) {
-					$totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
-				} else {
-					$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
-				}
-			}
-			// Currency
-			if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
-				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Currency rate
-			if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
-				print '<td class="nowrap">';
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount VAT
-			if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_tva)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount TTC
-			if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount invoiced
-			if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedHT)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount invoiced
-			if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
-				print '<td class="nowrap right"><span class="amount">'.price($multicurrency_totalInvoicedTTC)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			$userstatic->id = $obj->fk_user_author;
-			$userstatic->login = $obj->login;
-			$userstatic->lastname = $obj->lastname;
-			$userstatic->firstname = $obj->firstname;
-			$userstatic->email = $obj->user_email;
-			$userstatic->statut = $obj->user_statut;
-			$userstatic->entity = $obj->user_entity;
-			$userstatic->photo = $obj->photo;
-			$userstatic->office_phone = $obj->office_phone;
-			$userstatic->office_fax = $obj->office_fax;
-			$userstatic->user_mobile = $obj->user_mobile;
-			$userstatic->job = $obj->job;
-			$userstatic->gender = $obj->gender;
-
-			// Author
-			if (!empty($arrayfields['u.login']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				if ($userstatic->id) {
-					print $userstatic->getNomUrl(-1);
-				}
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['sale_representative']['checked'])) {
-				// Sales representatives
-				print '<td class="tdoverflowmax125">';
-				if ($obj->socid > 0) {
-					$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
-					if ($listsalesrepresentatives < 0) {
-						dol_print_error($db);
-					}
-					$nbofsalesrepresentative = count($listsalesrepresentatives);
-					if ($nbofsalesrepresentative > 6) {
-						// We print only number
-						print $nbofsalesrepresentative;
-					} elseif ($nbofsalesrepresentative > 0) {
-						$userstatic = new User($db);
-						$j = 0;
-						foreach ($listsalesrepresentatives as $val) {
-							$userstatic->id = $val['id'];
-							$userstatic->lastname = $val['lastname'];
-							$userstatic->firstname = $val['firstname'];
-							$userstatic->email = $val['email'];
-							$userstatic->statut = $val['statut'];
-							$userstatic->entity = $val['entity'];
-							$userstatic->photo = $val['photo'];
-							$userstatic->login = $val['login'];
-							$userstatic->office_phone = $val['office_phone'];
-							$userstatic->office_fax = $val['office_fax'];
-							$userstatic->user_mobile = $val['user_mobile'];
-							$userstatic->job = $val['job'];
-							$userstatic->gender = $val['gender'];
-							//print '<div class="float">':
-							print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
-							$j++;
-							if ($j < $nbofsalesrepresentative) {
-								print ' ';
-							}
-							//print '</div>';
+				$nbofsalesrepresentative = count($listsalesrepresentatives);
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
+					print $nbofsalesrepresentative;
+				} elseif ($nbofsalesrepresentative > 0) {
+					$userstatic = new User($db);
+					$j = 0;
+					foreach ($listsalesrepresentatives as $val) {
+						$userstatic->id = $val['id'];
+						$userstatic->lastname = $val['lastname'];
+						$userstatic->firstname = $val['firstname'];
+						$userstatic->email = $val['email'];
+						$userstatic->statut = $val['statut'];
+						$userstatic->entity = $val['entity'];
+						$userstatic->photo = $val['photo'];
+						$userstatic->login = $val['login'];
+						$userstatic->office_phone = $val['office_phone'];
+						$userstatic->office_fax = $val['office_fax'];
+						$userstatic->user_mobile = $val['user_mobile'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
+						//print '<div class="float">':
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+						$j++;
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
 						}
+						//print '</div>';
 					}
-					//else print $langs->trans("NoSalesRepresentativeAffected");
+				}
+				//else print $langs->trans("NoSalesRepresentativeAffected");
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Total buying or cost price
+		if (!empty($arrayfields['total_pa']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total margin
+		if (!empty($arrayfields['total_margin']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+			}
+			$totalarray['val']['total_margin'] = $total_margin;
+		}
+		// Total margin rate
+		if (!empty($arrayfields['total_margin_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total mark rate
+		if (!empty($arrayfields['total_mark_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+			}
+			if ($i >= $imaxinloop - 1) {
+				if (!empty($total_ht)) {
+					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
 				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
+					$totalarray['val']['total_mark_rate'] = '';
 				}
 			}
-
-			// Total buying or cost price
-			if (!empty($arrayfields['total_pa']['checked'])) {
-				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Total margin
-			if (!empty($arrayfields['total_margin']['checked'])) {
-				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
-				}
-				$totalarray['val']['total_margin'] = $total_margin;
-			}
-			// Total margin rate
-			if (!empty($arrayfields['total_margin_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Total mark rate
-			if (!empty($arrayfields['total_mark_rate']['checked'])) {
-				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
-				}
-				if ($i >= $imaxinloop - 1) {
-					if (!empty($total_ht)) {
-						$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
-					} else {
-						$totalarray['val']['total_mark_rate'] = '';
-					}
-				}
-			}
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-			// Date creation
-			if (!empty($arrayfields['p.datec']['checked'])) {
-				print '<td align="center" class="nowrap">';
-				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date modification
-			if (!empty($arrayfields['p.tms']['checked'])) {
-				print '<td align="center" class="nowrap">';
-				print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date cloture
-			if (!empty($arrayfields['p.date_cloture']['checked'])) {
-				print '<td align="center" class="nowrap">';
-				print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Note public
-			if (!empty($arrayfields['p.note_public']['checked'])) {
-				print '<td class="center">';
-				print dol_string_nohtmltag($obj->note_public);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Note private
-			if (!empty($arrayfields['p.note_private']['checked'])) {
-				print '<td class="center">';
-				print dol_string_nohtmltag($obj->note_private);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Status
-			if (!empty($arrayfields['p.fk_statut']['checked'])) {
-				print '<td class="nowrap center">'.$objectstatic->getLibStatut(5).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Action column
-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap" align="center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->rowid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-
-			print '</tr>'."\n";
 		}
 
-		$i++;
-	}
-
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-	// If no record found
-	if ($num == 0) {
-		$colspan = 1;
-		foreach ($arrayfields as $key => $val) {
-			if (!empty($val['checked'])) {
-				$colspan++;
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['p.datec']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
-		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
-	}
-
-	$db->free($resql);
-
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	print '</table>'."\n";
-	print '</div>'."\n";
-
-	print '</form>'."\n";
-
-	if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
-		$hidegeneratedfilelistifempty = 1;
-		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
-			$hidegeneratedfilelistifempty = 0;
+		// Date modification
+		if (!empty($arrayfields['p.tms']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date cloture
+		if (!empty($arrayfields['p.date_cloture']['checked'])) {
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Note public
+		if (!empty($arrayfields['p.note_public']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_public);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Note private
+		if (!empty($arrayfields['p.note_private']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_private);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['p.fk_statut']['checked'])) {
+			print '<td class="nowrap center">'.$objectstatic->getLibStatut(5).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap" align="center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		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_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+		print '</tr>'."\n";
 	}
 
-	// End of page
-	llxFooter();
-	$db->close();
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
+$db->free($resql);
+
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', array_keys($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_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 54ba84705cb..ac2ac6af639 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2016-2023  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2023  Charlene Benke	        <charlene@patas-monkey.com>
  * Copyright (C) 2021-2024 	Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -783,11 +784,7 @@ if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
 	}
 
 	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		}
+		setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
 	} else {
 		$db->rollback();
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 1acea501327..9649ef6252c 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2018 	   Juanjo Menent  <jmenent@2byte.es>
  * Copyright (C) 2019 	   Ferran Marcet  <fmarcet@2byte.es>
  * Copyright (C) 2019-2024 Frédéric France <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -373,9 +374,9 @@ if (!$error && $massaction == 'confirm_presend') {
 					if ($filepath_found) {
 						// Create form object
 						$attachedfilesThirdpartyObj[$thirdpartyid][$objectid] = array(
-							'paths'=>array($filepath_found),
-							'names'=>array($filename_found),
-							'mimes'=>array(dol_mimetype($filepath_found))
+							'paths' => array($filepath_found),
+							'names' => array($filename_found),
+							'mimes' => array(dol_mimetype($filepath_found))
 						);
 					} else {
 						$nbignored++;
@@ -477,7 +478,7 @@ if (!$error && $massaction == 'confirm_presend') {
 					$substitutionarray['__EMAIL__'] = $thirdparty->email;
 					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefined&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-undefined", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 
-					$parameters = array('mode'=>'formemail');
+					$parameters = array('mode' => 'formemail');
 
 					if (!empty($listofobjectthirdparties)) {
 						$parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
@@ -491,16 +492,16 @@ if (!$error && $massaction == 'confirm_presend') {
 					$subjectreplaced = make_substitutions($subject, $substitutionarray);
 					$messagereplaced = make_substitutions($message, $substitutionarray);
 
-					$attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
+					$attachedfiles = array('paths' => array(), 'names' => array(), 'mimes' => array());
 					if ($oneemailperrecipient) {
 						// if "one email per recipient" is check we must collate $attachedfiles by thirdparty
 						if (is_array($attachedfilesThirdpartyObj[$thirdparty->id]) && count($attachedfilesThirdpartyObj[$thirdparty->id])) {
 							foreach ($attachedfilesThirdpartyObj[$thirdparty->id] as $keyObjId => $objAttachedFiles) {
 								// Create form object
 								$attachedfiles = array(
-									'paths'=>array_merge($attachedfiles['paths'], $objAttachedFiles['paths']),
-									'names'=>array_merge($attachedfiles['names'], $objAttachedFiles['names']),
-									'mimes'=>array_merge($attachedfiles['mimes'], $objAttachedFiles['mimes'])
+									'paths' => array_merge($attachedfiles['paths'], $objAttachedFiles['paths']),
+									'names' => array_merge($attachedfiles['names'], $objAttachedFiles['names']),
+									'mimes' => array_merge($attachedfiles['mimes'], $objAttachedFiles['mimes'])
 								);
 							}
 						}
@@ -720,11 +721,7 @@ if (!$error && $massaction == 'cancelorders') {
 		}
 	}
 	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		}
+		setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -1205,9 +1202,9 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread) {
 if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
 	$db->begin();
 
-	$affecttag_type=GETPOST('affecttag_type', 'alpha');
+	$affecttag_type = GETPOST('affecttag_type', 'alpha');
 	if (!empty($affecttag_type)) {
-		$affecttag_type_array=explode(',', $affecttag_type);
+		$affecttag_type_array = explode(',', $affecttag_type);
 	} else {
 		setEventMessage('CategTypeNotFound', 'errors');
 	}
@@ -1215,8 +1212,8 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		//check if tag type submitted exists into Tag Map categorie class
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categ = new Categorie($db);
-		$to_affecttag_type_array=array();
-		$categ_type_array=$categ->getMapList();
+		$to_affecttag_type_array = array();
+		$categ_type_array = $categ->getMapList();
 		foreach ($categ_type_array as $categdef) {
 			if (in_array($categdef['code'], $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
@@ -1250,13 +1247,9 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 	}
 
 	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		}
+		setEventMessages($langs->trans("RecordsModified", $nbok), null);
 		$db->commit();
-		$toselect=array();
+		$toselect = array();
 	} else {
 		$db->rollback();
 	}
@@ -1265,7 +1258,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoadd) {
 	$db->begin();
 	if (GETPOSTISSET('pricerate')) {
-		$pricepercentage=GETPOSTINT('pricerate');
+		$pricepercentage = GETPOSTINT('pricerate');
 		if ($pricepercentage == 0) {
 			setEventMessages($langs->trans("RecordsModified", 0), null);
 		} else {
@@ -1300,7 +1293,7 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 			setEventMessages($langs->trans("RecordsModified", $nbok), null);
 		}
 		$db->commit();
-		$toselect=array();
+		$toselect = array();
 	} else {
 		$db->rollback();
 	}
@@ -1308,7 +1301,7 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 
 if (!$error && ($action == 'setsupervisor' && $confirm == 'yes') && $permissiontoadd) {
 	$db->begin();
-	$supervisortoset=GETPOST('supervisortoset');
+	$supervisortoset = GETPOST('supervisortoset');
 	if (!empty($supervisortoset)) {
 		foreach ($toselect as $toselectid) {
 			$result = $object->fetch($toselectid);
@@ -1333,13 +1326,9 @@ if (!$error && ($action == 'setsupervisor' && $confirm == 'yes') && $permissiont
 	}
 
 	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		}
+		setEventMessages($langs->trans("RecordsModified", $nbok), null);
 		$db->commit();
-		$toselect=array();
+		$toselect = array();
 	} else {
 		$db->rollback();
 	}
@@ -1348,9 +1337,9 @@ if (!$error && ($action == 'setsupervisor' && $confirm == 'yes') && $permissiont
 if (!$error && ($action == 'affectuser' && $confirm == 'yes') && $permissiontoadd) {
 	$db->begin();
 
-	$usertoaffect=GETPOST('usertoaffect');
-	$projectrole=GETPOST('projectrole');
-	$tasksrole=GETPOST('tasksrole');
+	$usertoaffect = GETPOST('usertoaffect');
+	$projectrole = GETPOST('projectrole');
+	$tasksrole = GETPOST('tasksrole');
 	if (!empty($usertoaffect)) {
 		foreach ($toselect as $toselectid) {
 			$result = $object->fetch($toselectid);
@@ -1387,13 +1376,9 @@ if (!$error && ($action == 'affectuser' && $confirm == 'yes') && $permissiontoad
 	}
 
 	if (!$error) {
-		if ($nbok > 1) {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		} else {
-			setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		}
+		setEventMessages($langs->trans("RecordsModified", $nbok), null);
 		$db->commit();
-		$toselect=array();
+		$toselect = array();
 	} else {
 		$db->rollback();
 	}
@@ -1406,9 +1391,9 @@ if (!$error && ($massaction == 'enable' || ($action == 'enable' && $confirm == '
 	$nbok = 0;
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if ($result>0) {
+		if ($result > 0) {
 			if (in_array($objecttmp->element, array('societe'))) {
-				$result =$objecttmp->setStatut(1);
+				$result = $objecttmp->setStatut(1);
 			}
 			if ($result <= 0) {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
@@ -1443,9 +1428,9 @@ if (!$error && ($massaction == 'disable' || ($action == 'disable' && $confirm ==
 	$nbok = 0;
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if ($result>0) {
+		if ($result > 0) {
 			if (in_array($objecttmp->element, array('societe'))) {
-				$result =$objecttmp->setStatut(0);
+				$result = $objecttmp->setStatut(0);
 			}
 			if ($result <= 0) {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
@@ -1488,7 +1473,7 @@ if (!$error && $action == 'confirm_edit_value_extrafields' && $confirm == 'yes'
 		/** @var CommonObject $objecttmp */
 		$objecttmp = new $objectclass($db); // to avoid ghost data
 		$result = $objecttmp->fetch($toselectid);
-		if ($result>0) {
+		if ($result > 0) {
 			// Fill array 'array_options' with data from add form
 			$ret = $e->setOptionalsFromPost(null, $objecttmp, $extrafieldKeyToUpdate);
 			if ($ret > 0) {
@@ -1524,7 +1509,7 @@ if (!$error && ($massaction == 'affectcommercial' || ($action == 'affectcommerci
 
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if ($result>0) {
+		if ($result > 0) {
 			if (in_array($objecttmp->element, array('societe'))) {
 				$result = $objecttmp->setSalesRep(GETPOST("commercial", "alpha"));
 			}
@@ -1719,7 +1704,7 @@ if (!$error && ($massaction == 'increaseholiday' || ($action == 'increaseholiday
 			setEventMessages($langs->trans("HolidayRecordIncreased"), null, 'mesgs');
 		}
 		$db->commit();
-		$toselect=array();
+		$toselect = array();
 	} else {
 		$db->rollback();
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a140bf1e4b7..32b758792c6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1667,11 +1667,7 @@ abstract class CommonObject
 						$tmpelement = $obj->element;
 						$transkey = "TypeContact_".$tmpelement."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_label);
-						if (empty($option)) {
-							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
-						} else {
-							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
-						}
+						$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
 					}
 				}
 			}
@@ -8846,13 +8842,7 @@ abstract class CommonObject
 						}
 
 						$out .= ($display_type == 'card' ? '</td>' : '</div>');
-
-						if (getDolGlobalString('MAIN_EXTRAFIELDS_USE_TWO_COLUMS') && (($e % 2) == 1)) {
-							$out .= ($display_type == 'card' ? '</tr>' : '</div>');
-						} else {
-							$out .= ($display_type == 'card' ? '</tr>' : '</div>');
-						}
-
+						$out .= ($display_type == 'card' ? '</tr>' : '</div>');
 						$e++;
 					}
 				}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 14d8680faec..51324da5753 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -23,6 +23,7 @@
  * Copyright (C) 2018       Josep Lluis Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2023		Joachim Kueter			<git-jk@bloxera.com>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -3753,13 +3754,8 @@ class Form
 						$outvallabel .= " - " . $reputations[$objp->supplier_reputation];
 					}
 				} else {
-					if (empty($alsoproductwithnosupplierprice)) {     // No supplier price defined for couple product/supplier
-						$optlabel .= " - <span class='opacitymedium'>" . $langs->trans("NoPriceDefinedForThisSupplier") . '</span>';
-						$outvallabel .= ' - ' . $langs->transnoentities("NoPriceDefinedForThisSupplier");
-					} else { // No supplier price defined for product, even on other suppliers
-						$optlabel .= " - <span class='opacitymedium'>" . $langs->trans("NoPriceDefinedForThisSupplier") . '</span>';
-						$outvallabel .= ' - ' . $langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
+					$optlabel .= " - <span class='opacitymedium'>" . $langs->trans("NoPriceDefinedForThisSupplier") . '</span>';
+					$outvallabel .= ' - ' . $langs->transnoentities("NoPriceDefinedForThisSupplier");
 				}
 
 				if (isModEnabled('stock') && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
@@ -10183,13 +10179,8 @@ class Form
 	public function showFilterButtons($pos = '')
 	{
 		$out = '<div class="nowraponall">';
-		if ($pos == 'left') {
-			$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fas fa-search"></span></button>';
-			$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fas fa-times"></span></button>';
-		} else {
-			$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fas fa-search"></span></button>';
-			$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fas fa-times"></span></button>';
-		}
+		$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fas fa-search"></span></button>';
+		$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fas fa-times"></span></button>';
 		$out .= '</div>';
 
 		return $out;
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index cf824fea339..b041710ab4a 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -475,30 +476,21 @@ class RssParser
 							}
 						}
 					} elseif ($rss->_format == 'atom') {
-						if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
-							$itemLink = (isset($item['link']) ? sanitizeVal((string) $item['link']) : '');
-							$itemTitle = sanitizeVal((string) $item['title']);
-							$itemDescription = sanitizeVal($this->getAtomItemDescription($item));
-							$itemPubDate = sanitizeVal((string) $item['created']);
-							$itemId = sanitizeVal((string) $item['id']);
-							$itemAuthor = sanitizeVal((string) ($item['author'] ? $item['author'] : $item['author_name']));
-						} else {
-							$itemLink = (isset($item['link']) ? sanitizeVal((string) $item['link']) : '');
-							$itemTitle = sanitizeVal((string) $item['title']);
-							$itemDescription = sanitizeVal($this->getAtomItemDescription($item));
-							$itemPubDate = sanitizeVal((string) $item['created']);
-							$itemId = sanitizeVal((string) $item['id']);
-							$itemAuthor = sanitizeVal((string) ($item['author'] ? $item['author'] : $item['author_name']));
-						}
+						$itemLink = (isset($item['link']) ? sanitizeVal((string) $item['link']) : '');
+						$itemTitle = sanitizeVal((string) $item['title']);
+						$itemDescription = sanitizeVal($this->getAtomItemDescription($item));
+						$itemPubDate = sanitizeVal((string) $item['created']);
+						$itemId = sanitizeVal((string) $item['id']);
+						$itemAuthor = sanitizeVal((string) ($item['author'] ? $item['author'] : $item['author_name']));
 						$itemCategory = array();
 					} else {
-						$itemCategory = array();
 						$itemLink = '';
 						$itemTitle = '';
 						$itemDescription = '';
 						$itemPubDate = '';
 						$itemId = '';
 						$itemAuthor = '';
+						$itemCategory = array();
 						print 'ErrorBadFeedFormat';
 					}
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index a8bad027e59..8024bb4aa5b 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -337,12 +338,7 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		try {
-			if (!$this->database_name) {
-				// SQL query not needing a database connection (example: CREATE DATABASE)
-				$ret = $this->db->query($query, $result_mode);
-			} else {
-				$ret = $this->db->query($query, $result_mode);
-			}
+			$ret = $this->db->query($query, $result_mode);
 		} catch (Exception $e) {
 			dol_syslog(get_class($this)."::query Exception in query instead of returning an error: ".$e->getMessage(), LOG_ERR);
 			$ret = false;
diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php
index 89a36297e39..3782a170242 100644
--- a/htdocs/core/lib/ftp.lib.php
+++ b/htdocs/core/lib/ftp.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2022-2023	Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2022	    Anthony Berton       	<bertonanthony@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -43,7 +44,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 	$error = 0;
 	$connect_id = null;
 	$newsectioniso = '';
-	$mesg="";
+	$mesg = "";
 
 	if (!is_numeric($ftp_port)) {
 		$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
@@ -110,7 +111,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 		}
 	}
 
-	$arrayresult = array('conn_id'=>$connect_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
+	$arrayresult = array('conn_id' => $connect_id, 'ok' => $ok, 'mesg' => $mesg, 'curdir' => $section, 'curdiriso' => $newsectioniso);
 	return $arrayresult;
 }
 
@@ -144,10 +145,7 @@ function dol_ftp_close($connect_id)
 
 	// Close FTP connection
 	if ($connect_id) {
-		if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
-		} elseif (getDolGlobalString('FTP_CONNECT_WITH_SSL')) {
-			return ftp_close($connect_id);
-		} else {
+		if (!getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 			return ftp_close($connect_id);
 		}
 	}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 6aacd9bdae3..e749f7f54fd 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2008-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -317,11 +318,7 @@ class MenuManager
 
 							print $val2['titre'];
 							if ($relurl2) {
-								if ($val2['enabled']) {	// Allowed
-									print '</a>';
-								} else {
-									print '</a>';
-								}
+								print '</a>';
 							}
 							print '</li>'."\n";
 						}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index c6bb8ac861c..dcbaadcc563 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -323,11 +324,7 @@ class MenuManager
 
 							print $val2['titre'];
 							if ($relurl2) {
-								if ($val2['enabled']) {	// Allowed
-									print '</a>';
-								} else {
-									print '</a>';
-								}
+								print '</a>';
 							}
 							print '</li>'."\n";
 						}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 4b189b165cc..16b936b6ac1 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -309,13 +310,7 @@ class MenuManager
 							}
 							print $val2['titre'];
 							if ($relurl2) {
-								if ($val2['enabled']) {
-									// Allowed
-									print '</a>';
-								} else {
-									// Not allowed
-									print '</a>';
-								}
+								print '</a>';
 							}
 							print '</li>'."\n";
 						}
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 9e6c85f4f3b..cd73e6a0473 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -192,12 +193,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$codetouse = $prefix.strtoupper($codetouse);
 
 		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (!$is_dispo) {
-			$this->code = $codetouse;
-		} else {
-			// Pour retour
-			$this->code = $codetouse;
-		}
+		$this->code = $codetouse;
 		dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
 		return $is_dispo;
 	}
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 0751cfd6f5d..7a0338a0126 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -240,11 +241,11 @@ if ($action == 'refreshmanual') {
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
 				if ($id > 0) {
-					$newdirsql = array('id'=>$id,
-									 'id_mere'=>$ecmdirtmp->fk_parent,
-									 'label'=>$ecmdirtmp->label,
-									 'description'=>$ecmdirtmp->description,
-									 'fullrelativename'=>$relativepathmissing);
+					$newdirsql = array('id' => $id,
+									 'id_mere' => $ecmdirtmp->fk_parent,
+									 'label' => $ecmdirtmp->label,
+									 'description' => $ecmdirtmp->description,
+									 'fullrelativename' => $relativepathmissing);
 					$sqltree[] = $newdirsql; // We complete fulltree for following loops
 					//var_dump($sqltree);
 					$adirwascreated = 1;
@@ -313,93 +314,93 @@ if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 	if (isModEnabled("product") || isModEnabled("service")) {
 		$langs->load("products");
 		$rowspan++;
-		$sectionauto[] = array('position'=>10, 'level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+		$sectionauto[] = array('position' => 10, 'level' => 1, 'module' => 'product', 'test' => (isModEnabled("product") || isModEnabled("service")), 'label' => $langs->trans("ProductsAndServices"), 'desc' => $langs->trans("ECMDocsByProducts"));
 	}
 	if (isModEnabled("societe")) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>20, 'level'=>1, 'module'=>'company', 'test'=>isModEnabled('societe'), 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+		$sectionauto[] = array('position' => 20, 'level' => 1, 'module' => 'company', 'test' => isModEnabled('societe'), 'label' => $langs->trans("ThirdParties"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
 	}
 	if (isModEnabled("propal")) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>30, 'level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+		$sectionauto[] = array('position' => 30, 'level' => 1, 'module' => 'propal', 'test' => isModEnabled('propal'), 'label' => $langs->trans("Proposals"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 	}
 	if (isModEnabled('contract')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contract'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+		$sectionauto[] = array('position' => 40, 'level' => 1, 'module' => 'contract', 'test' => isModEnabled('contract'), 'label' => $langs->trans("Contracts"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 	}
 	if (isModEnabled('order')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>isModEnabled('order'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+		$sectionauto[] = array('position' => 50, 'level' => 1, 'module' => 'order', 'test' => isModEnabled('order'), 'label' => $langs->trans("CustomersOrders"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 	}
 	if (isModEnabled('invoice')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('invoice'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+		$sectionauto[] = array('position' => 60, 'level' => 1, 'module' => 'invoice', 'test' => isModEnabled('invoice'), 'label' => $langs->trans("CustomersInvoices"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 	}
 	if (isModEnabled('supplier_proposal')) {
 		$langs->load("supplier_proposal");
 		$rowspan++;
-		$sectionauto[] = array('position'=>70, 'level'=>1, 'module'=>'supplier_proposal', 'test'=>isModEnabled('supplier_proposal'), 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+		$sectionauto[] = array('position' => 70, 'level' => 1, 'module' => 'supplier_proposal', 'test' => isModEnabled('supplier_proposal'), 'label' => $langs->trans("SupplierProposals"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
 	}
 	if (isModEnabled("supplier_order")) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>80, 'level'=>1, 'module'=>'order_supplier', 'test'=>isModEnabled("supplier_order"), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+		$sectionauto[] = array('position' => 80, 'level' => 1, 'module' => 'order_supplier', 'test' => isModEnabled("supplier_order"), 'label' => $langs->trans("SuppliersOrders"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
 	}
 	if (isModEnabled("supplier_invoice")) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>90, 'level'=>1, 'module'=>'invoice_supplier', 'test'=>isModEnabled("supplier_invoice"), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+		$sectionauto[] = array('position' => 90, 'level' => 1, 'module' => 'invoice_supplier', 'test' => isModEnabled("supplier_invoice"), 'label' => $langs->trans("SuppliersInvoices"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
 	}
 	if (isModEnabled('tax')) {
 		$langs->load("compta");
 		$rowspan++;
-		$sectionauto[] = array('position'=>100, 'level'=>1, 'module'=>'tax', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+		$sectionauto[] = array('position' => 100, 'level' => 1, 'module' => 'tax', 'test' => isModEnabled('tax'), 'label' => $langs->trans("SocialContributions"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
 		$rowspan++;
-		$sectionauto[] = array('position'=>110, 'level'=>1, 'module'=>'tax-vat', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("VAT"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
+		$sectionauto[] = array('position' => 110, 'level' => 1, 'module' => 'tax-vat', 'test' => isModEnabled('tax'), 'label' => $langs->trans("VAT"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
 	}
 	if (isModEnabled('salaries')) {
 		$langs->load("compta");
 		$rowspan++;
-		$sectionauto[] = array('position'=>120, 'level'=>1, 'module'=>'salaries', 'test'=>isModEnabled('salaries'), 'label'=>$langs->trans("Salaries"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Salaries")));
+		$sectionauto[] = array('position' => 120, 'level' => 1, 'module' => 'salaries', 'test' => isModEnabled('salaries'), 'label' => $langs->trans("Salaries"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Salaries")));
 	}
 	if (isModEnabled('project')) {
 		$rowspan++;
-		$sectionauto[] = array('position'=>130, 'level'=>1, 'module'=>'project', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+		$sectionauto[] = array('position' => 130, 'level' => 1, 'module' => 'project', 'test' => isModEnabled('project'), 'label' => $langs->trans("Projects"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
 		$rowspan++;
-		$sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
+		$sectionauto[] = array('position' => 140, 'level' => 1, 'module' => 'project_task', 'test' => isModEnabled('project'), 'label' => $langs->trans("Tasks"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
 	}
 	if (isModEnabled('intervention')) {
 		$langs->load("interventions");
 		$rowspan++;
-		$sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('intervention'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+		$sectionauto[] = array('position' => 150, 'level' => 1, 'module' => 'fichinter', 'test' => isModEnabled('intervention'), 'label' => $langs->trans("Interventions"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 	}
 	if (isModEnabled('expensereport')) {
 		$langs->load("trips");
 		$rowspan++;
-		$sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>isModEnabled('expensereport'), 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+		$sectionauto[] = array('position' => 160, 'level' => 1, 'module' => 'expensereport', 'test' => isModEnabled('expensereport'), 'label' => $langs->trans("ExpenseReports"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 	}
 	if (isModEnabled('holiday')) {
 		$langs->load("holiday");
 		$rowspan++;
-		$sectionauto[] = array('position'=>170, 'level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+		$sectionauto[] = array('position' => 170, 'level' => 1, 'module' => 'holiday', 'test' => isModEnabled('holiday'), 'label' => $langs->trans("Holidays"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 	}
 	if (isModEnabled("bank")) {
 		$langs->load("banks");
 		$rowspan++;
-		$sectionauto[] = array('position'=>180, 'level'=>1, 'module'=>'banque', 'test'=>isModEnabled('bank'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+		$sectionauto[] = array('position' => 180, 'level' => 1, 'module' => 'banque', 'test' => isModEnabled('bank'), 'label' => $langs->trans("BankAccount"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
 		$rowspan++;
-		$sectionauto[] = array('position'=>190, 'level'=>1, 'module'=>'chequereceipt', 'test'=>isModEnabled('bank'), 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
+		$sectionauto[] = array('position' => 190, 'level' => 1, 'module' => 'chequereceipt', 'test' => isModEnabled('bank'), 'label' => $langs->trans("CheckReceipt"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
 	}
 	if (isModEnabled('mrp')) {
 		$langs->load("mrp");
 		$rowspan++;
-		$sectionauto[] = array('position'=>200, 'level'=>1, 'module'=>'mrp-mo', 'test'=>isModEnabled('mrp'), 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+		$sectionauto[] = array('position' => 200, 'level' => 1, 'module' => 'mrp-mo', 'test' => isModEnabled('mrp'), 'label' => $langs->trans("MOs"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
 	}
 	if (isModEnabled('recruitment')) {
 		$langs->load("recruitment");
 		$rowspan++;
-		$sectionauto[] = array('position'=>210, 'level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>isModEnabled('recruitment'), 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+		$sectionauto[] = array('position' => 210, 'level' => 1, 'module' => 'recruitment-recruitmentcandidature', 'test' => isModEnabled('recruitment'), 'label' => $langs->trans("Candidatures"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
 	}
 	$rowspan++;
-	$sectionauto[] = array('position'=>220, 'level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
+	$sectionauto[] = array('position' => 220, 'level' => 1, 'module' => 'user', 'test' => 1, 'label' => $langs->trans("Users"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
@@ -481,15 +482,9 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			}
 
 			print '<li class="directory collapsed">';
-			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
-				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
-				print $val['label'];
-				print '</a>';
-			} else {
-				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
-				print $val['label'];
-				print '</a>';
-			}
+			print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
+			print $val['label'];
+			print '</a>';
 
 			print '<div class="ecmjqft">';
 			// Info
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index d5bdbdb3fb6..8c1cf0cae44 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1693,7 +1694,7 @@ if ($action == 'create') {
 			}
 
 			if ($action == 'cancel') {
-				$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text", 'label'=>'<strong>'.$langs->trans("Comment").'</strong>', 'name'=>"detail_cancel", 'value'=>""));
+				$array_input = array('text' => $langs->trans("ConfirmCancelTrip"), array('type' => "text", 'label' => '<strong>'.$langs->trans("Comment").'</strong>', 'name' => "detail_cancel", 'value' => ""));
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
 			}
 
@@ -1702,7 +1703,7 @@ if ($action == 'create') {
 			}
 
 			if ($action == 'refuse') {		// Deny
-				$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
+				$array_input = array('text' => $langs->trans("ConfirmRefuseTrip"), array('type' => "text", 'label' => $langs->trans("Comment"), 'name' => "detail_refuse", 'value' => ""));
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
 			}
 
@@ -1882,8 +1883,6 @@ if ($action == 'create') {
 			$rowspan = 5;
 			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
 				$rowspan++;
-			} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
-				$rowspan += 2;
 			} else {
 				$rowspan += 2;
 			}
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 4cd1297d617..455fcf636b8 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -74,8 +75,6 @@ $tmpproduct = new Product($db);
 $helpurl = '';
 if ($type == '0') {
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-} elseif ($type == '1') {
-	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 } else {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
@@ -171,7 +170,7 @@ if (!empty($mode) && $mode != '-1') {
 		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
-			$infoprod[$objp->rowid] = array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label, 'tobuy'=>$objp->tobuy, 'tosell'=>$objp->tobuy, 'tobatch'=>$objp->tobatch, 'barcode'=>$objp->barcode);
+			$infoprod[$objp->rowid] = array('type' => $objp->type, 'ref' => $objp->ref, 'label' => $objp->label, 'tobuy' => $objp->tobuy, 'tosell' => $objp->tobuy, 'tobatch' => $objp->tobatch, 'barcode' => $objp->barcode);
 			$infoprod[$objp->rowid]['nbline'] = $objp->c;
 
 			$i++;
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index b9413e921bc..9f298b9d438 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2019		Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,10 +110,6 @@ if (!($id > 0) && empty($ref) || $notab) {
 		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 		//$title=$langs->trans("StatisticsOfProducts");
 		$title = $langs->trans("Statistics");
-	} elseif ($type == '1') {
-		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-		//$title=$langs->trans("StatisticsOfServices");
-		$title = $langs->trans("Statistics");
 	} else {
 		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 		//$title=$langs->trans("StatisticsOfProductsOrServices");
@@ -203,7 +200,7 @@ if ($result || !($id > 0)) {
 	if (!($id > 0) || $notab) {
 		// Type
 		print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("Type").'</td><td>';
-		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+		$array = array('-1' => '&nbsp;', '0' => $langs->trans('Product'), '1' => $langs->trans('Service'));
 		print $form->selectarray('type', $array, $type, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 		print '</td></tr>';
 
@@ -344,50 +341,50 @@ if ($result || !($id > 0)) {
 	$arrayforlabel = array('byunit' => 'NumberOfUnits', 'bynumber' => 'NumberOf', 'byamount' => 'AmountIn');
 
 	if (isModEnabled('propal')) {
-		$graphfiles['propal'] = array('modulepart'=>'productstats_proposals',
+		$graphfiles['propal'] = array('modulepart' => 'productstats_proposals',
 			'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("Proposals")));
 	}
 
 	if (isModEnabled('supplier_proposal')) {
 		$langs->load("supplier_proposal");
-		$graphfiles['proposalssuppliers'] = array('modulepart'=>'productstats_proposalssuppliers',
+		$graphfiles['proposalssuppliers'] = array('modulepart' => 'productstats_proposalssuppliers',
 			'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("SupplierProposals")));
 	}
 
 	if (isModEnabled('order')) {
-		$graphfiles['orders'] = array('modulepart'=>'productstats_orders',
+		$graphfiles['orders'] = array('modulepart' => 'productstats_orders',
 			'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("Orders")));
 	}
 
 	if (isModEnabled('supplier_order')) {
-		$graphfiles['orderssuppliers'] = array('modulepart'=>'productstats_orderssuppliers',
+		$graphfiles['orderssuppliers'] = array('modulepart' => 'productstats_orderssuppliers',
 			'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("SuppliersOrders")));
 	}
 
 	if (isModEnabled('invoice')) {
-		$graphfiles['invoices'] = array('modulepart'=>'productstats_invoices',
+		$graphfiles['invoices'] = array('modulepart' => 'productstats_invoices',
 			'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("Invoices")));
 	}
 
 	if (isModEnabled('supplier_invoice')) {
-		$graphfiles['invoicessuppliers'] = array('modulepart'=>'productstats_invoicessuppliers',
+		$graphfiles['invoicessuppliers'] = array('modulepart' => 'productstats_invoicessuppliers',
 			'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("SupplierInvoices")));
 	}
 
 	if (isModEnabled('contract')) {
-		$graphfiles['contracts'] = array('modulepart'=>'productstats_contracts',
+		$graphfiles['contracts'] = array('modulepart' => 'productstats_contracts',
 			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode], $langs->transnoentitiesnoconv("Contracts")));
 	}
 
 	if (isModEnabled('mrp') && $mode != 'byamount') {
-		$graphfiles['mrp'] = array('modulepart'=>'productstats_mrp',
+		$graphfiles['mrp'] = array('modulepart' => 'productstats_mrp',
 			'file' => $object->id.'/mos12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => $langs->transnoentitiesnoconv($arrayforlabel[$mode]."Mos"));
 	}

From 4065a590242fb1de0128758e5a890b379c35c007 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Mon, 11 Mar 2024 13:07:37 +0100
Subject: [PATCH 0822/1862] FIX #24265 regression cannot see all product on
 takepos (#28753)

* FIX #24265 regression cannot see all product on takepose

See discussion here :

https://www.dolibarr.fr/forum/t/bug-affichage-takepos-mobile-dolibarr-v17/43219

* Update pos.css.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/takepos/css/pos.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 5a773fc3347..7965c7aaba7 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -375,7 +375,7 @@ div.paymentbordline
 	margin: 0 auto;
 	width: 100%;
 	height: 55%;
-	overflow: hidden;
+    overflow-x: hidden;
 }
 
 .div1{

From f72b03434bceedcb3aa1fae741be1f76b153281a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 13:16:53 +0100
Subject: [PATCH 0823/1862] Fix sql sanitization

---
 htdocs/accountancy/bookkeeping/export.php     | 50 +++++++++++++------
 htdocs/accountancy/bookkeeping/list.php       | 50 +++++++++++++------
 .../accountancy/class/bookkeeping.class.php   |  2 +-
 3 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 6f3c34b279e..97163ce1c16 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -528,25 +528,45 @@ $sqlwhere = array();
 if (count($filter) > 0) {
 	foreach ($filter as $key => $value) {
 		if ($key == 't.doc_date') {
-			$sqlwhere[] = $key."='".$db->idate($value)."'";
-		} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-			$sqlwhere[] = $key."'".$db->escape($value)."'";
+			$sqlwhere[] = $db->sanitize($key).' = \''.$db->idate($value).'\'';
+		} elseif ($key == 't.doc_date>=') {
+			$sqlwhere[] = "t.doc_date >= '".$db->idate($value)."'";
+		} elseif ($key == 't.doc_date<=') {
+			$sqlwhere[] = "t.doc_date <= '".$db->idate($value)."'";
+		} elseif ($key == 't.doc_date>') {
+			$sqlwhere[] = "t.doc_date > '".$db->idate($value)."'";
+		} elseif ($key == 't.doc_date<') {
+			$sqlwhere[] = "t.doc_date < '".$db->idate($value)."'";
+		} elseif ($key == 't.numero_compte>=') {
+			$sqlwhere[] = "t.numero_compte >= '".$db->escape($value)."'";
+		} elseif ($key == 't.numero_compte<=') {
+			$sqlwhere[] = "t.numero_compte <= '".$db->escape($value)."'";
+		} elseif ($key == 't.subledger_account>=') {
+			$sqlwhere[] = "t.subledger_account >= '".$db->escape($value)."'";
+		} elseif ($key == 't.subledger_account<=') {
+			$sqlwhere[] = "t.subledger_account <= '".$db->escape($value)."'";
 		} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-			$sqlwhere[] = $key.'='.((int) $value);
+			$sqlwhere[] = $db->sanitize($key).'='.((int) $value);
 		} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-			$sqlwhere[] = $key." LIKE '".$db->escape($value)."%'";
+			$sqlwhere[] = $db->sanitize($key)." LIKE '".$db->escape($db->escapeforlike($value))."%'";
 		} elseif ($key == 't.subledger_account') {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
-		} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
+		} elseif ($key == 't.tms>=') {
+			$sqlwhere[] = "t.tms >= '".$db->idate($value)."'";
+		} elseif ($key == 't.tms<=') {
+			$sqlwhere[] = "t.tms <= '".$db->idate($value)."'";
+		} elseif ($key == 't.date_creation>=') {
+			$sqlwhere[] = 't.date_creation >= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_creation<=') {
+			$sqlwhere[] = 't.date_creation <= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_export>=') {
+			$sqlwhere[] = 't.date_export >= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_export<=') {
+			$sqlwhere[] = 't.date_export <= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_validated>=') {
+			$sqlwhere[] = 't;date_validate >= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_validated<=') {
+			$sqlwhere[] = 't;date_validate <= \''.$db->idate($value).'\'';
 		} elseif ($key == 't.credit' || $key == 't.debit') {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 06921fc9d38..07f864cd5ef 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -620,25 +620,45 @@ $sqlwhere = array();
 if (count($filter) > 0) {
 	foreach ($filter as $key => $value) {
 		if ($key == 't.doc_date') {
-			$sqlwhere[] = $key."='".$db->idate($value)."'";
-		} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-			$sqlwhere[] = $key."'".$db->escape($value)."'";
+			$sqlwhere[] = $db->sanitize($key).' = \''.$db->idate($value).'\'';
+		} elseif ($key == 't.doc_date>=') {
+			$sqlwhere[] = "t.doc_date >= '".$db->idate($value)."'";
+		} elseif ($key == 't.doc_date<=') {
+			$sqlwhere[] = "t.doc_date <= '".$db->idate($value)."'";
+		} elseif ($key == 't.doc_date>') {
+			$sqlwhere[] = "t.doc_date > '".$db->idate($value)."'";
+		} elseif ($key == 't.doc_date<') {
+			$sqlwhere[] = "t.doc_date < '".$db->idate($value)."'";
+		} elseif ($key == 't.numero_compte>=') {
+			$sqlwhere[] = "t.numero_compte >= '".$db->escape($value)."'";
+		} elseif ($key == 't.numero_compte<=') {
+			$sqlwhere[] = "t.numero_compte <= '".$db->escape($value)."'";
+		} elseif ($key == 't.subledger_account>=') {
+			$sqlwhere[] = "t.subledger_account >= '".$db->escape($value)."'";
+		} elseif ($key == 't.subledger_account<=') {
+			$sqlwhere[] = "t.subledger_account <= '".$db->escape($value)."'";
 		} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-			$sqlwhere[] = $key.'='.((int) $value);
+			$sqlwhere[] = $db->sanitize($key).' = '.((int) $value);
 		} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-			$sqlwhere[] = $key." LIKE '".$db->escape($value)."%'";
+			$sqlwhere[] = $db->sanitize($key)." LIKE '".$db->escape($db->escapeforlike($value))."%'";
 		} elseif ($key == 't.subledger_account') {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
-		} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
-		} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
-			$sqlwhere[] = $key."'".$db->idate($value)."'";
+		} elseif ($key == 't.tms>=') {
+			$sqlwhere[] = "t.tms >= '".$db->idate($value)."'";
+		} elseif ($key == 't.tms<=') {
+			$sqlwhere[] = "t.tms <= '".$db->idate($value)."'";
+		} elseif ($key == 't.date_creation>=') {
+			$sqlwhere[] = 't.date_creation >= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_creation<=') {
+			$sqlwhere[] = 't.date_creation <= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_export>=') {
+			$sqlwhere[] = 't.date_export >= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_export<=') {
+			$sqlwhere[] = 't.date_export <= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_validated>=') {
+			$sqlwhere[] = 't;date_validate >= \''.$db->idate($value).'\'';
+		} elseif ($key == 't.date_validated<=') {
+			$sqlwhere[] = 't;date_validate <= \''.$db->idate($value).'\'';
 		} elseif ($key == 't.credit' || $key == 't.debit') {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 1f526e323e0..f291093d063 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -938,7 +938,7 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = 't.date_export <= \''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.date_validated>=') {
 					$sqlwhere[] = 't;date_validate >= \''.$this->db->idate($value).'\'';
-				} elseif ($key == 't.date_validated>=') {
+				} elseif ($key == 't.date_validated<=') {
 					$sqlwhere[] = 't;date_validate <= \''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);

From c33307577603d701722c01138da8779ec84b881b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 10:49:26 +0100
Subject: [PATCH 0824/1862] Fix: getChildrenOfLine's use of includealltree as
 array

# Fix: getChildrenOfLine's use of includealltree as array

includealltree of getChildrenOfLine was used as an array, fixed
---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 32b758792c6..b8878b38900 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3280,8 +3280,8 @@ abstract class CommonObject
 			if ($this->db->num_rows($resql) > 0) {
 				while ($row = $this->db->fetch_row($resql)) {
 					$rows[] = $row[0];
-					if (!empty($includealltree)) {
-						$rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					if ($includealltree) {
+						$rows = array_merge($rows, $this->getChildrenOfLine($row[0]));
 					}
 				}
 			}

From 674e668b78a78b431e1359b70561f96cf633fb4d Mon Sep 17 00:00:00 2001
From: Florent Poinsaut <1256948+FlorentPoinsaut@users.noreply.github.com>
Date: Mon, 4 Mar 2024 08:57:52 +0000
Subject: [PATCH 0825/1862] FIX cloned supplier order creation date as now

---
 .../class/fournisseur.commande.class.php      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2e128bcd7ec..2ab1ce0ef0d 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -5,14 +5,15 @@
  * Copyright (C) 2007		Franky Van Liedekerke	<franky.van.liedekerke@telenet.be>
  * Copyright (C) 2010-2020	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2010-2018	Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
- * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2018-2022  Ferran Marcet         	<fmarcet@2byte.es>
- * Copyright (C) 2021       Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2018		Nicolas ZABOURI			<info@inovea-conseil.com>
+ * Copyright (C) 2018-2024	Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2018-2022	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2021		Josep Lluís Amador		<joseplluis@lliuretic.cat>
+ * Copyright (C) 2022		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		Solution Libre SAS		<contact@solution-libre.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
@@ -1863,8 +1864,10 @@ class CommandeFournisseur extends CommonOrder
 		// Clear fields
 		$this->user_author_id     = $user->id;
 		$this->user_validation_id = 0;
+		$this->date               = dol_now();
 		$this->date_creation      = 0;
 		$this->date_validation    = 0;
+		$this->date_commande      = 0;
 		$this->ref_supplier       = '';
 		$this->user_approve_id    = 0;
 		$this->user_approve_id2   = 0;

From b72cf193c4a27b5781b2e3965e395cab10d102e7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:01:28 +0100
Subject: [PATCH 0826/1862] Fix some cases of
 PhanTypeSuspiciousStringExpression (#28751)

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

* Fix PhanTypeSuspiciousStringExpression

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
---
 htdocs/accountancy/admin/productaccount.php   |  3 ++-
 htdocs/admin/system/xdebug.php                |  8 +++++-
 htdocs/blockedlog/class/blockedlog.class.php  |  5 ++--
 htdocs/comm/action/class/actioncomm.class.php |  3 ++-
 htdocs/comm/mailing/card.php                  |  2 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/contrat/index.php                      | 27 +++++++++++--------
 htdocs/core/boxes/modules_boxes.php           |  3 ++-
 htdocs/core/class/menubase.class.php          | 12 ++++-----
 htdocs/core/menus/standard/auguria.lib.php    | 10 ++++---
 htdocs/core/menus/standard/eldy.lib.php       | 10 +++----
 htdocs/core/menus/standard/empty.php          |  3 +++
 .../modules/dons/html_cerfafr.modules.php     |  4 +++
 13 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index fa0db20a05f..fdd471b2fac 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Ari Elbaz (elarifr) <github@accedinfo.com>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -206,7 +207,7 @@ if ($action == 'update') {
 						$sql_exists .= " WHERE fk_product = " . ((int) $productid) . " AND entity = " . ((int) $conf->entity);
 						$resql_exists = $db->query($sql_exists);
 						if (!$resql_exists) {
-							$msg .= '<div><span class="error">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br> <pre>'.$resql_exists.'</pre></span></div>';
+							$msg .= '<div><span class="error">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br> <pre>'.json_encode($resql_exists).'</pre></span></div>';
 							$ko++;
 						} else {
 							$nb_exists = $db->num_rows($resql_exists);
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 719b81859c3..9e0b05a24a3 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2009-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -90,7 +91,12 @@ if (function_exists('socket_create')) {
 	//$client = socket_accept($sock);
 	$client = socket_connect($socket, $address, $port);
 	if ($client) {
-		print "Connection established: ".$client." - address=".$address." port=".$port."<br>\n";
+		if (is_bool($client)) {
+			$client_str = 'true';
+		} else {
+			$client_str = (string) $client;
+		}
+		print "Connection established: ".$client_str." - address=".$address." port=".$port."<br>\n";
 		print "There is a Remote debug server at this address.<br>\n";
 		print "<br>\n";
 		print "To be sure this debugger accepts input from your PHP server and xdebug, be sure to have\n";
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 451720bbd59..2166a0eb8cd 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017       ATM Consulting      <contact@atm-consulting.fr>
  * Copyright (C) 2017-2020  Laurent Destailleur <eldy@destailleur.fr>
  * Copyright (C) 2022 		charlene benke		<charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1014,7 +1015,7 @@ class BlockedLog
 				unset($keyforsignature);
 				return array('checkresult' => $res, 'calculatedsignature' => $signature, 'previoushash' => $previoushash);
 			} else {	// Consume much memory ($keyforsignature is a large var)
-				return array('checkresult' => $res, 'calculatedsignature' => $signature, 'previoushash' => $previoushash, 'keyforsignature'=>$keyforsignature);
+				return array('checkresult' => $res, 'calculatedsignature' => $signature, 'previoushash' => $previoushash, 'keyforsignature' => $keyforsignature);
 			}
 		} else {
 			unset($keyforsignature);
@@ -1227,7 +1228,7 @@ class BlockedLog
 			dol_print_error($this->db);
 		}
 
-		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".$result);
+		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".json_encode($result));
 
 		return $result;
 	}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index a73b24e9d28..62b813d8eb1 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015	    Marcos García		    <marcosgdf@gmail.com>
  * Copyright (C) 2018	    Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -2728,7 +2729,7 @@ class ActionComm extends CommonObject
 			return 0;
 		} else {
 			$this->db->commit(); // We commit also on error, to have the error message recorded.
-			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? implode(', ', $errorsMsg) : $error;
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg) ? implode(', ', $errorsMsg) : $error);
 
 			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 0618b4c94dc..f44f53071bd 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -532,7 +532,7 @@ if (empty($reshook)) {
 				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 				$action = '';
 			} else {
-				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
+				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.json_encode($result), null, 'errors');
 				$action = 'test';
 			}
 		}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 352e23c0431..e0e994959a7 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5915,7 +5915,7 @@ class Facture extends CommonInvoice
 
 			return 0;
 		} else {
-			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? implode(', ', $errorsMsg) : $error;
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg) ? implode(', ', $errorsMsg) : $error);
 
 			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 28f6c49a9fb..9f7089afc5f 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -154,9 +155,9 @@ if ($resql) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 		if ($obj) {
-			$nb[$obj->status.true] = $obj->nb;
+			$nb[$obj->status.((string) true)] = $obj->nb;
 			if ($obj->status != 5) {
-				$vals[$obj->status.true] = $obj->nb;
+				$vals[$obj->status.((string) true)] = $obj->nb;
 				$totalinprocess += $obj->nb;
 			}
 			$total += $obj->nb;
@@ -175,26 +176,28 @@ include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover centpercent">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
-$listofstatus = array(0, 4, 4, 5); $bool = false;
+$listofstatus = array(0, 4, 4, 5);
+$bool = false;
 foreach ($listofstatus as $status) {
-	$dataseries[] = array($staticcontratligne->LibStatut($status, 1, ($bool ? 1 : 0)), (isset($nb[$status.$bool]) ? (int) $nb[$status.$bool] : 0));
+	$bool_str = (string) $bool;
+	$dataseries[] = array($staticcontratligne->LibStatut($status, 1, ($bool ? 1 : 0)), (isset($nb[$status.$bool_str]) ? (int) $nb[$status.$bool_str] : 0));
 	if ($status == ContratLigne::STATUS_INITIAL) {
-		$colorseries[$status.$bool] = '-'.$badgeStatus0;
+		$colorseries[$status.$bool_str] = '-'.$badgeStatus0;
 	}
 	if ($status == ContratLigne::STATUS_OPEN && !$bool) {
-		$colorseries[$status.$bool] = $badgeStatus4;
+		$colorseries[$status.$bool_str] = $badgeStatus4;
 	}
 	if ($status == ContratLigne::STATUS_OPEN && $bool) {
-		$colorseries[$status.$bool] = $badgeStatus1;
+		$colorseries[$status.$bool_str] = $badgeStatus1;
 	}
 	if ($status == ContratLigne::STATUS_CLOSED) {
-		$colorseries[$status.$bool] = $badgeStatus6;
+		$colorseries[$status.$bool_str] = $badgeStatus6;
 	}
 
 	if (empty($conf->use_javascript_ajax)) {
 		print '<tr class="oddeven">';
 		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool_str] ? $nb[$status.$bool_str] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
 		print "</tr>\n";
 	}
 	if ($status == 4 && !$bool) {
@@ -219,12 +222,14 @@ if (!empty($conf->use_javascript_ajax)) {
 
 	print '</td></tr>';
 }
-$listofstatus = array(0, 4, 4, 5); $bool = false;
+$listofstatus = array(0, 4, 4, 5);
+$bool = false;
 foreach ($listofstatus as $status) {
+	$bool_str = (string) $bool;
 	if (empty($conf->use_javascript_ajax)) {
 		print '<tr class="oddeven">';
 		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print '<td class="right"><a href="services_list.php?search_status='.((int) $status).($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool_str] ? $nb[$status.$bool_str] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
 		if ($status == 4 && !$bool) {
 			$bool = true;
 		} else {
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 9be28e8bfc0..3ada87e0a10 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012  Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2014       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015       Frederic France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -194,7 +195,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 	 * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
 	 *
 	 * @param   array   $head       Array with properties of box title
-	 * @param   array   $contents   Array with properties of box lines
+	 * @param   array<array<array{tr?:string,text?:string,text2?:string,textnoformat?:string,tooltip?:string,logo?:string,url?:string,maxlength?:string}>>   $contents   Array with properties of box lines
 	 * @param	int		$nooutput	No print, only return string
 	 * @return  string
 	 */
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 25dc836be3c..85b6ca80901 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2009	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -511,8 +512,8 @@ class Menubase
 	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
 	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
 	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-	 * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
-	 * 	@return	array					Return array with menu entries for top menu
+	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tabMenu	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+	 * 	@return  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	Return array with menu entries for top menu
 	 */
 	public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
 	{
@@ -541,7 +542,7 @@ class Menubase
 	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
 	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
 	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-	 * 	@param  array	$tabMenu       Array with menu entries already loaded
+	 * 	@param  array<array{rowid:string,fk_menu:string,module:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tabMenu	Array with menu entries already loaded
 	 * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray
 	 */
 	public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
@@ -573,7 +574,6 @@ class Menubase
 			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu) {    // We found a menu entry not linked to parent with good mainmenu
 				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
 				//var_dump($this->newmenu->liste);exit;
-
 				if (empty($val['fk_leftmenu'])) {
 					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position'], '', '', '', $val['prefix']);
 					//var_dump($this->newmenu->liste);
@@ -624,7 +624,7 @@ class Menubase
 	 *  @param	string	$myleftmenu     Value for left that defined leftmenu
 	 *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
 	 *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
-	 *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be already filled)
+	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tabMenu	Array to store new entries found (in most cases, it's empty, but may be already filled)
 	 *  @return int     		        >0 if OK, <0 if KO
 	 */
 	public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
@@ -757,7 +757,7 @@ class Menubase
 	/**
 	 *  Complete this->newmenu with menu entry found in $tab
 	 *
-	 *  @param  array	$tab			Tab array with all menu entries
+	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tab	Tab array with all menu entries
 	 *  @param  int		$pere			Id of parent
 	 *  @param  int		$level			Level
 	 *  @return	void
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 9648194fccf..d727967222e 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2022	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -31,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target (Example: '' or '_top')
  * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
- * @param  	array	$tabMenu        If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> $tabMenu		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu	$menu			Object Menu to return back list of menu entries
  * @param	int		$noout			1=Disable output (Initialise &$menu only).
  * @param	string	$mode			'top', 'topnb', 'left', 'jmobile'
@@ -51,6 +52,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	// Show personalized menus
 	$menuArbo = new Menubase($db, 'auguria');
 	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'auguria', $tabMenu);
+	'@phan-var-force array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> $newTabMenu';
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
@@ -307,9 +309,9 @@ function print_end_menu_array_auguria()
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
  *
  * @param	DoliDB		$db                 Database handler
- * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
- * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
- * @param  	array		$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 10da59b56d7..843beba18af 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target (Example: '' or '_top')
  * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
- * @param  	array	$tabMenu        If array with menu entries already loaded, we put this array here (in most cases, it's empty). For eldy menu, it contains menu entries loaded from database.
+ * @param  	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$tabMenu        If array with menu entries already loaded, we put this array here (in most cases, it's empty). For eldy menu, it contains menu entries loaded from database.
  * @param	Menu	$menu			Object Menu to return back list of menu entries
  * @param	int		$noout			1=Disable output (Initialise &$menu only).
  * @param	string	$mode			'top', 'topnb', 'left', 'jmobile'
@@ -638,7 +638,7 @@ function print_start_menu_entry($idsel, $classname, $showmode)
  * @param	string	$idsel			Id sel
  * @param	string	$classname		Class name
  * @param	string	$atarget		Target
- * @param	array	$menuval		All the $menuval array
+ * @param	array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string} 	$menuval		All the $menuval array
  * @return	void
  */
 function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
@@ -719,9 +719,9 @@ function print_end_menu_array()
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
  *
  * @param	DoliDB		$db                 Database handler
- * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
- * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
- * @param	array		$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param 	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param   array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 16b936b6ac1..16809c89405 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -35,6 +35,9 @@ class MenuManager
 	public $atarget = ""; // To store default target to use onto links
 	public $name = "empty";
 
+	/**
+	 * @var Menu
+	 */
 	public $menu;
 	public $menu_array_after;
 
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 56e24e9a776..73eac71322f 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -297,6 +297,10 @@ class html_cerfafr extends ModeleDon
 		$prim = array();
 		$secon = array();
 		$trio = array();
+		'@phan-var string[] $prim
+		 @phan-var string[] $secon
+		 @phan-var string[] $trio
+        ';
 		for ($i = 1; $i <= 3; $i++) {
 			$prim[$i] = '';
 			$secon[$i] = '';

From ec0fd31386540eec1410f0d8acc098cc73f71c2a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:04:02 +0100
Subject: [PATCH 0827/1862] Fix phpstan workflow file (#28741)

* Fix phpstan workflow file

# Fix phpstan workflow file

Line was split in two, joined

* qual: set memory limit to 'unlimited' (-1)

* Remove some stubs to check impact

* Fix: Verify execution time limit

* Remove stub files to reuse cache

* Qual: Rename distribution phpstan.neon to phpstan.neon.dist

# Qual: Rename distribution phpstan.neon to phpstan.neon.dist

This allows the developer to override some settings locally

Also update the .gitignore file with phpstan.neon and some other other
ignores (cache, local log files, temporary edit files).

* Enable debug on phpstan

* Re-enable stubs

* Fix: Change parallel settings to defaults, remove buffer

'buffer' is not a documented parameter, removing it.
Removing some configuration settings as the defaults are higher and
should adapt better to the target machine
---
 .github/workflows/phpstan.yml     |  6 +++---
 .gitignore                        | 18 ++++++++++++++++--
 phpstan.neon => phpstan.neon.dist | 17 ++++++-----------
 3 files changed, 25 insertions(+), 16 deletions(-)
 rename phpstan.neon => phpstan.neon.dist (86%)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 967d16ab04e..cbe0f4b2732 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -9,8 +9,7 @@ concurrency:
     cancel-in-progress: true
 
 env:
-  CACHE_KEY_PART: ${{ github.event_name == 'pull_request' && format('{0}-{1}', 
-github.base_ref, github.head_ref) || github.ref_name }}
+  CACHE_KEY_PART: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.base_ref, github.head_ref) || github.ref_name }}
   GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -57,7 +56,8 @@ jobs:
       # Run PHPStan
       - name: Run PHPStan
         id: phpstan
-        run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -a build/phpstan/bootstrap_action.php -c phpstan.neon | tee _stan.xml | cs2pr --graceful-warnings
+        run: |
+          phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
         # continue-on-error: true
 
       # Save cache
diff --git a/.gitignore b/.gitignore
index efe6c66dfc0..2964b1ead0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,8 +66,21 @@ doc/install.lock
 /composer.json
 /composer.lock
 
-# to execute pre-commit
-local.sh
+# Local script, executed during pre-commit
+/local.sh
+
+# Local phpstan configuration
+/phpstan.neon
+/phpstan-baseline.neon
+
+# Logs
+/*.log
+
+# Vim swap files
+*.sw?
+
+# Generated by PHPUNIT.BAT
+/INI_PHPUNIT
 
 # ignore cache builds
 /build/phpstan/phpstan
@@ -75,3 +88,4 @@ local.sh
 phpstan_custom.neon
 /.php-cs-fixer.cache
 /.php_cs.cache
+/.cache
diff --git a/phpstan.neon b/phpstan.neon.dist
similarity index 86%
rename from phpstan.neon
rename to phpstan.neon.dist
index 8951e8ddaa2..78867274e30 100644
--- a/phpstan.neon
+++ b/phpstan.neon.dist
@@ -1,11 +1,13 @@
 parameters:
 	tmpDir: ./.github/tmp
 	parallel:
-		jobSize: 8
+		# Commented some of the settings, reminding the defaults:
+		#   should adapt better to target machines
+		# jobSize: 8  # default is 20
 		processTimeout: 600.0
-		maximumNumberOfProcesses: 20
-		minimumNumberOfJobsPerProcess: 2
-		buffer: 134217728 # 128 MB
+		# maximumNumberOfProcesses: 20  # default is 32
+		# minimumNumberOfJobsPerProcess: 2  # default is 2
+		# buffer: 134217728 # 128 MB  # Not documented
 	customRulesetUsed: true
 	level: 2
 	fileExtensions:
@@ -13,13 +15,6 @@ parameters:
 	paths:
 		- htdocs
 		- scripts
-	stubFiles:
-		# - dev/tools/phan/stubs/GeoIP2.php
-		# - dev/tools/phan/stubs/geoip_inc.php
-		- dev/tools/phan/stubs/module_numberwords.php
-		- dev/tools/phan/stubs/restler.php
-		- dev/tools/phan/stubs/stripe.php
-		- dev/tools/phan/stubs/swiss-qr-bill.php
 	excludePaths:
 		analyseAndScan:
 		- htdocs/custom/*

From 61d328093ce15c0e2282e8b467b3d1049789f30c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 14:28:55 +0100
Subject: [PATCH 0828/1862] Fix warnings

---
 .../modules/export/export_excel2007.modules.php     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 3f01e2fc938..23dd1e5b71b 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -258,7 +258,6 @@ class ExportExcel2007 extends ModeleExports
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
 		// phpcs:enable
-		global $conf;
 
 		// Create a format for the column headings
 		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
@@ -284,13 +283,17 @@ class ExportExcel2007 extends ModeleExports
 			}
 			$this->col++;
 		}
+
+		// Complete with some columns to add columns with the labels of columns of type Select, so we have more then the ID
 		foreach ($selectlabel as $key => $value) {
+			$code = preg_replace('/_label$/', '', $key);
 			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($value));
 			if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto'))) {		// Set autowidth for some types
 				$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
 			}
 			$this->col++;
 		}
+
 		$this->row++;
 		return 0;
 	}
@@ -308,7 +311,6 @@ class ExportExcel2007 extends ModeleExports
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
 		// phpcs:enable
-		global $conf;
 
 		// Define first row
 		$this->col = 1;
@@ -371,7 +373,12 @@ class ExportExcel2007 extends ModeleExports
 			}
 			$this->col++;
 		}
+
+		// Complete with some columns to add columns with the labels of columns of type Select, so we have more then the ID
 		foreach ($selectlabelvalues as $key => $newvalue) {
+			$code = preg_replace('/_label$/', '', $key);
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
+
 			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue)) {
 				$newvalue = dol_stringtotime($newvalue);
 				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
@@ -394,6 +401,7 @@ class ExportExcel2007 extends ModeleExports
 			}
 			$this->col++;
 		}
+
 		$this->row++;
 		return 0;
 	}
@@ -422,7 +430,6 @@ class ExportExcel2007 extends ModeleExports
 	public function close_file()
 	{
 		// phpcs:enable
-		global $conf;
 
 		$objWriter = new Xlsx($this->workbook);
 		$objWriter->save($this->file);

From c192b8fccdf6f19670074ed39f19372976e64c85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 14:33:02 +0100
Subject: [PATCH 0829/1862] Import menu before export

---
 htdocs/core/menus/standard/eldy.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 843beba18af..b5de6584a85 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -2440,18 +2440,18 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
 			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $titlelist, 1, $user->hasRight('mailing', 'lire'));
 		}
 
+		if (isModEnabled('import')) {
+			$langs->load("exports");
+			$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import', 'run'), '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
+		}
+
 		if (isModEnabled('export')) {
 			$langs->load("exports");
 			$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->hasRight('export', 'lire'), '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'creer'));
 			//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->hasRight('export',  'lire'));
 		}
-
-		if (isModEnabled('import')) {
-			$langs->load("exports");
-			$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import', 'run'), '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
-		}
 	}
 }
 

From be403024ed4987bce20680ada0fc18f23481473d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 14:40:36 +0100
Subject: [PATCH 0830/1862] Try a fix for #28734

---
 htdocs/core/class/extrafields.class.php               | 2 +-
 htdocs/core/tpl/extrafields_list_print_fields.tpl.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index deb021bb0bc..f849094195b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -44,7 +44,7 @@ class ExtraFields
 	public $db;
 
 	/**
-	 * @var array<string,array{label:array<string,string>,type:array<string,string>,size:array<string,string>,default:array<string,string>,computed:array<string,string>,unique:array<string,int>,required:array<string,int>,param:array<string,mixed>,perms:array<string,mixed[]>,list:array<string,mixed[]>,totalizable:array<string,int>,help:array<string,string>,printable:array<string,int>,enabled:array<string,int>,langfile:array<string,string>,css:array<string,string>,csslist:array<string,string>,hidden:array<string,int>,mandatoryfieldsofotherentities:array<string,string>,isameasure?:array<string,string>}> New array to store extrafields definition
+	 * @var array<string,array{label:array<string,string>,type:array<string,string>,size:array<string,string>,default:array<string,string>,computed:array<string,string>,unique:array<string,int>,required:array<string,int>,param:array<string,mixed>,perms:array<string,mixed[]>,list:array<string,mixed[]>,totalizable:array<string,int>,help:array<string,string>,printable:array<string,int>,enabled:array<string,int>,langfile:array<string,string>,css:array<string,string>,csslist:array<string,string>,hidden:array<string,int>,mandatoryfieldsofotherentities:array<string,string>}> New array to store extrafields definition
 	 */
 	public $attributes;
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index b44df727362..c061a0764a9 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -71,7 +71,8 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 						$totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
 					}
 				}
-				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+				// key 'totalizable' if in extrafields same as 'isameasure' into ->$fields
+				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key] == 1) {
 					if (!$i) {
 						$totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
 					}

From 4d8e5bb2a7f6fa16a029a2d96b59844a6e685e99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 14:50:35 +0100
Subject: [PATCH 0831/1862] Fix phpunit

---
 htdocs/accountancy/bookkeeping/export.php |  2 +-
 htdocs/accountancy/bookkeeping/list.php   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 97163ce1c16..bb257f2403a 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -528,7 +528,7 @@ $sqlwhere = array();
 if (count($filter) > 0) {
 	foreach ($filter as $key => $value) {
 		if ($key == 't.doc_date') {
-			$sqlwhere[] = $db->sanitize($key).' = \''.$db->idate($value).'\'';
+			$sqlwhere[] = $db->sanitize($key)." = '".$db->idate($value)."'";
 		} elseif ($key == 't.doc_date>=') {
 			$sqlwhere[] = "t.doc_date >= '".$db->idate($value)."'";
 		} elseif ($key == 't.doc_date<=') {
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 07f864cd5ef..6e84cc8e01d 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -620,7 +620,7 @@ $sqlwhere = array();
 if (count($filter) > 0) {
 	foreach ($filter as $key => $value) {
 		if ($key == 't.doc_date') {
-			$sqlwhere[] = $db->sanitize($key).' = \''.$db->idate($value).'\'';
+			$sqlwhere[] = $db->sanitize($key)." = '".$db->idate($value)."'";
 		} elseif ($key == 't.doc_date>=') {
 			$sqlwhere[] = "t.doc_date >= '".$db->idate($value)."'";
 		} elseif ($key == 't.doc_date<=') {
@@ -648,17 +648,17 @@ if (count($filter) > 0) {
 		} elseif ($key == 't.tms<=') {
 			$sqlwhere[] = "t.tms <= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_creation>=') {
-			$sqlwhere[] = 't.date_creation >= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_creation >= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_creation<=') {
-			$sqlwhere[] = 't.date_creation <= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_creation <= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_export>=') {
-			$sqlwhere[] = 't.date_export >= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_export >= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_export<=') {
-			$sqlwhere[] = 't.date_export <= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_export <= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_validated>=') {
-			$sqlwhere[] = 't;date_validate >= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t;date_validate >= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_validated<=') {
-			$sqlwhere[] = 't;date_validate <= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t;date_validate <= '".$db->idate($value)."'";
 		} elseif ($key == 't.credit' || $key == 't.debit') {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {

From 66c40264d1ed0db7e152ce984b48d0aaccfbbd2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 14:56:36 +0100
Subject: [PATCH 0832/1862] sql syntax

---
 htdocs/accountancy/bookkeeping/export.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index bb257f2403a..610b6d4384a 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -556,17 +556,17 @@ if (count($filter) > 0) {
 		} elseif ($key == 't.tms<=') {
 			$sqlwhere[] = "t.tms <= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_creation>=') {
-			$sqlwhere[] = 't.date_creation >= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_creation >= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_creation<=') {
-			$sqlwhere[] = 't.date_creation <= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_creation <= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_export>=') {
-			$sqlwhere[] = 't.date_export >= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_export >= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_export<=') {
-			$sqlwhere[] = 't.date_export <= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t.date_export <= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_validated>=') {
-			$sqlwhere[] = 't;date_validate >= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t;date_validate >= '".$db->idate($value)."'";
 		} elseif ($key == 't.date_validated<=') {
-			$sqlwhere[] = 't;date_validate <= \''.$db->idate($value).'\'';
+			$sqlwhere[] = "t;date_validate <= '".$db->idate($value)."'";
 		} elseif ($key == 't.credit' || $key == 't.debit') {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {

From e0cf910f49b91a50b8b3b257f0d01a87fbf0b056 Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Mon, 11 Mar 2024 15:01:39 +0100
Subject: [PATCH 0833/1862] Fix unable to delete file medias

---
 htdocs/ecm/index_medias.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 1fa0e03a1a7..3527523b49c 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -37,6 +37,7 @@ $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal'
 
 // Get parameters
 $action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $socid = GETPOST('socid', 'int');

From 39ea68ace4e8dc17387a87428235f83055feefbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 15:20:56 +0100
Subject: [PATCH 0834/1862] Try fix phan

---
 htdocs/admin/modulehelp.php                   | 2 +-
 htdocs/admin/modules.php                      | 2 +-
 htdocs/core/modules/DolibarrModules.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 68db7450055..50e83f65fcb 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -167,7 +167,7 @@ foreach ($modulesdir as $dir) {
 										$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
 										$familykey = key($objMod->familyinfo);
 									} else {
-										$familykey = $objMod->family;
+										$familykey = empty($objMod->family) ? 'other' : $objMod->family;
 									}
 
 									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5ce0f2042d7..ece8c531fc9 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -460,7 +460,7 @@ foreach ($modulesdir as $dir) {
 									$arrayofwarningsext[$modName] = $objMod->warnings_activation_ext;
 								}
 
-								$familyposition = (empty($familyinfo[$familykey]['position']) ? 0 : $familyinfo[$familykey]['position']);
+								$familyposition = (empty($familyinfo[$familykey]['position']) ? '0' : $familyinfo[$familykey]['position']);
 								$listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
 								if ($external && !in_array($familykey, $listOfOfficialModuleGroups)) {
 									// If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 3a73f89ffd9..2994a5c58b0 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -60,7 +60,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $editor_url;
 
 	/**
-	 * @var string Family
+	 * @var string 	Family
 	 * @see $familyinfo
 	 *
 	 * Native values: 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'.

From 5e2a06a177c6eb11eaf5d03bf6f63e2cb3951963 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 11 Mar 2024 15:23:26 +0100
Subject: [PATCH 0835/1862] Add layout and prompt ai on create emmailing

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index f44f53071bd..e6f33c8e8cd 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -845,6 +845,63 @@ if ($action == 'create') {
 	print $htmlother->selectColor(GETPOST('bgcolor'), 'bgcolor', '', 0);
 	print '</td></tr>';
 
+	$formmail = new FormMail($db);
+	$formmail->withfckeditor = 1;
+	$formmail->withaiprompt = 1;
+	$formmail->withlayout = 1;
+
+	print '<tr class="fieldsforemail"><td></td><td>';
+	$out = '';
+	// Add link to add layout
+	if ($formmail->withlayout && $formmail->withfckeditor) {
+		$out .= '<a href="#" id="linkforlayouttemplates" class="reposition notasortlink inline-block alink marginrightonly">';
+		$out .= img_picto($langs->trans("FillMessageWithALayout"), 'layout', 'class="paddingrightonly"');
+		$out .= $langs->trans("FillMessageWithALayout").'...';
+		$out .= '</a> &nbsp; &nbsp; ';
+
+		$out .= '<script>
+			$(document).ready(function() {
+				  $("#linkforlayouttemplates").click(function() {
+					console.log("We click on linkforlayouttemplates");
+					event.preventDefault();
+					jQuery("#template-selector").toggle();
+					//jQuery("#template-selector").attr("style", "aaa");
+					jQuery("#ai_input").hide();
+				});
+			});
+		</script>
+		';
+	}
+
+	// Add link to add AI content
+	if ($formmail->withaiprompt && isModEnabled('ai')) {
+		$out .= '<a href="#" id="linkforaiprompt" class="reposition notasortlink inline-block alink marginrightonly">';
+		$out .= img_picto($langs->trans("FillMessageWithAIContent"), 'ai', 'class="paddingrightonly"');
+		$out .= $langs->trans("FillMessageWithAIContent").'...';
+		$out .= '</a>';
+		$out .= '<script>
+					$(document).ready(function() {
+						$("#linkforaiprompt").click(function() {
+							console.log("We click on linkforaiprompt");
+							event.preventDefault();
+							jQuery("#ai_input").toggle();
+							jQuery("#template-selector").hide();
+							if (!jQuery("ai_input").is(":hidden")) {
+								console.log("Set focus on input field");
+								jQuery("#ai_instructions").focus();
+							}
+						});
+					});
+				</script>';
+	}
+	if ($formmail->withfckeditor) {
+		$out .= $formmail->getModelEmailTemplate();
+	}
+	if ($formmail->withaiprompt && isModEnabled('ai')) {
+		$out .= $formmail->getSectionForAIPrompt();
+	}
+	print $out;
+	print '</td></tr>';
 	print '</table>';
 
 	print '<div style="padding-top: 10px">';

From bb64871b355c43f0940560311ab9bbf866493bd0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:23:43 +0100
Subject: [PATCH 0836/1862] Qual: Precise typing for Societeaccount's fields
 property (#28758)

# Qual: Precise typing for Societeaccount's fields property

Better typing helps static analysis and fixes the message:
PhanTypeMismatchArgumentInternal Argument 2 ($array) is $object->fields['site']['arrayofkeyval'] of type null but \array_key_exists() takes array
---
 htdocs/societe/class/societeaccount.class.php | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index c4a3f1fa824..cff6d5e7af5 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -75,30 +76,31 @@ class SocieteAccount extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
+
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
-		'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
-		'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30),
-		'pass_crypted' => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
-		'pass_temp'    => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth300 widthcentpercentminusxx'),
-		'site' => array('type'=>'varchar(128)', 'label'=>'WebsiteTypeLabel', 'visible'=>0, 'enabled'=>0, 'position'=>41, 'notnull'=>1, 'default' => '', 'help'=>'Name of the website or service if this is account on an external website or service'),
-		'fk_website' => array('type'=>'integer:Website:website/class/website.class.php', 'label'=>'WebSite', 'visible'=>0, 'enabled'=>0, 'position'=>42, 'notnull'=>-1, 'index'=>1, 'picto'=>'website', 'css'=>'maxwidth300 widthcentpercentminusxx'),
-		'site_account' => array('type'=>'varchar(128)', 'label'=>'ExternalSiteAccount', 'visible'=>0, 'enabled'=>1, 'position'=>44, 'help'=>'A key to identify the account on external web site if this is an account on an external website'),
-		'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>0, 'enabled'=>1, 'position'=>48, 'notnull'=>0, 'index'=>1, 'searchall'=>1, 'comment'=>'The id of third party in the external web site (for site_account if site_account defined)',),
-		'date_last_login' => array('type'=>'datetime', 'label'=>'LastConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>50, 'notnull'=>0,),
-		'date_previous_login' => array('type'=>'datetime', 'label'=>'PreviousConnexion', 'visible'=>2, 'enabled'=>1, 'position'=>51, 'notnull'=>0,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 5, 'default' => 1),
+		'login' => array('type' => 'varchar(64)', 'label' => 'Login', 'visible' => 1, 'enabled' => 1, 'notnull' => 1, 'position' => 10, 'showoncombobox' => 1),
+		'pass_encoding' => array('type' => 'varchar(24)', 'label' => 'PassEncoding', 'visible' => 0, 'enabled' => 1, 'position' => 30),
+		'pass_crypted' => array('type' => 'password', 'label' => 'Password', 'visible' => -1, 'enabled' => 1, 'position' => 31, 'notnull' => 1),
+		'pass_temp'    => array('type' => 'varchar(128)', 'label' => 'Temp', 'visible' => 0, 'enabled' => 0, 'position' => 32, 'notnull' => -1,),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'visible' => 1, 'enabled' => 1, 'position' => 40, 'notnull' => -1, 'index' => 1, 'picto' => 'company', 'css' => 'maxwidth300 widthcentpercentminusxx'),
+		'site' => array('type' => 'varchar(128)', 'label' => 'WebsiteTypeLabel', 'visible' => 0, 'enabled' => 0, 'position' => 41, 'notnull' => 1, 'default' => '', 'help' => 'Name of the website or service if this is account on an external website or service'),
+		'fk_website' => array('type' => 'integer:Website:website/class/website.class.php', 'label' => 'WebSite', 'visible' => 0, 'enabled' => 0, 'position' => 42, 'notnull' => -1, 'index' => 1, 'picto' => 'website', 'css' => 'maxwidth300 widthcentpercentminusxx'),
+		'site_account' => array('type' => 'varchar(128)', 'label' => 'ExternalSiteAccount', 'visible' => 0, 'enabled' => 1, 'position' => 44, 'help' => 'A key to identify the account on external web site if this is an account on an external website'),
+		'key_account' => array('type' => 'varchar(128)', 'label' => 'KeyAccount', 'visible' => 0, 'enabled' => 1, 'position' => 48, 'notnull' => 0, 'index' => 1, 'searchall' => 1, 'comment' => 'The id of third party in the external web site (for site_account if site_account defined)',),
+		'date_last_login' => array('type' => 'datetime', 'label' => 'LastConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 50, 'notnull' => 0,),
+		'date_previous_login' => array('type' => 'datetime', 'label' => 'PreviousConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 51, 'notnull' => 0,),
 		//'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>46, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active', '0'=>'Disabled')),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'visible' => -1, 'enabled' => 1, 'position' => 46, 'notnull' => -1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserAuthor', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => -1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'visible' => -2, 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'index' => 1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'index' => 1, 'default' => 1, 'arrayofkeyval' => array('1' => 'Active', '0' => 'Disabled')),
 	);
 
 	/**

From a8a2f0ff7308ca478251999da63950d4f1c02374 Mon Sep 17 00:00:00 2001
From: terhoy <70033666+terhoy@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:33:10 +0100
Subject: [PATCH 0837/1862] =?UTF-8?q?FIX:=20online=20signature=20partly=20?=
 =?UTF-8?q?fails=20if=20commercial=20proposal=20numbering=20contains=20a?=
 =?UTF-8?q?=20mask=20that=E2=80=99s=20includes=20a=20space=20(#28608)=20?=
 =?UTF-8?q?=20(#28742)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* FIX: online signature (#28608) Update signature.lib.php

If Commercial proposal numbering contains a mask that’s includes a space, that will affect the result of the online signature form. When generating the online signature form, the code in signature.lib.php line 77, will remove any existing space in the Commercial proposal numbering. The result is that the online signature form will miss data in field “Third-party” and “Amount”.

* FIX: online signature (#28608) Update payments.lib.php

If Commercial proposal numbering contains a mask that’s includes a space, that will affect the result of the online signature form. When generating the online signature form, the code in core/lib/payments.lib.ph, will remove any existing space in the Commercial proposal numbering.
---
 htdocs/core/lib/payments.lib.php  | 1 -
 htdocs/core/lib/signature.lib.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 2c496401768..e8532129b53 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -242,7 +242,6 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 {
 	global $conf, $dolibarr_main_url_root;
 
-	$ref = str_replace(' ', '', $ref);
 	$out = '';
 
 	// Define $urlwithroot
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 0290ec78080..d56cd662e9d 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -74,7 +74,6 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1, $o
 		}
 	}
 
-	$ref = str_replace(' ', '', $ref);
 	$out = '';
 
 	// Define $urlwithroot

From f7024b61ee6797e02f2c969dda280d53668c707b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 15:37:16 +0100
Subject: [PATCH 0838/1862] Update api_bankaccounts.class.php

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

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index c2f57b76056..bc973b0045b 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -258,7 +258,7 @@ class BankAccounts extends DolibarrApi
 
 		// Clean data
 		$description = sanitizeVal($description, 'alphanohtml');
-		$cheque_number = sanitizeVal($cheque_number);
+		$cheque_number = sanitizeVal($cheque_number, 'alphanohtml');
 
 		/**
 		 * Creating bank line records

From 769b682fd3690214216be2a11dd6e189209cb00e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 16:13:11 +0100
Subject: [PATCH 0839/1862] 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 bbdb8183fe2..a693c31ff2d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3281,7 +3281,7 @@ abstract class CommonObject
 				while ($row = $this->db->fetch_row($resql)) {
 					$rows[] = $row[0];
 					if ($includealltree) {
-						$rows = array_merge($rows, $this->getChildrenOfLine($row[0]));
+						$rows = array_merge($rows, $this->getChildrenOfLine($row[0], $includealltree));
 					}
 				}
 			}

From 5b921d0dc4326c38e8b8cdd36cf3bca420b88603 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 16:26:17 +0100
Subject: [PATCH 0840/1862] Update DoliDB.class.php

---
 htdocs/core/db/DoliDB.class.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 4c0bfcbd0f3..1a21fb5c527 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -396,18 +396,16 @@ abstract class DoliDB implements Database
 	}
 
 	/**
-	 * Return all results from query as an array of objects
-	 * Note : This method executes a given SQL query and retrieves all row of results as an array of objects. It should only be used with SELECT queries
-	 * be careful with this method use it only with some limit of results to avoid performances loss.
+	 * Return all results from query as an array of objects. Using this is a bad practice and is discouraged.
+	 * Note : It should only be used with SELECT queries and with a limit. If you are not able to defined/know what can be the limit, it 
+     * just means this function is not what you need. Do not use it.
 	 *
-	 * @param string $sql The sql query string
-	 * @param bool   $noLimitCheck set it to true to disable sql query check of limit
-	 * @return    bool|array                Result
+	 * @param 	string 			$sql 	The sql query string. Must end with "... LIMIT x"
+	 * @return  bool|array              Result
 	 */
-	public function getRows($sql, $noLimitCheck = false)
+	public function getRows($sql)
 	{
-
-		if (!$noLimitCheck && strpos($sql, 'LIMIT') === false) {
+		if (! preg_match('/LIMIT \d+$/', $sql)) {
 			return false;
 		}
 

From 553587b6606f6f956883fba7be163315526f23c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 16:27:46 +0100
Subject: [PATCH 0841/1862] Update DoliDB.class.php

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

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 1a21fb5c527..90cb227db73 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -381,11 +381,11 @@ abstract class DoliDB implements Database
 	{
 		$sql .= ' LIMIT 1';
 
-		$res = $this->query($sql);
-		if ($res) {
-			$obj = $this->fetch_object($res);
+		$resql = $this->query($sql);
+		if ($resql) {
+			$obj = $this->fetch_object($resql);
 			if ($obj) {
-				$this->free($res);
+				$this->free($resql);
 				return $obj;
 			} else {
 				return 0;
@@ -409,15 +409,15 @@ abstract class DoliDB implements Database
 			return false;
 		}
 
-		$res = $this->query($sql);
-		if ($res) {
+		$resql = $this->query($sql);
+		if ($resql) {
 			$results = array();
-			if ($this->num_rows($res) > 0) {
-				while ($obj = $this->fetch_object($res)) {
+			if ($this->num_rows($resql) > 0) {
+				while ($obj = $this->fetch_object($resql)) {
 					$results[] = $obj;
 				}
 			}
-			$this->free($res);
+			$this->free($resql);
 			return $results;
 		}
 

From b963a9ab368a02cff7c68b3304dfb4bba8d40ecd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 16:30:33 +0100
Subject: [PATCH 0842/1862] Fix phpunit

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

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 90cb227db73..b839770410f 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -397,8 +397,8 @@ abstract class DoliDB implements Database
 
 	/**
 	 * Return all results from query as an array of objects. Using this is a bad practice and is discouraged.
-	 * Note : It should only be used with SELECT queries and with a limit. If you are not able to defined/know what can be the limit, it 
-     * just means this function is not what you need. Do not use it.
+	 * Note : It should only be used with SELECT queries and with a limit. If you are not able to defined/know what can be the limit, it
+	 * just means this function is not what you need. Do not use it.
 	 *
 	 * @param 	string 			$sql 	The sql query string. Must end with "... LIMIT x"
 	 * @return  bool|array              Result

From 404d594f24aa51b9e49a6d7c3113b471f530895f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 16:39:44 +0100
Subject: [PATCH 0843/1862] Removed not used file

---
 htdocs/langs/fr_FR/ai.lang | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 htdocs/langs/fr_FR/ai.lang

diff --git a/htdocs/langs/fr_FR/ai.lang b/htdocs/langs/fr_FR/ai.lang
deleted file mode 100644
index f6eb575e977..00000000000
--- a/htdocs/langs/fr_FR/ai.lang
+++ /dev/null
@@ -1 +0,0 @@
-AI_KEY_API_CHATGPT= Clé pour l'api IA 
\ No newline at end of file

From b7acea0ec4c160cfb11bc44e3e2295bd02155717 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 16:47:38 +0100
Subject: [PATCH 0844/1862] Fix: PhanTypeMismatchDeclaredParamNullable notices

# Fix: PhanTypeMismatchDeclaredParamNullable notices

PHPDoc must indicate param is nullable if the default is null
with explicit typing.
(+Improved some other typing from generic Object to CommonObject).
---
 htdocs/core/lib/bank.lib.php                        | 13 +++++++------
 .../modules/fichinter/doc/pdf_soleil.modules.php    |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 75788627cec..ffde1206773 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016		Juanjo Menent   	<jmenent@2byte.es>
  * Copyright (C) 2019	   Nicolas ZABOURI     <info@inovea-conseil.com>
  * Copyright (C) 2021		Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -228,8 +229,8 @@ function account_statement_prepare_head($object, $num)
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @param   CommonObject	$object		Object related to tabs
+ * @return  array						Array of tabs to shoc
  */
 function various_payment_prepare_head($object)
 {
@@ -275,8 +276,8 @@ function various_payment_prepare_head($object)
 /**
  *      Check SWIFT information for a bank account
  *
- *      @param  Account     $account    A bank account (used to get BIC/SWIFT)
- *      @param	string		$swift		Swift value (used to get BIC/SWIFT, param $account non used if provided)
+ *      @param  ?Account	$account    A bank account (used to get BIC/SWIFT)
+ *      @param	?string		$swift		Swift value (used to get BIC/SWIFT, param $account non used if provided)
  *      @return boolean                 True if information are valid, false otherwise
  */
 function checkSwiftForAccount(Account $account = null, $swift = null)
@@ -296,8 +297,8 @@ function checkSwiftForAccount(Account $account = null, $swift = null)
 /**
  *      Check IBAN number information for a bank account.
  *
- *      @param  Account     $account    	A bank account
- *      @param	string		$ibantocheck	Bank account number (used to get BAN, $account not used if provided)
+ *      @param  ?Account	$account    	A bank account
+ *      @param	?string		$ibantocheck	Bank account number (used to get BAN, $account not used if provided)
  *      @return boolean                 	True if information are valid, false otherwise
  */
 function checkIbanForAccount(Account $account = null, $ibantocheck = null)
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 8c2b45055fc..82871ffae52 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2011		Fabrice CHERRIER
  * Copyright (C) 2013		Cédric Salvador				<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -449,7 +450,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @param		Fichinter	$object			FichInter Object
+	 *   @param		?Fichinter	$object			FichInter Object
 	 *   @return	void
 	 */
 	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, FichInter $object = null)

From 200bc042bd239912de7825a682c6717165704ad5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 16:48:55 +0100
Subject: [PATCH 0845/1862] Qual: Enable PhanTypeMismatchDeclaredParamNullable

# Qual: Enable PhanTypeMismatchDeclaredParamNullable

The few cases for PhanTypeMismatchDeclaredParamNullable were fixed,
so the notification can be enabled
---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 0bb240128f8..609f2cc267c 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -475,7 +475,7 @@ return [
 		// 'PhanPluginUnknownFunctionReturnType',
 		// 'PhanPluginDescriptionlessCommentOnProtectedProperty',
 		'PhanPluginRedundantAssignmentInGlobalScope',
-		'PhanTypeMismatchDeclaredParamNullable',
+		// 'PhanTypeMismatchDeclaredParamNullable',
 		'PhanTypeInvalidRightOperandOfAdd',
 		// 'PhanPluginDescriptionlessCommentOnPrivateProperty',
 		// 'PhanUndeclaredVariableDim',  // Array initialisation on undeclared var: $abc['x']='ab'

From 9aaae61c9ad4cd600c7b4f5983b8c637f2303cea Mon Sep 17 00:00:00 2001
From: John BOTELLA <john.botella@atm-consulting.fr>
Date: Mon, 11 Mar 2024 16:49:46 +0100
Subject: [PATCH 0846/1862] Fix var

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7ffc4d04934..7ebb7a6eba5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12287,12 +12287,12 @@ function getElementProperties($elementType)
 		$classname = 'EmailSenderProfile';
 		$table_element = 'c_email_senderprofile';
 		$subelement = '';
-	} elseif ($objectType == 'conferenceorboothattendee') {
+	} elseif ($elementType == 'conferenceorboothattendee') {
 		$classpath = 'eventorganization/class';
 		$classfile = 'conferenceorboothattendee';
 		$classname = 'ConferenceOrBoothAttendee';
 		$module = 'eventorganization';
-	} elseif ($objectType == 'conferenceorbooth') {
+	} elseif ($elementType == 'conferenceorbooth') {
 		$classpath = 'eventorganization/class';
 		$classfile = 'conferenceorbooth';
 		$classname = 'ConferenceOrBooth';

From 087390b44e4e8e8563797c3baa81f68f094a67dc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:15:54 +0100
Subject: [PATCH 0847/1862] Change logic to help static tool analysis

---
 htdocs/admin/modulehelp.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 50e83f65fcb..22165d2c305 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2022	Charlene Benke			<charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -167,7 +168,10 @@ foreach ($modulesdir as $dir) {
 										$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
 										$familykey = key($objMod->familyinfo);
 									} else {
-										$familykey = empty($objMod->family) ? 'other' : $objMod->family;
+										$familykey = $objMod->family;
+										if (empty($familykey)) {
+											$familykey = 'other';
+										}
 									}
 
 									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');

From 831aee8fa2f10da172915cf129d9fb8d5b3a0d07 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 11 Mar 2024 17:31:01 +0100
Subject: [PATCH 0848/1862] add link for redirect in setup module

---
 htdocs/ai/ajax/generate_content.php | 8 +++++++-
 htdocs/ai/class/ai.class.php        | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index 9b1adf13b84..c476a0b09f4 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -67,7 +67,13 @@ $function = 'textgeneration';
 $generatedContent = $ai->generateContent($instructions, 'auto', $function);
 
 if (is_array($generatedContent) && $generatedContent['error']) {
-	print "Error : " . $generatedContent['message'];
+	// client errors
+	if ($generatedContent['code'] >= 400) {
+		print "Error : " . $generatedContent['message'];
+		print '<br><a href="'.DOL_MAIN_URL_ROOT.'/ai/admin/setup.php">'.$langs->trans('Check Config of Module').'</a>';
+	} else {
+		print "Error : " . $generatedContent['message'];
+	}
 } else {
 	print $generatedContent;
 }
diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 399b3adb1ee..d3baf33421c 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -131,7 +131,7 @@ class Ai
 
 			$response = curl_exec($ch);
 			if (curl_errno($ch)) {
-				throw new Exception('cURL error: ' . curl_error($ch));
+				throw new Exception('Wrong configuration !' . curl_error($ch));
 			}
 
 			$statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -146,7 +146,7 @@ class Ai
 
 			return $generatedEmailContent;
 		} catch (Exception $e) {
-			return array('error' => true, 'message' => $e->getMessage());
+			return array('error' => true, 'message' => $e->getMessage(), 'code' => $statusCode);
 		} finally {
 			curl_close($ch);
 		}

From 1350f4d29e2a75648d15c662f1e94ab09ac75679 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:36 +0100
Subject: [PATCH 0849/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/adherents/class/adherent.class.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 531c089e1f1..0c593549865 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2020		Josep Lluís Amador 		<joseplluis@lliuretic.cat>
  * Copyright (C) 2021		Waël Almoman            <info@almoman.com>
  * Copyright (C) 2021		Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -315,7 +316,7 @@ class Adherent extends CommonObject
 
 
 	/**
-	 * @var array fields
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
@@ -323,14 +324,14 @@ class Adherent extends CommonObject
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
-		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox'=>1),
-		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'showoncombobox'=>1),
+		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox' => 1),
+		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'showoncombobox' => 1),
 		'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => 1, 'position' => 40),
 		'pass' => array('type' => 'varchar(50)', 'label' => 'Pass', 'enabled' => 1, 'visible' => -1, 'position' => 45),
 		'pass_crypted' => array('type' => 'varchar(128)', 'label' => 'Pass crypted', 'enabled' => 1, 'visible' => -1, 'position' => 50),
 		'morphy' => array('type' => 'varchar(3)', 'label' => 'MemberNature', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 55),
 		'fk_adherent_type' => array('type' => 'integer', 'label' => 'Fk adherent type', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 60),
-		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => 1, 'position' => 65, 'showoncombobox'=>2),
+		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => 1, 'position' => 65, 'showoncombobox' => 2),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => 1, 'position' => 70),
 		'address' => array('type' => 'text', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 75),
 		'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 80),
@@ -341,14 +342,14 @@ class Adherent extends CommonObject
 		'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120),
 		'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125),
 		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => 1, 'position' => 126),
-		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>127),
+		'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => 1, 'visible' => -1, 'position' => 127),
 		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 128),
 		'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
 		'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => -1, 'position' => 132),
 		'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135),
 		'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145),
 		'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => 1, 'position' => 150),
-		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>-1, 'position'=> 153),
+		'default_lang' => array('type' => 'varchar(6)', 'label' => 'Default lang', 'enabled' => 1, 'visible' => -1, 'position' => 153),
 		'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
 		'note_private' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
 		'datevalid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 165),
@@ -2421,7 +2422,7 @@ class Adherent extends CommonObject
 		}
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -3276,7 +3277,7 @@ class Adherent extends CommonObject
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
 		if (property_exists($this, 'photo') || !empty($this->photo)) {
-			$return.= Form::showphoto('memberphoto', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1);
+			$return .= Form::showphoto('memberphoto', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1);
 		} else {
 			$return .= img_picto('', 'user');
 		}

From f6920538b62bd263aca4786411d09750978f5be1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:38 +0100
Subject: [PATCH 0850/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/adherents/class/subscription.class.php | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 111cb2c04ea..92a1edf1fe7 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -103,21 +104,21 @@ class Subscription extends CommonObject
 	public $fk_bank;
 
 	/**
-	 * @var array  Array with all fields into database and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-		'fk_adherent' =>array('type'=>'integer', 'label'=>'Member', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-		'dateadh' =>array('type'=>'datetime', 'label'=>'DateSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'datef' =>array('type'=>'datetime', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'subscription' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'isameasure'=>1),
-		'fk_bank' =>array('type'=>'integer', 'label'=>'BankId', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'note' =>array('type'=>'html', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'fk_type' =>array('type'=>'integer', 'label'=>'MemberType', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 20),
+		'fk_adherent' => array('type' => 'integer', 'label' => 'Member', 'enabled' => 1, 'visible' => -1, 'position' => 25),
+		'dateadh' => array('type' => 'datetime', 'label' => 'DateSubscription', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'datef' => array('type' => 'datetime', 'label' => 'DateEndSubscription', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'subscription' => array('type' => 'double(24,8)', 'label' => 'Amount', 'enabled' => 1, 'visible' => -1, 'position' => 40, 'isameasure' => 1),
+		'fk_bank' => array('type' => 'integer', 'label' => 'BankId', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'note' => array('type' => 'html', 'label' => 'Note', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'fk_type' => array('type' => 'integer', 'label' => 'MemberType', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'position' => 60),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 65),
 	);
 
 
@@ -295,7 +296,7 @@ class Subscription extends CommonObject
 			$result = $member->update_end_date($user);
 
 			if (!$error && !$notrigger) {
-				$this->context = array('member'=>$member);
+				$this->context = array('member' => $member);
 				// Call triggers
 				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
 				if ($result < 0) {

From 67d01e2a9b470b703cb9a66fc9774a18337c718d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:40 +0100
Subject: [PATCH 0851/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/asset/class/asset.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 9c034a3340b..e757f3efdd4 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2018  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -93,7 +94,7 @@ class Asset extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 47405621413e259af2a0d4e98c1ff0eb003514db Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:42 +0100
Subject: [PATCH 0852/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../class/assetdepreciationoptions.class.php  | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index e6aa273060c..a07ae6b5043 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -64,7 +65,7 @@ class AssetDepreciationOptions extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
@@ -77,15 +78,15 @@ class AssetDepreciationOptions extends CommonObject
 			'label' => 'AssetDepreciationOptionEconomic',
 			'table'	=> 'asset_depreciation_options_economic',
 			'fields' => array(
-				'depreciation_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDepreciationType', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDepreciationTypeLinear', '1'=>'AssetDepreciationOptionDepreciationTypeDegressive', '2'=>'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate'=>'1',),
-				'degressive_coefficient' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionDegressiveRate', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1','enabled_field' => 'economic:depreciation_type:1'),
-				'duration' => array('type'=>'integer', 'label'=>'AssetDepreciationOptionDuration', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
-				'duration_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDurationType', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDurationTypeAnnual', '1'=>'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate'=>'1',),
-				'rate' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionRate', 'enabled'=>'1', 'position'=>50, 'visible'=>3, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1', 'computed' => '$object->asset_depreciation_options->getRate("economic")',),
-				'accelerated_depreciation_option' => array('type'=>'boolean', 'label'=>'AssetDepreciationOptionAcceleratedDepreciation', 'enabled'=>'1', 'position'=>60, 'column_break' => true, 'notnull'=>0, 'default'=>'0', 'visible'=>1, 'validate'=>'1',),
-				'amount_base_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>90, 'notnull'=>0, 'required'=>1, 'visible'=>1, 'default'=>'$object->reversal_amount_ht > 0 ? $object->reversal_amount_ht : $object->acquisition_value_ht', 'isameasure'=>'1', 'validate'=>'1',),
-				'amount_base_deductible_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDeductibleHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>100, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
-				'total_amount_last_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionTotalAmountLastDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>110, 'noteditable'=> 1, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+				'depreciation_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDepreciationType', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDepreciationTypeLinear', '1' => 'AssetDepreciationOptionDepreciationTypeDegressive', '2' => 'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate' => '1',),
+				'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1','enabled_field' => 'economic:depreciation_type:1'),
+				'duration' => array('type' => 'integer', 'label' => 'AssetDepreciationOptionDuration', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
+				'duration_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDurationType', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDurationTypeAnnual', '1' => 'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate' => '1',),
+				'rate' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionRate', 'enabled' => '1', 'position' => 50, 'visible' => 3, 'default' => '0', 'isameasure' => '1', 'validate' => '1', 'computed' => '$object->asset_depreciation_options->getRate("economic")',),
+				'accelerated_depreciation_option' => array('type' => 'boolean', 'label' => 'AssetDepreciationOptionAcceleratedDepreciation', 'enabled' => '1', 'position' => 60, 'column_break' => true, 'notnull' => 0, 'default' => '0', 'visible' => 1, 'validate' => '1',),
+				'amount_base_depreciation_ht' => array('type' => 'price', 'label' => 'AssetDepreciationOptionAmountBaseDepreciationHT', 'enabled' => 'isset($object)&&get_class($object)=="Asset"', 'only_on_asset' => 1, 'position' => 90, 'notnull' => 0, 'required' => 1, 'visible' => 1, 'default' => '$object->reversal_amount_ht > 0 ? $object->reversal_amount_ht : $object->acquisition_value_ht', 'isameasure' => '1', 'validate' => '1',),
+				'amount_base_deductible_ht' => array('type' => 'price', 'label' => 'AssetDepreciationOptionAmountBaseDeductibleHT', 'enabled' => 'isset($object)&&get_class($object)=="Asset"', 'only_on_asset' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
+				'total_amount_last_depreciation_ht' => array('type' => 'price', 'label' => 'AssetDepreciationOptionTotalAmountLastDepreciationHT', 'enabled' => 'isset($object)&&get_class($object)=="Asset"', 'only_on_asset' => 1, 'position' => 110, 'noteditable' => 1, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
 			),
 		),
 		'accelerated_depreciation' => array(
@@ -93,14 +94,14 @@ class AssetDepreciationOptions extends CommonObject
 			'table'	=> 'asset_depreciation_options_fiscal',
 			'enabled_field' => 'economic:accelerated_depreciation_option:1',
 			'fields' => array(
-				'depreciation_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDepreciationType', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDepreciationTypeLinear', '1'=>'AssetDepreciationOptionDepreciationTypeDegressive', '2'=>'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate'=>'1',),
-				'degressive_coefficient' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionDegressiveRate', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1','enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
-				'duration' => array('type'=>'integer', 'label'=>'AssetDepreciationOptionDuration', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
-				'duration_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDurationType', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDurationTypeAnnual', '1'=>'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate'=>'1',),
-				'rate' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionRate', 'enabled'=>'1', 'position'=>50, 'visible'=>3, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1', 'computed' => '$object->asset_depreciation_options->getRate("accelerated_depreciation")',),
-				'amount_base_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>80, 'column_break' => true, 'notnull'=>0, 'required'=>1, 'visible'=>1, 'default'=>'$object->reversal_amount_ht > 0 ? $object->reversal_amount_ht : $object->acquisition_value_ht', 'isameasure'=>'1', 'validate'=>'1',),
-				'amount_base_deductible_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDeductibleHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>90, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
-				'total_amount_last_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionTotalAmountLastDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>100, 'noteditable'=> 1, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+				'depreciation_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDepreciationType', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDepreciationTypeLinear', '1' => 'AssetDepreciationOptionDepreciationTypeDegressive', '2' => 'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate' => '1',),
+				'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1','enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
+				'duration' => array('type' => 'integer', 'label' => 'AssetDepreciationOptionDuration', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
+				'duration_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDurationType', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDurationTypeAnnual', '1' => 'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate' => '1',),
+				'rate' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionRate', 'enabled' => '1', 'position' => 50, 'visible' => 3, 'default' => '0', 'isameasure' => '1', 'validate' => '1', 'computed' => '$object->asset_depreciation_options->getRate("accelerated_depreciation")',),
+				'amount_base_depreciation_ht' => array('type' => 'price', 'label' => 'AssetDepreciationOptionAmountBaseDepreciationHT', 'enabled' => 'isset($object)&&get_class($object)=="Asset"', 'only_on_asset' => 1, 'position' => 80, 'column_break' => true, 'notnull' => 0, 'required' => 1, 'visible' => 1, 'default' => '$object->reversal_amount_ht > 0 ? $object->reversal_amount_ht : $object->acquisition_value_ht', 'isameasure' => '1', 'validate' => '1',),
+				'amount_base_deductible_ht' => array('type' => 'price', 'label' => 'AssetDepreciationOptionAmountBaseDeductibleHT', 'enabled' => 'isset($object)&&get_class($object)=="Asset"', 'only_on_asset' => 1, 'position' => 90, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
+				'total_amount_last_depreciation_ht' => array('type' => 'price', 'label' => 'AssetDepreciationOptionTotalAmountLastDepreciationHT', 'enabled' => 'isset($object)&&get_class($object)=="Asset"', 'only_on_asset' => 1, 'position' => 100, 'noteditable' => 1, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
 			),
 		),
 	);
@@ -178,7 +179,7 @@ class AssetDepreciationOptions extends CommonObject
 				$this->{$field_key} = $this->deprecation_options[$mode][$field_key] ?? null;
 			}
 
-			$this->fields['rowid'] = array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id");
+			$this->fields['rowid'] = array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id");
 			if (empty($class_type)) {
 				$this->fields['fk_asset'] = array('type' => 'integer:Asset:asset/class/asset.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label' => 'Asset', 'enabled' => '1', 'position' => 0, 'notnull' => 0, 'visible' => 0, 'index' => 1, 'validate' => '1',);
 			} else {

From 622a32b2bb3527f3f2dddd484d0f6431817fd8df Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:44 +0100
Subject: [PATCH 0853/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/asset/class/assetmodel.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 811f50252d7..5b995978015 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2021  Open-Dsi  			<support@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -99,7 +100,7 @@ class AssetModel extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From f4b444cc0f4ce8adcd07e6f917f791cc60e62e3e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:46 +0100
Subject: [PATCH 0854/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/bom/class/bom.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 451926a030c..ac9173a4a07 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2023	Benjamin Falière	<benjamin.faliere@altairis.fr>
  * Copyright (C) 2023	Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -110,7 +111,7 @@ class BOM extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),

From d494def49d37382737bed84677e3da4183cf2f73 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:48 +0100
Subject: [PATCH 0855/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/bookcal/class/availabilities.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index e3320b531c7..a2bbcd6ffc8 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -111,7 +112,7 @@ class Availabilities extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From bc8f023653e63235f5a52bacf42e2dd794878b34 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:50 +0100
Subject: [PATCH 0856/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/bookcal/class/calendar.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index cad6ca0eeb2..a3320c04cda 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur      <eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) 2023 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -111,7 +112,7 @@ class Calendar extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'right', 'comment' => "Id"),

From 4ec7a53e3f3fe5bbb319ee8aeb778c65e7e95397 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:52 +0100
Subject: [PATCH 0857/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../action/class/actioncommreminder.class.php | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 4880e42300d..a55752b62c6 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -75,20 +76,20 @@ class ActionCommReminder extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
-		'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
-		'fk_user' => array('type'=>'integer', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>65, 'notnull'=>1, 'index'=>1,),
-		'offsetvalue' => array('type'=>'integer', 'label'=>'OffsetValue', 'visible'=>1, 'enabled'=>1, 'position'=>56, 'notnull'=>1,),
-		'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"y, m, d, w, h, i",),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>58, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
-		'lasterror' => array('type'=>'varchar(128)', 'label'=>'LastError', 'visible'=>-1, 'enabled'=>1, 'position'=>59, 'index'=>0),
-		'fk_actioncomm' => array('type'=>'integer', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>70, 'notnull'=>1, 'index'=>1,),
-		'fk_email_template' => array('type'=>'integer', 'label'=>'EmailTemplate', 'visible'=>1, 'enabled'=>1, 'position'=>80, 'notnull'=>0),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1,),
+		'dateremind' => array('type' => 'datetime', 'label' => 'DateRemind', 'visible' => 1, 'enabled' => 1, 'position' => 60, 'notnull' => 1, 'index' => 1,),
+		'typeremind' => array('type' => 'varchar(32)', 'label' => 'TypeRemind', 'visible' => -1, 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'comment' => "email, browser, sms",),
+		'fk_user' => array('type' => 'integer', 'label' => 'User', 'visible' => -1, 'enabled' => 1, 'position' => 65, 'notnull' => 1, 'index' => 1,),
+		'offsetvalue' => array('type' => 'integer', 'label' => 'OffsetValue', 'visible' => 1, 'enabled' => 1, 'position' => 56, 'notnull' => 1,),
+		'offsetunit' => array('type' => 'varchar(1)', 'label' => 'OffsetUnit', 'visible' => 1, 'enabled' => 1, 'position' => 57, 'notnull' => 1, 'comment' => "y, m, d, w, h, i",),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 58, 'notnull' => 1, 'default' => 0, 'index' => 0, 'arrayofkeyval' => array('0' => 'ToDo', '1' => 'Done')),
+		'lasterror' => array('type' => 'varchar(128)', 'label' => 'LastError', 'visible' => -1, 'enabled' => 1, 'position' => 59, 'index' => 0),
+		'fk_actioncomm' => array('type' => 'integer', 'label' => 'Project', 'visible' => 1, 'enabled' => 1, 'position' => 70, 'notnull' => 1, 'index' => 1,),
+		'fk_email_template' => array('type' => 'integer', 'label' => 'EmailTemplate', 'visible' => 1, 'enabled' => 1, 'position' => 80, 'notnull' => 0),
 	);
 
 	/**

From ed703c72419a22841ac6cfcdadfcbd61b654fa86 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:55 +0100
Subject: [PATCH 0858/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/comm/propal/class/propal.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5097273a833..a19ee568c3b 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -19,6 +19,7 @@
  * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -319,7 +320,7 @@ class Propal extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From 3f5a3b03eeeeafc3f2164fa9fad6a659aa6ef404 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:57 +0100
Subject: [PATCH 0859/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/commande/class/commande.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d89d3b39dfb..e4cc13362b6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2016-2022 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2021-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2022      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -310,7 +311,7 @@ class Commande extends CommonOrder
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From ec18ec0605daecb570d938eaf79d40b09db42a0b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:38:59 +0100
Subject: [PATCH 0860/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/compta/bank/class/account.class.php | 83 +++++++++++-----------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 980139ac752..9efdbcd8451 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  * Copyright (C) 2019		JC Prieto				<jcprieto@virtual20.com><prietojc@gmail.com>
  * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -311,49 +312,49 @@ class Account extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(12)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>25),
-		'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>35, 'index'=>1),
-		'bank' =>array('type'=>'varchar(60)', 'label'=>'Bank', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'code_banque' =>array('type'=>'varchar(128)', 'label'=>'Code banque', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'code_guichet' =>array('type'=>'varchar(6)', 'label'=>'Code guichet', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'number' =>array('type'=>'varchar(255)', 'label'=>'Number', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'cle_rib' =>array('type'=>'varchar(5)', 'label'=>'Cle rib', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'bic' =>array('type'=>'varchar(11)', 'label'=>'Bic', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'iban_prefix' =>array('type'=>'varchar(34)', 'label'=>'Iban prefix', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-		'country_iban' =>array('type'=>'varchar(2)', 'label'=>'Country iban', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'cle_iban' =>array('type'=>'varchar(2)', 'label'=>'Cle iban', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'domiciliation' =>array('type'=>'varchar(255)', 'label'=>'Domiciliation', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'state_id' =>array('type'=>'integer', 'label'=>'StateId', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_pays' =>array('type'=>'integer', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>95),
-		'proprio' =>array('type'=>'varchar(60)', 'label'=>'Proprio', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'owner_address' =>array('type'=>'varchar(255)', 'label'=>'Owner address', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'owner_zip' =>array('type'=>'varchar(25)', 'label'=>'Owner zip', 'enabled'=>1, 'visible'=>-1, 'position'=>106),
-		'owner_town' =>array('type'=>'varchar(50)', 'label'=>'Owner town', 'enabled'=>1, 'visible'=>-1, 'position'=>107),
-		'owner_country_id' =>array('type'=>'integer', 'label'=>'Owner country', 'enabled'=>1, 'visible'=>-1, 'position'=>108),
-		'courant' =>array('type'=>'smallint(6)', 'label'=>'Courant', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>110),
-		'clos' =>array('type'=>'smallint(6)', 'label'=>'Clos', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>115),
-		'rappro' =>array('type'=>'smallint(6)', 'label'=>'Rappro', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		'url' =>array('type'=>'varchar(128)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'account_number' =>array('type'=>'varchar(32)', 'label'=>'Account number', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'fk_accountancy_journal' =>array('type'=>'integer', 'label'=>'Accountancy journal ID', 'enabled'=>1, 'visible'=>-1, 'position'=>132),
-		'accountancy_journal' =>array('type'=>'varchar(20)', 'label'=>'Accountancy journal', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'currency_code' =>array('type'=>'varchar(3)', 'label'=>'Currency code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>140),
-		'min_allowed' =>array('type'=>'integer', 'label'=>'Min allowed', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-		'min_desired' =>array('type'=>'integer', 'label'=>'Min desired', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-		'comment' =>array('type'=>'text', 'label'=>'Comment', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>156),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>157),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>165),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>170),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>175),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>180),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'ref' => array('type' => 'varchar(12)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 25),
+		'label' => array('type' => 'varchar(30)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 35, 'index' => 1),
+		'bank' => array('type' => 'varchar(60)', 'label' => 'Bank', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'code_banque' => array('type' => 'varchar(128)', 'label' => 'Code banque', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'code_guichet' => array('type' => 'varchar(6)', 'label' => 'Code guichet', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'number' => array('type' => 'varchar(255)', 'label' => 'Number', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'cle_rib' => array('type' => 'varchar(5)', 'label' => 'Cle rib', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'bic' => array('type' => 'varchar(11)', 'label' => 'Bic', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'iban_prefix' => array('type' => 'varchar(34)', 'label' => 'Iban prefix', 'enabled' => 1, 'visible' => -1, 'position' => 70),
+		'country_iban' => array('type' => 'varchar(2)', 'label' => 'Country iban', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'cle_iban' => array('type' => 'varchar(2)', 'label' => 'Cle iban', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'domiciliation' => array('type' => 'varchar(255)', 'label' => 'Domiciliation', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'state_id' => array('type' => 'integer', 'label' => 'StateId', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'fk_pays' => array('type' => 'integer', 'label' => 'Country', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 95),
+		'proprio' => array('type' => 'varchar(60)', 'label' => 'Proprio', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'owner_address' => array('type' => 'varchar(255)', 'label' => 'Owner address', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'owner_zip' => array('type' => 'varchar(25)', 'label' => 'Owner zip', 'enabled' => 1, 'visible' => -1, 'position' => 106),
+		'owner_town' => array('type' => 'varchar(50)', 'label' => 'Owner town', 'enabled' => 1, 'visible' => -1, 'position' => 107),
+		'owner_country_id' => array('type' => 'integer', 'label' => 'Owner country', 'enabled' => 1, 'visible' => -1, 'position' => 108),
+		'courant' => array('type' => 'smallint(6)', 'label' => 'Courant', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 110),
+		'clos' => array('type' => 'smallint(6)', 'label' => 'Clos', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 115),
+		'rappro' => array('type' => 'smallint(6)', 'label' => 'Rappro', 'enabled' => 1, 'visible' => -1, 'position' => 120),
+		'url' => array('type' => 'varchar(128)', 'label' => 'Url', 'enabled' => 1, 'visible' => -1, 'position' => 125),
+		'account_number' => array('type' => 'varchar(32)', 'label' => 'Account number', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'fk_accountancy_journal' => array('type' => 'integer', 'label' => 'Accountancy journal ID', 'enabled' => 1, 'visible' => -1, 'position' => 132),
+		'accountancy_journal' => array('type' => 'varchar(20)', 'label' => 'Accountancy journal', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'currency_code' => array('type' => 'varchar(3)', 'label' => 'Currency code', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 140),
+		'min_allowed' => array('type' => 'integer', 'label' => 'Min allowed', 'enabled' => 1, 'visible' => -1, 'position' => 145),
+		'min_desired' => array('type' => 'integer', 'label' => 'Min desired', 'enabled' => 1, 'visible' => -1, 'position' => 150),
+		'comment' => array('type' => 'text', 'label' => 'Comment', 'enabled' => 1, 'visible' => -1, 'position' => 155),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 156),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 157),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 160),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 165),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 170),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 175),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 180),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 185),
 	);
 	// END MODULEBUILDER PROPERTIES
 

From a8a7d71426486dbf565fca5b516312b8c6192462 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:01 +0100
Subject: [PATCH 0861/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/compta/bank/class/paymentvarious.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 33ac0d8f817..fe7ea276767 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -197,7 +198,7 @@ class PaymentVarious extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array fields definition
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		// TODO: fill this array
@@ -744,7 +745,7 @@ class PaymentVarious extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('variouspayment'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 88ba7d1bc502e0903fe43796a8126c5679e4796b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:03 +0100
Subject: [PATCH 0862/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/compta/facture/class/facture-rec.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 50317b0ece3..957f7040a66 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -171,7 +172,7 @@ class FactureRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From 0c0f04f2d5284288cd0ffcf5184aa00a9b8d33bc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:05 +0100
Subject: [PATCH 0863/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/compta/facture/class/facture.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index e0e994959a7..6caa4a49b8c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -290,7 +290,7 @@ class Facture extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 1),

From fd757539346ad5bc04b58967507e511c789bfc73 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:07 +0100
Subject: [PATCH 0864/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index abda85280a0..5a92797fdb7 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014-2016 Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI     <info@inovea-conseil.com>
  * Copyright (C) 2019		JC Prieto			<jcprieto@virtual20.com><prietojc@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -144,7 +145,7 @@ class BonPrelevement extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),

From c88a9ea1eb8c601e35f8e00caaa689f7c8427941 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:09 +0100
Subject: [PATCH 0865/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/contact/class/contact.class.php | 79 +++++++++++++-------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 9b6752305a7..8b46a8d4c5a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2019      Nicolas ZABOURI 	           <info@inovea-conseil.com>
  * Copyright (C) 2020      Open-Dsi  	               <support@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -97,45 +98,45 @@ class Contact extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>30, 'index'=>1),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>3, 'position'=>35),
-		'civility' =>array('type'=>'varchar(6)', 'label'=>'Civility', 'enabled'=>1, 'visible'=>3, 'position'=>40),
-		'lastname' =>array('type'=>'varchar(50)', 'label'=>'Lastname', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'showoncombobox'=>1, 'searchall'=>1),
-		'name_alias' =>array('type'=>'varchar(255)', 'label'=>'Name alias', 'enabled'=>1, 'visible'=>-1, 'position'=>46, 'searchall'=>1),
-		'firstname' =>array('type'=>'varchar(50)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
-		'poste' =>array('type'=>'varchar(80)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>-1, 'position'=>52),
-		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>1, 'position'=>60),
-		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'fk_departement' =>array('type'=>'integer', 'label'=>'Fk departement', 'enabled'=>1, 'visible'=>3, 'position'=>70),
-		'fk_pays' =>array('type'=>'integer', 'label'=>'Fk pays', 'enabled'=>1, 'visible'=>3, 'position'=>75),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>1, 'position'=>77, 'searchall'=>1),
-		'birthday' =>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'phone' =>array('type'=>'varchar(30)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>1, 'position'=>90, 'searchall'=>1),
-		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'PhonePerso', 'enabled'=>1, 'visible'=>-1, 'position'=>95, 'searchall'=>1),
-		'phone_mobile' =>array('type'=>'varchar(30)', 'label'=>'PhoneMobile', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'searchall'=>1),
-		'fax' =>array('type'=>'varchar(30)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'searchall'=>1),
-		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>1, 'position'=>110, 'searchall'=>1),
-		'socialnetworks' =>array('type'=>'text', 'label'=>'SocialNetworks', 'enabled'=>1, 'visible'=>3, 'position'=>115),
-		'photo' =>array('type'=>'varchar(255)', 'label'=>'Photo', 'enabled'=>1, 'visible'=>3, 'position'=>170),
-		'priv' =>array('type'=>'smallint(6)', 'label'=>'ContactVisibility', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>175),
-		'fk_stcommcontact' =>array('type'=>'integer', 'label'=>'ProspectStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
-		'fk_prospectcontactlevel' =>array('type'=>'varchar(12)', 'label'=>'ProspectLevel', 'enabled'=>1, 'visible'=>-1, 'position'=>255),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 30, 'index' => 1),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 3, 'position' => 35),
+		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => 3, 'position' => 40),
+		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 45, 'showoncombobox' => 1, 'searchall' => 1),
+		'name_alias' => array('type' => 'varchar(255)', 'label' => 'Name alias', 'enabled' => 1, 'visible' => -1, 'position' => 46, 'searchall' => 1),
+		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 50, 'showoncombobox' => 1, 'searchall' => 1),
+		'poste' => array('type' => 'varchar(80)', 'label' => 'PostOrFunction', 'enabled' => 1, 'visible' => -1, 'position' => 52),
+		'address' => array('type' => 'varchar(255)', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'zip' => array('type' => 'varchar(25)', 'label' => 'Zip', 'enabled' => 1, 'visible' => 1, 'position' => 60),
+		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'fk_departement' => array('type' => 'integer', 'label' => 'Fk departement', 'enabled' => 1, 'visible' => 3, 'position' => 70),
+		'fk_pays' => array('type' => 'integer', 'label' => 'Fk pays', 'enabled' => 1, 'visible' => 3, 'position' => 75),
+		'fk_soc' => array('type' => 'integer', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => 1, 'position' => 77, 'searchall' => 1),
+		'birthday' => array('type' => 'date', 'label' => 'Birthday', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => 1, 'position' => 90, 'searchall' => 1),
+		'phone_perso' => array('type' => 'varchar(30)', 'label' => 'PhonePerso', 'enabled' => 1, 'visible' => -1, 'position' => 95, 'searchall' => 1),
+		'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'PhoneMobile', 'enabled' => 1, 'visible' => 1, 'position' => 100, 'searchall' => 1),
+		'fax' => array('type' => 'varchar(30)', 'label' => 'Fax', 'enabled' => 1, 'visible' => -1, 'position' => 105, 'searchall' => 1),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => 1, 'position' => 110, 'searchall' => 1),
+		'socialnetworks' => array('type' => 'text', 'label' => 'SocialNetworks', 'enabled' => 1, 'visible' => 3, 'position' => 115),
+		'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => 3, 'position' => 170),
+		'priv' => array('type' => 'smallint(6)', 'label' => 'ContactVisibility', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 175),
+		'fk_stcommcontact' => array('type' => 'integer', 'label' => 'ProspectStatus', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 220),
+		'fk_prospectcontactlevel' => array('type' => 'varchar(12)', 'label' => 'ProspectLevel', 'enabled' => 1, 'visible' => -1, 'position' => 255),
 		//no more used. Replace by a scan of email into mailing_unsubscribe. 'no_email' =>array('type'=>'smallint(6)', 'label'=>'No_Email', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>180),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>3, 'position'=>195, 'searchall'=>1),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>3, 'position'=>200, 'searchall'=>1),
-		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>3, 'position'=>205),
-		'canvas' =>array('type'=>'varchar(32)', 'label'=>'Canvas', 'enabled'=>1, 'visible'=>3, 'position'=>210),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>300),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>305),
-		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>3, 'position'=>310),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>3, 'position'=>315),
-		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>1000),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 3, 'position' => 195, 'searchall' => 1),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 3, 'position' => 200, 'searchall' => 1),
+		'default_lang' => array('type' => 'varchar(6)', 'label' => 'Default lang', 'enabled' => 1, 'visible' => 3, 'position' => 205),
+		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => 3, 'position' => 210),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 300),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 305),
+		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => 3, 'position' => 310),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => 3, 'position' => 315),
+		'statut' => array('type' => 'tinyint(4)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 500),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -1, 'position' => 1000),
 	);
 
 	public $civility_id; // In fact we store civility_code
@@ -1797,7 +1798,7 @@ class Contact extends CommonObject
 				while ($obj = $this->db->fetch_object($resql)) {
 					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
 					$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
-					$this->roles[$obj->contactroleid] = array('id'=>$obj->rowid, 'socid'=>$obj->socid, 'element'=>$obj->element, 'source'=>$obj->source, 'code'=>$obj->code, 'label'=>$libelle_element.' - '.($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->label));
+					$this->roles[$obj->contactroleid] = array('id' => $obj->rowid, 'socid' => $obj->socid, 'element' => $obj->element, 'source' => $obj->source, 'code' => $obj->code, 'label' => $libelle_element.' - '.($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->label));
 				}
 			}
 		} else {
@@ -1846,7 +1847,7 @@ class Contact extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$tab[] = array('fk_socpeople'=>$obj->id, 'type_contact'=>$obj->fk_c_type_contact);
+				$tab[] = array('fk_socpeople' => $obj->id, 'type_contact' => $obj->fk_c_type_contact);
 
 				$i++;
 			}
@@ -2178,7 +2179,7 @@ class Contact extends CommonObject
 		$return .= '<span class="info-box-icon bg-infobox-action">';
 		//var_dump($this->photo);exit;
 		if (property_exists($this, 'photo') && !is_null($this->photo)) {
-			$return.= Form::showphoto('contact', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1);
+			$return .= Form::showphoto('contact', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1);
 		} else {
 			$return .= img_picto('', $this->picto);
 		}

From 640eb1b75d71ce326f4a4c536330106a634d7004 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:11 +0100
Subject: [PATCH 0866/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/contrat/class/contrat.class.php | 108 ++++++++++++-------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8139d7aa755..e15c3f57a3f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -243,31 +243,31 @@ class Contrat extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>15, 'searchall'=>1),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>20),
-		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>25, 'searchall'=>1),
-		'ref_supplier' =>array('type'=>'varchar(50)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>26, 'searchall'=>1),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'date_contrat' =>array('type'=>'datetime', 'label'=>'Date contrat', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>75),
-		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105, 'searchall'=>1),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110, 'searchall'=>1),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'notnull'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'showoncombobox' => 1, 'position' => 15, 'searchall' => 1),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
+		'ref_customer' => array('type' => 'varchar(50)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 25, 'searchall' => 1),
+		'ref_supplier' => array('type' => 'varchar(50)', 'label' => 'RefSupplier', 'enabled' => 1, 'visible' => -1, 'position' => 26, 'searchall' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'date_contrat' => array('type' => 'datetime', 'label' => 'Date contrat', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 70),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 75),
+		'fk_commercial_signature' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'SaleRepresentative Signature', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'fk_commercial_suivi' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'SaleRepresentative follower', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 90),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 105, 'searchall' => 1),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 110, 'searchall' => 1),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 115),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 120),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 125),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 135),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'Last main doc', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'position' => 500, 'notnull' => 1, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', 2 => 'Closed'))
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -2154,7 +2154,7 @@ class Contrat extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('contractdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -2744,7 +2744,7 @@ class Contrat extends CommonObject
 
 		$error = 0;
 		$this->output = '';
-		$this->error='';
+		$this->error = '';
 
 		$contractlineprocessed = array();
 		$contractignored = array();
@@ -2753,13 +2753,13 @@ class Contrat extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = 'SELECT c.rowid, c.ref_customer, cd.rowid as lid, cd.date_fin_validite, p.duration';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'contrat as c, '.MAIN_DB_PREFIX.'contratdet as cd';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = cd.fk_product';
-		$sql.= ' WHERE cd.fk_contrat = c.rowid';
-		$sql.= " AND date_format(cd.date_fin_validite, '%Y-%m-%d') <= date_format('".$this->db->idate($enddatetoscan)."', '%Y-%m-%d')";
-		$sql.= " AND cd.statut = 4";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c, '.MAIN_DB_PREFIX.'contratdet as cd';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = cd.fk_product';
+		$sql .= ' WHERE cd.fk_contrat = c.rowid';
+		$sql .= " AND date_format(cd.date_fin_validite, '%Y-%m-%d') <= date_format('".$this->db->idate($enddatetoscan)."', '%Y-%m-%d')";
+		$sql .= " AND cd.statut = 4";
 		if ($thirdparty_id > 0) {
-			$sql.=" AND c.fk_soc = ".((int) $thirdparty_id);
+			$sql .= " AND c.fk_soc = ".((int) $thirdparty_id);
 		}
 		//print $sql;
 
@@ -2769,7 +2769,7 @@ class Contrat extends CommonObject
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 
-			$i=0;
+			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
@@ -2806,7 +2806,7 @@ class Contrat extends CommonObject
 						usort($object->linkedObjects['facture'], array('Contrat', 'contractCmpDate'));
 						//dol_sort_array($object->linkedObjects['facture'], 'date');
 
-						$someinvoicenotpaid=0;
+						$someinvoicenotpaid = 0;
 						foreach ($object->linkedObjects['facture'] as $idinvoice => $invoice) {
 							if ($invoice->statut == Facture::STATUS_DRAFT) {
 								continue;
@@ -2826,7 +2826,7 @@ class Contrat extends CommonObject
 					if ($expirationdate && $expirationdate < $enddatetoscan) {
 						dol_syslog("Define the newdate of end of services from expirationdate=".$expirationdate);
 						$newdate = $expirationdate;
-						$protecti=0;	//$protecti is to avoid infinite loop
+						$protecti = 0;	//$protecti is to avoid infinite loop
 						while ($newdate < $enddatetoscan && $protecti < 1000) {
 							$newdate = dol_time_plus_duree($newdate, $duration_value, $duration_unit);
 							$protecti++;
@@ -2844,10 +2844,10 @@ class Contrat extends CommonObject
 							$comment = 'Renew date of contract '.$object->ref.' line '.$obj->lid.' by doAutoRenewContracts';
 
 							$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."contratdet SET date_fin_validite = '".$this->db->idate($newdate)."'";
-							$sqlupdate.= ' WHERE rowid = '.((int) $obj->lid);
+							$sqlupdate .= ' WHERE rowid = '.((int) $obj->lid);
 							$resqlupdate = $this->db->query($sqlupdate);
 							if ($resqlupdate) {
-								$contractlineprocessed[$obj->lid]=$object->ref;
+								$contractlineprocessed[$obj->lid] = $object->ref;
 
 								$actioncode = 'RENEW_CONTRACT';
 								$now = dol_now();
@@ -2869,7 +2869,7 @@ class Contrat extends CommonObject
 
 								$ret = $actioncomm->create($user);       // User creating action
 							} else {
-								$contracterror[$object->id]=$object->ref;
+								$contracterror[$object->id] = $object->ref;
 
 								$error++;
 								$errorforlocaltransaction++;
@@ -2895,7 +2895,7 @@ class Contrat extends CommonObject
 			$this->error = $this->db->lasterror();
 		}
 
-		$this->output .= count($contractlineprocessed).' contract line(s) with end date before '.dol_print_date($enddatetoscan, 'day').' were renewed'.(count($contractlineprocessed)>0 ? ' : '.implode(',', $contractlineprocessed) : '');
+		$this->output .= count($contractlineprocessed).' contract line(s) with end date before '.dol_print_date($enddatetoscan, 'day').' were renewed'.(count($contractlineprocessed) > 0 ? ' : '.implode(',', $contractlineprocessed) : '');
 
 		return ($error ? 1 : 0);
 	}
@@ -3109,27 +3109,27 @@ class ContratLigne extends CommonObjectLine
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'qty' =>array('type'=>'integer', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>35, 'isameasure'=>1),
-		'total_ht' =>array('type'=>'integer', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>36, 'isameasure'=>1),
-		'total_tva' =>array('type'=>'integer', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>37, 'isameasure'=>1),
-		'total_ttc' =>array('type'=>'integer', 'label'=>'AmountTTC', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>38, 'isameasure'=>1),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
+		'qty' => array('type' => 'integer', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 35, 'isameasure' => 1),
+		'total_ht' => array('type' => 'integer', 'label' => 'AmountHT', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 36, 'isameasure' => 1),
+		'total_tva' => array('type' => 'integer', 'label' => 'AmountVAT', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 37, 'isameasure' => 1),
+		'total_ttc' => array('type' => 'integer', 'label' => 'AmountTTC', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 38, 'isameasure' => 1),
 		//'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
 		//'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_contrat' =>array('type'=>'integer:Contrat:contrat/class/contrat.class.php', 'label'=>'Contract', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_product' =>array('type'=>'integer:Product:product/class/product.class.php:1', 'label'=>'Product', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
+		'fk_contrat' => array('type' => 'integer:Contrat:contrat/class/contrat.class.php', 'label' => 'Contract', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 70),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:1', 'label' => 'Product', 'enabled' => 1, 'visible' => -1, 'position' => 75),
 		//'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		'note_private' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 105),
+		'note_public' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 110),
 		//'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
 		//'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
 		//'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'fk_user_ouverture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserStartingService', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
-		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosingService', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
-		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'arrayofkeyval'=>array(0=>'Draft', 4=>'Open', 5=>'Closed')),
-		'rang' =>array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'position'=>500, 'default' =>0)
+		'fk_user_ouverture' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserStartingService', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 135),
+		'fk_user_cloture' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserClosingService', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 135),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'position' => 500, 'arrayofkeyval' => array(0 => 'Draft', 4 => 'Open', 5 => 'Closed')),
+		'rang' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'position' => 500, 'default' => 0)
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -3200,7 +3200,7 @@ class ContratLigne extends CommonObjectLine
 		$params = array();
 		$reg = array();
 		if (preg_match('/class="(.*)"/', $moreatt, $reg)) {
-			$params = array('badgeParams'=>array('css' => $reg[1]));
+			$params = array('badgeParams' => array('css' => $reg[1]));
 		}
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', $params);
 	}

From 3730dbc31b55f334e734b20ce7a9818d273c79ec Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:13 +0100
Subject: [PATCH 0867/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/core/class/defaultvalues.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index cdb14b5bd5a..1d8fb59c4c1 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Florian HENRY <florian.henry@scopen.fr>
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -86,7 +87,7 @@ class DefaultValues extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From 1035e92861c6cf63116d3cff3b539fe6d5bbdea0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:15 +0100
Subject: [PATCH 0868/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../core/class/emailsenderprofile.class.php   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 00a8d800251..6aa1222c9d6 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -88,19 +89,19 @@ class EmailSenderProfile extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>1),
-		'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
-		'private' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'User', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'default'=>'0', 'notnull'=>1),
-		'signature' => array('type'=>'html', 'label'=>'Signature', 'visible'=>3, 'enabled'=>1, 'position'=>400, 'notnull'=>-1, 'index'=>1,),
-		'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>1, 'enabled'=>1, 'position'=>405, 'notnull'=>-1, 'index'=>1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'default'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0=>'Disabled', 1=>'Enabled')),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => -1, 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1,),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'notnull' => 1),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'visible' => 1, 'enabled' => 1, 'position' => 40, 'notnull' => -1),
+		'private' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'User', 'visible' => 1, 'enabled' => 1, 'position' => 50, 'default' => '0', 'notnull' => 1),
+		'signature' => array('type' => 'html', 'label' => 'Signature', 'visible' => 3, 'enabled' => 1, 'position' => 400, 'notnull' => -1, 'index' => 1,),
+		'position' => array('type' => 'integer', 'label' => 'Position', 'visible' => 1, 'enabled' => 1, 'position' => 405, 'notnull' => -1, 'index' => 1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -1, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'visible' => -1, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'active' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'default' => 1, 'position' => 1000, 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array(0 => 'Disabled', 1 => 'Enabled')),
 	);
 
 	/**

From dcf25336ba2145f6d6497ca5ce47aa1ddec116bc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:17 +0100
Subject: [PATCH 0869/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/core/class/timespent.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index a4327d55ae9..c3a830c5d48 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur      <eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) 2023  Gauthier VERDOL       	<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -111,7 +112,7 @@ class TimeSpent extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 254dc732bd3770781fe0c20389cfd29d50572fbf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:19 +0100
Subject: [PATCH 0870/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../class/emailcollector.class.php            | 93 ++++++++++---------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index bffa405796e..9400a7d9437 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -119,40 +120,40 @@ class EmailCollector extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1),
-		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax200'),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector', 'csslist'=>'tdoverflowmax150'),
-		'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1, 'cssview'=>'small', 'csslist'=>'small tdoverflowmax200'),
-		'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com', 'csslist'=>'tdoverflowmax125'),
-		'port'          => array('type'=>'varchar(10)', 'label'=>'EMailHostPort', 'visible'=>1, 'enabled'=>1, 'position'=>91, 'notnull'=>1, 'searchall'=>0, 'comment'=>"IMAP server port", 'help'=>'Example: 993', 'csslist'=>'tdoverflowmax50', 'default'=>'993'),
-		'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)', 'default'=>'UTF-8'),
-		'imap_encryption'  => array('type'=>'varchar(16)', 'label'=>'ImapEncryption', 'visible'=>-1, 'enabled'=>1, 'position'=>93, 'searchall'=>0, 'comment'=>"IMAP encryption", 'help'=>'ImapEncryptionHelp', 'arrayofkeyval'=> array('ssl'=>'SSL', 'tls' => 'TLS', 'notls' => 'NOTLS'), 'default'=>'ssl'),
-		'norsh'  => array('type'=>'integer', 'label'=>'NoRSH', 'visible'=>-1, 'enabled'=>"!getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>94, 'searchall'=>0, 'help'=>'NoRSHHelp', 'arrayofkeyval'=> array(0 =>'No', 1 => 'Yes'), 'default'=> 0),
-		'acces_type'     => array('type'=>'integer', 'label'=>'accessType', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>101, 'notnull'=>1, 'index'=>1, 'comment'=>"IMAP login type", 'arrayofkeyval'=>array('0'=>'loginPassword', '1'=>'oauthToken'), 'default'=>'0', 'help'=>''),
-		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
-		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>"1", 'position'=>103, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
-		'oauth_service' => array('type'=>'varchar(128)', 'label'=>'oauthService', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>104, 'notnull'=>0, 'index'=>1, 'comment'=>"IMAP login oauthService", 'arrayofkeyval'=>array(), 'help'=>'TokenMustHaveBeenCreated'),
-		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>109, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
-		'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
-		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>50),
-		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1, 'csslist'=>'nowraponall'),
-		'codelastresult' => array('type'=>'varchar(16)', 'label'=>'CodeLastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>122, 'notnull'=>-1,),
-		'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1, 'cssview'=>'small', 'csslist'=>'small tdoverflowmax200'),
-		'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1, 'csslist'=>'nowraponall'),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>0, 'enabled'=>1, 'position'=>61, 'notnull'=>-1,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>0, 'enabled'=>1, 'position'=>62, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1,),
+		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => 2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 20),
+		'ref'           => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'help' => 'Example: MyCollector1', 'csslist' => 'tdoverflowmax200'),
+		'label'         => array('type' => 'varchar(255)', 'label' => 'Label', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'notnull' => -1, 'searchall' => 1, 'help' => 'Example: My Email collector', 'csslist' => 'tdoverflowmax150'),
+		'description'   => array('type' => 'text', 'label' => 'Description', 'visible' => -1, 'enabled' => 1, 'position' => 60, 'notnull' => -1, 'cssview' => 'small', 'csslist' => 'small tdoverflowmax200'),
+		'host'          => array('type' => 'varchar(255)', 'label' => 'EMailHost', 'visible' => 1, 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'searchall' => 1, 'comment' => "IMAP server", 'help' => 'Example: imap.gmail.com', 'csslist' => 'tdoverflowmax125'),
+		'port'          => array('type' => 'varchar(10)', 'label' => 'EMailHostPort', 'visible' => 1, 'enabled' => 1, 'position' => 91, 'notnull' => 1, 'searchall' => 0, 'comment' => "IMAP server port", 'help' => 'Example: 993', 'csslist' => 'tdoverflowmax50', 'default' => '993'),
+		'hostcharset'   => array('type' => 'varchar(16)', 'label' => 'HostCharset', 'visible' => -1, 'enabled' => 1, 'position' => 92, 'notnull' => 0, 'searchall' => 0, 'comment' => "IMAP server charset", 'help' => 'Example: "UTF-8" (May be "US-ASCII" with some Office365)', 'default' => 'UTF-8'),
+		'imap_encryption'  => array('type' => 'varchar(16)', 'label' => 'ImapEncryption', 'visible' => -1, 'enabled' => 1, 'position' => 93, 'searchall' => 0, 'comment' => "IMAP encryption", 'help' => 'ImapEncryptionHelp', 'arrayofkeyval' => array('ssl' => 'SSL', 'tls' => 'TLS', 'notls' => 'NOTLS'), 'default' => 'ssl'),
+		'norsh'  => array('type' => 'integer', 'label' => 'NoRSH', 'visible' => -1, 'enabled' => "!getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position' => 94, 'searchall' => 0, 'help' => 'NoRSHHelp', 'arrayofkeyval' => array(0 => 'No', 1 => 'Yes'), 'default' => 0),
+		'acces_type'     => array('type' => 'integer', 'label' => 'accessType', 'visible' => -1, 'enabled' => "getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position' => 101, 'notnull' => 1, 'index' => 1, 'comment' => "IMAP login type", 'arrayofkeyval' => array('0' => 'loginPassword', '1' => 'oauthToken'), 'default' => '0', 'help' => ''),
+		'login'         => array('type' => 'varchar(128)', 'label' => 'Login', 'visible' => -1, 'enabled' => 1, 'position' => 102, 'notnull' => -1, 'index' => 1, 'comment' => "IMAP login", 'help' => 'Example: myaccount@gmail.com'),
+		'password'      => array('type' => 'password', 'label' => 'Password', 'visible' => -1, 'enabled' => "1", 'position' => 103, 'notnull' => -1, 'comment' => "IMAP password", 'help' => 'WithGMailYouCanCreateADedicatedPassword'),
+		'oauth_service' => array('type' => 'varchar(128)', 'label' => 'oauthService', 'visible' => -1, 'enabled' => "getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position' => 104, 'notnull' => 0, 'index' => 1, 'comment' => "IMAP login oauthService", 'arrayofkeyval' => array(), 'help' => 'TokenMustHaveBeenCreated'),
+		'source_directory' => array('type' => 'varchar(255)', 'label' => 'MailboxSourceDirectory', 'visible' => -1, 'enabled' => 1, 'position' => 109, 'notnull' => 1, 'default' => 'Inbox', 'help' => 'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
+		'target_directory' => array('type' => 'varchar(255)', 'label' => 'MailboxTargetDirectory', 'visible' => 1, 'enabled' => 1, 'position' => 110, 'notnull' => 0, 'help' => "EmailCollectorTargetDir"),
+		'maxemailpercollect' => array('type' => 'integer', 'label' => 'MaxEmailCollectPerCollect', 'visible' => -1, 'enabled' => 1, 'position' => 111, 'default' => 50),
+		'datelastresult' => array('type' => 'datetime', 'label' => 'DateLastCollectResult', 'visible' => 1, 'enabled' => '$action != "create" && $action != "edit"', 'position' => 121, 'notnull' => -1, 'csslist' => 'nowraponall'),
+		'codelastresult' => array('type' => 'varchar(16)', 'label' => 'CodeLastResult', 'visible' => 1, 'enabled' => '$action != "create" && $action != "edit"', 'position' => 122, 'notnull' => -1,),
+		'lastresult' => array('type' => 'varchar(255)', 'label' => 'LastResult', 'visible' => 1, 'enabled' => '$action != "create" && $action != "edit"', 'position' => 123, 'notnull' => -1, 'cssview' => 'small', 'csslist' => 'small tdoverflowmax200'),
+		'datelastok' => array('type' => 'datetime', 'label' => 'DateLastcollectResultOk', 'visible' => 1, 'enabled' => '$action != "create"', 'position' => 125, 'notnull' => -1, 'csslist' => 'nowraponall'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'visible' => 0, 'enabled' => 1, 'position' => 61, 'notnull' => -1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'visible' => 0, 'enabled' => 1, 'position' => 62, 'notnull' => -1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'visible' => -2, 'enabled' => 1, 'position' => 501, 'notnull' => 1,),
 		//'date_validation' => array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>510, 'notnull'=>1,),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>511, 'notnull'=>-1,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'visible' => -2, 'enabled' => 1, 'position' => 510, 'notnull' => 1,),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'visible' => -2, 'enabled' => 1, 'position' => 511, 'notnull' => -1,),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Inactive', '1'=>'Active'))
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'visible' => -2, 'enabled' => 1, 'position' => 1000, 'notnull' => -1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Inactive', '1' => 'Active'))
 	);
 
 
@@ -614,7 +615,7 @@ class EmailCollector extends CommonObject
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		$hookmanager->initHooks(array('emailcollectordao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -730,7 +731,7 @@ class EmailCollector extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$this->filters[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'rulevalue'=>$obj->rulevalue, 'status'=>$obj->status);
+				$this->filters[$obj->rowid] = array('id' => $obj->rowid, 'type' => $obj->type, 'rulevalue' => $obj->rulevalue, 'status' => $obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -762,7 +763,7 @@ class EmailCollector extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$this->actions[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'actionparam'=>$obj->actionparam, 'status'=>$obj->status);
+				$this->actions[$obj->rowid] = array('id' => $obj->rowid, 'type' => $obj->type, 'actionparam' => $obj->actionparam, 'status' => $obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -1673,8 +1674,8 @@ class EmailCollector extends CommonObject
 				} else {
 					$operationslog .= " - ".dol_escape_htmltag((string) $imapemail);
 				}
-				$operationslog .= " - References: ".dol_escape_htmltag($headers['References']??'')." - Subject: ".dol_escape_htmltag($headers['Subject']);
-				dol_syslog("** Process email ".$iforemailloop." References: ".($headers['References']??'')." Subject: ".$headers['Subject']);
+				$operationslog .= " - References: ".dol_escape_htmltag($headers['References'] ?? '')." - Subject: ".dol_escape_htmltag($headers['Subject']);
+				dol_syslog("** Process email ".$iforemailloop." References: ".($headers['References'] ?? '')." Subject: ".$headers['Subject']);
 
 
 				$trackidfoundintorecipienttype = '';
@@ -2678,7 +2679,7 @@ class EmailCollector extends CommonObject
 											}
 											if (!empty($attachments)) {
 												// There is an attachment for the ticket -> store attachment
-												$ticket = New Ticket($this->db);
+												$ticket = new Ticket($this->db);
 												$ticket->fetch($fk_element_id);
 												$destdir = $conf->ticket->dir_output.'/'.$ticket->ref;
 												if (!dol_is_dir($destdir)) {
@@ -3248,23 +3249,23 @@ class EmailCollector extends CommonObject
 							}
 
 							$parameters = array(
-								'connection'=>  $connection,
-								'imapemail'=>$imapemail,
-								'overview'=>$overview,
+								'connection' =>  $connection,
+								'imapemail' => $imapemail,
+								'overview' => $overview,
 
 								'from' => $from,
 								'fromtext' => $fromtext,
 
-								'actionparam'=>  $operation['actionparam'],
+								'actionparam' =>  $operation['actionparam'],
 
 								'thirdpartyid' => $thirdpartyid,
-								'objectid'=> $objectid,
-								'objectemail'=> $objectemail,
+								'objectid' => $objectid,
+								'objectemail' => $objectemail,
 
-								'messagetext'=>$messagetext,
-								'subject'=>$subject,
-								'header'=>$header,
-								'attachments'=>$attachments,
+								'messagetext' => $messagetext,
+								'subject' => $subject,
+								'header' => $header,
+								'attachments' => $attachments,
 							);
 							$reshook = $hookmanager->executeHooks('doCollectImapOneCollector', $parameters, $this, $operation['type']);
 

From 8a00ee901f28540a0a871d735fef2e3be6c38e75 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:21 +0100
Subject: [PATCH 0871/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../class/emailcollectoraction.class.php      | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index bdefd8a1f87..cafee277913 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -78,20 +79,20 @@ class EmailCollectorAction extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
-		'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
-		'actionparam' => array('type'=>'text', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
-		'position' => array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>1, 'position'=>600, 'default'=>'0',),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled')),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
+		'fk_emailcollector' => array('type' => 'integer', 'label' => 'Id of emailcollector', 'foreignkey' => 'emailcollector.rowid'),
+		'type' => array('type' => 'varchar(128)', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1),
+		'actionparam' => array('type' => 'text', 'label' => 'ParamForAction', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'notnull' => -1),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'position' => 501, 'notnull' => 1,),
+		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'llx_user.rowid',),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'position' => 511, 'notnull' => -1,),
+		'position' => array('type' => 'integer', 'label' => 'Position', 'enabled' => 1, 'visible' => 1, 'position' => 600, 'default' => '0',),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 1000, 'notnull' => 1, 'default' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled')),
 	);
 	public $rowid;
 	public $fk_emailcollector;
@@ -337,7 +338,7 @@ class EmailCollectorAction extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('emailcollectoractiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 696d748375431e904dd00139d1c8d979e375af02 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:23 +0100
Subject: [PATCH 0872/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../class/emailcollectorfilter.class.php      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 52acc3440d7..6e1442c50a5 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -80,19 +81,19 @@ class EmailCollectorFilter extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
-		'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1,),
-		'rulevalue' => array('type'=>'varchar(255)', 'label'=>'ValueOfRule', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>-1, 'help'=>"Value of Rule",),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled')),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
+		'fk_emailcollector' => array('type' => 'integer', 'label' => 'Id of emailcollector', 'foreignkey' => 'emailcollector.rowid'),
+		'type' => array('type' => 'varchar(128)', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'position' => 10, 'notnull' => 1,),
+		'rulevalue' => array('type' => 'varchar(255)', 'label' => 'ValueOfRule', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'notnull' => -1, 'help' => "Value of Rule",),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'position' => 501, 'notnull' => 1,),
+		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'llx_user.rowid',),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'position' => 511, 'notnull' => -1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 1000, 'notnull' => 1, 'default' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled')),
 	);
 	public $rowid;
 	public $fk_emailcollector;
@@ -351,7 +352,7 @@ class EmailCollectorFilter extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('emailcollectorfilterdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 829712cf200056dd97a8a1622b854935f9197e08 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:26 +0100
Subject: [PATCH 0873/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../class/conferenceorboothattendee.class.php                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 29f7fb8eafa..1712a02cec4 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -99,7 +100,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From b323ae5d3dc95b30d3082895e86110cbbc9c30b3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:28 +0100
Subject: [PATCH 0874/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/expedition/class/expedition.class.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1e880c2c91a..39eab0d71d0 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -91,7 +92,7 @@ class Expedition extends CommonObject
 
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
@@ -1691,7 +1692,7 @@ class Expedition extends CommonObject
 				$line->pa_ht = $obj->pa_ht;
 
 				// Local taxes
-				$localtax_array = array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx);
+				$localtax_array = array(0 => $obj->localtax1_type, 1 => $obj->localtax1_tx, 2 => $obj->localtax2_type, 3 => $obj->localtax2_tx);
 				$localtax1_tx = get_localtax($obj->tva_tx, 1, $this->thirdparty);
 				$localtax2_tx = get_localtax($obj->tva_tx, 2, $this->thirdparty);
 
@@ -1913,7 +1914,7 @@ class Expedition extends CommonObject
 		$result .= $linkend;
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -2252,7 +2253,7 @@ class Expedition extends CommonObject
 			// If stock increment is done on closing
 			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 				$result = $this->manageStockMvtOnEvt($user);
-				if ($result<0) {
+				if ($result < 0) {
 					$error++;
 				}
 			}
@@ -2294,7 +2295,7 @@ class Expedition extends CommonObject
 	{
 		global $langs;
 
-		$error=0;
+		$error = 0;
 
 		require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
 
@@ -2366,7 +2367,7 @@ class Expedition extends CommonObject
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
-			$error ++;
+			$error++;
 		}
 
 		return $error;

From 61f9bd468db65bed681c2443f2d0582c77a03076 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:30 +0100
Subject: [PATCH 0875/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../expensereport/class/expensereport_ik.class.php  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 5079a6a5210..a1cc92421e4 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017		ATM Consulting			<support@atm-consulting.fr>
  * Copyright (C) 2017		Pierre-Henry Favre		<phf@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -71,14 +72,14 @@ class ExpenseReportIk extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'=>array('type'=>'integer', 'index'=>true)
-		,'fk_c_exp_tax_cat'=>array('type'=>'integer', 'index'=>true)
-		,'fk_range'=>array('type'=>'integer', 'index'=>true)
-		,'coef'=>array('type'=>'double')
-		,'ikoffset'=>array('type'=>'double')
+		'rowid' => array('type' => 'integer', 'index' => true)
+		,'fk_c_exp_tax_cat' => array('type' => 'integer', 'index' => true)
+		,'fk_range' => array('type' => 'integer', 'index' => true)
+		,'coef' => array('type' => 'double')
+		,'ikoffset' => array('type' => 'double')
 	);
 
 

From b04317adb66173cec3e7894b4f5d31c88a955e9f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:32 +0100
Subject: [PATCH 0876/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../class/expensereport_rule.class.php        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 5966ba2399a..2e07990ac93 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017		ATM Consulting			<support@atm-consulting.fr>
  * Copyright (C) 2017		Pierre-Henry Favre		<phf@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,20 +110,20 @@ class ExpenseReportRule extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'=>array('type'=>'integer', 'index'=>true)
-		,'dates'=>array('type'=>'date')
-		,'datee'=>array('type'=>'date')
-		,'amount'=>array('type'=>'double')
-		,'restrictive'=>array('type'=>'integer')
-		,'fk_user'=>array('type'=>'integer')
-		,'fk_usergroup'=>array('type'=>'integer')
-		,'fk_c_type_fees'=>array('type'=>'integer')
-		,'code_expense_rules_type'=>array('type'=>'string')
-		,'is_for_all'=>array('type'=>'integer')
-		,'entity'=>array('type'=>'integer')
+		'rowid' => array('type' => 'integer', 'index' => true)
+		,'dates' => array('type' => 'date')
+		,'datee' => array('type' => 'date')
+		,'amount' => array('type' => 'double')
+		,'restrictive' => array('type' => 'integer')
+		,'fk_user' => array('type' => 'integer')
+		,'fk_usergroup' => array('type' => 'integer')
+		,'fk_c_type_fees' => array('type' => 'integer')
+		,'code_expense_rules_type' => array('type' => 'string')
+		,'is_for_all' => array('type' => 'integer')
+		,'entity' => array('type' => 'integer')
 	);
 
 

From 23eea8430937063ae010d08f712a967a48867566 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:34 +0100
Subject: [PATCH 0877/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/fourn/class/fournisseur.facture-rec.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index f592f36ea9f..4b5fd7a64ac 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -189,7 +190,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From e289e36fc1260105f604098aa381930292f670e6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:36 +0100
Subject: [PATCH 0878/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/evaluation.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index fe3dc78df7f..ccc97cc8f87 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -103,7 +104,7 @@ class Evaluation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From a2a2b3fa0e980632d34b884b2eed847549cc1b93 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:38 +0100
Subject: [PATCH 0879/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/evaluationdet.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 5a2d230bf59..50335a09417 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,7 +103,7 @@ class EvaluationLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 71fa5af141cff4f09f097b629267fa1d24fbd5f0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:40 +0100
Subject: [PATCH 0880/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/job.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 08ef1dc33de..1e2bc91b1cd 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 	Jean-Pascal BOUDET  <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 	Grégory BLEMAND     <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024	Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -101,7 +102,7 @@ class Job extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 7fb5c23758dae0f277ea43f3f2d25f4bf4078c1e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:42 +0100
Subject: [PATCH 0881/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/position.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index a65fc43e564..65d1e8c3557 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -101,7 +102,7 @@ class Position extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 4c56911ee89ba382a9a5db3364932e77adb47d95 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:44 +0100
Subject: [PATCH 0882/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/skill.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index a7e799e7c47..8a91dbc816b 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -107,7 +108,7 @@ class Skill extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 3865c099544b01d6a943cfc87be89fc7b8b3a8f2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:46 +0100
Subject: [PATCH 0883/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/skilldet.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 905ce049df9..fa9a4736b78 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -101,7 +102,7 @@ class Skilldet extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 54b2305e74cdd58325aba604d9e955085494047e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:48 +0100
Subject: [PATCH 0884/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/hrm/class/skillrank.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 4f820c3a62f..103067d9154 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -103,7 +104,7 @@ class SkillRank extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 2ab17157d25923d16d50bfffa037203522b090c1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:50 +0100
Subject: [PATCH 0885/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/knowledgemanagement/class/knowledgerecord.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 558922a7af8..74368e35e58 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -99,7 +99,7 @@ class KnowledgeRecord extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 26e487d69e3db8181d5a34f958a21c563d5670aa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:52 +0100
Subject: [PATCH 0886/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../template/class/myobject.class.php         | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 906cdc3d0e2..b0d8ce35479 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur      <eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -115,30 +116,30 @@ class MyObject extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields into database and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>10),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object', 'validate'=>1),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2, 'validate'=>1, 'alwayseditable'=>1),
-		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount', 'validate'=>1),
-		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp', 'validate'=>1),
-		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'OrganizationEventLinkToThirdParty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'isModEnabled("project")', 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'description'   => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60, 'validate'=>1),
-		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1, 'cssview'=>'wordbreak'),
-		'note_private'  => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'validate'=>1, 'cssview'=>'wordbreak'),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>500),
-		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 0, 'position'=>501),
+		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'default' => 1, 'index' => 1, 'position' => 10),
+		'ref'           => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'noteditable' => 0, 'default' => '', 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 20, 'searchall' => 1, 'comment' => 'Reference of object', 'validate' => 1),
+		'label'         => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => 'Help text', 'showoncombobox' => 2, 'validate' => 1, 'alwayseditable' => 1),
+		'amount'        => array('type' => 'price', 'label' => 'Amount', 'enabled' => 1, 'visible' => 1, 'default' => 'null', 'position' => 40, 'searchall' => 0, 'isameasure' => 1, 'help' => 'Help text for amount', 'validate' => 1),
+		'qty'           => array('type' => 'real', 'label' => 'Qty', 'enabled' => 1, 'visible' => 1, 'default' => '0', 'position' => 45, 'searchall' => 0, 'isameasure' => 1, 'help' => 'Help text for quantity', 'css' => 'maxwidth75imp', 'validate' => 1),
+		'fk_soc' 		=> array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'picto' => 'company', 'label' => 'ThirdParty', 'visible' => 1, 'enabled' => 'isModEnabled("societe")', 'position' => 50, 'notnull' => -1, 'index' => 1, 'help' => 'OrganizationEventLinkToThirdParty', 'validate' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_project'    => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'picto' => 'project', 'enabled' => 'isModEnabled("project")', 'visible' => -1, 'position' => 52, 'notnull' => -1, 'index' => 1, 'validate' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'description'   => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 3, 'position' => 60, 'validate' => 1),
+		'note_public'   => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 61, 'validate' => 1, 'cssview' => 'wordbreak'),
+		'note_private'  => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 62, 'validate' => 1, 'cssview' => 'wordbreak'),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500),
+		'tms'           => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 0, 'position' => 501),
 		//'date_validation '    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>510, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'picto'=>'user', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511, 'csslist'=>'tdoverflowmax150'),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 510, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax150'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 511, 'csslist' => 'tdoverflowmax150'),
 		//'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'notnull'=>0, 'position'=>600),
-		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
-		'model_pdf' 	=> array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'notnull'=>-1, 'position'=>1010),
-		'status'        => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>2000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled'), 'validate'=>1),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => 0, 'notnull' => 0, 'position' => 600),
+		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
+		'model_pdf' 	=> array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'notnull' => -1, 'position' => 1010),
+		'status'        => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => 0, 'index' => 1, 'position' => 2000, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', 9 => 'Canceled'), 'validate' => 1),
 	);
 
 	/**

From c7221ff338d73c6a25e81da45d586c5d32963797 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:54 +0100
Subject: [PATCH 0887/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/mrp/class/mo.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 9c1ade49f15..c896d3216cc 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -94,7 +94,7 @@ class Mo extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),

From db110db3cb66d14609e2acbd6beca76ade561b80 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:56 +0100
Subject: [PATCH 0888/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/opensurvey/class/opensurveysondage.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 8d0d577cce7..cc28ad8c41d 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García	    <marcosgdf@gmail.com>
  * Copyright (C) 2020-2024  Frédéric France		<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -100,7 +101,7 @@ class Opensurveysondage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id_sondage' => array('type' => 'varchar(16)', 'label' => 'Idsondage', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => -1,),

From 8ff540ecab931fb45a32a4d827b23450b3b6a6cd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:39:58 +0100
Subject: [PATCH 0889/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/partnership/class/partnership.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 606acb2ecd7..721121b8658 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -104,7 +104,7 @@ class Partnership extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 9d866f3dc3586a1fe291785bfd3f8a7e8e24cf57 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:01 +0100
Subject: [PATCH 0890/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/product/class/product.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3b31d2064e3..233b35edb76 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2017		Gustavo Novaro
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -582,7 +583,7 @@ class Product extends CommonObject
 	 */
 
 	/**
-	 * @var array fields of object product
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),

From 37b466a1358ce3a25be97342a95d0edeaa3e4693 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:03 +0100
Subject: [PATCH 0891/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/product/class/productcustomerprice.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 03b55d72fcb..4507b0fbdb9 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class ProductCustomerPrice extends CommonObject
 {
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => '1', 'noteditable' => 1),

From d55ebea8fbb6499b0819cb9521048a5f00e7f886 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:05 +0100
Subject: [PATCH 0892/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/product/class/productfournisseurprice.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index f34ce5f9b64..ef09d7b4307 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -92,7 +92,7 @@ class ProductFournisseurPrice extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),

From 1f328ddd812fd1aeb5d8916b5a9b8559cb2be376 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:07 +0100
Subject: [PATCH 0893/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/product/inventory/class/inventory.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index cb3da2f695a..6ce66586c6c 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -95,7 +96,7 @@ class Inventory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'              => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),

From 1106b9a40fdcdb15e2cdf1e71c1c77eac3ce9252 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:09 +0100
Subject: [PATCH 0894/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/product/stock/class/entrepot.class.php | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index c3106759f8e..203a3b77b9a 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016	   Francis Appels       <francis.appels@yahoo.com>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -120,30 +121,30 @@ class Entrepot extends CommonObject
 
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>15),
-		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
-		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
-		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
-		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:((statut:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
-		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
-		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45, 'searchall'=>1),
-		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'searchall'=>1),
-		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-2, 'position'=>55, 'searchall'=>1),
-		'fk_departement' =>array('type'=>'integer', 'label'=>'State', 'enabled'=>1, 'visible'=>0, 'position'=>60),
-		'fk_pays' =>array('type'=>'integer:Ccountry:core/class/ccountry.class.php', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-2, 'position'=>70, 'searchall'=>1),
-		'fax' =>array('type'=>'varchar(20)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-2, 'position'=>75, 'searchall'=>1),
+		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 15),
+		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 25, 'searchall' => 1),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => -2, 'position' => 35, 'searchall' => 1),
+		'lieu' => array('type' => 'varchar(64)', 'label' => 'LocationSummary', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'showoncombobox' => 2, 'searchall' => 1),
+		'fk_parent' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php:1:((statut:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ParentWarehouse', 'enabled' => 1, 'visible' => -2, 'position' => 41),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'visible' => -1, 'position' => 25),
+		'address' => array('type' => 'varchar(255)', 'label' => 'Address', 'enabled' => 1, 'visible' => -2, 'position' => 45, 'searchall' => 1),
+		'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -2, 'position' => 50, 'searchall' => 1),
+		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -2, 'position' => 55, 'searchall' => 1),
+		'fk_departement' => array('type' => 'integer', 'label' => 'State', 'enabled' => 1, 'visible' => 0, 'position' => 60),
+		'fk_pays' => array('type' => 'integer:Ccountry:core/class/ccountry.class.php', 'label' => 'Country', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'phone' => array('type' => 'varchar(20)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -2, 'position' => 70, 'searchall' => 1),
+		'fax' => array('type' => 'varchar(20)', 'label' => 'Fax', 'enabled' => 1, 'visible' => -2, 'position' => 75, 'searchall' => 1),
 		//'fk_user_author' =>array('type'=>'integer', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-2, 'position'=>82),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>300),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>301),
-		'warehouse_usage' => array('type'=>'integer', 'label' => 'WarehouseUsage', 'enabled'=>'getDolGlobalInt("MAIN_FEATURES_LEVEL")', 'visible'=>1, 'position'=>400, 'arrayofkeyval'=>array(1=>'InternalWarehouse', 2=>'ExternalWarehouse')),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 300),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 301),
+		'warehouse_usage' => array('type' => 'integer', 'label' => 'WarehouseUsage', 'enabled' => 'getDolGlobalInt("MAIN_FEATURES_LEVEL")', 'visible' => 1, 'position' => 400, 'arrayofkeyval' => array(1 => 'InternalWarehouse', 2 => 'ExternalWarehouse')),
 		//'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000),
 		//'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>500, 'css'=>'minwidth50'),
+		'statut' => array('type' => 'tinyint(4)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 500, 'css' => 'minwidth50'),
 	);
 
 	/**
@@ -825,7 +826,7 @@ class Entrepot extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('warehousedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip'=> $notooltip);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip' => $notooltip);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From b54f4b4af5d4a2d0daca161d85651e2013f8a701 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:11 +0100
Subject: [PATCH 0895/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../product/stock/class/productlot.class.php  | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 28f8b53c88b..8e48d272407 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023	   	Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -98,28 +99,28 @@ class Productlot extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
-		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'picto' => 'product', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'maxwidth150'),
-		'batch'         => array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch', 'searchall'=>1, 'picto'=>'lot', 'validate'=>1),
-		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'sellby'        => array('type'=>'date', 'label'=>'SellByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible'=>1, 'notnull'=>0, 'position'=>60),
-		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>1, 'notnull'=>0, 'position'=>62),
-		'eol_date'        => array('type'=>'date', 'label'=>'EndOfLife', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position'=>70),
-		'manufacturing_date' => array('type'=>'date', 'label'=>'ManufacturingDate', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?5:0', 'position'=>80),
-		'scrapping_date'     => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?5:0', 'position'=>90),
+		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
+		'fk_product'    => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => 1, 'visible' => 1, 'position' => 5, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'picto' => 'product', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'maxwidth150'),
+		'batch'         => array('type' => 'varchar(30)', 'label' => 'Batch', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'comment' => 'Batch', 'searchall' => 1, 'picto' => 'lot', 'validate' => 1),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 20),
+		'sellby'        => array('type' => 'date', 'label' => 'SellByDate', 'enabled' => 'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible' => 1, 'notnull' => 0, 'position' => 60),
+		'eatby'         => array('type' => 'date', 'label' => 'EatByDate', 'enabled' => 'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible' => 1, 'notnull' => 0, 'position' => 62),
+		'eol_date'        => array('type' => 'date', 'label' => 'EndOfLife', 'enabled' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position' => 70),
+		'manufacturing_date' => array('type' => 'date', 'label' => 'ManufacturingDate', 'enabled' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?1:0', 'visible' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?5:0', 'position' => 80),
+		'scrapping_date'     => array('type' => 'date', 'label' => 'DestructionDate', 'enabled' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?1:0', 'visible' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?5:0', 'position' => 90),
 		//'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY", 0)', 'visible'=>5, 'position'=>100),
-		'qc_frequency'        => array('type'=>'integer', 'label'=>'QCFrequency', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position'=>110),
-		'lifetime'        => array('type'=>'integer', 'label'=>'Lifetime', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position'=>110),
+		'qc_frequency'        => array('type' => 'integer', 'label' => 'QCFrequency', 'enabled' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position' => 110),
+		'lifetime'        => array('type' => 'integer', 'label' => 'Lifetime', 'enabled' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position' => 110),
 		'model_pdf'		=> array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 215),
 		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -2, 'position' => 310),
-		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>500),
-		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
-		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000)
+		'datec'         => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 500),
+		'tms'           => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 510, 'foreignkey' => 'llx_user.rowid'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 511),
+		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000)
 	);
 
 	/**
@@ -161,7 +162,7 @@ class Productlot extends CommonObject
 	 */
 	public $import_key;
 
-	public $stats_supplier_order=array();
+	public $stats_supplier_order = array();
 
 
 	/**

From 58df99e873119def42b67aa40b74ce7412d86d15 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:13 +0100
Subject: [PATCH 0896/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../product/stock/stocktransfer/class/stocktransfer.class.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 7ba9d0105dc..d90a892382c 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -123,7 +124,7 @@ class StockTransfer extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),

From e996c4028a4982279a96d2e9cd474548b3722ce5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:15 +0100
Subject: [PATCH 0897/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 .../stock/stocktransfer/class/stocktransferline.class.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index f726293c5e4..5a71cd70afd 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -93,7 +94,7 @@ class StockTransferLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),

From d62e8f78b46415d00541880c8c7b725d3f043ac3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:17 +0100
Subject: [PATCH 0898/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/projet/class/project.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 763382fd70c..f245a9c727a 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -292,7 +293,7 @@ class Project extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From 9d0e78985ca46f2efc7f1e8138517b60b4d4adfc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:19 +0100
Subject: [PATCH 0899/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/recruitment/class/recruitmentcandidature.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index bf874a1fa1f..8ccc0a498d0 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2020  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -106,7 +107,7 @@ class RecruitmentCandidature extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),

From 5985ab8ce06781bebb92328438b69ce416b92982 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:21 +0100
Subject: [PATCH 0900/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/recruitment/class/recruitmentjobposition.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index a288bc65f97..d035b8bd5eb 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2020       Laurent Destailleur	<eldy@users.sourceforge.net>
 /* Copyright (C) 2022       Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -112,7 +113,7 @@ class RecruitmentJobPosition extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),

From 46a275c376c07ef517177d43a80ea4e637ff09fb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:23 +0100
Subject: [PATCH 0901/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/salaries/class/paymentsalary.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 0de7eaaf457..70a714f02f3 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -152,7 +153,7 @@ class PaymentSalary extends CommonObject
 	public $datev = '';
 
 	/**
-	 * @var array
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),

From c370ad8dac385568a5b21247643a31c2f4dd7a6c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:25 +0100
Subject: [PATCH 0902/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/societe/class/companypaymentmode.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 99901fc00c8..9494f434c3c 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,7 +83,7 @@ class CompanyPaymentMode extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),

From c36a03d7e085fc9ed538b51e24212985d92820c9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:27 +0100
Subject: [PATCH 0903/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 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 eedaa168c37..8150efa1be1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -188,7 +188,7 @@ class Societe extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),

From d491c9f264148725fa9a55a99273052f492dbe94 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:29 +0100
Subject: [PATCH 0904/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/ticket/class/cticketcategory.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 1bc4f15c5bf..963c7647934 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -97,7 +98,7 @@ class CTicketCategory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From 13fcaf19f2a018c367cb8cb41d8896251b3047f9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:31 +0100
Subject: [PATCH 0905/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/variants/class/ProductAttribute.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index f0014a0a7ab..ea66396479c 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
  * Copyright (C) 2023       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -97,7 +98,7 @@ class ProductAttribute extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),

From c58a2db86b94d85f3fd0cd7e8b8e4932aee255da Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:33 +0100
Subject: [PATCH 0906/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/variants/class/ProductAttributeValue.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 7636df31290..556dbbfac30 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -75,7 +76,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),

From b1148cf2626c2730826c5c1efbac6d3204b4a9f5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:35 +0100
Subject: [PATCH 0907/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/webhook/class/target.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 484991e1dc7..d7bbc3af3a6 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -100,7 +101,7 @@ class Target extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 8cf93e2cb323a0fe537db76a8d52dad84f776c77 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:37 +0100
Subject: [PATCH 0908/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/website/class/websitepage.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 7a0a42a0f9f..f005727a326 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020 	   Nicolas ZABOURI		<info@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -162,7 +163,7 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'          => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),

From 6551b752d6163d98d3e48a25b127b128e34f6746 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:39 +0100
Subject: [PATCH 0909/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/workstation/class/workstation.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index ad650d6c7b0..f34232c86d4 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017       Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -95,7 +96,7 @@ class Workstation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),

From 23ac94ac49bc9823c2f1d951c4e83c438a8e9237 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:41 +0100
Subject: [PATCH 0910/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/workstation/class/workstationresource.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index c50a8417e90..56df285ace1 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -35,7 +36,7 @@ class WorkstationResource extends CommonObject
 	public $element = 'workstationresource';
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),

From b3aaa6c4e7c0e3a24a853754a7e7af75689205b4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:43 +0100
Subject: [PATCH 0911/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/workstation/class/workstationusergroup.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index e53bee221ef..7fed35b4b14 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -34,7 +35,7 @@ class WorkstationUserGroup extends CommonObject
 	public $element = 'workstationusergroup';
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),

From 5027cd4de9bb27daee12b2cac23878e4eca93e8c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:45 +0100
Subject: [PATCH 0912/1862] Fix: Repeat fields typing in CommonClass children

# Fix: Repeat fields typing in CommonClass children

phpstan needs typing to be 'co-variant' and therefore typing must be repeated as
the method is not to initialise the property in the constructor, but to override
the proparty by a 'local' definition in the child class
---
 htdocs/zapier/class/hook.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index b5a25699205..9e953292cd6 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -80,7 +81,7 @@ class Hook extends CommonObject
 	 */
 
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array(

From 6b34b8757f9a7821e1cde07420a2602920e2987e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:43:57 +0100
Subject: [PATCH 0913/1862] fixup! Change logic to help static tool analysis

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

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 22165d2c305..8116316dfa1 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -169,7 +169,7 @@ foreach ($modulesdir as $dir) {
 										$familykey = key($objMod->familyinfo);
 									} else {
 										$familykey = $objMod->family;
-										if (empty($familykey)) {
+										if (empty($familykey) || $familykey === null) {
 											$familykey = 'other';
 										}
 									}

From 8e422f15e38b5d65ec0d88c216b5a85074c2ea65 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 11 Mar 2024 18:00:43 +0100
Subject: [PATCH 0914/1862] New update in generate_content in module Ai

---
 htdocs/ai/class/ai.class.php | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 399b3adb1ee..5b4f4003248 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -20,6 +20,8 @@
  * or see https://www.gnu.org/
  */
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
 
 /**
  * Class for AI
@@ -116,30 +118,27 @@ class Ai
 			$fullInstructions = $prePrompt.' '.$instructions.' .'.$postPrompt;
 
 			// TODO Replace this with a simple call of getDolURLContent();
-			$ch = curl_init($this->apiEndpoint);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode([
+			// $ch = curl_init($this->apiEndpoint);
+			// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			//curl_setopt($ch, CURLOPT_HTTPHEADER, [
+			$payload = json_encode([
 				'messages' => [
 					['role' => 'user', 'content' => $fullInstructions]
 				],
 				'model' => $model
-			]));
-			curl_setopt($ch, CURLOPT_HTTPHEADER, [
+			]);
+
+			$headers = ([
 				'Authorization: Bearer ' . $this->apiKey,
 				'Content-Type: application/json'
 			]);
+			$response = getURLContent($this->apiEndpoint, 'POST', $payload, $headers);
 
-			$response = curl_exec($ch);
-			if (curl_errno($ch)) {
-				throw new Exception('cURL error: ' . curl_error($ch));
-			}
-
-			$statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if ($statusCode != 200) {
-				throw new Exception('API request failed with status code ' . $statusCode);
+			if ($response['http_code']  != 200) {
+				throw new Exception('API request failed with status code ' . $response['http_code']);
 			}
 			// Decode JSON response
-			$decodedResponse = json_decode($response, true);
+			$decodedResponse = json_decode($response['content'], true);
 
 			// Extraction content
 			$generatedEmailContent = $decodedResponse['choices'][0]['message']['content'];
@@ -147,8 +146,6 @@ class Ai
 			return $generatedEmailContent;
 		} catch (Exception $e) {
 			return array('error' => true, 'message' => $e->getMessage());
-		} finally {
-			curl_close($ch);
 		}
 	}
 }

From fc6c93877b369d6974c0732072882de70c071971 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 18:02:19 +0100
Subject: [PATCH 0915/1862] fixup! Change logic to help static tool analysis

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

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 8116316dfa1..e076187e563 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -169,9 +169,9 @@ foreach ($modulesdir as $dir) {
 										$familykey = key($objMod->familyinfo);
 									} else {
 										$familykey = $objMod->family;
-										if (empty($familykey) || $familykey === null) {
-											$familykey = 'other';
-										}
+									}
+									if (empty($familykey) || $familykey === null) {
+										$familykey = 'other';
 									}
 
 									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');

From d916a70acff5eb14cb20c564a6d8014e056dd5e4 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 11 Mar 2024 18:03:33 +0100
Subject: [PATCH 0916/1862] Remove comments

---
 htdocs/ai/class/ai.class.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 5b4f4003248..ee3970912b6 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -117,10 +117,7 @@ class Ai
 			}
 			$fullInstructions = $prePrompt.' '.$instructions.' .'.$postPrompt;
 
-			// TODO Replace this with a simple call of getDolURLContent();
-			// $ch = curl_init($this->apiEndpoint);
-			// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			//curl_setopt($ch, CURLOPT_HTTPHEADER, [
+
 			$payload = json_encode([
 				'messages' => [
 					['role' => 'user', 'content' => $fullInstructions]

From 8e1b6543b8e9d0f5ea24abd8afddc05247feda5a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:57:54 +0100
Subject: [PATCH 0917/1862] Qual: Typing : make all $module_parts fields
 optional and add missing

# Qual: Typing : make all $module_parts fields optional and add missing

According to the initialisations of the modules all fields for $module_parts are optional
and some keys were missing in the definition.
This is updated.
---
 htdocs/core/modules/DolibarrModules.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 2994a5c58b0..15fbe56aa32 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -140,7 +141,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $menu = array();
 
 	/**
-	 * @var array{triggers:int,login:int,substitutions:int,menus:int,theme:int,tpl:int,barcode:int,models:int,css:string,js:string,hooks:string[]} Module parts
+	 * @var array{triggers?:int<0,1>,login?:int<0,1>,substitutions?:int<0,1>,menus?:int<0,1>,theme?:int<0,1>,tpl?:int<0,1>,barcode?:int<0,1>,models?:int<0,1>,printing?:int<0,1>,css?:string[],js?:string[],hooks?:array{data:string[],entity:string},moduleforexternal?:int<0,1>,websitetemplates?:int<0,1>,contactelement?:int<0,1>} Module parts
 	 *  array(
 	 *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
 	 *      'triggers' => 0,

From 7bcb635a4e1de8b3a5e38af195d51825eb8aed04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 18:13:48 +0100
Subject: [PATCH 0918/1862] clean code and phpdoc

---
 .../core/modules/asset/mod_asset_standard.php |  6 +++---
 .../barcode/mod_barcode_product_standard.php  |  4 ++--
 .../mod_barcode_thirdparty_standard.php       |  2 +-
 htdocs/core/modules/bom/mod_bom_advanced.php  |  4 ++--
 htdocs/core/modules/bom/mod_bom_standard.php  | 11 +++++-----
 .../modules/cheque/mod_chequereceipt_mint.php | 18 ++---------------
 .../cheque/mod_chequereceipt_thyme.php        | 17 +---------------
 .../modules/commande/mod_commande_marbre.php  | 20 +++----------------
 .../modules/commande/mod_commande_saphir.php  | 19 ++----------------
 .../modules/contract/mod_contract_magre.php   | 16 +--------------
 .../modules/contract/mod_contract_serpis.php  | 19 ++----------------
 .../modules/delivery/mod_delivery_jade.php    | 20 +++----------------
 .../modules/delivery/mod_delivery_saphir.php  | 20 +++----------------
 .../expedition/mod_expedition_ribera.php      | 18 ++---------------
 .../expedition/mod_expedition_safor.php       | 19 +++---------------
 .../expensereport/mod_expensereport_jade.php  |  5 +++--
 .../expensereport/mod_expensereport_sand.php  |  5 +++--
 .../core/modules/facture/mod_facture_mars.php |  5 +++--
 .../modules/facture/mod_facture_mercure.php   |  3 ++-
 .../modules/facture/mod_facture_terre.php     |  5 +++--
 .../societe/mod_codeclient_elephant.php       |  2 +-
 .../societe/mod_codeclient_leopard.php        |  4 ++--
 .../modules/societe/mod_codeclient_monkey.php |  2 +-
 23 files changed, 54 insertions(+), 190 deletions(-)

diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php
index 7c34cc27931..1c957de8724 100644
--- a/htdocs/core/modules/asset/mod_asset_standard.php
+++ b/htdocs/core/modules/asset/mod_asset_standard.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@ class mod_asset_standard extends ModeleNumRefAsset
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Asset		$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -118,7 +118,7 @@ class mod_asset_standard extends ModeleNumRefAsset
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Asset		$object		Object we need next value for
 	 *  @return string|-1      			Next value if OK, -1 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index c2df3f7c3a0..2190150ec62 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -127,8 +127,8 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	/**
 	 *  Return literal barcode type code from numerical rowid type of barcode
 	 *
-	 *	@param	Database    $db         Database
-	 *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
+	 *	@param	DoliDB	$db         Database
+	 *  @param  int  	$type       Type of barcode (EAN, ISBN, ...) as rowid
 	 *  @return string
 	 */
 	public function literalBarcodeType($db, $type = 0)
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index 118e87cbc3a..6825c1e53bb 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -139,7 +139,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	/**
 	 *  Return literal barcode type code from numerical rowid type of barcode
 	 *
-	 *	@param	Database    $db         Database
+	 *	@param	DoliDB    	$db         Database
 	 *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
 	 *  @return string
 	 */
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index 0e9f3d4f977..2428e79595d 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ class mod_bom_advanced extends ModeleNumRefBoms
 	 * 	Return next free value
 	 *
 	 *  @param	Product		$objprod    Object product
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Bom			$object		Object we need next value for
 	 *  @return string|0      			Next value if OK, 0 if KO
 	 */
 	public function getNextValue($objprod, $object)
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 1e26ba2254a..f4ba8293423 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,8 +77,8 @@ class mod_bom_standard extends ModeleNumRefBoms
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  Bom		$object		Object we need next value for
+	 *  @return boolean     		false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
@@ -112,9 +113,9 @@ class mod_bom_standard extends ModeleNumRefBoms
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|-1      			Next value if OK, -1 if KO
+	 *  @param	Product	$objprod    Object product
+	 *  @param  Bom		$object		Object we need next value for
+	 *  @return string|-1      		Next value if OK, -1 if KO
 	 */
 	public function getNextValue($objprod, $object)
 	{
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index 5106697211d..c42806e603e 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,7 +74,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  RemiseCheque	$object	Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -150,19 +151,4 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	public function chequereceipt_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 5a2ae083d2f..44eff63035d 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015       Juanjo Menent	        <jmenent@2byte.es>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -131,19 +131,4 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 
 		return  $numFinal;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	public function chequereceipt_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index ad664e10e3a..8583d30d46c 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,7 +89,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Commande	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -125,7 +126,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Commande	$object		Object we need next value for
 	 *  @return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $object)
@@ -165,19 +166,4 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		dol_syslog("mod_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string|-1      			Next free value, -1 if KO
-	 */
-	public function commande_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 2cc4331e98e..f727b9dff70 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Commande	$object		Object we need next value for
 	 *  @return string|0      			Next value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $object)
@@ -149,19 +149,4 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 
 		return  $numFinal;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	public function commande_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index f68e180a65c..ebd7957780f 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -105,7 +105,7 @@ class mod_contract_magre extends ModelNumRefContracts
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$contract	contract object
+	 *	@param	Contrat		$contract	contract object
 	 *	@return string|0      			Next value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $contract)
@@ -125,18 +125,4 @@ class mod_contract_magre extends ModelNumRefContracts
 
 		return  $numFinal;
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next value
-	 *
-	 *  @param	Societe		$objsoc     third party object
-	 *  @param	Object		$objforref	contract object
-	 *  @return string|0      			Value if OK, 0 if KO
-	 */
-	public function contract_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index fe155099ac7..d78c6ebbf89 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -76,7 +76,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Contrat		$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -113,7 +113,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$contract	contract object
+	 *	@param	Contrat		$contract	contract object
 	 *	@return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $contract)
@@ -151,19 +151,4 @@ class mod_contract_serpis extends ModelNumRefContracts
 		dol_syslog("mod_contract_serpis::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Return next value
-	 *
-	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$objforref  contract object
-	 *	@return string|-1      			Value if OK, -1 if KO
-	 */
-	public function contract_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
index c29a5f7f4bd..95e3e0ff18e 100644
--- a/htdocs/core/modules/delivery/mod_delivery_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -86,7 +87,7 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Delivery	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -126,7 +127,7 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Delivery	$object		Object we need next value for
 	 *  @return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $object)
@@ -168,19 +169,4 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 		dol_syslog("mod_delivery_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free ref
-	 *
-	 *  @param  Societe     $objsoc         Object thirdparty
-	 *  @param  Object      $object         Object livraison
-	 *  @return string|-1                   Value if OK, -1 if KO
-	 */
-	public function delivery_get_num($objsoc = 0, $object = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $object);
-	}
 }
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index 209d848ec31..4d6bdb7c716 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -121,7 +122,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     	Object third party
-	 *  @param  Object		$object			Object delivery
+	 *  @param  Delivery	$object			Object delivery
 	 *  @return string|0      				Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $object)
@@ -148,26 +149,11 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
+	 * 	@param	Delivery	$objforref	Object for number to search
 	 *  @return string|0      			Next free value, 0 if KO
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
 		return $this->getNextValue($objsoc, $objforref);
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free ref
-	 *
-	 *  @param	Societe		$objsoc      	Object thirdparty
-	 *  @param  Object		$object			Object livraison
-	 *  @return string|0      				Value if OK, 0 if KO
-	 */
-	public function delivery_get_num($objsoc = 0, $object = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $object);
-	}
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index 2d8c5f7f138..4d85f303169 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011       Juanjo Menent	        <jmenent@2byte.es>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -117,7 +117,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$shipment	Shipment object
+	 *	@param	Expedition	$shipment	Shipment object
 	 *	@return string|0      			Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $shipment)
@@ -139,18 +139,4 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 
 		return  $numFinal;
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$objforref	Shipment object
-	 *	@return string|0      			Next free value, 0 if KO
-	 */
-	public function expedition_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index 579ba6a4d4f..98f20203fa2 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,7 +82,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Expedition	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -118,7 +119,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$shipment	Shipment object
+	 *	@param	Expedition	$shipment	Shipment object
 	 *	@return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $shipment)
@@ -156,18 +157,4 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$objforref	Shipment object
-	 *	@return string|-1      			Next free value, -1 if KO
-	 */
-	public function expedition_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 60de9d22014..ddac61f46c5 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 Maxime Kohlhaas <support@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -82,8 +83,8 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  ExpenseReport	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 8a0165e3799..5bb216e5f65 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 Maxime Kohlhaas <support@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -120,8 +121,8 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 	/**
 	 *  Return next free value
 	 *
-	 *  @param  Object      $object     Object we need next value for
-	 *  @return string|0                Next value if OK, 0 if KO
+	 *  @param  ExpenseReport	$object     Object we need next value for
+	 *  @return string|0                	Next value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 10d42804a9c..71f9fb27eec 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2018 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,7 +97,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Facture		$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -243,7 +244,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 *  Return next free value
 	 *
 	 *  @param  Societe     $objsoc         Object third party
-	 *  @param  string      $objforref      Object for number to search
+	 *  @param  Facture     $objforref      Object for number to search
 	 *  @param  string      $mode           'next' for next value or 'last' for last value
 	 *  @return string                      Next free value
 	 */
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 1aae660c1a9..8d1194b7d4a 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2013		uanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -178,7 +179,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 	 * Return next free value
 	 *
 	 * @param	Societe		$objsoc     	Object third party
-	 * @param	string		$objforref		Object for number to search
+	 * @param	Facture		$objforref		Object for number to search
 	 * @param   string		$mode       	'next' for next value or 'last' for last value
 	 * @return  string|0      				Next free value, 0 if KO
 	 */
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 3336340cd63..bf116118024 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2008  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -112,7 +113,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Facture		$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -283,7 +284,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 *  Return next free value
 	 *
 	 *  @param  Societe     $objsoc         Object third party
-	 *  @param  string      $objforref      Object for number to search
+	 *  @param  Facture      $objforref      Object for number to search
 	 *  @param   string     $mode           'next' for next value or 'last' for last value
 	 *  @return  string|int<-1,0>           Next free value, -1 or 0 if error
 	 */
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 9039c9a2907..c0787d83fe9 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -125,7 +125,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	Societe		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 9729c15e7d7..4d4870a3f35 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -77,7 +77,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	Societe		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
@@ -89,7 +89,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	Societe		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return next value
 	 */
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 1d843fd007e..7c9457bd904 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -77,7 +77,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	Societe		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */

From f19fc5c70ce7bc70f116e186fa5d6fadfb76ed7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 18:18:59 +0100
Subject: [PATCH 0919/1862] clean code and phpdoc

---
 htdocs/core/modules/fichinter/mod_arctic.php  |  5 +++--
 htdocs/core/modules/fichinter/mod_pacific.php | 11 ++++++-----
 .../holiday/mod_holiday_immaculate.php        | 16 +---------------
 .../modules/holiday/mod_holiday_madonna.php   | 19 ++-----------------
 .../modules/hrm/mod_evaluation_advanced.php   |  4 ++--
 .../modules/hrm/mod_evaluation_standard.php   |  5 +++--
 6 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 4e23b6cb1e3..54362d39bd4 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin                <regis.houssin@inodbox.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2013      Juanjo Menent				<jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -121,7 +122,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Fichinter	$object		Object we need next value for
 	 *  @return string|0      			Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc = 0, $object = '')
@@ -148,7 +149,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
-	 *  @param	Object		$objforref	Object for number to search
+	 *  @param	Fichinter	$objforref	Object for number to search
 	 *  @return string|0      			Next free value, 0 if KO
 	 */
 	public function getNumRef($objsoc, $objforref)
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index 1892d9f3759..a1f90012125 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -82,7 +83,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Fichinter	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -121,7 +122,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Fichinter	$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
 	public function getNextValue($objsoc = 0, $object = '')
@@ -161,9 +162,9 @@ class mod_pacific extends ModeleNumRefFicheinter
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe	$objsoc     Object third party
-	 * 	@param	Object	$objforref	Object for number to search
-	 *  @return string      		Next free value
+	 *  @param	Societe		$objsoc     Object third party
+	 * 	@param	Fichinter	$objforref	Object for number to search
+	 *  @return string      			Next free value
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index ca246324929..434b9614985 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -105,7 +105,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$holiday	holiday object
+	 *	@param	Holiday		$holiday	holiday object
 	 *	@return string|0      			Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $holiday)
@@ -125,18 +125,4 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 
 		return  $numFinal;
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next value
-	 *
-	 *  @param  User		$fuser     	User object
-	 *  @param  Object		$objforref	Holiday object
-	 *  @return string|0      			Value if OK, 0 if KO
-	 */
-	public function holiday_get_num($fuser, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($fuser, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index d2eeceeafc2..636ee4269d3 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -77,7 +77,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Holiday		$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -114,7 +114,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$holiday	Holiday object
+	 *	@param	Holiday		$holiday	Holiday object
 	 *	@return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $holiday)
@@ -152,19 +152,4 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Return next value
-	 *
-	 *	@param	User		$fuser     	User object
-	 *	@param	Object		$objforref	Holiday object
-	 *	@return string|-1      			Value if OK, -1 if KO
-	 */
-	public function holiday_get_num($fuser, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($fuser, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
index 2c89930a5ab..78d396d909b 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_advanced.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -123,7 +123,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Evaluation	$object		Object we need next value for
 	 *  @return string|0      			Value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
index 17cb75ad4ea..418b7b1e5ba 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_standard.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +78,7 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Evaluation	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -117,7 +118,7 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Evaluation	$object		Object we need next value for
 	 *  @return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($object)

From 23b323f7a5d694d0983c3e1e4739eafdceb27a0f Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 11 Mar 2024 18:25:30 +0100
Subject: [PATCH 0920/1862] Fix date by using dol_mktime

---
 htdocs/bookcal/availabilities_card.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index f3fe963f906..ac6eec12015 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -136,14 +136,24 @@ if (empty($reshook)) {
 
 	$triggermodname = 'BOOKCAL_AVAILABILITIES_MODIFY'; // Name of trigger action code to execute when we modify record
 
-	$dateStartTimestamp = dol_stringtotime(GETPOST('start'));
-	$dateEndTimestamp = dol_stringtotime(GETPOST('end'));
 
-	$startHour = intval(GETPOST('startHour'));
-	$endHour = intval(GETPOST('endHour'));
+	$startday = GETPOST('startday', 'int');
+	$startmonth = GETPOST('startmonth', 'int');
+	$startyear = GETPOST('startyear', 'int');
+	$starthour = GETPOST('startHour', 'int');
+
+	$dateStartTimestamp = dol_mktime($starthour, 0, 0, $startmonth, $startday, $startyear);
+
+	$endday = GETPOST('endday', 'int');
+	$endmonth = GETPOST('endmonth', 'int');
+	$endyear = GETPOST('endyear', 'int');
+	$endhour = GETPOST('endHour', 'int');
+
+
+	$dateEndTimestamp = dol_mktime($endhour, 0, 0, $endmonth, $endday, $endyear);
 
 	// check hours
-	if ($startHour > $endHour) {
+	if ($starthour > $endhour) {
 		if ($dateStartTimestamp === $dateEndTimestamp) {
 			$error++;
 			setEventMessages($langs->trans("ErrorEndTimeMustBeGreaterThanStartTime"), null, 'errors');

From 9cc32d70d29ea48bedecf85ebeba0e6b0a06cfdf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 18:25:48 +0100
Subject: [PATCH 0921/1862] Clean code

---
 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 eedaa168c37..8565e7260e1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4951,7 +4951,7 @@ class Societe extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $user, $langs;
+		global $langs;
 
 		if (!empty($moreparams) && !empty($moreparams['use_companybankid'])) {
 			$modelpath = "core/modules/bank/doc/";

From 330abe14fe8568cfa499d59c44f5107580e6028a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 18:28:20 +0100
Subject: [PATCH 0922/1862] FIX Option MAIN_DOC_USE_TIMING can be a string with
 date format

---
 .../core/modules/asset/doc/doc_generic_asset_odt.modules.php  | 4 ++--
 htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php   | 4 ++--
 .../modules/commande/doc/doc_generic_order_odt.modules.php    | 4 ++--
 .../modules/contract/doc/doc_generic_contract_odt.modules.php | 4 ++--
 .../expedition/doc/doc_generic_shipment_odt.modules.php       | 4 ++--
 .../modules/facture/doc/doc_generic_invoice_odt.modules.php   | 4 ++--
 .../core/modules/member/doc/doc_generic_member_odt.class.php  | 4 ++--
 htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php    | 4 ++--
 .../modules/product/doc/doc_generic_product_odt.modules.php   | 4 ++--
 .../modules/project/doc/doc_generic_project_odt.modules.php   | 4 ++--
 .../modules/propale/doc/doc_generic_proposal_odt.modules.php  | 4 ++--
 .../reception/doc/doc_generic_reception_odt.modules.php       | 4 ++--
 htdocs/core/modules/societe/doc/doc_generic_odt.modules.php   | 4 ++--
 .../core/modules/stock/doc/doc_generic_stock_odt.modules.php  | 4 ++--
 .../doc/doc_generic_supplier_invoice_odt.modules.php          | 4 ++--
 .../doc/doc_generic_supplier_order_odt.modules.php            | 4 ++--
 .../doc/doc_generic_supplier_proposal_odt.modules.php         | 4 ++--
 .../modules/ticket/doc/doc_generic_ticket_odt.modules.php     | 4 ++--
 htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php | 4 ++--
 .../usergroup/doc/doc_generic_usergroup_odt.modules.php       | 4 ++--
 .../doc/doc_generic_recruitmentjobposition_odt.modules.php    | 4 ++--
 21 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index 15d95bde92e..ca77c6f13d0 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -262,8 +262,8 @@ class doc_generic_asset_odt extends ModelePDFAsset
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 1fcc55446a8..9e3df7965fb 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -274,8 +274,8 @@ class doc_generic_bom_odt extends ModelePDFBom
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index e8d7abfe0d7..63884795307 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -280,8 +280,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 515109c4f20..dffded55555 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -278,8 +278,8 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 219c0f47029..a678d8265c5 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -278,8 +278,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
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 b74934d96a4..6b28da3e1e1 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
@@ -278,8 +278,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 2076e156bac..bff58b2737f 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -268,8 +268,8 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index fe18e6eb6ea..fe33eec3bba 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -267,8 +267,8 @@ class doc_generic_mo_odt extends ModelePDFMo
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
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 2728bf266c2..8f799be03ae 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
@@ -276,8 +276,8 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index e8c1357e7a2..d3cf5e7440c 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -559,8 +559,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
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 734ebdc5137..0c6ef9df011 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
@@ -312,8 +312,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 2bc493eb580..71fcf65b197 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -271,8 +271,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
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 261aeef9ad5..374c44c7a25 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -252,8 +252,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)) . '-' . $newfiletmp;
 					$newfiletmp = preg_replace('/__+/', '_', $newfiletmp);	// Replace repeated _ into one _ (to avoid string with substitution syntax)
 				}
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 5aae143fc2b..a0e89ad1d76 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -278,8 +278,8 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index 6031907b305..27cb836e420 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -271,8 +271,8 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 285be7c2799..ff7a4f33d36 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -266,8 +266,8 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index bbc0fdb583a..35bf81667f8 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -300,8 +300,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 7aa6b4a07e4..9b6646c313b 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -266,8 +266,8 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index d6e52e2f21e..6e671eadae0 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -300,8 +300,8 @@ class doc_generic_user_odt extends ModelePDFUser
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 74ad5902966..666a7945e2d 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -282,8 +282,8 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
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 a93a724fbd9..da7640d708a 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
@@ -267,8 +267,8 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (getDolGlobalInt('MAIN_DOC_USE_TIMING')) {
-					$format = getDolGlobalInt('MAIN_DOC_USE_TIMING');
+				if (getDolGlobalString('MAIN_DOC_USE_TIMING')) {
+					$format = getDolGlobalString('MAIN_DOC_USE_TIMING');
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}

From e160ba6ba441a42aa96bdd8044f48d86c4b9bcd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 18:29:41 +0100
Subject: [PATCH 0923/1862] clean code and phpdoc

---
 .../modules/member/mod_member_advanced.php    |  2 +-
 .../core/modules/member/mod_member_simple.php |  2 +-
 htdocs/core/modules/mrp/mod_mo_advanced.php   |  4 ++--
 htdocs/core/modules/mrp/mod_mo_standard.php   |  5 +++--
 .../product_batch/mod_lot_standard.php        |  3 ++-
 .../modules/product_batch/mod_sn_standard.php |  3 ++-
 .../modules/project/mod_project_simple.php    |  3 ++-
 .../modules/project/mod_project_universal.php | 16 +---------------
 .../modules/propale/mod_propale_marbre.php    |  5 +++--
 .../modules/reception/mod_reception_beryl.php | 19 +++----------------
 .../reception/mod_reception_moonstone.php     | 18 ++----------------
 .../societe/mod_codecompta_aquarium.php       |  3 ++-
 .../mod_stocktransfer_advanced.php            |  6 +++---
 .../mod_stocktransfer_standard.php            |  9 +++++----
 14 files changed, 32 insertions(+), 66 deletions(-)

diff --git a/htdocs/core/modules/member/mod_member_advanced.php b/htdocs/core/modules/member/mod_member_advanced.php
index 2147961ea82..4ed9bb1740c 100644
--- a/htdocs/core/modules/member/mod_member_advanced.php
+++ b/htdocs/core/modules/member/mod_member_advanced.php
@@ -79,7 +79,7 @@ class mod_member_advanced extends ModeleNumRefMembers
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Adherent	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/member/mod_member_simple.php b/htdocs/core/modules/member/mod_member_simple.php
index c76d7a38c38..77b1bd8632d 100644
--- a/htdocs/core/modules/member/mod_member_simple.php
+++ b/htdocs/core/modules/member/mod_member_simple.php
@@ -79,7 +79,7 @@ class mod_member_simple extends ModeleNumRefMembers
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Adherent	$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index b04001e84d3..fe2948e1ea5 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2020       Josep Lluís Amador          <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -120,7 +120,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 	 * 	Return next free value
 	 *
 	 *  @param	Product		$objprod    Object product
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Mo			$object		Object we need next value for
 	 *  @return string|0      			Value if OK, 0 if KO
 	 */
 	public function getNextValue($objprod, $object)
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index d1e294fd3d3..191bf3439d6 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,7 +77,7 @@ class mod_mo_standard extends ModeleNumRefMos
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Mo			$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -113,7 +114,7 @@ class mod_mo_standard extends ModeleNumRefMos
 	 * 	Return next free value
 	 *
 	 *  @param	Product		$objprod    Object product
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Mo			$object		Object we need next value for
 	 *  @return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objprod, $object)
diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php
index 82e4098a246..43a33dbba67 100644
--- a/htdocs/core/modules/product_batch/mod_lot_standard.php
+++ b/htdocs/core/modules/product_batch/mod_lot_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2021       Christophe Battarel			<christophe@altairis.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +78,7 @@ class mod_lot_standard extends ModeleNumRefBatch
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Productlot	$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php
index 42986330cf8..474b6531c65 100644
--- a/htdocs/core/modules/product_batch/mod_sn_standard.php
+++ b/htdocs/core/modules/product_batch/mod_sn_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2021       Christophe Battarel			<christophe@altairis.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +78,7 @@ class mod_sn_standard extends ModeleNumRefBatch
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Productlot	$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 69229dcf77f..8dac1238ab2 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2010		Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,7 +86,7 @@ class mod_project_simple extends ModeleNumRefProjects
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Project		$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index e4b280cf226..6ed05b3e728 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2010 Regis Houssin  <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -150,19 +151,4 @@ class mod_project_universal extends ModeleNumRefProjects
 
 		return  $numFinal;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next reference not yet used as a reference
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  Project		$project	Object project
-	 *  @return string|0      			Next not used reference, 0 if KO
-	 */
-	public function project_get_num($objsoc = 0, $project = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $project);
-	}
 }
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index e5a8c1a0d9d..e38d8076604 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,7 +86,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Propal		$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
@@ -167,7 +168,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc      	Object third party
-	 * 	@param	Object		$objforref		Object for number to search
+	 * 	@param	Propal		$objforref		Object for number to search
 	 *  @return string|-1      				Next free value, -1 if KO
 	 */
 	public function getNumRef($objsoc, $objforref)
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 164732886a3..896d8f86fb6 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,7 +62,7 @@ class mod_reception_beryl extends ModelNumRefReception
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Reception	$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
@@ -98,7 +99,7 @@ class mod_reception_beryl extends ModelNumRefReception
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$reception	Reception object
+	 *	@param	Reception	$reception	Reception object
 	 *	@return string|-1      			Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $reception)
@@ -136,18 +137,4 @@ class mod_reception_beryl extends ModelNumRefReception
 		dol_syslog("mod_reception_beryl::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$objforref	Shipment object
-	 *	@return string|-1      			Next free value, -1 if KO
-	 */
-	public function reception_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index 8742dede043..0ccf7ff1328 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018		Quentin Vial-Gouteyron	<quentin.vial-gouteyron@atm-consulting.fr>
- * Copyright (C) 2019		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -98,7 +98,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 	 *	Return next value
 	 *
 	 *	@param	Societe			$objsoc     Third party object
-	 *	@param	Object|null		$reception	Reception object
+	 *	@param	Receptiont|null	$reception	Reception object
 	 *	@return string|0      				Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $reception)
@@ -124,18 +124,4 @@ class mod_reception_moonstone extends ModelNumRefReception
 
 		return  $numFinal;
 	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$objforref	Reception object
-	 *	@return string|0      			Next free value, 0 if KO
-	 */
-	public function reception_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index cd73e6a0473..264ee51741b 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -130,7 +131,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
+	 * @param	Societe		$objsoc		Object thirdparty
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
index 21da56af6bc..5860b120342 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2021 		Gauthier VERDOL 			<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -124,8 +124,8 @@ class mod_stocktransfer_advanced extends ModeleNumRefStockTransfer
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|0      			Value if OK, 0 if KO
+	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @return string|0      				Value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
 	{
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
index c1e16da016b..35e02b76fa4 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,8 +79,8 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
@@ -118,8 +119,8 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|-1      			Value if OK, -1 if KO
+	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @return string|-1     	 			Value if OK, -1 if KO
 	 */
 	public function getNextValue($object)
 	{

From 6f3ba871e0ecc80d243c528c6e4c448ddbdd8825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 18:33:41 +0100
Subject: [PATCH 0924/1862] clean code and phpdoc

---
 .../mod_facture_fournisseur_cactus.php        | 19 +++++++++--------
 .../mod_facture_fournisseur_tulip.php         | 21 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 418db94b07e..95612da93f0 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -91,7 +92,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	/**
 	 * 	Tests if the numbers already in the database do not cause conflicts that would prevent this numbering.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	FactureFournisseur		$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
@@ -173,10 +174,10 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	/**
 	 * Return next value
 	 *
-	 * @param	Societe		$objsoc     Object third party
-	 * @param  	Object		$object		Object invoice
-	 * @param   string		$mode       'next' for next value or 'last' for last value
-	 * @return 	string|-1      			Value if OK, -1 if KO
+	 * @param	Societe				$objsoc     Object third party
+	 * @param  	FactureFournisseur	$object		Object invoice
+	 * @param   string				$mode       'next' for next value or 'last' for last value
+	 * @return 	string|-1      					Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $object, $mode = 'next')
 	{
@@ -256,10 +257,10 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	/**
 	 * Return next free value
 	 *
-	 * @param	Societe		$objsoc     	Object third party
-	 * @param	string		$objforref		Object for number to search
-	 * @param   string		$mode       	'next' for next value or 'last' for last value
-	 * @return  string      				Next free value
+	 * @param	Societe				$objsoc     	Object third party
+	 * @param	FactureFournisseur	$objforref		Object for number to search
+	 * @param   string				$mode      		'next' for next value or 'last' for last value
+	 * @return  string      						Next free value
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index b567b7e5522..39643722cf5 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013-2018	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2016-2021  Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefo
 
 
 /**
-	\class      mod_facture_fournisseur_tulip
-	\brief      Tulip Class of numbering models of suppliers invoices references
+ * \class      mod_facture_fournisseur_tulip
+ * \brief      Tulip Class of numbering models of suppliers invoices references
 */
 class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 {
@@ -146,10 +147,10 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 	/**
 	 * Return next value
 	 *
-	 * @param	Societe		$objsoc     Object third party
-	 * @param  	Object	    $object		Object invoice
-	 * @param	string		$mode       'next' for next value or 'last' for last value
-	 * @return 	string|0      			Value if OK, 0 if KO
+	 * @param	Societe				$objsoc     Object third party
+	 * @param  	FactureFournisseur	$object		Object invoice
+	 * @param	string				$mode       'next' for next value or 'last' for last value
+	 * @return 	string|0      					Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $object, $mode = 'next')
 	{
@@ -185,10 +186,10 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 	/**
 	 * Return next free value
 	 *
-	 *  @param  Societe     $objsoc         Object third party
-	 *  @param  string      $objforref      Object for number to search
-	 *  @param  string      $mode           'next' for next value or 'last' for last value
-	 *  @return string                      Next free value
+	 *  @param  Societe     		$objsoc         Object third party
+	 *  @param  FactureFournisseur  $objforref      Object for number to search
+	 *  @param  string      		$mode           'next' for next value or 'last' for last value
+	 *  @return string                      		Next free value
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{

From 71a65557bb8e81e4c80941a5c90549d49cf7c232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 18:36:05 +0100
Subject: [PATCH 0925/1862] clean code and phpdoc

---
 .../reception/mod_reception_moonstone.php     |  2 +-
 .../mod_commande_fournisseur_muguet.php       | 24 ++++---------------
 .../mod_commande_fournisseur_orchidee.php     | 22 ++++-------------
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index 0ccf7ff1328..9acf2cfd161 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -98,7 +98,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 	 *	Return next value
 	 *
 	 *	@param	Societe			$objsoc     Third party object
-	 *	@param	Receptiont|null	$reception	Reception object
+	 *	@param	Reception|null	$reception	Reception object
 	 *	@return string|0      				Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $reception)
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 35aec96e909..1ff309bdcdf 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,7 +96,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	CommandeFournisseur		$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
@@ -130,9 +131,9 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	/**
 	 * 	Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  Object		$object		Object
-	 *  @return string      			Value if OK, 0 if KO
+	 *  @param	Societe				$objsoc     Object third party
+	 *  @param  CommandeFournisseur	$object		Object
+	 *  @return string      					Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc = 0, $object = '')
 	{
@@ -170,19 +171,4 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Renvoie la reference de commande suivante non utilisee
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  Object	    $object		Object
-	 *  @return string      			Descriptive text
-	 */
-	public function commande_get_num($objsoc = 0, $object = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $object);
-	}
 }
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index a0322ab2956..db138369a53 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -121,9 +122,9 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  Object	    $object		Object
-	 *  @return string|0      			Value if OK, 0 if KO
+	 *  @param	Societe				$objsoc     Object third party
+	 *  @param  CommandeFournisseur	$object		Object
+	 *  @return string|0      					Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc = 0, $object = '')
 	{
@@ -143,19 +144,4 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 
 		return  $numFinal;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Renvoie la reference de commande suivante non utilisee
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  Object	    $object		Object
-	 *  @return string      			Descriptive text
-	 */
-	public function commande_get_num($objsoc = 0, $object = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $object);
-	}
 }

From 50e8c19b7e630a7e8492ea065d31cfa1b948ee62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 18:50:18 +0100
Subject: [PATCH 0926/1862] clean code and phpdoc

---
 .../mod_supplier_payment_brodator.php         | 22 +++-------------
 .../mod_supplier_payment_bronan.php           | 26 +++++--------------
 .../mod_supplier_proposal_marbre.php          | 11 ++++----
 .../takepos/mod_takepos_ref_simple.php        |  5 ++--
 .../takepos/mod_takepos_ref_universal.php     |  3 ++-
 .../core/modules/ticket/mod_ticket_simple.php |  3 ++-
 .../workstation/mod_workstation_advanced.php  |  4 +--
 .../workstation/mod_workstation_standard.php  |  5 ++--
 8 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index b2a26199a32..6790389a328 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,9 +119,9 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|0      			Next value if OK, 0 if KO
+	 *  @param	Societe			$objsoc     Object thirdparty
+	 *  @param  PaiementFourn	$object		Object we need next value for
+	 *  @return string|0      				Next value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $object)
 	{
@@ -140,19 +141,4 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 
 		return  $numFinal;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	public function commande_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 38d41158f04..710369855b8 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -83,8 +84,8 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
-	 *  @return boolean     			false if KO (there is a conflict), true if OK
+	 *	@param	PaiementFourn	$object		Object we need next value for
+	 *  @return boolean     				false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
 	{
@@ -119,9 +120,9 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|-1      			Value if OK, -1 if KO
+	 *  @param	Societe			$objsoc     Object thirdparty
+	 *  @param  PaiementFourn	$object		Object we need next value for
+	 *  @return string|-1      				Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $object)
 	{
@@ -160,19 +161,4 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next free value
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	string		$objforref	Object for number to search
-	 *  @return string      			Next free value
-	 */
-	public function payment_get_num($objsoc, $objforref)
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $objforref);
-	}
 }
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 97a3507ff3b..d1a638345d3 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,8 +86,8 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
-	 *  @return boolean     			false if KO (there is a conflict), true if OK
+	 *	@param	SupplierProposal	$object		Object we need next value for
+	 *  @return boolean     					false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
 	{
@@ -166,9 +167,9 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	/**
 	 *  Return next free value
 	 *
-	 *  @param	Societe		$objsoc      	Object third party
-	 * 	@param	Object		$objforref		Object for number to search
-	 *  @return string      				Next free value
+	 *  @param	Societe				$objsoc     Object third party
+	 * 	@param	SupplierProposal	$objforref	Object for number to search
+	 *  @return string      					Next free value
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index af9b41f3f97..616c43513dd 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2020      Open-DSI	            <support@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,7 +86,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 *  Test if the numbers already in the database do not cause any conflicts that will prevent this
 	 *  of conflicts that will prevent this numbering from working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Facture		$object		Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
@@ -208,7 +209,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 *  Return next free value
 	 *
 	 * @param       Societe     $objsoc         Object third party
-	 * @param       Object      $objforref      Object for number to search
+	 * @param       Facture     $objforref      Object for number to search
 	 * @return      string      Next free value
 	 */
 	public function getNumRef($objsoc, $objforref)
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 35a02f4823c..1c06bfdd16a 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2013      Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2020      Open-DSI	                    <support@open-dsi.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -151,7 +152,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 * Return next free value
 	 *
 	 * @param   Societe     $objsoc         Object third party
-	 * @param   Object      $objforref      Object for number to search
+	 * @param   Facture     $objforref      Object for number to search
 	 * @return  string      Next free value
 	 */
 	public function getNumRef($objsoc, $objforref)
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 943f26c2c50..eca05a8e700 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012   Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010        Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,7 +82,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	Ticket		$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
index 3081519dad1..032083ba641 100644
--- a/htdocs/core/modules/workstation/mod_workstation_advanced.php
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2020 		Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -124,7 +124,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Workstation	$object		Object we need next value for
 	 *  @return string|0      		    Next value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
index bb8938e6440..5d2b3cbde0e 100644
--- a/htdocs/core/modules/workstation/mod_workstation_standard.php
+++ b/htdocs/core/modules/workstation/mod_workstation_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020 	   Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +78,7 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Workstation	$object		Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
@@ -115,7 +116,7 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  Workstation	$object		Object we need next value for
 	 *  @return string|-1      	        Next value if OK, -1 if KO
 	 */
 	public function getNextValue($object)

From 56a4dd46db7d489759af538cd1b301fd51bdc747 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2024 20:41:56 +0100
Subject: [PATCH 0927/1862] Add a log

---
 htdocs/ai/ajax/generate_content.php | 2 +-
 htdocs/ai/class/ai.class.php        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index 9b1adf13b84..f60cef9ee09 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -67,7 +67,7 @@ $function = 'textgeneration';
 $generatedContent = $ai->generateContent($instructions, 'auto', $function);
 
 if (is_array($generatedContent) && $generatedContent['error']) {
-	print "Error : " . $generatedContent['message'];
+	print "Error returned by API call: " . $generatedContent['message'];
 } else {
 	print $generatedContent;
 }
diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 399b3adb1ee..fd1c7ca17c5 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -64,6 +64,10 @@ class Ai
 	 */
 	public function generateContent($instructions, $model = 'auto', $function = 'textgeneration')
 	{
+		if (empty($this->apiKey)) {
+			return array('error' => true, 'message' => 'API key is no defined');
+		}
+
 		if (empty($this->apiEndpoint)) {
 			if ($function == 'textgeneration') {
 				$this->apiEndpoint = 'https://api.openai.com/v1/chat/completions';
@@ -97,6 +101,8 @@ class Ai
 			}
 		}
 
+		dol_syslog("Call API for apiEndpoint=".$this->apiEndpoint." apiKey=".substr($this->apiKey, 0, 3).'***********, model='.$model);
+
 		try {
 			$configurationsJson = getDolGlobalString('AI_CONFIGURATIONS_PROMPT');
 			$configurations = json_decode($configurationsJson, true);

From 325cb587f62d50e255b51336ba8c196de9786b87 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 20:46:21 +0100
Subject: [PATCH 0928/1862] Qual: Exclude some tests from windows-ci until
 fixed

# Qual: Exclude some tests from windows-ci until fixed

Until #28598 and #28264 find some way to the develop branch, this update will
skip the tests that currently fail on windows so that the results of other
tests have an effect on the CI status and github annotations
---
 .github/workflows/windows-ci.yaml | 4 ++--
 test/phpunit/FilesLibTest.php     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index c0e44dbb74f..f8441c438fc 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -114,7 +114,7 @@ jobs:
           curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
         shell: powershell
       - name: Run PHPUnit tests
-        continue-on-error: true
+        # continue-on-error: true
         shell: cmd
         # setting up php.ini, starting the php server are currently in this step
         run: |-
@@ -143,7 +143,7 @@ jobs:
           cat htdocs/conf/conf.php
           curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
           REM 'DOSKEY' USED to recover error code (no pipefile equivalent in windows?)
-          ( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
+          ( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" --exclude-group WindowsWaitingForFix & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
           for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
       - name: Convert Raw Log to Annotations
         uses: mdeweerd/logToCheckStyle@v2024.2.9
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 91cdcc816bd..32616542c2a 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -247,6 +247,7 @@ class FilesLibTest extends CommonClassTest
 	 * testDolCopyMoveDelete
 	 *
 	 * @return	void
+	 * @group WindowsWaitingForFix
 	 */
 	public function testDolCopyMoveDelete()
 	{
@@ -490,6 +491,7 @@ class FilesLibTest extends CommonClassTest
 	 * testDolDirMove
 	 *
 	 * @return void
+	 * @group WindowsWaitingForFix
 	 */
 	public function testDolDirMove()
 	{

From 23ae21958b828c0bfb2564cb33c1a90738002045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 20:57:48 +0100
Subject: [PATCH 0929/1862] clean code and phpdoc

---
 htdocs/core/modules/delivery/mod_delivery_saphir.php            | 1 +
 htdocs/core/modules/facture/mod_facture_mars.php                | 1 +
 htdocs/core/modules/facture/mod_facture_mercure.php             | 1 +
 htdocs/core/modules/facture/mod_facture_terre.php               | 1 +
 htdocs/core/modules/fichinter/mod_arctic.php                    | 1 +
 htdocs/core/modules/fichinter/mod_pacific.php                   | 1 +
 htdocs/core/modules/propale/mod_propale_marbre.php              | 1 +
 .../modules/supplier_invoice/mod_facture_fournisseur_cactus.php | 1 +
 .../modules/supplier_invoice/mod_facture_fournisseur_tulip.php  | 1 +
 .../modules/supplier_proposal/mod_supplier_proposal_marbre.php  | 1 +
 htdocs/core/modules/takepos/mod_takepos_ref_simple.php          | 1 +
 htdocs/core/modules/takepos/mod_takepos_ref_universal.php       | 1 +
 htdocs/fourn/class/fournisseur.facture.class.php                | 2 +-
 13 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index 4d6bdb7c716..b6669961cd0 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -151,6 +151,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	Delivery	$objforref	Object for number to search
 	 *  @return string|0      			Next free value, 0 if KO
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 71f9fb27eec..94c45e0ce37 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -247,6 +247,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 *  @param  Facture     $objforref      Object for number to search
 	 *  @param  string      $mode           'next' for next value or 'last' for last value
 	 *  @return string                      Next free value
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 8d1194b7d4a..1043808be3a 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -182,6 +182,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 	 * @param	Facture		$objforref		Object for number to search
 	 * @param   string		$mode       	'next' for next value or 'last' for last value
 	 * @return  string|0      				Next free value, 0 if KO
+	 * @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index bf116118024..07c6173a17b 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -287,6 +287,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 *  @param  Facture      $objforref      Object for number to search
 	 *  @param   string     $mode           'next' for next value or 'last' for last value
 	 *  @return  string|int<-1,0>           Next free value, -1 or 0 if error
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 54362d39bd4..e8f79c9c084 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -151,6 +151,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param	Fichinter	$objforref	Object for number to search
 	 *  @return string|0      			Next free value, 0 if KO
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index a1f90012125..2e7dfe34792 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -165,6 +165,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	Fichinter	$objforref	Object for number to search
 	 *  @return string      			Next free value
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index e38d8076604..c649f1139cb 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -170,6 +170,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	 *  @param	Societe		$objsoc      	Object third party
 	 * 	@param	Propal		$objforref		Object for number to search
 	 *  @return string|-1      				Next free value, -1 if KO
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 95612da93f0..a3a4c321bf3 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -261,6 +261,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	 * @param	FactureFournisseur	$objforref		Object for number to search
 	 * @param   string				$mode      		'next' for next value or 'last' for last value
 	 * @return  string      						Next free value
+	 * @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 39643722cf5..7fb38484e21 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -190,6 +190,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 	 *  @param  FactureFournisseur  $objforref      Object for number to search
 	 *  @param  string      		$mode           'next' for next value or 'last' for last value
 	 *  @return string                      		Next free value
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index d1a638345d3..71949409f92 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -170,6 +170,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	 *  @param	Societe				$objsoc     Object third party
 	 * 	@param	SupplierProposal	$objforref	Object for number to search
 	 *  @return string      					Next free value
+	 *  @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 616c43513dd..a4757350a57 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -211,6 +211,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 * @param       Societe     $objsoc         Object third party
 	 * @param       Facture     $objforref      Object for number to search
 	 * @return      string      Next free value
+	 * @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 1c06bfdd16a..8eb7c341643 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -154,6 +154,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 * @param   Societe     $objsoc         Object third party
 	 * @param   Facture     $objforref      Object for number to search
 	 * @return  string      Next free value
+	 * @deprecated see getNextValue
 	 */
 	public function getNumRef($objsoc, $objforref)
 	{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index dc1f44735d7..5130c4ad2bd 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2972,7 +2972,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$obj = new $classname();
 		$numref = "";
-		$numref = $obj->getNumRef($soc, $this, $mode);
+		$numref = $obj->getNextValue($soc, $this, $mode);
 
 		if ($numref != "") {
 			return $numref;

From aaf173a0d22266c8b7f0eebe10e0721c3a0b3357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 21:01:20 +0100
Subject: [PATCH 0930/1862] clean code and phpdoc

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

diff --git a/htdocs/core/class/commonnumrefgenerator.class.php b/htdocs/core/class/commonnumrefgenerator.class.php
index c4edb202031..60104d09cd7 100644
--- a/htdocs/core/class/commonnumrefgenerator.class.php
+++ b/htdocs/core/class/commonnumrefgenerator.class.php
@@ -132,7 +132,7 @@ abstract class CommonNumRefGenerator
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Object		$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *	@return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)

From fbcfd89f88e2077cd322cf99d96a64e800d2ac0c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:27:22 +0100
Subject: [PATCH 0931/1862] Fix PHPDoc date_start typo

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f291093d063..3696c997737 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2528,7 +2528,7 @@ class BookKeeping extends CommonObject
 	 * Get list of fiscal period
 	 *
 	 * @param 	string	$filter		Filter
-	 * @return 	array<array{id:int,data_start:string,date_end:string,label:string}>|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
+	 * @return 	array<array{id:int,date_start:string,date_end:string,label:string}>|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
 	 */
 	public function getFiscalPeriods($filter = '')
 	{

From cb35dabd8fe3aec02ac7f739481815a9763a3930 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:39:04 +0100
Subject: [PATCH 0932/1862] Qual: Document sendMail according to code

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index e782e83f662..1e1004a7959 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -274,7 +275,7 @@ class CMailFile
 				// This converts an embed file with src="/viewimage.php?modulepart... into a cid link
 				// TODO Exclude viewimage used for the read tracker ?
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
-				if ($findimg<0) {
+				if ($findimg < 0) {
 					dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
 					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
 					return;
@@ -285,7 +286,7 @@ class CMailFile
 				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
 				// This convert an embedded file with src="data:image... into a cid link + attached file
 				$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
-				if ($resultImageData<0) {
+				if ($resultImageData < 0) {
 					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData");
 					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
 					return;
@@ -388,7 +389,7 @@ class CMailFile
 			$addr_cc = implode(',', $tabcc);
 
 			//Verify for $addr_bcc
-			$replacebcc= false;
+			$replacebcc = false;
 			$tabbcc = explode(',', $addr_bcc);
 			foreach ($tabbcc as $key => $bcc) {
 				if (in_array($bcc, $tabbcc)) {
@@ -730,7 +731,7 @@ class CMailFile
 	/**
 	 * Send mail that was prepared by constructor.
 	 *
-	 * @return    boolean     True if mail sent, false otherwise
+	 * @return    negative-int|bool|string	True if mail sent, false otherwise.  Negative int if error in hook.  String if incorrect send mode.
 	 */
 	public function sendfile()
 	{

From 6e5c4ef851475feb7a882955fefb66aa8f9e9227 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:43:50 +0100
Subject: [PATCH 0933/1862] Fix PHPDoc date_m typo

---
 htdocs/core/db/DoliDB.class.php | 2 +-
 htdocs/core/lib/files.lib.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index b839770410f..73470391fce 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -188,7 +188,7 @@ abstract class DoliDB implements Database
 				dol_syslog("BEGIN Transaction".($textinlog ? ' '.$textinlog : ''), LOG_DEBUG);
 				dol_syslog('', 0, 1);
 			}
-			return $ret;
+			return (int) $ret;
 		} else {
 			$this->transaction_opened++;
 			dol_syslog('', 0, 1);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index d07f1960e15..8623989482c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -256,7 +256,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
  * @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
  * @param	int			$sortorder		Sort order (SORT_ASC, SORT_DESC)
  * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like description
- * @return	array<array{rowid:string,label:string,name:string,path:string,level1name:string,fullname:string,fullpath_orig:string,date_c:string,datem:string,type:string,keywords:string,cover:string,position:int,acl:string,share:string,description:string}> Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
+ * @return	array<array{rowid:string,label:string,name:string,path:string,level1name:string,fullname:string,fullpath_orig:string,date_c:string,date_m:string,type:string,keywords:string,cover:string,position:int,acl:string,share:string,description:string}> Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
  * @see dol_dir_list()
  */
 function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0)

From 85efac2257914c3d5610776ebc655a0812e570de Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:47:38 +0100
Subject: [PATCH 0934/1862] Qual: Update PHPdoc to correspond to code

---
 htdocs/core/menus/standard/empty.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 16809c89405..48e5edc719f 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -78,7 +78,7 @@ class MenuManager
 	 *
 	 *	@param	string	$mode			'top', 'left', 'jmobile'
 	 *  @param	array	$moredata		An array with more data to output
-	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 *  @return int|string				0 or nb of top menu entries if $mode = 'topnb', string inc ase of bad parameter
 	 */
 	public function showmenu($mode, $moredata = null)
 	{

From 4e20c644c227fdd94ae18719a1374dacae70a902 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:51:04 +0100
Subject: [PATCH 0935/1862] Qual: Correct PHPdoc typing

---
 htdocs/core/modules/barcode/modules_barcode.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index f8026af15e1..1a2d056a17c 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -54,7 +55,6 @@ abstract class ModeleBarCode
  */
 abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 {
-
 	// variables inherited from CommonNumRefGenerator
 	public $code_null;
 
@@ -62,9 +62,9 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	Product		$objproduct	Object Product
-	 *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
-	 *  @return string      			Value
+	 *	@param	CommonObject	$objproduct	Object Product, Thirdparty
+	 *	@param	string			$type		Type of barcode (EAN, ISBN, ...)
+	 *  @return string						Value
 	 */
 	public function getNextValue($objproduct, $type = '')
 	{

From ad96de073a66b78a951942e523fd313ea67364d7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:57:50 +0100
Subject: [PATCH 0936/1862] Fix: Correct type of field configuration values

---
 htdocs/ecm/class/ecmfiles.class.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 3aceab4db49..fcf77549177 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -157,26 +157,26 @@ class EcmFiles extends CommonObject
 	public $section_id;
 
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => -1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "contains hash from filename+filepath"),
-		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1', 'comment' => "contains hash of file content"),
-		'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1', 'comment' => "contains hash for file sharing"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => "contains hash from filename+filepath"),
+		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash of file content"),
+		'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash for file sharing"),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1),
-		'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "relative to dolibarr document dir. Example module/def"),
-		'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "file name only without any directory"),
-		'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "Source object type ('proposal', 'invoice', ...)"),
+		'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "relative to dolibarr document dir. Example module/def"),
+		'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "file name only without any directory"),
+		'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "Source object type ('proposal', 'invoice', ...)"),
 		'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"),
-		'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "full path of original filename, when file is uploaded from a local computer"),
+		'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "full path of original filename, when file is uploaded from a local computer"),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110),
-		'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "list of keywords, separated with comma. Must be limited to most important keywords."),
+		'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."),
 		'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment' => "is this file a file to use for a cover"),
 		'position' => array('type' => 'integer', 'label' => 'Position', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"),
-		'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => '1', 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1','comment' => "'generated' or 'uploaded'"),
-		'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => '1', 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1', 'comment' => "for stocking other parameters with json format"),
+		'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "'generated' or 'uploaded'"),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "for stocking other parameters with json format"),
 		'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175),
-		'fk_user_c' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_m' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'fk_user_c' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_m' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 		'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
 		'note_private' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
 		'acl' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160, 'comment' => "for future permission 'per file'"),

From a300206c28e264f0d572bbe4a9d624ebc1422550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 21:59:48 +0100
Subject: [PATCH 0937/1862] clean code and phpdoc

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

diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 1043808be3a..123ced406da 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
- * Copyright (C) 2013		uanjo Menent				<jmenent@2byte.es>
+ * Copyright (C) 2013		Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *

From 7a2045b646434aacb08e5b05e4b3524e68cb4b10 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:02:08 +0100
Subject: [PATCH 0938/1862] Fix PHPdoc for childtables

---
 .../class/emailcollector.class.php            | 93 ++++++++++---------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index bffa405796e..b8323b5d1d2 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -88,7 +89,7 @@ class EmailCollector extends CommonObject
 	public $fk_element = 'fk_emailcollector';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array();
 
@@ -122,37 +123,37 @@ class EmailCollector extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1),
-		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax200'),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector', 'csslist'=>'tdoverflowmax150'),
-		'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1, 'cssview'=>'small', 'csslist'=>'small tdoverflowmax200'),
-		'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com', 'csslist'=>'tdoverflowmax125'),
-		'port'          => array('type'=>'varchar(10)', 'label'=>'EMailHostPort', 'visible'=>1, 'enabled'=>1, 'position'=>91, 'notnull'=>1, 'searchall'=>0, 'comment'=>"IMAP server port", 'help'=>'Example: 993', 'csslist'=>'tdoverflowmax50', 'default'=>'993'),
-		'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)', 'default'=>'UTF-8'),
-		'imap_encryption'  => array('type'=>'varchar(16)', 'label'=>'ImapEncryption', 'visible'=>-1, 'enabled'=>1, 'position'=>93, 'searchall'=>0, 'comment'=>"IMAP encryption", 'help'=>'ImapEncryptionHelp', 'arrayofkeyval'=> array('ssl'=>'SSL', 'tls' => 'TLS', 'notls' => 'NOTLS'), 'default'=>'ssl'),
-		'norsh'  => array('type'=>'integer', 'label'=>'NoRSH', 'visible'=>-1, 'enabled'=>"!getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>94, 'searchall'=>0, 'help'=>'NoRSHHelp', 'arrayofkeyval'=> array(0 =>'No', 1 => 'Yes'), 'default'=> 0),
-		'acces_type'     => array('type'=>'integer', 'label'=>'accessType', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>101, 'notnull'=>1, 'index'=>1, 'comment'=>"IMAP login type", 'arrayofkeyval'=>array('0'=>'loginPassword', '1'=>'oauthToken'), 'default'=>'0', 'help'=>''),
-		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
-		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>"1", 'position'=>103, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
-		'oauth_service' => array('type'=>'varchar(128)', 'label'=>'oauthService', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>104, 'notnull'=>0, 'index'=>1, 'comment'=>"IMAP login oauthService", 'arrayofkeyval'=>array(), 'help'=>'TokenMustHaveBeenCreated'),
-		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>109, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
-		'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
-		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>50),
-		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1, 'csslist'=>'nowraponall'),
-		'codelastresult' => array('type'=>'varchar(16)', 'label'=>'CodeLastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>122, 'notnull'=>-1,),
-		'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1, 'cssview'=>'small', 'csslist'=>'small tdoverflowmax200'),
-		'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1, 'csslist'=>'nowraponall'),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>0, 'enabled'=>1, 'position'=>61, 'notnull'=>-1,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>0, 'enabled'=>1, 'position'=>62, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1,),
+		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => 2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 20),
+		'ref'           => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'help' => 'Example: MyCollector1', 'csslist' => 'tdoverflowmax200'),
+		'label'         => array('type' => 'varchar(255)', 'label' => 'Label', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'notnull' => -1, 'searchall' => 1, 'help' => 'Example: My Email collector', 'csslist' => 'tdoverflowmax150'),
+		'description'   => array('type' => 'text', 'label' => 'Description', 'visible' => -1, 'enabled' => 1, 'position' => 60, 'notnull' => -1, 'cssview' => 'small', 'csslist' => 'small tdoverflowmax200'),
+		'host'          => array('type' => 'varchar(255)', 'label' => 'EMailHost', 'visible' => 1, 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'searchall' => 1, 'comment' => "IMAP server", 'help' => 'Example: imap.gmail.com', 'csslist' => 'tdoverflowmax125'),
+		'port'          => array('type' => 'varchar(10)', 'label' => 'EMailHostPort', 'visible' => 1, 'enabled' => 1, 'position' => 91, 'notnull' => 1, 'searchall' => 0, 'comment' => "IMAP server port", 'help' => 'Example: 993', 'csslist' => 'tdoverflowmax50', 'default' => '993'),
+		'hostcharset'   => array('type' => 'varchar(16)', 'label' => 'HostCharset', 'visible' => -1, 'enabled' => 1, 'position' => 92, 'notnull' => 0, 'searchall' => 0, 'comment' => "IMAP server charset", 'help' => 'Example: "UTF-8" (May be "US-ASCII" with some Office365)', 'default' => 'UTF-8'),
+		'imap_encryption'  => array('type' => 'varchar(16)', 'label' => 'ImapEncryption', 'visible' => -1, 'enabled' => 1, 'position' => 93, 'searchall' => 0, 'comment' => "IMAP encryption", 'help' => 'ImapEncryptionHelp', 'arrayofkeyval' => array('ssl' => 'SSL', 'tls' => 'TLS', 'notls' => 'NOTLS'), 'default' => 'ssl'),
+		'norsh'  => array('type' => 'integer', 'label' => 'NoRSH', 'visible' => -1, 'enabled' => "!getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position' => 94, 'searchall' => 0, 'help' => 'NoRSHHelp', 'arrayofkeyval' => array(0 => 'No', 1 => 'Yes'), 'default' => 0),
+		'acces_type'     => array('type' => 'integer', 'label' => 'accessType', 'visible' => -1, 'enabled' => "getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position' => 101, 'notnull' => 1, 'index' => 1, 'comment' => "IMAP login type", 'arrayofkeyval' => array('0' => 'loginPassword', '1' => 'oauthToken'), 'default' => '0', 'help' => ''),
+		'login'         => array('type' => 'varchar(128)', 'label' => 'Login', 'visible' => -1, 'enabled' => 1, 'position' => 102, 'notnull' => -1, 'index' => 1, 'comment' => "IMAP login", 'help' => 'Example: myaccount@gmail.com'),
+		'password'      => array('type' => 'password', 'label' => 'Password', 'visible' => -1, 'enabled' => "1", 'position' => 103, 'notnull' => -1, 'comment' => "IMAP password", 'help' => 'WithGMailYouCanCreateADedicatedPassword'),
+		'oauth_service' => array('type' => 'varchar(128)', 'label' => 'oauthService', 'visible' => -1, 'enabled' => "getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position' => 104, 'notnull' => 0, 'index' => 1, 'comment' => "IMAP login oauthService", 'arrayofkeyval' => array(), 'help' => 'TokenMustHaveBeenCreated'),
+		'source_directory' => array('type' => 'varchar(255)', 'label' => 'MailboxSourceDirectory', 'visible' => -1, 'enabled' => 1, 'position' => 109, 'notnull' => 1, 'default' => 'Inbox', 'help' => 'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
+		'target_directory' => array('type' => 'varchar(255)', 'label' => 'MailboxTargetDirectory', 'visible' => 1, 'enabled' => 1, 'position' => 110, 'notnull' => 0, 'help' => "EmailCollectorTargetDir"),
+		'maxemailpercollect' => array('type' => 'integer', 'label' => 'MaxEmailCollectPerCollect', 'visible' => -1, 'enabled' => 1, 'position' => 111, 'default' => 50),
+		'datelastresult' => array('type' => 'datetime', 'label' => 'DateLastCollectResult', 'visible' => 1, 'enabled' => '$action != "create" && $action != "edit"', 'position' => 121, 'notnull' => -1, 'csslist' => 'nowraponall'),
+		'codelastresult' => array('type' => 'varchar(16)', 'label' => 'CodeLastResult', 'visible' => 1, 'enabled' => '$action != "create" && $action != "edit"', 'position' => 122, 'notnull' => -1,),
+		'lastresult' => array('type' => 'varchar(255)', 'label' => 'LastResult', 'visible' => 1, 'enabled' => '$action != "create" && $action != "edit"', 'position' => 123, 'notnull' => -1, 'cssview' => 'small', 'csslist' => 'small tdoverflowmax200'),
+		'datelastok' => array('type' => 'datetime', 'label' => 'DateLastcollectResultOk', 'visible' => 1, 'enabled' => '$action != "create"', 'position' => 125, 'notnull' => -1, 'csslist' => 'nowraponall'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'visible' => 0, 'enabled' => 1, 'position' => 61, 'notnull' => -1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'visible' => 0, 'enabled' => 1, 'position' => 62, 'notnull' => -1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'visible' => -2, 'enabled' => 1, 'position' => 501, 'notnull' => 1,),
 		//'date_validation' => array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>510, 'notnull'=>1,),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>511, 'notnull'=>-1,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'visible' => -2, 'enabled' => 1, 'position' => 510, 'notnull' => 1,),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'visible' => -2, 'enabled' => 1, 'position' => 511, 'notnull' => -1,),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Inactive', '1'=>'Active'))
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'visible' => -2, 'enabled' => 1, 'position' => 1000, 'notnull' => -1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Inactive', '1' => 'Active'))
 	);
 
 
@@ -614,7 +615,7 @@ class EmailCollector extends CommonObject
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		$hookmanager->initHooks(array('emailcollectordao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -730,7 +731,7 @@ class EmailCollector extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$this->filters[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'rulevalue'=>$obj->rulevalue, 'status'=>$obj->status);
+				$this->filters[$obj->rowid] = array('id' => $obj->rowid, 'type' => $obj->type, 'rulevalue' => $obj->rulevalue, 'status' => $obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -762,7 +763,7 @@ class EmailCollector extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$this->actions[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'actionparam'=>$obj->actionparam, 'status'=>$obj->status);
+				$this->actions[$obj->rowid] = array('id' => $obj->rowid, 'type' => $obj->type, 'actionparam' => $obj->actionparam, 'status' => $obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
@@ -1673,8 +1674,8 @@ class EmailCollector extends CommonObject
 				} else {
 					$operationslog .= " - ".dol_escape_htmltag((string) $imapemail);
 				}
-				$operationslog .= " - References: ".dol_escape_htmltag($headers['References']??'')." - Subject: ".dol_escape_htmltag($headers['Subject']);
-				dol_syslog("** Process email ".$iforemailloop." References: ".($headers['References']??'')." Subject: ".$headers['Subject']);
+				$operationslog .= " - References: ".dol_escape_htmltag($headers['References'] ?? '')." - Subject: ".dol_escape_htmltag($headers['Subject']);
+				dol_syslog("** Process email ".$iforemailloop." References: ".($headers['References'] ?? '')." Subject: ".$headers['Subject']);
 
 
 				$trackidfoundintorecipienttype = '';
@@ -2678,7 +2679,7 @@ class EmailCollector extends CommonObject
 											}
 											if (!empty($attachments)) {
 												// There is an attachment for the ticket -> store attachment
-												$ticket = New Ticket($this->db);
+												$ticket = new Ticket($this->db);
 												$ticket->fetch($fk_element_id);
 												$destdir = $conf->ticket->dir_output.'/'.$ticket->ref;
 												if (!dol_is_dir($destdir)) {
@@ -3248,23 +3249,23 @@ class EmailCollector extends CommonObject
 							}
 
 							$parameters = array(
-								'connection'=>  $connection,
-								'imapemail'=>$imapemail,
-								'overview'=>$overview,
+								'connection' =>  $connection,
+								'imapemail' => $imapemail,
+								'overview' => $overview,
 
 								'from' => $from,
 								'fromtext' => $fromtext,
 
-								'actionparam'=>  $operation['actionparam'],
+								'actionparam' =>  $operation['actionparam'],
 
 								'thirdpartyid' => $thirdpartyid,
-								'objectid'=> $objectid,
-								'objectemail'=> $objectemail,
+								'objectid' => $objectid,
+								'objectemail' => $objectemail,
 
-								'messagetext'=>$messagetext,
-								'subject'=>$subject,
-								'header'=>$header,
-								'attachments'=>$attachments,
+								'messagetext' => $messagetext,
+								'subject' => $subject,
+								'header' => $header,
+								'attachments' => $attachments,
 							);
 							$reshook = $hookmanager->executeHooks('doCollectImapOneCollector', $parameters, $this, $operation['type']);
 

From fb730e2c5b7498d6f746eca88a1047972929bbea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:05:24 +0100
Subject: [PATCH 0939/1862] Qual: set default value to match PHPdoc type

---
 .../class/expensereport.class.php             | 103 +++++++++---------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 38d86dc15c7..a62d4dc04f2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (c) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -230,49 +231,49 @@ class ExpenseReport extends CommonObject
 	const STATUS_REFUSED = 99;
 
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20),
-		'ref_number_int' =>array('type'=>'integer', 'label'=>'Ref number int', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-		'ref_ext' =>array('type'=>'integer', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'Total ht', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'Total tva', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'date_debut' =>array('type'=>'date', 'label'=>'Date debut', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>60),
-		'date_fin' =>array('type'=>'date', 'label'=>'Date fin', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>65),
-		'date_valid' =>array('type'=>'datetime', 'label'=>'Date valid', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'date_approve' =>array('type'=>'datetime', 'label'=>'Date approve', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'date_refuse' =>array('type'=>'datetime', 'label'=>'Date refuse', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'date_cancel' =>array('type'=>'datetime', 'label'=>'Date cancel', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_user_author' =>array('type'=>'integer', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>100),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'Fk user modif', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'fk_user_valid' =>array('type'=>'integer', 'label'=>'Fk user valid', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'fk_user_validator' =>array('type'=>'integer', 'label'=>'Fk user validator', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'fk_user_approve' =>array('type'=>'integer', 'label'=>'Fk user approve', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		'fk_user_refuse' =>array('type'=>'integer', 'label'=>'Fk user refuse', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'fk_user_cancel' =>array('type'=>'integer', 'label'=>'Fk user cancel', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'fk_c_paiement' =>array('type'=>'integer', 'label'=>'Fk c paiement', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'paid' =>array('type'=>'integer', 'label'=>'Paid', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>145),
-		'note_public' =>array('type'=>'html', 'label'=>'Note public', 'enabled'=>1, 'visible'=>0, 'position'=>150),
-		'note_private' =>array('type'=>'html', 'label'=>'Note private', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'detail_refuse' =>array('type'=>'varchar(255)', 'label'=>'Detail refuse', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
-		'detail_cancel' =>array('type'=>'varchar(255)', 'label'=>'Detail cancel', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'integration_compta' =>array('type'=>'integer', 'label'=>'Integration compta', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_bank_account' =>array('type'=>'integer', 'label'=>'Fk bank account', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency tx', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ht', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total tva', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
-		'date_create' =>array('type'=>'datetime', 'label'=>'Date create', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>300),
-		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>305),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>1000),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'fk_statut' =>array('type'=>'integer', 'label'=>'Fk statut', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
+		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 15),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20),
+		'ref_number_int' => array('type' => 'integer', 'label' => 'Ref number int', 'enabled' => 1, 'visible' => -1, 'position' => 25),
+		'ref_ext' => array('type' => 'integer', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'total_ht' => array('type' => 'double(24,8)', 'label' => 'Total ht', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'total_tva' => array('type' => 'double(24,8)', 'label' => 'Total tva', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'localtax1' => array('type' => 'double(24,8)', 'label' => 'Localtax1', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'localtax2' => array('type' => 'double(24,8)', 'label' => 'Localtax2', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'total_ttc' => array('type' => 'double(24,8)', 'label' => 'Total ttc', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'date_debut' => array('type' => 'date', 'label' => 'Date debut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 60),
+		'date_fin' => array('type' => 'date', 'label' => 'Date fin', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 65),
+		'date_valid' => array('type' => 'datetime', 'label' => 'Date valid', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'date_approve' => array('type' => 'datetime', 'label' => 'Date approve', 'enabled' => 1, 'visible' => -1, 'position' => 80),
+		'date_refuse' => array('type' => 'datetime', 'label' => 'Date refuse', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'date_cancel' => array('type' => 'datetime', 'label' => 'Date cancel', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'fk_user_author' => array('type' => 'integer', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 100),
+		'fk_user_modif' => array('type' => 'integer', 'label' => 'Fk user modif', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'fk_user_valid' => array('type' => 'integer', 'label' => 'Fk user valid', 'enabled' => 1, 'visible' => -1, 'position' => 110),
+		'fk_user_validator' => array('type' => 'integer', 'label' => 'Fk user validator', 'enabled' => 1, 'visible' => -1, 'position' => 115),
+		'fk_user_approve' => array('type' => 'integer', 'label' => 'Fk user approve', 'enabled' => 1, 'visible' => -1, 'position' => 120),
+		'fk_user_refuse' => array('type' => 'integer', 'label' => 'Fk user refuse', 'enabled' => 1, 'visible' => -1, 'position' => 125),
+		'fk_user_cancel' => array('type' => 'integer', 'label' => 'Fk user cancel', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'fk_c_paiement' => array('type' => 'integer', 'label' => 'Fk c paiement', 'enabled' => 1, 'visible' => -1, 'position' => 140),
+		'paid' => array('type' => 'integer', 'label' => 'Paid', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145),
+		'note_public' => array('type' => 'html', 'label' => 'Note public', 'enabled' => 1, 'visible' => 0, 'position' => 150),
+		'note_private' => array('type' => 'html', 'label' => 'Note private', 'enabled' => 1, 'visible' => 0, 'position' => 155),
+		'detail_refuse' => array('type' => 'varchar(255)', 'label' => 'Detail refuse', 'enabled' => 1, 'visible' => -1, 'position' => 160),
+		'detail_cancel' => array('type' => 'varchar(255)', 'label' => 'Detail cancel', 'enabled' => 1, 'visible' => -1, 'position' => 165),
+		'integration_compta' => array('type' => 'integer', 'label' => 'Integration compta', 'enabled' => 1, 'visible' => -1, 'position' => 170),
+		'fk_bank_account' => array('type' => 'integer', 'label' => 'Fk bank account', 'enabled' => 1, 'visible' => -1, 'position' => 175),
+		'fk_multicurrency' => array('type' => 'integer', 'label' => 'Fk multicurrency', 'enabled' => 1, 'visible' => -1, 'position' => 185),
+		'multicurrency_code' => array('type' => 'varchar(255)', 'label' => 'Multicurrency code', 'enabled' => 1, 'visible' => -1, 'position' => 190),
+		'multicurrency_tx' => array('type' => 'double(24,8)', 'label' => 'Multicurrency tx', 'enabled' => 1, 'visible' => -1, 'position' => 195),
+		'multicurrency_total_ht' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total ht', 'enabled' => 1, 'visible' => -1, 'position' => 200),
+		'multicurrency_total_tva' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total tva', 'enabled' => 1, 'visible' => -1, 'position' => 205),
+		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'Multicurrency total ttc', 'enabled' => 1, 'visible' => -1, 'position' => 210),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 220),
+		'date_create' => array('type' => 'datetime', 'label' => 'Date create', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 300),
+		'tms' => array('type' => 'timestamp', 'label' => 'Tms', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 305),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -1, 'position' => 1000),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010),
+		'fk_statut' => array('type' => 'integer', 'label' => 'Fk statut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500),
 	);
 
 	/**
@@ -521,7 +522,7 @@ class ExpenseReport extends CommonObject
 		if (!$error) {
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$objFrom);
+				$parameters = array('objFrom' => $objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -1820,7 +1821,7 @@ class ExpenseReport extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -2294,7 +2295,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function deleteLine($rowid, $fuser = '', $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -2721,10 +2722,10 @@ class ExpenseReport extends CommonObject
 				$sql = " SELECT count(n.qty) as cumul FROM ".MAIN_DB_PREFIX."expensereport_det n";
 				$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."expensereport e ON e.rowid = n.fk_expensereport";
 				$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."c_type_fees tf ON tf.id = n.fk_c_type_fees";
-				$sql.= " WHERE e.fk_user_author = ".(int) $this->fk_user_author;
-				$sql.= " AND YEAR(n.date) = ".(int) $arrayDate['year'];
-				$sql.= " AND tf.code = 'EX_KME' ";
-				$sql.= " AND e.fk_statut = ".(int) ExpenseReport::STATUS_VALIDATED;
+				$sql .= " WHERE e.fk_user_author = ".(int) $this->fk_user_author;
+				$sql .= " AND YEAR(n.date) = ".(int) $arrayDate['year'];
+				$sql .= " AND tf.code = 'EX_KME' ";
+				$sql .= " AND e.fk_statut = ".(int) ExpenseReport::STATUS_VALIDATED;
 
 				$resql = $this->db->query($sql);
 
@@ -2748,7 +2749,7 @@ class ExpenseReport extends CommonObject
 
 				for ($i = 0; $i < $num; $i++) {
 					if ($i < ($num - 1)) {
-						if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i+1]->range_ik) {
+						if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i + 1]->range_ik) {
 							$coef = $ranges[$i]->coef;
 							$offset = $ranges[$i]->ikoffset;
 						}

From 1ea9a7fa4858f50c60d84c834b981a9645591716 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:10:04 +0100
Subject: [PATCH 0940/1862] Qual: set default value to match PHPdoc type

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 407d1c7e0a9..a1be6fa35f8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2021		Josep Lluís Amador		<joseplluis@lliuretic.cat>
  * Copyright (C) 2022		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Solution Libre SAS		<contact@solution-libre.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -396,7 +397,7 @@ class CommandeFournisseur extends CommonOrder
 		'multicurrency_total_ttc' => array('type' => 'double(24,8)', 'label' => 'MulticurrencyAmountTTC', 'enabled' => 'isModEnabled("multicurrency")', 'visible' => -1, 'position' => 240),
 		'date_creation' => array('type' => 'datetime', 'label' => 'Date creation', 'enabled' => 1, 'visible' => -1, 'position' => 500),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => 1, 'notnull' => 1, 'position' => 50),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1000, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1000, 'index' => 1),
 		'tms' => array('type' => 'datetime', 'label' => "DateModificationShort", 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 501),
 		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => 0, 'position' => 700),
 		'fk_statut' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 701),

From 7a7d342aaadb7fd7421c31416bcbfccb42d87da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 22:14:39 +0100
Subject: [PATCH 0941/1862] clean code and phpdoc

---
 dev/tools/phan/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 0bb240128f8..ae33dadbb32 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  */
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
 define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
@@ -535,7 +536,7 @@ return [
 		// 'PhanTypeInvalidThrowsIsInterface',
 		// 'PhanPluginRedundantAssignmentInLoop',
 		// 'PhanInvalidCommentForDeclarationType',
-		//'PhanParamSignatureMismatchInternal',
+		'PhanParamSignatureMismatchInternal',
 		// 'PhanPluginEmptyStatementForeachLoop',
 		// 'PhanCompatibleDimAlternativeSyntax',
 		'PhanInvalidFQSENInClasslike',
@@ -656,5 +657,4 @@ return [
 		'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
 		'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
 	],
-
 ];

From 44376cd066fa459ac68e6d6f400c4b0c45f75093 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:16:27 +0100
Subject: [PATCH 0942/1862] More specific type for childtablesoncascade

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a693c31ff2d..11be8c7e0c0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -781,9 +781,9 @@ abstract class CommonObject
 	protected $childtables = array();
 
 	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
-	 *               If name is like '@ClassName:FilePathClass:ParentFkFieldName', it will
-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
+	 * 					If name is like '@ClassName:FilePathClass:ParentFkFieldName', it will
+	 *					call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object.
 	 */
 	protected $childtablesoncascade = array();
 

From b1b49811611d6e9e9efe63d062fb72b94862632c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:19:49 +0100
Subject: [PATCH 0943/1862] Qual: Fix PHPdoc to match parent

---
 htdocs/salaries/class/salary.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 76a8982062e..0e242e38b39 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -49,9 +50,9 @@ class Salary extends CommonObject
 	public $picto = 'salary';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
-	protected $childtables = array('payment_salary' => array('name'=>'SalaryPayment', 'fk_element'=>'fk_salary'));
+	protected $childtables = array('payment_salary' => array('name' => 'SalaryPayment', 'fk_element' => 'fk_salary'));
 
 	// /**
 	//  * @var array    List of child tables. To know object to delete on cascade.
@@ -572,7 +573,7 @@ class Salary extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('salarypayment'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From e60db40fa4421f59a2da72214c71f38a2604ca51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 22:20:29 +0100
Subject: [PATCH 0944/1862] clean code and phpdoc

---
 dev/tools/phan/config.php       | 3 ++-
 dev/tools/phan/config_fixer.php | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index ae33dadbb32..36aca92b25e 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -536,7 +536,8 @@ return [
 		// 'PhanTypeInvalidThrowsIsInterface',
 		// 'PhanPluginRedundantAssignmentInLoop',
 		// 'PhanInvalidCommentForDeclarationType',
-		'PhanParamSignatureMismatchInternal',
+		// 'PhanParamSignatureMismatchInternal',
+		'PhanParamSignatureMismatch',
 		// 'PhanPluginEmptyStatementForeachLoop',
 		// 'PhanCompatibleDimAlternativeSyntax',
 		'PhanInvalidFQSENInClasslike',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index a588483e3bf..8033331240b 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -1,4 +1,7 @@
 <?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ */
 
 // Uncomment require_once to enable corresponding fixer
 
@@ -7,8 +10,6 @@
 //require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
 require_once __DIR__.'/plugins/SelectDateFixer.php';
 
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- */
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
 define('DOL_DOCUMENT_ROOT', DOL_PROJECT_ROOT.'/htdocs');
 define('PHAN_DIR', __DIR__);

From f4e1026e7d2fa26ae7e6de372db43431dd161099 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:21:08 +0100
Subject: [PATCH 0945/1862] Qual: Fix PHPdoc to match parent

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index a8217136ff6..5f97d8c9a3f 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2020       Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2022       Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2023      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -59,7 +60,7 @@ class Task extends CommonObjectLine
 	public $picto = 'projecttask';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array(
 		'element_time' => array('name' => 'Task', 'parent' => 'projet_task', 'parentkey' => 'fk_element', 'parenttypefield' => 'elementtype', 'parenttypevalue' => 'task')
@@ -881,7 +882,7 @@ class Task extends CommonObjectLine
 			$result .= (($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 		}
 
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 71948cb559c54df3734998c27e409be9007bc50d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:24:04 +0100
Subject: [PATCH 0946/1862] Qual: Fix PHPdoc to match parent

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

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index cb3da2f695a..05a59a22875 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -204,11 +205,11 @@ class Inventory extends CommonObject
 	public $class_element_line = 'Inventoryline';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array();
 	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 */
 	protected $childtablesoncascade = array('inventorydet');
 

From 303d0ef6791b5f490b2e5d6d56749213ef3c0bd8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:25:57 +0100
Subject: [PATCH 0947/1862] Qual: Fix PHPdoc to match parent

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3b31d2064e3..3be66063f6f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2017		Gustavo Novaro
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -76,7 +77,7 @@ class Product extends CommonObject
 	public $oldcopy;
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array(
 		'supplier_proposaldet' => array('name' => 'SupplierProposal', 'parent' => 'supplier_proposal', 'parentkey' => 'fk_supplier_proposal'),
@@ -113,7 +114,7 @@ class Product extends CommonObject
 	public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into images.lib.php
 
 	/**
-	 * @deprecated
+	 * @deprecated  Use $label instead
 	 * @see $label
 	 */
 	public $libelle;

From 03d14dfe56f268566b680dd95f8807d6bc8fa14e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:27:35 +0100
Subject: [PATCH 0948/1862] Qual: set default value to match PHPdoc type

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

diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 335009e0e29..b5a6cc21656 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2018-2019  Thibault Foucart		<support@ptibogxiv.net>
  * Copyright (C) 2021     	Waël Almoman            <info@almoman.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -71,7 +72,7 @@ class PartnershipType extends CommonObject
 
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'code' => array('type' => 'varchar(32)', 'label' => 'Code', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 20),
 		'label' => array('type' => 'varchar(64)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25, 'showoncombobox' => 1),
 		'active' => array('type' => 'integer', 'label' => 'Active', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),

From 7fabf59b46cfc90d9a6b773cafa1ec69b47a7fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 23:13:30 +0100
Subject: [PATCH 0949/1862] clean code and phpdoc

---
 htdocs/comm/remx.php               |  5 +++--
 htdocs/core/lib/usergroups.lib.php | 32 ++++++++++++++----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 994e30fb9f1..f1584aa8b30 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2019 Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019      Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,6 +45,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
 $socid = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('socid');
+/** @var User $user */
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -55,7 +56,7 @@ if ($user->socid > 0) {
 }
 $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
-$permissiontocreate = ($user->rights->societe->creer || $user->rights->facture->creer);
+$permissiontocreate = ($user->hasRight('societe', 'creer') || $user->hasRight('facture', 'creer'));
 
 
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 30db640ed07..87e6e367cb3 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2021-2023  Anthony Berton      <anthony.berton@bb2a.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -237,7 +238,7 @@ function group_prepare_head($object)
 
 	$canreadperms = true;
 	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
-		$canreadperms = ($user->admin || $user->rights->user->group_advance->readperms);
+		$canreadperms = ($user->admin || $user->hasRight('user', 'group_advance', 'readperms'));
 	}
 
 	$h = 0;
@@ -504,17 +505,17 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//Nothing
 	} else {
 		$listofdarkmodes = array(
-			'0' => $langs->trans("AlwaysDisabled"),
-			'1' => $langs->trans("AccordingToBrowser"),
-			'2' => $langs->trans("AlwaysEnabled")
+			$langs->trans("AlwaysDisabled"),
+			$langs->trans("AccordingToBrowser"),
+			$langs->trans("AlwaysEnabled")
 		);
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("DarkThemeMode").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $form->selectarray('THEME_DARKMODEENABLED', $listofdarkmodes, isset($conf->global->THEME_DARKMODEENABLED) ? $conf->global->THEME_DARKMODEENABLED : 0);
+			print $form->selectarray('THEME_DARKMODEENABLED', $listofdarkmodes, getDolGlobalInt('THEME_DARKMODEENABLED'));
 		} else {
-			print $listofdarkmodes[isset($conf->global->THEME_DARKMODEENABLED) ? $conf->global->THEME_DARKMODEENABLED : 0];
+			print $listofdarkmodes[getDolGlobalInt('THEME_DARKMODEENABLED')];
 		}
 		print $form->textwithpicto('', $langs->trans("DoesNotWorkWithAllThemes"));
 		print '</tr>';
@@ -545,11 +546,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '</td>';*/
 	} else {
 		$listoftopmenumodes = array(
-			'0' => $langs->transnoentitiesnoconv("IconAndText"),
-			'1' => $langs->transnoentitiesnoconv("TextOnly"),
-			'2' => $langs->transnoentitiesnoconv("IconOnlyAllTextsOnHover"),
-			'3' => $langs->transnoentitiesnoconv("IconOnlyTextOnHover"),
-			'4' => $langs->transnoentitiesnoconv("IconOnly"),
+			$langs->transnoentitiesnoconv("IconAndText"),
+			$langs->transnoentitiesnoconv("TextOnly"),
+			$langs->transnoentitiesnoconv("IconOnlyAllTextsOnHover"),
+			$langs->transnoentitiesnoconv("IconOnlyTextOnHover"),
+			$langs->transnoentitiesnoconv("IconOnly"),
 		);
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -637,13 +638,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 		print '> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>';
-		if ($edit)
-		{
+		if ($edit) {
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
-		}
-		   else
-		   {
-			   $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,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 '';
 		   }

From 7ad8f6b074180984bbb7685095fc70f7f59a7deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 23:18:01 +0100
Subject: [PATCH 0950/1862] clean code and phpdoc

---
 htdocs/core/lib/functions2.lib.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 1335da5649a..f5e95da450c 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015-2016  Raphaël Doursenaud          <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -892,7 +893,7 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
  * @param   string		$table			Table containing field with counter
  * @param   string		$field			Field containing already used values of counter
  * @param   string		$where			To add a filter on selection (for example to filter on invoice types)
- * @param   Societe		$objsoc			The company that own the object we need a counter for
+ * @param   Societe|string $objsoc		The company that own the object we need a counter for
  * @param   string		$date			Date to use for the {y},{m},{d} tags.
  * @param   string		$mode			'next' for next value or 'last' for last value
  * @param   bool		$bentityon		Activate the entity filter. Default is true (for modules not compatible with multicompany)
@@ -2511,16 +2512,16 @@ function colorLighten($hex, $percent)
 
 
 /**
- * @param string 	$hex 			color in hex
- * @param float 	$alpha 			0 to 1 to add alpha channel
- * @param bool 		$returnArray	true=return an array instead, false=return string
- * @return string|array				String or array
+ * @param string 		$hex 			color in hex
+ * @param float|false	$alpha 			0 to 1 to add alpha channel
+ * @param bool 			$returnArray	true=return an array instead, false=return string
+ * @return string|array					String or array
  */
 function colorHexToRgb($hex, $alpha = false, $returnArray = false)
 {
 	$string = '';
-	$hex      = str_replace('#', '', $hex);
-	$length   = strlen($hex);
+	$hex = str_replace('#', '', $hex);
+	$length = strlen($hex);
 	$rgb = array();
 	$rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0));
 	$rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0));

From b79328f4e613f0f635b5be1d2bec1953aa1c8d37 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:28:39 +0100
Subject: [PATCH 0951/1862] Qual: Fix PHPdoc to match parent

---
 htdocs/core/class/CMailFile.class.php |  2 +-
 htdocs/user/class/usergroup.class.php | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 1e1004a7959..ea236ae12bc 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -731,7 +731,7 @@ class CMailFile
 	/**
 	 * Send mail that was prepared by constructor.
 	 *
-	 * @return    negative-int|bool|string	True if mail sent, false otherwise.  Negative int if error in hook.  String if incorrect send mode.
+	 * @return    int|bool|string	True if mail sent, false otherwise.  Negative int if error in hook.  String if incorrect send mode.
 	 */
 	public function sendfile()
 	{
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 48ec6758351..25a188fa8ee 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI		 <info@inovea-conseil.com>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
  * Copyright (C) 2023-2024  Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -111,13 +112,13 @@ class UserGroup extends CommonObject
 	public $oldcopy; // To contains a clone of this when we need to save old properties of object
 
 	public $fields = array(
-		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
-		'nom'=>array('type'=>'varchar(180)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Group name'),
-		'note' => array('type'=>'html', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>-1, 'searchall'=>1),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>60, 'notnull'=>1,),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>100),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'default' => 1, 'index' => 1, 'position' => 5),
+		'nom' => array('type' => 'varchar(180)', 'label' => 'Name', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'comment' => 'Group name'),
+		'note' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'visible' => 1, 'position' => 20, 'notnull' => -1, 'searchall' => 1),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 50, 'notnull' => 1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'position' => 60, 'notnull' => 1,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'ModelPDF', 'enabled' => 1, 'visible' => 0, 'position' => 100),
 	);
 
 	/**
@@ -126,12 +127,12 @@ class UserGroup extends CommonObject
 	public $fk_element = 'fk_usergroup';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array();
 
 	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 */
 	protected $childtablesoncascade = array('usergroup_rights', 'usergroup_user');
 
@@ -407,7 +408,7 @@ class UserGroup extends CommonObject
 
 			if (!$error) {
 				$langs->load("other");
-				$this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
+				$this->context = array('audit' => $langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
 
 				// Call trigger
 				$result = $this->call_trigger('USERGROUP_MODIFY', $user);
@@ -536,7 +537,7 @@ class UserGroup extends CommonObject
 
 			if (!$error) {
 				$langs->load("other");
-				$this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
+				$this->context = array('audit' => $langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
 
 				// Call trigger
 				$result = $this->call_trigger('USERGROUP_MODIFY', $user);
@@ -860,7 +861,7 @@ class UserGroup extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('groupdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From d9b63894d1b1de5ad636297994956867d72a7fea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:29:48 +0100
Subject: [PATCH 0952/1862] Qual: Fix PHPdoc to match parent

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index eedaa168c37..5258417e0cc 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -83,7 +83,7 @@ class Societe extends CommonObject
 	public $fieldsforcombobox = 'nom,name_alias';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array(
 		'supplier_proposal' => array('name' => 'SupplierProposal'),
@@ -101,7 +101,7 @@ class Societe extends CommonObject
 	);
 
 	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 *               if name like with @ClassName:FilePathClass:ParentFkFieldName' it will call method deleteByParentField (with parentId as parameters) and FieldName to fetch and delete child object
 	 */
 	protected $childtablesoncascade = array(

From 868c52dd1dce31160f39e01244e2d3e0e9affd39 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:32:48 +0100
Subject: [PATCH 0953/1862] Qual: Fix PHPdoc to match parent & default to match
 doc

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 9c1ade49f15..1b92a3a2851 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -221,12 +221,12 @@ class Mo extends CommonObject
 	public $class_element_line = 'MoLine';
 
 	/**
-	 * @var array	List of child tables. To test if we can delete object.
+	 * @var array<string, array<string>>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array();
 
 	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 */
 	protected $childtablesoncascade = array('mrp_production');
 
@@ -2016,8 +2016,8 @@ class MoLine extends CommonObjectLine
 		'fk_product' => array('type' => 'integer', 'label' => 'Product', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
 		'fk_warehouse' => array('type' => 'integer', 'label' => 'Warehouse', 'enabled' => 1, 'visible' => -1, 'position' => 30),
 		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
-		'qty_frozen' => array('type' => 'smallint', 'label' => 'QuantityFrozen', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 105, 'css' => 'maxwidth50imp', 'help' => 'QuantityConsumedInvariable'),
-		'disable_stock_change' => array('type' => 'smallint', 'label' => 'DisableStockChange', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 108, 'css' => 'maxwidth50imp', 'help' => 'DisableStockChangeHelp'),
+		'qty_frozen' => array('type' => 'smallint', 'label' => 'QuantityFrozen', 'enabled' => 1, 'visible' => 1, 'default' => '0', 'position' => 105, 'css' => 'maxwidth50imp', 'help' => 'QuantityConsumedInvariable'),
+		'disable_stock_change' => array('type' => 'smallint', 'label' => 'DisableStockChange', 'enabled' => 1, 'visible' => 1, 'default' => '0', 'position' => 108, 'css' => 'maxwidth50imp', 'help' => 'DisableStockChangeHelp'),
 		'batch' => array('type' => 'varchar(30)', 'label' => 'Batch', 'enabled' => 1, 'visible' => -1, 'position' => 140),
 		'role' => array('type' => 'varchar(10)', 'label' => 'Role', 'enabled' => 1, 'visible' => -1, 'position' => 145),
 		'fk_mrp_production' => array('type' => 'integer', 'label' => 'Fk mrp production', 'enabled' => 1, 'visible' => -1, 'position' => 150),

From c8c003a437e7bbd3311eaab5b8842002ec66571d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 11 Mar 2024 23:46:48 +0100
Subject: [PATCH 0954/1862] restore rule

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 36aca92b25e..53982aaee7f 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -537,7 +537,7 @@ return [
 		// 'PhanPluginRedundantAssignmentInLoop',
 		// 'PhanInvalidCommentForDeclarationType',
 		// 'PhanParamSignatureMismatchInternal',
-		'PhanParamSignatureMismatch',
+		// 'PhanParamSignatureMismatch',
 		// 'PhanPluginEmptyStatementForeachLoop',
 		// 'PhanCompatibleDimAlternativeSyntax',
 		'PhanInvalidFQSENInClasslike',

From 6d92b164f0b14c877bba7bbebc225612ac6cccdc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:35:23 +0100
Subject: [PATCH 0955/1862] Qual: set default value to match PHPdoc type

---
 htdocs/hrm/class/establishment.class.php | 39 ++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 37ab22b84a9..d2faf176a86 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -130,24 +131,24 @@ class Establishment extends CommonObject
 
 
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
-		'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>2, 'position'=>22),
-		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'fk_state' =>array('type'=>'integer', 'label'=>'Fkstate', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'fk_country' =>array('type'=>'integer', 'label'=>'Fkcountry', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'profid1' =>array('type'=>'varchar(20)', 'label'=>'Profid1', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'profid2' =>array('type'=>'varchar(20)', 'label'=>'Profid2', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'profid3' =>array('type'=>'varchar(20)', 'label'=>'Profid3', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkuserauthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_user_mod' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusermod', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
-		'status' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 20),
+		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'showoncombobox' => 2, 'position' => 22),
+		'address' => array('type' => 'varchar(255)', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 25),
+		'zip' => array('type' => 'varchar(25)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 30),
+		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+		'fk_state' => array('type' => 'integer', 'label' => 'Fkstate', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+		'fk_country' => array('type' => 'integer', 'label' => 'Fkcountry', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'profid1' => array('type' => 'varchar(20)', 'label' => 'Profid1', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'profid2' => array('type' => 'varchar(20)', 'label' => 'Profid2', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'profid3' => array('type' => 'varchar(20)', 'label' => 'Profid3', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'phone' => array('type' => 'varchar(20)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkuserauthor', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 70),
+		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusermod', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 80),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 85),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => -1, 'position' => 500),
 	);
 
 
@@ -505,7 +506,7 @@ class Establishment extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('establishmentdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 217e3afda5332f0586ba0b9602cb81fd99007765 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:52:15 +0100
Subject: [PATCH 0956/1862] Qual: set default value to match PHPdoc type

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 451926a030c..f6a1d4f9deb 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2023	Benjamin Falière	<benjamin.faliere@altairis.fr>
  * Copyright (C) 2023	Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -236,7 +237,7 @@ class BOM extends CommonObject
 	// protected $childtables=array();
 
 	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 */
 	protected $childtablesoncascade = array('bom_bomline');
 

From 3c7cbac2400bb010e1b1399ba4beab3ac7f2c9f4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:54:04 +0100
Subject: [PATCH 0957/1862] Qual: set default value to match PHPdoc type

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

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index fcf77549177..69501fda02b 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -161,16 +161,16 @@ class EcmFiles extends CommonObject
 		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => "contains hash from filename+filepath"),
 		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash of file content"),
 		'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash for file sharing"),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1),
 		'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "relative to dolibarr document dir. Example module/def"),
 		'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "file name only without any directory"),
 		'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "Source object type ('proposal', 'invoice', ...)"),
-		'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"),
+		'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"),
 		'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "full path of original filename, when file is uploaded from a local computer"),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110),
 		'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."),
 		'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment' => "is this file a file to use for a cover"),
-		'position' => array('type' => 'integer', 'label' => 'Position', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"),
+		'position' => array('type' => 'integer', 'label' => 'Position', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"),
 		'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "'generated' or 'uploaded'"),
 		'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "for stocking other parameters with json format"),
 		'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),

From 77c10d653ea72bc14859716b3c954f7faf5e6903 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:55:05 +0100
Subject: [PATCH 0958/1862] Qual: set default value to match PHPdoc type

---
 htdocs/fichinter/class/fichinter.class.php | 59 +++++++++++-----------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 0b29b094202..010427ab2a4 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
  * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2023-2024      William Mead         <william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -38,33 +39,33 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 class Fichinter extends CommonObject
 {
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk projet', 'enabled'=>'isModEnabled("project")', 'visible'=>-1, 'position'=>20),
-		'fk_contrat' =>array('type'=>'integer', 'label'=>'Fk contrat', 'enabled'=>'$conf->contrat->enabled', 'visible'=>-1, 'position'=>25),
-		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>30),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
-		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>36),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>40, 'index'=>1),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>45),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'datei' =>array('type'=>'date', 'label'=>'Datei', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>70),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'dateo' =>array('type'=>'date', 'label'=>'Dateo', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'datee' =>array('type'=>'date', 'label'=>'Datee', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'datet' =>array('type'=>'date', 'label'=>'Datet', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'duree' =>array('type'=>'double', 'label'=>'Duree', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'description' =>array('type'=>'html', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'showoncombobox'=>2),
-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
-		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>115),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>120),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>130),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'fk_statut' =>array('type'=>'integer', 'label'=>'Fk statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 15),
+		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Fk projet', 'enabled' => 'isModEnabled("project")', 'visible' => -1, 'position' => 20),
+		'fk_contrat' => array('type' => 'integer', 'label' => 'Fk contrat', 'enabled' => '$conf->contrat->enabled', 'visible' => -1, 'position' => 25),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 30),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 35),
+		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 36),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 40, 'index' => 1),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 45),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+		'datei' => array('type' => 'date', 'label' => 'Datei', 'enabled' => 1, 'visible' => -1, 'position' => 60),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 65),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 70),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 75),
+		'dateo' => array('type' => 'date', 'label' => 'Dateo', 'enabled' => 1, 'visible' => -1, 'position' => 85),
+		'datee' => array('type' => 'date', 'label' => 'Datee', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'datet' => array('type' => 'date', 'label' => 'Datet', 'enabled' => 1, 'visible' => -1, 'position' => 95),
+		'duree' => array('type' => 'double', 'label' => 'Duree', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 105, 'showoncombobox' => 2),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 110),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 115),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 120),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'Last main doc', 'enabled' => 1, 'visible' => -1, 'position' => 125),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 130),
+		'extraparams' => array('type' => 'varchar(255)', 'label' => 'Extraparams', 'enabled' => 1, 'visible' => -1, 'position' => 135),
+		'fk_statut' => array('type' => 'integer', 'label' => 'Fk statut', 'enabled' => 1, 'visible' => -1, 'position' => 500),
 	);
 
 	/**
@@ -945,7 +946,7 @@ class Fichinter extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('interventiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -1326,7 +1327,7 @@ class Fichinter extends CommonObject
 
 			// Hook of thirdparty module
 			if (is_object($hookmanager)) {
-				$parameters = array('objFrom'=>$objFrom);
+				$parameters = array('objFrom' => $objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {

From eefe123dcb4b30fae29a34da77d108922169e454 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 11 Mar 2024 23:42:45 +0100
Subject: [PATCH 0959/1862] fixup! fix phpstan (#28727)

---
 .../barcode/mod_barcode_product_standard.php   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index c2df3f7c3a0..9e830faa4c2 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -157,14 +158,19 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	/**
 	 * Return next value
 	 *
-	 * @param	Product		$objproduct     Object product
-	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
+	 * @param	CommonObject	$objproduct     Object product
+	 * @param	string			$type       	Type of barcode (EAN, ISBN, ...)
 	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
 	 */
 	public function getNextValue($objproduct, $type = '')
 	{
 		global $db, $conf;
 
+		if (!$objproduct instanceof Product) {
+			dol_syslog(get_class($this)."::getNextValue used on incompatible".get_class($objproduct), LOG_ERR);
+			return -1;
+		}
+
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // to be able to call function barcode_gen_ean_sum($ean)
 
@@ -192,19 +198,19 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		$numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now);
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
+		if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
 			$literaltype = '';
 			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
 			switch ($literaltype) {
 				case 'EAN13': //EAN13 rowid = 2
-					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
+					if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
-							$eansum = barcode_gen_ean_sum($ean);
+						$eansum = barcode_gen_ean_sum($ean);
 						$ean .= $eansum; //substitute the las character by the key
 						$numFinal = $ean;
 					}
 					break;
-				// Other barcode cases with key could be written here
+					// Other barcode cases with key could be written here
 				default:
 					break;
 			}

From 8b79cfa0956be7a7de55b42e7983ab5ba47dc2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 00:16:06 +0100
Subject: [PATCH 0960/1862] clean

---
 htdocs/core/modules/barcode/modules_barcode.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index f8026af15e1..ed2326edafb 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -62,11 +62,11 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	Product		$objproduct	Object Product
-	 *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
-	 *  @return string      			Value
+	 *	@param	CommonObject	$objcommon	CommonObject
+	 *	@param	string			$type		Type of barcode (EAN, ISBN, ...)
+	 *  @return string      				Value
 	 */
-	public function getNextValue($objproduct, $type = '')
+	public function getNextValue($objcommon, $type = '')
 	{
 		global $langs;
 		return $langs->trans("Function_getNextValue_InModuleNotWorking");

From 4f64c683ee2525dff91d1099fa2e44f14cfa6eb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 01:55:26 +0100
Subject: [PATCH 0961/1862] Better support for MAIN_OPTIMIZEFORTEXTBROWSER

---
 htdocs/core/class/conf.class.php           | 11 ++++--
 htdocs/core/lib/security2.lib.php          |  2 +-
 htdocs/core/menus/standard/auguria.lib.php |  2 +-
 htdocs/core/menus/standard/eldy.lib.php    |  2 +-
 htdocs/core/menus/standard/empty.php       |  2 +-
 htdocs/core/search_page.php                | 39 ++++++++++++----------
 htdocs/core/tpl/login.tpl.php              |  4 +--
 htdocs/index.php                           |  8 ++---
 htdocs/main.inc.php                        |  9 +++--
 9 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 647354ef247..9f73b069950 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,4 +1,6 @@
 <?php
+use Stripe\OAuthErrorObject;
+
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
@@ -41,9 +43,14 @@ class Conf extends stdClass
 	 */
 	public $db;
 
-	//! To store properties found into database
+	/**
+	 * @var Object To store global setup found into database
+	 */
 	public $global;
-	//! To store browser info (->name, ->os, ->version, ->ua, ->layout, ...)
+
+	/**
+	 * @var Object To store browser info (->name, ->os, ->version, ->ua, ->layout, ...)
+	 */
 	public $browser;
 
 	//! To store some setup of generic modules
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index d08912c169e..33157cde1ce 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -149,7 +149,7 @@ if (!function_exists('dol_loginfunction')) {
 
 		// Title
 		$appli = constant('DOL_APPLICATION_TITLE');
-		$title = $appli.' '.constant('DOL_VERSION');
+		$title = $appli.(getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' '.constant('DOL_VERSION'));
 		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 			$title = getDolGlobalString('MAIN_APPLICATION_TITLE');
 		}
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index d727967222e..8509416d4fc 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -178,7 +178,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	}
 
 	$showmode = 1;
-	if (empty($noout)) {
+	if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		print_start_menu_entry_auguria('', 'class="tmenuend"', $showmode);
 		print_end_menu_entry_auguria($showmode);
 		print_end_menu_array_auguria();
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b5de6584a85..8ef3b8c9b90 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -590,7 +590,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	}
 
 	$showmode = 1;
-	if (empty($noout)) {
+	if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		print_start_menu_entry('', 'class="tmenuend"', $showmode);
 		print_end_menu_entry($showmode);
 		print_end_menu_array();
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 16809c89405..0b925551848 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -139,7 +139,7 @@ class MenuManager
 			}
 
 			$showmode = 1;
-			if (empty($noout)) {
+			if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
 			}
 			if (empty($noout)) {
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index adaa198087d..0f91b78b9ed 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -165,25 +165,28 @@ if (empty($reshook)) {
 
 $searchform .= '<br>';
 
-// Add search on URL
-$ret = '';
-$ret .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" class="searchform nowraponall tagtr">';
-$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
-$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-$ret .= '<input type="hidden" name="action" value="redirect">';
-$ret .= '<div class="tagtd">';
-$ret .= img_picto('', 'url', '', false, 0, 0, '', 'paddingright width20');
-$ret .= '<input type="text" class="flat minwidth200"';
-$ret .= ' style="background-repeat: no-repeat; background-position: 3px;"';
-$ret .= ' placeholder="'.strip_tags($langs->trans("OrPasteAnURL")).'"';
-$ret .= ' name="url" id="url" />';
-$ret .= '<button type="submit" class="button bordertransp" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
-$ret .= '<span class="fa fa-search"></span>';
-$ret .= '</button>';
-$ret .= '</div>';
-$ret .= "</form>\n";
 
-$searchform .= $ret;
+// Add search on URL
+if ($conf->dol_use_jmobile) {
+	$ret = '';
+	$ret .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" class="searchform nowraponall tagtr">';
+	$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
+	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
+	$ret .= '<input type="hidden" name="action" value="redirect">';
+	$ret .= '<div class="tagtd">';
+	$ret .= img_picto('', 'url', '', false, 0, 0, '', 'paddingright width20');
+	$ret .= '<input type="text" class="flat minwidth200"';
+	$ret .= ' style="background-repeat: no-repeat; background-position: 3px;"';
+	$ret .= ' placeholder="'.strip_tags($langs->trans("OrPasteAnURL")).'"';
+	$ret .= ' name="url" id="url" />';
+	$ret .= '<button type="submit" class="button bordertransp" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
+	$ret .= '<span class="fa fa-search"></span>';
+	$ret .= '</button>';
+	$ret .= '</div>';
+	$ret .= "</form>\n";
+
+	$searchform .= $ret;
+}
 
 
 // Show all forms
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 4d5dc2833dc..b2072e48eed 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -402,9 +402,9 @@ if (!empty($_SESSION['dol_loginmesg'])) {
 	$message = $_SESSION['dol_loginmesg'];	// By default this is an error message
 	if (preg_match('/<!-- warning -->/', $message)) {	// if it contains this comment, this is a warning message
 		$message = str_replace('<!-- warning -->', '', $message);
-		print '<div class="warning">';
+		print '<div class="warning" role="alert">';
 	} else {
-		print '<div class="error">';
+		print '<div class="error" role="alert">';
 	}
 	print dol_escape_htmltag($message);
 	print '</div>'; ?>
diff --git a/htdocs/index.php b/htdocs/index.php
index 0cb2d4a260c..6ab07c74f12 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -93,14 +93,14 @@ $resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (select
 print load_fiche_titre('&nbsp;', $resultboxes['selectboxlist'], '', 0, '', 'titleforhome');
 
 if (getDolGlobalString('MAIN_MOTD')) {
-	$conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);
+	$conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', getDolGlobalString('MAIN_MOTD'));
 	if (getDolGlobalString('MAIN_MOTD')) {
 		$substitutionarray = getCommonSubstitutionArray($langs);
 		complete_substitutions_array($substitutionarray, $langs);
 		$texttoshow = make_substitutions(getDolGlobalString('MAIN_MOTD'), $substitutionarray, $langs);
 
 		print "\n<!-- Start of welcome text -->\n";
-		print '<table width="100%" class="notopnoleftnoright"><tr><td>';
+		print '<table class="centpercent notopnoleftnoright"><tr><td>';
 		print dol_htmlentitiesbr($texttoshow);
 		print '</td></tr></table><br>';
 		print "\n<!-- End of welcome text -->\n";
@@ -145,7 +145,7 @@ if (!getDolGlobalString('MAIN_REMOVE_INSTALL_WARNING')) {
 }
 
 /*
- * Dashboard Dolibarr states (statistics)
+ * Dashboard Dolibarr statistics
  * Hidden for external users
  */
 
@@ -156,7 +156,7 @@ $boxstatFromHook = '';
 $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts'));
 
 // Dolibarr Working Board with weather
-if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
+if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD') && getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2) {
 	$showweather = (!getDolGlobalString('MAIN_DISABLE_METEO') || getDolGlobalInt('MAIN_DISABLE_METEO') == 2) ? 1 : 0;
 
 	//Array that contains all WorkboardResponse classes to process them
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bc1a1e25816..b334168357a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -467,7 +467,7 @@ if (GETPOST('theme', 'aZ09')) {
 
 // Set global MAIN_OPTIMIZEFORTEXTBROWSER (must be before login part)
 if (GETPOSTINT('textbrowser') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks')) {   // If we must enable text browser
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 2;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or 'https dolibarr root url')
@@ -2677,6 +2677,11 @@ function top_menu_quickadd()
 {
 	global $conf, $langs;
 
+	// Button disabled on text browser
+	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
+		return '';
+	}
+
 	$html = '';
 
 	// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
@@ -2738,7 +2743,7 @@ function top_menu_quickadd()
  */
 function printDropdownQuickadd()
 {
-	global $conf, $user, $langs, $hookmanager;
+	global $user, $langs, $hookmanager;
 
 	$items = array(
 		'items' => array(

From 56950673b87fb901560219a8fdb6e514d9360672 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 02:41:47 +0100
Subject: [PATCH 0962/1862] Better support for MAIN_OPTIMIZEFORTEXTBROWSER

---
 htdocs/core/class/commonobject.class.php | 6 +++++-
 htdocs/core/class/extrafields.class.php  | 7 +++++--
 htdocs/core/class/html.form.class.php    | 8 ++++----
 htdocs/core/lib/functions.lib.php        | 7 ++++---
 htdocs/user/card.php                     | 7 +++++--
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a693c31ff2d..538d616f155 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8006,7 +8006,11 @@ abstract class CommonObject
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
-			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
+			if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2) {
+				$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
+			} else {
+				$value = yn($value ? 1 : 0);
+			}
 		} elseif ($type == 'mail' || $type == 'email') {
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		} elseif ($type == 'url') {
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f849094195b..9a8e1ea8a0f 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1121,7 +1121,6 @@ class ExtraFields
 				} else {
 					$checked = ' value="1" ';
 				}
-
 				$out = '<input type="checkbox" class="flat valignmiddle'.($morecss ? ' '.$morecss : '').' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 			} else {
 				$out = $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
@@ -1691,7 +1690,11 @@ class ExtraFields
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
-			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
+			if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2) {
+				$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
+			} else {
+				$value = yn($value ? 1 : 0);
+			}
 		} elseif ($type == 'mail') {
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		} elseif ($type == 'ip') {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 51324da5753..014ec5486ae 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9681,8 +9681,8 @@ class Form
 				$stringforfirstkey .= ' CTL +';
 			}
 
-			$previous_ref = $object->ref_previous ? '<a accesskey="p" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_previous) . $moreparam . '"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';
-			$next_ref = $object->ref_next ? '<a accesskey="n" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_next) . $moreparam . '"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';
+			$previous_ref = $object->ref_previous ? '<a accesskey="p" alt="'.dol_escape_htmltag($langs->trans("Previous")).'" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_previous) . $moreparam . '"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';
+			$next_ref = $object->ref_next ? '<a accesskey="n" alt="'.dol_escape_htmltag($langs->trans("Next")).'" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_next) . $moreparam . '"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';
 		}
 
 		//print "xx".$previous_ref."x".$next_ref;
@@ -9696,8 +9696,8 @@ class Form
 		if ($previous_ref || $next_ref || $morehtml) {
 			$ret .= '<div class="pagination paginationref"><ul class="right">';
 		}
-		if ($morehtml) {
-			$ret .= '<li class="noborder litext' . (($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '') . '">' . $morehtml . '</li>';
+		if ($morehtml && getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2) {
+			$ret .= '<!-- morehtml --><li class="noborder litext' . (($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '') . '">' . $morehtml . '</li>';
 		}
 		if ($shownav && ($previous_ref || $next_ref)) {
 			$ret .= '<li class="pagination">' . $previous_ref . '</li>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 67330401c86..8f81da32e56 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2116,9 +2116,10 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 	if (!empty($conf->use_javascript_ajax)) {
 		// Add code to open url using the popup. Add also hidden field to retrieve the returned variables
 		$out .= '<!-- code to open popup and variables to retrieve returned variables -->';
-		$out .= '<div id="idfordialog'.$name.'" class="hidden">div for dialog</div>';
-		$out .= '<div id="varforreturndialogid'.$name.'" class="hidden">div for returned id</div>';
-		$out .= '<div id="varforreturndialoglabel'.$name.'" class="hidden">div for returned label</div>';
+		$out .= '<div id="idfordialog'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for dialog' : '').'</div>';
+		$out .= '<div id="varforreturndialogid'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for returned id' : '').'</div>';
+		$out .= '<div id="varforreturndialoglabel'.$name.'" class="hidden">'.(getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2 ? 'div for returned label' : '').'</div>';
+
 		$out .= '<!-- Add js code to open dialog popup on dialog -->';
 		$out .= '<script nonce="'.getNonce().'" type="text/javascript">
 					jQuery(document).ready(function () {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 9c074307e31..2b68a23c5c5 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1582,8 +1582,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Employee
 			print '<tr><td>'.$langs->trans("Employee").'</td><td>';
-			print '<input type="checkbox" disabled name="employee" value="1"'.($object->employee ? ' checked="checked"' : '').'>';
-			//print yn($object->employee);
+			if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2) {
+				print '<input type="checkbox" disabled name="employee" value="1"'.($object->employee ? ' checked="checked"' : '').'>';
+			} else {
+				print yn($object->employee);
+			}
 			print '</td></tr>'."\n";
 
 			// TODO This is also available into the tab RH

From dcca7cc3f6c05328bed8b9e756b3c47fb433deb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 02:54:05 +0100
Subject: [PATCH 0963/1862] Better support for MAIN_OPTIMIZEFORTEXTBROWSER

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

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

From ebf33c496071b84ac2d56f46f947da5ed76c0dd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 02:58:01 +0100
Subject: [PATCH 0964/1862] Clean code

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 531c089e1f1..3c810864506 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -490,7 +490,7 @@ class Adherent extends CommonObject
 	 */
 	public function makeSubstitution($text)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$birthday = dol_print_date($this->birth, 'day');
 

From b9094fc00af8a8ee6c25568d7dfa8f872708512c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 03:37:21 +0100
Subject: [PATCH 0965/1862] Fix warning

---
 htdocs/modulebuilder/template/myobject_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index d1bde9d79c5..d7983464a8e 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -599,7 +599,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '</td>';
 }
 foreach ($object->fields as $key => $val) {
-	$searchkey = empty($search[$key]) ? '' : $search[$key];
+	//$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -626,7 +626,7 @@ foreach ($object->fields as $key => $val) {
 		} elseif ($key == 'lang') {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 			$formadmin = new FormAdmin($db);
-			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+			print $formadmin->select_language((isset($search[$key]) ? $search[$key] : ''), 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}

From c458a4686257e18fbbf458ed61125e1eb9599f7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 03:46:00 +0100
Subject: [PATCH 0966/1862] Fix warning

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

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index d7983464a8e..87f3e4ed8e4 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -797,7 +797,7 @@ while ($i < $imaxinloop) {
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
 					print ' title="'.dol_escape_htmltag($object->$key).'"';
 				}

From 77afadcc1f8a6fea029ed75df2fbe3a64f2f637a Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Tue, 12 Mar 2024 07:43:16 +0100
Subject: [PATCH 0967/1862] replace OR by AND condition

---
 htdocs/accountancy/bookkeeping/list.php          | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 5d91a0fc334..819d1fe21e8 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -519,7 +519,7 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 					break;
-				} elseif (isset($object->date_validation) || $object->date_validation != '') {
+				} elseif (isset($object->date_validation) && $object->date_validation != '') {
 					setEventMessages($langs->trans("ValidatedRecordWhereFound"), null, 'errors');
 					$error++;
 					break;
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 50f2b308ea3..9d171900005 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -432,7 +432,7 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 					break;
-				} elseif (isset($object->date_validation) || $object->date_validation != '') {
+				} elseif (isset($object->date_validation) && $object->date_validation != '') {
 					setEventMessages($langs->trans("ValidatedRecordWhereFound"), null, 'errors');
 					$error++;
 					break;

From d666a0f35e87b8cd30febc73ed4946b2ca831b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 08:03:41 +0100
Subject: [PATCH 0968/1862] clean

---
 htdocs/core/modules/asset/mod_asset_standard.php | 4 ++--
 htdocs/core/modules/bom/mod_bom_standard.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php
index 1c957de8724..bc0705840d3 100644
--- a/htdocs/core/modules/asset/mod_asset_standard.php
+++ b/htdocs/core/modules/asset/mod_asset_standard.php
@@ -78,8 +78,8 @@ class mod_asset_standard extends ModeleNumRefAsset
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Asset		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index f4ba8293423..1e4c22fb754 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -77,8 +77,8 @@ class mod_bom_standard extends ModeleNumRefBoms
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Bom		$object		Object we need next value for
-	 *  @return boolean     		false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{

From 16f161e263184fb4955787b53016a0d6c1207475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 08:06:42 +0100
Subject: [PATCH 0969/1862] clean

---
 htdocs/core/modules/cheque/mod_chequereceipt_mint.php        | 2 +-
 htdocs/core/modules/commande/mod_commande_marbre.php         | 4 ++--
 htdocs/core/modules/contract/mod_contract_serpis.php         | 4 ++--
 htdocs/core/modules/delivery/mod_delivery_jade.php           | 4 ++--
 htdocs/core/modules/expedition/mod_expedition_safor.php      | 4 ++--
 htdocs/core/modules/expensereport/mod_expensereport_jade.php | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index c42806e603e..8cf6c383e65 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -74,7 +74,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  RemiseCheque	$object	Object we need next value for
+	 *  @param  CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 8583d30d46c..4bd0c9a9c33 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -89,8 +89,8 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Commande	$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index d78c6ebbf89..4c7979728e4 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -76,8 +76,8 @@ class mod_contract_serpis extends ModelNumRefContracts
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *  @param  Contrat		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
index 95e3e0ff18e..df68b875e72 100644
--- a/htdocs/core/modules/delivery/mod_delivery_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -87,8 +87,8 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Delivery	$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index 98f20203fa2..af10ae43e45 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -82,8 +82,8 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *  @param  Expedition	$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index ddac61f46c5..e88aa5f6bf9 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -83,7 +83,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  ExpenseReport	$object		Object we need next value for
+	 *  @param  CommonObject	$object		Object we need next value for
 	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)

From 424eabf9663a1870cef459f51925b68a042fc2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 08:08:44 +0100
Subject: [PATCH 0970/1862] clean

---
 htdocs/core/modules/facture/mod_facture_mars.php    | 4 ++--
 htdocs/core/modules/facture/mod_facture_terre.php   | 4 ++--
 htdocs/core/modules/fichinter/mod_pacific.php       | 4 ++--
 htdocs/core/modules/holiday/mod_holiday_madonna.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 94c45e0ce37..2993ed9f37e 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -97,8 +97,8 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Facture		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 07c6173a17b..f29607e5cd1 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -113,8 +113,8 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Facture		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index 2e7dfe34792..f05a1ec320f 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -83,8 +83,8 @@ class mod_pacific extends ModeleNumRefFicheinter
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Fichinter	$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 636ee4269d3..06e63f42af8 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -77,8 +77,8 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *  @param  Holiday		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{

From ddfd1fbfd400bfcee103e5feb632c78ca5c597bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 08:10:29 +0100
Subject: [PATCH 0971/1862] clean

---
 htdocs/core/modules/takepos/mod_takepos_ref_simple.php       | 4 ++--
 htdocs/core/modules/ticket/mod_ticket_simple.php             | 4 ++--
 htdocs/core/modules/workstation/mod_workstation_standard.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index a4757350a57..1629d0e779d 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -86,8 +86,8 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 *  Test if the numbers already in the database do not cause any conflicts that will prevent this
 	 *  of conflicts that will prevent this numbering from working.
 	 *
-	 *	@param	Facture		$object		Object we need next value for
-	 *  @return boolean     			false if KO (there is a conflict), true if OK
+	 *	@param	CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index eca05a8e700..3d0c057870d 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -82,8 +82,8 @@ class mod_ticket_simple extends ModeleNumRefTicket
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Ticket		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *	@param	CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
index 5d2b3cbde0e..d5d6c40e459 100644
--- a/htdocs/core/modules/workstation/mod_workstation_standard.php
+++ b/htdocs/core/modules/workstation/mod_workstation_standard.php
@@ -78,8 +78,8 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Workstation	$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{

From bb7ecb956f65c27cb4d27c15594410cfa2f34c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 09:24:48 +0100
Subject: [PATCH 0972/1862] clean

---
 .../modules/supplier_payment/mod_supplier_payment_bronan.php  | 2 +-
 .../supplier_proposal/mod_supplier_proposal_marbre.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 710369855b8..dba6eefb6b4 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -84,7 +84,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	PaiementFourn	$object		Object we need next value for
+	 *	@param	CommonObject	$object		Object we need next value for
 	 *  @return boolean     				false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 71949409f92..b71d9581a53 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -86,8 +86,8 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	SupplierProposal	$object		Object we need next value for
-	 *  @return boolean     					false if KO (there is a conflict), true if OK
+	 *	@param	CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
 	{

From 0bcd1035cc13897ac1fe4d9a9d0353fedf145299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 09:29:11 +0100
Subject: [PATCH 0973/1862] clean

---
 .../core/modules/stocktransfer/mod_stocktransfer_standard.php | 2 +-
 .../supplier_invoice/mod_facture_fournisseur_cactus.php       | 4 ++--
 .../supplier_order/mod_commande_fournisseur_muguet.php        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
index 35e02b76fa4..a270b7d8842 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
@@ -79,7 +79,7 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @param  CommonObject	$object		Object we need next value for
 	 *  @return boolean     				false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index a3a4c321bf3..9a197b31aad 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -92,8 +92,8 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	/**
 	 * 	Tests if the numbers already in the database do not cause conflicts that would prevent this numbering.
 	 *
-	 *	@param	FactureFournisseur		$object		Object we need next value for
-	 *  @return boolean     			false if KO (there is a conflict), true if OK
+	 *	@param	CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 1ff309bdcdf..740dbfbfd17 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -96,8 +96,8 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	CommandeFournisseur		$object		Object we need next value for
-	 *  @return boolean     			false if KO (there is a conflict), true if OK
+	 *	@param	CommonObject	$object		Object we need next value for
+	 *  @return boolean     				false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
 	{

From 9b4c8f24454cf5b4f5ce6b66caccbc072c31a1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 09:48:42 +0100
Subject: [PATCH 0974/1862] clean

---
 .../core/modules/barcode/mod_barcode_product_standard.php   | 6 +++---
 .../modules/barcode/mod_barcode_thirdparty_standard.php     | 6 +++---
 htdocs/core/modules/hrm/mod_evaluation_standard.php         | 2 +-
 htdocs/core/modules/member/mod_member_advanced.php          | 2 +-
 htdocs/core/modules/member/mod_member_simple.php            | 2 +-
 htdocs/core/modules/mrp/mod_mo_standard.php                 | 2 +-
 htdocs/core/modules/product_batch/mod_lot_standard.php      | 2 +-
 htdocs/core/modules/product_batch/mod_sn_standard.php       | 2 +-
 htdocs/core/modules/project/mod_project_simple.php          | 2 +-
 htdocs/core/modules/propale/mod_propale_marbre.php          | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 2190150ec62..920c388894d 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -157,9 +157,9 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	/**
 	 * Return next value
 	 *
-	 * @param	Product		$objproduct     Object product
-	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
-	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
+	 * @param	CommonObject	$objproduct     Object product
+	 * @param	string			$type       	Type of barcode (EAN, ISBN, ...)
+	 * @return 	string      					Value if OK, '' if module not configured, <0 if KO
 	 */
 	public function getNextValue($objproduct, $type = '')
 	{
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index 6825c1e53bb..a0e94fd69a1 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -169,9 +169,9 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	/**
 	 * Return next value
 	 *
-	 * @param	Societe		$objthirdparty     Object third-party
-	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
-	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
+	 * @param	CommonObject	$objthirdparty  Object third-party
+	 * @param	string			$type       	Type of barcode (EAN, ISBN, ...)
+	 * @return 	string      					Value if OK, '' if module not configured, <0 if KO
 	 */
 	public function getNextValue($objthirdparty, $type = '')
 	{
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
index 418b7b1e5ba..9a568923e44 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_standard.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php
@@ -78,7 +78,7 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Evaluation	$object		Object we need next value for
+	 *  @param  CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/member/mod_member_advanced.php b/htdocs/core/modules/member/mod_member_advanced.php
index 4ed9bb1740c..0547350208e 100644
--- a/htdocs/core/modules/member/mod_member_advanced.php
+++ b/htdocs/core/modules/member/mod_member_advanced.php
@@ -79,7 +79,7 @@ class mod_member_advanced extends ModeleNumRefMembers
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Adherent	$object		Object we need next value for
+	 *  @param  CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/member/mod_member_simple.php b/htdocs/core/modules/member/mod_member_simple.php
index 77b1bd8632d..9381e030018 100644
--- a/htdocs/core/modules/member/mod_member_simple.php
+++ b/htdocs/core/modules/member/mod_member_simple.php
@@ -79,7 +79,7 @@ class mod_member_simple extends ModeleNumRefMembers
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Adherent	$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 191bf3439d6..333491281cc 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -77,7 +77,7 @@ class mod_mo_standard extends ModeleNumRefMos
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Mo			$object		Object we need next value for
+	 *  @param  CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php
index 43a33dbba67..d3feb2e88c1 100644
--- a/htdocs/core/modules/product_batch/mod_lot_standard.php
+++ b/htdocs/core/modules/product_batch/mod_lot_standard.php
@@ -78,7 +78,7 @@ class mod_lot_standard extends ModeleNumRefBatch
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Productlot	$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php
index 474b6531c65..ae4d4efa965 100644
--- a/htdocs/core/modules/product_batch/mod_sn_standard.php
+++ b/htdocs/core/modules/product_batch/mod_sn_standard.php
@@ -78,7 +78,7 @@ class mod_sn_standard extends ModeleNumRefBatch
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Productlot	$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 8dac1238ab2..a153b3a590d 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -86,7 +86,7 @@ class mod_project_simple extends ModeleNumRefProjects
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Project		$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index c649f1139cb..0da17182404 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -86,7 +86,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *	@param	Propal		$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)

From c8714ea50b0da14d039beeb3b1f9442d5599296e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 09:54:32 +0100
Subject: [PATCH 0975/1862] clean

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

diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 896d8f86fb6..1482d96f935 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -62,7 +62,7 @@ class mod_reception_beryl extends ModelNumRefReception
 	/**
 	 *	Test if existing numbers make problems with numbering
 	 *
-	 *	@param	Reception	$object		Object we need next value for
+	 *	@param	CommonObject	$object	Object we need next value for
 	 *  @return boolean     			false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated($object)

From de4c564c7e2c8267deee01713c49f9737ce76711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 09:56:36 +0100
Subject: [PATCH 0976/1862] clean

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 9f73b069950..a8148548443 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,6 +1,4 @@
 <?php
-use Stripe\OAuthErrorObject;
-
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Xavier Dutoit        <doli@sydesy.com>
  * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>

From 7869c1a3093c9685962b389d77730b0cc6b30574 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 10:01:39 +0100
Subject: [PATCH 0977/1862] AI support both plain text and HTML generation

---
 htdocs/admin/mails.php                    | 10 +++++-----
 htdocs/ai/ajax/generate_content.php       |  5 +++--
 htdocs/ai/class/ai.class.php              | 21 ++++++++++----------
 htdocs/comm/mailing/card.php              |  4 ++--
 htdocs/core/class/html.formmail.class.php | 24 ++++++++++++-----------
 5 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index e224b75a986..1856e89f875 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -273,9 +273,9 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_SMTP_SERVER").show();
                             jQuery("#MAIN_MAIL_SMTP_PORT").show();
                             jQuery("#smtp_server_mess").hide();
-			                			jQuery("#smtp_port_mess").hide();
+			                jQuery("#smtp_port_mess").hide();
                             jQuery(".smtp_method").show();
-														jQuery(".dkim").hide();
+							jQuery(".dkim").hide();
                             jQuery(".smtp_auth_method").show();
 						}
                         if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\')
@@ -302,9 +302,9 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_SMTP_PORT").show();
                             jQuery("#smtp_server_mess").hide();
                             jQuery("#smtp_port_mess").hide();
-														jQuery(".smtp_method").show();
+							jQuery(".smtp_method").show();
                             jQuery(".dkim").show();
-														jQuery(".smtp_auth_method").show();
+							jQuery(".smtp_auth_method").show();
                         }
                     }
 					function change_smtp_auth_method() {
@@ -1109,7 +1109,7 @@ if ($action == 'edit') {
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
 		$formmail->withlayout = 1;
-		$formmail->withaiprompt = 1;
+		$formmail->withaiprompt = ($action == 'testhtml' ? 'html' : 'text');
 		$formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
 		$formmail->withbodyreadonly = 0;
 		$formmail->withcancel = 1;
diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index f60cef9ee09..e06fd133409 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -61,10 +61,11 @@ if (is_null($jsonData)) {
 }
 $ai = new Ai($db);
 
-$instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
 $function = 'textgeneration';
+$instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
+$format = empty($jsonData['instructions']) ? '' : $jsonData['instructions'];
 
-$generatedContent = $ai->generateContent($instructions, 'auto', $function);
+$generatedContent = $ai->generateContent($instructions, 'auto', $function, $format);
 
 if (is_array($generatedContent) && $generatedContent['error']) {
 	print "Error returned by API call: " . $generatedContent['message'];
diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index fd1c7ca17c5..eaeefa0f166 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -1,9 +1,5 @@
 <?php
-/* Copyright (C) 2008-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2016  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2023       Eric Seigne      		<eric.seigne@cap-rel.fr>
+/* Copyright (C) 2024  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
@@ -26,7 +22,6 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
  */
 class Ai
 {
-
 	/**
 	 * @var DoliDB $db Database object
 	 */
@@ -57,12 +52,13 @@ class Ai
 	/**
 	 * Generate response of instructions
 	 *
-	 * @param   string  	$instructions   instruction for generate content
-	 * @param   string  	$model          model name ('gpt-3.5-turbo')
-	 * @param   string  	$function     	code of the feature we want to use ('emailing', 'transcription', 'audiotext', 'imagegeneration', 'translation')
+	 * @param   string  	$instructions   Instruction to generate content
+	 * @param   string  	$model          Model name ('gpt-3.5-turbo', 'gpt-4-turbo', 'dall-e-3', ...)
+	 * @param   string  	$function     	Code of the feature we want to use ('textgeneration', 'transcription', 'audiotext', 'imagegeneration', 'translation')
+	 * @param	string		$format			Format for output ('', 'html', ...)
 	 * @return  mixed   	$response
 	 */
-	public function generateContent($instructions, $model = 'auto', $function = 'textgeneration')
+	public function generateContent($instructions, $model = 'auto', $function = 'textgeneration', $format = '')
 	{
 		if (empty($this->apiKey)) {
 			return array('error' => true, 'message' => 'API key is no defined');
@@ -150,6 +146,11 @@ class Ai
 			// Extraction content
 			$generatedEmailContent = $decodedResponse['choices'][0]['message']['content'];
 
+			// If content is not HTML, we convert it into HTML
+			if (!dol_textishtml($generatedEmailContent)) {
+				$generatedEmailContent = dol_nl2br($generatedEmailContent);
+			}
+
 			return $generatedEmailContent;
 		} catch (Exception $e) {
 			return array('error' => true, 'message' => $e->getMessage());
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e6f33c8e8cd..147415be9fa 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -847,7 +847,7 @@ if ($action == 'create') {
 
 	$formmail = new FormMail($db);
 	$formmail->withfckeditor = 1;
-	$formmail->withaiprompt = 1;
+	$formmail->withaiprompt = 'html';
 	$formmail->withlayout = 1;
 
 	print '<tr class="fieldsforemail"><td></td><td>';
@@ -1252,7 +1252,7 @@ if ($action == 'create') {
 				$formmail->withtopicreadonly = 1;
 				$formmail->withfile = 0;
 				$formmail->withlayout = 0;
-				$formmail->withaiprompt = 0;
+				$formmail->withaiprompt = '';
 				$formmail->withbody = 0;
 				$formmail->withbodyreadonly = 1;
 				$formmail->withcancel = 1;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8c998f0cc50..331b2627316 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -142,12 +142,12 @@ class FormMail extends Form
 	public $withfile;
 
 	/**
-	 * @var int	1=Add a button "Fill with layout"
+	 * @var int		1=Add a button "Fill with layout"
 	 */
 	public $withlayout;
 
 	/**
-	 * @var int	1=Add a button "Fill with AI generation"
+	 * @var string	'text' or 'html' to add a button "Fill with AI generation"
 	 */
 	public $withaiprompt;
 
@@ -1051,7 +1051,7 @@ class FormMail extends Form
 					$out .= $this->getModelEmailTemplate();
 				}
 				if ($this->withaiprompt && isModEnabled('ai')) {
-					$out .= $this->getSectionForAIPrompt();
+					$out .= $this->getSectionForAIPrompt($this->withaiprompt);
 				}
 				$out .= '</td>';
 				$out .= '</tr>';
@@ -1399,7 +1399,7 @@ class FormMail extends Form
 	}
 
 	/**
-	 * get Html For Topic of message
+	 * Return Html section for the Topic of message
 	 *
 	 * @param	array	$arraydefaultmessage		Array with message template content
 	 * @param	string	$helpforsubstitution		Help string for substitution
@@ -1437,11 +1437,12 @@ class FormMail extends Form
 	}
 
 	/**
-	 * Return Html code for AI instruction of message
+	 * Return Html code for AI instruction of message and autofill result
 	 *
-	 * @return 	string      Text for instructions
+	 * @param	string		$format			Format for output ('', 'html', ...)
+	 * @return 	string      				HTML code to ask AI instruction and autofill result
 	 */
-	public function getSectionForAIPrompt()
+	public function getSectionForAIPrompt($format = '')
 	{
 		global $langs;
 
@@ -1455,7 +1456,6 @@ class FormMail extends Form
 		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
 		$out .= "</td></tr>\n";
 
-
 		$out .= "<script type='text/javascript'>
 			$(document).ready(function() {
 				// for keydown
@@ -1468,16 +1468,18 @@ class FormMail extends Form
 
 				$('#generate_button').click(function() {
 					var instructions = $('#ai_instructions').val();
+
 					//editor on readonly
         			if (CKEDITOR.instances.message) {
 						CKEDITOR.instances.message.setReadOnly(1);
 					}
 
 					$.ajax({
-						url: '". DOL_URL_ROOT."/ai/ajax/generate_content.php?token=".newToken()."',
+						url: '". DOL_URL_ROOT."/ai/ajax/generate_content.php?token=".currentToken()."',
 						type: 'POST',
 						contentType: 'application/json',
 						data: JSON.stringify({
+							'format': '".dol_escape_js($format)."',
 							'instructions': instructions,
 						}),
 						success: function(response) {
@@ -1810,7 +1812,7 @@ class FormMail extends Form
 	 */
 	public function setSubstitFromObject($object, $outputlangs)
 	{
-		global $conf, $user, $extrafields;
+		global $extrafields;
 
 		$parameters = array();
 		$tmparray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
@@ -1867,7 +1869,7 @@ class FormMail extends Form
 	 */
 	public static function getAvailableSubstitKey($mode = 'formemail', $object = null)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$tmparray = array();
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines') {

From 7ff68a58195ebaca7be2d23fd0c48741529918a6 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 12 Mar 2024 11:07:18 +0100
Subject: [PATCH 0978/1862] Fix shipping is not a delivery_note (sub module of
 shipping)

---
 htdocs/admin/dict.php                                     | 2 +-
 htdocs/admin/mails_templates.php                          | 2 +-
 htdocs/admin/stock.php                                    | 6 +++---
 htdocs/admin/workflow.php                                 | 6 +++---
 htdocs/comm/action/class/cactioncomm.class.php            | 2 +-
 htdocs/comm/card.php                                      | 6 +++---
 htdocs/comm/propal/card.php                               | 4 ++--
 htdocs/comm/propal/list.php                               | 4 ++--
 htdocs/commande/card.php                                  | 6 +++---
 htdocs/commande/class/commande.class.php                  | 2 +-
 htdocs/commande/list.php                                  | 8 ++++----
 htdocs/commande/list_det.php                              | 8 ++++----
 htdocs/contact/card.php                                   | 6 +++---
 htdocs/core/ajax/selectsearchbox.php                      | 2 +-
 htdocs/core/class/html.form.class.php                     | 4 ++--
 htdocs/core/lib/expedition.lib.php                        | 2 +-
 htdocs/core/lib/functions.lib.php                         | 2 +-
 htdocs/core/lib/order.lib.php                             | 2 +-
 htdocs/core/lib/product.lib.php                           | 2 +-
 htdocs/core/lib/project.lib.php                           | 2 +-
 htdocs/core/lib/propal.lib.php                            | 2 +-
 htdocs/core/menus/standard/eldy.lib.php                   | 6 +++---
 .../project/doc/doc_generic_project_odt.modules.php       | 4 ++--
 .../interface_20_modWorkflow_WorkflowManager.class.php    | 6 +++---
 .../interface_50_modNotification_Notification.class.php   | 2 +-
 htdocs/delivery/card.php                                  | 2 +-
 htdocs/install/upgrade2.php                               | 2 +-
 htdocs/product/class/product.class.php                    | 2 +-
 htdocs/product/stock/product.php                          | 2 +-
 htdocs/product/stock/replenish.php                        | 2 +-
 htdocs/projet/element.php                                 | 4 ++--
 htdocs/societe/admin/societe.php                          | 2 +-
 htdocs/supplier_proposal/card.php                         | 2 +-
 .../webportal/controllers/propallist.controller.class.php | 2 +-
 34 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0ca6a21bfe2..7f2bd04a718 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -507,7 +507,7 @@ $tabcond[14] = (isModEnabled("product") && (isModEnabled('ecotax') || getDolGlob
 $tabcond[15] = true;
 $tabcond[16] = (isModEnabled("societe") && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS'));
 $tabcond[17] = (isModEnabled('deplacement') || isModEnabled('expensereport'));
-$tabcond[18] = isModEnabled("delivery_note") || isModEnabled("reception");
+$tabcond[18] = isModEnabled("shipping") || isModEnabled("reception");
 $tabcond[19] = isModEnabled("societe");
 $tabcond[20] = isModEnabled("supplier_order");
 $tabcond[21] = isModEnabled("propal");
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 830a129b74a..ae1f8bf67d1 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -204,7 +204,7 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 	$elementList['facture_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
 }
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
 }
 if (isModEnabled("reception")) {
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 4c8c5fc51ae..7572ccd69ef 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -270,7 +270,7 @@ print '<!-- STOCK_CALCULATE_ON_SHIPMENT -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipment").'</td>';
 print '<td class="right">';
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT', array(), null, 0, 0, 0, 2, 1, '', '', 'reposition');
 	} else {
@@ -287,7 +287,7 @@ print '<!-- STOCK_CALCULATE_ON_SHIPMENT_CLOSE -->';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipmentOnClosing").'</td>';
 print '<td class="right">';
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE', array(), null, 0, 0, 0, 2, 1, '', '', 'reposition');
 	} else {
@@ -461,7 +461,7 @@ if (isModEnabled('order')) {
 	print "</tr>\n";
 }
 
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
 	print '<td class="right">';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 1628db01977..e06954b0422 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -101,13 +101,13 @@ $workflowcodes = array(
 	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(  // when shipping validated
 		'family'=>'classify_order',
 		'position'=>40,
-		'enabled'=>(isModEnabled("delivery_note") && isModEnabled('order')),
+		'enabled'=>(isModEnabled("shipping") && isModEnabled('order')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed
 		'family'=>'classify_order',
 		'position'=>41,
-		'enabled'=>(isModEnabled("delivery_note") && isModEnabled('order')),
+		'enabled'=>(isModEnabled("shipping") && isModEnabled('order')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
@@ -166,7 +166,7 @@ $workflowcodes = array(
 	'WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE' => array(
 		'family' => 'classify_shipping',
 		'position' => 91,
-		'enabled' => isModEnabled("delivery_note") && isModEnabled("invoice") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0',
+		'enabled' => isModEnabled("shipping") && isModEnabled("invoice") && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0',
 		'picto' => 'shipment'
 	),
 
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index ac9148579b1..bc6f454539a 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -228,7 +228,7 @@ class CActionComm
 						if ($obj->module == 'order_supplier' && ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (!isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')))) {
 							$qualified = 1;
 						}
-						if ($obj->module == 'shipping' && isModEnabled("delivery_note") && $user->hasRight('expedition', 'lire')) {
+						if ($obj->module == 'shipping' && isModEnabled("shipping") && $user->hasRight('expedition', 'lire')) {
 							$qualified = 1;
 						}
 						// For case module = 'myobject@eventorganization'
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 4a20bf2dc9e..796f17e710c 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -52,7 +52,7 @@ if (isModEnabled("propal")) {
 if (isModEnabled('order')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 if (isModEnabled('contract')) {
@@ -74,7 +74,7 @@ if (isModEnabled('contract')) {
 if (isModEnabled('order')) {
 	$langs->load("orders");
 }
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	$langs->load("sendings");
 }
 if (isModEnabled('invoice')) {
@@ -1029,7 +1029,7 @@ if ($object->id > 0) {
 	/*
 	 *   Latest shipments
 	 */
-	if (isModEnabled("delivery_note") && $user->hasRight('expedition', 'lire')) {
+	if (isModEnabled("shipping") && $user->hasRight('expedition', 'lire')) {
 		$sql = 'SELECT e.rowid as id';
 		$sql .= ', e.ref, e.entity';
 		$sql .= ', e.date_creation';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index cb2001fc399..940b686b710 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2004,7 +2004,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Shipping Method
-		if (isModEnabled("delivery_note")) {
+		if (isModEnabled("shipping")) {
 			if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($soc->shipping_method_id)) {
 				$shipping_method_id = $soc->shipping_method_id;
 			}
@@ -2695,7 +2695,7 @@ if ($action == 'create') {
 		print '</tr>';
 
 		// Shipping Method
-		if (isModEnabled("delivery_note")) {
+		if (isModEnabled("shipping")) {
 			print '<tr><td>';
 			print '<table class="nobordernopadding centpercent"><tr><td>';
 			print $langs->trans('SendingMethod');
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e5cb5d58393..c1c27a784fc 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -59,7 +59,7 @@ if (isModEnabled('category')) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	$langs->loadLangs(array('sendings'));
 }
 
@@ -225,7 +225,7 @@ $arrayfields = array(
 	'p.date_livraison' => array('label' => "DeliveryDate", 'checked' => 0),
 	'p.date_signature' => array('label' => "DateSigning", 'checked' => 0),
 	'ava.rowid' => array('label' => "AvailabilityPeriod", 'checked' => 0),
-	'p.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => 0, 'enabled' => isModEnabled("delivery_note")),
+	'p.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => 0, 'enabled' => isModEnabled("shipping")),
 	'p.fk_input_reason' => array('label' => "Origin", 'checked' => 0, 'enabled' => 1),
 	'p.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 0),
 	'p.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 0),
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 11b3f049599..6c407d828bf 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1953,7 +1953,7 @@ if ($action == 'create' && $usercancreate) {
 		}
 
 		// Shipping Method
-		if (isModEnabled('delivery_note')) {
+		if (isModEnabled('shipping')) {
 			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
 			print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
 			$form->selectShippingMethod(((GETPOSTISSET('shipping_method_id') && GETPOSTINT('shipping_method_id') != 0) ? GETPOST('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
@@ -2593,7 +2593,7 @@ if ($action == 'create' && $usercancreate) {
 			print '</td></tr>';
 
 			// Shipping Method
-			if (isModEnabled('delivery_note')) {
+			if (isModEnabled('shipping')) {
 				print '<tr><td>';
 				$editenable = $usercancreate;
 				print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, $editenable);
@@ -2995,7 +2995,7 @@ if ($action == 'create' && $usercancreate) {
 				}*/
 
 				$numshipping = 0;
-				if (isModEnabled('delivery_note')) {
+				if (isModEnabled('shipping')) {
 					$numshipping = $object->countNbOfShipments();
 				}
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d89d3b39dfb..ef283b89c59 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3825,7 +3825,7 @@ class Commande extends CommonOrder
 
 		$result = '';
 
-		if (isModEnabled("delivery_note") && ($option == '1' || $option == '2')) {
+		if (isModEnabled("shipping") && ($option == '1' || $option == '2')) {
 			$url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
 		} else {
 			$url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ac2ac6af639..42d1a4de4dd 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -184,7 +184,7 @@ $arrayfields = array(
 	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55),
 	'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60, 'csslist' => 'nowraponall'),
 	'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65, 'csslist' => 'nowraponall'),
-	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("delivery_note")),
+	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled("shipping")),
 	'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67),
 	'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68),
 	'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69),
@@ -207,7 +207,7 @@ $arrayfields = array(
 	'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130),
 	'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position' => 135, 'searchall' => 1),
 	'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position' => 140),
-	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("delivery_note")), 'position' => 990),
+	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled("shipping")), 'position' => 990),
 	'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995),
 	'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999),
 	'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
@@ -905,7 +905,7 @@ if ($search_billed != '' && $search_billed >= 0) {
 }
 if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
-		if ($search_status == 1 && !isModEnabled('delivery_note')) {
+		if ($search_status == 1 && !isModEnabled('shipping')) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated"
 		} else {
 			$sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled
@@ -1162,7 +1162,7 @@ if ($search_status == -2) {
 	$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
 }
 if ($search_status == -3) {
-	$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('delivery_note') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+	$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('shipping') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 }
 if ($search_status == -4) {
 	$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 0451f7d48fe..c623a7c81c9 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -195,7 +195,7 @@ $arrayfields = array(
 	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 55),
 	'c.date_commande' => array('label' => "OrderDateShort", 'checked' => 1, 'position' => 60),
 	'c.date_delivery' => array('label' => "DateDeliveryPlanned", 'checked' => 1, 'enabled' => !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65),
-	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled('delivery_note')),
+	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => -1, 'position' => 66 , 'enabled' => isModEnabled('shipping')),
 	'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => -1, 'position' => 67),
 	'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => -1, 'position' => 68),
 	'c.fk_input_reason' => array('label' => "Channel", 'checked' => -1, 'position' => 69),
@@ -219,7 +219,7 @@ $arrayfields = array(
 	'c.date_cloture' => array('label' => "DateClosing", 'checked' => 0, 'position' => 130),
 	'c.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'enabled' => (!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position' => 135),
 	'c.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'enabled' => (!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position' => 140),
-	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled('delivery_note')), 'position' => 990),
+	'shippable' => array('label' => "Shippable", 'checked' => 1,'enabled' => (isModEnabled('shipping')), 'position' => 990),
 	'c.facture' => array('label' => "Billed", 'checked' => 1, 'enabled' => (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995),
 	'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 999),
 	'c.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
@@ -470,7 +470,7 @@ if ($search_billed != '' && $search_billed >= 0) {
 }
 if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
-		if ($search_status == 1 && !isModEnabled('delivery_note')) {
+		if ($search_status == 1 && !isModEnabled('shipping')) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status "sent" into "validated"
 		} else {
 			$sql .= ' AND c.fk_statut = '.((int) $search_status); // draft, validated, in process or canceled
@@ -685,7 +685,7 @@ if ($resql) {
 		$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
 	}
 	if ($search_status == -3) {
-		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('delivery_note') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(!isModEnabled('shipping') ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 	}
 	if ($search_status == -4) {
 		$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 0cf70884978..a7b38cc85c7 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1462,16 +1462,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
-		if (isModEnabled('order') || isModEnabled("delivery_note")) {
+		if (isModEnabled('order') || isModEnabled("shipping")) {
 			print '<tr><td class="titlefield tdoverflow">';
-			if (isModEnabled("delivery_note")) {
+			if (isModEnabled("shipping")) {
 				print $langs->trans("ContactForOrdersOrShipments");
 			} else {
 				print $langs->trans("ContactForOrders");
 			}
 			print '</td><td>';
 			$none = $langs->trans("NoContactForAnyOrder");
-			if (isModEnabled("delivery_note")) {
+			if (isModEnabled("shipping")) {
 				$none = $langs->trans("NoContactForAnyOrderOrShipments");
 			}
 			print $object->ref_commande ? $object->ref_commande : $none;
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 00a86ccd9a9..f1d63188307 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -106,7 +106,7 @@ if (isModEnabled('propal') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_PROP
 if (isModEnabled('order') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED') && $user->hasRight('commande', 'lire')) {
 	$arrayresult['searchintoorder'] = array('position' => 70, 'img' => 'object_order', 'label' => $langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text' => img_picto('', 'object_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url' => DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) {
+if (isModEnabled('shipping') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) {
 	$arrayresult['searchintoshipment'] = array('position' => 80, 'img' => 'object_shipment', 'label' => $langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text' => img_picto('', 'object_shipment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url' => DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (isModEnabled('invoice') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 014ec5486ae..35f3d9c3e01 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9181,7 +9181,7 @@ class Form
 					}
 				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') {
 					$tplpath = 'expedition';
-					if (!isModEnabled('delivery_note')) {
+					if (!isModEnabled('shipping')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'reception') {
@@ -9298,7 +9298,7 @@ class Form
 					'label' => 'LinkToProposal',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('propal') . ')'),
 				'shipping' => array(
-					'enabled' => isModEnabled('delivery_note'),
+					'enabled' => isModEnabled('shipping'),
 					'perms' => 1,
 					'label' => 'LinkToExpedition',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('shipping') . ')'),
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index 78975768664..7f89ca4e51a 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -35,7 +35,7 @@
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (isModEnabled("delivery_note")) {
+	if (isModEnabled("shipping")) {
 		$langs->load("sendings");
 	}
 	$langs->load("orders");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7f6d39d0e29..546ab720452 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8455,7 +8455,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = 'Direct download url of a contract';
 			$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = 'Direct download url of a supplier proposal';
 
-			if (isModEnabled("delivery_note") && (!is_object($object) || $object->element == 'shipping')) {
+			if (isModEnabled("shipping") && (!is_object($object) || $object->element == 'shipping')) {
 				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 				$substitutionarray['__SHIPPINGMETHOD__'] = 'Shipping method';
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index cb3f380fca3..8516b3a488f 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -34,7 +34,7 @@
 function commande_prepare_head(Commande $object)
 {
 	global $db, $langs, $conf, $user;
-	if (isModEnabled("delivery_note")) {
+	if (isModEnabled("shipping")) {
 		$langs->load("sendings");
 	}
 	$langs->load("orders");
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 976e6c4cf15..b7cb8f7e2fc 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -679,7 +679,7 @@ function show_stats_for_batch($batch, $socid)
 	print '</tr>';
 
 	// Expeditions
-	if (isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')) {
+	if (isModEnabled('shipping') && $user->hasRight('expedition', 'lire')) {
 		$nblines++;
 		$ret = $batch->loadStatsExpedition($socid);
 		if ($ret < 0) {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index e58bd5e34bf..f2cc29f4b74 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -167,7 +167,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled('intervention')) {
 				$nbElements += $project->getElementCount('intervention', 'fichinter');
 			}
-			if (isModEnabled("delivery_note")) {
+			if (isModEnabled("shipping")) {
 				$nbElements += $project->getElementCount('shipping', 'expedition');
 			}
 			if (isModEnabled('mrp')) {
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index dceaf0bc8a3..91c53523965 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -42,7 +42,7 @@ function propal_prepare_head($object)
 	$head[$h][2] = 'comm';
 	$h++;
 
-	if ((empty($conf->commande->enabled) && ((isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))
+	if ((empty($conf->commande->enabled) && ((isModEnabled("shipping") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))
 		|| (isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) {
 		$langs->load("sendings");
 		$text = '';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8ef3b8c9b90..a18a773f390 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -151,7 +151,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Products-Services
 	$tmpentry = array(
-		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('delivery_note')),
+		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('shipping')),
 		'perms'=> ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
 		'module'=>'product|service'
 	);
@@ -1371,7 +1371,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande', 'lire'));
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->hasRight('commande', 'lire'));
-				if (isModEnabled('delivery_note')) {
+				if (isModEnabled('shipping')) {
 					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->hasRight('commande', 'lire'));
 				}
 				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande', 'lire'));
@@ -2157,7 +2157,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 		}
 
 		// Shipments
-		if (isModEnabled('delivery_note')) {
+		if (isModEnabled('shipping')) {
 			$langs->load("sendings");
 			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition', 'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition', 'creer'));
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 6317eabeef8..79b7945c13e 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -69,7 +69,7 @@ if (isModEnabled('deplacement')) {
 if (isModEnabled('agenda')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 }
-if (isModEnabled('delivery_note')) {
+if (isModEnabled('shipping')) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 
@@ -992,7 +992,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'class' => 'Expedition',
 						'table' => 'expedition',
 						'disableamount' => 1,
-						'test' => isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')
+						'test' => isModEnabled('shipping') && $user->hasRight('expedition', 'lire')
 					),
 					'trip' => array(
 						'title' => "ListTripAssociatedProject",
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 0de09d491f0..ea792005846 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -189,7 +189,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 
 			// Set shipment to "Closed" if WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE is set (deprecated, has been replaced with WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE instead))
-			if (isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) {
+			if (isModEnabled("shipping") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) {
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -210,7 +210,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 
-			if (isModEnabled("delivery_note") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) {
+			if (isModEnabled("shipping") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) {
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -360,7 +360,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if (($action == 'SHIPPING_VALIDATE') || ($action == 'SHIPPING_CLOSED')) {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (isModEnabled('order') && isModEnabled("delivery_note") && !empty($conf->workflow->enabled) &&
+			if (isModEnabled('order') && isModEnabled("shipping") && !empty($conf->workflow->enabled) &&
 				(
 					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING') && ($action == 'SHIPPING_VALIDATE')) ||
 					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED') && ($action == 'SHIPPING_CLOSED'))
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index a056d47b48d..a66659f0e90 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -155,7 +155,7 @@ class InterfaceNotification extends DolibarrTriggers
 						$qualified = 0;
 					} elseif ($element == 'withdraw' && !isModEnabled('prelevement')) {
 						$qualified = 0;
-					} elseif ($element == 'shipping' && !isModEnabled('delivery_note')) {
+					} elseif ($element == 'shipping' && !isModEnabled('shipping')) {
 						$qualified = 0;
 					} elseif ($element == 'member' && !isModEnabled('member')) {
 						$qualified = 0;
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 7ee3fd7ea4b..acf107b994a 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (isModEnabled("product") || isModEnabled("service")) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
-if (isModEnabled('delivery_note')) {
+if (isModEnabled('shipping')) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 if (isModEnabled('stock')) {
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 536d9d7bee5..931d2f5e44e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -2008,7 +2008,7 @@ function migrate_modeles($db, $langs, $conf)
 		}
 	}
 
-	if (isModEnabled("delivery_note")) {
+	if (isModEnabled("shipping")) {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 		$modellist = ModelePdfExpedition::liste_modeles($db);
 		if (count($modellist) == 0) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3b31d2064e3..774f8255e2f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5890,7 +5890,7 @@ class Product extends CommonObject
 			}
 			$stock_commande_client = $this->stats_commande['qty'];
 		}
-		if (isModEnabled("delivery_note")) {
+		if (isModEnabled("shipping")) {
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 			$filterShipmentStatus = '';
 			if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 456460e2b21..1a33d36a1f5 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -796,7 +796,7 @@ if ($id > 0 || $ref) {
 			}
 
 			// Number of product from sales order already sent (partial shipping)
-			if (isModEnabled("delivery_note")) {
+			if (isModEnabled("shipping")) {
 				require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 				$filterShipmentStatus = '';
 				if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index ee51a45c4d5..c1fcd48ca6c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -425,7 +425,7 @@ if ($usevirtualstock) {
 		$sqlCommandesCli = '0';
 	}
 
-	if (isModEnabled("delivery_note")) {
+	if (isModEnabled("shipping")) {
 		$sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,";
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 310ecd4704e..68e57451ca3 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -59,7 +59,7 @@ if (isModEnabled('deplacement')) {
 if (isModEnabled('don')) {
 	require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 }
-if (isModEnabled('delivery_note')) {
+if (isModEnabled('shipping')) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
 if (isModEnabled('expensereport')) {
@@ -515,7 +515,7 @@ $listofreferent = array(
 		'lang'=>'sendings',
 		'buttonnew'=>'CreateShipment',
 		'testnew'=>0,
-		'test'=>isModEnabled('delivery_note') && $user->hasRight('expedition', 'lire')
+		'test'=>isModEnabled('shipping') && $user->hasRight('expedition', 'lire')
 	),
 	'mrp'=>array(
 		'name'=>"MO",
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index acfd93d1740..9821a24974b 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -877,7 +877,7 @@ if (getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
 print '</a></td>';
 print '</tr>';
 
-if (isModEnabled("delivery_note")) {
+if (isModEnabled("shipping")) {
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
 		print '<tr class="oddeven">';
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 78551cdb6e4..c1001889fcc 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1328,7 +1328,7 @@ if ($action == 'create') {
 		}
 
 		// Shipping Method
-		if (isModEnabled("delivery_note")) {
+		if (isModEnabled("shipping")) {
 			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
 			$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOSTINT('shipping_method_id') : "", 'shipping_method_id', '', 1);
diff --git a/htdocs/webportal/controllers/propallist.controller.class.php b/htdocs/webportal/controllers/propallist.controller.class.php
index 5c6ca9668db..4eb947582c1 100644
--- a/htdocs/webportal/controllers/propallist.controller.class.php
+++ b/htdocs/webportal/controllers/propallist.controller.class.php
@@ -64,7 +64,7 @@ class PropalListController extends Controller
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
-		if (isModEnabled('delivery_note')) {
+		if (isModEnabled('shipping')) {
 			$langs->loadLangs(array('sendings'));
 		}
 

From 75e99a6dee6115421b13c6367a0f847a489cef4b Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 12 Mar 2024 11:21:42 +0100
Subject: [PATCH 0979/1862] Fix phan tool for shipping

---
 dev/tools/phan/config.php                            | 4 ++--
 dev/tools/phan/config_extended.php                   | 4 ++--
 dev/tools/phan/config_fixer.php                      | 2 +-
 dev/tools/phan/plugins/DeprecatedModuleNameFixer.php | 2 +-
 test/phpunit/CommonClassTest.class.php               | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 0bb240128f8..c82acbd9439 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -54,7 +54,7 @@ $DEPRECATED_MODULE_MAPPING = array(
 	'commande' => 'order',
 	'contrat' => 'contract',
 	'entrepot' => 'stock',
-	'expedition' => 'delivery_note',
+	'expedition' => 'shipping',
 	'facture' => 'invoice',
 	'ficheinter' => 'intervention',
 	'product_fournisseur_price' => 'productsupplierprice',
@@ -93,7 +93,7 @@ $VALID_MODULE_MAPPING = array(
 	'datapolicy' => 'DataPolicy',
 	'dav' => 'Dav',
 	'debugbar' => 'DebugBar',
-	'delivery_note' => 'Expedition',
+	'shipping' => 'Expedition',
 	'deplacement' => 'Deplacement',
 	"documentgeneration" => 'DocumentGeneration',
 	'don' => 'Don',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 7db2b587708..b9e92619b06 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -54,7 +54,7 @@ $DEPRECATED_MODULE_MAPPING = array(
 	'commande' => 'order',
 	'contrat' => 'contract',
 	'entrepot' => 'stock',
-	'expedition' => 'delivery_note',
+	'expedition' => 'shipping',
 	'facture' => 'invoice',
 	'ficheinter' => 'intervention',
 	'product_fournisseur_price' => 'productsupplierprice',
@@ -93,7 +93,7 @@ $VALID_MODULE_MAPPING = array(
 	'datapolicy' => 'DataPolicy',
 	'dav' => 'Dav',
 	'debugbar' => 'DebugBar',
-	'delivery_note' => 'Expedition',
+	'shipping' => 'Expedition',
 	'deplacement' => 'Deplacement',
 	"documentgeneration" => 'DocumentGeneration',
 	'don' => 'Don',
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index a588483e3bf..79368226de8 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -22,7 +22,7 @@ $DEPRECATED_MODULE_MAPPING = array(
 	'commande' => 'order',
 	'contrat' => 'contract',
 	'entrepot' => 'stock',
-	'expedition' => 'delivery_note',
+	'expedition' => 'shipping',
 	'facture' => 'invoice',
 	'ficheinter' => 'intervention',
 	'product_fournisseur_price' => 'productsupplierprice',
diff --git a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
index d8cfcfb141a..cf8a9bc7c62 100644
--- a/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
+++ b/dev/tools/phan/plugins/DeprecatedModuleNameFixer.php
@@ -36,7 +36,7 @@ call_user_func(static function (): void {
 		'commande' => 'order',
 		'contrat' => 'contract',
 		'entrepot' => 'stock',
-		'expedition' => 'delivery_note',
+		'expedition' => 'shipping',
 		'facture' => 'invoice',
 		'ficheinter' => 'intervention',
 		'product_fournisseur_price' => 'productsupplierprice',
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 701dccc6e63..399f972863c 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -247,7 +247,7 @@ abstract class CommonClassTest extends TestCase
 		'commande' => 'order',
 		'contrat' => 'contract',
 		'entrepot' => 'stock',
-		'expedition' => 'delivery_note',
+		'expedition' => 'shipping',
 		'facture' => 'invoice',
 		'fichinter' => 'intervention',
 		'product_fournisseur_price' => 'productsupplierprice',
@@ -296,7 +296,7 @@ abstract class CommonClassTest extends TestCase
 		'datapolicy' => 'DataPolicy',
 		'dav' => 'Dav',
 		'debugbar' => 'DebugBar',
-		'delivery_note' => 'Expedition',
+		'shipping' => 'Expedition',
 		'deplacement' => 'Deplacement',
 		"documentgeneration" => 'DocumentGeneration',  // TODO: fill in proper name
 		'don' => 'Don',

From ba1ca6dc7d987d1a8a73578c1e021df8fd6ebd21 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 12 Mar 2024 11:46:12 +0100
Subject: [PATCH 0980/1862] module delivery_note not exist (no own module
 descriptor) is global MAIN_SUBMODULE_DELIVERY

---
 htdocs/admin/delivery.php                | 2 +-
 htdocs/commande/card.php                 | 2 +-
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/core/class/html.form.class.php    | 4 ++--
 htdocs/core/lib/propal.lib.php           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 0e6339c36f8..123126c693e 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -58,7 +58,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 
 // Shipment note
-if (isModEnabled('delivery_note') && !getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {
+if (isModEnabled('shipping') && !getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {
 	// This option should always be set to on when module is on.
 	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);
 }
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6c407d828bf..61dd58436d2 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -3002,7 +3002,7 @@ if ($action == 'create' && $usercancreate) {
 				// Create shipment
 				if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 					if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'creer')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer'))) {
-						$arrayforbutaction[] = array('lang' => 'sendings', 'enabled' => (isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm' => $user->hasRight('expedition', 'creer'), 'label' => 'CreateShipment', 'url' => '/expedition/shipment.php?id='.$object->id);
+						$arrayforbutaction[] = array('lang' => 'sendings', 'enabled' => (isModEnabled("shipping") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm' => $user->hasRight('expedition', 'creer'), 'label' => 'CreateShipment', 'url' => '/expedition/shipment.php?id='.$object->id);
 						/*
 						if ($user->hasRight('expedition', 'creer')) {
 						print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 538d616f155..c0439e3193e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4224,7 +4224,7 @@ abstract class CommonObject
 					} elseif ($objecttype == 'delivery') {
 						$classpath = 'delivery/class';
 						$subelement = 'delivery';
-						$module = 'delivery_note';
+						$module = 'shipping';
 					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class';
 						$module = 'fournisseur';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 35f3d9c3e01..2b4be14b443 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9191,8 +9191,8 @@ class Form
 					}
 				} elseif ($objecttype == 'delivery') {
 					$tplpath = 'delivery';
-					if (!isModEnabled('delivery_note')) {
-						continue; // Do not show if module disabled
+					if (!getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
+						continue; // Do not show if sub module disabled
 					}
 				} elseif ($objecttype == 'ficheinter') {
 					$tplpath = 'fichinter';
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 91c53523965..46cf91ce684 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -43,7 +43,7 @@ function propal_prepare_head($object)
 	$h++;
 
 	if ((empty($conf->commande->enabled) && ((isModEnabled("shipping") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))
-		|| (isModEnabled("delivery_note") && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) {
+		|| (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) {
 		$langs->load("sendings");
 		$text = '';
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;

From 88d59896ec013858f6ded47769584fa6c02720c3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 13:38:08 +0100
Subject: [PATCH 0981/1862] Qual: 'enabled' in fields can be string
 ('isModEnabled(...)')

# Qual: 'enabled' in fields can be string ('isModEnabled(...)')

Update PHPdoc to allow that enabled is a string
---
 htdocs/adherents/class/adherent.class.php     |  2 +-
 htdocs/adherents/class/subscription.class.php |  2 +-
 htdocs/asset/class/asset.class.php            |  2 +-
 .../class/assetdepreciationoptions.class.php  |  2 +-
 htdocs/asset/class/assetmodel.class.php       |  2 +-
 htdocs/bom/class/bom.class.php                |  2 +-
 htdocs/bookcal/class/availabilities.class.php |  2 +-
 htdocs/bookcal/class/calendar.class.php       |  2 +-
 .../action/class/actioncommreminder.class.php |  2 +-
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/commande/class/commande.class.php      |  2 +-
 htdocs/compta/bank/class/account.class.php    |  2 +-
 .../bank/class/paymentvarious.class.php       |  2 +-
 .../facture/class/facture-rec.class.php       |  2 +-
 htdocs/compta/facture/class/facture.class.php |  2 +-
 .../class/bonprelevement.class.php            |  2 +-
 htdocs/contact/class/contact.class.php        |  2 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/class/defaultvalues.class.php     |  2 +-
 .../core/class/emailsenderprofile.class.php   |  2 +-
 htdocs/core/class/timespent.class.php         |  2 +-
 .../class/emailcollector.class.php            |  2 +-
 .../class/emailcollectoraction.class.php      |  2 +-
 .../class/emailcollectorfilter.class.php      |  2 +-
 .../class/conferenceorboothattendee.class.php |  2 +-
 htdocs/expedition/class/expedition.class.php  |  2 +-
 .../class/expensereport_ik.class.php          |  2 +-
 .../class/expensereport_rule.class.php        |  2 +-
 .../class/fournisseur.facture-rec.class.php   |  2 +-
 htdocs/hrm/class/evaluation.class.php         |  2 +-
 htdocs/hrm/class/evaluationdet.class.php      |  2 +-
 htdocs/hrm/class/job.class.php                |  2 +-
 htdocs/hrm/class/position.class.php           |  2 +-
 htdocs/hrm/class/skill.class.php              |  2 +-
 htdocs/hrm/class/skilldet.class.php           |  2 +-
 htdocs/hrm/class/skillrank.class.php          |  2 +-
 .../class/knowledgerecord.class.php           |  2 +-
 .../template/class/myobject.class.php         |  2 +-
 htdocs/mrp/class/mo.class.php                 |  2 +-
 .../class/opensurveysondage.class.php         |  2 +-
 .../partnership/class/partnership.class.php   |  2 +-
 htdocs/product/class/product.class.php        |  2 +-
 .../class/productcustomerprice.class.php      |  2 +-
 .../class/productfournisseurprice.class.php   |  2 +-
 .../inventory/class/inventory.class.php       |  2 +-
 htdocs/product/stock/class/entrepot.class.php |  2 +-
 .../product/stock/class/productlot.class.php  |  2 +-
 .../class/stocktransfer.class.php             |  2 +-
 .../class/stocktransferline.class.php         |  2 +-
 htdocs/projet/class/project.class.php         |  2 +-
 .../class/recruitmentcandidature.class.php    |  2 +-
 .../class/recruitmentjobposition.class.php    |  2 +-
 htdocs/salaries/class/paymentsalary.class.php |  4 +-
 .../class/companypaymentmode.class.php        | 78 +++++++++----------
 htdocs/societe/class/societe.class.php        |  2 +-
 htdocs/societe/class/societeaccount.class.php |  2 +-
 htdocs/ticket/class/cticketcategory.class.php |  2 +-
 .../variants/class/ProductAttribute.class.php | 14 ++--
 .../class/ProductAttributeValue.class.php     | 14 ++--
 htdocs/webhook/class/target.class.php         |  2 +-
 htdocs/website/class/websitepage.class.php    |  2 +-
 .../workstation/class/workstation.class.php   |  2 +-
 .../class/workstationresource.class.php       |  2 +-
 .../class/workstationusergroup.class.php      |  2 +-
 htdocs/zapier/class/hook.class.php            |  2 +-
 66 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0c593549865..b8b2333c40a 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -316,7 +316,7 @@ class Adherent extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 92a1edf1fe7..40aa0ab512a 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -104,7 +104,7 @@ class Subscription extends CommonObject
 	public $fk_bank;
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index e757f3efdd4..a915dc1412a 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -94,7 +94,7 @@ class Asset extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index a07ae6b5043..1be3533eedd 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -65,7 +65,7 @@ class AssetDepreciationOptions extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 5b995978015..8315231fd76 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -100,7 +100,7 @@ class AssetModel extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index ac9173a4a07..74e73d4c704 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -111,7 +111,7 @@ class BOM extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index a2bbcd6ffc8..c131598facf 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -112,7 +112,7 @@ class Availabilities extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index a3320c04cda..f4777bfa003 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -112,7 +112,7 @@ class Calendar extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'right', 'comment' => "Id"),
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index a55752b62c6..cf86e744f70 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -76,7 +76,7 @@ class ActionCommReminder extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a19ee568c3b..41fd6253113 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -320,7 +320,7 @@ class Propal extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e4cc13362b6..50a0b8b92d6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -311,7 +311,7 @@ class Commande extends CommonOrder
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 9efdbcd8451..e871b6dd754 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -312,7 +312,7 @@ class Account extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index fe7ea276767..7e54567fc47 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -198,7 +198,7 @@ class PaymentVarious extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		// TODO: fill this array
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 957f7040a66..447d0d9f5da 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -172,7 +172,7 @@ class FactureRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6caa4a49b8c..20483623722 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -290,7 +290,7 @@ class Facture extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 1),
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 5a92797fdb7..7e149cc435c 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -145,7 +145,7 @@ class BonPrelevement extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 8b46a8d4c5a..9b204deacf1 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -98,7 +98,7 @@ class Contact extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e15c3f57a3f..99662fd0273 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -243,7 +243,7 @@ class Contrat extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a693c31ff2d..281c1495d36 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -140,7 +140,7 @@ abstract class CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 1d8fb59c4c1..de216b0c47c 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -87,7 +87,7 @@ class DefaultValues extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 6aa1222c9d6..d9f8aa251cc 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -89,7 +89,7 @@ class EmailSenderProfile extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index c3a830c5d48..67e8c9fad48 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -112,7 +112,7 @@ class TimeSpent extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 9400a7d9437..e96c54a3dd3 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -120,7 +120,7 @@ class EmailCollector extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => 2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1),
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index cafee277913..dc5e4a44c49 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -79,7 +79,7 @@ class EmailCollectorAction extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 6e1442c50a5..10d937cd866 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -81,7 +81,7 @@ class EmailCollectorFilter extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 1712a02cec4..02fcb8b350f 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -100,7 +100,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 39eab0d71d0..6742c84011b 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -92,7 +92,7 @@ class Expedition extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index a1cc92421e4..438bf4af1c2 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -72,7 +72,7 @@ class ExpenseReportIk extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'index' => true)
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 2e07990ac93..a2fdaa4d3d8 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -110,7 +110,7 @@ class ExpenseReportRule extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'index' => true)
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 4b5fd7a64ac..39fcd70e101 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -190,7 +190,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index ccc97cc8f87..06eb51043b1 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -104,7 +104,7 @@ class Evaluation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 50335a09417..f0f2612d0c1 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -103,7 +103,7 @@ class EvaluationLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 1e2bc91b1cd..c0ec08939d4 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -102,7 +102,7 @@ class Job extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 65d1e8c3557..f15e98131ca 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -102,7 +102,7 @@ class Position extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 8a91dbc816b..aefd68a0bea 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -108,7 +108,7 @@ class Skill extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index fa9a4736b78..83ccae8c5ab 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -102,7 +102,7 @@ class Skilldet extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 103067d9154..245a6d8ba6c 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -104,7 +104,7 @@ class SkillRank extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 74368e35e58..bd4aeec2174 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -99,7 +99,7 @@ class KnowledgeRecord extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index b0d8ce35479..c7d56bfc777 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -116,7 +116,7 @@ class MyObject extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index c896d3216cc..33b3590b992 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -94,7 +94,7 @@ class Mo extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index cc28ad8c41d..29110bc16d4 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -101,7 +101,7 @@ class Opensurveysondage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id_sondage' => array('type' => 'varchar(16)', 'label' => 'Idsondage', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => -1,),
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 721121b8658..b40cbdd1a27 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -104,7 +104,7 @@ class Partnership extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 233b35edb76..0340074f997 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -583,7 +583,7 @@ class Product extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 4507b0fbdb9..b5aba3ae45a 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class ProductCustomerPrice extends CommonObject
 {
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => '1', 'noteditable' => 1),
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index ef09d7b4307..a5b432425ac 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -92,7 +92,7 @@ class ProductFournisseurPrice extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 6ce66586c6c..1a460fe68c6 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -96,7 +96,7 @@ class Inventory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'              => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 203a3b77b9a..1647c870515 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -121,7 +121,7 @@ class Entrepot extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 8e48d272407..f1941283842 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -99,7 +99,7 @@ class Productlot extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index d90a892382c..ff9e7d0330b 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -124,7 +124,7 @@ class StockTransfer extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 5a71cd70afd..90cbb649838 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -94,7 +94,7 @@ class StockTransferLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f245a9c727a..13d4c426bc7 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -293,7 +293,7 @@ class Project extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 8ccc0a498d0..0f53b8a9a65 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -107,7 +107,7 @@ class RecruitmentCandidature extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index d035b8bd5eb..531e07b23a5 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -113,7 +113,7 @@ class RecruitmentJobPosition extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 70a714f02f3..c4ccb8b8845 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -153,10 +153,10 @@ class PaymentSalary extends CommonObject
 	public $datev = '';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
 	);
 
 	/**
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 9494f434c3c..068d6138b5b 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -83,47 +83,47 @@ class CompanyPaymentMode extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'Rowid', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>10),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15),
-		'label' =>array('type'=>'varchar(30)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-2, 'position'=>30),
-		'bank' =>array('type'=>'varchar(255)', 'label'=>'Bank', 'enabled'=>1, 'visible'=>-2, 'position'=>35),
-		'code_banque' =>array('type'=>'varchar(128)', 'label'=>'Code banque', 'enabled'=>1, 'visible'=>-2, 'position'=>40),
-		'code_guichet' =>array('type'=>'varchar(6)', 'label'=>'Code guichet', 'enabled'=>1, 'visible'=>-2, 'position'=>45),
-		'number' =>array('type'=>'varchar(255)', 'label'=>'Number', 'enabled'=>1, 'visible'=>-2, 'position'=>50),
-		'cle_rib' =>array('type'=>'varchar(5)', 'label'=>'Cle rib', 'enabled'=>1, 'visible'=>-2, 'position'=>55),
-		'bic' =>array('type'=>'varchar(20)', 'label'=>'Bic', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
-		'iban_prefix' =>array('type'=>'varchar(34)', 'label'=>'Iban prefix', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
-		'domiciliation' =>array('type'=>'varchar(255)', 'label'=>'Domiciliation', 'enabled'=>1, 'visible'=>-2, 'position'=>70),
-		'proprio' =>array('type'=>'varchar(60)', 'label'=>'Proprio', 'enabled'=>1, 'visible'=>-2, 'position'=>75),
-		'owner_address' =>array('type'=>'text', 'label'=>'Owner address', 'enabled'=>1, 'visible'=>-2, 'position'=>80),
-		'default_rib' =>array('type'=>'tinyint(4)', 'label'=>'Default rib', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>85),
-		'rum' =>array('type'=>'varchar(32)', 'label'=>'Rum', 'enabled'=>1, 'visible'=>-2, 'position'=>90),
-		'date_rum' =>array('type'=>'date', 'label'=>'Date rum', 'enabled'=>1, 'visible'=>-2, 'position'=>95),
-		'frstrecur' =>array('type'=>'varchar(16)', 'label'=>'Frstrecur', 'enabled'=>1, 'visible'=>-2, 'position'=>100),
-		'type' =>array('type'=>'varchar(32)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-2, 'position'=>110),
-		'last_four' =>array('type'=>'varchar(4)', 'label'=>'Last four', 'enabled'=>1, 'visible'=>-2, 'position'=>115),
-		'card_type' =>array('type'=>'varchar(255)', 'label'=>'Card type', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
-		'cvn' =>array('type'=>'varchar(255)', 'label'=>'Cvn', 'enabled'=>1, 'visible'=>-2, 'position'=>125),
-		'exp_date_month' =>array('type'=>'integer', 'label'=>'Exp date month', 'enabled'=>1, 'visible'=>-2, 'position'=>130),
-		'exp_date_year' =>array('type'=>'integer', 'label'=>'Exp date year', 'enabled'=>1, 'visible'=>-2, 'position'=>135),
-		'country_code' =>array('type'=>'varchar(10)', 'label'=>'Country code', 'enabled'=>1, 'visible'=>-2, 'position'=>140),
-		'approved' =>array('type'=>'integer', 'label'=>'Approved', 'enabled'=>1, 'visible'=>-2, 'position'=>145),
-		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-2, 'position'=>150),
-		'max_total_amount_of_all_payments' =>array('type'=>'double(24,8)', 'label'=>'Max total amount of all payments', 'enabled'=>1, 'visible'=>-2, 'position'=>155),
-		'preapproval_key' =>array('type'=>'varchar(255)', 'label'=>'Preapproval key', 'enabled'=>1, 'visible'=>-2, 'position'=>160),
-		'total_amount_of_all_payments' =>array('type'=>'double(24,8)', 'label'=>'Total amount of all payments', 'enabled'=>1, 'visible'=>-2, 'position'=>165),
-		'stripe_card_ref' =>array('type'=>'varchar(128)', 'label'=>'ExternalSystemID', 'enabled'=>1, 'visible'=>-2, 'position'=>170, 'help'=>'IDOfPaymentInAnExternalSystem'),
-		'stripe_account' =>array('type'=>'varchar(128)', 'label'=>'ExternalSystemCustomerAccount', 'enabled'=>1, 'visible'=>-2, 'position'=>171, 'help'=>'IDOfCustomerInAnExternalSystem'),
-		'ext_payment_site' =>array('type'=>'varchar(128)', 'label'=>'ExternalSystem', 'enabled'=>1, 'visible'=>-2, 'position'=>172, 'help'=>'NameOfExternalSystem'),
-		'status' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>175),
-		'starting_date' =>array('type'=>'date', 'label'=>'Starting date', 'enabled'=>1, 'visible'=>-2, 'position'=>180),
-		'ending_date' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>1, 'visible'=>-2, 'position'=>185),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>20),
-		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'Import key', 'enabled'=>1, 'visible'=>-2, 'position'=>105),
+		'rowid' => array('type' => 'integer', 'label' => 'Rowid', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 10),
+		'fk_soc' => array('type' => 'integer', 'label' => 'Fk soc', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15),
+		'label' => array('type' => 'varchar(30)', 'label' => 'Label', 'enabled' => 1, 'visible' => -2, 'position' => 30),
+		'bank' => array('type' => 'varchar(255)', 'label' => 'Bank', 'enabled' => 1, 'visible' => -2, 'position' => 35),
+		'code_banque' => array('type' => 'varchar(128)', 'label' => 'Code banque', 'enabled' => 1, 'visible' => -2, 'position' => 40),
+		'code_guichet' => array('type' => 'varchar(6)', 'label' => 'Code guichet', 'enabled' => 1, 'visible' => -2, 'position' => 45),
+		'number' => array('type' => 'varchar(255)', 'label' => 'Number', 'enabled' => 1, 'visible' => -2, 'position' => 50),
+		'cle_rib' => array('type' => 'varchar(5)', 'label' => 'Cle rib', 'enabled' => 1, 'visible' => -2, 'position' => 55),
+		'bic' => array('type' => 'varchar(20)', 'label' => 'Bic', 'enabled' => 1, 'visible' => -2, 'position' => 60),
+		'iban_prefix' => array('type' => 'varchar(34)', 'label' => 'Iban prefix', 'enabled' => 1, 'visible' => -2, 'position' => 65),
+		'domiciliation' => array('type' => 'varchar(255)', 'label' => 'Domiciliation', 'enabled' => 1, 'visible' => -2, 'position' => 70),
+		'proprio' => array('type' => 'varchar(60)', 'label' => 'Proprio', 'enabled' => 1, 'visible' => -2, 'position' => 75),
+		'owner_address' => array('type' => 'text', 'label' => 'Owner address', 'enabled' => 1, 'visible' => -2, 'position' => 80),
+		'default_rib' => array('type' => 'tinyint(4)', 'label' => 'Default rib', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 85),
+		'rum' => array('type' => 'varchar(32)', 'label' => 'Rum', 'enabled' => 1, 'visible' => -2, 'position' => 90),
+		'date_rum' => array('type' => 'date', 'label' => 'Date rum', 'enabled' => 1, 'visible' => -2, 'position' => 95),
+		'frstrecur' => array('type' => 'varchar(16)', 'label' => 'Frstrecur', 'enabled' => 1, 'visible' => -2, 'position' => 100),
+		'type' => array('type' => 'varchar(32)', 'label' => 'Type', 'enabled' => 1, 'visible' => -2, 'position' => 110),
+		'last_four' => array('type' => 'varchar(4)', 'label' => 'Last four', 'enabled' => 1, 'visible' => -2, 'position' => 115),
+		'card_type' => array('type' => 'varchar(255)', 'label' => 'Card type', 'enabled' => 1, 'visible' => -2, 'position' => 120),
+		'cvn' => array('type' => 'varchar(255)', 'label' => 'Cvn', 'enabled' => 1, 'visible' => -2, 'position' => 125),
+		'exp_date_month' => array('type' => 'integer', 'label' => 'Exp date month', 'enabled' => 1, 'visible' => -2, 'position' => 130),
+		'exp_date_year' => array('type' => 'integer', 'label' => 'Exp date year', 'enabled' => 1, 'visible' => -2, 'position' => 135),
+		'country_code' => array('type' => 'varchar(10)', 'label' => 'Country code', 'enabled' => 1, 'visible' => -2, 'position' => 140),
+		'approved' => array('type' => 'integer', 'label' => 'Approved', 'enabled' => 1, 'visible' => -2, 'position' => 145),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => -2, 'position' => 150),
+		'max_total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Max total amount of all payments', 'enabled' => 1, 'visible' => -2, 'position' => 155),
+		'preapproval_key' => array('type' => 'varchar(255)', 'label' => 'Preapproval key', 'enabled' => 1, 'visible' => -2, 'position' => 160),
+		'total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Total amount of all payments', 'enabled' => 1, 'visible' => -2, 'position' => 165),
+		'stripe_card_ref' => array('type' => 'varchar(128)', 'label' => 'ExternalSystemID', 'enabled' => 1, 'visible' => -2, 'position' => 170, 'help' => 'IDOfPaymentInAnExternalSystem'),
+		'stripe_account' => array('type' => 'varchar(128)', 'label' => 'ExternalSystemCustomerAccount', 'enabled' => 1, 'visible' => -2, 'position' => 171, 'help' => 'IDOfCustomerInAnExternalSystem'),
+		'ext_payment_site' => array('type' => 'varchar(128)', 'label' => 'ExternalSystem', 'enabled' => 1, 'visible' => -2, 'position' => 172, 'help' => 'NameOfExternalSystem'),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 175),
+		'starting_date' => array('type' => 'date', 'label' => 'Starting date', 'enabled' => 1, 'visible' => -2, 'position' => 180),
+		'ending_date' => array('type' => 'date', 'label' => 'Ending date', 'enabled' => 1, 'visible' => -2, 'position' => 185),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 20),
+		'tms' => array('type' => 'timestamp', 'label' => 'Tms', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'Import key', 'enabled' => 1, 'visible' => -2, 'position' => 105),
 		//'aaa' =>array('type'=>'date', 'label'=>'Ending date', 'enabled'=>0, 'visible'=>-2, 'position'=>185),
 	);
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8150efa1be1..60c89db9dd1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -188,7 +188,7 @@ class Societe extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index cff6d5e7af5..2a08a81f584 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -76,7 +76,7 @@ class SocieteAccount extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 
 	public $fields = array(
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 963c7647934..820cc281c89 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -98,7 +98,7 @@ class CTicketCategory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index ea66396479c..b4c16a23b95 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -98,14 +98,14 @@ class ProductAttribute extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'width200'),
-		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'ExternalRef', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall'=>1),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"", 'showoncombobox'=>'1',),
-		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>40, 'notnull'=>1,),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'css' => 'width200'),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'ExternalRef', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall' => 1),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => '1',),
+		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => 0, 'position' => 40, 'notnull' => 1,),
 	);
 
 	/**
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 556dbbfac30..4b04d46a375 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -76,14 +76,14 @@ class ProductAttributeValue extends CommonObjectLine
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'fk_product_attribute' => array('type'=>'integer:ProductAttribute:variants/class/ProductAttribute.class.php', 'label'=>'ProductAttribute', 'enabled'=>1, 'visible'=>0, 'position'=>10, 'notnull'=>1, 'index'=>1,),
-		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
-		'value' => array('type'=>'varchar(255)', 'label'=>'Value', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"", 'showoncombobox'=>'1',),
-		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
+	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_product_attribute' => array('type' => 'integer:ProductAttribute:variants/class/ProductAttribute.class.php', 'label' => 'ProductAttribute', 'enabled' => 1, 'visible' => 0, 'position' => 10, 'notnull' => 1, 'index' => 1,),
+		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'css' => ''),
+		'value' => array('type' => 'varchar(255)', 'label' => 'Value', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => '1',),
+		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => 0, 'position' => 200, 'notnull' => 1,),
 	);
 	public $id;
 	public $fk_product_attribute;
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index d7bbc3af3a6..011b8b31606 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -101,7 +101,7 @@ class Target extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index f005727a326..f9d9b73f32b 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -163,7 +163,7 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'          => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index f34232c86d4..8a3e195f0fd 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -96,7 +96,7 @@ class Workstation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 56df285ace1..853bba00724 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -36,7 +36,7 @@ class WorkstationResource extends CommonObject
 	public $element = 'workstationresource';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index 7fed35b4b14..54e342ba09a 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -35,7 +35,7 @@ class WorkstationUserGroup extends CommonObject
 	public $element = 'workstationusergroup';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 9e953292cd6..b1057e8f2db 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -81,7 +81,7 @@ class Hook extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array(

From 2ee52c1659e851221bf184ee46f014a5dcf2b288 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Tue, 12 Mar 2024 13:44:19 +0100
Subject: [PATCH 0982/1862] Fix: Error in the SQL to update the stock from
 batch to non-batch management

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index b959d87063f..fa89c13b5cf 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2014		Henry Florian			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Ion agorria			    <ion@agorria.com>
- * Copyright (C) 2016-2018	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2016-2024	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Gustavo Novaro
  * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
@@ -1341,8 +1341,8 @@ class Product extends CommonObject
 
 				if (!$this->hasbatch() && $this->oldcopy->hasbatch()) {
 					// Selection of all product stock mouvements that contains batchs
-					$sql = 'SELECT pb.qty, pb.fk_entrepot, pb.batch FROM '.MAIN_DB_PREFIX.'product_batch as pb';
-					$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
+					$sql = 'SELECT pb.qty, ps.fk_entrepot, pb.batch FROM '.MAIN_DB_PREFIX.'product_batch as pb';
+					$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = pb.fk_product_stock)';
 					$sql.= ' WHERE ps.fk_product = '.(int) $this->id;
 
 					$resql = $this->db->query($sql);

From b3620dad5ff38ffc24c8d993f79c4825eb48d896 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 13:58:53 +0100
Subject: [PATCH 0983/1862] Qual: Fix PHPdoc for fields

---
 htdocs/eventorganization/class/conferenceorbooth.class.php | 3 ++-
 htdocs/product/inventory/class/inventory.class.php         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 0ff0e06936f..76d4f83c622 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -111,7 +112,7 @@ class ConferenceOrBooth extends ActionComm
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 1a460fe68c6..ac26101684c 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -826,7 +826,7 @@ class InventoryLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),

From b276452b365492e133bab629bfbd617b699c3617 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:00:39 +0100
Subject: [PATCH 0984/1862] Qual: Fix childtablesoncascade phpdoc

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

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index ff9e7d0330b..3749f3e67f2 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -60,7 +60,7 @@ class StockTransfer extends CommonObject
 
 
 	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
+	 * @var string[] List of child tables. To know object to delete on cascade.
 	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
 	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
 	 */

From 7b1155dec075ecd8722f41f742dde4184a717e53 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:02:10 +0100
Subject: [PATCH 0985/1862] Qual: Fix childtablesoncascade phpdoc

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

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index f9d9b73f32b..f7d8829bd71 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -58,7 +58,7 @@ class WebsitePage extends CommonObject
 	public $fk_element = 'fk_website_page';
 
 	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 */
 	protected $childtablesoncascade = array('categorie_website_page');
 

From d3fe1348c1f9de397f207fdecaa119524a384280 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:03:58 +0100
Subject: [PATCH 0986/1862] Qual: Fix PHPdoc for fields

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

diff --git a/htdocs/webportal/class/webportalpropal.class.php b/htdocs/webportal/class/webportalpropal.class.php
index d53fa5f07ab..2c6a973ec66 100644
--- a/htdocs/webportal/class/webportalpropal.class.php
+++ b/htdocs/webportal/class/webportalpropal.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -97,7 +98,7 @@ class WebPortalPropal extends Propal
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id",),

From 12025d0762ae96fbf410b436ca73bf7000ce716e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:05:51 +0100
Subject: [PATCH 0987/1862] Qual: Fix PHPdoc for fields

---
 .../class/webportalpartnership.class.php      | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/htdocs/webportal/class/webportalpartnership.class.php b/htdocs/webportal/class/webportalpartnership.class.php
index ffb32ec6dfc..7a0146072dd 100644
--- a/htdocs/webportal/class/webportalpartnership.class.php
+++ b/htdocs/webportal/class/webportalpartnership.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -96,33 +97,33 @@ class WebPortalPartnership extends Partnership
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id",),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 5, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'showonheader' => 1,),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 15, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id",),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 5, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'showonheader' => 1,),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
 
-		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label' => 'Type', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 5, 'csslist' => '',),
-		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 5, 'index' => 1, 'css' => '', 'csslist' => '',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'date_partnership_start' => array('type' => 'date', 'label' => 'DatePartnershipStart', 'enabled' => '1', 'position' => 52, 'notnull' => 1, 'visible' => 5,),
-		'date_partnership_end' => array('type' => 'date', 'label' => 'DatePartnershipEnd', 'enabled' => '1', 'position' => 53, 'notnull' => 0, 'visible' => 5,),
-		'url_to_check' => array('type' => 'varchar(255)', 'label' => 'UrlToCheck', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => -5,),
-		'count_last_url_check_error' => array('type' => 'integer', 'label' => 'CountLastUrlCheckError', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => -2, 'default' => '0',),
-		'last_check_backlink' => array('type' => 'datetime', 'label' => 'LastCheckBacklink', 'enabled' => '1', 'position' => 72, 'notnull' => 0, 'visible' => -2,),
-		'reason_decline_or_cancel' => array('type' => 'text', 'label' => 'ReasonDeclineOrCancel', 'enabled' => '1', 'position' => 73, 'notnull' => 0, 'visible' => -2,),
-		'ip' => array('type' => 'varchar(250)', 'label' => 'Ip', 'enabled' => '1', 'position' => 74, 'notnull' => 0, 'visible' => -2,),
+		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label' => 'Type', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 5, 'csslist' => '',),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 1, 'position' => 50, 'notnull' => -1, 'visible' => 5, 'index' => 1, 'css' => '', 'csslist' => '',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'date_partnership_start' => array('type' => 'date', 'label' => 'DatePartnershipStart', 'enabled' => 1, 'position' => 52, 'notnull' => 1, 'visible' => 5,),
+		'date_partnership_end' => array('type' => 'date', 'label' => 'DatePartnershipEnd', 'enabled' => 1, 'position' => 53, 'notnull' => 0, 'visible' => 5,),
+		'url_to_check' => array('type' => 'varchar(255)', 'label' => 'UrlToCheck', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => -5,),
+		'count_last_url_check_error' => array('type' => 'integer', 'label' => 'CountLastUrlCheckError', 'enabled' => 1, 'position' => 71, 'notnull' => 0, 'visible' => -2, 'default' => '0',),
+		'last_check_backlink' => array('type' => 'datetime', 'label' => 'LastCheckBacklink', 'enabled' => 1, 'position' => 72, 'notnull' => 0, 'visible' => -2,),
+		'reason_decline_or_cancel' => array('type' => 'text', 'label' => 'ReasonDeclineOrCancel', 'enabled' => 1, 'position' => 73, 'notnull' => 0, 'visible' => -2,),
+		'ip' => array('type' => 'varchar(250)', 'label' => 'Ip', 'enabled' => 1, 'position' => 74, 'notnull' => 0, 'visible' => -2,),
 
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'visible' => 5, 'default' => '0', 'index' => 1, 'arrayofkeyval' => self::STATUS_SHORT_LIST, 'showonheader' => 1,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 2000, 'notnull' => 1, 'visible' => 5, 'default' => '0', 'index' => 1, 'arrayofkeyval' => self::STATUS_SHORT_LIST, 'showonheader' => 1,),
 	);
 	//public $rowid;
 	//public $ref;

From f41ec6913f7b83936feee4e381de338dcd5b312b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:06:53 +0100
Subject: [PATCH 0988/1862] Qual: Fix PHPdoc for fields

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

diff --git a/htdocs/webportal/class/webportalorder.class.php b/htdocs/webportal/class/webportalorder.class.php
index 12b1586e4c3..a1ca6bd5270 100644
--- a/htdocs/webportal/class/webportalorder.class.php
+++ b/htdocs/webportal/class/webportalorder.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -97,7 +98,7 @@ class WebPortalOrder extends Commande
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),

From d2cefd3409c185aaabf6d5e0e1aad0def2c68a1f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:07:53 +0100
Subject: [PATCH 0989/1862] Qual: Fix PHPdoc for fields

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

diff --git a/htdocs/webportal/class/webportalmember.class.php b/htdocs/webportal/class/webportalmember.class.php
index 093703df8c7..d09568cf5f5 100644
--- a/htdocs/webportal/class/webportalmember.class.php
+++ b/htdocs/webportal/class/webportalmember.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -112,7 +113,7 @@ class WebPortalMember extends Adherent
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),

From a75bc08d946ba41977fe95393c156bddcbc6067d Mon Sep 17 00:00:00 2001
From: gdesnoues <gdesnoues@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:08:29 +0100
Subject: [PATCH 0990/1862] show image in a line description of a proposal PDF
 #28670

When you set FCKEDITOR_ENABLE_DETAILS_FULL to 1 you can add pictures in description proposal with the WYSIWYG bar.
Add preg_replace() to show this pictures in the PDF
---
 htdocs/core/lib/pdf.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 7d342e152a3..ed3f5f8ef05 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1443,6 +1443,7 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
 	}
 	if (empty($reshook)) {
 		$labelproductservice = pdf_getlinedesc($object, $i, $outputlangs, $hideref, $hidedesc, $issupplierline);
+		$labelproductservice = preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)/', '\1file:/'.DOL_DATA_ROOT.'/medias/\2\3', $labelproductservice, -1, $nbrep);
 
 		//var_dump($labelproductservice);exit;
 

From 74c5b450f80cb455eac04116b8ff7fc4bd2f5196 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:09:04 +0100
Subject: [PATCH 0991/1862] Qual: Fix PHPdoc for fields

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

diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php
index e120979aaa9..5212a7e433f 100644
--- a/htdocs/webportal/class/webportalinvoice.class.php
+++ b/htdocs/webportal/class/webportalinvoice.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -96,11 +97,11 @@ class WebPortalInvoice extends Facture
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1,),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 20, 'index' => 1,),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 20, 'index' => 1,),
 		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 2, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 5,),
 		'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 15,),
 		'datef' => array('type' => 'date', 'label' => 'DateInvoice', 'enabled' => 1, 'visible' => 2, 'position' => 20,),

From 3a441359da77d115ca60aef5140c1e39c207d545 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:10:46 +0100
Subject: [PATCH 0992/1862] Qual: Fix PHPdoc for fields

---
 .../class/companybankaccount.class.php        | 95 ++++++++++---------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 6b95ec4ab79..b8e2a301b84 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013   	Peter Fontaine          <contact@peterfontaine.fr>
  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -85,52 +86,52 @@ class CompanyBankAccount extends Account
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>-1,),
-		'type' => array('type'=>'varchar(32)', 'label'=>'Type', 'enabled'=>'1', 'position'=>15, 'notnull'=>1, 'visible'=>-1,),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>25, 'notnull'=>0, 'visible'=>-1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>-1,),
-		'label' => array('type'=>'varchar(200)', 'label'=>'Label', 'enabled'=>'1', 'position'=>35, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1', 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax150',),
-		'bank' => array('type'=>'varchar(255)', 'label'=>'Bank', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'code_banque' => array('type'=>'varchar(128)', 'label'=>'Codebanque', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'code_guichet' => array('type'=>'varchar(6)', 'label'=>'Codeguichet', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'number' => array('type'=>'varchar(255)', 'label'=>'Number', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'cle_rib' => array('type'=>'varchar(5)', 'label'=>'Clerib', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'bic' => array('type'=>'varchar(20)', 'label'=>'Bic', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'iban_prefix' => array('type'=>'varchar(34)', 'label'=>'Ibanprefix', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'domiciliation' => array('type'=>'varchar(255)', 'label'=>'Domiciliation', 'enabled'=>'1', 'position'=>75, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'proprio' => array('type'=>'varchar(60)', 'label'=>'Proprio', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'owner_address' => array('type'=>'varchar(255)', 'label'=>'Owneraddress', 'enabled'=>'1', 'position'=>85, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'default_rib' => array('type'=>'smallint(6)', 'label'=>'Defaultrib', 'enabled'=>'1', 'position'=>90, 'notnull'=>1, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'state_id' => array('type'=>'integer', 'label'=>'Stateid', 'enabled'=>'1', 'position'=>95, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'fk_country' => array('type'=>'integer', 'label'=>'Fkcountry', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1', 'css'=>'maxwidth500 widthcentpercentminusxx',),
-		'currency_code' => array('type'=>'varchar(3)', 'label'=>'Currencycode', 'enabled'=>'1', 'position'=>105, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'rum' => array('type'=>'varchar(32)', 'label'=>'Rum', 'enabled'=>'1', 'position'=>110, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'date_rum' => array('type'=>'date', 'label'=>'Daterum', 'enabled'=>'1', 'position'=>115, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'frstrecur' => array('type'=>'varchar(16)', 'label'=>'Frstrecur', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>900, 'notnull'=>0, 'visible'=>-2, 'alwayseditable'=>'1',),
-		'last_four' => array('type'=>'varchar(4)', 'label'=>'Lastfour', 'enabled'=>'1', 'position'=>130, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'card_type' => array('type'=>'varchar(255)', 'label'=>'Cardtype', 'enabled'=>'1', 'position'=>135, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'cvn' => array('type'=>'varchar(255)', 'label'=>'Cvn', 'enabled'=>'1', 'position'=>140, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'exp_date_month' => array('type'=>'integer', 'label'=>'Expdatemonth', 'enabled'=>'1', 'position'=>145, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'exp_date_year' => array('type'=>'integer', 'label'=>'Expdateyear', 'enabled'=>'1', 'position'=>150, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'country_code' => array('type'=>'varchar(10)', 'label'=>'Countrycode', 'enabled'=>'1', 'position'=>155, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'approved' => array('type'=>'integer', 'label'=>'Approved', 'enabled'=>'1', 'position'=>160, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>'1', 'position'=>165, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'ending_date' => array('type'=>'date', 'label'=>'Endingdate', 'enabled'=>'1', 'position'=>170, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'max_total_amount_of_all_payments' => array('type'=>'double(24,8)', 'label'=>'Maxtotalamountofallpayments', 'enabled'=>'1', 'position'=>175, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'preapproval_key' => array('type'=>'varchar(255)', 'label'=>'Preapprovalkey', 'enabled'=>'1', 'position'=>180, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'starting_date' => array('type'=>'date', 'label'=>'Startingdate', 'enabled'=>'1', 'position'=>185, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'total_amount_of_all_payments' => array('type'=>'double(24,8)', 'label'=>'Totalamountofallpayments', 'enabled'=>'1', 'position'=>190, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'stripe_card_ref' => array('type'=>'varchar(128)', 'label'=>'Stripecardref', 'enabled'=>'1', 'position'=>195, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'comment' => array('type'=>'varchar(255)', 'label'=>'Comment', 'enabled'=>'1', 'position'=>205, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'ipaddress' => array('type'=>'varchar(68)', 'label'=>'Ipaddress', 'enabled'=>'1', 'position'=>210, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'stripe_account' => array('type'=>'varchar(128)', 'label'=>'Stripeaccount', 'enabled'=>'1', 'position'=>215, 'notnull'=>0, 'visible'=>-1, 'alwayseditable'=>'1',),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'position'=>230),
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,),
+		'type' => array('type' => 'varchar(32)', 'label' => 'Type', 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'visible' => -1,),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 25, 'notnull' => 0, 'visible' => -1,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => -1,),
+		'label' => array('type' => 'varchar(200)', 'label' => 'Label', 'enabled' => 1, 'position' => 35, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1', 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',),
+		'bank' => array('type' => 'varchar(255)', 'label' => 'Bank', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'code_banque' => array('type' => 'varchar(128)', 'label' => 'Codebanque', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'code_guichet' => array('type' => 'varchar(6)', 'label' => 'Codeguichet', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'number' => array('type' => 'varchar(255)', 'label' => 'Number', 'enabled' => 1, 'position' => 55, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'cle_rib' => array('type' => 'varchar(5)', 'label' => 'Clerib', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'bic' => array('type' => 'varchar(20)', 'label' => 'Bic', 'enabled' => 1, 'position' => 65, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'iban_prefix' => array('type' => 'varchar(34)', 'label' => 'Ibanprefix', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'domiciliation' => array('type' => 'varchar(255)', 'label' => 'Domiciliation', 'enabled' => 1, 'position' => 75, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'proprio' => array('type' => 'varchar(60)', 'label' => 'Proprio', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'owner_address' => array('type' => 'varchar(255)', 'label' => 'Owneraddress', 'enabled' => 1, 'position' => 85, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'default_rib' => array('type' => 'smallint(6)', 'label' => 'Defaultrib', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => '1',),
+		'state_id' => array('type' => 'integer', 'label' => 'Stateid', 'enabled' => 1, 'position' => 95, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'fk_country' => array('type' => 'integer', 'label' => 'Fkcountry', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1', 'css' => 'maxwidth500 widthcentpercentminusxx',),
+		'currency_code' => array('type' => 'varchar(3)', 'label' => 'Currencycode', 'enabled' => 1, 'position' => 105, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'rum' => array('type' => 'varchar(32)', 'label' => 'Rum', 'enabled' => 1, 'position' => 110, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'date_rum' => array('type' => 'date', 'label' => 'Daterum', 'enabled' => 1, 'position' => 115, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'frstrecur' => array('type' => 'varchar(16)', 'label' => 'Frstrecur', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 900, 'notnull' => 0, 'visible' => -2, 'alwayseditable' => '1',),
+		'last_four' => array('type' => 'varchar(4)', 'label' => 'Lastfour', 'enabled' => 1, 'position' => 130, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'card_type' => array('type' => 'varchar(255)', 'label' => 'Cardtype', 'enabled' => 1, 'position' => 135, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'cvn' => array('type' => 'varchar(255)', 'label' => 'Cvn', 'enabled' => 1, 'position' => 140, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'exp_date_month' => array('type' => 'integer', 'label' => 'Expdatemonth', 'enabled' => 1, 'position' => 145, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'exp_date_year' => array('type' => 'integer', 'label' => 'Expdateyear', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'country_code' => array('type' => 'varchar(10)', 'label' => 'Countrycode', 'enabled' => 1, 'position' => 155, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'approved' => array('type' => 'integer', 'label' => 'Approved', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'position' => 165, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'ending_date' => array('type' => 'date', 'label' => 'Endingdate', 'enabled' => 1, 'position' => 170, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'max_total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Maxtotalamountofallpayments', 'enabled' => 1, 'position' => 175, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'preapproval_key' => array('type' => 'varchar(255)', 'label' => 'Preapprovalkey', 'enabled' => 1, 'position' => 180, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'starting_date' => array('type' => 'date', 'label' => 'Startingdate', 'enabled' => 1, 'position' => 185, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Totalamountofallpayments', 'enabled' => 1, 'position' => 190, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'stripe_card_ref' => array('type' => 'varchar(128)', 'label' => 'Stripecardref', 'enabled' => 1, 'position' => 195, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => '1',),
+		'comment' => array('type' => 'varchar(255)', 'label' => 'Comment', 'enabled' => 1, 'position' => 205, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'ipaddress' => array('type' => 'varchar(68)', 'label' => 'Ipaddress', 'enabled' => 1, 'position' => 210, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'stripe_account' => array('type' => 'varchar(128)', 'label' => 'Stripeaccount', 'enabled' => 1, 'position' => 215, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => 0, 'position' => 230),
 	);
 
 	/**
@@ -336,7 +337,7 @@ class CompanyBankAccount extends Account
 		}
 
 		if (empty($this->datec)) {
-			$this->datec=$now;
+			$this->datec = $now;
 		}
 
 		// Correct ->default_rib to not set the new account as default, if there is already 1. We want to be sure to have always 1 default for type = 'ban'.
@@ -544,7 +545,7 @@ class CompanyBankAccount extends Account
 				$this->date_rum        = $this->db->jdate($obj->date_rum);
 				$this->stripe_card_ref = $obj->stripe_card_ref;		// External system payment mode ID
 				$this->stripe_account  = $obj->stripe_account;		// External system customer ID
-				$this->ext_payment_site= $obj->ext_payment_site;	// External system name ('StripeLive', 'StripeTest', 'StancerLive', 'StancerTest', ...)
+				$this->ext_payment_site = $obj->ext_payment_site;	// External system name ('StripeLive', 'StripeTest', 'StancerLive', 'StancerTest', ...)
 				$this->last_main_doc   = $obj->last_main_doc;
 				$this->model_pdf   	   = $obj->model_pdf;
 			}

From cc6fbef64d25bd2bcd7104d1cb42708492451a95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 14:44:48 +0100
Subject: [PATCH 0993/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8159bc5436e..62b0d8b42d2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12296,12 +12296,12 @@ function getElementProperties($elementType)
 		$classname = 'EmailSenderProfile';
 		$table_element = 'c_email_senderprofile';
 		$subelement = '';
-	} elseif ($objectType == 'conferenceorboothattendee') {
+	} elseif ($elementType == 'conferenceorboothattendee') {
 		$classpath = 'eventorganization/class';
 		$classfile = 'conferenceorboothattendee';
 		$classname = 'ConferenceOrBoothAttendee';
 		$module = 'eventorganization';
-	} elseif ($objectType == 'conferenceorbooth') {
+	} elseif ($elementType == 'conferenceorbooth') {
 		$classpath = 'eventorganization/class';
 		$classfile = 'conferenceorbooth';
 		$classname = 'ConferenceOrBooth';

From f54c929321524222c329d67740cb4ff3a6e83e8b Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 12 Mar 2024 14:58:20 +0100
Subject: [PATCH 0994/1862] Fix method doc and cast two column

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f291093d063..6d47b7fe700 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2528,7 +2528,7 @@ class BookKeeping extends CommonObject
 	 * Get list of fiscal period
 	 *
 	 * @param 	string	$filter		Filter
-	 * @return 	array<array{id:int,data_start:string,date_end:string,label:string}>|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
+	 * @return 	array<array{id:int,label:string,date_start:string,date_end:string,status:int}>|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
 	 */
 	public function getFiscalPeriods($filter = '')
 	{
@@ -2551,11 +2551,11 @@ class BookKeeping extends CommonObject
 
 		while ($obj = $this->db->fetch_object($resql)) {
 			$list[$obj->rowid] = array(
-				'id' => $obj->rowid,
+				'id' => (int) $obj->rowid,
 				'label' => $obj->label,
 				'date_start' => $this->db->jdate($obj->date_start),
 				'date_end' => $this->db->jdate($obj->date_end),
-				'status' => $obj->statut,
+				'status' => (int) $obj->statut,
 			);
 		}
 

From 8bf54dee9ea7acb16a6d6c6140516caf0655d429 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 12 Mar 2024 15:13:54 +0100
Subject: [PATCH 0995/1862] fix method sendfile return type

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index e782e83f662..29acff325b2 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -755,7 +755,7 @@ class CMailFile
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
-				return $reshook;
+				return false;
 			}
 			if ($reshook == 1) {	// Hook replace standard code
 				return true;
@@ -1283,7 +1283,7 @@ class CMailFile
 				// Send mail method not correctly defined
 				// --------------------------------------
 
-				return 'Bad value for sendmode';
+				$this->error = 'Bad value for sendmode';
 			}
 
 			// Now we delete image files that were created dynamically to manage data inline files
@@ -1300,7 +1300,7 @@ class CMailFile
 				$this->error = "Error in hook maildao sendMailAfter ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
-				return $reshook;
+				return false;
 			}
 		} else {
 			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';

From cf28211a784af117fc5bf8adaccef41046ddb2af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 16:18:44 +0100
Subject: [PATCH 0996/1862] Update CMailFile.class.php

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 29acff325b2..cb073784e61 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1284,6 +1284,7 @@ class CMailFile
 				// --------------------------------------
 
 				$this->error = 'Bad value for sendmode';
+				return false;
 			}
 
 			// Now we delete image files that were created dynamically to manage data inline files

From 6679565638d619522280ba8587f28d70bb775cf0 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Tue, 12 Mar 2024 17:01:59 +0100
Subject: [PATCH 0997/1862] Fix: Error in the treatment of the date and the
 name of the variable

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

diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 0d6d4f52e68..f9d0edb5988 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2014 Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2024      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -519,7 +520,7 @@ class Productbatch extends CommonObject
 				$tmp->import_key = $obj->import_key;
 
 				if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-					$tmp->context['stock_date_entry'] = $obj->date_entree;
+					$tmp->context['stock_entry_date'] = $dbs->jdate($obj->date_entree);
 				}
 
 				if ($fk_product > 0) {

From 499bdea72ba34d8c4370b4d9073096cfc1c8d852 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 12 Mar 2024 17:21:32 +0100
Subject: [PATCH 0998/1862] Fix php warning

---
 htdocs/expedition/list.php                      | 2 +-
 htdocs/product/class/html.formproduct.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 86309c6da9f..92154e65c1d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -1117,7 +1117,7 @@ while ($i < $imaxinloop) {
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked'])) {
 			$shipment->fetchObjectLinked($shipment->id, $shipment->element);
 			$receiving = '';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) {
+			if (array_key_exists('delivery', $shipment->linkedObjects) && count($shipment->linkedObjects['delivery']) > 0) {
 				$receiving = reset($shipment->linkedObjects['delivery']);
 			}
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 660ed67acba..d0ce8aaf8e3 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -288,7 +288,7 @@ class FormProduct
 	{
 		global $conf, $langs, $user, $hookmanager;
 
-		dol_syslog(get_class($this)."::selectWarehouses $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $empty_label, $showstock, $forcecombo, $morecss", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectWarehouses " . (is_array($selected) ? 'selected is array' : $selected) . ", $htmlname, $filterstatus, $empty, $disabled, $fk_product, $empty_label, $showstock, $forcecombo, $morecss", LOG_DEBUG);
 
 		$out = '';
 		if (!getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {

From 40434773c7b808725097f6ad767d3000b55bd814 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Tue, 12 Mar 2024 18:22:59 +0100
Subject: [PATCH 0999/1862] New buttons for edit and delete pre_post prompt for
 each function

---
 htdocs/ai/admin/custom_prompt.php | 38 ++++++++++++++++++++++++++++++-
 htdocs/langs/en_US/help.lang      |  1 +
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index c784e9ae3b8..8f93431e363 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -126,6 +126,25 @@ if ($action == 'update' && !GETPOST('cancel')) {
 	$action = 'edit';
 }
 
+if ($action == 'confirm_deleteproperty') {
+	$key = GETPOST('key', 'alpha');
+
+	//var_dump($currentConfigurations[$key]);exit;
+	if (isset($currentConfigurations[$key])) {
+		unset($currentConfigurations[$key]);
+
+		$newConfigurationsJson = json_encode($currentConfigurations, JSON_UNESCAPED_UNICODE);
+		$res = dolibarr_set_const($db, 'AI_CONFIGURATIONS_PROMPT', $newConfigurationsJson, 'chaine', 0, '', $conf->entity);
+		if ($res) {
+			header("Location: ".$_SERVER['PHP_SELF']);
+			setEventMessages($langs->trans("SetupDeleted"), null, 'mesgs');
+			exit;
+		} else {
+			setEventMessages($langs->trans("ErrorDeleting"), null, 'errors');
+		}
+	}
+}
+
 
 /*
  * View
@@ -152,11 +171,25 @@ $newbutton = '';
 
 print load_fiche_titre($langs->trans("AIPromptForFeatures"), $newbutton, '');
 
+if ($action == 'deleteproperty') {
+	$formconfirm = $form->formconfirm(
+		$_SERVER["PHP_SELF"].'?key='.urlencode(GETPOST('key', 'alpha')),
+		$langs->trans('Delete'),
+		$langs->trans('ConfirmDeleteProperty', GETPOST('key', 'alpha')),
+		'confirm_deleteproperty',
+		'',
+		0,
+		1
+	);
+	print $formconfirm;
+}
+
 if ($action == 'edit') {
 	$out .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 	$out .= '<input type="hidden" name="action" value="update">';
 
+
 	$out .= '<table class="noborder centpercent">';
 	$out .= '<thead>';
 	$out .= '<tr class="liste_titre">';
@@ -235,7 +268,10 @@ if ($action == 'edit' || $action == 'create') {
 
 			$out .= '<thead>';
 			$out .= '<tr class="liste_titre">';
-			$out .= '<td>'.$arrayofaifeatures[$key]['picto'].' '.$langs->trans($arrayofaifeatures[$key]['label']).'</td>';
+			$out .= '<td>'.$arrayofaifeatures[$key]['picto'].' '.$langs->trans($arrayofaifeatures[$key]['label']);
+			$out .= '<a class="editfielda reposition marginleftonly marginrighttonly " href="'.$_SERVER["PHP_SELF"].'?action=editproperty&token='.newToken().'&key='.urlencode($key).'">'.img_edit().'</a>';
+			$out .= '<a class="deletefielda  marginleftonly right" href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&token='.newToken().'&key='.urlencode($key).'">'.img_delete().'</a>';
+			$out .= '</td>';
 			$out .= '<td></td>';
 			$out .= '</tr>';
 			$out .= '</thead>';
diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
index 17a6104d59a..ccfb6d8468d 100644
--- a/htdocs/langs/en_US/help.lang
+++ b/htdocs/langs/en_US/help.lang
@@ -21,3 +21,4 @@ LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for yo
 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>
+ConfirmDeleteProperty=Are you sure you want to delete this property ?
\ No newline at end of file

From 738c6eeeb7fac1a752b3a0c004a374160db11d87 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:17 +0100
Subject: [PATCH 1000/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/agenda_other.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 772bc0efa6a..dcc7cdec446 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015		Jean-François Ferry	    <jfefe@aternatik.fr>
  * Copyright (C) 2016		Charlie Benke		    <charlie@patas-monkey.com>
  * Copyright (C) 2017       Open-DSI                <support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -89,7 +90,7 @@ if ($action == 'set') {
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 
 	$defaultValues = new DefaultValues($db);
-	$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete', 't.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity));
+	$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page' => 'comm/action/card.php', 't.param' => 'complete', 't.user_id' => '0', 't.type' => 'createform', 't.entity' => $conf->entity));
 	if (!is_array($result) && $result < 0) {
 		setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
 	} elseif (count($result) > 0) {
@@ -123,18 +124,16 @@ if ($action == 'set') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db, $commande);
@@ -334,7 +333,7 @@ $htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoe
 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"));
+$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, getDolGlobalString('AGENDA_DEFAULT_VIEW'));
 print '</td></tr>'."\n";
 
@@ -369,7 +368,7 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right nowrap">'."\n";
 $defval = 'na';
 $defaultValues = new DefaultValues($db);
-$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete', 't.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity));
+$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page' => 'comm/action/card.php', 't.param' => 'complete', 't.user_id' => '0', 't.type' => 'createform', 't.entity' => $conf->entity));
 if (!is_array($result) && $result < 0) {
 	setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
 } elseif (count($result) > 0) {

From cccee21d5136488cad3e66a78eb6d66f257d67e9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:19 +0100
Subject: [PATCH 1001/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/agenda_reminder.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index fa4dd0df9a1..cdc6a2b8647 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017	Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -86,18 +87,16 @@ if ($action == 'set') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db, $commande);

From 7f798effcec95a000627d1821f434b7a39e86472 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:22 +0100
Subject: [PATCH 1002/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/bank.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index f8ca472744f..865b54f5878 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010-2016  Juanjo Menent	       <jmenent@2byte.es>
  * Copyright (C) 2013-2018  Philippe Grand         <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Jean-François Ferry    <jfefe@aternatik.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -131,18 +132,16 @@ if ($action == 'specimen') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/bank/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 547b5214596a83e9dd2a7c570869be6229a3335c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:25 +0100
Subject: [PATCH 1003/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/bom.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 319e5b71789..ebfa4e6772a 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -76,18 +77,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/bom/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From c764c0fd595a2275358fbbd7147d2a3b7e5cf140 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:28 +0100
Subject: [PATCH 1004/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/commande.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 62d11335384..af9db12a62b 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2011-2016 Philippe Grand			    <philippe.grand@atoo-net.com>
  * Copyright (C) 2013 	   Florian Henry			    <florian.henry@open-concept.pro>
  * Copyright (C) 2021		Frédéric France				<frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -86,18 +87,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 9fe6fd76949973fca7eff29c37a1a334b1db670a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:31 +0100
Subject: [PATCH 1005/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/contract.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index e30a2b8d0c5..89e09907a6e 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011-2013      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2011-2018      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,18 +83,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/contract/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 7d16c805b83aed1061d845d36b36411403f70a3f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:33 +0100
Subject: [PATCH 1006/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/delivery.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 123126c693e..2c66f284c7d 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -131,18 +132,16 @@ if ($action == 'specimen') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/delivery/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 73b8dfd77a30fb4a61a9c5df5ffc2422b4747c0d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:36 +0100
Subject: [PATCH 1007/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/eventorganization.php | 47 +++++++++++++++---------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 7016986b0bd..983a93a9c02 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -47,20 +48,20 @@ $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
 $arrayofparameters = array(
-	'EVENTORGANIZATION_TASK_LABEL'=>array('type'=>'textarea','enabled'=>1),
-	'EVENTORGANIZATION_CATEG_THIRDPARTY_CONF'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
-	'EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
-	'EVENTORGANIZATION_FILTERATTENDEES_CAT'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
-	'EVENTORGANIZATION_FILTERATTENDEES_TYPE'=>array('type'=>'thirdparty_type:', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	'EVENTORGANIZATION_TASK_LABEL' => array('type' => 'textarea','enabled' => 1),
+	'EVENTORGANIZATION_CATEG_THIRDPARTY_CONF' => array('type' => 'category:'.Categorie::TYPE_CUSTOMER, 'enabled' => 1),
+	'EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH' => array('type' => 'category:'.Categorie::TYPE_CUSTOMER, 'enabled' => 1),
+	'EVENTORGANIZATION_FILTERATTENDEES_CAT' => array('type' => 'category:'.Categorie::TYPE_CUSTOMER, 'enabled' => 1),
+	'EVENTORGANIZATION_FILTERATTENDEES_TYPE' => array('type' => 'thirdparty_type:', 'enabled' => 1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF' => array('type' => 'emailtemplate:conferenceorbooth', 'enabled' => 1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH' => array('type' => 'emailtemplate:conferenceorbooth', 'enabled' => 1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH' => array('type' => 'emailtemplate:conferenceorbooth', 'enabled' => 1),
+	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT' => array('type' => 'emailtemplate:conferenceorbooth', 'enabled' => 1),
 	//'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	//'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
-	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
-	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
+	'SERVICE_BOOTH_LOCATION' => array('type' => 'product', 'enabled' => 1),
+	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION' => array('type' => 'product', 'enabled' => 1),
+	'EVENTORGANIZATION_SECUREKEY' => array('type' => 'securekey', 'enabled' => 1),
 );
 
 $error = 0;
@@ -80,7 +81,7 @@ if (empty($user->admin)) {
  */
 
 if ($cancel) {
-	$action  ='';
+	$action  = '';
 }
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
@@ -111,18 +112,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/eventorganization/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);
@@ -218,7 +217,7 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
-		if ($val['enabled']==1) {
+		if ($val['enabled'] == 1) {
 			$setupnotempty++;
 			print '<tr class="oddeven"><td><!-- '.$constname.' -->';
 			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
@@ -230,7 +229,7 @@ if ($action == 'edit') {
 				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
 				print getDolGlobalString($constname);
 				print "</textarea>\n";
-			} elseif ($val['type']== 'html') {
+			} elseif ($val['type'] == 'html') {
 				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 				$doleditor->Create();
@@ -300,7 +299,7 @@ if ($action == 'edit') {
 		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
-			if ($val['enabled']==1) {
+			if ($val['enabled'] == 1) {
 				$setupnotempty++;
 				print '<tr class="oddeven">';
 				print '<td><!-- '.$constname.' -->';
@@ -311,7 +310,7 @@ if ($action == 'edit') {
 
 				if ($val['type'] == 'textarea') {
 					print dol_nl2br(getDolGlobalString($constname));
-				} elseif ($val['type']== 'html') {
+				} elseif ($val['type'] == 'html') {
 					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
@@ -348,13 +347,13 @@ if ($action == 'edit') {
 						print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 					}
 				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					if (getDolGlobalString($constname)==2) {
+					if (getDolGlobalString($constname) == 2) {
 						print $langs->trans("Prospect");
-					} elseif (getDolGlobalString($constname)==3) {
+					} elseif (getDolGlobalString($constname) == 3) {
 						print $langs->trans("ProspectCustomer");
-					} elseif (getDolGlobalString($constname)==1) {
+					} elseif (getDolGlobalString($constname) == 1) {
 						print $langs->trans("Customer");
-					} elseif (getDolGlobalString($constname)==0) {
+					} elseif (getDolGlobalString($constname) == 0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} elseif ($val['type'] == 'product') {

From 88632afe5efc5659557cb23716f8ba69e7d1b5a1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:39 +0100
Subject: [PATCH 1008/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/expedition.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index d054f3bfa5e..082d2a39741 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011-2018	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,18 +103,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/expedition/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 732056902ed551383daa23e4ca67b2430a3b98f4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:42 +0100
Subject: [PATCH 1009/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/expensereport.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 64cba2b7c6f..d0fa6cfd98b 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2022 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -83,18 +84,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 07d3e4cfe1ac2161243cd5e749a07756d01c6795 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:45 +0100
Subject: [PATCH 1010/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/fichinter.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index aba9db7f9fd..250d4d9e2cd 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,18 +83,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/fichinter/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 3291ec5afbc815017709cfdb96f3318c00aaea56 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:47 +0100
Subject: [PATCH 1011/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/holiday.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 34153e22866..1a8a343ea69 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2011-2018      Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2018		    Charlene Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018			Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,18 +83,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/holiday/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From a333aaf50a62399309a73cc1043149587444b826 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:50 +0100
Subject: [PATCH 1012/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/hrm.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index eef0a7a34a8..df883799b2b 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -116,18 +117,16 @@ if ($action == 'update') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/hrm/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 5d3f6187bd97a8276eba3ad79bc0ee52b1e48cbc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:53 +0100
Subject: [PATCH 1013/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/invoice.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/invoice.php b/htdocs/admin/invoice.php
index 26678685f53..a2f0282ba9f 100644
--- a/htdocs/admin/invoice.php
+++ b/htdocs/admin/invoice.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2012-2013  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2014		Teddy Andreotti				<125155@supinfo.com>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -99,18 +100,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/facture/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);
@@ -628,10 +627,10 @@ if (getDolGlobalString('INVOICE_USE_DEFAULT_DOCUMENT')) { // Hidden conf
 	print "</tr>\n";
 
 	$listtype = array(
-		Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
-		Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
-		Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
-		Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
+		Facture::TYPE_STANDARD => $langs->trans("InvoiceStandard"),
+		Facture::TYPE_REPLACEMENT => $langs->trans("InvoiceReplacement"),
+		Facture::TYPE_CREDIT_NOTE => $langs->trans("InvoiceAvoir"),
+		Facture::TYPE_DEPOSIT => $langs->trans("InvoiceDeposit"),
 	);
 	if (getDolGlobalInt('INVOICE_USE_SITUATION')) {
 		$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");

From 8afd985b6df5111d6fda4cdde88b5b5e681eb488 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:56 +0100
Subject: [PATCH 1014/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/knowledgemanagement.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index b8445a0fb9a..1f79f506c89 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021 SuperAdmin
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -94,18 +95,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From f8e8a0cad40fe0f380448aca44cf5a20b87f306e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:59 +0100
Subject: [PATCH 1015/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/mrp.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 5c2de506880..f616df182c4 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -77,18 +78,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/mrp/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 06071c6a91188d07608444f48a6b30d843c3e84f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:01 +0100
Subject: [PATCH 1016/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/propal.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 6913857a69f..401db58d473 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			   <jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,18 +83,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 02fe181cb9ae9d0e86d0ac79f11337d8ab58462f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:04 +0100
Subject: [PATCH 1017/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/reception_setup.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 3b5ee37b77c..b5f8e336b20 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -105,18 +106,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/reception/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From dc0ac0f6019486ff37fb65f7b77e63ea1fbc09f0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:07 +0100
Subject: [PATCH 1018/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/stock.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 7572ccd69ef..86f485c11a4 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2012-2013 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,18 +110,16 @@ if ($action == 'specimen') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/stock/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 97ec41cf4d758d9e0d5ff355215fcd064ddcf590 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:10 +0100
Subject: [PATCH 1019/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/stocktransfer.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index b7e027db2b2..dee8ebc3b14 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2021 SuperAdmin
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -91,18 +92,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/stocktransfer/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From ee18ef221cda0fc132ba8bbadfd35d73e52c554d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:13 +0100
Subject: [PATCH 1020/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/supplier_invoice.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 52b1342f88e..38db853af92 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,18 +103,16 @@ if ($action == 'specimen') {  // For invoices
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/supplier_invoice/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db, $facture);

From b5f0b6ae17f26b40bc6269f4bd086ef83dc26f43 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:15 +0100
Subject: [PATCH 1021/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/supplier_order.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 849a6dff7f3..ecfc2a68b93 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
 * Copyright (C) 2004-2011 Laurent Destailleur     <eldy@users.sourceforge.net>
 * Copyright (C) 2005-2011 Regis Houssin           <regis.houssin@inodbox.com>
 * Copyright (C) 2004      Sebastien Di Cintio     <sdicintio@ressource-toi.org>
@@ -92,18 +93,16 @@ if ($action == 'specimen') {  // For orders
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/supplier_order/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db, $commande);

From a015fa1c76b1a581d70a2fbaae273f2b6b5a6686 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:18 +0100
Subject: [PATCH 1022/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/supplier_payment.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index c8ac3fa4423..e420a914155 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2016  Laurent Destailleur          <eldy@users.sourceforge.net>
  * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -103,18 +104,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 05408a189370ef2f49d7bbc4193f51271142ccc6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:21 +0100
Subject: [PATCH 1023/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/supplier_proposal.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 09728fbe93e..94197b4bdad 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry		   <jfefe@aternatik.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,18 +82,16 @@ if ($action == 'specimen') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From bcd692ef6aa533d42a10ab3aba2f683018242f5b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:24 +0100
Subject: [PATCH 1024/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/webhook.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 7755856f8a0..4758220503d 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -99,18 +100,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/webhook/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 4e1d81984dcd67c85da9873e16d90bb0a008d249 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:27 +0100
Subject: [PATCH 1025/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/admin/workstation.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 67c2bb9869a..78084737c6e 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -84,18 +85,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 9dbf0742f13c51240002370d3031fafe56a3aaa3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:29 +0100
Subject: [PATCH 1026/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/ai/admin/setup.php | 47 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index 73e4765d7a4..9459b501b84 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -75,7 +76,7 @@ foreach ($arrayofia as $ia) {
 	$item->cssClass = 'minwidth500';
 }
 
-$setupnotempty =+ count($formSetup->items);
+$setupnotempty = + count($formSetup->items);
 
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -113,18 +114,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/ai/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);
@@ -193,45 +192,45 @@ $action = 'edit';
  * View
  */
 
- $form = new Form($db);
+$form = new Form($db);
 
- $help_url = '';
- $title = "AiSetup";
+$help_url = '';
+$title = "AiSetup";
 
- llxHeader('', $langs->trans($title), $help_url);
+llxHeader('', $langs->trans($title), $help_url);
 
- // Subheader
- $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
- print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 
- // Configuration header
- $head = aiAdminPrepareHead();
- print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "fa-microchip");
+// Configuration header
+$head = aiAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "fa-microchip");
 
- // Setup page goes here
- //echo '<span class="opacitymedium">'.$langs->trans("AiSetupPage").'</span><br><br>';
+// Setup page goes here
+//echo '<span class="opacitymedium">'.$langs->trans("AiSetupPage").'</span><br><br>';
 
 
 if ($action == 'edit') {
-	 print $formSetup->generateOutput(true);
-	 print '<br>';
+	print $formSetup->generateOutput(true);
+	print '<br>';
 } elseif (!empty($formSetup->items)) {
 	print $formSetup->generateOutput();
 	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 '<br>'.$langs->trans("NothingToSetup");
 }
 
 
 if (empty($setupnotempty)) {
-	 print '<br>'.$langs->trans("NothingToSetup");
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
- // Page end
- print dol_get_fiche_end();
+// Page end
+print dol_get_fiche_end();
 
- llxFooter();
- $db->close();
+llxFooter();
+$db->close();

From b79e5638a990eaaeb6233d8b0bf3d2c402e71675 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:31 +0100
Subject: [PATCH 1027/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/asset/admin/setup.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 72e6cac37ea..40e37464e90 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -96,18 +97,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 0a90a2eeaf1ac0a6bbb81cf4ae572af18e746b34 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:33 +0100
Subject: [PATCH 1028/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/bookcal/admin/setup.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index 7117deee8e1..1b445686550 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,7 +103,7 @@ $item->helpText = $langs->transnoentities('AnHelpMessage');*/
 //$item->fieldOutputOverride = false; // set this var to override field output
 
 
-$setupnotempty =+ count($formSetup->items);
+$setupnotempty = + count($formSetup->items);
 
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -145,18 +146,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/bookcal/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 69e335a13b667f29d71eca81f4cb11fa68593319 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:35 +0100
Subject: [PATCH 1029/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/core/ajax/onlineSign.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 996f7be806d..de58f75c303 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -1,4 +1,6 @@
 <?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -580,18 +582,15 @@ if ($action == "importSignature") {
 									$classname = 'pdf_' . $last_modelpdf;
 									break;
 								}
-								if ($filefound) {
-									break;
-								}
 							}
 
-							if (!$filefound) {
+							if ($filefound === '') {
 								$response = $langs->trans("Error") . ' Failed to load doc generator with modelpaths=' . $modelpath . ' - modele=' . $last_modelpdf;
 								dol_syslog($response, LOG_ERR);
 								$error++;
 							}
 
-							if (!$error) {
+							if (!$error && $classname !== '') {
 								// If PDF template class  was found
 								require_once $file;
 

From bba0d4661e4de281090ea3cab13727a931224533 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:37 +0100
Subject: [PATCH 1030/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 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 4c9edcc8868..796f0e04b02 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5705,7 +5705,7 @@ abstract class CommonObject
 			}
 		}
 
-		if (!$filefound) {
+		if ($filefound === '' || $classname === '') {
 			$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
 			$this->errors[] = $this->error;
 			dol_syslog($this->error, LOG_ERR);

From 7825954f2ab1d9f7efd24d3f085d41901320e36f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:39 +0100
Subject: [PATCH 1031/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/core/modules/fichinter/modules_fichinter.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 2abbbe07264..dc50dcb1804 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2019 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -108,7 +109,6 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array('/');
 	if (is_array($conf->modules_parts['models'])) {
 		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
@@ -120,18 +120,17 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 			// Get the location of the module and verify it exists
 			$file = dol_buildpath($reldir."core/modules/fichinter/doc/".$file, 0);
 			if (file_exists($file)) {
-				$filefound = 1;
 				$classname = $prefix.'_'.$modele;
 				break;
 			}
 		}
-		if ($filefound) {
+		if ($classname !== '') {
 			break;
 		}
 	}
 
 	// Charge le modele
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$obj = new $classname($db);

From a59fd68987edde62c75f2533f86c91d31a53296c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:41 +0100
Subject: [PATCH 1032/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/core/modules/member/modules_cards.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 912c540f220..853601860a8 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2004	   Eric Seigne			<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009 Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -115,7 +116,6 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array('/');
 	if (is_array($conf->modules_parts['models'])) {
 		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
@@ -127,19 +127,18 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 			// We check that file of doc generaotr exists
 			$file = dol_buildpath($reldir."core/modules/member/doc/".$file, 0);
 			if (file_exists($file)) {
-				$filefound = 1;
 				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
-		if ($filefound) {
+		if ($classname !== '') {
 			break;
 		}
 	}
 
 
 	// Charge le modele
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$obj = new $classname($db);

From 3d47d9b8946bdd3ce9d89b1b5f76c478a01448f6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:43 +0100
Subject: [PATCH 1033/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/core/modules/printsheet/modules_labels.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index 7e319e71112..47c35ceb597 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -117,7 +118,6 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array('/');
 	if (is_array($conf->modules_parts['models'])) {
 		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
@@ -129,18 +129,17 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 			// Determine the model path and validate that it exists
 			$file = dol_buildpath($reldir."core/modules/printsheet/doc/".$file, 0);
 			if (file_exists($file)) {
-				$filefound = 1;
 				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
-		if ($filefound) {
+		if ($classname !== '') {
 			break;
 		}
 	}
 
 	// Load the model
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$obj = new $classname($db);

From d5ffddbd8691c1011e7197b92f221664b600a9b7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:46 +0100
Subject: [PATCH 1034/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/don/admin/donation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 5a09ccd8f6b..3a0854cb103 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015-2020  Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Benoit Bruchard			<benoitb21@gmail.com>
  * Copyright (C) 2019       Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -62,7 +63,7 @@ if ($action == 'specimen') {
 	// Search template files
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
 	$file = $modele.".modules.php";
-	if (file_exists($dir.$file)) {
+	if ($modele !== '' && file_exists($dir.$file)) {
 		$classname = $modele;
 		require_once $dir.$file;
 

From 5a92724251dbef59b6a92dfa8155ded984bf9955 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:49 +0100
Subject: [PATCH 1035/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/emailcollector/class/emailcollector.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 7fdbfc5cca5..518529630fb 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2934,19 +2934,17 @@ class EmailCollector extends CommonObject
 									// Search template files
 									$file = '';
 									$classname = '';
-									$filefound = 0;
 									$reldir = '';
 									$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 									foreach ($dirmodels as $reldir) {
 										$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
 										if (file_exists($file)) {
-											$filefound = 1;
 											$classname = $modele;
 											break;
 										}
 									}
 
-									if ($filefound) {
+									if ($classname !== '') {
 										if ($savesocid > 0) {
 											if ($savesocid != $projecttocreate->socid) {
 												$errorforactions++;

From b7f49773548a5d7cca29814bafc02d566851dc4d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:52 +0100
Subject: [PATCH 1036/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/product/admin/product.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 8704a530387..a565fb86518 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2016      Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2016	   Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -168,18 +169,16 @@ if ($action == 'specimen') { // For products
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 9eb5b199bd69a83575d53c1ed0ffd31ce100166b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:54 +0100
Subject: [PATCH 1037/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/product/admin/product_lot.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index edc9ad53fd2..77dff433356 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021		Christophe Battarel  <christophe.battarel@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -115,18 +116,16 @@ if ($action == 'updateMaskLot') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir . "core/modules/product_batch/doc/pdf_" . $modele . ".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_" . $modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 7f4e3da7faa67edf6a03898280d457deb9a9c9b2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:56 +0100
Subject: [PATCH 1038/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/projet/admin/project.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 625b0bd76f7..184f8ac6104 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2018		Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -101,18 +102,16 @@ if ($action == 'updateMaskTask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 7efbf4808e35faa8684644685b2963df196775d0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:16:58 +0100
Subject: [PATCH 1039/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/recruitment/admin/setup.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index daf74ba39d7..296c20bffb5 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -120,18 +121,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 6cd54fd28130604734e67df80551669825fe6123 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:17:00 +0100
Subject: [PATCH 1040/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/recruitment/admin/setup_candidatures.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 37c641c8b29..c8324656aa3 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -91,18 +92,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 46c508b3570540367e1205d4c316bbcaebab8d83 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:17:02 +0100
Subject: [PATCH 1041/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 htdocs/webportal/admin/setup.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 48a3f73e2a4..7680e08cd9a 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -146,18 +147,16 @@ if ($action == 'updateMask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From fc732b1be5f479ed55ee4e3fff238b4d4ff220ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 18:49:29 +0100
Subject: [PATCH 1042/1862] fix mod barcode product

---
 .../barcode/mod_barcode_product_standard.php  | 27 ++++++++---------
 .../mod_barcode_thirdparty_standard.php       | 30 ++++++++-----------
 .../modules/barcode/modules_barcode.class.php |  8 ++---
 phpstan.neon.dist                             |  1 -
 4 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index ea68cd1810a..31859eb4ead 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -109,10 +109,10 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs			Object langs
-	 * @param	Product		$objproduct		Object product
+	 * @param	?Product	$objproduct		Object product
 	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objproduct = 0)
+	public function getExample($langs, $objproduct = null)
 	{
 		$examplebarcode = $this->getNextValue($objproduct, '');
 		if (!$examplebarcode) {
@@ -155,18 +155,19 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		return $out;
 	}
+
 	/**
 	 * Return next value
 	 *
-	 * @param	  CommonObject	$objproduct   Object product
-	 * @param	  string			  $type       	Type of barcode (EAN, ISBN, ...)
-	 * @return 	string      					      Value if OK, '' if module not configured, <0 if KO
+	 * @param	?CommonObject	$objproduct 	Object product (not used)
+	 * @param	string			$type    		Type of barcode (EAN, ISBN, ...)
+	 * @return 	string      					Value if OK, '' if module not configured, <0 if KO
 	 */
-	public function getNextValue($objproduct, $type = '')
+	public function getNextValue($objproduct = null, $type = '')
 	{
-		global $db, $conf;
+		global $db;
 
-		if (!$objproduct instanceof Product) {
+		if (is_object($objproduct) && !$objproduct instanceof Product) {
 			dol_syslog(get_class($this)."::getNextValue used on incompatible".get_class($objproduct), LOG_ERR);
 			return -1;
 		}
@@ -178,13 +179,8 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 			$type = getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE');
 		} //get barcode type configuration for products if $type not set
 
-		// TODO
-
 		// Get Mask value
-		$mask = '';
-		if (getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK')) {
-			$mask = getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK');
-		}
+		$mask = getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK');
 
 		if (empty($mask)) {
 			$this->error = 'NotConfigured';
@@ -216,7 +212,8 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 			}
 		}
 		//End barcode with key
-		return  $numFinal;
+
+		return $numFinal;
 	}
 
 
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index a0e94fd69a1..0113e7dfb39 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -72,10 +72,11 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	}
 
 
-	/**		Return description of module
+	/**
+	 * Return description of module
 	 *
-	 * 		@param	Translate 		$langs		Object langs
-	 * 		@return string      			Description of module
+	 * @param	Translate 	$langs		Object langs
+	 * @return  string      			Description of module
 	 */
 	public function info($langs)
 	{
@@ -120,10 +121,10 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	Translate	$langs			Object langs
-	 * @param	Societe		$objthirdparty	Object third-party
+	 * @param	?Societe	$objthirdparty	Object third-party
 	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objthirdparty = 0)
+	public function getExample($langs, $objthirdparty = null)
 	{
 		$examplebarcode = $this->getNextValue($objthirdparty, '');
 		if (!$examplebarcode) {
@@ -169,13 +170,13 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	/**
 	 * Return next value
 	 *
-	 * @param	CommonObject	$objthirdparty  Object third-party
+	 * @param	?CommonObject	$objthirdparty  Object third-party
 	 * @param	string			$type       	Type of barcode (EAN, ISBN, ...)
 	 * @return 	string      					Value if OK, '' if module not configured, <0 if KO
 	 */
-	public function getNextValue($objthirdparty, $type = '')
+	public function getNextValue($objthirdparty = null, $type = '')
 	{
-		global $db, $conf;
+		global $db;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // to be able to call function barcode_gen_ean_sum($ean)
@@ -184,13 +185,8 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 			$type = getDolGlobalString('GENBARCODE_BARCODETYPE_THIRDPARTY');
 		} //get barcode type configuration for companies if $type not set
 
-		// TODO
-
 		// Get Mask value
-		$mask = '';
-		if (getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK')) {
-			$mask = getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK');
-		}
+		$mask = getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK');
 
 		if (empty($mask)) {
 			$this->error = 'NotConfigured';
@@ -222,6 +218,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 			}
 		}
 		//End barcode with key
+
 		return  $numFinal;
 	}
 
@@ -242,10 +239,6 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 	 */
 	public function verif($db, &$code, $thirdparty, $thirdparty_type, $type)
 	{
-		global $conf;
-
-		//var_dump($code.' '.$thirdparty->ref.' '.$thirdparty_type);exit;
-
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		$result = 0;
@@ -273,6 +266,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		}
 
 		dol_syslog(get_class($this)."::verif type=".$thirdparty_type." result=".$result);
+
 		return $result;
 	}
 
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index e037b9e0a09..7a283f5189f 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -62,11 +62,11 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	CommonObject	$objcommon	Object Product, Thirdparty
-	 *	@param	string			  $type		    Type of barcode (EAN, ISBN, ...)
-	 *  @return string						        Value
+	 *	@param	?CommonObject	$objcommon	Object Product, Thirdparty
+	 *	@param	string			$type		Type of barcode (EAN, ISBN, ...)
+	 *  @return string						Value
 	 */
-	public function getNextValue($objcommon, $type = '')
+	public function getNextValue($objcommon = null, $type = '')
 	{
 		global $langs;
 		return $langs->trans("Function_getNextValue_InModuleNotWorking");
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 78867274e30..c354dfd5d84 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -54,7 +54,6 @@ parameters:
 		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Sprain\\SwissQrBill\\#'
 		- '#Constructor of class .* has an unused parameter #'
-		- '#Default value of the parameter#'
 	internalErrorsCountLimit: 50
 	cache:
 		nodesByFileCountMax: 512

From 37b22d5b90a2054b633a074ca4456efba885a14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 18:51:20 +0100
Subject: [PATCH 1043/1862] fix mod barcode product

---
 phpstan.neon.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c354dfd5d84..78867274e30 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -54,6 +54,7 @@ parameters:
 		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Sprain\\SwissQrBill\\#'
 		- '#Constructor of class .* has an unused parameter #'
+		- '#Default value of the parameter#'
 	internalErrorsCountLimit: 50
 	cache:
 		nodesByFileCountMax: 512

From 29b8d0db84156391261c6bea2a8a0b45735fbdf1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:05:15 +0100
Subject: [PATCH 1044/1862] Fix: Duplicate test on "shipping", replaced
 duplicate with delivery_note

# Fix: Duplicate test on "shipping", replaced duplicate with delivery_note

The second test on "shipping" was without effect but as the module was set to
"expedition_bon", I modified the test to delivery_note and put it closer to
the test on "shipping"
---
 htdocs/core/lib/functions.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 546ab720452..5729ea05203 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12169,16 +12169,16 @@ function getElementProperties($elementType)
 		$classname = 'Expedition';
 		$module = 'expedition';
 		$table_element = 'expedition';
+	} elseif ($elementType == 'delivery_note') {
+		$classpath = 'expedition/class';
+		$subelement = 'expedition';
+		$module = 'expedition_bon';
 	} elseif ($elementType == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
 		$module = 'supplier_proposal';
 		$element = 'supplierproposal';
 		$classfile = 'supplier_proposal';
 		$subelement = 'supplierproposal';
-	} elseif ($elementType == 'shipping') {
-		$classpath = 'expedition/class';
-		$subelement = 'expedition';
-		$module = 'expedition_bon';
 	} elseif ($elementType == 'delivery') {
 		$classpath = 'delivery/class';
 		$subelement = 'delivery';

From 8bd965fb8032aa1241d06c276d8197bf79ed6b48 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:09:06 +0100
Subject: [PATCH 1045/1862] Fix duplicate if condition

# Fix duplicate if condition

Removed the duplicate which had a different action but it was not effective in the code
so it was removed (it looks like a leftover).
---
 htdocs/core/modules/societe/modules_societe.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 1408c2cdf99..dff42b63e86 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -136,8 +137,6 @@ abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
 		$s = '';
 		if ($type == -1) {
 			$s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-		} elseif ($type == -1) {
-			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
 		} elseif ($type == 0) {
 			$s .= $langs->trans("CustomerCodeDesc").'<br>';
 		} elseif ($type == 1) {

From 1f31d29a7731bc16e0b3074b465d816812d2431a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:09:53 +0100
Subject: [PATCH 1046/1862] Fix duplicate if condition with same effect

---
 htdocs/core/lib/files.lib.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 8623989482c..aeceaa2f1be 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3289,10 +3289,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	} elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp)) {
-		// Wrapping for Scanner
-		$accessallowed = 1;
-		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 		// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
 		// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
 		// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser

From 6a64b3a50f8742ea81bdf833817962573c2a572a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:10:50 +0100
Subject: [PATCH 1047/1862] Fix duplicate if condition with same effect

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cfa495f3922..13995e6cc0b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2019-2021 Alexandre Spangaro    <aspangaro@open-dsi.fr>
  * Copyright (C) 2023	   Nick Fragoulis
  * Copyright (C) 2023	   Joachim Kueter		 <git-jk@bloxera.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -273,8 +274,6 @@ foreach ($object->fields as $key => $val) {
 			$newkey = $key;
 		} elseif (array_key_exists('f.'.$key, $arrayfields)) {
 			$newkey = 'f.'.$key;
-		} elseif (array_key_exists('f.'.$key, $arrayfields)) {
-			$newkey = 'f.'.$key;
 		} elseif (array_key_exists('s.'.$key, $arrayfields)) {
 			$newkey = 's.'.$key;
 		}

From 7e52b2f632c41ae94060690cbd87a9adff32fa0a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:13:40 +0100
Subject: [PATCH 1048/1862] Fix duplicate if condition with same effect

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4c9edcc8868..0ae97db829e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1659,8 +1659,6 @@ abstract class CommonObject
 						$modulename = 'agenda';
 					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
 						$modulename = 'fournisseur';
-					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
-						$modulename = 'fournisseur';
 					}
 					if (!empty($conf->{$modulename}->enabled)) {
 						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);

From 8f7fb3fac901c24d407dc440e8bfa502250633ef Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:16:44 +0100
Subject: [PATCH 1049/1862] Qual: No more exception for
 PhanPluginDuplicateIfCondition

---
 dev/tools/phan/baseline.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 1fd31534dad..68fc0c015e7 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -15,7 +15,6 @@ return [
     // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
     // PhanTypeArraySuspiciousNull : 10+ occurrences
     // PhanTypeInvalidUnaryOperandNumeric : 8 occurrences
-    // PhanPluginDuplicateIfCondition : 6 occurrences
     // PhanRedefineFunctionInternal : 6 occurrences
     // PhanPluginUnsafeEval : 5 occurrences
     // PhanParamSuspiciousOrder : 4 occurrences
@@ -51,7 +50,6 @@ return [
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/compta/facture/agenda-rec.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/facture/list.php' => ['PhanPluginDuplicateIfCondition'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/sociales/class/paymentsocialcontribution.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
@@ -62,7 +60,7 @@ return [
         'htdocs/compta/tva/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/core/class/commonobject.class.php' => ['PhanPluginDuplicateIfCondition', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/class/commonobject.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanNoopArray'],
@@ -72,8 +70,8 @@ return [
         'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/filemanagerdol/connectors/php/connector.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginDuplicateIfCondition'],
-        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginDuplicateIfCondition', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
+        'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
+        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
         'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/usergroups.lib.php' => ['PhanNoopArrayAccess'],
         'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder'],
@@ -84,7 +82,6 @@ return [
         'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanPluginDuplicateIfCondition'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],

From 21e0bb4a7656def5fd95f709528d618843fa5ff5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:00:58 +0100
Subject: [PATCH 1050/1862] Fix duplicate if condition (remove 2nd case with
 less effect

---
 htdocs/core/lib/files.lib.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index aeceaa2f1be..8b64dadea63 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3167,12 +3167,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/".(strpos($original_file, 'receipt/') === 0 ? '' : 'receipt/').$original_file;
-	} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
-		// Wrapping pour les actions
-		if ($fuser->hasRight('agenda', 'myactions', $read) || preg_match('/^specimen/i', $original_file)) {
-			$accessallowed = 1;
-		}
-		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp)) {
 		// Wrapping pour les actions
 		if ($fuser->hasRight('agenda', 'allactions', $read) || preg_match('/^specimen/i', $original_file)) {

From 6fd62a3591ae4e521901330a68e928fcdbe53261 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 20:22:23 +0100
Subject: [PATCH 1051/1862] Fix duplicate

---
 htdocs/langs/en_US/help.lang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
index ccfb6d8468d..17a6104d59a 100644
--- a/htdocs/langs/en_US/help.lang
+++ b/htdocs/langs/en_US/help.lang
@@ -21,4 +21,3 @@ LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for yo
 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>
-ConfirmDeleteProperty=Are you sure you want to delete this property ?
\ No newline at end of file

From a467b0f9f6579381c81d00a30b10d1e204735062 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 20:31:01 +0100
Subject: [PATCH 1052/1862] Fix trans

---
 htdocs/ai/admin/custom_prompt.php | 2 +-
 htdocs/langs/en_US/admin.lang     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 8f93431e363..ee62b646604 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -175,7 +175,7 @@ if ($action == 'deleteproperty') {
 	$formconfirm = $form->formconfirm(
 		$_SERVER["PHP_SELF"].'?key='.urlencode(GETPOST('key', 'alpha')),
 		$langs->trans('Delete'),
-		$langs->trans('ConfirmDeleteProperty', GETPOST('key', 'alpha')),
+		$langs->trans('ConfirmDeleteSetup', GETPOST('key', 'alpha')),
 		'confirm_deleteproperty',
 		'',
 		0,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e632b93088a..576180c6371 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2425,6 +2425,7 @@ LargeModern=Large - Modern
 SpecialCharActivation=Enable the button to open a virtual keyboard to enter special characters
 DeleteExtrafield=Delete extrafield
 ConfirmDeleteExtrafield=Do you confirm deletion of the field %s ? All data saved into this field will be definitely deleted
+ConfirmDeleteSetup=Are you sure you want to delete the setup for %s ?
 ExtraFieldsSupplierInvoicesRec=Complementary attributes (templates invoices)
 ExtraFieldsSupplierInvoicesLinesRec=Complementary attributes (template invoice lines)
 ParametersForTestEnvironment=Parameters for test environment

From 03798025b90afc1579390adc8af9bc0697ea4fa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 20:44:02 +0100
Subject: [PATCH 1053/1862] FIX #28787

---
 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 331b2627316..15e1758fa1a 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -137,7 +137,7 @@ class FormMail extends Form
 	public $witherrorsto;
 
 	/**
-	 * @var int 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+	 * @var int|string 		0=No attaches files, 1=Show attached files, 2=Can add new attached files, 'text'=Show attached files and the text
 	 */
 	public $withfile;
 

From 98f80f2e00f7e5f9481203b7d7ed6405e07b1250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 20:56:16 +0100
Subject: [PATCH 1054/1862] fix phpstan is incompatible with

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

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 85c6925c306..9511ebd660b 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1464,10 +1464,10 @@ class Holiday extends CommonObject
 	/**
 	 *	Returns the label of a status
 	 *
-	 *	@param      int		$status     Id status
-	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *  @param		integer	$startdate	Date holiday should start
-	 *	@return     string      		Label
+	 *	@param      int			$status     Id status
+	 *	@param      int			$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *  @param		int|string	$startdate	Date holiday should start
+	 *	@return     string      			Label
 	 */
 	public function LibStatut($status, $mode = 0, $startdate = '')
 	{
@@ -1520,7 +1520,7 @@ class Holiday extends CommonObject
 	 *   @param		string	$morecss		More CSS on select component
 	 *   @return    string					Show select of status
 	 */
-	public function selectStatutCP($selected = '', $htmlname = 'select_statut', $morecss = 'minwidth125')
+	public function selectStatutCP($selected = 0, $htmlname = 'select_statut', $morecss = 'minwidth125')
 	{
 		global $langs;
 
@@ -1541,7 +1541,7 @@ class Holiday extends CommonObject
 			}
 		}
 
-		$out .= '</select>'."\n";
+		$out .= "</select>\n";
 
 		$showempty = 0;
 		$out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);
@@ -1623,7 +1623,7 @@ class Holiday extends CommonObject
 	 *  @param		int		$fk_type	Type of vacation
 	 *  @return     int					0=Nothing done, 1=OK, -1=KO
 	 */
-	public function updateSoldeCP($userID = '', $nbHoliday = '', $fk_type = '')
+	public function updateSoldeCP($userID = 0, $nbHoliday = 0, $fk_type = 0)
 	{
 		global $user, $langs;
 
@@ -1741,7 +1741,7 @@ class Holiday extends CommonObject
 	 *  @param	int			$userid		Id user
 	 *  @return void
 	 */
-	public function createCPusers($single = false, $userid = '')
+	public function createCPusers($single = false, $userid = 0)
 	{
 		// do we have to add balance for all users ?
 		if (!$single) {

From 691e82593c85bfb8de824f6255b337396f0a8f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 21:04:20 +0100
Subject: [PATCH 1055/1862] fix phpstan is incompatible with

---
 htdocs/holiday/class/holiday.class.php | 56 +++++++++++++++++---------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 9511ebd660b..69623e47103 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -71,17 +71,36 @@ class Holiday extends CommonObject
 	 */
 	public $description;
 
-	public $date_debut = ''; // Date start in PHP server TZ
-	public $date_fin = ''; // Date end in PHP server TZ
-	public $date_debut_gmt = ''; // Date start in GMT
-	public $date_fin_gmt = ''; // Date end in GMT
-	public $halfday = ''; // 0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
+	/**
+	 * @var int|string Date start in PHP server TZ
+	 */
+	public $date_debut = '';
 
 	/**
-	 * @var int
+	 * @var int|string Date end in PHP server TZ
+	 */
+	public $date_fin = '';
+
+	/**
+	 * @var int|string Date start in GMT
+	 */
+	public $date_debut_gmt = '';
+
+	/**
+	 * @var int|string Date end in GMT
+	 */
+	public $date_fin_gmt = '';
+
+	/**
+	 * @var int|string 0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
+	 */
+	public $halfday = '';
+
+	/**
+	 * @var int Status 1=draft, 2=validated, 3=approved, 4 canceled, 5 refused
 	 * @deprecated
 	 */
-	public $statut = 0; // 1=draft, 2=validated, 3=approved
+	public $statut = 0;
 
 	/**
 	 * @var int 	ID of user that must approve. Real user for approval is fk_user_valid (old version) or fk_user_approve (new versions)
@@ -133,7 +152,9 @@ class Holiday extends CommonObject
 	 */
 	public $fk_user_create;
 
-
+	/**
+	 * @var string Detail of refuse
+	 */
 	public $detail_refuse = '';
 
 	/**
@@ -760,8 +781,8 @@ class Holiday extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
 		$sql .= " fk_user_valid = ".((int) $user->id).",";
 		$sql .= " date_valid = '".$this->db->idate(dol_now())."',";
-		if (!empty($this->statut) && is_numeric($this->statut)) {
-			$sql .= " statut = ".((int) $this->statut).",";
+		if (!empty($this->status) && is_numeric($this->status)) {
+			$sql .= " statut = ".((int) $this->status).",";
 		} else {
 			$this->error = 'Property status must be a numeric value';
 			$error++;
@@ -888,8 +909,8 @@ class Holiday extends CommonObject
 			$error++;
 		}
 		$sql .= " halfday = ".((int) $this->halfday).",";
-		if (!empty($this->statut) && is_numeric($this->statut)) {
-			$sql .= " statut = ".((int) $this->statut).",";
+		if (!empty($this->status) && is_numeric($this->status)) {
+			$sql .= " statut = ".((int) $this->status).",";
 		} else {
 			$error++;
 		}
@@ -993,7 +1014,7 @@ class Holiday extends CommonObject
 
 		$checkBalance = getDictionaryValue('c_holiday_types', 'block_if_negative', $this->fk_type);
 
-		if ($checkBalance > 0 && $this->statut != self::STATUS_DRAFT) {
+		if ($checkBalance > 0 && $this->status != self::STATUS_DRAFT) {
 			$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
 
 			if ($balance < 0) {
@@ -1018,8 +1039,8 @@ class Holiday extends CommonObject
 			$error++;
 		}
 		$sql .= " halfday = ".$this->halfday.",";
-		if (!empty($this->statut) && is_numeric($this->statut)) {
-			$sql .= " statut = ".$this->statut.",";
+		if (!empty($this->status) && is_numeric($this->status)) {
+			$sql .= " statut = ".$this->status.",";
 		} else {
 			$error++;
 		}
@@ -1338,7 +1359,7 @@ class Holiday extends CommonObject
 
 		$datas = array();
 		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Holiday").'</u>';
-		if (isset($this->statut)) {
+		if (isset($this->status)) {
 			$datas['picto'] .= ' '.$this->getLibStatut(5);
 		}
 		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -1457,7 +1478,7 @@ class Holiday extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut, $mode, $this->date_debut);
+		return $this->LibStatut($this->status, $mode, $this->date_debut);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2363,7 +2384,6 @@ class Holiday extends CommonObject
 		$this->fk_validator = $user->id;
 		$this->halfday = 0;
 		$this->fk_type = 1;
-		$this->statut = Holiday::STATUS_VALIDATED;
 		$this->status = Holiday::STATUS_VALIDATED;
 
 		return 1;

From bf954e9cd7dacf9ee77f9d1abbd705665804f990 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 21:04:20 +0100
Subject: [PATCH 1056/1862] Fix for compatibility

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 546ab720452..326f5e9236a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -261,6 +261,16 @@ function isModEnabled($module)
 		$arrayconv['supplier_order'] = 'fournisseur';
 		$arrayconv['supplier_invoice'] = 'fournisseur';
 	}
+	// Special case.
+	// @TODO Replace isModEnabled('delivery_note') with
+	// isModEnabled('shipping') && getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')
+	if ($module == 'delivery_note') {
+		if (!getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {
+			return false;
+		} else {
+			$module = 'shipping';
+		}
+	}
 
 	$module_alt = $module;
 	if (!empty($arrayconv[$module])) {

From 9807ed32e8a6ef87c9b57a6207e69c961d86619e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Mar 2024 21:09:23 +0100
Subject: [PATCH 1057/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5729ea05203..d157c6b62e2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12170,19 +12170,19 @@ function getElementProperties($elementType)
 		$module = 'expedition';
 		$table_element = 'expedition';
 	} elseif ($elementType == 'delivery_note') {
-		$classpath = 'expedition/class';
-		$subelement = 'expedition';
-		$module = 'expedition_bon';
+		$classpath = 'delivery/class';
+		$subelement = 'delivery';
+		$module = 'expedition';
+	} elseif ($elementType == 'delivery') {
+		$classpath = 'delivery/class';
+		$subelement = 'delivery';
+		$module = 'expedition';
 	} elseif ($elementType == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
 		$module = 'supplier_proposal';
 		$element = 'supplierproposal';
 		$classfile = 'supplier_proposal';
 		$subelement = 'supplierproposal';
-	} elseif ($elementType == 'delivery') {
-		$classpath = 'delivery/class';
-		$subelement = 'delivery';
-		$module = 'expedition';
 	} elseif ($elementType == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';

From a548d453b4b70af06706c3df4d6cd1f9c7cea6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 21:15:01 +0100
Subject: [PATCH 1058/1862] clean deprecated

---
 htdocs/holiday/card.php           | 62 +++++++++++++++----------------
 htdocs/holiday/card_group.php     | 16 ++++----
 htdocs/holiday/define_holiday.php |  3 +-
 htdocs/holiday/document.php       | 10 ++---
 htdocs/holiday/list.php           |  8 ++--
 htdocs/holiday/month_report.php   |  4 +-
 htdocs/holiday/view_log.php       |  9 +++--
 7 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 93d6cbe538a..48b96e4dd39 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2017  Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2018-2023  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2020-2021  Udo Tamm            <dev@dolibit.de>
  * Copyright (C) 2022		Anthony Berton      <anthony.berton@bb2a.fr>
  *
@@ -108,7 +108,7 @@ $candelete = 0;
 if ($user->hasRight('holiday', 'delete')) {
 	$candelete = 1;
 }
-if ($object->statut == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'write') && in_array($object->fk_user, $childids)) {
+if ($object->status == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'write') && in_array($object->fk_user, $childids)) {
 	$candelete = 1;
 }
 
@@ -116,7 +116,7 @@ if ($object->statut == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'writ
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->statut);
+$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->status);
 
 
 /*
@@ -357,7 +357,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 
 		// If under validation
-		if ($object->statut == Holiday::STATUS_DRAFT) {
+		if ($object->status == Holiday::STATUS_DRAFT) {
 			// If this is the requester or has read/write rights
 			if ($cancreate) {
 				$approverid = GETPOSTINT('valideur');
@@ -440,7 +440,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 
 		// 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) {
+		if ($object->status == Holiday::STATUS_DRAFT || $object->status == Holiday::STATUS_CANCELED || $object->status == Holiday::STATUS_REFUSED) {
 			$result = $object->delete($user);
 		} else {
 			$error++;
@@ -462,10 +462,10 @@ if (empty($reshook)) {
 		$object->fetch($id);
 
 		// If draft and owner of leave
-		if ($object->statut == Holiday::STATUS_DRAFT && $cancreate) {
+		if ($object->status == Holiday::STATUS_DRAFT && $cancreate) {
 			$object->oldcopy = dol_clone($object, 2);
 
-			$object->statut = Holiday::STATUS_VALIDATED;
+			$object->status = Holiday::STATUS_VALIDATED;
 
 			$verif = $object->validate($user);
 
@@ -598,7 +598,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 
 		// If status is waiting approval and approver is also user
-		if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) {
+		if ($object->status == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) {
 			$object->oldcopy = dol_clone($object, 2);
 
 			$object->date_approval = dol_now();
@@ -703,7 +703,7 @@ if (empty($reshook)) {
 			$object->fetch($id);
 
 			// If status pending validation and validator = user
-			if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) {
+			if ($object->status == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) {
 				$object->date_refuse = dol_now();
 				$object->fk_user_refuse = $user->id;
 				$object->statut = Holiday::STATUS_REFUSED;
@@ -794,7 +794,7 @@ if (empty($reshook)) {
 
 		$object->fetch($id);
 
-		$oldstatus = $object->statut;
+		$oldstatus = $object->status;
 		$object->statut = Holiday::STATUS_DRAFT;
 		$object->status = Holiday::STATUS_DRAFT;
 
@@ -821,11 +821,11 @@ if (empty($reshook)) {
 		$object->fetch($id);
 
 		// 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) &&
+		if (($object->status == Holiday::STATUS_VALIDATED || $object->status == Holiday::STATUS_APPROVED) &&
 			(!empty($user->admin) || $user->id == $object->fk_validator || $cancreate || $cancreateall)) {
 			$db->begin();
 
-			$oldstatus = $object->statut;
+			$oldstatus = $object->status;
 			$object->date_cancel = dol_now();
 			$object->fk_user_cancel = $user->id;
 			$object->statut = Holiday::STATUS_CANCELED;
@@ -1253,8 +1253,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			if ($canread) {
 				$head = holiday_prepare_head($object);
 
-				if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {
-					if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) {
+				if (($action == 'edit' && $object->status == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {
+					if ($action == 'edit' && $object->status == Holiday::STATUS_DRAFT) {
 						$edit = true;
 					}
 
@@ -1364,7 +1364,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				print '</td>';
 				print '</tr>';
 
-				if ($object->statut == Holiday::STATUS_REFUSED) {
+				if ($object->status == Holiday::STATUS_REFUSED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DetailRefusCP').'</td>';
 					print '<td>'.$object->detail_refuse.'</td>';
@@ -1414,14 +1414,14 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				if (!$edit && $action != 'editvalidator') {
 					print '<tr>';
 					print '<td class="titlefield">';
-					if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
+					if ($object->status == Holiday::STATUS_APPROVED || $object->status == Holiday::STATUS_CANCELED) {
 						print $langs->trans('ApprovedBy');
 					} else {
 						print $langs->trans('ReviewedByCP');
 					}
 					print '</td>';
 					print '<td>';
-					if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
+					if ($object->status == Holiday::STATUS_APPROVED || $object->status == Holiday::STATUS_CANCELED) {
 						if ($object->fk_user_approve > 0) {
 							$approverdone = new User($db);
 							$approverdone->fetch($object->fk_user_approve);
@@ -1431,7 +1431,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						print $approverexpected->getNomUrl(-1);
 					}
 					$include_users = $object->fetch_users_approver_holiday();
-					if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED) {
+					if (is_array($include_users) && in_array($user->id, $include_users) && $object->status == Holiday::STATUS_VALIDATED) {
 						print '<a class="editfielda paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
 					}
 					print '</td>';
@@ -1463,19 +1463,19 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				print '<td>'.$langs->trans('DateCreation').'</td>';
 				print '<td>'.dol_print_date($object->date_create, 'dayhour', 'tzuser').'</td>';
 				print '</tr>';
-				if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
+				if ($object->status == Holiday::STATUS_APPROVED || $object->status == Holiday::STATUS_CANCELED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DateValidCP').'</td>';
 					print '<td>'.dol_print_date($object->date_approval, 'dayhour', 'tzuser').'</td>'; // warning: date_valid is approval date on holiday module
 					print '</tr>';
 				}
-				if ($object->statut == Holiday::STATUS_CANCELED) {
+				if ($object->status == Holiday::STATUS_CANCELED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DateCancelCP').'</td>';
 					print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td>';
 					print '</tr>';
 				}
-				if ($object->statut == Holiday::STATUS_REFUSED) {
+				if ($object->status == Holiday::STATUS_REFUSED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DateRefusCP').'</td>';
 					print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser').'</td>';
@@ -1500,7 +1500,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				}
 
 				// Si envoi en validation
-				if ($action == 'sendToValidate' && $object->statut == Holiday::STATUS_DRAFT) {
+				if ($action == 'sendToValidate' && $object->status == Holiday::STATUS_DRAFT) {
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleToValidCP"), $langs->trans("ConfirmToValidCP"), "confirm_send", '', 1, 1);
 				}
 
@@ -1525,9 +1525,9 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleSetToDraft"), $langs->trans("ConfirmSetToDraft"), "confirm_draft", '', 1, 1);
 				}
 
-				if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {
-					if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) {
-						if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {
+				if (($action == 'edit' && $object->status == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {
+					if ($action == 'edit' && $object->status == Holiday::STATUS_DRAFT) {
+						if ($cancreate && $object->status == Holiday::STATUS_DRAFT) {
 							print $form->buttonsSaveCancel();
 						}
 					}
@@ -1540,15 +1540,15 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 					print '<div class="tabsAction">';
 
-					if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {
+					if ($cancreate && $object->status == Holiday::STATUS_DRAFT) {
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'" class="butAction">'.$langs->trans("EditCP").'</a>';
 					}
 
-					if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {		// If draft
+					if ($cancreate && $object->status == Holiday::STATUS_DRAFT) {		// If draft
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate&token='.newToken().'" class="butAction">'.$langs->trans("Validate").'</a>';
 					}
 
-					if ($object->statut == Holiday::STATUS_VALIDATED) {	// If validated
+					if ($object->status == Holiday::STATUS_VALIDATED) {	// If validated
 						// Button Approve / Refuse
 						if ($user->id == $object->fk_validator) {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid&token='.newToken().'" class="butAction">'.$langs->trans("Approve").'</a>';
@@ -1567,7 +1567,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 							}
 						}
 					}
-					if ($object->statut == Holiday::STATUS_APPROVED) { // If validated and approved
+					if ($object->status == Holiday::STATUS_APPROVED) { // If validated and approved
 						if ($user->id == $object->fk_validator || $user->id == $object->fk_user_approve || $cancreate || $cancreateall) {
 							if (($object->date_fin > dol_now()) || !empty($user->admin) || $user->id == $object->fk_user_approve) {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
@@ -1583,10 +1583,10 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						}
 					}
 
-					if (($cancreate || $cancreateall) && $object->statut == Holiday::STATUS_CANCELED) {
+					if (($cancreate || $cancreateall) && $object->status == 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
+					if ($candelete && ($object->status == Holiday::STATUS_DRAFT || $object->status == Holiday::STATUS_CANCELED || $object->status == Holiday::STATUS_REFUSED)) {	// If draft or canceled or refused
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
 					}
 
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 129353718b9..3d01863ed95 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2017  Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2020-2021  Udo Tamm            <dev@dolibit.de>
  * Copyright (C) 2022		Anthony Berton      <anthony.berton@bb2a.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
@@ -50,10 +50,10 @@ $confirm 		= GETPOST('confirm', 'alpha');
 $id 			= GETPOSTINT('id');
 $ref 			= GETPOST('ref', 'alpha');
 $fuserid 		= (GETPOSTINT('fuserid') ? GETPOSTINT('fuserid') : $user->id);
-$users 			=  (GETPOST('users', 'array') ? GETPOST('users', 'array') : array($user->id));
+$users 			= (GETPOST('users', 'array') ? GETPOST('users', 'array') : array($user->id));
 $groups 		= GETPOST('groups', 'array');
 $socid 			= GETPOSTINT('socid');
-$autoValidation 	= GETPOSTINT('autoValidation');
+$autoValidation = GETPOSTINT('autoValidation');
 $AutoSendMail   = GETPOSTINT('AutoSendMail');
 // Load translation files required by the page
 $langs->loadLangs(array("other", "holiday", "mails", "trips"));
@@ -109,7 +109,7 @@ $candelete = 0;
 if ($user->hasRight('holiday', 'delete')) {
 	$candelete = 1;
 }
-if ($object->statut == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'write') && in_array($object->fk_user, $childids)) {
+if ($object->status == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'write') && in_array($object->fk_user, $childids)) {
 	$candelete = 1;
 }
 
@@ -117,7 +117,7 @@ if ($object->statut == Holiday::STATUS_DRAFT && $user->hasRight('holiday', 'writ
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->statut);
+$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->status);
 
 
 /*
@@ -325,7 +325,7 @@ if (empty($reshook)) {
 								$htemp = new Holiday($db);
 								$htemp->fetch($result);
 
-								$htemp->statut = Holiday::STATUS_VALIDATED;
+								$htemp->status = Holiday::STATUS_VALIDATED;
 								$resultValidated = $htemp->update($approverid);
 
 								if ($resultValidated < 0) {
@@ -685,10 +685,10 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 
 	if ($result) {
 		// If draft and owner of leave
-		if ($object->statut == Holiday::STATUS_VALIDATED && $cancreate) {
+		if ($object->status == Holiday::STATUS_VALIDATED && $cancreate) {
 			$object->oldcopy = dol_clone($object, 2);
 
-			//if ($autoValidation) $object->statut = Holiday::STATUS_VALIDATED;
+			//if ($autoValidation) $object->status = Holiday::STATUS_VALIDATED;
 
 			$verif = $object->validate($user);
 
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 9bcd2ea51c4..4b8c0974eef 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
  * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -431,7 +432,7 @@ if (count($typeleaves) == 0) {
 		$userstatic->firstname = $users['firstname'];
 		$userstatic->gender = $users['gender'];
 		$userstatic->photo = $users['photo'];
-		$userstatic->statut = $users['status'];
+		$userstatic->status = $users['status'];
 		$userstatic->employee = $users['employee'];
 		$userstatic->fk_user = $users['fk_user'];
 
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 94c60cf964e..2722521ca0f 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005       Simon TOSSER            <simon@kornog-computing.com>
  * Copyright (C) 2011-2012  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
- * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -212,7 +212,7 @@ if ($object->id) {
 	print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
 	print '</tr>';
 
-	if ($object->statut == 5) {
+	if ($object->status == Holiday::STATUS_REFUSED) {
 		print '<tr>';
 		print '<td>'.$langs->trans('DetailRefusCP').'</td>';
 		print '<td>'.$object->detail_refuse.'</td>';
@@ -258,19 +258,19 @@ if ($object->id) {
 	print '<td>'.$langs->trans('DateCreation').'</td>';
 	print '<td>'.dol_print_date($object->date_create,'dayhour').'</td>';
 	print '</tr>';
-	if ($object->statut == 3) {
+	if ($object->status == 3) {
 		print '<tr>';
 		print '<td>'.$langs->trans('DateValidCP').'</td>';
 		print '<td>'.dol_print_date($object->date_valid,'dayhour').'</td>';
 		print '</tr>';
 	}
-	if ($object->statut == 4) {
+	if ($object->status == 4) {
 		print '<tr>';
 		print '<td>'.$langs->trans('DateCancelCP').'</td>';
 		print '<td>'.dol_print_date($object->date_cancel,'dayhour').'</td>';
 		print '</tr>';
 	}
-	if ($object->statut == 5) {
+	if ($object->status == 5) {
 		print '<tr>';
 		print '<td>'.$langs->trans('DateRefusCP').'</td>';
 		print '<td>'.dol_print_date($object->date_refuse,'dayhour').'</td>';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 42c2d0808f6..a4eaae03a85 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2020 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016 Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2018      Charlene Benke	<charlie@patas-monkey.com>
- * Copyright (C) 2019-2023 Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France		<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -842,7 +842,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 		// Leave request
 		$holidaystatic->id = $obj->rowid;
 		$holidaystatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
-		$holidaystatic->statut = $obj->status;
+		$holidaystatic->status = $obj->status;
 		$holidaystatic->date_debut = $db->jdate($obj->date_debut);
 		$holidaystatic->date_fin = $db->jdate($obj->date_fin);
 
@@ -853,7 +853,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 		$userstatic->admin = $obj->user_admin;
 		$userstatic->email = $obj->user_email;
 		$userstatic->login = $obj->user_login;
-		$userstatic->statut = $obj->user_status;
+		$userstatic->status = $obj->user_status;
 		$userstatic->photo = $obj->user_photo;
 
 		// Validator
@@ -863,7 +863,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 		$approbatorstatic->admin = $obj->validator_admin;
 		$approbatorstatic->email = $obj->validator_email;
 		$approbatorstatic->login = $obj->validator_login;
-		$approbatorstatic->statut = $obj->validator_status;
+		$approbatorstatic->status = $obj->validator_status;
 		$approbatorstatic->photo = $obj->validator_photo;
 
 		$date = $obj->date_create;
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 6f10f9c9ce9..75831e91497 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2011       François Legastelois    <flegastelois@teclib.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -399,7 +399,7 @@ if ($num == 0) {
 		// Leave request
 		$holidaystatic->id = $obj->rowid;
 		$holidaystatic->ref = $obj->ref;
-		$holidaystatic->statut = $obj->status;
+		$holidaystatic->status = $obj->status;
 		$holidaystatic->status = $obj->status;
 		$holidaystatic->fk_user = $obj->fk_user;
 		$holidaystatic->fk_type = $obj->fk_type;
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 0820c283618..ac042253777 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Dimitri Mouillard    <dmouillard@teclib.com>
  * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -464,12 +465,12 @@ while ($i < min($num, $limit)) {
 
 	$holidaylogstatic->id = $obj['rowid'];
 	$holidaylogstatic->date = $obj['date_action'];
-	$holidaylogstatic->validator		= $obj['fk_user_action'];
-	$holidaylogstatic->employee			= $obj['fk_user_update'];
-	$holidaylogstatic->description		= $obj['type_action'];
+	$holidaylogstatic->validator = $obj['fk_user_action'];
+	$holidaylogstatic->employee = $obj['fk_user_update'];
+	$holidaylogstatic->description = $obj['type_action'];
 	$holidaylogstatic->type = $obj['fk_type'];
 	$holidaylogstatic->balance_previous = $obj['prev_solde'];
-	$holidaylogstatic->balance_new		= $obj['new_solde'];
+	$holidaylogstatic->balance_new = $obj['new_solde'];
 
 	print '<tr class="oddeven">';
 

From 8068d07c83620ab4bacc17a49ff2033db526c30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 21:21:29 +0100
Subject: [PATCH 1059/1862] fix warning

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 48b96e4dd39..895d96d6966 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1290,8 +1290,12 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				print '<td>'.$langs->trans("Type").'</td>';
 				print '<td>';
 				$typeleaves = $object->getTypes(1, -1);
-				$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-				print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
+				if (empty($typeleaves[$object->fk_type])) {
+					$labeltoshow = $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type);
+				} else {
+					$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+				}
+				print $labeltoshow;
 				print '</td>';
 				print '</tr>';
 

From d5c5982b20347f8f7382aaf6adb9e0259077b79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 21:24:28 +0100
Subject: [PATCH 1060/1862] fix warnings

---
 htdocs/holiday/class/holiday.class.php | 2 +-
 htdocs/holiday/document.php            | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 69623e47103..c12032028e6 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2345,7 +2345,7 @@ class Holiday extends CommonObject
 				$this->date_approval = $this->db->jdate($obj->datea);
 
 				$this->user_creation_id = $obj->fk_user_creation;
-				$this->user_validation_id = $obj->fk_user_valid;
+				$this->user_validation_id = $obj->fk_user_validation;
 				$this->user_modification_id = $obj->fk_user_modification;
 
 				if ($obj->status == Holiday::STATUS_APPROVED || $obj->status == Holiday::STATUS_CANCELED) {
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 2722521ca0f..43fe279c57d 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -167,8 +167,12 @@ if ($object->id) {
 	print '<td>'.$langs->trans("Type").'</td>';
 	print '<td>';
 	$typeleaves = $object->getTypes(1, -1);
-	$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-	print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
+	if (empty($typeleaves[$object->fk_type])) {
+		$labeltoshow = $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type);
+	} else {
+		$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+	}
+	print $labeltoshow;
 	print '</td>';
 	print '</tr>';
 

From 4bc9f52957236bf6509d28c55a8800f50f2b8b1c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:23:37 +0100
Subject: [PATCH 1061/1862] Fix PhanPluginMixedKeyNoKey - real missing
 key/value mapping

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

diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index c1592b01db3..4b6f6f60939 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2014-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2020       OScss-Shop          <support@oscss-shop.fr>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -331,7 +332,7 @@ class Fiscalyear extends CommonObject
 		$params = [
 			'id' => $this->id,
 			'objecttype' => $this->element,
-			'option', $option,
+			'option' => $option,
 			'nofetch' => 1,
 		];
 		$classfortooltip = 'classfortooltip';

From 2f5a227f8c7774a22b6f0a9e51d3fb80379e53d8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:31:51 +0100
Subject: [PATCH 1062/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

---
 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 1f954f6a9ad..479887a5724 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015       Ari Elbaz (elarifr)  <github@accedinfo.com>
  * Copyright (C) 2018       Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -745,7 +746,7 @@ class AccountingAccount extends CommonObject
 		$hookmanager->initHooks(array('accountancyBindingCalculation'));
 
 		// Execute hook accountancyBindingCalculation
-		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount' => $accountingAccount, $type);
+		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount' => $accountingAccount, 0 => $type);
 		$reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
 
 		if (empty($reshook)) {

From 7eb27d189153d41d3dabb863b6d4accd182789ff Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:31:53 +0100
Subject: [PATCH 1063/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 147415be9fa..559530a6873 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1151,8 +1151,8 @@ if ($action == 'create') {
 				// Create an array for form
 				$formquestion = array(
 					'text' => $langs->trans("ConfirmClone"),
-				array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
-				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
+				0 => array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
+				1 => array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
 				);
 				// Incomplete payment. On demande si motif = escompte ou autre
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneEMailing', $object->ref), 'confirm_clone', $formquestion, 'yes', 2, 240);

From ce626d72ede921616f8e9d70f6d77810faa89554 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:31:59 +0100
Subject: [PATCH 1064/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

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

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index f1584aa8b30..1ed17699c6d 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2019 Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -560,8 +561,8 @@ if ($socid > 0) {
 				$amount2 = ($showconfirminfo['amount_ttc'] - $amount1);
 				$formquestion = array(
 					'text' => $langs->trans('TypeAmountOfEachNewDiscount'),
-					array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
-					array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
+					0 => array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
+					1 => array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
 				);
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, '', 0);
@@ -707,8 +708,8 @@ if ($socid > 0) {
 				$amount2 = ($showconfirminfo['amount_ttc'] - $amount1);
 				$formquestion = array(
 					'text' => $langs->trans('TypeAmountOfEachNewDiscount'),
-					array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
-					array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
+					0 => array('type' => 'text', 'name' => 'amount_ttc_1', 'label' => $langs->trans("AmountTTC").' 1', 'value' => $amount1, 'size' => '5'),
+					1 => array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5')
 				);
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);

From d8c7aad698b11d2518b987ebda2617fc3ab54535 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:02 +0100
Subject: [PATCH 1065/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ecb64ab4396..f01432b7c25 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1662,7 +1663,7 @@ if (empty($reshook)) {
 									null,
 									0,
 									'',
-									(!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)?0:1)
+									(!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) ? 0 : 1)
 								);
 							}
 
@@ -4459,7 +4460,7 @@ if ($action == 'create') {
 		}
 
 		// Create a form table
-		$formquestion = array('text' => $langs->trans("ConfirmClassifyPaidPartiallyQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
+		$formquestion = array('text' => $langs->trans("ConfirmClassifyPaidPartiallyQuestion"), 0 => array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), 1 => array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
 		// Incomplete payment. We ask if reason = discount or other
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidPartially', $object->ref), 'confirm_paid_partially', $formquestion, "yes", 1, 380, 600);
 	}
@@ -4491,7 +4492,7 @@ if ($action == 'create') {
 			$arrayreasons[$close[2]['code']] = $close[2]['reason'];
 
 			// Create a form table
-			$formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
+			$formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"), 0 => array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), 1 => array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
 
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('CancelBill'), $langs->trans('ConfirmCancelBill', $object->ref), 'confirm_canceled', $formquestion, "yes", 1, 270);
 		}

From 43ba3df82e58e8b4ccc216797d5be8d98a4d67dd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:05 +0100
Subject: [PATCH 1066/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 98c46cc9f47..ff741101419 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2023       Charlene Benke     		<charlene@patas-monkey.com>
  * Copyright (C) 2023       Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1351,8 +1352,8 @@ if ($action == 'create') {
 		} elseif ($action == 'activate') {
 			$formquestion = array(
 				array('type' => 'date', 'name' => 'd_start', 'label' => $langs->trans("DateServiceActivate"), 'value' => dol_now()),
-				array('type' => 'date', 'name' => 'd_end', 'label' => $langs->trans("DateEndPlanned"), /*'value' => $form->selectDate('', "end", $usehm, $usehm, '', "active", 1, 0),*/ '', ''),
-				array('type' => 'text', 'name' => 'comment', 'label' => $langs->trans("Comment"), 'value' => '', '', '', 'class' => 'minwidth300', 'moreattr' => 'autofocus')
+				array('type' => 'date', 'name' => 'd_end', 'label' => $langs->trans("DateEndPlanned"), /*'value' => $form->selectDate('', "end", $usehm, $usehm, '', "active", 1, 0),*/ 0 => '', 1 => ''),
+				array('type' => 'text', 'name' => 'comment', 'label' => $langs->trans("Comment"), 'value' => '', 0 => '', 1 => '', 'class' => 'minwidth300', 'moreattr' => 'autofocus')
 			);
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", $formquestion, 'yes', 1, 280);
 		} elseif ($action == 'clone') {
@@ -1890,7 +1891,7 @@ if ($action == 'create') {
 				// Cree un tableau formulaire
 				$formquestion = array(
 				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
-				array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
+				0 => array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
 
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOSTINT('rowid'), $langs->trans("MoveToAnotherContract"), $langs->trans("ConfirmMoveToAnotherContract"), "confirm_move", $formquestion);
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';

From 06868badf8439f6eee39c18c39135be4cb70c0cd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:08 +0100
Subject: [PATCH 1067/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 8c1cf0cae44..83e2df9364c 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1667,7 +1667,7 @@ if ($action == 'create') {
 				}
 				$formquestion = array(
 					'text' => '',
-					array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOSTINT('fk_user_author') > 0 ? GETPOSTINT('fk_user_author') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
+					0 => array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOSTINT('fk_user_author') > 0 ? GETPOSTINT('fk_user_author') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
 				);
 				// Paiement incomplet. On demande si motif = escompte ou autre
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
@@ -1694,7 +1694,7 @@ if ($action == 'create') {
 			}
 
 			if ($action == 'cancel') {
-				$array_input = array('text' => $langs->trans("ConfirmCancelTrip"), array('type' => "text", 'label' => '<strong>'.$langs->trans("Comment").'</strong>', 'name' => "detail_cancel", 'value' => ""));
+				$array_input = array('text' => $langs->trans("ConfirmCancelTrip"), 0 => array('type' => "text", 'label' => '<strong>'.$langs->trans("Comment").'</strong>', 'name' => "detail_cancel", 'value' => ""));
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
 			}
 
@@ -1703,7 +1703,7 @@ if ($action == 'create') {
 			}
 
 			if ($action == 'refuse') {		// Deny
-				$array_input = array('text' => $langs->trans("ConfirmRefuseTrip"), array('type' => "text", 'label' => $langs->trans("Comment"), 'name' => "detail_refuse", 'value' => ""));
+				$array_input = array('text' => $langs->trans("ConfirmRefuseTrip"), 0 => array('type' => "text", 'label' => $langs->trans("Comment"), 'name' => "detail_refuse", 'value' => ""));
 				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
 			}
 

From b1b6ce6dc00d1dc5af6ea5609261d72936c1309a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:11 +0100
Subject: [PATCH 1068/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 064dca1f9cf..97f21ccb533 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -3094,7 +3095,7 @@ if ($action == 'create') {
 			}
 
 			// Create a form table
-			$formquestion = array('text' => $langs->trans("ConfirmClassifyPaidPartiallyQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
+			$formquestion = array('text' => $langs->trans("ConfirmClassifyPaidPartiallyQuestion"), 0 => array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), 1 => array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
 			// Incomplete payment. We ask if the reason is discount or other
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidPartially', $object->ref), 'confirm_paid_partially', $formquestion, "yes", 1, 310);
 		}
@@ -3115,7 +3116,7 @@ if ($action == 'create') {
 			$arrayreasons[$close[2]['code']] = $close[2]['reason'];
 
 			// Create a form table
-			$formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
+			$formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"), 0 => array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), 1 => array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
 
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelBill'), $langs->trans('ConfirmCancelBill', $object->ref), 'confirm_canceled', $formquestion, "yes", 1, 280);
 		}

From 28e866c22c608dd11c8b26de033d14caa2d687ca Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:13 +0100
Subject: [PATCH 1069/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

---
 htdocs/product/card.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b848078cc20..d18442094ca 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -20,6 +20,7 @@
  * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
  * Copyright (C) 2022  		Vincent de Grandpré  <vincent@de-grandpre.quebec>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -2884,9 +2885,9 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 	// Define confirmation messages
 	$formquestionclone = array(
 		'text' => $langs->trans("ConfirmClone"),
-		array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'morecss' => 'width150'),
-		array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
-		array('type' => 'checkbox', 'name' => 'clone_categories', 'label' => $langs->trans("CloneCategoriesProduct"), 'value' => 1),
+		0 => array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'morecss' => 'width150'),
+		1 => array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
+		2 => array('type' => 'checkbox', 'name' => 'clone_categories', 'label' => $langs->trans("CloneCategoriesProduct"), 'value' => 1),
 	);
 	if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		$formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("CustomerPrices").')', 'value' => 0);

From 0a65a582fc9ffc0e5b74b7e5c827dcb9547113af Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:15 +0100
Subject: [PATCH 1070/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

---
 .../stocktransfer/stocktransfer_card.php      | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index da94893f777..7521fb2ef3b 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -537,29 +538,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	} elseif ($action == 'destock') { // Destock confirmation
 		// Create an array for form
 		$formquestion = array(	'text' => '',
-			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestock', $object->ref), 'size'=>40),
-			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestock', $object->ref), 'size' => 40),
+			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DestockAllProduct'), '', 'confirm_destock', $formquestion, 'yes', 1);
 	} elseif ($action == 'destockcancel') { // Destock confirmation cancel
 		// Create an array for form
 		$formquestion = array(	'text' => '',
-			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestockCancel', $object->ref), 'size'=>40),
-			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestockCancel', $object->ref), 'size' => 40),
+			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DestockAllProductCancel'), '', 'confirm_destockcancel', $formquestion, 'yes', 1);
 	} elseif ($action == 'addstock') { // Addstock confirmation
 		// Create an array for form
 		$formquestion = array(	'text' => '',
-			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStock', $object->ref), 'size'=>40),
-			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStock', $object->ref), 'size' => 40),
+			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AddStockAllProduct'), '', 'confirm_addstock', $formquestion, 'yes', 1);
 	} elseif ($action == 'addstockcancel') { // Addstock confirmation cancel
 		// Create an array for form
 		$formquestion = array(	'text' => '',
-			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStockCancel', $object->ref), 'size'=>40),
-			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+			0 => array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStockCancel', $object->ref), 'size' => 40),
+			1 => array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size' => 25)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AddStockAllProductCancel'), '', 'confirm_addstockcancel', $formquestion, 'yes', 1);
 	}
@@ -582,7 +583,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 
 	if ($action == 'valid' && $permissiontoadd) {
-		$nextref=$object->getNextNumRef();
+		$nextref = $object->getNextNumRef();
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Validate'), $langs->transnoentities('ConfirmValidateStockTransfer', $nextref), 'confirm_validate', $formquestion, 0, 2);
 	}
 
@@ -646,8 +647,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 
-	$object->fields['fk_soc']['visible']=0; // Already available in banner
-	$object->fields['fk_project']['visible']=0; // Already available in banner
+	$object->fields['fk_soc']['visible'] = 0; // Already available in banner
+	$object->fields['fk_project']['visible'] = 0; // Already available in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	// Incoterms
@@ -763,7 +764,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$param = '';
 
-	$conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE=true; // Full display needed to see all column title details
+	$conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE = true; // Full display needed to see all column title details
 
 	print '<tr class="liste_titre">';
 	print getTitleFieldOfList($langs->trans('ProductRef'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
@@ -927,7 +928,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formproduct->loadWarehouses(); // Pour charger la totalité des entrepôts
 
 		// On stock ceux qui ne doivent pas être proposés dans la liste
-		$TExcludedWarehouseSource=array();
+		$TExcludedWarehouseSource = array();
 		if (!empty($object->fk_warehouse_source)) {
 			$source_ent = new Entrepot($db);
 			$source_ent->fetch($object->fk_warehouse_source);
@@ -939,7 +940,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		// On stock ceux qui ne doivent pas être proposés dans la liste
-		$TExcludedWarehouseDestination=array();
+		$TExcludedWarehouseDestination = array();
 		if (!empty($object->fk_warehouse_destination)) {
 			$dest_ent = new Entrepot($db);
 			$dest_ent->fetch($object->fk_warehouse_destination);
@@ -951,14 +952,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		// On vide le tableau pour qu'il se charge tout seul lors de l'appel à la fonction select_warehouses
-		$formproduct->cache_warehouses=array();
+		$formproduct->cache_warehouses = array();
 		// In warehouse
 		print '<td>';
 		print $formproduct->selectWarehouses(empty($fk_warehouse_source) ? $object->fk_warehouse_source : $fk_warehouse_source, 'fk_warehouse_source', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseSource);
 		print '</td>';
 
 		// On vide le tableau pour qu'il se charge tout seul lors de l'appel à la fonction select_warehouses
-		$formproduct->cache_warehouses=array();
+		$formproduct->cache_warehouses = array();
 		// Out warehouse
 		print '<td>';
 		print $formproduct->selectWarehouses(empty($fk_warehouse_destination) ? $object->fk_warehouse_destination : $fk_warehouse_destination, 'fk_warehouse_destination', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseDestination);

From 5be91bbfa4439b7c1fcdbb3e9715f15c5b0499e2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:19 +0100
Subject: [PATCH 1071/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

---
 htdocs/projet/card.php | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 84cd7ade199..6925294ec2d 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2023      Charlene Benke       <charlene@patas_monkey.com>
  * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.de>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -38,9 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
-$langsLoad=array('projects', 'companies');
+$langsLoad = array('projects', 'companies');
 if (isModEnabled('eventorganization')) {
-	$langsLoad[]='eventorganization';
+	$langsLoad[] = 'eventorganization';
 }
 
 $langs->loadLangs($langsLoad);
@@ -116,7 +117,7 @@ $permissiondellink = $user->hasRight('projet', 'creer');	// Used by the include
  * Actions
  */
 
-$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$parameters = array('id' => $socid, 'objcanvas' => $objcanvas);
 $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');
@@ -977,13 +978,13 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	if ($action == 'clone') {
 		$formquestion = array(
 			'text' => $langs->trans("ConfirmClone"),
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid') > 0 ? GETPOSTINT('socid') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200 maxwidth250')),
-			array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'move_date', 'label' => $langs->trans("CloneMoveDate"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_notes', 'label' => $langs->trans("CloneNotes"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_project_files', 'label' => $langs->trans("CloneProjectFiles"), 'value' => false),
-			array('type' => 'checkbox', 'name' => 'clone_task_files', 'label' => $langs->trans("CloneTaskFiles"), 'value' => false)
+			0 => array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid') > 0 ? GETPOSTINT('socid') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200 maxwidth250')),
+			1 => array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
+			2 => array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
+			3 => array('type' => 'checkbox', 'name' => 'move_date', 'label' => $langs->trans("CloneMoveDate"), 'value' => true),
+			4 => array('type' => 'checkbox', 'name' => 'clone_notes', 'label' => $langs->trans("CloneNotes"), 'value' => true),
+			5 => array('type' => 'checkbox', 'name' => 'clone_project_files', 'label' => $langs->trans("CloneProjectFiles"), 'value' => false),
+			6 => array('type' => 'checkbox', 'name' => 'clone_task_files', 'label' => $langs->trans("CloneTaskFiles"), 'value' => false)
 		);
 
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClone"), $langs->trans("ConfirmCloneProject"), "confirm_clone", $formquestion, '', 1, 400, 590);
@@ -1644,16 +1645,16 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			// Buttons Create
 			if (!getDolGlobalString('PROJECT_HIDE_CREATE_OBJECT_BUTTON')) {
 				$arrayforbutaction = array(
-					10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					30 => array('lang'=>'bills', 'enabled'=>isModEnabled("invoice"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					40 => array('lang'=>'supplier_proposal', 'enabled'=>isModEnabled("supplier_proposal"), 'perm'=>$user->hasRight('supplier_proposal', 'creer'), 'label' => 'AddSupplierProposal', 'url'=>'/supplier_proposal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					50 => array('lang'=>'suppliers', 'enabled'=>isModEnabled("supplier_order"), 'perm'=>$user->hasRight('fournisseur', 'commande', 'creer'), 'label' => 'AddSupplierOrder', 'url'=>'/fourn/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					60 => array('lang'=>'suppliers', 'enabled'=>isModEnabled("supplier_invoice"), 'perm'=>$user->hasRight('fournisseur', 'facture', 'creer'), 'label' => 'AddSupplierInvoice', 'url'=>'/fourn/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					70 => array('lang'=>'interventions', 'enabled'=>isModEnabled("intervention"), 'perm'=>$user->hasRight('fichinter', 'creer'), 'label' => 'AddIntervention', 'url'=>'/fichinter/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					80 => array('lang'=>'contracts', 'enabled'=>isModEnabled("contract"), 'perm'=>$user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url'=>'/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-					90 => array('lang'=>'trips', 'enabled'=>isModEnabled("expensereport"), 'perm'=>$user->hasRight('expensereport', 'creer'), 'label' => 'AddTrip', 'url'=>'/expensereport/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
-				   100 => array('lang'=>'donations', 'enabled'=>isModEnabled("don"), 'perm'=>$user->hasRight('don', 'creer'), 'label' => 'AddDonation', 'url'=>'/don/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					10 => array('lang' => 'propal', 'enabled' => isModEnabled("propal"), 'perm' => $user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url' => '/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					20 => array('lang' => 'orders', 'enabled' => isModEnabled("order"), 'perm' => $user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url' => '/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					30 => array('lang' => 'bills', 'enabled' => isModEnabled("invoice"), 'perm' => $user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url' => '/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					40 => array('lang' => 'supplier_proposal', 'enabled' => isModEnabled("supplier_proposal"), 'perm' => $user->hasRight('supplier_proposal', 'creer'), 'label' => 'AddSupplierProposal', 'url' => '/supplier_proposal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					50 => array('lang' => 'suppliers', 'enabled' => isModEnabled("supplier_order"), 'perm' => $user->hasRight('fournisseur', 'commande', 'creer'), 'label' => 'AddSupplierOrder', 'url' => '/fourn/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					60 => array('lang' => 'suppliers', 'enabled' => isModEnabled("supplier_invoice"), 'perm' => $user->hasRight('fournisseur', 'facture', 'creer'), 'label' => 'AddSupplierInvoice', 'url' => '/fourn/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					70 => array('lang' => 'interventions', 'enabled' => isModEnabled("intervention"), 'perm' => $user->hasRight('fichinter', 'creer'), 'label' => 'AddIntervention', 'url' => '/fichinter/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					80 => array('lang' => 'contracts', 'enabled' => isModEnabled("contract"), 'perm' => $user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url' => '/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+					90 => array('lang' => 'trips', 'enabled' => isModEnabled("expensereport"), 'perm' => $user->hasRight('expensereport', 'creer'), 'label' => 'AddTrip', 'url' => '/expensereport/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+				   100 => array('lang' => 'donations', 'enabled' => isModEnabled("don"), 'perm' => $user->hasRight('don', 'creer'), 'label' => 'AddDonation', 'url' => '/don/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 				);
 
 				$params = array('backtopage' => $_SERVER["PHP_SELF"].'?id='.$object->id);

From 3c67a1288ae17af4ed26a73edfd80926929e80cf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:22 +0100
Subject: [PATCH 1072/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

---
 htdocs/projet/tasks/task.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 39a8f5dd7db..0179c320106 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -58,7 +59,7 @@ $projectstatic = new Project($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-$parameters = array('id'=>$id);
+$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');
@@ -267,7 +268,7 @@ if ($id > 0 || !empty($ref)) {
 		// Title
 		$morehtmlref .= $projectstatic->title;
 		// Thirdparty
-		if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) {
+		if (!empty($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
 			$morehtmlref .= '<br>'.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
@@ -417,11 +418,11 @@ if ($id > 0 || !empty($ref)) {
 		$formquestion = array(
 			'text' => $langs->trans("ConfirmClone"),
 			//array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_change_dt', 'label' => $langs->trans("CloneChanges"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_affectation', 'label' => $langs->trans("CloneAffectation"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_prog', 'label' => $langs->trans("CloneProgression"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_time', 'label' => $langs->trans("CloneTimes"), 'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_file', 'label' => $langs->trans("CloneFile"), 'value' => true),
+			0 => array('type' => 'checkbox', 'name' => 'clone_change_dt', 'label' => $langs->trans("CloneChanges"), 'value' => true),
+			1 => array('type' => 'checkbox', 'name' => 'clone_affectation', 'label' => $langs->trans("CloneAffectation"), 'value' => true),
+			2 => array('type' => 'checkbox', 'name' => 'clone_prog', 'label' => $langs->trans("CloneProgression"), 'value' => true),
+			3 => array('type' => 'checkbox', 'name' => 'clone_time', 'label' => $langs->trans("CloneTimes"), 'value' => true),
+			4 => array('type' => 'checkbox', 'name' => 'clone_file', 'label' => $langs->trans("CloneFile"), 'value' => true),
 
 		);
 
@@ -638,7 +639,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Other attributes
 		$cols = 3;
-		$parameters = array('socid'=>$socid);
+		$parameters = array('socid' => $socid);
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';

From bb6eee4cf7e2b317f676d1b2fa382286d4e280c4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:32:24 +0100
Subject: [PATCH 1073/1862] Fix PhanPluginMixedKeyNoKey by using explicit keys

---
 htdocs/stripe/class/stripe.class.php | 51 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 70ed30c225f..ca71a510a1b 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2018-2021 	Thibault FOUCART       <support@ptibogxiv.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -206,10 +207,10 @@ class Stripe extends CommonObject
 				try {
 					if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
 						//$customer = \Stripe\Customer::retrieve("$tiers");
-						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'));
+						$customer = \Stripe\Customer::retrieve(array('id' => "$tiers", 'expand[]' => 'sources'));
 					} else {
 						//$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
-						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'), array("stripe_account" => $key));
+						$customer = \Stripe\Customer::retrieve(array('id' => "$tiers", 'expand[]' => 'sources'), array("stripe_account" => $key));
 					}
 				} catch (Exception $e) {
 					// For example, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
@@ -221,7 +222,7 @@ class Stripe extends CommonObject
 				$dataforcustomer = array(
 					"email" => $object->email,
 					"description" => $object->name,
-					"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
+					"metadata" => array('dol_id' => $object->id, 'dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress)
 				);
 
 				$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
@@ -256,7 +257,7 @@ class Stripe extends CommonObject
 							$isineec = isInEEC($object);
 							if ($object->country_code && $isineec) {
 								//$taxids = $customer->allTaxIds($customer->id);
-								$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+								$customer->createTaxId($customer->id, array('type' => 'eu_vat', 'value' => $vatcleaned));
 							}
 						}
 					}
@@ -444,7 +445,7 @@ class Stripe extends CommonObject
 		if (empty($paymentintent)) {
 			// Try to create intent. See https://stripe.com/docs/api/payment_intents/create
 			$ipaddress = getUserRemoteIP();
-			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+			$metadata = array('dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress);
 			if (is_object($object)) {
 				$metadata['dol_type'] = $object->element;
 				$metadata['dol_id'] = $object->id;
@@ -681,7 +682,7 @@ class Stripe extends CommonObject
 
 		if (empty($setupintent)) {
 			$ipaddress = getUserRemoteIP();
-			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+			$metadata = array('dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress);
 			if (is_object($object)) {
 				$metadata['dol_type'] = $object->element;
 				$metadata['dol_id'] = $object->id;
@@ -877,19 +878,19 @@ class Stripe extends CommonObject
 
 					$dataforcard = array(
 						"source" => array(
-							'object'=>'card',
-							'exp_month'=>$exp_date_month,
-							'exp_year'=>$exp_date_year,
-							'number'=>$number,
-							'cvc'=>$cvc,
-							'name'=>$cardholdername
+							'object' => 'card',
+							'exp_month' => $exp_date_month,
+							'exp_year' => $exp_date_year,
+							'number' => $number,
+							'cvc' => $cvc,
+							'name' => $cardholdername
 						),
 						"metadata" => array(
-							'dol_type'=>$object->element,
-							'dol_id'=>$object->id,
-							'dol_version'=>DOL_VERSION,
-							'dol_entity'=>$conf->entity,
-							'ipaddress'=>$ipaddress
+							'dol_type' => $object->element,
+							'dol_id' => $object->id,
+							'dol_version' => DOL_VERSION,
+							'dol_entity' => $conf->entity,
+							'ipaddress' => $ipaddress
 						)
 					);
 
@@ -1022,7 +1023,7 @@ class Stripe extends CommonObject
 				} elseif ($createifnotlinkedtostripe) {
 					$iban = $obj->iban;
 					$ipaddress = getUserRemoteIP();
-					$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+					$metadata = array('dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress);
 					if (is_object($object)) {
 						$metadata['dol_type'] = $object->element;
 						$metadata['dol_id'] = $object->id;
@@ -1032,7 +1033,7 @@ class Stripe extends CommonObject
 					$description = 'SEPA for IBAN '.$iban;
 
 					$dataforcard = array(
-						'type'=>'sepa_debit',
+						'type' => 'sepa_debit',
 						"sepa_debit" => array('iban' => $iban),
 						'billing_details' => array(
 							'name' => $soc->name,
@@ -1042,19 +1043,19 @@ class Stripe extends CommonObject
 					);
 					// Complete owner name
 					if (!empty($soc->town)) {
-						$dataforcard['billing_details']['address']['city']=$soc->town;
+						$dataforcard['billing_details']['address']['city'] = $soc->town;
 					}
 					if (!empty($soc->country_code)) {
-						$dataforcard['billing_details']['address']['country']=$soc->country_code;
+						$dataforcard['billing_details']['address']['country'] = $soc->country_code;
 					}
 					if (!empty($soc->address)) {
-						$dataforcard['billing_details']['address']['line1']=$soc->address;
+						$dataforcard['billing_details']['address']['line1'] = $soc->address;
 					}
 					if (!empty($soc->zip)) {
-						$dataforcard['billing_details']['address']['postal_code']=$soc->zip;
+						$dataforcard['billing_details']['address']['postal_code'] = $soc->zip;
 					}
 					if (!empty($soc->state)) {
-						$dataforcard['billing_details']['address']['state']=$soc->state;
+						$dataforcard['billing_details']['address']['state'] = $soc->state;
 					}
 
 					//$a = \Stripe\Stripe::getApiKey();
@@ -1084,7 +1085,7 @@ class Stripe extends CommonObject
 						} else {
 							// link customer and src
 							//$cs = $this->getSetupIntent($description, $soc, $cu, '', $status);
-							$dataforintent = array(['description'=> $description, 'payment_method_types' => ['sepa_debit'], 'customer' => $cu->id, 'payment_method' => $sepa->id], 'metadata'=>$metadata);
+							$dataforintent = array(0 => ['description' => $description, 'payment_method_types' => ['sepa_debit'], 'customer' => $cu->id, 'payment_method' => $sepa->id], 'metadata' => $metadata);
 
 							$cs = $s->setupIntents->create($dataforintent);
 							//$cs = $s->setupIntents->update($cs->id, ['payment_method' => $sepa->id]);

From 4df31b56646d0c8aeeb586e78728aef92c0e0515 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:33:23 +0100
Subject: [PATCH 1074/1862] Qual: Enable PhanPluginMixedKeyNoKey, all cases
 fixed

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 5b058d1b438..53dd0aa447b 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -570,7 +570,7 @@ return [
 		// 'PhanTypeMismatchDeclaredReturnNullable',
 
 		// 'PhanUndeclaredThis',
-		'PhanPluginMixedKeyNoKey',
+		// 'PhanPluginMixedKeyNoKey',
 		'PhanPluginDuplicateConditionalNullCoalescing', // Suggests to optimize to ??
 		//'PhanUnreferencedClosure',  // False positives seen with closures in arrays, TODO: move closure checks closer to what is done by unused variable plugin
 		//'PhanPluginNoCommentOnProtectedMethod',

From c9ed43c9e543f73e937de015a1ef568633158900 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 21:40:59 +0100
Subject: [PATCH 1075/1862] CSS

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

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 92154e65c1d..a71b364cdac 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -657,7 +657,7 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
-	$moreforfilter .= img_picto($tmptitle, 'category');
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
 	//$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
 	//$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 	$moreforfilter .= $formother->select_categories(Categorie::TYPE_PRODUCT, $search_product_category, 'search_product_category', 1, $tmptitle);
@@ -668,7 +668,7 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
-	$moreforfilter .= img_picto($tmptitle, 'category');
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
 	$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle);
 	$moreforfilter .= '</div>';
 }

From 51ff132107527459b6a3936fae2f2981ad56ea48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 21:44:49 +0100
Subject: [PATCH 1076/1862] fix phpdoc

---
 .../class/expensereport.class.php             | 77 ++++++++++++++-----
 1 file changed, 58 insertions(+), 19 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index a62d4dc04f2..54c4a8b469a 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,8 +73,14 @@ class ExpenseReport extends CommonObject
 	 */
 	public $line;
 
+	/**
+	 * @var int|string
+	 */
 	public $date_debut;
 
+	/**
+	 * @var int|string
+	 */
 	public $date_fin;
 
 	/**
@@ -86,6 +93,9 @@ class ExpenseReport extends CommonObject
 	 */
 	public $fk_user;
 
+	/**
+	 * @var int ID
+	 */
 	public $user_approve_id;
 
 	/**
@@ -107,6 +117,8 @@ class ExpenseReport extends CommonObject
 	public $modepaymentid;
 
 	public $paid;
+	// Paiement
+	public $user_paid_infos;
 
 	public $user_author_infos;
 	public $user_validator_infos;
@@ -116,6 +128,9 @@ class ExpenseReport extends CommonObject
 	// ACTIONS
 
 	// Create
+	/**
+	 * @var int|string
+	 */
 	public $date_create;
 
 	/**
@@ -129,16 +144,41 @@ class ExpenseReport extends CommonObject
 	public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
 
 	// Update
+	/**
+	 * @var int|string
+	 */
 	public $date_modif;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	// Refus
+	/**
+	 * @var int|string
+	 */
 	public $date_refuse;
+
+	/**
+	 * @var string
+	 */
 	public $detail_refuse;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_refuse;
 
 	// Annulation
+	/**
+	 * @var int|string
+	 */
 	public $date_cancel;
+
+	/**
+	 * @var string
+	 */
 	public $detail_cancel;
 
 	/**
@@ -169,37 +209,36 @@ class ExpenseReport extends CommonObject
 	 * @var int ID of User making validation
 	 */
 	public $fk_user_valid;
+
+	/**
+	 * @var int ID
+	 */
 	public $user_valid_infos;
 
 	// Approve
+	/**
+	 * @var int|string
+	 */
 	public $date_approve;
-	public $fk_user_approve; // User that has approved
 
-	// Paiement
-	public $user_paid_infos;
+	/**
+	 * @var int ID User that has approved
+	 */
+	public $fk_user_approve;
 
 	public $localtax1;	// for backward compatibility (real field should be total_localtax1 defined into CommonObject)
 	public $localtax2;	// for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
+	/**
+	 * @var array
+	 */
 	public $labelStatus = array();
+
+	/**
+	 * @var array
+	 */
 	public $labelStatusShort = array();
 
-	// Multicurrency
-	/**
-	 * @var int Currency ID
-	 */
-	public $fk_multicurrency;
-
-	/**
-	 * @var string multicurrency code
-	 */
-	public $multicurrency_code;
-	public $multicurrency_tx;
-	public $multicurrency_total_ht;
-	public $multicurrency_total_tva;
-	public $multicurrency_total_ttc;
-
-
 	/**
 	 * Draft status
 	 */

From 8ff2a41af5e430ef1e5c4169cd1986c48bc3f452 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 21:46:59 +0100
Subject: [PATCH 1077/1862] Trans

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

diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index b8ae6dca02a..5eac14c4958 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Delivery
 DeliveryRef=Ref Delivery
-DeliveryCard=Stock receipt
+DeliveryCard=Delivery receipt
 DeliveryOrder=Delivery receipt
 DeliveryDate=Delivery date
 CreateDeliveryOrder=Generate delivery receipt

From c6654fcd70f9cd0fda007b24344e71d6f267f10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 21:55:40 +0100
Subject: [PATCH 1078/1862] fix phpdoc

---
 .../class/expensereportstats.class.php        | 26 +++++++++++++++++--
 .../class/paymentexpensereport.class.php      |  7 +++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index ddec220d12f..5f1c0858959 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,13 +36,34 @@ class ExpenseReportStats extends Stats
 	 */
 	public $table_element;
 
+	/**
+	 * @var int ID
+	 */
 	public $socid;
+
+	/**
+	 * @var int ID
+	 */
 	public $userid;
 
+	/**
+	 * @var string
+	 */
 	public $from;
+
+	/**
+	 * @var string
+	 */
 	public $field;
+
+	/**
+	 * @var string
+	 */
 	public $where;
 
+	/**
+	 * @var string
+	 */
 	private $datetouse = 'date_valid';
 
 
@@ -120,7 +142,7 @@ class ExpenseReportStats extends Stats
 		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
-		//var_dump($res);print '<br>';
+
 		return $res;
 	}
 
@@ -142,7 +164,7 @@ class ExpenseReportStats extends Stats
 		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
-		//var_dump($res);print '<br>';
+
 		return $res;
 	}
 
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 09ea23d79c1..f480854dad8 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -56,7 +56,14 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public $fk_expensereport;
 
+	/**
+	 * @var int|string
+	 */
 	public $datec = '';
+
+	/**
+	 * @var int|string
+	 */
 	public $datep = '';
 	public $amount; // Total amount of payment
 	public $amounts = array(); // Array of amounts

From 54556b37fd317d056de498191fa9573b44e6e33b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 21:59:29 +0100
Subject: [PATCH 1079/1862] Clean code

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

diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index eecef7aaaec..7c108f74eca 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -58,10 +58,10 @@ function shipping_prepare_head($object)
 		// delivery link
 		$object->fetchObjectLinked($object->id, $object->element);
 		if (isset($object->linkedObjectsIds['delivery']) && is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0) {        // If there is a delivery
-			// Take first one element of array
+			// Take first element of array
 			$tmp = reset($object->linkedObjectsIds['delivery']);
 
-			$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$tmp;
+			$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".((int) $tmp);
 			$head[$h][1] = $langs->trans("DeliveryCard");
 			$head[$h][2] = 'delivery';
 			$h++;
@@ -75,7 +75,7 @@ function shipping_prepare_head($object)
 			$objectsrc->fetch($object->origin_id);
 		}
 		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
-		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
+		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".((int) $object->id);
 		$head[$h][1] = $langs->trans("ContactsAddresses");
 		if ($nbContact > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

From 24bf23e68bf66bdffc041f3972798d99663ca01c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 22:06:03 +0100
Subject: [PATCH 1080/1862] Use ->statut instead of status

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 05b60d4d159..9ef21f4823f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1803,7 +1803,7 @@ if ($action == 'create') {
 	// Confirm deletion
 	if ($action == 'delete') {
 		$formquestion = array();
-		if ($object->statut == Expedition::STATUS_CLOSED && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
+		if ($object->status == Expedition::STATUS_CLOSED && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 			$formquestion = array(
 					array(
 						'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
@@ -2184,7 +2184,7 @@ if ($action == 'create') {
 			$editColspan--;
 		}
 		print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
-		if ($object->statut <= 1) {
+		if ($object->status <= 1) {
 			print $langs->trans("QtyToShip").' - ';
 		} else {
 			print $langs->trans("QtyShipped").' - ';
@@ -2197,7 +2197,7 @@ if ($action == 'create') {
 		}
 		print '</td>';
 	} else {
-		if ($object->statut <= 1) {
+		if ($object->status <= 1) {
 			print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
 		} else {
 			print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
@@ -2213,7 +2213,7 @@ if ($action == 'create') {
 	print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
 	print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
 	//print '<td class="center">'.$langs->trans("Size").'</td>';
-	if ($object->statut == 0) {
+	if ($object->status == 0) {
 		print '<td class="linecoledit"></td>';
 		print '<td class="linecoldelete" width="10"></td>';
 	}
@@ -2574,7 +2574,7 @@ if ($action == 'create') {
 				print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 				print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 				print '</td>';
-			} elseif ($object->statut == Expedition::STATUS_DRAFT) {
+			} elseif ($object->status == Expedition::STATUS_DRAFT) {
 				// edit-delete buttons
 				print '<td class="linecoledit center">';
 				print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
@@ -2647,7 +2647,7 @@ if ($action == 'create') {
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 		// modified by hook
 		if (empty($reshook)) {
-			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0) {
+			if ($object->status == Expedition::STATUS_DRAFT && $num_prod > 0) {
 				if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
 				 || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate'))) {
 					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
@@ -2657,12 +2657,12 @@ if ($action == 'create') {
 			}
 
 			// 0=draft, 1=validated/delivered, 2=closed/delivered
-			if ($object->statut == Expedition::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
+			if ($object->status == Expedition::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 				if ($user->hasRight('expedition', 'creer')) {
 					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id, '');
 				}
 			}
-			if ($object->statut == Expedition::STATUS_CLOSED) {
+			if ($object->status == Expedition::STATUS_CLOSED) {
 				if ($user->hasRight('expedition', 'creer')) {
 					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
 				}
@@ -2670,7 +2670,7 @@ if ($action == 'create') {
 
 			// Send
 			if (empty($user->socid)) {
-				if ($object->statut > 0) {
+				if ($object->status > 0) {
 					if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('expedition', 'shipping_advance', 'send')) {
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 					} else {
@@ -2680,7 +2680,7 @@ if ($action == 'create') {
 			}
 
 			// Create bill
-			if (isModEnabled('invoice') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
+			if (isModEnabled('invoice') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED)) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
 						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid, '');
@@ -2690,13 +2690,13 @@ if ($action == 'create') {
 
 			// This is just to generate a delivery receipt
 			//var_dump($object->linkedObjectsIds['delivery']);
-			if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->hasRight('expedition', 'delivery', 'creer') && empty($object->linkedObjectsIds['delivery'])) {
+			if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED) && $user->hasRight('expedition', 'delivery', 'creer') && empty($object->linkedObjectsIds['delivery'])) {
 				print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"].'?action=create_delivery&token='.newToken().'&id='.$object->id, '');
 			}
 
 			// Set Billed and Closed
-			if ($object->statut == Expedition::STATUS_VALIDATED) {
-				if ($user->hasRight('expedition', 'creer') && $object->statut > 0) {
+			if ($object->status == Expedition::STATUS_VALIDATED) {
+				if ($user->hasRight('expedition', 'creer') && $object->status > 0) {
 					if (!$object->billed && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
 						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifybilled&token='.newToken().'&id='.$object->id, '');
 					}
@@ -2705,7 +2705,7 @@ if ($action == 'create') {
 			}
 
 			// Cancel
-			if ($object->statut == Expedition::STATUS_VALIDATED) {
+			if ($object->status == Expedition::STATUS_VALIDATED) {
 				if ($user->hasRight('expedition', 'creer')) {
 					print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 				}

From 1f43cf56d91261c3affa4798afc4bd1d0bb98ff2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 12 Mar 2024 22:11:11 +0100
Subject: [PATCH 1081/1862] Fix regression

---
 htdocs/expedition/list.php | 2 +-
 htdocs/reception/list.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index a71b364cdac..69980c72d1e 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -62,7 +62,7 @@ $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
 $search_country = GETPOSTINT("search_country");
 $search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
-$search_billed = GETPOSTINT("search_billed");
+$search_billed = GETPOST("search_billed", 'intcomma');
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datedelivery_startmonth'), GETPOSTINT('search_datedelivery_startday'), GETPOSTINT('search_datedelivery_startyear'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datedelivery_endmonth'), GETPOSTINT('search_datedelivery_endday'), GETPOSTINT('search_datedelivery_endyear'));
 $search_datereceipt_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datereceipt_startmonth'), GETPOSTINT('search_datereceipt_startday'), GETPOSTINT('search_datereceipt_startyear'));
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index f6242c6ee14..20b9262923f 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -75,7 +75,7 @@ $search_date_create_endmonth = GETPOSTINT('search_date_create_endmonth');
 $search_date_create_endyear = GETPOSTINT('search_date_create_endyear');
 $search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear);	// Use tzserver
 $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear);
-$search_billed = GETPOSTINT("search_billed");
+$search_billed = GETPOST("search_billed", 'intcomma');
 $search_status = GETPOST('search_status', 'intcomma');
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 

From c5659b5fbd3df4ab8fde1379678c5ba4a9805508 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:04:53 +0100
Subject: [PATCH 1082/1862] Fix
 PhanPluginDuplicateExpressionAssignmentOperation $this to obj

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

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index e81d5b80e5d..b08bcacfc9a 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2016-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2017      Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2021      Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -192,7 +193,7 @@ class ChargeSociales extends CommonObject
 				$this->paye = $obj->paye;
 				$this->periode = $this->db->jdate($obj->period);
 				$this->period = $this->db->jdate($obj->period);
-				$this->import_key = $this->import_key;
+				$this->import_key = $obj->import_key;
 
 				$this->db->free($resql);
 
@@ -653,7 +654,7 @@ class ChargeSociales extends CommonObject
 		$result .= $linkend;
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 0afe2fa14585ec65664d98b438a0280de7bfa26c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:21:52 +0100
Subject: [PATCH 1083/1862] Fix
 PhanPluginDuplicateExpressionAssignmentOperation (Simplification)

---
 htdocs/adherents/tpl/linkedobjectblock.tpl.php |  3 ++-
 htdocs/admin/modules.php                       | 17 +++++++++--------
 htdocs/admin/system/filecheck.php              |  7 ++++---
 htdocs/admin/system/phpinfo.php                | 17 +++++++++--------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index d4efa349202..5582c60e30f 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@inodbox.com>
  * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -40,7 +41,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<td class="center">'.dol_print_date($objectlink->dateh, 'day').'</td>';
 	echo '<td class="right">';
 	if ($user->hasRight('adherent', 'lire')) {
-		$total = $total + $objectlink->amount;
+		$total += $objectlink->amount;
 		echo price($objectlink->amount);
 	}
 	echo '</td>';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index ece8c531fc9..893523f22da 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018		Nicolas ZABOURI 		<info@inovea-conseil.com>
  * Copyright (C) 2021-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1253,36 +1254,36 @@ if ($mode == 'deploy') {
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
 			if (preg_match('/k$/i', $maxphp)) {
 				$maxphp = preg_replace('/k$/i', '', $maxphp);
-				$maxphp = $maxphp * 1;
+				$maxphp *= 1;
 			}
 			if (preg_match('/m$/i', $maxphp)) {
 				$maxphp = preg_replace('/m$/i', '', $maxphp);
-				$maxphp = $maxphp * 1024;
+				$maxphp *= 1024;
 			}
 			if (preg_match('/g$/i', $maxphp)) {
 				$maxphp = preg_replace('/g$/i', '', $maxphp);
-				$maxphp = $maxphp * 1024 * 1024;
+				$maxphp *= 1024 * 1024;
 			}
 			if (preg_match('/t$/i', $maxphp)) {
 				$maxphp = preg_replace('/t$/i', '', $maxphp);
-				$maxphp = $maxphp * 1024 * 1024 * 1024;
+				$maxphp *= 1024 * 1024 * 1024;
 			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
 			if (preg_match('/k$/i', $maxphp2)) {
 				$maxphp2 = preg_replace('/k$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1;
+				$maxphp2 *= 1;
 			}
 			if (preg_match('/m$/i', $maxphp2)) {
 				$maxphp2 = preg_replace('/m$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1024;
+				$maxphp2 *= 1024;
 			}
 			if (preg_match('/g$/i', $maxphp2)) {
 				$maxphp2 = preg_replace('/g$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1024 * 1024;
+				$maxphp2 *= 1024 * 1024;
 			}
 			if (preg_match('/t$/i', $maxphp2)) {
 				$maxphp2 = preg_replace('/t$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+				$maxphp2 *= 1024 * 1024 * 1024;
 			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 57b9ea2c7d8..f54720e03df 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2019  Frederic France         <frederic.france@netlogic.fr>
  * Copyright (C) 2017       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -83,7 +84,7 @@ $xmlshortfile = dol_sanitizeFileName(GETPOST('xmlshortfile', 'alpha') ? GETPOST(
 
 $xmlfile = DOL_DOCUMENT_ROOT.'/install/'.$xmlshortfile;
 if (!preg_match('/\.zip$/i', $xmlfile) && dol_is_file($xmlfile.'.zip')) {
-	$xmlfile = $xmlfile.'.zip';
+	$xmlfile .= '.zip';
 }
 
 // Remote file to compare to
@@ -183,7 +184,7 @@ if (GETPOST('target') == 'remote') {
 			libxml_disable_entity_loader(true);
 		}
 
-		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
 	} else {
 		$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
 		setEventMessages($errormsg, null, 'errors');
@@ -259,7 +260,7 @@ if (empty($error) && !empty($xml)) {
 			$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
 			if (!in_array($tmprelativefilename, $file_list['insignature'])) {
 				$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
-				$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+				$file_list['added'][] = array('filename' => $tmprelativefilename, 'md5' => $md5newfile);
 			}
 		}
 
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 36c64a826a6..3c410fbe0d4 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016       Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2020       Tobias Sekan			<tobias.sekan@startmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -53,36 +54,36 @@ if (isset($title)) {
 $maxphp = @ini_get('upload_max_filesize'); // In unknown
 if (preg_match('/k$/i', $maxphp)) {
 	$maxphp = preg_replace('/k$/i', '', $maxphp);
-	$maxphp = $maxphp * 1;
+	$maxphp *= 1;
 }
 if (preg_match('/m$/i', $maxphp)) {
 	$maxphp = preg_replace('/m$/i', '', $maxphp);
-	$maxphp = $maxphp * 1024;
+	$maxphp *= 1024;
 }
 if (preg_match('/g$/i', $maxphp)) {
 	$maxphp = preg_replace('/g$/i', '', $maxphp);
-	$maxphp = $maxphp * 1024 * 1024;
+	$maxphp *= 1024 * 1024;
 }
 if (preg_match('/t$/i', $maxphp)) {
 	$maxphp = preg_replace('/t$/i', '', $maxphp);
-	$maxphp = $maxphp * 1024 * 1024 * 1024;
+	$maxphp *= 1024 * 1024 * 1024;
 }
 $maxphp2 = @ini_get('post_max_size'); // In unknown
 if (preg_match('/k$/i', $maxphp2)) {
 	$maxphp2 = preg_replace('/k$/i', '', $maxphp2);
-	$maxphp2 = $maxphp2 * 1;
+	$maxphp2 *= 1;
 }
 if (preg_match('/m$/i', $maxphp2)) {
 	$maxphp2 = preg_replace('/m$/i', '', $maxphp2);
-	$maxphp2 = $maxphp2 * 1024;
+	$maxphp2 *= 1024;
 }
 if (preg_match('/g$/i', $maxphp2)) {
 	$maxphp2 = preg_replace('/g$/i', '', $maxphp2);
-	$maxphp2 = $maxphp2 * 1024 * 1024;
+	$maxphp2 *= 1024 * 1024;
 }
 if (preg_match('/t$/i', $maxphp2)) {
 	$maxphp2 = preg_replace('/t$/i', '', $maxphp2);
-	$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+	$maxphp2 *= 1024 * 1024 * 1024;
 }
 if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2) {
 	$langs->load("errors");

From 0f76544e0fd6228a69922c2f3a99e1d7482cf41b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:12 +0100
Subject: [PATCH 1084/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ae720d63423..90817a5848d 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2023       Joachim Kueter     		<git-jk@bloxera.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -286,9 +287,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 
 		if (GETPOSTISSET("clone_sens")) {
 			$object->sens = GETPOSTINT("clone_sens");
-		} else {
-			$object->sens = $object->sens;
-		}
+		} // else { $object->sens = $object->sens; }
 
 		if (GETPOSTISSET("clone_amount")) {
 			$object->amount = GETPOSTFLOAT("clone_amount");

From 944ba8a4c02336dbdbf15116106593cb46230bf3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:14 +0100
Subject: [PATCH 1085/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index f01432b7c25..30b7d6e655a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1274,7 +1274,7 @@ if (empty($reshook)) {
 							$line->fk_parent_line = $fk_parent_line;
 
 							$line->subprice = -$line->subprice; // invert price for object
-							$line->pa_ht = $line->pa_ht; // we chose to have buy/cost price always positive, so no revert of sign here
+							// $line->pa_ht = $line->pa_ht; // we chose to have buy/cost price always positive, so no revert of sign here
 							$line->total_ht = -$line->total_ht;
 							$line->total_tva = -$line->total_tva;
 							$line->total_ttc = -$line->total_ttc;

From d66937c65ba951dff6e032f35c8e132c2ee245d5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:17 +0100
Subject: [PATCH 1086/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index ff741101419..4d411b5a2b9 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -764,7 +764,7 @@ if (empty($reshook)) {
 			$fk_unit = GETPOST('unit', 'alpha');
 
 			// update price_ht with discount
-			// TODO Use object->updateline instead objedtline->update
+			// TODO Use object->updateline instead objectline->update
 
 			$price_ht =  price2num(GETPOST('elprice'), 'MU');
 			$remise_percent = price2num(GETPOST('elremise_percent'), '', 2);
@@ -789,7 +789,7 @@ if (empty($reshook)) {
 			$objectline->user_closing_id = $user->id;
 			//$objectline->fk_fournprice = $fk_fournprice;
 			$objectline->pa_ht = $pa_ht;
-			$objectline->rang = $objectline->rang;
+			// $objectline->rang = $objectline->rang;
 
 			if ($fk_unit > 0) {
 				$objectline->fk_unit = GETPOST('unit');

From d199883ec1610b9642e66387d2425ab5e5621b0a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:20 +0100
Subject: [PATCH 1087/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

---
 htdocs/contrat/class/contrat.class.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 99662fd0273..bc9964d2d33 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -3467,19 +3467,6 @@ class ContratLigne extends CommonObjectLine
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
-		// For backward compatibility
-		if (empty($this->date_start)) {
-			$this->date_start = $this->date_start;
-		}
-		if (empty($this->date_start_real)) {
-			$this->date_start_real = $this->date_start_real;
-		}
-		if (empty($this->date_end)) {
-			$this->date_end = $this->date_end;
-		}
-		if (empty($this->date_end_real)) {
-			$this->date_end_real = $this->date_end_real;
-		}
 
 		// Calcul du total TTC et de la TVA pour la ligne a partir de
 		// qty, pu, remise_percent et txtva

From e670fcc32ea4b5574045c371c1638fe2bea848ea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:22 +0100
Subject: [PATCH 1088/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

---
 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 9a8e1ea8a0f..04777bd7b7b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2017       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022 		Antonin MARCHAL         <antonin@letempledujeu.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1310,7 +1311,6 @@ class ExtraFields
 							} else {
 								$labeltoshow = $obj->{$InfoFieldList[1]};
 							}
-							$labeltoshow = $labeltoshow;
 
 							if ($value == $obj->rowid) {
 								if (!$notrans) {

From 6319b5bff1eb9af594271e24bdd0acbf3477fe08 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:24 +0100
Subject: [PATCH 1089/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index d759ceef970..dad0a0a68d4 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
  * Copyright (C) 2023       Christian Foellmann     <christian@foellmann.de>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -172,7 +173,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 
 			$object->sendtoid = array($object->id => $object->id);
-			$object->socid = $object->socid;
+			// $object->socid = $object->socid;
 		} elseif ($action == 'CONTACT_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "companies"));
@@ -189,7 +190,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 
 			$object->sendtoid = array($object->id => $object->id);
-			$object->socid = $object->socid;
+			// $object->socid = $object->socid;
 		} elseif ($action == 'CONTRACT_VALIDATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "contracts"));

From 60ba5d0b823de381e98f421636a3156d3b10d1bf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:26 +0100
Subject: [PATCH 1090/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 89f6ee1b1f9..297da859f33 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -238,7 +239,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'salaries';
-	$permissiontoadd = $permissiontoadd;
+	// $permissiontoadd = $permissiontoadd;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

From 71e6cbf5344f2efe6dd6b50aa726a30cba1b9c03 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:29 +0100
Subject: [PATCH 1091/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 612c9c7852c..0d501e63cdc 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2019   Cedric Ancelin          <icedo.anc@gmail.com>
  * Copyright (C) 2020-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023       Alexandre Janniaux  <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1306,7 +1307,7 @@ class Thirdparties extends DolibarrApi
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
 
 		$this->company->fk_bank = $this->company->fk_account;
-		$this->company->fk_account = $this->company->fk_account;
+		// $this->company->fk_account = $this->company->fk_account;
 
 		$outputlangs = $langs;
 		$newlang = '';

From 8422a355678340f9586f6f397a5a56c4f89ae74a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:24:31 +0100
Subject: [PATCH 1092/1862] Fix PhanPluginDuplicateExpressionAssignment (NOOP
 assignment)

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3172aedb7f9..a1d1f03cb54 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -447,7 +447,7 @@ if (empty($reshook)) {
 			$line->fk_parent_line = $fk_parent_line;
 
 			$line->subprice = -$line->subprice; // invert price for object
-			$line->pa_ht = $line->pa_ht; // we chose to have the buy/cost price always positive, so no inversion of the sign here
+			// $line->pa_ht = $line->pa_ht; // we chose to have the buy/cost price always positive, so no inversion of the sign here
 			$line->total_ht = -$line->total_ht;
 			$line->total_tva = -$line->total_tva;
 			$line->total_ttc = -$line->total_ttc;

From 6170ebe82e612d0107287491b984d50eca2dd11d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:27:58 +0100
Subject: [PATCH 1093/1862] Qual: Enable
 PhanPluginDuplicateExpressionAssignment, all fixed

---
 dev/tools/phan/config.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 53dd0aa447b..24a3daa363d 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -410,8 +410,7 @@ return [
 		'PhanDeprecatedProperty',
 		'PhanDeprecatedFunction',
 		//'PhanCompatibleNegativeStringOffset',
-		// Dolibarr has quite a few strange noop assignments like $abc=$abc;
-		'PhanPluginDuplicateExpressionAssignment',
+		// 'PhanPluginDuplicateExpressionAssignment',
 		// Nulls are likely mostly false positives
 		'PhanPluginConstantVariableNull',
 		'PhanTypeObjectUnsetDeclaredProperty',
@@ -601,7 +600,7 @@ return [
 		'PhanUndeclaredClassMethod',
 		'PhanUndeclaredMethod',
 		'PhanTypeMismatchArgumentProbablyReal',
-		'PhanPluginDuplicateExpressionAssignmentOperation',
+		'PhanPluginDuplicateExpressionAssignmentOperation',  // Suggestions for optimisation
 		'PhanTypeMismatchPropertyDefault',
 		// 'PhanPluginAlwaysReturnMethod',
 		// 'PhanPluginMissingReturnMethod',

From ea4054b42e5599dcdcd498a516a573427abe9b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 12 Mar 2024 22:48:12 +0100
Subject: [PATCH 1094/1862] fix warnings

---
 htdocs/holiday/card.php                | 7 +++++--
 htdocs/holiday/class/holiday.class.php | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 895d96d6966..bf2ff8f4fe4 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -524,8 +524,11 @@ if (empty($reshook)) {
 				}
 
 				$typeleaves = $object->getTypes(1, -1);
-				$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-
+				if (empty($typeleaves[$object->fk_type])) {
+					$labeltoshow = $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type);
+				} else {
+					$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+				}
 				if ($object->halfday == 2) {
 					$starthalfdaykey = "Afternoon";
 					$endhalfdaykey = "Morning";
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index c12032028e6..985bb575f0c 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1366,8 +1366,12 @@ class Holiday extends CommonObject
 		// show type for this record only in ajax to not overload lists
 		if (!$nofetch && !empty($this->fk_type)) {
 			$typeleaves = $this->getTypes(1, -1);
-			$labeltoshow = (($typeleaves[$this->fk_type]['code'] && $langs->trans($typeleaves[$this->fk_type]['code']) != $typeleaves[$this->fk_type]['code']) ? $langs->trans($typeleaves[$this->fk_type]['code']) : $typeleaves[$this->fk_type]['label']);
-			$datas['type'] = '<br><b>'.$langs->trans("Type") . ':</b> ' . (empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $this->fk_type) : $labeltoshow);
+			if (empty($typeleaves[$this->fk_type])) {
+				$labeltoshow = $langs->trans("TypeWasDisabledOrRemoved", $this->fk_type);
+			} else {
+				$labeltoshow = (($typeleaves[$this->fk_type]['code'] && $langs->trans($typeleaves[$this->fk_type]['code']) != $typeleaves[$this->fk_type]['code']) ? $langs->trans($typeleaves[$this->fk_type]['code']) : $typeleaves[$this->fk_type]['label']);
+			}
+			$datas['type'] = '<br><b>'.$langs->trans("Type") . ':</b> ' . $labeltoshow;
 		}
 		if (isset($this->halfday) && !empty($this->date_debut) && !empty($this->date_fin)) {
 			$listhalfday = array(

From 717c47abd3e33a4d154cde120ea7de8ede59259a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:28:49 +0100
Subject: [PATCH 1095/1862] Fix PhanPluginRedundantAssignment

---
 .../accountancy/class/accountancyexport.class.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index a240dca3387..09586c12637 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2020       Guillaume Alexandre <guillaume@tag-info.fr>
  * Copyright (C) 2022		Joachim Kueter		<jkueter@gmx.de>
  * Copyright (C) 2022  		Progiseize         	<a.bisotti@progiseize.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -277,7 +278,7 @@ class AccountancyExport
 					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
 				),
 			),
-			'cr'=> array(
+			'cr' => array(
 				'1' => $langs->trans("Unix"),
 				'2' => $langs->trans("Windows")
 			),
@@ -302,8 +303,6 @@ class AccountancyExport
 	 */
 	public function getMimeType($formatexportset)
 	{
-		$mime = 'text/csv';
-
 		switch ($formatexportset) {
 			case self::$EXPORT_TYPE_FEC:
 				$mime = 'text/tab-separated-values';
@@ -346,7 +345,7 @@ class AccountancyExport
 		$exportFile = null;
 		$exportFileName = '';
 		$exportFilePath = '';
-		$exportFileFullName ='';
+		$exportFileFullName = '';
 		$downloadFileMimeType = '';
 		$downloadFileFullName = '';
 		$downloadFilePath = '';
@@ -1000,7 +999,7 @@ class AccountancyExport
 						$invoice = new FactureFournisseur($this->db);
 						$invoice->fetch($line->fk_doc);
 						$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
-						$objectDirPath.= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
+						$objectDirPath .= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 					}
 					$arrayofinclusion = array();
 					// If it is a supplier invoice, we want to use last uploaded file
@@ -1466,7 +1465,7 @@ class AccountancyExport
 							$objectDirPath = !empty($conf->expensereport->multidir_output[$conf->entity]) ? $conf->expensereport->multidir_output[$conf->entity] : $conf->expensereport->dir_output;
 						} elseif ($line->doc_type == 'supplier_invoice') {
 							$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
-							$objectDirPath.= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
+							$objectDirPath .= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 						}
 						$arrayofinclusion = array();
 						// If it is a supplier invoice, we want to use last uploaded file
@@ -1678,7 +1677,7 @@ class AccountancyExport
 							$objectDirPath = !empty($conf->expensereport->multidir_output[$conf->entity]) ? $conf->expensereport->multidir_output[$conf->entity] : $conf->expensereport->dir_output;
 						} elseif ($line->doc_type == 'supplier_invoice') {
 							$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
-							$objectDirPath.= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
+							$objectDirPath .= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 						}
 						$arrayofinclusion = array();
 						// If it is a supplier invoice, we want to use last uploaded file
@@ -1789,7 +1788,7 @@ class AccountancyExport
 					&& $objectLines[$aIndex + 1]->piece_num == $line->piece_num
 					&& $aIndex - 1 < $aSize
 					&& $objectLines[$aIndex - 1]->piece_num == $line->piece_num
-					) {
+			) {
 				$sammelBuchung = true;
 			}
 

From 42dafc78ed1336abcd4cd5f38e2f4e5791ebc5ce Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:28:51 +0100
Subject: [PATCH 1096/1862] Fix PhanPluginRedundantAssignment

---
 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 479887a5724..0a8e5a40845 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -770,11 +770,11 @@ class AccountingAccount extends CommonObject
 			if ($factureDet->product_type == 1) {
 				if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
 					$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT');
+					// @phan-suppress-next-line PhanPluginRedundantAssignment
 					$suggestedaccountingaccountbydefaultfor = '';
 				} else {
 					if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {    // European intravat sale, but with a VAT
 						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT');
-						$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
 					} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {    // European intravat sale, without VAT intra community number
 						$code_l = getDolGlobalString('ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT');
 						$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
@@ -789,6 +789,7 @@ class AccountingAccount extends CommonObject
 			} elseif ($factureDet->product_type == 0) {
 				if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
 					$code_l = getDolGlobalString('ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT');
+					// @phan-suppress-next-line PhanPluginRedundantAssignment
 					$suggestedaccountingaccountbydefaultfor = '';
 				} else {
 					if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {    // European intravat sale, but with a VAT

From fc3cdf51bae051cb356120bf73aa7af4c754bf3a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:28:53 +0100
Subject: [PATCH 1097/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/adherents/class/api_members.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 889f1212547..941a685d326 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2020	Thibault FOUCART<support@ptibogxiv.net>
  * Copyright (C) 2020	Frédéric France	<frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -535,8 +536,6 @@ class Members extends DolibarrApi
 	 */
 	public function getSubscriptions($id)
 	{
-		$obj_ret = array();
-
 		if (!DolibarrApiAccess::$user->hasRight('adherent', 'cotisation', 'lire')) {
 			throw new RestException(403);
 		}

From 22bd4d8774549e4d17b3941c204aad1be520a882 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:28:56 +0100
Subject: [PATCH 1098/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 2166a0eb8cd..64f69ea390d 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -352,6 +352,7 @@ class BlockedLog
 		global $langs, $cachedUser;
 
 		if (empty($cachedUser)) {
+			// @phan-suppress-next-line PhanPluginRedundantAssignment
 			$cachedUser = array();
 		}
 

From 5ab895f31cebd2c450f68c274d7bdd26cfe502da Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:28:58 +0100
Subject: [PATCH 1099/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 62bbc69953d..f65789c855c 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1009,7 +1010,7 @@ class Categorie extends CommonObject
 			$nbtotalofrecords = $this->db->num_rows($result);
 			if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 				$page = 0;
-				$offset = 0;
+				$offset = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 			}
 		}
 

From 3c24140ccfd88066ee26d0c845efabcf25b1d465 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:00 +0100
Subject: [PATCH 1100/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 62b813d8eb1..704f14baeb8 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1578,7 +1578,7 @@ class ActionComm extends CommonObject
 
 		$statusType = 'status9';
 		if ($percent == -1 && !$hidenastatus) {
-			$statusType = 'status9';
+			$statusType = 'status9';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		if ($percent == 0) {
 			$statusType = 'status1';

From fb2aadf006fa2edd02ac7f7860feab101167b821 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:03 +0100
Subject: [PATCH 1101/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/comm/propal/class/propal.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 41fd6253113..51cb5484af0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -673,7 +673,6 @@ class Propal extends CommonObject
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			$reg = array();
 			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.

From ca8ccd84f0553063c1166b17b532ff01d200b218 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:05 +0100
Subject: [PATCH 1102/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 447d0d9f5da..e48c0d52c5e 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1590,7 +1590,7 @@ class FactureRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
@@ -1609,7 +1609,7 @@ class FactureRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
@@ -1628,7 +1628,7 @@ class FactureRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
@@ -1650,7 +1650,7 @@ class FactureRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}

From 9ee7611a081422bea428f39a3dcff9bcbac50c20 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:07 +0100
Subject: [PATCH 1103/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 20483623722..8aee3548b16 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -524,8 +524,8 @@ class Facture extends CommonInvoice
 
 			// Define some dates
 			$originaldatewhen = $_facrec->date_when;
-			$nextdatewhen = null;
-			$previousdaynextdatewhen = null;
+			$nextdatewhen = null;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$previousdaynextdatewhen = null;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			if ($originaldatewhen) {
 				$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
 				$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');

From c7bd8b57ccefaf1ebb19e97256d309f8c98f5934 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:10 +0100
Subject: [PATCH 1104/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 7e149cc435c..0194541b801 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -316,7 +316,7 @@ class BonPrelevement extends CommonObject
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
 			} else {
-				$result = -1;
+				$result = -1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			}
 		} else {
 			/*
@@ -1649,7 +1649,7 @@ class BonPrelevement extends CommonObject
 
 			dol_syslog("adnotiff: ".$sql);
 			if ($this->db->query($sql)) {
-				$result = 0;
+				$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			} else {
 				$result = -1;
 				dol_syslog(get_class($this)."::addNotification Error $result");

From d68f196ccfe11b98fc0ec935f67f6f1b2e1e8156 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:12 +0100
Subject: [PATCH 1105/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/boxes/box_members_subscriptions_by_year.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index 09df79556bb..ddb3b12185b 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2021 Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -110,7 +111,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 				}
 
 
-				$line = 0;
+				$line = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class=""',
 					'text' => $langs->trans("Year"),

From d33e0a69ca8db2cc7e04f66668d7381ffda28375 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:15 +0100
Subject: [PATCH 1106/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 2bd85fa349e..c3cfdf85fca 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1119,7 +1119,7 @@ class CMailFile
 					$result = $this->smtps->getErrors();	// applicative error code (not SMTP error code)
 					if (empty($this->error) && empty($result)) {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-						$res = true;
+						$res = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					} else {
 						if (empty($this->error)) {
 							$this->error = $result;

From 509357d6322e16a8e602df6f10cee761dd655bca Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:17 +0100
Subject: [PATCH 1107/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 65c23b44c50..4e34d9a284f 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -207,7 +208,7 @@ class CSMSFile
 				// Send sms method not correctly defined
 				// --------------------------------------
 				$this->error = 'Bad value for MAIN_SMS_SENDMODE constant';
-				$res = false;
+				$res = false;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			}
 		} else {
 			$this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';

From c76c08e9f02bd0e4205f8005ff5751e565cfbfd0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:19 +0100
Subject: [PATCH 1108/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/class/commoninvoice.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index a32425ceef4..fcdc114110e 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -269,7 +270,7 @@ abstract class CommonInvoice extends CommonObject
 				if ($multicurrency < 0) {
 					$this->sumpayed = $obj->amount;
 					$this->sumpayed_multicurrency = $obj->multicurrency_amount;
-					return array('alreadypaid'=>(float) $obj->amount, 'alreadypaid_multicurrency'=>(float) $obj->multicurrency_amount);
+					return array('alreadypaid' => (float) $obj->amount, 'alreadypaid_multicurrency' => (float) $obj->multicurrency_amount);
 				} elseif ($multicurrency) {
 					$this->sumpayed_multicurrency = $obj->multicurrency_amount;
 					return (float) $obj->multicurrency_amount;
@@ -477,7 +478,7 @@ abstract class CommonInvoice extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$tmp = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+				$tmp = array('amount' => $obj->amount, 'type' => $obj->code, 'date' => $obj->datep, 'num' => $obj->num, 'ref' => $obj->ref);
 				if (!empty($field3)) {
 					$tmp['ref_ext'] = $obj->ref_ext;
 				}
@@ -511,9 +512,9 @@ abstract class CommonInvoice extends CommonObject
 					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 						if ($multicurrency) {
-							$retarray[] = array('amount'=>$obj->multicurrency_amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'0', 'ref'=>$obj->ref);
+							$retarray[] = array('amount' => $obj->multicurrency_amount, 'type' => $obj->type, 'date' => $obj->date, 'num' => '0', 'ref' => $obj->ref);
 						} else {
-							$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'', 'ref'=>$obj->ref);
+							$retarray[] = array('amount' => $obj->amount, 'type' => $obj->type, 'date' => $obj->date, 'num' => '', 'ref' => $obj->ref);
 						}
 						$i++;
 					}
@@ -1312,9 +1313,9 @@ abstract class CommonInvoice extends CommonObject
 
 								if ($foundalternativestripeaccount) {
 									if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-										$customer = \Stripe\Customer::retrieve(array('id'=>"$foundalternativestripeaccount", 'expand[]'=>'sources'));
+										$customer = \Stripe\Customer::retrieve(array('id' => "$foundalternativestripeaccount", 'expand[]' => 'sources'));
 									} else {
-										$customer = \Stripe\Customer::retrieve(array('id'=>"$foundalternativestripeaccount", 'expand[]'=>'sources'), array("stripe_account" => $stripeacc));
+										$customer = \Stripe\Customer::retrieve(array('id' => "$foundalternativestripeaccount", 'expand[]' => 'sources'), array("stripe_account" => $stripeacc));
 									}
 								} else {
 									$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
@@ -1500,7 +1501,7 @@ abstract class CommonInvoice extends CommonObject
 									$description = 'Failed to find or use your payment mode (no payment mode for this customer id)';
 									$stripefailurecode = 'BADPAYMENTMODE';
 									$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
-									$postactionmessages = [];
+									$postactionmessages = [];  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 									$object = $this;
 

From 5668974d461811a55ca5c57f86613409b0992101 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:21 +0100
Subject: [PATCH 1109/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d7c2f99e635..19ae71b14e2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7368,7 +7368,7 @@ abstract class CommonObject
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		} elseif ($type == 'select') {	// combo list
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
@@ -7400,7 +7400,7 @@ abstract class CommonObject
 			$out .= $tmpselect;
 			$out .= '</select>';
 		} elseif ($type == 'sellist') {
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
@@ -7594,7 +7594,7 @@ abstract class CommonObject
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, $morecss, 0, '100%');
 		} elseif ($type == 'radio') {
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			foreach ($param['options'] as $keyopt => $valopt) {
 				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
 				$out .= ' value="'.$keyopt.'"';
@@ -7813,7 +7813,7 @@ abstract class CommonObject
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
 
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			if (!empty($value)) {
 				foreach ($value as $option) {
 					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';

From 81fde8ffc377dd3dd1c44ecde8ff514cee724a92 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:23 +0100
Subject: [PATCH 1110/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/class/commonobjectline.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 1a0f1f15ed0..92a84376184 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -167,8 +168,6 @@ abstract class CommonObjectLine extends CommonObject
 
 		$langs->load('products');
 
-		$label_type = 'label';
-
 		$label_type = 'label';
 		if ($type == 'short') {
 			$label_type = 'short_label';

From 0302e4f2b5839b514a7a93b088edc18e976cc910 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:25 +0100
Subject: [PATCH 1111/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/class/dolgraph.class.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index d1743b8c733..215d9a9e0e0 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (c) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1288,7 +1289,6 @@ class DolGraph
 			$this->stringtoshow .= '],
 					datasets: [';
 			$i = 0;
-			$i = 0;
 			while ($i < $nblot) {	// Loop on each series
 				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
 
@@ -1310,11 +1310,7 @@ class DolGraph
 			$type = 'bar';
 			$xaxis = '';
 
-			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') {
-				$type = 'bar';
-			}
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') {
-				$type = 'bar';
 				$xaxis = "indexAxis: 'y', ";
 			}
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) {
@@ -1348,7 +1344,7 @@ class DolGraph
 				$this->stringtoshow .= 'tooltip: { mode: \'nearest\',
 					callbacks: {';
 				if (is_array($this->tooltipsTitles)) {
-					$this->stringtoshow .='
+					$this->stringtoshow .= '
 							title: function(tooltipItem, data) {
 								var tooltipsTitle ='.json_encode($this->tooltipsTitles).'
 								return tooltipsTitle[tooltipItem[0].datasetIndex];
@@ -1360,7 +1356,7 @@ class DolGraph
 								return tooltipslabels[tooltipItem.datasetIndex]
 							}';
 				}
-				$this->stringtoshow .='}},';
+				$this->stringtoshow .= '}},';
 			}
 			$this->stringtoshow .= "}, \n";
 
@@ -1388,7 +1384,7 @@ class DolGraph
 				$this->stringtoshow .= 'tooltips: { mode: \'nearest\',
 					callbacks: {';
 				if (is_array($this->tooltipsTitles)) {
-					$this->stringtoshow .='
+					$this->stringtoshow .= '
 							title: function(tooltipItem, data) {
 								var tooltipsTitle ='.json_encode($this->tooltipsTitles).'
 								return tooltipsTitle[tooltipItem[0].datasetIndex];
@@ -1400,7 +1396,7 @@ class DolGraph
 								return tooltipslabels[tooltipItem.datasetIndex]
 							}';
 				}
-				$this->stringtoshow .='}},';
+				$this->stringtoshow .= '}},';
 			}
 			$this->stringtoshow .= '};';
 			$this->stringtoshow .= '

From 271525deaa2d99035a217c901a3bf375c699d900 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:27 +0100
Subject: [PATCH 1112/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 9a8e1ea8a0f..55fe49953f2 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2017       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022 		Antonin MARCHAL         <antonin@letempledujeu.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1147,7 +1148,7 @@ class ExtraFields
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		} elseif ($type == 'select') {
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			if ($mode) {
 				$options = array();
 				foreach ($param['options'] as $okey => $val) {
@@ -1202,7 +1203,7 @@ class ExtraFields
 				$out .= '</select>';
 			}
 		} elseif ($type == 'sellist') {
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
@@ -1366,7 +1367,7 @@ class ExtraFields
 			}
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');
 		} elseif ($type == 'radio') {
-			$out = '';
+			$out = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			foreach ($param['options'] as $keyopt => $val) {
 				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
 				$out .= ' value="'.$keyopt.'"';

From 6d6cbff08e2003b29533481bdfac61dcf718dffc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:29 +0100
Subject: [PATCH 1113/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a7905a1b346..4a3f654a83e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2813,7 +2813,7 @@ class Form
 
 		$sql .= " FROM ".$this->db->prefix()."product as p";
 		// Add from (left join) from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('selectProductsListFrom', $parameters); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 
@@ -2883,7 +2883,7 @@ class Form
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		// Add where from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('selectProductsListWhere', $parameters); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 		// Add criteria on ref/label
@@ -7843,7 +7843,6 @@ class Form
 
 		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {
 			$placeholder = '';
-			$urloption = '';
 
 			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
@@ -9492,7 +9491,7 @@ class Form
     		</dd>
     		</dl>';
 		} else {
-			$linktoelem = '';
+			$linktoelem = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 
 		if (!empty($conf->use_javascript_ajax)) {

From c3647c3af69b17183c7af26ced7df8d14ae49e92 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:31 +0100
Subject: [PATCH 1114/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/class/html.formfile.class.php | 53 ++++++++++++-----------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5c527e016c2..8d8133fabdb 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015		Bahfir Abbes		<bafbes@gmail.com>
  * Copyright (C) 2016-2017	Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2019-2023  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -260,7 +261,7 @@ class FormFile
 				$out .= "\n</div><!-- End form link new url -->\n";
 			}
 
-			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm, 'options'=>$options);
+			$parameters = array('socid' => (isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id' => (isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url' => $url, 'perm' => $perm, 'options' => $options);
 			$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
 			if (empty($res)) {
 				$out = '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">'.$out.'</div>';
@@ -349,23 +350,23 @@ class FormFile
 		$reshook = 0;
 		if (is_object($hookmanager)) {
 			$parameters = array(
-				'modulepart'=>&$modulepart,
-				'modulesubdir'=>&$modulesubdir,
-				'filedir'=>&$filedir,
-				'urlsource'=>&$urlsource,
-				'genallowed'=>&$genallowed,
-				'delallowed'=>&$delallowed,
-				'modelselected'=>&$modelselected,
-				'allowgenifempty'=>&$allowgenifempty,
-				'forcenomultilang'=>&$forcenomultilang,
-				'noform'=>&$noform,
-				'param'=>&$param,
-				'title'=>&$title,
-				'buttonlabel'=>&$buttonlabel,
-				'codelang'=>&$codelang,
-				'morepicto'=>&$morepicto,
-				'hideifempty'=>&$hideifempty,
-				'removeaction'=>&$removeaction
+				'modulepart' => &$modulepart,
+				'modulesubdir' => &$modulesubdir,
+				'filedir' => &$filedir,
+				'urlsource' => &$urlsource,
+				'genallowed' => &$genallowed,
+				'delallowed' => &$delallowed,
+				'modelselected' => &$modelselected,
+				'allowgenifempty' => &$allowgenifempty,
+				'forcenomultilang' => &$forcenomultilang,
+				'noform' => &$noform,
+				'param' => &$param,
+				'title' => &$title,
+				'buttonlabel' => &$buttonlabel,
+				'codelang' => &$codelang,
+				'morepicto' => &$morepicto,
+				'hideifempty' => &$hideifempty,
+				'removeaction' => &$removeaction
 			);
 			$reshook = $hookmanager->executeHooks('showDocuments', $parameters, $object); // Note that parameters may have been updated by hook
 			// May report error
@@ -593,7 +594,7 @@ class FormFile
 				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					//$modellist = ModeleExports::liste_modeles($this->db);		// liste_modeles() does not exists. We are using listOfAvailableExportFormat() method instead that return a different array format.
-					$modellist = array();
+					$modellist = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				}
 			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {
 				if (is_array($genallowed)) {
@@ -713,7 +714,7 @@ class FormFile
 			$out .= '<tr class="liste_titre">';
 			$addcolumforpicto = ($delallowed || $printer || $morepicto);
 			$colspan = (4 + ($addcolumforpicto ? 1 : 0));
-			$colspanmore = 0;
+			$colspanmore = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 			$out .= '<th colspan="'.$colspan.'" class="formdoc liste_titre maxwidthonsmartphone center">';
 
@@ -816,7 +817,7 @@ class FormFile
 			$out .= '</tr>';
 
 			// Execute hooks
-			$parameters = array('colspan'=>($colspan + $colspanmore), 'socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart);
+			$parameters = array('colspan' => ($colspan + $colspanmore), 'socid' => (isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id' => (isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart' => $modulepart);
 			if (is_object($hookmanager)) {
 				$reshook = $hookmanager->executeHooks('formBuilddocOptions', $parameters, $GLOBALS['object']);
 				$out .= $hookmanager->resPrint;
@@ -967,7 +968,7 @@ class FormFile
 						$addcolumforpicto = ($delallowed || $printer || $morepicto);
 						$colspan = (4 + ($addcolumforpicto ? 1 : 0));
 						$colspanmore = 0;
-						$parameters = array('colspan'=>($colspan + $colspanmore), 'socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart, 'relativepath'=>$relativepath);
+						$parameters = array('colspan' => ($colspan + $colspanmore), 'socid' => (isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id' => (isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart' => $modulepart, 'relativepath' => $relativepath);
 						$res = $hookmanager->executeHooks('formBuilddocLineOptions', $parameters, $file);
 						if (empty($res)) {
 							$out .= $hookmanager->resPrint; // Complete line
@@ -1056,7 +1057,7 @@ class FormFile
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$out = '';
-		$this->infofiles = array('nboffiles'=>0, 'extensions'=>array(), 'files'=>array());
+		$this->infofiles = array('nboffiles' => 0, 'extensions' => array(), 'files' => array());
 
 		$entity = 1; // Without multicompany
 
@@ -1230,7 +1231,7 @@ class FormFile
 		$hookmanager->initHooks(array('formfile'));
 		$parameters = array(
 				'filearray' => $filearray,
-				'modulepart'=> $modulepart,
+				'modulepart' => $modulepart,
 				'param' => $param,
 				'forcedownload' => $forcedownload,
 				'relativepath' => $relativepath, // relative filename to module dir
@@ -1775,7 +1776,7 @@ class FormFile
 			include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 			$object_instance = new Mo($this->db);
 		} else {
-			$parameters = array('modulepart'=>$modulepart);
+			$parameters = array('modulepart' => $modulepart);
 			$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
 			if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
 				if (array_key_exists('classpath', $hookmanager->resArray) && !empty($hookmanager->resArray['classpath'])) {
@@ -1859,7 +1860,7 @@ class FormFile
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
 					$ref = (isset($reg[1]) ? $reg[1] : '');
 				} else {
-					$parameters = array('modulepart'=>$modulepart, 'fileinfo'=>$file);
+					$parameters = array('modulepart' => $modulepart, 'fileinfo' => $file);
 					$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
 					if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
 						if (array_key_exists('ref', $hookmanager->resArray) && !empty($hookmanager->resArray['ref'])) {

From 60359aa4184165505c8541c2022527751bd8e7db Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:33 +0100
Subject: [PATCH 1115/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 15e1758fa1a..be4e7a242e2 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2018-2022	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2022		Charlene Benke			<charlene@patas-monkey.com>
  * Copyright (C) 2023		Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -350,7 +351,7 @@ class FormMail extends Form
 		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
 			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 		}
-		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
+		return array('paths' => $listofpaths, 'names' => $listofnames, 'mimes' => $listofmimes);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -407,8 +408,8 @@ class FormMail extends Form
 
 		$parameters = array(
 			'addfileaction' => $addfileaction,
-			'removefileaction'=> $removefileaction,
-			'trackid'=> $this->trackid
+			'removefileaction' => $removefileaction,
+			'trackid' => $this->trackid
 		);
 		$reshook = $hookmanager->executeHooks('getFormMail', $parameters, $this);
 
@@ -599,7 +600,7 @@ class FormMail extends Form
 						&& !preg_match('/user_aliases/', $this->fromtype)
 						&& !preg_match('/global_aliases/', $this->fromtype)
 						&& !preg_match('/senderprofile/', $this->fromtype)
-						) {
+					) {
 						// Use this->fromname and this->frommail or error if not defined
 						$out .= $this->fromname;
 						if ($this->frommail) {
@@ -910,7 +911,6 @@ class FormMail extends Form
 				}
 
 				// Complete substitution array with the url to make online payment
-				$paymenturl = '';
 				$validpaymentmethod = array();
 				if (empty($this->substit['__REF__'])) {
 					$paymenturl = '';
@@ -1187,7 +1187,7 @@ class FormMail extends Form
 					$tmparray[$key]['label'] = $label;
 					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);
 					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);
+					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', true);
 
 					$tmparray[$key]['labelhtml'] = $label;
 					$tmparray[$key]['labelhtml'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $tmparray[$key]['labelhtml']);
@@ -1240,7 +1240,7 @@ class FormMail extends Form
 					$tmparray[$key]['label'] = $label;
 					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);
 					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);
+					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', true);
 
 					$tmparray[$key]['labelhtml'] = $label;
 					$tmparray[$key]['labelhtml'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $tmparray[$key]['labelhtml']);
@@ -1289,7 +1289,7 @@ class FormMail extends Form
 					$tmparray[$key]['label'] = $label;
 					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);
 					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);
+					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', true);
 
 					$tmparray[$key]['labelhtml'] = $label;
 					$tmparray[$key]['labelhtml'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $tmparray[$key]['labelhtml']);
@@ -1873,7 +1873,7 @@ class FormMail extends Form
 
 		$tmparray = array();
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines') {
-			$parameters = array('mode'=>$mode);
+			$parameters = array('mode' => $mode);
 			$tmparray = getCommonSubstitutionArray($langs, 2, null, $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
 
@@ -1886,7 +1886,7 @@ class FormMail extends Form
 		}
 
 		if ($mode == 'emailing') {
-			$parameters = array('mode'=>$mode);
+			$parameters = array('mode' => $mode);
 			$tmparray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount'), $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
 

From a1f332586cb6fa6a352c796d060c2ba57306aedf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:35 +0100
Subject: [PATCH 1116/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index c8409cbe9ae..810ee8f24fc 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2021		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2022		Anthony Berton		<anthony.berton@bb2a.fr>
  * Copyright (C) 2023-2024	William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -277,12 +278,10 @@ class Utils
 			$ext = 'sql';
 			if (in_array($type, array('mysql', 'mysqli'))) {
 				$prefix = 'mysqldump';
-				$ext = 'sql';
 			}
 			//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
 			if (in_array($type, array('pgsql'))) {
 				$prefix = 'pg_dump';
-				$ext = 'sql';
 			}
 			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.dol_print_date(dol_now('gmt'), "dayhourlogsmall", 'tzuser').'.'.$ext;
 		}
@@ -466,7 +465,7 @@ class Utils
 						$langs->load("errors");
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$errormsg = 'Error '.$retval;
-						$ok = 0;
+						$ok = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					} else {
 						$i = 0;
 						if (!empty($output_arr)) {

From 600cdb5e65294b93ac77d8f6fa3c4ed412f7067b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:37 +0100
Subject: [PATCH 1117/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/filemanagerdol/connectors/php/connector.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
index 02bf537b9cf..656ca060471 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
@@ -2,6 +2,7 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2010 Frederico Caldeira Knabben
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * == BEGIN LICENSE ==
  *
@@ -265,7 +266,7 @@ function CreateFolder($resourceType, $currentFolder)
 
 				switch ($sErrorMsg) {
 					case '':
-						$sErrorNumber = '0';
+						$sErrorNumber = '0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 						break;
 					case 'Invalid argument':
 					case 'No such file or directory':

From 5c09a7df85a89a43bb47284307040991e26e76ae Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:40 +0100
Subject: [PATCH 1118/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/lib/admin.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 270742a3c97..fde50455f74 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2023       Eric Seigne      		<eric.seigne@cap-rel.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -543,7 +544,7 @@ function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler
 	if ($error == 0) {
 		$ok = 1;
 	} else {
-		$ok = 0;
+		$ok = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	}
 
 	return $ok;
@@ -1115,7 +1116,7 @@ function activateModule($value, $withdeps = 1, $noconfverification = 0)
 		return $ret;
 	}
 
-	$ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);
+	$ret = array('nbmodules' => 0, 'errors' => array(), 'nbperms' => 0);
 	$modName = $value;
 	$modFile = $modName.".class.php";
 
@@ -1725,7 +1726,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 			$obj = $db->fetch_object($result); // Take first result of select
 
 			if (empty($obj)) {	// If not yet into table
-				$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');
+				$obj = (object) array('rowid' => '', 'name' => $const, 'value' => '', 'type' => $type, 'note' => '');
 			}
 
 			if (empty($strictw3c)) {

From 323c66216a541b0f625148b626bdf80f15fcb79e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:42 +0100
Subject: [PATCH 1119/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index a4cd09de402..2384751a523 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Rui Strecht             <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 +74,7 @@ function societe_prepare_head(Societe $object)
 				$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 				$sql .= " AND p.entity IN (".getEntity($object->element).")";
 				// Add where from hooks
-				$parameters = array('contacttab' => true);
+				$parameters = array('contacttab' => true);  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 				$sql .= $hookmanager->resPrint;
 				$resql = $db->query($sql);

From 73b7cf9338d53b86c408c493ffdfa762f192e098 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:44 +0100
Subject: [PATCH 1120/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index 7f89ca4e51a..e765a0f030d 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2010-2012	Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010		Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015 Claudio Aschieri				<c.aschieri@19.coop>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -42,7 +43,6 @@ function expedition_prepare_head(Expedition $object)
 
 	$h = 0;
 	$head = array();
-	$h = 0;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
 	$head[$h][1] = $langs->trans("Setup");

From e073692e4dbee578736edd9e489946beb328791d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:46 +0100
Subject: [PATCH 1121/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index 18fcf4d49a7..592cfb4a638 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -132,13 +133,11 @@ function expensereport_admin_prepare_head()
 {
 	global $langs, $conf, $user, $db;
 
-	$h = 0;
-	$head = array();
-
 	$extrafields = new ExtraFields($db);
 	$extrafields->fetch_name_optionals_label('expensereport');
 
 	$h = 0;
+	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/expensereport.php";
 	$head[$h][1] = $langs->trans("ExpenseReports");

From 439979a43908cb7708e75b139e71b5a05db04d26 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:48 +0100
Subject: [PATCH 1122/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 2045003d1c0..90fe590aff4 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Gilles Poirier 		   <glgpoirier@gmail.com>
  * Copyright (C) 2018		charlene Benke 		   <charlie@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -122,7 +123,7 @@ function fichinter_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Events');
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -177,8 +178,6 @@ function fichinter_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-	$h = 0;
-
 	$head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php";
 	$head[$h][1] = $langs->trans("Interventions");
 	$head[$h][2] = 'ficheinter';

From bbe0368bbd91f9392f29481a425a7f48bf53f054 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:50 +0100
Subject: [PATCH 1123/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 8b64dadea63..d19e28faa01 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1104,7 +1104,7 @@ function dol_move($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $
 				}
 
 				if ($resultecm > 0) {
-					$result = true;
+					$result = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				} else {
 					$result = false;
 				}
@@ -1180,7 +1180,7 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase
 							}
 						}
 					}
-					$result = true;
+					$result = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				}
 			}
 		}
@@ -2518,9 +2518,9 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 
 	try {
 		if ($mode == 'gz') {
-			$foundhandler = 0;
+			$foundhandler = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif ($mode == 'bz') {
-			$foundhandler = 0;
+			$foundhandler = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif ($mode == 'zip') {
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
 			 {
@@ -2736,7 +2736,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) {
 		// Wrapping for users photos (user photos are allowed to any connected users)
-		$accessallowed = 0;
+		$accessallowed = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		if (preg_match('/^\d+\/photos\//', $original_file)) {
 			$accessallowed = 1;
 		}
@@ -2772,7 +2772,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;
 	} elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output)) {
 		// Wrapping for members photos
-		$accessallowed = 0;
+		$accessallowed = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		if (preg_match('/^\d+\/photos\//', $original_file)) {
 			$accessallowed = 1;
 		}

From a57d0915a2286dbe42e53ce43c3f2759d813b610 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:52 +0100
Subject: [PATCH 1124/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e6edeabe7ac..d3d2b8d2633 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2975,10 +2975,12 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			if ($tzoutput == 'tzserver') {
 				$to_gmt = false;
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
+				// @phan-suppress-next-line PhanPluginRedundantAssignment
 				$offsettz = 0;	// Timezone offset with server timezone (because to_gmt is false), so 0
+				// @phan-suppress-next-line PhanPluginRedundantAssignment
 				$offsetdst = 0;	// Dst offset with server timezone (because to_gmt is false), so 0
 			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
-				$to_gmt = true;
+				$to_gmt = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
 
 				if (class_exists('DateTimeZone')) {
@@ -4025,7 +4027,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			} elseif ($withpicto == 'mobile') {
 				$picto = 'phoning_mobile';
 			} else {
-				$picto = '';
+				$picto = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			}
 		}
 		if ($adddivfloat == 1) {
@@ -8714,7 +8716,6 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			}
 
 			// Complete substitution array with the url to make online payment
-			$paymenturl = '';
 			if (empty($substitutionarray['__REF__'])) {
 				$paymenturl = '';
 			} else {
@@ -11203,12 +11204,12 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 		$famime = 'file-alt';
 	} elseif (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) {
 		$mime = 'text/xml';
-		$imgmime = 'other.png';
+		$imgmime = 'other.png';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$srclang = 'xml';
 		$famime = 'file-alt';
 	} elseif (preg_match('/\.xaml$/i', $tmpfile)) {
 		$mime = 'text/xml';
-		$imgmime = 'other.png';
+		$imgmime = 'other.png';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$srclang = 'xaml';
 		$famime = 'file-alt';
 	} elseif (preg_match('/\.bas$/i', $tmpfile)) {					// Languages
@@ -11372,16 +11373,16 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 		$famime = 'file-image';
 	} elseif (preg_match('/\.vcs$/i', $tmpfile)) {					// Calendar
 		$mime = 'text/calendar';
-		$imgmime = 'other.png';
+		$imgmime = 'other.png';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$famime = 'file-alt';
 	} elseif (preg_match('/\.ics$/i', $tmpfile)) {
 		$mime = 'text/calendar';
-		$imgmime = 'other.png';
+		$imgmime = 'other.png';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$famime = 'file-alt';
 	} elseif (preg_match('/\.torrent$/i', $tmpfile)) {				// Other
 		$mime = 'application/x-bittorrent';
-		$imgmime = 'other.png';
-		$famime = 'file-o';
+		$imgmime = 'other.png';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$famime = 'file-o';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	} elseif (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) {	// Audio
 		$mime = 'audio';
 		$imgmime = 'audio.png';
@@ -11421,12 +11422,12 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 		$famime = 'file-archive';
 	} elseif (preg_match('/\.(exe|com)$/i', $tmpfile)) {					// Exe
 		$mime = 'application/octet-stream';
-		$imgmime = 'other.png';
-		$famime = 'file-o';
+		$imgmime = 'other.png';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$famime = 'file-o';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	} elseif (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) {				// Lib
 		$mime = 'library';
 		$imgmime = 'library.png';
-		$famime = 'file-o';
+		$famime = 'file-o';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	} elseif (preg_match('/\.err$/i', $tmpfile)) {							 // phpcs:ignore
 		$mime = 'error';
 		$imgmime = 'error.png';
@@ -11678,7 +11679,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		$return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
 	} elseif (getDolGlobalString('MAIN_STATUS_USES_IMAGES')) {
 		// Use status with images (for backward compatibility)
-		$return = '';
+		$return = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
 		$htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
 
@@ -13043,7 +13044,7 @@ function getTimelineIcon($actionstatic, &$histo, $key)
 	} elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
 		$iconClass = 'fa fa-pencilxxx';
 	} elseif (preg_match('/^TICKET_MSG/', $actionstatic->code)) {
-		$iconClass = 'fa fa-comments';
+		$iconClass = 'fa fa-comments';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	} elseif (preg_match('/^TICKET_MSG_PRIVATE/', $actionstatic->code)) {
 		$iconClass = 'fa fa-mask';
 	} elseif (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {

From c05221c87913260c386f6e8810b338ea58c9273b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:54 +0100
Subject: [PATCH 1125/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 809188c8975..1efc998a384 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015       Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2017      	Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2017       ATM-CONSULTING		<contact@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -530,7 +531,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 		}
 
 		// Add Group from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListGroupByCustomerDraft', $parameters);
 		$sql .= $hookmanager->resPrint;
 

From e50f2028e47947805bd2423350f03c27470813f8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:56 +0100
Subject: [PATCH 1126/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index 2ed6bf435f8..13fefc8ee54 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2009-2013  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -296,7 +297,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			} else {
 				dol_syslog("No invoices found for criteria");
 			}
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 	} else {
 		dol_print_error($db);

From 452b2600be2a5fc58fb5ede5af922d351882088a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:29:58 +0100
Subject: [PATCH 1127/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 12b0ab69220..5a55202c5dc 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -283,7 +283,7 @@ function dol_json_decode($json, $assoc = false)
 			// @phan-suppress-next-line PhanPluginUnsafeEval
 			eval('$array = '.$out.';');
 		} catch (Exception $e) {
-			$array = array();
+			$array = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 	}
 

From 4f86b65f78fde6fcde4c99f7af788e79753d5900 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:00 +0100
Subject: [PATCH 1128/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f2cc29f4b74..ab142a50675 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2018-2024 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -239,10 +240,10 @@ function project_prepare_head(Project $project, $moreparam = '')
 			$nbConfOrBooth = $dataretrieved;
 		} else {
 			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-			$conforbooth=new ConferenceOrBooth($db);
+			$conforbooth = new ConferenceOrBooth($db);
 			$result = $conforbooth->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $project->id).")");
 			//,
-			if (!is_array($result) && $result<0) {
+			if (!is_array($result) && $result < 0) {
 				setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
 			} else {
 				$nbConfOrBooth = count($result);
@@ -255,10 +256,10 @@ function project_prepare_head(Project $project, $moreparam = '')
 			$nbAttendees = $dataretrieved;
 		} else {
 			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-			$conforboothattendee=new ConferenceOrBoothAttendee($db);
+			$conforboothattendee = new ConferenceOrBoothAttendee($db);
 			$result = $conforboothattendee->fetchAll('', '', 0, 0, '(t.fk_project:=:'.((int) $project->id).')');
 
-			if (!is_array($result) && $result<0) {
+			if (!is_array($result) && $result < 0) {
 				setEventMessages($conforboothattendee->error, $conforboothattendee->errors, 'errors');
 			} else {
 				$nbAttendees = count($result);
@@ -485,8 +486,6 @@ function project_timesheet_prepare_head($mode, $fuser = null)
 	$h = 0;
 	$head = array();
 
-	$h = 0;
-
 	$param = '';
 	$param .= ($mode ? '&mode='.$mode : '');
 	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {
@@ -938,7 +937,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$obj = $lines[$i]->obj;
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 				// Fields from hook
-				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$lines[$i]);
+				$parameters = array('arrayfields' => $arrayfields, 'obj' => $lines[$i]);
 				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 
@@ -1353,7 +1352,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 		//}
 		//else
 		//{
-			//$level--;
+		//$level--;
 		//}
 	}
 

From 2fc8cc7bb9a34104acd15074c4bec2985c0f4a68 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:02 +0100
Subject: [PATCH 1129/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 87e6e367cb3..dfc50a0692f 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2021-2023  Anthony Berton      <anthony.berton@bb2a.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -146,7 +147,7 @@ function user_prepare_head(User $object)
 		|| (isModEnabled('hrm') && $user->hasRight('hrm', 'employee', 'read'))
 		|| (isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire') && ($user->id == $object->id || $user->hasRight('expensereport', 'readall')))
 		|| (isModEnabled('holiday') && $user->hasRight('holiday', 'read') && ($user->id == $object->id || $user->hasRight('holiday', 'readall')))
-		) {
+	) {
 		// Bank
 		$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("HRAndBank");
@@ -188,7 +189,7 @@ function user_prepare_head(User $object)
 
 		$head[$h][0] = DOL_URL_ROOT.'/user/agenda.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Events");
-		if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+		if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 			$nbEvent = 0;
 			// Enable caching of thirdparty count actioncomm
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -491,7 +492,6 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$colorbacklinepair2 = '';
 	$colortextlink = '';
 	$colorbacklinepairhover = '';
-	$colorbacklinepairhover = '';
 	$colorbacklinepairchecked = '';
 	$butactionbg = '';
 	$textbutaction = '';

From 8f15e595b110aac07ecfc5d3855e4f6760de6fa6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:04 +0100
Subject: [PATCH 1130/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index d90df0b530e..f7700e18b09 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -602,7 +603,7 @@ function includeContainer($containerref)
 	$fullpathfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/'.$containerref;
 
 	if (empty($includehtmlcontentopened)) {
-		$includehtmlcontentopened = 0;
+		$includehtmlcontentopened = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	}
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL) {

From 84131ca971d8ae07fcbae310390979d8c2937f70 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:06 +0100
Subject: [PATCH 1131/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/menus/standard/empty.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 34fb9aa1cb8..3d624a5c9a3 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -138,7 +138,6 @@ class MenuManager
 				}
 			}
 
-			$showmode = 1;
 			if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
 			}

From b2528e2727437946c6fb263bcc17ba2f50f42485 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:08 +0100
Subject: [PATCH 1132/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/barcode/mod_barcode_product_standard.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 31859eb4ead..cb5b273577b 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -243,7 +243,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK'))) {
 			$result = -2;
 		} else {
@@ -252,7 +252,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 				if ($is_dispo != 0) {
 					$result = -3;
 				} else {
-					$result = 0;
+					$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				}
 			} else {
 				if (dol_strlen($code) == 0) {

From 5c57a24fbc47f16c655716faf23793307a90d1b5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:11 +0100
Subject: [PATCH 1133/1862] Fix PhanPluginRedundantAssignment

---
 .../barcode/mod_barcode_thirdparty_standard.php     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index 0113e7dfb39..b7d7a1ca8ff 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2022      Faustin Boitel <fboitel@enseirb-matmeca.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -200,19 +201,19 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 
 		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
+		if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
 			$literaltype = '';
 			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
 			switch ($literaltype) {
 				case 'EAN13': //EAN13 rowid = 2
-					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
+					if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
-							$eansum = barcode_gen_ean_sum($ean);
+						$eansum = barcode_gen_ean_sum($ean);
 						$ean .= $eansum; //substitute the las character by the key
 						$numFinal = $ean;
 					}
 					break;
-				// Other barcode cases with key could be written here
+					// Other barcode cases with key could be written here
 				default:
 					break;
 			}
@@ -245,7 +246,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK'))) {
 			$result = -2;
 		} else {
@@ -254,7 +255,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 				if ($is_dispo != 0) {
 					$result = -3;
 				} else {
-					$result = 0;
+					$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				}
 			} else {
 				if (dol_strlen($code) == 0) {

From 9c48c816e3624f930c6ef37f3fd9f7c1f1dc0994 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:14 +0100
Subject: [PATCH 1134/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/contract/mod_contract_olive.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 2fd4d27f6fe..a080266d59f 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Floran Henry  <florian.henry@open-concept.pro>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -33,7 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_olive extends ModelNumRefContracts
 {
-
 	// variables inherited from ModelNumRefContracts class
 	public $name = 'Olive';
 	public $version = 'dolibarr';
@@ -108,7 +108,7 @@ class mod_contract_olive extends ModelNumRefContracts
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_CONTRACT_CODE_ALWAYS_REQUIRED')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_CONTRACT_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		}

From b1b49b48c431ec6ddcf5b5f7a0f16ea19ea08b1a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:16 +0100
Subject: [PATCH 1135/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/delivery/doc/pdf_storm.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 1332f698bfc..144ed4d8ae9 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2020      John BOTELLA
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -820,7 +821,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			if ($this->page_largeur < 210) {
 				$widthrecbox = 84; // To work with US executive format
 			}
-			$posy = 42;
+			$posy = 42;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;

From edaad7eb62fcc449ea0bc6704fda031e31db0ab9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:18 +0100
Subject: [PATCH 1136/1862] Fix PhanPluginRedundantAssignment

---
 .../modules/delivery/doc/pdf_typhon.modules.php     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index a851802251f..fd6c949ab05 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2008      Chiptronik
  * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -186,7 +187,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -426,10 +427,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						$pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
 						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
-						$pdf->SetLineStyle(array('dash'=>0));
+						$pdf->SetLineStyle(array('dash' => 0));
 					}
 
 					$nexY += 2; // Add space between lines
@@ -562,7 +563,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
@@ -572,7 +573,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				dolChmod($file);
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // No error
 			} else {
@@ -828,7 +829,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			if ($this->page_largeur < 210) {
 				$widthrecbox = 84; // To work with US executive format
 			}
-			$posy = 42;
+			$posy = 42;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;

From 1efcfabc8aa72d36e2bb085e57ce48dc9fbae288 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:20 +0100
Subject: [PATCH 1137/1862] Fix PhanPluginRedundantAssignment

---
 .../core/modules/expensereport/doc/pdf_standard.modules.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 692a1c24301..2cc35d093ee 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
  * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
  * Copyright (C) 2020       Marc Guenneugues        <marc.guenneugues@simicar.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -305,7 +306,7 @@ class pdf_standard extends ModeleExpenseReport
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-					$tab_top = 95;
+					$tab_top = 95;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->posxpiece - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
@@ -794,7 +795,7 @@ class pdf_standard extends ModeleExpenseReport
 			}
 
 			// Show recipient
-			$posy = 50;
+			$posy = 50;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			$posx = 100;
 			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;

From 01d59c10c9d1e996d24fb847999ab65ffb195678 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:23 +0100
Subject: [PATCH 1138/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/hrm/doc/pdf_standard.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
index b2bc3a79b7a..35877acb40a 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
  * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
  * Copyright (C) 2020       Marc Guenneugues        <marc.guenneugues@simicar.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -248,7 +249,7 @@ class pdf_standard extends ModelePDFEvaluation
 
 				// Show notes
 				if (!empty($object->note_public)) {
-					$tab_top = 65;
+					$tab_top = 65;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 					$pdf->SetFont('', 'B', $default_font_size);
 					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, '', 12, $tab_top);

From 31ea26e14eefdb9913f67d74ee621e4b6211a4dd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:25 +0100
Subject: [PATCH 1139/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 895e7e2329e..2a1411806e9 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013      Cedric Gross         <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Bahfir Abbes         <bafbes@gmail.com>
  * Copyright (C) 2017      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -578,9 +579,9 @@ class modAgenda extends DolibarrModules
 		);
 
 		// Import Event Extra Fields
-		$keyforselect = 'actioncomm';
-		$keyforelement = 'action';
-		$keyforaliasextra = 'extra';
+		$keyforselect = 'actioncomm';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$keyforelement = 'action';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 	}
 }

From 2eeb847528aa227e6737253450a5571bc4299033 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:28 +0100
Subject: [PATCH 1140/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php
index 21249db69e9..3194a93ed5a 100644
--- a/htdocs/core/modules/modAi.class.php
+++ b/htdocs/core/modules/modAi.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -263,7 +264,7 @@ class modAi extends DolibarrModules
 
 		// Main menu entries to add
 		$this->menu = array();
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		// Add here entries to declare new menus
 		/* BEGIN MODULEBUILDER TOPMENU */
 		/* END MODULEBUILDER TOPMENU */
@@ -306,7 +307,7 @@ class modAi extends DolibarrModules
 		/* END MODULEBUILDER EXPORT AVAILABILITIES */
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT AVAILABILITIES */
 		/*
 		$langs->load("agenda");
@@ -375,7 +376,7 @@ class modAi extends DolibarrModules
 		// Document templates
 		$moduledir = dol_sanitizeFileName('ai');
 		$myTmpObjects = array();
-		$myTmpObjects['Availabilities'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['Availabilities'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 		// foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		// 	if ($myTmpObjectKey == 'Availabilities') {

From 2260027770f6fe957bc469d1b8eaf54d755392cf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:30 +0100
Subject: [PATCH 1141/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modBom.class.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 2832ec9da99..8639b022aa6 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018	   Nicolas ZABOURI 	<info@inovea-conseil.com>
  * Copyright (C) 2019 Maxime Kohlhaas <maxime@atm-consulting.fr>
  * Copyright (C) 2021 Ferran Marcet <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -123,9 +124,9 @@ class modBom extends DolibarrModules
 		//                             1=>array('BILLOFMATERIALS_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
 		// );
 		$this->const = array(
-			1=>array('BOM_ADDON_PDF', 'chaine', 'generic_bom_odt', 'Name of PDF model of BOM', 0),
-			2=>array('BOM_ADDON', 'chaine', 'mod_bom_standard', 'Name of numbering rules of BOM', 0),
-			3=>array('BOM_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/boms', '', 0)
+			1 => array('BOM_ADDON_PDF', 'chaine', 'generic_bom_odt', 'Name of PDF model of BOM', 0),
+			2 => array('BOM_ADDON', 'chaine', 'mod_bom_standard', 'Name of numbering rules of BOM', 0),
+			3 => array('BOM_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/boms', '', 0)
 		);
 
 		// Some keys to add into the overwriting translation tables
@@ -176,7 +177,7 @@ class modBom extends DolibarrModules
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in bom/core/boxes that contains class to show a widget.
 		$this->boxes = array(
-			0=>array('file' => 'box_boms.php', 'note' => '', 'enabledbydefaulton' => 'Home')
+			0 => array('file' => 'box_boms.php', 'note' => '', 'enabledbydefaulton' => 'Home')
 		);
 
 
@@ -281,7 +282,7 @@ class modBom extends DolibarrModules
 		$keyforelement = 'bom';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
 		$keyforclass = 'BOMLine';
-		$keyforclassfile = '/bom/class/bom.class.php';
+		$keyforclassfile = '/bom/class/bom.class.php';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$keyforelement = 'bomline';
 		$keyforalias = 'tl';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
@@ -294,7 +295,7 @@ class modBom extends DolibarrModules
 		$keyforaliasextra = 'extraline';
 		$keyforelement = 'bomline';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_dependencies_array[$r] = array('bomline'=>'tl.rowid'); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		$this->export_dependencies_array[$r] = array('bomline' => 'tl.rowid'); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'bom_bom as t';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bom_bom_extrafields as extra on (t.rowid = extra.fk_object)';
@@ -485,6 +486,7 @@ class modBom extends DolibarrModules
 			}
 		}
 
+		// @phan-suppress-next-line PhanPluginRedundantAssignment
 		$sql = array(
 			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'bom' AND entity = ".((int) $conf->entity),
 			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'bom', ".((int) $conf->entity).")"

From 6ad3828b4406f7336e4b535b01d139555a945a3d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:33 +0100
Subject: [PATCH 1142/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modBookCal.class.php | 132 ++++++++++++-----------
 1 file changed, 67 insertions(+), 65 deletions(-)

diff --git a/htdocs/core/modules/modBookCal.class.php b/htdocs/core/modules/modBookCal.class.php
index 6ae92d3142a..a778ac8ffc7 100644
--- a/htdocs/core/modules/modBookCal.class.php
+++ b/htdocs/core/modules/modBookCal.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -316,59 +317,59 @@ class modBookCal extends DolibarrModules
 
 		/* BEGIN MODULEBUILDER LEFTMENU CALENDAR */
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=agenda',
-			'type'=>'left',
-			'titre'=> 'MenuBookcalIndex',
+			'fk_menu' => 'fk_mainmenu=agenda',
+			'type' => 'left',
+			'titre' => 'MenuBookcalIndex',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em92"'),
-			'mainmenu'=>'agenda',
-			'leftmenu'=> 'bookcal',
-			'url'=> '/bookcal/bookcalindex.php',
-			'langs'=> 'bookcal',
-			'position'=> 1100+$r,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->bookcal->calendar->read',
-			'user'=> 0
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'bookcal',
+			'url' => '/bookcal/bookcalindex.php',
+			'langs' => 'bookcal',
+			'position' => 1100 + $r,
+			'enabled' => '1',
+			'perms' => '$user->rights->bookcal->calendar->read',
+			'user' => 0
 		);
 
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=bookcal',
+			'fk_menu' => 'fk_mainmenu=agenda,fk_leftmenu=bookcal',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'Calendar',
-			'mainmenu'=>'agenda',
-			'leftmenu'=>'bookcal_calendar_list',
-			'url'=>'/bookcal/calendar_list.php',
+			'type' => 'left',
+			'titre' => 'Calendar',
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'bookcal_calendar_list',
+			'url' => '/bookcal/calendar_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'bookcal',
-			'position'=>1100+$r,
+			'langs' => 'bookcal',
+			'position' => 1100 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->bookcal->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->bookcal->enabled',
+			'enabled' => '$conf->bookcal->enabled',
 			// Use 'perms'=>'$user->rights->bookcal->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->bookcal->calendar->read',
-			'target'=>'',
+			'perms' => '$user->rights->bookcal->calendar->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2,
+			'user' => 2,
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=bookcal_calendar_list',
+			'fk_menu' => 'fk_mainmenu=agenda,fk_leftmenu=bookcal_calendar_list',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'NewCalendar',
-			'mainmenu'=>'agenda',
-			'leftmenu'=>'bookcal_new',
-			'url'=>'/bookcal/calendar_card.php?action=create',
+			'type' => 'left',
+			'titre' => 'NewCalendar',
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'bookcal_new',
+			'url' => '/bookcal/calendar_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'bookcal',
-			'position'=>1100+$r,
+			'langs' => 'bookcal',
+			'position' => 1100 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->bookcal->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->bookcal->enabled',
+			'enabled' => '$conf->bookcal->enabled',
 			// Use 'perms'=>'$user->rights->bookcal->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->bookcal->calendar->read',
-			'target'=>'',
+			'perms' => '$user->rights->bookcal->calendar->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2
+			'user' => 2
 		);
 		/* END MODULEBUILDER LEFTMENU CALENDAR */
 
@@ -418,45 +419,45 @@ class modBookCal extends DolibarrModules
 		);
 		*/
 
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=bookcal',
+			'fk_menu' => 'fk_mainmenu=agenda,fk_leftmenu=bookcal',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'Availabilities',
-			'mainmenu'=>'agenda',
-			'leftmenu'=>'bookcal_availabilities',
-			'url'=>'/bookcal/availabilities_list.php',
+			'type' => 'left',
+			'titre' => 'Availabilities',
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'bookcal_availabilities',
+			'url' => '/bookcal/availabilities_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'bookcal',
-			'position'=>1200+$r,
+			'langs' => 'bookcal',
+			'position' => 1200 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->bookcal->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->bookcal->enabled',
+			'enabled' => '$conf->bookcal->enabled',
 			// Use 'perms'=>'$user->rights->bookcal->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->bookcal->availabilities->read',
-			'target'=>'',
+			'perms' => '$user->rights->bookcal->availabilities->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2,
+			'user' => 2,
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=bookcal_availabilities',
+			'fk_menu' => 'fk_mainmenu=agenda,fk_leftmenu=bookcal_availabilities',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'NewAvailabilities',
-			'mainmenu'=>'agenda',
-			'leftmenu'=>'bookcal_availabilities',
-			'url'=>'/bookcal/availabilities_card.php?action=create',
+			'type' => 'left',
+			'titre' => 'NewAvailabilities',
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'bookcal_availabilities',
+			'url' => '/bookcal/availabilities_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'bookcal',
-			'position'=>1200+$r,
+			'langs' => 'bookcal',
+			'position' => 1200 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->bookcal->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->bookcal->enabled',
+			'enabled' => '$conf->bookcal->enabled',
 			// Use 'perms'=>'$user->rights->bookcal->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->bookcal->availabilities->read',
-			'target'=>'',
+			'perms' => '$user->rights->bookcal->availabilities->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2
+			'user' => 2
 		);
 
 		/* END MODULEBUILDER LEFTMENU AVAILABILITIES */
@@ -492,7 +493,8 @@ class modBookCal extends DolibarrModules
 		/* END MODULEBUILDER EXPORT AVAILABILITIES */
 
 		// Imports profiles provided by this module
-		$r = 1;
+
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT AVAILABILITIES */
 		/*
 		$langs->load("agenda");
@@ -561,7 +563,7 @@ class modBookCal extends DolibarrModules
 		// Document templates
 		$moduledir = dol_sanitizeFileName('bookcal');
 		$myTmpObjects = array();
-		$myTmpObjects['Availabilities'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['Availabilities'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'Availabilities') {

From 1656601c48246f412950d8c3c3b0bb04fd414c04 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:36 +0100
Subject: [PATCH 1143/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modCategorie.class.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 0ead1e5e844..c046b25e2a2 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2020      Stéphane Lesage		<stephane.lesage@ateis.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -234,7 +235,7 @@ class modCategorie extends DolibarrModules
 
 		$keyforselect = 'societe';
 		$keyforelement = 'company';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -280,9 +281,9 @@ class modCategorie extends DolibarrModules
 			't.libelle' => 'company', 'pl.code' => 'company', 'st.code' => 'company'
 		); // We define here only fields that use another picto
 
-		$keyforselect = 'societe';
-		$keyforelement = 'company';
-		$keyforaliasextra = 'extra';
+		$keyforselect = 'societe';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$keyforelement = 'company';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -311,7 +312,7 @@ class modCategorie extends DolibarrModules
 
 		$keyforselect = 'adherent';
 		$keyforelement = 'member';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -366,7 +367,7 @@ class modCategorie extends DolibarrModules
 
 		$keyforselect = 'socpeople';
 		$keyforelement = 'contact';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -396,7 +397,7 @@ class modCategorie extends DolibarrModules
 
 		$keyforselect = 'projet';
 		$keyforelement = 'project';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -422,7 +423,7 @@ class modCategorie extends DolibarrModules
 
 		$keyforselect = 'user';
 		$keyforelement = 'user';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';

From fa1009f68e61ecfdd7b2e439174b59447dc2a336 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:39 +0100
Subject: [PATCH 1144/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modCollab.class.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index abf1949a174..eca7e3eb615 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017      Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -107,20 +108,20 @@ class modCollab extends DolibarrModules
 		$r++;*/
 
 		// Main menu entries
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$this->menu[$r] = array(
-			'fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'top', // This is a Left menu entry
-			'titre'=>'Collab',
+			'fk_menu' => '0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'top', // This is a Left menu entry
+			'titre' => 'Collab',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em092"'),
-			'mainmenu'=>'collab',
-			'url'=>'/collab/index.php',
-			'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>100,
-			'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'1', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2				                // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'collab',
+			'url' => '/collab/index.php',
+			'langs' => 'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 100,
+			'enabled' => '$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '1', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2				                // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 	}

From 2a4218ec09ec6275477b4462bcf785f58d0cab25 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:42 +0100
Subject: [PATCH 1145/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modCommande.class.php | 67 ++++++++++++-----------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 005ae6490be..e9bc3e8b3c0 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2020		Ahmad Jamaly Rabub		<rabib@metroworks.co.jp>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -106,8 +107,8 @@ class modCommande extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_commandes.php', 'enabledbydefaulton'=>'Home'),
-			2=>array('file'=>'box_graph_orders_permonth.php', 'enabledbydefaulton'=>'Home')
+			0 => array('file' => 'box_commandes.php', 'enabledbydefaulton' => 'Home'),
+			2 => array('file' => 'box_graph_orders_permonth.php', 'enabledbydefaulton' => 'Home')
 		);
 
 		// Permissions
@@ -200,15 +201,15 @@ class modCommande extends DolibarrModules
 		$this->export_label[$r] = 'CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("commande", "commande", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
-			'co.code'=>"CountryCode", 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id",
-			'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_commande'=>"OrderDate",
-			'c.date_livraison'=>"DateDeliveryPlanned", 'c.amount_ht'=>"Amount", 'c.total_ht'=>"TotalHT",
-			'c.total_ttc'=>"TotalTTC", 'c.facture'=>"Billed", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'sm.code'=>'SendingMethod',
-			'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
-			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
-			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
+			's.rowid' => "IdCompany", 's.nom' => 'CompanyName', 'ps.nom' => 'ParentCompany', 's.code_client' => 'CustomerCode', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town', 'd.nom' => 'State', 'co.label' => 'Country',
+			'co.code' => "CountryCode", 's.phone' => 'Phone', 's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 'c.rowid' => "Id",
+			'c.ref' => "Ref", 'c.ref_client' => "RefCustomer", 'c.fk_soc' => "IdCompany", 'c.date_creation' => "DateCreation", 'c.date_commande' => "OrderDate",
+			'c.date_livraison' => "DateDeliveryPlanned", 'c.amount_ht' => "Amount", 'c.total_ht' => "TotalHT",
+			'c.total_ttc' => "TotalTTC", 'c.facture' => "Billed", 'c.fk_statut' => 'Status', 'c.note_public' => "Note", 'sm.code' => 'SendingMethod',
+			'c.fk_user_author' => 'CreatedById', 'uc.login' => 'CreatedByLogin', 'c.fk_user_valid' => 'ValidatedById', 'uv.login' => 'ValidatedByLogin',
+			'pj.ref' => 'ProjectRef', 'cd.rowid' => 'LineId', 'cd.description' => "LineDescription", 'cd.product_type' => 'TypeOfLineServiceOrProduct',
+			'cd.tva_tx' => "LineVATRate", 'cd.qty' => "LineQty", 'cd.total_ht' => "LineTotalHT", 'cd.total_tva' => "LineTotalVAT", 'cd.total_ttc' => "LineTotalTTC",
+			'p.rowid' => 'ProductId', 'p.ref' => 'ProductRef', 'p.label' => 'ProductLabel'
 		);
 		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
@@ -233,24 +234,24 @@ class modCommande extends DolibarrModules
 		//	'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
-			's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.date_creation'=>"Date",
-			'c.date_commande'=>"Date", 'c.date_livraison'=>"Date", 'sm.code'=>"Text", 'c.amount_ht'=>"Numeric", 'c.total_ht'=>"Numeric",
-			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", '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',
-			'c.entity'=>'List:entity:label:rowid',
+			's.nom' => 'Text', 'ps.nom' => 'Text', 's.code_client' => 'Text', 's.address' => 'Text', 's.zip' => 'Text', 's.town' => 'Text', 'co.label' => 'List:c_country:label:label', 'co.code' => 'Text', 's.phone' => 'Text',
+			's.siren' => 'Text', 's.siret' => 'Text', 's.ape' => 'Text', 's.idprof4' => 'Text', 'c.ref' => "Text", 'c.ref_client' => "Text", 'c.date_creation' => "Date",
+			'c.date_commande' => "Date", 'c.date_livraison' => "Date", 'sm.code' => "Text", 'c.amount_ht' => "Numeric", 'c.total_ht' => "Numeric",
+			'c.total_ttc' => "Numeric", 'c.facture' => "Boolean", 'c.fk_statut' => 'Status', 'c.note_public' => "Text", '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',
+			'c.entity' => 'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
-			'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"order",
-			'c.ref'=>"order", 'c.ref_client'=>"order", 'c.fk_soc'=>"order", 'c.date_creation'=>"order", 'c.date_commande'=>"order", 'c.amount_ht'=>"order",
-			'c.total_ht'=>"order", 'c.total_ttc'=>"order", 'c.facture'=>"order", 'c.fk_statut'=>"order", 'c.note'=>"order",
-			'c.date_livraison'=>"order", 'sm.code'=>"order", 'pj.ref'=>'project', 'cd.rowid'=>'order_line', 'cd.description'=>"order_line",
-			'cd.product_type'=>'order_line', 'cd.tva_tx'=>"order_line", 'cd.qty'=>"order_line", 'cd.total_ht'=>"order_line", 'cd.total_tva'=>"order_line",
-			'cd.total_ttc'=>"order_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'
+			's.rowid' => "company", 's.nom' => 'company', 'ps.nom' => 'company', 's.code_client' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company', 'd.nom' => 'company', 'co.label' => 'company',
+			'co.code' => 'company', 's.phone' => 'company', 's.siren' => 'company', 's.ape' => 'company', 's.idprof4' => 'company', 's.siret' => 'company', 'c.rowid' => "order",
+			'c.ref' => "order", 'c.ref_client' => "order", 'c.fk_soc' => "order", 'c.date_creation' => "order", 'c.date_commande' => "order", 'c.amount_ht' => "order",
+			'c.total_ht' => "order", 'c.total_ttc' => "order", 'c.facture' => "order", 'c.fk_statut' => "order", 'c.note' => "order",
+			'c.date_livraison' => "order", 'sm.code' => "order", 'pj.ref' => 'project', 'cd.rowid' => 'order_line', 'cd.description' => "order_line",
+			'cd.product_type' => 'order_line', 'cd.tva_tx' => "order_line", 'cd.qty' => "order_line", 'cd.total_ht' => "order_line", 'cd.total_tva' => "order_line",
+			'cd.total_ttc' => "order_line", 'p.rowid' => 'product', 'p.ref' => 'product', 'p.label' => 'product'
 		);
-		$this->export_dependencies_array[$r] = array('order_line'=>'cd.rowid', 'product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$this->export_dependencies_array[$r] = array('order_line' => 'cd.rowid', 'product' => 'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		$keyforselect = 'commande';
 		$keyforelement = 'order';
 		$keyforaliasextra = 'extra';
@@ -349,11 +350,11 @@ class modCommande extends DolibarrModules
 		$this->import_updatekeys_array[$r] = array('c.ref' => 'Ref');
 		$this->import_convertvalue_array[$r] = array(
 			'c.ref' => array(
-				'rule'=>'getrefifauto',
-				'class'=>(!getDolGlobalString('COMMANDE_ADDON') ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON),
-				'path'=>"/core/modules/commande/".(!getDolGlobalString('COMMANDE_ADDON') ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON).'.php',
-				'classobject'=>'Commande',
-				'pathobject'=>'/commande/class/commande.class.php',
+				'rule' => 'getrefifauto',
+				'class' => (!getDolGlobalString('COMMANDE_ADDON') ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON),
+				'path' => "/core/modules/commande/".(!getDolGlobalString('COMMANDE_ADDON') ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON).'.php',
+				'classobject' => 'Commande',
+				'pathobject' => '/commande/class/commande.class.php',
 			),
 			'c.fk_soc' => array(
 				'rule'    => 'fetchidfromref',
@@ -413,10 +414,10 @@ class modCommande extends DolibarrModules
 			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 
-		$import_extrafield_sample = array();
+		$import_extrafield_sample = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$keyforselect = 'commandedet';
 		$keyforelement = 'orderline';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
 
 		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commandedet'];

From d2f09f0b64b1f86ce911ede1e5c99ad3fe74d0a8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:45 +0100
Subject: [PATCH 1146/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modECM.class.php | 117 ++++++++++++++-------------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 7aefd2d0028..018ec643045 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -77,7 +78,7 @@ class modECM extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(); // List of boxes
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
@@ -119,82 +120,82 @@ class modECM extends DolibarrModules
 
 		// Top menu
 		$this->menu[$r] = array(
-			'fk_menu'=>0,
-			'type'=>'top',
-			'titre'=>'MenuECM',
+			'fk_menu' => 0,
+			'type' => 'top',
+			'titre' => 'MenuECM',
 			'prefix' => img_picto('', $this->picto, 'class="pictofixedwidth"'),
-			'mainmenu'=>'ecm',
-			'url'=>'/ecm/index.php',
-			'langs'=>'ecm',
-			'position'=>82,
-			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup',
-			'enabled'=>'isModEnabled("ecm")',
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'ecm',
+			'url' => '/ecm/index.php',
+			'langs' => 'ecm',
+			'position' => 82,
+			'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup',
+			'enabled' => 'isModEnabled("ecm")',
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 
 		// Left menu linked to top menu
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=ecm',
-			'type'=>'left',
-			'titre'=>'ECMArea',
+			'fk_menu' => 'fk_mainmenu=ecm',
+			'type' => 'left',
+			'titre' => 'ECMArea',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'ecm',
-			'leftmenu'=>'ecm',
-			'url'=>'/ecm/index.php?mainmenu=ecm&leftmenu=ecm',
-			'langs'=>'ecm',
-			'position'=>101,
-			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'enabled'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'ecm',
+			'leftmenu' => 'ecm',
+			'url' => '/ecm/index.php?mainmenu=ecm&leftmenu=ecm',
+			'langs' => 'ecm',
+			'position' => 101,
+			'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled' => '$user->rights->ecm->read || $user->rights->ecm->upload',
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
-			'type'=>'left',
-			'titre'=>'ECMSectionsManual',
-			'mainmenu'=>'ecm',
-			'leftmenu'=>'ecm_manual',
-			'url'=>'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
-			'langs'=>'ecm',
-			'position'=>102,
-			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'enabled'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=ecm,fk_leftmenu=ecm',
+			'type' => 'left',
+			'titre' => 'ECMSectionsManual',
+			'mainmenu' => 'ecm',
+			'leftmenu' => 'ecm_manual',
+			'url' => '/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
+			'langs' => 'ecm',
+			'position' => 102,
+			'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled' => '$user->rights->ecm->read || $user->rights->ecm->upload',
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
-			'type'=>'left',
-			'titre'=>'ECMSectionsAuto',
-			'mainmenu'=>'ecm',
-			'url'=>'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
-			'langs'=>'ecm',
-			'position'=>103,
-			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && !getDolGlobalInt("ECM_AUTO_TREE_HIDEN")',
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=ecm,fk_leftmenu=ecm',
+			'type' => 'left',
+			'titre' => 'ECMSectionsAuto',
+			'mainmenu' => 'ecm',
+			'url' => '/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
+			'langs' => 'ecm',
+			'position' => 103,
+			'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled' => '($user->rights->ecm->read || $user->rights->ecm->upload) && !getDolGlobalInt("ECM_AUTO_TREE_HIDEN")',
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
-			'type'=>'left',
-			'titre'=>'ECMSectionsMedias',
-			'mainmenu'=>'ecm',
-			'url'=>'/ecm/index_medias.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
-			'langs'=>'ecm',
-			'position'=>104,
-			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && getDolGlobalInt("MAIN_FEATURES_LEVEL") == 2',
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=ecm,fk_leftmenu=ecm',
+			'type' => 'left',
+			'titre' => 'ECMSectionsMedias',
+			'mainmenu' => 'ecm',
+			'url' => '/ecm/index_medias.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
+			'langs' => 'ecm',
+			'position' => 104,
+			'perms' => '$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled' => '($user->rights->ecm->read || $user->rights->ecm->upload) && getDolGlobalInt("MAIN_FEATURES_LEVEL") == 2',
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 	}

From 269bc05efd6804af0956573640a180de613926bf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:48 +0100
Subject: [PATCH 1147/1862] Fix PhanPluginRedundantAssignment

---
 .../modules/modEventOrganization.class.php    | 167 +++++++++---------
 1 file changed, 84 insertions(+), 83 deletions(-)

diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 0f709e1ccad..45a595da727 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -228,83 +229,83 @@ class modEventOrganization extends DolibarrModules
 		/* BEGIN MODULEBUILDER TOPMENU */
 		/* END MODULEBUILDER TOPMENU */
 		/* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'EventOrganizationMenuLeft',
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',			                // This is a Left menu entry
+			'titre' => 'EventOrganizationMenuLeft',
 			'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'project',
-			'leftmenu'=>'eventorganization',
-			'url'=>'',
-			'langs'=>'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'project',
+			'leftmenu' => 'eventorganization',
+			'url' => '',
+			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'List',
-			'url'=>'/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
-			'langs'=>'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',			                // This is a Left menu entry
+			'titre' => 'List',
+			'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
+			'langs' => 'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'New',
-			'url'=>'/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
-			'langs'=>'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->eventorganization->write',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',			                // This is a Left menu entry
+			'titre' => 'New',
+			'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
+			'langs' => 'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->eventorganization->write',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'ConferenceOrBooth',
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',			                // This is a Left menu entry
+			'titre' => 'ConferenceOrBooth',
 			'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'project',
-			'leftmenu'=>'eventorganizationconforbooth',
-			'url'=>'',
-			'langs'=>'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'project',
+			'leftmenu' => 'eventorganizationconforbooth',
+			'url' => '',
+			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'List',
-			'url'=>'/eventorganization/conferenceorbooth_list.php?mainmenu=project',
-			'langs'=>'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',			                // This is a Left menu entry
+			'titre' => 'List',
+			'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project',
+			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->eventorganization->read',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
-		$this->menu[$r++]=array(
-			'fk_menu'=>'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'New',
-			'url'=>'/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
-			'langs'=>'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000+$r,
-			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->eventorganization->write',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',			                // This is a Left menu entry
+			'titre' => 'New',
+			'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
+			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->eventorganization->write',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
 		/* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */
 
@@ -313,13 +314,13 @@ class modEventOrganization extends DolibarrModules
 
 		/* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTHATTENDEES */
 		$langs->load("eventorganization");
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ListOfAttendeesOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_icon[$r]=$this->picto;
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'ListOfAttendeesOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = $this->picto;
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
 		$keyforclass = 'ConferenceOrBoothAttendee';
-		$keyforclassfile='/eventorganization/class/conferenceorboothattendee.class.php';
-		$keyforelement='conferenceorboothattendee';
+		$keyforclassfile = '/eventorganization/class/conferenceorboothattendee.class.php';
+		$keyforelement = 'conferenceorboothattendee';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
 		$this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
 		unset($this->export_fields_array[$r]['t.fk_project']);	// Remove field so we can add it at end just after
@@ -337,18 +338,18 @@ class modEventOrganization extends DolibarrModules
 		$this->export_TypeFields_array[$r]['t.fk_soc'] = 'Numeric';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
-		$keyforselect='conferenceorboothattendee';
-		$keyforaliasextra='extra';
-		$keyforelement='conferenceorboothattendee';
+		$keyforselect = 'conferenceorboothattendee';
+		$keyforaliasextra = 'extra';
+		$keyforelement = 'conferenceorboothattendee';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		//$this->export_dependencies_array[$r] = array('aaaline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
 		//$this->export_special_array[$r] = array('t.field'=>'...');
 		//$this->export_examplevalues_array[$r] = array('t.field'=>'Example');
 		//$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp');
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'eventorganization_conferenceorboothattendee as t, '.MAIN_DB_PREFIX.'projet as p';
-		$this->export_sql_end[$r] .=' WHERE t.fk_project = p.rowid';
-		$this->export_sql_end[$r] .=' AND p.entity IN ('.getEntity('conferenceorboothattendee').')';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'eventorganization_conferenceorboothattendee as t, '.MAIN_DB_PREFIX.'projet as p';
+		$this->export_sql_end[$r] .= ' WHERE t.fk_project = p.rowid';
+		$this->export_sql_end[$r] .= ' AND p.entity IN ('.getEntity('conferenceorboothattendee').')';
 		$r++;
 		/* END MODULEBUILDER EXPORT CONFERENCEORBOOTHATTENDEES */
 
@@ -446,7 +447,7 @@ class modEventOrganization extends DolibarrModules
 		// Document templates
 		$moduledir = 'eventorganization';
 		$myTmpObjects = array();
-		$myTmpObjects['ConferenceOrBooth'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['ConferenceOrBooth'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'ConferenceOrBooth') {

From a84d0ea87c8b8e0783456dee0274ae959755595a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:51 +0100
Subject: [PATCH 1148/1862] Fix PhanPluginRedundantAssignment

---
 .../core/modules/modExpenseReport.class.php   | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 525760c6ac3..cd8cc5a0a21 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2011  Dimitri Mouillard    <dmouillard@teclib.com>
  * Copyright (C) 2015  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023  Alexandre Spangaro   <aspangaro@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -72,7 +73,7 @@ class modExpenseReport extends DolibarrModules
 
 		// Constants
 		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		$this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -182,41 +183,41 @@ class modExpenseReport extends DolibarrModules
 		$this->export_icon[$r] = 'trip';
 		$this->export_permission[$r] = array(array("expensereport", "export"));
 		$this->export_fields_array[$r] = array(
-			'd.rowid'=>"TripId", 'd.ref'=>'Ref', 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.date_create'=>'DateCreation', 'd.date_approve'=>'DateApprove',
-			'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC',
-			'd.fk_statut'=>'Status', 'd.paid'=>'Paid',
-			'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'd.detail_cancel'=>'MOTIF_CANCEL', 'd.detail_refuse'=>'MOTIF_REFUS',
-			'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
-			'ed.qty'=>"Quantity", 'ed.value_unit'=>"UnitPriceHT",
-			'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref',
-			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login",
+			'd.rowid' => "TripId", 'd.ref' => 'Ref', 'd.date_debut' => 'DateStart', 'd.date_fin' => 'DateEnd', 'd.date_create' => 'DateCreation', 'd.date_approve' => 'DateApprove',
+			'd.total_ht' => "TotalHT", 'd.total_tva' => 'TotalVAT', 'd.total_ttc' => 'TotalTTC',
+			'd.fk_statut' => 'Status', 'd.paid' => 'Paid',
+			'd.note_private' => 'NotePrivate', 'd.note_public' => 'NotePublic', 'd.detail_cancel' => 'MOTIF_CANCEL', 'd.detail_refuse' => 'MOTIF_REFUS',
+			'ed.rowid' => 'LineId', 'tf.code' => 'Type', 'ed.date' => 'Date', 'ed.tva_tx' => 'VATRate',
+			'ed.qty' => "Quantity", 'ed.value_unit' => "UnitPriceHT",
+			'ed.total_ht' => 'TotalHT', 'ed.total_tva' => 'TotalVAT', 'ed.total_ttc' => 'TotalTTC', 'ed.comments' => 'Comment', 'p.rowid' => 'ProjectId', 'p.ref' => 'Ref',
+			'u.lastname' => 'Lastname', 'u.firstname' => 'Firstname', 'u.login' => "Login",
 			'user_rib.iban_prefix' => 'IBAN', 'user_rib.bic' => 'BIC', 'user_rib.code_banque' => 'BankCode', 'user_rib.bank' => 'BankName', 'user_rib.proprio' => 'BankAccountOwner',
 			'user_rib.owner_address' => 'BankAccountOwnerAddress'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'd.rowid'=>'Numeric', 'd.ref'=>'Text', 'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'd.date_create'=>'Date', 'd.date_approve'=>'Date',
-			'd.total_ht'=>"Numeric", 'd.total_tva'=>'Numeric', 'd.total_ttc'=>'Numeric',
-			'd.fk_statut'=>"Numeric", 'd.paid'=>'Numeric',
-			'd.note_private'=>'Text', 'd.note_public'=>'Text', 'd.detail_cancel'=>'Text', 'd.detail_refuse'=>'Text',
-			'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
-			'ed.qty'=>'Numeric', 'ed.value_unit'=>'Numeric',
-			'ed.total_ht'=>'Numeric', 'ed.total_tva'=>'Numeric', 'ed.total_ttc'=>'Numeric', 'ed.comments'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text',
-			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text",
+			'd.rowid' => 'Numeric', 'd.ref' => 'Text', 'd.date_debut' => 'Date', 'd.date_fin' => 'Date', 'd.date_create' => 'Date', 'd.date_approve' => 'Date',
+			'd.total_ht' => "Numeric", 'd.total_tva' => 'Numeric', 'd.total_ttc' => 'Numeric',
+			'd.fk_statut' => "Numeric", 'd.paid' => 'Numeric',
+			'd.note_private' => 'Text', 'd.note_public' => 'Text', 'd.detail_cancel' => 'Text', 'd.detail_refuse' => 'Text',
+			'ed.rowid' => 'Numeric', 'tf.code' => 'Code', 'ed.date' => 'Date', 'ed.tva_tx' => 'Numeric',
+			'ed.qty' => 'Numeric', 'ed.value_unit' => 'Numeric',
+			'ed.total_ht' => 'Numeric', 'ed.total_tva' => 'Numeric', 'ed.total_ttc' => 'Numeric', 'ed.comments' => 'Text', 'p.rowid' => 'Numeric', 'p.ref' => 'Text',
+			'u.lastname' => 'Text', 'u.firstname' => 'Text', 'u.login' => "Text",
 			'user_rib.iban_prefix' => 'Text', 'user_rib.bic' => 'Text', 'user_rib.code_banque' => 'Text', 'user_rib.bank' => 'Text', 'user_rib.proprio' => 'Text',
 			'user_rib.owner_address' => 'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
-			'ed.qty'=>'expensereport_line', 'ed.value_unit'=>'expensereport_line',
-			'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line',
-			'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project',
-			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user',
+			'ed.rowid' => 'expensereport_line', 'ed.date' => 'expensereport_line',
+			'ed.qty' => 'expensereport_line', 'ed.value_unit' => 'expensereport_line',
+			'ed.tva_tx' => 'expensereport_line', 'ed.total_ht' => 'expensereport_line', 'ed.total_tva' => 'expensereport_line', 'ed.total_ttc' => 'expensereport_line',
+			'ed.comments' => 'expensereport_line', 'tf.code' => 'expensereport_line', 'p.project_ref' => 'expensereport_line', 'p.rowid' => 'project', 'p.ref' => 'project',
+			'u.lastname' => 'user', 'u.firstname' => 'user', 'u.login' => 'user',
 			'user_rib.iban_prefix' => 'user', 'user_rib.bic' => 'user', 'user_rib.code_banque' => 'user', 'user_rib.bank' => 'user', 'user_rib.proprio' => 'user',
 			'user_rib.owner_address' => 'user'
 
 		);
 		//$this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
-		$this->export_dependencies_array[$r] = array('expensereport_line'=>'ed.rowid', 'type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$this->export_dependencies_array[$r] = array('expensereport_line' => 'ed.rowid', 'type_fees' => 'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$keyforselect = 'expensereport';
 		$keyforelement = 'expensereport';

From 98862398f11413d52d61f9fa109d7ef769ef0430 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:54 +0100
Subject: [PATCH 1149/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modExternalSite.class.php | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index b56f62538b0..382c1a3821f 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -77,7 +78,7 @@ class modExternalSite extends DolibarrModules
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
 		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0)
 		// );
-		$this->const = array(0=>array('EXTERNALSITE_LABEL', 'chaine', 'ExternalSite', 'To declare label to use into external site menu entry', 0));
+		$this->const = array(0 => array('EXTERNALSITE_LABEL', 'chaine', 'ExternalSite', 'To declare label to use into external site menu entry', 0));
 
 		// Boxes
 		$this->boxes = array(); // List of boxes
@@ -100,21 +101,21 @@ class modExternalSite extends DolibarrModules
 
 		// Menus
 		//------
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		$this->menu[$r] = array(
-			'fk_menu'=>0,
-			'type'=>'top',
-			'titre'=>'__[EXTERNALSITE_LABEL]__',
+			'fk_menu' => 0,
+			'type' => 'top',
+			'titre' => '__[EXTERNALSITE_LABEL]__',
 			'prefix' => img_picto('', $this->picto, 'class="pictofixedwidth em092"'),
-			'mainmenu'=>'externalsite',
-			'url'=>'/externalsite/frames.php',
-			'langs'=>'other',
-			'position'=>100,
-			'perms'=>'',
-			'enabled'=>'$conf->externalsite->enabled',
-			'target'=>'',
-			'user'=>2
+			'mainmenu' => 'externalsite',
+			'url' => '/externalsite/frames.php',
+			'langs' => 'other',
+			'position' => 100,
+			'perms' => '',
+			'enabled' => '$conf->externalsite->enabled',
+			'target' => '',
+			'user' => 2
 		);
 		$r++;
 	}

From f9250639af47579268349c37c520e92ec88b4ebf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:30:57 +0100
Subject: [PATCH 1150/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modFournisseur.class.php | 213 ++++++++++---------
 1 file changed, 107 insertions(+), 106 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index e850567eb6f..c49e5311e91 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013-2015 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2020      Ahmad Jamaly Rabib   <rabib@metroworks.co.jp>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -131,32 +132,32 @@ class modFournisseur extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_graph_invoices_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_graph_orders_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
-			2=>array('file'=>'box_fournisseurs.php', 'enabledbydefaulton'=>'Home'),
-			3=>array('file'=>'box_factures_fourn_imp.php', 'enabledbydefaulton'=>'Home'),
-			4=>array('file'=>'box_factures_fourn.php', 'enabledbydefaulton'=>'Home'),
-			5=>array('file'=>'box_supplier_orders.php', 'enabledbydefaulton'=>'Home'),
-			6=>array('file'=>'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton'=>'Home'),
+			0 => array('file' => 'box_graph_invoices_supplier_permonth.php', 'enabledbydefaulton' => 'Home'),
+			1 => array('file' => 'box_graph_orders_supplier_permonth.php', 'enabledbydefaulton' => 'Home'),
+			2 => array('file' => 'box_fournisseurs.php', 'enabledbydefaulton' => 'Home'),
+			3 => array('file' => 'box_factures_fourn_imp.php', 'enabledbydefaulton' => 'Home'),
+			4 => array('file' => 'box_factures_fourn.php', 'enabledbydefaulton' => 'Home'),
+			5 => array('file' => 'box_supplier_orders.php', 'enabledbydefaulton' => 'Home'),
+			6 => array('file' => 'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton' => 'Home'),
 		);
 
 		$arraydate = dol_getdate(dol_now());
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$this->cronjobs = array(
 			0 => array(
-				'label'=>'RecurringSupplierInvoicesJob',
-				'jobtype'=>'method',
-				'class'=>'fourn/class/fournisseur.facture-rec.class.php',
-				'objectname'=>'FactureFournisseurRec',
-				'method'=>'createRecurringInvoices',
-				'parameters'=>'',
-				'comment'=>'Generate recurring supplier invoices',
-				'frequency'=>1,
-				'unitfrequency'=>3600 * 24,
-				'priority'=>51,
-				'status'=>1,
-				'test'=>'isModEnabled("supplier_invoice")',
-				'datestart'=>$datestart
+				'label' => 'RecurringSupplierInvoicesJob',
+				'jobtype' => 'method',
+				'class' => 'fourn/class/fournisseur.facture-rec.class.php',
+				'objectname' => 'FactureFournisseurRec',
+				'method' => 'createRecurringInvoices',
+				'parameters' => '',
+				'comment' => 'Generate recurring supplier invoices',
+				'frequency' => 1,
+				'unitfrequency' => 3600 * 24,
+				'priority' => 51,
+				'status' => 1,
+				'test' => 'isModEnabled("supplier_invoice")',
+				'datestart' => $datestart
 			),
 			1 => array(
 				'label' => 'SendEmailsRemindersOnSupplierInvoiceDueDate',
@@ -170,8 +171,8 @@ class modFournisseur extends DolibarrModules
 				'unitfrequency' => 3600 * 24,
 				'priority' => 50,
 				'status' => 0,
-				'test'=>'isModEnabled("supplier_invoice")',
-				'datestart'=>$datestart
+				'test' => 'isModEnabled("supplier_invoice")',
+				'datestart' => $datestart
 			));
 
 
@@ -337,17 +338,17 @@ class modFournisseur extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("fournisseur", "facture", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
-			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6',
-			's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
-			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_supplier'=>"RefSupplier", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>'DateMaxPayment',
-			'f.fk_cond_reglement'=>'IdPaymentTerm', 'cpt.code'=>'CodePaymentTerm', 'cpt.libelle'=>'LabelPaymentTerm', 'f.fk_mode_reglement'=>'IdPaymentMode', 'cp.code'=>'CodePaymentMode', 'cp.libelle'=>'LabelPaymentMode',
-			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote",
-			'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.remise_percent'=>"Discount", 'fd.total_ht'=>"LineTotalHT",
-			'fd.total_ttc'=>"LineTotalTTC", 'fd.tva'=>"LineTotalVAT", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
-			'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.fk_product'=>'ProductId',
-			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', $alias_product_perentity.'.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
-			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
+			's.rowid' => "IdCompany", 's.nom' => 'CompanyName', 'ps.nom' => 'ParentCompany', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town', 'c.code' => 'CountryCode', 's.phone' => 'Phone',
+			's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 's.idprof5' => 'ProfId5', 's.idprof6' => 'ProfId6',
+			's.code_compta' => 'CustomerAccountancyCode', 's.code_compta_fournisseur' => 'SupplierAccountancyCode', 's.tva_intra' => 'VATIntra',
+			'f.rowid' => "InvoiceId", 'f.ref' => "InvoiceRef", 'f.ref_supplier' => "RefSupplier", 'f.datec' => "InvoiceDateCreation", 'f.datef' => "DateInvoice", 'f.date_lim_reglement' => 'DateMaxPayment',
+			'f.fk_cond_reglement' => 'IdPaymentTerm', 'cpt.code' => 'CodePaymentTerm', 'cpt.libelle' => 'LabelPaymentTerm', 'f.fk_mode_reglement' => 'IdPaymentMode', 'cp.code' => 'CodePaymentMode', 'cp.libelle' => 'LabelPaymentMode',
+			'f.total_ht' => "TotalHT", 'f.total_ttc' => "TotalTTC", 'f.total_tva' => "TotalVAT", 'f.paye' => "InvoicePaid", 'f.fk_statut' => 'InvoiceStatus', 'f.note_public' => "InvoiceNote",
+			'fd.rowid' => 'LineId', 'fd.description' => "LineDescription", 'fd.tva_tx' => "LineVATRate", 'fd.qty' => "LineQty", 'fd.remise_percent' => "Discount", 'fd.total_ht' => "LineTotalHT",
+			'fd.total_ttc' => "LineTotalTTC", 'fd.tva' => "LineTotalVAT", 'fd.date_start' => "DateStart", 'fd.date_end' => "DateEnd", 'fd.special_code' => 'SpecialCode',
+			'fd.product_type' => 'TypeOfLineServiceOrProduct', 'fd.fk_product' => 'ProductId',
+			'p.ref' => 'ProductRef', 'p.label' => 'ProductLabel', $alias_product_perentity.'.accountancy_code_buy' => 'ProductAccountancyBuyCode', 'project.rowid' => 'ProjectId',
+			'project.ref' => 'ProjectRef', 'project.title' => 'ProjectLabel'
 		);
 		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
@@ -363,26 +364,26 @@ class modFournisseur extends DolibarrModules
 		//     'fd.tva'=>"Numeric",'fd.product_type'=>'Numeric','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text',
-			's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>'Date',
-			'f.fk_cond_reglement'=>'Numeric', 'f.fk_mode_reglement'=>'Numeric',
-			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status', 'f.note_public'=>"Text", 'fd.description'=>"Text", 'fd.tva_tx'=>"Text",
-			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.tva'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date", 'fd.special_code'=>"Numeric",
-			'fd.product_type'=>'Numeric', 'fd.fk_product'=>'List:product:label', $alias_product_perentity . '.accountancy_code_buy'=>'Text',
-			'p.ref'=>'Text', 'p.label'=>'Text', 'project.ref'=>'Text', 'project.title'=>'Text'
+			's.nom' => 'Text', 'ps.nom' => 'Text', 's.address' => 'Text', 's.zip' => 'Text', 's.town' => 'Text', 'c.code' => 'Text', 's.phone' => 'Text', 's.siren' => 'Text', 's.siret' => 'Text', 's.ape' => 'Text', 's.idprof4' => 'Text', 's.idprof5' => 'Text', 's.idprof6' => 'Text',
+			's.code_compta' => 'Text', 's.code_compta_fournisseur' => 'Text', 's.tva_intra' => 'Text', 'f.ref' => "Text", 'f.ref_supplier' => "Text", 'f.datec' => "Date", 'f.datef' => "Date", 'f.date_lim_reglement' => 'Date',
+			'f.fk_cond_reglement' => 'Numeric', 'f.fk_mode_reglement' => 'Numeric',
+			'f.total_ht' => "Numeric", 'f.total_ttc' => "Numeric", 'f.total_tva' => "Numeric", 'f.paye' => "Boolean", 'f.fk_statut' => 'Status', 'f.note_public' => "Text", 'fd.description' => "Text", 'fd.tva_tx' => "Text",
+			'fd.qty' => "Numeric", 'fd.total_ht' => "Numeric", 'fd.total_ttc' => "Numeric", 'fd.tva' => "Numeric", 'fd.date_start' => "Date", 'fd.date_end' => "Date", 'fd.special_code' => "Numeric",
+			'fd.product_type' => 'Numeric', 'fd.fk_product' => 'List:product:label', $alias_product_perentity . '.accountancy_code_buy' => 'Text',
+			'p.ref' => 'Text', 'p.label' => 'Text', 'project.ref' => 'Text', 'project.title' => 'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.siret'=>'company',
-			's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company', 'f.rowid'=>"invoice",
-			'f.ref'=>"invoice", 'f.ref_supplier'=>"invoice", 'f.datec'=>"invoice", 'f.datef'=>"invoice", 'f.date_lim_reglement'=>'invoice',
-			'f.fk_cond_reglement'=>'invoice', 'f.fk_mode_reglement'=>'invoice',
-			'f.total_ht'=>"invoice", 'f.total_ttc'=>"invoice", 'f.total_tva'=>"invoice",
-			'f.paye'=>"invoice", 'f.fk_statut'=>'invoice', 'f.note_public'=>"invoice", 'fd.rowid'=>'invoice_line', 'fd.description'=>"invoice_line", 'fd.tva_tx'=>"invoice_line", 'fd.qty'=>"invoice_line",
-			'fd.remise_percent'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva'=>"invoice_line", 'fd.date_start'=>"invoice_line", 'fd.date_end'=>"invoice_line", 'fd.special_code'=>"invoice_line",
-			'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product',
-			'p.ref'=>'product', 'p.label'=>'product', $alias_product_perentity.'.accountancy_code_buy'=>'product', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project'
+			's.rowid' => "company", 's.nom' => 'company', 'ps.nom' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company', 'c.code' => 'company', 's.phone' => 'company', 's.siren' => 'company', 's.siret' => 'company',
+			's.ape' => 'company', 's.idprof4' => 'company', 's.idprof5' => 'company', 's.idprof6' => 'company', 's.code_compta' => 'company', 's.code_compta_fournisseur' => 'company', 's.tva_intra' => 'company', 'f.rowid' => "invoice",
+			'f.ref' => "invoice", 'f.ref_supplier' => "invoice", 'f.datec' => "invoice", 'f.datef' => "invoice", 'f.date_lim_reglement' => 'invoice',
+			'f.fk_cond_reglement' => 'invoice', 'f.fk_mode_reglement' => 'invoice',
+			'f.total_ht' => "invoice", 'f.total_ttc' => "invoice", 'f.total_tva' => "invoice",
+			'f.paye' => "invoice", 'f.fk_statut' => 'invoice', 'f.note_public' => "invoice", 'fd.rowid' => 'invoice_line', 'fd.description' => "invoice_line", 'fd.tva_tx' => "invoice_line", 'fd.qty' => "invoice_line",
+			'fd.remise_percent' => "invoice_line", 'fd.total_ht' => "invoice_line", 'fd.total_ttc' => "invoice_line", 'fd.tva' => "invoice_line", 'fd.date_start' => "invoice_line", 'fd.date_end' => "invoice_line", 'fd.special_code' => "invoice_line",
+			'fd.product_type' => 'invoice_line', 'fd.fk_product' => 'product',
+			'p.ref' => 'product', 'p.label' => 'product', $alias_product_perentity.'.accountancy_code_buy' => 'product', 'project.rowid' => 'project', 'project.ref' => 'project', 'project.title' => 'project'
 		);
-		$this->export_dependencies_array[$r] = array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$this->export_dependencies_array[$r] = array('invoice_line' => 'fd.rowid', 'product' => 'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$keyforselect = 'facture_fourn';
 		$keyforelement = 'invoice';
@@ -420,14 +421,14 @@ class modFournisseur extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("fournisseur", "facture", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
-			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6',
-			's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
-			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_supplier'=>"RefSupplier", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateMaxPayment",
-			'f.fk_cond_reglement'=>'IdPaymentTerm', 'cpt.code'=>'CodePaymentTerm', 'cpt.libelle'=>'LabelPaymentTerm', 'f.fk_mode_reglement'=>'IdPaymentMode', 'cp.code'=>'CodePaymentMode', 'cp.libelle'=>'LabelPaymentMode',
-			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.paye'=>"InvoicePaid",
-			'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote", 'p.rowid'=>'PaymentId', 'pf.amount'=>'AmountPayment',
-			'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber', 'p.fk_bank'=>'IdTransaction', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
+			's.rowid' => "IdCompany", 's.nom' => 'CompanyName', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town', 'c.code' => 'CountryCode', 's.phone' => 'Phone',
+			's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 's.idprof5' => 'ProfId5', 's.idprof6' => 'ProfId6',
+			's.code_compta' => 'CustomerAccountancyCode', 's.code_compta_fournisseur' => 'SupplierAccountancyCode', 's.tva_intra' => 'VATIntra',
+			'f.rowid' => "InvoiceId", 'f.ref' => "InvoiceRef", 'f.ref_supplier' => "RefSupplier", 'f.datec' => "InvoiceDateCreation", 'f.datef' => "DateInvoice", 'f.date_lim_reglement' => "DateMaxPayment",
+			'f.fk_cond_reglement' => 'IdPaymentTerm', 'cpt.code' => 'CodePaymentTerm', 'cpt.libelle' => 'LabelPaymentTerm', 'f.fk_mode_reglement' => 'IdPaymentMode', 'cp.code' => 'CodePaymentMode', 'cp.libelle' => 'LabelPaymentMode',
+			'f.total_ht' => "TotalHT", 'f.total_ttc' => "TotalTTC", 'f.total_tva' => "TotalVAT", 'f.paye' => "InvoicePaid",
+			'f.fk_statut' => 'InvoiceStatus', 'f.note_public' => "InvoiceNote", 'p.rowid' => 'PaymentId', 'pf.amount' => 'AmountPayment',
+			'p.datep' => 'DatePayment', 'p.num_paiement' => 'PaymentNumber', 'p.fk_bank' => 'IdTransaction', 'project.rowid' => 'ProjectId', 'project.ref' => 'ProjectRef', 'project.title' => 'ProjectLabel'
 		);
 		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
@@ -443,22 +444,22 @@ class modFournisseur extends DolibarrModules
 		//	'pf.amount'=>'Numeric','p.datep'=>'Date','p.num_paiement'=>'Numeric'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text',
-			's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text",
-			'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>'Date',
-			'f.fk_cond_reglement'=>'Numeric', 'f.fk_mode_reglement'=>'Numeric',
-			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status', 'f.note_public'=>"Text", 'pf.amount'=>'Numeric',
-			'p.datep'=>'Date', 'p.num_paiement'=>'Numeric', 'p.fk_bank'=>'Numeric', 'project.ref'=>'Text', 'project.title'=>'Text'
+			's.nom' => 'Text', 's.address' => 'Text', 's.zip' => 'Text', 's.town' => 'Text', 'c.code' => 'Text', 's.phone' => 'Text', 's.siren' => 'Text', 's.siret' => 'Text', 's.ape' => 'Text',
+			's.idprof4' => 'Text', 's.code_compta' => 'Text', 's.code_compta_fournisseur' => 'Text', 's.tva_intra' => 'Text', 'f.ref' => "Text", 'f.ref_supplier' => "Text",
+			'f.datec' => "Date", 'f.datef' => "Date", 'f.date_lim_reglement' => 'Date',
+			'f.fk_cond_reglement' => 'Numeric', 'f.fk_mode_reglement' => 'Numeric',
+			'f.total_ht' => "Numeric", 'f.total_ttc' => "Numeric", 'f.total_tva' => "Numeric", 'f.paye' => "Boolean", 'f.fk_statut' => 'Status', 'f.note_public' => "Text", 'pf.amount' => 'Numeric',
+			'p.datep' => 'Date', 'p.num_paiement' => 'Numeric', 'p.fk_bank' => 'Numeric', 'project.ref' => 'Text', 'project.title' => 'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company',
-			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company',
-			's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company',
-			'f.rowid'=>"invoice", 'f.ref'=>"invoice", 'f.ref_supplier'=>"invoice", 'f.datec'=>"invoice", 'f.datef'=>"invoice", 'f.date_lim_reglement'=>'invoice',
-			'f.fk_cond_reglement'=>'invoice', 'f.fk_mode_reglement'=>'invoice',
-			'f.total_ht'=>"invoice", 'f.total_ttc'=>"invoice", 'f.total_tva'=>"invoice", 'f.paye'=>"invoice", 'f.fk_statut'=>'invoice', 'f.note_public'=>"invoice", 'p.rowid'=>'payment', 'pf.amount'=>'payment',
-			'p.datep'=>'payment', 'p.num_paiement'=>'payment', 'p.fk_bank'=>'account', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project');
-		$this->export_dependencies_array[$r] = array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+			's.rowid' => "company", 's.nom' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company', 'c.code' => 'company', 's.phone' => 'company',
+			's.siren' => 'company', 's.siret' => 'company', 's.ape' => 'company', 's.idprof4' => 'company', 's.idprof5' => 'company', 's.idprof6' => 'company',
+			's.code_compta' => 'company', 's.code_compta_fournisseur' => 'company', 's.tva_intra' => 'company',
+			'f.rowid' => "invoice", 'f.ref' => "invoice", 'f.ref_supplier' => "invoice", 'f.datec' => "invoice", 'f.datef' => "invoice", 'f.date_lim_reglement' => 'invoice',
+			'f.fk_cond_reglement' => 'invoice', 'f.fk_mode_reglement' => 'invoice',
+			'f.total_ht' => "invoice", 'f.total_ttc' => "invoice", 'f.total_tva' => "invoice", 'f.paye' => "invoice", 'f.fk_statut' => 'invoice', 'f.note_public' => "invoice", 'p.rowid' => 'payment', 'pf.amount' => 'payment',
+			'p.datep' => 'payment', 'p.num_paiement' => 'payment', 'p.fk_bank' => 'account', 'project.rowid' => 'project', 'project.ref' => 'project', 'project.title' => 'project');
+		$this->export_dependencies_array[$r] = array('payment' => 'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$keyforselect = 'facture_fourn';
 		$keyforelement = 'invoice';
@@ -491,15 +492,15 @@ class modFournisseur extends DolibarrModules
 		$this->export_icon[$r] = 'order';
 		$this->export_permission[$r] = array(array("fournisseur", "commande", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
-			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6', 's.tva_intra'=>'VATIntra',
-			'f.rowid'=>"OrderId", 'f.ref'=>"Ref", 'f.ref_supplier'=>"RefSupplier", 'f.date_creation'=>"DateCreation", 'f.date_commande'=>"OrderDate", 'f.date_livraison'=>"DateDeliveryPlanned",
-			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.fk_statut'=>'Status', 'f.date_valid'=>'DateValidation', 'f.date_approve'=>'DateApprove', 'f.date_approve2'=>'DateApprove2',
-			'f.note_public'=>"NotePublic", 'f.note_private'=>"NotePrivate", 'uv.login'=>'UserValidation', 'ua1.login'=>'ApprovedBy', 'ua2.login'=>'ApprovedBy2', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
-			'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.remise_percent'=>"Discount", 'fd.total_ht'=>"LineTotalHT", 'fd.total_ttc'=>"LineTotalTTC",
-			'fd.total_tva'=>"LineTotalVAT", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
-			'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'SupplierRef', 'fd.fk_product'=>'ProductId',
-			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
+			's.rowid' => "IdCompany", 's.nom' => 'CompanyName', 'ps.nom' => 'ParentCompany', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town', 'c.code' => 'CountryCode', 's.phone' => 'Phone',
+			's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 's.idprof5' => 'ProfId5', 's.idprof6' => 'ProfId6', 's.tva_intra' => 'VATIntra',
+			'f.rowid' => "OrderId", 'f.ref' => "Ref", 'f.ref_supplier' => "RefSupplier", 'f.date_creation' => "DateCreation", 'f.date_commande' => "OrderDate", 'f.date_livraison' => "DateDeliveryPlanned",
+			'f.total_ht' => "TotalHT", 'f.total_ttc' => "TotalTTC", 'f.total_tva' => "TotalVAT", 'f.fk_statut' => 'Status', 'f.date_valid' => 'DateValidation', 'f.date_approve' => 'DateApprove', 'f.date_approve2' => 'DateApprove2',
+			'f.note_public' => "NotePublic", 'f.note_private' => "NotePrivate", 'uv.login' => 'UserValidation', 'ua1.login' => 'ApprovedBy', 'ua2.login' => 'ApprovedBy2', 'fd.rowid' => 'LineId', 'fd.description' => "LineDescription",
+			'fd.tva_tx' => "LineVATRate", 'fd.qty' => "LineQty", 'fd.remise_percent' => "Discount", 'fd.total_ht' => "LineTotalHT", 'fd.total_ttc' => "LineTotalTTC",
+			'fd.total_tva' => "LineTotalVAT", 'fd.date_start' => "DateStart", 'fd.date_end' => "DateEnd", 'fd.special_code' => 'SpecialCode',
+			'fd.product_type' => 'TypeOfLineServiceOrProduct', 'fd.ref' => 'SupplierRef', 'fd.fk_product' => 'ProductId',
+			'p.ref' => 'ProductRef', 'p.label' => 'ProductLabel', 'project.rowid' => 'ProjectId', 'project.ref' => 'ProjectRef', 'project.title' => 'ProjectLabel'
 		);
 		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
@@ -513,27 +514,27 @@ class modFournisseur extends DolibarrModules
 			unset($this->export_fields_array['ua2.login']);
 		}
 		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.cp'=>'Text', 's.ville'=>'Text', 'c.code'=>'Text', 's.tel'=>'Text', 's.siren'=>'Text',
-			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text",
-			'f.date_creation'=>"Date", 'f.date_commande'=>"Date", 'f.date_livraison'=>"Date", 'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric",
-			'f.fk_statut'=>'Status', 'f.date_valid'=>'Date', 'f.date_approve'=>'Date', 'f.date_approve2'=>'Date', 'f.note_public'=>"Text", 'f.note_private'=>"Text", 'fd.description'=>"Text",
-			'fd.tva_tx'=>"Numeric", 'fd.qty'=>"Numeric", 'fd.remise_percent'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.total_tva'=>"Numeric",
-			'fd.date_start'=>"Date", 'fd.date_end'=>"Date", 'fd.special_code'=>"Numeric",
-			'fd.product_type'=>'Numeric', 'fd.ref'=>'Text', 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text', 'project.ref'=>'Text', 'project.title'=>'Text'
+			's.rowid' => "company", 's.nom' => 'Text', 'ps.nom' => 'Text', 's.address' => 'Text', 's.cp' => 'Text', 's.ville' => 'Text', 'c.code' => 'Text', 's.tel' => 'Text', 's.siren' => 'Text',
+			's.siret' => 'Text', 's.ape' => 'Text', 's.idprof4' => 'Text', 's.idprof5' => 'Text', 's.idprof6' => 'Text', 's.tva_intra' => 'Text', 'f.ref' => "Text", 'f.ref_supplier' => "Text",
+			'f.date_creation' => "Date", 'f.date_commande' => "Date", 'f.date_livraison' => "Date", 'f.total_ht' => "Numeric", 'f.total_ttc' => "Numeric", 'f.total_tva' => "Numeric",
+			'f.fk_statut' => 'Status', 'f.date_valid' => 'Date', 'f.date_approve' => 'Date', 'f.date_approve2' => 'Date', 'f.note_public' => "Text", 'f.note_private' => "Text", 'fd.description' => "Text",
+			'fd.tva_tx' => "Numeric", 'fd.qty' => "Numeric", 'fd.remise_percent' => "Numeric", 'fd.total_ht' => "Numeric", 'fd.total_ttc' => "Numeric", 'fd.total_tva' => "Numeric",
+			'fd.date_start' => "Date", 'fd.date_end' => "Date", 'fd.special_code' => "Numeric",
+			'fd.product_type' => 'Numeric', 'fd.ref' => 'Text', 'fd.fk_product' => 'List:product:label', 'p.ref' => 'Text', 'p.label' => 'Text', 'project.ref' => 'Text', 'project.title' => 'Text'
 		);
 		$this->export_entities_array[$r] = array(
-			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company',
-			's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company', 's.tva_intra'=>'company', 'uv.login'=>'user', 'ua1.login'=>'user',
-			'ua2.login'=>'user', 'fd.rowid'=>'order_line', 'fd.description'=>"order_line", 'fd.tva_tx'=>"order_line", 'fd.qty'=>"order_line", 'fd.remise_percent'=>"order_line",
-			'fd.total_ht'=>"order_line", 'fd.total_ttc'=>"order_line", 'fd.total_tva'=>"order_line", 'fd.date_start'=>"order_line", 'fd.date_end'=>"order_line", 'fd.special_code'=>"order_line",
-			'fd.product_type'=>'order_line', 'fd.ref'=>'order_line', 'fd.fk_product'=>'product',
-			'p.ref'=>'product', 'p.label'=>'product', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project'
+			's.rowid' => "company", 's.nom' => 'company', 'ps.nom' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company', 'c.code' => 'company', 's.phone' => 'company', 's.siren' => 'company',
+			's.siret' => 'company', 's.ape' => 'company', 's.idprof4' => 'company', 's.idprof5' => 'company', 's.idprof6' => 'company', 's.tva_intra' => 'company', 'uv.login' => 'user', 'ua1.login' => 'user',
+			'ua2.login' => 'user', 'fd.rowid' => 'order_line', 'fd.description' => "order_line", 'fd.tva_tx' => "order_line", 'fd.qty' => "order_line", 'fd.remise_percent' => "order_line",
+			'fd.total_ht' => "order_line", 'fd.total_ttc' => "order_line", 'fd.total_tva' => "order_line", 'fd.date_start' => "order_line", 'fd.date_end' => "order_line", 'fd.special_code' => "order_line",
+			'fd.product_type' => 'order_line', 'fd.ref' => 'order_line', 'fd.fk_product' => 'product',
+			'p.ref' => 'product', 'p.label' => 'product', 'project.rowid' => 'project', 'project.ref' => 'project', 'project.title' => 'project'
 		);
-		$this->export_dependencies_array[$r] = array('order_line'=>'fd.rowid', 'product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$this->export_dependencies_array[$r] = array('order_line' => 'fd.rowid', 'product' => 'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$keyforselect = 'commande_fournisseur';
 		$keyforelement = 'order';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// End add extra fields object
 		// Add extra fields line
@@ -659,11 +660,11 @@ class modFournisseur extends DolibarrModules
 		$this->import_updatekeys_array[$r] = array('f.ref' => 'Ref');
 		$this->import_convertvalue_array[$r] = array(
 			'f.ref' => array(
-				'rule'=>'getrefifauto',
-				'class'=>(!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER),
-				'path'=>"/core/modules/supplier_invoice/".(!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER).'.php',
-				'classobject'=>'FactureFournisseur',
-				'pathobject'=>'/fourn/class/fournisseur.facture.class.php',
+				'rule' => 'getrefifauto',
+				'class' => (!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER),
+				'path' => "/core/modules/supplier_invoice/".(!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER).'.php',
+				'classobject' => 'FactureFournisseur',
+				'pathobject' => '/fourn/class/fournisseur.facture.class.php',
 			),
 			'f.fk_soc' => array('rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
 			'f.fk_account' => array('rule' => 'fetchidfromref', 'file' => '/compta/bank/class/account.class.php', 'class' => 'Account', 'method' => 'fetch', 'element' => 'bank_account'),
@@ -812,11 +813,11 @@ class modFournisseur extends DolibarrModules
 		$this->import_updatekeys_array[$r] = array('c.ref' => 'Ref');
 		$this->import_convertvalue_array[$r] = array(
 			'c.ref' => array(
-				'rule'=>'getrefifauto',
-				'class'=>(!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER') ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER),
-				'path'=>"/core/modules/supplier_order/".(!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER') ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER).'.php',
-				'classobject'=>'CommandeFournisseur',
-				'pathobject'=>'/fourn/class/fournisseur.commande.class.php',
+				'rule' => 'getrefifauto',
+				'class' => (!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER') ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER),
+				'path' => "/core/modules/supplier_order/".(!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER') ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER).'.php',
+				'classobject' => 'CommandeFournisseur',
+				'pathobject' => '/fourn/class/fournisseur.commande.class.php',
 			),
 			'c.fk_soc' => array(
 				'rule'    => 'fetchidfromref',

From daaf1e46c6fc38e2900bbd9b2a5f25bbba93ff56 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:00 +0100
Subject: [PATCH 1151/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index 4e38b93c4fc..f5992524911 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -91,7 +92,7 @@ class modGravatar extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(); // List of boxes
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
@@ -103,7 +104,7 @@ class modGravatar extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
@@ -117,7 +118,7 @@ class modGravatar extends DolibarrModules
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here entries to declare new menus
 		// Example to declare the Top Menu entry:

From 75c1556a4f49de9929a5e983bc277ff23bca5227 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:03 +0100
Subject: [PATCH 1152/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 927325431fd..b2daca3d2f6 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -125,7 +126,7 @@ class modHRM extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		$this->tabs = array();
-		$this->tabs[] = array('data'=>'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user');  					// To add a new tab identified by code tabname1
+		$this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user');  					// To add a new tab identified by code tabname1
 		//$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__');  					// To add a new tab identified by code tabname1
 		// Example:
 		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
@@ -190,7 +191,7 @@ class modHRM extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Skill / Job / Position
 		$this->rights[$r][0] = 4001; // Permission id (must not be already used)

From f929da1d0e25feb271db63db547c6246e76f486f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:06 +0100
Subject: [PATCH 1153/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modHoliday.class.php | 33 ++++++++++++------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 6aadda390dd..a974f86e95a 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011      Dimitri Mouillard 	<dmouillard@teclib.com>
  * Copyright (C) 2013      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2018      Charlene Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -92,7 +93,7 @@ class modHoliday extends DolibarrModules
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
 		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
 		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		$this->const[$r][0] = "HOLIDAY_ADDON";
 		$this->const[$r][1] = "chaine";
@@ -155,7 +156,7 @@ class modHoliday extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		$this->rights[$r][0] = 20001; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read leave requests (yours and your subordinates)'; // Permission label
@@ -221,26 +222,26 @@ class modHoliday extends DolibarrModules
 		$this->export_icon[$r] = 'holiday';
 		$this->export_permission[$r] = array(array("holiday", "readall"));
 		$this->export_fields_array[$r] = array(
-			'd.rowid'=>"LeaveId", 'd.fk_type'=>'TypeOfLeaveId', 't.code'=>'TypeOfLeaveCode', 't.label'=>'TypeOfLeaveLabel', 'd.fk_user'=>'UserID',
-			'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.halfday'=>'HalfDay', 'none.num_open_days'=>'NbUseDaysCP',
-			'd.date_valid'=>'DateApprove', 'd.fk_validator'=>"UserForApprovalID",
-			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login",
-			'ua.lastname'=>"UserForApprovalLastname", 'ua.firstname'=>"UserForApprovalFirstname",
-			'ua.login'=>"UserForApprovalLogin", 'd.description'=>'Description', 'd.statut'=>'Status'
+			'd.rowid' => "LeaveId", 'd.fk_type' => 'TypeOfLeaveId', 't.code' => 'TypeOfLeaveCode', 't.label' => 'TypeOfLeaveLabel', 'd.fk_user' => 'UserID',
+			'd.date_debut' => 'DateStart', 'd.date_fin' => 'DateEnd', 'd.halfday' => 'HalfDay', 'none.num_open_days' => 'NbUseDaysCP',
+			'd.date_valid' => 'DateApprove', 'd.fk_validator' => "UserForApprovalID",
+			'u.lastname' => 'Lastname', 'u.firstname' => 'Firstname', 'u.login' => "Login",
+			'ua.lastname' => "UserForApprovalLastname", 'ua.firstname' => "UserForApprovalFirstname",
+			'ua.login' => "UserForApprovalLogin", 'd.description' => 'Description', 'd.statut' => 'Status'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'd.rowid'=>"Numeric", 't.code'=>'Text', 't.label'=>'Text', 'd.fk_user'=>'Numeric',
-			'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'none.num_open_days'=>'NumericCompute',
-			'd.date_valid'=>'Date', 'd.fk_validator'=>"Numeric",
-			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text",
-			'ua.lastname'=>"Text", 'ua.firstname'=>"Text",
-			'ua.login'=>"Text", 'd.description'=>'Text', 'd.statut'=>'Numeric'
+			'd.rowid' => "Numeric", 't.code' => 'Text', 't.label' => 'Text', 'd.fk_user' => 'Numeric',
+			'd.date_debut' => 'Date', 'd.date_fin' => 'Date', 'none.num_open_days' => 'NumericCompute',
+			'd.date_valid' => 'Date', 'd.fk_validator' => "Numeric",
+			'u.lastname' => 'Text', 'u.firstname' => 'Text', 'u.login' => "Text",
+			'ua.lastname' => "Text", 'ua.firstname' => "Text",
+			'ua.login' => "Text", 'd.description' => 'Text', 'd.statut' => 'Numeric'
 		);
 		$this->export_entities_array[$r] = array(
-			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ua.lastname'=>'user', 'ua.firstname'=>'user', 'ua.login'=>'user'
+			'u.lastname' => 'user', 'u.firstname' => 'user', 'u.login' => 'user', 'ua.lastname' => 'user', 'ua.firstname' => 'user', 'ua.login' => 'user'
 		);
 		//$this->export_alias_array[$r] = array('d.rowid'=>"idholiday");
-		$this->export_special_array[$r] = array('none.num_open_days'=>'getNumOpenDays');
+		$this->export_special_array[$r] = array('none.num_open_days' => 'getNumOpenDays');
 		$this->export_dependencies_array[$r] = array(); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$keyforselect = 'holiday';

From cbc0fd1f5d92f5d55df7a79ab84cef84a0123662 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:09 +0100
Subject: [PATCH 1154/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modIncoterm.class.php | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index dccaa02aef4..87d0b6da464 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -84,16 +85,16 @@ class modIncoterm extends DolibarrModules
 			$conf->incoterm->enabled = 0;
 		}
 		$this->dictionaries = array(
-			'langs'=>'incoterm',
-			'tabname'=>array("c_incoterms"), // List of tables we want to see into dictonnary editor
-			'tablib'=>array("Incoterms"), // Label of tables
-			'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
-			'tabsqlsort'=>array("rowid ASC"), // Sort order
-			'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
-			'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
-			'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
-			'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->incoterm->enabled),
+			'langs' => 'incoterm',
+			'tabname' => array("c_incoterms"), // List of tables we want to see into dictonnary editor
+			'tablib' => array("Incoterms"), // Label of tables
+			'tabsql' => array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
+			'tabsqlsort' => array("rowid ASC"), // Sort order
+			'tabfield' => array("code,libelle"), // List of fields (result of select to show dictionary)
+			'tabfieldvalue' => array("code,libelle"), // List of fields (list of fields to edit a record)
+			'tabfieldinsert' => array("code,libelle"), // List of fields (list of fields for insert)
+			'tabrowid' => array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
+			'tabcond' => array($conf->incoterm->enabled),
 			'tabhelp' => array(array())
 		);
 
@@ -102,10 +103,10 @@ class modIncoterm extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	}
 }

From a32d69d68d3d65b869f392e3b1a22b5f358162a2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:12 +0100
Subject: [PATCH 1155/1862] Fix PhanPluginRedundantAssignment

---
 .../modules/modKnowledgeManagement.class.php  | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index cec8cfcc3fd..37784bdeb8d 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021 SuperAdmin
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -280,66 +281,66 @@ class modKnowledgeManagement extends DolibarrModules
 		*/
 		/* END MODULEBUILDER TOPMENU */
 
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=ticket',
+			'fk_menu' => 'fk_mainmenu=ticket',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'MenuKnowledgeRecord',
+			'type' => 'left',
+			'titre' => 'MenuKnowledgeRecord',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em092"'),
-			'mainmenu'=>'ticket',
-			'leftmenu'=>'knowledgemanagement_knowledgerecord',
-			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'knowledgemanagement_knowledgerecord',
+			'url' => '/knowledgemanagement/knowledgerecord_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'knowledgemanagement',
-			'position'=>101,
+			'langs' => 'knowledgemanagement',
+			'position' => 101,
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->knowledgemanagement->enabled',
+			'enabled' => '$conf->knowledgemanagement->enabled',
 			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',
-			'target'=>'',
+			'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2,
+			'user' => 2,
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			'fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'ListKnowledgeRecord',
-			'mainmenu'=>'ticket',
-			'leftmenu'=>'knowledgemanagement_list',
-			'url'=>'/knowledgemanagement/knowledgerecord_list.php',
+			'type' => 'left',
+			'titre' => 'ListKnowledgeRecord',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'knowledgemanagement_list',
+			'url' => '/knowledgemanagement/knowledgerecord_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'knowledgemanagement',
-			'position'=>111,
+			'langs' => 'knowledgemanagement',
+			'position' => 111,
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->knowledgemanagement->enabled',
+			'enabled' => '$conf->knowledgemanagement->enabled',
 			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',
-			'target'=>'',
+			'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2,
+			'user' => 2,
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			'fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'NewKnowledgeRecord',
-			'mainmenu'=>'ticket',
-			'leftmenu'=>'knowledgemanagement_new',
-			'url'=>'/knowledgemanagement/knowledgerecord_card.php?action=create',
+			'type' => 'left',
+			'titre' => 'NewKnowledgeRecord',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'knowledgemanagement_new',
+			'url' => '/knowledgemanagement/knowledgerecord_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'knowledgemanagement',
-			'position'=>110,
+			'langs' => 'knowledgemanagement',
+			'position' => 110,
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->knowledgemanagement->enabled',
+			'enabled' => '$conf->knowledgemanagement->enabled',
 			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->hasRight("knowledgemanagement", "knowledgerecord", "write")',
-			'target'=>'',
+			'perms' => '$user->hasRight("knowledgemanagement", "knowledgerecord", "write")',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2
+			'user' => 2
 		);
 		$this->menu[$r++] = array(
 			'fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
@@ -389,7 +390,7 @@ class modKnowledgeManagement extends DolibarrModules
 		/* END MODULEBUILDER EXPORT KNOWLEDGERECORD */
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT KNOWLEDGERECORD */
 		/*
 		 $langs->load("knowledgemanagement");
@@ -443,7 +444,7 @@ class modKnowledgeManagement extends DolibarrModules
 		// Document templates
 		$moduledir = 'knowledgemanagement';
 		$myTmpObjects = array();
-		$myTmpObjects['KnowledgeRecord'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['KnowledgeRecord'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'KnowledgeRecord') {

From 10f0cc700d2b602d571740cfc398ae8d8d8c73e7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:15 +0100
Subject: [PATCH 1156/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modMargin.class.php | 31 +++++++++++++------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 3f88584d3bf..f1a324f3114 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2012	Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2015   Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,7 +82,7 @@ class modMargin extends DolibarrModules
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
 		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
 		// );
-		$this->const = array(0=>array('MARGIN_TYPE', 'chaine', 'costprice', 'Rule for margin calculation by default', 0, 'current', 0)); // List of particular constants to add when module is enabled
+		$this->const = array(0 => array('MARGIN_TYPE', 'chaine', 'costprice', 'Rule for margin calculation by default', 0, 'current', 0)); // List of particular constants to add when module is enabled
 
 		// New pages on tabs
 		$this->tabs = array(
@@ -96,27 +97,27 @@ class modMargin extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// left menu entry
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=billing', // Put 0 if this is a top menu
-			'type'=>'left', // This is a Top menu entry
-			'titre'=>'Margins',
+			'fk_menu' => 'fk_mainmenu=billing', // Put 0 if this is a top menu
+			'type' => 'left', // This is a Top menu entry
+			'titre' => 'Margins',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'billing',
-			'leftmenu'=>'margins',
-			'url'=>'/margin/index.php',
-			'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>100,
-			'enabled'=>'isModEnabled("margin")', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'billing',
+			'leftmenu' => 'margins',
+			'url' => '/margin/index.php',
+			'langs' => 'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 100,
+			'enabled' => 'isModEnabled("margin")', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$r++;
 

From 859301523c69641f3c4a772af9be007648f6966e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:18 +0100
Subject: [PATCH 1157/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modOauth.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index fcfa34e3fa9..7ffa5157c66 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,7 +103,7 @@ class modOauth extends DolibarrModules
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// This is to declare the Top Menu entry:
 		//$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu

From c5b2bc126570fa465a6a9c92fd3baa5017b79d1f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:21 +0100
Subject: [PATCH 1158/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modOpenSurvey.class.php | 75 +++++++++++----------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 237e5086a30..e9def30529b 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -95,7 +96,7 @@ class modOpenSurvey extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
@@ -120,51 +121,51 @@ class modOpenSurvey extends DolibarrModules
 		//-------
 		$r = 0;
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',
-			'titre'=>'Survey',
+			'fk_menu' => 'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',
+			'titre' => 'Survey',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'tools',
-			'leftmenu'=>'opensurvey',
-			'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
-			'langs'=>'opensurvey',
-			'position'=>200,
-			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->opensurvey->read',
-			'target'=>'',
-			'user'=>0,
+			'mainmenu' => 'tools',
+			'leftmenu' => 'opensurvey',
+			'url' => '/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
+			'langs' => 'opensurvey',
+			'position' => 200,
+			'enabled' => '$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->opensurvey->read',
+			'target' => '',
+			'user' => 0,
 		);
 		$r++;
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',
-			'titre'=>'NewSurvey',
-			'mainmenu'=>'tools',
-			'leftmenu'=>'opensurvey_new',
-			'url'=>'/opensurvey/wizard/index.php',
-			'langs'=>'opensurvey',
-			'position'=>210,
-			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->opensurvey->write',
-			'target'=>'',
-			'user'=>0,
+			'fk_menu' => 'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',
+			'titre' => 'NewSurvey',
+			'mainmenu' => 'tools',
+			'leftmenu' => 'opensurvey_new',
+			'url' => '/opensurvey/wizard/index.php',
+			'langs' => 'opensurvey',
+			'position' => 210,
+			'enabled' => '$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->opensurvey->write',
+			'target' => '',
+			'user' => 0,
 		);
 		$r++;
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',
-			'titre'=>'List',
-			'mainmenu'=>'tools',
-			'leftmenu'=>'opensurvey_list',
-			'url'=>'/opensurvey/list.php',
-			'langs'=>'opensurvey',
-			'position'=>220,
-			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->opensurvey->read',
-			'target'=>'',
-			'user'=>0,
+			'fk_menu' => 'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left',
+			'titre' => 'List',
+			'mainmenu' => 'tools',
+			'leftmenu' => 'opensurvey_list',
+			'url' => '/opensurvey/list.php',
+			'langs' => 'opensurvey',
+			'position' => 220,
+			'enabled' => '$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->opensurvey->read',
+			'target' => '',
+			'user' => 0,
 		);
 		$r++;
 	}

From 708ab58b269e24b4d55c347ae873f83f7ef89047 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:24 +0100
Subject: [PATCH 1159/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modPartnership.class.php | 157 ++++++++++---------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index be6da6264f2..e03a1a666d3 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021 Dorian Laurent <i.merraha@sofimedmaroc.com>
  * Copyright (C) 2021 NextGestion <contact@nextgestion.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -211,28 +212,28 @@ class modPartnership extends DolibarrModules
 		// 'user'             to add a tab in user view
 
 		// Dictionaries
-		$this->dictionaries=array(
-			'langs'=>'partnership',
+		$this->dictionaries = array(
+			'langs' => 'partnership',
 			// List of tables we want to see into dictonnary editor
-			'tabname'=>array("c_partnership_type"),
+			'tabname' => array("c_partnership_type"),
 			// Label of tables
-			'tablib'=>array("PartnershipType"),
+			'tablib' => array("PartnershipType"),
 			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM '.MAIN_DB_PREFIX.'c_partnership_type as f WHERE f.entity = '.((int) $conf->entity)),
+			'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM '.MAIN_DB_PREFIX.'c_partnership_type as f WHERE f.entity = '.((int) $conf->entity)),
 			// Sort order
-			'tabsqlsort'=>array("label ASC"),
+			'tabsqlsort' => array("label ASC"),
 			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label,keyword"),
+			'tabfield' => array("code,label,keyword"),
 			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label,keyword"),
+			'tabfieldvalue' => array("code,label,keyword"),
 			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label,keyword"),
+			'tabfieldinsert' => array("code,label,keyword"),
 			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid"),
+			'tabrowid' => array("rowid"),
 			// Condition to show each dictionary
-			'tabcond'=>array($conf->partnership->enabled),
+			'tabcond' => array($conf->partnership->enabled),
 			// Help tooltip for each fields of the dictionary
-			'tabhelp'=>array(array('keyword'=>$langs->trans('KeywordToCheckInWebsite')))
+			'tabhelp' => array(array('keyword' => $langs->trans('KeywordToCheckInWebsite')))
 		);
 
 		// Boxes/Widgets
@@ -249,39 +250,39 @@ class modPartnership extends DolibarrModules
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
 		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
 
-		$arraydate=dol_getdate(dol_now());
-		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
 			0 => array(
-				'priority'=>60,
-				'label'=>'CancelPartnershipForExpiredMembers',
-				'jobtype'=>'method',
-				'class'=>'/partnership/class/partnershiputils.class.php',
-				'objectname'=>'PartnershipUtils',
-				'method'=>'doCancelStatusOfMemberPartnership',
-				'parameters'=>'',
-				'comment'=>'Cancel status of partnership when subscription is expired + x days.',
-				'frequency'=>1,
-				'unitfrequency'=>86400,
-				'status'=>1,
-				'test'=>'isModEnabled("partnership")',
-				'datestart'=>$datestart
+				'priority' => 60,
+				'label' => 'CancelPartnershipForExpiredMembers',
+				'jobtype' => 'method',
+				'class' => '/partnership/class/partnershiputils.class.php',
+				'objectname' => 'PartnershipUtils',
+				'method' => 'doCancelStatusOfMemberPartnership',
+				'parameters' => '',
+				'comment' => 'Cancel status of partnership when subscription is expired + x days.',
+				'frequency' => 1,
+				'unitfrequency' => 86400,
+				'status' => 1,
+				'test' => 'isModEnabled("partnership")',
+				'datestart' => $datestart
 			),
 			1 => array(
-				'priority'=>61,
-				'label'=>'PartnershipCheckBacklink',
-				'jobtype'=>'method',
-				'class'=>'/partnership/class/partnershiputils.class.php',
-				'objectname'=>'PartnershipUtils',
-				'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound',
-				'parameters'=>'',
-				'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.',
-				'frequency'=>1,
-				'unitfrequency'=>86400,
-				'status'=>0,
-				'test'=>'isModEnabled("partnership")',
-				'datestart'=>$datestart
+				'priority' => 61,
+				'label' => 'PartnershipCheckBacklink',
+				'jobtype' => 'method',
+				'class' => '/partnership/class/partnershiputils.class.php',
+				'objectname' => 'PartnershipUtils',
+				'method' => 'doWarningOfPartnershipIfDolibarrBacklinkNotfound',
+				'parameters' => '',
+				'comment' => 'Add a warning on partnership record if the backlink keyword is not found on the partner website.',
+				'frequency' => 1,
+				'unitfrequency' => 86400,
+				'status' => 0,
+				'test' => 'isModEnabled("partnership")',
+				'datestart' => $datestart
 			),
 		);
 
@@ -330,47 +331,47 @@ class modPartnership extends DolibarrModules
 		//     'user'=>2,
 		// );
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu='.$fk_mainmenu, // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Top menu entry
-			'titre'=>'Partnership',
+			'fk_menu' => 'fk_mainmenu='.$fk_mainmenu, // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Top menu entry
+			'titre' => 'Partnership',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>$fk_mainmenu,
-			'leftmenu'=>'partnership',
-			'url'=>'/partnership/partnership_list.php',
-			'langs'=>'partnership', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1100 + $r,
-			'enabled'=>'$conf->partnership->enabled', // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->partnership->read', // Use 'perms'=>'$user->rights->partnership->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => $fk_mainmenu,
+			'leftmenu' => 'partnership',
+			'url' => '/partnership/partnership_list.php',
+			'langs' => 'partnership', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1100 + $r,
+			'enabled' => '$conf->partnership->enabled', // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->partnership->read', // Use 'perms'=>'$user->rights->partnership->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Left menu entry
-			'titre'=>'NewPartnership',
-			'mainmenu'=>$fk_mainmenu,
-			'leftmenu'=>'partnership_new',
-			'url'=>'/partnership/partnership_card.php?action=create',
-			'langs'=>'partnership', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1100 + $r,
-			'enabled'=>'$conf->partnership->enabled', // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->partnership->write', // Use 'perms'=>'$user->rights->partnership->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
+			'titre' => 'NewPartnership',
+			'mainmenu' => $fk_mainmenu,
+			'leftmenu' => 'partnership_new',
+			'url' => '/partnership/partnership_card.php?action=create',
+			'langs' => 'partnership', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1100 + $r,
+			'enabled' => '$conf->partnership->enabled', // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->partnership->write', // Use 'perms'=>'$user->rights->partnership->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Left menu entry
-			'titre'=>'ListOfPartnerships',
-			'mainmenu'=>$fk_mainmenu,
-			'leftmenu'=>'partnership_list',
-			'url'=>'/partnership/partnership_list.php',
-			'langs'=>'partnership', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1100 + $r,
-			'enabled'=>'$conf->partnership->enabled', // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->partnership->read', // Use 'perms'=>'$user->rights->partnership->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
+			'titre' => 'ListOfPartnerships',
+			'mainmenu' => $fk_mainmenu,
+			'leftmenu' => 'partnership_list',
+			'url' => '/partnership/partnership_list.php',
+			'langs' => 'partnership', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1100 + $r,
+			'enabled' => '$conf->partnership->enabled', // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->partnership->read', // Use 'perms'=>'$user->rights->partnership->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		/* END MODULEBUILDER LEFTMENU PARTNERSHIP */
 		// Exports profiles provided by this module
@@ -405,7 +406,7 @@ class modPartnership extends DolibarrModules
 		/* END MODULEBUILDER EXPORT PARTNERSHIP */
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT PARTNERSHIP */
 		/*
 		 $langs->load("partnership");
@@ -459,7 +460,7 @@ class modPartnership extends DolibarrModules
 		// Document templates
 		$moduledir = dol_sanitizeFileName('partnership');
 		$myTmpObjects = array();
-		$myTmpObjects['Partnership'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['Partnership'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'Partnership') {

From bde6702b28557f1639c8dd2e35ccd5fb256a474a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:27 +0100
Subject: [PATCH 1160/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index eeb3dc00e6c..263ffdfe490 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -100,7 +101,7 @@ class modPaybox extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
@@ -114,7 +115,7 @@ class modPaybox extends DolibarrModules
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Add here entries to declare new menus
 		// Example to declare the Top Menu entry:

From 6d7fe53d17b67569f714c20b500774d41c051e13 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:29 +0100
Subject: [PATCH 1161/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modPaymentByBankTransfer.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 1118b81f193..8fbecdc97d8 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2011 Juanjo Menent 		<jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -90,7 +91,7 @@ class modPaymentByBankTransfer extends DolibarrModules
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'paymentbybanktransfer';
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$r++;
 		$this->rights[$r][0] = 561;
 		$this->rights[$r][1] = 'Read bank transfer payment orders';

From 3a561d2e379f0c8be152e0c9ddaeadeeb3bd9f0f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:32 +0100
Subject: [PATCH 1162/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 8d2a98c67e7..e284195ebcc 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -101,12 +102,12 @@ class modPaypal extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/*$this->menu[$r]=array(
 			'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'mainmenu'=>'billing',

From d415980074d45094f0a4232ce4125656a9c9a465 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:35 +0100
Subject: [PATCH 1163/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modProduct.class.php | 423 ++++++++++++-----------
 1 file changed, 212 insertions(+), 211 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 28b5f19174c..836d36f4d4d 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2014		Christophe Battarel		<contact@altairis.fr>
  * Copyright (C) 2014		Cedric Gross			<c.gross@kreiz-it.fr>
  * Copyright (C) 2020-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -103,9 +104,9 @@ class modProduct extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_produits.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_produits_alerte_stock.php', 'enabledbydefaulton'=>'Home'),
-			2=>array('file'=>'box_graph_product_distribution.php', 'enabledbydefaulton'=>'Home')
+			0 => array('file' => 'box_produits.php', 'enabledbydefaulton' => 'Home'),
+			1 => array('file' => 'box_produits_alerte_stock.php', 'enabledbydefaulton' => 'Home'),
+			2 => array('file' => 'box_graph_product_distribution.php', 'enabledbydefaulton' => 'Home')
 		);
 
 		// Permissions
@@ -191,115 +192,115 @@ class modProduct extends DolibarrModules
 		$this->export_label[$r] = "Products"; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("produit", "export"));
 		$this->export_fields_array[$r] = array(
-			'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
-			'p.fk_product_type'=>'Type', 'p.tosell'=>"OnSell", 'p.tobuy'=>"OnBuy",
-			'p.description'=>"Description", 'p.url'=>"PublicUrl",
-			'p.customcode'=>'CustomCode', 'p.fk_country'=>'IDCountry',
-			$alias_product_perentity . '.accountancy_code_sell'=>"ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
-			$alias_product_perentity . '.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy'=>"ProductAccountancyBuyCode",
-			$alias_product_perentity . '.accountancy_code_buy_intra'=>"ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export'=>"ProductAccountancyBuyExportCode",
-			'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
-			'p.weight'=>"Weight", 'p.weight_units'=>"WeightUnits", 'p.length'=>"Length", 'p.length_units'=>"LengthUnits", 'p.width'=>"Width", 'p.width_units'=>"WidthUnits", 'p.height'=>"Height", 'p.height_units'=>"HeightUnits",
-			'p.surface'=>"Surface", 'p.surface_units'=>"SurfaceUnits", 'p.volume'=>"Volume", 'p.volume_units'=>"VolumeUnits",
-			'p.duration'=>"Duration",
+			'p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label",
+			'p.fk_product_type' => 'Type', 'p.tosell' => "OnSell", 'p.tobuy' => "OnBuy",
+			'p.description' => "Description", 'p.url' => "PublicUrl",
+			'p.customcode' => 'CustomCode', 'p.fk_country' => 'IDCountry',
+			$alias_product_perentity . '.accountancy_code_sell' => "ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
+			$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
+			$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
+			'p.note' => "NotePrivate", 'p.note_public' => 'NotePublic',
+			'p.weight' => "Weight", 'p.weight_units' => "WeightUnits", 'p.length' => "Length", 'p.length_units' => "LengthUnits", 'p.width' => "Width", 'p.width_units' => "WidthUnits", 'p.height' => "Height", 'p.height_units' => "HeightUnits",
+			'p.surface' => "Surface", 'p.surface_units' => "SurfaceUnits", 'p.volume' => "Volume", 'p.volume_units' => "VolumeUnits",
+			'p.duration' => "Duration",
 			'p.finished' => 'Nature',
-			'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC",
-			'p.price_min'=>"MinPriceHT",'p.price_min_ttc'=>"MinPriceTTC",
-			'p.tva_tx'=>'VATRate',
-			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
+			'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC",
+			'p.price_min' => "MinPriceHT",'p.price_min_ttc' => "MinPriceTTC",
+			'p.tva_tx' => 'VATRate',
+			'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
 		);
 		if (is_object($mysoc) && $usenpr) {
 			$this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price' => 'CostPrice'));
 		}
 		if (isModEnabled('stock')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref'=>'DefaultWarehouse', 'p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref' => 'DefaultWarehouse', 'p.tobatch' => 'ManageLotSerial', 'p.stock' => 'Stock', 'p.seuil_stock_alerte' => 'StockLimit', 'p.desiredstock' => 'DesiredStock', 'p.pmp' => 'PMPValue'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 		}
 		$keyforselect = 'product';
 		$keyforelement = 'product';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom' => 'Supplier', 'pf.ref_fourn' => 'SupplierRef', 'pf.quantity' => 'QtyMin', 'pf.remise_percent' => 'DiscountQtyMin', 'pf.unitprice' => 'BuyingPrice', 'pf.delivery_time_days' => 'NbDaysToDelivery'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)' => 'Categories'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang' => 'Language', 'l.label' => 'TranslatedLabel', 'l.description' => 'TranslatedDescription', 'l.note' => 'TranslatedNote'));
 		}
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
 		}
 		$this->export_TypeFields_array[$r] = array(
-			'p.ref'=>"Text", 'p.label'=>"Text",
-			'p.fk_product_type'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
-			'p.description'=>"Text", 'p.url'=>"Text",
-			$alias_product_perentity . '.accountancy_code_sell'=>"Text", $alias_product_perentity . '.accountancy_code_sell_intra'=>"Text", $alias_product_perentity . '.accountancy_code_sell_export'=>"Text",
-			$alias_product_perentity . '.accountancy_code_buy'=>"Text", $alias_product_perentity . '.accountancy_code_buy_intra'=>"Text", $alias_product_perentity . '.accountancy_code_buy_export'=>"Text",
-			'p.note'=>"Text", 'p.note_public'=>"Text",
-			'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.width'=>"Numeric", 'p.height'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric",
-			'p.customcode'=>'Text',
-			'p.duration'=>"Text",
+			'p.ref' => "Text", 'p.label' => "Text",
+			'p.fk_product_type' => 'Numeric', 'p.tosell' => "Boolean", 'p.tobuy' => "Boolean",
+			'p.description' => "Text", 'p.url' => "Text",
+			$alias_product_perentity . '.accountancy_code_sell' => "Text", $alias_product_perentity . '.accountancy_code_sell_intra' => "Text", $alias_product_perentity . '.accountancy_code_sell_export' => "Text",
+			$alias_product_perentity . '.accountancy_code_buy' => "Text", $alias_product_perentity . '.accountancy_code_buy_intra' => "Text", $alias_product_perentity . '.accountancy_code_buy_export' => "Text",
+			'p.note' => "Text", 'p.note_public' => "Text",
+			'p.weight' => "Numeric", 'p.length' => "Numeric", 'p.width' => "Numeric", 'p.height' => "Numeric", 'p.surface' => "Numeric", 'p.volume' => "Numeric",
+			'p.customcode' => 'Text',
+			'p.duration' => "Text",
 			'p.finished' => 'Numeric',
-			'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric",
-			'p.price_min'=>"Numeric", 'p.price_min_ttc'=>"Numeric",
-			'p.tva_tx'=>'Numeric',
-			'p.datec'=>'Date', 'p.tms'=>'Date'
+			'p.price_base_type' => "Text", 'p.price' => "Numeric", 'p.price_ttc' => "Numeric",
+			'p.price_min' => "Numeric", 'p.price_min_ttc' => "Numeric",
+			'p.tva_tx' => 'Numeric',
+			'p.datec' => 'Date', 'p.tms' => 'Date'
 		);
 		if (isModEnabled('stock')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('e.ref'=>'Text', 'p.tobatch'=>'Numeric', 'p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('e.ref' => 'Text', 'p.tobatch' => 'Numeric', 'p.stock' => 'Numeric', 'p.seuil_stock_alerte' => 'Numeric', 'p.desiredstock' => 'Numeric', 'p.pmp' => 'Numeric', 'p.cost_price' => 'Numeric'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom' => 'Text', 'pf.ref_fourn' => 'Text', 'pf.unitprice' => 'Numeric', 'pf.quantity' => 'Numeric', 'pf.remise_percent' => 'Numeric', 'pf.delivery_time_days' => 'Numeric'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang' => 'Text', 'l.label' => 'Text', 'l.description' => 'Text', 'l.note' => 'Text'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)" => 'Text'));
 		}
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)" => 'category'));
 		}
 		if (isModEnabled('stock')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock' => 'product', 'p.pmp' => 'product'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom' => 'product_supplier_ref', 'pf.ref_fourn' => 'product_supplier_ref', 'pf.unitprice' => 'product_supplier_ref', 'pf.quantity' => 'product_supplier_ref', 'pf.remise_percent' => 'product_supplier_ref', 'pf.delivery_time_days' => 'product_supplier_ref'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang' => 'translation', 'l.label' => 'translation', 'l.description' => 'translation', 'l.note' => 'translation'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+			$this->export_dependencies_array[$r] = array('category' => 'p.rowid');
 		}
 		if (isModEnabled('stock')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock' => 'product', 'p.pmp' => 'product'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom' => 'product_supplier_ref', 'pf.ref_fourn' => 'product_supplier_ref', 'pf.unitprice' => 'product_supplier_ref', 'pf.quantity' => 'product_supplier_ref', 'pf.remise_percent' => 'product_supplier_ref', 'pf.delivery_time_days' => 'product_supplier_ref'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang' => 'translation', 'l.label' => 'translation', 'l.description' => 'translation', 'l.note' => 'translation'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+			$this->export_dependencies_array[$r] = array('category' => 'p.rowid');
 		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -330,12 +331,12 @@ class modProduct extends DolibarrModules
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
-				'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
-				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
-				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
-				'pr.tva_tx'=>'PriceLevelVATRate',
-				'pr.date_price'=>'DateCreation');
+			$this->export_fields_array[$r] = array('p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label",
+				'pr.price_base_type' => "PriceBase", 'pr.price_level' => "PriceLevel",
+				'pr.price' => "PriceLevelUnitPriceHT", 'pr.price_ttc' => "PriceLevelUnitPriceTTC",
+				'pr.price_min' => "MinPriceLevelUnitPriceHT", 'pr.price_min_ttc' => "MinPriceLevelUnitPriceTTC",
+				'pr.tva_tx' => 'PriceLevelVATRate',
+				'pr.date_price' => 'DateCreation');
 			if (is_object($mysoc) && $usenpr) {
 				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 			}
@@ -345,13 +346,13 @@ class modProduct extends DolibarrModules
 			//	'p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",
 			//	'p.datec'=>'Date','p.tms'=>'Date'
 			//);
-			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product", 'p.label'=>"Label",
-				'pr.price_base_type'=>"product", 'pr.price_level'=>"product", 'pr.price'=>"product",
-				'pr.price_ttc'=>"product",
-				'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
-				'pr.tva_tx'=>'product',
-				'pr.recuperableonly'=>'product',
-				'pr.date_price'=>"product");
+			$this->export_entities_array[$r] = array('p.rowid' => "product", 'p.ref' => "product", 'p.label' => "Label",
+				'pr.price_base_type' => "product", 'pr.price_level' => "product", 'pr.price' => "product",
+				'pr.price_ttc' => "product",
+				'pr.price_min' => "product", 'pr.price_min_ttc' => "product",
+				'pr.tva_tx' => 'product',
+				'pr.recuperableonly' => 'product',
+				'pr.date_price' => "product");
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
@@ -366,28 +367,28 @@ class modProduct extends DolibarrModules
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
-				's.nom'=>'ThirdParty',
-				's.code_client'=>'CodeClient',
-				'pr.price_base_type'=>"PriceBase",
-				'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
-				'pr.price_min'=>"MinPriceUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceUnitPriceTTC",
-				'pr.tva_tx'=>'PriceVATRate',
-				'pr.default_vat_code'=>'PriceVATCode',
-				'pr.datec'=>'DateCreation');
+			$this->export_fields_array[$r] = array('p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label",
+				's.nom' => 'ThirdParty',
+				's.code_client' => 'CodeClient',
+				'pr.price_base_type' => "PriceBase",
+				'pr.price' => "PriceUnitPriceHT", 'pr.price_ttc' => "PriceUnitPriceTTC",
+				'pr.price_min' => "MinPriceUnitPriceHT", 'pr.price_min_ttc' => "MinPriceUnitPriceTTC",
+				'pr.tva_tx' => 'PriceVATRate',
+				'pr.default_vat_code' => 'PriceVATCode',
+				'pr.datec' => 'DateCreation');
 			if (is_object($mysoc) && $usenpr) {
 				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 			}
-			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product", 'p.label'=>"Label",
-				's.nom'=>'company',
-				's.code_client'=>'company',
-				'pr.price_base_type'=>"product", 'pr.price'=>"product",
-				'pr.price_ttc'=>"product",
-				'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
-				'pr.tva_tx'=>'product',
-				'pr.default_vat_code'=>'product',
-				'pr.recuperableonly'=>'product',
-				'pr.datec'=>"product");
+			$this->export_entities_array[$r] = array('p.rowid' => "product", 'p.ref' => "product", 'p.label' => "Label",
+				's.nom' => 'company',
+				's.code_client' => 'company',
+				'pr.price_base_type' => "product", 'pr.price' => "product",
+				'pr.price_ttc' => "product",
+				'pr.price_min' => "product", 'pr.price_min_ttc' => "product",
+				'pr.tva_tx' => 'product',
+				'pr.default_vat_code' => 'product',
+				'pr.recuperableonly' => 'product',
+				'pr.datec' => "product");
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_customer_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
@@ -402,66 +403,66 @@ class modProduct extends DolibarrModules
 			$this->export_label[$r] = "AssociatedProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
 			$this->export_fields_array[$r] = array(
-				'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label", 'p.description'=>"Description", 'p.url'=>"PublicUrl",
-				$alias_product_perentity . '.accountancy_code_sell'=>"ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
-				$alias_product_perentity . '.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy'=>"ProductAccountancyBuyCode",
-				$alias_product_perentity . '.accountancy_code_buy_intra'=>"ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export'=>"ProductAccountancyBuyExportCode",
-				'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
-				'p.weight'=>"Weight", 'p.length'=>"Length", 'p.surface'=>"Surface", 'p.volume'=>"Volume", 'p.customcode'=>'CustomCode',
-				'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
-				'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
+				'p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label", 'p.description' => "Description", 'p.url' => "PublicUrl",
+				$alias_product_perentity . '.accountancy_code_sell' => "ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
+				$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
+				$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
+				'p.note' => "NotePrivate", 'p.note_public' => 'NotePublic',
+				'p.weight' => "Weight", 'p.length' => "Length", 'p.surface' => "Surface", 'p.volume' => "Volume", 'p.customcode' => 'CustomCode',
+				'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC", 'p.tva_tx' => 'VATRate', 'p.tosell' => "OnSell",
+				'p.tobuy' => "OnBuy", 'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
 			);
 			if (isModEnabled('stock')) {
-				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock' => 'Stock', 'p.seuil_stock_alerte' => 'StockLimit', 'p.desiredstock' => 'DesiredStock', 'p.pmp' => 'PMPValue'));
 			}
 			if (isModEnabled('barcode')) {
-				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 			}
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty' => 'Qty', 'pa.incdec' => 'ComposedProductIncDecStock'));
 			$this->export_TypeFields_array[$r] = array(
-				'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
-				$alias_product_perentity . '.accountancy_code_sell'=>"Text", $alias_product_perentity . '.accountancy_code_sell_intra'=>"Text", $alias_product_perentity . '.accountancy_code_sell_export'=>"Text",
-				$alias_product_perentity . '.accountancy_code_buy'=>"Text", $alias_product_perentity . '.accountancy_code_buy_intra'=>"Text", $alias_product_perentity . '.accountancy_code_buy_export'=>"Text",
-				'p.note'=>"Text", 'p.note_public'=>"Text",
-				'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric", 'p.customcode'=>'Text',
-				'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
-				'p.datec'=>'Date', 'p.tms'=>'Date'
+				'p.ref' => "Text", 'p.label' => "Text", 'p.description' => "Text", 'p.url' => "Text",
+				$alias_product_perentity . '.accountancy_code_sell' => "Text", $alias_product_perentity . '.accountancy_code_sell_intra' => "Text", $alias_product_perentity . '.accountancy_code_sell_export' => "Text",
+				$alias_product_perentity . '.accountancy_code_buy' => "Text", $alias_product_perentity . '.accountancy_code_buy_intra' => "Text", $alias_product_perentity . '.accountancy_code_buy_export' => "Text",
+				'p.note' => "Text", 'p.note_public' => "Text",
+				'p.weight' => "Numeric", 'p.length' => "Numeric", 'p.surface' => "Numeric", 'p.volume' => "Numeric", 'p.customcode' => 'Text',
+				'p.price_base_type' => "Text", 'p.price' => "Numeric", 'p.price_ttc' => "Numeric", 'p.tva_tx' => 'Numeric', 'p.tosell' => "Boolean", 'p.tobuy' => "Boolean",
+				'p.datec' => 'Date', 'p.tms' => 'Date'
 			);
 			if (isModEnabled('stock')) {
-				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock' => 'Numeric', 'p.seuil_stock_alerte' => 'Numeric', 'p.desiredstock' => 'Numeric', 'p.pmp' => 'Numeric', 'p.cost_price' => 'Numeric'));
 			}
 			if (isModEnabled('barcode')) {
-				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 			}
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty' => 'Numeric'));
 			$this->export_entities_array[$r] = array(
-				'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
-				$alias_product_perentity . '.accountancy_code_sell'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_intra'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_export'=>'virtualproduct',
-				$alias_product_perentity . '.accountancy_code_buy'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_intra'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_export'=>'virtualproduct',
-				'p.note'=>"virtualproduct", 'p.length'=>"virtualproduct",
-				'p.surface'=>"virtualproduct", 'p.volume'=>"virtualproduct", 'p.weight'=>"virtualproduct", 'p.customcode'=>'virtualproduct',
-				'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
-				'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
+				'p.rowid' => "virtualproduct", 'p.ref' => "virtualproduct", 'p.label' => "virtualproduct", 'p.description' => "virtualproduct", 'p.url' => "virtualproduct",
+				$alias_product_perentity . '.accountancy_code_sell' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_intra' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_export' => 'virtualproduct',
+				$alias_product_perentity . '.accountancy_code_buy' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_intra' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_export' => 'virtualproduct',
+				'p.note' => "virtualproduct", 'p.length' => "virtualproduct",
+				'p.surface' => "virtualproduct", 'p.volume' => "virtualproduct", 'p.weight' => "virtualproduct", 'p.customcode' => 'virtualproduct',
+				'p.price_base_type' => "virtualproduct", 'p.price' => "virtualproduct", 'p.price_ttc' => "virtualproduct", 'p.tva_tx' => "virtualproduct",
+				'p.tosell' => "virtualproduct", 'p.tobuy' => "virtualproduct", 'p.datec' => "virtualproduct", 'p.tms' => "virtualproduct"
 			);
 			if (isModEnabled('stock')) {
-				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock' => 'virtualproduct', 'p.seuil_stock_alerte' => 'virtualproduct', 'p.desiredstock' => 'virtualproduct', 'p.pmp' => 'virtualproduct'));
 			}
 			if (isModEnabled('barcode')) {
-				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'virtualproduct'));
 			}
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
-			$keyforselect = 'product';
-			$keyforelement = 'product';
-			$keyforaliasextra = 'extra';
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty' => "subproduct", 'pa.incdec' => 'subproduct'));
+			$keyforselect = 'product';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$keyforelement = 'product';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+			$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid'=>"Id", 'p2.ref'=>"Ref", 'p2.label'=>"Label", 'p2.description'=>"Description"));
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid'=>"subproduct", 'p2.ref'=>"subproduct", 'p2.label'=>"subproduct", 'p2.description'=>"subproduct"));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description"));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct"));
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 				$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 			}
-			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
 			$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			$this->export_sql_end[$r] .= ' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
@@ -478,8 +479,8 @@ class modProduct extends DolibarrModules
 		$this->import_label[$r] = "Products"; // Translation key
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
-		$this->import_tables_array[$r] = array('p'=>MAIN_DB_PREFIX.'product', 'extra'=>MAIN_DB_PREFIX.'product_extrafields');
-		$this->import_tables_creator_array[$r] = array('p'=>'fk_user_author'); // Fields to store import user id
+		$this->import_tables_array[$r] = array('p' => MAIN_DB_PREFIX.'product', 'extra' => MAIN_DB_PREFIX.'product_extrafields');
+		$this->import_tables_creator_array[$r] = array('p' => 'fk_user_author'); // Fields to store import user id
 		$this->import_fields_array[$r] = array(
 			'p.ref' => "Ref*",
 			'p.label' => "Label*",
@@ -578,19 +579,19 @@ class modProduct extends DolibarrModules
 					'method' => 'fetch',
 					'dict' => 'DictionaryCountry'
 				),
-				'p.finished'=> array(
+				'p.finished' => array(
 					'rule' => 'fetchidfromcodeorlabel',
 					'classfile' => '/core/class/cproductnature.class.php',
 					'class' => 'CProductNature',
 					'method' => 'fetch',
 					'dict' => 'DictionaryProductNature'
 				),
-				'p.accountancy_code_sell'=>array('rule'=>'accountingaccount'),
-				'p.accountancy_code_sell_intra'=>array('rule'=>'accountingaccount'),
-				'p.accountancy_code_sell_export'=>array('rule'=>'accountingaccount'),
-				'p.accountancy_code_buy'=>array('rule'=>'accountingaccount'),
-				'p.accountancy_code_buy_intra'=>array('rule'=>'accountingaccount'),
-				'p.accountancy_code_buy_export'=>array('rule'=>'accountingaccount'),
+				'p.accountancy_code_sell' => array('rule' => 'accountingaccount'),
+				'p.accountancy_code_sell_intra' => array('rule' => 'accountingaccount'),
+				'p.accountancy_code_sell_export' => array('rule' => 'accountingaccount'),
+				'p.accountancy_code_buy' => array('rule' => 'accountingaccount'),
+				'p.accountancy_code_buy_intra' => array('rule' => 'accountingaccount'),
+				'p.accountancy_code_buy_export' => array('rule' => 'accountingaccount'),
 		);
 
 		$this->import_regex_array[$r] = array(
@@ -605,8 +606,8 @@ class modProduct extends DolibarrModules
 
 		if (isModEnabled('stock')) {//if Stock module enabled
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-				'p.fk_default_warehouse'=>'DefaultWarehouse',
-				'p.tobatch'=>'ManageLotSerial',
+				'p.fk_default_warehouse' => 'DefaultWarehouse',
+				'p.tobatch' => 'ManageLotSerial',
 				'p.seuil_stock_alerte' => 'StockLimit', //lower limit for warning
 				'p.pmp' => 'PMPValue', //weighted average price
 				'p.desiredstock' => 'DesiredStock'//desired stock for replenishment feature
@@ -622,25 +623,25 @@ class modProduct extends DolibarrModules
 					'classfile' => '/product/stock/class/entrepot.class.php',
 					'class' => 'Entrepot',
 					'method' => 'fetch',
-					'element'=> 'Warehouse'
+					'element' => 'Warehouse'
 				)
 			));
 		}
 
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price' => 'CostPrice'));
 		}
 		if (is_object($mysoc) && $usenpr) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly' => 'NPR'));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx' => 'LT1', 'p.localtax1_type' => 'LT1Type'));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx' => 'LT2', 'p.localtax2_type' => 'LT2Type'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode' => 'BarCode'));
 		}
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
@@ -659,7 +660,7 @@ class modProduct extends DolibarrModules
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 
 		// field order as per structure of table llx_product
 		$import_sample = array(
@@ -705,26 +706,26 @@ class modProduct extends DolibarrModules
 		//clauses copied from import_fields_array
 		if (isModEnabled('stock')) {
 			$import_sample = array_merge($import_sample, array(
-				'p.tobatch'=>"0 (don't use) / 1 (use batch) / 2 (use serial number)",
+				'p.tobatch' => "0 (don't use) / 1 (use batch) / 2 (use serial number)",
 				'p.seuil_stock_alerte' => '',
 				'p.pmp' => '0',
 				'p.desiredstock' => ''
 			));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
-			$import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
+			$import_sample = array_merge($import_sample, array('p.cost_price' => '90'));
 		}
 		if (is_object($mysoc) && $usenpr) {
-			$import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
+			$import_sample = array_merge($import_sample, array('p.recuperableonly' => '0'));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-			$import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
+			$import_sample = array_merge($import_sample, array('p.localtax1_tx' => '', 'p.localtax1_type' => ''));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-			$import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
+			$import_sample = array_merge($import_sample, array('p.localtax2_tx' => '', 'p.localtax2_type' => ''));
 		}
 		if (isModEnabled('barcode')) {
-			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
+			$import_sample = array_merge($import_sample, array('p.barcode' => ''));
 		}
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$import_sample = array_merge(
@@ -745,9 +746,9 @@ class modProduct extends DolibarrModules
 			));
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
+		$this->import_updatekeys_array[$r] = array('p.ref' => 'Ref');
 		if (isModEnabled('barcode')) {
-			$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+			$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode' => 'BarCode')); //only show/allow barcode as update key if Barcode module enabled
 		}
 
 		if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE')) {
@@ -757,24 +758,24 @@ class modProduct extends DolibarrModules
 			$this->import_label[$r] = "ProductStockWarehouse"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('pwp'=>MAIN_DB_PREFIX.'product_warehouse_properties');
-			$this->import_fields_array[$r] = array('pwp.fk_product'=>"Product*",
-				'pwp.fk_entrepot'=>"Warehouse*", 'pwp.seuil_stock_alerte'=>"StockLimit",
-				'pwp.desiredstock'=>"DesiredStock");
+			$this->import_tables_array[$r] = array('pwp' => MAIN_DB_PREFIX.'product_warehouse_properties');
+			$this->import_fields_array[$r] = array('pwp.fk_product' => "Product*",
+				'pwp.fk_entrepot' => "Warehouse*", 'pwp.seuil_stock_alerte' => "StockLimit",
+				'pwp.desiredstock' => "DesiredStock");
 			$this->import_regex_array[$r] = array(
 				'pwp.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product',
 				'pwp.fk_entrepot' => 'rowid@'.MAIN_DB_PREFIX.'entrepot',
 			);
 			$this->import_convertvalue_array[$r] = array(
-				'pwp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
-				,'pwp.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'Entrepot')
+				'pwp.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
+				,'pwp.fk_entrepot' => array('rule' => 'fetchidfromref', 'classfile' => '/product/stock/class/entrepot.class.php', 'class' => 'Entrepot', 'method' => 'fetch', 'element' => 'Entrepot')
 			);
-			$this->import_examplevalues_array[$r] = array('pwp.fk_product'=>"ref:PRODUCT_REF or id:123456",
-				'pwp.fk_entrepot'=>"ref:WAREHOUSE_REF or id:123456",
-				'pwp.seuil_stock_alerte'=>"100",
-				'pwp.desiredstock'=>"110"
+			$this->import_examplevalues_array[$r] = array('pwp.fk_product' => "ref:PRODUCT_REF or id:123456",
+				'pwp.fk_entrepot' => "ref:WAREHOUSE_REF or id:123456",
+				'pwp.seuil_stock_alerte' => "100",
+				'pwp.desiredstock' => "110"
 			);
-			$this->import_updatekeys_array[$r] = array('pwp.fk_product'=>'Product', 'pwp.fk_entrepot'=>'Warehouse');
+			$this->import_updatekeys_array[$r] = array('pwp.fk_product' => 'Product', 'pwp.fk_entrepot' => 'Warehouse');
 		}
 
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
@@ -784,10 +785,10 @@ class modProduct extends DolibarrModules
 			$this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price', 'extra'=>MAIN_DB_PREFIX.'product_fournisseur_price_extrafields');
-			$this->import_tables_creator_array[$r] = array('sp'=>'fk_user');
+			$this->import_tables_array[$r] = array('sp' => MAIN_DB_PREFIX.'product_fournisseur_price', 'extra' => MAIN_DB_PREFIX.'product_fournisseur_price_extrafields');
+			$this->import_tables_creator_array[$r] = array('sp' => 'fk_user');
 			$this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields
-				'sp.fk_product'=>"ProductOrService*",
+				'sp.fk_product' => "ProductOrService*",
 				'sp.fk_soc' => "Supplier*",
 				'sp.ref_fourn' => 'SupplierRef*',
 				'sp.quantity' => "QtyMin*",
@@ -798,27 +799,27 @@ class modProduct extends DolibarrModules
 				'sp.status' => 'Status'
 			);
 			if (is_object($mysoc) && $usenpr) {
-				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly' => 'VATNPR'));
 			}
 			if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx' => 'LT1', 'sp.localtax1_type' => 'LT1Type'));
 			}
 			if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx' => 'LT2', 'sp.localtax2_type' => 'LT2Type'));
 			}
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-					'sp.price'=>"PriceQtyMinHT*",
-					'sp.unitprice'=>'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
-					'sp.remise_percent'=>'DiscountQtyMin'
+					'sp.price' => "PriceQtyMinHT*",
+					'sp.unitprice' => 'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
+					'sp.remise_percent' => 'DiscountQtyMin'
 			));
 
 			if (isModEnabled("multicurrency")) {
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-					'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
-					'sp.multicurrency_code'=>'CurrencyCode',
-					'sp.multicurrency_tx'=>'CurrencyRate',
-					'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
-					'sp.multicurrency_price'=>'CurrencyPrice',
+					'sp.fk_multicurrency' => 'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
+					'sp.multicurrency_code' => 'CurrencyCode',
+					'sp.multicurrency_tx' => 'CurrencyRate',
+					'sp.multicurrency_unitprice' => 'CurrencyUnitPrice',
+					'sp.multicurrency_price' => 'CurrencyPrice',
 				));
 			}
 
@@ -839,11 +840,11 @@ class modProduct extends DolibarrModules
 				}
 			}
 			// End add extra fields
-			$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product_fournisseur_price'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+			$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'product_fournisseur_price'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 
 			$this->import_convertvalue_array[$r] = array(
-					'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
-					'sp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'sp.fk_soc' => array('rule' => 'fetchidfromref', 'classfile' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
+					'sp.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 			);
 
 			$this->import_examplevalues_array[$r] = array(
@@ -852,22 +853,22 @@ class modProduct extends DolibarrModules
 				'sp.ref_fourn' => "XYZ-F123456",
 				'sp.quantity' => "5",
 				'sp.tva_tx' => '10',
-				'sp.price'=>"50",
-				'sp.unitprice'=>'50',
-				'sp.remise_percent'=>'0',
+				'sp.price' => "50",
+				'sp.unitprice' => '50',
+				'sp.remise_percent' => '0',
 				'sp.default_vat_code' => '',
 				'sp.delivery_time_days' => '5',
 				'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER',
 				'sp.status' => '1'
 			);
 			if (is_object($mysoc) && $usenpr) {
-				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly' => ''));
 			}
 			if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx' => 'LT1', 'sp.localtax1_type' => 'LT1Type'));
 			}
 			if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx' => 'LT2', 'sp.localtax2_type' => 'LT2Type'));
 			}
 			$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 				'sp.price' => "50.00",
@@ -877,21 +878,21 @@ class modProduct extends DolibarrModules
 			));
 			if (isModEnabled("multicurrency")) {
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-					'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
-					'sp.multicurrency_code'=>'GBP',
-					'sp.multicurrency_tx'=>'1.12345',
-					'sp.multicurrency_unitprice'=>'',
+					'sp.fk_multicurrency' => 'eg: 2, rowid for code of multicurrency currency',
+					'sp.multicurrency_code' => 'GBP',
+					'sp.multicurrency_tx' => '1.12345',
+					'sp.multicurrency_unitprice' => '',
 					// TODO Make this field not required and calculate it from price and qty
-					'sp.multicurrency_price'=>''
+					'sp.multicurrency_price' => ''
 				));
 			}
 			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-					'sp.packaging'=>'10',
+					'sp.packaging' => '10',
 				));
 			}
 
-			$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier', 'sp.quantity'=>"QtyMin");
+			$this->import_updatekeys_array[$r] = array('sp.fk_product' => 'ProductOrService', 'sp.ref_fourn' => 'SupplierRef', 'sp.fk_soc' => 'Supplier', 'sp.quantity' => "QtyMin");
 		}
 
 		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
@@ -901,30 +902,30 @@ class modProduct extends DolibarrModules
 			$this->import_label[$r] = "ProductsOrServiceMultiPrice"; // Translation key
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('pr'=>MAIN_DB_PREFIX.'product_price');
-			$this->import_tables_creator_array[$r] = array('pr'=>'fk_user_author'); // Fields to store import user id
-			$this->import_fields_array[$r] = array('pr.fk_product'=>"ProductOrService*",
-				'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
-				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
-				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
-				'pr.date_price'=>'DateCreation*');
+			$this->import_tables_array[$r] = array('pr' => MAIN_DB_PREFIX.'product_price');
+			$this->import_tables_creator_array[$r] = array('pr' => 'fk_user_author'); // Fields to store import user id
+			$this->import_fields_array[$r] = array('pr.fk_product' => "ProductOrService*",
+				'pr.price_base_type' => "PriceBase", 'pr.price_level' => "PriceLevel",
+				'pr.price' => "PriceLevelUnitPriceHT", 'pr.price_ttc' => "PriceLevelUnitPriceTTC",
+				'pr.price_min' => "MinPriceLevelUnitPriceHT", 'pr.price_min_ttc' => "MinPriceLevelUnitPriceTTC",
+				'pr.date_price' => 'DateCreation*');
 			if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
 				$this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
 			}
 			if (is_object($mysoc) && $usenpr) {
-				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly' => 'NPR'));
 			}
-			$this->import_regex_array[$r] = array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly'=>'^[0|1]$');
+			$this->import_regex_array[$r] = array('pr.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly' => '^[0|1]$');
 			$this->import_convertvalue_array[$r] = array(
-				'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+				'pr.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 			);
-			$this->import_examplevalues_array[$r] = array('pr.fk_product'=>"ref:PRODUCT_REF or id:123456",
-				'pr.price_base_type'=>"HT (for excl tax) or TTC (for inc tax)", 'pr.price_level'=>"1",
-				'pr.price'=>"100", 'pr.price_ttc'=>"110",
-				'pr.price_min'=>"100", 'pr.price_min_ttc'=>"110",
-				'pr.tva_tx'=>'20',
-				'pr.recuperableonly'=>'0',
-				'pr.date_price'=>'2020-12-31');
+			$this->import_examplevalues_array[$r] = array('pr.fk_product' => "ref:PRODUCT_REF or id:123456",
+				'pr.price_base_type' => "HT (for excl tax) or TTC (for inc tax)", 'pr.price_level' => "1",
+				'pr.price' => "100", 'pr.price_ttc' => "110",
+				'pr.price_min' => "100", 'pr.price_min_ttc' => "110",
+				'pr.tva_tx' => '20',
+				'pr.recuperableonly' => '0',
+				'pr.date_price' => '2020-12-31');
 		}
 
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -934,15 +935,15 @@ class modProduct extends DolibarrModules
 			$this->import_label[$r] = "ProductsOrServicesTranslations";
 			$this->import_icon[$r] = $this->picto;
 			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r] = array('l'=>MAIN_DB_PREFIX.'product_lang');
+			$this->import_tables_array[$r] = array('l' => MAIN_DB_PREFIX.'product_lang');
 			// multiline translation, one line per translation
-			$this->import_fields_array[$r] = array('l.fk_product'=>'ProductOrService*', 'l.lang'=>'Language*', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription');
+			$this->import_fields_array[$r] = array('l.fk_product' => 'ProductOrService*', 'l.lang' => 'Language*', 'l.label' => 'TranslatedLabel', 'l.description' => 'TranslatedDescription');
 			//$this->import_fields_array[$r]['l.note']='TranslatedNote';
 			$this->import_convertvalue_array[$r] = array(
-					'l.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'l.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 			);
-			$this->import_examplevalues_array[$r] = array('l.fk_product'=>'ref:PRODUCT_REF or id:123456', 'l.lang'=>'en_US', 'l.label'=>'Label in en_US', 'l.description'=>'Desc in en_US');
-			$this->import_updatekeys_array[$r] = array('l.fk_product'=>'ProductOrService', 'l.lang'=>'Language');
+			$this->import_examplevalues_array[$r] = array('l.fk_product' => 'ref:PRODUCT_REF or id:123456', 'l.lang' => 'en_US', 'l.label' => 'Label in en_US', 'l.description' => 'Desc in en_US');
+			$this->import_updatekeys_array[$r] = array('l.fk_product' => 'ProductOrService', 'l.lang' => 'Language');
 		}
 	}
 

From ec59a692e88cfc009c90be01de2d53bce16c9452 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:38 +0100
Subject: [PATCH 1164/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modProductBatch.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 30ab6cefe35..1f8f4436a53 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2014 Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -118,7 +119,7 @@ class modProductBatch extends DolibarrModules
 
 
 		// Exports
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 	}
 
 	/**

From eb3fe3c05c3f2ebbec3b08468d4bbf0fa73c74df Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:41 +0100
Subject: [PATCH 1165/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modRecruitment.class.php | 125 ++++++++++---------
 1 file changed, 63 insertions(+), 62 deletions(-)

diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index c8c5b623845..3731002467c 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -255,75 +256,75 @@ class modRecruitment extends DolibarrModules
 		/* END MODULEBUILDER TOPMENU */
 		/* BEGIN MODULEBUILDER LEFTMENU RECRUITMENTJOBPOSITION */
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=hrm', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Top menu entry
-			'titre'=>'Recruitment',
+			'fk_menu' => 'fk_mainmenu=hrm', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Top menu entry
+			'titre' => 'Recruitment',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'hrm',
-			'leftmenu'=>'recruitmentjobposition',
-			'url'=>'/recruitment/index.php',
-			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->hasRight("recruitment", "recruitmentjobposition", "read")', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'mainmenu' => 'hrm',
+			'leftmenu' => 'recruitmentjobposition',
+			'url' => '/recruitment/index.php',
+			'langs' => 'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->hasRight("recruitment", "recruitmentjobposition", "read")', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Left menu entry
-			'titre'=>'NewPositionToBeFilled',
-			'mainmenu'=>'hrm',
-			'leftmenu'=>'recruitment_recruitmentjobposition_new',
-			'url'=>'/recruitment/recruitmentjobposition_card.php?action=create',
-			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->recruitment->recruitmentjobposition->write', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
+			'titre' => 'NewPositionToBeFilled',
+			'mainmenu' => 'hrm',
+			'leftmenu' => 'recruitment_recruitmentjobposition_new',
+			'url' => '/recruitment/recruitmentjobposition_card.php?action=create',
+			'langs' => 'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->recruitment->recruitmentjobposition->write', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Left menu entry
-			'titre'=>'ListOfPositionsToBeFilled',
-			'mainmenu'=>'hrm',
-			'leftmenu'=>'recruitment_recruitmentjobposition_list',
-			'url'=>'/recruitment/recruitmentjobposition_list.php',
-			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->hasRight("recruitment", "recruitmentjobposition", "read")', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
+			'titre' => 'ListOfPositionsToBeFilled',
+			'mainmenu' => 'hrm',
+			'leftmenu' => 'recruitment_recruitmentjobposition_list',
+			'url' => '/recruitment/recruitmentjobposition_list.php',
+			'langs' => 'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("recruitment", "recruitmentjobposition", "read")', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Left menu entry
-			'titre'=>'NewCandidature',
-			'mainmenu'=>'hrm',
-			'leftmenu'=>'recruitment_recruitmentcandidature_new',
-			'url'=>'/recruitment/recruitmentcandidature_card.php?action=create',
-			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->recruitment->recruitmentjobposition->write', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
+			'titre' => 'NewCandidature',
+			'mainmenu' => 'hrm',
+			'leftmenu' => 'recruitment_recruitmentcandidature_new',
+			'url' => '/recruitment/recruitmentcandidature_card.php?action=create',
+			'langs' => 'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->rights->recruitment->recruitmentjobposition->write', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left', // This is a Left menu entry
-			'titre'=>'ListOfCandidatures',
-			'mainmenu'=>'hrm',
-			'leftmenu'=>'recruitment_recruitmentcandidature_list',
-			'url'=>'/recruitment/recruitmentcandidature_list.php',
-			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>1000 + $r,
-			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->hasRight("recruitment", "recruitmentjobposition", "read")', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
-			'target'=>'',
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu' => 'fk_mainmenu=hrm,fk_leftmenu=recruitmentjobposition', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
+			'titre' => 'ListOfCandidatures',
+			'mainmenu' => 'hrm',
+			'leftmenu' => 'recruitment_recruitmentcandidature_list',
+			'url' => '/recruitment/recruitmentcandidature_list.php',
+			'langs' => 'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 1000 + $r,
+			'enabled' => '$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("recruitment", "recruitmentjobposition", "read")', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
+			'target' => '',
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		/* END MODULEBUILDER LEFTMENU RECRUITMENTJOBPOSITION */
 
@@ -359,7 +360,7 @@ class modRecruitment extends DolibarrModules
 		/* END MODULEBUILDER EXPORT RECRUITMENTJOBPOSITION */
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT RECRUITMENTJOBPOSITION */
 		/*
 		 $langs->load("recruitment");
@@ -413,7 +414,7 @@ class modRecruitment extends DolibarrModules
 		// Document template
 		$moduledir = 'recruitment';
 		$myTmpObjects = array();
-		$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+		$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration' => 1, 'includedocgeneration' => 1);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'MyObject') {

From 923f403c54dfd1108a25620ea3ac0953415e70c3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:44 +0100
Subject: [PATCH 1166/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modResource.class.php | 95 ++++++++++++-----------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 350953ad4c6..8acfb7cfb64 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Jean-François Ferry <jfefe@aternatik.fr>
  * Copyright (C) 2015      Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -146,7 +147,7 @@ class modResource extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		$this->rights[$r][0] = 63001;
 		$this->rights[$r][1] = 'Read resources';
@@ -184,49 +185,49 @@ class modResource extends DolibarrModules
 
 		// Menus declaration
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=agenda',
-			'type'=>'left',
-			'titre'=> 'MenuResourceIndex',
+			'fk_menu' => 'fk_mainmenu=agenda',
+			'type' => 'left',
+			'titre' => 'MenuResourceIndex',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em92"'),
-			'mainmenu'=>'agenda',
-			'leftmenu'=> 'resource',
-			'url'=> '/resource/list.php',
-			'langs'=> 'resource',
-			'position'=> 100,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->resource->read',
-			'user'=> 0
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'resource',
+			'url' => '/resource/list.php',
+			'langs' => 'resource',
+			'position' => 100,
+			'enabled' => '1',
+			'perms' => '$user->rights->resource->read',
+			'user' => 0
 		);
 		$r++;
 
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
-			'type'=> 'left', // Toujours un menu gauche
-			'titre'=> 'MenuResourceAdd',
-			'mainmenu'=> 'agenda',
-			'leftmenu'=> 'resource_add',
-			'url'=> '/resource/card.php?action=create',
-			'langs'=> 'resource',
-			'position'=> 101,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->resource->write',
-			'target'=> '',
-			'user'=> 0
+			'fk_menu' => 'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+			'type' => 'left', // Toujours un menu gauche
+			'titre' => 'MenuResourceAdd',
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'resource_add',
+			'url' => '/resource/card.php?action=create',
+			'langs' => 'resource',
+			'position' => 101,
+			'enabled' => '1',
+			'perms' => '$user->rights->resource->write',
+			'target' => '',
+			'user' => 0
 		);
 
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
-			'type'=> 'left', // Toujours un menu gauche
-			'titre'=> 'List',
-			'mainmenu'=> 'agenda',
-			'leftmenu'=> 'resource_list',
-			'url'=> '/resource/list.php',
-			'langs'=> 'resource',
-			'position'=> 102,
-			'enabled'=> '1',
-			'perms'=> '$user->rights->resource->read',
-			'target'=> '',
-			'user'=> 0
+			'fk_menu' => 'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+			'type' => 'left', // Toujours un menu gauche
+			'titre' => 'List',
+			'mainmenu' => 'agenda',
+			'leftmenu' => 'resource_list',
+			'url' => '/resource/list.php',
+			'langs' => 'resource',
+			'position' => 102,
+			'enabled' => '1',
+			'perms' => '$user->rights->resource->read',
+			'target' => '',
+			'user' => 0
 		);
 
 
@@ -239,9 +240,9 @@ class modResource extends DolibarrModules
 		$this->export_label[$r] = "ResourceSingular"; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("resource", "read"));
 
-		$this->export_fields_array[$r] = array('r.rowid'=>'IdResource', 'r.ref'=>'ResourceFormLabel_ref', 'c.rowid'=>'ResourceTypeID', 'c.code'=>'ResourceTypeCode', 'c.label'=>'ResourceTypeLabel', 'r.description'=>'ResourceFormLabel_description', 'r.note_private'=>"NotePrivate", 'r.note_public'=>"NotePublic", 'r.asset_number'=>'AssetNumber', 'r.datec'=>"DateCreation", 'r.tms'=>"DateLastModification");
-		$this->export_TypeFields_array[$r] = array('r.rowid'=>'List:resource:ref', 'r.ref'=>'Text', 'r.asset_number'=>'Text', 'r.description'=>'Text', 'c.code'=>'Text', 'c.label'=>'List:c_type_resource:label', 'r.datec'=>'Date', 'r.tms'=>'Date', 'r.note_private'=>'Text', 'r.note_public'=>'Text');
-		$this->export_entities_array[$r] = array('r.rowid'=>'resource', 'r.ref'=>'resource', 'c.code'=>'resource', 'c.label'=>'resource', 'r.description'=>'resource', 'r.note_private'=>"resource", 'r.resource'=>"resource", 'r.asset_number'=>'resource', 'r.datec'=>"resource", 'r.tms'=>"resource");
+		$this->export_fields_array[$r] = array('r.rowid' => 'IdResource', 'r.ref' => 'ResourceFormLabel_ref', 'c.rowid' => 'ResourceTypeID', 'c.code' => 'ResourceTypeCode', 'c.label' => 'ResourceTypeLabel', 'r.description' => 'ResourceFormLabel_description', 'r.note_private' => "NotePrivate", 'r.note_public' => "NotePublic", 'r.asset_number' => 'AssetNumber', 'r.datec' => "DateCreation", 'r.tms' => "DateLastModification");
+		$this->export_TypeFields_array[$r] = array('r.rowid' => 'List:resource:ref', 'r.ref' => 'Text', 'r.asset_number' => 'Text', 'r.description' => 'Text', 'c.code' => 'Text', 'c.label' => 'List:c_type_resource:label', 'r.datec' => 'Date', 'r.tms' => 'Date', 'r.note_private' => 'Text', 'r.note_public' => 'Text');
+		$this->export_entities_array[$r] = array('r.rowid' => 'resource', 'r.ref' => 'resource', 'c.code' => 'resource', 'c.label' => 'resource', 'r.description' => 'resource', 'r.note_private' => "resource", 'r.resource' => "resource", 'r.asset_number' => 'resource', 'r.datec' => "resource", 'r.tms' => "resource");
 
 		$keyforselect = 'resource';
 		$keyforelement = 'resource';
@@ -249,7 +250,7 @@ class modResource extends DolibarrModules
 
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-		$this->export_dependencies_array[$r] = array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+		$this->export_dependencies_array[$r] = array('resource' => array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'resource as r';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.code = r.fk_code_type_resource';
@@ -268,8 +269,8 @@ class modResource extends DolibarrModules
 		$this->import_label[$r] = 'ImportDataset_resource_1';
 		$this->import_icon[$r] = 'resource';
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = array('r'=>MAIN_DB_PREFIX.'resource', 'extra'=>MAIN_DB_PREFIX.'resource_extrafields'); // List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r] = array('r.ref'=>"ResourceFormLabel_ref*", 'r.fk_code_type_resource'=>'ResourceTypeCode', 'r.description'=>'ResourceFormLabel_description', 'r.note_private'=>"NotePrivate", 'r.note_public'=>"NotePublic", 'r.asset_number'=>'AssetNumber', 'r.datec'=>'DateCreation');
+		$this->import_tables_array[$r] = array('r' => MAIN_DB_PREFIX.'resource', 'extra' => MAIN_DB_PREFIX.'resource_extrafields'); // List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r] = array('r.ref' => "ResourceFormLabel_ref*", 'r.fk_code_type_resource' => 'ResourceTypeCode', 'r.description' => 'ResourceFormLabel_description', 'r.note_private' => "NotePrivate", 'r.note_public' => "NotePublic", 'r.asset_number' => 'AssetNumber', 'r.datec' => 'DateCreation');
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE type <> 'separate' AND elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
@@ -281,14 +282,14 @@ class modResource extends DolibarrModules
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = array('r.fk_user_author'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'resource'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_fieldshidden_array[$r] = array('r.fk_user_author' => 'user->id', 'extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'resource'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r] = array(
-				'r.fk_code_type_resource'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/core/class/ctyperesource.class.php', 'class'=>'Ctyperesource', 'method'=>'fetch', 'dict'=>'DictionaryResourceType'),
+				'r.fk_code_type_resource' => array('rule' => 'fetchidfromcodeorlabel', 'classfile' => '/core/class/ctyperesource.class.php', 'class' => 'Ctyperesource', 'method' => 'fetch', 'dict' => 'DictionaryResourceType'),
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r] = array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-		$this->import_examplevalues_array[$r] = array('r.ref'=>"REF1", 'r.fk_code_type_resource'=>"Code from dictionary resource type", 'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
-		$this->import_updatekeys_array[$r] = array('r.rf'=>'ResourceFormLabel_ref');
+		$this->import_regex_array[$r] = array('s.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+		$this->import_examplevalues_array[$r] = array('r.ref' => "REF1", 'r.fk_code_type_resource' => "Code from dictionary resource type", 'r.datec' => "2017-01-01 or 2017-01-01 12:30:00");
+		$this->import_updatekeys_array[$r] = array('r.rf' => 'ResourceFormLabel_ref');
 	}
 
 	/**

From 5f61e07477b830f24a90d8be5287b781abd002bc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:47 +0100
Subject: [PATCH 1167/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modService.class.php | 377 ++++++++++++-----------
 1 file changed, 189 insertions(+), 188 deletions(-)

diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index fb07f91ee1c..ced0c7c9919 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2020-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -78,8 +79,8 @@ class modService extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_services_contracts.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_graph_product_distribution.php', 'enabledbydefaulton'=>'Home')
+			0 => array('file' => 'box_services_contracts.php', 'enabledbydefaulton' => 'Home'),
+			1 => array('file' => 'box_graph_product_distribution.php', 'enabledbydefaulton' => 'Home')
 		);
 
 		// Permissions
@@ -157,111 +158,111 @@ class modService extends DolibarrModules
 		$this->export_label[$r] = "Services"; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("service", "export"));
 		$this->export_fields_array[$r] = array(
-			'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
-			'p.fk_product_type'=>'Type', 'p.tosell'=>"OnSell", 'p.tobuy'=>"OnBuy",
-			'p.description'=>"Description", 'p.url'=>"PublicUrl",
-			'p.customcode'=>'CustomCode', 'p.fk_country'=>'IDCountry',
-			$alias_product_perentity . '.accountancy_code_sell'=>"ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
-			$alias_product_perentity . '.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy'=>"ProductAccountancyBuyCode",
-			$alias_product_perentity . '.accountancy_code_buy_intra'=>"ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export'=>"ProductAccountancyBuyExportCode",
-			'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
-			'p.weight'=>"Weight", 'p.length'=>"Length", 'p.width'=>"Width", 'p.height'=>"Height", 'p.surface'=>"Surface", 'p.volume'=>"Volume",
-			'p.duration'=>"Duration",
+			'p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label",
+			'p.fk_product_type' => 'Type', 'p.tosell' => "OnSell", 'p.tobuy' => "OnBuy",
+			'p.description' => "Description", 'p.url' => "PublicUrl",
+			'p.customcode' => 'CustomCode', 'p.fk_country' => 'IDCountry',
+			$alias_product_perentity . '.accountancy_code_sell' => "ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
+			$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
+			$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
+			'p.note' => "NotePrivate", 'p.note_public' => 'NotePublic',
+			'p.weight' => "Weight", 'p.length' => "Length", 'p.width' => "Width", 'p.height' => "Height", 'p.surface' => "Surface", 'p.volume' => "Volume",
+			'p.duration' => "Duration",
 			'p.finished' => 'Nature',
-			'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC",
-			'p.tva_tx'=>'VATRate',
-			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
+			'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC",
+			'p.tva_tx' => 'VATRate',
+			'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
 		);
 		if (is_object($mysoc) && $usenpr) {
 			$this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price' => 'CostPrice'));
 		}
 		if (isModEnabled('stock')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock' => 'Stock', 'p.seuil_stock_alerte' => 'StockLimit', 'p.desiredstock' => 'DesiredStock', 'p.pmp' => 'PMPValue'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 		}
 		$keyforselect = 'product';
 		$keyforelement = 'product';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom' => 'Supplier', 'pf.ref_fourn' => 'SupplierRef', 'pf.quantity' => 'QtyMin', 'pf.remise_percent' => 'DiscountQtyMin', 'pf.unitprice' => 'BuyingPrice', 'pf.delivery_time_days' => 'NbDaysToDelivery'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)' => 'Categories'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang' => 'Language', 'l.label' => 'TranslatedLabel', 'l.description' => 'TranslatedDescription', 'l.note' => 'TranslatedNote'));
 		}
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
 		}
 		$this->export_TypeFields_array[$r] = array(
-			'p.ref'=>"Text", 'p.label'=>"Text",
-			'p.fk_product_type'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
-			'p.description'=>"Text", 'p.url'=>"Text",
-			$alias_product_perentity . '.accountancy_code_sell'=>"Text", $alias_product_perentity . '.accountancy_code_sell_intra'=>"Text", $alias_product_perentity . '.accountancy_code_sell_export'=>"Text",
-			$alias_product_perentity . '.accountancy_code_buy'=>"Text", $alias_product_perentity . '.accountancy_code_buy_intra'=>"Text", $alias_product_perentity . '.accountancy_code_buy_export'=>"Text",
-			'p.note'=>"Text", 'p.note_public'=>"Text",
-			'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.width'=>"Numeric", 'p.height'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric",
-			'p.customcode'=>'Text',
-			'p.duration'=>"Text",
+			'p.ref' => "Text", 'p.label' => "Text",
+			'p.fk_product_type' => 'Numeric', 'p.tosell' => "Boolean", 'p.tobuy' => "Boolean",
+			'p.description' => "Text", 'p.url' => "Text",
+			$alias_product_perentity . '.accountancy_code_sell' => "Text", $alias_product_perentity . '.accountancy_code_sell_intra' => "Text", $alias_product_perentity . '.accountancy_code_sell_export' => "Text",
+			$alias_product_perentity . '.accountancy_code_buy' => "Text", $alias_product_perentity . '.accountancy_code_buy_intra' => "Text", $alias_product_perentity . '.accountancy_code_buy_export' => "Text",
+			'p.note' => "Text", 'p.note_public' => "Text",
+			'p.weight' => "Numeric", 'p.length' => "Numeric", 'p.width' => "Numeric", 'p.height' => "Numeric", 'p.surface' => "Numeric", 'p.volume' => "Numeric",
+			'p.customcode' => 'Text',
+			'p.duration' => "Text",
 			'p.finished' => 'Numeric',
-			'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric',
-			'p.datec'=>'Date', 'p.tms'=>'Date'
+			'p.price_base_type' => "Text", 'p.price' => "Numeric", 'p.price_ttc' => "Numeric", 'p.tva_tx' => 'Numeric',
+			'p.datec' => 'Date', 'p.tms' => 'Date'
 		);
 		if (isModEnabled('stock')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock' => 'Numeric', 'p.seuil_stock_alerte' => 'Numeric', 'p.desiredstock' => 'Numeric', 'p.pmp' => 'Numeric', 'p.cost_price' => 'Numeric'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom' => 'Text', 'pf.ref_fourn' => 'Text', 'pf.unitprice' => 'Numeric', 'pf.quantity' => 'Numeric', 'pf.remise_percent' => 'Numeric', 'pf.delivery_time_days' => 'Numeric'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang' => 'Text', 'l.label' => 'Text', 'l.description' => 'Text', 'l.note' => 'Text'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)" => 'Text'));
 		}
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)" => 'category'));
 		}
 		if (isModEnabled('stock')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock' => 'product', 'p.pmp' => 'product'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom' => 'product_supplier_ref', 'pf.ref_fourn' => 'product_supplier_ref', 'pf.unitprice' => 'product_supplier_ref', 'pf.quantity' => 'product_supplier_ref', 'pf.remise_percent' => 'product_supplier_ref', 'pf.delivery_time_days' => 'product_supplier_ref'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang' => 'translation', 'l.label' => 'translation', 'l.description' => 'translation', 'l.note' => 'translation'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+			$this->export_dependencies_array[$r] = array('category' => 'p.rowid');
 		}
 		if (isModEnabled('stock')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock' => 'product', 'p.pmp' => 'product'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom' => 'product_supplier_ref', 'pf.ref_fourn' => 'product_supplier_ref', 'pf.unitprice' => 'product_supplier_ref', 'pf.quantity' => 'product_supplier_ref', 'pf.remise_percent' => 'product_supplier_ref', 'pf.delivery_time_days' => 'product_supplier_ref'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang' => 'translation', 'l.label' => 'translation', 'l.description' => 'translation', 'l.note' => 'translation'));
 		}
 		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
-			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+			$this->export_dependencies_array[$r] = array('category' => 'p.rowid');
 		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -290,12 +291,12 @@ class modService extends DolibarrModules
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
 				$this->export_label[$r] = "ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
 				$this->export_permission[$r] = array(array("service", "export"));
-				$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
-					'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
-					'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
-					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
-					'pr.tva_tx'=>'PriceLevelVATRate',
-					'pr.date_price'=>'DateCreation');
+				$this->export_fields_array[$r] = array('p.rowid' => "Id", 'p.ref' => "Ref",
+					'pr.price_base_type' => "PriceBase", 'pr.price_level' => "PriceLevel",
+					'pr.price' => "PriceLevelUnitPriceHT", 'pr.price_ttc' => "PriceLevelUnitPriceTTC",
+					'pr.price_min' => "MinPriceLevelUnitPriceHT", 'pr.price_min_ttc' => "MinPriceLevelUnitPriceTTC",
+					'pr.tva_tx' => 'PriceLevelVATRate',
+					'pr.date_price' => 'DateCreation');
 				if (is_object($mysoc) && $usenpr) {
 					$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 				}
@@ -305,13 +306,13 @@ class modService extends DolibarrModules
 				//	'p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",
 				//	'p.datec'=>'Date','p.tms'=>'Date'
 				//);
-				$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
-					'pr.price_base_type'=>"product", 'pr.price_level'=>"product", 'pr.price'=>"product",
-					'pr.price_ttc'=>"product",
-					'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
-					'pr.tva_tx'=>'product',
-					'pr.recuperableonly'=>'product',
-					'pr.date_price'=>"product");
+				$this->export_entities_array[$r] = array('p.rowid' => "product", 'p.ref' => "product",
+					'pr.price_base_type' => "product", 'pr.price_level' => "product", 'pr.price' => "product",
+					'pr.price_ttc' => "product",
+					'pr.price_min' => "product", 'pr.price_min_ttc' => "product",
+					'pr.tva_tx' => 'product',
+					'pr.recuperableonly' => 'product',
+					'pr.date_price' => "product");
 				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
@@ -324,26 +325,26 @@ class modService extends DolibarrModules
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
 				$this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
 				$this->export_permission[$r] = array(array("service", "export"));
-				$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
-					's.nom'=>'ThirdParty',
-					'pr.price_base_type'=>"PriceBase",
-					'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
-					'pr.price_min'=>"MinPriceUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceUnitPriceTTC",
-					'pr.tva_tx'=>'PriceVATRate',
-					'pr.default_vat_code'=>'PriceVATCode',
-					'pr.datec'=>'DateCreation');
+				$this->export_fields_array[$r] = array('p.rowid' => "Id", 'p.ref' => "Ref",
+					's.nom' => 'ThirdParty',
+					'pr.price_base_type' => "PriceBase",
+					'pr.price' => "PriceUnitPriceHT", 'pr.price_ttc' => "PriceUnitPriceTTC",
+					'pr.price_min' => "MinPriceUnitPriceHT", 'pr.price_min_ttc' => "MinPriceUnitPriceTTC",
+					'pr.tva_tx' => 'PriceVATRate',
+					'pr.default_vat_code' => 'PriceVATCode',
+					'pr.datec' => 'DateCreation');
 				if (is_object($mysoc) && $usenpr) {
 					$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 				}
-				$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
-					's.nom'=>'company',
-					'pr.price_base_type'=>"product", 'pr.price'=>"product",
-					'pr.price_ttc'=>"product",
-					'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
-					'pr.tva_tx'=>'product',
-					'pr.default_vat_code'=>'product',
-					'pr.recuperableonly'=>'product',
-					'pr.datec'=>"product");
+				$this->export_entities_array[$r] = array('p.rowid' => "product", 'p.ref' => "product",
+					's.nom' => 'company',
+					'pr.price_base_type' => "product", 'pr.price' => "product",
+					'pr.price_ttc' => "product",
+					'pr.price_min' => "product", 'pr.price_min_ttc' => "product",
+					'pr.tva_tx' => 'product',
+					'pr.default_vat_code' => 'product',
+					'pr.recuperableonly' => 'product',
+					'pr.datec' => "product");
 				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_customer_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
@@ -358,60 +359,60 @@ class modService extends DolibarrModules
 				$this->export_label[$r] = "AssociatedProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
 				$this->export_permission[$r] = array(array("service", "export"));
 				$this->export_fields_array[$r] = array(
-					'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label", 'p.description'=>"Description", 'p.url'=>"PublicUrl",
-					$alias_product_perentity . '.accountancy_code_sell'=>"ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
-					$alias_product_perentity . '.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy'=>"ProductAccountancyBuyCode",
-					$alias_product_perentity . '.accountancy_code_buy_intra'=>"ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export'=>"ProductAccountancyBuyExportCode",
-					'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
-					'p.weight'=>"Weight", 'p.length'=>"Length", 'p.surface'=>"Surface", 'p.volume'=>"Volume", 'p.customcode'=>'CustomCode',
-					'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
-					'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
+					'p.rowid' => "Id", 'p.ref' => "Ref", 'p.label' => "Label", 'p.description' => "Description", 'p.url' => "PublicUrl",
+					$alias_product_perentity . '.accountancy_code_sell' => "ProductAccountancySellCode", $alias_product_perentity . '.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
+					$alias_product_perentity . '.accountancy_code_sell_export' => "ProductAccountancySellExportCode", $alias_product_perentity . '.accountancy_code_buy' => "ProductAccountancyBuyCode",
+					$alias_product_perentity . '.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode", $alias_product_perentity . '.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
+					'p.note' => "NotePrivate", 'p.note_public' => 'NotePublic',
+					'p.weight' => "Weight", 'p.length' => "Length", 'p.surface' => "Surface", 'p.volume' => "Volume", 'p.customcode' => 'CustomCode',
+					'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC", 'p.tva_tx' => 'VATRate', 'p.tosell' => "OnSell",
+					'p.tobuy' => "OnBuy", 'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
 				);
 				if (isModEnabled('stock')) {
-					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock' => 'Stock', 'p.seuil_stock_alerte' => 'StockLimit', 'p.desiredstock' => 'DesiredStock', 'p.pmp' => 'PMPValue'));
 				}
 				if (isModEnabled('barcode')) {
-					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 				}
-				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty' => 'Qty', 'pa.incdec' => 'ComposedProductIncDecStock'));
 				$this->export_TypeFields_array[$r] = array(
-					'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
-					$alias_product_perentity . 'p.accountancy_code_sell'=>"Text", $alias_product_perentity . '.accountancy_code_sell_intra'=>"Text", $alias_product_perentity . '.accountancy_code_sell_export'=>"Text",
-					$alias_product_perentity . 'p.accountancy_code_buy'=>"Text", $alias_product_perentity . '.accountancy_code_buy_intra'=>"Text", $alias_product_perentity . '.accountancy_code_buy_export'=>"Text",
-					'p.note'=>"Text", 'p.note_public'=>"Text",
-					'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric", 'p.customcode'=>'Text',
-					'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
-					'p.datec'=>'Date', 'p.tms'=>'Date'
+					'p.ref' => "Text", 'p.label' => "Text", 'p.description' => "Text", 'p.url' => "Text",
+					$alias_product_perentity . 'p.accountancy_code_sell' => "Text", $alias_product_perentity . '.accountancy_code_sell_intra' => "Text", $alias_product_perentity . '.accountancy_code_sell_export' => "Text",
+					$alias_product_perentity . 'p.accountancy_code_buy' => "Text", $alias_product_perentity . '.accountancy_code_buy_intra' => "Text", $alias_product_perentity . '.accountancy_code_buy_export' => "Text",
+					'p.note' => "Text", 'p.note_public' => "Text",
+					'p.weight' => "Numeric", 'p.length' => "Numeric", 'p.surface' => "Numeric", 'p.volume' => "Numeric", 'p.customcode' => 'Text',
+					'p.price_base_type' => "Text", 'p.price' => "Numeric", 'p.price_ttc' => "Numeric", 'p.tva_tx' => 'Numeric', 'p.tosell' => "Boolean", 'p.tobuy' => "Boolean",
+					'p.datec' => 'Date', 'p.tms' => 'Date'
 				);
 				if (isModEnabled('stock')) {
-					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock' => 'Numeric', 'p.seuil_stock_alerte' => 'Numeric', 'p.desiredstock' => 'Numeric', 'p.pmp' => 'Numeric', 'p.cost_price' => 'Numeric'));
 				}
 				if (isModEnabled('barcode')) {
-					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 				}
-				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty' => 'Numeric'));
 				$this->export_entities_array[$r] = array(
-					'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
-					$alias_product_perentity . '.accountancy_code_sell'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_intra'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_export'=>'virtualproduct',
-					$alias_product_perentity . '.accountancy_code_buy'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_intra'=>'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_export'=>'virtualproduct',
-					'p.note'=>"virtualproduct", 'p.length'=>"virtualproduct",
-					'p.surface'=>"virtualproduct", 'p.volume'=>"virtualproduct", 'p.weight'=>"virtualproduct", 'p.customcode'=>'virtualproduct',
-					'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
-					'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
+					'p.rowid' => "virtualproduct", 'p.ref' => "virtualproduct", 'p.label' => "virtualproduct", 'p.description' => "virtualproduct", 'p.url' => "virtualproduct",
+					$alias_product_perentity . '.accountancy_code_sell' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_intra' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_sell_export' => 'virtualproduct',
+					$alias_product_perentity . '.accountancy_code_buy' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_intra' => 'virtualproduct', $alias_product_perentity . '.accountancy_code_buy_export' => 'virtualproduct',
+					'p.note' => "virtualproduct", 'p.length' => "virtualproduct",
+					'p.surface' => "virtualproduct", 'p.volume' => "virtualproduct", 'p.weight' => "virtualproduct", 'p.customcode' => 'virtualproduct',
+					'p.price_base_type' => "virtualproduct", 'p.price' => "virtualproduct", 'p.price_ttc' => "virtualproduct", 'p.tva_tx' => "virtualproduct",
+					'p.tosell' => "virtualproduct", 'p.tobuy' => "virtualproduct", 'p.datec' => "virtualproduct", 'p.tms' => "virtualproduct"
 				);
 				if (isModEnabled('stock')) {
-					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
+					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock' => 'virtualproduct', 'p.seuil_stock_alerte' => 'virtualproduct', 'p.desiredstock' => 'virtualproduct', 'p.pmp' => 'virtualproduct'));
 				}
 				if (isModEnabled('barcode')) {
-					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'virtualproduct'));
 				}
-				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
-				$keyforselect = 'product';
-				$keyforelement = 'product';
-				$keyforaliasextra = 'extra';
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty' => "subproduct", 'pa.incdec' => 'subproduct'));
+				$keyforselect = 'product';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+				$keyforelement = 'product';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+				$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid'=>"Id", 'p2.ref'=>"Ref", 'p2.label'=>"Label", 'p2.description'=>"Description"));
-				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid'=>"subproduct", 'p2.ref'=>"subproduct", 'p2.label'=>"subproduct", 'p2.description'=>"subproduct"));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description"));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct"));
 				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 				if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
@@ -435,8 +436,8 @@ class modService extends DolibarrModules
 		$this->import_label[$r] = "Products"; // Translation key
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
-		$this->import_tables_array[$r] = array('p'=>MAIN_DB_PREFIX.'product', 'extra'=>MAIN_DB_PREFIX.'product_extrafields');
-		$this->import_tables_creator_array[$r] = array('p'=>'fk_user_author'); // Fields to store import user id
+		$this->import_tables_array[$r] = array('p' => MAIN_DB_PREFIX.'product', 'extra' => MAIN_DB_PREFIX.'product_extrafields');
+		$this->import_tables_creator_array[$r] = array('p' => 'fk_user_author'); // Fields to store import user id
 		$this->import_fields_array[$r] = array(
 			'p.ref' => "Ref*",
 			'p.label' => "Label*",
@@ -549,8 +550,8 @@ class modService extends DolibarrModules
 
 		if (isModEnabled('stock')) {//if Stock module enabled
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-				'p.fk_default_warehouse'=>'DefaultWarehouse',
-				'p.tobatch'=>'ManageLotSerial',
+				'p.fk_default_warehouse' => 'DefaultWarehouse',
+				'p.tobatch' => 'ManageLotSerial',
 				'p.seuil_stock_alerte' => 'StockLimit', //lower limit for warning
 				'p.pmp' => 'PMPValue', //weighted average price
 				'p.desiredstock' => 'DesiredStock'//desired stock for replenishment feature
@@ -566,25 +567,25 @@ class modService extends DolibarrModules
 					'classfile' => '/product/stock/class/entrepot.class.php',
 					'class' => 'Entrepot',
 					'method' => 'fetch',
-					'element'=> 'Warehouse'
+					'element' => 'Warehouse'
 				)
 			));
 		}
 
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price' => 'CostPrice'));
 		}
 		if (is_object($mysoc) && $usenpr) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly' => 'NPR'));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx' => 'LT1', 'p.localtax1_type' => 'LT1Type'));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx' => 'LT2', 'p.localtax2_type' => 'LT2Type'));
 		}
 		if (isModEnabled('barcode')) {
-			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode' => 'BarCode'));
 		}
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
@@ -602,14 +603,14 @@ class modService extends DolibarrModules
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array(
-			'p.ref'=>'[^ ]',
+			'p.ref' => '[^ ]',
 			'p.price_base_type' => 'HT|TTC',
-			'p.tosell'=>'^[0|1]$',
-			'p.tobuy'=>'^[0|1]$',
-			'p.fk_product_type'=>'^[0|1]$',
-			'p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
+			'p.tosell' => '^[0|1]$',
+			'p.tobuy' => '^[0|1]$',
+			'p.fk_product_type' => '^[0|1]$',
+			'p.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
 			'p.recuperableonly' => '^[0|1]$',
 			'p.finished' => '^[0|1]$'
 		);
@@ -663,19 +664,19 @@ class modService extends DolibarrModules
 			));
 		}
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
-			$import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
+			$import_sample = array_merge($import_sample, array('p.cost_price' => '90'));
 		}
 		if (is_object($mysoc) && $usenpr) {
-			$import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
+			$import_sample = array_merge($import_sample, array('p.recuperableonly' => '0'));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-			$import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
+			$import_sample = array_merge($import_sample, array('p.localtax1_tx' => '', 'p.localtax1_type' => ''));
 		}
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-			$import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
+			$import_sample = array_merge($import_sample, array('p.localtax2_tx' => '', 'p.localtax2_type' => ''));
 		}
 		if (isModEnabled('barcode')) {
-			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
+			$import_sample = array_merge($import_sample, array('p.barcode' => ''));
 		}
 		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 			$import_sample = array_merge(
@@ -699,9 +700,9 @@ class modService extends DolibarrModules
 			));
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
+		$this->import_updatekeys_array[$r] = array('p.ref' => 'Ref');
 		if (isModEnabled('barcode')) {
-			$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+			$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode' => 'BarCode')); //only show/allow barcode as update key if Barcode module enabled
 		}
 
 		if (!isModEnabled("product")) {	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -712,10 +713,10 @@ class modService extends DolibarrModules
 				$this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key
 				$this->import_icon[$r] = $this->picto;
 				$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-				$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
-				$this->import_tables_creator_array[$r] = array('sp'=>'fk_user');
+				$this->import_tables_array[$r] = array('sp' => MAIN_DB_PREFIX.'product_fournisseur_price');
+				$this->import_tables_creator_array[$r] = array('sp' => 'fk_user');
 				$this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields
-					'sp.fk_product'=>"ProductOrService*",
+					'sp.fk_product' => "ProductOrService*",
 					'sp.fk_soc' => "Supplier*",
 					'sp.ref_fourn' => 'SupplierRef*',
 					'sp.quantity' => "QtyMin*",
@@ -725,33 +726,33 @@ class modService extends DolibarrModules
 					'sp.supplier_reputation' => 'SupplierReputation'
 				);
 				if (is_object($mysoc) && $usenpr) {
-					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly' => 'VATNPR'));
 				}
 				if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx' => 'LT1', 'sp.localtax1_type' => 'LT1Type'));
 				}
 				if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx' => 'LT2', 'sp.localtax2_type' => 'LT2Type'));
 				}
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-					'sp.price'=>"PriceQtyMinHT*",
-					'sp.unitprice'=>'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
-					'sp.remise_percent'=>'DiscountQtyMin'
+					'sp.price' => "PriceQtyMinHT*",
+					'sp.unitprice' => 'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
+					'sp.remise_percent' => 'DiscountQtyMin'
 				));
 
 				if (isModEnabled("multicurrency")) {
 					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-					'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
-					'sp.multicurrency_code'=>'CurrencyCode',
-					'sp.multicurrency_tx'=>'CurrencyRate',
-					'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
-					'sp.multicurrency_price'=>'CurrencyPrice',
+					'sp.fk_multicurrency' => 'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
+					'sp.multicurrency_code' => 'CurrencyCode',
+					'sp.multicurrency_tx' => 'CurrencyRate',
+					'sp.multicurrency_unitprice' => 'CurrencyUnitPrice',
+					'sp.multicurrency_price' => 'CurrencyPrice',
 					));
 				}
 
 				$this->import_convertvalue_array[$r] = array(
-						'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
-						'sp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+						'sp.fk_soc' => array('rule' => 'fetchidfromref', 'classfile' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
+						'sp.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 					);
 				$this->import_examplevalues_array[$r] = array(
 					'sp.fk_product' => "ref:PRODUCT_REF or id:123456",
@@ -759,21 +760,21 @@ class modService extends DolibarrModules
 					'sp.ref_fourn' => "XYZ-F123456",
 					'sp.quantity' => "5",
 					'sp.tva_tx' => '10',
-					'sp.price'=>"50",
-					'sp.unitprice'=>'50',
-					'sp.remise_percent'=>'0',
+					'sp.price' => "50",
+					'sp.unitprice' => '50',
+					'sp.remise_percent' => '0',
 					'sp.default_vat_code' => '',
 					'sp.delivery_time_days' => '5',
 					'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
 					);
 				if (is_object($mysoc) && $usenpr) {
-					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
+					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly' => ''));
 				}
 				if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
-					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx' => 'LT1', 'sp.localtax1_type' => 'LT1Type'));
 				}
 				if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
-					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx' => 'LT2', 'sp.localtax2_type' => 'LT2Type'));
 				}
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 					'sp.price' => "50.00",
@@ -783,21 +784,21 @@ class modService extends DolibarrModules
 					));
 				if (isModEnabled("multicurrency")) {
 					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-					'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
-					'sp.multicurrency_code'=>'GBP',
-					'sp.multicurrency_tx'=>'1.12345',
-					'sp.multicurrency_unitprice'=>'',
+					'sp.fk_multicurrency' => 'eg: 2, rowid for code of multicurrency currency',
+					'sp.multicurrency_code' => 'GBP',
+					'sp.multicurrency_tx' => '1.12345',
+					'sp.multicurrency_unitprice' => '',
 					// TODO Make this field not required and calculate it from price and qty
-					'sp.multicurrency_price'=>''
+					'sp.multicurrency_price' => ''
 					));
 				}
 				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-						'sp.packaging'=>'10',
+						'sp.packaging' => '10',
 					));
 				}
 
-				$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
+				$this->import_updatekeys_array[$r] = array('sp.fk_product' => 'ProductOrService', 'sp.ref_fourn' => 'SupplierRef', 'sp.fk_soc' => 'Supplier');
 			}
 
 			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
@@ -807,30 +808,30 @@ class modService extends DolibarrModules
 				$this->import_label[$r] = "ProductsOrServiceMultiPrice"; // Translation key
 				$this->import_icon[$r] = $this->picto;
 				$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-				$this->import_tables_array[$r] = array('pr'=>MAIN_DB_PREFIX.'product_price');
-				$this->import_tables_creator_array[$r] = array('pr'=>'fk_user_author'); // Fields to store import user id
-				$this->import_fields_array[$r] = array('pr.fk_product'=>"ProductOrService*",
-					'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
-					'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
-					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
-					'pr.date_price'=>'DateCreation*');
+				$this->import_tables_array[$r] = array('pr' => MAIN_DB_PREFIX.'product_price');
+				$this->import_tables_creator_array[$r] = array('pr' => 'fk_user_author'); // Fields to store import user id
+				$this->import_fields_array[$r] = array('pr.fk_product' => "ProductOrService*",
+					'pr.price_base_type' => "PriceBase", 'pr.price_level' => "PriceLevel",
+					'pr.price' => "PriceLevelUnitPriceHT", 'pr.price_ttc' => "PriceLevelUnitPriceTTC",
+					'pr.price_min' => "MinPriceLevelUnitPriceHT", 'pr.price_min_ttc' => "MinPriceLevelUnitPriceTTC",
+					'pr.date_price' => 'DateCreation*');
 				if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
 					$this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
 				}
 				if (is_object($mysoc) && $usenpr) {
-					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly' => 'NPR'));
 				}
-				$this->import_regex_array[$r] = array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly'=>'^[0|1]$');
+				$this->import_regex_array[$r] = array('pr.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly' => '^[0|1]$');
 				$this->import_convertvalue_array[$r] = array(
-					'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'pr.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 				);
-				$this->import_examplevalues_array[$r] = array('pr.fk_product'=>"ref:SERVICE_REF or id:123456",
-					'pr.price_base_type'=>"HT (for excl tax) or TTC (for inc tax)", 'pr.price_level'=>"1",
-					'pr.price'=>"100", 'pr.price_ttc'=>"110",
-					'pr.price_min'=>"100", 'pr.price_min_ttc'=>"110",
-					'pr.tva_tx'=>'20',
-					'pr.recuperableonly'=>'0',
-					'pr.date_price'=>'2013-04-10');
+				$this->import_examplevalues_array[$r] = array('pr.fk_product' => "ref:SERVICE_REF or id:123456",
+					'pr.price_base_type' => "HT (for excl tax) or TTC (for inc tax)", 'pr.price_level' => "1",
+					'pr.price' => "100", 'pr.price_ttc' => "110",
+					'pr.price_min' => "100", 'pr.price_min_ttc' => "110",
+					'pr.tva_tx' => '20',
+					'pr.recuperableonly' => '0',
+					'pr.date_price' => '2013-04-10');
 			}
 
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -840,15 +841,15 @@ class modService extends DolibarrModules
 				$this->import_label[$r] = "ProductsOrServicesTranslations";
 				$this->import_icon[$r] = $this->picto;
 				$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-				$this->import_tables_array[$r] = array('l'=>MAIN_DB_PREFIX.'product_lang');
+				$this->import_tables_array[$r] = array('l' => MAIN_DB_PREFIX.'product_lang');
 				// multiline translation, one line per translation
-				$this->import_fields_array[$r] = array('l.fk_product'=>'ProductOrService*', 'l.lang'=>'Language*', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription');
+				$this->import_fields_array[$r] = array('l.fk_product' => 'ProductOrService*', 'l.lang' => 'Language*', 'l.label' => 'TranslatedLabel', 'l.description' => 'TranslatedDescription');
 				//$this->import_fields_array[$r]['l.note']='TranslatedNote';
 				$this->import_convertvalue_array[$r] = array(
-				'l.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+				'l.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
 				);
-				$this->import_examplevalues_array[$r] = array('l.fk_product'=>'ref:SERVICE_REF or id:123456', 'l.lang'=>'en_US', 'l.label'=>'Label in en_US', 'l.description'=>'Desc in en_US');
-				$this->import_updatekeys_array[$r] = array('l.fk_product'=>'ProductOrService', 'l.lang'=>'Language');
+				$this->import_examplevalues_array[$r] = array('l.fk_product' => 'ref:SERVICE_REF or id:123456', 'l.lang' => 'en_US', 'l.label' => 'Label in en_US', 'l.description' => 'Desc in en_US');
+				$this->import_updatekeys_array[$r] = array('l.fk_product' => 'ProductOrService', 'l.lang' => 'Language');
 			}
 		}
 	}

From 0b8a46faff03ab6012ee7ca1e68901b7ff24c5cf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:50 +0100
Subject: [PATCH 1168/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modSociete.class.php | 165 ++++++++++++-----------
 1 file changed, 83 insertions(+), 82 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 7c1edc59adb..059f011ac28 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2022      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -123,11 +124,11 @@ class modSociete extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-			0=>array('file'=>'box_clients.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_prospect.php', 'enabledbydefaulton'=>'Home'),
-			2=>array('file'=>'box_contacts.php', 'enabledbydefaulton'=>'Home'),
-			3=>array('file'=>'box_activity.php', 'enabledbydefaulton'=>'Home', 'note'=>'(WarningUsingThisBoxSlowDown)'),
-			4=>array('file'=>'box_goodcustomers.php', 'enabledbydefaulton'=>'Home', 'note'=>'(WarningUsingThisBoxSlowDown)'),
+			0 => array('file' => 'box_clients.php', 'enabledbydefaulton' => 'Home'),
+			1 => array('file' => 'box_prospect.php', 'enabledbydefaulton' => 'Home'),
+			2 => array('file' => 'box_contacts.php', 'enabledbydefaulton' => 'Home'),
+			3 => array('file' => 'box_activity.php', 'enabledbydefaulton' => 'Home', 'note' => '(WarningUsingThisBoxSlowDown)'),
+			4 => array('file' => 'box_goodcustomers.php', 'enabledbydefaulton' => 'Home', 'note' => '(WarningUsingThisBoxSlowDown)'),
 		);
 
 		// Permissions
@@ -272,15 +273,15 @@ class modSociete extends DolibarrModules
 		$this->export_icon[$r] = 'company';
 		$this->export_permission[$r] = array(array("societe", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"Id", 's.nom'=>"Name", 's.name_alias'=>"AliasNameShort", 'ps.nom'=>"ParentCompany",
-			's.status'=>"Status", 's.client'=>"Customer", 's.fournisseur'=>"Supplier", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification",
-			's.code_client'=>"CustomerCode", 's.code_fournisseur'=>"SupplierCode", 's.code_compta'=>"AccountancyCode", 's.code_compta_fournisseur'=>"SupplierAccountancyCode",
-			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'd.nom'=>'State', 'r.nom'=>'Region', 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax",
-			's.url'=>"Url", 's.email'=>"Email", 's.default_lang'=>"DefaultLang", 's.canvas' => "Canvas", 's.siren'=>"ProfId1", 's.siret'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4",
-			's.idprof5'=>"ProfId5", 's.idprof6'=>"ProfId6", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital", 's.note_private'=>"NotePrivate", 's.note_public'=>"NotePublic",
-			't.code'=>"ThirdPartyType", 'ce.code'=>"DictionaryStaff", "cfj.libelle"=>"JuridicalStatus", 's.fk_prospectlevel'=>'ProspectLevel',
-			'st.code'=>'ProspectStatus', 'payterm.libelle'=>'PaymentConditions', 'paymode.libelle'=>'PaymentMode',
-			's.outstanding_limit'=>'OutstandingBill', 'pbacc.ref'=>'PaymentBankAccount', 'incoterm.code'=>'IncotermLabel'
+			's.rowid' => "Id", 's.nom' => "Name", 's.name_alias' => "AliasNameShort", 'ps.nom' => "ParentCompany",
+			's.status' => "Status", 's.client' => "Customer", 's.fournisseur' => "Supplier", 's.datec' => "DateCreation", 's.tms' => "DateLastModification",
+			's.code_client' => "CustomerCode", 's.code_fournisseur' => "SupplierCode", 's.code_compta' => "AccountancyCode", 's.code_compta_fournisseur' => "SupplierAccountancyCode",
+			's.address' => "Address", 's.zip' => "Zip", 's.town' => "Town", 'd.nom' => 'State', 'r.nom' => 'Region', 'c.label' => "Country", 'c.code' => "CountryCode", 's.phone' => "Phone", 's.fax' => "Fax",
+			's.url' => "Url", 's.email' => "Email", 's.default_lang' => "DefaultLang", 's.canvas' => "Canvas", 's.siren' => "ProfId1", 's.siret' => "ProfId2", 's.ape' => "ProfId3", 's.idprof4' => "ProfId4",
+			's.idprof5' => "ProfId5", 's.idprof6' => "ProfId6", 's.tva_intra' => "VATIntraShort", 's.capital' => "Capital", 's.note_private' => "NotePrivate", 's.note_public' => "NotePublic",
+			't.code' => "ThirdPartyType", 'ce.code' => "DictionaryStaff", "cfj.libelle" => "JuridicalStatus", 's.fk_prospectlevel' => 'ProspectLevel',
+			'st.code' => 'ProspectStatus', 'payterm.libelle' => 'PaymentConditions', 'paymode.libelle' => 'PaymentMode',
+			's.outstanding_limit' => 'OutstandingBill', 'pbacc.ref' => 'PaymentBankAccount', 'incoterm.code' => 'IncotermLabel'
 		);
 		if (getDolGlobalString('SOCIETE_USEPREFIX')) {
 			$this->export_fields_array[$r]['s.prefix'] = 'Prefix';
@@ -289,49 +290,49 @@ class modSociete extends DolibarrModules
 			$this->export_fields_array[$r]['s.price_level'] = 'PriceLevel';
 		}
 		if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
-			$this->export_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
+			$this->export_fields_array[$r] += array('s.accountancy_code_sell' => 'ProductAccountancySellCode', 's.accountancy_code_buy' => 'ProductAccountancyBuyCode');
 		}
 		// Add multicompany field
 		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			$nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1
 			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
-				$this->export_fields_array[$r] += array('s.entity'=>'Entity');
+				$this->export_fields_array[$r] += array('s.entity' => 'Entity');
 			}
 		}
 		$keyforselect = 'societe';
 		$keyforelement = 'company';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_fields_array[$r] += array('u.login'=>'SaleRepresentativeLogin', 'u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname');
+		$this->export_fields_array[$r] += array('u.login' => 'SaleRepresentativeLogin', 'u.firstname' => 'SaleRepresentativeFirstname', 'u.lastname' => 'SaleRepresentativeLastname');
 
 		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>"Numeric", 's.nom'=>"Text", 's.name_alias'=>"Text", 'ps.nom'=>"Text",
-			's.status'=>"Numeric", 's.client'=>"Numeric", 's.fournisseur'=>"Boolean", 's.datec'=>"Date", 's.tms'=>"Date",
-			's.code_client'=>"Text", 's.code_fournisseur'=>"Text", 's.code_compta'=>"Text", 's.code_compta_fournisseur'=>"Text",
-			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text",
-			'd.nom'=>'Text', 'r.nom'=>'Text', 'c.label'=>'List:c_country:label:label', 'c.code'=>'Text',
-			's.phone'=>"Text", 's.fax'=>"Text",
-			's.url'=>"Text", 's.email'=>"Text", 's.default_lang'=>"Text", 's.canvas' => "Text",
-			's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.idprof5'=>"Text", 's.idprof6'=>"Text",
-			's.tva_intra'=>"Text", 's.capital'=>"Numeric",
-			's.note_private'=>"Text", 's.note_public'=>"Text",
-			't.code'=>"List:c_typent:libelle:code",
-			'ce.code'=>"List:c_effectif:libelle:code",
-			"cfj.libelle"=>"Text",
-			's.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
-			'st.code'=>'List:c_stcomm:libelle:code',
-			'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'=>'List:entity:label:rowid', 's.price_level'=>'Numeric',
-			's.accountancy_code_sell'=>'Text', 's.accountancy_code_buy'=>'Text'
+			's.rowid' => "Numeric", 's.nom' => "Text", 's.name_alias' => "Text", 'ps.nom' => "Text",
+			's.status' => "Numeric", 's.client' => "Numeric", 's.fournisseur' => "Boolean", 's.datec' => "Date", 's.tms' => "Date",
+			's.code_client' => "Text", 's.code_fournisseur' => "Text", 's.code_compta' => "Text", 's.code_compta_fournisseur' => "Text",
+			's.address' => "Text", 's.zip' => "Text", 's.town' => "Text",
+			'd.nom' => 'Text', 'r.nom' => 'Text', 'c.label' => 'List:c_country:label:label', 'c.code' => 'Text',
+			's.phone' => "Text", 's.fax' => "Text",
+			's.url' => "Text", 's.email' => "Text", 's.default_lang' => "Text", 's.canvas' => "Text",
+			's.siret' => "Text", 's.siren' => "Text", 's.ape' => "Text", 's.idprof4' => "Text", 's.idprof5' => "Text", 's.idprof6' => "Text",
+			's.tva_intra' => "Text", 's.capital' => "Numeric",
+			's.note_private' => "Text", 's.note_public' => "Text",
+			't.code' => "List:c_typent:libelle:code",
+			'ce.code' => "List:c_effectif:libelle:code",
+			"cfj.libelle" => "Text",
+			's.fk_prospectlevel' => 'List:c_prospectlevel:label:code',
+			'st.code' => 'List:c_stcomm:libelle:code',
+			'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' => 'List:entity:label:rowid', 's.price_level' => 'Numeric',
+			's.accountancy_code_sell' => 'Text', 's.accountancy_code_buy' => 'Text'
 		);
 
 		$this->export_entities_array[$r] = array(	// We define here only fields that use another picto
-			'u.login'=>'user',
-			'u.firstname'=>'user',
-			'u.lastname'=>'user');
-		$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)');
+			'u.login' => 'user',
+			'u.firstname' => 'user',
+			'u.lastname' => 'user');
+		$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_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
@@ -365,17 +366,17 @@ class modSociete extends DolibarrModules
 		$this->export_icon[$r] = 'contact';
 		$this->export_permission[$r] = array(array("societe", "contact", "export"));
 		$this->export_fields_array[$r] = array(
-			'c.rowid'=>"IdContact", 'c.civility'=>"CivilityCode", 'c.lastname'=>'Lastname', 'c.firstname'=>'Firstname', 'c.poste'=>'PostOrFunction',
-			'c.datec'=>"DateCreation", 'c.tms'=>"DateLastModification", 'c.priv'=>"ContactPrivate", 'c.address'=>"Address", 'c.zip'=>"Zip", 'c.town'=>"Town",
-			'd.nom'=>'State', 'r.nom'=>'Region', 'co.label'=>"Country", 'co.code'=>"CountryCode", 'c.phone'=>"Phone", 'c.fax'=>"Fax", 'c.phone_mobile'=>"Mobile", 'c.email'=>"EMail",
-			'c.note_private'=>'NotePrivate', 'c.note_public'=>"NotePublic",
-			'c.statut'=>"Status",
-			's.rowid'=>"IdCompany", 's.nom'=>"CompanyName", 's.status'=>"Status", 's.code_client'=>"CustomerCode", 's.code_fournisseur'=>"SupplierCode",
-			's.code_compta'=>"AccountancyCode", 's.code_compta_fournisseur'=>"SupplierAccountancyCode",
-			's.client'=>'Customer', 's.fournisseur'=>'Supplier',
-			's.address'=>'Address', 's.zip'=>"Zip", 's.town'=>"Town", 's.phone'=>'Phone', 's.email'=>"Email",
-			's.note_private'=>'NotePrivate', 's.note_public'=>"NotePublic",
-			't.code'=>"ThirdPartyType"
+			'c.rowid' => "IdContact", 'c.civility' => "CivilityCode", 'c.lastname' => 'Lastname', 'c.firstname' => 'Firstname', 'c.poste' => 'PostOrFunction',
+			'c.datec' => "DateCreation", 'c.tms' => "DateLastModification", 'c.priv' => "ContactPrivate", 'c.address' => "Address", 'c.zip' => "Zip", 'c.town' => "Town",
+			'd.nom' => 'State', 'r.nom' => 'Region', 'co.label' => "Country", 'co.code' => "CountryCode", 'c.phone' => "Phone", 'c.fax' => "Fax", 'c.phone_mobile' => "Mobile", 'c.email' => "EMail",
+			'c.note_private' => 'NotePrivate', 'c.note_public' => "NotePublic",
+			'c.statut' => "Status",
+			's.rowid' => "IdCompany", 's.nom' => "CompanyName", 's.status' => "Status", 's.code_client' => "CustomerCode", 's.code_fournisseur' => "SupplierCode",
+			's.code_compta' => "AccountancyCode", 's.code_compta_fournisseur' => "SupplierAccountancyCode",
+			's.client' => 'Customer', 's.fournisseur' => 'Supplier',
+			's.address' => 'Address', 's.zip' => "Zip", 's.town' => "Town", 's.phone' => 'Phone', 's.email' => "Email",
+			's.note_private' => 'NotePrivate', 's.note_public' => "NotePublic",
+			't.code' => "ThirdPartyType"
 		);
 		// Add multicompany field
 		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
@@ -391,27 +392,27 @@ class modSociete extends DolibarrModules
 				}
 			}
 		}
-		$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_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",
-			'c.address'=>"Text", 'c.zip'=>"Text", 'c.town'=>"Text", 'd.nom'=>'Text', 'r.nom'=>'Text', 'co.label'=>"List:c_country:label:rowid", 'co.code'=>"Text", 'c.phone'=>"Text",
-			'c.fax'=>"Text", 'c.email'=>"Text",
-			'c.statut'=>"Status",
-			's.rowid'=>"Numeric", 's.nom'=>"Text", 's.status'=>"Status", 's.code_client'=>"Text", 's.code_fournisseur'=>"Text",
-			's.code_compta'=>"Text", 's.code_compta_fournisseur'=>"Text",
-			's.client'=>"Numeric", 's.fournisseur'=>"Numeric",
-			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 's.phone'=>"Text", 's.email'=>"Text",
-			't.code'=>"List:c_stcomm:libelle:code",
-			'c.entity'=>'List:entity:label:rowid',
-			's.entity'=>'List:entity:label:rowid',
+			'c.civility' => "List:c_civility:label:code", 'c.lastname' => 'Text', 'c.firstname' => 'Text', 'c.poste' => 'Text', 'c.datec' => "Date", 'c.priv' => "Boolean",
+			'c.address' => "Text", 'c.zip' => "Text", 'c.town' => "Text", 'd.nom' => 'Text', 'r.nom' => 'Text', 'co.label' => "List:c_country:label:rowid", 'co.code' => "Text", 'c.phone' => "Text",
+			'c.fax' => "Text", 'c.email' => "Text",
+			'c.statut' => "Status",
+			's.rowid' => "Numeric", 's.nom' => "Text", 's.status' => "Status", 's.code_client' => "Text", 's.code_fournisseur' => "Text",
+			's.code_compta' => "Text", 's.code_compta_fournisseur' => "Text",
+			's.client' => "Numeric", 's.fournisseur' => "Numeric",
+			's.address' => "Text", 's.zip' => "Text", 's.town' => "Text", 's.phone' => "Text", 's.email' => "Text",
+			't.code' => "List:c_stcomm:libelle:code",
+			'c.entity' => 'List:entity:label:rowid',
+			's.entity' => 'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(	// We define here only fields that use another picto
-			'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.code'=>"company",
-			's.entity'=>'company',
+			'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.code' => "company",
+			's.entity' => 'company',
 		); // We define here only fields that use another picto
 		if (!isModEnabled("supplier_order") && !isModEnabled("supplier_invoice")) {
 			unset($this->export_fields_array[$r]['s.code_fournisseur']);
@@ -419,7 +420,7 @@ class modSociete extends DolibarrModules
 		}
 		$keyforselect = 'socpeople';
 		$keyforelement = 'contact';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$keyforselect = 'societe';
 		$keyforelement = 'company';
@@ -502,9 +503,9 @@ class modSociete extends DolibarrModules
 			's.cond_reglement' => "PaymentTermsCustomer",
 			's.mode_reglement_supplier' => 'PaymentTypeSupplier',
 			's.cond_reglement_supplier' => "PaymentTermsSupplier",
-			's.outstanding_limit'=>'OutstandingBill',
-			's.fk_account'=>'PaymentBankAccount',
-			's.fk_incoterms'=>'IncotermLabel',
+			's.outstanding_limit' => 'OutstandingBill',
+			's.fk_account' => 'PaymentBankAccount',
+			's.fk_incoterms' => 'IncotermLabel',
 			's.tva_assuj' => 'VATIsUsed',
 			's.barcode' => 'BarCode',
 			's.default_lang' => 'DefaultLanguage',
@@ -517,7 +518,7 @@ class modSociete extends DolibarrModules
 			$this->import_fields_array[$r]['s.price_level'] = 'PriceLevel';
 		}
 		if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
-			$this->import_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
+			$this->import_fields_array[$r] += array('s.accountancy_code_sell' => 'ProductAccountancySellCode', 's.accountancy_code_buy' => 'ProductAccountancyBuyCode');
 		}
 		// Add social networks fields
 		if (isModEnabled('socialnetworks')) {
@@ -703,7 +704,7 @@ class modSociete extends DolibarrModules
 		}
 		// Add profids as criteria to search duplicates
 		$langs->load("companies");
-		$i=1;
+		$i = 1;
 		while ($i <= 6) {
 			if ($i == 1) {
 				$this->import_updatekeys_array[$r]['s.siren'] = 'ProfId1'.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
@@ -908,15 +909,15 @@ class modSociete extends DolibarrModules
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
 		$this->import_label[$r] = "ImportDataset_company_4"; // Translation key
 		$this->import_icon[$r] = 'company';
-		$this->import_entities_array[$r] = array('sr.fk_user'=>'user'); // We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = array('sr'=>MAIN_DB_PREFIX.'societe_commerciaux');
-		$this->import_fields_array[$r] = array('sr.fk_soc'=>"ThirdPartyName*", 'sr.fk_user'=>"User*");
+		$this->import_entities_array[$r] = array('sr.fk_user' => 'user'); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('sr' => MAIN_DB_PREFIX.'societe_commerciaux');
+		$this->import_fields_array[$r] = array('sr.fk_soc' => "ThirdPartyName*", 'sr.fk_user' => "User*");
 
 		$this->import_convertvalue_array[$r] = array(
-				'sr.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
-				'sr.fk_user'=>array('rule'=>'fetchidfromref', 'classfile'=>'/user/class/user.class.php', 'class'=>'User', 'method'=>'fetch', 'element'=>'User')
+				'sr.fk_soc' => array('rule' => 'fetchidfromref', 'classfile' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
+				'sr.fk_user' => array('rule' => 'fetchidfromref', 'classfile' => '/user/class/user.class.php', 'class' => 'User', 'method' => 'fetch', 'element' => 'User')
 		);
-		$this->import_examplevalues_array[$r] = array('sr.fk_soc'=>"MyBigCompany", 'sr.fk_user'=>"login");
+		$this->import_examplevalues_array[$r] = array('sr.fk_soc' => "MyBigCompany", 'sr.fk_user' => "login");
 	}
 
 

From 8032bc3a86a0b779615f100a9671c67c31978f9d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:53 +0100
Subject: [PATCH 1169/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modStock.class.php | 209 +++++++++++++------------
 1 file changed, 105 insertions(+), 104 deletions(-)

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 19deac068ba..1d465e595c8 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2021	   Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -198,7 +199,7 @@ class modStock extends DolibarrModules
 
 		// Exports
 		//--------
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Export warehouses
 		$r++;
@@ -207,14 +208,14 @@ class modStock extends DolibarrModules
 		$this->export_icon[$r] = "warehouse";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
-			'd.code_departement'=>'Departement', 'c.code'=>'CountryCode',
-			'e.phone'=>'Phone', 'e.fax'=>'Fax', 'e.statut'=>'Status', 'pe.rowid'=>'ParentWarehouse', 'pe.ref'=>'LocationSummary'
+			'e.rowid' => 'IdWarehouse', 'e.ref' => 'LocationSummary', 'e.description' => 'DescWareHouse', 'e.lieu' => 'LieuWareHouse', 'e.address' => 'Address', 'e.zip' => 'Zip', 'e.town' => 'Town',
+			'd.code_departement' => 'Departement', 'c.code' => 'CountryCode',
+			'e.phone' => 'Phone', 'e.fax' => 'Fax', 'e.statut' => 'Status', 'pe.rowid' => 'ParentWarehouse', 'pe.ref' => 'LocationSummary'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
-			'd.code_departement'=>'List:c_departements:code_departement:code_departement:', 'c.code'=>'List:c_country:code:code:',
-			'e.phone'=>'Text', 'e.fax'=>'Text', 'e.statut'=>'Text', 'pe.rowid'=>'List:entrepot:ref:rowid:stock', 'pe.ref'=>'Text'
+			'e.ref' => 'Text', 'e.description' => 'Text', 'e.lieu' => 'Text', 'e.address' => 'Text', 'e.zip' => 'Text', 'e.town' => 'Text',
+			'd.code_departement' => 'List:c_departements:code_departement:code_departement:', 'c.code' => 'List:c_country:code:code:',
+			'e.phone' => 'Text', 'e.fax' => 'Text', 'e.statut' => 'Text', 'pe.rowid' => 'List:entrepot:ref:rowid:stock', 'pe.ref' => 'Text'
 		);
 		$this->export_entities_array[$r] = array();	// We define here only fields that use another icon that the one defined into export_icon
 		$this->export_aggregate_array[$r] = array();	// TODO Not used yet
@@ -238,43 +239,43 @@ class modStock extends DolibarrModules
 		$this->export_icon[$r] = "warehouse";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
-			'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', 'p.barcode'=>'BarCode', 'bt.libelle'=>'BarcodeType',
+			'e.rowid' => 'IdWarehouse', 'e.ref' => 'LocationSummary', 'e.description' => 'DescWareHouse', 'e.lieu' => 'LieuWareHouse', 'e.address' => 'Address', 'e.zip' => 'Zip', 'e.town' => 'Town',
+			'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', 'p.barcode' => 'BarCode', 'bt.libelle' => 'BarcodeType',
 		);
 		if (isModEnabled('barcode')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 		}
 		$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'=>"Numeric", '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',
-			'p.seuil_stock_alerte'=>'Numeric', 'p.barcode'=>'Text', 'bt.libelle'=>'List:c_barcode_type:libelle',
+			'e.rowid' => 'List:entrepot:ref::stock', 'e.ref' => 'Text', 'e.lieu' => 'Text', 'e.address' => 'Text', 'e.zip' => 'Text', 'e.town' => 'Text',
+			'p.rowid' => "Numeric", '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',
+			'p.seuil_stock_alerte' => 'Numeric', 'p.barcode' => 'Text', 'bt.libelle' => 'List:c_barcode_type:libelle',
 		);
 		if (isModEnabled('barcode')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 		}
 		$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',
-			'p.seuil_stock_alerte'=>'product', 'p.barcode'=>'product', 'bt.libelle'=>'c_barcode_type',
+			'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',
+			'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'c_barcode_type',
 		);	// We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('barcode')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
-		$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.
+		$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.
 		$keyforselect = 'product';
 		$keyforelement = 'product';
-		$keyforaliasextra = 'extra';
+		$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ps.reel'=>'Stock'));
+		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ps.reel' => 'Stock'));
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -296,42 +297,42 @@ class modStock extends DolibarrModules
 			$this->export_icon[$r] = "warehouse";
 			$this->export_permission[$r] = array(array("stock", "lire"));
 			$this->export_fields_array[$r] = array(
-				'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
-				'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',
-				'pb.rowid'=>'Id', 'pb.batch'=>'Batch', 'pb.qty'=>'Qty',
-				'pl.eatby'=>'EatByDate', 'pl.sellby'=>'SellByDate'
+				'e.rowid' => 'IdWarehouse', 'e.ref' => 'LocationSummary', 'e.description' => 'DescWareHouse', 'e.lieu' => 'LieuWareHouse', 'e.address' => 'Address', 'e.zip' => 'Zip', 'e.town' => 'Town',
+				'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',
+				'pb.rowid' => 'Id', 'pb.batch' => 'Batch', 'pb.qty' => 'Qty',
+				'pl.eatby' => 'EatByDate', 'pl.sellby' => 'SellByDate'
 			);
 			if (isModEnabled('barcode')) {
-				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 			}
 			$this->export_TypeFields_array[$r] = array(
-				'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.description'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
-				'p.rowid'=>"Numeric", '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'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
-				'pb.batch'=>'Text', 'pb.qty'=>'Numeric',
-				'pl.eatby'=>'Date', 'pl.sellby'=>'Date'
+				'e.rowid' => 'List:entrepot:ref::stock', 'e.ref' => 'Text', 'e.lieu' => 'Text', 'e.description' => 'Text', 'e.address' => 'Text', 'e.zip' => 'Text', 'e.town' => 'Text',
+				'p.rowid' => "Numeric", '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' => 'DateCreation', 'p.tms' => 'DateModification', 'p.pmp' => 'PMPValue', 'p.cost_price' => 'CostPrice',
+				'pb.batch' => 'Text', 'pb.qty' => 'Numeric',
+				'pl.eatby' => 'Date', 'pl.sellby' => 'Date'
 			);
 			if (isModEnabled('barcode')) {
-				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 			}
 			$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',
-				'pb.rowid'=>'batch', 'pb.batch'=>'batch', 'pb.qty'=>'batch',
-				'pl.eatby'=>'batch', 'pl.sellby'=>'batch'
+				'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',
+				'pb.rowid' => 'batch', 'pb.batch' => 'batch', 'pb.qty' => 'batch',
+				'pl.eatby' => 'batch', 'pl.sellby' => 'batch'
 			);	// We define here only fields that use another icon that the one defined into export_icon
 			if (isModEnabled('barcode')) {
-				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 			}
-			$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
-			$this->export_dependencies_array[$r] = array('stockbatch'=>array('pb.rowid'), 'batch'=>array('pb.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+			$this->export_aggregate_array[$r] = array('ps.reel' => 'SUM'); // TODO Not used yet
+			$this->export_dependencies_array[$r] = array('stockbatch' => array('pb.rowid'), 'batch' => array('pb.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 			$keyforselect = 'product_lot';
 			$keyforelement = 'batch';
-			$keyforaliasextra = 'extra';
+			$keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 			$this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -352,27 +353,27 @@ class modStock extends DolibarrModules
 		$this->export_icon[$r] = "movement";
 		$this->export_permission[$r] = array(array("stock", "lire"));
 		$this->export_fields_array[$r] = array(
-			'sm.rowid'=>'MovementId', 'sm.value'=>'Qty', 'sm.datem'=>'DateMovement', 'sm.label'=>'MovementLabel', 'sm.inventorycode'=>'InventoryCode',
-			'e.rowid'=>'IdWarehouse', 'e.ref'=>'LocationSummary', 'e.description'=>'DescWareHouse', 'e.lieu'=>'LieuWareHouse', 'e.address'=>'Address', 'e.zip'=>'Zip', 'e.town'=>'Town',
-			'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'
+			'sm.rowid' => 'MovementId', 'sm.value' => 'Qty', 'sm.datem' => 'DateMovement', 'sm.label' => 'MovementLabel', 'sm.inventorycode' => 'InventoryCode',
+			'e.rowid' => 'IdWarehouse', 'e.ref' => 'LocationSummary', 'e.description' => 'DescWareHouse', 'e.lieu' => 'LieuWareHouse', 'e.address' => 'Address', 'e.zip' => 'Zip', 'e.town' => 'Town',
+			'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'
 		);
 		if (isModEnabled('barcode')) {
-			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode' => 'BarCode'));
 		}
 		$this->export_TypeFields_array[$r] = array(
-			'sm.rowid'=>'Numeric', 'sm.value'=>'Numeric', 'sm.datem'=>'Date', 'sm.batch'=>'Text', 'sm.label'=>'Text', 'sm.inventorycode'=>'Text',
-			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
-			'p.rowid'=>"Numeric", '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'
+			'sm.rowid' => 'Numeric', 'sm.value' => 'Numeric', 'sm.datem' => 'Date', 'sm.batch' => 'Text', 'sm.label' => 'Text', 'sm.inventorycode' => 'Text',
+			'e.rowid' => 'List:entrepot:ref::stock', 'e.ref' => 'Text', 'e.description' => 'Text', 'e.lieu' => 'Text', 'e.address' => 'Text', 'e.zip' => 'Text', 'e.town' => 'Text',
+			'p.rowid' => "Numeric", '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'
 		);
 		if (isModEnabled('barcode')) {
-			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode' => 'Text'));
 		}
 		$this->export_entities_array[$r] = array(
-			'e.rowid'=>'warehouse', 'e.ref'=>'warehouse', 'e.description'=>'warehouse', 'e.lieu'=>'warehouse', 'e.address'=>'warehouse', 'e.zip'=>'warehouse', 'e.town'=>'warehouse',
-			'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'
+			'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse',
+			'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'
 		);	// We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('productbatch')) {
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
@@ -380,10 +381,10 @@ class modStock extends DolibarrModules
 			$this->export_entities_array[$r]['sm.batch'] = 'movement';
 		}
 		if (isModEnabled('barcode')) {
-			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
 		}
-		$this->export_aggregate_array[$r] = array('sm.value'=>'SUM'); // TODO Not used yet
-		$this->export_dependencies_array[$r] = array('movement'=>array('sm.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
+		$this->export_aggregate_array[$r] = array('sm.value' => 'SUM'); // TODO Not used yet
+		$this->export_dependencies_array[$r] = array('movement' => array('sm.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'stock_mouvement as sm, '.MAIN_DB_PREFIX.'entrepot as e';
@@ -401,40 +402,40 @@ class modStock extends DolibarrModules
 		$this->import_label[$r] = "Warehouses"; // Translation key
 		$this->import_icon[$r] = "warehouse";
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = array('e'=>MAIN_DB_PREFIX.'entrepot');
-		$this->import_tables_creator_array[$r] = array('e'=>'fk_user_author');
-		$this->import_fields_array[$r] = array('e.ref'=>"LocationSummary*",
-				'e.description'=>"DescWareHouse",
-				'e.lieu'=>"LieuWareHouse",
-				'e.address'=>"Address",
-				'e.zip'=>'Zip',
-				'e.fk_departement'=>'StateCode',
-				'e.fk_pays'=>'CountryCode',
-				'e.phone'=>'Phone',
-				'e.fax'=>'Fax',
-				'e.statut'=>'Status',
-				'e.fk_parent'=>'ParentWarehouse'
+		$this->import_tables_array[$r] = array('e' => MAIN_DB_PREFIX.'entrepot');
+		$this->import_tables_creator_array[$r] = array('e' => 'fk_user_author');
+		$this->import_fields_array[$r] = array('e.ref' => "LocationSummary*",
+				'e.description' => "DescWareHouse",
+				'e.lieu' => "LieuWareHouse",
+				'e.address' => "Address",
+				'e.zip' => 'Zip',
+				'e.fk_departement' => 'StateCode',
+				'e.fk_pays' => 'CountryCode',
+				'e.phone' => 'Phone',
+				'e.fax' => 'Fax',
+				'e.statut' => 'Status',
+				'e.fk_parent' => 'ParentWarehouse'
 		);
 
 		$this->import_convertvalue_array[$r] = array(
-				'e.fk_departement'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/cstate.class.php', 'class'=>'Cstate', 'method'=>'fetch', 'dict'=>'DictionaryStateCode'),
-				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
-				'e.fk_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
+				'e.fk_departement' => array('rule' => 'fetchidfromcodeid', 'classfile' => '/core/class/cstate.class.php', 'class' => 'Cstate', 'method' => 'fetch', 'dict' => 'DictionaryStateCode'),
+				'e.fk_pays' => array('rule' => 'fetchidfromcodeid', 'classfile' => '/core/class/ccountry.class.php', 'class' => 'Ccountry', 'method' => 'fetch', 'dict' => 'DictionaryCountry'),
+				'e.fk_parent' => array('rule' => 'fetchidfromref', 'classfile' => '/product/stock/class/entrepot.class.php', 'class' => 'Entrepot', 'method' => 'fetch', 'element' => 'ref')
 		);
-		$this->import_regex_array[$r] = array('e.statut'=>'^[0|1]');
-		$this->import_examplevalues_array[$r] = array('e.ref'=>"ALM001",
-				'e.description'=>"Central Warehouse",
-				'e.lieu'=>"Central",
-				'e.address'=>"Route 66",
-				'e.zip'=>'28080',
-				'e.fk_departement'=>'matches field "code_departement" in table "'.MAIN_DB_PREFIX.'c_departements"',
-				'e.fk_pays'=>'US/FR/DE etc. matches field "code" in table "'.MAIN_DB_PREFIX.'c_country"',
-				'e.phone'=>'(+33)(0)123456789',
-				'e.fax'=>'(+33)(0)123456790',
-				'e.statut'=>'1',
-				'e.fk_parent'=>'id or ref of warehouse'
+		$this->import_regex_array[$r] = array('e.statut' => '^[0|1]');
+		$this->import_examplevalues_array[$r] = array('e.ref' => "ALM001",
+				'e.description' => "Central Warehouse",
+				'e.lieu' => "Central",
+				'e.address' => "Route 66",
+				'e.zip' => '28080',
+				'e.fk_departement' => 'matches field "code_departement" in table "'.MAIN_DB_PREFIX.'c_departements"',
+				'e.fk_pays' => 'US/FR/DE etc. matches field "code" in table "'.MAIN_DB_PREFIX.'c_country"',
+				'e.phone' => '(+33)(0)123456789',
+				'e.fax' => '(+33)(0)123456790',
+				'e.statut' => '1',
+				'e.fk_parent' => 'id or ref of warehouse'
 		);
-		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
+		$this->import_updatekeys_array[$r] = array('p.ref' => 'Ref');
 
 		// Import stocks
 		$r++;
@@ -442,17 +443,17 @@ class modStock extends DolibarrModules
 		$this->import_label[$r] = "Stocks"; // Translation key
 		$this->import_icon[$r] = "stock";
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = array('ps'=>MAIN_DB_PREFIX.'product_stock');
-		$this->import_fields_array[$r] = array('ps.fk_product'=>"Product*", 'ps.fk_entrepot'=>"Warehouse*", 'ps.reel'=>"Stock*");
+		$this->import_tables_array[$r] = array('ps' => MAIN_DB_PREFIX.'product_stock');
+		$this->import_fields_array[$r] = array('ps.fk_product' => "Product*", 'ps.fk_entrepot' => "Warehouse*", 'ps.reel' => "Stock*");
 
 		$this->import_convertvalue_array[$r] = array(
-			'ps.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'product'),
-			'ps.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
+			'ps.fk_product' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'product'),
+			'ps.fk_entrepot' => array('rule' => 'fetchidfromref', 'classfile' => '/product/stock/class/entrepot.class.php', 'class' => 'Entrepot', 'method' => 'fetch', 'element' => 'ref')
 		  );
 		$this->import_examplevalues_array[$r] = array(
-			'ps.fk_product'=>"id or ref of product", 'ps.fk_entrepot'=>"id or ref of warehouse", 'ps.reel'=>"10"
+			'ps.fk_product' => "id or ref of product", 'ps.fk_entrepot' => "id or ref of warehouse", 'ps.reel' => "10"
 		);
-		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
+		$this->import_updatekeys_array[$r] = array('ps.fk_product' => 'Product', 'ps.fk_entrepot' => "Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.
 			'UPDATE '.MAIN_DB_PREFIX.'product as p SET p.stock = (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
 		);

From 32ee0f042c8fa2e40eb2040f1acd55711ebc21e7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:56 +0100
Subject: [PATCH 1170/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modStockTransfer.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index affb6575dcb..3da4bea5c1a 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021 		Gauthier VERDOL 		<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -109,7 +110,7 @@ class modStockTransfer extends DolibarrModules
 			),
 			// Set this to 1 if features of module are opened to external users
 			'moduleforexternal' => 0,
-			'contactelement'=>1
+			'contactelement' => 1
 		);
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/stocktransfer/temp","/stocktransfer/subdir");
@@ -393,7 +394,7 @@ class modStockTransfer extends DolibarrModules
 		/* END MODULEBUILDER EXPORT STOCKTRANSFER */
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT STOCKTRANSFER */
 		/*
 		 $langs->load("stocktransfer@stocktransfer");
@@ -438,21 +439,21 @@ class modStockTransfer extends DolibarrModules
 		// Roles
 		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'internal'");
 		$res = $this->db->fetch_object($resql);
-		$nextid=$this->getNextId();
+		$nextid = $this->getNextId();
 		if (empty($res)) {
 			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'internal', 'STRESP', 'Responsible for stock transfers', 1, NULL, 0)");
 		}
 
 		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STFROM' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
-		$nextid=$this->getNextId();
+		$nextid = $this->getNextId();
 		if (empty($res)) {
 			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STFROM', 'Contact sending the stock transfer', 1, NULL, 0)");
 		}
 
 		$resql = $this->db->query("SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'external'");
 		$res = $this->db->fetch_object($resql);
-		$nextid=$this->getNextId();
+		$nextid = $this->getNextId();
 		if (empty($res)) {
 			$this->db->query("INSERT INTO ".MAIN_DB_PREFIX."c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(".((int) $nextid).", 'stocktransfer', 'external', 'STDEST', 'Contact receiving the stock transfer', 1, NULL, 0)");
 		}

From 558871207c69fe993daed5059596dc04f4462961 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:31:59 +0100
Subject: [PATCH 1171/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modStripe.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 2e0d639c856..99e71b5aba5 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -88,10 +89,10 @@ class modStripe extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 		// Main menu entries
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* $this->menu[$r]=array(
 			'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'mainmenu'=>'billing',
@@ -109,12 +110,12 @@ class modStripe extends DolibarrModules
 		$r++;*/
 
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=bank',
-			'type'=>'left',
-			'titre'=>'StripeAccount',
+			'fk_menu' => 'fk_mainmenu=bank',
+			'type' => 'left',
+			'titre' => 'StripeAccount',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'bank',
-			'leftmenu'=>'stripe',
+			'mainmenu' => 'bank',
+			'leftmenu' => 'stripe',
 			'url' => '',
 			'langs' => 'stripe',
 			'position' => 100,

From fa62f5d89d3fe2dd2e8e6a468c275ae5cd9d267f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:02 +0100
Subject: [PATCH 1172/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modTicket.class.php | 47 +++++++++++++------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 260022ef63a..392378cd5c6 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) - 2013-2018    Jean-François FERRY    <hello@librethic.io>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -160,22 +161,22 @@ class modTicket extends DolibarrModules
 			'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
 			'tabcond' => array(isModEnabled("ticket"), isModEnabled("ticket"), isModEnabled("ticket"), isModEnabled("ticket") && getDolGlobalString('TICKET_ENABLE_RESOLUTION')),
 			'tabhelp' => array(
-				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
-				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
-				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc"), 'fk_parent'=>$langs->trans("IfThisCategoryIsChildOfAnother")),
-				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))
+				array('code' => $langs->trans("EnterAnyCode"), 'use_default' => $langs->trans("Enter0or1")),
+				array('code' => $langs->trans("EnterAnyCode"), 'use_default' => $langs->trans("Enter0or1")),
+				array('code' => $langs->trans("EnterAnyCode"), 'use_default' => $langs->trans("Enter0or1"), 'public' => $langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc"), 'fk_parent' => $langs->trans("IfThisCategoryIsChildOfAnother")),
+				array('code' => $langs->trans("EnterAnyCode"), 'use_default' => $langs->trans("Enter0or1"))
 			),
 		);
 
 		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		$this->boxes = array(
-			0=>array('file'=>'box_last_ticket.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_last_modified_ticket.php', 'enabledbydefaulton'=>'Home'),
-			2=>array('file'=>'box_ticket_by_severity.php', 'enabledbydefaulton'=>'ticketindex'),
-			3=>array('file'=>'box_graph_nb_ticket_last_x_days.php', 'enabledbydefaulton'=>'ticketindex'),
-			4=>array('file'=>'box_graph_nb_tickets_type.php', 'enabledbydefaulton'=>'ticketindex'),
-			5=>array('file'=>'box_new_vs_close_ticket.php', 'enabledbydefaulton'=>'ticketindex')
+			0 => array('file' => 'box_last_ticket.php', 'enabledbydefaulton' => 'Home'),
+			1 => array('file' => 'box_last_modified_ticket.php', 'enabledbydefaulton' => 'Home'),
+			2 => array('file' => 'box_ticket_by_severity.php', 'enabledbydefaulton' => 'ticketindex'),
+			3 => array('file' => 'box_graph_nb_ticket_last_x_days.php', 'enabledbydefaulton' => 'ticketindex'),
+			4 => array('file' => 'box_graph_nb_tickets_type.php', 'enabledbydefaulton' => 'ticketindex'),
+			5 => array('file' => 'box_new_vs_close_ticket.php', 'enabledbydefaulton' => 'ticketindex')
 		); // Boxes list
 
 		// Permissions
@@ -333,23 +334,23 @@ class modTicket extends DolibarrModules
 
 		// Export list of tickets and attributes
 		$langs->load("ticket");
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ExportDataset_ticket_1';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'ExportDataset_ticket_1';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("ticket", "export"));
-		$this->export_icon[$r]='ticket';
+		$this->export_icon[$r] = 'ticket';
 		$keyforclass = 'Ticket';
-		$keyforclassfile='/ticket/class/ticket.class.php';
-		$keyforelement='ticket';
+		$keyforclassfile = '/ticket/class/ticket.class.php';
+		$keyforelement = 'ticket';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		$keyforselect='ticket';
-		$keyforaliasextra='extra';
-		$keyforelement='ticket';
+		$keyforselect = 'ticket';
+		$keyforaliasextra = 'extra';
+		$keyforelement = 'ticket';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'ticket as t';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'ticket as t';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'ticket_extrafields as extra on (t.rowid = extra.fk_object)';
-		$this->export_sql_end[$r] .=' WHERE 1 = 1';
-		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('ticket').')';
+		$this->export_sql_end[$r] .= ' WHERE 1 = 1';
+		$this->export_sql_end[$r] .= ' AND t.entity IN ('.getEntity('ticket').')';
 		$r++;
 	}
 
@@ -397,7 +398,7 @@ class modTicket extends DolibarrModules
 			// remove old settings
 			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'TICKET_ADDON_PDF_ODT_PATH' AND type = 'ticket' AND entity = ".((int) $conf->entity),
 			// activate default odt templates
-			array("sql" =>"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, libelle, entity, description) VALUES('generic_ticket_odt','ticket','ODT templates',".((int) $conf->entity).",'TICKET_ADDON_PDF_ODT_PATH');", "ignoreerror" =>1),
+			array("sql" => "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, libelle, entity, description) VALUES('generic_ticket_odt','ticket','ODT templates',".((int) $conf->entity).",'TICKET_ADDON_PDF_ODT_PATH');", "ignoreerror" => 1),
 		);
 
 		return $this->_init($sql, $options);

From 42de0761a2e6d41f39ed41a3152e3b0d5cb17a1d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:05 +0100
Subject: [PATCH 1173/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modWebPortal.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modWebPortal.class.php b/htdocs/core/modules/modWebPortal.class.php
index 99f31d1907f..355c383c324 100644
--- a/htdocs/core/modules/modWebPortal.class.php
+++ b/htdocs/core/modules/modWebPortal.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024  	Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024		Lionel Vessiller		<lvessiller@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -278,7 +279,7 @@ class modWebPortal extends DolibarrModules
 
 		// Main menu entries to add
 		$this->menu = array();
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		// Add here entries to declare new menus
 		/*
 		$this->menu[$r++] = array(

From b08ea1cffab41842c442326d335a5f36a7cc559a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:08 +0100
Subject: [PATCH 1174/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modWorkflow.class.php | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index becde5af45c..08f02c03b6a 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010		Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -83,18 +84,18 @@ class modWorkflow extends DolibarrModules
 		$this->const = array(
 			//0=>array('WORKFLOW_PROPAL_AUTOCREATE_ORDER', 'chaine', '1', 'WORKFLOW_PROPAL_AUTOCREATE_ORDER', 0, 'current', 0),
 			//0=>array('WORKFLOW_ORDER_AUTOCREATE_INVOICE', 'chaine', '1', 'WORKFLOW_ORDER_AUTOCREATE_INVOICE', 0, 'current', 0),
-			0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
-			1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
-			2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
-			3=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 0, 'current', 0),
-			4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
-			5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
-			6=>array('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION', 0, 'current', 0),
-			7=>array('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED', 0, 'current', 0),
-			8=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
-			10=>array('WORKFLOW_TICKET_LINK_CONTRACT', 'chaine', '0', 'Automatically link a ticket to available contracts', 0, 'current', 0),
-			11=>array('WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS', 'chaine', '0', 'Search among parent companies contracts when automatically linking a ticket to available contracts', 0, 'current', 0),
-			12=>array('WORKFLOW_TICKET_CREATE_INTERVENTION', 'chaine', '0', 'WORKFLOW_TICKET_CREATE_INTERVENTION', 0, 'current', 0)
+			0 => array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
+			1 => array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
+			2 => array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
+			3 => array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 0, 'current', 0),
+			4 => array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
+			5 => array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
+			6 => array('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION', 0, 'current', 0),
+			7 => array('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED', 0, 'current', 0),
+			8 => array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
+			10 => array('WORKFLOW_TICKET_LINK_CONTRACT', 'chaine', '0', 'Automatically link a ticket to available contracts', 0, 'current', 0),
+			11 => array('WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS', 'chaine', '0', 'Search among parent companies contracts when automatically linking a ticket to available contracts', 0, 'current', 0),
+			12 => array('WORKFLOW_TICKET_CREATE_INTERVENTION', 'chaine', '0', 'WORKFLOW_TICKET_CREATE_INTERVENTION', 0, 'current', 0)
 		);
 
 		// Boxes
@@ -115,7 +116,7 @@ class modWorkflow extends DolibarrModules
 
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
-		$r = 0;
+		$r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/*
 		$this->menu[$r]=array('fk_menu'=>0,
 								'type'=>'top',

From 409f7e0268eda5826ad61d013184c7b6d3cd6bf5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:10 +0100
Subject: [PATCH 1175/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/modWorkstation.class.php | 83 ++++++++++----------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index 8fa1503a1ae..822f5d4d055 100644
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020 		Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -241,66 +242,66 @@ class modWorkstation extends DolibarrModules
 		$this->menu = array();
 		$r = 0;
 		// Add here entries to declare new menus
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=mrp',
+			'fk_menu' => 'fk_mainmenu=mrp',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'Workstations',
+			'type' => 'left',
+			'titre' => 'Workstations',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-			'mainmenu'=>'mrp',
-			'leftmenu'=>'workstation_workstation',
-			'url'=>'',
+			'mainmenu' => 'mrp',
+			'leftmenu' => 'workstation_workstation',
+			'url' => '',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'mrp',
-			'position'=>1100+$r,
+			'langs' => 'mrp',
+			'position' => 1100 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->workstation->enabled',
+			'enabled' => '$conf->workstation->enabled',
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->workstation->workstation->read',
-			'target'=>'',
+			'perms' => '$user->rights->workstation->workstation->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2,
+			'user' => 2,
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
+			'fk_menu' => 'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'WorkstationCreate',
-			'mainmenu'=>'mrp',
-			'leftmenu'=>'workstation_workstation_left_create',
-			'url'=>'/workstation/workstation_card.php?action=create',
+			'type' => 'left',
+			'titre' => 'WorkstationCreate',
+			'mainmenu' => 'mrp',
+			'leftmenu' => 'workstation_workstation_left_create',
+			'url' => '/workstation/workstation_card.php?action=create',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'mrp',
-			'position'=>1100+$r,
+			'langs' => 'mrp',
+			'position' => 1100 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->workstation->enabled',
+			'enabled' => '$conf->workstation->enabled',
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->workstation->workstation->write',
-			'target'=>'',
+			'perms' => '$user->rights->workstation->workstation->write',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2
+			'user' => 2
 		);
-		$this->menu[$r++]=array(
+		$this->menu[$r++] = array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
+			'fk_menu' => 'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
 			// This is a Left menu entry
-			'type'=>'left',
-			'titre'=>'List',
-			'mainmenu'=>'mrp',
-			'leftmenu'=>'workstation_workstation_left_list',
-			'url'=>'/workstation/workstation_list.php',
+			'type' => 'left',
+			'titre' => 'List',
+			'mainmenu' => 'mrp',
+			'leftmenu' => 'workstation_workstation_left_list',
+			'url' => '/workstation/workstation_list.php',
 			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'langs'=>'mrp',
-			'position'=>1101+$r,
+			'langs' => 'mrp',
+			'position' => 1101 + $r,
 			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'enabled'=>'$conf->workstation->enabled',
+			'enabled' => '$conf->workstation->enabled',
 			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-			'perms'=>'$user->rights->workstation->workstation->read',
-			'target'=>'',
+			'perms' => '$user->rights->workstation->workstation->read',
+			'target' => '',
 			// 0=Menu for internal users, 1=external users, 2=both
-			'user'=>2
+			'user' => 2
 		);
 
 		/* END MODULEBUILDER LEFTMENU WORKSTATION */
@@ -336,7 +337,7 @@ class modWorkstation extends DolibarrModules
 		/* END MODULEBUILDER EXPORT WORKSTATION */
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 1;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		/* BEGIN MODULEBUILDER IMPORT WORKSTATION */
 		/*
 		 $langs->load("workstation@workstation");
@@ -390,7 +391,7 @@ class modWorkstation extends DolibarrModules
 		// Document templates
 		$moduledir = 'workstation';
 		$myTmpObjects = array();
-		$myTmpObjects['Workstation'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['Workstation'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'Workstation') {

From c247c8bca8fc268d1c4eef3c633ca04e3eec58fb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:13 +0100
Subject: [PATCH 1176/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/movement/doc/pdf_standard.modules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 8b5fd2e39bd..e6d6645d8b2 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 	Laurent Destailleur <eldy@stocks.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -291,7 +292,7 @@ class pdf_standard extends ModelePDFMovement
 		// Add where from extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 		// Add where from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -446,7 +447,6 @@ class pdf_standard extends ModelePDFMovement
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
-					$i = 0;
 					$nblines = $num;
 					for ($i = 0; $i < $nblines; $i++) {
 						$objp = $this->db->fetch_object($resql);

From 3da05238906d0c720e4acfbf95f2a139717507a6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:15 +0100
Subject: [PATCH 1177/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index d0bc9d30e16..644808826d5 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -34,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'
  */
 class mod_codeproduct_elephant extends ModeleProductCode
 {
-
 	// variables inherited from ModelProductCode class
 	public $name = 'Elephant';
 	public $version = 'dolibarr';
@@ -256,7 +256,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		} else {

From a0bbf04d746c207c5e41315220b8da21a9a0c85d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:17 +0100
Subject: [PATCH 1178/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/product/mod_codeproduct_leopard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 921f2a2617f..126527a55bf 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -115,7 +116,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		}

From c66c59f1460118299f4a4df95957decdd56b0cc9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:19 +0100
Subject: [PATCH 1179/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/product_batch/mod_lot_advanced.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php
index c455b639022..9cf186afc11 100644
--- a/htdocs/core/modules/product_batch/mod_lot_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Christophe Battarel			<christophe@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 @@ class mod_lot_advanced extends ModeleNumRefBatch
 			$res = $product->fetch($object->fk_product);
 			if ($res > 0 && !empty($product->batch_mask)) {
 				$mask = $product->batch_mask;
-				$filter = '';
+				$filter = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			}
 		}
 

From accbf347d1df882590df59e4d1f50c9d808eb6f0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:21 +0100
Subject: [PATCH 1180/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/product_batch/mod_sn_advanced.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index dd3ec1df88e..f3e2a71398e 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Christophe Battarel			<christophe@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -151,7 +152,7 @@ class mod_sn_advanced extends ModeleNumRefBatch
 			$res = $product->fetch($object->fk_product);
 			if ($res > 0 && !empty($product->batch_mask)) {
 				$mask = $product->batch_mask;
-				$filter = '';
+				$filter = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 			}
 		}
 

From ce85da498c01aecb3a0083b604fc85b64af659a7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:24 +0100
Subject: [PATCH 1181/1862] Fix PhanPluginRedundantAssignment

---
 .../task/doc/doc_generic_task_odt.modules.php | 126 +++++++++---------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index c070f29ce02..06ef3a02cc7 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -149,18 +149,18 @@ class doc_generic_task_odt extends ModelePDFTask
 		}
 
 		$resarray = array(
-			$array_key.'_id'=>$object->id,
-			$array_key.'_ref'=>$object->ref,
-			$array_key.'_title'=>$object->title,
-			$array_key.'_description'=>$object->description,
-			$array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
-			$array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
-			$array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
-			$array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
-			$array_key.'_note_private'=>$object->note_private,
-			$array_key.'_note_public'=>$object->note_public,
-			$array_key.'_public'=>$object->public,
-			$array_key.'_statut'=>$object->getLibStatut()
+			$array_key.'_id' => $object->id,
+			$array_key.'_ref' => $object->ref,
+			$array_key.'_title' => $object->title,
+			$array_key.'_description' => $object->description,
+			$array_key.'_date_creation' => dol_print_date($object->date_c, 'day'),
+			$array_key.'_date_modification' => dol_print_date($object->date_m, 'day'),
+			$array_key.'_date_start' => dol_print_date($object->date_start, 'day'),
+			$array_key.'_date_end' => dol_print_date($object->date_end, 'day'),
+			$array_key.'_note_private' => $object->note_private,
+			$array_key.'_note_public' => $object->note_public,
+			$array_key.'_public' => $object->public,
+			$array_key.'_statut' => $object->getLibStatut()
 		);
 
 		// Retrieve extrafields
@@ -188,23 +188,23 @@ class doc_generic_task_odt extends ModelePDFTask
 		global $extrafields;
 
 		$resarray = array(
-			'task_ref'=>$task->ref,
-			'task_fk_project'=>$task->fk_project,
-			'task_projectref'=>$task->projectref,
-			'task_projectlabel'=>$task->projectlabel,
-			'task_label'=>$task->label,
-			'task_description'=>$task->description,
-			'task_fk_parent'=>$task->fk_task_parent,
-			'task_duration'=>$task->duration_effective,
-			'task_duration_formated'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
-			'task_planned_workload'=>$task->planned_workload,
-			'task_planned_workload_formated'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
-			'task_progress'=>$task->progress,
-			'task_public'=>$task->public,
-			'task_date_start'=>dol_print_date($task->date_start, 'day'),
-			'task_date_end'=>dol_print_date($task->date_end, 'day'),
-			'task_note_private'=>$task->note_private,
-			'task_note_public'=>$task->note_public
+			'task_ref' => $task->ref,
+			'task_fk_project' => $task->fk_project,
+			'task_projectref' => $task->projectref,
+			'task_projectlabel' => $task->projectlabel,
+			'task_label' => $task->label,
+			'task_description' => $task->description,
+			'task_fk_parent' => $task->fk_task_parent,
+			'task_duration' => $task->duration_effective,
+			'task_duration_formated' => convertSecondToTime($task->duration_effective, 'allhourmin'),
+			'task_planned_workload' => $task->planned_workload,
+			'task_planned_workload_formated' => convertSecondToTime($task->planned_workload, 'allhourmin'),
+			'task_progress' => $task->progress,
+			'task_public' => $task->public,
+			'task_date_start' => dol_print_date($task->date_start, 'day'),
+			'task_date_end' => dol_print_date($task->date_end, 'day'),
+			'task_note_private' => $task->note_private,
+			'task_note_public' => $task->note_public
 		);
 
 		// Retrieve extrafields
@@ -229,14 +229,14 @@ class doc_generic_task_odt extends ModelePDFTask
 	{
 		// phpcs:enable
 		return array(
-			'projcontacts_id'=>$contact['id'],
-			'projcontacts_rowid'=>$contact['rowid'],
-			'projcontacts_role'=>$contact['libelle'],
-			'projcontacts_lastname'=>$contact['lastname'],
-			'projcontacts_firstname'=>$contact['firstname'],
-			'projcontacts_fullcivname'=>$contact['fullname'],
-			'projcontacts_socname'=>$contact['socname'],
-			'projcontacts_email'=>$contact['email']
+			'projcontacts_id' => $contact['id'],
+			'projcontacts_rowid' => $contact['rowid'],
+			'projcontacts_role' => $contact['libelle'],
+			'projcontacts_lastname' => $contact['lastname'],
+			'projcontacts_firstname' => $contact['firstname'],
+			'projcontacts_fullcivname' => $contact['fullname'],
+			'projcontacts_socname' => $contact['socname'],
+			'projcontacts_email' => $contact['email']
 		);
 	}
 
@@ -252,9 +252,9 @@ class doc_generic_task_odt extends ModelePDFTask
 	{
 		// phpcs:enable
 		return array(
-			'projfile_name'=>$file['name'],
-			'projfile_date'=>dol_print_date($file['date'], 'day'),
-			'projfile_size'=>$file['size']
+			'projfile_name' => $file['name'],
+			'projfile_date' => dol_print_date($file['date'], 'day'),
+			'projfile_size' => $file['size']
 		);
 	}
 
@@ -270,13 +270,13 @@ class doc_generic_task_odt extends ModelePDFTask
 	{
 		// phpcs:enable
 		return array(
-			'projref_type'=>$refdetail['type'],
-			'projref_ref'=>$refdetail['ref'],
-			'projref_date'=>dol_print_date($refdetail['date'], 'day'),
-			'projref_socname'=>$refdetail['socname'],
-			'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
-			'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
-			'projref_status'=>$refdetail['status']
+			'projref_type' => $refdetail['type'],
+			'projref_ref' => $refdetail['ref'],
+			'projref_date' => dol_print_date($refdetail['date'], 'day'),
+			'projref_socname' => $refdetail['socname'],
+			'projref_amountht' => price($refdetail['amountht'], 0, $outputlangs),
+			'projref_amountttc' => price($refdetail['amountttc'], 0, $outputlangs),
+			'projref_status' => $refdetail['status']
 		);
 	}
 
@@ -318,14 +318,14 @@ class doc_generic_task_odt extends ModelePDFTask
 		global $conf;
 
 		return array(
-		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'], 'day'),
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'], 'all'),
-		'tasktime_note'=>$tasktime['note'],
-		'tasktime_fk_user'=>$tasktime['fk_user'],
-		'tasktime_user_name'=>$tasktime['name'],
-		'tasktime_user_first'=>$tasktime['firstname'],
-		'tasktime_fullcivname'=>$tasktime['fullcivname']
+		'tasktime_rowid' => $tasktime['rowid'],
+		'tasktime_task_date' => dol_print_date($tasktime['task_date'], 'day'),
+		'tasktime_task_duration' => convertSecondToTime($tasktime['task_duration'], 'all'),
+		'tasktime_note' => $tasktime['note'],
+		'tasktime_fk_user' => $tasktime['fk_user'],
+		'tasktime_user_name' => $tasktime['name'],
+		'tasktime_user_first' => $tasktime['firstname'],
+		'tasktime_fullcivname' => $tasktime['fullcivname']
 		);
 	}
 
@@ -341,9 +341,9 @@ class doc_generic_task_odt extends ModelePDFTask
 	{
 		// phpcs:enable
 		return array(
-			'tasksfile_name'=>$file['name'],
-			'tasksfile_date'=>dol_print_date($file['date'], 'day'),
-			'tasksfile_size'=>$file['size']
+			'tasksfile_name' => $file['name'],
+			'tasksfile_date' => dol_print_date($file['date'], 'day'),
+			'tasksfile_size' => $file['size']
 		);
 	}
 
@@ -538,7 +538,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				// Call the ODTSubstitution hook
 				$tmparray = array();
 				$action = '';
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$parameters = array('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
 
 				// Open and load template
@@ -765,7 +765,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 
 				// Replace tags of lines for contacts
-				$sourcearray = array('internal', 'external');
+				$sourcearray = array('internal', 'external');  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				$contact_arrray = array();
 				foreach ($sourcearray as $source) {
 					$contact_temp = $project->liste_contact(-1, $source);
@@ -815,7 +815,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 
 				// Call the beforeODTSave hook
-				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray);
 				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 
@@ -837,14 +837,14 @@ class doc_generic_task_odt extends ModelePDFTask
 						return -1;
 					}
 				}
-				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				dolChmod($file);
 
 				$odfHandler = null; // Destroy object
 
-				$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath' => $file);
 
 				return 1; // Success
 			} else {

From 6629c823e8573c99437fd1d852e429258ae6d55b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:26 +0100
Subject: [PATCH 1182/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index c0787d83fe9..f83ec00dc77 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013-2018 Philippe Grand      	<philippe.grand@atoo-net.com>
  * Copyright (C) 2020-2024	Frédéric France		<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -35,7 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
  */
 class mod_codeclient_elephant extends ModeleThirdPartyCode
 {
-
 	// variables inherited from ModeleThirdPartyCode class
 	public $name = 'Elephant';
 	public $version = 'dolibarr';
@@ -277,7 +277,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		} else {

From 259faedafe11d3299ff219902120ede94404c457 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:28 +0100
Subject: [PATCH 1183/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/core/modules/societe/mod_codeclient_leopard.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 4d4870a3f35..98343987765 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -118,7 +119,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 		$code = trim($code);
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		}

From a35efb0b8b692b59ae217e38833048c07475a3a9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:30 +0100
Subject: [PATCH 1184/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 7c9457bd904..9019ff44d29 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2007	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -33,7 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
  */
 class mod_codeclient_monkey extends ModeleThirdPartyCode
 {
-
 	// variables inherited from ModeleThirdPartyCode class
 	public $name = 'Monkey';
 	public $version = 'dolibarr';
@@ -164,7 +164,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		$code = strtoupper(trim($code));
 
 		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		} else {
@@ -173,7 +173,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 				if ($is_dispo != 0) {
 					$result = -3;
 				} else {
-					$result = 0;
+					$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				}
 			} else {
 				if (dol_strlen($code) == 0) {
@@ -242,7 +242,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (dol_strlen($code) < 11) {
 			$res = -1;
 		} else {
-			$res = 0;
+			$res = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		return $res;
 	}

From a604e446f1414d97357e13d61bfaef11d9cb5642 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:32 +0100
Subject: [PATCH 1185/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 09247f96fd3..faada7164ef 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017 	Laurent Destailleur <eldy@stocks.sourceforge.net>
  * Copyright (C) 2022 	Ferran Marcet <fmarcet@2byte.es>
  * Copyright (C) 2022 	Nicolas Silobre <nsilobre@ns-info90.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -257,7 +258,6 @@ class pdf_standard extends ModelePDFStock
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
-					$i = 0;
 					$nblines = $num;
 
 					$nexY = $tab_top + $this->tabTitleHeight;

From cf778e9da8629455735e31f49e371f1501b39794 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:35 +0100
Subject: [PATCH 1186/1862] Fix PhanPluginRedundantAssignment

---
 .../core/triggers/interface_50_modTicket_TicketEmail.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 273b560fa27..3610fdf840a 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014-2016  Jean-François Ferry	<hello@librethic.io>
  * 				 2016       Christophe Battarel <christophe@altairis.fr>
  * Copyright (C) 2023		Benjamin Falière	<benjamin.faliere@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -265,7 +266,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 							$error_msg = $langs->trans('Error'). ': ';
 							$error_msg .= $langs->transnoentities('TicketWrongContact');
 							setEventMessages($error_msg, [], 'errors');
-							$ok = 0;
+							$ok = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 							break;
 						}
 					}

From af5816f3444b2d8e46b606f05e7aa9d40727a1e9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:37 +0100
Subject: [PATCH 1187/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a1be6fa35f8..7f7511db38f 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1361,7 +1361,7 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			if ($this->db->query($sql)) {
-				$result = 0;
+				$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 				if ($error == 0) {
 					// Call trigger
@@ -1413,7 +1413,7 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
 			if ($this->db->query($sql)) {
-				$result = 0;
+				$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_CANCEL', $user);

From a997447ce387e939d1ace44968390b480a3f8fe5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:39 +0100
Subject: [PATCH 1188/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 39fcd70e101..2ac0eb78ccf 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -1575,7 +1575,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
@@ -1594,7 +1594,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
@@ -1613,7 +1613,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
@@ -1635,7 +1635,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$statusType = 'status6';
 					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$statusType = 'status0';
+					$statusType = 'status0';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}

From 63b2768229fabb943a90013d1c5e51b7e25308a7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:41 +0100
Subject: [PATCH 1189/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index c12032028e6..34ef7b9c9e9 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2016       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1306,7 +1307,7 @@ class Holiday extends CommonObject
 				}
 
 				// We found a record, user is on holiday by default, so is not available is true.
-				$isavailablemorning = true;
+				$isavailablemorning = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				foreach ($arrayofrecord as $record) {
 					if ($timestamp == $record['date_start'] && $record['halfday'] == 2) {
 						continue;
@@ -1317,7 +1318,7 @@ class Holiday extends CommonObject
 					$isavailablemorning = false;
 					break;
 				}
-				$isavailableafternoon = true;
+				$isavailableafternoon = true;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				foreach ($arrayofrecord as $record) {
 					if ($timestamp == $record['date_end'] && $record['halfday'] == 2) {
 						continue;

From 9c6394b996a68700e6dc61baa553cd47f322c0e0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:43 +0100
Subject: [PATCH 1190/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/install/step1.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index ffd1ff7b54e..85e77bbbd79 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -951,67 +952,67 @@ function write_conf_file($conffile)
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_FPDF_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_FPDF_PATH = '';
+			$force_dolibarr_lib_FPDF_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_FPDF_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDF_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_TCPDF_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_TCPDF_PATH = '';
+			$force_dolibarr_lib_TCPDF_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_TCPDF_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDF_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_FPDI_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_FPDI_PATH = '';
+			$force_dolibarr_lib_FPDI_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_FPDI_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDI_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_TCPDI_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_TCPDI_PATH = '';
+			$force_dolibarr_lib_TCPDI_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_TCPDI_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDI_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_GEOIP_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_GEOIP_PATH = '';
+			$force_dolibarr_lib_GEOIP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_GEOIP_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_GEOIP_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_NUSOAP_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_NUSOAP_PATH = '';
+			$force_dolibarr_lib_NUSOAP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_NUSOAP_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_NUSOAP_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_ODTPHP_PATH)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_ODTPHP_PATH = '';
+			$force_dolibarr_lib_ODTPHP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_ODTPHP_PATH="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATH)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) {
 			fwrite($fp, '//');
-			$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';
+			$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP="'.dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)).'";');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_js_CKEDITOR)) {
 			fwrite($fp, '//');
-			$force_dolibarr_js_CKEDITOR = '';
+			$force_dolibarr_js_CKEDITOR = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_js_CKEDITOR=\''.dol_escape_php($force_dolibarr_js_CKEDITOR, 1).'\';');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_js_JQUERY)) {
 			fwrite($fp, '//');
-			$force_dolibarr_js_JQUERY = '';
+			$force_dolibarr_js_JQUERY = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_js_JQUERY=\''.dol_escape_php($force_dolibarr_js_JQUERY, 1).'\';');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_js_JQUERY_UI)) {
 			fwrite($fp, '//');
-			$force_dolibarr_js_JQUERY_UI = '';
+			$force_dolibarr_js_JQUERY_UI = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_js_JQUERY_UI=\''.dol_escape_php($force_dolibarr_js_JQUERY_UI, 1).'\';');
 		fwrite($fp, "\n");
@@ -1020,13 +1021,13 @@ function write_conf_file($conffile)
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) {
 			fwrite($fp, '//');
-			$force_dolibarr_font_DOL_DEFAULT_TTF = '';
+			$force_dolibarr_font_DOL_DEFAULT_TTF = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF, 1).'\';');
 		fwrite($fp, "\n");
 		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) {
 			fwrite($fp, '//');
-			$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';
+			$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 		fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD, 1).'\';');
 		fwrite($fp, "\n");

From b3efdbbd5f00bbd626635aaa889ffc7f6c27659f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:46 +0100
Subject: [PATCH 1191/1862] Fix PhanPluginRedundantAssignment

---
 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 b334168357a..6fc00d524ac 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3453,7 +3453,7 @@ function main_area($title = '')
 
 	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
 	if (getDolGlobalString('SHOW_SOCINFO_ON_PRINT') && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'aZ09'))) {
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
 		if (empty($reshook)) {
 			print '<!-- Begin show mysoc info header -->'."\n";
@@ -3839,7 +3839,7 @@ if (!function_exists("llxFooter")) {
 			}
 		}
 
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('beforeBodyClose', $parameters); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			print $hookmanager->resPrint;

From c90d856d6c0ef10f3c986ed80168989c7dd84da0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:48 +0100
Subject: [PATCH 1192/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 96c1ce01069..c124d0b7220 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1170,7 +1170,7 @@ class Product extends CommonObject
 			$result = $this->verify(); // We don't check when update called during a create because verify was already done
 		} else {
 			// we can continue
-			$result = 0;
+			$result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 
 		if ($result >= 0) {
@@ -2335,9 +2335,6 @@ class Product extends CommonObject
 		if (empty($newminprice)) {
 			$newminprice = 0;
 		}
-		if (empty($newminprice)) {
-			$newminprice = 0;
-		}
 
 		// Check parameters
 		if ($newvat == '') {

From 9053c0c7c081785ae6d291e21cb2aef60155715a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:50 +0100
Subject: [PATCH 1193/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f1a2e943cf7..1d7a78e3a13 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -5154,7 +5154,6 @@ class Societe extends CommonObject
 
 		$this->db->begin();
 
-		$field = 'accountancy_code_sell';
 		if ($type == 'buy') {
 			$field = 'accountancy_code_buy';
 		} elseif ($type == 'sell') {

From e7d378055f371000864d3c21176f07fa65aca5f8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:52 +0100
Subject: [PATCH 1194/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 0769e98d05e..778bd6ef730 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3082,7 +3082,7 @@ class Ticket extends CommonObject
 			if ($mode == 'opened') {
 				$status = 'openall';
 				//$delay_warning = $conf->ticket->warning_delay;
-				$delay_warning = 0;
+				$delay_warning = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 				$label = $langs->trans("MenuListNonClosed");
 				$labelShort = $langs->trans("MenuListNonClosed");
 			}

From 8c08c6d483943513e2ac407aa8d4345decccd9f2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:54 +0100
Subject: [PATCH 1195/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index ac40da2c6df..230344118c6 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2020   Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -446,8 +447,6 @@ class Users extends DolibarrApi
 			throw new RestException(403);
 		}
 
-		$obj_ret = array();
-
 		$user = new User($this->db);
 		$result = $user->fetch($id);
 		if (!$result) {

From 17a0ee081071cbbc7928ec82aa46cda42bd84d2f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:56 +0100
Subject: [PATCH 1196/1862] Fix PhanPluginRedundantAssignment

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index fd6b5d6dc3a..c68c602bdbb 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3092,7 +3092,7 @@ class User extends CommonObject
 
 		if ($option == 'xxx') {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
-			$linkend = '</a>';
+			$linkend = '</a>';  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		}
 
 		if ($option == 'nolink') {

From a8e678128855cf14f8e9eac310e33ad5b41d0bb1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:32:58 +0100
Subject: [PATCH 1197/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/webportal/class/html.formlistwebportal.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php
index 524c4e99548..ac7fc81679b 100644
--- a/htdocs/webportal/class/html.formlistwebportal.class.php
+++ b/htdocs/webportal/class/html.formlistwebportal.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
  * Copyright (C) 2023-2024	Patrice Andreani		<pandreani@easya.solutions>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -300,7 +301,7 @@ class FormListWebPortal
 
 		$sql .= " FROM " . $this->db->prefix() . $object->table_element . " as t";
 		// Add table from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 		if ($object->ismultientitymanaged == 1) {
@@ -343,7 +344,7 @@ class FormListWebPortal
 		//    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 		//}
 		// Add where from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 
@@ -422,7 +423,7 @@ class FormListWebPortal
 			}
 		}
 		// Add $param from hooks
-		$parameters = array();
+		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$param .= $hookmanager->resPrint;
 

From 217dc729671f78abd383b2662aca86e38de5689d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:33:01 +0100
Subject: [PATCH 1198/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/webservices/server_category.php | 79 +++++++++++++-------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index 6e3e66bc205..a062c5c9361 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      JF FERRY             <jfefe@aternatik.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -77,11 +78,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'password' => array('name'=>'password', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+		'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'password' => array('name' => 'password', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
 	)
 );
 
@@ -95,16 +96,16 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'id' => array('name'=>'id', 'type'=>'xsd:string'),
-		'id_mere' => array('name'=>'id_mere', 'type'=>'xsd:string'),
-		'label' => array('name'=>'label', 'type'=>'xsd:string'),
-		'description' => array('name'=>'description', 'type'=>'xsd:string'),
-		'socid' => array('name'=>'socid', 'type'=>'xsd:string'),
-		'type' => array('name'=>'type', 'type'=>'xsd:string'),
-		'visible' => array('name'=>'visible', 'type'=>'xsd:string'),
-		'dir'=> array('name'=>'dir', 'type'=>'xsd:string'),
-		'photos' => array('name'=>'photos', 'type'=>'tns:PhotosArray'),
-		'filles' => array('name'=>'filles', 'type'=>'tns:FillesArray')
+		'id' => array('name' => 'id', 'type' => 'xsd:string'),
+		'id_mere' => array('name' => 'id_mere', 'type' => 'xsd:string'),
+		'label' => array('name' => 'label', 'type' => 'xsd:string'),
+		'description' => array('name' => 'description', 'type' => 'xsd:string'),
+		'socid' => array('name' => 'socid', 'type' => 'xsd:string'),
+		'type' => array('name' => 'type', 'type' => 'xsd:string'),
+		'visible' => array('name' => 'visible', 'type' => 'xsd:string'),
+		'dir' => array('name' => 'dir', 'type' => 'xsd:string'),
+		'photos' => array('name' => 'photos', 'type' => 'tns:PhotosArray'),
+		'filles' => array('name' => 'filles', 'type' => 'tns:FillesArray')
 	)
 );
 
@@ -119,14 +120,14 @@ $server->wsdl->addComplexType(
 	'SOAP-ENC:Array',
 	array(),
 	array(
-		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:categorie[]')
+		array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:categorie[]')
 	),
 	'tns:categorie'
 );
 
- /*
-  * Image of product
- */
+/*
+ * Image of product
+*/
 $server->wsdl->addComplexType(
 	'PhotosArray',
 	'complexType',
@@ -143,9 +144,9 @@ $server->wsdl->addComplexType(
 		)
 );
 
- /*
-  * An image
- */
+/*
+ * An image
+*/
 $server->wsdl->addComplexType(
 	'image',
 	'complexType',
@@ -153,10 +154,10 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-				'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
-				'photo_vignette' => array('name'=>'photo_vignette', 'type'=>'xsd:string'),
-				'imgWidth' => array('name'=>'imgWidth', 'type'=>'xsd:string'),
-				'imgHeight' => array('name'=>'imgHeight', 'type'=>'xsd:string')
+				'photo' => array('name' => 'photo', 'type' => 'xsd:string'),
+				'photo_vignette' => array('name' => 'photo_vignette', 'type' => 'xsd:string'),
+				'imgWidth' => array('name' => 'imgWidth', 'type' => 'xsd:string'),
+				'imgHeight' => array('name' => 'imgHeight', 'type' => 'xsd:string')
 		)
 );
 
@@ -170,8 +171,8 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+		'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+		'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 	)
 );
 
@@ -187,9 +188,9 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getCategory',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'categorie'=>'tns:categorie'),
+	array('result' => 'tns:result', 'categorie' => 'tns:categorie'),
 	$ns,
 	$ns.'#getCategory',
 	$styledoc,
@@ -232,7 +233,7 @@ function getCategory($authentication, $id)
 	if (!$error) {
 		$fuser->getrights();
 
-		$nbmax = 10;
+		$nbmax = 10;  // @phan-suppress-current-line PhanPluginRedundantAssignment
 		if ($fuser->hasRight('categorie', 'lire')) {
 			$categorie = new Categorie($db);
 			$result = $categorie->fetch($id);
@@ -260,13 +261,13 @@ function getCategory($authentication, $id)
 						$pdir = get_exdir($child_cat->id, 2, 0, 0, $categorie, 'category').$child_cat->id."/photos/";
 						$dir = $dir.'/'.$pdir;
 						$cat['filles'][] = array(
-							'id'=>$child_cat->id,
+							'id' => $child_cat->id,
 							'id_mere' => $categorie->id_mere,
-							'label'=>$child_cat->label,
-							'description'=>$child_cat->description,
-							'socid'=>$child_cat->socid,
+							'label' => $child_cat->label,
+							'description' => $child_cat->description,
+							'socid' => $child_cat->socid,
 							//'visible'=>$child_cat->visible,
-							'type'=>$child_cat->type,
+							'type' => $child_cat->type,
 							'dir' => $pdir,
 							'photos' => $child_cat->liste_photos($dir, $nbmax)
 						);
@@ -275,8 +276,8 @@ function getCategory($authentication, $id)
 
 				// Create
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'categorie'=> $cat
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'categorie' => $cat
 				);
 			} else {
 				$error++;
@@ -291,7 +292,7 @@ function getCategory($authentication, $id)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;

From 2b9a416dfd1145e5c1a03e062f49f2eb344ff56b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:33:04 +0100
Subject: [PATCH 1199/1862] Fix PhanPluginRedundantAssignment

---
 htdocs/webservices/server_user.php | 184 ++++++++++++++---------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 52267436a8d..b0f7f2372fd 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,11 +82,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'password' => array('name'=>'password', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+		'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'password' => array('name' => 'password', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
 	)
 );
 
@@ -97,8 +98,8 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+		'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+		'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 	)
 );
 
@@ -110,34 +111,34 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'element' => array('name'=>'element', 'type'=>'xsd:string'),
-		'id' => array('name'=>'id', 'type'=>'xsd:string'),
-		'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
-		'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
-		'note' => array('name'=>'note', 'type'=>'xsd:string'),
-		'email' => array('name'=>'email', 'type'=>'xsd:string'),
-		'signature' => array('name'=>'signature', 'type'=>'xsd:string'),
-		'office_phone' => array('name'=>'office_phone', 'type'=>'xsd:string'),
-		'office_fax' => array('name'=>'office_fax', 'type'=>'xsd:string'),
-		'user_mobile' => array('name'=>'user_mobile', 'type'=>'xsd:string'),
-		'admin' => array('name'=>'admin', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-		'pass_indatabase' => array('name'=>'pass_indatabase', 'type'=>'xsd:string'),
-		'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted', 'type'=>'xsd:string'),
-		'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
-		'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
-		'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:string'),
-		'fk_contact' => array('name'=>'fk_contact', 'type'=>'xsd:string'),
-		'fk_member' => array('name'=>'fk_member', 'type'=>'xsd:string'),
-		'datelastlogin' => array('name'=>'datelastlogin', 'type'=>'xsd:dateTime'),
-		'datepreviouslogin' => array('name'=>'datepreviouslogin', 'type'=>'xsd:dateTime'),
-		'statut' => array('name'=>'statut', 'type'=>'xsd:string'),
-		'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
-		'lang' => array('name'=>'lang', 'type'=>'xsd:string'),
-		'entrepots' => array('name'=>'entrepots', 'type'=>'xsd:string'),
+		'element' => array('name' => 'element', 'type' => 'xsd:string'),
+		'id' => array('name' => 'id', 'type' => 'xsd:string'),
+		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
+		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+		'note' => array('name' => 'note', 'type' => 'xsd:string'),
+		'email' => array('name' => 'email', 'type' => 'xsd:string'),
+		'signature' => array('name' => 'signature', 'type' => 'xsd:string'),
+		'office_phone' => array('name' => 'office_phone', 'type' => 'xsd:string'),
+		'office_fax' => array('name' => 'office_fax', 'type' => 'xsd:string'),
+		'user_mobile' => array('name' => 'user_mobile', 'type' => 'xsd:string'),
+		'admin' => array('name' => 'admin', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
+		'pass_indatabase' => array('name' => 'pass_indatabase', 'type' => 'xsd:string'),
+		'pass_indatabase_crypted' => array('name' => 'pass_indatabase_crypted', 'type' => 'xsd:string'),
+		'datec' => array('name' => 'datec', 'type' => 'xsd:dateTime'),
+		'datem' => array('name' => 'datem', 'type' => 'xsd:dateTime'),
+		'fk_thirdparty' => array('name' => 'fk_thirdparty', 'type' => 'xsd:string'),
+		'fk_contact' => array('name' => 'fk_contact', 'type' => 'xsd:string'),
+		'fk_member' => array('name' => 'fk_member', 'type' => 'xsd:string'),
+		'datelastlogin' => array('name' => 'datelastlogin', 'type' => 'xsd:dateTime'),
+		'datepreviouslogin' => array('name' => 'datepreviouslogin', 'type' => 'xsd:dateTime'),
+		'statut' => array('name' => 'statut', 'type' => 'xsd:string'),
+		'photo' => array('name' => 'photo', 'type' => 'xsd:string'),
+		'lang' => array('name' => 'lang', 'type' => 'xsd:string'),
+		'entrepots' => array('name' => 'entrepots', 'type' => 'xsd:string'),
 		//'rights' => array('name'=>'rights','type'=>'xsd:string'),
-		'canvas' => array('name'=>'canvas', 'type'=>'xsd:string')
+		'canvas' => array('name' => 'canvas', 'type' => 'xsd:string')
 	)
 );
 
@@ -149,10 +150,10 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-	'name' => array('name'=>'name', 'type'=>'xsd:string'),
-	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-	'datec' => array('name'=>'datec', 'type'=>'xsd:string'),
-	'nb' => array('name'=>'nb', 'type'=>'xsd:string')
+	'name' => array('name' => 'name', 'type' => 'xsd:string'),
+	'id' => array('name' => 'id', 'type' => 'xsd:string'),
+	'datec' => array('name' => 'datec', 'type' => 'xsd:string'),
+	'nb' => array('name' => 'nb', 'type' => 'xsd:string')
 	)
 );
 
@@ -164,42 +165,42 @@ $server->wsdl->addComplexType(
 	'SOAP-ENC:Array',
 	array(),
 	array(
-	array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:group[]')
+	array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:group[]')
 	),
 	'tns:group'
 );
 
 $thirdpartywithuser_fields = array(
 	// For thirdparty and contact
-	'name' => array('name'=>'name', 'type'=>'xsd:string'),
-	'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
-	'name_thirdparty' => array('name'=>'name_thirdparty', 'type'=>'xsd:string'),
-	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-	'client' => array('name'=>'client', 'type'=>'xsd:string'),
-	'fournisseur' => array('name'=>'fournisseur', 'type'=>'xsd:string'),
-	'address' => array('name'=>'address', 'type'=>'xsd:string'),
-	'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
-	'town' => array('name'=>'town', 'type'=>'xsd:string'),
-	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-	'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
-	'phone_mobile' => array('name'=>'phone_mobile', 'type'=>'xsd:string'),
-	'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
-	'email' => array('name'=>'email', 'type'=>'xsd:string'),
-	'url' => array('name'=>'url', 'type'=>'xsd:string'),
-	'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
-	'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
-	'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
-	'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
-	'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
-	'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
-	'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
-	'tva_assuj' => array('name'=>'tva_assuj', 'type'=>'xsd:string'),
-	'tva_intra' => array('name'=>'tva_intra', 'type'=>'xsd:string'),
+	'name' => array('name' => 'name', 'type' => 'xsd:string'),
+	'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+	'name_thirdparty' => array('name' => 'name_thirdparty', 'type' => 'xsd:string'),
+	'ref_ext' => array('name' => 'ref_ext', 'type' => 'xsd:string'),
+	'client' => array('name' => 'client', 'type' => 'xsd:string'),
+	'fournisseur' => array('name' => 'fournisseur', 'type' => 'xsd:string'),
+	'address' => array('name' => 'address', 'type' => 'xsd:string'),
+	'zip' => array('name' => 'zip', 'type' => 'xsd:string'),
+	'town' => array('name' => 'town', 'type' => 'xsd:string'),
+	'country_id' => array('name' => 'country_id', 'type' => 'xsd:string'),
+	'country_code' => array('name' => 'country_code', 'type' => 'xsd:string'),
+	'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
+	'phone_mobile' => array('name' => 'phone_mobile', 'type' => 'xsd:string'),
+	'fax' => array('name' => 'fax', 'type' => 'xsd:string'),
+	'email' => array('name' => 'email', 'type' => 'xsd:string'),
+	'url' => array('name' => 'url', 'type' => 'xsd:string'),
+	'profid1' => array('name' => 'profid1', 'type' => 'xsd:string'),
+	'profid2' => array('name' => 'profid2', 'type' => 'xsd:string'),
+	'profid3' => array('name' => 'profid3', 'type' => 'xsd:string'),
+	'profid4' => array('name' => 'profid4', 'type' => 'xsd:string'),
+	'profid5' => array('name' => 'profid5', 'type' => 'xsd:string'),
+	'profid6' => array('name' => 'profid6', 'type' => 'xsd:string'),
+	'capital' => array('name' => 'capital', 'type' => 'xsd:string'),
+	'tva_assuj' => array('name' => 'tva_assuj', 'type' => 'xsd:string'),
+	'tva_intra' => array('name' => 'tva_intra', 'type' => 'xsd:string'),
 	// 	For user
-	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-	'password' => array('name'=>'password', 'type'=>'xsd:string'),
-	'group_id' => array('name'=>'group_id', 'type'=>'xsd:string')
+	'login' => array('name' => 'login', 'type' => 'xsd:string'),
+	'password' => array('name' => 'password', 'type' => 'xsd:string'),
+	'group_id' => array('name' => 'group_id', 'type' => 'xsd:string')
 );
 
 $elementtype = 'socpeople';
@@ -221,7 +222,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 			$type = 'xsd:string';
 		}
 
-		$extrafield_array['contact_options_'.$key] = array('name'=>'contact_options_'.$key, 'type'=>$type);
+		$extrafield_array['contact_options_'.$key] = array('name' => 'contact_options_'.$key, 'type' => $type);
 	}
 }
 
@@ -247,9 +248,9 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-	'login' => array('name'=>'login', 'type'=>'xsd:string'),
-	'password' => array('name'=>'password', 'type'=>'xsd:string'),
-	'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+	'login' => array('name' => 'login', 'type' => 'xsd:string'),
+	'password' => array('name' => 'password', 'type' => 'xsd:string'),
+	'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
 	)
 );
 
@@ -267,9 +268,9 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getUser',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'user'=>'tns:user'),
+	array('result' => 'tns:result', 'user' => 'tns:user'),
 	$ns,
 	$ns.'#getUser',
 	$styledoc,
@@ -280,9 +281,9 @@ $server->register(
 $server->register(
 	'getListOfGroups',
 	// Entry values
-	array('authentication'=>'tns:authentication'),
+	array('authentication' => 'tns:authentication'),
 	// Exit values
-	array('result'=>'tns:result', 'groups'=>'tns:GroupsArray'),
+	array('result' => 'tns:result', 'groups' => 'tns:GroupsArray'),
 	$ns,
 	$ns.'#getListOfGroups',
 	$styledoc,
@@ -293,9 +294,9 @@ $server->register(
 $server->register(
 	'createUserFromThirdparty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'thirdpartywithuser'=>'tns:thirdpartywithuser'),
+	array('authentication' => 'tns:authentication', 'thirdpartywithuser' => 'tns:thirdpartywithuser'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#createUserFromThirdparty',
 	$styledoc,
@@ -306,9 +307,9 @@ $server->register(
 $server->register(
 	'setUserPassword',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'shortuser'=>'tns:shortuser'),
+	array('authentication' => 'tns:authentication', 'shortuser' => 'tns:shortuser'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#setUserPassword',
 	$styledoc,
@@ -363,8 +364,8 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
 			if ($result > 0) {
 				// Create
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'user'=>array(
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'user' => array(
 						'id' => $user->id,
 						'lastname' => $user->lastname,
 						'firstname' => $user->firstname,
@@ -406,7 +407,7 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -454,7 +455,7 @@ function getListOfGroups($authentication)
 			$i = 0;
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
-				$arraygroups[] = array('id'=>$obj->rowid, 'name'=>$obj->name, 'datec'=>$obj->datec, 'nb'=>$obj->nb);
+				$arraygroups[] = array('id' => $obj->rowid, 'name' => $obj->name, 'datec' => $obj->datec, 'nb' => $obj->nb);
 				$i++;
 			}
 		} else {
@@ -466,13 +467,13 @@ function getListOfGroups($authentication)
 
 	if ($error) {
 		$objectresp = array(
-		'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-		'groups'=>$arraygroups
+		'result' => array('result_code' => $errorcode, 'result_label' => $errorlabel),
+		'groups' => $arraygroups
 		);
 	} else {
 		$objectresp = array(
-		'result'=>array('result_code' => 'OK', 'result_label' => ''),
-		'groups'=>$arraygroups
+		'result' => array('result_code' => 'OK', 'result_label' => ''),
+		'groups' => $arraygroups
 		);
 	}
 
@@ -648,8 +649,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 
 						if (!$error) {
 							$db->commit();
-							$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'), 'id'=>$socid_return);
-							$error = 0;
+							$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => 'SUCCESS'), 'id' => $socid_return);
 						}
 					} else {
 						$error++;
@@ -672,7 +672,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 	if ($error) {
 		$db->rollback();
 		$objectresp = array(
-			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel)
+			'result' => array('result_code' => $errorcode, 'result_label' => $errorlabel)
 		);
 	}
 
@@ -728,7 +728,7 @@ function setUserPassword($authentication, $shortuser)
 					$errorlabel = 'Error when changing password';
 				} else {
 					$objectresp = array(
-						'result'=>array('result_code' => 'OK', 'result_label' => ''),
+						'result' => array('result_code' => 'OK', 'result_label' => ''),
 					);
 				}
 			} else {
@@ -746,7 +746,7 @@ function setUserPassword($authentication, $shortuser)
 
 	if ($error) {
 		$objectresp = array(
-			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel)
+			'result' => array('result_code' => $errorcode, 'result_label' => $errorlabel)
 		);
 	}
 

From fcca1b6987f71f31f9f07a8ad2c647bba1b008ee Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 00:36:32 +0100
Subject: [PATCH 1200/1862] Qual: Enable PhanPluginRedundantAssignment (all
 fixed)

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 53dd0aa447b..08c547244ee 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -468,7 +468,7 @@ return [
 		// 'PhanPluginDescriptionlessCommentOnPublicProperty',
 		'PhanPluginUnknownFunctionParamType',
 		'PhanTypeSuspiciousStringExpression',
-		'PhanPluginRedundantAssignment',
+		// 'PhanPluginRedundantAssignment',
 
 		'PhanTypeExpectedObjectPropAccess',
 		'PhanTypeInvalidRightOperandOfNumericOp',

From d8a785fa2b1369142db9ed5d80238885b721c027 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 02:17:35 +0100
Subject: [PATCH 1201/1862] FIX get_string_between

# FIX get_string_between

Noticed that the typing of the arguments was incorrect and then found
the implementation suspicious.  The implemented test confirmed that it
was flawed.  Fixed.

Apparently this method is used in get_next_value .
---
 htdocs/core/lib/functions2.lib.php | 21 ++++++++++------
 test/phpunit/Functions2LibTest.php | 39 ++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index f5e95da450c..e2a8569e710 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1431,23 +1431,28 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 }
 
 /**
- * Get string between
+ * Get string from "$start" up to "$end"
+ *
+ * If string is "STARTcontentEND" and $start is "START" and $end is "END",
+ * then this function returns "content"
  *
  * @param   string  $string     String to test
- * @param   int     $start      Value for start
- * @param   int     $end        Value for end
+ * @param   string  $start      String Value for start
+ * @param   string  $end        String Value for end
  * @return  string              Return part of string
  */
 function get_string_between($string, $start, $end)
 {
-	$string = " ".$string;
 	$ini = strpos($string, $start);
-	if ($ini == 0) {
-		return "";
+	if ($ini === false) {
+		return '';
 	}
 	$ini += strlen($start);
-	$len = strpos($string, $end, $ini) - $ini;
-	return substr($string, $ini, $len);
+	$endpos = strpos($string, $end, $ini);
+	if ($endpos === false) {
+		return '';
+	}
+	return substr($string, $ini, $endpos - $ini);
 }
 
 /**
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 1d987d5aac5..081061a08ed 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023      Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -205,4 +206,42 @@ class Functions2LibTest extends CommonClassTest
 		print __METHOD__." for ".$ip." result=".$result."\n";
 		$this->assertEquals(2, $result, $ip);
 	}
+
+
+	/**
+	 * Dataprovider for testGetStringBetween
+	 *
+	 * @return array<string,string[]}
+	 */
+	public function stringBetweenDataProvider()
+	{
+		return [
+			// string, start, end, expected
+			'matches' => [ "STARTcontentEND", "START", "END", "content"],
+			'start does not match' => [ "ScontentEND", "START", "END", ""],
+			'end does not match' => [ "STARTcontentN", "START", "END", ""],
+			'no match' => [ "content", "START", "END", ""],
+			'end before start' => [ "ENDcontentSTART", "START", "END", ""],
+			'end inside start' => [ "BAB", "BA", "AB", ""],
+			'multiple matches' => [ "BAcontentABBAdoneAB", "BA", "AB", "content"],
+		];
+	}
+
+
+	/**
+	 * Test get_string_between()
+	 *
+	 * @param string $string String to search in.
+	 * @param string $start String indicating start
+	 * @param string $end String indicating end
+	 * @param string $expected Expected result
+	 *
+	 * @return void
+	 *
+	 * @dataProvider stringBetweenDataProvider
+	 */
+	public function testGetStringBetween($string, $start, $end, $expected)
+	{
+		$this->assertEquals($expected, get_string_between($string, $start, $end));
+	}
 }

From 09a62365eb19691703be28ee516930fb9b23a82d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:08:12 +0100
Subject: [PATCH 1202/1862] Fix PhanPluginUnknownFunctionParamType

# Fix PhanPluginUnknownFunctionParamType

PHPdoc for $object was incorrect.
Also updated the return type and the parameter typing for $head
in complete_head_from_modules
---
 htdocs/core/lib/functions.lib.php                            | 4 ++--
 .../lib/eventorganization_conferenceorbooth.lib.php          | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e6edeabe7ac..51a6ffc698a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10318,8 +10318,8 @@ function getLanguageCodeFromCountryCode($countrycode)
  *  @param	Conf			$conf           Object conf
  *  @param  Translate		$langs          Object langs
  *  @param  object|null		$object         Object object
- *  @param  array			$head          	Object head
- *  @param  int				$h				New position to fill
+ *  @param  array<array<int,string>>	$head          	List of head tabs (updated by this function)
+ *  @param  int				$h				New position to fill (updated by this function)
  *  @param  string			$type           Value for object where objectvalue can be
  *                              			'thirdparty'       to add a tab in third party view
  *		                        	      	'intervention'     to add a tab in intervention view
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index b0efb0602c5..f4d88699fe1 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -114,7 +115,7 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 /**
  * Prepare array of tabs for ConferenceOrBooth Project tab
  *
- * @param $object Project Project
+ * @param Project $object Project
  * @return array
  */
 function conferenceorboothProjectPrepareHead($object)
@@ -190,7 +191,7 @@ function conferenceorboothProjectPrepareHead($object)
  * Prepare array of tabs for ConferenceOrBoothAttendees
  *
  * @param	ConferenceOrBoothAttendee	$object		ConferenceOrBoothAttendee
- * @return 	array					Array of tabs
+ * @return 	array<array<int,string>>				Array of tabs
  */
 function conferenceorboothAttendeePrepareHead($object)
 {

From 1debf4f538ee85e692a10b02c7c0276221e04ff0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:42:13 +0100
Subject: [PATCH 1203/1862] # Fix & enable PhanPluginPrintfNotPercent

Fix PhanPluginPrintfNotPercent by setting format length to non 0 value.

Example of Notification message:

    'Format string "%0.10F" contains something that is not a percent sign, it will be treated as a format string '%0.10F' with padding of "0" and alignment of '' but no width. Use %% for a literal percent sign, or '%1$.10F' to be less ambiguous' .
---
 dev/tools/phan/config.php         | 2 +-
 htdocs/core/lib/functions.lib.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 53dd0aa447b..8070fa48e16 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -587,7 +587,7 @@ return [
 		'PhanTypePossiblyInvalidDimOffset', // Also checks optional array keys and requires that they are checked for existence.
 		'PhanUndeclaredGlobalVariable',
 		'PhanUndeclaredProperty',
-		'PhanPluginPrintfNotPercent',
+		// 'PhanPluginPrintfNotPercent',  // Detects fishy stuff with '%' format and suggests %%
 		'PhanPossiblyUndeclaredGlobalVariable',
 		// 'PhanPluginPossiblyStaticProtectedMethod',
 		'PhanTypeMismatchReturn',
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e6edeabe7ac..20d8f7b84f7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6426,7 +6426,7 @@ function price2num($amount, $rounding = '', $option = 0)
 		// So if number was already a good number, it is converted into local Dolibarr setup.
 		if (is_numeric($amount)) {
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps = sprintf("%10.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
 			$nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."
 			$amount = number_format($amount, $nbofdec, $dec, $thousand);
@@ -6475,7 +6475,7 @@ function price2num($amount, $rounding = '', $option = 0)
 		// to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.
 		if (is_numeric($amount)) {
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
-			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
+			$temps = sprintf("%10.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
 			$nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."
 			$amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

From b02014bf4736b841967cdc85904f7edbd7c86d95 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:16:41 +0100
Subject: [PATCH 1204/1862] Fix PhanPluginUnknownFunctionParamType

# Fix PhanPluginUnknownFunctionParamType

PHPdoc for $object was incorrect.
Reviewed some of the other typings as well
---
 htdocs/hrm/lib/hrm_evaluation.lib.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/hrm/lib/hrm_evaluation.lib.php b/htdocs/hrm/lib/hrm_evaluation.lib.php
index d4b99471087..a84aa3b0a3b 100644
--- a/htdocs/hrm/lib/hrm_evaluation.lib.php
+++ b/htdocs/hrm/lib/hrm_evaluation.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -28,7 +29,7 @@
  * Prepare array of tabs for Evaluation
  *
  * @param	Evaluation	$object		Evaluation
- * @return 	array					Array of tabs
+ * @return 	array<array<int,string>>	Array of tabs
  */
 function evaluationPrepareHead($object)
 {
@@ -129,7 +130,7 @@ function GetLegendSkills()
 }
 
 /**
- * @param  $obj  object  object need to handle
+ * @param  object $obj Object needed to be represented
  * @return string
  */
 function getRankOrderResults($obj)
@@ -163,8 +164,9 @@ function getRankOrderResults($obj)
 
 /**
  * Grouped rows with same ref in array
- * @param   array  $objects   all rows getted by sql
- * @return array |int
+ *
+ * @param   object[]  $objects   all rows retrieve from sql query
+ * @return	array<object>|int 			Object by groiup, -1 if error (empty or bad argument)
  */
 function getGroupedEval($objects)
 {

From 73eeb69cc808f164136ee684f1cf0b187cf091ae Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:18:22 +0100
Subject: [PATCH 1205/1862] Qual: Enable PhanPluginUnknownFunctionParamType
 (all fixed)

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 53dd0aa447b..e094e4028a4 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -466,7 +466,7 @@ return [
 		// 'PhanPluginNoCommentOnFunction',
 		'PhanPluginUnknownArrayFunctionParamType',
 		// 'PhanPluginDescriptionlessCommentOnPublicProperty',
-		'PhanPluginUnknownFunctionParamType',
+		// 'PhanPluginUnknownFunctionParamType',  // Finds certain errors in PHPdoc typing
 		'PhanTypeSuspiciousStringExpression',
 		'PhanPluginRedundantAssignment',
 

From 930af6b838e4d49ed071f093198c61c3a78da9c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 10:54:20 +0100
Subject: [PATCH 1206/1862] Doc

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

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index f5e95da450c..c1e5795e802 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -889,7 +889,7 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
  * Return last or next value for a mask (according to area we should not reset)
  *
  * @param   DoliDB		$db				Database handler
- * @param   string		$mask			Mask to use
+ * @param   string		$mask			Mask to use. Must contains {0...0}. Can contains {t..}, {u...}, {user_extra_xxx}, .;.
  * @param   string		$table			Table containing field with counter
  * @param   string		$field			Field containing already used values of counter
  * @param   string		$where			To add a filter on selection (for example to filter on invoice types)
@@ -903,7 +903,7 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
  */
 function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)
 {
-	global $conf, $user;
+	global $user;
 
 	if (!is_object($objsoc)) {
 		$valueforccc = $objsoc;

From c8046e4cdd3b8219df24586604b32a46e65fe404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 11:18:50 +0100
Subject: [PATCH 1207/1862] fix expensereport setdraft

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 83e2df9364c..786f42f362f 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -69,6 +69,7 @@ $comments = GETPOST('comments', 'restricthtml');
 $fk_c_type_fees = GETPOSTINT('fk_c_type_fees');
 $socid = GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('socid_id');
 
+/** @var User $user */
 $childids = $user->getAllChildIds(1);
 
 if (getDolGlobalString('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH')) {
@@ -951,7 +952,7 @@ if (empty($reshook)) {
 	if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->hasRight('expensereport', 'creer')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
-		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
+		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid || in_array($object->fk_user_author, $childids)) {
 			$result = $object->setStatut(0);
 
 			if ($result > 0) {
@@ -1537,7 +1538,7 @@ if ($action == 'create') {
 	$result = $object->fetch($id, $ref);
 
 	if ($result > 0) {
-		if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
+		if (!in_array($object->fk_user_author, $childids)) {
 			if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')
 				&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance'))) {
 				print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
@@ -2710,7 +2711,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	* 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	*/
 	if ($user->hasRight('expensereport', 'creer') && $object->status == ExpenseReport::STATUS_DRAFT) {
-		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || $user->hasRight('expensereport', 'writeall_advance')) {
+		if (in_array($object->fk_user_author, $childids) || $user->hasRight('expensereport', 'writeall_advance')) {
 			// Modify
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
@@ -2751,7 +2752,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	 *	Afficher : "Valider" / "Refuser" / "Supprimer"
 	 */
 	if ($object->status == ExpenseReport::STATUS_VALIDATED) {
-		if (in_array($object->fk_user_author, $user->getAllChildIds(1))) {
+		if (in_array($object->fk_user_author, $childids)) {
 			// set draft
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
 		}

From 5bbab794fae171e9ac5b73fe03d5ae30511fa488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 11:20:37 +0100
Subject: [PATCH 1208/1862] fix expensereport setdraft

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

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 786f42f362f..d9d609822a8 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify

From c7d621342829df39a54a2b2df180b60f009ef652 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 13 Mar 2024 11:35:24 +0100
Subject: [PATCH 1209/1862] Fix: Improve display and fix update

---
 .../class/multicurrency.class.php             |  4 +-
 htdocs/multicurrency/multicurrency_rate.php   | 41 +++++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index a7ef2153c9f..81d85b7c470 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
+ * Copyright (C) 2024       Ferran Marcet       <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -912,7 +913,8 @@ class CurrencyRate extends CommonObjectLine
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= "SET rate = ".((float) $this->rate);
+		$sql .= " SET rate = ".((float) $this->rate);
+		$sql .= ", rate_indirect = ".((float) $this->rate_indirect);
 		if (!empty($this->date_sync)) {
 			$sql .= ", date_sync = '".$this->db->idate($this->date_sync)."'";
 		}
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 94c0438f71e..40fb99eba4a 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016       Ferran Marcet		    <fmarcet@2byte.es>
+ * Copyright (C) 2016-2024  Ferran Marcet		    <fmarcet@2byte.es>
  * Copyright (C) 2023       Lenin Rivas		    	<lenin.rivas777@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@ $search_code		= GETPOST('search_code', 'alpha');
 $multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 $dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('dateinputday', 'int'), GETPOST('dateinputyear', 'int'));
 $rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
-$rateindirectinput 	= price2num(GETPOST('rateinidirectinput', 'alpha'));
+$rateindirectinput 	= price2num(GETPOST('rateindirectinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield 			= GETPOST('sortfield', 'aZ09comma');
@@ -168,6 +168,7 @@ if ($action == 'update') {
 		$currencyRate->date_sync = $dateinput;
 		$currencyRate->fk_multicurrency = $fk_currency;
 		$currencyRate->rate = $rateinput;
+		$currencyRate->rate_indirect = $rateindirectinput;
 		$res = $currencyRate->update();
 		if ($res) {
 			setEventMessages($langs->trans('successUpdateRate'), null);
@@ -244,6 +245,7 @@ if (empty($reshook)) {
 		$search_date_sync = "";
 		$search_date_sync_end="";
 		$search_rate = "";
+		$search_rate_indirect = "";
 		$search_code = "";
 		$search_array_options = array();
 	}
@@ -347,6 +349,9 @@ if ($search_date_sync && $search_date_sync_end) {
 if ($search_rate) {
 	$sql .= natural_search('cr.rate', $search_rate, 1);
 }
+if ($search_rate_indirect) {
+	$sql .= natural_search('cr.rate_indirect', $search_rate_indirect, 1);
+}
 if ($search_code) {
 	$sql .= natural_search('m.code', $search_code);
 }
@@ -408,6 +413,9 @@ if ($resql) {
 	if ($search_rate) {
 		$param = "&search_rate=".urlencode($search_rate);
 	}
+	if ($search_rate_indirect) {
+		$param = "&search_rate_indirect=".urlencode($search_rate_indirect);
+	}
 	if ($search_code != '') {
 		$param.="&search_code=".urlencode($search_code);
 	}
@@ -502,6 +510,12 @@ if ($resql) {
 		print '<input class="flat maxwidth75" type="text" name="search_rate" value="'.dol_escape_htmltag($search_rate).'">';
 		print '</td>';
 	}
+	// rate indirect
+	if (!empty($arrayfields['cr.rate_indirect']['checked'])) {
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat maxwidth75" type="text" name="search_rate_indirect" value="'.dol_escape_htmltag($search_rate_indirect).'">';
+		print '</td>';
+	}
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -531,6 +545,9 @@ if ($resql) {
 	if (!empty($arrayfields['cr.rate']['checked'])) {
 		print_liste_field_titre($arrayfields['cr.rate']['label'], $_SERVER["PHP_SELF"], "cr.rate", "", $param, "", $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['cr.rate_indirect']['checked'])) {
+		print_liste_field_titre($arrayfields['cr.rate_indirect']['label'], $_SERVER["PHP_SELF"], "cr.rate_indirect", "", $param, "", $sortfield, $sortorder);
+	}
 
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -557,7 +574,25 @@ if ($resql) {
 			}
 			print '<td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
 			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-			print '<td><input type="text" min="0" step="any" class="maxwidth100" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
+			print '<td><input type="text" min="0" step="any" class="maxwidth100" id="rateinput" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
+
+			if (getDolGlobalString('MULTICURRENCY_USE_RATE_INDIRECT')) {
+				print '</td>';
+				// LRR Calculate Rate Direct
+				print '<script type="text/javascript">';
+				print 'jQuery(document).ready(function () {
+						//alert("TC");
+						jQuery("#rateindirectinput").keyup(function () {
+							var valindirect = jQuery(this).val();
+							valdirect = 1 / parseFloat(valindirect);
+							jQuery("#rateinput").val(valdirect);
+							console.log("Rate Direct:"+valdirect)
+						});
+					});';
+				print '</script>';
+				print '<td><input type="text" min="0" step="any" class="maxwidth75" id="rateindirectinput" name="rateindirectinput" value="'.dol_escape_htmltag($obj->rate_indirect).'">';
+			}
+
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
 			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
 			print '<button type="submit" class="button small reposition" name="action" value="update">'.$langs->trans("Modify").'</button>';

From 3a0bf96e925fc88a80788cfadf80be331cdacc3c Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Wed, 13 Mar 2024 11:49:03 +0100
Subject: [PATCH 1210/1862] add password and genericpassword entry types

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index e5199267d31..700a66d422a 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -905,6 +905,10 @@ class FormSetupItem
 				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
 				$out.= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
 			}
+		} elseif ($this->type == 'password') {
+			$out.= $this->generateInputFieldPassword('dolibarr');
+		} elseif ($this->type == 'genericpassword') {
+			$out.= $this->generateInputFieldPassword('generic');
 		} else {
 			$out.= $this->generateInputFieldText();
 		}
@@ -1028,6 +1032,37 @@ class FormSetupItem
 	}
 
 
+	/**
+	 * generate input field for a password
+	 *
+	 * @param   [type]  $type  'dolibarr' (dolibarr password rules apply) or 'generic'
+	 *
+	 * @return  string
+	 */
+	public function generateInputFieldPassword($type = 'generic')
+	{
+		global $conf, $langs, $user;
+
+		$min = 8;
+		$max = 50;
+		if ($type == 'dolibarr') {
+			$gen = getDolGlobalString('USER_PASSWORD_GENERATED', 'standard');
+			if ($gen == 'none') {
+				$gen = 'standard';
+			}
+			$nomclass = "modGeneratePass".ucfirst($gen);
+			$nomfichier = $nomclass.".class.php";
+			require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier;
+			$genhandler = new $nomclass($this->db, $conf, $langs, $user);
+			$min = $genhandler->length;
+			$max = $genhandler->length2;
+		}
+		$out = '<input required="required" type="password" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ? GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" minlength="' . $min . '" maxlength="' . $max . '">';
+		return $out;
+	}
+
+
+
 	/**
 	 * generateInputFieldMultiSelect
 	 *
@@ -1209,6 +1244,8 @@ class FormSetupItem
 			} elseif ($resbank < 0) {
 				$this->setErrors($bankaccount->errors);
 			}
+		} elseif ($this->type == 'password' || $this->type == 'genericpassword') {
+			$out.= str_repeat('*', strlen($this->fieldValue));
 		} else {
 			$out.= $this->fieldValue;
 		}
@@ -1480,4 +1517,28 @@ class FormSetupItem
 		$this->type = 'selectBankAccount';
 		return $this;
 	}
+
+	/**
+	 * Set type of input as a password with dolibarr password rules apply.
+	 * Hide entry on display.
+	 *
+	 * @return self
+	 */
+	public function setAsPassword()
+	{
+		$this->type = 'password';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as a generic password without dolibarr password rules (for external passwords for example).
+	 * Hide entry on display.
+	 *
+	 * @return self
+	 */
+	public function setAsGenericPassword()
+	{
+		$this->type = 'genericpassword';
+		return $this;
+	}
 }

From 3d449b8fce548e77e37d8312af389465ee09f1f5 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Wed, 13 Mar 2024 11:54:05 +0100
Subject: [PATCH 1211/1862] phpdoc missing argument type, thanks to phpstan !

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

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 700a66d422a..999603adf8a 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1035,7 +1035,7 @@ class FormSetupItem
 	/**
 	 * generate input field for a password
 	 *
-	 * @param   [type]  $type  'dolibarr' (dolibarr password rules apply) or 'generic'
+	 * @param   string  $type  'dolibarr' (dolibarr password rules apply) or 'generic'
 	 *
 	 * @return  string
 	 */

From b9007acbf18f6272509d35d3c9378142a5f8475e Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 13 Mar 2024 14:03:27 +0100
Subject: [PATCH 1212/1862] Fixed PHP warnings

---
 .../comm/action/class/cactioncomm.class.php   | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index bc6f454539a..d308ce7bd1c 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -192,9 +192,21 @@ class CActionComm
 			$nump = $this->db->num_rows($resql);
 			if ($nump) {
 				$idforallfornewmodule = 96;
-				$TSystem = array();
-				$TSystemAuto = array();
-				$TModule = array();
+				$TSystem = array(
+					'id' => [],
+					'code' => [],
+					'all' => []
+				);
+				$TSystemAuto = array(
+					'id' => [],
+					'code' => [],
+					'all' => []
+				);
+				$TModule = array(
+					'id' => [],
+					'code' => [],
+					'all' => []
+				);
 				$i = 0;
 				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
@@ -319,8 +331,8 @@ class CActionComm
 						}
 
 						if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) {
-							$TModule['code'][$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
-							$TModule['all'][$obj->code]['label'] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
+							array_key_exists($obj->code, $TModule['code']) ? ($TModule['code'][$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')') : ($TModule['code'][$obj->code] = ' ('.$langs->trans("Module").': '.$obj->module.')');
+							array_key_exists($obj->code, $TModule['all']) ? ($TModule['all'][$obj->code]['label'] .= ' ('.$langs->trans("Module").': '.$obj->module.')') : ($TModule['all'][$obj->code]['label'] = ' ('.$langs->trans("Module").': '.$obj->module.')');
 						}
 					}
 					$i++;

From 2baab69aa01dcf869aadad7244221fa08322b7fd Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 13 Mar 2024 14:34:46 +0100
Subject: [PATCH 1213/1862] Cleaned code. Fixed undefined userSID warning when
 LDAP bind failed. Added attribute table error message when LDAP bind failed.

---
 htdocs/user/ldap.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index ab95f1ad25e..47b9017b008 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('users', 'admin', 'companies', 'ldap'));
 
 $id = GETPOSTINT('id');
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userldap'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?: 'userldap'; // To manage different context of search
 
 // Security check
 $socid = 0;
@@ -125,9 +125,7 @@ print '</tr>';
 if (getDolGlobalString('LDAP_SERVER_TYPE') == "activedirectory") {
 	$ldap = new Ldap();
 	$result = $ldap->connectBind();
-	if ($result > 0) {
-		$userSID = $ldap->getObjectSid($object->login);
-	}
+	($result > 0) ? ($userSID = $ldap->getObjectSid($object->login)) : $userSID = '';
 	print '<tr><td class="valigntop">'.$langs->trans("SID").'</td>';
 	print '<td>'.$userSID.'</td>';
 	print "</tr>\n";
@@ -204,6 +202,7 @@ if ($result > 0) {
 
 	$ldap->unbind();
 } else {
+	print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</span></td></tr>';
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 

From 06a593a2c3aee24940e8f733ee15f17646a8a920 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 13 Mar 2024 14:36:04 +0100
Subject: [PATCH 1214/1862] Added contributor details

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

diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 47b9017b008..f2e9a3708d2 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2021 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2021	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.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 c314bdc82d6784769c817cc494b783f93d748d0a Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Wed, 13 Mar 2024 15:34:00 +0100
Subject: [PATCH 1215/1862] fix trad not showing

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

diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 20603909699..dd803f2ad71 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'bills', 'companies', 'languages', 'members', 'other', 'products', 'propal', 'receptions', 'stocks', 'trips'));
+$langs->loadLangs(array('admin', 'bills', 'companies', 'languages', 'members', 'other', 'products', 'propal', 'receptions', 'stocks', 'trips', 'orders'));
 
 if (!$user->admin) {
 	accessforbidden();

From 3668efcd90b81342a62f4e3c55f08ba3fa72ce26 Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Wed, 13 Mar 2024 15:34:29 +0100
Subject: [PATCH 1216/1862] fix warnings phpstan

---
 htdocs/mrp/class/mo.class.php    |   2 +-
 htdocs/user/class/user.class.php | 350 ++++++++++++++++---------------
 2 files changed, 178 insertions(+), 174 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 4b91802fd5a..c55149fe424 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1844,7 +1844,7 @@ class Mo extends CommonObject
 	 * Function used to return all child MOs recursively
 	 *
 	 * @param int $depth   Depth for recursing loop count
-	 * @return Mo[]|int[]  array of MOs if OK, -1 if KO
+	 * @return Mo[]|int[]|int  array of MOs if OK, -1 if KO
 	 */
 	public function getAllMoChilds($depth = 0)
 	{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index fd6b5d6dc3a..641189725fd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1187,15 +1187,17 @@ class User extends CommonObject
 	{
 		global $conf;
 
+		$alreadyloaded = false;
+
 		if (empty($forcereload)) {
 			if ($moduletag && isset($this->_tab_loaded[$moduletag]) && $this->_tab_loaded[$moduletag]) {
 				// Rights for this module are already loaded, so we leave
-				return;
+				$alreadyloaded = true;
 			}
 
 			if (!empty($this->all_permissions_are_loaded)) {
 				// We already loaded all rights for this user, so we leave
-				return;
+				$alreadyloaded = true;
 			}
 		}
 
@@ -1209,211 +1211,213 @@ class User extends CommonObject
 
 		// Get permission of users + Get permissions of groups
 
-		// First user permissions
-		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
-		$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 (getDolGlobalString('MULTICOMPANY_BACKWARD_COMPATIBILITY')) {
-			// on old version, we use entity defined into table r only
-			$sql .= " AND r.entity IN (0,".(isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') ? "1," : "").$conf->entity.")";
-		} else {
-			// 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 entity on both table 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";
-		if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
-			$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
-		}
-		if ($moduletag) {
-			$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num) {
-				$obj = $this->db->fetch_object($resql);
-
-				if ($obj) {
-					$module = $obj->module;
-					$perms = $obj->perms;
-					$subperms = $obj->subperms;
-
-					if (!empty($perms)) {
-						if (!empty($module)) {
-							if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
-								$this->rights->$module = new stdClass();
-							}
-							if (!empty($subperms)) {
-								if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
-									$this->rights->$module->$perms = new stdClass();
-								}
-								if (empty($this->rights->$module->$perms->$subperms)) {
-									$this->nb_rights++;
-								}
-								$this->rights->$module->$perms->$subperms = 1;
-							} else {
-								if (empty($this->rights->$module->$perms)) {
-									$this->nb_rights++;
-								}
-								$this->rights->$module->$perms = 1;
-							}
-						}
-					}
-				}
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-
-		// Now permissions of groups
-		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
-		$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";
-		// A very strange business rules. Must be same than into user->getrights() user/perms.php and user/group/perms.php
-		if (getDolGlobalString('MULTICOMPANY_BACKWARD_COMPATIBILITY')) {
-			if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
-				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
+		if (!$alreadyloaded) {
+			// First user permissions
+			$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
+			$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 (getDolGlobalString('MULTICOMPANY_BACKWARD_COMPATIBILITY')) {
+				// on old version, we use entity defined into table r only
+				$sql .= " AND r.entity IN (0,".(isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') ? "1," : "").$conf->entity.")";
 			} else {
-				$sql .= " AND r.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 entity on both table 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";
+			if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
+				$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+			}
+			if ($moduletag) {
+				$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
 			}
-		} else {
-			$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
-			// The entity on the table usergroup_user should be useless and should never be used because it is already 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
-		}
-		// End of strange business rule
-		$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
-		$sql .= " AND gu.fk_user = ".((int) $this->id);
-		$sql .= " AND r.perms IS NOT NULL";
-		if ($moduletag) {
-			$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
-		}
 
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num) {
-				$obj = $this->db->fetch_object($resql);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
 
-				if ($obj) {
-					$module = $obj->module;
-					$perms = $obj->perms;
-					$subperms = $obj->subperms;
+					if ($obj) {
+						$module = $obj->module;
+						$perms = $obj->perms;
+						$subperms = $obj->subperms;
 
-					if (!empty($perms)) {
-						if (!empty($module)) {
-							if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
-								$this->rights->$module = new stdClass();
-							}
-							if (!empty($subperms)) {
-								if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
-									$this->rights->$module->$perms = new stdClass();
+						if (!empty($perms)) {
+							if (!empty($module)) {
+								if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+									$this->rights->$module = new stdClass();
 								}
-								if (empty($this->rights->$module->$perms->$subperms)) {
-									$this->nb_rights++;
-								}
-								$this->rights->$module->$perms->$subperms = 1;
-							} else {
-								if (empty($this->rights->$module->$perms)) {
-									$this->nb_rights++;
-								}
-								// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
-								if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+								if (!empty($subperms)) {
+									if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+										$this->rights->$module->$perms = new stdClass();
+									}
+									if (empty($this->rights->$module->$perms->$subperms)) {
+										$this->nb_rights++;
+									}
+									$this->rights->$module->$perms->$subperms = 1;
+								} else {
+									if (empty($this->rights->$module->$perms)) {
+										$this->nb_rights++;
+									}
 									$this->rights->$module->$perms = 1;
 								}
 							}
 						}
 					}
+					$i++;
 				}
-				$i++;
+				$this->db->free($resql);
 			}
-			$this->db->free($resql);
-		}
 
-		// Force permission on user for admin
-		if (!empty($this->admin)) {
-			if (empty($this->rights->user->user)) {
-				$this->rights->user->user = new stdClass();
-			}
-			$listofpermtotest = array('lire', 'creer', 'password', 'supprimer', 'export');
-			foreach ($listofpermtotest as $permtotest) {
-				if (empty($this->rights->user->user->$permtotest)) {
-					$this->rights->user->user->$permtotest = 1;
-					$this->nb_rights++;
+			// Now permissions of groups
+			$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
+			$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";
+			// A very strange business rules. Must be same than into user->getrights() user/perms.php and user/group/perms.php
+			if (getDolGlobalString('MULTICOMPANY_BACKWARD_COMPATIBILITY')) {
+				if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
+					$sql .= " AND gu.entity IN (0,".$conf->entity.")";
+				} else {
+					$sql .= " AND r.entity = ".((int) $conf->entity);
 				}
+			} else {
+				$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+				// The entity on the table usergroup_user should be useless and should never be used because it is already 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
 			}
-			if (empty($this->rights->user->self)) {
-				$this->rights->user->self = new stdClass();
+			// End of strange business rule
+			$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
+			$sql .= " AND gu.fk_user = ".((int) $this->id);
+			$sql .= " AND r.perms IS NOT NULL";
+			if ($moduletag) {
+				$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
 			}
-			$listofpermtotest = array('creer', 'password');
-			foreach ($listofpermtotest as $permtotest) {
-				if (empty($this->rights->user->self->$permtotest)) {
-					$this->rights->user->self->$permtotest = 1;
-					$this->nb_rights++;
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num) {
+					$obj = $this->db->fetch_object($resql);
+
+					if ($obj) {
+						$module = $obj->module;
+						$perms = $obj->perms;
+						$subperms = $obj->subperms;
+
+						if (!empty($perms)) {
+							if (!empty($module)) {
+								if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
+									$this->rights->$module = new stdClass();
+								}
+								if (!empty($subperms)) {
+									if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+										$this->rights->$module->$perms = new stdClass();
+									}
+									if (empty($this->rights->$module->$perms->$subperms)) {
+										$this->nb_rights++;
+									}
+									$this->rights->$module->$perms->$subperms = 1;
+								} else {
+									if (empty($this->rights->$module->$perms)) {
+										$this->nb_rights++;
+									}
+									// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
+									if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) {
+										$this->rights->$module->$perms = 1;
+									}
+								}
+							}
+						}
+					}
+					$i++;
 				}
+				$this->db->free($resql);
 			}
-			// Add test on advanced permissions
-			if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
-				if (empty($this->rights->user->user_advance)) {
-					$this->rights->user->user_advance = new stdClass();
+
+			// Force permission on user for admin
+			if (!empty($this->admin)) {
+				if (empty($this->rights->user->user)) {
+					$this->rights->user->user = new stdClass();
 				}
-				$listofpermtotest = array('readperms', 'write');
+				$listofpermtotest = array('lire', 'creer', 'password', 'supprimer', 'export');
 				foreach ($listofpermtotest as $permtotest) {
-					if (empty($this->rights->user->user_advance->$permtotest)) {
-						$this->rights->user->user_advance->$permtotest = 1;
+					if (empty($this->rights->user->user->$permtotest)) {
+						$this->rights->user->user->$permtotest = 1;
 						$this->nb_rights++;
 					}
 				}
-				if (empty($this->rights->user->self_advance)) {
-					$this->rights->user->self_advance = new stdClass();
+				if (empty($this->rights->user->self)) {
+					$this->rights->user->self = new stdClass();
 				}
-				$listofpermtotest = array('readperms', 'writeperms');
+				$listofpermtotest = array('creer', 'password');
 				foreach ($listofpermtotest as $permtotest) {
-					if (empty($this->rights->user->self_advance->$permtotest)) {
-						$this->rights->user->self_advance->$permtotest = 1;
+					if (empty($this->rights->user->self->$permtotest)) {
+						$this->rights->user->self->$permtotest = 1;
 						$this->nb_rights++;
 					}
 				}
-				if (empty($this->rights->user->group_advance)) {
-					$this->rights->user->group_advance = new stdClass();
-				}
-				$listofpermtotest = array('read', 'readperms', 'write', 'delete');
-				foreach ($listofpermtotest as $permtotest) {
-					if (empty($this->rights->user) || empty($this->rights->user->group_advance->$permtotest)) {
-						$this->rights->user->group_advance->$permtotest = 1;
-						$this->nb_rights++;
+				// Add test on advanced permissions
+				if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
+					if (empty($this->rights->user->user_advance)) {
+						$this->rights->user->user_advance = new stdClass();
+					}
+					$listofpermtotest = array('readperms', 'write');
+					foreach ($listofpermtotest as $permtotest) {
+						if (empty($this->rights->user->user_advance->$permtotest)) {
+							$this->rights->user->user_advance->$permtotest = 1;
+							$this->nb_rights++;
+						}
+					}
+					if (empty($this->rights->user->self_advance)) {
+						$this->rights->user->self_advance = new stdClass();
+					}
+					$listofpermtotest = array('readperms', 'writeperms');
+					foreach ($listofpermtotest as $permtotest) {
+						if (empty($this->rights->user->self_advance->$permtotest)) {
+							$this->rights->user->self_advance->$permtotest = 1;
+							$this->nb_rights++;
+						}
+					}
+					if (empty($this->rights->user->group_advance)) {
+						$this->rights->user->group_advance = new stdClass();
+					}
+					$listofpermtotest = array('read', 'readperms', 'write', 'delete');
+					foreach ($listofpermtotest as $permtotest) {
+						if (empty($this->rights->user) || empty($this->rights->user->group_advance->$permtotest)) {
+							$this->rights->user->group_advance->$permtotest = 1;
+							$this->nb_rights++;
+						}
 					}
 				}
 			}
-		}
 
-		// For backward compatibility
-		if (isset($this->rights->propale) && !isset($this->rights->propal)) {
-			$this->rights->propal = $this->rights->propale;
-		}
-		if (isset($this->rights->propal) && !isset($this->rights->propale)) {
-			$this->rights->propale = $this->rights->propal;
-		}
+			// For backward compatibility
+			if (isset($this->rights->propale) && !isset($this->rights->propal)) {
+				$this->rights->propal = $this->rights->propale;
+			}
+			if (isset($this->rights->propal) && !isset($this->rights->propale)) {
+				$this->rights->propale = $this->rights->propal;
+			}
 
-		if (!$moduletag) {
-			// If the module was not define, then everything is loaded.
-			// Therefore, we can consider that the permissions are cached
-			// because they were all loaded for this user instance.
-			$this->all_permissions_are_loaded = 1;
-		} else {
-			// If the module is defined, we flag it as loaded into cache
-			$this->_tab_loaded[$moduletag] = 1;
+			if (!$moduletag) {
+				// If the module was not define, then everything is loaded.
+				// Therefore, we can consider that the permissions are cached
+				// because they were all loaded for this user instance.
+				$this->all_permissions_are_loaded = 1;
+			} else {
+				// If the module is defined, we flag it as loaded into cache
+				$this->_tab_loaded[$moduletag] = 1;
+			}
 		}
 	}
 

From 5e5792d1449ff796a19a3b850a4f1d2be6a8e6e3 Mon Sep 17 00:00:00 2001
From: Jonathan lescaut <jonathan.lescaut@atm-consulting.fr>
Date: Wed, 13 Mar 2024 15:38:29 +0100
Subject: [PATCH 1217/1862] add import kit

---
 htdocs/core/modules/modProduct.class.php      | 22 +++++++++++++++++++
 .../install/mysql/migration/19.0.0-20.0.0.sql |  2 ++
 .../tables/llx_product_association.key.sql    |  1 +
 .../mysql/tables/llx_product_association.sql  |  3 ++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 28b5f19174c..258a0fc5b33 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -944,6 +944,28 @@ class modProduct extends DolibarrModules
 			$this->import_examplevalues_array[$r] = array('l.fk_product'=>'ref:PRODUCT_REF or id:123456', 'l.lang'=>'en_US', 'l.label'=>'Label in en_US', 'l.description'=>'Desc in en_US');
 			$this->import_updatekeys_array[$r] = array('l.fk_product'=>'ProductOrService', 'l.lang'=>'Language');
 		}
+
+		if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
+			// Import products kit
+			$r++;
+			$this->import_code[$r] = $this->rights_class . '_' . $r;
+			$this->import_label[$r] = "AssociatedProducts"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('pa' => MAIN_DB_PREFIX . 'product_association');
+			$this->import_fields_array[$r] = array('pa.fk_product_pere' => 'ParentProducts', 'pa.fk_product_fils' => 'ComposedProduct', 'pa.qty' => 'Qty', 'pa.incdec' => 'ComposedProductIncDecStock', 'pa.rang' => 'rang');
+
+			$this->import_convertvalue_array[$r] = array(
+				'pa.fk_product_pere' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product'),
+				'pa.fk_product_fils' => array('rule' => 'fetchidfromref', 'classfile' => '/product/class/product.class.php', 'class' => 'Product', 'method' => 'fetch', 'element' => 'Product')
+			);
+			$this->import_examplevalues_array[$r] = array(
+				'pa.fk_product_pere' => "ref:PREF123456",
+				'pa.fk_product_fils' => "ref:PREF123456",
+				'pa.qty' => "100",
+				'pa.incdec' => "0",
+				'pa.rang' => "1");
+		}
 	}
 
 
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 4f50ee95936..1a109507a36 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -268,3 +268,5 @@ ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_tms (tms);
 ALTER TABLE llx_element_element MODIFY COLUMN sourcetype VARCHAR(64) NOT NULL;
 ALTER TABLE llx_element_element MODIFY COLUMN targettype VARCHAR(64) NOT NULL;
 ALTER TABLE llx_c_type_contact MODIFY COLUMN element VARCHAR(64) NOT NULL;
+
+ALTER TABLE llx_product_association ADD COLUMN import_key varchar(14) DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql
index 9eb9fdd457b..c9dca6e611e 100644
--- a/htdocs/install/mysql/tables/llx_product_association.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_association.key.sql
@@ -20,3 +20,4 @@
 ALTER TABLE llx_product_association ADD UNIQUE INDEX uk_product_association (fk_product_pere, fk_product_fils);
 
 ALTER TABLE llx_product_association ADD INDEX idx_product_association_fils (fk_product_fils);
+
diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql
index f97e2aa6a0b..55ce8cc9d78 100644
--- a/htdocs/install/mysql/tables/llx_product_association.sql
+++ b/htdocs/install/mysql/tables/llx_product_association.sql
@@ -24,6 +24,7 @@ create table llx_product_association
   fk_product_fils       integer NOT NULL DEFAULT 0, -- id du sous-produit
   qty                   double NULL,
   incdec                integer DEFAULT 1, -- when set to 1 changing stock of product will change stock of linked product too
-  rang                  integer DEFAULT 0
+  rang                  integer DEFAULT 0,
+  import_key            varchar(14) DEFAULT NULL
 )ENGINE=innodb;
 

From b9ed346711072c479607050e8c742751145d414d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 15:54:15 +0100
Subject: [PATCH 1218/1862] FIX edit bank suggested for credit transfer payment
 in invoice setup when bank is closed.

---
 htdocs/admin/facture.php | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 19f1182e608..7bf83eb4a9c 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -618,13 +618,14 @@ if (getDolGlobalString('INVOICE_USE_DEFAULT_DOCUMENT')) { // Hidden conf
 	print '<form action="'.$_SERVER["PHP_SELF"].'#default-pdf-modules-by-type-table" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'" />';
 	print '<input type="hidden" name="action" value="setDefaultPDFModulesByType" >';
+	print '<input type="hidden" name="page_y" value="" />';
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table id="default-pdf-modules-by-type-table" class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Type").'</td>';
 	print '<td>'.$langs->trans("Name").'</td>';
-	print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
+	print '<td class="right"><input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'"></td>';
 	print "</tr>\n";
 
 	$listtype = array(
@@ -660,6 +661,7 @@ print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
+print '<input type="hidden" name="page_y" value="" />';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -668,17 +670,16 @@ print '<tr class="liste_titre">';
 print '<td>';
 print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
-print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
 if (isModEnabled('banque')) {
-	$sql = "SELECT rowid, label";
+	$sql = "SELECT rowid, label, clos";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
-	$sql .= " WHERE clos = 0";
-	$sql .= " AND courant = 1";
+	$sql .= " WHERE courant = 1";
 	$sql .= " AND entity IN (".getEntity('bank_account').")";
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -688,15 +689,19 @@ if (isModEnabled('banque')) {
 			print '<select name="rib" class="flat" id="rib">';
 			print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
 			while ($i < $num) {
-				$row = $db->fetch_row($resql);
+				$obj = $db->fetch_object($resql);
 
-				print '<option value="'.$row[0].'"';
-				print $conf->global->FACTURE_RIB_NUMBER == $row[0] ? ' selected' : '';
-				print '>'.$row[1].'</option>';
+				print '<option value="'.$obj->rowid.'"';
+				print getDolGlobalString('FACTURE_RIB_NUMBER') == $obj->rowid ? ' selected' : '';
+				if (!empty($obj->clos)) {
+					print ' disabled';
+				}
+				print '>'.dol_escape_htmltag($obj->label).'</option>';
 
 				$i++;
 			}
 			print "</select>";
+			print ajax_combobox("rib");
 		} else {
 			print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 		}
@@ -736,6 +741,8 @@ if ($resql) {
 	}
 }
 print "</select>";
+print ajax_combobox("chq", array(), 0, 0, 'resolve', -2);
+
 print "</td></tr>";
 print "</table>";
 print '</div>';
@@ -758,12 +765,13 @@ print "</tr>\n";
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="action" value="setforcedate" />';
+print '<input type="hidden" name="page_y" value="" />';
 print '<tr class="oddeven"><td>';
 print $langs->trans("ForceInvoiceDate");
 print '</td><td width="60" class="center">';
 print $form->selectyesno("forcedate", getDolGlobalInt('FAC_FORCE_DATE_VALIDATION', 0), 1);
 print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
@@ -778,6 +786,7 @@ $htmltext .= '</i>';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
+print '<input type="hidden" name="page_y" value="" />';
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'INVOICE_FREE_TEXT';
@@ -789,7 +798,7 @@ if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
@@ -797,12 +806,13 @@ print '</form>';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
+print '<input type="hidden" name="page_y" value="" />';
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td>';
 print '<td><input class="flat minwidth200imp" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('FACTURE_DRAFT_WATERMARK')).'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 

From b3b7afa07aff27b15b417658a8301a6b8efa5bd5 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 13 Mar 2024 16:26:10 +0100
Subject: [PATCH 1219/1862] Fixed warning undefined userId & nbevent.

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

diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index 7c692bb9ba4..af23913a051 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -89,7 +89,7 @@ if (($object->id != $user->id) && !$user->hasRight('user', 'user', 'lire')) {
 	accessforbidden();
 }
 
-$parameters = array('id' => $userId);
+$parameters = array('id' => $user->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');
@@ -195,7 +195,7 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	// Try to know count of actioncomm from cache
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 	$cachekey = 'count_events_user_'.$object->id;
-	//$nbEvent = dol_getcache($cachekey);	// TODO Add nb into badge in menu so we can get it from cache also here
+	$nbEvent = dol_getcache($cachekey);
 
 	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {

From cd727f22a6c0f5cb0f458ea55a18620d560506fa Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Wed, 13 Mar 2024 16:26:52 +0100
Subject: [PATCH 1220/1862] Fixed event count

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

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 87e6e367cb3..2ffc38d1072 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -197,9 +197,9 @@ function user_prepare_head(User $object)
 			if (!is_null($dataretrieved)) {
 				$nbEvent = $dataretrieved;
 			} else {
-				$sql = "SELECT COUNT(id) as nb";
-				$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
-				$sql .= " WHERE fk_user_done = ".((int) $object->id);
+				$sql = "SELECT COUNT(ac.id) as nb";
+				$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as ac";
+				$sql .= " WHERE fk_user_action = ".((int) $object->id);
 				$sql .= " AND entity IN (".getEntity('agenda').")";
 				$resql = $db->query($sql);
 				if ($resql) {

From 04282f9c5f96c3e03390397d4049194619f2f7d4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:45:14 +0100
Subject: [PATCH 1221/1862] Fix PhanTypeInvalidUnaryOperandIncOrDec by typing
 $error

# Fix PhanTypeInvalidUnaryOperandIncOrDec by typing $error

For some strange reason phan determined that $error was not an int, so forced the
typing to fix the PhanTypeInvalidUnaryOperandIncOrDec notifications in this
file
---
 htdocs/website/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 31b79d9722e..566a1c2feb9 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020 	   Nicolas ZABOURI		<info@inovea-conseil.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -747,6 +748,8 @@ if ($action == 'addsite' && $usercanedit) {
 	}
 }
 
+'@phan-var-force int $error';
+
 // Add page/container
 if ($action == 'addcontainer' && $usercanedit) {
 	dol_mkdir($pathofwebsite);
@@ -761,6 +764,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 		$grabimagesinto = GETPOST('grabimagesinto', 'alpha');
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		// The include seems to break typing on variables
 
 		if (empty($urltograb)) {
 			$error++;

From e4331877dfeea79da0165e175e88c9fb747d15f7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:46:21 +0100
Subject: [PATCH 1222/1862] Fix: Remove stray $i++

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

diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 9dbc437758c..6ee4e9c9ac7 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003	   Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003	   Jean-Louis Bergamo	<jlb@j1b.org>
  * Copyright (C) 2006-2017 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -253,8 +254,6 @@ if (empty($reshook)) {
 				}
 			}
 
-			$i++;
-
 			// Build and output PDF
 			if (!$error && $mode == 'label') {
 				if (!count($arrayofrecords)) {

From 1daa77650cc7bac7bc0e3ffd9764a860263ee2ea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:50:28 +0100
Subject: [PATCH 1223/1862] Fix Initialise array to fix
 PhanTypeInvalidUnaryOperandIncOrDec

---
 htdocs/compta/cashcontrol/report.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 83b0a56e563..5a863e5e410 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Andreu Bisquerra	 <jove@bisquerra.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -59,13 +60,13 @@ $sortorder = 'ASC';
 $sortfield = 'b.datev,b.dateo,b.rowid';
 
 $arrayfields = array(
-	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-	'b.num_chq'=>array('label'=>$langs->trans("Number"), 'checked'=>1),
-	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
-	'cp.code'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
-	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.rowid' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	'b.dateo' => array('label' => $langs->trans("DateOperationShort"), 'checked' => 1),
+	'b.num_chq' => array('label' => $langs->trans("Number"), 'checked' => 1),
+	'ba.ref' => array('label' => $langs->trans("BankAccount"), 'checked' => 1),
+	'cp.code' => array('label' => $langs->trans("PaymentMode"), 'checked' => 1),
+	'b.debit' => array('label' => $langs->trans("Debit"), 'checked' => 1, 'position' => 600),
+	'b.credit' => array('label' => $langs->trans("Credit"), 'checked' => 1, 'position' => 605),
 );
 
 $syear  = $object->year_close;
@@ -209,7 +210,7 @@ if ($resql) {
 	$transactionspertype = array();
 	$amountpertype = array();
 
-	$totalarray = array();
+	$totalarray = array('nbfield' => 0,'pos' => array());
 	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 

From 393dacd59e42b214293f48ab411be46850693b34 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:52:05 +0100
Subject: [PATCH 1224/1862] Fix Initialise var to fix
 PhanTypeInvalidUnaryOperandIncOrDec

---
 htdocs/core/actions_massactions.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 9649ef6252c..382cb71fca4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1040,6 +1040,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 	$objecttmp = new $objectclass($db);
 	$nbok = 0;
+	$nbignored = 0;
 	$TMsg = array();
 
 	//$toselect could contain duplicate entries, cf https://github.com/Dolibarr/dolibarr/issues/26244
@@ -1200,6 +1201,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread) {
 }
 
 if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
+	$nbok = 0;
 	$db->begin();
 
 	$affecttag_type = GETPOST('affecttag_type', 'alpha');
@@ -1221,7 +1223,6 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		}
 
 		//For each valid categ type set common categ
-		$nbok = 0;
 		if (!empty($to_affecttag_type_array)) {
 			foreach ($to_affecttag_type_array as $categ_type) {
 				$contcats = GETPOST('contcats_' . $categ_type, 'array');
@@ -1256,6 +1257,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 }
 
 if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoadd) {
+	$nbok = 0;
 	$db->begin();
 	if (GETPOSTISSET('pricerate')) {
 		$pricepercentage = GETPOSTINT('pricerate');
@@ -1300,6 +1302,7 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 }
 
 if (!$error && ($action == 'setsupervisor' && $confirm == 'yes') && $permissiontoadd) {
+	$nbok = 0;
 	$db->begin();
 	$supervisortoset = GETPOST('supervisortoset');
 	if (!empty($supervisortoset)) {
@@ -1335,6 +1338,7 @@ if (!$error && ($action == 'setsupervisor' && $confirm == 'yes') && $permissiont
 }
 
 if (!$error && ($action == 'affectuser' && $confirm == 'yes') && $permissiontoadd) {
+	$nbok = 0;
 	$db->begin();
 
 	$usertoaffect = GETPOST('usertoaffect');

From a0ea2ed65487a47736e1cba6f50060c9d8793fbb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:55:14 +0100
Subject: [PATCH 1225/1862] Fix: Remove stray $i++

---
 htdocs/core/lib/company.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2384751a523..d8113ce1356 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -2230,7 +2230,6 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 			}
 
 			$out .= "</tr>\n";
-			$i++;
 		}
 		if (empty($histo)) {
 			$colspan = 9;

From 3ffa85eb496a83176aca506c1837be50896af1d6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:57:50 +0100
Subject: [PATCH 1226/1862] Fix: Remove stray $i++

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2c94e4d4a8c..2f794579b7b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13804,8 +13804,6 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
 
 			$out .= '</li>';
 			$out .= '<!-- END timeline item -->';
-
-			$i++;
 		}
 
 		$out .= "</ul>\n";

From dfaa8358fb8a80c92549c5447a2660f6fc0e23b2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:02:37 +0100
Subject: [PATCH 1227/1862] Fix: Comment unused $errorforemail (outside loop)

---
 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 518529630fb..8efeda93635 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3363,7 +3363,7 @@ class EmailCollector extends CommonObject
 				if (empty($mode) && empty($error)) {
 					$res = imap_mail_move($connection, $imapemail, $targetdir, CP_UID);
 					if ($res == false) {
-						$errorforemail++;
+						// $errorforemail++;  // Not in loop, not needed, not initialised
 						$this->error = imap_last_error();
 						$this->errors[] = $this->error;
 

From 636d552499835135f171a524be8a082fce3b000d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:03:36 +0100
Subject: [PATCH 1228/1862] Fix: Remove stray $i++

---
 htdocs/product/popuprop.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 455fcf636b8..0af9c8052ae 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -260,7 +260,6 @@ if ($mode && $mode != '-1') {
 		print '<td>'.dol_escape_htmltag($vals['label']).'</td>';
 		print '<td class="right">'.$vals['nbline'].'</td>';
 		print "</tr>\n";
-		$i++;
 	}
 } else {
 	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("SelectTheTypeOfObjectToAnalyze").'</span></td></tr>';

From 8ed09542f23ed5a4d5919880e6d204aee68c865b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:04:40 +0100
Subject: [PATCH 1229/1862] Fix Initialise $error to fix
 PhanTypeInvalidUnaryOperandIncOrDec

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

diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index d1ae82983e4..eae9deb3ef0 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -249,6 +250,7 @@ if ($action == "correct_stock") {
 
 // Transfer stock from a warehouse to another warehouse
 if ($action == "transfert_stock" && !$cancel) {
+	$error = 0;
 	$product = new Product($db);
 	if (!empty($product_id)) {
 		$result = $product->fetch($product_id);

From 3183079e306d2e39f157b09e6f39e9ff3ba9f275 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:05:36 +0100
Subject: [PATCH 1230/1862] Fix Initialise $error to fix
 PhanTypeInvalidUnaryOperandIncOrDec

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

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index fbc888a2793..9a054d18375 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -429,6 +429,7 @@ if ($action == "correct_stock") {
 
 // Transfer stock from a warehouse to another warehouse
 if ($action == "transfert_stock" && !$cancel) {
+	$error = 0;
 	$product = new Product($db);
 	if (!empty($product_id)) {
 		$result = $product->fetch($product_id);

From 29d650960c2a4014ca71a0fa3c1e3884ffda42ef Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:08:13 +0100
Subject: [PATCH 1231/1862] Fix Initialise $numline to fix
 PhanTypeInvalidUnaryOperandIncOrDec

---
 htdocs/reception/dispatch.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index 69055aa130c..94258089bed 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2017-2022 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018-2022 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020 Christophe Battarel	<christophe@altairis.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -304,6 +305,7 @@ $supplierorderdispatch = new CommandeFournisseurDispatch($db);
 $title = $object->ref." - ".$langs->trans('ReceptionDistribution');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 $morejs = array('/fourn/js/lib_dispatch.js.php');
+$numline = 0;
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs);
 

From 344ae9e5b470cde09fd402bf1cff220ea30aac87 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:09:04 +0100
Subject: [PATCH 1232/1862] Fix: Remove stray $i++

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

diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 9821a24974b..285beb5742d 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -735,7 +736,6 @@ foreach ($profid as $key => $val) {
 
 		print "</tr>\n";
 	}
-	$i++;
 }
 
 // VAT ID

From 0127cc76f5e18ee9b69ab0893572a1c2bc3d3294 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 17:10:09 +0100
Subject: [PATCH 1233/1862] Qual: Enable PhanTypeInvalidUnaryOperandIncOrDec
 (all fixed)

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 5c021217ac4..4771e953a36 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -482,7 +482,7 @@ return [
 		'PhanTypeInvalidPropertyName',
 		'PhanPluginDuplicateCatchStatementBody',
 		'PhanPluginUndeclaredVariableIsset',
-		'PhanTypeInvalidUnaryOperandIncOrDec',
+		// 'PhanTypeInvalidUnaryOperandIncOrDec',
 		// 'PhanPluginDescriptionlessCommentOnClass',
 		'PhanPluginEmptyStatementIf',
 		'PhanPluginInlineHTMLTrailing',

From 8b165963fa078a7f7776154c4194eed9adb89ffb Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 13 Mar 2024 18:03:10 +0100
Subject: [PATCH 1234/1862] Fix Update prompts for each functions

---
 htdocs/ai/admin/custom_prompt.php | 74 ++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index ee62b646604..699479bbb9e 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -80,8 +80,8 @@ $arrayofaifeatures = array(
  */
 
 $functioncode = GETPOST('functioncode', 'alpha');
-$pre_prompt = GETPOST('prePrompt', 'alpha');
-$post_prompt = GETPOST('postPrompt', 'alpha');
+$pre_prompt = GETPOST('prePrompt');
+$post_prompt = GETPOST('postPrompt');
 // get all configs in const AI
 
 $currentConfigurationsJson = getDolGlobalString('AI_CONFIGURATIONS_PROMPT');
@@ -126,10 +126,31 @@ if ($action == 'update' && !GETPOST('cancel')) {
 	$action = 'edit';
 }
 
-if ($action == 'confirm_deleteproperty') {
+if ($action == 'updatePrompts') {
+	$key = GETPOST('key', 'alpha');
+
+	$currentConfigurations[$key] = [
+		'prePrompt' => $pre_prompt,
+		'postPrompt' => $post_prompt,
+	];
+
+	$newConfigurationsJson = json_encode($currentConfigurations, JSON_UNESCAPED_UNICODE);
+	$result = dolibarr_set_const($db, 'AI_CONFIGURATIONS_PROMPT', $newConfigurationsJson, 'chaine', 0, '', $conf->entity);
+	if (!$error) {
+		$action = 'dodo';
+		if ($result) {
+			header("Location: ".$_SERVER['PHP_SELF']);
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+			exit;
+		} else {
+			setEventMessages($langs->trans("ErrorUpdating"), null, 'errors');
+		}
+	}
+}
+
+if ($action == 'confirm_deleteproperty' && GETPOST('confirm') == 'yes') {
 	$key = GETPOST('key', 'alpha');
 
-	//var_dump($currentConfigurations[$key]);exit;
 	if (isset($currentConfigurations[$key])) {
 		unset($currentConfigurations[$key]);
 
@@ -144,6 +165,9 @@ if ($action == 'confirm_deleteproperty') {
 		}
 	}
 }
+if ($action == 'confirm_deleteproperty') {
+	var_dump(GETPOST('confirm'));exit;
+}
 
 
 /*
@@ -249,7 +273,7 @@ if ($action == 'edit') {
 	$out .= '</table>';
 
 	$out .= $form->buttonsSaveCancel("Add", "");
-
+	$out .= '</form>';
 	$out .= '<br><br><br>';
 
 	print $out;
@@ -269,19 +293,24 @@ if ($action == 'edit' || $action == 'create') {
 			$out .= '<thead>';
 			$out .= '<tr class="liste_titre">';
 			$out .= '<td>'.$arrayofaifeatures[$key]['picto'].' '.$langs->trans($arrayofaifeatures[$key]['label']);
-			$out .= '<a class="editfielda reposition marginleftonly marginrighttonly " href="'.$_SERVER["PHP_SELF"].'?action=editproperty&token='.newToken().'&key='.urlencode($key).'">'.img_edit().'</a>';
+			$out .= '<a class="viewfielda reposition marginleftonly marginrighttonly showInputBtn" href="#" data-index="'.$key.'" data-state="edit" data-icon-edit="'.dol_escape_htmltag(img_edit()).'" data-icon-cancel="'.dol_escape_htmltag(img_view()).'">'.img_edit().'</a>';
 			$out .= '<a class="deletefielda  marginleftonly right" href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&token='.newToken().'&key='.urlencode($key).'">'.img_delete().'</a>';
 			$out .= '</td>';
 			$out .= '<td></td>';
 			$out .= '</tr>';
 			$out .= '</thead>';
 			$out .= '<tbody>';
+
+			$out .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$out .= '<input type="hidden" name="key" value="'.$key.'" />';
+			$out .= '<input type="hidden" name="action" value="updatePrompts">';
 			$out .= '<tr class="oddeven">';
 			$out .= '<td class="col-setup-title">';
 			$out .= '<span id="prePrompt" class="spanforparamtooltip">pre-Prompt</span>';
 			$out .= '</td>';
 			$out .= '<td>';
-			$out .= '<input name="prePrompt" id="prePromptInput" class="flat minwidth500" value="'.$config['prePrompt'].'">';
+			$out .= '<input name="prePrompt" id="prePromptInput_'.$key.'" class="flat minwidth500" value="'.$config['prePrompt'].'" disabled>';
 			$out .= '</td>';
 			$out .= '</tr>';
 			$out .= '<tr class="oddeven">';
@@ -289,15 +318,16 @@ if ($action == 'edit' || $action == 'create') {
 			$out .= '<span id="postPrompt" class="spanforparamtooltip">Post-prompt</span>';
 			$out .= '</td>';
 			$out .= '<td>';
-			$out .= '<input name="postPrompt" id="postPromptInput" class="flat minwidth500" value="'.$config['postPrompt'].'">';
+			$out .= '<input name="postPrompt" id="postPromptInput_'.$key.'" class="flat minwidth500" value="'.$config['postPrompt'].'" disabled>';
+			$out .= '<br><input type="submit" class="button small submitBtn" name="modify" data-index="'.$key.'" style="display: none;" value="'.dol_escape_htmltag($langs->trans("Modify")).'"/>';
 			$out .= '</td>';
 			$out .= '</tr>';
+			$out .= '</form>';
 		}
 		$out .= '</tbody>';
 		$out .= '</table>';
 	}
 
-	$out .= '</form>';
 
 	$out .= "<script>
     var configurations =  ".$currentConfigurationsJson.";
@@ -314,7 +344,31 @@ if ($action == 'edit' || $action == 'create') {
                 $('#postPromptInput').val('');
             }
         });
-    });
+   
+		$('.showInputBtn').click(function() {
+			event.preventDefault();
+			var index = $(this).data('index');
+			var state = $(this).data('state');
+
+			if(state === 'edit') {
+				$('#prePromptInput_'+index).removeAttr('disabled').focus();
+				$('#postPromptInput_'+index).removeAttr('disabled');
+				$('.submitBtn[data-index=' + index + ']').show();
+				$(this).html($(this).data('icon-cancel'));
+				$(this).data('state', 'cancel');
+
+			} else { 
+
+				$('#prePromptInput_'+index).attr('disabled', 'disabled');
+				$('#postPromptInput_'+index).attr('disabled', 'disabled');
+				$('.submitBtn[data-index=' + index + ']').hide();
+				$(this).html($(this).data('icon-edit'));
+				$(this).data('state', 'edit');
+			}
+		});
+	});
+	
+	
     </script>";
 
 	print $out;

From f15725ee33017963885ef13cf75bd7db669484ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 18:10:30 +0100
Subject: [PATCH 1235/1862] Update usergroups.lib.php

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

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 2ffc38d1072..2a0dc0d4bc8 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -199,8 +199,8 @@ function user_prepare_head(User $object)
 			} else {
 				$sql = "SELECT COUNT(ac.id) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as ac";
-				$sql .= " WHERE fk_user_action = ".((int) $object->id);
-				$sql .= " AND entity IN (".getEntity('agenda').")";
+				$sql .= " WHERE ac.fk_user_action = ".((int) $object->id);
+				$sql .= " AND ac.entity IN (".getEntity('agenda').")";
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);

From 7b4c0536c75ad80408733d640b3fbe1e8ae51422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 18:11:40 +0100
Subject: [PATCH 1236/1862] fix warnings

---
 htdocs/hrm/compare.php   | 8 +++++---
 htdocs/hrm/skill_tab.php | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index a75965f797e..8286c7f0cf4 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021  Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021  Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021  Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -278,6 +279,7 @@ $fk_usergroup1 = GETPOST('fk_usergroup1');
 print dol_get_fiche_end();
 
 llxFooter();
+$db->close();
 
 
 
@@ -357,10 +359,10 @@ function rate(&$TMergedSkills, $field)
 }
 
 /**
- * 	  	return a html ul list of skills
+ * return a html ul list of skills
  *
- * 			@param array $TMergedSkills skill list for display
- * 			@return string (ul list in html )
+ * @param array $TMergedSkills skill list for display
+ * @return string (ul list in html )
  */
 function skillList(&$TMergedSkills)
 {
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index c7a0e1bd988..a1e71528361 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -481,6 +482,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$rslt = $db->query($sqlEval);
 		$numEval = $db->num_rows($sqlEval);
 
+		$page = 0;
 		print_barre_liste($langs->trans("Evaluations"), $page, $_SERVER["PHP_SELF"], '', '', '', '', $numEval, $numEval, $evaltmp->picto, 0);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -547,6 +549,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	print dol_get_fiche_end();
-
-	llxFooter();
 }
+
+llxFooter();
+$db->close();

From e01d9452d50a5526277b3941ab4cc6d9374553b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 18:12:00 +0100
Subject: [PATCH 1237/1862] Update agenda.php

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

diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index af23913a051..229c299a2e7 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -89,7 +89,7 @@ if (($object->id != $user->id) && !$user->hasRight('user', 'user', 'lire')) {
 	accessforbidden();
 }
 
-$parameters = array('id' => $user->id);
+$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');

From 09b11719c436a01c87e155bc73e7dca003d5d46f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 18:15:36 +0100
Subject: [PATCH 1238/1862] Update report.php

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

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 5a863e5e410..bf6a7310720 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -210,7 +210,7 @@ if ($resql) {
 	$transactionspertype = array();
 	$amountpertype = array();
 
-	$totalarray = array('nbfield' => 0,'pos' => array());
+	$totalarray = array('nbfield' => 0, 'pos' => array());
 	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 

From f7ec65f10415292eec3f274b7dbb054596b9892e Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 13 Mar 2024 18:16:55 +0100
Subject: [PATCH 1239/1862] Add error msg foin ai generate_content

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

diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index 2d65256ad01..11aaa3e787b 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -72,6 +72,8 @@ if (is_array($generatedContent) && $generatedContent['error']) {
 	if ($generatedContent['code'] >= 400) {
 		print "Error : " . $generatedContent['message'];
 		print '<br><a href="'.DOL_MAIN_URL_ROOT.'/ai/admin/setup.php">'.$langs->trans('Check Config of Module').'</a>';
+	} elseif ($generatedContent['code'] == 429) {
+		print "Quota or allowed period exceeded. Retry Later !";
 	} else {
 		print "Error returned by API call: " . $generatedContent['message'];
 	}

From 26fe76733c717a3fa1191edfe69df149a20e7f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 18:20:41 +0100
Subject: [PATCH 1240/1862] fix warnings

---
 htdocs/commande/class/commande.class.php                     | 4 ++--
 htdocs/core/class/html.form.class.php                        | 2 +-
 htdocs/core/class/utils.class.php                            | 5 +++--
 htdocs/core/lib/company.lib.php                              | 2 +-
 htdocs/core/lib/functions.lib.php                            | 2 +-
 .../core/modules/asset/doc/doc_generic_asset_odt.modules.php | 4 ++--
 htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php | 4 ++--
 htdocs/core/modules/hrm/mod_evaluation_advanced.php          | 2 +-
 htdocs/core/modules/hrm/mod_evaluation_standard.php          | 2 +-
 htdocs/core/tpl/advtarget.tpl.php                            | 3 ++-
 10 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b7d2e37c24d..07dccd2bf24 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1317,8 +1317,8 @@ class Commande extends CommonOrder
 	{
 		global $conf, $hookmanager;
 
-		dol_include_once('/multicurrency/class/multicurrency.class.php');
-		dol_include_once('/core/class/extrafields.class.php');
+		require_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 
 		$error = 0;
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4a3f654a83e..cee9e9bfafd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6009,7 +6009,7 @@ class Form
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';
 			print '</form>';
 		} else {
-			dol_include_once('/core/lib/company.lib.php');
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 			print !empty($selected) ? currency_name($selected, 1) : '&nbsp;';
 		}
 	}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 810ee8f24fc..6b00c3bc17b 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2022		Anthony Berton		<anthony.berton@bb2a.fr>
  * Copyright (C) 2023-2024	William Mead		<william.mead@manchenumerique.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1006,7 +1007,7 @@ class Utils
 			return -1;
 		}
 
-		dol_include_once('/core/lib/files.lib.php');
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 		$nbSaves = intval(getDolGlobalString('SYSLOG_FILE_SAVES', 10));
 
@@ -1412,7 +1413,7 @@ class Utils
 		dol_syslog("Utils::cleanUnfinishedCronjob Starting cleaning");
 
 		// Import Cronjob class if not present
-		dol_include_once('/cron/class/cronjob.class.php');
+		require_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
 
 		// Get this job object
 		$this_job = new Cronjob($db);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2384751a523..07395e49191 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1615,7 +1615,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		$tms_start = '';
 		$tms_end = '';
 	}
-	dol_include_once('/comm/action/class/actioncomm.class.php');
+	require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
 
 	// Check parameters
 	if (!is_object($filterobj) && !is_object($objcon)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2c94e4d4a8c..7b0edc2931b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13129,7 +13129,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
 
 	global $param, $massactionbutton;
 
-	dol_include_once('/comm/action/class/actioncomm.class.php');
+	require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
 
 	// Check parameters
 	if (!is_object($filterobj) && !is_object($objcon)) {
diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index 7e6405baf78..b01f50afb70 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
  *	\brief      File of class to build ODT documents for assets
  */
 
-dol_include_once('/asset/core/modules/asset/modules_asset.php');
+require_once DOL_DOCUMENT_ROOT . '/asset/core/modules/asset/modules_asset.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index 15a9d3bf15c..5b6dc78bf0c 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
  *  \brief      File of class to generate document from standard template
  */
 
-dol_include_once('/asset/core/modules/asset/modules_asset.php');
+require_once DOL_DOCUMENT_ROOT . '/asset/core/modules/asset/modules_asset.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
index 78d396d909b..f5b236d4594 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_advanced.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
@@ -26,7 +26,7 @@
  * \brief      File containing class for advanced numbering model of Evaluation
  */
 
-dol_include_once('/core/modules/hrm/modules_evaluation.php');
+ require_once DOL_DOCUMENT_ROOT . '/core/modules/hrm/modules_evaluation.php';
 
 
 /**
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
index 9a568923e44..eb69f3c0953 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_standard.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php
@@ -23,7 +23,7 @@
  *  \ingroup    hrm
  *  \brief      File of class to manage Evaluation numbering rules standard
  */
-dol_include_once('/core/modules/hrm/modules_evaluation.php');
+require_once DOL_DOCUMENT_ROOT . '/core/modules/hrm/modules_evaluation.php';
 
 
 /**
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 225707f0828..a4c13f5cd4f 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  */
 /*
  *
@@ -274,7 +275,7 @@ if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 	$socstatic = new Societe($db);
 	$elementtype = $socstatic->table_element;
 	// fetch optionals attributes and labels
-	dol_include_once('/core/class/extrafields.class.php');
+	require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
 	$extrafields = new ExtraFields($db);
 	$extrafields->fetch_name_optionals_label($elementtype);
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {

From 439654a634209b505c367fb2334ce089e195c129 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 18:24:35 +0100
Subject: [PATCH 1241/1862] Fix ternary of ternary too difficult to read

---
 htdocs/user/ldap.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index f2e9a3708d2..328e14910ae 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -126,7 +126,10 @@ print '</tr>';
 if (getDolGlobalString('LDAP_SERVER_TYPE') == "activedirectory") {
 	$ldap = new Ldap();
 	$result = $ldap->connectBind();
-	($result > 0) ? ($userSID = $ldap->getObjectSid($object->login)) : $userSID = '';
+	$userSID = '';
+	if ($result > 0) {
+		$userSID = $ldap->getObjectSid($object->login);
+	}
 	print '<tr><td class="valigntop">'.$langs->trans("SID").'</td>';
 	print '<td>'.$userSID.'</td>';
 	print "</tr>\n";

From 769fafbdea5890d29e53ed34f63942fac61198c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 18:24:59 +0100
Subject: [PATCH 1242/1862] fix warnings

---
 .../conferenceorboothattendee_note.php        | 54 ++-----------------
 1 file changed, 4 insertions(+), 50 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 99768a9b738..66caf29a247 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,59 +23,12 @@
  *    \brief      Tab for notes on ConferenceOrBoothAttendee
  */
 
-//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('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('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--;
-	$j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
+require '../main.inc.php';
 
-dol_include_once('/eventorganization/class/conferenceorboothattendee.class.php');
-dol_include_once('/eventorganization/lib/eventorganization_conferenceorboothattendee.lib.php');
+require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT . '/eventorganization/lib/eventorganization_conferenceorboothattendee.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('eventorganization', 'companies'));

From 3cc9467ee4a00f6bfb8604e84ca210309bec651a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 18:39:51 +0100
Subject: [PATCH 1243/1862] Clean code

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

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index c3cfdf85fca..91e7d127486 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -198,7 +198,7 @@ class CMailFile
 			}
 		}
 		if (empty($this->sendmode)) {
-			$this->sendmode = (getDolGlobalString('MAIN_MAIL_SENDMODE') ? $conf->global->MAIN_MAIL_SENDMODE : 'mail');
+			$this->sendmode = getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail');
 		}
 
 		// Add a Feedback-ID. Must be used for stats on spam report only.

From ec7ff74f2561cd685cf9fd75751c6fae0e67d25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 18:45:02 +0100
Subject: [PATCH 1244/1862] clean code

---
 htdocs/ai/admin/custom_prompt.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 699479bbb9e..c791479eca8 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -137,7 +138,7 @@ if ($action == 'updatePrompts') {
 	$newConfigurationsJson = json_encode($currentConfigurations, JSON_UNESCAPED_UNICODE);
 	$result = dolibarr_set_const($db, 'AI_CONFIGURATIONS_PROMPT', $newConfigurationsJson, 'chaine', 0, '', $conf->entity);
 	if (!$error) {
-		$action = 'dodo';
+		$action = '';
 		if ($result) {
 			header("Location: ".$_SERVER['PHP_SELF']);
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -165,9 +166,6 @@ if ($action == 'confirm_deleteproperty' && GETPOST('confirm') == 'yes') {
 		}
 	}
 }
-if ($action == 'confirm_deleteproperty') {
-	var_dump(GETPOST('confirm'));exit;
-}
 
 
 /*
@@ -344,7 +342,7 @@ if ($action == 'edit' || $action == 'create') {
                 $('#postPromptInput').val('');
             }
         });
-   
+
 		$('.showInputBtn').click(function() {
 			event.preventDefault();
 			var index = $(this).data('index');
@@ -357,7 +355,7 @@ if ($action == 'edit' || $action == 'create') {
 				$(this).html($(this).data('icon-cancel'));
 				$(this).data('state', 'cancel');
 
-			} else { 
+			} else {
 
 				$('#prePromptInput_'+index).attr('disabled', 'disabled');
 				$('#postPromptInput_'+index).attr('disabled', 'disabled');
@@ -367,8 +365,8 @@ if ($action == 'edit' || $action == 'create') {
 			}
 		});
 	});
-	
-	
+
+
     </script>";
 
 	print $out;

From 45a68ba612d3d4bf8b442605a784428690e72c1e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 20:17:26 +0100
Subject: [PATCH 1245/1862] Better error management

---
 htdocs/core/lib/files.lib.php                 | 14 +++++-----
 htdocs/core/lib/modulebuilder.lib.php         | 27 +++++++++++++++----
 htdocs/langs/en_US/errors.lang                |  2 +-
 htdocs/modulebuilder/index.php                | 21 ++++++++-------
 .../core/modules/modMyModule.class.php        | 10 +++++--
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index d19e28faa01..960d9ee7eec 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -644,19 +644,17 @@ function dol_fileperm($pathoffile)
 /**
  * Make replacement of strings into a file.
  *
- * @param	string	$srcfile			       Source file (can't be a directory)
+ * @param	string					$srcfile			       Source file (can't be a directory)
  * @param	array<string,string>	$arrayreplacement	       Array with strings to replace. Example: array('valuebefore'=>'valueafter', ...)
- * @param	string	$destfile			       Destination file (can't be a directory). If empty, will be same than source file.
- * @param	string	$newmask			       Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
- * @param	int		$indexdatabase		       1=index new file into database.
- * @param   int     $arrayreplacementisregex   1=Array of replacement is already an array with key that is a regex. Warning: the key must be escaped with preg_quote for '/'
- * @return	int							       Return integer <0 if error, 0 if nothing done (dest file already exists), >0 if OK
+ * @param	string					$destfile			       Destination file (can't be a directory). If empty, will be same than source file.
+ * @param	string					$newmask			       Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
+ * @param	int						$indexdatabase		       1=index new file into database.
+ * @param   int     				$arrayreplacementisregex   1=Array of replacement is already an array with key that is a regex. Warning: the key must be escaped with preg_quote for '/'
+ * @return	int											       Return integer <0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dol_copy()
  */
 function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = '0', $indexdatabase = 0, $arrayreplacementisregex = 0)
 {
-	global $conf;
-
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase." arrayreplacementisregex=".$arrayreplacementisregex);
 
 	if (empty($srcfile)) {
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 19d9c9319a2..68e8b982cce 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -456,20 +456,37 @@ function dolGetListOfObjectClasses($destdir)
 
 	return -1;
 }
+
 /**
- * function for check if comment begin an end exist in modMyModule class
- * @param  string  $file    filename or path
- * @param  int     $number   0 = For Menus,1 = For permissions, 2 = For Dictionaries
- * @return int     1 if OK , -1 if KO
+ * Function to check if comment begin an end exist in modMyModule class
+ *
+ * @param  string  $file    	Filename or path
+ * @param  int     $number   	0 = For Menus,1 = For permissions, 2 = For Dictionaries
+ * @return int     				1 if OK , -1 if KO
  */
 function checkExistComment($file, $number)
 {
 	if (!file_exists($file)) {
 		return -1;
 	}
+
 	$content = file_get_contents($file);
 	if ($number === 0) {
-		if (strpos($content, '/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */') !== false && strpos($content, '/* END MODULEBUILDER LEFTMENU MYOBJECT */') !== false) {
+		$ret = 0;
+		if (strpos($content, '/* BEGIN MODULEBUILDER TOPMENU MYOBJECT */') !== false) {
+			$ret++;
+		}
+		if (strpos($content, '/* END MODULEBUILDER TOPMENU MYOBJECT */') !== false) {
+			$ret++;
+		}
+		if (strpos($content, '/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */') !== false) {
+			$ret++;
+		}
+		if (strpos($content, '/* END MODULEBUILDER LEFTMENU MYOBJECT */') !== false) {
+			$ret++;
+		}
+
+		if ($ret == 4) {
 			return 1;
 		}
 	} elseif ($number === 1) {
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 3290d9a2251..fe7cb304610 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -374,7 +374,7 @@ WarningModuleNeedRefresh = Module <b>%s</b> has been disabled. Don't forget to e
 WarningPermissionAlreadyExist=Existing permissions for this object
 WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
 WarningCorrectedInvoiceNotFound=Corrected invoice not found
-WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
+WarningCommentNotFound=Warning: Can't find the start and/or end comments for the section <b>%s</b> into the file <b>%s</b>
 WarningAlreadyReverse=Stock movement already reversed
 
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 6d1a5a85d06..1e78c341f06 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1017,6 +1017,8 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 
 // Init an object
 if ($dirins && $action == 'initobject' && $module && $objectname) {
+	$warning = 0;
+
 	$objectname = ucfirst($objectname);
 
 	$dirins = $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
@@ -1365,13 +1367,12 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 			}
 		}
 
-
 		if (!$error) {
 			foreach ($filetogenerate as $srcfile => $destfile) {
 				$result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile, $newmask, 0);
 				if ($result <= 0) {
 					if ($result < 0) {
-						$error++;
+						$warning++;
 						$langs->load("errors");
 						setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
 					} else {
@@ -1383,6 +1384,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 					'/myobject\.class\.php/' => strtolower($objectname).'.class.php',
 					'/myobject\.lib\.php/' => strtolower($objectname).'.lib.php',
 				);
+
 				dolReplaceInFile($destdir.'/'.$destfile, $arrayreplacement, '', 0, 0, 1);
 			}
 		}
@@ -1529,8 +1531,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 		if (!$counter) {
 			$checkComment = checkExistComment($moduledescriptorfile, 0);
 			if ($checkComment < 0) {
-				$error++;
-				setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Menus"), "mod".$module."class.php"), null, 'warnings');
+				$warning++;
+				setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Menus"), basename($moduledescriptorfile)), null, 'warnings');
 			} else {
 				$arrayofreplacement = array('/* END MODULEBUILDER LEFTMENU MYOBJECT */' => '/*LEFTMENU '.strtoupper($objectname).'*/'.$stringtoadd."\n\t\t".'/*END LEFTMENU '.strtoupper($objectname).'*/'."\n\t\t".'/* END MODULEBUILDER LEFTMENU MYOBJECT */');
 				dolReplaceInFile($moduledescriptorfile, $arrayofreplacement);
@@ -1580,7 +1582,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 		if (is_numeric($object) && $object <= 0) {
 			$pathoffiletoeditsrc = $destdir.'/class/'.strtolower($objectname).'.class.php';
 			setEventMessages($langs->trans('ErrorFailToCreateFile', $pathoffiletoeditsrc), null, 'errors');
-			$error++;
+			$warning++;
 		}
 		// check if documentation was generate and add table of properties object
 		$file = $destdir.'/class/'.strtolower($objectname).'.class.php';
@@ -1610,7 +1612,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 	// check if module is enabled
 	if (isModEnabled(strtolower($module))) {
 		$result = unActivateModule(strtolower($module));
-		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
 		if ($result) {
 			setEventMessages($result, null, 'errors');
 		}
@@ -1898,11 +1900,12 @@ if ($dirins && $action == 'confirm_deletemodule') {
 		} else {
 			$error++;
 			$langs->load("errors");
-			dol_print_error($db, $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
-			exit;
+			setEventMessages($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module), null, 'warnings');
 		}
 
-		$moduleobj->remove();
+		if ($moduleobj) {
+			$moduleobj->remove();
+		}
 
 		$result = dol_delete_dir_recursive($dir);
 
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 0b166dd54b1..53c7957cf78 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -28,6 +28,7 @@
  */
 include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
+
 /**
  *  Description and activation class for module MyModule
  */
@@ -303,8 +304,10 @@ class modMyModule extends DolibarrModules
 		// Main menu entries to add
 		$this->menu = array();
 		$r = 0;
+
 		// Add here entries to declare new menus
-		/* BEGIN MODULEBUILDER TOPMENU */
+
+		/* BEGIN MODULEBUILDER TOPMENU MYOBJECT */
 		$this->menu[$r++] = array(
 			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'top', // This is a Top menu entry
@@ -320,7 +323,8 @@ class modMyModule extends DolibarrModules
 			'target'=>'',
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
 		);
-		/* END MODULEBUILDER TOPMENU */
+		/* END MODULEBUILDER TOPMENU MYOBJECT */
+
 		/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */
 		/*$this->menu[$r++]=array(
 			'fk_menu'=>'fk_mainmenu=mymodule',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@@ -366,6 +370,8 @@ class modMyModule extends DolibarrModules
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);*/
 		/* END MODULEBUILDER LEFTMENU MYOBJECT */
+
+
 		// Exports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */

From 345edd56fb7de26ad1e90f5a2c1c2f7651e7550e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 21:07:56 +0100
Subject: [PATCH 1246/1862] clean code

---
 htdocs/hrm/class/evaluation.class.php    | 39 ++----------------
 htdocs/hrm/class/evaluationdet.class.php | 44 ++-------------------
 htdocs/hrm/class/job.class.php           | 40 ++-----------------
 htdocs/hrm/class/position.class.php      | 38 +-----------------
 htdocs/hrm/class/skill.class.php         | 41 ++-----------------
 htdocs/hrm/class/skilldet.class.php      | 35 +----------------
 htdocs/hrm/class/skillrank.class.php     | 50 +-----------------------
 7 files changed, 18 insertions(+), 269 deletions(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 06eb51043b1..d44468aaf8f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -30,8 +30,7 @@
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluationdet.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
 
 /**
  * Class for Evaluation
@@ -322,8 +321,7 @@ class Evaluation extends CommonObject
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -920,8 +918,7 @@ class Evaluation extends CommonObject
 		$result = $objectline->fetchAll('ASC', '', 0, 0, '(fk_evaluation:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
-			$this->error = $objectline->error;
-			$this->errors = $objectline->errors;
+			$this->setErrorsFromObject($objectline);
 			return $result;
 		} else {
 			$this->lines = $result;
@@ -1022,36 +1019,6 @@ class Evaluation extends CommonObject
 		return $result;
 	}
 
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-
 	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index f0f2612d0c1..5635afc434f 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -28,10 +28,9 @@
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
 
 /**
  * Class for EvaluationLine
@@ -288,8 +287,7 @@ class EvaluationLine extends CommonObjectLine
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -890,8 +888,7 @@ class EvaluationLine extends CommonObjectLine
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_evaluationdet:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
-			$this->error = $objectline->error;
-			$this->errors = $objectline->errors;
+			$this->setErrorsFromObject($objectline);
 			return $result;
 		} else {
 			$this->lines = $result;
@@ -992,37 +989,4 @@ class EvaluationLine extends CommonObjectLine
 
 		return $result;
 	}
-
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
 }
-
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index c0ec08939d4..19c22de1b02 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -29,8 +29,7 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
 
 /**
  * Class for Job
@@ -292,8 +291,7 @@ class Job extends CommonObject
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -928,8 +926,7 @@ class Job extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_job:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
-			$this->error = $objectline->error;
-			$this->errors = $objectline->errors;
+			$this->setErrorsFromObject($objectline);
 			return $result;
 		} else {
 			$this->lines = $result;
@@ -1031,36 +1028,6 @@ class Job extends CommonObject
 		return $result;
 	}
 
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-
 	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
@@ -1097,6 +1064,7 @@ class Job extends CommonObject
 		$return .= '</div>';
 		return $return;
 	}
+
 	/**
 	 * function for get required skills associate to job object
 	 * @param int  $id  Id of object
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index f15e98131ca..68467a84c43 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -29,8 +29,6 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
  * Class for Position
@@ -301,8 +299,7 @@ class Position extends CommonObject
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -970,8 +967,7 @@ class Position extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, '(fk_position:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
-			$this->error = $objectline->error;
-			$this->errors = $objectline->errors;
+			$this->setErrorsFromObject($objectline);
 			return $result;
 		} else {
 			$this->lines = $result;
@@ -1088,36 +1084,6 @@ class Position extends CommonObject
 		return $result;
 	}
 
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return    int            0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-
 	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index aefd68a0bea..bd2fea61de8 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -29,8 +29,6 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
  * Class for Skill
@@ -351,8 +349,7 @@ class Skill extends CommonObject
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -414,8 +411,7 @@ class Skill extends CommonObject
 		if (is_array($this->lines)) {
 			return (count($this->lines) > 0) ? $this->lines : array();
 		} elseif ($this->lines < 0) {
-			$this->errors = array_merge($this->errors, $skilldet->errors);
-			$this->error = $skilldet->error;
+			$this->setErrorsFromObject($skilldet);
 			return $this->lines;
 		}
 		return [];
@@ -969,8 +965,7 @@ class Skill extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, '(fk_skill:=:'.((int) $this->id).')');
 
 		if (is_numeric($result)) {
-			$this->error = $objectline->error;
-			$this->errors = $objectline->errors;
+			$this->setErrorsFromObject($objectline);
 			return $result;
 		} else {
 			$this->lines = $result;
@@ -1072,36 +1067,6 @@ class Skill extends CommonObject
 		return $result;
 	}
 
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-
 	/**
 	 * @param int $code number of code label
 	 * @return int|string
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 83ccae8c5ab..edfc3886843 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -29,8 +29,6 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
  * Class for Skilldet
@@ -283,8 +281,7 @@ class Skilldet extends CommonObjectLine
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -959,34 +956,4 @@ class Skilldet extends CommonObjectLine
 
 		return $result;
 	}
-
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
 }
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 245a6d8ba6c..27400f33638 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -309,8 +309,7 @@ class SkillRank extends CommonObject
 		$result = $object->createCommon($user);
 		if ($result < 0) {
 			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
+			$this->setErrorsFromObject($object);
 		}
 
 		if (!$error) {
@@ -1033,51 +1032,4 @@ class SkillRank extends CommonObject
 
 		return $result;
 	}
-
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
-
-	/**
-	 * @param array $val
-	 * @param string $key
-	 * @param string $value
-	 * @param string $moreparam
-	 * @param string $keysuffix
-	 * @param string $keyprefix
-	 * @param string $morecss
-	 * @return string
-	 */
-	//  public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '')
-	//  {
-	//      if ($key == "rank") {
-	//          return displayRankInfos($this);
-	//      } else return parent::showOutputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
-	//  }
 }

From 93d2cad7fec316ef245917b09ef028ff8dba0ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 13 Mar 2024 21:33:51 +0100
Subject: [PATCH 1247/1862] fix warnings

---
 htdocs/user/messaging.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php
index f28ee2aa0cc..319a00e9f5e 100644
--- a/htdocs/user/messaging.php
+++ b/htdocs/user/messaging.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2007      Patrick Raguin  		<patrick.raguin@gmail.com>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,6 +51,8 @@ if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
+$id = GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('id');
+$ref = GETPOST('ref', 'alpha');
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -74,6 +77,9 @@ if (!$sortorder) {
 $object = new User($db);
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref, '', 1);
+	if ($result <= 0) {
+		accessforbidden('User not found');
+	}
 	$object->getrights();
 }
 
@@ -81,18 +87,17 @@ if ($id > 0 || !empty($ref)) {
 $hookmanager->initHooks(array('agendathirdparty', 'globalcard'));
 
 // Security check
-$userid = GETPOSTINT('userid') ? GETPOSTINT('userid') : GETPOSTINT('id');
 if ($user->id) {
-	$userId = $user->id;
+	$id = $user->id;
 }
 
-$result = $object->fetch($userid);
-if ($result <= 0) {
-	accessforbidden('User not found');
+// Security check
+$socid = 0;
+if ($user->socid > 0) {
+	$socid = $user->socid;
 }
-
-$result = restrictedArea($user, 'user', $userId, '&user');
-
+$feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user');
+$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
 
 /*
@@ -153,7 +158,7 @@ $morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->tra
 dol_banner_tab($object, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
-$object->info($userid);
+$object->info($id);
 
 
 print '<div class="fichecenter">';
@@ -196,7 +201,7 @@ if (isModEnabled('agenda')) {
 
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allaactions', 'read'))) {
 	print '<br>';
-	$param = '&userid='.urlencode((string) ($userid));
+	$param = '&userid='.urlencode((string) ($id));
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
@@ -208,7 +213,7 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	// Try to know count of actioncomm from cache
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 	$cachekey = 'count_events_user_'.$object->id;
-	//$nbEvent = dol_getcache($cachekey);	// TODO Add nb into badge in menu so we can get it from cache also here
+	$nbEvent = dol_getcache($cachekey);	// TODO Add nb into badge in menu so we can get it from cache also here
 
 	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {

From a0b26ae7cd293306e8908ff166e41bfc2cbe07e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 21:41:55 +0100
Subject: [PATCH 1248/1862] FIX Amount of localtaxes in foreign currency was
 wrong on screen and PDF

---
 htdocs/comm/propal/card.php                   |  8 ++++++--
 htdocs/comm/propal/class/propal.class.php     |  2 ++
 htdocs/commande/card.php                      |  8 ++++++--
 htdocs/commande/class/commande.class.php      |  2 ++
 htdocs/compta/facture/card.php                |  8 ++++++--
 htdocs/compta/facture/class/facture.class.php |  2 ++
 .../commande/doc/pdf_einstein.modules.php     | 17 +++++++++++++----
 .../commande/doc/pdf_eratosthene.modules.php  | 17 +++++++++++++----
 .../modules/facture/doc/pdf_crabe.modules.php | 19 +++++++++++++------
 .../facture/doc/pdf_sponge.modules.php        | 19 +++++++++++++------
 .../modules/propale/doc/pdf_azur.modules.php  | 19 +++++++++++++------
 .../modules/propale/doc/pdf_cyan.modules.php  | 19 +++++++++++++------
 12 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3e201e1f683..97ed893601d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2857,7 +2857,9 @@ if ($action == 'create') {
 		print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
 		print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			$object->multicurrency_total_localtax1 = price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
+
+			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
@@ -2866,7 +2868,9 @@ if ($action == 'create') {
 			print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
 			print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				$object->multicurrency_total_localtax2 = price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
+
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 		}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index ec2fa41b991..48efe44c41c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -272,6 +272,8 @@ class Propal extends CommonObject
 	public $multicurrency_total_ht;
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
+	public $multicurrency_total_localtax1;	// not in database
+	public $multicurrency_total_localtax2;	// not in database
 
 
 	/**
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 71aefc2e708..bf55cdd65e2 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2770,7 +2770,9 @@ if ($action == 'create' && $usercancreate) {
 			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
 			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				$object->multicurrency_total_localtax1 = price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
+
+				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
@@ -2780,7 +2782,9 @@ if ($action == 'create' && $usercancreate) {
 				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
 				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					$object->multicurrency_total_localtax2 = price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
+
+					print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 				}
 				print '</tr>';
 			}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6b6037d62d5..3ab9910376c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -275,6 +275,8 @@ class Commande extends CommonOrder
 	public $multicurrency_total_ht;
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
+	public $multicurrency_total_localtax1;	// not in database
+	public $multicurrency_total_localtax2;	// not in database
 
 	//! key of module source when order generated from a dedicated module ('cashdesk', 'takepos', ...)
 	public $module_source;
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 43b1087d89c..4310d340844 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4904,7 +4904,9 @@ if ($action == 'create') {
 		print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
 		print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+			$object->multicurrency_total_localtax1 = price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
+
+			print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 		}
 		print '</tr>';
 
@@ -4913,7 +4915,9 @@ if ($action == 'create') {
 			print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
 			print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($sign * $object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				$object->multicurrency_total_localtax2 = price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
+
+				print '<td class="nowrap amountcard right">' . price($sign * $object->multicurrency_total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 		}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index cf84bbd1b44..405d14e39ed 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -262,6 +262,8 @@ class Facture extends CommonInvoice
 	public $multicurrency_total_ht;
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
+	public $multicurrency_total_localtax1;	// not in database
+	public $multicurrency_total_localtax2;	// not in database
 
 	/**
 	 * @var int Situation cycle reference number
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 3f1a62c1b2b..b9d4661b679 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -988,8 +988,10 @@ class pdf_einstein extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1018,8 +1020,10 @@ class pdf_einstein extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1079,8 +1083,11 @@ class pdf_einstein extends ModelePDFCommandes
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1112,8 +1119,10 @@ class pdf_einstein extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index f6f9cf79bfa..449d29f62a8 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -1194,8 +1194,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1224,8 +1226,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1285,8 +1289,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1318,8 +1325,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index a0b26a8b17c..9a8e48e6f83 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1426,8 +1426,6 @@ class pdf_crabe extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
-				// FIXME amount of vat not supported with multicurrency
-
 				//Local tax 1 before VAT
 				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1454,8 +1452,10 @@ class pdf_crabe extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1485,8 +1485,10 @@ class pdf_crabe extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1546,8 +1548,11 @@ class pdf_crabe extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1576,8 +1581,10 @@ class pdf_crabe extends ModelePDFFactures
 						$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+						$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 				//}
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 57596f3edca..1b583bab5f4 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1689,8 +1689,6 @@ class pdf_sponge extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
-				// FIXME amount of vat not supported with multicurrency
-
 				//Local tax 1 before VAT
 				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1717,8 +1715,10 @@ class pdf_sponge extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1748,8 +1748,10 @@ class pdf_sponge extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1833,8 +1835,11 @@ class pdf_sponge extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1866,8 +1871,10 @@ class pdf_sponge extends ModelePDFFactures
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 85576e467ec..50a5af68ad4 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1168,8 +1168,10 @@ class pdf_azur extends ModelePDFPropales
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1186,8 +1188,6 @@ class pdf_azur extends ModelePDFPropales
 						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
-
-
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
@@ -1200,8 +1200,10 @@ class pdf_azur extends ModelePDFPropales
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1260,8 +1262,11 @@ class pdf_azur extends ModelePDFPropales
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1292,8 +1297,10 @@ class pdf_azur extends ModelePDFPropales
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 153a0460d84..67e49fca891 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1289,8 +1289,10 @@ class pdf_cyan extends ModelePDFPropales
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1307,8 +1309,6 @@ class pdf_cyan extends ModelePDFPropales
 						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
-
-
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
@@ -1322,8 +1322,10 @@ class pdf_cyan extends ModelePDFPropales
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1377,8 +1379,11 @@ class pdf_cyan extends ModelePDFPropales
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}
@@ -1410,8 +1415,10 @@ class pdf_cyan extends ModelePDFPropales
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
+
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
 						}
 					}
 				}

From 9c876b28419c1c2cfcb398693022ed799caf9ab6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 22:22:32 +0100
Subject: [PATCH 1249/1862] Fix phpunit

---
 htdocs/ai/admin/custom_prompt.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 699479bbb9e..7790c822249 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -165,9 +165,6 @@ if ($action == 'confirm_deleteproperty' && GETPOST('confirm') == 'yes') {
 		}
 	}
 }
-if ($action == 'confirm_deleteproperty') {
-	var_dump(GETPOST('confirm'));exit;
-}
 
 
 /*
@@ -344,7 +341,7 @@ if ($action == 'edit' || $action == 'create') {
                 $('#postPromptInput').val('');
             }
         });
-   
+
 		$('.showInputBtn').click(function() {
 			event.preventDefault();
 			var index = $(this).data('index');
@@ -357,7 +354,7 @@ if ($action == 'edit' || $action == 'create') {
 				$(this).html($(this).data('icon-cancel'));
 				$(this).data('state', 'cancel');
 
-			} else { 
+			} else {
 
 				$('#prePromptInput_'+index).attr('disabled', 'disabled');
 				$('#postPromptInput_'+index).attr('disabled', 'disabled');
@@ -367,8 +364,8 @@ if ($action == 'edit' || $action == 'create') {
 			}
 		});
 	});
-	
-	
+
+
     </script>";
 
 	print $out;

From ee214ae7fd8500afe493720afb4845aa8858b71d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Mar 2024 22:39:41 +0100
Subject: [PATCH 1250/1862] Test to avoid not found method

---
 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 2f794579b7b..bcc2e9864e9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8322,7 +8322,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			'__USER_SIGNATURE__' => (string) (($usersignature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')
 		));
 
-		if (is_object($user)) {
+		if (is_object($user) && ($user instanceof User)) {
 			$substitutionarray = array_merge($substitutionarray, array(
 				'__USER_ID__' => (string) $user->id,
 				'__USER_LOGIN__' => (string) $user->login,

From a50bab344e34abb188280bd89ff546d9ca702852 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 00:26:45 +0100
Subject: [PATCH 1251/1862] Fix problem in phpStan

---
 htdocs/ai/admin/custom_prompt.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index ee62b646604..abdf755ffd5 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -129,7 +129,6 @@ if ($action == 'update' && !GETPOST('cancel')) {
 if ($action == 'confirm_deleteproperty') {
 	$key = GETPOST('key', 'alpha');
 
-	//var_dump($currentConfigurations[$key]);exit;
 	if (isset($currentConfigurations[$key])) {
 		unset($currentConfigurations[$key]);
 

From a504207ed1ce43e90f4ceb1409871d8ccbfa7875 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 01:28:30 +0100
Subject: [PATCH 1252/1862] New msg for prompt ai before display result

---
 htdocs/core/class/html.formmail.class.php | 6 ++++++
 htdocs/langs/en_US/help.lang              | 1 +
 htdocs/theme/eldy/global.inc.php          | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index be4e7a242e2..00e2cd60f04 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1454,6 +1454,7 @@ class FormMail extends Form
 		$out .= '<td>';
 		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="'.$langs->trans("EnterYourAIPromptHere").'..." />';
 		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
+		$out .= '<div id="ai_status_message" class="fieldrequired dispwaitmsg" >'.$langs->trans("AIProcessingPleaseWait").'</div>';
 		$out .= "</td></tr>\n";
 
 		$out .= "<script type='text/javascript'>
@@ -1468,6 +1469,8 @@ class FormMail extends Form
 
 				$('#generate_button').click(function() {
 					var instructions = $('#ai_instructions').val();
+					
+					$('#ai_status_message').show();
 
 					//editor on readonly
         			if (CKEDITOR.instances.message) {
@@ -1494,10 +1497,13 @@ class FormMail extends Form
 
 							// remove readonly
 							$('#ai_instructions').val('');
+
+							$('#ai_status_message').hide();
 						},
 						error: function(xhr, status, error) {
 							alert(error);
 							console.error('error ajax', status, error);
+							$('#ai_status_message').hide();
 						}
 
 					});
diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
index 17a6104d59a..88a1b006591 100644
--- a/htdocs/langs/en_US/help.lang
+++ b/htdocs/langs/en_US/help.lang
@@ -21,3 +21,4 @@ LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for yo
 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>
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
\ No newline at end of file
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3c87a03153a..36a067e956a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3759,6 +3759,9 @@ input.button[name="upload"] {
 input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
 	font-size: 0.8em;
 }
+.dispwaitmsg {
+	display : none;
+}
 input.buttonlink {
 	color: var(--colortextlink);
 	background-color: transparent;

From 7629455b7d89dc0b1188d7d48b33498edd9485ba Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 14 Mar 2024 09:29:51 +0100
Subject: [PATCH 1253/1862] Added deprecated for user done

---
 ChangeLog                                     | 3 +++
 htdocs/comm/action/class/actioncomm.class.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 25688ef0ccb..3207490752d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@ The following changes may create regressions for some external modules, but were
 * The signature for all ->delete() method has been modified to match the modulebuilder template (so first paramis now always $user), except
   the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
 * Route for API /thirdparties/gateways has been renamed into /thirdparties/accounts
+* The $userdoneid in actioncomm class is deprecated. Please use $userownerid instead.
+* The field fk_user_done in actioncomm table is deprecated. Please use fk_user_action instead.
+* The AGENDA_ENABLE_DONEBY hidden option is deprecated.
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 704f14baeb8..dff69c1ab21 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -242,6 +242,7 @@ class ActionComm extends CommonObject
 
 	/**
 	 * @var int 	Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
+	 * @deprecated	Use $userownerid instead
 	 */
 	public $userdoneid;
 

From ba79d822fff2f796c65ed218515b1090a045e944 Mon Sep 17 00:00:00 2001
From: jyhere <jyhere@gmail.com>
Date: Thu, 14 Mar 2024 09:58:39 +0100
Subject: [PATCH 1254/1862] UPDATE: add a conf param to disable extrafields
 code autofill

I find this feature pretty annoying, so i added a misc conf global param to disable the feature.
---
 htdocs/core/tpl/admin_extrafields_add.tpl.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index a9fb094ed58..19245020f26 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -137,10 +137,12 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 		});
 
 		/* Autofill the code with label */
+		<?php if (empty($conf->global->MAIN_EXTRAFIELDS_CODE_AUTOFILL_DISABLED)) : ?>
 		jQuery("#label").keyup(function() {
 			console.log("Update new field");
 			$("#attrname").val( $(this).val().replace(/[^a-zA-Z0-9_]/g, '').toLowerCase() );
 		});
+		<?php endif; ?>
 	});
 </script>
 

From da543ac96d472dfe18ea239086856913a9c22211 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 10:00:48 +0100
Subject: [PATCH 1255/1862] codespell and datee

---
 dev/tools/codespell/codespell-ignore.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/codespell/codespell-ignore.txt b/dev/tools/codespell/codespell-ignore.txt
index c71e990a467..0c84807010b 100644
--- a/dev/tools/codespell/codespell-ignore.txt
+++ b/dev/tools/codespell/codespell-ignore.txt
@@ -57,3 +57,4 @@ dur
 fonction
 espace
 methode
+datee

From 89d6fe8d5d9638794bbf5de21527e9f37b787c58 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 10:02:23 +0100
Subject: [PATCH 1256/1862] add project list linked by a contact

---
 htdocs/core/lib/company.lib.php  | 98 ++++++++++++++++++++++++++++++++
 htdocs/langs/fr_FR/admin.lang    |  2 +
 htdocs/langs/fr_FR/projects.lang |  1 +
 htdocs/projet/admin/project.php  | 12 ++++
 4 files changed, 113 insertions(+)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d8113ce1356..63f1e382fa7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -960,6 +960,104 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 			dol_print_error($db);
 		}
 
+		//projects linked to that thirdpart because of a people of that company is linked to a project
+		if (getDolGlobalString('PROJECT_DISPLAY_LINKED_BY_CONTACT')) {
+			print "\n";
+			print load_fiche_titre($langs->trans("ProjectsLinkedToThisThirdParty"), '', '');
+
+
+			print '<div class="div-table-responsive">'."\n";
+			print '<table class="noborder centpercent">';
+
+			$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 .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec on p.rowid = ec.element_id";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sc on ec.fk_socpeople = sc.rowid";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc on ec.fk_c_type_contact = tc.rowid";
+			$sql .= " WHERE sc.fk_soc = ".((int) $object->id);
+			$sql .= " AND p.entity IN (".getEntity('project').")";
+			$sql .= " AND tc.element = '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 class="nowraponall">';
+							print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:'.$_SERVER["PHP_SELF"].'?socid=__SOCID__');
+							print '</td>';
+
+							// Label
+							print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($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 '<span class="amount">'.price($obj->opp_amount, 1, '', 1, -1, -1, '').'</span>';
+							}
+							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);
+			}
+		}
+
 		$parameters = array('sql' => $sql, 'function' => 'show_projects');
 		$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 2857c585ba4..3750b9bab8a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -88,6 +88,8 @@ SearchString=Chaîne de recherche
 NotAvailableWhenAjaxDisabled=Non disponible quand Ajax est désactivé
 AllowToSelectProjectFromOtherCompany=Sur les éléments d'un tiers, autorise la sélection d'un projet lié à un autre tiers
 TimesheetPreventAfterFollowingMonths=Empêcher l'enregistrement du temps consacré après le nombre de mois suivant
+PROJECT_DISPLAY_LINKED_BY_CONTACT=Afficher les projets liés par un contact
+PROJECT_DISPLAY_LINKED_BY_CONTACT_help=Cette option permet d'ajouter la liste de tous les projets dans lesquels un des contact du tiers est rattaché
 JavascriptDisabled=Javascript désactivé
 UsePreviewTabs=Afficher les onglets "Aperçu"
 ShowPreview=Afficher aperçu
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 962372b874b..d5d1f2ce01c 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -142,6 +142,7 @@ DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
 ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées
 TaskRessourceLinks=Contacts de la tâche
 ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
+ProjectsLinkedToThisThirdParty=Projets liés à ce tiers par un contact commun
 NoTasks=Aucune tâche pour ce projet
 LinkedToAnotherCompany=Liés à autre société
 TaskIsNotAssignedToUser=Tâche non assignée à l'utilisateur. Utilisez le bouton '<strong>%s</strong>'  pour assigner la tâche maintenant.
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 184f8ac6104..9dc673aa745 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -841,6 +841,18 @@ print '<input type="number" class="width50" id="timesheetFreezeDuration" name="t
 print '<input type="submit" class="button small reposition" name="PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '</tr>';
+
+$key = 'PROJECT_DISPLAY_LINKED_BY_CONTACT';
+echo '<tr class="oddeven">',
+		'<td class="left">',
+			$form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
+		'</td>',
+		'<td class="right" colspan="2">',
+			ajax_constantonoff($key),
+		'</td>',
+	'</tr>';
+
+
 print '</table>';
 print '</div>';
 

From a4d85d870671ae610a51af9ad017d679f5c3784f Mon Sep 17 00:00:00 2001
From: jyhere <jyhere@gmail.com>
Date: Thu, 14 Mar 2024 10:11:54 +0100
Subject: [PATCH 1257/1862] UPDATE: improved extrafields code autofill

Add normalize() (to convert accented chars to unaccented chars) and replace whitespaces by underscores to make the db column name more readable.
---
 htdocs/core/tpl/admin_extrafields_add.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 19245020f26..7b8092ef81d 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -140,7 +140,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 		<?php if (empty($conf->global->MAIN_EXTRAFIELDS_CODE_AUTOFILL_DISABLED)) : ?>
 		jQuery("#label").keyup(function() {
 			console.log("Update new field");
-			$("#attrname").val( $(this).val().replace(/[^a-zA-Z0-9_]/g, '').toLowerCase() );
+			$("#attrname").val( $(this).val().normalize('NFD').replace(/\s/g, "_").replace(/[^a-zA-Z0-9_]/g, '').toLowerCase() );
 		});
 		<?php endif; ?>
 	});

From 07fe0f6cd0a66dbcdfb8310fd1ab26d474400401 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 10:29:36 +0100
Subject: [PATCH 1258/1862] NEW: Module Website: Can link/unlink translation
 between web pages

---
 htdocs/website/index.php | 57 +++++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 566a1c2feb9..37430439427 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1155,7 +1155,17 @@ if ($action == 'addcontainer' && $usercanedit) {
 		$substitutionarray = array();
 		$substitutionarray['__WEBSITE_CREATE_BY__'] = $user->getFullName($langs);
 
-		// Define id of page the new page is translation of
+		// Define id of the page the new page is translation of
+		/*
+		if ($objectpage->lang == $object->lang) {
+			// If
+			$pageidfortranslation = (GETPOSTINT('pageidfortranslation') > 0 ? GETPOSTINT('pageidfortranslation') : 0);
+			if ($pageidfortranslation > 0) {
+				// We must update the page $pageidfortranslation to set fk_page = $object->id.
+				// But what if page $pageidfortranslation is already linked to another ?
+			}
+		} else {
+		*/
 		$pageidfortranslation = (GETPOSTINT('pageidfortranslation') > 0 ? GETPOSTINT('pageidfortranslation') : 0);
 		if ($pageidfortranslation > 0) {
 			// Check if the page we are translation of is already a translation of a source page. if yes, we will use source id instead
@@ -1166,6 +1176,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 			}
 		}
 		$objectpage->fk_page = $pageidfortranslation;
+		//}
 
 		$sample = GETPOST('sample', 'alpha');
 		if (empty($sample)) {
@@ -2406,6 +2417,22 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 	}
 }
 
+if ($action == 'deletelang' && $usercanedit) {
+	$sql = "UPDATE ".MAIN_DB_PREFIX."website_page SET fk_page = NULL";
+	$sql .= " WHERE rowid = ".GETPOSTINT('deletelangforid');
+	//$sql .= " AND fk_page = ".((int) $objectpage->id);
+
+	$resql = $db->query($sql);
+	if (!$resql) {
+		setEventMessages($db->lasterror(), null, 'errors');
+	} else {
+		$objectpage->fk_page = null;
+	}
+
+	$action = 'editmeta';
+}
+
+
 // Export site
 if ($action == 'exportsite' && $user->hasRight('website', 'export')) {
 	$fileofzip = $object->exportWebSite();
@@ -4360,7 +4387,9 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 						if ($i > 0) {
 							$tmpstring .= '<br>';
 						}
-						$tmpstring .= $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
+						$tmpstring .= $tmppage->getNomUrl(1).' '.picto_from_langcode($tmppage->lang).' '.$tmppage->lang;
+						// Button unlink
+						$tmpstring .= ' <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?website='.urlencode($object->ref).'&pageid='.((int) $objectpage->id).'&action=deletelang&token='.newToken().'&deletelangforid='.((int) $tmppage->id).'">'.img_picto($langs->trans("Remove"), 'unlink').'</a>';
 						$translatedby++;
 						$i++;
 					}
@@ -4376,17 +4405,27 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 			dol_print_error($db);
 		}
 	}
-	if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0)) {
+	if ((empty($translatedby) || ($objectpage->lang != $object->lang)) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0)) {
 		$sourcepage = new WebsitePage($db);
-		$result = $sourcepage->fetch($objectpage->fk_page);
-		if ($result == 0) {
-			// not found, we can reset value to clean database
-		} elseif ($result > 0) {
+		$result = 1;
+		if ($objectpage->fk_page > 0) {
+			$result = $sourcepage->fetch($objectpage->fk_page);
+			if ($result == 0) {
+				// not found, we can reset value to clean database
+				// TODO
+			}
+		}
+		if ($result >= 0) {
+			if ($translatedby) {
+				print '<br>';
+			}
 			$translationof = $objectpage->fk_page;
 			print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
-			print $formwebsite->selectContainer($website, 'pageidfortranslation', ($translationof ? $translationof : -1), 1, $action, 'minwidth300', array($objectpage->id));
+			print $sourcepage->getNomUrl(2).' '.$formwebsite->selectContainer($website, 'pageidfortranslation', ($translationof ? $translationof : -1), 1, $action, 'minwidth300', array($objectpage->id));
 			if ($translationof > 0 && $sourcepage->lang) {
-				print $sourcepage->getNomUrl(2).' ('.$sourcepage->lang.')';
+				print picto_from_langcode($sourcepage->lang).' '.$sourcepage->lang;
+				// Button unlink
+				print ' <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?website='.urlencode($object->ref).'&pageid='.((int) $objectpage->id).'&action=deletelang&token='.newToken().'&deletelangforid='.((int) $objectpage->id).'">'.img_picto($langs->trans("Remove"), 'unlink').'</a>';
 			}
 		}
 	}

From 90210c3bfcc423858f22fef1b1fe8cce5ce750fd Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 10:36:55 +0100
Subject: [PATCH 1259/1862] translation

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 576180c6371..f20f46f5c03 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -88,6 +88,8 @@ 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
+PROJECT_DISPLAY_LINKED_BY_CONTACT=Display project linked by a common contact
+PROJECT_DISPLAY_LINKED_BY_CONTACT_help=That option add a new list on Project tab with all projects linked to that thirdparty via a contact relationship
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview

From d4ea162cfb158992d4929441000b65ee798b6297 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 10:37:46 +0100
Subject: [PATCH 1260/1862] locale

---
 htdocs/langs/en_US/projects.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index f0d303285d4..e522a34fd1e 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -142,6 +142,7 @@ 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
+ProjectsLinkedToThisThirdParty=Projects linked to that third party thanks to a contact
 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.

From 4e872df2a646f8e18308e1c7fe3f486238eca0ed Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 10:45:37 +0100
Subject: [PATCH 1261/1862] New change input to textarea for prompts in ai
 module

---
 htdocs/ai/admin/custom_prompt.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 7790c822249..8974e25a66c 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -255,7 +255,7 @@ if ($action == 'edit') {
 	$out .= '<span id="prePrompt" class="spanforparamtooltip">pre-Prompt</span>';
 	$out .= '</td>';
 	$out .= '<td>';
-	$out .= '<input name="prePrompt" id="prePromptInput" class="flat minwidth500" value="">';
+	$out .= '<textarea class="flat minwidth500" id="prePromptInput" name="prePrompt" rows="3"></textarea>';
 	$out .= '</td>';
 	$out .= '</tr>';
 	$out .= '<tr class="oddeven">';
@@ -263,7 +263,7 @@ if ($action == 'edit') {
 	$out .= '<span id="postPrompt" class="spanforparamtooltip">Post-prompt</span>';
 	$out .= '</td>';
 	$out .= '<td>';
-	$out .= '<input name="postPrompt" id="postPromptInput" class="flat minwidth500" value="">';
+	$out .= '<textarea class="flat minwidth500" id="postPromptInput" name="postPrompt" rows="3"></textarea>';
 	$out .= '</td>';
 	$out .= '</tr>';
 	$out .= '</tbody>';
@@ -307,7 +307,7 @@ if ($action == 'edit' || $action == 'create') {
 			$out .= '<span id="prePrompt" class="spanforparamtooltip">pre-Prompt</span>';
 			$out .= '</td>';
 			$out .= '<td>';
-			$out .= '<input name="prePrompt" id="prePromptInput_'.$key.'" class="flat minwidth500" value="'.$config['prePrompt'].'" disabled>';
+			$out .= '<textarea class="flat minwidth500" id="prePromptInput_'.$key.'" name="prePrompt" rows="2" disabled>'.$config['prePrompt'].'</textarea>';
 			$out .= '</td>';
 			$out .= '</tr>';
 			$out .= '<tr class="oddeven">';
@@ -315,8 +315,9 @@ if ($action == 'edit' || $action == 'create') {
 			$out .= '<span id="postPrompt" class="spanforparamtooltip">Post-prompt</span>';
 			$out .= '</td>';
 			$out .= '<td>';
-			$out .= '<input name="postPrompt" id="postPromptInput_'.$key.'" class="flat minwidth500" value="'.$config['postPrompt'].'" disabled>';
+			$out .= '<textarea class="flat minwidth500" id="postPromptInput_'.$key.'" name="postPrompt" rows="2" disabled>'.$config['postPrompt'].'</textarea>';
 			$out .= '<br><input type="submit" class="button small submitBtn" name="modify" data-index="'.$key.'" style="display: none;" value="'.dol_escape_htmltag($langs->trans("Modify")).'"/>';
+
 			$out .= '</td>';
 			$out .= '</tr>';
 			$out .= '</form>';

From 5008a324c633ef650d9dac68c16e6eaac6fed370 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 11:24:09 +0100
Subject: [PATCH 1262/1862] Fix warning

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

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index dbe02a3ff02..e14477b9158 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -191,10 +191,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha')) {
+		$newid = 0;
 		if ($tabrowid[$id]) {
 			// Get free id for insert
-			$newid = 0;
-			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]);
+			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") as newid FROM ".$db->sanitize($tabname[$id]);
 			$result = $db->query($sql);
 			if ($result) {
 				$obj = $db->fetch_object($result);

From fc753daa26352a838228982f5d01faf042eda0c1 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 11:58:23 +0100
Subject: [PATCH 1263/1862] NEW functionality for delete contact of company
 list

---
 htdocs/core/lib/company.lib.php | 14 ++++++++++++++
 htdocs/langs/en_US/users.lang   |  2 ++
 htdocs/societe/contact.php      | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d8113ce1356..62e6840351d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1417,6 +1417,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 					print '</a>';
 				}
 
+				// Delete
+				if ($user->hasRight('societe', 'contact', 'delete')) {
+					print '<a class="marginleftonly right" href="'.DOL_URL_ROOT.'/societe/contact.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
+					print img_delete();
+					print '</a>';
+				}
+
 				print '</td>';
 			}
 
@@ -1513,6 +1520,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 					print '</a>';
 				}
 
+				// Delete
+				if ($user->hasRight('societe', 'contact', 'delete')) {
+					print '<a class="marginleftonly right" href="'.DOL_URL_ROOT.'/societe/contact.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&socid='.urlencode($obj->fk_soc).'">';
+					print img_delete();
+					print '</a>';
+				}
+
 				print '</td>';
 			}
 
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index c4695d86791..3cfa2ee7236 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -134,3 +134,5 @@ UserPublicPageDesc=You can enable a virtual card for this user. An url with the
 EnablePublicVirtualCard=Enable the user's virtual business card
 UserEnabledDisabled=User status changed: %s
 AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
+ConfirmDeleteContact= Are you sure that you want delete this contact ?
+ContactDeleted= Contact has been delete successfully
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 1fd810a9793..c56ca5ccfb4 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -133,6 +133,27 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 }
 
+if ($action == 'confirm_delete') {
+	$id = GETPOST('id', 'int');
+	if (!empty($id) && $socid > 0) {
+		$sql = "DELETE t, et FROM llx_socpeople AS t";
+		$sql .= " LEFT JOIN llx_socpeople_extrafields AS et ON t.rowid = et.fk_object";
+		$sql .= " WHERE t.fk_soc = ".((int) $socid);
+		$sql .= " AND t.rowid = ".((int) $id);
+		$sql .= " AND ((t.fk_user_creat = ".((int) $user->id)." AND t.priv = 1) OR t.priv = 0)";
+
+		$result = $db->query($sql);
+		if (!$result) {
+			$error++;
+			setEventMessages($db->lasterror(), null, 'errors');
+		} else {
+			$db->commit();
+			setEventMessages('ContactDeleted', null, 'mesgs');
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$socid);
+			exit();
+		}
+	}
+}
 
 /*
  *  View
@@ -184,6 +205,18 @@ if ($action != 'presend') {
 		$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1);
 	}
 }
+if ($action == 'delete') {
+	$formconfirm = $form->formconfirm(
+		$_SERVER["PHP_SELF"].'?id='.GETPOST('id').'&socid='.$object->id,
+		$langs->trans('Delete'),
+		$langs->trans('ConfirmDeleteContact', GETPOST('id', 'alpha')),
+		'confirm_delete',
+		'',
+		0,
+		1
+	);
+	print $formconfirm;
+}
 
 // End of page
 llxFooter();

From fb85f17ef4d9cb8a0bad6193ec4f5ad0d207dfa7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 12:09:35 +0100
Subject: [PATCH 1264/1862] FIX: Better error management in loading a website
 template

---
 htdocs/core/lib/files.lib.php          | 23 +++++++++++++++--------
 htdocs/core/lib/functions.lib.php      |  2 +-
 htdocs/website/class/website.class.php | 19 ++++++++++++++-----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 960d9ee7eec..5b18aee94af 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -857,14 +857,14 @@ function dol_copy($srcfile, $destfile, $newmask = '0', $overwriteifexists = 1, $
 /**
  * Copy a dir to another dir. This include recursive subdirectories.
  *
- * @param	string	$srcfile			Source file (a directory)
- * @param	string	$destfile			Destination file (a directory)
- * @param	string	$newmask			Mask for new file ('0' by default means getDolGlobalString('MAIN_UMASK')). Example: '0666'
- * @param 	int		$overwriteifexists	Overwrite file if exists (1 by default)
+ * @param	string					$srcfile			Source file (a directory)
+ * @param	string					$destfile			Destination file (a directory)
+ * @param	string					$newmask			Mask for new file ('0' by default means getDolGlobalString('MAIN_UMASK')). Example: '0666'
+ * @param 	int						$overwriteifexists	Overwrite file if exists (1 by default)
  * @param	array<string,string>	$arrayreplacement	Array to use to replace filenames with another one during the copy (works only on file names, not on directory names).
- * @param	int		$excludesubdir		0=Do not exclude subdirectories, 1=Exclude subdirectories, 2=Exclude subdirectories if name is not a 2 chars (used for country codes subdirectories).
- * @param	string[]	$excludefileext		Exclude some file extensions
- * @return	int							Return integer <0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
+ * @param	int						$excludesubdir		0=Do not exclude subdirectories, 1=Exclude subdirectories, 2=Exclude subdirectories if name is not a 2 chars (used for country codes subdirectories).
+ * @param	string[]				$excludefileext		Exclude some file extensions
+ * @return	int											Return integer <0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy()
  */
 function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0, $excludefileext = null)
@@ -878,6 +878,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 	}
 
 	$destexists = dol_is_dir($destfile);
+
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
 	if (!$destexists) {
@@ -888,7 +889,13 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 			$dirmaskdec = octdec(getDolGlobalString('MAIN_UMASK'));
 		}
 		$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
-		dol_mkdir($destfile, '', decoct($dirmaskdec));
+
+		$result = dol_mkdir($destfile, '', decoct($dirmaskdec));
+
+		if (!dol_is_dir($destfile)) {
+			// The output directory does not exists and we failed to create it. So we stop here.
+			return -1;
+		}
 	}
 
 	$ossrcfile = dol_osencode($srcfile);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bcc2e9864e9..e74be328a4b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7424,7 +7424,7 @@ function dol_mkdir($dir, $dataroot = '', $newmask = '')
 				}
 				$dirmaskdec |= octdec('0111'); // Set x bit required for directories
 				if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {
-					// Si le is_dir a renvoye une fausse info, alors on passe ici.
+					// If the is_dir has returned a false information, we arrive here
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
 				} else {
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 47d572654be..7bfe8b0373e 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1262,8 +1262,17 @@ class Website extends CommonObject
 			$error++;
 		}
 
-		dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/medias/image/websitekey', $conf->website->dir_output.'/'.$object->ref.'/medias/image/'.$object->ref, 0, 1); // Medias can be shared, do not overwrite if exists
-		dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/medias/js/websitekey', $conf->website->dir_output.'/'.$object->ref.'/medias/js/'.$object->ref, 0, 1); // Medias can be shared, do not overwrite if exists
+		$result = dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/medias/image/websitekey', $conf->website->dir_output.'/'.$object->ref.'/medias/image/'.$object->ref, 0, 1);
+		if ($result < 0) {
+			$this->errors[] = 'Failed to copy files into '.$conf->website->dir_output.'/'.$object->ref.'/medias/image/'.$object->ref.'.';
+			return -5;
+		}
+
+		$result = dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/medias/js/websitekey', $conf->website->dir_output.'/'.$object->ref.'/medias/js/'.$object->ref, 0, 1);
+		if ($result < 0) {
+			$this->errors[] = 'Failed to copy files into '.$conf->website->dir_output.'/'.$object->ref.'/medias/js/'.$object->ref.'.';
+			return -5;
+		}
 
 		$sqlfile = $conf->website->dir_temp."/".$object->ref.'/website_pages.sql';
 
@@ -1301,13 +1310,13 @@ class Website extends CommonObject
 					$newid = ($reg[2] + $maxrowid);
 					$aliasesarray = explode(',', $reg[3]);
 
-					dol_syslog("Found ID ".$oldid." to replace with ID ".$newid." and shortcut aliases to create: ".$reg[3]);
+					dol_syslog("In sql source file, we have the page ID ".$oldid." to replace with the new ID ".$newid.", and we must create the shortcut aliases: ".$reg[3]);
 
-					dol_move($conf->website->dir_output.'/'.$object->ref.'/page'.$oldid.'.tpl.php', $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php', 0, 1, 0, 0);
+					//dol_move($conf->website->dir_output.'/'.$object->ref.'/page'.$oldid.'.tpl.php', $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php', 0, 1, 0, 0);
 
 					$objectpagestatic->fetch($newid);
 
-					// The move is not enough, so we regenerate pageX.tpl.php
+					// We regenerate the pageX.tpl.php
 					$filetpl = $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php';
 					$result = dolSavePageContent($filetpl, $object, $objectpagestatic);
 					if (!$result) {

From 0903b4da87bde9285b5be6d8991ee989a44d8c13 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 12:35:19 +0100
Subject: [PATCH 1265/1862] disable auto correct login field on smartphone

---
 htdocs/core/tpl/login.tpl.php             | 2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 7f460587248..1567392285a 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -180,7 +180,7 @@ if ($disablenofollow) {
 } ?>
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
-<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
+<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="off" spellcheck="false" autocorrect="off" />
 </div>
 </div>
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 6fe5ddad2d6..4b6cd2392f2 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -129,7 +129,7 @@ if (!empty($disablenofollow)) {
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
-<input type="text" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
+<input type="text" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" autocapitalize="off" autocomplete="off" spellcheck="false" autocorrect="off" />
 </div>
 </div>
 

From 1c9129497ff25e1f06eb54a5d70b713838eec5b6 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 12:36:01 +0100
Subject: [PATCH 1266/1862] autocomplete on

---
 htdocs/core/tpl/login.tpl.php             | 2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 1567392285a..cbb89e80b3b 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -180,7 +180,7 @@ if ($disablenofollow) {
 } ?>
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
-<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="off" spellcheck="false" autocorrect="off" />
+<input type="text" id="username" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="on" spellcheck="false" autocorrect="off" />
 </div>
 </div>
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 4b6cd2392f2..8d78c4fa41a 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -129,7 +129,7 @@ if (!empty($disablenofollow)) {
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
-<input type="text" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" autocapitalize="off" autocomplete="off" spellcheck="false" autocorrect="off" />
+<input type="text" maxlength="255" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" autocapitalize="off" autocomplete="on" spellcheck="false" autocorrect="off" />
 </div>
 </div>
 

From c664cdae0f62775af2dd58b8a4a9494b4728d4bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 12:39:42 +0100
Subject: [PATCH 1267/1862] NEW Init of a module with a website template copy
 also the preview

---
 htdocs/core/modules/DolibarrModules.class.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 15fbe56aa32..04081ba6a02 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -453,7 +453,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$err += $this->insert_tabs();
 		}
 
-		// Insert activation of module's parts
+		// Insert activation of module's parts. Copy website templates into doctemplates.
 		if (!$err) {
 			$err += $this->insert_module_parts();
 		}
@@ -2310,6 +2310,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 							$this->errors[] = ($errormsg ? $errormsg : $langs->trans('ErrorFailToCreateZip', $dest));
 						}
 					}
+
+					// Copy also the preview website_xxx.jpg file
+					$docs = dol_dir_list($srcroot, 'files', 0, 'website_.*\.jpg$');
+					foreach ($docs as $cursorfile) {
+						$src = $srcroot.'/'.$cursorfile['name'];
+						$dest = DOL_DATA_ROOT.'/doctemplates/websites/'.$cursorfile['name'];
+
+						dol_copy($src, $dest);
+					}
 				}
 
 				$entity = $conf->entity; // Reset the current entity

From 5399e3aef5c0d6a43134ef1d8c54964a074a6574 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 12:59:35 +0100
Subject: [PATCH 1268/1862] Debug import website template

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 7bfe8b0373e..290f18606f9 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1305,7 +1305,11 @@ class Website extends CommonObject
 
 				// Warning fgets with second parameter that is null or 0 hang.
 				$buf = fgets($fp, 65000);
+				$newid = 0;
+
+				// Scan the line
 				if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg)) {
+					// Example of line: "-- Page ID 179 -> 1__+MAX_llx_website_page__ - Aliases about-us --;"
 					$oldid = $reg[1];
 					$newid = ($reg[2] + $maxrowid);
 					$aliasesarray = explode(',', $reg[3]);
@@ -1313,7 +1317,15 @@ class Website extends CommonObject
 					dol_syslog("In sql source file, we have the page ID ".$oldid." to replace with the new ID ".$newid.", and we must create the shortcut aliases: ".$reg[3]);
 
 					//dol_move($conf->website->dir_output.'/'.$object->ref.'/page'.$oldid.'.tpl.php', $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php', 0, 1, 0, 0);
+				} elseif (preg_match('/^-- Page ID (\d+).*Aliases\s(.*)\s--;/i', $buf, $reg)) {
+					// Example of line: "-- Page ID 1__+MAX_llx_website_page__ - Aliases about-us --;"
+					$newid = ($reg[1] + $maxrowid);
+					$aliasesarray = explode(',', $reg[2]);
 
+					dol_syslog("In sql source file, we have the page with the new ID ".$newid.", and we must create the shortcut aliases: ".$reg[3]);
+				}
+
+				if ($newid) {
 					$objectpagestatic->fetch($newid);
 
 					// We regenerate the pageX.tpl.php

From b51be1117180fe5c146d1ebeb1144d3e6c69a9cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 13:39:24 +0100
Subject: [PATCH 1269/1862] Clean code

---
 htdocs/website/class/website.class.php | 208 ++-----------------------
 1 file changed, 12 insertions(+), 196 deletions(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 290f18606f9..5f91c26ebd2 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1244,7 +1244,8 @@ class Website extends CommonObject
 		$arrayreplacement['__LOGO_MINI_KEY__'] = $this->db->escape($mysoc->logo_mini);
 		$arrayreplacement['__LOGO_KEY__'] = $this->db->escape($mysoc->logo);
 
-		// Copy containers
+
+		// Copy containers directory
 		dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/containers', $conf->website->dir_output.'/'.$object->ref, 0, 1); // Overwrite if exists
 
 		// Make replacement into css and htmlheader file
@@ -1297,7 +1298,7 @@ class Website extends CommonObject
 
 		$objectpagestatic = new WebsitePage($this->db);
 
-		// Make replacement of IDs
+		// Regenerate the php files for pages
 		$fp = fopen($sqlfile, "r");
 		if ($fp) {
 			while (!feof($fp)) {
@@ -1367,7 +1368,7 @@ class Website extends CommonObject
 			}
 		}
 
-		// Regenerate index page to point to the new index page
+		// Regenerate the index.php page to point to the new index page
 		$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
 		dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php', $object);
 
@@ -1705,173 +1706,20 @@ class Website extends CommonObject
 		// Export on target sources
 		$resultarray = dol_uncompress($pathtotmpzip, $destdir);
 
+		// Remove the file README and LICENSE from the $destdir (already into the containers directory)
+		dol_delete_file($destdir.'/README.md');
+		dol_delete_file($destdir.'/LICENSE');
+
+		// Remove non required files (will be re-generated during the import)
+		dol_delete_file($destdir.'/containers/index.php');
+		dol_delete_file($destdir.'/containers/master.inc.php');
+
 		if (!empty($resultarray)) {
 			setEventMessages("Error, failed to unzip the export into target dir", null, 'errors');
 		} else {
 			setEventMessages("Website content written into ".$destdirrel, null, 'mesgs');
 		}
 
-		/*
-		$sourcedir = $conf->website->dir_output."/".$website->ref;
-
-		// Get array with hash of files (for the last sync)
-		$fichierEtat = $sourcedir . '/filelist-'.dol_sanitizeFileName($destdir).'.txt';
-		$etatPrecedent = $this->checkPreviousState($fichierEtat);
-
-		// Get list of all source files of the website
-		$arraySourcedir = dol_dir_list($sourcedir);
-
-		// Get list of modified files
-		$modifications = [];
-		foreach ($arraySourcedir as $file) {
-			if (substr($file['name'], -4) === '.old') {
-				continue;
-			}
-			$hashActuel = hash_file('md5', $file['fullname']);
-
-			// Check whether the file is new or has been modified
-			if (!isset($etatPrecedent[$file['name']]) || $etatPrecedent[$file['name']] !== $hashActuel) {
-				$modifications[] = $file;
-			}
-
-			$etatPrecedent[$file['name']] = $hashActuel;	// we store he new hash to record it later on disk.
-		}
-
-		$arraydestdir = dol_dir_list($destdir, "all", 1);
-		$differences = [];
-		$names = array_column($arraydestdir, 'name');
-		$namesSource = array_column($arraySourcedir, 'name');
-
-		if (count($modifications) > 1) {
-			foreach ($modifications as $fichierModifie) {
-				$nomFichierModifie = $fichierModifie['name'];
-				if ($nomFichierModifie == basename($fichierEtat)) {
-					continue;
-				}
-				$success = 0;
-
-				//check if it is a new file
-				if ((!preg_match('/^page\d+\.tpl\.php$/', $nomFichierModifie)) && (!in_array($nomFichierModifie, $names))) {
-					if (file_exists($fichierModifie['fullname']) && dol_is_dir($destdir.'/containers')) {
-						$cp = dol_copy($fichierModifie['fullname'], $destdir.'/containers/'.$nomFichierModifie, '0664');
-						if ($cp > 0) {
-							if (file_exists($destdir.'/containers/'.$nomFichierModifie)) {
-								$tabnumpage = array();
-								foreach ($arraydestdir as $fileDest) {
-									if ($this->extractNumberFromFilename($fileDest['name']) !== -1) {
-										$tabnumpage[] = $this->extractNumberFromFilename($fileDest['name']);
-									}
-								}
-								$getContentSource = file_get_contents($destdir.'/containers/'.$nomFichierModifie);
-								$nextpage = max($tabnumpage) + 1;
-								$chaineModifiee = preg_replace('/page\d+\.tpl\.php/', 'page' . $nextpage . '.tpl.php', $getContentSource);
-								$write = file_put_contents($destdir.'/containers/'.$nomFichierModifie, $chaineModifiee);
-								if ($write !== false) {
-									if (!touch($destdir.'/containers/'."page" . $nextpage . ".tpl.php")) {
-										setEventMessages("Please check permission to create  <b>page" . $nextpage . ".tpl.php</b> in template <b>".$website->name_template."</b>", null, 'errors');
-									}
-									$filesFound = '';
-									foreach ($arraySourcedir as $file) {
-										if ($file['name'] == $nomFichierModifie) {
-											$fileContent = file_get_contents($file['fullname']);
-											$matches = array();
-											if (preg_match("/page\d+\.tpl\.php/", $fileContent, $matches)) {
-												$filesFound = $matches[0];
-												break;
-											}
-										}
-									}
-									foreach ($arraySourcedir as $file) {
-										if ($file['name'] == $filesFound) {
-											if (!is_writable($file['fullname'])) {
-												dolChmod($file['fullname'], '0664');
-											}
-											$diff = $this->showDifferences(file_get_contents($destdir.'/containers/'."page" . $nextpage . ".tpl.php"), file_get_contents($file['fullname']), array($nextpage,$this->extractNumberFromFilename($file['name'])));
-											if ($diff != -1) {
-												$replace = $this->replaceLineUsingNum($destdir.'/containers/'."page" . $nextpage . ".tpl.php", $diff);
-												if ($replace !== false) {
-													setEventMessages("Copy file <b>page".$nextpage.".tpl.php</b> in template <b>".$this->name_template."</b> with success", null, 'warnings');
-												}
-											}
-										}
-									}
-								}
-							}
-
-							$this->saveState($etatPrecedent, $fichierEtat);
-							setEventMessages("file <b>".$nomFichierModifie."</b> was created in template <b>".$website->name_template."</b>", null, 'warnings');
-
-							header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
-							exit();
-						}
-					} else {
-						setEventMessages("Error, target dir containers not found", null, 'errors');
-						$error = 1;
-						break;
-					}
-				}
-
-				// Find the corresponding file in the destination folder
-				if (!$error && in_array($nomFichierModifie, $namesSource)) {
-					foreach ($arraydestdir as $destFile) {
-						if ($destFile['name'] == $nomFichierModifie) {
-							$sourceContent = file_get_contents($fichierModifie['fullname']);
-							$destContent = file_get_contents($destFile['fullname']);
-
-							if ($sourceContent !== $destContent) {
-								$differences[$nomFichierModifie] = $this->showDifferences($destContent, $sourceContent);
-								if (count($differences[$nomFichierModifie]) > 0) {
-									$result = $this->replaceLineUsingNum($destFile['fullname'], $differences[$nomFichierModifie]);
-									if ($result >= 0) {
-										setEventMessages("file <b>".$nomFichierModifie."</b> was modified in template <b>".$website->name_template."</b>", null, 'warnings');
-									} else {
-										if ($result == -2) {
-											setEventMessages("No permissions to write into file <b>".$destdirrel.'/'.$nomFichierModifie."</b> from the current website <b>".$website->name_template."</b>", null, 'errors');
-
-											header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
-											exit();
-										}
-										setEventMessages("file ".$nomFichierModifie." was not modified", null, 'errors');
-									}
-								}
-							}
-						}
-
-						if (preg_match('/page(\d+)\.tpl\.php/', $nomFichierModifie)) {
-							$differences[$nomFichierModifie] = $this->compareFichierModifie($sourcedir, $destdir, $fichierModifie);
-							if (count($differences[$nomFichierModifie]) > 0) {
-								$result = $this->replaceLineUsingNum($differences[$nomFichierModifie]['file_destination']['fullname'], $differences[$nomFichierModifie]);
-								if ($result !== false) {
-									if ($result == -2) {
-										setEventMessages("No permissions to write into file <b>".$destdirrel.'/'.$differences[$nomFichierModifie]['file_destination']['name']."</b> from the current website <b>".$website->name_template."</b>", null, 'errors');
-										header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
-										exit();
-									}
-									$success++;
-								}
-							}
-						}
-					}
-				}
-			}
-			if ($success > 0) {
-				// Save the state file filelist.txt
-				$this->saveState($etatPrecedent, $fichierEtat);
-				setEventMessages("file <b>".$differences[$nomFichierModifie]['file_destination']['name']."</b> was modified in template <b>".$website->name_template."</b>", null, 'warnings');
-
-				header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
-				exit();
-			}
-		} else {
-			setEventMessages("No file has been modified", null, 'errors');
-		}
-
-		// save state file
-		if (!$error) {
-			$this->saveState($etatPrecedent, $fichierEtat);
-		}
-		*/
-
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website->ref);
 		exit();
 	}
@@ -1939,38 +1787,6 @@ class Website extends CommonObject
 		return file_put_contents($pathname, serialize($etat));
 	}
 
-	/**
-	 * create file for save state of all files in folder
-	 *
-	 * @param string  $sourcedir   path of folder
-	 * @return void
-	 */
-	/*
-	public function initFilesStatus($sourcedir)
-	{
-		$fichierEtat = $sourcedir . '/filelist-lastwrite-doctemplates.txt';
-
-		$etatPrecedent = $this->checkPreviousState($fichierEtat);
-
-		// for first save state when create file
-		if (empty($etatPrecedent)) {
-			$arraySourcedir = dol_dir_list($sourcedir, "files");
-			$etatFichiers = [];
-
-			foreach ($arraySourcedir as $file) {
-				// Ignore .old files and the status file itself
-				if (substr($file['name'], -4) === '.old' || $file['name'] === basename($fichierEtat)) {
-					continue;
-				}
-
-				$hashActuel = hash_file('md5', $file['fullname']);
-				$etatFichiers[$file['name']] = $hashActuel;
-			}
-			$this->saveState($etatFichiers, $fichierEtat);
-		}
-	}
-	*/
-
 	/**
 	 * Compare two files has not same name but same content
 	 * @param  string   $dossierSource        filepath of folder source

From 1134d9a7f06a4481a59361ec4577dc7403ca5603 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 14 Mar 2024 13:39:43 +0100
Subject: [PATCH 1270/1862] Deleted userdoneid. Cleaned code.

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

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index dff69c1ab21..b8364ea8dbc 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -240,12 +240,6 @@ class ActionComm extends CommonObject
 	 */
 	public $userownerid;
 
-	/**
-	 * @var int 	Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
-	 * @deprecated	Use $userownerid instead
-	 */
-	public $userdoneid;
-
 	/**
 	 * @var int[] Array of contact ids
 	 */
@@ -494,7 +488,6 @@ class ActionComm extends CommonObject
 		}
 
 		$userownerid = $this->userownerid;
-		$userdoneid = $this->userdoneid;
 
 		// Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
 		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned)) {
@@ -544,7 +537,6 @@ class ActionComm extends CommonObject
 		$sql .= "fk_contact,";
 		$sql .= "fk_user_author,";
 		$sql .= "fk_user_action,";
-		$sql .= "fk_user_done,";
 		$sql .= "label,percent,priority,fulldayevent,location,";
 		$sql .= "transparency,";
 		$sql .= "fk_element,";
@@ -583,7 +575,6 @@ class ActionComm extends CommonObject
 		$sql .= ((isset($this->contact_id) && $this->contact_id > 0) ? ((int) $this->contact_id) : "null").", "; // deprecated, use ->socpeopleassigned
 		$sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
 		$sql .= ($userownerid > 0 ? $userownerid : "null").", ";
-		$sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
 		$sql .= "'".$this->db->escape($this->label)."', ";
 		$sql .= "'".$this->db->escape($this->percentage)."', ";
 		$sql .= "'".$this->db->escape($this->priority)."', ";
@@ -812,7 +803,7 @@ class ActionComm extends CommonObject
 		$sql .= " a.fk_soc,";
 		$sql .= " a.fk_project,";
 		$sql .= " a.fk_user_author, a.fk_user_mod,";
-		$sql .= " a.fk_user_action, a.fk_user_done,";
+		$sql .= " a.fk_user_action,";
 		$sql .= " a.fk_contact, a.percent as percentage,";
 		$sql .= " a.fk_element as elementid, a.elementtype,";
 		$sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
@@ -1162,16 +1153,9 @@ class ActionComm extends CommonObject
 			$this->fk_project = 0;
 		}
 
-		// Check parameters
-		if ($this->percentage == 0 && $this->userdoneid > 0) {
-			$this->error = "ErrorCantSaveADoneUserWithZeroPercentage";
-			return -1;
-		}
-
 		$socid = (($this->socid > 0) ? $this->socid : 0);
 		$contactid = (($this->contact_id > 0) ? $this->contact_id : 0);
 		$userownerid = ($this->userownerid ? $this->userownerid : 0);
-		$userdoneid = ($this->userdoneid ? $this->userdoneid : 0);
 
 		// If a type_id is set, we must also have the type_code set
 		if ($this->type_id > 0) {
@@ -1209,7 +1193,6 @@ class ActionComm extends CommonObject
 		$sql .= ", transparency = '".$this->db->escape($this->transparency)."'";
 		$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 ? ((int) $this->fk_element) : "null");
 		}
@@ -1432,7 +1415,7 @@ class ActionComm extends CommonObject
 		}
 		$sql .= " AND a.entity IN (".getEntity('agenda').")";
 		if (!$user->hasRight('agenda', 'allactions', 'read')) {
-			$sql .= " AND (a.fk_user_author = ".((int) $user->id)." OR a.fk_user_action = ".((int) $user->id)." OR a.fk_user_done = ".((int) $user->id);
+			$sql .= " AND (a.fk_user_author = ".((int) $user->id)." OR a.fk_user_action = ".((int) $user->id);
 			$sql .= " OR ar.fk_element = ".((int) $user->id);
 			$sql .= ")";
 		}
@@ -2004,7 +1987,6 @@ class ActionComm extends CommonObject
 		$buildfile = true;
 		$login = '';
 		$logina = '';
-		$logind = '';
 		$logint = '';
 		$eventorganization = '';
 
@@ -2355,9 +2337,6 @@ class ActionComm extends CommonObject
 			if ($logint) {
 				$more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
 			}
-			if ($logind) {
-				$more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
-			}
 			if ($eventorganization) {
 				$langs->load("eventorganization");
 				$title = $langs->transnoentities("OrganizedEvent").(empty($eventarray[0]['label']) ? '' : ' '.$eventarray[0]['label']);

From 93a2ab24c8600133530f40c07c543cd08904e28d Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 14 Mar 2024 13:43:44 +0100
Subject: [PATCH 1271/1862] Deleted AGENDA_ENABLE_DONEBY option. Cleaned code.

---
 htdocs/comm/action/card.php | 47 -------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index f5d96eec190..1e27f3d54f8 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -426,12 +426,6 @@ if (empty($reshook) && $action == 'add') {
 		}
 	}
 
-	if (!$error && getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
-		if (GETPOST("doneby") > 0) {
-			$object->userdoneid = GETPOSTINT("doneby");
-		}
-	}
-
 	$object->note_private = trim(GETPOST("note", "restricthtml"));
 
 	if (GETPOSTISSET("contactid")) {
@@ -877,12 +871,6 @@ if (empty($reshook) && $action == 'update') {
 		$object->transparency = $transparency; // We set transparency on event (even if we can also store it on each user, standard says this property is for event)
 		// TODO store also transparency on owner user
 
-		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
-			if (GETPOST("doneby")) {
-				$object->userdoneid = GETPOSTINT("doneby");
-			}
-		}
-
 		// Check parameters
 		if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) {	// actioncode is '0'
 			$error++;
@@ -1230,16 +1218,6 @@ if ($action == 'create') {
                         setdatefields();
                     });
 
-                    $("#selectcomplete").change(function() {
-						console.log("we change the complete status - set the doneby");
-                        if ($("#selectcomplete").val() == 100) {
-                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.((int) $user->id).'\');
-                        }
-                        if ($("#selectcomplete").val() == 0) {
-                            $("#doneby").val(-1);
-                        }
-                    });
-
                     $("#actioncode").change(function() {
                         if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
                         else $("#dateend").removeClass("fieldrequired");
@@ -1444,13 +1422,6 @@ if ($action == 'create') {
 	print '</div>';
 	print '</td></tr>';
 
-	// Done by
-	if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
-		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOSTINT("doneby") : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
-		print '</td></tr>';
-	}
-
 	// Location
 	if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
@@ -1995,13 +1966,6 @@ if ($id > 0) {
 		}*/
 		print '</td></tr>';
 
-		// Realised by
-		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
-			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
-			print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1);
-			print '</td></tr>';
-		}
-
 		// Location
 		if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.$object->location.'"></td></tr>';
@@ -2427,17 +2391,6 @@ if ($id > 0) {
 		*/
 		print '	</td></tr>';
 
-		// Done by
-		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
-			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-			if ($object->userdoneid > 0) {
-				$tmpuser = new User($db);
-				$tmpuser->fetch($object->userdoneid);
-				print $tmpuser->getNomUrl(1);
-			}
-			print '</td></tr>';
-		}
-
 		// Categories
 		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';

From 2b187c4b308a3b5a79ca4250a22b39e2c5235b13 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 13:45:55 +0100
Subject: [PATCH 1272/1862] Fix: the line "file generated" must appears once.

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 5f91c26ebd2..335c3447e6a 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1075,15 +1075,15 @@ class Website extends CommonObject
 			$i++;
 		}
 
+		$line = '-- File generated by Dolibarr '.DOL_VERSION.' --;'."\n";
+		$line .= "\n";
+
 		foreach ($listofpages as $pageid => $objectpageold) {
 			$oldpageid = $objectpageold->id;
 
 			$allaliases = $objectpageold->pageurl;
 			$allaliases .= ($objectpageold->aliasalt ? ','.$objectpageold->aliasalt : '');
 
-			$line = '-- File generated by Dolibarr '.DOL_VERSION.' -- '.dol_print_date(dol_now('gmt'), 'standard', 'gmt').' UTC --;'."\n";
-			$line .= "\n";
-
 			if (!getDolGlobalInt('WEBSITE_EXPORT_KEEP_FILES_OF_PAGES')) {	// We don't need to keep the PHP files of pages and aliases (they are regenerated at import) so we remove them. You can ask to keep them in the export
 				// Delete the pageX.tpl.php page
 				dol_delete_file($conf->website->dir_temp.'/'.$website->ref.'/containers/page'.$objectpageold->id.'.tpl.php', 0, 0, 0, null, false, 0);

From 71e7adac7fa75ec25797dfe8296bc94c69e5a6f5 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 14 Mar 2024 13:48:00 +0100
Subject: [PATCH 1273/1862] Deleted fk_user_done

---
 htdocs/install/mysql/tables/llx_actioncomm.sql | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 54eac887362..eccb6f49fe8 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -17,7 +17,7 @@
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
 --
--- Table of events and actions (past and to do). 
+-- Table of events and actions (past and to do).
 -- This is also the table to track events on other Dolibarr objects.
 -- ========================================================================
 
@@ -31,7 +31,7 @@ create table llx_actioncomm
   datep2			datetime,						-- date end
 
   fk_action			integer,						-- type of action (optional link with id in llx_c_actioncomm or null)
-  code				varchar(50) NULL,				-- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...) 
+  code				varchar(50) NULL,				-- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...)
 
   datec				datetime,						-- date creation
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
@@ -43,7 +43,6 @@ create table llx_actioncomm
   fk_contact		integer,
   fk_parent			integer NOT NULL default 0,
   fk_user_action	integer,						-- user id of owner of action (note that users assigned to event are stored into table 'actioncomm_resources')
-  fk_user_done		integer,						-- user id of user that has made action (deprecated)
 
   transparency      integer,						-- transparency (ical standard). used to say if user assigned to event are busy or not by event. This field may be deprecated if we want to store transparency for each assigned user, moved into table llx_actioncomm_resources.
 
@@ -56,9 +55,9 @@ create table llx_actioncomm
 
   label				varchar(255) NOT NULL,			-- label/title of event or topic of email
   note				mediumtext,						-- private note of event or content of email
-  
+
   calling_duration  integer,                        -- when event is a phone call, duration of phone call
-  
+
   email_subject		varchar(255),					-- when event was an email, we store here the subject. content is stored into note.
   email_msgid		varchar(255),					-- when event was an email, we store here the msgid
   email_from		varchar(255),					-- when event was an email, we store here the from
@@ -68,7 +67,7 @@ create table llx_actioncomm
   email_tobcc		varchar(255),					-- when event was an email, we store here the email_tobcc
   errors_to			varchar(255),					-- when event was an email, we store here the erros_to
   reply_to			varchar(255),					-- when event was an email, we store here the reply_to
-  
+
   recurid           varchar(128),                   -- used to store event id to link each other all the repeating event record. It can be the 'iCalUID' as in RFC5545 (an id similar for all the same serie)
   recurrule         varchar(128),					-- contains string with ical format recurring rule like 'FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19' or 'FREQ=WEEKLY;BYDAY=MO'
   recurdateend      datetime,						-- no more recurring event after this date

From da2546d9d3605bf9ceb217bfe3fb7f564ac1f3b5 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 14 Mar 2024 13:48:44 +0100
Subject: [PATCH 1274/1862] Added contributor details

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

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index b8364ea8dbc..db8eadee618 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -6,7 +6,8 @@
  * Copyright (C) 2015	    Marcos García		    <marcosgdf@gmail.com>
  * Copyright (C) 2018	    Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.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 7264621c75e02dd535dd7131aa4fdeb2cd5670dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 13:55:47 +0100
Subject: [PATCH 1275/1862] Fix: the line "file generated" must appears once.

---
 htdocs/website/class/website.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 335c3447e6a..2dbc2227f9d 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1077,6 +1077,7 @@ class Website extends CommonObject
 
 		$line = '-- File generated by Dolibarr '.DOL_VERSION.' --;'."\n";
 		$line .= "\n";
+		fwrite($fp, $line);
 
 		foreach ($listofpages as $pageid => $objectpageold) {
 			$oldpageid = $objectpageold->id;
@@ -1098,13 +1099,12 @@ class Website extends CommonObject
 			}
 
 			// This comment syntax is important, it is parsed by import to get information on page ID and all aliases to regenerate
-			$line .= '-- Page ID '.$objectpageold->newid.'__+MAX_llx_website_page__ - Aliases '.$allaliases.' --;'; // newid start at 1, 2...
+			$line = '-- Page ID '.$objectpageold->newid.'__+MAX_llx_website_page__ - Aliases '.$allaliases.' --;'; // newid start at 1, 2...
 			$line .= "\n";
 			fwrite($fp, $line);
 
 			// Warning: We must keep llx_ here. It is a generic SQL.
 			$line = 'INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames)';
-
 			$line .= " VALUES(";
 			$line .= $objectpageold->newid."__+MAX_llx_website_page__, ";
 			$line .= ($objectpageold->newfk_page ? $this->db->escape($objectpageold->newfk_page)."__+MAX_llx_website_page__" : "null").", ";
@@ -1170,7 +1170,7 @@ class Website extends CommonObject
 				fwrite($fp, $line);
 			}
 
-			$line .= "\n";
+			fwrite($fp, "\n");
 		}
 
 		$line = "\n-- For Dolibarr v14+ --;\n";
@@ -1180,6 +1180,7 @@ class Website extends CommonObject
 		fwrite($fp, $line);
 
 		fclose($fp);
+
 		dolChmod($filesql);
 
 		// Build zip file

From ca3141c255834b478dd89bc8e7f253d912d291d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 14:03:21 +0100
Subject: [PATCH 1276/1862] Fix picto

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

diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php
index 3194a93ed5a..c0a527a6463 100644
--- a/htdocs/core/modules/modAi.class.php
+++ b/htdocs/core/modules/modAi.class.php
@@ -78,7 +78,7 @@ class modAi extends DolibarrModules
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
-		$this->picto = 'fa-microchip';
+		$this->picto = 'fa-magic';
 
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(

From 9dbc249cf0ee9b9f91df9a4bcb5023d89ce99118 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Thu, 14 Mar 2024 14:59:04 +0100
Subject: [PATCH 1277/1862] Fixed undefined task object

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

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ab142a50675..12974209afe 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -934,7 +934,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Extra fields
 				$extrafieldsobjectkey = $taskstatic->table_element;
 				$extrafieldsobjectprefix = 'efpt.';
-				$obj = $lines[$i]->obj;
+				$obj = $lines[$i];
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 				// Fields from hook
 				$parameters = array('arrayfields' => $arrayfields, 'obj' => $lines[$i]);

From a25e8ee14de2c08067dba4ad24bdea1f8a51a682 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 15:09:44 +0100
Subject: [PATCH 1278/1862] FIX PHPStan warnings

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

diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 8585f4ee1b4..5ce0565f4eb 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -263,7 +263,7 @@ class pdf_standard extends CommonStickerGenerator
 	/**
 	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
-	 *	@param	Adherent	$object		        Member object. Old usage: Array of record information (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
+	 *	@param	mixed	    $object		        Member object. Old usage: Array of record information (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
 	 *	@param	string		$mode				Tell if doc module is called for 'member', ...

From 21b291a87ad94a14ba426da94b61912e78dd1a21 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 15:21:39 +0100
Subject: [PATCH 1279/1862] FIX variable assignement for PHPStan warnings

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

diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 88cd5ecb2d0..bd3ba374d76 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -517,9 +517,9 @@ while ($i < $imaxinloop) {
 
 	if ($objp->bid) {
 		$accountstatic->fetch($objp->bid);
-		$paymentexpensereportstatic->fk_bank = $accountstatic->getNomUrl(1);
+		$paymentexpensereportstatic->fk_bank = $accountstatic->id;
 	} else {
-		$paymentexpensereportstatic->fk_bank = null;
+		$paymentexpensereportstatic->fk_bank = 0;
 	}
 
 	$userstatic->id = $objp->userid;

From 560d5618d2b4eb02b5de1a3f8947aa9945fbd433 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 15:31:11 +0100
Subject: [PATCH 1280/1862] FIX type in doc for variable childtables

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

diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index c0ec08939d4..34893a805b2 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -148,7 +148,7 @@ class Job extends CommonObject
 	// public $class_element_line = 'Jobline';
 
 	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
+	//  * @var string[]	List of child tables. To test if we can delete object.
 	//  */
 	protected $childtables = array('hrm_evaluation', 'hrm_job_user');
 

From b818a6a137cc6023903b3a37bc3c6cac4f53f543 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 15:52:37 +0100
Subject: [PATCH 1281/1862] Fix return type in getAllMochilds (PHPStan
 warnings)

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2a1c580a03b..0244bfd3866 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -236,7 +236,7 @@ class Mo extends CommonObject
 	public $lines = array();
 
 	/**
-	 * @var MoLine     MO line
+	 * @var MoLine|null     MO line
 	 */
 	public $line = array();
 
@@ -1859,7 +1859,7 @@ class Mo extends CommonObject
 	 * Function used to return all child MOs recursively
 	 *
 	 * @param int $depth   Depth for recursing loop count
-	 * @return Mo[]|int[]  array of MOs if OK, -1 if KO
+	 * @return Mo[]|int  array of MOs if OK, -1 if KO
 	 */
 	public function getAllMoChilds($depth = 0)
 	{

From 3c7f5391e5b27a64232bb0534698bc685709cfdf Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 16:00:43 +0100
Subject: [PATCH 1282/1862] FIX variable by adding a type BOMLine (PHPStan
 warnings)

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2a1c580a03b..da5b1caf030 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -231,7 +231,7 @@ class Mo extends CommonObject
 	protected $childtablesoncascade = array('mrp_production');
 
 	/**
-	 * @var MoLine[]     Array of subtable lines
+	 * @var MoLine[]|BOMLine[]     Array of subtable lines
 	 */
 	public $lines = array();
 

From c46e5ac34b6abcc09b210766c523de933e685fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 16:01:12 +0100
Subject: [PATCH 1283/1862] some fix for vinci

---
 .../modules/mrp/doc/pdf_vinci.modules.php     | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index cc5bc784df0..1fd7f7d6005 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
- * Copyright (C) 2018-2023 Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -124,13 +124,13 @@ class pdf_vinci extends ModelePDFMo
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		CommandeFournisseur	$object				Id of object to generate
-	 *  @param		Translate			$outputlangs		Lang output object
-	 *  @param		string				$srctemplatepath	Full path of source filename for generator using a template file
-	 *  @param		int					$hidedetails		Do not show line details
-	 *  @param		int					$hidedesc			Do not show desc
-	 *  @param		int					$hideref			Do not show ref
-	 *  @return		int										1=OK, 0=KO
+	 *  @param		Mo				$object				Id of object to generate
+	 *  @param		Translate		$outputlangs		Lang output object
+	 *  @param		string			$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int				$hidedetails		Do not show line details
+	 *  @param		int				$hidedesc			Do not show desc
+	 *  @param		int				$hideref			Do not show ref
+	 *  @return		int									1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs = null, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
@@ -235,10 +235,10 @@ class pdf_vinci extends ModelePDFMo
 				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Mo"));
+				$pdf->SetSubject($outputlangs->transnoentities("ManufacturingOrder"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Mo")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ManufacturingOrder")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
 					$pdf->SetCompression(false);
 				}
@@ -657,7 +657,7 @@ class pdf_vinci extends ModelePDFMo
 	 *  Show payments table
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  CommandeFournisseur		$object			Object order
+	 *  @param  Mo			$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							Return integer <0 if KO, >0 if OK
@@ -674,7 +674,7 @@ class pdf_vinci extends ModelePDFMo
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		CommandeFournisseur		$object			Object to show
+	 *   @param		Mo			$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	integer
@@ -1016,7 +1016,7 @@ class pdf_vinci extends ModelePDFMo
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  CommandeFournisseur		$object     	Object to show
+	 *  @param  Mo			$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	float|int                   Return topshift value
@@ -1031,7 +1031,7 @@ class pdf_vinci extends ModelePDFMo
 		}
 
 		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
+		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings", "mrp"));
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1074,7 +1074,7 @@ class pdf_vinci extends ModelePDFMo
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$title = $outputlangs->transnoentities("Mo")." ".$outputlangs->convToOutputCharset($object->ref);
+		$title = $outputlangs->transnoentities("ManufacturingOrder")." ".$outputlangs->convToOutputCharset($object->ref);
 		$pdf->MultiCell(100, 3, $title, '', 'R');
 		$posy += 1;
 
@@ -1311,7 +1311,7 @@ class pdf_vinci extends ModelePDFMo
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	CommandeFournisseur		$object				Object to show
+	 * 		@param	Mo			$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
@@ -1323,15 +1323,14 @@ class pdf_vinci extends ModelePDFMo
 	}
 
 
-
 	/**
 	 *   	Define Array Column Field
 	 *
-	 *   	@param	object			$object    		common object
+	 *   	@param	Mo				$object    		common object
 	 *   	@param	Translate		$outputlangs    langs
-	 *      @param	int			   $hidedetails		Do not show line details
-	 *      @param	int			   $hidedesc		Do not show desc
-	 *      @param	int			   $hideref			Do not show ref
+	 *      @param	int				$hidedetails		Do not show line details
+	 *      @param	int				$hidedesc		Do not show desc
+	 *      @param	int				$hideref			Do not show ref
 	 *      @return	void
 	 */
 	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)

From 0bb1dfca0c2d9c2b6c5c2dd7f3d1dfaab5809705 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 16:09:10 +0100
Subject: [PATCH 1284/1862] FIX the variable type by adding null to the
 variable document

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

diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 57a6c1ee69a..f2ff645052c 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -90,7 +90,7 @@ class MultiCurrency extends CommonObject
 	public $fk_user;
 
 	/**
-	 * @var CurrencyRate 	The currency rate
+	 * @var CurrencyRate|null 	The currency rate
 	 */
 	public $rate;
 

From 98d0ed71107163544cbc2d1e45bb2dddeed40c4d Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 16:14:55 +0100
Subject: [PATCH 1285/1862] FIX assignement variable (PHPStan warnings)

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

diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 42030aa290e..c0ec8226e3d 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -456,7 +456,7 @@ class PriceGlobalVariableUpdater
 		$langs->load("errors");
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$this->error = null;
+		$this->error = '';
 		$this->checkParameters();
 
 		//Try to load the target global variable and abort if fails

From 8ae32dd865f29845d7e77f483ff1715b0d1bf631 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 16:19:41 +0100
Subject: [PATCH 1286/1862] FIX variable by casting it with int

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 747604f0f70..30b9502a78a 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -292,7 +292,7 @@ if (empty($reshook)) {
 			$newlocaltax2_type = GETPOST('localtax2_type', 'array');
 
 			//Shall we generate prices using price rules?
-			$object->price_autogen = GETPOST('usePriceRules') == 'on';
+			$object->price_autogen = (int) GETPOST('usePriceRules') == 'on';
 
 			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 				if (!isset($newprice[$i])) {

From 9acd54b5a73c7dece9d148e1f251bf029ab293f7 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 16:26:43 +0100
Subject: [PATCH 1287/1862] Fix return method by changing boolean to exception
 in api_warehouse (PHPStan warnings)

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

diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index e39ede65299..1af08af0534 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -222,9 +222,9 @@ class Warehouses extends DolibarrApi
 
 		if ($this->warehouse->update($id, DolibarrApiAccess::$user)) {
 			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->warehouse->error);
 		}
-
-		return false;
 	}
 
 	/**

From 05a9dc5f72b8a9f45f7d817c27a468399fb0ce15 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 14 Mar 2024 16:33:38 +0100
Subject: [PATCH 1288/1862] Fix: Correction for batches with letters in Takepos

---
 htdocs/takepos/invoice.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index d0e0d179efc..cf3e3cde9b6 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018    	Andreu Bisquerra   	<jove@bisquerra.com>
  * Copyright (C) 2021    	Nicolas ZABOURI    	<info@inovea-conseil.com>
  * Copyright (C) 2022-2023	Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2024	    Ferran Marcet 		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -923,7 +924,7 @@ if (empty($reshook)) {
 
 	if ($action=="setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch=".$db->escape($batch).", fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch='".$db->escape($batch)."', fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded);
 		$db->query($sql);
 	}
 

From 2670287dd4543035cb4834b22b3cd0a4d093a911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 16:34:41 +0100
Subject: [PATCH 1289/1862] translation

---
 htdocs/core/modules/mrp/doc/pdf_vinci.modules.php | 2 +-
 htdocs/langs/en_US/main.lang                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 1fd7f7d6005..81e910d4e19 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -1421,7 +1421,7 @@ class pdf_vinci extends ModelePDFMo
 			'status' => true,
 			'width' => 25, // in mm
 			'title' => array(
-				'textkey' => 'Size'
+				'textkey' => 'Dimensions'
 			),
 			'border-left' => true, // add left line separator
 		);
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 95042a5cc24..f519e098d01 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -562,6 +562,7 @@ New=New
 Discount=Discount
 Unknown=Unknown
 General=General
+Dimensions=Dimensions
 Size=Size
 OriginalSize=Original size
 RotateImage=Rotate 90°

From 3f4033a8e22d2925519a56f07d560b4a6548df14 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 14 Mar 2024 16:39:08 +0100
Subject: [PATCH 1290/1862] Fix: Correction for batches with letters in Takepos

---
 .../class/multicurrency.class.php             |  2 -
 htdocs/multicurrency/multicurrency_rate.php   | 38 +------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 81d85b7c470..5433bb23f28 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -4,7 +4,6 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
- * Copyright (C) 2024       Ferran Marcet       <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -914,7 +913,6 @@ class CurrencyRate extends CommonObjectLine
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET rate = ".((float) $this->rate);
-		$sql .= ", rate_indirect = ".((float) $this->rate_indirect);
 		if (!empty($this->date_sync)) {
 			$sql .= ", date_sync = '".$this->db->idate($this->date_sync)."'";
 		}
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 40fb99eba4a..782834bbaa5 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016-2024  Ferran Marcet		    <fmarcet@2byte.es>
+ * Copyright (C) 2016       Ferran Marcet		    <fmarcet@2byte.es>
  * Copyright (C) 2023       Lenin Rivas		    	<lenin.rivas777@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@ $search_code		= GETPOST('search_code', 'alpha');
 $multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 $dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('dateinputday', 'int'), GETPOST('dateinputyear', 'int'));
 $rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
-$rateindirectinput 	= price2num(GETPOST('rateindirectinput', 'alpha'));
+$rateindirectinput 	= price2num(GETPOST('rateinidirectinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield 			= GETPOST('sortfield', 'aZ09comma');
@@ -168,7 +168,6 @@ if ($action == 'update') {
 		$currencyRate->date_sync = $dateinput;
 		$currencyRate->fk_multicurrency = $fk_currency;
 		$currencyRate->rate = $rateinput;
-		$currencyRate->rate_indirect = $rateindirectinput;
 		$res = $currencyRate->update();
 		if ($res) {
 			setEventMessages($langs->trans('successUpdateRate'), null);
@@ -245,7 +244,6 @@ if (empty($reshook)) {
 		$search_date_sync = "";
 		$search_date_sync_end="";
 		$search_rate = "";
-		$search_rate_indirect = "";
 		$search_code = "";
 		$search_array_options = array();
 	}
@@ -349,9 +347,6 @@ if ($search_date_sync && $search_date_sync_end) {
 if ($search_rate) {
 	$sql .= natural_search('cr.rate', $search_rate, 1);
 }
-if ($search_rate_indirect) {
-	$sql .= natural_search('cr.rate_indirect', $search_rate_indirect, 1);
-}
 if ($search_code) {
 	$sql .= natural_search('m.code', $search_code);
 }
@@ -413,9 +408,6 @@ if ($resql) {
 	if ($search_rate) {
 		$param = "&search_rate=".urlencode($search_rate);
 	}
-	if ($search_rate_indirect) {
-		$param = "&search_rate_indirect=".urlencode($search_rate_indirect);
-	}
 	if ($search_code != '') {
 		$param.="&search_code=".urlencode($search_code);
 	}
@@ -510,12 +502,6 @@ if ($resql) {
 		print '<input class="flat maxwidth75" type="text" name="search_rate" value="'.dol_escape_htmltag($search_rate).'">';
 		print '</td>';
 	}
-	// rate indirect
-	if (!empty($arrayfields['cr.rate_indirect']['checked'])) {
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth75" type="text" name="search_rate_indirect" value="'.dol_escape_htmltag($search_rate_indirect).'">';
-		print '</td>';
-	}
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -545,9 +531,6 @@ if ($resql) {
 	if (!empty($arrayfields['cr.rate']['checked'])) {
 		print_liste_field_titre($arrayfields['cr.rate']['label'], $_SERVER["PHP_SELF"], "cr.rate", "", $param, "", $sortfield, $sortorder);
 	}
-	if (!empty($arrayfields['cr.rate_indirect']['checked'])) {
-		print_liste_field_titre($arrayfields['cr.rate_indirect']['label'], $_SERVER["PHP_SELF"], "cr.rate_indirect", "", $param, "", $sortfield, $sortorder);
-	}
 
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -576,23 +559,6 @@ if ($resql) {
 			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
 			print '<td><input type="text" min="0" step="any" class="maxwidth100" id="rateinput" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
 
-			if (getDolGlobalString('MULTICURRENCY_USE_RATE_INDIRECT')) {
-				print '</td>';
-				// LRR Calculate Rate Direct
-				print '<script type="text/javascript">';
-				print 'jQuery(document).ready(function () {
-						//alert("TC");
-						jQuery("#rateindirectinput").keyup(function () {
-							var valindirect = jQuery(this).val();
-							valdirect = 1 / parseFloat(valindirect);
-							jQuery("#rateinput").val(valdirect);
-							console.log("Rate Direct:"+valdirect)
-						});
-					});';
-				print '</script>';
-				print '<td><input type="text" min="0" step="any" class="maxwidth75" id="rateindirectinput" name="rateindirectinput" value="'.dol_escape_htmltag($obj->rate_indirect).'">';
-			}
-
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
 			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
 			print '<button type="submit" class="button small reposition" name="action" value="update">'.$langs->trans("Modify").'</button>';

From 967c444d8d7bfaf85a0fe64dd302b86eafadc4b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 16:39:12 +0100
Subject: [PATCH 1291/1862] FIX support of multiobject in APIs generated by
 modulebuilder

---
 htdocs/core/lib/modulebuilder.lib.php | 139 ++++++++++++++++----------
 htdocs/modulebuilder/index.php        |  29 ++++--
 2 files changed, 105 insertions(+), 63 deletions(-)

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 68e8b982cce..bb1ce99fa52 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -839,7 +839,8 @@ function deletePropsAndPermsFromDoc($file, $objectname)
 
 
 /**
- * Search a string and return all lines needed from file
+ * Search a string and return all lines needed from file. Does not include line $start nor $end
+ *
  * @param  string  $file    file for searching
  * @param  string  $start   start line if exist
  * @param  string  $end     end line if exist
@@ -953,106 +954,136 @@ function writePermsInAsciiDoc($file, $destfile)
 
 /**
  * Add Object in ModuleApi File
- * @param  string $file           path of file
- * @param  array  $objects        array of objects in the module
- * @param  string $modulename     name of module
- * @return int                    1 if OK, -1 if KO
+ *
+ * @param	string	$srcfile		Source file to use as example
+ * @param  	string 	$file           Path of modified file
+ * @param  	array  	$objects        Array of objects in the module
+ * @param  	string 	$modulename     Name of module
+ * @return 	int                    	Return 1 if OK, -1 if KO
  */
-function addObjectsToApiFile($file, $objects, $modulename)
+function addObjectsToApiFile($srcfile, $file, $objects, $modulename)
 {
+	global $langs, $user;
+
 	if (!file_exists($file)) {
 		return -1;
 	}
-	$content = file($file);
-	$includeClass = "dol_include_once('/mymodule/class/myobject.class.php');";
-	$props = "public \$myobject;";
-	$varcomented = "@var MyObject \$myobject {@type MyObject}";
-	$constructObj = "\$this->myobject = new MyObject(\$this->db);";
+
+	$now = dol_now();
+	$content = file($file);	// $content is an array
+
+	$includeClass = "dol_include_once\(\'\/\w+\/class\/\w+\.class\.php\'\);";
+	$props = 'public\s+\$\w+;';
+	$varcommented = '@var\s+\w+\s+\$\w+\s+{@type\s+\w+}';
+	$constructObj = '\$this->\w+\s+=\s+new\s+\w+\(\$this->db\);';
 
 	// add properties and declare them in constructor
 	foreach ($content as $lineNumber => &$lineContent) {
-		if (strpos($lineContent, $varcomented) !== false) {
+		if (preg_match('/'.$varcommented.'/', $lineContent)) {
 			$lineContent = '';
-			foreach ($objects as $object) {
-				$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}". PHP_EOL;
+			foreach ($objects as $objectname) {
+				$lineContent .= "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}". PHP_EOL;
 			}
 			//var_dump($lineContent);exit;
-		}
-		if (strpos($lineContent, $props) !== false) {
+		} elseif (preg_match('/'.$props.'/', $lineContent)) {
 			$lineContent = '';
-			foreach ($objects as $object) {
-				$lineContent .= "\tpublic \$".strtolower($object).";". PHP_EOL;
+			foreach ($objects as $objectname) {
+				$lineContent .= "\tpublic \$".strtolower($objectname).";". PHP_EOL;
 			}
-		}
-		if (strpos($lineContent, $constructObj) !== false) {
+		} elseif (preg_match('/'.$constructObj.'/', $lineContent)) {
 			$lineContent = '';
-			foreach ($objects as $object) {
-				$lineContent .= "\t\t\$this->".strtolower($object)." = new ".$object."(\$this->db);". PHP_EOL;
+			foreach ($objects as $objectname) {
+				$lineContent .= "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);". PHP_EOL;
 			}
-		}
-		if (strpos($lineContent, $includeClass) !== false) {
+		} elseif (preg_match('/'.$includeClass.'/', $lineContent)) {
 			$lineContent = '';
-			foreach ($objects as $object) {
-				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($object).".class.php');". PHP_EOL;
+			foreach ($objects as $objectname) {
+				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');". PHP_EOL;
 			}
 		}
 	}
+
 	$allContent = implode("", $content);
 	file_put_contents($file, $allContent);
 
-	//add methods for each object
-	$allContent = getFromFile($file, '/*begin methods CRUD*/', '/*end methods CRUD*/');
-	foreach ($objects as $object) {
-		$contentReplaced = str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
-		dolReplaceInFile($file, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/'));
+	// Add methods for each object
+	$allContent = getFromFile($srcfile, '/* BEGIN MODULEBUILDER API MYOBJECT */', '/* END MODULEBUILDER API MYOBJECT */');
+	foreach ($objects as $objectname) {
+		$arrayreplacement = array(
+			'mymodule' => strtolower($modulename),
+			'MyModule' => $modulename,
+			'MYMODULE' => strtoupper($modulename),
+			'My module' => $modulename,
+			'my module' => $modulename,
+			'Mon module' => $modulename,
+			'mon module' => $modulename,
+			'htdocs/modulebuilder/template' => strtolower($modulename),
+			'myobject' => strtolower($objectname),
+			'MyObject' => $objectname,
+			'MYOBJECT' => strtoupper($objectname),
+			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+		);
+		$contentReplaced = make_substitutions($allContent, $arrayreplacement, null);
+		//$contentReplaced = str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
+
+		dolReplaceInFile($file, array(
+			'/* BEGIN MODULEBUILDER API MYOBJECT */' => '/* BEGIN MODULEBUILDER API '.strtoupper($objectname).' */'.$contentReplaced."\t".'/* END MODULEBUILDER API '.strtoupper($objectname).' */'."\n\n\n\t".'/* BEGIN MODULEBUILDER API MYOBJECT */'
+		));
 	}
-	dolReplaceInFile($file, array($allContent => '','MyModule' => ucfirst($modulename)));
+
+	// Remove the block $allContent found in src file
+	// TODO Replace with a replacement of all text including into /* BEGIN MODULEBUILDER API MYOBJECT */ and /* END MODULEBUILDER API MYOBJECT */
+	dolReplaceInFile($file, array($allContent => ''));
+
 	return 1;
 }
 
 /**
- * Remove Object variables and methods from API_Module File
- * @param string   $file         file api module
- * @param string   $objectname   name of object want to remove
- * @param string   $modulename   name of module
- * @return int                    1 if OK, -1 if KO
+ * Remove 	Object variables and methods from API_Module File
+ *
+ * @param 	string   	$file         	File api module
+ * @param  	array  		$objects        Array of objects in the module
+ * @param 	string   	$objectname   	Name of object want to remove
+ * @return 	int                    		1 if OK, -1 if KO
  */
-function removeObjectFromApiFile($file, $objectname, $modulename)
+function removeObjectFromApiFile($file, $objects, $objectname)
 {
-	$begin = '/*CRUD FOR '.strtoupper($objectname).'*/';
-	$end = '/*END CRUD FOR '.strtoupper($objectname).'*/';
-	$includeClass = "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');";
-	$varcomentedDel = "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}";
-	$propsDel = "\tpublic \$".strtolower($objectname).";";
-	$constructObjDel = "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);";
-
 	if (!file_exists($file)) {
 		return -1;
 	}
-	$content = file($file);
-	// for delete property and the initialization from the construct
+
+	$content = file($file);	// $content is an array
+
+	$includeClass = "dol_include_once\(\'\/\w+\/class\/".strtolower($objectname)."\.class\.php\'\);";
+	$props = 'public\s+\$'.strtolower($objectname);
+	$varcommented = '@var\s+\w+\s+\$'.strtolower($objectname).'\s+{@type\s+\w+}';
+	$constructObj = '\$this->'.strtolower($objectname).'\s+=\s+new\s+\w+\(\$this->db\);';
+
+	// add properties and declare them in constructor
 	foreach ($content as $lineNumber => &$lineContent) {
-		if (strpos($lineContent, $includeClass) !== false) {
+		if (preg_match('/'.$varcommented.'/i', $lineContent)) {
 			$lineContent = '';
-		}
-		if (strpos($lineContent, $varcomentedDel) !== false) {
+		} elseif (preg_match('/'.$props.'/i', $lineContent)) {
 			$lineContent = '';
-		}
-		if (strpos($lineContent, $propsDel) !== false) {
+		} elseif (preg_match('/'.$constructObj.'/i', $lineContent)) {
 			$lineContent = '';
-		}
-		if (strpos($lineContent, $constructObjDel) !== false) {
+		} elseif (preg_match('/'.$includeClass.'/i', $lineContent)) {
 			$lineContent = '';
 		}
 	}
+
 	$allContent = implode("", $content);
 	file_put_contents($file, $allContent);
+
 	// for delete methods of object
+	$begin = '/* BEGIN MODULEBUILDER API '.strtoupper($objectname).' */';
+	$end = '/* END MODULEBUILDER API '.strtoupper($objectname).' */';
 	$allContent = getFromFile($file, $begin, $end);
 	$check = dolReplaceInFile($file, array($allContent => ''));
 	if ($check) {
 		dolReplaceInFile($file, array($begin => '', $end => ''));
 	}
+
 	return 1;
 }
 
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 1e78c341f06..e0acefa2b0e 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -467,13 +467,13 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 			'---Put here your own copyright and developer email---' => dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
-		if (count($objects) > 1) {
-			addObjectsToApiFile($destfile, $objects, $modulename);
+		if ($action == 'initapi') {
+			if (count($objects) >= 1) {
+				addObjectsToApiFile($srcfile, $destfile, $objects, $modulename);
+			}
 		} else {
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			dolReplaceInFile($destfile, $arrayreplacement);
-			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-			dolReplaceInFile($destfile, array('/*begin methods CRUD*/' => '/*begin methods CRUD*/'."\n\t".'/*CRUD FOR '.strtoupper($objectname).'*/', '/*end methods CRUD*/' => '/*END CRUD FOR '.strtoupper($objectname).'*/'."\n\t".'/*end methods CRUD*/'));
 		}
 
 		if ($varnametoupdate) {
@@ -952,20 +952,31 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 		$filetodelete = $dirins.'/'.$relativefilename;
 		$dirtodelete  = $dirins.'/'.$dirnametodelete;
 
-		//check when we want delete api_file
+		// Get list of existing objects
+		$objects = dolGetListOfObjectClasses($destdir);
+
+		$keyofobjecttodelete = array_search($objectname, $objects);
+		if ($keyofobjecttodelete !== false) {
+			unset($objects[$keyofobjecttodelete]);
+		}
+
+		// Delete or modify the file
 		if (strpos($relativefilename, 'api') !== false) {
 			$file_api = $destdir.'/class/api_'.strtolower($module).'.class.php';
-			$removeFile = removeObjectFromApiFile($file_api, $objectname, $module);
-			$var = getFromFile($file_api, '/*begin methods CRUD*/', '/*end methods CRUD*/');
-			if (str_word_count($var) == 0) {
+
+			$removeFile = removeObjectFromApiFile($file_api, $objects, $objectname);
+
+			if (count($objects) == 0) {
 				$result = dol_delete_file($filetodelete);
 			}
+
 			if ($removeFile) {
 				setEventMessages($langs->trans("ApiObjectDeleted"), null);
 			}
 		} else {
 			$result = dol_delete_file($filetodelete);
 		}
+
 		if (!$result) {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
 		} else {
@@ -4209,7 +4220,7 @@ if ($module == 'initmodule') {
 									print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("ApiExplorer").'</a>';
 								}
 							} else {
-								print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&token='.newToken().'&format=php&file='.urlencode($pathtoapi).'">'.img_picto('AddAPIsForThisObject', 'generate', 'class="paddingleft"').'</a>';
+								print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&token='.newToken().'&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans('AddAPIsForThisObject'), 'generate', 'class="paddingleft"').'</a>';
 							}
 						} else {
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&token='.newToken().'&format=php&file='.urlencode($pathtoapi).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';

From c22a6219ece134d053e6ec54df9a45151a3e31ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 16:40:06 +0100
Subject: [PATCH 1292/1862] Debug v20

---
 htdocs/core/lib/functions.lib.php        | 4 +++-
 htdocs/core/modules/modAi.class.php      | 2 +-
 htdocs/core/modules/modBookCal.class.php | 2 +-
 htdocs/langs/en_US/modulebuilder.lang    | 7 ++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e74be328a4b..40afe9b9dc8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4618,7 +4618,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'ai', 'angle-double-down', 'angle-double-up', 'asset',
-				'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bookmark', 'bom', 'briefcase-medical', 'bug', 'building',
+				'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bom', 'bookcal', 'bookmark', 'briefcase-medical', 'bug', 'building',
 				'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'clone', 'close_title', 'code', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cross', 'cubes',
 				'check-circle', 'check-square', 'currency', 'multicurrency',
@@ -4666,6 +4666,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 				'asset' => 'money-check-alt', 'autofill' => 'fill',
 				'bank_account' => 'university',
 				'bill' => 'file-invoice-dollar', 'billa' => 'file-excel', 'billr' => 'file-invoice-dollar', 'billd' => 'file-medical',
+				'bookcal' => 'calendar-check',
 				'supplier_invoice' => 'file-invoice-dollar', 'supplier_invoicea' => 'file-excel', 'supplier_invoicer' => 'file-invoice-dollar', 'supplier_invoiced' => 'file-medical',
 				'bom' => 'shapes',
 				'card' => 'address-card', 'chart' => 'chart-line', 'company' => 'building', 'contact' => 'address-book', 'contract' => 'suitcase', 'collab' => 'people-arrows', 'conversation' => 'comments', 'country' => 'globe-americas', 'cron' => 'business-time', 'cross' => 'times',
@@ -4764,6 +4765,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 				'action' => 'infobox-action', 'account' => 'infobox-bank_account', 'accounting_account' => 'infobox-bank_account', 'accountline' => 'infobox-bank_account', 'accountancy' => 'infobox-bank_account', 'asset' => 'infobox-bank_account',
 				'bank_account' => 'infobox-bank_account',
 				'bill' => 'infobox-commande', 'billa' => 'infobox-commande', 'billr' => 'infobox-commande', 'billd' => 'infobox-commande',
+				'bookcal' => 'infobox-action',
 				'margin' => 'infobox-bank_account', 'conferenceorbooth' => 'infobox-project',
 				'cash-register' => 'infobox-bank_account', 'contract' => 'infobox-contrat', 'check' => 'font-status4', 'collab' => 'infobox-action', 'conversation' => 'infobox-contrat',
 				'donation' => 'infobox-commande', 'dolly' => 'infobox-commande',  'dollyrevert' => 'flip infobox-order_supplier',
diff --git a/htdocs/core/modules/modAi.class.php b/htdocs/core/modules/modAi.class.php
index c0a527a6463..3c47eb376d3 100644
--- a/htdocs/core/modules/modAi.class.php
+++ b/htdocs/core/modules/modAi.class.php
@@ -69,7 +69,7 @@ class modAi extends DolibarrModules
 		$this->descriptionlong = "AiDescriptionLong";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'development';
+		$this->version = 'experimental';
 
 		// Key used in llx_const table to save module status enabled/disabled (where BOOKCAL is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
diff --git a/htdocs/core/modules/modBookCal.class.php b/htdocs/core/modules/modBookCal.class.php
index a778ac8ffc7..0b2ce6c2c77 100644
--- a/htdocs/core/modules/modBookCal.class.php
+++ b/htdocs/core/modules/modBookCal.class.php
@@ -78,7 +78,7 @@ class modBookCal extends DolibarrModules
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
-		$this->picto = 'fa-calendar-check';
+		$this->picto = 'bookcal';
 
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index c59c4271710..9ff542d9799 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -165,7 +165,7 @@ BadValueForType=Bad value for type %s
 DefinePropertiesFromExistingTable=Define the fields/properties from an existing table
 DefinePropertiesFromExistingTableDesc=If a table in the database (for the object to create) already exists, you can use it to define the properties of the object.
 DefinePropertiesFromExistingTableDesc2=Keep empty if the table does not exist yet. The code generator will use different kinds of fields to build an example of table that you can edit later.
-GeneratePermissions=I want to manage permissions on this object 
+GeneratePermissions=I want to manage permissions on this object
 GeneratePermissionsHelp=If you check this, some code will be added to manage permissions to read, write and delete record of the objects
 PermissionDeletedSuccesfuly=Permission has been successfully removed
 PermissionUpdatedSuccesfuly=Permission has been successfully updated
@@ -173,6 +173,7 @@ PermissionAddedSuccesfuly=Permission has been successfully added
 MenuDeletedSuccessfuly=Menu has been successfully deleted
 MenuAddedSuccessfuly=Menu has been successfully added
 MenuUpdatedSuccessfuly=Menu has been successfully updated
+AddAPIsForThisObject=Add APIs for this object
 ApiObjectDeleted=API for object %s has been successfully deleted
 CRUDRead=Read
 CRUDCreateWrite=Create or Update
@@ -181,8 +182,8 @@ DictionariesCreated=Dictionary <b>%s</b> created successfully
 DictionaryDeleted=Dictionary <b>%s</b> removed successfully
 PropertyModuleUpdated=Property <b>%s</b> has been update successfully
 InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
-SetupFile=Page for module setup 
+SetupFile=Page for module setup
 EmailingSelectors=Emails selectors
 EmailingSelectorDesc=You can generate and edit here the class files to provide new email target selectors for the mass emailing module
 EmailingSelectorFile=Emails selector file
-NoEmailingSelector=No emails selector file
\ No newline at end of file
+NoEmailingSelector=No emails selector file

From 7fddff930225e9ca90753967fa76effce2887850 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 14 Mar 2024 16:40:14 +0100
Subject: [PATCH 1293/1862] Fix: Correction for batches with letters in Takepos

---
 htdocs/multicurrency/class/multicurrency.class.php | 2 +-
 htdocs/multicurrency/multicurrency_rate.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 5433bb23f28..a7ef2153c9f 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -912,7 +912,7 @@ class CurrencyRate extends CommonObjectLine
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET rate = ".((float) $this->rate);
+		$sql .= "SET rate = ".((float) $this->rate);
 		if (!empty($this->date_sync)) {
 			$sql .= ", date_sync = '".$this->db->idate($this->date_sync)."'";
 		}
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 782834bbaa5..947c5ac3a2b 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -557,7 +557,7 @@ if ($resql) {
 			}
 			print '<td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
 			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
-			print '<td><input type="text" min="0" step="any" class="maxwidth100" id="rateinput" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
+			print '<td><input type="text" min="0" step="any" class="maxwidth100" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
 
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
 			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';

From 54bdad710d1b074fe0fd3c0abe2a0748403f33a2 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 14 Mar 2024 16:40:54 +0100
Subject: [PATCH 1294/1862] Fix: Correction for batches with letters in Takepos

---
 htdocs/multicurrency/multicurrency_rate.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 947c5ac3a2b..94c0438f71e 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -558,7 +558,6 @@ if ($resql) {
 			print '<td><input class="minwidth200" name="dateinput" value="'. date('Y-m-d', dol_stringtotime($obj->date_sync)) .'" type="date"></td>';
 			print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
 			print '<td><input type="text" min="0" step="any" class="maxwidth100" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '">';
-
 			print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
 			print '<input type="hidden" name="id_rate" value="'.dol_escape_htmltag($obj->rowid).'">';
 			print '<button type="submit" class="button small reposition" name="action" value="update">'.$langs->trans("Modify").'</button>';

From 9430bebbb1ddf25da9fccc7e175e0c29f263a146 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 14 Mar 2024 16:44:07 +0100
Subject: [PATCH 1295/1862] Fix: Correction so that warehouse does not have to
 be indicated if it is a service

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

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 9588e8c9852..0ec2cf6aa77 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014-2017  Francis Appels          <francis.appels@yahoo.com>
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
- * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2016-2024	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
@@ -920,7 +920,7 @@ class Expedition extends CommonObject
 		if (isModEnabled('stock') && !empty($orderline->fk_product)) {
 			$fk_product = $orderline->fk_product;
 
-			if (!($entrepot_id > 0) && !getDolGlobalString('STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS')) {
+			if (!($entrepot_id > 0) && !getDolGlobalString('STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS') && !(getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES') && $line->product_type == Product::TYPE_SERVICE)) {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index cf3e3cde9b6..d0e0d179efc 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -3,7 +3,6 @@
  * Copyright (C) 2018    	Andreu Bisquerra   	<jove@bisquerra.com>
  * Copyright (C) 2021    	Nicolas ZABOURI    	<info@inovea-conseil.com>
  * Copyright (C) 2022-2023	Christophe Battarel	<christophe.battarel@altairis.fr>
- * Copyright (C) 2024	    Ferran Marcet 		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -924,7 +923,7 @@ if (empty($reshook)) {
 
 	if ($action=="setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch='".$db->escape($batch)."', fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch=".$db->escape($batch).", fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded);
 		$db->query($sql);
 	}
 

From 6b48e098549c3ee0dcf56ae3f8ce7bdab8200ad8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 16:49:29 +0100
Subject: [PATCH 1296/1862] Debug

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

diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 7ec1d1f30f3..ecacf04f4c1 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -83,7 +83,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $form = new Form($db);
 
 $help_url = '';
-$title = "MyModuleAbout";
+$title = "MyModuleSetup";
 
 llxHeader('', $langs->trans($title), $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-admin_about');
 

From 1e252dd5871f15181d17dd95194470fde7f4e778 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 17:05:27 +0100
Subject: [PATCH 1297/1862] Add spelling exception (datee + error in Changelog)

---
 dev/tools/codespell/codespell-ignore.txt       | 1 -
 dev/tools/codespell/codespell-lines-ignore.txt | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tools/codespell/codespell-ignore.txt b/dev/tools/codespell/codespell-ignore.txt
index 0c84807010b..c71e990a467 100644
--- a/dev/tools/codespell/codespell-ignore.txt
+++ b/dev/tools/codespell/codespell-ignore.txt
@@ -57,4 +57,3 @@ dur
 fonction
 espace
 methode
-datee
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 2c0fb95a96f..80e4f25e296 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -79,6 +79,7 @@
 			$object->periode = $dateperiod;
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Payement").'</span> : <span class="info-box-label">'.$this->type_payment.'</span>';
 			$sortfield = "datea";
+			$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 .= " '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 			$sql .= " , datee = ".(!empty($obj->datee) ? "'".$this->db->escape($obj->datee)."'" : "null");
 			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
@@ -325,6 +326,7 @@ $usercanread = (($user->hasRight('stock', 'mouvement', 'lire')));
 * The hook contaxt thirdpartycard has been renamed thirdpartycontact
 * The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
 - New: Add proposals into referer page of thirdparty.
+NEW: ModuleBuilder: Checkin comments begin and end before each actions
 for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV /NH') do (
 foreach ($TWeek as $week_number) {
 function checkES($IentOfi, $InumCta)

From 587c4eb2ee90d45f058d766f2b2398eab9cb16e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 17:24:52 +0100
Subject: [PATCH 1298/1862] Escape ouput

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

diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index edfa8adbb2f..f94cc476321 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -120,12 +120,13 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent tableforfield">';
 
 // Login
-print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.dol_escape_htmltag($object->login).'&nbsp;</td></tr>';
 
 // If there is a link to the unencrypted password, we show the value in database here so we can compare because it is shown nowhere else
+// This is for very old situation. Password are now encrypted and $object->pass is empty.
 if (getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD')) {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
-	print '<td class="valeur">'.$object->pass.'</td>';
+	print '<td class="valeur">'.dol_escape_htmltag($object->pass).'</td>';
 	print "</tr>\n";
 }
 

From b6b4acf5f9feaf323d0f2692fd6b5d7f5d9df293 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 17:53:48 +0100
Subject: [PATCH 1299/1862] Complet security file

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

diff --git a/SECURITY.md b/SECURITY.md
index 0cc37b96ce6..4d335d63737 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -104,3 +104,6 @@ Scope is the web application (backoffice) and the APIs.
 * SSL/TLS best practices
 * Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
 * Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
+* Ability to include javascript into a page of the website using the website page editor are not qualified (this is the expected behaviour)
+* Ability to execute PHP code on the server using the website using the website page editor by a user that own the super permission "add php code into pages" are not qualified (this is the expected behaviour).
+ 

From 8da1bc8b74791b9be692095a6fd3bb3467777135 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 17:55:49 +0100
Subject: [PATCH 1300/1862] FIX variable assignment (PHPStan warning)

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

diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f1941283842..f9787f8e3eb 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -1220,7 +1220,7 @@ class Productlot extends CommonObject
 		$this->specimen = 1;
 
 		$this->entity = $conf->entity;
-		$this->fk_product = null;
+		$this->fk_product = 0;
 		$this->batch = '';
 		$this->eatby = $now - 100000;
 		$this->sellby = $now - 100000;

From 2c1be590d9f752ae456f6c6019b44c7c9b64de19 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 18:03:32 +0100
Subject: [PATCH 1301/1862] FIX variables in project class (PHPStan Warnings)

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 13d4c426bc7..e8911500494 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2670,10 +2670,10 @@ class Project extends CommonObject
 					$actioncomm->email_sender = '';
 					$actioncomm->email_to = $to;
 
-					$actioncomm->errors_to = $errors_to;
+					$actioncomm->errors_to = (string) $errors_to;
 
 					$actioncomm->elementtype = 'project_task';
-					$actioncomm->fk_element = $this->element;
+					$actioncomm->fk_element = (int) $this->element;
 
 					$actioncomm->create($user);
 				} else {
@@ -2704,10 +2704,10 @@ class Project extends CommonObject
 					$actioncomm->email_sender = '';
 					$actioncomm->email_to = $to;
 
-					$actioncomm->errors_to = $errors_to;
+					$actioncomm->errors_to = (string) $errors_to;
 
 					$actioncomm->elementtype = 'project_task';
-					$actioncomm->fk_element = $this->element;
+					$actioncomm->fk_element = (int) $this->element;
 
 					$actioncomm->create($user);
 				}

From 385732c12d0eeb4992efed32fab5fa2d4c71eeda Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Thu, 14 Mar 2024 10:00:48 +0100
Subject: [PATCH 1302/1862] codespell and datee

---
 dev/tools/codespell/codespell-ignore.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/codespell/codespell-ignore.txt b/dev/tools/codespell/codespell-ignore.txt
index c71e990a467..0c84807010b 100644
--- a/dev/tools/codespell/codespell-ignore.txt
+++ b/dev/tools/codespell/codespell-ignore.txt
@@ -57,3 +57,4 @@ dur
 fonction
 espace
 methode
+datee

From fb5dab71caa1fec472376b8bd1603c7919cf07c6 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Thu, 14 Mar 2024 18:25:47 +0100
Subject: [PATCH 1303/1862] FIX variable assignment for newPayment (PHPStan
 warnings)

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

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d57987f4434..feec219703d 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1619,7 +1619,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 
 			// Set the new member type
 			$member->typeid = $newtypeid;
-			$member->type = dol_getIdFromCode($db, $newtypeid, 'adherent_type', 'rowid', 'libelle');
+			$member->type = (string) dol_getIdFromCode($db, $newtypeid, 'adherent_type', 'rowid', 'libelle');
 
 			// list member type
 			if (!$action) {

From 4577a4d43221479f21caeffb4a9d88d63134734c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 18:40:31 +0100
Subject: [PATCH 1304/1862] fix phpstan is incompatible with

---
 htdocs/core/modules/fichinter/mod_arctic.php  | 15 ++++++----
 htdocs/core/modules/fichinter/mod_pacific.php | 13 +++++----
 .../product/mod_codeproduct_leopard.php       |  2 +-
 .../modules/product/modules_product.class.php |  4 +--
 .../modules/project/mod_project_simple.php    | 15 ----------
 .../modules/project/task/mod_task_simple.php  | 21 +++-----------
 .../project/task/mod_task_universal.php       | 24 ++++-----------
 .../societe/mod_codeclient_elephant.php       | 29 ++++++++-----------
 .../societe/mod_codeclient_leopard.php        | 18 ++++++------
 .../modules/societe/mod_codeclient_monkey.php | 18 ++++++------
 .../societe/mod_codecompta_aquarium.php       | 10 +++----
 .../societe/mod_codecompta_digitaria.php      | 16 +++++-----
 .../societe/mod_codecompta_panicum.php        | 13 +++++----
 .../modules/societe/modules_societe.class.php | 10 +++----
 .../mod_commande_fournisseur_muguet.php       |  4 +--
 .../mod_commande_fournisseur_orchidee.php     |  4 +--
 phpstan.neon.dist                             |  1 -
 17 files changed, 88 insertions(+), 129 deletions(-)

diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index e8f79c9c084..33fce191c0e 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -121,11 +121,11 @@ class mod_arctic extends ModeleNumRefFicheinter
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Fichinter	$object		Object we need next value for
-	 *  @return string|0      			Value if OK, 0 if KO
+	 *  @param	Societe|string		$objsoc     Object thirdparty
+	 *  @param  Fichinter|string	$object		Object we need next value for
+	 *  @return string|0      					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc = 0, $object = '')
+	public function getNextValue($objsoc = '', $object = '')
 	{
 		global $db, $conf;
 
@@ -138,8 +138,11 @@ class mod_arctic extends ModeleNumRefFicheinter
 			$this->error = 'NotConfigured';
 			return 0;
 		}
-
-		$numFinal = get_next_value($db, $mask, 'fichinter', 'ref', '', $objsoc, $object->datec);
+		$datec = '';
+		if (!empty($object->datec)) {
+			$datec = $object->datec;
+		}
+		$numFinal = get_next_value($db, $mask, 'fichinter', 'ref', '', $objsoc, $datec);
 
 		return  $numFinal;
 	}
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index f05a1ec320f..0f780ee2bb6 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -121,11 +121,11 @@ class mod_pacific extends ModeleNumRefFicheinter
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Fichinter	$object		Object we need next value for
-	 *  @return string      			Value if KO, <0 if KO
+	 *  @param	Societe|string		$objsoc     Object thirdparty
+	 *  @param  Fichinter|string	$object		Object we need next value for
+	 *  @return string      					Value if KO, <0 if KO
 	 */
-	public function getNextValue($objsoc = 0, $object = '')
+	public function getNextValue($objsoc = '', $object = '')
 	{
 		global $db, $conf;
 
@@ -147,7 +147,10 @@ class mod_pacific extends ModeleNumRefFicheinter
 		}
 
 		//$date=time();
-		$date = $object->datec;
+		$date = '';
+		if (!empty($object->datec)) {
+			$date = $object->datec;
+		}
 		$yymm = dol_print_date($date, "%y%m");
 
 		if ($max >= (pow(10, 4) - 1)) {
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 126527a55bf..990d55b691e 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -85,7 +85,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Product		$objproduct		Object product
+	 * @param	?Product		$objproduct		Object product
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return next value
 	 */
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 893dc9dc2dc..6d9e87bf023 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -64,11 +64,11 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	Product		$objproduct		Object product
+	 *	@param	?Product		$objproduct		Object product
 	 *	@param	int			$type		Type
 	 *  @return string      			Value
 	 */
-	public function getNextValue($objproduct = 0, $type = -1)
+	public function getNextValue($objproduct = null, $type = -1)
 	{
 		global $langs;
 		return $langs->trans("Function_getNextValue_InModuleNotWorking");
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index a153b3a590d..1ef51d36c95 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -165,19 +165,4 @@ class mod_project_simple extends ModeleNumRefProjects
 		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next reference not yet used as a reference
-	 *
-	 *  @param	Societe	$objsoc     Object third party
-	 *  @param  Project	$project	Object project
-	 *  @return string|-1      		Next not used reference, -1 if KO
-	 */
-	public function project_get_num($objsoc = 0, $project = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $project);
-	}
 }
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index 0eea8129ca3..e75fd1b5e8a 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2010		Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -122,9 +123,9 @@ class mod_task_simple extends ModeleNumRefTask
 	/**
 	 *  Return next value
 	 *
-	 *  @param   Societe	$objsoc		Object third party
-	 *  @param   Task	$object		Object Task
-	 *  @return	string|-1			Value if OK, -1 if KO
+	 *  @param   Societe|string	$objsoc		Object third party
+	 *  @param   Task|string	$object		Object Task
+	 *  @return	string|-1					Value if OK, -1 if KO
 	 */
 	public function getNextValue($objsoc, $object)
 	{
@@ -161,18 +162,4 @@ class mod_task_simple extends ModeleNumRefTask
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next reference not yet used as a reference
-	 *
-	 *  @param  Societe	$objsoc     Object third party
-	 *  @param  Task	$object     Object task
-	 *  @return string|-1           Next not used reference, -1 if KO
-	 */
-	public function task_get_num($objsoc = 0, $object = '')
-	{
-		return $this->getNextValue($objsoc, $object);
-	}
 }
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 95c7d392ed0..52b7b9b18d9 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2010 Regis Houssin  <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,11 +120,11 @@ class mod_task_universal extends ModeleNumRefTask
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc		Object third party
-	 *  @param   Task		$object	    Object task
-	 *  @return  string|0				Value if OK, 0 if KO
+	 *  @param	Societe|string	$objsoc		Object third party
+	 *  @param	Task|string		$object	    Object task
+	 *  @return string|0					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc, $object)
+	public function getNextValue($objsoc = '', $object = '')
 	{
 		global $db, $conf;
 
@@ -141,19 +142,4 @@ class mod_task_universal extends ModeleNumRefTask
 
 		return  $numFinal;
 	}
-
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return next reference not yet used as a reference
-	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  Task		$object	    Object task
-	 *  @return string|0      			Next not used reference, 0 if KO
-	 */
-	public function project_get_num($objsoc = 0, $object = '')
-	{
-		// phpcs:enable
-		return $this->getNextValue($objsoc, $object);
-	}
 }
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index f83ec00dc77..6e1d61e165d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -124,14 +124,13 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	Societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return string example
+	 * @param	Translate		$langs		Object langs
+	 * @param	Societe|string	$objsoc		Object thirdparty
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objsoc = 0, $type = -1)
+	public function getExample($langs, $objsoc = '', $type = -1)
 	{
-		$error = 0;
 		$examplecust = '';
 		$examplesup = '';
 		$errmsg = array(
@@ -150,12 +149,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			if (!$examplecust && ($cssforerror == 'error' || $this->error != 'NotConfigured')) {
 				$langs->load("errors");
 				$examplecust = '<span class="'.$cssforerror.'">'.$langs->trans('ErrorBadMask').'</span>';
-				$error = 1;
 			}
 			if (in_array($examplecust, $errmsg)) {
 				$langs->load("errors");
 				$examplecust = '<span class="'.$cssforerror.'">'.$langs->trans($examplecust).'</span>';
-				$error = 1;
 			}
 		}
 		if ($type != 0) {
@@ -163,12 +160,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			if (!$examplesup && ($cssforerror == 'error' || $this->error != 'NotConfigured')) {
 				$langs->load("errors");
 				$examplesup = '<span class="'.$cssforerror.'">'.$langs->trans('ErrorBadMask').'</span>';
-				$error = 1;
 			}
 			if (in_array($examplesup, $errmsg)) {
 				$langs->load("errors");
 				$examplesup = '<span class="'.$cssforerror.'">'.$langs->trans($examplesup).'</span>';
-				$error = 1;
 			}
 		}
 
@@ -184,23 +179,23 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	/**
 	 * Return next value
 	 *
-	 * @param	Societe		$objsoc     Object third party
-	 * @param  	int		    $type       Client ou fournisseur (0:customer, 1:supplier)
-	 * @return 	string|-1      			Value if OK, '' if module not configured, -1 if KO
+	 * @param	Societe|string	$objsoc     Object third party
+	 * @param  	int		    	$type       Client ou fournisseur (0:customer, 1:supplier)
+	 * @return 	string|-1      				Value if OK, '' if module not configured, -1 if KO
 	 */
-	public function getNextValue($objsoc = 0, $type = -1)
+	public function getNextValue($objsoc = '', $type = -1)
 	{
-		global $db, $conf;
+		global $db;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// Get Mask value
 		$mask = '';
 		if ($type == 0) {
-			$mask = !getDolGlobalString('COMPANY_ELEPHANT_MASK_CUSTOMER') ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			$mask = getDolGlobalString('COMPANY_ELEPHANT_MASK_CUSTOMER');
 		}
 		if ($type == 1) {
-			$mask = !getDolGlobalString('COMPANY_ELEPHANT_MASK_SUPPLIER') ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			$mask = getDolGlobalString('COMPANY_ELEPHANT_MASK_SUPPLIER');
 		}
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 98343987765..1f592057adb 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -77,12 +77,12 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	Societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return string example
+	 * @param	Translate		$langs		Object langs
+	 * @param	Societe|string	$objsoc		Object thirdparty
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objsoc = 0, $type = -1)
+	public function getExample($langs, $objsoc = '', $type = -1)
 	{
 		return '';
 	}
@@ -90,11 +90,11 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return next value
+	 * @param	Societe|string	$objsoc		Object thirdparty
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return next value
 	 */
-	public function getNextValue($objsoc = 0, $type = -1)
+	public function getNextValue($objsoc = '', $type = -1)
 	{
 		return '';
 	}
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 9019ff44d29..e46b5dc3f7a 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -76,12 +76,12 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	Societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return string example
+	 * @param	Translate		$langs		Object langs
+	 * @param	Societe|string	$objsoc		Object thirdparty
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objsoc = 0, $type = -1)
+	public function getExample($langs, $objsoc = '', $type = -1)
 	{
 		return $this->prefixcustomer.'0901-00001<br>'.$this->prefixsupplier.'0901-00001';
 	}
@@ -90,11 +90,11 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 *  @param  int			$type       Client ou fournisseur (1:client, 2:fournisseur)
-	 *  @return string|-1      			Value if OK, '' if module not configured, -1 if KO
+	 *  @param	Societe|string	$objsoc     Object third party
+	 *  @param  int				$type       Client ou fournisseur (1:client, 2:fournisseur)
+	 *  @return string|-1      				Value if OK, '' if module not configured, -1 if KO
 	 */
-	public function getNextValue($objsoc = 0, $type = -1)
+	public function getNextValue($objsoc = '', $type = -1)
 	{
 		global $db;
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 264ee51741b..64b65be81e5 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -130,12 +130,12 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	Societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return string example
+	 * @param	Translate		$langs		Object langs
+	 * @param	Societe|string	$objsoc		Object thirdparty
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objsoc = 0, $type = -1)
+	public function getExample($langs, $objsoc = '', $type = -1)
 	{
 		$s = '';
 		$s .= $this->prefixcustomeraccountancycode.'CUSTCODE';
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index fc9feb6b25f..a902fc80ac8 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2010       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2019       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -160,12 +160,12 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	/**
 	 *  Return an example of result returned by getNextValue
 	 *
-	 *  @param	Translate	$langs		Object langs
-	 *  @param	Societe		$objsoc		Object thirdparty
-	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 *  @return	string					Example
+	 *  @param	Translate		$langs		Object langs
+	 *  @param	Societe|string	$objsoc		Object thirdparty
+	 *  @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 *  @return	string						Example
 	 */
-	public function getExample($langs, $objsoc = 0, $type = -1)
+	public function getExample($langs, $objsoc = '', $type = -1)
 	{
 		global $conf, $mysoc;
 
@@ -188,7 +188,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 *
 	 *  @param	DoliDB	$db              Database handler
 	 *  @param  Societe	$societe         Third party object
-	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @param  string	$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
 	public function get_code($db, $societe, $type = '')
@@ -277,7 +277,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 *
 	 *  @param	DoliDB	$db             Database handler
 	 *  @param  string	$code           Code of third party
-	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @param  string	$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
 	public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 1cec3d33dad..9dd740313f9 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,12 +72,12 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	/**
 	 *  Return an example of result returned by getNextValue
 	 *
-	 *  @param	Translate	$langs		Object langs
-	 *  @param	Societe		$objsoc		Object thirdparty
-	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 *  @return	string					Example
+	 *  @param	Translate		$langs		Object langs
+	 *  @param	Societe|string	$objsoc		Object thirdparty
+	 *  @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 *  @return	string						Example
 	 */
-	public function getExample($langs, $objsoc = 0, $type = -1)
+	public function getExample($langs, $objsoc = '', $type = -1)
 	{
 		return '';
 	}
@@ -87,7 +88,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	 *
 	 *  @param	DoliDB	$db              Database handler
 	 *  @param  Societe	$societe         Third party object
-	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @param  string	$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
 	public function get_code($db, $societe, $type = '')
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index dff42b63e86..8cc1ddd8082 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -72,11 +72,11 @@ abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	Societe		$objsoc		Object thirdparty
-	 *	@param	int			$type		Type
-	 *  @return string      			Value
+	 *	@param	Societe|string	$objsoc		Object thirdparty
+	 *	@param	int				$type		Type
+	 *  @return string      				Value
 	 */
-	public function getNextValue($objsoc = 0, $type = -1)
+	public function getNextValue($objsoc = '', $type = -1)
 	{
 		global $langs;
 		return $langs->trans("Function_getNextValue_InModuleNotWorking");
@@ -254,7 +254,7 @@ abstract class ModeleAccountancyCode extends CommonNumRefGenerator
 	 *
 	 *  @param	DoliDB	$db             Database handler
 	 *  @param  Societe	$societe        Third party object
-	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @param  string	$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
 	public function get_code($db, $societe, $type = '')
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 740dbfbfd17..cd6d9f78d0e 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -131,11 +131,11 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	/**
 	 * 	Return next value
 	 *
-	 *  @param	Societe				$objsoc     Object third party
+	 *  @param	Societe|string		$objsoc     Object third party
 	 *  @param  CommandeFournisseur	$object		Object
 	 *  @return string      					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc = 0, $object = '')
+	public function getNextValue($objsoc = '', $object = '')
 	{
 		global $db, $conf;
 
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index db138369a53..03f948de1c1 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -122,11 +122,11 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe				$objsoc     Object third party
+	 *  @param	Societe|string		$objsoc     Object third party
 	 *  @param  CommandeFournisseur	$object		Object
 	 *  @return string|0      					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc = 0, $object = '')
+	public function getNextValue($objsoc = '', $object = '')
 	{
 		global $db, $conf;
 
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 78867274e30..c354dfd5d84 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -54,7 +54,6 @@ parameters:
 		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Sprain\\SwissQrBill\\#'
 		- '#Constructor of class .* has an unused parameter #'
-		- '#Default value of the parameter#'
 	internalErrorsCountLimit: 50
 	cache:
 		nodesByFileCountMax: 512

From f4c1d824461f66366c5bd040cd4caac264084308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Benke?=
 <1179011+defrance@users.noreply.github.com>
Date: Thu, 14 Mar 2024 18:40:56 +0100
Subject: [PATCH 1305/1862] add hook to list category from external module

---
 htdocs/categories/viewcat.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index efcd10ddbb9..8466119ffd8 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -102,7 +102,7 @@ if ($confirm == 'no') {
 	}
 }
 
-$parameters = array();
+$parameters = array('type' => $type, 'id' => $id, 'label' => $label);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Remove element from category
 if ($id > 0 && $removeelem > 0 && $action == 'unlink') {
@@ -1355,6 +1355,10 @@ if ($type == Categorie::TYPE_TICKET) {
 	}
 }
 
+// Note that $action and $object may have been modified by some hooks
+$parameters = array('type' => $type, 'id' => $id, 'label' => $label);
+$reshook = $hookmanager->executeHooks('addMoreCategorieList', $parameters, $object, $action);
+
 // End of page
 llxFooter();
 $db->close();

From f8eb9da0b57ceeb763d0f1436bd23aec49925364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 18:43:22 +0100
Subject: [PATCH 1306/1862] fix phpstan is incompatible with

---
 .../doc/doc_generic_supplier_invoice_odt.modules.php          | 4 ++--
 .../doc/doc_generic_supplier_order_odt.modules.php            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index d149b5ff576..e03a9fcb835 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2019       Tim Otte		    <otte@meuser.it>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -123,7 +123,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->SUPPLIER_INVOICE_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString('SUPPLIER_INVOICE_ADDON_PDF_ODT_PATH'))));
 
 
 		$listoffiles = array();
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index a0963e88c04..049683aa1f5 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2019       Tim Otte		    <otte@meuser.it>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -123,7 +123,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString('SUPPLIER_ORDER_ADDON_PDF_ODT_PATH'))));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);

From ad13f6fc76d32d363a54dca9142cd67f02500e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 18:46:17 +0100
Subject: [PATCH 1307/1862] fix phpstan is incompatible with

---
 htdocs/fourn/class/fournisseur.facture.class.php | 6 +++---
 phpstan.neon.dist                                | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 5130c4ad2bd..cd90cf86179 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2313,13 +2313,13 @@ class FactureFournisseur extends CommonInvoice
 	 * @param		double		$txlocaltax2		LocalTax2 Rate
 	 * @param     	double		$qty           		Quantity
 	 * @param     	int			$idproduct			Id produit
-	 * @param	  	double		$price_base_type	HT or TTC
+	 * @param	  	string		$price_base_type	HT or TTC
 	 * @param	  	int			$info_bits			Miscellaneous information of line
 	 * @param		int			$type				Type of line (0=product, 1=service)
 	 * @param     	double		$remise_percent  	Percentage discount of the line
 	 * @param		int			$notrigger			Disable triggers
-	 * @param      	integer 	$date_start     	Date start of service
-	 * @param      	integer     $date_end       	Date end of service
+	 * @param      	int|string 	$date_start     	Date start of service
+	 * @param      	int|string  $date_end       	Date end of service
 	 * @param		array		$array_options		extrafields array
 	 * @param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @param		double		$pu_devise			Amount in currency
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c354dfd5d84..78867274e30 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -54,6 +54,7 @@ parameters:
 		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
 		- '#Sprain\\SwissQrBill\\#'
 		- '#Constructor of class .* has an unused parameter #'
+		- '#Default value of the parameter#'
 	internalErrorsCountLimit: 50
 	cache:
 		nodesByFileCountMax: 512

From a9847bb44c166d25a66df6e39c2d3dfee84cb021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 19:02:16 +0100
Subject: [PATCH 1308/1862] fix phpstan is incompatible with

---
 .../core/modules/product/mod_codeproduct_elephant.php  | 10 +++++-----
 .../core/modules/product/mod_codeproduct_leopard.php   |  8 ++++----
 htdocs/core/modules/product/modules_product.class.php  |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 644808826d5..397312fbb5f 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -118,12 +118,12 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	Product		$objproduct		Object product
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return string example
+	 * @param	Translate		$langs		Object langs
+	 * @param	Product|string	$objproduct	Object product
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return string example
 	 */
-	public function getExample($langs, $objproduct = null, $type = -1)
+	public function getExample($langs, $objproduct = '', $type = -1)
 	{
 		$exampleproduct = $exampleservice = '';
 
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 990d55b691e..d8ae7f91676 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -85,11 +85,11 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	?Product		$objproduct		Object product
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return next value
+	 * @param	Product|string	$objproduct	Object product
+	 * @param	int				$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @return	string						Return next value
 	 */
-	public function getNextValue($objproduct = null, $type = -1)
+	public function getNextValue($objproduct = '', $type = -1)
 	{
 		return '';
 	}
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 6d9e87bf023..cfe79891429 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -64,11 +64,11 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	?Product		$objproduct		Object product
-	 *	@param	int			$type		Type
-	 *  @return string      			Value
+	 *	@param	Product|string	$objproduct	Object product
+	 *	@param	int				$type		Type
+	 *  @return string      				Value
 	 */
-	public function getNextValue($objproduct = null, $type = -1)
+	public function getNextValue($objproduct = '', $type = -1)
 	{
 		global $langs;
 		return $langs->trans("Function_getNextValue_InModuleNotWorking");

From 2a7eac534e481a81a3138bf0c2fbd81682e59526 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 03:02:54 +0100
Subject: [PATCH 1309/1862] Fix call to rollback (was NOOP property access)

---
 htdocs/compta/cashcontrol/cashcontrol_card.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index fe4d5a15f77..74cce92938d 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Andreu Bisquerra		<jove@bisquerra.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 +69,7 @@ if ($contextpage == 'takepos') {
 	$_GET['optioncss'] = 'print';
 }
 
-$arrayofpaymentmode = array('cash'=>'Cash', 'cheque'=>'Cheque', 'card'=>'CreditCard');
+$arrayofpaymentmode = array('cash' => 'Cash', 'cheque' => 'Cheque', 'card' => 'CreditCard');
 
 $arrayofposavailable = array();
 if (isModEnabled('cashdesk')) {
@@ -180,7 +181,7 @@ if ($action == "start") {
 			$db->commit();
 			$action = "view";
 		} else {
-			$db->rollback;
+			$db->rollback();
 			$action = "view";
 		}
 	}

From 6d2ad5b180a4d07f8dd6b5e34bddf0b82208fff0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 03:04:22 +0100
Subject: [PATCH 1310/1862] Comment NOOP access to unset property

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

diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 8e7aad352be..4c71562da9b 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2016-2018  Charlie Benke           <charlie@patas-monkey.com>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -730,9 +731,7 @@ if ($action == 'create') {
 				// Show product and description
 				if (isset($object->lines[$i]->product_type)) {
 					$type = $object->lines[$i]->product_type;
-				} else {
-					$object->lines[$i]->fk_product_type;
-				}
+				} // else { $object->lines[$i]->fk_product_type; }
 				// Try to enhance type detection using date_start and date_end for free lines when type
 				// was not saved.
 				if (!empty($objp->date_start)) {

From b28f6a2cbad8ebc5e9516a148c868acf8a8721e9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 03:06:41 +0100
Subject: [PATCH 1311/1862] Enable PhanNoopProperty

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4771e953a36..a80290c1fb0 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -549,7 +549,7 @@ return [
 		// 'PhanSyntaxReturnValueInVoid',
 		// 'PhanTypeInstantiateTraitStaticOrSelf',
 		// 'PhanUndeclaredInvokeInCallable',
-		'PhanNoopProperty',
+		// 'PhanNoopProperty',
 		'PhanNoopVariable',
 		// 'PhanPluginPrintfUnusedArgument',
 		// 'PhanSyntaxReturnExpectedValue',

From 49416784ce3646fd942d8164e11d8968f74b04fd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:10 +0100
Subject: [PATCH 1312/1862] Fix PhanPluginSuspiciousParamPosition

---
 dev/tools/phan/baseline.txt | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 68fc0c015e7..c56fd81b5d6 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,8 +9,9 @@
  */
 return [
     // # Issue statistics:
-    // PhanPluginSuspiciousParamPosition : 45+ occurrences
+    // PhanPluginDuplicateIfStatements : 30+ occurrences
     // PhanParamSignatureMismatch : 25+ occurrences
+    // PhanPluginSuspiciousParamPosition : 15+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
     // PhanTypeArraySuspiciousNull : 10+ occurrences
@@ -33,34 +34,21 @@ return [
         'htdocs/adherents/stats/geo.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/adherents/type.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/admin/receiptprinter.php' => ['PhanRedefineFunctionInternal'],
-        'htdocs/admin/translation.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
         'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/collab/index.php' => ['PhanParamTooMany'],
-        'htdocs/comm/action/index.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeArraySuspiciousNull', 'PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/comm/action/index.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/comm/mailing/cibles.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/comm/mailing/info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/accounting-files.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/compta/bank/various_payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/bank/various_payment/info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/compta/facture/agenda-rec.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/sociales/class/paymentsocialcontribution.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/compta/sociales/document.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/sociales/info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/sociales/note.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/compta/tva/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/core/class/commonobject.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanNoopArray'],
@@ -68,7 +56,6 @@ return [
         'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/filemanagerdol/connectors/php/connector.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
@@ -78,7 +65,6 @@ return [
         'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
@@ -87,18 +73,10 @@ return [
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/fourn/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
-        'htdocs/loan/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/loan/document.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/loan/info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/loan/note.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/loan/payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/loan/schedule.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/mrp/class/mo.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
-        'htdocs/product/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/public/bookcal/index.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],

From 0efd899509de91afff51d3d828718ee8b6de98a1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:14 +0100
Subject: [PATCH 1313/1862] Fix PhanPluginSuspiciousParamPosition

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

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 0dbeab0db6d..307f4e3a579 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2020	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2017	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2017       Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -301,7 +302,9 @@ foreach ($modulesdir as $keydir => $tmpsearchdir) {
 		}
 		//var_dump($i.' - '.$keydir.' - '.$dir_lang_osencoded.' -> '.$moduledirname . ' / ' . $tmpfile.' -> '.$langkey);
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$result = $newlang->load($langkey, 0, 0, '', 0); // Load translation files + database overwrite
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$result = $newlangfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
 		if ($result < 0) {
 			print 'Failed to load language file '.$tmpfile.'<br>'."\n";
@@ -313,6 +316,7 @@ foreach ($modulesdir as $keydir => $tmpsearchdir) {
 		}
 		//print 'After loading lang '.$langkey.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$result = $langsenfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
 	}
 	$i++;

From a7274050d205b0cd9d9602987ae44280080eaf37 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:17 +0100
Subject: [PATCH 1314/1862] Fix PhanPluginSuspiciousParamPosition

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 68e6b4d7169..92bd8159976 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -302,8 +302,8 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 				'src' => getDolUserString($source),
 				'name' => dol_string_nohtmltag(getDolUserString($name)),
 				'offsettz' => (int) (empty($user->conf->$offsettz) ? 0 : $user->conf->$offsettz),
-				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				'color' => dol_string_nohtmltag(getDolUserString($color)),
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 				'default' => dol_string_nohtmltag(getDolUserString($default)),
 				'buggedfile' => dol_string_nohtmltag(isset($user->conf->buggedfile) ? $user->conf->buggedfile : '')
 			);

From 06cf35634af3cc6f90d2fce63f86ba323eb21085 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:19 +0100
Subject: [PATCH 1315/1862] Fix PhanPluginSuspiciousParamPosition

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

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 00934b0f0e6..a6b326ac456 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -241,6 +242,7 @@ if ($type == 'bank-transfer') {
 llxHeader('', $title);
 
 
+// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 $head = bon_prelevement_prepare_head($bprev, $bprev->nbOfInvoiceToPay($type), $bprev->nbOfInvoiceToPay($type, 'salary'));
 if ($type) {
 	print dol_get_fiche_head($head, (!GETPOSTISSET('sourcetype') ? 'invoice' : 'salary'), $langs->trans("Invoices"), -1, $bprev->picto);

From 27e89df94db179b3e4ecdb45f78f85d6eb29e6be Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:20 +0100
Subject: [PATCH 1316/1862] Fix PhanPluginSuspiciousParamPosition

---
 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 6d3d2c65557..dba5ffd306a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9785,6 +9785,7 @@ abstract class CommonObject
 		foreach ($fieldvalues as $k => $v) {
 			$keys[$k] = $k;
 			$value = $this->fields[$k];
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$values[$k] = $this->quote($v, $value); // May return string 'NULL' if $value is null
 		}
 
@@ -10087,7 +10088,9 @@ abstract class CommonObject
 		foreach ($fieldvalues as $k => $v) {
 			$keys[$k] = $k;
 			$value = $this->fields[$k];
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$values[$k] = $this->quote($v, $value);
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			$tmp[] = $k.'='.$this->quote($v, $this->fields[$k]);
 		}
 

From bd0447a8a3544eea86bdc6bc02d4744111350a85 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:22 +0100
Subject: [PATCH 1317/1862] Fix PhanPluginSuspiciousParamPosition

---
 htdocs/core/filemanagerdol/connectors/php/connector.lib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
index 656ca060471..afdfa2b6ffd 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
@@ -551,8 +551,8 @@ function GetParentFolder($folderPath)
 /**
  * CreateServerFolder
  *
- * @param 	string	$folderPath		Folder
- * @param 	string	$lastFolder		Folder
+ * @param 	string	$folderPath		Folder - Folder to create (recursively)
+ * @param 	?string	$lastFolder		Internal - Child Folder we are creating, prevents recursion
  * @return	string					''=success, error message otherwise
  */
 function CreateServerFolder($folderPath, $lastFolder = null)
@@ -585,6 +585,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 			return "Can't create $folderPath directory";
 		}
 
+		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
 		if ($sErrorMsg != '') {
 			return $sErrorMsg;

From 8ff08adbbfbb6e92642dd9891c1b61ccd3099c9e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:28:25 +0100
Subject: [PATCH 1318/1862] Fix PhanPluginSuspiciousParamPosition

---
 htdocs/core/modules/import/import_xlsx.modules.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index def42e03d9c..6a6d33df252 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2009-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2012-2016 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -519,6 +520,7 @@ class ImportXlsx extends ModeleImports
 													// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+													// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
 												} else {
 													$this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';

From 4d4aa6b4736f5fa942a44f1fe67648064be383d4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:31:41 +0100
Subject: [PATCH 1319/1862] Fix PhanPluginSuspiciousParamPosition

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d18442094ca..3b028e50d73 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -974,6 +974,7 @@ if (empty($reshook)) {
 						} else {
 							if (count($clone->errors)) {
 								setEventMessages($clone->error, $clone->errors, 'errors');
+								// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 								dol_print_error($db, $clone->errors);
 							} else {
 								setEventMessages($langs->trans($clone->error), null, 'errors');

From 4719e1a28041cdbdaa75f18585a9a42d761df560 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:49:52 +0100
Subject: [PATCH 1320/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 559530a6873..216ec9bbdd8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1023,20 +1023,20 @@ if ($action == 'create') {
 			$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string', '', null, null, '', 1);
 			$morehtmlref .= '</div>';
 
-			$morehtmlright = '';
+			$morehtmlstatus = '';
 			$nbtry = $nbok = 0;
 			if ($object->status == 2 || $object->status == 3) {
 				$nbtry = $object->countNbOfTargets('alreadysent');
 				$nbko  = $object->countNbOfTargets('alreadysentko');
 
-				$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
+				$morehtmlstatus .= ' ('.$nbtry.'/'.$object->nbemail;
 				if ($nbko) {
-					$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+					$morehtmlstatus .= ' - '.$nbko.' '.$langs->trans("Error");
 				}
-				$morehtmlright .= ') &nbsp; ';
+				$morehtmlstatus .= ') &nbsp; ';
 			}
 
-			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
@@ -1345,20 +1345,20 @@ if ($action == 'create') {
 			$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string', '', null, null, '', 1);
 			$morehtmlref .= '</div>';
 
-			$morehtmlright = '';
+			$morehtmlstatus = '';
 			$nbtry = $nbok = 0;
 			if ($object->status == 2 || $object->status == 3) {
 				$nbtry = $object->countNbOfTargets('alreadysent');
 				$nbko  = $object->countNbOfTargets('alreadysentko');
 
-				$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
+				$morehtmlstatus .= ' ('.$nbtry.'/'.$object->nbemail;
 				if ($nbko) {
-					$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+					$morehtmlstatus .= ' - '.$nbko.' '.$langs->trans("Error");
 				}
-				$morehtmlright .= ') &nbsp; ';
+				$morehtmlstatus .= ') &nbsp; ';
 			}
 
-			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';

From 8b00d0c359a4e74cdea9940e9fec6bc4de22b64a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:49:55 +0100
Subject: [PATCH 1321/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 95ffc1f0c38..108974d986e 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -278,21 +278,21 @@ if ($object->fetch($id) >= 0) {
 	$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, 0, 'string', '', null, null, '', 1);
 	$morehtmlref .= '</div>';
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 	$nbtry = $nbok = 0;
 	if ($object->status == $object::STATUS_SENTPARTIALY || $object->status == $object::STATUS_SENTCOMPLETELY) {
 		$nbtry = $object->countNbOfTargets('alreadysent');
 		$nbko  = $object->countNbOfTargets('alreadysentko');
 		$nbok = ($nbtry - $nbko);
 
-		$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
+		$morehtmlstatus .= ' ('.$nbtry.'/'.$object->nbemail;
 		if ($nbko) {
-			$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+			$morehtmlstatus .= ' - '.$nbko.' '.$langs->trans("Error");
 		}
-		$morehtmlright .= ') &nbsp; ';
+		$morehtmlstatus .= ') &nbsp; ';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';

From 6745fe4a5164060a33fa3166c269967df2ef7967 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:49:59 +0100
Subject: [PATCH 1322/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

---
 htdocs/comm/mailing/info.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 0bf7e9cb4ad..08aaad90c2a 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -64,20 +64,20 @@ if ($object->fetch($id) >= 0) {
 	$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, 0, 'string', '', null, null, '', 1);
 	$morehtmlref .= '</div>';
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 	$nbtry = $nbok = 0;
 	if ($object->status == 2 || $object->status == 3) {
 		$nbtry = $object->countNbOfTargets('alreadysent');
 		$nbko  = $object->countNbOfTargets('alreadysentko');
 
-		$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
+		$morehtmlstatus .= ' ('.$nbtry.'/'.$object->nbemail;
 		if ($nbko) {
-			$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+			$morehtmlstatus .= ' - '.$nbko.' '.$langs->trans("Error");
 		}
-		$morehtmlright .= ') &nbsp; ';
+		$morehtmlstatus .= ') &nbsp; ';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="underbanner clearboth"></div><br>';
 

From 715b5ef38e09237ffabe9ec8deb9acc25454718f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:02 +0100
Subject: [PATCH 1323/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

---
 htdocs/compta/facture/agenda-rec.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index 542dfd8f6c1..3636c91fce7 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -175,9 +175,9 @@ if ($object->id > 0) {
 	}
 	$morehtmlref .= '</div>';
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -211,19 +211,19 @@ if ($object->id > 0) {
 		//$out.="</a>";
 	}
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 
 	//$messagingUrl = DOL_URL_ROOT.'/societe/messaging.php?socid='.$object->id;
-	//$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
+	//$morehtmlstatus .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
 	//$messagingUrl = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
-	//$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
+	//$morehtmlstatus .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
 
 	if (isModEnabled('agenda')) {
 		/*
 		if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
-			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+			$morehtmlstatus .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		} else {
-			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', 0);
+			$morehtmlstatus .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', 0);
 		}
 		*/
 	}
@@ -245,8 +245,8 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_facture_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print_barre_liste($langs->trans("ActionsOnBillRec").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
-		//print_barre_liste($langs->trans("ActionsOnBill"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnBillRec").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlstatus, '', 0, 1, 1);
+		//print_barre_liste($langs->trans("ActionsOnBill"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlstatus, '', 0, 1, 1);
 
 		// List of all actions
 		$filters = array();

From 3874830fc04ebef049c12a8ebe69a10d4d35eba0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:04 +0100
Subject: [PATCH 1324/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 59318f1a753..3502f31d822 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1282,9 +1282,9 @@ if ($action == 'create') {
 		}
 		$morehtmlref .= '</div>';
 
-		$morehtmlright = '';
+		$morehtmlstatus = '';
 
-		dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';

From 7ecc9cfc2a3db17b4424771c1927106ca2da79b8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:07 +0100
Subject: [PATCH 1325/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index c66056c47ca..0666335cc4d 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -142,9 +142,9 @@ if ($object->id) {
 
 	$object->totalpaid = $alreadypayed; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

From e6c29dacdaffb9e4cdd39a2494eb8f308ff3c0e4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:09 +0100
Subject: [PATCH 1326/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 24181ae4b7b..e6ad4953129 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -111,8 +111,8 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?restore_lastsear
 
 $object->totalpaid = $alreadypayed; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-$morehtmlright = '';
-dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+$morehtmlstatus = '';
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';

From dabd4e9f8031c65bd5c7252983f59f59a0d084b1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:10 +0100
Subject: [PATCH 1327/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/compta/sociales/note.php b/htdocs/compta/sociales/note.php
index 2f5487497f6..53c6fe187e6 100644
--- a/htdocs/compta/sociales/note.php
+++ b/htdocs/compta/sociales/note.php
@@ -116,9 +116,9 @@ if ($id > 0 || !empty($ref)) {
 
 	//$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 
 	print '<div class="fichecenter">';

From a308f7c178c18d460828eabcfca764f615474c1b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:12 +0100
Subject: [PATCH 1328/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

---
 htdocs/compta/tva/document.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index f2670861833..b9cf49d5dff 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -126,8 +126,8 @@ if ($object->id) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlright = '';
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	$morehtmlstatus = '';
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

From cbd42a79061889a5caa103354f8608427f4e6d4f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:14 +0100
Subject: [PATCH 1329/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index d8f899d7bb1..a5dc3d0eba1 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -1184,9 +1184,9 @@ if ($action == 'create') {
 		}
 		$morehtmlref .= '</div>';
 
-		$morehtmlright = '';
+		$morehtmlstatus = '';
 
-		dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';

From e90ce779cc0ba07f0b2180aaa9a6c03178603bc1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:16 +0100
Subject: [PATCH 1330/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 17fd78aa8c1..803717ae085 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -258,7 +258,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formproject = new FormProjets($db);
-$morehtmlright = '';
+$morehtmlstatus = '';
 $outputlangs = $langs;
 if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
@@ -474,7 +474,7 @@ if ($id > 0) {
 
 		$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';

From 5d77c882829bccbfc309ed2b3aa04b0fbfd0d867 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:17 +0100
Subject: [PATCH 1331/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 2afeb25b322..31b71d49a3d 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -103,9 +103,9 @@ if ($action == 'delete') {
 
 $linkback = '';
 $morehtmlref = '';
-$morehtmlright = '';
+$morehtmlstatus = '';
 
-dol_banner_tab($payment, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+dol_banner_tab($payment, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';

From 4735ff5c278d389d7f5257665d208ed33627e5fb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:19 +0100
Subject: [PATCH 1332/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 1864c309298..ae61486bcfe 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -185,9 +185,9 @@ if (isModEnabled('project')) {
 }
 $morehtmlref .= '</div>';
 
-$morehtmlright = '';
+$morehtmlstatus = '';
 
-dol_banner_tab($object, 'loanid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+dol_banner_tab($object, 'loanid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 ?>
 <script type="text/javascript">

From 69be3bbca66c9abb0d309e13cfb75d14cad5aeec Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 18:37:54 +0100
Subject: [PATCH 1333/1862] Fix PhanTypeInvalidUnaryOperandNumeric & remove
 from exceptions

# Fix PhanTypeInvalidUnaryOperandNumeric & remove from exceptions

Fix by casting result of date() or by adding typing hints.

(This notification indicates a unary '-' or similar is performed
on a value that may not be a number).
---
 dev/tools/phan/baseline.txt                   |  9 +---
 htdocs/comm/action/index.php                  |  6 +--
 htdocs/compta/accounting-files.php            | 46 +++++++++++--------
 .../class/paymentsocialcontribution.class.php | 16 +++++--
 htdocs/compta/tva/class/paymentvat.class.php  | 15 ++++--
 .../class/paymentexpensereport.class.php      | 16 ++++++-
 htdocs/loan/class/paymentloan.class.php       | 28 +++++++++--
 htdocs/public/bookcal/index.php               |  7 +--
 8 files changed, 99 insertions(+), 44 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 68fc0c015e7..86cd01fc014 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -14,7 +14,6 @@ return [
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
     // PhanTypeArraySuspiciousNull : 10+ occurrences
-    // PhanTypeInvalidUnaryOperandNumeric : 8 occurrences
     // PhanRedefineFunctionInternal : 6 occurrences
     // PhanPluginUnsafeEval : 5 occurrences
     // PhanParamSuspiciousOrder : 4 occurrences
@@ -39,11 +38,10 @@ return [
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
         'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/collab/index.php' => ['PhanParamTooMany'],
-        'htdocs/comm/action/index.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeArraySuspiciousNull', 'PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/comm/action/index.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeArraySuspiciousNull'],
         'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/mailing/cibles.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/comm/mailing/info.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/accounting-files.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/bank/various_payment/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/bank/various_payment/info.php' => ['PhanPluginSuspiciousParamPosition'],
@@ -52,11 +50,9 @@ return [
         'htdocs/compta/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/sociales/class/paymentsocialcontribution.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/sociales/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/sociales/info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/compta/sociales/note.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/compta/tva/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
@@ -85,12 +81,10 @@ return [
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
-        'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
         'htdocs/loan/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/loan/document.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/loan/info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/loan/note.php' => ['PhanPluginSuspiciousParamPosition'],
@@ -100,7 +94,6 @@ return [
         'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
         'htdocs/product/card.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/public/bookcal/index.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 68e6b4d7169..44bb2d8b05a 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -319,10 +319,10 @@ if (empty($mode) || $mode == 'show_month') {
 	$next_year  = $next['year'];
 	$next_month = $next['month'];
 
-	$max_day_in_prev_month = date("t", dol_mktime(12, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
-	$max_day_in_month = date("t", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')); // Nb of days in next month
+	$max_day_in_prev_month = (int) date("t", dol_mktime(12, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
+	$max_day_in_month = (int) date("t", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')); // Nb of days in next month
 	// tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
-	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
+	$tmpday = - (int) date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
 	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
 	if ($tmpday >= 1) {
 		$tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index bb4b30474b7..05351d41713 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
  * Copyright (C) 2021       Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022-2024  Alexandre Spangaro   <aspangaro@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -96,15 +97,15 @@ if (!$sortorder) {
 
 
 $arrayfields = array(
-	'type'=>array('label'=>"Type", 'checked'=>1),
-	'date'=>array('label'=>"Date", 'checked'=>1),
-	'date_due'=>array('label'=>"DateDue", 'checked'=>1),
-	'ref'=>array('label'=>"Ref", 'checked'=>1),
-	'documents'=>array('label'=>"Documents", 'checked'=>1),
-	'paid'=>array('label'=>"Paid", 'checked'=>1),
-	'total_ht'=>array('label'=>"TotalHT", 'checked'=>1),
-	'total_ttc'=>array('label'=>"TotalTTC", 'checked'=>1),
-	'total_vat'=>array('label'=>"TotalVAT", 'checked'=>1),
+	'type' => array('label' => "Type", 'checked' => 1),
+	'date' => array('label' => "Date", 'checked' => 1),
+	'date_due' => array('label' => "DateDue", 'checked' => 1),
+	'ref' => array('label' => "Ref", 'checked' => 1),
+	'documents' => array('label' => "Documents", 'checked' => 1),
+	'paid' => array('label' => "Paid", 'checked' => 1),
+	'total_ht' => array('label' => "TotalHT", 'checked' => 1),
+	'total_ttc' => array('label' => "TotalTTC", 'checked' => 1),
+	'total_vat' => array('label' => "TotalVAT", 'checked' => 1),
 	//...
 );
 
@@ -135,14 +136,14 @@ if (empty($entity)) {
 $error = 0;
 
 $listofchoices = array(
-	'selectinvoices'=>array('label'=>'Invoices', 'picto'=>'bill', 'lang'=>'bills', 'enabled' => isModEnabled('invoice'), 'perms' => $user->hasRight('facture', 'lire')),
-	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'picto'=>'supplier_invoice', 'lang'=>'bills', 'enabled' => isModEnabled('supplier_invoice'), 'perms' => $user->hasRight('fournisseur', 'facture', 'lire')),
-	'selectexpensereports'=>array('label'=>'ExpenseReports', 'picto'=>'expensereport', 'lang'=>'trips', 'enabled' => isModEnabled('expensereport'), 'perms' => $user->hasRight('expensereport', 'lire')),
-	'selectdonations'=>array('label'=>'Donations', 'picto'=>'donation', 'lang'=>'donation', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('don', 'lire')),
-	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'picto'=>'bill', 'enabled' => isModEnabled('tax'), 'perms' => $user->hasRight('tax', 'charges', 'lire')),
-	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'picto'=>'salary', 'lang'=>'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => $user->hasRight('salaries', 'read')),
-	'selectvariouspayment'=>array('label'=>'VariousPayment', 'picto'=>'payment', 'enabled' => isModEnabled('bank'), 'perms' => $user->hasRight('banque', 'lire')),
-	'selectloanspayment'=>array('label'=>'PaymentLoan','picto'=>'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
+	'selectinvoices' => array('label' => 'Invoices', 'picto' => 'bill', 'lang' => 'bills', 'enabled' => isModEnabled('invoice'), 'perms' => $user->hasRight('facture', 'lire')),
+	'selectsupplierinvoices' => array('label' => 'BillsSuppliers', 'picto' => 'supplier_invoice', 'lang' => 'bills', 'enabled' => isModEnabled('supplier_invoice'), 'perms' => $user->hasRight('fournisseur', 'facture', 'lire')),
+	'selectexpensereports' => array('label' => 'ExpenseReports', 'picto' => 'expensereport', 'lang' => 'trips', 'enabled' => isModEnabled('expensereport'), 'perms' => $user->hasRight('expensereport', 'lire')),
+	'selectdonations' => array('label' => 'Donations', 'picto' => 'donation', 'lang' => 'donation', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('don', 'lire')),
+	'selectsocialcontributions' => array('label' => 'SocialContributions', 'picto' => 'bill', 'enabled' => isModEnabled('tax'), 'perms' => $user->hasRight('tax', 'charges', 'lire')),
+	'selectpaymentsofsalaries' => array('label' => 'SalariesPayments', 'picto' => 'salary', 'lang' => 'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => $user->hasRight('salaries', 'read')),
+	'selectvariouspayment' => array('label' => 'VariousPayment', 'picto' => 'payment', 'enabled' => isModEnabled('bank'), 'perms' => $user->hasRight('banque', 'lire')),
+	'selectloanspayment' => array('label' => 'PaymentLoan','picto' => 'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
 );
 
 
@@ -157,6 +158,9 @@ $listofchoices = array(
 //if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 $filesarray = array();
+
+'@phan-var-force array<string,array{id:string,entity:string,date:string,date_due:string,paid:float|int,amount_ht:float|int,amount_ttc:float|int,amount_vat:float|int,amount_localtax1:float|int,amount_localtax2:float|int,amount_revenuestamp:float|int,ref:string,fk:string,item:string,thirdparty_name:string,thirdparty_code:string,country_code:string,vatnum:string,sens:string,currency:string,line?:string,name?:string,files?:mixed}> $filesarray';
+
 $result = false;
 if (($action == 'searchfiles' || $action == 'dl')) {
 	if (empty($date_start)) {
@@ -411,6 +415,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 							$nofile['link'] = '';
 							$nofile['name'] = '';
 
+
 							$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
 						} else {
 							foreach ($files as $key => $file) {
@@ -446,8 +451,8 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 								}
 								$filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
 									'link' => $link.urlencode($file['name']),
-									'name'=>$file['name'],
-									'ref'=>$file['ref'],
+									'name' => $file['name'],
+									'ref' => $file['ref'],
 									'fullname' => $file['fullname'],
 									'relpath' => '/'.$file['name'],
 									'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
@@ -522,7 +527,7 @@ if ($result && $action == "dl" && !$error) {
 				$zipname .= '_'.$project->ref;
 			}
 		}
-		$zipname .='_export.zip';
+		$zipname .= '_export.zip';
 
 		dol_delete_file($zipname);
 
@@ -689,6 +694,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 	}
 
 	$TData = dol_sort_array($filesarray, $sortfield, $sortorder);
+	'@phan-var-force array<string,array{id:string,entity:string,date:string,date_due:string,paid:float|int,amount_ht:float|int,amount_ttc:float|int,amount_vat:float|int,amount_localtax1:float|int,amount_localtax2:float|int,amount_revenuestamp:float|int,ref:string,fk:string,item:string,thirdparty_name:string,thirdparty_code:string,country_code:string,vatnum:string,sens:string,currency:string,line?:string,name?:string,files?:mixed}> $TData';
 
 
 	$filename = dol_print_date($date_start, 'dayrfc', 'tzuserrel')."-".dol_print_date($date_stop, 'dayrfc', 'tzuserrel').'_export.zip';
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 2a724f56d42..6713da39db7 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2022       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,12 +83,19 @@ class PaymentSocialContribution extends CommonObject
 	public $bank_line;
 
 	/**
-	 * @deprecated
+	 * @deprecated  Use $amount instead.
 	 * @see $amount
+	 * @var float|int
 	 */
 	public $total;
 
+	/**
+	 * @var float|int
+	 */
 	public $amount; // Total amount of payment
+	/**
+	 * @var array<float|int>
+	 */
 	public $amounts = array(); // Array of amounts
 
 	/**
@@ -97,7 +105,7 @@ class PaymentSocialContribution extends CommonObject
 
 	/**
 	 * @var string
-	 * @deprecated
+	 * @deprecated Use $num_payment instead
 	 * @see $num_payment
 	 */
 	public $num_paiement;
@@ -318,8 +326,10 @@ class PaymentSocialContribution extends CommonObject
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->amount = $obj->amount;
+				$this->total = $obj->amount;
 				$this->fk_typepaiement = $obj->fk_typepaiement;
 				$this->num_payment = $obj->num_payment;
+				$this->num_paiement = $obj->num_payment;
 				$this->note_private = $obj->note;
 				$this->fk_bank = $obj->fk_bank;
 				$this->fk_user_creat = $obj->fk_user_creat;
@@ -577,7 +587,7 @@ class PaymentSocialContribution extends CommonObject
 			$acc = new Account($this->db);
 			$acc->fetch($accountid);
 
-			$total = $this->total;
+			$total = $this->amount;
 			if ($mode == 'payment_sc') {
 				$total = -$total;
 			}
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index f45cc80e909..c5fbf396667 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -58,12 +59,20 @@ class PaymentVAT extends CommonObject
 	public $datep = '';
 
 	/**
-	 * @deprecated
+	 * @deprecated Use $amount instead
 	 * @see $amount
+	 * @var float|int
 	 */
 	public $total;
 
+	/**
+	 * @var float|int
+	 */
 	public $amount; // Total amount of payment
+
+	/**
+	 * @var array<float|int>
+	 */
 	public $amounts = array(); // Array of amounts
 
 	/**
@@ -73,7 +82,7 @@ class PaymentVAT extends CommonObject
 
 	/**
 	 * @var string
-	 * @deprecated
+	 * @deprecated Use $num_payment instead
 	 * @see $num_payment
 	 */
 	public $num_paiement;
@@ -578,7 +587,7 @@ class PaymentVAT extends CommonObject
 			$acc = new Account($this->db);
 			$acc->fetch($accountid);
 
-			$total = $this->total;
+			$total = $this->amount;
 			if ($mode == 'payment_vat') {
 				$total = -$total;
 			}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index f480854dad8..8763f965a90 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI  <info@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -65,7 +66,13 @@ class PaymentExpenseReport extends CommonObject
 	 * @var int|string
 	 */
 	public $datep = '';
+	/**
+	 * @var float|int
+	 */
 	public $amount; // Total amount of payment
+	/**
+	 * @var array<float|int>
+	 */
 	public $amounts = array(); // Array of amounts
 
 	/**
@@ -94,7 +101,14 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string
+	 */
 	public $type_code;
+
+	/**
+	 * @var string
+	 */
 	public $type_label;
 
 	/**
@@ -693,7 +707,7 @@ class PaymentExpenseReport extends CommonObject
 		}
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index f095f480a04..28a1d9f4060 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -62,14 +63,23 @@ class PaymentLoan extends CommonObject
 	public $datep = '';
 
 	/**
-	 * @var array Array of amounts
+	 * @var array<float|int> Array of amounts
 	 */
 	public $amounts = array();
 
-	public $amount_capital; // Total amount of payment
+	/**
+	 * @var float|int  Total amount of payment
+	 */
+	public $amount_capital;
 
+	/**
+	 * @var float|int
+	 */
 	public $amount_insurance;
 
+	/**
+	 * @var float|int
+	 */
 	public $amount_interest;
 
 	/**
@@ -98,10 +108,22 @@ class PaymentLoan extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string
+	 */
 	public $type_code;
+	/**
+	 * @var string
+	 */
 	public $type_label;
 	public $chid;
+	/**
+	 * @var string
+	 */
 	public $label;
+	/**
+	 * @var string
+	 */
 	public $paymenttype;
 	public $bank_account;
 	public $bank_line;
@@ -666,7 +688,7 @@ class PaymentLoan extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
index e0630108c1a..e6515fa6c7d 100644
--- a/htdocs/public/bookcal/index.php
+++ b/htdocs/public/bookcal/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2023		anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -94,7 +95,7 @@ $next_month = $next['month'];
 $max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year)); // Nb of days in next month
 // tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
-$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
+$tmpday = - (int) date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 for sunday
 $tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
 if ($tmpday >= 1) {
 	$tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
@@ -398,13 +399,13 @@ if ($action == 'afteradd') {
 			$numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
 			if (!empty($conf->dol_optimize_smallscreen)) {
 				print '  <td class="center bold uppercase tdfordaytitle'.($i == 0 ? ' borderleft' : '').'">';
-				$labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
+				$labelshort = array(0 => 'SundayMin', 1 => 'MondayMin', 2 => 'TuesdayMin', 3 => 'WednesdayMin', 4 => 'ThursdayMin', 5 => 'FridayMin', 6 => 'SaturdayMin');
 				print $langs->trans($labelshort[$numdayinweek]);
 				print '  </td>'."\n";
 			} else {
 				print '  <td class="center minwidth75 bold uppercase small tdoverflowmax50 tdfordaytitle'.($i == 0 ? ' borderleft' : '').'">';
 				//$labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
-				$labelshort = array(0=>'Sunday', 1=>'Monday', 2=>'Tuesday', 3=>'Wednesday', 4=>'Thursday', 5=>'Friday', 6=>'Saturday');
+				$labelshort = array(0 => 'Sunday', 1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday');
 				print $langs->trans($labelshort[$numdayinweek]);
 				print '  </td>'."\n";
 			}

From 01e4397f3a206f192dc25587a9f2a6d33ff1d7a0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:50:59 +0100
Subject: [PATCH 1334/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (local assign)

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

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 90817a5848d..0eeab1735c3 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -614,9 +614,9 @@ if ($id) {
 	$morehtmlref .= '</div>';
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlright = '';
+	$morehtmlstatus = '';
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

From 5b88c4e466d396cb114e4fe4a8838374342c89ae Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:56:55 +0100
Subject: [PATCH 1335/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (from ext.var)

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

diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 83bafc6aaad..7c717d7ede0 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017       Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -128,7 +129,8 @@ if ($object->id) {
 	$morehtmlref .= '</div>';
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	$morehtmlstatus = $morehtmlright;
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

From 929da49242d75c957e6d6775885eb621613b03d7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:56:57 +0100
Subject: [PATCH 1336/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (from ext.var)

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

diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 80705447223..27a8ce3a27b 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017       Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -88,7 +89,8 @@ if (isModEnabled('project')) {
 $morehtmlref .= '</div>';
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+$morehtmlstatus = $morehtmlright;
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';

From 0e0238d1ba93280e48983d00bb30496f2bd9a6ed Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:56:59 +0100
Subject: [PATCH 1337/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (from ext.var)

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

diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 1b6f586bb58..74b96bf0877 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2023  Alexandre Spangaro  <aspangaro@easya.solutions>
  * Copyright (C) 2017       Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -140,7 +141,8 @@ if ($object->id) {
 
 	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	$morehtmlstatus = $morehtmlright;
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

From 54acbd269632be5b7e6b2931e4697b05e182339a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:57:01 +0100
Subject: [PATCH 1338/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (from ext.var)

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

diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 436caf903d2..b437a73b845 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2023  Alexandre Spangaro  <aspangaro@easya.solutions>
  * Copyright (C) 2017       Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -102,7 +103,8 @@ $morehtmlref .= '</div>';
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/loan/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+$morehtmlstatus = $morehtmlright;
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';

From 8976717d4d0067ce0b89cf746db3c213d18336d0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 19:57:03 +0100
Subject: [PATCH 1339/1862] Fix PhanPluginSuspiciousParamPosition by renaming
 arg (from ext.var)

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

diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 27a9d0bc70b..62d84a1adbc 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015       Frederic France         <frederic.france@free.fr>
  * Copyright (C) 2016-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -129,7 +130,8 @@ if ($id > 0) {
 
 	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+	$morehtmlstatus = $morehtmlright;
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlstatus);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

From eba03444603bb2dadb6156131a96eeee7e753b9a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:44:27 +0100
Subject: [PATCH 1340/1862] Qual: suppress PhanPluginSuspiciousParamPosition
 notice

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 108974d986e..4b36bba8cda 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -364,6 +365,7 @@ if ($object->fetch($id) >= 0) {
 			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 		}
 		if ($text) {
+			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
 		} else {
 			print $nbemail;

From 3b0d19a1600b0a4df756c23b89938e611257ea6a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 22:50:59 +0100
Subject: [PATCH 1341/1862] Fix unneed test 'X ? Y : Y' by assigning '' to
 note_private

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d1d37f33589..31852eecb70 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -459,8 +459,8 @@ class Facture extends CommonInvoice
 
 		$this->ref_client = trim($this->ref_client);
 
-		$this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
-		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note_private));
+		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : '');
+		$this->note = (isset($this->note) ? trim($this->note) : $this->note_private); // deprecated
 		$this->note_public = trim($this->note_public);
 		if (!$this->cond_reglement_id) {
 			$this->cond_reglement_id = 0;

From c8a295d13037337c8d9f658052643226564f6d6e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:05:07 +0100
Subject: [PATCH 1342/1862] Fix unneeded test 'X ? Y : Y' by using GETPOST
 value if it is set

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 7b85ba94863..8eda5988f80 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2022-2023  George Gkantinas	    <info@geowv.eu>
  * Copyright (C) 2023       Nick Fragoulis
  * Copyright (C) 2023       Alexandre Janniaux      <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1568,7 +1569,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Vat is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';

From 1637ba5c87927b6e01ad8a612e60c53d505d8be2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:05 +0100
Subject: [PATCH 1343/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/adherents/class/adherent.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1937924df3b..f48d80a2abe 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -760,13 +760,13 @@ class Adherent extends CommonObject
 		$this->lastname = trim($this->lastname) ? trim($this->lastname) : trim($this->lastname);
 		$this->firstname = trim($this->firstname) ? trim($this->firstname) : trim($this->firstname);
 		$this->gender = trim($this->gender);
-		$this->address = ($this->address ? $this->address : $this->address);
-		$this->zip = ($this->zip ? $this->zip : $this->zip);
-		$this->town = ($this->town ? $this->town : $this->town);
-		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
-		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
-		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
+		// $this->address = ($this->address ? $this->address : $this->address);
+		// $this->zip = ($this->zip ? $this->zip : $this->zip);
+		// $this->town = ($this->town ? $this->town : $this->town);
+		// $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		// $this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
+		// $this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
+		// $this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
 		$this->url = $this->url ? clean_url($this->url, 0) : '';
 		$this->setUpperOrLowerCase();
 		// Check parameters

From ac23e322e2879b8129124cf7ce19ce82a32de50a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:07 +0100
Subject: [PATCH 1344/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/asset/tpl/accountancy_codes_view.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
index 61954bfc936..16c333b8c6b 100644
--- a/htdocs/asset/tpl/accountancy_codes_view.tpl.php
+++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -58,7 +59,7 @@ if (empty($reshook)) {
 		if (empty($assetdepreciationoptions->deprecation_options[$mode_key]) && $mode_key == "accelerated_depreciation") {
 			continue;
 		}
-		$width = ($mode_key == "economic")? "pull-left" : "pull-left";
+		$width = "pull-left";
 		print '<table class="liste centpercent '. $width .'" id="block_' . $mode_key . '">' . "\n";
 		print '<tr class="liste_titre"><td colspan="5">'.$langs->trans($mode_info['label']).'</td></tr>';
 		foreach ($mode_info['fields'] as $field_key => $field_info) {

From 8e664aa0e1ad9ced7f9866bd9a3e6d7847d72952 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:09 +0100
Subject: [PATCH 1345/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/asset/tpl/depreciation_options_view.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/asset/tpl/depreciation_options_view.tpl.php b/htdocs/asset/tpl/depreciation_options_view.tpl.php
index a98171ed1ea..d7350801020 100644
--- a/htdocs/asset/tpl/depreciation_options_view.tpl.php
+++ b/htdocs/asset/tpl/depreciation_options_view.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -64,7 +65,7 @@ if (empty($reshook)) {
 
 		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
 
-		$width = ($mode_key == "economic")? "pull-left" : "pull-left";
+		$width = "pull-left";
 		print '<table class="liste centpercent '. $width .'" id="block_' . $mode_key . '">' . "\n";
 		print '<tr class="liste_titre"><td colspan="5">'.$langs->trans($mode_info['label']).'</td></tr>';
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');

From e64bf30bf64d10a7b1792398e1f79097b12f29da Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:11 +0100
Subject: [PATCH 1346/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c4db4c61421..5753ce0bc89 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017-2023  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2023       Charlene Benke          <charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 +200,7 @@ if (empty($reshook)) {
 		}
 
 		// We check if we're allowed to add this bom
-		$TParentBom=array();
+		$TParentBom = array();
 		$object->getParentBomTreeRecursive($TParentBom);
 		if ($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) {
 			$n_child = new BOM($db);
@@ -306,7 +307,7 @@ $formfile = new FormFile($db);
 
 
 $title = $langs->trans('BOM');
-$help_url ='EN:Module_BOM';
+$help_url = 'EN:Module_BOM';
 llxHeader('', $title, $help_url);
 
 // Part to create
@@ -590,7 +591,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
 
-		print '	<form name="addproduct" id="listbomproducts" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+		print '	<form name="addproduct" id="listbomproducts" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">
     	<input type="hidden" name="token" value="' . newToken() . '">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     	<input type="hidden" name="mode" value="">
@@ -642,7 +643,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
-		print '	<form name="addservice" id="listbomservices" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+		print '	<form name="addservice" id="listbomservices" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">
     	<input type="hidden" name="token" value="' . newToken() . '">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     	<input type="hidden" name="mode" value="">

From f3eceb42ff326745764900c259efd6d79e4f0d33 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:14 +0100
Subject: [PATCH 1347/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 9b204deacf1..be2237a5c72 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -604,7 +604,7 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		// $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) {
 			$this->statut = 0;
 		}

From 47a4a3b8486828b0e57a21813e8b202c6d0500fd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:16 +0100
Subject: [PATCH 1348/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index dc7dc9a278e..bd4a8b48c74 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021 Gaëtan MAISON <gm@ilad.org>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -200,7 +201,7 @@ class DolEditor
                             		htmlEncodeOutput: '.dol_escape_js($htmlencode_force).',
             						allowedContent: '.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is own when allowedContent is false */
             						extraAllowedContent: \'a[target];div{float,display}\',				/* Add the style float and display into div to default other allowed tags */
-									disallowedContent: '.($disallowAnyContent ? '\'\'' : '\'\'').',		/* Tags that are not allowed */
+									disallowedContent: \'\',		/* Tags that are not allowed */
             						fullPage: '.($fullpage ? 'true' : 'false').',						/* if true, the html, header and body tags are kept */
                             		toolbar: \''.dol_escape_js($this->toolbarname).'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
@@ -280,8 +281,8 @@ class DolEditor
 				$out .= '<script nonce="'.getNonce().'" type="text/javascript">'."\n";
 				$out .= 'jQuery(document).ready(function() {'."\n";
 				$out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
-							aceEditor.moveCursorTo('.($this->posy+1).','.$this->posx.');
-							aceEditor.gotoLine('.($this->posy+1).','.$this->posx.');
+							aceEditor.moveCursorTo('.($this->posy + 1).','.$this->posx.');
+							aceEditor.gotoLine('.($this->posy + 1).','.$this->posx.');
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 

From 8823cca1176521c2307077b5334d4ac031dd5c8e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:18 +0100
Subject: [PATCH 1349/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4a3f654a83e..d028834480b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7060,7 +7060,7 @@ class Form
 				if (strlen($min) < 2) {
 					$min = "0" . $min;
 				}
-				$retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty($conf->dol_optimize_smallscreen) ? '' : '') . '</option>';
+				$retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . '</option>';
 			}
 			$retstring .= '</select>';
 

From 0f6bddfb9b55afbde13ff83ac0f46576eeb6d288 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:20 +0100
Subject: [PATCH 1350/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/core/tpl/admin_extrafields_view.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 04d75f0e844..c6cf8c6365e 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2018	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2021	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2018-2023  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -46,7 +47,7 @@ if ($action == 'delete') {
 $title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '' : $textobject).'</span><br>'."\n";
 //if ($action != 'create' && $action != 'edit') {
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewAttribute'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=create', '', (($action != 'create' && $action != 'edit') ? 1 : 1));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewAttribute'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=create', '', 1);
 /*} else {
 	$newcardbutton = '';
 }*/

From 3a2bed44ea344332a57c9f84d22619d569cf5d2a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:22 +0100
Subject: [PATCH 1351/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/cron/list.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 8aa30543b4a..4e14d503f1e 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013      Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2021 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2019-2024 Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -379,8 +380,8 @@ if ($action == 'delete' && empty($toselect)) {	// Used when we make a delete on
 $arrayofmassactions = array(
 //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	'enable'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("CronStatusActiveBtn"),
-	'disable'=>img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans("CronStatusInactiveBtn"),
+	'enable' => img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("CronStatusActiveBtn"),
+	'disable' => img_picto('', 'uncheck', 'class="pictofixedwidth"').$langs->trans("CronStatusInactiveBtn"),
 );
 if ($user->hasRight('cron', 'delete')) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -471,7 +472,7 @@ print '<td class="liste_titre center"><input type="text" class="width50" name="s
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre center">';
-print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+print $form->selectarray('search_status', array('0' => $langs->trans("Disabled"), '1' => $langs->trans("Scheduled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 print '</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 // Action column
@@ -607,9 +608,9 @@ if ($num > 0) {
 
 		$s = '';
 		if ($obj->unitfrequency == "60") {
-			$s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('MinuteShort') : $langs->trans('MinuteShort'));
+			$s = ($obj->frequency)." ".$langs->trans('MinuteShort');
 		} elseif ($obj->unitfrequency == "3600") {
-			$s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('HourShort') : $langs->trans('HourShort'));
+			$s = ($obj->frequency)." ".$langs->trans('HourShort');
 		} elseif ($obj->unitfrequency == "86400") {
 			$s = ($obj->frequency)." ".($obj->frequency > 1 ? $langs->trans('DurationDays') : $langs->trans('DurationDay'));
 		} elseif ($obj->unitfrequency == "604800") {
@@ -659,7 +660,7 @@ if ($num > 0) {
 		print '<td class="center nowraponall" title="'.dol_escape_htmltag($datefromto).'">';
 		if (!empty($datelastresult) && ($datelastresult >= $datelastrun)) {
 			$nbseconds = max($datelastresult - $datelastrun, 1);
-			print $nbseconds.' '.($nbseconds > 1 ? $langs->trans("SecondShort") : $langs->trans("SecondShort"));
+			print $nbseconds.' '.$langs->trans("SecondShort");
 		}
 		print '</td>';
 

From 22b78382a36516010eba52fd17e4d4d56a776ff6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:25 +0100
Subject: [PATCH 1352/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/don/class/don.class.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index c3bce69d1db..4bdcaa4a853 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2019      Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2019-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2021      Maxime DEMAREST      <maxime@indelog.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -382,11 +383,11 @@ class Don extends CommonObject
 		$now = dol_now();
 
 		// Clean parameters
-		$this->address = ($this->address > 0 ? $this->address : $this->address);
-		$this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
-		$this->town = ($this->town > 0 ? $this->town : $this->town);
-		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-		$this->country = ($this->country ? $this->country : $this->country);
+		// $this->address = ($this->address > 0 ? $this->address : $this->address);
+		// $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
+		// $this->town = ($this->town > 0 ? $this->town : $this->town);
+		// $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		// $this->country = ($this->country ? $this->country : $this->country);
 		$this->amount = (float) price2num($this->amount);
 
 		// Check parameters
@@ -499,11 +500,11 @@ class Don extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		$this->address = ($this->address > 0 ? $this->address : $this->address);
-		$this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
-		$this->town = ($this->town > 0 ? $this->town : $this->town);
-		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-		$this->country = ($this->country ? $this->country : $this->country);
+		// $this->address = ($this->address > 0 ? $this->address : $this->address);
+		// $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
+		// $this->town = ($this->town > 0 ? $this->town : $this->town);
+		// $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		// $this->country = ($this->country ? $this->country : $this->country);
 		$this->amount = (float) price2num($this->amount);
 
 		// Check parameters

From ca6dcff6cd70717cef3f552fa32e77f86e29c901 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:27 +0100
Subject: [PATCH 1353/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 2e5e1606202..a08301932af 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -514,7 +514,7 @@ $includeonly = 'hierarchyme';
 if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->hasRight('user', 'user', 'lire') ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

From c4be0d7ff94d2b560180f1b4b388342ba3dee57a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:29 +0100
Subject: [PATCH 1354/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 82f46fa4b4a..f9e8ed04aca 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -523,7 +523,7 @@ $includeonly = 'hierarchyme';
 if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->hasRight('user', 'user', 'lire') ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

From 22a96119c2dca0d887cedc5ba9a0b3a42a69c25b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:31 +0100
Subject: [PATCH 1355/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index b1776078f36..55cc6a88ad9 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -562,7 +562,7 @@ $includeonly = 'hierarchyme';
 if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->hasRight('user', 'user', 'lire') ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

From aef661e4a201acad4b7579809f4fb7d8393a0437 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:33 +0100
Subject: [PATCH 1356/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 82e8ff4ebda..31bc2e0d493 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2021-2023  Anthony Berton          <anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -189,7 +190,7 @@ $butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!ge
 $textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('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) ? (!getDolGlobalString('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) ? (!getDolGlobalString('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);
-$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%');
+$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (empty($user->conf->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%');
 // Hover color
 $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_HOVER));
 $colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED));

From f924a8c2f594b6f71f95d0b41cbd14b9f8fe8f71 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:36 +0100
Subject: [PATCH 1357/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

---
 htdocs/theme/md/style.css.php | 137 +++++++++++++++++-----------------
 1 file changed, 69 insertions(+), 68 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e1d69443c5a..129015d839b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015		Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2021-2023  Anthony Berton          <anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -194,7 +195,7 @@ $butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!ge
 $textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('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) ? (!getDolGlobalString('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) ? (!getDolGlobalString('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);
-$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%');
+$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (empty($user->conf->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%');
 
 // Hover color
 $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_HOVER));
@@ -2994,78 +2995,78 @@ div.mainmenu.menu {
 	<?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
 
 	<?php
-	// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
+			// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
-	$moduletomainmenu = array(
-		'user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
-		'produit'=>'products', 'service'=>'products', 'stock'=>'products',
-		'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
-		'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticket'=>'ticket', 'deplacement'=>'commercial',
-		'fournisseur'=>'companies',
-		'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
-	);
-	$mainmenuused = 'home';
-	foreach ($conf->modules as $val) {
-		$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
-	}
-	$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
-
-	$generic = 1;
-	// Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-	$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
-	// Put here list of menu entries we are sure we don't want
-	$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
-	foreach ($mainmenuusedarray as $val) {
-		if (empty($val) || in_array($val, $divalreadydefined)) {
-			continue;
-		}
-		if (in_array($val, $divnotrequired)) {
-			continue;
-		}
-		//print "XXX".$val;
-
-		$found = 0;
-		$url = '';
-		$constformoduleicon = 'MAIN_MODULE_'.strtoupper($val).'_ICON';
-		$iconformodule = getDolGlobalString($constformoduleicon);
-		if ($iconformodule) {
-			if (preg_match('/^fa\-/', $iconformodule)) {
-				// This is a fa icon
-			} else {
-				$url = 	dol_buildpath('/'.$val.'/img/'.$iconformodule.'.png', 1);
+			$moduletomainmenu = array(
+				'user' => '', 'syslog' => '', 'societe' => 'companies', 'projet' => 'project', 'propale' => 'commercial', 'commande' => 'commercial',
+				'produit' => 'products', 'service' => 'products', 'stock' => 'products',
+				'don' => 'accountancy', 'tax' => 'accountancy', 'banque' => 'accountancy', 'facture' => 'accountancy', 'compta' => 'accountancy', 'accounting' => 'accountancy', 'adherent' => 'members', 'import' => 'tools', 'export' => 'tools', 'mailing' => 'tools',
+				'contrat' => 'commercial', 'ficheinter' => 'commercial', 'ticket' => 'ticket', 'deplacement' => 'commercial',
+				'fournisseur' => 'companies',
+				'barcode' => '', 'fckeditor' => '', 'categorie' => '',
+			);
+			$mainmenuused = 'home';
+			foreach ($conf->modules as $val) {
+				$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
 			}
-			$found = 1;
-		} else {
-			// Search img file in module dir
-			foreach ($conf->file->dol_document_root as $dirroot) {
-				if (file_exists($dirroot."/".$val."/img/".$val.".png")) {
-					$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+			$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
+
+			$generic = 1;
+			// Put here list of menu entries when the div.mainmenu.menuentry was previously defined
+			$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
+			// Put here list of menu entries we are sure we don't want
+			$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
+			foreach ($mainmenuusedarray as $val) {
+				if (empty($val) || in_array($val, $divalreadydefined)) {
+					continue;
+				}
+				if (in_array($val, $divnotrequired)) {
+					continue;
+				}
+				//print "XXX".$val;
+
+				$found = 0;
+				$url = '';
+				$constformoduleicon = 'MAIN_MODULE_'.strtoupper($val).'_ICON';
+				$iconformodule = getDolGlobalString($constformoduleicon);
+				if ($iconformodule) {
+					if (preg_match('/^fa\-/', $iconformodule)) {
+						// This is a fa icon
+					} else {
+						$url = 	dol_buildpath('/'.$val.'/img/'.$iconformodule.'.png', 1);
+					}
 					$found = 1;
-					break;
+				} else {
+					// Search img file in module dir
+					foreach ($conf->file->dol_document_root as $dirroot) {
+						if (file_exists($dirroot."/".$val."/img/".$val.".png")) {
+							$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+							$found = 1;
+							break;
+						}
+					}
+				}
+
+				// Output entry for menu icon in CSS
+				if (!$found) {
+					print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+					print 'div.mainmenu.'.$val.' span::before {'."\n";
+					print 'content: "\f249";'."\n";
+					print '}'."\n";
+					$generic++;
+				} else {
+					if ($url) {
+						print "div.mainmenu.".$val." {\n";
+						print "	background-image: url(".$url.");\n";
+						print " background-position-y: 3px;\n";
+						print " filter: saturate(0);\n";
+						print "}\n";
+					} else {
+						print '/* icon for module '.$val.' is a fa icon */'."\n";
+					}
 				}
 			}
-		}
-
-		// Output entry for menu icon in CSS
-		if (!$found) {
-			print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
-			print 'div.mainmenu.'.$val.' span::before {'."\n";
-			print 'content: "\f249";'."\n";
-			print '}'."\n";
-			$generic++;
-		} else {
-			if ($url) {
-				print "div.mainmenu.".$val." {\n";
-				print "	background-image: url(".$url.");\n";
-				print " background-position-y: 3px;\n";
-				print " filter: saturate(0);\n";
-				print "}\n";
-			} else {
-				print '/* icon for module '.$val.' is a fa icon */'."\n";
-			}
-		}
-	}
-	// End of part to add more div class css
+			// End of part to add more div class css
 }	// End test if $dol_hide_topmenu?>
 
 

From de10bcc7d5f327e19eab906ccd0b84c9d8953286 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:15:39 +0100
Subject: [PATCH 1358/1862] Fix PhanPluginDuplicateConditionalUnnecessary "X ?
 Y : Y" (Simplify)

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 37430439427..8a4e45499dc 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3397,7 +3397,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 				// Edit CKEditor
 				if (getDolGlobalInt('WEBSITE_ALLOW_CKEDITOR')) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "CKEditor" : "CKEditor")).'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("CKEditor")).'</a>';
 				}
 
 				print '</span>';

From b2cbf7fe3c566fa86a622b25fcffc95b7db83fa7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 23:16:08 +0100
Subject: [PATCH 1359/1862] Qual: Enable
 PhanPluginDuplicateConditionalUnnecessary notices (all fixed)

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4771e953a36..2d3bc612f42 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -511,7 +511,7 @@ return [
 		'PhanTypeSuspiciousNonTraversableForeach',
 		'PhanEmptyForeach',
 		'PhanTypeInvalidRightOperandOfBitwiseOp',
-		'PhanPluginDuplicateConditionalUnnecessary',
+		// 'PhanPluginDuplicateConditionalUnnecessary',
 		// 'PhanTraitParentReference',
 		'PhanPluginBothLiteralsBinaryOp',
 		// 'PhanTypeMismatchDeclaredParam',

From 97f4e4f46288fb80e327b61ffc6d5b07e7ba887f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 20:05:32 +0100
Subject: [PATCH 1360/1862] Qual: Disable PhanPluginDuplicateCatchStatementBody
 which requires PHP7.1 for fix

# Qual: Disable PhanPluginDuplicateCatchStatementBody which requires PHP7.1 for fix

To fix this PHP7.1 is required, so skipping the message in the extended
report as well.
---
 dev/tools/phan/config_extended.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index b9e92619b06..91b2894cd26 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -368,6 +368,7 @@ return [
 		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
 		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
 		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
+		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
 	],
 	// You can put relative paths to internal stubs in this config option.
 	// Phan will continue using its detailed type annotations,

From f36cd6a28195dd1e9a37268d5ca3b2a65f6fccf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 20:22:03 +0100
Subject: [PATCH 1361/1862] fix phpstan is incompatible with

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

diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 464ca7edf60..3ccf90c0255 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2024  Frédéric France		<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,7 +107,7 @@ class ExpenseReports extends DolibarrApi
 	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of Expense Report objects
 	 */
-	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '', $properties = '')
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = '', $sqlfilters = '', $properties = '')
 	{
 		if (!DolibarrApiAccess::$user->hasRight('expensereport', 'lire')) {
 			throw new RestException(403);

From 75e693b9b93a34370653cd95defe24febd6f137d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 20:37:21 +0100
Subject: [PATCH 1362/1862] fix phpstan is incompatible with

---
 .../doc_generic_recruitmentjobposition_odt.modules.php   | 4 ++--
 .../doc/pdf_standard_recruitmentjobposition.modules.php  | 8 ++++----
 .../recruitment/mod_recruitmentcandidature_advanced.php  | 6 +++---
 .../recruitment/mod_recruitmentcandidature_standard.php  | 9 +++++----
 .../recruitment/mod_recruitmentjobposition_advanced.php  | 8 ++++----
 .../recruitment/mod_recruitmentjobposition_standard.php  | 7 ++++---
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 0d950928653..148e75eee6d 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
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018-2022  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -212,7 +212,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
-	 *	@param		Commande	$object				Object source to build document
+	 *	@param		RecruitmentJobPosition	$object				Object source to build document
 	 *	@param		Translate	$outputlangs		Lang output object
 	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index fd5a1a88d06..11727b809f1 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -177,7 +177,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
+	 *  @param		RecruitmentJobPosition		$object				RecruitmentJobPosition to generate
 	 *  @param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -807,7 +807,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
+	 *  @param  RecruitmentJobPosition		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
@@ -1053,7 +1053,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	 *   	Show footer of page. Need this->emetteur object
 	 *
 	 *   	@param	TCPDF		$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	RecruitmentJobPosition		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
index 7cc19971cb3..c1258703e6c 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,7 +118,7 @@ class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandida
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  RecruitmentCandidature	$object		Object we need next value for
 	 *  @return string|0                Next value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
@@ -135,7 +135,7 @@ class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandida
 			return 0;
 		}
 
-		$date = $object->date;
+		$date = $object->date ?? '';
 
 		$numFinal = get_next_value($db, $mask, 'recruitment_recruitmentcandidature', 'ref', '', null, $date);
 
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
index dca26f27602..848b11267e7 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,8 +77,8 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  RecruitmentCandidature	$object	Object we need next value for
+	 *  @return boolean     					false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
@@ -116,8 +117,8 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|-1      			Next value if OK, -1 if KO
+	 *  @param  RecruitmentCandidature	$object	Object we need next value for
+	 *  @return string|-1      					Next value if OK, -1 if KO
 	 */
 	public function getNextValue($object)
 	{
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
index 4be33bfd352..868b4b284e0 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,8 +118,8 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return string|0      			Next value if OK, 0 if KO
+	 *  @param  RecruitmentJobPosition	$object	Object we need next value for
+	 *  @return string|0      					Next value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
 	{
@@ -135,7 +135,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 			return 0;
 		}
 
-		$date = $object->date;
+		$date = $object->date ?? '';
 
 		$numFinal = get_next_value($db, $mask, 'recruitment_recruitmentjobposition', 'ref', '', null, $date);
 
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
index 09c69067887..ef3c199b912 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,8 +77,8 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  Object		$object		Object we need next value for
-	 *  @return boolean     			false if conflict, true if ok
+	 *  @param  RecruitmentJobPosition	$object	Object we need next value for
+	 *  @return boolean     					false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
@@ -116,7 +117,7 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  RecruitmentJobPosition	$object		Object we need next value for
 	 *  @return string|-1      			Next value if OK, -1 if KO
 	 */
 	public function getNextValue($object)

From c07c5533e87e2d66e79d0316effd7512bd769f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 20:45:20 +0100
Subject: [PATCH 1363/1862] fix phpstan is incompatible with

---
 .../recruitment/mod_recruitmentcandidature_standard.php       | 4 ++--
 .../recruitment/mod_recruitmentjobposition_standard.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
index 848b11267e7..6a7b4d8c510 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -77,8 +77,8 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  RecruitmentCandidature	$object	Object we need next value for
-	 *  @return boolean     					false if conflict, true if ok
+	 *  @param  CommonObject	$object	Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
index ef3c199b912..50c2ab775e7 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
@@ -77,8 +77,8 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 	 *  Checks if the numbers already in the database do not
 	 *  cause conflicts that would prevent this numbering working.
 	 *
-	 *  @param  RecruitmentJobPosition	$object	Object we need next value for
-	 *  @return boolean     					false if conflict, true if ok
+	 *  @param  CommonObject	$object	Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
 	 */
 	public function canBeActivated($object)
 	{

From c21eedfbdd9dc0c4105063ae49ee878acb275db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 20:56:13 +0100
Subject: [PATCH 1364/1862] fix phpstan is incompatible with

---
 htdocs/admin/fckeditor.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 5dc257a55d2..d11c3adf4ca 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2012-2013	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2019		Christophe Battarel <christophe@altairis.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doleditor.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'fckeditor'));
+$langs->loadLangs(array('admin', 'fckeditor', 'errors'));
 
 $action = GETPOST('action', 'aZ09');
 // Possible modes are:
@@ -221,12 +222,12 @@ if (empty($conf->use_javascript_ajax)) {
 	if ($mode != 'Full_inline') {
 		$uselocalbrowser = true;
 		$readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
-		$editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
+		$editor = new DolEditor('formtestfield', getDolGlobalString('FCKEDITOR_TEST', 'Test'), '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
 		$editor->Create();
 	} else {
 		// CKEditor inline enabled with the contenteditable="true"
 		print '<div style="border: 1px solid #888;" contenteditable="true">';
-		print $conf->global->FCKEDITOR_TEST;
+		print getDolGlobalString('FCKEDITOR_TEST');
 		print '</div>';
 	}
 	print $form->buttonsSaveCancel("Save", '', null, 0, 'reposition');

From 744f7392f21d5bd90ad300de15551c9348392562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 20:59:09 +0100
Subject: [PATCH 1365/1862] fix phpstan is incompatible with

---
 htdocs/langs/en_US/errors.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index fe7cb304610..1fde12f73ff 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -412,3 +412,4 @@ ThisIdNotDefined=Id not defined
 OperNotDefined=Payment method not defined
 ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for this type.
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error

From 8ffcda499f932c7aae2123fe57c4e608a14e4ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 14 Mar 2024 21:14:23 +0100
Subject: [PATCH 1366/1862] fix warnings

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index b80ce304f94..ff41f78e2e2 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2016-2023  Charlene Benke           <charlene@patas-monkey.com>
- * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -232,6 +232,9 @@ abstract class CommonDocGenerator
 		);
 		// Retrieve extrafields
 		if (is_array($user->array_options) && count($user->array_options)) {
+			if (empty($extrafields->attributes[$user->table_element])) {
+				$extrafields->fetch_name_optionals_label($user->table_element);
+			}
 			$array_user = $this->fill_substitutionarray_with_extrafields($user, $array_user, $extrafields, 'myuser', $outputlangs);
 		}
 		return $array_user;

From 54152730400c5a15e91057bd88be06bed37b88b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 14 Mar 2024 21:31:44 +0100
Subject: [PATCH 1367/1862] Update doc_generic_odt.modules.php

---
 htdocs/core/modules/societe/doc/doc_generic_odt.modules.php | 1 +
 1 file changed, 1 insertion(+)

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 2022fd03dd8..efacbd6b196 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -259,6 +259,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				}
 				$file = $dir . '/' . $filename;
 				$object->builddoc_filename = $filename; // For triggers
+				$object->context['builddoc_filename'] = $filename; // For triggers
 				//print "newfileformat=".$newfileformat;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;

From 390f18f55731bb9eba2420c8b8e1a94cd00e9a26 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 22:06:43 +0100
Subject: [PATCH 1368/1862] FIX #yogosha20932

---
 SECURITY.md                      |  5 ++-
 htdocs/core/lib/website2.lib.php |  6 ++--
 htdocs/core/website.inc.php      |  9 +++++
 htdocs/filefunc.inc.php          | 62 +++++++++++++++++++++++++++++++-
 htdocs/main.inc.php              |  6 ++--
 htdocs/website/index.php         |  9 +++++
 6 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 4d335d63737..02a015756cf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -104,6 +104,5 @@ Scope is the web application (backoffice) and the APIs.
 * SSL/TLS best practices
 * Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
 * Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
-* Ability to include javascript into a page of the website using the website page editor are not qualified (this is the expected behaviour)
-* Ability to execute PHP code on the server using the website using the website page editor by a user that own the super permission "add php code into pages" are not qualified (this is the expected behaviour).
- 
+* Vulnerabilities of type XSS exploited by using javascript into a website page (with permission to edit website pages) or by using php code into a website page
+  using the permission to edit php code are not qualified, except if this allow to get higher privileges (being able to set javascript or php code is the expected behaviour).
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 752216aa230..9691b94642a 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -671,7 +671,7 @@ function showWebsiteTemplates(Website $website)
  */
 function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
 {
-	global $conf, $langs, $user;
+	global $langs, $user;
 
 	$error = 0;
 
@@ -680,9 +680,9 @@ function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
 	}
 
 	// First check forbidden commands
-	$forbiddenphpcommands = array();
+	$forbiddenphpcommands = array("override_function", "session_id", "session_create_id", "session_regenerate_id");
 	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_EXEC')) {    // If option is not on, we disallow functions to execute commands
-		$forbiddenphpcommands = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI");
+		$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI"));
 	}
 	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_WRITE')) {    // If option is not on, we disallow functions to write files
 		$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 9a340050d22..7c02a2c53f4 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -263,3 +263,12 @@ if (!defined('USEDOLIBARREDITOR') && empty($website->status)) {
 	print '<center><br><br>'.$weblangs->trans("SorryWebsiteIsCurrentlyOffLine").'</center>';
 	exit;
 }
+
+
+// Get session info and obfuscate session cookie and other variables
+$prefix = dol_getprefix('');
+$sessionname = 'DOLSESSID_'.$prefix;
+//$savsessionid = $_COOKIE[$sessionname];
+
+$_COOKIE[$sessionname] = 'obfuscatedcookie';
+unset($conf->file->instance_unique_id);
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index ff496ac9673..a94af12f92d 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -61,6 +61,66 @@ if (defined('DOL_INC_FOR_VERSION_ERROR')) {
 	return;
 }
 
+
+/**
+ * Replace session_start()
+ *
+ * @return void
+ */
+function dol_session_start()
+{
+	session_start();
+}
+
+/**
+ * Replace session_regenerate_id()
+ *
+ * @return void
+ */
+function dol_session_regenerate_id()
+{
+	session_regenerate_id();
+}
+
+/**
+ * Destroy and recreate a new session without losing content.
+ * Not used yet.
+ *
+ * @param  $sessionname		string		Session name
+ * @return void
+ */
+function dol_session_rotate($sessionname = '')
+{
+	$oldsessionid = session_id();
+
+	// Backup the current session
+	$session_backup = $_SESSION;
+
+	// Set current session to expire in 1 minute
+	$_SESSION['OBSOLETE'] = true;
+	$_SESSION['EXPIRES'] = time() + 60;
+
+	// Close the current session
+	session_write_close();
+
+	// Set a new session id and start the session
+	session_name($sessionname);
+	dol_session_start();
+
+	// Restore the previous session backup
+	$_SESSION = $session_backup;
+
+	// Clean up
+	unset($session_backup);
+	unset($_SESSION['OBSOLETE']);
+	unset($_SESSION['EXPIRES']);
+
+	$newsessionid = session_id();
+	//var_dump("oldsessionid=".$oldsessionid." - newsessionid=".$newsessionid);
+}
+
+
+
 // Define vars
 $conffiletoshowshort = "conf.php";
 // Define localization of conf file
@@ -76,7 +136,7 @@ $conffiletoshow = "htdocs/conf/conf.php";
 // --- End of part replaced by Dolibarr packager makepack-dolibarr
 
 // Include configuration
-$result = @include_once $conffile; // Keep @ because with some error reporting this break the redirect done when file not found
+$result = @include_once $conffile; // Keep @ because with some error reporting mode, this breaks the redirect done when file is not found
 
 // Disable some not used PHP stream
 $listofwrappers = stream_get_wrappers();
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6fc00d524ac..5e4659ab70c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -386,7 +386,7 @@ if (!defined('NOSESSION')) {
 		session_set_cookie_params($sessioncookieparams);
 	}
 	session_name($sessionname);
-	session_start();	// This call the open and read of session handler
+	dol_session_start();	// This call the open and read of session handler
 	//exit;	// this exist generates a call to write and close
 }
 
@@ -972,7 +972,7 @@ if (!defined('NOLOGIN')) {
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
-			session_start();
+			dol_session_start();
 
 			if ($resultFetchUser == 0) {
 				// Load translation files required by page
@@ -1059,7 +1059,7 @@ if (!defined('NOLOGIN')) {
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
-			session_start();
+			dol_session_start();
 
 			if ($resultFetchUser == 0) {
 				$langs->loadLangs(array('main', 'errors'));
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 37430439427..91adc317602 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -5200,6 +5200,12 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 
 			//var_dump($filetpl);
 			$filephp = $filetpl;
+
+			// Get session info and obfuscate session cookie
+			$savsessionname = session_name();
+			$savsessionid = $_COOKIE[$savsessionname];
+			$_COOKIE[$savsessionname] = 'obfuscatedcookie';
+
 			ob_start();
 			try {
 				$res = include $filephp;
@@ -5211,6 +5217,9 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 			}
 			$newcontent = ob_get_contents();
 			ob_end_clean();
+
+			// Restore data
+			$_COOKIE[$savsessionname] = $savsessionid;
 		}
 
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off

From aa07e6a4f2bf41c7e7126ccea05eaee11673a9fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 22:31:40 +0100
Subject: [PATCH 1369/1862] Update viewcat.php

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

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 8466119ffd8..f8b9d834118 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -1357,7 +1357,7 @@ if ($type == Categorie::TYPE_TICKET) {
 
 // Note that $action and $object may have been modified by some hooks
 $parameters = array('type' => $type, 'id' => $id, 'label' => $label);
-$reshook = $hookmanager->executeHooks('addMoreCategorieList', $parameters, $object, $action);
+$reshook = $hookmanager->executeHooks('addMoreCategoryList', $parameters, $object, $action);
 
 // End of page
 llxFooter();

From 6178e9392d5f9889d474df456866471dd668be62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 22:32:18 +0100
Subject: [PATCH 1370/1862] Update viewcat.php

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

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index f8b9d834118..a277b9b03c8 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -1357,7 +1357,7 @@ if ($type == Categorie::TYPE_TICKET) {
 
 // Note that $action and $object may have been modified by some hooks
 $parameters = array('type' => $type, 'id' => $id, 'label' => $label);
-$reshook = $hookmanager->executeHooks('addMoreCategoryList', $parameters, $object, $action);
+$reshook = $hookmanager->executeHooks('addMoreCategoriesList', $parameters, $object, $action);
 
 // End of page
 llxFooter();

From 41c2843f716c389b28fe65202dd3d4124227eecb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 22:35:00 +0100
Subject: [PATCH 1371/1862] Fix type

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 13d4c426bc7..153e1f9c26d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2607,7 +2607,7 @@ class Project extends CommonObject
 			$to = '';
 			$nbMailSend = 0;
 			$error = 0;
-			$errors_to = 0;
+			$errors_to = '';
 			while ($obj = $this->db->fetch_object($resql)) {
 				$to = $obj->email;
 				$numHolidays = num_public_holiday($lastWeekStartTS, $lastWeekEndTS, $mysoc->country_code, 1);

From e12faaa6633ed82c731b487769bbee0f27474e3e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 22:38:31 +0100
Subject: [PATCH 1372/1862] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 40afe9b9dc8..1fabc1a40ec 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9728,14 +9728,14 @@ function dol_osencode($str)
  *      Return an id or code from a code or id.
  *      Store also Code-Id into a cache to speed up next request on same key.
  *
- * 		@param	DoliDB	$db				Database handler
- * 		@param	string	$key			Code or Id to get Id or Code
- * 		@param	string	$tablename		Table name without prefix
- * 		@param	string	$fieldkey		Field to search the key into
- * 		@param	string	$fieldid		Field to get
- *      @param  int		$entityfilter	Filter by entity
- *      @param	string	$filters		Filters to add. WARNING: string must be escaped for SQL and not coming from user input.
- *      @return int<-1,max>				ID of code if OK, 0 if key empty, -1 if KO
+ * 		@param	DoliDB				$db				Database handler
+ * 		@param	string				$key			Code or Id to get Id or Code
+ * 		@param	string				$tablename		Table name without prefix
+ * 		@param	string				$fieldkey		Field to search the key into
+ * 		@param	string				$fieldid		Field to get
+ *      @param  int					$entityfilter	Filter by entity
+ *      @param	string				$filters		Filters to add. WARNING: string must be escaped for SQL and not coming from user input.
+ *      @return int<-1,max>|string					ID of code if OK, 0 if key empty, -1 if KO
  *      @see $langs->getLabelFromKey
  */
 function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '')

From a408288ba17fe3a7f41592b40ad933234e34b8ed Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 21:59:15 +0100
Subject: [PATCH 1373/1862] Fix & enable PhanPluginUnknownClosureParamType

# Fix & enable PhanPluginUnknownClosureParamType

Typing of anonymous functions to fix this notice.
Optimised some minor things.
---
 dev/tools/phan/config.php                     |   2 +-
 htdocs/admin/system/modules.php               |  41 +++--
 htdocs/admin/workflow.php                     | 150 +++++++++---------
 htdocs/api/class/api_access.class.php         |  16 +-
 htdocs/api/index.php                          |  16 +-
 .../core/class/commondocgenerator.class.php   |  15 +-
 htdocs/core/lib/functions.lib.php             |  14 +-
 htdocs/core/lib/modulebuilder.lib.php         |  30 +++-
 htdocs/dav/fileserver.php                     | 128 ++++++++-------
 .../class/DataCollector/DolPhpCollector.php   |  20 ++-
 htdocs/debugbar/class/autoloader.php          |  60 ++++---
 htdocs/install/inc.php                        |  38 +++--
 htdocs/main.inc.php                           |  16 +-
 htdocs/projet/class/task.class.php            |   7 +-
 .../class/ProductCombination.class.php        |  25 +--
 15 files changed, 355 insertions(+), 223 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4771e953a36..83000936137 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -453,7 +453,7 @@ return [
 		'PhanTypeInvalidDimOffset',
 		// 'PhanPluginNoCommentOnProtectedProperty',
 		// 'PhanPluginDescriptionlessCommentOnPublicMethod',
-		'PhanPluginUnknownClosureParamType',
+		// 'PhanPluginUnknownClosureParamType',
 		'PhanPluginUnknownClosureReturnType',
 		// 'PhanPluginNoCommentOnProtectedMethod',
 		// 'PhanTypeArraySuspicious',
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index da70b1fbbec..89912dd030e 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -308,21 +309,37 @@ print '</tr>';
 
 // sort list
 if ($sortfield == "name" && $sortorder == "asc") {
-	usort($moduleList, function (stdClass $a, stdClass $b) {
-		return strcasecmp($a->name, $b->name);
-	});
+	usort(
+		$moduleList,
+		/** @return bool */
+		function (stdClass $a, stdClass $b) {
+			return strcasecmp($a->name, $b->name);
+		}
+	);
 } elseif ($sortfield == "name" && $sortorder == "desc") {
-	usort($moduleList, function (stdClass $a, stdClass $b) {
-		return strcasecmp($b->name, $a->name);
-	});
+	usort(
+		$moduleList,
+		/** @return bool */
+		static function (stdClass $a, stdClass $b) {
+			return strcasecmp($b->name, $a->name);
+		}
+	);
 } elseif ($sortfield == "version" && $sortorder == "asc") {
-	usort($moduleList, function (stdClass $a, stdClass $b) {
-		return strcasecmp($a->version, $b->version);
-	});
+	usort(
+		$moduleList,
+		/** @return bool */
+		static function (stdClass $a, stdClass $b) {
+			return strcasecmp($a->version, $b->version);
+		}
+	);
 } elseif ($sortfield == "version" && $sortorder == "desc") {
-	usort($moduleList, function (stdClass $a, stdClass $b) {
-		return strcasecmp($b->version, $a->version);
-	});
+	usort(
+		$moduleList,
+		/** @return bool */
+		static function (stdClass $a, stdClass $b) {
+			return strcasecmp($b->version, $a->version);
+		}
+	);
 } elseif ($sortfield == "id" && $sortorder == "asc") {
 	usort($moduleList, "compareIdAsc");
 } elseif ($sortfield == "id" && $sortorder == "desc") {
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index e06954b0422..2e28dc8a6f9 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2021	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -60,96 +61,96 @@ clearstatcache();
 
 $workflowcodes = array(
 	// Automatic creation
-	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array(
-		'family'=>'create',
-		'position'=>10,
-		'enabled'=>(isModEnabled("propal") && isModEnabled('order')),
-		'picto'=>'order'
+	'WORKFLOW_PROPAL_AUTOCREATE_ORDER' => array(
+		'family' => 'create',
+		'position' => 10,
+		'enabled' => (isModEnabled("propal") && isModEnabled('order')),
+		'picto' => 'order'
 	),
-	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array(
-		'family'=>'create',
-		'position'=>20,
-		'enabled'=>(isModEnabled('order') && isModEnabled('invoice')),
-		'picto'=>'bill'
+	'WORKFLOW_ORDER_AUTOCREATE_INVOICE' => array(
+		'family' => 'create',
+		'position' => 20,
+		'enabled' => (isModEnabled('order') && isModEnabled('invoice')),
+		'picto' => 'bill'
 	),
 	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array(
-		'family'=>'create',
-		'position'=>25,
-		'enabled'=>(isModEnabled('ticket') && isModEnabled('intervention')),
-		'picto'=>'ticket'
+		'family' => 'create',
+		'position' => 25,
+		'enabled' => (isModEnabled('ticket') && isModEnabled('intervention')),
+		'picto' => 'ticket'
 	),
 
-	'separator1'=>array('family'=>'separator', 'position'=>25, 'title'=>'', 'enabled'=>((isModEnabled("propal") && isModEnabled('order')) || (isModEnabled('order') && isModEnabled('invoice')) || (isModEnabled('ticket') && isModEnabled('intervention')))),
+	'separator1' => array('family' => 'separator', 'position' => 25, 'title' => '', 'enabled' => ((isModEnabled("propal") && isModEnabled('order')) || (isModEnabled('order') && isModEnabled('invoice')) || (isModEnabled('ticket') && isModEnabled('intervention')))),
 
 	// Automatic classification of proposal
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array(
-		'family'=>'classify_proposal',
-		'position'=>30,
-		'enabled'=>(isModEnabled("propal") && isModEnabled('order')),
-		'picto'=>'propal',
-		'warning'=>''
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL' => array(
+		'family' => 'classify_proposal',
+		'position' => 30,
+		'enabled' => (isModEnabled("propal") && isModEnabled('order')),
+		'picto' => 'propal',
+		'warning' => ''
 	),
-	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array(
-		'family'=>'classify_proposal',
-		'position'=>31,
-		'enabled'=>(isModEnabled("propal") && isModEnabled('invoice')),
-		'picto'=>'propal',
-		'warning'=>''
+	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL' => array(
+		'family' => 'classify_proposal',
+		'position' => 31,
+		'enabled' => (isModEnabled("propal") && isModEnabled('invoice')),
+		'picto' => 'propal',
+		'warning' => ''
 	),
 
 	// Automatic classification of order
-	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(  // when shipping validated
-		'family'=>'classify_order',
-		'position'=>40,
-		'enabled'=>(isModEnabled("shipping") && isModEnabled('order')),
-		'picto'=>'order'
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING' => array(  // when shipping validated
+		'family' => 'classify_order',
+		'position' => 40,
+		'enabled' => (isModEnabled("shipping") && isModEnabled('order')),
+		'picto' => 'order'
 	),
-	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed
-		'family'=>'classify_order',
-		'position'=>41,
-		'enabled'=>(isModEnabled("shipping") && isModEnabled('order')),
-		'picto'=>'order'
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED' => array( // when shipping closed
+		'family' => 'classify_order',
+		'position' => 41,
+		'enabled' => (isModEnabled("shipping") && isModEnabled('order')),
+		'picto' => 'order'
 	),
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
-		'family'=>'classify_order',
-		'position'=>42,
-		'enabled'=>(isModEnabled('invoice') && isModEnabled('order')),
-		'picto'=>'order',
-		'warning'=>''
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER' => array(
+		'family' => 'classify_order',
+		'position' => 42,
+		'enabled' => (isModEnabled('invoice') && isModEnabled('order')),
+		'picto' => 'order',
+		'warning' => ''
 	), // For this option, if module invoice is disabled, it does not exists, so "Classify billed" for order must be done manually from order card.
 
 	// Automatic classification supplier proposal
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL'=>array(
-		'family'=>'classify_supplier_proposal',
-		'position'=>60,
-		'enabled'=>(isModEnabled('supplier_proposal') && (isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
-		'picto'=>'supplier_proposal',
-		'warning'=>''
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL' => array(
+		'family' => 'classify_supplier_proposal',
+		'position' => 60,
+		'enabled' => (isModEnabled('supplier_proposal') && (isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
+		'picto' => 'supplier_proposal',
+		'warning' => ''
 	),
 
 	// Automatic classification supplier order
-	'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION'=>array(
-		'family'=>'classify_supplier_order',
-		'position'=>63,
-		'enabled'=>(getDolGlobalString('MAIN_FEATURES_LEVEL') && isModEnabled("reception") && isModEnabled('supplier_order')),
-		'picto'=>'supplier_order',
-		'warning'=>''
+	'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION' => array(
+		'family' => 'classify_supplier_order',
+		'position' => 63,
+		'enabled' => (getDolGlobalString('MAIN_FEATURES_LEVEL') && isModEnabled("reception") && isModEnabled('supplier_order')),
+		'picto' => 'supplier_order',
+		'warning' => ''
 	),
 
-	'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED'=>array(
-		'family'=>'classify_supplier_order',
-		'position'=>64,
-		'enabled'=>(getDolGlobalString('MAIN_FEATURES_LEVEL') && isModEnabled("reception") && isModEnabled('supplier_order')),
-		'picto'=>'supplier_order',
-		'warning'=>''
+	'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED' => array(
+		'family' => 'classify_supplier_order',
+		'position' => 64,
+		'enabled' => (getDolGlobalString('MAIN_FEATURES_LEVEL') && isModEnabled("reception") && isModEnabled('supplier_order')),
+		'picto' => 'supplier_order',
+		'warning' => ''
 	),
 
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER'=>array(
-		'family'=>'classify_supplier_order',
-		'position'=>65,
-		'enabled'=>(isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
-		'picto'=>'supplier_order',
-		'warning'=>''
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER' => array(
+		'family' => 'classify_supplier_order',
+		'position' => 65,
+		'enabled' => (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
+		'picto' => 'supplier_order',
+		'warning' => ''
 	),
 
 	// Automatic classification shipping
@@ -188,7 +189,7 @@ $workflowcodes = array(
 	),
 
 
-	'separator2'=>array('family'=>'separator', 'position'=>400, 'enabled' => (isModEnabled('ticket') && isModEnabled('contract'))),
+	'separator2' => array('family' => 'separator', 'position' => 400, 'enabled' => (isModEnabled('ticket') && isModEnabled('contract'))),
 
 	// Automatic link ticket -> contract
 	'WORKFLOW_TICKET_LINK_CONTRACT' => array(
@@ -212,9 +213,16 @@ if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['w
 }
 
 // remove not available workflows (based on activated modules and global defined keys)
-$workflowcodes = array_filter($workflowcodes, function ($var) {
-	return $var['enabled'];
-});
+$workflowcodes = array_filter(
+	$workflowcodes,
+	/**
+	 * @param array{enabled:int<0,1>} $var
+	 * @return int<0,1>
+	 */
+	static function ($var) {
+		return $var['enabled'];
+	}
+);
 
 
 
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 82a60bc5116..8e4bdb0db9f 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,11 +20,16 @@
 
 // Create the autoloader for Luracast
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
-call_user_func(function () {
-	$loader = Luracast\Restler\AutoLoader::instance();
-	spl_autoload_register($loader);
-	return $loader;
-});
+call_user_func(
+	/**
+	 * @return Luracast\Restler\AutoLoader
+	 */
+	static function () {
+		$loader = Luracast\Restler\AutoLoader::instance();
+		spl_autoload_register($loader);
+		return $loader;
+	}
+);
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/iAuthenticate.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/iUseAuthentication.php';
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index d55fe8d38d5..4b3385fe5ee 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2021	Alexis LAURIER			<contact@alexislaurier.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -91,11 +92,16 @@ if (!$res) {
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
-call_user_func(function () {
-	$loader = Luracast\Restler\AutoLoader::instance();
-	spl_autoload_register($loader);
-	return $loader;
-});
+call_user_func(
+	/**
+	 * @return Luracast\Restler\AutoLoader
+	 */
+	static function () {
+		$loader = Luracast\Restler\AutoLoader::instance();
+		spl_autoload_register($loader);
+		return $loader;
+	}
+);
 
 require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php';
 require_once DOL_DOCUMENT_ROOT.'/api/class/api_access.class.php';
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index ff41f78e2e2..251442a9b72 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2016-2023  Charlene Benke           <charlene@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1491,9 +1492,17 @@ abstract class CommonDocGenerator
 
 		if (!empty($fields)) {
 			// Sort extrafields by rank
-			uasort($fields, function ($a, $b) {
-				return  ($a->rank > $b->rank) ? 1 : -1;
-			});
+			uasort(
+				$fields,
+				/**
+				 * @param stdClass $a
+				 * @param stdClass $b
+				 * @return int<-1,1>
+				 */
+				static function ($a, $b) {
+					return  ($a->rank > $b->rank) ? 1 : -1;
+				}
+			);
 
 			// define some HTML content with style
 			$html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1fabc1a40ec..68256ee7774 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7929,9 +7929,17 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 			// 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', function ($m) {
-				return realCharForNumericEntities($m);
-			}, $out);
+			$out = preg_replace_callback(
+				'/&#(x?[0-9][0-9a-f]+;?)/i',
+				/**
+				 * @param string $m
+				 * @return string
+				 */
+				static 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/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index bb1ce99fa52..30b199a735f 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2009-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1210,9 +1211,16 @@ function updateDictionaryInFile($module, $file, $dicts)
 		$dicData .= "\t\t\t'$key'=>";
 
 		if ($key === 'tabcond') {
-			$conditions = array_map(function ($val) use ($module) {
-				return ($val === true || $val === false) ? "isModEnabled('$module')" : $val;
-			}, $value);
+			$conditions = array_map(
+				/**
+				 * @param bool|int|string $val
+				 * @return string|int
+				 */
+				function ($val) use ($module) {
+					return is_bool($val) ? "isModEnabled('$module')" : $val;
+				},
+				$value
+			);
 			$dicData .= "array(" . implode(",", $conditions) . ")";
 		} elseif ($key === 'tabhelp') {
 			$helpItems = array();
@@ -1222,9 +1230,19 @@ function updateDictionaryInFile($module, $file, $dicts)
 			$dicData .= "array(" . implode(",", $helpItems) . ")";
 		} else {
 			if (is_array($value)) {
-				$dicData .= "array(" . implode(",", array_map(function ($val) {
-					return "'$val'";
-				}, $value)) . ")";
+				$dicData .= "array(" . implode(
+					",",
+					array_map(
+						/**
+						 * @param string $val
+						 * @return string
+						 */
+						static function ($val) {
+							return "'$val'";
+						},
+						$value
+					)
+				) . ")";
 			} else {
 				$dicData .= "'$value'";
 			}
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index f4fad036d8d..ad1b7cb1290 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2018	Destailleur Laurent	<eldy@users.sourceforge.net>
  * Copyright (C) 2019	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -92,69 +93,76 @@ $tmpDir = $conf->dav->multidir_output[$entity]; // We need root dir, not a dir t
 
 
 // Authentication callback function
-$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
-	global $user, $conf;
-	global $dolibarr_main_authentication, $dolibarr_auto_user;
+$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(
+	/**
+	 * @param string	$username	Username to validate as a login
+	 * @param string	$password	Password to validate for $username
+	 * @return true				True if login ok, false if not
+	 */
+	static function ($username, $password) {
+		global $user, $conf;
+		global $dolibarr_main_authentication, $dolibarr_auto_user;
 
-	if (empty($user->login)) {
-		dol_syslog("Failed to authenticate to DAV, login is not provided", LOG_WARNING);
-		return false;
-	}
-	if ($user->socid > 0) {
-		dol_syslog("Failed to authenticate to DAV, user is an external user", LOG_WARNING);
-		return false;
-	}
-	if ($user->login != $username) {
-		dol_syslog("Failed to authenticate to DAV, login does not match the login of loaded user", LOG_WARNING);
-		return false;
-	}
-
-	// Authentication mode
-	if (empty($dolibarr_main_authentication)) {
-		$dolibarr_main_authentication = 'dolibarr';
-	}
-
-	// Authentication mode: forceuser
-	if ($dolibarr_main_authentication == 'forceuser') {
-		if (empty($dolibarr_auto_user)) {
-			$dolibarr_auto_user = 'auto';
-		}
-		if ($dolibarr_auto_user != $username) {
-			dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. DAV usage is forbidden in this mode.");
+		if (empty($user->login)) {
+			dol_syslog("Failed to authenticate to DAV, login is not provided", LOG_WARNING);
 			return false;
 		}
+		if ($user->socid > 0) {
+			dol_syslog("Failed to authenticate to DAV, user is an external user", LOG_WARNING);
+			return false;
+		}
+		if ($user->login != $username) {
+			dol_syslog("Failed to authenticate to DAV, login does not match the login of loaded user", LOG_WARNING);
+			return false;
+		}
+
+		// Authentication mode
+		if (empty($dolibarr_main_authentication)) {
+			$dolibarr_main_authentication = 'dolibarr';
+		}
+
+		// Authentication mode: forceuser
+		if ($dolibarr_main_authentication == 'forceuser') {
+			if (empty($dolibarr_auto_user)) {
+				$dolibarr_auto_user = 'auto';
+			}
+			if ($dolibarr_auto_user != $username) {
+				dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. DAV usage is forbidden in this mode.");
+				return false;
+			}
+		}
+
+		$authmode = explode(',', $dolibarr_main_authentication);
+		$entity = (GETPOSTINT('entity') ? GETPOSTINT('entity') : (!empty($conf->entity) ? $conf->entity : 1));
+
+		if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username) {
+			return false;
+		}
+
+		// Check if user status is enabled
+		if ($user->statut != $user::STATUS_ENABLED) {
+			// Status is disabled
+			dol_syslog("The user has been disabled.");
+			return false;
+		}
+
+		// Check if session was unvalidated by a password change
+		if (($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
+			// Session is no more valid
+			dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
+			return false;
+		}
+
+		// Check date validity
+		if ($user->isNotIntoValidityDateRange()) {
+			// User validity dates are no more valid
+			dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], current date is ".dol_now());
+			return false;
+		}
+
+		return true;
 	}
-
-	$authmode = explode(',', $dolibarr_main_authentication);
-	$entity = (GETPOSTINT('entity') ? GETPOSTINT('entity') : (!empty($conf->entity) ? $conf->entity : 1));
-
-	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username) {
-		return false;
-	}
-
-	// Check if user status is enabled
-	if ($user->statut != $user::STATUS_ENABLED) {
-		// Status is disabled
-		dol_syslog("The user has been disabled.");
-		return false;
-	}
-
-	// Check if session was unvalidated by a password change
-	if (($user->flagdelsessionsbefore && !empty($_SESSION["dol_logindate"]) && $user->flagdelsessionsbefore > $_SESSION["dol_logindate"])) {
-		// Session is no more valid
-		dol_syslog("The user has a date for session invalidation = ".$user->flagdelsessionsbefore." and a session date = ".$_SESSION["dol_logindate"].". We must invalidate its sessions.");
-		return false;
-	}
-
-	// Check date validity
-	if ($user->isNotIntoValidityDateRange()) {
-		// User validity dates are no more valid
-		dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], current date is ".dol_now());
-		return false;
-	}
-
-	return true;
-});
+);
 
 $authBackend->setRealm(constant('DOL_APPLICATION_TITLE').' - WebDAV');
 
@@ -211,7 +219,7 @@ if (isset($baseUri)) {
 if ((!getDolGlobalString('DAV_ALLOW_PUBLIC_DIR')
 	|| !preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public', '/').'/', $_SERVER["PHP_SELF"]))
 	&& !preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
-	) {
+) {
 	//var_dump($_SERVER["QUERY_STRING"]);exit;
 	$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 }
diff --git a/htdocs/debugbar/class/DataCollector/DolPhpCollector.php b/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
index c4ff10dbc61..8adc2a3814d 100644
--- a/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolPhpCollector.php
@@ -76,18 +76,26 @@ class PhpCollector extends DataCollector implements Renderable
 	/**
 	 * Returns a list of messages ordered by their timestamp.
 	 *
-	 * @return array A list of messages ordered by time.
+	 * @return array<array{time:int}> A list of messages ordered by time.
 	 */
 	public function getMessages()
 	{
 		$messages = $this->messages;
 
-		usort($messages, function ($itemA, $itemB) {
-			if ($itemA['time'] === $itemB['time']) {
-				return 0;
+		usort(
+			$messages,
+			/**
+			 * @param array{time:int} $itemA Message A information
+			 * @param array{time:int} $itemB Message B information
+			 * @return int<-1,1> -1 if Item A before Item B, 0 if same, 1 if later.
+			 */
+			static function ($itemA, $itemB) {
+				if ($itemA['time'] === $itemB['time']) {
+					return 0;
+				}
+				return $itemA['time'] < $itemB['time'] ? -1 : 1;
 			}
-			return $itemA['time'] < $itemB['time'] ? -1 : 1;
-		});
+		);
 
 		return $messages;
 	}
diff --git a/htdocs/debugbar/class/autoloader.php b/htdocs/debugbar/class/autoloader.php
index a093315172a..b5e54aa29dd 100644
--- a/htdocs/debugbar/class/autoloader.php
+++ b/htdocs/debugbar/class/autoloader.php
@@ -1,35 +1,43 @@
 <?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
 /**
  * Simple autoloader, so we don't need Composer just for this.
  */
 
-spl_autoload_register(function ($class) {
-	if (preg_match('/^DebugBar/', $class)) {
-		$file = DOL_DOCUMENT_ROOT.'/includes/maximebf/debugbar/src/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
-		//var_dump($class.' - '.file_exists($file).' - '.$file);
-		if (file_exists($file)) {
-			require_once $file;
-			return true;
+spl_autoload_register(
+	/**
+	 * @param string	$class	Class to load
+	 * @return true				If class could be loaded
+	 */
+	static function ($class) {
+		if (preg_match('/^DebugBar/', $class)) {
+			$file = DOL_DOCUMENT_ROOT.'/includes/maximebf/debugbar/src/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
+			//var_dump($class.' - '.file_exists($file).' - '.$file);
+			if (file_exists($file)) {
+				require_once $file;
+				return true;
+			}
+			return false;
 		}
-		return false;
-	}
-	if (preg_match('/^'.preg_quote('Psr\Log', '/').'/', $class)) {
-		$file = DOL_DOCUMENT_ROOT.'/includes/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
-		//var_dump($class.' - '.file_exists($file).' - '.$file);
-		if (file_exists($file)) {
-			require_once $file;
-			return true;
+		if (preg_match('/^'.preg_quote('Psr\Log', '/').'/', $class)) {
+			$file = DOL_DOCUMENT_ROOT.'/includes/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
+			//var_dump($class.' - '.file_exists($file).' - '.$file);
+			if (file_exists($file)) {
+				require_once $file;
+				return true;
+			}
+			return false;
 		}
-		return false;
-	}
-	if (preg_match('/^'.preg_quote('Symfony\Component\VarDumper', '/').'/', $class)) {
-		$class = preg_replace('/'.preg_quote('Symfony\Component\VarDumper', '/').'/', '', $class);
-		$file = DOL_DOCUMENT_ROOT.'/includes/symfony/var-dumper/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
-		if (file_exists($file)) {
-			require_once $file;
-			return true;
+		if (preg_match('/^'.preg_quote('Symfony\Component\VarDumper', '/').'/', $class)) {
+			$class = preg_replace('/'.preg_quote('Symfony\Component\VarDumper', '/').'/', '', $class);
+			$file = DOL_DOCUMENT_ROOT.'/includes/symfony/var-dumper/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
+			if (file_exists($file)) {
+				require_once $file;
+				return true;
+			}
+			return false;
 		}
-		return false;
+		return true;
 	}
-	return true;
-});
+);
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 8abfb691119..d896cae320c 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2021       Charlene Benke      	<charlene@patas-monkey.com>
  * Copyright (C) 2023       Alexandre Janniaux      <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -140,24 +141,39 @@ if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) {
 			case 'config':
 				$conffile = $arg;
 				$conffiletoshow = $arg;
-			break;
+				break;
 			case 'h':
 			case 'help':
 				usage($argv[0], "Usage:");
-			exit(0);
+				exit(0);
 		}
 	}
 
 	// Parse the arguments to find the options.
-	$args_options = array_filter(array_slice($argv, 0, $rest_index), function ($arg) {
-		return strlen($arg) >= 2 && $arg[0] == '-';
-	});
-	$parsed_options = array_map(function ($arg) {
-		if (strlen($arg) > 1) {
-			return "--" . $arg;
+	$args_options = array_filter(
+		array_slice($argv, 0, $rest_index),
+		/**
+		 * @param string $arg
+		 * @return bool
+		 */
+		static function ($arg) {
+			return strlen($arg) >= 2 && $arg[0] == '-';
 		}
-		return "-" . $arg;
-	}, array_keys($opts));
+	);
+	$parsed_options = array_map(
+		/**
+		 * Previx option with '-' for single characters and -- for more than single characters
+		 * @param string $arg
+		 * @return straing
+		 */
+		static function ($arg) {
+			if (strlen($arg) > 1) {
+				return "--" . $arg;
+			}
+			return "-" . $arg;
+		},
+		array_keys($opts)
+	);
 
 	// Find options (dash-prefixed) that were not parsed.
 	$unknown_options = array_diff($args_options, $parsed_options);
@@ -301,7 +317,7 @@ if (constant('DOL_DATA_ROOT') === null) {
 	$lockfile = '../../documents/install.lock';
 	$upgradeunlockfile = '../../documents/upgrade.unlock';
 }
-$islocked=false;
+$islocked = false;
 if (@file_exists($lockfile) || @file_exists($lockfile2)) {
 	if (!defined('ALLOWED_IF_UPGRADE_UNLOCK_FOUND') || (! @file_exists($upgradeunlockfile) && ! @file_exists($upgradeunlockfile2))) {
 		// If this is a dangerous install page (ALLOWED_IF_UPGRADE_UNLOCK_FOUND not defined) or
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5e4659ab70c..5dd096ef228 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -101,10 +101,18 @@ function testSqlAndScriptInject($val, $type)
 		$oldval = $val;
 		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);	// Decode '&colon;', '&apos;', '&Tab;', '&NewLine', ...
 		// 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) {
-			// Decode '&#110;', ...
-			return realCharForNumericEntities($m);
-		}, $val);
+		$val = preg_replace_callback(
+			'/&#(x?[0-9][0-9a-f]+;?)/i',
+			/**
+			 * @param string $m
+			 * @return string
+			 */
+			static function ($m) {
+				// Decode '&#110;', ...
+				return realCharForNumericEntities($m);
+			},
+			$val
+		);
 
 		// We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: on<!-- -->error=alert(1)
 		$val = preg_replace('/<!--[^>]*-->/', '', $val);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 5f97d8c9a3f..754f465e574 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -525,7 +525,12 @@ class Task extends CommonObjectLine
 					$project->getLinesArray(null); // this method does not return <= 0 if fails
 					$projectCompleted = array_reduce(
 						$project->lines,
-						function ($allTasksCompleted, $task) {
+						/**
+						 * @param bool $allTasksCompleted
+						 * @param Task $task
+						 * @return bool
+						 */
+						static function ($allTasksCompleted, $task) {
 							return $allTasksCompleted && $task->progress >= 100;
 						},
 						1
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 25d69eaeac9..ef23ce4857d 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2018	Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -292,13 +293,13 @@ class ProductCombination
 		global $conf;
 
 		$sql = "SELECT pac.rowid, pac.fk_product_parent, pac.fk_product_child, pac.variation_price, pac.variation_price_percentage, pac.variation_ref_ext, pac.variation_weight";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_attribute_combination AS pac";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute_combination AS pac";
 		if ($sort_by_ref) {
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = pac.fk_product_child";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = pac.fk_product_child";
 		}
-		$sql.= " WHERE pac.fk_product_parent = ".((int) $fk_product_parent)." AND pac.entity IN (".getEntity('product').")";
+		$sql .= " WHERE pac.fk_product_parent = ".((int) $fk_product_parent)." AND pac.entity IN (".getEntity('product').")";
 		if ($sort_by_ref) {
-			$sql.= $this->db->order('p.ref', 'ASC');
+			$sql .= $this->db->order('p.ref', 'ASC');
 		}
 
 		$query = $this->db->query($sql);
@@ -614,7 +615,7 @@ class ProductCombination
 	 * Retrieves the combination that matches the given features.
 	 *
 	 * @param 	int 						$prodid 	Id of parent product
-	 * @param 	array 						$features 	Format: [$attr] => $attr_val
+	 * @param 	array<string,string> 		$features 	Format: [$attr] => $attr_val
 	 * @return 	false|ProductCombination 				False if not found
 	 */
 	public function fetchByProductCombination2ValuePairs($prodid, array $features)
@@ -626,9 +627,15 @@ class ProductCombination
 		$prodcomb2val = new ProductCombination2ValuePair($this->db);
 		$prodcomb = new ProductCombination($this->db);
 
-		$features = array_filter($features, function ($v) {
-			return !empty($v);
-		});
+		$features = array_filter(
+			$features,
+			/**
+			 * @param mixed $v Feature information of a product.
+			 */
+			static function ($v) {
+				return !empty($v);
+			}
+		);
 
 		foreach ($features as $attr => $attr_val) {
 			$actual_comp[$attr] = $attr_val;
@@ -729,7 +736,7 @@ class ProductCombination
 
 		$this->db->begin();
 
-		$price_impact = array(1=>0); // init level price impact
+		$price_impact = array(1 => 0); // init level price impact
 
 		$forced_refvar = trim($forced_refvar);
 

From 2c09a8b174cfae7c7b62d66fc110f48da45ed0e0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 02:55:48 +0100
Subject: [PATCH 1374/1862] Fix PhanNoopBinaryOperator by converting to
 ->element = 'generic'

---
 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 8efeda93635..b885ba5340b 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2385,7 +2385,7 @@ class EmailCollector extends CommonObject
 									$operationslog .= '<br>We have this data to search thirdparty: id='.$idtouseforthirdparty.', email='.$emailtouseforthirdparty.', name='.$nametouseforthirdparty.', name_alias='.$namealiastouseforthirdparty;
 
 									$tmpobject = new stdClass();
-									$tmpobject->element == 'generic';
+									$tmpobject->element = 'generic';
 									$tmpobject->id = $idtouseforthirdparty;
 									$tmpobject->name = $nametouseforthirdparty;
 									$tmpobject->name_alias = $namealiastouseforthirdparty;

From f5ab94634a1f1a0845c81517306639274731bb56 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 02:56:56 +0100
Subject: [PATCH 1375/1862] Fix PhanNoopBinaryOperator by commenting NOOP tests

---
 htdocs/core/modules/societe/mod_codecompta_digitaria.php | 5 ++---
 htdocs/modulebuilder/index.php                           | 6 +++---
 htdocs/paybox/lib/paybox.lib.php                         | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index a902fc80ac8..d536c5e7dd6 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2019       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -260,9 +261,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 
 					$i++;
 				}
-			} else {
-				$disponibility == 0;
-			}
+			} // else { $disponibility = 0; /* Already set */ }
 		}
 
 		if ($disponibility == 0) {
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index e0acefa2b0e..6eb2db3db15 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2398,15 +2398,15 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright') &&
 
 	if ($label == "Read objects of $module" && $crud != "read") {
 		$crud = "read";
-		$label == "Read objects of $module";
+		// $label = "Read objects of $module";
 	}
 	if ($label == "Create/Update objects of $module" && $crud != "write") {
 		$crud = "write";
-		$label == "Create/Update objects of $module";
+		// $label = "Create/Update objects of $module";
 	}
 	if ($label == "Delete objects of $module" && $crud != "delete") {
 		$crud = "delete";
-		$label == "Delete objects of $module";
+		// $label = "Delete objects of $module";
 	}
 
 	$permissions = $moduleobj->rights;
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 7138646c8ca..6cc94d4d6f3 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -146,8 +147,8 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 		   "&PBX_OUTPUT=".$IBS_OUTPUT.
 		   "&PBX_SOURCE=".$PBX_SOURCE.
 		   "&PBX_TYPEPAIEMENT=".$PBX_TYPEPAIEMENT;
-	"&PBX_HASH=".$PBX_HASH;
-	"&PBX_TIME=".$PBX_TIME;
+	// "&PBX_HASH=".$PBX_HASH;
+	// "&PBX_TIME=".$PBX_TIME;
 
 	$binKey = pack("H*", dol_decode($conf->global->PAYBOX_HMAC_KEY));
 

From 43342c89788c063b8fe6ecd85ef2c527e9c16be5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 02:57:51 +0100
Subject: [PATCH 1376/1862] Qual: Allow PhanNoopBinaryOperator (all fixed)

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4771e953a36..4acc540bacc 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -527,7 +527,7 @@ return [
 		'PhanTypeMismatchBitwiseBinaryOperands',
 		'PhanTypeMismatchDimEmpty',
 		'PhanTypeSuspiciousEcho',
-		'PhanNoopBinaryOperator',
+		// 'PhanNoopBinaryOperator',
 		// 'PhanTypeInvalidBitwiseBinaryOperator',
 		// 'PhanPluginDescriptionlessCommentOnFunction',
 		'PhanPluginPHPDocInWrongComment',

From 0f8b9e73f0eb8abeaae1164a110cf6ab6aa8251d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 10 Mar 2024 16:24:06 +0100
Subject: [PATCH 1377/1862] Fix: Enable/fix
 PhanPluginPrintfIncompatibleArgumentTypeWeak occurences

# Fix: Enable/fix PhanPluginPrintfIncompatibleArgumentTypeWeak occurences

Fix the PhanPluginPrintfIncompatibleArgumentTypeWeak occurences and fix the rule
---
 dev/tools/phan/config.php                                    | 2 +-
 htdocs/compta/bank/annuel.php                                | 3 ++-
 htdocs/compta/resultat/result.php                            | 5 +++--
 htdocs/core/modules/asset/mod_asset_standard.php             | 4 +++-
 htdocs/core/modules/bom/mod_bom_standard.php                 | 3 ++-
 htdocs/core/modules/cheque/mod_chequereceipt_mint.php        | 3 ++-
 htdocs/core/modules/commande/mod_commande_marbre.php         | 3 ++-
 htdocs/core/modules/contract/mod_contract_serpis.php         | 4 ++--
 htdocs/core/modules/delivery/mod_delivery_jade.php           | 3 ++-
 htdocs/core/modules/expedition/mod_expedition_safor.php      | 3 ++-
 htdocs/core/modules/expensereport/mod_expensereport_jade.php | 3 ++-
 htdocs/core/modules/facture/mod_facture_mars.php             | 5 +++--
 htdocs/core/modules/facture/mod_facture_terre.php            | 5 +++--
 htdocs/core/modules/fichinter/mod_pacific.php                | 3 ++-
 htdocs/core/modules/holiday/mod_holiday_madonna.php          | 4 ++--
 htdocs/core/modules/hrm/mod_evaluation_standard.php          | 3 ++-
 htdocs/core/modules/member/mod_member_advanced.php           | 4 ++--
 htdocs/core/modules/mrp/mod_mo_standard.php                  | 3 ++-
 htdocs/core/modules/payment/mod_payment_cicada.php           | 3 ++-
 htdocs/core/modules/product_batch/mod_lot_standard.php       | 3 ++-
 htdocs/core/modules/product_batch/mod_sn_standard.php        | 3 ++-
 htdocs/core/modules/project/mod_project_simple.php           | 3 ++-
 htdocs/core/modules/project/task/mod_task_simple.php         | 3 ++-
 htdocs/core/modules/propale/mod_propale_marbre.php           | 3 ++-
 htdocs/core/modules/reception/mod_reception_beryl.php        | 3 ++-
 htdocs/core/modules/societe/mod_codeclient_monkey.php        | 2 +-
 .../modules/stocktransfer/mod_stocktransfer_standard.php     | 3 ++-
 .../supplier_invoice/mod_facture_fournisseur_cactus.php      | 5 +++--
 .../supplier_order/mod_commande_fournisseur_muguet.php       | 3 ++-
 .../modules/supplier_payment/mod_supplier_payment_bronan.php | 3 ++-
 .../supplier_proposal/mod_supplier_proposal_marbre.php       | 3 ++-
 htdocs/core/modules/takepos/mod_takepos_ref_simple.php       | 5 +++--
 htdocs/core/modules/ticket/mod_ticket_simple.php             | 3 ++-
 htdocs/core/modules/workstation/mod_workstation_standard.php | 3 ++-
 .../knowledgemanagement/mod_knowledgerecord_standard.php     | 3 ++-
 .../core/modules/partnership/mod_partnership_standard.php    | 3 ++-
 htdocs/product/list.php                                      | 3 ++-
 .../recruitment/mod_recruitmentcandidature_standard.php      | 3 ++-
 .../recruitment/mod_recruitmentjobposition_standard.php      | 3 ++-
 39 files changed, 82 insertions(+), 47 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4771e953a36..4254d0c0585 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -495,7 +495,7 @@ return [
 		'PhanTypeInvalidLeftOperandOfBitwiseOp',
 		// 'PhanTypeMismatchDimAssignment',
 		// 'PhanPluginDescriptionlessCommentOnProtectedMethod',
-		'PhanPluginPrintfIncompatibleArgumentTypeWeak',
+		// 'PhanPluginPrintfIncompatibleArgumentTypeWeak',
 		'PhanUndeclaredVariableAssignOp',
 		'PhanTypeExpectedObjectOrClassName',
 		'PhanEmptyFQSENInClasslike',
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 5978fcc75b8..ff8260fce9d 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2023  Charlene BENKE          <charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -205,7 +206,7 @@ for ($mois = 1; $mois < 13; $mois++) {
 	print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
 
 	for ($annee = $year_start; $annee <= $year_end; $annee++) {
-		$case = sprintf("%04s-%02s", $annee, $mois);
+		$case = sprintf("%04d-%02d", $annee, $mois);
 
 		print '<td class="right" width="10%">&nbsp;';
 		if (isset($decaiss[$case]) && $decaiss[$case] > 0) {
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 21fa04cc931..daa017a0130 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2016-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2020  Laurent Destailleur     <eldy@destailleur.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -260,12 +261,12 @@ print '<th class="liste_titre right">'.$langs->trans("PreviousPeriod").'</th>';
 print '<th class="liste_titre right">'.$langs->trans("SelectedPeriod").'</th>';
 foreach ($months as $k => $v) {
 	if (($k + 1) >= $date_startmonth && $k < $date_endmonth) {
-		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k + 1))).'</th>';
+		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02d", ($k + 1))).'</th>';
 	}
 }
 foreach ($months as $k => $v) {
 	if (($k + 1) < $date_startmonth) {
-		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k + 1))).'</th>';
+		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02d", ($k + 1))).'</th>';
 	}
 }
 print	'</tr>';
diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php
index bc0705840d3..d09748f158c 100644
--- a/htdocs/core/modules/asset/mod_asset_standard.php
+++ b/htdocs/core/modules/asset/mod_asset_standard.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2005-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -156,7 +158,7 @@ class mod_asset_standard extends ModeleNumRefAsset
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_asset_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 1e4c22fb754..69656164461 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 +149,7 @@ class mod_bom_standard extends ModeleNumRefBoms
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_bom_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index 8cf6c383e65..3f760794750 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -145,7 +146,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 4bd0c9a9c33..71ccfb8915e 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -160,7 +161,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index 4c7979728e4..e0ffb17003c 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -29,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_serpis extends ModelNumRefContracts
 {
-
 	// variables inherited from ModelNumRefContracts class
 	public $name = 'Serpis';
 	public $version = 'dolibarr';
@@ -145,7 +145,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_contract_serpis::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
index df68b875e72..8cc8ec7f234 100644
--- a/htdocs/core/modules/delivery/mod_delivery_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -163,7 +164,7 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_delivery_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index af10ae43e45..a96b405e694 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -151,7 +152,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index e88aa5f6bf9..afbd1664e96 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Maxime Kohlhaas <support@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -208,7 +209,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_expensereport_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 2993ed9f37e..651181c8cfb 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2018 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -200,7 +201,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max);
+				$num = sprintf("%04d", $max);
 			}
 
 			$ref = '';
@@ -229,7 +230,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max + 1);
+				$num = sprintf("%04d", $max + 1);
 			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index f29607e5cd1..eef74993761 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -240,7 +241,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max);
+				$num = sprintf("%04d", $max);
 			}
 
 			$ref = '';
@@ -268,7 +269,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max + 1);
+				$num = sprintf("%04d", $max + 1);
 			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index 0f780ee2bb6..f721029b132 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -156,7 +157,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 06e63f42af8..c084f48e46d 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2018-2023 Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -30,7 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
  */
 class mod_holiday_madonna extends ModelNumRefHolidays
 {
-
 	// variables inherited from ModelNumRefHolidays class
 	public $name = 'Madonna';
 	public $version = 'dolibarr';
@@ -146,7 +146,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
index 9a568923e44..9096edcd050 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_standard.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -156,7 +157,7 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_evaluation_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/member/mod_member_advanced.php b/htdocs/core/modules/member/mod_member_advanced.php
index 0547350208e..2e1de7e6b1e 100644
--- a/htdocs/core/modules/member/mod_member_advanced.php
+++ b/htdocs/core/modules/member/mod_member_advanced.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2021		Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2022-2024	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -31,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_member.class.php';
  */
 class mod_member_advanced extends ModeleNumRefMembers
 {
-
 	// variables inherited from ModeleNumRefMembers class
 	public $name = 'Advanced';
 	public $version = 'dolibarr';
@@ -150,7 +150,7 @@ class mod_member_advanced extends ModeleNumRefMembers
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_member_advanced::getNextValue return ".$this->prefix.$yymm."-".$num, LOG_INFO);
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 333491281cc..b835a07614f 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 +149,7 @@ class mod_mo_standard extends ModeleNumRefMos
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_mo_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 6c90fec350a..5991cc2be93 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -154,7 +155,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php
index d3feb2e88c1..b09f6bc3ff5 100644
--- a/htdocs/core/modules/product_batch/mod_lot_standard.php
+++ b/htdocs/core/modules/product_batch/mod_lot_standard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2021       Christophe Battarel			<christophe@altairis.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 @@ class mod_lot_standard extends ModeleNumRefBatch
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1;
 		} else { // If counter > 9999, we do not format on 4 chars, we take number as it is
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_lot_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php
index ae4d4efa965..6f5f673562e 100644
--- a/htdocs/core/modules/product_batch/mod_sn_standard.php
+++ b/htdocs/core/modules/product_batch/mod_sn_standard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2021       Christophe Battarel			<christophe@altairis.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 @@ class mod_sn_standard extends ModeleNumRefBatch
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1;
 		} else { // If counter > 9999, we do not format on 4 chars, we take number as it is
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_sn_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 1ef51d36c95..a411154425c 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2010		Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -159,7 +160,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index e75fd1b5e8a..b523fefad8c 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2010		Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -156,7 +157,7 @@ class mod_task_simple extends ModeleNumRefTask
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index 0da17182404..b601a7b1217 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -157,7 +158,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 1482d96f935..10b12439776 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -131,7 +132,7 @@ class mod_reception_beryl extends ModelNumRefReception
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_reception_beryl::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index e46b5dc3f7a..9ddae66f284 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -137,7 +137,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if ($max >= (pow(10, 5) - 1)) {
 			$num = $max + 1; // If counter > 99999, we do not format on 5 chars, we take number as it is
 		} else {
-			$num = sprintf("%05s", $max + 1);
+			$num = sprintf("%05d", $max + 1);
 		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
index a270b7d8842..57e7f238fc2 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009  Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -157,7 +158,7 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1;
 		} else { // If counter > 9999, we do not format on 4 chars, we take number as it is
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_stocktransfer_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 9a197b31aad..68b728b839c 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2013-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -214,7 +215,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max);
+				$num = sprintf("%04d", $max);
 			}
 
 			$ref = '';
@@ -242,7 +243,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max + 1);
+				$num = sprintf("%04d", $max + 1);
 			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index cd6d9f78d0e..bb9441afc34 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -166,7 +167,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index dba6eefb6b4..30f323ecc81 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -155,7 +156,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index b71d9581a53..ad61e3a55b2 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -157,7 +158,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 1629d0e779d..7ac31b4929e 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2020      Open-DSI	            <support@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -166,7 +167,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max);
+				$num = sprintf("%04d", $max);
 			}
 
 			$ref = '';
@@ -194,7 +195,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 			if ($max >= (pow(10, 4) - 1)) {
 				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 			} else {
-				$num = sprintf("%04s", $max + 1);
+				$num = sprintf("%04d", $max + 1);
 			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 3d0c057870d..8c476eb91a7 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2012   Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010        Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -156,7 +157,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
 			$num = $max + 1;
 		} else {
 			// If counter > 9999, we do not format on 4 chars, we take number as it is
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_ticket_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
index d5d6c40e459..c68952f36a6 100644
--- a/htdocs/core/modules/workstation/mod_workstation_standard.php
+++ b/htdocs/core/modules/workstation/mod_workstation_standard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020 	   Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -146,7 +147,7 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_workstation_standard::getNextValue return ".$this->prefix."-".$num);
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
index 3d509d7d25c..c4652df83b1 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -154,7 +155,7 @@ class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_knowledgerecord_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
index 92c39356a7f..9dd883cd2fb 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -154,7 +155,7 @@ class mod_partnership_standard extends ModeleNumRefPartnership
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_partnership_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 1fe8ae87fa5..7d387457b23 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2020-2021	Open-DSI                <support@open-dsi.fr>
  * Copyright (C) 2022		Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2020-2023	Alexandre Spangaro      <aspangaro@easya.solutions>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -296,7 +297,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		} else {
 			$labelp = $langs->transnoentitiesnoconv("SellingPrice")." ".$i;
 		}
-		$arrayfields['p.sellprice'.$i] = array('label' => $labelp, 'checked' => ($i == 1 ? 1 : 0), 'enabled' => getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => (float) ('40.'.sprintf('%03s', $i)));
+		$arrayfields['p.sellprice'.$i] = array('label' => $labelp, 'checked' => ($i == 1 ? 1 : 0), 'enabled' => getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => (float) ('40.'.sprintf('%03d', $i)));
 		$arraypricelevel[$i] = array($i);
 	}
 }
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
index 6a7b4d8c510..cb46d8323df 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -155,7 +156,7 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_recruitmentcandidature_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
index 50c2ab775e7..e95cfbb2ee8 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -155,7 +156,7 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 		if ($max >= (pow(10, 4) - 1)) {
 			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
 		} else {
-			$num = sprintf("%04s", $max + 1);
+			$num = sprintf("%04d", $max + 1);
 		}
 
 		dol_syslog("mod_recruitmentjobposition_standard::getNextValue return ".$this->prefix.$yymm."-".$num);

From d8e1bf8844af76f244986ebcdaef35a321a01938 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 23:23:38 +0100
Subject: [PATCH 1378/1862] Clean var

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

diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 7c02a2c53f4..4708d12e929 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -272,3 +272,13 @@ $sessionname = 'DOLSESSID_'.$prefix;
 
 $_COOKIE[$sessionname] = 'obfuscatedcookie';
 unset($conf->file->instance_unique_id);
+
+unset($dolibarr_main_instance_unique_id);
+unset($dolibarr_main_db_host);
+unset($dolibarr_main_db_port);
+unset($dolibarr_main_db_name);
+unset($dolibarr_main_db_user);
+unset($dolibarr_main_db_pass);
+unset($$dolibarr_main_db_type);
+unset($dolibarr_main_document_root);
+unset($dolibarr_main_document_root_alt);

From ab7879c4a23bc2721f38e86ebdac3449adc1db8d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:34:43 +0100
Subject: [PATCH 1379/1862] Fix & enable PhanPluginPHPDocInWrongComment

# Fix & enable PhanPluginPHPDocInWrongComment

Ignore error in file where the notification occurs & enable detection.
---
 dev/tools/phan/config.php             | 2 +-
 htdocs/core/class/rssparser.class.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 0a2622ba150..acafc7e1904 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -530,7 +530,7 @@ return [
 		'PhanNoopBinaryOperator',
 		// 'PhanTypeInvalidBitwiseBinaryOperator',
 		// 'PhanPluginDescriptionlessCommentOnFunction',
-		'PhanPluginPHPDocInWrongComment',
+		// 'PhanPluginPHPDocInWrongComment',
 		'PhanRedefineClassInternal',
 		// 'PhanTypeInvalidThrowsIsInterface',
 		// 'PhanPluginRedundantAssignmentInLoop',
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index b041710ab4a..057cab3ff7d 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -22,6 +22,8 @@
  *      \brief      File of class to parse RSS feeds
  */
 
+// @phan-file-suppress PhanPluginPHPDocInWrongComment
+
 /**
  * 	Class to parse RSS files
  */
@@ -805,7 +807,6 @@ class RssParser
 	}
 }
 
-// @phan-suppress PhanPluginPHPDocInWrongComment
 /*
  * A method for the xml_set_external_entity_ref_handler()
  *

From fd4fa05313bd3dc91f4a7b04669f06fd7b0e9dea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 23:39:16 +0100
Subject: [PATCH 1380/1862] FIX #yogosha21416

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 0d501e63cdc..dfd78b08cd6 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2018   Pierre Chéné            <pierre.chene44@gmail.com>
- * Copyright (C) 2019   Cedric Ancelin          <icedo.anc@gmail.com>
- * Copyright (C) 2020-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2023       Alexandre Janniaux  <alexandre.janniaux@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2015   	Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2018   	Pierre Chéné            <pierre.chene44@gmail.com>
+ * Copyright (C) 2019   	Cedric Ancelin          <icedo.anc@gmail.com>
+ * Copyright (C) 2020-2024  Frédéric France     	<frederic.france@free.fr>
+ * Copyright (C) 2023       Alexandre Janniaux  	<alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.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
@@ -49,7 +49,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -258,7 +258,7 @@ class Thirdparties extends DolibarrApi
 				continue;
 			}
 
-			$this->company->$field = $value;
+			$this->company->$field = $this->_checkValForAPI($field, $value, $this->company);
 		}
 
 		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
@@ -303,7 +303,7 @@ class Thirdparties extends DolibarrApi
 				continue;
 			}
 
-			$this->company->$field = $value;
+			$this->company->$field = $this->_checkValForAPI($field, $value, $this->company);
 		}
 
 		if (isModEnabled('mailing') && !empty($this->company->email) && isset($this->company->no_email)) {

From 16e5d08b36a2ae8539927a6aac2136323b0a47b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 23:39:16 +0100
Subject: [PATCH 1381/1862] FIX #yogosha21416

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index d01c109e8fb..849b507e517 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2018   Pierre Chéné            <pierre.chene44@gmail.com>
- * Copyright (C) 2019   Cedric Ancelin          <icedo.anc@gmail.com>
- * Copyright (C) 2020-2021  Frédéric France     <frederic.france@netlogic.fr>
- * Copyright (C) 2023       Alexandre Janniaux  <alexandre.janniaux@gmail.com>
+/* Copyright (C) 2015   	Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2018   	Pierre Chéné            <pierre.chene44@gmail.com>
+ * Copyright (C) 2019   	Cedric Ancelin          <icedo.anc@gmail.com>
+ * Copyright (C) 2020-2024  Frédéric France     	<frederic.france@free.fr>
+ * Copyright (C) 2023       Alexandre Janniaux  	<alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.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
@@ -48,7 +49,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -269,7 +270,7 @@ class Thirdparties extends DolibarrApi
 				continue;
 			}
 
-			$this->company->$field = $value;
+			$this->company->$field = $this->_checkValForAPI($field, $value, $this->company);
 		}
 
 		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
@@ -314,7 +315,7 @@ class Thirdparties extends DolibarrApi
 				continue;
 			}
 
-			$this->company->$field = $value;
+			$this->company->$field = $this->_checkValForAPI($field, $value, $this->company);
 		}
 
 		if (isModEnabled('mailing') && !empty($this->company->email) && isset($this->company->no_email)) {

From 7ecf1ac0824070a064ddc9f69a9b8f90f3cf603e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2024 23:43:25 +0100
Subject: [PATCH 1382/1862] Merge

---
 htdocs/core/modules/workstation/mod_workstation_standard.php | 0
 htdocs/core/modules/workstation/modules_workstation.php      | 0
 htdocs/workstation/lib/workstation_workstation.lib.php       | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 htdocs/core/modules/workstation/mod_workstation_standard.php
 mode change 100755 => 100644 htdocs/core/modules/workstation/modules_workstation.php
 mode change 100755 => 100644 htdocs/workstation/lib/workstation_workstation.lib.php

diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/modules/workstation/modules_workstation.php b/htdocs/core/modules/workstation/modules_workstation.php
old mode 100755
new mode 100644
diff --git a/htdocs/workstation/lib/workstation_workstation.lib.php b/htdocs/workstation/lib/workstation_workstation.lib.php
old mode 100755
new mode 100644

From 08ac230dc0d4c3c6432be76e890619eba95e943a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 00:04:18 +0100
Subject: [PATCH 1383/1862] Update projects.lang

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

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index e522a34fd1e..3b0ec6edb3d 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -142,7 +142,7 @@ 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
-ProjectsLinkedToThisThirdParty=Projects linked to that third party thanks to a contact
+ProjectsLinkedToThisThirdParty=Projects having a contact that is a contact of the 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.

From 6d71b4f9c59dbc7e94e83d60c7684b56388dd9b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 00:08:42 +0100
Subject: [PATCH 1384/1862] 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 00e2cd60f04..7557a9d89ce 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1454,7 +1454,7 @@ class FormMail extends Form
 		$out .= '<td>';
 		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="'.$langs->trans("EnterYourAIPromptHere").'..." />';
 		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
-		$out .= '<div id="ai_status_message" class="fieldrequired dispwaitmsg" >'.$langs->trans("AIProcessingPleaseWait").'</div>';
+		$out .= '<div id="ai_status_message" class="fieldrequired hideobject" >'.$langs->trans("AIProcessingPleaseWait").'</div>';
 		$out .= "</td></tr>\n";
 
 		$out .= "<script type='text/javascript'>

From 771e4ffb5ea38bf5bd38a04aba07d945919770bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 00:09:07 +0100
Subject: [PATCH 1385/1862] Update global.inc.php

---
 htdocs/theme/eldy/global.inc.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 36a067e956a..3c87a03153a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3759,9 +3759,6 @@ input.button[name="upload"] {
 input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
 	font-size: 0.8em;
 }
-.dispwaitmsg {
-	display : none;
-}
 input.buttonlink {
 	color: var(--colortextlink);
 	background-color: transparent;

From 3fb6501beaa02a4791cf37a79ec0623ab8229324 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 00:27:09 +0100
Subject: [PATCH 1386/1862] Update contact.class.php

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index be2237a5c72..a12bb616949 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -604,7 +604,7 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		// $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		$this->country_id = ($this->country_id > 0 ? 0 : $this->country_id);
 		if (empty($this->statut)) {
 			$this->statut = 0;
 		}

From 5be98ff240e7f302bab2640c90924dc7e86be374 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:58:46 +0100
Subject: [PATCH 1387/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index f48d80a2abe..7b747238feb 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -320,8 +320,8 @@ class Adherent extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => 1, 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 12, 'index' => 1),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => '1', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 12, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
 		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox' => 1),

From 74c846e11472981b83ac3da495b79c68e2ae7079 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:58:48 +0100
Subject: [PATCH 1388/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/asset/class/asset.class.php | 58 +++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index a915dc1412a..cd323db81e1 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -97,35 +97,35 @@ class Asset extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'noteditable' => '0', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "Reference of object"),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2', 'validate' => '1',),
-		'fk_asset_model' => array('type' => 'integer:AssetModel:asset/class/assetmodel.class.php:1:((status:=:1) and (entity:IN:__SHARED_ENTITIES__))', 'label' => 'AssetModel', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => '1',),
-		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0, 'default' => '1', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'validate' => '1',),
-		'acquisition_type' => array('type' => 'smallint', 'label' => 'AssetAcquisitionType', 'enabled' => '1', 'position' => 60, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetAcquisitionTypeNew', '1' => 'AssetAcquisitionTypeOccasion'), 'validate' => '1',),
-		'asset_type' => array('type' => 'smallint', 'label' => 'AssetType', 'enabled' => '1', 'position' => 70, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetTypeIntangible', '1' => 'AssetTypeTangible', '2' => 'AssetTypeInProgress', '3' => 'AssetTypeFinancial'), 'validate' => '1',),
-		'not_depreciated' => array('type' => 'boolean', 'label' => 'AssetNotDepreciated', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'default' => '0', 'visible' => 1, 'validate' => '1',),
-		'date_acquisition' => array('type' => 'date', 'label' => 'AssetDateAcquisition', 'enabled' => '1', 'position' => 90, 'notnull' => 1, 'visible' => 1,),
-		'date_start' => array('type' => 'date', 'label' => 'AssetDateStart', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => -1,),
-		'acquisition_value_ht' => array('type' => 'price', 'label' => 'AssetAcquisitionValueHT', 'enabled' => '1', 'position' => 110, 'notnull' => 1, 'visible' => 1, 'isameasure' => '1', 'validate' => '1',),
-		'recovered_vat' => array('type' => 'price', 'label' => 'AssetRecoveredVAT', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => 1, 'isameasure' => '1', 'validate' => '1',),
-		'reversal_date' => array('type' => 'date', 'label' => 'AssetReversalDate', 'enabled' => '1', 'position' => 130, 'notnull' => 0, 'visible' => 1,),
-		'reversal_amount_ht' => array('type' => 'price', 'label' => 'AssetReversalAmountHT', 'enabled' => '1', 'position' => 140, 'notnull' => 0, 'visible' => 1, 'isameasure' => '1', 'validate' => '1',),
-		'disposal_date' => array('type' => 'date', 'label' => 'AssetDisposalDate', 'enabled' => '1', 'position' => 200, 'notnull' => 0, 'visible' => -2,),
-		'disposal_amount_ht' => array('type' => 'price', 'label' => 'AssetDisposalAmount', 'enabled' => '1', 'position' => 210, 'notnull' => 0, 'visible' => -2, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
-		'fk_disposal_type' => array('type' => 'sellist:c_asset_disposal_type:label:rowid::active=1', 'label' => 'AssetDisposalType', 'enabled' => '1', 'position' => 220, 'notnull' => 0, 'visible' => -2, 'index' => 1, 'validate' => '1',),
-		'disposal_depreciated' => array('type' => 'boolean', 'label' => 'AssetDisposalDepreciated', 'enabled' => '1', 'position' => 230, 'notnull' => 0, 'default' => '0', 'visible' => -2, 'validate' => '1',),
-		'disposal_subject_to_vat' => array('type' => 'boolean', 'label' => 'AssetDisposalSubjectToVat', 'enabled' => '1', 'position' => 240, 'notnull' => 0, 'default' => '0', 'visible' => -2, 'validate' => '1',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 300, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 301, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'default' => '0', 'visible' => 2, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Canceled'), 'validate' => '1',),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'noteditable' => 0, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => "Reference of object"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2', 'validate' => 1,),
+		'fk_asset_model' => array('type' => 'integer:AssetModel:asset/class/assetmodel.class.php:1:((status:=:1) and (entity:IN:__SHARED_ENTITIES__))', 'label' => 'AssetModel', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => 1,),
+		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 0, 'default' => '1', 'isameasure' => 1, 'css' => 'maxwidth75imp', 'validate' => 1,),
+		'acquisition_type' => array('type' => 'smallint', 'label' => 'AssetAcquisitionType', 'enabled' => 1, 'position' => 60, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetAcquisitionTypeNew', '1' => 'AssetAcquisitionTypeOccasion'), 'validate' => 1,),
+		'asset_type' => array('type' => 'smallint', 'label' => 'AssetType', 'enabled' => 1, 'position' => 70, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetTypeIntangible', '1' => 'AssetTypeTangible', '2' => 'AssetTypeInProgress', '3' => 'AssetTypeFinancial'), 'validate' => 1,),
+		'not_depreciated' => array('type' => 'boolean', 'label' => 'AssetNotDepreciated', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'default' => '0', 'visible' => 1, 'validate' => 1,),
+		'date_acquisition' => array('type' => 'date', 'label' => 'AssetDateAcquisition', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1,),
+		'date_start' => array('type' => 'date', 'label' => 'AssetDateStart', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => -1,),
+		'acquisition_value_ht' => array('type' => 'price', 'label' => 'AssetAcquisitionValueHT', 'enabled' => 1, 'position' => 110, 'notnull' => 1, 'visible' => 1, 'isameasure' => 1, 'validate' => 1,),
+		'recovered_vat' => array('type' => 'price', 'label' => 'AssetRecoveredVAT', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'isameasure' => 1, 'validate' => 1,),
+		'reversal_date' => array('type' => 'date', 'label' => 'AssetReversalDate', 'enabled' => 1, 'position' => 130, 'notnull' => 0, 'visible' => 1,),
+		'reversal_amount_ht' => array('type' => 'price', 'label' => 'AssetReversalAmountHT', 'enabled' => 1, 'position' => 140, 'notnull' => 0, 'visible' => 1, 'isameasure' => 1, 'validate' => 1,),
+		'disposal_date' => array('type' => 'date', 'label' => 'AssetDisposalDate', 'enabled' => 1, 'position' => 200, 'notnull' => 0, 'visible' => -2,),
+		'disposal_amount_ht' => array('type' => 'price', 'label' => 'AssetDisposalAmount', 'enabled' => 1, 'position' => 210, 'notnull' => 0, 'visible' => -2, 'default' => '0', 'isameasure' => 1, 'validate' => 1,),
+		'fk_disposal_type' => array('type' => 'sellist:c_asset_disposal_type:label:rowid::active=1', 'label' => 'AssetDisposalType', 'enabled' => 1, 'position' => 220, 'notnull' => 0, 'visible' => -2, 'index' => 1, 'validate' => 1,),
+		'disposal_depreciated' => array('type' => 'boolean', 'label' => 'AssetDisposalDepreciated', 'enabled' => 1, 'position' => 230, 'notnull' => 0, 'default' => '0', 'visible' => -2, 'validate' => 1,),
+		'disposal_subject_to_vat' => array('type' => 'boolean', 'label' => 'AssetDisposalSubjectToVat', 'enabled' => 1, 'position' => 240, 'notnull' => 0, 'default' => '0', 'visible' => -2, 'validate' => 1,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 300, 'notnull' => 0, 'visible' => 0, 'validate' => 1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 301, 'notnull' => 0, 'visible' => 0, 'validate' => 1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '0', 'visible' => 2, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Canceled'), 'validate' => 1,),
 	);
 	public $rowid;
 	public $ref;

From dfd1dfff9c64295cc0361046c6fb4302413aea06 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:58:50 +0100
Subject: [PATCH 1389/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/asset/class/assetmodel.class.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 8315231fd76..b5124a52222 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -103,18 +103,18 @@ class AssetModel extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1'),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2', 'validate' => '1',),
-		'asset_type' => array('type' => 'smallint', 'label' => 'AssetType', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetTypeIntangible', '1' => 'AssetTypeTangible', '2' => 'AssetTypeInProgress', '3' => 'AssetTypeFinancial'), 'validate' => '1',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 300, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 301, 'notnull' => 0, 'visible' => 0, 'validate' => '1',),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'default' => '1', 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Enabled', '9' => 'Disabled'), 'validate' => '1',),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2', 'validate' => 1,),
+		'asset_type' => array('type' => 'smallint', 'label' => 'AssetType', 'enabled' => 1, 'position' => 40, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'AssetTypeIntangible', '1' => 'AssetTypeTangible', '2' => 'AssetTypeInProgress', '3' => 'AssetTypeFinancial'), 'validate' => 1,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 300, 'notnull' => 0, 'visible' => 0, 'validate' => 1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 301, 'notnull' => 0, 'visible' => 0, 'validate' => 1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '1', 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Enabled', '9' => 'Disabled'), 'validate' => 1,),
 	);
 	public $rowid;
 	public $ref;

From bac86158c637059827f62643d162b6b04816d1e0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:58:52 +0100
Subject: [PATCH 1390/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/bom/class/bom.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index fda5dd93eeb..151ff183f1f 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -116,13 +116,13 @@ class BOM extends CommonObject
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'default' => 1, 'index' => 1, 'position' => 5),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'noteditable' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of BOM", 'showoncombobox' => '1', 'csslist' => 'nowraponall'),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'noteditable' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of BOM", 'showoncombobox' => 1, 'csslist' => 'nowraponall'),
 		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'notnull' => 1, 'searchall' => 1, 'showoncombobox' => '2', 'autofocusoncreate' => 1, 'css' => 'minwidth300 maxwidth400', 'csslist' => 'tdoverflowmax200'),
 		'bomtype' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'position' => 33, 'notnull' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'Manufacturing', 1 => 'Disassemble'), 'css' => 'minwidth175', 'csslist' => 'minwidth175 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
 		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:1:((finished:is:null) or (finished:!=:0))', 'label' => 'Product', 'picto' => 'product', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'help' => 'ProductBOMHelp', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 60, 'notnull' => -1,),
-		'qty' => array('type' => 'real', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'default' => 1, 'position' => 55, 'notnull' => 1, 'isameasure' => '1', 'css' => 'maxwidth50imp right'),
+		'qty' => array('type' => 'real', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'default' => 1, 'position' => 55, 'notnull' => 1, 'isameasure' => 1, 'css' => 'maxwidth50imp right'),
 		//'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLossForProductProduced'),
 		'duration' => array('type' => 'duration', 'label' => 'EstimatedDuration', 'enabled' => 1, 'visible' => -1, 'position' => 101, 'notnull' => -1, 'css' => 'maxwidth50imp', 'help' => 'EstimatedDurationDesc'),
 		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label' => 'WarehouseForProduction', 'picto' => 'stock', 'enabled' => 1, 'visible' => -1, 'position' => 102, 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
@@ -1722,12 +1722,12 @@ class BOMLine extends CommonObjectLine
 		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => 1, 'visible' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1,),
 		'fk_bom_child' => array('type' => 'integer:BOM:bom/class/bom.class.php', 'label' => 'BillOfMaterials', 'enabled' => 1, 'visible' => -1, 'position' => 40, 'notnull' => -1,),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 60, 'notnull' => -1,),
-		'qty' => array('type' => 'double(24,8)', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'position' => 100, 'notnull' => 1, 'isameasure' => '1',),
-		'qty_frozen' => array('type' => 'smallint', 'label' => 'QuantityFrozen', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 105, 'css' => 'maxwidth50imp', 'help' => 'QuantityConsumedInvariable'),
-		'disable_stock_change' => array('type' => 'smallint', 'label' => 'DisableStockChange', 'enabled' => 1, 'visible' => 1, 'default' => 0, 'position' => 108, 'css' => 'maxwidth50imp', 'help' => 'DisableStockChangeHelp'),
-		'efficiency' => array('type' => 'double(24,8)', 'label' => 'ManufacturingEfficiency', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'position' => 110, 'notnull' => 1, 'css' => 'maxwidth50imp', 'help' => 'ValueOfEfficiencyConsumedMeans'),
+		'qty' => array('type' => 'double(24,8)', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'position' => 100, 'notnull' => 1, 'isameasure' => 1,),
+		'qty_frozen' => array('type' => 'smallint', 'label' => 'QuantityFrozen', 'enabled' => 1, 'visible' => 1, 'default' => '0', 'position' => 105, 'css' => 'maxwidth50imp', 'help' => 'QuantityConsumedInvariable'),
+		'disable_stock_change' => array('type' => 'smallint', 'label' => 'DisableStockChange', 'enabled' => 1, 'visible' => 1, 'default' => '0', 'position' => 108, 'css' => 'maxwidth50imp', 'help' => 'DisableStockChangeHelp'),
+		'efficiency' => array('type' => 'double(24,8)', 'label' => 'ManufacturingEfficiency', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'position' => 110, 'notnull' => 1, 'css' => 'maxwidth50imp', 'help' => 'ValueOfEfficiencyConsumedMeans'),
 		'fk_unit' => array('type' => 'integer', 'label' => 'Unit', 'enabled' => 1, 'visible' => 1, 'position' => 120, 'notnull' => -1,),
-		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => 0, 'position' => 200, 'notnull' => 1,),
+		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => '0', 'position' => 200, 'notnull' => 1,),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
 		'fk_default_workstation' => array('type' => 'integer', 'label' => 'DefaultWorkstation', 'enabled' => 1, 'visible' => 1, 'notnull' => 0, 'position' => 1050)
 	);

From 3bf6bfbf34af19ea61b5572daaf5b3ce76398491 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 02:30:20 +0100
Subject: [PATCH 1391/1862] Fix ContactTest::testContactUpdate

# ContactTest::testContactUpdate

Fix bug introduced in b2cbf7fe3c5..3fb6501beaa
---
 htdocs/contact/class/contact.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index a12bb616949..7ba67557e6b 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -604,7 +604,7 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		$this->country_id = ($this->country_id > 0 ? 0 : $this->country_id);
+		$this->country_id = empty($this->country_id) || $this->country_id < 0 ? 0 : $this->country_id;
 		if (empty($this->statut)) {
 			$this->statut = 0;
 		}

From 614994ec0b4fe3fcefbfa11c6e12bc60a9bee0e5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:58:54 +0100
Subject: [PATCH 1392/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index c131598facf..7011ad5d5b8 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -115,25 +115,25 @@ class Availabilities extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 20, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'cssview' => 'wordbreak', 'help' => "BookcalLabelAvailabilityHelp", 'showoncombobox' => '2', 'validate' => '1',),
-		'fk_bookcal_calendar' => array('type' => 'integer:Calendar:bookcal/class/calendar.class.php:1', 'label' => 'Calendar', 'enabled' => '1', 'position' => 25, 'notnull' => 1, 'visible' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax100'),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => '1',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'start' => array('type' => 'date', 'label' => 'Start Date', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'searchall' => 1,),
-		'end' => array('type' => 'date', 'label' => 'End Date', 'enabled' => '1', 'position' => 45, 'notnull' => 1, 'visible' => 1, 'searchall' => 1,),
-		'duration' => array('type' => 'integer', 'label' => 'DurationOfRange', 'enabled' => '1', 'position' => 47, 'notnull' => 1, 'visible' => 1, 'default' => '30', 'css' => 'width50 right'),
-		'startHour' => array('type' => 'integer', 'label' => 'Start Hour', 'enabled' => '1', 'position' => 46, 'notnull' => 1, 'visible' => 1,),
-		'endHour' => array('type' => 'integer', 'label' => 'End Hour', 'enabled' => '1', 'position' => 46.5, 'notnull' => 1, 'visible' => 1,),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Closed'), 'default' => 1, 'validate' => '1'),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 20, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'cssview' => 'wordbreak', 'help' => "BookcalLabelAvailabilityHelp", 'showoncombobox' => 2, 'validate' => 1,),
+		'fk_bookcal_calendar' => array('type' => 'integer:Calendar:bookcal/class/calendar.class.php:1', 'label' => 'Calendar', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax100'),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => 1,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'start' => array('type' => 'date', 'label' => 'Start Date', 'enabled' => 1, 'position' => 40, 'notnull' => 1, 'visible' => 1, 'searchall' => 1,),
+		'end' => array('type' => 'date', 'label' => 'End Date', 'enabled' => 1, 'position' => 45, 'notnull' => 1, 'visible' => 1, 'searchall' => 1,),
+		'duration' => array('type' => 'integer', 'label' => 'DurationOfRange', 'enabled' => 1, 'position' => 47, 'notnull' => 1, 'visible' => 1, 'default' => '30', 'css' => 'width50 right'),
+		'startHour' => array('type' => 'integer', 'label' => 'Start Hour', 'enabled' => 1, 'position' => 46, 'notnull' => 1, 'visible' => 1,),
+		'endHour' => array('type' => 'integer', 'label' => 'End Hour', 'enabled' => 1, 'position' => 46.5, 'notnull' => 1, 'visible' => 1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'position' => 2000, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Closed'), 'default' => '1', 'validate' => 1),
 	);
 	public $rowid;
 	public $label;

From 3981f2ec3f03a6ce81ce37e955466ef9cd11e23d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:58:56 +0100
Subject: [PATCH 1393/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/bookcal/class/calendar.class.php | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index f4777bfa003..923e19b973c 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -115,22 +115,22 @@ class Calendar extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'right', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "Reference of object", 'css' => 'width100'),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'alwayseditable' => '1', 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1',),
-		'visibility' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Owner', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'picto' => 'user', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
-		'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => '1', 'position' => 42, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'Customer', '1' => 'Supplier', '3' => 'Other'),),
-		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 'isModEnabled("societe")', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150', 'help' => "ThirdPartyBookCalHelp", 'validate' => '1',),
-		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'picto' => 'project', 'enabled' => 'isModEnabled("project")', 'position' => 52, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150', 'validate' => '1',),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => '1',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax150',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax150',),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'default' => 0, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Closed'), 'validate' => '1',),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'right', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => "Reference of object", 'css' => 'width100'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 1, 'alwayseditable' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,),
+		'visibility' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Owner', 'enabled' => 1, 'position' => 40, 'notnull' => 1, 'visible' => 1, 'picto' => 'user', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'position' => 42, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('0' => 'Customer', '1' => 'Supplier', '3' => 'Other'),),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 'isModEnabled("societe")', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150', 'help' => "ThirdPartyBookCalHelp", 'validate' => 1,),
+		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'picto' => 'project', 'enabled' => 'isModEnabled("project")', 'position' => 52, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150', 'validate' => 1,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => 1,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'picto' => 'user', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax150',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'picto' => 'user', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax150',),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'position' => 2000, 'notnull' => 1, 'default' => '0', 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Closed'), 'validate' => 1,),
 	);
 	public $rowid;
 	public $ref;

From 803249fc3bf35c080ed4637396073c00b18843ac Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:44 +0100
Subject: [PATCH 1394/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index cf86e744f70..a85489dd251 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -86,7 +86,7 @@ class ActionCommReminder extends CommonObject
 		'fk_user' => array('type' => 'integer', 'label' => 'User', 'visible' => -1, 'enabled' => 1, 'position' => 65, 'notnull' => 1, 'index' => 1,),
 		'offsetvalue' => array('type' => 'integer', 'label' => 'OffsetValue', 'visible' => 1, 'enabled' => 1, 'position' => 56, 'notnull' => 1,),
 		'offsetunit' => array('type' => 'varchar(1)', 'label' => 'OffsetUnit', 'visible' => 1, 'enabled' => 1, 'position' => 57, 'notnull' => 1, 'comment' => "y, m, d, w, h, i",),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 58, 'notnull' => 1, 'default' => 0, 'index' => 0, 'arrayofkeyval' => array('0' => 'ToDo', '1' => 'Done')),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'visible' => 1, 'enabled' => 1, 'position' => 58, 'notnull' => 1, 'default' => '0', 'index' => 0, 'arrayofkeyval' => array('0' => 'ToDo', '1' => 'Done')),
 		'lasterror' => array('type' => 'varchar(128)', 'label' => 'LastError', 'visible' => -1, 'enabled' => 1, 'position' => 59, 'index' => 0),
 		'fk_actioncomm' => array('type' => 'integer', 'label' => 'Project', 'visible' => 1, 'enabled' => 1, 'position' => 70, 'notnull' => 1, 'index' => 1,),
 		'fk_email_template' => array('type' => 'integer', 'label' => 'EmailTemplate', 'visible' => 1, 'enabled' => 1, 'position' => 80, 'notnull' => 0),

From 00e65bb09d31a98b4e7b9d743138599b4800ecbb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:46 +0100
Subject: [PATCH 1395/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 00311e60480..74297cb8da1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -312,7 +312,7 @@ class Propal extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 20),
 		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 22),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 40),

From 5263bc81dce80e5817e47f60b1e4bd2746aeea31 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:48 +0100
Subject: [PATCH 1396/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 0929345915b..2e7df64469b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -301,7 +301,7 @@ class Commande extends CommonOrder
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
 		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 25),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 26),
 		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 28),

From c27a93401ceeae8d0d27a8f7e8bc06ce2d028601 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:50 +0100
Subject: [PATCH 1397/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e871b6dd754..30df1f264b1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -318,7 +318,7 @@ class Account extends CommonObject
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'ref' => array('type' => 'varchar(12)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 25),
 		'label' => array('type' => 'varchar(30)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 35, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 35, 'index' => 1),
 		'bank' => array('type' => 'varchar(60)', 'label' => 'Bank', 'enabled' => 1, 'visible' => -1, 'position' => 40),
 		'code_banque' => array('type' => 'varchar(128)', 'label' => 'Code banque', 'enabled' => 1, 'visible' => -1, 'position' => 45),
 		'code_guichet' => array('type' => 'varchar(6)', 'label' => 'Code guichet', 'enabled' => 1, 'visible' => -1, 'position' => 50),

From b7b05d4d49058883b12f51d30a034f36f2e47845 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:52 +0100
Subject: [PATCH 1398/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index e48c0d52c5e..a260028394a 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -177,7 +177,7 @@ class FactureRec extends CommonInvoice
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'titre' => array('type' => 'varchar(100)', 'label' => 'Titre', 'enabled' => 1, 'showoncombobox' => 1, 'visible' => -1, 'position' => 15),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 25),
 		'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 35),

From e7fde26b0f0a8f03f7310b87a14535b69fafb558 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:54 +0100
Subject: [PATCH 1399/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 31852eecb70..49fb76c1cd1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -296,7 +296,7 @@ class Facture extends CommonInvoice
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 1),
 		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 5),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1),
 		'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 10),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 12),
 		'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15),

From cdc3eee53016891dc7673f040c2dc66a0c3a40ed Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:10:56 +0100
Subject: [PATCH 1400/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/bonprelevement.class.php            | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0194541b801..4271f0c962e 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -148,20 +148,20 @@ class BonPrelevement extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
-		'ref' => array('type' => 'varchar(12)', 'label' => 'Ref', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax150', 'showoncombobox' => '1',),
-		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 25, 'notnull' => 0, 'visible' => -1,),
-		'amount' => array('type' => 'double(24,8)', 'label' => 'Amount', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => -1,),
-		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => '1', 'position' => 500, 'notnull' => 0, 'visible' => -1, 'arrayofkeyval' => array(0 => 'Wait', 1 => 'Transfered', 2 => 'Credited')),
-		'credite' => array('type' => 'smallint(6)', 'label' => 'Credite', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => -1,),
-		'note' => array('type' => 'text', 'label' => 'Note', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => -1,),
-		'date_trans' => array('type' => 'datetime', 'label' => 'Datetrans', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => -1,),
-		'method_trans' => array('type' => 'smallint(6)', 'label' => 'Methodtrans', 'enabled' => '1', 'position' => 55, 'notnull' => 0, 'visible' => -1,),
-		'fk_user_trans' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusertrans', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
-		'date_credit' => array('type' => 'datetime', 'label' => 'Datecredit', 'enabled' => '1', 'position' => 65, 'notnull' => 0, 'visible' => -1,),
-		'fk_user_credit' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusercredit', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
-		'type' => array('type' => 'varchar(16)', 'label' => 'Type', 'enabled' => '1', 'position' => 75, 'notnull' => 0, 'visible' => -1,),
-		'fk_bank_account' => array('type' => 'integer', 'label' => 'Fkbankaccount', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 0,),
+		'ref' => array('type' => 'varchar(12)', 'label' => 'Ref', 'enabled' => 1, 'position' => 15, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax150', 'showoncombobox' => 1,),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 25, 'notnull' => 0, 'visible' => -1,),
+		'amount' => array('type' => 'double(24,8)', 'label' => 'Amount', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => -1,),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'position' => 500, 'notnull' => 0, 'visible' => -1, 'arrayofkeyval' => array(0 => 'Wait', 1 => 'Transfered', 2 => 'Credited')),
+		'credite' => array('type' => 'smallint(6)', 'label' => 'Credite', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1,),
+		'note' => array('type' => 'text', 'label' => 'Note', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => -1,),
+		'date_trans' => array('type' => 'datetime', 'label' => 'Datetrans', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => -1,),
+		'method_trans' => array('type' => 'smallint(6)', 'label' => 'Methodtrans', 'enabled' => 1, 'position' => 55, 'notnull' => 0, 'visible' => -1,),
+		'fk_user_trans' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusertrans', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'date_credit' => array('type' => 'datetime', 'label' => 'Datecredit', 'enabled' => 1, 'position' => 65, 'notnull' => 0, 'visible' => -1,),
+		'fk_user_credit' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusercredit', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+		'type' => array('type' => 'varchar(16)', 'label' => 'Type', 'enabled' => 1, 'position' => 75, 'notnull' => 0, 'visible' => -1,),
+		'fk_bank_account' => array('type' => 'integer', 'label' => 'Fkbankaccount', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
 	);
 	public $rowid;
 	public $ref;

From e21600cb5053a5c89c918bfb2428227635a042af Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:31 +0100
Subject: [PATCH 1401/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index a12bb616949..05c12e15c24 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -102,7 +102,7 @@ class Contact extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 30, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 30, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 3, 'position' => 35),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => 3, 'position' => 40),
 		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 45, 'showoncombobox' => 1, 'searchall' => 1),

From 27fc56c70adb3f65cd68ff44484afcbd47cd1c8d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:33 +0100
Subject: [PATCH 1402/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index bc9964d2d33..7371e619dee 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -251,7 +251,7 @@ class Contrat extends CommonObject
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'ref_customer' => array('type' => 'varchar(50)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 25, 'searchall' => 1),
 		'ref_supplier' => array('type' => 'varchar(50)', 'label' => 'RefSupplier', 'enabled' => 1, 'visible' => -1, 'position' => 26, 'searchall' => 1),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 40),
 		'date_contrat' => array('type' => 'datetime', 'label' => 'Date contrat', 'enabled' => 1, 'visible' => -1, 'position' => 45),
@@ -3110,7 +3110,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
 		'qty' => array('type' => 'integer', 'label' => 'Quantity', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 35, 'isameasure' => 1),
 		'total_ht' => array('type' => 'integer', 'label' => 'AmountHT', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 36, 'isameasure' => 1),
@@ -3129,7 +3129,7 @@ class ContratLigne extends CommonObjectLine
 		'fk_user_ouverture' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserStartingService', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 135),
 		'fk_user_cloture' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserClosingService', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 135),
 		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'position' => 500, 'arrayofkeyval' => array(0 => 'Draft', 4 => 'Open', 5 => 'Closed')),
-		'rang' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'position' => 500, 'default' => 0)
+		'rang' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'position' => 500, 'default' => '0')
 	);
 	// END MODULEBUILDER PROPERTIES
 

From 27dfa334d00d045ec1ffcc987febccbb3c66133a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:35 +0100
Subject: [PATCH 1403/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index de216b0c47c..c0c4486cc4b 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -91,7 +91,7 @@ class DefaultValues extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'type' => array('type' => 'varchar(10)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'position' => 20),
 		'user_id' => array('type' => 'integer', 'label' => 'Userid', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
 		'page' => array('type' => 'varchar(255)', 'label' => 'RelativeURL', 'enabled' => 1, 'visible' => -1, 'position' => 30),

From 1e5dd2f209215a4dc104b4be935d024d6406f3c5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:37 +0100
Subject: [PATCH 1404/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/core/class/timespent.class.php | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 67e8c9fad48..f4c2a452921 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -115,24 +115,24 @@ class TimeSpent extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 17, 'notnull' => 0, 'visible' => -2,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'import_key', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1,),
-		'fk_element' => array('type' => 'integer', 'label' => 'fk_element', 'enabled' => '1', 'position' => 2, 'notnull' => 1, 'visible' => -1,),
-		'elementtype' => array('type' => 'varchar(32)', 'label' => 'elementtype', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => -1,),
-		'element_date' => array('type' => 'date', 'label' => 'element_date', 'enabled' => '1', 'position' => 4, 'notnull' => 0, 'visible' => -1,),
-		'element_datehour' => array('type' => 'datetime', 'label' => 'element_datehour', 'enabled' => '1', 'position' => 5, 'notnull' => 0, 'visible' => -1,),
-		'element_date_withhour' => array('type' => 'integer', 'label' => 'element_date_withhour', 'enabled' => '1', 'position' => 6, 'notnull' => 0, 'visible' => -1,),
-		'element_duration' => array('type' => 'double', 'label' => 'element_duration', 'enabled' => '1', 'position' => 7, 'notnull' => 0, 'visible' => -1,),
-		'fk_product' => array('type' => 'integer', 'label' => 'fk_product', 'enabled' => '1', 'position' => 8, 'notnull' => 0, 'visible' => -1,),
-		'fk_user' => array('type' => 'integer', 'label' => 'fk_user', 'enabled' => '1', 'position' => 9, 'notnull' => 0, 'visible' => -1,),
-		'thm' => array('type' => 'double(24,8)', 'label' => 'thm', 'enabled' => '1', 'position' => 10, 'notnull' => 0, 'visible' => -1,),
-		'invoice_id' => array('type' => 'integer', 'label' => 'invoice_id', 'enabled' => '1', 'position' => 11, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
-		'invoice_line_id' => array('type' => 'integer', 'label' => 'invoice_line_id', 'enabled' => '1', 'position' => 12, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
-		'intervention_id' => array('type' => 'integer', 'label' => 'intervention_id', 'enabled' => '1', 'position' => 13, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
-		'intervention_line_id' => array('type' => 'integer', 'label' => 'intervention_line_id', 'enabled' => '1', 'position' => 14, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
-		'datec' => array('type' => 'datetime', 'label' => 'datec', 'enabled' => '1', 'position' => 16, 'notnull' => 0, 'visible' => -1,),
-		'note' => array('type' => 'text', 'label' => 'note', 'enabled' => '1', 'position' => 18, 'notnull' => 0, 'visible' => -1,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 17, 'notnull' => 0, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'import_key', 'enabled' => 1, 'position' => 15, 'notnull' => 0, 'visible' => -1,),
+		'fk_element' => array('type' => 'integer', 'label' => 'fk_element', 'enabled' => 1, 'position' => 2, 'notnull' => 1, 'visible' => -1,),
+		'elementtype' => array('type' => 'varchar(32)', 'label' => 'elementtype', 'enabled' => 1, 'position' => 3, 'notnull' => 1, 'visible' => -1,),
+		'element_date' => array('type' => 'date', 'label' => 'element_date', 'enabled' => 1, 'position' => 4, 'notnull' => 0, 'visible' => -1,),
+		'element_datehour' => array('type' => 'datetime', 'label' => 'element_datehour', 'enabled' => 1, 'position' => 5, 'notnull' => 0, 'visible' => -1,),
+		'element_date_withhour' => array('type' => 'integer', 'label' => 'element_date_withhour', 'enabled' => 1, 'position' => 6, 'notnull' => 0, 'visible' => -1,),
+		'element_duration' => array('type' => 'double', 'label' => 'element_duration', 'enabled' => 1, 'position' => 7, 'notnull' => 0, 'visible' => -1,),
+		'fk_product' => array('type' => 'integer', 'label' => 'fk_product', 'enabled' => 1, 'position' => 8, 'notnull' => 0, 'visible' => -1,),
+		'fk_user' => array('type' => 'integer', 'label' => 'fk_user', 'enabled' => 1, 'position' => 9, 'notnull' => 0, 'visible' => -1,),
+		'thm' => array('type' => 'double(24,8)', 'label' => 'thm', 'enabled' => 1, 'position' => 10, 'notnull' => 0, 'visible' => -1,),
+		'invoice_id' => array('type' => 'integer', 'label' => 'invoice_id', 'enabled' => 1, 'position' => 11, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'invoice_line_id' => array('type' => 'integer', 'label' => 'invoice_line_id', 'enabled' => 1, 'position' => 12, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'intervention_id' => array('type' => 'integer', 'label' => 'intervention_id', 'enabled' => 1, 'position' => 13, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'intervention_line_id' => array('type' => 'integer', 'label' => 'intervention_line_id', 'enabled' => 1, 'position' => 14, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+		'datec' => array('type' => 'datetime', 'label' => 'datec', 'enabled' => 1, 'position' => 16, 'notnull' => 0, 'visible' => -1,),
+		'note' => array('type' => 'text', 'label' => 'note', 'enabled' => 1, 'position' => 18, 'notnull' => 0, 'visible' => -1,),
 	);
 	public $rowid;
 	public $import_key;

From efdbe83dab586a492b3f14aeae52ac7f4d5d4283 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:39 +0100
Subject: [PATCH 1405/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 10d937cd866..251281d91d9 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -93,7 +93,7 @@ class EmailCollectorFilter extends CommonObject
 		'fk_user_creat' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'position' => 510, 'notnull' => 1, 'foreignkey' => 'llx_user.rowid',),
 		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'position' => 511, 'notnull' => -1,),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 1000, 'notnull' => 1, 'default' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled')),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '1', 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled')),
 	);
 	public $rowid;
 	public $fk_emailcollector;

From cfdf2087ae09882231f6d56809737fc1f23ee80d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:41 +0100
Subject: [PATCH 1406/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/conferenceorbooth.class.php         | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index e46a547045b..598f0b16791 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -115,22 +115,22 @@ class ConferenceOrBooth extends ActionComm
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'integer', 'label' => 'Ref', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'help' => "OrganizationEvenLabelName", 'showoncombobox' => '1', 'autofocusoncreate' => 1),
+		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'integer', 'label' => 'Ref', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'help' => "OrganizationEvenLabelName", 'showoncombobox' => 1, 'autofocusoncreate' => 1),
 		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(t.usage_organize_event:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'position' => 52, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '$conf->societe->enabled', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'help' => "OrganizationEventLinkToThirdParty", 'picto' => 'company', 'csslist' => 'tdoverflowmax100', 'css' => 'maxwidth500'),
-		'note' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3),
-		'fk_action' => array('type' => "sellist:c_actioncomm:libelle:id::(module:LIKE:'%@eventorganization')", 'label' => 'Format', 'enabled' => '1', 'position' => 60, 'notnull' => 1, 'visible' => 1, 'css' => 'width100', 'csslist' => 'tdoverflowmax100'),
-		'datep' => array('type' => 'datetime', 'label' => 'DateStart', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '2',),
-		'datep2' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '3',),
-		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
-		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
-		'num_vote' => array('type' => 'smallint', 'label' => 'NbVotes', 'enabled' => '1', 'position' => 800, 'notnull' => -1, 'visible' => 5, 'default' => '0', 'index' => 0),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'EvntOrgDraft', '1' => 'EvntOrgSuggested', '2' => 'EvntOrgConfirmed', '3' => 'EvntOrgNotQualified', '4' => 'EvntOrgDone', '9' => 'EvntOrgCancelled'),),
+		'note' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3),
+		'fk_action' => array('type' => "sellist:c_actioncomm:libelle:id::(module:LIKE:'%@eventorganization')", 'label' => 'Format', 'enabled' => 1, 'position' => 60, 'notnull' => 1, 'visible' => 1, 'css' => 'width100', 'csslist' => 'tdoverflowmax100'),
+		'datep' => array('type' => 'datetime', 'label' => 'DateStart', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '2',),
+		'datep2' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'position' => 71, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '3',),
+		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
+		'num_vote' => array('type' => 'smallint', 'label' => 'NbVotes', 'enabled' => 1, 'position' => 800, 'notnull' => -1, 'visible' => 5, 'default' => '0', 'index' => 0),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'EvntOrgDraft', '1' => 'EvntOrgSuggested', '2' => 'EvntOrgConfirmed', '3' => 'EvntOrgNotQualified', '4' => 'EvntOrgDone', '9' => 'EvntOrgCancelled'),),
 	);
 	public $rowid;
 	public $id;

From c8640321e8074dbe56900a2c63f96dbda972afa4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:43 +0100
Subject: [PATCH 1407/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 02fcb8b350f..9ec2a5b78e0 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -103,29 +103,29 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'comment' => "Reference of object"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'comment' => "Reference of object"),
 		//'fk_actioncomm' => array('type'=>'integer:ActionComm:comm/action/class/actioncomm.class.php:1', 'label'=>'ConferenceOrBooth', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'picto'=>'agenda'),
 		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'position' => 20, 'notnull' => 1, 'visible' => 0, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'email' => array('type' => 'mail', 'label' => 'EmailAttendee', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'autofocusoncreate' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax150'),
-		'firstname' => array('type' => 'varchar(100)', 'label' => 'Firstname', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125'),
-		'lastname' => array('type' => 'varchar(100)', 'label' => 'Lastname', 'enabled' => '1', 'position' => 32, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125'),
+		'email' => array('type' => 'mail', 'label' => 'EmailAttendee', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'autofocusoncreate' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax150'),
+		'firstname' => array('type' => 'varchar(100)', 'label' => 'Firstname', 'enabled' => 1, 'position' => 31, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125'),
+		'lastname' => array('type' => 'varchar(100)', 'label' => 'Lastname', 'enabled' => 1, 'position' => 32, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125'),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'position' => 40, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'help' => "OrganizationEventLinkToThirdParty", 'picto' => 'company', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'email_company' => array('type' => 'mail', 'label' => 'EmailCompany', 'enabled' => '1', 'position' => 41, 'notnull' => 0, 'visible' => -2, 'searchall' => 1),
-		'date_subscription' => array('type' => 'datetime', 'label' => 'DateOfRegistration', 'enabled' => '1', 'position' => 56, 'notnull' => 1, 'visible' => 1, 'showoncombobox' => '1',),
+		'email_company' => array('type' => 'mail', 'label' => 'EmailCompany', 'enabled' => 1, 'position' => 41, 'notnull' => 0, 'visible' => -2, 'searchall' => 1),
+		'date_subscription' => array('type' => 'datetime', 'label' => 'DateOfRegistration', 'enabled' => 1, 'position' => 56, 'notnull' => 1, 'visible' => 1, 'showoncombobox' => 1,),
 		'fk_invoice' => array('type' => 'integer:Facture:compta/facture/class/facture.class.php', 'label' => 'Invoice', 'enabled' => 'isModEnabled("invoice")', 'position' => 57, 'notnull' => 0, 'visible' => 1, 'index' => 0, 'picto' => 'bill', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'amount' => array('type' => 'price', 'label' => 'AmountPaid', 'enabled' => '1', 'position' => 57, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => '1', 'help' => "AmountOfRegistrationPaid",),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 3,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 3,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'css' => 'nowraponall'),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => -1, 'visible' => -2),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'ip' => array('type' => 'varchar(250)', 'label' => 'IPAddress', 'enabled' => '1', 'position' => 900, 'notnull' => -1, 'visible' => -2,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'default' => 0, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Canceled'),),
+		'amount' => array('type' => 'price', 'label' => 'AmountPaid', 'enabled' => 1, 'position' => 57, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => 1, 'help' => "AmountOfRegistrationPaid",),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 3,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 3,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2, 'css' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => -1, 'visible' => -2),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'ip' => array('type' => 'varchar(250)', 'label' => 'IPAddress', 'enabled' => 1, 'position' => 900, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'default' => '0', 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '9' => 'Canceled'),),
 	);
 	public $rowid;
 	public $ref;

From a12553944aa8220fd979623105ffa7285957cead Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:45 +0100
Subject: [PATCH 1408/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 438bf4af1c2..2bff41e8acb 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -75,9 +75,9 @@ class ExpenseReportIk extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'index' => true)
-		,'fk_c_exp_tax_cat' => array('type' => 'integer', 'index' => true)
-		,'fk_range' => array('type' => 'integer', 'index' => true)
+		'rowid' => array('type' => 'integer', 'index' => 1)
+		,'fk_c_exp_tax_cat' => array('type' => 'integer', 'index' => 1)
+		,'fk_range' => array('type' => 'integer', 'index' => 1)
 		,'coef' => array('type' => 'double')
 		,'ikoffset' => array('type' => 'double')
 	);

From 6b0f48ade7a0b3f98a821c8b7527b47b956f614b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:47 +0100
Subject: [PATCH 1409/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index a2fdaa4d3d8..2ec09b40e6c 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -113,7 +113,7 @@ class ExpenseReportRule extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'index' => true)
+		'rowid' => array('type' => 'integer', 'index' => 1)
 		,'dates' => array('type' => 'date')
 		,'datee' => array('type' => 'date')
 		,'amount' => array('type' => 'double')

From 9ea2b38c47efd010e2ec3acfe4956195862f2784 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:49 +0100
Subject: [PATCH 1410/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 2ac0eb78ccf..59dcb459d47 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -196,7 +196,7 @@ class FactureFournisseurRec extends CommonInvoice
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'titre' => array('type' => 'varchar(100)', 'label' => 'Titre', 'enabled' => 1, 'showoncombobox' => 1, 'visible' => -1, 'position' => 15),
 		'ref_supplier' => array('type' => 'varchar(180)', 'label' => 'RefSupplier', 'enabled' => 1, 'showoncombobox' => 1, 'visible' => -1, 'position' => 20),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25, 'index' => 1),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 30),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 35),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 40),

From 10f94b59e3f666034eb8fe6e97d207c2d7acfc08 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:21:51 +0100
Subject: [PATCH 1411/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/hrm/class/evaluation.class.php | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index d44468aaf8f..1cae9e08bf1 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -106,21 +106,21 @@ class Evaluation extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2',),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3,),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'default' => 0, 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '6' => 'Closed'),),
-		'date_eval' => array('type' => 'date', 'label' => 'DateEval', 'enabled' => '1', 'position' => 502, 'notnull' => 1, 'visible' => 1,),
-		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => '1', 'position' => 504, 'notnull' => 1, 'visible' => 1, 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => '1', 'position' => 505, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of object"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2',),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '0', 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '6' => 'Closed'),),
+		'date_eval' => array('type' => 'date', 'label' => 'DateEval', 'enabled' => 1, 'position' => 502, 'notnull' => 1, 'visible' => 1,),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => 1, 'position' => 504, 'notnull' => 1, 'visible' => 1, 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => 1, 'position' => 505, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 	);
 	public $rowid;
 	public $ref;

From c3d36b8a2487e6fb582d84f6a459fd5d4237db2b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:12 +0100
Subject: [PATCH 1412/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/hrm/class/evaluationdet.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 5635afc434f..c15d05692b2 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -105,16 +105,16 @@ class EvaluationLine extends CommonObjectLine
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'fk_skill' => array('type' => 'integer:Skill:hrm/class/skill.class.php:1', 'label' => 'Skill', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => 1, 'index' => 1,),
-		'fk_evaluation' => array('type' => 'integer:Evaluation:hrm/class/evaluation.class.php:1', 'label' => 'Evaluation', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => 1, 'index' => 1,),
-		'rankorder' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => '1', 'position' => 4, 'notnull' => 1, 'visible' => 1,),
-		'required_rank' => array('type' => 'integer', 'label' => 'requiredRank', 'enabled' => '1', 'position' => 5, 'notnull' => 1, 'visible' => 1,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'fk_skill' => array('type' => 'integer:Skill:hrm/class/skill.class.php:1', 'label' => 'Skill', 'enabled' => 1, 'position' => 3, 'notnull' => 1, 'visible' => 1, 'index' => 1,),
+		'fk_evaluation' => array('type' => 'integer:Evaluation:hrm/class/evaluation.class.php:1', 'label' => 'Evaluation', 'enabled' => 1, 'position' => 3, 'notnull' => 1, 'visible' => 1, 'index' => 1,),
+		'rankorder' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'position' => 4, 'notnull' => 1, 'visible' => 1,),
+		'required_rank' => array('type' => 'integer', 'label' => 'requiredRank', 'enabled' => 1, 'position' => 5, 'notnull' => 1, 'visible' => 1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
 	);
 	public $rowid;
 	public $date_creation;

From 67fc86b051d49558fbd47ca1e1411086e5d13c49 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:14 +0100
Subject: [PATCH 1413/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/hrm/class/job.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 11c4d9ca09a..1b262a51360 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -104,16 +104,16 @@ class Job extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Label of object"),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => 1,),
-		'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,),
-		'deplacement' => array('type' => 'select', 'required' => 1,'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => 0),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 0,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Label of object"),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 21, 'notnull' => 0, 'visible' => 1,),
+		'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,),
+		'deplacement' => array('type' => 'select', 'required' => 1,'label' => 'NeedBusinessTravels', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array(0 => "No", 1 => "Yes"), 'default' => '0'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 71, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 	);
 	public $rowid;
 	public $ref;

From 3200b68ed9375ae76944d9dc7af5f441b596e4ea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:16 +0100
Subject: [PATCH 1414/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/hrm/class/position.class.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 68467a84c43..392ad7a5a13 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -103,21 +103,21 @@ class Position extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
 		//'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'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,),
+		'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' => 'isModEnabled("contract")', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
-		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label' => 'Employee', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => 0, 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => '1', 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => '1', 'position' => 101, 'notnull' => 1, 'visible' => 1,),
-		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 1,),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 120, 'notnull' => 0, 'visible' => 3,),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => 1, 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'position' => 101, 'notnull' => 1, 'visible' => 1,),
+		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 1,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 3,),
 		'abort_comment' => array('type' => 'varchar(255)', 'label' => 'AbandonmentComment', 'enabled' => 'getDolGlobalInt("HRM_JOB_POSITON_ENDING_COMMENT")', 'position' => 502, 'notnull' => 0, 'visible' => 1,),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 151, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 152, 'notnull' => 0, 'visible' => 0,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 151, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 152, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 	);
 	public $rowid;
 	public $ref;

From 2bab0f44a95f7816ad5209d5c2a8f43b5b5ce9e9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:19 +0100
Subject: [PATCH 1415/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/hrm/class/skill.class.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index bd2fea61de8..11d6cb47c0d 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -109,19 +109,19 @@ class Skill extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => '2',),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'required_level' => array('type' => 'integer', 'label' => 'requiredLevel', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0,),
-		'date_validite' => array('type' => 'integer', 'label' => 'date_validite', 'enabled' => '1', 'position' => 52, 'notnull' => 1, 'visible' => 0,),
-		'temps_theorique' => array('type' => 'double(24,8)', 'label' => 'temps_theorique', 'enabled' => '1', 'position' => 54, 'notnull' => 1, 'visible' => 0,),
-		'skill_type' => array('type' => 'integer', 'label' => 'SkillType', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'css' => 'minwidth200', 'arrayofkeyval' => array('0' => 'TypeKnowHow', '1' => 'TypeHowToBe', '9' => 'TypeKnowledge'), 'default' => 0),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 0,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'showoncombobox' => 2,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'required_level' => array('type' => 'integer', 'label' => 'requiredLevel', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 0,),
+		'date_validite' => array('type' => 'integer', 'label' => 'date_validite', 'enabled' => 1, 'position' => 52, 'notnull' => 1, 'visible' => 0,),
+		'temps_theorique' => array('type' => 'double(24,8)', 'label' => 'temps_theorique', 'enabled' => 1, 'position' => 54, 'notnull' => 1, 'visible' => 0,),
+		'skill_type' => array('type' => 'integer', 'label' => 'SkillType', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'css' => 'minwidth200', 'arrayofkeyval' => array('0' => 'TypeKnowHow', '1' => 'TypeHowToBe', '9' => 'TypeKnowledge'), 'default' => '0'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 71, 'notnull' => 0, 'visible' => 0,),
 	);
 	public $rowid;
 	public $label;

From 050c7fecd05a502fab49df989109c591b55e3aee Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:21 +0100
Subject: [PATCH 1416/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index edfc3886843..dd0b76adee3 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -103,12 +103,12 @@ class Skilldet extends CommonObjectLine
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', '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', 'label' => 'fk_skill', 'enabled' => '1', 'position' => 5, 'notnull' => 1, 'visible' => 0,),
-		'rankorder' => array('type' => 'integer', 'label' => 'rank', 'enabled' => '1', 'position' => 10, 'notnull' => 0, 'visible' => 2,),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 1,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => 0,),
+		'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', 'label' => 'fk_skill', 'enabled' => 1, 'position' => 5, 'notnull' => 1, 'visible' => 0,),
+		'rankorder' => array('type' => 'integer', 'label' => 'rank', 'enabled' => 1, 'position' => 10, 'notnull' => 0, 'visible' => 2,),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 1,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => 0,),
 	);
 	public $rowid;
 	public $fk_skill;

From 43f5e96235297b8beb01b1eb7006432f2a99d8f1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:23 +0100
Subject: [PATCH 1417/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/hrm/class/skillrank.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 27400f33638..7398fa4ff6b 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -107,15 +107,15 @@ class SkillRank extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', '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,),
-		'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,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'objecttype' => array('type' => 'varchar(128)', 'label' => 'objecttype', 'enabled' => '1', 'position' => 6, 'notnull' => 1, 'visible' => 0,),
+		'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,),
+		'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,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'objecttype' => array('type' => 'varchar(128)', 'label' => 'objecttype', 'enabled' => 1, 'position' => 6, 'notnull' => 1, 'visible' => 0,),
 	);
 	public $rowid;
 	public $fk_skill;

From 5a29540e4713c371359d2921698fc0cf4eb820ea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:25 +0100
Subject: [PATCH 1418/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/knowledgerecord.class.php           | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index bd4aeec2174..7650eabfab9 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -102,23 +102,23 @@ class KnowledgeRecord extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'visible' => 5, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", "csslist" => "nowraponall", "showoncombobox" => 1),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 20, 'index' => 1),
-		'question' => array('type' => 'text', 'label' => 'Question', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax300', 'copytoclipboard' => 1, 'tdcss' => 'titlefieldcreate nowraponall'),
-		'lang' => array('type' => 'varchar(6)', 'label' => 'Language', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'tdcss' => 'titlefieldcreate nowraponall', "csslist" => "tdoverflowmax100"),
-		'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,),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserCreation', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => '1', 'position' => 512, 'notnull' => 0, 'visible' => -2,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'visible' => 5, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", "csslist" => "nowraponall", "showoncombobox" => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 20, 'index' => 1),
+		'question' => array('type' => 'text', 'label' => 'Question', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax300', 'copytoclipboard' => 1, 'tdcss' => 'titlefieldcreate nowraponall'),
+		'lang' => array('type' => 'varchar(6)', 'label' => 'Language', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => 1, 'tdcss' => 'titlefieldcreate nowraponall', "csslist" => "tdoverflowmax100"),
+		'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,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserCreation', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'position' => 512, 'notnull' => 0, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
 		//'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:(t.active:=:1):pos', 'label' => 'SuggestedForTicketsInGroup', 'enabled' => 'isModEnabled("ticket")', 'position' => 520, 'notnull' => 0, 'visible' => -1, 'help' => 'YouCanLinkArticleToATicketCategory', 'csslist' => 'minwidth200 tdoverflowmax250'),
-		'answer' => array('type' => 'html', 'label' => 'Solution', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 3, 'searchall' => 1, 'csslist' => 'tdoverflowmax300', 'copytoclipboard' => 1, 'tdcss' => 'titlefieldcreate nowraponall'),
-		'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'),),
+		'answer' => array('type' => 'html', 'label' => 'Solution', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 3, 'searchall' => 1, 'csslist' => 'tdoverflowmax300', 'copytoclipboard' => 1, 'tdcss' => 'titlefieldcreate nowraponall'),
+		'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;

From 628ddbda1461ba6b90c8369d54b21b8461f6e5ea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:27 +0100
Subject: [PATCH 1419/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index dbe0ec147c8..9ec47220047 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -99,12 +99,12 @@ class Mo extends CommonObject
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => '1', 'noteditable' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => 1, 'noteditable' => 1),
 		'fk_bom' => array('type' => 'integer:Bom:bom/class/bom.class.php:0:(t.status:=:1)', 'filter' => 'active=1', 'label' => 'BOM', 'enabled' => '$conf->bom->enabled', 'visible' => 1, 'position' => 33, 'notnull' => -1, 'index' => 1, 'comment' => "Original BOM", 'css' => 'minwidth100 maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'bom'),
 		'mrptype' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'visible' => 1, 'position' => 34, 'notnull' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'Manufacturing', 1 => 'Disassemble'), 'css' => 'minwidth150', 'csslist' => 'minwidth150 center'),
 		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:0', 'label' => 'Product', 'enabled' => 'isModEnabled("product")', 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'comment' => "Product to produce", 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax100', 'picto' => 'product'),
-		'qty' => array('type' => 'real', 'label' => 'QtyToProduce', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'notnull' => 1, 'comment' => "Qty to produce", 'css' => 'width75', 'default' => 1, 'isameasure' => 1),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 42, 'notnull' => -1, 'searchall' => 1, 'showoncombobox' => '2', 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax200', 'alwayseditable' => 1),
+		'qty' => array('type' => 'real', 'label' => 'QtyToProduce', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'notnull' => 1, 'comment' => "Qty to produce", 'css' => 'width75', 'default' => '1', 'isameasure' => 1),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 42, 'notnull' => -1, 'searchall' => 1, 'showoncombobox' => 2, 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax200', 'alwayseditable' => 1),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'position' => 50, 'notnull' => -1, 'index' => 1, 'css' => 'maxwidth400', 'csslist' => 'tdoverflowmax150'),
 		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'picto' => 'project', 'enabled' => '$conf->project->enabled', 'visible' => -1, 'position' => 51, 'notnull' => -1, 'index' => 1, 'css' => 'minwidth200 maxwidth400', 'csslist' => 'tdoverflowmax100'),
 		'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label' => 'WarehouseForProduction', 'picto' => 'stock', 'enabled' => 'isModEnabled("stock")', 'visible' => 1, 'position' => 52, 'css' => 'maxwidth400', 'csslist' => 'tdoverflowmax200'),
@@ -119,8 +119,8 @@ class Mo extends CommonObject
 		'date_end_planned' => array('type' => 'datetime', 'label' => 'DateEndPlannedMo', 'enabled' => 1, 'visible' => 1, 'position' => 56, 'notnull' => -1, 'index' => 1, 'alwayseditable' => 1, 'csslist' => 'nowraponall'),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'default' => 0, 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'InProgress', '3' => 'StatusMOProduced', '9' => 'Canceled')),
-		'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => 0, 'notnull' => 0, 'index' => 1,'showoncombobox' => 0),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'default' => '0', 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'InProgress', '3' => 'StatusMOProduced', '9' => 'Canceled')),
+		'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1,'showoncombobox' => 0),
 	);
 	public $rowid;
 	public $entity;
@@ -238,7 +238,7 @@ class Mo extends CommonObject
 	/**
 	 * @var MoLine|null     MO line
 	 */
-	public $line = array();
+	public $line = null;
 
 	/**
 	 * @var int ID of parent line

From 1180913344dccb68e20718edb755bdd48eada5c1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:31:29 +0100
Subject: [PATCH 1420/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../partnership/class/partnership.class.php   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index b40cbdd1a27..d46c5b6fea1 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -107,28 +107,28 @@ class Partnership extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 'isModEnabled("multicompany")', 'position' => 15, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
-		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label' => 'Type', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'csslist' => 'tdoverflowmax125'),
-		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax125',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax125'),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax125'),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => 0,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'date_partnership_start' => array('type' => 'date', 'label' => 'DatePartnershipStart', 'enabled' => '1', 'position' => 52, 'notnull' => 1, 'visible' => 1,),
-		'date_partnership_end' => array('type' => 'date', 'label' => 'DatePartnershipEnd', 'enabled' => '1', 'position' => 53, 'notnull' => 0, 'visible' => 1,),
+		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label' => 'Type', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'csslist' => 'tdoverflowmax125'),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 1, 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax125',),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax125'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax125'),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'date_partnership_start' => array('type' => 'date', 'label' => 'DatePartnershipStart', 'enabled' => 1, 'position' => 52, 'notnull' => 1, 'visible' => 1,),
+		'date_partnership_end' => array('type' => 'date', 'label' => 'DatePartnershipEnd', 'enabled' => 1, 'position' => 53, 'notnull' => 0, 'visible' => 1,),
 		'url_to_check' => array('type' => 'url', 'label' => 'UrlToCheck', 'enabled' => 'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position' => 70, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax150'),
 		'count_last_url_check_error' => array('type' => 'integer', 'label' => 'CountLastUrlCheckError', 'enabled' => 'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position' => 71, 'notnull' => 0, 'visible' => -4, 'default' => '0',),
 		'last_check_backlink' => array('type' => 'datetime', 'label' => 'LastCheckBacklink', 'enabled' => 'getDolGlobalString("PARTNERSHIP_BACKLINKS_TO_CHECK")', 'position' => 72, 'notnull' => 0, 'visible' => -4, 'csslist' => 'nowraponall'),
-		'reason_decline_or_cancel' => array('type' => 'text', 'label' => 'ReasonDeclineOrCancel', 'enabled' => '1', 'position' => 73, 'notnull' => 0, 'visible' => -2,),
-		'ip' => array('type' => 'ip', 'label' => 'IPOfApplicant', 'enabled' => '1', 'position' => 74, 'notnull' => 0, 'visible' => -2,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'visible' => 2, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'Approved', '3' => 'Refused', '9' => 'Terminated'),),
+		'reason_decline_or_cancel' => array('type' => 'text', 'label' => 'ReasonDeclineOrCancel', 'enabled' => 1, 'position' => 73, 'notnull' => 0, 'visible' => -2,),
+		'ip' => array('type' => 'ip', 'label' => 'IPOfApplicant', 'enabled' => 1, 'position' => 74, 'notnull' => 0, 'visible' => -2,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 2000, 'notnull' => 1, 'visible' => 2, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'Approved', '3' => 'Refused', '9' => 'Terminated'),),
 	);
 	public $rowid;
 	public $ref;

From 9d26fe1e1e223bd8025bf8ba3200a0deba3c9253 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:37:26 +0100
Subject: [PATCH 1421/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9cbcc07479d..00a07fbfe83 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -588,10 +588,10 @@ class Product extends CommonObject
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
 		'ref'           => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'comment' => 'Reference of object'),
-		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 5),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'notnull' => 1, 'index' => 1, 'position' => 5),
 		'label'         => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 2, 'position' => 15, 'csslist' => 'tdoverflowmax250'),
 		'barcode'       => array('type' => 'varchar(255)', 'label' => 'Barcode', 'enabled' => 'isModEnabled("barcode")', 'position' => 20, 'visible' => -1, 'showoncombobox' => 3),
-		'fk_barcode_type' => array('type' => 'integer', 'label' => 'BarcodeType', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => -1,),
+		'fk_barcode_type' => array('type' => 'integer', 'label' => 'BarcodeType', 'enabled' => 1, 'position' => 21, 'notnull' => 0, 'visible' => -1,),
 		'note_public'   => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 61),
 		'note'          => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 62),
 		'datec'         => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500),
@@ -600,15 +600,15 @@ class Product extends CommonObject
 		'fk_user_author' => array('type' => 'integer', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 510, 'foreignkey' => 'llx_user.rowid'),
 		'fk_user_modif' => array('type' => 'integer', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 511),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-		'localtax1_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax1tx', 'enabled' => '1', 'position' => 150, 'notnull' => 0, 'visible' => -1,),
-		'localtax1_type' => array('type' => 'varchar(10)', 'label' => 'Localtax1type', 'enabled' => '1', 'position' => 155, 'notnull' => 1, 'visible' => -1,),
-		'localtax2_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax2tx', 'enabled' => '1', 'position' => 160, 'notnull' => 0, 'visible' => -1,),
-		'localtax2_type' => array('type' => 'varchar(10)', 'label' => 'Localtax2type', 'enabled' => '1', 'position' => 165, 'notnull' => 1, 'visible' => -1,),
+		'localtax1_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax1tx', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1,),
+		'localtax1_type' => array('type' => 'varchar(10)', 'label' => 'Localtax1type', 'enabled' => 1, 'position' => 155, 'notnull' => 1, 'visible' => -1,),
+		'localtax2_tx' => array('type' => 'double(6,3)', 'label' => 'Localtax2tx', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => -1,),
+		'localtax2_type' => array('type' => 'varchar(10)', 'label' => 'Localtax2type', 'enabled' => 1, 'position' => 165, 'notnull' => 1, 'visible' => -1,),
 		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -1, 'position' => 170),
 		'import_key'    => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
-		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1,  'notnull' => 1, 'default' => 0, 'index' => 1,  'position' => 1000),
+		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
+		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>'0', 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
+		'mandatory_period' => array('type' => 'integer', 'label' => 'mandatoryperiod', 'enabled' => 1, 'visible' => 1,  'notnull' => 1, 'default' => '0', 'index' => 1,  'position' => 1000),
 	);
 
 	/**

From 10580a9b69251efce59a7fec89a88aba62fad3b9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:37:28 +0100
Subject: [PATCH 1422/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index b5aba3ae45a..5986ad96bfa 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -34,7 +34,7 @@ class ProductCustomerPrice extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => '1', 'noteditable' => 1),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => 1, 'noteditable' => 1),
 		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php:0', 'label' => 'Product', 'enabled' => '$conf->product->enabled', 'visible' => 1, 'position' => 35, 'notnull' => 1, 'index' => 1, 'comment' => "Product to produce", 'css' => 'maxwidth300', 'csslist' => 'tdoverflowmax100', 'picto' => 'product'),
 		'ref_customer' => array('type' => 'varchar(128)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1,),
 		'datec' => array('type' => 'datetime', 'label' => 'AppliedPricesFrom', 'enabled' => 1, 'visible' => 1, 'position' => 500, 'notnull' => 1,),

From db144c9cb0b04adef6432b169760d945c5ec4105 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:37:30 +0100
Subject: [PATCH 1423/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index b99b26dc1a3..09eb95025c5 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -114,7 +114,7 @@ class Inventory extends CommonObject
 		'fk_user_modif'      => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 511, 'csslist' => 'tdoverflowmax150'),
 		'fk_user_valid'      => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'visible' => -2, 'enabled' => 1, 'position' => 512, 'csslist' => 'tdoverflowmax150'),
 		'import_key'         => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'index' => 0, 'position' => 1000),
-		'status'             => array('type' => 'integer', 'label' => 'Status', 'visible' => 4, 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => 0, 'index' => 1, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', 2 => 'Closed', 9 => 'Canceled'))
+		'status'             => array('type' => 'integer', 'label' => 'Status', 'visible' => 4, 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', 2 => 'Closed', 9 => 'Canceled'))
 	);
 
 	/**

From 7e19c0afa3c83e319d1d647eb595b77dfab62b35 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:37:32 +0100
Subject: [PATCH 1424/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 1647c870515..2cf53aea7c5 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -125,7 +125,7 @@ class Entrepot extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 15),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'notnull' => 1, 'index' => 1, 'position' => 15),
 		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 25, 'searchall' => 1),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => -2, 'position' => 35, 'searchall' => 1),
 		'lieu' => array('type' => 'varchar(64)', 'label' => 'LocationSummary', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'showoncombobox' => 2, 'searchall' => 1),

From d712e62715b0fbdc6163426bc17de35472f5af86 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:37:34 +0100
Subject: [PATCH 1425/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f9787f8e3eb..f344073e07a 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -105,7 +105,7 @@ class Productlot extends CommonObject
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
 		'fk_product'    => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => 1, 'visible' => 1, 'position' => 5, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'picto' => 'product', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'maxwidth150'),
 		'batch'         => array('type' => 'varchar(30)', 'label' => 'Batch', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'comment' => 'Batch', 'searchall' => 1, 'picto' => 'lot', 'validate' => 1),
-		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => 1, 'notnull' => 1, 'index' => 1, 'position' => 20),
+		'entity'        => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'notnull' => 1, 'index' => 1, 'position' => 20),
 		'sellby'        => array('type' => 'date', 'label' => 'SellByDate', 'enabled' => 'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible' => 1, 'notnull' => 0, 'position' => 60),
 		'eatby'         => array('type' => 'date', 'label' => 'EatByDate', 'enabled' => 'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible' => 1, 'notnull' => 0, 'position' => 62),
 		'eol_date'        => array('type' => 'date', 'label' => 'EndOfLife', 'enabled' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible' => 'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position' => 70),

From df588ebf21203633f3dfdc7fcfbe152687fce4a4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:40:24 +0100
Subject: [PATCH 1426/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/stocktransfer.class.php             | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 3749f3e67f2..6749476358f 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -127,31 +127,31 @@ class StockTransfer extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
-		'entity'                   => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 1, 'default' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
-		'ref'                      => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
-		'label'                    => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'css' => 'minwidth100', 'csslist' => 'tdoverflowmax125', 'autofocusoncreate' => 1),
-		'description'              => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 3,),
+		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
+		'entity'                   => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'position' => 1, 'default' => '1', 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
+		'ref'                      => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of object"),
+		'label'                    => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'css' => 'minwidth100', 'csslist' => 'tdoverflowmax125', 'autofocusoncreate' => 1),
+		'description'              => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 31, 'notnull' => 0, 'visible' => 3,),
 		'fk_project'               => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'position' => 32, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
-		'fk_soc'                   => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1/*, 'help'=>"LinkToThirdparty"*/, 'picto' => 'company', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
-		'fk_warehouse_source'      => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferSource', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => '1', 'position' => 51, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferDestination', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
-		'note_public'              => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
-		'note_private'             => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
-		'date_creation'            => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'date_prevue_depart'       => array('type' => 'date', 'label' => 'DatePrevueDepart', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => 1,),
-		'date_reelle_depart'       => array('type' => 'date', 'label' => 'DateReelleDepart', 'enabled' => '1', 'position' => 101, 'notnull' => 0, 'visible' => 5,),
-		'date_prevue_arrivee'      => array('type' => 'date', 'label' => 'DatePrevueArrivee', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 1,),
-		'date_reelle_arrivee'      => array('type' => 'date', 'label' => 'DateReelleArrivee', 'enabled' => '1', 'position' => 103, 'notnull' => 0, 'visible' => 5,),
-		'lead_time_for_warning'    => array('type' => 'integer', 'label' => 'LeadTimeForWarning', 'enabled' => '1', 'position' => 200, 'default' => 0, 'notnull' => 0, 'visible' => 1),
-		'tms'                      => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat'            => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif'            => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'ChangedBy', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'import_key'               => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf'                => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'fk_soc'                   => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => 1, 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1/*, 'help'=>"LinkToThirdparty"*/, 'picto' => 'company', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
+		'fk_warehouse_source'      => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferSource', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => 1, 'position' => 51, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferDestination', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'note_public'              => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private'             => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation'            => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'date_prevue_depart'       => array('type' => 'date', 'label' => 'DatePrevueDepart', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 1,),
+		'date_reelle_depart'       => array('type' => 'date', 'label' => 'DateReelleDepart', 'enabled' => 1, 'position' => 101, 'notnull' => 0, 'visible' => 5,),
+		'date_prevue_arrivee'      => array('type' => 'date', 'label' => 'DatePrevueArrivee', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 1,),
+		'date_reelle_arrivee'      => array('type' => 'date', 'label' => 'DateReelleArrivee', 'enabled' => 1, 'position' => 103, 'notnull' => 0, 'visible' => 5,),
+		'lead_time_for_warning'    => array('type' => 'integer', 'label' => 'LeadTimeForWarning', 'enabled' => 1, 'position' => 200, 'default' => '0', 'notnull' => 0, 'visible' => 1),
+		'tms'                      => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat'            => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif'            => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'ChangedBy', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key'               => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf'                => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
 		'fk_incoterms'             => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => '$conf->incoterm->enabled', 'visible' => -2, 'position' => 220),
 		'location_incoterms'       => array('type' => 'varchar(255)', 'label' => 'IncotermLabel', 'enabled' => '$conf->incoterm->enabled', 'visible' => -2, 'position' => 225),
-		'status'                   => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'StockStransferDecremented', '3' => 'StockStransferIncremented'),),
+		'status'                   => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'StockStransferDecremented', '3' => 'StockStransferIncremented'),),
 	);
 	public $rowid;
 	public $ref;

From 713fee0f905075101ecf9b6f8438a1d73006b203 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:40:27 +0100
Subject: [PATCH 1427/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/stocktransferline.class.php         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 90cbb649838..fdab599afcb 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -97,16 +97,16 @@ class StockTransferLine extends CommonObjectLine
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
-		'amount' => array('type' => 'price', 'label' => 'Amount', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => '1', 'help' => "Help text for amount",),
-		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
-		'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
-		'fk_warehouse_source' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
-		'fk_stocktransfer' => array('type' => 'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label' => 'StockTransfer', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0,),
-		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
-		'batch' => array('type' => 'varchar(128)', 'label' => 'Batch', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => 1,),
-		'pmp' => array('type' => 'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label' => 'PMP', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1,),
-		'rang' => array('type' => 'integer', 'label' => 'Qty', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => 0, 'default' => '0', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
+		'amount' => array('type' => 'price', 'label' => 'Amount', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => 1, 'help' => "Help text for amount",),
+		'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
+		'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'fk_warehouse_source' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'fk_stocktransfer' => array('type' => 'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label' => 'StockTransfer', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 0,),
+		'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'batch' => array('type' => 'varchar(128)', 'label' => 'Batch', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => 1,),
+		'pmp' => array('type' => 'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label' => 'PMP', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1,),
+		'rang' => array('type' => 'integer', 'label' => 'Qty', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => 0, 'default' => '0', 'isameasure' => 1, 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
 	);
 	public $rowid;
 	public $amount;

From b881df8636bf9c00faab5607174955d49f71b76e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:40:29 +0100
Subject: [PATCH 1428/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 153e1f9c26d..436d080774d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -300,7 +300,7 @@ class Project extends CommonObject
 		'fk_project' => array('type' => 'integer', 'label' => 'Parent', 'enabled' => 1, 'visible' => 1, 'notnull' => 0, 'position' => 12),
 		'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 15, 'searchall' => 1),
 		'title' => array('type' => 'varchar(255)', 'label' => 'ProjectLabel', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 17, 'showoncombobox' => 2, 'searchall' => 1),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 19),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 19),
 		'fk_soc' => array('type' => 'integer', 'label' => 'Thirdparty', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'dateo' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'visible' => 1, 'position' => 30),
 		'datee' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => 1, 'position' => 35),

From ccc93dfdc8d5b9916c7d6223a907f685500df133 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:53:53 +0100
Subject: [PATCH 1429/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/recruitmentcandidature.class.php    | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 0f53b8a9a65..74afa39f56a 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -110,31 +110,31 @@ class RecruitmentCandidature extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of candidature", 'csslist' => 'nowraponall'),
-		'fk_recruitmentjobposition' => array('type' => 'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php:0:(t.status:=:1)', 'label' => 'Job', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'picto' => 'recruitmentjobposition', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'minwidth100 nowraponall'),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
-		'lastname' => array('type' => 'varchar(128)', 'label' => 'Lastname', 'enabled' => '1', 'position' => 20, 'notnull' => 0, 'visible' => 1, 'csslist' => 'tdoverflowmax150'),
-		'firstname' => array('type' => 'varchar(128)', 'label' => 'Firstname', 'enabled' => '1', 'position' => 21, 'notnull' => 0, 'visible' => 1, 'csslist' => 'tdoverflowmax150'),
-		'email' => array('type' => 'email', 'label' => 'EMail', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'picto' => 'email', 'csslist' => 'tdoverflowmax150'),
-		'phone' => array('type' => 'phone', 'label' => 'Phone', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 1, 'picto' => 'phone', 'csslist' => 'tdoverflowmax150'),
-		'date_birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => '1', 'position' => 70, 'visible' => -1,),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of candidature", 'csslist' => 'nowraponall'),
+		'fk_recruitmentjobposition' => array('type' => 'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php:0:(t.status:=:1)', 'label' => 'Job', 'enabled' => 1, 'position' => 15, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'picto' => 'recruitmentjobposition', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'minwidth100 nowraponall'),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
+		'lastname' => array('type' => 'varchar(128)', 'label' => 'Lastname', 'enabled' => 1, 'position' => 20, 'notnull' => 0, 'visible' => 1, 'csslist' => 'tdoverflowmax150'),
+		'firstname' => array('type' => 'varchar(128)', 'label' => 'Firstname', 'enabled' => 1, 'position' => 21, 'notnull' => 0, 'visible' => 1, 'csslist' => 'tdoverflowmax150'),
+		'email' => array('type' => 'email', 'label' => 'EMail', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'picto' => 'email', 'csslist' => 'tdoverflowmax150'),
+		'phone' => array('type' => 'phone', 'label' => 'Phone', 'enabled' => 1, 'position' => 31, 'notnull' => 0, 'visible' => 1, 'picto' => 'phone', 'csslist' => 'tdoverflowmax150'),
+		'date_birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'position' => 70, 'visible' => -1,),
 		'email_msgid' => array('type' => 'varchar(255)', 'label' => 'EmailMsgID', 'visible' => -2, 'enabled' => 1, 'position' => 540, 'notnull' => -1, 'help' => 'EmailMsgIDDesc'),
 		'email_date' => array('type' => 'datetime', 'label' => 'EmailDate', 'visible' => -2, 'enabled' => 1, 'position' => 541),
 		//'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1),
-		'remuneration_requested' => array('type' => 'integer', 'label' => 'RequestedRemuneration', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1,),
-		'remuneration_proposed' => array('type' => 'integer', 'label' => 'ProposedRemuneration', 'enabled' => '1', 'position' => 81, 'notnull' => 0, 'visible' => -1,),
-		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 300, 'notnull' => 0, 'visible' => 3, 'cssview' => 'wordbreak'),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -4, 'csslist' => 'nowraponall'),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'LinkedToDolibarrUser', 'enabled' => '1', 'position' => 600, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax100'),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'default' => 0, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Received', '3' => 'ContractProposed', '5' => 'ContractSigned', '8' => 'Refused', '9' => 'Canceled')),
+		'remuneration_requested' => array('type' => 'integer', 'label' => 'RequestedRemuneration', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => -1,),
+		'remuneration_proposed' => array('type' => 'integer', 'label' => 'ProposedRemuneration', 'enabled' => 1, 'position' => 81, 'notnull' => 0, 'visible' => -1,),
+		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'position' => 300, 'notnull' => 0, 'visible' => 3, 'cssview' => 'wordbreak'),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -4, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'LinkedToDolibarrUser', 'enabled' => 1, 'position' => 600, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax100'),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Received', '3' => 'ContractProposed', '5' => 'ContractSigned', '8' => 'Refused', '9' => 'Canceled')),
 	);
 	public $rowid;
 	public $entity;

From 72bc4cbe742c40a3264bb101cc1f12145b159ed2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:53:55 +0100
Subject: [PATCH 1430/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../class/recruitmentjobposition.class.php    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 531e07b23a5..0c6542d8ba2 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -116,30 +116,30 @@ class RecruitmentJobPosition extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'css' => 'nowraponall'),
-		'label' => array('type' => 'varchar(255)', 'label' => 'JobLabel', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth500', 'csslist' => 'tdoverflowmax300', 'showoncombobox' => '2', 'autofocusoncreate' => 1),
-		'qty' => array('type' => 'integer', 'label' => 'NbOfEmployeesExpected', 'enabled' => '1', 'position' => 45, 'notnull' => 1, 'visible' => 1, 'default' => '1', 'isameasure' => '1', 'css' => 'maxwidth75imp'),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of object", 'css' => 'nowraponall'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'JobLabel', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth500', 'csslist' => 'tdoverflowmax300', 'showoncombobox' => '2', 'autofocusoncreate' => 1),
+		'qty' => array('type' => 'integer', 'label' => 'NbOfEmployeesExpected', 'enabled' => 1, 'position' => 45, 'notnull' => 1, 'visible' => 1, 'default' => '1', 'isameasure' => 1, 'css' => 'maxwidth75imp'),
 		'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'position' => 52, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'css' => 'maxwidth500', 'picto' => 'project'),
-		'fk_user_recruiter' => array('type' => 'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label' => 'ResponsibleOfRecruitement', 'enabled' => '1', 'position' => 54, 'notnull' => 1, 'visible' => 1, 'foreignkey' => 'user.rowid', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'user'),
-		'email_recruiter' => array('type' => 'varchar(255)', 'label' => 'EmailRecruiter', 'enabled' => '1', 'position' => 54, 'notnull' => 0, 'visible' => -1, 'help' => 'ToUseAGenericEmail', 'picto' => 'email'),
-		'fk_user_supervisor' => array('type' => 'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label' => 'FutureManager', 'enabled' => '1', 'position' => 55, 'notnull' => 0, 'visible' => -1, 'foreignkey' => 'user.rowid', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'user'),
+		'fk_user_recruiter' => array('type' => 'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label' => 'ResponsibleOfRecruitement', 'enabled' => 1, 'position' => 54, 'notnull' => 1, 'visible' => 1, 'foreignkey' => 'user.rowid', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'user'),
+		'email_recruiter' => array('type' => 'varchar(255)', 'label' => 'EmailRecruiter', 'enabled' => 1, 'position' => 54, 'notnull' => 0, 'visible' => -1, 'help' => 'ToUseAGenericEmail', 'picto' => 'email'),
+		'fk_user_supervisor' => array('type' => 'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label' => 'FutureManager', 'enabled' => 1, 'position' => 55, 'notnull' => 0, 'visible' => -1, 'foreignkey' => 'user.rowid', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax150', 'picto' => 'user'),
 		'fk_establishment' => array('type' => 'integer:Establishment:hrm/class/establishment.class.php', 'label' => 'Establishment', 'enabled' => '$conf->hrm->enabled', 'position' => 56, 'notnull' => 0, 'visible' => -1, 'foreignkey' => 'establishment.rowid',),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'WorkPlace', 'enabled' => 'isModEnabled("societe")', 'position' => 57, 'notnull' => -1, 'visible' => -1, 'css' => 'maxwidth500', 'index' => 1, 'help' => "IfJobIsLocatedAtAPartner", 'picto' => 'company'),
-		'date_planned' => array('type' => 'date', 'label' => 'DateExpected', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 1,),
-		'remuneration_suggested' => array('type' => 'varchar(255)', 'label' => 'Remuneration', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 1,),
-		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 65, 'notnull' => 0, 'visible' => 3,),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 101, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 0,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -4,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => '1', 'position' => 900, 'notnull' => 0, 'visible' => 0,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '3' => 'Recruited', '9' => 'Canceled'),),
+		'date_planned' => array('type' => 'date', 'label' => 'DateExpected', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 1,),
+		'remuneration_suggested' => array('type' => 'varchar(255)', 'label' => 'Remuneration', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 1,),
+		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'position' => 65, 'notnull' => 0, 'visible' => 3,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 101, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -4,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'position' => 900, 'notnull' => 0, 'visible' => 0,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '3' => 'Recruited', '9' => 'Canceled'),),
 	);
 	public $rowid;
 

From 7e36eac96972232c397d9c13123b9e69fbf7f165 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:53:58 +0100
Subject: [PATCH 1431/1862] Fix PhanTypeMismatchPropertyDefault

---
 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 1d7a78e3a13..81cb820fb49 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -197,7 +197,7 @@ class Societe extends CommonObject
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 30),
 		'nom' => array('type' => 'varchar(128)', 'label' => 'Nom', 'enabled' => 1, 'visible' => -1, 'position' => 35, 'showoncombobox' => 1),
 		'name_alias' => array('type' => 'varchar(128)', 'label' => 'Name alias', 'enabled' => 1, 'visible' => -1, 'position' => 36, 'showoncombobox' => 2),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 40, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 40, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 45),
 		'code_client' => array('type' => 'varchar(24)', 'label' => 'CustomerCode', 'enabled' => 1, 'visible' => -1, 'position' => 55),
 		'code_fournisseur' => array('type' => 'varchar(24)', 'label' => 'SupplierCode', 'enabled' => 1, 'visible' => -1, 'position' => 60),

From f8055ec866a35a5acbf52f68768debd95fa37694 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:00 +0100
Subject: [PATCH 1432/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 820cc281c89..dbe37cb4be4 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -102,7 +102,7 @@ class CTicketCategory extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'position' => 15, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'position' => 15, 'index' => 1),
 		'code' => array('type' => 'varchar(32)', 'label' => 'Code', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 20),
 		'pos' => array('type' => 'integer', 'label' => 'Pos', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
 		'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30, 'showoncombobox' => 1),

From 4aa0ccd870b6fa71104acc689810427f8933c34a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:02 +0100
Subject: [PATCH 1433/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index b4c16a23b95..7ea87524d7a 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -101,11 +101,11 @@ class ProductAttribute extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
 		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'css' => 'width200'),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'ExternalRef', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall' => 1),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => '1',),
-		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => 0, 'position' => 40, 'notnull' => 1,),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => 1,),
+		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => '0', 'position' => 40, 'notnull' => 1,),
 	);
 
 	/**

From e8f49e9bf8845128fed07703f5fb022047a9b1ab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:04 +0100
Subject: [PATCH 1434/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 4b04d46a375..01de2a2ed84 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -79,11 +79,11 @@ class ProductAttributeValue extends CommonObjectLine
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
 		'fk_product_attribute' => array('type' => 'integer:ProductAttribute:variants/class/ProductAttribute.class.php', 'label' => 'ProductAttribute', 'enabled' => 1, 'visible' => 0, 'position' => 10, 'notnull' => 1, 'index' => 1,),
 		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'css' => ''),
-		'value' => array('type' => 'varchar(255)', 'label' => 'Value', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => '1',),
-		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => 0, 'position' => 200, 'notnull' => 1,),
+		'value' => array('type' => 'varchar(255)', 'label' => 'Value', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => 1,),
+		'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => '0', 'position' => 200, 'notnull' => 1,),
 	);
 	public $id;
 	public $fk_product_attribute;

From 40b6210e0bbe0eba7e0c525784bd761818d6532e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:06 +0100
Subject: [PATCH 1435/1862] Fix PhanTypeMismatchPropertyDefault

---
 htdocs/webhook/class/target.class.php | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 011b8b31606..634c75a2c33 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -104,20 +104,20 @@ class Target extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'index' => 1, 'searchall' => 1, 'validate' => '1', 'comment' => "Reference of object"),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => '2', 'validate' => '1',),
-		'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
-		'trigger_codes' => array('type' => 'text', 'label' => 'TriggerCodes', 'enabled' => '1', 'position' => 55, 'notnull' => 1, 'visible' => 1, 'help' => "TriggerCodeInfo",),
-		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => '1',),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => '1',),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => '1', 'position' => 2000, 'notnull' => 1, 'default' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'), 'validate' => '1',),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'index' => 1, 'searchall' => 1, 'validate' => 1, 'comment' => "Reference of object"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,),
+		'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => 1, 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+		'trigger_codes' => array('type' => 'text', 'label' => 'TriggerCodes', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'help' => "TriggerCodeInfo",),
+		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 3, 'validate' => 1,),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0, 'cssview' => 'wordbreak', 'validate' => 1,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'position' => 2000, 'notnull' => 1, 'default' => '1', 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'), 'validate' => 1,),
 	);
 	public $rowid;
 	public $ref;

From 5e3b9fa6516cf8f988b17880ca392b42ac70d7ac Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:08 +0100
Subject: [PATCH 1436/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/webportal/class/webportalmember.class.php b/htdocs/webportal/class/webportalmember.class.php
index d09568cf5f5..742dc71dda3 100644
--- a/htdocs/webportal/class/webportalmember.class.php
+++ b/htdocs/webportal/class/webportalmember.class.php
@@ -117,8 +117,8 @@ class WebPortalMember extends Adherent
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
-		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => 1, 'enabled' => 1, 'visible' => 5, 'notnull' => 1, 'position' => 12, 'index' => 1, 'showonheader' => 1,),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1,),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => '1', 'enabled' => 1, 'visible' => 5, 'notnull' => 1, 'position' => 12, 'index' => 1, 'showonheader' => 1,),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1,),
 
 		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 4, 'position' => 30, 'showonheader' => 1,),
 		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 4, 'position' => 35, 'showonheader' => 1,),

From 25467c94047f45f8ee3d2d9369ec20ee6dd97527 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:10 +0100
Subject: [PATCH 1437/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/webportal/class/webportalorder.class.php b/htdocs/webportal/class/webportalorder.class.php
index a1ca6bd5270..03a2331a75a 100644
--- a/htdocs/webportal/class/webportalorder.class.php
+++ b/htdocs/webportal/class/webportalorder.class.php
@@ -102,7 +102,7 @@ class WebPortalOrder extends Commande
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1,),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1,),
 		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 2, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 25,),
 		'date_commande' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 2, 'position' => 60,),
 		'date_livraison' => array('type' => 'date', 'label' => 'DateDeliveryPlanned', 'enabled' => 1, 'visible' => 2, 'position' => 70,),

From 634a6fe37d9aeee1d79c25dbe4d6ac1c5a4e6991 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:12 +0100
Subject: [PATCH 1438/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/webportal/class/webportalpartnership.class.php b/htdocs/webportal/class/webportalpartnership.class.php
index 7a0146072dd..d67cd26083b 100644
--- a/htdocs/webportal/class/webportalpartnership.class.php
+++ b/htdocs/webportal/class/webportalpartnership.class.php
@@ -100,8 +100,8 @@ class WebPortalPartnership extends Partnership
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id",),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 5, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'showonheader' => 1,),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 5, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of object", 'showonheader' => 1,),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'visible' => -2, 'default' => '1', 'index' => 1,),
 
 		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label' => 'Type', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 5, 'csslist' => '',),

From 8ab5736153aa319b27ed9a57e95d6e44aee94e70 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:14 +0100
Subject: [PATCH 1439/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/webportal/class/webportalpropal.class.php b/htdocs/webportal/class/webportalpropal.class.php
index 2c6a973ec66..0a365361114 100644
--- a/htdocs/webportal/class/webportalpropal.class.php
+++ b/htdocs/webportal/class/webportalpropal.class.php
@@ -101,9 +101,9 @@ class WebPortalPropal extends Propal
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id",),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1,),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'validate' => '1', 'comment' => "Reference of object",),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1,),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => "Reference of object",),
 		'datep' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 2, 'position' => 60,),
 		'fin_validite' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => 2, 'position' => 65,),
 		'total_ht' => array('type' => 'price', 'label' => 'TotalHT', 'enabled' => 1, 'visible' => 2, 'position' => 125, 'isameasure' => 1,),

From e16b73288adb0829c585935c349d6d051e483319 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:17 +0100
Subject: [PATCH 1440/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index f7d8829bd71..03f8949a389 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -178,7 +178,7 @@ class WebsitePage extends CommonObject
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
 		'fk_website'     => array('type' => 'integer', 'label' => 'WebsiteId', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 40, 'searchall' => 0, 'foreignkey' => 'websitepage.rowid'),
 		'fk_page'        => array('type' => 'integer', 'label' => 'ParentPageId', 'enabled' => 1, 'visible' => 1, 'notnull' => -1, 'position' => 45, 'searchall' => 0, 'foreignkey' => 'website.rowid'),
-		'allowed_in_frames'   => array('type' => 'integer', 'label' => 'AllowedInFrames', 'enabled' => 1, 'visible' => -1, 'position' => 48, 'searchall' => 0, 'default' => 0),
+		'allowed_in_frames'   => array('type' => 'integer', 'label' => 'AllowedInFrames', 'enabled' => 1, 'visible' => -1, 'position' => 48, 'searchall' => 0, 'default' => '0'),
 		'htmlheader'     => array('type' => 'html', 'label' => 'HtmlHeader', 'enabled' => 1, 'visible' => 0, 'position' => 50, 'searchall' => 0),
 		'content'        => array('type' => 'mediumtext', 'label' => 'Content', 'enabled' => 1, 'visible' => 0, 'position' => 51, 'searchall' => 0),
 		'grabbed_from'   => array('type' => 'varchar(255)', 'label' => 'GrabbedFrom', 'enabled' => 1, 'visible' => 1, 'index' => 1, 'position' => 400, 'comment' => 'URL page content was grabbed from'),

From 460d43cfbee46ce54907164c843b09a950b44a0c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:19 +0100
Subject: [PATCH 1441/1862] Fix PhanTypeMismatchPropertyDefault

---
 .../workstation/class/workstation.class.php   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 8a3e195f0fd..d2b47492405 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -99,22 +99,22 @@ class Workstation extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'position' => 5, 'notnull' => 1, 'default' => '1', 'index' => 1),
-		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'noteditable' => '0', 'default' => '', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object", 'csslist' => 'nowraponall'),
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax125', 'showoncombobox' => '2',),
-		'type' => array('type' => 'varchar(8)', 'label' => 'Type', 'enabled' => '1', 'position' => 32, 'default' => 1, 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('HUMAN' => 'Human', 'MACHINE' => 'Machine', 'BOTH' => 'HumanMachine'),),
-		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
-		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
-		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
-		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
-		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 512, 'notnull' => -1, 'visible' => -2,),
-		'nb_operators_required' => array('type' => 'integer', 'label' => 'NbOperatorsRequired', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
-		'thm_operator_estimated' => array('type' => 'double', 'help' => 'THMOperatorEstimatedHelp','label' => 'THMOperatorEstimated', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
-		'thm_machine_estimated' => array('type' => 'double', 'help' => 'THMMachineEstimatedHelp', 'label' => 'THMMachineEstimated', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
-		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'default' => 1, 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'),),
+		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 1, 'noteditable' => 0, 'default' => '', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'comment' => "Reference of object", 'csslist' => 'nowraponall'),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax125', 'showoncombobox' => '2',),
+		'type' => array('type' => 'varchar(8)', 'label' => 'Type', 'enabled' => 1, 'position' => 32, 'default' => '1', 'notnull' => 1, 'visible' => 1, 'arrayofkeyval' => array('HUMAN' => 'Human', 'MACHINE' => 'Machine', 'BOTH' => 'HumanMachine'),),
+		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+		'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 512, 'notnull' => -1, 'visible' => -2,),
+		'nb_operators_required' => array('type' => 'integer', 'label' => 'NbOperatorsRequired', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'thm_operator_estimated' => array('type' => 'double', 'help' => 'THMOperatorEstimatedHelp','label' => 'THMOperatorEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'thm_machine_estimated' => array('type' => 'double', 'help' => 'THMMachineEstimatedHelp', 'label' => 'THMMachineEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right', 'csslist' => 'maxwidth75imp'),
+		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'default' => '1', 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Disabled', '1' => 'Enabled'),),
 	);
 
 	/**

From 0c9795e9e8fba66a9361a897e748699acb62bd5f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 00:54:21 +0100
Subject: [PATCH 1442/1862] Fix PhanTypeMismatchPropertyDefault

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

diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index b1057e8f2db..59b11b3a603 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -101,7 +101,7 @@ class Hook extends CommonObject
 			'enabled' => 1,
 			'visible' => 0,
 			'notnull' => 1,
-			'default' => 1,
+			'default' => '1',
 			'index' => 1,
 			'position' => 20,
 		),
@@ -178,7 +178,7 @@ class Hook extends CommonObject
 			'enabled' => 1,
 			'visible' => 1,
 			'notnull' => 1,
-			'default' => 0,
+			'default' => '0',
 			'index' => 1,
 			'position' => 1000,
 			'arrayofkeyval' => array(

From 23785393a3b6dac26ca69c5323e8c7ae4dfcaaad Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 02:04:16 +0100
Subject: [PATCH 1443/1862] Add csslist to json keys

---
 htdocs/adherents/class/adherent.class.php                     | 2 +-
 htdocs/adherents/class/subscription.class.php                 | 2 +-
 htdocs/asset/class/asset.class.php                            | 2 +-
 htdocs/asset/class/assetdepreciationoptions.class.php         | 2 +-
 htdocs/asset/class/assetmodel.class.php                       | 2 +-
 htdocs/bom/class/bom.class.php                                | 2 +-
 htdocs/bookcal/class/availabilities.class.php                 | 2 +-
 htdocs/bookcal/class/calendar.class.php                       | 2 +-
 htdocs/comm/action/class/actioncommreminder.class.php         | 2 +-
 htdocs/comm/propal/class/propal.class.php                     | 2 +-
 htdocs/commande/class/commande.class.php                      | 2 +-
 htdocs/compta/bank/class/account.class.php                    | 2 +-
 htdocs/compta/bank/class/paymentvarious.class.php             | 2 +-
 htdocs/compta/facture/class/facture-rec.class.php             | 2 +-
 htdocs/compta/facture/class/facture.class.php                 | 2 +-
 htdocs/compta/prelevement/class/bonprelevement.class.php      | 2 +-
 htdocs/contact/class/contact.class.php                        | 2 +-
 htdocs/contrat/class/contrat.class.php                        | 2 +-
 htdocs/core/class/commonobject.class.php                      | 2 +-
 htdocs/core/class/defaultvalues.class.php                     | 2 +-
 htdocs/core/class/emailsenderprofile.class.php                | 2 +-
 htdocs/core/class/timespent.class.php                         | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php          | 2 +-
 htdocs/emailcollector/class/emailcollectoraction.class.php    | 2 +-
 htdocs/emailcollector/class/emailcollectorfilter.class.php    | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php    | 2 +-
 .../class/conferenceorboothattendee.class.php                 | 2 +-
 htdocs/expedition/class/expedition.class.php                  | 2 +-
 htdocs/expensereport/class/expensereport_ik.class.php         | 2 +-
 htdocs/expensereport/class/expensereport_rule.class.php       | 2 +-
 htdocs/fourn/class/fournisseur.facture-rec.class.php          | 2 +-
 htdocs/hrm/class/evaluation.class.php                         | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                      | 2 +-
 htdocs/hrm/class/job.class.php                                | 2 +-
 htdocs/hrm/class/position.class.php                           | 2 +-
 htdocs/hrm/class/skill.class.php                              | 2 +-
 htdocs/hrm/class/skilldet.class.php                           | 2 +-
 htdocs/hrm/class/skillrank.class.php                          | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php    | 2 +-
 htdocs/modulebuilder/template/class/myobject.class.php        | 2 +-
 htdocs/mrp/class/mo.class.php                                 | 2 +-
 htdocs/opensurvey/class/opensurveysondage.class.php           | 2 +-
 htdocs/partnership/class/partnership.class.php                | 2 +-
 htdocs/product/class/product.class.php                        | 2 +-
 htdocs/product/class/productcustomerprice.class.php           | 2 +-
 htdocs/product/class/productfournisseurprice.class.php        | 2 +-
 htdocs/product/inventory/class/inventory.class.php            | 4 ++--
 htdocs/product/stock/class/entrepot.class.php                 | 2 +-
 htdocs/product/stock/class/productlot.class.php               | 2 +-
 .../product/stock/stocktransfer/class/stocktransfer.class.php | 2 +-
 .../stock/stocktransfer/class/stocktransferline.class.php     | 2 +-
 htdocs/projet/class/project.class.php                         | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php     | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php     | 2 +-
 htdocs/salaries/class/paymentsalary.class.php                 | 2 +-
 htdocs/societe/class/companybankaccount.class.php             | 2 +-
 htdocs/societe/class/companypaymentmode.class.php             | 2 +-
 htdocs/societe/class/societe.class.php                        | 2 +-
 htdocs/societe/class/societeaccount.class.php                 | 2 +-
 htdocs/ticket/class/cticketcategory.class.php                 | 2 +-
 htdocs/variants/class/ProductAttribute.class.php              | 2 +-
 htdocs/variants/class/ProductAttributeValue.class.php         | 2 +-
 htdocs/webhook/class/target.class.php                         | 2 +-
 htdocs/webportal/class/webportalinvoice.class.php             | 2 +-
 htdocs/webportal/class/webportalmember.class.php              | 2 +-
 htdocs/webportal/class/webportalorder.class.php               | 2 +-
 htdocs/webportal/class/webportalpartnership.class.php         | 2 +-
 htdocs/webportal/class/webportalpropal.class.php              | 2 +-
 htdocs/website/class/websitepage.class.php                    | 2 +-
 htdocs/workstation/class/workstation.class.php                | 2 +-
 htdocs/workstation/class/workstationresource.class.php        | 2 +-
 htdocs/workstation/class/workstationusergroup.class.php       | 2 +-
 htdocs/zapier/class/hook.class.php                            | 2 +-
 73 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 7b747238feb..b5f319bb70c 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -316,7 +316,7 @@ class Adherent extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 40aa0ab512a..c268ac3ab6e 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -104,7 +104,7 @@ class Subscription extends CommonObject
 	public $fk_bank;
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index cd323db81e1..3d62ba4c91a 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -94,7 +94,7 @@ class Asset extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index 1be3533eedd..0aa62c55919 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -65,7 +65,7 @@ class AssetDepreciationOptions extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index b5124a52222..8576e5ee37e 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -100,7 +100,7 @@ class AssetModel extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 151ff183f1f..1aa3f31ddae 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -111,7 +111,7 @@ class BOM extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 7011ad5d5b8..66ca4625151 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -112,7 +112,7 @@ class Availabilities extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 923e19b973c..539ef39e5ed 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -112,7 +112,7 @@ class Calendar extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'right', 'comment' => "Id"),
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index a85489dd251..1c8dd2b5b95 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -76,7 +76,7 @@ class ActionCommReminder extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 74297cb8da1..2950d5d2248 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -308,7 +308,7 @@ class Propal extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2e7df64469b..8d67611ad20 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -297,7 +297,7 @@ class Commande extends CommonOrder
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 30df1f264b1..94d4b4247b1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -312,7 +312,7 @@ class Account extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 7e54567fc47..6e3a2f28c67 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -198,7 +198,7 @@ class PaymentVarious extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		// TODO: fill this array
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index a260028394a..bb7a8ab2ace 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -172,7 +172,7 @@ class FactureRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 49fb76c1cd1..55c89240fa8 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -291,7 +291,7 @@ class Facture extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 1),
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 4271f0c962e..a58cb34a0b5 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -145,7 +145,7 @@ class BonPrelevement extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 0,),
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 05c12e15c24..eb927368976 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -98,7 +98,7 @@ class Contact extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 7371e619dee..232084addce 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -243,7 +243,7 @@ class Contrat extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6d3d2c65557..7a65cefee01 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -140,7 +140,7 @@ abstract class CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index c0c4486cc4b..9a47a8843e8 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -87,7 +87,7 @@ class DefaultValues extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index d9f8aa251cc..f3e1c04be92 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -89,7 +89,7 @@ class EmailSenderProfile extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index f4c2a452921..e0ca486ad9e 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -112,7 +112,7 @@ class TimeSpent extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index b885ba5340b..214b1731a94 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -120,7 +120,7 @@ class EmailCollector extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => 2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1),
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index dc5e4a44c49..85c9ad7dc83 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -79,7 +79,7 @@ class EmailCollectorAction extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 251281d91d9..0089e5f0b6c 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -81,7 +81,7 @@ class EmailCollectorFilter extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 598f0b16791..683a8d016fe 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -112,7 +112,7 @@ class ConferenceOrBooth extends ActionComm
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 9ec2a5b78e0..7b898c6cc12 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -100,7 +100,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 6afc9492235..4f9ef208d88 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -92,7 +92,7 @@ class Expedition extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 2bff41e8acb..14727b498e7 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -72,7 +72,7 @@ class ExpenseReportIk extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'index' => 1)
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 2ec09b40e6c..7c640527055 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -110,7 +110,7 @@ class ExpenseReportRule extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'index' => 1)
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 59dcb459d47..900ee4d014a 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -190,7 +190,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 1cae9e08bf1..7bf46c30b86 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -103,7 +103,7 @@ class Evaluation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index c15d05692b2..ad7c91c86d9 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -102,7 +102,7 @@ class EvaluationLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 1b262a51360..e1a355b54cd 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -101,7 +101,7 @@ class Job extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 392ad7a5a13..f96cb1539a2 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -100,7 +100,7 @@ class Position extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 11d6cb47c0d..c895035010d 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -106,7 +106,7 @@ class Skill extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index dd0b76adee3..12258e08025 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -100,7 +100,7 @@ class Skilldet extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 7398fa4ff6b..4c599235f72 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -104,7 +104,7 @@ class SkillRank extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 7650eabfab9..2b5f1e56d4f 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -99,7 +99,7 @@ class KnowledgeRecord extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c7d56bfc777..fbf37e0e025 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -116,7 +116,7 @@ class MyObject extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 9ec47220047..082a27a1ead 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -94,7 +94,7 @@ class Mo extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 29110bc16d4..8e57437c2cd 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -101,7 +101,7 @@ class Opensurveysondage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id_sondage' => array('type' => 'varchar(16)', 'label' => 'Idsondage', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => -1,),
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index d46c5b6fea1..51e44645703 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -104,7 +104,7 @@ class Partnership extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 00a07fbfe83..5c59e925394 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -583,7 +583,7 @@ class Product extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 5986ad96bfa..7120d9b3434 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class ProductCustomerPrice extends CommonObject
 {
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => 1, 'noteditable' => 1),
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index a5b432425ac..d5f64ad5e0f 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -92,7 +92,7 @@ class ProductFournisseurPrice extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 09eb95025c5..13e793e2920 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -96,7 +96,7 @@ class Inventory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'              => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
@@ -826,7 +826,7 @@ class InventoryLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 2cf53aea7c5..2ffb55706f8 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -121,7 +121,7 @@ class Entrepot extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f344073e07a..537a4bb9b3d 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -99,7 +99,7 @@ class Productlot extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 6749476358f..f29ae639830 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -124,7 +124,7 @@ class StockTransfer extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index fdab599afcb..af7e7946e72 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -94,7 +94,7 @@ class StockTransferLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 436d080774d..ad0fa548c13 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -293,7 +293,7 @@ class Project extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 74afa39f56a..8ded276c054 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -107,7 +107,7 @@ class RecruitmentCandidature extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 0c6542d8ba2..219c2503053 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -113,7 +113,7 @@ class RecruitmentJobPosition extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index c4ccb8b8845..c099b10c41e 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -153,7 +153,7 @@ class PaymentSalary extends CommonObject
 	public $datev = '';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index b8e2a301b84..86bbab8910c 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -86,7 +86,7 @@ class CompanyBankAccount extends Account
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,),
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 068d6138b5b..fae5b162b2e 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -83,7 +83,7 @@ class CompanyPaymentMode extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'Rowid', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 81cb820fb49..42bae7b3096 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -188,7 +188,7 @@ class Societe extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 2a08a81f584..29819dbfdcc 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -76,7 +76,7 @@ class SocieteAccount extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 
 	public $fields = array(
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index dbe37cb4be4..e4bcccb7e5e 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -98,7 +98,7 @@ class CTicketCategory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 7ea87524d7a..255a1428386 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -98,7 +98,7 @@ class ProductAttribute extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 01de2a2ed84..a6ddfcd9570 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -76,7 +76,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 634c75a2c33..4b6db01486a 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -101,7 +101,7 @@ class Target extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php
index 5212a7e433f..ddb7e7bec8a 100644
--- a/htdocs/webportal/class/webportalinvoice.class.php
+++ b/htdocs/webportal/class/webportalinvoice.class.php
@@ -97,7 +97,7 @@ class WebPortalInvoice extends Facture
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1,),
diff --git a/htdocs/webportal/class/webportalmember.class.php b/htdocs/webportal/class/webportalmember.class.php
index 742dc71dda3..c4954e4886d 100644
--- a/htdocs/webportal/class/webportalmember.class.php
+++ b/htdocs/webportal/class/webportalmember.class.php
@@ -113,7 +113,7 @@ class WebPortalMember extends Adherent
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
diff --git a/htdocs/webportal/class/webportalorder.class.php b/htdocs/webportal/class/webportalorder.class.php
index 03a2331a75a..e9cd8757b61 100644
--- a/htdocs/webportal/class/webportalorder.class.php
+++ b/htdocs/webportal/class/webportalorder.class.php
@@ -98,7 +98,7 @@ class WebPortalOrder extends Commande
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
diff --git a/htdocs/webportal/class/webportalpartnership.class.php b/htdocs/webportal/class/webportalpartnership.class.php
index d67cd26083b..78b87cc04dd 100644
--- a/htdocs/webportal/class/webportalpartnership.class.php
+++ b/htdocs/webportal/class/webportalpartnership.class.php
@@ -97,7 +97,7 @@ class WebPortalPartnership extends Partnership
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
diff --git a/htdocs/webportal/class/webportalpropal.class.php b/htdocs/webportal/class/webportalpropal.class.php
index 0a365361114..c49d8bfd686 100644
--- a/htdocs/webportal/class/webportalpropal.class.php
+++ b/htdocs/webportal/class/webportalpropal.class.php
@@ -98,7 +98,7 @@ class WebPortalPropal extends Propal
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 03f8949a389..2da0b7f5390 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -163,7 +163,7 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'          => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index d2b47492405..f7542c226f1 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -96,7 +96,7 @@ class Workstation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 853bba00724..83a326ead04 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -36,7 +36,7 @@ class WorkstationResource extends CommonObject
 	public $element = 'workstationresource';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index 54e342ba09a..290b6d34714 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -35,7 +35,7 @@ class WorkstationUserGroup extends CommonObject
 	public $element = 'workstationusergroup';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 59b11b3a603..edd9e77cb70 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -81,7 +81,7 @@ class Hook extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array(

From 9fd8b8c8e8213a4a6f1b05e690e93990c7eae22a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:59:36 +0100
Subject: [PATCH 1444/1862] Qual: Enable PhanTypeMismatchPropertyDefault

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index ce9b3840be4..ee945388e74 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -601,7 +601,7 @@ return [
 		'PhanUndeclaredMethod',
 		'PhanTypeMismatchArgumentProbablyReal',
 		'PhanPluginDuplicateExpressionAssignmentOperation',  // Suggestions for optimisation
-		'PhanTypeMismatchPropertyDefault',
+		// 'PhanTypeMismatchPropertyDefault',
 		// 'PhanPluginAlwaysReturnMethod',
 		// 'PhanPluginMissingReturnMethod',
 		'PhanUndeclaredTypeReturnType',

From cca4bef00b6c5e2abf3c795fb75d97878afd4d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 15 Mar 2024 08:06:27 +0100
Subject: [PATCH 1445/1862] fix warning

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 33ec278f646..c2d13c792c2 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012  Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2010-2014  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017       Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -314,7 +314,7 @@ if ($object->id > 0) {
 	}
 
 	$author = new User($db);
-	if ($object->fk_user_author) {
+	if (!empty($object->fk_user_author)) {
 		$author->fetch($object->fk_user_author);
 	}
 

From b1ce17dd4e7bec29d8d6df55fa89806010f7cc33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Fri, 15 Mar 2024 08:09:50 +0100
Subject: [PATCH 1446/1862] fix warning

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index c2d13c792c2..2371f6ff59a 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -314,7 +314,9 @@ if ($object->id > 0) {
 	}
 
 	$author = new User($db);
-	if (!empty($object->fk_user_author)) {
+	if (!empty($object->user_creation_id)) {
+		$author->fetch($object->user_creation_id);
+	} elseif (!empty($object->fk_user_author)) {
 		$author->fetch($object->fk_user_author);
 	}
 

From 105a0831fa4ceb49913af4e60c275cd20125c86a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 08:40:35 +0100
Subject: [PATCH 1447/1862] Update contact.class.php

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

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 7ba67557e6b..d6c3387d89e 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -604,7 +604,7 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		$this->country_id = empty($this->country_id) || $this->country_id < 0 ? 0 : $this->country_id;
+		$this->country_id = (empty($this->country_id) || $this->country_id < 0) ? 0 : $this->country_id;
 		if (empty($this->statut)) {
 			$this->statut = 0;
 		}

From 0872f825eca2e55ec866fb03bf0a12a9b0407b1a Mon Sep 17 00:00:00 2001
From: jyhere <jyhere@gmail.com>
Date: Fri, 15 Mar 2024 09:10:17 +0100
Subject: [PATCH 1448/1862] FIX: use getDolGlobalInt

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

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 7b8092ef81d..b06415364a6 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -137,7 +137,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 		});
 
 		/* Autofill the code with label */
-		<?php if (empty($conf->global->MAIN_EXTRAFIELDS_CODE_AUTOFILL_DISABLED)) : ?>
+		<?php if (!getDolGlobalInt('MAIN_EXTRAFIELDS_CODE_AUTOFILL_DISABLED')) : ?>
 		jQuery("#label").keyup(function() {
 			console.log("Update new field");
 			$("#attrname").val( $(this).val().normalize('NFD').replace(/\s/g, "_").replace(/[^a-zA-Z0-9_]/g, '').toLowerCase() );

From 5cdf7c73b1ee38c836a30e6ec12be06ce7b95b1d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 15 Mar 2024 09:22:46 +0100
Subject: [PATCH 1449/1862] NEW: Label on Price fix:#28544

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 8c0acb88b58..40bbfdecd51 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1760,6 +1760,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+			print '<td class="right">'.$langs->trans("Label").'</td>';
 			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
 			if ($user->hasRight('produit', 'supprimer')) {
 				print '<td class="right">&nbsp;</td>';
@@ -2318,7 +2319,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		print '<table class="liste centpercent">'."\n";
 
 		if (count($prodcustprice->lines) > 0 || $search_soc) {
-			$colspan = 9;
+			$colspan = 10;
 			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
 				$colspan++;
 			}

From 09e75b6c901608dd5bf93848e654fdb39d194524 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 15 Mar 2024 09:24:45 +0100
Subject: [PATCH 1450/1862] NEW: Label on Price fix:#28544

---
 htdocs/langs/en_US/products.lang | 1 +
 htdocs/langs/fr_FR/products.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 93bf150de17..dbdc58acdcb 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -437,3 +437,4 @@ AllowStockMovementVariantParent=Also records stock movements on parent products
 AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
+PriceLabel=Price label
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index b794cbde418..a939cc392ba 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -436,3 +436,4 @@ WarningConvertFromBatchToSerial=Si vous disposez actuellement d'une quantité su
 AllowStockMovementVariantParent=Enregistre également les mouvements de stock sur les produits parent des produits variants
 AllowStockMovementVariantParentHelp=Par défaut, un parent d'une variante est un produit virtuel, donc aucun stock n'est géré pour celui-ci. En activant cette option, un stock sera géré pour les produits parents et à chaque fois qu'une quantité de stock est modifiée pour une variante de produit, la même quantité sera modifiée pour le produit parent. Vous ne devriez pas avoir besoin de cette option, sauf si vous utilisez une variante pour gérer le même produit que le parent (mais avec des descriptions, des prix différents...)
 ConfirmSetToDraftInventory=Êtes-vous sûr de vouloir revenir à l'état de brouillon ?<br>Les quantités actuellement définies dans l'inventaire seront réinitialisées.
+PriceLabel=Libellé du prix

From 30037a5cba4c4e5aac61f365ae59961b5573d67d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 15 Mar 2024 09:30:21 +0100
Subject: [PATCH 1451/1862] Fix: Test removalof one phan exception

---
 htdocs/core/lib/functions.lib.php | 10 +++++-----
 htdocs/product/card.php           | 11 ++---------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d4e0c2e5d56..da57c3863a8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5608,19 +5608,19 @@ function dol_print_error($db = null, $error = '', $errors = null)
 	}
 
 	if ($error || $errors) {
-		$langs->load("errors");
-
 		// Merge all into $errors array
 		if (is_array($error) && is_array($errors)) {
 			$errors = array_merge($error, $errors);
-		} elseif (is_array($error)) {
+		} elseif (is_array($error)) {	// deprecated, use second parameters
 			$errors = $error;
-		} elseif (is_array($errors)) {
+		} elseif (is_array($errors) && !empty($error)) {
 			$errors = array_merge(array($error), $errors);
-		} else {
+		} elseif (!empty($error)) {
 			$errors = array_merge(array($error), array($errors));
 		}
 
+		$langs->load("errors");
+
 		foreach ($errors as $msg) {
 			if (empty($msg)) {
 				continue;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 3b028e50d73..086163975a3 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -972,14 +972,7 @@ if (empty($reshook)) {
 							$mesg .= ' <a href="' . $_SERVER["PHP_SELF"] . '?ref=' . $clone->ref . '">' . $langs->trans("ShowCardHere") . '</a>.';
 							setEventMessages($mesg, null, 'errors');
 						} else {
-							if (count($clone->errors)) {
-								setEventMessages($clone->error, $clone->errors, 'errors');
-								// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-								dol_print_error($db, $clone->errors);
-							} else {
-								setEventMessages($langs->trans($clone->error), null, 'errors');
-								dol_print_error($db, $clone->error);
-							}
+							setEventMessages(empty($clone->error) ? '' : $langs->trans($clone->error), $clone->errors, 'errors');
 						}
 						$error++;
 					}
@@ -998,7 +991,7 @@ if (empty($reshook)) {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NewRefForClone")), null, 'errors');
 				}
 			} else {
-				dol_print_error($db, $object->error);
+				dol_print_error($db, $object->error, $object->errors);
 			}
 		}
 		$action = 'clone';

From 3384a0b84760aeff1a6d8f7e3307eff170efee6e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 04:22:49 +0100
Subject: [PATCH 1452/1862] Fix & enable PhanUndeclaredTypeReturnType

# Fix & enable PhanUndeclaredTypeReturnType

One typo, and replace 'number' with int or int|float
---
 dev/tools/phan/config.php                     |  2 +-
 .../accountancy/class/bookkeeping.class.php   |  2 +-
 .../sociales/class/chargesociales.class.php   |  2 +-
 htdocs/core/class/evalmath.class.php          | 17 ++++---
 htdocs/core/lib/pdf.lib.php                   | 51 ++++++++++---------
 htdocs/install/inc.php                        |  2 +-
 6 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4232427191a..9e5069ba4b4 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -604,7 +604,7 @@ return [
 		// 'PhanTypeMismatchPropertyDefault',
 		// 'PhanPluginAlwaysReturnMethod',
 		// 'PhanPluginMissingReturnMethod',
-		'PhanUndeclaredTypeReturnType',
+		// 'PhanUndeclaredTypeReturnType',
 		'PhanUndeclaredClassProperty',
 		'PhanTypeArraySuspiciousNullable',
 		// 'PhanPluginInconsistentReturnMethod',
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 6d47b7fe700..6a261a146cd 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1514,7 +1514,7 @@ class BookKeeping extends CommonObject
 	 * @param  string  $field          Field
 	 * @param  string  $value          Value
 	 * @param  string  $mode           Mode ('' or _tmp')
-	 * @return number                  Return integer <0 if KO, >0 if OK
+	 * @return int                     Return integer <0 if KO, >0 if OK
 	 */
 	public function updateByMvt($piece_num = '', $field = '', $value = '', $mode = '')
 	{
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index b08bcacfc9a..153cb7d53ff 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -407,7 +407,7 @@ class ChargeSociales extends CommonObject
 	 * Calculate amount remaining to pay by year
 	 *
 	 * @param   int     $year       Year
-	 * @return  number
+	 * @return  int|float
 	 */
 	public function solde($year = 0)
 	{
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index e47e7e7acd1..84fc25781a7 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -57,6 +57,9 @@
  *
  * AUTHOR INFORMATION
  * Copyright 2005, Miles Kaufmann.
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * LICENSE
  * Redistribution and use in source and binary forms, with or without
@@ -129,7 +132,7 @@ class EvalMath
 	 * Evaluate
 	 *
 	 * @param string $expr 	String
-	 * @return boolean|number|NULL|mixed Result
+	 * @return boolean|int|float|NULL|mixed Result
 	 */
 	public function e($expr)
 	{
@@ -140,7 +143,7 @@ class EvalMath
 	 * Evaluate
 	 *
 	 * @param string $expr 	String
-	 * @return boolean|number|NULL|mixed Result
+	 * @return boolean|int|float|NULL|mixed Result
 	 */
 	public function evaluate($expr)
 	{
@@ -166,8 +169,8 @@ class EvalMath
 			}
 			$this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
 			return $this->v[$matches[1]]; // and return the resulting value
-										  // ===============
-										  // is it a function assignment?
+			// ===============
+			// is it a function assignment?
 		} elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) {
 			$fnn = $matches[1]; // get the function name
 			if (in_array($matches[1], $this->fb)) { // make sure it isn't built in
@@ -252,7 +255,7 @@ class EvalMath
 
 		while (1) { // 1 Infinite Loop ;)
 			$op = substr($expr, $index, 1); // get the first character at the current index
-											// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+			// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
 			$match = array();
 			$ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match);
 			// ===============
@@ -261,7 +264,7 @@ class EvalMath
 				$index++;
 			} elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack
 				return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
-																		// ===============
+				// ===============
 			} elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
 				if ($ex) { // are we expecting an operator but have a number/variable/function/opening parenthesis?
 					$op = '*';
@@ -427,7 +430,7 @@ class EvalMath
 					}
 					eval('$stack->push('.$fnn.'($op1));'); // perfectly safe eval()
 				} elseif (array_key_exists($fnn, $this->f)) { // user function
-															  // get args
+					// get args
 					$args = array();
 					for ($i = count($this->f[$fnn]['args']) - 1; $i >= 0; $i--) {
 						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index ed3f5f8ef05..d7bc551cd5c 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2021-2022	Anthony Berton       	<anthony.berton@bb2a.fr>
  * Copyright (C) 2023       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -113,7 +114,7 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 	}
 
 	//print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
-	return array('width'=>$width, 'height'=>$height, 'unit'=>$unit);
+	return array('width' => $width, 'height' => $height, 'unit' => $unit);
 }
 
 /**
@@ -309,7 +310,7 @@ function pdf_getPDFFontSize($outputlangs)
  *
  * @param	string		$logo		Full path to logo file to use
  * @param	bool		$url		Image with url (true or false)
- * @return	number
+ * @return	int|float
  */
 function pdf_getHeightForLogo($logo, $url = false)
 {
@@ -1219,7 +1220,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 	// For customize footer
 	if (is_object($hookmanager)) {
-		$parameters = array('line1' => $line1, 'line2' => $line2, 'line3' => $line3, 'line4' => $line4, 'outputlangs'=>$outputlangs);
+		$parameters = array('line1' => $line1, 'line2' => $line2, 'line3' => $line3, 'line4' => $line4, 'outputlangs' => $outputlangs);
 		$action = '';
 		$hookmanager->executeHooks('pdf_pagefoot', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		if (!empty($hookmanager->resPrint) && $hidefreetext == 0) {
@@ -1433,7 +1434,7 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('pdf'=>$pdf, 'i'=>$i, 'outputlangs'=>$outputlangs, 'w'=>$w, 'h'=>$h, 'posx'=>$posx, 'posy'=>$posy, 'hideref'=>$hideref, 'hidedesc'=>$hidedesc, 'issupplierline'=>$issupplierline, 'special_code'=>$special_code);
+		$parameters = array('pdf' => $pdf, 'i' => $i, 'outputlangs' => $outputlangs, 'w' => $w, 'h' => $h, 'posx' => $posx, 'posy' => $posy, 'hideref' => $hideref, 'hidedesc' => $hidedesc, 'issupplierline' => $issupplierline, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_writelinedesc', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -1572,7 +1573,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					$libelleproduitservice = dol_concatdesc(
 						dol_concatdesc($libelleproduitservice, " * ".$subprodval[3]),
 						(!empty($qtyText) ?
-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText :
+							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1] * $qtyText :
 							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
 					);
 				}
@@ -1581,7 +1582,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					$libelleproduitservice = dol_concatdesc(
 						dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3]),
 						(!empty($qtyText) ?
-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText :
+							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1] * $qtyText :
 							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
 					);
 				}
@@ -1826,7 +1827,7 @@ function pdf_getlinenum($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinenum', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$result .= $hookmanager->resPrint;
@@ -1859,7 +1860,7 @@ function pdf_getlineref($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$result .= $hookmanager->resPrint;
@@ -1891,7 +1892,7 @@ function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$result .= $hookmanager->resPrint;
@@ -1923,7 +1924,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -1990,7 +1991,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2033,7 +2034,7 @@ function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2070,7 +2071,7 @@ function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2110,7 +2111,7 @@ function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2150,7 +2151,7 @@ function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2190,7 +2191,7 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2275,7 +2276,7 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2372,7 +2373,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code, 'sign'=>$sign);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code, 'sign' => $sign);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2428,7 +2429,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
-		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
+		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
@@ -2588,7 +2589,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 
 	// For add external linked objects
 	if (is_object($hookmanager)) {
-		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
+		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs' => $outputlangs);
 		$action = '';
 		$hookmanager->executeHooks('pdf_getLinkedObjects', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		if (!empty($hookmanager->resArray)) {
@@ -2625,7 +2626,7 @@ function pdf_getSizeForImage($realpath)
 			$height = $maxheight;
 		}
 	}
-	return array('width'=>$width, 'height'=>$height);
+	return array('width' => $width, 'height' => $height);
 }
 
 /**
@@ -2655,10 +2656,10 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 			}
 
 			$parameters = array(
-				'i'=>$i,
-				'outputlangs'=>$outputlangs,
-				'hidedetails'=>$hidedetails,
-				'special_code'=>$special_code
+				'i' => $i,
+				'outputlangs' => $outputlangs,
+				'hidedetails' => $hidedetails,
+				'special_code' => $special_code
 			);
 
 			$action = '';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index d896cae320c..871030cb774 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -164,7 +164,7 @@ if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) {
 		/**
 		 * Previx option with '-' for single characters and -- for more than single characters
 		 * @param string $arg
-		 * @return straing
+		 * @return string
 		 */
 		static function ($arg) {
 			if (strlen($arg) > 1) {

From 74ab4b5a54b0afce87d0d0455dc3e07b8629ba9e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 04:10:57 +0100
Subject: [PATCH 1453/1862] Fix typo in typing

# Fix typo in typing

Fix typo in typing straing->string.
---
 htdocs/install/inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index d896cae320c..871030cb774 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -164,7 +164,7 @@ if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) {
 		/**
 		 * Previx option with '-' for single characters and -- for more than single characters
 		 * @param string $arg
-		 * @return straing
+		 * @return string
 		 */
 		static function ($arg) {
 			if (strlen($arg) > 1) {

From 23fecf4524f3424bc5b79bd7bc9540fd73e925a3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:25:55 +0100
Subject: [PATCH 1454/1862] Fix Add to errors, not error which is not an array

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 232084addce..53102bc5a07 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1657,7 +1657,7 @@ class Contrat extends CommonObject
 					$contractline->id = $contractlineid;
 					$result = $contractline->insertExtraFields();
 					if ($result < 0) {
-						$this->error[] = $contractline->error;
+						$this->errors[] = $contractline->error;
 						$error++;
 					}
 				}
@@ -1851,7 +1851,7 @@ class Contrat extends CommonObject
 
 				$result = $contractline->insertExtraFields();
 				if ($result < 0) {
-					$this->error[] = $contractline->error;
+					$this->errors[] = $contractline->error;
 					$error++;
 				}
 			}

From b28a17ee5195c2290a81a9424f75859d1f9fcc25 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:28:10 +0100
Subject: [PATCH 1455/1862] Fix Assign to error as string, not to error as
 array

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

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index ef23ce4857d..7e183f75362 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -884,7 +884,7 @@ class ProductCombination
 			if ($result < 0) {
 				//In case the error is not related with an already existing product
 				if ($newproduct->error != 'ErrorProductAlreadyExists') {
-					$this->error[] = $newproduct->error;
+					$this->error = $newproduct->error;
 					$this->errors = $newproduct->errors;
 					$this->db->rollback();
 					return -1;

From b57b4c8f1733fd578350862965417d1a1e05cd14 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:42:07 +0100
Subject: [PATCH 1456/1862] Qual: Improve typing hints, in particular sendtoid

---
 htdocs/core/class/commonobject.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 44de1d12109..9b4c10a21fd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -226,13 +226,13 @@ abstract class CommonObject
 
 	/**
 	 * @var Project 		The related project object
-	 * @deprecated
-	 * @see project
+	 * @deprecated  Use $project instead
+	 * @see $project
 	 */
 	public $projet;
 
 	/**
-	 * @deprecated
+	 * @deprecated  Use $fk_project instead
 	 * @see $fk_project
 	 */
 	public $fk_projet;
@@ -322,7 +322,7 @@ abstract class CommonObject
 
 	/**
 	 * @var int 		The object's status. Use status instead.
-	 * @deprecated
+	 * @deprecated  Use $status instead
 	 * @see setStatut()
 	 */
 	public $statut;
@@ -369,7 +369,7 @@ abstract class CommonObject
 
 	/**
 	 * var	int			State ID
-	 * @deprecated	Use state_id. We can remove this property when the field 'fk_departement' have been renamed into 'state_id' in all tables
+	 * @deprecated	Use $state_id. We can remove this property when the field 'fk_departement' have been renamed into 'state_id' in all tables
 	 */
 	public $fk_departement;
 
@@ -447,7 +447,7 @@ abstract class CommonObject
 
 	/**
 	 * @var int 		Payment terms ID
-	 * @deprecated Kept for compatibility
+	 * @deprecated Use $cond_reglement_id instead - Kept for compatibility
 	 * @see cond_reglement_id;
 	 */
 	public $cond_reglement;
@@ -730,13 +730,13 @@ abstract class CommonObject
 	public $specimen = 0;
 
 	/**
-	 * @var	int			Id of contact to send object (used by the trigger of module Agenda)
+	 * @var	int[]		Id of contacts to send objects (mails, etc.)
 	 */
 	public $sendtoid;
 
 	/**
 	 * @var	float		Amount already paid from getSommePaiement() (used to show correct status)
-	 * @deprecated		Duplicate of $totalpaid
+	 * @deprecated		Use $totalpaid instead
 	 */
 	public $alreadypaid;
 	/**

From 6ab1e6e7d91d10f919d2bf818a262c2f8e247596 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:43:34 +0100
Subject: [PATCH 1457/1862] Qual: Add typing information

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

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 2a5dc287f2b..58a877cca75 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
 *  Copyright (C) 2013 Juanjo Menent		   <jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -29,6 +30,10 @@
 // $triggersendname must be set (can be '')
 // $actiontypecode can be set
 // $object and $uobject may be defined
+'
+@phan-var-force Societe      $mysoc
+@phan-var-force CommonObject $object
+';
 
 /*
  * Add file in email form
@@ -357,7 +362,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			$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=undefined&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-undefined", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 
-			$parameters = array('mode'=>'formemail');
+			$parameters = array('mode' => 'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
 
 			$subject = make_substitutions($subject, $substitutionarray);

From db0134183de93f8263f25e811578bd947d7c633c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:57:49 +0100
Subject: [PATCH 1458/1862] Qual: improve hist typing

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 0e9927aad5d..2c82eec316b 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -2043,6 +2043,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		}
 	}
 
+	'@phan-var-force array<int,array{userid:int,type:string,tododone:string,apicto:string,acode:string,alabel:string,note:string,id:int,percent:int<0,100>,datestart:int,dateend:int,fk_element:string,elementtype:string,contact_id:string,lastname:string,firstname:string,contact_photo:string,socpeaopleassigned:int[],login:string,userfirstname:string,userlastname:string,userphoto:string}> $histo';
+
 	if (isModEnabled('agenda') || (isModEnabled('mailing') && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 

From 07d63e5bf376b4c3f01918ee2ef04ae7ead3df3f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:02:25 +0100
Subject: [PATCH 1459/1862] Fix Add to errors, not error which is not an array

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

diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index b4d139a0120..d57a25e96ba 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013      Florian Henry	     <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2023-2024 Frédéric France       <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -615,7 +616,7 @@ class Delivery extends CommonObject
 			$result = $line->insertExtraFields();
 
 			if ($result < 0) {
-				$this->error[] = $line->error;
+				$this->errors[] = $line->error;
 				$error++;
 			}
 		}
@@ -826,7 +827,7 @@ class Delivery extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From 29644f2ae869c353ee59e0a64df6871d0ec1d5d9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:05:00 +0100
Subject: [PATCH 1460/1862] Fix Add to errors, not error which is not an array

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

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 51e44645703..b03747a8129 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -205,7 +205,7 @@ class Partnership extends CommonObject
 	public function create(User $user, $notrigger = 0)
 	{
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
-			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
+			$this->errors[] = "ErrorThirpdartyOrMemberidIsMandatory";
 			return -1;
 		}
 
@@ -522,7 +522,7 @@ class Partnership extends CommonObject
 	public function update(User $user, $notrigger = 0)
 	{
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
-			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
+			$this->errors[] = "ErrorThirpdartyOrMemberidIsMandatory"; // Mistyping in key is in translations
 			return -1;
 		}
 		if (empty($this->fk_user_creat)) {	// For the case the object was created with empty user (from public page).

From 18c4bfd808d03afc4347c9db8e4bbfb89002ea9e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:08:10 +0100
Subject: [PATCH 1461/1862] Fix Initialise ->error as ''

---
 .../dynamic_price/class/price_global_variable_updater.class.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index c0ec8226e3d..11b8b1db214 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 59abbda92ff3604af9877b137b2f3e5a8210e882 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:16:45 +0100
Subject: [PATCH 1462/1862] Fix Assign 0 to fk_bank not null (dolibarr's way)

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

diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index bd3ba374d76..c1f474af0db 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2018-2021	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  * Copyright (C) 2021		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 575e620300ef502c790d645375bdc6a9f10e299c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:19:01 +0100
Subject: [PATCH 1463/1862] Fix Assign 0 to fk_project, not null (dolibarr's
 way)

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index cd90cf86179..8084c99c40b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1196,9 +1197,9 @@ class FactureFournisseur extends CommonInvoice
 		}
 		if (isset($this->fk_project)) {
 			if (empty($this->fk_project)) {
-				$this->fk_project = null;
+				$this->fk_project = 0;
 			} else {
-				$this->fk_project = intval($this->fk_project);
+				$this->fk_project = (int) $this->fk_project;
 			}
 		}
 		if (isset($this->cond_reglement_id)) {

From cc5207a5316e42d4ce0ec2a7b6f5f2fe5cea114a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:20:38 +0100
Subject: [PATCH 1464/1862] Fix rate can be null

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

diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index f2ff645052c..ed4affb4e1a 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -90,7 +91,7 @@ class MultiCurrency extends CommonObject
 	public $fk_user;
 
 	/**
-	 * @var CurrencyRate|null 	The currency rate
+	 * @var ?CurrencyRate 	The currency rate
 	 */
 	public $rate;
 

From 3e49424f2fc04e76d3f83310512432ae4630df4c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:29:05 +0100
Subject: [PATCH 1465/1862] Fix finished can be null && defautl fk is 0

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 086163975a3..0f37edaf398 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -807,7 +807,7 @@ if (empty($reshook)) {
 				if ($fk_default_bom >= 0) {
 					$object->fk_default_bom = $fk_default_bom;
 				} else {
-					$object->fk_default_bom = null;
+					$object->fk_default_bom = 0;
 				}
 
 				$units = GETPOSTINT('units');
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5c59e925394..dc69488ce8b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -310,7 +310,7 @@ class Product extends CommonObject
 	/**
 	 * Status indicates whether the product is on sale '1' or not '0'
 	 * @var int
-	 * @deprecated
+	 * @deprecated  Use $status instead
 	 * @see $status
 	 */
 	public $tosell;
@@ -325,7 +325,7 @@ class Product extends CommonObject
 	/**
 	 * Status indicate whether the product is available for purchase '1' or not '0'
 	 * @var int
-	 * @deprecated
+	 * @deprecated Use $status_buy instead
 	 * @see $status_buy
 	 */
 	public $tobuy;
@@ -333,7 +333,7 @@ class Product extends CommonObject
 	/**
 	 * Status indicates whether the product is a finished product '1' or a raw material '0'
 	 *
-	 * @var int
+	 * @var ?int
 	 */
 	public $finished;
 

From 8cc6b3133778c7495f6e77c2e07a7f5b8975dec1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:25:44 +0100
Subject: [PATCH 1466/1862] Fix empty label is '', not null

---
 htdocs/public/stripe/ipn.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 1cbedcc9342..0b78780cfe4 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2018-2020  Thibault FOUCART       <support@ptibogxiv.net>
  * Copyright (C) 2018       Fédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2023       Laurent Destailleur    <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -689,7 +690,7 @@ if ($event->type == 'payout.created') {
 		$companypaymentmode->stripe_card_ref = $db->escape($event->data->object->id);
 		$companypaymentmode->fk_soc          = $idthirdparty;
 		$companypaymentmode->bank            = null;
-		$companypaymentmode->label           = null;
+		$companypaymentmode->label           = '';
 		$companypaymentmode->number          = $db->escape($event->data->object->id);
 		$companypaymentmode->last_four       = $db->escape($event->data->object->card->last4);
 		$companypaymentmode->card_type       = $db->escape($event->data->object->card->branding);
@@ -725,7 +726,7 @@ if ($event->type == 'payout.created') {
 	if ($companypaymentmode->id > 0) {
 		// If we found a payment mode with the ID
 		$companypaymentmode->bank            = null;
-		$companypaymentmode->label           = null;
+		$companypaymentmode->label           = '';
 		$companypaymentmode->number          = $db->escape($event->data->object->id);
 		$companypaymentmode->last_four       = $db->escape($event->data->object->card->last4);
 		$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name);

From 6a606bf7c11f033059a2663d761411d5ae2a0a20 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:34:07 +0100
Subject: [PATCH 1467/1862] Adjust typing for 'origin' & 'origin_object'

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9b4c10a21fd..ea197a8d0d0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -274,13 +274,13 @@ abstract class CommonObject
 	public $origin_id;
 
 	/**
-	 * @var	Object		Origin object. This is set by fetch_origin() from this->origin and this->origin_id.
+	 * @var	?CommonObject	Origin object. This is set by fetch_origin() from this->origin and this->origin_id.
 	 */
 	public $origin_object;
 
 	/**
-	 * @var string|CommonObject		Sometime the type of the originating object ('commande', 'facture', ...), sometime the object (like onh MouvementStock)
-	 * @deprecated					Use now $origin_type and $origin_id;
+	 * @var CommonObject|string|null	Sometimes the type of the originating object ('commande', 'facture', ...), sometimes the object (as with MouvementStock)
+	 * @deprecated						Use now $origin_type and $origin_id;
 	 * @see fetch_origin()
 	 */
 	public $origin;

From c31c883a9175e057d6ef7432fdd5d8b2bb6f3f02 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:37:09 +0100
Subject: [PATCH 1468/1862] Ensure typing for commandeFournisseur matches

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

diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 5d7b262f22e..67e29c85fc1 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
  * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -125,7 +126,7 @@ class Reception extends CommonObject
 	public $listmeths; // List of carriers
 
 	/**
-	 * @var CommandeFournisseur
+	 * @var ?CommandeFournisseur
 	 */
 	public $commandeFournisseur;
 
@@ -731,7 +732,11 @@ class Reception extends CommonObject
 				$this->fetch_origin();
 				if (empty($this->origin_object->lines)) {
 					$res = $this->origin_object->fetch_lines();
-					$this->commandeFournisseur = $this->origin_object;	// deprecated
+					if ($this->origin_object instanceof CommandeFournisseur) {
+						$this->commandeFournisseur = $this->origin_object;	// deprecated
+					} else {
+						$this->commandeFournisseur = null;	// deprecated
+					}
 					if ($res < 0) {
 						return $res;
 					}
@@ -742,7 +747,7 @@ class Reception extends CommonObject
 			$qty_wished = array();
 
 			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
-			$filter = array('t.fk_commande'=>$this->origin_id);
+			$filter = array('t.fk_commande' => $this->origin_id);
 			if (getDolGlobalInt('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 				$filter['t.status'] = 1; // Restrict to lines with status validated
 			}
@@ -1305,7 +1310,7 @@ class Reception extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array($this->element . 'dao'));
-		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;

From b072966cc8cd8e787c91d08cabb38b7c4eaf091c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:40:27 +0100
Subject: [PATCH 1469/1862] Fix Initialise id to 0 and ref to ''

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 0159b9b93a9..4e7024d83c2 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -402,7 +402,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 
 	if ($object->id > 0) {
 		$object->paye = 0;
-		$object->id = $object->ref = null;
+		$object->id = 0;
+		$object->ref = '';
 
 		if (GETPOST('amount', 'alphanohtml')) {
 			$object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);

From e36dccff599fd722c507068d5aef91186efc77d9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:46:14 +0100
Subject: [PATCH 1470/1862] Qual: better typing for getCountry()

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2c82eec316b..bae98beff93 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -524,7 +524,7 @@ function societe_admin_prepare_head()
  *    @param	Translate	$outputlangs	Langs object for output translation
  *    @param	int			$entconv       	0=Return value without entities and not converted to output charset, 1=Ready for html output
  *    @param	string		$searchlabel    Label of country to search (warning: searching on label is not reliable)
- *    @return	mixed       				Integer with country id or String with country code or translated country name or Array('id','code','label') or 'NotDefined'
+ *    @return	int|string|array{id:int,code:string,label:string}	Integer with country id or String with country code or translated country name or Array('id','code','label') or 'NotDefined'
  */
 function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs = null, $entconv = 1, $searchlabel = '')
 {

From 4e05ac84f147b878e80f890646ec71f08f85af11 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:55:43 +0100
Subject: [PATCH 1471/1862] Init code_client and code_fournisseur to '', not
 null

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 8eda5988f80..52921b28c80 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -562,12 +562,12 @@ if (empty($reshook)) {
 				} else {
 					if ($result == -3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors)) {
 						$duplicate_code_error = true;
-						$object->code_client = null;
+						$object->code_client = '';
 					}
 
 					if ($result == -3 && in_array('ErrorSupplierCodeAlreadyUsed', $object->errors)) {
 						$duplicate_code_error = true;
-						$object->code_fournisseur = null;
+						$object->code_fournisseur = '';
 					}
 
 					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {	// TODO Sometime errors on duplicate on profid and not on code, so we must manage this case

From 7025738db859466d284810e16ca4e82b4ef14b35 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 22:00:55 +0100
Subject: [PATCH 1472/1862] Fix fields initialisation

---
 .../class/companybankaccount.class.php        | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 86bbab8910c..a30927fafb3 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -94,43 +94,43 @@ class CompanyBankAccount extends Account
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'picto' => 'company', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 25, 'notnull' => 0, 'visible' => -1,),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => -1,),
-		'label' => array('type' => 'varchar(200)', 'label' => 'Label', 'enabled' => 1, 'position' => 35, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1', 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',),
-		'bank' => array('type' => 'varchar(255)', 'label' => 'Bank', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'code_banque' => array('type' => 'varchar(128)', 'label' => 'Codebanque', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'code_guichet' => array('type' => 'varchar(6)', 'label' => 'Codeguichet', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'number' => array('type' => 'varchar(255)', 'label' => 'Number', 'enabled' => 1, 'position' => 55, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'cle_rib' => array('type' => 'varchar(5)', 'label' => 'Clerib', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'bic' => array('type' => 'varchar(20)', 'label' => 'Bic', 'enabled' => 1, 'position' => 65, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'iban_prefix' => array('type' => 'varchar(34)', 'label' => 'Ibanprefix', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'domiciliation' => array('type' => 'varchar(255)', 'label' => 'Domiciliation', 'enabled' => 1, 'position' => 75, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'proprio' => array('type' => 'varchar(60)', 'label' => 'Proprio', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'owner_address' => array('type' => 'varchar(255)', 'label' => 'Owneraddress', 'enabled' => 1, 'position' => 85, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'default_rib' => array('type' => 'smallint(6)', 'label' => 'Defaultrib', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => '1',),
-		'state_id' => array('type' => 'integer', 'label' => 'Stateid', 'enabled' => 1, 'position' => 95, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'fk_country' => array('type' => 'integer', 'label' => 'Fkcountry', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1', 'css' => 'maxwidth500 widthcentpercentminusxx',),
-		'currency_code' => array('type' => 'varchar(3)', 'label' => 'Currencycode', 'enabled' => 1, 'position' => 105, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'rum' => array('type' => 'varchar(32)', 'label' => 'Rum', 'enabled' => 1, 'position' => 110, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'date_rum' => array('type' => 'date', 'label' => 'Daterum', 'enabled' => 1, 'position' => 115, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'frstrecur' => array('type' => 'varchar(16)', 'label' => 'Frstrecur', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 900, 'notnull' => 0, 'visible' => -2, 'alwayseditable' => '1',),
-		'last_four' => array('type' => 'varchar(4)', 'label' => 'Lastfour', 'enabled' => 1, 'position' => 130, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'card_type' => array('type' => 'varchar(255)', 'label' => 'Cardtype', 'enabled' => 1, 'position' => 135, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'cvn' => array('type' => 'varchar(255)', 'label' => 'Cvn', 'enabled' => 1, 'position' => 140, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'exp_date_month' => array('type' => 'integer', 'label' => 'Expdatemonth', 'enabled' => 1, 'position' => 145, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'exp_date_year' => array('type' => 'integer', 'label' => 'Expdateyear', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'country_code' => array('type' => 'varchar(10)', 'label' => 'Countrycode', 'enabled' => 1, 'position' => 155, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'approved' => array('type' => 'integer', 'label' => 'Approved', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'position' => 165, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'ending_date' => array('type' => 'date', 'label' => 'Endingdate', 'enabled' => 1, 'position' => 170, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'max_total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Maxtotalamountofallpayments', 'enabled' => 1, 'position' => 175, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'preapproval_key' => array('type' => 'varchar(255)', 'label' => 'Preapprovalkey', 'enabled' => 1, 'position' => 180, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'starting_date' => array('type' => 'date', 'label' => 'Startingdate', 'enabled' => 1, 'position' => 185, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Totalamountofallpayments', 'enabled' => 1, 'position' => 190, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'stripe_card_ref' => array('type' => 'varchar(128)', 'label' => 'Stripecardref', 'enabled' => 1, 'position' => 195, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => '1',),
-		'comment' => array('type' => 'varchar(255)', 'label' => 'Comment', 'enabled' => 1, 'position' => 205, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'ipaddress' => array('type' => 'varchar(68)', 'label' => 'Ipaddress', 'enabled' => 1, 'position' => 210, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
-		'stripe_account' => array('type' => 'varchar(128)', 'label' => 'Stripeaccount', 'enabled' => 1, 'position' => 215, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => '1',),
+		'label' => array('type' => 'varchar(200)', 'label' => 'Label', 'enabled' => 1, 'position' => 35, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',),
+		'bank' => array('type' => 'varchar(255)', 'label' => 'Bank', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'code_banque' => array('type' => 'varchar(128)', 'label' => 'Codebanque', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'code_guichet' => array('type' => 'varchar(6)', 'label' => 'Codeguichet', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'number' => array('type' => 'varchar(255)', 'label' => 'Number', 'enabled' => 1, 'position' => 55, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'cle_rib' => array('type' => 'varchar(5)', 'label' => 'Clerib', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'bic' => array('type' => 'varchar(20)', 'label' => 'Bic', 'enabled' => 1, 'position' => 65, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'iban_prefix' => array('type' => 'varchar(34)', 'label' => 'Ibanprefix', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'domiciliation' => array('type' => 'varchar(255)', 'label' => 'Domiciliation', 'enabled' => 1, 'position' => 75, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'proprio' => array('type' => 'varchar(60)', 'label' => 'Proprio', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'owner_address' => array('type' => 'varchar(255)', 'label' => 'Owneraddress', 'enabled' => 1, 'position' => 85, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'default_rib' => array('type' => 'smallint(6)', 'label' => 'Defaultrib', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1,),
+		'state_id' => array('type' => 'integer', 'label' => 'Stateid', 'enabled' => 1, 'position' => 95, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'fk_country' => array('type' => 'integer', 'label' => 'Fkcountry', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
+		'currency_code' => array('type' => 'varchar(3)', 'label' => 'Currencycode', 'enabled' => 1, 'position' => 105, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'rum' => array('type' => 'varchar(32)', 'label' => 'Rum', 'enabled' => 1, 'position' => 110, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'date_rum' => array('type' => 'date', 'label' => 'Daterum', 'enabled' => 1, 'position' => 115, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'frstrecur' => array('type' => 'varchar(16)', 'label' => 'Frstrecur', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 900, 'notnull' => 0, 'visible' => -2, 'alwayseditable' => 1,),
+		'last_four' => array('type' => 'varchar(4)', 'label' => 'Lastfour', 'enabled' => 1, 'position' => 130, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'card_type' => array('type' => 'varchar(255)', 'label' => 'Cardtype', 'enabled' => 1, 'position' => 135, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'cvn' => array('type' => 'varchar(255)', 'label' => 'Cvn', 'enabled' => 1, 'position' => 140, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'exp_date_month' => array('type' => 'integer', 'label' => 'Expdatemonth', 'enabled' => 1, 'position' => 145, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'exp_date_year' => array('type' => 'integer', 'label' => 'Expdateyear', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'country_code' => array('type' => 'varchar(10)', 'label' => 'Countrycode', 'enabled' => 1, 'position' => 155, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'approved' => array('type' => 'integer', 'label' => 'Approved', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'position' => 165, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'ending_date' => array('type' => 'date', 'label' => 'Endingdate', 'enabled' => 1, 'position' => 170, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'max_total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Maxtotalamountofallpayments', 'enabled' => 1, 'position' => 175, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'preapproval_key' => array('type' => 'varchar(255)', 'label' => 'Preapprovalkey', 'enabled' => 1, 'position' => 180, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'starting_date' => array('type' => 'date', 'label' => 'Startingdate', 'enabled' => 1, 'position' => 185, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'total_amount_of_all_payments' => array('type' => 'double(24,8)', 'label' => 'Totalamountofallpayments', 'enabled' => 1, 'position' => 190, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'stripe_card_ref' => array('type' => 'varchar(128)', 'label' => 'Stripecardref', 'enabled' => 1, 'position' => 195, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1,),
+		'comment' => array('type' => 'varchar(255)', 'label' => 'Comment', 'enabled' => 1, 'position' => 205, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'ipaddress' => array('type' => 'varchar(68)', 'label' => 'Ipaddress', 'enabled' => 1, 'position' => 210, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
+		'stripe_account' => array('type' => 'varchar(128)', 'label' => 'Stripeaccount', 'enabled' => 1, 'position' => 215, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
 		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => 0, 'position' => 230),
 	);
 

From a5acb448902189ba19839d467b5950501ba79a95 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 22:18:13 +0100
Subject: [PATCH 1473/1862] Fix origin_email and track_id can be null

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 778bd6ef730..cdfb8beef07 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -76,7 +76,7 @@ class Ticket extends CommonObject
 
 
 	/**
-	 * @var string Hash to identify ticket publicly
+	 * @var ?string Hash to identify ticket publicly
 	 */
 	public $track_id;
 
@@ -97,17 +97,17 @@ class Ticket extends CommonObject
 	public $fk_contract;
 
 	/**
-	 * @var string Person email who have create ticket
+	 * @var ?string Email of person who created the ticket
 	 */
 	public $origin_email;
 
 	/**
-	 * @var int User id who have create ticket
+	 * @var int User id who created the ticket
 	 */
 	public $fk_user_create;
 
 	/**
-	 * @var int User id who have ticket assigned
+	 * @var int User id who the ticket is assigned to
 	 */
 	public $fk_user_assign;
 

From ec6786ece323eb168c8a6fb1f4201b5046b5f0de Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:56:19 +0100
Subject: [PATCH 1474/1862] Detect PhanTypeMismatchPropertyProbablyReal

---
 dev/tools/phan/baseline.txt | 2 ++
 dev/tools/phan/config.php   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index c56fd81b5d6..0fa37276d34 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -70,6 +70,7 @@ return [
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/triggers/interface_80_modStripe_Stripe.class.php' => ['PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
@@ -82,6 +83,7 @@ return [
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/societe/paymentmodes.php' => ['PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4232427191a..c698f693e59 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -457,7 +457,7 @@ return [
 		'PhanPluginUnknownClosureReturnType',
 		// 'PhanPluginNoCommentOnProtectedMethod',
 		// 'PhanTypeArraySuspicious',
-		'PhanTypeMismatchPropertyProbablyReal',
+		// 'PhanTypeMismatchPropertyProbablyReal',
 		// 'PhanPluginNoCommentOnPrivateMethod',
 		'PhanPluginUnknownArrayFunctionReturnType',
 		'PhanTypeInvalidLeftOperandOfAdd',

From 651b5a22eb4fa52a79a420c02b29659268e6418d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:06:34 +0100
Subject: [PATCH 1475/1862] Fix & enable PhanTypeSuspiciousEcho

# Fix & enable PhanTypeSuspiciousEcho

Fix occurences by improving typing - array key was not found and
supposed null in a print statement.

Example:
  PhanTypeSuspiciousEcho Suspicious argument $menu_array[$i]['prefix'] of type null for an echo/print statement

Enabled detection because all cases are fixed
---
 dev/tools/phan/config.php                  |  2 +-
 htdocs/core/class/menu.class.php           |  3 +-
 htdocs/core/class/menubase.class.php       | 10 +--
 htdocs/core/menus/standard/auguria.lib.php | 14 +--
 htdocs/core/menus/standard/eldy.lib.php    | 99 ++++++++++++----------
 5 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4232427191a..201f4399965 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -526,7 +526,7 @@ return [
 		// 'PhanTypeMismatchArgumentInternalProbablyReal',
 		'PhanTypeMismatchBitwiseBinaryOperands',
 		'PhanTypeMismatchDimEmpty',
-		'PhanTypeSuspiciousEcho',
+		// 'PhanTypeSuspiciousEcho',
 		// 'PhanNoopBinaryOperator',
 		// 'PhanTypeInvalidBitwiseBinaryOperator',
 		// 'PhanPluginDescriptionlessCommentOnFunction',
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index f87766fff94..90299401453 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -31,7 +32,7 @@ class Menu
 	/**
 	 * List of menu items
 	 *
-	 * @var array<array{url:string,titre:string,level:string,enabled:int<0,2>,target:string,mainmenu:string,leftmenu:string,position:int,id:string,idsel:string,classname:string,prefix:string}>
+	 * @var array<array{url:string,titre:string,enabled:int<0,2>,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,id:string,idsel:string,classname:string,prefix:string}>
 	 */
 	public $liste;
 
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 85b6ca80901..d6b60144dfa 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -512,8 +512,8 @@ class Menubase
 	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
 	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
 	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tabMenu	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
-	 * 	@return  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	Return array with menu entries for top menu
+	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>	$tabMenu	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+	 * 	@return  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>	Return array with menu entries for top menu
 	 */
 	public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
 	{
@@ -542,7 +542,7 @@ class Menubase
 	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
 	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
 	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-	 * 	@param  array<array{rowid:string,fk_menu:string,module:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tabMenu	Array with menu entries already loaded
+	 * 	@param  array<array{rowid:string,fk_menu:string,module:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>	$tabMenu	Array with menu entries already loaded
 	 * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray
 	 */
 	public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
@@ -624,7 +624,7 @@ class Menubase
 	 *  @param	string	$myleftmenu     Value for left that defined leftmenu
 	 *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
 	 *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
-	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tabMenu	Array to store new entries found (in most cases, it's empty, but may be already filled)
+	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>	$tabMenu	Array to store new entries found (in most cases, it's empty, but may be already filled)
 	 *  @return int     		        >0 if OK, <0 if KO
 	 */
 	public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
@@ -757,7 +757,7 @@ class Menubase
 	/**
 	 *  Complete this->newmenu with menu entry found in $tab
 	 *
-	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>	$tab	Tab array with all menu entries
+	 * 	@param  array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>	$tab	Tab array with all menu entries
 	 *  @param  int		$pere			Id of parent
 	 *  @param  int		$level			Level
 	 *  @return	void
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 8509416d4fc..ddbd7fab4b9 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target (Example: '' or '_top')
  * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
- * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> $tabMenu		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level:int,prefix:string}> $tabMenu		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu	$menu			Object Menu to return back list of menu entries
  * @param	int		$noout			1=Disable output (Initialise &$menu only).
  * @param	string	$mode			'top', 'topnb', 'left', 'jmobile'
@@ -309,9 +309,9 @@ function print_end_menu_array_auguria()
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
  *
  * @param	DoliDB		$db                 Database handler
- * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
- * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
- * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
@@ -514,6 +514,10 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		//      array_multisort($position, $array1_sort_order, $menu_array);
 	}
 
+	// Phan has a hard time tracking the type, for instance because it get hookmanager->results
+	// Force the typing at this point to get useful analysis below:
+	'@phan-var-force array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string,level:int}> $menu_array';
+
 	// Show menu
 	$invert = !getDolGlobalString('MAIN_MENU_INVERT') ? "" : "invert";
 	if (empty($noout)) {
@@ -521,7 +525,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$blockvmenuopened = false;
 		$lastlevel0 = '';
 		$num = count($menu_array);
-		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
+		foreach (array_keys($menu_array) as $i) {     // Loop on each menu entry (foreach better for static analysis)
 			$showmenu = true;
 			if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($menu_array[$i]['enabled'])) {
 				$showmenu = false;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index a18a773f390..7fcb1c8f0d1 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018-2022 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -36,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target (Example: '' or '_top')
  * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
- * @param  	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$tabMenu        If array with menu entries already loaded, we put this array here (in most cases, it's empty). For eldy menu, it contains menu entries loaded from database.
+ * @param  	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$tabMenu        If array with menu entries already loaded, we put this array here (in most cases, it's empty). For eldy menu, it contains menu entries loaded from database.
  * @param	Menu	$menu			Object Menu to return back list of menu entries
  * @param	int		$noout			1=Disable output (Initialise &$menu only).
  * @param	string	$mode			'top', 'topnb', 'left', 'jmobile'
@@ -120,15 +121,15 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Third parties
 	$tmpentry = array(
-		'enabled'=> (
+		'enabled' => (
 			(
-			isModEnabled('societe') &&
+				isModEnabled('societe') &&
 			(!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS'))
-		)
+			)
 			|| (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))
 		),
-		'perms'=> ($user->hasRight('societe', 'lire') || $user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')),
-		'module'=>'societe|fournisseur'
+		'perms' => ($user->hasRight('societe', 'lire') || $user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')),
+		'module' => 'societe|fournisseur'
 	);
 	$menu_arr[] = array(
 		'name' => 'Companies',
@@ -151,9 +152,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Products-Services
 	$tmpentry = array(
-		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('shipping')),
-		'perms'=> ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
-		'module'=>'product|service'
+		'enabled' => (isModEnabled('product') || isModEnabled('service') || isModEnabled('shipping')),
+		'perms' => ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
+		'module' => 'product|service'
 	);
 	$menu_arr[] = array(
 		'name' => 'Products',
@@ -178,9 +179,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// MRP - GPAO
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('bom') || isModEnabled('mrp')),
-		'perms'=>($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),
-		'module'=>'bom|mrp'
+		'enabled' => (isModEnabled('bom') || isModEnabled('mrp')),
+		'perms' => ($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),
+		'module' => 'bom|mrp'
 	);
 	$menu_arr[] = array(
 		'name' => 'TMenuMRP',
@@ -203,9 +204,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Projects
 	$tmpentry = array(
-		'enabled'=> (isModEnabled('project') ? 1 : 0),
-		'perms'=> ($user->hasRight('projet', 'lire') ? 1 : 0),
-		'module'=>'projet'
+		'enabled' => (isModEnabled('project') ? 1 : 0),
+		'perms' => ($user->hasRight('projet', 'lire') ? 1 : 0),
+		'module' => 'projet'
 	);
 
 	if ($mode == 'jmobile') {
@@ -241,7 +242,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
-		'enabled'=>(
+		'enabled' => (
 			isModEnabled('propal')
 			|| isModEnabled('order')
 			|| isModEnabled('fournisseur')
@@ -250,7 +251,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| isModEnabled('contract')
 			|| isModEnabled('intervention')
 		) ? 1 : 0,
-		'perms'=>(
+		'perms' => (
 			$user->hasRight('propal', 'read')
 			|| $user->hasRight('commande', 'lire')
 			|| $user->hasRight('supplier_proposal', 'lire')
@@ -260,7 +261,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| $user->hasRight('contrat', 'lire')
 			|| $user->hasRight('ficheinter', 'lire')
 		),
-		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
+		'module' => 'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
 	$onlysupplierorder = $user->hasRight('fournisseur', 'commande', 'lire') &&
@@ -292,7 +293,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Billing - Financial
 	$tmpentry = array(
-		'enabled'=>(
+		'enabled' => (
 			isModEnabled('invoice') ||
 			isModEnabled('don') ||
 			isModEnabled('tax') ||
@@ -301,10 +302,10 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			isModEnabled('loan') ||
 			isModEnabled('margin')
 		) ? 1 : 0,
-		'perms'=>($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
+		'perms' => ($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
 			|| $user->hasRight('tax', 'charges', 'lire') || $user->hasRight('salaries', 'read')
 			|| $user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('loan', 'read') || $user->hasRight('margins', 'liretous')),
-		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
+		'module' => 'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(
 		'name' => 'Compta',
@@ -327,9 +328,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Bank
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('bank') || isModEnabled('prelevement')),
-		'perms'=>($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),
-		'module'=>'banque|prelevement|paymentbybanktransfer'
+		'enabled' => (isModEnabled('bank') || isModEnabled('prelevement')),
+		'perms' => ($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),
+		'module' => 'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
 		'name' => 'Bank',
@@ -352,9 +353,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Accounting
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
-		'perms'=>($user->hasRight('compta', 'resultat', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire') || $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('asset', 'read') || $user->hasRight('intracommreport', 'read')),
-		'module'=>'comptabilite|accounting|asset|intracommreport'
+		'enabled' => (isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
+		'perms' => ($user->hasRight('compta', 'resultat', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire') || $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('asset', 'read') || $user->hasRight('intracommreport', 'read')),
+		'module' => 'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(
 		'name' => 'Accounting',
@@ -377,9 +378,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// HRM
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),
-		'perms'=>($user->hasRight('user', 'user', 'lire') || $user->hasRight('holiday', 'read') || $user->hasRight('deplacement', 'lire') || $user->hasRight('expensereport', 'lire') || $user->hasRight('recruitment', 'recruitmentjobposition', 'read')),
-		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
+		'enabled' => (isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),
+		'perms' => ($user->hasRight('user', 'user', 'lire') || $user->hasRight('holiday', 'read') || $user->hasRight('deplacement', 'lire') || $user->hasRight('expensereport', 'lire') || $user->hasRight('recruitment', 'recruitmentjobposition', 'read')),
+		'module' => 'hrm|holiday|deplacement|expensereport|recruitment'
 	);
 
 	$menu_arr[] = array(
@@ -403,9 +404,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Tickets and Knowledge base
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
-		'perms'=>($user->hasRight('ticket', 'read') || $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')),
-		'module'=>'ticket|knowledgemanagement'
+		'enabled' => (isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
+		'perms' => ($user->hasRight('ticket', 'read') || $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')),
+		'module' => 'ticket|knowledgemanagement'
 	);
 	$link = '';
 	if (isModEnabled('ticket')) {
@@ -434,9 +435,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Tools
 	$tmpentry = array(
-		'enabled'=>1,
-		'perms'=>1,
-		'module'=>''
+		'enabled' => 1,
+		'perms' => 1,
+		'module' => ''
 	);
 	$menu_arr[] = array(
 		'name' => 'Tools',
@@ -638,7 +639,7 @@ function print_start_menu_entry($idsel, $classname, $showmode)
  * @param	string	$idsel			Id sel
  * @param	string	$classname		Class name
  * @param	string	$atarget		Target
- * @param	array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string} 	$menuval		All the $menuval array
+ * @param	array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string} 	$menuval		All the $menuval array
  * @return	void
  */
 function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
@@ -719,9 +720,9 @@ function print_end_menu_array()
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
  *
  * @param	DoliDB		$db                 Database handler
- * @param 	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
- * @param   array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
- * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param 	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param   array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int			$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
@@ -738,8 +739,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 	$newmenu = $menu;
 
-	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]??'');
-	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]??''));
+	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"] ?? '');
+	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"] ?? ''));
 
 	if (is_null($mainmenu)) {
 		$mainmenu = 'home';
@@ -931,6 +932,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	 $cursor++;
 	 }*/
 
+	// Force the typing at this point to get useful analysis below:
+	'@phan-var-force array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> $menu_array';
+
+
 	// Show menu
 	$invert = !getDolGlobalString('MAIN_MENU_INVERT') ? "" : "invert";
 	if (empty($noout)) {
@@ -938,7 +943,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		$blockvmenuopened = false;
 		$lastlevel0 = '';
 		$num = count($menu_array);
-		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
+		foreach (array_keys($menu_array) as $i) {     // Loop on each menu entry (got better static analysis)
 			$showmenu = true;
 			if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($menu_array[$i]['enabled'])) {
 				$showmenu = false;
@@ -2038,7 +2043,7 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 
 		// Cash Control
 		if (isModEnabled('takepos') || isModEnabled('cashdesk')) {
-			$permtomakecashfence = ($user->hasRight('cashdesk', 'run')|| $user->hasRight('takepos', 'run'));
+			$permtomakecashfence = ($user->hasRight('cashdesk', 'run') || $user->hasRight('takepos', 'run'));
 			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("CashControl"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol', 0, '', '', '', img_picto('', 'pos', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);
 			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("List"), 1, $permtomakecashfence);
@@ -2245,9 +2250,9 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$search_project_user = GETPOSTINT('search_project_user');
 
 			$tmpentry = array(
-				'enabled'=>isModEnabled('project'),
-				'perms'=>$user->hasRight('projet', 'lire'),
-				'module'=>'projet'
+				'enabled' => isModEnabled('project'),
+				'perms' => $user->hasRight('projet', 'lire'),
+				'module' => 'projet'
 			);
 			$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 			$showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);

From 778f7b0fbf3a2d5698407e282b6c5086c4efe24c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 15 Mar 2024 10:21:17 +0100
Subject: [PATCH 1476/1862] NEW: add column for barcode in ticket

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql  | 3 +++
 htdocs/install/mysql/tables/llx_ticket-ticket.sql | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 1a109507a36..6b0714022c4 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -270,3 +270,6 @@ ALTER TABLE llx_element_element MODIFY COLUMN targettype VARCHAR(64) NOT NULL;
 ALTER TABLE llx_c_type_contact MODIFY COLUMN element VARCHAR(64) NOT NULL;
 
 ALTER TABLE llx_product_association ADD COLUMN import_key varchar(14) DEFAULT NULL;
+
+ALTER TABLE llx_ticket ADD COLUMN barcode varchar(255) DEFAULT NULL after extraparams;
+ALTER TABLE llx_ticket ADD COLUMN fk_barcode_type integer DEFAULT NULL after barcode;
diff --git a/htdocs/install/mysql/tables/llx_ticket-ticket.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
index 67e7ca419dd..cda890c6f69 100644
--- a/htdocs/install/mysql/tables/llx_ticket-ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
@@ -49,5 +49,7 @@ CREATE TABLE llx_ticket
 	model_pdf varchar(255),
 	last_main_doc varchar(255),				-- relative filepath+filename of last main generated document
 	extraparams varchar(255),				-- to save other parameters with json format
+	barcode varchar(255) DEFAULT NULL,          -- barcode
+    fk_barcode_type integer DEFAULT NULL,          -- barcode type
     import_key        varchar(14)
 )ENGINE=innodb;

From ee02be99e38a1b851c1fa892fae86e80e8747c29 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 15 Mar 2024 10:36:22 +0100
Subject: [PATCH 1477/1862] add BDD contraint on bar code

---
 htdocs/install/mysql/tables/llx_ticket-ticket.key.sql | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
index 858f7c7eec5..7517538baac 100644
--- a/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
+++ b/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
@@ -22,7 +22,10 @@ ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_user_assign (fk_user_assign);
 ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_project (fk_project);
 ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_statut (fk_statut);
 
+ALTER TABLE llx_ticket ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
+ALTER TABLE llx_ticket ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
+
 -- Idea for better perf to get last num of ticket on large databases
---ALTER TABLE llx_ticket ADD COLUMN calculated_numrefonly INTEGER AS (CASE SUBSTRING(ref FROM 1 FOR 2) WHEN 'TS' THEN CAST(SUBSTRING(ref FROM 8) AS SIGNED) ELSE 0 END) PERSISTENT;
---ALTER TABLE llx_ticket ADD INDEX idx_calculated_numrefonly (calculated_numrefonly);
---Then, the numering module can use the column calculated_numrefonly to get the max with SELECT MAX(calculated_numrefonly) FROM llx_ticket
+-- ALTER TABLE llx_ticket ADD COLUMN calculated_numrefonly INTEGER AS (CASE SUBSTRING(ref FROM 1 FOR 2) WHEN 'TS' THEN CAST(SUBSTRING(ref FROM 8) AS SIGNED) ELSE 0 END) PERSISTENT;
+-- ALTER TABLE llx_ticket ADD INDEX idx_calculated_numrefonly (calculated_numrefonly);
+-- Then, the numering module can use the column calculated_numrefonly to get the max with SELECT MAX(calculated_numrefonly) FROM llx_ticket

From 2d051d2fd550341235a7733acb2e90640c245d9d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 15 Mar 2024 10:38:07 +0100
Subject: [PATCH 1478/1862] add BDD contraint on bar code

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql      | 3 +++
 htdocs/install/mysql/tables/llx_ticket-ticket.key.sql | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 6b0714022c4..7d23c0a4554 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -273,3 +273,6 @@ ALTER TABLE llx_product_association ADD COLUMN import_key varchar(14) DEFAULT NU
 
 ALTER TABLE llx_ticket ADD COLUMN barcode varchar(255) DEFAULT NULL after extraparams;
 ALTER TABLE llx_ticket ADD COLUMN fk_barcode_type integer DEFAULT NULL after barcode;
+
+ALTER TABLE llx_ticket ADD UNIQUE INDEX uk_ticket_barcode_barcode_type (barcode, fk_barcode_type, entity);
+ALTER TABLE llx_ticket ADD CONSTRAINT llx_ticket_fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
diff --git a/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
index 7517538baac..e7bd5174263 100644
--- a/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
+++ b/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
@@ -22,8 +22,8 @@ ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_user_assign (fk_user_assign);
 ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_project (fk_project);
 ALTER TABLE llx_ticket ADD INDEX idx_ticket_fk_statut (fk_statut);
 
-ALTER TABLE llx_ticket ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
-ALTER TABLE llx_ticket ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
+ALTER TABLE llx_ticket ADD UNIQUE INDEX uk_ticket_barcode_barcode_type (barcode, fk_barcode_type, entity);
+ALTER TABLE llx_ticket ADD CONSTRAINT llx_ticket_fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
 
 -- Idea for better perf to get last num of ticket on large databases
 -- ALTER TABLE llx_ticket ADD COLUMN calculated_numrefonly INTEGER AS (CASE SUBSTRING(ref FROM 1 FOR 2) WHEN 'TS' THEN CAST(SUBSTRING(ref FROM 8) AS SIGNED) ELSE 0 END) PERSISTENT;

From f91d32de86b3b4d76561da2914f97745200da267 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 10:46:20 +0100
Subject: [PATCH 1479/1862] Qual: Fix typing - module_parts['hooks'] may be
 empty

# Qual: Fix typing - moduleparts['hooks'] may be empty

PHPstan reported on initialisation mismatch when module_parts['hooks']
is initialised to empty array.  This change makes the fields optional.
---
 htdocs/core/modules/DolibarrModules.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 04081ba6a02..e0603034fbe 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -141,7 +141,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $menu = array();
 
 	/**
-	 * @var array{triggers?:int<0,1>,login?:int<0,1>,substitutions?:int<0,1>,menus?:int<0,1>,theme?:int<0,1>,tpl?:int<0,1>,barcode?:int<0,1>,models?:int<0,1>,printing?:int<0,1>,css?:string[],js?:string[],hooks?:array{data:string[],entity:string},moduleforexternal?:int<0,1>,websitetemplates?:int<0,1>,contactelement?:int<0,1>} Module parts
+	 * @var array{triggers?:int<0,1>,login?:int<0,1>,substitutions?:int<0,1>,menus?:int<0,1>,theme?:int<0,1>,tpl?:int<0,1>,barcode?:int<0,1>,models?:int<0,1>,printing?:int<0,1>,css?:string[],js?:string[],hooks?:array{data?:string[],entity?:string},moduleforexternal?:int<0,1>,websitetemplates?:int<0,1>,contactelement?:int<0,1>} Module parts
 	 *  array(
 	 *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
 	 *      'triggers' => 0,

From 2bf7c6f806ed174c1ee6aa9fe9bdef865e779cc3 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 11:06:29 +0100
Subject: [PATCH 1480/1862] add permission

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

diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index c56ca5ccfb4..ffd695e83e5 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -133,7 +133,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 }
 
-if ($action == 'confirm_delete') {
+if ($action == 'confirm_delete' && $user->hasRight('societe', 'contact', 'delete')) {
 	$id = GETPOST('id', 'int');
 	if (!empty($id) && $socid > 0) {
 		$sql = "DELETE t, et FROM llx_socpeople AS t";

From 3ec61160378623108551d30e10650fb22c117580 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 9 Mar 2024 18:01:48 +0100
Subject: [PATCH 1481/1862] Qual: Fix PhanTypeMismatchReturnProbablyReal with
 typing update

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

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 153cb7d53ff..d91ce98999e 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -406,8 +406,8 @@ class ChargeSociales extends CommonObject
 	/**
 	 * Calculate amount remaining to pay by year
 	 *
-	 * @param   int     $year       Year
-	 * @return  int|float
+	 * @param   int			$year       Year
+	 * @return  int|float 	  	        Returns -1 when error (Note: could be mistaken with an amount)
 	 */
 	public function solde($year = 0)
 	{

From a9220b6f68ce9c0af7ca3f60abf869fe54aa4ff7 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 12:02:12 +0100
Subject: [PATCH 1482/1862] add begin and rollback for db

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

diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index ffd695e83e5..fd0109db515 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -136,6 +136,8 @@ if (empty($reshook)) {
 if ($action == 'confirm_delete' && $user->hasRight('societe', 'contact', 'delete')) {
 	$id = GETPOST('id', 'int');
 	if (!empty($id) && $socid > 0) {
+		$db->begin();
+
 		$sql = "DELETE t, et FROM llx_socpeople AS t";
 		$sql .= " LEFT JOIN llx_socpeople_extrafields AS et ON t.rowid = et.fk_object";
 		$sql .= " WHERE t.fk_soc = ".((int) $socid);
@@ -144,8 +146,8 @@ if ($action == 'confirm_delete' && $user->hasRight('societe', 'contact', 'delete
 
 		$result = $db->query($sql);
 		if (!$result) {
-			$error++;
 			setEventMessages($db->lasterror(), null, 'errors');
+			$db->rollback();
 		} else {
 			$db->commit();
 			setEventMessages('ContactDeleted', null, 'mesgs');

From d43c3227dbe82e7f96f8ac5f59b54edc1a5f84bb Mon Sep 17 00:00:00 2001
From: evarisk-micka <mickael.evarisk@gmail.com>
Date: Fri, 15 Mar 2024 12:11:01 +0100
Subject: [PATCH 1483/1862] Add signed status CRUD to contract and fichinter

---
 htdocs/contrat/class/contrat.class.php        | 42 ++++++++++++++++
 htdocs/core/class/commonobject.class.php      | 49 +++++++++++++++++++
 htdocs/fichinter/class/fichinter.class.php    | 41 ++++++++++++++++
 .../install/mysql/migration/19.0.0-20.0.0.sql |  4 +-
 htdocs/install/mysql/tables/llx_contrat.sql   |  2 +-
 htdocs/install/mysql/tables/llx_fichinter.sql |  2 +-
 6 files changed, 136 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 232084addce..06644ff5a17 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -184,6 +184,12 @@ class Contrat extends CommonObject
 	 */
 	public $date_contrat;
 
+	/**
+	 * Status of the contract (0=NoSignature, 1=SignedBySender, 2=SignedByReceiver, 9=SignedByAll)
+	 * @var int
+	 */
+	public $signed_status = 0;
+
 	public $commercial_signature_id;
 	public $fk_commercial_signature;
 	public $commercial_suivi_id;
@@ -255,6 +261,7 @@ class Contrat extends CommonObject
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 40),
 		'date_contrat' => array('type' => 'datetime', 'label' => 'Date contrat', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+		'signed_status' => array('type' => 'smallint(6)', 'label' => 'SignedStatus', 'enabled' => 1, 'visible' => -1, 'position' => 50, 'arrayofkeyval' => array(0 => 'NoSignature', 1 => 'SignedSender', 2 => 'SignedReceiver', 9 => 'SignedAll')),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 'isModEnabled("societe")', 'visible' => -1, 'notnull' => 1, 'position' => 70),
 		'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 75),
 		'fk_commercial_signature' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'SaleRepresentative Signature', 'enabled' => 1, 'visible' => -1, 'position' => 80),
@@ -275,6 +282,25 @@ class Contrat extends CommonObject
 	const STATUS_VALIDATED = 1;
 	const STATUS_CLOSED = 2;
 
+	/*
+	 * No signature
+	 */
+	const STATUS_NO_SIGNATURE    = 0;
+
+	/*
+	 * Signed by sender
+	 */
+	CONST STATUS_SIGNED_SENDER   = 1;
+
+	/*
+	 * Signed by receiver
+	 */
+	CONST STATUS_SIGNED_RECEIVER = 2;
+
+	/*
+	 * Signed by all
+	 */
+	CONST STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
 
 
 	/**
@@ -2953,6 +2979,22 @@ class Contrat extends CommonObject
 		$return .= '</div>';
 		return $return;
 	}
+
+	// @Todo getLibSignedStatus, LibSignedStatus
+
+	/**
+	 * Set signed status
+	 *
+	 * @param  User   $user        Object user that modify
+	 * @param  int    $status      Newsigned  status to set (often a constant like self::STATUS_XXX)
+	 * @param  int    $notrigger   1 = Does not execute triggers, 0 = Execute triggers
+	 * @param  string $triggercode Trigger code to use
+	 * @return int                 0 < if KO, > 0 if OK
+	 */
+	public function setSignedStatus(User $user, int $status = 0, int $notrigger = 0, $triggercode = ''): int
+	{
+		return $this->setSignedStatusCommon($user, $status, $notrigger, $triggercode);
+	}
 }
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 44de1d12109..985f23625e8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10467,6 +10467,55 @@ abstract class CommonObject
 		}
 	}
 
+	/**
+	 *	Set to a signed status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$status			New status to set (often a constant like self::STATUS_XXX)
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *  @param  string  $triggercode    Trigger code to use
+	 *	@return	int						Return integer <0 if KO, >0 if OK
+	 */
+	public function setSignedStatusCommon($user, $status, $notrigger = 0, $triggercode = '')
+	{
+		$error = 0;
+
+		$this->db->begin();
+
+		$statusfield = 'signed_status';
+
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
+		$sql .= " SET ".$statusfield." = ".((int) $status);
+		$sql .= " WHERE rowid = ".((int) $this->id);
+
+		if ($this->db->query($sql)) {
+			if (!$error) {
+				$this->oldcopy = clone $this;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger($triggercode, $user);
+				if ($result < 0) {
+					$error++;
+				}
+			}
+
+			if (!$error) {
+				$this->status = $status;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
 
 	/**
 	 * Initialise object with example values
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 010427ab2a4..f5b57037c0d 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -58,6 +58,7 @@ class Fichinter extends CommonObject
 		'datee' => array('type' => 'date', 'label' => 'Datee', 'enabled' => 1, 'visible' => -1, 'position' => 90),
 		'datet' => array('type' => 'date', 'label' => 'Datet', 'enabled' => 1, 'visible' => -1, 'position' => 95),
 		'duree' => array('type' => 'double', 'label' => 'Duree', 'enabled' => 1, 'visible' => -1, 'position' => 100),
+		'signed_status' => array('type' => 'smallint(6)', 'label' => 'SignedStatus', 'enabled' => 1, 'visible' => -1, 'position' => 101, 'arrayofkeyval' => array(0 => 'NoSignature', 1 => 'SignedSender', 2 => 'SignedReceiver', 9 => 'SignedAll')),
 		'description' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 105, 'showoncombobox' => 2),
 		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 110),
 		'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 115),
@@ -134,6 +135,12 @@ class Fichinter extends CommonObject
 	 */
 	public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
 
+	/**
+	 * Signed Status of the intervention (0=NoSignature, 1=SignedBySender, 2=SignedByReceiver, 9=SignedByAll)
+	 * @var int
+	 */
+	public $signed_status = 0;
+
 	/**
 	 * @var string description
 	 */
@@ -185,6 +192,26 @@ class Fichinter extends CommonObject
 	 */
 	const STATUS_CLOSED = 3;
 
+	/*
+	 * No signature
+	 */
+	const STATUS_NO_SIGNATURE    = 0;
+
+	/*
+	 * Signed by sender
+	 */
+	CONST STATUS_SIGNED_SENDER   = 1;
+
+	/*
+	 * Signed by receiver
+	 */
+	CONST STATUS_SIGNED_RECEIVER = 2;
+
+	/*
+	 * Signed by all
+	 */
+	CONST STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
+
 	/**
 	 * Date delivery
 	 * @var string|int		Delivery int
@@ -1600,6 +1627,20 @@ class Fichinter extends CommonObject
 		$return .= '</div>';
 		return $return;
 	}
+
+	/**
+	 * Set signed status
+	 *
+	 * @param  User   $user        Object user that modify
+	 * @param  int    $status      Newsigned  status to set (often a constant like self::STATUS_XXX)
+	 * @param  int    $notrigger   1 = Does not execute triggers, 0 = Execute triggers
+	 * @param  string $triggercode Trigger code to use
+	 * @return int                 0 < if KO, > 0 if OK
+	 */
+	public function setSignedStatus(User $user, int $status = 0, int $notrigger = 0, $triggercode = ''): int
+	{
+		return $this->setSignedStatusCommon($user, $status, $notrigger, $triggercode);
+	}
 }
 
 /**
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 7d23c0a4554..9c9f6dd01ee 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -232,8 +232,8 @@ ALTER TABLE llx_knowledgemanagement_knowledgerecord MODIFY COLUMN answer longtex
 -- Rename const to add customer categories on not customer/prospect third-party if enabled
 UPDATE llx_const SET name = 'THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT' WHERE name = 'THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER';
 
-ALTER TABLE llx_fichinter ADD COLUMN signed_status integer DEFAULT NULL AFTER duree;
-ALTER TABLE llx_contrat ADD COLUMN signed_status integer DEFAULT NULL AFTER date_contrat;
+ALTER TABLE llx_fichinter ADD COLUMN signed_status smallint DEFAULT NULL AFTER duree;
+ALTER TABLE llx_contrat ADD COLUMN signed_status smallint DEFAULT NULL AFTER date_contrat;
 
 ALTER TABLE llx_mailing ADD COLUMN messtype	varchar(16) DEFAULT 'email' after rowid;
 
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index 2e01e909127..53c97061102 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -29,7 +29,7 @@ create table llx_contrat
   tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec						datetime,                   	-- creation date
   date_contrat				datetime,
-  signed_status        		integer  DEFAULT NULL,        -- signed status
+  signed_status        		smallint DEFAULT NULL,          -- signed status
   statut					smallint DEFAULT 0,				-- not used. deprecated
   fin_validite				datetime,
   date_cloture				datetime,
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index 4065f3c64b8..5832ce07e9f 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -39,7 +39,7 @@ create table llx_fichinter
   datee				date,						-- date de fin d'intervention
   datet				date,						-- date de terminaison de l'intervention
   duree				real,                       -- duree totale de l'intervention
-  signed_status     integer  DEFAULT NULL,        -- signed status
+  signed_status     smallint DEFAULT NULL,      -- signed status
   description		text,
   note_private		text,
   note_public		text,

From 6d7ce609ca1daf23404717d18a00e69f968460b5 Mon Sep 17 00:00:00 2001
From: William Mead <william.mead@manchenumerique.fr>
Date: Fri, 15 Mar 2024 12:30:00 +0100
Subject: [PATCH 1484/1862] Updated add button to use minutes and local user
 time

---
 htdocs/comm/action/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index eff2e4b3708..dc81eff94b2 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -724,8 +724,7 @@ $tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 $newparam = '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
-//$param='month='.$monthshown.'&year='.$year;
-$hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt').'0000';	// Set $hourminsec to '100000' to auto set hour to 10:00 at creation
+$hourminsec = dol_print_date(dol_now(), '%H%M', 'tzserver').'00';
 
 $url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
 $url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;

From 28f74e994ae0e8fb5b6b9e82840ae567ffdee4f3 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 12:50:06 +0100
Subject: [PATCH 1485/1862] FIX number of properties for each object in
 modulebuilder

---
 htdocs/modulebuilder/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 6eb2db3db15..3c0d1e41776 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -4353,8 +4353,9 @@ if ($module == 'initmodule') {
 							$mod = strtolower($module);
 							$obj = strtolower($tabobj);
 							$newproperty = dolGetButtonTitle($langs->trans('NewProperty'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/modulebuilder/index.php?tab=objects&module='.urlencode($module).'&tabobj=createproperty&obj='.urlencode($tabobj));
+							$nbOfProperties = count($reflectorpropdefault['fields']);
 
-							print_barre_liste($langs->trans("ObjectProperties"), 0, $_SERVER["PHP_SELF"], '', '', '', '', '', 0, '', 0, $newproperty, '', '', 0, 0, 1);
+							print_barre_liste($langs->trans("ObjectProperties"), 0, $_SERVER["PHP_SELF"], '', '', '', '', '', $nbOfProperties, '', 0, $newproperty, '', '', 0, 0, 1);
 
 							//var_dump($reflectorpropdefault);exit;
 							print '<!-- Table with properties of object -->'."\n";

From 65ee1f17760904e3f140ea4e90ec064986258170 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 12:55:30 +0100
Subject: [PATCH 1486/1862] initialise the variable as an empty string

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index e8911500494..ca071434835 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2607,7 +2607,7 @@ class Project extends CommonObject
 			$to = '';
 			$nbMailSend = 0;
 			$error = 0;
-			$errors_to = 0;
+			$errors_to = '';
 			while ($obj = $this->db->fetch_object($resql)) {
 				$to = $obj->email;
 				$numHolidays = num_public_holiday($lastWeekStartTS, $lastWeekEndTS, $mysoc->country_code, 1);
@@ -2670,7 +2670,7 @@ class Project extends CommonObject
 					$actioncomm->email_sender = '';
 					$actioncomm->email_to = $to;
 
-					$actioncomm->errors_to = (string) $errors_to;
+					$actioncomm->errors_to = $errors_to;
 
 					$actioncomm->elementtype = 'project_task';
 					$actioncomm->fk_element = (int) $this->element;
@@ -2704,7 +2704,7 @@ class Project extends CommonObject
 					$actioncomm->email_sender = '';
 					$actioncomm->email_to = $to;
 
-					$actioncomm->errors_to = (string) $errors_to;
+					$actioncomm->errors_to = $errors_to;
 
 					$actioncomm->elementtype = 'project_task';
 					$actioncomm->fk_element = (int) $this->element;

From b2804f09825f4e6a3714e906dec79cb5ef1a3f6a Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 12:58:03 +0100
Subject: [PATCH 1487/1862] add brackets in cast variable

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 30b9502a78a..3f7a58760ca 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -292,7 +292,7 @@ if (empty($reshook)) {
 			$newlocaltax2_type = GETPOST('localtax2_type', 'array');
 
 			//Shall we generate prices using price rules?
-			$object->price_autogen = (int) GETPOST('usePriceRules') == 'on';
+			$object->price_autogen = (int) (GETPOST('usePriceRules') == 'on');
 
 			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 				if (!isset($newprice[$i])) {

From c9e0bc86dcc1e28f91e06896684782012c63c94f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 13:02:58 +0100
Subject: [PATCH 1488/1862] Fix look and feel

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

diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 4422ff3da33..0829b4cc8ec 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -356,6 +356,11 @@ while ($i < min($num, $limit)) {
 	$i++;
 }
 
+// If no record found
+if ($num == 0) {
+	print '<tr><td colspan="5"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
 print "</table>";
 print "</div>";
 print "<br>";

From 9a79e6b6d00056654c3473aa443e10a1ec5bf011 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:26:23 +0100
Subject: [PATCH 1489/1862] Fix PhanTypeMismatchDefault with typing hints

---
 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 da57c3863a8..98d06e8a72f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13866,9 +13866,9 @@ function GETPOSTDATE($prefix, $hourTime = '', $gm = 'auto')
  * request.
  *
  * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)
- * @param int $timestamp If null, the timestamp will be created from request data
- * @param bool $hourTime If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp
- * @param bool $gm If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp
+ * @param ?int $timestamp If null, the timestamp will be created from request data
+ * @param string $hourTime If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp
+ * @param string $gm If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp
  * @return string Portion of URL with query parameters for the specified date
  */
 function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto')

From f0821a6b427692912ea79080fdd8b6929fad7db1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 13:34:49 +0100
Subject: [PATCH 1490/1862] Fix date param must use the day/hour/year instead
 of one string date.

---
 htdocs/comm/action/list.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index dc81eff94b2..217fca02d35 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -724,10 +724,8 @@ $tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 $newparam = '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
-$hourminsec = dol_print_date(dol_now(), '%H%M', 'tzserver').'00';
-
 $url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
-$url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;
+$url .= '&apyear='.$tmpforcreatebutton['year'].'&apmonth='.$tmpforcreatebutton['mon'].'&apday='.$tmpforcreatebutton['mday'].'&aphour='.$tmpforcreatebutton['hours'].'&apmin='.$tmpforcreatebutton['minutes'];
 $url .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
 
 $newcardbutton = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, '', $user->rights->agenda->myactions->create || $user->hasRight('agenda', 'allactions', 'create'));

From c5c79a9fc5195992b8bfacf4921fc1763322f195 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:13:55 +0100
Subject: [PATCH 1491/1862] Fix PhanTypeMismatchReturnProbablyReal

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 5b18aee94af..3d9117894a2 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -57,7 +57,7 @@ function dol_basename($pathfile)
  * @param	string			$relativename	For recursive purpose only. Must be "" at first call.
  * @param	int 			$donotfollowsymlinks	Do not follow symbolic links
  * @param	int 			$nbsecondsold	Only files older than $nbsecondsold
- * @return	array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}> Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)
+ * @return	array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}> Array of array('name'=>'xxx','fullname'=>'/abc/xxx','date'=>'yyy','size'=>99,'type'=>'dir|file',...)>
  * @see dol_dir_list_in_database()
  */
 function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0, $nbsecondsold = 0)
@@ -2621,10 +2621,10 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
  *
  * @param 	string		$dir			Directory to scan
  * @param	string		$regexfilter	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
- * @param	array		$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
- * @param	int			$nohook			Disable all hooks
- * @param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
- * @return	array						Array with properties (full path, date, ...) of to most recent file
+ * @param	string[]	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
+ * @param	int<0,1>	$nohook			Disable all hooks
+ * @param	int<0,3>	$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
+ * @return	null|array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}	null if none or Array with properties (full path, date, ...) of the most recent file
  */
 function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = 0, $mode = 0)
 {

From 3a6144dc9056af8609fc5ccabde57caa6cd9481d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:02:35 +0100
Subject: [PATCH 1492/1862] Fix PhanTypeMismatchReturnProbablyReal

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

diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 7fd087024c3..db6e2158e1f 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015       Jean-François Ferry         <jfefe@aternatik.fr>
  * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -167,7 +168,7 @@ class Contacts extends DolibarrApi
 	 * @param int       $includecount       Count and return also number of elements the contact is used as a link for
 	 * @param int		$includeroles        Includes roles of the contact
 	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
-	 * @return array                        Array of contact objects
+	 * @return Contact[]                        Array of contact objects
 	 *
 	 * @throws RestException
 	 */
@@ -273,6 +274,8 @@ class Contacts extends DolibarrApi
 	 *
 	 * @param   array   $request_data   Request datas
 	 * @return  int     ID of contact
+	 *
+	 * @suppress PhanPluginUnknownArrayMethodParamType  Luracast limitation
 	 */
 	public function post($request_data = null)
 	{
@@ -311,7 +314,7 @@ class Contacts extends DolibarrApi
 	 *
 	 * @param 	int   	$id             	Id of contact to update
 	 * @param 	array 	$request_data   	Datas
-	 * @return 	Object						Updated object
+	 * @return 	Object|false				Updated object, false when issue toupdate
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -389,6 +392,7 @@ class Contacts extends DolibarrApi
 	 * @return  int     ID of user
 	 *
 	 * @url	POST {id}/createUser
+	 * @suppress PhanPluginUnknownArrayMethodParamType  Luracast limitation
 	 */
 	public function createUser($id, $request_data = null)
 	{
@@ -573,8 +577,8 @@ class Contacts extends DolibarrApi
 	/**
 	 * Validate fields before create or update object
 	 *
-	 * @param   array|null     $data   Data to validate
-	 * @return  array
+	 * @param   string[]|null     $data   Data to validate
+	 * @return  string[]
 	 * @throws  RestException
 	 */
 	private function _validate($data)

From 3b0e83c53346888184822eb77c457f7f1f94af3f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:06:00 +0100
Subject: [PATCH 1493/1862] Fix PhanTypeMismatchReturnProbablyReal

---
 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 44de1d12109..725af336c9a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8955,7 +8955,7 @@ abstract class CommonObject
 	/**
 	 * Returns the rights used for this class
 	 *
-	 * @return int|stdClass		Object of permission for the module
+	 * @return null|int|stdClass		Object of permission for the module
 	 */
 	public function getRights()
 	{

From c7ad91cfc0851937fba82817368b41b08c984b18 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:12:51 +0100
Subject: [PATCH 1494/1862] Qual: Enable PhanTypeMismatchReturnProbablyReal

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 650f4fbf9e2..7edfd7a8d1b 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -591,7 +591,7 @@ return [
 		// 'PhanPluginPossiblyStaticProtectedMethod',
 		'PhanTypeMismatchReturn',
 		// 'PhanPluginMoreSpecificActualReturnType',
-		'PhanTypeMismatchReturnProbablyReal',
+		// 'PhanTypeMismatchReturnProbablyReal',
 		'PhanPossiblyUndeclaredVariable',
 		'PhanTypeMismatchArgument',
 		// 'PhanPluginUnreachableCode',

From e5cf5475a10b8c3d47f25a61f4b2ba6dd6699d39 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:04:43 +0100
Subject: [PATCH 1495/1862] Qual: Improve test message on failure

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

diff --git a/test/phpunit/RestAPIContactTest.php b/test/phpunit/RestAPIContactTest.php
index 4af37c718e0..dd4173ab6ff 100644
--- a/test/phpunit/RestAPIContactTest.php
+++ b/test/phpunit/RestAPIContactTest.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -229,7 +230,7 @@ class RestAPIContactTest extends CommonClassTest
 		print_r($updateResponse);
 
 		// Check if the updated fields match the changes you made
-		$this->assertTrue($updateResponse['firstname'] === $updateBody['firstname'], 'Update might have failed');
+		$this->assertEquals($updateBody['firstname'], $updateResponse['firstname'], 'Update failed for request body: '.$updateRequestBody);
 
 		// Deleting the Contact
 		/*

From 972028bb9523aaad0ee58ed94cf450d6de76fd96 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:34:27 +0100
Subject: [PATCH 1496/1862] Fix PhanTypeMismatchDefault by removing defaults
 ($object is required)

---
 .../modules/supplier_order/mod_commande_fournisseur_muguet.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index cd6d9f78d0e..ff0ac8142aa 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -135,7 +136,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	 *  @param  CommandeFournisseur	$object		Object
 	 *  @return string      					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc = '', $object = '')
+	public function getNextValue($objsoc, $object)
 	{
 		global $db, $conf;
 

From 920e1fbe770b7f4ec3af0086fde8545ad57b4cb4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:35:41 +0100
Subject: [PATCH 1497/1862] Fix PhanTypeMismatchDefault by removing defaults
 ($object is required)

---
 .../supplier_order/mod_commande_fournisseur_orchidee.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 03f948de1c1..025ee320d36 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -126,7 +127,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	 *  @param  CommandeFournisseur	$object		Object
 	 *  @return string|0      					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc = '', $object = '')
+	public function getNextValue($objsoc, $object)
 	{
 		global $db, $conf;
 

From 4a53b3dd1770b50f786dbc35f602bad60248b811 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 14:37:35 +0100
Subject: [PATCH 1498/1862] fix type by adding both to doc function

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

diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 5ce0565f4eb..db1b90f1118 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -263,7 +263,7 @@ class pdf_standard extends CommonStickerGenerator
 	/**
 	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
-	 *	@param	mixed	    $object		        Member object. Old usage: Array of record information (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
+	 *	@param	Adherent|array	    $object		        Member object. Old usage: Array of record information (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
 	 *	@param	string		$mode				Tell if doc module is called for 'member', ...

From d9694bec3dca878ab23d0d5a2b29a1b0df39eb21 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 14:38:22 +0100
Subject: [PATCH 1499/1862] fix type by adding both to doc function

---
 htdocs/core/modules/member/doc/pdf_standard.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index db1b90f1118..b8b8acbbec1 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -264,11 +264,11 @@ class pdf_standard extends CommonStickerGenerator
 	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
 	 *	@param	Adherent|array	    $object		        Member object. Old usage: Array of record information (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
-	 *	@param	Translate	$outputlangs		Lang object for output language
-	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
-	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
-	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
-	 *  @param	string		$filename			Name of output file (without extension)
+	 *	@param	Translate			$outputlangs		Lang object for output language
+	 *	@param	string				$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
+	 *	@param	string				$mode				Tell if doc module is called for 'member', ...
+	 *  @param  int         		$nooutput           1=Generate only file on disk and do not return it on response
+	 *  @param	string				$filename			Name of output file (without extension)
 	 *	@return	int								1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0, $filename = 'tmp_cards')

From 0617d4346046b5ec659f474decfc4b1719642268 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 14:39:40 +0100
Subject: [PATCH 1500/1862] Fix link to create an event

---
 htdocs/comm/action/index.php   |  6 +++++-
 htdocs/comm/action/list.php    |  2 +-
 htdocs/comm/action/pertype.php |  8 +++++---
 htdocs/comm/action/peruser.php | 16 +++++++++-------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index c995908532f..78c5449ccca 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -550,7 +550,11 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt').'0000';	// Set $hourminsec to '100000' to auto set hour to 10:00 at creation
 
-	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
+	$urltocreateaction = DOL_URL_ROOT.'/comm/action/card.php?action=create';
+	$urltocreateaction .= '&apyear='.$tmpforcreatebutton['year'].'&apmonth='.$tmpforcreatebutton['mon'].'&apday='.$tmpforcreatebutton['mday'].'&aphour='.$tmpforcreatebutton['hours'].'&apmin='.$tmpforcreatebutton['minutes'];
+	$urltocreateaction .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+
+	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', $urltocreateaction);
 }
 
 // Define the legend/list of calendard to show
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 217fca02d35..408b64c6fc9 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -730,7 +730,7 @@ $url .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam
 
 $newcardbutton = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, '', $user->rights->agenda->myactions->create || $user->hasRight('agenda', 'allactions', 'create'));
 
-$param .= '&mode='.$mode;
+$param .= '&mode='.urlencode($mode);
 
 print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, is_numeric($nbtotalofrecords) ? -1 * $nbtotalofrecords : $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 7bb071f036c..990c9af705f 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -480,9 +480,11 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 
 	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
-	//$param='month='.$monthshown.'&year='.$year;
-	$hourminsec = '100000';
-	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
+	$urltocreateaction = DOL_URL_ROOT.'/comm/action/card.php?action=create';
+	$urltocreateaction .= '&apyear='.$tmpforcreatebutton['year'].'&apmonth='.$tmpforcreatebutton['mon'].'&apday='.$tmpforcreatebutton['mday'].'&aphour='.$tmpforcreatebutton['hours'].'&apmin='.$tmpforcreatebutton['minutes'];
+	$urltocreateaction .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+
+	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', $urltocreateaction);
 }
 
 print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index c191a6c35be..97098383652 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -129,8 +129,8 @@ if ($dateselect > 0) {
 $tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS') ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_h = GETPOSTINT('begin_h') != '' ? GETPOSTINT('begin_h') : ($tmparray[0] != '' ? $tmparray[0] : 9);
-$end_h   = GETPOSTINT('end_h') ? GETPOSTINT('end_h') : ($tmparray[1] != '' ? $tmparray[1] : 18);
+$begin_h = GETPOSTISSET('begin_h') ? GETPOSTINT('begin_h') : ($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOSTISSET('end_h') ? GETPOSTINT('end_h') : ($tmparray[1] != '' ? $tmparray[1] : 18);
 if ($begin_h < 0 || $begin_h > 23) {
 	$begin_h = 9;
 }
@@ -144,8 +144,8 @@ if ($end_h <= $begin_h) {
 $tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS') ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_d = GETPOSTINT('begin_d') ? GETPOSTINT('begin_d') : ($tmparray[0] != '' ? $tmparray[0] : 1);
-$end_d   = GETPOSTINT('end_d') ? GETPOSTINT('end_d') : ($tmparray[1] != '' ? $tmparray[1] : 5);
+$begin_d = GETPOSTISSET('begin_d') ? GETPOSTINT('begin_d') : ($tmparray[0] != '' ? $tmparray[0] : 1);
+$end_d   = GETPOSTISSET('end_d') ? GETPOSTINT('end_d') : ($tmparray[1] != '' ? $tmparray[1] : 5);
 if ($begin_d < 1 || $begin_d > 7) {
 	$begin_d = 1;
 }
@@ -496,9 +496,11 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 		$newparam .= '&end_d='.urlencode($end_d);
 	}
 
-	//$param='month='.$monthshown.'&year='.$year;
-	$hourminsec = '100000';
-	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
+	$urltocreateaction = DOL_URL_ROOT.'/comm/action/card.php?action=create';
+	$urltocreateaction .= '&apyear='.$tmpforcreatebutton['year'].'&apmonth='.$tmpforcreatebutton['mon'].'&apday='.$tmpforcreatebutton['mday'].'&aphour='.$tmpforcreatebutton['hours'].'&apmin='.$tmpforcreatebutton['minutes'];
+	$urltocreateaction .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+
+	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', $urltocreateaction);
 }
 
 $num = '';

From 8495a75f43970c924c6e0e6352852d42d6cddac1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:50:23 +0100
Subject: [PATCH 1501/1862] Fix PhanTypeMismatchDefault by removing defaults,
 update typing

Also remove some unused references to globals
---
 .../class/expensereport.class.php             | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 54c4a8b469a..a602edc810d 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -656,8 +656,6 @@ class ExpenseReport extends CommonObject
 	 */
 	public function fetch($id, $ref = '')
 	{
-		global $conf;
-
 		$sql = "SELECT d.rowid, d.entity, d.ref, d.note_public, d.note_private,"; // DEFAULT
 		$sql .= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
 		$sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
@@ -885,6 +883,8 @@ class ExpenseReport extends CommonObject
 		$sql .= " WHERE f.rowid = ".((int) $id);
 		$sql .= " AND f.entity = ".$conf->entity;
 
+
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -920,7 +920,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		global $user, $langs, $conf;
+		global $user, $langs;
 
 		$now = dol_now();
 
@@ -983,10 +983,10 @@ class ExpenseReport extends CommonObject
 	 * @param   User    $user           User
 	 * @return  int                     Return integer <0 if KO, >0 if OK
 	 */
-	public function fetch_line_by_project($projectid, $user = '')
+	public function fetch_line_by_project($projectid, $user)
 	{
 		// phpcs:enable
-		global $conf, $db, $langs;
+		global $langs;
 
 		$langs->load('trips');
 
@@ -1086,8 +1086,6 @@ class ExpenseReport extends CommonObject
 	public function fetch_lines()
 	{
 		// phpcs:enable
-		global $conf;
-
 		$this->lines = array();
 
 		$sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
@@ -1792,7 +1790,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
 	{
-		global $langs, $conf, $hookmanager;
+		global $langs, $hookmanager;
 
 		$result = '';
 
@@ -1906,7 +1904,7 @@ class ExpenseReport extends CommonObject
 	 * @param    float       $qty                      Qty
 	 * @param    double      $up                       Unit price (price with tax)
 	 * @param    int         $fk_c_type_fees           Type payment
-	 * @param    string      $vatrate                  Vat rate (Can be '10' or '10 (ABC)')
+	 * @param    int<-1,0>|string	$vatrate                  Vat rate (Can be '10' or '10 (ABC)')
 	 * @param    string      $date                     Date
 	 * @param    string      $comments                 Description
 	 * @param    int         $fk_project               Project id
@@ -1917,7 +1915,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0, $fk_ecm_files = 0)
 	{
-		global $conf, $langs, $mysoc;
+		global $langs, $mysoc;
 
 		dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
 
@@ -2029,7 +2027,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function checkRules($type = 0, $seller = '')
 	{
-		global $user, $conf, $db, $langs, $mysoc;
+		global $conf, $db, $langs, $mysoc;
 
 		$langs->load('trips');
 
@@ -2105,7 +2103,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function applyOffset($type = 0, $seller = '')
 	{
-		global $conf, $mysoc;
+		global $mysoc;
 
 		if (!getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 			return false;
@@ -2327,10 +2325,10 @@ class ExpenseReport extends CommonObject
 	/**
 	 * deleteline
 	 *
-	 * @param   int     $rowid      	Row id
-	 * @param   User    $fuser      	User
-	 * @param   int     $notrigger      1=No trigger
-	 * @return  int                 	Return integer <0 if KO, >0 if OK
+	 * @param   int			$rowid      	Row id
+	 * @param   User|string	$fuser      	User
+	 * @param   int<0,1>	$notrigger      1=No trigger
+	 * @return  int<0,1>                 	Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteLine($rowid, $fuser = '', $notrigger = 0)
 	{
@@ -2473,8 +2471,6 @@ class ExpenseReport extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf;
-
 		$outputlangs->load("trips");
 
 		if (!dol_strlen($modele)) {
@@ -2530,7 +2526,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function loadStateBoard()
 	{
-		global $conf, $user;
+		global $user;
 
 		$this->nb = array();
 
@@ -3040,7 +3036,7 @@ class ExpenseReportLine extends CommonObjectLine
 	 */
 	public function insert($notrigger = 0, $fromaddline = false)
 	{
-		global $user, $conf;
+		global $user;
 
 		$error = 0;
 
@@ -3182,7 +3178,7 @@ class ExpenseReportLine extends CommonObjectLine
 	 */
 	public function update(User $user)
 	{
-		global $langs, $conf;
+		global $langs;
 
 		$error = 0;
 

From 61b55f21abd6a2bc66979fc5a16a720d1b1c8cbd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:56:36 +0100
Subject: [PATCH 1502/1862] Fix PhanTypeMismatchDefault with typing hint

---
 .../class/fournisseur.commande.class.php      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7f7511db38f..5c7fba47e8e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1929,7 +1929,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@param		int			$date_end				Date end of service
 	 *	@param		array		$array_options			extrafields array
 	 *	@param 		int|null	$fk_unit 				Code of the unit to use. Null to use the default one
-	 *	@param 		string		$pu_ht_devise			Amount in currency
+	 *	@param 		int|string		$pu_ht_devise			Amount in currency
 	 *	@param		string		$origin					'order', ...
 	 *	@param		int			$origin_id				Id of origin object
 	 *	@param		int			$rang					Rank
@@ -2880,13 +2880,13 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *	@param     	int			$rowid           	ID de la ligne de facture
 	 *	@param     	string		$desc            	Line description
-	 *	@param     	float		$pu              	Unit price
-	 *	@param     	float		$qty             	Quantity
-	 *	@param     	float		$remise_percent  	Percent discount on line
-	 *	@param     	float		$txtva          	VAT rate
-	 *  @param     	float		$txlocaltax1	    Localtax1 tax
-	 *  @param     	float		$txlocaltax2   		Localtax2 tax
-	 *  @param     	float		$price_base_type 	Type of price base
+	 *	@param     	int|float	$pu              	Unit price
+	 *	@param     	int|float	$qty             	Quantity
+	 *	@param     	int|float	$remise_percent  	Percent discount on line
+	 *	@param     	int|float	$txtva          	VAT rate
+	 *  @param     	int|float	$txlocaltax1	    Localtax1 tax
+	 *  @param     	int|float	$txlocaltax2   		Localtax2 tax
+	 *  @param     	string		$price_base_type 	Type of price base
 	 *	@param		int			$info_bits			Miscellaneous information
 	 *	@param		int			$type				Type of line (0=product, 1=service)
 	 *  @param		int			$notrigger			Disable triggers
@@ -2894,11 +2894,11 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param      integer     $date_end       	Date end of service
 	 *  @param		array		$array_options		Extrafields array
 	 * 	@param 		int|null	$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param		float		$pu_ht_devise		Unit price in currency
+	 * 	@param		int|float	$pu_ht_devise		Unit price in currency
 	 *  @param		string		$ref_supplier		Supplier ref
 	 *	@return    	int         	    			Return integer < 0 if error, > 0 if ok
 	 */
-	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = [], $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = 0, $date_end = 0, $array_options = [], $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
 	{
 		global $mysoc, $conf, $langs;
 		dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
@@ -3243,8 +3243,8 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *	@param          User	$user   Object user
-	 *  @param          int		$mode   "opened", "awaiting" for orders awaiting reception
+	 *	@param	User	$user   Object user
+	 *  @param	string	$mode   "opened", "awaiting" for orders awaiting reception
 	 *	@return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode = 'opened')

From 82157757f012e2b8f4f0f574c991b8164d74ad6d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:59:15 +0100
Subject: [PATCH 1503/1862] Fix PhanTypeMismatchDefault by updating defaults

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index cd90cf86179..146bc872c3b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -2064,7 +2065,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param      int         $fk_remise_except       Id discount used
 	 *	@return     int                                 >0 if OK, <0 if KO
 	 */
-	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $fk_code_ventilation = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = 0, $array_options = [], $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = 0, $date_end = 0, $fk_code_ventilation = 0, $info_bits = 0, $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = 0, $array_options = [], $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
 	{
 		global $langs, $mysoc, $conf;
 

From 5c9a063160b83a5ffa565c2f50efacb19326f885 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:02:33 +0100
Subject: [PATCH 1504/1862] Fix PhanTypeMismatchDefault by updating default to
 null

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c4b70c7a1f8..274e586340b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1971,7 +1971,7 @@ class Product extends CommonObject
 		// Add new price
 		$sql = "INSERT INTO ".$this->db->prefix()."product_price(price_level,date_price, fk_product, fk_user_author, price_label, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
 		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
-		$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".(empty($this->price_label)?"null":"'".$this->db->escape($this->price_label)."'").", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
+		$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".(empty($this->price_label) ? "null" : "'".$this->db->escape($this->price_label)."'").", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
 		$sql .= " ".price2num($this->localtax1_tx).", ".price2num($this->localtax2_tx).", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".price2num($this->price_min).", ".price2num($this->price_min_ttc).", ".price2num($this->price_by_qty).", ".((int) $conf->entity).",".($this->fk_price_expression > 0 ? ((int) $this->fk_price_expression) : 'null');
 		$sql .= ")";
 
@@ -2308,7 +2308,7 @@ class Product extends CommonObject
 	 * @param  double $newprice          New price
 	 * @param  string $newpricebase      HT or TTC
 	 * @param  User   $user              Object user that make change
-	 * @param  double $newvat            New VAT Rate (For example 8.5. Should not be a string)
+	 * @param  ?double $newvat           New VAT Rate (For example 8.5. Should not be a string)
 	 * @param  double $newminprice       New price min
 	 * @param  int    $level             0=standard, >0 = level if multilevel prices
 	 * @param  int    $newnpr            0=Standard vat rate, 1=Special vat rate for French NPR VAT
@@ -2320,7 +2320,7 @@ class Product extends CommonObject
 	 * @param  int    $notrigger         Disable triggers
 	 * @return int                            Return integer <0 if KO, >0 if OK
 	 */
-	public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $price_label = '', $notrigger = 0)
+	public function updatePrice($newprice, $newpricebase, $user, $newvat = null, $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '', $price_label = '', $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -2342,7 +2342,7 @@ class Product extends CommonObject
 		}
 
 		// Check parameters
-		if ($newvat == '') {
+		if ($newvat === null || $newvat == '') {  // Maintain '' for backwards compatibility
 			$newvat = $this->tva_tx;
 		}
 

From 38e7d389a92bcc8be948a6d184375260f2c70de4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:13:38 +0100
Subject: [PATCH 1505/1862] Fix PhanTypeMismatchDefault by updating default to
 null

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 754f465e574..260b922d5de 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -934,9 +934,9 @@ class Task extends CommonObjectLine
 	 * @param	string	$filteronproj    		Filter on project ref or label
 	 * @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated only)
 	 * @param	string	$morewherefilter		Add more filter into where SQL request (must start with ' AND ...')
-	 * @param	string	$filteronprojuser		Filter on user that is a contact of project
-	 * @param	string	$filterontaskuser		Filter on user assigned to task
-	 * @param	Extrafields	$extrafields	    Show additional column from project or task
+	 * @param	int		$filteronprojuser		Filter on user that is a contact of project
+	 * @param	int		$filterontaskuser		Filter on user assigned to task
+	 * @param	?Extrafields	$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 filters. Not Used yet.
 	 * @param   int     $loadextras         	Fetch all Extrafields on each project and task
@@ -945,9 +945,9 @@ class Task extends CommonObjectLine
 	 * @param	string	$sortorder				Sort order
 	 * @return 	array|string					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(), $loadextras = 0, $loadRoleMode = 1, $sortfield = '', $sortorder = '')
+	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = null, $includebilltime = 0, $search_array_options = array(), $loadextras = 0, $loadRoleMode = 1, $sortfield = '', $sortorder = '')
 	{
-		global $conf, $hookmanager;
+		global $hookmanager;
 
 		$tasks = array();
 
@@ -1054,7 +1054,7 @@ class Task extends CommonObjectLine
 		if ($filteronproj) {
 			$sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
 		}
-		if ($filteronprojstatus && $filteronprojstatus != '-1') {
+		if ($filteronprojstatus && (int) $filteronprojstatus != '-1') {
 			$sql .= " AND p.fk_statut IN (".$this->db->sanitize($filteronprojstatus).")";
 		}
 		if ($morewherefilter) {

From ca06a0ee7fdf159621d610298f96f69c2c86e11b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 13:30:01 +0100
Subject: [PATCH 1506/1862] Fix PhanTypeMismatchDefault with typing hint

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7fcb1c8f0d1..9c5d138dfc6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -639,7 +639,7 @@ function print_start_menu_entry($idsel, $classname, $showmode)
  * @param	string	$idsel			Id sel
  * @param	string	$classname		Class name
  * @param	string	$atarget		Target
- * @param	array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string} 	$menuval		All the $menuval array
+ * @param	array{}|array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string} 	$menuval		All the $menuval array
  * @return	void
  */
 function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())

From 1af4e9002700acddbe618aa078a392313b268f0a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:14:42 +0100
Subject: [PATCH 1507/1862] Qual: enable PhanTypeMismatchDefault

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 650f4fbf9e2..0c5e261618b 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -446,7 +446,7 @@ return [
 		'PhanRedefinedClassReference',
 		// 'PhanPluginNoCommentOnClass',
 		// 'PhanPluginNotFullyQualifiedGlobalConstant',
-		'PhanTypeMismatchDefault',
+		// 'PhanTypeMismatchDefault',
 		// 'PhanPluginPHPDocHashComment',
 		'PhanPluginShortArrayList',
 		'PhanPluginUnknownArrayPropertyType',

From 29d6c2b76ea73302eabff3d15069d4ab60a517a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 15:07:05 +0100
Subject: [PATCH 1508/1862] Fix for #28821 ->status is int ->labelStatus is
 array of label.

---
 htdocs/compta/bank/class/account.class.php | 60 ++++------------------
 1 file changed, 10 insertions(+), 50 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 94d4b4247b1..67a067854f1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -93,8 +93,10 @@ class Account extends CommonObject
 	public $bank;
 
 	/**
-	 * Status
+	 * Status closed
+	 *
 	 * @var int
+	 * @deprecated 	Duplicate field. We already have the field $this->status
 	 */
 	public $clos = self::STATUS_OPEN;
 
@@ -200,13 +202,6 @@ class Account extends CommonObject
 	 */
 	public $type_lib = array();
 
-	/**
-	 * Array listing all the potential status of an account.
-	 * Defined in __construct
-	 * @var array<int, string>		array: int of the status => translated label of the status
-	 */
-	public $status = array();
-
 	/**
 	 * Accountancy code
 	 * @var string
@@ -387,17 +382,17 @@ class Account extends CommonObject
 
 		$this->db = $db;
 
-		$this->solde = 0;
+		$this->balance = 0;
 
 		$this->type_lib = array(
-			self::TYPE_SAVINGS => $langs->trans("BankType0"),
-			self::TYPE_CURRENT => $langs->trans("BankType1"),
-			self::TYPE_CASH => $langs->trans("BankType2"),
+			self::TYPE_SAVINGS => $langs->transnoentitiesnoconv("BankType0"),
+			self::TYPE_CURRENT => $langs->transnoentitiesnoconv("BankType1"),
+			self::TYPE_CASH => $langs->transnoentitiesnoconv("BankType2"),
 		);
 
-		$this->status = array(
-			self::STATUS_OPEN => $langs->trans("StatusAccountOpened"),
-			self::STATUS_CLOSED => $langs->trans("StatusAccountClosed")
+		$this->labelStatus = array(
+			self::STATUS_OPEN => $langs->transnoentitiesnoconv("StatusAccountOpened"),
+			self::STATUS_CLOSED => $langs->transnoentitiesnoconv("StatusAccountClosed")
 		);
 	}
 
@@ -2744,41 +2739,6 @@ class AccountLine extends CommonObjectLine
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		//global $langs;
-
-		//$langs->load('companies');
-		/*
-		if ($mode == 0)
-		{
-			if ($status==0) return $langs->trans("ActivityCeased");
-			if ($status==1) return $langs->trans("InActivity");
-		}
-		if ($mode == 1)
-		{
-			if ($status==0) return $langs->trans("ActivityCeased");
-			if ($status==1) return $langs->trans("InActivity");
-		}
-		if ($mode == 2)
-		{
-			if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		if ($mode == 3)
-		{
-			if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}
-		if ($mode == 4)
-		{
-			if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-			if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-		}
-		if ($mode == 5)
-		{
-			if ($status==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-			if ($status==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-		}*/
-
 		return '';
 	}
 

From e3c4c1aff0b8fb6baf8febda57612f541cb18443 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 15:16:22 +0100
Subject: [PATCH 1509/1862] Fix warning

---
 htdocs/compta/tva/class/paymentvat.class.php  | 10 ++++-----
 .../class/paymentexpensereport.class.php      | 22 ++++++-------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index c5fbf396667..1c72b1ff444 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -548,12 +548,12 @@ class PaymentVAT extends CommonObject
 		$this->fk_tva = 0;
 		$this->datec = dol_now();
 		$this->tms = dol_now();
-		$this->datep = '';
-		$this->amount = '';
+		$this->datep = dol_now();
+		$this->amount = 100;
 		$this->fk_typepaiement = 0;
-		$this->num_payment = '';
-		$this->note_private = '';
-		$this->note_public = '';
+		$this->num_payment = '123456';
+		$this->note_private = 'Private note';
+		$this->note_public = 'Public note';
 		$this->fk_bank = 0;
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 8763f965a90..5541cdc9ac3 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -307,7 +307,6 @@ class PaymentExpenseReport extends CommonObject
 	public function update($user = null, $notrigger = 0)
 	{
 		// phpcs:enable
-		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -337,13 +336,8 @@ class PaymentExpenseReport extends CommonObject
 			$this->fk_user_modif = (int) $this->fk_user_modif;
 		}
 
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_expensereport SET";
-
 		$sql .= " fk_expensereport=".(isset($this->fk_expensereport) ? $this->fk_expensereport : "null").",";
 		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
@@ -355,8 +349,6 @@ class PaymentExpenseReport extends CommonObject
 		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
 		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
 		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "null");
-
-
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -393,7 +385,6 @@ class PaymentExpenseReport extends CommonObject
 	public function delete($user, $notrigger = 0)
 	{
 		// phpcs:enable
-		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
@@ -524,13 +515,14 @@ class PaymentExpenseReport extends CommonObject
 		$this->id = 0;
 
 		$this->fk_expensereport = 0;
-		$this->datec = '';
+		$this->datec = dol_now();
 		$this->tms = dol_now();
-		$this->datep = '';
-		$this->amount = '';
+		$this->datep = dol_now();
+		$this->amount = 100;
 		$this->fk_typepayment = 0;
-		$this->num_payment = '';
-		$this->note = '';
+		$this->num_payment = '123456';
+		$this->note_public = 'Public note';
+		$this->note_private = 'Private note';
 		$this->fk_bank = 0;
 		$this->fk_user_creat = 0;
 		$this->fk_user_modif = 0;
@@ -553,7 +545,7 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
-		global $langs, $conf;
+		global $langs;
 
 		$error = 0;
 

From 8ca778978010698e525882c84df330736e7ec9f7 Mon Sep 17 00:00:00 2001
From: x <x@x.x>
Date: Fri, 15 Mar 2024 15:36:05 +0100
Subject: [PATCH 1510/1862] FIX function load_stats_inproduction()

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5812a120489..5e5e8f8d119 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3605,13 +3605,13 @@ class Product extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			while ($obj = $this->db->fetch_object($result)) {
-				if ($obj->role == 'toconsume') {
+				if ($obj->role == 'toconsume' && empty($warehouseid)) {
 					$this->stats_mrptoconsume['customers'] += $obj->nb_customers;
 					$this->stats_mrptoconsume['nb'] += $obj->nb;
 					$this->stats_mrptoconsume['rows'] += $obj->nb_rows;
 					$this->stats_mrptoconsume['qty'] += ($obj->qty ? $obj->qty : 0);
 				}
-				if ($obj->role == 'consumed') {
+				if ($obj->role == 'consumed' && empty($warehouseid)) {
 					//$this->stats_mrptoconsume['customers'] += $obj->nb_customers;
 					//$this->stats_mrptoconsume['nb'] += $obj->nb;
 					//$this->stats_mrptoconsume['rows'] += $obj->nb_rows;

From b4ffcf400f1807db8d25f748a23ddd74b803fea3 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 15:47:48 +0100
Subject: [PATCH 1511/1862] Fix assignment with moLine to BomLine

---
 htdocs/mrp/class/mo.class.php |  2 +-
 htdocs/mrp/mo_card.php        | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index da5b1caf030..2a1c580a03b 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -231,7 +231,7 @@ class Mo extends CommonObject
 	protected $childtablesoncascade = array('mrp_production');
 
 	/**
-	 * @var MoLine[]|BOMLine[]     Array of subtable lines
+	 * @var MoLine[]     Array of subtable lines
 	 */
 	public $lines = array();
 
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index d88c5755d45..2e0bd589fd0 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -432,7 +432,20 @@ if ($action == 'create') {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
-		$object->lines = $objectbom->lines;
+		$arrayOfObjBom = array();
+		foreach ($objectbom->lines as $key => $val) {
+			$moLine = new MoLine($db);
+			$moLine->id = $objectbom->lines[$key]->id;
+			$moLine->position = $objectbom->lines[$key]->position;
+			$moLine->fk_product = $objectbom->lines[$key]->fk_product;
+			$moLine->fk_unit = $objectbom->lines[$key]->fk_unit;
+			$moLine->qty = $objectbom->lines[$key]->qty;
+			$moLine->qty_frozen = $objectbom->lines[$key]->qty_frozen;
+			$moLine->disable_stock_change = $objectbom->lines[$key]->disable_stock_change;
+
+			$arrayOfObjBom[] = $moLine;
+		}
+		$object->lines = $arrayOfObjBom;
 		$object->mrptype = $objectbom->bomtype;
 		$object->bom = $objectbom;
 

From 61e05a9fdea253ce3d7643a8b94462907879593d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:10:30 +0100
Subject: [PATCH 1512/1862] Fix Typing on $fields for 2nd class in file

# Fix Typing on $fields for 2nd class in file

This fixes the PHPstan notification for the $fields property of the
second CommonObject subclass in the files.

Example: 'PHPDoc type array of property BOMLine::$fields is not covariant with PHPDoc type array of overridden property CommonObject::$fields.'
---
 htdocs/bom/class/bom.class.php         | 2 +-
 htdocs/contrat/class/contrat.class.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 1aa3f31ddae..1ed600f2433 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1714,7 +1714,7 @@ class BOMLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'LineID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 6c9fc066666..6110150e731 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -290,17 +290,17 @@ class Contrat extends CommonObject
 	/*
 	 * Signed by sender
 	 */
-	CONST STATUS_SIGNED_SENDER   = 1;
+	const STATUS_SIGNED_SENDER   = 1;
 
 	/*
 	 * Signed by receiver
 	 */
-	CONST STATUS_SIGNED_RECEIVER = 2;
+	const STATUS_SIGNED_RECEIVER = 2;
 
 	/*
 	 * Signed by all
 	 */
-	CONST STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
+	const STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
 
 
 	/**
@@ -3148,7 +3148,7 @@ class ContratLigne extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),

From 13e1209c01c4c2b169442b47c9d4b6901bf7cb6f Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 17:15:24 +0100
Subject: [PATCH 1513/1862] FIX problem for display content in editor

---
 htdocs/comm/mailing/card.php              |  4 ++--
 htdocs/core/class/html.formmail.class.php | 25 +++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 216ec9bbdd8..d0efa85599e 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -895,10 +895,10 @@ if ($action == 'create') {
 				</script>';
 	}
 	if ($formmail->withfckeditor) {
-		$out .= $formmail->getModelEmailTemplate();
+		$out .= $formmail->getModelEmailTemplate('bodyemail');
 	}
 	if ($formmail->withaiprompt && isModEnabled('ai')) {
-		$out .= $formmail->getSectionForAIPrompt();
+		$out .= $formmail->getSectionForAIPrompt('', 'bodyemail');
 	}
 	print $out;
 	print '</td></tr>';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 7557a9d89ce..f9cde0e1d1a 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1004,6 +1004,8 @@ class FormMail extends Form
 				$out .= '</td>';
 				$out .= '<td>';
 
+				$this->withaiprompt = 'html';
+				$this->withlayout = 1;
 				// Add link to add layout
 				if ($this->withlayout && $this->withfckeditor) {
 					$out .= '<a href="#" id="linkforlayouttemplates" class="reposition notasortlink inline-block alink marginrightonly">';
@@ -1440,9 +1442,10 @@ class FormMail extends Form
 	 * Return Html code for AI instruction of message and autofill result
 	 *
 	 * @param	string		$format			Format for output ('', 'html', ...)
+	 * @param   string      $htmlContent    HTML name of WYSIWIG field
 	 * @return 	string      				HTML code to ask AI instruction and autofill result
 	 */
-	public function getSectionForAIPrompt($format = '')
+	public function getSectionForAIPrompt($format = '', $htmlContent = 'message')
 	{
 		global $langs;
 
@@ -1473,8 +1476,8 @@ class FormMail extends Form
 					$('#ai_status_message').show();
 
 					//editor on readonly
-        			if (CKEDITOR.instances.message) {
-						CKEDITOR.instances.message.setReadOnly(1);
+        			if (CKEDITOR.instances.".$htmlContent.") {
+						CKEDITOR.instances.".$htmlContent.".setReadOnly(1);
 					}
 
 					$.ajax({
@@ -1486,13 +1489,13 @@ class FormMail extends Form
 							'instructions': instructions,
 						}),
 						success: function(response) {
-							console.log('Add response into field message: '+response);
+							console.log('Add response into field ".$htmlContent.": '+response);
 
-							jQuery('#message').val(response);
+							jQuery('#".$htmlContent."').val(response);
 
-							if (CKEDITOR.instances && CKEDITOR.instances.message && ".getDolGlobalInt('FCKEDITOR_ENABLE_MAIL', 0).") {
-								CKEDITOR.instances.message.setReadOnly(0);
-								CKEDITOR.instances.message.setData(response);
+							if (CKEDITOR.instances && CKEDITOR.instances.".$htmlContent." && ".getDolGlobalInt('FCKEDITOR_ENABLE_MAIL', 0).") {
+								CKEDITOR.instances.".$htmlContent.".setReadOnly(0);
+								CKEDITOR.instances.".$htmlContent.".setData(response);
 							}
 
 							// remove readonly
@@ -1516,10 +1519,10 @@ class FormMail extends Form
 
 	/**
 	 * Return HTML code for selection of email layout
-	 *
+	 * @param   string      $htmlContent    HTML name of WYSIWIG field
 	 * @return 	string      HTML for model email boxes
 	 */
-	public function getModelEmailTemplate()
+	public function getModelEmailTemplate($htmlContent = 'message')
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/emaillayout.lib.php';
 
@@ -1551,7 +1554,7 @@ class FormMail extends Form
 						var template = $(this).data('template');
 						var contentHtml = $(this).data('content');
 
-						var editorInstance = CKEDITOR.instances.message;
+						var editorInstance = CKEDITOR.instances.".$htmlContent.";
 						if (editorInstance) {
 							editorInstance.setData(contentHtml);
 						}

From 7d49d0e20b4fcb976ea8884389b5c5bb76684992 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Fri, 15 Mar 2024 18:05:32 +0100
Subject: [PATCH 1514/1862] NEW annimation for display spinner when waiting
 response

---
 htdocs/core/class/html.formmail.class.php |  8 +++-
 htdocs/theme/eldy/global.inc.php          | 46 +++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 7557a9d89ce..290c4ffec6d 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1454,7 +1454,8 @@ class FormMail extends Form
 		$out .= '<td>';
 		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="'.$langs->trans("EnterYourAIPromptHere").'..." />';
 		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
-		$out .= '<div id="ai_status_message" class="fieldrequired hideobject" >'.$langs->trans("AIProcessingPleaseWait").'</div>';
+		$out .= '<div id="ai_status_message" class="fieldrequired hideobject marginrightonly" >';
+		$out .= '<i class="loader"></i>'.$langs->trans("AIProcessingPleaseWait").'</div>';
 		$out .= "</td></tr>\n";
 
 		$out .= "<script type='text/javascript'>
@@ -1471,6 +1472,7 @@ class FormMail extends Form
 					var instructions = $('#ai_instructions').val();
 					
 					$('#ai_status_message').show();
+					$('.icon-container .loader').show();
 
 					//editor on readonly
         			if (CKEDITOR.instances.message) {
@@ -1498,7 +1500,9 @@ class FormMail extends Form
 							// remove readonly
 							$('#ai_instructions').val('');
 
-							$('#ai_status_message').hide();
+							setTimeout(function() {
+								$('#ai_status_message').hide();
+							}, 3000);
 						},
 						error: function(xhr, status, error) {
 							alert(error);
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3c87a03153a..39205187292 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -8154,7 +8154,51 @@ table.jPicker {
 	}
 }
 
+/* ============================================================================== */
+/* CSS style for animation ai message                                                   */
+/* ============================================================================== */
+.icon-container {
+  top: calc(50% - 10px);
+}
 
+.loader {
+  position: relative;
+  height: 20px;
+  width: 20px;
+  display: inline-block;
+  animation: around 5.4s infinite;
+}
+
+@keyframes around {
+  0% {
+	transform: rotate(0deg);
+  }
+  100% {
+	transform: rotate(360deg);
+  }
+}
+
+.loader::after, .loader::before {
+  content: '';
+  background: white;
+  position: absolute;
+  display: inline-block;
+  width: 100%;
+  height: 100%;
+  border-width: 2px;
+  border-color: #333 #333 transparent transparent;
+  border-style: solid;
+  border-radius: 20px;
+  box-sizing: border-box;
+  top: 0;
+  left: 0;
+  animation: around 0.7s ease-in-out infinite;
+}
+
+.loader::after {
+  animation: around 0.7s ease-in-out 0.1s infinite;
+  background: transparent;
+}
 @media only screen and (max-width: 320px)
 {
 	.dropdown dd ul {
@@ -8206,3 +8250,5 @@ div.flot-text .flot-tick-label .tickLabel, .fa-color-unset {
 	color: unset;
 
 }
+
+

From ad45f2709b72db716582cf54ae772d7c83354f2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 18:52:34 +0100
Subject: [PATCH 1515/1862] Clean code

---
 htdocs/accountancy/admin/categories_list.php | 65 ++++++++------------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 18d793fc43e..8204c4ba6a2 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -201,9 +201,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha')) {
+		$newid = 0;
+
 		if ($tabrowid[$id]) {
 			// Get free id for insert
-			$newid = 0;
 			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]);
 			$result = $db->query($sql);
 			if ($result) {
@@ -309,11 +310,7 @@ if (GETPOST('actioncancel', 'alpha')) {
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
+	$rowidcol = "rowid";
 
 	$sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
 
@@ -330,11 +327,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 
 // activate
 if ($action == $acts[0]) {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
+	$rowidcol = "rowid";
 
 	if ($rowid) {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
@@ -342,19 +335,17 @@ if ($action == $acts[0]) {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE code = '".$db->escape($code)."'";
 	}
 
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
+	if ($sql) {
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
 	}
 }
 
 // disable
 if ($action == $acts[1]) {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
+	$rowidcol = "rowid";
 
 	if ($rowid) {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
@@ -362,19 +353,17 @@ if ($action == $acts[1]) {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE code = '".$db->escape($code)."'";
 	}
 
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
+	if ($sql) {
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
 	}
 }
 
 // favorite
 if ($action == 'activate_favorite') {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
+	$rowidcol = "rowid";
 
 	if ($rowid) {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 1 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
@@ -382,19 +371,17 @@ if ($action == 'activate_favorite') {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
 	}
 
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
+	if ($sql) {
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
 	}
 }
 
 // disable favorite
 if ($action == 'disable_favorite') {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
+	$rowidcol = "rowid";
 
 	if ($rowid) {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 0 WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
@@ -402,9 +389,11 @@ if ($action == 'disable_favorite') {
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
 	}
 
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
+	if ($sql) {
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
 	}
 }
 

From 5fadea4d0da5254ebcbe052e292dd73067ebb93c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 19:39:08 +0100
Subject: [PATCH 1516/1862] NEW Support Reply-To tracking in emails sending
 (tickets only for the moment)

---
 htdocs/core/class/CMailFile.class.php | 29 +++++++++++++++++----------
 htdocs/core/class/smtps.class.php     | 16 +++++----------
 htdocs/ticket/class/ticket.class.php  | 16 ++++++++++++++-
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 91e7d127486..ac4f4c0da39 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -81,19 +81,20 @@ class CMailFile
 	 */
 	public $errors = array();
 
-	public $smtps; // Contains SMTPs object (if this method is used)
-	public $phpmailer; // Contains PHPMailer object (if this method is used)
+
+	/**
+	 * @var SMTPS (if this method is used)
+	 */
+	public $smtps;
+	/**
+	 * @var Swift_Mailer (if the method is used)
+	 */
+	public $mailer;
 
 	/**
 	 * @var Swift_SmtpTransport
 	 */
 	public $transport;
-
-	/**
-	 * @var Swift_Mailer
-	 */
-	public $mailer;
-
 	/**
 	 * @var Swift_Plugins_Loggers_ArrayLogger
 	 */
@@ -108,9 +109,13 @@ class CMailFile
 	//! Defined background directly in body tag
 	public $bodyCSS;
 
+	/**
+	 * @var string	Message-ID of the email to send (generated)
+	 */
 	public $msgid;
 	public $headers;
 	public $message;
+
 	/**
 	 * @var array fullfilenames list (full path of filename on file system)
 	 */
@@ -579,12 +584,15 @@ class CMailFile
 			//$this->message = new Swift_SignedMessage();
 			// Adding a trackid header to a message
 			$headers = $this->message->getHeaders();
+
 			$headers->addTextHeader('X-Dolibarr-TRACKID', $this->trackid.'@'.$host);
 			$this->msgid = time().'.swiftmailer-dolibarr-'.$this->trackid.'@'.$host;
 			$headerID = $this->msgid;
 			$msgid = $headers->get('Message-ID');
 			$msgid->setId($headerID);
-			$headers->addIdHeader('References', $headerID);
+
+			// Add 'References:' header
+			//$headers->addIdHeader('References', $headerID);
 
 			if (!empty($moreinheader)) {
 				$moreinheaderarray = preg_split('/[\r\n]+/', $moreinheader);
@@ -727,7 +735,6 @@ class CMailFile
 		}
 	}
 
-
 	/**
 	 * Send mail that was prepared by constructor.
 	 *
@@ -1536,7 +1543,7 @@ class CMailFile
 			// References is kept in response and Message-ID is returned into In-Reply-To:
 			$this->msgid = time().'.phpmail-dolibarr-'.$trackid.'@'.$host;
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2; // Uppercase seems replaced by phpmail
-			$out .= 'References: <'.$this->msgid.">".$this->eol2;
+			//$out .= 'References: <'.$this->msgid.">".$this->eol2;
 			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
 		} else {
 			$this->msgid = time().'.phpmail@'.$host;
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 150414b3c4d..572bc38f363 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -651,12 +651,9 @@ class SMTPs
 	 */
 	public function sendMsg()
 	{
-		global $conf;
-
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		/**
-		 * Default return value
-		 */
+
+		// Default return value
 		$_retVal = false;
 
 		// Connect to Server
@@ -1451,10 +1448,10 @@ class SMTPs
 
 		$trackid = $this->getTrackId();
 		if ($trackid) {
-			// References is kept in response and Message-ID is returned into In-Reply-To:
 			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
-			$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
 			$_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
+			// References and In-Reply-To: will be set by caller
+			//$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
 		} else {
 			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
 		}
@@ -1465,10 +1462,6 @@ class SMTPs
 			$_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
 		}
 
-		//$_header .=
-		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
-		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
-
 		if ($this->getSensitivity()) {
 			$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
 		}
@@ -1493,6 +1486,7 @@ class SMTPs
 		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
 		$_header .= 'Mime-Version: 1.0'."\r\n";
 
+		// TODO Add also $this->references and In-Reply-To
 
 		return $_header;
 	}
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index cdfb8beef07..3d231680b21 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3008,10 +3008,24 @@ class Ticket extends CommonObject
 
 				$moreinheader = 'X-Dolibarr-Info: sendTicketMessageByEmail'."\r\n";
 				if (!empty($this->email_msgid)) {
-					$moreinheader .= 'References: <'.$this->email_msgid.'>'."\r\n";
+					// We must also add 1 entry In-Reply-To: <$this->email_msgid> with Message-ID we respond from (See RFC5322).
+					$moreinheader .= 'In-Reply-To: <'.$this->email_msgid.'>'."\r\n";
+				}
+
+				// We should add here also a header 'References:'
+				// According to RFC5322, we should add here all the References fields of the initial message concatenated with
+				// the Message-ID of the message we respond from (but each ID must be once).
+				$references = '';
+				// @TODO
+				// Retrieve source References to do  				$references .= (empty($references) ? '' : ' ').Source References
+				// If No References is set, use the In-Reply-To for $references .= (empty($references) ? '' : ' ').Source In-reply-To
+				$references .= (empty($references) ? '' : ' ').'<'.$this->email_msgid.'>';
+				if ($references) {
+					$moreinheader .= 'References: '.$references."\r\n";
 				}
 
 				$mailfile = new CMailFile($subject, $receiver, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid, $moreinheader, 'ticket', '', $upload_dir_tmp);
+
 				if ($mailfile->error) {
 					setEventMessages($mailfile->error, null, 'errors');
 				} else {

From 9302eb645fd1093544f48828137ac50ab47446b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 19:57:23 +0100
Subject: [PATCH 1517/1862] Update product.class.php

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5e5e8f8d119..dc52f70cd7f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3482,11 +3482,11 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats réception fournisseur pour le produit/service
 	 *
-	 * @param  int    	$socid           Id societe pour filtrer sur une societe
-	 * @param  string 	$filtrestatut    Id statut pour filtrer sur un statut
-	 * @param  int    	$forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param  int    	$socid           	Id societe pour filtrer sur une societe
+	 * @param  string 	$filtrestatut    	Id statut pour filtrer sur un statut
+	 * @param  int    	$forVirtualStock 	Ignore rights filter for virtual stock calculation.
 	 * @param	int		$dateofvirtualstock	Date of virtual stock
-	 * @return int                     Array of stats in $this->stats_reception, <0 if ko or >0 if ok
+	 * @return int                     		Array of stats in $this->stats_reception, <0 if ko or >0 if ok
 	 */
 	public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null)
 	{
@@ -3543,12 +3543,12 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats production pour le produit/service
 	 *
-	 * @param  int    	$socid           Id societe pour filtrer sur une societe
-	 * @param  string 	$filtrestatut    Id statut pour filtrer sur un statut
-	 * @param  int    	$forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param	int    	$socid           	Id societe pour filtrer sur une societe
+	 * @param	string 	$filtrestatut    	Id statut pour filtrer sur un statut
+	 * @param	int    	$forVirtualStock 	Ignore rights filter for virtual stock calculation.
 	 * @param	int		$dateofvirtualstock	Date of virtual stock
-	 * @param   int $warehouseid Filter by a warehouse
-	 * @return integer                 Array of stats in $this->stats_mrptoproduce (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
+	 * @param   int 	$warehouseid 		Filter by a warehouse. Warning: When a filter on a warehous is set, it is not possible to calculate an accurate virtual stock because we can't knnow in which warehouse will be done virtual stock changes.
+	 * @return 	integer                 	Array of stats in $this->stats_mrptoproduce (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
 	 */
 	public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null, $warehouseid = 0)
 	{

From 5f0c13b73b83c5412e4dfab3e3df225e8c52b9ef Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Fri, 15 Mar 2024 20:04:03 +0100
Subject: [PATCH 1518/1862] only if supplied 'account' numbers match will we
 actually delete, else return 416. Return 401 when not authorized

---
 htdocs/societe/class/api_thirdparties.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index dfd78b08cd6..f4aad4569bf 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1266,18 +1266,20 @@ class Thirdparties extends DolibarrApi
 	public function deleteCompanyBankAccount($id, $bankaccount_id)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('societe', 'creer')) {
-			throw new RestException(403);
+			throw new RestException(401);
 		}
 
 		$account = new CompanyBankAccount($this->db);
 
 		$account->fetch($bankaccount_id);
 
-		if (!$account->socid == $id) {
-			throw new RestException(403);
-		}
+		$socid = (int) $account->socid;
 
-		return $account->delete(DolibarrApiAccess::$user);
+		if ($account->socid == $id) {
+			return $account->delete(DolibarrApiAccess::$user);
+		} else {
+			throw new RestException(416);
+		}
 	}
 
 	/**

From 434d4d2a0d0caa156e95073049f193761f1a3324 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Fri, 15 Mar 2024 20:07:56 +0100
Subject: [PATCH 1519/1862] using the type casted variable in if

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f4aad4569bf..fb67a582612 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1275,7 +1275,7 @@ class Thirdparties extends DolibarrApi
 
 		$socid = (int) $account->socid;
 
-		if ($account->socid == $id) {
+		if ($socid == $id) {
 			return $account->delete(DolibarrApiAccess::$user);
 		} else {
 			throw new RestException(416);

From 28269b1a0aa874cc22caec468b1b1cad0301d2ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 20:26:22 +0100
Subject: [PATCH 1520/1862] Clean code for #28785

---
 htdocs/admin/eventorganization.php            |  35 --
 htdocs/admin/hrm.php                          |  58 ++--
 htdocs/admin/knowledgemanagement.php          |  57 ++--
 htdocs/admin/webhook.php                      | 298 ------------------
 htdocs/admin/workstation.php                  |  60 ++--
 htdocs/ai/admin/setup.php                     |  35 --
 htdocs/asset/admin/setup.php                  |  58 ++--
 htdocs/bookcal/admin/setup.php                |  35 --
 htdocs/cron/class/cronjob.class.php           |   2 +-
 htdocs/don/admin/donation.php                 |   2 +-
 htdocs/modulebuilder/template/admin/setup.php |  65 ++--
 11 files changed, 159 insertions(+), 546 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 983a93a9c02..f6e6361fa34 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -102,41 +102,6 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
-	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
-
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
-
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/eventorganization/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele;
-			break;
-		}
-	}
-
-	if ($classname !== '') {
-		require_once $file;
-
-		$module = new $classname($db);
-
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
-		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
-		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index df883799b2b..c057181dd25 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -66,6 +66,11 @@ $setupnotempty = 0;
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
+$moduledir = 'hrm';
+$myTmpObjects = array();
+// TODO Scan list of objects to fill this array
+$myTmpObjects['evaluation'] = array('label' => 'Evaluation', 'includerefgeneration' => 1, 'includedocgeneration' => 0);
+
 
 /*
  * Actions
@@ -109,38 +114,40 @@ if ($action == 'update') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (in_array($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/hrm/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele;
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/hrm/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_".$modele;
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
@@ -209,9 +216,6 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 $head = hrmAdminPrepareHead();
 print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "hrm");
 
-$moduledir = 'hrm';
-$myTmpObjects = array();
-$myTmpObjects['evaluation'] = array('label' => 'Evaluation', 'includerefgeneration' => 1, 'includedocgeneration' => 0);
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectKey != $type) {
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 1f79f506c89..c3b7a4be39c 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -46,7 +46,7 @@ $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'knowledgemanagement';
 
 $arrayofparameters = array(
-	'KNOWLEDGEMANAGEMENT_MYPARAM1' => array('type' => 'string', 'css' => 'minwidth500' ,'enabled' => 0),
+	//'KNOWLEDGEMANAGEMENT_MYPARAM1' => array('type' => 'string', 'css' => 'minwidth500' ,'enabled' => 0),
 	//'KNOWLEDGEMANAGEMENT_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
 	//'KNOWLEDGEMANAGEMENT_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
 	//'KNOWLEDGEMANAGEMENT_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
@@ -62,6 +62,11 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
+$moduledir = 'knowledgemanagement';
+$myTmpObjects = array();
+// TODO Scan list of objects to fill this array
+$myTmpObjects['knowledgemanagement'] = array('label'=>'KnowledgeManagement', 'includerefgeneration'=>0, 'includedocgeneration'=>0, 'class'=>'KnowledgeManagement');
+
 
 /*
  * Actions
@@ -87,38 +92,40 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (in_array($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele;
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_".$modele;
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 4758220503d..879c17af00d 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -90,41 +90,6 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
-	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
-
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
-
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/webhook/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
-			break;
-		}
-	}
-
-	if ($classname !== '') {
-		require_once $file;
-
-		$module = new $classname($db);
-
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=webhook-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
-		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
-		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
@@ -375,269 +340,6 @@ if ($action == 'edit') {
 }
 
 
-$moduledir = 'webhook';
-$myTmpObjects = array();
-$myTmpObjects['MyObject'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
-
-
-foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') {
-		continue;
-	}
-	if ($myTmpObjectArray['includerefgeneration']) {
-		/*
-		 * Orders Numbering model
-		 */
-		$setupnotempty++;
-
-		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Name").'</td>';
-		print '<td>'.$langs->trans("Description").'</td>';
-		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
-		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
-		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
-		print '</tr>'."\n";
-
-		clearstatcache();
-
-		foreach ($dirmodels as $reldir) {
-			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
-
-			if (is_dir($dir)) {
-				$handle = opendir($dir);
-				if (is_resource($handle)) {
-					while (($file = readdir($handle)) !== false) {
-						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
-							$file = substr($file, 0, dol_strlen($file) - 4);
-
-							require_once $dir.'/'.$file.'.php';
-
-							$module = new $file($db);
-
-							// Show modules according to features level
-							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
-								continue;
-							}
-							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
-								continue;
-							}
-
-							if ($module->isEnabled()) {
-								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
-
-								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
-								print $module->info($langs);
-								print '</td>';
-
-								// Show example of numbering model
-								print '<td class="nowrap">';
-								$tmp = $module->getExample();
-								if (preg_match('/^Error/', $tmp)) {
-									$langs->load("errors");
-									print '<div class="error">'.$langs->trans($tmp).'</div>';
-								} elseif ($tmp == 'NotConfigured') {
-									print $langs->trans($tmp);
-								} else {
-									print $tmp;
-								}
-								print '</td>'."\n";
-
-								print '<td class="center">';
-								$constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON';
-								if (getDolGlobalString($constforvar) == $file) {
-									print img_picto($langs->trans("Activated"), 'switch_on');
-								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
-									print img_picto($langs->trans("Disabled"), 'switch_off');
-									print '</a>';
-								}
-								print '</td>';
-
-								$mytmpinstance = new $myTmpObjectKey($db);
-								$mytmpinstance->initAsSpecimen();
-
-								// Info
-								$htmltooltip = '';
-								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-
-								$nextval = $module->getNextValue($mytmpinstance);
-								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-									$htmltooltip .= ''.$langs->trans("NextValue").': ';
-									if ($nextval) {
-										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
-											$nextval = $langs->trans($nextval);
-										}
-										$htmltooltip .= $nextval.'<br>';
-									} else {
-										$htmltooltip .= $langs->trans($module->error).'<br>';
-									}
-								}
-
-								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
-								print '</td>';
-
-								print "</tr>\n";
-							}
-						}
-					}
-					closedir($handle);
-				}
-			}
-		}
-		print "</table><br>\n";
-	}
-
-	if ($myTmpObjectArray['includedocgeneration']) {
-		/*
-		 * Document templates generators
-		 */
-		$setupnotempty++;
-		$type = strtolower($myTmpObjectKey);
-
-		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
-
-		// Load array def with activated templates
-		$def = array();
-		$sql = "SELECT nom";
-		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-		$sql .= " WHERE type = '".$db->escape($type)."'";
-		$sql .= " AND entity = ".$conf->entity;
-		$resql = $db->query($sql);
-		if ($resql) {
-			$i = 0;
-			$num_rows = $db->num_rows($resql);
-			while ($i < $num_rows) {
-				$array = $db->fetch_array($resql);
-				array_push($def, $array[0]);
-				$i++;
-			}
-		} else {
-			dol_print_error($db);
-		}
-
-		print "<table class=\"noborder\" width=\"100%\">\n";
-		print "<tr class=\"liste_titre\">\n";
-		print '<td>'.$langs->trans("Name").'</td>';
-		print '<td>'.$langs->trans("Description").'</td>';
-		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
-		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
-		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
-		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
-		print "</tr>\n";
-
-		clearstatcache();
-
-		foreach ($dirmodels as $reldir) {
-			foreach (array('', '/doc') as $valdir) {
-				$realpath = $reldir."core/modules/".$moduledir.$valdir;
-				$dir = dol_buildpath($realpath);
-
-				if (is_dir($dir)) {
-					$handle = opendir($dir);
-					if (is_resource($handle)) {
-						$filelist = array();
-						while (($file = readdir($handle)) !== false) {
-							$filelist[] = $file;
-						}
-						closedir($handle);
-						arsort($filelist);
-
-						foreach ($filelist as $file) {
-							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
-								if (file_exists($dir.'/'.$file)) {
-									$name = substr($file, 4, dol_strlen($file) - 16);
-									$classname = substr($file, 0, dol_strlen($file) - 12);
-
-									require_once $dir.'/'.$file;
-									$module = new $classname($db);
-
-									$modulequalified = 1;
-									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
-										$modulequalified = 0;
-									}
-									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
-										$modulequalified = 0;
-									}
-
-									if ($modulequalified) {
-										print '<tr class="oddeven"><td width="100">';
-										print(empty($module->name) ? $name : $module->name);
-										print "</td><td>\n";
-										if (method_exists($module, 'info')) {
-											print $module->info($langs);
-										} else {
-											print $module->description;
-										}
-										print '</td>';
-
-										// Active
-										if (in_array($name, $def)) {
-											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';
-											print img_picto($langs->trans("Enabled"), 'switch_on');
-											print '</a>';
-											print '</td>';
-										} else {
-											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-											print "</td>";
-										}
-
-										// Default
-										print '<td class="center">';
-										$constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if (getDolGlobalString($constforvar) == $name) {
-											//print img_picto($langs->trans("Default"), 'on');
-											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-										}
-										print '</td>';
-
-										// Info
-										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-										if ($module->type == 'pdf') {
-											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-										}
-										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
-
-										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-
-										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
-										print '</td>';
-
-										// Preview
-										print '<td class="center">';
-										if ($module->type == 'pdf') {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
-										} else {
-											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-										}
-										print '</td>';
-
-										print "</tr>\n";
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		print '</table>';
-	}
-}
-
 if (empty($setupnotempty)) {
 	print '<br>'.$langs->trans("NothingToSetup");
 }
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 78084737c6e..78715860e12 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -51,6 +51,11 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
+$moduledir = 'workstation';
+$myTmpObjects = array();
+$myTmpObjects['workstation'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
+
+
 
 /*
  * Actions
@@ -77,38 +82,40 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (in_array($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele;
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_".$modele;
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'set') {
 	// Activate a model
@@ -219,11 +226,6 @@ if ($action == 'edit') {
 }
 
 
-$moduledir = 'workstation';
-$myTmpObjects = array();
-$myTmpObjects['workstation'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
-
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectKey == 'MyObject') {
 		continue;
diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index 9459b501b84..02ecda6a727 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -104,41 +104,6 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
-	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
-
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
-
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/ai/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
-			break;
-		}
-	}
-
-	if ($classname !== '') {
-		require_once $file;
-
-		$module = new $classname($db);
-
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bookcal-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
-		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
-		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 40e37464e90..0297cce5031 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -64,6 +64,10 @@ $setupnotempty = 0;
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
+$moduledir = 'asset';
+$myTmpObjects = array();
+$myTmpObjects['Asset'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
+
 
 /*
  * Actions
@@ -89,38 +93,40 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (in_array($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele;
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_".$modele;
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
@@ -194,10 +200,6 @@ print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "asse
 echo '<span class="opacitymedium">'.$langs->trans("AssetSetupPage").'</span>';
 
 
-$moduledir = 'asset';
-$myTmpObjects = array();
-$myTmpObjects['Asset'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
-
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectKey == 'MyObject') {
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index 1b445686550..737ad9558a8 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -136,41 +136,6 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
-	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
-
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
-
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/bookcal/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
-			break;
-		}
-	}
-
-	if ($classname !== '') {
-		require_once $file;
-
-		$module = new $classname($db);
-
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bookcal-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
-		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
-		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 621de20afa6..a761b7ffd4a 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1297,7 +1297,7 @@ class Cronjob extends CommonObject
 				dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params."); (Note: Log for cron jobs may be into a different log file)", LOG_DEBUG);
 
 				// Create Object for the called module
-				$nameofclass = $this->objectname;
+				$nameofclass = (string) $this->objectname;
 				$object = new $nameofclass($this->db);
 				if ($this->entity > 0) {
 					$object->entity = $this->entity; // We work on a dedicated entity
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 3a0854cb103..b88040c2ed7 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -64,9 +64,9 @@ if ($action == 'specimen') {
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
 	$file = $modele.".modules.php";
 	if ($modele !== '' && file_exists($dir.$file)) {
-		$classname = $modele;
 		require_once $dir.$file;
 
+		$classname = (string) $modele;
 		$obj = new $classname($db);
 
 		if ($obj->write_file($don, $langs) > 0) {
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 3fce4970731..d0ceb430554 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -171,6 +171,11 @@ $setupnotempty += count($formSetup->items);
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
+$moduledir = 'mymodule';
+$myTmpObjects = array();
+// TODO Scan list of objects to fill this array
+$myTmpObjects['myobject'] = array('label'=>'MyObject', 'includerefgeneration'=>0, 'includedocgeneration'=>0, 'class'=>'MyObject');
+
 
 /*
  * Actions
@@ -201,40 +206,42 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (in_array($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$filefound = 0;
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$filefound = 1;
-			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$filefound = 0;
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$filefound = 1;
+				$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
+				break;
+			}
 		}
-	}
 
-	if ($filefound) {
-		require_once $file;
+		if ($filefound) {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mymodule-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mymodule-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
@@ -327,12 +334,6 @@ if (!empty($formSetup->items)) {
 }
 
 
-$moduledir = 'mymodule';
-$myTmpObjects = array();
-// TODO Scan list of objects
-$myTmpObjects['myobject'] = array('label'=>'MyObject', 'includerefgeneration'=>0, 'includedocgeneration'=>0, 'class'=>'MyObject');
-
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*

From 79aa9fb1f163e9603a2d2569bc2aed61b6d26882 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Mar 2024 20:29:21 +0100
Subject: [PATCH 1521/1862] Code simpler

---
 htdocs/accountancy/admin/account.php                          | 2 +-
 htdocs/accountancy/admin/categories.php                       | 2 +-
 htdocs/accountancy/admin/fiscalyear.php                       | 2 +-
 htdocs/accountancy/admin/subaccount.php                       | 2 +-
 htdocs/accountancy/bookkeeping/balance.php                    | 2 +-
 htdocs/adherents/agenda.php                                   | 2 +-
 htdocs/adherents/document.php                                 | 2 +-
 htdocs/adherents/list.php                                     | 2 +-
 htdocs/adherents/subscription.php                             | 2 +-
 htdocs/adherents/subscription/list.php                        | 2 +-
 htdocs/adherents/type.php                                     | 2 +-
 htdocs/admin/const.php                                        | 2 +-
 htdocs/admin/defaultvalues.php                                | 2 +-
 htdocs/admin/emailcollector_list.php                          | 2 +-
 htdocs/admin/events.php                                       | 2 +-
 htdocs/admin/mails_senderprofile_list.php                     | 2 +-
 htdocs/admin/mails_templates.php                              | 2 +-
 htdocs/admin/tools/dolibarr_export.php                        | 2 +-
 htdocs/admin/tools/export.php                                 | 2 +-
 htdocs/admin/tools/export_files.php                           | 2 +-
 htdocs/admin/tools/listevents.php                             | 2 +-
 htdocs/admin/tools/listsessions.php                           | 2 +-
 htdocs/admin/translation.php                                  | 2 +-
 htdocs/admin/website.php                                      | 2 +-
 htdocs/admin/website_options.php                              | 2 +-
 htdocs/asset/agenda.php                                       | 2 +-
 htdocs/asset/document.php                                     | 2 +-
 htdocs/asset/list.php                                         | 2 +-
 htdocs/asset/model/agenda.php                                 | 2 +-
 htdocs/asset/model/list.php                                   | 2 +-
 htdocs/blockedlog/admin/blockedlog_list.php                   | 2 +-
 htdocs/bom/bom_agenda.php                                     | 2 +-
 htdocs/bom/bom_document.php                                   | 2 +-
 htdocs/bom/bom_list.php                                       | 2 +-
 htdocs/bookcal/availabilities_agenda.php                      | 2 +-
 htdocs/bookcal/availabilities_document.php                    | 2 +-
 htdocs/bookcal/availabilities_list.php                        | 2 +-
 htdocs/bookcal/calendar_agenda.php                            | 2 +-
 htdocs/bookcal/calendar_document.php                          | 2 +-
 htdocs/bookcal/calendar_list.php                              | 2 +-
 htdocs/bookmarks/list.php                                     | 2 +-
 htdocs/categories/viewcat.php                                 | 2 +-
 htdocs/comm/action/document.php                               | 2 +-
 htdocs/comm/action/index.php                                  | 2 +-
 htdocs/comm/action/list.php                                   | 2 +-
 htdocs/comm/action/pertype.php                                | 2 +-
 htdocs/comm/action/peruser.php                                | 2 +-
 htdocs/comm/action/rapport/index.php                          | 2 +-
 htdocs/comm/card.php                                          | 2 +-
 htdocs/comm/contact.php                                       | 2 +-
 htdocs/comm/mailing/advtargetemailing.php                     | 2 +-
 htdocs/comm/mailing/cibles.php                                | 2 +-
 htdocs/comm/propal/agenda.php                                 | 2 +-
 htdocs/comm/propal/document.php                               | 2 +-
 htdocs/comm/propal/list.php                                   | 2 +-
 htdocs/commande/agenda.php                                    | 2 +-
 htdocs/commande/customer.php                                  | 2 +-
 htdocs/commande/document.php                                  | 2 +-
 htdocs/commande/list.php                                      | 2 +-
 htdocs/commande/list_det.php                                  | 2 +-
 htdocs/compta/accounting-files.php                            | 2 +-
 htdocs/compta/bank/account_statement_document.php             | 2 +-
 htdocs/compta/bank/bankentries_list.php                       | 2 +-
 htdocs/compta/bank/document.php                               | 2 +-
 htdocs/compta/bank/list.php                                   | 2 +-
 htdocs/compta/bank/releve.php                                 | 2 +-
 htdocs/compta/bank/various_payment/document.php               | 2 +-
 htdocs/compta/bank/various_payment/list.php                   | 2 +-
 htdocs/compta/cashcontrol/cashcontrol_card.php                | 2 +-
 htdocs/compta/cashcontrol/cashcontrol_list.php                | 2 +-
 htdocs/compta/charges/index.php                               | 2 +-
 htdocs/compta/clients.php                                     | 2 +-
 htdocs/compta/deplacement/document.php                        | 2 +-
 htdocs/compta/deplacement/index.php                           | 4 ++--
 htdocs/compta/deplacement/list.php                            | 2 +-
 htdocs/compta/facture/agenda-rec.php                          | 2 +-
 htdocs/compta/facture/agenda.php                              | 2 +-
 htdocs/compta/facture/card-rec.php                            | 2 +-
 htdocs/compta/facture/document.php                            | 2 +-
 htdocs/compta/facture/invoicetemplate_list.php                | 2 +-
 htdocs/compta/facture/list.php                                | 2 +-
 htdocs/compta/paiement.php                                    | 2 +-
 htdocs/compta/paiement/cheque/card.php                        | 2 +-
 htdocs/compta/paiement/cheque/list.php                        | 2 +-
 htdocs/compta/paiement/list.php                               | 2 +-
 htdocs/compta/paiement/tovalidate.php                         | 2 +-
 htdocs/compta/prelevement/card.php                            | 2 +-
 htdocs/compta/prelevement/create.php                          | 2 +-
 htdocs/compta/prelevement/demandes.php                        | 2 +-
 htdocs/compta/prelevement/factures.php                        | 2 +-
 htdocs/compta/prelevement/fiche-rejet.php                     | 2 +-
 htdocs/compta/prelevement/fiche-stat.php                      | 2 +-
 htdocs/compta/prelevement/line.php                            | 2 +-
 htdocs/compta/prelevement/list.php                            | 2 +-
 htdocs/compta/prelevement/orders_list.php                     | 2 +-
 htdocs/compta/prelevement/rejets.php                          | 2 +-
 htdocs/compta/recap-compta.php                                | 2 +-
 htdocs/compta/resultat/clientfourn.php                        | 2 +-
 htdocs/compta/sociales/document.php                           | 2 +-
 htdocs/compta/sociales/list.php                               | 2 +-
 htdocs/compta/sociales/payments.php                           | 2 +-
 htdocs/compta/tva/document.php                                | 2 +-
 htdocs/compta/tva/list.php                                    | 2 +-
 htdocs/compta/tva/payments.php                                | 2 +-
 htdocs/contact/agenda.php                                     | 2 +-
 htdocs/contact/consumption.php                                | 2 +-
 htdocs/contact/document.php                                   | 2 +-
 htdocs/contact/list.php                                       | 2 +-
 htdocs/contrat/agenda.php                                     | 2 +-
 htdocs/contrat/document.php                                   | 2 +-
 htdocs/contrat/list.php                                       | 2 +-
 htdocs/contrat/messaging.php                                  | 2 +-
 htdocs/contrat/services_list.php                              | 2 +-
 htdocs/core/ajax/ajaxdirpreview.php                           | 2 +-
 htdocs/core/customreports.php                                 | 2 +-
 htdocs/core/modules/movement/doc/pdf_standard.modules.php     | 2 +-
 htdocs/cron/list.php                                          | 2 +-
 htdocs/don/document.php                                       | 2 +-
 htdocs/don/list.php                                           | 2 +-
 htdocs/don/paiement/list.php                                  | 2 +-
 htdocs/ecm/dir_add_card.php                                   | 2 +-
 htdocs/ecm/dir_card.php                                       | 2 +-
 htdocs/ecm/file_card.php                                      | 2 +-
 htdocs/ecm/file_note.php                                      | 2 +-
 htdocs/ecm/index.php                                          | 2 +-
 htdocs/ecm/index_auto.php                                     | 2 +-
 htdocs/ecm/index_medias.php                                   | 2 +-
 htdocs/ecm/search.php                                         | 2 +-
 htdocs/eventorganization/conferenceorbooth_document.php       | 2 +-
 htdocs/eventorganization/conferenceorbooth_list.php           | 2 +-
 htdocs/eventorganization/conferenceorboothattendee_list.php   | 2 +-
 htdocs/expedition/document.php                                | 2 +-
 htdocs/expedition/list.php                                    | 2 +-
 htdocs/expensereport/document.php                             | 2 +-
 htdocs/expensereport/index.php                                | 4 ++--
 htdocs/expensereport/payment/list.php                         | 2 +-
 htdocs/fichinter/agenda.php                                   | 2 +-
 htdocs/fichinter/card-rec.php                                 | 2 +-
 htdocs/fichinter/document.php                                 | 2 +-
 htdocs/fichinter/list.php                                     | 2 +-
 htdocs/fourn/commande/document.php                            | 2 +-
 htdocs/fourn/commande/info.php                                | 2 +-
 htdocs/fourn/commande/list.php                                | 2 +-
 htdocs/fourn/contact.php                                      | 4 ++--
 htdocs/fourn/facture/card-rec.php                             | 2 +-
 htdocs/fourn/facture/document.php                             | 2 +-
 htdocs/fourn/facture/list-rec.php                             | 2 +-
 htdocs/fourn/facture/list.php                                 | 2 +-
 htdocs/fourn/paiement/document.php                            | 2 +-
 htdocs/fourn/paiement/list.php                                | 2 +-
 htdocs/fourn/product/list.php                                 | 2 +-
 htdocs/ftp/index.php                                          | 2 +-
 htdocs/holiday/define_holiday.php                             | 2 +-
 htdocs/holiday/document.php                                   | 2 +-
 htdocs/holiday/list.php                                       | 2 +-
 htdocs/holiday/view_log.php                                   | 2 +-
 htdocs/hrm/admin/admin_establishment.php                      | 2 +-
 htdocs/hrm/establishment/info.php                             | 2 +-
 htdocs/hrm/evaluation_agenda.php                              | 2 +-
 htdocs/hrm/evaluation_document.php                            | 2 +-
 htdocs/hrm/evaluation_list.php                                | 2 +-
 htdocs/hrm/job_agenda.php                                     | 2 +-
 htdocs/hrm/job_document.php                                   | 2 +-
 htdocs/hrm/job_list.php                                       | 2 +-
 htdocs/hrm/position_agenda.php                                | 2 +-
 htdocs/hrm/position_document.php                              | 2 +-
 htdocs/hrm/position_list.php                                  | 2 +-
 htdocs/hrm/skill_agenda.php                                   | 2 +-
 htdocs/hrm/skill_document.php                                 | 2 +-
 htdocs/hrm/skill_list.php                                     | 2 +-
 htdocs/intracommreport/list.php                               | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_agenda.php         | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_document.php       | 2 +-
 htdocs/knowledgemanagement/knowledgerecord_list.php           | 2 +-
 htdocs/loan/document.php                                      | 2 +-
 htdocs/loan/list.php                                          | 2 +-
 htdocs/margin/agentMargins.php                                | 2 +-
 htdocs/margin/checkMargins.php                                | 2 +-
 htdocs/margin/customerMargins.php                             | 2 +-
 htdocs/margin/productMargins.php                              | 2 +-
 htdocs/margin/tabs/productMargins.php                         | 2 +-
 htdocs/margin/tabs/thirdpartyMargins.php                      | 2 +-
 htdocs/mrp/mo_document.php                                    | 2 +-
 htdocs/mrp/mo_list.php                                        | 2 +-
 htdocs/mrp/mo_movements.php                                   | 2 +-
 htdocs/multicurrency/multicurrency_rate.php                   | 2 +-
 htdocs/opensurvey/list.php                                    | 2 +-
 htdocs/partnership/partnership_agenda.php                     | 2 +-
 htdocs/partnership/partnership_document.php                   | 2 +-
 htdocs/partnership/partnership_list.php                       | 2 +-
 htdocs/product/agenda.php                                     | 2 +-
 htdocs/product/document.php                                   | 2 +-
 htdocs/product/fournisseurs.php                               | 2 +-
 htdocs/product/inventory/list.php                             | 2 +-
 htdocs/product/list.php                                       | 2 +-
 htdocs/product/popuprop.php                                   | 2 +-
 htdocs/product/price.php                                      | 2 +-
 htdocs/product/reassort.php                                   | 2 +-
 htdocs/product/reassortlot.php                                | 2 +-
 htdocs/product/stats/bom.php                                  | 2 +-
 htdocs/product/stats/commande.php                             | 2 +-
 htdocs/product/stats/commande_fournisseur.php                 | 2 +-
 htdocs/product/stats/contrat.php                              | 2 +-
 htdocs/product/stats/facture.php                              | 2 +-
 htdocs/product/stats/facture_fournisseur.php                  | 2 +-
 htdocs/product/stats/facturerec.php                           | 2 +-
 htdocs/product/stats/mo.php                                   | 2 +-
 htdocs/product/stats/propal.php                               | 2 +-
 htdocs/product/stats/supplier_proposal.php                    | 2 +-
 htdocs/product/stock/card.php                                 | 2 +-
 htdocs/product/stock/list.php                                 | 2 +-
 htdocs/product/stock/massstockmove.php                        | 2 +-
 htdocs/product/stock/movement_card.php                        | 2 +-
 htdocs/product/stock/movement_list.php                        | 2 +-
 htdocs/product/stock/productlot_document.php                  | 2 +-
 htdocs/product/stock/productlot_list.php                      | 2 +-
 htdocs/product/stock/replenish.php                            | 2 +-
 htdocs/product/stock/replenishorders.php                      | 2 +-
 htdocs/product/stock/stats/commande_fournisseur.php           | 2 +-
 htdocs/product/stock/stats/expedition.php                     | 2 +-
 htdocs/product/stock/stats/mo.php                             | 2 +-
 htdocs/product/stock/stats/reception.php                      | 2 +-
 htdocs/product/stock/stockatdate.php                          | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_agenda.php   | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_document.php | 2 +-
 htdocs/product/stock/stocktransfer/stocktransfer_list.php     | 2 +-
 htdocs/product/stock/valo.php                                 | 2 +-
 htdocs/projet/agenda.php                                      | 2 +-
 htdocs/projet/list.php                                        | 2 +-
 htdocs/projet/messaging.php                                   | 2 +-
 htdocs/projet/tasks.php                                       | 2 +-
 htdocs/projet/tasks/document.php                              | 2 +-
 htdocs/projet/tasks/list.php                                  | 2 +-
 htdocs/projet/tasks/time.php                                  | 2 +-
 htdocs/public/members/public_list.php                         | 2 +-
 htdocs/public/opensurvey/index.php                            | 2 +-
 htdocs/public/recruitment/index.php                           | 2 +-
 htdocs/reception/document.php                                 | 2 +-
 htdocs/reception/list.php                                     | 2 +-
 htdocs/recruitment/recruitmentcandidature_agenda.php          | 2 +-
 htdocs/recruitment/recruitmentcandidature_document.php        | 2 +-
 htdocs/recruitment/recruitmentcandidature_list.php            | 2 +-
 htdocs/recruitment/recruitmentjobposition_agenda.php          | 2 +-
 htdocs/recruitment/recruitmentjobposition_document.php        | 2 +-
 htdocs/recruitment/recruitmentjobposition_list.php            | 2 +-
 htdocs/resource/agenda.php                                    | 2 +-
 htdocs/resource/document.php                                  | 2 +-
 htdocs/salaries/document.php                                  | 2 +-
 htdocs/salaries/list.php                                      | 2 +-
 htdocs/salaries/payments.php                                  | 2 +-
 htdocs/societe/agenda.php                                     | 2 +-
 htdocs/societe/list.php                                       | 2 +-
 htdocs/societe/messaging.php                                  | 2 +-
 htdocs/societe/notify/card.php                                | 2 +-
 htdocs/societe/price.php                                      | 2 +-
 htdocs/societe/societecontact.php                             | 2 +-
 htdocs/societe/website.php                                    | 2 +-
 htdocs/stripe/charge.php                                      | 2 +-
 htdocs/stripe/payout.php                                      | 2 +-
 htdocs/stripe/transaction.php                                 | 2 +-
 htdocs/supplier_proposal/document.php                         | 2 +-
 htdocs/supplier_proposal/list.php                             | 2 +-
 htdocs/ticket/agenda.php                                      | 2 +-
 htdocs/ticket/document.php                                    | 2 +-
 htdocs/ticket/list.php                                        | 2 +-
 htdocs/ticket/messaging.php                                   | 2 +-
 htdocs/user/agenda.php                                        | 2 +-
 htdocs/user/document.php                                      | 2 +-
 htdocs/user/group/list.php                                    | 2 +-
 htdocs/user/list.php                                          | 2 +-
 htdocs/user/messaging.php                                     | 2 +-
 htdocs/user/notify/card.php                                   | 2 +-
 htdocs/variants/list.php                                      | 2 +-
 htdocs/webhook/target_list.php                                | 2 +-
 htdocs/website/index.php                                      | 2 +-
 htdocs/workstation/workstation_agenda.php                     | 2 +-
 htdocs/workstation/workstation_document.php                   | 2 +-
 htdocs/workstation/workstation_list.php                       | 2 +-
 278 files changed, 281 insertions(+), 281 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 20d561ed752..b95e972374d 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -50,7 +50,7 @@ $search_accountparent = GETPOST('search_accountparent', 'alpha');
 $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
 $search_import_key = GETPOST('search_import_key', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $confirm = GETPOST('confirm', 'alpha');
 
 $chartofaccounts = GETPOSTINT('chartofaccounts');
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 465f2836122..37fd2ce3ed1 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -46,7 +46,7 @@ if ($cat_id == 0) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index d1ba74b8b56..59a89a20bdd 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 188915b0ec0..dd18283a704 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -55,7 +55,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 58807c5bcd2..3ef0b40b8c1 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -64,7 +64,7 @@ if ($search_accountancy_code_end == - 1) {
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index a42090f5b3c..9996fb644b5 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('companies', 'members'));
 $id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('rowid');
 
 // Pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index e92e1da0d41..b2e8f943cf4 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index e8d85f21c76..16088574096 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -102,7 +102,7 @@ if ($search_status < -2) {
 }
 
 // Pagination parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3ace1b42d58..11e817b6587 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -54,7 +54,7 @@ $typeid = GETPOSTINT('typeid');
 $cancel = GETPOST('cancel');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 3a99f379502..277a2f67a4f 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -57,7 +57,7 @@ $search_all = '';
 $date_select = GETPOST("date_select", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index df36f5c95da..8148f6ca683 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -61,7 +61,7 @@ $status = GETPOST('status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 317e838e922..1667f5138bb 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -41,7 +41,7 @@ $constname = GETPOST('constname', 'alphanohtml');
 $constvalue = GETPOST('constvalue', 'restricthtml'); // We should be able to send everything here
 $constnote = GETPOST('constnote', 'alpha');
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 430befce12b..56dc6b7aa97 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -46,7 +46,7 @@ $optioncss = GETPOST('optionscss', 'alphanohtml');
 
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 84706102216..668eb8fe6b2 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -50,7 +50,7 @@ $mode       = GETPOST('mode', 'aZ');
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 323483601a1..e701c903c07 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -41,7 +41,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'au
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index bcf786ec1b0..b96f325aaf4 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -48,7 +48,7 @@ $id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index ae1f8bf67d1..1ff0e80dbb4 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -81,7 +81,7 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ? GETPOST('listlimit', 'alpha') : 1000;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index b44581098bc..a913b110fff 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -44,7 +44,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 860cef0e9cd..2f81fd1b1f1 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -38,7 +38,7 @@ $export_type = GETPOST('export_type', 'alpha');
 $file = dol_sanitizeFileName(GETPOST('filename_template', 'alpha'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 446a013df81..6828c37acbf 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -59,7 +59,7 @@ if ($page < 0) {
 } elseif (empty($page)) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 902239fca39..49a5b4a47e5 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals"));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 0fdf1a0e561..def0be0975a 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 307f4e3a579..79d1c3eb87b 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -52,7 +52,7 @@ if ($mode == 'searchkey') {
 }
 
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index b517491d14c..a66ad8b43dd 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -49,7 +49,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 8066ac8604d..4e2c85e9697 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -40,7 +40,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 56e33e2e317..8f099abc537 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index bf585199df1..3c8a71d9425 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -41,7 +41,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index c35fe380279..561c16881b0 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -47,7 +47,7 @@ $mode			= GETPOST('mode', 'alpha');  // mode view (kanban or common)
 $id				= GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 1eb0a2e850a..797c1036af1 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 //$search_rowid = GETPOST('search_rowid');
 //$search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index cb61803017c..5c151668e9c 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -45,7 +45,7 @@ $optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index bb385e34984..016fae147a1 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -80,7 +80,7 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index f6229b309a1..b4f5a8531b7 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -56,7 +56,7 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 458d9d0b1aa..fae9d759bda 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -46,7 +46,7 @@ $ref = GETPOST('ref', 'alpha');
 // $result = restrictedArea($user, 'bom', $id);
 
 // Load variables for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index a3d335c11da..e9f32ee0433 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -48,7 +48,7 @@ $mode        = GETPOST('mode', 'aZ');  // mode view (kanban or common)
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index 5c29e0c45cc..21f6b113231 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index 433d92b144f..6991cd5ed6c 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 16efbe2d5df..3559e285947 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -52,7 +52,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index 7ef31ec2c3e..e7712a1f8b1 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php
index 32aaf416f35..38538b2f8a8 100644
--- a/htdocs/bookcal/calendar_document.php
+++ b/htdocs/bookcal/calendar_document.php
@@ -43,7 +43,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index 7a735b81c86..7787d75ddb8 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -50,7 +50,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index f333df50690..67f4e68088f 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -44,7 +44,7 @@ $id = GETPOSTINT("id");
 $search_title = GETPOST('search_title', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a277b9b03c8..d0d954802da 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -54,7 +54,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index ccda6ff5be1..b98e30d33ca 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -67,7 +67,7 @@ if ($id > 0) {
 $hookmanager->initHooks(array('actioncard', 'globalcard'));
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 78c5449ccca..67ea4fef765 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -74,7 +74,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 408b64c6fc9..514c9a4171c 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -115,7 +115,7 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 }
 
 // Pagination parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 990c9af705f..a40b63a50ad 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -69,7 +69,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 97098383652..9642d24053c 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -69,7 +69,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 5bf0b91974b..246befa21ef 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -39,7 +39,7 @@ $month = GETPOSTINT('month');
 $year = GETPOSTINT('year');
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 796f17e710c..36d7de22671 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -94,7 +94,7 @@ $action = GETPOST('action', 'aZ09');
 
 $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index a0eec00fa04..3f0b01ff537 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -42,7 +42,7 @@ if (!$sortfield) {
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 
 $type = GETPOST('type', 'alpha');
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index e0098643747..a64b886a0d4 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -44,7 +44,7 @@ if (isModEnabled('category')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 4b36bba8cda..e6644d5bdbd 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 $langs->loadLangs(array("mails", "admin"));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index 1fe3cf6d5dd..157c47bfdbd 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index e0dbd6b45b1..1d81859f0cf 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -46,7 +46,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 911d866b671..81fd59eb56b 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -147,7 +147,7 @@ $search_status = GETPOST('search_status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index af2a5da5594..3096e93831c 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 4f826bf3af3..1a9079b6418 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -46,7 +46,7 @@ if (!$user->hasRight('facture', 'creer')) {
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "orders"));
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 06ada04a04f..8be9504cf18 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -46,7 +46,7 @@ $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index e01cc02b357..1a96c6a7e6b 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -124,7 +124,7 @@ $search_fk_input_reason = GETPOSTINT('search_fk_input_reason');
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 2adbd25a7d0..ad037a7c026 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -132,7 +132,7 @@ $search_fk_input_reason = GETPOSTINT("search_fk_input_reason");
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 05351d41713..05bb11ed23a 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -78,7 +78,7 @@ $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0);
 $hookmanager->initHooks(array('comptafileslist', 'globallist'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 9585ac55973..32c6b1c9e01 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -51,7 +51,7 @@ if ($user->socid) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 82184b9ecb7..81d4d0e3738 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -96,7 +96,7 @@ if (empty($dateop)) {
 	$dateop = -1;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 006d8e72a4f..7df02b4b4f1 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -51,7 +51,7 @@ if ($user->socid) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 480c36cd07e..4cfb917017e 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -73,7 +73,7 @@ if ($user->socid) {
 
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 34c61ad8b31..2c215f3a0ab 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -76,7 +76,7 @@ if ($user->hasRight('banque', 'consolidate') && $action == 'dvprev' && !empty($d
 }
 
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 7c717d7ede0..30b02e86f8b 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -47,7 +47,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'banque', '', '', '');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 8a2aa9178f7..50203a3a815 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -42,7 +42,7 @@ $mode      = GETPOST('mode', 'alpha');
 $massaction = GETPOST('massaction', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 74cce92938d..db39a879308 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -47,7 +47,7 @@ $syear = (GETPOSTISSET('closeyear') ? GETPOSTINT('closeyear') : dol_print_date($
 $smonth = (GETPOSTISSET('closemonth') ? GETPOSTINT('closemonth') : dol_print_date($now, "%m"));
 $sday = (GETPOSTISSET('closeday') ? GETPOSTINT('closeday') : dol_print_date($now, "%d"));
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index c3cd5cd37a1..18e23efa53f 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -45,7 +45,7 @@ $mode       = GETPOST('mode', 'alpha');  // for mode view result
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 534b4a45d01..680c90f8d04 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -63,7 +63,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 
 $search_account = GETPOSTINT('search_account');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index c7963e95090..8b47e9a0aa3 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -45,7 +45,7 @@ $langs->load("companies");
 
 $mode = GETPOST("mode");
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index d950e51d852..9d77c73ff34 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -45,7 +45,7 @@ $confirm = GETPOST('confirm', 'alpha');
 
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 4adeb8913d6..2711ee5970c 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -38,7 +38,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'deplacement', '', '');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -54,7 +54,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.dated";
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 
 
 /*
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index c3eac0cb087..172c7175d53 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -49,7 +49,7 @@ $search_company = GETPOST('search_company', 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index 3636c91fce7..4a0c945b723 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php
index 2880e158273..c986254a715 100644
--- a/htdocs/compta/facture/agenda.php
+++ b/htdocs/compta/facture/agenda.php
@@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 3502f31d822..efe77c128a9 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -73,7 +73,7 @@ $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
 $selectedLines = GETPOST('toselect', 'array');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 47c6faf0c76..abc869cf031 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -50,7 +50,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 13a119e35b5..cb67dc4bbe2 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -97,7 +97,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 13995e6cc0b..7abf07206a6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -152,7 +152,7 @@ if ($search_late == 'late') {
 	$search_status = '1';
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index f7a2026903d..aaad52684f5 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -933,7 +933,7 @@ if (!GETPOST('action', 'aZ09')) {
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}
-	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit', $conf->liste_limit);
 	$offset = $limit * $page;
 
 	if (!$sortorder) {
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 9af72aa1a1f..fe74afe765e 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -61,7 +61,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 
 $upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits";
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 7243c91f3c3..9d26c07560a 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -54,7 +54,7 @@ $search_account = GETPOSTINT('search_account');
 $search_amount = GETPOST('search_amount', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 12c2ec797d8..7cf396f7573 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -69,7 +69,7 @@ $search_status = GETPOST('search_status', 'intcomma');
 $search_sale = GETPOSTINT('search_sale');
 
 $mode = GETPOST('mode', 'alpha');
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 7a79d37cc5c..65224c37557 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -35,7 +35,7 @@ if ($user->socid > 0) {
 }
 
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index c9f2401513b..6c5fb010347 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -45,7 +45,7 @@ $type = GETPOST('type', 'aZ09');
 $date_trans = dol_mktime(GETPOSTINT('date_transhour'), GETPOSTINT('date_transmin'), GETPOSTINT('date_transsec'), GETPOSTINT('date_transmonth'), GETPOSTINT('date_transday'), GETPOSTINT('date_transyear'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index a6b326ac456..71b138cc0a6 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -55,7 +55,7 @@ $format = GETPOST('format', 'aZ09');
 $id_bankaccount = GETPOSTINT('id_bankaccount');
 $executiondate = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 0829b4cc8ec..7a96f2a55ee 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -51,7 +51,7 @@ $search_facture = GETPOST('search_facture', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 1fe40efa05e..dba7583f807 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -45,7 +45,7 @@ $userid = GETPOSTINT('userid');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index febb51cdc1d..38f11895988 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -51,7 +51,7 @@ $ref = GETPOST('ref', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index b0fadbafd1b..272afb1db8c 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -41,7 +41,7 @@ $ref = GETPOST('ref', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 96d9a2d6b2c..9d8f837c49c 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -43,7 +43,7 @@ $socid = GETPOSTINT('socid');
 
 $type = GETPOST('type', 'aZ09');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index c21f88d2157..2d36e8841e5 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index b6dd673f37f..e6cd1d4de5b 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -45,7 +45,7 @@ $mode = GETPOST('mode', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 88d1f736422..11a0d643178 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index bff81de3bda..80c5329621a 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -52,7 +52,7 @@ if ($id > 0) {
 $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index c300817bfa4..bc3561828b3 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -54,7 +54,7 @@ $date_endday = GETPOSTINT('date_endday');
 $date_endyear = GETPOSTINT('date_endyear');
 $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes';
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 0666335cc4d..2c62883915e 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -47,7 +47,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 5f07abd308a..b63b09d7f0a 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -75,7 +75,7 @@ $search_users = GETPOST('search_users');
 $search_type = GETPOSTINT('search_type');
 $search_account = GETPOSTINT('search_account');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index b97882242e3..fe1bc5a7d6b 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -54,7 +54,7 @@ $year = GETPOSTINT("year");
 $search_sc_type = GETPOSTINT('search_sc_type');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index b9cf49d5dff..d4b41aa5249 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 573c3d50289..fede497b7a8 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -62,7 +62,7 @@ $search_account				= GETPOSTINT('search_account');
 $search_amount 				= GETPOST('search_amount', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield					= GETPOST('sortfield', 'aZ09comma');
 $sortorder					= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index fbcb057a859..c9a9668ae38 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -47,7 +47,7 @@ if (!$year && $mode != 'tvaonly') {
 	$year = date("Y", time());
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index af06f40761f..7188c6eb668 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -92,7 +92,7 @@ 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 = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 66067b00e6e..203a8aaf028 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -49,7 +49,7 @@ if (empty($object->thirdparty)) {
 $socid = !empty($object->thirdparty->id) ? $object->thirdparty->id : null;
 
 // Sort & Order fields
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 1a98fb921fa..00617077be4 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -53,7 +53,7 @@ if (!empty($canvas)) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index d391b2e8d4b..cca4a38cf05 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -135,7 +135,7 @@ $userid = GETPOSTINT('userid');
 $begin = GETPOST('begin');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 848f1a088d7..7647e8d2679 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -63,7 +63,7 @@ $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($id) ? 'rowid' : 'ref');
 $result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype);
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 6f19a21fa69..099b7bb90d3 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -53,7 +53,7 @@ if ($user->socid > 0) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index a9c49bbeaab..7d1f21a7926 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -108,7 +108,7 @@ $search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php
index 8f3e5fac95e..8816149370c 100644
--- a/htdocs/contrat/messaging.php
+++ b/htdocs/contrat/messaging.php
@@ -56,7 +56,7 @@ $confirm	= GETPOST('confirm', 'alpha');
 $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index a2542669485..e92610d95b2 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -44,7 +44,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 3fbd13840c2..b25028383a3 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -53,7 +53,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$urlsource = GETPOST("urlsource", 'alpha');
 	$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit', $conf->liste_limit);
 	$sortfield = GETPOST("sortfield", 'aZ09comma');
 	$sortorder = GETPOST("sortorder", 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 02b795734af..325d31660c5 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -55,7 +55,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$search_graph = GETPOST('search_graph', 'restricthtml');
 
 	// Load variable for pagination
-	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit', $conf->liste_limit);
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index e6d6645d8b2..0c85045a527 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -178,7 +178,7 @@ class pdf_standard extends ModelePDFMovement
 		$search_qty = trim(GETPOST("search_qty"));
 		$search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-		$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+		$limit = GETPOSTINT('limit', $conf->liste_limit);
 		$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 		$sortfield = GETPOST('sortfield', 'aZ09comma');
 		$sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 4e14d503f1e..0d3aa74ef87 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -43,7 +43,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'cr
 
 $id = GETPOSTINT('id');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 4176ac74d7a..882c08c35e1 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -50,7 +50,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 13ffaf15511..780982f3c7b 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -39,7 +39,7 @@ $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; //
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index b314131ca5b..666f3b8983b 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -58,7 +58,7 @@ $search_amount = GETPOST("search_amount", 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 $search_sale = GETPOSTINT('search_sale');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index ad2b5b387c3..b38f9adc5bb 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -67,7 +67,7 @@ if ($module == 'ecm') {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 7444815a11e..72d8e592524 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -47,7 +47,7 @@ if (empty($module)) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index a2551c18932..48e9b0783e8 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -46,7 +46,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 580f8ab03dd..ccb3b23a586 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -50,7 +50,7 @@ if ($user->socid > 0) {
 
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index e0c191e8e23..0e2b6e23ad1 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -45,7 +45,7 @@ if (!$section) {
 $section_dir = GETPOST('section_dir', 'alpha');
 $overwritefile = GETPOSTINT('overwritefile');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 7a0338a0126..88114234ba9 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -47,7 +47,7 @@ $section_dir = GETPOST('section_dir', 'alpha');
 
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index c59cab0c059..771a07d4fd6 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -54,7 +54,7 @@ if (empty($action) && $file_manager) {
 }
 $pageid  = GETPOSTINT('pageid');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 202ea14afb7..a9c4e766170 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -59,7 +59,7 @@ if (empty($module)) {
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index da8471988d9..3d42c4da2a6 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -53,7 +53,7 @@ $ref = GETPOST('ref', 'alpha');
 $withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index b340622595f..a8c390bdc46 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -58,7 +58,7 @@ $projectid = GETPOSTINT('projectid');
 $projectref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 93ae78eeeb2..38f8bfabfa7 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -66,7 +66,7 @@ $projectid = $fk_project;
 $withProjectUrl = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index d34d4b0a72d..98e99a9e935 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -47,7 +47,7 @@ $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index a71b364cdac..597ae8a3e2d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -73,7 +73,7 @@ $search_sale = GETPOSTINT('search_sale');
 $search_categ_cus = GETPOSTINT("search_categ_cus");
 $search_product_category = GETPOSTINT('search_product_category');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index c28c5251dc1..272a930ae51 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -46,7 +46,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 016fbfee019..0a38650a94b 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'expensereport', '', '');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -64,7 +64,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.date_create";
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 
 
 /*
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index c1f474af0db..f17ad86e3b8 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -73,7 +73,7 @@ $search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOSTINT('search_bank_account');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
 $sortorder				= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
index e348b888d55..4818eab1e30 100644
--- a/htdocs/fichinter/agenda.php
+++ b/htdocs/fichinter/agenda.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 4c71562da9b..1e96ac2dbf0 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -70,7 +70,7 @@ if ($action == "create" || $action == "add") {
 $result = restrictedArea($user, 'ficheinter', $id, $objecttype);
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 5ec97fd1908..a0e1de536bb 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 20878a34e16..2c7ed215649 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -82,7 +82,7 @@ $socid = GETPOSTINT('socid');
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 56320809feb..2fda338005f 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 2f80fe4ba45..836adf8d82a 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -43,7 +43,7 @@ $id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTINT("page");
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 1bab50ecddd..209f12ca1bc 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -134,7 +134,7 @@ if (GETPOSTISARRAY('search_status')) {
 
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 0be5b7bb135..20427747739 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,7 +41,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -57,7 +57,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "p.name";
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 
 
 /*
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index a5dc3d0eba1..dd6a607e309 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -55,7 +55,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicetemplatelist'; // To manage different context of search
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index ea6fe3335d0..f192143b784 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 $hookmanager->initHooks(array('invoicesuppliercarddocument'));
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 62531e8a569..3739dec898d 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -96,7 +96,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 642b4612358..7182aa7e6aa 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -113,7 +113,7 @@ if ($option == 'late') {
 $filter = GETPOST('filtre', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index db152d3eb47..b7819d25c65 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -60,7 +60,7 @@ if ($user->socid) {
 $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index aa328d13024..5ff2340f5c4 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -68,7 +68,7 @@ $search_bank_account	= GETPOSTINT('search_bank_account');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 $search_sale            = GETPOSTINT('search_sale');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
 $sortorder				= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 5549f799ddd..a8e48814757 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -46,7 +46,7 @@ $type = GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 0d3bf9a9496..f48bade81d3 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -54,7 +54,7 @@ $confirm = GETPOST('confirm');
 $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 4b8c0974eef..cae68a15387 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -45,7 +45,7 @@ $search_name = GETPOST('search_name', 'alpha');
 $search_supervisor = GETPOSTINT('search_supervisor');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 43fe279c57d..d192e12a0d9 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -46,7 +46,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index a4eaae03a85..69dd8dca0e5 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -66,7 +66,7 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user-
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index ac042253777..d2779c6afbd 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -60,7 +60,7 @@ $search_prev_solde  = GETPOST('search_prev_solde', 'alphanohtml');
 $search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 5dacecd2c3c..5172bbdbb64 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -60,7 +60,7 @@ if (empty($page) || $page == -1) {
 	$page = 0;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 2d9ebbd1968..f0782602f3a 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -46,7 +46,7 @@ if (GETPOST('actioncode', 'array')) {
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 4507ba5764f..20878b3baa5 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index a83905abff9..98c2d76abc6 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -47,7 +47,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 20b8ee4359c..9183e9ebb7c 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -58,7 +58,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index 6fffa6934e4..bcd660e1e3e 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -56,7 +56,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index 2155f033088..93caa6ea5f1 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -45,7 +45,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 9191162e979..61746b905bb 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -57,7 +57,7 @@ $mode        = GETPOST('mode', 'alpha'); // for view result with other mode
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index 49f269d8efa..8fb7658592c 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 539a8405f4a..49b0b0f377c 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -46,7 +46,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 4b9666e4c79..db440929e61 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -57,7 +57,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index a469ded4cf9..87dd58e6d17 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -58,7 +58,7 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Get Parameters for Pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index 418208e0465..dcf776c785c 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -46,7 +46,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get Parameters for Pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index ea155ac684f..33da365b16a 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -58,7 +58,7 @@ $mode        = GETPOST('mode', 'alpha'); // for mode view result
 $id         = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 3611ae2c51e..7fa4b76f300 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -46,7 +46,7 @@ $type = GETPOSTINT("type");
 
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 4ed3b95b63b..dfaa6017361 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index fa4d8f75ed7..6c8e8f79d60 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -42,7 +42,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index f2ee512c004..6aef8a1fab0 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -57,7 +57,7 @@ if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryKnowledgemanagementOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 74b96bf0877..7552629c216 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'loan', $id, '', '');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 013c41e3cce..313c33aed3a 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index bd47dd65d95..37bb3631adb 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 5cdee16619b..5ff62d28783 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -40,7 +40,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index b81567d7b09..cae41a5a0b0 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index e6837605980..87997aac856 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -43,7 +43,7 @@ $socid = 0;
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index a921bebd8c2..e0476034c86 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -43,7 +43,7 @@ if (!empty($user->socid)) {
 
 $object = new Product($db);
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 83b646baf29..aeea537069f 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -35,7 +35,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 6afe0f35686..c374a60caf6 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -44,7 +44,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index c88168ed1b9..5e2f38d27ea 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -53,7 +53,7 @@ $mode = GETPOST('mode', 'alpha');
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index bab5f6aa68f..3abc698c73d 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -67,7 +67,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $page  = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 836b3de06de..63ee37732df 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -60,7 +60,7 @@ $dateinput 			= dol_mktime(0, 0, 0, GETPOSTINT('dateinputmonth'), GETPOSTINT('da
 $rateinput 			= (float) price2num(GETPOST('rateinput', 'alpha'));
 $rateindirectinput 	= (float) price2num(GETPOST('rateinidirectinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield 			= GETPOST('sortfield', 'aZ09comma');
 $sortorder 			= GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index e1cb682ea33..d6f482bcfb4 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -48,7 +48,7 @@ $search_title = GETPOST('search_title', 'alpha');
 $search_status = GETPOST('search_status', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 851809edb21..45d408ad992 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index 3b9e46c9639..efba17da602 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -42,7 +42,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 327b8e7988e..0c284bbbabb 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -55,7 +55,7 @@ $id = GETPOSTINT('id');
 $socid = GETPOSTINT('socid');
 $memberid = GETPOSTINT('rowid');
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 9a11c59abd1..a5ecc5eba25 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -56,7 +56,7 @@ if ($user->socid) {
 	$id = $user->socid;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 1435fa74b3a..4a0ded165aa 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -62,7 +62,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index f9fcdab2709..43e60b6380e 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -81,7 +81,7 @@ if (!$user->hasRight('fournisseur', 'lire') && (!isModEnabled('margin') && !$use
 	accessforbidden();
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTINT("page") ? GETPOSTINT("page") : 0;
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index d9ff6026f0d..3a6dd855543 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -46,7 +46,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7d387457b23..3fa6350b70b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -118,7 +118,7 @@ if (isModEnabled('variants')) {
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 0af9c8052ae..afed89383a6 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -45,7 +45,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 0ece26ed6d8..744e2070d75 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1950,7 +1950,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$prodcustprice = new ProductCustomerPrice($db);
 
-	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit', $conf->liste_limit);
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 32d15a43939..d7e0873640d 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -62,7 +62,7 @@ if (!$sortfield) {
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 07873e790ad..d51bc17fd33 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -63,7 +63,7 @@ $sbarcode = GETPOSTINT("sbarcode");
 $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 73714afa21c..4cf895bc6d1 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -50,7 +50,7 @@ $mesg = '';
 $option = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 8c9dbd7830b..e1033a1be70 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -50,7 +50,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatsorder'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index e91555cea67..4a77c722232 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -50,7 +50,7 @@ $hookmanager->initHooks(array('productstatssupplierorder'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 6712ac33185..69e5deb5091 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -46,7 +46,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatscontract'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index c44e95eae64..0f5d69c1f54 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -58,7 +58,7 @@ $search_array_options = $extrafields->getOptionalsFromPost('facture', '', 'searc
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 2ee2e18b793..097854f7d86 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -50,7 +50,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index 83d66963e51..ac925af5d0a 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatsinvoice'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index d98a73fbc79..4ee8efa0a44 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 9e6084f78c5..8064f28bc67 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -50,7 +50,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 $hookmanager->initHooks(array('productstatspropal'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 5c755024acd..c284b3cdcae 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -49,7 +49,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierpropal'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index c812e507035..1e03967e658 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -58,7 +58,7 @@ $socid = GETPOSTINT('socid');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 787cc14f779..5e2fc05a1ea 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -60,7 +60,7 @@ if (isModEnabled('category')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 88b51aa78ab..84f72eba7ab 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -61,7 +61,7 @@ $qty = GETPOST('qty');
 $idline = GETPOST('idline');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index eae9deb3ef0..09471b2a62f 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -75,7 +75,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 9a054d18375..593265f9d69 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -92,7 +92,7 @@ $search_fk_project = GETPOSTINT("search_fk_project");
 $type = GETPOSTINT("type");
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 3adc9370df5..73e1409454a 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -60,7 +60,7 @@ $result = restrictedArea($user, 'produit|service');
 $hookmanager->initHooks(array('productlotdocuments'));
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index bd1733bdf81..6d690d79a61 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -53,7 +53,7 @@ $search_fk_user_modif = GETPOSTINT('search_fk_user_modif');
 $search_import_key = GETPOSTINT('search_import_key');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 24e9d0d8a10..86e1e56d4e8 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -93,7 +93,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 
 if (!$sortfield) {
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 724eeed763c..4464df16e43 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -53,7 +53,7 @@ $search_dateday = GETPOSTINT('search_dateday');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 7f362de5f01..4a29bb0d44c 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatssupplierorder'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index b3c30f5ce68..a1f617a7564 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsexpedition'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index 96699d17d92..e2ddd4be7d7 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -49,7 +49,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('batchproductstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index ced528e301d..f70b1257b64 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsreception'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 6b39de66295..38cd13eae64 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -89,7 +89,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 if (!$sortfield) {
 	$sortfield = 'p.ref';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index 9f328000513..2e8eccf995b 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index 7e851677dc1..dc22e5feb22 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index d798b7556ac..21af23d7c01 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -48,7 +48,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 259f139a177..b61104011c4 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -49,7 +49,7 @@ $page = $_GET["page"];
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $offset = $limit * $page;
 
 $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php
index d06cde2a04b..712591c5ab9 100644
--- a/htdocs/projet/agenda.php
+++ b/htdocs/projet/agenda.php
@@ -38,7 +38,7 @@ $socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 4e0f40d0127..3e331514cf8 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -75,7 +75,7 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php
index ea2ff3e7a89..eca28d7716e 100644
--- a/htdocs/projet/messaging.php
+++ b/htdocs/projet/messaging.php
@@ -38,7 +38,7 @@ $socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 23aac791656..e7d135dff47 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -54,7 +54,7 @@ $ref = GETPOST('ref', 'alpha');
 $taskref = GETPOST('taskref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 7507cafa4b3..f2ed23cf8c1 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -46,7 +46,7 @@ $withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index a7a5c47d757..25ad71ae6fb 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -124,7 +124,7 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index c48a6f296cc..42feefa9537 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -93,7 +93,7 @@ $search_timespent_startmin = GETPOSTINT("search_timespent_duration_startmin");
 $search_timespent_endhour = GETPOSTINT("search_timespent_duration_endhour");
 $search_timespent_endmin = GETPOSTINT("search_timespent_duration_endmin");
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 1401d22b82a..1ec6c775697 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -86,7 +86,7 @@ function llxFooterVierge()
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 772245f3d51..310d3f46ca4 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -53,7 +53,7 @@ $backtopage = '';
 $suffix = "";
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index bcd27f58b18..c10fad87770 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -54,7 +54,7 @@ $backtopage = '';
 $suffix = "";
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index 36d9a6efb15..06647afbefd 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -49,7 +49,7 @@ $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index f6242c6ee14..85c7bf13468 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -79,7 +79,7 @@ $search_billed = GETPOSTINT("search_billed");
 $search_status = GETPOST('search_status', 'intcomma');
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index a8339a0ca7b..2e4e9b6cb65 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 741e0107a45..71b7faa3320 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 56c05ffdb56..090bc1d3319 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -50,7 +50,7 @@ $mode = GETPOST('mode', 'aZ');
 $lineid = GETPOSTINT('lineid');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 665f26bc75d..dbee1f831d2 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -53,7 +53,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 11e4fe7bb62..f2d7d85f014 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index bf62f0beb62..fea96969637 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -46,7 +46,7 @@ $mode       = GETPOST('mode', 'aZ');
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 61c17c3a66c..0325ac771db 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 9bf219dfcec..f3e9bd78747 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 297da859f33..5996e04269e 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -54,7 +54,7 @@ $label = GETPOST('label', 'alphanohtml');
 $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project'));
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 7af81d47d6e..b0ceffba2e1 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index fc659db2e1b..6493e5afbf4 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -50,7 +50,7 @@ $mode       = GETPOST('mode', 'alpha'); // mode view for result
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index be5ed78293e..8ada8019d41 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1d780599f2d..cff729e2c56 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -152,7 +152,7 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index b1275bfcdfe..6046c57e4e3 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 0e0031e6f9c..e56db09f24d 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -45,7 +45,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', '', '');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 55d0091a80b..a502b62dc97 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -261,7 +261,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+	$limit = GETPOSTINT('limit', $conf->liste_limit);
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1) {
 		$page = 0;
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 4411b7a1c37..2dc86bde8a7 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -43,7 +43,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 29484d9773d..27c71219ce1 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -54,7 +54,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 947fccafdb3..6d11a56bcbe 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -41,7 +41,7 @@ if ($user->socid) {
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 0abc7a5063d..bd9c64bf763 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -41,7 +41,7 @@ if ($user->socid) {
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index bdca6980414..f73c584b24c 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -41,7 +41,7 @@ if ($user->socid) {
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 650d89ffdc5..d24c6ec2836 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -52,7 +52,7 @@ if (!empty($user->socid)) {
 $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index c34a60b581b..9e5b2591fb2 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -106,7 +106,7 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all'
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 74cb95e87d5..8c5d10fae70 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -49,7 +49,7 @@ $action   = GETPOST('action', 'aZ09');
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/agenda.php';
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 12ec2a2d953..27d154a84ff 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -53,7 +53,7 @@ $confirm  = GETPOST('confirm', 'alpha');
 $url_page_current = DOL_URL_ROOT.'/ticket/document.php';
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 4ccef134ea0..18709719ee1 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -72,7 +72,7 @@ $search_dateclose_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateclose_endm
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 98fb7551fe1..09943ada8e1 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -49,7 +49,7 @@ $action   = GETPOST('action', 'aZ09');
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/messaging.php';
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index 229c299a2e7..a6f4f4d2ac9 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 1c1f0895d46..e97be6a29ce 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -82,7 +82,7 @@ if ($user->id != $id && !$canreaduser) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index f491bdad587..ffbd73b3fe6 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -48,7 +48,7 @@ $search_group = GETPOST('search_group');
 $search = array();
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e55dc5ea1bc..10ea9a10b2f 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -54,7 +54,7 @@ if ($user->socid > 0) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php
index 319a00e9f5e..be82eb01403 100644
--- a/htdocs/user/messaging.php
+++ b/htdocs/user/messaging.php
@@ -56,7 +56,7 @@ $ref = GETPOST('ref', 'alpha');
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 240723c47c8..292c48b6645 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -45,7 +45,7 @@ if (!isset($id) || empty($id)) {
 $action = GETPOST('action', 'aZ09');
 $actionid = GETPOSTINT('actionid');
 
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 0bee01ba154..71cbbdba5ea 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -44,7 +44,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index cbcca8fbfe8..c120213d81c 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -54,7 +54,7 @@ if (empty($mode)) {
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 74c43d54e48..d1e82ffc3e7 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -143,7 +143,7 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index 4e6853596bc..a3db02f9841 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -56,7 +56,7 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index e1b891da1ce..c08bc1fecad 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -44,7 +44,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 2d1e9d9fefc..54d269d561f 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -51,7 +51,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");

From d28835ef7d3dbd44f962d47bcc6a76e7065acc01 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Fri, 15 Mar 2024 20:56:12 +0100
Subject: [PATCH 1522/1862] adding 2 new notification triggers, Order and
 Invoice cancellation

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

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index a4771df772b..d49388d26c9 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -66,8 +66,10 @@ class Notify
 
 	// This codes actions are defined into table llx_notify_def
 	public static $arrayofnotifsupported = array(
+		'BILL_CANCEL',
 		'BILL_VALIDATE',
 		'BILL_PAYED',
+		'ORDER_CANCEL',
 		'ORDER_CREATE',
 		'ORDER_VALIDATE',
 		'ORDER_CLOSE',
@@ -485,6 +487,12 @@ class Notify
 						$subject = '['.$appli.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');
 
 						switch ($notifcode) {
+							case 'BILL_CANCEL':
+								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
+								$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
+								$object_type = 'facture';
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCancelled", $link);
+								break;
 							case 'BILL_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
@@ -497,6 +505,12 @@ class Notify
 								$object_type = 'facture';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 								break;
+							case 'ORDER_CANCEL':
+								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
+								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
+								$object_type = 'order';
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCancelled", $link);
+								break;
 							case 'ORDER_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');

From 4f879f2c0135ecda62c2e6256e39f6298774d28b Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Fri, 15 Mar 2024 20:59:35 +0100
Subject: [PATCH 1523/1862] fix spelling mistake

---
 dev/initdemo/mysqldump_dolibarr_19.0.0.sql         | 2 +-
 htdocs/install/mysql/data/llx_c_action_trigger.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_19.0.0.sql b/dev/initdemo/mysqldump_dolibarr_19.0.0.sql
index 83d4645572a..78a4358879e 100644
--- a/dev/initdemo/mysqldump_dolibarr_19.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_19.0.0.sql
@@ -1389,7 +1389,7 @@ CREATE TABLE `llx_c_action_trigger` (
 
 LOCK TABLES `llx_c_action_trigger` WRITE;
 /*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
-INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1,NULL),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1,NULL),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2,NULL),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3,NULL),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4,NULL),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5,NULL),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5,NULL),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5,NULL),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5,NULL),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6,NULL),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7,NULL),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8,NULL),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9,NULL),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9,NULL),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12,NULL),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13,NULL),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14,NULL),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15,NULL),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16,NULL),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17,NULL),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17,NULL),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18,NULL),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20,NULL),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21,NULL),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22,NULL),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24,NULL),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24,NULL),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25,NULL),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19,NULL),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19,NULL),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19,NULL),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140,NULL),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2,NULL),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2,NULL),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2,NULL),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35,NULL),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36,NULL),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37,NULL),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15,NULL),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141,NULL),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142,NULL),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12,NULL),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12,NULL),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14,NULL),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30,NULL),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30,NULL),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30,NULL),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201,NULL),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202,NULL),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203,NULL),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204,NULL),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221,NULL),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222,NULL),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223,NULL),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23,NULL),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18,NULL),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10,NULL),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10,NULL),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10,NULL),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10,NULL),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24,NULL),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24,NULL),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24,NULL),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1,NULL),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2,NULL),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5,NULL),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9,NULL),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10,NULL),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14,NULL),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17,NULL),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18,NULL),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35,NULL),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204,NULL),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161,NULL),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163,NULL),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164,NULL),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165,NULL),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166,NULL),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167,NULL),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300,NULL),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650,NULL),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651,NULL),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652,NULL),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653,NULL),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654,NULL),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660,NULL),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661,NULL),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662,NULL),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663,NULL),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50,NULL),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51,NULL),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52,NULL),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500,NULL),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502,NULL),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504,NULL),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506,NULL),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510,NULL),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512,NULL),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514,NULL),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516,NULL),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1,NULL),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51,NULL),(394,'ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13,NULL),(395,'MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27,NULL),(396,'USER_CREATE','User created','Executed when a user is created','user',301,NULL),(397,'USER_MODIFY','User update','Executed when a user is updated','user',302,NULL),(398,'USER_DELETE','User update','Executed when a user is deleted','user',303,NULL),(399,'USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304,NULL),(400,'USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305,NULL),(402,'HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801,NULL),(405,'HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802,NULL),(406,'HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804,NULL),(407,'PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2,NULL),(408,'ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5,NULL),(409,'BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7,NULL),(410,'PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10,NULL),(411,'ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13,NULL),(412,'BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15,NULL),(413,'CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18,NULL),(414,'SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20,NULL),(415,'FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30,NULL),(417,'EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202,NULL),(455,'PROJECT_SENTBYMAIL','Project sent by mail','Executed when a project is sent by email','project',144,NULL),(511,'SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21,NULL),(512,'RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22,NULL),(513,'RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22,NULL),(543,'PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141,NULL),(584,'ACTION_CREATE','Action added','Executed when an action is added to the agenda','agenda',700,NULL),(591,'BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900,NULL),(592,'BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901,NULL),(593,'BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902,NULL),(594,'BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903,NULL),(875,'PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000,NULL),(876,'PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002,NULL),(877,'PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004,NULL),(878,'PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006,NULL),(879,'PROJECT_CLOSE','Project closed','Executed when a project is closed','project',145,NULL),(881,'COMPANY_RIB_CREATE','Third party payment information created','Executed when a third party payment information is created','societe',1,NULL),(882,'COMPANY_RIB_MODIFY','Third party payment information updated','Executed when a third party payment information is updated','societe',1,NULL),(883,'COMPANY_RIB_DELETE','Third party payment information deleted','Executed when a third party payment information is deleted','societe',1,NULL),(884,'FICHINTER_CLOSE','Intervention is done','Executed when a intervention is done','ficheinter',36,NULL);
+INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1,NULL),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1,NULL),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2,NULL),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3,NULL),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4,NULL),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5,NULL),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5,NULL),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5,NULL),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5,NULL),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6,NULL),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7,NULL),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is canceled','facture',8,NULL),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9,NULL),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9,NULL),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12,NULL),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13,NULL),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14,NULL),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15,NULL),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16,NULL),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17,NULL),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17,NULL),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18,NULL),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20,NULL),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21,NULL),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22,NULL),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24,NULL),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24,NULL),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25,NULL),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19,NULL),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19,NULL),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19,NULL),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140,NULL),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2,NULL),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2,NULL),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2,NULL),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35,NULL),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36,NULL),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37,NULL),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15,NULL),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141,NULL),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142,NULL),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12,NULL),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12,NULL),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14,NULL),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30,NULL),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30,NULL),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30,NULL),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201,NULL),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202,NULL),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203,NULL),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204,NULL),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221,NULL),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222,NULL),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223,NULL),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23,NULL),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18,NULL),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10,NULL),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10,NULL),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10,NULL),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10,NULL),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24,NULL),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24,NULL),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24,NULL),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1,NULL),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2,NULL),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5,NULL),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9,NULL),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10,NULL),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14,NULL),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17,NULL),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18,NULL),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35,NULL),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204,NULL),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161,NULL),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163,NULL),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164,NULL),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165,NULL),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166,NULL),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167,NULL),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300,NULL),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650,NULL),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651,NULL),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652,NULL),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653,NULL),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654,NULL),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660,NULL),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661,NULL),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662,NULL),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663,NULL),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50,NULL),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51,NULL),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52,NULL),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500,NULL),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502,NULL),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504,NULL),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506,NULL),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510,NULL),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512,NULL),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514,NULL),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516,NULL),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1,NULL),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51,NULL),(394,'ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13,NULL),(395,'MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27,NULL),(396,'USER_CREATE','User created','Executed when a user is created','user',301,NULL),(397,'USER_MODIFY','User update','Executed when a user is updated','user',302,NULL),(398,'USER_DELETE','User update','Executed when a user is deleted','user',303,NULL),(399,'USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304,NULL),(400,'USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305,NULL),(402,'HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801,NULL),(405,'HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802,NULL),(406,'HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804,NULL),(407,'PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2,NULL),(408,'ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5,NULL),(409,'BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7,NULL),(410,'PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10,NULL),(411,'ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13,NULL),(412,'BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15,NULL),(413,'CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18,NULL),(414,'SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20,NULL),(415,'FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30,NULL),(417,'EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202,NULL),(455,'PROJECT_SENTBYMAIL','Project sent by mail','Executed when a project is sent by email','project',144,NULL),(511,'SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21,NULL),(512,'RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22,NULL),(513,'RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22,NULL),(543,'PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141,NULL),(584,'ACTION_CREATE','Action added','Executed when an action is added to the agenda','agenda',700,NULL),(591,'BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900,NULL),(592,'BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901,NULL),(593,'BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902,NULL),(594,'BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903,NULL),(875,'PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000,NULL),(876,'PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002,NULL),(877,'PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004,NULL),(878,'PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006,NULL),(879,'PROJECT_CLOSE','Project closed','Executed when a project is closed','project',145,NULL),(881,'COMPANY_RIB_CREATE','Third party payment information created','Executed when a third party payment information is created','societe',1,NULL),(882,'COMPANY_RIB_MODIFY','Third party payment information updated','Executed when a third party payment information is updated','societe',1,NULL),(883,'COMPANY_RIB_DELETE','Third party payment information deleted','Executed when a third party payment information is deleted','societe',1,NULL),(884,'FICHINTER_CLOSE','Intervention is done','Executed when a intervention is done','ficheinter',36,NULL);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 958a0c65797..5ed3730adc1 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -60,7 +60,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 ('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_CANCEL','Customer invoice canceled','Executed when a customer invoice is canceled','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);

From 081b5a256ffed20f7487e06681f9dae3521a23f8 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Fri, 15 Mar 2024 21:52:59 +0100
Subject: [PATCH 1524/1862] 403 when loggin is ok but permission are wrong.

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index fb67a582612..ee5403e2d0f 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1266,7 +1266,7 @@ class Thirdparties extends DolibarrApi
 	public function deleteCompanyBankAccount($id, $bankaccount_id)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('societe', 'creer')) {
-			throw new RestException(401);
+			throw new RestException(403);
 		}
 
 		$account = new CompanyBankAccount($this->db);

From db18ba99bd4d0528e1c9275f6c54cf3c663e6c3e Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Fri, 15 Mar 2024 22:30:55 +0100
Subject: [PATCH 1525/1862] writing why it is not allowed

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index ee5403e2d0f..f91fb19bf4a 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1278,7 +1278,7 @@ class Thirdparties extends DolibarrApi
 		if ($socid == $id) {
 			return $account->delete(DolibarrApiAccess::$user);
 		} else {
-			throw new RestException(416);
+			throw new RestException(403, "Not allowed due to bad consistency of input data");
 		}
 	}
 

From f8ea5ac0776e80476a0f41a6bdb418c645feacdd Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:33:51 +0100
Subject: [PATCH 1526/1862] Proposed function for records that can't be found

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4a6e3a42f01..b8762bb0414 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13905,3 +13905,69 @@ function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto'
 
 	return '&' . http_build_query($TParam);
 }
+
+/**
+ * Displays an error page when a record is not found. It allows customization of the message,
+ * whether to include the header and footer, and if only the message should be shown without additional details.
+ * The function also supports executing additional hooks for customized handling of error pages.
+ *
+ * @param string $message Custom error message to display. If empty, a default "Record Not Found" message is shown.
+ * @param int $printheader Determines if the page header should be printed (1 = yes, 0 = no).
+ * @param int $printfooter Determines if the page footer should be printed (1 = yes, 0 = no).
+ * @param int $showonlymessage If set to 1, only the error message is displayed without any additional information or hooks.
+ * @param mixed $params Optional parameters to pass to hooks for further processing or customization.
+ * @global object $conf Dolibarr configuration object (global)
+ * @global object $db Database connection object (global)
+ * @global object $user Current user object (global)
+ * @global Translate $langs Language translation object, initialized within the function if not already.
+ * @global object $hookmanager Hook manager object, initialized within the function if not already for executing hooks.
+ * @global string $action Current action, can be modified by hooks.
+ * @global object $object Current object, can be modified by hooks.
+ * @return void This function terminates script execution after outputting the error page.
+ */
+
+function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
+ {
+    global $conf, $db, $user, $langs, $hookmanager;
+    global $action, $object;
+  
+    if (!is_object($langs)) {
+      include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+      $langs = new Translate('', $conf);
+      $langs->setDefaultLang();
+    }
+  
+   $langs->load("errors");
+  
+   if ($printheader) {
+     if (function_exists("llxHeader")) {
+       llxHeader('');
+     } elseif (function_exists("llxHeaderVierge")) {
+       llxHeaderVierge('');
+     }
+   }
+   print '<div class="error">';
+   if (empty($message)) {
+     print $langs->trans("ErrorRecordNotFound");
+   } else {
+     print $langs->trans($message);
+   }
+   print '</div>';
+   print '<br>';
+   if (empty($showonlymessage)) {
+     if (empty($hookmanager)) {
+       include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+       $hookmanager = new HookManager($db);
+       // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+       $hookmanager->initHooks(array('main'));
+     }
+  
+     $parameters = array('message'=>$message, 'params'=>$params);
+     $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+     print $hookmanager->resPrint;
+   }
+   if ($printfooter && function_exists("llxFooter")) {
+     llxFooter();
+   }
+   exit(0);
+ }

From 4c864a49e35f7a74c7f7f95414232b6dd8fb5fb2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 21:48:36 +0100
Subject: [PATCH 1527/1862] Add typing to fix
 PhanTypeMismatchArgumentInternalReal

---
 htdocs/categories/class/categorie.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f65789c855c..57365ce5f50 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -256,7 +256,7 @@ class Categorie extends CommonObject
 	public $type;
 
 	/**
-	 * @var array Categories table in memory
+	 * @var array<int,array{rowid:int,id:int,fk_parent:int,label:string,description:string,color:string,position:string,visible:int,ref_ext:string,picto:string,fullpath:string,fulllabel:string}>  Categories table in memory
 	 */
 	public $cats = array();
 
@@ -970,7 +970,7 @@ class Categorie extends CommonObject
 	 * @param	string	$sortorder	Sort order
 	 * @param	int		$limit		Limit for list
 	 * @param	int		$page		Page number
-	 * @return	array|int			Array of categories, 0 if no cat, -1 on error
+	 * @return  int<-1,0>|array<int,array{id:int,fk_parent:int,label:string,description:string,color:string,position:string,socid:int,type:string,entity:string,array_options:array<string,mixed>,visible:int,ref_ext:string,picto:string,multilangs?:string}> Array of categories, 0 if no cat, -1 on error
 	 */
 	public function getListForItem($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
@@ -1139,7 +1139,7 @@ class Categorie extends CommonObject
 	 *                                                  - string (categories ids separated by comma)
 	 *                                                  - array (list of categories ids)
 	 * @param   int                 $include            [=0] Removed or 1=Keep only
-	 * @return  array|int              					Array of categories. this->cats and this->motherof are set, -1 on error
+	 * @return  int<-1,-1>|array<int,array{rowid:int,id:int,fk_parent:int,label:string,description:string,color:string,position:string,visible:int,ref_ext:string,picto:string,fullpath:string,fulllabel:string}>              					Array of categories. this->cats and this->motherof are set, -1 on error
 	 */
 	public function get_full_arbo($type, $markafterid = 0, $include = 0)
 	{
@@ -1222,9 +1222,10 @@ class Categorie extends CommonObject
 			$keyfilter2 = '_'.$keyfiltercatid.'$';
 			$keyfilter3 = '^'.$keyfiltercatid.'_';
 			$keyfilter4 = '_'.$keyfiltercatid.'_';
-			foreach ($this->cats as $key => $val) {
-				$test = (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
-					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']));
+			foreach (array_keys($this->cats) as $key) {
+				$fullpath = $this->cats[$key]['fullpath'];
+				$test = (preg_match('/'.$keyfilter1.'/', $fullpath) || preg_match('/'.$keyfilter2.'/', $fullpath)
+					|| preg_match('/'.$keyfilter3.'/', $fullpath) || preg_match('/'.$keyfilter4.'/', $fullpath));
 
 				if (($test && !$include) || (!$test && $include)) {
 					unset($this->cats[$key]);
@@ -1245,7 +1246,7 @@ class Categorie extends CommonObject
 	 *
 	 * 	@param		int		$id_categ		id_categ entry to update
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop
-	 *	@return		int						Return integer <0 if KO, >0 if OK
+	 *	@return		int<-1,1>				Return integer <0 if KO, >0 if OK
 	 *  @see get_full_arbo()
 	 */
 	private function buildPathFromId($id_categ, $protection = 1000)

From 375e4d7ccf0977767be47fb498ef7e89f849ba92 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 21:49:31 +0100
Subject: [PATCH 1528/1862] Qual: Enable PhanTypeMismatchArgumentInternalReal

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 5cb5b5b2f07..092e01fd795 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -499,7 +499,7 @@ return [
 		'PhanUndeclaredVariableAssignOp',
 		'PhanTypeExpectedObjectOrClassName',
 		'PhanEmptyFQSENInClasslike',
-		'PhanTypeMismatchArgumentInternalReal',
+		// 'PhanTypeMismatchArgumentInternalReal',
 		// 'PhanUnextractableAnnotationElementName',
 		// 'PhanCommentParamWithoutRealParam',
 		// 'PhanRedefinedExtendedClass',

From b6f9df4ad399bbc34933b68b1c7f33fb96980f7e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:02:11 +0100
Subject: [PATCH 1529/1862] Passing null to DOMDocument() is deprecated in
 PHP8.1 at the latest

---
 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 4a6e3a42f01..1291d954e2a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7646,7 +7646,7 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 		$stringtoclean = '<?xml encoding="UTF-8"><html><body>'.$stringtoclean.'</body></html>';
 
 		// Warning: loadHTML does not support HTML5 on old libxml versions.
-		$dom = new DOMDocument(null, 'UTF-8');
+		$dom = new DOMDocument('', 'UTF-8');
 		$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE | LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NONET | LIBXML_NOWARNING | LIBXML_NOXMLDECL);
 
 		if ($dom instanceof DOMDocument) {

From 0492b19c0931de77e8e0d803300d8126dde55349 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:08:23 +0100
Subject: [PATCH 1530/1862] Fix: openssl_decrypt needs a string for $iv

---
 htdocs/core/lib/security.lib.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 8b0844da3f8..1027e78c423 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2021 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020	   Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -209,7 +210,7 @@ function dolDecrypt($chain, $key = '')
 			if (!empty($tmpexplode[1]) && is_string($tmpexplode[0])) {
 				$newchain = openssl_decrypt($tmpexplode[1], $ciphering, $key, 0, $tmpexplode[0]);
 			} else {
-				$newchain = openssl_decrypt($tmpexplode[0], $ciphering, $key, 0, null);
+				$newchain = openssl_decrypt($tmpexplode[0], $ciphering, $key, 0, '');
 			}
 		} else {
 			dol_syslog("Error dolDecrypt openssl_decrypt is not available", LOG_ERR);
@@ -447,7 +448,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 	//print $features.' - '.$tableandshare.' - '.$feature2.' - '.$dbt_select."\n";
 
 	// Get more permissions checks from hooks
-	$parameters = array('features'=>$features, 'originalfeatures'=>$originalfeatures, 'objectid'=>$objectid, 'dbt_select'=>$dbt_select, 'idtype'=>$dbt_select, 'isdraft'=>$isdraft);
+	$parameters = array('features' => $features, 'originalfeatures' => $originalfeatures, 'objectid' => $objectid, 'dbt_select' => $dbt_select, 'idtype' => $dbt_select, 'isdraft' => $isdraft);
 	if (!empty($hookmanager)) {
 		$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
 
@@ -1237,7 +1238,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 			$hookmanager->initHooks(array('main'));
 		}
 
-		$parameters = array('message'=>$message, 'params'=>$params);
+		$parameters = array('message' => $message, 'params' => $params);
 		$reshook = $hookmanager->executeHooks('getAccessForbiddenMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
 		if (empty($reshook)) {
@@ -1322,5 +1323,5 @@ function getMaxFileSizeArray()
 	//var_dump($maxphp.'-'.$maxphp2);
 	//var_dump($maxmin);
 
-	return array('max'=>$max, 'maxmin'=>$maxmin, 'maxphptoshow'=>$maxphptoshow, 'maxphptoshowparam'=>$maxphptoshowparam);
+	return array('max' => $max, 'maxmin' => $maxmin, 'maxphptoshow' => $maxphptoshow, 'maxphptoshowparam' => $maxphptoshowparam);
 }

From 49381e2af1cf680c0ca7789a5932a9eb6c463e1c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:10:45 +0100
Subject: [PATCH 1531/1862] Fix: $domain for setcookie() must be string

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

diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 33157cde1ce..38f18edbce7 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2017 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -209,7 +210,7 @@ if (!function_exists('dol_loginfunction')) {
 					session_set_cookie_params($sessioncookieparams);
 				}
 
-				setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);
+				setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', (empty($dolibarr_main_force_https) ? false : true), true);
 			}
 		}
 

From 705296217cdf9bac3958f5291a885f2c7e98ec04 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:18:24 +0100
Subject: [PATCH 1532/1862] Fix: preg_match  must be string, add cast

Note: ['type'] does not seem to be set.
---
 htdocs/datapolicy/admin/setup.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index de7ec5c5b50..aa76563c82e 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -36,24 +37,24 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array();
 $arrayofparameters['ThirdParty'] = array(
-	'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
-	'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
-	'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
-	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
-	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'supplier', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_CLIENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_PROSPECT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_PROSPECT_CLIENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'company', 'class="pictofixedwidth"')),
+	'DATAPOLICY_TIERS_FOURNISSEUR' => array('css' => 'minwidth200', 'picto' => img_picto('', 'supplier', 'class="pictofixedwidth"')),
 );
 if (getDolGlobalString('DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT')) {
 	$arrayofparameters['Contact'] = array(
-		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
-		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
-		'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
-		'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
-		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_CLIENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_PROSPECT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_PROSPECT_CLIENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'contact', 'class="pictofixedwidth"')),
+		'DATAPOLICY_CONTACT_FOURNISSEUR' => array('css' => 'minwidth200', 'picto' => img_picto('', 'contact', 'class="pictofixedwidth"')),
 	);
 }
 if (isModEnabled('member')) {
 	$arrayofparameters['Member'] = array(
-		'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'member', 'class="pictofixedwidth"')),
+		'DATAPOLICY_ADHERENT' => array('css' => 'minwidth200', 'picto' => img_picto('', 'member', 'class="pictofixedwidth"')),
 	);
 }
 
@@ -79,15 +80,16 @@ if (!$user->admin) {
 }
 
 
+'@phan-var-force array<string,array<string,array{type?:string,css?:string,picto?:string}>> $arrayofparameters';
+
 /*
  * Actions
  */
-
 foreach ($arrayofparameters as $title => $tab) {
 	foreach ($tab as $key => $val) {
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if (GETPOSTISSET($key)) {
-			if (preg_match('/category:/', $val['type'])) {
+			if (preg_match('/category:/', (string) $val['type'])) {
 				if (GETPOSTINT($key) == '-1') {
 					$val_const = '';
 				} else {

From 882533da0d2e13d9dfdd438746185b96b7be4bbf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:20:26 +0100
Subject: [PATCH 1533/1862] Fix: $domain for setcookie() must be string

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5dd096ef228..2f35855ff10 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -342,7 +342,7 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"])) {
 	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
 	if (PHP_VERSION_ID < 70300) {
-		setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true), true); // keep cookie 1 year and add tag httponly
+		setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', '', ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true), true); // keep cookie 1 year and add tag httponly
 	} else {
 		// Only available for php >= 7.3
 		$cookieparams = array(

From 048f459869bcff29dcbea2c03c487f63eb3f6f2e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:22:38 +0100
Subject: [PATCH 1534/1862] Fix: $domain for setcookie() must be string

---
 .../public/webportal/webportal.main.inc.php   | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/webportal/webportal.main.inc.php b/htdocs/public/webportal/webportal.main.inc.php
index c00f1c30935..de198b4a494 100644
--- a/htdocs/public/webportal/webportal.main.inc.php
+++ b/htdocs/public/webportal/webportal.main.inc.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,13 +24,27 @@
  * \brief   Main include file for WebPortal
  */
 
-if (!defined('WEBPORTAL')) { define('WEBPORTAL', 1); }
-if (!defined('NOLOGIN')) { define('NOLOGIN', 1); }
-if (!defined('NOREQUIREUSER')) { define('NOREQUIREUSER', 1); }
-if (!defined('NOREQUIREMENU')) { define('NOREQUIREMENU', 1); }
-if (!defined('NOREQUIRESOC')) { define('NOREQUIRESOC', 1); }
-if (!defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) { define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1); }
-if (!defined('NOIPCHECK')) { define('NOIPCHECK', 1); }
+if (!defined('WEBPORTAL')) {
+	define('WEBPORTAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', 1);
+}
+if (!defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+	define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1);
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', 1);
+}
 
 
 if (!function_exists('dol_getprefix')) {
@@ -45,7 +60,7 @@ if (!function_exists('dol_getprefix')) {
 	function dol_getprefix($mode = '')
 	{
 		global $dolibarr_main_instance_unique_id,
-			   $dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php
+		$dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php
 
 		$tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ?
 			(empty($dolibarr_main_cookie_cryptkey) ? '' :
@@ -77,7 +92,7 @@ require_once DOL_DOCUMENT_ROOT . '/webportal/class/webportalpartnership.class.ph
 $prefix = dol_getprefix('');
 $sessionname = 'WEBPORTAL_SESSID_' . $prefix;
 $sessiontimeout = 'WEBPORTAL_SESSTIMEOUT_' . $prefix;
-if (!empty($_COOKIE[$sessiontimeout]) && session_status()===PHP_SESSION_NONE) {
+if (!empty($_COOKIE[$sessiontimeout]) && session_status() === PHP_SESSION_NONE) {
 	ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 }
 
@@ -131,7 +146,9 @@ if (!defined('WEBPORTAL_NOLOGIN') && !empty($context->controllerInstance->access
 			}
 			if (empty($password)) {
 				$context->setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Password")), 'errors');
-				if (empty($focus_element)) $focus_element = 'password';
+				if (empty($focus_element)) {
+					$focus_element = 'password';
+				}
 				$error++;
 			}
 			// check security graphic code
@@ -162,7 +179,7 @@ if (!defined('WEBPORTAL_NOLOGIN') && !empty($context->controllerInstance->access
 		if (empty($webportal_logged_thirdparty_account_id)) {
 			// Set cookie for timeout management
 			if (getDolGlobalString('MAIN_SESSION_TIMEOUT')) {
-				setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);
+				setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", '', (empty($dolibarr_main_force_https) ? false : true), true);
 			}
 
 			$context->controller = 'login';

From f0f2e7c2fc31b8cefb19d71b0772f087c33cdf60 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:25:15 +0100
Subject: [PATCH 1535/1862] Fix: $domain for setcookie() must be string

---
 htdocs/takepos/index.php | 101 ++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index c3a1f934e2d..a77554afd9e 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
  * Copyright (C) 2019	Josep Lluís Amador	<joseplluis@lliuretic.cat>
  * Copyright (C) 2020	Thibault FOUCART	<support@ptibogxiv.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -65,7 +66,7 @@ if (empty($_SESSION["takeposterminal"])) {
 
 if ($setterminal > 0) {
 	$_SESSION["takeposterminal"] = $setterminal;
-	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Permanent takeposterminal var in a cookie
+	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', '', (empty($dolibarr_main_force_https) ? false : true), true); // Permanent takeposterminal var in a cookie
 }
 
 if ($setcurrency != "") {
@@ -96,7 +97,7 @@ if ($conf->browser->layout == 'phone') {
 $MAXCATEG = (!getDolGlobalString('TAKEPOS_NB_MAXCATEG') ? $maxcategbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXCATEG);
 $MAXPRODUCT = (!getDolGlobalString('TAKEPOS_NB_MAXPRODUCT') ? $maxproductbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXPRODUCT);
 
-$term = empty($_SESSION['takeposterminal']) ? 1: $_SESSION['takeposterminal'];
+$term = empty($_SESSION['takeposterminal']) ? 1 : $_SESSION['takeposterminal'];
 
 /*
  $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
@@ -377,7 +378,7 @@ function LoadProducts(position, issubcat) {
 			} else  {
 				<?php
 					$titlestring = "'".dol_escape_js($langs->transnoentities('Ref').': ')."' + data[idata]['ref']";
-					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[idata]['barcode']";
+				$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[idata]['barcode']";
 				?>
 				var titlestring = <?php echo $titlestring; ?>;
 				<?php if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
@@ -423,7 +424,7 @@ function LoadProducts(position, issubcat) {
 
 				<?php
 				// Add js from hooks
-				$parameters=array();
+				$parameters = array();
 				$parameters['caller'] = 'loadProducts';
 				$hookmanager->executeHooks('completeJSProductDisplay', $parameters);
 				print $hookmanager->resPrint;
@@ -541,7 +542,7 @@ function ClickProduct(position, qty = 1) {
 		// Call page invoice.php to generate the section with product lines
 		$("#poslines").load("invoice.php?action=addline&token=<?php echo newToken() ?>&place="+place+"&idproduct="+idproduct+"&qty="+qty, function() {
 			<?php if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
-					echo "CustomerDisplay();";
+				echo "CustomerDisplay();";
 			}?>
 		});
 	}
@@ -773,7 +774,7 @@ function Search2(keyCodeForEnter, moreorless) {
 
 					<?php
 					// Add js from hooks
-					$parameters=array();
+					$parameters = array();
 					$parameters['caller'] = 'search2';
 					$hookmanager->executeHooks('completeJSProductDisplay', $parameters);
 					print $hookmanager->resPrint;
@@ -1256,7 +1257,7 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
 </div>
 
 	<div class="row1<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
-				print 'withhead';
+		print 'withhead';
 					} ?>">
 
 		<div id="poslines" class="div1">
@@ -1331,38 +1332,38 @@ $menus = array();
 $r = 0;
 
 if (!getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
-	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
+	$menus[$r++] = array('title' => '<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action' => 'New();');
 } else {
 	// BAR RESTAURANT specific menu
-	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
+	$menus[$r++] = array('title' => '<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action' => 'Floors();');
 }
 
 if (getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
 	if (getDolGlobalString('TAKEPOS_CHOOSE_CONTACT')) {
-		$menus[$r++] = array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Contact").'</div>', 'action'=>'Contact();');
+		$menus[$r++] = array('title' => '<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Contact").'</div>', 'action' => 'Contact();');
 	} else {
-		$menus[$r++] = array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Customer").'</div>', 'action'=>'Customer();');
+		$menus[$r++] = array('title' => '<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Customer").'</div>', 'action' => 'Customer();');
 	}
 }
 if (! getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
-	$menus[$r++] = array('title'=>'<span class="fa fa-history paddingrightonly"></span><div class="trunc">'.$langs->trans("History").'</div>', 'action'=>'History();');
+	$menus[$r++] = array('title' => '<span class="fa fa-history paddingrightonly"></span><div class="trunc">'.$langs->trans("History").'</div>', 'action' => 'History();');
 }
-$menus[$r++] = array('title'=>'<span class="fa fa-cube paddingrightonly"></span><div class="trunc">'.$langs->trans("FreeZone").'</div>', 'action'=>'FreeZone();');
-$menus[$r++] = array('title'=>'<span class="fa fa-percent paddingrightonly"></span><div class="trunc">'.$langs->trans("InvoiceDiscountShort").'</div>', 'action'=>'Reduction();');
+$menus[$r++] = array('title' => '<span class="fa fa-cube paddingrightonly"></span><div class="trunc">'.$langs->trans("FreeZone").'</div>', 'action' => 'FreeZone();');
+$menus[$r++] = array('title' => '<span class="fa fa-percent paddingrightonly"></span><div class="trunc">'.$langs->trans("InvoiceDiscountShort").'</div>', 'action' => 'Reduction();');
 
-$menus[$r++] = array('title'=>'<span class="fas fa-cut paddingrightonly"></span><div class="trunc">'.$langs->trans("SplitSale").'</div>', 'action'=>'Split();');
+$menus[$r++] = array('title' => '<span class="fas fa-cut paddingrightonly"></span><div class="trunc">'.$langs->trans("SplitSale").'</div>', 'action' => 'Split();');
 
 // BAR RESTAURANT specific menu
 if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	if (getDolGlobalString('TAKEPOS_ORDER_PRINTERS')) {
-		$menus[$r++] = array('title'=>'<span class="fa fa-blender-phone paddingrightonly"></span><div class="trunc">'.$langs->trans("Order").'</span>', 'action'=>'TakeposPrintingOrder();');
+		$menus[$r++] = array('title' => '<span class="fa fa-blender-phone paddingrightonly"></span><div class="trunc">'.$langs->trans("Order").'</span>', 'action' => 'TakeposPrintingOrder();');
 	}
 }
 
 // Last action that close the sell (payments)
-$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Payment").'</div>', 'action'=>'CloseBill();');
+$menus[$r++] = array('title' => '<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Payment").'</div>', 'action' => 'CloseBill();');
 if (getDolGlobalString('TAKEPOS_DIRECT_PAYMENT')) {
-	$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action'=>'DirectPayment();');
+	$menus[$r++] = array('title' => '<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action' => 'DirectPayment();');
 }
 
 // BAR RESTAURANT specific menu
@@ -1371,26 +1372,26 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 		if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
 			if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
-				$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
+				$menus[$r++] = array('title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action' => 'TakeposConnector(placeid);');
 			} else {
-				$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
+				$menus[$r++] = array('title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action' => 'TakeposPrinting(placeid);');
 			}
 		} elseif ((isModEnabled('receiptprinter') && getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term) > 0) || getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
-			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'DolibarrTakeposPrinting(placeid);');
+			$menus[$r++] = array('title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action' => 'DolibarrTakeposPrinting(placeid);');
 		} else {
-			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'Print(placeid);');
+			$menus[$r++] = array('title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action' => 'Print(placeid);');
 		}
 	}
 	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector" && getDolGlobalString('TAKEPOS_ORDER_NOTES') == 1) {
-		$menus[$r++] = array('title'=>'<span class="fa fa-sticky-note paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
+		$menus[$r++] = array('title' => '<span class="fa fa-sticky-note paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action' => 'TakeposOrderNotes();');
 	}
 	if (getDolGlobalString('TAKEPOS_SUPPLEMENTS')) {
-		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
+		$menus[$r++] = array('title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action' => 'LoadProducts(\'supplements\');');
 	}
 }
 
 if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
-	$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');
+	$menus[$r++] = array('title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action' => 'OpenDrawer();');
 }
 if (getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term) > 0 || getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 	$menus[$r++] = array(
@@ -1409,14 +1410,14 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	if ($num) {
 		$obj = $db->fetch_object($resql);
-		$menus[$r++] = array('title'=>'<span class="fas fa-file-invoice-dollar paddingrightonly"></span><div class="trunc">'.$langs->trans("CashReport").'</div>', 'action'=>'CashReport('.$obj->rowid.');');
+		$menus[$r++] = array('title' => '<span class="fas fa-file-invoice-dollar paddingrightonly"></span><div class="trunc">'.$langs->trans("CashReport").'</div>', 'action' => 'CashReport('.$obj->rowid.');');
 		if ($obj->status == 0) {
-			$menus[$r++] = array('title'=>'<span class="fas fa-cash-register paddingrightonly"></span><div class="trunc">'.$langs->trans("CloseCashFence").'</div>', 'action'=>'CloseCashFence('.$obj->rowid.');');
+			$menus[$r++] = array('title' => '<span class="fas fa-cash-register paddingrightonly"></span><div class="trunc">'.$langs->trans("CloseCashFence").'</div>', 'action' => 'CloseCashFence('.$obj->rowid.');');
 		}
 	}
 }
 
-$parameters = array('menus'=>$menus);
+$parameters = array('menus' => $menus);
 $reshook = $hookmanager->executeHooks('ActionButtons', $parameters);
 if ($reshook == 0) {  //add buttons
 	if (is_array($hookmanager->resArray)) {
@@ -1438,15 +1439,15 @@ if ($reshook == 0) {  //add buttons
 }
 
 if ($r % 3 == 2) {
-	$menus[$r++] = array('title'=>'', 'style'=>'visibility: hidden;');
+	$menus[$r++] = array('title' => '', 'style' => 'visibility: hidden;');
 }
 
 if (getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
-	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php?token='.newToken().'\';');
+	$menus[$r++] = array('title' => '<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action' => 'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php?token='.newToken().'\';');
 }
 
 if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
-	$menus[$r++] = array('title'=>'<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action'=>'WeighingScale();');
+	$menus[$r++] = array('title' => '<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action' => 'WeighingScale();');
 }
 
 ?>
@@ -1478,7 +1479,7 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
 	</div>
 
 	<div class="row2<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
-			print 'withhead';
+		print 'withhead';
 					} ?>">
 
 		<!--  Show categories -->
@@ -1511,15 +1512,15 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
 						echo '<img class="imgwrapper" id="catimg'.$count.'" />';
 					}
 				} ?>
-				<?php if ($count != $MAXCATEG - 2 && $count != $MAXCATEG - 1) { ?>
+						<?php if ($count != $MAXCATEG - 2 && $count != $MAXCATEG - 1) { ?>
 				<div class="description" id="catdivdesc<?php echo $count; ?>">
 					<div class="description_content" id="catdesc<?php echo $count; ?>"></div>
 				</div>
-				<?php } ?>
+						<?php } ?>
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
-			<?php
-			$count++;
+					<?php
+					$count++;
 		}
 		?>
 		</div>
@@ -1532,21 +1533,21 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
 		print '<div class="wrapper2 arrow" 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.')"';
-				} ?>>
+						<?php if ($count == ($MAXPRODUCT - 2)) {
+							?> onclick="MoreProducts('less')" <?php
+						}
+						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.'" />';
-						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
+								//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
+								print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
 					} elseif ($count == ($MAXPRODUCT - 1)) {
-						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
-						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
+							//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
+							print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
 					} else {
 						if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_PRICES')) {
 							print '<div class="" id="proprice'.$count.'"></div>';
@@ -1564,8 +1565,8 @@ if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
 					<?php } ?>
 					<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>
 				</div>
-		<?php
-		$count++;
+			<?php
+			$count++;
 	}
 	?>
 				<input type="hidden" id="search_start_less" value="0">

From d174abe4497b092437acb6f2308055a6ed0be92c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:11:10 +0100
Subject: [PATCH 1536/1862] Fix class filter (needs array_key, not array_value)

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

diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index c057181dd25..fecafa518f5 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -116,8 +116,9 @@ if ($action == 'update') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$nameofclass = ucfirst($tmpobjectkey);
+		$tmpobject = new $nameofclass($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files
@@ -295,6 +296,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								$nameofclass = ucfirst($myTmpObjectKey);
 								$mytmpinstance = new $nameofclass($db);
+								'@phan-var-force Evaluation $mytmpinstance';
 								$mytmpinstance->initAsSpecimen();
 
 								// Info

From b494c1a57c1cf90a8e2cd0f68617a7934322cf56 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:14:21 +0100
Subject: [PATCH 1537/1862] Qual add typing for $users property

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ba8f8116bdf..5e26283544a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -336,7 +336,10 @@ class User extends CommonObject
 	public $lastsearch_values_tmp; // To store current search criteria for user
 	public $lastsearch_values; // To store last saved search criteria for user
 
-	public $users = array(); // To store all tree of users hierarchy
+	/**
+	 * @var array<int,array{rowid:int,id:int,fk_user:int,fk_soc:int,firstname:string,lastname:string,login:string,statut:int,entity:string,email:string,gender:int,admin:string,photo:string,fullpath:string,fullname:string,level:int}>  Store the entire hierarchy tree of users
+	 */
+	public $users = array();
 	public $parentof; // To store an array of all parents for all ids.
 	private $cache_childids; // Cache array of already loaded children
 
@@ -3635,7 +3638,7 @@ class User extends CommonObject
 	/**
 	 * Return and array with all instantiated first level children users of current user
 	 *
-	 * @return	User[]|int
+	 * @return	User[]|int<-1,-1>
 	 * @see getAllChildIds()
 	 */
 	public function get_children()
@@ -3664,7 +3667,7 @@ class User extends CommonObject
 	/**
 	 *  Load this->parentof that is array(id_son=>id_parent, ...)
 	 *
-	 *  @return     int     Return integer <0 if KO, >0 if OK
+	 *  @return     int<-1,1>     Return integer <0 if KO, >0 if OK
 	 */
 	private function loadParentOf()
 	{
@@ -3759,7 +3762,7 @@ class User extends CommonObject
 			return -1;
 		}
 
-		// We add the fullpath property to each elements of first level (no parent exists)
+		// We add the fullpath property to each element of the first level (no parent exists)
 		dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);
 		foreach ($this->users as $key => $val) {
 			$result = $this->build_path_from_id_user($key, 0); // Process a branch from the root user key (this user has no parent)
@@ -3776,9 +3779,10 @@ class User extends CommonObject
 			$keyfilter2 = '_'.$deleteafterid.'$';
 			$keyfilter3 = '^'.$deleteafterid.'_';
 			$keyfilter4 = '_'.$deleteafterid.'_';
-			foreach ($this->users as $key => $val) {
-				if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
-					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {
+			foreach (array_keys($this->users) as $key) {
+				$fullpath = $this->users[$key]['fullpath'];
+				if (preg_match('/'.$keyfilter1.'/', $fullpath) || preg_match('/'.$keyfilter2.'/', $fullpath)
+					|| preg_match('/'.$keyfilter3.'/', $fullpath) || preg_match('/'.$keyfilter4.'/', $fullpath)) {
 					unset($this->users[$key]);
 				}
 			}
@@ -3836,7 +3840,7 @@ class User extends CommonObject
 	 *
 	 * 	@param		int		$id_user		id_user entry to update
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop (no more required, a protection is added with array useridfound)
-	 *	@return		int                     Return integer < 0 if KO (infinite loop), >= 0 if OK
+	 *	@return		int<-1,1>               Return integer < 0 if KO (infinite loop), >= 0 if OK
 	 */
 	public function build_path_from_id_user($id_user, $protection = 0)
 	{

From a0a9454828b41d9506df862fefc2a1154d6b002a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:23:22 +0100
Subject: [PATCH 1538/1862] Fix tmpobjectkey test

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index c3b7a4be39c..0163c248a59 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -65,7 +65,7 @@ if (!$user->admin) {
 $moduledir = 'knowledgemanagement';
 $myTmpObjects = array();
 // TODO Scan list of objects to fill this array
-$myTmpObjects['knowledgemanagement'] = array('label'=>'KnowledgeManagement', 'includerefgeneration'=>0, 'includedocgeneration'=>0, 'class'=>'KnowledgeManagement');
+$myTmpObjects['knowledgemanagement'] = array('label' => 'KnowledgeManagement', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'KnowledgeManagement');
 
 
 /*
@@ -94,8 +94,9 @@ if ($action == 'updateMask') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$nameofclass = $myTmpObjects['class'];
+		$tmpobject = new $nameofclass($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files
@@ -455,7 +456,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</table><br>\n";
 	}
 
-	if ($myTmpObjectArray['includedocgeneration']) {
+	if (array_key_exists('includedocgeneration', $myTmpObjectArray)) {
 		/*
 		 * Document templates generators
 		 */

From 17db0726a6ccf72f8c32c32345c5bfb3197dbec7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:25:40 +0100
Subject: [PATCH 1539/1862] Fix tmpobjectkey test

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

diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 78715860e12..c98e036c1d3 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -84,8 +84,9 @@ if ($action == 'updateMask') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$nameofclass = ucfirst($tmpobjectkey);
+		$tmpobject = new $nameofclass($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files

From 7c9e6d09c3811574b2dc768d72c3a9529e90b660 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:27:42 +0100
Subject: [PATCH 1540/1862] Fix tmpobjectkey test

---
 htdocs/asset/admin/setup.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 0297cce5031..5850128b3d2 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -95,8 +95,9 @@ if ($action == 'updateMask') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$nameofclass = ucfirst($tmpobjectkey);
+		$tmpobject = new $nameofclass($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files

From 05ee3d482c0ceab0fcde6c4afe775115cc6b5048 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:00:06 +0100
Subject: [PATCH 1541/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b8762bb0414..8c055faf841 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13925,32 +13925,31 @@ function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto'
  * @global object $object Current object, can be modified by hooks.
  * @return void This function terminates script execution after outputting the error page.
  */
-
 function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
- {
-    global $conf, $db, $user, $langs, $hookmanager;
+{
+	global $conf, $db, $user, $langs, $hookmanager;
     global $action, $object;
   
-    if (!is_object($langs)) {
-      include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-      $langs = new Translate('', $conf);
-      $langs->setDefaultLang();
+	if (!is_object($langs)) {
+    	include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+    	$langs = new Translate('', $conf);
+    	$langs->setDefaultLang();
     }
   
-   $langs->load("errors");
+	$langs->load("errors");
   
-   if ($printheader) {
-     if (function_exists("llxHeader")) {
-       llxHeader('');
+	if ($printheader) {
+    	if (function_exists("llxHeader")) {
+    		llxHeader('');
      } elseif (function_exists("llxHeaderVierge")) {
-       llxHeaderVierge('');
+    	llxHeaderVierge('');
      }
    }
    print '<div class="error">';
-   if (empty($message)) {
-     print $langs->trans("ErrorRecordNotFound");
+	if (empty($message)) {
+		print $langs->trans("ErrorRecordNotFound");
    } else {
-     print $langs->trans($message);
+		print $langs->trans($message);
    }
    print '</div>';
    print '<br>';
@@ -13962,9 +13961,9 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
        $hookmanager->initHooks(array('main'));
      }
   
-     $parameters = array('message'=>$message, 'params'=>$params);
-     $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-     print $hookmanager->resPrint;
+    	$parameters = array('message'=>$message, 'params'=>$params);
+    	$reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+    	print $hookmanager->resPrint;
    }
    if ($printfooter && function_exists("llxFooter")) {
      llxFooter();

From c9135d0c33d2915984cc981031b63442d4f28d1c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:19:06 +0100
Subject: [PATCH 1542/1862] Fix: Main email configuration was not added to list

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 7557a9d89ce..c2e5cf7f5bc 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -647,7 +647,7 @@ class FormMail extends Form
 								if ($this->frommail) {
 									$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'&gt;';
 								}
-								array('label' => $s, 'data-html' => $s);
+								$liste['main_from'] = array('label' => $s, 'data-html' => $s);
 							}
 						}
 
@@ -1469,7 +1469,7 @@ class FormMail extends Form
 
 				$('#generate_button').click(function() {
 					var instructions = $('#ai_instructions').val();
-					
+
 					$('#ai_status_message').show();
 
 					//editor on readonly

From df591e8c158ad66a75b103f0ef1229eb5958a1a6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:21:57 +0100
Subject: [PATCH 1543/1862] Suppress PhanEmptyForeachBody on TODO code

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

diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 680e46a244c..8161f22d703 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -218,6 +219,7 @@ if (empty($conf->use_javascript_ajax) || getDolGlobalString('MAIN_ECM_DISABLE_JS
 		// We removed all expanded sections that are child of the closed section
 		$oldexpandedsectionarray = $expandedsectionarray;
 		$expandedsectionarray = array(); // Reset
+		// @phan-suppress-next-line PhanEmptyForeachBody
 		foreach ($oldexpandedsectionarray as $sectioncursor) {
 			// TODO is_in_subtree(fulltree,sectionparent,sectionchild) does nox exists. Enable or remove this...
 			//if ($sectioncursor && ! is_in_subtree($sqltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;

From 1877dda1a48945eac0d074bff0f5814f45770c35 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:35:08 +0100
Subject: [PATCH 1544/1862] Always return a value in dol_eval

---
 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 4a6e3a42f01..4faa0de3d82 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10008,6 +10008,7 @@ function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1'
 			} else {
 				eval($s);
 			}
+			return '';
 		}
 	} catch (Error $e) {
 		if ($isObBufferActive) {

From c8db19331b32d2f1917dbec1ce94f5a1e009c03b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:36:54 +0100
Subject: [PATCH 1545/1862] Handle ftp_chdir error

---
 htdocs/core/lib/ftp.lib.php   | 10 ++++++----
 htdocs/langs/en_US/other.lang |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php
index 3782a170242..d72d98d7f94 100644
--- a/htdocs/core/lib/ftp.lib.php
+++ b/htdocs/core/lib/ftp.lib.php
@@ -89,18 +89,20 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 					}
 				} else {
 					if (ftp_login($connect_id, $ftp_user, $ftp_password)) {
-						// Turn on passive mode transfers (must be after a successful login
+						// Turn on passive mode transfers (must be after a successful login)
 						if ($ftp_passive) {
 							ftp_pasv($connect_id, true);
 						}
 
 						// Change the dir
 						$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
-						ftp_chdir($connect_id, $newsectioniso);
+						if (!ftp_chdir($connect_id, $newsectioniso)) {
+							$ok = 0;
+							$mesg = $langs->transnoentitiesnoconv("FailedToChdirOnFTPServer");
+						}
 					} else {
-						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 						$ok = 0;
-						$error++;
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 					}
 				}
 			}
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a1e25cea1af..32cd6681507 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -327,6 +327,7 @@ SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module see
 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
+FailedToChdirOnFTPServer=Failed to change directory on the FTP server
 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

From c8ecf18b0c9d8023184852bee060e23e78a0bbab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:44:03 +0100
Subject: [PATCH 1546/1862] Suppress false positive for UnknownModuleName

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

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 30b199a735f..da7287ce74a 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -1332,7 +1332,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
 	$dictionnaires['tabfieldvalue'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabfieldinsert'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabrowid'][] = $primaryKey;
-	$dictionnaires['tabcond'][] = isModEnabled('$modulename');
+	$dictionnaires['tabcond'][] = isModEnabled('$modulename');  // @phan-suppress-current-line UnknownModuleName
 	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code' => $langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');
 
 	// Build the dictionary string

From f1ea8bee839ad78fda3ce7db7dcb7c36f09ad40c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:53:06 +0100
Subject: [PATCH 1547/1862] Fix PhanPluginUseReturnValueInternalKnown by
 returning value

---
 htdocs/filefunc.inc.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index a94af12f92d..0c6698c736c 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2006 	   Andre Cianfarani     <andre.cianfarani@acdeveloppement.net>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Bahfir Abbes         <bafbes@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -75,11 +76,11 @@ function dol_session_start()
 /**
  * Replace session_regenerate_id()
  *
- * @return void
+ * @return bool True if success, false if failed
  */
 function dol_session_regenerate_id()
 {
-	session_regenerate_id();
+	return session_regenerate_id();
 }
 
 /**
@@ -296,7 +297,7 @@ if (!defined('NOCSRFCHECK') && isset($dolibarr_nocsrfcheck) && $dolibarr_nocsrfc
 		if ($csrfattack) {
 			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
 			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
-			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (Bad referrer).", LOG_WARNING);
+			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (Bad referrer).", LOG_WARNING);
 			print "Access refused by CSRF protection in main.inc.php. Referrer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
 			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
 			die;
@@ -389,22 +390,22 @@ define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
  */
 // Path to root libraries
 if (!defined('TCPDF_PATH')) {
-	define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/');
+	define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ? DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/');
 }
 if (!defined('TCPDI_PATH')) {
-	define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/');
+	define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ? DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/');
 }
 if (!defined('NUSOAP_PATH')) {
-	define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/'));
+	define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ? DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/'));
 }
 if (!defined('PHPEXCELNEW_PATH')) {
-	define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/'));
+	define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ? DOL_DOCUMENT_ROOT.'/includes/phpoffice/phpspreadsheet/src/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/'));
 }
 if (!defined('ODTPHP_PATH')) {
-	define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/'));
+	define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ? DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/'));
 }
 if (!defined('ODTPHP_PATHTOPCLZIP')) {
-	define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/'));
+	define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ? DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/'));
 }
 if (!defined('JS_CKEDITOR')) {
 	define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/'));
@@ -417,10 +418,10 @@ if (!defined('JS_JQUERY_UI')) {
 }
 // Other required path
 if (!defined('DOL_DEFAULT_TTF')) {
-	define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF) ? '' : $dolibarr_font_DOL_DEFAULT_TTF));
+	define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF)) ? DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF) ? '' : $dolibarr_font_DOL_DEFAULT_TTF));
 }
 if (!defined('DOL_DEFAULT_TTF_BOLD')) {
-	define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD) ? '' : $dolibarr_font_DOL_DEFAULT_TTF_BOLD));
+	define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD)) ? DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD) ? '' : $dolibarr_font_DOL_DEFAULT_TTF_BOLD));
 }
 
 

From 8a833889056961154236a4f5d1020303b91ec33f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 19:07:36 +0100
Subject: [PATCH 1548/1862] Qual: Enable several phan notifications

---
 dev/tools/phan/baseline.txt | 3 +--
 dev/tools/phan/config.php   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 97e91d7bb07..f7210c92b8d 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -23,7 +23,6 @@ return [
     // PhanUndeclaredFunctionInCallable : 4 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanAccessPropertyStaticAsNonStatic : 1 occurrence
-    // PhanNoopArray : 1 occurrence
     // PhanNoopArrayAccess : 1 occurrence
     // PhanNoopStringLiteral : 1 occurrence
     // PhanPluginAlwaysReturnFunction : 1 occurrence
@@ -50,7 +49,7 @@ return [
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/class/html.formmail.class.php' => ['PhanNoopArray'],
+        'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/rssparser.class.php' => ['PhanUndeclaredFunctionInCallable'],
         'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 5cb5b5b2f07..39b5aa1f5bc 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -518,7 +518,7 @@ return [
 		// 'PhanCommentDuplicateMagicMethod',
 		// 'PhanParamSpecial1',
 		'PhanPluginInlineHTMLLeading',
-		'PhanPluginUseReturnValueInternalKnown',
+		// 'PhanPluginUseReturnValueInternalKnown',
 		// 'PhanRedefinedInheritedInterface',
 		// 'PhanTypeComparisonToArray',
 		'PhanTypeConversionFromArray',
@@ -550,14 +550,14 @@ return [
 		// 'PhanTypeInstantiateTraitStaticOrSelf',
 		// 'PhanUndeclaredInvokeInCallable',
 		// 'PhanNoopProperty',
-		'PhanNoopVariable',
+		// 'PhanNoopVariable',
 		// 'PhanPluginPrintfUnusedArgument',
 		// 'PhanSyntaxReturnExpectedValue',
 		// 'PhanAccessClassInternal',
 		// 'PhanCompatibleAccessMethodOnTraitDefinition',
 		// 'PhanNoopSwitchCases',
 		// 'PhanNoopTernary',
-		'PhanNoopUnaryOperator',
+		// 'PhanNoopUnaryOperator',
 		// 'PhanParamNameIndicatingUnusedInClosure',
 		// 'PhanParamSignatureRealMismatchTooFewParametersInternal',
 		// 'PhanPluginEmptyStatementSwitch',

From 8c29ca90334d73caa9396478a855fb9f3caeb484 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 20:17:05 +0100
Subject: [PATCH 1549/1862] Fix PhanNoopVariable for $i by changing loop to
 while

# Fix PhanNoopVariable for $i by changing loop to while

`$i` looked like a NOOP on $i which is provided as an argument to
the function.  Changed to while to improve readability and avoid thinking
that `$i` needs initialisation and fix the notification
---
 htdocs/hrm/class/skill.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index c895035010d..256956d55de 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -259,7 +259,7 @@ class Skill extends CommonObject
 		$this->db->begin();
 
 		// Create level of skills
-		for ($i; $i <= $MaxNumberSkill ; $i++) {
+		while ($i <= $MaxNumberSkill) {
 			$skilldet = new Skilldet($this->db);
 			$skilldet->description = $defaultSkillDesc . " " . $i;
 			$skilldet->rankorder = $i;
@@ -269,9 +269,10 @@ class Skill extends CommonObject
 			if ($result <= 0) {
 				$error++;
 			}
+			$i++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 
 			setEventMessage($langs->trans('SkillCreated'), $i);

From 6e887464d31b8c68b327b60a7e9e894e32a99c6a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:49:07 +0100
Subject: [PATCH 1550/1862] Fix NOOP code with unset of
 conf->multicompany->enabled

---
 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 42467f123bf..a831b268a13 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -3,6 +3,7 @@
  * 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>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -145,7 +146,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 						global $mc;
 
 						if (!isset($mc)) {
-							!isModEnabled('multicompany'); // Global not available, disable $conf->multicompany->enabled for safety
+							unset($conf->multicompany->enabled); // Global not available, disable $conf->multicompany->enabled for safety
 						} else {
 							$ret = $mc->checkRight($obj->rowid, $entitytotest);
 							if ($ret < 0) {

From c12af524d57e9169e3ed46a28c16778e8193b578 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:05:34 +0100
Subject: [PATCH 1551/1862] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 75 ++++++++++++++++---------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8c055faf841..4651e6a17e6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13927,46 +13927,47 @@ function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto'
  */
 function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
-	global $conf, $db, $user, $langs, $hookmanager;
+    global $conf, $db, $user, $langs, $hookmanager;
     global $action, $object;
   
-	if (!is_object($langs)) {
-    	include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-    	$langs = new Translate('', $conf);
-    	$langs->setDefaultLang();
+    if (!is_object($langs)) {
+        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+        $langs = new Translate('', $conf);
+        $langs->setDefaultLang();
     }
   
-	$langs->load("errors");
+    $langs->load("errors");
   
-	if ($printheader) {
-    	if (function_exists("llxHeader")) {
-    		llxHeader('');
-     } elseif (function_exists("llxHeaderVierge")) {
-    	llxHeaderVierge('');
-     }
-   }
-   print '<div class="error">';
-	if (empty($message)) {
-		print $langs->trans("ErrorRecordNotFound");
-   } else {
-		print $langs->trans($message);
-   }
-   print '</div>';
-   print '<br>';
-   if (empty($showonlymessage)) {
-     if (empty($hookmanager)) {
-       include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-       $hookmanager = new HookManager($db);
-       // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-       $hookmanager->initHooks(array('main'));
-     }
+    if ($printheader) {
+        if (function_exists("llxHeader")) {
+            llxHeader('');
+        } elseif (function_exists("llxHeaderVierge")) {
+            llxHeaderVierge('');
+        }
+    }
+    print '<div class="error">';
+    if (empty($message)) {
+        print $langs->trans("ErrorRecordNotFound");
+    } else {
+        print $langs->trans($message);
+    }
+    print '</div>';
+    print '<br>';
+    if (empty($showonlymessage)) {
+        if (empty($hookmanager)) {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager = new HookManager($db);
+            // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+            $hookmanager->initHooks(array('main'));
+        }
   
-    	$parameters = array('message'=>$message, 'params'=>$params);
-    	$reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-    	print $hookmanager->resPrint;
-   }
-   if ($printfooter && function_exists("llxFooter")) {
-     llxFooter();
-   }
-   exit(0);
- }
+        $parameters = array('message'=>$message, 'params'=>$params);
+        $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+        print $hookmanager->resPrint;
+    }
+    if ($printfooter && function_exists("llxFooter")) {
+        llxFooter();
+    }
+    exit(0);
+}
+

From 48bbc532b9ce94a5d82184c365405c62f8a9d8f7 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:11:06 +0100
Subject: [PATCH 1552/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4651e6a17e6..e5d23dc7115 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13927,14 +13927,14 @@ function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto'
  */
 function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
-    global $conf, $db, $user, $langs, $hookmanager;
-    global $action, $object;
-  
+	global $conf, $db, $user, $langs, $hookmanager;
+	global $action, $object;
+	
     if (!is_object($langs)) {
-        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-        $langs = new Translate('', $conf);
-        $langs->setDefaultLang();
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+    	$langs = new Translate('', $conf);
+    	$langs->setDefaultLang();
+	}
   
     $langs->load("errors");
   

From e1cf39773bf71ad9c29914d045d3c9f3ae08c6ab Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:13:51 +0100
Subject: [PATCH 1553/1862] 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 e5d23dc7115..a6178020bdc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13930,7 +13930,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 	global $conf, $db, $user, $langs, $hookmanager;
 	global $action, $object;
 	
-    if (!is_object($langs)) {
+	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
     	$langs = new Translate('', $conf);
     	$langs->setDefaultLang();

From 13350802e5c04f3821239fa35ae9f62b50d3b334 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:16:15 +0100
Subject: [PATCH 1554/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a6178020bdc..c4a99a7ecfa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13929,7 +13929,6 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 {
 	global $conf, $db, $user, $langs, $hookmanager;
 	global $action, $object;
-	
 	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
     	$langs = new Translate('', $conf);

From fb9f9a7c8b4ae71182df185c2b47378ad08407a3 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:22:17 +0100
Subject: [PATCH 1555/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c4a99a7ecfa..610eb22a218 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13929,14 +13929,15 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 {
 	global $conf, $db, $user, $langs, $hookmanager;
 	global $action, $object;
+	
 	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
     	$langs = new Translate('', $conf);
     	$langs->setDefaultLang();
 	}
-  
+	
     $langs->load("errors");
-  
+	
     if ($printheader) {
         if (function_exists("llxHeader")) {
             llxHeader('');
@@ -13944,6 +13945,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
             llxHeaderVierge('');
         }
     }
+	
     print '<div class="error">';
     if (empty($message)) {
         print $langs->trans("ErrorRecordNotFound");
@@ -13952,18 +13954,20 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
     }
     print '</div>';
     print '<br>';
+	
     if (empty($showonlymessage)) {
         if (empty($hookmanager)) {
-            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-            $hookmanager = new HookManager($db);
-            // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+        	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+        	$hookmanager = new HookManager($db);
+        	// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
             $hookmanager->initHooks(array('main'));
         }
   
         $parameters = array('message'=>$message, 'params'=>$params);
         $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-        print $hookmanager->resPrint;
+    	print $hookmanager->resPrint;
     }
+	
     if ($printfooter && function_exists("llxFooter")) {
         llxFooter();
     }

From 4dc118a759bb883ccaa5a77d84d95c3b9bb0871a Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:25:05 +0100
Subject: [PATCH 1556/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 610eb22a218..b5d8b656189 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13973,4 +13973,3 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
     }
     exit(0);
 }
-

From d339f4252c031148623b40c4f763a6d330886472 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:26:50 +0100
Subject: [PATCH 1557/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b5d8b656189..b15deef2f01 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13967,8 +13967,8 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
         $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
     	print $hookmanager->resPrint;
     }
-	
-    if ($printfooter && function_exists("llxFooter")) {
+
+	if ($printfooter && function_exists("llxFooter")) {
         llxFooter();
     }
     exit(0);

From dd7f84abde2a5f144e9c260e95c4518801aafc1b Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:30:24 +0100
Subject: [PATCH 1558/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b15deef2f01..e6b133f3b6f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13929,15 +13929,15 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 {
 	global $conf, $db, $user, $langs, $hookmanager;
 	global $action, $object;
-	
+
 	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
     	$langs = new Translate('', $conf);
     	$langs->setDefaultLang();
 	}
-	
+
     $langs->load("errors");
-	
+
     if ($printheader) {
         if (function_exists("llxHeader")) {
             llxHeader('');
@@ -13945,7 +13945,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
             llxHeaderVierge('');
         }
     }
-	
+
     print '<div class="error">';
     if (empty($message)) {
         print $langs->trans("ErrorRecordNotFound");
@@ -13954,7 +13954,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
     }
     print '</div>';
     print '<br>';
-	
+
     if (empty($showonlymessage)) {
         if (empty($hookmanager)) {
         	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -13962,7 +13962,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
         	// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
             $hookmanager->initHooks(array('main'));
         }
-  
+
         $parameters = array('message'=>$message, 'params'=>$params);
         $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
     	print $hookmanager->resPrint;

From cd47aa1aad1be9cf6577e5431de0f46698b0aad4 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:34:09 +0100
Subject: [PATCH 1559/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e6b133f3b6f..702f90beeae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13932,8 +13932,8 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 
 	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-    	$langs = new Translate('', $conf);
-    	$langs->setDefaultLang();
+		$langs = new Translate('', $conf);
+		$langs->setDefaultLang();
 	}
 
     $langs->load("errors");

From 82dc53e796c5ea5440a7956678a8cb618f1a256a Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:36:43 +0100
Subject: [PATCH 1560/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 702f90beeae..60de32cfb5e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13936,15 +13936,15 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 		$langs->setDefaultLang();
 	}
 
-    $langs->load("errors");
+	$langs->load("errors");
 
-    if ($printheader) {
-        if (function_exists("llxHeader")) {
-            llxHeader('');
-        } elseif (function_exists("llxHeaderVierge")) {
-            llxHeaderVierge('');
-        }
-    }
+	if ($printheader) {
+    	if (function_exists("llxHeader")) {
+			llxHeader('');
+		} elseif (function_exists("llxHeaderVierge")) {
+			llxHeaderVierge('');
+		}
+	}
 
     print '<div class="error">';
     if (empty($message)) {

From 0c7ed79f40c85a6684fdc99a6e482e123842198b Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:42:57 +0100
Subject: [PATCH 1561/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 60de32cfb5e..ea7c71bf971 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13939,21 +13939,21 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 	$langs->load("errors");
 
 	if ($printheader) {
-    	if (function_exists("llxHeader")) {
+		if (function_exists("llxHeader")) {
 			llxHeader('');
 		} elseif (function_exists("llxHeaderVierge")) {
 			llxHeaderVierge('');
 		}
 	}
 
-    print '<div class="error">';
-    if (empty($message)) {
-        print $langs->trans("ErrorRecordNotFound");
-    } else {
-        print $langs->trans($message);
-    }
-    print '</div>';
-    print '<br>';
+	print '<div class="error">';
+	if (empty($message)) {
+		print $langs->trans("ErrorRecordNotFound");
+	} else {
+		print $langs->trans($message);
+	}
+	print '</div>';
+	print '<br>';
 
     if (empty($showonlymessage)) {
         if (empty($hookmanager)) {

From 3fba583ffadb45f723c0fe72238c1f0fd461beaa Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:46:40 +0100
Subject: [PATCH 1562/1862] Update functions.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ea7c71bf971..16328dfcece 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13955,21 +13955,21 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 	print '</div>';
 	print '<br>';
 
-    if (empty($showonlymessage)) {
-        if (empty($hookmanager)) {
-        	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        	$hookmanager = new HookManager($db);
-        	// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-            $hookmanager->initHooks(array('main'));
-        }
+	if (empty($showonlymessage)) {
+		if (empty($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($db);
+			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+			$hookmanager->initHooks(array('main'));
+		}
 
-        $parameters = array('message'=>$message, 'params'=>$params);
-        $reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-    	print $hookmanager->resPrint;
-    }
+		$parameters = array('message'=>$message, 'params'=>$params);
+		$reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		print $hookmanager->resPrint;
+	}
 
 	if ($printfooter && function_exists("llxFooter")) {
-        llxFooter();
-    }
-    exit(0);
+    	llxFooter();
+	}
+	exit(0);
 }

From 3b0bd0c427312b5f1b6ba72a6043d3772ff2418b Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 00:49:12 +0100
Subject: [PATCH 1563/1862] 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 16328dfcece..99f35c5740f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13969,7 +13969,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 	}
 
 	if ($printfooter && function_exists("llxFooter")) {
-    	llxFooter();
+		llxFooter();
 	}
 	exit(0);
 }

From 28e10cb999245a6649c262c461e7079c1b3f18cb Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Sat, 16 Mar 2024 01:02:32 +0100
Subject: [PATCH 1564/1862] Change icon spinner

---
 htdocs/core/class/html.formmail.class.php |  2 +-
 htdocs/theme/eldy/global.inc.php          | 46 -----------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 290c4ffec6d..68520d673f2 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1455,7 +1455,7 @@ class FormMail extends Form
 		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="'.$langs->trans("EnterYourAIPromptHere").'..." />';
 		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
 		$out .= '<div id="ai_status_message" class="fieldrequired hideobject marginrightonly" >';
-		$out .= '<i class="loader"></i>'.$langs->trans("AIProcessingPleaseWait").'</div>';
+		$out .= '<i class="fa fa-spinner fa-spin fa-2x fa-fw"></i>'.$langs->trans("AIProcessingPleaseWait").'</div>';
 		$out .= "</td></tr>\n";
 
 		$out .= "<script type='text/javascript'>
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 39205187292..15cea59c574 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -8153,52 +8153,6 @@ table.jPicker {
 		margin-top: 30px;
 	}
 }
-
-/* ============================================================================== */
-/* CSS style for animation ai message                                                   */
-/* ============================================================================== */
-.icon-container {
-  top: calc(50% - 10px);
-}
-
-.loader {
-  position: relative;
-  height: 20px;
-  width: 20px;
-  display: inline-block;
-  animation: around 5.4s infinite;
-}
-
-@keyframes around {
-  0% {
-	transform: rotate(0deg);
-  }
-  100% {
-	transform: rotate(360deg);
-  }
-}
-
-.loader::after, .loader::before {
-  content: '';
-  background: white;
-  position: absolute;
-  display: inline-block;
-  width: 100%;
-  height: 100%;
-  border-width: 2px;
-  border-color: #333 #333 transparent transparent;
-  border-style: solid;
-  border-radius: 20px;
-  box-sizing: border-box;
-  top: 0;
-  left: 0;
-  animation: around 0.7s ease-in-out infinite;
-}
-
-.loader::after {
-  animation: around 0.7s ease-in-out 0.1s infinite;
-  background: transparent;
-}
 @media only screen and (max-width: 320px)
 {
 	.dropdown dd ul {

From 5422cbdfc29b68fa50253f1df51c8105403de681 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Sat, 16 Mar 2024 01:07:17 +0100
Subject: [PATCH 1565/1862] remove variables withaiprompt

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f9cde0e1d1a..f58e5f79365 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1004,8 +1004,6 @@ class FormMail extends Form
 				$out .= '</td>';
 				$out .= '<td>';
 
-				$this->withaiprompt = 'html';
-				$this->withlayout = 1;
 				// Add link to add layout
 				if ($this->withlayout && $this->withfckeditor) {
 					$out .= '<a href="#" id="linkforlayouttemplates" class="reposition notasortlink inline-block alink marginrightonly">';

From a48c3215a1d944503c801630bd62ff0c10782c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 08:43:08 +0100
Subject: [PATCH 1566/1862] fix phpstan warnings

---
 htdocs/compta/paiement/class/paiement.class.php | 4 ++--
 htdocs/compta/paiement_charge.php               | 4 ++--
 htdocs/compta/paiement_vat.php                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 0594855dce2..d60aa17ce3b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -68,12 +68,12 @@ class Paiement extends CommonObject
 	public $socid;
 
 	/**
-	 * @var int
+	 * @var int|string
 	 */
 	public $datepaye;
 
 	/**
-	 * @var int							same than $datepaye
+	 * @var int|string					same than $datepaye
 	 */
 	public $date;
 
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 0094a541cf6..31b4daceabf 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2016-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -85,7 +85,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
 				$other_chid = substr($key, 7);
-				$amounts[$other_chid] = price2num(GETPOST($key));
+				$amounts[$other_chid] = (float) price2num(GETPOST($key));
 			}
 		}
 
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 3b98f540a22..af4e1463ae3 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2016-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -80,7 +80,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 	foreach ($_POST as $key => $value) {
 		if (substr($key, 0, 7) == 'amount_') {
 			$other_chid = substr($key, 7);
-			$amounts[$other_chid] = price2num(GETPOST($key));
+			$amounts[$other_chid] = (float) price2num(GETPOST($key));
 		}
 	}
 

From 41fccbaac5c8ea0b3ff603438f076fc48ede7b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 08:49:50 +0100
Subject: [PATCH 1567/1862] fix phpstan warnings

---
 .../compta/sociales/class/paymentsocialcontribution.class.php | 2 +-
 htdocs/compta/tva/card.php                                    | 4 ++--
 htdocs/core/modules/barcode/mod_barcode_product_standard.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 6713da39db7..6d552f245f9 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -186,7 +186,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->fk_charge = (int) $this->fk_charge;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepaiement)) {
 			$this->fk_typepaiement = (int) $this->fk_typepaiement;
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index d3f0886eae9..863eb956f33 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -179,7 +179,7 @@ if (empty($reshook)) {
 		$object->datev = $datev;
 		$object->datep = $datep;
 
-		$amount = price2num(GETPOST("amount", 'alpha'));
+		$amount = (float) price2num(GETPOST("amount", 'alpha'));
 		if ($refund == 1) {
 			$amount = price2num(-1 * $amount);
 		}
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index cb5b273577b..82402b1b9c6 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -161,7 +161,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 *
 	 * @param	?CommonObject	$objproduct 	Object product (not used)
 	 * @param	string			$type    		Type of barcode (EAN, ISBN, ...)
-	 * @return 	string      					Value if OK, '' if module not configured, <0 if KO
+	 * @return 	string|int     					Value if OK, '' if module not configured, <0 if KO
 	 */
 	public function getNextValue($objproduct = null, $type = '')
 	{

From 5c7db3d4e130508f727147328db5e9323c328b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 09:14:58 +0100
Subject: [PATCH 1568/1862] fix phpstan warnings

---
 htdocs/loan/class/paymentloan.class.php | 9 +++++++--
 htdocs/public/bookcal/index.php         | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 28a1d9f4060..d1e34bbbdf9 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -121,10 +121,15 @@ class PaymentLoan extends CommonObject
 	 * @var string
 	 */
 	public $label;
+
 	/**
-	 * @var string
+	 * @var int
 	 */
 	public $paymenttype;
+
+	/**
+	 * @var int
+	 */
 	public $bank_account;
 	public $bank_line;
 
@@ -543,7 +548,7 @@ class PaymentLoan extends CommonObject
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
 				$this->datep,
-				$this->paymenttype, // Payment mode ID or code ("CHQ or VIR for example")
+				$this->paymenttype, // Payment mode ID or code ("CHQ or VIR for example") it's integer in db
 				$label,
 				$total,
 				$this->num_payment,
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
index e6515fa6c7d..ba43b12a5d0 100644
--- a/htdocs/public/bookcal/index.php
+++ b/htdocs/public/bookcal/index.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2023		anthony Berton			<anthony.berton@bb2a.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -253,7 +254,7 @@ if ($action == 'add') {
 		$actioncomm->fk_bookcal_calendar = $id;
 		$actioncomm->userownerid = $calendar->visibility;
 		$actioncomm->contact_id = $contact->id;
-		$actioncomm->socpeopleassigned = $contact->id;
+		$actioncomm->socpeopleassigned = [$contact->id];
 
 		$result = $actioncomm->create($user);
 		if ($result < 0) {

From 97e43469134ab1c328a16e8e8ba3789952b8f4f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 10:45:32 +0100
Subject: [PATCH 1569/1862] Fix look and feel

---
 .../modulebuilder/template/myobject_list.php  |   6 +-
 htdocs/webhook/target_list.php                | 187 +++++++++++-------
 2 files changed, 119 insertions(+), 74 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 87f3e4ed8e4..6222cab47f5 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -147,8 +147,8 @@ foreach ($object->fields as $key => $val) {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
-		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -514,7 +514,7 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index c120213d81c..f5fe7899a18 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -88,7 +88,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criteria
-$search_all = GETPOST('search_all', 'alphanohtml');
+$search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -131,7 +131,6 @@ $object->fields = dol_sort_array($object->fields, 'position');
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-// Permissions
 // There is several ways to check permission.
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
@@ -154,7 +153,7 @@ if ($user->socid > 0) {
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 if (!isModEnabled('webhook')) {
-	accessforbidden('Module not enabled');
+	accessforbidden('Module webhook not enabled');
 }
 if (!$permissiontoread) {
 	accessforbidden();
@@ -192,6 +191,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
+		$search_all = '';
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -235,10 +235,12 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
-//$sql .= ", COUNT(rc.rowid) as anotherfield";
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 //$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."anothertable as rc ON rc.parent = t.rowid";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -246,10 +248,10 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array
 }
 // Add table from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
-	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -290,7 +292,7 @@ if ($search_all) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
@@ -304,9 +306,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
 }
-// Add where from hooks
+// Add groupby from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 */
@@ -314,33 +316,26 @@ $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
+$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object, $action); // 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 (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
-	/* This old and fast method to get and count full list returns all record so use a high amount of memory.
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
-	*/
-	/* The slow method does not consume memory on mysql (not tested on pgsql) */
-	/*$resql = $db->query($sql, 0, 'auto', 1);
-	while ($db->fetch_object($resql)) {
-		if (empty($nbtotalofrecords)) {
-			$nbtotalofrecords = 1;    // We can't make +1 because init value is ''
-		 } else {
-			 $nbtotalofrecords++;
-		 }
-	 }*/
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
-	$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
-	$resql = $db->query($sqlforcount);
-	$objforcount = $db->fetch_object($resql);
-	$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -363,7 +358,7 @@ $num = $db->num_rows($resql);
 
 
 // Direct jump if only one record found
-if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
+if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/webhook/target_card.php', 1).'?id='.$id);
@@ -416,25 +411,29 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
 			if ($skey != '') {
 				$param .= '&search_'.$key.'[]='.urlencode($skey);
 			}
 		}
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
-if ($optioncss != '') {
-	$param .= '&optioncss='.urlencode($optioncss);
-}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $param .= $hookmanager->resPrint;
 
 // List of mass actions available
@@ -444,7 +443,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
@@ -482,9 +481,11 @@ $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
+	print '<!-- Search done like if WEBHOOK_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 }
 
@@ -494,7 +495,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -504,11 +505,14 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
@@ -518,6 +522,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -526,15 +537,15 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 1, 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
-			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -545,7 +556,7 @@ foreach ($object->fields as $key => $val) {
 		} elseif ($key == 'lang') {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 			$formadmin = new FormAdmin($db);
-			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+			print $formadmin->select_language((isset($search[$key]) ? $search[$key] : ''), 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -557,16 +568,19 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }*/
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 $totalarray = array();
@@ -575,6 +589,11 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -583,11 +602,12 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;
 	}
 }
@@ -595,15 +615,17 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
 	print '<th class="liste_titre right">'.$langs->trans("AnotherField").'</th>';
 	$totalarray['nbfield']++;
 }*/
 // Action column
-print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
-$totalarray['nbfield']++;
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 print '</tr>'."\n";
 
 
@@ -622,6 +644,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // --------------------------------------------------------------------
 $i = 0;
 $savnbfield = $totalarray['nbfield'];
+$totalarray = array();
 $totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
@@ -656,9 +679,25 @@ while ($i < $imaxinloop) {
 			print '</td></tr>';
 		}
 	} else {
-		// Show here line of result
+		// Show line of result
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -668,18 +707,22 @@ while ($i < $imaxinloop) {
 			}
 
 			if (in_array($val['type'], array('timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			} elseif ($key == 'ref') {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			}
 
-			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && empty($val['arrayofkeyval'])) {
 				$cssforfield .= ($cssforfield ? ' ' : '').'right';
 			}
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
@@ -709,23 +752,25 @@ while ($i < $imaxinloop) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		/*if (!empty($arrayfields['anotherfield']['checked'])) {
 			print '<td class="right">'.$obj->anotherfield.'</td>';
 		}*/
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
 		}
 
 		print '</tr>'."\n";
@@ -752,7 +797,7 @@ if ($num == 0) {
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
@@ -777,7 +822,7 @@ if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords
 	$genallowed = $permissiontoread;
 	$delallowed = $permissiontoadd;
 
-	print $formfile->showdocuments('massfilesarea_webhook', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_'.$object->module, '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page

From ea2eab434c5234155b674411b9ee864ed1422114 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 11:04:54 +0100
Subject: [PATCH 1570/1862] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/admin/knowledgemanagement.php                | 13 ++++---------
 .../class/knowledgerecord.class.php                 |  2 +-
 htdocs/modulebuilder/template/admin/setup.php       |  7 ++++---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index c3b7a4be39c..c62df83bc93 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -1,7 +1,6 @@
 <?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 SuperAdmin
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2004-2017 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.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
@@ -95,7 +94,8 @@ if ($action == 'updateMask') {
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+		$className = $myTmpObjects[$tmpobjectkey];
+		$tmpobject = new $className($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files
@@ -339,11 +339,6 @@ if ($action == 'edit') {
 }
 
 
-$moduledir = 'knowledgemanagement';
-$myTmpObjects = array();
-$myTmpObjects['MyObject'] = array('includerefgeneration' => 0, 'includedocgeneration' => 0);
-
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectKey == 'MyObject') {
 		continue;
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 2b5f1e56d4f..21168aea09f 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -189,7 +189,7 @@ class KnowledgeRecord extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$this->db = $db;
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index d0ceb430554..5657c30c5b8 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -209,7 +209,8 @@ if ($action == 'updateMask') {
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+		$className = $myTmpObjects[$tmpobjectkey];
+		$tmpobject = new $className($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files
@@ -407,8 +408,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 								print '</td>';
 
-								$nameofclass = $myTmpObjectArray['class'];
-								$mytmpinstance = new $nameofclass($db);
+								$className = $myTmpObjectArray['class'];
+								$mytmpinstance = new $className($db);
 								$mytmpinstance->initAsSpecimen();
 
 								// Info

From 2b9d5b723280c3ce2482144018583e2e6ff50d33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 11:16:32 +0100
Subject: [PATCH 1571/1862] Clean code

---
 htdocs/admin/knowledgemanagement.php          | 7 ++-----
 htdocs/modulebuilder/template/admin/setup.php | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index d1141d812ef..7356f5a329d 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -340,10 +340,7 @@ if ($action == 'edit') {
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') {
-		continue;
-	}
-	if ($myTmpObjectArray['includerefgeneration']) {
+	if (!empty($myTmpObjectArray['includerefgeneration'])) {
 		/*
 		 * Orders Numbering model
 		 */
@@ -450,7 +447,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</table><br>\n";
 	}
 
-	if (array_key_exists('includedocgeneration', $myTmpObjectArray)) {
+	if (!empty($myTmpObjectArray['includedocgeneration'])) {
 		/*
 		 * Document templates generators
 		 */
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 53d0cdccda3..602d8ffa685 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -336,7 +336,7 @@ if (!empty($formSetup->items)) {
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectArray['includerefgeneration']) {
+	if (!empty($myTmpObjectArray['includerefgeneration'])) {
 		/*
 		 * Orders Numbering model
 		 */
@@ -444,7 +444,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</table><br>\n";
 	}
 
-	if ($myTmpObjectArray['includedocgeneration']) {
+	if (!empty($myTmpObjectArray['includedocgeneration'])) {
 		/*
 		 * Document templates generators
 		 */

From 6a50978206770cac30223b415eeef3510bea91df Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Sat, 16 Mar 2024 11:17:00 +0100
Subject: [PATCH 1572/1862] natural sort of result

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

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 5c6154a4605..048f5f68dc0 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -130,6 +130,8 @@ class FormCompany extends Form
 			}
 			$this->db->free($resql);
 		}
+		//return natural sorted list
+		natsort($effs);
 		return $effs;
 	}
 

From 6b20661c37da2c53b7f612d5a4f6347097ee3421 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 11:31:35 +0100
Subject: [PATCH 1573/1862] Update card.php with new function recordNotFound

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 52921b28c80..3cc208d270d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -142,9 +142,7 @@ if ($socid > 0) {
 }
 
 if (!($object->id > 0) && $action == 'view') {
-	$langs->load("errors");
-	print($langs->trans('ErrorRecordNotFound'));
-	exit;
+	recordNotFound();
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)

From e994d6650f624eb9399f854713ed43730475515b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 11:41:00 +0100
Subject: [PATCH 1574/1862] Fix regression in GETPOST limit

---
 htdocs/accountancy/admin/account.php          |  4 ++--
 htdocs/accountancy/admin/categories.php       |  2 +-
 htdocs/accountancy/admin/fiscalyear.php       |  2 +-
 htdocs/accountancy/admin/subaccount.php       |  2 +-
 htdocs/accountancy/bookkeeping/balance.php    |  2 +-
 htdocs/adherents/agenda.php                   |  2 +-
 htdocs/adherents/document.php                 |  2 +-
 htdocs/adherents/list.php                     |  2 +-
 htdocs/adherents/subscription.php             |  2 +-
 htdocs/adherents/subscription/list.php        |  2 +-
 htdocs/adherents/type.php                     |  2 +-
 htdocs/admin/const.php                        |  2 +-
 htdocs/admin/defaultvalues.php                |  2 +-
 htdocs/admin/emailcollector_list.php          |  2 +-
 htdocs/admin/events.php                       |  2 +-
 htdocs/admin/mails_senderprofile_list.php     |  2 +-
 htdocs/admin/mails_templates.php              |  2 +-
 htdocs/admin/modules.php                      |  2 +-
 htdocs/admin/tools/dolibarr_export.php        |  2 +-
 htdocs/admin/tools/export.php                 |  2 +-
 htdocs/admin/tools/export_files.php           |  2 +-
 htdocs/admin/tools/listevents.php             |  2 +-
 htdocs/admin/tools/listsessions.php           |  2 +-
 htdocs/admin/translation.php                  | 23 ++++++++++---------
 htdocs/admin/website.php                      |  2 +-
 htdocs/admin/website_options.php              |  2 +-
 htdocs/asset/agenda.php                       |  2 +-
 htdocs/asset/document.php                     |  2 +-
 htdocs/asset/list.php                         |  2 +-
 htdocs/asset/model/agenda.php                 |  2 +-
 htdocs/asset/model/list.php                   |  2 +-
 htdocs/blockedlog/admin/blockedlog_list.php   |  2 +-
 htdocs/bom/bom_agenda.php                     |  2 +-
 htdocs/bom/bom_document.php                   |  2 +-
 htdocs/bom/bom_list.php                       |  2 +-
 htdocs/bookcal/availabilities_agenda.php      |  2 +-
 htdocs/bookcal/availabilities_document.php    |  2 +-
 htdocs/bookcal/availabilities_list.php        |  2 +-
 htdocs/bookcal/calendar_agenda.php            |  2 +-
 htdocs/bookcal/calendar_document.php          |  2 +-
 htdocs/bookcal/calendar_list.php              |  2 +-
 htdocs/bookmarks/list.php                     |  2 +-
 htdocs/categories/viewcat.php                 |  2 +-
 htdocs/comm/action/document.php               |  2 +-
 htdocs/comm/action/index.php                  |  2 +-
 htdocs/comm/action/list.php                   |  2 +-
 htdocs/comm/action/pertype.php                |  2 +-
 htdocs/comm/action/peruser.php                |  2 +-
 htdocs/comm/action/rapport/index.php          |  2 +-
 htdocs/comm/card.php                          |  2 +-
 htdocs/comm/contact.php                       |  2 +-
 htdocs/comm/mailing/advtargetemailing.php     |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/comm/propal/agenda.php                 |  2 +-
 htdocs/comm/propal/document.php               |  2 +-
 htdocs/comm/propal/list.php                   |  2 +-
 htdocs/commande/agenda.php                    |  2 +-
 htdocs/commande/customer.php                  |  2 +-
 htdocs/commande/document.php                  |  2 +-
 htdocs/commande/list.php                      |  2 +-
 htdocs/commande/list_det.php                  |  2 +-
 htdocs/compta/accounting-files.php            |  2 +-
 .../bank/account_statement_document.php       |  2 +-
 htdocs/compta/bank/bankentries_list.php       |  2 +-
 htdocs/compta/bank/document.php               |  2 +-
 htdocs/compta/bank/list.php                   |  2 +-
 htdocs/compta/bank/releve.php                 |  2 +-
 .../compta/bank/various_payment/document.php  |  2 +-
 htdocs/compta/bank/various_payment/list.php   |  2 +-
 .../compta/cashcontrol/cashcontrol_card.php   |  2 +-
 .../compta/cashcontrol/cashcontrol_list.php   |  2 +-
 htdocs/compta/charges/index.php               |  2 +-
 htdocs/compta/clients.php                     |  2 +-
 htdocs/compta/deplacement/document.php        |  2 +-
 htdocs/compta/deplacement/index.php           |  4 ++--
 htdocs/compta/deplacement/list.php            |  2 +-
 htdocs/compta/facture/agenda-rec.php          |  2 +-
 htdocs/compta/facture/agenda.php              |  2 +-
 htdocs/compta/facture/card-rec.php            |  2 +-
 htdocs/compta/facture/document.php            |  2 +-
 .../compta/facture/invoicetemplate_list.php   |  2 +-
 htdocs/compta/facture/list.php                |  2 +-
 htdocs/compta/paiement.php                    |  2 +-
 htdocs/compta/paiement/cheque/card.php        |  2 +-
 htdocs/compta/paiement/cheque/list.php        |  2 +-
 htdocs/compta/paiement/list.php               |  2 +-
 htdocs/compta/paiement/tovalidate.php         |  2 +-
 htdocs/compta/prelevement/card.php            |  2 +-
 htdocs/compta/prelevement/create.php          |  2 +-
 htdocs/compta/prelevement/demandes.php        |  2 +-
 htdocs/compta/prelevement/factures.php        |  2 +-
 htdocs/compta/prelevement/fiche-rejet.php     |  2 +-
 htdocs/compta/prelevement/fiche-stat.php      |  2 +-
 htdocs/compta/prelevement/line.php            |  2 +-
 htdocs/compta/prelevement/list.php            |  2 +-
 htdocs/compta/prelevement/orders_list.php     |  2 +-
 htdocs/compta/prelevement/rejets.php          |  2 +-
 htdocs/compta/recap-compta.php                |  2 +-
 htdocs/compta/resultat/clientfourn.php        |  2 +-
 htdocs/compta/sociales/document.php           |  2 +-
 htdocs/compta/sociales/list.php               |  2 +-
 htdocs/compta/sociales/payments.php           |  2 +-
 htdocs/compta/tva/document.php                |  2 +-
 htdocs/compta/tva/list.php                    |  2 +-
 htdocs/compta/tva/payments.php                |  2 +-
 htdocs/contact/agenda.php                     |  2 +-
 htdocs/contact/consumption.php                |  2 +-
 htdocs/contact/document.php                   |  2 +-
 htdocs/contact/list.php                       |  2 +-
 htdocs/contrat/agenda.php                     |  2 +-
 htdocs/contrat/document.php                   |  2 +-
 htdocs/contrat/list.php                       |  2 +-
 htdocs/contrat/messaging.php                  |  2 +-
 htdocs/contrat/services_list.php              |  2 +-
 htdocs/core/ajax/ajaxdirpreview.php           |  2 +-
 htdocs/core/customreports.php                 |  2 +-
 .../movement/doc/pdf_standard.modules.php     |  2 +-
 htdocs/cron/list.php                          |  2 +-
 htdocs/don/document.php                       |  2 +-
 htdocs/don/list.php                           |  2 +-
 htdocs/don/paiement/list.php                  |  2 +-
 htdocs/ecm/dir_add_card.php                   |  2 +-
 htdocs/ecm/dir_card.php                       |  2 +-
 htdocs/ecm/file_card.php                      |  2 +-
 htdocs/ecm/file_note.php                      |  2 +-
 htdocs/ecm/index.php                          |  2 +-
 htdocs/ecm/index_auto.php                     |  2 +-
 htdocs/ecm/index_medias.php                   |  2 +-
 htdocs/ecm/search.php                         |  2 +-
 .../conferenceorbooth_document.php            |  2 +-
 .../conferenceorbooth_list.php                |  2 +-
 .../conferenceorboothattendee_list.php        |  2 +-
 htdocs/expedition/document.php                |  2 +-
 htdocs/expedition/list.php                    |  2 +-
 htdocs/expensereport/document.php             |  2 +-
 htdocs/expensereport/index.php                |  4 ++--
 htdocs/expensereport/payment/list.php         |  2 +-
 htdocs/fichinter/agenda.php                   |  2 +-
 htdocs/fichinter/card-rec.php                 |  2 +-
 htdocs/fichinter/document.php                 |  2 +-
 htdocs/fichinter/list.php                     |  2 +-
 htdocs/fourn/commande/document.php            |  2 +-
 htdocs/fourn/commande/info.php                |  2 +-
 htdocs/fourn/commande/list.php                |  2 +-
 htdocs/fourn/contact.php                      |  4 ++--
 htdocs/fourn/facture/card-rec.php             |  2 +-
 htdocs/fourn/facture/document.php             |  2 +-
 htdocs/fourn/facture/list-rec.php             |  2 +-
 htdocs/fourn/facture/list.php                 |  2 +-
 htdocs/fourn/paiement/document.php            |  2 +-
 htdocs/fourn/paiement/list.php                |  2 +-
 htdocs/fourn/product/list.php                 |  2 +-
 htdocs/ftp/index.php                          |  2 +-
 htdocs/holiday/define_holiday.php             |  2 +-
 htdocs/holiday/document.php                   |  2 +-
 htdocs/holiday/list.php                       |  2 +-
 htdocs/holiday/view_log.php                   |  2 +-
 htdocs/hrm/admin/admin_establishment.php      |  2 +-
 htdocs/hrm/establishment/info.php             |  2 +-
 htdocs/hrm/evaluation_agenda.php              |  2 +-
 htdocs/hrm/evaluation_document.php            |  2 +-
 htdocs/hrm/evaluation_list.php                |  2 +-
 htdocs/hrm/job_agenda.php                     |  2 +-
 htdocs/hrm/job_document.php                   |  2 +-
 htdocs/hrm/job_list.php                       |  2 +-
 htdocs/hrm/position_agenda.php                |  2 +-
 htdocs/hrm/position_document.php              |  2 +-
 htdocs/hrm/position_list.php                  |  2 +-
 htdocs/hrm/skill_agenda.php                   |  2 +-
 htdocs/hrm/skill_document.php                 |  2 +-
 htdocs/hrm/skill_list.php                     |  2 +-
 htdocs/intracommreport/list.php               |  2 +-
 .../knowledgerecord_agenda.php                |  2 +-
 .../knowledgerecord_document.php              |  2 +-
 .../knowledgerecord_list.php                  |  2 +-
 htdocs/loan/document.php                      |  2 +-
 htdocs/loan/list.php                          |  2 +-
 htdocs/margin/agentMargins.php                |  2 +-
 htdocs/margin/checkMargins.php                |  2 +-
 htdocs/margin/customerMargins.php             |  2 +-
 htdocs/margin/productMargins.php              |  2 +-
 htdocs/margin/tabs/productMargins.php         |  2 +-
 htdocs/margin/tabs/thirdpartyMargins.php      |  2 +-
 .../modulebuilder/template/myobject_list.php  |  4 +---
 htdocs/mrp/mo_document.php                    |  2 +-
 htdocs/mrp/mo_list.php                        |  2 +-
 htdocs/mrp/mo_movements.php                   |  2 +-
 htdocs/multicurrency/multicurrency_rate.php   |  2 +-
 htdocs/opensurvey/list.php                    |  2 +-
 htdocs/partnership/partnership_agenda.php     |  2 +-
 htdocs/partnership/partnership_document.php   |  2 +-
 htdocs/partnership/partnership_list.php       |  2 +-
 htdocs/product/agenda.php                     |  2 +-
 htdocs/product/document.php                   |  2 +-
 htdocs/product/fournisseurs.php               |  2 +-
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list.php                       |  2 +-
 htdocs/product/popuprop.php                   |  2 +-
 htdocs/product/price.php                      |  2 +-
 htdocs/product/reassort.php                   |  2 +-
 htdocs/product/reassortlot.php                |  2 +-
 htdocs/product/stats/bom.php                  |  2 +-
 htdocs/product/stats/commande.php             |  2 +-
 htdocs/product/stats/commande_fournisseur.php |  2 +-
 htdocs/product/stats/contrat.php              |  2 +-
 htdocs/product/stats/facture.php              |  2 +-
 htdocs/product/stats/facture_fournisseur.php  |  2 +-
 htdocs/product/stats/facturerec.php           |  2 +-
 htdocs/product/stats/mo.php                   |  2 +-
 htdocs/product/stats/propal.php               |  2 +-
 htdocs/product/stats/supplier_proposal.php    |  2 +-
 htdocs/product/stock/card.php                 |  2 +-
 htdocs/product/stock/list.php                 |  2 +-
 htdocs/product/stock/massstockmove.php        |  2 +-
 htdocs/product/stock/movement_card.php        |  2 +-
 htdocs/product/stock/movement_list.php        |  2 +-
 htdocs/product/stock/productlot_document.php  |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 htdocs/product/stock/replenish.php            |  2 +-
 htdocs/product/stock/replenishorders.php      |  2 +-
 .../stock/stats/commande_fournisseur.php      |  2 +-
 htdocs/product/stock/stats/expedition.php     |  2 +-
 htdocs/product/stock/stats/mo.php             |  2 +-
 htdocs/product/stock/stats/reception.php      |  2 +-
 htdocs/product/stock/stockatdate.php          |  2 +-
 .../stocktransfer/stocktransfer_agenda.php    |  2 +-
 .../stocktransfer/stocktransfer_document.php  |  2 +-
 .../stocktransfer/stocktransfer_list.php      |  2 +-
 htdocs/product/stock/valo.php                 |  2 +-
 htdocs/projet/agenda.php                      |  2 +-
 htdocs/projet/list.php                        |  2 +-
 htdocs/projet/messaging.php                   |  2 +-
 htdocs/projet/tasks.php                       |  2 +-
 htdocs/projet/tasks/document.php              |  2 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  2 +-
 htdocs/public/members/public_list.php         |  2 +-
 htdocs/public/opensurvey/index.php            |  2 +-
 htdocs/public/recruitment/index.php           |  2 +-
 htdocs/reception/document.php                 |  2 +-
 htdocs/reception/list.php                     |  2 +-
 .../recruitmentcandidature_agenda.php         |  2 +-
 .../recruitmentcandidature_document.php       |  2 +-
 .../recruitmentcandidature_list.php           |  2 +-
 .../recruitmentjobposition_agenda.php         |  2 +-
 .../recruitmentjobposition_document.php       |  2 +-
 .../recruitmentjobposition_list.php           |  2 +-
 htdocs/resource/agenda.php                    |  2 +-
 htdocs/resource/document.php                  |  2 +-
 htdocs/salaries/document.php                  |  2 +-
 htdocs/salaries/list.php                      |  2 +-
 htdocs/salaries/payments.php                  |  2 +-
 htdocs/societe/agenda.php                     |  2 +-
 htdocs/societe/list.php                       |  2 +-
 htdocs/societe/messaging.php                  |  2 +-
 htdocs/societe/notify/card.php                |  2 +-
 htdocs/societe/price.php                      |  2 +-
 htdocs/societe/societecontact.php             |  2 +-
 htdocs/societe/website.php                    |  2 +-
 htdocs/stripe/charge.php                      |  2 +-
 htdocs/stripe/payout.php                      |  2 +-
 htdocs/stripe/transaction.php                 |  2 +-
 htdocs/supplier_proposal/document.php         |  2 +-
 htdocs/supplier_proposal/list.php             |  2 +-
 htdocs/ticket/agenda.php                      |  2 +-
 htdocs/ticket/document.php                    |  2 +-
 htdocs/ticket/list.php                        |  2 +-
 htdocs/ticket/messaging.php                   |  2 +-
 htdocs/user/agenda.php                        |  2 +-
 htdocs/user/document.php                      |  2 +-
 htdocs/user/group/list.php                    |  2 +-
 htdocs/user/list.php                          |  2 +-
 htdocs/user/messaging.php                     |  2 +-
 htdocs/user/notify/card.php                   |  2 +-
 htdocs/variants/list.php                      |  2 +-
 htdocs/webhook/target_list.php                |  2 +-
 htdocs/website/index.php                      |  2 +-
 htdocs/workstation/workstation_agenda.php     |  2 +-
 htdocs/workstation/workstation_document.php   |  2 +-
 htdocs/workstation/workstation_list.php       |  2 +-
 280 files changed, 295 insertions(+), 296 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index b95e972374d..567af5d4d10 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -50,7 +50,7 @@ $search_accountparent = GETPOST('search_accountparent', 'alpha');
 $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
 $search_import_key = GETPOST('search_import_key', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $confirm = GETPOST('confirm', 'alpha');
 
 $chartofaccounts = GETPOSTINT('chartofaccounts');
@@ -67,7 +67,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 37fd2ce3ed1..465f2836122 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -46,7 +46,7 @@ if ($cat_id == 0) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 59a89a20bdd..d1ba74b8b56 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index dd18283a704..188915b0ec0 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -55,7 +55,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3ef0b40b8c1..58807c5bcd2 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -64,7 +64,7 @@ if ($search_accountancy_code_end == - 1) {
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 9996fb644b5..a42090f5b3c 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('companies', 'members'));
 $id = GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('rowid');
 
 // Pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index b2e8f943cf4..e92e1da0d41 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 16088574096..e8d85f21c76 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -102,7 +102,7 @@ if ($search_status < -2) {
 }
 
 // Pagination parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 11e817b6587..3ace1b42d58 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -54,7 +54,7 @@ $typeid = GETPOSTINT('typeid');
 $cancel = GETPOST('cancel');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 277a2f67a4f..3a99f379502 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -57,7 +57,7 @@ $search_all = '';
 $date_select = GETPOST("date_select", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 8148f6ca683..df36f5c95da 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -61,7 +61,7 @@ $status = GETPOST('status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 1667f5138bb..317e838e922 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -41,7 +41,7 @@ $constname = GETPOST('constname', 'alphanohtml');
 $constvalue = GETPOST('constvalue', 'restricthtml'); // We should be able to send everything here
 $constnote = GETPOST('constnote', 'alpha');
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 56dc6b7aa97..430befce12b 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -46,7 +46,7 @@ $optioncss = GETPOST('optionscss', 'alphanohtml');
 
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 668eb8fe6b2..84706102216 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -50,7 +50,7 @@ $mode       = GETPOST('mode', 'aZ');
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index e701c903c07..323483601a1 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -41,7 +41,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'au
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index b96f325aaf4..bcf786ec1b0 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -48,7 +48,7 @@ $id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 1ff0e80dbb4..ae1f8bf67d1 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -81,7 +81,7 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ? GETPOST('listlimit', 'alpha') : 1000;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 893523f22da..435fb37e1f6 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1318,7 +1318,7 @@ if ($mode == 'deploy') {
 
 			print '<input class="flat minwidth400" type="file" name="fileinstall" id="fileinstall"> ';
 
-			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Upload")).'" class="button">';
+			print '<input type="submit" name="send" value="'.dol_escape_htmltag($langs->trans("Upload")).'" class="button small">';
 
 			if (getDolGlobalString('MAIN_UPLOAD_DOC')) {
 				if ($user->admin) {
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index a913b110fff..b44581098bc 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -44,7 +44,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 2f81fd1b1f1..860cef0e9cd 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -38,7 +38,7 @@ $export_type = GETPOST('export_type', 'alpha');
 $file = dol_sanitizeFileName(GETPOST('filename_template', 'alpha'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 6828c37acbf..446a013df81 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -59,7 +59,7 @@ if ($page < 0) {
 } elseif (empty($page)) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 49a5b4a47e5..902239fca39 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals"));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index def0be0975a..0fdf1a0e561 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 79d1c3eb87b..fa6547f2eb0 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -51,14 +51,15 @@ if ($mode == 'searchkey') {
 	$transvalue = GETPOST('transvalue', 'restricthtml');
 }
 
-
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+// Load variable for pagination
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
-if (empty($page) || $page == -1) {
+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;
@@ -248,7 +249,7 @@ if ($transvalue) {
 }
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && !empty($debug)) ? '?debug=1' : '').'" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 if (isset($optioncss) && $optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -400,12 +401,12 @@ if ($mode == 'overwrite') {
 
 			print '<tr class="oddeven">';
 
-			print '<td>'.$obj->lang.'</td>'."\n";
+			print '<td>'.dol_escape_htmltag($obj->lang).'</td>'."\n";
 			print '<td>';
 			if ($action == 'edit' && $obj->rowid == GETPOSTINT('rowid')) {
 				print '<input type="text" class="quatrevingtpercent" name="transkey" value="'.dol_escape_htmltag($obj->transkey).'">';
 			} else {
-				print $obj->transkey;
+				print dol_escape_htmltag($obj->transkey);
 			}
 			print '</td>'."\n";
 
@@ -420,7 +421,7 @@ if ($mode == 'overwrite') {
 				print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
 			} else {
 				//print $obj->transkey.' '.$langsenfileonly->tab_translate[$obj->transkey];
-				$titleforvalue = $langs->trans("Translation").' en_US for key '.$obj->transkey.':<br>'.($langsenfileonly->tab_translate[$obj->transkey] ? $langsenfileonly->trans($obj->transkey) : '<span class="opacitymedium">'.$langs->trans("None").'</span>');
+				$titleforvalue = $langs->trans("Translation").' en_US for key '.$obj->transkey.':<br>'.(!empty($langsenfileonly->tab_translate[$obj->transkey]) ? $langsenfileonly->trans($obj->transkey) : '<span class="opacitymedium">'.$langs->trans("None").'</span>');
 				/*if ($obj->lang != 'en_US') {
 					$titleforvalue .= '<br>'.$langs->trans("Translation").' '.$obj->lang.' '...;
 				}*/
@@ -437,9 +438,9 @@ if ($mode == 'overwrite') {
 				print ' &nbsp; ';
 				print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 			} else {
-				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit&token='.newToken().'">'.img_edit().'</a>';
 				print ' &nbsp; ';
-				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 			}
 			print '</td>';
 
@@ -565,7 +566,7 @@ if ($mode == 'searchkey') {
 		if ($i <= $offset) {
 			continue;
 		}
-		if ($i > ($offset + $limit)) {
+		if ($limit && $i > ($offset + $limit)) {
 			break;
 		}
 		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td class="small">';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index a66ad8b43dd..b517491d14c 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -49,7 +49,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 4e2c85e9697..8066ac8604d 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -40,7 +40,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 8f099abc537..56e33e2e317 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 3c8a71d9425..bf585199df1 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -41,7 +41,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 561c16881b0..c35fe380279 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -47,7 +47,7 @@ $mode			= GETPOST('mode', 'alpha');  // mode view (kanban or common)
 $id				= GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 797c1036af1..1eb0a2e850a 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 //$search_rowid = GETPOST('search_rowid');
 //$search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index 5c151668e9c..cb61803017c 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -45,7 +45,7 @@ $optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 016fae147a1..bb385e34984 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -80,7 +80,7 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index b4f5a8531b7..f6229b309a1 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -56,7 +56,7 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index fae9d759bda..458d9d0b1aa 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -46,7 +46,7 @@ $ref = GETPOST('ref', 'alpha');
 // $result = restrictedArea($user, 'bom', $id);
 
 // Load variables for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e9f32ee0433..a3d335c11da 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -48,7 +48,7 @@ $mode        = GETPOST('mode', 'aZ');  // mode view (kanban or common)
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index 21f6b113231..5c29e0c45cc 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index 6991cd5ed6c..433d92b144f 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 3559e285947..16efbe2d5df 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -52,7 +52,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index e7712a1f8b1..7ef31ec2c3e 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php
index 38538b2f8a8..32aaf416f35 100644
--- a/htdocs/bookcal/calendar_document.php
+++ b/htdocs/bookcal/calendar_document.php
@@ -43,7 +43,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index 7787d75ddb8..7a735b81c86 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -50,7 +50,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 67f4e68088f..f333df50690 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -44,7 +44,7 @@ $id = GETPOSTINT("id");
 $search_title = GETPOST('search_title', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d0d954802da..a277b9b03c8 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -54,7 +54,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index b98e30d33ca..ccda6ff5be1 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -67,7 +67,7 @@ if ($id > 0) {
 $hookmanager->initHooks(array('actioncard', 'globalcard'));
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 67ea4fef765..78c5449ccca 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -74,7 +74,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 514c9a4171c..408b64c6fc9 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -115,7 +115,7 @@ if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 }
 
 // Pagination parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index a40b63a50ad..990c9af705f 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -69,7 +69,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 9642d24053c..97098383652 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -69,7 +69,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 246befa21ef..5bf0b91974b 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -39,7 +39,7 @@ $month = GETPOSTINT('month');
 $year = GETPOSTINT('year');
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 36d7de22671..796f17e710c 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -94,7 +94,7 @@ $action = GETPOST('action', 'aZ09');
 
 $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 3f0b01ff537..a0eec00fa04 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -42,7 +42,7 @@ if (!$sortfield) {
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $type = GETPOST('type', 'alpha');
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index a64b886a0d4..e0098643747 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -44,7 +44,7 @@ if (isModEnabled('category')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index e6644d5bdbd..4b36bba8cda 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 $langs->loadLangs(array("mails", "admin"));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index 157c47bfdbd..1fe3cf6d5dd 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 1d81859f0cf..e0dbd6b45b1 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -46,7 +46,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 81fd59eb56b..911d866b671 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -147,7 +147,7 @@ $search_status = GETPOST('search_status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index 3096e93831c..af2a5da5594 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1a9079b6418..4f826bf3af3 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -46,7 +46,7 @@ if (!$user->hasRight('facture', 'creer')) {
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "orders"));
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 8be9504cf18..06ada04a04f 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -46,7 +46,7 @@ $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1a96c6a7e6b..e01cc02b357 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -124,7 +124,7 @@ $search_fk_input_reason = GETPOSTINT('search_fk_input_reason');
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index ad037a7c026..2adbd25a7d0 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -132,7 +132,7 @@ $search_fk_input_reason = GETPOSTINT("search_fk_input_reason");
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 05bb11ed23a..05351d41713 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -78,7 +78,7 @@ $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : 0);
 $hookmanager->initHooks(array('comptafileslist', 'globallist'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 32c6b1c9e01..9585ac55973 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -51,7 +51,7 @@ if ($user->socid) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 81d4d0e3738..82184b9ecb7 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -96,7 +96,7 @@ if (empty($dateop)) {
 	$dateop = -1;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 7df02b4b4f1..006d8e72a4f 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -51,7 +51,7 @@ if ($user->socid) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 4cfb917017e..480c36cd07e 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -73,7 +73,7 @@ if ($user->socid) {
 
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 2c215f3a0ab..34c61ad8b31 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -76,7 +76,7 @@ if ($user->hasRight('banque', 'consolidate') && $action == 'dvprev' && !empty($d
 }
 
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 30b02e86f8b..7c717d7ede0 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -47,7 +47,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'banque', '', '', '');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 50203a3a815..8a2aa9178f7 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -42,7 +42,7 @@ $mode      = GETPOST('mode', 'alpha');
 $massaction = GETPOST('massaction', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index db39a879308..74cce92938d 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -47,7 +47,7 @@ $syear = (GETPOSTISSET('closeyear') ? GETPOSTINT('closeyear') : dol_print_date($
 $smonth = (GETPOSTISSET('closemonth') ? GETPOSTINT('closemonth') : dol_print_date($now, "%m"));
 $sday = (GETPOSTISSET('closeday') ? GETPOSTINT('closeday') : dol_print_date($now, "%d"));
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 18e23efa53f..c3cd5cd37a1 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -45,7 +45,7 @@ $mode       = GETPOST('mode', 'alpha');  // for mode view result
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 680c90f8d04..534b4a45d01 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -63,7 +63,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 
 $search_account = GETPOSTINT('search_account');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 8b47e9a0aa3..c7963e95090 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -45,7 +45,7 @@ $langs->load("companies");
 
 $mode = GETPOST("mode");
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 9d77c73ff34..d950e51d852 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -45,7 +45,7 @@ $confirm = GETPOST('confirm', 'alpha');
 
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 2711ee5970c..4adeb8913d6 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -38,7 +38,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'deplacement', '', '');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -54,7 +54,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.dated";
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 172c7175d53..c3eac0cb087 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -49,7 +49,7 @@ $search_company = GETPOST('search_company', 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index 4a0c945b723..3636c91fce7 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php
index c986254a715..2880e158273 100644
--- a/htdocs/compta/facture/agenda.php
+++ b/htdocs/compta/facture/agenda.php
@@ -50,7 +50,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index efe77c128a9..3502f31d822 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -73,7 +73,7 @@ $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
 $selectedLines = GETPOST('toselect', 'array');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index abc869cf031..47c6faf0c76 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -50,7 +50,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index cb67dc4bbe2..13a119e35b5 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -97,7 +97,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7abf07206a6..13995e6cc0b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -152,7 +152,7 @@ if ($search_late == 'late') {
 	$search_status = '1';
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index aaad52684f5..f7a2026903d 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -933,7 +933,7 @@ if (!GETPOST('action', 'aZ09')) {
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}
-	$limit = GETPOSTINT('limit', $conf->liste_limit);
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$offset = $limit * $page;
 
 	if (!$sortorder) {
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index fe74afe765e..9af72aa1a1f 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -61,7 +61,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits";
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 9d26c07560a..7243c91f3c3 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -54,7 +54,7 @@ $search_account = GETPOSTINT('search_account');
 $search_amount = GETPOST('search_amount', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 7cf396f7573..12c2ec797d8 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -69,7 +69,7 @@ $search_status = GETPOST('search_status', 'intcomma');
 $search_sale = GETPOSTINT('search_sale');
 
 $mode = GETPOST('mode', 'alpha');
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 65224c37557..7a79d37cc5c 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -35,7 +35,7 @@ if ($user->socid > 0) {
 }
 
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 6c5fb010347..c9f2401513b 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -45,7 +45,7 @@ $type = GETPOST('type', 'aZ09');
 $date_trans = dol_mktime(GETPOSTINT('date_transhour'), GETPOSTINT('date_transmin'), GETPOSTINT('date_transsec'), GETPOSTINT('date_transmonth'), GETPOSTINT('date_transday'), GETPOSTINT('date_transyear'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 71b138cc0a6..a6b326ac456 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -55,7 +55,7 @@ $format = GETPOST('format', 'aZ09');
 $id_bankaccount = GETPOSTINT('id_bankaccount');
 $executiondate = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 7a96f2a55ee..0829b4cc8ec 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -51,7 +51,7 @@ $search_facture = GETPOST('search_facture', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index dba7583f807..1fe40efa05e 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -45,7 +45,7 @@ $userid = GETPOSTINT('userid');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 38f11895988..febb51cdc1d 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -51,7 +51,7 @@ $ref = GETPOST('ref', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 272afb1db8c..b0fadbafd1b 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -41,7 +41,7 @@ $ref = GETPOST('ref', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 9d8f837c49c..96d9a2d6b2c 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -43,7 +43,7 @@ $socid = GETPOSTINT('socid');
 
 $type = GETPOST('type', 'aZ09');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 2d36e8841e5..c21f88d2157 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index e6cd1d4de5b..b6dd673f37f 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -45,7 +45,7 @@ $mode = GETPOST('mode', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 11a0d643178..88d1f736422 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 80c5329621a..bff81de3bda 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -52,7 +52,7 @@ if ($id > 0) {
 $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index bc3561828b3..c300817bfa4 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -54,7 +54,7 @@ $date_endday = GETPOSTINT('date_endday');
 $date_endyear = GETPOSTINT('date_endyear');
 $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes';
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 2c62883915e..0666335cc4d 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -47,7 +47,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index b63b09d7f0a..5f07abd308a 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -75,7 +75,7 @@ $search_users = GETPOST('search_users');
 $search_type = GETPOSTINT('search_type');
 $search_account = GETPOSTINT('search_account');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index fe1bc5a7d6b..b97882242e3 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -54,7 +54,7 @@ $year = GETPOSTINT("year");
 $search_sc_type = GETPOSTINT('search_sc_type');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index d4b41aa5249..b9cf49d5dff 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index fede497b7a8..573c3d50289 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -62,7 +62,7 @@ $search_account				= GETPOSTINT('search_account');
 $search_amount 				= GETPOST('search_amount', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield					= GETPOST('sortfield', 'aZ09comma');
 $sortorder					= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index c9a9668ae38..fbcb057a859 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -47,7 +47,7 @@ if (!$year && $mode != 'tvaonly') {
 	$year = date("Y", time());
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 7188c6eb668..af06f40761f 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -92,7 +92,7 @@ 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 = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 203a8aaf028..66067b00e6e 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -49,7 +49,7 @@ if (empty($object->thirdparty)) {
 $socid = !empty($object->thirdparty->id) ? $object->thirdparty->id : null;
 
 // Sort & Order fields
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 00617077be4..1a98fb921fa 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -53,7 +53,7 @@ if (!empty($canvas)) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index cca4a38cf05..d391b2e8d4b 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -135,7 +135,7 @@ $userid = GETPOSTINT('userid');
 $begin = GETPOST('begin');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 7647e8d2679..848f1a088d7 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -63,7 +63,7 @@ $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($id) ? 'rowid' : 'ref');
 $result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype);
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 099b7bb90d3..6f19a21fa69 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -53,7 +53,7 @@ if ($user->socid > 0) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 7d1f21a7926..a9c49bbeaab 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -108,7 +108,7 @@ $search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php
index 8816149370c..8f3e5fac95e 100644
--- a/htdocs/contrat/messaging.php
+++ b/htdocs/contrat/messaging.php
@@ -56,7 +56,7 @@ $confirm	= GETPOST('confirm', 'alpha');
 $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index e92610d95b2..a2542669485 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -44,7 +44,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index b25028383a3..3fbd13840c2 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -53,7 +53,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$urlsource = GETPOST("urlsource", 'alpha');
 	$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-	$limit = GETPOSTINT('limit', $conf->liste_limit);
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST("sortfield", 'aZ09comma');
 	$sortorder = GETPOST("sortorder", 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 325d31660c5..02b795734af 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -55,7 +55,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	$search_graph = GETPOST('search_graph', 'restricthtml');
 
 	// Load variable for pagination
-	$limit = GETPOSTINT('limit', $conf->liste_limit);
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 0c85045a527..e6d6645d8b2 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -178,7 +178,7 @@ class pdf_standard extends ModelePDFMovement
 		$search_qty = trim(GETPOST("search_qty"));
 		$search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-		$limit = GETPOSTINT('limit', $conf->liste_limit);
+		$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 		$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 		$sortfield = GETPOST('sortfield', 'aZ09comma');
 		$sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 0d3aa74ef87..4e14d503f1e 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -43,7 +43,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'cr
 
 $id = GETPOSTINT('id');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 882c08c35e1..4176ac74d7a 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -50,7 +50,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $projectid = (GETPOST('projectid') ? GETPOSTINT('projectid') : 0);
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 780982f3c7b..13ffaf15511 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -39,7 +39,7 @@ $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; //
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 666f3b8983b..b314131ca5b 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -58,7 +58,7 @@ $search_amount = GETPOST("search_amount", 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 $search_sale = GETPOSTINT('search_sale');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index b38f9adc5bb..ad2b5b387c3 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -67,7 +67,7 @@ if ($module == 'ecm') {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 72d8e592524..7444815a11e 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -47,7 +47,7 @@ if (empty($module)) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 48e9b0783e8..a2551c18932 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -46,7 +46,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index ccb3b23a586..580f8ab03dd 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -50,7 +50,7 @@ if ($user->socid > 0) {
 
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 0e2b6e23ad1..e0c191e8e23 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -45,7 +45,7 @@ if (!$section) {
 $section_dir = GETPOST('section_dir', 'alpha');
 $overwritefile = GETPOSTINT('overwritefile');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 88114234ba9..7a0338a0126 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -47,7 +47,7 @@ $section_dir = GETPOST('section_dir', 'alpha');
 
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 771a07d4fd6..c59cab0c059 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -54,7 +54,7 @@ if (empty($action) && $file_manager) {
 }
 $pageid  = GETPOSTINT('pageid');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index a9c4e766170..202ea14afb7 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -59,7 +59,7 @@ if (empty($module)) {
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 3d42c4da2a6..da8471988d9 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -53,7 +53,7 @@ $ref = GETPOST('ref', 'alpha');
 $withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index a8c390bdc46..b340622595f 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -58,7 +58,7 @@ $projectid = GETPOSTINT('projectid');
 $projectref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 38f8bfabfa7..93ae78eeeb2 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -66,7 +66,7 @@ $projectid = $fk_project;
 $withProjectUrl = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 98e99a9e935..d34d4b0a72d 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -47,7 +47,7 @@ $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 597ae8a3e2d..a71b364cdac 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -73,7 +73,7 @@ $search_sale = GETPOSTINT('search_sale');
 $search_categ_cus = GETPOSTINT("search_categ_cus");
 $search_product_category = GETPOSTINT('search_product_category');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 272a930ae51..c28c5251dc1 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -46,7 +46,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 0a38650a94b..016fbfee019 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'expensereport', '', '');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -64,7 +64,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.date_create";
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index f17ad86e3b8..c1f474af0db 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -73,7 +73,7 @@ $search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOSTINT('search_bank_account');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
 $sortorder				= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
index 4818eab1e30..e348b888d55 100644
--- a/htdocs/fichinter/agenda.php
+++ b/htdocs/fichinter/agenda.php
@@ -51,7 +51,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 1e96ac2dbf0..4c71562da9b 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -70,7 +70,7 @@ if ($action == "create" || $action == "add") {
 $result = restrictedArea($user, 'ficheinter', $id, $objecttype);
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index a0e1de536bb..5ec97fd1908 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 2c7ed215649..20878a34e16 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -82,7 +82,7 @@ $socid = GETPOSTINT('socid');
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 2fda338005f..56320809feb 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -48,7 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 836adf8d82a..2f80fe4ba45 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -43,7 +43,7 @@ $id     = GETPOSTINT('id');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTINT("page");
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 209f12ca1bc..1bab50ecddd 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -134,7 +134,7 @@ if (GETPOSTISARRAY('search_status')) {
 
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 20427747739..0be5b7bb135 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,7 +41,7 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
@@ -57,7 +57,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "p.name";
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index dd6a607e309..a5dc3d0eba1 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -55,7 +55,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicetemplatelist'; // To manage different context of search
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index f192143b784..ea6fe3335d0 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 $hookmanager->initHooks(array('invoicesuppliercarddocument'));
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 3739dec898d..62531e8a569 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -96,7 +96,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 7182aa7e6aa..642b4612358 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -113,7 +113,7 @@ if ($option == 'late') {
 $filter = GETPOST('filtre', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index b7819d25c65..db152d3eb47 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -60,7 +60,7 @@ if ($user->socid) {
 $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 5ff2340f5c4..aa328d13024 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -68,7 +68,7 @@ $search_bank_account	= GETPOSTINT('search_bank_account');
 $search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 $search_sale            = GETPOSTINT('search_sale');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
 $sortorder				= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index a8e48814757..5549f799ddd 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -46,7 +46,7 @@ $type = GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index f48bade81d3..0d3bf9a9496 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -54,7 +54,7 @@ $confirm = GETPOST('confirm');
 $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index cae68a15387..4b8c0974eef 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -45,7 +45,7 @@ $search_name = GETPOST('search_name', 'alpha');
 $search_supervisor = GETPOSTINT('search_supervisor');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index d192e12a0d9..43fe279c57d 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -46,7 +46,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 69dd8dca0e5..a4eaae03a85 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -66,7 +66,7 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user-
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index d2779c6afbd..ac042253777 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -60,7 +60,7 @@ $search_prev_solde  = GETPOST('search_prev_solde', 'alphanohtml');
 $search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 5172bbdbb64..5dacecd2c3c 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -60,7 +60,7 @@ if (empty($page) || $page == -1) {
 	$page = 0;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index f0782602f3a..2d9ebbd1968 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -46,7 +46,7 @@ if (GETPOST('actioncode', 'array')) {
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 20878b3baa5..4507ba5764f 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index 98c2d76abc6..a83905abff9 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -47,7 +47,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 9183e9ebb7c..20b8ee4359c 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -58,7 +58,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index bcd660e1e3e..6fffa6934e4 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -56,7 +56,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index 93caa6ea5f1..2155f033088 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -45,7 +45,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 61746b905bb..9191162e979 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -57,7 +57,7 @@ $mode        = GETPOST('mode', 'alpha'); // for view result with other mode
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index 8fb7658592c..49f269d8efa 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 49b0b0f377c..539a8405f4a 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -46,7 +46,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index db440929e61..4b9666e4c79 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -57,7 +57,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index 87dd58e6d17..a469ded4cf9 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -58,7 +58,7 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Get Parameters for Pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index dcf776c785c..418208e0465 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -46,7 +46,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get Parameters for Pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 33da365b16a..ea155ac684f 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -58,7 +58,7 @@ $mode        = GETPOST('mode', 'alpha'); // for mode view result
 $id         = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 7fa4b76f300..3611ae2c51e 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -46,7 +46,7 @@ $type = GETPOSTINT("type");
 
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index dfaa6017361..4ed3b95b63b 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 6c8e8f79d60..fa4d8f75ed7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -42,7 +42,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 6aef8a1fab0..f2ee512c004 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -57,7 +57,7 @@ if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryKnowledgemanagementOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 7552629c216..74b96bf0877 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'loan', $id, '', '');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 313c33aed3a..013c41e3cce 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 37bb3631adb..bd47dd65d95 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 5ff62d28783..5cdee16619b 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -40,7 +40,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index cae41a5a0b0..b81567d7b09 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 87997aac856..e6837605980 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -43,7 +43,7 @@ $socid = 0;
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index e0476034c86..a921bebd8c2 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -43,7 +43,7 @@ if (!empty($user->socid)) {
 
 $object = new Product($db);
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index aeea537069f..83b646baf29 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -35,7 +35,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 6222cab47f5..c7aca98e383 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -80,10 +80,8 @@ if (!$res) {
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
 // load module libraries
 require_once __DIR__.'/class/myobject.class.php';
-
 // for other modules
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
@@ -106,7 +104,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index c374a60caf6..6afe0f35686 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -44,7 +44,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 5e2f38d27ea..c88168ed1b9 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -53,7 +53,7 @@ $mode = GETPOST('mode', 'alpha');
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 3abc698c73d..bab5f6aa68f 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -67,7 +67,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $page  = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 63ee37732df..836b3de06de 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -60,7 +60,7 @@ $dateinput 			= dol_mktime(0, 0, 0, GETPOSTINT('dateinputmonth'), GETPOSTINT('da
 $rateinput 			= (float) price2num(GETPOST('rateinput', 'alpha'));
 $rateindirectinput 	= (float) price2num(GETPOST('rateinidirectinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield 			= GETPOST('sortfield', 'aZ09comma');
 $sortorder 			= GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index d6f482bcfb4..e1cb682ea33 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -48,7 +48,7 @@ $search_title = GETPOST('search_title', 'alpha');
 $search_status = GETPOST('search_status', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 45d408ad992..851809edb21 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index efba17da602..3b9e46c9639 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -42,7 +42,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 0c284bbbabb..327b8e7988e 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -55,7 +55,7 @@ $id = GETPOSTINT('id');
 $socid = GETPOSTINT('socid');
 $memberid = GETPOSTINT('rowid');
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index a5ecc5eba25..9a11c59abd1 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -56,7 +56,7 @@ if ($user->socid) {
 	$id = $user->socid;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 4a0ded165aa..1435fa74b3a 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -62,7 +62,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 43e60b6380e..f9fcdab2709 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -81,7 +81,7 @@ if (!$user->hasRight('fournisseur', 'lire') && (!isModEnabled('margin') && !$use
 	accessforbidden();
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTINT("page") ? GETPOSTINT("page") : 0;
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 3a6dd855543..d9ff6026f0d 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -46,7 +46,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 3fa6350b70b..7d387457b23 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -118,7 +118,7 @@ if (isModEnabled('variants')) {
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index afed89383a6..0af9c8052ae 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -45,7 +45,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 744e2070d75..0ece26ed6d8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1950,7 +1950,7 @@ if ((!getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || $action == 'showlog_defau
 if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$prodcustprice = new ProductCustomerPrice($db);
 
-	$limit = GETPOSTINT('limit', $conf->liste_limit);
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = (GETPOSTINT("page") ? GETPOSTINT("page") : 0);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index d7e0873640d..32d15a43939 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -62,7 +62,7 @@ if (!$sortfield) {
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index d51bc17fd33..07873e790ad 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -63,7 +63,7 @@ $sbarcode = GETPOSTINT("sbarcode");
 $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 4cf895bc6d1..73714afa21c 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -50,7 +50,7 @@ $mesg = '';
 $option = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index e1033a1be70..8c9dbd7830b 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -50,7 +50,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatsorder'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 4a77c722232..e91555cea67 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -50,7 +50,7 @@ $hookmanager->initHooks(array('productstatssupplierorder'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 69e5deb5091..6712ac33185 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -46,7 +46,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatscontract'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 0f5d69c1f54..c44e95eae64 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -58,7 +58,7 @@ $search_array_options = $extrafields->getOptionalsFromPost('facture', '', 'searc
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 097854f7d86..2ee2e18b793 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -50,7 +50,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index ac925af5d0a..83d66963e51 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatsinvoice'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 4ee8efa0a44..d98a73fbc79 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 8064f28bc67..9e6084f78c5 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -50,7 +50,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 $hookmanager->initHooks(array('productstatspropal'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index c284b3cdcae..5c755024acd 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -49,7 +49,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierpropal'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 1e03967e658..c812e507035 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -58,7 +58,7 @@ $socid = GETPOSTINT('socid');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 5e2fc05a1ea..787cc14f779 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -60,7 +60,7 @@ if (isModEnabled('category')) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 84f72eba7ab..88b51aa78ab 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -61,7 +61,7 @@ $qty = GETPOST('qty');
 $idline = GETPOST('idline');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 09471b2a62f..eae9deb3ef0 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -75,7 +75,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOSTINT('search_type_mouvement');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 593265f9d69..9a054d18375 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -92,7 +92,7 @@ $search_fk_project = GETPOSTINT("search_fk_project");
 $type = GETPOSTINT("type");
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 73e1409454a..3adc9370df5 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -60,7 +60,7 @@ $result = restrictedArea($user, 'produit|service');
 $hookmanager->initHooks(array('productlotdocuments'));
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 6d690d79a61..bd1733bdf81 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -53,7 +53,7 @@ $search_fk_user_modif = GETPOSTINT('search_fk_user_modif');
 $search_import_key = GETPOSTINT('search_import_key');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 86e1e56d4e8..24e9d0d8a10 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -93,7 +93,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$sortfield) {
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 4464df16e43..724eeed763c 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -53,7 +53,7 @@ $search_dateday = GETPOSTINT('search_dateday');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index 4a29bb0d44c..7f362de5f01 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatssupplierorder'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index a1f617a7564..b3c30f5ce68 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsexpedition'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index e2ddd4be7d7..96699d17d92 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -49,7 +49,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('batchproductstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index f70b1257b64..ced528e301d 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsreception'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 38cd13eae64..6b39de66295 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -89,7 +89,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTI
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortfield) {
 	$sortfield = 'p.ref';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index 2e8eccf995b..9f328000513 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index dc22e5feb22..7e851677dc1 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 21af23d7c01..d798b7556ac 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -48,7 +48,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index b61104011c4..259f139a177 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -49,7 +49,7 @@ $page = $_GET["page"];
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php
index 712591c5ab9..d06cde2a04b 100644
--- a/htdocs/projet/agenda.php
+++ b/htdocs/projet/agenda.php
@@ -38,7 +38,7 @@ $socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 3e331514cf8..4e0f40d0127 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -75,7 +75,7 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php
index eca28d7716e..ea2ff3e7a89 100644
--- a/htdocs/projet/messaging.php
+++ b/htdocs/projet/messaging.php
@@ -38,7 +38,7 @@ $socid  = GETPOSTINT('socid');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index e7d135dff47..23aac791656 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -54,7 +54,7 @@ $ref = GETPOST('ref', 'alpha');
 $taskref = GETPOST('taskref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index f2ed23cf8c1..7507cafa4b3 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -46,7 +46,7 @@ $withproject = GETPOSTINT('withproject');
 $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 25ad71ae6fb..a7a5c47d757 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -124,7 +124,7 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 42feefa9537..c48a6f296cc 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -93,7 +93,7 @@ $search_timespent_startmin = GETPOSTINT("search_timespent_duration_startmin");
 $search_timespent_endhour = GETPOSTINT("search_timespent_duration_endhour");
 $search_timespent_endmin = GETPOSTINT("search_timespent_duration_endmin");
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 1ec6c775697..1401d22b82a 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -86,7 +86,7 @@ function llxFooterVierge()
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 310d3f46ca4..772245f3d51 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -53,7 +53,7 @@ $backtopage = '';
 $suffix = "";
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index c10fad87770..bcd27f58b18 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -54,7 +54,7 @@ $backtopage = '';
 $suffix = "";
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index 06647afbefd..36d9a6efb15 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -49,7 +49,7 @@ $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 85c7bf13468..f6242c6ee14 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -79,7 +79,7 @@ $search_billed = GETPOSTINT("search_billed");
 $search_status = GETPOST('search_status', 'intcomma');
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 2e4e9b6cb65..a8339a0ca7b 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 71b7faa3320..741e0107a45 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 090bc1d3319..56c05ffdb56 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -50,7 +50,7 @@ $mode = GETPOST('mode', 'aZ');
 $lineid = GETPOSTINT('lineid');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index dbee1f831d2..665f26bc75d 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -53,7 +53,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index f2d7d85f014..11e4fe7bb62 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -41,7 +41,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index fea96969637..bf62f0beb62 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -46,7 +46,7 @@ $mode       = GETPOST('mode', 'aZ');
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 0325ac771db..61c17c3a66c 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -58,7 +58,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index f3e9bd78747..9bf219dfcec 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -52,7 +52,7 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 5996e04269e..297da859f33 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -54,7 +54,7 @@ $label = GETPOST('label', 'alphanohtml');
 $projectid = (GETPOSTINT('projectid') ? GETPOSTINT('projectid') : GETPOSTINT('fk_project'));
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index b0ceffba2e1..7af81d47d6e 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 6493e5afbf4..fc659db2e1b 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -50,7 +50,7 @@ $mode       = GETPOST('mode', 'alpha'); // mode view for result
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 8ada8019d41..be5ed78293e 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index cff729e2c56..1d780599f2d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -152,7 +152,7 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index 6046c57e4e3..b1275bfcdfe 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index e56db09f24d..0e0031e6f9c 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -45,7 +45,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', '', '');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index a502b62dc97..55d0091a80b 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -261,7 +261,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$limit = GETPOSTINT('limit', $conf->liste_limit);
+	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 	if (empty($page) || $page == -1) {
 		$page = 0;
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 2dc86bde8a7..4411b7a1c37 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -43,7 +43,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 27c71219ce1..29484d9773d 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -54,7 +54,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 6d11a56bcbe..947fccafdb3 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -41,7 +41,7 @@ if ($user->socid) {
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index bd9c64bf763..0abc7a5063d 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -41,7 +41,7 @@ if ($user->socid) {
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index f73c584b24c..bdca6980414 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -41,7 +41,7 @@ if ($user->socid) {
 }
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index d24c6ec2836..650d89ffdc5 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -52,7 +52,7 @@ if (!empty($user->socid)) {
 $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 9e5b2591fb2..c34a60b581b 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -106,7 +106,7 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all'
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 8c5d10fae70..74cb95e87d5 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -49,7 +49,7 @@ $action   = GETPOST('action', 'aZ09');
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/agenda.php';
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 27d154a84ff..12ec2a2d953 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -53,7 +53,7 @@ $confirm  = GETPOST('confirm', 'alpha');
 $url_page_current = DOL_URL_ROOT.'/ticket/document.php';
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 18709719ee1..4ccef134ea0 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -72,7 +72,7 @@ $search_dateclose_end = dol_mktime(23, 59, 59, GETPOSTINT('search_dateclose_endm
 
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 09943ada8e1..98fb7551fe1 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -49,7 +49,7 @@ $action   = GETPOST('action', 'aZ09');
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/messaging.php';
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index a6f4f4d2ac9..229c299a2e7 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -52,7 +52,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index e97be6a29ce..1c1f0895d46 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -82,7 +82,7 @@ if ($user->id != $id && !$canreaduser) {
 }
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index ffbd73b3fe6..f491bdad587 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -48,7 +48,7 @@ $search_group = GETPOST('search_group');
 $search = array();
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 10ea9a10b2f..e55dc5ea1bc 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -54,7 +54,7 @@ if ($user->socid > 0) {
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php
index be82eb01403..319a00e9f5e 100644
--- a/htdocs/user/messaging.php
+++ b/htdocs/user/messaging.php
@@ -56,7 +56,7 @@ $ref = GETPOST('ref', 'alpha');
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 292c48b6645..240723c47c8 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -45,7 +45,7 @@ if (!isset($id) || empty($id)) {
 $action = GETPOST('action', 'aZ09');
 $actionid = GETPOSTINT('actionid');
 
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 71cbbdba5ea..0bee01ba154 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -44,7 +44,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index f5fe7899a18..2a119373a51 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -54,7 +54,7 @@ if (empty($mode)) {
 $id = GETPOSTINT('id');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d1e82ffc3e7..74c43d54e48 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -143,7 +143,7 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 }
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index a3db02f9841..4e6853596bc 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -56,7 +56,7 @@ $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index c08bc1fecad..e1b891da1ce 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -44,7 +44,7 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
 $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 54d269d561f..2d1e9d9fefc 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -51,7 +51,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOSTINT('limit', $conf->liste_limit);
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");

From e15f243e95fdaf09a4cc9b559c4df2329f694a88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 11:51:32 +0100
Subject: [PATCH 1575/1862] Clean code - Remove a deprecated tag that should
 not exists.

---
 htdocs/comm/propal/class/propal.class.php     | 130 ------------------
 htdocs/commande/class/commande.class.php      |   1 -
 htdocs/compta/facture/class/facture.class.php |   1 -
 3 files changed, 132 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 2950d5d2248..69d3e5b59c9 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2461,136 +2461,6 @@ class Propal extends CommonObject
 		return -1;
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Set an overall discount on the proposal
-	 *
-	 *	@param      User	$user       Object user that modify
-	 *	@param      double	$remise     Amount discount
-	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         		Return integer <0 if ko, >0 if ok
-	 *	@deprecated remise_percent is a deprecated field for object parent
-	 */
-	/*
-	public function set_remise_percent($user, $remise, $notrigger = 0)
-	{
-		// phpcs:enable
-		$remise = trim($remise) ?trim($remise) : 0;
-
-		if ($user->hasRight('propal', 'creer')) {
-			$remise = price2num($remise, 2);
-
-			$error = 0;
-
-			$this->db->begin();
-
-			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".((float) $remise);
-			$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = ".self::STATUS_DRAFT;
-
-			dol_syslog(__METHOD__, LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$this->errors[] = $this->db->error();
-				$error++;
-			}
-
-			if (!$error) {
-				$this->oldcopy = clone $this;
-				$this->remise_percent = $remise;
-				$this->update_price(1);
-			}
-
-			if (!$notrigger && empty($error)) {
-				// Call trigger
-				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-
-			if (!$error) {
-				$this->db->commit();
-				return 1;
-			} else {
-				foreach ($this->errors as $errmsg) {
-					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-				}
-				$this->db->rollback();
-				return -1 * $error;
-			}
-		}
-
-		return -1;
-	}
-	*/
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Set an absolute overall discount on the proposal
-	 *
-	 *	@param      User	$user       Object user that modify
-	 *	@param      double	$remise     Amount discount
-	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         		Return integer <0 if ko, >0 if ok
-	 */
-	/*
-	public function set_remise_absolue($user, $remise, $notrigger = 0)
-	{
-		// phpcs:enable
-		if (empty($remise)) {
-			$remise = 0;
-		}
-		$remise = price2num($remise);
-
-		if ($user->hasRight('propal', 'creer')) {
-			$error = 0;
-
-			$this->db->begin();
-
-			$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-			$sql .= " SET remise_absolue = ".((float) $remise);
-			$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = ".self::STATUS_DRAFT;
-
-			dol_syslog(__METHOD__, LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$this->errors[] = $this->db->error();
-				$error++;
-			}
-
-			if (!$error) {
-				$this->oldcopy = clone $this;
-				$this->update_price(1);
-			}
-
-			if (!$notrigger && empty($error)) {
-				// Call trigger
-				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-
-			if (!$error) {
-				$this->db->commit();
-				return 1;
-			} else {
-				foreach ($this->errors as $errmsg) {
-					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-				}
-				$this->db->rollback();
-				return -1 * $error;
-			}
-		}
-
-		return -1;
-	}
-	*/
-
 
 	/**
 	 *	Reopen the commercial proposal
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8d67611ad20..b03fe2ae009 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2445,7 +2445,6 @@ class Commande extends CommonOrder
 	 * 	@param     	float		$remise		Discount (percent)
 	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 					Return integer <0 if KO, >0 if OK
-	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 55c89240fa8..c161836279c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4424,7 +4424,6 @@ class Facture extends CommonInvoice
 	 *	@param     	float	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 				Return integer <0 if KO, >0 if OK
-	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{

From 09b89903ca19962692d6ec2fc3dc646f50001cb3 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 11:52:04 +0100
Subject: [PATCH 1576/1862] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3cc208d270d..52921b28c80 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -142,7 +142,9 @@ if ($socid > 0) {
 }
 
 if (!($object->id > 0) && $action == 'view') {
-	recordNotFound();
+	$langs->load("errors");
+	print($langs->trans('ErrorRecordNotFound'));
+	exit;
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)

From a516b920405aa1a583a56f46b6cf39cf6c40f238 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:02:33 +0100
Subject: [PATCH 1577/1862] Update card.php with new function record not found

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 52921b28c80..3cc208d270d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -142,9 +142,7 @@ if ($socid > 0) {
 }
 
 if (!($object->id > 0) && $action == 'view') {
-	$langs->load("errors");
-	print($langs->trans('ErrorRecordNotFound'));
-	exit;
+	recordNotFound();
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)

From 44ff048881bf37415eea1f34346df078ba9428a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 12:20:51 +0100
Subject: [PATCH 1578/1862] Exclude false positive

---
 htdocs/core/triggers/interface_80_modStripe_Stripe.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index d42c2c92264..5dc15c83cce 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -226,6 +226,7 @@ class InterfaceStripe extends DolibarrTriggers
 						dol_syslog("We got the customer, so now we update the credit card", LOG_DEBUG);
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
+							// @phan-suppress-next-line PhanTypeMismatchPropertyProbablyReal
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save();

From a72d772c617a1e8a73c8ed455eadb721a913a674 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:24:13 +0100
Subject: [PATCH 1579/1862] Update card.php


From 62827c14e653a8855ba74b31148204ac158d6293 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 12:28:15 +0100
Subject: [PATCH 1580/1862] Fix "Class KnowledgeManagement constructor invoked
 with 1 parameter, 0 required"

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 7356f5a329d..0bf98789a80 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -94,7 +94,7 @@ if ($action == 'updateMask') {
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$className = $myTmpObjects['class'];
+		$className = $myTmpObjects[$tmpobjectkey]['class'];
 		$tmpobject = new $className($db);
 		$tmpobject->initAsSpecimen();
 
@@ -412,7 +412,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 								print '</td>';
 
-								$mytmpinstance = new $myTmpObjectKey($db);
+								$className = $myTmpObjectArray['class'];
+								$mytmpinstance = new $className($db);
 								$mytmpinstance->initAsSpecimen();
 
 								// Info

From efd11891cc4e7586877709cdb2ae3b54de26bd6c Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:43:52 +0100
Subject: [PATCH 1581/1862] Update card.php


From 62e3d499d68729aff9915cd96e5bff636b882664 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:47:35 +0100
Subject: [PATCH 1582/1862] Update knowledgemanagement.php

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index c3b7a4be39c..9e0b93c022b 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -95,7 +95,7 @@ if ($action == 'updateMask') {
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject = new $tmpobjectkey();
 		$tmpobject->initAsSpecimen();
 
 		// Search template files

From ee481d7dd0c7f13f276e9948e65a3ac1f011eaaa Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:49:01 +0100
Subject: [PATCH 1583/1862] Update knowledgemanagement.php

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 9e0b93c022b..c3b7a4be39c 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -95,7 +95,7 @@ if ($action == 'updateMask') {
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey();
+		$tmpobject = new $tmpobjectkey($db);
 		$tmpobject->initAsSpecimen();
 
 		// Search template files

From 2b0a789289e050c1bb1b3f571672b095fe1f1888 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 12:49:42 +0100
Subject: [PATCH 1584/1862] Fix translation

---
 htdocs/ai/admin/custom_prompt.php   |  4 ++--
 htdocs/ai/admin/setup.php           |  3 ---
 htdocs/ai/ajax/generate_content.php | 10 +++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 628b3adf568..5836a0d5b26 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -159,10 +159,10 @@ if ($action == 'confirm_deleteproperty' && GETPOST('confirm') == 'yes') {
 		$res = dolibarr_set_const($db, 'AI_CONFIGURATIONS_PROMPT', $newConfigurationsJson, 'chaine', 0, '', $conf->entity);
 		if ($res) {
 			header("Location: ".$_SERVER['PHP_SELF']);
-			setEventMessages($langs->trans("SetupDeleted"), null, 'mesgs');
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			exit;
 		} else {
-			setEventMessages($langs->trans("ErrorDeleting"), null, 'errors');
+			setEventMessages($langs->trans("NoRecordDeleted"), null, 'errors');
 		}
 	}
 }
diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index 02ecda6a727..a2bb8f77a23 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -173,9 +173,6 @@ print load_fiche_titre($langs->trans($title), $linkback, 'title_setup');
 $head = aiAdminPrepareHead();
 print dol_get_fiche_head($head, 'settings', $langs->trans($title), -1, "fa-microchip");
 
-// Setup page goes here
-//echo '<span class="opacitymedium">'.$langs->trans("AiSetupPage").'</span><br><br>';
-
 
 if ($action == 'edit') {
 	print $formSetup->generateOutput(true);
diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index 11aaa3e787b..bba1402d340 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -68,12 +68,12 @@ $format = empty($jsonData['instructions']) ? '' : $jsonData['instructions'];
 $generatedContent = $ai->generateContent($instructions, 'auto', $function, $format);
 
 if (is_array($generatedContent) && $generatedContent['error']) {
-	// client errors
-	if ($generatedContent['code'] >= 400) {
-		print "Error : " . $generatedContent['message'];
-		print '<br><a href="'.DOL_MAIN_URL_ROOT.'/ai/admin/setup.php">'.$langs->trans('Check Config of Module').'</a>';
-	} elseif ($generatedContent['code'] == 429) {
+	// Output error
+	if ($generatedContent['code'] == 429) {
 		print "Quota or allowed period exceeded. Retry Later !";
+	} elseif ($generatedContent['code'] >= 400) {
+		print "Error : " . $generatedContent['message'];
+		print '<br><a href="'.DOL_MAIN_URL_ROOT.'/ai/admin/setup.php">'.$langs->trans('ErrorGoToModuleSetup').'</a>';
 	} else {
 		print "Error returned by API call: " . $generatedContent['message'];
 	}

From 582424c607d275134688c45a4a17b65713586a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 13:09:25 +0100
Subject: [PATCH 1585/1862] fix knowledgerecord

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 0bf98789a80..10ee2610079 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,7 @@ global $langs, $user;
 // Libraries
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/knowledgemanagement/lib/knowledgemanagement.lib.php";
+require_once DOL_DOCUMENT_ROOT."/knowledgemanagement/class/knowledgerecord.class.php";
 
 // Translations
 $langs->loadLangs(array("admin", "knowledgemanagement"));
@@ -64,7 +66,7 @@ if (!$user->admin) {
 $moduledir = 'knowledgemanagement';
 $myTmpObjects = array();
 // TODO Scan list of objects to fill this array
-$myTmpObjects['knowledgemanagement'] = array('label' => 'KnowledgeManagement', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'KnowledgeManagement');
+$myTmpObjects['knowledgemanagement'] = array('label' => 'KnowledgeManagement', 'includerefgeneration' => 1, 'includedocgeneration' => 0, 'class' => 'KnowledgeRecord');
 
 
 /*
@@ -366,7 +368,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 				$handle = opendir($dir);
 				if (is_resource($handle)) {
 					while (($file = readdir($handle)) !== false) {
-						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectArray['class']).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 							$file = substr($file, 0, dol_strlen($file) - 4);
 
 							require_once $dir.'/'.$file.'.php';

From f61c97bd9a248bf871ffa75e359138906908ba79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 13:20:36 +0100
Subject: [PATCH 1586/1862] fix knowledgerecord

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 10ee2610079..42522dc3eb7 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -76,11 +76,11 @@ $myTmpObjects['knowledgemanagement'] = array('label' => 'KnowledgeManagement', '
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'aZ09');
-	$maskorder = GETPOST('maskorder', 'alpha');
+	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskdata = GETPOST('maskKnowledgeRecord', 'alpha');
 
 	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
-		$res = dolibarr_set_const($db, $maskconst, $maskorder, 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, $maskconst, $maskdata, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
 		}

From eee807e7d3e9a86205821fd110ee75374935425a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 13:23:30 +0100
Subject: [PATCH 1587/1862] fix knowledgerecord

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 42522dc3eb7..2bfcd6efdd7 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -76,7 +76,7 @@ $myTmpObjects['knowledgemanagement'] = array('label' => 'KnowledgeManagement', '
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskconst = GETPOST('maskconst', 'aZ09');
 	$maskdata = GETPOST('maskKnowledgeRecord', 'alpha');
 
 	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {

From 13ab93969192c754a8c3413c56724f142cd6c6b3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 19:57:45 +0100
Subject: [PATCH 1588/1862] Fix deprecated function calls

---
 htdocs/adherents/vcard.php                    |   2 +
 htdocs/commande/class/commande.class.php      |   3 +-
 htdocs/commande/list_det.php                  |   3 +-
 htdocs/compta/facture/class/facture.class.php |   1 +
 htdocs/contact/vcard.php                      |   2 +
 htdocs/contrat/ticket.php                     |  61 ++++----
 .../class/commonnumrefgenerator.class.php     |   3 +-
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/core/class/html.formsetup.class.php    | 138 +++++++++---------
 .../modules/barcode/modules_barcode.class.php |   2 +-
 .../modules/product/modules_product.class.php |   5 +-
 .../modules/societe/modules_societe.class.php |   4 +-
 htdocs/dav/fileserver.php                     |   2 +-
 13 files changed, 121 insertions(+), 107 deletions(-)

diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index cd39e578045..56f82a7665d 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
  * Copyright (C) 2020-2021	Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -98,6 +99,7 @@ $v->setPhoneNumber($object->fax, "TYPE=WORK;FAX");
 $country = $object->country_code ? $object->country : '';
 
 $v->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK;POSTAL");
+// @phan-suppress-next-line PhanDeprecatedFunction  (setLabel is the old method, new is setAddress)
 $v->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
 
 $v->setEmail($object->email);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b03fe2ae009..8f89a1bb336 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2424,7 +2424,7 @@ class Commande extends CommonOrder
 	/**
 	 * 	Applique une remise relative
 	 *
-	 *  @deprecated
+	 *  @deprecated Use setDiscount() instead.
 	 *  @see setDiscount()
 	 * 	@param     	User		$user		User qui positionne la remise
 	 * 	@param     	float		$remise		Discount (percent)
@@ -2435,6 +2435,7 @@ class Commande extends CommonOrder
 	{
 		// phpcs:enable
 		dol_syslog(get_class($this)."::set_remise is deprecated, use setDiscount instead", LOG_NOTICE);
+		// @phan-suppress-next-line PhanDeprecatedFunction
 		return $this->setDiscount($user, $remise, $notrigger);
 	}
 
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 2adbd25a7d0..2046845b8db 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2023  Charlene Benke	        <charlene@patas-monkey.com>
  * Copyright (C) 2021-2023 	Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1107,7 +1108,7 @@ if ($resql) {
 	// Payment term
 	if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
+		print $form->getSelectConditionsPaiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
 		print '</td>';
 	}
 	// Payment mode
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c161836279c..9b3e6733698 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4414,6 +4414,7 @@ class Facture extends CommonInvoice
 	{
 		// phpcs:enable
 		dol_syslog(get_class($this)."::set_remise is deprecated, use setDiscount instead", LOG_NOTICE);
+		// @phan-suppress-next-line PhanDeprecatedFunction
 		return $this->setDiscount($user, $remise, $notrigger);
 	}
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index a8434eff2d9..08e8e248d7e 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -67,6 +68,7 @@ $v->setPhoneNumber($contact->fax, "TYPE=WORK;FAX");
 $country = $contact->country_code ? $contact->country : '';
 
 $v->setAddress("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK;POSTAL");
+// @phan-suppress-next-line PhanDeprecatedFunction setLabel applies the old method, setAddress is the new method.
 $v->setLabel("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK");
 
 $v->setEmail($contact->email);
diff --git a/htdocs/contrat/ticket.php b/htdocs/contrat/ticket.php
index 7c7cce00982..a4b37e28f71 100644
--- a/htdocs/contrat/ticket.php
+++ b/htdocs/contrat/ticket.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2023		Charlene BENKE		<charlene@patas-monkey.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -37,10 +38,10 @@ require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 
 $langs->loadLangs(array('companies', 'contracts', 'tickets'));
 
-$socid=GETPOSTINT('socid');
-$id=GETPOSTINT('id');
-$ref=GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
+$socid = GETPOSTINT('socid');
+$id = GETPOSTINT('id');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 if ($id == '' && $ref == '') {
 	dol_print_error(null, 'Bad parameter');
@@ -48,12 +49,12 @@ if ($id == '' && $ref == '') {
 }
 
 // Security check
-$socid=0;
+$socid = 0;
 if ($user->socid > 0) {
-	$socid=$user->socid;
+	$socid = $user->socid;
 }
 
-$result=restrictedArea($user, 'contrat', $id);
+$result = restrictedArea($user, 'contrat', $id);
 
 
 /*
@@ -63,25 +64,25 @@ $result=restrictedArea($user, 'contrat', $id);
 llxHeader("", $langs->trans("Tickets"), "Contrat");
 
 $form = new Form($db);
-$userstatic=new User($db);
+$userstatic = new User($db);
 
-$object= new Contrat($db);
-$result=$object->fetch($id, $ref);
-$ret=$object->fetch_thirdparty();
+$object = new Contrat($db);
+$result = $object->fetch($id, $ref);
+$ret = $object->fetch_thirdparty();
 $head = contract_prepare_head($object);
 
 
-dol_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract');
+dol_get_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid) ? '?socid='.$socid : '').'">';
-$linkback.= $langs->trans("BackToList").'</a>';
+$linkback .= $langs->trans("BackToList").'</a>';
 
-$morehtmlref='';
-$morehtmlref.=$object->ref;
+$morehtmlref = '';
+$morehtmlref .= $object->ref;
 
-$morehtmlref.='<div class="refidno">';
+$morehtmlref .= '<div class="refidno">';
 // Ref customer
-$morehtmlref.=$form->editfieldkey(
+$morehtmlref .= $form->editfieldkey(
 	"RefCustomer",
 	'ref_customer',
 	$object->ref_customer,
@@ -92,7 +93,7 @@ $morehtmlref.=$form->editfieldkey(
 	0,
 	1
 );
-$morehtmlref.=$form->editfieldval(
+$morehtmlref .= $form->editfieldval(
 	"RefCustomer",
 	'ref_customer',
 	$object->ref_customer,
@@ -106,8 +107,8 @@ $morehtmlref.=$form->editfieldval(
 	1
 );
 // Ref supplier
-$morehtmlref.='<br>';
-$morehtmlref.=$form->editfieldkey(
+$morehtmlref .= '<br>';
+$morehtmlref .= $form->editfieldkey(
 	"RefSupplier",
 	'ref_supplier',
 	$object->ref_supplier,
@@ -118,7 +119,7 @@ $morehtmlref.=$form->editfieldkey(
 	0,
 	1
 );
-$morehtmlref.=$form->editfieldval(
+$morehtmlref .= $form->editfieldval(
 	"RefSupplier",
 	'ref_supplier',
 	$object->ref_supplier,
@@ -132,25 +133,25 @@ $morehtmlref.=$form->editfieldval(
 	1
 );
 // Thirdparty
-$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+$morehtmlref .= '<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 // Project
 if (! empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 	$langs->load("projects");
-	$morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
+	$morehtmlref .= '<br>'.$langs->trans('Project') . ' : ';
 	if (! empty($object->fk_project)) {
 		$proj = new Project($db);
 		$proj->fetch($object->fk_project);
-		$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=';
-		$morehtmlref.=$object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-		$morehtmlref.=$proj->ref;
-		$morehtmlref.='</a>';
+		$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id=';
+		$morehtmlref .= $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+		$morehtmlref .= $proj->ref;
+		$morehtmlref .= '</a>';
 	} else {
-		$morehtmlref.='';
+		$morehtmlref .= '';
 	}
 }
-$morehtmlref.='</div>';
+$morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
@@ -161,7 +162,7 @@ print '<div class="underbanner clearboth"></div>';
  * Referrers types
  */
 
-$title=$langs->trans("ListTicketsLinkToContract");
+$title = $langs->trans("ListTicketsLinkToContract");
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/core/class/commonnumrefgenerator.class.php b/htdocs/core/class/commonnumrefgenerator.class.php
index 60104d09cd7..264a5417771 100644
--- a/htdocs/core/class/commonnumrefgenerator.class.php
+++ b/htdocs/core/class/commonnumrefgenerator.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -88,7 +89,7 @@ abstract class CommonNumRefGenerator
 	 *
 	 *  @param	Translate	$langs		Object langs
 	 *  @return string      			Model name
-	 *  @deprecated
+	 *  @deprecated Use getName() instead
 	 *  @see getName()
 	 */
 	public function getNom($langs)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a02c5eafa31..11b660adc40 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4321,7 +4321,7 @@ class Form
 	 *                                > 0 : force deposit percentage (for example, from company object)
 	 * @param int $noprint if set to one we return the html to print, if 0 (default) we print it
 	 * @return    void|string
-	 * @deprecated
+	 * @deprecated Use getSelectConditionsPaiements() instead and handle noprint locally.
 	 */
 	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1, $noprint = 0)
 	{
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 999603adf8a..f74ee4d124d 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2021  John BOTELLA    <john.botella@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -154,15 +155,15 @@ class FormSetup
 			return $hookmanager->resPrint;
 		} else {
 			$out = '<!-- Start generateOutput from FormSetup class  -->';
-			$out.= $this->htmlBeforeOutputForm;
+			$out .= $this->htmlBeforeOutputForm;
 
 			if ($editMode) {
-				$out.= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >';
+				$out .= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >';
 
 				// generate hidden values from $this->formHiddenInputs
 				if (!empty($this->formHiddenInputs) && is_array($this->formHiddenInputs)) {
 					foreach ($this->formHiddenInputs as $hiddenKey => $hiddenValue) {
-						$out.= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">';
+						$out .= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">';
 					}
 				}
 			}
@@ -180,7 +181,7 @@ class FormSetup
 				return $hookmanager->resPrint;
 			} elseif ($editMode) {
 				$out .= '<div class="form-setup-button-container center">'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes
-				$out.= $this->htmlOutputMoreButton;
+				$out .= $this->htmlOutputMoreButton;
 				$out .= '<input class="button button-save" type="submit" value="' . $this->langs->trans("Save") . '">'; // Todo fix dolibarr style for <button and use <button instead of input
 				/*$out .= ' &nbsp;&nbsp; ';
 				$out .= '<a class="button button-cancel" type="submit" href="' . $this->formAttributes['action'] . '">'.$this->langs->trans('Cancel').'</a>';
@@ -192,7 +193,7 @@ class FormSetup
 				$out .= '</form>';
 			}
 
-			$out.= $this->htmlAfterOutputForm;
+			$out .= $this->htmlAfterOutputForm;
 
 			return $out;
 		}
@@ -311,27 +312,27 @@ class FormSetup
 	public function generateLineOutput($item, $editMode = false)
 	{
 		$out = '';
-		if ($item->enabled==1) {
+		if ($item->enabled == 1) {
 			$trClass = 'oddeven';
 			if ($item->getType() == 'title') {
 				$trClass = 'liste_titre';
 			}
 
 			$this->setupNotEmpty++;
-			$out.= '<tr class="'.$trClass.'">';
+			$out .= '<tr class="'.$trClass.'">';
 
-			$out.= '<td class="col-setup-title">';
-			$out.= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
-			$out.= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
-			$out.= '</span>';
-			$out.= '</td>';
+			$out .= '<td class="col-setup-title">';
+			$out .= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
+			$out .= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
+			$out .= '</span>';
+			$out .= '</td>';
 
-			$out.= '<td>';
+			$out .= '<td>';
 
 			if ($editMode) {
-				$out.= $item->generateInputField();
+				$out .= $item->generateInputField();
 			} else {
-				$out.= $item->generateOutputField();
+				$out .= $item->generateOutputField();
 			}
 
 			if (!empty($item->errors)) {
@@ -339,8 +340,8 @@ class FormSetup
 				setEventMessages(null, $item->errors, 'errors');
 			}
 
-			$out.= '</td>';
-			$out.= '</tr>';
+			$out .= '</td>';
+			$out .= '</tr>';
 		}
 
 		return $out;
@@ -393,6 +394,7 @@ class FormSetup
 
 		$item = new FormSetupItem($confKey);
 		// need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developer to use object oriented usage
+		// @phan-suppress-next-line PhanDeprecatedFunction
 		/** @scrutinizer ignore-deprecated */ $item->setTypeFromTypeString($params['type']);
 
 		if (!empty($params['enabled'])) {
@@ -831,7 +833,9 @@ class FormSetupItem
 		$out = (($this->langs->trans($this->confKey) != $this->confKey) ? $this->langs->trans($this->confKey) : $this->langs->trans('MissingTranslationForConfKey', $this->confKey));
 
 		// if conf defined on entity 0, prepend a picto to indicate it will apply across all entities
-		if (isModEnabled('multicompany') && $this->entity == 0) $out = img_picto($this->langs->trans('AllEntities'), 'fa-globe-americas em088 opacityhigh') . '&nbsp;' . $out;
+		if (isModEnabled('multicompany') && $this->entity == 0) {
+			$out = img_picto($this->langs->trans('AllEntities'), 'fa-globe-americas em088 opacityhigh') . '&nbsp;' . $out;
+		}
 
 		return $out;
 	}
@@ -866,51 +870,51 @@ class FormSetupItem
 		$out = '';
 
 		if ($this->type == 'title') {
-			$out.= $this->generateOutputField(); // title have no input
+			$out .= $this->generateOutputField(); // title have no input
 		} elseif ($this->type == 'multiselect') {
-			$out.= $this->generateInputFieldMultiSelect();
+			$out .= $this->generateInputFieldMultiSelect();
 		} elseif ($this->type == 'select') {
-			$out.= $this->generateInputFieldSelect();
+			$out .= $this->generateInputFieldSelect();
 		} elseif ($this->type == 'selectUser') {
-			$out.= $this->generateInputFieldSelectUser();
+			$out .= $this->generateInputFieldSelectUser();
 		} elseif ($this->type == 'textarea') {
-			$out.= $this->generateInputFieldTextarea();
-		} elseif ($this->type== 'html') {
-			$out.= $this->generateInputFieldHtml();
-		} elseif ($this->type== 'color') {
-			$out.=  $this->generateInputFieldColor();
+			$out .= $this->generateInputFieldTextarea();
+		} elseif ($this->type == 'html') {
+			$out .= $this->generateInputFieldHtml();
+		} elseif ($this->type == 'color') {
+			$out .=  $this->generateInputFieldColor();
 		} elseif ($this->type == 'yesno') {
 			if (!empty($conf->use_javascript_ajax)) {
-				$out.= ajax_constantonoff($this->confKey);
+				$out .= ajax_constantonoff($this->confKey);
 			} else {
-				$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+				$out .= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
 			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
-			$out.= $this->generateInputFieldEmailTemplate();
+			$out .= $this->generateInputFieldEmailTemplate();
 		} elseif (preg_match('/category:/', $this->type)) {
-			$out.=$this->generateInputFieldCategories();
+			$out .= $this->generateInputFieldCategories();
 		} elseif (preg_match('/thirdparty_type/', $this->type)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 			$formcompany = new FormCompany($this->db);
-			$out.= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
+			$out .= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
 		} elseif ($this->type == 'securekey') {
-			$out.= $this->generateInputFieldSecureKey();
+			$out .= $this->generateInputFieldSecureKey();
 		} elseif ($this->type == 'product') {
 			if (isModEnabled("product") || isModEnabled("service")) {
 				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
-				$out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
+				$out .= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
 			}
 		} elseif ($this->type == 'selectBankAccount') {
 			if (isModEnabled("bank")) {
 				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
-				$out.= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
+				$out .= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
 			}
 		} elseif ($this->type == 'password') {
-			$out.= $this->generateInputFieldPassword('dolibarr');
+			$out .= $this->generateInputFieldPassword('dolibarr');
 		} elseif ($this->type == 'genericpassword') {
-			$out.= $this->generateInputFieldPassword('generic');
+			$out .= $this->generateInputFieldPassword('generic');
 		} else {
-			$out.= $this->generateInputFieldText();
+			$out .= $this->generateInputFieldText();
 		}
 
 		return $out;
@@ -937,8 +941,8 @@ class FormSetupItem
 	public function generateInputFieldTextarea()
 	{
 		$out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">' . "\n";
-		$out.= dol_htmlentities($this->fieldValue);
-		$out.= "</textarea>\n";
+		$out .= dol_htmlentities($this->fieldValue);
+		$out .= "</textarea>\n";
 		return $out;
 	}
 
@@ -1021,7 +1025,7 @@ class FormSetupItem
 		global $conf;
 		$out = '<input required="required" type="text" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ? GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" size="40">';
 		if (!empty($conf->use_javascript_ajax)) {
-			$out.= '&nbsp;'.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
+			$out .= '&nbsp;'.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
 		}
 
 		// Add button to autosuggest a key
@@ -1167,25 +1171,25 @@ class FormSetupItem
 		if ($this->type == 'title') {
 			// nothing to do
 		} elseif ($this->type == 'textarea') {
-			$out.= dol_nl2br($this->fieldValue);
+			$out .= dol_nl2br($this->fieldValue);
 		} elseif ($this->type == 'multiselect') {
-			$out.= $this->generateOutputFieldMultiSelect();
+			$out .= $this->generateOutputFieldMultiSelect();
 		} elseif ($this->type == 'select') {
-			$out.= $this->generateOutputFieldSelect();
+			$out .= $this->generateOutputFieldSelect();
 		} elseif ($this->type == 'selectUser') {
-			$out.= $this->generateOutputFieldSelectUser();
+			$out .= $this->generateOutputFieldSelectUser();
 		} elseif ($this->type == 'html') {
-			$out.=  $this->fieldValue;
+			$out .=  $this->fieldValue;
 		} elseif ($this->type == 'color') {
-			$out.=  $this->generateOutputFieldColor();
+			$out .=  $this->generateOutputFieldColor();
 		} elseif ($this->type == 'yesno') {
 			if (!empty($conf->use_javascript_ajax)) {
-				$out.= ajax_constantonoff($this->confKey);
+				$out .= ajax_constantonoff($this->confKey);
 			} else {
 				if ($this->fieldValue == 1) {
-					$out.= $langs->trans('yes');
+					$out .= $langs->trans('yes');
 				} else {
-					$out.= $langs->trans('no');
+					$out .= $langs->trans('no');
 				}
 			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
@@ -1199,7 +1203,7 @@ class FormSetupItem
 				if (is_numeric($template) && $template < 0) {
 					$this->setErrors($formmail->errors);
 				}
-				$out.= $this->langs->trans($template->label);
+				$out .= $this->langs->trans($template->label);
 			}
 		} elseif (preg_match('/category:/', $this->type)) {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -1213,16 +1217,16 @@ class FormSetupItem
 			foreach ($ways as $way) {
 				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
 			}
-			$out.='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+			$out .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 		} elseif (preg_match('/thirdparty_type/', $this->type)) {
-			if ($this->fieldValue==2) {
-				$out.= $this->langs->trans("Prospect");
-			} elseif ($this->fieldValue==3) {
-				$out.= $this->langs->trans("ProspectCustomer");
-			} elseif ($this->fieldValue==1) {
-				$out.= $this->langs->trans("Customer");
-			} elseif ($this->fieldValue==0) {
-				$out.= $this->langs->trans("NorProspectNorCustomer");
+			if ($this->fieldValue == 2) {
+				$out .= $this->langs->trans("Prospect");
+			} elseif ($this->fieldValue == 3) {
+				$out .= $this->langs->trans("ProspectCustomer");
+			} elseif ($this->fieldValue == 1) {
+				$out .= $this->langs->trans("Customer");
+			} elseif ($this->fieldValue == 0) {
+				$out .= $this->langs->trans("NorProspectNorCustomer");
 			}
 		} elseif ($this->type == 'product') {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -1230,7 +1234,7 @@ class FormSetupItem
 			$product = new Product($this->db);
 			$resprod = $product->fetch($this->fieldValue);
 			if ($resprod > 0) {
-				$out.= $product->ref;
+				$out .= $product->ref;
 			} elseif ($resprod < 0) {
 				$this->setErrors($product->errors);
 			}
@@ -1240,14 +1244,14 @@ class FormSetupItem
 			$bankaccount = new Account($this->db);
 			$resbank = $bankaccount->fetch($this->fieldValue);
 			if ($resbank > 0) {
-				$out.= $bankaccount->label;
+				$out .= $bankaccount->label;
 			} elseif ($resbank < 0) {
 				$this->setErrors($bankaccount->errors);
 			}
 		} elseif ($this->type == 'password' || $this->type == 'genericpassword') {
-			$out.= str_repeat('*', strlen($this->fieldValue));
+			$out .= str_repeat('*', strlen($this->fieldValue));
 		} else {
-			$out.= $this->fieldValue;
+			$out .= $this->fieldValue;
 		}
 
 		return $out;
@@ -1270,7 +1274,7 @@ class FormSetupItem
 		if (!empty($TSelected)) {
 			foreach ($TSelected as $selected) {
 				if (!empty($this->fieldOptions[$selected])) {
-					$outPut.= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
+					$outPut .= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
 				}
 			}
 		}
@@ -1285,7 +1289,7 @@ class FormSetupItem
 	public function generateOutputFieldColor()
 	{
 		global $langs;
-		$this->fieldAttr['disabled']=null;
+		$this->fieldAttr['disabled'] = null;
 		$color = colorArrayToHex(colorStringToArray($this->fieldValue, array()), '');
 		if ($color) {
 			return '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -1299,7 +1303,7 @@ class FormSetupItem
 	 */
 	public function generateInputFieldColor()
 	{
-		$this->fieldAttr['type']= 'color';
+		$this->fieldAttr['type'] = 'color';
 		$default = $this->defaultFieldValue;
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 		$formother = new FormOther($this->db);
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 7a283f5189f..d77658802bc 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -90,7 +90,7 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 		$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
 		$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
 		if ($type != -1) {
-			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getName($langs).'</b><br>';
 		}
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index cfe79891429..bf0959be743 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -125,7 +126,7 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 		}
 		$s = '';
 		if ($type == -1) {
-			$s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+			$s .= $langs->trans("Name").': <b>'.$this->getName($langs).'</b><br>';
 			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
 		} elseif ($type == 0) {
 			$s .= $langs->trans("ProductCodeDesc").'<br>';
@@ -133,7 +134,7 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 			$s .= $langs->trans("ServiceCodeDesc").'<br>';
 		}
 		if ($type != -1) {
-			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getName($langs).'</b><br>';
 		}
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 8cc1ddd8082..4e1bd2e5865 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -136,14 +136,14 @@ abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
 
 		$s = '';
 		if ($type == -1) {
-			$s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+			$s .= $langs->trans("Name").': <b>'.$this->getName($langs).'</b><br>';
 		} elseif ($type == 0) {
 			$s .= $langs->trans("CustomerCodeDesc").'<br>';
 		} elseif ($type == 1) {
 			$s .= $langs->trans("SupplierCodeDesc").'<br>';
 		}
 		if ($type != -1) {
-			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getName($langs).'</b><br>';
 		}
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index ad1b7cb1290..5efb5016c6c 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -247,7 +247,7 @@ $server->addPlugin($tempFF);
 */
 
 // And off we go!
-$server->exec();
+$server->start();
 
 if (is_object($db)) {
 	$db->close();

From 7b53202f747aa4be383f5f30c740c6bbda08cbf9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 20:03:13 +0100
Subject: [PATCH 1589/1862] Qual: Enable detection of use of
 DeprecatedFunctions

---
 dev/tools/phan/baseline.txt | 5 +++--
 dev/tools/phan/config.php   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index f7210c92b8d..be0a4d597ba 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -68,7 +68,7 @@ return [
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/triggers/interface_80_modStripe_Stripe.class.php' => ['PhanTypeMismatchPropertyProbablyReal'],
+        'htdocs/core/triggers/interface_80_modStripe_Stripe.class.php' => ['PhanDeprecatedFunction', 'PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
@@ -79,8 +79,9 @@ return [
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/societe/paymentmodes.php' => ['PhanTypeMismatchPropertyProbablyReal'],
+        'htdocs/societe/paymentmodes.php' => ['PhanDeprecatedFunction', 'PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/stripe/admin/stripe.php' => ['PhanDeprecatedFunction'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/user/class/user.class.php' => ['PhanParamSignatureMismatch'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 1c4297caad8..50787253740 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -408,7 +408,7 @@ return [
 	'suppress_issue_types' => [
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
-		'PhanDeprecatedFunction',
+		// 'PhanDeprecatedFunction',
 		//'PhanCompatibleNegativeStringOffset',
 		// 'PhanPluginDuplicateExpressionAssignment',
 		// Nulls are likely mostly false positives

From 912c0f754bfe7f1ee9f74d5601e7966715208652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 13:36:55 +0100
Subject: [PATCH 1590/1862] fix knowledgerecord

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 2bfcd6efdd7..731f703f1cd 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -404,11 +404,11 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								print '</td>'."\n";
 
 								print '<td class="center">';
-								$constforvar = 'KNOWLEDGEMANAGEMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+								$constforvar = 'KNOWLEDGEMANAGEMENT_'.strtoupper($myTmpObjectArray['class']).'_ADDON';
 								if (getDolGlobalString($constforvar) == $file) {
 									print img_picto($langs->trans("Activated"), 'switch_on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectArray['class']).'&value='.urlencode($file).'">';
 									print img_picto($langs->trans("Disabled"), 'switch_off');
 									print '</a>';
 								}

From 3d02ca0fdcea1d2d74bbe3bb12bfbc9adee99523 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 13:38:52 +0100
Subject: [PATCH 1591/1862] Debug v20

---
 htdocs/contact/card.php            |  3 ++-
 htdocs/core/class/notify.class.php |  4 ++--
 htdocs/core/photos_resize.php      |  6 +++---
 htdocs/langs/en_US/companies.lang  |  4 ++--
 htdocs/langs/en_US/main.lang       |  1 -
 htdocs/langs/en_US/other.lang      |  2 ++
 htdocs/langs/en_US/users.lang      |  3 +--
 htdocs/projet/admin/project.php    | 18 ++++++++----------
 htdocs/societe/contact.php         |  3 ++-
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index a7b38cc85c7..1a11ac4f65a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -52,7 +52,8 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'users', 'other', 'commercial'));
 
-$mesg = ''; $error = 0; $errors = array();
+$error = 0;
+$errors = array();
 
 // Get parameters
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index d49388d26c9..46f9320ab32 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -491,7 +491,7 @@ class Notify
 								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCancelled", $link);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCanceled", $link);
 								break;
 							case 'BILL_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
@@ -509,7 +509,7 @@ class Notify
 								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 								$object_type = 'order';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCancelled", $link);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCanceled", $link);
 								break;
 							case 'ORDER_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index eecfe22c4b3..393cb4067c1 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -560,11 +560,11 @@ if (!empty($conf->use_javascript_ajax)) {
 
 	if (empty($conf->dol_no_mouse_hover)) {
 		print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
-		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
+		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $object->entity).'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
 		print '</div>';
 		print '</div><br>';
 
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).($num ? '&num='.$num : '').'" method="POST">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).($num ? '&num='.urlencode($num) : '').'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="backtourl" value="'.$backtourl.'">';
 		print '
@@ -608,7 +608,7 @@ jQuery(document).ready(function() {
         console.log("We click on submitcrop");
 	    var idClicked = e.target.id;
 	    if (parseInt(jQuery(\'#w\').val())) return true;
-	    alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Dimension"))).'\');
+	    alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"))).'\');
 	    return false;
 	});
 });
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 57b3cf539cf..526483b1339 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -6,7 +6,7 @@ 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?
+ConfirmDeleteContact=Are you sure you want to delete this contact?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -527,4 +527,4 @@ HideSocialNetworks=Hide social networks
 ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
-ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side 
+ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f519e098d01..95042a5cc24 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -562,7 +562,6 @@ New=New
 Discount=Discount
 Unknown=Unknown
 General=General
-Dimensions=Dimensions
 Size=Size
 OriginalSize=Original size
 RotateImage=Rotate 90°
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 32cd6681507..12955cc9f0e 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -207,6 +207,7 @@ EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInterventionClosed=The intervention %s has been closed.
 EMailTextInvoiceValidated=Invoice %s has been validated.
 EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextInvoiceCanceled=Invoice %s has been canceled.
 EMailTextProposalValidated=Proposal %s has been validated.
 EMailTextProposalClosedSigned=Proposal %s has been closed signed.
 EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
@@ -214,6 +215,7 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
 EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
 EMailTextOrderValidated=Order %s has been validated.
 EMailTextOrderClose=Order %s has been delivered.
+EMailTextOrderCanceled=Order %s has been canceled.
 EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
 EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
 EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 3cfa2ee7236..4974dab92f1 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -134,5 +134,4 @@ UserPublicPageDesc=You can enable a virtual card for this user. An url with the
 EnablePublicVirtualCard=Enable the user's virtual business card
 UserEnabledDisabled=User status changed: %s
 AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
-ConfirmDeleteContact= Are you sure that you want delete this contact ?
-ContactDeleted= Contact has been delete successfully
+ContactDeleted=Contact has been delete successfully
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 9dc673aa745..512fbc064d0 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -842,16 +842,14 @@ print '<input type="submit" class="button small reposition" name="PROJECT_TIMESH
 print '</td>';
 print '</tr>';
 
-$key = 'PROJECT_DISPLAY_LINKED_BY_CONTACT';
-echo '<tr class="oddeven">',
-		'<td class="left">',
-			$form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
-		'</td>',
-		'<td class="right" colspan="2">',
-			ajax_constantonoff($key),
-		'</td>',
-	'</tr>';
-
+print '<tr class="oddeven">';
+print '<td class="left">';
+print $form->textwithpicto($langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT'), $langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT_help'));
+print '</td>';
+print '<td class="right" colspan="2">';
+print ajax_constantonoff('PROJECT_DISPLAY_LINKED_BY_CONTACT');
+print '</td>';
+print '</tr>';
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index fd0109db515..7591c58c98b 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -60,7 +60,8 @@ if (isModEnabled('notification')) {
 	$langs->load("mails");
 }
 
-$mesg = ''; $error = 0; $errors = array();
+$error = 0;
+$errors = array();
 
 
 // Get parameters

From 9eed23c6d073fcb651de79d5a1d0ec72af0445fe Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:40:04 +0100
Subject: [PATCH 1592/1862] Fix return type by cast or typing update

# Fix return type by cast or typing update

Fix most PhanTypeMismatchReturn notifications.

The remaining ones are likely real bugs or need more Dolibarr
knowledge to fix them efficiently
---
 htdocs/admin/system/modules.php               |  8 ++++----
 htdocs/bom/class/bom.class.php                |  2 +-
 htdocs/core/class/rssparser.class.php         |  2 +-
 htdocs/core/db/sqlite3.class.php              | 19 ++++++++++---------
 htdocs/core/lib/company.lib.php               |  2 +-
 htdocs/core/lib/project.lib.php               |  4 ++--
 htdocs/core/lib/treeview.lib.php              |  8 +++++++-
 htdocs/core/lib/website.lib.php               |  4 ++--
 .../core/login/functions_openid_connect.php   |  3 ++-
 .../barcode/mod_barcode_product_standard.php  |  2 +-
 htdocs/dav/fileserver.php                     |  2 +-
 htdocs/debugbar/class/autoloader.php          |  2 +-
 htdocs/product/class/product.class.php        |  2 +-
 .../stock/class/mouvementstock.class.php      |  2 +-
 14 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 89912dd030e..349a0ead610 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -311,7 +311,7 @@ print '</tr>';
 if ($sortfield == "name" && $sortorder == "asc") {
 	usort(
 		$moduleList,
-		/** @return bool */
+		/** @return int */
 		function (stdClass $a, stdClass $b) {
 			return strcasecmp($a->name, $b->name);
 		}
@@ -319,7 +319,7 @@ if ($sortfield == "name" && $sortorder == "asc") {
 } elseif ($sortfield == "name" && $sortorder == "desc") {
 	usort(
 		$moduleList,
-		/** @return bool */
+		/** @return int */
 		static function (stdClass $a, stdClass $b) {
 			return strcasecmp($b->name, $a->name);
 		}
@@ -327,7 +327,7 @@ if ($sortfield == "name" && $sortorder == "asc") {
 } elseif ($sortfield == "version" && $sortorder == "asc") {
 	usort(
 		$moduleList,
-		/** @return bool */
+		/** @return int */
 		static function (stdClass $a, stdClass $b) {
 			return strcasecmp($a->version, $b->version);
 		}
@@ -335,7 +335,7 @@ if ($sortfield == "name" && $sortorder == "asc") {
 } elseif ($sortfield == "version" && $sortorder == "desc") {
 	usort(
 		$moduleList,
-		/** @return bool */
+		/** @return int */
 		static function (stdClass $a, stdClass $b) {
 			return strcasecmp($b->version, $a->version);
 		}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 1ed600f2433..c49f4a4cc89 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1404,7 +1404,7 @@ class BOM extends CommonObject
 	 * BOM costs calculation based on cost_price or pmp of each BOM line.
 	 * Set the property ->total_cost and ->unit_cost of BOM.
 	 *
-	 * @return int			Return integer <0 if KO, >0 if OK
+	 * @return int|string	Return integer <0 if KO, >0 if OK, or printable error result from hook
 	 */
 	public function calculateCosts()
 	{
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 057cab3ff7d..e6cfa44e23e 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -176,7 +176,7 @@ class RssParser
 	/**
 	 * getLastFetchDate
 	 *
-	 * @return string
+	 * @return int
 	 */
 	public function getLastFetchDate()
 	{
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index d7ca7239bd0..7484ac1cee5 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1419,7 +1420,7 @@ class DoliDBSqlite3 extends DoliDB
 			$num -= floor(($month * 4 + 23) / 10);
 		}
 		$temp = floor(($y / 100 + 1) * 3 / 4);
-		return $num + floor($y / 4) - $temp;
+		return (int) ($num + floor($y / 4) - $temp);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1433,7 +1434,7 @@ class DoliDBSqlite3 extends DoliDB
 	private static function calc_weekday($daynr, $sunday_first_day_of_week)
 	{
 		// phpcs:enable
-		$ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+		$ret = (int) floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
 		return $ret;
 	}
 
@@ -1454,12 +1455,12 @@ class DoliDBSqlite3 extends DoliDB
 	/**
 	 * calc_week
 	 *
-	 * @param 	string	$year				Year
-	 * @param 	string	$month				Month
-	 * @param 	string	$day				Day
-	 * @param 	string	$week_behaviour		Week behaviour
-	 * @param 	string	$calc_year			???
-	 * @return	string						???
+	 * @param 	int		$year				Year
+	 * @param 	int		$month				Month
+	 * @param 	int		$day				Day
+	 * @param 	int		$week_behaviour		Week behaviour, bit masks: WEEK_MONDAY_FIRST, WEEK_YEAR, WEEK_FIRST_WEEKDEAY
+	 * @param 	int		$calc_year			??? Year where the week started
+	 * @return	int							??? Week number in year
 	 */
 	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
 	{
@@ -1496,6 +1497,6 @@ class DoliDBSqlite3 extends DoliDB
 				return 1;
 			}
 		}
-		return floor($days / 7 + 1);
+		return (int) floor($days / 7 + 1);
 	}
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index df8fe37210d..5e69aaba3df 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -535,7 +535,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs =
 	// Check parameters
 	if (empty($searchkey) && empty($searchlabel)) {
 		if ($withcode === 'all') {
-			return array('id' => '', 'code' => '', 'label' => '');
+			return array('id' => 0, 'code' => '', 'label' => '');
 		} else {
 			return '';
 		}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 12974209afe..f3c8910f646 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2448,9 +2448,9 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 /**
  * Search in task lines with a particular parent if there is a task for a particular user (in taskrole)
  *
- * @param 	string	$inc				Counter that count number of lines legitimate to show (for return)
+ * @param 	int		$inc				Counter that count number of lines legitimate to show (for return)
  * @param 	int		$parent				Id of parent task to start
- * @param 	array	$lines				Array of all tasks
+ * @param 	Task[]	$lines				Array of all tasks
  * @param	string	$taskrole			Array of task filtered on a particular user
  * @return	int							1 if there is
  */
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 2378b919007..5166fb849db 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
  * Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -31,12 +32,17 @@
  * @param	array	$fulltree		Array of entries in correct order
  * @param 	string	$key			Key of entry into fulltree to show picto
  * @param	int		$silent			Do not output indent and picto, returns only value
- * @return	integer[]					array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub)
+ * @return	array{0:int,1:int,2:int}	array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub)
  */
 function tree_showpad(&$fulltree, $key, $silent = 0)
 {
 	$pos = 1;
 
+	// Initialise in case no items to loop on.
+	$atleastoneofthislevelafter = 0;
+	$nbofdirinsub = 0;
+	$nbofdocinsub = 0;
+
 	// Loop on each pos, because we will output an img for each pos
 	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0) {
 		// Process for column $pos
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index f7700e18b09..bee8322ab69 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -979,8 +979,8 @@ function getSocialNetworkSharingLinks()
 /**
  * Return HTML content to add structured data for an article, news or Blog Post.
  *
- * @param	Object	$object			Object
- * @return  string					HTML img content or '' if no image found
+ * @param	Object	$object		Object
+ * @return  int					HTML img content or '' if no image found
  * @see getImagePublicURLOfObject()
  */
 function getNbOfImagePublicURLOfObject($object)
diff --git a/htdocs/core/login/functions_openid_connect.php b/htdocs/core/login/functions_openid_connect.php
index 8e494bd96f0..d9eda8088ed 100644
--- a/htdocs/core/login/functions_openid_connect.php
+++ b/htdocs/core/login/functions_openid_connect.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2022 Jeritiana Ravelojaona <jeritiana.rav@smartone.ai>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -32,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
  * @param	string	$usertotest		Login
  * @param	string	$passwordtotest	Password
  * @param   int		$entitytotest   Number of instance (always 1 if module multicompany not enabled)
- * @return	string					Login if OK, '' if KO
+ * @return	string|false			Login if OK, false if KO
  */
 function check_user_password_openid_connect($usertotest, $passwordtotest, $entitytotest)
 {
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 82402b1b9c6..8c959a42db1 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -161,7 +161,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 *
 	 * @param	?CommonObject	$objproduct 	Object product (not used)
 	 * @param	string			$type    		Type of barcode (EAN, ISBN, ...)
-	 * @return 	string|int     					Value if OK, '' if module not configured, <0 if KO
+	 * @return 	string|int<-1,-1> 				Value if OK, '' if module not configured, <0 if KO
 	 */
 	public function getNextValue($objproduct = null, $type = '')
 	{
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index ad1b7cb1290..7c6a1afae5d 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -97,7 +97,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(
 	/**
 	 * @param string	$username	Username to validate as a login
 	 * @param string	$password	Password to validate for $username
-	 * @return true				True if login ok, false if not
+	 * @return bool					True if login ok, false if not
 	 */
 	static function ($username, $password) {
 		global $user, $conf;
diff --git a/htdocs/debugbar/class/autoloader.php b/htdocs/debugbar/class/autoloader.php
index b5e54aa29dd..bb1bc7880d7 100644
--- a/htdocs/debugbar/class/autoloader.php
+++ b/htdocs/debugbar/class/autoloader.php
@@ -8,7 +8,7 @@
 spl_autoload_register(
 	/**
 	 * @param string	$class	Class to load
-	 * @return true				If class could be loaded
+	 * @return bool				If class could be loaded
 	 */
 	static function ($class) {
 		if (preg_match('/^DebugBar/', $class)) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index fb4168914d2..240fc40ff39 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2143,7 +2143,7 @@ class Product extends CommonObject
 	 * @param  int    $product_id     Filter on a particular product id
 	 * @param  string $fourn_ref      Filter on a supplier price ref. 'none' to exclude ref in search.
 	 * @param  int    $fk_soc         If of supplier
-	 * @return int                    Return integer <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
+	 * @return int|string             Return integer <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...), or printable result of hook
 	 * @see getSellPrice(), find_min_price_product_fournisseur()
 	 */
 	public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 74396b9ecc5..a6ad446ecbe 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -183,7 +183,7 @@ class MouvementStock extends CommonObject
 	 *  @param		int				$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
 	 *  @param		int				$donotcleanemptylines				Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
 	 * 	@param		boolean			$force_update_batch	Allows to add batch stock movement even if $product doesn't use batch anymore
-	 *	@return		int									Return integer <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
+	 *	@return		int|string							Return integer <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK, or printabl result of hook
 	 */
 	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false)
 	{

From 725e419a46c648d18e64109dbe99a8ac5778df30 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:41:26 +0100
Subject: [PATCH 1593/1862] Qual: Enable PhanTypeMismatchReturn

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 1c4297caad8..f8ed6a9e4c9 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -589,7 +589,7 @@ return [
 		// 'PhanPluginPrintfNotPercent',  // Detects fishy stuff with '%' format and suggests %%
 		'PhanPossiblyUndeclaredGlobalVariable',
 		// 'PhanPluginPossiblyStaticProtectedMethod',
-		'PhanTypeMismatchReturn',
+		// 'PhanTypeMismatchReturn',
 		// 'PhanPluginMoreSpecificActualReturnType',
 		// 'PhanTypeMismatchReturnProbablyReal',
 		'PhanPossiblyUndeclaredVariable',

From d662dbbcaea9199a04466efc736d79458348fbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 16 Mar 2024 13:52:24 +0100
Subject: [PATCH 1594/1862] restore translation

https://github.com/Dolibarr/dolibarr/commit/2670287dd4543035cb4834b22b3cd0a4d093a911
---
 htdocs/langs/en_US/main.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 95042a5cc24..f519e098d01 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -562,6 +562,7 @@ New=New
 Discount=Discount
 Unknown=Unknown
 General=General
+Dimensions=Dimensions
 Size=Size
 OriginalSize=Original size
 RotateImage=Rotate 90°

From ee97747eb6f438b54f274f012185f65e307cecad Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:57:37 +0100
Subject: [PATCH 1595/1862] Qual: Update phan baseline with issue we're not
 fixing now

---
 dev/tools/phan/baseline.txt | 39 +++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index f7210c92b8d..c65097be907 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,18 +9,20 @@
  */
 return [
     // # Issue statistics:
-    // PhanPluginDuplicateIfStatements : 30+ occurrences
     // PhanParamSignatureMismatch : 25+ occurrences
+    // PhanTypeMismatchReturnNullable : 20+ occurrences
     // PhanPluginSuspiciousParamPosition : 15+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 10+ occurrences
     // PhanTypeArraySuspiciousNull : 10+ occurrences
+    // PhanTypeMismatchReturn : 10+ occurrences
     // PhanRedefineFunctionInternal : 6 occurrences
     // PhanPluginUnsafeEval : 5 occurrences
     // PhanParamSuspiciousOrder : 4 occurrences
     // PhanParamTooMany : 4 occurrences
     // PhanPluginSuspiciousParamOrder : 4 occurrences
     // PhanUndeclaredFunctionInCallable : 4 occurrences
+    // PhanTypeMismatchPropertyProbablyReal : 2 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanAccessPropertyStaticAsNonStatic : 1 occurrence
     // PhanNoopArrayAccess : 1 occurrence
@@ -29,6 +31,8 @@ return [
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
+        'htdocs/adherents/class/adherent.class.php' => ['PhanTypeMismatchReturnNullable'],
+        'htdocs/adherents/class/adherentstats.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/adherents/stats/geo.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/adherents/type.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/admin/receiptprinter.php' => ['PhanRedefineFunctionInternal'],
@@ -37,54 +41,69 @@ return [
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected'],
         'htdocs/categories/viewcat.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/collab/index.php' => ['PhanParamTooMany'],
+        'htdocs/comm/action/class/actioncomm.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/comm/action/index.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/accounting-files.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
+        'htdocs/comm/propal/class/api_proposals.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/compta/sociales/class/paymentsocialcontribution.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
-        'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
+        'htdocs/core/class/commonobject.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
+        'htdocs/core/class/extrafields.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/rssparser.class.php' => ['PhanUndeclaredFunctionInCallable'],
+        'htdocs/core/class/smtps.class.php' => ['PhanTypeMismatchReturnNullable'],
+        'htdocs/core/class/stats.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/db/pgsql.class.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/db/sqlite3.class.php' => ['PhanParamSignatureMismatch', 'PhanTypeMismatchReturnNullable'],
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/core/lib/date.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
+        'htdocs/core/lib/functions2.lib.php' => ['PhanTypeMismatchReturnNullable'],
+        'htdocs/core/lib/pdf.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/usergroups.lib.php' => ['PhanNoopArrayAccess'],
+        'htdocs/core/lib/website.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder'],
-        'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/modules/member/doc/pdf_standard.class.php' => ['PhanParamSignatureMismatch'],
+        'htdocs/core/modules/DolibarrModules.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
+        'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/triggers/interface_80_modStripe_Stripe.class.php' => ['PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
+        'htdocs/expedition/class/api_shipments.class.php' => ['PhanTypeMismatchReturn'],
+        'htdocs/expensereport/class/api_expensereports.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
+        'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanTypeMismatchReturn'],
+        'htdocs/fourn/class/fournisseur.facture.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
-        'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeInvalidUnaryOperandNumeric'],
         'htdocs/mrp/class/mo.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/product/admin/product_tools.php' => ['PhanNoopStringLiteral'],
+        'htdocs/product/class/product.class.php' => ['PhanTypeMismatchReturn'],
+        'htdocs/projet/class/project.class.php' => ['PhanTypeMismatchReturnNullable'],
+        'htdocs/projet/class/projectstats.class.php' => ['PhanTypeMismatchReturnNullable'],
+        'htdocs/projet/class/task.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/societe/paymentmodes.php' => ['PhanTypeMismatchPropertyProbablyReal'],
+        'htdocs/salaries/class/api_salaries.class.php' => ['PhanTypeMismatchReturn'],
+        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/user/class/user.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition'],
+        'htdocs/website/class/website.class.php' => ['PhanTypeMismatchReturnNullable'],
         'internal' => ['PhanUndeclaredConstant'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.

From 4a343466aadfd422a2685f6561f5df6a1ea14142 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:24:15 +0100
Subject: [PATCH 1596/1862] Suppress PhanTypeMismatchReturnNullable
 notification

# Suppress PhanTypeMismatchReturnNullable notification

There is no "straightforward" way to avoid this notification, ignoring
it.
---
 htdocs/core/class/CMailFile.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index ac4f4c0da39..0bfbb65529a 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -738,7 +738,9 @@ class CMailFile
 	/**
 	 * Send mail that was prepared by constructor.
 	 *
-	 * @return    int|bool|string	True if mail sent, false otherwise.  Negative int if error in hook.  String if incorrect send mode.
+	 * @return    bool	True if mail sent, false otherwise.  Negative int if error in hook.  String if incorrect send mode.
+	 *
+	 * @phan-suppress PhanTypeMismatchReturnNullable  False positif by phan for unclear reason.
 	 */
 	public function sendfile()
 	{

From 23d656de0dcbf2a892123fb4a4efa848eef918a7 Mon Sep 17 00:00:00 2001
From: Zephyriony <142790847+zephyriony@users.noreply.github.com>
Date: Sat, 16 Mar 2024 14:19:59 +0100
Subject: [PATCH 1597/1862] Update card.php


From 65d2f6af6d3974e49bf0e911bb80491648d33bd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 14:20:23 +0100
Subject: [PATCH 1598/1862] Debug v20

---
 htdocs/langs/en_US/agenda.lang     | 1 -
 htdocs/langs/en_US/commercial.lang | 1 -
 htdocs/website/index.php           | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 70ce8809858..8ce39450cd8 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -21,7 +21,6 @@ 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
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 2f6e4da03dc..7b0ab3ed30e 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -47,7 +47,6 @@ 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
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 74c43d54e48..2b622531dac 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3397,7 +3397,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 				// Edit CKEditor
 				if (getDolGlobalInt('WEBSITE_ALLOW_CKEDITOR')) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("CKEditor")).'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag("CKEditor").'</a>';
 				}
 
 				print '</span>';

From b1a880626c32f31bdfda3a4b31534c9965e90584 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 14:23:16 +0100
Subject: [PATCH 1599/1862] Look and feel v19

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

diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 8cc4f573e38..a2175e26ae3 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -803,7 +803,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
 
 		// Firstname
 		print '<tr><td><span class="fieldrequired">' . $langs->trans("Firstname") . '</span></td><td>';
-		print '<input type="text" name="firstname" maxlength="255" class="minwidth200 maxwidth300" value="' . dol_escape_htmltag($firstname) . '" required></td></tr>' . "\n";
+		print '<input type="text" name="firstname" maxlength="255" class="minwidth200 maxwidth300" value="' . dol_escape_htmltag($firstname) . '" required autofocus></td></tr>' . "\n";
 
 		// Lastname
 		print '<tr><td><span class="fieldrequired">' . $langs->trans("Lastname") . '</span></td><td>';

From 1b1cd2553eacbc7d373017edb4bd5f0bbc8e47f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 14:25:27 +0100
Subject: [PATCH 1600/1862] Fix trans

---
 htdocs/langs/en_US/users.lang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 4974dab92f1..c4695d86791 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -134,4 +134,3 @@ UserPublicPageDesc=You can enable a virtual card for this user. An url with the
 EnablePublicVirtualCard=Enable the user's virtual business card
 UserEnabledDisabled=User status changed: %s
 AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
-ContactDeleted=Contact has been delete successfully

From cb55fb0864a2e29b9415393da4ca487c1268b848 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:21:40 +0100
Subject: [PATCH 1601/1862] Remove PhanTypeMismatchPropertyProbablyReal
 exceptions in baseline

---
 dev/tools/phan/baseline.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index f7210c92b8d..a399e64f0aa 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -68,7 +68,6 @@ return [
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
-        'htdocs/core/triggers/interface_80_modStripe_Stripe.class.php' => ['PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
@@ -79,7 +78,6 @@ return [
         'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
-        'htdocs/societe/paymentmodes.php' => ['PhanTypeMismatchPropertyProbablyReal'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/takepos/invoice.php' => ['PhanPluginSuspiciousParamPosition'],

From 554b35be370d336a371087ae97cbfd3ad79a5ebb Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:00:07 +0100
Subject: [PATCH 1602/1862] remove AI_KEY_API_CHATGPT as a dynamic key.

---
 dev/translation/dynamic_translation_keys.lst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst
index 5e1df8fb25f..bed7c4cf1f4 100644
--- a/dev/translation/dynamic_translation_keys.lst
+++ b/dev/translation/dynamic_translation_keys.lst
@@ -12,7 +12,6 @@ AiDescriptionLong
 AiSetup
 AI_API_CHATGPT_ENDPOINT
 AI_API_CHATGPT_KEY
-AI_KEY_API_CHATGPT
 
 # datapolicy
 DATAPOLICY_ADHERENT

From 65cf2f980fc1b1330450dd8bf2114d6526978c0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 16:10:31 +0100
Subject: [PATCH 1603/1862] Update mo_card.php

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

diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 2e0bd589fd0..97170377d71 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -432,7 +432,7 @@ if ($action == 'create') {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
-		$arrayOfObjBom = array();
+		$arrayOfMoLines = array();
 		foreach ($objectbom->lines as $key => $val) {
 			$moLine = new MoLine($db);
 			$moLine->id = $objectbom->lines[$key]->id;
@@ -443,9 +443,9 @@ if ($action == 'create') {
 			$moLine->qty_frozen = $objectbom->lines[$key]->qty_frozen;
 			$moLine->disable_stock_change = $objectbom->lines[$key]->disable_stock_change;
 
-			$arrayOfObjBom[] = $moLine;
+			$arrayOfMoLines[] = $moLine;
 		}
-		$object->lines = $arrayOfObjBom;
+		$object->lines = $arrayOfMoLines;
 		$object->mrptype = $objectbom->bomtype;
 		$object->bom = $objectbom;
 

From 28217c6dd5c59966dd301a9fb7a20d474584d84c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 16:21:43 +0100
Subject: [PATCH 1604/1862] Fix warning

---
 .../societe/class/api_thirdparties.class.php  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f91fb19bf4a..9a2c6435e4d 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -318,25 +318,21 @@ class Thirdparties extends DolibarrApi
 	}
 
 	/**
-	 * Merge a thirdparty into another one.
+	 * Merge a third party into another one.
 	 *
-	 * Merge content (properties, notes) and objects (like invoices, events, orders, proposals, ...) of a thirdparty into a target thirdparty,
-	 * then delete the merged thirdparty.
-	 * If a property has a defined value both in thirdparty to delete and thirdparty to keep, the value into the thirdparty to
+	 * Merge content (properties, notes) and objects (like invoices, events, orders, proposals, ...) of a thirdparty into a target third party,
+	 * then delete the merged third party.
+	 * If a property has a defined value both in third party to delete and third party to keep, the value into the third party to
 	 * delete will be ignored, the value of target thirdparty will remain, except for notes (content is concatenated).
 	 *
-	 * @param int   $id             ID of thirdparty to keep (the target thirdparty)
-	 * @param int   $idtodelete     ID of thirdparty to remove (the thirdparty to delete), once data has been merged into the target thirdparty.
-	 * @return int
+	 * @param int   $id             ID of thirdparty to keep (the target third party)
+	 * @param int   $idtodelete     ID of thirdparty to remove (the thirdparty to delete), once data has been merged into the target third party.
+	 * @return Object				Return the resulted third party.
 	 *
 	 * @url PUT {id}/merge/{idtodelete}
 	 */
 	public function merge($id, $idtodelete)
 	{
-		global $user;
-
-		$error = 0;
-
 		if ($id == $idtodelete) {
 			throw new RestException(400, 'Try to merge a thirdparty into itself');
 		}
@@ -413,7 +409,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @param	int		$id				ID of thirdparty
 	 * @param	int		$priceLevel		Price level to apply to thirdparty
-	 * @return	object					Thirdparty data without useless information
+	 * @return	Object					Thirdparty data without useless information
 	 *
 	 * @url PUT {id}/setpricelevel/{priceLevel}
 	 *

From d0ea54dce84b86be84b8c323a3e0c865733b07ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 16:27:11 +0100
Subject: [PATCH 1605/1862] Fix phan warning

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

diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 5dc15c83cce..f3f35486474 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -171,6 +171,7 @@ class InterfaceStripe extends DolibarrTriggers
 							}
 
 							// Update Customer on Stripe
+							// @phan-suppress-next-line PhanDeprecatedFunction
 							$customer->save();
 						} catch (Exception $e) {
 							//var_dump(\Stripe\Stripe::getApiVersion());
@@ -229,6 +230,7 @@ class InterfaceStripe extends DolibarrTriggers
 							// @phan-suppress-next-line PhanTypeMismatchPropertyProbablyReal
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
+								// @phan-suppress-next-line PhanDeprecatedFunction
 								$card->save();
 							} catch (Exception $e) {
 								$ok = -1;

From cac3fb2c5579a5100f8fff21c1e94fa57bdf53d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 16:41:44 +0100
Subject: [PATCH 1606/1862] Fix CTI

---
 dev/translation/dynamic_translation_keys.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst
index bed7c4cf1f4..b91972b13c4 100644
--- a/dev/translation/dynamic_translation_keys.lst
+++ b/dev/translation/dynamic_translation_keys.lst
@@ -882,6 +882,7 @@ DictionaryTypeContact
 DictionaryTypeOfContainer
 DictionaryUnits
 Difference
+Dimensions
 DirectPrint
 Disassemble
 Dispatch

From a124b9aa43420c0514de0d6ec0c72e12af4c8ea2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 16:48:36 +0100
Subject: [PATCH 1607/1862] Fix warnings deprecated

---
 htdocs/salaries/class/api_salaries.class.php | 16 ++++++++--------
 htdocs/societe/paymentmodes.php              |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/salaries/class/api_salaries.class.php b/htdocs/salaries/class/api_salaries.class.php
index fad592803c4..c1b6b27313f 100644
--- a/htdocs/salaries/class/api_salaries.class.php
+++ b/htdocs/salaries/class/api_salaries.class.php
@@ -114,8 +114,8 @@ class Salaries extends DolibarrApi
 	/**
 	 * Get salary by ID.
 	 *
-	 * @param int    $id    ID of salary
-	 * @return array Salary object
+	 * @param 	int    $id    	ID of salary
+	 * @return 	Object			Salary object
 	 *
 	 * @throws RestException
 	 */
@@ -137,8 +137,8 @@ class Salaries extends DolibarrApi
 	/**
 	 * Create salary object
 	 *
-	 * @param array $request_data    Request data
-	 * @return int ID of salary
+	 * @param 	array $request_data    	Request data
+	 * @return 	int 					ID of salary
 	 */
 	public function post($request_data = null)
 	{
@@ -281,7 +281,7 @@ class Salaries extends DolibarrApi
 	 * Get a given payment.
 	 *
 	 * @param 	int    $pid    	ID of payment salary
-	 * @return 	array 			PaymentSalary object
+	 * @return 	Object 			PaymentSalary object
 	 *
 	 * @url     GET /payments/{pid}
 	 *
@@ -346,9 +346,9 @@ class Salaries extends DolibarrApi
 	/**
 	 * Update paymentsalary
 	 *
-	 * @param int    $id              ID of paymentsalary
-	 * @param array  $request_data    data
-	 * @return int
+	 * @param 	int    $id              ID of paymentsalary
+	 * @param 	array  $request_data    data
+	 * @return 	Object					PaymentSalary object
 	 *
 	 * @url     POST {id}/payments
 	 *
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 3029aa323a7..594ea922ab0 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -778,6 +778,7 @@ if (empty($reshook)) {
 				} else {
 					$cu->default_source = (string) $source; // Old
 				}
+				// @phan-suppress-next-line PhanDeprecatedFunction
 				$result = $cu->save();
 
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;

From eececbe72b1e026aca759d5faac029b220b78ac3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 17:34:58 +0100
Subject: [PATCH 1608/1862] More secured parameter for $tmpobjectkey

---
 htdocs/admin/eventorganization.php            |  8 +--
 htdocs/admin/hrm.php                          |  8 +--
 htdocs/admin/knowledgemanagement.php          |  8 +--
 htdocs/admin/webhook.php                      |  8 +--
 htdocs/admin/workstation.php                  |  6 +-
 htdocs/ai/admin/setup.php                     |  8 +--
 htdocs/asset/admin/setup.php                  |  8 +--
 htdocs/bookcal/admin/setup.php                |  8 +--
 htdocs/modulebuilder/template/admin/setup.php | 12 ++--
 htdocs/recruitment/admin/setup.php            | 67 +++++++++---------
 .../recruitment/admin/setup_candidatures.php  | 68 ++++++++++---------
 htdocs/webportal/admin/setup.php              | 10 +--
 12 files changed, 111 insertions(+), 108 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index f6e6361fa34..839125a8da3 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -104,7 +104,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'EVENTORGANIZATION_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -115,7 +115,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'EVENTORGANIZATION_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -125,7 +125,7 @@ if ($action == 'updateMask') {
 	}
 }/* elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'EVENTORGANIZATION_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -141,7 +141,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'EVENTORGANIZATION_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index fecafa518f5..0078a384f8f 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -152,7 +152,7 @@ if ($action == 'update') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -163,7 +163,7 @@ if ($action == 'update') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -173,7 +173,7 @@ if ($action == 'update') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -189,7 +189,7 @@ if ($action == 'update') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 731f703f1cd..6e9aef924c6 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -131,7 +131,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -142,7 +142,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -152,7 +152,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -168,7 +168,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 879c17af00d..a0ef3ee897c 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -92,7 +92,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -103,7 +103,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -113,7 +113,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -129,7 +129,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index c98e036c1d3..818a9c014f4 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -122,7 +122,7 @@ if ($action == 'updateMask') {
 	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
@@ -133,7 +133,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
 	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
@@ -149,7 +149,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	$constforval = 'WORKSTATION_'.strtoupper($tmpobjectkey)."_ADDON";
 	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 }
diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index a2bb8f77a23..a4b7f2f5499 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -106,7 +106,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'Ai_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -117,7 +117,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'Ai_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -127,7 +127,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'Ai_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -143,7 +143,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'Ai_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 5850128b3d2..dbe1593199e 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -131,7 +131,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'ASSET_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -142,7 +142,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -152,7 +152,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -168,7 +168,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index 737ad9558a8..43bd3bb66d7 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -138,7 +138,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'BOOKCAL_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -149,7 +149,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'BOOKCAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -159,7 +159,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'BOOKCAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -175,7 +175,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'BOOKCAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 602d8ffa685..311fc2472a4 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -208,8 +208,8 @@ if ($action == 'updateMask') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$className = $myTmpObjects[$tmpobjectkey];
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$className = $myTmpObjects[$tmpobjectkey]['class'];
 		$tmpobject = new $className($db);
 		$tmpobject->initAsSpecimen();
 
@@ -246,7 +246,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -257,7 +257,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -267,7 +267,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -283,7 +283,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 296c20bffb5..67257d6e875 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -87,6 +87,10 @@ $arrayofparameters = array(
 $error = 0;
 $setupnotempty = 0;
 
+$moduledir = 'recruitment';
+$myTmpObjects = array();
+$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration' => 1, 'includedocgeneration' => 1);
+
 
 /*
  * Actions
@@ -113,38 +117,40 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (in_array($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=recruitment-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=recruitment-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'set') {
 	// Activate a model
@@ -152,7 +158,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -162,7 +168,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
 
@@ -170,7 +176,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -186,7 +192,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
@@ -264,11 +270,6 @@ if ($action == 'edit') {
 }
 
 
-$moduledir = 'recruitment';
-$myTmpObjects = array();
-$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration' => 1, 'includedocgeneration' => 1);
-
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index c8324656aa3..c72257e9d2a 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -58,6 +58,10 @@ $arrayofparameters = array(
 $error = 0;
 $setupnotempty = 0;
 
+$moduledir = 'recruitment';
+$myTmpObjects = array();
+$myTmpObjects['RecruitmentCandidature'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
+
 
 /*
  * Actions
@@ -84,44 +88,47 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$className = $myTmpObjects[$tmpobjectkey]['class'];
+		$tmpobject = new $className($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_".$modele;
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_".$modele;
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'set') {
 	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
@@ -132,7 +139,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
 
@@ -140,7 +147,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
@@ -154,7 +161,7 @@ if ($action == 'updateMask') {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
@@ -232,11 +239,6 @@ if ($action == 'edit') {
 }
 
 
-$moduledir = 'recruitment';
-$myTmpObjects = array();
-$myTmpObjects['RecruitmentCandidature'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
-
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 7680e08cd9a..1d919cb1950 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -139,7 +139,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 
 	$tmpobject = new $tmpobjectkey($db);
 	$tmpobject->initAsSpecimen();
@@ -174,7 +174,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . "_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -185,7 +185,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object');
+		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -195,7 +195,7 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -211,7 +211,7 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object');
+	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);

From a2f0af5e75b263fdc9685e9536d2f54a69b585f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 16 Mar 2024 17:49:03 +0100
Subject: [PATCH 1609/1862] fix phpstan

---
 htdocs/loan/class/paymentloan.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index d1e34bbbdf9..6d0c922aad3 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -170,13 +170,13 @@ class PaymentLoan extends CommonObject
 			$this->fk_loan = (int) $this->fk_loan;
 		}
 		if (isset($this->amount_capital)) {
-			$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
+			$this->amount_capital = (float) price2num($this->amount_capital ? $this->amount_capital : 0);
 		}
 		if (isset($this->amount_insurance)) {
-			$this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
+			$this->amount_insurance = (float) price2num($this->amount_insurance ? $this->amount_insurance : 0);
 		}
 		if (isset($this->amount_interest)) {
-			$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
+			$this->amount_interest = (float) price2num($this->amount_interest ? $this->amount_interest : 0);
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
@@ -201,7 +201,7 @@ class PaymentLoan extends CommonObject
 		}
 
 		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
-		$totalamount = price2num($totalamount);
+		$totalamount = (float) price2num($totalamount);
 
 		// Check parameters
 		if ($totalamount == 0) {
@@ -332,13 +332,13 @@ class PaymentLoan extends CommonObject
 			$this->fk_loan = (int) $this->fk_loan;
 		}
 		if (isset($this->amount_capital)) {
-			$this->amount_capital = trim($this->amount_capital);
+			$this->amount_capital = (float) $this->amount_capital;
 		}
 		if (isset($this->amount_insurance)) {
-			$this->amount_insurance = trim($this->amount_insurance);
+			$this->amount_insurance = (float) $this->amount_insurance;
 		}
 		if (isset($this->amount_interest)) {
-			$this->amount_interest = trim($this->amount_interest);
+			$this->amount_interest = (float) $this->amount_interest;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;

From 4ee4d1678f422c7db25acfb1bcdc63cd35e3d493 Mon Sep 17 00:00:00 2001
From: Alfredo Altamirano <Ahuahuachi@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:59:31 +0000
Subject: [PATCH 1610/1862] fix #28892 change default table ref on
 modulebuilder new dictionaries

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

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 032f5fbb696..fe584f278b8 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -1259,7 +1259,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
 	$dictionnaires['langs'] = $modulename.'@'.$modulename;
 	$dictionnaires['tabname'][] = strtolower($namedic);
 	$dictionnaires['tablib'][] = ucfirst(substr($namedic, 2));
-	$dictionnaires['tabsql'][] = 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.strtolower($namedic).' as f';
+	$dictionnaires['tabsql'][] = 'SELECT t.rowid as rowid, t.code, t.label, t.active FROM '.MAIN_DB_PREFIX.strtolower($namedic).' as t';
 	$dictionnaires['tabsqlsort'][] = (array_key_exists('label', $columns) ? 'label ASC' : '');
 	$dictionnaires['tabfield'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabfieldvalue'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');

From c146f708e388ae4cd1f9d390d63df23c76200a6a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 17:59:38 +0100
Subject: [PATCH 1611/1862] Qual: Add dolibarrr to dict

---
 dev/tools/codespell/codespell-dict.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt
index c40c7608602..dce7bdff144 100644
--- a/dev/tools/codespell/codespell-dict.txt
+++ b/dev/tools/codespell/codespell-dict.txt
@@ -11,6 +11,7 @@ aplphanothtml->alphanohtml
 choosed->chosen
 dokument->document
 dolibar->dolibarr
+dolibarrr->dolibarr
 dollibar->dolibarr
 dollibarr->dolibarr
 # fiche->card

From 5067a8bee984071a89bac7fa5fb8802edc39e8b9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 18:11:10 +0100
Subject: [PATCH 1612/1862] Fix Dolibarr spellings

---
 ...e_20_modWorkflow_WorkflowManager.class.php |   2 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |   2 +-
 ...ntOrganization_EventOrganization.class.php |   9 +-
 ...interface_50_modLdap_Ldapsynchro.class.php |   3 +-
 ...odMailmanspip_Mailmanspipsynchro.class.php |   3 +-
 ..._50_modNotification_Notification.class.php |   5 +-
 ...terface_50_modTicket_TicketEmail.class.php |   2 +-
 .../interface_80_modStripe_Stripe.class.php   |   7 +-
 ...rface_90_modSociete_ContactRoles.class.php |   3 +-
 ...face_95_modZapier_ZapierTriggers.class.php | 311 +++++++++---------
 ..._99_modMyModule_MyModuleTriggers.class.php |   3 +-
 11 files changed, 179 insertions(+), 171 deletions(-)

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index ea792005846..96da2886c32 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -52,7 +52,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * @param string		$action		Event action code
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index dad0a0a68d4..034a052ce0c 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -56,7 +56,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * Following properties may be set before calling trigger. The may be completed by this trigger to be used for writing the event into database:
diff --git a/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php b/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
index 738ad23d173..f54615a2aaf 100644
--- a/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
+++ b/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2017	Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2021		Florian Henry		<florian.henry@scopen.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -47,7 +48,7 @@ class InterfaceEventOrganization extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * Following properties may be set before calling trigger. The may be completed by this trigger to be used for writing the event into database:
@@ -74,13 +75,13 @@ class InterfaceEventOrganization extends DolibarrTriggers
 			return 0; // Module not active, we do nothing
 		}
 
-		$error=0;
+		$error = 0;
 
 		// Actions
 		if ($action == 'PROJECT_VALIDATE') {
 			if (getDolGlobalString('EVENTORGANIZATION_TASK_LABEL') && !empty($object->usage_organize_event)) {
 				$taskToDo = explode("\n", getDolGlobalString('EVENTORGANIZATION_TASK_LABEL'));
-				if (is_array($taskToDo) && count($taskToDo)>0) {
+				if (is_array($taskToDo) && count($taskToDo) > 0) {
 					// Load translation files required by the page
 					$langs->loadLangs(array("eventorganization"));
 
@@ -107,7 +108,7 @@ class InterfaceEventOrganization extends DolibarrTriggers
 
 						$result = $task->create($user);
 						if ($result < 0) {
-							$this->errors=array_merge($this->errors, $task->errors);
+							$this->errors = array_merge($this->errors, $task->errors);
 							$error++;
 						}
 					}
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 3f5c0c8ba77..105739fa5de 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2021	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -48,7 +49,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * @param string		$action		Event action code
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index 3da6aeb7ea3..a73a0eb2eb4 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -46,7 +47,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * @param string		$action		Event action code
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index a66659f0e90..602c3798c97 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2011      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2014 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2022      Anthony Berton     	<anthony.berton@bb2a.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -53,7 +54,7 @@ class InterfaceNotification extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * @param string		$action		Event action code
@@ -167,7 +168,7 @@ class InterfaceNotification extends DolibarrTriggers
 				}
 
 				if ($qualified) {
-					$ret[] = array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'contexts'=>$obj->contexts, 'label'=>$obj->label, 'description'=>$obj->description, 'elementtype'=>$obj->elementtype);
+					$ret[] = array('rowid' => $obj->rowid, 'code' => $obj->code, 'contexts' => $obj->contexts, 'label' => $obj->label, 'description' => $obj->description, 'elementtype' => $obj->elementtype);
 				}
 
 				$i++;
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 3610fdf840a..b37bd6ced34 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -49,7 +49,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	}
 
 	/**
-	 *      Function called when a Dolibarrr business event is done.
+	 *      Function called when a Dolibarr business event is done.
 	 *      All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers
 	 *
 	 *      @param  string    $action Event action code
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index f3f35486474..2d2b6db94c9 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -1,6 +1,7 @@
 <?php
 /*
  * Copyright (C) 2018  ptibogxiv	<support@ptibogxiv.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -52,7 +53,7 @@ class InterfaceStripe extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file
 	 * is inside directory core/triggers
 	 *
@@ -157,7 +158,7 @@ class InterfaceStripe extends DolibarrTriggers
 									$isineec = isInEEC($object);
 									if ($object->country_code && $isineec) {
 										//$taxids = $customer->allTaxIds($customer->id);
-										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
+										$customer->createTaxId($customer->id, array('type' => 'eu_vat', 'value' => $vatcleaned));
 									}
 								} else {
 									$taxids = $customer->allTaxIds($customer->id);
@@ -228,7 +229,7 @@ class InterfaceStripe extends DolibarrTriggers
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
 							// @phan-suppress-next-line PhanTypeMismatchPropertyProbablyReal
-							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
+							$card->metadata = array('dol_id' => $object->id, 'dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								// @phan-suppress-next-line PhanDeprecatedFunction
 								$card->save();
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index b2f6a99b07e..7c3047b03d3 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
  * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
  * Copyright (C) 2015 Bahfir Abbes <bafbes@gmail.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +51,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * Following properties may be set before calling trigger. The may be completed by this trigger to be used for writing the event into database:
diff --git a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
index eb91fb9ad4d..701cfeec3fd 100644
--- a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017-2020  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -46,7 +47,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file
 	 * is inside directory core/triggers
 	 *
@@ -97,14 +98,14 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 				}
 				$logtriggeraction = true;
 				break;
-			//case 'USER_NEW_PASSWORD':
-			//case 'USER_ENABLEDISABLE':
-			//case 'USER_DELETE':
-			//case 'USER_LOGIN':
-			//case 'USER_LOGIN_FAILED':
-			//case 'USER_LOGOUT':
+				//case 'USER_NEW_PASSWORD':
+				//case 'USER_ENABLEDISABLE':
+				//case 'USER_DELETE':
+				//case 'USER_LOGIN':
+				//case 'USER_LOGIN_FAILED':
+				//case 'USER_LOGOUT':
 
-			// Actions
+				// Actions
 			case 'ACTION_MODIFY':
 				//$logtriggeraction = true;
 				break;
@@ -125,18 +126,18 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 				//$logtriggeraction = true;
 				break;
 
-			// Groups
-			//case 'USERGROUP_CREATE':
-			//case 'USERGROUP_MODIFY':
-			//case 'USERGROUP_DELETE':
+				// Groups
+				//case 'USERGROUP_CREATE':
+				//case 'USERGROUP_MODIFY':
+				//case 'USERGROUP_DELETE':
 
-			// Categories
-			// case 'CATEGORY_CREATE':
-			// case 'CATEGORY_MODIFY':
-			// case 'CATEGORY_DELETE':
-			// case 'CATEGORY_SET_MULTILANGS':
+				// Categories
+				// case 'CATEGORY_CREATE':
+				// case 'CATEGORY_MODIFY':
+				// case 'CATEGORY_DELETE':
+				// case 'CATEGORY_SET_MULTILANGS':
 
-			// Companies
+				// Companies
 			case 'COMPANY_CREATE':
 				$resql = $this->db->query($sql);
 				while ($resql && $obj = $this->db->fetch_array($resql)) {
@@ -161,7 +162,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 				//$logtriggeraction = true;
 				break;
 
-			// Contacts
+				// Contacts
 			case 'CONTACT_CREATE':
 				$resql = $this->db->query($sql);
 				while ($resql && $obj = $this->db->fetch_array($resql)) {
@@ -186,23 +187,23 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 				break;
 			case 'CONTACT_ENABLEDISABLE':
 				break;
-			// Products
-			// case 'PRODUCT_CREATE':
-			// case 'PRODUCT_MODIFY':
-			// case 'PRODUCT_DELETE':
-			// case 'PRODUCT_PRICE_MODIFY':
-			// case 'PRODUCT_SET_MULTILANGS':
-			// case 'PRODUCT_DEL_MULTILANGS':
+				// Products
+				// case 'PRODUCT_CREATE':
+				// case 'PRODUCT_MODIFY':
+				// case 'PRODUCT_DELETE':
+				// case 'PRODUCT_PRICE_MODIFY':
+				// case 'PRODUCT_SET_MULTILANGS':
+				// case 'PRODUCT_DEL_MULTILANGS':
 
-			//Stock movement
-			// case 'STOCK_MOVEMENT':
+				//Stock movement
+				// case 'STOCK_MOVEMENT':
 
-			//MYECMDIR
-			// case 'MYECMDIR_DELETE':
-			// case 'MYECMDIR_CREATE':
-			// case 'MYECMDIR_MODIFY':
+				//MYECMDIR
+				// case 'MYECMDIR_DELETE':
+				// case 'MYECMDIR_CREATE':
+				// case 'MYECMDIR_MODIFY':
 
-			// Sales orders
+				// Sales orders
 			case 'ORDER_CREATE':
 				$resql = $this->db->query($sql);
 				while ($resql && $obj = $this->db->fetch_array($resql)) {
@@ -226,108 +227,108 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 			case 'LINEORDER_UPDATE':
 			case 'LINEORDER_DELETE':
 				break;
-			// Supplier orders
-			// case 'ORDER_SUPPLIER_CREATE':
-			// case 'ORDER_SUPPLIER_CLONE':
-			// case 'ORDER_SUPPLIER_VALIDATE':
-			// case 'ORDER_SUPPLIER_DELETE':
-			// case 'ORDER_SUPPLIER_APPROVE':
-			// case 'ORDER_SUPPLIER_REFUSE':
-			// case 'ORDER_SUPPLIER_CANCEL':
-			// case 'ORDER_SUPPLIER_SENTBYMAIL':
-			// case 'ORDER_SUPPLIER_RECEIVE':
-			// case 'LINEORDER_SUPPLIER_DISPATCH':
-			// case 'LINEORDER_SUPPLIER_CREATE':
-			// case 'LINEORDER_SUPPLIER_UPDATE':
+				// Supplier orders
+				// case 'ORDER_SUPPLIER_CREATE':
+				// case 'ORDER_SUPPLIER_CLONE':
+				// case 'ORDER_SUPPLIER_VALIDATE':
+				// case 'ORDER_SUPPLIER_DELETE':
+				// case 'ORDER_SUPPLIER_APPROVE':
+				// case 'ORDER_SUPPLIER_REFUSE':
+				// case 'ORDER_SUPPLIER_CANCEL':
+				// case 'ORDER_SUPPLIER_SENTBYMAIL':
+				// case 'ORDER_SUPPLIER_RECEIVE':
+				// case 'LINEORDER_SUPPLIER_DISPATCH':
+				// case 'LINEORDER_SUPPLIER_CREATE':
+				// case 'LINEORDER_SUPPLIER_UPDATE':
 
-			// Proposals
-			// case 'PROPAL_CREATE':
-			// case 'PROPAL_CLONE':
-			// case 'PROPAL_MODIFY':
-			// case 'PROPAL_VALIDATE':
-			// case 'PROPAL_SENTBYMAIL':
-			// case 'PROPAL_CLOSE_SIGNED':
-			// case 'PROPAL_CLOSE_REFUSED':
-			// case 'PROPAL_DELETE':
-			// case 'LINEPROPAL_INSERT':
-			// case 'LINEPROPAL_UPDATE':
-			// case 'LINEPROPAL_DELETE':
+				// Proposals
+				// case 'PROPAL_CREATE':
+				// case 'PROPAL_CLONE':
+				// case 'PROPAL_MODIFY':
+				// case 'PROPAL_VALIDATE':
+				// case 'PROPAL_SENTBYMAIL':
+				// case 'PROPAL_CLOSE_SIGNED':
+				// case 'PROPAL_CLOSE_REFUSED':
+				// case 'PROPAL_DELETE':
+				// case 'LINEPROPAL_INSERT':
+				// case 'LINEPROPAL_UPDATE':
+				// case 'LINEPROPAL_DELETE':
 
-			// SupplierProposal
-			// case 'SUPPLIER_PROPOSAL_CREATE':
-			// case 'SUPPLIER_PROPOSAL_CLONE':
-			// case 'SUPPLIER_PROPOSAL_MODIFY':
-			// case 'SUPPLIER_PROPOSAL_VALIDATE':
-			// case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
-			// case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
-			// case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
-			// case 'SUPPLIER_PROPOSAL_DELETE':
-			// case 'LINESUPPLIER_PROPOSAL_INSERT':
-			// case 'LINESUPPLIER_PROPOSAL_UPDATE':
-			// case 'LINESUPPLIER_PROPOSAL_DELETE':
+				// SupplierProposal
+				// case 'SUPPLIER_PROPOSAL_CREATE':
+				// case 'SUPPLIER_PROPOSAL_CLONE':
+				// case 'SUPPLIER_PROPOSAL_MODIFY':
+				// case 'SUPPLIER_PROPOSAL_VALIDATE':
+				// case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
+				// case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
+				// case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
+				// case 'SUPPLIER_PROPOSAL_DELETE':
+				// case 'LINESUPPLIER_PROPOSAL_INSERT':
+				// case 'LINESUPPLIER_PROPOSAL_UPDATE':
+				// case 'LINESUPPLIER_PROPOSAL_DELETE':
 
-			// Contracts
-			// case 'CONTRACT_CREATE':
-			// case 'CONTRACT_ACTIVATE':
-			// case 'CONTRACT_CANCEL':
-			// case 'CONTRACT_CLOSE':
-			// case 'CONTRACT_DELETE':
-			// case 'LINECONTRACT_INSERT':
-			// case 'LINECONTRACT_UPDATE':
-			// case 'LINECONTRACT_DELETE':
+				// Contracts
+				// case 'CONTRACT_CREATE':
+				// case 'CONTRACT_ACTIVATE':
+				// case 'CONTRACT_CANCEL':
+				// case 'CONTRACT_CLOSE':
+				// case 'CONTRACT_DELETE':
+				// case 'LINECONTRACT_INSERT':
+				// case 'LINECONTRACT_UPDATE':
+				// case 'LINECONTRACT_DELETE':
 
-			// Bills
-			// case 'BILL_CREATE':
-			// case 'BILL_CLONE':
-			// case 'BILL_MODIFY':
-			// case 'BILL_VALIDATE':
-			// case 'BILL_UNVALIDATE':
-			// case 'BILL_SENTBYMAIL':
-			// case 'BILL_CANCEL':
-			// case 'BILL_DELETE':
-			// case 'BILL_PAYED':
-			// case 'LINEBILL_INSERT':
-			// case 'LINEBILL_UPDATE':
-			// case 'LINEBILL_DELETE':
+				// Bills
+				// case 'BILL_CREATE':
+				// case 'BILL_CLONE':
+				// case 'BILL_MODIFY':
+				// case 'BILL_VALIDATE':
+				// case 'BILL_UNVALIDATE':
+				// case 'BILL_SENTBYMAIL':
+				// case 'BILL_CANCEL':
+				// case 'BILL_DELETE':
+				// case 'BILL_PAYED':
+				// case 'LINEBILL_INSERT':
+				// case 'LINEBILL_UPDATE':
+				// case 'LINEBILL_DELETE':
 
-			//Supplier Bill
-			// case 'BILL_SUPPLIER_CREATE':
-			// case 'BILL_SUPPLIER_UPDATE':
-			// case 'BILL_SUPPLIER_DELETE':
-			// case 'BILL_SUPPLIER_PAYED':
-			// case 'BILL_SUPPLIER_UNPAYED':
-			// case 'BILL_SUPPLIER_VALIDATE':
-			// case 'BILL_SUPPLIER_UNVALIDATE':
-			// case 'LINEBILL_SUPPLIER_CREATE':
-			// case 'LINEBILL_SUPPLIER_UPDATE':
-			// case 'LINEBILL_SUPPLIER_DELETE':
+				//Supplier Bill
+				// case 'BILL_SUPPLIER_CREATE':
+				// case 'BILL_SUPPLIER_UPDATE':
+				// case 'BILL_SUPPLIER_DELETE':
+				// case 'BILL_SUPPLIER_PAYED':
+				// case 'BILL_SUPPLIER_UNPAYED':
+				// case 'BILL_SUPPLIER_VALIDATE':
+				// case 'BILL_SUPPLIER_UNVALIDATE':
+				// case 'LINEBILL_SUPPLIER_CREATE':
+				// case 'LINEBILL_SUPPLIER_UPDATE':
+				// case 'LINEBILL_SUPPLIER_DELETE':
 
-			// Payments
-			// case 'PAYMENT_CUSTOMER_CREATE':
-			// case 'PAYMENT_SUPPLIER_CREATE':
-			// case 'PAYMENT_ADD_TO_BANK':
-			// case 'PAYMENT_DELETE':
+				// Payments
+				// case 'PAYMENT_CUSTOMER_CREATE':
+				// case 'PAYMENT_SUPPLIER_CREATE':
+				// case 'PAYMENT_ADD_TO_BANK':
+				// case 'PAYMENT_DELETE':
 
-			// Online
-			// case 'PAYMENT_PAYBOX_OK':
-			// case 'PAYMENT_PAYPAL_OK':
-			// case 'PAYMENT_STRIPE_OK':
+				// Online
+				// case 'PAYMENT_PAYBOX_OK':
+				// case 'PAYMENT_PAYPAL_OK':
+				// case 'PAYMENT_STRIPE_OK':
 
-			// Donation
-			// case 'DON_CREATE':
-			// case 'DON_UPDATE':
-			// case 'DON_DELETE':
+				// Donation
+				// case 'DON_CREATE':
+				// case 'DON_UPDATE':
+				// case 'DON_DELETE':
 
-			// Interventions
-			// case 'FICHINTER_CREATE':
-			// case 'FICHINTER_MODIFY':
-			// case 'FICHINTER_VALIDATE':
-			// case 'FICHINTER_DELETE':
-			// case 'LINEFICHINTER_CREATE':
-			// case 'LINEFICHINTER_UPDATE':
-			// case 'LINEFICHINTER_DELETE':
+				// Interventions
+				// case 'FICHINTER_CREATE':
+				// case 'FICHINTER_MODIFY':
+				// case 'FICHINTER_VALIDATE':
+				// case 'FICHINTER_DELETE':
+				// case 'LINEFICHINTER_CREATE':
+				// case 'LINEFICHINTER_UPDATE':
+				// case 'LINEFICHINTER_DELETE':
 
-			// Members
+				// Members
 			case 'MEMBER_CREATE':
 				$resql = $this->db->query($sql);
 				while ($resql && $obj = $this->db->fetch_array($resql)) {
@@ -348,26 +349,26 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 				}
 				$logtriggeraction = true;
 				break;
-			// case 'MEMBER_VALIDATE':
-			// case 'MEMBER_SUBSCRIPTION':
-			// case 'MEMBER_NEW_PASSWORD':
-			// case 'MEMBER_RESILIATE':
-			// case 'MEMBER_DELETE':
+				// case 'MEMBER_VALIDATE':
+				// case 'MEMBER_SUBSCRIPTION':
+				// case 'MEMBER_NEW_PASSWORD':
+				// case 'MEMBER_RESILIATE':
+				// case 'MEMBER_DELETE':
 
-			// Projects
-			// case 'PROJECT_CREATE':
-			// case 'PROJECT_MODIFY':
-			// case 'PROJECT_DELETE':
+				// Projects
+				// case 'PROJECT_CREATE':
+				// case 'PROJECT_MODIFY':
+				// case 'PROJECT_DELETE':
 
-			// Project tasks
-			// case 'TASK_CREATE':
-			// case 'TASK_MODIFY':
-			// case 'TASK_DELETE':
+				// Project tasks
+				// case 'TASK_CREATE':
+				// case 'TASK_MODIFY':
+				// case 'TASK_DELETE':
 
-			// Task time spent
-			// case 'TASK_TIMESPENT_CREATE':
-			// case 'TASK_TIMESPENT_MODIFY':
-			// case 'TASK_TIMESPENT_DELETE':
+				// Task time spent
+				// case 'TASK_TIMESPENT_CREATE':
+				// case 'TASK_TIMESPENT_MODIFY':
+				// case 'TASK_TIMESPENT_DELETE':
 			case 'TICKET_CREATE':
 				$resql = $this->db->query($sql);
 				// TODO voir comment regrouper les webhooks en un post
@@ -379,20 +380,20 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 				}
 				$logtriggeraction = true;
 				break;
-			// case 'TICKET_MODIFY':
-			// 	break;
-			// case 'TICKET_DELETE':
-			// 	break;
+				// case 'TICKET_MODIFY':
+				// 	break;
+				// case 'TICKET_DELETE':
+				// 	break;
 
-			// Shipping
-			// case 'SHIPPING_CREATE':
-			// case 'SHIPPING_MODIFY':
-			// case 'SHIPPING_VALIDATE':
-			// case 'SHIPPING_SENTBYMAIL':
-			// case 'SHIPPING_BILLED':
-			// case 'SHIPPING_CLOSED':
-			// case 'SHIPPING_REOPEN':
-			// case 'SHIPPING_DELETE':
+				// Shipping
+				// case 'SHIPPING_CREATE':
+				// case 'SHIPPING_MODIFY':
+				// case 'SHIPPING_VALIDATE':
+				// case 'SHIPPING_SENTBYMAIL':
+				// case 'SHIPPING_BILLED':
+				// case 'SHIPPING_CLOSED':
+				// case 'SHIPPING_REOPEN':
+				// case 'SHIPPING_DELETE':
 		}
 		if ($logtriggeraction) {
 			dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__." id=".$object->id);
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 8b0077b8f49..db9cb264f7b 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -53,7 +54,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 	}
 
 	/**
-	 * Function called when a Dolibarrr business event is done.
+	 * Function called when a Dolibarr business event is done.
 	 * All functions "runTrigger" are triggered if file
 	 * is inside directory core/triggers
 	 *

From 246051860830a91a10ebb22e1fad5b52bb848124 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 18:13:13 +0100
Subject: [PATCH 1613/1862] Add exception with latest codespell

---
 dev/tools/codespell/codespell-lines-ignore.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 80e4f25e296..5fa92f8c13e 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -326,6 +326,7 @@ $usercanread = (($user->hasRight('stock', 'mouvement', 'lire')));
 * The hook contaxt thirdpartycard has been renamed thirdpartycontact
 * The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
 - New: Add proposals into referer page of thirdparty.
+AmountIn
 NEW: ModuleBuilder: Checkin comments begin and end before each actions
 for /F "tokens=2 delims=," %%i in ('tasklist /FI "IMAGENAME eq php.exe" /FO CSV /NH') do (
 foreach ($TWeek as $week_number) {

From a1c5ab1adba64b616aae394b8733ef4ee5c536ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 18:32:39 +0100
Subject: [PATCH 1614/1862] fix phan warnings

---
 htdocs/accountancy/admin/card.php       | 3 ++-
 htdocs/accountancy/admin/categories.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 8dcbff61b8d..59a412fa3a4 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2014  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
  * Copyright (C) 2014       Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -241,7 +242,7 @@ if ($action == 'create') {
 	// Account parent
 	print '<tr><td>'.$langs->trans("Accountparent").'</td>';
 	print '<td>';
-	print $formaccounting->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
+	print $formaccounting->select_account($object->account_parent, 'account_parent', 1, [], 0, 0, 'minwidth200');
 	print '</td></tr>';
 
 	// Chart of accounts type
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 465f2836122..0231856071a 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016       Jamal Elbaz         <jamelbaz@gmail.pro>
  * Copyright (C) 2017-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
  * Copyright (C) 2022       Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -164,7 +165,7 @@ if (!empty($cat_id)) {
 
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
 		print img_picto($langs->trans("AccountingAccount"), 'accounting_account', 'class="pictofixedwith"');
-		print $form->multiselectarray('cpt_bk', $arraykeyvalue, GETPOST('cpt_bk', 'array'), null, null, '', 0, "80%", '', '', $langs->transnoentitiesnoconv("AddAccountFromBookKeepingWithNoCategories"));
+		print $form->multiselectarray('cpt_bk', $arraykeyvalue, GETPOST('cpt_bk', 'array'), 0, 0, '', 0, "80%", '', '', $langs->transnoentitiesnoconv("AddAccountFromBookKeepingWithNoCategories"));
 		print '<input type="submit" class="button button-add small" id="" class="action-delete" value="'.$langs->trans("Add").'"> ';
 	}
 }

From 98e2f2f0136d9e65ff4c5fd8ea8d573ec7efaa09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 16 Mar 2024 18:37:54 +0100
Subject: [PATCH 1615/1862] fix phan warnings

---
 htdocs/accountancy/admin/categories_list.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 8204c4ba6a2..2f1b22cf778 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2023  Laurent Destailleur      <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2024  Alexandre Spangaro       <aspangaro@easya.solutions>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -305,9 +306,9 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
-if (GETPOST('actioncancel', 'alpha')) {
-	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
-}
+// if (GETPOST('actioncancel', 'alpha')) {
+// 	$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+// }
 
 if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 	$rowidcol = "rowid";

From ebd531e3087846b4bc0072971338feb6cf119f38 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:03:20 +0100
Subject: [PATCH 1616/1862] Fix use  array instead of fileinfo

# Fix use  array instead of fileinfo

Detected with PhanTypeSuspiciousStringExpression, seperate PR
because of functional impact (to check)
---
 htdocs/expensereport/tpl/expensereport_linktofile.tpl.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 0c7b7d9bdca..d9970e9bf85 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -1,4 +1,6 @@
 <?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
 
 // Add line to select existing file
 if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
@@ -39,7 +41,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 				//print $file['path'].'/'.$minifile.'<br>';
 				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));
 				if (empty($urlforhref)) {
-					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
+					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($file['relativename'].'.'.strtolower($fileinfo['extension']));
 					print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 				} else {
 					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';

From 87388d7dab54b9a49b9ce53c9fd17f7c176db15f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 21:33:55 +0100
Subject: [PATCH 1617/1862] Debug v20

---
 htdocs/ai/admin/custom_prompt.php         |  2 +-
 htdocs/ai/admin/setup.php                 | 62 -------------------
 htdocs/ai/ajax/generate_content.php       |  2 +-
 htdocs/ai/class/ai.class.php              | 20 ++++++-
 htdocs/asset/admin/setup.php              |  9 +--
 htdocs/bookcal/admin/setup.php            |  1 -
 htdocs/core/class/html.formmail.class.php | 19 ++++--
 htdocs/core/lib/geturl.lib.php            |  4 +-
 htdocs/webportal/admin/setup.php          | 72 ++++++++++++-----------
 9 files changed, 79 insertions(+), 112 deletions(-)

diff --git a/htdocs/ai/admin/custom_prompt.php b/htdocs/ai/admin/custom_prompt.php
index 5836a0d5b26..83506888d74 100644
--- a/htdocs/ai/admin/custom_prompt.php
+++ b/htdocs/ai/admin/custom_prompt.php
@@ -207,7 +207,7 @@ if ($action == 'deleteproperty') {
 }
 
 if ($action == 'edit') {
-	$out .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	$out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 	$out .= '<input type="hidden" name="action" value="update">';
 
diff --git a/htdocs/ai/admin/setup.php b/htdocs/ai/admin/setup.php
index a4b7f2f5499..e74f3c3b5d9 100644
--- a/htdocs/ai/admin/setup.php
+++ b/htdocs/ai/admin/setup.php
@@ -88,68 +88,6 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'aZ09');
-	$maskvalue = GETPOST('maskvalue', 'alpha');
-
-	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
-		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) {
-			$error++;
-		}
-	}
-
-	if (!$error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-} elseif ($action == 'setmod') {
-	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
-	if (!empty($tmpobjectkey)) {
-		$constforval = 'Ai_'.strtoupper($tmpobjectkey)."_ADDON";
-		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
-	}
-} elseif ($action == 'set') {
-	// Activate a model
-	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del') {
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object', 'aZ09');
-		if (!empty($tmpobjectkey)) {
-			$constforval = 'Ai_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if (getDolGlobalString($constforval) == "$value") {
-				dolibarr_del_const($db, $constforval, $conf->entity);
-			}
-		}
-	}
-} elseif ($action == 'setdoc') {
-	// Set or unset default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
-	if (!empty($tmpobjectkey)) {
-		$constforval = 'Ai_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
-			// The constant that was read before the new set
-			// We therefore requires a variable to have a coherent view
-			$conf->global->$constforval = $value;
-		}
-
-		// We disable/enable the document template (into llx_document_model table)
-		$ret = delDocumentModel($value, $type);
-		if ($ret > 0) {
-			$ret = addDocumentModel($value, $type, $label, $scandir);
-		}
-	}
-} elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
-	if (!empty($tmpobjectkey)) {
-		$constforval = 'Ai_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-		dolibarr_del_const($db, $constforval, $conf->entity);
-	}
-}
-
 $action = 'edit';
 
 
diff --git a/htdocs/ai/ajax/generate_content.php b/htdocs/ai/ajax/generate_content.php
index bba1402d340..ad854743b20 100644
--- a/htdocs/ai/ajax/generate_content.php
+++ b/htdocs/ai/ajax/generate_content.php
@@ -69,7 +69,7 @@ $generatedContent = $ai->generateContent($instructions, 'auto', $function, $form
 
 if (is_array($generatedContent) && $generatedContent['error']) {
 	// Output error
-	if ($generatedContent['code'] == 429) {
+	if (!empty($generatedContent['code']) && $generatedContent['code'] == 429) {
 		print "Quota or allowed period exceeded. Retry Later !";
 	} elseif ($generatedContent['code'] >= 400) {
 		print "Error : " . $generatedContent['message'];
diff --git a/htdocs/ai/class/ai.class.php b/htdocs/ai/class/ai.class.php
index 68002b62bb8..7b46636c411 100644
--- a/htdocs/ai/class/ai.class.php
+++ b/htdocs/ai/class/ai.class.php
@@ -28,6 +28,7 @@ class Ai
 	 * @var DoliDB $db Database object
 	 */
 	protected $db;
+
 	/**
 	 * @var string $apiEndpoint
 	 */
@@ -131,9 +132,12 @@ class Ai
 				'Authorization: Bearer ' . $this->apiKey,
 				'Content-Type: application/json'
 			]);
-			$response = getURLContent($this->apiEndpoint, 'POST', $payload, $headers);
+			$response = getURLContent($this->apiEndpoint, 'POST', $payload, 1, $headers);
 
-			if ($response['http_code']  != 200) {
+			if (empty($response['http_code'])) {
+				throw new Exception('API request failed. No http received');
+			}
+			if (!empty($response['http_code']) && $response['http_code'] != 200) {
 				throw new Exception('API request failed with status code ' . $response['http_code']);
 			}
 			// Decode JSON response
@@ -149,7 +153,17 @@ class Ai
 
 			return $generatedEmailContent;
 		} catch (Exception $e) {
-			return array('error' => true, 'message' => $e->getMessage());
+			$errormessage = $e->getMessage();
+			if (!empty($response['content'])) {
+				$decodedResponse = json_decode($response['content'], true);
+
+				// With OpenAI, error is into an object error into the content
+				if (!empty($decodedResponse['error']['message'])) {
+					$errormessage .= ' - '.$decodedResponse['error']['message'];
+				}
+			}
+
+			return array('error' => true, 'message' => $errormessage, 'code' => (empty($response['http_code']) ? 0 : $response['http_code']), 'curl_error_no' => (empty($response['curl_error_no']) ? $response['curl_error_no'] : ''));
 		}
 	}
 }
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index dbe1593199e..2f30bca4e3e 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -68,6 +68,11 @@ $moduledir = 'asset';
 $myTmpObjects = array();
 $myTmpObjects['Asset'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
 
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
+
 
 /*
  * Actions
@@ -201,11 +206,7 @@ print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "asse
 echo '<span class="opacitymedium">'.$langs->trans("AssetSetupPage").'</span>';
 
 
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') {
-		continue;
-	}
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
 		 * Assets Numbering model
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index 43bd3bb66d7..dd16dfb720e 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -207,7 +207,6 @@ print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "fa-c
 // Setup page goes here
 //echo '<span class="opacitymedium">'.$langs->trans("BookCalSetupPage").'</span><br><br>';
 
-
 if ($action == 'edit') {
 	print $formSetup->generateOutput(true);
 	print '<br>';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 2bca27f5aca..edef301c3de 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1455,8 +1455,9 @@ class FormMail extends Form
 		$out .= '<td>';
 		$out .= '<input type="text" class="quatrevingtpercent" id="ai_instructions" name="instruction" placeholder="'.$langs->trans("EnterYourAIPromptHere").'..." />';
 		$out .= '<input id="generate_button" type="button" class="button smallpaddingimp"  value="'.$langs->trans('Generate').'"/>';
-		$out .= '<div id="ai_status_message" class="fieldrequired hideobject marginrightonly" >';
-		$out .= '<i class="fa fa-spinner fa-spin fa-2x fa-fw"></i>'.$langs->trans("AIProcessingPleaseWait").'</div>';
+		$out .= '<div id="ai_status_message" class="fieldrequired hideobject marginrightonly">';
+		$out .= '<i class="fa fa-spinner fa-spin fa-2x fa-fw"></i>'.$langs->trans("AIProcessingPleaseWait");
+		$out .= '</div>';
 		$out .= "</td></tr>\n";
 
 		$out .= "<script type='text/javascript'>
@@ -1471,15 +1472,24 @@ class FormMail extends Form
 
 				$('#generate_button').click(function() {
 					var instructions = $('#ai_instructions').val();
+					var timeoutfinished = 0;
+					var apicallfinished = 0;
 
 					$('#ai_status_message').show();
 					$('.icon-container .loader').show();
+					setTimeout(function() {
+						timeoutfinished = 1;
+						if (apicallfinished) {
+							$('#ai_status_message').hide();
+						}
+					}, 2000);
 
 					//editor on readonly
         			if (CKEDITOR.instances.".$htmlContent.") {
 						CKEDITOR.instances.".$htmlContent.".setReadOnly(1);
 					}
 
+
 					$.ajax({
 						url: '". DOL_URL_ROOT."/ai/ajax/generate_content.php?token=".currentToken()."',
 						type: 'POST',
@@ -1501,9 +1511,10 @@ class FormMail extends Form
 							// remove readonly
 							$('#ai_instructions').val('');
 
-							setTimeout(function() {
+							apicallfinished = 1;
+							if (timeoutfinished) {
 								$('#ai_status_message').hide();
-							}, 3000);
+							}
 						},
 						error: function(xhr, status, error) {
 							alert(error);
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index afd0d921890..dc960a7ec0e 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -111,8 +111,8 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		}
 	}
 
-	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, !getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-	curl_setopt($ch, CURLOPT_TIMEOUT, !getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, getDolGlobalInt('MAIN_USE_CONNECT_TIMEOUT', 5));
+	curl_setopt($ch, CURLOPT_TIMEOUT, getDolGlobalint('MAIN_USE_RESPONSE_TIMEOUT', 30));
 
 	// limit size of downloaded files. TODO Add MAIN_SECURITY_MAXFILESIZE_DOWNLOADED
 	$maxsize = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');
diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 1d919cb1950..d2bcd74f8e1 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -42,7 +42,8 @@ $modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleopti
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
-$type = 'myobject';
+$tmpobjectkey = GETPOST('object', 'aZ09');
+$type = 'webportal';
 
 $error = 0;
 $setupnotempty = 0;
@@ -111,9 +112,17 @@ $item->helpText = $langs->transnoentities('WebPortalUserLoggedHelp');
 
 $setupnotempty += count($formSetup->items);
 
-
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
+$moduledir = 'webportal';
+$myTmpObjects = array();
+$myTmpObjects['WebPortal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0);
+
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
+
 
 /*
  * Actions
@@ -141,36 +150,38 @@ if ($action == 'updateMask') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	$tmpobject = new $tmpobjectkey($db);
-	$tmpobject->initAsSpecimen();
+	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
+		$tmpobject = new $tmpobjectkey($db);
+		$tmpobject->initAsSpecimen();
 
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
-			break;
+		// Search template files
+		$file = '';
+		$classname = '';
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
+			if (file_exists($file)) {
+				$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
+				break;
+			}
 		}
-	}
 
-	if ($classname !== '') {
-		require_once $file;
+		if ($classname !== '') {
+			require_once $file;
 
-		$module = new $classname($db);
+			$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
-			return;
+			if ($module->write_file($tmpobject, $langs) > 0) {
+				header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
+				return;
+			} else {
+				setEventMessages($module->error, null, 'errors');
+				dol_syslog($module->error, LOG_ERR);
+			}
 		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
+			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
@@ -284,15 +295,8 @@ if ($action == 'edit') {
 }
 
 
-$moduledir = 'webportal';
-$myTmpObjects = array();
-$myTmpObjects['MyObject'] = array('label' => 'MyObject', 'includerefgeneration' => 0, 'includedocgeneration' => 0);
-
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') {
-		continue;
-	}
-	if ($myTmpObjectArray['includerefgeneration']) {
+	if (!empty($myTmpObjectArray['includerefgeneration'])) {
 		/*
 		 * Orders Numbering model
 		 */
@@ -399,7 +403,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		print "</table><br>\n";
 	}
 
-	if ($myTmpObjectArray['includedocgeneration']) {
+	if (!empty($myTmpObjectArray['includedocgeneration'])) {
 		/*
 		 * Document templates generators
 		 */

From 84f02105fbafbd4250b1371ac0c29f5330291538 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 21:40:40 +0100
Subject: [PATCH 1618/1862] Fix phan warning

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 2dbc2227f9d..e77e4b5b3c9 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1310,7 +1310,7 @@ class Website extends CommonObject
 				$newid = 0;
 
 				// Scan the line
-				if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg)) {
+				if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.+)\s--;/i', $buf, $reg)) {
 					// Example of line: "-- Page ID 179 -> 1__+MAX_llx_website_page__ - Aliases about-us --;"
 					$oldid = $reg[1];
 					$newid = ($reg[2] + $maxrowid);
@@ -1324,7 +1324,7 @@ class Website extends CommonObject
 					$newid = ($reg[1] + $maxrowid);
 					$aliasesarray = explode(',', $reg[2]);
 
-					dol_syslog("In sql source file, we have the page with the new ID ".$newid.", and we must create the shortcut aliases: ".$reg[3]);
+					dol_syslog("In sql source file, we have the page with the new ID ".$newid.", and we must create the shortcut aliases: ".$reg[2]);
 				}
 
 				if ($newid) {

From 90172fba83f7fbc183fed0bbefd6f949d5c94626 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:00:55 +0100
Subject: [PATCH 1619/1862] Code simpler

---
 htdocs/admin/hrm.php                          | 60 +++++++++--------
 htdocs/admin/knowledgemanagement.php          | 59 +++++++++--------
 htdocs/admin/workstation.php                  | 61 +++++++++---------
 htdocs/asset/admin/setup.php                  | 59 ++++++++---------
 htdocs/modulebuilder/template/admin/setup.php | 64 +++++++++----------
 htdocs/recruitment/admin/setup.php            | 60 +++++++++--------
 .../recruitment/admin/setup_candidatures.php  | 59 ++++++++---------
 htdocs/webportal/admin/setup.php              | 54 +++++++---------
 8 files changed, 223 insertions(+), 253 deletions(-)

diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 0078a384f8f..6736f26e290 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -71,6 +71,11 @@ $myTmpObjects = array();
 // TODO Scan list of objects to fill this array
 $myTmpObjects['evaluation'] = array('label' => 'Evaluation', 'includerefgeneration' => 1, 'includedocgeneration' => 0);
 
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
+
 
 /*
  * Actions
@@ -114,45 +119,41 @@ if ($action == 'update') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$nameofclass = ucfirst($tmpobjectkey);
-		$tmpobject = new $nameofclass($db);
-		$tmpobject->initAsSpecimen();
+	$nameofclass = ucfirst($tmpobjectkey);
+	$tmpobject = new $nameofclass($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$classname = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/hrm/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$classname = "pdf_".$modele;
-				break;
-			}
+	// Search template files
+	$file = '';
+	$classname = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/hrm/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$classname = "pdf_".$modele;
+			break;
 		}
+	}
 
-		if ($classname !== '') {
-			require_once $file;
+	if ($classname !== '') {
+		require_once $file;
 
-			$module = new $classname($db);
+		$module = new $classname($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -163,7 +164,6 @@ if ($action == 'update') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -173,7 +173,6 @@ if ($action == 'update') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -189,7 +188,6 @@ if ($action == 'update') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 6e9aef924c6..132eecdada3 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -68,6 +68,11 @@ $myTmpObjects = array();
 // TODO Scan list of objects to fill this array
 $myTmpObjects['knowledgemanagement'] = array('label' => 'KnowledgeManagement', 'includerefgeneration' => 1, 'includedocgeneration' => 0, 'class' => 'KnowledgeRecord');
 
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
+
 
 /*
  * Actions
@@ -93,45 +98,41 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$className = $myTmpObjects[$tmpobjectkey]['class'];
-		$tmpobject = new $className($db);
-		$tmpobject->initAsSpecimen();
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$className = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$className = "pdf_".$modele;
-				break;
-			}
+	// Search template files
+	$file = '';
+	$className = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$className = "pdf_".$modele;
+			break;
 		}
+	}
 
-		if ($className !== '') {
-			require_once $file;
+	if ($className !== '') {
+		require_once $file;
 
-			$module = new $className($db);
+		$module = new $className($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -152,7 +153,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -168,7 +168,6 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 818a9c014f4..11d0b08e7f3 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -53,8 +53,12 @@ if (!$user->admin) {
 
 $moduledir = 'workstation';
 $myTmpObjects = array();
-$myTmpObjects['workstation'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
+$myTmpObjects['workstation'] = array('label' => 'Workstation', 'includerefgeneration' => 1, 'includedocgeneration' => 0, 'class' => 'Workstation');
 
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
 
 
 /*
@@ -82,48 +86,43 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$nameofclass = ucfirst($tmpobjectkey);
-		$tmpobject = new $nameofclass($db);
-		$tmpobject->initAsSpecimen();
+	$nameofclass = ucfirst($tmpobjectkey);
+	$tmpobject = new $nameofclass($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$classname = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$classname = "pdf_".$modele;
-				break;
-			}
+	// Search template files
+	$file = '';
+	$classname = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$classname = "pdf_".$modele;
+			break;
 		}
+	}
 
-		if ($classname !== '') {
-			require_once $file;
+	if ($classname !== '') {
+		require_once $file;
 
-			$module = new $classname($db);
+		$module = new $classname($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'set') {
 	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
-
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
 		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
@@ -133,7 +132,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
 	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
@@ -149,7 +147,6 @@ if ($action == 'updateMask') {
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	$constforval = 'WORKSTATION_'.strtoupper($tmpobjectkey)."_ADDON";
 	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 }
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 2f30bca4e3e..91daeaaf19f 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -66,10 +66,10 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 $moduledir = 'asset';
 $myTmpObjects = array();
-$myTmpObjects['Asset'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
+$myTmpObjects['asset'] = array('label' => 'Asset', 'includerefgeneration' => 1, 'includedocgeneration' => 0, 'class' => 'Asset');
 
 $tmpobjectkey = GETPOST('object', 'aZ09');
-if ($tmpobjectkey && array_key_exists($tmpobjectkey, $myTmpObjects)) {
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
 	accessforbidden('Bad value for object. Hack attempt ?');
 }
 
@@ -98,45 +98,41 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$nameofclass = ucfirst($tmpobjectkey);
-		$tmpobject = new $nameofclass($db);
-		$tmpobject->initAsSpecimen();
+	$nameofclass = ucfirst($tmpobjectkey);
+	$tmpobject = new $nameofclass($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$classname = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$classname = "pdf_".$modele;
-				break;
-			}
+	// Search template files
+	$file = '';
+	$classname = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$classname = "pdf_".$modele;
+			break;
 		}
+	}
 
-		if ($classname !== '') {
-			require_once $file;
+	if ($classname !== '') {
+		require_once $file;
 
-			$module = new $classname($db);
+		$module = new $classname($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'ASSET_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -147,7 +143,6 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -157,7 +152,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -173,7 +167,6 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 311fc2472a4..71537be6691 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -176,6 +176,11 @@ $myTmpObjects = array();
 // TODO Scan list of objects to fill this array
 $myTmpObjects['myobject'] = array('label'=>'MyObject', 'includerefgeneration'=>0, 'includedocgeneration'=>0, 'class'=>'MyObject');
 
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
+
 
 /*
  * Actions
@@ -206,47 +211,43 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$className = $myTmpObjects[$tmpobjectkey]['class'];
-		$tmpobject = new $className($db);
-		$tmpobject->initAsSpecimen();
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$className = '';
-		$filefound = 0;
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$filefound = 1;
-				$className = "pdf_".$modele."_".strtolower($tmpobjectkey);
-				break;
-			}
+	// Search template files
+	$file = '';
+	$className = '';
+	$filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$filefound = 1;
+			$className = "pdf_".$modele."_".strtolower($tmpobjectkey);
+			break;
 		}
+	}
 
-		if ($filefound) {
-			require_once $file;
+	if ($filefound) {
+		require_once $file;
 
-			$module = new $className($db);
+		$module = new $className($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mymodule-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mymodule-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -257,7 +258,6 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -267,7 +267,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -283,7 +282,6 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 67257d6e875..21a965437ae 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -89,7 +89,12 @@ $setupnotempty = 0;
 
 $moduledir = 'recruitment';
 $myTmpObjects = array();
-$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration' => 1, 'includedocgeneration' => 1);
+$myTmpObjects['recruitmentjobposition'] = array('label' => 'RecruitmentJobPosition', 'includerefgeneration' => 1, 'includedocgeneration' => 1, 'class' => 'RecruitmentJobPosition');
+
+$tmpobjectkey = GETPOST('object', 'aZ09');
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
+	accessforbidden('Bad value for object. Hack attempt ?');
+}
 
 
 /*
@@ -117,40 +122,37 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (in_array($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
-		$tmpobject->initAsSpecimen();
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$classname = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
-				break;
-			}
+	// Search template files
+	$file = '';
+	$classname = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
+			break;
 		}
+	}
 
-		if ($classname !== '') {
-			require_once $file;
+	if ($classname !== '') {
+		require_once $file;
 
-			$module = new $classname($db);
+		$module = new $classname($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=recruitment-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=recruitment-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'set') {
 	// Activate a model
@@ -158,7 +160,6 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {
@@ -168,7 +169,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
 
@@ -176,7 +176,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -192,7 +191,6 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index c72257e9d2a..9706487e6e3 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -58,9 +58,10 @@ $arrayofparameters = array(
 $error = 0;
 $setupnotempty = 0;
 
+$tmpobjectkey = GETPOST('object', 'aZ09');
 $moduledir = 'recruitment';
 $myTmpObjects = array();
-$myTmpObjects['RecruitmentCandidature'] = array('includerefgeneration' => 1, 'includedocgeneration' => 0);
+$myTmpObjects['recruitmentcandidature'] = array('label' => 'RecruitmentCandidature', 'includerefgeneration' => 1, 'includedocgeneration' => 0, 'class' => 'RecruitmentCandidature');
 
 
 /*
@@ -88,48 +89,43 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$className = $myTmpObjects[$tmpobjectkey]['class'];
-		$tmpobject = new $className($db);
-		$tmpobject->initAsSpecimen();
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$classname = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-			if (file_exists($file)) {
-				$classname = "pdf_".$modele;
-				break;
-			}
+	// Search template files
+	$file = '';
+	$classname = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$classname = "pdf_".$modele;
+			break;
 		}
+	}
 
-		if ($classname !== '') {
-			require_once $file;
+	if ($classname !== '') {
+		require_once $file;
 
-			$module = new $classname($db);
+		$module = new $classname($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'set') {
 	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
-
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
@@ -139,7 +135,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
 
@@ -147,7 +142,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
@@ -161,7 +155,6 @@ if ($action == 'updateMask') {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);
diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index d2bcd74f8e1..55006cab01f 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -119,7 +119,7 @@ $myTmpObjects = array();
 $myTmpObjects['WebPortal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0);
 
 $tmpobjectkey = GETPOST('object', 'aZ09');
-if ($tmpobjectkey && array_key_exists($tmpobjectkey, $myTmpObjects)) {
+if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
 	accessforbidden('Bad value for object. Hack attempt ?');
 }
 
@@ -148,44 +148,40 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 
-	if (array_key_exists($tmpobjectkey, $myTmpObjects)) {
-		$tmpobject = new $tmpobjectkey($db);
-		$tmpobject->initAsSpecimen();
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->initAsSpecimen();
 
-		// Search template files
-		$file = '';
-		$classname = '';
-		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir) {
-			$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
-			if (file_exists($file)) {
-				$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
-				break;
-			}
+	// Search template files
+	$file = '';
+	$classname = '';
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
+		if (file_exists($file)) {
+			$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
+			break;
 		}
+	}
 
-		if ($classname !== '') {
-			require_once $file;
+	if ($classname !== '') {
+		require_once $file;
 
-			$module = new $classname($db);
+		$module = new $classname($db);
 
-			if ($module->write_file($tmpobject, $langs) > 0) {
-				header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
-				return;
-			} else {
-				setEventMessages($module->error, null, 'errors');
-				dol_syslog($module->error, LOG_ERR);
-			}
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
+			return;
 		} else {
-			setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-			dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
 		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 } elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . "_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
@@ -206,7 +202,6 @@ if ($action == 'updateMask') {
 	}
 } elseif ($action == 'setdoc') {
 	// Set or unset default model
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
 		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
@@ -222,7 +217,6 @@ if ($action == 'updateMask') {
 		}
 	}
 } elseif ($action == 'unsetdoc') {
-	$tmpobjectkey = GETPOST('object', 'aZ09');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
 		dolibarr_del_const($db, $constforval, $conf->entity);

From 614d8021174e219eca4a270cf5e159488e5d3b61 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:26:58 +0100
Subject: [PATCH 1620/1862] Fix getting $id for Object from post

# Fix getting $id for Object from post

$id was assigned `GETPOSTINT() || GETPOSTINT()` which is a boolean while
the objective is to assigne the best id.
This fixes that.
---
 htdocs/societe/ajax/ajaxcompanies.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index f7bb0ce0c60..11de653e6c5 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Cyrille de Lambert   <info@auguria.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -43,7 +44,10 @@ if (!defined('NOREQUIRESOC')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-$id = GETPOSTINT('socid') || GETPOSTINT('id_fourn');
+$id = GETPOSTINT('socid');
+if ($id == 0) {
+	$id = GETPOSTINT('id_fourn');
+}
 
 $object = new Societe($db);
 if ($id > 0) {

From d6674ee44be19c791b7dd34cf023980bf4516c21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:04:39 +0100
Subject: [PATCH 1621/1862] Fix default value

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

diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 132eecdada3..1c8319ac06a 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -63,6 +63,10 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
+if (!getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON')) {
+	$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON = 'mod_knowledgerecord_standard';
+}
+
 $moduledir = 'knowledgemanagement';
 $myTmpObjects = array();
 // TODO Scan list of objects to fill this array

From 487a55750a455ffc717f70a1141d101de1f7fa22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:13:00 +0100
Subject: [PATCH 1622/1862] Fix warnings

---
 htdocs/fourn/class/fournisseur.facture.class.php | 5 +++--
 htdocs/install/upgrade.php                       | 3 ++-
 htdocs/projet/class/project.class.php            | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index c9b37398cae..beb2a0d3564 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3408,10 +3408,11 @@ class FactureFournisseur extends CommonInvoice
 	{
 		global $conf, $langs, $user;
 
-		$error = 0;
 		$this->output = '';
 		$this->error = '';
 		$nbMailSend = 0;
+
+		$error = 0;
 		$errorsMsg = array();
 
 		$langs->load('bills');
@@ -3692,7 +3693,7 @@ class FactureFournisseur extends CommonInvoice
 
 			return 0;
 		} else {
-			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? implode(', ', $errorsMsg) : $error;
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(empty($errorsMsg) ? $error : implode(', ', $errorsMsg));
 
 			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 7f2dfc0f0cd..60055abf65e 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -417,7 +417,8 @@ if (!$ok && isset($argv[1])) {
 }
 dolibarr_install_syslog("Exit ".$ret);
 
-dolibarr_install_syslog("--- upgrade: end ".((!$ok && empty($_GET["ignoreerrors"])) || $dirmodule));
+dolibarr_install_syslog("--- upgrade: end ".(!$ok && empty($_GET["ignoreerrors"]))." dirmodule=".$dirmodule);
+
 $nonext = (!$ok && empty($_GET["ignoreerrors"])) ? 2 : 0;
 if ($dirmodule) {
 	$nonext = 1;
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 92680ea5719..08c54b13fce 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2566,6 +2566,8 @@ class Project extends CommonObject
 
 		$now = dol_now();
 		$nowDate = dol_getdate($now, true);
+
+		$errormesg = '';
 		$errorsMsg = array();
 
 		$firstDayOfWeekTS = dol_get_first_day_week($nowDate['mday'], $nowDate['mon'], $nowDate['year']);
@@ -2714,7 +2716,7 @@ class Project extends CommonObject
 				$this->db->commit();
 			}
 		}
-		if ($errormesg) {
+		if (!empty($errormesg)) {
 			$errorsMsg[] = $errormesg;
 		}
 
@@ -2723,7 +2725,7 @@ class Project extends CommonObject
 			dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
 			return 0;
 		} else {
-			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? implode(', ', $errorsMsg) : $error;
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(empty($errorsMsg) ? $error : implode(', ', $errorsMsg));
 			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
 			return $error;
 		}

From e8596c61c32b10979c5a5e854c4c7517864d0019 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:18:58 +0100
Subject: [PATCH 1623/1862] Fix phan

---
 htdocs/asset/admin/setup.php                    | 3 ++-
 htdocs/core/lib/geturl.lib.php                  | 2 +-
 htdocs/recruitment/admin/setup.php              | 3 ++-
 htdocs/recruitment/admin/setup_candidatures.php | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 91daeaaf19f..67ba80471ae 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -272,7 +272,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 								print '</td>';
 
-								$mytmpinstance = new $myTmpObjectKey($db);
+								$className = $myTmpObjectArray['class'];
+								$mytmpinstance = new $className($db);
 								$mytmpinstance->initAsSpecimen();
 
 								// Info
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index dc960a7ec0e..31b27356498 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -112,7 +112,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	}
 
 	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, getDolGlobalInt('MAIN_USE_CONNECT_TIMEOUT', 5));
-	curl_setopt($ch, CURLOPT_TIMEOUT, getDolGlobalint('MAIN_USE_RESPONSE_TIMEOUT', 30));
+	curl_setopt($ch, CURLOPT_TIMEOUT, getDolGlobalInt('MAIN_USE_RESPONSE_TIMEOUT', 30));
 
 	// limit size of downloaded files. TODO Add MAIN_SECURITY_MAXFILESIZE_DOWNLOADED
 	$maxsize = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 21a965437ae..a4fd778ad63 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -340,7 +340,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 								print '</td>';
 
-								$mytmpinstance = new $myTmpObjectKey($db);
+								$className = $myTmpObjectArray['class'];
+								$mytmpinstance = new $className($db);
 								$mytmpinstance->initAsSpecimen();
 
 								// Info
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 9706487e6e3..b248236d1f7 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -305,7 +305,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 								print '</td>';
 
-								$mytmpinstance = new $myTmpObjectKey($db);
+								$className = $myTmpObjectArray['class'];
+								$mytmpinstance = new $className($db);
 								$mytmpinstance->initAsSpecimen();
 
 								// Info

From 310b74960e64de51ed10f5a19b771cdf68746d8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:26:24 +0100
Subject: [PATCH 1624/1862] Fight against ucfirst to get a className.

---
 htdocs/admin/hrm.php                            |  8 ++++----
 htdocs/admin/knowledgemanagement.php            |  2 +-
 htdocs/asset/admin/setup.php                    |  6 +++---
 htdocs/modulebuilder/template/admin/setup.php   |  2 +-
 htdocs/recruitment/admin/setup.php              |  5 +++--
 htdocs/recruitment/admin/setup_candidatures.php |  2 +-
 htdocs/webportal/admin/setup.php                | 10 ++++++----
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 6736f26e290..c55622f1a11 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -69,7 +69,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 $moduledir = 'hrm';
 $myTmpObjects = array();
 // TODO Scan list of objects to fill this array
-$myTmpObjects['evaluation'] = array('label' => 'Evaluation', 'includerefgeneration' => 1, 'includedocgeneration' => 0);
+$myTmpObjects['evaluation'] = array('label' => 'Evaluation', 'includerefgeneration' => 1, 'includedocgeneration' => 0, 'class' => 'Evaluation');
 
 $tmpobjectkey = GETPOST('object', 'aZ09');
 if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
@@ -117,11 +117,11 @@ if ($action == 'update') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
-	$nameofclass = ucfirst($tmpobjectkey);
-	$tmpobject = new $nameofclass($db);
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 1c8319ac06a..ef80a03cbcb 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -100,7 +100,7 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
 	$className = $myTmpObjects[$tmpobjectkey]['class'];
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 67ba80471ae..0016c5e82e5 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -96,11 +96,11 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
-	$nameofclass = ucfirst($tmpobjectkey);
-	$tmpobject = new $nameofclass($db);
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 71537be6691..eaaf8206e87 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -209,7 +209,7 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
 	$className = $myTmpObjects[$tmpobjectkey]['class'];
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index a4fd778ad63..d77a7734449 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -120,10 +120,11 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
-	$tmpobject = new $tmpobjectkey($db);
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index b248236d1f7..397372d46da 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -87,7 +87,7 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
 	$className = $myTmpObjects[$tmpobjectkey]['class'];
diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 55006cab01f..8e800f355a9 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -116,7 +116,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 $moduledir = 'webportal';
 $myTmpObjects = array();
-$myTmpObjects['WebPortal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0);
+//$myTmpObjects['webportal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'WebPortal');
 
 $tmpobjectkey = GETPOST('object', 'aZ09');
 if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
@@ -146,10 +146,11 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen') {
+} elseif ($action == 'specimen' && $tmpobjectkey) {
 	$modele = GETPOST('module', 'alpha');
 
-	$tmpobject = new $tmpobjectkey($db);
+	$className = $myTmpObjects[$tmpobjectkey]['class'];
+	$tmpobject = new $className($db);
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
@@ -362,7 +363,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 								print '</td>';
 
-								$mytmpinstance = new $myTmpObjectKey($db);
+								$className = $myTmpObjectArray['class'];
+								$mytmpinstance = new $className($db);
 								$mytmpinstance->initAsSpecimen();
 
 								// Info

From 19afa8f79f6d53a17c0f580b1f457caaeb1e8506 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:37:42 +0100
Subject: [PATCH 1625/1862] Fix warning

---
 htdocs/webportal/admin/setup.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 8e800f355a9..60486430170 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -42,7 +42,6 @@ $modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleopti
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
-$tmpobjectkey = GETPOST('object', 'aZ09');
 $type = 'webportal';
 
 $error = 0;
@@ -116,7 +115,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 $moduledir = 'webportal';
 $myTmpObjects = array();
-//$myTmpObjects['webportal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'WebPortal');
+$myTmpObjects['webportal'] = array('label' => 'WebPortal', 'includerefgeneration' => 0, 'includedocgeneration' => 0, 'class' => 'WebPortal');
 
 $tmpobjectkey = GETPOST('object', 'aZ09');
 if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
@@ -193,7 +192,6 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		$tmpobjectkey = GETPOST('object', 'aZ09');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
 			if (getDolGlobalString($constforval) == "$value") {

From 00ab361fcf4a58ca08056fa467671d561064b6d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 22:43:11 +0100
Subject: [PATCH 1626/1862] Clean code

---
 htdocs/webportal/admin/setup.php       | 351 -------------------------
 htdocs/webportal/lib/webportal.lib.php |  17 +-
 2 files changed, 1 insertion(+), 367 deletions(-)

diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php
index 60486430170..3884a965121 100644
--- a/htdocs/webportal/admin/setup.php
+++ b/htdocs/webportal/admin/setup.php
@@ -129,99 +129,6 @@ if ($tmpobjectkey && !array_key_exists($tmpobjectkey, $myTmpObjects)) {
 
 include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
 
-if ($action == 'updateMask') {
-	$maskconst = GETPOST('maskconst', 'aZ09');
-	$maskvalue = GETPOST('maskvalue', 'alpha');
-
-	if ($maskconst && preg_match('/_MASK$/', $maskconst)) {
-		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) {
-			$error++;
-		}
-	}
-
-	if (!$error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-} elseif ($action == 'specimen' && $tmpobjectkey) {
-	$modele = GETPOST('module', 'alpha');
-
-	$className = $myTmpObjects[$tmpobjectkey]['class'];
-	$tmpobject = new $className($db);
-	$tmpobject->initAsSpecimen();
-
-	// Search template files
-	$file = '';
-	$classname = '';
-	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir) {
-		$file = dol_buildpath($reldir . "core/modules/webportal/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
-		if (file_exists($file)) {
-			$classname = "pdf_" . $modele . "_" . strtolower($tmpobjectkey);
-			break;
-		}
-	}
-
-	if ($classname !== '') {
-		require_once $file;
-
-		$module = new $classname($db);
-
-		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: " . DOL_URL_ROOT . "/document.php?modulepart=webportal-" . strtolower($tmpobjectkey) . "&file=SPECIMEN.pdf");
-			return;
-		} else {
-			setEventMessages($module->error, null, 'errors');
-			dol_syslog($module->error, LOG_ERR);
-		}
-	} else {
-		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-	}
-} elseif ($action == 'setmod') {
-	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
-	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . "_ADDON";
-		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
-	}
-} elseif ($action == 'set') {
-	// Activate a model
-	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del') {
-	$ret = delDocumentModel($value, $type);
-	if ($ret > 0) {
-		if (!empty($tmpobjectkey)) {
-			$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
-			if (getDolGlobalString($constforval) == "$value") {
-				dolibarr_del_const($db, $constforval, $conf->entity);
-			}
-		}
-	}
-} elseif ($action == 'setdoc') {
-	// Set or unset default model
-	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
-		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
-			// The constant that was read before the new set
-			// We therefore requires a variable to have a coherent view
-			$conf->global->$constforval = $value;
-		}
-
-		// We disable/enable the document template (into llx_document_model table)
-		$ret = delDocumentModel($value, $type);
-		if ($ret > 0) {
-			$ret = addDocumentModel($value, $type, $label, $scandir);
-		}
-	}
-} elseif ($action == 'unsetdoc') {
-	if (!empty($tmpobjectkey)) {
-		$constforval = 'WEBPORTAL_' . strtoupper($tmpobjectkey) . '_ADDON_PDF';
-		dolibarr_del_const($db, $constforval, $conf->entity);
-	}
-}
-
 // Force always edit mode
 if (empty($action) || $action == 'update') {
 	$action = 'edit';
@@ -287,264 +194,6 @@ if ($action == 'edit') {
 	print '<br>' . $langs->trans("NothingToSetup");
 }
 
-
-foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if (!empty($myTmpObjectArray['includerefgeneration'])) {
-		/*
-		 * Orders Numbering model
-		 */
-		$setupnotempty++;
-
-		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectArray['label']), '', '');
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td>' . $langs->trans("Name") . '</td>';
-		print '<td>' . $langs->trans("Description") . '</td>';
-		print '<td class="nowrap">' . $langs->trans("Example") . '</td>';
-		print '<td class="center" width="60">' . $langs->trans("Status") . '</td>';
-		print '<td class="center" width="16">' . $langs->trans("ShortInfo") . '</td>';
-		print '</tr>' . "\n";
-
-		clearstatcache();
-
-		foreach ($dirmodels as $reldir) {
-			$dir = dol_buildpath($reldir . "core/modules/" . $moduledir);
-
-			if (is_dir($dir)) {
-				$handle = opendir($dir);
-				if (is_resource($handle)) {
-					while (($file = readdir($handle)) !== false) {
-						if (strpos($file, 'mod_' . strtolower($myTmpObjectKey) . '_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
-							$file = substr($file, 0, dol_strlen($file) - 4);
-
-							require_once $dir . '/' . $file . '.php';
-
-							$module = new $file($db);
-
-							// Show modules according to features level
-							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
-								continue;
-							}
-							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
-								continue;
-							}
-
-							if ($module->isEnabled()) {
-								dol_include_once('/' . $moduledir . '/class/' . strtolower($myTmpObjectKey) . '.class.php');
-
-								print '<tr class="oddeven"><td>' . $module->name . "</td><td>\n";
-								print $module->info();
-								print '</td>';
-
-								// Show example of numbering model
-								print '<td class="nowrap">';
-								$tmp = $module->getExample();
-								if (preg_match('/^Error/', $tmp)) {
-									$langs->load("errors");
-									print '<div class="error">' . $langs->trans($tmp) . '</div>';
-								} elseif ($tmp == 'NotConfigured') {
-									print $langs->trans($tmp);
-								} else {
-									print $tmp;
-								}
-								print '</td>' . "\n";
-
-								print '<td class="center">';
-								$constforvar = 'WEBPORTAL_' . strtoupper($myTmpObjectKey) . '_ADDON';
-								if (getDolGlobalString($constforvar) == $file) {
-									print img_picto($langs->trans("Activated"), 'switch_on');
-								} else {
-									print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setmod&token=' . newToken() . '&object=' . strtolower($myTmpObjectKey) . '&value=' . urlencode($file) . '">';
-									print img_picto($langs->trans("Disabled"), 'switch_off');
-									print '</a>';
-								}
-								print '</td>';
-
-								$className = $myTmpObjectArray['class'];
-								$mytmpinstance = new $className($db);
-								$mytmpinstance->initAsSpecimen();
-
-								// Info
-								$htmltooltip = '';
-								$htmltooltip .= '' . $langs->trans("Version") . ': <b>' . $module->getVersion() . '</b><br>';
-
-								$nextval = $module->getNextValue($mytmpinstance);
-								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-									$htmltooltip .= '' . $langs->trans("NextValue") . ': ';
-									if ($nextval) {
-										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
-											$nextval = $langs->trans($nextval);
-										}
-										$htmltooltip .= $nextval . '<br>';
-									} else {
-										$htmltooltip .= $langs->trans($module->error) . '<br>';
-									}
-								}
-
-								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
-								print '</td>';
-
-								print "</tr>\n";
-							}
-						}
-					}
-					closedir($handle);
-				}
-			}
-		}
-		print "</table><br>\n";
-	}
-
-	if (!empty($myTmpObjectArray['includedocgeneration'])) {
-		/*
-		 * Document templates generators
-		 */
-		$setupnotempty++;
-		$type = strtolower($myTmpObjectKey);
-
-		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
-
-		// Load array def with activated templates
-		$def = array();
-		$sql = "SELECT nom";
-		$sql .= " FROM " . $db->prefix() . "document_model";
-		$sql .= " WHERE type = '" . $db->escape($type) . "'";
-		$sql .= " AND entity = " . $conf->entity;
-		$resql = $db->query($sql);
-		if ($resql) {
-			$i = 0;
-			$num_rows = $db->num_rows($resql);
-			while ($i < $num_rows) {
-				$array = $db->fetch_array($resql);
-				array_push($def, $array[0]);
-				$i++;
-			}
-		} else {
-			dol_print_error($db);
-		}
-
-		print "<table class=\"noborder\" width=\"100%\">\n";
-		print "<tr class=\"liste_titre\">\n";
-		print '<td>' . $langs->trans("Name") . '</td>';
-		print '<td>' . $langs->trans("Description") . '</td>';
-		print '<td class="center" width="60">' . $langs->trans("Status") . "</td>\n";
-		print '<td class="center" width="60">' . $langs->trans("Default") . "</td>\n";
-		print '<td class="center" width="38">' . $langs->trans("ShortInfo") . '</td>';
-		print '<td class="center" width="38">' . $langs->trans("Preview") . '</td>';
-		print "</tr>\n";
-
-		clearstatcache();
-		$filelist = array();
-
-		foreach ($dirmodels as $reldir) {
-			foreach (array('', '/doc') as $valdir) {
-				$realpath = $reldir . "core/modules/" . $moduledir . $valdir;
-				$dir = dol_buildpath($realpath);
-
-				if (is_dir($dir)) {
-					$handle = opendir($dir);
-					if (is_resource($handle)) {
-						while (($file = readdir($handle)) !== false) {
-							$filelist[] = $file;
-						}
-						closedir($handle);
-						arsort($filelist);
-
-						foreach ($filelist as $file) {
-							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
-								if (file_exists($dir . '/' . $file)) {
-									$name = substr($file, 4, dol_strlen($file) - 16);
-									$classname = substr($file, 0, dol_strlen($file) - 12);
-
-									require_once $dir . '/' . $file;
-									$module = new $classname($db);
-
-									$modulequalified = 1;
-									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
-										$modulequalified = 0;
-									}
-									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
-										$modulequalified = 0;
-									}
-
-									if ($modulequalified) {
-										print '<tr class="oddeven"><td width="100">';
-										print(empty($module->name) ? $name : $module->name);
-										print "</td><td>\n";
-										if (method_exists($module, 'info')) {
-											print $module->info($langs);
-										} else {
-											print $module->description;
-										}
-										print '</td>';
-
-										// Active
-										if (in_array($name, $def)) {
-											print '<td class="center">' . "\n";
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=del&token=' . newToken() . '&value=' . urlencode($name) . '">';
-											print img_picto($langs->trans("Enabled"), 'switch_on');
-											print '</a>';
-											print '</td>';
-										} else {
-											print '<td class="center">' . "\n";
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=set&token=' . newToken() . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</a>';
-											print "</td>";
-										}
-
-										// Default
-										print '<td class="center">';
-										$constforvar = 'WEBPORTAL_' . strtoupper($myTmpObjectKey) . '_ADDON_PDF';
-										if (getDolGlobalString($constforvar) == $name) {
-											//print img_picto($langs->trans("Default"), 'on');
-											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=unsetdoc&token=' . newToken() . '&object=' . urlencode(strtolower($myTmpObjectKey)) . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '&amp;type=' . urlencode($type) . '" alt="' . $langs->trans("Disable") . '">' . img_picto($langs->trans("Enabled"), 'on') . '</a>';
-										} else {
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setdoc&token=' . newToken() . '&object=' . urlencode(strtolower($myTmpObjectKey)) . '&value=' . urlencode($name) . '&scan_dir=' . urlencode($module->scandir) . '&label=' . urlencode($module->name) . '" alt="' . $langs->trans("Default") . '">' . img_picto($langs->trans("Disabled"), 'off') . '</a>';
-										}
-										print '</td>';
-
-										// Info
-										$htmltooltip = '' . $langs->trans("Name") . ': ' . $module->name;
-										$htmltooltip .= '<br>' . $langs->trans("Type") . ': ' . ($module->type ? $module->type : $langs->trans("Unknown"));
-										if ($module->type == 'pdf') {
-											$htmltooltip .= '<br>' . $langs->trans("Width") . '/' . $langs->trans("Height") . ': ' . $module->page_largeur . '/' . $module->page_hauteur;
-										}
-										$htmltooltip .= '<br>' . $langs->trans("Path") . ': ' . preg_replace('/^\//', '', $realpath) . '/' . $file;
-
-										$htmltooltip .= '<br><br><u>' . $langs->trans("FeaturesSupported") . ':</u>';
-										$htmltooltip .= '<br>' . $langs->trans("Logo") . ': ' . yn($module->option_logo, 1, 1);
-										$htmltooltip .= '<br>' . $langs->trans("MultiLanguage") . ': ' . yn($module->option_multilang, 1, 1);
-
-										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
-										print '</td>';
-
-										// Preview
-										print '<td class="center">';
-										if ($module->type == 'pdf') {
-											$newname = preg_replace('/_' . preg_quote(strtolower($myTmpObjectKey), '/') . '/', '', $name);
-											print '<a href="' . $_SERVER["PHP_SELF"] . '?action=specimen&module=' . urlencode($newname) . '&object=' . urlencode($myTmpObjectKey) . '">' . img_object($langs->trans("Preview"), 'pdf') . '</a>';
-										} else {
-											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-										}
-										print '</td>';
-
-										print "</tr>\n";
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		print '</table>';
-	}
-}
-
 // Page end
 print dol_get_fiche_end();
 
diff --git a/htdocs/webportal/lib/webportal.lib.php b/htdocs/webportal/lib/webportal.lib.php
index 97feb78f06a..a73e6053117 100644
--- a/htdocs/webportal/lib/webportal.lib.php
+++ b/htdocs/webportal/lib/webportal.lib.php
@@ -32,16 +32,12 @@ function webportalAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	// global $db;
-	// $extrafields = new ExtraFields($db);
-	// $extrafields->fetch_name_optionals_label('myobject');
-
 	$langs->load("website");
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '"/webportal/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT . '/webportal/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -56,17 +52,6 @@ function webportalAdminPrepareHead()
 	$head[$h][2] = 'css';
 	$h++;
 
-	/*
-	$head[$h][0] = dol_buildpath("/webportal/admin/myobject_extrafields.php", 1);
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$nbExtrafields = is_countable($extrafields->attributes['myobject']['label']) ? count($extrafields->attributes['myobject']['label']) : 0;
-	if ($nbExtrafields > 0) {
-		$head[$h][1] .= ' <span class="badge">' . $nbExtrafields . '</span>';
-	}
-	$head[$h][2] = 'myobject_extrafields';
-	$h++;
-	*/
-
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(

From 7b8cbf0e5eeafc3a6641b5a1f00680cb9343b02e Mon Sep 17 00:00:00 2001
From: ksar <ksar.ksar@gmail.com>
Date: Sat, 16 Mar 2024 22:52:17 +0100
Subject: [PATCH 1627/1862] UPDATE: Doliwamp to PHP V7.4

UPDATE Doliwamp to PHP V7.4.

Warning : You need to update the Micrsoft Visual C++ Redistributable for Visual Studio from 2015 to at least 2017
---
 build/exe/doliwamp/Languages/MyCatalan.isl |  2 +-
 build/exe/doliwamp/Languages/MyEnglish.isl |  2 +-
 build/exe/doliwamp/Languages/MyFrench.isl  | 54 +++++++++++-----------
 build/exe/doliwamp/Languages/MyGerman.isl  |  2 +-
 build/exe/doliwamp/Languages/MySpanish.isl |  2 +-
 build/exe/doliwamp/doliwamp.iss            |  8 ++--
 build/makepack-howto.txt                   |  3 +-
 7 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MyCatalan.isl b/build/exe/doliwamp/Languages/MyCatalan.isl
index cb1066b5f91..c2f8ad5791d 100644
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reini
 OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
 OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
 
-DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2015". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
+DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
 ContinueAnyway=Continua igualment (el procés d'instal·lació podria fallar sense aquest prerequisit)
diff --git a/build/exe/doliwamp/Languages/MyEnglish.isl b/build/exe/doliwamp/Languages/MyEnglish.isl
index 2a6c8b9a4ba..566d4410334 100644
--- a/build/exe/doliwamp/Languages/MyEnglish.isl
+++ b/build/exe/doliwamp/Languages/MyEnglish.isl
@@ -44,5 +44,5 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
 OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by the new Dolibarr version
 OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with the new Dolibarr version
 
-DLLMissing=Your Windows installation is missing The "Microsoft Visual C++ Redistributable for Visual Studio 2015" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+DLLMissing=Your Windows installation is missing The "Microsoft Visual C++ Redistributable for Visual Studio 2017" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170) and restart DoliWamp installation/upgrade after.
 ContinueAnyway=Continue anyway (install process may fail without this prerequisite)
diff --git a/build/exe/doliwamp/Languages/MyFrench.isl b/build/exe/doliwamp/Languages/MyFrench.isl
index 6c6294fb7c4..ca38aa599e3 100644
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -2,47 +2,47 @@
 [CustomMessages]
 
 NameAndVersion=%1 version %2
-AdditionalIcons=Ic�nes suppl�mentaires :
-CreateDesktopIcon=Cr�er une ic�ne sur le &Bureau
-CreateQuickLaunchIcon=Cr�er une ic�ne dans la barre de &Lancement rapide
+AdditionalIcons=Icônes supplémentaires :
+CreateDesktopIcon=Créer une icône sur le &Bureau
+CreateQuickLaunchIcon=Créer une icône dans la barre de &Lancement rapide
 ProgramOnTheWeb=Page d'accueil de %1
-UninstallProgram=D�sinstaller %1
-LaunchProgram=Ex�cuter %1
+UninstallProgram=Désinstaller %1
+LaunchProgram=Exécuter %1
 AssocFileExtension=&Associer %1 avec l'extension de fichier %2
 AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
 
-YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr�requis comme Apache, Mysql et PHP).
-ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM install� sur un ordinateur local peut �tre dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos donn�es. Faites-le si vous �tes pr�t � g�rer les sauvegardes vous-m�me s�rieusement. Sinon, utilisez plut�t une installation en Saas (voir https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=De plus, si vous avez des comp�tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut�t une installation manuelle de Dolibarr sur un serveur existant �quip� de Apache, Mysql et PHP.
-ButIfYouLook=Mais si vous recherchez une installation cl� en main automatis�e sur une poste local, vous �tes sur la bonne voie...
-DoYouWantToStart=Voulez-vous d�marrer le processus d'installation ?
+YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants prérequis comme Apache, Mysql et PHP).
+ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM installé sur un ordinateur local peut être dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos données. Faites-le si vous êtes prêt à gérer les sauvegardes vous-même sérieusement. Sinon, utilisez plutôt une installation en Saas (voir https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=De plus, si vous avez des compétences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plutôt une installation manuelle de Dolibarr sur un serveur existant équipé de Apache, Mysql et PHP.
+ButIfYouLook=Mais si vous recherchez une installation clé en main automatisée sur une poste local, vous êtes sur la bonne voie...
+DoYouWantToStart=Voulez-vous démarrer le processus d'installation ?
 
-TechnicalParameters=Param�tres techniques
-IfFirstInstall=S'il s'agit de la premi�re installation, merci de sp�cifier ces quelques param�tres techniques. Si vous ne les comprennez pas, �tes non s�r, ou proc�dez � une mise � jour, laissez les champs avec les valeurs propos�es par d�faut.
+TechnicalParameters=Paramètres techniques
+IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut.
 
 
 ; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Serveur SMTP (le votre ou de votre FAI, premi�re installation uniquement):
-ApachePort=Port Apache (premi�re installation uniquement, le choix standard est 80):
-MySqlPort=Port Mysql (premi�re installation uniquement, le choix standard est 3306):
-MySqlPassword=Mot de passe serveur+base MySql de root (premi�re installation uniquement):
+SMTPServer=Serveur SMTP (le votre ou de votre FAI, première installation uniquement):
+ApachePort=Port Apache (première installation uniquement, le choix standard est 80):
+MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306):
+MySqlPassword=Mot de passe serveur+base MySql de root (première installation uniquement):
 
-FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signal�. Cliquez sur OK pour continuer...
+FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signalé. Cliquez sur OK pour continuer...
 
-PortAlreadyInUse=Le port %1 semble d�j� utilis�. Il est recommand� d'annuler pour revenir en arri�re et sp�cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
+PortAlreadyInUse=Le port %1 semble déjà utilisé. Il est recommandé d'annuler pour revenir en arrière et spécifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
 
-FirefoxDetected=Firefox a �t� d�tect� sur votre ordinateur. Voulez-vous en faire votre navigateur par d�faut pour Dolibarr ?
-ChromeDetected=Chrome a �t� d�tect� sur votre ordinateur. Voulez-vous en faire votre navigateur par d�faut pour Dolibarr ?
-ChooseDefaultBrowser=Merci de choisir votre navigateur par d�faut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'�tes pas s�r, cliquez simplement sur Ouvrir :
+FirefoxDetected=Firefox a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
+ChromeDetected=Chrome a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
+ChooseDefaultBrowser=Merci de choisir votre navigateur par défaut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'êtes pas sûr, cliquez simplement sur Ouvrir :
 
 LaunchNow=Lancer Dolibarr maintenant
 
-ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont �t� supprim�s. Toutefois, tous vos fichiers de donn�es sont toujours dans le r�pertoire %1. Vous devez supprimer ce r�pertoire manuellement pour avoir une d�sinstallation compl�te.
+ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont été supprimés. Toutefois, tous vos fichiers de données sont toujours dans le répertoire %1. Vous devez supprimer ce répertoire manuellement pour avoir une désinstallation complète.
 
-DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d�marrer ou red�marrer Apache et Mysql, ceci peut durer de quelques secondes � une minute apr�s cette confirmation. D�marrer l'installation ou mise � jour du serveur web et base de donn�es requis par Dolibarr ?
+DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant démarrer ou redémarrer Apache et Mysql, ceci peut durer de quelques secondes à une minute après cette confirmation. Démarrer l'installation ou mise à jour du serveur web et base de données requis par Dolibarr ?
 
-OldVersionFoundAndMoveInNew=Une ancienne version de base a �t� trouv�e et d�plac�e pour fonctionner avec la nouvelle version de Dolibarr.
-OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a �t� trouv�e mais ne peut �tre d�plac�e pour �tre utilis�e avec la nouvelle version de Dolibarr.
+OldVersionFoundAndMoveInNew=Une ancienne version de base a été trouvée et déplacée pour fonctionner avec la nouvelle version de Dolibarr.
+OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a été trouvée mais ne peut être déplacée pour être utilisée avec la nouvelle version de Dolibarr.
 
-DLLMissing=L'installation de votre Windows est incompl�te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2015". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver � https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr�s.
-ContinueAnyway=Continuer malgr� tout (le process d'installaton �chouera)
+DLLMissing=L'installation de votre Windows est incomplète. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2017". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver à https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp après.
+ContinueAnyway=Continuer malgré tout (le process d'installaton échouera)
diff --git a/build/exe/doliwamp/Languages/MyGerman.isl b/build/exe/doliwamp/Languages/MyGerman.isl
index 132260b7273..7d7fa1662a8 100644
--- a/build/exe/doliwamp/Languages/MyGerman.isl
+++ b/build/exe/doliwamp/Languages/MyGerman.isl
@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apa
 OldVersionFoundAndMoveInNew=Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
 OldVersionFoundButFailedToMoveInNew=Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
 
-DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2015" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2017" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
 ContinueAnyway=Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).
diff --git a/build/exe/doliwamp/Languages/MySpanish.isl b/build/exe/doliwamp/Languages/MySpanish.isl
index 6880a9263e1..4500e776672 100644
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reinici
 OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
 OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
  	  	 
-DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2015". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
+DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
 ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito)
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index beeec222c2a..1a14058de68 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -100,9 +100,9 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 
 ; Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.4.51, php 7.3.33, mariadb10.6.5 (wampserver3.2.6_x64.exe)
+; Value OK: apache 2.4.51, php 7.4.26, mariadb10.6.5 (wampserver3.2.6_x64.exe)
 Source: "C:\wamp64\bin\apache\apache2.4.51\*.*"; DestDir: "{app}\bin\apache\apache2.4.51"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\php\php7.3.33\*.*"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\php\php7.4.26\*.*"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
 Source: "C:\wamp64\bin\mariadb\mariadb10.6.5\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 
 ; Mysql data files (does not overwrite if exists)
@@ -121,7 +121,7 @@ Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flag
 Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -228,7 +228,7 @@ begin
 
   //version des applis, a modifier pour chaque version de WampServer 2
   apacheVersion := '2.4.51';
-  phpVersion := '7.3.33' ;
+  phpVersion := '7.4.26' ;
   mysqlVersion := '10.6.5';
 
   smtpServer := 'localhost';
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index ca228f804d0..4a1059bb47d 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -29,12 +29,13 @@ Prerequisites to build autoexe DoliWamp package from Windows:
 
 > Install Perl for Windows (https://strawberryperl.com/)
 > Install isetup-5.5.8.exe (https://www.jrsoftware.org)
+> Install Microsoft Visual C++ Redistributable 2017 (https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170)
 > Install WampServer-3.2.*-64.exe (Apache 2.4.51, PHP 7.3.33, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
 > Install GIT for Windows (https://git-scm.com/ => You must choose option "Add Git bash profile", "Git commit as-is")
 > Install Dolibarr current version:   
   git clone https://github.com/dolibarr/dolibarr  or  git clone --branch X.Y https://github.com/dolibarr/dolibarr  
 
-> Add the path of PHP (C:\wamp64\bin\php\php7.3.33) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
+> Add the path of PHP (C:\wamp64\bin\php\php7.4.26) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
 
 > Create a config file c:\dolibarr\dolibarr\htdocs\conf\conf.php with content
   <?php

From 61196a1a860e272650c251e6457d3fe26d9a34d8 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Sat, 16 Mar 2024 23:02:39 +0100
Subject: [PATCH 1628/1862] Update makepack-howto.txt

---
 build/makepack-howto.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index 4a1059bb47d..6a9543b5a88 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -30,7 +30,7 @@ Prerequisites to build autoexe DoliWamp package from Windows:
 > Install Perl for Windows (https://strawberryperl.com/)
 > Install isetup-5.5.8.exe (https://www.jrsoftware.org)
 > Install Microsoft Visual C++ Redistributable 2017 (https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170)
-> Install WampServer-3.2.*-64.exe (Apache 2.4.51, PHP 7.3.33, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
+> Install WampServer-3.2.6-64.exe (Apache 2.4.51, PHP 7.4.26, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
 > Install GIT for Windows (https://git-scm.com/ => You must choose option "Add Git bash profile", "Git commit as-is")
 > Install Dolibarr current version:   
   git clone https://github.com/dolibarr/dolibarr  or  git clone --branch X.Y https://github.com/dolibarr/dolibarr  

From de58435ef1cf1836cfb1d7f43b49e7fccb504526 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 23:08:15 +0100
Subject: [PATCH 1629/1862] FIX: if we stop for security purpose, we must exit
 a non zero value.

---
 htdocs/accountancy/tpl/export_journal.tpl.php                   | 2 +-
 htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php | 2 +-
 htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php   | 2 +-
 htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php   | 2 +-
 htdocs/adherents/tpl/linkedobjectblock.tpl.php                  | 2 +-
 htdocs/asset/tpl/accountancy_codes_edit.tpl.php                 | 2 +-
 htdocs/asset/tpl/accountancy_codes_view.tpl.php                 | 2 +-
 htdocs/asset/tpl/depreciation_options_edit.tpl.php              | 2 +-
 htdocs/asset/tpl/depreciation_options_view.tpl.php              | 2 +-
 htdocs/asset/tpl/depreciation_view.tpl.php                      | 2 +-
 htdocs/asset/tpl/linkedobjectblock.tpl.php                      | 2 +-
 htdocs/bom/tpl/linkedobjectblock.tpl.php                        | 2 +-
 htdocs/bom/tpl/objectline_edit.tpl.php                          | 2 +-
 htdocs/bom/tpl/objectline_title.tpl.php                         | 2 +-
 htdocs/bom/tpl/objectline_view.tpl.php                          | 2 +-
 htdocs/comm/propal/tpl/linkedobjectblock.tpl.php                | 2 +-
 htdocs/commande/tpl/linkedobjectblock.tpl.php                   | 2 +-
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php             | 2 +-
 htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php       | 2 +-
 htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php    | 2 +-
 htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php      | 2 +-
 htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php      | 2 +-
 htdocs/contrat/tpl/linkedobjectblock.tpl.php                    | 2 +-
 htdocs/core/tpl/admin_extrafields_add.tpl.php                   | 2 +-
 htdocs/core/tpl/admin_extrafields_edit.tpl.php                  | 2 +-
 htdocs/core/tpl/admin_extrafields_view.tpl.php                  | 2 +-
 htdocs/core/tpl/bloc_comment.tpl.php                            | 2 +-
 htdocs/core/tpl/bloc_showhide.tpl.php                           | 2 +-
 htdocs/core/tpl/card_presend.tpl.php                            | 2 +-
 htdocs/core/tpl/commonfields_add.tpl.php                        | 2 +-
 htdocs/core/tpl/commonfields_edit.tpl.php                       | 2 +-
 htdocs/core/tpl/commonfields_view.tpl.php                       | 2 +-
 htdocs/core/tpl/contacts.tpl.php                                | 2 +-
 htdocs/core/tpl/document_actions_post_headers.tpl.php           | 2 +-
 htdocs/core/tpl/extrafields_add.tpl.php                         | 2 +-
 htdocs/core/tpl/extrafields_edit.tpl.php                        | 2 +-
 htdocs/core/tpl/extrafields_list_array_fields.tpl.php           | 2 +-
 htdocs/core/tpl/extrafields_list_print_fields.tpl.php           | 2 +-
 htdocs/core/tpl/extrafields_list_search_input.tpl.php           | 2 +-
 htdocs/core/tpl/extrafields_list_search_param.tpl.php           | 2 +-
 htdocs/core/tpl/extrafields_list_search_sql.tpl.php             | 2 +-
 htdocs/core/tpl/extrafields_list_search_title.tpl.php           | 2 +-
 htdocs/core/tpl/extrafields_view.tpl.php                        | 2 +-
 htdocs/core/tpl/login.tpl.php                                   | 2 +-
 htdocs/core/tpl/notes.tpl.php                                   | 2 +-
 htdocs/core/tpl/objectline_edit.tpl.php                         | 2 +-
 htdocs/core/tpl/objectline_title.tpl.php                        | 2 +-
 htdocs/core/tpl/objectline_view.tpl.php                         | 2 +-
 htdocs/core/tpl/objectlinked_lineimport.tpl.php                 | 2 +-
 htdocs/core/tpl/onlinepaymentlinks.tpl.php                      | 2 +-
 htdocs/core/tpl/originproductline.tpl.php                       | 2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php                       | 2 +-
 htdocs/core/tpl/passwordreset.tpl.php                           | 2 +-
 htdocs/core/tpl/resource_add.tpl.php                            | 2 +-
 htdocs/core/tpl/resource_view.tpl.php                           | 2 +-
 htdocs/delivery/tpl/linkedobjectblock.tpl.php                   | 2 +-
 htdocs/eventorganization/tpl/linkedobjectblock.tpl.php          | 2 +-
 htdocs/expedition/tpl/linkedobjectblock.tpl.php                 | 2 +-
 htdocs/expensereport/tpl/linkedobjectblock.tpl.php              | 2 +-
 htdocs/fichinter/tpl/linkedobjectblock.tpl.php                  | 2 +-
 htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php             | 2 +-
 htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php              | 2 +-
 htdocs/hrm/core/tpl/objectline_title.tpl.php                    | 2 +-
 htdocs/hrm/core/tpl/objectline_view.tpl.php                     | 2 +-
 htdocs/hrm/core/tpl/skilldet.fiche.tpl.php                      | 2 +-
 .../template/core/tpl/linkedobjectblock_myobject.tpl.php        | 2 +-
 htdocs/mrp/tpl/linkedobjectblock.tpl.php                        | 2 +-
 htdocs/mrp/tpl/originproductline.tpl.php                        | 2 +-
 htdocs/product/canvas/product/tpl/card_create.tpl.php           | 2 +-
 htdocs/product/canvas/product/tpl/card_edit.tpl.php             | 2 +-
 htdocs/product/canvas/product/tpl/card_view.tpl.php             | 2 +-
 htdocs/product/canvas/service/tpl/card_create.tpl.php           | 2 +-
 htdocs/product/canvas/service/tpl/card_edit.tpl.php             | 2 +-
 htdocs/product/canvas/service/tpl/card_view.tpl.php             | 2 +-
 htdocs/product/stock/tpl/extrafields_add.tpl.php                | 2 +-
 htdocs/product/stock/tpl/stockcorrection.tpl.php                | 2 +-
 htdocs/product/stock/tpl/stocktransfer.tpl.php                  | 2 +-
 htdocs/public/webportal/tpl/404.tpl.php                         | 2 +-
 htdocs/public/webportal/tpl/errors.tpl.php                      | 2 +-
 htdocs/public/webportal/tpl/footer.tpl.php                      | 2 +-
 htdocs/public/webportal/tpl/header.tpl.php                      | 2 +-
 htdocs/public/webportal/tpl/header_login.tpl.php                | 2 +-
 htdocs/public/webportal/tpl/home.tpl.php                        | 2 +-
 htdocs/public/webportal/tpl/login.tpl.php                       | 2 +-
 htdocs/public/webportal/tpl/menu.tpl.php                        | 2 +-
 htdocs/reception/tpl/linkedobjectblock.tpl.php                  | 2 +-
 htdocs/societe/canvas/company/tpl/card_create.tpl.php           | 2 +-
 htdocs/societe/canvas/company/tpl/card_edit.tpl.php             | 2 +-
 htdocs/societe/canvas/company/tpl/card_view.tpl.php             | 2 +-
 htdocs/societe/canvas/individual/tpl/card_create.tpl.php        | 2 +-
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php          | 2 +-
 htdocs/societe/canvas/individual/tpl/card_view.tpl.php          | 2 +-
 htdocs/societe/tpl/linesalesrepresentative.tpl.php              | 2 +-
 htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php          | 2 +-
 htdocs/ticket/tpl/linkedobjectblock.tpl.php                     | 2 +-
 htdocs/variants/tpl/productattributevalueline_edit.tpl.php      | 2 +-
 htdocs/variants/tpl/productattributevalueline_title.tpl.php     | 2 +-
 htdocs/variants/tpl/productattributevalueline_view.tpl.php      | 2 +-
 98 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 9853dd08bf1..5d5269892bd 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -24,7 +24,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 $code = getDolGlobalString('MAIN_INFO_ACCOUNTANT_CODE');
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 419b32f3c34..582d2eb2499 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 9056ff201e4..88631d23a40 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 1ad9e4ff3d4..6417e6a32b2 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 5582c60e30f..62a3a08aa49 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -21,7 +21,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 echo "<!-- BEGIN PHP TEMPLATE adherents/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
index 93a261c442a..d0bd4f0c468 100644
--- a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
+++ b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
@@ -27,7 +27,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!is_object($form)) {
diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
index 16c333b8c6b..b48f642c4c2 100644
--- a/htdocs/asset/tpl/accountancy_codes_view.tpl.php
+++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
@@ -28,7 +28,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!is_object($form)) {
diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
index ea55ab5999a..2741da86c2b 100644
--- a/htdocs/asset/tpl/depreciation_options_edit.tpl.php
+++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
@@ -27,7 +27,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!is_object($form)) {
diff --git a/htdocs/asset/tpl/depreciation_options_view.tpl.php b/htdocs/asset/tpl/depreciation_options_view.tpl.php
index d7350801020..c801d74505e 100644
--- a/htdocs/asset/tpl/depreciation_options_view.tpl.php
+++ b/htdocs/asset/tpl/depreciation_options_view.tpl.php
@@ -28,7 +28,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!is_object($form)) {
diff --git a/htdocs/asset/tpl/depreciation_view.tpl.php b/htdocs/asset/tpl/depreciation_view.tpl.php
index 2660fbbaee7..424d989665f 100644
--- a/htdocs/asset/tpl/depreciation_view.tpl.php
+++ b/htdocs/asset/tpl/depreciation_view.tpl.php
@@ -27,7 +27,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!is_object($form)) {
diff --git a/htdocs/asset/tpl/linkedobjectblock.tpl.php b/htdocs/asset/tpl/linkedobjectblock.tpl.php
index 7dddd8cbeb1..0e8d62a6921 100644
--- a/htdocs/asset/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/asset/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE commande/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index 082936be50a..3ededc6bffa 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -21,7 +21,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE bom/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 5535f3dbf5a..2d456007c73 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php";
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index b2b8d94bc51..303e735a498 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -36,7 +36,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 179bec8f474..38da2d0077c 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index b81a31e1891..05692d23ae0 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -26,7 +26,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 2ced0e73a63..4d37b71e10e 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE commande/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 09ca6cdef05..ea6f8d6c4a1 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index d888d1fd5d7..bd8fa94cf19 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index bc8ff9ebcf4..42f31475c00 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index cf193e25274..f1bea679d32 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index 1a66208288f..ab7f560ec47 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 86c7abfb7f2..0aaf9e98993 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index b06415364a6..b7f59dddddd 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -30,7 +30,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index bb8c4fb9c3a..0853edc8955 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -29,7 +29,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index c6cf8c6365e..75f92eda0cf 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -28,7 +28,7 @@
 // Protection to avoid direct call of template
 if (empty($langs) || !is_object($langs)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 global $action, $form, $langs;
 
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index a868bb61879..8506d42dd7b 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // Require
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index 267c56e42a7..8af7c7665db 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($blocname)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 $hide = true; // Hide by default
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index aac09eb8462..42c7cd957fc 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -32,7 +32,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 $fileparams = array();
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index e17510485ba..92f48272aee 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -25,7 +25,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 00610c0add8..fea9afd80dc 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -25,7 +25,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 if (!is_object($form)) {
 	$form = new Form($db);
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 9f8c49198ec..6065f64e189 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -26,7 +26,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 if (!is_object($form)) {
 	$form = new Form($db);
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index f687f2b883b..d05831af439 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -27,7 +27,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (empty($preselectedtypeofcontact)) {
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 512635e3cba..373fcab1813 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -32,7 +32,7 @@
 // Protection to avoid direct call of template
 if (empty($langs) || !is_object($langs)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
index 8067e4fedbc..e9a5d283807 100644
--- a/htdocs/core/tpl/extrafields_add.tpl.php
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -28,7 +28,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index e605fbd93fb..e778f59919e 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -28,7 +28,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index 3f3f73a9760..46eb1a8b55f 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -11,7 +11,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) {
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index c061a0764a9..2ea9aaa1b80 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) {
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index f209c9fd49d..886a0cbc092 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -5,7 +5,7 @@ print '<!-- extrafields_list_search_input.tpl.php -->'."\n";
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) {
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 2ab5749b4e0..bdfaafbce59 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // Loop to complete $param for extrafields
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index ff858ef0d29..31e6acf3c89 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) {
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 8d24c81c2e4..df6386f7557 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 347e611b8bf..db152a3141f 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -29,7 +29,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!is_object($form)) {
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index eb0c48e27c3..e7eea603e18 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -27,7 +27,7 @@ if (!defined('NOBROWSERNOTIF')) {
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // DDOS protection
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 8ca0cc44990..4f56f9c6435 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // $permissionnote 	must be defined by caller. For example $permissionnote=$user->rights->module->create
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 3dc3b059e8c..cf4ddd5c88b 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -36,7 +36,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 121f0466db9..10489412b08 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -37,7 +37,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 24a298e1ba5..414ba6b9461 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -41,7 +41,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this
diff --git a/htdocs/core/tpl/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/objectlinked_lineimport.tpl.php
index 3193f3db96d..eb6f7b470b6 100644
--- a/htdocs/core/tpl/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/objectlinked_lineimport.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 $objectUrl = $object->getNomUrl(0, '', 0, 1);
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index b5e24042ee3..f599ccd736b 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 40a3656a7fd..9bad8c41a25 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 188e3099f6c..8c7a04d2af3 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -23,7 +23,7 @@ if (!defined('NOBROWSERNOTIF')) {
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // DDOS protection
diff --git a/htdocs/core/tpl/passwordreset.tpl.php b/htdocs/core/tpl/passwordreset.tpl.php
index e778be0afb5..c73c1ac5088 100644
--- a/htdocs/core/tpl/passwordreset.tpl.php
+++ b/htdocs/core/tpl/passwordreset.tpl.php
@@ -25,7 +25,7 @@ if (!defined('NOBROWSERNOTIF')) {
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // DDOS protection
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index bff55cca329..6b67021096b 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -4,7 +4,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index d62169697da..3f66edd22d7 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/delivery/tpl/linkedobjectblock.tpl.php b/htdocs/delivery/tpl/linkedobjectblock.tpl.php
index 3c7e12abe45..16eb40fc209 100644
--- a/htdocs/delivery/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/delivery/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE delivery/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
index 127ea95a424..e99e7fe8f83 100644
--- a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 echo "<!-- BEGIN PHP TEMPLATE eventorganization/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 6b025f8dda7..44341e1ab7d 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index dd215f15873..62084f2e73d 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 8d5d8e85c17..9062d9f798b 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 8bb4b3442bb..9dd662c8507 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 6ebb4f03f4f..02fa09d5ba9 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -21,7 +21,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/hrm/core/tpl/objectline_title.tpl.php b/htdocs/hrm/core/tpl/objectline_title.tpl.php
index e7e5091eb95..f96fd3a72f8 100644
--- a/htdocs/hrm/core/tpl/objectline_title.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_title.tpl.php
@@ -40,7 +40,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE hrm/core/tpl/objectline_title.tpl.php -->\n";
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
index 2c9939e234d..a325e303a10 100644
--- a/htdocs/hrm/core/tpl/objectline_view.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -45,7 +45,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $mysoc;
diff --git a/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php b/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
index 56a3bcb58b1..124d17f50fe 100644
--- a/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
+++ b/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
@@ -3,7 +3,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 if (!empty($object->table_element_line)) {
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
index f34850b5166..b655a692c62 100644
--- a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
+++ b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index 4bdad2cc588..094a6b0c21f 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -21,7 +21,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE mrp/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index b4fbbfa998e..237a9914246 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this';
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index ca7f6000a82..c6802081d3b 100644
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
index be4d4099d9b..2caf95cd468 100644
--- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php
index 86bbf9627fa..1730a75a7c3 100644
--- a/htdocs/product/canvas/product/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php
index 73f79b6efdb..65d95524d03 100644
--- a/htdocs/product/canvas/service/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
index a656d749a4b..d67a9cfa964 100644
--- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php
index 9c9c15efb27..402c604d9ff 100644
--- a/htdocs/product/canvas/service/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php
index 05a4436e82b..d880e516500 100644
--- a/htdocs/product/stock/tpl/extrafields_add.tpl.php
+++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php
@@ -28,7 +28,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 87f6acee486..708c527ee6a 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -22,7 +22,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index b24230fdf38..13f54ce6b56 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -22,7 +22,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/public/webportal/tpl/404.tpl.php b/htdocs/public/webportal/tpl/404.tpl.php
index 1f4073affb4..0a022a8b09f 100644
--- a/htdocs/public/webportal/tpl/404.tpl.php
+++ b/htdocs/public/webportal/tpl/404.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $langs;
diff --git a/htdocs/public/webportal/tpl/errors.tpl.php b/htdocs/public/webportal/tpl/errors.tpl.php
index e39d5575230..53ee228be15 100644
--- a/htdocs/public/webportal/tpl/errors.tpl.php
+++ b/htdocs/public/webportal/tpl/errors.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print '
diff --git a/htdocs/public/webportal/tpl/footer.tpl.php b/htdocs/public/webportal/tpl/footer.tpl.php
index 5774cb0753e..1a01af734e8 100644
--- a/htdocs/public/webportal/tpl/footer.tpl.php
+++ b/htdocs/public/webportal/tpl/footer.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $langs;
diff --git a/htdocs/public/webportal/tpl/header.tpl.php b/htdocs/public/webportal/tpl/header.tpl.php
index 648f0841271..9d320f30814 100644
--- a/htdocs/public/webportal/tpl/header.tpl.php
+++ b/htdocs/public/webportal/tpl/header.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $langs;
diff --git a/htdocs/public/webportal/tpl/header_login.tpl.php b/htdocs/public/webportal/tpl/header_login.tpl.php
index 646600472bc..8b8f7ad53d7 100644
--- a/htdocs/public/webportal/tpl/header_login.tpl.php
+++ b/htdocs/public/webportal/tpl/header_login.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $langs;
diff --git a/htdocs/public/webportal/tpl/home.tpl.php b/htdocs/public/webportal/tpl/home.tpl.php
index e1c83c75f3a..a610c757aaf 100644
--- a/htdocs/public/webportal/tpl/home.tpl.php
+++ b/htdocs/public/webportal/tpl/home.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $conf, $langs;
diff --git a/htdocs/public/webportal/tpl/login.tpl.php b/htdocs/public/webportal/tpl/login.tpl.php
index d4715fcbf68..781ce24e68d 100644
--- a/htdocs/public/webportal/tpl/login.tpl.php
+++ b/htdocs/public/webportal/tpl/login.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/public/webportal/tpl/menu.tpl.php b/htdocs/public/webportal/tpl/menu.tpl.php
index 91edea91acb..389a008320a 100644
--- a/htdocs/public/webportal/tpl/menu.tpl.php
+++ b/htdocs/public/webportal/tpl/menu.tpl.php
@@ -2,7 +2,7 @@
 // Protection to avoid direct call of template
 if (empty($context) || !is_object($context)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 global $conf, $hookmanager, $langs;
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 51a9e3aedc1..b9009d858bc 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 396edff865b..4214b859c4d 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 74851c874ea..bfef0d1fb61 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 $contact = $GLOBALS['objcanvas']->control->object;
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index ecd169d9009..7e0d751b231 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index d255656bd72..fec630a689f 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 46f2bb63afa..70dd0666e48 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -19,7 +19,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index e684b5c502d..67c99f9807f 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 97ab6e75cca..58c6e20f93c 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print '<!-- linesalesrepresentative.tpl.php -->';
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index abcef408349..ea08a816750 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -20,7 +20,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index e4ccd67308c..cebcaf46494 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -18,7 +18,7 @@
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE ticket/tpl/linkedobjectblock.tpl.php -->\n";
diff --git a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
index e38cd431ef2..ec99925f320 100644
--- a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
@@ -29,7 +29,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 // Define colspan for the button 'Add'
diff --git a/htdocs/variants/tpl/productattributevalueline_title.tpl.php b/htdocs/variants/tpl/productattributevalueline_title.tpl.php
index b2905b535f2..b455c347bf9 100644
--- a/htdocs/variants/tpl/productattributevalueline_title.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_title.tpl.php
@@ -30,7 +30,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 print "<!-- BEGIN PHP TEMPLATE productattributevalueline_title.tpl.php -->\n";
diff --git a/htdocs/variants/tpl/productattributevalueline_view.tpl.php b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
index 54349ca725f..3c3b7cbbcc6 100644
--- a/htdocs/variants/tpl/productattributevalueline_view.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
@@ -35,7 +35,7 @@
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
-	exit;
+	exit(1);
 }
 
 '@phan-var-force CommonObject $this

From 289621c739d330a585ad3b54322617147310a910 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:58:38 +0100
Subject: [PATCH 1630/1862] Qual/Fix Win-CI Check that the PHPUNIT step really
 completed

# Qual/Fix Win-CI Check that the PHPUNIT step really completed

The program under test can abruptly abort the PHPUNIT test case by calling
exit which results in no error code - it then appears as if the test was
successful.
This adds a grep on the last lines looking for the summary information from
phpunit.
If absent, the step fails
---
 .github/workflows/windows-ci.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index f8441c438fc..defb42e0148 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -103,6 +103,8 @@ jobs:
           sed -i -e 's/stopOnFailure="[^"]*"/stopOnFailure="false"/' test/phpunit/phpunittest.xml
           # Check if database cache is present after the script (visually, to remove once ok)
           ls -l
+          echo "TAIL=$(cygpath -w "$(which tail)")" >> "$GITHUB_ENV"
+          echo "GREP=$(cygpath -w "$(which grep)")" >> "$GITHUB_ENV"
           echo "TEE=$(cygpath -w "$(which tee)")" >> "$GITHUB_ENV"
           echo "BASEDIR=$(realpath .)" >> "$GITHUB_ENV"
       - name: Start web server
@@ -144,6 +146,10 @@ jobs:
           curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
           REM 'DOSKEY' USED to recover error code (no pipefile equivalent in windows?)
           ( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" --exclude-group WindowsWaitingForFix & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
+          echo ""
+          echo "Ensure that PHPUNIT completed (no early exit from code)"
+          "${{ env.TAIL }}" -5 "${{ env.PHPUNIT_LOG }}" | "${{ env.GREP }}" -qE "(OK .*[0-9]+ tests.*[0-9]+ assertions|Tests: [0-9]+)"  || EXIT /B 1
+          echo "PHPUNIT seems to have completed with a test result, reuse the exit code"
           for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
       - name: Convert Raw Log to Annotations
         uses: mdeweerd/logToCheckStyle@v2024.2.9

From d3262ace71c14931e673445183242a8bd21b5a1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 23:22:12 +0100
Subject: [PATCH 1631/1862] Fix phpunit error due to regression in removing the
 $conf

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 07dfa7db829..f919aa71ef3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5646,7 +5646,7 @@ abstract class CommonObject
 		$filefound = dol_sanitizePathName($filefound);
 
 		// If generator was found
-		global $db; // Required to solve a conception default making an include of some code that uses $db instead of $this->db just after.
+		global $db; // Required to solve a conception error making an include of some code that uses $db instead of $this->db just after.
 
 		require_once $filefound;
 
@@ -5706,12 +5706,14 @@ abstract class CommonObject
 		// update model_pdf in object
 		$this->model_pdf = $saved_model;
 
+		var_dump($filefound);
 		if (in_array(get_class($this), array('Adherent'))) {
 			$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, 'tmp_cards', $moreparams);
 		} else {
 			$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
+		var_dump($filefound);
 
 		if ($resultwritefile > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 260b922d5de..ca0feede6c8 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1060,11 +1060,13 @@ class Task extends CommonObjectLine
 		if ($morewherefilter) {
 			$sql .= $morewherefilter;
 		}
+
 		// Add where from extra fields
 		$extrafieldsobjectkey = 'projet_task';
 		$extrafieldsobjectprefix = 'efpt.';
-		global $db; // needed for extrafields_list_search_sql.tpl
+		global $db, $conf; // needed for extrafields_list_search_sql.tpl
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
 		// Add where from hooks
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook

From a132f5331159b3e290fe2e8e86748b86c02a0600 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 23:28:22 +0100
Subject: [PATCH 1632/1862] Fix removed var_dump

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f919aa71ef3..72c1c2c9dd9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5706,14 +5706,12 @@ abstract class CommonObject
 		// update model_pdf in object
 		$this->model_pdf = $saved_model;
 
-		var_dump($filefound);
 		if (in_array(get_class($this), array('Adherent'))) {
 			$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, 'tmp_cards', $moreparams);
 		} else {
 			$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 		// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
-		var_dump($filefound);
 
 		if ($resultwritefile > 0) {
 			$outputlangs->charset_output = $sav_charset_output;

From 9cca26258bcb1367f8c0e79bd5bc684b2c7f2608 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Mar 2024 23:50:35 +0100
Subject: [PATCH 1633/1862] Clean code

---
 htdocs/emailcollector/lib/emailcollector.lib.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 3549f20a5a5..b60768fb5c3 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) ---Put here your own copyright and developer email---
- * Copyright (C) 2024       Frédéric France     <frederic.france@free.fr>
+/* Copyright (C) 2024       Frédéric France     <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +30,7 @@
  */
 function emailcollectorPrepareHead($object)
 {
-	global $db, $langs, $conf;
+	global $langs, $conf;
 
 	$langs->load("emailcollector@emailcollector");
 
@@ -123,7 +122,7 @@ function getAttachments($jk, $mbox)
 	$fpos = 2;
 	$attachments = array();
 	$nb = count($parts);
-	if ($parts && $nb) {
+	if ($nb && !empty($parts)) {
 		for ($i = 1; $i < $nb; $i++) {
 			$part = $parts[$i];
 

From ef6eea3ed2131d867c570191bd540571e9eb8199 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:15:12 +0100
Subject: [PATCH 1634/1862] Qual: Fix PhanTypeExpectedObjectOrClassName by
 testing on classname

# Qual: Fix PhanTypeExpectedObjectOrClassName by testing on classname

PhanTypeExpectedObjectOrClassName should be fixed by testing that the classname is not
empty.
---
 dev/tools/phan/config.php                            | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php | 4 +---
 htdocs/projet/admin/project.php                      | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 98c02fdc2d0..f6e57a83cbb 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -497,7 +497,7 @@ return [
 		// 'PhanPluginDescriptionlessCommentOnProtectedMethod',
 		// 'PhanPluginPrintfIncompatibleArgumentTypeWeak',
 		'PhanUndeclaredVariableAssignOp',
-		'PhanTypeExpectedObjectOrClassName',
+		// 'PhanTypeExpectedObjectOrClassName',
 		'PhanEmptyFQSENInClasslike',
 		// 'PhanTypeMismatchArgumentInternalReal',
 		// 'PhanUnextractableAnnotationElementName',
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 214b1731a94..f7501d678ab 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3075,19 +3075,17 @@ class EmailCollector extends CommonObject
 									// Search template files
 									$file = '';
 									$classname = '';
-									$filefound = 0;
 									$reldir = '';
 									$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 									foreach ($dirmodels as $reldir) {
 										$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
 										if (file_exists($file)) {
-											$filefound = 1;
 											$classname = $modele;
 											break;
 										}
 									}
 
-									if ($filefound) {
+									if ($classname !== '') {
 										if ($savesocid > 0) {
 											if ($savesocid != $tickettocreate->socid) {
 												$errorforactions++;
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 512fbc064d0..94741d31e4d 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -136,18 +136,16 @@ if ($action == 'updateMaskTask') {
 	// Search template files
 	$file = '';
 	$classname = '';
-	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/task/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file)) {
-			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound) {
+	if ($classname !== '') {
 		require_once $file;
 
 		$module = new $classname($db);

From 551eaa115cb32537a85b9db05d7de2aa7438dbe1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 15 Mar 2024 04:14:48 +0100
Subject: [PATCH 1635/1862] Fix & enable PhanPluginUnknownClosureReturnType

# Fix & enable PhanPluginUnknownClosureReturnType

Fix last PhanPluginUnknownClosureReturnType & enable the notice as
all are fixed
---
 dev/tools/phan/config.php                          | 2 +-
 htdocs/variants/class/ProductCombination.class.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 98c02fdc2d0..4570b839811 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -454,7 +454,7 @@ return [
 		// 'PhanPluginNoCommentOnProtectedProperty',
 		// 'PhanPluginDescriptionlessCommentOnPublicMethod',
 		// 'PhanPluginUnknownClosureParamType',
-		'PhanPluginUnknownClosureReturnType',
+		// 'PhanPluginUnknownClosureReturnType',
 		// 'PhanPluginNoCommentOnProtectedMethod',
 		// 'PhanTypeArraySuspicious',
 		// 'PhanTypeMismatchPropertyProbablyReal',
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 7e183f75362..4e40c36a553 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -631,6 +631,7 @@ class ProductCombination
 			$features,
 			/**
 			 * @param mixed $v Feature information of a product.
+			 * @return bool
 			 */
 			static function ($v) {
 				return !empty($v);

From 45d56dffd284f80de1f14466051a2ee14bdd7132 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 00:29:24 +0100
Subject: [PATCH 1636/1862] Make v19.0.1

---
 ChangeLog | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb3afe1e22e..b31afcad981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,11 @@ English Dolibarr ChangeLog
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****
 
 FIX: 16.0 - parent company gets emptied when updating a third party from the card in edit mode (#28269)
+FIX: 17.0: $num doesn't take trigger-modified newref into account, leading to inconsistencies if BILL_SUPPLIER_VALIDATE changes the invoice's ref (#28684)
 FIX: #22948
+FIX: #24265 regression cannot see all product on takepos (#28753)
 FIX: #28205
-FIX: 28251 Fixing subpermission name on api_multicurrencies.class.php (#28252)
+FIX: #28251 Fixing subpermission name on api_multicurrencies.class.php (#28252)
 FIX: #28369
 FIX: #28429
 FIX: #28491 (#28522)
@@ -17,6 +19,8 @@ FIX: #28533 Mo::deleteLine removes the "main" MoLine if consumed line is delete
 FIX: #28564
 FIX: Adding the dependencies list feature for extrafields "select" (#28549)
 FIX: Add new hidden conf "DISABLE_QTY_OVERWRITTEN" (#28523)
+FIX: Amount of localtaxes in foreign currency was wrong on screen and PDF
+FIX: an error in a complex else condition
 FIX: avoid error "Column 'entity' in where clause is ambiguous" (#28270)
 FIX: avoid Unknown column 'pfp.ref_fourn' (#28145)
 FIX: avoid warning "error parsing attribute name in Entity" (#28543)
@@ -24,30 +28,44 @@ FIX: Bad column for total in bom list
 FIX: Bad condition on button back to draft on recruitment job.
 FIX: Bad CRLF when sending text only content. Fix dol_htmlwithnojs()
 FIX: Bad picto on list of permission of a user when user not admin
-FIX: bad timezone for the start/end date of an event
+FIX: bad timzeone for the start/end date of an event
 FIX: Better test on validity of compute field syntax with parenthesis
 FIX: close #28279
+FIX: Count of virtual stock at Services and MoLine with disabled stock change (#28580)
 FIX: disabled pito of menu must be greyed.
 FIX: Don't display column when it's out of date (#28271)
 FIX: duplicate with lines: 414-416 (#28358)
+FIX: edit bank suggested for credit transfer payment in invoice setup
 FIX: Error When cloning fourn price no default value for tva_tx (#28368)
+FIX: fatal error Unsupported operand types when recording load payment
+FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfert is allowed (#26217)
 FIX: migration missing 2 columns in llx_resource and 1 in llx_user
 FIX: missing trans
 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
-FIX: Not truncate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
+FIX: Option MAIN_DOC_USE_TIMING can be a string with date format
 FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156)
 FIX: Pb in redirect of a website page in USEDOLIBARRSERVER mode
+FIX: permission on payment file of a tax
 FIX: PHP Warning: Undefined variable $lib (#28342)
+FIX: PHP Warning: Undefined variable $mode (#28697)
 FIX: Picto for mime
+FIX: Picto in top menu
 FIX: position of field in list of field in shipment list
 FIX: postgresql error (#28542)
 FIX: quote in sql request
 FIX: Responsive on admin project
 FIX: Shipment closing action has wrong value (#28174)
+FIX: skip adding tab if user doesn't have permission (#28698)
 FIX: some tooltips has disappeared on invoice action button
 FIX: Special code is now transmitted by args only in order supplier (#28546)
+FIX: Special code is now transmitted by args only in order supplier (#28619)
 FIX: subscription must be editable when accounting isn't reconciled (#28469)
-FIX: Value of field int = 0 from modulebuilder must not be set to null
+FIX: Translation for select  (#28677)
+FIX: upload odt files should not start/end with space
+FIX: Value of field int = 0 from modulebuilder must nto be set to null
+FIX: Wrong currency shown in TakePOS payment page
+FIX: #yogosha21416
 
 
 ***** ChangeLog for 19.0.0 compared to 18.0.0 *****

From 1b9db96e4f488d777abd7f3dc10f5220afc33922 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 00:35:06 +0100
Subject: [PATCH 1637/1862] Fix picto

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

diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 1d465e595c8..75586bbb69e 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -264,7 +264,7 @@ class modStock extends DolibarrModules
 			'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',
-			'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'c_barcode_type',
+			'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'product',
 		);	// We define here only fields that use another icon that the one defined into export_icon
 		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));

From 48d051aba7c366ac1d6acc40cc170591a1397cbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 01:06:02 +0100
Subject: [PATCH 1638/1862] Better tooltip on inventory

---
 htdocs/langs/en_US/stocks.lang         |  8 +++++---
 htdocs/product/inventory/inventory.php | 13 +++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 70a25ea5e27..644c2b58391 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -128,7 +128,7 @@ 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) 
+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
@@ -245,7 +245,7 @@ AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on t
 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
+InventoryRealQtyHelp=The quantity you found in stock when making the inventory. Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
 UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
@@ -322,7 +322,7 @@ BatchNotFound=Lot / serial not found for this product
 StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
-ReverseConfirmed=Stock movement has been reversed successfully 
+ReverseConfirmed=Stock movement has been reversed successfully
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
 ValidateInventory=Inventory validation
 IncludeSubWarehouse=Include sub-warehouse ?
@@ -332,3 +332,5 @@ ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
 WarehouseUsage=Warehouse usage
 InternalWarehouse=Internal warehouse
 ExternalWarehouse=External warehouse
+QtyCurrentlyKnownInStock=The quantity the system think you have in stock. This is a realtime value. It may change if you continue to make stock movement during the inventory.
+QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 793e9cf3c3c..a3bd728a62d 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -156,6 +156,8 @@ if (empty($reshook)) {
 			$num = $db->num_rows($resql);
 			$i = 0;
 			$totalarray = array();
+			$option = '';
+
 			while ($i < $num) {
 				$line = $db->fetch_object($resql);
 
@@ -926,7 +928,13 @@ if (isModEnabled('productbatch')) {
 	print $langs->trans("Batch");
 	print '</td>';
 }
-print '<td class="right">'.$langs->trans("ExpectedQty").'</td>';
+if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+	// Expected quantity = If inventory is open: Quantity currently in stock (may change if stock movement are done during the inventory)
+	print '<td class="right">'.$form->textwithpicto($langs->trans("ExpectedQty"), $langs->trans("QtyCurrentlyKnownInStock")).'</td>';
+} else {
+	// Expected quantity = If inventory is closed: Quantity we had in stock when we start the inventory.
+	print '<td class="right">'.$form->textwithpicto($langs->trans("ExpectedQty"), $langs->trans("QtyInStockWhenInventoryWasValidated")).'</td>';
+}
 if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 	print '<td class="right">'.$langs->trans('PMPExpected').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedValuation').'</td>';
@@ -1060,7 +1068,8 @@ if ($resql) {
 			print '</td>';
 		}
 
-		// Expected quantity = Quantity in stock when we start inventory
+		// Expected quantity = If inventory is open: Quantity currently in stock (may change if stock movement are done during the inventory)
+		// Expected quantity = If inventory is closed: Quantity we had in stock when we start the inventory.
 		print '<td class="right expectedqty" id="id_'.$obj->rowid.'" title="Stock viewed at last update: '.$obj->qty_stock.'">';
 		$valuetoshow = $obj->qty_stock;
 		// For inventory not yet close, we overwrite with the real value in stock now

From ca76798afde0dfec5a119d0de2109e9509b5d41d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 02:16:51 +0100
Subject: [PATCH 1639/1862] NEW Add a protection in inventory when a product
 has stock of lot and is not lot managed.

---
 htdocs/core/lib/functions.lib.php             |  2 +-
 htdocs/langs/en_US/stocks.lang                |  2 +-
 .../inventory/class/inventory.class.php       | 23 +++++++++++++++----
 htdocs/product/inventory/inventory.php        |  4 +++-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c07e60e709f..c9309bfa883 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7897,7 +7897,7 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 							'show-body-only' => true,
 							"indent-attributes" => false,
 							"vertical-space" => false,
-							'ident' => false,
+							//'ident' => false,			// Not always supported
 							"wrap" => 0
 							// HTML5 tags
 							//'new-blocklevel-tags' => 'article aside audio bdi canvas details dialog figcaption figure footer header hgroup main menu menuitem nav section source summary template track video',
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 644c2b58391..7740eb8d647 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -332,5 +332,5 @@ ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
 WarehouseUsage=Warehouse usage
 InternalWarehouse=Internal warehouse
 ExternalWarehouse=External warehouse
-QtyCurrentlyKnownInStock=The quantity the system think you have in stock. This is a realtime value. It may change if you continue to make stock movement during the inventory.
+QtyCurrentlyKnownInStock=The quantity the system think you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
 QtyInStockWhenInventoryWasValidated=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 13e793e2920..e793d442313 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -264,7 +264,6 @@ class Inventory extends CommonObject
 	 */
 	public function validate(User $user, $notrigger = 0, $include_sub_warehouse = 0)
 	{
-		global $conf;
 		$this->db->begin();
 
 		$result = 0;
@@ -281,10 +280,17 @@ class Inventory extends CommonObject
 
 			// Scan existing stock to prefill the inventory
 			$sql = "SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,";
-			$sql .= " pb.batch, pb.qty";
+			if (isModEnabled('productbatch')) {
+				$sql .= " pb.batch as batch, pb.qty as qty,";
+			} else {
+				$sql .= " '' as batch, 0 as qty,";
+			}
+			$sql .= " p.ref, p.tobatch";
 			$sql .= " FROM ".$this->db->prefix()."product_stock as ps";
-			$sql .= " LEFT JOIN ".$this->db->prefix()."product_batch as pb ON pb.fk_product_stock = ps.rowid,";
-			$sql .= " ".$this->db->prefix()."product as p, ".$this->db->prefix()."entrepot as e";
+			if (isModEnabled('productbatch')) {
+				$sql .= " LEFT JOIN ".$this->db->prefix()."product_batch as pb ON pb.fk_product_stock = ps.rowid";
+			}
+			$sql .= ", ".$this->db->prefix()."product as p, ".$this->db->prefix()."entrepot as e";
 			$sql .= " WHERE p.entity IN (".getEntity('product').")";
 			$sql .= " AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid";
 			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
@@ -317,6 +323,7 @@ class Inventory extends CommonObject
 				$sql .= " WHERE pa.fk_product_pere = ps.fk_product";
 				$sql .= ")";
 			}
+			$sql .= " ORDER BY p.rowid";
 
 			$inventoryline = new InventoryLine($this->db);
 
@@ -335,10 +342,18 @@ class Inventory extends CommonObject
 					$inventoryline->datec = dol_now();
 
 					if (isModEnabled('productbatch')) {
+						if ($obj->batch && empty($obj->tobatch)) {
+							// Bad consistency of data. The product is not a product with lot/serial but we found a stock for some lot/serial.
+							$result = -2;
+							$this->error = 'The product ID='.$obj->ref." has stock with lot/serial but is configured to not manage lot/serial. You must first fix this, this way: Set the product to have 'Management of Lot/Serial' to Yes, then set it back to 'Management of Lot/Serial to No";
+							break;
+						}
+
 						$inventoryline->qty_stock = ($obj->batch ? $obj->qty : $obj->reel); // If there is batch detail, we take qty for batch, else global qty
 					} else {
 						$inventoryline->qty_stock = $obj->reel;
 					}
+					//var_dump($obj->batch.' '.$obj->qty.' '.$obj->reel.' '.$this->error);exit;
 
 					$resultline = $inventoryline->create($user);
 					if ($resultline <= 0) {
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index a3bd728a62d..0aab3be055c 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -150,6 +150,7 @@ if (empty($reshook)) {
 		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.pmp_real';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 		$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
+		$sql .= ' ORDER BY id.rowid';
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -185,9 +186,10 @@ if (empty($reshook)) {
 					$realqtynow = $product_static->stock_warehouse[$line->fk_warehouse]->detail_batch[$line->batch]->qty;
 				}
 
-
 				if (!is_null($qty_view)) {
 					$stock_movement_qty = price2num($qty_view - $realqtynow, 'MS');
+					//print "Process inventory line ".$line->rowid." product=".$product_static->id." realqty=".$realqtynow." qty_stock=".$qty_stock." qty_view=".$qty_view." warehouse=".$line->fk_warehouse." qty to move=".$stock_movement_qty."<br>\n";
+
 					if ($stock_movement_qty != 0) {
 						if ($stock_movement_qty < 0) {
 							$movement_type = 1;

From 90245b15b92e087d4c4d63660794bdc47c25e242 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 02:55:35 +0100
Subject: [PATCH 1640/1862] Fix warning after comment on #28891

---
 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 214b1731a94..f06d990ac56 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3521,7 +3521,7 @@ class EmailCollector extends CommonObject
 				}
 
 				// Get file name (with extension)
-				$file_name_complete = $params['filename'];
+				$file_name_complete = $filename;
 				$destination = $destdir.$file_name_complete;
 
 				// Extract file extension

From e959bb4b55a20cc8dff85e58062cc8c4e6166621 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 02:58:16 +0100
Subject: [PATCH 1641/1862] Fix code for tabs

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

diff --git a/htdocs/webportal/lib/webportal.lib.php b/htdocs/webportal/lib/webportal.lib.php
index a73e6053117..a2f3fb0eff3 100644
--- a/htdocs/webportal/lib/webportal.lib.php
+++ b/htdocs/webportal/lib/webportal.lib.php
@@ -60,9 +60,9 @@ function webportalAdminPrepareHead()
 	//$this->tabs = array(
 	//	'entity:-tabname:Title:@webportal:/webportal/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'website');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'webportal');
 
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'website', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'webportal', 'remove');
 
 	return $head;
 }

From 0f92d6d95736e7025853f48a6ad5a27da6208543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 17 Mar 2024 07:43:18 +0100
Subject: [PATCH 1642/1862] fix phpstan

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

diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 6d552f245f9..c6a7b6c437f 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -209,11 +209,11 @@ class PaymentSocialContribution extends CommonObject
 
 		$totalamount = 0;
 		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
-			$newvalue = price2num($value, 'MT');
+			$newvalue = (float) price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 		}
-		$totalamount = price2num($totalamount);
+		$totalamount = (float) price2num($totalamount);
 
 		// Check parameters
 		if ($totalamount == 0) {
@@ -240,7 +240,7 @@ class PaymentSocialContribution extends CommonObject
 				foreach ($this->amounts as $key => $amount) {
 					$contribid = $key;
 					if (is_numeric($amount) && $amount != 0) {
-						$amount = price2num($amount);
+						$amount = (float) price2num($amount);
 
 						// If we want to closed paid invoices
 						if ($closepaidcontrib) {
@@ -251,8 +251,8 @@ class PaymentSocialContribution extends CommonObject
 							$creditnotes = 0;
 							//$deposits=$contrib->getSumDepositsUsed();
 							$deposits = 0;
-							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-							$remaintopay = price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
+							$alreadypayed = (float) price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = (float) price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
 							if ($remaintopay == 0) {
 								$result = $contrib->setPaid($user);
 							} else {
@@ -369,7 +369,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->fk_charge = (int) $this->fk_charge;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepaiement)) {
 			$this->fk_typepaiement = (int) $this->fk_typepaiement;

From 7e349a790aa2638579c28f18494c23a78ae26696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 09:18:00 +0100
Subject: [PATCH 1643/1862] fix phan

---
 htdocs/accountancy/admin/defaultaccounts.php |  9 +++++----
 htdocs/accountancy/admin/productaccount.php  | 14 +++++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 982448cebdd..8cb10b061e5 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -239,7 +240,7 @@ foreach ($list_account_main as $key) {
 	// Value
 	print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
 	$key_value = getDolGlobalString($key);
-	print $formaccounting->select_account($key_value, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accountsmain');
+	print $formaccounting->select_account($key_value, $key, 1, [], 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accountsmain');
 	print '</td>';
 	print '</tr>';
 }
@@ -285,7 +286,7 @@ foreach ($list_account as $key) {
 		print '</td>';
 		// Value
 		print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
-		print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+		print $formaccounting->select_account(getDolGlobalString($key), $key, 1, [], 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
 		print '</td>';
 		print '</tr>';
 	}
@@ -300,7 +301,7 @@ print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTI
 print '</td>';
 // Value
 print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
-print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT', 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT', 1, [], 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
 print '</td>';
 print '</tr>';
 
@@ -327,7 +328,7 @@ print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->tra
 print '</td>';
 // Value
 print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
-print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT', 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT', 1, [], 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 403819c7f4d..e8630ad3aa9 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015       Ari Elbaz (elarifr) <github@accedinfo.com>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,6 +82,12 @@ $search_onpurchase = GETPOST('search_onpurchase', 'alpha');
 $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changetype = GETPOST('changetype', 'alpha');
 
+// Show/hide child product variants
+$show_childproducts = 0;
+if (isModEnabled('variants')) {
+	$show_childproducts = GETPOST('search_show_childproducts');
+}
+
 if (empty($accounting_product_mode)) {
 	$accounting_product_mode = 'ACCOUNTANCY_SELL';
 }
@@ -179,6 +186,10 @@ if ($action == 'update') {
 
 	if (!empty($chk_prod) && $massaction === 'changeaccount') {
 		//$msg = '<div><span class="accountingprocessing">' . $langs->trans("Processing") . '...</span></div>';
+		$ok = 0;
+		$ko = 0;
+		$msg = '';
+		$sql = '';
 		if (!empty($chk_prod) && in_array($accounting_product_mode, $accounting_product_modes)) {
 			$accounting = new AccountingAccount($db);
 
@@ -186,8 +197,6 @@ if ($action == 'update') {
 			$arrayofdifferentselectedvalues = array();
 
 			$cpt = 0;
-			$ok = 0;
-			$ko = 0;
 			foreach ($chk_prod as $productid) {
 				$accounting_account_id = GETPOST('codeventil_'.$productid);
 
@@ -201,7 +210,6 @@ if ($action == 'update') {
 					$msg .= '<div><span class="error">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br> <pre>'.$sql.'</pre></span></div>';
 					$ko++;
 				} else {
-					$sql = '';
 					if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 						$sql_exists  = "SELECT rowid FROM " . MAIN_DB_PREFIX . "product_perentity";
 						$sql_exists .= " WHERE fk_product = " . ((int) $productid) . " AND entity = " . ((int) $conf->entity);

From c4b16e996e3d4326fa4491d090487a264ceef34a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 12:26:40 +0100
Subject: [PATCH 1644/1862] Clsoe #23147

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_socpeople.sql    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 9c9f6dd01ee..d36466a76a1 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -276,3 +276,5 @@ ALTER TABLE llx_ticket ADD COLUMN fk_barcode_type integer DEFAULT NULL after bar
 
 ALTER TABLE llx_ticket ADD UNIQUE INDEX uk_ticket_barcode_barcode_type (barcode, fk_barcode_type, entity);
 ALTER TABLE llx_ticket ADD CONSTRAINT llx_ticket_fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
+
+ALTER TABLE llx_societe ADD COLUMN fk_parent integer NULL;
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 4e28d8df270..93b99e79d03 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -27,7 +27,9 @@ create table llx_socpeople
   fk_soc			integer,									-- lien vers la societe
   entity			integer DEFAULT 1 NOT NULL,					-- multi company id
   ref_ext           varchar(255),                               -- reference into an external system (not used by dolibarr)
-  name_alias           varchar(255),
+  name_alias        varchar(255),
+  fk_parent         integer NULL,
+
   civility			varchar(6),
   lastname			varchar(50),
   firstname			varchar(50),

From a37c79c5ee61718868fe89c710ea73fde57403c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Benke?=
 <1179011+defrance@users.noreply.github.com>
Date: Sun, 17 Mar 2024 12:44:37 +0100
Subject: [PATCH 1645/1862] Display additional boxes in all case

---
 htdocs/accountancy/index.php | 43 ++++++++++++++----------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index db569da428c..b2a106712d3 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -80,7 +80,7 @@ llxHeader('', $langs->trans("AccountancyArea"), $help_url);
 if (isModEnabled('accounting')) {
 	$step = 0;
 
-	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+
 
 	$helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
 	$showtutorial = '';
@@ -264,32 +264,6 @@ if (isModEnabled('accounting')) {
 
 	print '<div class="clearboth"></div>';
 
-	print '<div class="fichecenter fichecenterbis">';
-
-	/*
-	 * Show boxes
-	 */
-	$boxlist = '<div class="twocolumns">';
-
-	$boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
-
-	$boxlist .= $resultboxes['boxlista'];
-
-	$boxlist .= '</div>';
-
-	$boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
-
-	$boxlist .= $resultboxes['boxlistb'];
-
-	$boxlist .= '</div>';
-	$boxlist .= "\n";
-
-	$boxlist .= '</div>';
-
-
-	print $boxlist;
-
-	print '</div>';
 } elseif (isModEnabled('comptabilite')) {
 	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
@@ -300,6 +274,21 @@ if (isModEnabled('accounting')) {
 	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 }
 
+/*
+ * Show boxes
+ */
+$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+$boxlist = '<div class="twocolumns">';
+$boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
+$boxlist .= $resultboxes['boxlista'];
+$boxlist .= '</div>';
+$boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
+$boxlist .= $resultboxes['boxlistb'];
+$boxlist .= '</div>';
+$boxlist .= "\n";
+$boxlist .= '</div>';
+print $boxlist;
+
 // End of page
 llxFooter();
 $db->close();

From d7ce93d9ea0d0ba8d9e1a12ffae60a8533198382 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 13:10:17 +0100
Subject: [PATCH 1646/1862] Fix warning

---
 htdocs/core/customreports.php | 78 +++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 02b795734af..ca7d4fb26c2 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -724,18 +724,20 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 			$sql .= $val." as x_".$key.", ";
 		}
 	}
-	foreach ($search_groupby as $key => $val) {
-		if (preg_match('/\-year$/', $val)) {
-			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y') as g_".$key.', ';
-		} elseif (preg_match('/\-month$/', $val)) {
-			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m') as g_".$key.', ';
-		} elseif (preg_match('/\-day$/', $val)) {
-			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d') as g_".$key.', ';
-		} else {
-			$sql .= $val." as g_".$key.", ";
+	if (!empty($search_groupby)) {
+		foreach ($search_groupby as $key => $val) {
+			if (preg_match('/\-year$/', $val)) {
+				$tmpval = preg_replace('/\-year$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y') as g_".$key.', ';
+			} elseif (preg_match('/\-month$/', $val)) {
+				$tmpval = preg_replace('/\-month$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m') as g_".$key.', ';
+			} elseif (preg_match('/\-day$/', $val)) {
+				$tmpval = preg_replace('/\-day$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d') as g_".$key.', ';
+			} else {
+				$sql .= $val." as g_".$key.", ";
+			}
 		}
 	}
 	foreach ($search_measures as $key => $val) {
@@ -880,18 +882,20 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 			$sql .= $val.", ";
 		}
 	}
-	foreach ($search_groupby as $key => $val) {
-		if (preg_match('/\-year$/', $val)) {
-			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
-		} elseif (preg_match('/\-month$/', $val)) {
-			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
-		} elseif (preg_match('/\-day$/', $val)) {
-			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
-		} else {
-			$sql .= $val.', ';
+	if (!empty($search_groupby)) {
+		foreach ($search_groupby as $key => $val) {
+			if (preg_match('/\-year$/', $val)) {
+				$tmpval = preg_replace('/\-year$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
+			} elseif (preg_match('/\-month$/', $val)) {
+				$tmpval = preg_replace('/\-month$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
+			} elseif (preg_match('/\-day$/', $val)) {
+				$tmpval = preg_replace('/\-day$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
+			} else {
+				$sql .= $val.', ';
+			}
 		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
@@ -910,18 +914,20 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 			$sql .= $val.', ';
 		}
 	}
-	foreach ($search_groupby as $key => $val) {
-		if (preg_match('/\-year$/', $val)) {
-			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
-		} elseif (preg_match('/\-month$/', $val)) {
-			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
-		} elseif (preg_match('/\-day$/', $val)) {
-			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
-		} else {
-			$sql .= $val.', ';
+	if (!empty($search_groupby)) {
+		foreach ($search_groupby as $key => $val) {
+			if (preg_match('/\-year$/', $val)) {
+				$tmpval = preg_replace('/\-year$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
+			} elseif (preg_match('/\-month$/', $val)) {
+				$tmpval = preg_replace('/\-month$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
+			} elseif (preg_match('/\-day$/', $val)) {
+				$tmpval = preg_replace('/\-day$/', '', $val);
+				$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
+			} else {
+				$sql .= $val.', ';
+			}
 		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);

From 912be1e1bd904fb86c18ca6920460e7c40d2b070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 13:15:37 +0100
Subject: [PATCH 1647/1862] fix phan

---
 htdocs/expensereport/class/paymentexpensereport.class.php | 2 +-
 htdocs/expensereport/payment/payment.php                  | 6 +++---
 phpstan.neon.dist                                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 5541cdc9ac3..98e4731a04c 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -189,7 +189,7 @@ class PaymentExpenseReport extends CommonObject
 
 		$totalamount = 0;
 		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
-			$newvalue = price2num($value, 'MT');
+			$newvalue = (float) price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 		}
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index e1de1f7015b..24895aa3bfa 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -91,8 +91,8 @@ if ($action == 'add_payment') {
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
 				if (GETPOST($key)) {
-					$amounts[$expensereport->fk_user_author] = price2num(GETPOST($key));
-					$total += price2num(GETPOST($key));
+					$amounts[$expensereport->fk_user_author] = (float) price2num(GETPOST($key));
+					$total += (float) price2num(GETPOST($key));
 				}
 			}
 		}
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c354dfd5d84..4bb2cf6eaed 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,7 @@ parameters:
 		# minimumNumberOfJobsPerProcess: 2  # default is 2
 		# buffer: 134217728 # 128 MB  # Not documented
 	customRulesetUsed: true
-	level: 2
+	level: 3
 	fileExtensions:
 		- php
 	paths:

From 5e5995731da31314fba14d33b20223ce6cfbd10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 13:17:51 +0100
Subject: [PATCH 1648/1862] fix phan

---
 .../expensereport/class/paymentexpensereport.class.php   | 2 +-
 htdocs/expensereport/payment/payment.php                 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 98e4731a04c..73fb1025f80 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -193,7 +193,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 		}
-		$totalamount = price2num($totalamount);
+		// $totalamount = (float) price2num($totalamount);
 
 		// Check parameters
 		if ($totalamount == 0) {
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 24895aa3bfa..df91a49f3f7 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -85,14 +85,14 @@ if ($action == 'add_payment') {
 
 	if (!$error) {
 		$paymentid = 0;
-		$total = 0;
+		// $total = 0;
 
 		// Read possible payments
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
 				if (GETPOST($key)) {
 					$amounts[$expensereport->fk_user_author] = (float) price2num(GETPOST($key));
-					$total += (float) price2num(GETPOST($key));
+					// $total += price2num(GETPOST($key));
 				}
 			}
 		}
@@ -109,8 +109,9 @@ if ($action == 'add_payment') {
 			$payment = new PaymentExpenseReport($db);
 			$payment->fk_expensereport = $expensereport->id;
 			$payment->datep       	 = $datepaid;
-			$payment->amounts		 = $amounts; // Tableau de montant
-			$payment->total          = $total;
+			$payment->amounts		 = $amounts; // array of amounts
+			// total is calculated in class
+			// $payment->total          = $total;
 			$payment->fk_typepayment = GETPOSTINT("fk_typepayment");
 			$payment->num_payment    = GETPOST("num_payment", 'alphanohtml');
 			$payment->note_public    = GETPOST("note_public", 'restricthtml');

From 47de296d7e40da013dcedcb9574ed9836d5f7477 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 13:20:37 +0100
Subject: [PATCH 1649/1862] Fix to allow include several times the customreport

---
 htdocs/core/customreports.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index ca7d4fb26c2..5e5d6297d56 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1118,10 +1118,11 @@ if ($mode == 'graph') {
 
 		$dir = $conf->user->dir_temp;
 		dol_mkdir($dir);
-		$filenamenb = $dir.'/customreport_'.$object->element.'.png';
-		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=user&file=customreport_'.$object->element.'.png';
+		// $customreportkey may be defined when using customreports.php as an include
+		$filenamekey = $dir.'/customreport_'.$object->element.(empty($customreportkey) ? '' : $customreportkey).'.png';
+		$fileurlkey = DOL_URL_ROOT.'/viewimage.php?modulepart=user&file=customreport_'.$object->element.(empty($customreportkey) ? '' : $customreportkey).'.png';
 
-		$px1->draw($filenamenb, $fileurlnb);
+		$px1->draw($filenamekey, $fileurlkey);
 
 		$texttoshow = $langs->trans("NoRecordFound");
 		if (!GETPOSTISSET('search_measures') || !GETPOSTISSET('search_xaxis')) {

From 26303dc4d39d69599d23383716c576a74ef7045b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 13:21:34 +0100
Subject: [PATCH 1650/1862] fix phan

---
 htdocs/expensereport/class/paymentexpensereport.class.php | 4 ++--
 phpstan.neon.dist                                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 73fb1025f80..7a9e9171de3 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -160,7 +160,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->fk_expensereport = (int) $this->fk_expensereport;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
@@ -315,7 +315,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->fk_expensereport = (int) $this->fk_expensereport;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 4bb2cf6eaed..c354dfd5d84 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,7 @@ parameters:
 		# minimumNumberOfJobsPerProcess: 2  # default is 2
 		# buffer: 134217728 # 128 MB  # Not documented
 	customRulesetUsed: true
-	level: 3
+	level: 2
 	fileExtensions:
 		- php
 	paths:

From 6843232393f3eb92836de8b298544c3c14345e70 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 14:48:32 +0100
Subject: [PATCH 1651/1862] Qual: Remove useless trim (fix
 PhanTypeMismatchArgumentInternal)

---
 htdocs/admin/agenda_extsites.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index ce994385f80..3f21267b451 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -155,7 +156,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 
 	// Save nb of agenda
 	if (!$error) {
-		$res = dolibarr_set_const($db, 'AGENDA_EXT_NB', trim(GETPOSTINT('AGENDA_EXT_NB')), 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'AGENDA_EXT_NB', GETPOSTINT('AGENDA_EXT_NB'), 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
 		}

From 1fe9527e809237285e302d94420fa7b55cb3545b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 14:57:16 +0100
Subject: [PATCH 1652/1862] Fix GETPOSTINT(trackingurl),
 is_numeric(GETPOSTINT()), unneeded trim

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 9ef21f4823f..d915a86929d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -546,24 +546,24 @@ if (empty($reshook)) {
 			$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
 		}
 		if ($action == 'settracking_url') {
-			$object->tracking_url = trim(GETPOSTINT('tracking_url'));
+			$object->tracking_url = trim(GETPOST('tracking_url', 'restricthtml'));
 		}
 		if ($action == 'settrueWeight') {
-			$object->trueWeight = trim(GETPOSTINT('trueWeight'));
+			$object->trueWeight = GETPOSTINT('trueWeight');
 			$object->weight_units = GETPOSTINT('weight_units');
 		}
 		if ($action == 'settrueWidth') {
-			$object->trueWidth = trim(GETPOSTINT('trueWidth'));
+			$object->trueWidth = GETPOSTINT('trueWidth');
 		}
 		if ($action == 'settrueHeight') {
-			$object->trueHeight = trim(GETPOSTINT('trueHeight'));
+			$object->trueHeight = GETPOSTINT('trueHeight');
 			$object->size_units = GETPOSTINT('size_units');
 		}
 		if ($action == 'settrueDepth') {
-			$object->trueDepth = trim(GETPOSTINT('trueDepth'));
+			$object->trueDepth = GETPOSTINT('trueDepth');
 		}
 		if ($action == 'setshipping_method_id') {
-			$object->shipping_method_id = trim(GETPOSTINT('shipping_method_id'));
+			$object->shipping_method_id = GETPOSTINT('shipping_method_id');
 		}
 
 		if (!$error) {
@@ -1336,7 +1336,7 @@ if ($action == 'create') {
 									// Show warehouse combo list
 									$ent = "entl".$indiceAsked;
 									$idl = "idl".$indiceAsked;
-									$tmpentrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : $warehouse_id;
+									$tmpentrepot_id = is_numeric(GETPOST($ent)) ? GETPOSTINT($ent) : $warehouse_id;
 									if ($line->fk_product > 0) {
 										print '<!-- Show warehouse selection -->';
 

From e56546515cf6577862de90a01ef21dc9c570a455 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:04:48 +0100
Subject: [PATCH 1653/1862] Fix unneeded trim, unneeded urlencode

---
 htdocs/fourn/facture/list.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 642b4612358..d2393f30f6d 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2019-2023	Alexandre Spangaro		<aspangaro@easya.solutions>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2023		Joachim Kueter		    <git-jk@bloxera.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -103,7 +104,7 @@ $search_datelimit_endmonth = GETPOSTINT('search_datelimit_endmonth');
 $search_datelimit_endyear = GETPOSTINT('search_datelimit_endyear');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
-$search_categ_sup = trim(GETPOSTINT("search_categ_sup"));
+$search_categ_sup = GETPOSTINT("search_categ_sup");
 $search_product_category = GETPOSTINT('search_product_category');
 
 $option = GETPOST('search_option');
@@ -932,10 +933,10 @@ if ($option) {
 	$param .= "&search_option=".urlencode($option);
 }
 if ($search_categ_sup > 0) {
-	$param .= '&search_categ_sup='.urlencode($search_categ_sup);
+	$param .= '&search_categ_sup='.$search_categ_sup;
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-	$param .= '&search_type_thirdparty='.urlencode((string) ($search_type_thirdparty));
+	$param .= '&search_type_thirdparty='.$search_type_thirdparty;
 }
 
 // Add $param from extra fields

From 45ca82e9f6653264d88516119b6c379ef00c2321 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:08:21 +0100
Subject: [PATCH 1654/1862] Fix GETPOSTINT(trackingurl),
 is_numeric(GETPOSTINT()), unneeded trim

---
 htdocs/reception/card.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index c4a27f64b5a..a9bd8f3e170 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Yasser Carreón			<yacasia@gmail.com>
  * Copyright (C) 2018	    Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -391,7 +392,7 @@ if (empty($reshook)) {
 					$ent = "entl".$i;
 					$idl = "idl".$i;
 
-					$entrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : GETPOSTINT('entrepot_id');
+					$entrepot_id = is_numeric(GETPOST($ent)) ? GETPOSTINT($ent) : GETPOSTINT('entrepot_id');
 
 					/*
 					if (!empty($lineToTest)) {
@@ -520,24 +521,24 @@ if (empty($reshook)) {
 			$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
 		}
 		if ($action == 'settracking_url') {
-			$object->tracking_url = trim(GETPOSTINT('tracking_url'));
+			$object->tracking_url = trim(GETPOST('tracking_url', 'restricthtml'));
 		}
 		if ($action == 'settrueWeight') {
-			$object->trueWeight = trim(GETPOSTINT('trueWeight'));
+			$object->trueWeight = GETPOSTINT('trueWeight');
 			$object->weight_units = GETPOSTINT('weight_units');
 		}
 		if ($action == 'settrueWidth') {
-			$object->trueWidth = trim(GETPOSTINT('trueWidth'));
+			$object->trueWidth = GETPOSTINT('trueWidth');
 		}
 		if ($action == 'settrueHeight') {
-			$object->trueHeight = trim(GETPOSTINT('trueHeight'));
+			$object->trueHeight = GETPOSTINT('trueHeight');
 			$object->size_units = GETPOSTINT('size_units');
 		}
 		if ($action == 'settrueDepth') {
-			$object->trueDepth = trim(GETPOSTINT('trueDepth'));
+			$object->trueDepth = GETPOSTINT('trueDepth');
 		}
 		if ($action == 'setshipping_method_id') {
-			$object->shipping_method_id = trim(GETPOSTINT('shipping_method_id'));
+			$object->shipping_method_id = GETPOSTINT('shipping_method_id');
 		}
 
 		if (!$error) {
@@ -1255,7 +1256,7 @@ if ($action == 'create') {
 							// Show warehouse combo list
 							$ent = "entl".$indiceAsked;
 							$idl = "idl".$indiceAsked;
-							$tmpentrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : $warehouse_id;
+							$tmpentrepot_id = is_numeric(GETPOST($ent)) ? GETPOSTINT($ent) : $warehouse_id;
 							if ($line->fk_product > 0) {
 								print '<!-- Show warehouse selection -->';
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);

From 59e9a1c24d6258cf11c8294fdc160f8424dd37f5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:12:41 +0100
Subject: [PATCH 1655/1862] Qual: Remove useless trim

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1d780599f2d..0e9680dd870 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2021       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022       Anthony Berton          <anthony.berton@bb2a.fr>
  * Copyright (C) 2023       William Mead            <william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -70,7 +71,7 @@ $mode = GETPOST("mode", 'alpha');
 $search_all = trim(GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
 
-$search_id = trim(GETPOSTINT("search_id"));
+$search_id = GETPOSTINT("search_id");
 $search_nom = trim(GETPOST("search_nom", 'restricthtml'));
 $search_alias = trim(GETPOST("search_alias", 'restricthtml'));
 $search_nom_only = trim(GETPOST("search_nom_only", 'restricthtml'));

From 4232713e9695b29eccad7923a890a8596db06c24 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:01:35 +0100
Subject: [PATCH 1656/1862] Qual: enable PhanPluginPrintfVariableFormatString

---
 dev/tools/codespell/codespell-dict.txt | 1 +
 dev/tools/phan/config.php              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt
index dce7bdff144..f6d51c0b68d 100644
--- a/dev/tools/codespell/codespell-dict.txt
+++ b/dev/tools/codespell/codespell-dict.txt
@@ -14,6 +14,7 @@ dolibar->dolibarr
 dolibarrr->dolibarr
 dollibar->dolibarr
 dollibarr->dolibarr
+thoose->those
 # fiche->card
 mot de passe->password
 not de passe->password
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 80be656d1a9..7229a312a8e 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -505,7 +505,7 @@ return [
 		// 'PhanRedefinedExtendedClass',
 		'PhanTypeComparisonFromArray',
 		'PhanPluginConstantVariableBool',
-		'PhanPluginPrintfVariableFormatString',
+		// 'PhanPluginPrintfVariableFormatString',
 		'PhanTypeMismatchDimFetch',
 		'PhanTypeMismatchDimFetchNullable',
 		'PhanTypeSuspiciousNonTraversableForeach',

From 10478a641b40f99401e39b5760f3ab9f67745843 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:36 +0100
Subject: [PATCH 1657/1862] Fix/ignore PhanPluginPrintfVariableFormatString

---
 htdocs/core/boxes/box_factures.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 4cb0e49ff9d..c0e08d06ba5 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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,7 +74,7 @@ class box_factures extends ModeleBoxes
 		$text = $langs->trans("BoxTitleLast".(getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE') ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
 			'text' => $text,
-			'limit'=> dol_strlen($text)
+			'limit' => dol_strlen($text)
 		);
 
 		if ($user->hasRight('facture', 'lire')) {
@@ -159,13 +160,14 @@ class box_factures extends ModeleBoxes
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
+						// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
 						'text' => $facturestatic->getNomUrl(1),
-						'text2'=> $late,
+						'text2' => $late,
 						'asis' => 1,
 					);
 
@@ -196,7 +198,7 @@ class box_factures extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedInvoices").'</span>',
+						'text' => '<span class="opacitymedium">'.$langs->trans("NoRecordedInvoices").'</span>',
 					);
 				}
 
@@ -204,7 +206,7 @@ class box_factures extends ModeleBoxes
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => '',
-					'maxlength'=>500,
+					'maxlength' => 500,
 					'text' => ($this->db->error().' sql='.$sql),
 				);
 			}

From 9a8aa2c9afef3e08d8312f1d461a591dd4745584 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:38 +0100
Subject: [PATCH 1658/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index f45d1ca689f..93ce9fab6da 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -149,13 +150,14 @@ class box_factures_fourn extends ModeleBoxes
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
+						// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
 						'text' => $facturestatic->getNomUrl(1),
-						'text2'=> $late,
+						'text2' => $late,
 						'asis' => 1,
 					);
 
@@ -193,7 +195,7 @@ class box_factures_fourn extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=> '<span class="opacitymedium">'.$langs->trans("NoModifiedSupplierBills").'</span>',
+						'text' => '<span class="opacitymedium">'.$langs->trans("NoModifiedSupplierBills").'</span>',
 					);
 				}
 
@@ -201,7 +203,7 @@ class box_factures_fourn extends ModeleBoxes
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => '',
-					'maxlength'=>500,
+					'maxlength' => 500,
 					'text' => ($this->db->error().' sql='.$sql),
 				);
 			}

From 2502c394f2551aa1181c3fcb6f2db47c3e824dc0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:40 +0100
Subject: [PATCH 1659/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index fab76f18fc8..777cea5a2ed 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -158,6 +159,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
+						// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
@@ -166,7 +168,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
 						'text' => $facturestatic->getNomUrl(1),
-						'text2'=> $late,
+						'text2' => $late,
 						'asis' => 1,
 					);
 
@@ -201,7 +203,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=> '<span class="opacitymedium">'.$langs->trans("NoUnpaidSupplierBills").'</span>',
+						'text' => '<span class="opacitymedium">'.$langs->trans("NoUnpaidSupplierBills").'</span>',
 					);
 				}
 
@@ -238,7 +240,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => '',
-					'maxlength'=>500,
+					'maxlength' => 500,
 					'text' => ($this->db->error().' sql='.$sql),
 				);
 			}

From 7910780fdfcdfff1e5c33a04436259423286a6a2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:42 +0100
Subject: [PATCH 1660/1862] Fix/ignore PhanPluginPrintfVariableFormatString

---
 htdocs/core/boxes/box_factures_imp.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index b0b2659fd69..c256dbbcc72 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2019 Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -75,7 +76,7 @@ class box_factures_imp extends ModeleBoxes
 		$langs->load("bills");
 
 		$textHead = $langs->trans("BoxTitleOldestUnpaidCustomerBills");
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $this->max), 'limit'=> dol_strlen($textHead));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $this->max), 'limit' => dol_strlen($textHead));
 
 		if ($user->hasRight('facture', 'lire')) {
 			$sql1 = "SELECT s.rowid as socid, s.nom as name, s.name_alias, s.code_client, s.client";
@@ -171,13 +172,14 @@ class box_factures_imp extends ModeleBoxes
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
+						// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day', 'tzuserrel')));
 					}
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
 						'text' => $facturestatic->getNomUrl(1),
-						'text2'=> $late,
+						'text2' => $late,
 						'asis' => 1,
 					);
 
@@ -212,7 +214,7 @@ class box_factures_imp extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=> '<span class="opacitymedium">'.$langs->trans("NoUnpaidCustomerBills").'</span>'
+						'text' => '<span class="opacitymedium">'.$langs->trans("NoUnpaidCustomerBills").'</span>'
 					);
 				}
 
@@ -249,7 +251,7 @@ class box_factures_imp extends ModeleBoxes
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => '',
-					'maxlength'=>500,
+					'maxlength' => 500,
 					'text' => ($this->db->error().' sql='.$sql),
 				);
 			}

From c5f8cccb88e0beb30207ef46e72758003cf1ea20 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:44 +0100
Subject: [PATCH 1661/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 96daa0479f8..92b32d2f257 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -701,6 +701,7 @@ class Translate
 
 			if (strpos($key, 'Format') !== 0) {
 				try {
+					// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 					$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
 				} catch (Exception $e) {
 					// No exception managed
@@ -786,6 +787,7 @@ class Translate
 
 			if (!preg_match('/^Format/', $key)) {
 				//print $str;
+				// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 				$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
 			}
 
@@ -810,7 +812,7 @@ class Translate
 	 */
 	public function transcountry($str, $countrycode)
 	{
-		$strLocaleKey=$str.$countrycode;
+		$strLocaleKey = $str.$countrycode;
 		if (!empty($this->tab_translate[$strLocaleKey])) {
 			return $this->trans($strLocaleKey);
 		} else {
@@ -829,7 +831,7 @@ class Translate
 	 */
 	public function transcountrynoentities($str, $countrycode)
 	{
-		$strLocaleKey=$str.$countrycode;
+		$strLocaleKey = $str.$countrycode;
 		if (!empty($this->tab_translate[$strLocaleKey])) {
 			return $this->transnoentities($strLocaleKey);
 		} else {

From da4b3b2e070e3fbbb51c001a85ad837606bbe47f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:47 +0100
Subject: [PATCH 1662/1862] Fix/ignore PhanPluginPrintfVariableFormatString

---
 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 c9309bfa883..e0cb8e17dc4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3946,7 +3946,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 	$newphoneastart = $newphoneaend = '';
 	if (!empty($addlink)) {	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 		if ($addlink == 'tel' || $conf->browser->layout == 'phone' || (isModEnabled('clicktodial') && getDolGlobalString('CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS'))) {	// If phone or option for, we use link of phone
-			$newphoneastart = '<a href="tel:'.$phone.'">';
+			$newphoneastart = '<a href="tel:'.urlencode($phone).'">';
 			$newphoneaend .= '</a>';
 		} elseif (isModEnabled('clicktodial') && $addlink == 'AC_TEL') {		// If click to dial, we use click to dial url
 			if (empty($user->clicktodial_loaded)) {
@@ -3962,9 +3962,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');
 			$clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');
 			$clicktodial_password = (!empty($user->clicktodial_password) ? urlencode($user->clicktodial_password) : '');
-			// This line is for backward compatibility
+			// This line is for backward compatibility  @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 			$url = sprintf($urlmask, urlencode($phone), $clicktodial_poste, $clicktodial_login, $clicktodial_password);
-			// Thoose lines are for substitution
+			// Those lines are for substitution
 			$substitarray = array('__PHONEFROM__' => $clicktodial_poste,
 								'__PHONETO__' => urlencode($phone),
 								'__LOGIN__' => $clicktodial_login,

From 988cd8a61eeedb7b284cd0c022cc645c7f610e9d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:49 +0100
Subject: [PATCH 1663/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 943c2e57956..ca90c123829 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2018       Nicolas ZABOURI     <info@inovea-conseil.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -463,6 +464,7 @@ class DataPolicyCron
 
 		foreach ($arrayofparameters as $key => $params) {
 			if (getDolGlobalInt($key) > 0) {
+				// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 				$sql = sprintf($params['sql'], (int) $conf->entity, (int) getDolGlobalInt($key), (int) getDolGlobalInt($key));
 
 				$resql = $this->db->query($sql);

From 50fe3149322d9bfa42a87e11b9eee328f526cf4f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:51 +0100
Subject: [PATCH 1664/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 4f9ef208d88..90da7555450 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2193,14 +2193,14 @@ class Expedition extends CommonObject
 
 		if (!empty($tracking) && !empty($value)) {
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" rel="noopener noreferrer" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
+			$this->tracking_url = sprintf('<a target="_blank" rel="noopener noreferrer" href="%s">%s</a>', $url, ($value ? $value : 'url'));
 		} else {
 			$this->tracking_url = $value;
 		}
 	}
 
 	/**
-	 *	Classify the shipping as closed (this record also the stock movement)
+	 *	Classify the shipping as closed (this records also the stock movement)
 	 *
 	 *	@return     int     Return integer <0 if KO, >0 if OK
 	 */

From 6c24b9f4bbf60053c8dabbec4184445171034878 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:53 +0100
Subject: [PATCH 1665/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2f35855ff10..a18fb425c37 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2332,8 +2332,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				}
 				$text .= '<a class="help" target="_blank" rel="noopener noreferrer" href="';
 				if ($mode == 'wiki') {
+					// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 					$text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
 				} else {
+					// @phan-suppress-next-line PhanPluginPrintfVariableFormatString
 					$text .= sprintf($helpbaseurl, $helppage);
 				}
 				$text .= '">';

From 2ebfc1d126768d6e303ff68787840523f00178e5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:02:56 +0100
Subject: [PATCH 1666/1862] Fix/ignore PhanPluginPrintfVariableFormatString

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

diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 67e29c85fc1..c895740b60a 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1588,14 +1588,14 @@ class Reception extends CommonObject
 
 		if (!empty($tracking) && !empty($value)) {
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" rel="noopener noreferrer" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
+			$this->tracking_url = sprintf('<a target="_blank" rel="noopener noreferrer" href="%s">%s</a>', $url, ($value ? $value : 'url'));
 		} else {
 			$this->tracking_url = $value;
 		}
 	}
 
 	/**
-	 *	Classify the reception as closed (this record also the stock movement)
+	 *	Classify the reception as closed (this records also the stock movement)
 	 *
 	 *	@return     int     Return integer <0 if KO, >0 if OK
 	 */

From 81d5f30466dacac8faa34845d2722ebc05af79ec Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:03:51 +0100
Subject: [PATCH 1667/1862] Qual: Enable
 PhanPluginPrintfIncompatibleArgumentType

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 7229a312a8e..1017a749576 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -488,7 +488,7 @@ return [
 		'PhanPluginInlineHTMLTrailing',
 		// 'PhanUndeclaredStaticMethod',
 		// 'PhanPluginDescriptionlessCommentOnPrivateMethod',
-		'PhanPluginPrintfIncompatibleArgumentType',
+		// 'PhanPluginPrintfIncompatibleArgumentType',
 		'PhanPossiblyNullTypeMismatchProperty',
 		'PhanRedefineClass',
 		'PhanRedefineFunction',

From d73886281ca4cff74fea9b8f74f1a50be6d9cda6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:10:41 +0100
Subject: [PATCH 1668/1862] Qual: Set typing for global

---
 dev/tools/phan/config.php          | 1 +
 dev/tools/phan/config_extended.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 1017a749576..a1644a4c43f 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -171,6 +171,7 @@ $VALID_MODULE_MAPPING = array(
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
 	'tax' => 'Tax',
+	'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}',
 	'ticket' => 'Ticket',
 	'user' => 'User',
 	'variants' => 'Variants',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 91b2894cd26..997fbaed91a 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -170,6 +170,7 @@ $VALID_MODULE_MAPPING = array(
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
 	'tax' => 'Tax',
+	'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}',
 	'ticket' => 'Ticket',
 	'user' => 'User',
 	'variants' => 'Variants',

From 207314ea597410316be7736043ee782bf5ca0b6f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:19:08 +0100
Subject: [PATCH 1669/1862] Fix PhanPluginPrintfIncompatibleArgumentType by
 typing/casting

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index a58cb34a0b5..2cc21fb215d 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2136,7 +2136,7 @@ class BonPrelevement extends CommonObject
 	 *	@param	string		$row_cc				pl.number AS cc,			Not used for SEPA
 	 *	@param	string		$row_somme			pl.amount AS somme,
 	 *	@param	string		$row_ref			Invoice ref (f.ref) or Salary ref
-	 *	@param	string		$row_idfac			p.fk_facture AS idfac or p.fk_facture_fourn or p.fk_salary,
+	 *	@param	int			$row_idfac			p.fk_facture AS idfac or p.fk_facture_fourn or p.fk_salary,
 	 *	@param	string		$row_iban			rib.iban_prefix AS iban,
 	 *	@param	string		$row_bic			rib.bic AS bic,
 	 *	@param	string		$row_datec			rib.datec,

From 25dd2433a103763fab41a3a0ae296be176c0295f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:19:10 +0100
Subject: [PATCH 1670/1862] Fix PhanPluginPrintfIncompatibleArgumentType by
 typing/casting

---
 htdocs/core/lib/date.lib.php | 82 ++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 9239d78cee3..8a08ef4141e 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -35,31 +35,31 @@
 function get_tz_array()
 {
 	$tzarray = array(
-		-11=>"Pacific/Midway",
-		-10=>"Pacific/Fakaofo",
-		-9=>"America/Anchorage",
-		-8=>"America/Los_Angeles",
-		-7=>"America/Dawson_Creek",
-		-6=>"America/Chicago",
-		-5=>"America/Bogota",
-		-4=>"America/Anguilla",
-		-3=>"America/Araguaina",
-		-2=>"America/Noronha",
-		-1=>"Atlantic/Azores",
-		0=>"Africa/Abidjan",
-		1=>"Europe/Paris",
-		2=>"Europe/Helsinki",
-		3=>"Europe/Moscow",
-		4=>"Asia/Dubai",
-		5=>"Asia/Karachi",
-		6=>"Indian/Chagos",
-		7=>"Asia/Jakarta",
-		8=>"Asia/Hong_Kong",
-		9=>"Asia/Tokyo",
-		10=>"Australia/Sydney",
-		11=>"Pacific/Noumea",
-		12=>"Pacific/Auckland",
-		13=>"Pacific/Enderbury"
+		-11 => "Pacific/Midway",
+		-10 => "Pacific/Fakaofo",
+		-9 => "America/Anchorage",
+		-8 => "America/Los_Angeles",
+		-7 => "America/Dawson_Creek",
+		-6 => "America/Chicago",
+		-5 => "America/Bogota",
+		-4 => "America/Anguilla",
+		-3 => "America/Araguaina",
+		-2 => "America/Noronha",
+		-1 => "Atlantic/Azores",
+		0 => "Africa/Abidjan",
+		1 => "Europe/Paris",
+		2 => "Europe/Helsinki",
+		3 => "Europe/Moscow",
+		4 => "Asia/Dubai",
+		5 => "Asia/Karachi",
+		6 => "Indian/Chagos",
+		7 => "Asia/Jakarta",
+		8 => "Asia/Hong_Kong",
+		9 => "Asia/Tokyo",
+		10 => "Australia/Sydney",
+		11 => "Pacific/Noumea",
+		12 => "Pacific/Auckland",
+		13 => "Pacific/Enderbury"
 	);
 	return $tzarray;
 }
@@ -296,11 +296,11 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
 		} elseif ($format == 'allhourminsec') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
 		} elseif ($format == 'allhourmin') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
 		} elseif ($format == 'allhour') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600)));
 		}
 	} elseif ($format == 'hour') {	// only hour part
 		$sTime = dol_print_date($iSecond, '%H', true);
@@ -431,12 +431,12 @@ function dol_stringtotime($string, $gm = 1)
 		dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
 		// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
 		// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
-		$sday = $reg[1];
-		$smonth = $reg[2];
-		$syear = $reg[3];
-		$shour = $reg[4];
-		$smin = $reg[5];
-		$ssec = $reg[6];
+		$sday = (int) $reg[1];
+		$smonth = (int) $reg[2];
+		$syear = (int) $reg[3];
+		$shour = (int) $reg[4];
+		$smin = (int) $reg[5];
+		$ssec = (int) $reg[6];
 		if ($syear < 50) {
 			$syear += 1900;
 		}
@@ -448,12 +448,12 @@ function dol_stringtotime($string, $gm = 1)
 		|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
 		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
 	) {
-		$syear = $reg[1];
-		$smonth = $reg[2];
-		$sday = $reg[3];
-		$shour = $reg[4];
-		$smin = $reg[5];
-		$ssec = $reg[6];
+		$syear = (int) $reg[1];
+		$smonth = (int) $reg[2];
+		$sday = (int) $reg[3];
+		$shour = (int) $reg[4];
+		$smin = (int) $reg[5];
+		$ssec = (int) $reg[6];
 		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
 	}
 
@@ -950,7 +950,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				$jour_1sunsept = date("d", $date_1sunsept);
 				$mois_1sunsept = date("m", $date_1sunsept);
 				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) {
-					$ferie=true;
+					$ferie = true;
 				}
 				// Geneva fast in Switzerland
 			}

From 66e88e123cb6cb33fcafbbcb254a56bfa74e8362 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:19:12 +0100
Subject: [PATCH 1671/1862] Fix PhanPluginPrintfIncompatibleArgumentType by
 typing/casting

---
 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 e0cb8e17dc4..2e6292f9663 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3149,7 +3149,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$dtts = new DateTime();
 		$dtts->setTimestamp($timetouse);
 		$dtts->setTimezone($tzo);
-		$month = $dtts->format("m");
+		$month = (int) $dtts->format("m");
 		$month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
 		if ($encodetooutput) {
 			$monthtext = $outputlangs->transnoentities('Month'.$month);

From 6b6da854c6f002fe54607c78cee17feb7e0d7a63 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:24:15 +0100
Subject: [PATCH 1672/1862] Fix spelling in Changelog

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

diff --git a/ChangeLog b/ChangeLog
index 3207490752d..6da016bd2cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10105,7 +10105,7 @@ For developers:
 WARNING:
 - A lot of class files (*.class.php) has moved into subdirectories. So If you use
   or develop non official modules that includes Dolibarr classes, you will have to rename
-  path to thoose classes into the include function.
+  path to those classes into the include function.
 - Also, parameters of the "fetch()" method for class "User" has changed to reflect
   other fetch methods.
 - If you build a personalised themes, you must rename the style sheet into style.css.php.

From a848a06b76d68760d492b8140d90c4ea4bb3375e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 18:41:53 +0100
Subject: [PATCH 1673/1862] Force typing for /global did not help

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 78c5449ccca..f9c22d3e10b 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1793,7 +1793,7 @@ $db->close();
  * @param   int		$showinfo        Add extended information (used by day and week view)
  * @param   int		$minheight       Minimum height for each event. 60px by default.
  * @param	int		$nonew			 0=Add "new entry button", 1=No "new entry button", -1=Only "new entry button"
- * @param	array	$bookcalcalendarsarray	 Used for Bookcal module array of calendar of bookcal
+ * @param	array{}|array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}	$bookcalcalendarsarray	 Used for Bookcal module array of calendar of bookcal
  * @return	void
  */
 function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $nonew = 0, $bookcalcalendarsarray = array())
@@ -1804,6 +1804,8 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 	global $hookmanager;
 
+	'@phan-var-force array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}} $theme_datacolor';
+
 	if ($conf->use_javascript_ajax) {	// Enable the "Show more button..."
 		$conf->global->MAIN_JS_SWITCH_AGENDA = 1;
 	}
@@ -1954,7 +1956,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							}
 						}
 						//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
-						// Define color
+						// Define color  // @suppress-next-line PhanPluginPrintfIncompatibleArgumentType
 						$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 					}
 					$cssclass = $cssclass.' eventday_'.$ymd;

From 049f660ea634dbea48aed0db994c84048f1ad7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 19:10:40 +0100
Subject: [PATCH 1674/1862] fix phpstan

---
 htdocs/compta/tva/class/paymentvat.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index 1c72b1ff444..1776fe56a77 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -189,7 +189,7 @@ class PaymentVAT extends CommonObject
 			$this->fk_tva = (int) $this->fk_tva;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepaiement)) {
 			$this->fk_typepaiement = (int) $this->fk_typepaiement;
@@ -215,11 +215,11 @@ class PaymentVAT extends CommonObject
 
 		$totalamount = 0;
 		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
-			$newvalue = price2num($value, 'MT');
+			$newvalue = (float) price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 		}
-		$totalamount = price2num($totalamount);
+		// $totalamount = price2num($totalamount);
 
 		// Check parameters
 		if ($totalamount == 0) {
@@ -246,7 +246,7 @@ class PaymentVAT extends CommonObject
 				foreach ($this->amounts as $key => $amount) {
 					$contribid = $key;
 					if (is_numeric($amount) && $amount != 0) {
-						$amount = price2num($amount);
+						$amount = (float) price2num($amount);
 
 						// If we want to closed paid invoices
 						if ($closepaidvat) {
@@ -257,8 +257,8 @@ class PaymentVAT extends CommonObject
 							$creditnotes = 0;
 							//$deposits=$contrib->getSumDepositsUsed();
 							$deposits = 0;
-							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-							$remaintopay = price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
+							$alreadypayed = (float) price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = (float) price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
 							if ($remaintopay == 0) {
 								$result = $contrib->setPaid($user);
 							} else {
@@ -374,7 +374,7 @@ class PaymentVAT extends CommonObject
 			$this->fk_tva = (int) $this->fk_tva;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepaiement)) {
 			$this->fk_typepaiement = (int) $this->fk_typepaiement;

From 93f2b77c026749b8f8edb23dd6ebfe09e0124417 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 19:23:25 +0100
Subject: [PATCH 1675/1862] Can use a custom sql

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

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 5e5d6297d56..9498ed91d9c 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -22,6 +22,11 @@
  *
  * To include this tool into another PHP page:
  * define('USE_CUSTOM_REPORT_AS_INCLUDE', 1);
+ * define('MAIN_DO_NOT_USE_JQUERY_MULTISELECT', 1);
+ * define('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY', 1);	// TODO Use a variable
+ * $SHOWLEGEND = 0;
+ * $search_xaxis = array('t.column');
+ * $customreportkey='abc';
  * include DOL_DOCUMENT_ROOT.'/core/customreports.php';
  */
 
@@ -931,6 +936,11 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
+
+	// Can overwrite the SQL with a custom SQL string (when used as an include)
+	if (!empty($customsql)) {
+		$sql = $customsql;
+	}
 }
 //print $sql;
 

From aa5aa2bf26cad815f1ac3ea4b0a6fadc3fc41ff0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 19:19:29 +0100
Subject: [PATCH 1676/1862] Add one more index to the theme_datacolor

---
 dev/tools/phan/config.php                     | 2 +-
 dev/tools/phan/config_extended.php            | 2 +-
 htdocs/comm/action/class/actioncomm.class.php | 2 +-
 htdocs/comm/action/index.php                  | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index a1644a4c43f..8ffd9a1991e 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -171,7 +171,7 @@ $VALID_MODULE_MAPPING = array(
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
 	'tax' => 'Tax',
-	'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}',
+	'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int},3:array{0:int,1:int,2:int}}',
 	'ticket' => 'Ticket',
 	'user' => 'User',
 	'variants' => 'Variants',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 997fbaed91a..739cd972d0a 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -170,7 +170,7 @@ $VALID_MODULE_MAPPING = array(
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
 	'tax' => 'Tax',
-	'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}}',
+	'theme_datacolor' => 'array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int},3:array{0:int,1:int,2:int}}',
 	'ticket' => 'Ticket',
 	'user' => 'User',
 	'variants' => 'Variants',
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index db8eadee618..f4f77bcaa9d 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -308,7 +308,7 @@ class ActionComm extends CommonObject
 	public $icalname;
 
 	/**
-	 * @var string Ical color
+	 * @var int<0,3> Ical color
 	 */
 	public $icalcolor;
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f9c22d3e10b..7bd186d812f 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1804,7 +1804,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 	global $hookmanager;
 
-	'@phan-var-force array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int}} $theme_datacolor';
+	'@phan-var-force array{0:array{0:int,1:int,2:int},1:array{0:int,1:int,2:int},2:array{0:int,1:int,2:int},3:array{0:int,1:int,2:int}} $theme_datacolor
+	 @phan-var-force User[] $cacheusers
+	 @phan-var-force array<int<0,3>> $colorindexused';
 
 	if ($conf->use_javascript_ajax) {	// Enable the "Show more button..."
 		$conf->global->MAIN_JS_SWITCH_AGENDA = 1;

From 0c7fc1ef097435a487571e9cac71e0549f0dbd31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 20:08:53 +0100
Subject: [PATCH 1677/1862] Fix NOOP

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

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 2fde1f7de02..7fa6ac23e7b 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -559,7 +559,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			//print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
 			print $form->selectarray('THEME_TOPMENU_DISABLE_IMAGE', $listoftopmenumodes, isset($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? $conf->global->THEME_TOPMENU_DISABLE_IMAGE : 0, 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth500');
 		} else {
-			$listoftopmenumodes[getDolGlobalString('THEME_TOPMENU_DISABLE_IMAGE')];
+			print $listoftopmenumodes[getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE')];
 			//print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));

From 7a4f5ec4f8aaa096c8cfa15e9422c51da76f4ea9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 12:55:38 +0100
Subject: [PATCH 1678/1862] Qual: Enable some low occurence notifications

---
 dev/tools/phan/baseline.txt | 19 ++-----------------
 dev/tools/phan/config.php   | 10 +++++-----
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 3e73236ccf5..8c6c44e90f3 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -17,15 +17,10 @@ return [
     // PhanTypeArraySuspiciousNull : 10+ occurrences
     // PhanTypeMismatchReturn : 10+ occurrences
     // PhanRedefineFunctionInternal : 6 occurrences
-    // PhanPluginUnsafeEval : 5 occurrences
-    // PhanParamSuspiciousOrder : 4 occurrences
     // PhanParamTooMany : 4 occurrences
-    // PhanPluginSuspiciousParamOrder : 4 occurrences
-    // PhanUndeclaredFunctionInCallable : 4 occurrences
     // PhanTypeMismatchPropertyProbablyReal : 2 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanAccessPropertyStaticAsNonStatic : 1 occurrence
-    // PhanNoopArrayAccess : 1 occurrence
     // PhanNoopStringLiteral : 1 occurrence
     // PhanPluginAlwaysReturnFunction : 1 occurrence
 
@@ -48,14 +43,11 @@ return [
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanParamTooMany'],
         'htdocs/compta/prelevement/create.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/actions_massactions.inc.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/class/commonobject.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/class/evalmath.class.php' => ['PhanPluginUnsafeEval'],
         'htdocs/core/class/extrafields.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/html.form.class.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/class/rssparser.class.php' => ['PhanUndeclaredFunctionInCallable'],
         'htdocs/core/class/smtps.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/class/stats.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/db/mysqli.class.php' => ['PhanParamSignatureMismatch'],
@@ -64,25 +56,20 @@ return [
         'htdocs/core/get_info.php' => ['PhanPluginSuspiciousParamPosition'],
         'htdocs/core/lib/date.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/lib/files.lib.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanPluginUnsafeEval', 'PhanRedefineFunctionInternal'],
+        'htdocs/core/lib/functions.lib.php' => ['PhanParamTooMany', 'PhanPluginAlwaysReturnFunction', 'PhanRedefineFunctionInternal'],
         'htdocs/core/lib/functions2.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/lib/pdf.lib.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/lib/price.lib.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/core/lib/usergroups.lib.php' => ['PhanNoopArrayAccess'],
         'htdocs/core/lib/website.lib.php' => ['PhanTypeMismatchReturnNullable'],
-        'htdocs/core/menus/standard/auguria_menu.php' => ['PhanParamSuspiciousOrder'],
-        'htdocs/core/menus/standard/eldy_menu.php' => ['PhanParamSuspiciousOrder'],
-        'htdocs/core/menus/standard/empty.php' => ['PhanParamSuspiciousOrder'],
         'htdocs/core/modules/DolibarrModules.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/core/modules/movement/doc/pdf_standard.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeArraySuspiciousNull'],
         'htdocs/core/modules/societe/modules_societe.class.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch', 'PhanParamSuspiciousOrder'],
+        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanParamSignatureMismatch'],
         'htdocs/core/modules/syslog/mod_syslog_syslog.php' => ['PhanParamSignatureMismatch'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/expedition/class/api_shipments.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/expensereport/class/api_expensereports.class.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/fourn/class/fournisseur.facture.class.php' => ['PhanTypeMismatchReturn'],
         'htdocs/intracommreport/list.php' => ['PhanAccessPropertyStaticAsNonStatic'],
@@ -93,9 +80,7 @@ return [
         'htdocs/projet/class/projectstats.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/projet/class/task.class.php' => ['PhanTypeMismatchReturnNullable'],
         'htdocs/projet/tasks/list.php' => ['PhanTypeArraySuspiciousNull'],
-        'htdocs/public/opensurvey/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/public/recruitment/index.php' => ['PhanPluginSuspiciousParamOrder'],
         'htdocs/societe/class/companybankaccount.class.php' => ['PhanParamSignatureMismatch'],
         'htdocs/stripe/admin/stripe.php' => ['PhanDeprecatedFunction'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginSuspiciousParamPosition'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 80be656d1a9..a7880ce1494 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -370,7 +370,7 @@ return [
 
 		'ConstantVariablePlugin', // Warns about values that are actually constant
 		//'HasPHPDocPlugin', // Requires PHPDoc
-		'InlineHTMLPlugin', // html in PHP file, or at end of file
+		// 'InlineHTMLPlugin', // html in PHP file, or at end of file
 		//'NonBoolBranchPlugin', // Requires test on bool, nont on ints
 		//'NonBoolInLogicalArithPlugin',
 		'NumericalComparisonPlugin',
@@ -471,7 +471,8 @@ return [
 
 		'PhanTypeExpectedObjectPropAccess',
 		'PhanTypeInvalidRightOperandOfNumericOp',
-		'PhanPluginInlineHTML',
+		// 'PhanPluginInlineHTML',
+		// 'PhanPluginInlineHTMLTrailing',
 		// 'PhanPluginUnknownFunctionReturnType',
 		// 'PhanPluginDescriptionlessCommentOnProtectedProperty',
 		'PhanPluginRedundantAssignmentInGlobalScope',
@@ -485,7 +486,6 @@ return [
 		// 'PhanTypeInvalidUnaryOperandIncOrDec',
 		// 'PhanPluginDescriptionlessCommentOnClass',
 		'PhanPluginEmptyStatementIf',
-		'PhanPluginInlineHTMLTrailing',
 		// 'PhanUndeclaredStaticMethod',
 		// 'PhanPluginDescriptionlessCommentOnPrivateMethod',
 		'PhanPluginPrintfIncompatibleArgumentType',
@@ -517,14 +517,14 @@ return [
 		// 'PhanTypeMismatchDeclaredParam',
 		// 'PhanCommentDuplicateMagicMethod',
 		// 'PhanParamSpecial1',
-		'PhanPluginInlineHTMLLeading',
+		// 'PhanPluginInlineHTMLLeading',
 		// 'PhanPluginUseReturnValueInternalKnown',
 		// 'PhanRedefinedInheritedInterface',
 		// 'PhanTypeComparisonToArray',
 		'PhanTypeConversionFromArray',
 		// 'PhanTypeInvalidLeftOperandOfIntegerOp',
 		// 'PhanTypeMismatchArgumentInternalProbablyReal',
-		'PhanTypeMismatchBitwiseBinaryOperands',
+		// 'PhanTypeMismatchBitwiseBinaryOperands',
 		'PhanTypeMismatchDimEmpty',
 		// 'PhanTypeSuspiciousEcho',
 		// 'PhanNoopBinaryOperator',

From 46d66b78257795ea8ad292d4e947a785e621c745 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 12:59:28 +0100
Subject: [PATCH 1679/1862] Qual: Force phan type to fix
 PhanPluginSuspiciousParamOrder

---
 htdocs/core/actions_massactions.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 382cb71fca4..94f77a2111c 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1082,6 +1082,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 			if ($objecttmp->element == 'societe') {
 				/** @var Societe $objecttmp */
+				'@phan-var-force Societe $objecttmp';
 				// TODO Change signature of delete for Societe
 				$result = $objecttmp->delete($objecttmp->id, $user, 1);
 			} else {

From 7d15cd3267668c5bf0f6dfd3da5a4a794a492914 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:03:21 +0100
Subject: [PATCH 1680/1862] Fix PhanUndeclaredFunctionInCallable by disabling
 notification in specific case

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

diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index e6cfa44e23e..4fa6b8eed6d 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -289,7 +289,9 @@ class RssParser
 					}
 
 					xml_set_object($xmlparser, $this);
+					// @phan-suppress-next-line PhanUndeclaredFunctionInCallable
 					xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+					// @phan-suppress-next-line PhanUndeclaredFunctionInCallable
 					xml_set_character_data_handler($xmlparser, 'feed_cdata');
 
 					$status = xml_parse($xmlparser, $str, false);

From 78f2e8752eb8e79bc2aa4a24b5496e4326aac800 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:38:35 +0100
Subject: [PATCH 1681/1862] Fix PhanPluginUnsafeEval by ignoring notification

---
 htdocs/core/class/evalmath.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index 84fc25781a7..8cc1adfa962 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -57,9 +57,6 @@
  *
  * AUTHOR INFORMATION
  * Copyright 2005, Miles Kaufmann.
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * LICENSE
  * Redistribution and use in source and binary forms, with or without
@@ -428,6 +425,7 @@ class EvalMath
 					if ($fnn == 'ln') {
 						$fnn = 'log';
 					}
+					// @phan-suppress-next-line PhanPluginUnsafeEval
 					eval('$stack->push('.$fnn.'($op1));'); // perfectly safe eval()
 				} elseif (array_key_exists($fnn, $this->f)) { // user function
 					// get args

From 66c592717da29c97aa8760e776da9f080ae99b08 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:40:02 +0100
Subject: [PATCH 1682/1862] Fix PhanTypeMismatchBitwiseBinaryOperands by typing
 argument

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

diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 7484ac1cee5..060e7318b65 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -1442,7 +1442,7 @@ class DoliDBSqlite3 extends DoliDB
 	/**
 	 * calc_days_in_year
 	 *
-	 * @param 	string	$year		Year
+	 * @param 	int		$year		Year
 	 * @return	int					Nb of days in year
 	 */
 	private static function calc_days_in_year($year)

From fe6c5e132a35d7023c66ebc723a04052cafe7170 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:44:28 +0100
Subject: [PATCH 1683/1862] Fix PhanPluginUnsafeEval by disabling notification
 in dol_eval

---
 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 c9309bfa883..652d7eab355 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9849,6 +9849,7 @@ function verifCond($strToEvaluate, $onlysimplestring = '1')
  * 										'2' (used for example for the compute property of extrafields)=Accept also '[]'
  * @return	mixed						Nothing or return result of eval
  * @see verifCond()
+ * @phan-suppress PhanPluginUnsafeEval
  */
 function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1')
 {

From 013d1cc54f945e89424fd2f9b46e03bdca582f28 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:49:47 +0100
Subject: [PATCH 1684/1862] Fix PhanParamSuspiciousOrder by ignoring
 notification

---
 htdocs/core/menus/standard/auguria_menu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index e749f7f54fd..ebdef15b063 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -286,6 +286,7 @@ class MenuManager
 								$disabled = " vsmenudisabled";
 							}
 
+							// @phan-suppress-next-line PhanParamSuspiciousOrder
 							print str_pad('', $val2['level'] + 1);
 							print '<li class="lilevel'.($val2['level'] + 1);
 							if ($val2['level'] == 0) {

From d79ca5f12607ac33726aeed5803c642fd8c47267 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:51:33 +0100
Subject: [PATCH 1685/1862] Fix PhanParamSuspiciousOrder by ignoring
 notification

---
 htdocs/core/menus/standard/eldy_menu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index dcbaadcc563..26d60f066dd 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -293,6 +293,7 @@ class MenuManager
 								$disabled = " vsmenudisabled";
 							}
 
+							// @phan-suppress-next-line PhanParamSuspiciousOrder
 							print str_pad('', $val2['level'] + 1);
 							print '<li class="lilevel'.($val2['level'] + 1);
 							if ($val2['level'] == 0) {

From dbe8aacd0ae8826368c1052cf3ad500cdc4ba527 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 13:52:30 +0100
Subject: [PATCH 1686/1862] Fix PhanParamSuspiciousOrder by ignoring
 notification

---
 htdocs/core/menus/standard/empty.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 3d624a5c9a3..b69c34b8111 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -287,6 +287,7 @@ class MenuManager
 								$disabled = " vsmenudisabled";
 							}
 
+							// @phan-suppress-next-line PhanParamSuspiciousOrder
 							print str_pad('', $val2['level'] + 1);
 							print '<li class="lilevel'.($val2['level'] + 1);
 							if ($val2['level'] == 0) {

From 18cfd0dae6ca2257a49ef3430497268a81fb8e0a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 14:24:07 +0100
Subject: [PATCH 1687/1862] Fix PhanTypeComparisonFromArray by testing $error
 field

# Fix PhanTypeComparisonFromArray by testing $error field

getListOfPayments always returns an array, comparing it to 0 is invalid.
To know if there was an error, we should test error, not the size of the result.
Updated getListOfPayments as well to initialize error to ""
---
 htdocs/core/class/commoninvoice.class.php          | 6 +++++-
 htdocs/fourn/class/api_supplier_invoices.class.php | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index fcdc114110e..a4843eff0ba 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -437,13 +437,17 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 *  Return list of payments
 	 *
+	 *  @see $error Empty string '' if no error.
+	 *
 	 *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
 	 *  @param      int     $multicurrency  Return multicurrency_amount instead of amount
-	 *  @return     array					Array with list of payments
+	 *  @return     array<array{amount:int|float,date:int,num:string,ref:string,ref_ext?:string,fk_bank_line?:int}>		 Array with list of payments
 	 */
 	public function getListOfPayments($filtertype = '', $multicurrency = 0)
 	{
 		$retarray = array();
+		// By default no error, list can be empty.
+		$this->error = '';
 
 		$table = 'paiement_facture';
 		$table2 = 'paiement';
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index fe44a813231..32165e8e7ea 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2023	Joachim Kueter		    <git-jk@bloxera.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -387,7 +388,7 @@ class SupplierInvoices extends DolibarrApi
 		}
 
 		$result = $this->invoice->getListOfPayments();
-		if ($result < 0) {
+		if ($this->invoice->error !== '') {
 			throw new RestException(405, $this->invoice->error);
 		}
 

From 7ab07a15497cc598b735e97bc67eebd31eca727c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 14:28:43 +0100
Subject: [PATCH 1688/1862] Fix PhanPluginSuspiciousParamOrder in updete() by
 removeing  arg

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

diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 32165e8e7ea..02028392a6f 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -265,7 +265,7 @@ class SupplierInvoices extends DolibarrApi
 			$this->invoice->$field = $this->_checkValForAPI($field, $value, $this->invoice);
 		}
 
-		if ($this->invoice->update($id, DolibarrApiAccess::$user)) {
+		if ($this->invoice->update(DolibarrApiAccess::$user)) {
 			return $this->get($id);
 		}
 

From 081963fa140b41e2da7dba07d9193cf24293b8b2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 14:32:42 +0100
Subject: [PATCH 1689/1862] Fix PhanPluginSuspiciousParamOrder by exchanging
 argument positions

---
 htdocs/public/opensurvey/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 772245f3d51..b07b047d586 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2023       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -169,7 +170,7 @@ if (getDolGlobalString('OPENSURVEY_IMAGE_PUBLIC_INTERFACE')) {
 }
 
 
-$results = $object->fetchAll($sortfield, $sortorder, 0, 0, '(status:=:1)');
+$results = $object->fetchAll($sortorder, $sortfield, 0, 0, '(status:=:1)');
 $now = dol_now();
 
 if (is_array($results)) {

From 6c7a7a8678e5f9b29874e5d1f437c23b1422446b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 14:33:34 +0100
Subject: [PATCH 1690/1862] Fix PhanPluginSuspiciousParamOrder by exchanging
 argument positions

---
 htdocs/public/recruitment/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index bcd27f58b18..5615e8133e2 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2020       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -170,7 +171,7 @@ if (getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE')) {
 }
 
 
-$results = $object->fetchAll($sortfield, $sortorder, 0, 0, '(status:=:1)');
+$results = $object->fetchAll($sortorder, $sortfield, 0, 0, '(status:=:1)');
 $now = dol_now();
 
 if (is_array($results)) {

From 012f284b3d698778eacaf94b20af59d1e2bc0a2b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:26:22 +0100
Subject: [PATCH 1691/1862] Fix PhanParamSuspiciousOrder by suppressing
 notification

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index a6df4ed82a5..3442877dca3 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -179,6 +179,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				$this->lastTime = $now;
 			}
 
+			// @phan-suppress-next-line PhanParamSuspiciousOrder
 			$message = dol_print_date(dol_now('gmt'), 'standard', 'gmt').$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident > 0 ? str_pad('', $this->ident, ' ') : '').$content['message'];
 			fwrite($filefd, $message."\n");
 			fclose($filefd);

From 6148a0f7a30ca70f8b267e4684e28e55cbeedf55 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:36:02 +0100
Subject: [PATCH 1692/1862] fixup! Fix PhanUndeclaredFunctionInCallable by
 disabling notification in specific case

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

diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 4fa6b8eed6d..06f851912d9 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -219,7 +219,7 @@ class RssParser
 		$newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contain special chars)
 		$newmask = '0644';
 
-		//dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
+		//dol_syslog("RssParser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
 		$nowgmt = dol_now();
 
 		// Search into cache

From b117d24cbaf85cb15073c9c97f47f85edf940d08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 20:26:05 +0100
Subject: [PATCH 1693/1862] Try to fix PhanUndeclaredFunctionInCallable

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

diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index e6cfa44e23e..667b9f061f1 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -589,7 +589,7 @@ class RssParser
 		} elseif ($this->_format == 'atom' && $this->incontent) {
 			// if inside an Atom content construct (e.g. content or summary) field treat tags as text
 			// if tags are inlined, then flatten
-			$attrs_str = implode(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
+			$attrs_str = implode(' ', array_map('rss_map_attrs', array_keys($attrs), array_values($attrs)));
 
 			$this->append_content("<$element $attrs_str>");
 
@@ -822,6 +822,17 @@ function extEntHandler($parser, $ent, $base, $sysID, $pubID)  {
 }
 */
 
+/**
+ * Function to convert an XML object into an array
+ *
+ * @param	string 	$k		Key
+ * @param	string 	$v		Value
+ * @return	string
+ */
+function rss_map_attrs($k, $v)
+{
+	return "$k=\"$v\"";
+}
 
 /**
  * Function to convert an XML object into an array

From 9627894d8d4c7535ba3c750512bb3c523e954b2e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 21:07:21 +0100
Subject: [PATCH 1694/1862] More default values for colors

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

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 78c5449ccca..88d5eb2a147 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1493,7 +1493,7 @@ if (is_readable($color_file)) {
 	include $color_file;
 }
 if (!is_array($theme_datacolor)) {
-	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+	$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(80, 166, 90), array(190, 190, 100), array(91, 115, 247), array(140, 140, 220), array(190, 120, 120), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 }
 
 $massactionbutton = '';

From 1c5b344c2d8b36bd614f2b62bf06018a2c26b675 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 21:19:49 +0100
Subject: [PATCH 1695/1862] Update index.php

---
 htdocs/accountancy/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index b2a106712d3..10adfea0bc8 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -263,7 +263,6 @@ if (isModEnabled('accounting')) {
 	print '</div>';
 
 	print '<div class="clearboth"></div>';
-
 } elseif (isModEnabled('comptabilite')) {
 	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 

From 17ea003a69e17d67bfc50a024bc34b2caa20920e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 21:20:36 +0100
Subject: [PATCH 1696/1862] fix phpstan

---
 .../class/expensereport.class.php             | 20 ++++++++++++++++++-
 htdocs/fourn/facture/list.php                 |  3 +--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index a602edc810d..7fc5a866eec 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -113,14 +113,32 @@ class ExpenseReport extends CommonObject
 	 */
 	public $fk_statut;
 
+	/**
+	 * @var int ID
+	 */
 	public $fk_c_paiement;
+
+	/**
+	 * @var int ID
+	 */
 	public $modepaymentid;
 
 	public $paid;
+
 	// Paiement
+	/**
+	 * @var string Firstname Lastname
+	 */
 	public $user_paid_infos;
 
+	/**
+	 * @var string Firstname Lastname
+	 */
 	public $user_author_infos;
+
+	/**
+	 * @var string Firstname Lastname
+	 */
 	public $user_validator_infos;
 
 	public $rule_warning_message;
@@ -211,7 +229,7 @@ class ExpenseReport extends CommonObject
 	public $fk_user_valid;
 
 	/**
-	 * @var int ID
+	 * @var string Firstname Lastname
 	 */
 	public $user_valid_infos;
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 642b4612358..cc371eb138c 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015-2016	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Josep Lluís Amador		<joseplluis@lliuretic.cat>
  * Copyright (C) 2018-2022	Charlene Benke			<charlene@patas-monkey.com>
- * Copyright (C) 2018-2020	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2019-2023	Alexandre Spangaro		<aspangaro@easya.solutions>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2023		Joachim Kueter		    <git-jk@bloxera.com>
@@ -1595,7 +1595,6 @@ while ($i < $imaxinloop) {
 	$facturestatic->alreadypaid = ($paiement ? $paiement : 0);
 
 	$facturestatic->paye = $obj->paye;
-	$facturestatic->socid = $thirdparty->getNomUrl(1, 'supplier', 3);
 
 	$facturestatic->date = $db->jdate($obj->datef);
 

From 5c5c0aecd64cd91c6226b58844f4946d87ad9d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 21:27:48 +0100
Subject: [PATCH 1697/1862] fix phpstan

---
 htdocs/emailcollector/class/emailcollector.class.php | 2 +-
 phpstan.neon.dist                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 77e243c8418..b1a291dc7ae 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2618,7 +2618,7 @@ class EmailCollector extends CommonObject
 								$actioncomm->percentage  = -1; // Not applicable
 								$actioncomm->socid       = $thirdpartystatic->id;
 								$actioncomm->contact_id = $contactstatic->id;
-								$actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id => '') : array());
+								$actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id) : array());
 								$actioncomm->authorid    = $user->id; // User saving action
 								$actioncomm->userownerid = $user->id; // Owner of action
 								// Fields when action is an email (content should be added into note)
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c354dfd5d84..4bb2cf6eaed 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,7 @@ parameters:
 		# minimumNumberOfJobsPerProcess: 2  # default is 2
 		# buffer: 134217728 # 128 MB  # Not documented
 	customRulesetUsed: true
-	level: 2
+	level: 3
 	fileExtensions:
 		- php
 	paths:

From c8e3dfb995966413f2dd689a70e40f085f2d4513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 21:31:26 +0100
Subject: [PATCH 1698/1862] fix phpstan

---
 htdocs/emailcollector/class/emailcollector.class.php | 10 +---------
 phpstan.neon.dist                                    |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index b1a291dc7ae..da23932c66b 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2645,14 +2645,6 @@ class EmailCollector extends CommonObject
 								// Overwrite values with values extracted from source email
 								$errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header, $operationslog);
 
-								//var_dump($fk_element_id);
-								//var_dump($fk_element_type);
-								//var_dump($alreadycreated);
-								//var_dump($operation['type']);
-								//var_dump($actioncomm);
-								//var_dump($objectemail);
-								//exit;
-
 								if ($errorforthisaction) {
 									$errorforactions++;
 								} else {
@@ -2661,7 +2653,7 @@ class EmailCollector extends CommonObject
 										$errorforactions++;
 										$this->errors = $actioncomm->errors;
 									} else {
-										if ($fk_element_type == "ticket") {
+										if ($fk_element_type == "ticket" && is_object($objectemail)) {
 											if ($objectemail->status == Ticket::STATUS_CLOSED || $objectemail->status == Ticket::STATUS_CANCELED) {
 												if ($objectemail->fk_user_assign != null) {
 													$res = $objectemail->setStatut(Ticket::STATUS_ASSIGNED);
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 4bb2cf6eaed..c354dfd5d84 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,7 @@ parameters:
 		# minimumNumberOfJobsPerProcess: 2  # default is 2
 		# buffer: 134217728 # 128 MB  # Not documented
 	customRulesetUsed: true
-	level: 3
+	level: 2
 	fileExtensions:
 		- php
 	paths:

From 763f584ea2f8c550744add2623ff61ccae09575f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 21:33:39 +0100
Subject: [PATCH 1699/1862] Doc

---
 ChangeLog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6da016bd2cb..751dd5ea123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,14 +25,15 @@ The following changes may create regressions for some external modules, but were
 * Properties ->date_update and ->date_modification were merged into date_modification.
 * All CLI tools (into /scripts) return a positive value to the shell if error (0 remains success) for a better
   cross platform compatibility. On linux the exit(-1) was caught as 255, it may be now exit(1) so will be caught as 1.
-* the parameter $filter of method fetchAll does not accept array of SQL but must be a string of an Universal Search Filter syntax.
+* The parameter $filter of method fetchAll does not accept array of SQL but must be a string of an Universal Search Filter syntax.
 * Use of dol_eval with parameter $returnvalue=0 is deprecated.
 * The signature for all ->delete() method has been modified to match the modulebuilder template (so first paramis now always $user), except
   the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
-* Route for API /thirdparties/gateways has been renamed into /thirdparties/accounts
+* Route for API /thirdparties/gateways has been renamed into /thirdparties/accounts to better match the api object name.
 * The $userdoneid in actioncomm class is deprecated. Please use $userownerid instead.
 * The field fk_user_done in actioncomm table is deprecated. Please use fk_user_action instead.
-* The AGENDA_ENABLE_DONEBY hidden option is deprecated.
+* The AGENDA_ENABLE_DONEBY hidden option has been removed.
+* The table commande_fournisseur_dispatch has been renamed into receptiondet_batch to better match its goal.
 
 
 ***** ChangeLog for 19.0.1 compared to 19.0.0 *****

From aa6c20bf0dc39fa2931d7cea8821e3b8c5450658 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 19:10:37 +0100
Subject: [PATCH 1700/1862] Qual: Enable PhanPluginWhitespaceTrailing

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 1d8a2f6f467..84131432ceb 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -436,7 +436,7 @@ return [
 		// 'PhanPluginUnknownMethodReturnType',
 		'PhanPluginUnknownArrayMethodParamType',
 		'PhanPluginWhitespaceTab',   // Dolibarr uses tabs
-		'PhanPluginWhitespaceTrailing',   // Should be handled by other tools
+		// 'PhanPluginWhitespaceTrailing',
 		// 'PhanPluginCanUsePHP71Void',
 		'PhanPluginUnknownArrayMethodReturnType',
 		'PhanTypeMismatchArgumentInternal',

From 686facd74d76077d5e14429930f15df7ea4bcfcc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 17 Mar 2024 21:25:34 +0100
Subject: [PATCH 1701/1862] Fix PhanPluginWhitespaceTrailing + format code +
 minor spelling

---
 dev/tools/phan/config.php          | 1 +
 dev/tools/phan/config_extended.php | 1 +
 dev/tools/phan/config_fixer.php    | 1 +
 htdocs/public/error-401.php        | 6 +++---
 htdocs/theme/eldy/dropdown.inc.php | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 84131432ceb..1938fa9b8e3 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -318,6 +318,7 @@ return [
 	//	to `exclude_analysis_directory_list`.
 	"exclude_analysis_directory_list" => [
 		'htdocs/includes/',
+		'htdocs/install/doctemplates/websites/',
 		'htdocs/core/class/lessc.class.php', // External library
 		PHAN_DIR . '/stubs/',
 	],
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 739cd972d0a..fc9fe8f6fd9 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -263,6 +263,7 @@ return [
 	//	to `exclude_analysis_directory_list`.
 	"exclude_analysis_directory_list" => [
 		'htdocs/includes/',
+		'htdocs/install/doctemplates/websites/',
 		'htdocs/core/class/lessc.class.php', // External library
 		PHAN_DIR . '/stubs/',
 	],
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 86f1765defb..b12c94d6468 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -92,6 +92,7 @@ return [
 	//	to `exclude_analysis_directory_list`.
 	"exclude_analysis_directory_list" => [
 		'htdocs/includes/',
+		'htdocs/install/doctemplates/websites/',
 		'htdocs/core/class/lessc.class.php', // External library
 		PHAN_DIR . '/stubs/',
 	],
diff --git a/htdocs/public/error-401.php b/htdocs/public/error-401.php
index a160535ff10..6428d3c0c71 100644
--- a/htdocs/public/error-401.php
+++ b/htdocs/public/error-401.php
@@ -18,15 +18,15 @@
 	<h1>Error</h1>
 
 	<br>
-	Sorry. You are not allowed to access this resource.
+	Sorry. You are not allowed access to this resource.
 
 	<br>
 	<br>
-	
+
 	No esta autorizado para acceder a este recurso.
 
 	<br>
-	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8').'.' : ''; ?>
+	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You arrived from '.htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8').'.' : ''; ?>
 
 	<hr>
 
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index aabf6977fa3..d4d38d82a81 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -158,7 +158,7 @@ div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::af
 /*
  * MENU Dropdown
  */
- 
+
 .login_block.usedropdown .logout-btn{
 	display: none;
 }

From 3b5aa4bed79b47be68eb4d9e30d2c487e99955bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 21:36:25 +0100
Subject: [PATCH 1702/1862] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 751dd5ea123..8a880fd04b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,9 +30,8 @@ The following changes may create regressions for some external modules, but were
 * The signature for all ->delete() method has been modified to match the modulebuilder template (so first paramis now always $user), except
   the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
 * Route for API /thirdparties/gateways has been renamed into /thirdparties/accounts to better match the api object name.
-* The $userdoneid in actioncomm class is deprecated. Please use $userownerid instead.
-* The field fk_user_done in actioncomm table is deprecated. Please use fk_user_action instead.
-* The AGENDA_ENABLE_DONEBY hidden option has been removed.
+* The AGENDA_ENABLE_DONEBY hidden option has been removed. So $userdoneid in actioncomm class is deprecated. Please use $userownerid instead. Also,
+  the field $fk_user_done in actioncomm table is deprecated. Please use $fk_user_action instead.
 * The table commande_fournisseur_dispatch has been renamed into receptiondet_batch to better match its goal.
 
 

From 313f3f592ab87a70f48b5abd08095a52c4868343 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Mar 2024 21:47:18 +0100
Subject: [PATCH 1703/1862] Close #27037

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f918d886795..bc36be00042 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -782,6 +782,7 @@ if (empty($reshook)) {
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			$price_min = $price_min_ttc = 0;
+			$tva_npr = 0;
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit

From 09a953d18f9b18ae7b5e760b8d6bb4f0c7d4038b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 22:04:10 +0100
Subject: [PATCH 1704/1862] fix phpstan

---
 dev/tools/apstats.php                 |  3 ++-
 htdocs/hrm/class/evaluation.class.php | 10 ++++-----
 htdocs/hrm/class/job.class.php        | 29 ++++++++++++++-------------
 htdocs/hrm/class/skill.class.php      | 29 ++++++++++++++-------------
 4 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index eb737b9690e..3a31b4b232b 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -3,6 +3,7 @@
 /*
  * Copyright (C) 2023 	   	Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -708,7 +709,7 @@ if (count($output_phan_json) != 0) {
 			$tmpphan .= '<td class="">';
 			$tmpphan .= '<a href="'.$code_url_attr.'" target="_blank">'.$line_range_txt.'</a>';
 			$tmpphan .= '</td>';
-			$tmpphan .= '<td class="tdoverflowmax300">'.dolPrintLabel($notice['description']).'</td>';
+			$tmpphan .= '<td class="tdoverflowmax300" title="'.dolPrintHTMLForAttribute($notice['description']).'">'.dolPrintLabel($notice['description']).'</td>';
 			$tmpphan .= '</tr>';
 			$tmpphan .= "\n";
 
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 7bf46c30b86..75debfda98a 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -161,11 +161,11 @@ class Evaluation extends CommonObject
 	//  */
 	// protected $childtables = array();
 
-	// /**
-	//  * @var array    List of child tables. To know object to delete on cascade.
-	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	//  */
+	/**
+	 * @var array    List of child tables. To know object to delete on cascade.
+	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
 	protected $childtablesoncascade = array('@EvaluationLine:hrm/class/evaluationdet.class.php:fk_evaluation');
 
 	/**
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index e1a355b54cd..2befee8a138 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -122,8 +122,6 @@ class Job extends CommonObject
 	public $date_creation;
 
 	public $deplacement;
-	public $note_public;
-	public $note_private;
 	public $fk_user_creat;
 	public $fk_user_modif;
 	// END MODULEBUILDER PROPERTIES
@@ -136,9 +134,9 @@ class Job extends CommonObject
 	//  */
 	// public $table_element_line = 'hrm_jobline';
 
-	// /**
-	//  * @var string    Field with ID of parent key if this object has a parent
-	//  */
+	/**
+	 * @var string    Field with ID of parent key if this object has a parent
+	 */
 	public $fk_element = 'fk_job';
 
 	// /**
@@ -146,16 +144,19 @@ class Job extends CommonObject
 	//  */
 	// public $class_element_line = 'Jobline';
 
-	// /**
-	//  * @var string[]	List of child tables. To test if we can delete object.
-	//  */
-	protected $childtables = array('hrm_evaluation', 'hrm_job_user');
+	/**
+	 * @var array<string,string[]>	List of child tables. To test if we can delete object.
+	 */
+	protected $childtables = array(
+		'hrm_evaluation' => ['name' => 'Evaluation'],
+		'hrm_job_user' => ['name' => 'Job'],
+	);
 
-	// /**
-	//  * @var array    List of child tables. To know object to delete on cascade.
-	//  *               If name matches '@ClassNAme:FilePathClass:ParentFkFieldName' it will
-	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	//  */
+	/**
+	 * @var string[]    List of child tables. To know object to delete on cascade.
+	 *               If name matches '@ClassNAme:FilePathClass:ParentFkFieldName' it will
+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
 	protected $childtablesoncascade = array("@SkillRank:hrm/class/skillrank.class.php:fk_object:(objecttype:=:'job')");
 
 	// /**
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 256956d55de..9f0defee0f6 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -133,8 +133,6 @@ class Skill extends CommonObject
 	public $date_validite;
 	public $temps_theorique;
 	public $skill_type;
-	public $note_public;
-	public $note_private;
 	// END MODULEBUILDER PROPERTIES
 
 
@@ -145,9 +143,9 @@ class Skill extends CommonObject
 	//  */
 	// public $table_element_line = 'hrm_skillline';
 
-	// /**
-	//  * @var string    Field with ID of parent key if this object has a parent
-	//  */
+	/**
+	 * @var string    Field with ID of parent key if this object has a parent
+	 */
 	public $fk_element = 'fk_skill';
 
 	// /**
@@ -155,16 +153,19 @@ class Skill extends CommonObject
 	//  */
 	// public $class_element_line = 'Skillline';
 
-	// /**
-	//  * @var array	List of child tables. To test if we can delete object.
-	//  */
-	protected $childtables = array('hrm_skillrank', 'hrm_evaluationdet');
+	/**
+	 * @var array<string,string[]>	List of child tables. To test if we can delete object.
+	 */
+	protected $childtables = array(
+		'hrm_skillrank' => ['name' => 'SkillRank'],
+		'hrm_evaluationdet' => ['name' => 'EvaluationDet'],
+	);
 
-	// /**
-	//  * @var array    List of child tables. To know object to delete on cascade.
-	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
-	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
-	//  */
+	/**
+	 * @var string[]    List of child tables. To know object to delete on cascade.
+	 *                  If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *                  call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
 	protected $childtablesoncascade = array('hrm_skilldet');
 
 	// /**

From a8627c9315b8f650b11452364cf37bae157077d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 22:06:53 +0100
Subject: [PATCH 1705/1862] fix phpstan

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

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 75debfda98a..ef811992c36 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -162,7 +162,7 @@ class Evaluation extends CommonObject
 	// protected $childtables = array();
 
 	/**
-	 * @var array    List of child tables. To know object to delete on cascade.
+	 * @var string[] List of child tables. To know object to delete on cascade.
 	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
 	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
 	 */

From 1f8ddf1b15ec89ac2a3438d9d1f71f7b9fb27792 Mon Sep 17 00:00:00 2001
From: rsanjoseo <info@rsanjoseo.com>
Date: Sun, 17 Mar 2024 22:21:58 +0100
Subject: [PATCH 1706/1862] Problem with database prefix in compta/index
 queries is solved

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 57748c27950..1788ec841c8 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
  * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2021-2023 Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2024      Rafael San José      <rsanjose@alxarafe.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
@@ -137,7 +138,7 @@ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_client, s.code_compta, s.email";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	$sql .= ", (SELECT SUM(pf.amount) FROM llx_paiement_facture as pf WHERE pf.fk_facture = f.rowid) as am";
+	$sql .= ", (SELECT SUM(pf.amount) FROM ".$db->prefix()."paiement_facture as pf WHERE pf.fk_facture = f.rowid) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
@@ -283,7 +284,7 @@ if ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
 	$sql .= ", s.nom as name";
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
-	$sql .= ", (SELECT SUM(pf.amount) FROM llx_paiementfourn_facturefourn as pf WHERE pf.fk_facturefourn = ff.rowid) as am";
+	$sql .= ", (SELECT SUM(pf.amount) FROM ".$db->prefix()."paiementfourn_facturefourn as pf WHERE pf.fk_facturefourn = ff.rowid) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity IN (".getEntity('facture_fourn').")";

From 7eda1a83f8eee218197316b18f8fe5693c87704f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 22:27:46 +0100
Subject: [PATCH 1707/1862] fix phpstan

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

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 58807c5bcd2..56d338270c5 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016       Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2016       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2016-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -472,11 +472,13 @@ if ($action != 'export_csv') {
 		$sql .= " GROUP BY t.numero_compte";
 
 		$resql = $db->query($sql);
-		$nrows = $resql->num_rows;
 		$opening_balances = array();
-		for ($i = 0; $i < $nrows; $i++) {
-			$arr = $resql->fetch_array();
-			$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
+		if ($resql) {
+			$nrows = $resql->num_rows;
+			for ($i = 0; $i < $nrows; $i++) {
+				$arr = $resql->fetch_array();
+				$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
+			}
 		}
 	}
 

From 295f5d5b1f113bb8aab97bfca4abb1b88f6ef970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 22:39:19 +0100
Subject: [PATCH 1708/1862] fix sql

---
 htdocs/compta/prelevement/card.php          | 4 ++--
 htdocs/core/class/html.formticket.class.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index c9f2401513b..b8a9f045c4d 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -460,7 +460,7 @@ if ($id > 0 || $ref) {
 	if ($salaryBonPl) {
 		$sql = "SELECT pl.rowid, pl.statut, pl.amount, pl.fk_user,";
 		$sql .= " u.rowid as socid, u.login as name";
-		$sql .= " FROM llx_prelevement_lignes as pl";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 		$sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
 		$sql .= ", ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id);
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 4fa8ee3eac6..6e5428cc71e 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2015 Jean-François FERRY     <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel     <christophe@altairis.fr>
- * Copyright (C) 2019-2022 Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021      Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2021      Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2023      Charlene Benke	       <charlene.r@patas-monkey.com>
@@ -942,7 +942,7 @@ class FormTicket
 			$stringtoprint .= '<option value="">&nbsp;</option>';
 
 			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctc.public, ";
-			$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent WHERE ctcjoin.active > 0)", "'NOTPARENT'", "'PARENT'")." as isparent";
+			$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM ".MAIN_DB_PREFIX."c_ticket_category as ctcfather JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent WHERE ctcjoin.active > 0)", "'NOTPARENT'", "'PARENT'")." as isparent";
 			$sql .= " FROM ".$this->db->prefix()."c_ticket_category as ctc";
 			$sql .= " WHERE ctc.active > 0 AND ctc.entity = ".((int) $conf->entity);
 			if ($filtertype == 'public=1') {

From ada61e9bd1e0d924f1f53f2b81f97cdec70f3b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 22:43:41 +0100
Subject: [PATCH 1709/1862] fix sql

---
 htdocs/accountancy/journal/purchasesjournal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 227c2f0f280..f5d30511ce0 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018       Eric Seigne             <eric.seigne@cap-rel.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -367,7 +367,7 @@ SELECT
     fk_facture_fourn,
     COUNT(fd.rowid) as nb
 FROM
-    llx_facture_fourn_det as fd
+    " . MAIN_DB_PREFIX . "facture_fourn_det as fd
 WHERE
     fd.product_type <= 2
     AND fd.fk_code_ventilation <= 0

From c084f4152509af4719a0ad7f863b14f384ead5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 17 Mar 2024 22:49:18 +0100
Subject: [PATCH 1710/1862] fix sql

---
 htdocs/projet/class/project.class.php | 4 ++--
 htdocs/public/stripe/ipn.php          | 9 +++++----
 htdocs/societe/contact.php            | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 08c54b13fce..e9bea281c08 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2587,9 +2587,9 @@ class Project extends CommonObject
 		u.email,u.weeklyhours,
 		SUM(et.element_duration) AS total_seconds
 		FROM
-			llx_element_time AS et
+			".MAIN_DB_PREFIX."element_time AS et
 		JOIN
-			llx_user AS u ON et.fk_user = u.rowid
+			".MAIN_DB_PREFIX."user AS u ON et.fk_user = u.rowid
 		WHERE
 			et.element_date BETWEEN '".$this->db->escape($startDate)."' AND '".$this->db->escape($endDate)."'
 			AND et.elementtype = 'task'
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 0b78780cfe4..9dcbc1248fa 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2018-2020  Thibault FOUCART       <support@ptibogxiv.net>
- * Copyright (C) 2018       Fédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Fédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Laurent Destailleur    <eldy@users.sourceforge.net>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -337,7 +338,7 @@ if ($event->type == 'payout.created') {
 	dol_syslog("Try to find a payment in database for the payment_intent id = ".$TRANSACTIONID);
 
 	$sql = "SELECT pi.rowid, pi.fk_facture, pi.fk_prelevement_bons, pi.amount, pi.type, pi.traite";
-	$sql .= " FROM llx_prelevement_demande as pi";
+	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pi";
 	$sql .= " WHERE pi.ext_payment_id = '".$db->escape($TRANSACTIONID)."'";
 	$sql .= " AND pi.ext_payment_site = '".$db->escape($service)."'";
 
@@ -438,7 +439,7 @@ if ($event->type == 'payout.created') {
 			$paiement->ext_payment_site = $service;
 
 			$ispaymentdone = 0;
-			$sql = "SELECT p.rowid FROM llx_paiement as p";
+			$sql = "SELECT p.rowid FROM ".MAIN_DB_PREFIX."paiement as p";
 			$sql .= " WHERE p.ext_payment_id = '".$db->escape($paiement->ext_payment_id)."'";
 			$sql .= " AND p.ext_payment_site = '".$db->escape($paiement->ext_payment_site)."'";
 			$result = $db->query($sql);
@@ -472,7 +473,7 @@ if ($event->type == 'payout.created') {
 			if (!$error && isModEnabled('bank')) {
 				// Search again the payment to see if it is already linked to a bank payment record (We should always find the payment that was created before).
 				$ispaymentdone = 0;
-				$sql = "SELECT p.rowid, p.fk_bank FROM llx_paiement as p";
+				$sql = "SELECT p.rowid, p.fk_bank FROM ".MAIN_DB_PREFIX."paiement as p";
 				$sql .= " WHERE p.ext_payment_id = '".$db->escape($paiement->ext_payment_id)."'";
 				$sql .= " AND p.ext_payment_site = '".$db->escape($paiement->ext_payment_site)."'";
 				$sql .= " AND p.fk_bank <> 0";
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 7591c58c98b..79d0a405d3f 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -139,8 +140,8 @@ if ($action == 'confirm_delete' && $user->hasRight('societe', 'contact', 'delete
 	if (!empty($id) && $socid > 0) {
 		$db->begin();
 
-		$sql = "DELETE t, et FROM llx_socpeople AS t";
-		$sql .= " LEFT JOIN llx_socpeople_extrafields AS et ON t.rowid = et.fk_object";
+		$sql = "DELETE t, et FROM ".MAIN_DB_PREFIX."socpeople AS t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields AS et ON t.rowid = et.fk_object";
 		$sql .= " WHERE t.fk_soc = ".((int) $socid);
 		$sql .= " AND t.rowid = ".((int) $id);
 		$sql .= " AND ((t.fk_user_creat = ".((int) $user->id)." AND t.priv = 1) OR t.priv = 0)";

From b94101a0178165da8d9530cfa90868beff6b6514 Mon Sep 17 00:00:00 2001
From: Jon Bendtsen <xcodeauthor@jonb.dk>
Date: Sun, 17 Mar 2024 23:06:11 +0100
Subject: [PATCH 1711/1862] direct copy from
 htdocs/fourn/class/fournisseur.facture-rec.class.php

---
 htdocs/adherents/class/subscription.class.php | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index c268ac3ab6e..fc4b3881de1 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -187,6 +187,32 @@ class Subscription extends CommonObject
 			$this->fk_type = $type;
 		}
 
+		if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
+			$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+		}
+
+		// Add object linked
+		if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+			foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+				if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+					foreach ($tmp_origin_id as $origin_id) {
+						$ret = $this->add_object_linked($origin, $origin_id);
+						if (!$ret) {
+							$this->error = $this->db->lasterror();
+							$error++;
+						}
+					}
+				} else { // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					$origin_id = $tmp_origin_id;
+					$ret = $this->add_object_linked($origin, $origin_id);
+					if (!$ret) {
+						$this->error = $this->db->lasterror();
+						$error++;
+					}
+				}
+			}
+		}
+
 		if (!$error && !$notrigger) {
 			$this->context = array('member' => $member);
 			// Call triggers

From b4880a8b172dc60985da76620070a471f506397d Mon Sep 17 00:00:00 2001
From: ksar <ksar.ksar@gmail.com>
Date: Sun, 17 Mar 2024 23:16:27 +0100
Subject: [PATCH 1712/1862] FIX : Issue with special characters in Frencj=h

Move to ANSI instead of UTF-8
---
 build/exe/doliwamp/Languages/MyFrench.isl | 54 +++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MyFrench.isl b/build/exe/doliwamp/Languages/MyFrench.isl
index ca38aa599e3..2fb684657a5 100644
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -2,47 +2,47 @@
 [CustomMessages]
 
 NameAndVersion=%1 version %2
-AdditionalIcons=Icônes supplémentaires :
-CreateDesktopIcon=Créer une icône sur le &Bureau
-CreateQuickLaunchIcon=Créer une icône dans la barre de &Lancement rapide
+AdditionalIcons=Ic�nes suppl�mentaires :
+CreateDesktopIcon=Cr�er une ic�ne sur le &Bureau
+CreateQuickLaunchIcon=Cr�er une ic�ne dans la barre de &Lancement rapide
 ProgramOnTheWeb=Page d'accueil de %1
-UninstallProgram=Désinstaller %1
-LaunchProgram=Exécuter %1
+UninstallProgram=D�sinstaller %1
+LaunchProgram=Ex�cuter %1
 AssocFileExtension=&Associer %1 avec l'extension de fichier %2
 AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
 
-YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants prérequis comme Apache, Mysql et PHP).
-ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM installé sur un ordinateur local peut être dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos données. Faites-le si vous êtes prêt à gérer les sauvegardes vous-même sérieusement. Sinon, utilisez plutôt une installation en Saas (voir https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=De plus, si vous avez des compétences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plutôt une installation manuelle de Dolibarr sur un serveur existant équipé de Apache, Mysql et PHP.
-ButIfYouLook=Mais si vous recherchez une installation clé en main automatisée sur une poste local, vous êtes sur la bonne voie...
-DoYouWantToStart=Voulez-vous démarrer le processus d'installation ?
+YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr�requis comme Apache, Mysql et PHP).
+ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM install� sur un ordinateur local peut �tre dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos donn�es. Faites-le si vous �tes pr�t � g�rer les sauvegardes vous-m�me s�rieusement. Sinon, utilisez plut�t une installation en Saas (voir https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=De plus, si vous avez des comp�tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut�t une installation manuelle de Dolibarr sur un serveur existant �quip� de Apache, Mysql et PHP.
+ButIfYouLook=Mais si vous recherchez une installation cl� en main automatis�e sur une poste local, vous �tes sur la bonne voie...
+DoYouWantToStart=Voulez-vous d�marrer le processus d'installation ?
 
-TechnicalParameters=Paramètres techniques
-IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut.
+TechnicalParameters=Param�tres techniques
+IfFirstInstall=S'il s'agit de la premi�re installation, merci de sp�cifier ces quelques param�tres techniques. Si vous ne les comprennez pas, �tes non s�r, ou proc�dez � une mise � jour, laissez les champs avec les valeurs propos�es par d�faut.
 
 
 ; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Serveur SMTP (le votre ou de votre FAI, première installation uniquement):
-ApachePort=Port Apache (première installation uniquement, le choix standard est 80):
-MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306):
-MySqlPassword=Mot de passe serveur+base MySql de root (première installation uniquement):
+SMTPServer=Serveur SMTP (le votre ou de votre FAI, premi�re installation uniquement):
+ApachePort=Port Apache (premi�re installation uniquement, le choix standard est 80):
+MySqlPort=Port Mysql (premi�re installation uniquement, le choix standard est 3306):
+MySqlPassword=Mot de passe serveur+base MySql de root (premi�re installation uniquement):
 
-FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signalé. Cliquez sur OK pour continuer...
+FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signal�. Cliquez sur OK pour continuer...
 
-PortAlreadyInUse=Le port %1 semble déjà utilisé. Il est recommandé d'annuler pour revenir en arrière et spécifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
+PortAlreadyInUse=Le port %1 semble d�j� utilis�. Il est recommand� d'annuler pour revenir en arri�re et sp�cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
 
-FirefoxDetected=Firefox a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
-ChromeDetected=Chrome a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
-ChooseDefaultBrowser=Merci de choisir votre navigateur par défaut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'êtes pas sûr, cliquez simplement sur Ouvrir :
+FirefoxDetected=Firefox a �t� d�tect� sur votre ordinateur. Voulez-vous en faire votre navigateur par d�faut pour Dolibarr ?
+ChromeDetected=Chrome a �t� d�tect� sur votre ordinateur. Voulez-vous en faire votre navigateur par d�faut pour Dolibarr ?
+ChooseDefaultBrowser=Merci de choisir votre navigateur par d�faut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'�tes pas s�r, cliquez simplement sur Ouvrir :
 
 LaunchNow=Lancer Dolibarr maintenant
 
-ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont été supprimés. Toutefois, tous vos fichiers de données sont toujours dans le répertoire %1. Vous devez supprimer ce répertoire manuellement pour avoir une désinstallation complète.
+ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont �t� supprim�s. Toutefois, tous vos fichiers de donn�es sont toujours dans le r�pertoire %1. Vous devez supprimer ce r�pertoire manuellement pour avoir une d�sinstallation compl�te.
 
-DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant démarrer ou redémarrer Apache et Mysql, ceci peut durer de quelques secondes à une minute après cette confirmation. Démarrer l'installation ou mise à jour du serveur web et base de données requis par Dolibarr ?
+DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d�marrer ou red�marrer Apache et Mysql, ceci peut durer de quelques secondes � une minute apr�s cette confirmation. D�marrer l'installation ou mise � jour du serveur web et base de donn�es requis par Dolibarr ?
 
-OldVersionFoundAndMoveInNew=Une ancienne version de base a été trouvée et déplacée pour fonctionner avec la nouvelle version de Dolibarr.
-OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a été trouvée mais ne peut être déplacée pour être utilisée avec la nouvelle version de Dolibarr.
+OldVersionFoundAndMoveInNew=Une ancienne version de base a �t� trouv�e et d�plac�e pour fonctionner avec la nouvelle version de Dolibarr.
+OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a �t� trouv�e mais ne peut �tre d�plac�e pour �tre utilis�e avec la nouvelle version de Dolibarr.
 
-DLLMissing=L'installation de votre Windows est incomplète. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2017". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver à https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp après.
-ContinueAnyway=Continuer malgré tout (le process d'installaton échouera)
+DLLMissing=L'installation de votre Windows est incompl�te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2017". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver � https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr�s.
+ContinueAnyway=Continuer malgr� tout (le process d'installaton �chouera)

From e0069026b316f54167e617fe8486736432e08ff2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:06:53 +0100
Subject: [PATCH 1713/1862] Fix abs() on value after price2num() not before
 fixes PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 58807c5bcd2..41214e14147 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -443,7 +443,7 @@ if ($action != 'export_csv') {
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
 
 	// Hook fields
-	$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array('param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -547,7 +547,7 @@ if ($action != 'export_csv') {
 
 				// Show first line of a break
 				print '<tr class="trforbreak">';
-				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$root_account_number.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+				print '<td colspan="'.($colspan + 1).'" class="tdforbreak">'.$root_account_number.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
 				$displayed_account = $root_account_number;
@@ -690,7 +690,7 @@ if ($action != 'export_csv') {
 
 		$accountingResult = $object->accountingResult($search_date_start, $search_date_end);
 		if ($accountingResult < 0) {
-			$accountingResultDebit = price(price2num(abs($accountingResult), 'MT'));
+			$accountingResultDebit = price(abs(price2num($accountingResult, 'MT')));
 			$accountingResultClassCSS = ' error';
 		} else {
 			$accountingResultCredit = price(price2num($accountingResult, 'MT'));

From 87288a1a17e4b51e254300b7e15e5fa94ce84619 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:08:55 +0100
Subject: [PATCH 1714/1862] Fix: cast int to string for str_pad fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 09586c12637..601cb02bd38 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -943,7 +943,7 @@ class AccountancyExport
 			$tab['signe_montant'] = '+';
 
 			// The amount must be in centimes without decimal points.
-			$tab['montant'] = str_pad(abs(($line->debit - $line->credit) * 100), 12, '0', STR_PAD_LEFT);
+			$tab['montant'] = str_pad((string) abs(($line->debit - $line->credit) * 100), 12, '0', STR_PAD_LEFT);
 			$tab['contrepartie'] = str_repeat(' ', 8);
 
 			// Force date format : %d%m%y

From ae3bc300a10f0bcc72723da4a3465d6dd926b478 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:15:10 +0100
Subject: [PATCH 1715/1862] Fix: remove strtoupper on int fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 90de07f928e..14afbbbe7d8 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -299,7 +299,7 @@ class AccountingJournal extends CommonObject
 			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$langs->transnoentities($this->label).($nourl ? '</span>' : '');
 		}
 		if ($withlabel == 2 && !empty($this->nature)) {
-			$key = $langs->trans("AccountingJournalType".strtoupper($this->nature));
+			$key = $langs->trans("AccountingJournalType".$this->nature);
 			$transferlabel = ($this->nature && $key != "AccountingJournalType".strtoupper($langs->trans($this->nature)) ? $key : $this->label);
 			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$transferlabel.($nourl ? '</span>' : '');
 		}

From a4a4025ffe3065d186e08a695d62a9f623273f15 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:16:20 +0100
Subject: [PATCH 1716/1862] Fix: cast int to string for str_pad fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 1226ae9d167..b33efc256e3 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -161,7 +161,7 @@ $formaccounting = new FormAccounting($db);
 
 $title = $langs->trans('Closure');
 
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Cl.C3.B4ture_annuelle';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Cl.C3.B4ture_annuelle';
 
 llxHeader('', $title, $help_url);
 
@@ -334,7 +334,7 @@ if (isset($current_fiscal_period)) {
 		print '<td class="right">' . $langs->trans("Year") . '</td>';
 	}
 	for ($i = 1; $i <= 12; $i++) {
-		print '<td class="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+		print '<td class="right">' . $langs->trans('MonthShort' . str_pad((string) $i, 2, '0', STR_PAD_LEFT)) . '</td>';
 	}
 	print '<td class="right"><b>' . $langs->trans("Total") . '</b></td>';
 	print '</tr>';

From 769174bf6b47fa867e0c54dcd9345be850ff2144 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:19:53 +0100
Subject: [PATCH 1717/1862] Fix: cast int to string for str_pad fixes
 PhanTypeMismatchArgumentInternal

---
 htdocs/accountancy/customer/index.php | 42 +++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index c5bd8949880..ed0e1b771d7 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -234,17 +234,17 @@ if ($action == 'validatehistory') {
 			$facture_static_det->desc = $objp->description;
 
 			$accountingAccountArray = array(
-				'dom'=>$objp->aarowid,
-				'intra'=>$objp->aarowid_intra,
-				'export'=>$objp->aarowid_export,
-				'thirdparty' =>$objp->aarowid_thirdparty);
+				'dom' => $objp->aarowid,
+				'intra' => $objp->aarowid_intra,
+				'export' => $objp->aarowid_export,
+				'thirdparty' => $objp->aarowid_thirdparty);
 
 			$code_sell_p_notset = '';
 			$code_sell_t_notset = '';
 
 			$suggestedid = 0;
 
-			$return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
+			$return = $accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
 			if (!is_array($return) && $return < 0) {
 				setEventMessage($accountingAccount->error, 'errors');
 			} else {
@@ -299,7 +299,7 @@ if ($action == 'validatehistory') {
 /*
  * View
  */
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("CustomersVentilation"), $help_url);
 
@@ -347,7 +347,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/customer/list.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -362,7 +362,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((string) $j), "fd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -434,7 +434,7 @@ if ($resql) {
 			// Add link to make binding
 			if (!empty(price2num($row[$i]))) {
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
-				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad((string) $cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
 			}
 			print '</td>';
@@ -484,7 +484,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/customer/lines.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -499,7 +499,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -595,7 +595,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -605,7 +605,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+		$sql .= "  SUM(".$db->ifsql("MONTH(f.datef) = ".((int) $j), "fd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -655,7 +655,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 			if ($j > 12) {
 				$j -= 12;
 			}
-			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
+			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
 		print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -670,17 +670,17 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 				$sql .= " SUM(".$db->ifsql(
 					"MONTH(f.datef) = ".((int) $j),
 					" (".$db->ifsql(
-								"fd.total_ht < 0",
-								" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
-								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
-							).")",
+						"fd.total_ht < 0",
+						" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+						"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
+					).")",
 					0
-				).") AS month".str_pad((int) $j, 2, '0', STR_PAD_LEFT).",";
+				).") AS month".str_pad((string) $j, 2, '0', STR_PAD_LEFT).",";
 			}
 			$sql .= "  SUM(".$db->ifsql(
 				"fd.total_ht < 0",
 				" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
-								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
+				"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
 			).") as total";
 		} else {
 			$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
@@ -697,7 +697,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 						"  (fd.total_ht - (fd.buy_price_ht * fd.qty))"
 					).")",
 					0
-				).") AS month".str_pad((int) $j, 2, '0', STR_PAD_LEFT).",";
+				).") AS month".str_pad((string) $j, 2, '0', STR_PAD_LEFT).",";
 			}
 			$sql .= "  SUM(".$db->ifsql(
 				"fd.total_ht < 0",

From b6b501a0e7ab81b94d8e23959a6ba275ef76f06e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:21:27 +0100
Subject: [PATCH 1718/1862] Fix: cast int to string for str_pad fixes
 PhanTypeMismatchArgumentInternal

---
 htdocs/accountancy/expensereport/index.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index f72ad2b3037..afe6465562f 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -177,7 +177,7 @@ if ($action == 'validatehistory') {
 /*
  * View
  */
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("ExpenseReportsVentilation"), $help_url);
 
@@ -223,7 +223,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_month='.$tmp['mon'].'&search_year='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/list.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -238,7 +238,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(er.date_debut) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(er.date_debut) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= " SUM(erd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -300,7 +300,7 @@ if ($resql) {
 			// Add link to make binding
 			if (!empty(price2num($row[$i]))) {
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
-				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad((string) $cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
 			}
 			print '</td>';
@@ -338,7 +338,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
+	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -349,7 +349,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= " SUM(".$db->ifsql("MONTH(er.date_debut) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= " SUM(".$db->ifsql("MONTH(er.date_debut) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= " ROUND(SUM(erd.total_ht),2) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -426,7 +426,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -436,7 +436,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= " SUM(".$db->ifsql("MONTH(er.date_create) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+		$sql .= " SUM(".$db->ifsql("MONTH(er.date_create) = ".((int) $j), "erd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= " SUM(erd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";

From 07d135f14db87db48ffc0e18fb0da1723eb0f95f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:22:54 +0100
Subject: [PATCH 1719/1862] Fix: cast int to string for str_pad fixes
 PhanTypeMismatchArgumentInternal

---
 htdocs/accountancy/supplier/index.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index dea3d7b875a..ab8dfe60060 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -232,10 +232,10 @@ if ($action == 'validatehistory') {
 			$facture_static_det->desc = $objp->description;
 
 			$accountingAccountArray = array(
-				'dom'=>$objp->aarowid,
-				'intra'=>$objp->aarowid_intra,
-				'export'=>$objp->aarowid_export,
-				'thirdparty' =>$objp->aarowid_thirdparty);
+				'dom' => $objp->aarowid,
+				'intra' => $objp->aarowid_intra,
+				'export' => $objp->aarowid_export,
+				'thirdparty' => $objp->aarowid_thirdparty);
 
 			$code_buy_p_notset = '';
 			$code_buy_t_notset = '';
@@ -243,7 +243,7 @@ if ($action == 'validatehistory') {
 			$suggestedid = 0;
 
 			$return = $accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'supplier');
-			if (!is_array($return) && $return<0) {
+			if (!is_array($return) && $return < 0) {
 				setEventMessage($accountingAccount->error, 'errors');
 			} else {
 				$suggestedid = $return['suggestedid'];
@@ -297,7 +297,7 @@ if ($action == 'validatehistory') {
 /*
  * View
  */
-$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#Liaisons_comptables';
 
 llxHeader('', $langs->trans("SuppliersVentilation"), $help_url);
 
@@ -340,7 +340,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/list.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -355,7 +355,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM ".$db->prefix()."facture_fourn_det as ffd";
@@ -422,7 +422,7 @@ if ($resql) {
 			// Add link to make binding
 			if (!empty(price2num($row[$i]))) {
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
-				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad((string) $cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
 			}
 			print '</td>';
@@ -472,7 +472,7 @@ for ($i = 1; $i <= 12; $i++) {
 		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
 		print '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/lines.php?'.$param.'">';
 	}
-	print $langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT));
+	print $langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT));
 	if (!empty($tmp['mday'])) {
 		print '</a>';
 	}
@@ -487,7 +487,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM ".$db->prefix()."facture_fourn_det as ffd";
@@ -571,7 +571,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((int) $j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -581,7 +581,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((int) $j, 2, "0", STR_PAD_LEFT).",";
+		$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef) = ".((int) $j), "ffd.total_ht", "0").") AS month".str_pad((string) $j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(ffd.total_ht) as total";
 	$sql .= " FROM ".$db->prefix()."facture_fourn_det as ffd";

From c2ea58a8e221f56798a6c923b784289ae3613295 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:25:51 +0100
Subject: [PATCH 1720/1862] Fix: strlen(trim(country_id))==0 to country_id==0
 fixes phantypemismatchargumentinternal

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

diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index d18ba0c335d..d4b06aa2b1f 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -148,7 +148,7 @@ abstract class ActionsAdherentCardCommon
 			// Town
 			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-			if (dol_strlen(trim($this->object->country_id)) == 0) {
+			if ($this->object->country_id == 0) {
 				$this->object->country_id = $objsoc->country_id;
 			}
 
@@ -168,7 +168,7 @@ abstract class ActionsAdherentCardCommon
 			}
 
 			// Physical or Moral
-			$selectarray = array('0'=>$langs->trans("Physical"), '1'=>$langs->trans("Moral"));
+			$selectarray = array('0' => $langs->trans("Physical"), '1' => $langs->trans("Moral"));
 			$this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
 		}
 

From 3b9c03f898887d51a6f6d2c6d615beed70c3b959 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:27:29 +0100
Subject: [PATCH 1721/1862] Fix cast int to string for preg_replace fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index e8575c36337..051e398512b 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -593,7 +593,7 @@ if (empty($reshook)) {
 				$rowid = $object->id;
 				$id = $object->id;
 
-				$backtopage = preg_replace('/__ID__/', $id, $backtopage);
+				$backtopage = preg_replace('/__ID__/', (string) $id, $backtopage);
 			} else {
 				$db->rollback();
 

From 4df0e3890bd697de790638d2288f4cda3fcd1722 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:30:50 +0100
Subject: [PATCH 1722/1862] Fix  is already int, remove trim&casts fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index df36f5c95da..1be94641271 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -145,7 +145,7 @@ if ($action == 'add' && $user->hasRight('adherent', 'configurer')) {
 	$object->note_public = trim($comment);
 	$object->note_private = '';
 	$object->mail_valid = trim($mail_valid);
-	$object->vote = (int) $vote;
+	$object->vote = $vote;  // $vote is already int
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -201,7 +201,7 @@ if ($action == 'update' && $user->hasRight('adherent', 'configurer')) {
 	$object->note_public = trim($comment);
 	$object->note_private = '';
 	$object->mail_valid = trim($mail_valid);
-	$object->vote = (bool) trim($vote);
+	$object->vote = $vote;  // $vote is already int.
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');

From ef97d549c667220c78bdf8ba6e4a398fc120e370 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:33:19 +0100
Subject: [PATCH 1723/1862] Fix cast int to string for strpos fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 4d1b5cc3bed..5d3228ae23a 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -347,7 +347,7 @@ $db->close();
 function _isInBoxList($idrss, array $boxlist)
 {
 	foreach ($boxlist as $box) {
-		if ($box->boxcode === "lastrssinfos" && strpos($box->note, $idrss) !== false) {
+		if ($box->boxcode === "lastrssinfos" && strpos($box->note, (string) $idrss) !== false) {
 			return true;
 		}
 	}

From c4ab5a0437e50d2932091d95b1807cb5d66b7f54 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:39:25 +0100
Subject: [PATCH 1724/1862] Fix typing for attributes: list to int|string, add
 pos (fixes PhanTypeMismatchArgumentInternal)

---
 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 59b937fce95..9f87c8bccc1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -45,7 +45,7 @@ class ExtraFields
 	public $db;
 
 	/**
-	 * @var array<string,array{label:array<string,string>,type:array<string,string>,size:array<string,string>,default:array<string,string>,computed:array<string,string>,unique:array<string,int>,required:array<string,int>,param:array<string,mixed>,perms:array<string,mixed[]>,list:array<string,mixed[]>,totalizable:array<string,int>,help:array<string,string>,printable:array<string,int>,enabled:array<string,int>,langfile:array<string,string>,css:array<string,string>,csslist:array<string,string>,hidden:array<string,int>,mandatoryfieldsofotherentities:array<string,string>}> New array to store extrafields definition
+	 * @var array<string,array{label:array<string,string>,type:array<string,string>,size:array<string,string>,default:array<string,string>,computed:array<string,string>,unique:array<string,int>,required:array<string,int>,param:array<string,mixed>,perms:array<string,mixed[]>,list:array<string,int|string>,pos:array<string,int>,totalizable:array<string,int>,help:array<string,string>,printable:array<string,int>,enabled:array<string,int>,langfile:array<string,string>,css:array<string,string>,csslist:array<string,string>,hidden:array<string,int>,mandatoryfieldsofotherentities:array<string,string>}> New array to store extrafields definition
 	 */
 	public $attributes;
 

From 257f65cc47ca32f41e7d056f96fe4257a560181a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:41:40 +0100
Subject: [PATCH 1725/1862] Fix return type for callbak of array_filter to bool
 fixes PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 2e28dc8a6f9..648f7706ad9 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -217,10 +217,10 @@ $workflowcodes = array_filter(
 	$workflowcodes,
 	/**
 	 * @param array{enabled:int<0,1>} $var
-	 * @return int<0,1>
+	 * @return bool
 	 */
 	static function ($var) {
-		return $var['enabled'];
+		return (bool) $var['enabled'];
 	}
 );
 

From 95a78001150a7870b8189dd51cd13d648d72b0bd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:43:42 +0100
Subject: [PATCH 1726/1862] Fix cast  to int for fsockopen fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index f81f081f9a3..865d2754981 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -182,7 +182,7 @@ if (!empty($number)) {
 		$errno = 0;
 		$errstr = 0;
 		$strCallerId = "Dolibarr caller $found <".strtolower($number).">";
-		$oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10);
+		$oSocket = @fsockopen($strHost, (int) $port, $errno, $errstr, 10);
 		if (!$oSocket) {
 			print '<body>'."\n";
 			$txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)<br>\n";

From 2a534539cb00a5efdcb2f870e62bbbdc962e6822 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:46:29 +0100
Subject: [PATCH 1727/1862] Fix json_decode requires bool for arg2 fixes
 PhanTypeMismatchArgumentInternal

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 1e27f3d54f8..9b688ac3d3e 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -172,7 +172,7 @@ if (empty($reshook) && (GETPOST('removedassigned') || GETPOST('removedassigned')
 	$idtoremove = GETPOST('removedassigned');
 
 	if (!empty($_SESSION['assignedtouser'])) {
-		$tmpassigneduserids = json_decode($_SESSION['assignedtouser'], 1);
+		$tmpassigneduserids = json_decode($_SESSION['assignedtouser'], true);
 	} else {
 		$tmpassigneduserids = array();
 	}
@@ -199,7 +199,7 @@ if (empty($reshook) && (GETPOST('removedassignedresource') || GETPOST('removedas
 	$idtoremove = GETPOST('removedassignedresource');
 
 	if (!empty($_SESSION['assignedtoresource'])) {
-		$tmpassignedresourceids = json_decode($_SESSION['assignedtoresource'], 1);
+		$tmpassignedresourceids = json_decode($_SESSION['assignedtoresource'], true);
 	} else {
 		$tmpassignedresourceids = array();
 	}

From 17b4ebe219e138075d94ed69cb0dcf72b1c75faf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 02:49:14 +0100
Subject: [PATCH 1728/1862] Ignore PhanTypeMismatchArgumentInternal - they
 concern resource instead of LDAP\Connection

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

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 7eb9fc06ca5..f87638ed985 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -27,6 +27,7 @@
  *  Note:
  *  LDAP_ESCAPE_FILTER is to escape char  array('\\', '*', '(', ')', "\x00")
  *  LDAP_ESCAPE_DN is to escape char  array('\\', ',', '=', '+', '<', '>', ';', '"', '#')
+ *  @phan-suppress-file PhanTypeMismatchArgumentInternal (notifications concern 'respource)
  */
 
 /**

From f2b71793922c0e7657850ed0d3aa57be0c1c4b61 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 03:42:28 +0100
Subject: [PATCH 1729/1862] Add test case for numero_semaine

---
 test/phpunit/Functions2LibTest.php | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 081061a08ed..725216c6cd6 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -244,4 +244,45 @@ class Functions2LibTest extends CommonClassTest
 	{
 		$this->assertEquals($expected, get_string_between($string, $start, $end));
 	}
+
+
+	/**
+	 * Dataprovider for numero_semaine
+	 *
+	 * @return array<string,array{0:string,1:string}
+	 */
+	public function numeroSemaineDataProvider()
+	{
+		return [
+			// time_str, expected week
+			'day 1 - 1977' => [ "1977/1/1 10:10:10", '53'],
+			'day 2 - 1977' => [ "1977/1/1 10:10:10", '53'],
+			'last day - 1977' => [ "1977/12/31 10:10:10", '52'],
+			'day 1 - 1978' => [ "1978/1/1 10:10:10", '52'],
+			'day 2 - 1978' => [ "1978/1/2 10:10:10", '01'],
+			'day 1 - 1981' => [ "1981/1/1 10:10:10", '01'],
+			'last day - 1981' => [ "1981/12/31 10:10:10", '53'],
+			'day 1 - 1982' => [ "1982/1/1 10:10:10", '53'],
+			'day 3 - 1982' => [ "1982/1/3 10:10:10", '53'],
+			'day 4 - 1982' => [ "1982/1/4 10:10:10", '01'],
+		];
+	}
+
+
+	/**
+	 * Test numero_semaine()
+	 *
+	 * @param string $time_str Time (string) to test
+	 * @param int    $expected_week Week expected
+	 *
+	 * @return void
+	 *
+	 * @dataProvider numeroSemaineDataProvider
+	 */
+	public function testNumeroSemaine($time_str, $expected_week)
+	{
+		$time = strtotime($time_str);
+		$str = date(DATE_ATOM, $time).PHP_EOL;
+		$this->assertEquals($expected_week, numero_semaine($time), "Computed week incorrect for $str");
+	}
 }

From d3e6a83d7024d994e08f156f59b2fbcff4af5804 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 03:45:11 +0100
Subject: [PATCH 1730/1862] Fix PhanTypeMismatchArgumentInternal - apply casts
 tofix

---
 htdocs/core/lib/functions2.lib.php | 68 ++++++++++++++++--------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 47a1d475e4b..cfe406a7684 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1008,7 +1008,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey)) {
 		$maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
 		// @phan-suppress-next-line PhanParamSuspiciousOrder
-		$maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
+		$maskpersonew[$regKey[1]] = str_pad('', (int) $regKey[2], '_', STR_PAD_RIGHT);
 		$tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
 	}
 
@@ -1070,7 +1070,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 
 	if ($maskraz > 0) {   // A reset is required
 		if ($maskraz == 99) {
-			$maskraz = date('m', $date);
+			$maskraz = (int) date('m', $date);
 			$resetEveryMonth = true;
 		}
 		if ($maskraz > 12) {
@@ -1123,7 +1123,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$yearcomp = 0;
 
 		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {	// $yearoffsettype is - or +
-			$currentyear = date("Y", $date);
+			$currentyear = (int) date("Y", $date);
 			$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
 			$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
 			$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);
@@ -1139,23 +1139,23 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 				// If after or equal of current new year date
 				$yearoffset = -1;
 			}
-		} elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) {
+		} elseif ((int) date("m", $date) < $maskraz && empty($resetEveryMonth)) {
 			// For backward compatibility
 			$yearoffset = -1;
 		}	// If current month lower that month of return to zero, year is previous year
 
 		if ($yearlen == 4) {
-			$yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
+			$yearcomp = sprintf("%04d", (int) date("Y", $date) + $yearoffset);
 		} elseif ($yearlen == 2) {
-			$yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
+			$yearcomp = sprintf("%02d", (int) date("y", $date) + $yearoffset);
 		} elseif ($yearlen == 1) {
 			$yearcomp = substr(date('y', $date), 1, 1) + $yearoffset;
 		}
 		if ($monthcomp > 1 && empty($resetEveryMonth)) {	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
 			if ($yearlen == 4) {
-				$yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
+				$yearcomp1 = sprintf("%04d", (int) date("Y", $date) + $yearoffset + 1);
 			} elseif ($yearlen == 2) {
-				$yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
+				$yearcomp1 = sprintf("%02d", (int) date("y", $date) + $yearoffset + 1);
 			}
 
 			$sqlwhere .= "(";
@@ -1383,8 +1383,8 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 
 		// We replace special codes except refclient
 		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {	// yearoffsettype is - or +, so we don't want current year
-			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
-			$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
+			$numFinal = preg_replace('/\{yyyy\}/i', (string) ((int) date("Y", $date) + $yearoffset), $numFinal);
+			$numFinal = preg_replace('/\{yy\}/i', (string) ((int) date("y", $date) + $yearoffset), $numFinal);
 			$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
 		} else { // we want yyyy to be current year
 			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
@@ -1538,7 +1538,7 @@ function check_value($mask, $value)
 	}
 	if ($maskraz >= 0) {
 		if ($maskraz == 99) {
-			$maskraz = date('m');
+			$maskraz = (int) date('m');
 			$resetEveryMonth = true;
 		}
 		if ($maskraz > 12) {
@@ -1632,9 +1632,9 @@ function numero_semaine($time)
 
 	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) {
 		// Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
-		$annee = $reg[1];
-		$mois = $reg[2];
-		$jour = $reg[3];
+		$annee = (int) $reg[1];
+		$mois = (int) $reg[2];
+		$jour = (int) $reg[3];
 	}
 
 	/*
@@ -1645,40 +1645,46 @@ function numero_semaine($time)
 	 */
 
 	// Definition du Jeudi de la semaine
-	if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) { // Dimanche
+	if ((int) date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) { // Dimanche
 		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
 	} elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) { // du Lundi au Mercredi
-		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
-	} elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) { // du Vendredi au Samedi
-		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
+		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - (int) date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
+	} elseif ((int) date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) { // du Vendredi au Samedi
+		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - ((int) date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
 	} else { // Jeudi
 		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
 	}
 
 	// Definition du premier Jeudi de l'annee
-	if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) { // Dimanche
-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
-	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) { // du Lundi au Mercredi
-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
-	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) { // du Vendredi au Samedi
-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
+	if ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) == 0) { // Dimanche
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
+	} elseif ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) < 4) { // du Lundi au Mercredi
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)) + (4 - (int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
+	} elseif ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) > 4) { // du Vendredi au Samedi
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)) + (7 - ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
 	} else { // Jeudi
-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine));
 	}
 
 	// Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
 	$numeroSemaine = (
 		(
-			date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
+			(int) date("z", mktime(12, 0, 0, (int) date("m", $jeudiSemaine), (int) date("d", $jeudiSemaine), (int) date("Y", $jeudiSemaine)))
 		-
-		date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
+		(int) date("z", mktime(12, 0, 0, (int) date("m", $premierJeudiAnnee), (int) date("d", $premierJeudiAnnee), (int) date("Y", $premierJeudiAnnee)))
 		) / 7
 	) + 1;
 
 	// Cas particulier de la semaine 53
 	if ($numeroSemaine == 53) {
-		// Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
-		if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) {
+		// Les annees qui commencent un Jeudi et les annees bissextiles commencant un Mercredi en possedent 53
+		if (
+			((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) == 4)
+			|| (
+				((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) == 3)
+				&& ((int) date("z", mktime(12, 0, 0, 12, 31, (int) date("Y", $jeudiSemaine))) == 365)
+			)
+		) {
 			$numeroSemaine = 53;
 		} else {
 			$numeroSemaine = 1;
@@ -2533,9 +2539,9 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false)
 	$rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0));
 	if ($alpha !== false) {
 		$rgb['a'] = (float) $alpha;
-		$string = 'rgba('.implode(',', $rgb).')';
+		$string = 'rgba('.implode(',', array_map('strval', $rgb)).')';
 	} else {
-		$string = 'rgb('.implode(',', $rgb).')';
+		$string = 'rgb('.implode(',', array_map('strval', $rgb)).')';
 	}
 
 	if ($returnArray) {

From 4f467950063acfc584bc1b353e3fe2ad421c5e84 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 03:47:45 +0100
Subject: [PATCH 1731/1862] Fix PhanTypeMismatchArgumentInternal - apply casts
 tofix

---
 htdocs/compta/stats/byratecountry.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index 85906cd2c12..8269058cf69 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -159,8 +159,8 @@ foreach ($listofparams as $param) {
 
 llxHeader('', $langs->trans("TurnoverReport"), '', '', 0, 0, '', '', $morequerystring);
 
-$exportlink="";
-$namelink="";
+$exportlink = "";
+$namelink = "";
 //print load_fiche_titre($langs->trans("VAT"),"");
 
 //$fsearch.='<br>';
@@ -304,7 +304,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 		$i++;
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("TotalHT").'</b></td></tr>';
@@ -314,7 +314,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " fd.product_type AS product_type,";
 	$sql .= " cc.code, cc.label AS country,";
 	for ($i = 1; $i <= 12; $i++) {
-		$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$i, "fd.total_ht", "0").") AS month".str_pad($i, 2, "0", STR_PAD_LEFT).",";
+		$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$i, "fd.total_ht", "0").") AS month".str_pad((string) $i, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -354,7 +354,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				if ($j > 12) {
 					$j -= 12;
 				}
-				$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
+				$monthj = 'month'.str_pad((string) $j, 2, '0', STR_PAD_LEFT);
 				print '<td class="right" width="6%">'.price($obj->$monthj).'</td>';
 				$totalpermonth[$j] = (empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]) + $obj->$monthj;
 			}
@@ -373,7 +373,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 			if ($j > 12) {
 				$j -= 12;
 			}
-			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
+			$monthj = 'month'.str_pad((string) $j, 2, '0', STR_PAD_LEFT);
 			print '<td class="right" width="6%">'.price((empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j])).'</td>';
 		}
 		print '<td class="right" width="6%"><b>'.price((empty($totalpermonth['total']) ? 0 : $totalpermonth['total'])).'</b></td>';
@@ -391,7 +391,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 		if ($j > 12) {
 			$j -= 12;
 		}
-		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad((string) $j, 2, '0', STR_PAD_LEFT)).'</td>';
 		$i++;
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("TotalHT").'</b></td></tr>';
@@ -401,7 +401,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql2 .= " ffd.product_type AS product_type,";
 	$sql2 .= " cc.code, cc.label AS country,";
 	for ($i = 1; $i <= 12; $i++) {
-		$sql2 .= " SUM(".$db->ifsql("MONTH(ff.datef)=".$i, "ffd.total_ht", "0").") AS month".str_pad($i, 2, "0", STR_PAD_LEFT).",";
+		$sql2 .= " SUM(".$db->ifsql("MONTH(ff.datef)=".$i, "ffd.total_ht", "0").") AS month".str_pad((string) $i, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql2 .= "  SUM(ffd.total_ht) as total";
 	$sql2 .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
@@ -441,7 +441,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				if ($j > 12) {
 					$j -= 12;
 				}
-				$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
+				$monthj = 'month'.str_pad((string) $j, 2, '0', STR_PAD_LEFT);
 				print '<td class="right" width="6%">'.price($obj->$monthj).'</td>';
 				$totalpermonth[$j] = (empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]) + $obj->$monthj;
 			}
@@ -460,7 +460,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 			if ($j > 12) {
 				$j -= 12;
 			}
-			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
+			$monthj = 'month'.str_pad((string) $j, 2, '0', STR_PAD_LEFT);
 			print '<td class="right" width="6%">'.price(empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]).'</td>';
 		}
 		print '<td class="right" width="6%"><b>'.price(empty($totalpermonth['total']) ? 0 : $totalpermonth['total']).'</b></td>';

From ce66366dd16310564db54cd85a93c436b85c74a7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 03:55:52 +0100
Subject: [PATCH 1732/1862] Fix file_get_contents() does not use "r",
 str_replace (PhanTypeMismatchArgumentInternal)

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

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 28ffb8e9d34..b05628a951e 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -94,7 +94,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
 
 		// Edit class files
-		$contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
+		$contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc));
 
 		// Update ->fields (to add or remove entries defined into $addfieldentry)
 		if (count($object->fields)) {
@@ -321,7 +321,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	// Backup old file
 	dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
 
-	$contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
+	$contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc));
 
 	$i = 0;
 	$texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
@@ -389,7 +389,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	$pathoffiletoedittarget = preg_replace('/\.sql$/', '.key.sql', $pathoffiletoedittarget);
 	$pathoffiletoedittarget = preg_replace('/\.sql.new$/', '.key.sql.new', $pathoffiletoedittarget);
 
-	$contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
+	$contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc));
 
 	$i = 0;
 	$texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
@@ -898,7 +898,7 @@ function writePermsInAsciiDoc($file, $destfile)
 	$array = explode(";", $content);
 	$permissions = array_filter($array);
 	// delete  occurrences "$r++" and ID
-	$permissions = str_replace('$r++', 1, $permissions);
+	$permissions = str_replace('$r++', '1', $permissions);
 
 	$permsN = array();
 	foreach ($permissions as $i => $element) {

From 632ee1b81b1bf217a10c9f250e0e26a0828e7f68 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 18 Mar 2024 04:36:25 +0100
Subject: [PATCH 1733/1862] NEW auto fill infos in template email

---
 htdocs/core/lib/emaillayout.lib.php | 36 ++++++++++++++---------------
 htdocs/langs/en_US/mails.lang       |  2 ++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/emaillayout.lib.php b/htdocs/core/lib/emaillayout.lib.php
index 1240c2fa664..9ae359f26df 100644
--- a/htdocs/core/lib/emaillayout.lib.php
+++ b/htdocs/core/lib/emaillayout.lib.php
@@ -30,28 +30,28 @@
  */
 function getHtmlOfLayout($name)
 {
+	global $conf, $mysoc, $user, $langs;
+
 	if ($name == 'basic') {
 		$out = '
             <div >
-            <div >
-            <img alt="Gray rectangle" width="800px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
-            </div>
-            <h3>Lorem, ipsum dolor sit amet consectetur adipisicing elit.</h3>
-            <h3>Lorem, ipsum dolor sit amet consectetur</h3>
-            <!-- Les paragraphes de texte -->
+            <div >';
+		if (!empty($mysoc->logo)) {
+			if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+				$out .= '<img  height="100px" width="400px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo).'">';
+			}
+		} else {
+			$out .= '<img alt="Gray rectangle" width="100px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />';
+		}
+		$out .= '</div> 
+            <h2>'.$langs->trans('TitleOfMailHolder').'</h2>
             <div class="email-template-text">
-            <p>Lorem, ipsum dolor sit amet consectetur adipisicing elit. Aperiam non blanditiis delectus accusamus reprehenderit voluptates repellat.<br> Excepturi illo delectus nisi labore, iste voluptatibus dignissimos explicabo, corrupti voluptatum et facere cum?</p>
-            </div>
-            <div class="email-template-text">
-            <p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-            </div>
-            <div class="email-template-text">
-            <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
-            </div>
-
-            <img alt="Gray rectangle" width="15%" height="50px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />
-
-        </div>';
+            <p>'.$langs->trans('ContentOfMailHOlder').'</p>
+            </div>';
+		if (!(empty($user->signature))) {
+			$out .= '<h4><strong>'.dol_htmlentities($user->signature).'</strong></h4>';
+		}
+		$out .= '</div>';
 	} elseif ($name == 'news') {
 		$out = '
         <h1 style="margin-left:120px;">Lorem, ipsum dolor sit amet consectetur adipisicing elit sit amet consectetur</h1>
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index d2e29b3941a..4160930b410 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -191,3 +191,5 @@ helpWithAi=Generate message from AI
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
+TitleOfMailHolder=Title of the e-mail goes here
+ContentOfMailHOlder=Content of email goes here...
\ No newline at end of file

From e72c5962236622360fdc2f880fba09446d942e88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 05:12:50 +0000
Subject: [PATCH 1734/1862] Bump tj-actions/changed-files from 42 to 43

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v42...v43)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 384ef39880e..e95694456cc 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -19,7 +19,7 @@ jobs:
       # This is faster for a big repo.
       - name: Get all changed php files (if PR)
         id: changed-php
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v43
         if: github.event_name == 'pull_request'
         with:
           files: |
@@ -57,7 +57,7 @@ jobs:
       # The next uses git, which is slow for a bit repo.
       # - name: Get all changed php files (if PR)
       #   id: changed-php
-      #   uses: tj-actions/changed-files@v42
+      #   uses: tj-actions/changed-files@v43
       #   if: github.event_name == 'pull_request'
       #   with:
       #     files: |

From 626cb3cfa0f65bca19d40da47eef4628ab787d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 18 Mar 2024 08:01:45 +0100
Subject: [PATCH 1735/1862] fix typo in ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index b31afcad981..56b6be75962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,11 +28,11 @@ FIX: Bad column for total in bom list
 FIX: Bad condition on button back to draft on recruitment job.
 FIX: Bad CRLF when sending text only content. Fix dol_htmlwithnojs()
 FIX: Bad picto on list of permission of a user when user not admin
-FIX: bad timzeone for the start/end date of an event
+FIX: bad timezone for the start/end date of an event
 FIX: Better test on validity of compute field syntax with parenthesis
 FIX: close #28279
 FIX: Count of virtual stock at Services and MoLine with disabled stock change (#28580)
-FIX: disabled pito of menu must be greyed.
+FIX: disabled picto of menu must be greyed.
 FIX: Don't display column when it's out of date (#28271)
 FIX: duplicate with lines: 414-416 (#28358)
 FIX: edit bank suggested for credit transfer payment in invoice setup

From ddfef5ac4ced6f6826f94e48b124aace7e82cbfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:23:20 +0100
Subject: [PATCH 1736/1862] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 56b6be75962..32270994e3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,7 +38,7 @@ FIX: duplicate with lines: 414-416 (#28358)
 FIX: edit bank suggested for credit transfer payment in invoice setup
 FIX: Error When cloning fourn price no default value for tva_tx (#28368)
 FIX: fatal error Unsupported operand types when recording load payment
-FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfert is allowed (#26217)
+FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfer is allowed (#26217)
 FIX: migration missing 2 columns in llx_resource and 1 in llx_user
 FIX: missing trans
 FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
@@ -63,7 +63,7 @@ FIX: Special code is now transmitted by args only in order supplier (#28619)
 FIX: subscription must be editable when accounting isn't reconciled (#28469)
 FIX: Translation for select  (#28677)
 FIX: upload odt files should not start/end with space
-FIX: Value of field int = 0 from modulebuilder must nto be set to null
+FIX: Value of field int = 0 from modulebuilder must not be set to null
 FIX: Wrong currency shown in TakePOS payment page
 FIX: #yogosha21416
 

From 39b866b2e139a04b66424a3dcb1d4eb986d0c229 Mon Sep 17 00:00:00 2001
From: AWeerWolf <a.weer.wolf@gmail.com>
Date: Mon, 18 Mar 2024 09:24:45 +0100
Subject: [PATCH 1737/1862] Renaming Hooks

---
 htdocs/accountancy/bookkeeping/card.php | 829 ++++++++++++------------
 1 file changed, 410 insertions(+), 419 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 8449bc8028b..4382227d1dd 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -95,7 +95,7 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
  * Actions
  */
 $parameters = array();
-$reshook_onBeforeActions = $hookmanager->executeHooks('onBeforeActions', $parameters, $object, $action);
+$reshook_onBeforeActions = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook_onBeforeActions < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -331,365 +331,384 @@ if (empty($reshook_onBeforeActions)) {
 		}
 	}
 }
-$reshook_onAfterActions = $hookmanager->executeHooks('onAfterActions', $parameters, $object, $action);
-
 
 /*
  * View
  */
-$reshook_onBeforeView = $hookmanager->executeHooks('onBeforeView', $parameters, $object, $action);
-if ($reshook_onBeforeView < 0) {
-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+$form = new Form($db);
+$formaccounting = new FormAccounting($db);
+
+$title = $langs->trans("CreateMvts");
+$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double';
+llxHeader('', $title, $help_url);
+
+// Confirmation to delete the command
+if ($action == 'delete') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
+	print $formconfirm;
 }
-if (empty($reshook_onBeforeView)) {
-	$form = new Form($db);
-	$formaccounting = new FormAccounting($db);
 
-	$title = $langs->trans("CreateMvts");
-	$help_url = 'EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double';
-	llxHeader('', $title, $help_url);
+if ($action == 'create') {
+	print load_fiche_titre($title);
 
-	// Confirmation to delete the command
-	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
+	$object = new BookKeeping($db);
+	$next_num_mvt = $object->getNextNumMvt('_tmp');
+
+	if (empty($next_num_mvt)) {
+		dol_print_error(null, 'Failed to get next piece number');
 	}
 
-	if ($action == 'create') {
-		print load_fiche_titre($title);
+	print '<form action="'.$_SERVER["PHP_SELF"].'" name="create_mvt" method="POST">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="confirm_create">'."\n";
+	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
+	print '<input type="hidden" name="mode" value="_tmp">'."\n";
 
-		$object = new BookKeeping($db);
-		$next_num_mvt = $object->getNextNumMvt('_tmp');
+	print dol_get_fiche_head();
 
-		if (empty($next_num_mvt)) {
-			dol_print_error(null, 'Failed to get next piece number');
+	print '<table class="border centpercent">';
+
+	/*print '<tr>';
+	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
+	print '<td>' . $next_num_mvt . '</td>';
+	print '</tr>';*/
+
+	print '<tr>';
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Docdate").'</td>';
+	print '<td>';
+	print $form->selectDate('', 'doc_date', 0, 0, 0, "create_mvt", 1, 1);
+	print '</td>';
+	print '</tr>';
+
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Codejournal").'</td>';
+	print '<td>'.$formaccounting->select_journal($journal_code, 'code_journal', 0, 0, 1, 1).'</td>';
+	print '</tr>';
+
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Piece").'</td>';
+	print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.GETPOST('doc_ref', 'alpha').'"></td>';
+	print '</tr>';
+
+	/*
+	print '<tr>';
+	print '<td>' . $langs->trans("Doctype") . '</td>';
+	print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
+	print '</tr>';
+	*/
+	$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action);
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print $form->buttonsSaveCancel("Create");
+
+	print '</form>';
+} else {
+	$object = new BookKeeping($db);
+	$result = $object->fetchPerMvt($piece_num, $mode);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+
+	if (!empty($object->piece_num)) {
+		$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
+
+		if ($mode == '_tmp') {
+			print load_fiche_titre($langs->trans("CreateMvts"), $backlink);
+		} else {
+			print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
 		}
 
-		print '<form action="'.$_SERVER["PHP_SELF"].'" name="create_mvt" method="POST">';
-		if ($optioncss != '') {
-			print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-		}
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="confirm_create">'."\n";
-		print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
-		print '<input type="hidden" name="mode" value="_tmp">'."\n";
+		$head = array();
+		$h = 0;
+		$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode ? '&mode='.$mode : '');
+		$head[$h][1] = $langs->trans("Transaction");
+		$head[$h][2] = 'transaction';
+		$h++;
 
-		print dol_get_fiche_head();
+		print dol_get_fiche_head($head, 'transaction', '', -1);
 
-		print '<table class="border centpercent">';
+		//dol_banner_tab($object, '', $backlink);
 
-		/*print '<tr>';
-		print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
-		print '<td>' . $next_num_mvt . '</td>';
-		print '</tr>';*/
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
+
+		// Account movement
 		print '<tr>';
-		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Docdate").'</td>';
-		print '<td>';
-		print $form->selectDate('', 'doc_date', 0, 0, 0, "create_mvt", 1, 1);
+		print '<td class="titlefield">'.$langs->trans("NumMvts").'</td>';
+		print '<td>'.($mode == '_tmp' ? '<span class="opacitymedium" title="Id tmp '.$object->piece_num.'">'.$langs->trans("Draft").'</span>' : $object->piece_num).'</td>';
+		print '</tr>';
+
+		// Date
+		print '<tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
+		print $langs->trans('Docdate');
+		print '</td>';
+		if ($action != 'editdate') {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdate') {
+			print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+			if ($optioncss != '') {
+				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			}
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="setdate">';
+			print '<input type="hidden" name="mode" value="'.$mode.'">';
+			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', 0, 0, 0, "setdate");
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+			print '</form>';
+		} else {
+			print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
+		}
 		print '</td>';
 		print '</tr>';
 
-		print '<tr>';
-		print '<td class="fieldrequired">'.$langs->trans("Codejournal").'</td>';
-		print '<td>'.$formaccounting->select_journal($journal_code, 'code_journal', 0, 0, 1, 1).'</td>';
+		// Journal
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Codejournal');
+		print '</td>';
+		if ($action != 'editjournal') {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editjournal') {
+			print '<form name="setjournal" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+			if ($optioncss != '') {
+				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			}
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="setjournal">';
+			print '<input type="hidden" name="mode" value="'.$mode.'">';
+			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+			print '</form>';
+		} else {
+			print $object->code_journal;
+		}
+		print '</td>';
 		print '</tr>';
 
-		print '<tr>';
-		print '<td class="fieldrequired">'.$langs->trans("Piece").'</td>';
-		print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.GETPOST('doc_ref', 'alpha').'"></td>';
+		// Ref document
+		print '<tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
+		print $langs->trans('Piece');
+		print '</td>';
+		if ($action != 'editdocref') {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editdocref') {
+			print '<form name="setdocref" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+			if ($optioncss != '') {
+				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			}
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="setdocref">';
+			print '<input type="hidden" name="mode" value="'.$mode.'">';
+			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
+			print '</form>';
+		} else {
+			print $object->doc_ref;
+		}
+		print '</td>';
 		print '</tr>';
 
-		/*
-		print '<tr>';
-		print '<td>' . $langs->trans("Doctype") . '</td>';
-		print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
-		print '</tr>';
-		*/
-		$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action);
-
 		print '</table>';
 
-		print dol_get_fiche_end();
+		print '</div>';
 
-		print $form->buttonsSaveCancel("Create");
+		print '<div class="fichehalfright">';
 
-		print '</form>';
-	} else {
-		$object = new BookKeeping($db);
-		$result = $object->fetchPerMvt($piece_num, $mode);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield centpercent">';
+
+		// Doc type
+		if (!empty($object->doc_type)) {
+			print '<tr>';
+			print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
+			print '<td>'.$object->doc_type.'</td>';
+			print '</tr>';
 		}
 
-		if (!empty($object->piece_num)) {
-			$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
+		// Date document creation
+		print '<tr>';
+		print '<td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+		print '<td>';
+		print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
+		print '</td>';
+		print '</tr>';
 
-			if ($mode == '_tmp') {
-				print load_fiche_titre($langs->trans("CreateMvts"), $backlink);
-			} else {
-				print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
-			}
-
-			$head = array();
-			$h = 0;
-			$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.$object->piece_num.($mode ? '&mode='.$mode : '');
-			$head[$h][1] = $langs->trans("Transaction");
-			$head[$h][2] = 'transaction';
-			$h++;
-
-			print dol_get_fiche_head($head, 'transaction', '', -1);
-
-			//dol_banner_tab($object, '', $backlink);
-
-			print '<div class="fichecenter">';
-			print '<div class="fichehalfleft">';
-
-			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border tableforfield" width="100%">';
-
-			// Account movement
+		// Don't show in tmp mode, inevitably empty
+		if ($mode != "_tmp") {
+			// Date document export
 			print '<tr>';
-			print '<td class="titlefield">'.$langs->trans("NumMvts").'</td>';
-			print '<td>'.($mode == '_tmp' ? '<span class="opacitymedium" title="Id tmp '.$object->piece_num.'">'.$langs->trans("Draft").'</span>' : $object->piece_num).'</td>';
-			print '</tr>';
-
-			// Date
-			print '<tr><td>';
-			print '<table class="nobordernopadding centpercent"><tr><td>';
-			print $langs->trans('Docdate');
-			print '</td>';
-			if ($action != 'editdate') {
-				print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
-			}
-			print '</tr></table>';
-			print '</td><td colspan="3">';
-			if ($action == 'editdate') {
-				print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-				if ($optioncss != '') {
-					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-				}
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="setdate">';
-				print '<input type="hidden" name="mode" value="'.$mode.'">';
-				print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', 0, 0, 0, "setdate");
-				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-				print '</form>';
-			} else {
-				print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
-			}
-			print '</td>';
-			print '</tr>';
-
-			// Journal
-			print '<tr><td>';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans('Codejournal');
-			print '</td>';
-			if ($action != 'editjournal') {
-				print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-			}
-			print '</tr></table>';
-			print '</td><td>';
-			if ($action == 'editjournal') {
-				print '<form name="setjournal" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-				if ($optioncss != '') {
-					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-				}
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="setjournal">';
-				print '<input type="hidden" name="mode" value="'.$mode.'">';
-				print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
-				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-				print '</form>';
-			} else {
-				print $object->code_journal;
-			}
-			print '</td>';
-			print '</tr>';
-
-			// Ref document
-			print '<tr><td>';
-			print '<table class="nobordernopadding centpercent"><tr><td>';
-			print $langs->trans('Piece');
-			print '</td>';
-			if ($action != 'editdocref') {
-				print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-			}
-			print '</tr></table>';
-			print '</td><td>';
-			if ($action == 'editdocref') {
-				print '<form name="setdocref" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-				if ($optioncss != '') {
-					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-				}
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="setdocref">';
-				print '<input type="hidden" name="mode" value="'.$mode.'">';
-				print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
-				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
-				print '</form>';
-			} else {
-				print $object->doc_ref;
-			}
-			print '</td>';
-			print '</tr>';
-
-			print '</table>';
-
-			print '</div>';
-
-			print '<div class="fichehalfright">';
-
-			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border tableforfield centpercent">';
-
-			// Doc type
-			if (!empty($object->doc_type)) {
-				print '<tr>';
-				print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
-				print '<td>'.$object->doc_type.'</td>';
-				print '</tr>';
-			}
-
-			// Date document creation
-			print '<tr>';
-			print '<td class="titlefield">'.$langs->trans("DateCreation").'</td>';
+			print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>';
 			print '<td>';
-			print $object->date_creation ? dol_print_date($object->date_creation, 'day') : '&nbsp;';
+			print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
 			print '</td>';
 			print '</tr>';
 
-			// Don't show in tmp mode, inevitably empty
-			if ($mode != "_tmp") {
-				// Date document export
-				print '<tr>';
-				print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>';
-				print '<td>';
-				print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
-				print '</td>';
-				print '</tr>';
-
-				// Date document validation
-				print '<tr>';
-				print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>';
-				print '<td>';
-				print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
-				print '</td>';
-				print '</tr>';
-			}
-
-			// Validate
-			/*
+			// Date document validation
 			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
+			print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>';
 			print '<td>';
-				if (empty($object->validated)) {
-					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=enable&token='.newToken().'">';
-					print img_picto($langs->trans("Disabled"), 'switch_off');
-					print '</a>';
+			print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Validate
+		/*
+		print '<tr>';
+		print '<td class="titlefield">' . $langs->trans("Status") . '</td>';
+		print '<td>';
+			if (empty($object->validated)) {
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=enable&token='.newToken().'">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+				print '</a>';
+			} else {
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=disable&token='.newToken().'">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+				print '</a>';
+			}
+			print '</td>';
+		print '</tr>';
+		*/
+
+		// check data
+		/*
+		print '<tr>';
+		print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
+		if ($object->doc_type == 'customer_invoice')
+		{
+		$sqlmid = 'SELECT rowid as ref';
+			$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
+			$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
+			dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+			$resultmid = $db->query($sqlmid);
+			if ($resultmid) {
+				$objmid = $db->fetch_object($resultmid);
+				$invoicestatic = new Facture($db);
+				$invoicestatic->fetch($objmid->ref);
+				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+			}
+			else dol_print_error($db);
+		}
+		print '<td>' . $ref .'</td>';
+		print '</tr>';
+		*/
+		print "</table>\n";
+
+		print '</div>';
+
+		print dol_get_fiche_end();
+
+		print '<div class="clearboth"></div>';
+
+		print '<br>';
+
+		$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
+
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			// List of movements
+			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
+
+			print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
+			if ($optioncss != '') {
+				print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			}
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="doc_date" value="'.$object->doc_date.'">'."\n";
+			print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'">'."\n";
+			print '<input type="hidden" name="doc_ref" value="'.$object->doc_ref.'">'."\n";
+			print '<input type="hidden" name="code_journal" value="'.$object->code_journal.'">'."\n";
+			print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
+			print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
+			print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
+
+			if (count($object->linesmvt) > 0) {
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent">';
+
+				$total_debit = 0;
+				$total_credit = 0;
+
+				print '<tr class="liste_titre">';
+
+				print_liste_field_titre("AccountAccountingShort");
+				print_liste_field_titre("SubledgerAccount");
+				print_liste_field_titre("LabelOperation");
+				print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"');
+				print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"');
+				if (empty($object->date_validation)) {
+					print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
 				} else {
-					print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $line->id . '&action=disable&token='.newToken().'">';
-					print img_picto($langs->trans("Activated"), 'switch_on');
-					print '</a>';
+					print_liste_field_titre("");
 				}
-				print '</td>';
-			print '</tr>';
-			*/
 
-			// check data
-			/*
-			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("Control") . '</td>';
-			if ($object->doc_type == 'customer_invoice')
-			{
-			$sqlmid = 'SELECT rowid as ref';
-				$sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac";
-				$sqlmid .= " WHERE fac.rowid=" . ((int) $object->fk_doc);
-				dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-				$resultmid = $db->query($sqlmid);
-				if ($resultmid) {
-					$objmid = $db->fetch_object($resultmid);
-					$invoicestatic = new Facture($db);
-					$invoicestatic->fetch($objmid->ref);
-					$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-				}
-				else dol_print_error($db);
-			}
-			print '<td>' . $ref .'</td>';
-			print '</tr>';
-			*/
-			print "</table>\n";
+				print "</tr>\n";
 
-			print '</div>';
-
-			print dol_get_fiche_end();
-
-			print '<div class="clearboth"></div>';
-
-			print '<br>';
-
-			$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
-
-			if ($result < 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-			} else {
-				// List of movements
-				print load_fiche_titre($langs->trans("ListeMvts"), '', '');
-
-				print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-				if ($optioncss != '') {
-					print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-				}
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="doc_date" value="'.$object->doc_date.'">'."\n";
-				print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'">'."\n";
-				print '<input type="hidden" name="doc_ref" value="'.$object->doc_ref.'">'."\n";
-				print '<input type="hidden" name="code_journal" value="'.$object->code_journal.'">'."\n";
-				print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
-				print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
-				print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
-
-				if (count($object->linesmvt) > 0) {
-					print '<div class="div-table-responsive-no-min">';
-					print '<table class="noborder centpercent">';
-
-					$total_debit = 0;
-					$total_credit = 0;
-
-					print '<tr class="liste_titre">';
-
-					print_liste_field_titre("AccountAccountingShort");
-					print_liste_field_titre("SubledgerAccount");
-					print_liste_field_titre("LabelOperation");
-					print_liste_field_titre("AccountingDebit", "", "", "", "", 'class="right"');
-					print_liste_field_titre("AccountingCredit", "", "", "", "", 'class="right"');
-					if (empty($object->date_validation)) {
-						print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
-					} else {
-						print_liste_field_titre("");
+				// Add an empty line if there is not yet
+				if (!empty($object->linesmvt[0])) {
+					$tmpline = $object->linesmvt[0];
+					if (!empty($tmpline->numero_compte)) {
+						$line = new BookKeepingLine($db);
+						$object->linesmvt[] = $line;
 					}
+				}
 
-					print "</tr>\n";
+				foreach ($object->linesmvt as $line) {
+					print '<tr class="oddeven" data-lineid="'.((int) $line->id).'">';
+					$total_debit += $line->debit;
+					$total_credit += $line->credit;
 
-					// Add an empty line if there is not yet
-					if (!empty($object->linesmvt[0])) {
-						$tmpline = $object->linesmvt[0];
-						if (!empty($tmpline->numero_compte)) {
-							$line = new BookKeepingLine($db);
-							$object->linesmvt[] = $line;
+					if ($action == 'update' && $line->id == $id) {
+						print '<!-- td columns in edit mode -->';
+						print '<td>';
+						print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
+						print '</td>';
+						print '<td>';
+						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+						// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+						// Also, it is not possible to use a value that is not in the list.
+						// Also, the label is not automatically filled when a value is selected.
+						if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
+							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+						} else {
+							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 						}
-					}
-
-					foreach ($object->linesmvt as $line) {
-						print '<tr class="oddeven" data-lineid="'.((int) $line->id).'">';
-						$total_debit += $line->debit;
-						$total_credit += $line->credit;
-
-						if ($action == 'update' && $line->id == $id) {
-							print '<!-- td columns in edit mode -->';
+						// Add also input for subledger label
+						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
+						print '</td>';
+						print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
+						print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
+						print '<td class="right"><input type="text" size="6" class="right" name="credit" value="'.(GETPOSTISSET("credit") ? GETPOST("credit", "alpha") : price($line->credit)).'"></td>';
+						print '<td>';
+						print '<input type="hidden" name="id" value="'.$line->id.'">'."\n";
+						print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
+						print '</td>';
+					} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
+						if ($action == "" || $action == 'add') {
+							print '<!-- td columns in add mode -->';
 							print '<td>';
-							print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
+							print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
 							print '</td>';
 							print '<td>';
 							// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
@@ -697,129 +716,101 @@ if (empty($reshook_onBeforeView)) {
 							// Also, it is not possible to use a value that is not in the list.
 							// Also, the label is not automatically filled when a value is selected.
 							if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
-								print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+								print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
 							} else {
-								print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
+								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
 							}
-							// Add also input for subledger label
-							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
-							print '</td>';
-							print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
-							print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
-							print '<td class="right"><input type="text" size="6" class="right" name="credit" value="'.(GETPOSTISSET("credit") ? GETPOST("credit", "alpha") : price($line->credit)).'"></td>';
-							print '<td>';
-							print '<input type="hidden" name="id" value="'.$line->id.'">'."\n";
-							print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
-							print '</td>';
-						} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
-							if ($action == "" || $action == 'add') {
-								print '<!-- td columns in add mode -->';
-								print '<td>';
-								print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, 'minwidth200 maxwidth500');
-								print '</td>';
-								print '<td>';
-								// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
-								// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
-								// Also, it is not possible to use a value that is not in the list.
-								// Also, the label is not automatically filled when a value is selected.
-								if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
-									print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
-								} else {
-									print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
-								}
-								print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
-								print '</td>';
-								print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
-								print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
-								print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
-								print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>';
-							}
-						} else {
-							print '<!-- td columns in display mode -->';
-							$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
-							print '<td>';
-							if ($resultfetch > 0) {
-								print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
-							} else {
-								print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
-							}
-							print '</td>';
-							print '<td>'.length_accounta($line->subledger_account);
-							if ($line->subledger_label) {
-								print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
-							}
-							print '</td>';
-							print '<td>'.$line->label_operation.'</td>';
-							print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
-							print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
-
-							print '<td class="center nowraponall">';
-							if (empty($line->date_export) && empty($line->date_validation)) {
-								print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
-								print img_edit('', 0, 'class="marginrightonly"');
-								print '</a> &nbsp;';
-							} else {
-								print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
-								print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
-								print '</a> &nbsp;';
-							}
-
-							if (empty($line->date_validation)) {
-								$actiontodelete = 'delete';
-								if ($mode == '_tmp' || $action != 'delmouv') {
-									$actiontodelete = 'confirm_delete';
-								}
-
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
-								print img_delete();
-								print '</a>';
-							} else {
-								print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
-								print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
-								print '</a>';
-							}
-
+							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
 							print '</td>';
+							print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
+							print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
+							print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
+							print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>';
 						}
-						print "</tr>\n";
-					}
-
-					$total_debit = price2num($total_debit, 'MT');
-					$total_credit = price2num($total_credit, 'MT');
-
-					if ($total_debit != $total_credit) {
-						setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
-					}
-
-					print '</table>';
-					print '</div>';
-
-					if ($mode == '_tmp' && $action == '') {
-						print '<br>';
-						print '<div class="center">';
-						if ($total_debit == $total_credit) {
-							print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
+					} else {
+						print '<!-- td columns in display mode -->';
+						$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
+						print '<td>';
+						if ($resultfetch > 0) {
+							print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
 						} else {
-							print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
+							print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
+						}
+						print '</td>';
+						print '<td>'.length_accounta($line->subledger_account);
+						if ($line->subledger_label) {
+							print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
+						}
+						print '</td>';
+						print '<td>'.$line->label_operation.'</td>';
+						print '<td class="right nowraponall amount">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
+						print '<td class="right nowraponall amount">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
+
+						print '<td class="center nowraponall">';
+						if (empty($line->date_export) && empty($line->date_validation)) {
+							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+							print img_edit('', 0, 'class="marginrightonly"');
+							print '</a> &nbsp;';
+						} else {
+							print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+							print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
+							print '</a> &nbsp;';
 						}
 
-						print ' &nbsp; ';
-						print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+						if (empty($line->date_validation)) {
+							$actiontodelete = 'delete';
+							if ($mode == '_tmp' || $action != 'delmouv') {
+								$actiontodelete = 'confirm_delete';
+							}
 
-						print "</div>";
+							print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+							print img_delete();
+							print '</a>';
+						} else {
+							print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+							print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
+							print '</a>';
+						}
+
+						print '</td>';
 					}
+					print "</tr>\n";
 				}
 
-				print '</form>';
+				$total_debit = price2num($total_debit, 'MT');
+				$total_credit = price2num($total_credit, 'MT');
+
+				if ($total_debit != $total_credit) {
+					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
+				}
+
+				print '</table>';
+				print '</div>';
+
+				if ($mode == '_tmp' && $action == '') {
+					print '<br>';
+					print '<div class="center">';
+					if ($total_debit == $total_credit) {
+						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
+					} else {
+						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
+					}
+
+					print ' &nbsp; ';
+					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+
+					print "</div>";
+				}
 			}
-		} else {
-			print load_fiche_titre($langs->trans("NoRecords"));
+
+			print '</form>';
 		}
+	} else {
+		print load_fiche_titre($langs->trans("NoRecords"));
 	}
 }
-$reshook_onAfterView = $hookmanager->executeHooks('onAfterView', $parameters, $object, $action);
 
-print dol_get_fiche_end();
+	print dol_get_fiche_end();
 
 // End of page
 llxFooter();

From 884cc5bd554a76a8c65a82c552bf09e803320e9f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:18:06 +0100
Subject: [PATCH 1738/1862] Fix: Initilialise $out to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index d0efa85599e..9c512bfc047 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1491,6 +1491,7 @@ if ($action == 'create') {
 				print '<td colspan="3">';
 				// List of files
 				$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+				$out = '';
 
 				// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
 				$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";

From ef6b5940015bd2454e134ef166d6ace95f331e96 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:19:28 +0100
Subject: [PATCH 1739/1862] Fix: Initilialise $amount_ttc_diff to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 7296c3dd820..86898548291 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1573,6 +1573,7 @@ if (empty($reshook)) {
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc;
 								}
 
+								$amount_ttc_diff = 0.;
 								foreach ($TTotalByTva as $tva => &$total) {
 									$coef = $total / $srcobject->total_ttc; // Calc coef
 									$am = $amount * $coef;

From 935f788774e8ae385f063768720773db1669c1b3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:20:44 +0100
Subject: [PATCH 1740/1862] Fix: Initilialise $total_ttc to fix
 PhanUndeclaredVariableAssignOp

---
 htdocs/compta/paiement_vat.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index af4e1463ae3..ecb946e6686 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -253,6 +253,7 @@ if ($action == 'create') {
 
 	$total = 0;
 	$totalrecu = 0;
+	$total_ttc = 0.;
 
 	while ($i < $num) {
 		$objp = $tva;

From 707e0dbd8769047b1becc03a0843d879f03b91aa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:21:45 +0100
Subject: [PATCH 1741/1862] Fix: Update initial assing to $sql to fix
 PhanUndeclaredVariableAssignOp

---
 htdocs/core/actions_extrafields.inc.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index affca98a90d..61b31bfb5fd 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -172,19 +172,19 @@ if ($action == 'add') {
 				//In sellist we have only one line and it can have come to do SQL expression
 				if ($type == 'sellist' || $type == 'chkbxlst') {
 					foreach ($parameters_array as $param_ligne) {
-						$params['options'] = array($parameters=>null);
+						$params['options'] = array($parameters => null);
 					}
 				} else {
 					// Else it's separated key/value and coma list
 					foreach ($parameters_array as $param_ligne) {
-						if (strpos($param_ligne, ',')!==false) {
+						if (strpos($param_ligne, ',') !== false) {
 							list($key, $value) = explode(',', $param_ligne);
 							if (!array_key_exists('options', $params)) {
 								$params['options'] = array();
 							}
 						} else {
-							$key=$param_ligne;
-							$value=null;
+							$key = $param_ligne;
+							$value = null;
 						}
 						$params['options'][$key] = $value;
 					}
@@ -345,7 +345,7 @@ if ($action == 'update') {
 				//In sellist we have only one line and it can have come to do SQL expression
 				if ($type == 'sellist' || $type == 'chkbxlst') {
 					foreach ($parameters_array as $param_ligne) {
-						$params['options'] = array($parameters=>null);
+						$params['options'] = array($parameters => null);
 					}
 				} else {
 					//Else it's separated key/value and coma list
@@ -447,7 +447,7 @@ if ($action == 'encrypt') {
 					if ($extrafields->attributes[$elementtype]['entityid'][$attributekey] == $conf->entity || empty($extrafields->attributes[$elementtype]['entityid'][$attributekey])) {
 						dol_syslog("Loop on each extafields of table ".$arrayofelement['table_element']);
 
-						$sql .= "SELECT te.rowid, te.".$attributekey;
+						$sql  = "SELECT te.rowid, te.".$attributekey;
 						$sql .= " FROM ".MAIN_DB_PREFIX.$arrayofelement['table_element']." as t, ".MAIN_DB_PREFIX.$arrayofelement['table_element'].'_extrafields as te';
 						$sql .= " WHERE te.fk_object = t.rowid";
 						$sql .= " AND te.".$attributekey." NOT LIKE 'dolcrypt:%'";
@@ -462,7 +462,7 @@ if ($action == 'encrypt') {
 						$resql = $db->query($sql);
 						if ($resql) {
 							$num_rows = $db->num_rows($resql);
-							$i=0;
+							$i = 0;
 							while ($i < $num_rows) {
 								$objtmp = $db->fetch_object($resql);
 								$id = $objtmp->rowid;

From cf952d3fdeebb9527024e515bbc59df013e06405 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:23:37 +0100
Subject: [PATCH 1742/1862] Fix: Initialise $fieldtocount to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 9498ed91d9c..d6e4f788500 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -390,6 +390,7 @@ if ($action == 'viewgraph') {
 // Get all possible values of fields when a 'group by' is set, and save this into $arrayofvaluesforgroupby
 // $arrayofvaluesforgroupby will be used to forge lael of each grouped series
 if (is_array($search_groupby) && count($search_groupby)) {
+	$fieldtocount = '';
 	foreach ($search_groupby as $gkey => $gval) {
 		$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
 

From 0b16a0618e1e60ca271f2f1e0cc75a83fb8f3b7f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:56:59 +0100
Subject: [PATCH 1743/1862] Fix: Initialise $logouthtmltext to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 28434f7d405..a8828f8c456 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -88,6 +88,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
 }
 
 $logouttext = '';
+$logouthtmltext = '';
 if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	//$logouthtmltext=$appli.'<br>';
 	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {

From a34798c8328072b1af076f88b11a6378cfe708dd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:57:50 +0100
Subject: [PATCH 1744/1862] Fix: Initialise $toprightmenu to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index a8828f8c456..2b5fc8f69d4 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -89,6 +89,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
 
 $logouttext = '';
 $logouthtmltext = '';
+$toprightmenu = '';
 if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	//$logouthtmltext=$appli.'<br>';
 	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {

From bee172c4b762bde8dd4e876026d41c71a5c72d0f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:00:51 +0100
Subject: [PATCH 1745/1862] Fix: Initialise $x to fix
 PhanUndeclaredVariableAssignOp & optimize

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

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index cfe406a7684..36cb26e4b6d 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1589,8 +1589,9 @@ function check_value($mask, $value)
 function binhex($bin, $pad = false, $upper = false)
 {
 	$last = dol_strlen($bin) - 1;
+	$x = 0;
 	for ($i = 0; $i <= $last; $i++) {
-		$x += $bin[$last - $i] * pow(2, $i);
+		$x += ($bin[$last - $i] ? 1 : 0) << $i;
 	}
 	$x = dechex($x);
 	if ($pad) {

From 83f2282517d46bfce976c55fd8390e75b4c6ec0b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:04:36 +0100
Subject: [PATCH 1746/1862] Fix: Initialise $bookmarkList to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/core/multicompany_page.php b/htdocs/core/multicompany_page.php
index 864dd76cc3d..9286e3efaaa 100644
--- a/htdocs/core/multicompany_page.php
+++ b/htdocs/core/multicompany_page.php
@@ -91,7 +91,9 @@ print '<body>'."\n";
 print '<div>';
 //print '<br>';
 
-
+if (!isset($bookmarkList)) {
+	$bookmarkList = '';
+}
 if (!isModEnabled('multicompany')) {
 	$langs->load("admin");
 	$bookmarkList .= '<br><span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("MultiCompany")).'</span>';
@@ -128,7 +130,7 @@ if (!isModEnabled('multicompany')) {
 
 
 	// Execute hook printBookmarks
-	$parameters = array('multicompany'=>$multicompanyList);
+	$parameters = array('multicompany' => $multicompanyList);
 	$reshook = $hookmanager->executeHooks('printMultiCompanyEntities', $parameters); // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook)) {
 		$multicompanyList .= $hookmanager->resPrint;

From a5d16b326b0e68b82fbd0651a15e5c00dbca5b64 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:06:35 +0100
Subject: [PATCH 1747/1862] Fix: Initialise $amount_ttc_diff to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 97f21ccb533..db8b2f6c8e6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1172,6 +1172,7 @@ if (empty($reshook)) {
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc;
 								}
 
+								$amount_ttc_diff = 0.;
 								foreach ($TTotalByTva as $tva => &$total) {
 									$coef = $total / $srcobject->total_ttc; // Calc coef
 									$am = $amount * $coef;

From 3c49c976bfa4385df88b864deb48ad4ab9270d44 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:08:16 +0100
Subject: [PATCH 1748/1862] Fix: Initialise $moreforfilter to fix
 PhanUndeclaredVariableAssignOp

---
 htdocs/intracommreport/list.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 3611ae2c51e..132163b1f89 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -113,20 +113,20 @@ else $result=restrictedArea($user, 'produit|service', '', '', '', '', '', $objca
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'i.ref'=>"Ref",
-	'pfi.ref_fourn'=>"RefSupplier",
-	'i.label'=>"ProductLabel",
-	'i.description'=>"Description",
-	"i.note"=>"Note",
+	'i.ref' => "Ref",
+	'pfi.ref_fourn' => "RefSupplier",
+	'i.label' => "ProductLabel",
+	'i.description' => "Description",
+	"i.note" => "Note",
 );
 
 $isInEEC = isInEEC($mysoc);
 
 // Definition of fields for lists
 $arrayfields = array(
-	'i.ref' => array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'i.label' => array('label'=>$langs->trans("Label"), 'checked'=>1),
-	'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(isModEnabled("product") && isModEnabled("service"))),
+	'i.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+	'i.label' => array('label' => $langs->trans("Label"), 'checked' => 1),
+	'i.fk_product_type' => array('label' => $langs->trans("Type"), 'checked' => 0, 'enabled' => (isModEnabled("product") && isModEnabled("service"))),
 );
 
 /*
@@ -360,7 +360,7 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'generate_doc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 	//'presend'=>$langs->trans("SendByMail"),
 );
@@ -415,6 +415,9 @@ if ($search_all) {
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+if (!isset($moreforfilter)) {
+	$moreforfilter = '';
+}
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -470,7 +473,7 @@ if (!empty($arrayfields['customerorsupplier']['checked'])) {
 
 if (!empty($arrayfields['i.fk_product_type']['checked'])) {
 	print '<td class="liste_titre left">';
-	$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+	$array = array('-1' => '&nbsp;', '0' => $langs->trans('Product'), '1' => $langs->trans('Service'));
 	print $form->selectarray('search_type', $array, $search_type);
 	print '</td>';
 }
@@ -480,7 +483,7 @@ if (!empty($arrayfields['i.fk_product_type']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 */
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
@@ -532,7 +535,7 @@ if (!empty($arrayfields['i.fk_product_type']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 */
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['i.datec']['checked'])) {

From f99f86284382704eed058b2e94e63c83ee08dccc Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:10:27 +0100
Subject: [PATCH 1749/1862] Fix: Initialise $choixdate to fix
 PhanUndeclaredVariableAssignOp + minor optimisation

---
 htdocs/opensurvey/wizard/choix_date.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 3eca1f0e68f..ff15655c5ff 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -38,6 +38,7 @@ $_SESSION["formatsondage"] = "D";
 
 $erreur = false;
 $erreurNbchoice = 0;
+$choixdate = '';
 
 /*
  * Actions
@@ -178,7 +179,7 @@ if (GETPOST('confirmation')) {
 
 	// Add survey into database
 	if (!$erreur && $erreurNb == 0) {
-		$_SESSION["toutchoix"] = substr("$choixdate", 1);
+		$_SESSION["toutchoix"] = substr($choixdate, 1);
 		unset($_SESSION["nbrecaseshoraires"]);
 
 		ajouter_sondage();

From ad96eb00a8a2d9a5371b641a68150b678b334c5b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:12:11 +0100
Subject: [PATCH 1750/1862] Fix: Initialise $textlate to fix
 PhanUndeclaredVariableAssignOp

---
 htdocs/partnership/partnership_list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 327b8e7988e..ccbda2e2e62 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -862,6 +862,7 @@ $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
+$textlate = '';
 while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {

From d2568a0878922e46299a025af531fc2d4a8ddd4e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:25:09 +0100
Subject: [PATCH 1751/1862] Qual: Enable PhanUndeclaredVariableAssignOp

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 1d8a2f6f467..21d410a9665 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -497,7 +497,7 @@ return [
 		// 'PhanTypeMismatchDimAssignment',
 		// 'PhanPluginDescriptionlessCommentOnProtectedMethod',
 		// 'PhanPluginPrintfIncompatibleArgumentTypeWeak',
-		'PhanUndeclaredVariableAssignOp',
+		// 'PhanUndeclaredVariableAssignOp',
 		// 'PhanTypeExpectedObjectOrClassName',
 		'PhanEmptyFQSENInClasslike',
 		// 'PhanTypeMismatchArgumentInternalReal',

From 3d61fbf4f2b47b574d00802b5e9a569947fe922b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:14:08 +0100
Subject: [PATCH 1752/1862] Fix: Initialise $errmsg to fix
 PhanUndeclaredVariableAssignOp

---
 htdocs/public/project/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 7d5df469aac..60c91239254 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -59,6 +59,7 @@ $langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
 
+$errmsg = '';
 $action = GETPOST('action', 'aZ09');
 $id = GETPOSTINT('id');
 $securekeyreceived = GETPOST("securekey", 'alpha');

From 449cb7758df8ccd89fed99c2262792577307c149 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:14:47 +0100
Subject: [PATCH 1753/1862] Fix: Initialise $errmsg to fix
 PhanUndeclaredVariableAssignOp

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

diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index c436a2ead90..90b56165cc2 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -66,6 +66,7 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
 
+$errmsg = '';
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id');
 $securekeyreceived = GETPOST("securekey");
@@ -172,7 +173,7 @@ if (strlen($idvote)) {
 		// Has not already voted
 		$conforbooth = new ActionComm($db);
 		$resultconforbooth = $conforbooth->fetch($idvote);
-		if ($resultconforbooth<=0) {
+		if ($resultconforbooth <= 0) {
 			$error++;
 			$errmsg .= $conforbooth->error;
 		} else {
@@ -188,11 +189,11 @@ if (strlen($idvote)) {
 			}
 		}
 	}
-	if ($votestatus=="ok") {
+	if ($votestatus == "ok") {
 		setEventMessage($langs->trans("VoteOk"), 'mesgs');
-	} elseif ($votestatus=="ko") {
+	} elseif ($votestatus == "ko") {
 		setEventMessage($langs->trans("AlreadyVoted"), 'warnings');
-	} elseif ($votestatus=="err") {
+	} elseif ($votestatus == "err") {
 		setEventMessage($langs->trans("VoteError"), 'warnings');
 	}
 	header("Refresh:0;url=".dol_buildpath('/public/project/viewandvote.php?id='.$id.'&securekey=', 1).$securekeyreceived);

From bb7eda434231def4a18719c4bf48c35483f4bfea Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:16:35 +0100
Subject: [PATCH 1754/1862] Fix: Initialise $moreforfilter to fix
 PhanUndeclaredVariableAssignOp

Also fix a few PhanUndeclaredGlobalVariable notifications.
---
 htdocs/public/test/test_arrays.php | 59 ++++++++++++++++--------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 71639adc51b..838052dac5b 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -68,27 +68,27 @@ if (empty($usedolheader)) {
 
 	<?php
 } else {
-		$arraycss = array();
-		$arrayjs = array();
-		/*
-		$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
-				'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
-				'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
-		);
-		$arrayjs=array('/includes/jquery/plugins/datatables/media/js/jquery.dataTables.js',
-				'/includes/jquery/plugins/datatables/extensions/Buttons/js/dataTables.buttons.js',
-				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.colVis.min.js',
-				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.html5.min.js',
-				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.flash.min.js',
-				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.print.min.js',
-				'/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js',
-				'/includes/jszip/jszip.min.js',
-				'/includes/pdfmake/pdfmake.min.js',
-				'/includes/pdfmake/vfs_fonts.js'
-		);
-		*/
+	$arraycss = array();
+	$arrayjs = array();
+	/*
+	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
+			'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
+			'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
+	);
+	$arrayjs=array('/includes/jquery/plugins/datatables/media/js/jquery.dataTables.js',
+			'/includes/jquery/plugins/datatables/extensions/Buttons/js/dataTables.buttons.js',
+			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.colVis.min.js',
+			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.html5.min.js',
+			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.flash.min.js',
+			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.print.min.js',
+			'/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js',
+			'/includes/jszip/jszip.min.js',
+			'/includes/pdfmake/pdfmake.min.js',
+			'/includes/pdfmake/vfs_fonts.js'
+	);
+	*/
 
-		llxHeader('', '', '', '', 0, 0, $arrayjs, $arraycss);
+	llxHeader('', '', '', '', 0, 0, $arrayjs, $arraycss);
 }
 
 
@@ -180,6 +180,9 @@ $sortfield = 'aaa';
 $sortorder = 'ASC';
 $tasksarray = array(1, 2, 3); // To force having several lines
 $tagidfortablednd = 'tablelines3';
+if (!isset($moreforfilter)) {
+	$moreforfilter = '';
+}
 if (!empty($conf->use_javascript_ajax)) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 }
@@ -201,10 +204,10 @@ if ($filtert) {
 if ($socid) {
 	$nav .= '<input type="hidden" name="socid" value="'.$socid.'">';
 }
-if ($showbirthday) {
+if (isset($showbirthday) && $showbirthday) {
 	$nav .= '<input type="hidden" name="showbirthday" value="1">';
 }
-if ($pid) {
+if (isset($pid) && $pid) {
 	$nav .= '<input type="hidden" name="projectid" value="'.$pid.'">';
 }
 if ($type) {
@@ -213,7 +216,7 @@ if ($type) {
 if ($usergroup) {
 	$nav .= '<input type="hidden" name="usergroup" value="'.$usergroup.'">';
 }
-$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
+$nav .= $form->selectDate($dateselect ?? '', 'dateselect', 0, 0, 1, '', 1, 0);
 $nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= '</form>';
 
@@ -222,25 +225,25 @@ print_barre_liste('Title of my list', 12, $_SERVER["PHP_SELF"], '', '', '', 'Tex
 
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('This is a select list for a filter A (no combo forced)').': ';
-$cate_arbo = array('field1'=>'value1a into the select list A', 'field2'=>'value2a');
+$cate_arbo = array('field1' => 'value1a into the select list A', 'field2' => 'value2a');
 $moreforfilter .= $form->selectarray('search_aaa', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidth300', 0); // List with no js combo
 $moreforfilter .= '</div>';
 
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('This is a select list for a filter B (auto combo)').': ';
-$cate_arbo = array('field1'=>'value1b into the select list B', 'field2'=>'value2b');
+$cate_arbo = array('field1' => 'value1b into the select list B', 'field2' => 'value2b');
 $moreforfilter .= $form->selectarray('search_bbb', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidth300', -1); // List with js combo auto
 $moreforfilter .= '</div>';
 
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('This is a select list for a filter C (combo forced)').': ';
-$cate_arbo = array('field1'=>'value1c into the select list C', 'field2'=>'value2c');
+$cate_arbo = array('field1' => 'value1c into the select list C', 'field2' => 'value2c');
 $moreforfilter .= $form->selectarray('search_ccc', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidth300', 1); // List with js combo forced
 $moreforfilter .= '</div>';
 
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('This is a select list for a filter D (combo forced)').': ';
-$cate_arbo = array('field1'=>'value1d into the select list D', 'field2'=>'value2d');
+$cate_arbo = array('field1' => 'value1d into the select list D', 'field2' => 'value2d');
 $moreforfilter .= $form->selectarray('search_ddd', $cate_arbo, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidth300', 1); // List with js combo forced
 $moreforfilter .= '</div>';
 
@@ -328,7 +331,7 @@ $(document).ready(function(){
 
 <?php
 	$tasksarray = array(1, 2, 3); // To force having several lines
-	$tagidfortablednd = 'tablelines';
+$tagidfortablednd = 'tablelines';
 if (!empty($conf->use_javascript_ajax)) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 }

From 114f5abd79475bb1be5136ff68330a970e39edb6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:17:17 +0100
Subject: [PATCH 1755/1862] Fix: Initialise $total_ttc to fix
 PhanUndeclaredVariableAssignOp

---
 htdocs/salaries/paiement_salary.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 6e5b19c857e..5f3165ed14b 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -264,6 +264,7 @@ if ($action == 'create') {
 	print "</tr>\n";
 
 	$total = 0;
+	$total_ttc = 0.;
 	$totalrecu = 0;
 
 	while ($i < $num) {

From 751992b030037374f8e4541539e1cdb203a12dfa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:20:16 +0100
Subject: [PATCH 1756/1862] Fix: Initialise
 $quantityToBeDelivered,$htmlforlines to fix PhanUndeclaredVariableAssignOp

---
 htdocs/takepos/invoice.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index a1d1f03cb54..f9d7e96cb4f 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -567,6 +567,7 @@ if (empty($reshook)) {
 				echo "</script>";
 
 				if ($nbofsuggested > 0) {
+					$quantityToBeDelivered = 0;
 					echo "<center>".$langs->trans("SearchIntoBatch").": <b> $nbofsuggested </b></center><br><table>";
 					foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
 						$batchStock = + $dbatch->qty; // To get a numeric
@@ -1604,6 +1605,7 @@ if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorie = new Categorie($db);
 		$categories = $categorie->get_full_arbo('product');
+		$htmlforlines = '';
 		foreach ($categories as $row) {
 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 				$htmlforlines .= '<div class="leftcat"';

From 31482901d230768003881ac4419d83a0c05ffd58 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:54:05 +0100
Subject: [PATCH 1757/1862] Fix PhanPossiblyUndeclaredGlobalVariable and
 PhanPossiblyUndeclaredGlobalVariable

---
 htdocs/compta/prelevement/factures.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 1fe40efa05e..d100cf59961 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -274,10 +274,10 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
+	$param = "&id=".$id;
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.((int) $limit);
 	}
-	$param = "&id=".urlencode((string) ($id));
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -325,10 +325,14 @@ if ($resql) {
 
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
-		if ($salaryBonPl) {
+		$itemurl = '';
+		$partyurl = '';
+		if ($salaryBonPl && ($salarytmp instanceof Salary) && ($user instanceof User)) {
 			$salarytmp->fetch($obj->salaryid);
 			$usertmp->fetch($obj->userid);
-		} else {
+			$itemurl = $salarytmp->getNomUrl(1);
+			$partyurl = $usertmp->getNomUrl(1);
+		} elseif ($invoicetmp instanceof Facture && $invoicetmpsupplier instanceof FactureFournisseur) {
 			if ($obj->type == 'bank-transfer') {
 				$invoicetmp = $invoicetmpsupplier;
 			} else {
@@ -337,22 +341,24 @@ if ($resql) {
 			$invoicetmp->fetch($obj->facid);
 
 			$thirdpartytmp->fetch($obj->socid);
+			$itemurl = $invoicetmp->getNomUrl(1);
+			$partyurl = $thirdpartytmp->getNomUrl(1);
 		}
 
 		print '<tr class="oddeven">';
 
 		print '<td class="nowraponall">';
-		print($salaryBonPl ? $salarytmp->getNomUrl(1) : $invoicetmp->getNomUrl(1));
+		print $itemurl;
 		print "</td>\n";
 
-		if ($object->type == 'bank-transfer' && !$salaryBonPl) {
+		if ($object->type == 'bank-transfer' && !$salaryBonPl && $invoicetmp instanceof Facture) {
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($invoicetmp->ref_supplier).'">';
 			print dol_escape_htmltag($invoicetmp->ref_supplier);
 			print "</td>\n";
 		}
 
 		print '<td class="tdoverflowmax125">';
-		print($salaryBonPl ? $usertmp->getNomUrl(-1) : $thirdpartytmp->getNomUrl(1));
+		print $partyurl;
 		print "</td>\n";
 
 		// Amount of invoice

From c5b62a4a73631999e7183273266aa43345861815 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:55:03 +0100
Subject: [PATCH 1758/1862] Add typing to fix PhanTypeMismatchDimFetch

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2cc21fb215d..e3a3eb07439 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -83,6 +83,9 @@ class BonPrelevement extends CommonObject
 
 	public $factures = array();
 
+	/**
+	 * @var array<int,string>
+	 */
 	public $methodes_trans = array();
 
 	public $invoice_in_error = array();
@@ -171,6 +174,9 @@ class BonPrelevement extends CommonObject
 	public $credite;
 	public $note;
 	public $date_trans;
+	/**
+	 * @var int Current transport method, index to $methodes_trans
+	 */
 	public $method_trans;
 	public $fk_user_trans;
 	public $date_credit;

From 33680415871f97af621095c1503ef7af131c24c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 14:04:10 +0100
Subject: [PATCH 1759/1862] Fix filter

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

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 13a119e35b5..63e01dac397 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -91,7 +91,7 @@ $search_date_when_endmonth = GETPOSTINT('search_date_when_endmonth');
 $search_date_when_endyear = GETPOSTINT('search_date_when_endyear');
 $search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);	// Use tzserver
 $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
-$search_recurring = GETPOSTINT('search_recurring');
+$search_recurring = GETPOST('search_recurring', 'intcomma');
 $search_frequency = GETPOST('search_frequency', 'alpha');
 $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'alpha');

From 9913778da0cd573c2f95718c4cb7a8370503918a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 18 Mar 2024 14:04:51 +0100
Subject: [PATCH 1760/1862] fix migration for postgresql  19.0.0 -> 20.0.0

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index cbbb6d34cdc..170f02a9ec1 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -227,8 +227,10 @@ ALTER TABLE llx_product ADD COLUMN last_main_doc varchar(255);
 
 ALTER TABLE llx_knowledgemanagement_knowledgerecord MODIFY COLUMN answer longtext;
 
-ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME llx_receptiondet_batch_extrafields;
-ALTER TABLE llx_commande_fournisseur_dispatch RENAME llx_receptiondet_batch;
+-- VMYSQL4.3 ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME llx_receptiondet_batch_extrafields;
+-- VMYSQL4.3 ALTER TABLE llx_commande_fournisseur_dispatch RENAME llx_receptiondet_batch;
+-- VPGSQL8.2 ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME TO llx_receptiondet_batch_extrafields;
+-- VPGSQL8.2 ALTER TABLE llx_commande_fournisseur_dispatch RENAME TO llx_receptiondet_batch;
 
 -- Rename const to add customer categories on not customer/prospect third-party if enabled
 UPDATE llx_const SET name = 'THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT' WHERE name = 'THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER';

From 1783d68fd4aa9542a4a58006c642287d2021e23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 18 Mar 2024 14:10:55 +0100
Subject: [PATCH 1761/1862] Update pgsql.class.php

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

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index a76fbfb6857..ecb9b0f0df9 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -724,7 +724,7 @@ class DoliDBPgsql extends DoliDB
 	 */
 	public function escape($stringtoencode)
 	{
-		return pg_escape_string($stringtoencode);
+		return pg_escape_string($this->db, $stringtoencode);
 	}
 
 	/**

From 6640354e79ad6b2b3abed9f16daa50136b1ee84b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 14:32:59 +0100
Subject: [PATCH 1762/1862] Move to use the english key name ofmodule

---
 htdocs/admin/workflow.php               |  2 +-
 htdocs/core/lib/functions.lib.php       |  6 ++--
 htdocs/core/menus/init_menu_auguria.sql | 38 ++++++++++++-------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 648f7706ad9..d68b7c054ef 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -158,7 +158,7 @@ $workflowcodes = array(
 	'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
 		'family' => 'classify_shipping',
 		'position' => 90,
-		'enabled' => isModEnabled("expedition") && isModEnabled("facture"),
+		'enabled' => isModEnabled("shipping") && isModEnabled("invoice"),
 		'picto' => 'shipment',
 		'deprecated' => 1
 	),
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7554f5e5851..bb5abcf9f4c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11765,9 +11765,9 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param string 		$actionType 	'default', 'danger', 'email', 'clone', 'cancel', 'delete', ...
  * @param string|array 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )
  * 										Example when an array is used: $arrayforbutaction = array(
- *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
- *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("commande"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
- *                                      30 => array('lang'=>'bills', 'enabled'=>isModEnabled("facture"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("proposal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                      30 => array('lang'=>'bills', 'enabled'=>isModEnabled("invoice"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *										);
  * @param string    	$id         	Attribute id of action button. Example 'action-delete'. This can be used for full ajax confirm if this code is reused into the ->formconfirm() method.
  * @param int|boolean	$userRight  	User action right
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index e661fb3db4c..d177030b841 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -18,7 +18,7 @@ insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, left
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values ( 16__+MAX_llx_menu__, 'bom|mrp', 'isModEnabled("bom") || isModEnabled("mrp")', __HANDLER__, 'top', 'mrp',    '', 0, '/mrp/index.php?mainmenu=mrp&amp;leftmenu=', 'TMenuMRP', -1, 'mrp', '$user->hasRight("bom","read") || $user->hasRight("mrp","read")', '', 0, 31, __ENTITY__, '<span class="fas fa-cubes fa-fw pictofixedwidth" style=" color: #a69944;"></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  7__+MAX_llx_menu__, 'projet', 'isModEnabled("project")', __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->hasRight("projet","lire")', '', 2, 32, __ENTITY__, '<span class="fas fa-project-diagram  em088 infobox-project fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  5__+MAX_llx_menu__, 'propal|commande|fournisseur|supplier_order|supplier_invoice|contrat|ficheinter', 'isModEnabled("propal") || isModEnabled("commande") || isModEnabled("supplier_order") || isModEnabled("contrat") || isModEnabled("ficheinter")', __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->hasRight("societe","lire") || $user->hasRight("societe","contact","lire")', '', 2, 40, __ENTITY__, '<span class="fas fa-suitcase  em092 infobox-contrat fa-fw pictofixedwidth" style=""></span>');
-insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  6__+MAX_llx_menu__, 'facture|don|tax|salaries|loan|banque', 'isModEnabled("comptabilite") || isModEnabled("accounting") || isModEnabled("facture") || isModEnabled("don")  || isModEnabled("tax") || isModEnabled("salaries") || isModEnabled("supplier_invoice") || isModEnabled("loan") || isModEnabled("banque")', __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->hasRight("facture","lire") || $user->hasRight("don","lire") || $user->hasRight("tax","charges","lire") || $user->hasRight("salaries","read") || $user->hasRight("loan","read") || $user->hasRight("banque","lire") || $user->hasRight("fournisseur","facture","lire") || $user->hasRight("supplier_invoice","read")', '', 2, 50, __ENTITY__, '<span class="fas fa-file-invoice-dollar infobox-commande fa-fw pictofixedwidth" style=""></span>');
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  6__+MAX_llx_menu__, 'facture|don|tax|salaries|loan|banque', 'isModEnabled("comptabilite") || isModEnabled("accounting") || isModEnabled("invoice") || isModEnabled("don")  || isModEnabled("tax") || isModEnabled("salaries") || isModEnabled("supplier_invoice") || isModEnabled("loan") || isModEnabled("banque")', __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->hasRight("facture","lire") || $user->hasRight("don","lire") || $user->hasRight("tax","charges","lire") || $user->hasRight("salaries","read") || $user->hasRight("loan","read") || $user->hasRight("banque","lire") || $user->hasRight("fournisseur","facture","lire") || $user->hasRight("supplier_invoice","read")', '', 2, 50, __ENTITY__, '<span class="fas fa-file-invoice-dollar infobox-commande fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values ( 14__+MAX_llx_menu__, 'banque|prelevement', 'isModEnabled("banque") || isModEnabled("prelevement")', __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->hasRight("banque","lire") || $user->hasRight("prelevement","bons","lire")', '', 0, 52, __ENTITY__, '<span class="fas fa-university infobox-bank_account fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  9__+MAX_llx_menu__, 'comptabilite|accounting|asset', 'isModEnabled("comptabilite") || isModEnabled("accounting") || isModEnabled("asset")', __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', -1, 'main', '$user->hasRight("compta","resultat","lire") || $user->hasRight("accounting","mouvements","lire") || $user->hasRight("asset","read")', '', 2, 54, __ENTITY__, '<span class="fas fa-search-dollar infobox-bank_account fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  8__+MAX_llx_menu__, '', '', __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__, '<span class="fas fa-tools fa-fw pictofixedwidth" style=""></span>');
@@ -231,23 +231,23 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("supplier_invoice")', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?mainmenu=billing&amp;leftmenu=customers_bills_stats&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
 
 -- Billing - Customer invoice
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'billing', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?mainmenu=billing&amp;action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'billing', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?mainmenu=billing&amp;action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1720__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_draft&amp;search_status=0', 'BillShortStatusDraft', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1721__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_notpaid&amp;search_status=1', 'BillShortStatusNotPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1722__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_paid&amp;search_status=2', 'BillShortStatusPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1723__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_canceled&amp;search_status=3', 'BillShortStatusCanceled', 2, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1720__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_draft&amp;search_status=0', 'BillShortStatusDraft', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1721__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_notpaid&amp;search_status=1', 'BillShortStatusNotPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1722__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_paid&amp;search_status=2', 'BillShortStatusPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1723__+MAX_llx_menu__, 'billing', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills_canceled&amp;search_status=3', 'BillShortStatusCanceled', 2, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/invoicetemplate_list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/invoicetemplate_list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'ListOfTemplates', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'billing', 'customers_bills_payment', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?mainmenu=billing&amp;leftmenu=customers_bills_payment', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'billing', 'customers_bills_reports', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?mainmenu=billing&amp;leftmenu=customers_bills_reports', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("facture")', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?mainmenu=billing&amp;leftmenu=customers_bills_stats', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'billing', 'customers_bills_payment', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?mainmenu=billing&amp;leftmenu=customers_bills_payment', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'billing', 'customers_bills_reports', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?mainmenu=billing&amp;leftmenu=customers_bills_reports', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("invoice")', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?mainmenu=billing&amp;leftmenu=customers_bills_stats', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
 
 -- Billing - Orders to bill
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("commande")', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'billing', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?mainmenu=billing&amp;leftmenu=orders&amp;search_status=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("order")', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'billing', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?mainmenu=billing&amp;leftmenu=orders&amp;search_status=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
 
 -- Donations
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("don")', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'billing', 'donations', 6__+MAX_llx_menu__, '/don/index.php?mainmenu=billing&amp;leftmenu=donations', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__);
@@ -316,9 +316,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period',       2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
 
 -- Binding
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("facture") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("facture") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 3, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("facture") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("supplier_invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_supplier', 2400__+MAX_llx_menu__, '/accountancy/supplier/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier', 'SuppliersVentilation', 1, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("supplier_invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && isModEnabled("supplier_invoice") && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->hasRight("accounting","bind","write")', '', 0, 7, __ENTITY__);
@@ -379,9 +379,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("asset") && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->hasRight("asset","model_advance","read"):$user->hasRight("asset","read"))', '', 0, 25, __ENTITY__);
 
 -- Check deposit
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled("banque") && (isModEnabled("facture") || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?mainmenu=bank&amp;leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->hasRight("banque","lire")', '', 2, 9, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled("banque") && (isModEnabled("facture") || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?mainmenu=bank&amp;leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->hasRight("banque","lire")', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled("banque") && (isModEnabled("facture") || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?mainmenu=bank&amp;leftmenu=checks', 'List', 1, 'bills', '$user->hasRight("banque","lire")', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled("bank") && (isModEnabled("invoice") || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?mainmenu=bank&amp;leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->hasRight("banque","lire")', '', 2, 9, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled("bank") && (isModEnabled("invoice") || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?mainmenu=bank&amp;leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->hasRight("banque","lire")', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled("bank") && (isModEnabled("invoice") || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?mainmenu=bank&amp;leftmenu=checks', 'List', 1, 'bills', '$user->hasRight("banque","lire")', '', 2, 1, __ENTITY__);
 
 -- PaymentByDirectDebit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("prelevement")', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?mainmenu=bank&amp;leftmenu=withdraw', 'PaymentByDirectDebit', 0, 'withdrawals', '$user->hasRight("prelevement","bons","lire")', '', 2, 9, __ENTITY__);

From 90882d46b2532beff42b1d87add039af46551dc8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 14:36:09 +0100
Subject: [PATCH 1763/1862] Update factures.php

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

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index d100cf59961..1dc1fd3d76d 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -274,7 +274,7 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$param = "&id=".$id;
+	$param = "&id=".((int) $id);
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.((int) $limit);
 	}

From d73d27466bbd4a8592173d683f95fb861e8e63c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 14:40:47 +0100
Subject: [PATCH 1764/1862] Update 19.0.0-20.0.0.sql

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 170f02a9ec1..acd230f65cb 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -5,7 +5,7 @@
 --
 -- 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 rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new; -- Note that "RENAME TO" is both compatible mysql/postgesql, not "RENAME" alone.
 -- 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;
@@ -227,10 +227,8 @@ ALTER TABLE llx_product ADD COLUMN last_main_doc varchar(255);
 
 ALTER TABLE llx_knowledgemanagement_knowledgerecord MODIFY COLUMN answer longtext;
 
--- VMYSQL4.3 ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME llx_receptiondet_batch_extrafields;
--- VMYSQL4.3 ALTER TABLE llx_commande_fournisseur_dispatch RENAME llx_receptiondet_batch;
--- VPGSQL8.2 ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME TO llx_receptiondet_batch_extrafields;
--- VPGSQL8.2 ALTER TABLE llx_commande_fournisseur_dispatch RENAME TO llx_receptiondet_batch;
+ALTER TABLE llx_commande_fournisseur_dispatch_extrafields RENAME TO llx_receptiondet_batch_extrafields;
+ALTER TABLE llx_commande_fournisseur_dispatch RENAME TO llx_receptiondet_batch;
 
 -- Rename const to add customer categories on not customer/prospect third-party if enabled
 UPDATE llx_const SET name = 'THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT' WHERE name = 'THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER';

From 034ce8cb98ac13c01f8fb35eba62c5e37e8626fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 14:44:18 +0100
Subject: [PATCH 1765/1862] Fix trans key code

---
 htdocs/core/lib/emaillayout.lib.php | 4 ++--
 htdocs/langs/en_US/mails.lang       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/emaillayout.lib.php b/htdocs/core/lib/emaillayout.lib.php
index 9ae359f26df..75b7b589c44 100644
--- a/htdocs/core/lib/emaillayout.lib.php
+++ b/htdocs/core/lib/emaillayout.lib.php
@@ -43,10 +43,10 @@ function getHtmlOfLayout($name)
 		} else {
 			$out .= '<img alt="Gray rectangle" width="100px" height="100px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAIAAABM5OhcAAABGklEQVR4nO3SwQ3AIBDAsNLJb3SWIEJC9gR5ZM3MB6f9twN4k7FIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIvEBtxYAkgpLmAeAAAAAElFTkSuQmCC" />';
 		}
-		$out .= '</div> 
+		$out .= '</div>
             <h2>'.$langs->trans('TitleOfMailHolder').'</h2>
             <div class="email-template-text">
-            <p>'.$langs->trans('ContentOfMailHOlder').'</p>
+            <p>'.$langs->trans('ContentOfMailHolder').'</p>
             </div>';
 		if (!(empty($user->signature))) {
 			$out .= '<h4><strong>'.dol_htmlentities($user->signature).'</strong></h4>';
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 4160930b410..da25fc5a5f9 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -192,4 +192,4 @@ YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
-ContentOfMailHOlder=Content of email goes here...
\ No newline at end of file
+ContentOfMailHolder=Content of email goes here...

From 72d758e05455f94766dd936a4c5e94a29695811b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 14:56:54 +0100
Subject: [PATCH 1766/1862] Doc

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

diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index db9cb264f7b..c68c6a4f33e 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -139,7 +139,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'ORDER_DELETE':
 			//case 'ORDER_CANCEL':
 			//case 'ORDER_SENTBYMAIL':
-			//case 'ORDER_CLASSIFY_BILLED':
+			//case 'ORDER_CLASSIFY_BILLED':		// TODO Replace it with ORDER_MODIFY
+			//case 'ORDER_CLASSIFY_UNBILLED':	// TODO Replace it with ORDER_MODIFY
 			//case 'ORDER_SETDRAFT':
 			//case 'LINEORDER_INSERT':
 			//case 'LINEORDER_UPDATE':
@@ -151,6 +152,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'ORDER_SUPPLIER_VALIDATE':
 			//case 'ORDER_SUPPLIER_DELETE':
 			//case 'ORDER_SUPPLIER_APPROVE':
+			//case 'ORDER_SUPPLIER_CLASSIFY_BILLED':		// TODO Replace with ORDER_SUPPLIER_MODIFY
+			//case 'ORDER_SUPPLIER_CLASSIFY_UNBILLED':		// TODO Replace with ORDER_SUPPLIER_MODIFY
 			//case 'ORDER_SUPPLIER_REFUSE':
 			//case 'ORDER_SUPPLIER_CANCEL':
 			//case 'ORDER_SUPPLIER_SENTBYMAIL':
@@ -165,6 +168,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'PROPAL_MODIFY':
 			//case 'PROPAL_VALIDATE':
 			//case 'PROPAL_SENTBYMAIL':
+			//case 'PROPAL_CLASSIFY_BILLED':		// TODO Replace it with PROPAL_MODIFY
+			//case 'PROPAL_CLASSIFY_UNBILLED':		// TODO Replace it with PROPAL_MODIFY
 			//case 'PROPAL_CLOSE_SIGNED':
 			//case 'PROPAL_CLOSE_REFUSED':
 			//case 'PROPAL_DELETE':
@@ -240,6 +245,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'FICHINTER_CREATE':
 			//case 'FICHINTER_MODIFY':
 			//case 'FICHINTER_VALIDATE':
+			//case 'FICHINTER_CLASSIFY_BILLED':			// TODO Replace it with FICHINTER_MODIFY
+			//case 'FICHINTER_CLASSIFY_UNBILLED':		// TODO Replace it with FICHINTER_MODIFY
 			//case 'FICHINTER_DELETE':
 			//case 'LINEFICHINTER_CREATE':
 			//case 'LINEFICHINTER_UPDATE':

From b72b38f5d1b6fc29552e103aec60d4679f2caa9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 15:03:41 +0100
Subject: [PATCH 1767/1862] Doc

---
 ...ace_99_modMyModule_MyModuleTriggers.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index c68c6a4f33e..3ab08016799 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -139,8 +139,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'ORDER_DELETE':
 			//case 'ORDER_CANCEL':
 			//case 'ORDER_SENTBYMAIL':
-			//case 'ORDER_CLASSIFY_BILLED':		// TODO Replace it with ORDER_MODIFY
-			//case 'ORDER_CLASSIFY_UNBILLED':	// TODO Replace it with ORDER_MODIFY
+			//case 'ORDER_CLASSIFY_BILLED':		// TODO Replace it with ORDER_BILLED
+			//case 'ORDER_CLASSIFY_UNBILLED':	// TODO Replace it with ORDER_UNBILLED
 			//case 'ORDER_SETDRAFT':
 			//case 'LINEORDER_INSERT':
 			//case 'LINEORDER_UPDATE':
@@ -152,8 +152,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'ORDER_SUPPLIER_VALIDATE':
 			//case 'ORDER_SUPPLIER_DELETE':
 			//case 'ORDER_SUPPLIER_APPROVE':
-			//case 'ORDER_SUPPLIER_CLASSIFY_BILLED':		// TODO Replace with ORDER_SUPPLIER_MODIFY
-			//case 'ORDER_SUPPLIER_CLASSIFY_UNBILLED':		// TODO Replace with ORDER_SUPPLIER_MODIFY
+			//case 'ORDER_SUPPLIER_CLASSIFY_BILLED':		// TODO Replace with ORDER_SUPPLIER_BILLED
+			//case 'ORDER_SUPPLIER_CLASSIFY_UNBILLED':		// TODO Replace with ORDER_SUPPLIER_UNBILLED
 			//case 'ORDER_SUPPLIER_REFUSE':
 			//case 'ORDER_SUPPLIER_CANCEL':
 			//case 'ORDER_SUPPLIER_SENTBYMAIL':
@@ -168,8 +168,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'PROPAL_MODIFY':
 			//case 'PROPAL_VALIDATE':
 			//case 'PROPAL_SENTBYMAIL':
-			//case 'PROPAL_CLASSIFY_BILLED':		// TODO Replace it with PROPAL_MODIFY
-			//case 'PROPAL_CLASSIFY_UNBILLED':		// TODO Replace it with PROPAL_MODIFY
+			//case 'PROPAL_CLASSIFY_BILLED':		// TODO Replace it with PROPAL_BILLED
+			//case 'PROPAL_CLASSIFY_UNBILLED':		// TODO Replace it with PROPAL_UNBILLED
 			//case 'PROPAL_CLOSE_SIGNED':
 			//case 'PROPAL_CLOSE_REFUSED':
 			//case 'PROPAL_DELETE':
@@ -245,8 +245,8 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'FICHINTER_CREATE':
 			//case 'FICHINTER_MODIFY':
 			//case 'FICHINTER_VALIDATE':
-			//case 'FICHINTER_CLASSIFY_BILLED':			// TODO Replace it with FICHINTER_MODIFY
-			//case 'FICHINTER_CLASSIFY_UNBILLED':		// TODO Replace it with FICHINTER_MODIFY
+			//case 'FICHINTER_CLASSIFY_BILLED':			// TODO Replace it with FICHINTER_BILLED
+			//case 'FICHINTER_CLASSIFY_UNBILLED':		// TODO Replace it with FICHINTER_UNBILLED
 			//case 'FICHINTER_DELETE':
 			//case 'LINEFICHINTER_CREATE':
 			//case 'LINEFICHINTER_UPDATE':

From d82729e49d5909cc0f80f87156b87d421acdc70e Mon Sep 17 00:00:00 2001
From: Hystepik <lmarcouiller@nltechno.com>
Date: Mon, 18 Mar 2024 15:11:50 +0100
Subject: [PATCH 1768/1862] New data struture for references field in ticket

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql  |  1 +
 htdocs/install/mysql/tables/llx_ticket-ticket.sql |  1 +
 htdocs/ticket/class/ticket.class.php              | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index acd230f65cb..53502e05197 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -242,6 +242,7 @@ ALTER TABLE llx_ticket ADD COLUMN model_pdf varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN last_main_doc varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN extraparams varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN origin_replyto varchar(128);
+ALTER TABLE llx_ticket ADD COLUMN origin_references mediumtext;
 
 ALTER TABLE llx_expensereport MODIFY COLUMN model_pdf varchar(255) DEFAULT NULL;
 ALTER TABLE llx_fichinter_rec MODIFY COLUMN modelpdf varchar(255) DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_ticket-ticket.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
index cda890c6f69..305b8a1db87 100644
--- a/htdocs/install/mysql/tables/llx_ticket-ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
@@ -26,6 +26,7 @@ CREATE TABLE llx_ticket
 	fk_contract	integer DEFAULT 0,
 	origin_email   varchar(128),
 	origin_replyto   varchar(128),
+	origin_references   mediumtext,
 	fk_user_create	integer,
 	fk_user_assign	integer,
 	subject	varchar(255),
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 3d231680b21..716a75672bb 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -193,6 +193,11 @@ class Ticket extends CommonObject
 	 */
 	public $origin_replyto;
 
+	/**
+	 * References from origin email
+	 */
+	public $origin_references;
+
 	/**
 	 * @var int Creation date
 	 */
@@ -327,7 +332,8 @@ class Ticket extends CommonObject
 		'fk_user_create' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Author', 'visible' => 1, 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'csslist' => 'tdoverflowmax100 maxwidth150onsmartphone'),
 		'origin_email' => array('type' => 'mail', 'label' => 'OriginEmail', 'visible' => -2, 'enabled' => 1, 'position' => 16, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
 		'origin_replyto' => array('type' => 'mail', 'label' => 'EmailReplyto', 'visible' => -2, 'enabled' => 1, 'position' => 17, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Email to reply to", 'csslist' => 'tdoverflowmax150'),
-		'subject' => array('type' => 'varchar(255)', 'label' => 'Subject', 'visible' => 1, 'enabled' => 1, 'position' => 18, 'notnull' => -1, 'searchall' => 1, 'help' => "", 'css' => 'maxwidth200 tdoverflowmax200', 'autofocusoncreate' => 1),
+		'origin_references' => array('type' => 'mediumtext', 'label' => 'EmailReferences', 'visible' => -2, 'enabled' => 1, 'position' => 18, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "References from origin email", 'csslist' => 'tdoverflowmax150'),
+		'subject' => array('type' => 'varchar(255)', 'label' => 'Subject', 'visible' => 1, 'enabled' => 1, 'position' => 19, 'notnull' => -1, 'searchall' => 1, 'help' => "", 'css' => 'maxwidth200 tdoverflowmax200', 'autofocusoncreate' => 1),
 		'type_code' => array('type' => 'varchar(32)', 'label' => 'Type', 'visible' => 1, 'enabled' => 1, 'position' => 20, 'notnull' => -1, 'help' => "", 'csslist' => 'maxwidth125 tdoverflowmax50'),
 		'category_code' => array('type' => 'varchar(32)', 'label' => 'TicketCategory', 'visible' => -1, 'enabled' => 1, 'position' => 21, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100 tdoverflowmax200'),
 		'severity_code' => array('type' => 'varchar(32)', 'label' => 'Severity', 'visible' => 1, 'enabled' => 1, 'position' => 22, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100'),
@@ -518,6 +524,7 @@ class Ticket extends CommonObject
 			$sql .= "fk_contract,";
 			$sql .= "origin_email,";
 			$sql .= "origin_replyto,";
+			$sql .= "origin_references,";
 			$sql .= "fk_user_create,";
 			$sql .= "fk_user_assign,";
 			$sql .= "email_msgid,";
@@ -546,6 +553,7 @@ class Ticket extends CommonObject
 			$sql .= " ".($this->fk_contract > 0 ? $this->db->escape($this->fk_contract) : "null").",";
 			$sql .= " ".(!isset($this->origin_email) ? 'NULL' : "'".$this->db->escape($this->origin_email)."'").",";
 			$sql .= " ".(!isset($this->origin_replyto) ? 'NULL' : "'".$this->db->escape($this->origin_replyto)."'").",";
+			$sql .= " ".(!isset($this->origin_references) ? 'NULL' : "'".$this->db->escape($this->origin_references)."'").",";
 			$sql .= " ".(!isset($this->fk_user_create) ? ($user->id > 0 ? $user->id : 'NULL') : ($this->fk_user_create > 0 ? $this->fk_user_create : 'NULL')).",";
 			$sql .= " ".($this->fk_user_assign > 0 ? $this->fk_user_assign : 'NULL').",";
 			$sql .= " ".(empty($this->email_msgid) ? 'NULL' : "'".$this->db->escape($this->email_msgid)."'").",";
@@ -672,6 +680,7 @@ class Ticket extends CommonObject
 		$sql .= " t.fk_contract,";
 		$sql .= " t.origin_email,";
 		$sql .= " t.origin_replyto,";
+		$sql .= " t.origin_references,";
 		$sql .= " t.fk_user_create,";
 		$sql .= " t.fk_user_assign,";
 		$sql .= " t.email_msgid,";
@@ -728,6 +737,7 @@ class Ticket extends CommonObject
 				$this->fk_contract = $obj->fk_contract;
 				$this->origin_email = $obj->origin_email;
 				$this->origin_replyto = $obj->origin_replyto;
+				$this->origin_references = $obj->origin_references;
 				$this->fk_user_create = $obj->fk_user_create;
 				$this->fk_user_assign = $obj->fk_user_assign;
 				$this->email_msgid = $obj->email_msgid;
@@ -808,6 +818,7 @@ class Ticket extends CommonObject
 		$sql .= " t.fk_contract,";
 		$sql .= " t.origin_email,";
 		$sql .= " t.origin_replyto,";
+		$sql .= " t.origin_references,";
 		$sql .= " t.fk_user_create, uc.lastname as user_create_lastname, uc.firstname as user_create_firstname,";
 		$sql .= " t.fk_user_assign, ua.lastname as user_assign_lastname, ua.firstname as user_assign_firstname,";
 		$sql .= " t.subject,";
@@ -926,6 +937,7 @@ class Ticket extends CommonObject
 					$line->fk_contract = $obj->fk_contract;
 					$line->origin_email = $obj->origin_email;
 					$line->origin_replyto = $obj->origin_replyto;
+					$line->origin_references = $obj->origin_references;
 
 					$line->fk_user_create = $obj->fk_user_create;
 					$line->fk_user_assign = $obj->fk_user_assign;
@@ -1079,6 +1091,7 @@ class Ticket extends CommonObject
 		$sql .= " fk_contract=".(isset($this->fk_contract) ? (int) $this->fk_contract : "null").",";
 		$sql .= " origin_email=".(isset($this->origin_email) ? "'".$this->db->escape($this->origin_email)."'" : "null").",";
 		$sql .= " origin_replyto=".(isset($this->origin_replyto) ? "'".$this->db->escape($this->origin_replyto)."'" : "null").",";
+		$sql .= " origin_references=".(isset($this->origin_references) ? "'".$this->db->escape($this->origin_references)."'" : "null").",";
 		$sql .= " fk_user_create=".(isset($this->fk_user_create) ? (int) $this->fk_user_create : "null").",";
 		$sql .= " fk_user_assign=".(isset($this->fk_user_assign) ? (int) $this->fk_user_assign : "null").",";
 		$sql .= " subject=".(isset($this->subject) ? "'".$this->db->escape($this->subject)."'" : "null").",";

From 20018163e29a67ccdad87c92171a11d23d872539 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 15:13:43 +0100
Subject: [PATCH 1769/1862] Fix restore declaration to avoid to many
 uncompatibility problems.

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

diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index e1eb9be0c0c..fd3004a9c9d 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -186,5 +186,5 @@ abstract class DolibarrTriggers
 	 *  @param conf         $conf       Object conf
 	 *  @return int                     if KO: <0 || if no trigger ran: 0 || if OK: >0
 	 */
-	abstract public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf);
+	abstract public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }

From f9346a8022c895900ad2a8784b17dce308a65aaf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 15:13:43 +0100
Subject: [PATCH 1770/1862] Fix restore declaration to avoid to many
 uncompatibility problems.

---
 htdocs/core/triggers/dolibarrtriggers.class.php                 | 2 +-
 htdocs/core/triggers/interface_20_all_Logevents.class.php       | 2 +-
 .../triggers/interface_20_modWorkflow_WorkflowManager.class.php | 2 +-
 .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php  | 2 +-
 .../interface_50_modBlockedlog_ActionsBlockedLog.class.php      | 2 +-
 ...nterface_50_modEventOrganization_EventOrganization.class.php | 2 +-
 htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php | 2 +-
 .../interface_50_modMailmanspip_Mailmanspipsynchro.class.php    | 2 +-
 .../interface_50_modNotification_Notification.class.php         | 2 +-
 .../core/triggers/interface_50_modTicket_TicketEmail.class.php  | 2 +-
 htdocs/core/triggers/interface_80_modStripe_Stripe.class.php    | 2 +-
 .../triggers/interface_90_modSociete_ContactRoles.class.php     | 2 +-
 .../triggers/interface_95_modWebhook_WebhookTriggers.class.php  | 2 +-
 .../triggers/interface_95_modZapier_ZapierTriggers.class.php    | 2 +-
 .../interface_99_modMyModule_MyModuleTriggers.class.php         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index e1eb9be0c0c..fd3004a9c9d 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -186,5 +186,5 @@ abstract class DolibarrTriggers
 	 *  @param conf         $conf       Object conf
 	 *  @return int                     if KO: <0 || if no trigger ran: 0 || if OK: >0
 	 */
-	abstract public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf);
+	abstract public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 47432eeb75c..adc63815e33 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -88,7 +88,7 @@ class InterfaceLogevents extends DolibarrTriggers
 	 * @return	int					if KO: <0, if no trigger ran: 0, if OK: >0
 	 * @throws	Exception			dol_syslog can throw Exceptions
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (getDolGlobalString('MAIN_LOGEVENTS_DISABLE_ALL')) {
 			return 0; // Log events is disabled (hidden features)
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 96da2886c32..1edea428b6f 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -62,7 +62,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->workflow) || empty($conf->workflow->enabled)) {
 			return 0; // Module not active, we do nothing
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 034a052ce0c..4d6a062e38b 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -77,7 +77,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (!isModEnabled('agenda')) {
 			return 0; // Module not active, we do nothing
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 68cfccb49d5..a27ee6b7d66 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -56,7 +56,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->blockedlog) || empty($conf->blockedlog->enabled)) {
 			return 0; // Module not active, we do nothing
diff --git a/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php b/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
index f54615a2aaf..445bbf4ac3c 100644
--- a/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
+++ b/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
@@ -69,7 +69,7 @@ class InterfaceEventOrganization extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->eventorganization) || empty($conf->eventorganization->enabled)) {
 			return 0; // Module not active, we do nothing
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 105739fa5de..1a92bca5b66 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -59,7 +59,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->ldap) || empty($conf->ldap->enabled)) {
 			return 0; // Module not active, we do nothing
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index a73a0eb2eb4..5b746b971cb 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -57,7 +57,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->mailmanspip) || empty($conf->mailmanspip->enabled)) {
 			return 0; // Module not active, we do nothing
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 602c3798c97..b9a009f7c0a 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -64,7 +64,7 @@ class InterfaceNotification extends DolibarrTriggers
 	 * @param conf		    $conf       Object conf
 	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		global $hookmanager;
 
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index b37bd6ced34..08a24e1fc63 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -59,7 +59,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 *      @param  conf      $conf   Object conf
 	 *      @return int                     Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		global $mysoc;
 
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 2d2b6db94c9..7178f29654c 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -64,7 +64,7 @@ class InterfaceStripe extends DolibarrTriggers
 	 * @param 	Conf 			$conf 		Object conf
 	 * @return 	int              			Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		// Put here code you want to execute when a Dolibarr business event occurs.
 		// Data and type of action are stored into $object and $action
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index 7c3047b03d3..6906157f6ef 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -65,7 +65,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 	 * @param conf $conf		Object conf
 	 * @return int Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if ($action === 'PROPAL_CREATE' || $action === 'ORDER_CREATE' || $action === 'BILL_CREATE'
 			|| $action === 'ORDER_SUPPLIER_CREATE' || $action === 'BILL_SUPPLIER_CREATE' || $action === 'PROPOSAL_SUPPLIER_CREATE'
diff --git a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
index 70777a03ed4..c78c99fc304 100644
--- a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
@@ -65,7 +65,7 @@ class InterfaceWebhookTriggers extends DolibarrTriggers
 	 * @param Conf 			$conf 		Object conf
 	 * @return int              		Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->webhook) || empty($conf->webhook->enabled)) {
 			return 0; // If module is not enabled, we do nothing
diff --git a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
index 701cfeec3fd..bfb4cf8ada3 100644
--- a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
@@ -58,7 +58,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 	 * @param Conf          $conf       Object conf
 	 * @return int                      Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (empty($conf->zapier) || empty($conf->zapier->enabled)) {
 			// Module not active, we do nothing
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 3ab08016799..32a980784e1 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -65,7 +65,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 	 * @param Conf 			$conf 		Object conf
 	 * @return int              		Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public function runTrigger(string $action, $object, User $user, Translate $langs, Conf $conf)
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
 		if (!isModEnabled('mymodule')) {
 			return 0; // If module is not enabled, we do nothing

From 57181e64070233881536f8a8ee2f0c72852a9d81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 15:28:19 +0100
Subject: [PATCH 1771/1862] Typo

---
 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 bb5abcf9f4c..9b0d6cfaab4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11765,7 +11765,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param string 		$actionType 	'default', 'danger', 'email', 'clone', 'cancel', 'delete', ...
  * @param string|array 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )
  * 										Example when an array is used: $arrayforbutaction = array(
- *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("proposal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *                                      30 => array('lang'=>'bills', 'enabled'=>isModEnabled("invoice"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *										);

From 49bd37a72d37448602566dec1c206a792553f2d5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 16:02:33 +0100
Subject: [PATCH 1772/1862] Doc

---
 htdocs/admin/system/database-tables.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index e122150571b..defb52235b7 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -168,7 +168,8 @@ if (!$base) {
 				print '<td align="right">'.$obj->Auto_increment.'</td>';
 				print '<td align="right">'.$obj->Check_time.'</td>';
 				print '<td align="right">'.$obj->Collation;
-				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci")))) {
+				// Accept utf8, utf8mb3_unicode_ci, utf8mb4_unicode_ci
+				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "latin1_swedish_ci")))) {
 					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&table='.urlencode($obj->Name).'&token='.newToken().'">'.$langs->trans("Convert").' UTF8</a>';
 				}
 				print '</td>';

From fcff03c66d68d0486a80abc0d032b2eff4f75bc9 Mon Sep 17 00:00:00 2001
From: mrozniecki <mrozniecki@easya.solutions>
Date: Mon, 18 Mar 2024 16:10:39 +0100
Subject: [PATCH 1773/1862] Add substitution for mail intro and signature on
 ticket mail

---
 htdocs/core/class/html.formticket.class.php | 8 ++++++--
 htdocs/ticket/card.php                      | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 4fa8ee3eac6..471cffd2a84 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1661,10 +1661,14 @@ class FormTicket
 				$texttooltip .= '<br><br>'.$langs->trans("ForEmailMessageWillBeCompletedWith").'...';
 			}
 			if (getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO')) {
-				$texttooltip .= '<br><u>'.$langs->trans("TicketMessageMailIntro").'</u><br>'.getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO');
+				$mail_intro = make_substitutions(getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO'), $this->substit);
+				print '<input type="hidden" name="mail_intro" value="'.$mail_intro.'">';
+				$texttooltip .= '<br><u>'.$langs->trans("TicketMessageMailIntro").'</u><br>'.$mail_intro;
 			}
 			if (getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE')) {
-				$texttooltip .= '<br><br><u>'.$langs->trans("TicketMessageMailFooter").'</u><br>'.getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE');
+				$mail_signature = make_substitutions(getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE'), $this->substit);
+				print '<input type="hidden" name="mail_signature" value="'.$mail_signature.'">';
+				$texttooltip .= '<br><br><u>'.$langs->trans("TicketMessageMailFooter").'</u><br>'.$mail_signature;
 			}
 			print $form->textwithpicto('', $texttooltip, 1, 'help');
 		}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 037ec5c57c4..db416fb7742 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1536,6 +1536,7 @@ if ($action == 'create' || $action == 'presend') {
 			$morehtmlright = '';
 			$help = "";
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
+			complete_substitutions_array($substitutionarray, $outputlangs, $object);
 			$morehtmlright .= $form->textwithpicto('<span class="opacitymedium">'.$langs->trans("TicketMessageSubstitutionReplacedByGenericValues").'</span>', $help, 1, 'helpclickable', '', 0, 3, 'helpsubstitution');
 
 			print '<div>';

From a9cabe6fe4c5f89b78180b238a8b430199be6519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 18 Mar 2024 16:39:49 +0100
Subject: [PATCH 1774/1862] Update codespell-dict.txt

---
 dev/tools/codespell/codespell-dict.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/codespell/codespell-dict.txt b/dev/tools/codespell/codespell-dict.txt
index f6d51c0b68d..047de65a4a8 100644
--- a/dev/tools/codespell/codespell-dict.txt
+++ b/dev/tools/codespell/codespell-dict.txt
@@ -9,6 +9,7 @@ aploha->alpha
 aplohanothtml->alphanohtml
 aplphanothtml->alphanohtml
 choosed->chosen
+cumuled->cumulative
 dokument->document
 dolibar->dolibarr
 dolibarrr->dolibarr

From 06ae1deb1b81147fb0f76acb9833ec1cb410d183 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 17:27:06 +0100
Subject: [PATCH 1775/1862] Fix better error message when using bad
 character_set_client

---
 htdocs/conf/conf.php.example    | 7 +++----
 htdocs/core/db/mysqli.class.php | 8 ++++++--
 htdocs/website/index.php        | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index d0ca5f7142e..4d8c4f8fadd 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -130,8 +130,8 @@ $dolibarr_main_db_user='';
 // dolibarr_main_db_pass
 // =====================
 // This parameter contains password used to read and write into Dolibarr database.
-// If content is 'crypted:...', the password is encrypted/decrypted with dol_encode/dol_decode.  
-// If content is 'dolcrypt:...', the password is encrypted/decrypted with dolEncrypt/dolDecrypt.  
+// If content is 'crypted:...', the password is encrypted/decrypted with dol_encode/dol_decode.
+// If content is 'dolcrypt:...', the password is encrypted/decrypted with dolEncrypt/dolDecrypt.
 //
 // Examples:
 // $dolibarr_main_db_pass='myadminpass';
@@ -160,6 +160,7 @@ $dolibarr_main_db_type='';
 // Default value: depends on database driver
 // Examples:
 // dolibarr_main_db_character_set='utf8';
+// dolibarr_main_db_character_set='utf8mb4';
 //
 $dolibarr_main_db_character_set='utf8';
 
@@ -455,5 +456,3 @@ $dolibarr_cron_allow_cli='0';
 //##############################
 // External modules
 //##############################
-
-
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 8024bb4aa5b..ff63113e47b 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -125,11 +125,15 @@ class DoliDBMysqli extends DoliDB
 						dol_syslog(get_class($this)."::DoliDBMysqli You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database ".$this->db->character_set_name(), LOG_WARNING);
 						$this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
 					} catch (Exception $e) {
-						print 'Failed to force character set to '.$clientmustbe." according to setup to match the one of the server database.<br>\n";
+						print 'Failed to force character_set_client to '.$clientmustbe." (according to setup) to match the one of the server database.<br>\n";
 						print $e->getMessage();
 						print "<br>\n";
 						if ($clientmustbe != 'utf8') {
-							print 'Edit conf/conf.php file to set a charset "utf8" instead of "'.$clientmustbe.'".'."\n";
+							print 'Edit conf/conf.php file to set a charset "utf8"';
+							if ($clientmustbe != 'utf8mb4') {
+								print ' or "utf8mb4"';
+							}
+							print ' instead of "'.$clientmustbe.'".'."\n";
 						}
 						exit;
 					}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 2b622531dac..d64888743cb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -683,7 +683,7 @@ if ($action == 'adddir' && $permtouploadfile)
 }
 */
 
-// Add site
+// Add a website
 if ($action == 'addsite' && $usercanedit) {
 	$db->begin();
 

From 13f7012d401525d80317d484bdca362e402af6c2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 18:17:53 +0100
Subject: [PATCH 1776/1862] NEW Add maintenance tool to switch utf8 -> utf8mb4

---
 htdocs/admin/system/database-tables.php | 42 +++++++----
 htdocs/admin/system/dbtable.php         | 94 +++++++++++++++++++++++--
 htdocs/core/lib/functions.lib.php       |  8 +--
 3 files changed, 120 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index defb52235b7..14121aebab8 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -39,6 +39,7 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
+$table = GETPOST('table', 'aZ09');
 $action = GETPOST('action', 'aZ09');
 
 
@@ -46,16 +47,20 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-if ($action == 'convert') {
-	$sql = "ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." ENGINE=INNODB";
+if ($action == 'convert') {	// Convert engine into innodb
+	$sql = "ALTER TABLE ".$db->sanitize($table)." ENGINE=INNODB";
 	$db->query($sql);
 }
 if ($action == 'convertutf8') {
-	$sql = "ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+	$db->query($sql);
+}
+if ($action == 'convertutf8mb4') {
+	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
 	$db->query($sql);
 }
 if ($action == 'convertdynamic') {
-	$sql = "ALTER TABLE ".$db->escape(GETPOST("table", "aZ09"))." ROW_FORMAT=DYNAMIC;";
+	$sql = "ALTER TABLE ".$db->sanitize($table)." ROW_FORMAT=DYNAMIC;";
 	$db->query($sql);
 }
 
@@ -160,17 +165,24 @@ if (!$base) {
 					print '<br><a class="reposition" href="database-tables.php?action=convertdynamic&table='.urlencode($obj->Name).'&token='.newToken().'">'.$langs->trans("Convert").' Dynamic</a>';
 				}
 				print '</td>';
-				print '<td align="right">'.$obj->Rows.'</td>';
-				print '<td align="right">'.$obj->Avg_row_length.'</td>';
-				print '<td align="right">'.$obj->Data_length.'</td>';
-				print '<td align="right">'.$obj->Max_data_length.'</td>';
-				print '<td align="right">'.$obj->Index_length.'</td>';
-				print '<td align="right">'.$obj->Auto_increment.'</td>';
-				print '<td align="right">'.$obj->Check_time.'</td>';
-				print '<td align="right">'.$obj->Collation;
-				// Accept utf8, utf8mb3_unicode_ci, utf8mb4_unicode_ci
-				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "latin1_swedish_ci")))) {
-					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&table='.urlencode($obj->Name).'&token='.newToken().'">'.$langs->trans("Convert").' UTF8</a>';
+				print '<td class="right">'.$obj->Rows.'</td>';
+				print '<td class="right">'.$obj->Avg_row_length.'</td>';
+				print '<td class="right">'.$obj->Data_length.'</td>';
+				print '<td class="right">'.$obj->Max_data_length.'</td>';
+				print '<td class="right">'.$obj->Index_length.'</td>';
+				print '<td class="right">'.$obj->Auto_increment.'</td>';
+				print '<td class="right">'.$obj->Check_time.'</td>';
+				print '<td class="right nowraponall">'.$obj->Collation;
+				// Link to convert collation
+				if (isset($obj->Collation)) {
+					print '<br><span class="opacitymedium small">'.$langs->trans("ConvertInto");
+					if (!in_array($obj->Collation, array("utf8_unicode_ci"))) {
+						print ' <a class="reposition" href="database-tables.php?action=convertutf8&table='.urlencode($obj->Name).'&token='.newToken().'">utf8</a>';
+					}
+					if (!in_array($obj->Collation, array("utf8mb4_unicode_ci"))) {
+						print ' <a class="reposition" href="database-tables.php?action=convertutf8mb4&table='.urlencode($obj->Name).'&token='.newToken().'">utf8mb4</a>';
+					}
+					print '</span>';
 				}
 				print '</td>';
 				print '</tr>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index c7e7c5baa5e..a47be52e386 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -33,7 +33,57 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
-$table = GETPOST('table', 'alpha');
+$table = GETPOST('table', 'aZ09');
+$field = GETPOST('field', 'aZ09');
+$action = GETPOST('action', 'aZ09');
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'convertutf8') {
+	$sql = "SHOW FULL COLUMNS IN ".$db->sanitize($table);
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$row = $db->fetch_row($resql);
+			if ($row[0] == $field) {
+				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' CHARACTER SET utf8';		// We must not sanitize the $row[1]
+				$db->query($sql);
+
+				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' COLLATE utf8_unicode_ci';	// We must not sanitize the $row[1]
+				$db->query($sql);
+
+				break;
+			}
+		}
+	}
+}
+if ($action == 'convertutf8mb4') {
+	$sql = "SHOW FULL COLUMNS IN ".$db->sanitize($table);
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$row = $db->fetch_row($resql);
+			if ($row[0] == $field) {
+				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' CHARACTER SET utf8mb4';		// We must not sanitize the $row[1]
+				$db->query($sql);
+
+				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' COLLATE utf8mb4_unicode_ci';	// We must not sanitize the $row[1]
+				$db->query($sql);
+
+				break;
+			}
+		}
+	}
+}
 
 
 /*
@@ -48,7 +98,7 @@ print load_fiche_titre($langs->trans("Table")." ".$table, '', 'title_setup');
 // Define request to get table description
 $base = 0;
 if (preg_match('/mysql/i', $conf->db->type)) {
-	$sql = "SHOW TABLE STATUS LIKE '".$db->escape($table)."'";
+	$sql = "SHOW TABLE STATUS LIKE '".$db->escape($db->escapeforlike($table))."'";
 	$base = 1;
 } elseif ($conf->db->type == 'pgsql') {
 	$sql = "SELECT conname,contype FROM pg_constraint";
@@ -99,7 +149,7 @@ if (!$base) {
 		print '</tr>';
 
 		// $sql = "DESCRIBE ".$table;
-		$sql = "SHOW FULL COLUMNS IN ".$db->escape($table);
+		$sql = "SHOW FULL COLUMNS IN ".$db->sanitize($table);
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -109,12 +159,46 @@ if (!$base) {
 				$row = $db->fetch_row($resql);
 
 				print '<tr class="oddeven">';
+
 				// field
 				print "<td>".$row[0]."</td>";
+
 				// type
-				print "<td>".$row[1]."</td>";
+				print "<td>";
+				$proptype = $row[1];
+				$pictoType = '';
+				$matches = array();
+				if (preg_match('/^varchar/', $proptype, $matches)) {
+					$pictoType = 'varchar';
+				} elseif (strpos($proptype, 'int') === 0 || strpos($proptype, 'tinyint') === 0 || strpos($proptype, 'bigint') === 0) {
+					$pictoType = 'int';
+				} elseif (strpos($proptype, 'timestamp') === 0) {
+					$pictoType = 'datetime';
+				} elseif (strpos($proptype, 'real') === 0) {
+					$pictoType = 'double';
+				}
+				print(!empty($pictoType) ? getPictoForType($pictoType) : getPictoForType($proptype)).'<span title="'.dol_escape_htmltag($proptype).'">'.dol_escape_htmltag($proptype).'</span>';
+				print "</td>";
+
 				// collation
-				print "<td>".$row[2]."</td>";
+				print "<td>".(empty($row[2]) ? '&nbsp;' : $row[2]);
+
+				// Link to convert collation
+				if (isset($row[2])) {
+					print '<br><span class="opacitymedium small">'.$langs->trans("ConvertInto");
+					if (!in_array($row[2], array("utf8_unicode_ci"))) {
+						print ' <a class="reposition" href="dbtable.php?action=convertutf8&table='.urlencode($table).'&field='.urlencode($row[0]).'&token='.newToken().'">utf8</a>';
+					}
+					if (!in_array($row[2], array("utf8mb4_unicode_ci"))) {
+						print ' <a class="reposition" href="dbtable.php?action=convertutf8mb4&table='.urlencode($table).'&field='.urlencode($row[0]).'&token='.newToken().'">utf8mb4</a>';
+					}
+					print '</span>';
+				} else {
+					print '<br>&nbsp;';
+				}
+
+				print "</td>";
+
 				// null
 				print "<td>".$row[3]."</td>";
 				// key
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9b0d6cfaab4..4a1beee4bcf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5437,7 +5437,7 @@ function img_mime($file, $titlealt = '', $morecss = '')
  */
 function img_search($titlealt = 'default', $other = '')
 {
-	global $conf, $langs;
+	global $langs;
 
 	if ($titlealt == 'default') {
 		$titlealt = $langs->trans('Search');
@@ -5460,7 +5460,7 @@ function img_search($titlealt = 'default', $other = '')
  */
 function img_searchclear($titlealt = 'default', $other = '')
 {
-	global $conf, $langs;
+	global $langs;
 
 	if ($titlealt == 'default') {
 		$titlealt = $langs->trans('Search');
@@ -5682,7 +5682,7 @@ function dol_print_error($db = null, $error = '', $errors = null)
  */
 function dol_print_error_email($prefixcode, $errormessage = '', $errormessages = array(), $morecss = 'error', $email = '')
 {
-	global $langs, $conf;
+	global $langs;
 
 	if (empty($email)) {
 		$email = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
@@ -5745,7 +5745,7 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
  */
 function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '', $forcenowrapcolumntitle = 0)
 {
-	global $conf, $langs, $form;
+	global $langs, $form;
 	//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
 
 	if ($moreattrib == 'class="right"') {

From 244da63a1cb2e75caa180b1a0ce2722ecb77bead Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Mon, 18 Mar 2024 18:22:19 +0100
Subject: [PATCH 1777/1862] NEW functionality for salaries with massactions

---
 htdocs/salaries/class/salary.class.php |  1 +
 htdocs/salaries/list.php               | 91 ++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 0e242e38b39..b8cac236746 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -128,6 +128,7 @@ class Salary extends CommonObject
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
 
+	public $resteapayer;
 
 	/**
 	 *	Constructor
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 7af81d47d6e..f88783a1f49 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -166,6 +166,93 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
+//credit transfer request
+if ($massaction == 'withdrawrequest') {
+	$langs->load("withdrawals");
+
+	if (!$user->hasRight('paymentbybanktransfer', 'create')) {
+		$error++;
+		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+	} else {
+		//Checking error
+		$error = 0;
+		$listofSalries =  array();
+		$arrayofselected = is_array($toselect) ? $toselect : array();
+		foreach ($arrayofselected as $toselectid) {
+			$objecttmp = new Salary($db);
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0) {
+				$totalpaid = $objecttmp->getSommePaiement();
+				$objecttmp->resteapayer = price2num($objecttmp->amount - $totalpaid, 'MT');
+
+				// hook to finalize the remaining amount, considering e.g. cash discount agreements
+				$parameters = array('remaintopay' => $objecttmp->resteapayer);
+				$reshook = $hookmanager->executeHooks('finalizeAmountOfInvoice', $parameters, $objecttmp, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook > 0) {
+					if (!empty($remaintopay = $hookmanager->resArray['remaintopay'])) {
+						$objecttmp->resteapayer = $remaintopay;
+					}
+				} elseif ($reshook < 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("ProcessingError"), $hookmanager->errors, 'errors');
+				}
+
+				if ($objecttmp->status == Salary::STATUS_PAID || $objecttmp->resteapayer == 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("AlreadyPaid"), $objecttmp->errors, 'errors');
+				} elseif ($resteapayer < 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("AmountMustBePositive"), $objecttmp->errors, 'errors');
+				}
+
+				$rsql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+				$rsql .= " , pfd.date_traite as date_traite";
+				$rsql .= " , pfd.amount";
+				$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
+				$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
+				$rsql .= " , ".MAIN_DB_PREFIX."user as u";
+				$rsql .= " WHERE fk_salary = ".((int) $objecttmp->id);
+				$rsql .= " AND pfd.fk_user_demande = u.rowid";
+				$rsql .= " AND pfd.traite = 0";
+				$rsql .= " ORDER BY pfd.date_demande DESC";
+
+				$result_sql = $db->query($rsql);
+				if ($result_sql) {
+					$numprlv = $db->num_rows($result_sql);
+				}
+
+				if ($numprlv > 0) {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
+				} elseif (!empty($objecttmp->type_payment) && $objecttmp->type_payment != '2') {
+					$error++;
+					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
+				} else {
+					$listofSalries[] = $objecttmp;
+				}
+			}
+		}
+
+		if (!empty($listofSalries)) {
+			$nbwithdrawrequestok = 0;
+			foreach ($listofSalries as $salary) {
+				$db->begin();
+				$result = $salary->demande_prelevement($user, (float) $salary->resteapayer, 'salaire');
+				if ($result > 0) {
+					$db->commit();
+					$nbwithdrawrequestok++;
+				} else {
+					$db->rollback();
+					setEventMessages($aBill->error, $aBill->errors, 'errors');
+				}
+			}
+			if ($nbwithdrawrequestok > 0) {
+				setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
+			}
+		}
+	}
+}
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -413,6 +500,10 @@ $arrayofmassactions = array(
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
+if (isModEnabled('prelevement') && $user->hasRight('prelevement', 'bons', 'creer')) {
+	$langs->load("withdrawals");
+	$arrayofmassactions['withdrawrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeBankTransferOrder");
+}
 if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }

From b1758520ea9f1d98ef38d7a1e689753c2bfa9c40 Mon Sep 17 00:00:00 2001
From: xbloq <xblanco@gmail.com>
Date: Mon, 18 Mar 2024 18:28:49 +0100
Subject: [PATCH 1778/1862] Update card.php  #28938

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

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index c9f2401513b..920aaa36885 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -460,7 +460,7 @@ if ($id > 0 || $ref) {
 	if ($salaryBonPl) {
 		$sql = "SELECT pl.rowid, pl.statut, pl.amount, pl.fk_user,";
 		$sql .= " u.rowid as socid, u.login as name";
-		$sql .= " FROM llx_prelevement_lignes as pl";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 		$sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
 		$sql .= ", ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id);

From d98b7210715351fff0086e3f90da9dc739e04f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 18 Mar 2024 18:42:09 +0100
Subject: [PATCH 1779/1862] fix phpstan

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index e3a3eb07439..6a7d5a774ee 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2018      Nicolas ZABOURI     <info@inovea-conseil.com>
  * Copyright (C) 2019		JC Prieto			<jcprieto@virtual20.com><prietojc@gmail.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -672,7 +673,7 @@ class BonPrelevement extends CommonObject
 	 *
 	 *	@param	User		$user		Id of user
 	 *	@param 	int			$date		Date of action
-	 *	@param	string		$method		Method of transmission to bank (0=Internet, 1=Api...)
+	 *	@param	int			$method		Method of transmission to bank (0=Internet, 1=Api...)
 	 *	@return	int						>0 if OK, <0 if KO
 	 */
 	public function set_infotrans($user, $date, $method)

From 62cf3ab098682dccfd78ad4aecdbcb5b1573764f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 19:27:52 +0100
Subject: [PATCH 1780/1862] Enhance error message

---
 htdocs/core/class/CMailFile.class.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 2ba41c28f43..11e25c2c741 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -275,8 +275,9 @@ class CMailFile
 				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
 				// This convert an embedded file with src="data:image... into a cid link + attached file
 				$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
-				if ($resultImageData<0) {
-					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData");
+				if ($resultImageData < 0) {
+					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);
+					dol_syslog("CMailFile::CMailfile: ".implode(',', $this->errors));	// Output errors set by findHtmlImagesInSrcData
 					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
 					return;
 				}
@@ -1900,8 +1901,6 @@ class CMailFile
 	 */
 	private function findHtmlImagesIsSrcData($images_dir)
 	{
-		global $conf;
-
 		// Build the array of image extensions
 		$extensions = array_keys($this->image_types);
 
@@ -1927,7 +1926,7 @@ class CMailFile
 		if (!empty($matches) && !empty($matches[1])) {
 			if (empty($images_dir)) {
 				// No temp directory provided, so we are not able to support convertion of data:image into physical images.
-				$this->error = 'NoTempDirProvidedInCMailConstructorSoCantConvertDataImgOnDisk';
+				$this->errors[] = 'NoTempDirProvidedInCMailConstructorSoCantConvertDataImgOnDisk';
 				return -1;
 			}
 
@@ -1949,7 +1948,7 @@ class CMailFile
 						dolChmod($destfiletmp);
 					} else {
 						$this->errors[] = "Failed to open file '".$destfiletmp."' for write";
-						return -1;
+						return -2;
 					}
 				}
 

From 04ae0f776d4d05b534e70331c9e1dec7157252b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 20:02:08 +0100
Subject: [PATCH 1781/1862] FIX trackid and temp dir on payment confirmation of
 event registration

---
 htdocs/public/payment/paymentok.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index ca5db265610..62f9797d833 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1378,7 +1378,10 @@ if ($ispaymentok) {
 								$listofmimes = array(dol_mimetype($file));
 							}
 
-							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, $cc, '', 0, $ishtml);
+							$trackid = 'inv'.$object->id;
+							$upload_dir_tmp = $conf->admin->dir_output.'/temp/'.uniqid('cmailfile');
+
+							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, $cc, '', 0, $ishtml, '', '', $trackid, '', 'standard', '', $upload_dir_tmp);
 
 							$result = $mailfile->sendfile();
 							if ($result) {

From a0b7cb90d86c2f7a740654dd8a7576193929d899 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 20:02:08 +0100
Subject: [PATCH 1782/1862] FIX trackid and temp dir on payment confirmation of
 event registration

---
 htdocs/core/class/CMailFile.class.php |  6 ++++++
 htdocs/public/payment/paymentok.php   | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 11e25c2c741..3539c62b6cf 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1901,9 +1901,15 @@ class CMailFile
 	 */
 	private function findHtmlImagesIsSrcData($images_dir)
 	{
+		global $conf;
+
 		// Build the array of image extensions
 		$extensions = array_keys($this->image_types);
 
+		if (empty($images_dir)) {
+			$images_dir = $conf->admin->dir_output.'/temp/'.uniqid('cmailfile');
+		}
+
 		if ($images_dir && !dol_is_dir($images_dir)) {
 			dol_mkdir($images_dir, DOL_DATA_ROOT);
 		}
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index ca5db265610..3c710691bdd 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1378,7 +1378,9 @@ if ($ispaymentok) {
 								$listofmimes = array(dol_mimetype($file));
 							}
 
-							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, $cc, '', 0, $ishtml);
+							$trackid = 'inv'.$object->id;
+
+							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, $cc, '', 0, $ishtml, '', '', $trackid, '', 'standard');
 
 							$result = $mailfile->sendfile();
 							if ($result) {
@@ -1569,8 +1571,9 @@ if ($ispaymentok) {
 										$urlback = $_SERVER["REQUEST_URI"];
 
 										$ishtml = dol_textishtml($texttosend); // May contain urls
+										$trackid = 'inv'.$invoice->id;
 
-										$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+										$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml, '', '', $trackid, '', 'standard');
 
 										$result = $mailfile->sendfile();
 										if ($result) {
@@ -1777,10 +1780,7 @@ if ($ispaymentok) {
 		print $conf->global->$key;
 	}
 
-	$sendemail = '';
-	if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
-		$sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
-	}
+	$sendemail = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL');
 
 	$tmptag = dolExplodeIntoArray($fulltag, '.', '=');
 
@@ -1860,9 +1860,10 @@ if ($ispaymentok) {
 
 
 		$ishtml = dol_textishtml($content); // May contain urls
+		$trackid = '';
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml, '', '', $trackid, '', 'standard');
 
 		$result = $mailfile->sendfile();
 		if ($result) {
@@ -1941,9 +1942,10 @@ if ($ispaymentok) {
 
 
 		$ishtml = dol_textishtml($content); // May contain urls
+		$trackid = '';
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml, '', '', $trackid, '', 'standard');
 
 		$result = $mailfile->sendfile();
 		if ($result) {

From 1a82c5e8ced5270313c6391787490fd891d1d9bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 20:38:51 +0100
Subject: [PATCH 1783/1862] Fix warnings

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index ae1f8bf67d1..546427463da 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -681,7 +681,7 @@ if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu
 
 // Confirm deletion of record
 if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((int) $rowid).'&code='.urlencode($code).'&id='.((int) $id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((int) $rowid).'&id='.((int) $id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 
 
@@ -1101,7 +1101,7 @@ if ($num) {
 				}
 				print "</tr>\n";
 
-				print '<tr class="oddeven nohover'.(in_array($tmpfieldlist, array('topic', 'joinfiles')) ? ' nobottom' : '').'" id="tr-'.$tmpfieldlist.'-'.$rowid.'">';
+				print '<tr class="oddeven nohover" id="tr-aaa-'.$rowid.'">';
 				print '<td colspan="10">';
 
 				$fieldsforcontent = array('topic', 'email_from','joinfiles', 'content');

From ae41b07b705aad3f99fdc7eb997c0bbfd2ad35d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 20:51:47 +0100
Subject: [PATCH 1784/1862] Fix trans

---
 htdocs/langs/en_US/admin.lang                    | 3 ++-
 htdocs/langs/en_US/eventorganization.lang        | 1 +
 htdocs/public/eventorganization/attendee_new.php | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f20f46f5c03..ed6431ff1d6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1666,7 +1666,7 @@ LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree f
 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.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use those values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all those 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.
@@ -2452,3 +2452,4 @@ VideoGeneration=Video generation
 AudioText=Audio - Text
 AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
+ConvertInto=Convert into
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 9d3b5c5fb08..e0e26dc460b 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -27,6 +27,7 @@ EventOrganizationMenuLeft = Organized events
 EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
 
 PaymentEvent=Payment of event
+EventFee=Event fee
 
 #
 # Admin page
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 3d6db67046d..3eb22bceb3a 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -510,6 +510,8 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 			// TODO Use default language of $thirdparty->default_lang to build $outputlang
 
+			$outputlangs->loadLangs(array("eventorganization"));
+
 			// Get product to use for invoice
 			$productforinvoicerow = new Product($db);
 			$productforinvoicerow->id = 0;
@@ -629,7 +631,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
 			// Load traductions files required by page
-			$outputlangs->loadLangs(array("main", "members"));
+			$outputlangs->loadLangs(array("main", "members", "eventorganization"));
 			// Get email content from template
 			$arraydefaultmessage = null;
 

From dfa9ed67d07b9af4a4f7cf3e3e23f15c5519f170 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 20:38:51 +0100
Subject: [PATCH 1785/1862] Fix warnings

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index cabbe69c319..7a6d513c589 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -681,7 +681,7 @@ if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu
 
 // Confirm deletion of record
 if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((int) $rowid).'&code='.urlencode($code).'&id='.((int) $id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((int) $rowid).'&id='.((int) $id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 
 
@@ -1096,7 +1096,7 @@ if ($num) {
 				}
 				print "</tr>\n";
 
-				print '<tr class="oddeven nohover'.(in_array($tmpfieldlist, array('topic', 'joinfiles')) ? ' nobottom' : '').'" id="tr-'.$tmpfieldlist.'-'.$rowid.'">';
+				print '<tr class="oddeven nohover" id="tr-aaa-'.$rowid.'">';
 				print '<td colspan="10">';
 
 				$fieldsforcontent = array('topic', 'email_from','joinfiles', 'content');

From 08ed8f9aaffba580ba2519d4700a4f7bed55e096 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Mar 2024 20:51:47 +0100
Subject: [PATCH 1786/1862] Fix trans

---
 htdocs/langs/en_US/admin.lang                    | 5 +++--
 htdocs/langs/en_US/eventorganization.lang        | 1 +
 htdocs/public/eventorganization/attendee_new.php | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 931cb74aa11..2d89a39b03a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1669,7 +1669,7 @@ LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree f
 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.
+LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use those values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all those 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.
@@ -2442,4 +2442,5 @@ RecommendedForProduction=Recommended for Production
 RecommendedForDebug=Recommended for Debug
 ExportUseForce=Use the parameter -f
 ExportUseForceHelp=Force to continue the export even when an error is found (Backup may not be reliable)
-EnterAnIP=Enter an IP address
\ No newline at end of file
+EnterAnIP=Enter an IP address
+ConvertInto=Convert into
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 30c3f5d6b59..4dda951377a 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -27,6 +27,7 @@ EventOrganizationMenuLeft = Organized events
 EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
 
 PaymentEvent=Payment of event
+EventFee=Event fee
 
 #
 # Admin page
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index a2175e26ae3..154cac787c5 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -510,6 +510,8 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 			// TODO Use default language of $thirdparty->default_lang to build $outputlang
 
+			$outputlangs->loadLangs(array("eventorganization"));
+
 			// Get product to use for invoice
 			$productforinvoicerow = new Product($db);
 			$productforinvoicerow->id = 0;
@@ -629,7 +631,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
 			// Load traductions files required by page
-			$outputlangs->loadLangs(array("main", "members"));
+			$outputlangs->loadLangs(array("main", "members", "eventorganization"));
 			// Get email content from template
 			$arraydefaultmessage = null;
 

From 8e372094ac20bae9f3e1a8d067fda4d977df70d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 18 Mar 2024 22:11:22 +0100
Subject: [PATCH 1787/1862] fix warning

---
 htdocs/admin/system/dbtable.php | 52 ++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index c7e7c5baa5e..c42067da6ce 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,9 @@
 // Load Dolibarr environment
 require '../../main.inc.php';
 
+/** @var Conf $conf */
+/** @var DoliDB $db */
+
 $langs->load("admin");
 
 if (!$user->admin) {
@@ -43,12 +47,12 @@ $table = GETPOST('table', 'alpha');
 llxHeader();
 
 
-print load_fiche_titre($langs->trans("Table")." ".$table, '', 'title_setup');
+print load_fiche_titre($langs->trans("Table") . " " . $table, '', 'title_setup');
 
 // Define request to get table description
 $base = 0;
 if (preg_match('/mysql/i', $conf->db->type)) {
-	$sql = "SHOW TABLE STATUS LIKE '".$db->escape($table)."'";
+	$sql = "SHOW TABLE STATUS LIKE '" . $db->escape($table) . "'";
 	$base = 1;
 } elseif ($conf->db->type == 'pgsql') {
 	$sql = "SELECT conname,contype FROM pg_constraint";
@@ -87,19 +91,19 @@ if (!$base) {
 
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Fields").'</td>';
-		print '<td>'.$langs->trans("Type").'</td>';
-		print '<td>'.$langs->trans("Collation").'</td>';
-		print '<td>'.$langs->trans("Null").'</td>';
-		print '<td>'.$langs->trans("Index").'</td>';
-		print '<td>'.$langs->trans("Default").'</td>';
-		print '<td>'.$langs->trans("Extra").'</td>';
-		print '<td>'.$langs->trans("Privileges").'</td>';
-		print '<td>'.$langs->trans("FieldsLinked").'</td>';
+		print '<td>' . $langs->trans("Fields") . '</td>';
+		print '<td>' . $langs->trans("Type") . '</td>';
+		print '<td>' . $langs->trans("Collation") . '</td>';
+		print '<td>' . $langs->trans("Null") . '</td>';
+		print '<td>' . $langs->trans("Index") . '</td>';
+		print '<td>' . $langs->trans("Default") . '</td>';
+		print '<td>' . $langs->trans("Extra") . '</td>';
+		print '<td>' . $langs->trans("Privileges") . '</td>';
+		print '<td>' . $langs->trans("FieldsLinked") . '</td>';
 		print '</tr>';
 
 		// $sql = "DESCRIBE ".$table;
-		$sql = "SHOW FULL COLUMNS IN ".$db->escape($table);
+		$sql = "SHOW FULL COLUMNS IN " . $db->escape($table);
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -110,27 +114,27 @@ if (!$base) {
 
 				print '<tr class="oddeven">';
 				// field
-				print "<td>".$row[0]."</td>";
+				print "<td>" . $row[0] . "</td>";
 				// type
-				print "<td>".$row[1]."</td>";
+				print "<td>" . $row[1] . "</td>";
 				// collation
-				print "<td>".$row[2]."</td>";
+				print "<td>" . $row[2] . "</td>";
 				// null
-				print "<td>".$row[3]."</td>";
+				print "<td>" . $row[3] . "</td>";
 				// key
-				print "<td>".(empty($row[4]) ? '' : $row[4])."</td>";
+				print "<td>" . (empty($row[4]) ? '' : $row[4]) . "</td>";
 				// default
-				print "<td>".(empty($row[5]) ? '' : $row[5])."</td>";
+				print "<td>" . (empty($row[5]) ? '' : $row[5]) . "</td>";
 				// extra
-				print "<td>".(empty($row[6]) ? '' : $row[6])."</td>";
+				print "<td>" . (empty($row[6]) ? '' : $row[6]) . "</td>";
 				// privileges
-				print "<td>".(empty($row[7]) ? '' : $row[7])."</td>";
+				print "<td>" . (empty($row[7]) ? '' : $row[7]) . "</td>";
 
-				print "<td>".(isset($link[$row[0]][0]) ? $link[$row[0]][0] : '').".";
-				print(isset($link[$row[0]][1]) ? $link[$row[0]][1] : '')."</td>";
+				print "<td>" . (isset($link[$row[0]][0]) ? $link[$row[0]][0] : '') . ".";
+				print (isset($link[$row[0]][1]) ? $link[$row[0]][1] : '') . "</td>";
 
-				print '<!-- ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' COLLATE utf8_unicode_ci; -->';
-				print '<!-- ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' CHARACTER SET utf8; -->';
+				print '<!-- ALTER TABLE ' . $db->sanitize($table) . ' MODIFY ' . $db->sanitize($row[0]) . ' ' . $db->sanitize($row[1]) . ' COLLATE ' . $conf->db->dolibarr_main_db_collation . '; -->';
+				print '<!-- ALTER TABLE ' . $db->sanitize($table) . ' MODIFY ' . $db->sanitize($row[0]) . ' ' . $db->sanitize($row[1]) . ' CHARACTER SET '.$conf->db->character_set.'; -->';
 				print '</tr>';
 				$i++;
 			}

From 03cda2dcc81148bf8abf39e8003beb6198d77908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 18 Mar 2024 22:25:13 +0100
Subject: [PATCH 1788/1862] fix

---
 htdocs/admin/system/dbtable.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index dde9adccea0..a47be52e386 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -226,4 +226,3 @@ if (!$base) {
 // End of page
 llxFooter();
 $db->close();
-

From defd044a747295564f79ea4b7011bfb1b927de8a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 18 Mar 2024 23:34:08 +0100
Subject: [PATCH 1789/1862] Fix phpunit

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

diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index a47be52e386..2cec477994f 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -52,10 +52,10 @@ if ($action == 'convertutf8') {
 		while ($i < $num) {
 			$row = $db->fetch_row($resql);
 			if ($row[0] == $field) {
-				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' CHARACTER SET utf8';		// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8";		// We must not sanitize the $row[1]
 				$db->query($sql);
 
-				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' COLLATE utf8_unicode_ci';	// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE utf8_unicode_ci";	// We must not sanitize the $row[1]
 				$db->query($sql);
 
 				break;
@@ -73,10 +73,10 @@ if ($action == 'convertutf8mb4') {
 		while ($i < $num) {
 			$row = $db->fetch_row($resql);
 			if ($row[0] == $field) {
-				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' CHARACTER SET utf8mb4';		// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." CHARACTER SET utf8mb4";		// We must not sanitize the $row[1]
 				$db->query($sql);
 
-				$sql = 'ALTER TABLE '.$db->sanitize($table).' MODIFY '.$db->sanitize($row[0]).' '.$row[1].' COLLATE utf8mb4_unicode_ci';	// We must not sanitize the $row[1]
+				$sql = "ALTER TABLE ".$db->sanitize($table)." MODIFY ".$db->sanitize($row[0])." ".$row[1]." COLLATE utf8mb4_unicode_ci";	// We must not sanitize the $row[1]
 				$db->query($sql);
 
 				break;

From a08f330ca72fb62f72ea2bd634593dd981d23443 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 17:59:44 +0100
Subject: [PATCH 1790/1862] Qual: Always run phpcin pre-commit workflow

# Qual: Always run phpcs in pre-commit workflow

Developers are prioritizing the Travis Run because the pre-commit workflow
only runs the phpcs checks if the other pre-commit checks did not fail.
This modifies the action so that the phpcs checks are also run if the
previous step failed.

That should help limit travis load and delays.
---
 .github/workflows/pre-commit.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 384ef39880e..ff99f5bdd74 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -67,13 +67,16 @@ jobs:
         uses: shivammathur/setup-php@v2
         # Install when we're going to run phpcs
         if: |
-          steps.changed-php.outputs.any_changed == 'true'
-          ||
+          ! cancelled() &&
           (
-            github.event_name == 'push'
-            && (
-                 github.event.ref == 'refs/heads/develop'
-               || endsWith(github.event.ref, '.0')
+            steps.changed-php.outputs.any_changed == 'true'
+            ||
+            (
+              github.event_name == 'push'
+              && (
+                   github.event.ref == 'refs/heads/develop'
+                 || endsWith(github.event.ref, '.0')
+              )
             )
           )
         with:
@@ -82,7 +85,7 @@ jobs:
           tools: phpcs
 
       - name: Run some pre-commit hooks on selected changed files only
-        if: steps.changed-php.outputs.any_changed == 'true'
+        if: "! cancelled() && steps.changed-php.outputs.any_changed == 'true'"
         env:
           ALL_CHANGED_FILES: ${{ steps.changed-php.outputs.all_changed_files }}
         run: |

From c9e7fc0ca426705cebc2693c931357daf79aec4f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:40:23 +0100
Subject: [PATCH 1791/1862] Qual: Update logToCheckStyle to version that
 extracts PHP Fatal Errors

---
 .github/workflows/windows-ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index defb42e0148..643c96bb21f 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -152,7 +152,7 @@ jobs:
           echo "PHPUNIT seems to have completed with a test result, reuse the exit code"
           for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
       - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.2.9
+        uses: mdeweerd/logToCheckStyle@v2024.3.2
         if: ${{ failure() }}
         with:
           in: ${{ env.PHPUNIT_LOG }}

From 1a863a374d29a3ad98f9e8c96716e37ca2b03021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 19 Mar 2024 00:09:33 +0100
Subject: [PATCH 1792/1862] fix

---
 htdocs/public/stripe/ipn.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 9dcbc1248fa..ceba4a94a41 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -1,9 +1,8 @@
 <?php
-/* Copyright (C) 2018-2020  Thibault FOUCART       <support@ptibogxiv.net>
- * Copyright (C) 2018       Fédéric France         <frederic.france@free.fr>
- * Copyright (C) 2023       Laurent Destailleur    <eldy@users.sourceforge.net>
+/* Copyright (C) 2018-2020  Thibault FOUCART            <support@ptibogxiv.net>
+ * Copyright (C) 2018-2024  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2023       Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 4500672cb4222fc5b8b6808931004b385577ae37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 00:11:59 +0100
Subject: [PATCH 1793/1862] Rename hooks

---
 htdocs/accountancy/bookkeeping/card.php        | 11 ++++++-----
 htdocs/accountancy/class/bookkeeping.class.php | 10 ----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index a05e4e1bcef..79f7c44cda9 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -95,11 +95,11 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
  * Actions
  */
 $parameters = array();
-$reshook_onBeforeActions = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
-if ($reshook_onBeforeActions < 0) {
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-if (empty($reshook_onBeforeActions)) {
+if (empty($reshook)) {
 	if ($cancel) {
 		header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
 		exit;
@@ -267,10 +267,11 @@ if (empty($reshook_onBeforeActions)) {
 			$object->amount = 0;
 
 			$result = $object->createStd($user, 0, $mode);
-			$reshook = $hookmanager->executeHooks('onConfirmCreate_onAfterCreateEmptyLine', $parameters, $object, $action);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
+				$reshook = $hookmanager->executeHooks('afterCreateBookkeeping', $parameters, $object, $action);
+
 				if ($mode != '_tmp') {
 					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 				}
@@ -399,7 +400,7 @@ if ($action == 'create') {
 	print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
 	print '</tr>';
 	*/
-	$reshook_onCreate_onAfterShowFields = $hookmanager->executeHooks('onCreate_onAfterShowFields', $parameters, $object, $action);
+	$reshookAddLine = $hookmanager->executeHooks('bookkeepingAddLine', $parameters, $object, $action);
 
 	print '</table>';
 
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 6a261a146cd..5c07b8f637f 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -721,16 +721,6 @@ class BookKeeping extends CommonObject
 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element.$mode);
-
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action to call a trigger.
-			//if (! $notrigger) {
-
-			// // Call triggers
-			// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
-			// if ($result < 0) $error++;
-			// // End call triggers
-			//}
 		}
 
 		// Commit or rollback

From 87ac6e2f686edbf4f69c3a478d9c2b2d19072fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 19 Mar 2024 00:28:08 +0100
Subject: [PATCH 1794/1862] fix sql

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 57748c27950..b17520685ad 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
  * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
- * Copyright (C) 2021-2023 Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2024  Frédéric France		<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_client, s.code_compta, s.email";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	$sql .= ", (SELECT SUM(pf.amount) FROM llx_paiement_facture as pf WHERE pf.fk_facture = f.rowid) as am";
+	$sql .= ", (SELECT SUM(pf.amount) FROM ".MAIN_DB_PREFIX."paiement_facture as pf WHERE pf.fk_facture = f.rowid) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
@@ -283,7 +283,7 @@ if ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
 	$sql .= ", s.nom as name";
 	$sql .= ", s.rowid as socid";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
-	$sql .= ", (SELECT SUM(pf.amount) FROM llx_paiementfourn_facturefourn as pf WHERE pf.fk_facturefourn = ff.rowid) as am";
+	$sql .= ", (SELECT SUM(pf.amount) FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf WHERE pf.fk_facturefourn = ff.rowid) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity IN (".getEntity('facture_fourn').")";

From 2917b3451927f7811d9221ab87259ee92d3c2a42 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:42:43 +0100
Subject: [PATCH 1795/1862] Fix phpstan $fields property issue

Fix Property FactureFournisseur::$fields (array) does not accept default value of type array{rowid: array
---
 htdocs/fourn/class/fournisseur.facture.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index beb2a0d3564..845053a4d89 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -254,7 +254,7 @@ class FactureFournisseur extends CommonInvoice
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 15),
 		'ref_supplier' => array('type' => 'varchar(255)', 'label' => 'RefSupplier', 'enabled' => 1, 'visible' => -1, 'position' => 20),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 25, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 30),
 		'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 35),
 		'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 36),

From fd9d48faacb6fda2ec4c67d579c1fee79c3d8e51 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:59:41 +0100
Subject: [PATCH 1796/1862] Fix phpstan CommonObject->fields - notnull is
 optional field

---
 htdocs/adherents/class/adherent.class.php                     | 2 +-
 htdocs/adherents/class/subscription.class.php                 | 2 +-
 htdocs/asset/class/asset.class.php                            | 2 +-
 htdocs/asset/class/assetdepreciationoptions.class.php         | 2 +-
 htdocs/asset/class/assetmodel.class.php                       | 2 +-
 htdocs/bom/class/bom.class.php                                | 4 ++--
 htdocs/bookcal/class/availabilities.class.php                 | 2 +-
 htdocs/bookcal/class/calendar.class.php                       | 2 +-
 htdocs/comm/action/class/actioncommreminder.class.php         | 2 +-
 htdocs/comm/propal/class/propal.class.php                     | 2 +-
 htdocs/commande/class/commande.class.php                      | 2 +-
 htdocs/compta/bank/class/account.class.php                    | 2 +-
 htdocs/compta/bank/class/paymentvarious.class.php             | 2 +-
 htdocs/compta/facture/class/facture-rec.class.php             | 2 +-
 htdocs/compta/facture/class/facture.class.php                 | 2 +-
 htdocs/compta/prelevement/class/bonprelevement.class.php      | 2 +-
 htdocs/contact/class/contact.class.php                        | 2 +-
 htdocs/contrat/class/contrat.class.php                        | 4 ++--
 htdocs/core/class/commonobject.class.php                      | 2 +-
 htdocs/core/class/defaultvalues.class.php                     | 2 +-
 htdocs/core/class/emailsenderprofile.class.php                | 2 +-
 htdocs/core/class/timespent.class.php                         | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php          | 2 +-
 htdocs/emailcollector/class/emailcollectoraction.class.php    | 2 +-
 htdocs/emailcollector/class/emailcollectorfilter.class.php    | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php    | 2 +-
 .../class/conferenceorboothattendee.class.php                 | 2 +-
 htdocs/expedition/class/expedition.class.php                  | 2 +-
 htdocs/expensereport/class/expensereport_ik.class.php         | 2 +-
 htdocs/expensereport/class/expensereport_rule.class.php       | 2 +-
 htdocs/fourn/class/fournisseur.facture-rec.class.php          | 2 +-
 htdocs/hrm/class/evaluation.class.php                         | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                      | 2 +-
 htdocs/hrm/class/job.class.php                                | 2 +-
 htdocs/hrm/class/position.class.php                           | 2 +-
 htdocs/hrm/class/skill.class.php                              | 2 +-
 htdocs/hrm/class/skilldet.class.php                           | 2 +-
 htdocs/hrm/class/skillrank.class.php                          | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php    | 2 +-
 htdocs/modulebuilder/template/class/myobject.class.php        | 2 +-
 htdocs/mrp/class/mo.class.php                                 | 2 +-
 htdocs/opensurvey/class/opensurveysondage.class.php           | 2 +-
 htdocs/partnership/class/partnership.class.php                | 2 +-
 htdocs/product/class/product.class.php                        | 2 +-
 htdocs/product/class/productcustomerprice.class.php           | 2 +-
 htdocs/product/class/productfournisseurprice.class.php        | 2 +-
 htdocs/product/inventory/class/inventory.class.php            | 4 ++--
 htdocs/product/stock/class/entrepot.class.php                 | 2 +-
 htdocs/product/stock/class/productlot.class.php               | 2 +-
 .../product/stock/stocktransfer/class/stocktransfer.class.php | 2 +-
 .../stock/stocktransfer/class/stocktransferline.class.php     | 2 +-
 htdocs/projet/class/project.class.php                         | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php     | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php     | 2 +-
 htdocs/salaries/class/paymentsalary.class.php                 | 2 +-
 htdocs/societe/class/companybankaccount.class.php             | 2 +-
 htdocs/societe/class/companypaymentmode.class.php             | 2 +-
 htdocs/societe/class/societe.class.php                        | 2 +-
 htdocs/societe/class/societeaccount.class.php                 | 2 +-
 htdocs/ticket/class/cticketcategory.class.php                 | 2 +-
 htdocs/variants/class/ProductAttribute.class.php              | 2 +-
 htdocs/variants/class/ProductAttributeValue.class.php         | 2 +-
 htdocs/webhook/class/target.class.php                         | 2 +-
 htdocs/webportal/class/webportalinvoice.class.php             | 2 +-
 htdocs/webportal/class/webportalmember.class.php              | 2 +-
 htdocs/webportal/class/webportalorder.class.php               | 2 +-
 htdocs/webportal/class/webportalpartnership.class.php         | 2 +-
 htdocs/webportal/class/webportalpropal.class.php              | 2 +-
 htdocs/website/class/websitepage.class.php                    | 2 +-
 htdocs/workstation/class/workstation.class.php                | 2 +-
 htdocs/workstation/class/workstationresource.class.php        | 2 +-
 htdocs/workstation/class/workstationusergroup.class.php       | 2 +-
 htdocs/zapier/class/hook.class.php                            | 2 +-
 73 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b5f319bb70c..c6ce7429708 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -316,7 +316,7 @@ class Adherent extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index c268ac3ab6e..c34420b67f2 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -104,7 +104,7 @@ class Subscription extends CommonObject
 	public $fk_bank;
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 3d62ba4c91a..8666a469aee 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -94,7 +94,7 @@ class Asset extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index 0aa62c55919..dac2d1ad194 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -65,7 +65,7 @@ class AssetDepreciationOptions extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 8576e5ee37e..51243277071 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -100,7 +100,7 @@ class AssetModel extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index c49f4a4cc89..72aab83ac21 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -111,7 +111,7 @@ class BOM extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
@@ -1714,7 +1714,7 @@ class BOMLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'LineID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 3582ea707ec..ad34e08abcd 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -112,7 +112,7 @@ class Availabilities extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 539ef39e5ed..b66f950fd12 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -112,7 +112,7 @@ class Calendar extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'right', 'comment' => "Id"),
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 1c8dd2b5b95..711e890e02d 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -76,7 +76,7 @@ class ActionCommReminder extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 69d3e5b59c9..9ea34ae4d3a 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -308,7 +308,7 @@ class Propal extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8f89a1bb336..931fbbd94d6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -297,7 +297,7 @@ class Commande extends CommonOrder
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 67a067854f1..1dd17795fcc 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -307,7 +307,7 @@ class Account extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 6e3a2f28c67..7bb567f1536 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -198,7 +198,7 @@ class PaymentVarious extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		// TODO: fill this array
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index bb7a8ab2ace..e8d007be1fa 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -172,7 +172,7 @@ class FactureRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 9b3e6733698..17cc796ff97 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -291,7 +291,7 @@ class Facture extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 1),
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index e3a3eb07439..f94983bb234 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -148,7 +148,7 @@ class BonPrelevement extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 0,),
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 1c800456b76..54a9983a6d9 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -98,7 +98,7 @@ class Contact extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 6110150e731..1202e840bd7 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -249,7 +249,7 @@ class Contrat extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
@@ -3148,7 +3148,7 @@ class ContratLigne extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 285e3915a79..f67471ee76e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -140,7 +140,7 @@ abstract class CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 9a47a8843e8..0b54bd8fb79 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -87,7 +87,7 @@ class DefaultValues extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index f3e1c04be92..abbd39f54e3 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -89,7 +89,7 @@ class EmailSenderProfile extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index e0ca486ad9e..927dbed57ca 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -112,7 +112,7 @@ class TimeSpent extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index da23932c66b..281c658297a 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -120,7 +120,7 @@ class EmailCollector extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => 2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1),
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 85c9ad7dc83..bb139c8be38 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -79,7 +79,7 @@ class EmailCollectorAction extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 0089e5f0b6c..37e4cf4525c 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -81,7 +81,7 @@ class EmailCollectorFilter extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 683a8d016fe..16c91a9114f 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -112,7 +112,7 @@ class ConferenceOrBooth extends ActionComm
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 7b898c6cc12..f6e4bff74cd 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -100,7 +100,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 90da7555450..7454e0b7832 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -92,7 +92,7 @@ class Expedition extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 14727b498e7..96626648b24 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -72,7 +72,7 @@ class ExpenseReportIk extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'index' => 1)
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 7c640527055..418623df567 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -110,7 +110,7 @@ class ExpenseReportRule extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'index' => 1)
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 900ee4d014a..e1669cedc99 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -190,7 +190,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 7bf46c30b86..6668df2a2f3 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -103,7 +103,7 @@ class Evaluation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index ad7c91c86d9..992e7fa4ce0 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -102,7 +102,7 @@ class EvaluationLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index e1a355b54cd..c38157e7133 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -101,7 +101,7 @@ class Job extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index f96cb1539a2..bcd91410fda 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -100,7 +100,7 @@ class Position extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 256956d55de..b696a8ecdaa 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -106,7 +106,7 @@ class Skill extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 12258e08025..6c02ca26c50 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -100,7 +100,7 @@ class Skilldet extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 4c599235f72..3cde6ae6476 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -104,7 +104,7 @@ class SkillRank extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 21168aea09f..1bb1040553a 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -99,7 +99,7 @@ class KnowledgeRecord extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index fbf37e0e025..4ff7f9ff232 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -116,7 +116,7 @@ class MyObject extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 082a27a1ead..c8589a3f4ba 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -94,7 +94,7 @@ class Mo extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 8e57437c2cd..91e62bdd414 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -101,7 +101,7 @@ class Opensurveysondage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id_sondage' => array('type' => 'varchar(16)', 'label' => 'Idsondage', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => -1,),
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index b03747a8129..7d26d35cb44 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -104,7 +104,7 @@ class Partnership extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8f419c64607..17aa0d9a6bb 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -584,7 +584,7 @@ class Product extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 8a02380b629..6eda4aaf297 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class ProductCustomerPrice extends CommonObject
 {
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 4, 'position' => 10, 'notnull' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'showoncombobox' => 1, 'noteditable' => 1),
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index d5f64ad5e0f..6e3b15405d0 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -92,7 +92,7 @@ class ProductFournisseurPrice extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index e793d442313..71de87fbb6a 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -96,7 +96,7 @@ class Inventory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'              => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
@@ -841,7 +841,7 @@ class InventoryLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 2ffb55706f8..a062d053ed9 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -121,7 +121,7 @@ class Entrepot extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index a51b3d26d9c..3d46b4ff41e 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -99,7 +99,7 @@ class Productlot extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'         => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index f29ae639830..4bf107d58f3 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -124,7 +124,7 @@ class StockTransfer extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'                    => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index af7e7946e72..b030daca098 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -94,7 +94,7 @@ class StockTransferLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 08c54b13fce..3c1d3ff67cb 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -293,7 +293,7 @@ class Project extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 8ded276c054..f80911e4381 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -107,7 +107,7 @@ class RecruitmentCandidature extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 219c2503053..90fe44b212d 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -113,7 +113,7 @@ class RecruitmentJobPosition extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index c099b10c41e..96d414b1d12 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -153,7 +153,7 @@ class PaymentSalary extends CommonObject
 	public $datev = '';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index a30927fafb3..de22b6d4ea7 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -86,7 +86,7 @@ class CompanyBankAccount extends Account
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,),
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index fae5b162b2e..20526bb32d9 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -83,7 +83,7 @@ class CompanyPaymentMode extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'Rowid', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 42bae7b3096..1bc51f9a903 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -188,7 +188,7 @@ class Societe extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 29819dbfdcc..97a07189c5f 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -76,7 +76,7 @@ class SocieteAccount extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 
 	public $fields = array(
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index e4bcccb7e5e..c96779054ce 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -98,7 +98,7 @@ class CTicketCategory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 255a1428386..38fa0793305 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -98,7 +98,7 @@ class ProductAttribute extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index a6ddfcd9570..1c291476d9e 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -76,7 +76,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 4b6db01486a..ef405bfadea 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -101,7 +101,7 @@ class Target extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php
index ddb7e7bec8a..751bb28e10f 100644
--- a/htdocs/webportal/class/webportalinvoice.class.php
+++ b/htdocs/webportal/class/webportalinvoice.class.php
@@ -97,7 +97,7 @@ class WebPortalInvoice extends Facture
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 1,),
diff --git a/htdocs/webportal/class/webportalmember.class.php b/htdocs/webportal/class/webportalmember.class.php
index c4954e4886d..803a405fd5d 100644
--- a/htdocs/webportal/class/webportalmember.class.php
+++ b/htdocs/webportal/class/webportalmember.class.php
@@ -113,7 +113,7 @@ class WebPortalMember extends Adherent
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
diff --git a/htdocs/webportal/class/webportalorder.class.php b/htdocs/webportal/class/webportalorder.class.php
index e9cd8757b61..157dcb25775 100644
--- a/htdocs/webportal/class/webportalorder.class.php
+++ b/htdocs/webportal/class/webportalorder.class.php
@@ -98,7 +98,7 @@ class WebPortalOrder extends Commande
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
diff --git a/htdocs/webportal/class/webportalpartnership.class.php b/htdocs/webportal/class/webportalpartnership.class.php
index 78b87cc04dd..c72ae9397f0 100644
--- a/htdocs/webportal/class/webportalpartnership.class.php
+++ b/htdocs/webportal/class/webportalpartnership.class.php
@@ -97,7 +97,7 @@ class WebPortalPartnership extends Partnership
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
diff --git a/htdocs/webportal/class/webportalpropal.class.php b/htdocs/webportal/class/webportalpropal.class.php
index c49d8bfd686..47669b08c55 100644
--- a/htdocs/webportal/class/webportalpropal.class.php
+++ b/htdocs/webportal/class/webportalpropal.class.php
@@ -98,7 +98,7 @@ class WebPortalPropal extends Propal
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 2da0b7f5390..7d9d21357ed 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -163,7 +163,7 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid'          => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index f7542c226f1..fe291337135 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -96,7 +96,7 @@ class Workstation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 83a326ead04..1b92e15ed02 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -36,7 +36,7 @@ class WorkstationResource extends CommonObject
 	public $element = 'workstationresource';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index 290b6d34714..56c17415242 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -35,7 +35,7 @@ class WorkstationUserGroup extends CommonObject
 	public $element = 'workstationusergroup';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer'),
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index edd9e77cb70..c7e07e39989 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -81,7 +81,7 @@ class Hook extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'rowid' => array(

From 9c21e214d13f0894ac64263428d5b21d9d837f51 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:21:46 +0100
Subject: [PATCH 1797/1862] Fix return type for Categorie::getListForItem()

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 57365ce5f50..0af6aa2953f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -970,7 +970,7 @@ class Categorie extends CommonObject
 	 * @param	string	$sortorder	Sort order
 	 * @param	int		$limit		Limit for list
 	 * @param	int		$page		Page number
-	 * @return  int<-1,0>|array<int,array{id:int,fk_parent:int,label:string,description:string,color:string,position:string,socid:int,type:string,entity:string,array_options:array<string,mixed>,visible:int,ref_ext:string,picto:string,multilangs?:string}> Array of categories, 0 if no cat, -1 on error
+	 * @return  int<-1,0>|array<int,array{id:int,fk_parent:int,label:string,description:string,color:string,position:int,socid:int,type:string,entity:string,array_options:array<string,mixed>,visible:int,ref_ext:string,picto:string,multilangs?:string}> Array of categories, 0 if no cat, -1 on error
 	 */
 	public function getListForItem($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{

From bd14c051333086dd4b8a757acad599000162ad21 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:24:48 +0100
Subject: [PATCH 1798/1862] Fix type for argument $method_trans of
 set_infotrans

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index f94983bb234..3e8e629fc7b 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -672,7 +672,7 @@ class BonPrelevement extends CommonObject
 	 *
 	 *	@param	User		$user		Id of user
 	 *	@param 	int			$date		Date of action
-	 *	@param	string		$method		Method of transmission to bank (0=Internet, 1=Api...)
+	 *	@param	int			$method		Method of transmission to bank (0=Internet, 1=Api...)
 	 *	@return	int						>0 if OK, <0 if KO
 	 */
 	public function set_infotrans($user, $date, $method)

From d30b2d03627d7ec999f2d9912b66f59ddb1f69d6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:28:28 +0100
Subject: [PATCH 1799/1862] Fix default in $fields init

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 5e69aaba3df..2a4a830d124 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1165,7 +1165,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 		'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible' => 3, 'position' => 35),
 		'role'      => array('type' => 'checkbox', 'label' => 'Role', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 4, 'index' => 1, 'position' => 40),
 		'birthday' 	=> array('type' => 'date', 'label' => 'Birthday', 'enabled' => 1, 'visible' => -1, 'notnull' => 0, 'position' => 45),
-		'statut'    => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => 0, 'index' => 1, 'position' => 50, 'arrayofkeyval' => array(0 => $contactstatic->LibStatut(0, 1), 1 => $contactstatic->LibStatut(1, 1))),
+		'statut'    => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => '0', 'index' => 1, 'position' => 50, 'arrayofkeyval' => array(0 => $contactstatic->LibStatut(0, 1), 1 => $contactstatic->LibStatut(1, 1))),
 	);
 
 	// Definition of fields for list

From 4c8b9784951ebe795b68142568364e26dbff60f0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:29:57 +0100
Subject: [PATCH 1800/1862] Fix typing for childtablesoncascade

---
 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 281c658297a..ef98b294f70 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -94,7 +94,7 @@ class EmailCollector extends CommonObject
 	protected $childtables = array();
 
 	/**
-	 * @var array	List of child tables. To know object to delete on cascade.
+	 * @var string[]	List of child tables. To know object to delete on cascade.
 	 */
 	protected $childtablesoncascade = array('emailcollector_emailcollectorfilter', 'emailcollector_emailcollectoraction');
 

From a46dfec5c6595a7712915ec696cac2df501fed1b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:31:28 +0100
Subject: [PATCH 1801/1862] Fix return type for deleteLine

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 7fc5a866eec..c8372f95d95 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2346,7 +2346,7 @@ class ExpenseReport extends CommonObject
 	 * @param   int			$rowid      	Row id
 	 * @param   User|string	$fuser      	User
 	 * @param   int<0,1>	$notrigger      1=No trigger
-	 * @return  int<0,1>                 	Return integer <0 if KO, >0 if OK
+	 * @return  int<-1,1>                 	Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteLine($rowid, $fuser = '', $notrigger = 0)
 	{

From 9730149fab6da07f28ea2aed802e47026e2bf5d9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:35:43 +0100
Subject: [PATCH 1802/1862] Fix typing: childtables can also be list of strings

---
 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 f67471ee76e..892fd02fcdb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -786,7 +786,7 @@ abstract class CommonObject
 	public $extraparams = array();
 
 	/**
-	 * @var array<string,string[]|array{parent:string,parentkey:string}>	List of child tables. To test if we can delete object.
+	 * @var string[]|array<string,string[]|array{parent:string,parentkey:string}>	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array();
 

From c266bdb042ef00ead0f8184c26cbb7be3a9b28a0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:50:22 +0100
Subject: [PATCH 1803/1862] Fix assignement to 'userassigned'

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 3d231680b21..1d4f5412ff2 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1818,7 +1818,7 @@ class Ticket extends CommonObject
 		$actioncomm->socid = $this->socid;
 		$actioncomm->label = $this->subject;
 		$actioncomm->note_private = $this->message;
-		$actioncomm->userassigned = array($user->id);
+		$actioncomm->userassigned = array($user->id => array('id' => $user->id,'transparency' => 0));
 		$actioncomm->userownerid = $user->id;
 		$actioncomm->datep = $now;
 		$actioncomm->percentage = -1; // percentage is not relevant for punctual events

From f892b3a27cc906d26635dafe3743a5ad09b4b3aa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:51:57 +0100
Subject: [PATCH 1804/1862] Fix  configuration

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

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 25a188fa8ee..401d661e5b7 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -113,7 +113,7 @@ class UserGroup extends CommonObject
 
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'default' => 1, 'index' => 1, 'position' => 5),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'default' => '1', 'index' => 1, 'position' => 5),
 		'nom' => array('type' => 'varchar(180)', 'label' => 'Name', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1, 'comment' => 'Group name'),
 		'note' => array('type' => 'html', 'label' => 'Description', 'enabled' => 1, 'visible' => 1, 'position' => 20, 'notnull' => -1, 'searchall' => 1),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'position' => 50, 'notnull' => 1,),

From c8172c65ae73168bb0858708bc223d3faa354f77 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 20:01:36 +0100
Subject: [PATCH 1805/1862] Fix typing for Categorie::getListForItem()  return
 value

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 0af6aa2953f..78bfbb8bb4f 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -271,7 +271,7 @@ class Categorie extends CommonObject
 	public $childs = array();
 
 	/**
-	 * @var array multilangs
+	 * @var array{string,array{label:string,description:string,note?:string}} multilangs
 	 */
 	public $multilangs;
 
@@ -970,7 +970,7 @@ class Categorie extends CommonObject
 	 * @param	string	$sortorder	Sort order
 	 * @param	int		$limit		Limit for list
 	 * @param	int		$page		Page number
-	 * @return  int<-1,0>|array<int,array{id:int,fk_parent:int,label:string,description:string,color:string,position:int,socid:int,type:string,entity:string,array_options:array<string,mixed>,visible:int,ref_ext:string,picto:string,multilangs?:string}> Array of categories, 0 if no cat, -1 on error
+	 * @return  int<-1,0>|array<int,array{id:int,fk_parent:int,label:string,description:string,color:string,position:int,socid:int,type:string,entity:int,array_options:array<string,mixed>,visible:int,ref_ext:string,multilangs?:array{string,array{label:string,description:string,note?:string}}}> Array of categories, 0 if no cat, -1 on error
 	 */
 	public function getListForItem($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{

From 2b4e2cdbb43481cd92fa6711daa08dd6c2ce36dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 00:47:32 +0100
Subject: [PATCH 1806/1862] FIX Inline edition not implemented

---
 htdocs/accountancy/admin/fiscalyear_card.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 70eb459efda..447dcaab4c9 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -313,23 +313,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Label
 	print '<tr><td class="tdtop">';
-	print $form->editfieldkey("Label", 'label', $object->label, $object, 1, 'alpha:32');
+	print $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'alpha:32');
 	print '</td><td colspan="2">';
-	print $form->editfieldval("Label", 'label', $object->label, $object, 1, 'alpha:32');
+	print $form->editfieldval("Label", 'label', $object->label, $object, 0, 'alpha:32');
 	print "</td></tr>";
 
 	// Date start
 	print '<tr><td>';
-	print $form->editfieldkey("DateStart", 'date_start', $object->date_start, $object, 1, 'datepicker');
+	print $form->editfieldkey("DateStart", 'date_start', $object->date_start, $object, 0, 'datepicker');
 	print '</td><td colspan="2">';
-	print $form->editfieldval("DateStart", 'date_start', $object->date_start, $object, 1, 'datepicker');
+	print $form->editfieldval("DateStart", 'date_start', $object->date_start, $object, 0, 'datepicker');
 	print '</td></tr>';
 
 	// Date end
 	print '<tr><td>';
-	print $form->editfieldkey("DateEnd", 'date_end', $object->date_end, $object, 1, 'datepicker');
+	print $form->editfieldkey("DateEnd", 'date_end', $object->date_end, $object, 0, 'datepicker');
 	print '</td><td colspan="2">';
-	print $form->editfieldval("DateEnd", 'date_end', $object->date_end, $object, 1, 'datepicker');
+	print $form->editfieldval("DateEnd", 'date_end', $object->date_end, $object, 0, 'datepicker');
 	print '</td></tr>';
 
 	// Status

From 7e44ab47ca3ed2a67e49380ab763abf1a8ebc4fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 00:48:51 +0100
Subject: [PATCH 1807/1862] FIX Manual deletion of a bookkeeping line

---
 .../accountancy/class/bookkeeping.class.php   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 5c07b8f637f..44f28bae658 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -738,11 +738,10 @@ class BookKeeping extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int $id Id object
-	 * @param string $ref Ref
-	 * @param string $mode 	Mode
-	 *
-	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
+	 * @param int 		$id 	Id object
+	 * @param string 	$ref 	Ref
+	 * @param string 	$mode 	Mode ('' or 'tmp_')
+	 * @return int 				Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null, $mode = '')
 	{
@@ -1545,15 +1544,16 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User 		$user 		User that deletes
 	 * @param int 		$notrigger 	false=launch triggers after, true=disable triggers
-	 * @param string 	$mode 		Mode
+	 * @param string 	$mode 		Mode ('' or 'tmp_')
 	 * @return int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0, $mode = '')
 	{
 		global $langs;
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$result = $this->canModifyBookkeeping($this->id);
+		$result = $this->canModifyBookkeeping($this->id, $mode);
 		if ($result < 0) {
 			return -1;
 		} elseif ($result == 0) {
@@ -2357,9 +2357,10 @@ class BookKeeping extends CommonObject
 	 * Is the bookkeeping can be modified or deleted ?
 	 *
 	 * @param 	int		$id		Bookkeeping ID
+	 * @param 	string 	$mode 	Mode ('' or 'tmp_')
 	 * @return 	int				Return integer <0 if KO, == 0 if No, == 1 if Yes
 	 */
-	public function canModifyBookkeeping($id)
+	public function canModifyBookkeeping($id, $mode = '')
 	{
 		global $conf;
 
@@ -2371,7 +2372,7 @@ class BookKeeping extends CommonObject
 			}
 
 			$bookkeeping = new BookKeeping($this->db);
-			$result = $bookkeeping->fetch($id);
+			$result = $bookkeeping->fetch($id, null, $mode);
 			if ($result <= 0) {
 				return $result;
 			}
@@ -2392,7 +2393,7 @@ class BookKeeping extends CommonObject
 			}
 
 			$bookkeeping = new BookKeeping($this->db);
-			$result = $bookkeeping->fetch($id);
+			$result = $bookkeeping->fetch($id, null, $mode);
 			if ($result <= 0) {
 				return $result;
 			}

From 2fce8f1d461d71ff5bf2f0638d822fff9028cd70 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 00:49:45 +0100
Subject: [PATCH 1808/1862] FIX Bad management on error creation of bookkeeping

---
 htdocs/accountancy/bookkeeping/card.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 79f7c44cda9..3469e8e994c 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -94,6 +94,7 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 /*
  * Actions
  */
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {
@@ -229,7 +230,7 @@ if (empty($reshook)) {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			$result = $object->delete($user, false, $mode);
+			$result = $object->delete($user, 0, $mode);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -269,6 +270,8 @@ if (empty($reshook)) {
 			$result = $object->createStd($user, 0, $mode);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
+
+				$action = 'create';
 			} else {
 				$reshook = $hookmanager->executeHooks('afterCreateBookkeeping', $parameters, $object, $action);
 
@@ -411,6 +414,7 @@ if ($action == 'create') {
 	print '</form>';
 } else {
 	$object = new BookKeeping($db);
+
 	$result = $object->fetchPerMvt($piece_num, $mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -811,7 +815,7 @@ if ($action == 'create') {
 	}
 }
 
-	print dol_get_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

From 79334dbbe4178efd0e41b73dd1c285fca3b6cfb2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 00:49:55 +0100
Subject: [PATCH 1809/1862] Fix regression in GETPOST

---
 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 7ac6bc27cea..f776fb43b9e 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -53,7 +53,7 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
 
 // Search Parameters
-$search_mvt_num = GETPOSTINT('search_mvt_num');
+$search_mvt_num = GETPOST('search_mvt_num', 'intcomma');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
 $search_date_startyear =  GETPOSTINT('search_date_startyear');

From f5259cee654cbfb3d3ca444bd1adab215375950b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 01:02:24 +0100
Subject: [PATCH 1810/1862] Fix regression of GETPOSTINT

---
 htdocs/accountancy/bookkeeping/export.php     | 62 +++++++++----------
 htdocs/accountancy/bookkeeping/list.php       |  4 +-
 .../accountancy/bookkeeping/listbyaccount.php | 38 ++++++------
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 16923e5ebbd..cb9e8ea09d4 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -50,48 +50,48 @@ $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
-$search_mvt_num = GETPOSTINT('search_mvt_num');
+$search_mvt_num = GETPOST('search_mvt_num', 'alpha');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-$search_date_startyear =  GETPOSTINT('search_date_startyear');
-$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
-$search_date_startday =  GETPOSTINT('search_date_startday');
-$search_date_endyear =  GETPOSTINT('search_date_endyear');
-$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
-$search_date_endday =  GETPOSTINT('search_date_endday');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
-$search_date_creation_startyear =  GETPOSTINT('search_date_creation_startyear');
-$search_date_creation_startmonth =  GETPOSTINT('search_date_creation_startmonth');
-$search_date_creation_startday =  GETPOSTINT('search_date_creation_startday');
-$search_date_creation_endyear =  GETPOSTINT('search_date_creation_endyear');
-$search_date_creation_endmonth =  GETPOSTINT('search_date_creation_endmonth');
-$search_date_creation_endday =  GETPOSTINT('search_date_creation_endday');
+$search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
+$search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
+$search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
+$search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
+$search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
+$search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
 $search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);
 $search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);
-$search_date_modification_startyear =  GETPOSTINT('search_date_modification_startyear');
-$search_date_modification_startmonth =  GETPOSTINT('search_date_modification_startmonth');
-$search_date_modification_startday =  GETPOSTINT('search_date_modification_startday');
-$search_date_modification_endyear =  GETPOSTINT('search_date_modification_endyear');
-$search_date_modification_endmonth =  GETPOSTINT('search_date_modification_endmonth');
-$search_date_modification_endday =  GETPOSTINT('search_date_modification_endday');
+$search_date_modification_startyear = GETPOSTINT('search_date_modification_startyear');
+$search_date_modification_startmonth = GETPOSTINT('search_date_modification_startmonth');
+$search_date_modification_startday = GETPOSTINT('search_date_modification_startday');
+$search_date_modification_endyear = GETPOSTINT('search_date_modification_endyear');
+$search_date_modification_endmonth = GETPOSTINT('search_date_modification_endmonth');
+$search_date_modification_endday = GETPOSTINT('search_date_modification_endday');
 $search_date_modification_start = dol_mktime(0, 0, 0, $search_date_modification_startmonth, $search_date_modification_startday, $search_date_modification_startyear);
 $search_date_modification_end = dol_mktime(23, 59, 59, $search_date_modification_endmonth, $search_date_modification_endday, $search_date_modification_endyear);
-$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
-$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
-$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
-$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
-$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
-$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
+$search_date_export_startyear = GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday = GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear = GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday = GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
-$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
-$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
-$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
-$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
-$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
+$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday = GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday = GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index f776fb43b9e..a9931ab2ccb 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -53,7 +53,7 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
 
 // Search Parameters
-$search_mvt_num = GETPOST('search_mvt_num', 'intcomma');
+$search_mvt_num = GETPOST('search_mvt_num', 'alpha');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
 $search_date_startyear =  GETPOSTINT('search_date_startyear');
@@ -154,7 +154,7 @@ $hookmanager->initHooks(array('bookkeepinglist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOSTINT('page') == '' && !GETPOSTINT('noreset') && $user->hasRight('accounting', 'mouvements', 'export')) {
+if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'alpha') == '' && !GETPOSTINT('noreset') && $user->hasRight('accounting', 'mouvements', 'export')) {
 	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values') && !GETPOST('search_accountancy_code_start')) {
 		$query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 		$query .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1";
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index bb549a3bc6d..338ca12e5f0 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -52,29 +52,29 @@ if ($type == 'sub') {
 	$context_default = 'bookkeepingbyaccountlist';
 }
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
-$search_date_startyear =  GETPOSTINT('search_date_startyear');
-$search_date_startmonth =  GETPOSTINT('search_date_startmonth');
-$search_date_startday =  GETPOSTINT('search_date_startday');
-$search_date_endyear =  GETPOSTINT('search_date_endyear');
-$search_date_endmonth =  GETPOSTINT('search_date_endmonth');
-$search_date_endday =  GETPOSTINT('search_date_endday');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
+$search_date_startmonth = GETPOSTINT('search_date_startmonth');
+$search_date_startday = GETPOSTINT('search_date_startday');
+$search_date_endyear = GETPOSTINT('search_date_endyear');
+$search_date_endmonth = GETPOSTINT('search_date_endmonth');
+$search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOSTINT('doc_datemonth'), GETPOSTINT('doc_dateday'), GETPOSTINT('doc_dateyear'));
-$search_date_export_startyear =  GETPOSTINT('search_date_export_startyear');
-$search_date_export_startmonth =  GETPOSTINT('search_date_export_startmonth');
-$search_date_export_startday =  GETPOSTINT('search_date_export_startday');
-$search_date_export_endyear =  GETPOSTINT('search_date_export_endyear');
-$search_date_export_endmonth =  GETPOSTINT('search_date_export_endmonth');
-$search_date_export_endday =  GETPOSTINT('search_date_export_endday');
+$search_date_export_startyear = GETPOSTINT('search_date_export_startyear');
+$search_date_export_startmonth = GETPOSTINT('search_date_export_startmonth');
+$search_date_export_startday = GETPOSTINT('search_date_export_startday');
+$search_date_export_endyear = GETPOSTINT('search_date_export_endyear');
+$search_date_export_endmonth = GETPOSTINT('search_date_export_endmonth');
+$search_date_export_endday = GETPOSTINT('search_date_export_endday');
 $search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
 $search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOSTINT('search_date_validation_startyear');
-$search_date_validation_startmonth =  GETPOSTINT('search_date_validation_startmonth');
-$search_date_validation_startday =  GETPOSTINT('search_date_validation_startday');
-$search_date_validation_endyear =  GETPOSTINT('search_date_validation_endyear');
-$search_date_validation_endmonth =  GETPOSTINT('search_date_validation_endmonth');
-$search_date_validation_endday =  GETPOSTINT('search_date_validation_endday');
+$search_date_validation_startyear = GETPOSTINT('search_date_validation_startyear');
+$search_date_validation_startmonth = GETPOSTINT('search_date_validation_startmonth');
+$search_date_validation_startday = GETPOSTINT('search_date_validation_startday');
+$search_date_validation_endyear = GETPOSTINT('search_date_validation_endyear');
+$search_date_validation_endmonth = GETPOSTINT('search_date_validation_endmonth');
+$search_date_validation_endday = GETPOSTINT('search_date_validation_endday');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
 $search_import_key = GETPOST("search_import_key", 'alpha');
@@ -91,7 +91,7 @@ if ($search_accountancy_code_end == - 1) {
 }
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
-$search_mvt_num = GETPOSTINT('search_mvt_num');
+$search_mvt_num = GETPOST('search_mvt_num', 'alpha');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');

From 6506a547341f1edc7e44ff0fdc1d53b9b59b22f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 01:12:35 +0100
Subject: [PATCH 1811/1862] Fix regression

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

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 44f28bae658..2dc381808fc 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2055,6 +2055,7 @@ class BookKeeping extends CommonObject
 		$error = 0;
 
 		$sql_filter = $this->getCanModifyBookkeepingSQL();
+
 		if (!isset($sql_filter)) {
 			return -1;
 		}
@@ -2344,10 +2345,11 @@ class BookKeeping extends CommonObject
 			$sql_list = array();
 			if (!empty($conf->cache['active_fiscal_period_cached']) && is_array($conf->cache['active_fiscal_period_cached'])) {
 				foreach ($conf->cache['active_fiscal_period_cached'] as $fiscal_period) {
-					$sql_list[] = "('" . $this->db->idate($fiscal_period['date_start']) . "' <= {$alias}doc_date AND {$alias}doc_date <= '" . $this->db->idate($fiscal_period['date_end']) . "')";
+					$sql_list[] = "('" . $this->db->idate($fiscal_period['date_start']) . "' <= ".$this->db->sanitize($alias)."doc_date AND ".$this->db->sanitize($alias)."doc_date <= '" . $this->db->idate($fiscal_period['date_end']) . "')";
 				}
 			}
-			self::$can_modify_bookkeeping_sql_cached[$alias] = !empty($sql_list) ? ' AND (' . $this->db->sanitize(implode(' OR ', $sql_list), 1, 1, 1) . ')' : '';
+			$sqlsanitized = implode(' OR ', $sql_list);
+			self::$can_modify_bookkeeping_sql_cached[$alias] = !empty($sql_list) ? " AND (".$sqlsanitized.")" : "";
 		}
 
 		return self::$can_modify_bookkeeping_sql_cached[$alias];

From d9a114e63d98619b4f00434d29e33022fe2dca25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 01:29:57 +0100
Subject: [PATCH 1812/1862] Look and feel

---
 htdocs/accountancy/closure/index.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index b33efc256e3..378c5a18778 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -309,7 +309,7 @@ if (isset($current_fiscal_period)) {
 	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
 	$head[0][1] = $langs->trans("AccountancyClosureStep1");
 	$head[0][2] = 'step1';
-	print dol_get_fiche_head($head, 'step1', '', -1, 'title_accountancy');
+	print dol_get_fiche_head($head, 'step1', '', -1, '');
 
 	print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep1Desc") . '</span><br>';
 
@@ -355,12 +355,14 @@ if (isset($current_fiscal_period)) {
 	print "</table>\n";
 	print '</div>';
 
+	print '<br>';
+
 	// Step 2
 	$head = array();
 	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
 	$head[0][1] = $langs->trans("AccountancyClosureStep2");
 	$head[0][2] = 'step2';
-	print dol_get_fiche_head($head, 'step2', '', -1, 'title_accountancy');
+	print dol_get_fiche_head($head, 'step2', '', -1, '');
 
 	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep2Desc") . '</span><br>';
 
@@ -371,12 +373,14 @@ if (isset($current_fiscal_period)) {
 	}
 	print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
 
+	print '<br>';
+
 	// Step 3
 	$head = array();
 	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
 	$head[0][1] = $langs->trans("AccountancyClosureStep3");
 	$head[0][2] = 'step3';
-	print dol_get_fiche_head($head, 'step3', '', -1, 'title_accountancy');
+	print dol_get_fiche_head($head, 'step3', '', -1, '');
 
 	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep3Desc") . '</span><br>';
 

From 35670de57c3cf88398ff94bbd7c2085939b949a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 00:45:11 +0000
Subject: [PATCH 1813/1862] Bump mdeweerd/logToCheckStyle from 2024.2.9 to
 2024.3.2

Bumps [mdeweerd/logToCheckStyle](https://github.com/mdeweerd/logtocheckstyle) from 2024.2.9 to 2024.3.2.
- [Commits](https://github.com/mdeweerd/logtocheckstyle/compare/v2024.2.9...2024.3.2)

---
updated-dependencies:
- dependency-name: mdeweerd/logToCheckStyle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit.yml  | 2 +-
 .github/workflows/windows-ci.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index ff99f5bdd74..ac6a5c23954 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -106,7 +106,7 @@ jobs:
           ls -l ~/.cache/pre-commit/
 
       - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.2.9
+        uses: mdeweerd/logToCheckStyle@2024.3.2
         if: ${{ failure() }}
         with:
           in: ${{ env.RAW_LOG }}
diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
index 643c96bb21f..927378fab59 100644
--- a/.github/workflows/windows-ci.yaml
+++ b/.github/workflows/windows-ci.yaml
@@ -152,7 +152,7 @@ jobs:
           echo "PHPUNIT seems to have completed with a test result, reuse the exit code"
           for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
       - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.3.2
+        uses: mdeweerd/logToCheckStyle@2024.3.2
         if: ${{ failure() }}
         with:
           in: ${{ env.PHPUNIT_LOG }}

From 67e5e95fde871082b20b38870c3865cadee234fd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Mar 2024 01:51:35 +0100
Subject: [PATCH 1814/1862] Update 19.0.0-20.0.0.sql

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index 53502e05197..491b563a502 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -242,7 +242,7 @@ ALTER TABLE llx_ticket ADD COLUMN model_pdf varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN last_main_doc varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN extraparams varchar(255);
 ALTER TABLE llx_ticket ADD COLUMN origin_replyto varchar(128);
-ALTER TABLE llx_ticket ADD COLUMN origin_references mediumtext;
+ALTER TABLE llx_ticket ADD COLUMN origin_references text DEFAULT NULL;
 
 ALTER TABLE llx_expensereport MODIFY COLUMN model_pdf varchar(255) DEFAULT NULL;
 ALTER TABLE llx_fichinter_rec MODIFY COLUMN modelpdf varchar(255) DEFAULT NULL;

From 57e2aea2557672243de9e42ee5ff7bd9c452280f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Mar 2024 01:52:03 +0100
Subject: [PATCH 1815/1862] Update llx_ticket-ticket.sql

---
 htdocs/install/mysql/tables/llx_ticket-ticket.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_ticket-ticket.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
index 305b8a1db87..7614bcc1ad7 100644
--- a/htdocs/install/mysql/tables/llx_ticket-ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
@@ -26,7 +26,7 @@ CREATE TABLE llx_ticket
 	fk_contract	integer DEFAULT 0,
 	origin_email   varchar(128),
 	origin_replyto   varchar(128),
-	origin_references   mediumtext,
+	origin_references   text,
 	fk_user_create	integer,
 	fk_user_assign	integer,
 	subject	varchar(255),

From 66faa6dd0e3e62edd7595fafb97d1b5958bad76e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Mar 2024 01:52:57 +0100
Subject: [PATCH 1816/1862] Update ticket.class.php

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 716a75672bb..fe795deac90 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -332,7 +332,7 @@ class Ticket extends CommonObject
 		'fk_user_create' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Author', 'visible' => 1, 'enabled' => 1, 'position' => 15, 'notnull' => 1, 'csslist' => 'tdoverflowmax100 maxwidth150onsmartphone'),
 		'origin_email' => array('type' => 'mail', 'label' => 'OriginEmail', 'visible' => -2, 'enabled' => 1, 'position' => 16, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'csslist' => 'tdoverflowmax150'),
 		'origin_replyto' => array('type' => 'mail', 'label' => 'EmailReplyto', 'visible' => -2, 'enabled' => 1, 'position' => 17, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Email to reply to", 'csslist' => 'tdoverflowmax150'),
-		'origin_references' => array('type' => 'mediumtext', 'label' => 'EmailReferences', 'visible' => -2, 'enabled' => 1, 'position' => 18, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "References from origin email", 'csslist' => 'tdoverflowmax150'),
+		'origin_references' => array('type' => 'text', 'label' => 'EmailReferences', 'visible' => -2, 'enabled' => 1, 'position' => 18, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "References from origin email", 'csslist' => 'tdoverflowmax150'),
 		'subject' => array('type' => 'varchar(255)', 'label' => 'Subject', 'visible' => 1, 'enabled' => 1, 'position' => 19, 'notnull' => -1, 'searchall' => 1, 'help' => "", 'css' => 'maxwidth200 tdoverflowmax200', 'autofocusoncreate' => 1),
 		'type_code' => array('type' => 'varchar(32)', 'label' => 'Type', 'visible' => 1, 'enabled' => 1, 'position' => 20, 'notnull' => -1, 'help' => "", 'csslist' => 'maxwidth125 tdoverflowmax50'),
 		'category_code' => array('type' => 'varchar(32)', 'label' => 'TicketCategory', 'visible' => -1, 'enabled' => 1, 'position' => 21, 'notnull' => -1, 'help' => "", 'css' => 'maxwidth100 tdoverflowmax200'),

From 16eee4775fa365ac1d391695f1841a0cd4da573f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 19 Mar 2024 02:30:05 +0100
Subject: [PATCH 1817/1862] Fix warning

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 6da542ab668..f82945c5abb 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -603,7 +603,7 @@ function CloseBill() {
 	<?php if (getDolGlobalInt("TAKEPOS_NO_GENERIC_THIRDPARTY")) { ?>
 		if ($("#idcustomer").val() == "") {
 			alert("<?php echo $langs->trans('TakePosCustomerMandatory'); ?>");
-			<?php if ($conf->global->TAKEPOS_CHOOSE_CONTACT) { ?>
+			<?php if (getDolGlobalString('TAKEPOS_CHOOSE_CONTACT')) { ?>
 				Contact();
 			<?php } else { ?>
 				Customer();

From 0a1cec7e9bca853c414225baf8b7b61ddb69ce0f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:12 +0100
Subject: [PATCH 1818/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/admin/system/database.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 1f95458a8b2..01e1c5f28b6 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -53,6 +54,7 @@ print '<tr class="oddeven"><td width="300">'.$langs->trans("DatabaseServer").'</
 print '<tr class="oddeven"><td width="300">'.$langs->trans("DatabasePort").'</td><td>'.(empty($conf->db->port) ? $langs->trans("Default") : $conf->db->port).'</td></tr>'."\n";
 print '<tr class="oddeven"><td width="300">'.$langs->trans("DatabaseName").'</td><td>'.$conf->db->name.'</td></tr>'."\n";
 print '<tr class="oddeven"><td width="300">'.$langs->trans("DriverType").'</td><td>'.$conf->db->type.($db->getDriverInfo() ? ' ('.$db->getDriverInfo().')' : '').'</td></tr>'."\n";
+// @phan-suppress-next-line PhanTypeSuspiciousStringExpression  (user is defined in the stdClass)
 print '<tr class="oddeven"><td width="300">'.$langs->trans("User").'</td><td>'.$conf->db->user.'</td></tr>'."\n";
 print '<tr class="oddeven"><td width="300">'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'</td></tr>'."\n";
 print '<tr class="oddeven"><td width="300">'.$langs->trans("DBStoringCharset").'</td><td>'.$db->getDefaultCharacterSetDatabase().'</td></tr>'."\n";

From f252a283d21d2801020abbaadc8e8592feee8045 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:17 +0100
Subject: [PATCH 1819/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 4e34d9a284f..e602896e82f 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -69,6 +69,9 @@ class CSMSFile
 	public $priority;
 	public $class;
 	public $message;
+	/**
+	 * @var bool
+	 */
 	public $nostop;
 
 	public $socid;
@@ -242,7 +245,7 @@ class CSMSFile
 			fwrite($fp, "Priority: ".$this->priority."\n");
 			fwrite($fp, "Class: ".$this->class."\n");
 			fwrite($fp, "Deferred: ".$this->deferred."\n");
-			fwrite($fp, "DisableStop: ".$this->nostop."\n");
+			fwrite($fp, "DisableStop: ".((string) (int) $this->nostop)."\n");
 			fwrite($fp, "DeliveryReceipt: ".$this->deliveryreceipt."\n");
 			fwrite($fp, "Message:\n".$this->message);
 

From f43fd7c934928d14290080ffd24cd531417b9a8d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:19 +0100
Subject: [PATCH 1820/1862] Fix PhanTypeSuspiciousStringExpression

---
 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 892fd02fcdb..27a787447ba 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10135,7 +10135,7 @@ abstract class CommonObject
 							}
 						} else {
 							$error++;
-							$this->errors[] = "You defined a cascade delete on an object $childObject but there is no method deleteByParentField for it";
+							$this->errors[] = "You defined a cascade delete on an object $className/$this->id but there is no method deleteByParentField for it";
 							break;
 						}
 					} else {

From 0cd2b3f06934fce9eb3f51ac5f7ae180439047ca Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:21 +0100
Subject: [PATCH 1821/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index edef301c3de..7d369ebe4f4 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -179,6 +179,9 @@ class FormMail extends Form
 
 	public $substit = array();
 	public $substit_lines = array();
+	/**
+	 * @var array{models:string,langmodels?:string,fileinit?:string[],returnurl:string}
+	 */
 	public $param = array();
 
 	public $withtouser = array();

From 2b7f9b2a865f5e7b5731ba3820ef4e738687dc3a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:23 +0100
Subject: [PATCH 1822/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 72564645e59..4bc69ddc7e6 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,16 +82,16 @@ class Interfaces
 
 		// Check parameters
 		if (!is_object($object) || !is_object($conf)) {	// Error
-			$error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+			$error = 'function run_triggers called with wrong parameters action='.$action.' object='.((string) (int) is_object($object)).' user='.((string) (int) is_object($user)).' langs='.((string) (int) is_object($langs)).' conf='.((string) (int) is_object($conf));
 			dol_syslog(get_class($this).'::run_triggers '.$error, LOG_ERR);
 			$this->errors[] = $error;
 			return -1;
 		}
 		if (!is_object($langs)) {	// Warning
-			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.((string) (int) is_object($object)).' user='.((string) (int) is_object($user)).' langs='.((string) (int) is_object($langs)).' conf='.((string) (int) is_object($conf)), LOG_WARNING);
 		}
 		if (!is_object($user)) {	    // Warning
-			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.((string) (int) is_object($object)).' user='.((string) (int) is_object($user)).' langs='.((string) (int) is_object($langs)).' conf='.((string) (int) is_object($conf)), LOG_WARNING);
 			$user = new User($this->db);
 		}
 

From 4728b1ec5e06536477c4eaa4e8335c14387a453a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:25 +0100
Subject: [PATCH 1823/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index ffde1206773..5c22a696d6d 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -189,7 +189,7 @@ function bank_admin_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @param   Object	$num		val to account statement
+ * @param   string	$num		val to account statement
  * @return  array				Array of tabs to shoc
  */
 function account_statement_prepare_head($object, $num)

From 50379954541b6b2b6c87eddfeed127d9c8dfc07f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:09:27 +0100
Subject: [PATCH 1824/1862] Fix PhanTypeSuspiciousStringExpression

---
 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 4a1beee4bcf..0931f402eb1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3306,7 +3306,7 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
 		try {
 			$localtz = new DateTimeZone($default_timezone);
 		} catch (Exception $e) {
-			dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
+			dol_syslog("Warning dol_tz_string contains an invalid value ".json_encode($_SESSION["dol_tz_string"] ?? null), LOG_WARNING);
 			$default_timezone = @date_default_timezone_get();
 		}
 	} elseif (strrpos($gm, "tz,") !== false) {
@@ -7074,7 +7074,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	$buyer_country_code = $thirdparty_buyer->country_code;
 	$buyer_in_cee = isInEEC($thirdparty_buyer);
 
-	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(getDolGlobalString('SERVICES_ARE_ECOMMERCE_200238EC') ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
+	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".((string) (int) $seller_in_cee).", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".((string) (int) $buyer_in_cee).", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(getDolGlobalString('SERVICES_ARE_ECOMMERCE_200238EC') ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
 
 	// If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)
 	// we use the buyer VAT.
@@ -11763,7 +11763,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param string    	$label      	Label or tooltip of button if $text is provided. Also used as tooltip in title attribute. Can be escaped HTML content or full simple text.
  * @param string    	$text       	Optional : short label on button. Can be escaped HTML content or full simple text.
  * @param string 		$actionType 	'default', 'danger', 'email', 'clone', 'cancel', 'delete', ...
- * @param string|array 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )
+ * @param string|array<int,array{lang:string,enabled:bool,perm:bool,label:string,url:string}> 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )
  * 										Example when an array is used: $arrayforbutaction = array(
  *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),

From b683ad4b66e73885cba57372d44a277982982726 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:34:37 +0100
Subject: [PATCH 1825/1862] Fix $labelToUse

---
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index baf4e960678..b4e95f3fa18 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2022       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -1921,7 +1922,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Credit note
 			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
-				$labeltouse .= (is_object($outputlangsbis) ? (' / '.($outputlangsbis->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangsbis->transnoentities("CreditNotesOrExcessReceived") : $outputlangsbis->transnoentities("CreditNotes")) : '');
+				$labeltouse .= (is_object($outputlangsbis) ? (' / '.(($outputlangsbis->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangsbis->transnoentities("CreditNotesOrExcessReceived") : $outputlangsbis->transnoentities("CreditNotes"))) : '');
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', 0);

From 0284ef4b6672bff053368feddd3e1f150585699f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:38:30 +0100
Subject: [PATCH 1826/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index b05628a951e..54107b65144 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -547,12 +547,12 @@ function compareFirstValue($a, $b)
 /**
  * Rewriting all permissions after any actions
  * @param string      $file            filename or path
- * @param array       $permissions     permissions existing in file
+ * @param array<int,string[]> $permissions permissions existing in file
  * @param int|null    $key             key for permission needed
  * @param array|null  $right           $right to update or add
  * @param string|null $objectname      name of object
  * @param string|null $module          name of module
- * @param int         $action          0 for delete, 1 for add, 2 for update, -1 when delete object completely, -2 for generate rights after add
+ * @param int<-2,2>   $action          0 for delete, 1 for add, 2 for update, -1 when delete object completely, -2 for generate rights after add
  * @return int                         1 if OK,-1 if KO
  */
 function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $module, $action)

From 02ea350a340a57f1ef7730ccb3b63bad1eda58c6 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:38:32 +0100
Subject: [PATCH 1827/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index ddbd7fab4b9..c12fbc08c45 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -92,6 +92,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
 				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url'])) {
+					// @phan-suppress-next-line PhanTypeSuspiciousStringExpression
 					$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
 				}
 				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url'])) {

From bbf2fb82e7fa71bccf5c410ce07d9dd1f05094c7 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:38:34 +0100
Subject: [PATCH 1828/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 9c5d138dfc6..165e09c12b5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -506,6 +506,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			$param = (isset($tmp[1]) ? $tmp[1] : '');
 
 			if ((!preg_match('/mainmenu/i', $param)) || !preg_match('/leftmenu/i', $param)) {
+				// @phan-suppress-next-line PhanTypeSuspiciousStringExpression
 				$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
 			}
 			//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

From 1fc3c3a46d1f9e73f59cf44b472a22111c5eb689 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:38:36 +0100
Subject: [PATCH 1829/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/core/menus/standard/empty.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index b69c34b8111..3d70364cbf9 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -370,6 +370,8 @@ class MenuManager
 				return 0;
 			}
 
+			'@phan-var-force array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> $menu_array';
+
 			if (empty($noout)) {
 				$alt = 0;
 				$altok = 0;

From f9c3d1d48db8baef798b8112fa0df044f7b27a3e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:21 +0100
Subject: [PATCH 1830/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/core/photos_resize.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 393cb4067c1..70c8da59d2a 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2009		Meos
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -581,7 +582,7 @@ if (!empty($conf->use_javascript_ajax)) {
 		      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
 		      <input type="hidden" id="action" name="action" value="confirm_crop" />
 		      <input type="hidden" id="product" name="product" value="'.dol_escape_htmltag($id).'" />
-		      <input type="hidden" id="dol_screenwidth" name="dol_screenwidth" value="'.$_SESSION['dol_screenwidth'].'" />
+		      <input type="hidden" id="dol_screenwidth" name="dol_screenwidth" value="'.($_SESSION['dol_screenwidth'] ?? 'null').'" />
 		      <input type="hidden" id="refsizeforcrop" name="refsizeforcrop" value="'.$refsizeforcrop.'" />
 		      <input type="hidden" id="ratioforcrop" name="ratioforcrop" value="'.$ratioforcrop.'" /><!-- value in field used by js/lib/lib_photoresize.js -->
 		      <input type="hidden" id="imagewidth" name="imagewidth" value="'.$width.'" /><!-- value in field used by js/lib/lib_photoresize.js -->

From e67d1de5bd6692db886a231d46c1997e64c9e75e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:24 +0100
Subject: [PATCH 1831/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index a4c13f5cd4f..42aba1b10ba 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -108,8 +108,11 @@ print '</td></tr>'."\n";
 print '<tr><td>'.$langs->trans('CustomerCode');
 if (!empty($array_query['cust_code'])) {
 	print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
+	$cust_code_str = (string) $array_query['cust_code'];
+} else {
+	$cust_code_str = "null";
 }
-print '</td><td><input type="text" name="cust_code" value="'.$array_query['cust_code'].'"/></td><td>'."\n";
+print '</td><td><input type="text" name="cust_code" value="'.$cust_code_str.'"/></td><td>'."\n";
 print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
 print '</td></tr>'."\n";
 
@@ -339,7 +342,7 @@ if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 	$std_soc = new Societe($db);
 	$action_search = 'query';
 
-	$parameters = array('advtarget'=>1);
+	$parameters = array('advtarget' => 1);
 	if (!empty($advTarget->id)) {
 		$parameters = array('array_query' => $advTarget->filtervalue);
 	}

From 9d4aede5c7a5c1741ba054ed934db7fc3cd5b0b5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:26 +0100
Subject: [PATCH 1832/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 1edea428b6f..3aaff1fe943 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -56,7 +56,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
 	 *
 	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
+	 * @param CommonObject	$object     Object
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf

From 22e370c011ffdb4723e19e35a4d89611c6cb8f86 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:28 +0100
Subject: [PATCH 1833/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/debugbar/class/DataCollector/DolibarrCollector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index c074068dba1..a114937ce59 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -63,6 +64,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info  = $langs->trans('Host').': <strong>'.$conf->db->host.'</strong><br>';
 		$info .= $langs->trans('Port').': <strong>'.$conf->db->port.'</strong><br>';
 		$info .= $langs->trans('Name').': <strong>'.$conf->db->name.'</strong><br>';
+		// @phan-suppress-next-line PhanTypeSuspiciousStringExpression
 		$info .= $langs->trans('User').': <strong>'.$conf->db->user.'</strong><br>';
 		$info .= $langs->trans('Type').': <strong>'.$conf->db->type.'</strong><br>';
 		$info .= $langs->trans('Prefix').': <strong>'.$conf->db->prefix.'</strong><br>';

From fe18e88383448ce0f5b975bceb7f74121b09a1a4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:31 +0100
Subject: [PATCH 1834/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 13ffaf15511..907ec01e668 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2019       Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -465,10 +466,10 @@ while ($i < $imaxinloop) {
 			if (!empty($obj->socid) && $company->id > 0) {
 				print "<td>".$company->getNomUrl(1)."</td>";
 			} else {
-				print "<td>".$obj->societe."</td>";
+				print "<td>".((string) $obj->societe)."</td>";
 			}
 		} else {
-			print "<td>".$obj->societe."</td>";
+			print "<td>".((string) $obj->societe)."</td>";
 		}
 		print "<td>".$donationstatic->getFullName($langs)."</td>";
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datedon), 'day').'</td>';

From 7f4c1fbd06482f295725f0983b3c7e442bee6319 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:34 +0100
Subject: [PATCH 1835/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index ef98b294f70..792440a0db7 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3495,6 +3495,7 @@ class EmailCollector extends CommonObject
 				$params[strtolower($x->attribute)] = $x->value;
 			}
 		}
+		'@phan-var-force array{filename?:string,name?:string,charset?:string} $params';
 
 		// ATTACHMENT
 		// Any part with a filename is an attachment,

From f4c8bc5b1d9b3c5b41335e863c019b394d21dca2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:40:36 +0100
Subject: [PATCH 1836/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 7454e0b7832..dac6efee52c 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -3050,7 +3050,8 @@ class ExpeditionLigne extends CommonObjectLine
 		// update lot
 
 		if (!empty($batch) && isModEnabled('productbatch')) {
-			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");
+			$batch_id_str = $batch_id ?? 'null';
+			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id_str, batch=$batch");
 
 			if (empty($batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);

From c79ca14dd952ebbcf6190591d423588ed1423f63 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 19:59:47 +0100
Subject: [PATCH 1837/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/core/boxes/modules_boxes.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 3ada87e0a10..11af741a6a4 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -194,12 +194,12 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 	/**
 	 * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
 	 *
-	 * @param   array   $head       Array with properties of box title
-	 * @param   array<array<array{tr?:string,text?:string,text2?:string,textnoformat?:string,tooltip?:string,logo?:string,url?:string,maxlength?:string}>>   $contents   Array with properties of box lines
+	 * @param   array{text?:string,sublink?:string,subpicto:?string,nbcol?:int,limit?:int,subclass?:string,graph?:string}   $head       Array with properties of box title
+	 * @param   array<array<array{tr?:string,td?:string,target?:string,text?:string,text2?:string,textnoformat?:string,tooltip?:string,logo?:string,url?:string,maxlength?:string}>>   $contents   Array with properties of box lines
 	 * @param	int		$nooutput	No print, only return string
 	 * @return  string
 	 */
-	public function showBox($head = null, $contents = null, $nooutput = 0)
+	public function showBox($head, $contents, $nooutput = 0)
 	{
 		global $langs, $user, $conf;
 
@@ -231,7 +231,6 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 			$out .= "\n<!-- Box ".get_class($this)." start -->\n";
 
 			$out .= '<div class="box divboxtable boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
-
 			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines) {
 				$out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
 			}
@@ -295,7 +294,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 			// Show box lines
 			if ($nblines) {
 				// Loop on each record
-				for ($i = 0, $n = $nblines; $i < $n; $i++) {
+				foreach (array_keys($contents) as $i) {
 					if (isset($contents[$i])) {
 						// TR
 						if (isset($contents[$i][0]['tr'])) {
@@ -306,7 +305,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 
 						// Loop on each TD
 						$nbcolthisline = count($contents[$i]);
-						for ($j = 0; $j < $nbcolthisline; $j++) {
+						foreach (array_keys($contents[$i]) as $j) {
 							// Define tdparam
 							$tdparam = '';
 							if (!empty($contents[$i][$j]['td'])) {
@@ -417,7 +416,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
 	 *  Return list of widget. Function used by admin page htdoc/admin/widget.
 	 *  List is sorted by widget filename so by priority to run.
 	 *
-	 *  @param	array	$forcedirwidget		null=All default directories. This parameter is used by modulebuilder module only.
+	 *  @param	?string[]	$forcedirwidget		null=All default directories. This parameter is used by modulebuilder module only.
 	 * 	@return	array						Array list of widget
 	 */
 	public static function getWidgetsList($forcedirwidget = null)

From 378bb482c7bb044852bc81cde8d20fcbe0924d47 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 20:51:00 +0100
Subject: [PATCH 1838/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 54107b65144..95e4711b396 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -606,10 +606,11 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 	} else {
 		$error++;
 	}
+	'@phan-var-force array<int,string[]> $permissions';
 	if (!$error) {
 		// prepare permissions array
 		$count_perms = count($permissions);
-		for ($i = 0;$i < $count_perms;$i++) {
+		foreach (array_keys($permissions) as $i) {
 			$permissions[$i][0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', \$r + 1)";
 			$permissions[$i][1] = "\$this->rights[\$r][1] = '".$permissions[$i][1]."'";
 			$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";

From c6d0cb3f5b39b33867e64b7441f1970df7c78169 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 20:51:02 +0100
Subject: [PATCH 1839/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/core/menus/standard/empty.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 3d70364cbf9..1a5fea91f01 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -377,7 +377,7 @@ class MenuManager
 				$altok = 0;
 				$blockvmenuopened = false;
 				$num = count($menu_array);
-				for ($i = 0; $i < $num; $i++) {
+				foreach (array_keys($menu_array) as $i) {
 					$alt++;
 					if (empty($menu_array[$i]['level'])) {
 						$altok++;

From 5c007eede4e95722ddc6ae9c8294ff4cec35b5c1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 20:51:04 +0100
Subject: [PATCH 1840/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 3aaff1fe943..785aac5f0fc 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -135,7 +135,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
 						foreach ($object->linkedObjects['propal'] as $element) {
 							$ret = $element->classifyBilled($user);
@@ -160,7 +160,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
 						foreach ($object->linkedObjects['commande'] as $element) {
 							$ret = $element->classifyBilled($user);
@@ -179,7 +179,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
 						foreach ($object->linkedObjects['propal'] as $element) {
 							$ret = $element->classifyBilled($user);
@@ -198,7 +198,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked shipment = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+					dol_syslog("Amount of linked shipment = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
 					if ($totalonlinkedelements == $object->total_ht) {
 						foreach ($object->linkedObjects['shipping'] as $element) {
 							$ret = $element->setClosed();
@@ -219,7 +219,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked shipment = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+					dol_syslog("Amount of linked shipment = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
 					if ($totalonlinkedelements == $object->total_ht) {
 						foreach ($object->linkedObjects['shipping'] as $element) {
 							$ret = $element->setBilled();
@@ -249,7 +249,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
 						foreach ($object->linkedObjects['order_supplier'] as $element) {
 							$ret = $element->classifyBilled($user);
@@ -271,7 +271,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
 						foreach ($object->linkedObjects['supplier_proposal'] as $element) {
 							$ret = $element->classifyBilled($user);
@@ -317,7 +317,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked reception = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+					dol_syslog("Amount of linked reception = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
 					if ($totalonlinkedelements == $object->total_ht) {
 						foreach ($object->linkedObjects['reception'] as $element) {
 							$ret = $element->setBilled();
@@ -345,7 +345,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							$totalonlinkedelements += $element->total_ht;
 						}
 					}
-					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".json_encode($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
 						foreach ($object->linkedObjects['commande'] as $element) {
 							$ret = $element->classifyBilled($user);

From 702976afaba49864422c7ed6211af812c31353f8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:26 +0100
Subject: [PATCH 1841/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/install/repair.php | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 553796f7c6f..4f2b8adb94f 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2021      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -234,15 +235,15 @@ if ($ok && GETPOST('standard', 'alpha')) {
 	$extrafields = new ExtraFields($db);
 
 	// List of tables that has an extrafield table
-	$listofmodulesextra = array('societe'=>'societe', 'adherent'=>'adherent', 'product'=>'product',
-				'socpeople'=>'socpeople', 'propal'=>'propal', 'commande'=>'commande',
-				'facture'=>'facture', 'facturedet'=>'facturedet', 'facture_rec'=>'facture_rec', 'facturedet_rec'=>'facturedet_rec',
-				'supplier_proposal'=>'supplier_proposal', 'commande_fournisseur'=>'commande_fournisseur',
-				'facture_fourn'=>'facture_fourn', 'facture_fourn_rec'=>'facture_fourn_rec', 'facture_fourn_det'=>'facture_fourn_det', 'facture_fourn_det_rec'=>'facture_fourn_det_rec',
-				'fichinter'=>'fichinter', 'fichinterdet'=>'fichinterdet',
-				'inventory'=>'inventory',
-				'actioncomm'=>'actioncomm', 'bom_bom'=>'bom_bom', 'mrp_mo'=>'mrp_mo',
-				'adherent_type'=>'adherent_type', 'user'=>'user', 'partnership'=>'partnership', 'projet'=>'projet', 'projet_task'=>'projet_task', 'ticket'=>'ticket');
+	$listofmodulesextra = array('societe' => 'societe', 'adherent' => 'adherent', 'product' => 'product',
+				'socpeople' => 'socpeople', 'propal' => 'propal', 'commande' => 'commande',
+				'facture' => 'facture', 'facturedet' => 'facturedet', 'facture_rec' => 'facture_rec', 'facturedet_rec' => 'facturedet_rec',
+				'supplier_proposal' => 'supplier_proposal', 'commande_fournisseur' => 'commande_fournisseur',
+				'facture_fourn' => 'facture_fourn', 'facture_fourn_rec' => 'facture_fourn_rec', 'facture_fourn_det' => 'facture_fourn_det', 'facture_fourn_det_rec' => 'facture_fourn_det_rec',
+				'fichinter' => 'fichinter', 'fichinterdet' => 'fichinterdet',
+				'inventory' => 'inventory',
+				'actioncomm' => 'actioncomm', 'bom_bom' => 'bom_bom', 'mrp_mo' => 'mrp_mo',
+				'adherent_type' => 'adherent_type', 'user' => 'user', 'partnership' => 'partnership', 'projet' => 'projet', 'projet_task' => 'projet_task', 'ticket' => 'ticket');
 	//$listofmodulesextra = array('fichinter'=>'fichinter');
 
 	print '<tr><td colspan="2"><br>*** Check fields into extra table structure match table of definition. If not add column into table</td></tr>';
@@ -275,7 +276,7 @@ if ($ok && GETPOST('standard', 'alpha')) {
 				if (in_array($fieldname, array('rowid', 'tms', 'fk_object', 'import_key'))) {
 					continue;
 				}
-				$arrayoffieldsfound[$fieldname] = array('type'=>$fieldtype);
+				$arrayoffieldsfound[$fieldname] = array('type' => $fieldtype);
 			}
 			print ' - Found '.count($arrayoffieldsfound).' fields into table';
 			if (count($arrayoffieldsfound) > 0) {
@@ -318,12 +319,12 @@ if ($ok && GETPOST('standard', 'alpha')) {
 					}
 
 					$field_desc = array(
-						'type'=>$typedb,
-						'value'=>$lengthdb,
-						'attribute'=>$attribute,
-						'default'=>$default,
-						'extra'=>$extra,
-						'null'=>$null
+						'type' => $typedb,
+						'value' => $lengthdb,
+						'attribute' => $attribute,
+						'default' => $default,
+						'extra' => $extra,
+						'null' => $null
 					);
 					//var_dump($field_desc);exit;
 
@@ -510,7 +511,7 @@ if ($ok && GETPOST('restore_thirdparties_logos')) {
 			if (!empty($name)) {
 				$filetotest = $dolibarr_main_data_root.'/societe/logos/'.$name.$ext;
 				$filetotestsmall = $dolibarr_main_data_root.'/societe/logos/thumbs/'.$name.'_small'.$ext;
-				$exists = dol_is_file($filetotest);
+				$exists = (int) dol_is_file($filetotest);
 				print 'Check thirdparty '.$obj->rowid.' name='.$obj->name.' logo='.$obj->logo.' file '.$filetotest." exists=".$exists."<br>\n";
 				if ($exists) {
 					$filetarget = $dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/'.$name.$ext;
@@ -585,7 +586,7 @@ if ($ok && GETPOST('restore_user_pictures', 'alpha')) {
 				$filetotest = $dolibarr_main_data_root.'/users/'.substr(sprintf('%08d', $obj->rowid), -1, 1).'/'.substr(sprintf('%08d', $obj->rowid), -2, 1).'/'.$name.$ext;
 				$filetotestsmall = $dolibarr_main_data_root.'/users/'.substr(sprintf('%08d', $obj->rowid), -1, 1).'/'.substr(sprintf('%08d', $obj->rowid), -2, 1).'/thumbs/'.$name.'_small'.$ext;
 				$filetotestmini = $dolibarr_main_data_root.'/users/'.substr(sprintf('%08d', $obj->rowid), -1, 1).'/'.substr(sprintf('%08d', $obj->rowid), -2, 1).'/thumbs/'.$name.'_mini'.$ext;
-				$exists = dol_is_file($filetotest);
+				$exists = (int) dol_is_file($filetotest);
 				print 'Check user '.$obj->rowid.' lastname='.$obj->lastname.' firstname='.$obj->firstname.' photo='.$obj->photo.' file '.$filetotest." exists=".$exists."<br>\n";
 				if ($exists) {
 					$filetarget = $dolibarr_main_data_root.'/users/'.$obj->rowid.'/'.$name.$ext;

From a9ac98f6c75ca5e3a51cb09f9f9bc181c59c9b7b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:29 +0100
Subject: [PATCH 1842/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 85e77bbbd79..cc16184788e 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -264,8 +264,7 @@ if (!$error) {
 
 			$db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, (int) $db_port);
 
-			dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
-			//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
+			dol_syslog("databasefortest=".$databasefortest." connected=".json_encode($db->connected)." database_selected=".json_encode($db->database_selected), LOG_DEBUG);
 
 			if (empty($db_create_database) && $db->connected && !$db->database_selected) {
 				print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';

From 3e1aaf8195251f6ade5d71f96160d386d74d285d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:32 +0100
Subject: [PATCH 1843/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/install/step2.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 99170d4c9c6..f62e793beab 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Cedric GROSS            <c.gross@kreiz-it.fr>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -171,7 +172,7 @@ if ($action == "set") {
 
 		$ok = 0;
 		$handle = opendir($dir);
-		dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
+		dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".(is_bool($handle) ? json_encode($handle) : $handle));
 		$tablefound = 0;
 		$tabledata = array();
 		if (is_resource($handle)) {
@@ -269,7 +270,7 @@ if ($action == "set") {
 
 		$okkeys = 0;
 		$handle = opendir($dir);
-		dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
+		dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".(is_bool($handle) ? json_encode($handle) : $handle));
 		$tablefound = 0;
 		$tabledata = array();
 		if (is_resource($handle)) {
@@ -400,7 +401,7 @@ if ($action == "set") {
 		$file = "functions.sql";
 		if (file_exists($dir.$file)) {
 			$fp = fopen($dir.$file, "r");
-			dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
+			dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".(is_bool($fp) ? json_encode($fp) : $fp));
 			if ($fp) {
 				$buffer = '';
 				while (!feof($fp)) {
@@ -467,7 +468,7 @@ if ($action == "set") {
 
 		// Insert data
 		$handle = opendir($dir);
-		dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
+		dolibarr_install_syslog("step2: open directory data ".$dir." handle=".(is_bool($handle) ? json_encode($handle) : $handle));
 		$tablefound = 0;
 		$tabledata = array();
 		if (is_resource($handle)) {
@@ -492,7 +493,7 @@ if ($action == "set") {
 		foreach ($tabledata as $file) {
 			$name = substr($file, 0, dol_strlen($file) - 4);
 			$fp = fopen($dir.$file, "r");
-			dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
+			dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".(is_bool($fp) ? json_encode($fp) : $fp));
 			if ($fp) {
 				$arrayofrequests = array();
 				$linefound = 0;

From c543f1b0021912d19aad1eef095241dc8863e219 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:35 +0100
Subject: [PATCH 1844/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/install/upgrade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 60055abf65e..d80205028c8 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -417,7 +418,7 @@ if (!$ok && isset($argv[1])) {
 }
 dolibarr_install_syslog("Exit ".$ret);
 
-dolibarr_install_syslog("--- upgrade: end ".(!$ok && empty($_GET["ignoreerrors"]))." dirmodule=".$dirmodule);
+dolibarr_install_syslog("--- upgrade: end ".((int) (!$ok && empty($_GET["ignoreerrors"])))." dirmodule=".$dirmodule);
 
 $nonext = (!$ok && empty($_GET["ignoreerrors"])) ? 2 : 0;
 if ($dirmodule) {

From 794dc257c759e38303c227f806f2e0b863e42851 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:38 +0100
Subject: [PATCH 1845/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 2951c1069eb..a67d23b6877 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019 Maxime Kohlhaas <maxime@atm-consulting.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -628,8 +629,7 @@ class Mos extends DolibarrApi
 		}
 
 		// Update status of MO
-		dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
-		//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+		dol_syslog("consumptioncomplete = ".json_encode($consumptioncomplete)." productioncomplete = ".json_encode($productioncomplete));
 		if ($consumptioncomplete && $productioncomplete) {
 			$result = $this->mo->setStatut(Mo::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
 		} else {

From 0ce51708f3e8f7eeac98179051fe29d8151db65a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:40 +0100
Subject: [PATCH 1846/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c13813c342f..7926ba1cfcf 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2023 		Christian Humpel     <christian.humpel@gmail.com>
  * Copyright (C) 2023 		Vincent de Grandpré  <vincent@de-grandpre.quebec>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -422,8 +423,7 @@ if (empty($reshook)) {
 			}
 
 			// Update status of MO
-			dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
-			//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+			dol_syslog("consumptioncomplete = ".json_encode($consumptioncomplete)." productioncomplete = ".json_encode($productioncomplete));
 			if ($consumptioncomplete && $productioncomplete) {
 				$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
 			} else {
@@ -823,7 +823,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline&token='.newToken();
 		$permissiontoaddaconsumeline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED;
-		$parameters = array('morecss'=>'reposition');
+		$parameters = array('morecss' => 'reposition');
 
 		$newcardbutton = '';
 		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
@@ -1432,7 +1432,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$newcardbutton = '';
 		$url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addproduceline&token='.newToken();
 		$permissiontoaddaproductline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED;
-		$parameters = array('morecss'=>'reposition');
+		$parameters = array('morecss' => 'reposition');
 		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
 			if ($nblinetoproduce == 0 || $object->mrptype == 1) {
 				$newcardbutton = dolGetButtonTitle($langs->trans('AddNewProduceLines'), '', 'fa fa-plus-circle size15x', $url, '', $permissiontoaddaproductline, $parameters);

From 31a6a3c9fc38245b4cfbefe66610601164baefa0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:43 +0100
Subject: [PATCH 1847/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index a6ad446ecbe..d9cb5fb5812 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -194,7 +194,7 @@ class MouvementStock extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
 		$error = 0;
-		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
+		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".json_encode($skip_batch));
 
 		// Call hook at beginning
 		global $action, $hookmanager;

From 18600215a15b0d0408c2e6fa6cf6032ec6e1c59b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:45 +0100
Subject: [PATCH 1848/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index b07a0981387..c8ded1e1b76 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1688,7 +1688,7 @@ class Project extends CommonObject
 	 *  @param	bool	$clone_task_file	  Clone file of task (if task are copied)
 	 *  @param	bool	$clone_note		      Clone note of project
 	 *  @param	bool	$move_date		      Move task date on clone
-	 *  @param	integer	$notrigger		      No trigger flag
+	 *  @param	int    	$notrigger		      No trigger flag
 	 *  @param  int     $newthirdpartyid      New thirdparty id
 	 *  @return	int						      New id of clone
 	 */
@@ -1698,7 +1698,7 @@ class Project extends CommonObject
 
 		$error = 0;
 
-		dol_syslog("createFromClone clone_contact=".$clone_contact." clone_task=".$clone_task." clone_project_file=".$clone_project_file." clone_note=".$clone_note." move_date=".$move_date, LOG_DEBUG);
+		dol_syslog("createFromClone clone_contact=".json_encode($clone_contact)." clone_task=".json_encode($clone_task)." clone_project_file=".json_encode($clone_project_file)." clone_note=".json_encode($clone_note)." move_date=".json_encode($move_date), LOG_DEBUG);
 
 		$now = dol_mktime(0, 0, 0, idate('m', dol_now()), idate('d', dol_now()), idate('Y', dol_now()));
 

From 58c7c9acb4fb7bba6a3171b647a2d2802f2e6667 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:43:47 +0100
Subject: [PATCH 1849/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/public/webportal/lib/webportal.lib.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/public/webportal/lib/webportal.lib.php b/htdocs/public/webportal/lib/webportal.lib.php
index cc2ba9ec532..f15b59af5d9 100644
--- a/htdocs/public/webportal/lib/webportal.lib.php
+++ b/htdocs/public/webportal/lib/webportal.lib.php
@@ -1,4 +1,6 @@
 <?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ */
 
 /**
  * \file        htdocs/public/webportal/lib/webportal.lib.php
@@ -9,7 +11,7 @@
 /**
  * Get nav menu
  *
- * @param	array	$Tmenu	Array of menu
+ * @param	array<string,array{id:string,rank:int,url:string,name:string,group:string,override?:int<0,1>,children?:array<array{id:string,rank:int,url:string,name:string,group:string,override?:int<0,1>}>}>	$Tmenu	Array of menu
  * @return  string
  */
 function getNav($Tmenu)
@@ -27,7 +29,7 @@ function getNav($Tmenu)
  * Get nav item
  *
  * TODO : Dropdown is actually not css implemented
- * @param	array	$item	Item of menu
+ * @param	array{id:string,rank:int,url:string,name:string,group:string,override?:int<0,1>,children?:array<array{id:string,rank:int,url:string,name:string,group:string,override?:int<0,1>,active?:bool,separator?:bool}>}	$item	Item of menu
  * @param	int		$deep	Level of deep
  * @return  string
  */
@@ -53,14 +55,15 @@ function getNavItem($item, $deep = 0)
 	}
 
 
-	if (!empty($item['overrride'])) {
-		$menu .= $item['overrride'];
+	if (!empty($item['override'])) {
+		$menu .= $item['override'];
 	} elseif (!empty($item['children'])) {
 		$menuChildren = '';
 		$haveChildActive = false;
 
 		foreach ($item['children'] as $child) {
 			$item = array_replace($itemDefault, $item); // applique les valeurs par default
+			'@phan-var-force array{id:string,rank:int,url:string,name:string,group:string,override?:int<0,1>,active?:bool,separator?:bool}	$child';
 
 			if (!empty($child['separator'])) {
 				$menuChildren .= '<li role="separator" class="divider"></li>';
@@ -100,9 +103,9 @@ function getNavItem($item, $deep = 0)
  * Sort menu
  * uasort callback function to Sort menu fields
  *
- * @param	array $a	PDF lines array fields configs
- * @param 	array $b	PDF lines array fields configs
- * @return 	int                                Return compare result
+ * @param	array{rank?:int} $a	PDF lines array fields configs
+ * @param 	array{rank?:int} $b	PDF lines array fields configs
+ * @return 	int<-1,1>           Return compare result
  *
  * 	// Sorting
  * 	uasort ( $this->cols, array( $this, 'menuSort' ) );

From 16e5ca0b1ed7fc45dd94c8b9aed12ee22f90821e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:07 +0100
Subject: [PATCH 1850/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index ca71a510a1b..e6881132167 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -668,7 +668,7 @@ class Stripe extends CommonObject
 	{
 		global $conf;
 
-		dol_syslog("getSetupIntent description=".$description.' confirmnow='.$confirmnow, LOG_INFO, 1);
+		dol_syslog("getSetupIntent description=".$description.' confirmnow='.json_encode($confirmnow), LOG_INFO, 1);
 
 		$error = 0;
 

From fe5c6484d4e27b0d18d907e4efa7f5e533f30f39 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:10 +0100
Subject: [PATCH 1851/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3d614e9fdd7..1d2430e5d55 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1507,7 +1507,7 @@ if (!empty($conf->use_javascript_ajax)) {
 
 $usediv = (GETPOST('format') == 'div');
 
-print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' usediv='.$usediv.', mobilepage='.(empty($mobilepage) ? '' : $mobilepage).' $_SESSION["basiclayout"]='.(empty($_SESSION["basiclayout"]) ? '' : $_SESSION["basiclayout"]).' conf TAKEPOS_BAR_RESTAURANT='.getDolGlobalString('TAKEPOS_BAR_RESTAURANT').' -->'."\n";
+print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' usediv='.json_encode($usediv).', mobilepage='.(empty($mobilepage) ? '' : $mobilepage).' $_SESSION["basiclayout"]='.(empty($_SESSION["basiclayout"]) ? '' : $_SESSION["basiclayout"]).' conf TAKEPOS_BAR_RESTAURANT='.getDolGlobalString('TAKEPOS_BAR_RESTAURANT').' -->'."\n";
 print '<div class="div-table-responsive-no-min invoice">';
 if ($usediv) {
 	print '<div id="tablelines">';

From 439839f1aa888e8cafed2b9a547d0beb52280d62 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:12 +0100
Subject: [PATCH 1852/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/webservices/server_actioncomm.php | 156 ++++++++++++-----------
 1 file changed, 79 insertions(+), 77 deletions(-)

diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 6bd2c21a0b1..4347affafb2 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2016 	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012	 	Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,11 +83,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'password' => array('name'=>'password', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+		'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'password' => array('name' => 'password', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
 	)
 );
 
@@ -98,37 +99,37 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+		'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+		'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 	)
 );
 
 
 $actioncomm_fields = array(
-	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-	'type_id' => array('name'=>'type_id', 'type'=>'xsd:string'),
-	'type_code' => array('name'=>'type_code', 'type'=>'xsd:string'),
-	'type' => array('name'=>'type', 'type'=>'xsd:string'),
-	'label' => array('name'=>'label', 'type'=>'xsd:string'),
-	'datep' => array('name'=>'datep', 'type'=>'xsd:dateTime'),
-	'datef' => array('name'=>'datef', 'type'=>'xsd:dateTime'),
-	'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
-	'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
-	'note' => array('name'=>'note', 'type'=>'xsd:string'),
-	'percentage' => array('name'=>'percentage', 'type'=>'xsd:string'),
-	'author' => array('name'=>'author', 'type'=>'xsd:string'),
-	'usermod' => array('name'=>'usermod', 'type'=>'xsd:string'),
-	'userownerid' => array('name'=>'userownerid', 'type'=>'xsd:string'),
-	'priority' => array('name'=>'priority', 'type'=>'xsd:string'),
-	'fulldayevent' => array('name'=>'fulldayevent', 'type'=>'xsd:string'),
-	'location' => array('name'=>'location', 'type'=>'xsd:string'),
-	'socid' => array('name'=>'socid', 'type'=>'xsd:string'),
-	'contactid' => array('name'=>'contactid', 'type'=>'xsd:string'),
-	'projectid' => array('name'=>'projectid', 'type'=>'xsd:string'),
-	'fk_element' => array('name'=>'fk_element', 'type'=>'xsd:string'),
-	'elementtype' => array('name'=>'elementtype', 'type'=>'xsd:string'));
+	'id' => array('name' => 'id', 'type' => 'xsd:string'),
+	'ref' => array('name' => 'ref', 'type' => 'xsd:string'),
+	'ref_ext' => array('name' => 'ref_ext', 'type' => 'xsd:string'),
+	'type_id' => array('name' => 'type_id', 'type' => 'xsd:string'),
+	'type_code' => array('name' => 'type_code', 'type' => 'xsd:string'),
+	'type' => array('name' => 'type', 'type' => 'xsd:string'),
+	'label' => array('name' => 'label', 'type' => 'xsd:string'),
+	'datep' => array('name' => 'datep', 'type' => 'xsd:dateTime'),
+	'datef' => array('name' => 'datef', 'type' => 'xsd:dateTime'),
+	'datec' => array('name' => 'datec', 'type' => 'xsd:dateTime'),
+	'datem' => array('name' => 'datem', 'type' => 'xsd:dateTime'),
+	'note' => array('name' => 'note', 'type' => 'xsd:string'),
+	'percentage' => array('name' => 'percentage', 'type' => 'xsd:string'),
+	'author' => array('name' => 'author', 'type' => 'xsd:string'),
+	'usermod' => array('name' => 'usermod', 'type' => 'xsd:string'),
+	'userownerid' => array('name' => 'userownerid', 'type' => 'xsd:string'),
+	'priority' => array('name' => 'priority', 'type' => 'xsd:string'),
+	'fulldayevent' => array('name' => 'fulldayevent', 'type' => 'xsd:string'),
+	'location' => array('name' => 'location', 'type' => 'xsd:string'),
+	'socid' => array('name' => 'socid', 'type' => 'xsd:string'),
+	'contactid' => array('name' => 'contactid', 'type' => 'xsd:string'),
+	'projectid' => array('name' => 'projectid', 'type' => 'xsd:string'),
+	'fk_element' => array('name' => 'fk_element', 'type' => 'xsd:string'),
+	'elementtype' => array('name' => 'elementtype', 'type' => 'xsd:string'));
 
 
 $elementtype = 'actioncomm';
@@ -150,7 +151,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 			$type = 'xsd:string';
 		}
 
-		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		$extrafield_array['options_'.$key] = array('name' => 'options_'.$key, 'type' => $type);
 	}
 }
 if (is_array($extrafield_array)) {
@@ -175,8 +176,8 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-		'code' => array('name'=>'code', 'type'=>'xsd:string'),
-		'libelle' => array('name'=>'libelle', 'type'=>'xsd:string')
+		'code' => array('name' => 'code', 'type' => 'xsd:string'),
+		'libelle' => array('name' => 'libelle', 'type' => 'xsd:string')
 	)
 );
 
@@ -209,9 +210,9 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getListActionCommType',
 	// Entry values
-	array('authentication'=>'tns:authentication'),
+	array('authentication' => 'tns:authentication'),
 	// Exit values
-	array('result'=>'tns:result', 'actioncommtypes'=>'tns:actioncommtypes'),
+	array('result' => 'tns:result', 'actioncommtypes' => 'tns:actioncommtypes'),
 	$ns,
 	$ns.'#getListActionCommType',
 	$styledoc,
@@ -223,9 +224,9 @@ $server->register(
 $server->register(
 	'getActionComm',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'actioncomm'=>'tns:actioncomm'),
+	array('result' => 'tns:result', 'actioncomm' => 'tns:actioncomm'),
 	$ns,
 	$ns.'#getActionComm',
 	$styledoc,
@@ -237,9 +238,9 @@ $server->register(
 $server->register(
 	'createActionComm',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'actioncomm'=>'tns:actioncomm'),
+	array('authentication' => 'tns:authentication', 'actioncomm' => 'tns:actioncomm'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#createActionComm',
 	$styledoc,
@@ -251,9 +252,9 @@ $server->register(
 $server->register(
 	'updateActionComm',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'actioncomm'=>'tns:actioncomm'),
+	array('authentication' => 'tns:authentication', 'actioncomm' => 'tns:actioncomm'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#updateActionComm',
 	$styledoc,
@@ -303,29 +304,29 @@ function getActionComm($authentication, $id)
 			if ($result > 0) {
 				$actioncomm_result_fields = array(
 						'id' => $actioncomm->id,
-						'ref'=> $actioncomm->ref,
-						'ref_ext'=> $actioncomm->ref_ext,
-						'type_id'=> $actioncomm->type_id,
-						'type_code'=> $actioncomm->type_code,
-						'type'=> $actioncomm->type,
-						'label'=> $actioncomm->label,
-						'datep'=> dol_print_date($actioncomm->datep, 'dayhourrfc'),
-						'datef'=> dol_print_date($actioncomm->datef, 'dayhourrfc'),
-						'datec'=> dol_print_date($actioncomm->datec, 'dayhourrfc'),
-						'datem'=> dol_print_date($actioncomm->datem, 'dayhourrfc'),
-						'note'=> $actioncomm->note_private,
-						'percentage'=> $actioncomm->percentage,
-						'author'=> $actioncomm->authorid,
-						'usermod'=> $actioncomm->usermodid,
-						'userownerid'=> $actioncomm->userownerid,
-						'priority'=> $actioncomm->priority,
-						'fulldayevent'=> $actioncomm->fulldayevent,
-						'location'=> $actioncomm->location,
-						'socid'=> $actioncomm->socid,
-						'contactid'=> $actioncomm->contact_id,
-						'projectid'=> $actioncomm->fk_project,
-						'fk_element'=> $actioncomm->fk_element,
-						'elementtype'=> $actioncomm->elementtype
+						'ref' => $actioncomm->ref,
+						'ref_ext' => $actioncomm->ref_ext,
+						'type_id' => $actioncomm->type_id,
+						'type_code' => $actioncomm->type_code,
+						'type' => $actioncomm->type,
+						'label' => $actioncomm->label,
+						'datep' => dol_print_date($actioncomm->datep, 'dayhourrfc'),
+						'datef' => dol_print_date($actioncomm->datef, 'dayhourrfc'),
+						'datec' => dol_print_date($actioncomm->datec, 'dayhourrfc'),
+						'datem' => dol_print_date($actioncomm->datem, 'dayhourrfc'),
+						'note' => $actioncomm->note_private,
+						'percentage' => $actioncomm->percentage,
+						'author' => $actioncomm->authorid,
+						'usermod' => $actioncomm->usermodid,
+						'userownerid' => $actioncomm->userownerid,
+						'priority' => $actioncomm->priority,
+						'fulldayevent' => $actioncomm->fulldayevent,
+						'location' => $actioncomm->location,
+						'socid' => $actioncomm->socid,
+						'contactid' => $actioncomm->contact_id,
+						'projectid' => $actioncomm->fk_project,
+						'fk_element' => $actioncomm->fk_element,
+						'elementtype' => $actioncomm->elementtype
 				);
 
 				$elementtype = 'actioncomm';
@@ -345,8 +346,8 @@ function getActionComm($authentication, $id)
 
 				// Create
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'actioncomm'=>$actioncomm_result_fields);
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'actioncomm' => $actioncomm_result_fields);
 			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
@@ -360,7 +361,7 @@ function getActionComm($authentication, $id)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -399,12 +400,12 @@ function getListActionCommType($authentication)
 			if ($result > 0) {
 				$resultarray = array();
 				foreach ($cactioncomm->liste_array as $code => $libeller) {
-					$resultarray[] = array('code'=>$code, 'libelle'=>$libeller);
+					$resultarray[] = array('code' => $code, 'libelle' => $libeller);
 				}
 
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'actioncommtypes'=>$resultarray);
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'actioncommtypes' => $resultarray);
 			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
@@ -418,7 +419,7 @@ function getListActionCommType($authentication)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -493,7 +494,7 @@ function createActionComm($authentication, $actioncomm)
 
 		if (!$error) {
 			$db->commit();
-			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id);
+			$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''), 'id' => $newobject->id);
 		} else {
 			$db->rollback();
 			$error++;
@@ -503,7 +504,7 @@ function createActionComm($authentication, $actioncomm)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -586,12 +587,13 @@ function updateActionComm($authentication, $actioncomm)
 				$error++;
 			}
 		}
+		'@phan-var-force array{id:string} $actioncomm';
 
 		if ((!$error) && ($objectfound)) {
 			$db->commit();
 			$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'id'=>$object->id
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'id' => $object->id
 			);
 		} elseif ($objectfound) {
 			$db->rollback();
@@ -606,7 +608,7 @@ function updateActionComm($authentication, $actioncomm)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;

From a19b3b20569eefbf81899c89da3ca787a401db1d Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:16 +0100
Subject: [PATCH 1853/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/webservices/server_contact.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 388fe0392c2..0089b625dfe 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      JF FERRY             <jfefe@aternatik.fr>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -706,6 +707,7 @@ function updateContact($authentication, $contact)
 				$error++;
 			}
 		}
+		'@phan-var-force array{id:string} $contact';
 
 		if ((!$error) && ($objectfound)) {
 			$db->commit();

From 187e715bc5750362bc69308439be879f58da9dd3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:19 +0100
Subject: [PATCH 1854/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/core/lib/ws.lib.php            |   5 +-
 htdocs/webservices/server_invoice.php | 215 +++++++++++++-------------
 2 files changed, 111 insertions(+), 109 deletions(-)

diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index a0150d403c8..34d1c8059ab 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,14 +20,14 @@
 /**
  *  \file		htdocs/core/lib/ws.lib.php
  *  \ingroup	webservices
- *  \brief		Set of function for manipulating web services
+ *  \brief		Set of functions for manipulating web services
  */
 
 
 /**
  *  Check authentication array and set error, errorcode, errorlabel
  *
- *  @param	array	$authentication     Array with authentication information ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>)
+ *  @param	array{login:string,password:string,entity:?int,dolibarrkey:string}	$authentication     Array with authentication information ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>)
  *  @param 	int		$error				Number of errors
  *  @param  string	$errorcode			Error string code
  *  @param  string	$errorlabel			Error string label
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 90d916e72b0..bb4d104c18d 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2016       Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -83,11 +84,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'password' => array('name'=>'password', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string')
+		'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+		'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'password' => array('name' => 'password', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string')
 	)
 );
 // Define WSDL Return object
@@ -98,8 +99,8 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+		'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+		'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 	)
 );
 
@@ -111,22 +112,22 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'id' => array('name'=>'id', 'type'=>'xsd:string'),
-		'type' => array('name'=>'type', 'type'=>'xsd:int'),
-		'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
-		'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
-		'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
-		'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
-		'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-		'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-		'total' => array('name'=>'total', 'type'=>'xsd:double'),
-		'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-		'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+		'id' => array('name' => 'id', 'type' => 'xsd:string'),
+		'type' => array('name' => 'type', 'type' => 'xsd:int'),
+		'desc' => array('name' => 'desc', 'type' => 'xsd:string'),
+		'vat_rate' => array('name' => 'vat_rate', 'type' => 'xsd:double'),
+		'qty' => array('name' => 'qty', 'type' => 'xsd:double'),
+		'unitprice' => array('name' => 'unitprice', 'type' => 'xsd:double'),
+		'total_net' => array('name' => 'total_net', 'type' => 'xsd:double'),
+		'total_vat' => array('name' => 'total_vat', 'type' => 'xsd:double'),
+		'total' => array('name' => 'total', 'type' => 'xsd:double'),
+		'date_start' => array('name' => 'date_start', 'type' => 'xsd:date'),
+		'date_end' => array('name' => 'date_end', 'type' => 'xsd:date'),
 		// From product
-		'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
-		'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
-		'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
-		'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
+		'product_id' => array('name' => 'product_id', 'type' => 'xsd:int'),
+		'product_ref' => array('name' => 'product_ref', 'type' => 'xsd:string'),
+		'product_label' => array('name' => 'product_label', 'type' => 'xsd:string'),
+		'product_desc' => array('name' => 'product_desc', 'type' => 'xsd:string')
 	)
 );
 
@@ -168,29 +169,29 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'id' => array('name'=>'id', 'type'=>'xsd:string'),
-		'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-		'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
-		'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:string'),
-		'date' => array('name'=>'date', 'type'=>'xsd:date'),
-		'date_due' => array('name'=>'date_due', 'type'=>'xsd:date'),
-		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-		'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
-		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-		'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:string'),
-		'type' => array('name'=>'type', 'type'=>'xsd:int'),
-		'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
-		'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
-		'total' => array('name'=>'type', 'type'=>'xsd:double'),
-		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-		'status' => array('name'=>'status', 'type'=>'xsd:int'),
-		'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
-		'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
-		'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
-		'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
+		'id' => array('name' => 'id', 'type' => 'xsd:string'),
+		'ref' => array('name' => 'ref', 'type' => 'xsd:string'),
+		'ref_ext' => array('name' => 'ref_ext', 'type' => 'xsd:string'),
+		'thirdparty_id' => array('name' => 'thirdparty_id', 'type' => 'xsd:int'),
+		'fk_user_author' => array('name' => 'fk_user_author', 'type' => 'xsd:string'),
+		'fk_user_valid' => array('name' => 'fk_user_valid', 'type' => 'xsd:string'),
+		'date' => array('name' => 'date', 'type' => 'xsd:date'),
+		'date_due' => array('name' => 'date_due', 'type' => 'xsd:date'),
+		'date_creation' => array('name' => 'date_creation', 'type' => 'xsd:dateTime'),
+		'date_validation' => array('name' => 'date_validation', 'type' => 'xsd:dateTime'),
+		'date_modification' => array('name' => 'date_modification', 'type' => 'xsd:dateTime'),
+		'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:string'),
+		'type' => array('name' => 'type', 'type' => 'xsd:int'),
+		'total_net' => array('name' => 'type', 'type' => 'xsd:double'),
+		'total_vat' => array('name' => 'type', 'type' => 'xsd:double'),
+		'total' => array('name' => 'type', 'type' => 'xsd:double'),
+		'note_private' => array('name' => 'note_private', 'type' => 'xsd:string'),
+		'note_public' => array('name' => 'note_public', 'type' => 'xsd:string'),
+		'status' => array('name' => 'status', 'type' => 'xsd:int'),
+		'close_code' => array('name' => 'close_code', 'type' => 'xsd:string'),
+		'close_note' => array('name' => 'close_note', 'type' => 'xsd:string'),
+		'project_id' => array('name' => 'project_id', 'type' => 'xsd:string'),
+		'lines' => array('name' => 'lines', 'type' => 'tns:LinesArray2')
 	)
 );
 /*
@@ -237,9 +238,9 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getInvoice',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
+	array('result' => 'tns:result', 'invoice' => 'tns:invoice'),
 	$ns,
 	$ns.'#getInvoice',
 	$styledoc,
@@ -249,9 +250,9 @@ $server->register(
 $server->register(
 	'getInvoicesForThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'idthirdparty' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'invoices'=>'tns:InvoicesArray2'),
+	array('result' => 'tns:result', 'invoices' => 'tns:InvoicesArray2'),
 	$ns,
 	$ns.'#getInvoicesForThirdParty',
 	$styledoc,
@@ -261,9 +262,9 @@ $server->register(
 $server->register(
 	'createInvoice',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
+	array('authentication' => 'tns:authentication', 'invoice' => 'tns:invoice'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	$ns,
 	$ns.'#createInvoice',
 	$styledoc,
@@ -273,9 +274,9 @@ $server->register(
 $server->register(
 	'createInvoiceFromOrder',
 	// Entry values
-		array('authentication'=>'tns:authentication', 'id_order'=>'xsd:string', 'ref_order'=>'xsd:string', 'ref_ext_order'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id_order' => 'xsd:string', 'ref_order' => 'xsd:string', 'ref_ext_order' => 'xsd:string'),
 	// Exit values
-		array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	$ns,
 	$ns.'#createInvoiceFromOrder',
 	$styledoc,
@@ -285,9 +286,9 @@ $server->register(
 $server->register(
 	'updateInvoice',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
+	array('authentication' => 'tns:authentication', 'invoice' => 'tns:invoice'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	$ns,
 	$ns.'#updateInvoice',
 	$styledoc,
@@ -340,29 +341,29 @@ function getInvoice($authentication, $id = 0, $ref = '', $ref_ext = '')
 				foreach ($invoice->lines as $line) {
 					//var_dump($line); exit;
 					$linesresp[] = array(
-						'id'=>$line->id,
-						'type'=>$line->product_type,
-												'desc'=>dol_htmlcleanlastbr($line->desc),
-												'total_net'=>$line->total_ht,
-												'total_vat'=>$line->total_tva,
-												'total'=>$line->total_ttc,
-												'vat_rate'=>$line->tva_tx,
-												'qty'=>$line->qty,
-												'unitprice'=> $line->subprice,
-												'date_start'=> $line->date_start ? dol_print_date($line->date_start, 'dayrfc') : '',
-												'date_end'=> $line->date_end ? dol_print_date($line->date_end, 'dayrfc') : '',
-												'product_id'=>$line->fk_product,
-												'product_ref'=>$line->product_ref,
-												'product_label'=>$line->product_label,
-												'product_desc'=>$line->product_desc,
+						'id' => $line->id,
+						'type' => $line->product_type,
+												'desc' => dol_htmlcleanlastbr($line->desc),
+												'total_net' => $line->total_ht,
+												'total_vat' => $line->total_tva,
+												'total' => $line->total_ttc,
+												'vat_rate' => $line->tva_tx,
+												'qty' => $line->qty,
+												'unitprice' => $line->subprice,
+												'date_start' => $line->date_start ? dol_print_date($line->date_start, 'dayrfc') : '',
+												'date_end' => $line->date_end ? dol_print_date($line->date_end, 'dayrfc') : '',
+												'product_id' => $line->fk_product,
+												'product_ref' => $line->product_ref,
+												'product_label' => $line->product_label,
+												'product_desc' => $line->product_desc,
 					);
 					$i++;
 				}
 
 				// Create invoice
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'invoice'=>array(
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'invoice' => array(
 						'id' => $invoice->id,
 						'ref' => $invoice->ref,
 						'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
@@ -400,7 +401,7 @@ function getInvoice($authentication, $id = 0, $ref = '', $ref_ext = '')
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -475,20 +476,20 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 					$linesresp = array();
 					foreach ($invoice->lines as $line) {
 						$linesresp[] = array(
-							'id'=>$line->id,
-							'type'=>$line->product_type,
-							'total_net'=>$line->total_ht,
-							'total_vat'=>$line->total_tva,
-							'total'=>$line->total_ttc,
-							'vat_rate'=>$line->tva_tx,
-							'qty'=>$line->qty,
-							'unitprice'=> $line->subprice,
-							'date_start'=> $line->date_start ? dol_print_date($line->date_start, 'dayrfc') : '',
-							'date_end'=> $line->date_end ? dol_print_date($line->date_end, 'dayrfc') : '',
-							'product_id'=>$line->fk_product,
-							'product_ref'=>$line->product_ref,
-							'product_label'=>$line->product_label,
-							'product_desc'=>$line->product_desc,
+							'id' => $line->id,
+							'type' => $line->product_type,
+							'total_net' => $line->total_ht,
+							'total_vat' => $line->total_tva,
+							'total' => $line->total_ttc,
+							'vat_rate' => $line->tva_tx,
+							'qty' => $line->qty,
+							'unitprice' => $line->subprice,
+							'date_start' => $line->date_start ? dol_print_date($line->date_start, 'dayrfc') : '',
+							'date_end' => $line->date_end ? dol_print_date($line->date_end, 'dayrfc') : '',
+							'product_id' => $line->fk_product,
+							'product_ref' => $line->product_ref,
+							'product_label' => $line->product_label,
+							'product_desc' => $line->product_desc,
 						);
 					}
 
@@ -510,7 +511,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 						'total' => $invoice->total_ttc,
 						'note_private' => $invoice->note_private ? $invoice->note_private : '',
 						'note_public' => $invoice->note_public ? $invoice->note_public : '',
-						'status'=> $invoice->statut,
+						'status' => $invoice->statut,
 						'project_id' => $invoice->fk_project,
 						'close_code' => $invoice->close_code ? $invoice->close_code : '',
 						'close_note' => $invoice->close_note ? $invoice->close_note : '',
@@ -523,8 +524,8 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 			}
 
 			$objectresp = array(
-				'result'=>array('result_code'=>'OK', 'result_label'=>''),
-				'invoices'=>$linesinvoice
+				'result' => array('result_code' => 'OK', 'result_label' => ''),
+				'invoices' => $linesinvoice
 
 			);
 		} else {
@@ -535,7 +536,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -641,8 +642,8 @@ function createInvoice($authentication, $invoice)
 
 		if (!$error) {
 			$db->commit();
-			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
-					'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
+			$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''), 'id' => $new_invoice->id,
+					'ref' => $new_invoice->ref, 'ref_ext' => $new_invoice->ref_ext);
 		} else {
 			$db->rollback();
 			$error++;
@@ -653,7 +654,7 @@ function createInvoice($authentication, $invoice)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -662,11 +663,11 @@ function createInvoice($authentication, $invoice)
 /**
  * Create an invoice from an order
  *
- * @param	array		$authentication		Array of authentication information
+ * @param	array{login:string,password:string,entity:?int,dolibarrkey:string}	$authentication		Array of authentication information
  * @param	string      $id_order			id of order to copy invoice from
  * @param	string      $ref_order			ref of order to copy invoice from
  * @param	string      $ref_ext_order		ref_ext of order to copy invoice from
- * @return	array							Array result
+ * @return	array{result:array{result_code:string,result_label:string},id?:int,ref?:string,ref_ext?:string}	Array result
  */
 function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = '', $ref_ext_order = '')
 {
@@ -732,20 +733,20 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	} else {
-		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref, 'ref_ext'=>$newobject->ref_ext);
+		$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''), 'id' => $newobject->id, 'ref' => $newobject->ref, 'ref_ext' => $newobject->ref_ext);
 	}
 
 	return $objectresp;
 }
 
 /**
- * Uddate an invoice, only change the state of an invoice
+ * Update an invoice, only change the state of an invoice
  *
- * @param	array		$authentication		Array of authentication information
- * @param	array		$invoice			Invoice
- * @return	array							Array result
+ * @param	array{login:string,password:string,entity:?int,dolibarrkey:string}	$authentication		Array of authentication information
+ * @param	array{id:string,ref:string,ref_ext:string,status?:string}			$invoice			Invoice
+ * @return	array{result:array{result_code:string,result_label:string},id?:int,ref?:string,ref_ext?:string}	Array result
  */
 function updateInvoice($authentication, $invoice)
 {
@@ -808,10 +809,10 @@ function updateInvoice($authentication, $invoice)
 		if ((!$error) && ($objectfound)) {
 			$db->commit();
 			$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'id'=>$object->id,
-					'ref'=>$object->ref,
-					'ref_ext'=>$object->ref_ext
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'id' => $object->id,
+					'ref' => $object->ref,
+					'ref_ext' => $object->ref_ext
 			);
 		} elseif ($objectfound) {
 			$db->rollback();
@@ -826,7 +827,7 @@ function updateInvoice($authentication, $invoice)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;

From aa4b84a01874143fc3025dcba9aed217a84923f3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:22 +0100
Subject: [PATCH 1855/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/webservices/server_order.php | 251 ++++++++++++++--------------
 1 file changed, 126 insertions(+), 125 deletions(-)

diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 792f7a5889b..11b375e0211 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2006-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		JF FERRY			<jfefe@aternatik.fr>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.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
@@ -82,11 +83,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-				'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-				'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-				'login' => array('name'=>'login', 'type'=>'xsd:string'),
-				'password' => array('name'=>'password', 'type'=>'xsd:string'),
-				'entity' => array('name'=>'entity', 'type'=>'xsd:string')
+				'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+				'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+				'login' => array('name' => 'login', 'type' => 'xsd:string'),
+				'password' => array('name' => 'password', 'type' => 'xsd:string'),
+				'entity' => array('name' => 'entity', 'type' => 'xsd:string')
 		)
 );
 // Define WSDL Return object
@@ -97,37 +98,37 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-				'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-				'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+				'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+				'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 		)
 );
 
 $line_fields = array(
-	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-	'type' => array('name'=>'type', 'type'=>'xsd:int'),
-	'fk_commande' => array('name'=>'fk_commande', 'type'=>'xsd:int'),
-	'fk_parent_line' => array('name'=>'fk_parent_line', 'type'=>'xsd:int'),
-	'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
-	'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
-	'price' => array('name'=>'price', 'type'=>'xsd:double'),
-	'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
-	'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+	'id' => array('name' => 'id', 'type' => 'xsd:string'),
+	'type' => array('name' => 'type', 'type' => 'xsd:int'),
+	'fk_commande' => array('name' => 'fk_commande', 'type' => 'xsd:int'),
+	'fk_parent_line' => array('name' => 'fk_parent_line', 'type' => 'xsd:int'),
+	'desc' => array('name' => 'desc', 'type' => 'xsd:string'),
+	'qty' => array('name' => 'qty', 'type' => 'xsd:double'),
+	'price' => array('name' => 'price', 'type' => 'xsd:double'),
+	'unitprice' => array('name' => 'unitprice', 'type' => 'xsd:double'),
+	'vat_rate' => array('name' => 'vat_rate', 'type' => 'xsd:double'),
 
-	'remise' => array('name'=>'remise', 'type'=>'xsd:double'),
-	'remise_percent' => array('name'=>'remise_percent', 'type'=>'xsd:double'),
+	'remise' => array('name' => 'remise', 'type' => 'xsd:double'),
+	'remise_percent' => array('name' => 'remise_percent', 'type' => 'xsd:double'),
 
-	'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-	'total' => array('name'=>'total', 'type'=>'xsd:double'),
+	'total_net' => array('name' => 'total_net', 'type' => 'xsd:double'),
+	'total_vat' => array('name' => 'total_vat', 'type' => 'xsd:double'),
+	'total' => array('name' => 'total', 'type' => 'xsd:double'),
 
-	'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-	'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+	'date_start' => array('name' => 'date_start', 'type' => 'xsd:date'),
+	'date_end' => array('name' => 'date_end', 'type' => 'xsd:date'),
 
 	// From product
-	'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
-	'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
-	'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
-	'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
+	'product_id' => array('name' => 'product_id', 'type' => 'xsd:int'),
+	'product_ref' => array('name' => 'product_ref', 'type' => 'xsd:string'),
+	'product_label' => array('name' => 'product_label', 'type' => 'xsd:string'),
+	'product_desc' => array('name' => 'product_desc', 'type' => 'xsd:string')
 );
 
 $elementtype = 'commandedet';
@@ -149,7 +150,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 		} else {
 			$type = 'xsd:string';
 		}
-		$extrafield_line_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		$extrafield_line_array['options_'.$key] = array('name' => 'options_'.$key, 'type' => $type);
 	}
 }
 if (is_array($extrafield_line_array)) {
@@ -198,39 +199,39 @@ $server->wsdl->addComplexType(
 );
 
 $order_fields = array(
-	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-	'ref_client' => array('name'=>'ref_client', 'type'=>'xsd:string'),
-	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-	'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-	'status' => array('name'=>'status', 'type'=>'xsd:int'),
-	'billed' => array('name'=>'billed', 'type'=>'xsd:string'),
-	'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-	'total_localtax1' => array('name'=>'total_localtax1', 'type'=>'xsd:double'),
-	'total_localtax2' => array('name'=>'total_localtax2', 'type'=>'xsd:double'),
-	'total' => array('name'=>'total', 'type'=>'xsd:double'),
-	'date' => array('name'=>'date', 'type'=>'xsd:date'),
-	'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-	'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
-	'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-	'source' => array('name'=>'source', 'type'=>'xsd:string'),
-	'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-	'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-	'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
+	'id' => array('name' => 'id', 'type' => 'xsd:string'),
+	'ref' => array('name' => 'ref', 'type' => 'xsd:string'),
+	'ref_client' => array('name' => 'ref_client', 'type' => 'xsd:string'),
+	'ref_ext' => array('name' => 'ref_ext', 'type' => 'xsd:string'),
+	'thirdparty_id' => array('name' => 'thirdparty_id', 'type' => 'xsd:int'),
+	'status' => array('name' => 'status', 'type' => 'xsd:int'),
+	'billed' => array('name' => 'billed', 'type' => 'xsd:string'),
+	'total_net' => array('name' => 'total_net', 'type' => 'xsd:double'),
+	'total_vat' => array('name' => 'total_vat', 'type' => 'xsd:double'),
+	'total_localtax1' => array('name' => 'total_localtax1', 'type' => 'xsd:double'),
+	'total_localtax2' => array('name' => 'total_localtax2', 'type' => 'xsd:double'),
+	'total' => array('name' => 'total', 'type' => 'xsd:double'),
+	'date' => array('name' => 'date', 'type' => 'xsd:date'),
+	'date_creation' => array('name' => 'date_creation', 'type' => 'xsd:dateTime'),
+	'date_validation' => array('name' => 'date_validation', 'type' => 'xsd:dateTime'),
+	'date_modification' => array('name' => 'date_modification', 'type' => 'xsd:dateTime'),
+	'source' => array('name' => 'source', 'type' => 'xsd:string'),
+	'note_private' => array('name' => 'note_private', 'type' => 'xsd:string'),
+	'note_public' => array('name' => 'note_public', 'type' => 'xsd:string'),
+	'project_id' => array('name' => 'project_id', 'type' => 'xsd:string'),
 
-	'mode_reglement_id' => array('name'=>'mode_reglement_id', 'type'=>'xsd:string'),
-	'mode_reglement_code' => array('name'=>'mode_reglement_code', 'type'=>'xsd:string'),
-	'mode_reglement' => array('name'=>'mode_reglement', 'type'=>'xsd:string'),
-	'cond_reglement_id' => array('name'=>'cond_reglement_id', 'type'=>'xsd:string'),
-	'cond_reglement_code' => array('name'=>'cond_reglement_code', 'type'=>'xsd:string'),
-	'cond_reglement' => array('name'=>'cond_reglement', 'type'=>'xsd:string'),
-	'cond_reglement_doc' => array('name'=>'cond_reglement_doc', 'type'=>'xsd:string'),
+	'mode_reglement_id' => array('name' => 'mode_reglement_id', 'type' => 'xsd:string'),
+	'mode_reglement_code' => array('name' => 'mode_reglement_code', 'type' => 'xsd:string'),
+	'mode_reglement' => array('name' => 'mode_reglement', 'type' => 'xsd:string'),
+	'cond_reglement_id' => array('name' => 'cond_reglement_id', 'type' => 'xsd:string'),
+	'cond_reglement_code' => array('name' => 'cond_reglement_code', 'type' => 'xsd:string'),
+	'cond_reglement' => array('name' => 'cond_reglement', 'type' => 'xsd:string'),
+	'cond_reglement_doc' => array('name' => 'cond_reglement_doc', 'type' => 'xsd:string'),
 
-	'date_livraison' => array('name'=>'date_livraison', 'type'=>'xsd:date'),
-	'demand_reason_id' => array('name'=>'demand_reason_id', 'type'=>'xsd:string'),
+	'date_livraison' => array('name' => 'date_livraison', 'type' => 'xsd:date'),
+	'demand_reason_id' => array('name' => 'demand_reason_id', 'type' => 'xsd:string'),
 
-	'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
+	'lines' => array('name' => 'lines', 'type' => 'tns:LinesArray2')
 );
 
 $elementtype = 'commande';
@@ -252,7 +253,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 		} else {
 			$type = 'xsd:string';
 		}
-		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		$extrafield_array['options_'.$key] = array('name' => 'options_'.$key, 'type' => $type);
 	}
 }
 if (is_array($extrafield_array)) {
@@ -312,8 +313,8 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 // Register WSDL
 $server->register(
 	'getOrder',
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'), // Entry values
-	array('result'=>'tns:result', 'order'=>'tns:order'), // Exit values
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'), // Entry values
+	array('result' => 'tns:result', 'order' => 'tns:order'), // Exit values
 	$ns,
 	$ns.'#getOrder',
 	$styledoc,
@@ -323,8 +324,8 @@ $server->register(
 
 $server->register(
 	'getOrdersForThirdParty',
-	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'), // Entry values
-	array('result'=>'tns:result', 'orders'=>'tns:OrdersArray2'), // Exit values
+	array('authentication' => 'tns:authentication', 'idthirdparty' => 'xsd:string'), // Entry values
+	array('result' => 'tns:result', 'orders' => 'tns:OrdersArray2'), // Exit values
 	$ns,
 	$ns.'#getOrdersForThirdParty',
 	$styledoc,
@@ -334,8 +335,8 @@ $server->register(
 
 $server->register(
 	'createOrder',
-	array('authentication'=>'tns:authentication', 'order'=>'tns:order'), // Entry values
-	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'), // Exit values
+	array('authentication' => 'tns:authentication', 'order' => 'tns:order'), // Entry values
+	array('result' => 'tns:result', 'id' => 'xsd:string', 'ref' => 'xsd:string'), // Exit values
 	$ns,
 	$ns.'#createOrder',
 	$styledoc,
@@ -345,8 +346,8 @@ $server->register(
 
 $server->register(
 	'updateOrder',
-	array('authentication'=>'tns:authentication', 'order'=>'tns:order'), // Entry values
-	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'), // Exit values
+	array('authentication' => 'tns:authentication', 'order' => 'tns:order'), // Entry values
+	array('result' => 'tns:result', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'), // Exit values
 	$ns,
 	$ns.'#updateOrder',
 	$styledoc,
@@ -356,8 +357,8 @@ $server->register(
 
 $server->register(
 	'validOrder',
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'id_warehouse'=>'xsd:string'), // Entry values
-	array('result'=>'tns:result'), // Exit values
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'id_warehouse' => 'xsd:string'), // Entry values
+	array('result' => 'tns:result'), // Exit values
 	$ns,
 	$ns.'#validOrder',
 	$styledoc,
@@ -424,34 +425,34 @@ function getOrder($authentication, $id = 0, $ref = '', $ref_ext = '')
 					foreach ($order->lines as $line) {
 						//var_dump($line); exit;
 						$linesresp[] = array(
-						'id'=>$line->rowid,
-						'fk_commande'=>$line->fk_commande,
-						'fk_parent_line'=>$line->fk_parent_line,
-						'desc'=>$line->desc,
-						'qty'=>$line->qty,
-						'price'=>$line->price,
-						'unitprice'=>$line->subprice,
-						'vat_rate'=>$line->tva_tx,
-						'remise'=>$line->remise,
-						'remise_percent'=>$line->remise_percent,
-						'product_id'=>$line->fk_product,
-						'product_type'=>$line->product_type,
-						'total_net'=>$line->total_ht,
-						'total_vat'=>$line->total_tva,
-						'total'=>$line->total_ttc,
-						'date_start'=>$line->date_start,
-						'date_end'=>$line->date_end,
-						'product_ref'=>$line->product_ref,
-						'product_label'=>$line->product_label,
-						'product_desc'=>$line->product_desc
+						'id' => $line->rowid,
+						'fk_commande' => $line->fk_commande,
+						'fk_parent_line' => $line->fk_parent_line,
+						'desc' => $line->desc,
+						'qty' => $line->qty,
+						'price' => $line->price,
+						'unitprice' => $line->subprice,
+						'vat_rate' => $line->tva_tx,
+						'remise' => $line->remise,
+						'remise_percent' => $line->remise_percent,
+						'product_id' => $line->fk_product,
+						'product_type' => $line->product_type,
+						'total_net' => $line->total_ht,
+						'total_vat' => $line->total_tva,
+						'total' => $line->total_ttc,
+						'date_start' => $line->date_start,
+						'date_end' => $line->date_end,
+						'product_ref' => $line->product_ref,
+						'product_label' => $line->product_label,
+						'product_desc' => $line->product_desc
 						);
 						$i++;
 					}
 
 					// Create order
 					$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'order'=>array(
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'order' => array(
 					'id' => $order->id,
 					'ref' => $order->ref,
 					'ref_client' => $order->ref_client,
@@ -503,7 +504,7 @@ function getOrder($authentication, $id = 0, $ref = '', $ref_ext = '')
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -579,26 +580,26 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 					$linesresp = array();
 					foreach ($order->lines as $line) {
 						$linesresp[] = array(
-						'id'=>$line->rowid,
-						'type'=>$line->product_type,
-						'fk_commande'=>$line->fk_commande,
-						'fk_parent_line'=>$line->fk_parent_line,
-						'desc'=>$line->desc,
-						'qty'=>$line->qty,
-						'price'=>$line->price,
-						'unitprice'=>$line->subprice,
-						'tva_tx'=>$line->tva_tx,
-						'remise'=>$line->remise,
-						'remise_percent'=>$line->remise_percent,
-						'total_net'=>$line->total_ht,
-						'total_vat'=>$line->total_tva,
-						'total'=>$line->total_ttc,
-						'date_start'=>$line->date_start,
-						'date_end'=>$line->date_end,
-						'product_id'=>$line->fk_product,
-						'product_ref'=>$line->product_ref,
-						'product_label'=>$line->product_label,
-						'product_desc'=>$line->product_desc
+						'id' => $line->rowid,
+						'type' => $line->product_type,
+						'fk_commande' => $line->fk_commande,
+						'fk_parent_line' => $line->fk_parent_line,
+						'desc' => $line->desc,
+						'qty' => $line->qty,
+						'price' => $line->price,
+						'unitprice' => $line->subprice,
+						'tva_tx' => $line->tva_tx,
+						'remise' => $line->remise,
+						'remise_percent' => $line->remise_percent,
+						'total_net' => $line->total_ht,
+						'total_vat' => $line->total_tva,
+						'total' => $line->total_ttc,
+						'date_start' => $line->date_start,
+						'date_end' => $line->date_end,
+						'product_id' => $line->fk_product,
+						'product_ref' => $line->product_ref,
+						'product_label' => $line->product_label,
+						'product_desc' => $line->product_desc
 						);
 					}
 
@@ -644,8 +645,8 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 			}
 
 			$objectresp = array(
-			'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			'orders'=>$linesorders
+			'result' => array('result_code' => 'OK', 'result_label' => ''),
+			'orders' => $linesorders
 
 			);
 		} else {
@@ -656,7 +657,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -786,7 +787,7 @@ function createOrder($authentication, $order)
 		if ($result >= 0) {
 			dol_syslog("Webservice server_order:: order creation & validation succeeded, commit", LOG_DEBUG);
 			$db->commit();
-			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+			$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''), 'id' => $newobject->id, 'ref' => $newobject->ref);
 		} else {
 			dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
 			$db->rollback();
@@ -797,7 +798,7 @@ function createOrder($authentication, $order)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -865,10 +866,10 @@ function validOrder($authentication, $id = 0, $id_warehouse = 0)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	} else {
 		$db->commit();
-		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
+		$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''));
 	}
 
 	return $objectresp;
@@ -878,7 +879,7 @@ function validOrder($authentication, $id = 0, $id_warehouse = 0)
  * Update an order
  *
  * @param	array		$authentication		Array of authentication information
- * @param	array		$order				Order info
+ * @param	array{id:string,ref:string,refext:string}	$order	Order info
  * @return	array							Array result
  */
 function updateOrder($authentication, $order)
@@ -969,10 +970,10 @@ function updateOrder($authentication, $order)
 		if ((!$error) && ($objectfound)) {
 			$db->commit();
 			$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'id'=>$object->id,
-					'ref'=>$object->ref,
-					'ref_ext'=>$object->ref_ext
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'id' => $object->id,
+					'ref' => $object->ref,
+					'ref_ext' => $object->ref_ext
 			);
 		} elseif ($objectfound) {
 			$db->rollback();
@@ -987,7 +988,7 @@ function updateOrder($authentication, $order)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;

From 5b2758327d0bf3085ee76f19ab94a81569b05fb5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:25 +0100
Subject: [PATCH 1856/1862] Fix PhanTypeSuspiciousStringExpression

---
 htdocs/webservices/server_thirdparty.php | 165 ++++++++++++-----------
 1 file changed, 84 insertions(+), 81 deletions(-)

diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 353387f7681..a768b970652 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,11 +82,11 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'dolibarrkey' => array('name'=>'dolibarrkey', 'type'=>'xsd:string'),
-		'sourceapplication' => array('name'=>'sourceapplication', 'type'=>'xsd:string'),
-		'login' => array('name'=>'login', 'type'=>'xsd:string'),
-		'password' => array('name'=>'password', 'type'=>'xsd:string'),
-		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'),
+		'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'),
+		'login' => array('name' => 'login', 'type' => 'xsd:string'),
+		'password' => array('name' => 'password', 'type' => 'xsd:string'),
+		'entity' => array('name' => 'entity', 'type' => 'xsd:string'),
 	)
 );
 // Define WSDL Return object
@@ -96,48 +97,48 @@ $server->wsdl->addComplexType(
 	'all',
 	'',
 	array(
-		'result_code' => array('name'=>'result_code', 'type'=>'xsd:string'),
-		'result_label' => array('name'=>'result_label', 'type'=>'xsd:string'),
+		'result_code' => array('name' => 'result_code', 'type' => 'xsd:string'),
+		'result_label' => array('name' => 'result_label', 'type' => 'xsd:string'),
 	)
 );
 
 
 $thirdparty_fields = array(
-		'id' => array('name'=>'id', 'type'=>'xsd:string'),
-		'ref' => array('name'=>'name', 'type'=>'xsd:string'),
-		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
-		'status' => array('name'=>'status', 'type'=>'xsd:string'),
-		'client' => array('name'=>'client', 'type'=>'xsd:string'),
-		'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
-		'customer_code' => array('name'=>'customer_code', 'type'=>'xsd:string'),
-		'supplier_code' => array('name'=>'supplier_code', 'type'=>'xsd:string'),
-		'customer_code_accountancy' => array('name'=>'customer_code_accountancy', 'type'=>'xsd:string'),
-		'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy', 'type'=>'xsd:string'),
-		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-		'address' => array('name'=>'address', 'type'=>'xsd:string'),
-		'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
-		'town' => array('name'=>'town', 'type'=>'xsd:string'),
-		'region_code' => array('name'=>'region_code', 'type'=>'xsd:string'),
-		'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-		'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-		'country' => array('name'=>'country', 'type'=>'xsd:string'),
-		'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
-		'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
-		'email' => array('name'=>'email', 'type'=>'xsd:string'),
-		'url' => array('name'=>'url', 'type'=>'xsd:string'),
-		'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
-		'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
-		'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
-		'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
-		'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
-		'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
-		'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
-		'vat_used' => array('name'=>'vat_used', 'type'=>'xsd:string'),
-		'vat_number' => array('name'=>'vat_number', 'type'=>'xsd:string'));
+		'id' => array('name' => 'id', 'type' => 'xsd:string'),
+		'ref' => array('name' => 'name', 'type' => 'xsd:string'),
+		'ref_ext' => array('name' => 'ref_ext', 'type' => 'xsd:string'),
+		'fk_user_author' => array('name' => 'fk_user_author', 'type' => 'xsd:string'),
+		'status' => array('name' => 'status', 'type' => 'xsd:string'),
+		'client' => array('name' => 'client', 'type' => 'xsd:string'),
+		'supplier' => array('name' => 'supplier', 'type' => 'xsd:string'),
+		'customer_code' => array('name' => 'customer_code', 'type' => 'xsd:string'),
+		'supplier_code' => array('name' => 'supplier_code', 'type' => 'xsd:string'),
+		'customer_code_accountancy' => array('name' => 'customer_code_accountancy', 'type' => 'xsd:string'),
+		'supplier_code_accountancy' => array('name' => 'supplier_code_accountancy', 'type' => 'xsd:string'),
+		'date_creation' => array('name' => 'date_creation', 'type' => 'xsd:dateTime'),
+		'date_modification' => array('name' => 'date_modification', 'type' => 'xsd:dateTime'),
+		'note_private' => array('name' => 'note_private', 'type' => 'xsd:string'),
+		'note_public' => array('name' => 'note_public', 'type' => 'xsd:string'),
+		'address' => array('name' => 'address', 'type' => 'xsd:string'),
+		'zip' => array('name' => 'zip', 'type' => 'xsd:string'),
+		'town' => array('name' => 'town', 'type' => 'xsd:string'),
+		'region_code' => array('name' => 'region_code', 'type' => 'xsd:string'),
+		'country_id' => array('name' => 'country_id', 'type' => 'xsd:string'),
+		'country_code' => array('name' => 'country_code', 'type' => 'xsd:string'),
+		'country' => array('name' => 'country', 'type' => 'xsd:string'),
+		'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
+		'fax' => array('name' => 'fax', 'type' => 'xsd:string'),
+		'email' => array('name' => 'email', 'type' => 'xsd:string'),
+		'url' => array('name' => 'url', 'type' => 'xsd:string'),
+		'profid1' => array('name' => 'profid1', 'type' => 'xsd:string'),
+		'profid2' => array('name' => 'profid2', 'type' => 'xsd:string'),
+		'profid3' => array('name' => 'profid3', 'type' => 'xsd:string'),
+		'profid4' => array('name' => 'profid4', 'type' => 'xsd:string'),
+		'profid5' => array('name' => 'profid5', 'type' => 'xsd:string'),
+		'profid6' => array('name' => 'profid6', 'type' => 'xsd:string'),
+		'capital' => array('name' => 'capital', 'type' => 'xsd:string'),
+		'vat_used' => array('name' => 'vat_used', 'type' => 'xsd:string'),
+		'vat_number' => array('name' => 'vat_number', 'type' => 'xsd:string'));
 
 $elementtype = 'societe';
 
@@ -159,7 +160,7 @@ if (isset($extrafields->attributes[$elementtype]['label']) && is_array($extrafie
 			$type = 'xsd:string';
 		}
 
-		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		$extrafield_array['options_'.$key] = array('name' => 'options_'.$key, 'type' => $type);
 	}
 }
 
@@ -186,9 +187,9 @@ $server->wsdl->addComplexType(
 	'',
 	array(
 		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
-		'client' => array('name'=>'client', 'type'=>'xsd:string'),
-		'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
-		'category' => array('name'=>'category', 'type'=>'xsd:string')
+		'client' => array('name' => 'client', 'type' => 'xsd:string'),
+		'supplier' => array('name' => 'supplier', 'type' => 'xsd:string'),
+		'category' => array('name' => 'category', 'type' => 'xsd:string')
 	)
 );
 
@@ -200,7 +201,7 @@ $server->wsdl->addComplexType(
 	'SOAP-ENC:Array',
 	array(),
 	array(
-		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:thirdparty[]')
+		array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:thirdparty[]')
 	),
 	'tns:thirdparty'
 );
@@ -232,9 +233,9 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 $server->register(
 	'getThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'barcode'=>'xsd:string', 'profid1'=>'xsd:string', 'profid2'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string', 'barcode' => 'xsd:string', 'profid1' => 'xsd:string', 'profid2' => 'xsd:string'),
 	// Exit values
-	array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
+	array('result' => 'tns:result', 'thirdparty' => 'tns:thirdparty'),
 	$ns,
 	$ns.'#getThirdParty',
 	$styledoc,
@@ -246,9 +247,9 @@ $server->register(
 $server->register(
 	'createThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
+	array('authentication' => 'tns:authentication', 'thirdparty' => 'tns:thirdparty'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string', 'ref' => 'xsd:string'),
 	$ns,
 	$ns.'#createThirdParty',
 	$styledoc,
@@ -260,9 +261,9 @@ $server->register(
 $server->register(
 	'updateThirdParty',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
+	array('authentication' => 'tns:authentication', 'thirdparty' => 'tns:thirdparty'),
 	// Exit values
-	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#updateThirdParty',
 	$styledoc,
@@ -275,9 +276,9 @@ $server->register(
 $server->register(
 	'getListOfThirdParties',
 	// Entry values
-	array('authentication'=>'tns:authentication', 'filterthirdparty'=>'tns:filterthirdparty'),
+	array('authentication' => 'tns:authentication', 'filterthirdparty' => 'tns:filterthirdparty'),
 	// Exit values
-	array('result'=>'tns:result', 'thirdparties'=>'tns:ThirdPartiesArray2'),
+	array('result' => 'tns:result', 'thirdparties' => 'tns:ThirdPartiesArray2'),
 	$ns,
 	$ns.'#getListOfThirdParties',
 	$styledoc,
@@ -289,9 +290,9 @@ $server->register(
 $server->register(
 	'deleteThirdParty',
 	// Entry values
-		array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	array('authentication' => 'tns:authentication', 'id' => 'xsd:string', 'ref' => 'xsd:string', 'ref_ext' => 'xsd:string'),
 	// Exit values
-		array('result'=>'tns:result', 'id'=>'xsd:string'),
+	array('result' => 'tns:result', 'id' => 'xsd:string'),
 	$ns,
 	$ns.'#deleteThirdParty',
 	$styledoc,
@@ -401,8 +402,8 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $bar
 
 				// Create
 				$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'thirdparty'=>$thirdparty_result_fields);
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'thirdparty' => $thirdparty_result_fields);
 			} elseif ($result == -2) {
 				$error++;
 				$errorcode = 'DUPLICATE_FOUND';
@@ -420,7 +421,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $bar
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -544,7 +545,7 @@ function createThirdParty($authentication, $thirdparty)
 				$newobject->add_commercial($fuser, $thirdparty["commid"]);
 			}
 
-			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+			$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''), 'id' => $newobject->id, 'ref' => $newobject->ref);
 		} else {
 			$db->rollback();
 			$error++;
@@ -554,7 +555,7 @@ function createThirdParty($authentication, $thirdparty)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -669,11 +670,13 @@ function updateThirdParty($authentication, $thirdparty)
 			}
 		}
 
+		'@phan-var-force array{id:string} $thirdparty';
+
 		if ((!$error) && ($objectfound)) {
 			$db->commit();
 			$objectresp = array(
-					'result'=>array('result_code'=>'OK', 'result_label'=>''),
-					'id'=>$object->id
+					'result' => array('result_code' => 'OK', 'result_label' => ''),
+					'id' => $object->id
 			);
 		} elseif ($objectfound) {
 			$db->rollback();
@@ -688,7 +691,7 @@ function updateThirdParty($authentication, $thirdparty)
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;
@@ -769,16 +772,16 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 					}
 				}
 
-				$arraythirdparties[] = array('id'=>$obj->socRowid,
-					'ref'=>$obj->ref,
-					'ref_ext'=>$obj->ref_ext,
-					'address'=>$obj->address,
-					'zip'=>$obj->zip,
-					'town'=>$obj->town,
-					'country'=>$obj->country,
-					'phone'=>$obj->phone,
-					'fax'=>$obj->fax,
-					'url'=>$obj->url
+				$arraythirdparties[] = array('id' => $obj->socRowid,
+					'ref' => $obj->ref,
+					'ref_ext' => $obj->ref_ext,
+					'address' => $obj->address,
+					'zip' => $obj->zip,
+					'town' => $obj->town,
+					'country' => $obj->country,
+					'phone' => $obj->phone,
+					'fax' => $obj->fax,
+					'url' => $obj->url
 				);
 				$arraythirdparties[$i] = array_merge($arraythirdparties[$i], $extrafieldsOptions);
 
@@ -793,13 +796,13 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 
 	if ($error) {
 		$objectresp = array(
-			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-			'thirdparties'=>$arraythirdparties
+			'result' => array('result_code' => $errorcode, 'result_label' => $errorlabel),
+			'thirdparties' => $arraythirdparties
 		);
 	} else {
 		$objectresp = array(
-			'result'=>array('result_code' => 'OK', 'result_label' => ''),
-			'thirdparties'=>$arraythirdparties
+			'result' => array('result_code' => 'OK', 'result_label' => ''),
+			'thirdparties' => $arraythirdparties
 		);
 	}
 
@@ -855,7 +858,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 				if ($result > 0) {
 					$db->commit();
 
-					$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
+					$objectresp = array('result' => array('result_code' => 'OK', 'result_label' => ''));
 				} else {
 					$db->rollback();
 					$error++;
@@ -876,7 +879,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 	}
 
 	if ($error) {
-		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+		$objectresp = array('result' => array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
 
 	return $objectresp;

From 0538db746883cbbb7a52817cc79d460fff115b45 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:53:28 +0100
Subject: [PATCH 1857/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index e77e4b5b3c9..bd5e25f1932 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1319,7 +1319,7 @@ class Website extends CommonObject
 					dol_syslog("In sql source file, we have the page ID ".$oldid." to replace with the new ID ".$newid.", and we must create the shortcut aliases: ".$reg[3]);
 
 					//dol_move($conf->website->dir_output.'/'.$object->ref.'/page'.$oldid.'.tpl.php', $conf->website->dir_output.'/'.$object->ref.'/page'.$newid.'.tpl.php', 0, 1, 0, 0);
-				} elseif (preg_match('/^-- Page ID (\d+).*Aliases\s(.*)\s--;/i', $buf, $reg)) {
+				} elseif (preg_match('/^-- Page ID (\d+).*Aliases\s(.*)\s--;/i', $buf, /** @var string[] $reg */ $reg)) {
 					// Example of line: "-- Page ID 1__+MAX_llx_website_page__ - Aliases about-us --;"
 					$newid = ($reg[1] + $maxrowid);
 					$aliasesarray = explode(',', $reg[2]);

From 10b260a31dfebf220e5ea6112b117f49cd11c341 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 23:38:50 +0100
Subject: [PATCH 1858/1862] Fix PhanTypeSuspiciousStringExpression

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ca0feede6c8..45dcad80025 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1207,7 +1207,7 @@ class Task extends CommonObjectLine
 	{
 		$arrayroles = array();
 
-		dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks userp=".is_object($userp)." usert=".is_object($usert)." projectid=".$projectid." taskid=".$taskid);
+		dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks userp=".json_encode(is_object($userp))." usert=".json_encode(is_object($usert))." projectid=".$projectid." taskid=".$taskid);
 
 		// We want role of user for a projet or role of user for a task. Both are not possible.
 		if (empty($userp) && empty($usert)) {

From 921431dbdcf95421b070cd62c75e4bdb6a96ae7f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 16 Mar 2024 19:58:26 +0100
Subject: [PATCH 1859/1862] Qual: Enable PhanTypeSuspiciousStringExpression

---
 dev/tools/phan/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 59853f259ac..4e7977ec76f 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -468,7 +468,7 @@ return [
 		'PhanPluginUnknownArrayFunctionParamType',
 		// 'PhanPluginDescriptionlessCommentOnPublicProperty',
 		// 'PhanPluginUnknownFunctionParamType',  // Finds certain errors in PHPdoc typing
-		'PhanTypeSuspiciousStringExpression',
+		// 'PhanTypeSuspiciousStringExpression',
 		// 'PhanPluginRedundantAssignment',
 
 		'PhanTypeExpectedObjectPropAccess',

From 3c968477cbe93d77388860073ed0b64a9aac4559 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 16:37:58 +0100
Subject: [PATCH 1860/1862] Change type of global $website to string

---
 dev/tools/phan/config.php          | 2 +-
 dev/tools/phan/config_extended.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 4e7977ec76f..9c084b8e0ad 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -179,7 +179,7 @@ $VALID_MODULE_MAPPING = array(
 	'webportal' => 'WebPortal',
 	'webservices' => 'WebServices',
 	'webservicesclient' => 'WebServicesClient',
-	'website' => 'Website',
+	'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334
 	'workflow' => 'Workflow',
 	'workstation' => 'Workstation',
 	'zapier' => 'Zapier',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index fc9fe8f6fd9..253032345ae 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -178,7 +178,7 @@ $VALID_MODULE_MAPPING = array(
 	'webportal' => 'WebPortal',
 	'webservices' => 'WebServices',
 	'webservicesclient' => 'WebServicesClient',
-	'website' => 'Website',
+	'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334
 	'workflow' => 'Workflow',
 	'workstation' => 'Workstation',
 	'zapier' => 'Zapier',

From 9647c463713cdd76f4205b0e6e4996cfdbd4704b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:20:15 +0100
Subject: [PATCH 1861/1862] Add empty lines to avoid comment alignments

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0931f402eb1..f9ce010b82f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11763,12 +11763,14 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param string    	$label      	Label or tooltip of button if $text is provided. Also used as tooltip in title attribute. Can be escaped HTML content or full simple text.
  * @param string    	$text       	Optional : short label on button. Can be escaped HTML content or full simple text.
  * @param string 		$actionType 	'default', 'danger', 'email', 'clone', 'cancel', 'delete', ...
- * @param string|array<int,array{lang:string,enabled:bool,perm:bool,label:string,url:string}> 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )
- * 										Example when an array is used: $arrayforbutaction = array(
- *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
- *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
- *                                      30 => array('lang'=>'bills', 'enabled'=>isModEnabled("invoice"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
- *										);
+ *
+ * @param string|array<int,array{lang:string,enabled:bool,perm:bool,label:string,url:string}> 	$url        	Url for link or array of subbutton description
+ *
+ *                                                                                                              Example when an array is used: $arrayforbutaction = array(
+ *                                                                                                              10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                                                                                              20 => array('lang'=>'orders', 'enabled'=>isModEnabled("order"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                                                                                              30 => array('lang'=>'bills', 'enabled'=>isModEnabled("invoice"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
+ *                                                                                                              );
  * @param string    	$id         	Attribute id of action button. Example 'action-delete'. This can be used for full ajax confirm if this code is reused into the ->formconfirm() method.
  * @param int|boolean	$userRight  	User action right
  * // phpcs:disable
@@ -13989,7 +13991,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show
 			$hookmanager->initHooks(array('main'));
 		}
 
-		$parameters = array('message'=>$message, 'params'=>$params);
+		$parameters = array('message' => $message, 'params' => $params);
 		$reshook = $hookmanager->executeHooks('getErrorRecordNotFound', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
 	}

From cd3ea72f96eebb23059b1a06468c2d4a9474d443 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:35:45 +0100
Subject: [PATCH 1862/1862] Qual: Disable global variable suggestion for
 $website

---
 dev/tools/phan/config.php          | 4 ++--
 dev/tools/phan/config_extended.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 9c084b8e0ad..2bf21dfadab 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -179,7 +179,7 @@ $VALID_MODULE_MAPPING = array(
 	'webportal' => 'WebPortal',
 	'webservices' => 'WebServices',
 	'webservicesclient' => 'WebServicesClient',
-	'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334
+	'website' => 'Website',
 	'workflow' => 'Workflow',
 	'workstation' => 'Workstation',
 	'zapier' => 'Zapier',
@@ -278,7 +278,7 @@ return [
 		'objectoffield' => '\CommonObject',
 		'senderissupplier' => 'int<0,1,2>',
 		'user' => '\User',
-		'website' => '\WebSite',
+		'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
 		'websitepage' => '\WebSitePage',
 		'websitepagefile' => 'string',
 		// 'object' => '\CommonObject',  // Deprecated, not enabled because conflicts with $object assignments
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 253032345ae..7a2b4e8238d 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -178,7 +178,7 @@ $VALID_MODULE_MAPPING = array(
 	'webportal' => 'WebPortal',
 	'webservices' => 'WebServices',
 	'webservicesclient' => 'WebServicesClient',
-	'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334
+	'website' => 'Website',
 	'workflow' => 'Workflow',
 	'workstation' => 'Workstation',
 	'zapier' => 'Zapier',
@@ -218,7 +218,7 @@ return [
 		'disablemove' => 'int<0,1>',
 		'disableremove' => 'int<0,1>',
 		// Found in dol_eval
-		'website' => '\WebSite',
+		'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
 		'websitepage' => '\WebSitePage',
 		'websitepagefile' => 'string',
 		'action' => 'string',